From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/doc/contributions.txt                       |   15 +
 linden/doc/releasenotes-where.txt                  |    6 +-
 linden/doc/viewer-changes.txt                      |    0
 linden/etc/message.xml                             |   28 +-
 linden/indra/CMakeLists.txt                        |  102 +
 linden/indra/SConstruct                            |  895 ---
 linden/indra/cmake/00-Common.cmake                 |  206 +
 linden/indra/cmake/APR.cmake                       |   55 +
 linden/indra/cmake/Audio.cmake                     |   34 +
 linden/indra/cmake/BerkeleyDB.cmake                |   11 +
 linden/indra/cmake/Boost.cmake                     |   49 +
 linden/indra/cmake/BuildVersion.cmake              |   18 +
 linden/indra/cmake/CARes.cmake                     |   23 +
 linden/indra/cmake/CMakeCopyIfDifferent.cmake      |   41 +
 linden/indra/cmake/CSharpMacros.cmake              |  142 +
 linden/indra/cmake/CURL.cmake                      |   19 +
 linden/indra/cmake/CommonMiscLibs.cmake            |    7 +
 linden/indra/cmake/CopyBackToSource.cmake          |   16 +
 linden/indra/cmake/CopyWinLibs.cmake               |  155 +
 linden/indra/cmake/DirectX.cmake                   |   40 +
 linden/indra/cmake/ELFIO.cmake                     |   19 +
 linden/indra/cmake/EXPAT.cmake                     |   17 +
 linden/indra/cmake/FMOD.cmake                      |   64 +
 linden/indra/cmake/FindAPR.cmake                   |   94 +
 linden/indra/cmake/FindBerkeleyDB.cmake            |   50 +
 linden/indra/cmake/FindCARes.cmake                 |   48 +
 linden/indra/cmake/FindELFIO.cmake                 |   48 +
 linden/indra/cmake/FindGooglePerfTools.cmake       |   66 +
 linden/indra/cmake/FindMono.cmake                  |   68 +
 linden/indra/cmake/FindMySQL.cmake                 |   48 +
 linden/indra/cmake/FindOpenJPEG.cmake              |   50 +
 linden/indra/cmake/FindSCP.cmake                   |   40 +
 linden/indra/cmake/FindXmlRpcEpi.cmake             |   48 +
 linden/indra/cmake/FreeType.cmake                  |   20 +
 linden/indra/cmake/GStreamer.cmake                 |   38 +
 linden/indra/cmake/GooglePerfTools.cmake           |   28 +
 linden/indra/cmake/JPEG.cmake                      |   23 +
 linden/indra/cmake/LLAudio.cmake                   |   15 +
 linden/indra/cmake/LLCharacter.cmake               |    9 +
 linden/indra/cmake/LLCommon.cmake                  |   21 +
 linden/indra/cmake/LLCrashLogger.cmake             |    9 +
 linden/indra/cmake/LLDatabase.cmake                |   13 +
 linden/indra/cmake/LLImage.cmake                   |   15 +
 linden/indra/cmake/LLImageJ2COJ.cmake              |    8 +
 linden/indra/cmake/LLInventory.cmake               |    9 +
 linden/indra/cmake/LLKDU.cmake                     |   20 +
 linden/indra/cmake/LLMath.cmake                    |    9 +
 linden/indra/cmake/LLMedia.cmake                   |   15 +
 linden/indra/cmake/LLMessage.cmake                 |   22 +
 linden/indra/cmake/LLPhysics.cmake                 |   76 +
 linden/indra/cmake/LLPrimitive.cmake               |    9 +
 linden/indra/cmake/LLRender.cmake                  |   32 +
 linden/indra/cmake/LLScene.cmake                   |    9 +
 linden/indra/cmake/LLUI.cmake                      |    9 +
 linden/indra/cmake/LLVFS.cmake                     |   13 +
 linden/indra/cmake/LLWindow.cmake                  |   43 +
 linden/indra/cmake/LLXML.cmake                     |   13 +
 linden/indra/cmake/LScript.cmake                   |   16 +
 linden/indra/cmake/Linking.cmake                   |   45 +
 linden/indra/cmake/MonoDeps.cmake                  |   48 +
 linden/indra/cmake/MonoEmbed.cmake                 |   57 +
 linden/indra/cmake/Mozlib.cmake                    |   47 +
 linden/indra/cmake/MySQL.cmake                     |   23 +
 linden/indra/cmake/NDOF.cmake                      |   14 +
 linden/indra/cmake/OpenGL.cmake                    |    9 +
 linden/indra/cmake/OpenJPEG.cmake                  |   22 +
 linden/indra/cmake/OpenSSL.cmake                   |   23 +
 linden/indra/cmake/PNG.cmake                       |   13 +
 linden/indra/cmake/Prebuilt.cmake                  |   44 +
 linden/indra/cmake/Python.cmake                    |   49 +
 linden/indra/cmake/QuickTime.cmake                 |   33 +
 linden/indra/cmake/TemplateCheck.cmake             |   14 +
 linden/indra/cmake/UI.cmake                        |   64 +
 linden/indra/cmake/UnixInstall.cmake               |   31 +
 linden/indra/cmake/Variables.cmake                 |  100 +
 linden/indra/cmake/ViewerMiscLibs.cmake            |   10 +
 linden/indra/cmake/XmlRpcEpi.cmake                 |   17 +
 linden/indra/cmake/ZLIB.cmake                      |   20 +
 linden/indra/copy_win_scripts/CMakeLists.txt       |   35 +
 linden/indra/copy_win_scripts/start-client.py      |   68 +
 linden/indra/develop.py                            |  676 ++
 linden/indra/indra_complete/indra_complete.sln     |  573 --
 linden/indra/indra_complete/indra_complete_vc8.sln |  619 --
 linden/indra/indra_complete/indra_complete_vc9.sln |  621 --
 linden/indra/lib/python/indra/base/cllsd_test.py   |   51 +
 linden/indra/lib/python/indra/base/config.py       |  236 +-
 linden/indra/lib/python/indra/base/llsd.py         |  110 +-
 linden/indra/lib/python/indra/base/lluuid.py       |   32 +-
 linden/indra/lib/python/indra/ipc/llsdhttp.py      |   13 +-
 linden/indra/lib/python/indra/ipc/mysql_pool.py    |  100 +-
 linden/indra/lib/python/indra/ipc/siesta.py        |  402 ++
 linden/indra/lib/python/indra/ipc/siesta_test.py   |  214 +
 .../lib/python/indra/util/fastest_elementtree.py   |   52 +
 linden/indra/lib/python/indra/util/llmanifest.py   |  217 +-
 linden/indra/lib/python/indra/util/named_query.py  |    7 +-
 linden/indra/lib/python/indra/util/term.py         |  222 +
 linden/indra/linux_crash_logger/CMakeLists.txt     |   68 +
 linden/indra/linux_crash_logger/files.lst          |    3 -
 .../linux_crash_logger/llcrashloggerlinux.cpp      |    2 +-
 .../indra/linux_crash_logger/llcrashloggerlinux.h  |    2 +-
 linden/indra/llaudio/CMakeLists.txt                |   67 +
 linden/indra/llaudio/audioengine.cpp               |   10 +-
 linden/indra/llaudio/audioengine.h                 |   10 +-
 linden/indra/llaudio/audioengine_fmod.cpp          |   37 +-
 linden/indra/llaudio/audioengine_fmod.h            |   22 +-
 linden/indra/llaudio/files.lst                     |    7 -
 linden/indra/llaudio/listener_fmod.cpp             |    7 -
 linden/indra/llaudio/listener_fmod.h               |    4 -
 linden/indra/llaudio/llaudio.vcproj                |  225 -
 linden/indra/llaudio/llaudio_vc8.vcproj            |  323 -
 linden/indra/llaudio/llaudio_vc9.vcproj            |  324 -
 linden/indra/llaudio/llaudiodecodemgr.cpp          |   22 +-
 linden/indra/llaudio/vorbisencode.cpp              |   26 +-
 linden/indra/llaudio/vorbisencode.h                |    4 +-
 linden/indra/llcharacter/CMakeLists.txt            |   76 +
 linden/indra/llcharacter/files.lst                 |   21 -
 linden/indra/llcharacter/llanimationstates.cpp     |    6 +-
 linden/indra/llcharacter/llanimationstates.h       |    2 +-
 linden/indra/llcharacter/llbvhloader.cpp           |  114 +-
 linden/indra/llcharacter/llbvhloader.h             |   64 +-
 linden/indra/llcharacter/llcharacter.cpp           |   16 +-
 linden/indra/llcharacter/llcharacter.vcproj        |  296 -
 linden/indra/llcharacter/llcharacter_vc8.vcproj    |  419 --
 linden/indra/llcharacter/llcharacter_vc9.vcproj    |  420 --
 linden/indra/llcharacter/llgesture.cpp             |   18 +-
 linden/indra/llcharacter/llgesture.h               |    2 +-
 linden/indra/llcharacter/llhandmotion.cpp          |    8 +-
 linden/indra/llcharacter/llhandmotion.h            |    4 +-
 linden/indra/llcharacter/llkeyframemotion.cpp      |   33 +-
 linden/indra/llcharacter/llkeyframemotion.h        |   11 +-
 linden/indra/llcharacter/llkeyframemotionparam.cpp |    8 +-
 linden/indra/llcharacter/llkeyframewalkmotion.cpp  |   14 +-
 linden/indra/llcharacter/llmotion.h                |    4 +-
 linden/indra/llcharacter/llmotioncontroller.h      |    2 +-
 linden/indra/llcharacter/llmultigesture.cpp        |   10 +-
 linden/indra/llcharacter/llpose.cpp                |    2 +
 linden/indra/llcharacter/llstatemachine.cpp        |    2 +-
 linden/indra/llcharacter/llstatemachine.h          |    2 +-
 linden/indra/llcharacter/llvisualparam.cpp         |    4 +-
 linden/indra/llcharacter/llvisualparam.h           |   24 +-
 linden/indra/llcommon/CMakeLists.txt               |  188 +
 linden/indra/llcommon/files.lst                    |   49 -
 linden/indra/llcommon/indra_constants.h            |   14 +-
 linden/indra/llcommon/linden_common.h              |    5 +-
 linden/indra/llcommon/llapp.cpp                    |    2 +
 linden/indra/llcommon/llapr.cpp                    |   24 +-
 linden/indra/llcommon/llapr.h                      |   34 +-
 linden/indra/llcommon/llares.cpp                   |  805 ---
 linden/indra/llcommon/llares.h                     |  572 --
 linden/indra/llcommon/llassettype.cpp              |   20 +-
 linden/indra/llcommon/llassettype.h                |    6 +-
 linden/indra/llcommon/llbase64.cpp                 |    2 +-
 linden/indra/llcommon/llchat.h                     |    6 +-
 linden/indra/llcommon/llcommon.vcproj              |  608 --
 linden/indra/llcommon/llcommon_vc8.vcproj          |  847 ---
 linden/indra/llcommon/llcommon_vc9.vcproj          |  828 ---
 linden/indra/llcommon/llcrc.cpp                    |  224 +
 linden/indra/llcommon/llcrc.h                      |   73 +
 linden/indra/llcommon/lldarray.h                   |    1 -
 linden/indra/llcommon/lldate.cpp                   |    2 +-
 linden/indra/llcommon/llerror.cpp                  |   44 +-
 linden/indra/llcommon/llevent.cpp                  |    2 +-
 linden/indra/llcommon/llfile.cpp                   |   88 +-
 linden/indra/llcommon/llfile.h                     |   81 +-
 linden/indra/llcommon/llfixedbuffer.cpp            |    2 +-
 linden/indra/llcommon/llfixedbuffer.h              |    2 +-
 linden/indra/llcommon/llframetimer.cpp             |    1 -
 linden/indra/llcommon/llframetimer.h               |    8 +-
 linden/indra/llcommon/llhash.h                     |    4 +-
 linden/indra/llcommon/llheartbeat.cpp              |    7 +-
 linden/indra/llcommon/llindraconfigfile.cpp        |    2 +-
 linden/indra/llcommon/llkeythrottle.h              |  110 +-
 linden/indra/llcommon/llliveappconfig.cpp          |    2 +-
 linden/indra/llcommon/lllivefile.cpp               |    2 +-
 linden/indra/llcommon/lllslconstants.h             |    6 +
 linden/indra/llcommon/llmd5.cpp                    |  531 ++
 linden/indra/llcommon/llmd5.h                      |  133 +
 linden/indra/llcommon/llmemory.cpp                 |    1 -
 linden/indra/llcommon/llmemtype.h                  |    1 +
 linden/indra/llcommon/llpreprocessor.h             |    7 +-
 linden/indra/llcommon/llprocessor.cpp              |    4 +-
 linden/indra/llcommon/llprocessor.h                |    2 +-
 linden/indra/llcommon/llptrskiplist.h              |    1 +
 linden/indra/llcommon/llrand.cpp                   |  176 +
 linden/indra/llcommon/llrand.h                     |  132 +
 linden/indra/llcommon/llsd.cpp                     |   28 +-
 linden/indra/llcommon/llsd.h                       |    4 +-
 linden/indra/llcommon/llsdserialize.cpp            |   30 +-
 linden/indra/llcommon/llsdserialize.h              |   41 +-
 linden/indra/llcommon/llsdserialize_xml.cpp        |  137 +-
 linden/indra/llcommon/llsdutil.cpp                 |  132 +-
 linden/indra/llcommon/llsdutil.h                   |   17 +-
 linden/indra/llcommon/llsecondlifeurls.cpp         |   72 +-
 linden/indra/llcommon/llsecondlifeurls.h           |   32 +-
 linden/indra/llcommon/llstat.cpp                   |    5 +-
 linden/indra/llcommon/llstat.h                     |    8 +-
 linden/indra/llcommon/llstatenums.h                |    3 +-
 linden/indra/llcommon/llstl.h                      |    2 +
 linden/indra/llcommon/llstring.cpp                 |  292 +-
 linden/indra/llcommon/llstring.h                   |  391 +-
 linden/indra/llcommon/llsys.cpp                    |   56 +-
 linden/indra/llcommon/llsys.h                      |    4 +-
 linden/indra/llcommon/llthread.cpp                 |    2 +-
 linden/indra/llcommon/llthread.h                   |    2 +-
 linden/indra/llcommon/lltimer.cpp                  |   25 +-
 linden/indra/llcommon/lltimer.h                    |   37 +-
 linden/indra/llcommon/lluri.cpp                    |    2 +-
 linden/indra/llcommon/lluuid.cpp                   |  923 +++
 linden/indra/llcommon/lluuid.h                     |  331 +
 linden/indra/llcommon/llversionserver.h            |    6 +-
 linden/indra/llcommon/llversionviewer.h            |    4 +-
 linden/indra/llcommon/metapropertyt.h              |   13 -
 linden/indra/llcommon/roles_constants.h            |   10 +
 linden/indra/llcommon/stdtypes.h                   |    2 +
 linden/indra/llcommon/u64.cpp                      |   36 +-
 linden/indra/llcommon/u64.h                        |    9 +-
 linden/indra/llcrashlogger/CMakeLists.txt          |   35 +
 linden/indra/llcrashlogger/files.lst               |    1 -
 linden/indra/llcrashlogger/llcrashlogger.cpp       |   27 +-
 linden/indra/llcrashlogger/llcrashlogger.h         |   18 +-
 linden/indra/llimage/CMakeLists.txt                |   50 +
 linden/indra/llimage/files.lst                     |    9 -
 linden/indra/llimage/llimage.cpp                   |   60 +-
 linden/indra/llimage/llimage.h                     |   22 +-
 linden/indra/llimage/llimage.vcproj                |  229 -
 linden/indra/llimage/llimage_vc8.vcproj            |  325 -
 linden/indra/llimage/llimage_vc9.vcproj            |  326 -
 linden/indra/llimage/llimagebmp.cpp                |    8 +-
 linden/indra/llimage/llimagebmp.h                  |    1 +
 linden/indra/llimage/llimagedxt.h                  |    1 +
 linden/indra/llimage/llimagej2c.cpp                |    6 +-
 linden/indra/llimage/llimagej2c.h                  |    3 +-
 linden/indra/llimage/llimagejpeg.cpp               |   35 +-
 linden/indra/llimage/llimagejpeg.h                 |    9 +-
 linden/indra/llimage/llimagepng.h                  |    7 +-
 linden/indra/llimage/llimagetga.cpp                |   37 +-
 linden/indra/llimage/llimagetga.h                  |    5 +-
 linden/indra/llimage/llpngwrapper.cpp              |   11 +-
 linden/indra/llimage/llpngwrapper.h                |    6 +-
 linden/indra/llimagej2coj/CMakeLists.txt           |   31 +
 linden/indra/llimagej2coj/files.lst                |    1 -
 linden/indra/llimagej2coj/llimagej2coj.cpp         |    6 +-
 linden/indra/llimagej2coj/llimagej2coj.vcproj      |  161 -
 linden/indra/llinventory/CMakeLists.txt            |   56 +
 linden/indra/llinventory/files.lst                 |   11 -
 linden/indra/llinventory/llinventory.cpp           |  228 +-
 linden/indra/llinventory/llinventory.h             |   26 +-
 linden/indra/llinventory/llinventory.vcproj        |  245 -
 linden/indra/llinventory/llinventory_vc8.vcproj    |  347 -
 linden/indra/llinventory/llinventory_vc9.vcproj    |  348 -
 linden/indra/llinventory/llinventorytype.cpp       |    4 +-
 linden/indra/llinventory/llinventorytype.h         |    2 +-
 linden/indra/llinventory/llnotecard.cpp            |   14 +-
 linden/indra/llinventory/llnotecard.h              |    9 +-
 linden/indra/llinventory/llparcel.cpp              |  341 +-
 linden/indra/llinventory/llparcel.h                |   60 +-
 linden/indra/llinventory/llpermissions.cpp         |   42 +-
 linden/indra/llinventory/llsaleinfo.cpp            |    2 +-
 linden/indra/llinventory/lltransactionflags.cpp    |   36 +-
 linden/indra/llinventory/lltransactionflags.h      |    6 +-
 linden/indra/llmath/CMakeLists.txt                 |   81 +
 linden/indra/llmath/files.lst                      |   25 -
 linden/indra/llmath/llcamera.h                     |    5 +-
 linden/indra/llmath/llcrc.cpp                      |  224 -
 linden/indra/llmath/llcrc.h                        |   73 -
 linden/indra/llmath/llline.cpp                     |    2 +
 linden/indra/llmath/llmath.h                       |   52 +-
 linden/indra/llmath/llmath.vcproj                  |  348 -
 linden/indra/llmath/llmath_vc8.vcproj              |  488 --
 linden/indra/llmath/llmath_vc9.vcproj              |  489 --
 linden/indra/llmath/llmd5.cpp                      |  531 --
 linden/indra/llmath/llmd5.h                        |  133 -
 linden/indra/llmath/lloctree.h                     |    2 +-
 linden/indra/llmath/llquaternion.cpp               |    8 +-
 linden/indra/llmath/llquaternion.h                 |    2 +-
 linden/indra/llmath/llrand.cpp                     |  176 -
 linden/indra/llmath/llrand.h                       |  132 -
 linden/indra/llmath/llrect.h                       |    5 +-
 linden/indra/llmath/llsdutil_math.cpp              |  172 +
 linden/indra/llmath/llsphere.cpp                   |    2 +
 linden/indra/llmath/lluuid.cpp                     |  923 ---
 linden/indra/llmath/lluuid.h                       |  330 -
 linden/indra/llmath/llvolume.cpp                   |  420 +-
 linden/indra/llmath/llvolume.h                     |  100 +-
 linden/indra/llmath/llvolumemgr.cpp                |    7 +-
 linden/indra/llmath/llvolumemgr.h                  |    2 +-
 linden/indra/llmath/v2math.cpp                     |    1 +
 linden/indra/llmath/v2math.h                       |   14 +-
 linden/indra/llmath/v3color.h                      |    4 +
 linden/indra/llmath/v3dmath.cpp                    |    6 +-
 linden/indra/llmath/v3dmath.h                      |   48 +-
 linden/indra/llmath/v3math.cpp                     |   80 +-
 linden/indra/llmath/v3math.h                       |    5 +-
 linden/indra/llmath/v4color.cpp                    |   28 +-
 linden/indra/llmath/v4color.h                      |    4 +-
 linden/indra/llmath/v4coloru.cpp                   |    8 +-
 linden/indra/llmath/v4coloru.h                     |    2 +-
 linden/indra/llmedia/CMakeLists.txt                |   94 +
 linden/indra/llmedia/files.lst                     |   11 -
 linden/indra/llmedia/llmedia.vcproj                |  245 -
 linden/indra/llmedia/llmedia_vc8.vcproj            |  323 -
 linden/indra/llmedia/llmedia_vc9.vcproj            |  326 -
 linden/indra/llmedia/llmediabase.h                 |   19 -
 linden/indra/llmedia/llmediaimplexample1.cpp       |    2 +
 linden/indra/llmedia/llmediaimplexample2.cpp       |    2 +
 linden/indra/llmedia/llmediaimplgstreamer.cpp      |   30 +-
 linden/indra/llmedia/llmediaimplgstreamer.h        |   12 +-
 linden/indra/llmedia/llmediaimplgstreamer_syms.cpp |    4 +-
 .../llmedia/llmediaimplgstreamer_syms_raw.inc      |    1 +
 linden/indra/llmedia/llmediamanager.cpp            |   23 +-
 linden/indra/llmedia/llmediamanager.h              |    4 +
 linden/indra/llmessage/CMakeLists.txt              |  191 +
 linden/indra/llmessage/files.lst                   |   71 -
 linden/indra/llmessage/llares.cpp                  |  804 +++
 linden/indra/llmessage/llares.h                    |  572 ++
 linden/indra/llmessage/llassetstorage.cpp          |  127 +-
 linden/indra/llmessage/llassetstorage.h            |   25 +-
 linden/indra/llmessage/llcachename.cpp             |   80 +-
 linden/indra/llmessage/llcachename.h               |    6 +-
 linden/indra/llmessage/llcircuit.cpp               |   20 +-
 linden/indra/llmessage/llcurl.cpp                  |   60 +-
 linden/indra/llmessage/llcurl.h                    |   33 +-
 linden/indra/llmessage/lldatapacker.cpp            |   26 +-
 linden/indra/llmessage/lldatapacker.h              |    8 +-
 linden/indra/llmessage/lldispatcher.cpp            |    3 +-
 linden/indra/llmessage/llfiltersd2xmlrpc.cpp       |    2 +-
 linden/indra/llmessage/llhost.cpp                  |   72 +-
 linden/indra/llmessage/llhost.h                    |   14 +-
 linden/indra/llmessage/llhttpassetstorage.cpp      |   64 +-
 linden/indra/llmessage/llhttpassetstorage.h        |   18 +-
 linden/indra/llmessage/llhttpclient.cpp            |  111 +-
 linden/indra/llmessage/llhttpclient.h              |   36 +-
 linden/indra/llmessage/llhttpnode.cpp              |   27 +
 linden/indra/llmessage/llhttpnode.h                |   88 +-
 linden/indra/llmessage/llhttpsender.cpp            |    2 +-
 linden/indra/llmessage/llhttpsender.h              |    2 +-
 linden/indra/llmessage/llinstantmessage.cpp        |   26 +-
 linden/indra/llmessage/llinstantmessage.h          |   10 +-
 linden/indra/llmessage/lliohttpserver.cpp          |   52 +-
 linden/indra/llmessage/lliopipe.cpp                |    2 +
 linden/indra/llmessage/lliopipe.h                  |    7 +-
 linden/indra/llmessage/lliosocket.cpp              |    8 +-
 linden/indra/llmessage/lliosocket.h                |    4 +-
 linden/indra/llmessage/llmail.cpp                  |   27 +-
 linden/indra/llmessage/llmessage.vcproj            |  675 --
 linden/indra/llmessage/llmessage_vc8.vcproj        |  921 ---
 linden/indra/llmessage/llmessage_vc9.vcproj        |  922 ---
 linden/indra/llmessage/llmessageconfig.cpp         |   19 +-
 linden/indra/llmessage/llmessagereader.h           |    1 +
 linden/indra/llmessage/llmessagetemplateparser.cpp |    2 +-
 linden/indra/llmessage/llmessagethrottle.cpp       |    4 +-
 linden/indra/llmessage/llmessagethrottle.h         |    4 +-
 linden/indra/llmessage/llmime.cpp                  |    6 +-
 linden/indra/llmessage/llnamevalue.cpp             |    2 +-
 linden/indra/llmessage/llpumpio.cpp                |   13 +-
 linden/indra/llmessage/llpumpio.h                  |    2 +-
 linden/indra/llmessage/llregionflags.h             |    4 +-
 linden/indra/llmessage/llsdmessagereader.cpp       |   26 +-
 linden/indra/llmessage/llsdmessagereader.h         |    2 +
 linden/indra/llmessage/llservicebuilder.cpp        |   72 +-
 linden/indra/llmessage/llservicebuilder.h          |   15 +-
 linden/indra/llmessage/lltemplatemessagereader.cpp |   16 +-
 linden/indra/llmessage/lltemplatemessagereader.h   |    2 +
 linden/indra/llmessage/lltransfersourcefile.cpp    |    8 +-
 linden/indra/llmessage/lltransfersourcefile.h      |    2 +-
 linden/indra/llmessage/lltransfertargetfile.cpp    |    4 +-
 linden/indra/llmessage/lltransfertargetfile.h      |    4 +-
 linden/indra/llmessage/llurlrequest.cpp            |   11 +-
 linden/indra/llmessage/llurlrequest.h              |    1 +
 linden/indra/llmessage/llxfer.cpp                  |   18 +-
 linden/indra/llmessage/llxfer.h                    |    2 +-
 linden/indra/llmessage/llxfer_file.cpp             |   44 +-
 linden/indra/llmessage/llxfer_file.h               |   20 +-
 linden/indra/llmessage/llxfer_mem.cpp              |    9 +-
 linden/indra/llmessage/llxfer_mem.h                |    2 +-
 linden/indra/llmessage/llxfer_vfile.cpp            |   10 +-
 linden/indra/llmessage/llxfer_vfile.h              |    4 +-
 linden/indra/llmessage/llxfermanager.cpp           |   26 +-
 linden/indra/llmessage/llxfermanager.h             |    6 +-
 linden/indra/llmessage/mean_collision_data.h       |   16 +-
 linden/indra/llmessage/message.cpp                 |  172 +-
 linden/indra/llmessage/message.h                   |   18 +-
 linden/indra/llmessage/message_prehash.cpp         |    3 +
 linden/indra/llmessage/message_prehash.h           |    4 +-
 linden/indra/llprimitive/CMakeLists.txt            |   49 +
 linden/indra/llprimitive/files.lst                 |    7 -
 linden/indra/llprimitive/llmaterialtable.cpp       |   29 +-
 linden/indra/llprimitive/llmaterialtable.h         |   20 +-
 linden/indra/llprimitive/llprimitive.cpp           |   65 +-
 linden/indra/llprimitive/llprimitive.h             |    4 +-
 linden/indra/llprimitive/llprimitive.vcproj        |  224 -
 linden/indra/llprimitive/llprimitive_vc8.vcproj    |  319 -
 linden/indra/llprimitive/llprimitive_vc9.vcproj    |  320 -
 linden/indra/llrender/CMakeLists.txt               |   83 +
 linden/indra/llrender/files.darwin.lst             |    1 -
 linden/indra/llrender/files.lst                    |    7 -
 linden/indra/llrender/llcubemap.cpp                |  532 ++
 linden/indra/llrender/llcubemap.h                  |   89 +
 linden/indra/llrender/llfont.h                     |    8 +-
 linden/indra/llrender/llfontgl.cpp                 |   98 +-
 linden/indra/llrender/llfontgl.h                   |   50 +-
 linden/indra/llrender/llgl.cpp                     | 1763 +++++
 linden/indra/llrender/llgl.h                       |  378 +
 linden/indra/llrender/llgldbg.cpp                  |   10 +-
 linden/indra/llrender/llglheaders.h                |  588 ++
 linden/indra/llrender/llglimmediate.cpp            |  264 +
 linden/indra/llrender/llglimmediate.h              |   97 +
 linden/indra/llrender/llglslshader.cpp             |  823 +++
 linden/indra/llrender/llglslshader.h               |  139 +
 linden/indra/llrender/llglstates.h                 |  302 +
 linden/indra/llrender/llgltypes.h                  |   44 +
 linden/indra/llrender/llimagegl.cpp                |    2 +-
 linden/indra/llrender/llpostprocess.cpp            |  574 ++
 linden/indra/llrender/llpostprocess.h              |  268 +
 linden/indra/llrender/llrender.cpp                 |   12 +
 linden/indra/llrender/llrender.h                   |    6 +-
 linden/indra/llrender/llrender.vcproj              |  232 -
 linden/indra/llrender/llrender_vc8.vcproj          |  329 -
 linden/indra/llrender/llrender_vc9.vcproj          |  330 -
 linden/indra/llrender/llrendersphere.cpp           |  182 +
 linden/indra/llrender/llrendersphere.h             |   47 +
 linden/indra/llrender/llrendertarget.cpp           |    5 +
 linden/indra/llrender/llshadermgr.cpp              |  513 ++
 linden/indra/llrender/llshadermgr.h                |   75 +
 linden/indra/llrender/llvertexbuffer.cpp           |    5 +
 linden/indra/llrender/llvertexbuffer.h             |    1 +
 linden/indra/llui/CMakeLists.txt                   |  133 +
 linden/indra/llui/files.lst                        |   46 -
 linden/indra/llui/llalertdialog.cpp                |  104 +-
 linden/indra/llui/llalertdialog.h                  |   69 +-
 linden/indra/llui/llbutton.cpp                     |  153 +-
 linden/indra/llui/llbutton.h                       |   73 +-
 linden/indra/llui/llcallbackmap.h                  |    2 +-
 linden/indra/llui/llcheckboxctrl.cpp               |   42 +-
 linden/indra/llui/llcheckboxctrl.h                 |   12 +-
 linden/indra/llui/llcombobox.cpp                   |  108 +-
 linden/indra/llui/llcombobox.h                     |   30 +-
 linden/indra/llui/llctrlselectioninterface.cpp     |    4 +-
 linden/indra/llui/llctrlselectioninterface.h       |   10 +-
 linden/indra/llui/lldraghandle.cpp                 |   24 +-
 linden/indra/llui/lldraghandle.h                   |   18 +-
 linden/indra/llui/llfloater.cpp                    |  242 +-
 linden/indra/llui/llfloater.h                      |   56 +-
 linden/indra/llui/llfocusmgr.cpp                   |   12 +-
 linden/indra/llui/llfocusmgr.h                     |    6 +-
 linden/indra/llui/lliconctrl.cpp                   |   10 +-
 linden/indra/llui/lliconctrl.h                     |   10 +-
 linden/indra/llui/llkeywords.cpp                   |   63 +-
 linden/indra/llui/llkeywords.h                     |    8 +-
 linden/indra/llui/lllineeditor.cpp                 |  142 +-
 linden/indra/llui/lllineeditor.h                   |   36 +-
 linden/indra/llui/llmemberlistener.h               |    4 +-
 linden/indra/llui/llmenugl.cpp                     |  262 +-
 linden/indra/llui/llmenugl.h                       |   90 +-
 linden/indra/llui/llmodaldialog.cpp                |    4 +-
 linden/indra/llui/llmodaldialog.h                  |    2 +-
 linden/indra/llui/llmultislider.cpp                |   32 +-
 linden/indra/llui/llmultislider.h                  |   22 +-
 linden/indra/llui/llmultisliderctrl.cpp            |   64 +-
 linden/indra/llui/llmultisliderctrl.h              |   28 +-
 linden/indra/llui/llpanel.cpp                      |  130 +-
 linden/indra/llui/llpanel.h                        |  126 +-
 linden/indra/llui/llradiogroup.cpp                 |   28 +-
 linden/indra/llui/llradiogroup.h                   |   10 +-
 linden/indra/llui/llresizebar.cpp                  |    2 +-
 linden/indra/llui/llresizebar.h                    |    2 +-
 linden/indra/llui/llresizehandle.cpp               |    2 +-
 linden/indra/llui/llresizehandle.h                 |    2 +-
 linden/indra/llui/llresmgr.cpp                     |   38 +-
 linden/indra/llui/llresmgr.h                       |   12 +-
 linden/indra/llui/llrootview.cpp                   |    2 +-
 linden/indra/llui/llrootview.h                     |    2 +-
 linden/indra/llui/llscrollbar.cpp                  |   28 +-
 linden/indra/llui/llscrollbar.h                    |    4 +-
 linden/indra/llui/llscrollcontainer.cpp            |   22 +-
 linden/indra/llui/llscrollcontainer.h              |    8 +-
 linden/indra/llui/llscrollingpanellist.cpp         |    2 +-
 linden/indra/llui/llscrollingpanellist.h           |    4 +-
 linden/indra/llui/llscrolllistctrl.cpp             |  166 +-
 linden/indra/llui/llscrolllistctrl.h               |   53 +-
 linden/indra/llui/llslider.cpp                     |    6 +-
 linden/indra/llui/llslider.h                       |    4 +-
 linden/indra/llui/llsliderctrl.cpp                 |   54 +-
 linden/indra/llui/llsliderctrl.h                   |   12 +-
 linden/indra/llui/llspinctrl.cpp                   |   63 +-
 linden/indra/llui/llspinctrl.h                     |    8 +-
 linden/indra/llui/llstyle.cpp                      |   18 +-
 linden/indra/llui/llstyle.h                        |   16 +-
 linden/indra/llui/lltabcontainer.cpp               |  141 +-
 linden/indra/llui/lltabcontainer.h                 |   26 +-
 linden/indra/llui/lltextbox.cpp                    |   28 +-
 linden/indra/llui/lltextbox.h                      |   12 +-
 linden/indra/llui/lltexteditor.cpp                 |  328 +-
 linden/indra/llui/lltexteditor.h                   |   57 +-
 linden/indra/llui/llui.cpp                         |   31 +-
 linden/indra/llui/llui.h                           |   18 +-
 linden/indra/llui/llui.vcproj                      |  446 --
 linden/indra/llui/llui_vc8.vcproj                  |  611 --
 linden/indra/llui/llui_vc9.vcproj                  |  612 --
 linden/indra/llui/lluictrl.cpp                     |    8 +-
 linden/indra/llui/lluictrl.h                       |    6 +-
 linden/indra/llui/lluictrlfactory.cpp              |   56 +-
 linden/indra/llui/lluictrlfactory.h                |   22 +-
 linden/indra/llui/lluistring.cpp                   |   14 +-
 linden/indra/llui/lluistring.h                     |   34 +-
 linden/indra/llui/lluixmltags.h                    |    6 +-
 linden/indra/llui/llview.cpp                       |  138 +-
 linden/indra/llui/llview.h                         |  103 +-
 linden/indra/llui/llviewborder.cpp                 |    8 +-
 linden/indra/llui/llviewborder.h                   |    2 +-
 linden/indra/llvfs/CMakeLists.txt                  |   58 +
 linden/indra/llvfs/files.linux.lst                 |    1 -
 linden/indra/llvfs/files.lst                       |    5 -
 linden/indra/llvfs/files.sunos5.lst                |    1 -
 linden/indra/llvfs/files.win32.lst                 |    1 -
 linden/indra/llvfs/lldir.cpp                       |  112 +-
 linden/indra/llvfs/lldir.h                         |   11 +-
 linden/indra/llvfs/lldir_linux.cpp                 |   22 +-
 linden/indra/llvfs/lldir_mac.cpp                   |   11 +-
 linden/indra/llvfs/lldir_solaris.cpp               |   18 +-
 linden/indra/llvfs/lldir_win32.cpp                 |   18 +-
 linden/indra/llvfs/lllfsthread.cpp                 |    7 +-
 linden/indra/llvfs/lllfsthread.h                   |   10 +-
 linden/indra/llvfs/llvfs.cpp                       |  112 +-
 linden/indra/llvfs/llvfs.h                         |   10 +-
 linden/indra/llvfs/llvfs.vcproj                    |  203 -
 linden/indra/llvfs/llvfs_vc8.vcproj                |  295 -
 linden/indra/llvfs/llvfs_vc9.vcproj                |  296 -
 linden/indra/llvfs/llvfsthread.cpp                 |    1 -
 linden/indra/llvfs/llvfsthread.h                   |    6 +-
 linden/indra/llwindow/CMakeLists.txt               |  147 +
 linden/indra/llwindow/GL/glh_extensions.h          |  207 +
 linden/indra/llwindow/GL/glh_genext.h              | 1671 +++++
 linden/indra/llwindow/files.darwin.lst             |    2 -
 linden/indra/llwindow/files.linux.lst              |    3 -
 linden/indra/llwindow/files.lst                    |    5 -
 linden/indra/llwindow/files.sunos5.lst             |    3 -
 linden/indra/llwindow/files.win32.lst              |    2 -
 linden/indra/llwindow/lldxhardware.cpp             |    4 +-
 linden/indra/llwindow/lldxhardware.h               |    4 +-
 linden/indra/llwindow/llgl.cpp                     | 1734 -----
 linden/indra/llwindow/llgl.h                       |  377 -
 linden/indra/llwindow/llglheaders.h                |  597 --
 linden/indra/llwindow/llglstates.h                 |  302 -
 linden/indra/llwindow/llgltypes.h                  |   44 -
 linden/indra/llwindow/llkeyboard.cpp               |   27 +-
 linden/indra/llwindow/llkeyboard.h                 |   12 +-
 linden/indra/llwindow/lllogitechlcd.cpp            |  296 -
 linden/indra/llwindow/lllogitechlcd.h              |  135 -
 linden/indra/llwindow/llmousehandler.h             |   11 +-
 linden/indra/llwindow/llwindow.cpp                 |   20 +-
 linden/indra/llwindow/llwindow.h                   |   31 +-
 linden/indra/llwindow/llwindow.vcproj              |  281 -
 linden/indra/llwindow/llwindow_vc8.vcproj          |  395 --
 linden/indra/llwindow/llwindow_vc9.vcproj          |  398 --
 linden/indra/llwindow/llwindowheadless.cpp         |    2 +-
 linden/indra/llwindow/llwindowheadless.h           |   10 +-
 linden/indra/llwindow/llwindowmacosx.cpp           |  166 +-
 linden/indra/llwindow/llwindowmacosx.h             |   23 +-
 linden/indra/llwindow/llwindowmesaheadless.cpp     |    7 +-
 linden/indra/llwindow/llwindowmesaheadless.h       |   10 +-
 linden/indra/llwindow/llwindowsdl.cpp              |  169 +-
 linden/indra/llwindow/llwindowsdl.h                |   17 +-
 linden/indra/llwindow/llwindowwin32.cpp            |  150 +-
 linden/indra/llwindow/llwindowwin32.h              |   13 +-
 linden/indra/llxml/CMakeLists.txt                  |   36 +
 linden/indra/llxml/files.lst                       |    4 -
 linden/indra/llxml/llcontrol.cpp                   |  158 +-
 linden/indra/llxml/llcontrol.h                     |  126 +-
 linden/indra/llxml/llxml.vcproj                    |  191 -
 linden/indra/llxml/llxml_vc8.vcproj                |  279 -
 linden/indra/llxml/llxml_vc9.vcproj                |  280 -
 linden/indra/llxml/llxmlnode.cpp                   |  233 +-
 linden/indra/llxml/llxmlnode.h                     |  107 +-
 linden/indra/llxml/llxmlparser.cpp                 |   14 +-
 linden/indra/llxml/llxmlparser.h                   |    2 +-
 linden/indra/llxml/llxmltree.cpp                   |   94 +-
 linden/indra/llxml/llxmltree.h                     |   20 +-
 linden/indra/lscript/CMakeLists.txt                |   18 +
 linden/indra/lscript/files.lst                     |   16 -
 linden/indra/lscript/lscript_byteconvert.h         |    4 +-
 linden/indra/lscript/lscript_byteformat.h          |   18 +-
 .../indra/lscript/lscript_compile/CMakeLists.txt   |  148 +
 linden/indra/lscript/lscript_compile/bison.bat     |   11 +
 linden/indra/lscript/lscript_compile/indra.l       |   42 +-
 .../lscript/lscript_compile/lscript_bytecode.cpp   |    4 +-
 .../lscript/lscript_compile/lscript_bytecode.h     |    4 +-
 .../lscript/lscript_compile/lscript_compile.vcproj |  227 -
 .../lscript_compile/lscript_compile_fb.vcproj      |  105 -
 .../lscript_compile/lscript_compile_fb_vc8.vcproj  |  131 -
 .../lscript_compile/lscript_compile_fb_vc9.vcproj  |  132 -
 .../lscript_compile/lscript_compile_ly.vcproj      |  110 -
 .../lscript_compile/lscript_compile_ly_vc8.vcproj  |  131 -
 .../lscript_compile/lscript_compile_vc8.vcproj     |  331 -
 .../lscript_compile/lscript_compile_vc9.vcproj     |  332 -
 .../lscript/lscript_compile/lscript_error.cpp      |   14 +-
 .../indra/lscript/lscript_compile/lscript_error.h  |    5 +
 .../indra/lscript/lscript_compile/lscript_scope.h  |   22 +-
 .../indra/lscript/lscript_compile/lscript_tree.cpp | 1743 +++--
 .../indra/lscript/lscript_compile/lscript_tree.h   |   16 +-
 .../lscript/lscript_compile/lscript_typecheck.cpp  |    8 +-
 linden/indra/lscript/lscript_execute.h             |  150 +-
 .../indra/lscript/lscript_execute/CMakeLists.txt   |   34 +
 .../lscript/lscript_execute/lscript_execute.cpp    |  985 ++-
 .../lscript/lscript_execute/lscript_execute.vcproj |  191 -
 .../lscript_execute/lscript_execute_vc8.vcproj     |  279 -
 .../lscript_execute/lscript_execute_vc9.vcproj     |  280 -
 .../lscript/lscript_execute_mono/assembly.cpp      |   74 +
 linden/indra/lscript/lscript_execute_mono/size.cpp |  182 +
 linden/indra/lscript/lscript_library.h             |   43 +-
 .../indra/lscript/lscript_library/CMakeLists.txt   |   32 +
 .../lscript/lscript_library/lscript_library.cpp    |   48 +-
 .../lscript/lscript_library/lscript_library.vcproj |  185 -
 .../lscript_library/lscript_library_vc8.vcproj     |  271 -
 .../lscript_library/lscript_library_vc9.vcproj     |  272 -
 linden/indra/lscript/lscript_rt_interface.h        |    6 +-
 linden/indra/mac_crash_logger/CMakeLists.txt       |   79 +
 linden/indra/mac_crash_logger/llcrashloggermac.cpp |   14 +-
 linden/indra/mac_crash_logger/llcrashloggermac.h   |    2 +-
 linden/indra/mac_updater/CMakeLists.txt            |   82 +
 linden/indra/mac_updater/MoreFilesX.c              |    2 +
 linden/indra/mac_updater/MoreFilesX.h              |    2 +
 linden/indra/mac_updater/mac_updater.cpp           |   14 +-
 linden/indra/newview/AutoUpdater-Info.plist        |   26 -
 linden/indra/newview/CMakeLists.txt                | 1490 ++++
 linden/indra/newview/CrashReporter.nib/classes.nib |    8 -
 linden/indra/newview/CrashReporter.nib/info.nib    |   20 -
 linden/indra/newview/CrashReporter.nib/objects.xib |   69 -
 .../indra/newview/English.lproj/InfoPlist.strings  |    5 +-
 linden/indra/newview/Info-SecondLife.plist         |    2 +-
 linden/indra/newview/ViewerInstall.cmake           |   28 +
 linden/indra/newview/app_settings/keywords.ini     |    3 +
 linden/indra/newview/app_settings/settings.xml     |  207 +-
 linden/indra/newview/crashreporter-Info.plist      |   26 -
 linden/indra/newview/featuretable.txt              |   42 +-
 linden/indra/newview/featuretable_linux.txt        |  145 +-
 linden/indra/newview/featuretable_mac.txt          |    2 +
 linden/indra/newview/files.lst                     |  373 -
 linden/indra/newview/gpu_table.txt                 |   39 +-
 .../darwin/firstlook-dmg/Applications-alias.r      | 6996 +++++++++++++++++++
 .../installers/darwin/firstlook-dmg/_DS_Store      |  Bin 0 -> 12292 bytes
 .../darwin/firstlook-dmg/_VolumeIcon.icns          |  Bin 0 -> 98049 bytes
 .../installers/darwin/firstlook-dmg/background.jpg |  Bin 0 -> 75112 bytes
 .../newview/installers/darwin/mac_image_DS_Store   |  Bin 12292 -> 0 bytes
 .../installers/darwin/mac_image_background.tga     |  Bin 589868 -> 0 bytes
 .../newview/installers/darwin/mac_image_hidden     |    1 -
 .../darwin/publicnightly-dmg/Applications-alias.r  | 6996 +++++++++++++++++++
 .../installers/darwin/publicnightly-dmg/_DS_Store  |  Bin 0 -> 12292 bytes
 .../darwin/publicnightly-dmg/_VolumeIcon.icns      |  Bin 0 -> 98049 bytes
 .../darwin/publicnightly-dmg/background.jpg        |  Bin 0 -> 75112 bytes
 .../darwin/release-dmg/Applications-alias.r        | 6996 +++++++++++++++++++
 .../installers/darwin/release-dmg/_DS_Store        |  Bin 0 -> 12292 bytes
 .../installers/darwin/release-dmg/_VolumeIcon.icns |  Bin 0 -> 98049 bytes
 .../installers/darwin/release-dmg/background.jpg   |  Bin 0 -> 75112 bytes
 .../releasecandidate-dmg/Applications-alias.r      | 6996 +++++++++++++++++++
 .../darwin/releasecandidate-dmg/_DS_Store          |  Bin 0 -> 12292 bytes
 .../darwin/releasecandidate-dmg/_VolumeIcon.icns   |  Bin 0 -> 98049 bytes
 .../darwin/releasecandidate-dmg/background.jpg     |  Bin 0 -> 75112 bytes
 .../installers/windows/installer_template.nsi      |   34 +-
 .../indra/newview/linux_tools/exposed-symbols.txt  |    4 -
 linden/indra/newview/linux_tools/wrapper.sh        |   11 +
 linden/indra/newview/llagent.cpp                   |  234 +-
 linden/indra/newview/llagent.h                     |   35 +-
 linden/indra/newview/llagentlanguage.cpp           |   65 +
 linden/indra/newview/llagentlanguage.h             |   45 +
 linden/indra/newview/llagentpilot.cpp              |   31 +-
 linden/indra/newview/llagentpilot.h                |    4 +-
 linden/indra/newview/llanimstatelabels.cpp         |    4 +-
 linden/indra/newview/llappviewer.cpp               |  418 +-
 linden/indra/newview/llappviewer.h                 |   25 +-
 linden/indra/newview/llappviewerlinux.cpp          |   44 +-
 linden/indra/newview/llappviewermacosx.cpp         |  128 +-
 linden/indra/newview/llappviewerwin32.cpp          |   27 +-
 linden/indra/newview/llassetuploadqueue.cpp        |  216 +
 linden/indra/newview/llassetuploadqueue.h          |   96 +
 linden/indra/newview/llassetuploadresponders.cpp   |  132 +-
 linden/indra/newview/llassetuploadresponders.h     |   23 +-
 linden/indra/newview/llcallingcard.cpp             |   10 +-
 linden/indra/newview/llcallingcard.h               |    2 +-
 linden/indra/newview/llcaphttpsender.cpp           |    2 +-
 linden/indra/newview/llcaphttpsender.h             |    2 +-
 linden/indra/newview/llchatbar.cpp                 |   81 +-
 linden/indra/newview/llchatbar.h                   |    2 +-
 linden/indra/newview/llcolorswatch.cpp             |   12 +-
 linden/indra/newview/llcommandlineparser.cpp       |   26 +-
 linden/indra/newview/llcommandlineparser.h         |    8 +-
 linden/indra/newview/llcompass.h                   |    4 -
 linden/indra/newview/llcompilequeue.cpp            |  321 +-
 linden/indra/newview/llcompilequeue.h              |   44 +-
 linden/indra/newview/llconfirmationmanager.cpp     |    6 +-
 linden/indra/newview/llconsole.cpp                 |  366 +-
 linden/indra/newview/llconsole.h                   |   85 +-
 linden/indra/newview/llcontainerview.cpp           |    2 +-
 linden/indra/newview/llcontainerview.h             |    4 +-
 linden/indra/newview/llcubemap.cpp                 |  539 --
 linden/indra/newview/llcubemap.h                   |   87 -
 linden/indra/newview/llcurrencyuimanager.cpp       |    5 +-
 linden/indra/newview/llcurrencyuimanager.h         |    2 +-
 linden/indra/newview/lldebugmessagebox.cpp         |   22 +-
 linden/indra/newview/lldebugmessagebox.h           |    4 +-
 linden/indra/newview/lldebugview.cpp               |    2 +-
 linden/indra/newview/lldelayedgestureerror.cpp     |    4 +-
 linden/indra/newview/lldelayedgestureerror.h       |    4 +-
 linden/indra/newview/lldirpicker.cpp               |   24 +-
 linden/indra/newview/lldirpicker.h                 |    9 +-
 linden/indra/newview/lldrawable.cpp                |   88 +-
 linden/indra/newview/lldrawable.h                  |    2 -
 linden/indra/newview/lldrawpoolalpha.cpp           |    4 +-
 linden/indra/newview/lldrawpoolavatar.cpp          |   59 +-
 linden/indra/newview/lldrawpoolbump.cpp            |   35 +-
 linden/indra/newview/lldrawpoolbump.h              |    4 +-
 linden/indra/newview/lldrawpoolground.cpp          |    4 +-
 linden/indra/newview/lldrawpoolsimple.cpp          |   10 +-
 linden/indra/newview/lldrawpoolsky.cpp             |    4 +-
 linden/indra/newview/lldrawpoolterrain.cpp         |   24 +-
 linden/indra/newview/lldrawpooltree.cpp            |    4 +-
 linden/indra/newview/lldrawpoolwater.cpp           |   52 +-
 linden/indra/newview/lldrawpoolwlsky.cpp           |    5 +-
 linden/indra/newview/llemote.h                     |    2 -
 linden/indra/newview/lleventinfo.cpp               |   57 +-
 linden/indra/newview/lleventinfo.h                 |    5 +-
 linden/indra/newview/lleventnotifier.cpp           |    7 +-
 linden/indra/newview/lleventnotifier.h             |    4 +-
 linden/indra/newview/llface.cpp                    |  243 +-
 linden/indra/newview/llface.h                      |    3 +-
 linden/indra/newview/llfasttimerview.cpp           |   24 +-
 linden/indra/newview/llfeaturemanager.cpp          |   56 +-
 linden/indra/newview/llfeaturemanager.h            |   35 +-
 linden/indra/newview/llfilepicker.cpp              |  563 +-
 linden/indra/newview/llfilepicker.h                |   45 +-
 linden/indra/newview/llfirstuse.cpp                |   23 +-
 linden/indra/newview/llfirstuse.h                  |    4 +-
 linden/indra/newview/llfloaterabout.cpp            |  125 +-
 linden/indra/newview/llfloateractivespeakers.cpp   |   97 +-
 linden/indra/newview/llfloateractivespeakers.h     |   12 +-
 linden/indra/newview/llfloateranimpreview.cpp      |   45 +-
 linden/indra/newview/llfloateranimpreview.h        |    4 +-
 linden/indra/newview/llfloaterauction.cpp          |   16 +-
 linden/indra/newview/llfloateravatarinfo.cpp       |   29 +-
 linden/indra/newview/llfloateravatarinfo.h         |    2 +
 linden/indra/newview/llfloateravatarpicker.cpp     |   24 +-
 linden/indra/newview/llfloateravatartextures.cpp   |    4 +-
 linden/indra/newview/llfloateravatartextures.h     |    2 +-
 linden/indra/newview/llfloaterbuildoptions.cpp     |    2 +-
 linden/indra/newview/llfloaterbump.cpp             |    9 +-
 linden/indra/newview/llfloaterbuy.cpp              |   18 +-
 linden/indra/newview/llfloaterbuy.h                |    2 +
 linden/indra/newview/llfloaterbuycontents.cpp      |    8 +-
 linden/indra/newview/llfloaterbuycurrency.cpp      |   10 +-
 linden/indra/newview/llfloaterbuyland.cpp          |   46 +-
 linden/indra/newview/llfloatercamera.cpp           |   23 +-
 linden/indra/newview/llfloaterchat.cpp             |   34 +-
 linden/indra/newview/llfloaterchat.h               |    2 +-
 linden/indra/newview/llfloaterclothing.cpp         |   14 +-
 linden/indra/newview/llfloatercolorpicker.cpp      |   12 +-
 linden/indra/newview/llfloatercustomize.cpp        |  128 +-
 linden/indra/newview/llfloatercustomize.h          |    3 +-
 linden/indra/newview/llfloaterdaycycle.cpp         |   52 +-
 linden/indra/newview/llfloaterdaycycle.h           |   10 +-
 linden/indra/newview/llfloaterdirectory.cpp        |    8 +-
 linden/indra/newview/llfloatereditui.cpp           |   40 +-
 linden/indra/newview/llfloaterenvsettings.cpp      |    6 +-
 linden/indra/newview/llfloaterenvsettings.h        |    2 +-
 linden/indra/newview/llfloaterfriends.cpp          |  141 +-
 linden/indra/newview/llfloaterfriends.h            |   12 +-
 linden/indra/newview/llfloatergesture.cpp          |   24 +-
 linden/indra/newview/llfloatergodtools.cpp         |   42 +-
 linden/indra/newview/llfloatergodtools.h           |   12 +-
 linden/indra/newview/llfloatergroupinfo.cpp        |   14 +-
 linden/indra/newview/llfloatergroupinfo.h          |   14 +-
 linden/indra/newview/llfloatergroupinvite.cpp      |    5 +-
 linden/indra/newview/llfloatergroups.cpp           |    6 +-
 linden/indra/newview/llfloaterhardwaresettings.cpp |    2 +-
 linden/indra/newview/llfloaterhtml.cpp             |   15 +-
 linden/indra/newview/llfloaterhtml.h               |    4 +-
 linden/indra/newview/llfloaterhtmlhelp.cpp         |   91 +-
 linden/indra/newview/llfloaterhud.cpp              |   21 +-
 linden/indra/newview/llfloaterhud.h                |   23 +-
 linden/indra/newview/llfloaterimagepreview.cpp     |   31 +-
 linden/indra/newview/llfloaterimagepreview.h       |    6 +-
 linden/indra/newview/llfloaterinspect.cpp          |    8 +-
 linden/indra/newview/llfloaterjoystick.cpp         |    2 +-
 linden/indra/newview/llfloaterlagmeter.cpp         |   18 +-
 linden/indra/newview/llfloaterlagmeter.h           |    2 +-
 linden/indra/newview/llfloaterland.cpp             |  169 +-
 linden/indra/newview/llfloaterland.h               |    2 +-
 linden/indra/newview/llfloaterlandholdings.cpp     |   30 +-
 linden/indra/newview/llfloaterlandholdings.h       |    2 +-
 linden/indra/newview/llfloaterlandmark.cpp         |    6 +-
 linden/indra/newview/llfloaterlandmark.h           |    6 +-
 linden/indra/newview/llfloatermap.cpp              |    6 +-
 linden/indra/newview/llfloatermemleak.cpp          |  265 +
 linden/indra/newview/llfloatermemleak.h            |   89 +
 linden/indra/newview/llfloatermute.cpp             |   18 +-
 linden/indra/newview/llfloatermute.h               |    2 +-
 linden/indra/newview/llfloaternamedesc.cpp         |   33 +-
 linden/indra/newview/llfloaternamedesc.h           |    4 +-
 linden/indra/newview/llfloaternewim.cpp            |    6 +-
 linden/indra/newview/llfloateropenobject.cpp       |    6 +-
 linden/indra/newview/llfloaterpermissionsmgr.cpp   |   17 +-
 linden/indra/newview/llfloaterpermissionsmgr.h     |    2 +-
 linden/indra/newview/llfloaterpostcard.cpp         |   14 +-
 linden/indra/newview/llfloaterpostcard.h           |    2 +-
 linden/indra/newview/llfloaterpostprocess.cpp      |    2 +-
 linden/indra/newview/llfloaterpreference.cpp       |   29 +-
 linden/indra/newview/llfloaterpreference.h         |   10 +-
 linden/indra/newview/llfloaterproperties.cpp       |    8 +-
 linden/indra/newview/llfloaterregioninfo.cpp       |  329 +-
 linden/indra/newview/llfloaterregioninfo.h         |   35 +-
 linden/indra/newview/llfloaterreleasemsg.cpp       |  174 -
 linden/indra/newview/llfloaterreleasemsg.h         |   59 -
 linden/indra/newview/llfloaterreporter.cpp         |   51 +-
 linden/indra/newview/llfloaterreporter.h           |    8 +-
 linden/indra/newview/llfloaterscriptdebug.cpp      |   14 +-
 linden/indra/newview/llfloaterscriptdebug.h        |    2 +-
 linden/indra/newview/llfloatersellland.cpp         |   22 +-
 linden/indra/newview/llfloatersettingsdebug.cpp    |   38 +-
 linden/indra/newview/llfloatersnapshot.cpp         |  636 +-
 linden/indra/newview/llfloatersnapshot.h           |   19 +-
 linden/indra/newview/llfloaterstats.cpp            |    8 +-
 linden/indra/newview/llfloaterstats.h              |    2 +-
 linden/indra/newview/llfloatertelehub.cpp          |   13 +-
 linden/indra/newview/llfloatertelehub.h            |    2 +-
 linden/indra/newview/llfloatertest.cpp             |   94 +-
 linden/indra/newview/llfloatertools.cpp            |   53 +-
 linden/indra/newview/llfloatertools.h              |    2 +
 linden/indra/newview/llfloatertopobjects.cpp       |   52 +-
 linden/indra/newview/llfloatertopobjects.h         |    4 +-
 linden/indra/newview/llfloatertos.cpp              |   58 +-
 linden/indra/newview/llfloatertos.h                |    2 +-
 linden/indra/newview/llfloaterurlentry.cpp         |    2 +-
 .../indra/newview/llfloatervoicedevicesettings.cpp |    6 +-
 linden/indra/newview/llfloaterwater.cpp            |   38 +-
 linden/indra/newview/llfloaterwater.h              |    4 +-
 linden/indra/newview/llfloaterwindlight.cpp        |   86 +-
 linden/indra/newview/llfloaterwindlight.h          |    4 +-
 linden/indra/newview/llfloaterworldmap.cpp         |   69 +-
 linden/indra/newview/llfloaterworldmap.h           |   14 +-
 linden/indra/newview/llfolderview.cpp              |  190 +-
 linden/indra/newview/llfolderview.h                |   87 +-
 linden/indra/newview/llfollowcam.cpp               |    1 +
 linden/indra/newview/llfollowcam.h                 |    2 -
 linden/indra/newview/llframestats.cpp              |   18 +-
 linden/indra/newview/llframestats.h                |   10 +-
 linden/indra/newview/llframestatview.cpp           |   10 +-
 linden/indra/newview/llframestatview.h             |    4 +-
 linden/indra/newview/llgenepool.cpp                |    7 +-
 linden/indra/newview/llgesturemgr.cpp              |   22 +-
 linden/indra/newview/llgivemoney.cpp               |   28 +-
 linden/indra/newview/llgivemoney.h                 |    6 +-
 linden/indra/newview/llglsandbox.cpp               |   43 +-
 linden/indra/newview/llglslshader.cpp              | 2310 -------
 linden/indra/newview/llglslshader.h                |  420 --
 linden/indra/newview/llgroupmgr.cpp                |   81 +-
 linden/indra/newview/llgroupmgr.h                  |    2 +-
 linden/indra/newview/llgroupnotify.cpp             |   98 +-
 linden/indra/newview/llgroupnotify.h               |   36 +-
 linden/indra/newview/llhippo.cpp                   |   70 -
 linden/indra/newview/llhippo.h                     |   37 -
 linden/indra/newview/llhoverview.cpp               |   21 +-
 linden/indra/newview/llhoverview.h                 |    5 +-
 linden/indra/newview/llhudeffectlookat.cpp         |   18 +-
 linden/indra/newview/llhudobject.h                 |    2 +
 linden/indra/newview/llhudrender.cpp               |    1 +
 linden/indra/newview/llhudtext.cpp                 |   19 +-
 linden/indra/newview/llhudtext.h                   |    3 +
 linden/indra/newview/llimpanel.cpp                 |  235 +-
 linden/indra/newview/llimpanel.h                   |   44 +-
 linden/indra/newview/llimview.cpp                  |  111 +-
 linden/indra/newview/llimview.h                    |   24 +-
 linden/indra/newview/llinventoryactions.cpp        |   36 +-
 linden/indra/newview/llinventorybridge.cpp         |  375 +-
 linden/indra/newview/llinventorybridge.h           |  106 +-
 linden/indra/newview/llinventorymodel.cpp          |  135 +-
 linden/indra/newview/llinventorymodel.h            |   22 +-
 linden/indra/newview/llinventoryview.cpp           |  162 +-
 linden/indra/newview/llinventoryview.h             |   51 +-
 linden/indra/newview/lljoystickbutton.cpp          |   50 +-
 linden/indra/newview/lljoystickbutton.h            |   16 +-
 linden/indra/newview/lllcd.cpp                     |  703 --
 linden/indra/newview/lllcd.h                       |  113 -
 linden/indra/newview/lllogchat.cpp                 |   37 +-
 linden/indra/newview/lllogchat.h                   |   12 +-
 linden/indra/newview/llmanip.cpp                   |   53 +-
 linden/indra/newview/llmanip.h                     |    7 +-
 linden/indra/newview/llmaniprotate.cpp             |  121 +-
 linden/indra/newview/llmaniprotate.h               |    3 -
 linden/indra/newview/llmanipscale.cpp              |   40 +-
 linden/indra/newview/llmanipscale.h                |    2 -
 linden/indra/newview/llmaniptranslate.cpp          |   52 +-
 linden/indra/newview/llmaniptranslate.h            |    2 -
 linden/indra/newview/llmediaremotectrl.cpp         |   14 +-
 linden/indra/newview/llmediaremotectrl.h           |    2 +-
 linden/indra/newview/llmemoryview.cpp              |    1 +
 linden/indra/newview/llmimetypes.cpp               |   48 +-
 linden/indra/newview/llmimetypes.h                 |   42 +-
 linden/indra/newview/llmoveview.cpp                |    2 +-
 linden/indra/newview/llmutelist.cpp                |   78 +-
 linden/indra/newview/llmutelist.h                  |   22 +-
 linden/indra/newview/llnamebox.cpp                 |   24 +-
 linden/indra/newview/llnamebox.h                   |    7 +-
 linden/indra/newview/llnameeditor.cpp              |   26 +-
 linden/indra/newview/llnameeditor.h                |    7 +-
 linden/indra/newview/llnamelistctrl.cpp            |   52 +-
 linden/indra/newview/llnamelistctrl.h              |   15 +-
 linden/indra/newview/llnetmap.cpp                  |   36 +-
 linden/indra/newview/llnetmap.h                    |    2 +-
 linden/indra/newview/llnotify.cpp                  |   72 +-
 linden/indra/newview/llnotify.h                    |   44 +-
 linden/indra/newview/lloverlaybar.cpp              |   22 +-
 linden/indra/newview/lloverlaybar.h                |    1 -
 linden/indra/newview/llpanelaudiovolume.cpp        |    2 +-
 linden/indra/newview/llpanelavatar.cpp             |  213 +-
 linden/indra/newview/llpanelavatar.h               |   21 +-
 linden/indra/newview/llpanelclassified.cpp         |   68 +-
 linden/indra/newview/llpanelclassified.h           |   10 +-
 linden/indra/newview/llpanelcontents.cpp           |    4 +-
 linden/indra/newview/llpaneldebug.cpp              |   66 +-
 linden/indra/newview/llpaneldirbrowser.cpp         |   82 +-
 linden/indra/newview/llpaneldirbrowser.h           |   11 +-
 linden/indra/newview/llpaneldirclassified.cpp      |    2 +-
 linden/indra/newview/llpaneldirclassified.h        |    2 +-
 linden/indra/newview/llpaneldirevents.cpp          |    6 +-
 linden/indra/newview/llpaneldirfind.cpp            |   14 +-
 linden/indra/newview/llpaneldirpeople.cpp          |    2 +-
 linden/indra/newview/llpaneldirplaces.cpp          |   14 +-
 linden/indra/newview/llpaneldirplaces.h            |    2 +-
 linden/indra/newview/llpaneldisplay.cpp            |   23 +-
 linden/indra/newview/llpaneldisplay.h              |    2 +-
 linden/indra/newview/llpanelevent.cpp              |    4 +-
 linden/indra/newview/llpanelgeneral.cpp            |    2 +-
 linden/indra/newview/llpanelgeneral.h              |    4 +-
 linden/indra/newview/llpanelgroup.cpp              |   30 +-
 linden/indra/newview/llpanelgroup.h                |   22 +-
 linden/indra/newview/llpanelgroupgeneral.cpp       |   28 +-
 linden/indra/newview/llpanelgroupgeneral.h         |    4 +-
 linden/indra/newview/llpanelgroupinvite.cpp        |   10 +-
 linden/indra/newview/llpanelgrouplandmoney.cpp     |  149 +-
 linden/indra/newview/llpanelgrouplandmoney.h       |    4 +-
 linden/indra/newview/llpanelgroupnotices.cpp       |   45 +-
 linden/indra/newview/llpanelgroupnotices.h         |   14 +-
 linden/indra/newview/llpanelgrouproles.cpp         |   63 +-
 linden/indra/newview/llpanelgrouproles.h           |   26 +-
 linden/indra/newview/llpanelgroupvoting.cpp        |  107 +-
 linden/indra/newview/llpanelgroupvoting.h          |    4 +-
 linden/indra/newview/llpanelinventory.cpp          |  168 +-
 linden/indra/newview/llpanelinventory.h            |    8 +-
 linden/indra/newview/llpanelland.cpp               |    4 +-
 linden/indra/newview/llpanellandmedia.cpp          |   36 +-
 linden/indra/newview/llpanellandmedia.h            |    6 +-
 linden/indra/newview/llpanellogin.cpp              |   95 +-
 linden/indra/newview/llpanellogin.h                |   12 +-
 linden/indra/newview/llpanelmsgs.cpp               |    6 +-
 linden/indra/newview/llpanelnetwork.cpp            |   12 +-
 linden/indra/newview/llpanelobject.cpp             |  109 +-
 linden/indra/newview/llpanelobject.h               |   10 +-
 linden/indra/newview/llpanelpermissions.cpp        |  203 +-
 linden/indra/newview/llpanelpick.cpp               |   42 +-
 linden/indra/newview/llpanelpick.h                 |    2 +-
 linden/indra/newview/llpanelplace.cpp              |   48 +-
 linden/indra/newview/llpanelplace.h                |    2 +
 linden/indra/newview/llpanelvolume.cpp             |    2 +-
 linden/indra/newview/llpanelweb.h                  |    2 +-
 linden/indra/newview/llpolymesh.cpp                |   28 +-
 linden/indra/newview/llpolymesh.h                  |   12 +-
 linden/indra/newview/llpolymorph.cpp               |   16 +-
 linden/indra/newview/llpolymorph.h                 |   13 +-
 linden/indra/newview/llpostprocess.cpp             |  567 --
 linden/indra/newview/llpostprocess.h               |  268 -
 linden/indra/newview/llprefschat.cpp               |    9 +-
 linden/indra/newview/llprefsim.cpp                 |   38 +-
 linden/indra/newview/llprefsim.h                   |    5 +-
 linden/indra/newview/llprefsvoice.cpp              |    4 +-
 linden/indra/newview/llpreview.cpp                 |    2 +-
 linden/indra/newview/llpreviewanim.h               |    2 +-
 linden/indra/newview/llpreviewgesture.cpp          |   42 +-
 linden/indra/newview/llpreviewgesture.h            |    2 +-
 linden/indra/newview/llpreviewlandmark.cpp         |    5 +-
 linden/indra/newview/llpreviewlandmark.h           |    2 +-
 linden/indra/newview/llpreviewnotecard.cpp         |   16 +-
 linden/indra/newview/llpreviewscript.cpp           |  305 +-
 linden/indra/newview/llpreviewscript.h             |   28 +-
 linden/indra/newview/llpreviewtexture.cpp          |   14 +-
 linden/indra/newview/llpreviewtexture.h            |    2 +-
 linden/indra/newview/llprogressview.cpp            |   23 +-
 linden/indra/newview/llprogressview.h              |   10 +-
 linden/indra/newview/llrendersphere.cpp            |  171 -
 linden/indra/newview/llrendersphere.h              |   47 -
 linden/indra/newview/llselectmgr.cpp               |  217 +-
 linden/indra/newview/llselectmgr.h                 |   34 +-
 linden/indra/newview/llsky.h                       |    3 -
 linden/indra/newview/llspatialpartition.cpp        |  178 +-
 linden/indra/newview/llspatialpartition.h          |    9 +-
 linden/indra/newview/llsprite.cpp                  |   32 +-
 linden/indra/newview/llsprite.h                    |    1 -
 linden/indra/newview/llstartup.cpp                 |  761 +-
 linden/indra/newview/llstartup.h                   |   37 +-
 linden/indra/newview/llstatbar.cpp                 |   24 +-
 linden/indra/newview/llstatbar.h                   |   10 +-
 linden/indra/newview/llstatgraph.cpp               |    4 +-
 linden/indra/newview/llstatgraph.h                 |    8 +-
 linden/indra/newview/llstatusbar.cpp               |  133 +-
 linden/indra/newview/llstatusbar.h                 |    4 +-
 linden/indra/newview/llstatview.cpp                |    6 +-
 linden/indra/newview/llstatview.h                  |    8 +-
 linden/indra/newview/llstylemap.cpp                |   16 +-
 linden/indra/newview/llstylemap.h                  |    3 +
 linden/indra/newview/llsurface.cpp                 |    2 +
 linden/indra/newview/llsurface.h                   |    3 -
 linden/indra/newview/llsurfacepatch.cpp            |   45 +-
 linden/indra/newview/llsurfacepatch.h              |   14 +-
 linden/indra/newview/lltexlayer.cpp                |   24 +-
 linden/indra/newview/lltexlayer.h                  |   30 +-
 linden/indra/newview/lltexturecache.cpp            |   26 +-
 linden/indra/newview/lltexturecache.h              |    2 +-
 linden/indra/newview/lltexturectrl.cpp             |   86 +-
 linden/indra/newview/lltexturectrl.h               |   18 +-
 linden/indra/newview/lltexturefetch.cpp            |   12 +-
 linden/indra/newview/lltexturefetch.h              |    2 +-
 linden/indra/newview/lltextureview.cpp             |   63 +-
 linden/indra/newview/lltool.cpp                    |   10 +-
 linden/indra/newview/lltool.h                      |   13 +-
 linden/indra/newview/lltoolbar.cpp                 |    8 +-
 linden/indra/newview/lltoolbar.h                   |    2 +-
 linden/indra/newview/lltoolbrush.cpp               |   79 +-
 linden/indra/newview/lltoolcomp.cpp                |   92 +-
 linden/indra/newview/lltoolcomp.h                  |   15 +-
 linden/indra/newview/lltooldraganddrop.cpp         |  402 +-
 linden/indra/newview/lltooldraganddrop.h           |   25 +-
 linden/indra/newview/lltoolface.cpp                |   15 +-
 linden/indra/newview/lltoolface.h                  |    3 +-
 linden/indra/newview/lltoolfocus.cpp               |   30 +-
 linden/indra/newview/lltoolfocus.h                 |    4 +-
 linden/indra/newview/lltoolgrab.cpp                |  345 +-
 linden/indra/newview/lltoolgrab.h                  |   19 +-
 linden/indra/newview/lltoolgun.cpp                 |    3 +-
 linden/indra/newview/lltoolindividual.cpp          |    8 +-
 linden/indra/newview/lltoolindividual.h            |    4 +-
 linden/indra/newview/lltoolmgr.cpp                 |    2 +-
 linden/indra/newview/lltoolobjpicker.cpp           |   17 +-
 linden/indra/newview/lltoolobjpicker.h             |    4 +-
 linden/indra/newview/lltoolpie.cpp                 |  105 +-
 linden/indra/newview/lltoolpie.h                   |   13 +-
 linden/indra/newview/lltoolpipette.cpp             |   22 +-
 linden/indra/newview/lltoolpipette.h               |    9 +-
 linden/indra/newview/lltoolplacer.cpp              |   26 +-
 linden/indra/newview/lltoolplacer.h                |    2 +-
 linden/indra/newview/lltoolselect.cpp              |   54 +-
 linden/indra/newview/lltoolselect.h                |    5 +-
 linden/indra/newview/lltoolselectland.cpp          |    2 +-
 linden/indra/newview/lltoolselectrect.cpp          |   22 +-
 linden/indra/newview/lltoolselectrect.h            |    2 +
 linden/indra/newview/lltoolview.cpp                |   88 +-
 linden/indra/newview/lltoolview.h                  |    2 -
 linden/indra/newview/lltracker.cpp                 |   15 +-
 linden/indra/newview/lltracker.h                   |   20 +-
 linden/indra/newview/lltrans.cpp                   |   12 +-
 linden/indra/newview/lltrans.h                     |   16 +-
 linden/indra/newview/lluploaddialog.cpp            |   11 +-
 linden/indra/newview/llurldispatcher.cpp           |    4 +-
 linden/indra/newview/llurlhistory.cpp              |   12 +-
 linden/indra/newview/llurlhistory.h                |    4 +-
 linden/indra/newview/llurlsimstring.cpp            |   54 +-
 linden/indra/newview/llurlsimstring.h              |   16 +-
 linden/indra/newview/llurlwhitelist.cpp            |   24 +-
 linden/indra/newview/llurlwhitelist.h              |   12 +-
 linden/indra/newview/lluserauth.cpp                |   56 +-
 linden/indra/newview/lluserauth.h                  |   26 +-
 linden/indra/newview/llvelocitybar.cpp             |   18 +-
 linden/indra/newview/llviewchildren.cpp            |   20 +-
 linden/indra/newview/llviewchildren.h              |   16 +-
 linden/indra/newview/llviewerassetstorage.cpp      |   16 +-
 linden/indra/newview/llviewerassetstorage.h        |    2 +-
 linden/indra/newview/llviewercamera.cpp            |   12 -
 linden/indra/newview/llviewercamera.h              |    7 -
 linden/indra/newview/llviewercontrol.cpp           |   24 +-
 linden/indra/newview/llviewercontrol.h             |    6 +-
 linden/indra/newview/llviewerdisplay.cpp           |  127 +-
 linden/indra/newview/llviewergenericmessage.cpp    |    4 +-
 linden/indra/newview/llviewergenericmessage.h      |    2 +-
 linden/indra/newview/llviewergesture.cpp           |    8 +-
 linden/indra/newview/llviewerimage.cpp             |   72 +-
 linden/indra/newview/llviewerimage.h               |   12 +-
 linden/indra/newview/llviewerimagelist.cpp         |   44 +-
 linden/indra/newview/llviewerimagelist.h           |   20 +-
 linden/indra/newview/llviewerinventory.cpp         |   45 +-
 linden/indra/newview/llviewerinventory.h           |   11 +-
 linden/indra/newview/llviewerjointattachment.cpp   |   25 +-
 linden/indra/newview/llviewerjointmesh.cpp         |    6 +-
 linden/indra/newview/llviewerjoystick.cpp          |   31 +-
 linden/indra/newview/llviewerjoystick.h            |    2 -
 linden/indra/newview/llviewerkeyboard.cpp          |   37 +-
 linden/indra/newview/llviewerkeyboard.h            |   13 +-
 linden/indra/newview/llviewermedia.cpp             |   46 +-
 linden/indra/newview/llviewermedia.h               |    9 +
 linden/indra/newview/llviewermenu.cpp              |  768 ++-
 linden/indra/newview/llviewermenu.h                |   11 +-
 linden/indra/newview/llviewermenufile.cpp          |  278 +-
 linden/indra/newview/llviewermenufile.h            |    6 +-
 linden/indra/newview/llviewermessage.cpp           |  920 ++-
 linden/indra/newview/llviewermessage.h             |   33 +-
 linden/indra/newview/llviewernetwork.cpp           |    8 +-
 linden/indra/newview/llviewernetwork.h             |    1 +
 linden/indra/newview/llviewerobject.cpp            |  339 +-
 linden/indra/newview/llviewerobject.h              |   51 +-
 linden/indra/newview/llviewerobjectlist.cpp        |   61 +-
 linden/indra/newview/llviewerobjectlist.h          |    9 +-
 linden/indra/newview/llviewerparcelmedia.cpp       |    4 +-
 linden/indra/newview/llviewerparcelmgr.cpp         |   43 +-
 linden/indra/newview/llviewerparcelmgr.h           |    2 +-
 linden/indra/newview/llviewerpartsim.cpp           |  211 +-
 linden/indra/newview/llviewerpartsim.h             |    6 +-
 linden/indra/newview/llviewerpartsource.cpp        |    8 +-
 linden/indra/newview/llviewerprecompiledheaders.h  |    1 +
 linden/indra/newview/llviewerregion.cpp            |  108 +-
 linden/indra/newview/llviewerregion.h              |   40 +-
 linden/indra/newview/llviewershadermgr.cpp         | 1098 +++
 linden/indra/newview/llviewershadermgr.h           |  313 +
 linden/indra/newview/llviewerstats.cpp             |   46 +-
 linden/indra/newview/llviewerstats.h               |    4 +-
 linden/indra/newview/llviewertexteditor.cpp        |   48 +-
 linden/indra/newview/llviewertexteditor.h          |   20 +-
 linden/indra/newview/llviewerthrottle.cpp          |    2 +-
 linden/indra/newview/llviewerthrottle.h            |    2 +-
 linden/indra/newview/llviewervisualparam.cpp       |    2 +-
 linden/indra/newview/llviewervisualparam.h         |    6 +-
 linden/indra/newview/llviewerwindow.cpp            | 1661 +++--
 linden/indra/newview/llviewerwindow.h              |  234 +-
 linden/indra/newview/llvoavatar.cpp                |  456 +-
 linden/indra/newview/llvoavatar.h                  |   62 +-
 linden/indra/newview/llvograss.cpp                 |   12 +-
 linden/indra/newview/llvoiceclient.cpp             |  177 +-
 linden/indra/newview/llvoiceclient.h               |    9 +-
 linden/indra/newview/llvoiceremotectrl.cpp         |   10 +-
 linden/indra/newview/llvoiceremotectrl.h           |    2 +-
 linden/indra/newview/llvoicevisualizer.cpp         |    8 -
 linden/indra/newview/llvopartgroup.cpp             |   19 +-
 linden/indra/newview/llvosky.cpp                   |    4 +-
 linden/indra/newview/llvosky.h                     |    2 +-
 linden/indra/newview/llvotree.cpp                  |   10 +-
 linden/indra/newview/llvovolume.cpp                |   78 +-
 linden/indra/newview/llvovolume.h                  |   13 +-
 linden/indra/newview/llwaterparammanager.cpp       |   38 +-
 linden/indra/newview/llwaterparammanager.h         |   26 +-
 linden/indra/newview/llwaterparamset.cpp           |   22 +-
 linden/indra/newview/llwaterparamset.h             |   26 +-
 linden/indra/newview/llwearable.cpp                |   69 +-
 linden/indra/newview/llwearable.h                  |   34 +-
 linden/indra/newview/llwearablelist.cpp            |   18 +-
 linden/indra/newview/llwearablelist.h              |    4 +-
 linden/indra/newview/llweb.cpp                     |    4 +-
 linden/indra/newview/llweb.h                       |    2 +-
 linden/indra/newview/llwebbrowserctrl.cpp          |   45 +-
 linden/indra/newview/llwebbrowserctrl.h            |    2 +
 linden/indra/newview/llwindebug.cpp                |   13 +-
 linden/indra/newview/llwindebug.h                  |    2 +-
 linden/indra/newview/llwldaycycle.cpp              |   25 +-
 linden/indra/newview/llwldaycycle.h                |   12 +-
 linden/indra/newview/llwlparammanager.cpp          |   50 +-
 linden/indra/newview/llwlparammanager.h            |   26 +-
 linden/indra/newview/llwlparamset.cpp              |   20 +-
 linden/indra/newview/llwlparamset.h                |   22 +-
 linden/indra/newview/llworld.cpp                   |   14 +-
 linden/indra/newview/llworld.h                     |    9 +-
 linden/indra/newview/llworldmap.cpp                |   53 +-
 linden/indra/newview/llworldmap.h                  |    5 +-
 linden/indra/newview/llworldmapview.cpp            |   89 +-
 linden/indra/newview/llworldmapview.h              |   10 +-
 linden/indra/newview/macview.r                     |  123 +
 .../newview/macview.xcodeproj/default.pbxuser      |  183 -
 .../newview/macview.xcodeproj/project.pbxproj      | 6200 -----------------
 linden/indra/newview/mozilla-theme/classic.jar     |  Bin 194180 -> 0 bytes
 .../indra/newview/mozilla-theme/classic.manifest   |    4 -
 linden/indra/newview/newview.vcproj                | 3451 ----------
 linden/indra/newview/newview_vc8.vcproj            | 4647 -------------
 linden/indra/newview/newview_vc9.vcproj            | 4624 -------------
 linden/indra/newview/pipeline.cpp                  |  229 +-
 linden/indra/newview/pipeline.h                    |   36 +-
 linden/indra/newview/postbuild.bat                 |  167 -
 linden/indra/newview/prebuild.bat                  |   15 -
 linden/indra/newview/releasenotes.txt              |  569 --
 linden/indra/newview/res/newViewRes.rc             |  288 -
 linden/indra/newview/res/resource.h                |    2 +-
 linden/indra/newview/res/viewerRes.rc              |  288 +
 .../newview/secondlife setup build A08T01.bat      |    4 -
 .../newview/secondlife setup build B08T01.bat      |    4 -
 .../indra/newview/secondlife setup build aditi.bat |    4 -
 .../indra/newview/secondlife setup build agni.bat  |    4 -
 .../indra/newview/secondlife setup build aruna.bat |    4 -
 .../indra/newview/secondlife setup build dmz.bat   |    4 -
 .../indra/newview/secondlife setup build durga.bat |    4 -
 .../secondlife setup build firstlookwindlight.bat  |    4 -
 .../indra/newview/secondlife setup build ganga.bat |    4 -
 .../indra/newview/secondlife setup build mitra.bat |    4 -
 .../newview/secondlife setup build mohini.bat      |    4 -
 .../indra/newview/secondlife setup build nandi.bat |    4 -
 .../indra/newview/secondlife setup build radha.bat |    4 -
 .../indra/newview/secondlife setup build ravi.bat  |    4 -
 .../secondlife setup build release candidate.bat   |    4 -
 .../newview/secondlife setup build shakti.bat      |    4 -
 .../indra/newview/secondlife setup build siva.bat  |    4 -
 .../indra/newview/secondlife setup build soma.bat  |    4 -
 .../indra/newview/secondlife setup build uma.bat   |    4 -
 .../indra/newview/secondlife setup build vaak.bat  |    4 -
 .../newview/secondlife setup build voicebeta.bat   |    4 -
 .../secondlife setup build voicefirstlook.bat      |    4 -
 .../indra/newview/secondlife setup build yami.bat  |    4 -
 linden/indra/newview/secondlife setup build.bat    |   21 -
 linden/indra/newview/skins/default/colors_base.xml |    1 +
 .../newview/skins/default/textures/textures.xml    |    4 +-
 .../indra/newview/skins/default/xui/de/alerts.xml  |   36 +-
 .../newview/skins/default/xui/de/floater_html.xml  |    3 +
 .../skins/default/xui/de/panel_region_estate.xml   |    3 -
 .../newview/skins/default/xui/en-us/LCD_text.xml   |   76 -
 .../newview/skins/default/xui/en-us/alerts.xml     |  144 +-
 .../skins/default/xui/en-us/floater_about_land.xml |    9 +-
 .../skins/default/xui/en-us/floater_critical.xml   |    6 +-
 .../skins/default/xui/en-us/floater_html.xml       |    3 +
 .../default/xui/en-us/floater_instant_message.xml  |    3 +
 .../xui/en-us/floater_instant_message_ad_hoc.xml   |    2 +-
 .../xui/en-us/floater_instant_message_group.xml    |    8 +-
 .../skins/default/xui/en-us/floater_lagmeter.xml   |    3 +-
 .../default/xui/en-us/floater_live_lsleditor.xml   |    5 +-
 .../default/xui/en-us/floater_mem_leaking.xml      |   31 +
 .../skins/default/xui/en-us/floater_postcard.xml   |    7 +-
 .../default/xui/en-us/floater_report_abuse.xml     |  131 +-
 .../default/xui/en-us/floater_script_ed_panel.xml  |    2 +-
 .../default/xui/en-us/floater_script_search.xml    |    2 +-
 .../xui/en-us/floater_skin_preview_template.xml    |    2 +-
 .../skins/default/xui/en-us/floater_snapshot.xml   |   56 +-
 .../skins/default/xui/en-us/floater_tools.xml      |   46 +-
 .../default/xui/en-us/floater_top_objects.xml      |   11 +-
 .../skins/default/xui/en-us/floater_tos.xml        |   32 +-
 .../skins/default/xui/en-us/floater_world_map.xml  |   86 +-
 .../skins/default/xui/en-us/menu_pie_avatar.xml    |    2 +-
 .../skins/default/xui/en-us/menu_pie_self.xml      |    1 +
 .../skins/default/xui/en-us/menu_viewer.xml        |   39 +-
 .../newview/skins/default/xui/en-us/mime_types.xml |    8 +
 .../newview/skins/default/xui/en-us/notify.xml     |   46 +-
 .../skins/default/xui/en-us/panel_avatar.xml       |   33 +-
 .../default/xui/en-us/panel_land_covenant.xml      |    2 +-
 .../skins/default/xui/en-us/panel_login.xml        |   38 +-
 .../skins/default/xui/en-us/panel_overlaybar.xml   |    5 -
 .../default/xui/en-us/panel_preferences_LCD.xml    |   61 -
 .../default/xui/en-us/panel_preferences_chat.xml   |  104 +-
 .../xui/en-us/panel_preferences_general.xml        |   28 +-
 .../default/xui/en-us/panel_preferences_im.xml     |   67 +-
 .../default/xui/en-us/panel_preferences_popups.xml |   33 +-
 .../skins/default/xui/en-us/panel_region_debug.xml |   38 +-
 .../default/xui/en-us/panel_region_estate.xml      |    1 +
 .../skins/default/xui/en-us/role_actions.xml       |   13 +
 .../newview/skins/default/xui/en-us/strings.xml    |   23 +-
 .../indra/newview/skins/default/xui/es/alerts.xml  |   25 +-
 .../newview/skins/default/xui/es/floater_html.xml  |    3 +
 .../indra/newview/skins/default/xui/fr/alerts.xml  |   25 +-
 .../newview/skins/default/xui/fr/floater_html.xml  |    3 +
 .../indra/newview/skins/default/xui/ja/alerts.xml  |   36 +-
 .../newview/skins/default/xui/ja/floater_html.xml  |    3 +
 .../skins/default/xui/ja/floater_joystick.xml      |   14 +-
 .../skins/default/xui/ja/panel_region_estate.xml   |    3 -
 .../indra/newview/skins/default/xui/ko/alerts.xml  |   36 +-
 .../newview/skins/default/xui/ko/floater_html.xml  |    3 +
 .../skins/default/xui/ko/floater_joystick.xml      |    6 +
 .../skins/default/xui/ko/panel_region_estate.xml   |    3 -
 .../indra/newview/skins/default/xui/pt/alerts.xml  |   29 +-
 .../newview/skins/default/xui/pt/floater_html.xml  |    3 +
 .../indra/newview/skins/default/xui/pt/notify.xml  |    4 +-
 .../skins/default/xui/pt/panel_region_estate.xml   |    2 +-
 .../indra/newview/skins/default/xui/zh/alerts.xml  |   25 +-
 .../newview/skins/default/xui/zh/floater_html.xml  |    3 +
 linden/indra/newview/skins/silver/colors_base.xml  |    1 +
 .../skins/silver/xui/en-us/floater_about_land.xml  |   11 +-
 .../silver/xui/en-us/floater_live_lsleditor.xml    |    3 +
 .../silver/xui/en-us/floater_script_ed_panel.xml   |    2 +-
 .../skins/silver/xui/en-us/floater_tools.xml       |   36 +-
 linden/indra/newview/viewer_manifest.py            | 1084 +--
 linden/indra/test/CMakeLists.txt                   |  153 +
 .../indra/test/MacTester.xcodeproj/project.pbxproj | 1350 ----
 linden/indra/test/assembly_tut.cpp                 |   86 +
 linden/indra/test/common.cpp                       |   10 +-
 linden/indra/test/files.lst                        |   51 -
 linden/indra/test/inventory.cpp                    |   24 +-
 linden/indra/test/io.cpp                           |   14 +-
 linden/indra/test/llapp_tut.cpp                    |    2 +-
 linden/indra/test/llassetuploadqueue_tut.cpp       |  200 +
 linden/indra/test/llblowfish_tut.cpp               |   20 +-
 linden/indra/test/llcontrol_tut.cpp                |   12 +-
 linden/indra/test/lldir_tut.cpp                    |  264 +
 linden/indra/test/llerror_tut.cpp                  |   38 +-
 linden/indra/test/llhost_tut.cpp                   |   27 +-
 linden/indra/test/llhttpclient_tut.cpp             |    6 +-
 linden/indra/test/llhttpdate_tut.cpp               |   31 +-
 linden/indra/test/llinventoryparcel_tut.cpp        |   12 +-
 linden/indra/test/lliohttpserver_tut.cpp           |   21 +-
 linden/indra/test/llmessageconfig_tut.cpp          |    8 +-
 linden/indra/test/llmessagetemplateparser_tut.cpp  |    2 +-
 linden/indra/test/llnamevalue_tut.cpp              |    5 +
 linden/indra/test/llquaternion_tut.cpp             |    8 +-
 linden/indra/test/llsd_new_tut.cpp                 |   26 +-
 linden/indra/test/llsdmessagereader_tut.cpp        |    4 +
 linden/indra/test/llsdserialize_tut.cpp            |   16 +-
 linden/indra/test/llsdtraits.h                     |    4 -
 linden/indra/test/llsdutil_tut.cpp                 |    8 +-
 linden/indra/test/llstring_tut.cpp                 |  544 +-
 linden/indra/test/lltemplatemessagebuilder_tut.cpp |    4 +-
 linden/indra/test/lluri_tut.cpp                    |    5 +
 linden/indra/test/llxfer_tut.cpp                   |    8 +-
 linden/indra/test/message_tut.cpp                  |   49 +-
 linden/indra/test/mock_http_client.cpp             |   88 +
 linden/indra/test/mock_http_client.h               |  196 +
 linden/indra/test/test.cpp                         |   87 +-
 linden/indra/test/test.vcproj                      |  344 -
 linden/indra/test/test_llmanifest.py               |    3 +-
 linden/indra/test/test_vc8.vcproj                  |  455 --
 linden/indra/test/test_vc9.vcproj                  |  453 --
 linden/indra/test/v3dmath_tut.cpp                  |    8 +-
 linden/indra/test/v3math_tut.cpp                   |    2 +-
 linden/indra/test/v4color_tut.cpp                  |    4 +-
 linden/indra/test/v4coloru_tut.cpp                 |    2 +-
 linden/indra/test/v4math_tut.cpp                   |    8 +
 linden/indra/tools/vstool/README.txt               |    9 +
 linden/indra/tools/vstool/VSTool.csproj            |   95 +
 linden/indra/tools/vstool/VSTool.exe               |  Bin 0 -> 24576 bytes
 linden/indra/tools/vstool/VSTool.sln               |   19 +
 linden/indra/tools/vstool/main.cs                  |  711 ++
 linden/indra/win_crash_logger/CMakeLists.txt       |   83 +
 .../win_crash_logger/llcrashloggerwindows.cpp      |   12 +-
 .../indra/win_crash_logger/llcrashloggerwindows.h  |    2 +-
 .../indra/win_crash_logger/win_crash_logger.vcproj |  224 -
 .../win_crash_logger/win_crash_logger_vc8.vcproj   |  336 -
 .../win_crash_logger/win_crash_logger_vc9.vcproj   |  337 -
 linden/indra/win_updater/CMakeLists.txt            |   30 +
 linden/indra/win_updater/win_updater.vcproj        |  194 -
 linden/indra/win_updater/win_updater_vc8.vcproj    |  295 -
 linden/indra/win_updater/win_updater_vc9.vcproj    |  293 -
 linden/install.xml                                 | 1302 ++++
 linden/libraries/i686-win32/include/GL/README.txt  |    5 -
 linden/libraries/i686-win32/include/GL/glext.h     | 7271 --------------------
 linden/libraries/i686-win32/include/GL/glut.h      |  596 --
 linden/libraries/i686-win32/include/GL/glxext.h    |  785 ---
 linden/libraries/i686-win32/include/GL/wglext.h    |  648 --
 linden/libraries/include/GL/glh_extensions.h       |  207 -
 linden/libraries/include/GL/glh_genext.h           | 1671 -----
 linden/libraries/include/glh/glh_linear.h          | 1621 -----
 linden/libraries/include/llmozlib2.h               |  383 --
 linden/scripts/build_version.py                    |   54 +
 linden/scripts/install.py                          | 1086 +++
 linden/scripts/messages/message_template.msg       |   35 +-
 1348 files changed, 79113 insertions(+), 93572 deletions(-)
 create mode 100644 linden/doc/viewer-changes.txt
 create mode 100644 linden/indra/CMakeLists.txt
 delete mode 100644 linden/indra/SConstruct
 create mode 100644 linden/indra/cmake/00-Common.cmake
 create mode 100644 linden/indra/cmake/APR.cmake
 create mode 100644 linden/indra/cmake/Audio.cmake
 create mode 100644 linden/indra/cmake/BerkeleyDB.cmake
 create mode 100644 linden/indra/cmake/Boost.cmake
 create mode 100644 linden/indra/cmake/BuildVersion.cmake
 create mode 100644 linden/indra/cmake/CARes.cmake
 create mode 100644 linden/indra/cmake/CMakeCopyIfDifferent.cmake
 create mode 100644 linden/indra/cmake/CSharpMacros.cmake
 create mode 100644 linden/indra/cmake/CURL.cmake
 create mode 100644 linden/indra/cmake/CommonMiscLibs.cmake
 create mode 100644 linden/indra/cmake/CopyBackToSource.cmake
 create mode 100644 linden/indra/cmake/CopyWinLibs.cmake
 create mode 100644 linden/indra/cmake/DirectX.cmake
 create mode 100644 linden/indra/cmake/ELFIO.cmake
 create mode 100644 linden/indra/cmake/EXPAT.cmake
 create mode 100644 linden/indra/cmake/FMOD.cmake
 create mode 100644 linden/indra/cmake/FindAPR.cmake
 create mode 100644 linden/indra/cmake/FindBerkeleyDB.cmake
 create mode 100644 linden/indra/cmake/FindCARes.cmake
 create mode 100644 linden/indra/cmake/FindELFIO.cmake
 create mode 100644 linden/indra/cmake/FindGooglePerfTools.cmake
 create mode 100644 linden/indra/cmake/FindMono.cmake
 create mode 100644 linden/indra/cmake/FindMySQL.cmake
 create mode 100644 linden/indra/cmake/FindOpenJPEG.cmake
 create mode 100644 linden/indra/cmake/FindSCP.cmake
 create mode 100644 linden/indra/cmake/FindXmlRpcEpi.cmake
 create mode 100644 linden/indra/cmake/FreeType.cmake
 create mode 100644 linden/indra/cmake/GStreamer.cmake
 create mode 100644 linden/indra/cmake/GooglePerfTools.cmake
 create mode 100644 linden/indra/cmake/JPEG.cmake
 create mode 100644 linden/indra/cmake/LLAudio.cmake
 create mode 100644 linden/indra/cmake/LLCharacter.cmake
 create mode 100644 linden/indra/cmake/LLCommon.cmake
 create mode 100644 linden/indra/cmake/LLCrashLogger.cmake
 create mode 100644 linden/indra/cmake/LLDatabase.cmake
 create mode 100644 linden/indra/cmake/LLImage.cmake
 create mode 100644 linden/indra/cmake/LLImageJ2COJ.cmake
 create mode 100644 linden/indra/cmake/LLInventory.cmake
 create mode 100644 linden/indra/cmake/LLKDU.cmake
 create mode 100644 linden/indra/cmake/LLMath.cmake
 create mode 100644 linden/indra/cmake/LLMedia.cmake
 create mode 100644 linden/indra/cmake/LLMessage.cmake
 create mode 100644 linden/indra/cmake/LLPhysics.cmake
 create mode 100644 linden/indra/cmake/LLPrimitive.cmake
 create mode 100644 linden/indra/cmake/LLRender.cmake
 create mode 100644 linden/indra/cmake/LLScene.cmake
 create mode 100644 linden/indra/cmake/LLUI.cmake
 create mode 100644 linden/indra/cmake/LLVFS.cmake
 create mode 100644 linden/indra/cmake/LLWindow.cmake
 create mode 100644 linden/indra/cmake/LLXML.cmake
 create mode 100644 linden/indra/cmake/LScript.cmake
 create mode 100644 linden/indra/cmake/Linking.cmake
 create mode 100644 linden/indra/cmake/MonoDeps.cmake
 create mode 100644 linden/indra/cmake/MonoEmbed.cmake
 create mode 100644 linden/indra/cmake/Mozlib.cmake
 create mode 100644 linden/indra/cmake/MySQL.cmake
 create mode 100644 linden/indra/cmake/NDOF.cmake
 create mode 100644 linden/indra/cmake/OpenGL.cmake
 create mode 100644 linden/indra/cmake/OpenJPEG.cmake
 create mode 100644 linden/indra/cmake/OpenSSL.cmake
 create mode 100644 linden/indra/cmake/PNG.cmake
 create mode 100644 linden/indra/cmake/Prebuilt.cmake
 create mode 100644 linden/indra/cmake/Python.cmake
 create mode 100644 linden/indra/cmake/QuickTime.cmake
 create mode 100644 linden/indra/cmake/TemplateCheck.cmake
 create mode 100644 linden/indra/cmake/UI.cmake
 create mode 100644 linden/indra/cmake/UnixInstall.cmake
 create mode 100644 linden/indra/cmake/Variables.cmake
 create mode 100644 linden/indra/cmake/ViewerMiscLibs.cmake
 create mode 100644 linden/indra/cmake/XmlRpcEpi.cmake
 create mode 100644 linden/indra/cmake/ZLIB.cmake
 create mode 100644 linden/indra/copy_win_scripts/CMakeLists.txt
 create mode 100644 linden/indra/copy_win_scripts/start-client.py
 create mode 100755 linden/indra/develop.py
 delete mode 100644 linden/indra/indra_complete/indra_complete.sln
 delete mode 100644 linden/indra/indra_complete/indra_complete_vc8.sln
 delete mode 100644 linden/indra/indra_complete/indra_complete_vc9.sln
 create mode 100644 linden/indra/lib/python/indra/base/cllsd_test.py
 create mode 100644 linden/indra/lib/python/indra/ipc/siesta.py
 create mode 100644 linden/indra/lib/python/indra/ipc/siesta_test.py
 create mode 100644 linden/indra/lib/python/indra/util/fastest_elementtree.py
 create mode 100644 linden/indra/lib/python/indra/util/term.py
 create mode 100644 linden/indra/linux_crash_logger/CMakeLists.txt
 delete mode 100644 linden/indra/linux_crash_logger/files.lst
 create mode 100644 linden/indra/llaudio/CMakeLists.txt
 delete mode 100644 linden/indra/llaudio/files.lst
 delete mode 100644 linden/indra/llaudio/llaudio.vcproj
 delete mode 100644 linden/indra/llaudio/llaudio_vc8.vcproj
 delete mode 100644 linden/indra/llaudio/llaudio_vc9.vcproj
 create mode 100644 linden/indra/llcharacter/CMakeLists.txt
 delete mode 100644 linden/indra/llcharacter/files.lst
 delete mode 100644 linden/indra/llcharacter/llcharacter.vcproj
 delete mode 100644 linden/indra/llcharacter/llcharacter_vc8.vcproj
 delete mode 100644 linden/indra/llcharacter/llcharacter_vc9.vcproj
 create mode 100644 linden/indra/llcommon/CMakeLists.txt
 delete mode 100644 linden/indra/llcommon/files.lst
 delete mode 100644 linden/indra/llcommon/llares.cpp
 delete mode 100644 linden/indra/llcommon/llares.h
 delete mode 100644 linden/indra/llcommon/llcommon.vcproj
 delete mode 100644 linden/indra/llcommon/llcommon_vc8.vcproj
 delete mode 100644 linden/indra/llcommon/llcommon_vc9.vcproj
 create mode 100644 linden/indra/llcommon/llcrc.cpp
 create mode 100644 linden/indra/llcommon/llcrc.h
 create mode 100644 linden/indra/llcommon/llmd5.cpp
 create mode 100644 linden/indra/llcommon/llmd5.h
 create mode 100644 linden/indra/llcommon/llrand.cpp
 create mode 100644 linden/indra/llcommon/llrand.h
 create mode 100644 linden/indra/llcommon/lluuid.cpp
 create mode 100644 linden/indra/llcommon/lluuid.h
 create mode 100644 linden/indra/llcrashlogger/CMakeLists.txt
 delete mode 100644 linden/indra/llcrashlogger/files.lst
 create mode 100644 linden/indra/llimage/CMakeLists.txt
 delete mode 100644 linden/indra/llimage/files.lst
 delete mode 100644 linden/indra/llimage/llimage.vcproj
 delete mode 100644 linden/indra/llimage/llimage_vc8.vcproj
 delete mode 100644 linden/indra/llimage/llimage_vc9.vcproj
 create mode 100644 linden/indra/llimagej2coj/CMakeLists.txt
 delete mode 100644 linden/indra/llimagej2coj/files.lst
 delete mode 100755 linden/indra/llimagej2coj/llimagej2coj.vcproj
 create mode 100644 linden/indra/llinventory/CMakeLists.txt
 delete mode 100644 linden/indra/llinventory/files.lst
 delete mode 100644 linden/indra/llinventory/llinventory.vcproj
 delete mode 100644 linden/indra/llinventory/llinventory_vc8.vcproj
 delete mode 100644 linden/indra/llinventory/llinventory_vc9.vcproj
 create mode 100644 linden/indra/llmath/CMakeLists.txt
 delete mode 100644 linden/indra/llmath/files.lst
 delete mode 100644 linden/indra/llmath/llcrc.cpp
 delete mode 100644 linden/indra/llmath/llcrc.h
 delete mode 100644 linden/indra/llmath/llmath.vcproj
 delete mode 100644 linden/indra/llmath/llmath_vc8.vcproj
 delete mode 100644 linden/indra/llmath/llmath_vc9.vcproj
 delete mode 100644 linden/indra/llmath/llmd5.cpp
 delete mode 100644 linden/indra/llmath/llmd5.h
 delete mode 100644 linden/indra/llmath/llrand.cpp
 delete mode 100644 linden/indra/llmath/llrand.h
 create mode 100644 linden/indra/llmath/llsdutil_math.cpp
 delete mode 100644 linden/indra/llmath/lluuid.cpp
 delete mode 100644 linden/indra/llmath/lluuid.h
 create mode 100644 linden/indra/llmedia/CMakeLists.txt
 delete mode 100644 linden/indra/llmedia/files.lst
 delete mode 100644 linden/indra/llmedia/llmedia.vcproj
 delete mode 100644 linden/indra/llmedia/llmedia_vc8.vcproj
 delete mode 100644 linden/indra/llmedia/llmedia_vc9.vcproj
 create mode 100644 linden/indra/llmessage/CMakeLists.txt
 delete mode 100644 linden/indra/llmessage/files.lst
 create mode 100644 linden/indra/llmessage/llares.cpp
 create mode 100644 linden/indra/llmessage/llares.h
 delete mode 100644 linden/indra/llmessage/llmessage.vcproj
 delete mode 100644 linden/indra/llmessage/llmessage_vc8.vcproj
 delete mode 100644 linden/indra/llmessage/llmessage_vc9.vcproj
 create mode 100644 linden/indra/llprimitive/CMakeLists.txt
 delete mode 100644 linden/indra/llprimitive/files.lst
 delete mode 100644 linden/indra/llprimitive/llprimitive.vcproj
 delete mode 100644 linden/indra/llprimitive/llprimitive_vc8.vcproj
 delete mode 100644 linden/indra/llprimitive/llprimitive_vc9.vcproj
 create mode 100644 linden/indra/llrender/CMakeLists.txt
 delete mode 100644 linden/indra/llrender/files.darwin.lst
 delete mode 100644 linden/indra/llrender/files.lst
 create mode 100644 linden/indra/llrender/llcubemap.cpp
 create mode 100644 linden/indra/llrender/llcubemap.h
 create mode 100644 linden/indra/llrender/llgl.cpp
 create mode 100644 linden/indra/llrender/llgl.h
 create mode 100644 linden/indra/llrender/llglheaders.h
 create mode 100644 linden/indra/llrender/llglslshader.cpp
 create mode 100644 linden/indra/llrender/llglslshader.h
 create mode 100644 linden/indra/llrender/llglstates.h
 create mode 100644 linden/indra/llrender/llgltypes.h
 create mode 100644 linden/indra/llrender/llpostprocess.cpp
 create mode 100644 linden/indra/llrender/llpostprocess.h
 delete mode 100644 linden/indra/llrender/llrender.vcproj
 delete mode 100644 linden/indra/llrender/llrender_vc8.vcproj
 delete mode 100644 linden/indra/llrender/llrender_vc9.vcproj
 create mode 100644 linden/indra/llrender/llrendersphere.cpp
 create mode 100644 linden/indra/llrender/llrendersphere.h
 create mode 100644 linden/indra/llrender/llshadermgr.cpp
 create mode 100644 linden/indra/llrender/llshadermgr.h
 create mode 100644 linden/indra/llui/CMakeLists.txt
 delete mode 100644 linden/indra/llui/files.lst
 delete mode 100644 linden/indra/llui/llui.vcproj
 delete mode 100644 linden/indra/llui/llui_vc8.vcproj
 delete mode 100644 linden/indra/llui/llui_vc9.vcproj
 create mode 100644 linden/indra/llvfs/CMakeLists.txt
 delete mode 100755 linden/indra/llvfs/files.linux.lst
 delete mode 100644 linden/indra/llvfs/files.lst
 delete mode 100644 linden/indra/llvfs/files.sunos5.lst
 delete mode 100755 linden/indra/llvfs/files.win32.lst
 delete mode 100644 linden/indra/llvfs/llvfs.vcproj
 delete mode 100644 linden/indra/llvfs/llvfs_vc8.vcproj
 delete mode 100644 linden/indra/llvfs/llvfs_vc9.vcproj
 create mode 100644 linden/indra/llwindow/CMakeLists.txt
 create mode 100644 linden/indra/llwindow/GL/glh_extensions.h
 create mode 100644 linden/indra/llwindow/GL/glh_genext.h
 delete mode 100644 linden/indra/llwindow/files.darwin.lst
 delete mode 100644 linden/indra/llwindow/files.linux.lst
 delete mode 100644 linden/indra/llwindow/files.lst
 delete mode 100644 linden/indra/llwindow/files.sunos5.lst
 delete mode 100644 linden/indra/llwindow/files.win32.lst
 delete mode 100644 linden/indra/llwindow/llgl.cpp
 delete mode 100644 linden/indra/llwindow/llgl.h
 delete mode 100644 linden/indra/llwindow/llglheaders.h
 delete mode 100644 linden/indra/llwindow/llglstates.h
 delete mode 100644 linden/indra/llwindow/llgltypes.h
 delete mode 100644 linden/indra/llwindow/lllogitechlcd.cpp
 delete mode 100644 linden/indra/llwindow/lllogitechlcd.h
 delete mode 100644 linden/indra/llwindow/llwindow.vcproj
 delete mode 100644 linden/indra/llwindow/llwindow_vc8.vcproj
 delete mode 100644 linden/indra/llwindow/llwindow_vc9.vcproj
 create mode 100644 linden/indra/llxml/CMakeLists.txt
 delete mode 100644 linden/indra/llxml/files.lst
 delete mode 100644 linden/indra/llxml/llxml.vcproj
 delete mode 100644 linden/indra/llxml/llxml_vc8.vcproj
 delete mode 100644 linden/indra/llxml/llxml_vc9.vcproj
 create mode 100644 linden/indra/lscript/CMakeLists.txt
 delete mode 100644 linden/indra/lscript/files.lst
 create mode 100644 linden/indra/lscript/lscript_compile/CMakeLists.txt
 create mode 100644 linden/indra/lscript/lscript_compile/bison.bat
 delete mode 100644 linden/indra/lscript/lscript_compile/lscript_compile.vcproj
 delete mode 100755 linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj
 delete mode 100644 linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
 delete mode 100644 linden/indra/lscript/lscript_compile/lscript_compile_fb_vc9.vcproj
 delete mode 100644 linden/indra/lscript/lscript_compile/lscript_compile_ly.vcproj
 delete mode 100644 linden/indra/lscript/lscript_compile/lscript_compile_ly_vc8.vcproj
 delete mode 100644 linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
 delete mode 100644 linden/indra/lscript/lscript_compile/lscript_compile_vc9.vcproj
 create mode 100644 linden/indra/lscript/lscript_execute/CMakeLists.txt
 delete mode 100644 linden/indra/lscript/lscript_execute/lscript_execute.vcproj
 delete mode 100644 linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
 delete mode 100644 linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj
 create mode 100644 linden/indra/lscript/lscript_execute_mono/assembly.cpp
 create mode 100644 linden/indra/lscript/lscript_execute_mono/size.cpp
 create mode 100644 linden/indra/lscript/lscript_library/CMakeLists.txt
 delete mode 100644 linden/indra/lscript/lscript_library/lscript_library.vcproj
 delete mode 100644 linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
 delete mode 100644 linden/indra/lscript/lscript_library/lscript_library_vc9.vcproj
 create mode 100644 linden/indra/mac_crash_logger/CMakeLists.txt
 create mode 100644 linden/indra/mac_updater/CMakeLists.txt
 delete mode 100644 linden/indra/newview/AutoUpdater-Info.plist
 create mode 100644 linden/indra/newview/CMakeLists.txt
 delete mode 100644 linden/indra/newview/CrashReporter.nib/classes.nib
 delete mode 100644 linden/indra/newview/CrashReporter.nib/info.nib
 delete mode 100644 linden/indra/newview/CrashReporter.nib/objects.xib
 create mode 100644 linden/indra/newview/ViewerInstall.cmake
 delete mode 100644 linden/indra/newview/crashreporter-Info.plist
 delete mode 100644 linden/indra/newview/files.lst
 create mode 100644 linden/indra/newview/installers/darwin/firstlook-dmg/Applications-alias.r
 create mode 100644 linden/indra/newview/installers/darwin/firstlook-dmg/_DS_Store
 create mode 100644 linden/indra/newview/installers/darwin/firstlook-dmg/_VolumeIcon.icns
 create mode 100644 linden/indra/newview/installers/darwin/firstlook-dmg/background.jpg
 delete mode 100644 linden/indra/newview/installers/darwin/mac_image_DS_Store
 delete mode 100644 linden/indra/newview/installers/darwin/mac_image_background.tga
 delete mode 100644 linden/indra/newview/installers/darwin/mac_image_hidden
 create mode 100644 linden/indra/newview/installers/darwin/publicnightly-dmg/Applications-alias.r
 create mode 100644 linden/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store
 create mode 100644 linden/indra/newview/installers/darwin/publicnightly-dmg/_VolumeIcon.icns
 create mode 100644 linden/indra/newview/installers/darwin/publicnightly-dmg/background.jpg
 create mode 100644 linden/indra/newview/installers/darwin/release-dmg/Applications-alias.r
 create mode 100644 linden/indra/newview/installers/darwin/release-dmg/_DS_Store
 create mode 100644 linden/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
 create mode 100644 linden/indra/newview/installers/darwin/release-dmg/background.jpg
 create mode 100644 linden/indra/newview/installers/darwin/releasecandidate-dmg/Applications-alias.r
 create mode 100644 linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store
 create mode 100644 linden/indra/newview/installers/darwin/releasecandidate-dmg/_VolumeIcon.icns
 create mode 100644 linden/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg
 delete mode 100644 linden/indra/newview/linux_tools/exposed-symbols.txt
 create mode 100644 linden/indra/newview/llagentlanguage.cpp
 create mode 100644 linden/indra/newview/llagentlanguage.h
 create mode 100644 linden/indra/newview/llassetuploadqueue.cpp
 create mode 100644 linden/indra/newview/llassetuploadqueue.h
 delete mode 100644 linden/indra/newview/llcubemap.cpp
 delete mode 100644 linden/indra/newview/llcubemap.h
 create mode 100644 linden/indra/newview/llfloatermemleak.cpp
 create mode 100644 linden/indra/newview/llfloatermemleak.h
 delete mode 100644 linden/indra/newview/llfloaterreleasemsg.cpp
 delete mode 100644 linden/indra/newview/llfloaterreleasemsg.h
 delete mode 100644 linden/indra/newview/llglslshader.cpp
 delete mode 100644 linden/indra/newview/llglslshader.h
 delete mode 100644 linden/indra/newview/llhippo.cpp
 delete mode 100644 linden/indra/newview/llhippo.h
 delete mode 100644 linden/indra/newview/lllcd.cpp
 delete mode 100644 linden/indra/newview/lllcd.h
 delete mode 100644 linden/indra/newview/llpostprocess.cpp
 delete mode 100644 linden/indra/newview/llpostprocess.h
 delete mode 100644 linden/indra/newview/llrendersphere.cpp
 delete mode 100644 linden/indra/newview/llrendersphere.h
 create mode 100644 linden/indra/newview/llviewershadermgr.cpp
 create mode 100644 linden/indra/newview/llviewershadermgr.h
 create mode 100644 linden/indra/newview/macview.r
 delete mode 100644 linden/indra/newview/macview.xcodeproj/default.pbxuser
 delete mode 100644 linden/indra/newview/macview.xcodeproj/project.pbxproj
 delete mode 100644 linden/indra/newview/mozilla-theme/classic.jar
 delete mode 100644 linden/indra/newview/mozilla-theme/classic.manifest
 delete mode 100644 linden/indra/newview/newview.vcproj
 delete mode 100644 linden/indra/newview/newview_vc8.vcproj
 delete mode 100644 linden/indra/newview/newview_vc9.vcproj
 delete mode 100644 linden/indra/newview/postbuild.bat
 delete mode 100755 linden/indra/newview/prebuild.bat
 delete mode 100644 linden/indra/newview/releasenotes.txt
 delete mode 100644 linden/indra/newview/res/newViewRes.rc
 create mode 100644 linden/indra/newview/res/viewerRes.rc
 delete mode 100644 linden/indra/newview/secondlife setup build A08T01.bat
 delete mode 100644 linden/indra/newview/secondlife setup build B08T01.bat
 delete mode 100644 linden/indra/newview/secondlife setup build aditi.bat
 delete mode 100644 linden/indra/newview/secondlife setup build agni.bat
 delete mode 100644 linden/indra/newview/secondlife setup build aruna.bat
 delete mode 100644 linden/indra/newview/secondlife setup build dmz.bat
 delete mode 100644 linden/indra/newview/secondlife setup build durga.bat
 delete mode 100644 linden/indra/newview/secondlife setup build firstlookwindlight.bat
 delete mode 100644 linden/indra/newview/secondlife setup build ganga.bat
 delete mode 100644 linden/indra/newview/secondlife setup build mitra.bat
 delete mode 100644 linden/indra/newview/secondlife setup build mohini.bat
 delete mode 100644 linden/indra/newview/secondlife setup build nandi.bat
 delete mode 100644 linden/indra/newview/secondlife setup build radha.bat
 delete mode 100644 linden/indra/newview/secondlife setup build ravi.bat
 delete mode 100644 linden/indra/newview/secondlife setup build release candidate.bat
 delete mode 100644 linden/indra/newview/secondlife setup build shakti.bat
 delete mode 100644 linden/indra/newview/secondlife setup build siva.bat
 delete mode 100644 linden/indra/newview/secondlife setup build soma.bat
 delete mode 100644 linden/indra/newview/secondlife setup build uma.bat
 delete mode 100644 linden/indra/newview/secondlife setup build vaak.bat
 delete mode 100644 linden/indra/newview/secondlife setup build voicebeta.bat
 delete mode 100644 linden/indra/newview/secondlife setup build voicefirstlook.bat
 delete mode 100644 linden/indra/newview/secondlife setup build yami.bat
 delete mode 100644 linden/indra/newview/secondlife setup build.bat
 delete mode 100644 linden/indra/newview/skins/default/xui/en-us/LCD_text.xml
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_mem_leaking.xml
 delete mode 100644 linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml
 create mode 100644 linden/indra/test/CMakeLists.txt
 delete mode 100644 linden/indra/test/MacTester.xcodeproj/project.pbxproj
 create mode 100644 linden/indra/test/assembly_tut.cpp
 delete mode 100644 linden/indra/test/files.lst
 create mode 100644 linden/indra/test/llassetuploadqueue_tut.cpp
 create mode 100644 linden/indra/test/lldir_tut.cpp
 create mode 100644 linden/indra/test/mock_http_client.cpp
 create mode 100644 linden/indra/test/mock_http_client.h
 delete mode 100644 linden/indra/test/test.vcproj
 delete mode 100644 linden/indra/test/test_vc8.vcproj
 delete mode 100644 linden/indra/test/test_vc9.vcproj
 create mode 100644 linden/indra/tools/vstool/README.txt
 create mode 100644 linden/indra/tools/vstool/VSTool.csproj
 create mode 100755 linden/indra/tools/vstool/VSTool.exe
 create mode 100644 linden/indra/tools/vstool/VSTool.sln
 create mode 100644 linden/indra/tools/vstool/main.cs
 create mode 100644 linden/indra/win_crash_logger/CMakeLists.txt
 delete mode 100644 linden/indra/win_crash_logger/win_crash_logger.vcproj
 delete mode 100644 linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj
 delete mode 100644 linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj
 create mode 100644 linden/indra/win_updater/CMakeLists.txt
 delete mode 100644 linden/indra/win_updater/win_updater.vcproj
 delete mode 100644 linden/indra/win_updater/win_updater_vc8.vcproj
 delete mode 100644 linden/indra/win_updater/win_updater_vc9.vcproj
 create mode 100644 linden/install.xml
 delete mode 100644 linden/libraries/i686-win32/include/GL/README.txt
 delete mode 100644 linden/libraries/i686-win32/include/GL/glext.h
 delete mode 100644 linden/libraries/i686-win32/include/GL/glut.h
 delete mode 100644 linden/libraries/i686-win32/include/GL/glxext.h
 delete mode 100644 linden/libraries/i686-win32/include/GL/wglext.h
 delete mode 100644 linden/libraries/include/GL/glh_extensions.h
 delete mode 100644 linden/libraries/include/GL/glh_genext.h
 delete mode 100755 linden/libraries/include/glh/glh_linear.h
 delete mode 100644 linden/libraries/include/llmozlib2.h
 create mode 100755 linden/scripts/build_version.py
 create mode 100755 linden/scripts/install.py

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index da98604..ea5ba5d 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -79,6 +79,7 @@ bushing Spatula
 	VWR-424
 Carjay McGinnis
 	VWR-3737
+	VWR-6154
 Catherine Pfeffer
 	VWR-1282
 Dale Glass
@@ -121,12 +122,16 @@ Farallon Greyskin
 Feep Larsson
 	VWR-447
 	VWR-1314
+	VWR-4444
+Fluf Fredriksson
+	VWR-3450
 Fremont Cunningham
 	VWR-1147
 Gudmund Shepherd
 	VWR-1873
 Gigs Taggart
 	SVC-493
+	VWR-6
 	VWR-38
 	VWR-71
 	VWR-101
@@ -141,7 +146,9 @@ Gigs Taggart
 	VWR-1434
 	VWR-1987
 	VWR-2065
+	VWR-2491
 	VWR-2502
+	VWR-2331
 Ginko Bayliss
 	VWR-4
 Grazer Kline
@@ -152,6 +159,7 @@ Gudmund Shepherd
 Hamncheese Omlet
 	VWR-333
 Henri Beauchamp
+	VWR-1320
 	VWR-1406
 	VWR-4157
 Hikkoshi Sakai
@@ -178,6 +186,8 @@ Jacek Antonelli
 	VWR-597
 	VWR-2448
 	VWR-3605
+JB Kraft
+  VWR-5283
 Joghert LeSabre
 	VWR-64
 Kage Pixel
@@ -200,6 +210,9 @@ Michelle2 Zenovka
 	VWR-2652
 	VWR-2834
 	VWR-3749
+	VWR-4506
+	VWR-7831
+	VWR-4022
 Mm Alder
 	VWR-3777
 	VWR-4794
@@ -260,6 +273,7 @@ Nicholaz Beresford
 	VWR-1721
 	VWR-1723
 	VWR-1732
+	VWR-1754
 	VWR-1769
 	VWR-1808
 	VWR-1861
@@ -369,6 +383,7 @@ Wilton Lundquist
 Whoops Babii
 	VWR-631
 	VWR-1640
+	VWR-3340
 Zarkonnen Decosta
 	VWR-253
 Zi Ree
diff --git a/linden/doc/releasenotes-where.txt b/linden/doc/releasenotes-where.txt
index 89125d2..4af5866 100644
--- a/linden/doc/releasenotes-where.txt
+++ b/linden/doc/releasenotes-where.txt
@@ -1,5 +1,5 @@
 For full release notes, see:
-	indra/newview/releasenotes.txt
-
-This is the same asset sourced by the viewer for displaying release notes.
+	http://wiki.secondlife.com/wiki/Release_Notes
 
+For a log of viewer changes, see:
+	doc/viewer-changes.txt
diff --git a/linden/doc/viewer-changes.txt b/linden/doc/viewer-changes.txt
new file mode 100644
index 0000000..e69de29
diff --git a/linden/etc/message.xml b/linden/etc/message.xml
index 701d049..80dc560 100644
--- a/linden/etc/message.xml
+++ b/linden/etc/message.xml
@@ -360,6 +360,14 @@
 					<boolean>true</boolean>
 				</map>
 				
+				<key>ParcelObjectOwnersReply</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+
 				<key>ParcelProperties</key>
 				<map>
 					<key>flavor</key>
@@ -368,6 +376,14 @@
 					<boolean>true</boolean>
 				</map>
 
+				<key>LandStatReply</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+
 				<key>avatarnotesrequest</key>
 				<map>
 					<key>service_name</key>
@@ -433,6 +449,14 @@
 					<key>trusted-sender</key>
 					<boolean>false</boolean>
 				</map>
+				
+				<key>LandStatReply</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>false</boolean>
+				</map>
 
 				<key>StartGroupProposal</key>
 				<map>
@@ -477,7 +501,7 @@
 			<boolean>false</boolean>
 
 			<key>UpdateScriptAgentInventory</key>
-			<boolean>true</boolean>
+			<boolean>false</boolean>
 
 			<key>UpdateGestureTaskInventory</key>
 			<boolean>false</boolean>
@@ -486,7 +510,7 @@
 			<boolean>true</boolean>
 
 			<key>UpdateScriptTaskInventory</key>
-			<boolean>true</boolean>
+			<boolean>false</boolean>
 
 			<key>ViewerStartAuction</key>
 			<boolean>true</boolean>
diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt
new file mode 100644
index 0000000..fac2afa
--- /dev/null
+++ b/linden/indra/CMakeLists.txt
@@ -0,0 +1,102 @@
+# -*- cmake -*-
+
+# cmake_minimum_required should appear before any
+# other commands to guarantee full compatibility
+# with the version specified
+
+# The "cmake -E touch" command was released with 2.4.8.
+cmake_minimum_required(VERSION 2.4.8 FATAL_ERROR)
+
+# This makes cmake 2.6 not complain about a version
+# 2.4 compatibility mode
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0003 OLD)
+endif(COMMAND cmake_policy)
+
+project(SecondLife)
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+include(Variables)
+
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
+endif (NOT CMAKE_BUILD_TYPE)
+
+# For the library installation process;
+# see cmake/Prebuild.cmake for the counterpart code.
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/temp)
+file(WRITE ${CMAKE_BINARY_DIR}/temp/sentinel_installed "0")
+add_subdirectory(cmake)
+
+add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
+add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
+add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
+add_subdirectory(${LIBS_OPEN_PREFIX}llimage)
+add_subdirectory(${LIBS_OPEN_PREFIX}llimagej2coj)
+add_subdirectory(${LIBS_OPEN_PREFIX}llinventory)
+add_subdirectory(${LIBS_OPEN_PREFIX}llmath)
+add_subdirectory(${LIBS_OPEN_PREFIX}llmedia)
+add_subdirectory(${LIBS_OPEN_PREFIX}llmessage)
+add_subdirectory(${LIBS_OPEN_PREFIX}llprimitive)
+add_subdirectory(${LIBS_OPEN_PREFIX}llrender)
+add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
+add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
+add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
+
+if (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE)
+  add_subdirectory(${LIBS_CLOSED_PREFIX}llkdu)
+endif (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE)
+
+add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
+
+if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
+  add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts)
+endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
+
+add_custom_target(viewer)
+if (VIEWER)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llui)
+
+  if (LINUX)
+    add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)
+    add_dependencies(viewer linux-crash-logger)
+  elseif (DARWIN)
+    add_subdirectory(${VIEWER_PREFIX}mac_crash_logger)
+    add_subdirectory(${VIEWER_PREFIX}mac_updater)
+    add_dependencies(viewer mac-updater mac-crash-logger)
+  elseif (WINDOWS)
+    add_subdirectory(${VIEWER_PREFIX}win_crash_logger)
+    add_subdirectory(${VIEWER_PREFIX}win_updater)
+    add_dependencies(viewer windows-updater windows-crash-logger)
+  elseif (SOLARIS)
+    add_subdirectory(solaris_crash_logger)
+    add_dependencies(viewer solaris-crash-logger)
+  endif (LINUX)
+
+  add_subdirectory(${VIEWER_PREFIX}newview)
+  add_dependencies(viewer secondlife-bin)
+endif (VIEWER)
+
+# Linux builds the viewer and server in 2 separate projects
+# In order for ./develop.py build server to work on linux, 
+# the viewer project needs a server target.
+# This is not true for mac and windows.
+if (LINUX) 
+  add_custom_target(server)
+endif (LINUX)
+if (SERVER)
+  if (NOT LINUX)
+    add_custom_target(server)
+  endif (NOT LINUX)
+  include(${SERVER_PREFIX}Server.cmake)
+endif (SERVER)
+
+# Windows builds include tools like VFS tool
+if (SERVER)
+  if (WINDOWS)
+    add_subdirectory(${SERVER_PREFIX}tools)
+  endif (WINDOWS)
+endif (SERVER)
diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct
deleted file mode 100644
index 9353317..0000000
--- a/linden/indra/SConstruct
+++ /dev/null
@@ -1,895 +0,0 @@
-################################################# -*- python -*-
-#
-#  SConstruct makefile for Second Life viewer and servers.
-#
-#  To build everything:
-#
-#    scons ARCH=all BTARGET=all DISTCC=yes
-#
-# To build a standalone viewer, you'll need the following packages
-# installed, with headers.  We pick up the correct flags to use for
-# these libraries using the "pkg-config" command.
-#
-#    cairo glib-2.0 atk gmobile-2.0 gdk-2.0 gdk-pixbuf-2.0 pango pangoft2 pangox pangoxft gtk+-2.0 sdl vorbis vorbisenc vorbisfile
-#
-# Then build as follows:
-#
-#    scons BTARGET=client STANDALONE=yes MOZLIB2=no ELFIO=no DISTCC=no
-#
-#  For help on options:
-#
-#    scons -h
-#
-#  Originally written by Tom Yedwab, 6/2006.
-#
-#################################################
-
-
-import glob
-import os
-import random
-import re
-import sys
-
-platform = sys.platform
-if platform == 'linux2':
-    platform = 'linux'
-
-######################
-# GET VERSION        #
-######################
-
-def get_version(type):
-    file = open('llcommon/llversion%s.h' % type,"r")
-    file_str = file.read()
-    file.close()
-
-    m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', file_str)
-    VER_MAJOR = m.group(1)
-    m = re.search('const S32 LL_VERSION_MINOR = (\d+);', file_str)
-    VER_MINOR = m.group(1)
-    m = re.search('const S32 LL_VERSION_PATCH = (\d+);', file_str)
-    VER_PATCH = m.group(1)
-    m = re.search('const S32 LL_VERSION_BUILD = (\d+);', file_str)
-    VER_BUILD = m.group(1)
-    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_BUILD)s" % locals()
-
-    return version
-
-version_viewer = get_version('viewer')
-version_server = get_version('server')
-
-
-###############
-# SYSTEM INFO #
-###############
-
-# Debian Sarge has a broken glibc that leads to build failures on
-# *non*-Sarge systems (because of prebuilt static libraries built on
-# Sarge).
-
-try:
-    debian_sarge = open('/etc/debian_version').read().strip() == '3.1'
-except:
-    debian_sarge = False
-
-#########################
-# COMMAND LINE OPTIONS  #
-#########################
-
-DEFAULT_CHANNEL='Release' # TODO: Make this the full channel name, i.e. "Second Life Release"
-
-
-opts = Options()
-opts.AddOptions(
-    EnumOption('BUILD', 'Set build type', 'releasefordownload',
-        allowed_values=('debug', 'release', 'releasenoopt', 'releasefordownload')),
-    EnumOption('ARCH', 'Set architecture', 'i686',
-        allowed_values=('i686', 'powerpc', 'x86_64')),
-    EnumOption('BTARGET', 'Set build target', 'server',
-        allowed_values=('client', 'server', 'all')),
-    BoolOption('DISTCC', 'Enabled distcc', True),
-    BoolOption('MOZLIB2', 'Enabled llmozlib2/mozilla support', True),
-    BoolOption('FMOD', 'Enabled FMOD audio support', True),
-    BoolOption('GSTREAMER', 'Enabled GStreamer support', True),
-    BoolOption('COLORGCC', 'Enabled colorgcc', True),
-    EnumOption('GRID', 'Client package\'s default grid', 'default',
-        allowed_values=('default', 'aditi', 'agni', 'durga', 'ganga', 'shakti', 'siva', 'soma', 'uma', 'vaak', 'yami', 'mohini', 'aruna', 'mitra', 'nandi', 'radha', 'ravi')),
-              ('CHANNEL', 'Client package\'s channel', DEFAULT_CHANNEL),
-              ('LOGINCHANNEL', 'Client package\'s channel for login only', False),
-    BoolOption('ELFIO', 'Enabled enhanced backtraces with libELFIO symbol extraction support', True),
-    BoolOption('STANDALONE', 'Build using system packages (implies OPENSOURCE)', False),
-    BoolOption('RUNTESTS', 'Run tests at end of compilation', True),
-    BoolOption('OPENSOURCE', 'Build using only non-proprietary dependencies', True) # OPENSOURCE: do not edit this line
-)
-optenv = Environment(options = opts)
-Help(opts.GenerateHelpText(optenv))
-
-build_param = optenv['BUILD']
-arch = optenv['ARCH']
-target_param = optenv['BTARGET']
-enable_distcc = optenv['DISTCC']
-enable_mozlib = optenv['MOZLIB2']
-enable_gstreamer = optenv['GSTREAMER']
-enable_colorgcc = optenv['COLORGCC']
-grid = optenv['GRID']
-channel = optenv['CHANNEL']
-login_channel = optenv['LOGINCHANNEL']
-standalone = optenv['STANDALONE']
-runtests = optenv['RUNTESTS']
-opensource = standalone or optenv['OPENSOURCE']
-enable_fmod = not opensource and optenv['FMOD']
-elfio = optenv['ELFIO']
-
-targets = [ target_param ]
-
-if target_param == 'all':
-    targets = [ 'client', 'server' ]
-
-# Set this to False if you don't want your source files copied into
-# the object directory in /tmp.
-duplicate = True
-
-if standalone and platform != 'linux':
-    print >> sys.stderr, 'Warning: standalone builds have only been tested on Linux'
-
-standalone_pkgs = [
-    'atk',
-    'cairo',
-    'fontconfig',
-    'freetype2',
-    'gdk-2.0',
-    'gdk-pixbuf-2.0',
-    'glib-2.0',
-    'gmodule-2.0',
-    'gthread-2.0',
-    'gtk+-2.0',
-    'libpng',
-    'pango',
-    'pangoft2',
-    'pangox',
-    'pangoxft',
-    'sdl',
-    'vorbis',
-    'vorbisenc',
-    'vorbisfile',
-    ]
-
-standalone_net_pkgs = [
-    'apr-1',
-    'apr-util-1',
-    'libcrypto',
-    'libcurl',
-    'libssl',
-    ]
-
-def pkgconfig(opt, pkgs=None):
-    if pkgs is None:
-        pkgs = standalone_pkgs + standalone_net_pkgs
-    return os.popen('pkg-config %s %s' %
-                    (opt, ' '.join(pkgs))).read().strip()
-
-if standalone:
-    missing = [pkg for pkg in standalone_pkgs + standalone_net_pkgs
-               if os.system('pkg-config --exists ' + pkg)]
-    if missing:
-        print >> sys.stderr, ('Error: pkg-config cannot find these '
-                              'packages: %s' % ' '.join(missing))
-        sys.exit(2)
-
-#####################
-# ITERATE TARGETS   #
-#####################
-
-for build_target in targets:
-    buildtype = build_param
-    if build_target == 'server' and buildtype == 'releasefordownload':
-        buildtype = 'release'
-
-    system_str = arch + '-' + platform
-
-    print 'Building ' + build_target + ' ' + version_server + ' on ' + system_str + ' (' + buildtype + ')'
-
-    system_lib_dir = '../libraries/' + system_str 
-    havok_lib_dir = '../libraries/' + system_str 
-    lib_dir = './lib_' + buildtype + '_' + build_target + '/' + system_str
-
-    if build_target == 'client':
-        system_lib_dir += '/lib_release_client'
-    elif buildtype == 'debug':
-        havok_lib_dir += '/lib_debug/havok/hk460'
-        system_lib_dir += '/lib_debug'
-        lib_dir = './lib_debug_' + build_target + '/' + system_str
-    else:
-        havok_lib_dir += '/lib_release/havok/hk460'
-        system_lib_dir += '/lib_release'
-        lib_dir = './lib_release_' + build_target + '/' + system_str
-
-    try:
-        build_dir_prefix = os.environ['TEMP_BUILD_DIR']
-    except:
-        build_dir_prefix = '/tmp/' + os.environ['USER']
-        
-    build_dir = build_dir_prefix + os.getcwd() + '/' + system_str + '-' + build_target + '-' + buildtype
-
-    ### Base include directories ###
-
-    include_dirs = Split("""
-        ./ ./llcommon ./llmath ./llwindow ./llaudio ./llcharacter ./llcrashlogger
-        ./lldatabase ./llimage ./llinventory ./llmedia ./llmessage ./llphysics
-        ./llprimitive ./llrender ./llscene ./llui ./llvfs ./llwindow
-        ./llxml ./lscript ./lscript/lscript_compile
-        ../libraries/include
-        """ +
-        '../libraries/' + system_str + '/include' )
-
-    client_external_libs = []
-    system_link_flags = ''
-
-    include_dirs += Split('../libraries/include/havok/hk460/physics ../libraries/include/havok/hk460/common ')
-
-    if platform != 'linux' and build_target == 'client' and enable_mozlib:
-
-        ### Mozilla include directories ###
-
-        mozilla_dir = '../libraries/' + system_str + '/include/mozilla'
-        include_dirs += Split(
-            mozilla_dir + '/include/webbrwsr ' +
-            mozilla_dir + '/include/docshell ' +
-            mozilla_dir + '/include/dom ' +
-            mozilla_dir + '/include/xpcom ' +
-            mozilla_dir + '/include/widget ' +
-            mozilla_dir + '/include/gfx ' +
-            mozilla_dir + '/include/string ' +
-            mozilla_dir + '/include/uriloader ' +
-            mozilla_dir + '/include/view ' +
-            mozilla_dir + '/include/layout ' +
-            mozilla_dir + '/include/content ' +
-            mozilla_dir + '/include/locale ' +
-            mozilla_dir + '/include/profdirserviceprovider ' +
-            mozilla_dir + '/include/xulapp ' +
-            mozilla_dir + '/include/pref ' +
-            mozilla_dir + '/sdk/include')
-
-    ##############
-    # CPP Flags  #
-    ##############
-
-    # Generic GCC flags
-    # cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '
-    cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
-    cxxflags = ''
-    #cppflags = '-D_FORTIFY_SOURCE=2 '
-    cppflags = ''
-    if standalone:
-        cppflags += '-DLL_STANDALONE '
-
-    if arch == 'i686':
-        cflags += '-m32 '
-        system_link_flags += '-m32 '
-
-    if build_target == 'server':
-        # Server flags
-        cppflags += '-D_GNU_SOURCE -DLL_MESA_HEADLESS=1 -DLL_MESA=1 '
-        cxxflags += '-ftemplate-depth-60 '
-        if arch == 'i686':
-            cflags += '-march=pentiumpro '
-        if debian_sarge:
-            def_server_cppflags = ''
-        else:
-            def_server_cppflags = '-DCTYPE_WORKAROUND'
-        server_cppflags = os.environ.get('SERVER_CPPFLAGS',
-                                         def_server_cppflags)
-        cppflags += server_cppflags + ' '
-    else:
-        # Viewer flags
-        cflags += '-pthread -D_REENTRANT -fno-math-errno -fsigned-char -fno-strict-aliasing '
-        cppflags += '-DLL_MESA_HEADLESS=0 -DLL_MESA=0 '
-        try:
-            client_cppflags = os.environ['CLIENT_CPPFLAGS']
-        except:
-            client_cppflags = ''
-        cppflags += client_cppflags + ' '
-
-
-    if platform == 'linux':
-        # Linux-only flags
-        cppflags += '-DLL_LINUX=1 '
-        if build_target == 'client':
-            cppflags += '-DAPPID=secondlife -DLL_SDL=1 '
-            if arch == 'x86_64' or arch == 'x86_64cross' or not enable_fmod:
-                cppflags += '-DLL_FMOD=0 '
-            cppflags += '-DLL_X11=1 -DLL_GTK=1 '
-            if standalone:
-                include_dirs += [d[2:] for d in
-                                 pkgconfig('--cflags-only-I').split()]
-		client_external_libs += [ 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt']
-            else:
-                client_external_libs += [ 'fontconfig', 'gtk-x11-2.0', 'atk-1.0', 'gmodule-2.0', 'gdk-x11-2.0', 'gdk_pixbuf-2.0', 'pango-1.0', 'pangoft2-1.0', 'pangox-1.0', 'pangoxft-1.0', 'Xinerama', 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt' ]
-                incdirs = [ 'ELFIO', 'atk-1.0', 'glib-2.0', 'gtk-2.0',
-                            'llfreetype2', 'pango-1.0' ]
-                include_dirs += ['../libraries/' + system_str + '/include/' + d
-                                 for d in incdirs]
-
-            if elfio:
-                client_external_libs += [ 'ELFIO' ]
-            else:
-                cppflags += '-DLL_ELFBIN=0 '
-
-            # llmozlib2 stuff
-            if enable_mozlib:
-                cppflags += '-DLL_LLMOZLIB_ENABLED=1 '
-                client_external_libs += [ 'llmozlib2' ]
-                client_external_libs += [ 'mozjs', 'nspr4', 'plc4', 'plds4', 'profdirserviceprovider_s', 'xul' ]
-            else:
-                cppflags += '-DLL_LLMOZLIB_ENABLED=0 '
-
-            # GStreamer stuff
-            if enable_gstreamer:
-                cppflags += '-DLL_GSTREAMER_ENABLED=1 '
-                client_external_libs += [ 'glib-2.0', 'gobject-2.0', 'gthread-2.0' ]
-                include_dirs += [ '../libraries/' + system_str + '/include/gstreamer-0.10' ]
-                include_dirs += [ '../libraries/' + system_str + '/include/glib-2.0', '../libraries/' + system_str + '/include/glib-2.0/include' ]
-                include_dirs += [ '../libraries/' + system_str + '/include/libxml2']
-            else:
-                cppflags += '-DLL_GSTREAMER_ENABLED=0 '
-
-        cppflags += '-DLL_CURRENT_HAVOK_VERSION=460 '
-    else:
-        # Mac-only flags
-        cflags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -Wmost -Wno-sign-compare -Wno-switch -fconstant-cfstrings -ffor-scope -Wno-reorder -fexceptions '
-        cppflags += '-x c++ -DLL_DARWIN=1 -fpch-preprocess -F./newview/build/Deployment -fconstant-cfstrings -isysroot /Developer/SDKs/MacOSX10.3.9.sdk '
-
-    if standalone:
-        gcc_bin = 'g++'
-    elif build_target != 'client':
-        gcc_bin = 'g++-3.3'
-    elif arch == 'x86_64cross':
-        gcc_bin = '/opt/crosstool/gcc-4.0.2-glibc-2.3.6/x86_64-unknown-linux-gnu/bin/x86_64-unknown-linux-gnu-gcc'
-        strip_cmd = '/opt/crosstool/gcc-4.0.2-glibc-2.3.6/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/bin/strip -S -o $TARGET $SOURCE'
-
-    else:
-        gcc_bin = 'g++-4.1'
-
-    # Are we using the Intel compiler?
-    if gcc_bin.find('icpc') >= 0:
-        cflags += '-wr193,654,981,1125 -w1 '
-    elif build_target == 'client':
-        cflags += '-falign-loops=16 -ffast-math '
-
-    cxxflags += cflags
-
-    ### Build type-specific flags ###
-
-    debug_cflags = cflags + '-fno-inline -O0 '
-    debug_cxxflags = cxxflags + '-fno-inline -O0 '
-    debug_cppflags = cppflags + '-D_DEBUG -DLL_DEBUG=1 '
-    release_cflags = cflags + '-O2 '
-    release_cxxflags = cxxflags + '-O2 '
-    release_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 '
-    releasenoopt_cflags = cflags + '-O0 '
-    releasenoopt_cxxflags = cxxflags + '-O0 '
-    releasenoopt_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 '
-    releasefordownload_cflags = cflags + '-O2 -fno-stack-protector '
-    releasefordownload_cxxflags = cxxflags + '-O2 -fno-stack-protector '
-    releasefordownload_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
-
-    ################
-    # ENVIRONMENT  #
-    ################
-
-    # If you strip more aggressively than -S then the quality of crash-
-    # logger backtraces deteriorates.
-    strip_cmd = 'strip -S -o $TARGET $SOURCE'
-
-    # hidesyms_cmd is something which copies an executable while 'hiding'
-    # all of its exposed symbols except a very few desired ones.  This is
-    # used mainly to hide the symbols of the many common libraries we
-    # static-link, which otherwise cause hard-to-trace fatal crashes due
-    # to clashes in the run-time symbol namespace.
-    if platform == 'linux':
-        exposed_symbols_file = 'newview/linux_tools/exposed-symbols.txt'
-        hidesyms_cmd = 'objcopy --keep-global-symbols ' + exposed_symbols_file + ' $SOURCE $TARGET'
-    else:
-        hidesyms_cmd = 'cp -f $SOURCE $TARGET'
-
-    compiler = gcc_bin 
-    compiler_no_distcc = compiler
-    if enable_distcc:
-        compiler = 'distcc ' + gcc_bin
-
-    lib_path = [lib_dir] + [system_lib_dir]
-
-    mysql_lib_dir = '/usr/lib/mysql4/mysql'
-    if os.path.isdir(mysql_lib_dir):
-        lib_path.append(mysql_lib_dir)
-
-    if standalone:
-        system_link_flags += pkgconfig('--libs-only-L') + ' '
-        system_link_flags += pkgconfig('--libs-only-other') + ' '
-
-    base_env = Environment(CXX = compiler,
-            CPPPATH = include_dirs,
-            LIBPATH = lib_path + [havok_lib_dir],
-            LINKFLAGS = system_link_flags + '--no-keep-memory --reduce-memory-overheads ' )
-
-    ### Environments for various build types ###
-
-    env = base_env.Copy(CFLAGS=releasefordownload_cflags,
-                        CPPFLAGS=releasefordownload_cppflags,
-                        CXXFLAGS=releasefordownload_cxxflags)
-
-    if buildtype == 'debug':
-        env = base_env.Copy(CFLAGS=debug_cflags,
-                            CPPFLAGS=debug_cppflags,
-                            CXXFLAGS=debug_cxxflags)
-
-    if buildtype == 'havok1debug':
-        env = base_env.Copy(CFLAGS=debug_cflags,
-                            CPPFLAGS=debug_cppflags,
-                            CXXFLAGS=debug_cxxflags)
-
-    if buildtype == 'release':
-        env = base_env.Copy(CFLAGS=release_cflags,
-                            CPPFLAGS=release_cppflags,
-                            CXXFLAGS=release_cxxflags)
-
-    if buildtype == 'releasenoopt':
-        env = base_env.Copy(CFLAGS=releasenoopt_cflags,
-                            CPPFLAGS=releasenoopt_cppflags,
-                            CXXFLAGS=releasenoopt_cxxflags)
-
-    # ccache needs this to be set
-    try:
-        env['ENV']['CCACHE_DIR'] = os.environ['CCACHE_DIR']
-    except:
-        print "No CCACHE_DIR set."
-
-    env_no_distcc = env.Copy(CXX = compiler_no_distcc)
-
-    vec_match	= re.compile("_vec\.")
-    env_vec = env.Copy()	# _vec is for default vector optimizations or none
-
-    sse_match	= re.compile("_sse\.")
-    env_sse = env.Copy()
-    env_sse.Append(CPPFLAGS = ' -msse -mfpmath=sse')
-
-    sse2_match	= re.compile("_sse2\.") 
-    env_sse2 = env.Copy()
-    env_sse2.Append(CPPFLAGS = ' -msse2 -mfpmath=sse')
-
-
-    ### Distributed build hosts ###
-
-    if enable_distcc:
-        if 'DISTCC_HOSTS' in os.environ:
-            hosts = os.environ['DISTCC_HOSTS']
-        else:
-            hosts = [ 'localhost/2', ]
-            if arch == 'i686':
-                dead = []
-                stations = [s for s in xrange(36) if s not in dead]
-                random.shuffle(stations)
-                hosts += ['station%d.lindenlab.com/2,lzo' % s for s in stations]
-            hosts = ' '.join(hosts)
-        print "Distributing to hosts: " + hosts
-        env['ENV']['DISTCC_HOSTS'] = hosts
-        env['ENV']['USER'] = os.environ['USER']
-        env['ENV']['HOME'] = os.environ['HOME']
-        #env['ENV']['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK']
-
-    if enable_colorgcc:
-        env['ENV']['PATH'] = os.environ['PATH']
-        env['ENV']['TERM'] = os.environ['TERM']
-        env['ENV']['HOME'] = os.environ['HOME']
-
-    ### Configure lex and yacc ###
-    env.Append(YACCFLAGS = ["-v", "-d"])
-    env.CFile(target=build_dir+'/lscript/lscript_compile/indra.l.cpp', source='lscript/lscript_compile/indra.l')
-    env.CFile(target=build_dir+'/lscript/lscript_compile/indra.y.c', source='lscript/lscript_compile/indra.y')
-    env.Command(build_dir+'/lscript/lscript_compile/indra.y.cpp',build_dir+'/lscript/lscript_compile/indra.y.c', 
-                        [Move('$TARGET','$SOURCE'),Delete(build_dir+'/lscript/lscript_compile/indra.y.output')])
-
-    #####################
-    # HELPER FUNCTIONS  #
-    #####################
-
-    ## handle special compiler modes
-
-    def file_obj(file):
-        if file == 'newsim/lltask.cpp':
-            print 'Found lltask!'
-            return env_no_distcc.Object(file)
-        elif vec_match.search(file) != None:
-            return env_vec.Object(file)
-        elif sse_match.search(file) != None:
-            return env_sse.Object(file)
-        elif sse2_match.search(file) != None:
-            return env_sse2.Object(file)
-        else:
-            return file
-
-    ### Load a files.lst and files.PLATFORM.lst for each module ###
-
-    def load_files(module, source_fname):
-        new_list = []
-        try:
-            list_file = open('./' + module + '/' + source_fname, 'r')
-            list = Split(list_file.read())
-            for x in list:
-                if not x.startswith('#'):
-                    file = os.path.join(build_dir, x)
-                    new_list.append(file_obj(file))
-            list_file.close()
-        except IOError, val:
-            print 'Error: unable to open file list',source_fname,
-            print 'for module', module + ":", val
-            return []
-
-        try:
-            platform_list_file = open('./' + module + '/files.' + platform + '.lst', 'r')
-            list = Split(platform_list_file.read())
-            for x in list:
-                file = os.path.join(build_dir, x)
-                new_list.append(file_obj(file))
-            platform_list_file.close()
-        except IOError:
-            return new_list
-
-        return new_list
-
-    ### Create a static library from the module ###
-
-    def create_static_module_from_dir(
-        input_dir,
-        mod_name,
-        local_flags="",
-        source_files = 'files.lst',
-        extra_depends=None,
-        source_env=env):
-        files_list = load_files(input_dir, source_files)
-        BuildDir(build_dir + '/' + input_dir, input_dir, duplicate=duplicate)
-        local_env = source_env.Copy(CPPFLAGS=env['CPPFLAGS'] + ' ' + local_flags)
-        if extra_depends:
-            for x in files_list:
-                Depends(local_env.Object(x), extra_depends)
-        tgt = local_env.StaticLibrary(lib_dir + '/' + mod_name, files_list)
-        Default(tgt)
-
-    def create_static_module(module, local_flags="", source_env=env,
-                             source_files='files.lst', extra_depends=None):
-        create_static_module_from_dir(module, module, local_flags,
-                                      source_files, extra_depends,
-                                      source_env=source_env)
-
-    def create_dynamic_module(
-        module,
-        local_flags="",
-        module_libs = [],
-        source_files = 'files.lst'):
-	# -Bsymbolic avoids having the lib pull symbols from the app's
-	# namespace instead of its own by default.  This avoids some
-	# rediculous problems with multiple destruction of the wrong
-	# objects, though has some gotchas of its own.
-	dyn_link_flags = '-Wl,-Bsymbolic'
-        files_list = load_files(module, source_files)
-        BuildDir(build_dir + '/' + module, module, duplicate=duplicate)
-        local_env = env.Copy(CPPFLAGS = env['CPPFLAGS'] + ' ' + local_flags,
-			LINKFLAGS = env['LINKFLAGS'] + ' ' + dyn_link_flags)
-        tgt = local_env.SharedLibrary(lib_dir + '/' + module, files_list, LIBS = module_libs)
-        Default(tgt)
-
-    # Some libraries need to be built using PIC so that they can be
-    # linked into libllkdu.so.  If we're not building libllkdu.so, we
-    # don't need to add the PIC flag.
-    def create_cond_module(module, module_libs=[]):
-        if build_target == 'client' and not opensource:
-            shared_env = env.Copy(CFLAGS=env['CFLAGS'] + '-fpic ',
-                                  CXXFLAGS=env['CXXFLAGS'] + '-fpic ')
-            create_static_module(module=module, source_env=shared_env)
-        else:
-            create_static_module(module=module, source_env=env)
-
-    ### Create an executable from the module ###
-
-    def create_executable(
-        exec_file, module, module_libs, source_files = 'files.lst'):
-        files_list = load_files(module, source_files)
-        BuildDir(build_dir + '/' + module, module, duplicate=duplicate)
-        tgt = env.Program(exec_file, files_list, LIBS = module_libs)
-        Default(tgt)
-
-
-    ### Check the message template for compatibility with the base ###
-    tgt = env.Command("template_verifier_output",
-                      '../scripts/template_verifier.py',
-                      'python $SOURCE  --mode="development" --cache_master 2>&1')
-    Default(tgt)
-    AlwaysBuild(tgt)
-
-    ####################
-    # BUILD LIBRARIES  #
-    ####################
-
-    create_cond_module('llcommon')
-    create_cond_module('llmath')
-    create_cond_module('llvfs')
-    create_cond_module('llimagej2coj', module_libs=['openjpeg'])
-    create_cond_module('llimage', module_libs=['llimagej2coj', 'jpeg', 'png12'])
-    create_static_module('llcrashlogger')
-    create_static_module('llmessage')
-    create_static_module('llinventory')
-    create_static_module('llcharacter')
-    create_static_module('llprimitive')
-    create_static_module('llrender')
-    create_static_module('llwindow')
-    create_static_module('llxml')
-    create_static_module('lscript', extra_depends=build_dir + '/lscript/lscript_compile/indra.y.h')
-
-    if standalone:
-        net_external_libs = [d[2:] for d in
-                             pkgconfig('--libs-only-l',
-                                       standalone_net_pkgs).split()]
-    else:
-        net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
-    net_external_libs += [ 'cares', 'expat' ]
-
-    common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]
-
-    if build_target == 'client':
-        if platform == 'linux':
-            #############################
-            # BUILD LINUX_CRASH_LOGGER  #
-            #############################
-            output_crashlogger_bin = 'linux_crash_logger/linux-crash-logger-' + arch + '-bin'
-            if standalone:
-                external_libs = net_external_libs
-                external_libs += [d[2:] for d in
-                                  pkgconfig('--libs-only-l', ['gtk+-2.0']).split()]
-            else:
-                external_libs = net_external_libs + [ 'db-4.2', 'gtk-x11-2.0' ]
-            external_libs += ['boost_signals-gcc34-mt']
-            internal_libs = [ 'llui', 'llxml', 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
-            create_executable(output_crashlogger_bin + '-globalsyms',
-                              'linux_crash_logger',
-                              internal_libs + external_libs)
-            env.Command(output_crashlogger_bin, output_crashlogger_bin + '-globalsyms', hidesyms_cmd)
-
-        create_static_module('llaudio')
-        create_static_module('llmedia')
-        create_static_module('llui')
-
-        if not opensource:
-            create_dynamic_module('llkdu', '', ['llimage', 'llvfs', 'llmath', 'llcommon', 'apr-1', 'kdu_v42R'])
-
-        ##################
-        # BUILD NEWVIEW  #
-        ##################
-        output_bin = 'newview/secondlife-' + arch + '-bin'
-
-        external_libs = client_external_libs + common_external_libs
-
-        if standalone:
-            external_libs += [ d[2:] for d in
-                              pkgconfig('--libs-only-l').split() ]
-        else:
-            external_libs += [ 'freetype', 'SDL', 'vorbisenc',
-                               'vorbisfile', 'vorbis', 'ogg', 'db-4.2' ]
-
-        external_libs += [ 'jpeg', 'openjpeg', 'png12', 'GL', 'GLU' ]
-
-        if arch != 'x86_64' and arch != 'x86_64cross':
-            if enable_fmod:
-                external_libs += [ 'fmod-3.75' ]
-            if buildtype == 'debug':
-                external_libs += ['tcmalloc', 'stacktrace']
-
-        internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive',
-                 'llmedia', 'llinventory', 
-                 'llimage',  'llimagej2coj', 
-                 'llcharacter', 'llaudio', 'llui', 'llxml',
-                 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
-
-        create_executable(output_bin + '-globalsyms', 'newview', internal_libs + external_libs)
-        env.Command(output_bin, output_bin + '-globalsyms', hidesyms_cmd)
-        Default(output_bin)
-
-        if buildtype == 'releasefordownload':
-
-            #######################
-            # PACKAGE THE CLIENT  #
-            #######################
-
-            if platform == 'linux':
-                env.Command(output_bin + '-stripped', output_bin, strip_cmd)
-                env.Command(output_crashlogger_bin + '-stripped', output_crashlogger_bin, strip_cmd)
-                product_name = 'SecondLife_' + arch + '_' + "_".join(version_viewer.split("."))
-                if grid not in ['default', 'agni']:
-                    product_name += "_" + grid.upper()
-                if channel != DEFAULT_CHANNEL:
-                    product_name += "_" + "".join((channel.upper()).split())
-                package_name = product_name + '.tar.bz2'
-                complete_channel = 'Second Life ' + channel
-                cmd = 'rm -rf newview/%(pn)s* && newview/viewer_manifest.py --grid=%(grid)s --channel=\'%(ch)s\' --installer_name=%(pn)s --arch=%(arch)s' % {
-                    'pn': product_name,
-                    'grid':grid,
-					'ch':complete_channel,
-                    'arch':arch}
-                if login_channel:
-                    cmd += ' --login_channel=\'Second Life %s\'' % (login_channel)
-                env.Command('newview/' + package_name, 'newview/viewer_manifest.py', cmd)
-                Depends('newview/' + package_name, output_bin + '-stripped')
-                Depends('newview/' + package_name, output_crashlogger_bin + '-stripped')
-                Default('newview/' + package_name)
-
-    elif build_target == 'server':
-        create_static_module('lldatabase')
-        create_static_module('llphysics', source_files='files.lst')
-        create_static_module('llscene')
-        create_static_module_from_dir('llkdu', 'llkdustatic')
-
-
-        ##################
-        # BUILD SERVERS  #
-        ##################
-        file_suffix = ''
-        if buildtype == 'debug' or buildtype == 'havok1debug':
-            file_suffix = '_debug'
-            boost_signals_lib = 'boost_signals-gcc33-mt-d'
-            boost_libs = [ 'boost_regex-gcc33-mt-d', boost_signals_lib ]
-        else:
-            boost_signals_lib = 'boost_signals-gcc33-mt'
-            boost_libs = [ 'boost_regex-gcc33-mt', boost_signals_lib ]
-
-        common_external_libs += [ 'pthread' ]
-
-        # Chatter test application
-        external_libs = common_external_libs
-        internal_libs = [ 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
-        create_executable('test_apps/chatter/chatter', 'test_apps/chatter', 
-                            internal_libs + external_libs)
-
-        # Tool to buffer all of standard input to memory.
-        create_executable('tools/simbin2xml/buffer_file/buffer_file', 
-                          'tools/simbin2xml/buffer_file', "")
-
-        # Simstate binary to XML utility.
-        external_libs = common_external_libs
-        internal_libs = [ 'llxml', 'llcommon', 'llmath' ]
-        create_executable('tools/simbin2xml/simbin2xml', 'tools/simbin2xml', 
-                            internal_libs + external_libs)
-
-        # Launcher
-        external_libs = common_external_libs
-        internal_libs = [ 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
-        create_executable('launcher/launcher' + file_suffix, 'launcher', 
-                            internal_libs + external_libs)
-
-        # Dataserver
-        external_libs = common_external_libs + boost_libs + [
-            'mysqlclient', 'tcmalloc', 'stacktrace',
-            ]
-        internal_libs = [ 'llcharacter', 'lldatabase', 'llimage', 'llimagej2coj', 'llinventory',
-                'llscene', 'llmessage', 'llvfs', 'llxml', 'llcommon', 'llmath' ]
-        create_executable('dataserver/dataserver' + file_suffix, 'dataserver', 
-                            internal_libs + external_libs)
-
-        # Spaceserver
-        external_libs = common_external_libs + ['mysqlclient']
-        internal_libs = ['llscene', 'lldatabase', 'llmessage', 'llvfs', 
-                'llmath', 'llcommon']
-        create_executable('newspace/spaceserver' + file_suffix, 'newspace',
-                            internal_libs + external_libs)
-
-        # Rpcserver
-        external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient']
-        internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs', 
-                'llmath', 'llcommon']
-        create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',
-                            internal_libs + external_libs)
-
-        # Mapserver
-        external_libs = common_external_libs + [ 'OSMesa16', 'kdu' ] + boost_libs + [ 
-                'iconv', 'jpeg', 'openjpeg', 'GL', 'mysqlclient', 'png12', 'pthread', 'dl' ]
-        internal_libs = ['llrender', 'llwindow', 'llimage', 'llimagej2coj', 'lldatabase', 'llprimitive', 'llmessage', 'llkdustatic',
-                'llxml', 'llvfs', 'llmath', 'llcommon']
-        create_executable('mapserver/mapserver' + file_suffix, 'mapserver',
-                            internal_libs + external_libs)
-        
-        # Simulator
-        Depends('newsim/simulator' + file_suffix, 'mapserver/mapserver' + file_suffix)
-        external_libs = common_external_libs + boost_libs + [
-            'openjpeg', 'dl', 'kdu', 'mysqlclient', 'iconv', 'tcmalloc', 'stacktrace', 'png12',
-            ]
-
-        # the order of the havok libs matters
-        external_libs += [ 
-                'libhkcompat.a', 
-                'libhkutilities.a', 
-                'libhkvisualize.a', 
-                'libhkdynamics.a', 
-                'libhkvehicle.a', 
-                'libhkcollide.a', 
-                'libhkinternal.a', 
-                'libhkconstraintsolver.a', 
-                'libhkmath.a', 
-                'libhkscenedata.a', 
-                'libhkserialize.a', 
-                'libhkgraphicsogl.a', 
-                'libhkgraphicsbridge.a', 
-                'libhkgraphics.a', 
-                'libhkdemoframework.a', 
-                'libhkbase.a'
-                ]
-        internal_libs = [ 'lscript', 'llprimitive',
-                 'llscene', 'llphysics', 'llinventory', 'llimage', 'llimagej2coj',
-                 'llcharacter', 'llxml', 'lldatabase', 'llkdustatic',
-                 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
-        create_executable('newsim/simulator' + file_suffix, 'newsim', 
-                            internal_libs + external_libs)
-
-        # texture upload verifier
-        external_libs = common_external_libs + [boost_signals_lib, 'kdu', 'openjpeg', 'png12', 'z', 'dl']
-        internal_libs = [
-            'llimage',
-            'llimagej2coj',
-            'llkdustatic',
-            'llinventory',
-            'llmessage',
-            'llvfs',
-            'llxml',
-            'llcommon',
-            'llmath' ]
-        create_executable(
-            'web/doc/asset-upload/plugins/verify-texture',
-            'web/doc/asset-upload/plugins',
-            internal_libs + external_libs,
-            'verify-texture.lst')
-
-        # notecard upload verifier
-        create_executable(
-            'web/doc/asset-upload/plugins/verify-notecard',
-            'web/doc/asset-upload/plugins',
-            internal_libs + external_libs,
-            'verify-notecard.lst')
-
-        # LSL compiler plugin for asset upload CGI.
-        external_libs = common_external_libs
-        internal_libs = ['lscript', 'llmath', 'llcommon']
-        create_executable('web/doc/asset-upload/plugins/lsl_compiler/lslc' + file_suffix, 'web/doc/asset-upload/plugins/lsl_compiler/', internal_libs + external_libs);
-
-        # Test
-        Depends('test/test', 'newsim/simulator' + file_suffix)
-        external_libs = common_external_libs + ['mysqlclient']
-        if platform == 'linux':
-            external_libs += [boost_signals_lib]
-        internal_libs = [ 'lldatabase', 'llinventory', 'llmessage', 'llxml',
-                'llvfs', 'llcharacter', 'llphysics', 'llprimitive', 'llmath', 'llcommon' ]
-        test_executable = 'test/test' + file_suffix
-        create_executable(test_executable, 'test', 
-                            internal_libs + external_libs)
-
-        # Run tests
-        if runtests:
-            test_results_file = 'test/test_results' + file_suffix + '.txt'
-            env.Command(test_results_file,
-                        test_executable,
-                        "$SOURCE 2>&1")  # tee masks segfaults
-            Depends(test_results_file, test_executable)
-            Default(test_results_file)
-
-            test_script = 'test/test.py'
-            script_test_results = 'test/script_test_result' + file_suffix + '.txt'
-            env.Command(script_test_results,
-                        test_script,
-                        "$SOURCE 2>&1")  # tee masks segfaults
-
-            Depends(script_test_results, test_results_file)
-            Default(script_test_results)
-        else:
-            print '============= SKIPPING TESTS ============='
-
-#########
-# DONE  #
-#########
-
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
new file mode 100644
index 0000000..240853a
--- /dev/null
+++ b/linden/indra/cmake/00-Common.cmake
@@ -0,0 +1,206 @@
+# -*- cmake -*-
+#
+# Compilation options shared by all Second Life components.
+
+include(Variables)
+
+
+# Portable compilation flags.
+
+set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
+    "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
+
+
+# Don't bother with a MinSizeRel build.
+
+set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
+    "Supported build types." FORCE)
+
+
+# Platform-specific compilation flags.
+
+if (WINDOWS)
+  # Don't build DLLs.
+  set(BUILD_SHARED_LIBS OFF)
+
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MTd"
+      CACHE STRING "C++ compiler debug options" FORCE)
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MT"
+      CACHE STRING "C++ compiler release-with-debug options" FORCE)
+  set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MT"
+      CACHE STRING "C++ compiler release options" FORCE)
+
+  add_definitions(
+      /DLL_WINDOWS=1
+      /DUNICODE
+      /D_UNICODE 
+      /GS
+      /TP
+      /W3
+      /c
+      /Zc:forScope
+      /nologo
+      /Oy-
+      )
+     
+  if(MSVC80 OR MSVC90)
+    add_definitions(
+      /Zc:wchar_t-
+      )
+  endif (MSVC80 OR MSVC90)
+  
+  # Are we using the crummy Visual Studio KDU build workaround?
+  if (NOT VS_DISABLE_FATAL_WARNINGS)
+    add_definitions(/WX)
+  endif (NOT VS_DISABLE_FATAL_WARNINGS)
+endif (WINDOWS)
+
+
+if (LINUX)
+  set(CMAKE_SKIP_RPATH TRUE)
+
+  # Here's a giant hack for Fedora 8, where we can't use
+  # _FORTIFY_SOURCE if we're using a compiler older than gcc 4.1.
+
+  find_program(GXX g++)
+  mark_as_advanced(GXX)
+
+  if (GXX)
+    execute_process(
+        COMMAND ${GXX} --version
+        COMMAND sed "s/^[gc+ ]*//"
+        COMMAND head -1
+        OUTPUT_VARIABLE GXX_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+  else (GXX)
+    set(GXX_VERSION x)
+  endif (GXX)
+
+  # The quoting hack here is necessary in case we're using distcc or
+  # ccache as our compiler.  CMake doesn't pass the command line
+  # through the shell by default, so we end up trying to run "distcc"
+  # " g++" - notice the leading space.  Ugh.
+
+  execute_process(
+      COMMAND sh -c "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} --version"
+      COMMAND sed "s/^[gc+ ]*//"
+      COMMAND head -1
+      OUTPUT_VARIABLE CXX_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if (${GXX_VERSION} STREQUAL ${CXX_VERSION})
+    add_definitions(-D_FORTIFY_SOURCE=2)
+  else (${GXX_VERSION} STREQUAL ${CXX_VERSION})
+    if (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
+      add_definitions(-D_FORTIFY_SOURCE=2)
+    endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
+  endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
+
+  # GCC 4.3 introduces a pile of obnoxious new warnings, which we
+  # treat as errors due to -Werror.  Quiet the most offensive and
+  # widespread of them.
+
+  if (${CXX_VERSION} MATCHES "4.3")
+    add_definitions(-Wno-deprecated -Wno-parentheses)
+  endif (${CXX_VERSION} MATCHES "4.3")
+
+  # End of hacks.
+
+  add_definitions(
+      -DLL_LINUX=1
+      -D_REENTRANT
+      -fexceptions
+      -fno-math-errno
+      -fno-strict-aliasing
+      -fsigned-char
+      -g
+      -pthread
+      )
+
+  if (SERVER)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-60")
+    if (EXISTS /etc/debian_version)
+      FILE(READ /etc/debian_version DEBIAN_VERSION)
+    else (EXISTS /etc/debian_version)
+      set(DEBIAN_VERSION "")
+    endif (EXISTS /etc/debian_version)
+
+    if (NOT DEBIAN_VERSION STREQUAL "3.1")
+      add_definitions(-DCTYPE_WORKAROUND)
+    endif (NOT DEBIAN_VERSION STREQUAL "3.1")
+
+    if (EXISTS /usr/lib/mysql4/mysql)
+      link_directories(/usr/lib/mysql4/mysql)
+    endif (EXISTS /usr/lib/mysql4/mysql)
+
+    add_definitions(
+        -msse2
+        -mfpmath=sse
+        )
+  endif (SERVER)
+
+  if (VIEWER)
+    add_definitions(-DAPPID=secondlife)
+    add_definitions(-fvisibility=hidden)
+    if (NOT STANDALONE)
+      # this stops us requiring a really recent glibc at runtime
+      add_definitions(-fno-stack-protector)
+    endif (NOT STANDALONE)
+  endif (VIEWER)
+
+  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
+  set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
+endif (LINUX)
+
+
+if (DARWIN)
+  add_definitions(-DLL_DARWIN=1)
+  set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+endif (DARWIN)
+
+
+if (LINUX OR DARWIN)
+  set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
+
+  if (NOT GCC_DISABLE_FATAL_WARNINGS)
+    set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
+  endif (NOT GCC_DISABLE_FATAL_WARNINGS)
+
+  set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder")
+
+  set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
+endif (LINUX OR DARWIN)
+
+
+if (STANDALONE)
+  add_definitions(-DLL_STANDALONE=1)
+
+  if (LINUX AND ${ARCH} STREQUAL "i686")
+    add_definitions(-march=pentiumpro)
+  endif (LINUX AND ${ARCH} STREQUAL "i686")
+
+else (STANDALONE)
+  set(${ARCH}_linux_INCLUDES
+      ELFIO
+      atk-1.0
+      glib-2.0
+      gstreamer-0.10
+      gtk-2.0
+      llfreetype2
+      pango-1.0
+      )
+endif (STANDALONE)
+
+if(SERVER)
+  include_directories(${LIBS_PREBUILT_DIR}/include/havok)
+endif(SERVER)
diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
new file mode 100644
index 0000000..2a96d70
--- /dev/null
+++ b/linden/indra/cmake/APR.cmake
@@ -0,0 +1,55 @@
+# -*- cmake -*-
+
+include(BerkeleyDB)
+include(Linking)
+include(Prebuilt)
+
+set(APR_FIND_QUIETLY ON)
+set(APR_FIND_REQUIRED ON)
+
+set(APRUTIL_FIND_QUIETLY ON)
+set(APRUTIL_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindAPR)
+else (STANDALONE)
+  use_prebuilt_binary(apr_suite)
+  if (WINDOWS)
+    set(WINLIBS_PREBUILT_DEBUG_DIR 
+      ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug
+      )
+    set(WINLIBS_PREBUILT_RELEASE_DIR 
+      ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+      )
+    set(APR_LIBRARIES 
+      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1.lib
+      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1.lib
+      )
+    set(APRUTIL_LIBRARIES 
+      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1.lib
+      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1.lib
+      )
+    set(APRICONV_LIBRARIES 
+      debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1.lib
+      optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1.lib
+      )
+  elseif (DARWIN)
+    set(APR_LIBRARIES 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
+      )
+    set(APRUTIL_LIBRARIES 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
+      )
+    set(APRICONV_LIBRARIES apriconv-1)
+  else (WINDOWS)
+    set(APR_LIBRARIES apr-1)
+    set(APRUTIL_LIBRARIES aprutil-1)
+  endif (WINDOWS)
+  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
+
+  if (LINUX AND VIEWER)
+    list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
+  endif (LINUX AND VIEWER)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/Audio.cmake b/linden/indra/cmake/Audio.cmake
new file mode 100644
index 0000000..c6ccab2
--- /dev/null
+++ b/linden/indra/cmake/Audio.cmake
@@ -0,0 +1,34 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+  pkg_check_modules(OGG REQUIRED ogg)
+  pkg_check_modules(VORBIS REQUIRED vorbis)
+  pkg_check_modules(VORBISENC REQUIRED vorbisenc)
+  pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
+else (STANDALONE)
+  use_prebuilt_binary(ogg-vorbis)
+  set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
+  set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
+
+  if (WINDOWS)
+    set(OGG_LIBRARIES ogg_static_mt)
+    set(VORBIS_LIBRARIES vorbis_static_mt)
+    set(VORBISENC_LIBRARIES vorbisenc_static_mt)
+    set(VORBISFILE_LIBRARIES vorbisfile_static_mt)
+  else (WINDOWS)
+    set(OGG_LIBRARIES ogg)
+    set(VORBIS_LIBRARIES vorbis)
+    set(VORBISENC_LIBRARIES vorbisenc)
+    set(VORBISFILE_LIBRARIES vorbisfile)
+  endif (WINDOWS)
+endif (STANDALONE)
+
+link_directories(
+    ${VORBIS_LIBRARY_DIRS}
+    ${VORBISENC_LIBRARY_DIRS}
+    ${VORBISFILE_LIBRARY_DIRS}
+    ${OGG_LIBRARY_DIRS}
+    )
diff --git a/linden/indra/cmake/BerkeleyDB.cmake b/linden/indra/cmake/BerkeleyDB.cmake
new file mode 100644
index 0000000..d98e791
--- /dev/null
+++ b/linden/indra/cmake/BerkeleyDB.cmake
@@ -0,0 +1,11 @@
+# -*- cmake -*-
+
+set(DB_FIND_QUIETLY ON)
+set(DB_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindBerkeleyDB)
+else (STANDALONE)
+  set(DB_LIBRARIES db-4.2)
+  set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
new file mode 100644
index 0000000..a7db67c
--- /dev/null
+++ b/linden/indra/cmake/Boost.cmake
@@ -0,0 +1,49 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(Boost_FIND_QUIETLY ON)
+set(Boost_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindBoost)
+
+  set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
+  set(BOOST_REGEX_LIBRARY boost_regex-mt)
+  set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+else (STANDALONE)
+  use_prebuilt_binary(boost)
+  set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+
+  if (WINDOWS)
+    set(BOOST_VERSION 1_34_1)
+    if (MSVC71)
+      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+          optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
+          debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
+      set(BOOST_REGEX_LIBRARY
+          optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
+          debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
+      set(BOOST_SIGNALS_LIBRARY 
+          optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
+          debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
+    else (MSVC71)
+      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+          optimized libboost_program_options-vc80-mt-s-${BOOST_VERSION}
+          debug libboost_program_options-vc80-mt-sgd-${BOOST_VERSION})
+      set(BOOST_REGEX_LIBRARY
+          optimized libboost_regex-vc80-mt-s-${BOOST_VERSION}
+          debug libboost_regex-vc80-mt-sgd-${BOOST_VERSION})
+      set(BOOST_SIGNALS_LIBRARY 
+          optimized libboost_signals-vc80-mt-s-${BOOST_VERSION}
+          debug libboost_signals-vc80-mt-sgd-${BOOST_VERSION})
+    endif (MSVC71)
+  elseif (DARWIN)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
+    set(BOOST_REGEX_LIBRARY boost_regex-mt)
+    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+  elseif (LINUX)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
+    set(BOOST_REGEX_LIBRARY boost_regex-mt)
+    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+  endif (WINDOWS)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/BuildVersion.cmake b/linden/indra/cmake/BuildVersion.cmake
new file mode 100644
index 0000000..60a519c
--- /dev/null
+++ b/linden/indra/cmake/BuildVersion.cmake
@@ -0,0 +1,18 @@
+# -*- cmake -*-
+
+include(Python)
+
+macro (build_version _target)
+  execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/build_version.py
+        llversion${_target}.h ${LLCOMMON_INCLUDE_DIRS}
+      OUTPUT_VARIABLE ${_target}_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+
+  if (${_target}_VERSION)
+    message(STATUS "Version of ${_target} is ${${_target}_VERSION}")
+  else (${_target}_VERSION)
+    message(SEND_ERROR "Could not determine ${_target} version")
+  endif (${_target}_VERSION)
+endmacro (build_version)
diff --git a/linden/indra/cmake/CARes.cmake b/linden/indra/cmake/CARes.cmake
new file mode 100644
index 0000000..8a2dc01
--- /dev/null
+++ b/linden/indra/cmake/CARes.cmake
@@ -0,0 +1,23 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+set(CARES_FIND_QUIETLY ON)
+set(CARES_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindCARes)
+else (STANDALONE)
+    use_prebuilt_binary(ares)
+    if (WINDOWS)
+        set(CARES_LIBRARIES areslib)
+    elseif (DARWIN)
+        set(CARES_LIBRARIES
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a
+          )
+    else (WINDOWS)
+        set(CARES_LIBRARIES cares)
+    endif (WINDOWS)
+    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/CMakeCopyIfDifferent.cmake b/linden/indra/cmake/CMakeCopyIfDifferent.cmake
new file mode 100644
index 0000000..55e71ff
--- /dev/null
+++ b/linden/indra/cmake/CMakeCopyIfDifferent.cmake
@@ -0,0 +1,41 @@
+# -*- cmake -*-
+# Taken from http://www.cmake.org/Wiki/CMakeCopyIfDifferent
+# Generates a rule to copy each source file from source directory to destination directory.
+#
+# Typical use -
+#
+# SET(SRC_FILES head1.h head2.h head3.h)
+# COPY_IF_DIFFERENT( /from_dir /to_dir IncludeTargets ${SRC_FILES})
+# ADD_TARGET(CopyIncludes ALL DEPENDS ${IncludeTargets})
+
+MACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR TARGETS)
+# Macro to implement copy_if_different for a list of files
+# Arguments - 
+#   FROM_DIR - this is the source directory
+#   TO_DIR   - this is the destination directory
+#   TARGETS  - A variable to receive a list of targets
+#   FILES    - names of the files to copy 
+#              TODO: add globing. 
+SET(AddTargets "")
+FOREACH(SRC ${ARGN})
+    GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME) 
+    IF("${FROM_DIR}" STREQUAL "")
+        SET(FROM ${SRC})
+    ELSE("${FROM_DIR}" STREQUAL "")
+        SET(FROM ${FROM_DIR}/${SRC})
+    ENDIF("${FROM_DIR}" STREQUAL "")        
+    IF("${TO_DIR}" STREQUAL "")
+        SET(TO ${SRCFILE})
+    ELSE("${TO_DIR}" STREQUAL "")
+        SET(TO   ${TO_DIR}/${SRCFILE})
+    ENDIF("${TO_DIR}" STREQUAL "")
+    ADD_CUSTOM_COMMAND(
+        OUTPUT  "${TO}"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FROM} ${TO}
+        DEPENDS ${FROM}
+        COMMENT "Copying ${SRCFILE} ${TO_DIR}"
+        )
+    SET(AddTargets ${AddTargets} ${TO})
+ENDFOREACH(SRC ${ARGN})
+SET(${TARGETS} ${AddTargets})
+ENDMACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR TARGETS)
diff --git a/linden/indra/cmake/CSharpMacros.cmake b/linden/indra/cmake/CSharpMacros.cmake
new file mode 100644
index 0000000..a4dd815
--- /dev/null
+++ b/linden/indra/cmake/CSharpMacros.cmake
@@ -0,0 +1,142 @@
+# - This is a support module for easy Mono/C# handling with CMake
+# It defines the following macros:
+#
+# ADD_CS_LIBRARY (<target> <source>)
+# ADD_CS_EXECUTABLE (<target> <source>)
+# INSTALL_GAC (<target>)
+#
+# Note that the order of the arguments is important.
+#
+# You can optionally set the variable CS_FLAGS to tell the macros whether
+# to pass additional flags to the compiler. This is particularly useful to
+# set assembly references, unsafe code, etc... These flags are always reset
+# after the target was added so you don't have to care about that.
+#
+# copyright (c) 2007 Arno Rehn arno@arnorehn.de
+#
+# Redistribution and use is allowed according to the terms of the GPL license.
+
+
+# ----- support macros -----
+MACRO(GET_CS_LIBRARY_TARGET_DIR)
+        IF (NOT LIBRARY_OUTPUT_PATH)
+                SET(CS_LIBRARY_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})
+        ELSE (NOT LIBRARY_OUTPUT_PATH)
+                SET(CS_LIBRARY_TARGET_DIR ${LIBRARY_OUTPUT_PATH})
+        ENDIF (NOT LIBRARY_OUTPUT_PATH)
+ENDMACRO(GET_CS_LIBRARY_TARGET_DIR)
+
+MACRO(GET_CS_EXECUTABLE_TARGET_DIR)
+        IF (NOT EXECUTABLE_OUTPUT_PATH)
+                SET(CS_EXECUTABLE_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})
+        ELSE (NOT EXECUTABLE_OUTPUT_PATH)
+                SET(CS_EXECUTABLE_TARGET_DIR ${EXECUTABLE_OUTPUT_PATH})
+        ENDIF (NOT EXECUTABLE_OUTPUT_PATH)
+ENDMACRO(GET_CS_EXECUTABLE_TARGET_DIR)
+
+MACRO(MAKE_PROPER_FILE_LIST)
+        FOREACH(file ${ARGN})
+                # first assume it's a relative path
+                FILE(GLOB globbed ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+                IF(globbed)
+                        FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${file} native)
+                ELSE(globbed)
+                        FILE(TO_NATIVE_PATH ${file} native)
+                ENDIF(globbed)
+                SET(proper_file_list ${proper_file_list} ${native})
+                SET(native "")
+        ENDFOREACH(file)
+ENDMACRO(MAKE_PROPER_FILE_LIST)
+# ----- end support macros -----
+
+MACRO(ADD_CS_LIBRARY target)
+        GET_CS_LIBRARY_TARGET_DIR()
+        
+        SET(target_DLL "${CS_LIBRARY_TARGET_DIR}/${target}.dll")
+        MAKE_PROPER_FILE_LIST(${ARGN})
+        FILE(RELATIVE_PATH relative_path ${CMAKE_BINARY_DIR} ${target_DLL})
+        
+        SET(target_KEY "${CMAKE_CURRENT_SOURCE_DIR}/${target}.key")
+        SET(target_CS_FLAGS "${CS_FLAGS}")
+        IF(${target}_CS_FLAGS)
+                LIST(APPEND target_CS_FLAGS ${${target}_CS_FLAGS})
+        ENDIF(${target}_CS_FLAGS)
+        IF(EXISTS ${target_KEY})
+                LIST(APPEND target_CS_FLAGS -keyfile:${target_KEY})
+        ENDIF(EXISTS ${target_KEY})
+
+        FOREACH(ref ${${target}_REFS})
+                SET(ref_DLL ${CMAKE_CURRENT_BINARY_DIR}/${ref}.dll)
+                IF(EXISTS ${ref_DLL})
+                        LIST(APPEND target_CS_FLAGS -r:${ref_DLL})
+                ELSE(EXISTS ${ref_DLL})
+                        LIST(APPEND target_CS_FLAGS -r:${ref})
+                ENDIF(EXISTS ${ref_DLL})
+        ENDFOREACH(ref ${${target}_REFS})
+
+        ADD_CUSTOM_COMMAND (OUTPUT ${target_DLL}
+                COMMAND ${MCS_EXECUTABLE} ${target_CS_FLAGS} -out:${target_DLL} -target:library ${proper_file_list}
+                MAIN_DEPENDENCY ${proper_file_list}
+                DEPENDS ${ARGN}
+                COMMENT "Building ${relative_path}")
+        ADD_CUSTOM_TARGET (${target} ALL DEPENDS ${target_DLL})
+
+        FOREACH(ref ${${target}_REFS})
+                GET_TARGET_PROPERTY(is_target ${ref} TYPE)
+                IF(is_target)
+                        ADD_DEPENDENCIES(${target} ${ref})
+                ENDIF(is_target)
+        ENDFOREACH(ref ${${target}_REFS})
+
+        SET(relative_path "")
+        SET(proper_file_list "")
+ENDMACRO(ADD_CS_LIBRARY)
+
+MACRO(ADD_CS_EXECUTABLE target)
+        GET_CS_EXECUTABLE_TARGET_DIR()
+        
+        # Seems like cmake doesn't like the ".exe" ending for custom commands.
+        # If we call it ${target}.exe, 'make' will later complain about a missing rule.
+        # Create a fake target instead.
+        SET(target_EXE "${CS_EXECUTABLE_TARGET_DIR}/${target}.exe")
+        SET(target_TOUCH "${CS_EXECUTABLE_TARGET_DIR}/${target}.exe-built")
+        GET_DIRECTORY_PROPERTY(clean ADDITIONAL_MAKE_CLEAN_FILES)
+        LIST(APPEND clean ${target}.exe)
+        SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${clean}")
+        MAKE_PROPER_FILE_LIST(${ARGN})
+        FILE(RELATIVE_PATH relative_path ${CMAKE_BINARY_DIR} ${target_EXE})
+        SET(target_CS_FLAGS "${CS_FLAGS}")
+        
+        FOREACH(ref ${${target}_REFS})
+                SET(ref_DLL ${CMAKE_CURRENT_SOURCE_DIR}/${ref}.dll)
+                IF(EXISTS ${ref_DLL})
+                        LIST(APPEND target_CS_FLAGS -r:${ref_DLL})
+                ELSE(EXISTS ${ref_DLL})
+                        LIST(APPEND target_CS_FLAGS -r:${ref})
+                ENDIF(EXISTS ${ref_DLL})
+        ENDFOREACH(ref ${${target}_REFS})
+
+        ADD_CUSTOM_COMMAND (OUTPUT "${target_TOUCH}"
+                COMMAND ${MCS_EXECUTABLE} ${target_CS_FLAGS} -out:${target_EXE} ${proper_file_list}
+                COMMAND ${CMAKE_COMMAND} -E touch ${target_TOUCH}
+                MAIN_DEPENDENCY ${ARGN}
+                DEPENDS ${ARGN}
+                COMMENT "Building ${relative_path}")
+        ADD_CUSTOM_TARGET ("${target}" ALL DEPENDS "${target_TOUCH}")
+
+        FOREACH(ref ${${target}_REFS})
+                GET_TARGET_PROPERTY(is_target ${ref} TYPE)
+                IF(is_target)
+                        ADD_DEPENDENCIES(${target} ${ref})
+                ENDIF(is_target)
+        ENDFOREACH(ref ${${target}_REFS})
+
+        SET(relative_path "")
+        SET(proper_file_list "")
+ENDMACRO(ADD_CS_EXECUTABLE)
+
+MACRO(INSTALL_GAC target)
+        GET_CS_LIBRARY_TARGET_DIR()
+        
+        INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GACUTIL_EXECUTABLE} -i ${CS_LIBRARY_TARGET_DIR}/${target}.dll -package 2.0)")
+ENDMACRO(INSTALL_GAC target)
diff --git a/linden/indra/cmake/CURL.cmake b/linden/indra/cmake/CURL.cmake
new file mode 100644
index 0000000..6e5fed4
--- /dev/null
+++ b/linden/indra/cmake/CURL.cmake
@@ -0,0 +1,19 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(CURL_FIND_QUIETLY ON)
+set(CURL_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindCURL)
+else (STANDALONE)
+  use_prebuilt_binary(curl)
+  if (WINDOWS)
+    set(CURL_LIBRARIES 
+    debug libcurld
+    optimized libcurl)
+  else (WINDOWS)
+    set(CURL_LIBRARIES curl)
+  endif (WINDOWS)
+  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/CommonMiscLibs.cmake b/linden/indra/cmake/CommonMiscLibs.cmake
new file mode 100644
index 0000000..513acf3
--- /dev/null
+++ b/linden/indra/cmake/CommonMiscLibs.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(tut)
+endif(NOT STANDALONE)
+
diff --git a/linden/indra/cmake/CopyBackToSource.cmake b/linden/indra/cmake/CopyBackToSource.cmake
new file mode 100644
index 0000000..d217df9
--- /dev/null
+++ b/linden/indra/cmake/CopyBackToSource.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+# Copies a binary back to the source directory
+
+MACRO(COPY_BACK_TO_SOURCE target)
+   GET_TARGET_PROPERTY(FROM ${target} LOCATION)
+   SET(TO ${CMAKE_CURRENT_SOURCE_DIR})
+   #MESSAGE("TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${FROM} ${TO}")
+   ADD_CUSTOM_COMMAND(
+        TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy ${FROM} ${TO}
+        DEPENDS ${FROM}
+        COMMENT "Copying ${target} to ${CMAKE_CURRENT_BINARY_DIR}"
+        )
+ENDMACRO(COPY_BACK_TO_SOURCE)
+
+
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
new file mode 100644
index 0000000..345761a
--- /dev/null
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -0,0 +1,155 @@
+# -*- cmake -*-
+
+# The copy_win_libs folder contains file lists and a script used to 
+# copy dlls, exes and such needed to run the SecondLife from within 
+# VisualStudio. 
+
+include(CMakeCopyIfDifferent)
+
+set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
+set(vivox_files
+    tntk.dll
+    libeay32.dll
+    SLVoice.exe
+    ssleay32.dll
+    SLVoiceAgent.exe
+    srtp.dll
+    alut.dll
+    vivoxsdk.dll
+    ortp.dll
+    wrap_oal.dll
+    )
+
+set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+set(debug_files
+    freebl3.dll
+    gksvggdiplus.dll
+    js3250.dll
+    nspr4.dll
+    nss3.dll
+    nssckbi.dll
+    plc4.dll
+    plds4.dll
+    smime3.dll
+    softokn3.dll
+    ssl3.dll
+    xpcom.dll
+    xul.dll
+    openjpegd.dll
+    windbgdlg.exe
+    )
+
+copy_if_different(
+    ${debug_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+    out_targets 
+    ${debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+    out_targets 
+    ${vivox_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+set(release_files
+    freebl3.dll
+    gksvggdiplus.dll
+    js3250.dll
+    nspr4.dll
+    nss3.dll
+    nssckbi.dll
+    plc4.dll
+    plds4.dll
+    smime3.dll
+    softokn3.dll
+    ssl3.dll
+    xpcom.dll
+    xul.dll
+    openjpeg.dll
+    )
+    
+copy_if_different(
+    ${release_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Release"
+    out_targets 
+    ${release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Release"
+    out_targets 
+    ${vivox_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${release_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+    out_targets 
+    ${release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+    out_targets 
+    ${vivox_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+set(internal_llkdu_path "${CMAKE_SOURCE_DIR}/llkdu")
+if(EXISTS ${internal_llkdu_path})
+    set(internal_llkdu_src "${CMAKE_BINARY_DIR}/llkdu/${CMAKE_CFG_INTDIR}/llkdu.dll")
+    set(llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llkdu.dll")
+    ADD_CUSTOM_COMMAND(
+        OUTPUT  ${llkdu_dst}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${internal_llkdu_src} ${llkdu_dst}
+        DEPENDS ${internal_llkdu_src}
+        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
+        )
+    set(all_targets ${all_targets} ${llkdu_dst})
+else(EXISTS ${internal_llkdu_path})
+    set(debug_llkdu_src "${debug_src_dir}/llkdu.dll")
+    set(debug_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Debug/llkdu.dll")
+    ADD_CUSTOM_COMMAND(
+        OUTPUT  ${debug_llkdu_dst}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${debug_llkdu_src} ${debug_llkdu_dst}
+        DEPENDS ${debug_llkdu_src}
+        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Debug"
+        )
+    set(all_targets ${all_targets} ${debug_llkdu_dst})
+
+    set(release_llkdu_src "${release_src_dir}/llkdu.dll")
+    set(release_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/Release/llkdu.dll")
+    ADD_CUSTOM_COMMAND(
+        OUTPUT  ${release_llkdu_dst}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${release_llkdu_dst}
+        DEPENDS ${release_llkdu_src}
+        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/Release"
+        )
+    set(all_targets ${all_targets} ${release_llkdu_dst})
+
+    set(relwithdebinfo_llkdu_dst "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llkdu.dll")
+    ADD_CUSTOM_COMMAND(
+        OUTPUT  ${relwithdebinfo_llkdu_dst}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${release_llkdu_src} ${relwithdebinfo_llkdu_dst}
+        DEPENDS ${release_llkdu_src}
+        COMMENT "Copying llkdu.dll ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+        )
+    set(all_targets ${all_targets} ${relwithdebinfo_llkdu_dst})
+   
+endif (EXISTS ${internal_llkdu_path})
+
+add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
+
+if(EXISTS ${internal_llkdu_path})
+    add_dependencies(copy_win_libs llkdu)
+endif(EXISTS ${internal_llkdu_path})
diff --git a/linden/indra/cmake/DirectX.cmake b/linden/indra/cmake/DirectX.cmake
new file mode 100644
index 0000000..4d2d5e0
--- /dev/null
+++ b/linden/indra/cmake/DirectX.cmake
@@ -0,0 +1,40 @@
+# -*- cmake -*-
+
+if (VIEWER AND WINDOWS)
+  find_path(DIRECTX_INCLUDE_DIR dxdiag.h
+            "$ENV{DXSDK_DIR}/Include"
+            "C:/Program Files/Microsoft DirectX SDK (June 2008)/Include"
+            "C:/Program Files/Microsoft DirectX SDK (March 2008)/Include"
+            "C:/Program Files/Microsoft DirectX SDK (November 2007)/Include"
+            "C:/Program Files/Microsoft DirectX SDK (August 2007)/Include"
+            "C:/DX90SDK/Include"
+            "C:/Program Files/DX90SDK/Include"
+            )
+  if (DIRECTX_INCLUDE_DIR)
+    include_directories(${DIRECTX_INCLUDE_DIR})
+    if (DIRECTX_FIND_QUIETLY)
+      message(STATUS "Found DirectX include: ${DIRECTX_INCLUDE_DIR}")
+    endif (DIRECTX_FIND_QUIETLY)
+  else (DIRECTX_INCLUDE_DIR)
+    message(FATAL_ERROR "Could not find DirectX SDK Include")
+  endif (DIRECTX_INCLUDE_DIR)
+
+
+  find_path(DIRECTX_LIBRARY_DIR dxguid.lib
+            "$ENV{DXSDK_DIR}/Lib/x86"
+            "C:/Program Files/Microsoft DirectX SDK (June 2008)/Lib/x86"
+            "C:/Program Files/Microsoft DirectX SDK (March 2008)/Lib/x86"
+            "C:/Program Files/Microsoft DirectX SDK (November 2007)/Lib/x86"
+            "C:/Program Files/Microsoft DirectX SDK (August 2007)/Lib/x86"
+            "C:/DX90SDK/Lib"
+            "C:/Program Files/DX90SDK/Lib"
+            )
+  if (DIRECTX_LIBRARY_DIR)
+    if (DIRECTX_FIND_QUIETLY)
+      message(STATUS "Found DirectX include: ${DIRECTX_LIBRARY_DIR}")
+    endif (DIRECTX_FIND_QUIETLY)
+  else (DIRECTX_LIBRARY_DIR)
+    message(FATAL_ERROR "Could not find DirectX SDK Libraries")
+  endif (DIRECTX_LIBRARY_DIR)
+
+endif (VIEWER AND WINDOWS)
diff --git a/linden/indra/cmake/ELFIO.cmake b/linden/indra/cmake/ELFIO.cmake
new file mode 100644
index 0000000..e51993b
--- /dev/null
+++ b/linden/indra/cmake/ELFIO.cmake
@@ -0,0 +1,19 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(ELFIO_FIND_QUIETLY ON)
+
+if (STANDALONE)
+  include(FindELFIO)
+elseif (LINUX)
+  use_prebuilt_binary(elfio)
+  set(ELFIO_LIBRARIES ELFIO)
+  set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+  set(ELFIO_FOUND "YES")
+endif (STANDALONE)
+
+if (ELFIO_FOUND)
+  add_definitions(-DLL_ELFBIN=1)
+else (ELFIO_FOUND)
+  set(ELFIO_INCLUDE_DIR "")
+endif (ELFIO_FOUND)
diff --git a/linden/indra/cmake/EXPAT.cmake b/linden/indra/cmake/EXPAT.cmake
new file mode 100644
index 0000000..acb15dc
--- /dev/null
+++ b/linden/indra/cmake/EXPAT.cmake
@@ -0,0 +1,17 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(EXPAT_FIND_QUIETLY ON)
+set(EXPAT_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindEXPAT)
+else (STANDALONE)
+    use_prebuilt_binary(expat)
+    if (WINDOWS)
+        set(EXPAT_LIBRARIES libexpatMT)
+    else (WINDOWS)
+        set(EXPAT_LIBRARIES expat)
+    endif (WINDOWS)
+    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/FMOD.cmake b/linden/indra/cmake/FMOD.cmake
new file mode 100644
index 0000000..759b8f1
--- /dev/null
+++ b/linden/indra/cmake/FMOD.cmake
@@ -0,0 +1,64 @@
+# -*- cmake -*-
+
+include(Linking)
+
+if(INSTALL_PROPRIETARY)
+  include(Prebuilt)
+  use_prebuilt_binary(fmod)
+endif(INSTALL_PROPRIETARY)
+
+find_library(FMOD_LIBRARY_RELEASE
+             NAMES fmod fmodvc fmod-3.75
+             PATHS
+             ${ARCH_PREBUILT_DIRS_RELEASE}
+             )
+
+find_library(FMOD_LIBRARY_DEBUG
+             NAMES fmod fmodvc fmod-3.75
+             PATHS
+             ${ARCH_PREBUILT_DIRS_DEBUG}
+             )
+
+if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
+  set(FMOD_LIBRARY
+      debug ${FMOD_LIBRARY_DEBUG}
+      optimized ${FMOD_LIBRARY_RELEASE})
+elseif (FMOD_LIBRARY_RELEASE)
+  set(FMOD_LIBRARY ${FMOD_LIBRARY_RELEASE})
+endif (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
+
+if (NOT FMOD_LIBRARY)
+  set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.")
+  if (FMOD_SDK_DIR)
+    find_library(FMOD_LIBRARY
+                 NAMES fmodvc fmod-3.75 fmod
+                 PATHS
+                 ${FMOD_SDK_DIR}/api/lib
+                 ${FMOD_SDK_DIR}/api
+                 ${FMOD_SDK_DIR}/lib
+                 ${FMOD_SDK_DIR}
+                 )
+  endif (FMOD_SDK_DIR)
+endif (NOT FMOD_LIBRARY)
+
+find_path(FMOD_INCLUDE_DIR fmod.h
+          ${LIBS_PREBUILT_DIR}/include
+          ${FMOD_SDK_DIR}/api/inc
+          ${FMOD_SDK_DIR}/inc
+          ${FMOD_SDK_DIR}
+          )
+
+if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+  set(FMOD ON CACHE BOOL "Use closed source FMOD sound library.")
+else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+  set(FMOD_LIBRARY "")
+  set(FMOD_INCLUDE_DIR "")
+  if (FMOD)
+    message(STATUS "No support for FMOD audio (need to set FMOD_SDK_DIR?)")
+  endif (FMOD)
+  set(FMOD OFF CACHE BOOL "Use closed source FMOD sound library.")
+endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+
+if (FMOD)
+  message(STATUS "Building with FMOD audio support")
+endif (FMOD)
diff --git a/linden/indra/cmake/FindAPR.cmake b/linden/indra/cmake/FindAPR.cmake
new file mode 100644
index 0000000..906b6c9
--- /dev/null
+++ b/linden/indra/cmake/FindAPR.cmake
@@ -0,0 +1,94 @@
+# -*- cmake -*-
+
+# - Find Apache Portable Runtime
+# Find the APR includes and libraries
+# This module defines
+#  APR_INCLUDE_DIR and APRUTIL_INCLUDE_DIR, where to find apr.h, etc.
+#  APR_LIBRARIES and APRUTIL_LIBRARIES, the libraries needed to use APR.
+#  APR_FOUND and APRUTIL_FOUND, If false, do not try to use APR.
+# also defined, but not for general use are
+#  APR_LIBRARY and APRUTIL_LIBRARY, where to find the APR library.
+
+# APR first.
+
+FIND_PATH(APR_INCLUDE_DIR apr.h
+/usr/local/include/apr-1
+/usr/local/include/apr-1.0
+/usr/include/apr-1
+/usr/include/apr-1.0
+)
+
+SET(APR_NAMES ${APR_NAMES} apr-1)
+FIND_LIBRARY(APR_LIBRARY
+  NAMES ${APR_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (APR_LIBRARY AND APR_INCLUDE_DIR)
+    SET(APR_LIBRARIES ${APR_LIBRARY})
+    SET(APR_FOUND "YES")
+ELSE (APR_LIBRARY AND APR_INCLUDE_DIR)
+  SET(APR_FOUND "NO")
+ENDIF (APR_LIBRARY AND APR_INCLUDE_DIR)
+
+
+IF (APR_FOUND)
+   IF (NOT APR_FIND_QUIETLY)
+      MESSAGE(STATUS "Found APR: ${APR_LIBRARIES}")
+   ENDIF (NOT APR_FIND_QUIETLY)
+ELSE (APR_FOUND)
+   IF (APR_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find APR library")
+   ENDIF (APR_FIND_REQUIRED)
+ENDIF (APR_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_APR_INCLUDE_PATH ${APR_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_APR_LIB_PATH ${APR_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  APR_LIBRARY
+  APR_INCLUDE_DIR
+  )
+
+# Next, APRUTIL.
+
+FIND_PATH(APRUTIL_INCLUDE_DIR apu.h
+/usr/local/include/apr-1
+/usr/local/include/apr-1.0
+/usr/include/apr-1
+/usr/include/apr-1.0
+)
+
+SET(APRUTIL_NAMES ${APRUTIL_NAMES} aprutil-1)
+FIND_LIBRARY(APRUTIL_LIBRARY
+  NAMES ${APRUTIL_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
+    SET(APRUTIL_LIBRARIES ${APRUTIL_LIBRARY})
+    SET(APRUTIL_FOUND "YES")
+ELSE (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
+  SET(APRUTIL_FOUND "NO")
+ENDIF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
+
+
+IF (APRUTIL_FOUND)
+   IF (NOT APRUTIL_FIND_QUIETLY)
+      MESSAGE(STATUS "Found APRUTIL: ${APRUTIL_LIBRARIES}")
+   ENDIF (NOT APRUTIL_FIND_QUIETLY)
+ELSE (APRUTIL_FOUND)
+   IF (APRUTIL_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find APRUTIL library")
+   ENDIF (APRUTIL_FIND_REQUIRED)
+ENDIF (APRUTIL_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_APRUTIL_INCLUDE_PATH ${APRUTIL_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_APRUTIL_LIB_PATH ${APRUTIL_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  APRUTIL_LIBRARY
+  APRUTIL_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindBerkeleyDB.cmake b/linden/indra/cmake/FindBerkeleyDB.cmake
new file mode 100644
index 0000000..2d633c7
--- /dev/null
+++ b/linden/indra/cmake/FindBerkeleyDB.cmake
@@ -0,0 +1,50 @@
+# -*- cmake -*-
+
+# - Find BerkeleyDB
+# Find the BerkeleyDB includes and library
+# This module defines
+#  DB_INCLUDE_DIR, where to find db.h, etc.
+#  DB_LIBRARIES, the libraries needed to use BerkeleyDB.
+#  DB_FOUND, If false, do not try to use BerkeleyDB.
+# also defined, but not for general use are
+#  DB_LIBRARY, where to find the BerkeleyDB library.
+
+FIND_PATH(DB_INCLUDE_DIR db.h
+/usr/local/include/db4
+/usr/local/include
+/usr/include/db4
+/usr/include
+)
+
+SET(DB_NAMES ${DB_NAMES} db)
+FIND_LIBRARY(DB_LIBRARY
+  NAMES ${DB_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (DB_LIBRARY AND DB_INCLUDE_DIR)
+    SET(DB_LIBRARIES ${DB_LIBRARY})
+    SET(DB_FOUND "YES")
+ELSE (DB_LIBRARY AND DB_INCLUDE_DIR)
+  SET(DB_FOUND "NO")
+ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR)
+
+
+IF (DB_FOUND)
+   IF (NOT DB_FIND_QUIETLY)
+      MESSAGE(STATUS "Found BerkeleyDB: ${DB_LIBRARIES}")
+   ENDIF (NOT DB_FIND_QUIETLY)
+ELSE (DB_FOUND)
+   IF (DB_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find BerkeleyDB library")
+   ENDIF (DB_FIND_REQUIRED)
+ENDIF (DB_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  DB_LIBRARY
+  DB_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindCARes.cmake b/linden/indra/cmake/FindCARes.cmake
new file mode 100644
index 0000000..1ed5b32
--- /dev/null
+++ b/linden/indra/cmake/FindCARes.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+# - Find c-ares
+# Find the c-ares includes and library
+# This module defines
+#  CARES_INCLUDE_DIR, where to find ares.h, etc.
+#  CARES_LIBRARIES, the libraries needed to use c-ares.
+#  CARES_FOUND, If false, do not try to use c-ares.
+# also defined, but not for general use are
+#  CARES_LIBRARY, where to find the c-ares library.
+
+FIND_PATH(CARES_INCLUDE_DIR ares.h
+/usr/local/include
+/usr/include
+)
+
+SET(CARES_NAMES ${CARES_NAMES} cares)
+FIND_LIBRARY(CARES_LIBRARY
+  NAMES ${CARES_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
+    SET(CARES_LIBRARIES ${CARES_LIBRARY})
+    SET(CARES_FOUND "YES")
+ELSE (CARES_LIBRARY AND CARES_INCLUDE_DIR)
+  SET(CARES_FOUND "NO")
+ENDIF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
+
+
+IF (CARES_FOUND)
+   IF (NOT CARES_FIND_QUIETLY)
+      MESSAGE(STATUS "Found c-ares: ${CARES_LIBRARIES}")
+   ENDIF (NOT CARES_FIND_QUIETLY)
+ELSE (CARES_FOUND)
+   IF (CARES_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find c-ares library")
+   ENDIF (CARES_FIND_REQUIRED)
+ENDIF (CARES_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_CARES_INCLUDE_PATH ${CARES_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_CARES_LIB_PATH ${CARES_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  CARES_LIBRARY
+  CARES_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindELFIO.cmake b/linden/indra/cmake/FindELFIO.cmake
new file mode 100644
index 0000000..8a5421a
--- /dev/null
+++ b/linden/indra/cmake/FindELFIO.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+# - Find ELFIO
+# Find the ELFIO includes and library
+# This module defines
+#  ELFIO_INCLUDE_DIR, where to find elfio.h, etc.
+#  ELFIO_LIBRARIES, the libraries needed to use ELFIO.
+#  ELFIO_FOUND, If false, do not try to use ELFIO.
+# also defined, but not for general use are
+#  ELFIO_LIBRARY, where to find the ELFIO library.
+
+FIND_PATH(ELFIO_INCLUDE_DIR ELFIO/ELFIO.h
+/usr/local/include
+/usr/include
+)
+
+SET(ELFIO_NAMES ${ELFIO_NAMES} ELFIO)
+FIND_LIBRARY(ELFIO_LIBRARY
+  NAMES ${ELFIO_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
+    SET(ELFIO_LIBRARIES ${ELFIO_LIBRARY})
+    SET(ELFIO_FOUND "YES")
+ELSE (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
+  SET(ELFIO_FOUND "NO")
+ENDIF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
+
+
+IF (ELFIO_FOUND)
+   IF (NOT ELFIO_FIND_QUIETLY)
+      MESSAGE(STATUS "Found ELFIO: ${ELFIO_LIBRARIES}")
+   ENDIF (NOT ELFIO_FIND_QUIETLY)
+ELSE (ELFIO_FOUND)
+   IF (ELFIO_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find ELFIO library")
+   ENDIF (ELFIO_FIND_REQUIRED)
+ENDIF (ELFIO_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_ELFIO_INCLUDE_PATH ${ELFIO_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_ELFIO_LIB_PATH ${ELFIO_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  ELFIO_LIBRARY
+  ELFIO_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindGooglePerfTools.cmake b/linden/indra/cmake/FindGooglePerfTools.cmake
new file mode 100644
index 0000000..bb125d5
--- /dev/null
+++ b/linden/indra/cmake/FindGooglePerfTools.cmake
@@ -0,0 +1,66 @@
+# -*- cmake -*-
+
+# - Find Google perftools
+# Find the Google perftools includes and libraries
+# This module defines
+#  GOOGLE_PERFTOOLS_INCLUDE_DIR, where to find heap-profiler.h, etc.
+#  GOOGLE_PERFTOOLS_FOUND, If false, do not try to use Google perftools.
+# also defined for general use are
+#  TCMALLOC_LIBRARIES, where to find the tcmalloc library.
+#  STACKTRACE_LIBRARIES, where to find the stacktrace library.
+#  PROFILER_LIBRARIES, where to find the profiler library.
+
+FIND_PATH(GOOGLE_PERFTOOLS_INCLUDE_DIR google/heap-profiler.h
+/usr/local/include
+/usr/include
+)
+
+SET(TCMALLOC_NAMES ${TCMALLOC_NAMES} tcmalloc)
+FIND_LIBRARY(TCMALLOC_LIBRARY
+  NAMES ${TCMALLOC_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
+    SET(TCMALLOC_LIBRARIES ${TCMALLOC_LIBRARY})
+    SET(GOOGLE_PERFTOOLS_FOUND "YES")
+ELSE (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
+  SET(GOOGLE_PERFTOOLS_FOUND "NO")
+ENDIF (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
+
+SET(STACKTRACE_NAMES ${STACKTRACE_NAMES} stacktrace)
+FIND_LIBRARY(STACKTRACE_LIBRARY
+  NAMES ${STACKTRACE_LIBRARY}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (STACKTRACE_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
+    SET(STACKTRACE_LIBRARIES ${STACKTRACE_LIBRARY})
+ENDIF (STACKTRACE_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
+
+SET(PROFILER_NAMES ${PROFILER_NAMES} profiler)
+FIND_LIBRARY(PROFILER_LIBRARY
+  NAMES ${PROFILER_LIBRARY}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (PROFILER_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
+    SET(PROFILER_LIBRARIES ${PROFILER_LIBRARY})
+ENDIF (PROFILER_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
+
+IF (GOOGLE_PERFTOOLS_FOUND)
+   IF (NOT GOOGLE_PERFTOOLS_FIND_QUIETLY)
+      MESSAGE(STATUS "Found Google perftools: ${GOOGLE_PERFTOOLS_LIBRARIES}")
+   ENDIF (NOT GOOGLE_PERFTOOLS_FIND_QUIETLY)
+ELSE (GOOGLE_PERFTOOLS_FOUND)
+   IF (GOOGLE_PERFTOOLS_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Google perftools library")
+   ENDIF (GOOGLE_PERFTOOLS_FIND_REQUIRED)
+ENDIF (GOOGLE_PERFTOOLS_FOUND)
+
+MARK_AS_ADVANCED(
+  TCMALLOC_LIBRARY
+  STACKTRACE_LIBRARY
+  PROFILER_LIBRARY
+  GOOGLE_PERFTOOLS_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindMono.cmake b/linden/indra/cmake/FindMono.cmake
new file mode 100644
index 0000000..f0a0705
--- /dev/null
+++ b/linden/indra/cmake/FindMono.cmake
@@ -0,0 +1,68 @@
+# - Try to find the mono, mcs, gmcs and gacutil
+#
+# defines
+#
+# MONO_FOUND - system has mono, mcs, gmcs and gacutil
+# MONO_PATH - where to find 'mono'
+# MCS_PATH - where to find 'mcs'
+# GMCS_PATH - where to find 'gmcs'
+# GACUTIL_PATH - where to find 'gacutil'
+#
+# copyright (c) 2007 Arno Rehn arno@arnorehn.de
+#
+# Redistribution and use is allowed according to the terms of the GPL license.
+# Removed the check for gmcs
+
+FIND_PROGRAM (MONO_EXECUTABLE mono
+             "C:/Program Files/Mono-1.9.1/bin"
+             "C:/Program Files/Mono-1.2.6/bin"
+             /bin
+             /usr/bin
+             /usr/local/bin
+)
+FIND_PROGRAM (MCS_EXECUTABLE mcs
+             "C:/Program Files/Mono-1.9.1/bin"
+             "C:/Program Files/Mono-1.2.6/bin"
+             /bin
+             /usr/bin
+             /usr/local/bin
+)
+FIND_PROGRAM (GMCS_EXECUTABLE gmcs
+             "C:/Program Files/Mono-1.9.1/bin"
+             "C:/Program Files/Mono-1.2.6/bin"
+             /bin
+             /usr/bin
+             /usr/local/bin
+)
+FIND_PROGRAM (GACUTIL_EXECUTABLE gacutil
+             "C:/Program Files/Mono-1.9.1/bin"
+             "C:/Program Files/Mono-1.2.6/bin"
+             /bin
+             /usr/bin
+             /usr/local/bin
+)
+FIND_PROGRAM (ILASM_EXECUTABLE
+             ilasm
+             NO_DEFAULT_PATH
+             PATHS "C:/Program Files/Mono-1.9.1/bin" "C:/Apps/Mono-1.2.6/bin" "C:/Program Files/Mono-1.2.6/bin" /bin /usr/bin /usr/local/bin
+)
+
+SET (MONO_FOUND FALSE)
+
+IF (MONO_EXECUTABLE AND MCS_EXECUTABLE AND GACUTIL_EXECUTABLE)
+        SET (MONO_FOUND TRUE)
+ENDIF (MONO_EXECUTABLE AND MCS_EXECUTABLE AND GACUTIL_EXECUTABLE)
+
+IF (MONO_FOUND)
+        IF (NOT Mono_FIND_QUIETLY)
+                MESSAGE(STATUS "Found mono: ${MONO_EXECUTABLE}")
+                MESSAGE(STATUS "Found mcs: ${MCS_EXECUTABLE}")
+                MESSAGE(STATUS "Found gacutil: ${GACUTIL_EXECUTABLE}")
+        ENDIF (NOT Mono_FIND_QUIETLY)
+ELSE (MONO_FOUND)
+        IF (Mono_FIND_REQUIRED)
+                MESSAGE(FATAL_ERROR "Could not find one or more of the following programs: mono, mcs, gacutil")
+        ENDIF (Mono_FIND_REQUIRED)
+ENDIF (MONO_FOUND)
+
+MARK_AS_ADVANCED(MONO_EXECUTABLE MCS_EXECUTABLE GACUTIL_EXECUTABLE)
diff --git a/linden/indra/cmake/FindMySQL.cmake b/linden/indra/cmake/FindMySQL.cmake
new file mode 100644
index 0000000..4319403
--- /dev/null
+++ b/linden/indra/cmake/FindMySQL.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+# - Find MySQL
+# Find the MySQL includes and library
+# This module defines
+#  MYSQL_INCLUDE_DIR, where to find mysql.h, etc.
+#  MYSQL_LIBRARIES, the libraries needed to use Mysql.
+#  MYSQL_FOUND, If false, do not try to use Mysql.
+# also defined, but not for general use are
+#  MYSQL_LIBRARY, where to find the Mysql library.
+
+FIND_PATH(MYSQL_INCLUDE_DIR mysql/mysql.h
+/usr/local/include
+/usr/include
+)
+
+SET(MYSQL_NAMES ${MYSQL_NAMES} mysqlclient)
+FIND_LIBRARY(MYSQL_LIBRARY
+  NAMES ${MYSQL_NAMES}
+  PATHS /usr/lib/mysql /usr/lib /usr/local/lib/mysql /usr/local/lib
+  )
+
+IF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR)
+    SET(MYSQL_LIBRARIES ${MYSQL_LIBRARY})
+    SET(MYSQL_FOUND "YES")
+ELSE (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR)
+  SET(MYSQL_FOUND "NO")
+ENDIF (MYSQL_LIBRARY AND MYSQL_INCLUDE_DIR)
+
+
+IF (MYSQL_FOUND)
+   IF (NOT MYSQL_FIND_QUIETLY)
+      MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARIES}")
+   ENDIF (NOT MYSQL_FIND_QUIETLY)
+ELSE (MYSQL_FOUND)
+   IF (MYSQL_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find MySQL library")
+   ENDIF (MYSQL_FIND_REQUIRED)
+ENDIF (MYSQL_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_MYSQL_INCLUDE_PATH ${MYSQL_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_MYSQL_LIB_PATH ${MYSQL_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  MYSQL_LIBRARY
+  MYSQL_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindOpenJPEG.cmake b/linden/indra/cmake/FindOpenJPEG.cmake
new file mode 100644
index 0000000..949384e
--- /dev/null
+++ b/linden/indra/cmake/FindOpenJPEG.cmake
@@ -0,0 +1,50 @@
+# -*- cmake -*-
+
+# - Find OpenJPEG
+# Find the OpenJPEG includes and library
+# This module defines
+#  OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc.
+#  OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG.
+#  OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
+# also defined, but not for general use are
+#  OPENJPEG_LIBRARY, where to find the OpenJPEG library.
+
+FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
+/usr/local/include/openjpeg
+/usr/local/include
+/usr/include/openjpeg
+/usr/include
+)
+
+SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
+FIND_LIBRARY(OPENJPEG_LIBRARY
+  NAMES ${OPENJPEG_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
+    SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
+    SET(OPENJPEG_FOUND "YES")
+ELSE (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
+  SET(OPENJPEG_FOUND "NO")
+ENDIF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
+
+
+IF (OPENJPEG_FOUND)
+   IF (NOT OPENJPEG_FIND_QUIETLY)
+      MESSAGE(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}")
+   ENDIF (NOT OPENJPEG_FIND_QUIETLY)
+ELSE (OPENJPEG_FOUND)
+   IF (OPENJPEG_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find OpenJPEG library")
+   ENDIF (OPENJPEG_FIND_REQUIRED)
+ENDIF (OPENJPEG_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_OPENJPEG_INCLUDE_PATH ${OPENJPEG_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_OPENJPEG_LIB_PATH ${OPENJPEG_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  OPENJPEG_LIBRARY
+  OPENJPEG_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindSCP.cmake b/linden/indra/cmake/FindSCP.cmake
new file mode 100644
index 0000000..ea02102
--- /dev/null
+++ b/linden/indra/cmake/FindSCP.cmake
@@ -0,0 +1,40 @@
+# -*- cmake -*-
+#
+# Find the OpenSSH scp ("secure copy") or Putty pscp command.
+#
+# Input variables:
+#   SCP_FIND_REQUIRED - set this if configuration should fail without scp
+#
+# Output variables:
+#
+#   SCP_FOUND - set if scp was found
+#   SCP_EXECUTABLE - path to scp or pscp executable
+#   SCP_BATCH_FLAG - how to put scp/pscp into batch mode
+
+SET(SCP_EXECUTABLE)
+IF (WINDOWS)
+  FIND_PROGRAM(SCP_EXECUTABLE NAMES pscp pscp.exe)
+ELSE (WINDOWS)
+  FIND_PROGRAM(SCP_EXECUTABLE NAMES scp scp.exe)
+ENDIF (WINDOWS)
+
+IF (SCP_EXECUTABLE)
+  SET(SCP_FOUND ON)
+ELSE (SCP_EXECUTABLE)
+  SET(SCP_FOUND OFF)
+ENDIF (SCP_EXECUTABLE)
+
+IF (SCP_FOUND)
+  GET_FILENAME_COMPONENT(_scp_name ${SCP_EXECUTABLE} NAME_WE)
+  IF (_scp_name STREQUAL scp)
+    SET(SCP_BATCH_FLAG -B)
+  ELSE (_scp_name STREQUAL scp)
+    SET(SCP_BATCH_FLAG -batch)
+  ENDIF (_scp_name STREQUAL scp)
+ELSE (SCP_FOUND)
+  IF (SCP_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find scp or pscp executable")
+  ENDIF (SCP_FIND_REQUIRED)
+ENDIF (SCP_FOUND)
+
+MARK_AS_ADVANCED(SCP_EXECUTABLE SCP_FOUND SCP_BATCH_FLAG)
diff --git a/linden/indra/cmake/FindXmlRpcEpi.cmake b/linden/indra/cmake/FindXmlRpcEpi.cmake
new file mode 100644
index 0000000..ba217e7
--- /dev/null
+++ b/linden/indra/cmake/FindXmlRpcEpi.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+# - Find XMLRPC-EPI
+# Find the XMLRPC-EPI includes and library
+# This module defines
+#  XMLRPCEPI_INCLUDE_DIR, where to find jpeglib.h, etc.
+#  XMLRPCEPI_LIBRARIES, the libraries needed to use XMLRPC-EPI.
+#  XMLRPCEPI_FOUND, If false, do not try to use XMLRPC-EPI.
+# also defined, but not for general use are
+#  XMLRPCEPI_LIBRARY, where to find the XMLRPC-EPI library.
+
+FIND_PATH(XMLRPCEPI_INCLUDE_DIR xmlrpc-epi/xmlrpc.h
+/usr/local/include
+/usr/include
+)
+
+SET(XMLRPCEPI_NAMES ${XMLRPCEPI_NAMES} xmlrpc-epi)
+FIND_LIBRARY(XMLRPCEPI_LIBRARY
+  NAMES ${XMLRPCEPI_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR)
+    SET(XMLRPCEPI_LIBRARIES ${XMLRPCEPI_LIBRARY})
+    SET(XMLRPCEPI_FOUND "YES")
+ELSE (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR)
+  SET(XMLRPCEPI_FOUND "NO")
+ENDIF (XMLRPCEPI_LIBRARY AND XMLRPCEPI_INCLUDE_DIR)
+
+
+IF (XMLRPCEPI_FOUND)
+   IF (NOT XMLRPCEPI_FIND_QUIETLY)
+      MESSAGE(STATUS "Found XMLRPC-EPI: ${XMLRPCEPI_LIBRARIES}")
+   ENDIF (NOT XMLRPCEPI_FIND_QUIETLY)
+ELSE (XMLRPCEPI_FOUND)
+   IF (XMLRPCEPI_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find XMLRPC-EPI library")
+   ENDIF (XMLRPCEPI_FIND_REQUIRED)
+ENDIF (XMLRPCEPI_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_XMLRPCEPI_INCLUDE_PATH ${XMLRPCEPI_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_XMLRPCEPI_LIB_PATH ${XMLRPCEPI_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  XMLRPCEPI_LIBRARY
+  XMLRPCEPI_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FreeType.cmake b/linden/indra/cmake/FreeType.cmake
new file mode 100644
index 0000000..5f1aa26
--- /dev/null
+++ b/linden/indra/cmake/FreeType.cmake
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(FREETYPE REQUIRED freetype2)
+else (STANDALONE)
+  use_prebuilt_binary(freetype)
+  if (LINUX)
+    set(FREETYPE_INCLUDE_DIRS
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  else (LINUX)
+    set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  endif (LINUX)
+
+  set(FREETYPE_LIBRARIES freetype)
+endif (STANDALONE)
+
+link_directories(${FREETYPE_LIBRARY_DIRS})
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
new file mode 100644
index 0000000..10d5207
--- /dev/null
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -0,0 +1,38 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
+  pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
+elseif (LINUX)
+  use_prebuilt_binary(gstreamer)
+  # possible libxml should have its own .cmake file instead
+  use_prebuilt_binary(libxml)
+  set(GSTREAMER_FOUND ON FORCE BOOL)
+  set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
+  set(GSTREAMER_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
+      )
+  # We don't need to explicitly link against gstreamer itself, because
+  # LLMediaImplGStreamer probes for the system's copy at runtime.
+  set(GSTREAMER_LIBRARIES
+      gobject-2.0
+      gmodule-2.0
+      dl
+      gthread-2.0
+      rt
+      glib-2.0
+      )
+endif (STANDALONE)
+
+if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
+  set(GSTREAMER ON CACHE BOOL "Build with GStreamer streaming media support.")
+endif (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
+
+if (GSTREAMER)
+  add_definitions(-DLL_GSTREAMER_ENABLED=1)
+endif (GSTREAMER)
diff --git a/linden/indra/cmake/GooglePerfTools.cmake b/linden/indra/cmake/GooglePerfTools.cmake
new file mode 100644
index 0000000..9b3eca0
--- /dev/null
+++ b/linden/indra/cmake/GooglePerfTools.cmake
@@ -0,0 +1,28 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindGooglePerfTools)
+else (STANDALONE)
+  use_prebuilt_binary(google)
+  if (LINUX)
+    set(TCMALLOC_LIBRARIES tcmalloc)
+    set(STACKTRACE_LIBRARIES stacktrace)
+    set(PROFILER_LIBRARIES profiler)
+    set(GOOGLE_PERFTOOLS_INCLUDE_DIR
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(GOOGLE_PERFTOOLS_FOUND "YES")
+  endif (LINUX)
+endif (STANDALONE)
+
+if (GOOGLE_PERFTOOLS_FOUND)
+  set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
+endif (GOOGLE_PERFTOOLS_FOUND)
+
+if (USE_GOOGLE_PERFTOOLS)
+  set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
+  include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
+  set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES})
+else (USE_GOOGLE_PERFTOOLS)
+  set(TCMALLOC_FLAG -ULL_USE_TCMALLOC)
+endif (USE_GOOGLE_PERFTOOLS)
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake
new file mode 100644
index 0000000..5d0ee0d
--- /dev/null
+++ b/linden/indra/cmake/JPEG.cmake
@@ -0,0 +1,23 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+include(Linking)
+set(JPEG_FIND_QUIETLY ON)
+set(JPEG_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindJPEG)
+else (STANDALONE)
+  use_prebuilt_binary(jpeglib)
+  if (LINUX)
+    set(JPEG_LIBRARIES jpeg)
+  elseif (DARWIN)
+    set(JPEG_LIBRARIES
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
+      )
+  elseif (WINDOWS)
+    set(JPEG_LIBRARIES jpeglib_6b)
+  endif (LINUX)
+  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
new file mode 100644
index 0000000..7b9f254
--- /dev/null
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+include(Audio)
+
+set(LLAUDIO_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llaudio
+    )
+
+set(LLAUDIO_LIBRARIES
+    llaudio
+    ${VORBISENC_LIBRARIES}
+    ${VORBISFILE_LIBRARIES}
+    ${VORBIS_LIBRARIES}
+    ${OGG_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/LLCharacter.cmake b/linden/indra/cmake/LLCharacter.cmake
new file mode 100644
index 0000000..c74092c
--- /dev/null
+++ b/linden/indra/cmake/LLCharacter.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+set(LLCHARACTER_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llcharacter
+    )
+
+set(LLCHARACTER_LIBRARIES
+    llcharacter
+    )
diff --git a/linden/indra/cmake/LLCommon.cmake b/linden/indra/cmake/LLCommon.cmake
new file mode 100644
index 0000000..f4b251e
--- /dev/null
+++ b/linden/indra/cmake/LLCommon.cmake
@@ -0,0 +1,21 @@
+# -*- cmake -*-
+
+include(APR)
+include(Boost)
+include(EXPAT)
+include(ZLIB)
+
+set(LLCOMMON_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llcommon
+    ${APRUTIL_INCLUDE_DIR}
+    ${APR_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIRS}
+    )
+
+set(LLCOMMON_LIBRARIES
+    llcommon
+    ${APRUTIL_LIBRARIES}
+    ${APR_LIBRARIES}
+    ${EXPAT_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/LLCrashLogger.cmake b/linden/indra/cmake/LLCrashLogger.cmake
new file mode 100644
index 0000000..7b362d0
--- /dev/null
+++ b/linden/indra/cmake/LLCrashLogger.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+set(LLCRASHLOGGER_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llcrashlogger
+    )
+
+set(LLCRASHLOGGER_LIBRARIES
+    llcrashlogger
+    )
diff --git a/linden/indra/cmake/LLDatabase.cmake b/linden/indra/cmake/LLDatabase.cmake
new file mode 100644
index 0000000..c3cf622
--- /dev/null
+++ b/linden/indra/cmake/LLDatabase.cmake
@@ -0,0 +1,13 @@
+# -*- cmake -*-
+
+include(MySQL)
+
+set(LLDATABASE_INCLUDE_DIRS
+    ${LIBS_SERVER_DIR}/lldatabase
+    ${MYSQL_INCLUDE_DIR}
+    )
+
+set(LLDATABASE_LIBRARIES
+    lldatabase
+    ${MYSQL_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/LLImage.cmake b/linden/indra/cmake/LLImage.cmake
new file mode 100644
index 0000000..8874fa5
--- /dev/null
+++ b/linden/indra/cmake/LLImage.cmake
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+include(JPEG)
+include(PNG)
+
+set(LLIMAGE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llimage
+    ${JPEG_INCLUDE_DIRS}
+    )
+
+set(LLIMAGE_LIBRARIES
+    llimage
+    ${JPEG_LIBRARIES}
+    ${PNG_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/LLImageJ2COJ.cmake b/linden/indra/cmake/LLImageJ2COJ.cmake
new file mode 100644
index 0000000..91973e0
--- /dev/null
+++ b/linden/indra/cmake/LLImageJ2COJ.cmake
@@ -0,0 +1,8 @@
+# -*- cmake -*-
+
+include(OpenJPEG)
+
+set(LLIMAGEJ2COJ_LIBRARIES
+    llimagej2coj
+    ${OPENJPEG_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/LLInventory.cmake b/linden/indra/cmake/LLInventory.cmake
new file mode 100644
index 0000000..7d5f492
--- /dev/null
+++ b/linden/indra/cmake/LLInventory.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+set(LLINVENTORY_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llinventory
+    )
+
+set(LLINVENTORY_LIBRARIES
+    llinventory
+    )
diff --git a/linden/indra/cmake/LLKDU.cmake b/linden/indra/cmake/LLKDU.cmake
new file mode 100644
index 0000000..a02b5d9
--- /dev/null
+++ b/linden/indra/cmake/LLKDU.cmake
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
+  use_prebuilt_binary(kdu)
+  if (WINDOWS)
+    set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
+  elseif (LINUX)
+    set(KDU_LIBRARY kdu_v42R)
+  else (WINDOWS)
+    set(KDU_LIBRARY kdu)
+  endif (WINDOWS)
+
+  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+
+  set(LLKDU_LIBRARY llkdu)
+  set(LLKDU_STATIC_LIBRARY llkdu_static)
+  set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
+  set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
+endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
diff --git a/linden/indra/cmake/LLMath.cmake b/linden/indra/cmake/LLMath.cmake
new file mode 100644
index 0000000..8afd45e
--- /dev/null
+++ b/linden/indra/cmake/LLMath.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+set(LLMATH_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llmath
+    )
+
+set(LLMATH_LIBRARIES
+    llmath
+    )
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
new file mode 100644
index 0000000..b7bf11c
--- /dev/null
+++ b/linden/indra/cmake/LLMedia.cmake
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+include(GStreamer)
+include(QuickTime)
+
+set(LLMEDIA_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llmedia
+    )
+
+set(LLMEDIA_LIBRARIES
+    llmedia
+    ${GSTREAMER_LIBRARIES}
+    ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
+    ${QUICKTIME_LIBRARY}
+    )
diff --git a/linden/indra/cmake/LLMessage.cmake b/linden/indra/cmake/LLMessage.cmake
new file mode 100644
index 0000000..1cea03a
--- /dev/null
+++ b/linden/indra/cmake/LLMessage.cmake
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+
+include(CARes)
+include(CURL)
+include(OpenSSL)
+include(XmlRpcEpi)
+
+set(LLMESSAGE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llmessage
+    ${CARES_INCLUDE_DIRS}
+    ${CURL_INCLUDE_DIRS}
+    ${OPENSSL_INCLUDE_DIRS}
+    )
+
+set(LLMESSAGE_LIBRARIES
+    llmessage
+    ${CURL_LIBRARIES}
+    ${CARES_LIBRARIES}
+    ${OPENSSL_LIBRARIES}
+    ${CRYPTO_LIBRARIES}
+    ${XMLRPCEPI_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/LLPhysics.cmake b/linden/indra/cmake/LLPhysics.cmake
new file mode 100644
index 0000000..3ae390e
--- /dev/null
+++ b/linden/indra/cmake/LLPhysics.cmake
@@ -0,0 +1,76 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(havok)
+
+set(HAVOK_VERSION 460)
+
+set(LLPHYSICS_INCLUDE_DIRS
+    ${LIBS_SERVER_DIR}/llphysics
+    ${LIBS_PREBUILT_DIR}/include/havok/hk${HAVOK_VERSION}/common
+    ${LIBS_PREBUILT_DIR}/include/havok/hk${HAVOK_VERSION}/physics
+    )
+
+add_definitions(-DLL_CURRENT_HAVOK_VERSION=${HAVOK_VERSION})
+
+if (LINUX OR DARWIN)
+  if (DARWIN)
+    link_directories(
+        ${LIBS_PREBUILT_DIR}/universal-darwin/lib_release/havok/hk460
+        )
+  else (DARWIN)
+    link_directories(
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release/havok/hk460
+        )
+  endif (DARWIN)
+
+  set(LLPHYSICS_LIBRARIES 
+      llphysics
+      hkcompat 
+      hkutilities 
+      hkvisualize 
+      hkdynamics 
+      hkvehicle 
+      hkcollide 
+      hkinternal 
+      hkconstraintsolver 
+      hkmath 
+      hkscenedata 
+      hkserialize 
+      hkgraphicsogl 
+      hkgraphicsbridge 
+      hkgraphics 
+      hkdemoframework 
+      hkbase
+      )
+elseif (WINDOWS)
+  if (MSVC71)
+    set(HK_DEBUG ${WINLIBS_PREBUILT_DEBUG_DIR}/havok/hk460)
+    set(HK_RELEASE ${WINLIBS_PREBUILT_RELEASE_DIR}/havok/hk460)
+  else (MSVC71)
+    set(HK_DEBUG ${WINLIBS_PREBUILT_DEBUG_DIR}/havok/hk460_net_8-0)
+    set(HK_RELEASE ${WINLIBS_PREBUILT_RELEASE_DIR}/havok/hk460_net_8-0)
+  endif (MSVC71)
+
+  set(HAVOK_LIBS
+      hkbase
+      hkdynamics
+      hkmath
+      hkcollide
+      hkutilities
+      hkvisualize
+      hkinternal
+      hkconstraintsolver
+      hkcompat
+      hkserialize
+      hkvehicle
+      hkscenedata
+      )
+
+  set(LLPHYSICS_LIBRARIES llphysics)
+
+  foreach(lib ${HAVOK_LIBS})
+    list(APPEND LLPHYSICS_LIBRARIES 
+         debug ${HK_DEBUG}/${lib} optimized ${HK_RELEASE}/${lib})
+  endforeach(lib)
+endif (LINUX OR DARWIN)
diff --git a/linden/indra/cmake/LLPrimitive.cmake b/linden/indra/cmake/LLPrimitive.cmake
new file mode 100644
index 0000000..0426ae5
--- /dev/null
+++ b/linden/indra/cmake/LLPrimitive.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+set(LLPRIMITIVE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llprimitive
+    )
+
+set(LLPRIMITIVE_LIBRARIES
+    llprimitive
+    )
diff --git a/linden/indra/cmake/LLRender.cmake b/linden/indra/cmake/LLRender.cmake
new file mode 100644
index 0000000..bbcf4cd
--- /dev/null
+++ b/linden/indra/cmake/LLRender.cmake
@@ -0,0 +1,32 @@
+# -*- cmake -*-
+
+include(FreeType)
+
+set(LLRENDER_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llrender
+    )
+
+if (SERVER AND LINUX)
+  set(LLRENDER_LIBRARIES
+      llrenderheadless
+      )
+else (SERVER AND LINUX)
+set(LLRENDER_LIBRARIES
+    llrender
+    )
+endif (SERVER AND LINUX)
+
+# mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set
+# differently for different object files.
+macro (copy_server_sources _copied_SOURCES)
+  foreach (PREFIX ${_copied_SOURCES})
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp
+        COMMAND ${CMAKE_COMMAND}
+        ARGS -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp
+             ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PREFIX}.cpp
+        )
+    list(APPEND server_SOURCE_FILES ${PREFIX}_server.cpp)
+  endforeach (PREFIX ${_copied_SOURCES})
+endmacro (copy_server_sources _copied_SOURCES)
diff --git a/linden/indra/cmake/LLScene.cmake b/linden/indra/cmake/LLScene.cmake
new file mode 100644
index 0000000..d1c32b3
--- /dev/null
+++ b/linden/indra/cmake/LLScene.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+set(LLSCENE_INCLUDE_DIRS
+    ${LIBS_SERVER_DIR}/llscene
+    )
+
+set(LLSCENE_LIBRARIES
+    llscene
+    )
diff --git a/linden/indra/cmake/LLUI.cmake b/linden/indra/cmake/LLUI.cmake
new file mode 100644
index 0000000..d1287de
--- /dev/null
+++ b/linden/indra/cmake/LLUI.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+
+set(LLUI_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llui
+    )
+
+set(LLUI_LIBRARIES
+    llui
+    )
diff --git a/linden/indra/cmake/LLVFS.cmake b/linden/indra/cmake/LLVFS.cmake
new file mode 100644
index 0000000..5ce3d25
--- /dev/null
+++ b/linden/indra/cmake/LLVFS.cmake
@@ -0,0 +1,13 @@
+# -*- cmake -*-
+
+set(LLVFS_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llvfs
+    )
+
+set(LLVFS_LIBRARIES llvfs)
+
+if (DARWIN)
+  include(CMakeFindFrameworks)
+  find_library(CARBON_LIBRARY Carbon)
+  list(APPEND LLVFS_LIBRARIES ${CARBON_LIBRARY})
+endif (DARWIN)
diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake
new file mode 100644
index 0000000..c0efa27
--- /dev/null
+++ b/linden/indra/cmake/LLWindow.cmake
@@ -0,0 +1,43 @@
+# -*- cmake -*-
+
+include(OpenGL)
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindSDL)
+
+  # This should be done by FindSDL.  Sigh.
+  mark_as_advanced(
+      SDLMAIN_LIBRARY
+      SDL_INCLUDE_DIR
+      SDL_LIBRARY
+      )
+else (STANDALONE)
+  use_prebuilt_binary(SDL)
+  use_prebuilt_binary(mesa)
+  if (LINUX AND VIEWER)
+    set (SDL_FOUND TRUE)
+    set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux)
+    set (SDL_LIBRARY SDL)
+  endif (LINUX AND VIEWER)
+endif (STANDALONE)
+
+if (SDL_FOUND)
+  add_definitions(-DLL_SDL=1)
+  include_directories(${SDL_INCLUDE_DIR})
+endif (SDL_FOUND)
+
+set(LLWINDOW_INCLUDE_DIRS
+    ${GLEXT_INCLUDE_DIR}
+    ${LIBS_OPEN_DIR}/llwindow
+    )
+
+if (SERVER AND LINUX)
+  set(LLWINDOW_LIBRARIES
+      llwindowheadless
+      )
+else (SERVER AND LINUX)
+  set(LLWINDOW_LIBRARIES
+      llwindow
+      )
+endif (SERVER AND LINUX)
diff --git a/linden/indra/cmake/LLXML.cmake b/linden/indra/cmake/LLXML.cmake
new file mode 100644
index 0000000..1ce93c0
--- /dev/null
+++ b/linden/indra/cmake/LLXML.cmake
@@ -0,0 +1,13 @@
+# -*- cmake -*-
+
+include(EXPAT)
+
+set(LLXML_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llxml
+    ${EXPAT_INCLUDE_DIRS}
+    )
+
+set(LLXML_LIBRARIES
+    llxml
+    ${EXPAT_LIBRARIES}
+    )
diff --git a/linden/indra/cmake/LScript.cmake b/linden/indra/cmake/LScript.cmake
new file mode 100644
index 0000000..86bfcb7
--- /dev/null
+++ b/linden/indra/cmake/LScript.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+
+set(LSCRIPT_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/lscript
+    ${LIBS_OPEN_DIR}/lscript/lscript_compile
+    ${LIBS_OPEN_DIR}/lscript/lscript_execute    
+    ${LIBS_OPEN_DIR}/lscript/lscript_execute_mono
+    )
+
+set(LSCRIPT_LIBRARIES
+    lscript_compile
+    lscript_execute    
+    lscript_library
+    )
+
+set(LSCRIPT_EXECUTE_MONO_LIBRARIES lscript_execute_mono)
\ No newline at end of file
diff --git a/linden/indra/cmake/Linking.cmake b/linden/indra/cmake/Linking.cmake
new file mode 100644
index 0000000..c9748e3
--- /dev/null
+++ b/linden/indra/cmake/Linking.cmake
@@ -0,0 +1,45 @@
+# -*- cmake -*-
+
+if (NOT STANDALONE)
+  if (WINDOWS)
+    set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
+    set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
+  elseif (LINUX)
+    if (VIEWER)
+      set(ARCH_PREBUILT_DIRS 
+          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
+      set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
+      set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
+    else (VIEWER)
+      set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
+    endif (VIEWER)
+  elseif (DARWIN)
+    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
+    set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
+  endif (WINDOWS)
+endif (NOT STANDALONE)
+
+link_directories(${ARCH_PREBUILT_DIRS})
+
+if (LINUX)
+  set(DL_LIBRARY dl)
+  set(PTHREAD_LIBRARY pthread)
+else (LINUX)
+  set(DL_LIBRARY "")
+  set(PTHREAD_LIBRARY "")
+endif (LINUX)
+
+if (WINDOWS)
+  set(WINDOWS_LIBRARIES
+      ws2_32
+      mswsock
+      psapi
+      winmm
+      netapi32
+      )
+else (WINDOWS)
+  set(WINDOWS_LIBRARIES "")
+endif (WINDOWS)
+    
+mark_as_advanced(DL_LIBRARY PTHREAD_LIBRARY WINDOWS_LIBRARIES)
diff --git a/linden/indra/cmake/MonoDeps.cmake b/linden/indra/cmake/MonoDeps.cmake
new file mode 100644
index 0000000..52d5491
--- /dev/null
+++ b/linden/indra/cmake/MonoDeps.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+set(MONO_PREBUILT_LIBRARIES_DIR ${LIBS_PREBUILT_DIR}/mono/1.0)
+
+set(MONO_PREBUILT_LIBRARIES
+     Iesi.Collections.dll
+     Iesi.Collections.pdb
+     Mono.CompilerServices.SymbolWriter.dll
+     Mono.PEToolkit.dll
+     Mono.PEToolkit.pdb
+     Mono.Security.dll
+     PEAPI.dll
+     RAIL.dll
+     RAIL.pdb
+  )
+  
+  set(MONO_CORE_LIBRARIES
+    System.dll
+    System.Xml.dll
+    mscorlib.dll)
+    
+if(WINDOWS)
+    set(MONO_DEPENDENCIES
+        DomainCreator
+        DomainRegister
+        LslLibrary
+        LslUserScript
+        Script
+        ScriptTypes
+        TestFormat
+        UserScript
+        UThread
+        UThreadInjector
+        )
+else(WINDOWS)
+    set(MONO_DEPENDENCIES
+        DomainCreator_POST_BUILD
+        DomainRegister_POST_BUILD
+        LslLibrary_POST_BUILD
+        LslUserScript_POST_BUILD
+        Script_POST_BUILD
+        ScriptTypes_POST_BUILD
+        TestFormat_POST_BUILD
+        UserScript_POST_BUILD
+        UThread_POST_BUILD
+        UThreadInjector_POST_BUILD
+        )
+endif(WINDOWS)
diff --git a/linden/indra/cmake/MonoEmbed.cmake b/linden/indra/cmake/MonoEmbed.cmake
new file mode 100644
index 0000000..0f1f233
--- /dev/null
+++ b/linden/indra/cmake/MonoEmbed.cmake
@@ -0,0 +1,57 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+use_prebuilt_binary(libmono)
+
+SET(GLIB_2_0 glib-2.0)
+
+if (WINDOWS)
+    SET(MONO_LIB mono) 
+else (WINDOWS)
+    SET(MONO_LIB mono)
+    SET(M_LIBRARIES m)
+    SET(GTHREAD_2_0 gthread-2.0)
+endif(WINDOWS)
+
+
+IF (DARWIN)
+
+  FIND_LIBRARY(MONO_LIBRARY NAMES Mono)
+  # Find_file doesnt work as expected. Hardcode relative to Mono.framework. 
+  #FIND_FILE(GLIB_CONFIG glibconfig.h ${MONO_LIBRARY})
+  #FIND_FILE(MONO_GLIB_LIBRARY glib.h ${MONO_LIBRARY})
+  SET(MONO_GLIB_LIBRARY ${MONO_LIBRARY}/Headers/glib-2.0/)
+  SET(GLIB_CONFIG ${MONO_LIBRARY}/Libraries/glib-2.0/include/)
+  SET(MONO_LIB_DIRECTORY ${MONO_LIBRARY}/Libraries)
+
+  IF (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG)
+    MESSAGE(STATUS "Found Mono for embedding")
+    INCLUDE_DIRECTORIES(${MONO_GLIB_LIBRARY} ${GLIB_CONFIG})
+    LINK_DIRECTORIES(${MONO_LIB_DIRECTORY})
+  ELSE (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG)
+    MESSAGE(FATAL_ERROR "Mono not found for embedding")   
+    MESSAGE(${MONO_LIBRARY})
+    MESSAGE(${MONO_GLIB_LIBRARY})
+    MESSAGE(${GLIB_CONFIG})
+  ENDIF (MONO_LIBRARY AND MONO_GLIB_LIBRARY AND GLIB_CONFIG)
+
+ELSE (DARWIN)
+
+  SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)  
+  SET(GLIB_2_0_PLATFORM_INCLUDE_DIR
+    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0)
+  SET(GLIB_2_0_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glib-2.0)
+
+  INCLUDE_DIRECTORIES(
+    ${MONO_INCLUDE_DIR} 
+    ${GLIB_2_0_PLATFORM_INCLUDE_DIR} 
+    ${GLIB_2_0_INCLUDE_DIR})
+    
+ENDIF (DARWIN) 
+
+SET(MONO_LIBRARIES 
+    ${MONO_LIB} 
+    ${M_LIBRARIES} 
+    ${GLIB_2_0}
+    ${GTHREAD_2_0} 
+)
diff --git a/linden/indra/cmake/Mozlib.cmake b/linden/indra/cmake/Mozlib.cmake
new file mode 100644
index 0000000..e9555df
--- /dev/null
+++ b/linden/indra/cmake/Mozlib.cmake
@@ -0,0 +1,47 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (STANDALONE)
+    set(MOZLIB OFF CACHE BOOL 
+        "Enable Mozilla support in the viewer (requires llmozlib library).")
+else (STANDALONE)
+    use_prebuilt_binary(llmozlib)
+    set(MOZLIB ON CACHE BOOL
+        "Enable Mozilla support in the viewer (requires llmozlib library).")
+endif (STANDALONE)
+
+if (MOZLIB)
+    add_definitions(-DLL_LLMOZLIB_ENABLED=1)
+
+    if (LINUX)
+        link_directories(${CMAKE_SOURCE_DIR}/newview/app_settings/mozilla-runtime-linux-${ARCH})
+        set(MOZLIB_LIBRARIES
+            llmozlib2
+            mozjs
+            nspr4
+            plc4
+            plds4
+            xpcom
+            xul
+            profdirserviceprovider_s
+            )
+    elseif (WINDOWS)
+        if (MSVC71)
+            set(MOZLIB_LIBRARIES 
+                debug llmozlib2d
+                optimized llmozlib2)
+        elseif (MSVC80 OR MSVC90)
+            set(MOZLIB_LIBRARIES 
+                debug llmozlib2d-vc80
+                optimized llmozlib2-vc80)
+        endif (MSVC71)
+    else (LINUX)
+        set(MOZLIB_LIBRARIES
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllmozlib2.dylib
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllmozlib2.dylib
+          )
+    endif (LINUX)
+else (MOZLIB)
+    add_definitions(-DLL_LLMOZLIB_ENABLED=0)
+endif (MOZLIB)
diff --git a/linden/indra/cmake/MySQL.cmake b/linden/indra/cmake/MySQL.cmake
new file mode 100644
index 0000000..97dd091
--- /dev/null
+++ b/linden/indra/cmake/MySQL.cmake
@@ -0,0 +1,23 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+# We don't prebuild our own MySQL client library.
+
+use_prebuilt_binary(mysql)
+
+set(MYSQL_FIND_QUIETLY ON)
+set(MYSQL_FIND_REQUIRED ON)
+
+if (WINDOWS)
+  set(MYSQL_LIBRARIES mysqlclient)
+  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+elseif (DARWIN)
+  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(MYSQL_LIBRARIES
+    optimized ${LIBS_PREBUILT_DIRS_RELEASE}/libmysqlclient.a
+    debug ${LIBS_PREBUILT_DIRS_DEBUG}/libmysqlclient.a
+    )
+else (WINDOWS)
+    set(MYSQL_FIND_REQUIRED)
+    include(FindMySQL)
+endif (WINDOWS)
diff --git a/linden/indra/cmake/NDOF.cmake b/linden/indra/cmake/NDOF.cmake
new file mode 100644
index 0000000..3f715a2
--- /dev/null
+++ b/linden/indra/cmake/NDOF.cmake
@@ -0,0 +1,14 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(ndofdev)
+
+if (WINDOWS OR DARWIN)
+  add_definitions(-DLIB_NDOF=1)
+endif (WINDOWS OR DARWIN)
+
+if (WINDOWS)
+  set(NDOF_LIBRARY libndofdev)
+elseif (DARWIN)
+  set(NDOF_LIBRARY ndofdev)
+endif (WINDOWS)
diff --git a/linden/indra/cmake/OpenGL.cmake b/linden/indra/cmake/OpenGL.cmake
new file mode 100644
index 0000000..6a2b681
--- /dev/null
+++ b/linden/indra/cmake/OpenGL.cmake
@@ -0,0 +1,9 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(GL)
+  # possible glh_linear should have its own .cmake file instead
+  use_prebuilt_binary(glh_linear)
+  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+endif (NOT STANDALONE)
diff --git a/linden/indra/cmake/OpenJPEG.cmake b/linden/indra/cmake/OpenJPEG.cmake
new file mode 100644
index 0000000..fcc82c2
--- /dev/null
+++ b/linden/indra/cmake/OpenJPEG.cmake
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(OPENJPEG_FIND_QUIETLY ON)
+set(OPENJPEG_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindOpenJPEG)
+else (STANDALONE)
+  use_prebuilt_binary(openjpeg)
+  
+  if(WINDOWS)
+    # Windows has differently named release and debug openjpeg(d) libs.
+    set(OPENJPEG_LIBRARIES 
+        debug openjpegd
+        optimized openjpeg)
+  else(WINDOWS)
+    set(OPENJPEG_LIBRARIES openjpeg)
+  endif(WINDOWS)
+  
+    set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/OpenSSL.cmake b/linden/indra/cmake/OpenSSL.cmake
new file mode 100644
index 0000000..81584c0
--- /dev/null
+++ b/linden/indra/cmake/OpenSSL.cmake
@@ -0,0 +1,23 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(OpenSSL_FIND_QUIETLY ON)
+set(OpenSSL_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindOpenSSL)
+else (STANDALONE)
+  use_prebuilt_binary(openSSL)
+  if (WINDOWS)
+    set(OPENSSL_LIBRARIES ssleay32 libeay32)
+  else (WINDOWS)
+    set(OPENSSL_LIBRARIES ssl)
+  endif (WINDOWS)
+  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+endif (STANDALONE)
+
+if (LINUX)
+  set(CRYPTO_LIBRARIES crypto)
+elseif (DARWIN)
+  set(CRYPTO_LIBRARIES llcrypto)
+endif (LINUX)
diff --git a/linden/indra/cmake/PNG.cmake b/linden/indra/cmake/PNG.cmake
new file mode 100644
index 0000000..4d0b7b2
--- /dev/null
+++ b/linden/indra/cmake/PNG.cmake
@@ -0,0 +1,13 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(PNG_FIND_QUIETLY ON)
+set(PNG_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindPNG)
+else (STANDALONE)
+  use_prebuilt_binary(libpng)
+  set(PNG_LIBRARIES png12)
+  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/Prebuilt.cmake b/linden/indra/cmake/Prebuilt.cmake
new file mode 100644
index 0000000..a915192
--- /dev/null
+++ b/linden/indra/cmake/Prebuilt.cmake
@@ -0,0 +1,44 @@
+# -*- cmake -*-
+
+include(Python)
+include(FindSCP)
+
+macro (use_prebuilt_binary _binary)
+  if (NOT STANDALONE)
+    if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
+      if(INSTALL_PROPRIETARY)
+        include(FindSCP)
+        if(DEBUG_PREBUILT)
+          message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. --scp=${SCP_EXECUTABLE} ${_binary}")
+        endif(DEBUG_PREBUILT)
+        execute_process(COMMAND ${PYTHON_EXECUTABLE}
+          install.py 
+          --install-dir=${CMAKE_SOURCE_DIR}/..
+          --scp=${SCP_EXECUTABLE}
+          ${_binary}
+          WORKING_DIRECTORY ${SCRIPTS_DIR}
+          RESULT_VARIABLE ${_binary}_installed
+          )
+      else(INSTALL_PROPRIETARY)
+        if(DEBUG_PREBUILT)
+          message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. ${_binary}")
+        endif(DEBUG_PREBUILT)
+        execute_process(COMMAND ${PYTHON_EXECUTABLE}
+          install.py 
+          --install-dir=${CMAKE_SOURCE_DIR}/..
+          ${_binary}
+          WORKING_DIRECTORY ${SCRIPTS_DIR}
+          RESULT_VARIABLE ${_binary}_installed
+          )
+      endif(INSTALL_PROPRIETARY)
+      file(WRITE ${CMAKE_BINARY_DIR}/temp/${_binary}_installed "${${_binary}_installed}")
+    else(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
+      set(${_binary}_installed 0)
+    endif(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
+    if(NOT ${_binary}_installed EQUAL 0)
+      message(FATAL_ERROR
+              "Failed to download or unpack prebuilt '${_binary}'."
+              " Process returned ${${_binary}_installed}.")
+    endif (NOT ${_binary}_installed EQUAL 0)
+  endif (NOT STANDALONE)
+endmacro (use_prebuilt_binary _binary)
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
new file mode 100644
index 0000000..e9505fb
--- /dev/null
+++ b/linden/indra/cmake/Python.cmake
@@ -0,0 +1,49 @@
+# -*- cmake -*-
+
+set(PYTHONINTERP_FOUND)
+
+if (WINDOWS)
+  # On Windows, explicitly avoid Cygwin Python.
+
+  find_program(PYTHON_EXECUTABLE
+    NAMES python25.exe python23.exe python.exe
+    NO_DEFAULT_PATH # added so that cmake does not find cygwin python
+    PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+    )
+elseif (EXISTS /etc/debian_version)
+  # On Debian and Ubuntu, avoid Python 2.4 if possible.
+
+  find_program(PYTHON_EXECUTABLE python2.5 python2.3 python PATHS /usr/bin)
+
+  if (PYTHON_EXECUTABLE)
+    set(PYTHONINTERP_FOUND ON)
+  endif (PYTHON_EXECUTABLE)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  # On MAC OS X be sure to search standard locations first
+
+  string(REPLACE ":" ";" PATH_LIST "$ENV{PATH}")
+  find_program(PYTHON_EXECUTABLE
+    NAMES python python25 python24 python23
+    NO_DEFAULT_PATH # Avoid searching non-standard locations first
+    PATHS
+    /bin
+    /usr/bin
+    /usr/local/bin
+    ${PATH_LIST}
+    )
+
+  if (PYTHON_EXECUTABLE)
+    set(PYTHONINTERP_FOUND ON)
+  endif (PYTHON_EXECUTABLE)
+else (WINDOWS)
+  include(FindPythonInterp)
+endif (WINDOWS)
+
+if (NOT PYTHON_EXECUTABLE)
+  message(FATAL_ERROR "No Python interpreter found")
+endif (NOT PYTHON_EXECUTABLE)
+
+mark_as_advanced(PYTHON_EXECUTABLE)
diff --git a/linden/indra/cmake/QuickTime.cmake b/linden/indra/cmake/QuickTime.cmake
new file mode 100644
index 0000000..b79ac11
--- /dev/null
+++ b/linden/indra/cmake/QuickTime.cmake
@@ -0,0 +1,33 @@
+# -*- cmake -*-
+
+if(INSTALL_PROPRIETARY)
+  include(Prebuilt)
+  use_prebuilt_binary(quicktime)
+endif(INSTALL_PROPRIETARY)
+
+if (DARWIN)
+  include(CMakeFindFrameworks)
+  find_library(QUICKTIME_LIBRARY QuickTime)
+elseif (WINDOWS)
+  set(QUICKTIME_SDK_DIR "C:\\Program Files\\QuickTime SDK"
+      CACHE PATH "Location of the QuickTime SDK.")
+  find_library(QUICKTIME_LIBRARY qtmlclient
+               PATHS
+               ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release
+               "${QUICKTIME_SDK_DIR}\\libraries"
+               )
+  include_directories(
+    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
+    "${QUICKTIME_SDK_DIR}\\CIncludes"
+    )
+endif (DARWIN)
+
+mark_as_advanced(QUICKTIME_LIBRARY)
+
+if (QUICKTIME_LIBRARY)
+  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
+endif (QUICKTIME_LIBRARY)
+
+if (QUICKTIME)
+  add_definitions(-DLL_QUICKTIME_ENABLED=1)
+endif (QUICKTIME)
diff --git a/linden/indra/cmake/TemplateCheck.cmake b/linden/indra/cmake/TemplateCheck.cmake
new file mode 100644
index 0000000..3b73dc8
--- /dev/null
+++ b/linden/indra/cmake/TemplateCheck.cmake
@@ -0,0 +1,14 @@
+# -*- cmake -*-
+
+include(Python)
+
+macro (check_message_template _target)
+  add_custom_command(
+      TARGET ${_target}
+      PRE_LINK
+      COMMAND ${PYTHON_EXECUTABLE}
+      ARGS ${SCRIPTS_DIR}/template_verifier.py
+           --mode=development --cache_master
+      COMMENT "Verifying message template"
+      )
+endmacro (check_message_template)
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
new file mode 100644
index 0000000..f529f5b
--- /dev/null
+++ b/linden/indra/cmake/UI.cmake
@@ -0,0 +1,64 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+    
+  if (LINUX)
+    set(PKGCONFIG_PACKAGES
+        atk
+        cairo
+        gdk-2.0
+        gdk-pixbuf-2.0
+        glib-2.0
+        gmodule-2.0
+        gtk+-2.0
+        gthread-2.0
+        libpng
+        pango
+        pangoft2
+        pangox
+        pangoxft
+        sdl
+        )
+  endif (LINUX)
+
+  foreach(pkg ${PKGCONFIG_PACKAGES})
+    pkg_check_modules(${pkg} REQUIRED ${pkg})
+    include_directories(${${pkg}_INCLUDE_DIRS})
+    link_directories(${${pkg}_LIBRARY_DIRS})
+    list(APPEND UI_LIBRARIES ${${pkg}_LIBRARIES})
+    add_definitions(${${pkg}_CFLAGS_OTHERS})
+  endforeach(pkg)
+else (STANDALONE)
+  use_prebuilt_binary(gtk-atk-pango-glib)
+  if (LINUX)
+    set(UI_LIBRARIES
+        atk-1.0
+        gdk-x11-2.0
+        gdk_pixbuf-2.0
+        Xinerama
+        glib-2.0
+        gmodule-2.0
+        gobject-2.0
+        gthread-2.0
+        gtk-x11-2.0
+        pango-1.0
+        pangoft2-1.0
+        pangox-1.0
+        pangoxft-1.0
+        )
+  endif (LINUX)
+
+  include_directories (
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+      ${LIBS_PREBUILT_DIR}/include
+      )
+  foreach(include ${${LL_ARCH}_INCLUDES})
+      include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include})
+  endforeach(include)
+endif (STANDALONE)
+
+if (LINUX)
+  add_definitions(-DLL_GTK=1 -DLL_X11=1)
+endif (LINUX)
diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake
new file mode 100644
index 0000000..139be0a
--- /dev/null
+++ b/linden/indra/cmake/UnixInstall.cmake
@@ -0,0 +1,31 @@
+if (NOT ${viewer_VERSION})
+  MESSAGE(FATAL_ERROR "Viewer version not known!")
+endif (NOT ${viewer_VERSION})
+
+set(INSTALL OFF CACHE BOOL
+    "Generate install target.")
+
+if (INSTALL)
+  set(INSTALL_PREFIX /usr CACHE PATH
+      "Top-level installation directory.")
+
+  if (EXISTS /lib64)
+    set(_LIB lib64)
+  else (EXISTS /lib64)
+    set(_LIB lib)
+  endif (EXISTS /lib64)
+
+  set(INSTALL_LIBRARY_DIR ${INSTALL_PREFIX}/${_LIB} CACHE PATH
+      "Installation directory for read-only shared files.")
+
+  set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH
+      "Installation directory for read-only shared files.")
+
+  set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/secondlife-${viewer_VERSION}
+      CACHE PATH
+      "Installation directory for binaries.")
+
+  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/secondlife-${viewer_VERSION}
+      CACHE PATH
+      "Installation directory for read-only data files.")
+endif (INSTALL)
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
new file mode 100644
index 0000000..5868e4d
--- /dev/null
+++ b/linden/indra/cmake/Variables.cmake
@@ -0,0 +1,100 @@
+# -*- cmake -*-
+#
+# Definitions of variables used throughout the Second Life build
+# process.
+#
+# Platform variables:
+#
+#   DARWIN  - Mac OS X
+#   LINUX   - Linux
+#   WINDOWS - Windows
+#
+# What to build:
+#
+#   VIEWER - viewer and other viewer-side components
+#   SERVER - simulator and other server-side bits
+
+
+# Relative and absolute paths to subtrees.
+
+set(LIBS_CLOSED_PREFIX)
+set(LIBS_OPEN_PREFIX)
+set(LIBS_SERVER_PREFIX)
+set(SCRIPTS_PREFIX ../scripts)
+set(SERVER_PREFIX)
+set(VIEWER_PREFIX)
+
+set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
+set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
+set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX})
+set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
+set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX})
+set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
+
+set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
+    "Location of prebuilt libraries.")
+
+if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
+  # We use this as a marker that you can try to use the proprietary libraries.
+  set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
+endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
+
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  set(WINDOWS ON BOOL FORCE)
+  set(ARCH i686)
+  set(LL_ARCH ${ARCH}_win32)
+  set(LL_ARCH_DIR ${ARCH}-win32)
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(LINUX ON BOOl FORCE)
+  execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
+                  OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set(LL_ARCH ${ARCH}_linux)
+  set(LL_ARCH_DIR ${ARCH}-linux)
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set(DARWIN 1)
+  # set this dynamically from the build system now -
+  # NOTE: wont have a distributable build unless you add this on the configure line with:
+  # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
+  #set(CMAKE_OSX_ARCHITECTURES i386;ppc)
+  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
+  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+    set(ARCH universal)
+  else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
+      set(ARCH ppc)
+    else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
+      set(ARCH i386)
+    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
+  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+  set(LL_ARCH ${ARCH}_darwin)
+  set(LL_ARCH_DIR universal-darwin)
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+# Default deploy grid
+set(GRID agni CACHE STRING "Target Grid")
+
+set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
+set(VIEWER_CHANNEL "Developer" CACHE STRING "Viewer Channel Name")
+set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
+
+set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+
+if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
+    set(SERVER ON CACHE BOOL "Build Second Life server software.")
+endif (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
+
+if (LINUX AND SERVER AND VIEWER)
+  MESSAGE(FATAL_ERROR "
+The indra source does not currently support building SERVER and VIEWER at the same time.
+Please set one of these values to OFF in your CMake cache file.
+(either by running ccmake or by editing CMakeCache.txt by hand)
+For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both VIEWER and SERVER in one build environment
+  ")
+endif (LINUX AND SERVER AND VIEWER)
+
+source_group("CMake Rules" FILES CMakeLists.txt)
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
new file mode 100644
index 0000000..68ee881
--- /dev/null
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -0,0 +1,10 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(libstdc++)
+  use_prebuilt_binary(libuuid)
+  use_prebuilt_binary(vivox)
+  use_prebuilt_binary(fontconfig)
+endif(NOT STANDALONE)
+
diff --git a/linden/indra/cmake/XmlRpcEpi.cmake b/linden/indra/cmake/XmlRpcEpi.cmake
new file mode 100644
index 0000000..107d192
--- /dev/null
+++ b/linden/indra/cmake/XmlRpcEpi.cmake
@@ -0,0 +1,17 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(XMLRPCEPI_FIND_QUIETLY ON)
+set(XMLRPCEPI_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindXmlRpcEpi)
+else (STANDALONE)
+    use_prebuilt_binary(xmlrpc-epi)
+    if (WINDOWS)
+        set(XMLRPCEPI_LIBRARIES xmlrpcepi)
+    else (WINDOWS)
+        set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
+    endif (WINDOWS)
+    set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
new file mode 100644
index 0000000..80d4191
--- /dev/null
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+set(ZLIB_FIND_QUIETLY ON)
+set(ZLIB_FIND_REQUIRED ON)
+
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindZLIB)
+else (STANDALONE)
+  use_prebuilt_binary(zlib)
+  if (WINDOWS)
+    set(ZLIB_LIBRARIES zlib)
+  else (WINDOWS)
+    set(ZLIB_LIBRARIES z)
+  endif (WINDOWS)
+  if (WINDOWS OR LINUX)
+    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib)
+  endif (WINDOWS OR LINUX)
+endif (STANDALONE)
diff --git a/linden/indra/copy_win_scripts/CMakeLists.txt b/linden/indra/copy_win_scripts/CMakeLists.txt
new file mode 100644
index 0000000..93a8c1d
--- /dev/null
+++ b/linden/indra/copy_win_scripts/CMakeLists.txt
@@ -0,0 +1,35 @@
+# -*- cmake -*-
+
+# The copy_win_scripts folder contains scripts handy for launching the 
+# from the windows command line on windows.
+# The cmake target created copies the scripts to the 
+# build directory being used, which where the scripts 
+# need to be executed from.
+
+include(CMakeCopyIfDifferent)
+
+set(win_scripts-src ${CMAKE_SOURCE_DIR}/copy_win_scripts)
+set(win_scripts-dst ${CMAKE_BINARY_DIR}/batch)
+
+set(file-list
+    llstart.py 
+    start-client.py 
+    start-servers.py 
+    stop-servers.py
+    user_config.py
+    )
+
+foreach(file ${file-list})
+    if(EXISTS ${win_scripts-src}/${file})    
+        set(win_scripts-files ${win_scripts-files} ${file})
+    endif(EXISTS ${win_scripts-src}/${file})
+endforeach(file ${file-list})
+
+copy_if_different(
+    ${win_scripts-src} 
+    ${win_scripts-dst} 
+    win_scripts-targets 
+    ${win_scripts-files} 
+    )
+
+add_custom_target(copy_win_scripts ALL DEPENDS ${win_scripts-targets})
diff --git a/linden/indra/copy_win_scripts/start-client.py b/linden/indra/copy_win_scripts/start-client.py
new file mode 100644
index 0000000..5f7ff2f
--- /dev/null
+++ b/linden/indra/copy_win_scripts/start-client.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+import sys, getopt
+import os
+import llstart
+
+def usage():
+    print """start-client.py
+    
+    --grid <grid>
+    --farm <grid>
+    --region <starting region name>
+    """
+
+def start_client(grid, slurl, build_config, my_args):
+    login_url = "https://login.%s.lindenlab.com/cgi-bin/login.cgi" % (grid)
+
+    viewer_args = { "--grid" : grid,
+                    "--loginuri" : login_url }
+    viewer_args.update(my_args)
+    # *sigh*  We must put --url at the end of the argument list.
+    if viewer_args.has_key("--url"):
+        slurl = viewer_args["--url"]
+        del(viewer_args["--url"])
+    viewer_args = llstart.get_args_from_dict(viewer_args)
+    if slurl is not None:
+        viewer_args += " --url %s" % slurl
+
+    # Figure out path stuff.
+    # The client should run from indra/newview
+    # but the exe is at indra/build-<xxx>/newview/<target>
+    build_path = os.path.dirname(os.getcwd());    
+    f = open("start-client.log", "w")
+    print >>f, "Viewer startup arguments:"
+    llstart.start("viewer", "../../newview", 
+        "%s/newview/%s/secondlife-bin.exe" % (build_path, build_config),
+        viewer_args, f)
+    f.close()
+
+if __name__ == "__main__":
+    grid = llstart.get_config("grid")
+    
+    if grid == None:
+        grid = "aditi"
+        
+    build_config = llstart.get_config("build_config")
+    my_args = llstart.get_config("viewer_args", force_dict = True)
+    opts, args = getopt.getopt(sys.argv[1:], "u:r:f:g:i:h",
+        ["region=", "username=", "farm=", "grid=", "ip=", "help"])
+    region = None
+    for o, a in opts:
+        if o in ("-r", "--region", "-u", "--username"):
+            region = a
+        if o in ("-f", "--farm", "-g", "--grid"):
+            grid = a
+        if o in ("-h", "--help"):
+            usage()
+            sys.exit(0)
+            
+    slurl = llstart.get_config("slurl")            
+    if slurl == None:
+        if region is None:
+            region = llstart.get_user_name()
+        slurl = "//%s/128/128/" % (region)
+    # Ensure the slurl has quotes around it.
+    if slurl is not None:
+        slurl = '"%s"' % (slurl.strip('"\''))
+    
+    start_client(grid, slurl, build_config, my_args)
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
new file mode 100755
index 0000000..8edfccc
--- /dev/null
+++ b/linden/indra/develop.py
@@ -0,0 +1,676 @@
+#!/usr/bin/env python
+#
+# @file develop.py
+# @authors Bryan O'Sullivan, Mark Palange, Aaron Brashears
+# @brief Fire and forget script to appropriately configure cmake for SL.
+#
+# $LicenseInfo:firstyear=2007&license=viewergpl$
+# 
+# Copyright (c) 2007-2008, Linden Research, Inc.
+# 
+# Second Life Viewer Source Code
+# The source code in this file ("Source Code") is provided by Linden Lab
+# to you under the terms of the GNU General Public License, version 2.0
+# ("GPL"), unless you have obtained a separate licensing agreement
+# ("Other License"), formally executed by you and Linden Lab.  Terms of
+# the GPL can be found in doc/GPL-license.txt in this distribution, or
+# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+# 
+# There are special exceptions to the terms and conditions of the GPL as
+# it is applied to this Source Code. View the full text of the exception
+# in the file doc/FLOSS-exception.txt in this software distribution, or
+# online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+# 
+# By copying, modifying or distributing this software, you acknowledge
+# that you have read and understood your obligations described above,
+# and agree to abide by those obligations.
+# 
+# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+# COMPLETENESS OR PERFORMANCE.
+# $/LicenseInfo$
+
+
+import errno
+import getopt
+import os
+import random
+import re
+import shutil
+import socket
+import sys
+import commands
+
+class CommandError(Exception):
+    pass
+
+
+def mkdir(path):
+    try:
+        os.mkdir(path)
+        return path
+    except OSError, err:
+        if err.errno != errno.EEXIST or not os.path.isdir(path):
+            raise
+
+def quote(opts):
+    return '"' + '" "'.join([ opt.replace('"', '') for opt in opts ]) + '"'
+
+class PlatformSetup(object):
+    generator = None
+    build_types = {}
+    for t in ('Debug', 'Release', 'RelWithDebInfo'):
+        build_types[t.lower()] = t
+
+    build_type = build_types['relwithdebinfo']
+    standalone = 'FALSE'
+    unattended = 'FALSE'
+    distcc = True
+    cmake_opts = []
+
+    def __init__(self):
+        self.script_dir = os.path.realpath(
+            os.path.dirname(__import__(__name__).__file__))
+
+    def os(self):
+        '''Return the name of the OS.'''
+
+        raise NotImplemented('os')
+
+    def arch(self):
+        '''Return the CPU architecture.'''
+
+        return None
+
+    def platform(self):
+        '''Return a stringified two-tuple of the OS name and CPU
+        architecture.'''
+
+        ret = self.os()
+        if self.arch():
+            ret += '-' + self.arch()
+        return ret 
+
+    def build_dirs(self):
+        '''Return the top-level directories in which builds occur.
+
+        This can return more than one directory, e.g. if doing a
+        32-bit viewer and server build on Linux.'''
+
+        return ['build-' + self.platform()]
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        '''Return the command line to run cmake with.'''
+
+        args = dict(
+            dir=src_dir,
+            generator=self.generator,
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            type=self.build_type.upper(),
+            )
+        #if simple:
+        #    return 'cmake %(opts)s %(dir)r' % args
+        return ('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '-DUNATTENDED:BOOL=%(unattended)s '
+                '-G %(generator)r %(opts)s %(dir)r' % args)
+
+    def run(self, command, name=None):
+        '''Run a program.  If the program fails, raise an exception.'''
+        ret = os.system(command)
+        if ret:
+            if name is None:
+                name = command.split(None, 1)[0]
+            if os.WIFEXITED(ret):
+                event = 'exited'
+                status = 'status %d' % os.WEXITSTATUS(ret)
+            elif os.WIFSIGNALED(ret):
+                event = 'was killed'
+                status = 'signal %d' % os.WTERMSIG(ret)
+            else:
+                event = 'died unexpectedly (!?)'
+                status = '16-bit status %d' % ret
+            raise CommandError('the command %r %s with %s' %
+                               (name, event, status))
+
+    def run_cmake(self, args=[]):
+        '''Run cmake.'''
+
+        # do a sanity check to make sure we have a generator
+        if not hasattr(self, 'generator'):
+            raise "No generator available for '%s'" % (self.__name__,)
+        cwd = os.getcwd()
+        created = []
+        try:
+            for d in self.build_dirs():
+                simple = True
+                if mkdir(d):
+                    created.append(d)
+                    simple = False
+                try:
+                    os.chdir(d)
+                    cmd = self.cmake_commandline(cwd, d, args, simple)
+                    print 'Running %r in %r' % (cmd, d)
+                    self.run(cmd, 'cmake')
+                finally:
+                    os.chdir(cwd)
+        except:
+            # If we created a directory in which to run cmake and
+            # something went wrong, the directory probably just
+            # contains garbage, so delete it.
+            os.chdir(cwd)
+            for d in created:
+                print 'Cleaning %r' % d
+                shutil.rmtree(d)
+            raise
+
+    def parse_build_opts(self, arguments):
+        opts, targets = getopt.getopt(arguments, 'o:', ['option='])
+        build_opts = []
+        for o, a in opts:
+            if o in ('-o', '--option'):
+                build_opts.append(a)
+        return build_opts, targets
+
+    def run_build(self, opts, targets):
+        '''Build the default targets for this platform.'''
+
+        raise NotImplemented('run_build')
+
+    def cleanup(self):
+        '''Delete all build directories.'''
+
+        cleaned = 0
+        for d in self.build_dirs():
+            if os.path.isdir(d):
+                print 'Cleaning %r' % d
+                shutil.rmtree(d)
+                cleaned += 1
+        if not cleaned:
+            print 'Nothing to clean up!'
+
+    def is_internal_tree(self):
+        '''Indicate whether we are building in an internal source tree.'''
+
+        return os.path.isdir(os.path.join(self.script_dir, 'newsim'))
+
+
+class UnixSetup(PlatformSetup):
+    '''Generic Unixy build instructions.'''
+
+    def __init__(self):
+        super(UnixSetup, self).__init__()
+        self.generator = 'Unix Makefiles'
+
+    def os(self):
+        return 'unix'
+
+    def arch(self):
+        cpu = os.uname()[-1]
+        if cpu.endswith('386'):
+            cpu = 'i386'
+        elif cpu.endswith('86'):
+            cpu = 'i686'
+        elif cpu in ('athlon',):
+            cpu = 'i686'
+        elif cpu == 'Power Macintosh':
+            cpu = 'ppc'
+        return cpu
+        
+
+class LinuxSetup(UnixSetup):
+    def __init__(self):
+        super(LinuxSetup, self).__init__()
+
+    def os(self):
+        return 'linux'
+
+    def build_dirs(self):
+        # Only build the server code if (a) we have it and (b) we're
+        # on 32-bit x86.
+        if self.arch() == 'i686' and self.is_internal_tree():
+            return ['viewer-' + self.platform(), 'server-' + self.platform()]
+        else:
+            return ['viewer-' + self.platform()]
+
+    def find_in_path(self, name, defval=None, basename=False):
+        for p in os.getenv('PATH', '/usr/bin').split(':'):
+            path = os.path.join(p, name)
+            if os.access(path, os.X_OK):
+                return [basename and os.path.basename(path) or path]
+        if defval:
+            return [defval]
+        return []
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        args = dict(
+            dir=src_dir,
+            generator=self.generator,
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            type=self.build_type.upper()
+            )
+        if not self.is_internal_tree():
+            args.update({'cxx':'g++', 'server':'FALSE', 'viewer':'TRUE'})
+        else:
+            if self.distcc:
+                distcc = self.find_in_path('distcc')
+                baseonly = True
+            else:
+                distcc = []
+                baseonly = False
+            if 'server' in build_dir:
+                gcc33 = distcc + self.find_in_path('g++-3.3', 'g++', baseonly)
+                args.update({'cxx':' '.join(gcc33), 'server':'TRUE',
+                             'viewer':'FALSE'})
+            else:
+                gcc41 = distcc + self.find_in_path('g++-4.1', 'g++', baseonly)
+                args.update({'cxx': ' '.join(gcc41), 'server':'FALSE',
+                             'viewer':'TRUE'})
+        #if simple:
+        #    return (('cmake %(opts)s '
+        #             '-DSERVER:BOOL=%(server)s ' 
+        #             '-DVIEWER:BOOL=%(viewer)s '
+        #             '%(dir)r') % args)
+        cmd = (('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
+                '-G %(generator)r -DSERVER:BOOL=%(server)s '
+                '-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s '
+                '-DUNATTENDED:BOOL=%(unattended)s '
+                '%(opts)s %(dir)r')
+               % args)
+        if 'CXX' not in os.environ:
+            args.update({'cmd':cmd})
+            cmd = ('CXX=%(cxx)r %(cmd)s' % args)
+        return cmd
+
+    def run_build(self, opts, targets):
+        job_count = None
+
+        for i in range(len(opts)):
+            if opts[i].startswith('-j'):
+                try:
+                    job_count = int(opts[i][2:])
+                except ValueError:
+                    try:
+                        job_count = int(opts[i+1])
+                    except ValueError:
+                        job_count = True
+
+        def get_cpu_count():
+            count = 0
+            for line in open('/proc/cpuinfo'):
+                if re.match(r'processor\s*:', line):
+                    count += 1
+            return count
+
+        def localhost():
+            count = get_cpu_count()
+            return 'localhost/' + str(count), count
+
+        def get_distcc_hosts():
+            try:
+                hosts = []
+                name = os.getenv('DISTCC_DIR', '/etc/distcc') + '/hosts'
+                for l in open(name):
+                    l = l[l.find('#')+1:].strip()
+                    if l: hosts.append(l)
+                return hosts
+            except IOError:
+                return (os.getenv('DISTCC_HOSTS', '').split() or
+                        [localhost()[0]])
+
+        def count_distcc_hosts():
+            cpus = 0
+            hosts = 0
+            for host in get_distcc_hosts():
+                m = re.match(r'.*/(\d+)', host)
+                hosts += 1
+                cpus += m and int(m.group(1)) or 1
+            return hosts, cpus
+
+        def mk_distcc_hosts():
+            '''Generate a list of LL-internal machines to build on.'''
+            loc_entry, cpus = localhost()
+            hosts = [loc_entry]
+            dead = []
+            stations = [s for s in xrange(36) if s not in dead]
+            random.shuffle(stations)
+            hosts += ['station%d.lindenlab.com/2,lzo' % s for s in stations]
+            cpus += 2 * len(stations)
+            return ' '.join(hosts), cpus
+
+        if job_count is None:
+            hosts, job_count = count_distcc_hosts()
+            if hosts == 1 and socket.gethostname().startswith('station'):
+                hosts, job_count = mk_distcc_hosts()
+                os.putenv('DISTCC_HOSTS', hosts)
+            opts.extend(['-j', str(job_count)])
+
+        if targets:
+            targets = ' '.join(targets)
+        else:
+            targets = 'all'
+
+        for d in self.build_dirs():
+            cmd = 'make -C %r %s %s' % (d, ' '.join(opts), targets)
+            print 'Running %r' % cmd
+            self.run(cmd)
+
+        
+class DarwinSetup(UnixSetup):
+    def __init__(self):
+        super(DarwinSetup, self).__init__()
+        self.generator = 'Xcode'
+
+    def os(self):
+        return 'darwin'
+
+    def arch(self):
+        if self.unattended == 'TRUE':
+            return 'universal'
+        else:
+            return UnixSetup.arch(self)
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        args = dict(
+            dir=src_dir,
+            generator=self.generator,
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            universal='',
+            type=self.build_type.upper()
+            )
+        if self.unattended == 'TRUE':
+            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
+        #if simple:
+        #    return 'cmake %(opts)s %(dir)r' % args
+        return ('cmake -G %(generator)r '
+                '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '-DUNATTENDED:BOOL=%(unattended)s '
+                '%(universal)s '
+                '%(opts)s %(dir)r' % args)
+
+    def run_build(self, opts, targets):
+        cwd = os.getcwd()
+        if targets:
+            targets = ' '.join(['-target ' + repr(t) for t in targets])
+        else:
+            targets = ''
+        cmd = ('xcodebuild -parallelizeTargets '
+               '-configuration %s %s %s' %
+               (self.build_type, ' '.join(opts), targets))
+        for d in self.build_dirs():
+            try:
+                os.chdir(d)
+                print 'Running %r in %r' % (cmd, d)
+                self.run(cmd)
+            finally:
+                os.chdir(cwd)
+
+
+class WindowsSetup(PlatformSetup):
+    gens = {
+        'vc71' : {
+            'gen' : r'Visual Studio 7 .NET 2003',
+            'ver' : r'7.1'
+            },
+        'vc80' : {
+            'gen' : r'Visual Studio 8 2005',
+            'ver' : r'8.0'
+            },
+        'vc90' : {
+            'gen' : r'Visual Studio 9 2008',
+            'ver' : r'9.0'
+            }
+        }
+    gens['vs2003'] = gens['vc71']
+    gens['vs2005'] = gens['vc80']
+    gens['vs2008'] = gens['vc90']
+
+    def __init__(self):
+        super(WindowsSetup, self).__init__()
+        self._generator = None
+        self.incredibuild = False
+
+    def _get_generator(self):
+        if self._generator is None:
+            for version in 'vc71 vc80 vc90'.split():
+                if self.find_visual_studio(version):
+                    self._generator = version
+                    print 'Building with ', self.gens[version]['gen']
+                    break
+            else:
+                print >> sys.stderr, 'Cannot find a Visual Studio installation!'
+                eys.exit(1)
+        return self._generator
+
+    def _set_generator(self, gen):
+        self._generator = gen
+
+    generator = property(_get_generator, _set_generator)
+
+    def os(self):
+        return 'win32'
+
+    def build_dirs(self):
+        return ['build-' + self.generator]
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        args = dict(
+            dir=src_dir,
+            generator=self.gens[self.generator.lower()]['gen'],
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            )
+        #if simple:
+        #    return 'cmake %(opts)s "%(dir)s"' % args
+        return ('cmake -G "%(generator)s" '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '-DUNATTENDED:BOOL=%(unattended)s '
+                '%(opts)s "%(dir)s"' % args)
+
+    def find_visual_studio(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
+                       self.gens[gen]['ver'])
+            value_str = (r'EnvironmentDirectory')
+            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
+
+    def get_build_cmd(self):
+        if self.incredibuild:
+            config = self.build_type
+            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
+                config = '\"%s|Win32\"' % config
+
+            return "buildconsole Secondlife.sln /build %s" % config
+
+        # devenv.com is CLI friendly, devenv.exe... not so much.
+        return ('"%sdevenv.com" Secondlife.sln /build %s' % 
+                (self.find_visual_studio(), self.build_type))
+
+    # this override of run exists because the PlatformSetup version
+    # uses Unix/Mac only calls. Freakin' os module!
+    def run(self, command, name=None):
+        '''Run a program.  If the program fails, raise an exception.'''
+        ret = os.system(command)
+        if ret:
+            if name is None:
+                name = command.split(None, 1)[0]
+            raise CommandError('the command %r exited with %s' %
+                               (name, ret))
+
+    def run_cmake(self, args=[]):
+        '''Override to add the vstool.exe call after running cmake.'''
+        PlatformSetup.run_cmake(self, args)
+        if self.unattended == 'FALSE':
+            for build_dir in self.build_dirs():
+                vstool_cmd = os.path.join('tools','vstool','VSTool.exe') \
+                             + ' --solution ' \
+                             + os.path.join(build_dir,'SecondLife.sln') \
+                             + ' --config RelWithDebInfo' \
+                             + ' --startup secondlife-bin'
+                print 'Running %r in %r' % (vstool_cmd, os.getcwd())
+                self.run(vstool_cmd)        
+        
+    def run_build(self, opts, targets):
+        cwd = os.getcwd()
+        build_cmd = self.get_build_cmd()
+
+        for d in self.build_dirs():
+            try:
+                os.chdir(d)
+                if targets:
+                    for t in targets:
+                        cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
+                        print 'Running %r in %r' % (cmd, d)
+                        self.run(cmd)
+                else:
+                    cmd = '%s %s' % (build_cmd, ' '.join(opts))
+                    print 'Running %r in %r' % (cmd, d)
+                    self.run(cmd)
+            finally:
+                os.chdir(cwd)
+                
+class CygwinSetup(WindowsSetup):
+    def __init__(self):
+        super(CygwinSetup, self).__init__()
+        self.generator = 'vc71'
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        dos_dir = commands.getoutput("cygpath -w %s" % src_dir)
+        args = dict(
+            dir=dos_dir,
+            generator=self.gens[self.generator.lower()]['gen'],
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            )
+        #if simple:
+        #    return 'cmake %(opts)s "%(dir)s"' % args
+        return ('cmake -G "%(generator)s" '
+                '-DUNATTENDED:BOOl=%(unattended)s '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '%(opts)s "%(dir)s"' % args)
+
+setup_platform = {
+    'darwin': DarwinSetup,
+    'linux2': LinuxSetup,
+    'win32' : WindowsSetup,
+    'cygwin' : CygwinSetup
+    }
+
+
+usage_msg = '''
+Usage:   develop.py [options] command [command-options]
+
+Options:
+  -h | --help           print this help message
+       --standalone     build standalone, without Linden prebuild libraries
+       --unattended     build unattended, do not invoke any tools requiring
+                        a human response
+  -t | --type=NAME      build type ("Debug", "Release", or "RelWithDebInfo")
+  -N | --no-distcc      disable use of distcc
+  -G | --generator=NAME generator name
+                        Windows: VC71 or VS2003 (default), VC80 (VS2005) or VC90 (VS2008)
+                        Mac OS X: Xcode (default), Unix Makefiles
+                        Linux: Unix Makefiles (default), KDevelop3
+Commands:
+  build       configure and build default target
+  clean       delete all build directories (does not affect sources)
+  configure   configure project by running cmake
+
+If you do not specify a command, the default is "configure".
+'''
+
+def main(arguments):
+    setup = setup_platform[sys.platform]()
+    try:
+        opts, args = getopt.getopt(
+            arguments,
+            '?hNt:G:',
+            ['help', 'standalone', 'no-distcc', 'unattended', 'type=', 'incredibuild', 'generator='])
+    except getopt.GetoptError, err:
+        print >> sys.stderr, 'Error:', err
+        sys.exit(1)
+
+    for o, a in opts:
+        if o in ('-?', '-h', '--help'):
+            print usage_msg.strip()
+            sys.exit(0)
+        elif o in ('--standalone',):
+            setup.standalone = 'TRUE'
+        elif o in ('--unattended',):
+            setup.unattended = 'TRUE'
+        elif o in ('-t', '--type'):
+            try:
+                setup.build_type = setup.build_types[a.lower()]
+            except KeyError:
+                print >> sys.stderr, 'Error: unknown build type', repr(a)
+                print >> sys.stderr, 'Supported build types:'
+                types = setup.build_types.values()
+                types.sort()
+                for t in types:
+                    print ' ', t
+                sys.exit(1)
+        elif o in ('-G', '--generator'):
+            setup.generator = a
+        elif o in ('-N', '--no-distcc'):
+            setup.distcc = False
+        elif o in ('--incredibuild'):
+            setup.incredibuild = True
+        else:
+            print >> sys.stderr, 'INTERNAL ERROR: unhandled option', repr(o)
+            sys.exit(1)
+    if not args:
+        setup.run_cmake()
+        return
+    try:
+        cmd = args.pop(0)
+        if cmd in ('cmake', 'configure'):
+            setup.run_cmake(args)
+        elif cmd == 'build':
+            for d in setup.build_dirs():
+                if not os.path.exists(d):
+                    raise CommandError('run "develop.py cmake" first')
+            setup.run_cmake()
+            opts, targets = setup.parse_build_opts(args)
+            setup.run_build(opts, targets)
+        elif cmd == 'clean':
+            if args:
+                raise CommandError('clean takes no arguments')
+            setup.cleanup()
+        else:
+            print >> sys.stderr, 'Error: unknown subcommand', repr(cmd)
+            print >> sys.stderr, "(run 'develop.py --help' for help)"
+            sys.exit(1)
+    except CommandError, err:
+        print >> sys.stderr, 'Error:', err
+        sys.exit(1)
+    except getopt.GetoptError, err:
+        print >> sys.stderr, 'Error with %r subcommand: %s' % (cmd, err)
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/linden/indra/indra_complete/indra_complete.sln b/linden/indra/indra_complete/indra_complete.sln
deleted file mode 100644
index e990489..0000000
--- a/linden/indra/indra_complete/indra_complete.sln
+++ /dev/null
@@ -1,573 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcommon", "..\llcommon\llcommon.vcproj", "{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmath", "..\llmath\llmath.vcproj", "{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmessage", "..\llmessage\llmessage.vcproj", "{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvfs", "..\llvfs\llvfs.vcproj", "{D37774F4-253D-4760-BF64-372A943224A1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llxml", "..\llxml\llxml.vcproj", "{A5470DA6-0C3A-4602-B930-43DB25511A59}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llui", "..\llui\llui.vcproj", "{DE55D666-6A3D-476C-937F-109269B83681}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimage", "..\llimage\llimage.vcproj", "{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llprimitive", "..\llprimitive\llprimitive.vcproj", "{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcharacter", "..\llcharacter\llcharacter.vcproj", "{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llaudio", "..\llaudio\llaudio.vcproj", "{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llrender", "..\llrender\llrender.vcproj", "{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llinventory", "..\llinventory\llinventory.vcproj", "{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newview", "..\newview\newview.vcproj", "{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594} = {9D0C7E02-6506-4EE7-BC5C-75671D28D594}
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3} = {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B} = {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{076DD042-2E58-42EA-9401-53210B65C1FC} = {076DD042-2E58-42EA-9401-53210B65C1FC}
-		{DE55D666-6A3D-476C-937F-109269B83681} = {DE55D666-6A3D-476C-937F-109269B83681}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB} = {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4} = {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llwindow", "..\llwindow\llwindow.vcproj", "{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_library", "..\lscript\lscript_library\lscript_library.vcproj", "{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_execute", "..\lscript\lscript_execute\lscript_execute.vcproj", "{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile", "..\lscript\lscript_compile\lscript_compile.vcproj", "{44CE6D82-7320-4609-8FC3-5965C19F4808}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb", "..\lscript\lscript_compile\lscript_compile_fb.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_crash_logger", "..\win_crash_logger\win_crash_logger.vcproj", "{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_updater", "..\win_updater\win_updater.vcproj", "{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmedia", "..\llmedia\llmedia.vcproj", "{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcproj", "{BBAA6588-CA96-4A87-A988-B02270B8D02B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC} = {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC} = {777F38BE-2DFE-4051-9AAD-2832ABC474CC}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej2coj\llimagej2coj.vcproj", "{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		DebugMesaHeadless = DebugMesaHeadless
-		Release = Release
-		ReleaseForDownload = ReleaseForDownload
-		ReleaseNoOpt = ReleaseNoOpt
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug.Build.0 = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release.ActiveCfg = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release.Build.0 = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload.Build.0 = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug.Build.0 = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release.ActiveCfg = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release.Build.0 = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload.Build.0 = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug.Build.0 = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release.ActiveCfg = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release.Build.0 = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload.Build.0 = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Debug.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Debug.Build.0 = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Release.ActiveCfg = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Release.Build.0 = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload.Build.0 = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug.Build.0 = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Release.ActiveCfg = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Release.Build.0 = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload.Build.0 = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Debug.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Debug.Build.0 = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Release.ActiveCfg = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Release.Build.0 = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload.Build.0 = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug.Build.0 = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release.ActiveCfg = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release.Build.0 = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload.Build.0 = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug.Build.0 = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release.ActiveCfg = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release.Build.0 = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload.Build.0 = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug.Build.0 = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release.ActiveCfg = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release.Build.0 = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload.Build.0 = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug.Build.0 = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release.ActiveCfg = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release.Build.0 = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload.Build.0 = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug.Build.0 = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release.ActiveCfg = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release.Build.0 = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload.Build.0 = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug.Build.0 = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release.ActiveCfg = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release.Build.0 = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload.Build.0 = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug.Build.0 = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release.ActiveCfg = Release|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release.Build.0 = Release|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload.ActiveCfg = ReleaseForDownload|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload.Build.0 = ReleaseForDownload|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug.Build.0 = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release.ActiveCfg = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release.Build.0 = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload.Build.0 = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug.ActiveCfg = Debug|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug.Build.0 = Debug|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless.ActiveCfg = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release.ActiveCfg = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release.Build.0 = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload.Build.0 = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug.Build.0 = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release.ActiveCfg = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release.Build.0 = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload.Build.0 = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug.Build.0 = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release.ActiveCfg = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release.Build.0 = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload.Build.0 = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug.Build.0 = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Release.ActiveCfg = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Release.Build.0 = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload.Build.0 = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug.Build.0 = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release.ActiveCfg = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release.Build.0 = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload.Build.0 = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug.Build.0 = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release.ActiveCfg = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release.Build.0 = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload.Build.0 = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug.Build.0 = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release.ActiveCfg = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release.Build.0 = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload.Build.0 = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug.Build.0 = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release.Build.0 = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload.Build.0 = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt.Build.0 = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug.Build.0 = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release.Build.0 = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug.Build.0 = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release.Build.0 = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt.ActiveCfg = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug.Build.0 = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release.ActiveCfg = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug.Build.0 = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release.ActiveCfg = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release.Build.0 = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload.Build.0 = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.Debug.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.Release.ActiveCfg = Release|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug.Build.0 = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release.ActiveCfg = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release.Build.0 = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload.Build.0 = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug.Build.0 = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release.ActiveCfg = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release.Build.0 = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload.Build.0 = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug.Build.0 = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release.ActiveCfg = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release.Build.0 = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug.Build.0 = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release.ActiveCfg = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release.Build.0 = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload.Build.0 = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug.ActiveCfg = Debug|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug.Build.0 = Debug|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless.ActiveCfg = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless.Build.0 = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release.ActiveCfg = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug.Build.0 = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release.ActiveCfg = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release.Build.0 = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload.Build.0 = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Debug.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Debug.Build.0 = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Release.ActiveCfg = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Release.Build.0 = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload.Build.0 = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug.Build.0 = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release.ActiveCfg = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release.Build.0 = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload.Build.0 = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug.Build.0 = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release.ActiveCfg = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release.Build.0 = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload.ActiveCfg = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload.Build.0 = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/linden/indra/indra_complete/indra_complete_vc8.sln b/linden/indra/indra_complete/indra_complete_vc8.sln
deleted file mode 100644
index 452608f..0000000
--- a/linden/indra/indra_complete/indra_complete_vc8.sln
+++ /dev/null
@@ -1,619 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcommon", "..\llcommon\llcommon_vc8.vcproj", "{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmath", "..\llmath\llmath_vc8.vcproj", "{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmessage", "..\llmessage\llmessage_vc8.vcproj", "{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvfs", "..\llvfs\llvfs_vc8.vcproj", "{D37774F4-253D-4760-BF64-372A943224A1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llxml", "..\llxml\llxml_vc8.vcproj", "{A5470DA6-0C3A-4602-B930-43DB25511A59}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llui", "..\llui\llui_vc8.vcproj", "{DE55D666-6A3D-476C-937F-109269B83681}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimage", "..\llimage\llimage_vc8.vcproj", "{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llprimitive", "..\llprimitive\llprimitive_vc8.vcproj", "{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcharacter", "..\llcharacter\llcharacter_vc8.vcproj", "{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llaudio", "..\llaudio\llaudio_vc8.vcproj", "{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llrender", "..\llrender\llrender_vc8.vcproj", "{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llinventory", "..\llinventory\llinventory_vc8.vcproj", "{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newview", "..\newview\newview_vc8.vcproj", "{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594} = {9D0C7E02-6506-4EE7-BC5C-75671D28D594}
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3} = {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B} = {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{076DD042-2E58-42EA-9401-53210B65C1FC} = {076DD042-2E58-42EA-9401-53210B65C1FC}
-		{DE55D666-6A3D-476C-937F-109269B83681} = {DE55D666-6A3D-476C-937F-109269B83681}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB} = {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4} = {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llwindow", "..\llwindow\llwindow_vc8.vcproj", "{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_library", "..\lscript\lscript_library\lscript_library_vc8.vcproj", "{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_execute", "..\lscript\lscript_execute\lscript_execute_vc8.vcproj", "{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile", "..\lscript\lscript_compile\lscript_compile_vc8.vcproj", "{44CE6D82-7320-4609-8FC3-5965C19F4808}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_crash_logger", "..\win_crash_logger\win_crash_logger_vc8.vcproj", "{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_updater", "..\win_updater\win_updater_vc8.vcproj", "{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmedia", "..\llmedia\llmedia_vc8.vcproj", "{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
-EndProject
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test_vc8.vcproj", "{BBAA6588-CA96-4A87-A988-B02270B8D02B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC} = {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC} = {777F38BE-2DFE-4051-9AAD-2832ABC474CC}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej2coj\llimagej2coj_vc8.vcproj", "{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc8", "..\lscript\lscript_compile\lscript_compile_fb_vc8.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
-EndProject
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		DebugHk460|Win32 = DebugHk460|Win32
-		DebugMesaHeadless|Win32 = DebugMesaHeadless|Win32
-		Release|Win32 = Release|Win32
-		ReleaseForDownload|Win32 = ReleaseForDownload|Win32
-		ReleaseNoOpt|Win32 = ReleaseNoOpt|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug|Win32.Build.0 = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release|Win32.ActiveCfg = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release|Win32.Build.0 = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug|Win32.Build.0 = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release|Win32.ActiveCfg = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release|Win32.Build.0 = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug|Win32.Build.0 = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release|Win32.ActiveCfg = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release|Win32.Build.0 = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Debug|Win32.Build.0 = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Release|Win32.ActiveCfg = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Release|Win32.Build.0 = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug|Win32.Build.0 = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Release|Win32.ActiveCfg = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Release|Win32.Build.0 = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Debug|Win32.Build.0 = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Release|Win32.ActiveCfg = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Release|Win32.Build.0 = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug|Win32.Build.0 = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release|Win32.ActiveCfg = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release|Win32.Build.0 = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug|Win32.Build.0 = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release|Win32.ActiveCfg = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release|Win32.Build.0 = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug|Win32.Build.0 = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release|Win32.ActiveCfg = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release|Win32.Build.0 = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug|Win32.Build.0 = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release|Win32.ActiveCfg = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release|Win32.Build.0 = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug|Win32.Build.0 = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release|Win32.ActiveCfg = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release|Win32.Build.0 = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug|Win32.Build.0 = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release|Win32.ActiveCfg = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release|Win32.Build.0 = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug|Win32.Build.0 = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release|Win32.ActiveCfg = Release|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release|Win32.Build.0 = Release|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload|Win32.ActiveCfg = ReleaseForDownload|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload|Win32.Build.0 = ReleaseForDownload|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug|Win32.Build.0 = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release|Win32.ActiveCfg = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release|Win32.Build.0 = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug|Win32.Build.0 = Debug|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugHk460|Win32.ActiveCfg = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugHk460|Win32.Build.0 = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless|Win32.ActiveCfg = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless|Win32.Build.0 = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release|Win32.ActiveCfg = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release|Win32.Build.0 = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug|Win32.Build.0 = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release|Win32.ActiveCfg = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release|Win32.Build.0 = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug|Win32.Build.0 = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release|Win32.ActiveCfg = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release|Win32.Build.0 = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug|Win32.Build.0 = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Release|Win32.ActiveCfg = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Release|Win32.Build.0 = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug|Win32.Build.0 = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release|Win32.ActiveCfg = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release|Win32.Build.0 = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug|Win32.Build.0 = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release|Win32.ActiveCfg = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release|Win32.Build.0 = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug|Win32.Build.0 = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release|Win32.ActiveCfg = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release|Win32.Build.0 = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug|Win32.Build.0 = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release|Win32.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release|Win32.Build.0 = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt|Win32.Build.0 = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug|Win32.Build.0 = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release|Win32.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release|Win32.Build.0 = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt|Win32.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug|Win32.Build.0 = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release|Win32.ActiveCfg = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release|Win32.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug|Win32.Build.0 = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release|Win32.ActiveCfg = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release|Win32.Build.0 = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.Release|Win32.ActiveCfg = Release|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.Build.0 = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release|Win32.ActiveCfg = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release|Win32.Build.0 = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug|Win32.Build.0 = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release|Win32.ActiveCfg = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release|Win32.Build.0 = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug|Win32.Build.0 = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release|Win32.ActiveCfg = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release|Win32.Build.0 = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug|Win32.Build.0 = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release|Win32.ActiveCfg = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release|Win32.Build.0 = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.Build.0 = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release|Win32.ActiveCfg = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release|Win32.Build.0 = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Debug|Win32.Build.0 = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Release|Win32.ActiveCfg = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Release|Win32.Build.0 = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug|Win32.Build.0 = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release|Win32.ActiveCfg = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release|Win32.Build.0 = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug|Win32.Build.0 = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release|Win32.ActiveCfg = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release|Win32.Build.0 = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug|Win32.Build.0 = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release|Win32.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release|Win32.Build.0 = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug|Win32.Build.0 = Debug|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugHk460|Win32.ActiveCfg = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugHk460|Win32.Build.0 = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless|Win32.ActiveCfg = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless|Win32.Build.0 = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release|Win32.ActiveCfg = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release|Win32.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/linden/indra/indra_complete/indra_complete_vc9.sln b/linden/indra/indra_complete/indra_complete_vc9.sln
deleted file mode 100644
index 3ef987d..0000000
--- a/linden/indra/indra_complete/indra_complete_vc9.sln
+++ /dev/null
@@ -1,621 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcommon", "..\llcommon\llcommon_vc9.vcproj", "{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmath", "..\llmath\llmath_vc9.vcproj", "{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmessage", "..\llmessage\llmessage_vc9.vcproj", "{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvfs", "..\llvfs\llvfs_vc9.vcproj", "{D37774F4-253D-4760-BF64-372A943224A1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llxml", "..\llxml\llxml_vc9.vcproj", "{A5470DA6-0C3A-4602-B930-43DB25511A59}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llui", "..\llui\llui_vc9.vcproj", "{DE55D666-6A3D-476C-937F-109269B83681}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimage", "..\llimage\llimage_vc9.vcproj", "{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llprimitive", "..\llprimitive\llprimitive_vc9.vcproj", "{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcharacter", "..\llcharacter\llcharacter_vc9.vcproj", "{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llaudio", "..\llaudio\llaudio_vc9.vcproj", "{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llrender", "..\llrender\llrender_vc9.vcproj", "{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llinventory", "..\llinventory\llinventory_vc9.vcproj", "{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newview", "..\newview\newview_vc9.vcproj", "{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594} = {9D0C7E02-6506-4EE7-BC5C-75671D28D594}
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3} = {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B} = {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{076DD042-2E58-42EA-9401-53210B65C1FC} = {076DD042-2E58-42EA-9401-53210B65C1FC}
-		{DE55D666-6A3D-476C-937F-109269B83681} = {DE55D666-6A3D-476C-937F-109269B83681}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB} = {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4} = {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llwindow", "..\llwindow\llwindow_vc9.vcproj", "{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_library", "..\lscript\lscript_library\lscript_library_vc9.vcproj", "{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_execute", "..\lscript\lscript_execute\lscript_execute_vc9.vcproj", "{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile", "..\lscript\lscript_compile\lscript_compile_vc9.vcproj", "{44CE6D82-7320-4609-8FC3-5965C19F4808}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_crash_logger", "..\win_crash_logger\win_crash_logger_vc9.vcproj", "{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_updater", "..\win_updater\win_updater_vc9.vcproj", "{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmedia", "..\llmedia\llmedia_vc9.vcproj", "{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
-EndProject
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test_vc9.vcproj", "{BBAA6588-CA96-4A87-A988-B02270B8D02B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}
-		{44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC} = {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}
-		{A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC} = {777F38BE-2DFE-4051-9AAD-2832ABC474CC}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-		{D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}
-	EndProjectSection
-EndProject
-	ProjectSection(ProjectDependencies) = postProject
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej2coj\llimagej2coj_vc9.vcproj", "{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc8", "..\lscript\lscript_compile\lscript_compile_fb_vc9.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
-EndProject
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		DebugHk460|Win32 = DebugHk460|Win32
-		DebugMesaHeadless|Win32 = DebugMesaHeadless|Win32
-		Release|Win32 = Release|Win32
-		ReleaseForDownload|Win32 = ReleaseForDownload|Win32
-		ReleaseNoOpt|Win32 = ReleaseNoOpt|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug|Win32.Build.0 = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release|Win32.ActiveCfg = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release|Win32.Build.0 = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug|Win32.Build.0 = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release|Win32.ActiveCfg = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release|Win32.Build.0 = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug|Win32.Build.0 = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release|Win32.ActiveCfg = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release|Win32.Build.0 = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Debug|Win32.Build.0 = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Release|Win32.ActiveCfg = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.Release|Win32.Build.0 = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug|Win32.Build.0 = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Release|Win32.ActiveCfg = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.Release|Win32.Build.0 = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Debug|Win32.Build.0 = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Release|Win32.ActiveCfg = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.Release|Win32.Build.0 = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug|Win32.Build.0 = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release|Win32.ActiveCfg = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release|Win32.Build.0 = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug|Win32.Build.0 = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release|Win32.ActiveCfg = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release|Win32.Build.0 = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug|Win32.Build.0 = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release|Win32.ActiveCfg = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release|Win32.Build.0 = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug|Win32.Build.0 = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release|Win32.ActiveCfg = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release|Win32.Build.0 = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug|Win32.Build.0 = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release|Win32.ActiveCfg = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release|Win32.Build.0 = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug|Win32.Build.0 = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release|Win32.ActiveCfg = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release|Win32.Build.0 = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug|Win32.Build.0 = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release|Win32.ActiveCfg = Release|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release|Win32.Build.0 = Release|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload|Win32.ActiveCfg = ReleaseForDownload|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload|Win32.Build.0 = ReleaseForDownload|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug|Win32.Build.0 = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release|Win32.ActiveCfg = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release|Win32.Build.0 = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug|Win32.Build.0 = Debug|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugHk460|Win32.ActiveCfg = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugHk460|Win32.Build.0 = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless|Win32.ActiveCfg = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless|Win32.Build.0 = DebugMesaHeadless|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release|Win32.ActiveCfg = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release|Win32.Build.0 = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug|Win32.Build.0 = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release|Win32.ActiveCfg = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release|Win32.Build.0 = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug|Win32.Build.0 = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release|Win32.ActiveCfg = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release|Win32.Build.0 = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug|Win32.Build.0 = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Release|Win32.ActiveCfg = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.Release|Win32.Build.0 = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug|Win32.Build.0 = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release|Win32.ActiveCfg = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release|Win32.Build.0 = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug|Win32.Build.0 = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release|Win32.ActiveCfg = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release|Win32.Build.0 = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug|Win32.Build.0 = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release|Win32.ActiveCfg = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release|Win32.Build.0 = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug|Win32.Build.0 = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release|Win32.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release|Win32.Build.0 = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32
-		{777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt|Win32.Build.0 = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug|Win32.Build.0 = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release|Win32.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release|Win32.Build.0 = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32
-		{EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt|Win32.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug|Win32.Build.0 = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release|Win32.ActiveCfg = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release|Win32.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug|Win32.Build.0 = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release|Win32.ActiveCfg = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release|Win32.Build.0 = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.Release|Win32.ActiveCfg = Release|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.Build.0 = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release|Win32.ActiveCfg = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release|Win32.Build.0 = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug|Win32.Build.0 = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release|Win32.ActiveCfg = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release|Win32.Build.0 = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug|Win32.Build.0 = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release|Win32.ActiveCfg = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release|Win32.Build.0 = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug|Win32.Build.0 = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release|Win32.ActiveCfg = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release|Win32.Build.0 = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.Build.0 = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release|Win32.ActiveCfg = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release|Win32.Build.0 = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Debug|Win32.Build.0 = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Release|Win32.ActiveCfg = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.Release|Win32.Build.0 = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug|Win32.Build.0 = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release|Win32.ActiveCfg = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release|Win32.Build.0 = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug|Win32.Build.0 = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release|Win32.ActiveCfg = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release|Win32.Build.0 = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug|Win32.Build.0 = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugHk460|Win32.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugHk460|Win32.Build.0 = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release|Win32.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release|Win32.Build.0 = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32
-		{B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug|Win32.Build.0 = Debug|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugHk460|Win32.ActiveCfg = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugHk460|Win32.Build.0 = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless|Win32.ActiveCfg = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless|Win32.Build.0 = DebugHk460|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release|Win32.ActiveCfg = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release|Win32.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
-		{020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/linden/indra/lib/python/indra/base/cllsd_test.py b/linden/indra/lib/python/indra/base/cllsd_test.py
new file mode 100644
index 0000000..3af59e7
--- /dev/null
+++ b/linden/indra/lib/python/indra/base/cllsd_test.py
@@ -0,0 +1,51 @@
+from indra.base import llsd, lluuid
+from datetime import datetime
+import cllsd
+import time, sys
+
+class myint(int):
+    pass
+
+values = (
+    '&<>',
+    u'\u81acj',
+    llsd.uri('http://foo<'),
+    lluuid.LLUUID(),
+    llsd.LLSD(['thing']),
+    1,
+    myint(31337),
+    sys.maxint + 10,
+    llsd.binary('foo'),
+    [],
+    {},
+    {u'f&\u1212': 3},
+    3.1,
+    True,
+    None,
+    datetime.fromtimestamp(time.time()),
+    )
+
+def valuator(values):
+    for v in values:
+        yield v
+
+longvalues = () # (values, list(values), iter(values), valuator(values))
+
+for v in values + longvalues:
+    print '%r => %r' % (v, cllsd.llsd_to_xml(v))
+
+a = [[{'a':3}]] * 1000000
+
+s = time.time()
+print hash(cllsd.llsd_to_xml(a))
+e = time.time()
+t1 = e - s
+print t1
+
+s = time.time()
+print hash(llsd.LLSDXMLFormatter()._format(a))
+e = time.time()
+t2 = e - s
+print t2
+
+print 'Speedup:', t2 / t1
diff --git a/linden/indra/lib/python/indra/base/config.py b/linden/indra/lib/python/indra/base/config.py
index 3865f5e..9c37ecf 100644
--- a/linden/indra/lib/python/indra/base/config.py
+++ b/linden/indra/lib/python/indra/base/config.py
@@ -26,74 +26,224 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
-from os.path import dirname, join, realpath
+import copy
+import os
+import traceback
+import time
 import types
+
+from os.path import dirname, getmtime, join, realpath
 from indra.base import llsd
 
-_g_config_dict = None
-
-def load(indra_xml_file=None):
-    global _g_config_dict
-    if _g_config_dict == None:
-        if indra_xml_file is None:
-            ## going from:
-            ## "/opt/linden/indra/lib/python/indra/base/config.py"
-            ## to:
-            ## "/opt/linden/etc/indra.xml"
-            indra_xml_file = realpath(
-                dirname(realpath(__file__)) + "../../../../../../etc/indra.xml")
-        config_file = file(indra_xml_file)
-        _g_config_dict = llsd.LLSD().parse(config_file.read())
+_g_config = None
+
+class IndraConfig(object):
+    """
+    IndraConfig loads a 'indra' xml configuration file
+    and loads into memory.  This representation in memory
+    can get updated to overwrite values or add new values.
+
+    The xml configuration file is considered a live file and changes
+    to the file are checked and reloaded periodically.  If a value had
+    been overwritten via the update or set method, the loaded values
+    from the file are ignored (the values from the update/set methods
+    override)
+    """
+    def __init__(self, indra_config_file):
+        self._indra_config_file = indra_config_file
+        self._reload_check_interval = 30 # seconds
+        self._last_check_time = 0
+        self._last_mod_time = 0
+
+        self._config_overrides = {}
+        self._config_file_dict = {}
+        self._combined_dict = {}
+
+        self._load()
+
+    def _load(self):
+        if self._indra_config_file is None:
+            return
+
+        config_file = open(self._indra_config_file)
+        self._config_file_dict = llsd.parse(config_file.read())
+        self._combine_dictionaries()
         config_file.close()
-        #print "loaded config from",indra_xml_file,"into",_g_config_dict
 
-def dump(indra_xml_file, indra_cfg={}, update_in_mem=False):
+        self._last_mod_time = self._get_last_modified_time()
+        self._last_check_time = time.time() # now
+
+    def _get_last_modified_time(self):
+        """
+        Returns the mtime (last modified time) of the config file,
+        if such exists.
+        """
+        if self._indra_config_file is not None:
+            return os.path.getmtime(self._indra_config_file)
+
+        return 0
+
+    def _combine_dictionaries(self):
+        self._combined_dict = {}
+        self._combined_dict.update(self._config_file_dict)
+        self._combined_dict.update(self._config_overrides)
+
+    def _reload_if_necessary(self):
+        now = time.time()
+
+        if (now - self._last_check_time) > self._reload_check_interval:
+            self._last_check_time = now
+            try:
+                modtime = self._get_last_modified_time()
+                if modtime > self._last_mod_time:
+                    self._load()
+            except OSError, e:
+                if e.errno == errno.ENOENT: # file not found
+                    # someone messed with our internal state
+                    # or removed the file
+
+                    print 'WARNING: Configuration file has been removed ' + (self._indra_config_file)
+                    print 'Disabling reloading of configuration file.'
+
+                    traceback.print_exc()
+
+                    self._indra_config_file = None
+                    self._last_check_time = 0
+                    self._last_mod_time = 0
+                else:
+                    raise  # pass the exception along to the caller
+
+    def __getitem__(self, key):
+        self._reload_if_necessary()
+
+        return self._combined_dict[key]
+
+    def get(self, key, default = None):
+        try:
+            return self.__getitem__(key)
+        except KeyError:
+            return default
+
+    def __setitem__(self, key, value):
+        """
+        Sets the value of the config setting of key to be newval
+
+        Once any key/value pair is changed via the set method,
+        that key/value pair will remain set with that value until
+        change via the update or set method
+        """
+        self._config_overrides[key] = value
+        self._combine_dictionaries()
+
+    def set(self, key, newval):
+        return self.__setitem__(key, newval)
+
+    def update(self, new_conf):
+        """
+        Load an XML file and apply its map as overrides or additions
+        to the existing config.  Update can be a file or a dict.
+
+        Once any key/value pair is changed via the update method,
+        that key/value pair will remain set with that value until
+        change via the update or set method
+        """
+        if isinstance(new_conf, dict):
+            overrides = new_conf
+        else:
+            # assuming that it is a filename
+            config_file = open(new_conf)
+            overrides = llsd.parse(config_file.read())
+            config_file.close()
+  
+        self._config_overrides.update(overrides)
+        self._combine_dictionaries()
+
+    def as_dict(self):
+        """
+        Returns immutable copy of the IndraConfig as a dictionary
+        """
+        return copy.deepcopy(self._combined_dict)
+
+def load(indra_xml_file = None):
+    global _g_config
+
+    if indra_xml_file is None:
+        ## going from:
+        ## "/opt/linden/indra/lib/python/indra/base/config.py"
+        ## to:
+        ## "/opt/linden/etc/indra.xml"
+        indra_xml_file = realpath(
+            dirname(realpath(__file__)) + "../../../../../../etc/indra.xml")
+
+    try:
+        _g_config = IndraConfig(indra_xml_file)
+    except IOError:
+        # indra.xml was not openable, so let's initialize with an empty dict
+        # some code relies on config behaving this way
+        _g_config = IndraConfig(None)
+
+def dump(indra_xml_file, indra_cfg = None, update_in_mem=False):
     '''
     Dump config contents into a file
     Kindof reverse of load.
     Optionally takes a new config to dump.
     Does NOT update global config unless requested.
     '''
-    global _g_config_dict
+    global _g_config
+
     if not indra_cfg:
-        indra_cfg = _g_config_dict
+        if _g_config is None:
+            return
+
+        indra_cfg = _g_config.as_dict()
+
     if not indra_cfg:
         return
+
     config_file = open(indra_xml_file, 'w')
     _config_xml = llsd.format_xml(indra_cfg)
     config_file.write(_config_xml)
     config_file.close()
+
     if update_in_mem:
         update(indra_cfg)
 
 def update(new_conf):
-    """Load an XML file and apply its map as overrides or additions
-    to the existing config.  The dataserver does this with indra.xml
-    and dataserver.xml."""
-    global _g_config_dict
-    if _g_config_dict == None:
-        _g_config_dict = {}
-    if isinstance(new_conf, dict):
-        overrides = new_conf
-    else:
-        config_file = file(new_conf)
-        overrides = llsd.LLSD().parse(config_file.read())
-        config_file.close()
-        
-    _g_config_dict.update(overrides)
+    global _g_config
+
+    if _g_config is None:
+        # To keep with how this function behaved
+        # previously, a call to update
+        # before the global is defined
+        # make a new global config which does not
+        # load data from a file.
+        _g_config = IndraConfig(None)
+
+    return _g_config.update(new_conf)
 
 def get(key, default = None):
-    global _g_config_dict
-    if _g_config_dict == None:
+    global _g_config
+
+    if _g_config is None:
         load()
-    return _g_config_dict.get(key, default)
+
+    return _g_config.get(key, default)
 
 def set(key, newval):
-    global _g_config_dict
-    if _g_config_dict == None:
-        load()
-    _g_config_dict[key] = newval
+    """
+    Sets the value of the config setting of key to be newval
+
+    Once any key/value pair is changed via the set method,
+    that key/value pair will remain set with that value until
+    change via the update or set method or program termination
+    """
+    global _g_config
+
+    if _g_config is None:
+        _g_config = IndraConfig(None)
+
+    _g_config.set(key, newval)
 
-def as_dict():
-    global _g_config_dict
-    return _g_config_dict
+def get_config():
+    global _g_config
+    return _g_config
diff --git a/linden/indra/lib/python/indra/base/llsd.py b/linden/indra/lib/python/indra/base/llsd.py
index cd23551..995ace7 100644
--- a/linden/indra/lib/python/indra/base/llsd.py
+++ b/linden/indra/lib/python/indra/base/llsd.py
@@ -33,14 +33,7 @@ import time
 import types
 import re
 
-#from cElementTree import fromstring ## This does not work under Windows
-try:
-    ## This is the old name of elementtree, for use with 2.3
-    from elementtree.ElementTree import fromstring
-except ImportError:
-    ## This is the name of elementtree under python 2.5
-    from xml.etree.ElementTree import fromstring
-
+from indra.util.fastest_elementtree import fromstring
 from indra.base import lluuid
 
 int_regex = re.compile("[-+]?\d+")
@@ -67,6 +60,39 @@ BOOL_TRUE = ('1', '1.0', 'true')
 BOOL_FALSE = ('0', '0.0', 'false', '')
 
 
+def format_datestr(v):
+    """ Formats a datetime object into the string format shared by xml and notation serializations."""
+    second_str = ""
+    if v.microsecond > 0:
+        seconds = v.second + float(v.microsecond) / 1000000
+        second_str = "%05.2f" % seconds
+    else:
+        second_str = "%d" % v.second
+    return '%s%sZ' % (v.strftime('%Y-%m-%dT%H:%M:'), second_str)
+
+
+def parse_datestr(datestr):
+    """Parses a datetime object from the string format shared by xml and notation serializations."""
+    if datestr == "":
+        return datetime.datetime(1970, 1, 1)
+    
+    match = re.match(date_regex, datestr)
+    if not match:
+        raise LLSDParseError("invalid date string '%s'." % datestr)
+    
+    year = int(match.group('year'))
+    month = int(match.group('month'))
+    day = int(match.group('day'))
+    hour = int(match.group('hour'))
+    minute = int(match.group('minute'))
+    second = int(match.group('second'))
+    seconds_float = match.group('second_float')
+    microsecond = 0
+    if seconds_float:
+        microsecond = int(seconds_float[1:]) * 10000
+    return datetime.datetime(year, month, day, hour, minute, second, microsecond)
+
+
 def bool_to_python(node):
     val = node.text or ''
     if val in BOOL_TRUE:
@@ -99,8 +125,7 @@ def date_to_python(node):
     val = node.text or ''
     if not val:
         val = "1970-01-01T00:00:00Z"
-    return datetime.datetime(
-        *time.strptime(val, '%Y-%m-%dT%H:%M:%SZ')[:6])
+    return parse_datestr(val)
 
 def uri_to_python(node):
     val = node.text or ''
@@ -194,7 +219,7 @@ class LLSDXMLFormatter(object):
     def URI(self, v):
         return self.elt('uri', self.xml_esc(str(v)))
     def DATE(self, v):
-        return self.elt('date', v.strftime('%Y-%m-%dT%H:%M:%SZ'))
+        return self.elt('date', format_datestr(v))
     def ARRAY(self, v):
         return self.elt('array', ''.join([self.generate(item) for item in v]))
     def MAP(self, v):
@@ -215,8 +240,12 @@ class LLSDXMLFormatter(object):
     def format(self, something):
         return '<?xml version="1.0" ?>' + self.elt("llsd", self.generate(something))
 
+_g_xml_formatter = None
 def format_xml(something):
-    return LLSDXMLFormatter().format(something)
+    global _g_xml_formatter
+    if _g_xml_formatter is None:
+        _g_xml_formatter = LLSDXMLFormatter()
+    return _g_xml_formatter.format(something)
 
 class LLSDXMLPrettyFormatter(LLSDXMLFormatter):
     def __init__(self, indent_atom = None):
@@ -333,13 +362,7 @@ class LLSDNotationFormatter(object):
     def URI(self, v):
         return 'l"%s"' % str(v).replace("\\", "\\\\").replace('"', '\\"')
     def DATE(self, v):
-        second_str = ""
-        if v.microsecond > 0:
-            seconds = v.second + float(v.microsecond) / 1000000
-            second_str = "%05.2f" % seconds
-        else:
-            second_str = "%d" % v.second
-        return 'd"%s%sZ"' % (v.strftime('%Y-%m-%dT%H:%M:'), second_str)
+        return 'd"%s"' % format_datestr(v)
     def ARRAY(self, v):
         return "[%s]" % ','.join([self.generate(item) for item in v])
     def MAP(self, v):
@@ -548,10 +571,11 @@ class LLSDNotationParser(object):
     integer: i####
     real: r####
     uuid: u####
-    string: "g'day" | 'have a "nice" day' | s(size)"raw data"
+    string: "g\'day" | 'have a "nice" day' | s(size)"raw data"
     uri: l"escaped"
     date: d"YYYY-MM-DDTHH:MM:SS.FFZ"
-    binary: b##"ff3120ab1" | b(size)"raw data" """
+    binary: b##"ff3120ab1" | b(size)"raw data"
+    """
     def __init__(self):
         pass
 
@@ -614,7 +638,6 @@ class LLSDNotationParser(object):
         elif cc == 'b':
             raise LLSDParseError("binary notation not yet supported")
         else:
-            print cc
             raise LLSDParseError("invalid token at index %d: %d" % (
                 self._index - 1, ord(cc)))
 
@@ -695,25 +718,7 @@ class LLSDNotationParser(object):
         delim = self._buffer[self._index]
         self._index += 1
         datestr = self._parse_string(delim)
-
-        if datestr == "":
-            return datetime.datetime(1970, 1, 1)
-            
-        match = re.match(date_regex, datestr)
-        if not match:
-            raise LLSDParseError("invalid date string '%s'." % datestr)
-
-        year = int(match.group('year'))
-        month = int(match.group('month'))
-        day = int(match.group('day'))
-        hour = int(match.group('hour'))
-        minute = int(match.group('minute'))
-        second = int(match.group('second'))
-        seconds_float = match.group('second_float')
-        microsecond = 0
-        if seconds_float:
-            microsecond = int(seconds_float[1:]) * 10000
-        return datetime.datetime(year, month, day, hour, minute, second, microsecond)
+        return parse_datestr(datestr)
 
     def _parse_real(self):
         match = re.match(real_regex, self._buffer[self._index:])
@@ -738,7 +743,7 @@ class LLSDNotationParser(object):
         return int( self._buffer[start:end] )
 
     def _parse_string(self, delim):
-        """ string: "g'day" | 'have a "nice" day' | s(size)"raw data" """
+        """ string: "g\'day" | 'have a "nice" day' | s(size)"raw data" """
         rv = ""
 
         if delim in ("'", '"'):
@@ -908,22 +913,17 @@ class LLSD(object):
 
 undef = LLSD(None)
 
-# register converters for stacked, if stacked is available
+# register converters for llsd in mulib, if it is available
 try:
-    from mulib import stacked
+    from mulib import stacked, mu
     stacked.NoProducer()  # just to exercise stacked
+    mu.safe_load(None)    # just to exercise mu
 except:
-    print "Couldn't import mulib.stacked, not registering LLSD converters"
+    # mulib not available, don't print an error message since this is normal
+    pass
 else:
-    def llsd_convert_json(llsd_stuff, request):
-        callback = request.get_header('callback')
-        if callback is not None:
-            ## See Yahoo's ajax documentation for information about using this
-            ## callback style of programming
-            ## http://developer.yahoo.com/common/json.html#callbackparam
-            req.write("%s(%s)" % (callback, simplejson.dumps(llsd_stuff)))
-        else:
-            req.write(simplejson.dumps(llsd_stuff))
+    mu.add_parser(parse, 'application/llsd+xml')
+    mu.add_parser(parse, 'application/llsd+binary')
 
     def llsd_convert_xml(llsd_stuff, request):
         request.write(format_xml(llsd_stuff))
@@ -932,8 +932,6 @@ else:
         request.write(format_binary(llsd_stuff))
 
     for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
-        stacked.add_producer(typ, llsd_convert_json, 'application/json')
-
         stacked.add_producer(typ, llsd_convert_xml, 'application/llsd+xml')
         stacked.add_producer(typ, llsd_convert_xml, 'application/xml')
         stacked.add_producer(typ, llsd_convert_xml, 'text/xml')
diff --git a/linden/indra/lib/python/indra/base/lluuid.py b/linden/indra/lib/python/indra/base/lluuid.py
index dd336f0..0756889 100644
--- a/linden/indra/lib/python/indra/base/lluuid.py
+++ b/linden/indra/lib/python/indra/base/lluuid.py
@@ -74,21 +74,29 @@ class UUID(object):
     hexip = ''.join(["%04x" % long(i) for i in ip.split('.')])
     lastid = ''
 
-    def __init__(self, string_with_uuid=None):
+    def __init__(self, possible_uuid=None):
         """
-        Initialize to first valid UUID in string argument,
-        or to null UUID if none found or string is not supplied.
+        Initialize to first valid UUID in argument (if a string),
+        or to null UUID if none found or argument is not supplied.
+
+        If the argument is a UUID, the constructed object will be a copy of it.
         """
         self._bits = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-        if string_with_uuid:
-            uuid_match = UUID.uuid_regex.search(string_with_uuid)
-            if uuid_match:
-                uuid_string = uuid_match.group()
-                s = string.replace(uuid_string, '-', '')
-                self._bits = _int2binstr(string.atol(s[:8],16),4) + \
-                             _int2binstr(string.atol(s[8:16],16),4) + \
-                             _int2binstr(string.atol(s[16:24],16),4) + \
-                             _int2binstr(string.atol(s[24:],16),4) 
+        if possible_uuid is None:
+            return
+
+        if isinstance(possible_uuid, type(self)):
+            self.set(possible_uuid)
+            return
+
+        uuid_match = UUID.uuid_regex.search(possible_uuid)
+        if uuid_match:
+            uuid_string = uuid_match.group()
+            s = string.replace(uuid_string, '-', '')
+            self._bits = _int2binstr(string.atol(s[:8],16),4) + \
+                         _int2binstr(string.atol(s[8:16],16),4) + \
+                         _int2binstr(string.atol(s[16:24],16),4) + \
+                         _int2binstr(string.atol(s[24:],16),4) 
 
     def __len__(self):
         """
diff --git a/linden/indra/lib/python/indra/ipc/llsdhttp.py b/linden/indra/lib/python/indra/ipc/llsdhttp.py
index 24cad61..1cf1146 100644
--- a/linden/indra/lib/python/indra/ipc/llsdhttp.py
+++ b/linden/indra/lib/python/indra/ipc/llsdhttp.py
@@ -48,7 +48,11 @@ put_ = suite.put_
 request = suite.request
 request_ = suite.request_
 
-for x in (httpc.ConnectionError, httpc.NotFound, httpc.Forbidden):
+# import every httpc error exception into our namespace for convenience
+for x in httpc.status_to_error_map.itervalues():
+    globals()[x.__name__] = x
+
+for x in (httpc.ConnectionError,):
     globals()[x.__name__] = x
 
 
@@ -60,21 +64,22 @@ def postFile(url, filename):
     return post_(url, llsd_body)
 
 
+# deprecated in favor of get_
 def getStatus(url, use_proxy=False):
     status, _headers, _body = get_(url, use_proxy=use_proxy)
     return status
 
-
+# deprecated in favor of put_
 def putStatus(url, data):
     status, _headers, _body = put_(url, data)
     return status
 
-
+# deprecated in favor of delete_
 def deleteStatus(url):
     status, _headers, _body = delete_(url)
     return status
 
-
+# deprecated in favor of post_
 def postStatus(url, data):
     status, _headers, _body = post_(url, data)
     return status
diff --git a/linden/indra/lib/python/indra/ipc/mysql_pool.py b/linden/indra/lib/python/indra/ipc/mysql_pool.py
index 01e31bb..507b185 100644
--- a/linden/indra/lib/python/indra/ipc/mysql_pool.py
+++ b/linden/indra/lib/python/indra/ipc/mysql_pool.py
@@ -1,6 +1,6 @@
 """\
 @file mysql_pool.py
-@brief Uses saranwrap to implement a pool of nonblocking database connections to a mysql server.
+@brief Thin wrapper around eventlet.db_pool that chooses MySQLdb and Tpool.
 
 $LicenseInfo:firstyear=2007&license=mit$
 
@@ -26,44 +26,14 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
-import os
-
-from eventlet.pools import Pool
-from eventlet.processes import DeadProcess
-from indra.ipc import saranwrap
-
 import MySQLdb
+from eventlet import db_pool
 
-# method 2: better -- admits the existence of the pool
-# dbp = my_db_connector.get()
-# dbh = dbp.get()
-# dbc = dbh.cursor()
-# dbc.execute(named_query)
-# dbc.close()
-# dbp.put(dbh)
-
-class DatabaseConnector(object):
-    """\
-@brief This is an object which will maintain a collection of database
-connection pools keyed on host,databasename"""
+class DatabaseConnector(db_pool.DatabaseConnector):
     def __init__(self, credentials, min_size = 0, max_size = 4, *args, **kwargs):
-        """\
-        @brief constructor
-        @param min_size the minimum size of a child pool.
-        @param max_size the maximum size of a child pool."""
-        self._min_size = min_size
-        self._max_size = max_size
-        self._args = args
-        self._kwargs = kwargs
-        self._credentials = credentials  # this is a map of hostname to username/password
-        self._databases = {}
-
-    def credentials_for(self, host):
-        if host in self._credentials:
-            return self._credentials[host]
-        else:
-            return self._credentials.get('default', None)
+        super(DatabaseConnector, self).__init__(MySQLdb, credentials, min_size, max_size, conn_pool=db_pool.ConnectionPool, *args, **kwargs)
 
+    # get is extended relative to eventlet.db_pool to accept a port argument
     def get(self, host, dbname, port=3306):
         key = (host, dbname, port)
         if key not in self._databases:
@@ -77,28 +47,44 @@ connection pools keyed on host,databasename"""
 
         return self._databases[key]
 
-
-class ConnectionPool(Pool):
+class ConnectionPool(db_pool.TpooledConnectionPool):
     """A pool which gives out saranwrapped MySQLdb connections from a pool
     """
-    def __init__(self, min_size = 0, max_size = 4, *args, **kwargs):
-        self._args = args
-        self._kwargs = kwargs
-        Pool.__init__(self, min_size, max_size)
 
-    def create(self):
-        return saranwrap.wrap(MySQLdb).connect(*self._args, **self._kwargs)
-
-    def put(self, conn):
-        # rollback any uncommitted changes, so that the next process
-        # has a clean slate.  This also pokes the process to see if
-        # it's dead or None
-        try:
-            conn.rollback()
-        except (AttributeError, DeadProcess), e:
-            conn = self.create()
-        # TODO figure out if we're still connected to the database
-        if conn is not None:
-            Pool.put(self, conn)
-        else:
-            self.current_size -= 1
+    def __init__(self, min_size = 0, max_size = 4, *args, **kwargs):
+        super(ConnectionPool, self).__init__(MySQLdb, min_size, max_size, *args, **kwargs)
+
+    def get(self):
+        conn = super(ConnectionPool, self).get()
+        # annotate the connection object with the details on the
+        # connection; this is used elsewhere to check that you haven't
+        # suddenly changed databases in midstream while making a
+        # series of queries on a connection.
+        arg_names = ['host','user','passwd','db','port','unix_socket','conv','connect_timeout',
+         'compress', 'named_pipe', 'init_command', 'read_default_file', 'read_default_group',
+         'cursorclass', 'use_unicode', 'charset', 'sql_mode', 'client_flag', 'ssl',
+         'local_infile']
+        # you could have constructed this connectionpool with a mix of
+        # keyword and non-keyword arguments, but we want to annotate
+        # the connection object with a dict so it's easy to check
+        # against so here we are converting the list of non-keyword
+        # arguments (in self._args) into a dict of keyword arguments,
+        # and merging that with the actual keyword arguments
+        # (self._kwargs).  The arg_names variable lists the
+        # constructor arguments for MySQLdb Connection objects.
+        converted_kwargs = dict([ (arg_names[i], arg) for i, arg in enumerate(self._args) ])
+        converted_kwargs.update(self._kwargs)
+        conn.connection_parameters = converted_kwargs
+        return conn
+
+    def clear(self):
+        """ Close all connections that this pool still holds a reference to, leaving it empty."""
+        for conn in self.free_items:
+            try:
+                conn.close()
+            except:
+                pass   # even if stuff happens here, we still want to at least try to close all the other connections
+        self.free_items.clear()
+            
+    def __del__(self):
+        self.clear()
diff --git a/linden/indra/lib/python/indra/ipc/siesta.py b/linden/indra/lib/python/indra/ipc/siesta.py
new file mode 100644
index 0000000..5fbea29
--- /dev/null
+++ b/linden/indra/lib/python/indra/ipc/siesta.py
@@ -0,0 +1,402 @@
+from indra.base import llsd
+from webob import exc
+import webob
+import re, socket
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+try:
+    import cjson
+    json_decode = cjson.decode
+    json_encode = cjson.encode
+    JsonDecodeError = cjson.DecodeError
+    JsonEncodeError = cjson.EncodeError
+except ImportError:
+    import simplejson
+    json_decode = simplejson.loads
+    json_encode = simplejson.dumps
+    JsonDecodeError = ValueError
+    JsonEncodeError = TypeError
+
+
+llsd_parsers = {
+    'application/json': json_decode,
+    'application/llsd+binary': llsd.parse_binary,
+    'application/llsd+notation': llsd.parse_notation,
+    'application/llsd+xml': llsd.parse_xml,
+    'application/xml': llsd.parse_xml,
+    }
+
+
+def mime_type(content_type):
+    '''Given a Content-Type header, return only the MIME type.'''
+
+    return content_type.split(';', 1)[0].strip().lower()
+    
+class BodyLLSD(object):
+    '''Give a webob Request or Response an llsd property.
+
+    Getting the llsd property parses the body, and caches the result.
+
+    Setting the llsd property formats a payload, and the body property
+    is set.'''
+
+    def _llsd__get(self):
+        '''Get, set, or delete the LLSD value stored in this object.'''
+
+        try:
+            return self._llsd
+        except AttributeError:
+            if not self.body:
+                raise AttributeError('No llsd attribute has been set')
+            else:
+                mtype = mime_type(self.content_type)
+                try:
+                    parser = llsd_parsers[mtype]
+                except KeyError:
+                    raise exc.HTTPUnsupportedMediaType(
+                        'Content type %s not supported' % mtype).exception
+                try:
+                    self._llsd = parser(self.body)
+                except (llsd.LLSDParseError, JsonDecodeError, TypeError), err:
+                    raise exc.HTTPBadRequest(
+                        'Could not parse body: %r' % err.args).exception
+            return self._llsd
+
+    def _llsd__set(self, val):
+        req = getattr(self, 'request', None)
+        if req is not None:
+            formatter, ctype = formatter_for_request(req)
+            self.content_type = ctype
+        else:
+            formatter, ctype = formatter_for_mime_type(
+                mime_type(self.content_type))
+        self.body = formatter(val)
+
+    def _llsd__del(self):
+        if hasattr(self, '_llsd'):
+            del self._llsd
+
+    llsd = property(_llsd__get, _llsd__set, _llsd__del)
+
+
+class Response(webob.Response, BodyLLSD):
+    '''Response class with LLSD support.
+
+    A sensible default content type is used.
+
+    Setting the llsd property also sets the body.  Getting the llsd
+    property parses the body if necessary.
+
+    If you set the body property directly, the llsd property will be
+    deleted.'''
+
+    default_content_type = 'application/llsd+xml'
+
+    def _body__set(self, body):
+        if hasattr(self, '_llsd'):
+            del self._llsd
+        super(Response, self)._body__set(body)
+
+    def cache_forever(self):
+        self.cache_expires(86400 * 365)
+
+    body = property(webob.Response._body__get, _body__set,
+                    webob.Response._body__del,
+                    webob.Response._body__get.__doc__)
+
+
+class Request(webob.Request, BodyLLSD):
+    '''Request class with LLSD support.
+
+    Sensible content type and accept headers are used by default.
+
+    Setting the llsd property also sets the body.  Getting the llsd
+    property parses the body if necessary.
+
+    If you set the body property directly, the llsd property will be
+    deleted.'''
+    
+    default_content_type = 'application/llsd+xml'
+    default_accept = ('application/llsd+xml; q=0.5, '
+                      'application/llsd+notation; q=0.3, '
+                      'application/llsd+binary; q=0.2, '
+                      'application/xml; q=0.1, '
+                      'application/json; q=0.0')
+
+    def __init__(self, environ=None, *args, **kwargs):
+        if environ is None:
+            environ = {}
+        else:
+            environ = environ.copy()
+        if 'CONTENT_TYPE' not in environ:
+            environ['CONTENT_TYPE'] = self.default_content_type
+        if 'HTTP_ACCEPT' not in environ:
+            environ['HTTP_ACCEPT'] = self.default_accept
+        super(Request, self).__init__(environ, *args, **kwargs)
+
+    def _body__set(self, body):
+        if hasattr(self, '_llsd'):
+            del self._llsd
+        super(Request, self)._body__set(body)
+
+    def path_urljoin(self, *parts):
+        return '/'.join([path_url.rstrip('/')] + list(parts))
+
+    body = property(webob.Request._body__get, _body__set,
+                    webob.Request._body__del, webob.Request._body__get.__doc__)
+
+    def create_response(self, llsd=None, status='200 OK',
+                        conditional_response=webob.NoDefault):
+        resp = self.ResponseClass(status=status, request=self,
+                                  conditional_response=conditional_response)
+        resp.llsd = llsd
+        return resp
+
+    def curl(self):
+        '''Create and fill out a pycurl easy object from this request.'''
+ 
+        import pycurl
+        c = pycurl.Curl()
+        c.setopt(pycurl.URL, self.url())
+        if self.headers:
+            c.setopt(pycurl.HTTPHEADER,
+                     ['%s: %s' % (k, self.headers[k]) for k in self.headers])
+        c.setopt(pycurl.FOLLOWLOCATION, True)
+        c.setopt(pycurl.AUTOREFERER, True)
+        c.setopt(pycurl.MAXREDIRS, 16)
+        c.setopt(pycurl.NOSIGNAL, True)
+        c.setopt(pycurl.READFUNCTION, self.body_file.read)
+        c.setopt(pycurl.SSL_VERIFYHOST, 2)
+        
+        if self.method == 'POST':
+            c.setopt(pycurl.POST, True)
+            post301 = getattr(pycurl, 'POST301', None)
+            if post301 is not None:
+                # Added in libcurl 7.17.1.
+                c.setopt(post301, True)
+        elif self.method == 'PUT':
+            c.setopt(pycurl.PUT, True)
+        elif self.method != 'GET':
+            c.setopt(pycurl.CUSTOMREQUEST, self.method)
+        return c
+
+Request.ResponseClass = Response
+Response.RequestClass = Request
+
+
+llsd_formatters = {
+    'application/json': json_encode,
+    'application/llsd+binary': llsd.format_binary,
+    'application/llsd+notation': llsd.format_notation,
+    'application/llsd+xml': llsd.format_xml,
+    'application/xml': llsd.format_xml,
+    }
+
+
+def formatter_for_mime_type(mime_type):
+    '''Return a formatter that encodes to the given MIME type.
+
+    The result is a pair of function and MIME type.'''
+
+    try:
+        return llsd_formatters[mime_type], mime_type
+    except KeyError:
+        raise exc.HTTPInternalServerError(
+            'Could not use MIME type %r to format response' %
+            mime_type).exception
+
+
+def formatter_for_request(req):
+    '''Return a formatter that encodes to the preferred type of the client.
+
+    The result is a pair of function and actual MIME type.'''
+
+    for ctype in req.accept.best_matches('application/llsd+xml'):
+        try:
+            return llsd_formatters[ctype], ctype
+        except KeyError:
+            pass
+    else:
+        raise exc.HTTPNotAcceptable().exception
+
+
+def wsgi_adapter(func, environ, start_response):
+    '''Adapt a Siesta callable to act as a WSGI application.'''
+
+    try:
+        req = Request(environ)
+        resp = func(req, **req.urlvars)
+        if not isinstance(resp, webob.Response):
+            try:
+                formatter, ctype = formatter_for_request(req)
+                resp = req.ResponseClass(formatter(resp), content_type=ctype)
+                resp._llsd = resp
+            except (JsonEncodeError, TypeError), err:
+                resp = exc.HTTPInternalServerError(
+                    detail='Could not format response')
+    except exc.HTTPException, e:
+        resp = e
+    except socket.error, e:
+        resp = exc.HTTPInternalServerError(detail=e.args[1])
+    return resp(environ, start_response)
+
+
+def llsd_callable(func):
+    '''Turn a callable into a Siesta application.'''
+
+    def replacement(environ, start_response):
+        return wsgi_adapter(func, environ, start_response)
+
+    return replacement
+
+
+def llsd_method(http_method, func):
+    def replacement(environ, start_response):
+        if environ['REQUEST_METHOD'] == http_method:
+            return wsgi_adapter(func, environ, start_response)
+        return exc.HTTPMethodNotAllowed()(environ, start_response)
+
+    return replacement
+
+
+http11_methods = 'OPTIONS GET HEAD POST PUT DELETE TRACE CONNECT'.split()
+http11_methods.sort()
+
+def llsd_class(cls):
+    '''Turn a class into a Siesta application.
+
+    A new instance is created for each request.  A HTTP method FOO is
+    turned into a call to the handle_foo method of the instance.'''
+
+    def foo(req, **kwargs):
+        instance = cls()
+        method = req.method.lower()
+        try:
+            handler = getattr(instance, 'handle_' + method)
+        except AttributeError:
+            allowed = [m for m in http11_methods
+                       if hasattr(instance, 'handle_' + m.lower())]
+            raise exc.HTTPMethodNotAllowed(
+                headers={'Allowed': ', '.join(allowed)}).exception
+        return handler(req, **kwargs)
+
+    def replacement(environ, start_response):
+        return wsgi_adapter(foo, environ, start_response)
+
+    return replacement
+
+
+def curl(reqs):
+    import pycurl
+
+    m = pycurl.CurlMulti()
+    curls = [r.curl() for r in reqs]
+    io = {}
+    for c in curls:
+        fp = StringIO()
+        hdr = StringIO()
+        c.setopt(pycurl.WRITEFUNCTION, fp.write)
+        c.setopt(pycurl.HEADERFUNCTION, hdr.write)
+        io[id(c)] = fp, hdr
+    m.handles = curls
+    try:
+        while True:
+            ret, num_handles = m.perform()
+            if ret != pycurl.E_CALL_MULTI_PERFORM:
+                break
+    finally:
+        m.close()
+
+    for req, c in zip(reqs, curls):
+        fp, hdr = io[id(c)]
+        hdr.seek(0)
+        status = hdr.readline().rstrip()
+        headers = []
+        name, values = None, None
+
+        # XXX We don't currently handle bogus header data.
+
+        for line in hdr.readlines():
+            if not line[0].isspace():
+                if name:
+                    headers.append((name, ' '.join(values)))
+                name, value = line.strip().split(':', 1)
+                value = [value]
+            else:
+                values.append(line.strip())
+        if name:
+            headers.append((name, ' '.join(values)))
+
+        resp = c.ResponseClass(fp.getvalue(), status, headers, request=req)
+
+
+route_re = re.compile(r'''
+    \{                 # exact character "{"
+    (\w+)              # variable name (restricted to a-z, 0-9, _)
+    (?:([:~])([^}]+))? # optional :type or ~regex part
+    \}                 # exact character "}"
+    ''', re.VERBOSE)
+
+predefined_regexps = {
+    'uuid': r'[a-f0-9][a-f0-9-]{31,35}',
+    'int': r'\d+',
+    }
+
+def compile_route(route):
+    fp = StringIO()
+    last_pos = 0
+    for match in route_re.finditer(route):
+        fp.write(re.escape(route[last_pos:match.start()]))
+        var_name = match.group(1)
+        sep = match.group(2)
+        expr = match.group(3)
+        if expr:
+            if sep == ':':
+                expr = predefined_regexps[expr]
+            # otherwise, treat what follows '~' as a regexp
+        else:
+            expr = '[^/]+'
+        expr = '(?P<%s>%s)' % (var_name, expr)
+        fp.write(expr)
+        last_pos = match.end()
+    fp.write(re.escape(route[last_pos:]))
+    return '^%s$' % fp.getvalue()
+
+class Router(object):
+    '''WSGI routing class.  Parses a URL and hands off a request to
+    some other WSGI application.  If no suitable application is found,
+    responds with a 404.'''
+
+    def __init__(self):
+        self.routes = []
+        self.paths = []
+
+    def add(self, route, app, methods=None):
+        self.paths.append(route)
+        self.routes.append((re.compile(compile_route(route)), app,
+                            methods and dict.fromkeys(methods)))
+
+    def __call__(self, environ, start_response):
+        path_info = environ['PATH_INFO']
+        request_method = environ['REQUEST_METHOD']
+        allowed = []
+        for regex, app, methods in self.routes:
+            m = regex.match(path_info)
+            if m:
+                if not methods or request_method in methods:
+                    environ['paste.urlvars'] = m.groupdict()
+                    return app(environ, start_response)
+                else:
+                    allowed += methods
+        if allowed:
+            allowed = dict.fromkeys(allows).keys()
+            allowed.sort()
+            resp = exc.HTTPMethodNotAllowed(
+                headers={'Allowed': ', '.join(allowed)})
+        else:
+            resp = exc.HTTPNotFound()
+        return resp(environ, start_response)
diff --git a/linden/indra/lib/python/indra/ipc/siesta_test.py b/linden/indra/lib/python/indra/ipc/siesta_test.py
new file mode 100644
index 0000000..177ea71
--- /dev/null
+++ b/linden/indra/lib/python/indra/ipc/siesta_test.py
@@ -0,0 +1,214 @@
+from indra.base import llsd, lluuid
+from indra.ipc import siesta
+import datetime, math, unittest
+from webob import exc
+
+
+class ClassApp(object):
+    def handle_get(self, req):
+        pass
+
+    def handle_post(self, req):
+        return req.llsd
+    
+
+def callable_app(req):
+    if req.method == 'UNDERPANTS':
+        raise exc.HTTPMethodNotAllowed()
+    elif req.method == 'GET':
+        return None
+    return req.llsd
+
+
+class TestBase:
+    def test_basic_get(self):
+        req = siesta.Request.blank('/')
+        self.assertEquals(req.get_response(self.server).body,
+                          llsd.format_xml(None))
+        
+    def test_bad_method(self):
+        req = siesta.Request.blank('/')
+        req.environ['REQUEST_METHOD'] = 'UNDERPANTS'
+        self.assertEquals(req.get_response(self.server).status_int,
+                          exc.HTTPMethodNotAllowed.code)
+        
+    json_safe = {
+        'none': None,
+        'bool_true': True,
+        'bool_false': False,
+        'int_zero': 0,
+        'int_max': 2147483647,
+        'int_min': -2147483648,
+        'long_zero': 0,
+        'long_max': 2147483647L,
+        'long_min': -2147483648L,
+        'float_zero': 0,
+        'float': math.pi,
+        'float_huge': 3.14159265358979323846e299,
+        'str_empty': '',
+        'str': 'foo',
+        u'unic\u1e51de_empty': u'',
+        u'unic\u1e51de': u'\u1e4exx\u10480',
+        }
+    json_safe['array'] = json_safe.values()
+    json_safe['tuple'] = tuple(json_safe.values())
+    json_safe['dict'] = json_safe.copy()
+
+    json_unsafe = {
+        'uuid_empty': lluuid.UUID(),
+        'uuid_full': lluuid.UUID('dc61ab0530200d7554d23510559102c1a98aab1b'),
+        'binary_empty': llsd.binary(),
+        'binary': llsd.binary('f\0\xff'),
+        'uri_empty': llsd.uri(),
+        'uri': llsd.uri('http://www.secondlife.com/'),
+        'datetime_empty': datetime.datetime(1970,1,1),
+        'datetime': datetime.datetime(1999,9,9,9,9,9),
+        }
+    json_unsafe.update(json_safe)
+    json_unsafe['array'] = json_unsafe.values()
+    json_unsafe['tuple'] = tuple(json_unsafe.values())
+    json_unsafe['dict'] = json_unsafe.copy()
+    json_unsafe['iter'] = iter(json_unsafe.values())
+
+    def _test_client_content_type_good(self, content_type, ll):
+        def run(ll):
+            req = siesta.Request.blank('/')
+            req.environ['REQUEST_METHOD'] = 'POST'
+            req.content_type = content_type
+            req.llsd = ll
+            req.accept = content_type
+            resp = req.get_response(self.server)
+            self.assertEquals(resp.status_int, 200)
+            return req, resp
+        
+        if False and isinstance(ll, dict):
+            def fixup(v):
+                if isinstance(v, float):
+                    return '%.5f' % v
+                if isinstance(v, long):
+                    return int(v)
+                if isinstance(v, (llsd.binary, llsd.uri)):
+                    return v
+                if isinstance(v, (tuple, list)):
+                    return [fixup(i) for i in v]
+                if isinstance(v, dict):
+                    return dict([(k, fixup(i)) for k, i in v.iteritems()])
+                return v
+            for k, v in ll.iteritems():
+                l = [k, v]
+                req, resp = run(l)
+                self.assertEquals(fixup(resp.llsd), fixup(l))
+
+        run(ll)
+
+    def test_client_content_type_json_good(self):
+        self._test_client_content_type_good('application/json', self.json_safe)
+
+    def test_client_content_type_llsd_xml_good(self):
+        self._test_client_content_type_good('application/llsd+xml',
+                                            self.json_unsafe)
+
+    def test_client_content_type_llsd_notation_good(self):
+        self._test_client_content_type_good('application/llsd+notation',
+                                            self.json_unsafe)
+
+    def test_client_content_type_llsd_binary_good(self):
+        self._test_client_content_type_good('application/llsd+binary',
+                                            self.json_unsafe)
+
+    def test_client_content_type_xml_good(self):
+        self._test_client_content_type_good('application/xml',
+                                            self.json_unsafe)
+
+    def _test_client_content_type_bad(self, content_type):
+        req = siesta.Request.blank('/')
+        req.environ['REQUEST_METHOD'] = 'POST'
+        req.body = '\0invalid nonsense under all encodings'
+        req.content_type = content_type
+        self.assertEquals(req.get_response(self.server).status_int,
+                          exc.HTTPBadRequest.code)
+        
+    def test_client_content_type_json_bad(self):
+        self._test_client_content_type_bad('application/json')
+
+    def test_client_content_type_llsd_xml_bad(self):
+        self._test_client_content_type_bad('application/llsd+xml')
+
+    def test_client_content_type_llsd_notation_bad(self):
+        self._test_client_content_type_bad('application/llsd+notation')
+
+    def test_client_content_type_llsd_binary_bad(self):
+        self._test_client_content_type_bad('application/llsd+binary')
+
+    def test_client_content_type_xml_bad(self):
+        self._test_client_content_type_bad('application/xml')
+
+    def test_client_content_type_bad(self):
+        req = siesta.Request.blank('/')
+        req.environ['REQUEST_METHOD'] = 'POST'
+        req.body = 'XXX'
+        req.content_type = 'application/nonsense'
+        self.assertEquals(req.get_response(self.server).status_int,
+                          exc.HTTPUnsupportedMediaType.code)
+
+    def test_request_default_content_type(self):
+        req = siesta.Request.blank('/')
+        self.assertEquals(req.content_type, req.default_content_type)
+
+    def test_request_default_accept(self):
+        req = siesta.Request.blank('/')
+        from webob import acceptparse
+        self.assertEquals(str(req.accept).replace(' ', ''),
+                          req.default_accept.replace(' ', ''))
+
+    def test_request_llsd_auto_body(self):
+        req = siesta.Request.blank('/')
+        req.llsd = {'a': 2}
+        self.assertEquals(req.body, '<?xml version="1.0" ?><llsd><map>'
+                          '<key>a</key><integer>2</integer></map></llsd>')
+
+    def test_request_llsd_mod_body_changes_llsd(self):
+        req = siesta.Request.blank('/')
+        req.llsd = {'a': 2}
+        req.body = '<?xml version="1.0" ?><llsd><integer>1337</integer></llsd>'
+        self.assertEquals(req.llsd, 1337)
+
+    def test_request_bad_llsd_fails(self):
+        def crashme(ctype):
+            def boom():
+                class foo(object): pass
+                req = siesta.Request.blank('/')
+                req.content_type = ctype
+                req.llsd = foo()
+        for mime_type in siesta.llsd_parsers:
+            self.assertRaises(TypeError, crashme(mime_type))
+
+
+class ClassServer(TestBase, unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        unittest.TestCase.__init__(self, *args, **kwargs)
+        self.server = siesta.llsd_class(ClassApp)
+
+
+class CallableServer(TestBase, unittest.TestCase):
+    def __init__(self, *args, **kwargs):
+        unittest.TestCase.__init__(self, *args, **kwargs)
+        self.server = siesta.llsd_callable(callable_app)
+
+
+class RouterServer(unittest.TestCase):
+    def test_router(self):
+        def foo(req, quux):
+            print quux
+
+        r = siesta.Router()
+        r.add('/foo/{quux:int}', siesta.llsd_callable(foo), methods=['GET'])
+        req = siesta.Request.blank('/foo/33')
+        req.get_response(r)
+
+        req = siesta.Request.blank('/foo/bar')
+        self.assertEquals(req.get_response(r).status_int,
+                          exc.HTTPNotFound.code)
+    
+if __name__ == '__main__':
+    unittest.main()
diff --git a/linden/indra/lib/python/indra/util/fastest_elementtree.py b/linden/indra/lib/python/indra/util/fastest_elementtree.py
new file mode 100644
index 0000000..64aed09
--- /dev/null
+++ b/linden/indra/lib/python/indra/util/fastest_elementtree.py
@@ -0,0 +1,52 @@
+"""\
+@file fastest_elementtree.py
+@brief Concealing some gnarly import logic in here.  This should export the interface of elementtree.
+
+$LicenseInfo:firstyear=2006&license=mit$
+
+Copyright (c) 2006-2008, Linden Research, Inc.
+
+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.
+$/LicenseInfo$
+"""
+
+# Using celementree might cause some unforeseen problems so here's a
+# convenient off switch.
+
+# *NOTE: turned off cause of problems.  :-(  *TODO: debug
+use_celementree = False
+
+try:
+    if not use_celementree:
+        raise ImportError()
+    from cElementTree import * ## This does not work under Windows
+except ImportError:
+    try:
+        if not use_celementree:
+            raise ImportError()
+        ## This is the name of cElementTree under python 2.5
+        from xml.etree.cElementTree import *
+    except ImportError:
+        try:
+            ## This is the old name of elementtree, for use with 2.3
+            from elementtree.ElementTree import *
+        except ImportError:
+            ## This is the name of elementtree under python 2.5
+            from xml.etree.ElementTree import *
+
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 89c14e8..4675177 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -34,7 +34,6 @@ import fnmatch
 import getopt
 import glob
 import os
-import os.path
 import re
 import shutil
 import sys
@@ -42,10 +41,10 @@ import tarfile
 import errno
 
 def path_ancestors(path):
-    path = os.path.normpath(path)
+    drive, path = os.path.splitdrive(os.path.normpath(path))
     result = []
-    while len(path) > 0:
-        result.append(path)
+    while len(path) > 0 and path != os.path.sep:
+        result.append(drive+path)
         path, sub = os.path.split(path)
     return result
 
@@ -57,13 +56,13 @@ def proper_windows_path(path, current_platform = sys.platform):
     drive_letter = None
     rel = None
     match = re.match("/cygdrive/([a-z])/(.*)", path)
-    if(not match):
+    if not match:
         match = re.match('([a-zA-Z]):\\\(.*)', path)
-    if(not match):
+    if not match:
         return None         # not an absolute path
     drive_letter = match.group(1)
     rel = match.group(2)
-    if(current_platform == "cygwin"):
+    if current_platform == "cygwin":
         return "/cygdrive/" + drive_letter.lower() + '/' + rel.replace('\\', '/')
     else:
         return drive_letter.upper() + ':\\' + rel.replace('/', '\\')
@@ -98,6 +97,7 @@ def get_channel(srctree):
             return channel
     
 
+DEFAULT_SRCTREE = os.path.dirname(sys.argv[0])
 DEFAULT_CHANNEL = 'Second Life Release'
 
 ARGUMENTS=[
@@ -118,10 +118,12 @@ ARGUMENTS=[
         Example use: %(name)s --arch=i686
         On Linux this would try to use Linux_i686Manifest.""",
          default=""),
+    dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE),
     dict(name='configuration',
          description="""The build configuration used. Only used on OS X for
         now, but it could be used for other platforms as well.""",
          default="Universal"),
+    dict(name='dest', description='Destination directory.', default=DEFAULT_SRCTREE),
     dict(name='grid',
          description="""Which grid the client will try to connect to. Even
         though it's not strictly a grid, 'firstlook' is also an acceptable
@@ -144,6 +146,15 @@ ARGUMENTS=[
          description="""The current platform, to be used for looking up which
         manifest class to run.""",
          default=get_default_platform),
+    dict(name='source',
+         description='Source directory.',
+         default=DEFAULT_SRCTREE),
+    dict(name='artwork', description='Artwork directory.', default=DEFAULT_SRCTREE),
+    dict(name='touch',
+         description="""File to touch when action is finished. Touch file will
+        contain the name of the final package in a form suitable
+        for use by a .bat file.""",
+         default=None),
     dict(name='version',
          description="""This specifies the version of Second Life that is
         being packaged up.""",
@@ -167,63 +178,75 @@ def usage(srctree=""):
             default,
             arg['description'] % nd)
 
-def main(argv=None, srctree='.', dsttree='./dst'):
-    if(argv == None):
-        argv = sys.argv
-
+def main():
     option_names = [arg['name'] + '=' for arg in ARGUMENTS]
     option_names.append('help')
-    options, remainder = getopt.getopt(argv[1:], "", option_names)
-    if len(remainder) >= 1:
-        dsttree = remainder[0]
-
-    print "Source tree:", srctree
-    print "Destination tree:", dsttree
+    options, remainder = getopt.getopt(sys.argv[1:], "", option_names)
 
     # convert options to a hash
-    args = {}
+    args = {'source':  DEFAULT_SRCTREE,
+            'artwork': DEFAULT_SRCTREE,
+            'build':   DEFAULT_SRCTREE,
+            'dest':    DEFAULT_SRCTREE }
     for opt in options:
         args[opt[0].replace("--", "")] = opt[1]
 
+    for k in 'artwork build dest source'.split():
+        args[k] = os.path.normpath(args[k])
+
+    print "Source tree:", args['source']
+    print "Artwork tree:", args['artwork']
+    print "Build tree:", args['build']
+    print "Destination tree:", args['dest']
+
     # early out for help
-    if args.has_key('help'):
+    if 'help' in args:
         # *TODO: it is a huge hack to pass around the srctree like this
-        usage(srctree)
+        usage(args['source'])
         return
 
     # defaults
     for arg in ARGUMENTS:
-        if not args.has_key(arg['name']):
+        if arg['name'] not in args:
             default = arg['default']
             if hasattr(default, '__call__'):
-                default = default(srctree)
+                default = default(args['source'])
             if default is not None:
                 args[arg['name']] = default
 
     # fix up version
-    if args.has_key('version') and type(args['version']) == str:
+    if isinstance(args.get('version'), str):
         args['version'] = args['version'].split('.')
         
     # default and agni are default
     if args['grid'] in ['default', 'agni']:
         args['grid'] = ''
 
-    if args.has_key('actions'):
+    if 'actions' in args:
         args['actions'] = args['actions'].split()
 
     # debugging
     for opt in args:
         print "Option:", opt, "=", args[opt]
 
-    wm = LLManifest.for_platform(args['platform'], args.get('arch'))(srctree, dsttree, args)
+    wm = LLManifest.for_platform(args['platform'], args.get('arch'))(args)
     wm.do(*args['actions'])
+
+    # Write out the package file in this format, so that it can easily be called
+    # and used in a .bat file - yeah, it sucks, but this is the simplest...
+    touch = args.get('touch')
+    if touch:
+        fp = open(touch, 'w')
+        fp.write('set package_file=%s\n' % wm.package_file)
+        fp.close()
+        print 'touched', touch
     return 0
 
 class LLManifestRegistry(type):
     def __init__(cls, name, bases, dct):
         super(LLManifestRegistry, cls).__init__(name, bases, dct)
         match = re.match("(\w+)Manifest", name)
-        if(match):
+        if match:
            cls.manifests[match.group(1).lower()] = cls
 
 class LLManifest(object):
@@ -235,15 +258,18 @@ class LLManifest(object):
         return self.manifests[platform.lower()]
     for_platform = classmethod(for_platform)
 
-    def __init__(self, srctree, dsttree, args):
+    def __init__(self, args):
         super(LLManifest, self).__init__()
         self.args = args
         self.file_list = []
         self.excludes = []
         self.actions = []
-        self.src_prefix = [srctree]
-        self.dst_prefix = [dsttree]
+        self.src_prefix = [args['source']]
+        self.artwork_prefix = [args['artwork']]
+        self.build_prefix = [args['build']]
+        self.dst_prefix = [args['dest']]
         self.created_paths = []
+        self.package_name = "Unknown"
         
     def default_grid(self):
         return self.args.get('grid', None) == ''
@@ -260,16 +286,20 @@ class LLManifest(object):
         in the file list by path()."""
         self.excludes.append(glob)
 
-    def prefix(self, src='', dst=None):
+    def prefix(self, src='', build=None, dst=None):
         """ Pushes a prefix onto the stack.  Until end_prefix is
         called, all relevant method calls (esp. to path()) will prefix
         paths with the entire prefix stack.  Source and destination
         prefixes can be different, though if only one is provided they
         are both equal.  To specify a no-op, use an empty string, not
         None."""
-        if(dst == None):
+        if dst is None:
             dst = src
+        if build is None:
+            build = src
         self.src_prefix.append(src)
+        self.artwork_prefix.append(src)
+        self.build_prefix.append(build)
         self.dst_prefix.append(dst)
         return True  # so that you can wrap it in an if to get indentation
 
@@ -281,14 +311,24 @@ class LLManifest(object):
         exception is raised."""
         # as an error-prevention mechanism, check the prefix and see if it matches the source or destination prefix.  If not, improper nesting may have occurred.
         src = self.src_prefix.pop()
+        artwork = self.artwork_prefix.pop()
+        build = self.build_prefix.pop()
         dst = self.dst_prefix.pop()
-        if descr and not(src == descr or dst == descr):
+        if descr and not(src == descr or build == descr or dst == descr):
             raise ValueError, "End prefix '" + descr + "' didn't match '" +src+ "' or '" +dst + "'"
 
     def get_src_prefix(self):
         """ Returns the current source prefix."""
         return os.path.join(*self.src_prefix)
 
+    def get_artwork_prefix(self):
+        """ Returns the current artwork prefix."""
+        return os.path.join(*self.artwork_prefix)
+
+    def get_build_prefix(self):
+        """ Returns the current build prefix."""
+        return os.path.join(*self.build_prefix)
+
     def get_dst_prefix(self):
         """ Returns the current destination prefix."""
         return os.path.join(*self.dst_prefix)
@@ -298,6 +338,11 @@ class LLManifest(object):
         relative to the source directory."""
         return os.path.join(self.get_src_prefix(), relpath)
 
+    def build_path_of(self, relpath):
+        """Returns the full path to a file or directory specified
+        relative to the build directory."""
+        return os.path.join(self.get_build_prefix(), relpath)
+
     def dst_path_of(self, relpath):
         """Returns the full path to a file or directory specified
         relative to the destination directory."""
@@ -329,13 +374,13 @@ class LLManifest(object):
         lines = []
         while True:
             lines.append(fd.readline())
-            if(lines[-1] == ''):
+            if lines[-1] == '':
                 break
             else:
                 print lines[-1],
         output = ''.join(lines)
         status = fd.close()
-        if(status):
+        if status:
             raise RuntimeError(
                 "Command %s returned non-zero status (%s) \noutput:\n%s"
                 % (command, status, output) )
@@ -356,7 +401,7 @@ class LLManifest(object):
         f.close()
 
     def replace_in(self, src, dst=None, searchdict={}):
-        if(dst == None):
+        if dst == None:
             dst = src
         # read src
         f = open(self.src_path_of(src), "rbU")
@@ -369,11 +414,11 @@ class LLManifest(object):
         self.created_paths.append(dst)
 
     def copy_action(self, src, dst):
-        if(src and (os.path.exists(src) or os.path.islink(src))):
+        if src and (os.path.exists(src) or os.path.islink(src)):
             # ensure that destination path exists
             self.cmakedirs(os.path.dirname(dst))
             self.created_paths.append(dst)
-            if(not os.path.isdir(src)):
+            if not os.path.isdir(src):
                 self.ccopy(src,dst)
             else:
                 # src is a dir
@@ -408,7 +453,7 @@ class LLManifest(object):
             print "Cleaning up " + c
 
     def process_file(self, src, dst):
-        if(self.includes(src, dst)):
+        if self.includes(src, dst):
 #            print src, "=>", dst
             for action in self.actions:
                 methodname = action + "_action"
@@ -416,26 +461,29 @@ class LLManifest(object):
                 if method is not None:
                     method(src, dst)
             self.file_list.append([src, dst])
+            return 1
         else:
-            print "Excluding: ", src, dst
-
+            sys.stdout.write(" (excluding %r, %r)" % (src, dst))
+            sys.stdout.flush()
+            return 0
 
     def process_directory(self, src, dst):
-        if(not self.includes(src, dst)):
-            print "Excluding: ", src, dst
-            return
+        if not self.includes(src, dst):
+            sys.stdout.write(" (excluding %r, %r)" % (src, dst))
+            sys.stdout.flush()
+            return 0
         names = os.listdir(src)
         self.cmakedirs(dst)
         errors = []
+        count = 0
         for name in names:
             srcname = os.path.join(src, name)
             dstname = os.path.join(dst, name)
             if os.path.isdir(srcname):
-                self.process_directory(srcname, dstname)
+                count += self.process_directory(srcname, dstname)
             else:
-                self.process_file(srcname, dstname)
-
-
+                count += self.process_file(srcname, dstname)
+        return count
 
     def includes(self, src, dst):
         if src:
@@ -446,9 +494,9 @@ class LLManifest(object):
 
     def remove(self, *paths):
         for path in paths:
-            if(os.path.exists(path)):
+            if os.path.exists(path):
                 print "Removing path", path
-                if(os.path.isdir(path)):
+                if os.path.isdir(path):
                     shutil.rmtree(path)
                 else:
                     os.remove(path)
@@ -457,17 +505,17 @@ class LLManifest(object):
         """ Copy a single file or symlink.  Uses filecmp to skip copying for existing files."""
         if os.path.islink(src):
             linkto = os.readlink(src)
-            if(os.path.islink(dst) or os.path.exists(dst)):
+            if os.path.islink(dst) or os.path.exists(dst):
                 os.remove(dst)  # because symlinking over an existing link fails
             os.symlink(linkto, dst)
         else:
             # Don't recopy file if it's up-to-date.
             # If we seem to be not not overwriting files that have been
             # updated, set the last arg to False, but it will take longer.
-            if(os.path.exists(dst) and filecmp.cmp(src, dst, True)):
+            if os.path.exists(dst) and filecmp.cmp(src, dst, True):
                 return
             # only copy if it's not excluded
-            if(self.includes(src, dst)):
+            if self.includes(src, dst):
                 try:
                     os.unlink(dst)
                 except OSError, err:
@@ -481,7 +529,7 @@ class LLManifest(object):
         feature that the destination directory can exist.  It
         is so dumb that Python doesn't come with this. Also it
         implements the excludes functionality."""
-        if(not self.includes(src, dst)):
+        if not self.includes(src, dst):
             return
         names = os.listdir(src)
         self.cmakedirs(dst)
@@ -512,7 +560,7 @@ class LLManifest(object):
 
     def find_existing_file(self, *list):
         for f in list:
-            if(os.path.exists(f)):
+            if os.path.exists(f):
                 return f
         # didn't find it, return last item in list
         if len(list) > 0:
@@ -535,62 +583,63 @@ class LLManifest(object):
 
 
     def wildcard_regex(self, src_glob, dst_glob):
- #       print "regex_pair:", src_glob, dst_glob
         src_re = re.escape(src_glob)
         src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]+)')
         dst_temp = dst_glob
         i = 1
-        while(dst_temp.count("*") > 0):
+        while dst_temp.count("*") > 0:
             dst_temp = dst_temp.replace('*', '\g<' + str(i) + '>', 1)
             i = i+1
- #       print "regex_result:", src_re, dst_temp
         return re.compile(src_re), dst_temp
 
     def check_file_exists(self, path):
-        if(not os.path.exists(path) and not os.path.islink(path)):
+        if not os.path.exists(path) and not os.path.islink(path):
             raise RuntimeError("Path %s doesn't exist" % (
                 os.path.normpath(os.path.join(os.getcwd(), path)),))
 
 
     wildcard_pattern = re.compile('\*')
     def expand_globs(self, src, dst):
-        def fw_slash(str):
-            return str.replace('\\', '/')
-        def os_slash(str):
-            return str.replace('/', os.path.sep)
-        dst = fw_slash(dst)
-        src = fw_slash(src)
         src_list = glob.glob(src)
-        src_re, d_template = self.wildcard_regex(src, dst)
+        src_re, d_template = self.wildcard_regex(src.replace('\\', '/'),
+                                                 dst.replace('\\', '/'))
         for s in src_list:
-            s = fw_slash(s)
-            d = src_re.sub(d_template, s)
-            #print "s:",s, "d_t", d_template, "dst", dst, "d", d
-            yield os_slash(s), os_slash(d)
+            d = src_re.sub(d_template, s.replace('\\', '/'))
+            yield os.path.normpath(s), os.path.normpath(d)
 
     def path(self, src, dst=None):
-        print "Processing", src, "=>", dst
+        sys.stdout.write("Processing %s => %s ... " % (src, dst))
+        sys.stdout.flush()
         if src == None:
             raise RuntimeError("No source file, dst is " + dst)
         if dst == None:
             dst = src
         dst = os.path.join(self.get_dst_prefix(), dst)
-        src = os.path.join(self.get_src_prefix(), src)
 
-        # expand globs
-        if(self.wildcard_pattern.search(src)):
-            for s,d in self.expand_globs(src, dst):
-                self.process_file(s, d)
-        else:
-            # if we're specifying a single path (not a glob),
-            # we should error out if it doesn't exist
-            self.check_file_exists(src)
-            # if it's a directory, recurse through it
-            if(os.path.isdir(src)):
-                self.process_directory(src, dst)
+        def try_path(src):
+            # expand globs
+            count = 0
+            if self.wildcard_pattern.search(src):
+                for s,d in self.expand_globs(src, dst):
+                    count += self.process_file(s, d)
             else:
-                self.process_file(src, dst)
-
+                # if we're specifying a single path (not a glob),
+                # we should error out if it doesn't exist
+                self.check_file_exists(src)
+                # if it's a directory, recurse through it
+                if os.path.isdir(src):
+                    count += self.process_directory(src, dst)
+                else:
+                    count += self.process_file(src, dst)
+            return count
+        try:
+            count = try_path(os.path.join(self.get_src_prefix(), src))
+        except RuntimeError:
+            try:
+                count = try_path(os.path.join(self.get_artwork_prefix(), src))
+            except RuntimeError:
+                count = try_path(os.path.join(self.get_build_prefix(), src))
+        print "%d files" % count
 
     def do(self, *actions):
         self.actions = actions
diff --git a/linden/indra/lib/python/indra/util/named_query.py b/linden/indra/lib/python/indra/util/named_query.py
index 680d1f9..20f2ec7 100644
--- a/linden/indra/lib/python/indra/util/named_query.py
+++ b/linden/indra/lib/python/indra/util/named_query.py
@@ -47,7 +47,7 @@ except NameError:
 from indra.base import llsd
 from indra.base import config
 
-NQ_FILE_SUFFIX = config.get('named-query-file-suffix', '')
+NQ_FILE_SUFFIX = config.get('named-query-file-suffix', '.nq')
 NQ_FILE_SUFFIX_LEN  = len(NQ_FILE_SUFFIX)
 
 _g_named_manager = None
@@ -60,6 +60,11 @@ def _init_g_named_manager(sql_dir = None):
     because it's tricky to control the config from inside a test."""
     if sql_dir is None:
         sql_dir = config.get('named-query-base-dir')
+
+    # extra fallback directory in case config doesn't return what we want
+    if sql_dir is None:
+        sql_dir = os.path.dirname(__file__) + "../../../../web/dataservice/sql"
+
     global _g_named_manager
     _g_named_manager = NamedQueryManager(
         os.path.abspath(os.path.realpath(sql_dir)))
diff --git a/linden/indra/lib/python/indra/util/term.py b/linden/indra/lib/python/indra/util/term.py
new file mode 100644
index 0000000..8238b78
--- /dev/null
+++ b/linden/indra/lib/python/indra/util/term.py
@@ -0,0 +1,222 @@
+'''
+@file term.py
+@brief a better shutil.copytree replacement
+
+$LicenseInfo:firstyear=2007&license=mit$
+
+Copyright (c) 2007-2008, Linden Research, Inc.
+
+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.
+$/LicenseInfo$
+'''
+
+#http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/475116
+
+import sys, re
+
+class TerminalController:
+    """
+    A class that can be used to portably generate formatted output to
+    a terminal.  
+    
+    `TerminalController` defines a set of instance variables whose
+    values are initialized to the control sequence necessary to
+    perform a given action.  These can be simply included in normal
+    output to the terminal:
+
+        >>> term = TerminalController()
+        >>> print 'This is '+term.GREEN+'green'+term.NORMAL
+
+    Alternatively, the `render()` method can used, which replaces
+    '${action}' with the string required to perform 'action':
+
+        >>> term = TerminalController()
+        >>> print term.render('This is ${GREEN}green${NORMAL}')
+
+    If the terminal doesn't support a given action, then the value of
+    the corresponding instance variable will be set to ''.  As a
+    result, the above code will still work on terminals that do not
+    support color, except that their output will not be colored.
+    Also, this means that you can test whether the terminal supports a
+    given action by simply testing the truth value of the
+    corresponding instance variable:
+
+        >>> term = TerminalController()
+        >>> if term.CLEAR_SCREEN:
+        ...     print 'This terminal supports clearning the screen.'
+
+    Finally, if the width and height of the terminal are known, then
+    they will be stored in the `COLS` and `LINES` attributes.
+    """
+    # Cursor movement:
+    BOL = ''             #: Move the cursor to the beginning of the line
+    UP = ''              #: Move the cursor up one line
+    DOWN = ''            #: Move the cursor down one line
+    LEFT = ''            #: Move the cursor left one char
+    RIGHT = ''           #: Move the cursor right one char
+
+    # Deletion:
+    CLEAR_SCREEN = ''    #: Clear the screen and move to home position
+    CLEAR_EOL = ''       #: Clear to the end of the line.
+    CLEAR_BOL = ''       #: Clear to the beginning of the line.
+    CLEAR_EOS = ''       #: Clear to the end of the screen
+
+    # Output modes:
+    BOLD = ''            #: Turn on bold mode
+    BLINK = ''           #: Turn on blink mode
+    DIM = ''             #: Turn on half-bright mode
+    REVERSE = ''         #: Turn on reverse-video mode
+    NORMAL = ''          #: Turn off all modes
+
+    # Cursor display:
+    HIDE_CURSOR = ''     #: Make the cursor invisible
+    SHOW_CURSOR = ''     #: Make the cursor visible
+
+    # Terminal size:
+    COLS = None          #: Width of the terminal (None for unknown)
+    LINES = None         #: Height of the terminal (None for unknown)
+
+    # Foreground colors:
+    BLACK = BLUE = GREEN = CYAN = RED = MAGENTA = YELLOW = WHITE = ''
+    
+    # Background colors:
+    BG_BLACK = BG_BLUE = BG_GREEN = BG_CYAN = ''
+    BG_RED = BG_MAGENTA = BG_YELLOW = BG_WHITE = ''
+    
+    _STRING_CAPABILITIES = """
+    BOL=cr UP=cuu1 DOWN=cud1 LEFT=cub1 RIGHT=cuf1
+    CLEAR_SCREEN=clear CLEAR_EOL=el CLEAR_BOL=el1 CLEAR_EOS=ed BOLD=bold
+    BLINK=blink DIM=dim REVERSE=rev UNDERLINE=smul NORMAL=sgr0
+    HIDE_CURSOR=cinvis SHOW_CURSOR=cnorm""".split()
+    _COLORS = """BLACK BLUE GREEN CYAN RED MAGENTA YELLOW WHITE""".split()
+    _ANSICOLORS = "BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE".split()
+
+    def __init__(self, term_stream=sys.stdout):
+        """
+        Create a `TerminalController` and initialize its attributes
+        with appropriate values for the current terminal.
+        `term_stream` is the stream that will be used for terminal
+        output; if this stream is not a tty, then the terminal is
+        assumed to be a dumb terminal (i.e., have no capabilities).
+        """
+        # Curses isn't available on all platforms
+        try: import curses
+        except: return
+
+        # If the stream isn't a tty, then assume it has no capabilities.
+        if not term_stream.isatty(): return
+
+        # Check the terminal type.  If we fail, then assume that the
+        # terminal has no capabilities.
+        try: curses.setupterm()
+        except: return
+
+        # Look up numeric capabilities.
+        self.COLS = curses.tigetnum('cols')
+        self.LINES = curses.tigetnum('lines')
+        
+        # Look up string capabilities.
+        for capability in self._STRING_CAPABILITIES:
+            (attrib, cap_name) = capability.split('=')
+            setattr(self, attrib, self._tigetstr(cap_name) or '')
+
+        # Colors
+        set_fg = self._tigetstr('setf')
+        if set_fg:
+            for i,color in zip(range(len(self._COLORS)), self._COLORS):
+                setattr(self, color, curses.tparm(set_fg, i) or '')
+        set_fg_ansi = self._tigetstr('setaf')
+        if set_fg_ansi:
+            for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
+                setattr(self, color, curses.tparm(set_fg_ansi, i) or '')
+        set_bg = self._tigetstr('setb')
+        if set_bg:
+            for i,color in zip(range(len(self._COLORS)), self._COLORS):
+                setattr(self, 'BG_'+color, curses.tparm(set_bg, i) or '')
+        set_bg_ansi = self._tigetstr('setab')
+        if set_bg_ansi:
+            for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
+                setattr(self, 'BG_'+color, curses.tparm(set_bg_ansi, i) or '')
+
+    def _tigetstr(self, cap_name):
+        # String capabilities can include "delays" of the form "$<2>".
+        # For any modern terminal, we should be able to just ignore
+        # these, so strip them out.
+        import curses
+        cap = curses.tigetstr(cap_name) or ''
+        return re.sub(r'\$<\d+>[/*]?', '', cap)
+
+    def render(self, template):
+        """
+        Replace each $-substitutions in the given template string with
+        the corresponding terminal control string (if it's defined) or
+        '' (if it's not).
+        """
+        return re.sub(r'\$\$|\${\w+}', self._render_sub, template)
+
+    def _render_sub(self, match):
+        s = match.group()
+        if s == '$$': return s
+        else: return getattr(self, s[2:-1])
+
+#######################################################################
+# Example use case: progress bar
+#######################################################################
+
+class ProgressBar:
+    """
+    A 3-line progress bar, which looks like::
+    
+                                Header
+        20% [===========----------------------------------]
+                           progress message
+
+    The progress bar is colored, if the terminal supports color
+    output; and adjusts to the width of the terminal.
+    """
+    BAR = '%3d%% ${GREEN}[${BOLD}%s%s${NORMAL}${GREEN}]${NORMAL}\n'
+    HEADER = '${BOLD}${CYAN}%s${NORMAL}\n\n'
+        
+    def __init__(self, term, header):
+        self.term = term
+        if not (self.term.CLEAR_EOL and self.term.UP and self.term.BOL):
+            raise ValueError("Terminal isn't capable enough -- you "
+                             "should use a simpler progress dispaly.")
+        self.width = self.term.COLS or 75
+        self.bar = term.render(self.BAR)
+        self.header = self.term.render(self.HEADER % header.center(self.width))
+        self.cleared = 1 #: true if we haven't drawn the bar yet.
+        self.update(0, '')
+
+    def update(self, percent, message):
+        if self.cleared:
+            sys.stdout.write(self.header)
+            self.cleared = 0
+        n = int((self.width-10)*percent)
+        sys.stdout.write(
+            self.term.BOL + self.term.UP + self.term.CLEAR_EOL +
+            (self.bar % (100*percent, '='*n, '-'*(self.width-10-n))) +
+            self.term.CLEAR_EOL + message.center(self.width))
+
+    def clear(self):
+        if not self.cleared:
+            sys.stdout.write(self.term.BOL + self.term.CLEAR_EOL +
+                             self.term.UP + self.term.CLEAR_EOL +
+                             self.term.UP + self.term.CLEAR_EOL)
+            self.cleared = 1
diff --git a/linden/indra/linux_crash_logger/CMakeLists.txt b/linden/indra/linux_crash_logger/CMakeLists.txt
new file mode 100644
index 0000000..628d4ac
--- /dev/null
+++ b/linden/indra/linux_crash_logger/CMakeLists.txt
@@ -0,0 +1,68 @@
+# -*- cmake -*-
+
+project(linux_crash_logger)
+
+include(00-Common)
+include(Boost)
+include(LLCommon)
+include(LLCrashLogger)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLXML)
+include(Linking)
+include(UI)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLCRASHLOGGER_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(linux_crash_logger_SOURCE_FILES
+    linux_crash_logger.cpp
+    llcrashloggerlinux.cpp
+    )
+
+set(linux_crash_logger_HEADER_FILES
+    CMakeLists.txt
+
+    llcrashloggerlinux.h
+    )
+
+set_source_files_properties(${linux_crash_logger_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND linux_crash_logger_SOURCE_FILES
+     ${linux_crash_logger_HEADER_FILES}
+     )
+
+list(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
+
+add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
+
+target_link_libraries(linux-crash-logger
+    ${LLCRASHLOGGER_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    ${UI_LIBRARIES}
+    ${BOOST_SIGNALS_LIBRARY}
+    ${DB_LIBRARIES}
+    )
+
+add_custom_command(
+    OUTPUT linux-crash-logger-stripped
+    COMMAND strip
+    ARGS --strip-debug -o linux-crash-logger-stripped
+         linux-crash-logger
+    DEPENDS linux-crash-logger
+    )
+
+add_custom_target(linux-crash-logger-stripped ALL
+                  DEPENDS linux-crash-logger-stripped)
diff --git a/linden/indra/linux_crash_logger/files.lst b/linden/indra/linux_crash_logger/files.lst
deleted file mode 100644
index 5c8b9a2..0000000
--- a/linden/indra/linux_crash_logger/files.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-llcrashlogger/llcrashlogger.cpp
-linux_crash_logger/linux_crash_logger.cpp
-linux_crash_logger/llcrashloggerlinux.cpp
diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index f90fea2..aa2b82c 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -132,7 +132,7 @@ bool LLCrashLoggerLinux::mainLoop()
 	return true;
 }
 
-void LLCrashLoggerLinux::updateApplication(LLString message)
+void LLCrashLoggerLinux::updateApplication(const std::string& message)
 {
 	LLCrashLogger::updateApplication(message);
 }
diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.h b/linden/indra/linux_crash_logger/llcrashloggerlinux.h
index f34c934..4708493 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.h
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.h
@@ -42,7 +42,7 @@ public:
 	LLCrashLoggerLinux(void);
 	~LLCrashLoggerLinux(void);
 	virtual bool mainLoop();
-	virtual void updateApplication(LLString message = "");
+	virtual void updateApplication(const std::string& = LLStringUtil::null);
 	virtual void gatherPlatformSpecificFiles();
 };
 
diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt
new file mode 100644
index 0000000..b662023
--- /dev/null
+++ b/linden/indra/llaudio/CMakeLists.txt
@@ -0,0 +1,67 @@
+# -*- cmake -*-
+
+project(llaudio)
+
+include(00-Common)
+include(Audio)
+include(FMOD)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+
+include_directories(
+    ${FMOD_INCLUDE_DIR}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${OGG_INCLUDE_DIRS}
+    ${VORBISENC_INCLUDE_DIRS}
+    ${VORBISFILE_INCLUDE_DIRS}
+    ${VORBIS_INCLUDE_DIRS}
+    )
+
+set(llaudio_SOURCE_FILES
+    audioengine.cpp
+    listener.cpp
+    llaudiodecodemgr.cpp
+    vorbisdecode.cpp
+    vorbisencode.cpp
+    )
+
+set(llaudio_HEADER_FILES
+    CMakeLists.txt
+
+    audioengine.h
+    listener.h
+    llaudiodecodemgr.h
+    vorbisdecode.h
+    vorbisencode.h
+    )
+
+if (FMOD)
+    list(APPEND llaudio_SOURCE_FILES
+         audioengine_fmod.cpp
+         listener_fmod.cpp
+         )
+
+    list(APPEND llaudio_HEADER_FILES
+         audioengine_fmod.h
+         listener_fmod.h
+         )
+
+    if (LINUX)
+      if (${CXX_VERSION} MATCHES "4.[23]")
+        set_source_files_properties(audioengine_fmod.cpp
+                                    COMPILE_FLAGS -Wno-error=write-strings)
+      endif (${CXX_VERSION} MATCHES "4.[23]")
+    endif (LINUX)
+endif (FMOD)
+
+set_source_files_properties(${llaudio_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})
+
+add_library (llaudio ${llaudio_SOURCE_FILES})
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index af43b42..5dd5b28 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -1,4 +1,4 @@
-/** 
+ /** 
  * @file audioengine.cpp
  * @brief implementation of LLAudioEngine class abstracting the Open
  * AL audio support
@@ -916,7 +916,7 @@ void LLAudioEngine::cleanupAudioSource(LLAudioSource *asp)
 
 BOOL LLAudioEngine::hasDecodedFile(const LLUUID &uuid)
 {
-	char uuid_str[UUID_STR_LENGTH]; 		/*Flawfinder: ignore*/
+	std::string uuid_str;
 	uuid.toString(uuid_str);
 
 	std::string wav_path;
@@ -1653,10 +1653,10 @@ BOOL LLAudioData::load()
 		return FALSE;
 	}
 
-	char uuid_str[UUID_STR_LENGTH];			/*Flawfinder: ignore*/
-	char wav_path[MAX_PATH]; 				/*Flawfinder: ignore*/
+	std::string uuid_str;
+	std::string wav_path;
 	mID.toString(uuid_str);
-	snprintf(wav_path, MAX_PATH, "%s.dsf",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str());	/* Flawfinder: ignore */
+	wav_path= gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str) + ".dsf";
 
 	if (!mBufferp->loadWAV(wav_path))
 	{
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index 8994703..e38413f 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -36,10 +36,6 @@
 #include <list>
 #include <map>
 
-#ifndef LL_FMOD
-#  define LL_FMOD 1
-#endif
-
 #include "listener.h"
 #include "v3math.h"
 #include "v3dmath.h"
@@ -136,14 +132,14 @@ public:
 	LLAudioData *getAudioData(const LLUUID &audio_uuid);
 
 
-	virtual void startInternetStream(const char* url) = 0;
+	virtual void startInternetStream(const std::string& url) = 0;
 	virtual void stopInternetStream() = 0;
 	virtual void pauseInternetStream(int pause) = 0;
 	virtual int isInternetStreamPlaying() = 0;
 	virtual void getInternetStreamInfo(char* artist, char* title) { artist[0] = 0; title[0] = 0; }
 	// use a value from 0.0 to 1.0, inclusive
 	virtual void setInternetStreamGain(F32 vol) { mInternetStreamGain = vol; }
-	virtual const char* getInternetStreamURL() { return ""; }
+	virtual const std::string& getInternetStreamURL() { return LLStringUtil::null; }
 
 	// For debugging usage
 	virtual LLVector3 getListenerPos();
@@ -416,7 +412,7 @@ class LLAudioBuffer
 {
 public:
 	virtual ~LLAudioBuffer() {};
-	virtual BOOL loadWAV(const char *filename) = 0;
+	virtual BOOL loadWAV(const std::string& filename) = 0;
 	virtual U32 getLength() = 0;
 
 	friend class LLAudioEngine;
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index cc2042d..16d820c 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -33,9 +33,6 @@
 #include "linden_common.h"
 
 #include "audioengine_fmod.h"
-
-#if LL_FMOD
-
 #include "listener_fmod.h"
 
 #include "llerror.h"
@@ -72,7 +69,7 @@ F32 gCurrentPanGainR = 0.5f;
 
 
 // Safe strcpy
-#if LL_WINDOWS || LL_LINUX
+#if 0 //(unused)  //LL_WINDOWS || LL_LINUX
 static size_t strlcpy( char* dest, const char* src, size_t dst_size )
 {
 	size_t source_len = 0;
@@ -655,11 +652,11 @@ LLAudioBufferFMOD::~LLAudioBufferFMOD()
 }
 
 
-BOOL LLAudioBufferFMOD::loadWAV(const char *filename)
+BOOL LLAudioBufferFMOD::loadWAV(const std::string& filename)
 {
 	// Try to open a wav file from disk.  This will eventually go away, as we don't
 	// really want to block doing this.
-	if (filename == NULL)
+	if (filename.empty())
 	{
 		// invalid filename, abort.
 		return FALSE;
@@ -705,7 +702,7 @@ BOOL LLAudioBufferFMOD::loadWAV(const char *filename)
 		fclose(sound_file);
 	}
 #else
-	mSamplep = FSOUND_Sample_Load(FSOUND_UNMANAGED, filename, FSOUND_LOOP_NORMAL, 0, 0);
+	mSamplep = FSOUND_Sample_Load(FSOUND_UNMANAGED, filename.c_str(), FSOUND_LOOP_NORMAL, 0, 0);
 #endif
 
 	if (!mSamplep)
@@ -777,11 +774,11 @@ void LLAudioEngine_FMOD::initInternetStream()
 
 	// Leave the net buffer properties at the default.
 	//FSOUND_Stream_Net_SetBufferProperties(20000, 40, 80);
-	mInternetStreamURL[0] = 0;
+	mInternetStreamURL.clear();
 }
 
 
-void LLAudioEngine_FMOD::startInternetStream(const char* url)
+void LLAudioEngine_FMOD::startInternetStream(const std::string& url)
 {
 	if (!mInited)
 	{
@@ -791,16 +788,16 @@ void LLAudioEngine_FMOD::startInternetStream(const char* url)
 
 	// "stop" stream but don't clear url, etc. in calse url == mInternetStreamURL
 	stopInternetStream();
-	if (url)
+	if (!url.empty())
 	{
 		llinfos << "Starting internet stream: " << url << llendl;
 		mCurrentInternetStreamp = new LLAudioStreamFMOD(url);
-		strlcpy(mInternetStreamURL, url, 1024);
+		mInternetStreamURL = url;
 	}
 	else
 	{
 		llinfos << "Set internet stream to null" << llendl;
-		mInternetStreamURL[0] = 0;
+		mInternetStreamURL.clear();
 	}
 }
 
@@ -930,7 +927,7 @@ void LLAudioEngine_FMOD::stopInternetStream()
 			mDeadStreams.push_back(mCurrentInternetStreamp);
 		}
 		mCurrentInternetStreamp = NULL;
-		//mInternetStreamURL[0] = 0;
+		//mInternetStreamURL.clear();
 	}
 }
 
@@ -963,7 +960,7 @@ int LLAudioEngine_FMOD::isInternetStreamPlaying()
 	{
 		return 1; // Active and playing
 	}
-	else if (mInternetStreamURL[0])
+	else if (!mInternetStreamURL.empty())
 	{
 		return 2; // "Paused"
 	}
@@ -993,19 +990,18 @@ void LLAudioEngine_FMOD::setInternetStreamGain(F32 vol)
 }
 
 
-const char* LLAudioEngine_FMOD::getInternetStreamURL()
+const std::string& LLAudioEngine_FMOD::getInternetStreamURL()
 {
 	return mInternetStreamURL;
 }
 
 
-LLAudioStreamFMOD::LLAudioStreamFMOD(const char *url) :
+LLAudioStreamFMOD::LLAudioStreamFMOD(const std::string& url) :
 	mInternetStream(NULL),
 	mReady(FALSE)
 {
-	mInternetStreamURL[0] = 0;
-	strlcpy(mInternetStreamURL, url, 1024);
-	mInternetStream = FSOUND_Stream_Open(url, FSOUND_NORMAL | FSOUND_NONBLOCKING, 0, 0);
+	mInternetStreamURL = url;
+	mInternetStream = FSOUND_Stream_Open(url.c_str(), FSOUND_NORMAL | FSOUND_NONBLOCKING, 0, 0);
 	if (!mInternetStream)
 	{
 		llwarns << "Couldn't open fmod stream, error "
@@ -1171,6 +1167,3 @@ void * F_CALLBACKAPI windCallback(void *originalbuffer, void *newbuffer, int len
 
 	return newbuffer;
 }
-
-#endif  // LL_FMOD
-
diff --git a/linden/indra/llaudio/audioengine_fmod.h b/linden/indra/llaudio/audioengine_fmod.h
index 3ee4334..41177b6 100644
--- a/linden/indra/llaudio/audioengine_fmod.h
+++ b/linden/indra/llaudio/audioengine_fmod.h
@@ -34,9 +34,6 @@
 #define LL_AUDIOENGINE_FMOD_H
 
 #include "audioengine.h"
-
-#if LL_FMOD
-
 #include "listener_fmod.h"
 
 #include "fmod.h"
@@ -59,14 +56,14 @@ public:
 
 	// Internet stream methods
 	virtual void initInternetStream();
-	virtual void startInternetStream(const char* url);
+	virtual void startInternetStream(const std::string& url);
 	virtual void updateInternetStream();
 	virtual void stopInternetStream();
 	virtual void pauseInternetStream(int pause);
 	virtual int isInternetStreamPlaying();
 	virtual void getInternetStreamInfo(char* artist, char* title);
 	virtual void setInternetStreamGain(F32 vol);
-	virtual const char* getInternetStreamURL();
+	virtual const std::string& getInternetStreamURL();
 
 	/*virtual*/ void initWind();
 	/*virtual*/ void cleanupWind();
@@ -82,7 +79,7 @@ protected:
 	static signed char F_CALLBACKAPI callbackMetaData(char* name, char* value, void* userdata);
 
 	LLAudioStreamFMOD *mCurrentInternetStreamp;
-	char mInternetStreamURL[1024];	/*Flawfinder: ignore*/
+	std::string mInternetStreamURL;
 	int mInternetStreamChannel;
 
 	std::list<LLAudioStreamFMOD *> mDeadStreams;
@@ -127,7 +124,7 @@ public:
 	LLAudioBufferFMOD();
 	virtual ~LLAudioBufferFMOD();
 
-	/*virtual*/ BOOL loadWAV(const char *filename);
+	/*virtual*/ BOOL loadWAV(const std::string& filename);
 	/*virtual*/ U32 getLength();
 	friend class LLAudioChannelFMOD;
 
@@ -141,22 +138,19 @@ protected:
 class LLAudioStreamFMOD
 {
 public:
-	LLAudioStreamFMOD(const char *url);
+	LLAudioStreamFMOD(const std::string& url);
 	int	startStream();
 	BOOL stopStream(); // Returns true if the stream was successfully stopped.
 	BOOL ready();
 
-	char *getURL() 	{ return mInternetStreamURL; }
+	const std::string& getURL() 	{ return mInternetStreamURL; }
 
 	int getOpenState();
 protected:
 	FSOUND_STREAM* mInternetStream;
 	BOOL mReady;
 
-	char mInternetStreamURL[1024];	/*Flawfinder: ignore*/
+	std::string mInternetStreamURL;
 };
 
-#endif
-
-#endif
-
+#endif // LL_AUDIOENGINE_FMOD_H
diff --git a/linden/indra/llaudio/files.lst b/linden/indra/llaudio/files.lst
deleted file mode 100644
index abc8710..0000000
--- a/linden/indra/llaudio/files.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-llaudio/audioengine.cpp
-llaudio/audioengine_fmod.cpp
-llaudio/listener.cpp
-llaudio/listener_fmod.cpp
-llaudio/llaudiodecodemgr.cpp
-llaudio/vorbisdecode.cpp
-llaudio/vorbisencode.cpp
diff --git a/linden/indra/llaudio/listener_fmod.cpp b/linden/indra/llaudio/listener_fmod.cpp
index e80a775..9e48408 100644
--- a/linden/indra/llaudio/listener_fmod.cpp
+++ b/linden/indra/llaudio/listener_fmod.cpp
@@ -32,9 +32,6 @@
 
 #include "linden_common.h"
 #include "audioengine.h"
-
-#if LL_FMOD
-
 #include "listener_fmod.h"
 #include "fmod.h"
 
@@ -143,7 +140,3 @@ F32 LLListener_FMOD::getDistanceFactor()
 {
 	return mDistanceFactor;
 }
-
-#endif  // LL_FMOD
-
-
diff --git a/linden/indra/llaudio/listener_fmod.h b/linden/indra/llaudio/listener_fmod.h
index 71604bd..7b7c4c6 100644
--- a/linden/indra/llaudio/listener_fmod.h
+++ b/linden/indra/llaudio/listener_fmod.h
@@ -37,15 +37,11 @@
 
 class LLListener_FMOD : public LLListener
 {
- private:
  protected:
 	 F32 mDopplerFactor;
 	 F32 mDistanceFactor;
 	 F32 mRolloffFactor;
- public:
 
- private:
- protected:
  public:  
 	LLListener_FMOD();
 	virtual ~LLListener_FMOD();
diff --git a/linden/indra/llaudio/llaudio.vcproj b/linden/indra/llaudio/llaudio.vcproj
deleted file mode 100644
index dee6916..0000000
--- a/linden/indra/llaudio/llaudio.vcproj
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llaudio"
-	ProjectGUID="{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
-	RootNamespace="llaudio"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\audioengine.cpp">
-			</File>
-			<File
-				RelativePath=".\audioengine_fmod.cpp">
-			</File>
-			<File
-				RelativePath=".\listener.cpp">
-			</File>
-			<File
-				RelativePath=".\listener_fmod.cpp">
-			</File>
-			<File
-				RelativePath=".\llaudiodecodemgr.cpp">
-			</File>
-			<File
-				RelativePath=".\vorbisdecode.cpp">
-			</File>
-			<File
-				RelativePath=".\vorbisencode.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\audioengine.h">
-			</File>
-			<File
-				RelativePath=".\audioengine_fmod.h">
-			</File>
-			<File
-				RelativePath=".\fmod.h">
-			</File>
-			<File
-				RelativePath=".\fmod_errors.h">
-			</File>
-			<File
-				RelativePath=".\listener.h">
-			</File>
-			<File
-				RelativePath=".\listener_ds3d.h">
-			</File>
-			<File
-				RelativePath=".\listener_fmod.h">
-			</File>
-			<File
-				RelativePath=".\listener_openal.h">
-			</File>
-			<File
-				RelativePath=".\llaudiodecodemgr.h">
-			</File>
-			<File
-				RelativePath=".\vorbisdecode.h">
-			</File>
-			<File
-				RelativePath=".\vorbisencode.h">
-			</File>
-			<File
-				RelativePath=".\wavefile.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llaudio/llaudio_vc8.vcproj b/linden/indra/llaudio/llaudio_vc8.vcproj
deleted file mode 100644
index 6cfe76c..0000000
--- a/linden/indra/llaudio/llaudio_vc8.vcproj
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llaudio"
-	ProjectGUID="{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
-	RootNamespace="llaudio"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\audioengine.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\audioengine_fmod.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\listener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_fmod.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiodecodemgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisdecode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisencode.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\audioengine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\audioengine_fmod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fmod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fmod_errors.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_ds3d.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_fmod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_openal.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiodecodemgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisdecode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisencode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wavefile.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llaudio/llaudio_vc9.vcproj b/linden/indra/llaudio/llaudio_vc9.vcproj
deleted file mode 100644
index e51623c..0000000
--- a/linden/indra/llaudio/llaudio_vc9.vcproj
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llaudio"
-	ProjectGUID="{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"
-	RootNamespace="llaudio"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llaudio.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\audioengine.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\audioengine_fmod.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\listener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_fmod.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiodecodemgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisdecode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisencode.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\audioengine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\audioengine_fmod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fmod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fmod_errors.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_ds3d.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_fmod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\listener_openal.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiodecodemgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisdecode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vorbisencode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wavefile.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llaudio/llaudiodecodemgr.cpp b/linden/indra/llaudio/llaudiodecodemgr.cpp
index af7ab92..7cd48a9 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.cpp
+++ b/linden/indra/llaudio/llaudiodecodemgr.cpp
@@ -70,7 +70,7 @@ public:
 		LLPointer<LLVorbisDecodeState> mDecoder;
 	};
 	
-	LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename);
+	LLVorbisDecodeState(const LLUUID &uuid, const std::string &out_filename);
 
 	BOOL initDecode();
 	BOOL decodeSection(); // Return TRUE if done.
@@ -93,7 +93,7 @@ protected:
 
 	std::vector<U8> mWAVBuffer;
 #if !defined(USE_WAV_VFILE)
-	LLString mOutFilename;
+	std::string mOutFilename;
 	LLLFSThread::handle_t mFileHandle;
 #endif
 	
@@ -166,7 +166,7 @@ long vfs_tell (void *datasource)
 	return file->tell();
 }
 
-LLVorbisDecodeState::LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename)
+LLVorbisDecodeState::LLVorbisDecodeState(const LLUUID &uuid, const std::string &out_filename)
 {
 	mDone = FALSE;
 	mValid = FALSE;
@@ -386,7 +386,7 @@ BOOL LLVorbisDecodeState::finishDecode()
 		mWAVBuffer[7] = (data_length >> 24) & 0x000000FF;
 
 		//
-		// FUCK!!! Vorbis encode/decode messes up loop point transitions (pop)
+		// FUDGECAKES!!! Vorbis encode/decode messes up loop point transitions (pop)
 		// do a cheap-and-cheesy crossfade 
 		//
 		{
@@ -413,12 +413,12 @@ BOOL LLVorbisDecodeState::finishDecode()
 			if((WAV_HEADER_SIZE+(2 * fade_length)) < (S32)mWAVBuffer.size())
 			{
 				memcpy(&mWAVBuffer[WAV_HEADER_SIZE], pcmout, (2 * fade_length));	/*Flawfinder: ignore*/
-		    }
+			}
 			S32 near_end = mWAVBuffer.size() - (2 * fade_length);
 			if ((S32)mWAVBuffer.size() >= ( near_end + 2* fade_length))
 			{
 				memcpy(pcmout, &mWAVBuffer[near_end], (2 * fade_length));	/*Flawfinder: ignore*/
-		    }
+			}
 			llendianswizzle(&pcmout, 2, fade_length);
 
 			samplep = (S16 *)pcmout;
@@ -443,8 +443,8 @@ BOOL LLVorbisDecodeState::finishDecode()
 		}
 #if !defined(USE_WAV_VFILE)
 		mBytesRead = -1;
-		mFileHandle = LLLFSThread::sLocal->write(mOutFilename, &mWAVBuffer[0], 0, data_length,
-												 new WriteResponder(this));
+		mFileHandle = LLLFSThread::sLocal->write(mOutFilename, &mWAVBuffer[0], 0, mWAVBuffer.size(),
+							 new WriteResponder(this));
 #endif
 	}
 
@@ -583,14 +583,14 @@ void LLAudioDecodeMgr::Impl::processQueue(const F32 num_secs)
 
 				lldebugs << "Decoding " << uuid << " from audio queue!" << llendl;
 
-				char uuid_str[64];			/*Flawfinder: ignore*/
-				char d_path[LL_MAX_PATH];	/*Flawfinder: ignore*/
+				std::string uuid_str;
+				std::string d_path;
 
 				LLTimer timer;
 				timer.reset();
 
 				uuid.toString(uuid_str);
-				snprintf(d_path, LL_MAX_PATH, "%s.dsf", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str()); 	/* Flawfinder: ignore */
+				d_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str) + ".dsf";
 
 				mCurrentDecodep = new LLVorbisDecodeState(uuid, d_path);
 				if (!mCurrentDecodep->initDecode())
diff --git a/linden/indra/llaudio/vorbisencode.cpp b/linden/indra/llaudio/vorbisencode.cpp
index 805e666..3a107b9 100644
--- a/linden/indra/llaudio/vorbisencode.cpp
+++ b/linden/indra/llaudio/vorbisencode.cpp
@@ -70,7 +70,7 @@
 
 #endif
 
-S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
+S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& error_msg)
 {
 	U16 num_channels = 0;
 	U32 sample_rate = 0;
@@ -83,12 +83,12 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
 
 	unsigned char wav_header[44];		/*Flawfinder: ignore*/
 
-	error_msg[0] = '\0';
+	error_msg.clear();
 
     apr_file_t* infp = ll_apr_file_open(in_fname,LL_APR_RB);
 	if (!infp)
 	{
-		strcpy(error_msg, "CannotUploadSoundFile");	/*Flawfinder: ignore*/
+		error_msg = "CannotUploadSoundFile";
 		return(LLVORBISENC_SOURCE_OPEN_ERR);
 	}
 
@@ -97,14 +97,14 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
 
 	if (strncmp((char *)&(wav_header[0]),"RIFF",4))
 	{
-		strcpy(error_msg, "SoundFileNotRIFF");	/*Flawfinder: ignore*/
+		error_msg = "SoundFileNotRIFF";
 		apr_file_close(infp);
 	    return(LLVORBISENC_WAV_FORMAT_ERR);
 	}
 
 	if (strncmp((char *)&(wav_header[8]),"WAVE",4))
 	{
-		strcpy(error_msg, "SoundFileNotRIFF");	/*Flawfinder: ignore*/
+		error_msg = "SoundFileNotRIFF";
 		apr_file_close(infp);
 	    return(LLVORBISENC_WAV_FORMAT_ERR);
 	}
@@ -154,31 +154,31 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
 
 	if (!uncompressed_pcm)
 	{	
-		 strcpy(error_msg, "SoundFileNotPCM");		/*Flawfinder: ignore*/
+		 error_msg = "SoundFileNotPCM";
 		  return(LLVORBISENC_PCM_FORMAT_ERR);
 	}
 	
 	if ((num_channels < 1) || (num_channels > 2))
 	{	
-		strcpy(error_msg, "SoundFileInvalidChannelCount");	/*Flawfinder: ignore*/
+		error_msg = "SoundFileInvalidChannelCount";
 		return(LLVORBISENC_MULTICHANNEL_ERR);
 	}
 
 	if (sample_rate != 44100)
 	{	
-		strcpy(error_msg, "SoundFileInvalidSampleRate");		/*Flawfinder: ignore*/
+		error_msg = "SoundFileInvalidSampleRate";
 		return(LLVORBISENC_UNSUPPORTED_SAMPLE_RATE);
 	}
 	
 	if ((bits_per_sample != 16) && (bits_per_sample != 8))
 	{		 
-		strcpy(error_msg, "SoundFileInvalidWordSize");		/*Flawfinder: ignore*/
+		error_msg = "SoundFileInvalidWordSize";
 		return(LLVORBISENC_UNSUPPORTED_WORD_SIZE);
 	}
 
 	if (!raw_data_length)
 	{
-		strcpy(error_msg, "SoundFileInvalidHeader");			/*Flawfinder: ignore*/
+		error_msg = "SoundFileInvalidHeader";
 		return(LLVORBISENC_CLIP_TOO_LONG);		 
 	}
 
@@ -186,14 +186,14 @@ S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg)
 		
 	if (clip_length > 10.0f)
 	{
-		strcpy(error_msg, "SoundFileInvalidTooLong");			/*Flawfinder: ignore*/
+		error_msg = "SoundFileInvalidTooLong";
 		return(LLVORBISENC_CLIP_TOO_LONG);		 
 	}
 
     return(LLVORBISENC_NOERR);
 }
 
-S32 encode_vorbis_file(const char *in_fname, const char *out_fname)
+S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname)
 {
 #define READ_BUFFER 1024
 	unsigned char readbuffer[READ_BUFFER*4+44];   /* out of the data segment, not the stack */	/*Flawfinder: ignore*/
@@ -216,7 +216,7 @@ S32 encode_vorbis_file(const char *in_fname, const char *out_fname)
 	U32 bits_per_sample = 0;
 
 	S32 format_error = 0;
-	char error_msg[MAX_STRING];	/*Flawfinder: ignore*/
+	std::string error_msg;
 	if ((format_error = check_for_invalid_wav_formats(in_fname, error_msg)))
 	{
 		llwarns << error_msg << ": " << in_fname << llendl;
diff --git a/linden/indra/llaudio/vorbisencode.h b/linden/indra/llaudio/vorbisencode.h
index 2dae529..6ad0819 100644
--- a/linden/indra/llaudio/vorbisencode.h
+++ b/linden/indra/llaudio/vorbisencode.h
@@ -45,8 +45,8 @@ const S32 LLVORBISENC_UNSUPPORTED_WORD_SIZE        = 9; // unsupported word size
 const S32 LLVORBISENC_CLIP_TOO_LONG                = 10; // source file is too long
 
 
-S32 check_for_invalid_wav_formats(const char *in_fname, char *error_msg);
-S32 encode_vorbis_file(const char *in_fname, const char *out_fname);
+S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& error_msg);
+S32 encode_vorbis_file(const std::string& in_fname, const std::string& out_fname);
 
 #endif
 
diff --git a/linden/indra/llcharacter/CMakeLists.txt b/linden/indra/llcharacter/CMakeLists.txt
new file mode 100644
index 0000000..6301062
--- /dev/null
+++ b/linden/indra/llcharacter/CMakeLists.txt
@@ -0,0 +1,76 @@
+# -*- cmake -*-
+
+project(llcharacter)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llcharacter_SOURCE_FILES
+    llanimationstates.cpp
+    llbvhloader.cpp
+    llcharacter.cpp
+    lleditingmotion.cpp
+    llgesture.cpp
+    llhandmotion.cpp
+    llheadrotmotion.cpp
+    lljoint.cpp
+    lljointsolverrp3.cpp
+    llkeyframefallmotion.cpp
+    llkeyframemotion.cpp
+    llkeyframemotionparam.cpp
+    llkeyframestandmotion.cpp
+    llkeyframewalkmotion.cpp
+    llmotioncontroller.cpp
+    llmotion.cpp
+    llmultigesture.cpp
+    llpose.cpp
+    llstatemachine.cpp
+    lltargetingmotion.cpp
+    llvisualparam.cpp
+    )
+
+set(llcharacter_HEADER_FILES
+    CMakeLists.txt
+
+    llanimationstates.h
+    llbvhloader.h
+    llcharacter.h
+    lleditingmotion.h
+    llgesture.h
+    llhandmotion.h
+    llheadrotmotion.h
+    lljoint.h
+    lljointsolverrp3.h
+    lljointstate.h
+    llkeyframefallmotion.h
+    llkeyframemotion.h
+    llkeyframemotionparam.h
+    llkeyframestandmotion.h
+    llkeyframewalkmotion.h
+    llmotion.h
+    llmotioncontroller.h
+    llmultigesture.h
+    llpose.h
+    llstatemachine.h
+    lltargetingmotion.h
+    llvisualparam.h
+    )
+
+set_source_files_properties(${llcharacter_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llcharacter_SOURCE_FILES ${llcharacter_HEADER_FILES})
+
+add_library (llcharacter ${llcharacter_SOURCE_FILES})
diff --git a/linden/indra/llcharacter/files.lst b/linden/indra/llcharacter/files.lst
deleted file mode 100644
index 3b7aba2..0000000
--- a/linden/indra/llcharacter/files.lst
+++ /dev/null
@@ -1,21 +0,0 @@
-llcharacter/llanimationstates.cpp
-llcharacter/llbvhloader.cpp
-llcharacter/llcharacter.cpp
-llcharacter/lleditingmotion.cpp
-llcharacter/llgesture.cpp
-llcharacter/llhandmotion.cpp
-llcharacter/llheadrotmotion.cpp
-llcharacter/lljoint.cpp
-llcharacter/lljointsolverrp3.cpp
-llcharacter/llkeyframefallmotion.cpp
-llcharacter/llkeyframemotion.cpp
-llcharacter/llkeyframemotionparam.cpp
-llcharacter/llkeyframestandmotion.cpp
-llcharacter/llkeyframewalkmotion.cpp
-llcharacter/llmotioncontroller.cpp
-llcharacter/llmotion.cpp
-llcharacter/llmultigesture.cpp
-llcharacter/llpose.cpp
-llcharacter/llstatemachine.cpp
-llcharacter/lltargetingmotion.cpp
-llcharacter/llvisualparam.cpp
diff --git a/linden/indra/llcharacter/llanimationstates.cpp b/linden/indra/llcharacter/llanimationstates.cpp
index 2b13b0a..fdeffc5 100644
--- a/linden/indra/llcharacter/llanimationstates.cpp
+++ b/linden/indra/llcharacter/llanimationstates.cpp
@@ -228,10 +228,10 @@ const char *LLAnimationLibrary::animStateToString( const LLUUID& state )
 //-----------------------------------------------------------------------------
 // Return the animation state for a given name
 //-----------------------------------------------------------------------------
-LLUUID LLAnimationLibrary::stringToAnimState( const char *name, BOOL allow_ids )
+LLUUID LLAnimationLibrary::stringToAnimState( const std::string& name, BOOL allow_ids )
 {
-	LLString lower_case_name(name);
-	LLString::toLower(lower_case_name);
+	std::string lower_case_name(name);
+	LLStringUtil::toLower(lower_case_name);
 
 	char *true_name = mAnimStringTable.checkString(lower_case_name.c_str());
 
diff --git a/linden/indra/llcharacter/llanimationstates.h b/linden/indra/llcharacter/llanimationstates.h
index dd269de..aa9e517 100644
--- a/linden/indra/llcharacter/llanimationstates.h
+++ b/linden/indra/llcharacter/llanimationstates.h
@@ -222,7 +222,7 @@ public:
 	// Return the animation state for the given name.
 	// Retun NULL if the name is invalid.
 	//-----------------------------------------------------------------------------
-	LLUUID stringToAnimState( const char *name, BOOL allow_ids = TRUE );
+	LLUUID stringToAnimState( const std::string& name, BOOL allow_ids = TRUE );
 };
 
 struct LLAnimStateEntry
diff --git a/linden/indra/llcharacter/llbvhloader.cpp b/linden/indra/llcharacter/llbvhloader.cpp
index e6e49f8..cd1f492 100644
--- a/linden/indra/llcharacter/llbvhloader.cpp
+++ b/linden/indra/llcharacter/llbvhloader.cpp
@@ -59,37 +59,37 @@ char gOutFile[1024];		/* Flawfinder: ignore */
 //------------------------------------------------------------------------
 // Status Codes
 //------------------------------------------------------------------------
-char *LLBVHLoader::ST_OK				= "Ok";
-char *LLBVHLoader::ST_EOF				= "Premature end of file.";
-char *LLBVHLoader::ST_NO_CONSTRAINT		= "Can't read constraint definition.";
-char *LLBVHLoader::ST_NO_FILE			= "Can't open BVH file.";
-char *LLBVHLoader::ST_NO_HIER			= "Invalid HIERARCHY header.";
-char *LLBVHLoader::ST_NO_JOINT			= "Can't find ROOT or JOINT.";
-char *LLBVHLoader::ST_NO_NAME			= "Can't get JOINT name.";
-char *LLBVHLoader::ST_NO_OFFSET			= "Can't find OFFSET.";
-char *LLBVHLoader::ST_NO_CHANNELS		= "Can't find CHANNELS.";
-char *LLBVHLoader::ST_NO_ROTATION		= "Can't get rotation order.";
-char *LLBVHLoader::ST_NO_AXIS			= "Can't get rotation axis.";
-char *LLBVHLoader::ST_NO_MOTION			= "Can't find MOTION.";
-char *LLBVHLoader::ST_NO_FRAMES			= "Can't get number of frames.";
-char *LLBVHLoader::ST_NO_FRAME_TIME		= "Can't get frame time.";
-char *LLBVHLoader::ST_NO_POS			= "Can't get position values.";
-char *LLBVHLoader::ST_NO_ROT			= "Can't get rotation values.";
-char *LLBVHLoader::ST_NO_XLT_FILE		= "Can't open translation file.";
-char *LLBVHLoader::ST_NO_XLT_HEADER		= "Can't read translation header.";
-char *LLBVHLoader::ST_NO_XLT_NAME		= "Can't read translation names.";
-char *LLBVHLoader::ST_NO_XLT_IGNORE		= "Can't read translation ignore value.";
-char *LLBVHLoader::ST_NO_XLT_RELATIVE	= "Can't read translation relative value.";
-char *LLBVHLoader::ST_NO_XLT_OUTNAME	= "Can't read translation outname value.";
-char *LLBVHLoader::ST_NO_XLT_MATRIX		= "Can't read translation matrix.";
-char *LLBVHLoader::ST_NO_XLT_MERGECHILD = "Can't get mergechild name.";
-char *LLBVHLoader::ST_NO_XLT_MERGEPARENT = "Can't get mergeparent name.";
-char *LLBVHLoader::ST_NO_XLT_PRIORITY	= "Can't get priority value.";
-char *LLBVHLoader::ST_NO_XLT_LOOP		= "Can't get loop value.";
-char *LLBVHLoader::ST_NO_XLT_EASEIN		= "Can't get easeIn values.";
-char *LLBVHLoader::ST_NO_XLT_EASEOUT	= "Can't get easeOut values.";
-char *LLBVHLoader::ST_NO_XLT_HAND		= "Can't get hand morph value.";
-char *LLBVHLoader::ST_NO_XLT_EMOTE		= "Can't read emote name.";
+const char *LLBVHLoader::ST_OK				= "Ok";
+const char *LLBVHLoader::ST_EOF				= "Premature end of file.";
+const char *LLBVHLoader::ST_NO_CONSTRAINT		= "Can't read constraint definition.";
+const char *LLBVHLoader::ST_NO_FILE			= "Can't open BVH file.";
+const char *LLBVHLoader::ST_NO_HIER			= "Invalid HIERARCHY header.";
+const char *LLBVHLoader::ST_NO_JOINT			= "Can't find ROOT or JOINT.";
+const char *LLBVHLoader::ST_NO_NAME			= "Can't get JOINT name.";
+const char *LLBVHLoader::ST_NO_OFFSET			= "Can't find OFFSET.";
+const char *LLBVHLoader::ST_NO_CHANNELS		= "Can't find CHANNELS.";
+const char *LLBVHLoader::ST_NO_ROTATION		= "Can't get rotation order.";
+const char *LLBVHLoader::ST_NO_AXIS			= "Can't get rotation axis.";
+const char *LLBVHLoader::ST_NO_MOTION			= "Can't find MOTION.";
+const char *LLBVHLoader::ST_NO_FRAMES			= "Can't get number of frames.";
+const char *LLBVHLoader::ST_NO_FRAME_TIME		= "Can't get frame time.";
+const char *LLBVHLoader::ST_NO_POS			= "Can't get position values.";
+const char *LLBVHLoader::ST_NO_ROT			= "Can't get rotation values.";
+const char *LLBVHLoader::ST_NO_XLT_FILE		= "Can't open translation file.";
+const char *LLBVHLoader::ST_NO_XLT_HEADER		= "Can't read translation header.";
+const char *LLBVHLoader::ST_NO_XLT_NAME		= "Can't read translation names.";
+const char *LLBVHLoader::ST_NO_XLT_IGNORE		= "Can't read translation ignore value.";
+const char *LLBVHLoader::ST_NO_XLT_RELATIVE	= "Can't read translation relative value.";
+const char *LLBVHLoader::ST_NO_XLT_OUTNAME	= "Can't read translation outname value.";
+const char *LLBVHLoader::ST_NO_XLT_MATRIX		= "Can't read translation matrix.";
+const char *LLBVHLoader::ST_NO_XLT_MERGECHILD = "Can't get mergechild name.";
+const char *LLBVHLoader::ST_NO_XLT_MERGEPARENT = "Can't get mergeparent name.";
+const char *LLBVHLoader::ST_NO_XLT_PRIORITY	= "Can't get priority value.";
+const char *LLBVHLoader::ST_NO_XLT_LOOP		= "Can't get loop value.";
+const char *LLBVHLoader::ST_NO_XLT_EASEIN		= "Can't get easeIn values.";
+const char *LLBVHLoader::ST_NO_XLT_EASEOUT	= "Can't get easeOut values.";
+const char *LLBVHLoader::ST_NO_XLT_HAND		= "Can't get hand morph value.";
+const char *LLBVHLoader::ST_NO_XLT_EMOTE		= "Can't read emote name.";
 
 //------------------------------------------------------------------------
 // find_next_whitespace()
@@ -175,11 +175,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 	//--------------------------------------------------------------------
 	// open file
 	//--------------------------------------------------------------------
-	char path[LL_MAX_PATH];		/* Flawfinder: ignore */
-
-	snprintf( path, sizeof(path), "%s",	/* Flawfinder: ignore */
-		gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName).c_str());	
-
+	std::string path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName);
 
 	apr_file_t *fp = ll_apr_file_open(path, LL_APR_R);
 	if (!fp)
@@ -243,7 +239,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for optional emote 
 		//----------------------------------------------------------------
-		if (loadingGlobals && LLString::compareInsensitive(token, "emote")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "emote")==0)
 		{
 			char emote_str[1024];	/* Flawfinder: ignore */
 			if ( sscanf(mLine, " %*s = %1023s", emote_str) != 1 )	/* Flawfinder: ignore */
@@ -258,7 +254,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for global priority setting
 		//----------------------------------------------------------------
-		if (loadingGlobals && LLString::compareInsensitive(token, "priority")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "priority")==0)
 		{
 			S32 priority;
 			if ( sscanf(mLine, " %*s = %d", &priority) != 1 )
@@ -272,7 +268,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for global loop setting
 		//----------------------------------------------------------------
-		if (loadingGlobals && LLString::compareInsensitive(token, "loop")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "loop")==0)
 		{
 			char trueFalse[128];		/* Flawfinder: ignore */
 			trueFalse[0] = '\0';
@@ -286,7 +282,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 			}
 			else if ( sscanf(mLine, " %*s = %127s", trueFalse) == 1 )	/* Flawfinder: ignore */	
 			{
-				mLoop = (LLString::compareInsensitive(trueFalse, "true")==0);
+				mLoop = (LLStringUtil::compareInsensitive(trueFalse, "true")==0);
 			}
 			else
 			{
@@ -302,7 +298,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for global easeIn setting
 		//----------------------------------------------------------------
-		if (loadingGlobals && LLString::compareInsensitive(token, "easein")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "easein")==0)
 		{
 			F32 duration;
 			char type[128];	/* Flawfinder: ignore */
@@ -316,7 +312,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for global easeOut setting
 		//----------------------------------------------------------------
-		if (loadingGlobals && LLString::compareInsensitive(token, "easeout")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "easeout")==0)
 		{
 			F32 duration;
 			char type[128];		/* Flawfinder: ignore */
@@ -330,7 +326,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for global handMorph setting
 		//----------------------------------------------------------------
-		if (loadingGlobals && LLString::compareInsensitive(token, "hand")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "hand")==0)
 		{
 			S32 handMorph;
 			if (sscanf(mLine, " %*s = %d", &handMorph) != 1)
@@ -340,7 +336,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 			continue;
 		}
 
-		if (loadingGlobals && LLString::compareInsensitive(token, "constraint")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "constraint")==0)
 		{
 			Constraint constraint;
 
@@ -400,7 +396,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 			continue;
 		}
 
-		if (loadingGlobals && LLString::compareInsensitive(token, "planar_constraint")==0)
+		if (loadingGlobals && LLStringUtil::compareInsensitive(token, "planar_constraint")==0)
 		{
 			Constraint constraint;
 
@@ -470,20 +466,20 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for ignore flag
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "ignore")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "ignore")==0 )
 		{
 			char trueFalse[128];	/* Flawfinder: ignore */
 			if ( sscanf(mLine, " %*s = %127s", trueFalse) != 1 )	/* Flawfinder: ignore */
 				return ST_NO_XLT_IGNORE;
 
-			trans->mIgnore = (LLString::compareInsensitive(trueFalse, "true")==0);
+			trans->mIgnore = (LLStringUtil::compareInsensitive(trueFalse, "true")==0);
 			continue;
 		}
 
 		//----------------------------------------------------------------
 		// check for relativepos flag
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "relativepos")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "relativepos")==0 )
 		{
 			F32 x, y, z;
 			char relpos[128];	/* Flawfinder: ignore */
@@ -493,7 +489,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 			}
 			else if ( sscanf(mLine, " %*s = %127s", relpos) == 1 )	/* Flawfinder: ignore */
 			{
-				if ( LLString::compareInsensitive(relpos, "firstkey")==0 )
+				if ( LLStringUtil::compareInsensitive(relpos, "firstkey")==0 )
 				{
 					trans->mRelativePositionKey = TRUE;
 				}
@@ -513,13 +509,13 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for relativerot flag
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "relativerot")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "relativerot")==0 )
 		{
 			//F32 x, y, z;
 			char relpos[128];	/* Flawfinder: ignore */
 			if ( sscanf(mLine, " %*s = %127s", relpos) == 1 )	/* Flawfinder: ignore */
 			{
-				if ( LLString::compareInsensitive(relpos, "firstkey")==0 )
+				if ( LLStringUtil::compareInsensitive(relpos, "firstkey")==0 )
 				{
 					trans->mRelativeRotationKey = TRUE;
 				}
@@ -539,7 +535,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for outname value
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "outname")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "outname")==0 )
 		{
 			char outName[128];	/* Flawfinder: ignore */
 			if ( sscanf(mLine, " %*s = %127s", outName) != 1 )	/* Flawfinder: ignore */
@@ -552,7 +548,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for frame matrix value
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "frame")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "frame")==0 )
 		{
 			LLMatrix3 fm;
 			if ( sscanf(mLine, " %*s = %f %f %f, %f %f %f, %f %f %f",
@@ -568,7 +564,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for offset matrix value
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "offset")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "offset")==0 )
 		{
 			LLMatrix3 om;
 			if ( sscanf(mLine, " %*s = %f %f %f, %f %f %f, %f %f %f",
@@ -584,7 +580,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for mergeparent value
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "mergeparent")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "mergeparent")==0 )
 		{
 			char mergeParentName[128];	/* Flawfinder: ignore */
 			if ( sscanf(mLine, " %*s = %127s", mergeParentName) != 1 )	/* Flawfinder: ignore */
@@ -597,7 +593,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for mergechild value
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "mergechild")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "mergechild")==0 )
 		{
 			char mergeChildName[128];	/* Flawfinder: ignore */
 			if ( sscanf(mLine, " %*s = %127s", mergeChildName) != 1 )	/* Flawfinder: ignore */
@@ -610,7 +606,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
 		//----------------------------------------------------------------
 		// check for per-joint priority
 		//----------------------------------------------------------------
-		if ( LLString::compareInsensitive(token, "priority")==0 )
+		if ( LLStringUtil::compareInsensitive(token, "priority")==0 )
 		{
 			S32 priority;
 			if ( sscanf(mLine, " %*s = %d", &priority) != 1 )
@@ -1304,7 +1300,7 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
 	dp.packU16(KEYFRAME_MOTION_SUBVERSION, "sub_version");
 	dp.packS32(mPriority, "base_priority");
 	dp.packF32(mDuration, "duration");
-	dp.packString(mEmoteName.c_str(), "emote_name");
+	dp.packString(mEmoteName, "emote_name");
 	dp.packF32(mLoopInPoint, "loop_in_point");
 	dp.packF32(mLoopOutPoint, "loop_out_point");
 	dp.packS32(mLoop, "loop");
@@ -1325,7 +1321,7 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
 		LLQuaternion first_frame_rot;
 		LLQuaternion fixup_rot;
 
-		dp.packString(joint->mOutName.c_str(), "joint_name");
+		dp.packString(joint->mOutName, "joint_name");
 		dp.packS32(joint->mPriority, "joint_priority");
 
 		// compute coordinate frame rotation
diff --git a/linden/indra/llcharacter/llbvhloader.h b/linden/indra/llcharacter/llbvhloader.h
index 3935ebe..f360fc8 100644
--- a/linden/indra/llcharacter/llbvhloader.h
+++ b/linden/indra/llcharacter/llbvhloader.h
@@ -203,38 +203,38 @@ public:
 	~LLBVHLoader();
 	
 	// Status Codes
-	typedef char *Status;
-	static char *ST_OK;
-	static char *ST_EOF;
-	static char *ST_NO_CONSTRAINT;
-	static char *ST_NO_FILE;
-	static char *ST_NO_HIER;
-	static char *ST_NO_JOINT;
-	static char *ST_NO_NAME;
-	static char *ST_NO_OFFSET;
-	static char *ST_NO_CHANNELS;
-	static char *ST_NO_ROTATION;
-	static char *ST_NO_AXIS;
-	static char *ST_NO_MOTION;
-	static char *ST_NO_FRAMES;
-	static char *ST_NO_FRAME_TIME;
-	static char *ST_NO_POS;
-	static char *ST_NO_ROT;
-	static char *ST_NO_XLT_FILE;
-	static char *ST_NO_XLT_HEADER;
-	static char *ST_NO_XLT_NAME;
-	static char *ST_NO_XLT_IGNORE;
-	static char *ST_NO_XLT_RELATIVE;
-	static char *ST_NO_XLT_OUTNAME;
-	static char *ST_NO_XLT_MATRIX;
-	static char *ST_NO_XLT_MERGECHILD;
-	static char *ST_NO_XLT_MERGEPARENT;
-	static char *ST_NO_XLT_PRIORITY;
-	static char *ST_NO_XLT_LOOP;
-	static char *ST_NO_XLT_EASEIN;
-	static char *ST_NO_XLT_EASEOUT;
-	static char *ST_NO_XLT_HAND;
-	static char *ST_NO_XLT_EMOTE;
+	typedef const char *Status;
+	static const char *ST_OK;
+	static const char *ST_EOF;
+	static const char *ST_NO_CONSTRAINT;
+	static const char *ST_NO_FILE;
+	static const char *ST_NO_HIER;
+	static const char *ST_NO_JOINT;
+	static const char *ST_NO_NAME;
+	static const char *ST_NO_OFFSET;
+	static const char *ST_NO_CHANNELS;
+	static const char *ST_NO_ROTATION;
+	static const char *ST_NO_AXIS;
+	static const char *ST_NO_MOTION;
+	static const char *ST_NO_FRAMES;
+	static const char *ST_NO_FRAME_TIME;
+	static const char *ST_NO_POS;
+	static const char *ST_NO_ROT;
+	static const char *ST_NO_XLT_FILE;
+	static const char *ST_NO_XLT_HEADER;
+	static const char *ST_NO_XLT_NAME;
+	static const char *ST_NO_XLT_IGNORE;
+	static const char *ST_NO_XLT_RELATIVE;
+	static const char *ST_NO_XLT_OUTNAME;
+	static const char *ST_NO_XLT_MATRIX;
+	static const char *ST_NO_XLT_MERGECHILD;
+	static const char *ST_NO_XLT_MERGEPARENT;
+	static const char *ST_NO_XLT_PRIORITY;
+	static const char *ST_NO_XLT_LOOP;
+	static const char *ST_NO_XLT_EASEIN;
+	static const char *ST_NO_XLT_EASEOUT;
+	static const char *ST_NO_XLT_HAND;
+	static const char *ST_NO_XLT_EMOTE;
 
 	// Loads the specified translation table.
 	Status loadTranslationTable(const char *fileName);
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 83487bc..71c5c40 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -287,8 +287,8 @@ BOOL LLCharacter::setVisualParamWeight(LLVisualParam* which_param, F32 weight, B
 //-----------------------------------------------------------------------------
 BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight, BOOL set_by_user)
 {
-	LLString tname(param_name);
-	LLString::toLower(tname);
+	std::string tname(param_name);
+	LLStringUtil::toLower(tname);
 	char *tableptr = sVisualParamNames.checkString(tname);
 	VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
 	if (name_iter != mVisualParamNameMap.end())
@@ -338,8 +338,8 @@ F32 LLCharacter::getVisualParamWeight(LLVisualParam *which_param)
 //-----------------------------------------------------------------------------
 F32 LLCharacter::getVisualParamWeight(const char* param_name)
 {
-	LLString tname(param_name);
-	LLString::toLower(tname);
+	std::string tname(param_name);
+	LLStringUtil::toLower(tname);
 	char *tableptr = sVisualParamNames.checkString(tname);
 	VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
 	if (name_iter != mVisualParamNameMap.end())
@@ -409,8 +409,8 @@ BOOL LLCharacter::visualParamWeightsAreDefault()
 //-----------------------------------------------------------------------------
 LLVisualParam*	LLCharacter::getVisualParam(const char *param_name)
 {
-	LLString tname(param_name);
-	LLString::toLower(tname);
+	std::string tname(param_name);
+	LLStringUtil::toLower(tname);
 	char *tableptr = sVisualParamNames.checkString(tname);
 	VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
 	if (name_iter != mVisualParamNameMap.end())
@@ -467,8 +467,8 @@ void LLCharacter::addVisualParam(LLVisualParam *param)
 	if (param->getInfo())
 	{
 		// Add name map
-		LLString tname(param->getName());
-		LLString::toLower(tname);
+		std::string tname(param->getName());
+		LLStringUtil::toLower(tname);
 		char *tableptr = sVisualParamNames.addString(tname);
 		std::pair<VisualParamNameMap_t::iterator, bool> nameres;
 		nameres = mVisualParamNameMap.insert(VisualParamNameMap_t::value_type(tableptr, param));
diff --git a/linden/indra/llcharacter/llcharacter.vcproj b/linden/indra/llcharacter/llcharacter.vcproj
deleted file mode 100644
index 82f17ae..0000000
--- a/linden/indra/llcharacter/llcharacter.vcproj
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llcharacter"
-	ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llanimationstates.cpp">
-			</File>
-			<File
-				RelativePath=".\llbvhloader.cpp">
-			</File>
-			<File
-				RelativePath=".\llcharacter.cpp">
-			</File>
-			<File
-				RelativePath=".\lleditingmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llgesture.cpp">
-			</File>
-			<File
-				RelativePath=".\llhandmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llheadrotmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\lljoint.cpp">
-			</File>
-			<File
-				RelativePath=".\lljointsolverrp3.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeyframefallmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeyframemotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeyframemotionparam.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeyframestandmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeyframewalkmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llmotioncontroller.cpp">
-			</File>
-			<File
-				RelativePath=".\llmultigesture.cpp">
-			</File>
-			<File
-				RelativePath=".\llpose.cpp">
-			</File>
-			<File
-				RelativePath=".\llstatemachine.cpp">
-			</File>
-			<File
-				RelativePath=".\lltargetingmotion.cpp">
-			</File>
-			<File
-				RelativePath=".\llvisualparam.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llanimationstates.h">
-			</File>
-			<File
-				RelativePath=".\llbvhloader.h">
-			</File>
-			<File
-				RelativePath=".\llcharacter.h">
-			</File>
-			<File
-				RelativePath=".\lleditingmotion.h">
-			</File>
-			<File
-				RelativePath=".\llgesture.h">
-			</File>
-			<File
-				RelativePath=".\llhandmotion.h">
-			</File>
-			<File
-				RelativePath=".\llheadrotmotion.h">
-			</File>
-			<File
-				RelativePath=".\lljoint.h">
-			</File>
-			<File
-				RelativePath=".\lljointsolverrp3.h">
-			</File>
-			<File
-				RelativePath=".\lljointstate.h">
-			</File>
-			<File
-				RelativePath=".\llkeyframefallmotion.h">
-			</File>
-			<File
-				RelativePath=".\llkeyframemotion.h">
-			</File>
-			<File
-				RelativePath=".\llkeyframemotionparam.h">
-			</File>
-			<File
-				RelativePath=".\llkeyframestandmotion.h">
-			</File>
-			<File
-				RelativePath=".\llkeyframewalkmotion.h">
-			</File>
-			<File
-				RelativePath=".\llmotion.h">
-			</File>
-			<File
-				RelativePath=".\llmotioncontroller.h">
-			</File>
-			<File
-				RelativePath=".\llmultigesture.h">
-			</File>
-			<File
-				RelativePath=".\llpose.h">
-			</File>
-			<File
-				RelativePath=".\llstatemachine.h">
-			</File>
-			<File
-				RelativePath=".\lltargetingmotion.h">
-			</File>
-			<File
-				RelativePath=".\llvisualparam.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llcharacter/llcharacter_vc8.vcproj b/linden/indra/llcharacter/llcharacter_vc8.vcproj
deleted file mode 100644
index fdad9c2..0000000
--- a/linden/indra/llcharacter/llcharacter_vc8.vcproj
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llcharacter"
-	ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
-	RootNamespace="llcharacter"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llanimationstates.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbvhloader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcharacter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditingmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhandmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llheadrotmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lljointsolverrp3.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframefallmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotionparam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframestandmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframewalkmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotioncontroller.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultigesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpose.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatemachine.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltargetingmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvisualparam.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llanimationstates.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbvhloader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcharacter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditingmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhandmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llheadrotmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoint.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljointsolverrp3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljointstate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframefallmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotionparam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframestandmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframewalkmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotioncontroller.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultigesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpose.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatemachine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltargetingmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvisualparam.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llcharacter/llcharacter_vc9.vcproj b/linden/indra/llcharacter/llcharacter_vc9.vcproj
deleted file mode 100644
index 837ec04..0000000
--- a/linden/indra/llcharacter/llcharacter_vc9.vcproj
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llcharacter"
-	ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
-	RootNamespace="llcharacter"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcharacter.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llanimationstates.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbvhloader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcharacter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditingmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhandmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llheadrotmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lljointsolverrp3.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframefallmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotionparam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframestandmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframewalkmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotioncontroller.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultigesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpose.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatemachine.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltargetingmotion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvisualparam.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llanimationstates.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbvhloader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcharacter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditingmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhandmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llheadrotmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoint.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljointsolverrp3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljointstate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframefallmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframemotionparam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframestandmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyframewalkmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmotioncontroller.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultigesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpose.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatemachine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltargetingmotion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvisualparam.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llcharacter/llgesture.cpp b/linden/indra/llcharacter/llgesture.cpp
index 60f0624..335e5c6 100644
--- a/linden/indra/llcharacter/llgesture.cpp
+++ b/linden/indra/llcharacter/llgesture.cpp
@@ -191,11 +191,11 @@ LLGestureList::LLGestureList()
 	mList.put(gesture);
 
 	gesture = new LLGesture(KEY_F4, MASK_NONE, "/boogie", 
-		LLUUID::null, "dance4", LLString::null );
+		LLUUID::null, "dance4", LLStringUtil::null );
 	mList.put(gesture);
 
 	gesture = new LLGesture(KEY_F5, MASK_SHIFT, "/tongue", 
-		LLUUID::null, "Express_Tongue_Out", LLString::null );
+		LLUUID::null, "Express_Tongue_Out", LLStringUtil::null );
 	mList.put(gesture);
 	*/
 }
@@ -219,9 +219,9 @@ void LLGestureList::deleteAll()
 // Iterates through space delimited tokens in string, triggering any gestures found.
 // Generates a revised string that has the found tokens replaced by their replacement strings
 // and (as a minor side effect) has multiple spaces in a row replaced by single spaces.
-BOOL LLGestureList::triggerAndReviseString(const LLString &string, LLString* revised_string)
+BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::string* revised_string)
 {
-	LLString tokenized = string;
+	std::string tokenized = string;
 
 	BOOL found_gestures = FALSE;
 	BOOL first_token = TRUE;
@@ -237,8 +237,8 @@ BOOL LLGestureList::triggerAndReviseString(const LLString &string, LLString* rev
 
 		if( !found_gestures ) // Only pay attention to the first gesture in the string.
 		{
-			LLString cur_token_lower = *token_iter;
-			LLString::toLower(cur_token_lower);
+			std::string cur_token_lower = *token_iter;
+			LLStringUtil::toLower(cur_token_lower);
 
 			for (S32 i = 0; i < mList.count(); i++)
 			{
@@ -254,15 +254,15 @@ BOOL LLGestureList::triggerAndReviseString(const LLString &string, LLString* rev
 
 						// Don't muck with the user's capitalization if we don't have to.
 						const std::string& output = gesture->getOutputString();
-						LLString output_lower = LLString(output.c_str());
-						LLString::toLower(output_lower);
+						std::string output_lower = std::string(output.c_str());
+						LLStringUtil::toLower(output_lower);
 						if( cur_token_lower == output_lower )
 						{
 							revised_string->append(*token_iter);
 						}
 						else
 						{
-							revised_string->append(output.c_str());
+							revised_string->append(output);
 						}
 
 					}
diff --git a/linden/indra/llcharacter/llgesture.h b/linden/indra/llcharacter/llgesture.h
index 003d236..8800887 100644
--- a/linden/indra/llcharacter/llgesture.h
+++ b/linden/indra/llcharacter/llgesture.h
@@ -93,7 +93,7 @@ public:
 	BOOL trigger(KEY key, MASK mask);
 
 	// Triggers if substring matches and generates revised string.
-	BOOL triggerAndReviseString(const LLString &string, LLString* revised_string);
+	BOOL triggerAndReviseString(const std::string &string, std::string* revised_string);
 
 	// Used for construction from UI
 	S32 count() const						{ return mList.count(); }
diff --git a/linden/indra/llcharacter/llhandmotion.cpp b/linden/indra/llcharacter/llhandmotion.cpp
index 3902518..f51e0d0 100644
--- a/linden/indra/llcharacter/llhandmotion.cpp
+++ b/linden/indra/llcharacter/llhandmotion.cpp
@@ -201,16 +201,16 @@ void LLHandMotion::onDeactivate()
 //-----------------------------------------------------------------------------
 // LLHandMotion::getHandPoseName()
 //-----------------------------------------------------------------------------
-LLString LLHandMotion::getHandPoseName(eHandPose pose)
+std::string LLHandMotion::getHandPoseName(eHandPose pose)
 {
 	if ((S32)pose < LLHandMotion::NUM_HAND_POSES && (S32)pose >= 0)
 	{
-		return gHandPoseNames[pose];
+		return std::string(gHandPoseNames[pose]);
 	}
-	return "";
+	return LLStringUtil::null;
 }
 
-LLHandMotion::eHandPose LLHandMotion::getHandPose(LLString posename)
+LLHandMotion::eHandPose LLHandMotion::getHandPose(std::string posename)
 {
 	for (S32 pose = 0; pose < LLHandMotion::NUM_HAND_POSES; ++pose)
 	{
diff --git a/linden/indra/llcharacter/llhandmotion.h b/linden/indra/llcharacter/llhandmotion.h
index 548e4de..b6cc175 100644
--- a/linden/indra/llcharacter/llhandmotion.h
+++ b/linden/indra/llcharacter/llhandmotion.h
@@ -126,8 +126,8 @@ public:
 
 	virtual BOOL canDeprecate() { return FALSE; }
 
-	static LLString getHandPoseName(eHandPose pose);
-	static eHandPose getHandPose(LLString posename);
+	static std::string getHandPoseName(eHandPose pose);
+	static eHandPose getHandPose(std::string posename);
 
 public:
 	//-------------------------------------------------------------------------
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index 34decd6..f53b01f 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -71,6 +71,15 @@ static F32 MAX_CONSTRAINTS = 10;
 // JointMotionList
 //-----------------------------------------------------------------------------
 LLKeyframeMotion::JointMotionList::JointMotionList()
+	: mDuration(0.f),
+	  mLoop(FALSE),
+	  mLoopInPoint(0.f),
+	  mLoopOutPoint(0.f),
+	  mEaseInDuration(0.f),
+	  mEaseOutDuration(0.f),
+	  mBasePriority(LLJoint::LOW_PRIORITY),
+	  mHandPose(LLHandMotion::HAND_POSE_SPREAD),
+	  mMaxPriority(LLJoint::LOW_PRIORITY)
 {
 }
 
@@ -646,9 +655,9 @@ BOOL LLKeyframeMotion::setupPose()
 BOOL LLKeyframeMotion::onActivate()
 {
 	// If the keyframe anim has an associated emote, trigger it. 
-	if( mEmoteName.length() > 0 )
+	if( mJointMotionList->mEmoteName.length() > 0 )
 	{
-		mCharacter->startMotion( gAnimLibrary.stringToAnimState(mEmoteName.c_str()) );
+		mCharacter->startMotion( gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName) );
 	}
 
 	mLastLoopedTime = 0.f;
@@ -1221,7 +1230,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
 	//-------------------------------------------------------------------------
 	// get emote (optional)
 	//-------------------------------------------------------------------------
-	if (!dp.unpackString(mEmoteName, "emote_name"))
+	if (!dp.unpackString(mJointMotionList->mEmoteName, "emote_name"))
 	{
 		llwarns << "can't read optional_emote_animation" << llendl;
 		return FALSE;
@@ -1663,7 +1672,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
 				if (!parent)
 				{
 					llwarns << "Joint with no parent: " << joint->getName()
-							<< " Emote: " << mEmoteName << llendl;
+							<< " Emote: " << mJointMotionList->mEmoteName << llendl;
 					return FALSE;
 				}
 				joint = parent;
@@ -1701,7 +1710,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
 	success &= dp.packU16(KEYFRAME_MOTION_SUBVERSION, "sub_version");
 	success &= dp.packS32(mJointMotionList->mBasePriority, "base_priority");
 	success &= dp.packF32(mJointMotionList->mDuration, "duration");
-	success &= dp.packString(mEmoteName.c_str(), "emote_name");
+	success &= dp.packString(mJointMotionList->mEmoteName, "emote_name");
 	success &= dp.packF32(mJointMotionList->mLoopInPoint, "loop_in_point");
 	success &= dp.packF32(mJointMotionList->mLoopOutPoint, "loop_out_point");
 	success &= dp.packS32(mJointMotionList->mLoop, "loop");
@@ -1713,7 +1722,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
 	for (U32 i = 0; i < mJointMotionList->getNumJointMotions(); i++)
 	{
 		JointMotion* joint_motionp = mJointMotionList->getJointMotion(i);
-		success &= dp.packString(joint_motionp->mJointName.c_str(), "joint_name");
+		success &= dp.packString(joint_motionp->mJointName, "joint_name");
 		success &= dp.packS32(joint_motionp->mPriority, "joint_priority");
 		success &= dp.packS32(joint_motionp->mRotationCurve.mNumKeys, "num_rot_keys");
 
@@ -1839,11 +1848,11 @@ void LLKeyframeMotion::setEmote(const LLUUID& emote_id)
 	const char* emote_name = gAnimLibrary.animStateToString(emote_id);
 	if (emote_name)
 	{
-		mEmoteName = emote_name;
+		mJointMotionList->mEmoteName = emote_name;
 	}
 	else
 	{
-		mEmoteName = "";
+		mJointMotionList->mEmoteName = "";
 	}
 }
 
@@ -2114,11 +2123,19 @@ void LLKeyframeDataCache::clear()
 //-----------------------------------------------------------------------------
 LLKeyframeMotion::JointConstraint::JointConstraint(JointConstraintSharedData* shared_data) : mSharedData(shared_data) 
 {
+	mWeight = 0.f;
 	mTotalLength = 0.f;
 	mActive = FALSE;
 	mSourceVolume = NULL;
 	mTargetVolume = NULL;
 	mFixupDistanceRMS = 0.f;
+
+	int i;
+	for (i=0; i<MAX_CHAIN_LENGTH; ++i)
+	{
+		mJointLengths[i] = 0.f;
+		mJointLengthFractions[i] = 0.f;
+	}
 }
 
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/llcharacter/llkeyframemotion.h b/linden/indra/llcharacter/llkeyframemotion.h
index 5f897cf..393b191 100644
--- a/linden/indra/llcharacter/llkeyframemotion.h
+++ b/linden/indra/llcharacter/llkeyframemotion.h
@@ -224,7 +224,11 @@ protected:
 			mEaseOutStopTime(0.f), 
 			mUseTargetOffset(FALSE),
 			mConstraintType(TYPE_POINT),
-			mConstraintTargetType(TYPE_BODY) {};
+			mConstraintTargetType(TYPE_BODY),
+			mSourceConstraintVolume(0),
+			mTargetConstraintVolume(0),
+			mJointStateIndices(NULL)
+		{ };
 		~JointConstraintSharedData() { delete [] mJointStateIndices; }
 
 		S32						mSourceConstraintVolume;
@@ -416,6 +420,10 @@ public:
 		typedef std::list<JointConstraintSharedData*> constraint_list_t;
 		constraint_list_t		mConstraints;
 		LLBBoxLocal				mPelvisBBox;
+		// mEmoteName is a facial motion, but it's necessary to appear here so that it's cached.
+		// TODO: LLKeyframeDataCache::getKeyframeData should probably return a class containing 
+		// JointMotionList and mEmoteName, see LLKeyframeMotion::onInitialize.
+		std::string				mEmoteName; 
 	public:
 		JointMotionList();
 		~JointMotionList();
@@ -435,7 +443,6 @@ protected:
 	std::vector<LLPointer<LLJointState> > mJointStates;
 	LLJoint*						mPelvisp;
 	LLCharacter*					mCharacter;
-	std::string						mEmoteName;
 	typedef std::list<JointConstraint*>	constraint_list_t;
 	constraint_list_t				mConstraints;
 	U32								mLastSkeletonSerialNum;
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp
index 0e7388c..c22ef26 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp
@@ -346,10 +346,8 @@ BOOL LLKeyframeMotionParam::loadMotions()
 	// Load named file by concatenating the character prefix with the motion name.
 	// Load data into a buffer to be parsed.
 	//-------------------------------------------------------------------------
-	char path[LL_MAX_PATH];		/* Flawfinder: ignore */
-	snprintf( path,sizeof(path), "%s_%s.llp",
-		gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()).c_str(),
-		getName().c_str() );	
+	std::string path = gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix())
+		+ "_" + getName() + ".llp";
 
 	//-------------------------------------------------------------------------
 	// open the file
@@ -436,7 +434,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
 			return FALSE;
 		}
 
-		addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(strA), strB, floatA);
+		addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(std::string(strA)), strB, floatA);
 		if (isFirstMotion)
 		{
 			isFirstMotion = FALSE;
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.cpp b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
index d5f6b81..dae24ee 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -139,9 +139,16 @@ BOOL LLKeyframeWalkMotion::onUpdate(F32 time, U8* joint_mask)
 // LLWalkAdjustMotion()
 // Class Constructor
 //-----------------------------------------------------------------------------
-LLWalkAdjustMotion::LLWalkAdjustMotion(const LLUUID &id) : LLMotion(id)
+LLWalkAdjustMotion::LLWalkAdjustMotion(const LLUUID &id) :
+	LLMotion(id),
+	mLastTime(0.f),
+	mAvgCorrection(0.f),
+	mSpeedAdjust(0.f),
+	mAnimSpeed(0.f),
+	mAvgSpeed(0.f),
+	mRelativeDir(0.f),
+	mAnkleOffset(0.f)
 {
-	mLastTime = 0.f;
 	mName = "walk_adjust";
 
 	mPelvisState = new LLJointState;
@@ -349,7 +356,8 @@ void LLWalkAdjustMotion::onDeactivate()
 // LLFlyAdjustMotion::LLFlyAdjustMotion()
 //-----------------------------------------------------------------------------
 LLFlyAdjustMotion::LLFlyAdjustMotion(const LLUUID &id)
-	: LLMotion(id)
+	: LLMotion(id),
+	  mRoll(0.f)
 {
 	mName = "fly_adjust";
 
diff --git a/linden/indra/llcharacter/llmotion.h b/linden/indra/llcharacter/llmotion.h
index 5a622a8..49f102a 100644
--- a/linden/indra/llcharacter/llmotion.h
+++ b/linden/indra/llcharacter/llmotion.h
@@ -51,13 +51,13 @@ class LLMotion
 	friend class LLMotionController;
 	
 public:
-	typedef enum LLMotionBlendType
+	enum LLMotionBlendType
 	{
 		NORMAL_BLEND,
 		ADDITIVE_BLEND
 	};
 
-	typedef enum LLMotionInitStatus
+	enum LLMotionInitStatus
 	{
 		STATUS_FAILURE,
 		STATUS_SUCCESS,
diff --git a/linden/indra/llcharacter/llmotioncontroller.h b/linden/indra/llcharacter/llmotioncontroller.h
index 209f689..ee85fd0 100644
--- a/linden/indra/llcharacter/llmotioncontroller.h
+++ b/linden/indra/llcharacter/llmotioncontroller.h
@@ -215,10 +215,10 @@ protected:
 	F32					mLastTime;
 	BOOL				mHasRunOnce;
 	BOOL				mPaused;
+	F32					mPauseTime;
 	F32					mTimeStep;
 	S32					mTimeStepCount;
 	F32					mLastInterp;
-	F32					mPauseTime;
 
 	U8					mJointSignature[2][LL_CHARACTER_MAX_JOINTS];
 };
diff --git a/linden/indra/llcharacter/llmultigesture.cpp b/linden/indra/llcharacter/llmultigesture.cpp
index 02016a0..5e6a0d6 100644
--- a/linden/indra/llcharacter/llmultigesture.cpp
+++ b/linden/indra/llcharacter/llmultigesture.cpp
@@ -124,8 +124,8 @@ BOOL LLMultiGesture::serialize(LLDataPacker& dp) const
 	dp.packS32(GESTURE_VERSION, "version");
 	dp.packU8(mKey, "key");
 	dp.packU32(mMask, "mask");
-	dp.packString(mTrigger.c_str(), "trigger");
-	dp.packString(mReplaceText.c_str(), "replace");
+	dp.packString(mTrigger, "trigger");
+	dp.packString(mReplaceText, "replace");
 
 	S32 count = (S32)mSteps.size();
 	dp.packS32(count, "step_count");
@@ -269,7 +269,7 @@ S32 LLGestureStepAnimation::getMaxSerialSize() const
 
 BOOL LLGestureStepAnimation::serialize(LLDataPacker& dp) const
 {
-	dp.packString(mAnimName.c_str(), "anim_name");
+	dp.packString(mAnimName, "anim_name");
 	dp.packUUID(mAnimAssetID, "asset_id");
 	dp.packU32(mFlags, "flags");
 	return TRUE;
@@ -344,7 +344,7 @@ S32 LLGestureStepSound::getMaxSerialSize() const
 
 BOOL LLGestureStepSound::serialize(LLDataPacker& dp) const
 {
-	dp.packString(mSoundName.c_str(), "sound_name");
+	dp.packString(mSoundName, "sound_name");
 	dp.packUUID(mSoundAssetID, "asset_id");
 	dp.packU32(mFlags, "flags");
 	return TRUE;
@@ -401,7 +401,7 @@ S32 LLGestureStepChat::getMaxSerialSize() const
 
 BOOL LLGestureStepChat::serialize(LLDataPacker& dp) const
 {
-	dp.packString(mChatText.c_str(), "chat_text");
+	dp.packString(mChatText, "chat_text");
 	dp.packU32(mFlags, "flags");
 	return TRUE;
 }
diff --git a/linden/indra/llcharacter/llpose.cpp b/linden/indra/llcharacter/llpose.cpp
index f496b7b..5b75a98 100644
--- a/linden/indra/llcharacter/llpose.cpp
+++ b/linden/indra/llcharacter/llpose.cpp
@@ -188,6 +188,7 @@ LLJointStateBlender::LLJointStateBlender()
 	{
 		mJointStates[i] = NULL;
 		mPriorities[i] = S32_MIN;
+		mAdditiveBlends[i] = FALSE;
 	}
 }
 
@@ -458,6 +459,7 @@ void LLJointStateBlender::resetCachedJoint()
 //-----------------------------------------------------------------------------
 
 LLPoseBlender::LLPoseBlender()
+	: mNextPoseSlot(0)
 {
 }
 
diff --git a/linden/indra/llcharacter/llstatemachine.cpp b/linden/indra/llcharacter/llstatemachine.cpp
index eab6e7f..564fbbc 100644
--- a/linden/indra/llcharacter/llstatemachine.cpp
+++ b/linden/indra/llcharacter/llstatemachine.cpp
@@ -206,7 +206,7 @@ LLFSMState* LLStateDiagram::getState(U32 state_id)
 	return NULL;
 }
 
-BOOL LLStateDiagram::saveDotFile(const char* filename)
+BOOL LLStateDiagram::saveDotFile(const std::string& filename)
 {
 	apr_file_t* dot_file = ll_apr_file_open(filename, LL_APR_W);
 
diff --git a/linden/indra/llcharacter/llstatemachine.h b/linden/indra/llcharacter/llstatemachine.h
index 873e938..a833629 100644
--- a/linden/indra/llcharacter/llstatemachine.h
+++ b/linden/indra/llcharacter/llstatemachine.h
@@ -115,7 +115,7 @@ protected:
 
 public:
 	// save the graph in a DOT file for rendering and visualization
-	BOOL saveDotFile(const char* filename);
+	BOOL saveDotFile(const std::string& filename);
 };
 
 class LLStateMachine
diff --git a/linden/indra/llcharacter/llvisualparam.cpp b/linden/indra/llcharacter/llvisualparam.cpp
index 00b1072..e3320f8 100644
--- a/linden/indra/llcharacter/llvisualparam.cpp
+++ b/linden/indra/llcharacter/llvisualparam.cpp
@@ -89,7 +89,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
 	}
 	
 	// attribute: sex
-	LLString sex = "both";
+	std::string sex = "both";
 	static LLStdStringHandle sex_string = LLXmlTree::addAttributeString("sex");
 	node->getFastAttributeString( sex_string, sex ); // optional
 	if( sex == "both" )
@@ -127,7 +127,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
 
 	// JC - make sure the display name includes the capitalization in the XML file,
 	// not the lowercased version.
-	LLString::toLower(mName);
+	LLStringUtil::toLower(mName);
 
 	// attribute: label_min
 	static LLStdStringHandle label_min_string = LLXmlTree::addAttributeString("label_min");
diff --git a/linden/indra/llcharacter/llvisualparam.h b/linden/indra/llcharacter/llvisualparam.h
index 41b8a05..39fff0f 100644
--- a/linden/indra/llcharacter/llvisualparam.h
+++ b/linden/indra/llcharacter/llvisualparam.h
@@ -71,10 +71,10 @@ public:
 protected:
 	S32					mID;				// ID associated with VisualParam
 	
-	LLString			mName;				// name (for internal purposes)
-	LLString			mDisplayName;		// name displayed to the user
-	LLString			mMinName;			// name associated with minimum value
-	LLString			mMaxName;			// name associated with maximum value
+	std::string			mName;				// name (for internal purposes)
+	std::string			mDisplayName;		// name displayed to the user
+	std::string			mMinName;			// name associated with minimum value
+	std::string			mMaxName;			// name associated with maximum value
 	EVisualParamGroup	mGroup;				// morph group for separating UI controls
 	F32					mMinWeight;			// minimum weight that can be assigned to this morph target
 	F32					mMaxWeight;			// maximum weight that can be assigned to this morph target
@@ -114,14 +114,14 @@ public:
 	S32						getID() 			{ return mID; }
 	void					setID(S32 id) 		{ llassert(!mInfo); mID = id; }
 	
-	const LLString&			getName() const 			{ return mInfo->mName; }
-	const LLString&			getDisplayName() const 		{ return mInfo->mDisplayName; }
-	const LLString&			getMaxDisplayName() const	{ return mInfo->mMaxName; }
-	const LLString&			getMinDisplayName() const	{ return mInfo->mMinName; }
-
-	void					setDisplayName(const LLString& s) 	 { mInfo->mDisplayName = s; }
-	void					setMaxDisplayName(const LLString& s) { mInfo->mMaxName = s; }
-	void					setMinDisplayName(const LLString& s) { mInfo->mMinName = s; }
+	const std::string&		getName() const 			{ return mInfo->mName; }
+	const std::string&		getDisplayName() const 		{ return mInfo->mDisplayName; }
+	const std::string&		getMaxDisplayName() const	{ return mInfo->mMaxName; }
+	const std::string&		getMinDisplayName() const	{ return mInfo->mMinName; }
+
+	void					setDisplayName(const std::string& s) 	 { mInfo->mDisplayName = s; }
+	void					setMaxDisplayName(const std::string& s) { mInfo->mMaxName = s; }
+	void					setMinDisplayName(const std::string& s) { mInfo->mMinName = s; }
 
 	EVisualParamGroup		getGroup() 			{ return mInfo->mGroup; }
 	F32						getMinWeight() 		{ return mInfo->mMinWeight; }
diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
new file mode 100644
index 0000000..72d267d
--- /dev/null
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -0,0 +1,188 @@
+# -*- cmake -*-
+
+project(llcommon)
+
+include(00-Common)
+include(LLCommon)
+
+include_directories(
+    ${EXPAT_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIRS}
+    )
+
+set(llcommon_SOURCE_FILES
+    llapp.cpp
+    llapr.cpp
+    llassettype.cpp
+    llbase32.cpp
+    llbase64.cpp
+    llcommon.cpp
+    llcrc.cpp
+    llcriticaldamp.cpp
+    lldate.cpp
+    llerror.cpp
+    llerrorthread.cpp
+    llevent.cpp
+    llfasttimer.cpp
+    llfile.cpp
+    llfindlocale.cpp
+    llfixedbuffer.cpp
+    llformat.cpp
+    llframetimer.cpp
+    llheartbeat.cpp
+    llindraconfigfile.cpp
+    llliveappconfig.cpp
+    lllivefile.cpp
+    lllog.cpp
+    llmd5.cpp
+    llmemory.cpp
+    llmemorystream.cpp
+    llmetrics.cpp
+    llmortician.cpp
+    llprocessor.cpp
+    llqueuedthread.cpp
+    llrand.cpp
+    llrun.cpp
+    llsd.cpp
+    llsdserialize.cpp
+    llsdserialize_xml.cpp
+    llsdutil.cpp
+    llsecondlifeurls.cpp
+    llstat.cpp
+    llstreamtools.cpp
+    llstring.cpp
+    llstringtable.cpp
+    llsys.cpp
+    llthread.cpp
+    lltimer.cpp
+    lluri.cpp
+    lluuid.cpp
+    llworkerthread.cpp
+    metaclass.cpp
+    metaproperty.cpp
+    reflective.cpp
+    timing.cpp
+    u64.cpp
+    )
+    
+set(llcommon_HEADER_FILES
+    CMakeLists.txt
+
+    bitpack.h
+    ctype_workaround.h
+    doublelinkedlist.h
+    imageids.h
+    indra_constants.h
+    linden_common.h
+    linked_lists.h
+    llagentconstants.h
+    llapp.h
+    llapr.h
+    llassettype.h
+    llassoclist.h
+    llavatarconstants.h
+    llbase32.h
+    llbase64.h
+    llboost.h
+    llchat.h
+    llclickaction.h
+    llcommon.h
+    llcrc.h
+    llcriticaldamp.h
+    lldarray.h
+    lldarrayptr.h
+    lldate.h
+    lldefs.h
+    lldepthstack.h
+    lldlinked.h
+    lldqueueptr.h
+    llendianswizzle.h
+    llenum.h
+    llerror.h
+    llerrorcontrol.h
+    llerrorlegacy.h
+    llerrorthread.h
+    llevent.h
+    lleventemitter.h
+    llextendedstatus.h
+    llfasttimer.h
+    llfile.h
+    llfindlocale.h
+    llfixedbuffer.h
+    llformat.h
+    llframetimer.h
+    llhash.h
+    llheartbeat.h
+    llindexedqueue.h
+    llindraconfigfile.h
+    llkeythrottle.h
+    lllinkedqueue.h
+    llliveappconfig.h
+    lllivefile.h
+    lllocalidhashmap.h
+    lllog.h
+    lllslconstants.h
+    llmap.h
+    llmd5.h
+    llmemory.h
+    llmemorystream.h
+    llmemtype.h
+    llmetrics.h
+    llmortician.h
+    llnametable.h
+    llpreprocessor.h
+    llpriqueuemap.h
+    llprocessor.h
+    llptrskiplist.h
+    llptrskipmap.h
+    llqueuedthread.h
+    llrand.h
+    llrun.h
+    llsd.h
+    llsdserialize.h
+    llsdserialize_xml.h
+    llsdutil.h
+    llsecondlifeurls.h
+    llsimplehash.h
+    llskiplist.h
+    llskipmap.h
+    llstack.h
+    llstat.h
+    llstatenums.h
+    llstl.h
+    llstreamtools.h
+    llstrider.h
+    llstring.h
+    llstringtable.h
+    llsys.h
+    llthread.h
+    lltimer.h
+    lluri.h
+    lluuid.h
+    lluuidhashmap.h
+    llversionserver.h
+    llversionviewer.h
+    llworkerthread.h
+    metaclass.h
+    metaclasst.h
+    metaproperty.h
+    metapropertyt.h
+    processor.h
+    reflective.h
+    reflectivet.h
+    roles_constants.h
+    stdenums.h
+    stdtypes.h
+    string_table.h
+    timer.h
+    timing.h
+    u64.h
+    )
+
+set_source_files_properties(${llcommon_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
+
+add_library (llcommon ${llcommon_SOURCE_FILES})
diff --git a/linden/indra/llcommon/files.lst b/linden/indra/llcommon/files.lst
deleted file mode 100644
index d698773..0000000
--- a/linden/indra/llcommon/files.lst
+++ /dev/null
@@ -1,49 +0,0 @@
-llcommon/llapp.cpp
-llcommon/llapr.cpp
-llcommon/llares.cpp
-llcommon/llassettype.cpp
-llcommon/llbase32.cpp
-llcommon/llbase64.cpp
-llcommon/llcommon.cpp
-llcommon/llcriticaldamp.cpp
-llcommon/lldate.cpp
-llcommon/llerror.cpp
-llcommon/llerrorthread.cpp
-llcommon/llevent.cpp
-llcommon/llfasttimer.cpp
-llcommon/llfile.cpp
-llcommon/llfindlocale.cpp
-llcommon/llfixedbuffer.cpp
-llcommon/llformat.cpp
-llcommon/llframetimer.cpp
-llcommon/llheartbeat.cpp
-llcommon/llindraconfigfile.cpp
-llcommon/lllog.cpp
-llcommon/llliveappconfig.cpp
-llcommon/lllivefile.cpp
-llcommon/llmemory.cpp
-llcommon/llmemorystream.cpp
-llcommon/llmetrics.cpp
-llcommon/llmortician.cpp
-llcommon/llprocessor.cpp
-llcommon/llqueuedthread.cpp
-llcommon/llrun.cpp
-llcommon/llsd.cpp
-llcommon/llsdserialize.cpp
-llcommon/llsdserialize_xml.cpp
-llcommon/llsdutil.cpp
-llcommon/llsecondlifeurls.cpp
-llcommon/llstat.cpp
-llcommon/llstreamtools.cpp
-llcommon/llstring.cpp
-llcommon/llstringtable.cpp
-llcommon/llsys.cpp
-llcommon/llthread.cpp
-llcommon/lltimer.cpp
-llcommon/lluri.cpp
-llcommon/llworkerthread.cpp
-llcommon/metaclass.cpp
-llcommon/metaproperty.cpp
-llcommon/reflective.cpp
-llcommon/timing.cpp
-llcommon/u64.cpp
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 77f3d8c..1c48a5c 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -38,7 +38,11 @@
 // At 45 Hz collisions seem stable and objects seem
 // to settle down at a reasonable rate.
 // JC 3/18/2003
-const F32 PHYSICS_TIMESTEP = 1.f / 45.f;
+
+// const F32 PHYSICS_TIMESTEP = 1.f / 45.f;
+// This must be a #define due to anal retentive restrictions on const expressions
+// CG 2008-06-05
+#define PHYSICS_TIMESTEP (1.f / 45.f)
 
 const F32 COLLISION_TOLERANCE = 0.1f;
 const F32 HALF_COLLISION_TOLERANCE = COLLISION_TOLERANCE * 0.5f;
@@ -50,9 +54,9 @@ const U32 DAYS_PER_LINDEN_YEAR		= 11;
 const U32 SEC_PER_LINDEN_DAY		= HOURS_PER_LINDEN_DAY * 60 * 60;
 const U32 SEC_PER_LINDEN_YEAR		= DAYS_PER_LINDEN_YEAR * SEC_PER_LINDEN_DAY;
 
-const F32 REGION_WIDTH_METERS = 256.f;
-const S32 REGION_WIDTH_UNITS = 256;
-const U32 REGION_WIDTH_U32 = 256;
+static const F32 REGION_WIDTH_METERS = 256.f;
+static const S32 REGION_WIDTH_UNITS = 256;
+static const U32 REGION_WIDTH_U32 = 256;
 
 const F32 REGION_HEIGHT_METERS = 4096.f;
 
@@ -74,7 +78,7 @@ enum LAND_STAT_REPORT_TYPE
 const U32 STAT_FILTER_MASK	= 0x1FFFFFFF;
 
 // Default maximum number of tasks/prims per region.
-const U32 MAX_TASKS_PER_REGION = 15000;
+const U32 DEFAULT_MAX_REGION_WIDE_PRIM_COUNT = 15000;
 
 const 	F32 	MIN_AGENT_DEPTH			= 0.30f;
 const 	F32 	DEFAULT_AGENT_DEPTH 	= 0.45f;
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index 547cceb..7d3c82d 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -45,9 +45,10 @@
 #include <iostream>
 #include <fstream>
 
-// Work around stupid Microsoft STL warning
+// Work Microsoft compiler warnings
 #ifdef LL_WINDOWS
-#pragma warning (disable : 4702) // warning C4702: unreachable code
+#pragma warning (disable : 4702) // unreachable code
+#pragma warning (disable : 4244) // conversion from time_t to S32
 #endif	//	LL_WINDOWS
 
 #include <algorithm>
diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp
index ebace4e..3ca3782 100644
--- a/linden/indra/llcommon/llapp.cpp
+++ b/linden/indra/llcommon/llapp.cpp
@@ -224,6 +224,7 @@ LLSD LLApp::getOptionData(OptionPriority level)
 void LLApp::stepFrame()
 {
 	LLFrameTimer::updateFrameTime();
+	LLFrameTimer::updateFrameCount();
 	LLEventTimer::updateClass();
 	mRunner.run();
 }
@@ -492,6 +493,7 @@ void LLApp::setDefaultChildCallback(LLAppChildCallback callback)
 
 pid_t LLApp::fork()
 {
+	fflush(NULL); // flush all buffers before the child inherits them
 	pid_t pid = ::fork();
 	if( pid < 0 )
 	{
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 78bf876..73e715a 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -129,7 +129,7 @@ void ll_apr_assert_status(apr_status_t status)
 }
 
 // File I/O
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool)
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool)
 {
 	apr_file_t* apr_file;
 	apr_status_t s;
@@ -160,15 +160,15 @@ apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* s
 
 	return apr_file;
 }
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep)
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep)
 {
 	return ll_apr_file_open(filename, flags, sizep, NULL);
 }
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, apr_pool_t* pool)
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, apr_pool_t* pool)
 {
 	return ll_apr_file_open(filename, flags, NULL, pool);
 }
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags)
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags)
 {
 	return ll_apr_file_open(filename, flags, NULL, NULL);
 }
@@ -188,7 +188,7 @@ S32 ll_apr_file_read(apr_file_t* apr_file, void *buf, S32 nbytes)
 	}
 }
 
-S32 ll_apr_file_read_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
+S32 ll_apr_file_read_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
 {
 	if (pool == NULL) pool = gAPRPoolp;
 	apr_file_t* filep = ll_apr_file_open(filename, APR_READ|APR_BINARY, pool);
@@ -230,7 +230,7 @@ S32 ll_apr_file_write(apr_file_t* apr_file, const void *buf, S32 nbytes)
 	}
 }
 
-S32 ll_apr_file_write_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
+S32 ll_apr_file_write_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
 {
 	if (pool == NULL) pool = gAPRPoolp;
 	apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
@@ -287,7 +287,7 @@ S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset)
 	}
 }
 
-bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool)
+bool ll_apr_file_remove(const std::string& filename, apr_pool_t* pool)
 {
 	apr_status_t s;
 	if (pool == NULL) pool = gAPRPoolp;
@@ -301,7 +301,7 @@ bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool)
 	return true;
 }
 
-bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_pool_t* pool)
+bool ll_apr_file_rename(const std::string& filename, const std::string& newname, apr_pool_t* pool)
 {
 	apr_status_t s;
 	if (pool == NULL) pool = gAPRPoolp;
@@ -315,7 +315,7 @@ bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_p
 	return true;
 }
 
-bool ll_apr_file_exists(const LLString& filename, apr_pool_t* pool)
+bool ll_apr_file_exists(const std::string& filename, apr_pool_t* pool)
 {
 	apr_file_t* apr_file;
 	apr_status_t s;
@@ -332,7 +332,7 @@ bool ll_apr_file_exists(const LLString& filename, apr_pool_t* pool)
 	}
 }
 
-S32 ll_apr_file_size(const LLString& filename, apr_pool_t* pool)
+S32 ll_apr_file_size(const std::string& filename, apr_pool_t* pool)
 {
 	apr_file_t* apr_file;
 	apr_finfo_t info;
@@ -358,7 +358,7 @@ S32 ll_apr_file_size(const LLString& filename, apr_pool_t* pool)
 	}
 }
 
-bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool)
+bool ll_apr_dir_make(const std::string& dirname, apr_pool_t* pool)
 {
 	apr_status_t s;
 	if (pool == NULL) pool = gAPRPoolp;
@@ -372,7 +372,7 @@ bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool)
 	return true;
 }
 
-bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool)
+bool ll_apr_dir_remove(const std::string& dirname, apr_pool_t* pool)
 {
 	apr_status_t s;
 	if (pool == NULL) pool = gAPRPoolp;
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h
index 695b93e..323dcb2 100644
--- a/linden/indra/llcommon/llapr.h
+++ b/linden/indra/llcommon/llapr.h
@@ -40,11 +40,11 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "apr-1/apr_thread_proc.h"
-#include "apr-1/apr_thread_mutex.h"
-#include "apr-1/apr_getopt.h"
-#include "apr-1/apr_signal.h"
-#include "apr-1/apr_atomic.h"
+#include "apr_thread_proc.h"
+#include "apr_thread_mutex.h"
+#include "apr_getopt.h"
+#include "apr_signal.h"
+#include "apr_atomic.h"
 #include "llstring.h"
 
 extern apr_thread_mutex_t* gLogMutexp;
@@ -130,24 +130,24 @@ typedef LLAtomic32<S32> LLAtomicS32;
 #define LL_APR_WB (APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY) // "wb"
 #define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b"
 #define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b"
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool);
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep);
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, apr_pool_t* pool);
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags);
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool);
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, S32* sizep);
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags, apr_pool_t* pool);
+apr_file_t* ll_apr_file_open(const std::string& filename, apr_int32_t flags);
 // Returns actual offset, -1 if seek fails
 S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset);
 // Returns bytes read/written, 0 if read/write fails:
 S32 ll_apr_file_read(apr_file_t* apr_file, void* buf, S32 nbytes);
-S32 ll_apr_file_read_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
+S32 ll_apr_file_read_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
 S32 ll_apr_file_write(apr_file_t* apr_file, const void* buf, S32 nbytes);
-S32 ll_apr_file_write_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
+S32 ll_apr_file_write_ex(const std::string& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
 // returns false if failure:
-bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool = NULL);
-bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_pool_t* pool = NULL);
-bool ll_apr_file_exists(const LLString& filename, apr_pool_t* pool = NULL);
-S32 ll_apr_file_size(const LLString& filename, apr_pool_t* pool = NULL);
-bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool = NULL);
-bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool = NULL);
+bool ll_apr_file_remove(const std::string& filename, apr_pool_t* pool = NULL);
+bool ll_apr_file_rename(const std::string& filename, const std::string& newname, apr_pool_t* pool = NULL);
+bool ll_apr_file_exists(const std::string& filename, apr_pool_t* pool = NULL);
+S32 ll_apr_file_size(const std::string& filename, apr_pool_t* pool = NULL);
+bool ll_apr_dir_make(const std::string& dirname, apr_pool_t* pool = NULL);
+bool ll_apr_dir_remove(const std::string& dirname, apr_pool_t* pool = NULL);
 
 /**
  * @brief Function which approprately logs error or remains quiet on
diff --git a/linden/indra/llcommon/llares.cpp b/linden/indra/llcommon/llares.cpp
deleted file mode 100644
index 4d054e4..0000000
--- a/linden/indra/llcommon/llares.cpp
+++ /dev/null
@@ -1,805 +0,0 @@
-/** 
- * @file llares.cpp
- * @author Bryan O'Sullivan
- * @date 2007-08-15
- * @brief Wrapper for asynchronous DNS lookups.
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifdef LL_STANDALONE
-# include <ares_dns.h>
-#else
-# include <ares/ares_dns.h>
-#endif
-
-#include "apr-1/apr_portable.h"
-#include "apr-1/apr_network_io.h"
-#include "apr-1/apr_poll.h"
-
-#include "linden_common.h"
-#include "llapr.h"
-#include "llares.h"
-
-#if defined(LL_WINDOWS)
-# define ns_c_in 1
-# define NS_HFIXEDSZ     12      /* #/bytes of fixed data in header */
-# define NS_QFIXEDSZ     4       /* #/bytes of fixed data in query */
-# define NS_RRFIXEDSZ    10      /* #/bytes of fixed data in r record */
-#else
-# include <arpa/nameser.h>
-#endif
-
-LLAres::HostResponder::~HostResponder()
-{
-}
-
-void LLAres::HostResponder::hostResult(const hostent *ent)
-{
-	llinfos << "LLAres::HostResponder::hostResult not implemented" << llendl;
-}
-
-void LLAres::HostResponder::hostError(int code)
-{
-	llinfos << "LLAres::HostResponder::hostError " << code << ": "
-			<< LLAres::strerror(code) << llendl;
-}
-
-LLAres::NameInfoResponder::~NameInfoResponder()
-{
-}
-
-void LLAres::NameInfoResponder::nameInfoResult(const char *node,
-											   const char *service)
-{
-	llinfos << "LLAres::NameInfoResponder::nameInfoResult not implemented"
-			<< llendl;
-}
-
-void LLAres::NameInfoResponder::nameInfoError(int code)
-{
-	llinfos << "LLAres::NameInfoResponder::nameInfoError " << code << ": "
-			<< LLAres::strerror(code) << llendl;
-}
-
-LLAres::QueryResponder::~QueryResponder()
-{
-}
-
-void LLAres::QueryResponder::queryResult(const char *buf, size_t len)
-{
-	llinfos << "LLAres::QueryResponder::queryResult not implemented"
-			<< llendl;
-}
-
-void LLAres::QueryResponder::queryError(int code)
-{
-	llinfos << "LLAres::QueryResponder::queryError " << code << ": "
-			<< LLAres::strerror(code) << llendl;
-}
-
-LLAres::LLAres()
-	: chan_(NULL)
-{
-	ares_init(&chan_);
-}
-
-LLAres::~LLAres()
-{
-	if (chan_)
-		ares_destroy(chan_);
-}
-
-void LLAres::cancel()
-{
-	if (chan_)
-		ares_cancel(chan_);
-}
-
-static void host_callback(void *arg, int status, struct hostent *ent)
-{
-	LLPointer<LLAres::HostResponder> *resp =
-		(LLPointer<LLAres::HostResponder> *) arg;
-
-	if (status == ARES_SUCCESS)
-	{
-		(*resp)->hostResult(ent);
-	} else {
-		(*resp)->hostError(status);
-	}
-
-	delete resp;
-}
-
-void LLAres::getHostByName(const char *name, HostResponder *resp,
-						   int family)
-{
-	if (!chan_)
-	{
-		resp->hostError(ARES_EBADRESP);
-		return;
-	}
-	ares_gethostbyname(chan_, name, family, host_callback,
-					   new LLPointer<LLAres::HostResponder>(resp));
-}
-	
-void LLAres::getSrvRecords(const std::string &name, SrvResponder *resp)
-{
-	search(name, RES_SRV, resp);
-}
-	
-void LLAres::rewriteURI(const std::string &uri, UriRewriteResponder *resp)
-{
-	LL_DEBUGS2("AppInit","Rewrite") << "Rewriting " << uri << LL_ENDL;
-
-	resp->mUri = LLURI(uri);
-	search("_" + resp->mUri.scheme() + "._tcp." + resp->mUri.hostName(),
-		   RES_SRV, resp);
-}
-
-LLQueryResponder::LLQueryResponder()
-	: LLAres::QueryResponder(),
-	  mResult(ARES_ENODATA),
-	  mType(RES_INVALID)
-{
-}
-
-int LLQueryResponder::parseRR(const char *buf, size_t len, const char *&pos,
-							  LLPointer<LLDnsRecord> &r)
-{
-	std::string rrname;
-	size_t enclen;
-	int ret;
-
-	// RR name.
-
-	ret = LLAres::expandName(pos, buf, len, rrname, enclen);
-	if (ret != ARES_SUCCESS)
-	{
-		return ret;
-	}
-		
-	pos += enclen;
-
-	if (pos + NS_RRFIXEDSZ > buf + len)
-	{
-		return ARES_EBADRESP;
-	}
-
-	int rrtype = DNS_RR_TYPE(pos);
-	int rrclass = DNS_RR_CLASS(pos);
-	int rrttl = DNS_RR_TTL(pos);
-	int rrlen = DNS_RR_LEN(pos);
-		
-	if (rrclass != ns_c_in)
-	{
-		return ARES_EBADRESP;
-	}
-
-	pos += NS_RRFIXEDSZ;
-
-	if (pos + rrlen > buf + len)
-	{
-		return ARES_EBADRESP;
-	}
-
-	switch (rrtype)
-	{
-	case RES_A:
-		r = new LLARecord(rrname, rrttl);
-		break;
-	case RES_NS:
-		r = new LLNsRecord(rrname, rrttl);
-		break;
-	case RES_CNAME:
-		r = new LLCnameRecord(rrname, rrttl);
-		break;
-	case RES_PTR:
-		r = new LLPtrRecord(rrname, rrttl);
-		break;
-	case RES_AAAA:
-		r = new LLAaaaRecord(rrname, rrttl);
-		break;
-	case RES_SRV:
-		r = new LLSrvRecord(rrname, rrttl);
-		break;
-	default:
-		llinfos << "LLQueryResponder::parseRR got unknown RR type " << rrtype
-				<< llendl;
-		return ARES_EBADRESP;
-	}
-
-	ret = r->parse(buf, len, pos, rrlen);
-
-	if (ret == ARES_SUCCESS)
-	{
-		pos += rrlen;
-	} else {
-		r = NULL;
-	}
-		
-	return ret;
-}
-
-int LLQueryResponder::parseSection(const char *buf, size_t len,
-								   size_t count, const char *&pos,
-								   dns_rrs_t &rrs)
-{
-	int ret = ARES_SUCCESS;
-	
-	for (size_t i = 0; i < count; i++)
-	{
-		LLPointer<LLDnsRecord> r;
-		ret = parseRR(buf, len, pos, r);
-		if (ret != ARES_SUCCESS)
-		{
-			break;
-		}
-		rrs.push_back(r);
-	}
-
-	return ret;
-}
-
-void LLQueryResponder::queryResult(const char *buf, size_t len)
-{
-	const char *pos = buf;
-	int qdcount = DNS_HEADER_QDCOUNT(pos);
-	int ancount = DNS_HEADER_ANCOUNT(pos);
-	int nscount = DNS_HEADER_NSCOUNT(pos);
-	int arcount = DNS_HEADER_ARCOUNT(pos);
-	int ret;
-
-	if (qdcount == 0 || ancount + nscount + arcount == 0)
-	{
-		ret = ARES_ENODATA;
-		goto bail;
-	}
-
-	pos += NS_HFIXEDSZ;
-
-	for (int i = 0; i < qdcount; i++)
-	{
-		std::string ignore;
-		size_t enclen;
-
-		ret = LLAres::expandName(pos, buf, len, i == 0 ? mQuery : ignore,
-								 enclen);
-		if (ret != ARES_SUCCESS)
-		{
-			goto bail;
-		}
-
-		pos += enclen;
-
-		if (i == 0)
-		{
-			int t = DNS_QUESTION_TYPE(pos);
-			switch (t)
-			{
-			case RES_A:
-			case RES_NS:
-			case RES_CNAME:
-			case RES_PTR:
-			case RES_AAAA:
-			case RES_SRV:
-				mType = (LLResType) t;
-				break;
-			default:
-				llinfos << "Cannot grok query type " << t << llendl;
-				ret = ARES_EBADQUERY;
-				goto bail;
-			}
-		}
-
-		pos += NS_QFIXEDSZ;
-		if (pos > buf + len)
-		{
-			ret = ARES_EBADRESP;
-			goto bail;
-		}
-	}
-	
-	ret = parseSection(buf, len, ancount, pos, mAnswers);
-	if (ret != ARES_SUCCESS)
-	{
-		goto bail;
-	}
-
-	ret = parseSection(buf, len, nscount, pos, mAuthorities);
-	if (ret != ARES_SUCCESS)
-	{
-		goto bail;
-	}
-
-	ret = parseSection(buf, len, arcount, pos, mAdditional);
-
-bail:
-	mResult = ret;
-	if (mResult == ARES_SUCCESS)
-	{
-		queryResult();
-	} else {
-		queryError(mResult);
-	}
-}
-
-void LLQueryResponder::queryResult()
-{
-	llinfos << "LLQueryResponder::queryResult not implemented" << llendl;
-}
-
-void LLAres::SrvResponder::queryResult()
-{
-	if (mType == RES_SRV)
-	{
-		srvResult(mAnswers);
-	} else {
-		srvError(ARES_EBADRESP);
-	}
-}
-
-void LLAres::SrvResponder::queryError(int code)
-{
-	srvError(code);
-}
-
-void LLAres::SrvResponder::srvResult(const dns_rrs_t &ents)
-{
-	llinfos << "LLAres::SrvResponder::srvResult not implemented" << llendl;
-
-	for (size_t i = 0; i < ents.size(); i++)
-	{
-		const LLSrvRecord *s = (const LLSrvRecord *) ents[i].get();
-
-		llinfos << "[" << i << "] " << s->host() << ":" << s->port()
-				<< " priority " << s->priority()
-				<< " weight " << s->weight()
-				<< llendl;
-	}
-}
-
-void LLAres::SrvResponder::srvError(int code)
-{
-	llinfos << "LLAres::SrvResponder::srvError " << code << ": "
-			<< LLAres::strerror(code) << llendl;
-}
-
-static void nameinfo_callback(void *arg, int status, char *node, char *service)
-{
-	LLPointer<LLAres::NameInfoResponder> *resp =
-		(LLPointer<LLAres::NameInfoResponder> *) arg;
-
-	if (status == ARES_SUCCESS)
-	{
-		(*resp)->nameInfoResult(node, service);
-	} else {
-		(*resp)->nameInfoError(status);
-	}
-
-	delete resp;
-}
-
-void LLAres::getNameInfo(const struct sockaddr &sa, socklen_t salen, int flags,
-						 NameInfoResponder *resp)
-{
-	if (!chan_)
-	{
-		resp->nameInfoError(ARES_EBADRESP);
-		return;
-	}
-	ares_getnameinfo(chan_, &sa, salen, flags, nameinfo_callback,
-					 new LLPointer<NameInfoResponder>(resp));
-}
-
-static void search_callback(void *arg, int status, unsigned char *abuf,
-							int alen)
-{
-	LLPointer<LLAres::QueryResponder> *resp =
-		(LLPointer<LLAres::QueryResponder> *) arg;
-
-	if (status == ARES_SUCCESS)
-	{
-		(*resp)->queryResult((const char *) abuf, alen);
-	} else {
-		(*resp)->queryError(status);
-	}
-
-	delete resp;
-}
-
-void LLAres::search(const std::string &query, LLResType type,
-					QueryResponder *resp)
-{
-	if (!chan_)
-	{
-		resp->queryError(ARES_EBADRESP);
-		return;
-	}
-	ares_search(chan_, query.c_str(), ns_c_in, type, search_callback,
-				new LLPointer<QueryResponder>(resp));
-}
-
-bool LLAres::process(U64 timeout)
-{
-	if (!gAPRPoolp)
-	{
-		ll_init_apr();
-	}
-
-	int socks[ARES_GETSOCK_MAXNUM];
-	apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM];
-	apr_int32_t nsds = 0;
-	apr_status_t status;
-	apr_pool_t *pool;
-	int nactive = 0;
-	int bitmask;
-
-	if (!chan_)
-	{
-		goto bail;
-	}
-
-	bitmask = ares_getsock(chan_, socks, ARES_GETSOCK_MAXNUM);
-
-	if (bitmask == 0)
-	{
-		goto bail;
-	}
-
-	status = apr_pool_create(&pool, gAPRPoolp);
-	ll_apr_assert_status(status);
-
-	for (int i = 0; i < ARES_GETSOCK_MAXNUM; i++)
-	{
-		if (ARES_GETSOCK_READABLE(bitmask, i))
-		{
-			aprFds[nactive].reqevents = APR_POLLIN | APR_POLLERR;
-		}
-		else if (ARES_GETSOCK_WRITABLE(bitmask, i))
-		{
-			aprFds[nactive].reqevents = APR_POLLOUT | APR_POLLERR;
-		} else {
-			continue;
-		}
-
-		apr_socket_t *aprSock = NULL;
-
-		status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool);
-		if (status != APR_SUCCESS)
-		{
-			ll_apr_warn_status(status);
-			goto bail_pool;
-		}
-
-		aprFds[nactive].desc.s = aprSock;
-		aprFds[nactive].desc_type = APR_POLL_SOCKET;
-		aprFds[nactive].p = pool;
-		aprFds[nactive].rtnevents = 0;
-		aprFds[nactive].client_data = &socks[i];
-
-		nactive++;
-	}
-
-	if (nactive > 0)
-	{
-		status = apr_poll(aprFds, nactive, &nsds, timeout);
-
-		if (status != APR_SUCCESS && status != APR_TIMEUP)
-		{
-			ll_apr_warn_status(status);
-		}
-
-		for (int i = 0; i < nactive; i++)
-		{
-			int evts = aprFds[i].rtnevents;
-			int ifd = (evts & (APR_POLLIN | APR_POLLERR))
-				? *((int *) aprFds[i].client_data) : ARES_SOCKET_BAD;
-			int ofd = (evts & (APR_POLLOUT | APR_POLLERR))
-				? *((int *) aprFds[i].client_data) : ARES_SOCKET_BAD;
-					
-			ares_process_fd(chan_, ifd, ofd);
-		}
-	}
-
-bail_pool:
-	apr_pool_destroy(pool);
-
-bail:
-	return nsds > 0;
-}
-
-bool LLAres::processAll()
-{
-	if (!chan_)
-	{
-		return false;
-	}
-	
-	bool anyProcessed = false, ret;
-
-	do {
-		timeval tv;
-
-		ret = ares_timeout(chan_, NULL, &tv) != NULL;
-
-		if (ret)
-		{
-			ret = process(tv.tv_sec * 1000000LL + tv.tv_usec);
-			anyProcessed |= ret;
-		}
-	} while (ret);
-
-	return anyProcessed;
-}
-
-int LLAres::expandName(const char *encoded, const char *abuf, size_t alen,
-					   std::string &s, size_t &enclen)
-{
-	char *t;
-	int ret;
-	long e;
-	
-	ret = ares_expand_name((const unsigned char *) encoded,
-						   (const unsigned char *) abuf, alen, &t, &e);
-	if (ret == ARES_SUCCESS)
-	{
-		s.assign(t);
-		enclen = e;
-		ares_free_string(t);
-	}
-	return ret;
-}
-
-const char *LLAres::strerror(int code)
-{
-	return ares_strerror(code);
-}
-
-LLAres *gAres;
-
-LLAres *ll_init_ares()
-{
-	if (gAres == NULL)
-	{
-		gAres = new LLAres();
-	}
-	return gAres;
-}
-
-LLDnsRecord::LLDnsRecord(LLResType type, const std::string &name,
-						 unsigned ttl)
-	: LLRefCount(),
-	  mType(type),
-	  mName(name),
-	  mTTL(ttl)
-{
-}
-
-LLHostRecord::LLHostRecord(LLResType type, const std::string &name,
-						   unsigned ttl)
-	: LLDnsRecord(type, name, ttl)
-{
-}
-
-int LLHostRecord::parse(const char *buf, size_t len, const char *pos,
-						size_t rrlen)
-{
-	int ret;
-
-	ret = LLAres::expandName(pos, buf, len, mHost);
-	if (ret != ARES_SUCCESS)
-	{
-		goto bail;
-	}
-	
-	ret = ARES_SUCCESS;
-
-bail:
-	return ret;
-}
-
-LLCnameRecord::LLCnameRecord(const std::string &name, unsigned ttl)
-	: LLHostRecord(RES_CNAME, name, ttl)
-{
-}
-
-LLPtrRecord::LLPtrRecord(const std::string &name, unsigned ttl)
-	: LLHostRecord(RES_PTR, name, ttl)
-{
-}
-
-LLAddrRecord::LLAddrRecord(LLResType type, const std::string &name,
-						   unsigned ttl)
-	: LLDnsRecord(type, name, ttl)
-{
-}
-
-LLARecord::LLARecord(const std::string &name, unsigned ttl)
-	: LLAddrRecord(RES_A, name, ttl)
-{
-}
-
-int LLARecord::parse(const char *buf, size_t len, const char *pos,
-					 size_t rrlen)
-{
-	int ret;
-
-	if (rrlen != sizeof(mSA.sin.sin_addr.s_addr))
-	{
-		ret = ARES_EBADRESP;
-		goto bail;
-	}
-	
-	memset(&mSA, 0, sizeof(mSA));
-	memcpy(&mSA.sin.sin_addr.s_addr, pos, rrlen);
-	mSA.sin.sin_family = AF_INET6;
-	mSize = sizeof(mSA.sin);
-	
-	ret = ARES_SUCCESS;
-
-bail:
-	return ret;
-}
-
-LLAaaaRecord::LLAaaaRecord(const std::string &name, unsigned ttl)
-	: LLAddrRecord(RES_AAAA, name, ttl)
-{
-}
-
-int LLAaaaRecord::parse(const char *buf, size_t len, const char *pos,
-						size_t rrlen)
-{
-	int ret;
-
-	if (rrlen != sizeof(mSA.sin6.sin6_addr))
-	{
-		ret = ARES_EBADRESP;
-		goto bail;
-	}
-	
-	memset(&mSA, 0, sizeof(mSA));
-	memcpy(&mSA.sin6.sin6_addr.s6_addr, pos, rrlen);
-	mSA.sin6.sin6_family = AF_INET6;
-	mSize = sizeof(mSA.sin6);
-	
-	ret = ARES_SUCCESS;
-
-bail:
-	return ret;
-}
-
-LLSrvRecord::LLSrvRecord(const std::string &name, unsigned ttl)
-	: LLHostRecord(RES_SRV, name, ttl)
-{
-}
-
-int LLSrvRecord::parse(const char *buf, size_t len, const char *pos,
-					   size_t rrlen)
-{
-	int ret;
-
-	if (rrlen < 6)
-	{
-		ret = ARES_EBADRESP;
-		goto bail;
-	}
-
-	memcpy(&mPriority, pos, 2);
-	memcpy(&mWeight, pos + 2, 2);
-	memcpy(&mPort, pos + 4, 2);
-
-	mPriority = ntohs(mPriority);
-	mWeight = ntohs(mWeight);
-	mPort = ntohs(mPort);
-
-	ret = LLHostRecord::parse(buf, len, pos + 6, rrlen - 6);
-	
-bail:
-	return ret;
-}
-
-LLNsRecord::LLNsRecord(const std::string &name, unsigned ttl)
-	: LLHostRecord(RES_NS, name, ttl)
-{
-}
-
-void LLAres::UriRewriteResponder::queryError(int code)
-{
-	std::vector<std::string> uris;
-	uris.push_back(mUri.asString());
-	rewriteResult(uris);
-}
-
-void LLAres::UriRewriteResponder::queryResult()
-{
-	std::vector<std::string> uris;
-
-	if (mType != RES_SRV)
-	{
-		goto bail;
-	}
-		
-	for (size_t i = 0; i < mAnswers.size(); i++)
-	{
-		const LLSrvRecord *r = (const LLSrvRecord *) mAnswers[i].get();
-
-		if (r->type() == RES_SRV)
-		{
-			// Check the domain in the response to ensure that it's
-			// the same as the domain in the request, so that bad guys
-			// can't forge responses that point to their own login
-			// servers with their own certificates.
-
-			// Hard-coding the domain to check here is a bit of a
-			// hack.  Hoist it to an outer caller if anyone ever needs
-			// this functionality on other domains.
-
-			static const std::string domain(".lindenlab.com");
-			const std::string &host = r->host();
-
-			std::string::size_type s = host.find(domain) + domain.length();
-				
-			if (s != host.length() && s != host.length() - 1)
-			{
-				continue;
-			}
-			
-			LLURI uri(mUri.scheme(),
-					  mUri.userName(),
-					  mUri.password(),
-					  r->host(),
-					  mUri.defaultPort() ? r->port() : mUri.hostPort(),
-					  mUri.escapedPath(),
-					  mUri.escapedQuery());
-			uris.push_back(uri.asString());
-		}
-	}
-
-	if (!uris.empty())
-	{
-		goto done;
-	}
-
-bail:
-	uris.push_back(mUri.asString());
-
-done:
-	rewriteResult(uris);
-}
-
-void LLAres::UriRewriteResponder::rewriteResult(
-	const std::vector<std::string> &uris)
-{
-	llinfos << "LLAres::UriRewriteResponder::rewriteResult not implemented"
-			<< llendl;
-
-	for (size_t i = 0; i < uris.size(); i++)
-	{
-		llinfos << "[" << i << "] " << uris[i] << llendl;
-	}
-}
diff --git a/linden/indra/llcommon/llares.h b/linden/indra/llcommon/llares.h
deleted file mode 100644
index 07957f1..0000000
--- a/linden/indra/llcommon/llares.h
+++ /dev/null
@@ -1,572 +0,0 @@
-/** 
- * @file llares.h
- * @author Bryan O'Sullivan
- * @date 2007-08-15
- * @brief Wrapper for asynchronous DNS lookups.
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLARES_H
-#define LL_LLARES_H
-
-#ifdef LL_WINDOWS
-# include <ws2tcpip.h>
-#endif
-
-#ifdef LL_STANDALONE
-# include <ares.h>
-#else
-# include <ares/ares.h>
-#endif
-
-#include "llmemory.h"
-#include "lluri.h"
-
-class LLQueryResponder;
-
-/**
- * @brief Supported DNS RR types.
- */
-enum LLResType
-{
-	RES_INVALID = 0,			/**< Cookie. */
-	RES_A = 1,					/**< "A" record. IPv4 address. */
-	RES_NS = 2,					/**< "NS" record. Authoritative server. */
-	RES_CNAME = 5,				/**< "CNAME" record. Canonical name. */
-	RES_PTR = 12,				/**< "PTR" record. Domain name pointer. */
-	RES_AAAA = 28,				/**< "AAAA" record. IPv6 Address. */
-	RES_SRV = 33,				/**< "SRV" record. Server Selection. */
-	RES_MAX = 65536				/**< Sentinel; RR types are 16 bits wide. */
-};
-
-/**
- * @class LLDnsRecord
- * @brief Base class for all DNS RR types.
- */
-class LLDnsRecord : public LLRefCount
-{
-protected:
-	friend class LLQueryResponder;
-
-	LLResType mType;
-	std::string mName;
-	unsigned mTTL;
-	
-	virtual int parse(const char *buf, size_t len, const char *pos,
-					  size_t rrlen) = 0;
-
-	LLDnsRecord(LLResType type, const std::string &name, unsigned ttl);
-	
-public:
-	/**
-	 * @brief Record name.
-	 */
-	const std::string &name() const { return mName; }
-
-	/**
-	 * @brief Time-to-live value, in seconds.
-	 */
-	unsigned ttl() const { return mTTL; }
-
-	/**
-	 * @brief RR type.
-	 */
-	LLResType type() const { return mType; }
-};
-
-/**
- * @class LLAddrRecord
- * @brief Base class for address-related RRs.
- */
-class LLAddrRecord : public LLDnsRecord
-{
-protected:
-	friend class LLQueryResponder;
-
-	LLAddrRecord(LLResType type, const std::string &name, unsigned ttl);
-
-	union 
-	{
-		sockaddr sa;
-		sockaddr_in sin;
-		sockaddr_in6 sin6;
-	} mSA;
-
-	socklen_t mSize;
-
-public:
-	/**
-	 * @brief Generic socket address.
-	 */
-	const sockaddr &addr() const { return mSA.sa; }
-
-	/**
-	 * @brief Size of the socket structure.
-	 */
-	socklen_t size() const { return mSize; }
-};
-
-/**
- * @class LLARecord
- * @brief A RR, for IPv4 addresses.
- */
-class LLARecord : public LLAddrRecord
-{
-protected:
-	friend class LLQueryResponder;
-
-	LLARecord(const std::string &name, unsigned ttl);
-
-	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
-
-public:
-	/**
-	 * @brief Socket address.
-	 */
-	const sockaddr_in &addr_in() const { return mSA.sin; }
-};
-
-/**
- * @class LLAaaaRecord
- * @brief AAAA RR, for IPv6 addresses.
- */
-class LLAaaaRecord : public LLAddrRecord
-{
-protected:
-	friend class LLQueryResponder;
-
-	LLAaaaRecord(const std::string &name, unsigned ttl);
-
-	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
-
-public:
-	/**
-	 * @brief Socket address.
-	 */
-	const sockaddr_in6 &addr_in6() const { return mSA.sin6; }
-};
-	
-/**
- * @class LLHostRecord
- * @brief Base class for host-related RRs.
- */
-class LLHostRecord : public LLDnsRecord
-{
-protected:
-	LLHostRecord(LLResType type, const std::string &name, unsigned ttl);
-
-	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
-
-	std::string mHost;
-
-public:
-	/**
-	 * @brief Host name.
-	 */
-	const std::string &host() const { return mHost; }
-};
-	
-/**
- * @class LLCnameRecord
- * @brief CNAME RR.
- */
-class LLCnameRecord : public LLHostRecord
-{
-protected:
-	friend class LLQueryResponder;
-
-	LLCnameRecord(const std::string &name, unsigned ttl);
-};
-	
-/**
- * @class LLPtrRecord
- * @brief PTR RR.
- */
-class LLPtrRecord : public LLHostRecord
-{
-protected:
-	friend class LLQueryResponder;
-
-	LLPtrRecord(const std::string &name, unsigned ttl);
-};
-
-/**
- * @class LLSrvRecord
- * @brief SRV RR.
- */
-class LLSrvRecord : public LLHostRecord
-{
-protected:
-	U16 mPriority;
-	U16 mWeight;
-	U16 mPort;
-
-	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
-
-public:
-	LLSrvRecord(const std::string &name, unsigned ttl);
-
-	/**
-	 * @brief Service priority.
-	 */
-	U16 priority() const { return mPriority; }
-
-	/**
-	 * @brief Service weight.
-	 */
-	U16 weight() const { return mWeight; }
-
-	/**
-	 * @brief Port number of service.
-	 */
-	U16 port() const { return mPort; }
-
-	/**
-	 * @brief Functor for sorting SRV records by priority.
-	 */
-	struct ComparePriorityLowest
-	{
-		bool operator()(const LLSrvRecord& lhs, const LLSrvRecord& rhs)
-		{
-			return lhs.mPriority < rhs.mPriority;
-		}
-	};
-};
-	
-/**
- * @class LLNsRecord
- * @brief NS RR.
- */
-class LLNsRecord : public LLHostRecord
-{
-public:
-	LLNsRecord(const std::string &name, unsigned ttl);
-};
-
-class LLQueryResponder;
-
-/**
- * @class LLAres
- * @brief Asynchronous address resolver.
- */
-class LLAres
-{
-public:
-    /**
-	 * @class HostResponder
-	 * @brief Base class for responding to hostname lookups.
-	 * @see LLAres::getHostByName
-	 */
-	class HostResponder : public LLRefCount
-	{
-	public:
-		virtual ~HostResponder();
-
-		virtual void hostResult(const hostent *ent);
-		virtual void hostError(int code);
-	};
-
-    /**
-	 * @class NameInfoResponder
-	 * @brief Base class for responding to address lookups.
-	 * @see LLAres::getNameInfo
-	 */
-	class NameInfoResponder : public LLRefCount
-	{
-	public:
-		virtual ~NameInfoResponder();
-
-		virtual void nameInfoResult(const char *node, const char *service);
-		virtual void nameInfoError(int code);
-	};
-
-    /**
-	 * @class QueryResponder
-	 * @brief Base class for responding to custom searches.
-	 * @see LLAres::search
-	 */
-	class QueryResponder : public LLRefCount
-	{
-	public:
-		virtual ~QueryResponder();
-
-		virtual void queryResult(const char *buf, size_t len);
-		virtual void queryError(int code);
-	};
-
-	class SrvResponder;
-	class UriRewriteResponder;
-		
-	LLAres();
-
-	~LLAres();
-
-	/**
-	 * Cancel all outstanding requests.  The error methods of the
-	 * corresponding responders will be called, with ARES_ETIMEOUT.
-	 */
-	void cancel();
-	
-	/**
-	 * Look up the address of a host.
-	 *
-	 * @param name name of host to look up
-	 * @param resp responder to call with result
-	 * @param family AF_INET for IPv4 addresses, AF_INET6 for IPv6
-	 */
-	void getHostByName(const std::string &name, HostResponder *resp,
-					   int family = AF_INET) {
-		getHostByName(name.c_str(), resp, family);
-	}
-
-	/**
-	 * Look up the address of a host.
-	 *
-	 * @param name name of host to look up
-	 * @param resp responder to call with result
-	 * @param family AF_INET for IPv4 addresses, AF_INET6 for IPv6
-	 */
-	void getHostByName(const char *name, HostResponder *resp,
-					   int family = PF_INET);
-
-	/**
-	 * Look up the name associated with a socket address.
-	 *
-	 * @param sa socket address to look up
-	 * @param salen size of socket address
-	 * @param flags flags to use
-	 * @param resp responder to call with result
-	 */
-	void getNameInfo(const struct sockaddr &sa, socklen_t salen, int flags,
-					 NameInfoResponder *resp);
-
-	/**
-	 * Look up SRV (service location) records for a service name.
-	 *
-	 * @param name service name (e.g. "_https._tcp.login.agni.lindenlab.com")
-	 * @param resp responder to call with result
-	 */
-	void getSrvRecords(const std::string &name, SrvResponder *resp);
-
-	/**
-	 * Rewrite a URI, using SRV (service location) records for its
-	 * protocol if available.  If no SRV records are published, the
-	 * existing URI is handed to the responder.
-	 *
-	 * @param uri URI to rewrite
-	 * @param resp responder to call with result
-	 */
-	void rewriteURI(const std::string &uri,
-					UriRewriteResponder *resp);
-
-	/**
-	 * Start a custom search.
-	 *
-	 * @param query query to make
-	 * @param type type of query to perform
-	 * @param resp responder to call with result
-	 */
-	void search(const std::string &query, LLResType type,
-				QueryResponder *resp);
-
-	/**
-	 * Process any outstanding queries.  This method takes an optional
-	 * timeout parameter (specified in microseconds).  If provided, it
-	 * will block the calling thread for that length of time to await
-	 * possible responses. A timeout of zero will return immediately
-	 * if there are no responses or timeouts to process.
-	 *
-	 * @param timeoutUsecs number of microseconds to block before timing out
-	 * @return whether any responses were processed
-	 */
-	bool process(U64 timeoutUsecs = 0);
-
-	/**
-	 * Process all outstanding queries, blocking the calling thread
-	 * until all have either been responded to or timed out.
-	 *
-	 * @return whether any responses were processed
-	 */
-	bool processAll();
-	
-	/**
-	 * Expand a DNS-encoded compressed string into a normal string.
-	 *
-	 * @param encoded the encoded name (null-terminated)
-	 * @param abuf the response buffer in which the string is embedded
-	 * @param alen the length of the response buffer
-	 * @param s the string into which to place the result
-	 * @return ARES_SUCCESS on success, otherwise an error indicator
-	 */
-	static int expandName(const char *encoded, const char *abuf, size_t alen,
-						  std::string &s) {
-		size_t ignore;
-		return expandName(encoded, abuf, alen, s, ignore);
-	}
-	
-	static int expandName(const char *encoded, const char *abuf, size_t alen,
-						  std::string &s, size_t &enclen);
-
-	/**
-	 * Return a string describing an error code.
-	 */
-	static const char *strerror(int code);
-
-protected:
-	ares_channel chan_;
-
-};
-	
-/**
- * An ordered collection of DNS resource records.
- */
-typedef std::vector<LLPointer<LLDnsRecord> > dns_rrs_t;
-
-/**
- * @class LLQueryResponder
- * @brief Base class for friendly handling of DNS query responses.
- *
- * This class parses a DNS response and represents it in a friendly
- * manner.
- *
- * @see LLDnsRecord
- * @see LLARecord
- * @see LLNsRecord
- * @see LLCnameRecord
- * @see LLPtrRecord
- * @see LLAaaaRecord
- * @see LLSrvRecord
- */
-class LLQueryResponder : public LLAres::QueryResponder
-{
-protected:
-	int mResult;
-	std::string mQuery;
-	LLResType mType;
-	
-	dns_rrs_t mAnswers;
-	dns_rrs_t mAuthorities;
-	dns_rrs_t mAdditional;
-
-	/**
-	 * Parse a single RR.
-	 */
-	int parseRR(const char *buf, size_t len, const char *&pos,
-				LLPointer<LLDnsRecord> &r);
-	/**
-	 * Parse one section of a response.
-	 */
-	int parseSection(const char *buf, size_t len,
-					 size_t count, const char *& pos, dns_rrs_t &rrs);
-
-	void queryResult(const char *buf, size_t len);
-	virtual void queryResult();
-
-public:
-	LLQueryResponder();
-
-	/**
-	 * Indicate whether the response could be parsed successfully.
-	 */
-	bool valid() const { return mResult == ARES_SUCCESS; }
-
-	/**
-	 * The more detailed result of parsing the response.
-	 */
-	int result() const { return mResult; }
-	
-	/**
-	 * Return the query embedded in the response.
-	 */
-	const std::string &query() const { return mQuery; }
-
-	/**
-	 * Return the contents of the "answers" section of the response.
-	 */
-	const dns_rrs_t &answers() const { return mAnswers; }
-
-	/**
-	 * Return the contents of the "authorities" section of the
-	 * response.
-	 */
-	const dns_rrs_t &authorities() const { return mAuthorities; }
-
-	/**
-	 * Return the contents of the "additional records" section of the
-	 * response.
-	 */
-	const dns_rrs_t &additional() const { return mAdditional; }
-};
-
-/**
- * @class LLAres::SrvResponder
- * @brief Class for handling SRV query responses.
- */
-class LLAres::SrvResponder : public LLQueryResponder
-{
-public:
-	friend void LLAres::getSrvRecords(const std::string &name,
-									  SrvResponder *resp);
-	void queryResult();
-	void queryError(int code);
-
-	virtual void srvResult(const dns_rrs_t &ents);
-	virtual void srvError(int code);
-};
-
-/**
- * @class LLAres::UriRewriteResponder
- * @brief Class for handling URI rewrites based on SRV records.
- */
-class LLAres::UriRewriteResponder : public LLQueryResponder
-{
-protected:
-	LLURI mUri;
-
-public:
-	friend void LLAres::rewriteURI(const std::string &uri,
-								   UriRewriteResponder *resp);
-	void queryResult();
-	void queryError(int code);
-
-	virtual void rewriteResult(const std::vector<std::string> &uris);
-};
-	
-/**
- * Singleton responder.
- */
-extern LLAres *gAres;
-
-/**
- * Set up the singleton responder.  It's safe to call this more than
- * once from within a single thread, but this function is not
- * thread safe.
- */
-extern LLAres *ll_init_ares();
-
-#endif // LL_LLARES_H
diff --git a/linden/indra/llcommon/llassettype.cpp b/linden/indra/llcommon/llassettype.cpp
index 4b2a862..27b8310 100644
--- a/linden/indra/llcommon/llassettype.cpp
+++ b/linden/indra/llcommon/llassettype.cpp
@@ -75,7 +75,7 @@ asset_info_t asset_types[] =
 LLAssetType::EType LLAssetType::getType(const std::string& sin)
 {
 	std::string s = sin;
-	LLString::toUpper(s);
+	LLStringUtil::toUpper(s);
 	for (S32 idx = 0; ;idx++)
 	{
 		asset_info_t* info = asset_types + idx;
@@ -128,7 +128,7 @@ const char* LLAssetType::mAssetTypeNames[LLAssetType::AT_COUNT] =
 	"jpeg",
 	"animatn",
 	"gesture",
-	"simstate",
+	"simstate"
 };
 
 // This table is meant for decoding to human readable form. Put any
@@ -158,7 +158,7 @@ const char* LLAssetType::mAssetTypeHumanNames[LLAssetType::AT_COUNT] =
 	"jpeg image",
 	"animation",
 	"gesture",
-	"simstate",
+	"simstate"
 };
 
 ///----------------------------------------------------------------------------
@@ -181,9 +181,14 @@ const char* LLAssetType::lookup( LLAssetType::EType type )
 // static
 LLAssetType::EType LLAssetType::lookup( const char* name )
 {
+	return lookup(ll_safe_string(name));
+}
+
+LLAssetType::EType LLAssetType::lookup( const std::string& name )
+{
 	for( S32 i = 0; i < AT_COUNT; i++ )
 	{
-		if( 0 == strcmp(name, mAssetTypeNames[i]) )
+		if( name == mAssetTypeNames[i] )
 		{
 			// match
 			return (EType)i;
@@ -208,9 +213,14 @@ const char* LLAssetType::lookupHumanReadable(LLAssetType::EType type)
 // static
 LLAssetType::EType LLAssetType::lookupHumanReadable( const char* name )
 {
+	return lookupHumanReadable(ll_safe_string(name));
+}
+
+LLAssetType::EType LLAssetType::lookupHumanReadable( const std::string& name )
+{
 	for( S32 i = 0; i < AT_COUNT; i++ )
 	{
-		if( 0 == strcmp(name, mAssetTypeHumanNames[i]) )
+		if( name == mAssetTypeHumanNames[i] )
 		{
 			// match
 			return (EType)i;
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index f5ef05b..f976df4 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -145,11 +145,13 @@ public:
 	};
 
 	// machine transation between type and strings
-	static EType lookup(const char* name);
+	static EType lookup(const char* name); // safe conversion to std::string, *TODO: deprecate
+	static EType lookup(const std::string& name);
 	static const char* lookup(EType type);
 
 	// translation from a type to a human readable form.
-	static EType lookupHumanReadable( const char* name );
+	static EType lookupHumanReadable( const char* name ); // safe conversion to std::string, *TODO: deprecate
+	static EType lookupHumanReadable( const std::string& name );
 	static const char* lookupHumanReadable(EType type);
 
 	static EDragAndDropType lookupDragAndDropType( EType );
diff --git a/linden/indra/llcommon/llbase64.cpp b/linden/indra/llcommon/llbase64.cpp
index 950ce6e..c2421d8 100644
--- a/linden/indra/llcommon/llbase64.cpp
+++ b/linden/indra/llcommon/llbase64.cpp
@@ -36,7 +36,7 @@
 
 #include <string>
 
-#include "apr-1/apr_base64.h"
+#include "apr_base64.h"
 
 
 // static
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index a46b8aa..ea1a579 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -68,7 +68,7 @@ typedef enum e_chat_audible_level
 class LLChat
 {
 public:
-	LLChat(const LLString& text = LLString::null)
+	LLChat(const std::string& text = LLStringUtil::null)
 	:	mText(text),
 		mFromName(),
 		mFromID(),
@@ -80,8 +80,8 @@ public:
 		mPosAgent()
 	{ }
 	
-	LLString		mText;		// UTF-8 line of text
-	LLString		mFromName;	// agent or object name
+	std::string		mText;		// UTF-8 line of text
+	std::string		mFromName;	// agent or object name
 	LLUUID			mFromID;	// agent id or object id
 	EChatSourceType	mSourceType;
 	EChatType		mChatType;
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
deleted file mode 100644
index f54ea13..0000000
--- a/linden/indra/llcommon/llcommon.vcproj
+++ /dev/null
@@ -1,608 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llcommon"
-	ProjectGUID="{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"
-	RootNamespace="llcommon"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;XML_STATIC;APR_DECLARE_STATIC"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcommon.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="3"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcommon.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcommon.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llapp.cpp">
-			</File>
-			<File
-				RelativePath=".\llapr.cpp">
-			</File>
-			<File
-				RelativePath=".\llares.cpp">
-			</File>
-			<File
-				RelativePath=".\llassettype.cpp">
-			</File>
-			<File
-				RelativePath=".\llbase32.cpp">
-			</File>
-			<File
-				RelativePath=".\llbase64.cpp">
-			</File>
-			<File
-				RelativePath=".\llcommon.cpp">
-			</File>
-			<File
-				RelativePath=".\llcriticaldamp.cpp">
-			</File>
-			<File
-				RelativePath=".\lldate.cpp">
-			</File>
-			<File
-				RelativePath=".\llerror.cpp">
-			</File>
-			<File
-				RelativePath=".\llerrorthread.cpp">
-			</File>
-			<File
-				RelativePath=".\llevent.cpp">
-			</File>
-			<File
-				RelativePath=".\llfasttimer.cpp">
-			</File>
-			<File
-				RelativePath=".\llfile.cpp">
-			</File>
-			<File
-				RelativePath=".\llfindlocale.cpp">
-			</File>
-			<File
-				RelativePath=".\llfixedbuffer.cpp">
-			</File>
-			<File
-				RelativePath=".\llformat.cpp">
-			</File>
-			<File
-				RelativePath=".\llframetimer.cpp">
-			</File>
-			<File
-				RelativePath=".\llheartbeat.cpp">
-			</File>
-			<File
-				RelativePath=".\llindraconfigfile.cpp">
-			</File>
-			<File
-				RelativePath=".\llliveappconfig.cpp">
-			</File>
-			<File
-				RelativePath=".\lllivefile.cpp">
-			</File>
-			<File
-				RelativePath=".\lllog.cpp">
-			</File>
-			<File
-				RelativePath=".\llmemory.cpp">
-			</File>
-			<File
-				RelativePath=".\llmemorystream.cpp">
-			</File>
-			<File
-				RelativePath=".\llmetrics.cpp">
-			</File>
-			<File
-				RelativePath=".\llmortician.cpp">
-			</File>
-			<File
-				RelativePath=".\llprocessor.cpp">
-			</File>
-			<File
-				RelativePath=".\llqueuedthread.cpp">
-			</File>
-			<File
-				RelativePath=".\llrun.cpp">
-			</File>
-			<File
-				RelativePath=".\llsd.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdserialize.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdserialize_xml.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdutil.cpp">
-			</File>
-			<File
-				RelativePath=".\llsecondlifeurls.cpp">
-			</File>
-			<File
-				RelativePath=".\llstat.cpp">
-			</File>
-			<File
-				RelativePath=".\llstreamtools.cpp">
-			</File>
-			<File
-				RelativePath=".\llstring.cpp">
-			</File>
-			<File
-				RelativePath=".\llstringtable.cpp">
-			</File>
-			<File
-				RelativePath=".\llsys.cpp">
-			</File>
-			<File
-				RelativePath=".\llthread.cpp">
-			</File>
-			<File
-				RelativePath=".\lltimer.cpp">
-			</File>
-			<File
-				RelativePath=".\lluri.cpp">
-			</File>
-			<File
-				RelativePath=".\llworkerthread.cpp">
-			</File>
-			<File
-				RelativePath=".\metaclass.cpp">
-			</File>
-			<File
-				RelativePath=".\metaproperty.cpp">
-			</File>
-			<File
-				RelativePath=".\reflective.cpp">
-			</File>
-			<File
-				RelativePath=".\timing.cpp">
-			</File>
-			<File
-				RelativePath=".\u64.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\bitpack.h">
-			</File>
-			<File
-				RelativePath=".\doublelinkedlist.h">
-			</File>
-			<File
-				RelativePath=".\imageids.h">
-			</File>
-			<File
-				RelativePath=".\indra_constants.h">
-			</File>
-			<File
-				RelativePath=".\linden_common.h">
-			</File>
-			<File
-				RelativePath=".\linked_lists.h">
-			</File>
-			<File
-				RelativePath=".\llagentconstants.h">
-			</File>
-			<File
-				RelativePath=".\llapp.h">
-			</File>
-			<File
-				RelativePath=".\llapr.h">
-			</File>
-			<File
-				RelativePath=".\llassettype.h">
-			</File>
-			<File
-				RelativePath=".\llassoclist.h">
-			</File>
-			<File
-				RelativePath=".\llavatarconstants.h">
-			</File>
-			<File
-				RelativePath=".\llbase32.h">
-			</File>
-			<File
-				RelativePath=".\llbase64.h">
-			</File>
-			<File
-				RelativePath=".\llboost.h">
-			</File>
-			<File
-				RelativePath=".\llchat.h">
-			</File>
-			<File
-				RelativePath=".\llclickaction.h">
-			</File>
-			<File
-				RelativePath=".\llcommon.h">
-			</File>
-			<File
-				RelativePath=".\llcriticaldamp.h">
-			</File>
-			<File
-				RelativePath=".\lldarray.h">
-			</File>
-			<File
-				RelativePath=".\lldarrayptr.h">
-			</File>
-			<File
-				RelativePath=".\lldate.h">
-			</File>
-			<File
-				RelativePath=".\lldefs.h">
-			</File>
-			<File
-				RelativePath=".\lldlinked.h">
-			</File>
-			<File
-				RelativePath=".\lldqueueptr.h">
-			</File>
-			<File
-				RelativePath=".\llendianswizzle.h">
-			</File>
-			<File
-				RelativePath=".\llenum.h">
-			</File>
-			<File
-				RelativePath=".\llerror.h">
-			</File>
-			<File
-				RelativePath=".\llerrorcontrol.h">
-			</File>
-			<File
-				RelativePath=".\llerrorthread.h">
-			</File>
-			<File
-				RelativePath=".\llevent.h">
-			</File>
-			<File
-				RelativePath=".\llextendedstatus.h">
-			</File>
-			<File
-				RelativePath=".\llfasttimer.h">
-			</File>
-			<File
-				RelativePath=".\llfile.h">
-			</File>
-			<File
-				RelativePath=".\llfixedbuffer.h">
-			</File>
-			<File
-				RelativePath=".\llformat.h">
-			</File>
-			<File
-				RelativePath=".\llframecallbackmanager.h">
-			</File>
-			<File
-				RelativePath=".\llframetimer.h">
-			</File>
-			<File
-				RelativePath=".\llhash.h">
-			</File>
-			<File
-				RelativePath=".\llheartbeat.h">
-			</File>
-			<File
-				RelativePath=".\llindexedqueue.h">
-			</File>
-			<File
-				RelativePath=".\llkeythrottle.h">
-			</File>
-			<File
-				RelativePath=".\llkeyusetracker.h">
-			</File>
-			<File
-				RelativePath=".\lllinkedqueue.h">
-			</File>
-			<File
-				RelativePath=".\llliveappconfig.h">
-			</File>
-			<File
-				RelativePath=".\lllivefile.h">
-			</File>
-			<File
-				RelativePath=".\lllocalidhashmap.h">
-			</File>
-			<File
-				RelativePath=".\lllog.h">
-			</File>
-			<File
-				RelativePath=".\lllslconstants.h">
-			</File>
-			<File
-				RelativePath=".\llmap.h">
-			</File>
-			<File
-				RelativePath=".\llmemory.h">
-			</File>
-			<File
-				RelativePath=".\llmemorystream.h">
-			</File>
-			<File
-				RelativePath=".\llmemtype.h">
-			</File>
-			<File
-				RelativePath=".\llmetrics.h">
-			</File>
-			<File
-				RelativePath=".\llmortician.h">
-			</File>
-			<File
-				RelativePath=".\llnametable.h">
-			</File>
-			<File
-				RelativePath=".\llpreprocessor.h">
-			</File>
-			<File
-				RelativePath=".\llpriqueuemap.h">
-			</File>
-			<File
-				RelativePath=".\llprocessor.h">
-			</File>
-			<File
-				RelativePath=".\llptrskiplist.h">
-			</File>
-			<File
-				RelativePath=".\llptrskipmap.h">
-			</File>
-			<File
-				RelativePath=".\llqueuedthread.h">
-			</File>
-			<File
-				RelativePath=".\llrun.h">
-			</File>
-			<File
-				RelativePath=".\llsd.h">
-			</File>
-			<File
-				RelativePath=".\llsdserialize.h">
-			</File>
-			<File
-				RelativePath=".\llsdserialize_xml.h">
-			</File>
-			<File
-				RelativePath=".\llsdutil.h">
-			</File>
-			<File
-				RelativePath=".\llsecondlifeurls.h">
-			</File>
-			<File
-				RelativePath=".\llskiplist.h">
-			</File>
-			<File
-				RelativePath=".\llskipmap.h">
-			</File>
-			<File
-				RelativePath=".\llsmoothstep.h">
-			</File>
-			<File
-				RelativePath=".\llstat.h">
-			</File>
-			<File
-				RelativePath=".\llstatenums.h">
-			</File>
-			<File
-				RelativePath=".\llstl.h">
-			</File>
-			<File
-				RelativePath=".\llstreamtools.h">
-			</File>
-			<File
-				RelativePath=".\llstrider.h">
-			</File>
-			<File
-				RelativePath=".\llstring.h">
-			</File>
-			<File
-				RelativePath=".\llstringtable.h">
-			</File>
-			<File
-				RelativePath=".\llsys.h">
-			</File>
-			<File
-				RelativePath=".\llthread.h">
-			</File>
-			<File
-				RelativePath=".\lltimer.h">
-			</File>
-			<File
-				RelativePath=".\lluri.h">
-			</File>
-			<File
-				RelativePath=".\lluuidhashmap.h">
-			</File>
-			<File
-				RelativePath=".\llversionserver.h">
-			</File>
-			<File
-				RelativePath=".\llversionviewer.h">
-			</File>
-			<File
-				RelativePath=".\llworkerthread.h">
-			</File>
-			<File
-				RelativePath=".\new_mem_ops.h">
-			</File>
-			<File
-				RelativePath=".\priqueue.h">
-			</File>
-			<File
-				RelativePath=".\processor.h">
-			</File>
-			<File
-				RelativePath=".\roles_constants.h">
-			</File>
-			<File
-				RelativePath=".\stdenums.h">
-			</File>
-			<File
-				RelativePath=".\stdtypes.h">
-			</File>
-			<File
-				RelativePath=".\string_table.h">
-			</File>
-			<File
-				RelativePath=".\timer.h">
-			</File>
-			<File
-				RelativePath=".\timing.h">
-			</File>
-			<File
-				RelativePath=".\u64.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj
deleted file mode 100644
index a298499..0000000
--- a/linden/indra/llcommon/llcommon_vc8.vcproj
+++ /dev/null
@@ -1,847 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llcommon"
-	ProjectGUID="{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"
-	RootNamespace="llcommon"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;XML_STATIC;APR_DECLARE_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcommon.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcommon.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="psapi.lib"
-				OutputFile="$(OutDir)/llcommon.lib"
-				AdditionalLibraryDirectories=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llapp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llapr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llares.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llassettype.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase64.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcriticaldamp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llerror.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llerrorthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfindlocale.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfixedbuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llformat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llframetimer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llheartbeat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llindraconfigfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llliveappconfig.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllivefile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemorystream.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmetrics.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmortician.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprocessor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llqueuedthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrun.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsd.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize_xml.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsecondlifeurls.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstreamtools.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstringtable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsys.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltimer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluri.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworkerthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\metaclass.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\metaproperty.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\reflective.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\timing.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\u64.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\bitpack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\doublelinkedlist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\imageids.h"
-				>
-			</File>
-			<File
-				RelativePath=".\indra_constants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\linden_common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\linked_lists.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llapp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llapr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llares.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassettype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassoclist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llavatarconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase64.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llboost.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llchat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclickaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcriticaldamp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldarray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldarrayptr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldefs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldlinked.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldqueueptr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llendianswizzle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llenum.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llerror.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llerrorcontrol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llerrorthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llevent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llextendedstatus.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfindlocale.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfixedbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llformat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframecallbackmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframetimer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhash.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llindexedqueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llindraconfigfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllinkedqueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llliveappconfig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllivefile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllocalidhashmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllslconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemorystream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemtype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmetrics.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmortician.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnametable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnametable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreprocessor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpriqueuemap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprocessor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llptrskiplist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llptrskipmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llqueuedthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrun.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize_xml.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsecondlifeurls.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llskiplist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llskipmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatenums.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstreamtools.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstrider.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstringtable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsys.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltimer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluri.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluuidhashmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llversionserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llversionviewer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworkerthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\metaclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\metaclasst.h"
-				>
-			</File>
-			<File
-				RelativePath=".\metaproperty.h"
-				>
-			</File>
-			<File
-				RelativePath=".\metapropertyt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\new_mem_ops.h"
-				>
-			</File>
-			<File
-				RelativePath=".\priqueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\processor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\roles_constants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdenums.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdtypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\string_table.h"
-				>
-			</File>
-			<File
-				RelativePath=".\timer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\timing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\u64.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llcommon/llcommon_vc9.vcproj b/linden/indra/llcommon/llcommon_vc9.vcproj
deleted file mode 100644
index 1ae534d..0000000
--- a/linden/indra/llcommon/llcommon_vc9.vcproj
+++ /dev/null
@@ -1,828 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llcommon"
-	ProjectGUID="{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"
-	RootNamespace="llcommon"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;XML_STATIC;APR_DECLARE_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcommon.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llcommon.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="psapi.lib"
-				OutputFile="$(OutDir)/llcommon.lib"
-				AdditionalLibraryDirectories=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llapp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llapr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llares.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llassettype.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase64.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcriticaldamp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llerror.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llerrorthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfindlocale.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfixedbuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llformat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llframetimer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llheartbeat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llindraconfigfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llliveappconfig.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllivefile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemorystream.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmetrics.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmortician.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprocessor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llqueuedthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrun.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsd.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize_xml.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsecondlifeurls.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstreamtools.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstringtable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsys.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltimer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluri.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworkerthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\metaclass.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\metaproperty.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\reflective.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\timing.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\u64.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\bitpack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\doublelinkedlist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\imageids.h"
-				>
-			</File>
-			<File
-				RelativePath=".\indra_constants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\linden_common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\linked_lists.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llapp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llapr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llares.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassettype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassoclist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llavatarconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase64.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llboost.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llchat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclickaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcriticaldamp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldarray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldarrayptr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldefs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldlinked.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldqueueptr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llendianswizzle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llenum.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llerror.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llerrorcontrol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llerrorthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llevent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llextendedstatus.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfindlocale.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfixedbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llformat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframecallbackmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframetimer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhash.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llindexedqueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llindraconfigfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllinkedqueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llliveappconfig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllivefile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllocalidhashmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllslconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemorystream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemtype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmetrics.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmortician.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnametable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreprocessor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpriqueuemap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprocessor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llptrskiplist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llptrskipmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llqueuedthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrun.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize_xml.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsecondlifeurls.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llskiplist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llskipmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatenums.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstreamtools.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstrider.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstringtable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsys.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltimer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluri.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluuidhashmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llversionserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llversionviewer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworkerthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\new_mem_ops.h"
-				>
-			</File>
-			<File
-				RelativePath=".\priqueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\processor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\roles_constants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdenums.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdtypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\string_table.h"
-				>
-			</File>
-			<File
-				RelativePath=".\timer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\timing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\u64.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llcommon/llcrc.cpp b/linden/indra/llcommon/llcrc.cpp
new file mode 100644
index 0000000..beb76d1
--- /dev/null
+++ b/linden/indra/llcommon/llcrc.cpp
@@ -0,0 +1,224 @@
+/** 
+ * @file llcrc.cpp
+ * @brief implementation of the crc class.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llcrc.h"
+#include "llerror.h"
+
+/* Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+   code or tables extracted from it, as desired without restriction.*/
+
+/* First, the polynomial itself and its table of feedback terms.  The  */
+/* polynomial is                                                       */
+/* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
+/* Note that we take it "backwards" and put the highest-order term in  */
+/* the lowest-order bit.  The X^32 term is "implied"; the LSB is the   */
+/* X^31 term, etc.  The X^0 term (usually shown as "+1") results in    */
+/* the MSB being 1.                                                    */
+
+/* Note that the usual hardware shift register implementation, which   */
+/* is what we're using (we're merely optimizing it by doing eight-bit  */
+/* chunks at a time) shifts bits into the lowest-order term.  In our   */
+/* implementation, that means shifting towards the right.  Why do we   */
+/* do it this way?  Because the calculated CRC must be transmitted in  */
+/* order from highest-order term to lowest-order term.  UARTs transmit */
+/* characters in order from LSB to MSB.  By storing the CRC this way,  */
+/* we hand it to the UART in the order low-byte to high-byte; the UART */
+/* sends each low-bit to hight-bit; and the result is transmission bit */
+/* by bit from highest- to lowest-order term without requiring any bit */
+/* shuffling on our part.  Reception works similarly.                  */
+
+/* The feedback terms table consists of 256, 32-bit entries.  Notes:   */
+/*                                                                     */
+/*  1. The table can be generated at runtime if desired; code to do so */
+/*     is shown later.  It might not be obvious, but the feedback      */
+/*     terms simply represent the results of eight shift/xor opera-    */
+/*     tions for all combinations of data and CRC register values.     */
+/*                                                                     */
+/*  2. The CRC accumulation logic is the same for all CRC polynomials, */
+/*     be they sixteen or thirty-two bits wide.  You simply choose the */
+/*     appropriate table.  Alternatively, because the table can be     */
+/*     generated at runtime, you can start by generating the table for */
+/*     the polynomial in question and use exactly the same "updcrc",   */
+/*     if your application needn't simultaneously handle two CRC       */
+/*     polynomials.  (Note, however, that XMODEM is strange.)          */
+/*                                                                     */
+/*  3. For 16-bit CRCs, the table entries need be only 16 bits wide;   */
+/*     of course, 32-bit entries work OK if the high 16 bits are zero. */
+/*                                                                     */
+/*  4. The values must be right-shifted by eight bits by the "updcrc"  */
+/*     logic; the shift must be unsigned (bring in zeroes).  On some   */
+/*     hardware you could probably optimize the shift in assembler by  */
+/*     using byte-swap instructions.                                   */
+
+///----------------------------------------------------------------------------
+/// Local function declarations, constants, enums, and typedefs
+///----------------------------------------------------------------------------
+
+#define UPDC32(octet,crc) (crc_32_tab[((crc) \
+ ^ ((U8)octet)) & 0xff] ^ ((crc) >> 8))
+
+
+static U32 crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
+0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+
+///----------------------------------------------------------------------------
+/// Class llcrc
+///----------------------------------------------------------------------------
+
+// Default constructor
+LLCRC::LLCRC() : mCurrent(0xffffffff)
+{
+}
+
+
+U32 LLCRC::getCRC() const
+{
+	return ~mCurrent;
+}
+
+void LLCRC::update(U8 next_byte)
+{
+	mCurrent = UPDC32(next_byte, mCurrent);
+}
+
+void LLCRC::update(const U8* buffer, size_t buffer_size)
+{
+	for (size_t i = 0; i < buffer_size; i++)
+	{
+		mCurrent = UPDC32(buffer[i], mCurrent);
+	}
+}
+
+void LLCRC::update(const std::string& filename)
+{
+	if (filename.empty())
+	{
+		llerrs << "No filename specified" << llendl;
+		return;
+	}
+
+	FILE* fp = LLFile::fopen(filename, "rb");		/* Flawfinder: ignore */
+
+	if (fp)
+	{
+		fseek(fp, 0, SEEK_END);
+		long size = ftell(fp);
+
+		fseek(fp, 0, SEEK_SET);
+
+		if (size > 0)
+		{
+			U8* data = new U8[size];
+			size_t nread;
+			
+			nread = fread(data, 1, size, fp);
+			fclose(fp);
+			
+			if (nread < (size_t) size)
+			{
+				llwarns << "Short read on " << filename << llendl;
+			}
+
+			update(data, nread);
+			delete[] data;
+		}
+	}
+}
+
+
+#ifdef _DEBUG
+BOOL LLCRC::testHarness()
+{
+	const S32 TEST_BUFFER_SIZE = 16;
+	const char TEST_BUFFER[TEST_BUFFER_SIZE] = "hello &#$)$&Nd0";	/* Flawfinder: ignore */
+	LLCRC c1, c2;
+	c1.update((U8*)TEST_BUFFER, TEST_BUFFER_SIZE - 1);
+	char* rh = (char*)TEST_BUFFER;
+	while(*rh != '\0')
+	{
+		c2.update(*rh);
+		++rh;
+	}
+	return(c1.getCRC() == c2.getCRC());
+}
+#endif
+
+
+
+///----------------------------------------------------------------------------
+/// Local function definitions
+///----------------------------------------------------------------------------
diff --git a/linden/indra/llcommon/llcrc.h b/linden/indra/llcommon/llcrc.h
new file mode 100644
index 0000000..20f214e
--- /dev/null
+++ b/linden/indra/llcommon/llcrc.h
@@ -0,0 +1,73 @@
+/** 
+ * @file llcrc.h
+ * @brief LLCRC class header file.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLCRC_H
+#define LL_LLCRC_H
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class llcrc
+//
+// Simple 32 bit crc. To use, instantiate an LLCRC instance and feed
+// it the bytes you want to check. It will update the internal crc as
+// you go, and you can qery it at the end. As a horribly inefficient
+// example (don't try this at work kids):
+//
+//  LLCRC crc;
+//  FILE* fp = LLFile::fopen(filename,"rb");
+//  while(!feof(fp)) {
+//    crc.update(fgetc(fp));
+//  }
+//  fclose(fp);
+//  llinfos << "File crc: " << crc.getCRC() << llendl;
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLCRC
+{
+protected:
+	U32 mCurrent;
+	
+public:
+	LLCRC();
+
+	U32 getCRC() const;
+	void update(U8 next_byte);
+	void update(const U8* buffer, size_t buffer_size);
+	void update(const std::string& filename);
+
+#ifdef _DEBUG
+	// This function runs tests to make sure the crc is
+	// working. Returns TRUE if it is.
+	static BOOL testHarness();
+#endif
+};
+
+
+#endif // LL_LLCRC_H
diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 45e564f..32ece4e 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -32,7 +32,6 @@
 #ifndef LL_LLDARRAY_H
 #define LL_LLDARRAY_H
 
-#include "llmath.h"
 #include "llerror.h"
 
 #include <vector>
diff --git a/linden/indra/llcommon/lldate.cpp b/linden/indra/llcommon/lldate.cpp
index 5d36d2b..a313246 100644
--- a/linden/indra/llcommon/lldate.cpp
+++ b/linden/indra/llcommon/lldate.cpp
@@ -34,7 +34,7 @@
 #include "linden_common.h"
 #include "lldate.h"
 
-#include "apr-1/apr_time.h"
+#include "apr_time.h"
 
 #include <iomanip>
 #include <sstream>
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index b74b288..5c7c3cd 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -102,7 +102,7 @@ namespace {
 	public:
 		RecordToFile(const std::string& filename)
 		{
-			mFile.open(filename.c_str(), llofstream::out | llofstream::app);
+			mFile.open(filename, llofstream::out | llofstream::app);
 			if (!mFile)
 			{
 				llinfos << "Error setting log file to " << filename << llendl;
@@ -168,7 +168,7 @@ namespace {
 	
 	private:
 		bool mTimestamp;
-		typedef enum ANSIState {ANSI_PROBE, ANSI_YES, ANSI_NO};
+		enum ANSIState {ANSI_PROBE, ANSI_YES, ANSI_NO};
 		ANSIState mUseANSI;
 		void colorANSI(const std::string color)
 		{
@@ -196,7 +196,7 @@ namespace {
 		virtual void recordMessage(LLError::ELevel level,
 									const std::string& message)
 		{
-			mBuffer.addLine(message.c_str());
+			mBuffer.addLine(message);
 		}
 	
 	private:
@@ -305,7 +305,7 @@ namespace
 		std::string file = dirBase + "logcontrol-dev.xml";
 		
 		llstat stat_info;
-		if (LLFile::stat(file.c_str(), &stat_info)) {
+		if (LLFile::stat(file, &stat_info)) {
 			// NB: stat returns non-zero if it can't read the file, for example
 			// if it doesn't exist.  LLFile has no better abstraction for 
 			// testing for file existence.
@@ -321,7 +321,7 @@ namespace
 		LLSD configuration;
 
 		{
-			llifstream file(filename().c_str());
+			llifstream file(filename());
 			if (file.is_open())
 			{
 				LLSDSerialize::fromXML(configuration, file);
@@ -1040,17 +1040,37 @@ namespace LLError
 					<< "(" << site.mLine << ") : ";
 		}
 		
-		if (message.find(functionName(site.mFunction)) == std::string::npos)
-		{
 	#if LL_WINDOWS
-			// DevStudio: __FUNCTION__ already includes the full class name
+		// DevStudio: __FUNCTION__ already includes the full class name
 	#else
-			if (site.mClassInfo != typeid(NoClassInfo))
+		if (site.mClassInfo != typeid(NoClassInfo))
+		{
+			prefix << className(site.mClassInfo) << "::";
+		}
+	#endif
+		prefix << site.mFunction << ": ";
+
+		if (site.mPrintOnce)
+		{
+			std::map<std::string, unsigned int>::iterator messageIter = s.uniqueLogMessages.find(message);
+			if (messageIter != s.uniqueLogMessages.end())
+			{
+				messageIter->second++;
+				unsigned int num_messages = messageIter->second;
+				if (num_messages == 10 || num_messages == 50 || (num_messages % 100) == 0)
+				{
+					prefix << "ONCE (" << num_messages << "th time seen): ";
+				} 
+				else
+				{
+					return;
+				}
+			}
+			else 
 			{
-				prefix << className(site.mClassInfo) << "::";
+				prefix << "ONCE: ";
+				s.uniqueLogMessages[message] = 1;
 			}
-	#endif
-			prefix << site.mFunction << ": ";
 		}
 
 		if (site.mPrintOnce)
diff --git a/linden/indra/llcommon/llevent.cpp b/linden/indra/llcommon/llevent.cpp
index 33af028..7d701a1 100644
--- a/linden/indra/llcommon/llevent.cpp
+++ b/linden/indra/llcommon/llevent.cpp
@@ -219,7 +219,7 @@ std::vector<LLListenerEntry> LLSimpleDispatcher::getListeners() const
 bool LLSimpleDispatcher::fireEvent(LLPointer<LLEvent> event, LLSD filter)
 {
 	std::vector<LLListenerEntry>::iterator itor;
-	LLString filter_string = filter.asString();
+	std::string filter_string = filter.asString();
 	for (itor=mListeners.begin(); itor!=mListeners.end(); ++itor)
 	{
 		LLListenerEntry& entry = *itor;
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index fc0d481..b32437f 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -32,6 +32,10 @@
  * $/LicenseInfo$
  */
 
+#if LL_WINDOWS
+#include <windows.h>
+#endif
+
 #include "linden_common.h"
 #include "llfile.h"
 #include "llstring.h"
@@ -40,7 +44,7 @@
 using namespace std;
 
 // static
-int	LLFile::mkdir(const	char* dirname, int perms)
+int	LLFile::mkdir(const std::string& dirname, int perms)
 {
 #if LL_WINDOWS	
 	// permissions are ignored on Windows
@@ -48,12 +52,12 @@ int	LLFile::mkdir(const	char* dirname, int perms)
 	llutf16string utf16dirname = utf8str_to_utf16str(utf8dirname);
 	return _wmkdir(utf16dirname.c_str());
 #else
-	return ::mkdir(dirname, (mode_t)perms);
+	return ::mkdir(dirname.c_str(), (mode_t)perms);
 #endif
 }
 
 // static
-int	LLFile::rmdir(const	char* dirname)
+int	LLFile::rmdir(const std::string& dirname)
 {
 #if LL_WINDOWS	
 	// permissions are ignored on Windows
@@ -61,29 +65,29 @@ int	LLFile::rmdir(const	char* dirname)
 	llutf16string utf16dirname = utf8str_to_utf16str(utf8dirname);
 	return _wrmdir(utf16dirname.c_str());
 #else
-	return ::rmdir(dirname);
+	return ::rmdir(dirname.c_str());
 #endif
 }
 
 // static
-LLFILE*	LLFile::fopen(const	char* filename, const char* mode)	/* Flawfinder: ignore */
+LLFILE*	LLFile::fopen(const std::string& filename, const char* mode)	/* Flawfinder: ignore */
 {
 #if	LL_WINDOWS
 	std::string utf8filename = filename;
-	std::string utf8mode = mode;
+	std::string utf8mode = std::string(mode);
 	llutf16string utf16filename = utf8str_to_utf16str(utf8filename);
 	llutf16string utf16mode = utf8str_to_utf16str(utf8mode);
 	return _wfopen(utf16filename.c_str(),utf16mode.c_str());
 #else
-	return ::fopen(filename,mode);	/* Flawfinder: ignore */
+	return ::fopen(filename.c_str(),mode);	/* Flawfinder: ignore */
 #endif
 }
 
-LLFILE*	LLFile::_fsopen(const char* filename, const char* mode, int sharingFlag)
+LLFILE*	LLFile::_fsopen(const std::string& filename, const char* mode, int sharingFlag)
 {
 #if	LL_WINDOWS
 	std::string utf8filename = filename;
-	std::string utf8mode = mode;
+	std::string utf8mode = std::string(mode);
 	llutf16string utf16filename = utf8str_to_utf16str(utf8filename);
 	llutf16string utf16mode = utf8str_to_utf16str(utf8mode);
 	return _wfsopen(utf16filename.c_str(),utf16mode.c_str(),sharingFlag);
@@ -93,18 +97,18 @@ LLFILE*	LLFile::_fsopen(const char* filename, const char* mode, int sharingFlag)
 #endif
 }
 
-int	LLFile::remove(const char* filename)
+int	LLFile::remove(const std::string& filename)
 {
 #if	LL_WINDOWS
 	std::string utf8filename = filename;
 	llutf16string utf16filename = utf8str_to_utf16str(utf8filename);
 	return _wremove(utf16filename.c_str());
 #else
-	return ::remove(filename);
+	return ::remove(filename.c_str());
 #endif
 }
 
-int	LLFile::rename(const char* filename, const char* newname)
+int	LLFile::rename(const std::string& filename, const std::string& newname)
 {
 #if	LL_WINDOWS
 	std::string utf8filename = filename;
@@ -113,19 +117,63 @@ int	LLFile::rename(const char* filename, const char* newname)
 	llutf16string utf16newname = utf8str_to_utf16str(utf8newname);
 	return _wrename(utf16filename.c_str(),utf16newname.c_str());
 #else
-	return ::rename(filename,newname);
+	return ::rename(filename.c_str(),newname.c_str());
 #endif
 }
 
-int	LLFile::stat(const char* filename, llstat* filestatus)
+int	LLFile::stat(const std::string& filename, llstat* filestatus)
 {
 #if LL_WINDOWS
 	std::string utf8filename = filename;
 	llutf16string utf16filename = utf8str_to_utf16str(utf8filename);
 	return _wstat(utf16filename.c_str(),filestatus);
 #else
-	return ::stat(filename,filestatus);
+	return ::stat(filename.c_str(),filestatus);
+#endif
+}
+
+bool LLFile::isdir(const std::string& filename)
+{
+	llstat st;
+	
+	return stat(filename, &st) == 0 && S_ISDIR(st.st_mode);
+}
+
+bool LLFile::isfile(const std::string& filename)
+{
+	llstat st;
+	
+	return stat(filename, &st) == 0 && S_ISREG(st.st_mode);
+}
+
+const char *LLFile::tmpdir()
+{
+	static std::string utf8path;
+
+	if (utf8path.empty())
+	{
+		char sep;
+#if LL_WINDOWS
+		sep = '\\';
+
+		DWORD len = GetTempPathW(0, L"");
+		llutf16string utf16path;
+		utf16path.resize(len + 1);
+		len = GetTempPathW(static_cast<DWORD>(utf16path.size()), &utf16path[0]);
+		utf8path = utf16str_to_utf8str(utf16path);
+#else
+		sep = '/';
+
+		char *env = getenv("TMPDIR");
+
+		utf8path = env ? env : "/tmp/";
 #endif
+		if (utf8path[utf8path.size() - 1] != sep)
+		{
+			utf8path += sep;
+		}
+	}
+	return utf8path.c_str();
 }
 
 
@@ -133,7 +181,7 @@ int	LLFile::stat(const char* filename, llstat* filestatus)
 
 #if USE_LLFILESTREAMS
 
-LLFILE *	LLFile::_Fiopen(const char *filename, std::ios::openmode mode,int)	// protection currently unused
+LLFILE *	LLFile::_Fiopen(const std::string& filename, std::ios::openmode mode,int)	// protection currently unused
 {	// open a file
 	static const char *mods[] =
 	{	// fopen mode strings corresponding to valid[i]
@@ -202,7 +250,7 @@ void llifstream::close()
 	}
 }
 
-void llifstream::open(const char* _Filename,	/* Flawfinder: ignore */
+void llifstream::open(const std::string& _Filename,	/* Flawfinder: ignore */
 	ios_base::openmode _Mode,
 	int _Prot)
 {	// open a C stream with specified mode
@@ -234,7 +282,7 @@ llifstream::~llifstream()
 	delete _Filebuffer;
 }
 
-llifstream::llifstream(const char *_Filename,
+llifstream::llifstream(const std::string& _Filename,
 	ios_base::openmode _Mode,
 	int _Prot)
 	: std::basic_istream< char , std::char_traits< char > >(NULL,true),_Filebuffer(NULL),_ShouldClose(false)
@@ -253,7 +301,7 @@ bool llofstream::is_open() const
 	return false;
 }
 
-void llofstream::open(const char* _Filename,	/* Flawfinder: ignore */
+void llofstream::open(const std::string& _Filename,	/* Flawfinder: ignore */
 	ios_base::openmode _Mode,
 	int _Prot)	
 {	// open a C stream with specified mode
@@ -279,7 +327,7 @@ void llofstream::close()
 	}
 }
 
-llofstream::llofstream(const char *_Filename,
+llofstream::llofstream(const std::string& _Filename,
 	std::ios_base::openmode _Mode,
 	int _Prot) 
 		: std::basic_ostream<char,std::char_traits < char > >(NULL,true),_Filebuffer(NULL),_ShouldClose(false)
diff --git a/linden/indra/llcommon/llfile.h b/linden/indra/llcommon/llfile.h
index 189edbf..f3e3af5 100644
--- a/linden/indra/llcommon/llfile.h
+++ b/linden/indra/llcommon/llfile.h
@@ -50,31 +50,45 @@ typedef FILE	LLFILE;
 #define	USE_LLFILESTREAMS	0
 #endif
 
+#include <sys/stat.h>
 
 #if LL_WINDOWS
 // windows version of stat function and stat data structure are called _stat
 typedef struct _stat	llstat;
 #else
-#include <sys/stat.h>
 typedef struct stat		llstat;
 #endif
 
+#ifndef S_ISREG
+# define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
+#endif
+
+#ifndef S_ISDIR
+# define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR)
+#endif
+
+#include "llstring.h" // safe char* -> std::string conversion
+
 class	LLFile
 {
 public:
 	// All these functions take UTF8 path/filenames.
-	static	LLFILE*	fopen(const char* filename,const char* accessmode);	/* Flawfinder: ignore */
-	static	LLFILE*	_fsopen(const char* filename,const char* accessmode,int	sharingFlag);
+	static	LLFILE*	fopen(const std::string& filename,const char* accessmode);	/* Flawfinder: ignore */
+	static	LLFILE*	_fsopen(const std::string& filename,const char* accessmode,int	sharingFlag);
 
 	// perms is a permissions mask like 0777 or 0700.  In most cases it will
 	// be overridden by the user's umask.  It is ignored on Windows.
-	static	int		mkdir(const char* filename, int perms = 0700);
+	static	int		mkdir(const std::string& filename, int perms = 0700);
 
-	static	int		rmdir(const char* filename);
-	static	int		remove(const char* filename);
-	static	int		rename(const char* filename,const char*	newname);
-	static	int		stat(const char*	filename,llstat*	file_status);
-	static	LLFILE *	_Fiopen(const char *filename, std::ios::openmode mode,int);	// protection currently unused
+	static	int		rmdir(const std::string& filename);
+	static	int		remove(const std::string& filename);
+	static	int		rename(const std::string& filename,const std::string&	newname);
+	static	int		stat(const std::string&	filename,llstat*	file_status);
+	static	bool	isdir(const std::string&	filename);
+	static	bool	isfile(const std::string&	filename);
+	static	LLFILE *	_Fiopen(const std::string& filename, std::ios::openmode mode,int);	// protection currently unused
+
+	static  const char * tmpdir();
 };
 
 
@@ -93,7 +107,7 @@ public:
 	{	// construct unopened
 	}
 
-	explicit llifstream(const char *_Filename,
+	explicit llifstream(const std::string& _Filename,
 		ios_base::openmode _Mode = ios_base::in,
 		int _Prot = (int)ios_base::_Openprot);
 
@@ -110,7 +124,7 @@ public:
 		return _Filebuffer;
 	}
 	bool is_open() const;
-	void open(const char* _Filename,	/* Flawfinder: ignore */
+	void open(const std::string& _Filename,	/* Flawfinder: ignore */
 		ios_base::openmode _Mode = ios_base::in,
 		int _Prot = (int)ios_base::_Openprot);	
 	void close();
@@ -133,7 +147,7 @@ public:
 	{	// construct unopened
 	}
 
-	explicit llofstream(const char *_Filename,
+	explicit llofstream(const std::string& _Filename,
 		std::ios_base::openmode _Mode = ios_base::out,
 		int _Prot = (int)std::ios_base::_Openprot);
 	
@@ -154,7 +168,7 @@ public:
 
 	bool is_open() const;
 
-	void open(const char *_Filename,ios_base::openmode _Mode = ios_base::out,int _Prot = (int)ios_base::_Openprot);	/* Flawfinder: ignore */
+	void open(const std::string& _Filename,ios_base::openmode _Mode = ios_base::out,int _Prot = (int)ios_base::_Openprot);	/* Flawfinder: ignore */
 
 	void close();
 
@@ -167,8 +181,45 @@ private:
 
 #else
 //Use standard file streams on non windows platforms
-#define	llifstream	std::ifstream
-#define	llofstream	std::ofstream
+//#define	llifstream	std::ifstream
+//#define	llofstream	std::ofstream
+
+class	llifstream	:	public	std::ifstream
+{
+public:
+	llifstream() : std::ifstream()
+	{
+	}
+
+	explicit llifstream(const std::string& _Filename, std::_Ios_Openmode _Mode = in)
+		: std::ifstream(_Filename.c_str(), _Mode)
+	{
+	}
+	void open(const std::string& _Filename, std::_Ios_Openmode _Mode = in)	/* Flawfinder: ignore */
+	{
+		std::ifstream::open(_Filename.c_str(), _Mode);
+	}
+};
+
+
+class	llofstream	:	public	std::ofstream
+{
+public:
+	llofstream() : std::ofstream()
+	{
+	}
+
+	explicit llofstream(const std::string& _Filename, std::_Ios_Openmode _Mode = out)
+		: std::ofstream(_Filename.c_str(), _Mode)
+	{
+	}
+
+	void open(const std::string& _Filename, std::_Ios_Openmode _Mode = out)	/* Flawfinder: ignore */
+	{
+		std::ofstream::open(_Filename.c_str(), _Mode);
+	}
+
+};
 
 #endif
 
diff --git a/linden/indra/llcommon/llfixedbuffer.cpp b/linden/indra/llcommon/llfixedbuffer.cpp
index 776de0d..a3ebae1 100644
--- a/linden/indra/llcommon/llfixedbuffer.cpp
+++ b/linden/indra/llcommon/llfixedbuffer.cpp
@@ -54,7 +54,7 @@ void LLFixedBuffer::clear()
 }
 
 
-void LLFixedBuffer::addLine(const LLString& utf8line)
+void LLFixedBuffer::addLine(const std::string& utf8line)
 {
 	LLWString wstring = utf8str_to_wstring(utf8line);
 	LLFixedBuffer::addLine(wstring);
diff --git a/linden/indra/llcommon/llfixedbuffer.h b/linden/indra/llcommon/llfixedbuffer.h
index 06a7f45..1641bee 100644
--- a/linden/indra/llcommon/llfixedbuffer.h
+++ b/linden/indra/llcommon/llfixedbuffer.h
@@ -52,7 +52,7 @@ public:
 	std::deque<S32>			mLineLengths;
 
 	void clear(); // Clear the buffer, and reset it.
-	virtual void addLine(const LLString& utf8line);
+	virtual void addLine(const std::string& utf8line);
 	virtual void addLine(const LLWString& line);
 
 	// Get lines currently in the buffer, up to max_size chars, max_length lines
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index 96e5014..e4e8a18 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -53,7 +53,6 @@ void LLFrameTimer::updateFrameTime()
 	sTotalTime = total_time;
 	sTotalSeconds = U64_to_F64(sTotalTime) * USEC_TO_SEC_F64;
 	sFrameTime = U64_to_F64(sTotalTime - sStartTotalTime) * USEC_TO_SEC_F64;
-	sFrameCount++;
 } 
 
 void LLFrameTimer::start()
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index 11c4cfc..d13018f 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -67,10 +67,14 @@ public:
 		return sTotalSeconds;
 	}
 
-	// Call this method once per frame to update the current frame time.
+	// Call this method once per frame to update the current frame time.   This is actually called
+	// at some other times as well
 	static void updateFrameTime();
 
-	static S32  getFrameCount()						{ return sFrameCount; }
+	// Call this method once, and only once, per frame to update the current frame count.
+	static void updateFrameCount()					{ sFrameCount++; }
+
+	static U32  getFrameCount()						{ return sFrameCount; }
 
 	static F32	getFrameDeltaTimeF32();
 
diff --git a/linden/indra/llcommon/llhash.h b/linden/indra/llcommon/llhash.h
index 716d9df..e259a11 100644
--- a/linden/indra/llcommon/llhash.h
+++ b/linden/indra/llcommon/llhash.h
@@ -38,7 +38,9 @@
 #include <hash_map>
 #include <algorithm>
 #elif LL_DARWIN || LL_LINUX
-#  if GCC_VERSION >= 30400 // gcc 3.4 and up
+#  if GCC_VERSION >= 40300 // gcc 4.3 and up
+#    include <backward/hashtable.h>
+#  elif GCC_VERSION >= 30400 // gcc 3.4 and up
 #    include <ext/hashtable.h>
 #  elif __GNUC__ >= 3
 #    include <ext/stl_hashtable.h>
diff --git a/linden/indra/llcommon/llheartbeat.cpp b/linden/indra/llcommon/llheartbeat.cpp
index 13bcd46..b67d3f2 100644
--- a/linden/indra/llcommon/llheartbeat.cpp
+++ b/linden/indra/llcommon/llheartbeat.cpp
@@ -72,8 +72,13 @@ LLHeartbeat::rawSend()
 	if (mSuppressed)
 		return 0; // Pretend we succeeded.
 
+	int result;
+#ifndef LL_DARWIN
 	union sigval dummy;
-	int result = sigqueue(getppid(), LL_HEARTBEAT_SIGNAL, dummy);
+	result = sigqueue(getppid(), LL_HEARTBEAT_SIGNAL, dummy);
+#else
+	result = kill(getppid(), LL_HEARTBEAT_SIGNAL);
+#endif
 	if (result == 0)
 		return 0; // success
 
diff --git a/linden/indra/llcommon/llindraconfigfile.cpp b/linden/indra/llcommon/llindraconfigfile.cpp
index 7ef1a9b..60b498d 100644
--- a/linden/indra/llcommon/llindraconfigfile.cpp
+++ b/linden/indra/llcommon/llindraconfigfile.cpp
@@ -81,7 +81,7 @@ void LLIndraConfigFile::loadFile()
     LLSD config;
 
     {
-        llifstream file(filename().c_str());
+        llifstream file(filename());
         if (file.is_open())
         {
             LLSDSerialize::fromXML(config, file);
diff --git a/linden/indra/llcommon/llkeythrottle.h b/linden/indra/llcommon/llkeythrottle.h
index 8314269..eb1519a 100644
--- a/linden/indra/llcommon/llkeythrottle.h
+++ b/linden/indra/llcommon/llkeythrottle.h
@@ -55,33 +55,40 @@ class LLKeyThrottleImpl
 protected:
 	struct Entry {
 		U32		count;
-		BOOL	blocked;
+		bool	blocked;
 
-		Entry() : count(0), blocked(FALSE) { }
+		Entry() : count(0), blocked(false) { }
 	};
 
 	typedef std::map<T, Entry> EntryMap;
 
-	EntryMap * prevMap;
-	EntryMap * currMap;
+	EntryMap* prevMap;
+	EntryMap* currMap;
 	
 	U32 countLimit;
 		// maximum number of keys allowed per interval
 		
-	U64 interval_usec;
-		// each map covers this time period
-	U64 start_usec;
+	U64 intervalLength;		// each map covers this time period (usec or frame number)
+	U64 startTime;			// start of the time period (usec or frame number)
 		// currMap started counting at this time
 		// prevMap covers the previous interval
 	
-	LLKeyThrottleImpl() : prevMap(0), currMap(0),
-			      countLimit(0), interval_usec(0),
-			      start_usec(0) { };
+	LLKeyThrottleImpl() :
+		prevMap(NULL),
+		currMap(NULL),
+		countLimit(0),
+		intervalLength(1),
+		startTime(0)
+	{}
 
 	static U64 getTime()
 	{
 		return LLFrameTimer::getTotalTime();
 	}
+	static U64 getFrame()		// Return the current frame number
+	{
+		return (U64) LLFrameTimer::getFrameCount();
+	}
 };
 
 
@@ -89,17 +96,12 @@ template< class T >
 class LLKeyThrottle
 {
 public:
-	LLKeyThrottle(U32 limit, F32 interval)
+	// @param realtime = FALSE for frame-based throttle, TRUE for usec
+	// real-time throttle
+	LLKeyThrottle(U32 limit, F32 interval, BOOL realtime = TRUE)	
 		: m(* new LLKeyThrottleImpl<T>)
 	{
-		// limit is the maximum number of keys
-		// allowed per interval (in seconds)
-		m.countLimit = limit;
-		m.interval_usec = (U64)(interval * USEC_PER_SEC);
-		m.start_usec = LLKeyThrottleImpl<T>::getTime();
-
-		m.prevMap = new typename LLKeyThrottleImpl<T>::EntryMap;
-		m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+		setParameters( limit, interval, realtime );
 	}
 		
 	~LLKeyThrottle()
@@ -118,18 +120,26 @@ public:
 	// call each time the key wants use
 	State noteAction(const T& id, S32 weight = 1)
 	{
-		U64 now = LLKeyThrottleImpl<T>::getTime();
+		U64 now = 0;
+		if ( mIsRealtime )
+		{
+			now = LLKeyThrottleImpl<T>::getTime();
+		}
+		else
+		{
+			now = LLKeyThrottleImpl<T>::getFrame();
+		}
 
-		if (now >= (m.start_usec + m.interval_usec))
+		if (now >= (m.startTime + m.intervalLength))
 		{
-			if (now < (m.start_usec + 2 * m.interval_usec))
+			if (now < (m.startTime + 2 * m.intervalLength))
 			{
 				// prune old data
 				delete m.prevMap;
 				m.prevMap = m.currMap;
 				m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
 
-				m.start_usec += m.interval_usec;
+				m.startTime += m.intervalLength;
 			}
 			else
 			{
@@ -139,12 +149,12 @@ public:
 				m.prevMap = new typename LLKeyThrottleImpl<T>::EntryMap;
 				m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
 
-				m.start_usec = now;
+				m.startTime = now;
 			}
 		}
 
 		U32 prevCount = 0;
-		BOOL prevBlocked = FALSE;
+		bool prevBlocked = false;
 
 		typename LLKeyThrottleImpl<T>::EntryMap::const_iterator prev = m.prevMap->find(id);
 		if (prev != m.prevMap->end())
@@ -166,7 +176,7 @@ public:
 		// (now) time.
 
 		// compute current, windowed rate
-		F64 timeInCurrent = ((F64)(now - m.start_usec) / m.interval_usec);
+		F64 timeInCurrent = ((F64)(now - m.startTime) / m.intervalLength);
 		F64 averageCount = curr.count + prevCount * (1.0 - timeInCurrent);
 		
 		curr.blocked |= averageCount > m.countLimit;
@@ -193,17 +203,17 @@ public:
 		noteAction(id);
 		typename LLKeyThrottleImpl<T>::Entry& curr = (*m.currMap)[id];
 		curr.count = llmax(m.countLimit, curr.count);
-		curr.blocked = TRUE;
+		curr.blocked = true;
 	}
 
-	// returns TRUE if key is blocked
-	BOOL isThrottled(const T& id) const
+	// returns true if key is blocked
+	bool isThrottled(const T& id) const
 	{
 		if (m.currMap->empty()
 			&& m.prevMap->empty())
 		{
 			// most of the time we'll fall in here
-			return FALSE;
+			return false;
 		}
 
 		// NOTE, we ignore the case where id is in the map but the map is stale.  
@@ -221,11 +231,49 @@ public:
 		{
 			return entry->second.blocked;
 		}
-		return FALSE;
+		return false;
+	}
+
+	// Get the throttling parameters
+	void getParameters( U32 & out_limit, F32 & out_interval, BOOL & out_realtime )
+	{
+		out_limit = m.countLimit;
+		out_interval = m.intervalLength;
+		out_realtime = mIsRealtime;
+	}
+
+	// Set the throttling behavior
+	void setParameters( U32 limit, F32 interval, BOOL realtime )
+	{
+		// limit is the maximum number of keys
+		// allowed per interval (in seconds or frames)
+		mIsRealtime = realtime;
+		m.countLimit = limit;
+		if ( mIsRealtime )
+		{
+			m.intervalLength = (U64)(interval * USEC_PER_SEC);
+			m.startTime = LLKeyThrottleImpl<T>::getTime();
+		}
+		else
+		{
+			m.intervalLength = (U64)interval;
+			m.startTime = LLKeyThrottleImpl<T>::getFrame();
+		}
+
+		if ( m.intervalLength == 0 )
+		{	// Don't allow zero intervals
+			m.intervalLength = 1;
+		}
+
+		delete m.prevMap;
+		m.prevMap = new typename LLKeyThrottleImpl<T>::EntryMap;
+		delete m.currMap;
+		m.currMap = new typename LLKeyThrottleImpl<T>::EntryMap;
 	}
 
 protected:
 	LLKeyThrottleImpl<T>& m;
+	BOOL	mIsRealtime;	// TRUE to be time based (default), FALSE for frame based
 };
 
 #endif
diff --git a/linden/indra/llcommon/llliveappconfig.cpp b/linden/indra/llcommon/llliveappconfig.cpp
index ad11987..a11f5b0 100644
--- a/linden/indra/llcommon/llliveappconfig.cpp
+++ b/linden/indra/llcommon/llliveappconfig.cpp
@@ -51,7 +51,7 @@ void LLLiveAppConfig::loadFile()
 {
 	llinfos << "LLLiveAppConfig::loadFile(): reading from "
 		<< filename() << llendl;
-    llifstream file(filename().c_str());
+    llifstream file(filename());
 	LLSD config;
     if (file.is_open())
     {
diff --git a/linden/indra/llcommon/lllivefile.cpp b/linden/indra/llcommon/lllivefile.cpp
index 6e027ef..8ac6bb4 100644
--- a/linden/indra/llcommon/lllivefile.cpp
+++ b/linden/indra/llcommon/lllivefile.cpp
@@ -93,7 +93,7 @@ bool LLLiveFile::Impl::check()
 
 	// Stat the file to see if it exists and when it was last modified.
 	llstat stat_data;
-	int res = LLFile::stat(mFilename.c_str(), &stat_data);
+	int res = LLFile::stat(mFilename, &stat_data);
 
 	if (res)
 	{
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index 508fb42..24120a2 100644
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -126,6 +126,9 @@ const S32 LSL_PRIM_SCULPT_TYPE_SPHERE   = 1;
 const S32 LSL_PRIM_SCULPT_TYPE_TORUS    = 2;
 const S32 LSL_PRIM_SCULPT_TYPE_PLANE    = 3;
 const S32 LSL_PRIM_SCULPT_TYPE_CYLINDER = 4;
+const S32 LSL_PRIM_SCULPT_TYPE_MASK     = 7;
+const S32 LSL_PRIM_SCULPT_FLAG_INVERT   = 64;
+const S32 LSL_PRIM_SCULPT_FLAG_MIRROR   = 128;
 
 const S32 LSL_ALL_SIDES				= -1;
 const S32 LSL_LINK_ROOT				= 1;
@@ -181,4 +184,7 @@ const S32 OBJECT_OWNER = 6;
 const S32 OBJECT_GROUP = 7;
 const S32 OBJECT_CREATOR = 8;
 
+// llTextBox() magic token string - yes this is a hack.  sue me.
+const std::string TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!";
+
 #endif
diff --git a/linden/indra/llcommon/llmd5.cpp b/linden/indra/llcommon/llmd5.cpp
new file mode 100644
index 0000000..a0ac92f
--- /dev/null
+++ b/linden/indra/llcommon/llmd5.cpp
@@ -0,0 +1,531 @@
+/** 
+ * @file llmd5.cpp
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// llMD5.CC - source code for the C++/object oriented translation and 
+//          modification of MD5.
+//
+// Adapted to Linden Lab by Frank Filipanits, 6/25/2002
+// Fixed potential memory leak, James Cook, 6/27/2002
+
+// Translation and modification (c) 1995 by Mordechai T. Abzug 
+
+// This translation/ modification is provided "as is," without express or 
+// implied warranty of any kind.
+
+// The translator/ modifier does not claim (1) that MD5 will do what you think 
+// it does; (2) that this translation/ modification is accurate; or (3) that 
+// this software is "merchantible."  (Language for this disclaimer partially 
+// copied from the disclaimer below).
+
+/* based on:
+
+   MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+   MDDRIVER.C - test driver for MD2, MD4 and MD5
+
+
+   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+
+ */
+
+
+
+
+
+#include "linden_common.h"
+
+#include "llmd5.h"
+
+#include <cassert>
+
+// how many bytes to grab at a time when checking files
+const int LLMD5::BLOCK_LEN = 4096;
+
+
+// LLMD5 simple initialization method
+
+LLMD5::LLMD5()
+{
+  init();
+}
+
+
+
+
+// MD5 block update operation. Continues an MD5 message-digest
+// operation, processing another message block, and updating the
+// context.
+
+void LLMD5::update (const uint1 *input, const uint4 input_length) {
+
+  uint4 input_index, buffer_index;
+  uint4 buffer_space;                // how much space is left in buffer
+
+  if (finalized){  // so we can't update!
+	  std::cerr << "LLMD5::update:  Can't update a finalized digest!" << std::endl;
+    return;
+  }
+
+  // Compute number of bytes mod 64
+  buffer_index = (unsigned int)((count[0] >> 3) & 0x3F);
+
+  // Update number of bits
+  if (  (count[0] += ((uint4) input_length << 3))<((uint4) input_length << 3) )
+    count[1]++;
+
+  count[1] += ((uint4)input_length >> 29);
+
+
+  buffer_space = 64 - buffer_index;  // how much space is left in buffer
+
+  // Transform as many times as possible.
+  if (input_length >= buffer_space) { // ie. we have enough to fill the buffer
+    // fill the rest of the buffer and transform
+    memcpy(	/* Flawfinder: ignore */
+		buffer + buffer_index,
+		input,
+		buffer_space);
+    transform (buffer);
+
+    // now, transform each 64-byte piece of the input, bypassing the buffer
+  if (input == NULL || input_length == 0){
+	std::cerr << "LLMD5::update:  Invalid input!" << std::endl;
+	return;
+  }
+
+    for (input_index = buffer_space; input_index + 63 < input_length; 
+	 input_index += 64)
+      transform (input+input_index);
+
+    buffer_index = 0;  // so we can buffer remaining
+  }
+  else
+    input_index=0;     // so we can buffer the whole input
+
+
+  // and here we do the buffering:
+  memcpy(buffer+buffer_index, input+input_index, input_length-input_index);		/* Flawfinder: ignore */
+}
+
+
+
+// MD5 update for files.
+// Like above, except that it works on files (and uses above as a primitive.)
+
+void LLMD5::update(FILE* file){
+
+  unsigned char buffer[BLOCK_LEN];		/* Flawfinder: ignore */
+  int len;
+
+  while ( (len=(int)fread(buffer, 1, BLOCK_LEN, file)) )
+    update(buffer, len);
+
+  fclose (file);
+
+}
+
+
+
+
+
+
+// MD5 update for istreams.
+// Like update for files; see above.
+
+void LLMD5::update(std::istream& stream){
+
+  unsigned char buffer[BLOCK_LEN];		/* Flawfinder: ignore */
+  int len;
+
+  while (stream.good()){
+    stream.read( (char*)buffer, BLOCK_LEN); 	/* Flawfinder: ignore */		// note that return value of read is unusable.
+    len=stream.gcount();
+    update(buffer, len);
+  }
+
+}
+
+
+
+
+
+// MD5 finalization. Ends an MD5 message-digest operation, writing the
+// the message digest and zeroizing the context.
+
+
+void LLMD5::finalize (){
+
+  unsigned char bits[8];		/* Flawfinder: ignore */
+  unsigned int index, padLen;
+  static uint1 PADDING[64]={
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+
+  if (finalized){
+    std::cerr << "LLMD5::finalize:  Already finalized this digest!" << std::endl;
+    return;
+  }
+
+  // Save number of bits
+  encode (bits, count, 8);
+
+  // Pad out to 56 mod 64.
+  index = (uint4) ((count[0] >> 3) & 0x3f);
+  padLen = (index < 56) ? (56 - index) : (120 - index);
+  update (PADDING, padLen);
+
+  // Append length (before padding)
+  update (bits, 8);
+
+  // Store state in digest
+  encode (digest, state, 16);
+
+  // Zeroize sensitive information
+  memset (buffer, 0, sizeof(*buffer));
+
+  finalized=1;
+
+}
+
+
+
+
+LLMD5::LLMD5(FILE *file){
+
+  init();  // must be called be all constructors
+  update(file);
+  finalize ();
+}
+
+
+
+
+LLMD5::LLMD5(std::istream& stream){
+
+  init();  // must called by all constructors
+  update (stream);
+  finalize();
+}
+
+// Digest a string of the format ("%s:%i" % (s, number))
+LLMD5::LLMD5(const unsigned char *string, const unsigned int number)
+{
+	const char *colon = ":";
+	char tbuf[16];		/* Flawfinder: ignore */
+	init();
+	update(string, (U32)strlen((const char *) string));		/* Flawfinder: ignore */
+	update((const unsigned char *) colon, (U32)strlen(colon));		/* Flawfinder: ignore */
+	snprintf(tbuf, sizeof(tbuf), "%i", number);	/* Flawfinder: ignore */
+	update((const unsigned char *) tbuf, (U32)strlen(tbuf));	/* Flawfinder: ignore */
+	finalize();
+}
+
+// Digest a string
+LLMD5::LLMD5(const unsigned char *s)
+{
+	init();
+	update(s, (U32)strlen((const char *) s));		/* Flawfinder: ignore */
+	finalize();
+}
+
+void LLMD5::raw_digest(unsigned char *s)
+{
+	if (!finalized)
+	{
+		std::cerr << "LLMD5::raw_digest:  Can't get digest if you haven't "<<
+			"finalized the digest!" << std::endl;
+		s[0] = '\0';
+		return;
+	}
+
+	memcpy(s, digest, 16);		/* Flawfinder: ignore */
+	return;
+}
+
+
+
+void LLMD5::hex_digest(char *s)
+{
+	int i;
+
+	if (!finalized)
+	{
+		std::cerr << "LLMD5::hex_digest:  Can't get digest if you haven't "<<
+		  "finalized the digest!" <<std::endl;
+		s[0] = '\0';
+		return;
+	}
+
+	for (i=0; i<16; i++)
+	{
+		sprintf(s+i*2, "%02x", digest[i]);		/* Flawfinder: ignore */
+	}
+
+	s[32]='\0';
+
+	return;
+}
+
+
+
+
+
+std::ostream& operator<<(std::ostream &stream, LLMD5 context)
+{
+	char s[33];		/* Flawfinder: ignore */
+	context.hex_digest(s);
+	stream << s;
+	return stream;
+}
+
+
+
+
+// PRIVATE METHODS:
+
+
+
+void LLMD5::init(){
+  finalized=0;  // we just started!
+
+  // Nothing counted, so count=0
+  count[0] = 0;
+  count[1] = 0;
+
+  // Load magic initialization constants.
+  state[0] = 0x67452301;
+  state[1] = 0xefcdab89;
+  state[2] = 0x98badcfe;
+  state[3] = 0x10325476;
+}
+
+
+
+// Constants for MD5Transform routine.
+// Although we could use C++ style constants, defines are actually better,
+// since they let us easily evade scope clashes.
+
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+// #defines are faster then inline, etc because the compiler is not required to inline.
+// Timing tests prove that this works ~40% faster on win with msvc++2k3 over using static inline.
+
+/* F, G, H and I are basic MD5 functions.
+ */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits.
+ */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+Rotation is separate from addition to prevent recomputation.
+ */
+#define FF(a, b, c, d, x, s, ac) { \
+ (a) += F ((b), (c), (d)) + (x) + (U32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) { \
+ (a) += G ((b), (c), (d)) + (x) + (U32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) { \
+ (a) += H ((b), (c), (d)) + (x) + (U32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) { \
+ (a) += I ((b), (c), (d)) + (x) + (U32)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+  }
+
+
+
+// LLMD5 basic transformation. Transforms state based on block.
+void LLMD5::transform (const U8 block[64]){
+
+  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+  decode (x, block, 64);
+
+  assert(!finalized);  // not just a user error, since the method is private
+
+  /* Round 1 */
+  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+ /* Round 2 */
+  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
+  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+  /* Round 3 */
+  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
+  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+  /* Round 4 */
+  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
+  state[0] += a;
+  state[1] += b;
+  state[2] += c;
+  state[3] += d;
+
+  // Zeroize sensitive information.
+  memset ( (uint1 *) x, 0, sizeof(x));
+
+}
+
+
+
+// Encodes input (UINT4) into output (unsigned char). Assumes len is
+// a multiple of 4.
+void LLMD5::encode (uint1 *output, const uint4 *input, const uint4 len) {
+
+  unsigned int i, j;
+
+  for (i = 0, j = 0; j < len; i++, j += 4) {
+    output[j]   = (uint1)  (input[i] & 0xff);
+    output[j+1] = (uint1) ((input[i] >> 8) & 0xff);
+    output[j+2] = (uint1) ((input[i] >> 16) & 0xff);
+    output[j+3] = (uint1) ((input[i] >> 24) & 0xff);
+  }
+}
+
+
+
+
+// Decodes input (unsigned char) into output (UINT4). Assumes len is
+// a multiple of 4.
+void LLMD5::decode (uint4 *output, const uint1 *input, const uint4 len){
+
+  unsigned int i, j;
+
+  for (i = 0, j = 0; j < len; i++, j += 4)
+    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
+      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
+}
diff --git a/linden/indra/llcommon/llmd5.h b/linden/indra/llcommon/llmd5.h
new file mode 100644
index 0000000..6d21b31
--- /dev/null
+++ b/linden/indra/llcommon/llmd5.h
@@ -0,0 +1,133 @@
+/** 
+ * @file llmd5.h
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLMD5_H
+#define LL_LLMD5_H
+
+// LLMD5.CC - source code for the C++/object oriented translation and 
+//          modification of MD5.
+
+// Translation and modification (c) 1995 by Mordechai T. Abzug 
+
+// This translation/ modification is provided "as is," without express or 
+// implied warranty of any kind.
+
+// The translator/ modifier does not claim (1) that MD5 will do what you think 
+// it does; (2) that this translation/ modification is accurate; or (3) that 
+// this software is "merchantible."  (Language for this disclaimer partially 
+// copied from the disclaimer below).
+
+/* based on:
+
+   MD5.H - header file for MD5C.C
+   MDDRIVER.C - test driver for MD2, MD4 and MD5
+
+   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+
+*/
+
+// use for the raw digest output
+const int MD5RAW_BYTES = 16;
+
+// use for outputting hex digests
+const int MD5HEX_STR_SIZE = 33;  // char hex[MD5HEX_STR_SIZE]; with null
+const int MD5HEX_STR_BYTES = 32; // message system fixed size
+
+class LLMD5 {
+// first, some types:
+  typedef unsigned       int uint4; // assumes integer is 4 words long
+  typedef unsigned short int uint2; // assumes short integer is 2 words long
+  typedef unsigned      char uint1; // assumes char is 1 word long
+
+// how many bytes to grab at a time when checking files
+  static const int BLOCK_LEN;
+
+public:
+// methods for controlled operation:
+  LLMD5              ();  // simple initializer
+  void  update     (const uint1 *input, const uint4 input_length);
+  void  update     (std::istream& stream);
+  void  update     (FILE *file);
+  void  finalize   ();
+
+// constructors for special circumstances.  All these constructors finalize
+// the MD5 context.
+  LLMD5              (const unsigned char *string); // digest string, finalize
+  LLMD5              (std::istream& stream);       // digest stream, finalize
+  LLMD5              (FILE *file);            // digest file, close, finalize
+  LLMD5              (const unsigned char *string, const unsigned int number);
+  
+// methods to acquire finalized result
+  void				raw_digest(unsigned char *array);	// provide 16-byte array for binary data
+  void				hex_digest(char *string);			// provide 33-byte array for ascii-hex string
+  friend std::ostream&   operator<< (std::ostream&, LLMD5 context);
+
+
+
+private:
+
+
+// next, the private data:
+  uint4 state[4];
+  uint4 count[2];     // number of *bits*, mod 2^64
+  uint1 buffer[64];   // input buffer
+  uint1 digest[16];
+  uint1 finalized;
+
+// last, the private methods, mostly static:
+  void init             ();               // called by all constructors
+  void transform        (const uint1 *buffer);  // does the real update work.  Note 
+                                          // that length is implied to be 64.
+
+  static void encode    (uint1 *dest, const uint4 *src, const uint4 length);
+  static void decode    (uint4 *dest, const uint1 *src, const uint4 length);
+
+};
+
+#endif // LL_LLMD5_H
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index 9b6f893..3fec50f 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -335,7 +335,6 @@ U64 getCurrentRSS()
 U64 getCurrentRSS()
 {
 	U64 residentSize = 0;
-
 	task_basic_info_data_t basicInfo;
 	mach_msg_type_number_t  basicInfoCount = TASK_BASIC_INFO_COUNT;
 	if (task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&basicInfo, &basicInfoCount) == KERN_SUCCESS)
diff --git a/linden/indra/llcommon/llmemtype.h b/linden/indra/llcommon/llmemtype.h
index 4a4702b..bd80930 100644
--- a/linden/indra/llcommon/llmemtype.h
+++ b/linden/indra/llcommon/llmemtype.h
@@ -80,6 +80,7 @@ public:
 		MTYPE_SPACE_PARTITION,
 		MTYPE_PIPELINE,
 		MTYPE_AVATAR,
+		MTYPE_AVATAR_MESH,
 		MTYPE_PARTICLES,
 		MTYPE_REGIONS,
 		MTYPE_INVENTORY,
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index e99b103..4809a2f 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -64,6 +64,9 @@
 	#ifndef LL_MSVC
 		#define LL_MSVC 1
 	#endif
+	#if _MSC_VER < 1400
+		#define LL_MSVC7 //Visual C++ 2003 or earlier
+	#endif
 #endif
 
 // Deal with minor differences on Unixy OSes.
@@ -104,9 +107,7 @@ using snprintf_hack::snprintf;
 #if defined(LL_WINDOWS)
 #define BOOST_REGEX_NO_LIB 1
 #define CURL_STATICLIB 1
-
-//#define LL_LCD_COMPILE 0
-
+#define XML_STATIC
 #endif	//	LL_WINDOWS
 
 
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index 1c0f7e0..f132b86 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -2216,12 +2216,12 @@ bool CProcessor::CPUInfoToText(char *strBuffer, unsigned int uiMaxLen)
 	return true;
 }
 
-// bool CProcessor::WriteInfoTextFile(const char *strFilename)
+// bool CProcessor::WriteInfoTextFile(const std::string& strFilename)
 // ===========================================================
 // Takes use of CProcessor::CPUInfoToText and saves the string to a
 // file
 ///////////////////////////////////////////////////////////////////
-bool CProcessor::WriteInfoTextFile(const char *strFilename)
+bool CProcessor::WriteInfoTextFile(const std::string& strFilename)
 {
 	char buf[16384];	/* Flawfinder: ignore */	
 
diff --git a/linden/indra/llcommon/llprocessor.h b/linden/indra/llcommon/llprocessor.h
index a188b1a..6abbd96 100644
--- a/linden/indra/llcommon/llprocessor.h
+++ b/linden/indra/llcommon/llprocessor.h
@@ -188,7 +188,7 @@ public:
 	F64 GetCPUFrequency(unsigned int uiMeasureMSecs);
 	const ProcessorInfo *GetCPUInfo();
 	bool CPUInfoToText(char *strBuffer, unsigned int uiMaxLen);
-	bool WriteInfoTextFile(const char *strFilename);
+	bool WriteInfoTextFile(const std::string& strFilename);
 };
 
 
diff --git a/linden/indra/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h
index f1df27a..ebd297d 100644
--- a/linden/indra/llcommon/llptrskiplist.h
+++ b/linden/indra/llcommon/llptrskiplist.h
@@ -33,6 +33,7 @@
 #define LL_LLPTRSKIPLIST_H
 
 #include "llerror.h"
+#include "llrand.h"
 //#include "vmath.h"
 #include "llrand.h"
 
diff --git a/linden/indra/llcommon/llrand.cpp b/linden/indra/llcommon/llrand.cpp
new file mode 100644
index 0000000..bc8c867
--- /dev/null
+++ b/linden/indra/llcommon/llrand.cpp
@@ -0,0 +1,176 @@
+/** 
+ * @file llrand.cpp
+ * @brief Global random generator.
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llrand.h"
+#include "lluuid.h"
+
+/**
+ * Through analysis, we have decided that we want to take values which
+ * are close enough to 1.0 to map back to 0.0.  We came to this
+ * conclusion from noting that:
+ *
+ * [0.0, 1.0)
+ *
+ * when scaled to the integer set:
+ *
+ * [0, 4)
+ *
+ * there is some value close enough to 1.0 that when multiplying by 4,
+ * gets truncated to 4. Therefore:
+ *
+ * [0,1-eps] => 0
+ * [1,2-eps] => 1
+ * [2,3-eps] => 2
+ * [3,4-eps] => 3
+ *
+ * So 0 gets uneven distribution if we simply clamp. The actual
+ * clamp utilized in this file is to map values out of range back
+ * to 0 to restore uniform distribution.
+ *
+ * Also, for clamping floats when asking for a distribution from
+ * [0.0,g) we have determined that for values of g < 0.5, then
+ * rand*g=g, which is not the desired result. As above, we clamp to 0
+ * to restore uniform distribution.
+ */
+
+// *NOTE: The system rand implementation is probably not correct.
+#define LL_USE_SYSTEM_RAND 0
+
+#if LL_USE_SYSTEM_RAND
+#include <cstdlib>
+#endif
+
+#if LL_USE_SYSTEM_RAND
+class LLSeedRand
+{
+public:
+	LLSeedRand()
+	{
+#if LL_WINDOWS
+		srand(LLUUID::getRandomSeed());
+#else
+		srand48(LLUUID::getRandomSeed());
+#endif
+	}
+};
+static LLSeedRand sRandomSeeder;
+inline F64 ll_internal_random_double()
+{
+#if LL_WINDOWS
+	return (F64)rand() / (F64)RAND_MAX; 
+#else
+	return drand48();
+#endif
+}
+inline F32 ll_internal_random_float()
+{
+#if LL_WINDOWS
+	return (F32)rand() / (F32)RAND_MAX; 
+#else
+	return (F32)drand48();
+#endif
+}
+#else
+static LLRandLagFib2281 gRandomGenerator(LLUUID::getRandomSeed());
+inline F64 ll_internal_random_double()
+{
+	// *HACK: Through experimentation, we have found that dual core
+	// CPUs (or at least multi-threaded processes) seem to
+	// occasionally give an obviously incorrect random number -- like
+	// 5^15 or something. Sooooo, clamp it as described above.
+	F64 rv = gRandomGenerator();
+	if(!((rv >= 0.0) && (rv < 1.0))) return fmod(rv, 1.0);
+	return rv;
+}
+
+inline F32 ll_internal_random_float()
+{
+	// The clamping rules are described above.
+	F32 rv = (F32)gRandomGenerator();
+	if(!((rv >= 0.0f) && (rv < 1.0f))) return fmod(rv, 1.f);
+	return rv;
+}
+#endif
+
+S32 ll_rand()
+{
+	return ll_rand(RAND_MAX);
+}
+
+S32 ll_rand(S32 val)
+{
+	// The clamping rules are described above.
+	S32 rv = (S32)(ll_internal_random_double() * val);
+	if(rv == val) return 0;
+	return rv;
+}
+
+F32 ll_frand()
+{
+	return ll_internal_random_float();
+}
+
+F32 ll_frand(F32 val)
+{
+	// The clamping rules are described above.
+	F32 rv = ll_internal_random_float() * val;
+	if(val > 0)
+	{
+		if(rv >= val) return 0.0f;
+	}
+	else
+	{
+		if(rv <= val) return 0.0f;
+	}
+	return rv;
+}
+
+F64 ll_drand()
+{
+	return ll_internal_random_double();
+}
+
+F64 ll_drand(F64 val)
+{
+	// The clamping rules are described above.
+	F64 rv = ll_internal_random_double() * val;
+	if(val > 0)
+	{
+		if(rv >= val) return 0.0;
+	}
+	else
+	{
+		if(rv <= val) return 0.0;
+	}
+	return rv;
+}
diff --git a/linden/indra/llcommon/llrand.h b/linden/indra/llcommon/llrand.h
new file mode 100644
index 0000000..0a28213
--- /dev/null
+++ b/linden/indra/llcommon/llrand.h
@@ -0,0 +1,132 @@
+/** 
+ * @file llrand.h
+ * @brief Information, functions, and typedefs for randomness.
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLRAND_H
+#define LL_LLRAND_H
+
+#include <boost/random/lagged_fibonacci.hpp>
+#include <boost/random/mersenne_twister.hpp>
+
+/**
+ * Use the boost random number generators if you want a stateful
+ * random numbers. If you want more random numbers, use the
+ * c-functions since they will generate faster/better randomness
+ * across the process.
+ *
+ * I tested some of the boost random engines, and picked a good double
+ * generator and a good integer generator. I also took some timings
+ * for them on linux using gcc 3.3.5. The harness also did some other
+ * fairly trivial operations to try to limit compiler optimizations,
+ * so these numbers are only good for relative comparisons.
+ *
+ * usec/inter		algorithm
+ * 0.21				boost::minstd_rand0
+ * 0.039			boost:lagged_fibonacci19937
+ * 0.036			boost:lagged_fibonacci607
+ * 0.44				boost::hellekalek1995
+ * 0.44				boost::ecuyer1988
+ * 0.042			boost::rand48
+ * 0.043			boost::mt11213b
+ * 0.028			stdlib random() 
+ * 0.05				stdlib lrand48()
+ * 0.034			stdlib rand()
+ * 0.020			the old & lame LLRand
+ */
+
+/**
+ *@brief Generate a float from [0, RAND_MAX).
+ */
+S32 ll_rand();
+
+/**
+ *@brief Generate a float from [0, val) or (val, 0].
+ */
+S32 ll_rand(S32 val);
+
+/**
+ *@brief Generate a float from [0, 1.0).
+ */
+F32 ll_frand();
+
+/**
+ *@brief Generate a float from [0, val) or (val, 0].
+ */
+F32 ll_frand(F32 val);
+
+/**
+ *@brief Generate a double from [0, 1.0).
+ */
+F64 ll_drand();
+
+/**
+ *@brief Generate a double from [0, val) or (val, 0].
+ */
+F64 ll_drand(F64 val);
+
+/**
+ * @brief typedefs for good boost lagged fibonacci.
+ * @see boost::lagged_fibonacci
+ *
+ * These generators will quickly generate doubles. Note the memory
+ * requirements, because they are somewhat high. I chose the smallest
+ * one, and one comparable in speed but higher periodicity without
+ * outrageous memory requirements.
+ * To use:
+ *  LLRandLagFib607 foo((U32)time(NULL));
+ *  double bar = foo();
+ */
+
+typedef boost::lagged_fibonacci607 LLRandLagFib607;
+/**< 
+ * lengh of cycle: 2^32,000
+ * memory: 607*sizeof(double) (about 5K)
+ */
+
+typedef boost::lagged_fibonacci2281 LLRandLagFib2281;
+/**< 
+ * lengh of cycle: 2^120,000
+ * memory: 2281*sizeof(double) (about 17K)
+ */
+
+/**
+ * @breif typedefs for a good boost mersenne twister implementation.
+ * @see boost::mersenne_twister
+ *
+ * This fairly quickly generates U32 values
+ * To use:
+ *  LLRandMT19937 foo((U32)time(NULL));
+ *  U32 bar = foo();
+ *
+ * lengh of cycle: 2^19,937-1
+ * memory: about 2496 bytes
+ */
+typedef boost::mt11213b LLRandMT19937;
+#endif
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp
index fa0531b..2c32184 100644
--- a/linden/indra/llcommon/llsd.cpp
+++ b/linden/indra/llcommon/llsd.cpp
@@ -42,10 +42,11 @@
 #endif
 
 #ifdef NAME_UNNAMED_NAMESPACE
-namespace LLSDUnnamedNamespace {
+namespace LLSDUnnamedNamespace 
 #else
-namespace {
+namespace 
 #endif
+{
 	class ImplMap;
 	class ImplArray;
 }
@@ -127,10 +128,10 @@ public:
 	virtual void erase(Integer)					{ }
 	virtual const LLSD& ref(Integer) const		{ return undef(); }
 
-	virtual LLSD::map_const_iterator beginMap() const { return LLSD::map_const_iterator(); }
-	virtual LLSD::map_const_iterator endMap() const { return LLSD::map_const_iterator(); }
-	virtual LLSD::array_const_iterator beginArray() const { return LLSD::array_const_iterator(); }
-	virtual LLSD::array_const_iterator endArray() const { return LLSD::array_const_iterator(); }
+	virtual LLSD::map_const_iterator beginMap() const { return endMap(); }
+	virtual LLSD::map_const_iterator endMap() const { static const std::map<String, LLSD> empty; return empty.end(); }
+	virtual LLSD::array_const_iterator beginArray() const { return endArray(); }
+	virtual LLSD::array_const_iterator endArray() const { static const std::vector<LLSD> empty; return empty.end(); }
 
 	static const LLSD& undef();
 	
@@ -139,10 +140,11 @@ public:
 };
 
 #ifdef NAME_UNNAMED_NAMESPACE
-namespace LLSDUnnamedNamespace {
+namespace LLSDUnnamedNamespace 
 #else
-namespace {
+namespace 
 #endif
+{
 	template<LLSD::Type T, class Data, class DataRef = Data>
 	class ImplBase : public LLSD::Impl
 		///< This class handles most of the work for a subclass of Impl
@@ -185,6 +187,11 @@ namespace {
 	};
 
 	LLSD::String ImplBoolean::asString() const
+		// *NOTE: The reason that false is not converted to "false" is
+		// because that would break roundtripping,
+		// e.g. LLSD(false).asString().asBoolean().  There are many
+		// reasons for wanting LLSD("false").asBoolean() == true, such
+		// as "everything else seems to work that way".
 		{ return mValue ? "true" : ""; }
 
 
@@ -650,10 +657,11 @@ U32 LLSD::Impl::sOutstandingCount = 0;
 
 
 #ifdef NAME_UNNAMED_NAMESPACE
-namespace LLSDUnnamedNamespace {
+namespace LLSDUnnamedNamespace 
 #else
-namespace {
+namespace 
 #endif
+{
 	inline LLSD::Impl& safe(LLSD::Impl* impl)
 		{ return LLSD::Impl::safe(impl); }
 		
diff --git a/linden/indra/llcommon/llsd.h b/linden/indra/llcommon/llsd.h
index 3f53735..98a6692 100644
--- a/linden/indra/llcommon/llsd.h
+++ b/linden/indra/llcommon/llsd.h
@@ -40,7 +40,7 @@
 
 #include "lldate.h"
 #include "lluri.h"
-#include "../llmath/lluuid.h"
+#include "lluuid.h"
 
 /**
 	LLSD provides a flexible data system similar to the data facilities of
@@ -394,7 +394,7 @@ std::ostream& operator<<(std::ostream& s, const LLSD& llsd);
 		- as UTF8 encoded strings (making not like UUID<->String)
 		- as Base64 or Base96 encoded (making like UUID<->String)
 	- Conversions to std::string and LLUUID do not result in easy assignment
-		to std::string, LLString or LLUUID due to non-unique conversion paths
+		to std::string, std::string or LLUUID due to non-unique conversion paths
 */
 
 #endif // LL_LLSD_NEW_H
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index a556d5d..d42842d 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -37,7 +37,7 @@
 #include "llstreamtools.h" // for fullread
 
 #include <iostream>
-#include "apr-1/apr_base64.h"
+#include "apr_base64.h"
 
 #if !LL_WINDOWS
 #include <netinet/in.h> // htonl & ntohl
@@ -146,12 +146,15 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
 	 * Create the parser as appropriate
 	 */
 	if (legacy_no_header)
-	{
-		LLSDXMLParser* x = new LLSDXMLParser;
-		x->parsePart(hdr_buf, inbuf);
-		p = x;
+	{	// Create a LLSD XML parser, and parse the first chunk read above
+		LLSDXMLParser* x = new LLSDXMLParser();
+		x->parsePart(hdr_buf, inbuf);	// Parse the first part that was already read
+		x->parseLines(str, sd);			// Parse the rest of it
+		delete x;
+		return true;
 	}
-	else if (header == LLSD_BINARY_HEADER)
+
+	if (header == LLSD_BINARY_HEADER)
 	{
 		p = new LLSDBinaryParser;
 	}
@@ -300,7 +303,8 @@ static const char BINARY_FALSE_SERIAL = '0';
 /**
  * LLSDParser
  */
-LLSDParser::LLSDParser() : mCheckLimits(true), mMaxBytesLeft(0)
+LLSDParser::LLSDParser()
+	: mCheckLimits(true), mMaxBytesLeft(0), mParseLines(false)
 {
 }
 
@@ -316,6 +320,15 @@ S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes)
 }
 
 
+// Parse using routine to get() lines, faster than parse()
+S32 LLSDParser::parseLines(std::istream& istr, LLSD& data)
+{
+	mCheckLimits = false;
+	mParseLines = false;		// was true, Emergency fix DEV-17785 parsing newline failure
+	return doParse(istr, data);
+}
+
+
 int LLSDParser::get(std::istream& istr) const
 {
 	if(mCheckLimits) --mMaxBytesLeft;
@@ -1217,8 +1230,7 @@ void LLSDFormatter::realFormat(const std::string& format)
 
 void LLSDFormatter::formatReal(LLSD::Real real, std::ostream& ostr) const
 {
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-	snprintf(buffer, MAX_STRING, mRealFormat.c_str(), real);	/* Flawfinder: ignore */
+	std::string buffer = llformat(mRealFormat.c_str(), real);
 	ostr << buffer;
 }
 
diff --git a/linden/indra/llcommon/llsdserialize.h b/linden/indra/llcommon/llsdserialize.h
index f5282b4..94ad824 100644
--- a/linden/indra/llcommon/llsdserialize.h
+++ b/linden/indra/llcommon/llsdserialize.h
@@ -83,6 +83,18 @@ public:
 	 */
 	S32 parse(std::istream& istr, LLSD& data, S32 max_bytes);
 
+	/** Like parse(), but uses a different call (istream.getline()) to read by lines
+	 *  This API is better suited for XML, where the parse cannot tell
+	 *  where the document actually ends.
+	 */
+	S32 parseLines(std::istream& istr, LLSD& data);
+
+	/** 
+	 * @brief Resets the parser so parse() or parseLines() can be called again for another <llsd> chunk.
+	 */
+	void reset()	{ doReset();	};
+
+
 protected:
 	/** 
 	 * @brief Pure virtual base for doing the parse.
@@ -100,6 +112,11 @@ protected:
 	 */
 	virtual S32 doParse(std::istream& istr, LLSD& data) const = 0;
 
+	/** 
+	 * @brief Virtual default function for resetting the parser
+	 */
+	virtual void doReset()	{};
+
 	/* @name Simple istream helper methods 
 	 *
 	 * These helper methods exist to help correctly use the
@@ -191,6 +208,11 @@ protected:
 	 * @brief The maximum number of bytes left to be parsed.
 	 */
 	mutable S32 mMaxBytesLeft;
+	
+	/**
+	 * @brief Use line-based reading to get text
+	 */
+	bool mParseLines;
 };
 
 /** 
@@ -301,6 +323,11 @@ protected:
 	 */
 	virtual S32 doParse(std::istream& istr, LLSD& data) const;
 
+	/** 
+	 * @brief Virtual default function for resetting the parser
+	 */
+	virtual void doReset();
+
 private:
 	class Impl;
 	Impl& impl;
@@ -674,7 +701,7 @@ public:
 		U32 options = LLSDFormatter::OPTIONS_NONE);
 
 	/**
-	 * @breif Examine a stream, and parse 1 sd object out based on contents.
+	 * @brief Examine a stream, and parse 1 sd object out based on contents.
 	 *
 	 * @param sd [out] The data found on the stream
 	 * @param str The incoming stream
@@ -718,13 +745,23 @@ public:
 		return f->format(sd, str, LLSDFormatter::OPTIONS_PRETTY);
 	}
 
-	static S32 fromXML(LLSD& sd, std::istream& str)
+	static S32 fromXMLEmbedded(LLSD& sd, std::istream& str)
 	{
 		// no need for max_bytes since xml formatting is not
 		// subvertable by bad sizes.
 		LLPointer<LLSDXMLParser> p = new LLSDXMLParser;
 		return p->parse(str, sd, LLSDSerialize::SIZE_UNLIMITED);
 	}
+	static S32 fromXMLDocument(LLSD& sd, std::istream& str)
+	{
+		LLPointer<LLSDXMLParser> p = new LLSDXMLParser();
+		return p->parseLines(str, sd);
+	}
+	static S32 fromXML(LLSD& sd, std::istream& str)
+	{
+		return fromXMLEmbedded(sd, str);
+//		return fromXMLDocument(sd, str);
+	}
 
 	/*
 	 * Binary Methods
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 7de0c35..690ab67 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -35,7 +35,7 @@
 #include <iostream>
 #include <deque>
 
-#include "apr-1/apr_base64.h"
+#include "apr_base64.h"
 
 extern "C"
 {
@@ -63,7 +63,7 @@ S32 LLSDXMLFormatter::format(const LLSD& data, std::ostream& ostr, U32 options)
 {
 	std::streamsize old_precision = ostr.precision(25);
 
-	LLString post = "";
+	std::string post;
 	if (options & LLSDFormatter::OPTIONS_PRETTY)
 	{
 		post = "\n";
@@ -79,8 +79,8 @@ S32 LLSDXMLFormatter::format(const LLSD& data, std::ostream& ostr, U32 options)
 S32 LLSDXMLFormatter::format_impl(const LLSD& data, std::ostream& ostr, U32 options, U32 level) const
 {
 	S32 format_count = 1;
-	LLString pre = "";
-	LLString post = "";
+	std::string pre;
+	std::string post;
 
 	if (options & LLSDFormatter::OPTIONS_PRETTY)
 	{
@@ -262,12 +262,13 @@ public:
 	~Impl();
 	
 	S32 parse(std::istream& input, LLSD& data);
+	S32 parseLines(std::istream& input, LLSD& data);
 
 	void parsePart(const char *buf, int len);
 	
-private:
 	void reset();
-	
+
+private:
 	void startElementHandler(const XML_Char* name, const XML_Char** attributes);
 	void endElementHandler(const XML_Char* name);
 	void characterDataHandler(const XML_Char* data, int length);
@@ -307,8 +308,8 @@ private:
 	LLSD mResult;
 	S32 mParseCount;
 	
-	bool mInLLSDElement;
-	bool mGracefullStop;
+	bool mInLLSDElement;			// true if we're on LLSD
+	bool mGracefullStop;			// true if we found the </llsd
 	
 	typedef std::deque<LLSD*> LLSDRefStack;
 	LLSDRefStack mStack;
@@ -319,15 +320,12 @@ private:
 	
 	std::string mCurrentKey;
 	std::ostringstream mCurrentContent;
-
-	bool mPreStaged;
 };
 
 
 LLSDXMLParser::Impl::Impl()
 {
 	mParser = XML_ParserCreate(NULL);
-	mPreStaged = false;
 	reset();
 }
 
@@ -336,7 +334,7 @@ LLSDXMLParser::Impl::~Impl()
 	XML_ParserFree(mParser);
 }
 
-bool is_eol(char c)
+inline bool is_eol(char c)
 {
 	return (c == '\n' || c == '\r');
 }
@@ -356,9 +354,9 @@ static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize)
 	unsigned count = 0;
 	while (count < bufsize && input.good())
 	{
-		input.get(buf[count]);
-		count++;
-		if (is_eol(buf[count - 1]))
+		char c = input.get();
+		buf[count++] = c;
+		if (is_eol(c))
 			break;
 	}
 	return count;
@@ -366,7 +364,6 @@ static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize)
 
 S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 {
-	reset();
 	XML_Status status;
 	
 	static const int BUFFER_SIZE = 1024;
@@ -420,14 +417,86 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 	return mParseCount;
 }
 
-void LLSDXMLParser::Impl::reset()
+
+S32 LLSDXMLParser::Impl::parseLines(std::istream& input, LLSD& data)
 {
-	if (mPreStaged)
+	XML_Status status = XML_STATUS_OK;
+
+	data = LLSD();
+
+	static const int BUFFER_SIZE = 1024;
+
+	//static char last_buffer[ BUFFER_SIZE ];
+	//std::streamsize last_num_read;
+
+	// Must get rid of any leading \n, otherwise the stream gets into an error/eof state
+	clear_eol(input);
+
+	while( !mGracefullStop
+		&& input.good() 
+		&& !input.eof())
 	{
-		mPreStaged = false;
-		return;
+		void* buffer = XML_GetBuffer(mParser, BUFFER_SIZE);
+		/*
+		 * If we happened to end our last buffer right at the end of the llsd, but the
+		 * stream is still going we will get a null buffer here.  Check for mGracefullStop.
+		 * -- I don't think this is actually true - zero 2008-05-09
+		 */
+		if (!buffer)
+		{
+			break;
+		}
+		
+		// Get one line
+		input.getline((char*)buffer, BUFFER_SIZE);
+		std::streamsize num_read = input.gcount();
+
+		//memcpy( last_buffer, buffer, num_read );
+		//last_num_read = num_read;
+
+		if ( num_read > 0 )
+		{
+			if (!input.good() )
+			{	// Clear state that's set when we run out of buffer
+				input.clear();
+			}
+		
+			// Don't parse the NULL at the end which might be added if \n was absorbed by getline()
+			char * text = (char *) buffer;
+			if ( text[num_read - 1] == 0)
+			{
+				num_read--;
+			}
+		}
+
+		status = XML_ParseBuffer(mParser, num_read, false);
+		if (status == XML_STATUS_ERROR)
+		{
+			break;
+		}
 	}
 
+	if (status != XML_STATUS_ERROR
+		&& !mGracefullStop)
+	{	// Parse last bit
+		status = XML_ParseBuffer(mParser, 0, true);
+	}
+	
+	if (status == XML_STATUS_ERROR  
+		&& !mGracefullStop)
+	{
+		llinfos << "LLSDXMLParser::Impl::parseLines: XML_STATUS_ERROR" << llendl;
+		return LLSDParser::PARSE_FAILURE;
+	}
+
+	clear_eol(input);
+	data = mResult;
+	return mParseCount;
+}
+
+
+void LLSDXMLParser::Impl::reset()
+{
 	mResult.clear();
 	mParseCount = 0;
 
@@ -476,14 +545,15 @@ LLSDXMLParser::Impl::findAttribute(const XML_Char* name, const XML_Char** pairs)
 
 void LLSDXMLParser::Impl::parsePart(const char* buf, int len)
 {
-	void * buffer = XML_GetBuffer(mParser, len);
-	if (buffer != NULL && buf != NULL)
+	if ( buf != NULL 
+		&& len > 0 )
 	{
-		memcpy(buffer, buf, len);
+		XML_Status status = XML_Parse(mParser, buf, len, false);
+		if (status == XML_STATUS_ERROR)
+		{
+			llinfos << "Unexpected XML parsing error at start" << llendl;
+		}
 	}
-	XML_ParseBuffer(mParser, len, false);
-
-	mPreStaged = true;
 }
 
 void LLSDXMLParser::Impl::startElementHandler(const XML_Char* name, const XML_Char** attributes)
@@ -738,5 +808,18 @@ void LLSDXMLParser::parsePart(const char *buf, int len)
 // virtual
 S32 LLSDXMLParser::doParse(std::istream& input, LLSD& data) const
 {
-	return impl.parse(input, data);	
+// Remove code - emergency fix DEV-17785 parsing newline failure
+//	if (mParseLines)
+//	{
+		// Use line-based reading (faster code)
+//		return impl.parseLines(input, data);
+//	}
+
+	return impl.parse(input, data);
+}
+
+//	virtual 
+void LLSDXMLParser::doReset()
+{
+	impl.reset();
 }
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp
index d1ccce0..b619fb6 100644
--- a/linden/indra/llcommon/llsdutil.cpp
+++ b/linden/indra/llcommon/llsdutil.cpp
@@ -46,124 +46,6 @@
 
 #include "llsdserialize.h"
 
-// vector3
-LLSD ll_sd_from_vector3(const LLVector3& vec)
-{
-	LLSD rv;
-	rv.append((F64)vec.mV[VX]);
-	rv.append((F64)vec.mV[VY]);
-	rv.append((F64)vec.mV[VZ]);
-	return rv;
-}
-
-LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index)
-{
-	LLVector3 rv;
-	rv.mV[VX] = (F32)sd[start_index].asReal();
-	rv.mV[VY] = (F32)sd[++start_index].asReal();
-	rv.mV[VZ] = (F32)sd[++start_index].asReal();
-	return rv;
-}
-
-// vector4
-LLSD ll_sd_from_vector4(const LLVector4& vec)
-{
-	LLSD rv;
-	rv.append((F64)vec.mV[VX]);
-	rv.append((F64)vec.mV[VY]);
-	rv.append((F64)vec.mV[VZ]);
-	rv.append((F64)vec.mV[VW]);
-	return rv;
-}
-
-LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index)
-{
-	LLVector4 rv;
-	rv.mV[VX] = (F32)sd[start_index].asReal();
-	rv.mV[VY] = (F32)sd[++start_index].asReal();
-	rv.mV[VZ] = (F32)sd[++start_index].asReal();
-	rv.mV[VW] = (F32)sd[++start_index].asReal();
-	return rv;
-}
-
-// vector3d
-LLSD ll_sd_from_vector3d(const LLVector3d& vec)
-{
-	LLSD rv;
-	rv.append(vec.mdV[VX]);
-	rv.append(vec.mdV[VY]);
-	rv.append(vec.mdV[VZ]);
-	return rv;
-}
-
-LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index)
-{
-	LLVector3d rv;
-	rv.mdV[VX] = sd[start_index].asReal();
-	rv.mdV[VY] = sd[++start_index].asReal();
-	rv.mdV[VZ] = sd[++start_index].asReal();
-	return rv;
-}
-
-//vector2
-LLSD ll_sd_from_vector2(const LLVector2& vec)
-{
-	LLSD rv;
-	rv.append((F64)vec.mV[VX]);
-	rv.append((F64)vec.mV[VY]);
-	return rv;
-}
-
-LLVector2 ll_vector2_from_sd(const LLSD& sd)
-{
-	LLVector2 rv;
-	rv.mV[VX] = (F32)sd[0].asReal();
-	rv.mV[VY] = (F32)sd[1].asReal();
-	return rv;
-}
-
-// Quaternion
-LLSD ll_sd_from_quaternion(const LLQuaternion& quat)
-{
-	LLSD rv;
-	rv.append((F64)quat.mQ[VX]);
-	rv.append((F64)quat.mQ[VY]);
-	rv.append((F64)quat.mQ[VZ]);
-	rv.append((F64)quat.mQ[VW]);
-	return rv;
-}
-
-LLQuaternion ll_quaternion_from_sd(const LLSD& sd)
-{
-	LLQuaternion quat;
-	quat.mQ[VX] = (F32)sd[0].asReal();
-	quat.mQ[VY] = (F32)sd[1].asReal();
-	quat.mQ[VZ] = (F32)sd[2].asReal();
-	quat.mQ[VW] = (F32)sd[3].asReal();
-	return quat;
-}
-
-// color4
-LLSD ll_sd_from_color4(const LLColor4& c)
-{
-	LLSD rv;
-	rv.append(c.mV[0]);
-	rv.append(c.mV[1]);
-	rv.append(c.mV[2]);
-	rv.append(c.mV[3]);
-	return rv;
-}
-
-LLColor4 ll_color4_from_sd(const LLSD& sd)
-{
-	LLColor4 c;
-	c.mV[0] = (F32)sd[0].asReal();
-	c.mV[1] = (F32)sd[1].asReal();
-	c.mV[2] = (F32)sd[2].asReal();
-	c.mV[3] = (F32)sd[3].asReal();
-	return c;
-}
-
 // U32
 LLSD ll_sd_from_U32(const U32 val)
 {
@@ -263,12 +145,11 @@ LLSD ll_binary_from_string(const LLSD& sd)
 {
 	std::vector<U8> binary_value;
 
-	LLString string_value = sd.asString();
-	const char* string_p = string_value.c_str();
-	while (*string_p)
+	std::string string_value = sd.asString();
+	for (std::string::iterator iter = string_value.begin();
+		 iter != string_value.end(); ++iter)
 	{
-		binary_value.push_back(*string_p);
-		string_p++;
+		binary_value.push_back(*iter);
 	}
 
 	binary_value.push_back('\0');
@@ -303,8 +184,9 @@ char* ll_pretty_print_sd(const LLSD& sd)
 }
 
 //compares the structure of an LLSD to a template LLSD and stores the
-//"valid" values in a 3rd LLSD.  Default values are stored in the template
-//
+//"valid" values in a 3rd LLSD.  Default values pulled from the template
+//if the tested LLSD does not contain the key/value pair.
+//Excess values in the test LLSD are ignored in the resultant_llsd.
 //If the llsd to test has a specific key to a map and the values
 //are not of the same type, false is returned or if the LLSDs are not
 //of the same value.  Ordering of arrays matters
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h
index ae6d694..905c031 100644
--- a/linden/indra/llcommon/llsdutil.h
+++ b/linden/indra/llcommon/llsdutil.h
@@ -35,35 +35,34 @@
 #define LL_LLSDUTIL_H
 
 #include "llsd.h"
-#include "../llmath/v3math.h"
-#include "../llmath/v4math.h"
-#include "../llmath/v3dmath.h"
-#include "../llmath/v2math.h"
-#include "../llmath/llquaternion.h"
-#include "../llmath/v4color.h"
-#include "../llprimitive/lltextureanim.h"
 
 // vector3
+class LLVector3;
 LLSD ll_sd_from_vector3(const LLVector3& vec);
 LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0);
 
 // vector4
+class LLVector4;
 LLSD ll_sd_from_vector4(const LLVector4& vec);
 LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index = 0);
 
 // vector3d (double)
+class LLVector3d;
 LLSD ll_sd_from_vector3d(const LLVector3d& vec);
 LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0);
 
 // vector2
+class LLVector2;
 LLSD ll_sd_from_vector2(const LLVector2& vec);
 LLVector2 ll_vector2_from_sd(const LLSD& sd);
 
 // Quaternion
+class LLQuaternion;
 LLSD ll_sd_from_quaternion(const LLQuaternion& quat);
 LLQuaternion ll_quaternion_from_sd(const LLSD& sd);
 
 // color4
+class LLColor4;
 LLSD ll_sd_from_color4(const LLColor4& c);
 LLColor4 ll_color4_from_sd(const LLSD& sd);
 
@@ -93,9 +92,11 @@ char* ll_pretty_print_sd(const LLSD& sd);
 
 //compares the structure of an LLSD to a template LLSD and stores the
 //"valid" values in a 3rd LLSD. Default values
-//are pulled from the template.  Ordering of arrays matters
+//are pulled from the template.  Extra keys/values in the test
+//are ignored in the resultant LLSD.  Ordering of arrays matters
 //Returns false if the test is of same type but values differ in type
 //Otherwise, returns true
+
 BOOL compare_llsd_with_template(
 	const LLSD& llsd_to_test,
 	const LLSD& template_llsd,
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index 46b8cde..ee478fe 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -32,56 +32,56 @@
 #include "linden_common.h"
 #include "llsecondlifeurls.h"
 
-const char CREATE_ACCOUNT_URL[] = 
-	"http://secondlife.com/registration/";
+const std::string CREATE_ACCOUNT_URL ( 
+	"http://secondlife.com/registration/");
 
-const char MANAGE_ACCOUNT[] = 
-	"http://secondlife.com/account/";
+const std::string MANAGE_ACCOUNT ( 
+	"http://secondlife.com/account/");
 
-const char AUCTION_URL[] = 
-	"http://secondlife.com/auctions/auction-detail.php?id=";
+const std::string AUCTION_URL ( 
+	"http://secondlife.com/auctions/auction-detail.php?id=");
 
-const char EVENTS_URL[] = 
-	"http://secondlife.com/events/";
+const std::string EVENTS_URL ( 
+	"http://secondlife.com/events/");
 
-const char TIER_UP_URL[] = 
-	"http://secondlife.com/app/landtier";
+const std::string TIER_UP_URL ( 
+	"http://secondlife.com/app/landtier");
 
-const char LAND_URL[] = 
-	"http://secondlife.com/app/landtier";
+const std::string LAND_URL ( 
+	"http://secondlife.com/app/landtier");
 
-const char UPGRADE_TO_PREMIUM_URL[] =
-	"http://secondlife.com/app/upgrade/";
+const std::string UPGRADE_TO_PREMIUM_URL (
+	"http://secondlife.com/app/upgrade/");
 
-const char DIRECTX_9_URL[] = 
-	"http://secondlife.com/support/";
+const std::string DIRECTX_9_URL ( 
+	"http://secondlife.com/support/");
 
-const char AMD_AGP_URL[] = 
-	"http://secondlife.com/support/";
+const std::string AMD_AGP_URL ( 
+	"http://secondlife.com/support/");
 
-const char VIA_URL[] = 
-	"http://secondlife.com/support/";
+const std::string VIA_URL ( 
+	"http://secondlife.com/support/");
 
-const char SUPPORT_URL[] = 
-    "http://secondlife.com/support/";
+const std::string SUPPORT_URL ( 
+    "http://secondlife.com/support/");
 
-const char INTEL_CHIPSET_URL[] = 
-	"http://secondlife.com/support/";
+const std::string INTEL_CHIPSET_URL ( 
+	"http://secondlife.com/support/");
 
-const char SIS_CHIPSET_URL[] = 
-	"http://secondlife.com/support/";
+const std::string SIS_CHIPSET_URL ( 
+	"http://secondlife.com/support/");
 
-const char BLOGS_URL[] = 
-	"http://blog.secondlife.com/";
+const std::string BLOGS_URL ( 
+	"http://blog.secondlife.com/");
 
-const char BUY_CURRENCY_URL[] =
-	"http://secondlife.com/app/currency/";
+const std::string BUY_CURRENCY_URL (
+	"http://secondlife.com/app/currency/");
 
-const char LSL_DOC_URL[] =
-	"http://secondlife.com/app/lsldoc/";
+const std::string LSL_DOC_URL (
+	"http://secondlife.com/app/lsldoc/");
 
-const char SL_KB_URL[] =
-	"http://secondlife.com/knowledgebase/";
-
-const char RELEASE_NOTES[] = "releasenotes.txt";
+const std::string SL_KB_URL (
+	"http://secondlife.com/knowledgebase/");
 
+const std::string RELEASE_NOTES_BASE_URL (
+	"http://secondlife.com/app/releasenotes/");
diff --git a/linden/indra/llcommon/llsecondlifeurls.h b/linden/indra/llcommon/llsecondlifeurls.h
index 3fe086a..f612d5e 100644
--- a/linden/indra/llcommon/llsecondlifeurls.h
+++ b/linden/indra/llcommon/llsecondlifeurls.h
@@ -33,46 +33,46 @@
 #define LL_LLSECONDLIFEURLS_H
 
 // Account registration web page
-extern const char CREATE_ACCOUNT_URL[];
+extern const std::string CREATE_ACCOUNT_URL;
 
 // Manage Account
-extern const char MANAGE_ACCOUNT[];
+extern const std::string MANAGE_ACCOUNT;
 
-extern const char AUCTION_URL[]; 
+extern const std::string AUCTION_URL; 
 
-extern const char EVENTS_URL[];
+extern const std::string EVENTS_URL;
 
 // Tier up to a new land level.
-extern const char TIER_UP_URL[];
+extern const std::string TIER_UP_URL;
 
 // Tier up to a new land level.
-extern const char LAND_URL[];
+extern const std::string LAND_URL;
 
 // Upgrade from basic membership to premium membership
-extern const char UPGRADE_TO_PREMIUM_URL[];
+extern const std::string UPGRADE_TO_PREMIUM_URL;
 
 // How to get DirectX 9
-extern const char DIRECTX_9_URL[];
+extern const std::string DIRECTX_9_URL;
 
 // Out of date VIA chipset
-extern const char VIA_URL[];
+extern const std::string VIA_URL;
 
 // Support URL
-extern const char SUPPORT_URL[];
+extern const std::string SUPPORT_URL;
 
 // Linden Blogs page
-extern const char BLOGS_URL[];
+extern const std::string BLOGS_URL;
 
 // Currency page
-extern const char BUY_CURRENCY_URL[];
+extern const std::string BUY_CURRENCY_URL;
 
 // LSL script wiki
-extern const char LSL_DOC_URL[];
+extern const std::string LSL_DOC_URL;
 
 // SL KnowledgeBase page
-extern const char SL_KB_URL[];
+extern const std::string SL_KB_URL;
 
-// Local Url Release Notes
-extern const char RELEASE_NOTES[];
+// Release Notes Redirect URL for Server and Viewer
+extern const std::string RELEASE_NOTES_BASE_URL;
 
 #endif
diff --git a/linden/indra/llcommon/llstat.cpp b/linden/indra/llcommon/llstat.cpp
index 11e4c64..4b79fcb 100644
--- a/linden/indra/llcommon/llstat.cpp
+++ b/linden/indra/llcommon/llstat.cpp
@@ -76,10 +76,11 @@ public:
 
 U64 LLStatAccum::impl::sScaleTimes[IMPL_NUM_SCALES] =
 {
+	USEC_PER_SEC / 10,				// 100 millisec
 	USEC_PER_SEC * 1,				// seconds
 	USEC_PER_SEC * 60,				// minutes
-	USEC_PER_SEC * 60 * 2				// minutes
-#if 0
+	USEC_PER_SEC * 60 * 2			// two minutes
+#if ENABLE_LONG_TIME_STATS
 	// enable these when more time scales are desired
 	USEC_PER_SEC * 60*60,			// hours
 	USEC_PER_SEC * 24*60*60,		// days
diff --git a/linden/indra/llcommon/llstat.h b/linden/indra/llcommon/llstat.h
index a0a86e6..0a7e014 100644
--- a/linden/indra/llcommon/llstat.h
+++ b/linden/indra/llcommon/llstat.h
@@ -37,6 +37,9 @@
 #include "lltimer.h"
 #include "llframetimer.h"
 
+// Set this if longer stats are needed
+#define ENABLE_LONG_TIME_STATS	0
+
 //
 // Accumulates statistics for an arbitrary length of time.
 // Does this by maintaining a chain of accumulators, each one
@@ -52,19 +55,22 @@ protected:
 
 public:
 	enum TimeScale {
+		SCALE_100MS,
 		SCALE_SECOND,
 		SCALE_MINUTE,
 		SCALE_TWO_MINUTE,
+#if ENABLE_LONG_TIME_STATS
 		SCALE_HOUR,
 		SCALE_DAY,
 		SCALE_WEEK,
-
+#endif
 		NUM_SCALES
 	};
 
 	F32 meanValue(TimeScale scale) const;
 		// see the subclasses for the specific meaning of value
 
+	F32 meanValueOverLast100ms()  const { return meanValue(SCALE_100MS);  }
 	F32 meanValueOverLastSecond() const	{ return meanValue(SCALE_SECOND); }
 	F32 meanValueOverLastMinute() const	{ return meanValue(SCALE_MINUTE); }
 
diff --git a/linden/indra/llcommon/llstatenums.h b/linden/indra/llcommon/llstatenums.h
index bde6ade..6866586 100644
--- a/linden/indra/llcommon/llstatenums.h
+++ b/linden/indra/llcommon/llstatenums.h
@@ -63,7 +63,8 @@ enum
 	LL_SIM_STAT_SIMPHYSICSSTEPMS,
 	LL_SIM_STAT_SIMPHYSICSSHAPEMS,
 	LL_SIM_STAT_SIMPHYSICSOTHERMS,
-	LL_SIM_STAT_SIMPHYSICSMEMORY
+	LL_SIM_STAT_SIMPHYSICSMEMORY,
+	LL_SIM_STAT_SCRIPT_EPS,
 };
 
 #endif
diff --git a/linden/indra/llcommon/llstl.h b/linden/indra/llcommon/llstl.h
index 9a24185..4486727 100644
--- a/linden/indra/llcommon/llstl.h
+++ b/linden/indra/llcommon/llstl.h
@@ -105,6 +105,7 @@ struct DeletePairedPointer
 	template<typename T> void operator()(T &ptr) const
 	{
 		delete ptr.second;
+		ptr.second = NULL;
 	}
 };
 struct DeletePairedPointerArray
@@ -112,6 +113,7 @@ struct DeletePairedPointerArray
 	template<typename T> void operator()(T &ptr) const
 	{
 		delete[] ptr.second;
+		ptr.second = NULL;
 	}
 };
 
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index a1f19ad..6a8efa8 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -1,6 +1,6 @@
 /** 
  * @file llstring.cpp
- * @brief String utility functions and the LLString class.
+ * @brief String utility functions and the std::string class.
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -47,6 +47,12 @@ std::string ll_safe_string(const char* in)
 	return std::string();
 }
 
+std::string ll_safe_string(const char* in, S32 maxlen)
+{
+	if(in) return std::string(in, maxlen);
+	return std::string();
+}
+
 U8 hex_as_nybble(char hex)
 {
 	if((hex >= '0') && (hex <= '9'))
@@ -65,12 +71,12 @@ U8 hex_as_nybble(char hex)
 }
 
 
-bool _read_file_into_string(std::string& str, const char* filename)
+bool _read_file_into_string(std::string& str, const std::string& filename)
 {
 	llifstream ifs(filename, llifstream::binary);
 	if (!ifs.is_open())
 	{
-		llinfos << "Unable to open file" << filename << llendl;
+		llinfos << "Unable to open file " << filename << llendl;
 		return false;
 	}
 
@@ -174,20 +180,6 @@ S32 utf16chars_to_wchar(const U16* inchars, llwchar* outchar)
 	return inchars - base;
 }
 
-S32 utf16chars_to_utf8chars(const U16* inchars, char* outchars, S32* nchars8p)
-{
-	// Get 32 bit char32
-	llwchar char32;
-	S32 nchars16 = utf16chars_to_wchar(inchars, &char32);
-	// Convert to utf8
-	S32 nchars8  = wchar_to_utf8chars(char32, outchars);
-	if (nchars8p)
-	{
-		*nchars8p = nchars8;
-	}
-	return nchars16;
-}
-
 llutf16string wstring_to_utf16str(const LLWString &utf32str, S32 len)
 {
 	llutf16string out;
@@ -216,7 +208,7 @@ llutf16string wstring_to_utf16str(const LLWString &utf32str)
 	return wstring_to_utf16str(utf32str, len);
 }
 
-llutf16string utf8str_to_utf16str ( const LLString& utf8str )
+llutf16string utf8str_to_utf16str ( const std::string& utf8str )
 {
 	LLWString wstr = utf8str_to_wstring ( utf8str );
 	return wstring_to_utf16str ( wstr );
@@ -492,210 +484,10 @@ std::string utf16str_to_utf8str(const llutf16string& utf16str, S32 len)
 	return wstring_to_utf8str(utf16str_to_wstring(utf16str, len), len);
 }
 
-
-//LLWString wstring_truncate(const LLWString &wstr, const S32 max_len)
-//{
-//	return wstr.substr(0, llmin((S32)wstr.length(), max_len));
-//}
-//
-//
-//LLWString wstring_trim(const LLWString &wstr)
-//{
-//	LLWString outstr;
-//	outstr = wstring_trimhead(wstr);
-//	outstr = wstring_trimtail(outstr);
-//	return outstr;
-//}
-//
-//
-//LLWString wstring_trimhead(const LLWString &wstr)
-//{
-//	if(wstr.empty())
-//	{
-//		return wstr;
-//	}
-//
-//    S32 i = 0;
-//	while((i < (S32)wstr.length()) && iswspace(wstr[i]))
-//	{
-//		i++;
-//	}
-//	return wstr.substr(i, wstr.length() - i);
-//}
-//
-//
-//LLWString wstring_trimtail(const LLWString &wstr)
-//{			
-//	if(wstr.empty())
-//	{
-//		return wstr;
-//	}
-//
-//	S32 len = (S32)wstr.length();
-//
-//	S32 i = len - 1;
-//	while (i >= 0 && iswspace(wstr[i]))
-//	{
-//		i--;
-//	}
-//
-//	if (i >= 0)
-//	{
-//		return wstr.substr(0, i + 1);
-//	}
-//	return wstr;
-//}
-//
-//
-//LLWString wstring_copyinto(const LLWString &dest, const LLWString &src, const S32 insert_offset)
-//{
-//	llassert( insert_offset <= (S32)dest.length() );
-//
-//	LLWString out_str = dest.substr(0, insert_offset);
-//	out_str += src;
-//	LLWString tail = dest.substr(insert_offset);
-//	out_str += tail;
-//
-//	return out_str;
-//}
-
-
-//LLWString wstring_detabify(const LLWString &wstr, const S32 num_spaces)
-//{
-//	LLWString out_str;
-//	// Replace tabs with spaces
-//	for (S32 i = 0; i < (S32)wstr.length(); i++)
-//	{
-//		if (wstr[i] == '\t')
-//		{
-//			for (S32 j = 0; j < num_spaces; j++)
-//				out_str += ' ';
-//		}
-//		else
-//		{
-//			out_str += wstr[i];
-//		}
-//	}
-//	return out_str;
-//}
-
-
-//LLWString wstring_makeASCII(const LLWString &wstr)
-//{
-//	// Replace non-ASCII chars with replace_char
-//	LLWString out_str = wstr;
-//	for (S32 i = 0; i < (S32)out_str.length(); i++)
-//	{
-//		if (out_str[i] > 0x7f)
-//		{
-//			out_str[i] = LL_UNKNOWN_CHAR;
-//		}
-//	}
-//	return out_str;
-//}
-
-
-//LLWString wstring_substChar(const LLWString &wstr, const llwchar target_char, const llwchar replace_char)
-//{
-//	// Replace all occurences of target_char with replace_char
-//	LLWString out_str = wstr;
-//	for (S32 i = 0; i < (S32)out_str.length(); i++)
-//	{
-//		if (out_str[i] == target_char)
-//		{
-//			out_str[i] = replace_char;
-//		}
-//	}
-//	return out_str;
-//}
-//
-//
-//LLWString wstring_tolower(const LLWString &wstr)
-//{
-//	LLWString out_str = wstr;
-//	for (S32 i = 0; i < (S32)out_str.length(); i++)
-//	{
-//		out_str[i] = towlower(out_str[i]);
-//	}
-//	return out_str;
-//}
-//
-//
-//LLWString wstring_convert_to_lf(const LLWString &wstr)
-//{
-//	const llwchar CR = 13;
-//	// Remove carriage returns from string with CRLF
-//	LLWString out_str;
-//
-//	for (S32 i = 0; i < (S32)wstr.length(); i++)
-//	{
-//		if (wstr[i] != CR)
-//		{
-//			out_str += wstr[i];
-//		}
-//	}
-//	return out_str;
-//}
-//
-//
-//LLWString wstring_convert_to_crlf(const LLWString &wstr)
-//{
-//	const llwchar LF = 10;
-//	const llwchar CR = 13;
-//	// Remove carriage returns from string with CRLF
-//	LLWString out_str;
-//
-//	for (S32 i = 0; i < (S32)wstr.length(); i++)
-//	{
-//		if (wstr[i] == LF)
-//		{
-//			out_str += CR;
-//		}
-//		out_str += wstr[i];
-//	}
-//	return out_str;
-//}
-
-
-//S32	wstring_compare_insensitive(const LLWString &lhs, const LLWString &rhs)
-//{
-//
-//	if (lhs == rhs)
-//	{
-//		return 0;
-//	}
-//
-//	if (lhs.empty())
-//	{
-//		return rhs.empty() ? 0 : 1;
-//	}
-//
-//	if (rhs.empty())
-//	{
-//		return -1;
-//	}
-//
-//#ifdef LL_LINUX
-//	// doesn't work because gcc 2.95 doesn't correctly implement c_str().  Sigh...
-//	llerrs << "wstring_compare_insensitive doesn't work on Linux!" << llendl;
-//	return 0;
-//#else
-//	LLWString lhs_lower = lhs;
-//	LLWString::toLower(lhs_lower);
-//	std::string lhs_lower = wstring_to_utf8str(lhs_lower);
-//	LLWString rhs_lower = lhs;
-//	LLWString::toLower(rhs_lower);
-//	std::string rhs_lower = wstring_to_utf8str(rhs_lower);
-//
-//	return strcmp(lhs_lower.c_str(), rhs_lower.c_str());
-//#endif
-//}
-
-
 std::string utf8str_trim(const std::string& utf8str)
 {
 	LLWString wstr = utf8str_to_wstring(utf8str);
-	LLWString::trim(wstr);
+	LLWStringUtil::trim(wstr);
 	return wstring_to_utf8str(wstr);
 }
 
@@ -703,7 +495,7 @@ std::string utf8str_trim(const std::string& utf8str)
 std::string utf8str_tolower(const std::string& utf8str)
 {
 	LLWString out_str = utf8str_to_wstring(utf8str);
-	LLWString::toLower(out_str);
+	LLWStringUtil::toLower(out_str);
 	return wstring_to_utf8str(out_str);
 }
 
@@ -712,7 +504,7 @@ S32 utf8str_compare_insensitive(const std::string& lhs, const std::string& rhs)
 {
 	LLWString wlhs = utf8str_to_wstring(lhs);
 	LLWString wrhs = utf8str_to_wstring(rhs);
-	return LLWString::compareInsensitive(wlhs.c_str(), wrhs.c_str());
+	return LLWStringUtil::compareInsensitive(wlhs, wrhs);
 }
 
 std::string utf8str_truncate(const std::string& utf8str, const S32 max_len)
@@ -756,7 +548,7 @@ std::string utf8str_substChar(
 	const llwchar replace_char)
 {
 	LLWString wstr = utf8str_to_wstring(utf8str);
-	LLWString::replaceChar(wstr, target_char, replace_char);
+	LLWStringUtil::replaceChar(wstr, target_char, replace_char);
 	//wstr = wstring_substChar(wstr, target_char, replace_char);
 	return wstring_to_utf8str(wstr);
 }
@@ -764,7 +556,7 @@ std::string utf8str_substChar(
 std::string utf8str_makeASCII(const std::string& utf8str)
 {
 	LLWString wstr = utf8str_to_wstring(utf8str);
-	LLWString::_makeASCII(wstr);
+	LLWStringUtil::_makeASCII(wstr);
 	return wstring_to_utf8str(wstr);
 }
 
@@ -929,6 +721,32 @@ namespace LLStringFn
 			}
 		}
 	}
+
+	// https://wiki.lindenlab.com/wiki/Unicode_Guidelines has details on
+	// allowable code points for XML. Specifically, they are:
+	// 0x09, 0x0a, 0x0d, and 0x20 on up.  JC
+	std::string strip_invalid_xml(const std::string& input)
+	{
+		std::string output;
+		output.reserve( input.size() );
+		std::string::const_iterator it = input.begin();
+		while (it != input.end())
+		{
+			// Must compare as unsigned for >=
+			// Test most likely match first
+			const unsigned char c = (unsigned char)*it;
+			if (   c >= (unsigned char)0x20   // SPACE
+				|| c == (unsigned char)0x09   // TAB
+				|| c == (unsigned char)0x0a   // LINE_FEED
+				|| c == (unsigned char)0x0d ) // CARRIAGE_RETURN
+			{
+				output.push_back(c);
+			}
+			++it;
+		}
+		return output;
+	}
+
 }
 
 
@@ -938,19 +756,19 @@ namespace LLStringFn
 #ifdef _DEBUG
 
 template<class T> 
-void LLStringBase<T>::testHarness()
+void LLStringUtilBase<T>::testHarness()
 {
-	LLString s1;
+	std::string s1;
 	
 	llassert( s1.c_str() == NULL );
 	llassert( s1.size() == 0 );
 	llassert( s1.empty() );
 	
-	LLString s2( "hello");
+	std::string s2( "hello");
 	llassert( !strcmp( s2.c_str(), "hello" ) );
 	llassert( s2.size() == 5 ); 
 	llassert( !s2.empty() );
-	LLString s3( s2 );
+	std::string s3( s2 );
 
 	llassert( "hello" == s2 );
 	llassert( s2 == "hello" );
@@ -959,12 +777,12 @@ void LLStringBase<T>::testHarness()
 	llassert( "gello" != s2 );
 	llassert( s2 != "gello" );
 
-	LLString s4 = s2;
+	std::string s4 = s2;
 	llassert( !s4.empty() );
 	s4.empty();
 	llassert( s4.empty() );
 	
-	LLString s5("");
+	std::string s5("");
 	llassert( s5.empty() );
 	
 	llassert( isValidIndex(s5, 0) );
@@ -978,8 +796,8 @@ void LLStringBase<T>::testHarness()
 	llassert( s4 == "hello again!hello again!" );
 	
 	
-	LLString s6 = s2 + " " + s2;
-	LLString s7 = s6;
+	std::string s6 = s2 + " " + s2;
+	std::string s7 = s6;
 	llassert( s6 == s7 );
 	llassert( !( s6 != s7) );
 	llassert( !(s6 < s7) );
@@ -1002,10 +820,10 @@ void LLStringBase<T>::testHarness()
 	s2.insert( 1, "awn, don't yel");
 	llassert( s2 == "yawn, don't yell");
 	
-	LLString s8 = s2.substr( 6, 5 );
+	std::string s8 = s2.substr( 6, 5 );
 	llassert( s8 == "don't"  );
 	
-	LLString s9 = "   \t\ntest  \t\t\n  ";
+	std::string s9 = "   \t\ntest  \t\t\n  ";
 	trim(s9);
 	llassert( s9 == "test"  );
 
@@ -1020,17 +838,17 @@ void LLStringBase<T>::testHarness()
 	llassert( s9 == "abc123&*(abc"  );
 
 
-	LLString s10( 10, 'x' );
+	std::string s10( 10, 'x' );
 	llassert( s10 == "xxxxxxxxxx" );
 
-	LLString s11( "monkey in the middle", 7, 2 );
+	std::string s11( "monkey in the middle", 7, 2 );
 	llassert( s11 == "in" );
 
-	LLString s12;  //empty
+	std::string s12;  //empty
 	s12 += "foo";
 	llassert( s12 == "foo" );
 
-	LLString s13;  //empty
+	std::string s13;  //empty
 	s13 += 'f';
 	llassert( s13 == "f" );
 }
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 82ebdc9..60a4492 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -1,6 +1,6 @@
 /** 
  * @file llstring.h
- * @brief String utility functions and LLString class.
+ * @brief String utility functions and std::string class.
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -39,15 +39,8 @@
 
 const char LL_UNKNOWN_CHAR = '?';
 
-class LLVector3;
-class LLVector3d;
-class LLQuaternion;
-class LLUUID;
-class LLColor4;
-class LLColor4U;
-
-#if (LL_DARWIN || LL_SOLARIS || (LL_LINUX && __GNUC__ > 2))
-// Template specialization of char_traits for U16s. Only necessary on Mac for now (exists on Windows, unused/broken on Linux/gcc2.95)
+#if LL_DARWIN || LL_LINUX || LL_SOLARIS
+// Template specialization of char_traits for U16s. Only necessary on Mac and Linux (exists on Windows already)
 namespace std
 {
 template<>
@@ -162,79 +155,29 @@ public:
 	static BOOL isDigit(llwchar a) { return iswdigit(a) != 0; }
 };
 
-//RN: I used a templated base class instead of a pure interface class to minimize code duplication
-// but it might be worthwhile to just go with two implementations (LLString and LLWString) of
-// an interface class, unless we can think of a good reason to have a std::basic_string polymorphic base
-
-//****************************************************************
-// NOTA BENE: do *NOT* dynamically allocate memory inside of LLStringBase as the {*()^#%*)#%W^*)#%*)STL implentation
-// of basic_string doesn't provide a virtual destructor.  If we need to allocate resources specific to LLString
-// then we should either customize std::basic_string to linden::basic_string or change LLString to be a wrapper
-// that contains an instance of std::basic_string.  Similarly, overriding methods defined in std::basic_string will *not*
-// be called in a polymorphic manner (passing an instance of basic_string to a particular function)
-//****************************************************************
+// Allowing assignments from non-strings into format_map_t is apparently
+// *really* error-prone, so subclass std::string with just basic c'tors.
+class FormatMapString : public std::string
+{
+public:
+	FormatMapString() : std::string() {};
+	FormatMapString(const char* s) : std::string(s) {};
+	FormatMapString(const std::string& s) : std::string(s) {};
+};
 
 template <class T>
-class LLStringBase : public std::basic_string<T> 
+class LLStringUtilBase
 {
 public:
 	typedef typename std::basic_string<T>::size_type size_type;
 	
-	// naming convention follows those set for LLUUID
-// 	static LLStringBase null; // deprecated for std::string compliance
-// 	static LLStringBase zero_length; // deprecated for std::string compliance
-	
-	
-	// standard constructors
-	LLStringBase() : std::basic_string<T>()	{}
-	LLStringBase(const LLStringBase& s): std::basic_string<T>(s) {}
-	LLStringBase(const std::basic_string<T>& s) : std::basic_string<T>(s) {}
-	LLStringBase(const std::basic_string<T>& s, size_type pos, size_type n = std::basic_string<T>::npos)
-		: std::basic_string<T>(s, pos, n) {}
-	LLStringBase(size_type count, const T& c) : std::basic_string<T>() { assign(count, c);}
-	// custom constructors
-	LLStringBase(const T* s);
-	LLStringBase(const T* s, size_type n);
-	LLStringBase(const T* s, size_type pos, size_type n );
-	
-#if LL_LINUX || LL_SOLARIS
-	void clear() { assign(null); }
-	
-	LLStringBase<T>& assign(const T* s);
-	LLStringBase<T>& assign(const T* s, size_type n); 
-	LLStringBase<T>& assign(const LLStringBase& s);
-	LLStringBase<T>& assign(size_type n, const T& c);
-	LLStringBase<T>& assign(const T* a, const T* b);
-	LLStringBase<T>& assign(typename LLStringBase<T>::iterator &it1, typename LLStringBase<T>::iterator &it2);
-	LLStringBase<T>& assign(typename LLStringBase<T>::const_iterator &it1, typename LLStringBase<T>::const_iterator &it2);
-
-    // workaround for bug in gcc2 STL headers.
-    #if ((__GNUC__ <= 2) && (!defined _STLPORT_VERSION))
-    const T* c_str () const
-    {
-        if (length () == 0)
-        {
-            static const T zero = 0;
-            return &zero;
-        }
-
-        //terminate ();
-        { string_char_traits<T>::assign(const_cast<T*>(data())[length()], string_char_traits<T>::eos()); }
-
-        return data ();
-    }
-    #endif
-#endif
-
-	bool operator==(const T* _Right) const { return _Right ? (std::basic_string<T>::compare(_Right) == 0) : this->empty(); }
-	
 public:
 	/////////////////////////////////////////////////////////////////////////////////////////
 	// Static Utility functions that operate on std::strings
 
-	static LLStringBase null;
+	static std::basic_string<T> null;
 	
-	typedef std::map<std::string, std::string> format_map_t;
+	typedef std::map<FormatMapString, FormatMapString> format_map_t;
 	static S32 format(std::basic_string<T>& s, const format_map_t& fmt_map);
 	
 	static BOOL	isValidIndex(const std::basic_string<T>& string, size_type i)
@@ -266,8 +209,8 @@ public:
 	/**
 	 * @brief Unsafe way to make ascii characters. You should probably
 	 * only call this when interacting with the host operating system.
-	 * The 1 byte LLString does not work correctly.
-	 * The 2 and 4 byte LLString probably work, so LLWString::_makeASCII
+	 * The 1 byte std::string does not work correctly.
+	 * The 2 and 4 byte std::string probably work, so LLWStringUtil::_makeASCII
 	 * should work.
 	 */
 	static void _makeASCII(std::basic_string<T>& string);
@@ -289,11 +232,13 @@ public:
 	// Like strcmp but also handles empty strings. Uses
 	// current locale.
 	static S32		compareStrings(const T* lhs, const T* rhs);
+	static S32		compareStrings(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs);
 	
 	// case insensitive version of above. Uses current locale on
 	// Win32, and falls back to a non-locale aware comparison on
 	// Linux.
 	static S32		compareInsensitive(const T* lhs, const T* rhs);
+	static S32		compareInsensitive(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs);
 
 	// Case sensitive comparison with good handling of numbers.  Does not use current locale.
 	// a.k.a. strdictcmp()
@@ -320,21 +265,21 @@ public:
 
 };
 
-template<class T> LLStringBase<T> LLStringBase<T>::null;
+template<class T> std::basic_string<T> LLStringUtilBase<T>::null;
 
-typedef LLStringBase<char> LLString;
-typedef LLStringBase<llwchar> LLWString;
+typedef LLStringUtilBase<char> LLStringUtil;
+typedef LLStringUtilBase<llwchar> LLWStringUtil;
+typedef std::basic_string<llwchar> LLWString;
 
 //@ Use this where we want to disallow input in the form of "foo"
 //  This is used to catch places where english text is embedded in the code
 //  instead of in a translatable XUI file.
-class LLStringExplicit : public LLString
+class LLStringExplicit : public std::string
 {
 public:
-	explicit LLStringExplicit(const char* s) : LLString(s) {}
-	LLStringExplicit(const LLString& s) : LLString(s) {}
-	LLStringExplicit(const std::string& s) : LLString(s) {}
-	LLStringExplicit(const std::string& s, size_type pos, size_type n = std::string::npos) : LLString(s, pos, n) {}
+	explicit LLStringExplicit(const char* s) : std::string(s) {}
+	LLStringExplicit(const std::string& s) : std::string(s) {}
+	LLStringExplicit(const std::string& s, size_type pos, size_type n = std::string::npos) : std::string(s, pos, n) {}
 };
 
 struct LLDictionaryLess
@@ -342,7 +287,7 @@ struct LLDictionaryLess
 public:
 	bool operator()(const std::string& a, const std::string& b)
 	{
-		return (LLString::precedesDict(a, b) ? true : false);
+		return (LLStringUtil::precedesDict(a, b) ? true : false);
 	}
 };
 
@@ -371,6 +316,7 @@ inline std::string chop_tail_copy(
  * pointer is NULL.
  */
 std::string ll_safe_string(const char* in);
+std::string ll_safe_string(const char* in, S32 maxlen);
 
 /**
  * @brief This translates a nybble stored as a hex value from 0-f back
@@ -387,7 +333,7 @@ U8 hex_as_nybble(char hex);
  * @param filename The full name of the file to read.
  * @return Returns true on success. If false, str is unmodified.
  */
-bool _read_file_into_string(std::string& str, const char* filename);
+bool _read_file_into_string(std::string& str, const std::string& filename);
 
 /**
  * Unicode support
@@ -409,20 +355,17 @@ LLWString utf16str_to_wstring(const llutf16string &utf16str);
 llutf16string wstring_to_utf16str(const LLWString &utf32str, S32 len);
 llutf16string wstring_to_utf16str(const LLWString &utf32str);
 
-llutf16string utf8str_to_utf16str ( const LLString& utf8str, S32 len);
-llutf16string utf8str_to_utf16str ( const LLString& utf8str );
+llutf16string utf8str_to_utf16str ( const std::string& utf8str, S32 len);
+llutf16string utf8str_to_utf16str ( const std::string& utf8str );
 
 LLWString utf8str_to_wstring(const std::string &utf8str, S32 len);
 LLWString utf8str_to_wstring(const std::string &utf8str);
 // Same function, better name. JC
 inline LLWString utf8string_to_wstring(const std::string& utf8_string) { return utf8str_to_wstring(utf8_string); }
 
-// Special hack for llfilepicker.cpp:
-S32 utf16chars_to_utf8chars(const U16* inchars, char* outchars, S32* nchars8 = 0);
-S32 utf16chars_to_wchar(const U16* inchars, llwchar* outchar);
+//
 S32 wchar_to_utf8chars(llwchar inchar, char* outchars);
 
-//
 std::string wstring_to_utf8str(const LLWString &utf32str, S32 len);
 std::string wstring_to_utf8str(const LLWString &utf32str);
 
@@ -484,15 +427,6 @@ std::string mbcsstring_makeASCII(const std::string& str);
 std::string utf8str_removeCRLF(const std::string& utf8str);
 
 
-template <class T>
-std::ostream& operator<<(std::ostream &s, const LLStringBase<T> &str)
-{
-	s << ((std::basic_string<T>)str);
-	return s;
-}
-
-std::ostream& operator<<(std::ostream &s, const LLWString &wstr);
-
 #if LL_WINDOWS
 /* @name Windows string helpers
  */
@@ -528,7 +462,7 @@ std::string ll_convert_wide_to_string(const wchar_t* in);
 #endif // LL_WINDOWS
 
 /**
- * Many of the 'strip' and 'replace' methods of LLStringBase need
+ * Many of the 'strip' and 'replace' methods of LLStringUtilBase need
  * specialization to work with the signed char type.
  * Sadly, it is not possible (AFAIK) to specialize a single method of
  * a template class.
@@ -581,30 +515,68 @@ namespace LLStringFn
 	 */
 	void replace_nonprintable_and_pipe(std::basic_string<llwchar>& str,
 									   llwchar replacement);
+
+	/**
+	 * @brief Remove all characters that are not allowed in XML 1.0.
+	 * Returns a copy of the string with those characters removed.
+	 * Works with US ASCII and UTF-8 encoded strings.  JC
+	 */
+	std::string strip_invalid_xml(const std::string& input);
 }
 
 ////////////////////////////////////////////////////////////
 
+// LLStringBase::format()
+//
+// This function takes a string 's' and a map 'fmt_map' of strings-to-strings.
+// All occurances of strings in 's' from the left-hand side of 'fmt_map' are
+// then replaced with the corresponding right-hand side of 'fmt_map', non-
+// recursively.  The function returns the number of substitutions made.
+
 // static
 template<class T> 
-S32 LLStringBase<T>::format(std::basic_string<T>& s, const format_map_t& fmt_map)
+S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const format_map_t& fmt_map)
 {
 	typedef typename std::basic_string<T>::size_type string_size_type_t;
+	string_size_type_t scanstart = 0;
 	S32 res = 0;
-	for (format_map_t::const_iterator iter = fmt_map.begin(); iter != fmt_map.end(); ++iter)
+
+	// Look for the first match of any keyword, replace that keyword,
+	// repeat from the end of the replacement string.  This avoids
+	// accidentally performing substitution on a substituted string.
+	while (1)
 	{
-		U32 fmtlen = iter->first.size();
-		string_size_type_t n = 0;
-		while (1)
+		string_size_type_t first_match_pos = scanstart;
+		string_size_type_t first_match_str_length = 0;
+		std::basic_string<T> first_match_str_replacement;
+
+		for (format_map_t::const_iterator iter = fmt_map.begin();
+		     iter != fmt_map.end();
+		     ++iter)
 		{
-			n = s.find(iter->first, n);
-			if (n == std::basic_string<T>::npos)
+			string_size_type_t n = s.find(iter->first, scanstart);
+			if (n != std::basic_string<T>::npos &&
+			    (n < first_match_pos ||
+			     0 == first_match_str_length))
 			{
-				break;
+				first_match_pos = n;
+				first_match_str_length = iter->first.length();
+				first_match_str_replacement = iter->second;
 			}
-			s.erase(n, fmtlen);
-			s.insert(n, iter->second);
-			n += fmtlen;
+		}
+
+		if (0 == first_match_str_length)
+		{
+			// no more keys found to substitute from this point
+			// in the string forward.
+			break;
+		}
+		else
+		{
+			s.erase(first_match_pos, first_match_str_length);
+			s.insert(first_match_pos, first_match_str_replacement);
+			scanstart = first_match_pos +
+				first_match_str_replacement.length();
 			++res;
 		}
 	}
@@ -613,7 +585,7 @@ S32 LLStringBase<T>::format(std::basic_string<T>& s, const format_map_t& fmt_map
 
 // static
 template<class T> 
-S32 LLStringBase<T>::compareStrings(const T* lhs, const T* rhs)
+S32 LLStringUtilBase<T>::compareStrings(const T* lhs, const T* rhs)
 {	
 	S32 result;
 	if( lhs == rhs )
@@ -637,9 +609,16 @@ S32 LLStringBase<T>::compareStrings(const T* lhs, const T* rhs)
 	return result;
 }
 
+//static 
+template<class T> 
+S32 LLStringUtilBase<T>::compareStrings(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs)
+{
+	return LLStringOps::collate(lhs.c_str(), rhs.c_str());
+}
+
 // static
 template<class T> 
-S32 LLStringBase<T>::compareInsensitive(const T* lhs, const T* rhs )
+S32 LLStringUtilBase<T>::compareInsensitive(const T* lhs, const T* rhs )
 {
 	S32 result;
 	if( lhs == rhs )
@@ -658,22 +637,32 @@ S32 LLStringBase<T>::compareInsensitive(const T* lhs, const T* rhs )
 	}
 	else
 	{
-		LLStringBase<T> lhs_string(lhs);
-		LLStringBase<T> rhs_string(rhs);
-		LLStringBase<T>::toUpper(lhs_string);
-		LLStringBase<T>::toUpper(rhs_string);
+		std::basic_string<T> lhs_string(lhs);
+		std::basic_string<T> rhs_string(rhs);
+		LLStringUtilBase<T>::toUpper(lhs_string);
+		LLStringUtilBase<T>::toUpper(rhs_string);
 		result = LLStringOps::collate(lhs_string.c_str(), rhs_string.c_str());
 	}
 	return result;
 }
 
+//static 
+template<class T> 
+S32 LLStringUtilBase<T>::compareInsensitive(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs)
+{
+	std::basic_string<T> lhs_string(lhs);
+	std::basic_string<T> rhs_string(rhs);
+	LLStringUtilBase<T>::toUpper(lhs_string);
+	LLStringUtilBase<T>::toUpper(rhs_string);
+	return LLStringOps::collate(lhs_string.c_str(), rhs_string.c_str());
+}
 
 // Case sensitive comparison with good handling of numbers.  Does not use current locale.
 // a.k.a. strdictcmp()
 
 //static 
 template<class T>
-S32 LLStringBase<T>::compareDict(const std::basic_string<T>& astr, const std::basic_string<T>& bstr)
+S32 LLStringUtilBase<T>::compareDict(const std::basic_string<T>& astr, const std::basic_string<T>& bstr)
 {
 	const T* a = astr.c_str();
 	const T* b = bstr.c_str();
@@ -712,8 +701,9 @@ S32 LLStringBase<T>::compareDict(const std::basic_string<T>& astr, const std::ba
 	return ca-cb;
 }
 
+// static
 template<class T>
-S32 LLStringBase<T>::compareDictInsensitive(const std::basic_string<T>& astr, const std::basic_string<T>& bstr)
+S32 LLStringUtilBase<T>::compareDictInsensitive(const std::basic_string<T>& astr, const std::basic_string<T>& bstr)
 {
 	const T* a = astr.c_str();
 	const T* b = bstr.c_str();
@@ -748,11 +738,11 @@ S32 LLStringBase<T>::compareDictInsensitive(const std::basic_string<T>& astr, co
 // Puts compareDict() in a form appropriate for LL container classes to use for sorting.
 // static 
 template<class T> 
-BOOL LLStringBase<T>::precedesDict( const std::basic_string<T>& a, const std::basic_string<T>& b )
+BOOL LLStringUtilBase<T>::precedesDict( const std::basic_string<T>& a, const std::basic_string<T>& b )
 {
 	if( a.size() && b.size() )
 	{
-		return (LLStringBase<T>::compareDict(a.c_str(), b.c_str()) < 0);
+		return (LLStringUtilBase<T>::compareDict(a.c_str(), b.c_str()) < 0);
 	}
 	else
 	{
@@ -760,108 +750,9 @@ BOOL LLStringBase<T>::precedesDict( const std::basic_string<T>& a, const std::ba
 	}
 }
 
-// Constructors
-template<class T> 
-LLStringBase<T>::LLStringBase(const T* s ) : std::basic_string<T>()
-{
-	if (s) assign(s);
-}
-
-template<class T> 
-LLStringBase<T>::LLStringBase(const T* s, size_type n ) : std::basic_string<T>()
-{
-	if (s) assign(s, n);
-}
-
-// Init from a substring
-template<class T> 
-LLStringBase<T>::LLStringBase(const T* s, size_type pos, size_type n ) : std::basic_string<T>()
-{
-	if( s )
-	{
-		assign(s + pos, n);
-	}
-	else
-	{
-		assign(LLStringBase<T>::null);
-	}
-}
-
-#if LL_LINUX || LL_SOLARIS
-template<class T> 
-LLStringBase<T>& LLStringBase<T>::assign(const T* s)
-{
-	if (s)
-	{
-		std::basic_string<T>::assign(s);
-	}
-	else
-	{
-		assign(LLStringBase<T>::null);
-	}
-	return *this;
-}
-
-template<class T> 
-LLStringBase<T>& LLStringBase<T>::assign(const T* s, size_type n)
-{
-	if (s)
-	{
-		std::basic_string<T>::assign(s, n);
-	}
-	else
-	{
-		assign(LLStringBase<T>::null);
-	}
-	return *this;
-}
-
-template<class T> 
-LLStringBase<T>& LLStringBase<T>::assign(const LLStringBase<T>& s)
-{
-	std::basic_string<T>::assign(s);
-	return *this;
-}
-
-template<class T> 
-LLStringBase<T>& LLStringBase<T>::assign(size_type n, const T& c)
-{
-    std::basic_string<T>::assign(n, c);
-    return *this;
-}
-
-template<class T> 
-LLStringBase<T>& LLStringBase<T>::assign(const T* a, const T* b)
-{
-    if (a > b)
-        assign(LLStringBase<T>::null);
-    else
-        assign(a, (size_type) (b-a));
-    return *this;
-}
-
-template<class T>
-LLStringBase<T>& LLStringBase<T>::assign(typename LLStringBase<T>::iterator &it1, typename LLStringBase<T>::iterator &it2)
-{
-    assign(LLStringBase<T>::null);
-    while(it1 != it2)
-        *this += *it1++;
-    return *this;
-}
-
-template<class T>
-LLStringBase<T>& LLStringBase<T>::assign(typename LLStringBase<T>::const_iterator &it1, typename LLStringBase<T>::const_iterator &it2)
-{
-    assign(LLStringBase<T>::null);
-    while(it1 != it2)
-        *this += *it1++;
-    return *this;
-}
-#endif
-
 //static
 template<class T> 
-void LLStringBase<T>::toUpper(std::basic_string<T>& string)	
+void LLStringUtilBase<T>::toUpper(std::basic_string<T>& string)	
 { 
 	if( !string.empty() )
 	{ 
@@ -875,7 +766,7 @@ void LLStringBase<T>::toUpper(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringBase<T>::toLower(std::basic_string<T>& string)
+void LLStringUtilBase<T>::toLower(std::basic_string<T>& string)
 { 
 	if( !string.empty() )
 	{ 
@@ -889,7 +780,7 @@ void LLStringBase<T>::toLower(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringBase<T>::trimHead(std::basic_string<T>& string)
+void LLStringUtilBase<T>::trimHead(std::basic_string<T>& string)
 {			
 	if( !string.empty() )
 	{
@@ -904,7 +795,7 @@ void LLStringBase<T>::trimHead(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringBase<T>::trimTail(std::basic_string<T>& string)
+void LLStringUtilBase<T>::trimTail(std::basic_string<T>& string)
 {			
 	if( string.size() )
 	{
@@ -923,7 +814,7 @@ void LLStringBase<T>::trimTail(std::basic_string<T>& string)
 // Replace line feeds with carriage return-line feed pairs.
 //static
 template<class T>
-void LLStringBase<T>::addCRLF(std::basic_string<T>& string)
+void LLStringUtilBase<T>::addCRLF(std::basic_string<T>& string)
 {
 	const T LF = 10;
 	const T CR = 13;
@@ -964,7 +855,7 @@ void LLStringBase<T>::addCRLF(std::basic_string<T>& string)
 // Remove all carriage returns
 //static
 template<class T> 
-void LLStringBase<T>::removeCRLF(std::basic_string<T>& string)
+void LLStringUtilBase<T>::removeCRLF(std::basic_string<T>& string)
 {
 	const T CR = 13;
 
@@ -985,7 +876,7 @@ void LLStringBase<T>::removeCRLF(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringBase<T>::replaceChar( std::basic_string<T>& string, T target, T replacement )
+void LLStringUtilBase<T>::replaceChar( std::basic_string<T>& string, T target, T replacement )
 {
 	size_type found_pos = 0;
 	for (found_pos = string.find(target, found_pos); 
@@ -998,7 +889,7 @@ void LLStringBase<T>::replaceChar( std::basic_string<T>& string, T target, T rep
 
 //static
 template<class T> 
-void LLStringBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T replacement )
+void LLStringUtilBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T replacement )
 {
 	const char LF = 10;
 	const S8 MIN = 32;
@@ -1018,12 +909,12 @@ void LLStringBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T r
 
 //static
 template<class T> 
-void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_type spaces_per_tab )
+void LLStringUtilBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_type spaces_per_tab )
 {
 	const T TAB = '\t';
 	const T SPACE = ' ';
 
-	LLStringBase<T> out_str;
+	std::basic_string<T> out_str;
 	// Replace tabs with spaces
 	for (size_type i = 0; i < str.length(); i++)
 	{
@@ -1042,7 +933,7 @@ void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_typ
 
 //static
 template<class T> 
-BOOL LLStringBase<T>::containsNonprintable(const std::basic_string<T>& string)
+BOOL LLStringUtilBase<T>::containsNonprintable(const std::basic_string<T>& string)
 {
 	const char MIN = 32;
 	BOOL rv = FALSE;
@@ -1059,7 +950,7 @@ BOOL LLStringBase<T>::containsNonprintable(const std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringBase<T>::stripNonprintable(std::basic_string<T>& string)
+void LLStringUtilBase<T>::stripNonprintable(std::basic_string<T>& string)
 {
 	const char MIN = 32;
 	size_type j = 0;
@@ -1090,7 +981,7 @@ void LLStringBase<T>::stripNonprintable(std::basic_string<T>& string)
 }
 
 template<class T> 
-void LLStringBase<T>::_makeASCII(std::basic_string<T>& string)
+void LLStringUtilBase<T>::_makeASCII(std::basic_string<T>& string)
 {
 	// Replace non-ASCII chars with LL_UNKNOWN_CHAR
 	for (size_type i = 0; i < string.length(); i++)
@@ -1104,7 +995,7 @@ void LLStringBase<T>::_makeASCII(std::basic_string<T>& string)
 
 // static
 template<class T> 
-void LLStringBase<T>::copy( T* dst, const T* src, size_type dst_size )
+void LLStringUtilBase<T>::copy( T* dst, const T* src, size_type dst_size )
 {
 	if( dst_size > 0 )
 	{
@@ -1120,7 +1011,7 @@ void LLStringBase<T>::copy( T* dst, const T* src, size_type dst_size )
 
 // static
 template<class T> 
-void LLStringBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset)
+void LLStringUtilBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset)
 {
 	if ( offset == dst.length() )
 	{
@@ -1141,7 +1032,7 @@ void LLStringBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_strin
 // True if this is the head of s.
 //static
 template<class T> 
-BOOL LLStringBase<T>::isHead( const std::basic_string<T>& string, const T* s ) 
+BOOL LLStringUtilBase<T>::isHead( const std::basic_string<T>& string, const T* s ) 
 { 
 	if( string.empty() )
 	{
@@ -1155,14 +1046,14 @@ BOOL LLStringBase<T>::isHead( const std::basic_string<T>& string, const T* s )
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToBOOL(const std::basic_string<T>& string, BOOL& value)
+BOOL LLStringUtilBase<T>::convertToBOOL(const std::basic_string<T>& string, BOOL& value)
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	LLStringBase<T> temp( string );
+	std::basic_string<T> temp( string );
 	trim(temp);
 	if( 
 		(temp == "1") || 
@@ -1192,7 +1083,7 @@ BOOL LLStringBase<T>::convertToBOOL(const std::basic_string<T>& string, BOOL& va
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToU8(const std::basic_string<T>& string, U8& value) 
+BOOL LLStringUtilBase<T>::convertToU8(const std::basic_string<T>& string, U8& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1205,7 +1096,7 @@ BOOL LLStringBase<T>::convertToU8(const std::basic_string<T>& string, U8& value)
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToS8(const std::basic_string<T>& string, S8& value) 
+BOOL LLStringUtilBase<T>::convertToS8(const std::basic_string<T>& string, S8& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1218,7 +1109,7 @@ BOOL LLStringBase<T>::convertToS8(const std::basic_string<T>& string, S8& value)
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToS16(const std::basic_string<T>& string, S16& value) 
+BOOL LLStringUtilBase<T>::convertToS16(const std::basic_string<T>& string, S16& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1231,7 +1122,7 @@ BOOL LLStringBase<T>::convertToS16(const std::basic_string<T>& string, S16& valu
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToU16(const std::basic_string<T>& string, U16& value) 
+BOOL LLStringUtilBase<T>::convertToU16(const std::basic_string<T>& string, U16& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1244,14 +1135,14 @@ BOOL LLStringBase<T>::convertToU16(const std::basic_string<T>& string, U16& valu
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToU32(const std::basic_string<T>& string, U32& value) 
+BOOL LLStringUtilBase<T>::convertToU32(const std::basic_string<T>& string, U32& value) 
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	LLStringBase<T> temp( string );
+	std::basic_string<T> temp( string );
 	trim(temp);
 	U32 v;
 	std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
@@ -1271,14 +1162,14 @@ BOOL LLStringBase<T>::convertToU32(const std::basic_string<T>& string, U32& valu
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToS32(const std::basic_string<T>& string, S32& value) 
+BOOL LLStringUtilBase<T>::convertToS32(const std::basic_string<T>& string, S32& value) 
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	LLStringBase<T> temp( string );
+	std::basic_string<T> temp( string );
 	trim(temp);
 	S32 v;
 	std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
@@ -1298,7 +1189,7 @@ BOOL LLStringBase<T>::convertToS32(const std::basic_string<T>& string, S32& valu
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToF32(const std::basic_string<T>& string, F32& value) 
+BOOL LLStringUtilBase<T>::convertToF32(const std::basic_string<T>& string, F32& value) 
 {
 	F64 value64 = 0.0;
 	BOOL success = convertToF64(string, value64);
@@ -1311,14 +1202,14 @@ BOOL LLStringBase<T>::convertToF32(const std::basic_string<T>& string, F32& valu
 }
 
 template<class T> 
-BOOL LLStringBase<T>::convertToF64(const std::basic_string<T>& string, F64& value)
+BOOL LLStringUtilBase<T>::convertToF64(const std::basic_string<T>& string, F64& value)
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	LLStringBase<T> temp( string );
+	std::basic_string<T> temp( string );
 	trim(temp);
 	F64 v;
 	std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
@@ -1338,7 +1229,7 @@ BOOL LLStringBase<T>::convertToF64(const std::basic_string<T>& string, F64& valu
 }
 
 template<class T> 
-void LLStringBase<T>::truncate(std::basic_string<T>& string, size_type count)
+void LLStringUtilBase<T>::truncate(std::basic_string<T>& string, size_type count)
 {
 	size_type cur_size = string.size();
 	string.resize(count < cur_size ? count : cur_size);
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index 1285851..cb2e34a 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -143,28 +143,22 @@ LLOSInfo::LLOSInfo() :
 
 			std::string csdversion = utf16str_to_utf8str(osvi.szCSDVersion);
 			// Display version, service pack (if any), and build number.
-			char tmp[MAX_STRING];		/* Flawfinder: ignore */
+			std::string tmpstr;
 			if(osvi.dwMajorVersion <= 4)
 			{
-				snprintf(	/* Flawfinder: ignore */
-					tmp,
-					sizeof(tmp),
-					"version %d.%d %s (Build %d)",
-					osvi.dwMajorVersion,
-					osvi.dwMinorVersion,
-					csdversion.c_str(),
-					(osvi.dwBuildNumber & 0xffff));
+				tmpstr = llformat("version %d.%d %s (Build %d)",
+								  osvi.dwMajorVersion,
+								  osvi.dwMinorVersion,
+								  csdversion.c_str(),
+								  (osvi.dwBuildNumber & 0xffff));
 			}
 			else
 			{
-				snprintf(	/* Flawfinder: ignore */
-					tmp,
-					sizeof(tmp),
-					"%s (Build %d)",
-					csdversion.c_str(),
-					(osvi.dwBuildNumber & 0xffff));	 
+				tmpstr = llformat("%s (Build %d)",
+								  csdversion.c_str(),
+								  (osvi.dwBuildNumber & 0xffff));
 			}
-			mOSString = mOSStringSimple + tmp;
+			mOSString = mOSStringSimple + tmpstr;
 		}
 		break;
 
@@ -397,7 +391,7 @@ LLCPUInfo::LLCPUInfo()
 	mCPUString = out.str();
 	
 #elif LL_LINUX
-	std::map< LLString, LLString > cpuinfo;
+	std::map< std::string, std::string > cpuinfo;
 	LLFILE* cpuinfo_fp = LLFile::fopen(CPUINFO_FILE, "rb");
 	if(cpuinfo_fp)
 	{
@@ -420,21 +414,21 @@ LLCPUInfo::LLCPUInfo()
 			if (nlspot == NULL)
 				nlspot = line + strlen( line ); // Fallback to terminating NUL
 			std::string linename( line, tabspot );
-			LLString llinename(linename);
-			LLString::toLower(llinename);
+			std::string llinename(linename);
+			LLStringUtil::toLower(llinename);
 			std::string lineval( spacespot + 1, nlspot );
 			cpuinfo[ llinename ] = lineval;
 		}
 		fclose(cpuinfo_fp);
 	}
 # if LL_X86
-	LLString flags = " " + cpuinfo["flags"] + " ";
-	LLString::toLower(flags);
+	std::string flags = " " + cpuinfo["flags"] + " ";
+	LLStringUtil::toLower(flags);
 	mHasSSE = ( flags.find( " sse " ) != std::string::npos );
 	mHasSSE2 = ( flags.find( " sse2 " ) != std::string::npos );
 	
 	F64 mhz;
-	if (LLString::convertToF64(cpuinfo["cpu mhz"], mhz)
+	if (LLStringUtil::convertToF64(cpuinfo["cpu mhz"], mhz)
 	    && 200.0 < mhz && mhz < 10000.0)
 	{
 		mCPUMhz = (S32)llrint(mhz);
@@ -658,18 +652,17 @@ std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info)
 	return s;
 }
 
-BOOL gunzip_file(const char *srcfile, const char *dstfile)
+BOOL gunzip_file(const std::string& srcfile, const std::string& dstfile)
 {
-	char tmpfile[LL_MAX_PATH];		/* Flawfinder: ignore */
+	std::string tmpfile;
 	const S32 UNCOMPRESS_BUFFER_SIZE = 32768;
 	BOOL retval = FALSE;
 	gzFile src = NULL;
 	U8 buffer[UNCOMPRESS_BUFFER_SIZE];
 	LLFILE *dst = NULL;
 	S32 bytes = 0;
-	(void *) strcpy(tmpfile, dstfile);		/* Flawfinder: ignore */
-	(void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1);		/* Flawfinder: ignore */
-	src = gzopen(srcfile, "rb");
+	tmpfile = dstfile + ".t";
+	src = gzopen(srcfile.c_str(), "rb");
 	if (! src) goto err;
 	dst = LLFile::fopen(tmpfile, "wb");		/* Flawfinder: ignore */
 	if (! dst) goto err;
@@ -693,18 +686,17 @@ err:
 	return retval;
 }
 
-BOOL gzip_file(const char *srcfile, const char *dstfile)
+BOOL gzip_file(const std::string& srcfile, const std::string& dstfile)
 {
 	const S32 COMPRESS_BUFFER_SIZE = 32768;
-	char tmpfile[LL_MAX_PATH];		/* Flawfinder: ignore */
+	std::string tmpfile;
 	BOOL retval = FALSE;
 	U8 buffer[COMPRESS_BUFFER_SIZE];
 	gzFile dst = NULL;
 	LLFILE *src = NULL;
 	S32 bytes = 0;
-	(void *) strcpy(tmpfile, dstfile);		/* Flawfinder: ignore */
-	(void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1);		/* Flawfinder: ignore */
-	dst = gzopen(tmpfile, "wb");		/* Flawfinder: ignore */
+	tmpfile = dstfile + ".t";
+	dst = gzopen(tmpfile.c_str(), "wb");		/* Flawfinder: ignore */
 	if (! dst) goto err;
 	src = LLFile::fopen(srcfile, "rb");		/* Flawfinder: ignore */
 	if (! src) goto err;
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h
index da7f07e..b764ca9 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -127,9 +127,9 @@ std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info);
 std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info);
 
 // gunzip srcfile into dstfile.  Returns FALSE on error.
-BOOL gunzip_file(const char *srcfile, const char *dstfile);
+BOOL gunzip_file(const std::string& srcfile, const std::string& dstfile);
 // gzip srcfile into dstfile.  Returns FALSE on error.
-BOOL gzip_file(const char *srcfile, const char *dstfile);
+BOOL gzip_file(const std::string& srcfile, const std::string& dstfile);
 
 extern LLCPUInfo gSysCPU;
 
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index 48ebc4b..e07170b 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -31,7 +31,7 @@
 #include "linden_common.h"
 #include "llapr.h"
 
-#include "apr-1/apr_portable.h"
+#include "apr_portable.h"
 
 #include "llthread.h"
 
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index 608b218..9da3134 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -36,7 +36,7 @@
 #include "llapp.h"
 #include "llmemory.h"
 
-#include "apr-1/apr_thread_cond.h"
+#include "apr_thread_cond.h"
 
 class LLThread;
 class LLMutex;
diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index 25d9897..967570d 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -429,10 +429,9 @@ BOOL LLTimer::knownBadTimer()
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-U32 time_corrected()
+time_t time_corrected()
 {
-	U32 corrected_time = (U32)time(NULL) + gUTCOffset;
-	return corrected_time;
+	return time(NULL) + gUTCOffset;
 }
 
 
@@ -452,27 +451,25 @@ BOOL is_daylight_savings()
 }
 
 
-struct tm* utc_to_pacific_time(S32 utc_time, BOOL pacific_daylight_time)
+struct tm* utc_to_pacific_time(time_t utc_time, BOOL pacific_daylight_time)
 {
-	time_t unix_time = (time_t)utc_time;
-
 	S32 pacific_offset_hours;
 	if (pacific_daylight_time)
 	{
-		pacific_offset_hours = -7;
+		pacific_offset_hours = 7;
 	}
 	else
 	{
-		pacific_offset_hours = -8;
+		pacific_offset_hours = 8;
 	}
 
 	// We subtract off the PST/PDT offset _before_ getting
 	// "UTC" time, because this will handle wrapping around
 	// for 5 AM UTC -> 10 PM PDT of the previous day.
-	unix_time += pacific_offset_hours * MIN_PER_HOUR * SEC_PER_MIN;
+	utc_time -= pacific_offset_hours * MIN_PER_HOUR * SEC_PER_MIN;
  
 	// Internal buffer to PST/PDT (see above)
-	struct tm* internal_time = gmtime(&unix_time);
+	struct tm* internal_time = gmtime(&utc_time);
 
 	/*
 	// Don't do this, this won't correctly tell you if daylight savings is active in CA or not.
@@ -486,7 +483,7 @@ struct tm* utc_to_pacific_time(S32 utc_time, BOOL pacific_daylight_time)
 }
 
 
-void microsecondsToTimecodeString(U64 current_time, char *tcstring)
+void microsecondsToTimecodeString(U64 current_time, std::string& tcstring)
 {
 	U64 hours;
 	U64 minutes;
@@ -504,11 +501,11 @@ void microsecondsToTimecodeString(U64 current_time, char *tcstring)
 	subframes = current_time / (U64)42;
 	subframes %= 100;
 
-	sprintf(tcstring,"%3.3d:%2.2d:%2.2d:%2.2d.%2.2d",(int)hours,(int)minutes,(int)seconds,(int)frames,(int)subframes);		/* Flawfinder: ignore */
+	tcstring = llformat("%3.3d:%2.2d:%2.2d:%2.2d.%2.2d",(int)hours,(int)minutes,(int)seconds,(int)frames,(int)subframes);
 }
 
 
-void secondsToTimecodeString(F32 current_time, char *tcstring)
+void secondsToTimecodeString(F32 current_time, std::string& tcstring)
 {
 	microsecondsToTimecodeString((U64)((F64)(SEC_TO_MICROSEC*current_time)), tcstring);
 }
@@ -541,7 +538,7 @@ void LLEventTimer::updateClass()
 	{
 		LLEventTimer* timer = *iter++;
 		F32 et = timer->mEventTimer.getElapsedTimeF32();
-		if (et > timer->mPeriod) {
+		if (timer->mEventTimer.getStarted() && et > timer->mPeriod) {
 			timer->mEventTimer.reset();
 			if ( timer->tick() )
 			{
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h
index 91b93d6..8d94276 100644
--- a/linden/indra/llcommon/lltimer.h
+++ b/linden/indra/llcommon/lltimer.h
@@ -35,6 +35,7 @@
 #if LL_LINUX || LL_DARWIN
 #include <sys/time.h>
 #endif
+#include <limits.h>
 
 #include "stdtypes.h"
 
@@ -117,7 +118,35 @@ void ms_sleep(U32 ms);
 
 // Returns the correct UTC time in seconds, like time(NULL).
 // Useful on the viewer, which may have its local clock set wrong.
-U32 time_corrected();
+time_t time_corrected();
+
+static inline time_t time_min()
+{
+	if (sizeof(time_t) == 4)
+	{
+		return (time_t) INT_MIN;
+	} else {
+#ifdef LLONG_MIN
+		return (time_t) LLONG_MIN;
+#else
+		return (time_t) LONG_MIN;
+#endif
+	}
+}
+
+static inline time_t time_max()
+{
+	if (sizeof(time_t) == 4)
+	{
+		return (time_t) INT_MAX;
+	} else {
+#ifdef LLONG_MAX
+		return (time_t) LLONG_MAX;
+#else
+		return (time_t) LONG_MAX;
+#endif
+	}
+}
 
 // Correction factor used by time_corrected() above.
 extern S32 gUTCOffset;
@@ -131,10 +160,10 @@ BOOL is_daylight_savings();
 // S32 utc_time;
 // utc_time = time_corrected();
 // struct tm* internal_time = utc_to_pacific_time(utc_time, gDaylight);
-struct tm* utc_to_pacific_time(S32 utc_time, BOOL pacific_daylight_time);
+struct tm* utc_to_pacific_time(time_t utc_time, BOOL pacific_daylight_time);
 
-void microsecondsToTimecodeString(U64 current_time, char *tcstring);
-void secondsToTimecodeString(F32 current_time, char *tcstring);
+void microsecondsToTimecodeString(U64 current_time, std::string& tcstring);
+void secondsToTimecodeString(F32 current_time, std::string& tcstring);
 
 // class for scheduling a function to be called at a given frequency (approximate, inprecise)
 class LLEventTimer 
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp
index 7db8f3b..b83036b 100644
--- a/linden/indra/llcommon/lluri.cpp
+++ b/linden/indra/llcommon/lluri.cpp
@@ -38,7 +38,7 @@
 #include "llsd.h"
 #include <iomanip>
   
-#include "../llmath/lluuid.h"
+#include "lluuid.h"
 
 // system includes
 #include <boost/tokenizer.hpp>
diff --git a/linden/indra/llcommon/lluuid.cpp b/linden/indra/llcommon/lluuid.cpp
new file mode 100644
index 0000000..7e4eb50
--- /dev/null
+++ b/linden/indra/llcommon/lluuid.cpp
@@ -0,0 +1,923 @@
+/** 
+ * @file lluuid.cpp
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+// We can't use WIN32_LEAN_AND_MEAN here, needs lots of includes.
+#if LL_WINDOWS
+#	undef WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>
+#	include <windows.h>
+#endif
+
+#include "lldefs.h"
+#include "llerror.h"
+
+#include "lluuid.h"
+#include "llerror.h"
+#include "llrand.h"
+#include "llmd5.h"
+#include "llstring.h"
+#include "lltimer.h"
+
+const LLUUID LLUUID::null;
+const LLTransactionID LLTransactionID::tnull;
+
+/*
+
+NOT DONE YET!!!
+
+static char BASE85_TABLE[] = {
+	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+	'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+	'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+	'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+	'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+	'y', 'z', '!', '#', '$', '%', '&', '(', ')', '*',
+	'+', '-', ';', '[', '=', '>', '?', '@', '^', '_',
+	'`', '{', '|', '}', '~', '\0'
+};
+
+
+void encode( char * fiveChars, unsigned int word ) throw( )
+{
+for( int ix = 0; ix < 5; ++ix ) {
+fiveChars[4-ix] = encodeTable[ word % 85];
+word /= 85;
+}
+}
+
+To decode:
+unsigned int decode( char const * fiveChars ) throw( bad_input_data )
+{
+unsigned int ret = 0;
+for( int ix = 0; ix < 5; ++ix ) {
+char * s = strchr( encodeTable, fiveChars[ ix ] );
+if( s == 0 ) throw bad_input_data();
+ret = ret * 85 + (s-encodeTable);
+}
+return ret;
+}
+
+void LLUUID::toBase85(char* out)
+{
+	U32* me = (U32*)&(mData[0]);
+	for(S32 i = 0; i < 4; ++i)
+	{
+		char* o = &out[i*i];
+		for(S32 j = 0; j < 5; ++j)
+		{
+			o[4-j] = BASE85_TABLE[ me[i] % 85];
+			word /= 85;
+		}
+	}
+}
+
+unsigned int decode( char const * fiveChars ) throw( bad_input_data )
+{
+	unsigned int ret = 0;
+	for( S32 ix = 0; ix < 5; ++ix )
+	{
+		char * s = strchr( encodeTable, fiveChars[ ix ] );
+		ret = ret * 85 + (s-encodeTable);
+	}
+	return ret;
+} 
+*/
+
+#define LL_USE_JANKY_RANDOM_NUMBER_GENERATOR 0
+#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
+/**
+ * @brief a global for
+ */
+static U64 sJankyRandomSeed(LLUUID::getRandomSeed());
+
+/**
+ * @brief generate a random U32.
+ */
+U32 janky_fast_random_bytes()
+{
+	sJankyRandomSeed = U64L(1664525) * sJankyRandomSeed + U64L(1013904223); 
+	return (U32)sJankyRandomSeed;
+}
+
+/**
+ * @brief generate a random U32 from [0, val)
+ */
+U32 janky_fast_random_byes_range(U32 val)
+{
+	sJankyRandomSeed = U64L(1664525) * sJankyRandomSeed + U64L(1013904223); 
+	return (U32)(sJankyRandomSeed) % val; 
+}
+
+/**
+ * @brief generate a random U32 from [0, val)
+ */
+U32 janky_fast_random_seeded_bytes(U32 seed, U32 val)
+{
+	seed = U64L(1664525) * (U64)(seed) + U64L(1013904223); 
+	return (U32)(seed) % val; 
+}
+#endif
+
+// Common to all UUID implementations
+void LLUUID::toString(std::string& out) const
+{
+	out = llformat(
+		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+		(U8)(mData[0]),
+		(U8)(mData[1]),
+		(U8)(mData[2]),
+		(U8)(mData[3]),
+		(U8)(mData[4]),
+		(U8)(mData[5]),
+		(U8)(mData[6]),
+		(U8)(mData[7]),
+		(U8)(mData[8]),
+		(U8)(mData[9]),
+		(U8)(mData[10]),
+		(U8)(mData[11]),
+		(U8)(mData[12]),
+		(U8)(mData[13]),
+		(U8)(mData[14]),
+		(U8)(mData[15]));
+}
+
+// *TODO: deprecate
+void LLUUID::toString(char *out) const
+{
+	std::string buffer;
+	toString(buffer);
+	strcpy(out,buffer.c_str()); /* Flawfinder: ignore */
+}
+
+void LLUUID::toCompressedString(std::string& out) const
+{
+	char bytes[UUID_BYTES+1];
+	memcpy(bytes, mData, UUID_BYTES);		/* Flawfinder: ignore */
+	bytes[UUID_BYTES] = '\0';
+	out.assign(bytes, UUID_BYTES);
+}
+
+// *TODO: deprecate
+void LLUUID::toCompressedString(char *out) const
+{
+	memcpy(out, mData, UUID_BYTES);		/* Flawfinder: ignore */
+	out[UUID_BYTES] = '\0';
+}
+
+std::string LLUUID::getString() const
+{
+	return asString();
+}
+
+std::string LLUUID::asString() const
+{
+	std::string str;
+	toString(str);
+	return str;
+}
+
+BOOL LLUUID::set(const char* in_string, BOOL emit)
+{
+	return set(ll_safe_string(in_string));
+}
+
+BOOL LLUUID::set(const std::string& in_string, BOOL emit)
+{
+	BOOL broken_format = FALSE;
+
+	// empty strings should make NULL uuid
+	if (in_string.empty())
+	{
+		setNull();
+		return TRUE;
+	}
+
+	if (in_string.length() != (UUID_STR_LENGTH - 1))		/* Flawfinder: ignore */
+	{
+		// I'm a moron.  First implementation didn't have the right UUID format.
+		// Shouldn't see any of these any more
+		if (in_string.length() == (UUID_STR_LENGTH - 2))	/* Flawfinder: ignore */
+		{
+			if(emit)
+			{
+				llinfos << "Warning! Using broken UUID string format" << llendl;
+			}
+			broken_format = TRUE;
+		}
+		else
+		{
+			// Bad UUID string.  Spam as INFO, as most cases we don't care.
+			if(emit)
+			{
+				llinfos << "Bad UUID string: " << in_string << llendl;
+			}
+			setNull();
+			return FALSE;
+		}
+	}
+
+	U8 cur_pos = 0;
+	S32 i;
+	for (i = 0; i < UUID_BYTES; i++)
+	{
+		if ((i == 4) || (i == 6) || (i == 8) || (i == 10))
+		{
+			cur_pos++;
+			if (broken_format && (i==10))
+			{
+				// Missing - in the broken format
+				cur_pos--;
+			}
+		}
+
+		mData[i] = 0;
+
+		if ((in_string[cur_pos] >= '0') && (in_string[cur_pos] <= '9'))
+		{
+			mData[i] += (U8)(in_string[cur_pos] - '0');
+		}
+		else if ((in_string[cur_pos] >= 'a') && (in_string[cur_pos] <='f'))
+		{
+			mData[i] += (U8)(10 + in_string[cur_pos] - 'a');
+		}
+		else if ((in_string[cur_pos] >= 'A') && (in_string[cur_pos] <='F'))
+		{
+			mData[i] += (U8)(10 + in_string[cur_pos] - 'A');
+		}
+		else
+		{
+			if(emit)
+			{							
+				llwarns << "Invalid UUID string character" << llendl;
+			}
+			setNull();
+			return FALSE;
+		}
+
+		mData[i] = mData[i] << 4;
+		cur_pos++;
+
+		if ((in_string[cur_pos] >= '0') && (in_string[cur_pos] <= '9'))
+		{
+			mData[i] += (U8)(in_string[cur_pos] - '0');
+		}
+		else if ((in_string[cur_pos] >= 'a') && (in_string[cur_pos] <='f'))
+		{
+			mData[i] += (U8)(10 + in_string[cur_pos] - 'a');
+		}
+		else if ((in_string[cur_pos] >= 'A') && (in_string[cur_pos] <='F'))
+		{
+			mData[i] += (U8)(10 + in_string[cur_pos] - 'A');
+		}
+		else
+		{
+			if(emit)
+			{
+				llwarns << "Invalid UUID string character" << llendl;
+			}
+			setNull();
+			return FALSE;
+		}
+		cur_pos++;
+	}
+
+	return TRUE;
+}
+
+BOOL LLUUID::validate(const std::string& in_string)
+{
+	BOOL broken_format = FALSE;
+	if (in_string.length() != (UUID_STR_LENGTH - 1))		/* Flawfinder: ignore */
+	{
+		// I'm a moron.  First implementation didn't have the right UUID format.
+		if (in_string.length() == (UUID_STR_LENGTH - 2))		/* Flawfinder: ignore */
+		{
+			broken_format = TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	U8 cur_pos = 0;
+	for (U32 i = 0; i < 16; i++)
+	{
+		if ((i == 4) || (i == 6) || (i == 8) || (i == 10))
+		{
+			cur_pos++;
+			if (broken_format && (i==10))
+			{
+				// Missing - in the broken format
+				cur_pos--;
+			}
+		}
+
+		if ((in_string[cur_pos] >= '0') && (in_string[cur_pos] <= '9'))
+		{
+		}
+		else if ((in_string[cur_pos] >= 'a') && (in_string[cur_pos] <='f'))
+		{
+		}
+		else if ((in_string[cur_pos] >= 'A') && (in_string[cur_pos] <='F'))
+		{
+		}
+		else
+		{
+			return FALSE;
+		}
+
+		cur_pos++;
+
+		if ((in_string[cur_pos] >= '0') && (in_string[cur_pos] <= '9'))
+		{
+		}
+		else if ((in_string[cur_pos] >= 'a') && (in_string[cur_pos] <='f'))
+		{
+		}
+		else if ((in_string[cur_pos] >= 'A') && (in_string[cur_pos] <='F'))
+		{
+		}
+		else
+		{
+			return FALSE;
+		}
+		cur_pos++;
+	}
+	return TRUE;
+}
+
+const LLUUID& LLUUID::operator^=(const LLUUID& rhs)
+{
+	U32* me = (U32*)&(mData[0]);
+	const U32* other = (U32*)&(rhs.mData[0]);
+	for(S32 i = 0; i < 4; ++i)
+	{
+		me[i] = me[i] ^ other[i];
+	}
+	return *this;
+}
+
+LLUUID LLUUID::operator^(const LLUUID& rhs) const
+{
+	LLUUID id(*this);
+	id ^= rhs;
+	return id;
+}
+
+void LLUUID::combine(const LLUUID& other, LLUUID& result) const
+{
+	LLMD5 md5_uuid;
+	md5_uuid.update((unsigned char*)mData, 16);
+	md5_uuid.update((unsigned char*)other.mData, 16);
+	md5_uuid.finalize();
+	md5_uuid.raw_digest(result.mData);
+}
+
+LLUUID LLUUID::combine(const LLUUID &other) const
+{
+	LLUUID combination;
+	combine(other, combination);
+	return combination;
+}
+
+std::ostream& operator<<(std::ostream& s, const LLUUID &uuid)
+{
+	std::string uuid_str;
+	uuid.toString(uuid_str);
+	s << uuid_str;
+	return s;
+}
+
+std::istream& operator>>(std::istream &s, LLUUID &uuid)
+{
+	U32 i;
+	char uuid_str[UUID_STR_LENGTH];		/* Flawfinder: ignore */
+	for (i = 0; i < UUID_STR_LENGTH-1; i++)
+	{
+		s >> uuid_str[i];
+	}
+	uuid_str[i] = '\0';
+	uuid.set(std::string(uuid_str));
+	return s;
+}
+
+static void get_random_bytes(void *buf, int nbytes)
+{
+	int i;
+	char *cp = (char *) buf;
+
+	// *NOTE: If we are not using the janky generator ll_rand()
+	// generates at least 3 good bytes of data since it is 0 to
+	// RAND_MAX. This could be made more efficient by copying all the
+	// bytes.
+	for (i=0; i < nbytes; i++)
+#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
+		*cp++ = janky_fast_random_bytes() & 0xFF;
+#else
+		*cp++ = ll_rand() & 0xFF;
+#endif
+	return;	
+}
+
+#if LL_WINDOWS
+typedef struct _ASTAT_
+{
+	ADAPTER_STATUS adapt;
+	NAME_BUFFER    NameBuff [30];
+}ASTAT, * PASTAT;
+
+// static
+S32 LLUUID::getNodeID(unsigned char * node_id)
+{
+	  ASTAT Adapter;
+      NCB Ncb;
+      UCHAR uRetCode;
+      LANA_ENUM   lenum;
+      int      i;
+	  int retval = 0;
+
+      memset( &Ncb, 0, sizeof(Ncb) );
+      Ncb.ncb_command = NCBENUM;
+      Ncb.ncb_buffer = (UCHAR *)&lenum;
+      Ncb.ncb_length = sizeof(lenum);
+      uRetCode = Netbios( &Ncb );
+ //     printf( "The NCBENUM return code is: 0x%x \n", uRetCode );
+
+      for(i=0; i < lenum.length ;i++)
+      {
+          memset( &Ncb, 0, sizeof(Ncb) );
+          Ncb.ncb_command = NCBRESET;
+          Ncb.ncb_lana_num = lenum.lana[i];
+
+          uRetCode = Netbios( &Ncb );
+ //         printf( "The NCBRESET on LANA %d return code is: 0x%x \n",
+ //                 lenum.lana[i], uRetCode );
+
+          memset( &Ncb, 0, sizeof (Ncb) );
+          Ncb.ncb_command = NCBASTAT;
+          Ncb.ncb_lana_num = lenum.lana[i];
+
+          strcpy( (char *)Ncb.ncb_callname,  "*              " );		/* Flawfinder: ignore */
+          Ncb.ncb_buffer = (unsigned char *)&Adapter;
+          Ncb.ncb_length = sizeof(Adapter);
+
+          uRetCode = Netbios( &Ncb );
+//          printf( "The NCBASTAT on LANA %d return code is: 0x%x \n",
+//                 lenum.lana[i], uRetCode );
+          if ( uRetCode == 0 )
+          {
+//            printf( "The Ethernet Number on LANA %d is: %02x%02x%02x%02x%02x%02x\n",
+//	 			  lenum.lana[i],
+//                  Adapter.adapt.adapter_address[0],
+//                  Adapter.adapt.adapter_address[1],
+//                  Adapter.adapt.adapter_address[2],
+//                  Adapter.adapt.adapter_address[3],
+//                  Adapter.adapt.adapter_address[4],
+//                  Adapter.adapt.adapter_address[5] );
+			memcpy(node_id,Adapter.adapt.adapter_address,6);		/* Flawfinder: ignore */
+			retval = 1;
+
+          }
+	  }
+	return retval;
+}
+
+#elif LL_DARWIN
+// Mac OS X version of the UUID generation code...
+/*
+ * Get an ethernet hardware address, if we can find it...
+ */
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <ifaddrs.h>
+
+// static
+S32 LLUUID::getNodeID(unsigned char *node_id)
+{
+	int i;
+	unsigned char 	*a = NULL;
+	struct ifaddrs *ifap, *ifa;
+	int rv;
+	S32 result = 0;
+
+	if ((rv=getifaddrs(&ifap))==-1)
+	{       
+		return -1;
+	}
+	if (ifap == NULL)
+	{
+		return -1;
+	}
+
+	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next)
+	{       
+//		printf("Interface %s, address family %d, ", ifa->ifa_name, ifa->ifa_addr->sa_family);
+		for(i=0; i< ifa->ifa_addr->sa_len; i++)
+		{
+//			printf("%02X ", (unsigned char)ifa->ifa_addr->sa_data[i]);
+		}
+//		printf("\n");
+		
+		if(ifa->ifa_addr->sa_family == AF_LINK)
+		{
+			// This is a link-level address
+			struct sockaddr_dl *lla = (struct sockaddr_dl *)ifa->ifa_addr;
+			
+//			printf("\tLink level address, type %02X\n", lla->sdl_type);
+
+			if(lla->sdl_type == IFT_ETHER)
+			{
+				// Use the first ethernet MAC in the list.
+				// For some reason, the macro LLADDR() defined in net/if_dl.h doesn't expand correctly.  This is what it would do.
+				a = (unsigned char *)&((lla)->sdl_data);
+				a += (lla)->sdl_nlen;
+				
+				if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
+				{
+					continue;
+				}
+
+				if (node_id) 
+				{
+					memcpy(node_id, a, 6);
+					result = 1;
+				}
+				
+				// We found one.
+				break;
+			}
+		}
+	}
+	freeifaddrs(ifap);
+
+	return result;
+}
+
+#else
+
+// Linux version of the UUID generation code...
+/*
+ * Get the ethernet hardware address, if we can find it...
+ */
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#define HAVE_NETINET_IN_H
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#if LL_SOLARIS
+#include <sys/sockio.h>
+#elif !LL_DARWIN
+#include <linux/sockios.h>
+#endif
+#endif
+
+// static
+S32 LLUUID::getNodeID(unsigned char *node_id)
+{
+	int 		sd;
+	struct ifreq 	ifr, *ifrp;
+	struct ifconf 	ifc;
+	char buf[1024];
+	int		n, i;
+	unsigned char 	*a;
+	
+/*
+ * BSD 4.4 defines the size of an ifreq to be
+ * max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len
+ * However, under earlier systems, sa_len isn't present, so the size is 
+ * just sizeof(struct ifreq)
+ */
+#ifdef HAVE_SA_LEN
+#ifndef max
+#define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#define ifreq_size(i) max(sizeof(struct ifreq),\
+     sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
+#else
+#define ifreq_size(i) sizeof(struct ifreq)
+#endif /* HAVE_SA_LEN*/
+
+	sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+	if (sd < 0) {
+		return -1;
+	}
+	memset(buf, 0, sizeof(buf));
+	ifc.ifc_len = sizeof(buf);
+	ifc.ifc_buf = buf;
+	if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) {
+		close(sd);
+		return -1;
+	}
+	n = ifc.ifc_len;
+	for (i = 0; i < n; i+= ifreq_size(*ifr) ) {
+		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
+		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);		/* Flawfinder: ignore */
+#ifdef SIOCGIFHWADDR
+		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+			continue;
+		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
+#else
+#ifdef SIOCGENADDR
+		if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
+			continue;
+		a = (unsigned char *) ifr.ifr_enaddr;
+#else
+		/*
+		 * XXX we don't have a way of getting the hardware
+		 * address
+		 */
+		close(sd);
+		return 0;
+#endif /* SIOCGENADDR */
+#endif /* SIOCGIFHWADDR */
+		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
+			continue;
+		if (node_id) {
+			memcpy(node_id, a, 6);		/* Flawfinder: ignore */
+			close(sd);
+			return 1;
+		}
+	}
+	close(sd);
+	return 0;
+}
+
+#endif
+
+S32 LLUUID::cmpTime(uuid_time_t *t1, uuid_time_t *t2)
+{
+   // Compare two time values.
+
+   if (t1->high < t2->high) return -1;
+   if (t1->high > t2->high) return 1;
+   if (t1->low  < t2->low)  return -1;
+   if (t1->low  > t2->low)  return 1;
+   return 0;
+}
+
+void LLUUID::getSystemTime(uuid_time_t *timestamp)
+{
+   // Get system time with 100ns precision. Time is since Oct 15, 1582.
+#if LL_WINDOWS
+   ULARGE_INTEGER time;
+   GetSystemTimeAsFileTime((FILETIME *)&time);
+   // NT keeps time in FILETIME format which is 100ns ticks since
+   // Jan 1, 1601. UUIDs use time in 100ns ticks since Oct 15, 1582.
+   // The difference is 17 Days in Oct + 30 (Nov) + 31 (Dec)
+   // + 18 years and 5 leap days.
+   time.QuadPart +=
+            (unsigned __int64) (1000*1000*10)       // seconds
+          * (unsigned __int64) (60 * 60 * 24)       // days
+          * (unsigned __int64) (17+30+31+365*18+5); // # of days
+
+   timestamp->high = time.HighPart;
+   timestamp->low  = time.LowPart;
+#else
+   struct timeval tp;
+   gettimeofday(&tp, 0);
+
+   // Offset between UUID formatted times and Unix formatted times.
+   // UUID UTC base time is October 15, 1582.
+   // Unix base time is January 1, 1970.
+   U64 uuid_time = ((U64)tp.tv_sec * 10000000) + (tp.tv_usec * 10) +
+                           U64L(0x01B21DD213814000);
+   timestamp->high = (U32) (uuid_time >> 32);
+   timestamp->low  = (U32) (uuid_time & 0xFFFFFFFF);
+#endif
+}
+
+void LLUUID::getCurrentTime(uuid_time_t *timestamp)
+{
+   // Get current time as 60 bit 100ns ticks since whenever.
+   // Compensate for the fact that real clock resolution is less
+   // than 100ns.
+
+   const U32 uuids_per_tick = 1024;
+
+   static uuid_time_t time_last;
+   static U32    uuids_this_tick;
+   static BOOL     init = FALSE;
+
+   if (!init) {
+      getSystemTime(&time_last);
+      uuids_this_tick = uuids_per_tick;
+      init = TRUE;
+   }
+
+   uuid_time_t time_now = {0,0};
+
+   while (1) {
+      getSystemTime(&time_now);
+
+      // if clock reading changed since last UUID generated
+      if (cmpTime(&time_last, &time_now))  {
+         // reset count of uuid's generated with this clock reading
+         uuids_this_tick = 0;
+         break;
+      }
+      if (uuids_this_tick < uuids_per_tick) {
+         uuids_this_tick++;
+         break;
+      }
+      // going too fast for our clock; spin
+   }
+
+   time_last = time_now;
+
+   if (uuids_this_tick != 0) {
+      if (time_now.low & 0x80000000) {
+         time_now.low += uuids_this_tick;
+         if (!(time_now.low & 0x80000000))
+            time_now.high++;
+      } else
+         time_now.low += uuids_this_tick;
+   }
+
+   timestamp->high = time_now.high;
+   timestamp->low  = time_now.low;
+}
+
+void LLUUID::generate()
+{
+	// Create a UUID.
+	uuid_time_t timestamp;
+
+	static unsigned char node_id[6];	/* Flawfinder: ignore */
+	static int has_init = 0;
+   
+	// Create a UUID.
+	static uuid_time_t time_last = {0,0};
+	static U16 clock_seq = 0;
+#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
+	static U32 seed = 0L; // dummy seed.  reset it below
+#endif
+	if (!has_init) 
+	{
+		if (getNodeID(node_id) <= 0) 
+		{
+			get_random_bytes(node_id, 6);
+			/*
+			 * Set multicast bit, to prevent conflicts
+			 * with IEEE 802 addresses obtained from
+			 * network cards
+			 */
+			node_id[0] |= 0x80;
+		}
+
+		getCurrentTime(&time_last);
+#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
+		seed = time_last.low;
+#endif
+
+#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
+		clock_seq = (U16)janky_fast_random_seeded_bytes(seed, 65536);
+#else
+		clock_seq = (U16)ll_rand(65536);
+#endif
+		has_init = 1;
+	}
+
+	// get current time
+	getCurrentTime(&timestamp);
+
+	// if clock went backward change clockseq
+	if (cmpTime(&timestamp, &time_last) == -1) {
+		clock_seq = (clock_seq + 1) & 0x3FFF;
+		if (clock_seq == 0) clock_seq++;
+	}
+
+	memcpy(mData+10, node_id, 6);		/* Flawfinder: ignore */
+	U32 tmp;
+	tmp = timestamp.low;
+	mData[3] = (unsigned char) tmp;
+	tmp >>= 8;
+	mData[2] = (unsigned char) tmp;
+	tmp >>= 8;
+	mData[1] = (unsigned char) tmp;
+	tmp >>= 8;
+	mData[0] = (unsigned char) tmp;
+	
+	tmp = (U16) timestamp.high;
+	mData[5] = (unsigned char) tmp;
+	tmp >>= 8;
+	mData[4] = (unsigned char) tmp;
+
+	tmp = (timestamp.high >> 16) | 0x1000;
+	mData[7] = (unsigned char) tmp;
+	tmp >>= 8;
+	mData[6] = (unsigned char) tmp;
+
+	tmp = clock_seq;
+	mData[9] = (unsigned char) tmp;
+	tmp >>= 8;
+	mData[8] = (unsigned char) tmp;
+
+	LLMD5 md5_uuid;
+	
+	md5_uuid.update(mData,16);
+	md5_uuid.finalize();
+	md5_uuid.raw_digest(mData);
+
+    time_last = timestamp;
+}
+
+void LLUUID::generate(const std::string& hash_string)
+{
+	LLMD5 md5_uuid((U8*)hash_string.c_str());
+	md5_uuid.raw_digest(mData);
+}
+
+U32 LLUUID::getRandomSeed()
+{
+   static unsigned char seed[16];		/* Flawfinder: ignore */
+   
+   getNodeID(&seed[0]);
+   seed[6]='\0';
+   seed[7]='\0';
+   getSystemTime((uuid_time_t *)(&seed[8]));
+
+   LLMD5 md5_seed;
+	
+   md5_seed.update(seed,16);
+   md5_seed.finalize();
+   md5_seed.raw_digest(seed);
+   
+   return(*(U32 *)seed);
+}
+
+BOOL LLUUID::parseUUID(const std::string& buf, LLUUID* value)
+{
+	if( buf.empty() || value == NULL)
+	{
+		return FALSE;
+	}
+
+	std::string temp( buf );
+	LLStringUtil::trim(temp);
+	if( LLUUID::validate( temp ) )
+	{
+		value->set( temp );
+		return TRUE;
+	}
+	return FALSE;
+}
+
+LLAssetID LLTransactionID::makeAssetID(const LLUUID& session) const
+{
+	LLAssetID result;
+	if (isNull())
+	{
+		result.setNull();
+	}
+	else
+	{
+		combine(session, result);
+	}
+	return result;
+}
diff --git a/linden/indra/llcommon/lluuid.h b/linden/indra/llcommon/lluuid.h
new file mode 100644
index 0000000..3b057fb
--- /dev/null
+++ b/linden/indra/llcommon/lluuid.h
@@ -0,0 +1,331 @@
+/** 
+ * @file lluuid.h
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLUUID_H
+#define LL_LLUUID_H
+
+#include <iostream>
+#include <set>
+#include "stdtypes.h"
+
+const S32 UUID_BYTES = 16;
+const S32 UUID_WORDS = 4;
+const S32 UUID_STR_LENGTH = 37;	// actually wrong, should be 36 and use size below
+const S32 UUID_STR_SIZE = 37;
+const S32 UUID_BASE85_LENGTH = 21; // including the trailing NULL.
+
+struct uuid_time_t {
+	U32 high;
+	U32 low;
+		};
+
+class LLUUID
+{
+public:
+	//
+	// CREATORS
+	//
+	LLUUID();
+	explicit LLUUID(const char *in_string); // Convert from string.
+	explicit LLUUID(const std::string& in_string); // Convert from string.
+	LLUUID(const LLUUID &in);
+	LLUUID &operator=(const LLUUID &rhs);
+
+	~LLUUID();
+
+	//
+	// MANIPULATORS
+	//
+	void	generate();					// Generate a new UUID
+	void	generate(const std::string& stream); //Generate a new UUID based on hash of input stream
+	BOOL	set(const char *in_string, BOOL emit = TRUE);	// Convert from string, if emit is FALSE, do not emit warnings
+	BOOL	set(const std::string& in_string, BOOL emit = TRUE);	// Convert from string, if emit is FALSE, do not emit warnings
+	void	setNull();					// Faster than setting to LLUUID::null.
+
+    S32     cmpTime(uuid_time_t *t1, uuid_time_t *t2);
+	static void    getSystemTime(uuid_time_t *timestamp);
+	void    getCurrentTime(uuid_time_t *timestamp);
+
+	//
+	// ACCESSORS
+	//
+	BOOL	isNull() const;			// Faster than comparing to LLUUID::null.
+	BOOL	notNull() const;		// Faster than comparing to LLUUID::null.
+	// JC: This is dangerous.  It allows UUIDs to be cast automatically
+	// to integers, among other things.  Use isNull() or notNull().
+	//		operator bool() const;
+
+	// JC: These must return real bool's (not BOOLs) or else use of the STL
+	// will generate bool-to-int performance warnings.
+	bool	operator==(const LLUUID &rhs) const;
+	bool	operator!=(const LLUUID &rhs) const;
+	bool	operator<(const LLUUID &rhs) const;
+	bool	operator>(const LLUUID &rhs) const;
+
+	// xor functions. Useful since any two random uuids xored together
+	// will yield a determinate third random unique id that can be
+	// used as a key in a single uuid that represents 2.
+	const LLUUID& operator^=(const LLUUID& rhs);
+	LLUUID operator^(const LLUUID& rhs) const;
+
+	// similar to functions above, but not invertible
+	// yields a third random UUID that can be reproduced from the two inputs
+	// but which, given the result and one of the inputs can't be used to
+	// deduce the other input
+	LLUUID combine(const LLUUID& other) const;
+	void combine(const LLUUID& other, LLUUID& result) const;  
+
+	friend std::ostream&	 operator<<(std::ostream& s, const LLUUID &uuid);
+	friend std::istream&	 operator>>(std::istream& s, LLUUID &uuid);
+
+	void toString(char *out) const;		// Does not allocate memory, needs 36 characters (including \0)
+	void toString(std::string& out) const;
+	void toCompressedString(char *out) const;	// Does not allocate memory, needs 17 characters (including \0)
+	void toCompressedString(std::string& out) const;
+
+	std::string asString() const;
+	std::string getString() const;
+
+	U16 getCRC16() const;
+	U32 getCRC32() const;
+
+	static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal.
+
+	static const LLUUID null;
+
+	static U32 getRandomSeed();
+	static S32 getNodeID(unsigned char * node_id);
+
+	static BOOL parseUUID(const std::string& buf, LLUUID* value);
+	
+	U8 mData[UUID_BYTES];
+};
+
+
+// Construct
+inline LLUUID::LLUUID()
+{
+	setNull();
+}
+
+
+// Faster than copying from memory
+inline void LLUUID::setNull()
+{
+	U32 *word = (U32 *)mData;
+	word[0] = 0;
+	word[1] = 0;
+	word[2] = 0;
+	word[3] = 0;
+}
+
+
+// Compare
+inline bool LLUUID::operator==(const LLUUID& rhs) const
+{
+	U32 *tmp = (U32 *)mData;
+	U32 *rhstmp = (U32 *)rhs.mData;
+	// Note: binary & to avoid branching
+	return 
+		(tmp[0] == rhstmp[0]) &  
+		(tmp[1] == rhstmp[1]) &
+		(tmp[2] == rhstmp[2]) &
+		(tmp[3] == rhstmp[3]);
+}
+
+
+inline bool LLUUID::operator!=(const LLUUID& rhs) const
+{
+	U32 *tmp = (U32 *)mData;
+	U32 *rhstmp = (U32 *)rhs.mData;
+	// Note: binary | to avoid branching
+	return 
+		(tmp[0] != rhstmp[0]) |
+		(tmp[1] != rhstmp[1]) |
+		(tmp[2] != rhstmp[2]) |
+		(tmp[3] != rhstmp[3]);
+}
+
+/*
+// JC: This is dangerous.  It allows UUIDs to be cast automatically
+// to integers, among other things.  Use isNull() or notNull().
+inline LLUUID::operator bool() const
+{
+	U32 *word = (U32 *)mData;
+	return (word[0] | word[1] | word[2] | word[3]) > 0;
+}
+*/
+
+inline BOOL LLUUID::notNull() const
+{
+	U32 *word = (U32 *)mData;
+	return (word[0] | word[1] | word[2] | word[3]) > 0;
+}
+
+// Faster than == LLUUID::null because doesn't require
+// as much memory access.
+inline BOOL LLUUID::isNull() const
+{
+	U32 *word = (U32 *)mData;
+	// If all bits are zero, return !0 == TRUE
+	return !(word[0] | word[1] | word[2] | word[3]);
+}
+
+// Copy constructor
+inline LLUUID::LLUUID(const LLUUID& rhs)
+{
+	U32 *tmp = (U32 *)mData;
+	U32 *rhstmp = (U32 *)rhs.mData;
+	tmp[0] = rhstmp[0];
+	tmp[1] = rhstmp[1];
+	tmp[2] = rhstmp[2];
+	tmp[3] = rhstmp[3];
+}
+
+inline LLUUID::~LLUUID()
+{
+}
+
+// Assignment
+inline LLUUID& LLUUID::operator=(const LLUUID& rhs)
+{
+	// No need to check the case where this==&rhs.  The branch is slower than the write.
+	U32 *tmp = (U32 *)mData;
+	U32 *rhstmp = (U32 *)rhs.mData;
+	tmp[0] = rhstmp[0];
+	tmp[1] = rhstmp[1];
+	tmp[2] = rhstmp[2];
+	tmp[3] = rhstmp[3];
+	
+	return *this;
+}
+
+
+inline LLUUID::LLUUID(const char *in_string)
+{
+	if (!in_string || in_string[0] == 0)
+	{
+		setNull();
+		return;
+	}
+ 
+	set(in_string);
+}
+
+inline LLUUID::LLUUID(const std::string& in_string)
+{
+	if (in_string.empty())
+	{
+		setNull();
+		return;
+	}
+
+	set(in_string);
+}
+
+// IW: DON'T "optimize" these w/ U32s or you'll scoogie the sort order
+// IW: this will make me very sad
+inline bool LLUUID::operator<(const LLUUID &rhs) const
+{
+	U32 i;
+	for( i = 0; i < (UUID_BYTES - 1); i++ )
+	{
+		if( mData[i] != rhs.mData[i] )
+		{
+			return (mData[i] < rhs.mData[i]);
+		}
+	}
+	return (mData[UUID_BYTES - 1] < rhs.mData[UUID_BYTES - 1]);
+}
+
+inline bool LLUUID::operator>(const LLUUID &rhs) const
+{
+	U32 i;
+	for( i = 0; i < (UUID_BYTES - 1); i++ )
+	{
+		if( mData[i] != rhs.mData[i] )
+		{
+			return (mData[i] > rhs.mData[i]);
+		}
+	}
+	return (mData[UUID_BYTES - 1] > rhs.mData[UUID_BYTES - 1]);
+}
+
+inline U16 LLUUID::getCRC16() const
+{
+	// A UUID is 16 bytes, or 8 shorts.
+	U16 *short_data = (U16*)mData;
+	U16 out = 0;
+	out += short_data[0];
+	out += short_data[1];
+	out += short_data[2];
+	out += short_data[3];
+	out += short_data[4];
+	out += short_data[5];
+	out += short_data[6];
+	out += short_data[7];
+	return out;
+}
+
+inline U32 LLUUID::getCRC32() const
+{
+	U32 *tmp = (U32*)mData;
+	return tmp[0] + tmp[1] + tmp[2] + tmp[3];
+}
+
+
+// Helper structure for ordering lluuids in stl containers.
+// eg: 	std::map<LLUUID, LLWidget*, lluuid_less> widget_map;
+struct lluuid_less
+{
+	bool operator()(const LLUUID& lhs, const LLUUID& rhs) const
+	{
+		return (lhs < rhs) ? true : false;
+	}
+};
+
+typedef std::set<LLUUID, lluuid_less> uuid_list_t;
+
+/*
+ * Sub-classes for keeping transaction IDs and asset IDs
+ * straight.
+ */
+typedef LLUUID LLAssetID;
+
+class LLTransactionID : public LLUUID
+{
+public:
+	LLTransactionID() : LLUUID() { }
+	
+	static const LLTransactionID tnull;
+	LLAssetID makeAssetID(const LLUUID& session) const;
+};
+
+#endif
diff --git a/linden/indra/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h
index e3ceadf..0b88ce8 100644
--- a/linden/indra/llcommon/llversionserver.h
+++ b/linden/indra/llcommon/llversionserver.h
@@ -33,9 +33,9 @@
 #define LL_LLVERSIONSERVER_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 21;
-const S32 LL_VERSION_PATCH = 1;
-const S32 LL_VERSION_BUILD = 86526;
+const S32 LL_VERSION_MINOR = 24;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 93453;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 9b3cf80..4820f68 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -33,8 +33,8 @@
 #define LL_LLVERSIONVIEWER_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 20;
-const S32 LL_VERSION_PATCH = 15;
+const S32 LL_VERSION_MINOR = 21;
+const S32 LL_VERSION_PATCH = 0;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/llcommon/metapropertyt.h b/linden/indra/llcommon/metapropertyt.h
index 5c25ec4..73c2a7a 100644
--- a/linden/indra/llcommon/metapropertyt.h
+++ b/linden/indra/llcommon/metapropertyt.h
@@ -86,13 +86,6 @@ inline const LLReflective* LLMetaPropertyT<std::string>::get(const LLReflective*
 }
 
 template <>
-inline const LLReflective* LLMetaPropertyT<LLString>::get(const LLReflective* object) const
-{
-	checkObjectClass(object);
-	return NULL;
-}
-
-template <>
 inline const LLReflective* LLMetaPropertyT<LLUUID>::get(const LLReflective* object) const
 {
 	checkObjectClass(object);
@@ -112,12 +105,6 @@ inline LLSD LLMetaPropertyT<std::string>::getLLSD(const LLReflective* object) co
 }
 
 template <>
-inline LLSD LLMetaPropertyT<LLString>::getLLSD(const LLReflective* object) const
-{
-	return *(getProperty(object));
-}
-
-template <>
 inline LLSD LLMetaPropertyT<LLUUID>::getLLSD(const LLReflective* object) const
 {
 	return *(getProperty(object));
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h
index 956a9de..ee2986b 100644
--- a/linden/indra/llcommon/roles_constants.h
+++ b/linden/indra/llcommon/roles_constants.h
@@ -143,11 +143,18 @@ const U64 GP_NOTICES_RECEIVE		= 0x1LL << 43;	// Receive Notices and View Notice
 const U64 GP_PROPOSAL_START		= 0x1LL << 44;	// Start Proposal
 const U64 GP_PROPOSAL_VOTE		= 0x1LL << 45;	// Vote on Proposal
 
+// Group chat moderation related
+const U64 GP_SESSION_JOIN = 0x1LL << 16; //can join session
+const U64 GP_SESSION_VOICE = 0x1LL << 27; //can hear/talk
+const U64 GP_SESSION_MODERATOR = 0x1LL << 37; //can mute people's session
+
 const U64 GP_DEFAULT_MEMBER = GP_ACCOUNTING_ACCOUNTABLE
 								| GP_LAND_ALLOW_SET_HOME
 								| GP_NOTICES_RECEIVE
 								| GP_PROPOSAL_START
 								| GP_PROPOSAL_VOTE
+                                | GP_SESSION_JOIN
+								| GP_SESSION_VOICE
 								;
 
 const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE
@@ -188,5 +195,8 @@ const U64 GP_DEFAULT_OFFICER = GP_ACCOUNTING_ACCOUNTABLE
 								| GP_PROPOSAL_VOTE
 								| GP_ROLE_ASSIGN_MEMBER_LIMITED
 								| GP_ROLE_PROPERTIES
+								| GP_SESSION_MODERATOR
+								| GP_SESSION_JOIN
+								| GP_SESSION_VOICE
 								;
 #endif
diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h
index c1f5303..44f67f2 100644
--- a/linden/indra/llcommon/stdtypes.h
+++ b/linden/indra/llcommon/stdtypes.h
@@ -31,6 +31,8 @@
 #ifndef LL_STDTYPES_H
 #define LL_STDTYPES_H
 
+#include <cfloat>
+
 typedef signed char			S8;
 typedef unsigned char			U8;
 typedef signed short			S16;
diff --git a/linden/indra/llcommon/u64.cpp b/linden/indra/llcommon/u64.cpp
index bbeed9f..5aebdb3 100644
--- a/linden/indra/llcommon/u64.cpp
+++ b/linden/indra/llcommon/u64.cpp
@@ -34,10 +34,10 @@
 #include "u64.h"
 
 
-U64 str_to_U64(const char *str)
+U64 str_to_U64(const std::string& str)
 {
 	U64 result = 0;
-	const char *aptr = strpbrk(str,"0123456789");
+	const char *aptr = strpbrk(str.c_str(),"0123456789");
 
 	if (!aptr)
 	{
@@ -54,8 +54,9 @@ U64 str_to_U64(const char *str)
 }
 
 
-char* U64_to_str(U64 value, char* result, S32 result_size) 
-{										
+std::string U64_to_str(U64 value) 
+{
+	std::string res;
 	U32 part1,part2,part3;
 	
 	part3 = (U32)(value % (U64)10000000);
@@ -70,31 +71,26 @@ char* U64_to_str(U64 value, char* result, S32 result_size)
 	
 	if (part1)
 	{
-		snprintf(	/* Flawfinder: ignore */
-			result,
-			result_size,
-			"%u%07u%07u",
-			part1,part2,part3);
+		res = llformat("%u%07u%07u",part1,part2,part3);
 	}
 	else if (part2)
 	{
-		snprintf(	/* Flawfinder: ignore */
-			result,
-			result_size,
-			"%u%07u",
-			part2,part3);
+		res = llformat("%u%07u",part2,part3);
 	}
 	else
 	{
-		snprintf(	/* Flawfinder: ignore */
-			result,
-			result_size,
-			"%u",
-			part3);		
+		res = llformat("%u",part3);	
 	}
-	return (result);
+	return res;
 } 
 
+char* U64_to_str(U64 value, char* result, S32 result_size) 
+{
+	std::string res = U64_to_str(value);
+	LLStringUtil::copy(result, res.c_str(), result_size);
+	return result;
+}
+
 F64 U64_to_F64(const U64 value)
 {
 	S64 top_bits = (S64)(value >> 1);
diff --git a/linden/indra/llcommon/u64.h b/linden/indra/llcommon/u64.h
index ab06836..3d45fc3 100644
--- a/linden/indra/llcommon/u64.h
+++ b/linden/indra/llcommon/u64.h
@@ -38,7 +38,14 @@
  * @param str The string to parse.
  * @return Returns the first U64 value found in the string or 0 on failure.
  */
-U64 str_to_U64(const char* str);
+U64 str_to_U64(const std::string& str);
+
+/**
+ * @brief Given a U64 value, return a printable representation.
+ * @param value The U64 to turn into a printable character array.
+ * @return Returns the result string.
+ */
+std::string U64_to_str(U64 value);
 
 /**
  * @brief Given a U64 value, return a printable representation.
diff --git a/linden/indra/llcrashlogger/CMakeLists.txt b/linden/indra/llcrashlogger/CMakeLists.txt
new file mode 100644
index 0000000..b2639ae
--- /dev/null
+++ b/linden/indra/llcrashlogger/CMakeLists.txt
@@ -0,0 +1,35 @@
+# -*- cmake -*-
+
+project(llcrashlogger)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llcrashlogger_SOURCE_FILES
+    llcrashlogger.cpp
+    )
+
+set(llcrashlogger_HEADER_FILES
+    CMakeLists.txt
+
+    llcrashlogger.h
+    )
+
+set_source_files_properties(${llcrashlogger_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llcrashlogger_SOURCE_FILES ${llcrashlogger_HEADER_FILES})
+
+add_library(llcrashlogger ${llcrashlogger_SOURCE_FILES})
diff --git a/linden/indra/llcrashlogger/files.lst b/linden/indra/llcrashlogger/files.lst
deleted file mode 100644
index d976a60..0000000
--- a/linden/indra/llcrashlogger/files.lst
+++ /dev/null
@@ -1 +0,0 @@
-llcrashlogger/llcrashlogger.cpp
\ No newline at end of file
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 306046a..57fa33b 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -76,7 +76,7 @@ bool LLCrashLoggerText::mainLoop()
 	return true;	
 }
 
-void LLCrashLoggerText::updateApplication(LLString message)
+void LLCrashLoggerText::updateApplication(const std::string& message)
 {
 	LLCrashLogger::updateApplication(message);
 	std::cout << message << std::endl;
@@ -147,10 +147,8 @@ void LLCrashLogger::gatherFiles()
 	updateApplication("Gathering logs...");
 
 	// Figure out the filename of the debug log
-	std::string db_file_name = gDirUtilp->getExpandedFilename(
-		LL_PATH_LOGS,
-		"debug_info.log");
-	llifstream debug_log_file(db_file_name.c_str());
+	std::string db_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"debug_info.log");
+	std::ifstream debug_log_file(db_file_name.c_str());
 
 	// Look for it in the debug_info.log file
 	if (debug_log_file.is_open())
@@ -191,7 +189,7 @@ void LLCrashLogger::gatherFiles()
 	{
 		// This is a 'little' hacky, but its the best simple solution.
 		std::string grid_host = mDebugLog["GridName"].asString();
-		LLString::toLower(grid_host);
+		LLStringUtil::toLower(grid_host);
 
 		mCrashHost = "https://login.";
 		mCrashHost += grid_host;
@@ -207,12 +205,12 @@ void LLCrashLogger::gatherFiles()
 	
 	updateApplication("Encoding files...");
 
-	for(std::map<LLString, LLString>::iterator itr = mFileMap.begin(); itr != mFileMap.end(); ++itr)
+	for(std::map<std::string, std::string>::iterator itr = mFileMap.begin(); itr != mFileMap.end(); ++itr)
 	{
 		std::ifstream f((*itr).second.c_str());
 		if(!f.is_open())
 		{
-			std::cout << "Can't find file " << (*itr).second.c_str() << std::endl;
+			std::cout << "Can't find file " << (*itr).second << std::endl;
 			continue;
 		}
 		std::stringstream s;
@@ -265,10 +263,10 @@ bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior)
 	return true;
 }
 
-bool LLCrashLogger::runCrashLogPost(LLString host, LLSD data, LLString msg, int retries, int timeout)
+bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout)
 {
 	gBreak = false;
-	LLString status_message;
+	std::string status_message;
 	for(int i = 0; i < retries; ++i)
 	{
 		status_message = llformat("%s, try %d...", msg.c_str(), i+1);
@@ -304,14 +302,15 @@ bool LLCrashLogger::sendCrashLogs()
 
 	bool sent = false;
 
+	//*TODO: Translate
 	if(mCrashHost != "")
 	{
-		sent = runCrashLogPost(mCrashHost, post_data, "Sending to server", 3, 5);
+		sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5);
 	}
 
 	if(!sent)
 	{
-		sent = runCrashLogPost(mAltCrashHost, post_data, "Sending to alternate server", 3, 5);
+		sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), 3, 5);
 	}
 	
 	mSentCrashLogs = sent;
@@ -319,7 +318,7 @@ bool LLCrashLogger::sendCrashLogs()
 	return true;
 }
 
-void LLCrashLogger::updateApplication(LLString message)
+void LLCrashLogger::updateApplication(const std::string& message)
 {
 	gServicePump->pump();
     gServicePump->callback();
@@ -372,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 )
 	{
-		LLString marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
+		std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
 		ll_apr_file_remove( marker_file );
 	}
 	
diff --git a/linden/indra/llcrashlogger/llcrashlogger.h b/linden/indra/llcrashlogger/llcrashlogger.h
index bf51e71..f8f7de7 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.h
+++ b/linden/indra/llcrashlogger/llcrashlogger.h
@@ -50,23 +50,23 @@ public:
 	bool saveCrashBehaviorSetting(S32 crash_behavior);
 	bool sendCrashLogs();
 	LLSD constructPostData();
-	virtual void updateApplication(LLString message = "");
+	virtual void updateApplication(const std::string& message = LLStringUtil::null);
 	virtual bool init();
 	virtual bool mainLoop() = 0;
 	virtual bool cleanup() { return true; }
-	void setUserText(LLString& text) { mCrashInfo["UserNotes"] = text; }
+	void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; }
 	S32 getCrashBehavior() { return mCrashBehavior; }
-	bool runCrashLogPost(LLString host, LLSD data, LLString msg, int retries, int timeout);
+	bool runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout);
 protected:
 	S32 mCrashBehavior;
 	BOOL mCrashInPreviousExec;
-	std::map<LLString, LLString> mFileMap;
-	LLString mGridName;
+	std::map<std::string, std::string> mFileMap;
+	std::string mGridName;
 	LLControlGroup mCrashSettings;
-	LLString mProductName;
+	std::string mProductName;
 	LLSD mCrashInfo;
-	LLString mCrashHost;
-	LLString mAltCrashHost;
+	std::string mCrashHost;
+	std::string mAltCrashHost;
 	LLSD mDebugLog;
 	bool mSentCrashLogs;
 };
@@ -78,7 +78,7 @@ public:
 	~LLCrashLoggerText(void) {}
 
 	virtual bool mainLoop();
-	virtual void updateApplication(LLString message = "");
+	virtual void updateApplication(const std::string& message = LLStringUtil::null);
 };
 
 
diff --git a/linden/indra/llimage/CMakeLists.txt b/linden/indra/llimage/CMakeLists.txt
new file mode 100644
index 0000000..5593b4a
--- /dev/null
+++ b/linden/indra/llimage/CMakeLists.txt
@@ -0,0 +1,50 @@
+# -*- cmake -*-
+
+project(llimage)
+
+include(00-Common)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLVFS)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${PNG_INCLUDE_DIRS}
+    )
+
+set(llimage_SOURCE_FILES
+    llimagebmp.cpp
+    llimage.cpp
+    llimagedxt.cpp
+    llimagej2c.cpp
+    llimagejpeg.cpp
+    llimagepng.cpp
+    llimagetga.cpp
+    llimageworker.cpp
+    llpngwrapper.cpp
+    )
+
+set(llimage_HEADER_FILES
+    CMakeLists.txt
+
+    llimage.h
+    llimagebmp.h
+    llimagedxt.h
+    llimagej2c.h
+    llimagejpeg.h
+    llimagepng.h
+    llimagetga.h
+    llimageworker.h
+    llmapimagetype.h
+    llpngwrapper.h
+    )
+
+set_source_files_properties(${llimage_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES})
+
+add_library (llimage ${llimage_SOURCE_FILES})
diff --git a/linden/indra/llimage/files.lst b/linden/indra/llimage/files.lst
deleted file mode 100644
index a6ac342..0000000
--- a/linden/indra/llimage/files.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-llimage/llimagebmp.cpp
-llimage/llimage.cpp
-llimage/llimagedxt.cpp
-llimage/llimagej2c.cpp
-llimage/llimagejpeg.cpp
-llimage/llimagepng.cpp
-llimage/llimagetga.cpp
-llimage/llimageworker.cpp
-llimage/llpngwrapper.cpp
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 52a210f..814e82f 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -40,9 +40,7 @@
 #include "llimagebmp.h"
 #include "llimagetga.h"
 #include "llimagej2c.h"
-#if JPEG_SUPPORT
 #include "llimagejpeg.h"
-#endif
 #include "llimagepng.h"
 #include "llimagedxt.h"
 
@@ -97,15 +95,15 @@ void LLImageBase::sanityCheck()
 	}
 }
 
-LLString LLImageBase::sLastErrorMessage;
+std::string LLImageBase::sLastErrorMessage;
 BOOL LLImageBase::sSizeOverride = FALSE;
 
-BOOL LLImageBase::setLastError(const LLString& message, const LLString& filename) 
+BOOL LLImageBase::setLastError(const std::string& message, const std::string& filename) 
 {
 	sLastErrorMessage = message;
-	if (filename != "")
+	if (!filename.empty())
 	{
-		sLastErrorMessage += LLString(" FILE:");
+		sLastErrorMessage += " FILE:";
 		sLastErrorMessage += filename;
 	}
 	llwarns << sLastErrorMessage << llendl;
@@ -251,7 +249,7 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components)
 	++sRawImageCount;
 }
 
-LLImageRaw::LLImageRaw(const LLString &filename, bool j2c_lowest_mip_only)
+LLImageRaw::LLImageRaw(const std::string& filename, bool j2c_lowest_mip_only)
 	: LLImageBase()
 {
 	createFromFile(filename, j2c_lowest_mip_only);
@@ -1112,25 +1110,25 @@ file_extensions[] =
 };
 #define NUM_FILE_EXTENSIONS sizeof(file_extensions)/sizeof(file_extensions[0])
 
-static LLString find_file(LLString &name, S8 *codec)
+static std::string find_file(std::string &name, S8 *codec)
 {
-	LLString tname;
+	std::string tname;
 	for (int i=0; i<(int)(NUM_FILE_EXTENSIONS); i++)
 	{
-		tname = name + "." + LLString(file_extensions[i].exten);
-		llifstream ifs(tname.c_str(), llifstream::binary);
+		tname = name + "." + std::string(file_extensions[i].exten);
+		llifstream ifs(tname, llifstream::binary);
 		if (ifs.is_open())
 		{
 			ifs.close();
 			if (codec)
 				*codec = file_extensions[i].codec;
-			return LLString(file_extensions[i].exten);
+			return std::string(file_extensions[i].exten);
 		}
 	}
-	return LLString("");
+	return std::string("");
 }
 
-EImageCodec LLImageBase::getCodecFromExtension(const LLString& exten)
+EImageCodec LLImageBase::getCodecFromExtension(const std::string& exten)
 {
 	for (int i=0; i<(int)(NUM_FILE_EXTENSIONS); i++)
 	{
@@ -1140,19 +1138,19 @@ EImageCodec LLImageBase::getCodecFromExtension(const LLString& exten)
 	return IMG_CODEC_INVALID;
 }
 
-bool LLImageRaw::createFromFile(const LLString &filename, bool j2c_lowest_mip_only)
+bool LLImageRaw::createFromFile(const std::string &filename, bool j2c_lowest_mip_only)
 {
-	LLString name = filename;
+	std::string name = filename;
 	size_t dotidx = name.rfind('.');
 	S8 codec = IMG_CODEC_INVALID;
-	LLString exten;
+	std::string exten;
 	
 	deleteData(); // delete any existing data
 
-	if (dotidx != LLString::npos)
+	if (dotidx != std::string::npos)
 	{
 		exten = name.substr(dotidx+1);
-		LLString::toLower(exten);
+		LLStringUtil::toLower(exten);
 		codec = getCodecFromExtension(exten);
 	}
 	else
@@ -1165,7 +1163,7 @@ bool LLImageRaw::createFromFile(const LLString &filename, bool j2c_lowest_mip_on
 		return false; // format not recognized
 	}
 
-	llifstream ifs(name.c_str(), llifstream::binary);
+	llifstream ifs(name, llifstream::binary);
 	if (!ifs.is_open())
 	{
 		// SJB: changed from llinfos to lldebugs to reduce spam
@@ -1197,11 +1195,9 @@ bool LLImageRaw::createFromFile(const LLString &filename, bool j2c_lowest_mip_on
 	  case IMG_CODEC_TGA:
 		image = new LLImageTGA();
 		break;
-#if JPEG_SUPPORT
 	  case IMG_CODEC_JPEG:
 		image = new LLImageJPEG();
 		break;
-#endif
 	  case IMG_CODEC_J2C:
 		image = new LLImageJ2C();
 		break;
@@ -1285,20 +1281,18 @@ LLImageFormatted* LLImageFormatted::createFromType(S8 codec)
 	  case IMG_CODEC_TGA:
 		image = new LLImageTGA();
 		break;
-#if JPEG_SUPPORT
 	  case IMG_CODEC_JPEG:
 		image = new LLImageJPEG();
 		break;
-#endif
+	  case IMG_CODEC_PNG:
+		image = new LLImagePNG();
+		break;
 	  case IMG_CODEC_J2C:
 		image = new LLImageJ2C();
 		break;
 	  case IMG_CODEC_DXT:
 		image = new LLImageDXT();
 		break;
-	  case IMG_CODEC_PNG:
-		image = new LLImagePNG();
-		break;
 	  default:
 		image = NULL;
 		break;
@@ -1307,11 +1301,11 @@ LLImageFormatted* LLImageFormatted::createFromType(S8 codec)
 }
 
 // static
-LLImageFormatted* LLImageFormatted::createFromExtension(const LLString& instring)
+LLImageFormatted* LLImageFormatted::createFromExtension(const std::string& instring)
 {
-	LLString exten;
+	std::string exten;
 	size_t dotidx = instring.rfind('.');
-	if (dotidx != LLString::npos)
+	if (dotidx != std::string::npos)
 	{
 		exten = instring.substr(dotidx+1);
 	}
@@ -1468,7 +1462,7 @@ void LLImageFormatted::appendData(U8 *data, S32 size)
 
 //----------------------------------------------------------------------------
 
-BOOL LLImageFormatted::load(const LLString &filename)
+BOOL LLImageFormatted::load(const std::string &filename)
 {
 	resetLastError();
 
@@ -1505,14 +1499,14 @@ BOOL LLImageFormatted::load(const LLString &filename)
 	return res;
 }
 
-BOOL LLImageFormatted::save(const LLString &filename)
+BOOL LLImageFormatted::save(const std::string &filename)
 {
 	resetLastError();
 
 	apr_file_t* apr_file = ll_apr_file_open(filename, LL_APR_WB);
 	if (!apr_file)
 	{
-		setLastError("Unable to open file for reading", filename);
+		setLastError("Unable to open file for writing", filename);
 		return FALSE;
 	}
 	
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 0d97595..98a98c2 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -113,9 +113,9 @@ protected:
 	void setDataAndSize(U8 *data, S32 size) { mData = data; mDataSize = size; };
 	
 public:
-	static const LLString& getLastError() {return sLastErrorMessage;};
-	static void resetLastError() {sLastErrorMessage = LLString("No Error"); };
-	static BOOL setLastError(const LLString& message, const LLString& filename = LLString()); // returns FALSE
+	static const std::string& getLastError() {return sLastErrorMessage;};
+	static void resetLastError() {sLastErrorMessage = "No Error"; };
+	static BOOL setLastError(const std::string& message, const std::string& filename = std::string()); // returns FALSE
 
 	static void generateMip(const U8 *indata, U8* mipdata, int width, int height, S32 nchannels);
 	
@@ -125,7 +125,7 @@ public:
 
 	static void setSizeOverride(BOOL enabled) { sSizeOverride = enabled; }
 
-	static EImageCodec getCodecFromExtension(const LLString& exten);
+	static EImageCodec getCodecFromExtension(const std::string& exten);
 	
 private:
 	U8 *mData;
@@ -141,7 +141,7 @@ private:
 public:
 	S16 mMemType; // debug
 	
-	static LLString sLastErrorMessage;
+	static std::string sLastErrorMessage;
 
 	static BOOL sSizeOverride;
 };
@@ -157,7 +157,7 @@ public:
 	LLImageRaw(U16 width, U16 height, S8 components);
 	LLImageRaw(U8 *data, U16 width, U16 height, S8 components);
 	// Construct using createFromFile (used by tools)
-	LLImageRaw(const LLString& filename, bool j2c_lowest_mip_only = false);
+	LLImageRaw(const std::string& filename, bool j2c_lowest_mip_only = false);
 
 	/*virtual*/ void deleteData();
 	/*virtual*/ U8* allocateData(S32 size = -1);
@@ -218,7 +218,7 @@ public:
 
 protected:
 	// Create an image from a local file (generally used in tools)
-	bool createFromFile(const LLString& filename, bool j2c_lowest_mip_only = false);
+	bool createFromFile(const std::string& filename, bool j2c_lowest_mip_only = false);
 
 	void copyLineScaled( U8* in, U8* out, S32 in_pixel_len, S32 out_pixel_len, S32 in_pixel_step, S32 out_pixel_step );
 	void compositeRowScaled4onto3( U8* in, U8* out, S32 in_pixel_len, S32 out_pixel_len );
@@ -236,7 +236,7 @@ class LLImageFormatted : public LLImageBase
 {
 public:
 	static LLImageFormatted* createFromType(S8 codec);
-	static LLImageFormatted* createFromExtension(const LLString& instring);	
+	static LLImageFormatted* createFromExtension(const std::string& instring);	
 
 protected:
 	/*virtual*/ ~LLImageFormatted();
@@ -255,6 +255,8 @@ public:
 
 	// New methods
 public:
+	// subclasses must return a prefered file extension (lowercase without a leading dot)
+	virtual std::string getExtension() = 0;
 	// calcHeaderSize() returns the maximum size of header;
 	//   0 indicates we don't know have a header and have to lead the entire file
 	virtual S32 calcHeaderSize() { return 0; };
@@ -265,8 +267,8 @@ public:
 	// getRawDiscardLevel()by default returns mDiscardLevel, but may be overridden (LLImageJ2C)
 	virtual S8  getRawDiscardLevel() { return mDiscardLevel; }
 	
-	BOOL load(const LLString& filename);
-	BOOL save(const LLString& filename);
+	BOOL load(const std::string& filename);
+	BOOL save(const std::string& filename);
 
 	virtual BOOL updateData() = 0; // pure virtual
  	void setData(U8 *data, S32 size);
diff --git a/linden/indra/llimage/llimage.vcproj b/linden/indra/llimage/llimage.vcproj
deleted file mode 100644
index d6689ae..0000000
--- a/linden/indra/llimage/llimage.vcproj
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llimage"
-	ProjectGUID="{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;JPEG_SUPPORT"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="3"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;JPEG_SUPPORT"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;JPEG_SUPPORT"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llimage.cpp">
-			</File>
-			<File
-				RelativePath=".\llimagebmp.cpp">
-			</File>
-			<File
-				RelativePath=".\llimagedxt.cpp">
-			</File>
-			<File
-				RelativePath=".\llimagej2c.cpp">
-			</File>
-			<File
-				RelativePath=".\llimagejpeg.cpp">
-			</File>
-			<File
-				RelativePath=".\llimagepng.cpp">
-			</File>
-			<File
-				RelativePath=".\llimagetga.cpp">
-			</File>
-			<File
-				RelativePath=".\llimageworker.cpp">
-			</File>
-			<File
-				RelativePath=".\llpngwrapper.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llimage.h">
-			</File>
-			<File
-				RelativePath=".\llimagebmp.h">
-			</File>
-			<File
-				RelativePath=".\llimageconstants.h">
-			</File>
-			<File
-				RelativePath=".\llimagedxt.h">
-			</File>
-			<File
-				RelativePath=".\llimagej2c.h">
-			</File>
-			<File
-				RelativePath=".\llimagejpeg.h">
-			</File>
-			<File
-				RelativePath=".\llimagepng.h">
-			</File>
-			<File
-				RelativePath=".\llimagetga.h">
-			</File>
-			<File
-				RelativePath=".\llimageworker.h">
-			</File>
-			<File
-				RelativePath=".\llpngwrapper.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llimage/llimage_vc8.vcproj b/linden/indra/llimage/llimage_vc8.vcproj
deleted file mode 100644
index 4265ea4..0000000
--- a/linden/indra/llimage/llimage_vc8.vcproj
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llimage"
-	ProjectGUID="{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
-	RootNamespace="llimage"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;JPEG_SUPPORT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;JPEG_SUPPORT"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;JPEG_SUPPORT"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llimage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagebmp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagedxt.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagej2c.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagejpeg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagepng.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagetga.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimageworker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpngwrapper.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llimage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagebmp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimageconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagedxt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagej2c.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagejpeg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagepng.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagetga.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimageworker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpngwrapper.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llimage/llimage_vc9.vcproj b/linden/indra/llimage/llimage_vc9.vcproj
deleted file mode 100644
index 244bc78..0000000
--- a/linden/indra/llimage/llimage_vc9.vcproj
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llimage"
-	ProjectGUID="{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"
-	RootNamespace="llimage"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llimage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llimage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagebmp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagedxt.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagej2c.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagejpeg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagepng.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagetga.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimageworker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpngwrapper.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llimage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagebmp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimageconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagedxt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagej2c.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagejpeg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagepng.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagetga.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimageworker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpngwrapper.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llimage/llimagebmp.cpp b/linden/indra/llimage/llimagebmp.cpp
index 8764dff..c72eb24 100644
--- a/linden/indra/llimage/llimagebmp.cpp
+++ b/linden/indra/llimage/llimagebmp.cpp
@@ -647,10 +647,10 @@ BOOL LLImageBMP::encode(const LLImageRaw* raw_image, F32 encode_time)
 				break;
 			}
 
-			for( S32 i = 0; i < alignment_bytes; i++ )
-			{
-				*dst++ = 0;
-			}
+		}
+		for( S32 i = 0; i < alignment_bytes; i++ )
+		{
+			*dst++ = 0;
 		}
 	}
 
diff --git a/linden/indra/llimage/llimagebmp.h b/linden/indra/llimage/llimagebmp.h
index 2b25c43..4a0d6fb 100644
--- a/linden/indra/llimage/llimagebmp.h
+++ b/linden/indra/llimage/llimagebmp.h
@@ -44,6 +44,7 @@ protected:
 public:
 	LLImageBMP();
 
+	/*virtual*/ std::string getExtension() { return std::string("bmp"); }
 	/*virtual*/ BOOL updateData();
 	/*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 decode_time);
 	/*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 encode_time);
diff --git a/linden/indra/llimage/llimagedxt.h b/linden/indra/llimage/llimagedxt.h
index f144c21..a3cb4c7 100644
--- a/linden/indra/llimage/llimagedxt.h
+++ b/linden/indra/llimage/llimagedxt.h
@@ -102,6 +102,7 @@ private:
 public:
 	LLImageDXT();
 
+	/*virtual*/ std::string getExtension() { return std::string("dxt"); }
 	/*virtual*/ BOOL updateData();
 
 	/*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 decode_time);
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 9de4d5f..510b303 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -29,8 +29,8 @@
  */
 #include "linden_common.h"
 
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_dso.h>
+#include "apr_pools.h"
+#include "apr_dso.h"
 
 #include "lldir.h"
 #include "llimagej2c.h"
@@ -374,7 +374,7 @@ void LLImageJ2C::setReversible(const BOOL reversible)
 }
 
 
-BOOL LLImageJ2C::loadAndValidate(const LLString &filename)
+BOOL LLImageJ2C::loadAndValidate(const std::string &filename)
 {
 	resetLastError();
 
diff --git a/linden/indra/llimage/llimagej2c.h b/linden/indra/llimage/llimagej2c.h
index 7e02c98..2b4a3ec 100644
--- a/linden/indra/llimage/llimagej2c.h
+++ b/linden/indra/llimage/llimagej2c.h
@@ -45,6 +45,7 @@ public:
 	LLImageJ2C();
 
 	// Base class overrides
+	/*virtual*/ std::string getExtension() { return std::string("j2c"); }
 	/*virtual*/ BOOL updateData();
 	/*virtual*/ BOOL decode(LLImageRaw *raw_imagep, F32 decode_time);
 	/*virtual*/ BOOL decodeChannels(LLImageRaw *raw_imagep, F32 decode_time, S32 first_channel, S32 max_channel_count);
@@ -58,7 +59,7 @@ public:
 	BOOL encode(const LLImageRaw *raw_imagep, const char* comment_text, F32 encode_time=0.0);
 
 	BOOL validate(U8 *data, U32 file_size);
-	BOOL loadAndValidate(const LLString &filename);
+	BOOL loadAndValidate(const std::string &filename);
 
 	// Encode accessors
 	void setReversible(const BOOL reversible); // Use non-lossy?
diff --git a/linden/indra/llimage/llimagejpeg.cpp b/linden/indra/llimage/llimagejpeg.cpp
index 0ffa838..68529b6 100644
--- a/linden/indra/llimage/llimagejpeg.cpp
+++ b/linden/indra/llimage/llimagejpeg.cpp
@@ -35,12 +35,13 @@
 
 #include "llerror.h"
 
-LLImageJPEG::LLImageJPEG() 
+jmp_buf	LLImageJPEG::sSetjmpBuffer ;
+LLImageJPEG::LLImageJPEG(S32 quality) 
 	:
 	LLImageFormatted(IMG_CODEC_JPEG),
 	mOutputBuffer( NULL ),
 	mOutputBufferSize( 0 ),
-	mEncodeQuality( 75 ) 		// on a scale from 1 to 100
+	mEncodeQuality( quality ) // on a scale from 1 to 100
 {
 }
 
@@ -76,7 +77,16 @@ BOOL LLImageJPEG::updateData()
 	jerr.error_exit =		&LLImageJPEG::errorExit;			// Error exit handler: does not return to caller
 	jerr.emit_message =		&LLImageJPEG::errorEmitMessage;		// Conditionally emit a trace or warning message
 	jerr.output_message =	&LLImageJPEG::errorOutputMessage;	// Routine that actually outputs a trace or error message
-
+	
+	//
+	//try/catch will crash on Mac and Linux if LLImageJPEG::errorExit throws an error
+	//so as instead, we use setjmp/longjmp to avoid this crash, which is the best we can get. --bao 
+	//
+	if(setjmp(sSetjmpBuffer))
+	{
+		jpeg_destroy_decompress(&cinfo);
+		return FALSE;
+	}
 	try
 	{
 		// Now we can initialize the JPEG decompression object.
@@ -208,7 +218,15 @@ BOOL LLImageJPEG::decode(LLImageRaw* raw_image, F32 decode_time)
 	jerr.emit_message =		&LLImageJPEG::errorEmitMessage;		// Conditionally emit a trace or warning message
 	jerr.output_message =	&LLImageJPEG::errorOutputMessage;	// Routine that actually outputs a trace or error message
 	
-
+	//
+	//try/catch will crash on Mac and Linux if LLImageJPEG::errorExit throws an error
+	//so as instead, we use setjmp/longjmp to avoid this crash, which is the best we can get. --bao 
+	//
+	if(setjmp(sSetjmpBuffer))
+	{
+		jpeg_destroy_decompress(&cinfo);
+		return FALSE;
+	}
 	try
 	{
 		// Now we can initialize the JPEG decompression object.
@@ -402,7 +420,7 @@ void LLImageJPEG::errorExit( j_common_ptr cinfo )
 	jpeg_destroy(cinfo);
 
 	// Return control to the setjmp point
-	throw 1;
+	longjmp(sSetjmpBuffer, 1) ;
 }
 
 // Decide whether to emit a trace or warning message.
@@ -500,8 +518,11 @@ BOOL LLImageJPEG::encode( const LLImageRaw* raw_image, F32 encode_time )
 	jerr.emit_message =		&LLImageJPEG::errorEmitMessage;		// Conditionally emit a trace or warning message
 	jerr.output_message =	&LLImageJPEG::errorOutputMessage;	// Routine that actually outputs a trace or error message
 
-	// Establish the setjmp return context mSetjmpBuffer.  Used by library to abort.
-	if( setjmp(mSetjmpBuffer) ) 
+	//
+	//try/catch will crash on Mac and Linux if LLImageJPEG::errorExit throws an error
+	//so as instead, we use setjmp/longjmp to avoid this crash, which is the best we can get. --bao 
+	//
+	if( setjmp(sSetjmpBuffer) ) 
 	{
 		// If we get here, the JPEG code has signaled an error.
 		// We need to clean up the JPEG object, close the input file, and return.
diff --git a/linden/indra/llimage/llimagejpeg.h b/linden/indra/llimage/llimagejpeg.h
index a890bf4..79dc1a3 100644
--- a/linden/indra/llimage/llimagejpeg.h
+++ b/linden/indra/llimage/llimagejpeg.h
@@ -32,7 +32,7 @@
 #ifndef LL_LLIMAGEJPEG_H
 #define LL_LLIMAGEJPEG_H
 
-#include <setjmp.h>
+#include <csetjmp>
 
 #include "llimage.h"
 
@@ -52,8 +52,9 @@ protected:
 	virtual ~LLImageJPEG();
 	
 public:
-	LLImageJPEG();
+	LLImageJPEG(S32 quality = 75);
 
+	/*virtual*/ std::string getExtension() { return std::string("jpg"); }
 	/*virtual*/ BOOL updateData();
 	/*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 decode_time);
 	/*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 encode_time);
@@ -83,8 +84,8 @@ protected:
 	S32				mOutputBufferSize;	// bytes in mOuputBuffer
 
 	S32				mEncodeQuality;		// on a scale from 1 to 100
-
-	jmp_buf			mSetjmpBuffer;		// To allow the library to abort.
+private:
+	static jmp_buf	sSetjmpBuffer;		// To allow the library to abort.
 };
 
 #endif  // LL_LLIMAGEJPEG_H
diff --git a/linden/indra/llimage/llimagepng.h b/linden/indra/llimage/llimagepng.h
index 7ca59cf..9d45fb0 100644
--- a/linden/indra/llimage/llimagepng.h
+++ b/linden/indra/llimage/llimagepng.h
@@ -42,9 +42,10 @@ protected:
 public:
 	LLImagePNG();
 
-	BOOL updateData();
-	BOOL decode(LLImageRaw* raw_image, F32 decode_time);
-	BOOL encode(const LLImageRaw* raw_image, F32 encode_time);
+	/*virtual*/ std::string getExtension() { return std::string("png"); }
+	/*virtual*/ BOOL updateData();
+	/*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 decode_time);
+	/*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 encode_time);
 
 private:
 	U8* mTmpWriteBuffer;
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp
index bd03abb..32c2111 100644
--- a/linden/indra/llimage/llimagetga.cpp
+++ b/linden/indra/llimage/llimagetga.cpp
@@ -30,6 +30,7 @@
 
 #include "linden_common.h"
 
+#include "lldir.h"
 #include "llimagetga.h"
 #include "llerror.h"
 #include "llmath.h"
@@ -63,11 +64,34 @@ LLImageTGA::LLImageTGA()
 	  mColorMapStart( 0 ),
 	  mColorMapLength( 0 ),
 	  mColorMapBytesPerEntry( 0 ),
-	  mIs15Bit( FALSE )
+	  mIs15Bit( FALSE ),
+
+	  mAttributeBits(0),
+	  mColorMapDepth(0),
+	  mColorMapIndexHi(0),
+	  mColorMapIndexLo(0),
+	  mColorMapLengthHi(0),
+	  mColorMapLengthLo(0),
+	  mColorMapType(0),
+	  mDataOffset(0),
+	  mHeightHi(0),
+	  mHeightLo(0),
+	  mIDLength(0),
+	  mImageType(0),
+	  mInterleave(0),
+	  mOriginRightBit(0),
+	  mOriginTopBit(0),
+	  mPixelSize(0),
+	  mWidthHi(0),
+	  mWidthLo(0),
+	  mXOffsetHi(0),
+	  mXOffsetLo(0),
+	  mYOffsetHi(0),
+	  mYOffsetLo(0)
 {
 }
 
-LLImageTGA::LLImageTGA(const LLString& file_name) 
+LLImageTGA::LLImageTGA(const std::string& file_name) 
 	: LLImageFormatted(IMG_CODEC_TGA),
 	  mColorMap( NULL ),
 	  mColorMapStart( 0 ),
@@ -1113,7 +1137,7 @@ BOOL LLImageTGA::decodeAndProcess( LLImageRaw* raw_image, F32 domain, F32 weight
 }
 
 // Reads a .tga file and creates an LLImageTGA with its data.
-bool LLImageTGA::loadFile( const LLString& path )
+bool LLImageTGA::loadFile( const std::string& path )
 {
 	S32 len = path.size();
 	if( len < 5 )
@@ -1121,14 +1145,13 @@ bool LLImageTGA::loadFile( const LLString& path )
 		return false;
 	}
 	
-	LLString extension = path.substr( len - 4, 4 );
-	LLString::toLower(extension);
-	if( ".tga" != extension )
+	std::string extension = gDirUtilp->getExtension(path);
+	if( "tga" != extension )
 	{
 		return false;
 	}
 	
-	LLFILE* file = LLFile::fopen(path.c_str(), "rb");	/* Flawfinder: ignore */
+	LLFILE* file = LLFile::fopen(path, "rb");	/* Flawfinder: ignore */
 	if( !file )
 	{
 		llwarns << "Couldn't open file " << path << llendl;
diff --git a/linden/indra/llimage/llimagetga.h b/linden/indra/llimage/llimagetga.h
index 475ffed..385e086 100644
--- a/linden/indra/llimage/llimagetga.h
+++ b/linden/indra/llimage/llimagetga.h
@@ -43,8 +43,9 @@ protected:
 	
 public:
 	LLImageTGA();
-	LLImageTGA(const LLString& file_name);
+	LLImageTGA(const std::string& file_name);
 
+	/*virtual*/ std::string getExtension() { return std::string("tga"); }
 	/*virtual*/ BOOL updateData();
 	/*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 decode_time=0.0);
 	/*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 encode_time=0.0);
@@ -70,7 +71,7 @@ private:
 	void			 decodeColorMapPixel24(U8* dst, const U8* src);
 	void			 decodeColorMapPixel32(U8* dst, const U8* src);
 
-	bool			 loadFile(const LLString& file_name);
+	bool			 loadFile(const std::string& file_name);
 	
 private:
 	// Class specific data
diff --git a/linden/indra/llimage/llpngwrapper.cpp b/linden/indra/llimage/llpngwrapper.cpp
index 0054adf..35b4ec3 100644
--- a/linden/indra/llimage/llpngwrapper.cpp
+++ b/linden/indra/llimage/llpngwrapper.cpp
@@ -42,17 +42,22 @@
 
 LLPngWrapper::LLPngWrapper()
 	: mReadPngPtr( NULL ),
-      mReadInfoPtr( NULL ),
+	  mReadInfoPtr( NULL ),
 	  mWritePngPtr( NULL ),
 	  mWriteInfoPtr( NULL ),
 	  mRowPointers( NULL ),
+	  mWidth( 0 ),
+	  mHeight( 0 ),
 	  mBitDepth( 0 ),
 	  mColorType( 0 ),
 	  mChannels( 0 ),
 	  mInterlaceType( 0 ),
 	  mCompressionType( 0 ),
 	  mFilterMethod( 0 ),
-	  mFinalSize( 0 )
+	  mFinalSize( 0 ),
+	  mHasBKGD(false),
+	  mBackgroundColor(),
+	  mGamma(0.f)
 {
 }
 
@@ -384,7 +389,7 @@ U32 LLPngWrapper::getFinalSize()
 }
 
 // Get last error message, if any
-LLString LLPngWrapper::getErrorMessage()
+const std::string& LLPngWrapper::getErrorMessage()
 {
 	return mErrorMessage;
 }
diff --git a/linden/indra/llimage/llpngwrapper.h b/linden/indra/llimage/llpngwrapper.h
index b773b72..bd603c3 100644
--- a/linden/indra/llimage/llpngwrapper.h
+++ b/linden/indra/llimage/llpngwrapper.h
@@ -52,7 +52,7 @@ public:
 	BOOL readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop = NULL);
 	BOOL writePng(const LLImageRaw* rawImage, U8* dst);
 	U32  getFinalSize();
-	LLString getErrorMessage();
+	const std::string& getErrorMessage();
 
 protected:
 	void normalizeImage();
@@ -93,12 +93,12 @@ private:
 
 	U32 mFinalSize;
 
-	BOOL mHasBKGD;
+	bool mHasBKGD;
 	png_color_16p mBackgroundColor;
 
 	F64 mGamma;
 
-	LLString mErrorMessage;
+	std::string mErrorMessage;
 };
 
 #endif
diff --git a/linden/indra/llimagej2coj/CMakeLists.txt b/linden/indra/llimagej2coj/CMakeLists.txt
new file mode 100644
index 0000000..ed3ff3c
--- /dev/null
+++ b/linden/indra/llimagej2coj/CMakeLists.txt
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+project(llimagej2coj)
+
+include(00-Common)
+include(LLCommon)
+include(LLImage)
+include(OpenJPEG)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${OPENJPEG_INCLUDE_DIR}
+    )
+
+set(llimagej2coj_SOURCE_FILES
+    llimagej2coj.cpp
+    )
+
+set(llimagej2coj_HEADER_FILES
+    CMakeLists.txt
+
+    llimagej2coj.h
+    )
+
+set_source_files_properties(${llimagej2coj_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
+
+add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
diff --git a/linden/indra/llimagej2coj/files.lst b/linden/indra/llimagej2coj/files.lst
deleted file mode 100644
index bbf359c..0000000
--- a/linden/indra/llimagej2coj/files.lst
+++ /dev/null
@@ -1 +0,0 @@
-llimagej2coj/llimagej2coj.cpp
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index 478cc84..983241c 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -33,7 +33,7 @@
 #include "llimagej2coj.h"
 
 // this is defined so that we get static linking.
-#include "openjpeg/openjpeg.h"
+#include "openjpeg.h"
 
 #include "lltimer.h"
 #include "llmemory.h"
@@ -268,12 +268,12 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
 
 	if (!comment_text)
 	{
-		parameters.cp_comment = "";
+		parameters.cp_comment = (char *) "";
 	}
 	else
 	{
 		// Awful hacky cast, too lazy to copy right now.
-		parameters.cp_comment = (char *)comment_text;
+		parameters.cp_comment = (char *) comment_text;
 	}
 
 	//
diff --git a/linden/indra/llimagej2coj/llimagej2coj.vcproj b/linden/indra/llimagej2coj/llimagej2coj.vcproj
deleted file mode 100755
index 637c81f..0000000
--- a/linden/indra/llimagej2coj/llimagej2coj.vcproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llimagej2coj"
-	ProjectGUID="{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"
-	Keyword="CustomAppWizProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llimage; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="3"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llimage; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				ForceConformanceInForLoopScope="TRUE"
-				WarningLevel="3"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				GlobalOptimizations="FALSE"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="FALSE"
-				OptimizeForProcessor="0"
-				OptimizeForWindowsApplication="FALSE"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llimage; ..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				ForceConformanceInForLoopScope="TRUE"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="">
-			<File
-				RelativePath=".\llimagej2coj.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="">
-			<File
-				RelativePath=".\llimagej2coj.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llinventory/CMakeLists.txt b/linden/indra/llinventory/CMakeLists.txt
new file mode 100644
index 0000000..b70548a
--- /dev/null
+++ b/linden/indra/llinventory/CMakeLists.txt
@@ -0,0 +1,56 @@
+# -*- cmake -*-
+
+project(llinventory)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llinventory_SOURCE_FILES
+    llcategory.cpp
+    lleconomy.cpp
+    llinventory.cpp
+    llinventorytype.cpp
+    lllandmark.cpp
+    llnotecard.cpp
+    llparcel.cpp
+    llpermissions.cpp
+    llsaleinfo.cpp
+    lltransactionflags.cpp
+    lluserrelations.cpp
+    )
+    
+set(llinventory_HEADER_FILES
+    CMakeLists.txt
+
+    llcategory.h
+    lleconomy.h
+    llinventory.h
+    llinventorytype.h
+    lllandmark.h
+    llnotecard.h
+    llparcel.h
+    llparcelflags.h
+    llpermissions.h
+    llpermissionsflags.h
+    llsaleinfo.h
+    lltransactionflags.h
+    lltransactiontypes.h
+    lluserrelations.h
+    )
+
+set_source_files_properties(${llinventory_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llinventory_SOURCE_FILES ${llinventory_HEADER_FILES})
+
+add_library (llinventory ${llinventory_SOURCE_FILES})
diff --git a/linden/indra/llinventory/files.lst b/linden/indra/llinventory/files.lst
deleted file mode 100644
index b918b06..0000000
--- a/linden/indra/llinventory/files.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-llinventory/llcategory.cpp
-llinventory/lleconomy.cpp
-llinventory/llinventory.cpp
-llinventory/llinventorytype.cpp
-llinventory/lllandmark.cpp
-llinventory/llnotecard.cpp
-llinventory/llparcel.cpp
-llinventory/llpermissions.cpp
-llinventory/llsaleinfo.cpp
-llinventory/lltransactionflags.cpp
-llinventory/lluserrelations.cpp
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 8cd0700..457a0cb 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -78,16 +78,16 @@ LLInventoryObject::LLInventoryObject(
 	const LLUUID& uuid,
 	const LLUUID& parent_uuid,
 	LLAssetType::EType type,
-	const LLString& name) :
+	const std::string& name) :
 	mUUID(uuid),
 	mParentUUID(parent_uuid),
 	mType(type),
 	mName(name)
 {
-	LLString::replaceNonstandardASCII(mName, ' ');
-	LLString::replaceChar(mName, '|', ' ');
-	LLString::trim(mName);
-	LLString::truncate(mName, DB_INV_ITEM_NAME_STR_LEN);
+	LLStringUtil::replaceNonstandardASCII(mName, ' ');
+	LLStringUtil::replaceChar(mName, '|', ' ');
+	LLStringUtil::trim(mName);
+	LLStringUtil::truncate(mName, DB_INV_ITEM_NAME_STR_LEN);
 }
 
 LLInventoryObject::LLInventoryObject() :
@@ -117,7 +117,7 @@ const LLUUID& LLInventoryObject::getParentUUID() const
 	return mParentUUID;
 }
 
-const LLString& LLInventoryObject::getName() const
+const std::string& LLInventoryObject::getName() const
 {
 	return mName;
 }
@@ -132,13 +132,13 @@ void LLInventoryObject::setUUID(const LLUUID& new_uuid)
 	mUUID = new_uuid;
 }
 
-void LLInventoryObject::rename(const LLString& n)
+void LLInventoryObject::rename(const std::string& n)
 {
-	LLString new_name(n);
-	LLString::replaceNonstandardASCII(new_name, ' ');
-	LLString::replaceChar(new_name, '|', ' ');
-	LLString::trim(new_name);
-	LLString::truncate(new_name, DB_INV_ITEM_NAME_STR_LEN);
+	std::string new_name(n);
+	LLStringUtil::replaceNonstandardASCII(new_name, ' ');
+	LLStringUtil::replaceChar(new_name, '|', ' ');
+	LLStringUtil::trim(new_name);
+	LLStringUtil::truncate(new_name, DB_INV_ITEM_NAME_STR_LEN);
 
 	if( new_name != mName )
 	{
@@ -201,10 +201,10 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 				" %254s %254[^|]",
 				keyword, valuestr);
 			mName.assign(valuestr);
-			LLString::replaceNonstandardASCII(mName, ' ');
-			LLString::replaceChar(mName, '|', ' ');
-			LLString::trim(mName);
-			LLString::truncate(mName, DB_INV_ITEM_NAME_STR_LEN);
+			LLStringUtil::replaceNonstandardASCII(mName, ' ');
+			LLStringUtil::replaceChar(mName, '|', ' ');
+			LLStringUtil::trim(mName);
+			LLStringUtil::truncate(mName, DB_INV_ITEM_NAME_STR_LEN);
 		}
 		else
 		{
@@ -219,12 +219,12 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 // not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get icramented...
 BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const
 {
-	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string uuid_str;
 	fprintf(fp, "\tinv_object\t0\n\t{\n");
 	mUUID.toString(uuid_str);
-	fprintf(fp, "\t\tobj_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tobj_id\t%s\n", uuid_str.c_str());
 	mParentUUID.toString(uuid_str);
-	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str.c_str());
 	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
 	fprintf(fp, "\t\tname\t%s|\n", mName.c_str());
 	fprintf(fp,"\t}\n");
@@ -233,7 +233,7 @@ BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const
 
 BOOL LLInventoryObject::exportLegacyStream(std::ostream& output_stream, BOOL) const
 {
-	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string uuid_str;
 	output_stream <<  "\tinv_object\t0\n\t{\n";
 	mUUID.toString(uuid_str);
 	output_stream << "\t\tobj_id\t" << uuid_str << "\n";
@@ -276,8 +276,8 @@ LLInventoryItem::LLInventoryItem(
 	const LLUUID& asset_uuid,
 	LLAssetType::EType type,
 	LLInventoryType::EType inv_type,
-	const LLString& name, 
-	const LLString& desc,
+	const std::string& name, 
+	const std::string& desc,
 	const LLSaleInfo& sale_info,
 	U32 flags,
 	S32 creation_date_utc) :
@@ -290,8 +290,8 @@ LLInventoryItem::LLInventoryItem(
 	mFlags(flags),
 	mCreationDate(creation_date_utc)
 {
-	LLString::replaceNonstandardASCII(mDescription, ' ');
-	LLString::replaceChar(mDescription, '|', ' ');
+	LLStringUtil::replaceNonstandardASCII(mDescription, ' ');
+	LLStringUtil::replaceChar(mDescription, '|', ' ');
 }
 
 LLInventoryItem::LLInventoryItem() :
@@ -359,12 +359,12 @@ void LLInventoryItem::setAssetUUID(const LLUUID& asset_id)
 }
 
 
-const LLString& LLInventoryItem::getDescription() const
+const std::string& LLInventoryItem::getDescription() const
 {
 	return mDescription;
 }
 
-S32 LLInventoryItem::getCreationDate() const
+time_t LLInventoryItem::getCreationDate() const
 {
 	return mCreationDate;
 }
@@ -396,11 +396,11 @@ U32 LLInventoryItem::getCRC32() const
 }
 
 
-void LLInventoryItem::setDescription(const LLString& d)
+void LLInventoryItem::setDescription(const std::string& d)
 {
-	LLString new_desc(d);
-	LLString::replaceNonstandardASCII(new_desc, ' ');
-	LLString::replaceChar(new_desc, '|', ' ');
+	std::string new_desc(d);
+	LLStringUtil::replaceNonstandardASCII(new_desc, ' ');
+	LLStringUtil::replaceChar(new_desc, '|', ' ');
 	if( new_desc != mDescription )
 	{
 		mDescription = new_desc;
@@ -422,7 +422,7 @@ void LLInventoryItem::setFlags(U32 flags)
 	mFlags = flags;
 }
 
-void LLInventoryItem::setCreationDate(S32 creation_date_utc)
+void LLInventoryItem::setCreationDate(time_t creation_date_utc)
 {
 	mCreationDate = creation_date_utc;
 }
@@ -486,17 +486,15 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
 
 	mSaleInfo.unpackMultiMessage(msg, block, block_num);
 
-	char name[DB_INV_ITEM_NAME_BUF_SIZE];	/* Flawfinder: ignore */
-	msg->getStringFast(block, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name, block_num);
-	mName.assign(name);
-	LLString::replaceNonstandardASCII(mName, ' ');
+	msg->getStringFast(block, _PREHASH_Name, mName, block_num);
+	LLStringUtil::replaceNonstandardASCII(mName, ' ');
 
-	char desc[DB_INV_ITEM_DESC_BUF_SIZE];	/* Flawfinder: ignore */
-	msg->getStringFast(block, _PREHASH_Description, DB_INV_ITEM_DESC_BUF_SIZE, desc, block_num);
-	mDescription.assign(desc);
-	LLString::replaceNonstandardASCII(mDescription, ' ');
+	msg->getStringFast(block, _PREHASH_Description, mDescription, block_num);
+	LLStringUtil::replaceNonstandardASCII(mDescription, ' ');
 
-	msg->getS32(block, "CreationDate", mCreationDate, block_num);
+	S32 date;
+	msg->getS32(block, "CreationDate", date, block_num);
+	mCreationDate = date;
 
 	U32 local_crc = getCRC32();
 	U32 remote_crc = 0;
@@ -602,7 +600,7 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
 		}
 		else if(0 == strcmp("inv_type", keyword))
 		{
-			mInventoryType = LLInventoryType::lookup(valuestr);
+			mInventoryType = LLInventoryType::lookup(std::string(valuestr));
 		}
 		else if(0 == strcmp("flags", keyword))
 		{
@@ -624,8 +622,8 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
 			}
 
 			mName.assign(valuestr);
-			LLString::replaceNonstandardASCII(mName, ' ');
-			LLString::replaceChar(mName, '|', ' ');
+			LLStringUtil::replaceNonstandardASCII(mName, ' ');
+			LLStringUtil::replaceChar(mName, '|', ' ');
 		}
 		else if(0 == strcmp("desc", keyword))
 		{
@@ -642,7 +640,7 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
 			}
 
 			mDescription.assign(valuestr);
-			LLString::replaceNonstandardASCII(mDescription, ' ');
+			LLStringUtil::replaceNonstandardASCII(mDescription, ' ');
 			/* TODO -- ask Ian about this code
 			const char *donkey = mDescription.c_str();
 			if (donkey[0] == '|')
@@ -653,7 +651,9 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
 		}
 		else if(0 == strcmp("creation_date", keyword))
 		{
-			sscanf(valuestr, "%d", &mCreationDate);
+			S32 date;
+			sscanf(valuestr, "%d", &date);
+			mCreationDate = date;
 		}
 		else
 		{
@@ -676,12 +676,12 @@ BOOL LLInventoryItem::importFile(LLFILE* fp)
 
 BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const
 {
-	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string uuid_str;
 	fprintf(fp, "\tinv_item\t0\n\t{\n");
 	mUUID.toString(uuid_str);
-	fprintf(fp, "\t\titem_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\titem_id\t%s\n", uuid_str.c_str());
 	mParentUUID.toString(uuid_str);
-	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str.c_str());
 	mPermissions.exportFile(fp);
 
 	// Check for permissions to see the asset id, and if so write it
@@ -693,7 +693,7 @@ BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const
 		   || (mAssetUUID.isNull()))
 		{
 			mAssetUUID.toString(uuid_str);
-			fprintf(fp, "\t\tasset_id\t%s\n", uuid_str);
+			fprintf(fp, "\t\tasset_id\t%s\n", uuid_str.c_str());
 		}
 		else
 		{
@@ -701,13 +701,13 @@ BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const
 			LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
 			cipher.encrypt(shadow_id.mData, UUID_BYTES);
 			shadow_id.toString(uuid_str);
-			fprintf(fp, "\t\tshadow_id\t%s\n", uuid_str);
+			fprintf(fp, "\t\tshadow_id\t%s\n", uuid_str.c_str());
 		}
 	}
 	else
 	{
 		LLUUID::null.toString(uuid_str);
-		fprintf(fp, "\t\tasset_id\t%s\n", uuid_str);
+		fprintf(fp, "\t\tasset_id\t%s\n", uuid_str.c_str());
 	}
 	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
 	const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
@@ -716,7 +716,7 @@ BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const
 	mSaleInfo.exportFile(fp);
 	fprintf(fp, "\t\tname\t%s|\n", mName.c_str());
 	fprintf(fp, "\t\tdesc\t%s|\n", mDescription.c_str());
-	fprintf(fp, "\t\tcreation_date\t%d\n", mCreationDate);
+	fprintf(fp, "\t\tcreation_date\t%d\n", (S32) mCreationDate);
 	fprintf(fp,"\t}\n");
 	return TRUE;
 }
@@ -803,7 +803,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 		}
 		else if(0 == strcmp("inv_type", keyword))
 		{
-			mInventoryType = LLInventoryType::lookup(valuestr);
+			mInventoryType = LLInventoryType::lookup(std::string(valuestr));
 		}
 		else if(0 == strcmp("flags", keyword))
 		{
@@ -825,8 +825,8 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 			}
 
 			mName.assign(valuestr);
-			LLString::replaceNonstandardASCII(mName, ' ');
-			LLString::replaceChar(mName, '|', ' ');
+			LLStringUtil::replaceNonstandardASCII(mName, ' ');
+			LLStringUtil::replaceChar(mName, '|', ' ');
 		}
 		else if(0 == strcmp("desc", keyword))
 		{
@@ -843,7 +843,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 			}
 
 			mDescription.assign(valuestr);
-			LLString::replaceNonstandardASCII(mDescription, ' ');
+			LLStringUtil::replaceNonstandardASCII(mDescription, ' ');
 			/* TODO -- ask Ian about this code
 			const char *donkey = mDescription.c_str();
 			if (donkey[0] == '|')
@@ -854,7 +854,9 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 		}
 		else if(0 == strcmp("creation_date", keyword))
 		{
-			sscanf(valuestr, "%d", &mCreationDate);
+			S32 date;
+			sscanf(valuestr, "%d", &date);
+			mCreationDate = date;
 		}
 		else
 		{
@@ -877,7 +879,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 
 BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key) const
 {
-	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string uuid_str;
 	output_stream << "\tinv_item\t0\n\t{\n";
 	mUUID.toString(uuid_str);
 	output_stream << "\t\titem_id\t" << uuid_str << "\n";
@@ -914,8 +916,8 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
 	const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
 	if(inv_type_str) 
 		output_stream << "\t\tinv_type\t" << inv_type_str << "\n";
-	char buffer[32];	/* Flawfinder: ignore */
-	snprintf(buffer, sizeof(buffer), "\t\tflags\t%08x\n", mFlags);		/* Flawfinder: ignore */
+	std::string buffer;
+	buffer = llformat( "\t\tflags\t%08x\n", mFlags);
 	output_stream << buffer;
 	mSaleInfo.exportLegacyStream(output_stream);
 	output_stream << "\t\tname\t" << mName.c_str() << "|\n";
@@ -956,7 +958,7 @@ LLSD LLInventoryItem::asLLSD() const
 	sd[INV_SALE_INFO_LABEL] = mSaleInfo;
 	sd[INV_NAME_LABEL] = mName;
 	sd[INV_DESC_LABEL] = mDescription;
-	sd[INV_CREATION_DATE_LABEL] = mCreationDate;
+	sd[INV_CREATION_DATE_LABEL] = (S32) mCreationDate;
 
 	return sd;
 }
@@ -1024,12 +1026,12 @@ bool LLInventoryItem::fromLLSD(LLSD& sd)
 	w = INV_ASSET_TYPE_LABEL;
 	if (sd.has(w))
 	{
-		mType = LLAssetType::lookup(sd[w].asString().c_str());
+		mType = LLAssetType::lookup(sd[w].asString());
 	}
 	w = INV_INVENTORY_TYPE_LABEL;
 	if (sd.has(w))
 	{
-		mInventoryType = LLInventoryType::lookup(sd[w].asString().c_str());
+		mInventoryType = LLInventoryType::lookup(sd[w].asString());
 	}
 	w = INV_FLAGS_LABEL;
 	if (sd.has(w))
@@ -1040,19 +1042,19 @@ bool LLInventoryItem::fromLLSD(LLSD& sd)
 	if (sd.has(w))
 	{
 		mName = sd[w].asString();
-		LLString::replaceNonstandardASCII(mName, ' ');
-		LLString::replaceChar(mName, '|', ' ');
+		LLStringUtil::replaceNonstandardASCII(mName, ' ');
+		LLStringUtil::replaceChar(mName, '|', ' ');
 	}
 	w = INV_DESC_LABEL;
 	if (sd.has(w))
 	{
 		mDescription = sd[w].asString();
-		LLString::replaceNonstandardASCII(mDescription, ' ');
+		LLStringUtil::replaceNonstandardASCII(mDescription, ' ');
 	}
 	w = INV_CREATION_DATE_LABEL;
 	if (sd.has(w))
 	{
-		mCreationDate = sd[w];
+		mCreationDate = sd[w].asInteger();
 	}
 
 	// Need to convert 1.0 simstate files to a useful inventory type
@@ -1101,22 +1103,23 @@ LLXMLNode *LLInventoryItem::exportFileXML(BOOL include_asset_key) const
 		}
 	}
 
-	LLString type_str = LLAssetType::lookup(mType);
-	LLString inv_type_str = LLInventoryType::lookup(mInventoryType);
+	std::string type_str = LLAssetType::lookup(mType);
+	std::string inv_type_str = LLInventoryType::lookup(mInventoryType);
 
-	ret->createChild("asset_type", FALSE)->setStringValue(1, &type_str);
-	ret->createChild("inventory_type", FALSE)->setStringValue(1, &inv_type_str);
+	ret->createChild("asset_type", FALSE)->setStringValue(type_str);
+	ret->createChild("inventory_type", FALSE)->setStringValue(inv_type_str);
 	S32 tmp_flags = (S32) mFlags;
 	ret->createChild("flags", FALSE)->setByteValue(4, (U8*)(&tmp_flags), LLXMLNode::ENCODING_HEX);
 
 	mSaleInfo.exportFileXML()->setParent(ret);
 
-	LLString temp;
+	std::string temp;
 	temp.assign(mName);
-	ret->createChild("name", FALSE)->setStringValue(1, &temp);
+	ret->createChild("name", FALSE)->setStringValue(temp);
 	temp.assign(mDescription);
-	ret->createChild("description", FALSE)->setStringValue(1, &temp);
-	ret->createChild("creation_date", FALSE)->setIntValue(1, &mCreationDate);
+	ret->createChild("description", FALSE)->setStringValue(temp);
+	S32 date = mCreationDate;
+	ret->createChild("creation_date", FALSE)->setIntValue(1, &date);
 
 	return ret;
 }
@@ -1143,9 +1146,9 @@ BOOL LLInventoryItem::importXML(LLXMLNode* node)
 			cipher.decrypt(mAssetUUID.mData, UUID_BYTES);
 		}
 		if (node->getChild("asset_type", sub_node))
-			mType = LLAssetType::lookup(sub_node->getValue().c_str());
+			mType = LLAssetType::lookup(sub_node->getValue());
 		if (node->getChild("inventory_type", sub_node))
-			mInventoryType = LLInventoryType::lookup(sub_node->getValue().c_str());
+			mInventoryType = LLInventoryType::lookup(sub_node->getValue());
 		if (node->getChild("flags", sub_node))
 		{
 			S32 tmp_flags = 0;
@@ -1159,7 +1162,12 @@ BOOL LLInventoryItem::importXML(LLXMLNode* node)
 		if (node->getChild("description", sub_node))
 			mDescription = sub_node->getValue();
 		if (node->getChild("creation_date", sub_node))
-			success = success && (1 == sub_node->getIntValue(1, &mCreationDate));
+		{
+			S32 date = 0;
+			success = success && (1 == sub_node->getIntValue(1, &date));
+			mCreationDate = date;
+		}
+		
 		if (!success)
 		{
 			lldebugs << "LLInventory::importXML() failed for node named '" 
@@ -1186,32 +1194,32 @@ S32 LLInventoryItem::packBinaryBucket(U8* bin_bucket, LLPermissions* perm_overri
 
 	// describe the inventory item
 	char* buffer = (char*) bin_bucket;
-	char creator_id_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string creator_id_str;
 
 	perm.getCreator().toString(creator_id_str);
-	char owner_id_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string owner_id_str;
 	perm.getOwner().toString(owner_id_str);
-	char last_owner_id_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string last_owner_id_str;
 	perm.getLastOwner().toString(last_owner_id_str);
-	char group_id_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string group_id_str;
 	perm.getGroup().toString(group_id_str);
-	char asset_id_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string asset_id_str;
 	getAssetUUID().toString(asset_id_str);
 	S32 size = sprintf(buffer,	/* Flawfinder: ignore */
 					   "%d|%d|%s|%s|%s|%s|%s|%x|%x|%x|%x|%x|%s|%s|%d|%d|%x",
 					   getType(),
 					   getInventoryType(),
 					   getName().c_str(),
-					   creator_id_str,
-					   owner_id_str,
-					   last_owner_id_str,
-					   group_id_str,
+					   creator_id_str.c_str(),
+					   owner_id_str.c_str(),
+					   last_owner_id_str.c_str(),
+					   group_id_str.c_str(),
 					   perm.getMaskBase(),
 					   perm.getMaskOwner(),
 					   perm.getMaskGroup(),
 					   perm.getMaskEveryone(),
 					   perm.getMaskNextOwner(),
-					   asset_id_str,
+					   asset_id_str.c_str(),
 					   getDescription().c_str(),
 					   getSaleInfo().getSaleType(),
 					   getSaleInfo().getSalePrice(),
@@ -1262,7 +1270,7 @@ void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
 	inv_type = (LLInventoryType::EType)(atoi((*(iter++)).c_str()));
 	setInventoryType( inv_type );
 
-	LLString name((*(iter++)).c_str());
+	std::string name((*(iter++)).c_str());
 	rename( name );
 	
 	LLUUID creator_id((*(iter++)).c_str());
@@ -1283,7 +1291,7 @@ void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
 	LLUUID asset_id((*(iter++)).c_str());
 	setAssetUUID(asset_id);
 
-	LLString desc((*(iter++)).c_str());
+	std::string desc((*(iter++)).c_str());
 	setDescription(desc);
 	
 	LLSaleInfo::EForSale sale_type;
@@ -1302,7 +1310,7 @@ void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
 // returns TRUE if a should appear before b
 BOOL item_dictionary_sort( LLInventoryItem* a, LLInventoryItem* b )
 {
-	return (LLString::compareDict( a->getName().c_str(), b->getName().c_str() ) < 0);
+	return (LLStringUtil::compareDict( a->getName().c_str(), b->getName().c_str() ) < 0);
 }
 
 // returns TRUE if a should appear before b
@@ -1320,7 +1328,7 @@ LLInventoryCategory::LLInventoryCategory(
 	const LLUUID& uuid,
 	const LLUUID& parent_uuid,
 	LLAssetType::EType preferred_type,
-	const LLString& name) :
+	const std::string& name) :
 	LLInventoryObject(uuid, parent_uuid, LLAssetType::AT_CATEGORY, name),
 	mPreferredType(preferred_type)
 {
@@ -1406,8 +1414,8 @@ bool LLInventoryCategory::fromLLSD(LLSD& sd)
     if (sd.has(w))
     {
         mName = sd[w].asString();
-        LLString::replaceNonstandardASCII(mName, ' ');
-        LLString::replaceChar(mName, '|', ' ');
+        LLStringUtil::replaceNonstandardASCII(mName, ' ');
+        LLStringUtil::replaceChar(mName, '|', ' ');
     }
     return true;
 }
@@ -1422,10 +1430,8 @@ void LLInventoryCategory::unpackMessage(LLMessageSystem* msg,
 	S8 type;
 	msg->getS8Fast(block, _PREHASH_Type, type, block_num);
 	mPreferredType = static_cast<LLAssetType::EType>(type);
-	char name[DB_INV_ITEM_NAME_BUF_SIZE];	/* Flawfinder: ignore */
-	msg->getStringFast(block, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name, block_num);
-	mName.assign(name);
-	LLString::replaceNonstandardASCII(mName, ' ');
+	msg->getStringFast(block, _PREHASH_Name, mName, block_num);
+	LLStringUtil::replaceNonstandardASCII(mName, ' ');
 }
 	
 // virtual
@@ -1483,8 +1489,8 @@ BOOL LLInventoryCategory::importFile(LLFILE* fp)
 				" %254s %254[^|]",
 				keyword, valuestr);
 			mName.assign(valuestr);
-			LLString::replaceNonstandardASCII(mName, ' ');
-			LLString::replaceChar(mName, '|', ' ');
+			LLStringUtil::replaceNonstandardASCII(mName, ' ');
+			LLStringUtil::replaceChar(mName, '|', ' ');
 		}
 		else
 		{
@@ -1497,12 +1503,12 @@ BOOL LLInventoryCategory::importFile(LLFILE* fp)
 
 BOOL LLInventoryCategory::exportFile(LLFILE* fp, BOOL) const
 {
-	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string uuid_str;
 	fprintf(fp, "\tinv_category\t0\n\t{\n");
 	mUUID.toString(uuid_str);
-	fprintf(fp, "\t\tcat_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tcat_id\t%s\n", uuid_str.c_str());
 	mParentUUID.toString(uuid_str);
-	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str.c_str());
 	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
 	fprintf(fp, "\t\tpref_type\t%s\n", LLAssetType::lookup(mPreferredType));
 	fprintf(fp, "\t\tname\t%s|\n", mName.c_str());
@@ -1562,8 +1568,8 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 				" %254s %254[^|]",
 				keyword, valuestr);
 			mName.assign(valuestr);
-			LLString::replaceNonstandardASCII(mName, ' ');
-			LLString::replaceChar(mName, '|', ' ');
+			LLStringUtil::replaceNonstandardASCII(mName, ' ');
+			LLStringUtil::replaceChar(mName, '|', ' ');
 		}
 		else
 		{
@@ -1576,7 +1582,7 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 
 BOOL LLInventoryCategory::exportLegacyStream(std::ostream& output_stream, BOOL) const
 {
-	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string uuid_str;
 	output_stream << "\tinv_category\t0\n\t{\n";
 	mUUID.toString(uuid_str);
 	output_stream << "\t\tcat_id\t" << uuid_str << "\n";
@@ -1615,7 +1621,7 @@ LLSD ll_create_sd_from_inventory_item(LLPointer<LLInventoryItem> item)
 	rv[INV_INVENTORY_TYPE_LABEL] =
 		LLInventoryType::lookup(item->getInventoryType());
 	rv[INV_FLAGS_LABEL] = (S32)item->getFlags();
-	rv[INV_CREATION_DATE_LABEL] = item->getCreationDate();
+	rv[INV_CREATION_DATE_LABEL] = (S32)item->getCreationDate();
 	return rv;
 }
 
@@ -1626,7 +1632,7 @@ LLPointer<LLInventoryItem> ll_create_item_from_sd(const LLSD& sd_item)
 	rv->setParent(sd_item[INV_PARENT_ID_LABEL].asUUID());
 	rv->rename(sd_item[INV_NAME_LABEL].asString());
 	rv->setType(
-		LLAssetType::lookup(sd_item[INV_ASSET_TYPE_LABEL].asString().c_str()));
+		LLAssetType::lookup(sd_item[INV_ASSET_TYPE_LABEL].asString()));
 	if (sd_item.has("shadow_id"))
 	{
 		LLUUID asset_id = sd_item["shadow_id"];
@@ -1643,7 +1649,7 @@ LLPointer<LLInventoryItem> ll_create_item_from_sd(const LLSD& sd_item)
 	rv->setPermissions(ll_permissions_from_sd(sd_item[INV_PERMISSIONS_LABEL]));
 	rv->setInventoryType(
 		LLInventoryType::lookup(
-			sd_item[INV_INVENTORY_TYPE_LABEL].asString().c_str()));
+			sd_item[INV_INVENTORY_TYPE_LABEL].asString()));
 	rv->setFlags((U32)(sd_item[INV_FLAGS_LABEL].asInteger()));
 	rv->setCreationDate(sd_item[INV_CREATION_DATE_LABEL].asInteger());
 	return rv;
@@ -1678,9 +1684,9 @@ LLPointer<LLInventoryCategory> ll_create_category_from_sd(const LLSD& sd_cat)
 	rv->setParent(sd_cat[INV_PARENT_ID_LABEL].asUUID());
 	rv->rename(sd_cat[INV_NAME_LABEL].asString());
 	rv->setType(
-		LLAssetType::lookup(sd_cat[INV_ASSET_TYPE_LABEL].asString().c_str()));
+		LLAssetType::lookup(sd_cat[INV_ASSET_TYPE_LABEL].asString()));
 	rv->setPreferredType(
 		LLAssetType::lookup(
-			sd_cat[INV_PREFERRED_TYPE_LABEL].asString().c_str()));
+			sd_cat[INV_PREFERRED_TYPE_LABEL].asString()));
 	return rv;
 }
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 1bb6b85..d3cce6b 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -75,7 +75,7 @@ protected:
 	LLUUID mUUID;
 	LLUUID mParentUUID;
 	LLAssetType::EType mType;
-	LLString mName;
+	std::string mName;
 
 protected:
 	virtual ~LLInventoryObject( void );
@@ -83,19 +83,19 @@ protected:
 public:
 	MEM_TYPE_NEW(LLMemType::MTYPE_INVENTORY);
 	LLInventoryObject(const LLUUID& uuid, const LLUUID& parent_uuid,
-					  LLAssetType::EType type, const LLString& name);
+					  LLAssetType::EType type, const std::string& name);
 	LLInventoryObject();
 	void copyObject(const LLInventoryObject* other); // LLRefCount requires custom copy
 
 	// accessors
 	const LLUUID& getUUID() const;
 	const LLUUID& getParentUUID() const;
-	const LLString& getName() const;
+	const std::string& getName() const;
 	LLAssetType::EType getType() const;
 
 	// mutators - will not call updateServer();
 	void setUUID(const LLUUID& new_uuid);
-	void rename(const LLString& new_name);
+	void rename(const std::string& new_name);
 	void setParent(const LLUUID& new_parent);
 	void setType(LLAssetType::EType type);
 
@@ -128,11 +128,11 @@ public:
 protected:
 	LLPermissions mPermissions;
 	LLUUID mAssetUUID;
-	LLString mDescription;
+	std::string mDescription;
 	LLSaleInfo mSaleInfo;
 	LLInventoryType::EType mInventoryType;
 	U32 mFlags;
-	S32 mCreationDate;	// seconds from 1/1/1970, UTC
+	time_t mCreationDate;	// seconds from 1/1/1970, UTC
 
 public:
 
@@ -212,8 +212,8 @@ public:
 					const LLUUID& asset_uuid,
 					LLAssetType::EType type,
 					LLInventoryType::EType inv_type,
-					const LLString& name, 
-					const LLString& desc,
+					const std::string& name, 
+					const std::string& desc,
 					const LLSaleInfo& sale_info,
 					U32 flags,
 					S32 creation_date_utc);
@@ -233,22 +233,22 @@ public:
 	const LLPermissions& getPermissions() const;
 	const LLUUID& getCreatorUUID() const;
 	const LLUUID& getAssetUUID() const;
-	const LLString& getDescription() const;
+	const std::string& getDescription() const;
 	const LLSaleInfo& getSaleInfo() const;
 	LLInventoryType::EType getInventoryType() const;
 	U32 getFlags() const;
-	S32 getCreationDate() const;
+	time_t getCreationDate() const;
 	U32 getCRC32() const; // really more of a checksum.
 	
 	// mutators - will not call updateServer(), and will never fail
 	// (though it may correct to sane values)
 	void setAssetUUID(const LLUUID& asset_id);
-	void setDescription(const LLString& new_desc);
+	void setDescription(const std::string& new_desc);
 	void setSaleInfo(const LLSaleInfo& sale_info);
 	void setPermissions(const LLPermissions& perm);
 	void setInventoryType(LLInventoryType::EType inv_type);
 	void setFlags(U32 flags);
-	void setCreationDate(S32 creation_date_utc);
+	void setCreationDate(time_t creation_date_utc);
 
 	// Put this inventory item onto the current outgoing mesage. It
 	// assumes you have already called nextBlock().
@@ -303,7 +303,7 @@ public:
 	MEM_TYPE_NEW(LLMemType::MTYPE_INVENTORY);
 	LLInventoryCategory(const LLUUID& uuid, const LLUUID& parent_uuid,
 						LLAssetType::EType preferred_type,
-						const LLString& name);
+						const std::string& name);
 	LLInventoryCategory();
 	LLInventoryCategory(const LLInventoryCategory* other);
 	void copyCategory(const LLInventoryCategory* other); // LLRefCount requires custom copy
diff --git a/linden/indra/llinventory/llinventory.vcproj b/linden/indra/llinventory/llinventory.vcproj
deleted file mode 100644
index 7155d29..0000000
--- a/linden/indra/llinventory/llinventory.vcproj
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llinventory"
-	ProjectGUID="{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llcategory.cpp">
-			</File>
-			<File
-				RelativePath=".\lleconomy.cpp">
-			</File>
-			<File
-				RelativePath=".\llinventory.cpp">
-			</File>
-			<File
-				RelativePath=".\llinventorytype.cpp">
-			</File>
-			<File
-				RelativePath=".\lllandmark.cpp">
-			</File>
-			<File
-				RelativePath=".\llnotecard.cpp">
-			</File>
-			<File
-				RelativePath=".\llparcel.cpp">
-			</File>
-			<File
-				RelativePath=".\llpermissions.cpp">
-			</File>
-			<File
-				RelativePath=".\llsaleinfo.cpp">
-			</File>
-			<File
-				RelativePath=".\lltransactionflags.cpp">
-			</File>
-			<File
-				RelativePath=".\lluserrelations.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llcategory.h">
-			</File>
-			<File
-				RelativePath=".\lleconomy.h">
-			</File>
-			<File
-				RelativePath=".\llinventory.h">
-			</File>
-			<File
-				RelativePath=".\llinventorytype.h">
-			</File>
-			<File
-				RelativePath=".\lllandmark.h">
-			</File>
-			<File
-				RelativePath=".\llnotecard.h">
-			</File>
-			<File
-				RelativePath=".\llparcel.h">
-			</File>
-			<File
-				RelativePath=".\llparcelflags.h">
-			</File>
-			<File
-				RelativePath=".\llpermissions.h">
-			</File>
-			<File
-				RelativePath=".\llpermissionsflags.h">
-			</File>
-			<File
-				RelativePath=".\llsaleinfo.h">
-			</File>
-			<File
-				RelativePath=".\lltransactionflags.h">
-			</File>
-			<File
-				RelativePath=".\lltransactiontypes.h">
-			</File>
-			<File
-				RelativePath=".\lluserrelations.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-		<File
-			RelativePath=".\files.lst">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llinventory/llinventory_vc8.vcproj b/linden/indra/llinventory/llinventory_vc8.vcproj
deleted file mode 100644
index 34dadc9..0000000
--- a/linden/indra/llinventory/llinventory_vc8.vcproj
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llinventory"
-	ProjectGUID="{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
-	RootNamespace="llinventory"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llcategory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleconomy.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorytype.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmark.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotecard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpermissions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsaleinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransactionflags.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserrelations.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llcategory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleconomy.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorytype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotecard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcelflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpermissions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpermissionsflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsaleinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransactionflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransactiontypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserrelations.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llinventory/llinventory_vc9.vcproj b/linden/indra/llinventory/llinventory_vc9.vcproj
deleted file mode 100644
index cdc6c43..0000000
--- a/linden/indra/llinventory/llinventory_vc9.vcproj
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llinventory"
-	ProjectGUID="{328D1968-924F-4863-AAE8-5F9A95BA68E5}"
-	RootNamespace="llinventory"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llinventory.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llcategory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleconomy.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorytype.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmark.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotecard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpermissions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsaleinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransactionflags.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserrelations.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llcategory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleconomy.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorytype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotecard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcelflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpermissions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpermissionsflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsaleinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransactionflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransactiontypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserrelations.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llinventory/llinventorytype.cpp b/linden/indra/llinventory/llinventorytype.cpp
index 9212947..6287db2 100644
--- a/linden/indra/llinventory/llinventorytype.cpp
+++ b/linden/indra/llinventory/llinventorytype.cpp
@@ -162,12 +162,12 @@ const char* LLInventoryType::lookup(EType type)
 }
 
 // static
-LLInventoryType::EType LLInventoryType::lookup(const char* name)
+LLInventoryType::EType LLInventoryType::lookup(const std::string& name)
 {
 	for(S32 i = 0; i < IT_COUNT; ++i)
 	{
 		if((INVENTORY_TYPE_NAMES[i])
-		   && (0 == strcmp(name, INVENTORY_TYPE_NAMES[i])))
+		   && (name == INVENTORY_TYPE_NAMES[i]))
 		{
 			// match
 			return (EType)i;
diff --git a/linden/indra/llinventory/llinventorytype.h b/linden/indra/llinventory/llinventorytype.h
index 3c9abe9..00a4d28 100644
--- a/linden/indra/llinventory/llinventorytype.h
+++ b/linden/indra/llinventory/llinventorytype.h
@@ -72,7 +72,7 @@ public:
 	};
 
 	// machine transation between type and strings
-	static EType lookup(const char* name);
+	static EType lookup(const std::string& name);
 	static const char* lookup(EType type);
 
 	// translation from a type to a human readable form.
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 6d565e8..acd2e76 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -222,7 +222,7 @@ bool LLNotecard::importStream(std::istream& str)
 	if(success)
 	{
 		// Actually set the text
-		mText = text;
+		mText = std::string(text);
 	}
 
 	delete[] text;
@@ -281,22 +281,12 @@ bool LLNotecard::exportStream( std::ostream& out_stream )
 
 ////////////////////////////////////////////////////////////////////////////
 
-const std::vector<LLPointer<LLInventoryItem> >& LLNotecard::getItems() const
-{
-	return mItems;
-}
-
-LLString& LLNotecard::getText()
-{
-	return mText;
-}
-
 void LLNotecard::setItems(const std::vector<LLPointer<LLInventoryItem> >& items)
 {
 	mItems = items;
 }
 
-void LLNotecard::setText(const LLString& text)
+void LLNotecard::setText(const std::string& text)
 {
 	mText = text;
 }
diff --git a/linden/indra/llinventory/llnotecard.h b/linden/indra/llinventory/llnotecard.h
index 2b36ae2..a510ba3 100644
--- a/linden/indra/llinventory/llnotecard.h
+++ b/linden/indra/llinventory/llnotecard.h
@@ -52,11 +52,12 @@ public:
 	bool importStream(std::istream& str);
 	bool exportStream(std::ostream& str);
 
-	const std::vector<LLPointer<LLInventoryItem> >& getItems() const;
-	LLString& getText();
+	const std::vector<LLPointer<LLInventoryItem> >& getItems() const { return mItems; }
+	const std::string& getText() const { return mText; }
+	std::string& getText() { return mText; }
 
 	void setItems(const std::vector<LLPointer<LLInventoryItem> >& items);
-	void setText(const LLString& text);
+	void setText(const std::string& text);
 	S32 getVersion() { return mVersion; }
 	S32 getEmbeddedVersion() { return mEmbeddedVersion; }
 	
@@ -64,7 +65,7 @@ private:
 	bool importEmbeddedItemsStream(std::istream& str);
 	bool exportEmbeddedItemsStream(std::ostream& str);
 	std::vector<LLPointer<LLInventoryItem> > mItems;
-	LLString mText;
+	std::string mText;
 	S32 mMaxText;
 	S32 mVersion;
 	S32 mEmbeddedVersion;
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 1390f72..2b9c201 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -1,33 +1,33 @@
 /** 
-* @file llparcel.cpp
-* @brief A land parcel.
-*
-* $LicenseInfo:firstyear=2002&license=viewergpl$
-* 
-* Copyright (c) 2002-2008, Linden Research, Inc.
-* 
-* Second Life Viewer Source Code
-* The source code in this file ("Source Code") is provided by Linden Lab
-* to you under the terms of the GNU General Public License, version 2.0
-* ("GPL"), unless you have obtained a separate licensing agreement
-* ("Other License"), formally executed by you and Linden Lab.  Terms of
-* the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-* 
-* There are special exceptions to the terms and conditions of the GPL as
-* it is applied to this Source Code. View the full text of the exception
-* in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
-* 
-* By copying, modifying or distributing this software, you acknowledge
-* that you have read and understood your obligations described above,
-* and agree to abide by those obligations.
-* 
-* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
+ * @file llparcel.cpp
+ * @brief A land parcel.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
 
 #include "linden_common.h"
 
@@ -48,17 +48,18 @@
 
 static const F32 SOME_BIG_NUMBER = 1000.0f;
 static const F32 SOME_BIG_NEG_NUMBER = -1000.0f;
-static const char* PARCEL_OWNERSHIP_STATUS_STRING[LLParcel::OS_COUNT] =
+static const std::string PARCEL_OWNERSHIP_STATUS_STRING[LLParcel::OS_COUNT+1] =
 {
     "leased",
     "lease_pending",
-    "abandoned"
+    "abandoned",
+    "none"
 };
 
 // NOTE: Adding parcel categories also requires updating:
 // * newview/app_settings/floater_directory.xml category combobox
 // * Web site "create event" tools
-static const char* PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] =
+static const std::string PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] =
 {
     "none",
     "linden",
@@ -75,7 +76,7 @@ static const char* PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] =
     "stage",
     "other",
 };
-static const char* PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] =
+static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] =
 {
     "None",
     "Linden Location",
@@ -94,7 +95,7 @@ static const char* PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] =
     "Any",	 // valid string for parcel searches
 };
 
-static const char* PARCEL_ACTION_STRING[LLParcel::A_COUNT + 1] =
+static const std::string PARCEL_ACTION_STRING[LLParcel::A_COUNT + 1] =
 {
     "create",
     "release",
@@ -132,14 +133,14 @@ const U64 SEVEN_DAYS_IN_USEC = U64L(604800000000);
 const S32 EXTEND_GRACE_IF_MORE_THAN_SEC = 100000;
 
 
-const char* ownership_status_to_string(LLParcel::EOwnershipStatus status);
-LLParcel::EOwnershipStatus ownership_string_to_status(const char* s);
+const std::string& ownership_status_to_string(LLParcel::EOwnershipStatus status);
+LLParcel::EOwnershipStatus ownership_string_to_status(const std::string& s);
 //const char* revert_action_to_string(LLParcel::ESaleTimerExpireAction action);
 //LLParcel::ESaleTimerExpireAction revert_string_to_action(const char* s);
-const char* category_to_string(LLParcel::ECategory category);
-const char* category_to_ui_string(LLParcel::ECategory category);
-LLParcel::ECategory category_string_to_category(const char* s);
-LLParcel::ECategory category_ui_string_to_category(const char* s);
+const std::string& category_to_string(LLParcel::ECategory category);
+const std::string& category_to_ui_string(LLParcel::ECategory category);
+LLParcel::ECategory category_string_to_category(const std::string& s);
+LLParcel::ECategory category_ui_string_to_category(const std::string& s);
 
 LLParcel::LLParcel()
 {
@@ -207,12 +208,12 @@ void LLParcel::init(const LLUUID &owner_id,
 	setParcelFlag(PF_ALLOW_DAMAGE,    damage);
 
 	mSalePrice			= 10000;
-	setName(NULL);
-	setDesc(NULL);
-	setMusicURL(NULL);
-	setMediaURL(NULL);
-	setMediaDesc(NULL);
-	setMediaType(NULL);
+	setName(LLStringUtil::null);
+	setDesc(LLStringUtil::null);
+	setMusicURL(LLStringUtil::null);
+	setMediaURL(LLStringUtil::null);
+	setMediaDesc(LLStringUtil::null);
+	setMediaType(LLStringUtil::null);
 	mMediaID.setNull();
 	mMediaAutoScale = 0;
 	mMediaLoop = TRUE;
@@ -241,6 +242,9 @@ void LLParcel::init(const LLUUID &owner_id,
 	setSelectedPrimCount(0);
 	setTempPrimCount(0);
 	setCleanOtherTime(0);
+    setRegionPushOverride(FALSE);
+    setRegionDenyAnonymousOverride(FALSE);
+    setRegionDenyAgeUnverifiedOverride(FALSE);
 	setParcelPrimBonus(parcel_object_bonus);
 
 	setPreviousOwnerID(LLUUID::null);
@@ -268,22 +272,7 @@ void LLParcel::overrideParcelFlags(U32 flags)
 {
     mParcelFlags = flags;
 }
-void set_std_string(const char* src, std::string& dest)
-{
-	if(src)
-	{
-		dest.assign(src);
-	}
-	else
-	{
-#if (LL_LINUX && __GNUC__ < 3)
-		dest.assign(std::string(""));
-#else
-		dest.clear();
-#endif
-	}
-}
-void LLParcel::setName(const LLString& name)
+void LLParcel::setName(const std::string& name)
 {
     // The escaping here must match the escaping in the database
     // abstraction layer.
@@ -291,7 +280,7 @@ void LLParcel::setName(const LLString& name)
     LLStringFn::replace_nonprintable(mName, LL_UNKNOWN_CHAR);
 }
 
-void LLParcel::setDesc(const LLString& desc)
+void LLParcel::setDesc(const std::string& desc)
 {
     // The escaping here must match the escaping in the database
     // abstraction layer.
@@ -299,7 +288,7 @@ void LLParcel::setDesc(const LLString& desc)
     mDesc = rawstr_to_utf8(mDesc);
 }
 
-void LLParcel::setMusicURL(const LLString& url)
+void LLParcel::setMusicURL(const std::string& url)
 {
     mMusicURL = url;
     // The escaping here must match the escaping in the database
@@ -309,7 +298,7 @@ void LLParcel::setMusicURL(const LLString& url)
     LLStringFn::replace_nonprintable(mMusicURL, LL_UNKNOWN_CHAR);
 }
 
-void LLParcel::setMediaURL(const LLString& url)
+void LLParcel::setMediaURL(const std::string& url)
 {
     mMediaURL = url;
     // The escaping here must match the escaping in the database
@@ -319,24 +308,24 @@ void LLParcel::setMediaURL(const LLString& url)
     LLStringFn::replace_nonprintable(mMediaURL, LL_UNKNOWN_CHAR);
 }
 
-void LLParcel::setMediaDesc(const char* desc)
+void LLParcel::setMediaDesc(const std::string& desc)
 {
 	// The escaping here must match the escaping in the database
 	// abstraction layer.
-	set_std_string(desc, mMediaDesc);
+	mMediaDesc = desc;
 	mMediaDesc = rawstr_to_utf8(mMediaDesc);
 }
-void LLParcel::setMediaType(const char* type)
+void LLParcel::setMediaType(const std::string& type)
 {
 	// The escaping here must match the escaping in the database
 	// abstraction layer.
-	set_std_string(type, mMediaType);
+	mMediaType = type;
 	mMediaType = rawstr_to_utf8(mMediaType);
 
 	// This code attempts to preserve legacy movie functioning
 	if(mMediaType.empty() && ! mMediaURL.empty())
 	{
-		setMediaType("video/vnd.secondlife.qt.legacy");
+		setMediaType(std::string("video/vnd.secondlife.qt.legacy"));
 	}
 }
 void LLParcel::setMediaWidth(S32 width)
@@ -575,7 +564,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 	while (input_stream.good())
 	{
 		skip_comments_and_emptyspace(input_stream);
-		LLString line, keyword, value;
+		std::string line, keyword, value;
 		get_line(line, input_stream, MAX_STRING);
 		get_keyword_and_value(keyword, value, line);
 
@@ -585,19 +574,19 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		}
 		else if ("parcel_id" == keyword)
 		{
-			mID.set(value.c_str());
+			mID.set(value);
 		}
 		else if ("status" == keyword)
 		{
-			mStatus = ownership_string_to_status(value.c_str());
+			mStatus = ownership_string_to_status(value);
 		}
 		else if ("category" == keyword)
 		{
-			mCategory = category_string_to_category(value.c_str());
+			mCategory = category_string_to_category(value);
 		}
 		else if ("local_id" == keyword)
 		{
-			LLString::convertToS32(value, mLocalID);
+			LLStringUtil::convertToS32(value, mLocalID);
 		}
 		else if ("name" == keyword)
 		{
@@ -617,65 +606,65 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		}
 		else if ("media_desc" == keyword)
 		{
-			setMediaDesc( value.c_str() );
+			setMediaDesc( value );
 		}
 		else if ("media_type" == keyword)
 		{
-			setMediaType( value.c_str() );
+			setMediaType( value );
 		}
 		else if ("media_width" == keyword)
 		{
 			S32 width;
-			LLString::convertToS32(value, width);
+			LLStringUtil::convertToS32(value, width);
 			setMediaWidth( width );
 		}
 		else if ("media_height" == keyword)
 		{
 			S32 height;
-			LLString::convertToS32(value, height);
+			LLStringUtil::convertToS32(value, height);
 			setMediaHeight( height );
 		}
 		else if ("media_id" == keyword)
 		{
-			mMediaID.set( value.c_str() );
+			mMediaID.set( value );
 		}
 		else if ("media_auto_scale" == keyword)
 		{
-			LLString::convertToU8(value, mMediaAutoScale);
+			LLStringUtil::convertToU8(value, mMediaAutoScale);
 		}
 		else if ("media_loop" == keyword)
 		{
-			LLString::convertToU8(value, mMediaLoop);
+			LLStringUtil::convertToU8(value, mMediaLoop);
 		}
 		else if ("obscure_media" == keyword)
 		{
-			LLString::convertToU8(value, mObscureMedia);
+			LLStringUtil::convertToU8(value, mObscureMedia);
 		}		
 		else if ("obscure_music" == keyword)
 		{
-			LLString::convertToU8(value, mObscureMusic);
+			LLStringUtil::convertToU8(value, mObscureMusic);
 		}		
 		else if ("owner_id" == keyword)
 		{
-			mOwnerID.set( value.c_str() );
+			mOwnerID.set( value );
 		}
 		else if ("group_owned" == keyword)
 		{
-			LLString::convertToBOOL(value, mGroupOwned);
+			LLStringUtil::convertToBOOL(value, mGroupOwned);
 		}
 		else if ("clean_other_time" == keyword)
 		{
 			S32 time;
-			LLString::convertToS32(value, time);
+			LLStringUtil::convertToS32(value, time);
 			setCleanOtherTime(time);
 		}
 		else if ("auth_buyer_id" == keyword)
 		{
-			mAuthBuyerID.set(value.c_str());
+			mAuthBuyerID.set(value);
 		}
 		else if ("snapshot_id" == keyword)
 		{
-			mSnapshotID.set(value.c_str());
+			mSnapshotID.set(value);
 		}
 		else if ("user_location" == keyword)
 		{
@@ -694,7 +683,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		else if ("landing_type" == keyword)
 		{
 			S32 landing_type = 0;
-			LLString::convertToS32(value, landing_type);
+			LLStringUtil::convertToS32(value, landing_type);
 			mLandingType = (ELandingType) landing_type;
 		}
 		else if ("join_neighbors" == keyword)
@@ -703,7 +692,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		}
 		else if ("revert_sale" == keyword)
 		{
-			LLString::convertToS32(value, secs_until_revert);
+			LLStringUtil::convertToS32(value, secs_until_revert);
 			if (secs_until_revert > 0)
 			{
 				mSaleTimerExpires.start();
@@ -712,7 +701,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		}
 		else if("extended_grace" == keyword)
 		{
-			LLString::convertToS32(value, mGraceExtension);
+			LLStringUtil::convertToS32(value, mGraceExtension);
 		}
 		else if ("user_list_type" == keyword)
 		{
@@ -720,147 +709,147 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		}
 		else if("auction_id" == keyword)
 		{
-			LLString::convertToU32(value, mAuctionID);
+			LLStringUtil::convertToU32(value, mAuctionID);
 		}
 		else if ("allow_modify" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_CREATE_OBJECTS, setting);
 		}
 		else if ("allow_group_modify" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_CREATE_GROUP_OBJECTS, setting);
 		}
 		else if ("allow_all_object_entry" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_ALL_OBJECT_ENTRY, setting);
 		}
 		else if ("allow_group_object_entry" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_GROUP_OBJECT_ENTRY, setting);
 		}
 		else if ("allow_deed_to_group" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_DEED_TO_GROUP, setting);
 		}
 		else if("contribute_with_deed" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_CONTRIBUTE_WITH_DEED, setting);
 		}
 		else if ("allow_terraform" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_TERRAFORM, setting);
 		}
 		else if ("allow_damage" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_DAMAGE, setting);
 		}
 		else if ("allow_fly" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_FLY, setting);
 		}
 		else if ("allow_landmark" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_LANDMARK, setting);
 		}
 		else if ("sound_local" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_SOUND_LOCAL, setting);
 		}
 		else if ("allow_group_scripts" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_GROUP_SCRIPTS, setting);
 		}
 		else if ("allow_voice_chat" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_VOICE_CHAT, setting);
 		}
 		else if ("use_estate_voice_chan" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, setting);
 		}
 		else if ("allow_scripts" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_OTHER_SCRIPTS, setting);
 		}
 		else if ("for_sale" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_FOR_SALE, setting);
 		}
 		else if ("sell_w_objects" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_SELL_PARCEL_OBJECTS, setting);
 		}
 		else if ("use_pass_list" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_USE_PASS_LIST, setting);
 		}
 		else if ("show_directory" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_SHOW_DIRECTORY, setting);
 		}
 		else if ("allow_publish" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_ALLOW_PUBLISH, setting);
 		}
 		else if ("mature_publish" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_MATURE_PUBLISH, setting);
 		}
 		else if ("claim_date" == keyword)
 		{
 			// BUG: This will fail when time rolls over in 2038.
 			S32 time;
-			LLString::convertToS32(value, time);
+			LLStringUtil::convertToS32(value, time);
 			mClaimDate = time;
 		}
 		else if ("claim_price" == keyword)
 		{
-			LLString::convertToS32(value, mClaimPricePerMeter);
+			LLStringUtil::convertToS32(value, mClaimPricePerMeter);
 		}
 		else if ("rent_price" == keyword)
 		{
-			LLString::convertToS32(value, mRentPricePerMeter);
+			LLStringUtil::convertToS32(value, mRentPricePerMeter);
 		}
 		else if ("discount_rate" == keyword)
 		{
-			LLString::convertToF32(value, mDiscountRate);
+			LLStringUtil::convertToF32(value, mDiscountRate);
 		}
 		else if ("draw_distance" == keyword)
 		{
-			LLString::convertToF32(value, mDrawDistance);
+			LLStringUtil::convertToF32(value, mDrawDistance);
 		}
 		else if ("sale_price" == keyword)
 		{
-			LLString::convertToS32(value, mSalePrice);
+			LLStringUtil::convertToS32(value, mSalePrice);
 		}
 		else if ("pass_price" == keyword)
 		{
-			LLString::convertToS32(value, mPassPrice);
+			LLStringUtil::convertToS32(value, mPassPrice);
 		}
 		else if ("pass_hours" == keyword)
 		{
-			LLString::convertToF32(value, mPassHours);
+			LLStringUtil::convertToF32(value, mPassHours);
 		}
 		else if ("box" == keyword)
 		{
@@ -873,17 +862,17 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		}
 		else if ("use_access_group" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_USE_ACCESS_GROUP, setting);
 		}
 		else if ("use_access_list" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_USE_ACCESS_LIST, setting);
 		}
 		else if ("use_ban_list" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_USE_BAN_LIST, setting);
 		}
 		else if ("group_name" == keyword)
@@ -892,7 +881,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		}
 		else if ("group_id" == keyword)
 		{
-			mGroupID.set( value.c_str() );
+			mGroupID.set( value );
 		}
 		// TODO: DEPRECATED FLAG
 		// Flag removed from simstate files in 1.11.1
@@ -900,7 +889,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		// no longer exists anywhere in simstate files.
 		else if ("require_identified" == keyword)
 		{
-			// LLString::convertToU32(value, setting);
+			// LLStringUtil::convertToU32(value, setting);
 			// setParcelFlag(PF_DENY_ANONYMOUS, setting);
 		}
 		// TODO: DEPRECATED FLAG
@@ -909,39 +898,39 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		// no longer exists anywhere in simstate files.
 		else if ("require_transacted" == keyword)
 		{
-			// LLString::convertToU32(value, setting);
+			// LLStringUtil::convertToU32(value, setting);
 			// setParcelFlag(PF_DENY_ANONYMOUS, setting);
 			// setParcelFlag(PF_DENY_IDENTIFIED, setting);
 		}
 		else if ("restrict_pushobject" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_RESTRICT_PUSHOBJECT, setting);
 		}
 		else if ("deny_anonymous" == keyword)
 		{
-			LLString::convertToU32(value, setting);
+			LLStringUtil::convertToU32(value, setting);
 			setParcelFlag(PF_DENY_ANONYMOUS, setting);
 		}
 		else if ("deny_identified" == keyword)
 		{
-// 			LLString::convertToU32(value, setting);
+// 			LLStringUtil::convertToU32(value, setting);
 // 			setParcelFlag(PF_DENY_IDENTIFIED, setting);
 		}
 		else if ("deny_transacted" == keyword)
 		{
-// 			LLString::convertToU32(value, setting);
+// 			LLStringUtil::convertToU32(value, setting);
 // 			setParcelFlag(PF_DENY_TRANSACTED, setting);
 		}
         else if ("deny_age_unverified" == keyword)
         {
-            LLString::convertToU32(value, setting);
+            LLStringUtil::convertToU32(value, setting);
             setParcelFlag(PF_DENY_AGEUNVERIFIED, setting);
         }
         else if ("access_list" == keyword)
         {
             S32 entry_count = 0;
-            LLString::convertToS32(value, entry_count);
+            LLStringUtil::convertToS32(value, entry_count);
             for (S32 i = 0; i < entry_count; i++)
             {
                 LLAccessEntry entry;
@@ -954,7 +943,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
         else if ("ban_list" == keyword)
         {
             S32 entry_count = 0;
-            LLString::convertToS32(value, entry_count);
+            LLStringUtil::convertToS32(value, entry_count);
             for (S32 i = 0; i < entry_count; i++)
             {
                 LLAccessEntry entry;
@@ -968,7 +957,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
         {
             /*
              S32 entry_count = 0;
-             LLString::convertToS32(value, entry_count);
+             LLStringUtil::convertToS32(value, entry_count);
              for (S32 i = 0; i < entry_count; i++)
              {
                  LLAccessEntry entry;
@@ -982,7 +971,7 @@ BOOL LLParcel::importStream(std::istream& input_stream)
         {
             // legacy - put into access list
             S32 entry_count = 0;
-            LLString::convertToS32(value, entry_count);
+            LLStringUtil::convertToS32(value, entry_count);
             for (S32 i = 0; i < entry_count; i++)
             {
                 LLAccessEntry entry;
@@ -1058,7 +1047,7 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
     while (input_stream.good())
     {
         skip_comments_and_emptyspace(input_stream);
-        LLString line, keyword, value;
+        std::string line, keyword, value;
         get_line(line, input_stream, MAX_STRING);
         get_keyword_and_value(keyword, value, line);
         
@@ -1068,7 +1057,7 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
         }
         else if ("id" == keyword)
         {
-            entry->mID.set( value.c_str() );
+            entry->mID.set( value );
         }
         else if ("name" == keyword)
         {
@@ -1077,13 +1066,13 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
         else if ("time" == keyword)
         {
             S32 when;
-            LLString::convertToS32(value, when);
+            LLStringUtil::convertToS32(value, when);
             entry->mTime = when;
         }
         else if ("flags" == keyword)
         {
             U32 setting;
-            LLString::convertToU32(value, setting);
+            LLStringUtil::convertToU32(value, setting);
             entry->mFlags = setting;
         }
         else
@@ -1098,7 +1087,7 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
 BOOL LLParcel::exportStream(std::ostream& output_stream)
 {
 	S32 setting;
-	char id_string[MAX_STRING];	/* Flawfinder: ignore */
+	std::string id_string;
 
 	std::ios::fmtflags old_flags = output_stream.flags();
 	output_stream.setf(std::ios::showpoint);
@@ -1201,8 +1190,10 @@ BOOL LLParcel::exportStream(std::ostream& output_stream)
 	output_stream << "\t\t sound_local	   " << (getSoundLocal() ? 1 : 0)  << "\n";
 	output_stream << "\t\t allow_scripts    " << (getAllowOtherScripts()  ? 1 : 0)  << "\n";
 	output_stream << "\t\t allow_group_scripts    " << (getAllowGroupScripts()  ? 1 : 0)  << "\n";
-	output_stream << "\t\t allow_voice_chat    " << (getVoiceEnabled() ? 1 : 0) << "\n";
-	output_stream << "\t\t use_estate_voice_chan   " << (getVoiceUseEstateChannel() ? 1 : 0) << "\n";
+	output_stream << "\t\t use_estate_voice_chan		 " << (getParcelFlagUseEstateVoiceChannel() ? 1 : 0) << "\n";
+
+	output_stream << "\t\t allow_voice_chat    " << (getParcelFlagAllowVoice() ? 1 : 0) << "\n";
+	output_stream << "\t\t use_estate_voice_chan   " << (getParcelFlagUseEstateVoiceChannel() ? 1 : 0) << "\n";
 	output_stream << "\t\t for_sale         " << (getForSale()       ? 1 : 0)  << "\n";
 	output_stream << "\t\t sell_w_objects   " << (getSellWithObjects()	? 1 : 0)  << "\n";
 	output_stream << "\t\t draw_distance    " << mDrawDistance  << "\n";
@@ -1374,17 +1365,17 @@ void LLParcel::packMessage(LLSD& msg)
 
 void LLParcel::unpackMessage(LLMessageSystem* msg)
 {
-    char buffer[256]; /* Flawfinder: ignore */
+	std::string buffer;
 	
     msg->getU32Fast( _PREHASH_ParcelData,_PREHASH_ParcelFlags, mParcelFlags );
     msg->getS32Fast( _PREHASH_ParcelData,_PREHASH_SalePrice, mSalePrice );
-    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_Name, 256, buffer );
+    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_Name, buffer );
     setName(buffer);
-    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_Desc, 256, buffer );
+    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_Desc, buffer );
     setDesc(buffer);
-    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_MusicURL, 256, buffer );
+    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_MusicURL, buffer );
     setMusicURL(buffer);
-    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_MediaURL, 256, buffer );
+    msg->getStringFast( _PREHASH_ParcelData,_PREHASH_MediaURL, buffer );
     setMediaURL(buffer);
     
     // non-optimized version
@@ -1409,9 +1400,9 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
 	// Note: the message has been converted to TCP
 	if(msg->getNumberOfBlocks("MediaData") > 0)
 	{
-		msg->getString("MediaData", "MediaDesc", 256, buffer);
+		msg->getString("MediaData", "MediaDesc", buffer);
 		setMediaDesc(buffer);
-		msg->getString("MediaData", "MediaType", 256, buffer);
+		msg->getString("MediaData", "MediaType", buffer);
 		setMediaType(buffer);
 		msg->getS32("MediaData", "MediaWidth", mMediaWidth);
 		msg->getS32("MediaData", "MediaHeight", mMediaHeight);
@@ -1421,8 +1412,8 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
 	}
 	else
 	{
-		setMediaType("video/vnd.secondlife.qt.legacy");
-		setMediaDesc("No Description available without Server Upgrade");
+		setMediaType(std::string("video/vnd.secondlife.qt.legacy"));
+		setMediaDesc(std::string("No Description available without Server Upgrade"));
 		mMediaLoop = true;
 		mObscureMedia = true;
 		mObscureMusic = true;
@@ -1685,37 +1676,37 @@ BOOL LLParcel::removeFromBanList(const LLUUID& agent_id)
 }
 
 // static
-const char* LLParcel::getOwnershipStatusString(EOwnershipStatus status)
+const std::string& LLParcel::getOwnershipStatusString(EOwnershipStatus status)
 {
     return ownership_status_to_string(status);
 }
 
 // static
-const char* LLParcel::getCategoryString(ECategory category)
+const std::string& LLParcel::getCategoryString(ECategory category)
 {
     return category_to_string(category);
 }
 
 // static
-const char* LLParcel::getCategoryUIString(ECategory category)
+const std::string& LLParcel::getCategoryUIString(ECategory category)
 {
     return category_to_ui_string(category);
 }
 
 // static
-LLParcel::ECategory LLParcel::getCategoryFromString(const char* string)
+LLParcel::ECategory LLParcel::getCategoryFromString(const std::string& string)
 {
     return category_string_to_category(string);
 }
 
 // static
-LLParcel::ECategory LLParcel::getCategoryFromUIString(const char* string)
+LLParcel::ECategory LLParcel::getCategoryFromUIString(const std::string& string)
 {
     return category_ui_string_to_category(string);
 }
 
 // static
-const char* LLParcel::getActionString(LLParcel::EAction action)
+const std::string& LLParcel::getActionString(LLParcel::EAction action)
 {
     S32 index = 0;
     if((action >= 0) && (action < LLParcel::A_COUNT))
@@ -1848,19 +1839,19 @@ BOOL LLParcel::isBuyerAuthorized(const LLUUID& buyer_id) const
 void LLParcel::clearParcel()
 {
 	overrideParcelFlags(PF_DEFAULT);
-	setName(NULL);
-	setDesc(NULL);
-	setMediaURL(NULL);
-	setMediaType(NULL);
+	setName(LLStringUtil::null);
+	setDesc(LLStringUtil::null);
+	setMediaURL(LLStringUtil::null);
+	setMediaType(LLStringUtil::null);
 	setMediaID(LLUUID::null);
-    setMediaDesc(NULL);
+    setMediaDesc(LLStringUtil::null);
 	setMediaAutoScale(0);
 	setMediaLoop(TRUE);
 	mObscureMedia = 1;
 	mObscureMusic = 1;
 	mMediaWidth = 0;
 	mMediaHeight = 0;
-	setMusicURL(NULL);
+	setMusicURL(LLStringUtil::null);
 	setInEscrow(FALSE);
 	setAuthorizedBuyerID(LLUUID::null);
 	setCategory(C_NONE);
@@ -1884,20 +1875,20 @@ void LLParcel::dump()
     llinfos << "	 desc <" << mDesc << ">" << llendl;
 }
 
-const char* ownership_status_to_string(LLParcel::EOwnershipStatus status)
+const std::string& ownership_status_to_string(LLParcel::EOwnershipStatus status)
 {
     if(status >= 0 && status < LLParcel::OS_COUNT)
     {
         return PARCEL_OWNERSHIP_STATUS_STRING[status];
     }
-    return "none";
+    return PARCEL_OWNERSHIP_STATUS_STRING[LLParcel::OS_COUNT];
 }
 
-LLParcel::EOwnershipStatus ownership_string_to_status(const char* s)
+LLParcel::EOwnershipStatus ownership_string_to_status(const std::string& s)
 {
     for(S32 i = 0; i < LLParcel::OS_COUNT; ++i)
     {
-        if(0 == strcmp(s, PARCEL_OWNERSHIP_STATUS_STRING[i]))
+        if(s == PARCEL_OWNERSHIP_STATUS_STRING[i])
         {
             return (LLParcel::EOwnershipStatus)i;
         }
@@ -1927,7 +1918,7 @@ LLParcel::EOwnershipStatus ownership_string_to_status(const char* s)
 // return LLParcel::STEA_REVERT;
 //}
     
-const char* category_to_string(LLParcel::ECategory category)
+const std::string& category_to_string(LLParcel::ECategory category)
 {
     S32 index = 0;
     if((category >= 0) && (category < LLParcel::C_COUNT))
@@ -1937,7 +1928,7 @@ const char* category_to_string(LLParcel::ECategory category)
     return PARCEL_CATEGORY_STRING[index];
 }
 
-const char* category_to_ui_string(LLParcel::ECategory category)
+const std::string& category_to_ui_string(LLParcel::ECategory category)
 {
     S32 index = 0;
     if((category >= 0) && (category < LLParcel::C_COUNT))
@@ -1952,11 +1943,11 @@ const char* category_to_ui_string(LLParcel::ECategory category)
     return PARCEL_CATEGORY_UI_STRING[index];
 }
 
-LLParcel::ECategory category_string_to_category(const char* s)
+LLParcel::ECategory category_string_to_category(const std::string& s)
 {
     for(S32 i = 0; i < LLParcel::C_COUNT; ++i)
     {
-        if(0 == strcmp(s, PARCEL_CATEGORY_STRING[i]))
+        if(s == PARCEL_CATEGORY_STRING[i])
         {
             return (LLParcel::ECategory)i;
         }
@@ -1965,11 +1956,11 @@ LLParcel::ECategory category_string_to_category(const char* s)
     return LLParcel::C_NONE;
 }
 
-LLParcel::ECategory category_ui_string_to_category(const char* s)
+LLParcel::ECategory category_ui_string_to_category(const std::string& s)
 {
     for(S32 i = 0; i < LLParcel::C_COUNT; ++i)
     {
-        if(0 == strcmp(s, PARCEL_CATEGORY_UI_STRING[i]))
+        if(s == PARCEL_CATEGORY_UI_STRING[i])
         {
             return (LLParcel::ECategory)i;
         }
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 9c91d94..e8f18f2 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -207,12 +207,12 @@ public:
 
 	// MANIPULATORS
 	void generateNewID() { mID.generate(); }
-	void setName(const LLString& name);
-	void setDesc(const LLString& desc);
-	void setMusicURL(const LLString& url);
-	void setMediaURL(const LLString& url);
-	void setMediaType(const char* type);
-	void setMediaDesc(const char* desc);
+	void setName(const std::string& name);
+	void setDesc(const std::string& desc);
+	void setMusicURL(const std::string& url);
+	void setMediaURL(const std::string& url);
+	void setMediaType(const std::string& type);
+	void setMediaDesc(const std::string& desc);
 	void	setMediaID(const LLUUID& id) { mMediaID = id; }
 	void	setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
 	void    setMediaLoop (U8 loop) { mMediaLoop = loop; }
@@ -266,7 +266,7 @@ public:
 	void	setDrawDistance(F32 dist)	{ mDrawDistance = dist; }
 	void	setSalePrice(S32 price)		{ mSalePrice = price; }
 	void	setGroupID(const LLUUID& id)	{ mGroupID = id; }
-	//void	setGroupName(const LLString& s)	{ mGroupName.assign(s); }
+	//void	setGroupName(const std::string& s)	{ mGroupName.assign(s); }
 	void	setPassPrice(S32 price)				{ mPassPrice = price; }
 	void	setPassHours(F32 hours)				{ mPassHours = hours; }
 
@@ -303,12 +303,12 @@ public:
 
 	// ACCESSORS
 	const LLUUID&	getID() const				{ return mID; }
-	const LLString&	getName() const			{ return mName; }
-	const LLString&	getDesc() const			{ return mDesc; }
-	const LLString&	getMusicURL() const		{ return mMusicURL; }
-	const LLString&	getMediaURL() const		{ return mMediaURL; }
-	const char*		getMediaDesc() const		{ return mMediaDesc.c_str(); }
-	const char*		getMediaType() const		{ return mMediaType.c_str(); }
+	const std::string&	getName() const			{ return mName; }
+	const std::string&	getDesc() const			{ return mDesc; }
+	const std::string&	getMusicURL() const		{ return mMusicURL; }
+	const std::string&	getMediaURL() const		{ return mMediaURL; }
+	const std::string&	getMediaDesc() const	{ return mMediaDesc; }
+	const std::string&	getMediaType() const	{ return mMediaType; }
 	const LLUUID&	getMediaID() const			{ return mMediaID; }
 	S32				getMediaWidth() const		{ return mMediaWidth; }
 	S32				getMediaHeight() const		{ return mMediaHeight; }
@@ -351,18 +351,18 @@ public:
 
 	// functions to deal with ownership status.
 	EOwnershipStatus getOwnershipStatus() const { return mStatus; }
-	static const char* getOwnershipStatusString(EOwnershipStatus status);
+	static const std::string& getOwnershipStatusString(EOwnershipStatus status);
 	void setOwnershipStatus(EOwnershipStatus status) { mStatus = status; }
 
 	// dealing with parcel category information
 	ECategory getCategory() const {return mCategory; }
-	static const char* getCategoryString(ECategory category);
-	static const char* getCategoryUIString(ECategory category);
-	static ECategory getCategoryFromString(const char* string);
-	static ECategory getCategoryFromUIString(const char* string);
+	static const std::string& getCategoryString(ECategory category);
+	static const std::string& getCategoryUIString(ECategory category);
+	static ECategory getCategoryFromString(const std::string& string);
+	static ECategory getCategoryFromUIString(const std::string& string);
 
 	// functions for parcel action (used for logging)
-	static const char* getActionString(EAction action);
+	static const std::string& getActionString(EAction action);
 
 	// dealing with sales and parcel conversion.
 	//
@@ -444,9 +444,9 @@ public:
 					{ return (mParcelFlags & PF_FOR_SALE) ? TRUE : FALSE; }
 	BOOL	getSoundLocal() const
 					{ return (mParcelFlags & PF_SOUND_LOCAL) ? TRUE : FALSE; }
-	BOOL	getVoiceEnabled() const
+	BOOL	getParcelFlagAllowVoice() const
 					{ return (mParcelFlags & PF_ALLOW_VOICE_CHAT) ? TRUE : FALSE; }
-	BOOL	getVoiceUseEstateChannel() const
+	BOOL	getParcelFlagUseEstateVoiceChannel() const
 					{ return (mParcelFlags & PF_USE_ESTATE_VOICE_CHAN) ? TRUE : FALSE; }
 	BOOL	getAllowPublish() const
 					{ return (mParcelFlags & PF_ALLOW_PUBLISH) ? TRUE : FALSE; }
@@ -514,7 +514,7 @@ public:
 	S32 getSimWidePrimCount() const { return mSimWidePrimCount; }
 
 	// this parcel only (not simwide)
-	S32		getMaxPrimCapacity() const	{ return mMaxPrimCapacity; }
+	S32		getMaxPrimCapacity() const	{ return mMaxPrimCapacity; }	// Does not include prim bonus
 	S32		getPrimCount() const		{ return mOwnerPrimCount + mGroupPrimCount + mOtherPrimCount + mSelectedPrimCount; }
 	S32		getOwnerPrimCount() const	{ return mOwnerPrimCount; }
 	S32		getGroupPrimCount() const	{ return mGroupPrimCount; }
@@ -525,7 +525,7 @@ public:
 
 	S32		getCleanOtherTime() const			{ return mCleanOtherTime; }
 
-	void	setMaxPrimCapacity(S32 max) { mMaxPrimCapacity = max; }
+	void	setMaxPrimCapacity(S32 max) { mMaxPrimCapacity = max; }		// Does not include prim bonus
 	// simwide
 	void	setSimWideMaxPrimCapacity(S32 current)	{ mSimWideMaxPrimCapacity = current; }
 	void setSimWidePrimCount(S32 current) { mSimWidePrimCount = current; }
@@ -587,12 +587,12 @@ protected:
 	F32					mDrawDistance;
 	U32					mParcelFlags;
 	S32					mSalePrice;				// linden dollars
-	LLString 			mName;
-	LLString 			mDesc;
-	LLString 			mMusicURL;
-	LLString 			mMediaURL;
-	std::string mMediaDesc;
-	std::string mMediaType;
+	std::string			mName;
+	std::string			mDesc;
+	std::string			mMusicURL;
+	std::string			mMediaURL;
+	std::string			mMediaDesc;
+	std::string 		mMediaType;
 	S32					mMediaWidth;
 	S32					mMediaHeight;
 	U8					mMediaAutoScale;
@@ -604,7 +604,7 @@ protected:
 	F32					mPassHours;
 	LLVector3			mAABBMin;
 	LLVector3			mAABBMax;
-	S32					mMaxPrimCapacity;
+	S32					mMaxPrimCapacity;		// Prims allowed on parcel, does not include prim bonus
 	S32					mSimWidePrimCount;
 	S32					mSimWideMaxPrimCapacity;
 	//S32					mSimWidePrimCorrection;
diff --git a/linden/indra/llinventory/llpermissions.cpp b/linden/indra/llinventory/llpermissions.cpp
index afa2772..b25faa8 100644
--- a/linden/indra/llinventory/llpermissions.cpp
+++ b/linden/indra/llinventory/llpermissions.cpp
@@ -650,7 +650,7 @@ BOOL LLPermissions::importFile(LLFILE* fp)
 
 BOOL LLPermissions::exportFile(LLFILE* fp) const
 {
-	char uuid_str[256];	/* Flawfinder: ignore */
+	std::string uuid_str;
 
 	fprintf(fp, "\tpermissions 0\n");
 	fprintf(fp, "\t{\n");
@@ -662,16 +662,16 @@ BOOL LLPermissions::exportFile(LLFILE* fp) const
 	fprintf(fp, "\t\tnext_owner_mask\t%08x\n",	mMaskNextOwner);
 
 	mCreator.toString(uuid_str);
-	fprintf(fp, "\t\tcreator_id\t%s\n",			uuid_str);
+	fprintf(fp, "\t\tcreator_id\t%s\n",			uuid_str.c_str());
 
 	mOwner.toString(uuid_str);
-	fprintf(fp, "\t\towner_id\t%s\n",			uuid_str);
+	fprintf(fp, "\t\towner_id\t%s\n",			uuid_str.c_str());
 
 	mLastOwner.toString(uuid_str);
-	fprintf(fp, "\t\tlast_owner_id\t%s\n",		uuid_str);
+	fprintf(fp, "\t\tlast_owner_id\t%s\n",		uuid_str.c_str());
 
 	mGroup.toString(uuid_str);
-	fprintf(fp, "\t\tgroup_id\t%s\n",			uuid_str);
+	fprintf(fp, "\t\tgroup_id\t%s\n",			uuid_str.c_str());
 
 	if(mIsGroupOwned)
 	{
@@ -784,21 +784,21 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
 
 BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const
 {
-	char uuid_str[256];	/* Flawfinder: ignore */
+	std::string uuid_str;
 
 	output_stream <<  "\tpermissions 0\n";
 	output_stream <<  "\t{\n";
 
-	char buffer[256];	/* Flawfinder: ignore */
-	snprintf(buffer, sizeof(buffer), "\t\tbase_mask\t%08x\n",		mMaskBase);		/* Flawfinder: ignore */
+	std::string buffer;
+	buffer = llformat( "\t\tbase_mask\t%08x\n",		mMaskBase);
 	output_stream << buffer;
-	snprintf(buffer, sizeof(buffer), "\t\towner_mask\t%08x\n",		mMaskOwner);		/* Flawfinder: ignore */
+	buffer = llformat( "\t\towner_mask\t%08x\n",		mMaskOwner);
 	output_stream << buffer;
-	snprintf(buffer, sizeof(buffer), "\t\tgroup_mask\t%08x\n",		mMaskGroup);		/* Flawfinder: ignore */
+	buffer = llformat( "\t\tgroup_mask\t%08x\n",		mMaskGroup);
 	output_stream << buffer;
-	snprintf(buffer, sizeof(buffer), "\t\teveryone_mask\t%08x\n",	mMaskEveryone);		/* Flawfinder: ignore */
+	buffer = llformat( "\t\teveryone_mask\t%08x\n",	mMaskEveryone);
 	output_stream << buffer;
-	snprintf(buffer, sizeof(buffer), "\t\tnext_owner_mask\t%08x\n",	mMaskNextOwner);		/* Flawfinder: ignore */
+	buffer = llformat( "\t\tnext_owner_mask\t%08x\n",	mMaskNextOwner);
 	output_stream << buffer;
 
 	mCreator.toString(uuid_str);
@@ -826,7 +826,7 @@ LLXMLNode *LLPermissions::exportFileXML() const
 {
 	LLXMLNode *ret = new LLXMLNode("permissions", FALSE);
 
-	ret->createChild("group_owned", TRUE)->setBoolValue(1, (const BOOL*)&mIsGroupOwned);
+	ret->createChild("group_owned", TRUE)->setBoolValue(mIsGroupOwned);
 
 	ret->createChild("base_mask", FALSE)->setByteValue(4, (U8*)&mMaskBase, LLXMLNode::ENCODING_HEX);
 	ret->createChild("owner_mask", FALSE)->setByteValue(4, (U8*)&mMaskOwner, LLXMLNode::ENCODING_HEX);
@@ -869,7 +869,11 @@ bool LLPermissions::importXML(LLXMLNode* node)
 		if (node->getChild("group_id", sub_node))
 			success = success && (1 == sub_node->getUUIDValue(1, &mGroup));
 		if (node->getChild("group_owned", sub_node))
-			success = success && (1 == sub_node->getBoolValue(1, (BOOL*)&mIsGroupOwned));
+		{
+			BOOL tmpbool = FALSE;
+			success = success && (1 == sub_node->getBoolValue(1, &tmpbool));
+			mIsGroupOwned = (bool)tmpbool;
+		}
 		if (!success)
 		{
 			lldebugs << "LLPermissions::importXML() failed for node named '" 
@@ -1114,12 +1118,12 @@ void LLAggregatePermissions::unpackMessage(LLMessageSystem* msg, const char* blo
 	mBits[PI_TRANSFER] = bits & TWO_BITS;
 }
 
-const LLString AGGREGATE_VALUES[4] =
+const std::string AGGREGATE_VALUES[4] =
 	{
-		LLString( "Empty" ),
-		LLString( "None" ),
-		LLString( "Some" ),
-		LLString( "All" )
+		std::string( "Empty" ),
+		std::string( "None" ),
+		std::string( "Some" ),
+		std::string( "All" )
 	};
 
 std::ostream& operator<<(std::ostream &s, const LLAggregatePermissions &perm)
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 7aabdda..4895378 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -128,7 +128,7 @@ bool LLSaleInfo::fromLLSD(LLSD& sd, BOOL& has_perm_mask, U32& perm_mask)
 LLXMLNode *LLSaleInfo::exportFileXML() const
 {
 	LLXMLNode *ret = new LLXMLNode("sale_info", FALSE);
-	LLString type_str = lookup(mSaleType);
+	std::string type_str = ll_safe_string( lookup(mSaleType));
 	ret->createChild("type", TRUE)->setStringValue(1, &type_str);
 	ret->createChild("price", TRUE)->setIntValue(1, &mSalePrice);
 	return ret;
diff --git a/linden/indra/llinventory/lltransactionflags.cpp b/linden/indra/llinventory/lltransactionflags.cpp
index a45cdba..175cd99 100644
--- a/linden/indra/llinventory/lltransactionflags.cpp
+++ b/linden/indra/llinventory/lltransactionflags.cpp
@@ -32,9 +32,9 @@
 
 #include "linden_common.h"
 
+#include "lluuid.h"
 #include "lltransactionflags.h"
 #include "lltransactiontypes.h"
-#include "lluuid.h"
  
 const U8 TRANSACTION_FLAGS_NONE = 0;
 const U8 TRANSACTION_FLAG_SOURCE_GROUP = 1;
@@ -69,12 +69,12 @@ BOOL is_tf_owner_group(TransactionFlags flags)
 void append_reason(
 	std::ostream& ostr,
 	S32 transaction_type,
-	const char* description)
+	const std::string& description)
 {
 	switch( transaction_type )
 	{
 	case TRANS_OBJECT_SALE:
-		ostr << " for " << (description ? description : "<unknown>");
+	  ostr << " for " << (description.length() > 0 ? description : std::string("<unknown>"));
 		break;
 	case TRANS_LAND_SALE:
 		ostr << " for a parcel of land";
@@ -95,12 +95,21 @@ std::string build_transfer_message_to_source(
 	const LLUUID& dest_id,
 	const std::string& dest_name,
 	S32 transaction_type,
-	const char* description)
+	const std::string& description)
 {
 	lldebugs << "build_transfer_message_to_source: " << amount << " "
 		<< source_id << " " << dest_id << " " << dest_name << " "
-		<< (description?description:"(no desc)") << llendl;
-	if((0 == amount) || source_id.isNull()) return ll_safe_string(description);
+		<< transaction_type << " "
+		<< (description.empty() ? "(no desc)" : description)
+		<< llendl;
+	if(source_id.isNull())
+	{
+		return description;
+	}
+	if((0 == amount) && description.empty())
+	{
+		return description;
+	}
 	std::ostringstream ostr;
 	if(dest_id.isNull())
 	{
@@ -135,13 +144,20 @@ std::string build_transfer_message_to_destination(
 	const LLUUID& source_id,
 	const std::string& source_name,
 	S32 transaction_type,
-	const char* description)
+	const std::string& description)
 {
 	lldebugs << "build_transfer_message_to_dest: " << amount << " "
 		<< dest_id << " " << source_id << " " << source_name << " "
-		<< (description?description:"(no desc)") << llendl;
-	if(0 == amount) return std::string();
-	if(dest_id.isNull()) return ll_safe_string(description);
+		<< transaction_type << " " << (description.empty() ? "(no desc)" : description)
+		<< llendl;
+	if(0 == amount)
+	{
+		return std::string();
+	}
+	if(dest_id.isNull())
+	{
+		return description;
+	}
 	std::ostringstream ostr;
 	ostr << source_name << " paid you L$" << amount;
 	append_reason(ostr, transaction_type, description);
diff --git a/linden/indra/llinventory/lltransactionflags.h b/linden/indra/llinventory/lltransactionflags.h
index 9a27c3f..ffb17cb 100644
--- a/linden/indra/llinventory/lltransactionflags.h
+++ b/linden/indra/llinventory/lltransactionflags.h
@@ -31,6 +31,8 @@
 #ifndef LL_LLTRANSACTIONFLAGS_H
 #define LL_LLTRANSACTIONFLAGS_H
 
+class LLUUID;
+
 typedef U8 TransactionFlags;
 
 // defined in common/llinventory/lltransactionflags.cpp
@@ -55,7 +57,7 @@ std::string build_transfer_message_to_source(
 	const LLUUID& dest_id,
 	const std::string& dest_name,
 	S32 transaction_type,
-	const char* description);
+	const std::string& description);
 
 std::string build_transfer_message_to_destination(
 	S32 amount,
@@ -63,6 +65,6 @@ std::string build_transfer_message_to_destination(
 	const LLUUID& source_id,
 	const std::string& source_name,
 	S32 transaction_type,
-	const char* description);
+	const std::string& description);
 
 #endif // LL_LLTRANSACTIONFLAGS_H
diff --git a/linden/indra/llmath/CMakeLists.txt b/linden/indra/llmath/CMakeLists.txt
new file mode 100644
index 0000000..6a329fa
--- /dev/null
+++ b/linden/indra/llmath/CMakeLists.txt
@@ -0,0 +1,81 @@
+# -*- cmake -*-
+
+project(llmath)
+
+include(00-Common)
+include(LLCommon)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    )
+
+set(llmath_SOURCE_FILES
+    llbboxlocal.cpp
+    llcamera.cpp
+    llcoordframe.cpp
+    llline.cpp
+    llperlin.cpp
+    llquaternion.cpp
+    llrect.cpp
+    llsphere.cpp
+    llvolume.cpp
+    llvolumemgr.cpp
+    llsdutil_math.cpp
+    m3math.cpp
+    m4math.cpp
+    raytrace.cpp
+    v2math.cpp
+    v3color.cpp
+    v3dmath.cpp
+    v3math.cpp
+    v4color.cpp
+    v4coloru.cpp
+    v4math.cpp
+    xform.cpp
+    )
+
+set(llmath_HEADER_FILES
+    CMakeLists.txt
+
+    camera.h
+    coordframe.h
+    llbboxlocal.h
+    llcamera.h
+    llcoord.h
+    llcoordframe.h
+    llinterp.h
+    llline.h
+    llmath.h
+    lloctree.h
+    llperlin.h
+    llplane.h
+    llquantize.h
+    llquaternion.h
+    llrect.h
+    llsphere.h
+    lltreenode.h
+    llv4math.h
+    llv4matrix3.h
+    llv4matrix4.h
+    llv4vector3.h
+    llvolume.h
+    llvolumemgr.h
+    m3math.h
+    m4math.h
+    raytrace.h
+    v2math.h
+    v3color.h
+    v3dmath.h
+    v3math.h
+    v4color.h
+    v4coloru.h
+    v4math.h
+    xform.h
+    )
+
+set_source_files_properties(${llmath_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES})
+
+add_library (llmath ${llmath_SOURCE_FILES})
diff --git a/linden/indra/llmath/files.lst b/linden/indra/llmath/files.lst
deleted file mode 100644
index 1001a6d..0000000
--- a/linden/indra/llmath/files.lst
+++ /dev/null
@@ -1,25 +0,0 @@
-llmath/llbboxlocal.cpp
-llmath/llcamera.cpp
-llmath/llcoordframe.cpp
-llmath/llcrc.cpp
-llmath/llline.cpp
-llmath/llmd5.cpp
-llmath/llperlin.cpp
-llmath/llquaternion.cpp
-llmath/llrand.cpp
-llmath/llrect.cpp
-llmath/llsphere.cpp
-llmath/lluuid.cpp
-llmath/llvolume.cpp
-llmath/llvolumemgr.cpp
-llmath/m3math.cpp
-llmath/m4math.cpp
-llmath/raytrace.cpp
-llmath/v2math.cpp
-llmath/v3color.cpp
-llmath/v3dmath.cpp
-llmath/v3math.cpp
-llmath/v4color.cpp
-llmath/v4coloru.cpp
-llmath/v4math.cpp
-llmath/xform.cpp
diff --git a/linden/indra/llmath/llcamera.h b/linden/indra/llmath/llcamera.h
index 7066b9f..2884338 100644
--- a/linden/indra/llmath/llcamera.h
+++ b/linden/indra/llmath/llcamera.h
@@ -115,11 +115,12 @@ protected:
 	LLPlane mWorldPlanes[PLANE_NUM];
 	LLPlane mHorizPlanes[HORIZ_PLANE_NUM];
 
-	typedef struct 
+	struct frustum_plane
 	{
+        frustum_plane() : mask(0) {}
 		LLPlane p;
 		U8 mask;
-	} frustum_plane;
+	};
 	frustum_plane mAgentPlanes[7];  //frustum planes in agent space a la gluUnproject (I'm a bastard, I know) - DaveP
 									
 	U32 mPlaneCount;  //defaults to 6, if setUserClipPlane is called, uses user supplied clip plane in
diff --git a/linden/indra/llmath/llcrc.cpp b/linden/indra/llmath/llcrc.cpp
deleted file mode 100644
index 447521a..0000000
--- a/linden/indra/llmath/llcrc.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/** 
- * @file llcrc.cpp
- * @brief implementation of the crc class.
- *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "llcrc.h"
-#include "llerror.h"
-
-/* Copyright (C) 1986 Gary S. Brown.  You may use this program, or
-   code or tables extracted from it, as desired without restriction.*/
-
-/* First, the polynomial itself and its table of feedback terms.  The  */
-/* polynomial is                                                       */
-/* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
-/* Note that we take it "backwards" and put the highest-order term in  */
-/* the lowest-order bit.  The X^32 term is "implied"; the LSB is the   */
-/* X^31 term, etc.  The X^0 term (usually shown as "+1") results in    */
-/* the MSB being 1.                                                    */
-
-/* Note that the usual hardware shift register implementation, which   */
-/* is what we're using (we're merely optimizing it by doing eight-bit  */
-/* chunks at a time) shifts bits into the lowest-order term.  In our   */
-/* implementation, that means shifting towards the right.  Why do we   */
-/* do it this way?  Because the calculated CRC must be transmitted in  */
-/* order from highest-order term to lowest-order term.  UARTs transmit */
-/* characters in order from LSB to MSB.  By storing the CRC this way,  */
-/* we hand it to the UART in the order low-byte to high-byte; the UART */
-/* sends each low-bit to hight-bit; and the result is transmission bit */
-/* by bit from highest- to lowest-order term without requiring any bit */
-/* shuffling on our part.  Reception works similarly.                  */
-
-/* The feedback terms table consists of 256, 32-bit entries.  Notes:   */
-/*                                                                     */
-/*  1. The table can be generated at runtime if desired; code to do so */
-/*     is shown later.  It might not be obvious, but the feedback      */
-/*     terms simply represent the results of eight shift/xor opera-    */
-/*     tions for all combinations of data and CRC register values.     */
-/*                                                                     */
-/*  2. The CRC accumulation logic is the same for all CRC polynomials, */
-/*     be they sixteen or thirty-two bits wide.  You simply choose the */
-/*     appropriate table.  Alternatively, because the table can be     */
-/*     generated at runtime, you can start by generating the table for */
-/*     the polynomial in question and use exactly the same "updcrc",   */
-/*     if your application needn't simultaneously handle two CRC       */
-/*     polynomials.  (Note, however, that XMODEM is strange.)          */
-/*                                                                     */
-/*  3. For 16-bit CRCs, the table entries need be only 16 bits wide;   */
-/*     of course, 32-bit entries work OK if the high 16 bits are zero. */
-/*                                                                     */
-/*  4. The values must be right-shifted by eight bits by the "updcrc"  */
-/*     logic; the shift must be unsigned (bring in zeroes).  On some   */
-/*     hardware you could probably optimize the shift in assembler by  */
-/*     using byte-swap instructions.                                   */
-
-///----------------------------------------------------------------------------
-/// Local function declarations, constants, enums, and typedefs
-///----------------------------------------------------------------------------
-
-#define UPDC32(octet,crc) (crc_32_tab[((crc) \
- ^ ((U8)octet)) & 0xff] ^ ((crc) >> 8))
-
-
-static U32 crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
-0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
-
-///----------------------------------------------------------------------------
-/// Class llcrc
-///----------------------------------------------------------------------------
-
-// Default constructor
-LLCRC::LLCRC() : mCurrent(0xffffffff)
-{
-}
-
-
-U32 LLCRC::getCRC() const
-{
-	return ~mCurrent;
-}
-
-void LLCRC::update(U8 next_byte)
-{
-	mCurrent = UPDC32(next_byte, mCurrent);
-}
-
-void LLCRC::update(const U8* buffer, size_t buffer_size)
-{
-	for (size_t i = 0; i < buffer_size; i++)
-	{
-		mCurrent = UPDC32(buffer[i], mCurrent);
-	}
-}
-
-void LLCRC::update(const char* filename)
-{
-	if (!filename)
-	{
-		llerrs << "No filename specified" << llendl;
-		return;
-	}
-
-	LLFILE* fp = LLFile::fopen(filename, "rb");		/* Flawfinder: ignore */
-
-	if (fp)
-	{
-		fseek(fp, 0, SEEK_END);
-		long size = ftell(fp);
-
-		fseek(fp, 0, SEEK_SET);
-
-		if (size > 0)
-		{
-			U8* data = new U8[size];
-			size_t nread;
-			
-			nread = fread(data, 1, size, fp);
-			fclose(fp);
-			
-			if (nread < (size_t) size)
-			{
-				llwarns << "Short read on " << filename << llendl;
-			}
-
-			update(data, nread);
-			delete[] data;
-		}
-	}
-}
-
-
-#ifdef _DEBUG
-BOOL LLCRC::testHarness()
-{
-	const S32 TEST_BUFFER_SIZE = 16;
-	const char TEST_BUFFER[TEST_BUFFER_SIZE] = "hello &#$)$&Nd0";	/* Flawfinder: ignore */
-	LLCRC c1, c2;
-	c1.update((U8*)TEST_BUFFER, TEST_BUFFER_SIZE - 1);
-	char* rh = (char*)TEST_BUFFER;
-	while(*rh != '\0')
-	{
-		c2.update(*rh);
-		++rh;
-	}
-	return(c1.getCRC() == c2.getCRC());
-}
-#endif
-
-
-
-///----------------------------------------------------------------------------
-/// Local function definitions
-///----------------------------------------------------------------------------
diff --git a/linden/indra/llmath/llcrc.h b/linden/indra/llmath/llcrc.h
deleted file mode 100644
index 59f58ce..0000000
--- a/linden/indra/llmath/llcrc.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/** 
- * @file llcrc.h
- * @brief LLCRC class header file.
- *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLCRC_H
-#define LL_LLCRC_H
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class llcrc
-//
-// Simple 32 bit crc. To use, instantiate an LLCRC instance and feed
-// it the bytes you want to check. It will update the internal crc as
-// you go, and you can qery it at the end. As a horribly inefficient
-// example (don't try this at work kids):
-//
-//  LLCRC crc;
-//  LLFILE* fp = LLFile::fopen(filename,"rb");
-//  while(!feof(fp)) {
-//    crc.update(fgetc(fp));
-//  }
-//  fclose(fp);
-//  llinfos << "File crc: " << crc.getCRC() << llendl;
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLCRC
-{
-protected:
-	U32 mCurrent;
-	
-public:
-	LLCRC();
-
-	U32 getCRC() const;
-	void update(U8 next_byte);
-	void update(const U8* buffer, size_t buffer_size);
-	void update(const char *filename);
-
-#ifdef _DEBUG
-	// This function runs tests to make sure the crc is
-	// working. Returns TRUE if it is.
-	static BOOL testHarness();
-#endif
-};
-
-
-#endif // LL_LLCRC_H
diff --git a/linden/indra/llmath/llline.cpp b/linden/indra/llmath/llline.cpp
index 9c41efb..cfd3f56 100644
--- a/linden/indra/llmath/llline.cpp
+++ b/linden/indra/llmath/llline.cpp
@@ -20,6 +20,8 @@
  * $/LicenseInfo$
  */
 
+#include "linden_common.h"
+
 #include "llline.h"
 #include "llrand.h"
 
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index 4a6358d..82ab197 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -33,9 +33,10 @@
 #define LLMATH_H
 
 #include <cmath>
-//#include <math.h>
-//#include <stdlib.h>
+#include <cstdlib>
 #include "lldefs.h"
+#include "llstl.h" // *TODO: Remove when LLString is gone
+#include "llstring.h" // *TODO: Remove when LLString is gone
 
 // work around for Windows & older gcc non-standard function names.
 #if LL_WINDOWS
@@ -93,6 +94,9 @@ const F32	F_APPROXIMATELY_ZERO = 0.00001f;
 const F32	F_LN2		= 0.69314718056f;
 const F32	OO_LN2		= 1.4426950408889634073599246810019f;
 
+const F32	F_ALMOST_ZERO	= 0.0001f;
+const F32	F_ALMOST_ONE	= 1.0f - F_ALMOST_ZERO;
+
 // BUG: Eliminate in favor of F_APPROXIMATELY_ZERO above?
 const F32 FP_MAG_THRESHOLD = 0.0000001f;
 
@@ -102,13 +106,13 @@ inline BOOL is_approx_zero( F32 f ) { return (-F_APPROXIMATELY_ZERO < f) && (f <
 inline BOOL is_approx_equal(F32 x, F32 y)
 {
 	const S32 COMPARE_MANTISSA_UP_TO_BIT = 0x02;
-	return (abs((S32) ((U32&)x - (U32&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
+	return (std::abs((S32) ((U32&)x - (U32&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
 }
 
 inline BOOL is_approx_equal(F64 x, F64 y)
 {
 	const S64 COMPARE_MANTISSA_UP_TO_BIT = 0x02;
-	return (abs((S32) ((U64&)x - (U64&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
+	return (std::abs((S32) ((U64&)x - (U64&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
 }
 
 inline BOOL is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
@@ -155,17 +159,17 @@ inline BOOL is_approx_equal_fraction(F64 x, F64 y, U32 frac_bits)
 
 inline S32 llabs(const S32 a)
 {
-	return S32(labs(a));
+	return S32(std::labs(a));
 }
 
 inline F32 llabs(const F32 a)
 {
-	return F32(fabs(a));
+	return F32(std::fabs(a));
 }
 
 inline F64 llabs(const F64 a)
 {
-	return F64(fabs(a));
+	return F64(std::fabs(a));
 }
 
 inline S32 lltrunc( F32 f )
@@ -473,8 +477,8 @@ inline F32 llsimple_angle(F32 angle)
 	return angle;
 }
 
-//calculate the nearesr power of two number for val, bounded by max_power_two
-inline U32 get_nearest_power_two(U32 val, U32 max_power_two)
+//SDK - Renamed this to get_lower_power_two, since this is what this actually does.
+inline U32 get_lower_power_two(U32 val, U32 max_power_two)
 {
 	if(!max_power_two)
 	{
@@ -489,4 +493,34 @@ inline U32 get_nearest_power_two(U32 val, U32 max_power_two)
 	
 	return max_power_two ;
 }
+
+// calculate next highest power of two, limited by max_power_two
+// This is taken from a brilliant little code snipped on http://acius2.blogspot.com/2007/11/calculating-next-power-of-2.html
+// Basically we convert the binary to a solid string of 1's with the same
+// number of digits, then add one.  We subtract 1 initially to handle
+// the case where the number passed in is actually a power of two.
+// WARNING: this only works with 32 bit ints.
+inline U32 get_next_power_two(U32 val, U32 max_power_two)
+{
+	if(!max_power_two)
+	{
+		max_power_two = 1 << 31 ;
+	}
+
+	if(val >= max_power_two)
+	{
+		return max_power_two;
+	}
+
+	val--;
+	val = (val >> 1) | val;
+	val = (val >> 2) | val;
+	val = (val >> 4) | val;
+	val = (val >> 8) | val;
+	val = (val >> 16) | val;
+	val++;
+
+	return val;
+}
+
 #endif
diff --git a/linden/indra/llmath/llmath.vcproj b/linden/indra/llmath/llmath.vcproj
deleted file mode 100644
index d05505e..0000000
--- a/linden/indra/llmath/llmath.vcproj
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llmath"
-	ProjectGUID="{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				BrowseInformation="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llbboxlocal.cpp">
-			</File>
-			<File
-				RelativePath=".\llcamera.cpp">
-			</File>
-			<File
-				RelativePath=".\llcoordframe.cpp">
-			</File>
-			<File
-				RelativePath=".\llcrc.cpp">
-			</File>
-			<File
-				RelativePath=".\llline.cpp">
-			</File>
-			<File
-				RelativePath=".\llmd5.cpp">
-			</File>
-			<File
-				RelativePath=".\llperlin.cpp">
-			</File>
-			<File
-				RelativePath=".\llquaternion.cpp">
-			</File>
-			<File
-				RelativePath=".\llrand.cpp">
-			</File>
-			<File
-				RelativePath=".\llrect.cpp">
-			</File>
-			<File
-				RelativePath=".\llsphere.cpp">
-			</File>
-			<File
-				RelativePath=".\lluuid.cpp">
-			</File>
-			<File
-				RelativePath=".\llvolume.cpp">
-			</File>
-			<File
-				RelativePath=".\llvolumemgr.cpp">
-			</File>
-			<File
-				RelativePath=".\m3math.cpp">
-			</File>
-			<File
-				RelativePath=".\m4math.cpp">
-			</File>
-			<File
-				RelativePath=".\raytrace.cpp">
-			</File>
-			<File
-				RelativePath=".\v2math.cpp">
-			</File>
-			<File
-				RelativePath=".\v3color.cpp">
-			</File>
-			<File
-				RelativePath=".\v3dmath.cpp">
-			</File>
-			<File
-				RelativePath=".\v3math.cpp">
-			</File>
-			<File
-				RelativePath=".\v4color.cpp">
-			</File>
-			<File
-				RelativePath=".\v4coloru.cpp">
-			</File>
-			<File
-				RelativePath=".\v4math.cpp">
-			</File>
-			<File
-				RelativePath=".\xform.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llbboxlocal.h">
-			</File>
-			<File
-				RelativePath=".\llcamera.h">
-			</File>
-			<File
-				RelativePath=".\llcoord.h">
-			</File>
-			<File
-				RelativePath=".\llcoordframe.h">
-			</File>
-			<File
-				RelativePath=".\llcrc.h">
-			</File>
-			<File
-				RelativePath=".\llinterp.h">
-			</File>
-			<File
-				RelativePath=".\llline.h">
-			</File>
-			<File
-				RelativePath=".\llmath.h">
-			</File>
-			<File
-				RelativePath=".\llmd5.h">
-			</File>
-			<File
-				RelativePath=".\lloctree.h">
-			</File>
-			<File
-				RelativePath=".\llperlin.h">
-			</File>
-			<File
-				RelativePath=".\llquantize.h">
-			</File>
-			<File
-				RelativePath=".\llquaternion.h">
-			</File>
-			<File
-				RelativePath=".\llrand.h">
-			</File>
-			<File
-				RelativePath=".\llrect.h">
-			</File>
-			<File
-				RelativePath=".\llsphere.h">
-			</File>
-			<File
-				RelativePath=".\lltreenode.h">
-			</File>
-			<File
-				RelativePath=".\lluuid.h">
-			</File>
-			<File
-				RelativePath=".\llv4math.h">
-			</File>
-			<File
-				RelativePath=".\llv4matrix3.h">
-			</File>
-			<File
-				RelativePath=".\llv4matrix4.h">
-			</File>
-			<File
-				RelativePath=".\llv4vector3.h">
-			</File>
-			<File
-				RelativePath=".\llvolume.h">
-			</File>
-			<File
-				RelativePath=".\llvolumemgr.h">
-			</File>
-			<File
-				RelativePath=".\m3math.h">
-			</File>
-			<File
-				RelativePath=".\m4math.h">
-			</File>
-			<File
-				RelativePath=".\raytrace.h">
-			</File>
-			<File
-				RelativePath=".\v2math.h">
-			</File>
-			<File
-				RelativePath=".\v3color.h">
-			</File>
-			<File
-				RelativePath=".\v3dmath.h">
-			</File>
-			<File
-				RelativePath=".\v3math.h">
-			</File>
-			<File
-				RelativePath=".\v4color.h">
-			</File>
-			<File
-				RelativePath=".\v4coloru.h">
-			</File>
-			<File
-				RelativePath=".\v4math.h">
-			</File>
-			<File
-				RelativePath=".\xform.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmath/llmath_vc8.vcproj b/linden/indra/llmath/llmath_vc8.vcproj
deleted file mode 100644
index 3b4413a..0000000
--- a/linden/indra/llmath/llmath_vc8.vcproj
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llmath"
-	ProjectGUID="{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
-	RootNamespace="llmath"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				BrowseInformation="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llbboxlocal.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcamera.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoordframe.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llline.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmd5.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llperlin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llquaternion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrand.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluuid.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\m3math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\m4math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\raytrace.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v2math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3color.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3dmath.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v4color.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v4coloru.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v4math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\xform.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llbboxlocal.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoord.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoordframe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinterp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llline.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmd5.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lloctree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llperlin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llquantize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llquaternion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrand.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsphere.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltreenode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluuid.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4matrix3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4matrix4.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4vector3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\m3math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\m4math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\raytrace.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v2math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v3color.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v3dmath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v3math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v4color.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v4coloru.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v4math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\xform.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmath/llmath_vc9.vcproj b/linden/indra/llmath/llmath_vc9.vcproj
deleted file mode 100644
index 03bc780..0000000
--- a/linden/indra/llmath/llmath_vc9.vcproj
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llmath"
-	ProjectGUID="{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"
-	RootNamespace="llmath"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				BrowseInformation="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmath.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llbboxlocal.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcamera.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoordframe.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llline.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmd5.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llperlin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llquaternion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrand.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluuid.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\m3math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\m4math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\raytrace.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v2math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3color.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3dmath.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v4color.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v4coloru.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v4math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\xform.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llbboxlocal.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoord.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoordframe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinterp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llline.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmd5.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lloctree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llperlin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llquantize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llquaternion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrand.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsphere.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltreenode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluuid.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4matrix3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4matrix4.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llv4vector3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\m3math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\m4math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\raytrace.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v2math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v3color.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v3dmath.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v3math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v4color.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v4coloru.h"
-				>
-			</File>
-			<File
-				RelativePath=".\v4math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\xform.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmath/llmd5.cpp b/linden/indra/llmath/llmd5.cpp
deleted file mode 100644
index ea69002..0000000
--- a/linden/indra/llmath/llmd5.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-/** 
- * @file llmd5.cpp
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-// llMD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
-//
-// Adapted to Linden Lab by Frank Filipanits, 6/25/2002
-// Fixed potential memory leak, James Cook, 6/27/2002
-
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
-
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
-
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
- */
-
-
-
-
-
-#include "linden_common.h"
-
-#include "llmd5.h"
-
-#include <cassert>
-
-// how many bytes to grab at a time when checking files
-const int LLMD5::BLOCK_LEN = 4096;
-
-
-// LLMD5 simple initialization method
-
-LLMD5::LLMD5()
-{
-  init();
-}
-
-
-
-
-// MD5 block update operation. Continues an MD5 message-digest
-// operation, processing another message block, and updating the
-// context.
-
-void LLMD5::update (const uint1 *input, const uint4 input_length) {
-
-  uint4 input_index, buffer_index;
-  uint4 buffer_space;                // how much space is left in buffer
-
-  if (finalized){  // so we can't update!
-	  std::cerr << "LLMD5::update:  Can't update a finalized digest!" << std::endl;
-    return;
-  }
-
-  // Compute number of bytes mod 64
-  buffer_index = (unsigned int)((count[0] >> 3) & 0x3F);
-
-  // Update number of bits
-  if (  (count[0] += ((uint4) input_length << 3))<((uint4) input_length << 3) )
-    count[1]++;
-
-  count[1] += ((uint4)input_length >> 29);
-
-
-  buffer_space = 64 - buffer_index;  // how much space is left in buffer
-
-  // Transform as many times as possible.
-  if (input_length >= buffer_space) { // ie. we have enough to fill the buffer
-    // fill the rest of the buffer and transform
-    memcpy(	/* Flawfinder: ignore */
-		buffer + buffer_index,
-		input,
-		buffer_space);
-    transform (buffer);
-
-    // now, transform each 64-byte piece of the input, bypassing the buffer
-  if (input == NULL || input_length == 0){
-	std::cerr << "LLMD5::update:  Invalid input!" << std::endl;
-	return;
-  }
-
-    for (input_index = buffer_space; input_index + 63 < input_length; 
-	 input_index += 64)
-      transform (input+input_index);
-
-    buffer_index = 0;  // so we can buffer remaining
-  }
-  else
-    input_index=0;     // so we can buffer the whole input
-
-
-  // and here we do the buffering:
-  memcpy(buffer+buffer_index, input+input_index, input_length-input_index);		/* Flawfinder: ignore */
-}
-
-
-
-// MD5 update for files.
-// Like above, except that it works on files (and uses above as a primitive.)
-
-void LLMD5::update(LLFILE* file){
-
-  unsigned char buffer[BLOCK_LEN];		/* Flawfinder: ignore */
-  int len;
-
-  while ( (len=(int)fread(buffer, 1, BLOCK_LEN, file)) )
-    update(buffer, len);
-
-  fclose (file);
-
-}
-
-
-
-
-
-
-// MD5 update for istreams.
-// Like update for files; see above.
-
-void LLMD5::update(std::istream& stream){
-
-  unsigned char buffer[BLOCK_LEN];		/* Flawfinder: ignore */
-  int len;
-
-  while (stream.good()){
-    stream.read( (char*)buffer, BLOCK_LEN); 	/* Flawfinder: ignore */		// note that return value of read is unusable.
-    len=stream.gcount();
-    update(buffer, len);
-  }
-
-}
-
-
-
-
-
-// MD5 finalization. Ends an MD5 message-digest operation, writing the
-// the message digest and zeroizing the context.
-
-
-void LLMD5::finalize (){
-
-  unsigned char bits[8];		/* Flawfinder: ignore */
-  unsigned int index, padLen;
-  static uint1 PADDING[64]={
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-
-  if (finalized){
-    std::cerr << "LLMD5::finalize:  Already finalized this digest!" << std::endl;
-    return;
-  }
-
-  // Save number of bits
-  encode (bits, count, 8);
-
-  // Pad out to 56 mod 64.
-  index = (uint4) ((count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
-  update (PADDING, padLen);
-
-  // Append length (before padding)
-  update (bits, 8);
-
-  // Store state in digest
-  encode (digest, state, 16);
-
-  // Zeroize sensitive information
-  memset (buffer, 0, sizeof(*buffer));
-
-  finalized=1;
-
-}
-
-
-
-
-LLMD5::LLMD5(LLFILE *file){
-
-  init();  // must be called be all constructors
-  update(file);
-  finalize ();
-}
-
-
-
-
-LLMD5::LLMD5(std::istream& stream){
-
-  init();  // must called by all constructors
-  update (stream);
-  finalize();
-}
-
-// Digest a string of the format ("%s:%i" % (s, number))
-LLMD5::LLMD5(const unsigned char *string, const unsigned int number)
-{
-	const char *colon = ":";
-	char tbuf[16];		/* Flawfinder: ignore */
-	init();
-	update(string, (U32)strlen((const char *) string));		/* Flawfinder: ignore */
-	update((const unsigned char *) colon, (U32)strlen(colon));		/* Flawfinder: ignore */
-	snprintf(tbuf, sizeof(tbuf), "%i", number);	/* Flawfinder: ignore */
-	update((const unsigned char *) tbuf, (U32)strlen(tbuf));	/* Flawfinder: ignore */
-	finalize();
-}
-
-// Digest a string
-LLMD5::LLMD5(const unsigned char *s)
-{
-	init();
-	update(s, (U32)strlen((const char *) s));		/* Flawfinder: ignore */
-	finalize();
-}
-
-void LLMD5::raw_digest(unsigned char *s)
-{
-	if (!finalized)
-	{
-		std::cerr << "LLMD5::raw_digest:  Can't get digest if you haven't "<<
-			"finalized the digest!" << std::endl;
-		s[0] = '\0';
-		return;
-	}
-
-	memcpy(s, digest, 16);		/* Flawfinder: ignore */
-	return;
-}
-
-
-
-void LLMD5::hex_digest(char *s)
-{
-	int i;
-
-	if (!finalized)
-	{
-		std::cerr << "LLMD5::hex_digest:  Can't get digest if you haven't "<<
-		  "finalized the digest!" <<std::endl;
-		s[0] = '\0';
-		return;
-	}
-
-	for (i=0; i<16; i++)
-	{
-		sprintf(s+i*2, "%02x", digest[i]);		/* Flawfinder: ignore */
-	}
-
-	s[32]='\0';
-
-	return;
-}
-
-
-
-
-
-std::ostream& operator<<(std::ostream &stream, LLMD5 context)
-{
-	char s[33];		/* Flawfinder: ignore */
-	context.hex_digest(s);
-	stream << s;
-	return stream;
-}
-
-
-
-
-// PRIVATE METHODS:
-
-
-
-void LLMD5::init(){
-  finalized=0;  // we just started!
-
-  // Nothing counted, so count=0
-  count[0] = 0;
-  count[1] = 0;
-
-  // Load magic initialization constants.
-  state[0] = 0x67452301;
-  state[1] = 0xefcdab89;
-  state[2] = 0x98badcfe;
-  state[3] = 0x10325476;
-}
-
-
-
-// Constants for MD5Transform routine.
-// Although we could use C++ style constants, defines are actually better,
-// since they let us easily evade scope clashes.
-
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-// #defines are faster then inline, etc because the compiler is not required to inline.
-// Timing tests prove that this works ~40% faster on win with msvc++2k3 over using static inline.
-
-/* F, G, H and I are basic MD5 functions.
- */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits.
- */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-Rotation is separate from addition to prevent recomputation.
- */
-#define FF(a, b, c, d, x, s, ac) { \
- (a) += F ((b), (c), (d)) + (x) + (U32)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) { \
- (a) += G ((b), (c), (d)) + (x) + (U32)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) { \
- (a) += H ((b), (c), (d)) + (x) + (U32)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) { \
- (a) += I ((b), (c), (d)) + (x) + (U32)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-
-
-
-// LLMD5 basic transformation. Transforms state based on block.
-void LLMD5::transform (const U8 block[64]){
-
-  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-  decode (x, block, 64);
-
-  assert(!finalized);  // not just a user error, since the method is private
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  // Zeroize sensitive information.
-  memset ( (uint1 *) x, 0, sizeof(x));
-
-}
-
-
-
-// Encodes input (UINT4) into output (unsigned char). Assumes len is
-// a multiple of 4.
-void LLMD5::encode (uint1 *output, const uint4 *input, const uint4 len) {
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
-    output[j]   = (uint1)  (input[i] & 0xff);
-    output[j+1] = (uint1) ((input[i] >> 8) & 0xff);
-    output[j+2] = (uint1) ((input[i] >> 16) & 0xff);
-    output[j+3] = (uint1) ((input[i] >> 24) & 0xff);
-  }
-}
-
-
-
-
-// Decodes input (unsigned char) into output (UINT4). Assumes len is
-// a multiple of 4.
-void LLMD5::decode (uint4 *output, const uint1 *input, const uint4 len){
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
-      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
-}
diff --git a/linden/indra/llmath/llmd5.h b/linden/indra/llmath/llmd5.h
deleted file mode 100644
index 9ba0a9f..0000000
--- a/linden/indra/llmath/llmd5.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/** 
- * @file llmd5.h
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLMD5_H
-#define LL_LLMD5_H
-
-// LLMD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
-
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
-
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
-
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5.H - header file for MD5C.C
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-// use for the raw digest output
-const int MD5RAW_BYTES = 16;
-
-// use for outputting hex digests
-const int MD5HEX_STR_SIZE = 33;  // char hex[MD5HEX_STR_SIZE]; with null
-const int MD5HEX_STR_BYTES = 32; // message system fixed size
-
-class LLMD5 {
-// first, some types:
-  typedef unsigned       int uint4; // assumes integer is 4 words long
-  typedef unsigned short int uint2; // assumes short integer is 2 words long
-  typedef unsigned      char uint1; // assumes char is 1 word long
-
-// how many bytes to grab at a time when checking files
-  static const int BLOCK_LEN;
-
-public:
-// methods for controlled operation:
-  LLMD5              ();  // simple initializer
-  void  update     (const uint1 *input, const uint4 input_length);
-  void  update     (std::istream& stream);
-  void  update     (LLFILE *file);
-  void  finalize   ();
-
-// constructors for special circumstances.  All these constructors finalize
-// the MD5 context.
-  LLMD5              (const unsigned char *string); // digest string, finalize
-  LLMD5              (std::istream& stream);       // digest stream, finalize
-  LLMD5              (LLFILE *file);            // digest file, close, finalize
-  LLMD5              (const unsigned char *string, const unsigned int number);
-  
-// methods to acquire finalized result
-  void				raw_digest(unsigned char *array);	// provide 16-byte array for binary data
-  void				hex_digest(char *string);			// provide 33-byte array for ascii-hex string
-  friend std::ostream&   operator<< (std::ostream&, LLMD5 context);
-
-
-
-private:
-
-
-// next, the private data:
-  uint4 state[4];
-  uint4 count[2];     // number of *bits*, mod 2^64
-  uint1 buffer[64];   // input buffer
-  uint1 digest[16];
-  uint1 finalized;
-
-// last, the private methods, mostly static:
-  void init             ();               // called by all constructors
-  void transform        (const uint1 *buffer);  // does the real update work.  Note 
-                                          // that length is implied to be 64.
-
-  static void encode    (uint1 *dest, const uint4 *src, const uint4 length);
-  static void decode    (uint4 *dest, const uint1 *src, const uint4 length);
-
-};
-
-#endif // LL_LLMD5_H
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h
index e26bae5..57b359f 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -37,7 +37,7 @@
 #include <vector>
 #include <set>
 
-#ifdef LL_RELEASE_FOR_DOWNLOAD
+#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #define OCT_ERRS LL_WARNS("OctreeErrors")
 #else
 #define OCT_ERRS LL_ERRS("OctreeErrors")
diff --git a/linden/indra/llmath/llquaternion.cpp b/linden/indra/llmath/llquaternion.cpp
index ab4855b..9eab8ed 100644
--- a/linden/indra/llmath/llquaternion.cpp
+++ b/linden/indra/llmath/llquaternion.cpp
@@ -791,7 +791,7 @@ LLQuaternion mayaQ(F32 xRot, F32 yRot, F32 zRot, LLQuaternion::Order order)
 
 const char *OrderToString( const LLQuaternion::Order order )
 {
-	char *p = NULL;
+	const char *p = NULL;
 	switch( order )
 	{
 	default:
@@ -937,15 +937,15 @@ void LLQuaternion::unpackFromVector3( const LLVector3& vec )
 	}
 }
 
-BOOL LLQuaternion::parseQuat(const char* buf, LLQuaternion* value)
+BOOL LLQuaternion::parseQuat(const std::string& buf, LLQuaternion* value)
 {
-	if( buf == NULL || buf[0] == '\0' || value == NULL)
+	if( buf.empty() || value == NULL)
 	{
 		return FALSE;
 	}
 
 	LLQuaternion quat;
-	S32 count = sscanf( buf, "%f %f %f %f", quat.mQ + 0, quat.mQ + 1, quat.mQ + 2, quat.mQ + 3 );
+	S32 count = sscanf( buf.c_str(), "%f %f %f %f", quat.mQ + 0, quat.mQ + 1, quat.mQ + 2, quat.mQ + 3 );
 	if( 4 == count )
 	{
 		value->set( quat );
diff --git a/linden/indra/llmath/llquaternion.h b/linden/indra/llmath/llquaternion.h
index 048db2d..1eb982e 100644
--- a/linden/indra/llmath/llquaternion.h
+++ b/linden/indra/llmath/llquaternion.h
@@ -158,7 +158,7 @@ public:
 	friend const char *OrderToString( const Order order );
 	friend Order StringToOrder( const char *str );
 
-	static BOOL parseQuat(const char* buf, LLQuaternion* value);
+	static BOOL parseQuat(const std::string& buf, LLQuaternion* value);
 
 	// For debugging, only
 	//static U32 mMultCount;
diff --git a/linden/indra/llmath/llrand.cpp b/linden/indra/llmath/llrand.cpp
deleted file mode 100644
index bc8c867..0000000
--- a/linden/indra/llmath/llrand.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/** 
- * @file llrand.cpp
- * @brief Global random generator.
- *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
- * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "llrand.h"
-#include "lluuid.h"
-
-/**
- * Through analysis, we have decided that we want to take values which
- * are close enough to 1.0 to map back to 0.0.  We came to this
- * conclusion from noting that:
- *
- * [0.0, 1.0)
- *
- * when scaled to the integer set:
- *
- * [0, 4)
- *
- * there is some value close enough to 1.0 that when multiplying by 4,
- * gets truncated to 4. Therefore:
- *
- * [0,1-eps] => 0
- * [1,2-eps] => 1
- * [2,3-eps] => 2
- * [3,4-eps] => 3
- *
- * So 0 gets uneven distribution if we simply clamp. The actual
- * clamp utilized in this file is to map values out of range back
- * to 0 to restore uniform distribution.
- *
- * Also, for clamping floats when asking for a distribution from
- * [0.0,g) we have determined that for values of g < 0.5, then
- * rand*g=g, which is not the desired result. As above, we clamp to 0
- * to restore uniform distribution.
- */
-
-// *NOTE: The system rand implementation is probably not correct.
-#define LL_USE_SYSTEM_RAND 0
-
-#if LL_USE_SYSTEM_RAND
-#include <cstdlib>
-#endif
-
-#if LL_USE_SYSTEM_RAND
-class LLSeedRand
-{
-public:
-	LLSeedRand()
-	{
-#if LL_WINDOWS
-		srand(LLUUID::getRandomSeed());
-#else
-		srand48(LLUUID::getRandomSeed());
-#endif
-	}
-};
-static LLSeedRand sRandomSeeder;
-inline F64 ll_internal_random_double()
-{
-#if LL_WINDOWS
-	return (F64)rand() / (F64)RAND_MAX; 
-#else
-	return drand48();
-#endif
-}
-inline F32 ll_internal_random_float()
-{
-#if LL_WINDOWS
-	return (F32)rand() / (F32)RAND_MAX; 
-#else
-	return (F32)drand48();
-#endif
-}
-#else
-static LLRandLagFib2281 gRandomGenerator(LLUUID::getRandomSeed());
-inline F64 ll_internal_random_double()
-{
-	// *HACK: Through experimentation, we have found that dual core
-	// CPUs (or at least multi-threaded processes) seem to
-	// occasionally give an obviously incorrect random number -- like
-	// 5^15 or something. Sooooo, clamp it as described above.
-	F64 rv = gRandomGenerator();
-	if(!((rv >= 0.0) && (rv < 1.0))) return fmod(rv, 1.0);
-	return rv;
-}
-
-inline F32 ll_internal_random_float()
-{
-	// The clamping rules are described above.
-	F32 rv = (F32)gRandomGenerator();
-	if(!((rv >= 0.0f) && (rv < 1.0f))) return fmod(rv, 1.f);
-	return rv;
-}
-#endif
-
-S32 ll_rand()
-{
-	return ll_rand(RAND_MAX);
-}
-
-S32 ll_rand(S32 val)
-{
-	// The clamping rules are described above.
-	S32 rv = (S32)(ll_internal_random_double() * val);
-	if(rv == val) return 0;
-	return rv;
-}
-
-F32 ll_frand()
-{
-	return ll_internal_random_float();
-}
-
-F32 ll_frand(F32 val)
-{
-	// The clamping rules are described above.
-	F32 rv = ll_internal_random_float() * val;
-	if(val > 0)
-	{
-		if(rv >= val) return 0.0f;
-	}
-	else
-	{
-		if(rv <= val) return 0.0f;
-	}
-	return rv;
-}
-
-F64 ll_drand()
-{
-	return ll_internal_random_double();
-}
-
-F64 ll_drand(F64 val)
-{
-	// The clamping rules are described above.
-	F64 rv = ll_internal_random_double() * val;
-	if(val > 0)
-	{
-		if(rv >= val) return 0.0;
-	}
-	else
-	{
-		if(rv <= val) return 0.0;
-	}
-	return rv;
-}
diff --git a/linden/indra/llmath/llrand.h b/linden/indra/llmath/llrand.h
deleted file mode 100644
index 0a28213..0000000
--- a/linden/indra/llmath/llrand.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/** 
- * @file llrand.h
- * @brief Information, functions, and typedefs for randomness.
- *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
- * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLRAND_H
-#define LL_LLRAND_H
-
-#include <boost/random/lagged_fibonacci.hpp>
-#include <boost/random/mersenne_twister.hpp>
-
-/**
- * Use the boost random number generators if you want a stateful
- * random numbers. If you want more random numbers, use the
- * c-functions since they will generate faster/better randomness
- * across the process.
- *
- * I tested some of the boost random engines, and picked a good double
- * generator and a good integer generator. I also took some timings
- * for them on linux using gcc 3.3.5. The harness also did some other
- * fairly trivial operations to try to limit compiler optimizations,
- * so these numbers are only good for relative comparisons.
- *
- * usec/inter		algorithm
- * 0.21				boost::minstd_rand0
- * 0.039			boost:lagged_fibonacci19937
- * 0.036			boost:lagged_fibonacci607
- * 0.44				boost::hellekalek1995
- * 0.44				boost::ecuyer1988
- * 0.042			boost::rand48
- * 0.043			boost::mt11213b
- * 0.028			stdlib random() 
- * 0.05				stdlib lrand48()
- * 0.034			stdlib rand()
- * 0.020			the old & lame LLRand
- */
-
-/**
- *@brief Generate a float from [0, RAND_MAX).
- */
-S32 ll_rand();
-
-/**
- *@brief Generate a float from [0, val) or (val, 0].
- */
-S32 ll_rand(S32 val);
-
-/**
- *@brief Generate a float from [0, 1.0).
- */
-F32 ll_frand();
-
-/**
- *@brief Generate a float from [0, val) or (val, 0].
- */
-F32 ll_frand(F32 val);
-
-/**
- *@brief Generate a double from [0, 1.0).
- */
-F64 ll_drand();
-
-/**
- *@brief Generate a double from [0, val) or (val, 0].
- */
-F64 ll_drand(F64 val);
-
-/**
- * @brief typedefs for good boost lagged fibonacci.
- * @see boost::lagged_fibonacci
- *
- * These generators will quickly generate doubles. Note the memory
- * requirements, because they are somewhat high. I chose the smallest
- * one, and one comparable in speed but higher periodicity without
- * outrageous memory requirements.
- * To use:
- *  LLRandLagFib607 foo((U32)time(NULL));
- *  double bar = foo();
- */
-
-typedef boost::lagged_fibonacci607 LLRandLagFib607;
-/**< 
- * lengh of cycle: 2^32,000
- * memory: 607*sizeof(double) (about 5K)
- */
-
-typedef boost::lagged_fibonacci2281 LLRandLagFib2281;
-/**< 
- * lengh of cycle: 2^120,000
- * memory: 2281*sizeof(double) (about 17K)
- */
-
-/**
- * @breif typedefs for a good boost mersenne twister implementation.
- * @see boost::mersenne_twister
- *
- * This fairly quickly generates U32 values
- * To use:
- *  LLRandMT19937 foo((U32)time(NULL));
- *  U32 bar = foo();
- *
- * lengh of cycle: 2^19,937-1
- * memory: about 2496 bytes
- */
-typedef boost::mt11213b LLRandMT19937;
-#endif
diff --git a/linden/indra/llmath/llrect.h b/linden/indra/llmath/llrect.h
index f2a5d75..ebe5d83 100644
--- a/linden/indra/llmath/llrect.h
+++ b/linden/indra/llmath/llrect.h
@@ -183,10 +183,11 @@ public:
 
 	LLRectBase& setCenterAndSize(Type x, Type y, Type width, Type height)
 	{
+		// width and height could be odd, so favor top, right with extra pixel
 		mLeft = x - width/2;
-		mTop = y + height/2;
-		mRight = x + width/2;
 		mBottom = y - height/2;
+		mTop = mBottom + height;
+		mRight = mLeft + width;
 		return *this;
 	}
 
diff --git a/linden/indra/llmath/llsdutil_math.cpp b/linden/indra/llmath/llsdutil_math.cpp
new file mode 100644
index 0000000..5b72875
--- /dev/null
+++ b/linden/indra/llmath/llsdutil_math.cpp
@@ -0,0 +1,172 @@
+/** 
+ * @file llsdutil_math.cpp
+ * @author Phoenix
+ * @date 2006-05-24
+ * @brief Implementation of classes, functions, etc, for using structured data.
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
+ * Copyright (c) 2006-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llsdutil.h"
+
+#include "v3math.h"
+#include "v4math.h"
+#include "v3dmath.h"
+#include "v2math.h"
+#include "llquaternion.h"
+#include "v4color.h"
+
+#if LL_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>	// for htonl
+#elif LL_LINUX || LL_SOLARIS
+#	include <netinet/in.h>
+#elif LL_DARWIN
+#	include <arpa/inet.h>
+#endif
+
+#include "llsdserialize.h"
+
+// vector3
+LLSD ll_sd_from_vector3(const LLVector3& vec)
+{
+	LLSD rv;
+	rv.append((F64)vec.mV[VX]);
+	rv.append((F64)vec.mV[VY]);
+	rv.append((F64)vec.mV[VZ]);
+	return rv;
+}
+
+LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index)
+{
+	LLVector3 rv;
+	rv.mV[VX] = (F32)sd[start_index].asReal();
+	rv.mV[VY] = (F32)sd[++start_index].asReal();
+	rv.mV[VZ] = (F32)sd[++start_index].asReal();
+	return rv;
+}
+
+// vector4
+LLSD ll_sd_from_vector4(const LLVector4& vec)
+{
+	LLSD rv;
+	rv.append((F64)vec.mV[VX]);
+	rv.append((F64)vec.mV[VY]);
+	rv.append((F64)vec.mV[VZ]);
+	rv.append((F64)vec.mV[VW]);
+	return rv;
+}
+
+LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index)
+{
+	LLVector4 rv;
+	rv.mV[VX] = (F32)sd[start_index].asReal();
+	rv.mV[VY] = (F32)sd[++start_index].asReal();
+	rv.mV[VZ] = (F32)sd[++start_index].asReal();
+	rv.mV[VW] = (F32)sd[++start_index].asReal();
+	return rv;
+}
+
+// vector3d
+LLSD ll_sd_from_vector3d(const LLVector3d& vec)
+{
+	LLSD rv;
+	rv.append(vec.mdV[VX]);
+	rv.append(vec.mdV[VY]);
+	rv.append(vec.mdV[VZ]);
+	return rv;
+}
+
+LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index)
+{
+	LLVector3d rv;
+	rv.mdV[VX] = sd[start_index].asReal();
+	rv.mdV[VY] = sd[++start_index].asReal();
+	rv.mdV[VZ] = sd[++start_index].asReal();
+	return rv;
+}
+
+//vector2
+LLSD ll_sd_from_vector2(const LLVector2& vec)
+{
+	LLSD rv;
+	rv.append((F64)vec.mV[VX]);
+	rv.append((F64)vec.mV[VY]);
+	return rv;
+}
+
+LLVector2 ll_vector2_from_sd(const LLSD& sd)
+{
+	LLVector2 rv;
+	rv.mV[VX] = (F32)sd[0].asReal();
+	rv.mV[VY] = (F32)sd[1].asReal();
+	return rv;
+}
+
+// Quaternion
+LLSD ll_sd_from_quaternion(const LLQuaternion& quat)
+{
+	LLSD rv;
+	rv.append((F64)quat.mQ[VX]);
+	rv.append((F64)quat.mQ[VY]);
+	rv.append((F64)quat.mQ[VZ]);
+	rv.append((F64)quat.mQ[VW]);
+	return rv;
+}
+
+LLQuaternion ll_quaternion_from_sd(const LLSD& sd)
+{
+	LLQuaternion quat;
+	quat.mQ[VX] = (F32)sd[0].asReal();
+	quat.mQ[VY] = (F32)sd[1].asReal();
+	quat.mQ[VZ] = (F32)sd[2].asReal();
+	quat.mQ[VW] = (F32)sd[3].asReal();
+	return quat;
+}
+
+// color4
+LLSD ll_sd_from_color4(const LLColor4& c)
+{
+	LLSD rv;
+	rv.append(c.mV[0]);
+	rv.append(c.mV[1]);
+	rv.append(c.mV[2]);
+	rv.append(c.mV[3]);
+	return rv;
+}
+
+LLColor4 ll_color4_from_sd(const LLSD& sd)
+{
+	LLColor4 c;
+	c.mV[0] = (F32)sd[0].asReal();
+	c.mV[1] = (F32)sd[1].asReal();
+	c.mV[2] = (F32)sd[2].asReal();
+	c.mV[3] = (F32)sd[3].asReal();
+	return c;
+}
diff --git a/linden/indra/llmath/llsphere.cpp b/linden/indra/llmath/llsphere.cpp
index 62f6e27..f253b6c 100644
--- a/linden/indra/llmath/llsphere.cpp
+++ b/linden/indra/llmath/llsphere.cpp
@@ -20,6 +20,8 @@
  * $/LicenseInfo$
  */
 
+#include "linden_common.h"
+
 #include "llsphere.h"
 
 LLSphere::LLSphere()
diff --git a/linden/indra/llmath/lluuid.cpp b/linden/indra/llmath/lluuid.cpp
deleted file mode 100644
index d835cbc..0000000
--- a/linden/indra/llmath/lluuid.cpp
+++ /dev/null
@@ -1,923 +0,0 @@
-/** 
- * @file lluuid.cpp
- *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
- * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-// We can't use WIN32_LEAN_AND_MEAN here, needs lots of includes.
-#if LL_WINDOWS
-#	undef WIN32_LEAN_AND_MEAN
-#	include <winsock2.h>
-#	include <windows.h>
-#endif
-
-#include "lldefs.h"
-#include "llerror.h"
-
-#include "lluuid.h"
-#include "llerror.h"
-#include "llrand.h"
-#include "llmd5.h"
-#include "llstring.h"
-#include "lltimer.h"
-
-const LLUUID LLUUID::null;
-const LLTransactionID LLTransactionID::tnull;
-
-/*
-
-NOT DONE YET!!!
-
-static char BASE85_TABLE[] = {
-	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-	'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-	'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
-	'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-	'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
-	'y', 'z', '!', '#', '$', '%', '&', '(', ')', '*',
-	'+', '-', ';', '[', '=', '>', '?', '@', '^', '_',
-	'`', '{', '|', '}', '~', '\0'
-};
-
-
-void encode( char * fiveChars, unsigned int word ) throw( )
-{
-for( int ix = 0; ix < 5; ++ix ) {
-fiveChars[4-ix] = encodeTable[ word % 85];
-word /= 85;
-}
-}
-
-To decode:
-unsigned int decode( char const * fiveChars ) throw( bad_input_data )
-{
-unsigned int ret = 0;
-for( int ix = 0; ix < 5; ++ix ) {
-char * s = strchr( encodeTable, fiveChars[ ix ] );
-if( s == 0 ) throw bad_input_data();
-ret = ret * 85 + (s-encodeTable);
-}
-return ret;
-}
-
-void LLUUID::toBase85(char* out)
-{
-	U32* me = (U32*)&(mData[0]);
-	for(S32 i = 0; i < 4; ++i)
-	{
-		char* o = &out[i*i];
-		for(S32 j = 0; j < 5; ++j)
-		{
-			o[4-j] = BASE85_TABLE[ me[i] % 85];
-			word /= 85;
-		}
-	}
-}
-
-unsigned int decode( char const * fiveChars ) throw( bad_input_data )
-{
-	unsigned int ret = 0;
-	for( S32 ix = 0; ix < 5; ++ix )
-	{
-		char * s = strchr( encodeTable, fiveChars[ ix ] );
-		ret = ret * 85 + (s-encodeTable);
-	}
-	return ret;
-} 
-*/
-
-#define LL_USE_JANKY_RANDOM_NUMBER_GENERATOR 0
-#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
-/**
- * @brief a global for
- */
-static U64 sJankyRandomSeed(LLUUID::getRandomSeed());
-
-/**
- * @brief generate a random U32.
- */
-U32 janky_fast_random_bytes()
-{
-	sJankyRandomSeed = U64L(1664525) * sJankyRandomSeed + U64L(1013904223); 
-	return (U32)sJankyRandomSeed;
-}
-
-/**
- * @brief generate a random U32 from [0, val)
- */
-U32 janky_fast_random_byes_range(U32 val)
-{
-	sJankyRandomSeed = U64L(1664525) * sJankyRandomSeed + U64L(1013904223); 
-	return (U32)(sJankyRandomSeed) % val; 
-}
-
-/**
- * @brief generate a random U32 from [0, val)
- */
-U32 janky_fast_random_seeded_bytes(U32 seed, U32 val)
-{
-	seed = U64L(1664525) * (U64)(seed) + U64L(1013904223); 
-	return (U32)(seed) % val; 
-}
-#endif
-
-// Common to all UUID implementations
-void LLUUID::toString(char *out) const
-{
-	sprintf(out,
-		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-		(U8)(mData[0]),
-		(U8)(mData[1]),
-		(U8)(mData[2]),
-		(U8)(mData[3]),
-		(U8)(mData[4]),
-		(U8)(mData[5]),
-		(U8)(mData[6]),
-		(U8)(mData[7]),
-		(U8)(mData[8]),
-		(U8)(mData[9]),
-		(U8)(mData[10]),
-		(U8)(mData[11]),
-		(U8)(mData[12]),
-		(U8)(mData[13]),
-		(U8)(mData[14]),
-		(U8)(mData[15]));
-}
-
-void LLUUID::toCompressedString(char *out) const
-{
-	memcpy(out, mData, UUID_BYTES);		/* Flawfinder: ignore */
-	out[UUID_BYTES] = '\0';
-}
-
-std::string LLUUID::getString() const
-{
-	return asString();
-}
-
-std::string LLUUID::asString() const
-{
-	char str[UUID_STR_SIZE];		/* Flawfinder: ignore */
-	toString(str);
-	return std::string(str);
-}
-
-BOOL LLUUID::set(const std::string& in_string, BOOL emit)
-{
-	return set(in_string.c_str(), emit);
-}
-
-BOOL LLUUID::set(const char *in_string, BOOL emit)
-{
-	BOOL broken_format = FALSE;
-	if (!in_string)
-	{
-		llerrs << "No string pointer in LLUUID::set!" << llendl;
-		setNull();
-		return FALSE;
-	}
-
-	// empty strings should make NULL uuid
-	if (!in_string[0])
-	{
-		setNull();
-		return TRUE;
-	}
-
-	if (strlen(in_string) != (UUID_STR_LENGTH - 1))		/* Flawfinder: ignore */
-	{
-		// I'm a moron.  First implementation didn't have the right UUID format.
-		// Shouldn't see any of these any more
-		if (strlen(in_string) == (UUID_STR_LENGTH - 2))	/* Flawfinder: ignore */
-		{
-			if(emit)
-			{
-				llinfos << "Warning! Using broken UUID string format" << llendl;
-			}
-			broken_format = TRUE;
-		}
-		else
-		{
-			// Bad UUID string.  Spam as INFO, as most cases we don't care.
-			if(emit)
-			{
-				llinfos << "Bad UUID string: " << in_string << llendl;
-			}
-			setNull();
-			return FALSE;
-		}
-	}
-
-	U8 cur_pos = 0;
-	S32 i;
-	for (i = 0; i < UUID_BYTES; i++)
-	{
-		if ((i == 4) || (i == 6) || (i == 8) || (i == 10))
-		{
-			cur_pos++;
-			if (broken_format && (i==10))
-			{
-				// Missing - in the broken format
-				cur_pos--;
-			}
-		}
-
-		mData[i] = 0;
-
-		if ((*(in_string + cur_pos) >= '0') && (*(in_string+cur_pos) <= '9'))
-		{
-			mData[i] += (U8)(*(in_string + cur_pos) - '0');
-		}
-		else if ((*(in_string + cur_pos) >= 'a') && (*(in_string+cur_pos) <='f'))
-		{
-			mData[i] += (U8)(10 + *(in_string + cur_pos) - 'a');
-		}
-		else if ((*(in_string + cur_pos) >= 'A') && (*(in_string+cur_pos) <='F'))
-		{
-			mData[i] += (U8)(10 + *(in_string + cur_pos) - 'A');
-		}
-		else
-		{
-			if(emit)
-			{							
-				llwarns << "Invalid UUID string character" << llendl;
-			}
-			setNull();
-			return FALSE;
-		}
-
-		mData[i] = mData[i] << 4;
-		cur_pos++;
-
-		if ((*(in_string + cur_pos) >= '0') && (*(in_string+cur_pos) <= '9'))
-		{
-			mData[i] += (U8)(*(in_string + cur_pos) - '0');
-		}
-		else if ((*(in_string + cur_pos) >= 'a') && (*(in_string+cur_pos) <='f'))
-		{
-			mData[i] += (U8)(10 + *(in_string + cur_pos) - 'a');
-		}
-		else if ((*(in_string + cur_pos) >= 'A') && (*(in_string+cur_pos) <='F'))
-		{
-			mData[i] += (U8)(10 + *(in_string + cur_pos) - 'A');
-		}
-		else
-		{
-			if(emit)
-			{
-				llwarns << "Invalid UUID string character" << llendl;
-			}
-			setNull();
-			return FALSE;
-		}
-		cur_pos++;
-	}
-
-	return TRUE;
-}
-
-BOOL LLUUID::validate(const std::string& in_string)
-{
-	return validate(in_string.c_str());
-}
-
-BOOL LLUUID::validate(const char *in_string) 
-{
-	BOOL broken_format = FALSE;
-	if (!in_string)
-	{
-		return FALSE;
-	}
-	if (strlen(in_string) != (UUID_STR_LENGTH - 1))		/* Flawfinder: ignore */
-	{
-		// I'm a moron.  First implementation didn't have the right UUID format.
-		if (strlen(in_string) == (UUID_STR_LENGTH - 2))		/* Flawfinder: ignore */
-		{
-			broken_format = TRUE;
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
-
-	U8 cur_pos = 0;
-	U32 i;
-	for (i = 0; i < 16; i++)
-	{
-		if ((i == 4) || (i == 6) || (i == 8) || (i == 10))
-		{
-			cur_pos++;
-			if (broken_format && (i==10))
-			{
-				// Missing - in the broken format
-				cur_pos--;
-			}
-		}
-
-		if ((*(in_string + cur_pos) >= '0') && (*(in_string+cur_pos) <= '9'))
-		{
-		}
-		else if ((*(in_string + cur_pos) >= 'a') && (*(in_string+cur_pos) <='f'))
-		{
-		}
-		else if ((*(in_string + cur_pos) >= 'A') && (*(in_string+cur_pos) <='F'))
-		{
-		}
-		else
-		{
-			return FALSE;
-		}
-
-		cur_pos++;
-
-		if ((*(in_string + cur_pos) >= '0') && (*(in_string+cur_pos) <= '9'))
-		{
-		}
-		else if ((*(in_string + cur_pos) >= 'a') && (*(in_string+cur_pos) <='f'))
-		{
-		}
-		else if ((*(in_string + cur_pos) >= 'A') && (*(in_string+cur_pos) <='F'))
-		{
-		}
-		else
-		{
-			return FALSE;
-		}
-		cur_pos++;
-	}
-	return TRUE;
-}
-
-const LLUUID& LLUUID::operator^=(const LLUUID& rhs)
-{
-	U32* me = (U32*)&(mData[0]);
-	const U32* other = (U32*)&(rhs.mData[0]);
-	for(S32 i = 0; i < 4; ++i)
-	{
-		me[i] = me[i] ^ other[i];
-	}
-	return *this;
-}
-
-LLUUID LLUUID::operator^(const LLUUID& rhs) const
-{
-	LLUUID id(*this);
-	id ^= rhs;
-	return id;
-}
-
-void LLUUID::combine(const LLUUID& other, LLUUID& result) const
-{
-	LLMD5 md5_uuid;
-	md5_uuid.update((unsigned char*)mData, 16);
-	md5_uuid.update((unsigned char*)other.mData, 16);
-	md5_uuid.finalize();
-	md5_uuid.raw_digest(result.mData);
-}
-
-LLUUID LLUUID::combine(const LLUUID &other) const
-{
-	LLUUID combination;
-	combine(other, combination);
-	return combination;
-}
-
-std::ostream& operator<<(std::ostream& s, const LLUUID &uuid)
-{
-	char uuid_str[UUID_STR_LENGTH];
-
-	uuid.toString(uuid_str);
-	s << uuid_str;
-	return s;
-}
-
-std::istream& operator>>(std::istream &s, LLUUID &uuid)
-{
-	U32 i;
-	char uuid_str[UUID_STR_LENGTH];		/* Flawfinder: ignore */
-	for (i = 0; i < UUID_STR_LENGTH-1; i++)
-	{
-		s >> uuid_str[i];
-	}
-	uuid_str[i] = '\0';
-	uuid.set(uuid_str);
-	return s;
-}
-
-static void get_random_bytes(void *buf, int nbytes)
-{
-	int i;
-	char *cp = (char *) buf;
-
-	// *NOTE: If we are not using the janky generator ll_rand()
-	// generates at least 3 good bytes of data since it is 0 to
-	// RAND_MAX. This could be made more efficient by copying all the
-	// bytes.
-	for (i=0; i < nbytes; i++)
-#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
-		*cp++ = janky_fast_random_bytes() & 0xFF;
-#else
-		*cp++ = ll_rand() & 0xFF;
-#endif
-	return;	
-}
-
-#if LL_WINDOWS
-typedef struct _ASTAT_
-{
-	ADAPTER_STATUS adapt;
-	NAME_BUFFER    NameBuff [30];
-}ASTAT, * PASTAT;
-
-// static
-S32 LLUUID::getNodeID(unsigned char * node_id)
-{
-	  ASTAT Adapter;
-      NCB Ncb;
-      UCHAR uRetCode;
-      LANA_ENUM   lenum;
-      int      i;
-	  int retval = 0;
-
-      memset( &Ncb, 0, sizeof(Ncb) );
-      Ncb.ncb_command = NCBENUM;
-      Ncb.ncb_buffer = (UCHAR *)&lenum;
-      Ncb.ncb_length = sizeof(lenum);
-      uRetCode = Netbios( &Ncb );
- //     printf( "The NCBENUM return code is: 0x%x \n", uRetCode );
-
-      for(i=0; i < lenum.length ;i++)
-      {
-          memset( &Ncb, 0, sizeof(Ncb) );
-          Ncb.ncb_command = NCBRESET;
-          Ncb.ncb_lana_num = lenum.lana[i];
-
-          uRetCode = Netbios( &Ncb );
- //         printf( "The NCBRESET on LANA %d return code is: 0x%x \n",
- //                 lenum.lana[i], uRetCode );
-
-          memset( &Ncb, 0, sizeof (Ncb) );
-          Ncb.ncb_command = NCBASTAT;
-          Ncb.ncb_lana_num = lenum.lana[i];
-
-          strcpy( (char *)Ncb.ncb_callname,  "*              " );		/* Flawfinder: ignore */
-          Ncb.ncb_buffer = (unsigned char *)&Adapter;
-          Ncb.ncb_length = sizeof(Adapter);
-
-          uRetCode = Netbios( &Ncb );
-//          printf( "The NCBASTAT on LANA %d return code is: 0x%x \n",
-//                 lenum.lana[i], uRetCode );
-          if ( uRetCode == 0 )
-          {
-//            printf( "The Ethernet Number on LANA %d is: %02x%02x%02x%02x%02x%02x\n",
-//	 			  lenum.lana[i],
-//                  Adapter.adapt.adapter_address[0],
-//                  Adapter.adapt.adapter_address[1],
-//                  Adapter.adapt.adapter_address[2],
-//                  Adapter.adapt.adapter_address[3],
-//                  Adapter.adapt.adapter_address[4],
-//                  Adapter.adapt.adapter_address[5] );
-			memcpy(node_id,Adapter.adapt.adapter_address,6);		/* Flawfinder: ignore */
-			retval = 1;
-
-          }
-	  }
-	return retval;
-}
-
-#elif LL_DARWIN
-// Mac OS X version of the UUID generation code...
-/*
- * Get an ethernet hardware address, if we can find it...
- */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <ifaddrs.h>
-
-// static
-S32 LLUUID::getNodeID(unsigned char *node_id)
-{
-	int i;
-	unsigned char 	*a = NULL;
-	struct ifaddrs *ifap, *ifa;
-	int rv;
-	S32 result = 0;
-
-	if ((rv=getifaddrs(&ifap))==-1)
-	{       
-		return -1;
-	}
-	if (ifap == NULL)
-	{
-		return -1;
-	}
-
-	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next)
-	{       
-//		printf("Interface %s, address family %d, ", ifa->ifa_name, ifa->ifa_addr->sa_family);
-		for(i=0; i< ifa->ifa_addr->sa_len; i++)
-		{
-//			printf("%02X ", (unsigned char)ifa->ifa_addr->sa_data[i]);
-		}
-//		printf("\n");
-		
-		if(ifa->ifa_addr->sa_family == AF_LINK)
-		{
-			// This is a link-level address
-			struct sockaddr_dl *lla = (struct sockaddr_dl *)ifa->ifa_addr;
-			
-//			printf("\tLink level address, type %02X\n", lla->sdl_type);
-
-			if(lla->sdl_type == IFT_ETHER)
-			{
-				// Use the first ethernet MAC in the list.
-				// For some reason, the macro LLADDR() defined in net/if_dl.h doesn't expand correctly.  This is what it would do.
-				a = (unsigned char *)&((lla)->sdl_data);
-				a += (lla)->sdl_nlen;
-				
-				if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
-				{
-					continue;
-				}
-
-				if (node_id) 
-				{
-					memcpy(node_id, a, 6);
-					result = 1;
-				}
-				
-				// We found one.
-				break;
-			}
-		}
-	}
-	freeifaddrs(ifap);
-
-	return result;
-}
-
-#else
-
-// Linux version of the UUID generation code...
-/*
- * Get the ethernet hardware address, if we can find it...
- */
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#define HAVE_NETINET_IN_H
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#if LL_SOLARIS
-#include <sys/sockio.h>
-#elif !LL_DARWIN
-#include <linux/sockios.h>
-#endif
-#endif
-
-// static
-S32 LLUUID::getNodeID(unsigned char *node_id)
-{
-	int 		sd;
-	struct ifreq 	ifr, *ifrp;
-	struct ifconf 	ifc;
-	char buf[1024];
-	int		n, i;
-	unsigned char 	*a;
-	
-/*
- * BSD 4.4 defines the size of an ifreq to be
- * max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len
- * However, under earlier systems, sa_len isn't present, so the size is 
- * just sizeof(struct ifreq)
- */
-#ifdef HAVE_SA_LEN
-#ifndef max
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
-#define ifreq_size(i) max(sizeof(struct ifreq),\
-     sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
-#else
-#define ifreq_size(i) sizeof(struct ifreq)
-#endif /* HAVE_SA_LEN*/
-
-	sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
-	if (sd < 0) {
-		return -1;
-	}
-	memset(buf, 0, sizeof(buf));
-	ifc.ifc_len = sizeof(buf);
-	ifc.ifc_buf = buf;
-	if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) {
-		close(sd);
-		return -1;
-	}
-	n = ifc.ifc_len;
-	for (i = 0; i < n; i+= ifreq_size(*ifr) ) {
-		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
-		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);		/* Flawfinder: ignore */
-#ifdef SIOCGIFHWADDR
-		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
-			continue;
-		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
-#else
-#ifdef SIOCGENADDR
-		if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
-			continue;
-		a = (unsigned char *) ifr.ifr_enaddr;
-#else
-		/*
-		 * XXX we don't have a way of getting the hardware
-		 * address
-		 */
-		close(sd);
-		return 0;
-#endif /* SIOCGENADDR */
-#endif /* SIOCGIFHWADDR */
-		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
-			continue;
-		if (node_id) {
-			memcpy(node_id, a, 6);		/* Flawfinder: ignore */
-			close(sd);
-			return 1;
-		}
-	}
-	close(sd);
-	return 0;
-}
-
-#endif
-
-S32 LLUUID::cmpTime(uuid_time_t *t1, uuid_time_t *t2)
-{
-   // Compare two time values.
-
-   if (t1->high < t2->high) return -1;
-   if (t1->high > t2->high) return 1;
-   if (t1->low  < t2->low)  return -1;
-   if (t1->low  > t2->low)  return 1;
-   return 0;
-}
-
-void LLUUID::getSystemTime(uuid_time_t *timestamp)
-{
-   // Get system time with 100ns precision. Time is since Oct 15, 1582.
-#if LL_WINDOWS
-   ULARGE_INTEGER time;
-   GetSystemTimeAsFileTime((FILETIME *)&time);
-   // NT keeps time in FILETIME format which is 100ns ticks since
-   // Jan 1, 1601. UUIDs use time in 100ns ticks since Oct 15, 1582.
-   // The difference is 17 Days in Oct + 30 (Nov) + 31 (Dec)
-   // + 18 years and 5 leap days.
-   time.QuadPart +=
-            (unsigned __int64) (1000*1000*10)       // seconds
-          * (unsigned __int64) (60 * 60 * 24)       // days
-          * (unsigned __int64) (17+30+31+365*18+5); // # of days
-
-   timestamp->high = time.HighPart;
-   timestamp->low  = time.LowPart;
-#else
-   struct timeval tp;
-   gettimeofday(&tp, 0);
-
-   // Offset between UUID formatted times and Unix formatted times.
-   // UUID UTC base time is October 15, 1582.
-   // Unix base time is January 1, 1970.
-   U64 uuid_time = ((U64)tp.tv_sec * 10000000) + (tp.tv_usec * 10) +
-                           U64L(0x01B21DD213814000);
-   timestamp->high = (U32) (uuid_time >> 32);
-   timestamp->low  = (U32) (uuid_time & 0xFFFFFFFF);
-#endif
-}
-
-void LLUUID::getCurrentTime(uuid_time_t *timestamp)
-{
-   // Get current time as 60 bit 100ns ticks since whenever.
-   // Compensate for the fact that real clock resolution is less
-   // than 100ns.
-
-   const U32 uuids_per_tick = 1024;
-
-   static uuid_time_t time_last;
-   static U32    uuids_this_tick;
-   static BOOL     init = FALSE;
-
-   if (!init) {
-      getSystemTime(&time_last);
-      uuids_this_tick = uuids_per_tick;
-      init = TRUE;
-   }
-
-   uuid_time_t time_now = {0,0};
-
-   while (1) {
-      getSystemTime(&time_now);
-
-      // if clock reading changed since last UUID generated
-      if (cmpTime(&time_last, &time_now))  {
-         // reset count of uuid's generated with this clock reading
-         uuids_this_tick = 0;
-         break;
-      }
-      if (uuids_this_tick < uuids_per_tick) {
-         uuids_this_tick++;
-         break;
-      }
-      // going too fast for our clock; spin
-   }
-
-   time_last = time_now;
-
-   if (uuids_this_tick != 0) {
-      if (time_now.low & 0x80000000) {
-         time_now.low += uuids_this_tick;
-         if (!(time_now.low & 0x80000000))
-            time_now.high++;
-      } else
-         time_now.low += uuids_this_tick;
-   }
-
-   timestamp->high = time_now.high;
-   timestamp->low  = time_now.low;
-}
-
-void LLUUID::generate()
-{
-	// Create a UUID.
-	uuid_time_t timestamp;
-
-	static unsigned char node_id[6];	/* Flawfinder: ignore */
-	static int has_init = 0;
-   
-	// Create a UUID.
-	static uuid_time_t time_last = {0,0};
-	static U16 clock_seq = 0;
-#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
-	static U32 seed = 0L; // dummy seed.  reset it below
-#endif
-	if (!has_init) 
-	{
-		if (getNodeID(node_id) <= 0) 
-		{
-			get_random_bytes(node_id, 6);
-			/*
-			 * Set multicast bit, to prevent conflicts
-			 * with IEEE 802 addresses obtained from
-			 * network cards
-			 */
-			node_id[0] |= 0x80;
-		}
-
-		getCurrentTime(&time_last);
-#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
-		seed = time_last.low;
-#endif
-
-#if LL_USE_JANKY_RANDOM_NUMBER_GENERATOR
-		clock_seq = (U16)janky_fast_random_seeded_bytes(seed, 65536);
-#else
-		clock_seq = (U16)ll_rand(65536);
-#endif
-		has_init = 1;
-	}
-
-	// get current time
-	getCurrentTime(&timestamp);
-
-	// if clock went backward change clockseq
-	if (cmpTime(&timestamp, &time_last) == -1) {
-		clock_seq = (clock_seq + 1) & 0x3FFF;
-		if (clock_seq == 0) clock_seq++;
-	}
-
-	memcpy(mData+10, node_id, 6);		/* Flawfinder: ignore */
-	U32 tmp;
-	tmp = timestamp.low;
-	mData[3] = (unsigned char) tmp;
-	tmp >>= 8;
-	mData[2] = (unsigned char) tmp;
-	tmp >>= 8;
-	mData[1] = (unsigned char) tmp;
-	tmp >>= 8;
-	mData[0] = (unsigned char) tmp;
-	
-	tmp = (U16) timestamp.high;
-	mData[5] = (unsigned char) tmp;
-	tmp >>= 8;
-	mData[4] = (unsigned char) tmp;
-
-	tmp = (timestamp.high >> 16) | 0x1000;
-	mData[7] = (unsigned char) tmp;
-	tmp >>= 8;
-	mData[6] = (unsigned char) tmp;
-
-	tmp = clock_seq;
-	mData[9] = (unsigned char) tmp;
-	tmp >>= 8;
-	mData[8] = (unsigned char) tmp;
-
-	LLMD5 md5_uuid;
-	
-	md5_uuid.update(mData,16);
-	md5_uuid.finalize();
-	md5_uuid.raw_digest(mData);
-
-    time_last = timestamp;
-}
-
-void LLUUID::generate(std::string hash_string)
-{
-	LLMD5 md5_uuid((U8*)hash_string.c_str());
-	md5_uuid.raw_digest(mData);
-}
-
-U32 LLUUID::getRandomSeed()
-{
-   static unsigned char seed[16];		/* Flawfinder: ignore */
-   
-   getNodeID(&seed[0]);
-   seed[6]='\0';
-   seed[7]='\0';
-   getSystemTime((uuid_time_t *)(&seed[8]));
-
-   LLMD5 md5_seed;
-	
-   md5_seed.update(seed,16);
-   md5_seed.finalize();
-   md5_seed.raw_digest(seed);
-   
-   return(*(U32 *)seed);
-}
-
-BOOL LLUUID::parseUUID(const char* buf, LLUUID* value)
-{
-	if( buf == NULL || buf[0] == '\0' || value == NULL)
-	{
-		return FALSE;
-	}
-
-	LLString temp( buf );
-	LLString::trim(temp);
-	if( LLUUID::validate( temp ) )
-	{
-		value->set( temp );
-		return TRUE;
-	}
-	return FALSE;
-}
-
-LLAssetID LLTransactionID::makeAssetID(const LLUUID& session) const
-{
-	LLAssetID result;
-	if (isNull())
-	{
-		result.setNull();
-	}
-	else
-	{
-		combine(session, result);
-	}
-	return result;
-}
diff --git a/linden/indra/llmath/lluuid.h b/linden/indra/llmath/lluuid.h
deleted file mode 100644
index 48308f2..0000000
--- a/linden/indra/llmath/lluuid.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/** 
- * @file lluuid.h
- *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
- * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLUUID_H
-#define LL_LLUUID_H
-
-#include <iostream>
-#include <set>
-#include "stdtypes.h"
-
-const S32 UUID_BYTES = 16;
-const S32 UUID_WORDS = 4;
-const S32 UUID_STR_LENGTH = 37;	// actually wrong, should be 36 and use size below
-const S32 UUID_STR_SIZE = 37;
-const S32 UUID_BASE85_LENGTH = 21; // including the trailing NULL.
-
-struct uuid_time_t {
-	U32 high;
-	U32 low;
-		};
-
-class LLUUID
-{
-public:
-	//
-	// CREATORS
-	//
-	LLUUID();
-	explicit LLUUID(const char *in_string); // Convert from string.
-	explicit LLUUID(const std::string& in_string); // Convert from string.
-	LLUUID(const LLUUID &in);
-	LLUUID &operator=(const LLUUID &rhs);
-
-	~LLUUID();
-
-	//
-	// MANIPULATORS
-	//
-	void	generate();					// Generate a new UUID
-	void	generate(std::string stream); //Generate a new UUID based on hash of input stream
-	BOOL	set(const char *in_string, BOOL emit = TRUE);	// Convert from string, if emit is FALSE, do not emit warnings
-	BOOL	set(const std::string& in_string, BOOL emit = TRUE);	// Convert from string, if emit is FALSE, do not emit warnings
-	void	setNull();					// Faster than setting to LLUUID::null.
-
-    S32     cmpTime(uuid_time_t *t1, uuid_time_t *t2);
-	static void    getSystemTime(uuid_time_t *timestamp);
-	void    getCurrentTime(uuid_time_t *timestamp);
-
-	//
-	// ACCESSORS
-	//
-	BOOL	isNull() const;			// Faster than comparing to LLUUID::null.
-	BOOL	notNull() const;		// Faster than comparing to LLUUID::null.
-	// JC: This is dangerous.  It allows UUIDs to be cast automatically
-	// to integers, among other things.  Use isNull() or notNull().
-	//		operator bool() const;
-
-	// JC: These must return real bool's (not BOOLs) or else use of the STL
-	// will generate bool-to-int performance warnings.
-	bool	operator==(const LLUUID &rhs) const;
-	bool	operator!=(const LLUUID &rhs) const;
-	bool	operator<(const LLUUID &rhs) const;
-	bool	operator>(const LLUUID &rhs) const;
-
-	// xor functions. Useful since any two random uuids xored together
-	// will yield a determinate third random unique id that can be
-	// used as a key in a single uuid that represents 2.
-	const LLUUID& operator^=(const LLUUID& rhs);
-	LLUUID operator^(const LLUUID& rhs) const;
-
-	// similar to functions above, but not invertible
-	// yields a third random UUID that can be reproduced from the two inputs
-	// but which, given the result and one of the inputs can't be used to
-	// deduce the other input
-	LLUUID combine(const LLUUID& other) const;
-	void combine(const LLUUID& other, LLUUID& result) const;  
-
-	friend std::ostream&	 operator<<(std::ostream& s, const LLUUID &uuid);
-	friend std::istream&	 operator>>(std::istream& s, LLUUID &uuid);
-
-	void toString(char *out) const;		// Does not allocate memory, needs 36 characters (including \0)
-	void toCompressedString(char *out) const;	// Does not allocate memory, needs 17 characters (including \0)
-
-	std::string asString() const;
-	std::string getString() const;
-
-	U16 getCRC16() const;
-	U32 getCRC32() const;
-
-	static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal.
-	static BOOL validate(const char *in_string); // Validate that the UUID string is legal.
-
-	static const LLUUID null;
-
-	static U32 getRandomSeed();
-	static S32 getNodeID(unsigned char * node_id);
-
-	static BOOL parseUUID(const char* buf, LLUUID* value);
-	
-	U8 mData[UUID_BYTES];
-};
-
-
-// Construct
-inline LLUUID::LLUUID()
-{
-	setNull();
-}
-
-
-// Faster than copying from memory
-inline void LLUUID::setNull()
-{
-	U32 *word = (U32 *)mData;
-	word[0] = 0;
-	word[1] = 0;
-	word[2] = 0;
-	word[3] = 0;
-}
-
-
-// Compare
-inline bool LLUUID::operator==(const LLUUID& rhs) const
-{
-	U32 *tmp = (U32 *)mData;
-	U32 *rhstmp = (U32 *)rhs.mData;
-	// Note: binary & to avoid branching
-	return 
-		(tmp[0] == rhstmp[0]) &  
-		(tmp[1] == rhstmp[1]) &
-		(tmp[2] == rhstmp[2]) &
-		(tmp[3] == rhstmp[3]);
-}
-
-
-inline bool LLUUID::operator!=(const LLUUID& rhs) const
-{
-	U32 *tmp = (U32 *)mData;
-	U32 *rhstmp = (U32 *)rhs.mData;
-	// Note: binary | to avoid branching
-	return 
-		(tmp[0] != rhstmp[0]) |
-		(tmp[1] != rhstmp[1]) |
-		(tmp[2] != rhstmp[2]) |
-		(tmp[3] != rhstmp[3]);
-}
-
-/*
-// JC: This is dangerous.  It allows UUIDs to be cast automatically
-// to integers, among other things.  Use isNull() or notNull().
-inline LLUUID::operator bool() const
-{
-	U32 *word = (U32 *)mData;
-	return (word[0] | word[1] | word[2] | word[3]) > 0;
-}
-*/
-
-inline BOOL LLUUID::notNull() const
-{
-	U32 *word = (U32 *)mData;
-	return (word[0] | word[1] | word[2] | word[3]) > 0;
-}
-
-// Faster than == LLUUID::null because doesn't require
-// as much memory access.
-inline BOOL LLUUID::isNull() const
-{
-	U32 *word = (U32 *)mData;
-	// If all bits are zero, return !0 == TRUE
-	return !(word[0] | word[1] | word[2] | word[3]);
-}
-
-// Copy constructor
-inline LLUUID::LLUUID(const LLUUID& rhs)
-{
-	U32 *tmp = (U32 *)mData;
-	U32 *rhstmp = (U32 *)rhs.mData;
-	tmp[0] = rhstmp[0];
-	tmp[1] = rhstmp[1];
-	tmp[2] = rhstmp[2];
-	tmp[3] = rhstmp[3];
-}
-
-inline LLUUID::~LLUUID()
-{
-}
-
-// Assignment
-inline LLUUID& LLUUID::operator=(const LLUUID& rhs)
-{
-	// No need to check the case where this==&rhs.  The branch is slower than the write.
-	U32 *tmp = (U32 *)mData;
-	U32 *rhstmp = (U32 *)rhs.mData;
-	tmp[0] = rhstmp[0];
-	tmp[1] = rhstmp[1];
-	tmp[2] = rhstmp[2];
-	tmp[3] = rhstmp[3];
-	
-	return *this;
-}
-
-
-inline LLUUID::LLUUID(const char *in_string)
-{
-	if (!in_string || in_string[0] == 0)
-	{
-		setNull();
-		return;
-	}
- 
-	set(in_string);
-}
-
-inline LLUUID::LLUUID(const std::string& in_string)
-{
-	if (in_string.empty())
-	{
-		setNull();
-		return;
-	}
-
-	set(in_string);
-}
-
-// IW: DON'T "optimize" these w/ U32s or you'll scoogie the sort order
-// IW: this will make me very sad
-inline bool LLUUID::operator<(const LLUUID &rhs) const
-{
-	U32 i;
-	for( i = 0; i < (UUID_BYTES - 1); i++ )
-	{
-		if( mData[i] != rhs.mData[i] )
-		{
-			return (mData[i] < rhs.mData[i]);
-		}
-	}
-	return (mData[UUID_BYTES - 1] < rhs.mData[UUID_BYTES - 1]);
-}
-
-inline bool LLUUID::operator>(const LLUUID &rhs) const
-{
-	U32 i;
-	for( i = 0; i < (UUID_BYTES - 1); i++ )
-	{
-		if( mData[i] != rhs.mData[i] )
-		{
-			return (mData[i] > rhs.mData[i]);
-		}
-	}
-	return (mData[UUID_BYTES - 1] > rhs.mData[UUID_BYTES - 1]);
-}
-
-inline U16 LLUUID::getCRC16() const
-{
-	// A UUID is 16 bytes, or 8 shorts.
-	U16 *short_data = (U16*)mData;
-	U16 out = 0;
-	out += short_data[0];
-	out += short_data[1];
-	out += short_data[2];
-	out += short_data[3];
-	out += short_data[4];
-	out += short_data[5];
-	out += short_data[6];
-	out += short_data[7];
-	return out;
-}
-
-inline U32 LLUUID::getCRC32() const
-{
-	U32 *tmp = (U32*)mData;
-	return tmp[0] + tmp[1] + tmp[2] + tmp[3];
-}
-
-
-// Helper structure for ordering lluuids in stl containers.
-// eg: 	std::map<LLUUID, LLWidget*, lluuid_less> widget_map;
-struct lluuid_less
-{
-	bool operator()(const LLUUID& lhs, const LLUUID& rhs) const
-	{
-		return (lhs < rhs) ? true : false;
-	}
-};
-
-typedef std::set<LLUUID, lluuid_less> uuid_list_t;
-
-/*
- * Sub-classes for keeping transaction IDs and asset IDs
- * straight.
- */
-typedef LLUUID LLAssetID;
-
-class LLTransactionID : public LLUUID
-{
-public:
-	LLTransactionID() : LLUUID() { }
-	
-	static const LLTransactionID tnull;
-	LLAssetID makeAssetID(const LLUUID& session) const;
-};
-
-#endif
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index f7c9286..7b6c6a9 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -82,11 +82,6 @@ const F32 TAPER_MAX =  1.f;
 const F32 SKEW_MIN	= -0.95f;
 const F32 SKEW_MAX	=  0.95f;
 
-const S32 SCULPT_REZ_1 = 6;  // changed from 4 to 6 - 6 looks round whereas 4 looks square
-const S32 SCULPT_REZ_2 = 8;
-const S32 SCULPT_REZ_3 = 16;
-const S32 SCULPT_REZ_4 = 32;
-
 const F32 SCULPT_MIN_AREA = 0.002f;
 
 BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm)
@@ -104,46 +99,128 @@ BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLV
 	}
 } 
 
-// intersect test between triangle pt1,pt2,pt3 and line from linept to linept+vect
-//returns TRUE if intersecting and moves linept to the point of intersection
-BOOL LLTriangleLineSegmentIntersect( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, LLVector3& linept, const LLVector3& vect)
+BOOL LLLineSegmentBoxIntersect(const LLVector3& start, const LLVector3& end, const LLVector3& center, const LLVector3& size)
+{
+	float fAWdU[3];
+	LLVector3 dir;
+	LLVector3 diff;
+
+	for (U32 i = 0; i < 3; i++)
+	{
+		dir.mV[i] = 0.5f * (end.mV[i] - start.mV[i]);
+		diff.mV[i] = (0.5f * (end.mV[i] + start.mV[i])) - center.mV[i];
+		fAWdU[i] = fabsf(dir.mV[i]);
+		if(fabsf(diff.mV[i])>size.mV[i] + fAWdU[i]) return false;
+	}
+
+	float f;
+	f = dir.mV[1] * diff.mV[2] - dir.mV[2] * diff.mV[1];    if(fabsf(f)>size.mV[1]*fAWdU[2] + size.mV[2]*fAWdU[1])  return false;
+	f = dir.mV[2] * diff.mV[0] - dir.mV[0] * diff.mV[2];    if(fabsf(f)>size.mV[0]*fAWdU[2] + size.mV[2]*fAWdU[0])  return false;
+	f = dir.mV[0] * diff.mV[1] - dir.mV[1] * diff.mV[0];    if(fabsf(f)>size.mV[0]*fAWdU[1] + size.mV[1]*fAWdU[0])  return false;
+	
+	return true;
+}
+
+
+// intersect test between triangle vert0, vert1, vert2 and a ray from orig in direction dir.
+// returns TRUE if intersecting and returns barycentric coordinates in intersection_a, intersection_b,
+// and returns the intersection point along dir in intersection_t.
+
+// Moller-Trumbore algorithm
+BOOL LLTriangleRayIntersect(const LLVector3& vert0, const LLVector3& vert1, const LLVector3& vert2, const LLVector3& orig, const LLVector3& dir,
+							F32* intersection_a, F32* intersection_b, F32* intersection_t, BOOL two_sided)
 {
-	LLVector3 V1 = pt2-pt1;
-	LLVector3 V2 = pt3-pt2;
+	F32 u, v, t;
 	
-	LLVector3 norm = V1 % V2;
+	/* find vectors for two edges sharing vert0 */
+	LLVector3 edge1 = vert1 - vert0;
 	
-	F32 dotprod = norm * vect;
+	LLVector3 edge2 = vert2 - vert0;;
 
-	if(dotprod < 0)
+	/* begin calculating determinant - also used to calculate U parameter */
+	LLVector3 pvec = dir % edge2;
+	
+	/* if determinant is near zero, ray lies in plane of triangle */
+	F32 det = edge1 * pvec;
+
+	if (!two_sided)
 	{
-		//Find point of intersect to triangle plane.
-		//find t to intersect point
-		F32 t = -(norm * (linept-pt1))/dotprod;
+		if (det < F_APPROXIMATELY_ZERO)
+		{
+			return FALSE;
+		}
+
+		/* calculate distance from vert0 to ray origin */
+		LLVector3 tvec = orig - vert0;
 
-		// if ds is neg line started past triangle so can't hit triangle.
-		if (t > 0) 
+		/* calculate U parameter and test bounds */
+		u = tvec * pvec;	
+
+		if (u < 0.f || u > det)
 		{
 			return FALSE;
 		}
 	
-		LLVector3 pt_int = linept + (vect*t);
+		/* prepare to test V parameter */
+		LLVector3 qvec = tvec % edge1;
 		
-		if(check_same_clock_dir(pt1, pt2, pt_int, norm))
+		/* calculate V parameter and test bounds */
+		v = dir * qvec;
+		if (v < 0.f || u + v > det)
 		{
-			if(check_same_clock_dir(pt2, pt3, pt_int, norm))
+			return FALSE;
+		}
+
+		/* calculate t, scale parameters, ray intersects triangle */
+		t = edge2 * qvec;
+		F32 inv_det = 1.0 / det;
+		t *= inv_det;
+		u *= inv_det;
+		v *= inv_det;
+	}
+	
+	else // two sided
 			{
-				if(check_same_clock_dir(pt3, pt1, pt_int, norm))
+		if (det > -F_APPROXIMATELY_ZERO && det < F_APPROXIMATELY_ZERO)
 				{
-					// answer in pt_int is insde triangle
-					linept.setVec(pt_int);
-					return TRUE;
+			return FALSE;
 				}
+		F32 inv_det = 1.0 / det;
+
+		/* calculate distance from vert0 to ray origin */
+		LLVector3 tvec = orig - vert0;
+		
+		/* calculate U parameter and test bounds */
+		u = (tvec * pvec) * inv_det;
+		if (u < 0.f || u > 1.f)
+		{
+			return FALSE;
 			}
+
+		/* prepare to test V parameter */
+		LLVector3 qvec = tvec - edge1;
+		
+		/* calculate V parameter and test bounds */
+		v = (dir * qvec) * inv_det;
+		
+		if (v < 0.f || u + v > 1.f)
+		{
+			return FALSE;
 		}
+
+		/* calculate t, ray intersects triangle */
+		t = (edge2 * qvec) * inv_det;
 	}
 	
-	return FALSE;
+	if (intersection_a != NULL)
+		*intersection_a = u;
+	if (intersection_b != NULL)
+		*intersection_b = v;
+	if (intersection_t != NULL)
+		*intersection_t = t;
+	
+	
+	return TRUE;
 } 
 
 
@@ -198,9 +275,6 @@ void LLProfile::genNGon(const LLProfileParams& params, S32 sides, F32 offset, F3
 	F32 t, t_step, t_first, t_fraction, ang, ang_step;
 	LLVector3 pt1,pt2;
 
-	mMaxX = 0.f;
-	mMinX = 0.f;
-
 	F32 begin  = params.getBegin();
 	F32 end    = params.getEnd();
 
@@ -236,15 +310,6 @@ void LLProfile::genNGon(const LLProfileParams& params, S32 sides, F32 offset, F3
 	if (t_fraction < 0.9999f)
 	{
 		LLVector3 new_pt = lerp(pt1, pt2, t_fraction);
-		F32 pt_x = new_pt.mV[VX];
-		if (pt_x < mMinX)
-		{
-			mMinX = pt_x;
-		}
-		else if (pt_x > mMaxX)
-		{
-			mMaxX = pt_x;
-		}
 		mProfile.push_back(new_pt);
 	}
 
@@ -254,16 +319,6 @@ void LLProfile::genNGon(const LLProfileParams& params, S32 sides, F32 offset, F3
 		// Iterate through all the integer steps of t.
 		pt1.setVec(cos(ang)*scale,sin(ang)*scale,t);
 
-		F32 pt_x = pt1.mV[VX];
-		if (pt_x < mMinX)
-		{
-			mMinX = pt_x;
-		}
-		else if (pt_x > mMaxX)
-		{
-			mMaxX = pt_x;
-		}
-
 		if (mProfile.size() > 0) {
 			LLVector3 p = mProfile[mProfile.size()-1];
 			for (S32 i = 0; i < split && mProfile.size() > 0; i++) {
@@ -287,15 +342,6 @@ void LLProfile::genNGon(const LLProfileParams& params, S32 sides, F32 offset, F3
 	if (t_fraction > 0.0001f)
 	{
 		LLVector3 new_pt = lerp(pt1, pt2, t_fraction);
-		F32 pt_x = new_pt.mV[VX];
-		if (pt_x < mMinX)
-		{
-			mMinX = pt_x;
-		}
-		else if (pt_x > mMaxX)
-		{
-			mMaxX = pt_x;
-		}
 		
 		if (mProfile.size() > 0) {
 			LLVector3 p = mProfile[mProfile.size()-1];
@@ -472,31 +518,9 @@ LLProfile::Face* LLProfile::addHole(const LLProfileParams& params, BOOL flat, F3
 }
 
 
-S32 sculpt_sides(F32 detail)
-{
-
-	// detail is usually one of: 1, 1.5, 2.5, 4.0.
-	
-	if (detail <= 1.0)
-	{
-		return SCULPT_REZ_1;
-	}
-	if (detail <= 2.0)
-	{
-		return SCULPT_REZ_2;
-	}
-	if (detail <= 3.0)
-	{
-		return SCULPT_REZ_3;
-	}
-	else
-	{
-		return SCULPT_REZ_4;
-	}
-}
-
 
-BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detail, S32 split, BOOL is_sculpted)
+BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detail, S32 split,
+						 BOOL is_sculpted, S32 sculpt_size)
 {
 	LLMemType m1(LLMemType::MTYPE_VOLUME);
 	
@@ -640,7 +664,7 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai
 			S32 sides = (S32)circle_detail;
 
 			if (is_sculpted)
-				sides = sculpt_sides(detail);
+				sides = sculpt_size;
 			
 			genNGon(params, sides);
 			
@@ -1131,7 +1155,8 @@ const LLVector2 LLPathParams::getEndScale() const
 	return end_scale;
 }
 
-BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL is_sculpted)
+BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split,
+					  BOOL is_sculpted, S32 sculpt_size)
 {
 	LLMemType m1(LLMemType::MTYPE_VOLUME);
 	
@@ -1194,7 +1219,7 @@ BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL is
 			S32 sides = (S32)llfloor(llfloor((MIN_DETAIL_FACES * detail + twist_mag * 3.5f * (detail-0.5f))) * params.getRevolutions());
 
 			if (is_sculpted)
-				sides = sculpt_sides(detail);
+				sides = sculpt_size;
 			
 			genNGon(params, sides);
 		}
@@ -1259,7 +1284,8 @@ BOOL LLPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL is
 	return TRUE;
 }
 
-BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split, BOOL is_sculpted)
+BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split,
+							 BOOL is_sculpted, S32 sculpt_size)
 {
 	LLMemType m1(LLMemType::MTYPE_VOLUME);
 	
@@ -1979,6 +2005,12 @@ void LLVolume::sculptGeneratePlaceholder()
 // create the vertices from the map
 void LLVolume::sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type)
 {
+	U8 sculpt_stitching = sculpt_type & LL_SCULPT_TYPE_MASK;
+	BOOL sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT;
+	BOOL sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR;
+	BOOL reverse_horizontal = (sculpt_invert ? !sculpt_mirror : sculpt_mirror);  // XOR
+	
+	
 	LLMemType m1(LLMemType::MTYPE_VOLUME);
 	
 	S32 sizeS = mPathp->mPath.size();
@@ -1993,13 +2025,21 @@ void LLVolume::sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8
 			S32 i = t + line;
 			Point& pt = mMesh[i];
 
-			U32 x = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_width);
+			S32 reversed_t = t;
+
+			if (reverse_horizontal)
+			{
+				reversed_t = sizeT - t - 1;
+			}
+			
+			U32 x = (U32) ((F32)reversed_t/(sizeT-1) * (F32) sculpt_width);
 			U32 y = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_height);
 
+			
 			if (y == 0)  // top row stitching
 			{
 				// pinch?
-				if (sculpt_type == LL_SCULPT_TYPE_SPHERE)
+				if (sculpt_stitching == LL_SCULPT_TYPE_SPHERE)
 				{
 					x = sculpt_width / 2;
 				}
@@ -2008,7 +2048,7 @@ void LLVolume::sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8
 			if (y == sculpt_height)  // bottom row stitching
 			{
 				// wrap?
-				if (sculpt_type == LL_SCULPT_TYPE_TORUS)
+				if (sculpt_stitching == LL_SCULPT_TYPE_TORUS)
 				{
 					y = 0;
 				}
@@ -2018,7 +2058,7 @@ void LLVolume::sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8
 				}
 
 				// pinch?
-				if (sculpt_type == LL_SCULPT_TYPE_SPHERE)
+				if (sculpt_stitching == LL_SCULPT_TYPE_SPHERE)
 				{
 					x = sculpt_width / 2;
 				}
@@ -2027,9 +2067,9 @@ void LLVolume::sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8
 			if (x == sculpt_width)   // side stitching
 			{
 				// wrap?
-				if ((sculpt_type == LL_SCULPT_TYPE_SPHERE) ||
-					(sculpt_type == LL_SCULPT_TYPE_TORUS) ||
-					(sculpt_type == LL_SCULPT_TYPE_CYLINDER))
+				if ((sculpt_stitching == LL_SCULPT_TYPE_SPHERE) ||
+					(sculpt_stitching == LL_SCULPT_TYPE_TORUS) ||
+					(sculpt_stitching == LL_SCULPT_TYPE_CYLINDER))
 				{
 					x = 0;
 				}
@@ -2041,12 +2081,69 @@ void LLVolume::sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8
 			}
 
 			pt.mPos = sculpt_xy_to_vector(x, y, sculpt_width, sculpt_height, sculpt_components, sculpt_data);
+
+			if (sculpt_mirror)
+			{
+				pt.mPos.mV[VX] *= -1.f;
+			}
 		}
+		
 		line += sizeT;
 	}
 }
 
 
+const S32 SCULPT_REZ_1 = 6;  // changed from 4 to 6 - 6 looks round whereas 4 looks square
+const S32 SCULPT_REZ_2 = 8;
+const S32 SCULPT_REZ_3 = 16;
+const S32 SCULPT_REZ_4 = 32;
+
+S32 sculpt_sides(F32 detail)
+{
+
+	// detail is usually one of: 1, 1.5, 2.5, 4.0.
+	
+	if (detail <= 1.0)
+	{
+		return SCULPT_REZ_1;
+	}
+	if (detail <= 2.0)
+	{
+		return SCULPT_REZ_2;
+	}
+	if (detail <= 3.0)
+	{
+		return SCULPT_REZ_3;
+	}
+	else
+	{
+		return SCULPT_REZ_4;
+	}
+}
+
+
+
+// determine the number of vertices in both s and t direction for this sculpt
+void sculpt_calc_mesh_resolution(U16 width, U16 height, U8 type, F32 detail, S32& s, S32& t)
+{
+	S32 vertices = sculpt_sides(detail);
+
+	F32 ratio;
+	if ((width == 0) || (height == 0))
+		ratio = 1.f;
+	else
+		ratio = (F32) width / (F32) height;
+
+	
+	s = (S32)(vertices / fsqrtf(ratio));
+
+	s = llmax(s, 3);   // no degenerate sizes, please
+	t = vertices * vertices / s;
+
+	t = llmax(t, 3);   // no degenerate sizes, please
+	s = vertices * vertices / t;
+}
+
 // sculpt replaces generate() for sculpted surfaces
 void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level)
 {
@@ -2061,11 +2158,16 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
 		data_is_empty = TRUE;
 	}
 
-	mPathp->generate(mParams.getPathParams(), mDetail, 0, TRUE);
-	mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), mDetail, 0, TRUE);
+	S32 requested_sizeS = 0;
+	S32 requested_sizeT = 0;
 
-	S32 sizeS = mPathp->mPath.size();
-	S32 sizeT = mProfilep->mProfile.size();
+	sculpt_calc_mesh_resolution(sculpt_width, sculpt_height, sculpt_type, mDetail, requested_sizeS, requested_sizeT);
+
+	mPathp->generate(mParams.getPathParams(), mDetail, 0, TRUE, requested_sizeS);
+	mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), mDetail, 0, TRUE, requested_sizeT);
+
+	S32 sizeS = mPathp->mPath.size();         // we requested a specific size, now see what we really got
+	S32 sizeT = mProfilep->mProfile.size();   // we requested a specific size, now see what we really got
 
 	// weird crash bug - DEV-11158 - trying to collect more data:
 	if ((sizeS == 0) || (sizeT == 0))
@@ -3405,47 +3507,99 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
 	}
 }
 
-S32 LLVolume::lineSegmentIntersect(const LLVector3& start, LLVector3& end) const
+S32 LLVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
+								   S32 face,
+								   LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
 {
-	S32 ret = -1;
+	S32 hit_face = -1;
 	
-	LLVector3 vec = end - start;
+	S32 start_face;
+	S32 end_face;
 	
-	for (S32 i = 0; i < getNumFaces(); i++)
+	if (face == -1) // ALL_SIDES
 	{
-		const LLVolumeFace& face = getVolumeFace(i);
+		start_face = 0;
+		end_face = getNumFaces() - 1;
+	}
+	else
+	{
+		start_face = face;
+		end_face = face;
+	}
+
+	LLVector3 dir = end - start;
+
+	F32 closest_t = 2.f; // must be larger than 1
+	
+	for (S32 i = start_face; i <= end_face; i++)
+	{
+		const LLVolumeFace &face = getVolumeFace((U32)i);
+
+		LLVector3 box_center = (face.mExtents[0] + face.mExtents[1]) / 2.f;
+		LLVector3 box_size   = face.mExtents[1] - face.mExtents[0];
+
+        if (LLLineSegmentBoxIntersect(start, end, box_center, box_size))
+		{
+			if (bi_normal != NULL) // if the caller wants binormals, we may need to generate them
+			{
+				genBinormals(i);
+			}
+			
+			for (U32 tri = 0; tri < face.mIndices.size()/3; tri++) 
+			{
+				S32 index1 = face.mIndices[tri*3+0];
+				S32 index2 = face.mIndices[tri*3+1];
+				S32 index3 = face.mIndices[tri*3+2];
 
-		for (U32 j = 0; j < face.mIndices.size()/3; j++) 
+				F32 a, b, t;
+			
+				if (LLTriangleRayIntersect(face.mVertices[index1].mPosition,
+										   face.mVertices[index2].mPosition,
+										   face.mVertices[index3].mPosition,
+										   start, dir, &a, &b, &t, FALSE))
+				{
+					if ((t >= 0.f) &&      // if hit is after start
+						(t <= 1.f) &&      // and before end
+						(t < closest_t))   // and this hit is closer
 		{
-			//approximate normal
-			S32 v1 = face.mIndices[j*3+0];
-			S32 v2 = face.mIndices[j*3+1];
-			S32 v3 = face.mIndices[j*3+2];
+						closest_t = t;
+						hit_face = i;
 
-			LLVector3 norm = (face.mVertices[v2].mPosition - face.mVertices[v1].mPosition) % 
-				(face.mVertices[v3].mPosition - face.mVertices[v2].mPosition);
+						if (intersection != NULL)
+						{
+							*intersection = start + dir * closest_t;
+						}
 			
-			if (norm.magVecSquared() >= 0.00000001f) 
+						if (tex_coord != NULL)
 			{
-				//get view vector
-				//LLVector3 view = (start-face.mVertices[v1].mPosition);
-				//if (view * norm < 0.0f)
+							*tex_coord = ((1.f - a - b)  * face.mVertices[index1].mTexCoord +
+										  a              * face.mVertices[index2].mTexCoord +
+										  b              * face.mVertices[index3].mTexCoord);
+
+						}
+
+						if (normal != NULL)
 				{
-					if (LLTriangleLineSegmentIntersect( face.mVertices[v1].mPosition,
-														face.mVertices[v2].mPosition,
-														face.mVertices[v3].mPosition,
-														end,
-														vec))
+							*normal    = ((1.f - a - b)  * face.mVertices[index1].mNormal + 
+										  a              * face.mVertices[index2].mNormal +
+										  b              * face.mVertices[index3].mNormal);
+						}
+
+						if (bi_normal != NULL)
 					{
-						vec = end-start;
-						ret = (S32) i;
+							*bi_normal = ((1.f - a - b)  * face.mVertices[index1].mBinormal + 
+										  a              * face.mVertices[index2].mBinormal +
+										  b              * face.mVertices[index3].mBinormal);
+						}
+
 					}
 				}
 			}
 		}		
 	}
 	
-	return ret;
+	
+	return hit_face;
 }
 
 class LLVertexIndexPair
@@ -4768,6 +4922,13 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 	LLMemType m1(LLMemType::MTYPE_VOLUME);
 	
 	BOOL flat = mTypeMask & FLAT_MASK;
+
+	U8 sculpt_type = volume->getParams().getSculptType();
+	U8 sculpt_stitching = sculpt_type & LL_SCULPT_TYPE_MASK;
+	BOOL sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT;
+	BOOL sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR;
+	BOOL sculpt_reverse_horizontal = (sculpt_invert ? !sculpt_mirror : sculpt_mirror);  // XOR
+	
 	S32 num_vertices, num_indices;
 
 	const std::vector<LLVolume::Point>& mesh = volume->getMesh();
@@ -4834,6 +4995,11 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 				}
 			}
 
+			if (sculpt_reverse_horizontal)
+			{
+				ss = 1.f - ss;
+			}
+			
 			// Check to see if this triangle wraps around the array.
 			if (mBeginS + s >= max_s)
 			{
@@ -4995,9 +5161,7 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 	
 	BOOL s_bottom_converges = ((mVertices[0].mPosition - mVertices[mNumS*(mNumT-2)].mPosition).magVecSquared() < 0.000001f);
 	BOOL s_top_converges = ((mVertices[mNumS-1].mPosition - mVertices[mNumS*(mNumT-2)+mNumS-1].mPosition).magVecSquared() < 0.000001f);
-	U8 sculpt_type = volume->getParams().getSculptType();
-
-	if (sculpt_type == LL_SCULPT_TYPE_NONE)  // logic for non-sculpt volumes
+	if (sculpt_stitching == LL_SCULPT_TYPE_NONE)  // logic for non-sculpt volumes
 	{
 		if (volume->getPath().isOpen() == FALSE)
 		{ //wrap normals on T
@@ -5046,15 +5210,15 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 		BOOL wrap_s = FALSE;
 		BOOL wrap_t = FALSE;
 
-		if (sculpt_type == LL_SCULPT_TYPE_SPHERE)
+		if (sculpt_stitching == LL_SCULPT_TYPE_SPHERE)
 			average_poles = TRUE;
 
-		if ((sculpt_type == LL_SCULPT_TYPE_SPHERE) ||
-			(sculpt_type == LL_SCULPT_TYPE_TORUS) ||
-			(sculpt_type == LL_SCULPT_TYPE_CYLINDER))
+		if ((sculpt_stitching == LL_SCULPT_TYPE_SPHERE) ||
+			(sculpt_stitching == LL_SCULPT_TYPE_TORUS) ||
+			(sculpt_stitching == LL_SCULPT_TYPE_CYLINDER))
 			wrap_s = TRUE;
 
-		if (sculpt_type == LL_SCULPT_TYPE_TORUS)
+		if (sculpt_stitching == LL_SCULPT_TYPE_TORUS)
 			wrap_t = TRUE;
 			
 		
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index 5b48cfc..8ac0e71 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -175,7 +175,7 @@ const LLFaceID	LL_FACE_OUTER_SIDE_3	= 0x1 << 8;
 
 //============================================================================
 
-// sculpt types
+// sculpt types + flags
 
 const U8 LL_SCULPT_TYPE_NONE      = 0;
 const U8 LL_SCULPT_TYPE_SPHERE    = 1;
@@ -183,21 +183,30 @@ const U8 LL_SCULPT_TYPE_TORUS     = 2;
 const U8 LL_SCULPT_TYPE_PLANE     = 3;
 const U8 LL_SCULPT_TYPE_CYLINDER  = 4;
 
+const U8 LL_SCULPT_TYPE_MASK      = LL_SCULPT_TYPE_SPHERE | LL_SCULPT_TYPE_TORUS | LL_SCULPT_TYPE_PLANE | LL_SCULPT_TYPE_CYLINDER;
+
+const U8 LL_SCULPT_FLAG_INVERT    = 64;
+const U8 LL_SCULPT_FLAG_MIRROR    = 128;
 
 
 class LLProfileParams
 {
 public:
 	LLProfileParams()
+		: mCurveType(LL_PCODE_PROFILE_SQUARE),
+		  mBegin(0.f),
+		  mEnd(1.f),
+		  mHollow(0.f),
+		  mCRC(0)
 	{
-		mCurveType = LL_PCODE_PROFILE_SQUARE;
-		mBegin     = 0.f;
-		mEnd       = 1.f;
-		mHollow    = 0.f;
 	}
 
 	LLProfileParams(U8 curve, F32 begin, F32 end, F32 hollow)
-		: mCurveType(curve), mBegin(begin), mEnd(end), mHollow(hollow)
+		: mCurveType(curve),
+		  mBegin(begin),
+		  mEnd(end),
+		  mHollow(hollow),
+		  mCRC(0)
 	{
 	}
 
@@ -222,6 +231,7 @@ public:
 			temp_f32 = 1.f;
 		}
 		mHollow = temp_f32;
+		mCRC = 0;
 	}
 
 	bool operator==(const LLProfileParams &params) const;
@@ -309,27 +319,36 @@ class LLPathParams
 {
 public:
 	LLPathParams()
+		:
+		mCurveType(LL_PCODE_PATH_LINE),
+		mBegin(0.f),
+		mEnd(1.f),
+		mScale(1.f,1.f),
+		mShear(0.f,0.f),
+		mTwistBegin(0.f),
+		mTwistEnd(0.f),
+		mRadiusOffset(0.f),
+		mTaper(0.f,0.f),
+		mRevolutions(1.f),
+		mSkew(0.f),
+		mCRC(0)
 	{
-		mBegin     = 0.f;
-		mEnd       = 1.f;
-		mScale.setVec(1.f,1.f);
-		mShear.setVec(0.f,0.f);
-		mCurveType = LL_PCODE_PATH_LINE;
-		mTwistBegin		= 0.f;
-		mTwistEnd     	= 0.f;
-		mRadiusOffset	= 0.f;
-		mTaper.setVec(0.f,0.f);
-		mRevolutions	= 1.f;
-		mSkew			= 0.f;
 	}
 
 	LLPathParams(U8 curve, F32 begin, F32 end, F32 scx, F32 scy, F32 shx, F32 shy, F32 twistend, F32 twistbegin, F32 radiusoffset, F32 tx, F32 ty, F32 revolutions, F32 skew)
-		: mCurveType(curve), mBegin(begin), mEnd(end), mTwistBegin(twistbegin), mTwistEnd(twistend), 
-		  mRadiusOffset(radiusoffset), mRevolutions(revolutions), mSkew(skew)
+		: mCurveType(curve),
+		  mBegin(begin),
+		  mEnd(end),
+		  mScale(scx,scy),
+		  mShear(shx,shy),
+		  mTwistBegin(twistbegin),
+		  mTwistEnd(twistend), 
+		  mRadiusOffset(radiusoffset),
+		  mTaper(tx,ty),
+		  mRevolutions(revolutions),
+		  mSkew(skew),
+		  mCRC(0)
 	{
-		mScale.setVec(scx,scy);
-		mShear.setVec(shx,shy);
-		mTaper.setVec(tx,ty);
 	}
 
 	LLPathParams(U8 curve, U16 begin, U16 end, U8 scx, U8 scy, U8 shx, U8 shy, U8 twistend, U8 twistbegin, U8 radiusoffset, U8 tx, U8 ty, U8 revolutions, U8 skew)
@@ -347,6 +366,8 @@ public:
 		mTaper.setVec(U8_TO_F32(tx) * TAPER_QUANTA,U8_TO_F32(ty) * TAPER_QUANTA);
 		mRevolutions = ((F32)revolutions) * REV_QUANTA + 1.0f;
 		mSkew = U8_TO_F32(skew) * SCALE_QUANTA;
+
+		mCRC = 0;
 	}
 
 	bool operator==(const LLPathParams &params) const;
@@ -525,6 +546,7 @@ class LLVolumeParams
 {
 public:
 	LLVolumeParams()
+		: mSculptType(LL_SCULPT_TYPE_NONE)
 	{
 	}
 
@@ -649,7 +671,9 @@ public:
 		  mConcave(FALSE),
 		  mDirty(TRUE),
 		  mTotalOut(0),
-		  mTotal(2)
+		  mTotal(2),
+		  mMinX(0.f),
+		  mMaxX(0.f)
 	{
 	}
 
@@ -660,7 +684,8 @@ public:
 	BOOL isFlat(S32 face) const							{ return (mFaces[face].mCount == 2); }
 	BOOL isOpen() const									{ return mOpen; }
 	void setDirty()										{ mDirty     = TRUE; }
-	BOOL generate(const LLProfileParams& params, BOOL path_open, F32 detail = 1.0f, S32 split = 0, BOOL is_sculpted = FALSE);
+	BOOL generate(const LLProfileParams& params, BOOL path_open, F32 detail = 1.0f, S32 split = 0,
+				  BOOL is_sculpted = FALSE, S32 sculpt_size = 0);
 	BOOL isConcave() const								{ return mConcave; }
 public:
 	struct Face
@@ -678,8 +703,6 @@ public:
 	std::vector<Face>      mFaces;
 	std::vector<LLVector3> mEdgeNormals;
 	std::vector<LLVector3> mEdgeCenters;
-	F32			  mMaxX;
-	F32			  mMinX;
 
 	friend std::ostream& operator<<(std::ostream &s, const LLProfile &profile);
 
@@ -698,6 +721,9 @@ protected:
 
 	S32			  mTotalOut;
 	S32			  mTotal;
+
+	F32			  mMaxX;
+	F32			  mMinX;
 };
 
 //-------------------------------------------------------------------
@@ -728,7 +754,8 @@ public:
 	virtual ~LLPath();
 
 	void genNGon(const LLPathParams& params, S32 sides, F32 offset=0.0f, F32 end_scale = 1.f, F32 twist_scale = 1.f);
-	virtual BOOL generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0, BOOL is_sculpted = FALSE);
+	virtual BOOL generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0,
+						  BOOL is_sculpted = FALSE, S32 sculpt_size = 0);
 
 	BOOL isOpen() const						{ return mOpen; }
 	F32 getStep() const						{ return mStep; }
@@ -754,7 +781,8 @@ class LLDynamicPath : public LLPath
 {
 public:
 	LLDynamicPath() : LLPath() { }
-	/*virtual*/ BOOL generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0, BOOL is_sculpted = FALSE);
+	/*virtual*/ BOOL generate(const LLPathParams& params, F32 detail=1.0f, S32 split = 0,
+							  BOOL is_sculpted = FALSE, S32 sculpt_size = 0);
 };
 
 // Yet another "face" class - caches volume-specific, but not instance-specific data for faces)
@@ -885,7 +913,13 @@ public:
 	//get the face index of the face that intersects with the given line segment at the point 
 	//closest to start.  Moves end to the point of intersection.  Returns -1 if no intersection.
 	//Line segment must be in volume space.
-	S32 lineSegmentIntersect(const LLVector3& start, LLVector3& end) const;
+	S32 lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+							 S32 face = -1,                          // which face to check, -1 = ALL_SIDES
+							 LLVector3* intersection = NULL,         // return the intersection point
+							 LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
+							 LLVector3* normal = NULL,               // return the surface normal at the intersection point
+							 LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point
+		);
 	
 	// The following cleans up vertices and triangles,
 	// getting rid of degenerate triangles and duplicate vertices,
@@ -916,6 +950,8 @@ private:
 	F32 sculptGetSurfaceArea(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data);
 	void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type);
 	void sculptGeneratePlaceholder();
+	void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t);
+
 	
 protected:
 	BOOL generate();
@@ -946,4 +982,10 @@ LLVector3 calc_binormal_from_triangle(
 		const LLVector3& pos2,
 		const LLVector2& tex2);
 
+BOOL LLLineSegmentBoxIntersect(const LLVector3& start, const LLVector3& end, const LLVector3& center, const LLVector3& size);
+BOOL LLTriangleRayIntersect(const LLVector3& vert0, const LLVector3& vert1, const LLVector3& vert2, const LLVector3& orig, const LLVector3& dir,
+							F32* intersection_a, F32* intersection_b, F32* intersection_t, BOOL two_sided);
+	
+	
+
 #endif
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index 0b5464c..a3cd6b5 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -115,7 +115,7 @@ LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32
 	{
 		mDataMutex->unlock();
 	}
-	return volgroupp->getLODVolume(detail);
+	return volgroupp->refLOD(detail);
 }
 
 // virtual
@@ -294,7 +294,7 @@ bool LLVolumeLODGroup::cleanupRefs()
 	return res;
 }
 
-LLVolume* LLVolumeLODGroup::getLODVolume(const S32 detail)
+LLVolume* LLVolumeLODGroup::refLOD(const S32 detail)
 {
 	llassert(detail >=0 && detail < NUM_LODS);
 	mAccessCount[detail]++;
@@ -376,7 +376,6 @@ F32 LLVolumeLODGroup::getVolumeScaleFromDetail(const S32 detail)
 
 F32 LLVolumeLODGroup::dump()
 {
-	char dump_str[255];		/* Flawfinder: ignore */
 	F32 usage = 0.f;
 	for (S32 i = 0; i < NUM_LODS; i++)
 	{
@@ -387,7 +386,7 @@ F32 LLVolumeLODGroup::dump()
 	}
 	usage = usage / (F32)NUM_LODS;
 
-	snprintf(dump_str, sizeof(dump_str), "%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]);	/* Flawfinder: ignore */
+	std::string dump_str = llformat("%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]);
 
 	llinfos << dump_str << llendl;
 	return usage;
diff --git a/linden/indra/llmath/llvolumemgr.h b/linden/indra/llmath/llvolumemgr.h
index dcaca01..d579fed 100644
--- a/linden/indra/llmath/llvolumemgr.h
+++ b/linden/indra/llmath/llvolumemgr.h
@@ -59,7 +59,7 @@ public:
 	static void getDetailProximity(const F32 tan_angle, F32 &to_lower, F32& to_higher);
 	static F32 getVolumeScaleFromDetail(const S32 detail);
 
-	LLVolume* getLODVolume(const S32 detail);
+	LLVolume* refLOD(const S32 detail);
 	BOOL derefLOD(LLVolume *volumep);
 	S32 getNumRefs() const { return mRefs; }
 	
diff --git a/linden/indra/llmath/v2math.cpp b/linden/indra/llmath/v2math.cpp
index 76fa60f..c3bb093 100644
--- a/linden/indra/llmath/v2math.cpp
+++ b/linden/indra/llmath/v2math.cpp
@@ -33,6 +33,7 @@
 
 //#include "vmath.h"
 #include "v2math.h"
+#include "v3math.h"
 #include "v4math.h"
 #include "m4math.h"
 #include "m3math.h"
diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h
index 5a520d2..350079d 100644
--- a/linden/indra/llmath/v2math.h
+++ b/linden/indra/llmath/v2math.h
@@ -33,6 +33,7 @@
 #define LL_V2MATH_H
 
 #include "llmath.h"
+#include "v3math.h"
 
 class LLVector4;
 class LLMatrix3;
@@ -49,9 +50,10 @@ class LLVector2
 
 		static LLVector2 zero;
 
-		LLVector2();							// Initializes LLVector2 to (0, 0)
-		LLVector2(F32 x, F32 y);			    // Initializes LLVector2 to (x. y)
-		LLVector2(const F32 *vec);				// Initializes LLVector2 to (vec[0]. vec[1])
+		LLVector2();							  // Initializes LLVector2 to (0, 0)
+		LLVector2(F32 x, F32 y);			      // Initializes LLVector2 to (x. y)
+		LLVector2(const F32 *vec);				  // Initializes LLVector2 to (vec[0]. vec[1])
+        explicit LLVector2(const LLVector3 &vec); // Initializes LLVector2 to (vec[0]. vec[1])
 		
 		// Clears LLVector2 to (0, 0).  DEPRECATED - prefer zeroVec.
 		void	clear();
@@ -137,6 +139,12 @@ inline LLVector2::LLVector2(const F32 *vec)
 	mV[VY] = vec[VY];
 }
 
+inline LLVector2::LLVector2(const LLVector3 &vec)
+{
+	mV[VX] = vec.mV[VX];
+	mV[VY] = vec.mV[VY];
+}
+
 
 // Clear and Assignment Functions
 
diff --git a/linden/indra/llmath/v3color.h b/linden/indra/llmath/v3color.h
index a3bf385..b9bc641 100644
--- a/linden/indra/llmath/v3color.h
+++ b/linden/indra/llmath/v3color.h
@@ -174,6 +174,10 @@ inline LLColor3::LLColor3(const F32 *vec)
 	mV[VZ] = vec[VZ];
 }
 
+#if LL_WINDOWS
+# pragma warning( disable : 4996 ) // strncpy teh sux0r
+#endif
+
 inline LLColor3::LLColor3(char* color_string) // takes a string of format "RRGGBB" where RR is hex 00..FF 
 {
 	if (strlen(color_string) <  6)		/* Flawfinder: ignore */
diff --git a/linden/indra/llmath/v3dmath.cpp b/linden/indra/llmath/v3dmath.cpp
index b59f519..5a3246c 100644
--- a/linden/indra/llmath/v3dmath.cpp
+++ b/linden/indra/llmath/v3dmath.cpp
@@ -132,15 +132,15 @@ const LLVector3d&	LLVector3d::rotVec(F64 angle, F64 x, F64 y, F64 z)
 }
 
 
-BOOL LLVector3d::parseVector3d(const char* buf, LLVector3d* value)
+BOOL LLVector3d::parseVector3d(const std::string& buf, LLVector3d* value)
 {
-	if( buf == NULL || buf[0] == '\0' || value == NULL)
+	if( buf.empty() || value == NULL)
 	{
 		return FALSE;
 	}
 
 	LLVector3d v;
-	S32 count = sscanf( buf, "%lf %lf %lf", v.mdV + 0, v.mdV + 1, v.mdV + 2 );
+	S32 count = sscanf( buf.c_str(), "%lf %lf %lf", v.mdV + 0, v.mdV + 1, v.mdV + 2 );
 	if( 3 == count )
 	{
 		value->setVec( v );
diff --git a/linden/indra/llmath/v3dmath.h b/linden/indra/llmath/v3dmath.h
index 9bd80b8..ecb333a 100644
--- a/linden/indra/llmath/v3dmath.h
+++ b/linden/indra/llmath/v3dmath.h
@@ -95,6 +95,10 @@ class LLVector3d
 		F64		magVecSquared() const;		// Returns magnitude squared of LLVector3d
 		inline F64		normVec();					// Normalizes and returns the magnitude of LLVector3d
 
+		F64 length() const;			// Returns magnitude of LLVector3d
+		F64 lengthSquared() const;	// Returns magnitude squared of LLVector3d
+		inline F64 normalize();		// Normalizes and returns the magnitude of LLVector3d
+
 		const LLVector3d&	rotVec(const F64 angle, const LLVector3d &vec);	// Rotates about vec by angle radians
 		const LLVector3d&	rotVec(const F64 angle, const F64 x, const F64 y, const F64 z);		// Rotates about x,y,z by angle radians
 		const LLVector3d&	rotVec(const LLMatrix3 &mat);				// Rotates by LLMatrix4 mat
@@ -128,7 +132,7 @@ class LLVector3d
 
 		friend std::ostream&	 operator<<(std::ostream& s, const LLVector3d &a);		// Stream a
 
-		static BOOL parseVector3d(const char* buf, LLVector3d* value);
+		static BOOL parseVector3d(const std::string& buf, LLVector3d* value);
 
 };
 
@@ -261,6 +265,28 @@ inline F64 LLVector3d::normVec(void)
 	return (mag);
 }
 
+inline F64 LLVector3d::normalize(void)
+{
+	F64 mag = fsqrtf(mdV[0]*mdV[0] + mdV[1]*mdV[1] + mdV[2]*mdV[2]);
+	F64 oomag;
+
+	if (mag > FP_MAG_THRESHOLD)
+	{
+		oomag = 1.f/mag;
+		mdV[0] *= oomag;
+		mdV[1] *= oomag;
+		mdV[2] *= oomag;
+	}
+	else
+	{
+		mdV[0] = 0.f;
+		mdV[1] = 0.f;
+		mdV[2] = 0.f;
+		mag = 0;
+	}
+	return (mag);
+}
+
 // LLVector3d Magnitude and Normalization Functions
 
 inline F64	LLVector3d::magVec(void) const
@@ -273,6 +299,16 @@ inline F64	LLVector3d::magVecSquared(void) const
 	return mdV[0]*mdV[0] + mdV[1]*mdV[1] + mdV[2]*mdV[2];
 }
 
+inline F64	LLVector3d::length(void) const
+{
+	return fsqrtf(mdV[0]*mdV[0] + mdV[1]*mdV[1] + mdV[2]*mdV[2]);
+}
+
+inline F64	LLVector3d::lengthSquared(void) const
+{
+	return mdV[0]*mdV[0] + mdV[1]*mdV[1] + mdV[2]*mdV[2];
+}
+
 inline LLVector3d operator+(const LLVector3d &a, const LLVector3d &b)
 {
 	LLVector3d c(a);
@@ -416,8 +452,8 @@ inline F64 angle_between(const LLVector3d& a, const LLVector3d& b)
 {
 	LLVector3d an = a;
 	LLVector3d bn = b;
-	an.normVec();
-	bn.normVec();
+	an.normalize();
+	bn.normalize();
 	F64 cosine = an * bn;
 	F64 angle = (cosine >= 1.0f) ? 0.0f :
 				(cosine <= -1.0f) ? F_PI :
@@ -429,8 +465,8 @@ inline BOOL are_parallel(const LLVector3d &a, const LLVector3d &b, const F64 eps
 {
 	LLVector3d an = a;
 	LLVector3d bn = b;
-	an.normVec();
-	bn.normVec();
+	an.normalize();
+	bn.normalize();
 	F64 dot = an * bn;
 	if ( (1.0f - fabs(dot)) < epsilon)
 	{
@@ -443,7 +479,7 @@ inline BOOL are_parallel(const LLVector3d &a, const LLVector3d &b, const F64 eps
 inline LLVector3d projected_vec(const LLVector3d &a, const LLVector3d &b)
 {
 	LLVector3d project_axis = b;
-	project_axis.normVec();
+	project_axis.normalize();
 	return project_axis * (a * project_axis);
 }
 
diff --git a/linden/indra/llmath/v3math.cpp b/linden/indra/llmath/v3math.cpp
index bbe460f..cb87836 100644
--- a/linden/indra/llmath/v3math.cpp
+++ b/linden/indra/llmath/v3math.cpp
@@ -34,6 +34,7 @@
 #include "v3math.h"
 
 //#include "vmath.h"
+#include "v2math.h"
 #include "v4math.h"
 #include "m4math.h"
 #include "m3math.h"
@@ -73,6 +74,72 @@ BOOL LLVector3::clamp(F32 min, F32 max)
 	return ret;
 }
 
+// Clamps length to an upper limit.  
+// Returns TRUE if the data changed
+BOOL LLVector3::clampLength( F32 length_limit )
+{
+	BOOL changed = FALSE;
+
+	F32 len = length();
+	if (llfinite(len))
+	{
+		if ( len > length_limit)
+		{
+			normalize();
+			if (length_limit < 0.f)
+			{
+				length_limit = 0.f;
+			}
+			mV[0] *= length_limit;
+			mV[1] *= length_limit;
+			mV[2] *= length_limit;
+			changed = TRUE;
+		}
+	}
+	else
+	{	// this vector may still be salvagable
+		F32 max_abs_component = 0.f;
+		for (S32 i = 0; i < 3; ++i)
+		{
+			F32 abs_component = fabs(mV[i]);
+			if (llfinite(abs_component))
+			{
+				if (abs_component > max_abs_component)
+				{
+					max_abs_component = abs_component;
+				}
+			}
+			else
+			{
+				// no it can't be salvaged --> clear it
+				clear();
+				changed = TRUE;
+				break;
+			}
+		}
+		if (!changed)
+		{
+			// yes it can be salvaged -->
+			// bring the components down before we normalize
+			mV[0] /= max_abs_component;
+			mV[1] /= max_abs_component;
+			mV[2] /= max_abs_component;
+			normalize();
+
+			if (length_limit < 0.f)
+			{
+				length_limit = 0.f;
+			}
+			mV[0] *= length_limit;
+			mV[1] *= length_limit;
+			mV[2] *= length_limit;
+		}
+	}
+
+	return changed;
+}
+
+
 // Sets all values to absolute value of their original values
 // Returns TRUE if data changed
 BOOL LLVector3::abs()
@@ -204,6 +271,13 @@ const LLVector3&	LLVector3::setVec(const LLVector4 &vec)
 	return (*this);
 }
 
+LLVector3::LLVector3(const LLVector2 &vec)
+{
+	mV[VX] = (F32)vec.mV[VX];
+	mV[VY] = (F32)vec.mV[VY];
+	mV[VZ] = 0;
+}
+
 LLVector3::LLVector3(const LLVector3d &vec)
 {
 	mV[VX] = (F32)vec.mdV[VX];
@@ -260,15 +334,15 @@ const LLVector3& operator*=(LLVector3 &a, const LLQuaternion &rot)
 }
 
 // static 
-BOOL LLVector3::parseVector3(const char* buf, LLVector3* value)
+BOOL LLVector3::parseVector3(const std::string& buf, LLVector3* value)
 {
-	if( buf == NULL || buf[0] == '\0' || value == NULL)
+	if( buf.empty() || value == NULL)
 	{
 		return FALSE;
 	}
 
 	LLVector3 v;
-	S32 count = sscanf( buf, "%f %f %f", v.mV + 0, v.mV + 1, v.mV + 2 );
+	S32 count = sscanf( buf.c_str(), "%f %f %f", v.mV + 0, v.mV + 1, v.mV + 2 );
 	if( 3 == count )
 	{
 		value->setVec( v );
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h
index ddb5e1f..65932cd 100644
--- a/linden/indra/llmath/v3math.h
+++ b/linden/indra/llmath/v3math.h
@@ -36,6 +36,7 @@
 #include "llmath.h"
 
 #include "llsd.h"
+class LLVector2;
 class LLVector4;
 class LLMatrix3;
 class LLVector3d;
@@ -62,6 +63,7 @@ class LLVector3
 		inline LLVector3();							// Initializes LLVector3 to (0, 0, 0)
 		inline LLVector3(const F32 x, const F32 y, const F32 z);			// Initializes LLVector3 to (x. y, z)
 		inline explicit LLVector3(const F32 *vec);				// Initializes LLVector3 to (vec[0]. vec[1], vec[2])
+		explicit LLVector3(const LLVector2 &vec);				// Initializes LLVector3 to (vec[0]. vec[1], 0)
 		explicit LLVector3(const LLVector3d &vec);				// Initializes LLVector3 to (vec[0]. vec[1], vec[2])
 		explicit LLVector3(const LLVector4 &vec);				// Initializes LLVector4 to (vec[0]. vec[1], vec[2])
 		LLVector3(const LLSD& sd);
@@ -74,6 +76,7 @@ class LLVector3
 
 		inline BOOL isFinite() const;									// checks to see if all values of LLVector3 are finite
 		BOOL		clamp(F32 min, F32 max);		// Clamps all values to (min,max), returns TRUE if data changed
+		BOOL		clampLength( F32 length_limit );					// Scales vector to limit length to a value
 
 		void		quantize16(F32 lowerxy, F32 upperxy, F32 lowerz, F32 upperz);	// changes the vector to reflect quatization
 		void		quantize8(F32 lowerxy, F32 upperxy, F32 lowerz, F32 upperz);	// changes the vector to reflect quatization
@@ -147,7 +150,7 @@ class LLVector3
 
 		friend std::ostream&	 operator<<(std::ostream& s, const LLVector3 &a);		// Stream a
 
-		static BOOL parseVector3(const char* buf, LLVector3* value);
+		static BOOL parseVector3(const std::string& buf, LLVector3* value);
 };
 
 typedef LLVector3 LLSimLocalVec;
diff --git a/linden/indra/llmath/v4color.cpp b/linden/indra/llmath/v4color.cpp
index 8e6907e..88237a0 100644
--- a/linden/indra/llmath/v4color.cpp
+++ b/linden/indra/llmath/v4color.cpp
@@ -286,16 +286,14 @@ void LLColor4::calcHSL(F32* hue, F32* saturation, F32* luminance) const
 }
 
 // static
-BOOL LLColor4::parseColor(const char* buf, LLColor4* color)
+BOOL LLColor4::parseColor(const std::string& buf, LLColor4* color)
 {
-	if( buf == NULL || buf[0] == '\0' || color == NULL)
+	if( buf.empty() || color == NULL)
 	{
 		return FALSE;
 	}
 
-	LLString full_string(buf);
-
-	boost_tokenizer tokens(full_string, boost::char_separator<char>(", "));
+	boost_tokenizer tokens(buf, boost::char_separator<char>(", "));
 	boost_tokenizer::iterator token_iter = tokens.begin();
 	if (token_iter == tokens.end())
 	{
@@ -304,15 +302,15 @@ BOOL LLColor4::parseColor(const char* buf, LLColor4* color)
 
 	// Grab the first token into a string, since we don't know
 	// if this is a float or a color name.
-	LLString color_name( (*token_iter) );
+	std::string color_name( (*token_iter) );
 	++token_iter;
 
 	if (token_iter != tokens.end())
 	{
 		// There are more tokens to read.  This must be a vector.
 		LLColor4 v;
-		LLString::convertToF32( color_name,  v.mV[VX] );
-		LLString::convertToF32( *token_iter, v.mV[VY] );
+		LLStringUtil::convertToF32( color_name,  v.mV[VX] );
+		LLStringUtil::convertToF32( *token_iter, v.mV[VY] );
 		v.mV[VZ] = 0.0f;
 		v.mV[VW] = 1.0f;
 
@@ -320,18 +318,18 @@ BOOL LLColor4::parseColor(const char* buf, LLColor4* color)
 		if (token_iter == tokens.end())
 		{
 			// This is a malformed vector.
-			llwarns << "LLColor4::parseColor() malformed color " << full_string << llendl;
+			llwarns << "LLColor4::parseColor() malformed color " << buf << llendl;
 		}
 		else
 		{
 			// There is a z-component.
-			LLString::convertToF32( *token_iter, v.mV[VZ] );
+			LLStringUtil::convertToF32( *token_iter, v.mV[VZ] );
 
 			++token_iter;
 			if (token_iter != tokens.end())
 			{
 				// There is an alpha component.
-				LLString::convertToF32( *token_iter, v.mV[VW] );
+				LLStringUtil::convertToF32( *token_iter, v.mV[VW] );
 			}
 		}
 
@@ -615,19 +613,19 @@ BOOL LLColor4::parseColor(const char* buf, LLColor4* color)
 }
 
 // static
-BOOL LLColor4::parseColor4(const char* buf, LLColor4* value)
+BOOL LLColor4::parseColor4(const std::string& buf, LLColor4* value)
 {
-	if( buf == NULL || buf[0] == '\0' || value == NULL)
+	if( buf.empty() || value == NULL)
 	{
 		return FALSE;
 	}
 
 	LLColor4 v;
-	S32 count = sscanf( buf, "%f, %f, %f, %f", v.mV + 0, v.mV + 1, v.mV + 2, v.mV + 3 );
+	S32 count = sscanf( buf.c_str(), "%f, %f, %f, %f", v.mV + 0, v.mV + 1, v.mV + 2, v.mV + 3 );
 	if (1 == count )
 	{
 		// try this format
-		count = sscanf( buf, "%f %f %f %f", v.mV + 0, v.mV + 1, v.mV + 2, v.mV + 3 );
+		count = sscanf( buf.c_str(), "%f %f %f %f", v.mV + 0, v.mV + 1, v.mV + 2, v.mV + 3 );
 	}
 	if( 4 == count )
 	{
diff --git a/linden/indra/llmath/v4color.h b/linden/indra/llmath/v4color.h
index a2c0fb6..53e4407 100644
--- a/linden/indra/llmath/v4color.h
+++ b/linden/indra/llmath/v4color.h
@@ -211,8 +211,8 @@ class LLColor4
 		static LLColor4 cyan5;
 		static LLColor4 cyan6;
 	
-		static BOOL parseColor(const char* buf, LLColor4* color);
-		static BOOL parseColor4(const char* buf, LLColor4* color);
+		static BOOL parseColor(const std::string& buf, LLColor4* color);
+		static BOOL parseColor4(const std::string& buf, LLColor4* color);
 
 		inline void clamp();
 };
diff --git a/linden/indra/llmath/v4coloru.cpp b/linden/indra/llmath/v4coloru.cpp
index 56a8413..7ad7eb2 100644
--- a/linden/indra/llmath/v4coloru.cpp
+++ b/linden/indra/llmath/v4coloru.cpp
@@ -93,19 +93,19 @@ std::ostream& operator<<(std::ostream& s, const LLColor4U &a)
 }
 
 // static
-BOOL LLColor4U::parseColor4U(const char* buf, LLColor4U* value)
+BOOL LLColor4U::parseColor4U(const std::string& buf, LLColor4U* value)
 {
-	if( buf == NULL || buf[0] == '\0' || value == NULL)
+	if( buf.empty() || value == NULL)
 	{
 		return FALSE;
 	}
 
 	U32 v[4];
-	S32 count = sscanf( buf, "%u, %u, %u, %u", v + 0, v + 1, v + 2, v + 3 );
+	S32 count = sscanf( buf.c_str(), "%u, %u, %u, %u", v + 0, v + 1, v + 2, v + 3 );
 	if (1 == count )
 	{
 		// try this format
-		count = sscanf( buf, "%u %u %u %u", v + 0, v + 1, v + 2, v + 3 );
+		count = sscanf( buf.c_str(), "%u %u %u %u", v + 0, v + 1, v + 2, v + 3 );
 	}
 	if( 4 != count )
 	{
diff --git a/linden/indra/llmath/v4coloru.h b/linden/indra/llmath/v4coloru.h
index c9c5418..910a081 100644
--- a/linden/indra/llmath/v4coloru.h
+++ b/linden/indra/llmath/v4coloru.h
@@ -127,7 +127,7 @@ public:
 	inline void setVecScaleClamp(const LLColor3 &color);
 	inline void setVecScaleClamp(const LLColor4 &color);
 
-	static BOOL parseColor4U(const char* buf, LLColor4U* value);
+	static BOOL parseColor4U(const std::string& buf, LLColor4U* value);
 
 	static LLColor4U white;
 	static LLColor4U black;
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
new file mode 100644
index 0000000..8ef8006
--- /dev/null
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -0,0 +1,94 @@
+# -*- cmake -*-
+
+project(llmedia)
+
+include(00-Common)
+include(LLAudio)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLMedia)
+include(LLMessage)
+include(LLWindow)
+include(Mozlib)
+
+include_directories(
+    ${GSTREAMER_INCLUDE_DIRS}
+    ${GSTREAMER_PLUGINS_BASE_INCLUDE_DIRS}
+    ${LLAUDIO_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    )
+
+set(llmedia_SOURCE_FILES
+    llmediaimplcommon.cpp
+    llmediaimplexample1.cpp
+    llmediaimplexample2.cpp
+    llmediaimplfactory.cpp
+    llmediamanager.cpp
+    )
+    
+set(llmedia_HEADER_FILES
+    CMakeLists.txt
+
+    llmediabase.h
+    llmediaemitter.h
+    llmediaimplcommon.h
+    llmediaimplexample1.h
+    llmediaimplexample2.h
+    llmediaimplfactory.h
+    llmediaimplregister.h
+    llmediamanager.h
+    llmediaobserver.h
+    )
+
+if (GSTREAMER)
+  list(APPEND llmedia_SOURCE_FILES
+       llmediaimplgstreamer.cpp
+       llmediaimplgstreamer_syms.cpp
+       llmediaimplgstreamervidplug.cpp
+       )
+
+  list(APPEND llmedia_HEADER_FILES
+       llmediaimplgstreamer.h
+       llmediaimplgstreamervidplug.h
+       llmediaimplgstreamer_syms.h
+       )
+
+  # Work around a bad interaction between broken gstreamer headers and
+  # g++ 4.3's increased strictness.
+
+  if (${CXX_VERSION} MATCHES "4.[23]")
+    set_source_files_properties(llmediaimplgstreamervidplug.cpp PROPERTIES
+                                COMPILE_FLAGS -Wno-error=write-strings)
+  endif (${CXX_VERSION} MATCHES "4.[23]")
+endif (GSTREAMER)
+
+if (MOZLIB)
+  list(APPEND llmedia_SOURCE_FILES llmediaimplllmozlib.cpp)
+
+  list(APPEND llmedia_HEADER_FILES llmediaimplllmozlib.h)
+endif (MOZLIB)
+
+if (QUICKTIME)
+  list(APPEND llmedia_SOURCE_FILES llmediaimplquicktime.cpp)
+  list(APPEND llmedia_HEADER_FILES llmediaimplquicktime.h)
+
+  # We use a bunch of deprecated system APIs.
+  if (DARWIN)
+    set_source_files_properties(
+        llmediaimplquicktime.cpp PROPERTIES
+        COMPILE_FLAGS -Wno-deprecated-declarations
+        )
+  endif (DARWIN)
+endif (QUICKTIME)
+
+set_source_files_properties(${llmedia_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llmedia_SOURCE_FILES ${llmedia_HEADER_FILES})
+
+add_library (llmedia ${llmedia_SOURCE_FILES})
diff --git a/linden/indra/llmedia/files.lst b/linden/indra/llmedia/files.lst
deleted file mode 100644
index 3ce18e5..0000000
--- a/linden/indra/llmedia/files.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-llmedia/llmediaimplcommon.cpp
-llmedia/llmediaimplexample1.cpp
-llmedia/llmediaimplexample2.cpp
-llmedia/llmediaimplfactory.cpp
-llmedia/llmediaimplgstreamer.cpp
-llmedia/llmediaimplgstreamer_syms.cpp
-llmedia/llmediaimplgstreamervidplug.cpp
-llmedia/llmediaimplllmozlib.cpp
-llmedia/llmediaimplquicktime.cpp
-llmedia/llmediamanager.cpp
-
diff --git a/linden/indra/llmedia/llmedia.vcproj b/linden/indra/llmedia/llmedia.vcproj
deleted file mode 100644
index 38c53f0..0000000
--- a/linden/indra/llmedia/llmedia.vcproj
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llmedia"
-	ProjectGUID="{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
-	RootNamespace="llmedia"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;XP_WIN;XP_WIN32"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4702"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/IGNORE:4006"
-				AdditionalDependencies="qtmlclient.lib llmozlib2d.lib"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories="&quot;..\..\libraries\i686-win32\lib_debug&quot;"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="FALSE"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="FALSE"
-				OptimizeForProcessor="0"
-				OptimizeForWindowsApplication="FALSE"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4702"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/IGNORE:4006"
-				AdditionalDependencies="qtmlclient.lib llmozlib2.lib"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories="&quot;..\..\libraries\i686-win32\lib_release&quot;"
-				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames=""/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				GlobalOptimizations="FALSE"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="FALSE"
-				OptimizeForProcessor="0"
-				OptimizeForWindowsApplication="FALSE"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4702"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/IGNORE:4006"
-				AdditionalDependencies="qtmlclient.lib llmozlib2.lib"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories="&quot;..\..\libraries\i686-win32\lib_release&quot;"
-				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames=""/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}">
-			<File
-				RelativePath=".\llmediaimplfactory.cpp">
-			</File>
-			<File
-				RelativePath=".\llmediamanager.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}">
-			<File
-				RelativePath=".\llmediabase.h">
-			</File>
-			<File
-				RelativePath=".\llmediaemitter.h">
-			</File>
-			<File
-				RelativePath=".\llmediaimplfactory.h">
-			</File>
-			<File
-				RelativePath=".\llmediaimplregister.h">
-			</File>
-			<File
-				RelativePath=".\llmediamanager.h">
-			</File>
-			<File
-				RelativePath=".\llmediaobserver.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="impls"
-			Filter="">
-			<File
-				RelativePath=".\llmediaimplcommon.cpp">
-			</File>
-			<File
-				RelativePath=".\llmediaimplcommon.h">
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample1.cpp">
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample1.h">
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample2.cpp">
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample2.h">
-			</File>
-			<File
-				RelativePath=".\llmediaimplllmozlib.cpp">
-			</File>
-			<File
-				RelativePath=".\llmediaimplllmozlib.h">
-			</File>
-			<File
-				RelativePath=".\llmediaimplquicktime.cpp">
-			</File>
-			<File
-				RelativePath=".\llmediaimplquicktime.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmedia/llmedia_vc8.vcproj b/linden/indra/llmedia/llmedia_vc8.vcproj
deleted file mode 100644
index 4681a6c..0000000
--- a/linden/indra/llmedia/llmedia_vc8.vcproj
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llmedia"
-	ProjectGUID="{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
-	RootNamespace="llmedia"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;XP_WIN;XP_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4702"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4702"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4702"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}"
-			>
-			<File
-				RelativePath=".\llmediaimplcommon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample1.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample2.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplfactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplllmozlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplquicktime.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediamanager.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}"
-			>
-			<File
-				RelativePath=".\llmediaemitter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplcommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample1.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample2.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplfactory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplllmozlib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplquicktime.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplregister.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediamanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaobserver.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmedia/llmedia_vc9.vcproj b/linden/indra/llmedia/llmedia_vc9.vcproj
deleted file mode 100644
index d032711..0000000
--- a/linden/indra/llmedia/llmedia_vc9.vcproj
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llmedia"
-	ProjectGUID="{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
-	RootNamespace="llmedia"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;XP_WIN;XP_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4702"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4702"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4702"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmedia.lib"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}"
-			>
-			<File
-				RelativePath=".\llmediaimplcommon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample1.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample2.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplfactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplllmozlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplquicktime.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediamanager.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}"
-			>
-			<File
-				RelativePath=".\llmediaemitter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplcommon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample1.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplexample2.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplfactory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplllmozlib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplquicktime.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaimplregister.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediamanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaobserver.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h
index 49c6d69..dad02ca 100644
--- a/linden/indra/llmedia/llmediabase.h
+++ b/linden/indra/llmedia/llmediabase.h
@@ -34,25 +34,6 @@
 #ifndef LLMEDIABASE_H
 #define LLMEDIABASE_H
 
-// Per-OS feature switches.
-#if LL_DARWIN
-	#define LL_QUICKTIME_ENABLED		1
-	#define LL_LLMOZLIB_ENABLED			1
-#elif LL_WINDOWS
-	#define LL_QUICKTIME_ENABLED		1
-	#define LL_LLMOZLIB_ENABLED			1
-#elif LL_LINUX
-	#define LL_QUICKTIME_ENABLED		0
-	#ifndef LL_LLMOZLIB_ENABLED
-		#define LL_LLMOZLIB_ENABLED		1
-	#endif // def LL_LLMOZLIB_ENABLED
-#elif LL_SOLARIS
-	#define LL_QUICKTIME_ENABLED		0
-	#ifndef LL_LLMOZLIB_ENABLED
-		#define LL_LLMOZLIB_ENABLED		0
-	#endif // def LL_LLMOZLIB_ENABLED
-#endif
-
 #if LL_LLMOZLIB_ENABLED && !defined ( MOZILLA_INTERNAL_API )
 	// Without this, nsTAString.h errors out with:
 	// "Cannot use internal string classes without MOZILLA_INTERNAL_API defined. Use the frozen header nsStringAPI.h instead."
diff --git a/linden/indra/llmedia/llmediaimplexample1.cpp b/linden/indra/llmedia/llmediaimplexample1.cpp
index 03e8291..977d508 100644
--- a/linden/indra/llmedia/llmediaimplexample1.cpp
+++ b/linden/indra/llmedia/llmediaimplexample1.cpp
@@ -32,6 +32,8 @@
 #include "llmediaimplexample1.h"
 #include "llmediaimplregister.h"
 
+#include <cstring>
+
 // register this impl with media manager factory
 static LLMediaImplRegister sLLMediaImplExample1Reg( "LLMediaImplExample1", new LLMediaImplExample1Maker() );
 
diff --git a/linden/indra/llmedia/llmediaimplexample2.cpp b/linden/indra/llmedia/llmediaimplexample2.cpp
index dc20e03..13036f9 100644
--- a/linden/indra/llmedia/llmediaimplexample2.cpp
+++ b/linden/indra/llmedia/llmediaimplexample2.cpp
@@ -32,6 +32,8 @@
 #include "llmediaimplexample2.h"
 #include "llmediaimplregister.h"
 
+#include <cstring>
+
 // register this impl with media manager factory
 static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new LLMediaImplExample2Maker() );
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 5bf30d9..51a5bca 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -235,10 +235,11 @@ static char* get_gst_state_name(GstState state)
 }
 #endif // LL_GST_REPORT_STATE_CHANGES
 
-static gboolean
-bus_callback (GstBus     *bus,
-	      GstMessage *message,
-	      gpointer    data)
+//static
+gboolean
+LLMediaImplGStreamer::bus_callback (GstBus     *bus,
+				    GstMessage *message,
+				    gpointer    data)
 {
 	if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_STATE_CHANGED &&
 	    GST_MESSAGE_TYPE(message) != GST_MESSAGE_BUFFERING)
@@ -612,6 +613,27 @@ getMediaData ()
 // virtual
 bool
 LLMediaImplGStreamer::
+seek( double time )
+{
+	bool success = false;
+	if (mPlaybin)
+	{
+		success = llgst_element_seek(mPlaybin, 1.0F, GST_FORMAT_TIME,
+				GstSeekFlags(GST_SEEK_FLAG_FLUSH |
+					     GST_SEEK_FLAG_KEY_UNIT),
+				GST_SEEK_TYPE_SET, gint64(time*1000000000.0F),
+				GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+	}
+	DEBUGMSG("MEDIA SEEK REQUEST to %fsec result was %d",
+		 float(time), int(success));
+	return success;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// virtual
+bool
+LLMediaImplGStreamer::
 setVolume(float volume)
 {
 	mVolume = volume;
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 944db59..247b0ce 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -43,8 +43,8 @@ extern "C" {
 #include <stdio.h>
 #include <gst/gst.h>
 
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_dso.h>
+#include "apr_pools.h"
+#include "apr_dso.h"
 }
 
 #include "llmediaimplgstreamervidplug.h"
@@ -76,16 +76,20 @@ class LLMediaImplGStreamer:
 		/* virtual */ int getTextureFormatPrimary() const;
 		/* virtual */ int getTextureFormatType() const;
 		/* virtual */ int getTextureFormatInternal() const;
+		/* virtual */ bool seek( double time );
 	        /* virtual */ bool setVolume( float volume );
 
-	        bool stop();
-	        bool play();
 	        LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
 	private:
         	// misc
 	        bool unload();
 	        bool pause();
+	        bool stop();
+	        bool play();
+	        static gboolean bus_callback (GstBus     *bus,
+					      GstMessage *message,
+					      gpointer    data);
 		unsigned char* mediaData;
         	int mMediaRowbytes;
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
index c5e3c7b..e81d886 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
@@ -34,8 +34,8 @@
 extern "C" {
 #include <gst/gst.h>
 
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_dso.h>
+#include "apr_pools.h"
+#include "apr_dso.h"
 }
 
 #include "llmediaimplgstreamer.h"
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
index 26cefc0..08ba6df 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
@@ -34,6 +34,7 @@ LL_GST_SYM(true, gst_structure_get_value, G_CONST_RETURN GValue *, const GstStru
 LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value);
 LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value);
 LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure);
+LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64);
 
 // optional symbols to grab
 LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled);
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 8d637c0..f72e63c 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -36,10 +36,13 @@
 #include "llmediaimplexample2.h"
 #include "llmediaimplquicktime.h"
 #include "llmediaimplgstreamer.h"
-#include "llmediaimplllmozlib.h"
+#if LL_LLMOZLIB_ENABLED
+# include "llmediaimplllmozlib.h"
+#endif
 
 LLMediaManager* LLMediaManager::sInstance = 0;
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // (private)
 LLMediaManager::LLMediaManager()
@@ -52,6 +55,20 @@ LLMediaManager::~LLMediaManager()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Early initialization for web browser for the viewer, so we can show
+// the login screen and defer initialization of QuickTime, etc. JC
+// (static)
+void LLMediaManager::initBrowser( LLMediaManagerData* init_data )
+{
+	if ( ! sInstance )
+		sInstance = new LLMediaManager();
+
+#if LL_LLMOZLIB_ENABLED
+	LLMediaImplLLMozLib::startup( init_data );
+#endif // LL_LLMOZLIB_ENABLED
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // (static)
 void LLMediaManager::initClass( LLMediaManagerData* init_data )
 {
@@ -73,10 +90,6 @@ void LLMediaManager::initClass( LLMediaManagerData* init_data )
 #if LL_GSTREAMER_ENABLED
 	LLMediaImplGStreamer::startup( init_data );
 #endif // LL_GSTREAMER_ENABLED
-
-#if LL_LLMOZLIB_ENABLED
-	LLMediaImplLLMozLib::startup( init_data );
-#endif // LL_LLMOZLIB_ENABLED
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmedia/llmediamanager.h b/linden/indra/llmedia/llmediamanager.h
index 0dbcc4a..ef721b2 100644
--- a/linden/indra/llmedia/llmediamanager.h
+++ b/linden/indra/llmedia/llmediamanager.h
@@ -78,6 +78,10 @@ class LLMediaManager
 	public:
 		virtual ~LLMediaManager();
 
+		// Special case early init for just web browser component
+		// so we can show login screen.  See .cpp file for details. JC
+		static void initBrowser( LLMediaManagerData* init_data );
+
 		static void initClass( LLMediaManagerData* init_data );
 		static void cleanupClass();
 		static LLMediaManager* getInstance();
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
new file mode 100644
index 0000000..ba17265
--- /dev/null
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -0,0 +1,191 @@
+# -*- cmake -*-
+
+project(llmessage)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    )
+
+set(llmessage_SOURCE_FILES
+    llares.cpp
+    llassetstorage.cpp
+    llblowfishcipher.cpp
+    llbuffer.cpp
+    llbufferstream.cpp
+    llcachename.cpp
+    llchainio.cpp
+    llcircuit.cpp
+    llclassifiedflags.cpp
+    llcurl.cpp
+    lldatapacker.cpp
+    lldispatcher.cpp
+    llfiltersd2xmlrpc.cpp
+    llhost.cpp
+    llhttpassetstorage.cpp
+    llhttpclient.cpp
+    llhttpnode.cpp
+    llhttpsender.cpp
+    llinstantmessage.cpp
+    lliobuffer.cpp
+    lliohttpserver.cpp
+    lliopipe.cpp
+    lliosocket.cpp
+    llioutil.cpp
+    llmail.cpp
+    llmessagebuilder.cpp
+    llmessageconfig.cpp
+    llmessagereader.cpp
+    llmessagetemplate.cpp
+    llmessagetemplateparser.cpp
+    llmessagethrottle.cpp
+    llmime.cpp
+    llnamevalue.cpp
+    llnullcipher.cpp
+    llpacketack.cpp
+    llpacketbuffer.cpp
+    llpacketring.cpp
+    llpartdata.cpp
+    llpumpio.cpp
+    llsdappservices.cpp
+    llsdhttpserver.cpp
+    llsdmessagebuilder.cpp
+    llsdmessagereader.cpp
+    llsdrpcclient.cpp
+    llsdrpcserver.cpp
+    llservicebuilder.cpp
+    llservice.cpp
+    lltemplatemessagebuilder.cpp
+    lltemplatemessagereader.cpp
+    llthrottle.cpp
+    lltransfermanager.cpp
+    lltransfersourceasset.cpp
+    lltransfersourcefile.cpp
+    lltransfertargetfile.cpp
+    lltransfertargetvfile.cpp
+    llurlrequest.cpp
+    lluseroperation.cpp
+    llxfer.cpp
+    llxfer_file.cpp
+    llxfermanager.cpp
+    llxfer_mem.cpp
+    llxfer_vfile.cpp
+    llxorcipher.cpp
+    message.cpp
+    message_prehash.cpp
+    message_string_table.cpp
+    net.cpp
+    network.cpp
+    partsyspacket.cpp
+    patch_code.cpp
+    patch_dct.cpp
+    patch_idct.cpp
+    )
+
+set(llmessage_HEADER_FILES
+    CMakeLists.txt
+
+    llares.h
+    llassetstorage.h
+    llblowfishcipher.h
+    llbuffer.h
+    llbufferstream.h
+    llcachename.h
+    llchainio.h
+    llcipher.h
+    llcircuit.h
+    llclassifiedflags.h
+    llcurl.h
+    lldatapacker.h
+    lldbstrings.h
+    lldispatcher.h
+    lleventflags.h
+    llfiltersd2xmlrpc.h
+    llfollowcamparams.h
+    llhost.h
+    llhttpassetstorage.h
+    llhttpclient.h
+    llhttpnode.h
+    llhttpsender.h
+    llinstantmessage.h
+    llinvite.h
+    lliobuffer.h
+    lliohttpserver.h
+    lliopipe.h
+    lliosocket.h
+    llioutil.h
+    llloginflags.h
+    llmail.h
+    llmessagebuilder.h
+    llmessageconfig.h
+    llmessagereader.h
+    llmessagetemplate.h
+    llmessagetemplateparser.h
+    llmessagethrottle.h
+    llmime.h
+    llmsgvariabletype.h
+    llnamevalue.h
+    llnullcipher.h
+    llpacketack.h
+    llpacketbuffer.h
+    llpacketring.h
+    llpartdata.h
+    llpumpio.h
+    llqueryflags.h
+    llregionflags.h
+    llregionhandle.h
+    llsdappservices.h
+    llsdhttpserver.h
+    llsdmessagebuilder.h
+    llsdmessagereader.h
+    llsdrpcclient.h
+    llsdrpcserver.h
+    llservice.h
+    llservicebuilder.h
+    lltaskname.h
+    llteleportflags.h
+    lltemplatemessagebuilder.h
+    lltemplatemessagereader.h
+    llthrottle.h
+    lltransfermanager.h
+    lltransfersourceasset.h
+    lltransfersourcefile.h
+    lltransfertargetfile.h
+    lltransfertargetvfile.h
+    llurlrequest.h
+    lluseroperation.h
+    llvehicleparams.h
+    llxfer.h
+    llxfermanager.h
+    llxfer_file.h
+    llxfer_mem.h
+    llxfer_vfile.h
+    llxorcipher.h
+    machine.h
+    mean_collision_data.h
+    message.h
+    message_prehash.h
+    net.h
+    network.h
+    partsyspacket.h
+    patch_code.h
+    patch_dct.h
+    sound_ids.h
+    )
+
+set_source_files_properties(${llmessage_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES})
+
+add_library (llmessage ${llmessage_SOURCE_FILES})
diff --git a/linden/indra/llmessage/files.lst b/linden/indra/llmessage/files.lst
deleted file mode 100644
index 690cc37..0000000
--- a/linden/indra/llmessage/files.lst
+++ /dev/null
@@ -1,71 +0,0 @@
-llmessage/llassetstorage.cpp
-llmessage/llblowfishcipher.cpp
-llmessage/llbuffer.cpp
-llmessage/llbufferstream.cpp
-llmessage/llcachename.cpp
-llmessage/llchainio.cpp
-llmessage/llcircuit.cpp
-llmessage/llclassifiedflags.cpp
-llmessage/llcurl.cpp
-llmessage/lldatapacker.cpp
-llmessage/lldispatcher.cpp
-llmessage/llfiltersd2xmlrpc.cpp
-llmessage/llhost.cpp
-llmessage/llhttpassetstorage.cpp
-llmessage/llhttpclient.cpp
-llmessage/llhttpnode.cpp
-llmessage/llhttpsender.cpp
-llmessage/llinstantmessage.cpp
-llmessage/lliobuffer.cpp
-llmessage/lliohttpserver.cpp
-llmessage/lliopipe.cpp
-llmessage/lliosocket.cpp
-llmessage/llioutil.cpp
-llmessage/llmail.cpp
-llmessage/llmessagebuilder.cpp
-llmessage/llmessageconfig.cpp
-llmessage/llmessagereader.cpp
-llmessage/llmessagetemplate.cpp
-llmessage/llmessagetemplateparser.cpp
-llmessage/llmessagethrottle.cpp
-llmessage/llmime.cpp
-llmessage/llnamevalue.cpp
-llmessage/llnullcipher.cpp
-llmessage/llpacketack.cpp
-llmessage/llpacketbuffer.cpp
-llmessage/llpacketring.cpp
-llmessage/llpartdata.cpp
-llmessage/llpumpio.cpp
-llmessage/llsdappservices.cpp
-llmessage/llsdhttpserver.cpp
-llmessage/llsdmessagereader.cpp
-llmessage/llsdmessagebuilder.cpp
-llmessage/llsdrpcclient.cpp
-llmessage/llsdrpcserver.cpp
-llmessage/llservice.cpp
-llmessage/llservicebuilder.cpp
-llmessage/lltemplatemessagebuilder.cpp
-llmessage/lltemplatemessagereader.cpp
-llmessage/llthrottle.cpp
-llmessage/lltransfermanager.cpp
-llmessage/lltransfersourceasset.cpp
-llmessage/lltransfersourcefile.cpp
-llmessage/lltransfertargetfile.cpp
-llmessage/lltransfertargetvfile.cpp
-llmessage/llurlrequest.cpp
-llmessage/lluseroperation.cpp
-llmessage/llxfer.cpp
-llmessage/llxfer_file.cpp
-llmessage/llxfermanager.cpp
-llmessage/llxfer_mem.cpp
-llmessage/llxfer_vfile.cpp
-llmessage/llxorcipher.cpp
-llmessage/message.cpp
-llmessage/message_prehash.cpp
-llmessage/message_string_table.cpp
-llmessage/net.cpp
-llmessage/network.cpp
-llmessage/partsyspacket.cpp
-llmessage/patch_code.cpp
-llmessage/patch_dct.cpp
-llmessage/patch_idct.cpp
diff --git a/linden/indra/llmessage/llares.cpp b/linden/indra/llmessage/llares.cpp
new file mode 100644
index 0000000..5a310b3
--- /dev/null
+++ b/linden/indra/llmessage/llares.cpp
@@ -0,0 +1,804 @@
+/** 
+ * @file llares.cpp
+ * @author Bryan O'Sullivan
+ * @date 2007-08-15
+ * @brief Wrapper for asynchronous DNS lookups.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include <ares_dns.h>
+#include <ares_version.h>
+
+#include "apr_portable.h"
+#include "apr_network_io.h"
+#include "apr_poll.h"
+
+#include "llapr.h"
+#include "llares.h"
+
+#if defined(LL_WINDOWS)
+# define ns_c_in 1
+# define NS_HFIXEDSZ     12      /* #/bytes of fixed data in header */
+# define NS_QFIXEDSZ     4       /* #/bytes of fixed data in query */
+# define NS_RRFIXEDSZ    10      /* #/bytes of fixed data in r record */
+#else
+# include <arpa/nameser.h>
+#endif
+
+LLAres::HostResponder::~HostResponder()
+{
+}
+
+void LLAres::HostResponder::hostResult(const hostent *ent)
+{
+	llinfos << "LLAres::HostResponder::hostResult not implemented" << llendl;
+}
+
+void LLAres::HostResponder::hostError(int code)
+{
+	llinfos << "LLAres::HostResponder::hostError " << code << ": "
+			<< LLAres::strerror(code) << llendl;
+}
+
+LLAres::NameInfoResponder::~NameInfoResponder()
+{
+}
+
+void LLAres::NameInfoResponder::nameInfoResult(const char *node,
+											   const char *service)
+{
+	llinfos << "LLAres::NameInfoResponder::nameInfoResult not implemented"
+			<< llendl;
+}
+
+void LLAres::NameInfoResponder::nameInfoError(int code)
+{
+	llinfos << "LLAres::NameInfoResponder::nameInfoError " << code << ": "
+			<< LLAres::strerror(code) << llendl;
+}
+
+LLAres::QueryResponder::~QueryResponder()
+{
+}
+
+void LLAres::QueryResponder::queryResult(const char *buf, size_t len)
+{
+	llinfos << "LLAres::QueryResponder::queryResult not implemented"
+			<< llendl;
+}
+
+void LLAres::QueryResponder::queryError(int code)
+{
+	llinfos << "LLAres::QueryResponder::queryError " << code << ": "
+			<< LLAres::strerror(code) << llendl;
+}
+
+LLAres::LLAres()
+{
+	ares_init(&chan_);
+}
+
+LLAres::~LLAres()
+{
+	ares_destroy(chan_);
+}
+
+void LLAres::cancel()
+{
+	ares_cancel(chan_);
+}
+
+static void host_callback_1_5(void *arg, int status, int timeouts,
+							  struct hostent *ent)
+{
+	LLPointer<LLAres::HostResponder> *resp =
+		(LLPointer<LLAres::HostResponder> *) arg;
+
+	if (status == ARES_SUCCESS)
+	{
+		(*resp)->hostResult(ent);
+	} else {
+		(*resp)->hostError(status);
+	}
+
+	delete resp;
+}
+
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void host_callback(void *arg, int status, struct hostent *ent)
+{
+	host_callback_1_5(arg, status, 0, ent);
+}
+#else
+# define host_callback host_callback_1_5
+#endif
+
+void LLAres::getHostByName(const char *name, HostResponder *resp,
+						   int family)
+{
+	ares_gethostbyname(chan_, name, family, host_callback,
+					   new LLPointer<LLAres::HostResponder>(resp));
+}
+	
+void LLAres::getSrvRecords(const std::string &name, SrvResponder *resp)
+{
+	search(name, RES_SRV, resp);
+}
+	
+void LLAres::rewriteURI(const std::string &uri, UriRewriteResponder *resp)
+{
+	llinfos << "Rewriting " << uri << llendl;
+
+	resp->mUri = LLURI(uri);
+	search("_" + resp->mUri.scheme() + "._tcp." + resp->mUri.hostName(),
+		   RES_SRV, resp);
+}
+
+LLQueryResponder::LLQueryResponder()
+	: LLAres::QueryResponder(),
+	  mResult(ARES_ENODATA)
+{
+}
+
+int LLQueryResponder::parseRR(const char *buf, size_t len, const char *&pos,
+							  LLPointer<LLDnsRecord> &r)
+{
+	std::string rrname;
+	size_t enclen;
+	int ret;
+
+	// RR name.
+
+	ret = LLAres::expandName(pos, buf, len, rrname, enclen);
+	if (ret != ARES_SUCCESS)
+	{
+		return ret;
+	}
+		
+	pos += enclen;
+
+	if (pos + NS_RRFIXEDSZ > buf + len)
+	{
+		return ARES_EBADRESP;
+	}
+
+	int rrtype = DNS_RR_TYPE(pos);
+	int rrclass = DNS_RR_CLASS(pos);
+	int rrttl = DNS_RR_TTL(pos);
+	int rrlen = DNS_RR_LEN(pos);
+		
+	if (rrclass != ns_c_in)
+	{
+		return ARES_EBADRESP;
+	}
+
+	pos += NS_RRFIXEDSZ;
+
+	if (pos + rrlen > buf + len)
+	{
+		return ARES_EBADRESP;
+	}
+
+	switch (rrtype)
+	{
+	case RES_A:
+		r = new LLARecord(rrname, rrttl);
+		break;
+	case RES_NS:
+		r = new LLNsRecord(rrname, rrttl);
+		break;
+	case RES_CNAME:
+		r = new LLCnameRecord(rrname, rrttl);
+		break;
+	case RES_PTR:
+		r = new LLPtrRecord(rrname, rrttl);
+		break;
+	case RES_AAAA:
+		r = new LLAaaaRecord(rrname, rrttl);
+		break;
+	case RES_SRV:
+		r = new LLSrvRecord(rrname, rrttl);
+		break;
+	default:
+		llinfos << "LLQueryResponder::parseRR got unknown RR type " << rrtype
+				<< llendl;
+		return ARES_EBADRESP;
+	}
+
+	ret = r->parse(buf, len, pos, rrlen);
+
+	if (ret == ARES_SUCCESS)
+	{
+		pos += rrlen;
+	} else {
+		r = NULL;
+	}
+		
+	return ret;
+}
+
+int LLQueryResponder::parseSection(const char *buf, size_t len,
+								   size_t count, const char *&pos,
+								   dns_rrs_t &rrs)
+{
+	int ret = ARES_SUCCESS;
+	
+	for (size_t i = 0; i < count; i++)
+	{
+		LLPointer<LLDnsRecord> r;
+		ret = parseRR(buf, len, pos, r);
+		if (ret != ARES_SUCCESS)
+		{
+			break;
+		}
+		rrs.push_back(r);
+	}
+
+	return ret;
+}
+
+void LLQueryResponder::queryResult(const char *buf, size_t len)
+{
+	const char *pos = buf;
+	int qdcount = DNS_HEADER_QDCOUNT(pos);
+	int ancount = DNS_HEADER_ANCOUNT(pos);
+	int nscount = DNS_HEADER_NSCOUNT(pos);
+	int arcount = DNS_HEADER_ARCOUNT(pos);
+	int ret;
+
+	if (qdcount == 0 || ancount + nscount + arcount == 0)
+	{
+		ret = ARES_ENODATA;
+		goto bail;
+	}
+
+	pos += NS_HFIXEDSZ;
+
+	for (int i = 0; i < qdcount; i++)
+	{
+		std::string ignore;
+		size_t enclen;
+
+		ret = LLAres::expandName(pos, buf, len, i == 0 ? mQuery : ignore,
+								 enclen);
+		if (ret != ARES_SUCCESS)
+		{
+			goto bail;
+		}
+
+		pos += enclen;
+
+		if (i == 0)
+		{
+			int t = DNS_QUESTION_TYPE(pos);
+			switch (t)
+			{
+			case RES_A:
+			case RES_NS:
+			case RES_CNAME:
+			case RES_PTR:
+			case RES_AAAA:
+			case RES_SRV:
+				mType = (LLResType) t;
+				break;
+			default:
+				llinfos << "Cannot grok query type " << t << llendl;
+				ret = ARES_EBADQUERY;
+				goto bail;
+			}
+		}
+
+		pos += NS_QFIXEDSZ;
+		if (pos > buf + len)
+		{
+			ret = ARES_EBADRESP;
+			goto bail;
+		}
+	}
+	
+	ret = parseSection(buf, len, ancount, pos, mAnswers);
+	if (ret != ARES_SUCCESS)
+	{
+		goto bail;
+	}
+
+	ret = parseSection(buf, len, nscount, pos, mAuthorities);
+	if (ret != ARES_SUCCESS)
+	{
+		goto bail;
+	}
+
+	ret = parseSection(buf, len, arcount, pos, mAdditional);
+
+bail:
+	mResult = ret;
+	if (mResult == ARES_SUCCESS)
+	{
+		querySuccess();
+	} else {
+		queryError(mResult);
+	}
+}
+
+void LLQueryResponder::querySuccess()
+{
+	llinfos << "LLQueryResponder::queryResult not implemented" << llendl;
+}
+
+void LLAres::SrvResponder::querySuccess()
+{
+	if (mType == RES_SRV)
+	{
+		srvResult(mAnswers);
+	} else {
+		srvError(ARES_EBADRESP);
+	}
+}
+
+void LLAres::SrvResponder::queryError(int code)
+{
+	srvError(code);
+}
+
+void LLAres::SrvResponder::srvResult(const dns_rrs_t &ents)
+{
+	llinfos << "LLAres::SrvResponder::srvResult not implemented" << llendl;
+
+	for (size_t i = 0; i < ents.size(); i++)
+	{
+		const LLSrvRecord *s = (const LLSrvRecord *) ents[i].get();
+
+		llinfos << "[" << i << "] " << s->host() << ":" << s->port()
+				<< " priority " << s->priority()
+				<< " weight " << s->weight()
+				<< llendl;
+	}
+}
+
+void LLAres::SrvResponder::srvError(int code)
+{
+	llinfos << "LLAres::SrvResponder::srvError " << code << ": "
+			<< LLAres::strerror(code) << llendl;
+}
+
+static void nameinfo_callback_1_5(void *arg, int status, int timeouts,
+								  char *node, char *service)
+{
+	LLPointer<LLAres::NameInfoResponder> *resp =
+		(LLPointer<LLAres::NameInfoResponder> *) arg;
+
+	if (status == ARES_SUCCESS)
+	{
+		(*resp)->nameInfoResult(node, service);
+	} else {
+		(*resp)->nameInfoError(status);
+	}
+
+	delete resp;
+}
+
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void nameinfo_callback(void *arg, int status, char *node, char *service)
+{
+	nameinfo_callback_1_5(arg, status, 0, node, service);
+}
+#else
+# define nameinfo_callback nameinfo_callback_1_5
+#endif
+
+void LLAres::getNameInfo(const struct sockaddr &sa, socklen_t salen, int flags,
+						 NameInfoResponder *resp)
+{
+	ares_getnameinfo(chan_, &sa, salen, flags, nameinfo_callback,
+					 new LLPointer<NameInfoResponder>(resp));
+}
+
+static void search_callback_1_5(void *arg, int status, int timeouts,
+								unsigned char *abuf, int alen)
+{
+	LLPointer<LLAres::QueryResponder> *resp =
+		(LLPointer<LLAres::QueryResponder> *) arg;
+
+	if (status == ARES_SUCCESS)
+	{
+		(*resp)->queryResult((const char *) abuf, alen);
+	} else {
+		(*resp)->queryError(status);
+	}
+
+	delete resp;
+}
+
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void search_callback(void *arg, int status, unsigned char *abuf,
+							int alen)
+{
+	search_callback_1_5(arg, status, 0, abuf, alen);
+}
+#else
+# define search_callback search_callback_1_5
+#endif
+
+void LLAres::search(const std::string &query, LLResType type,
+					QueryResponder *resp)
+{
+	ares_search(chan_, query.c_str(), ns_c_in, type, search_callback,
+				new LLPointer<QueryResponder>(resp));
+}
+
+bool LLAres::process(U64 timeout)
+{
+	if (!gAPRPoolp)
+	{
+		ll_init_apr();
+	}
+
+	int socks[ARES_GETSOCK_MAXNUM];
+	apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM];
+	apr_int32_t nsds = 0;
+	apr_status_t status;
+	apr_pool_t *pool;
+	int nactive = 0;
+	int bitmask;
+
+	bitmask = ares_getsock(chan_, socks, ARES_GETSOCK_MAXNUM);
+
+	if (bitmask == 0)
+	{
+		goto bail;
+	}
+
+	status = apr_pool_create(&pool, gAPRPoolp);
+	ll_apr_assert_status(status);
+
+	for (int i = 0; i < ARES_GETSOCK_MAXNUM; i++)
+	{
+		if (ARES_GETSOCK_READABLE(bitmask, i))
+		{
+			aprFds[nactive].reqevents = APR_POLLIN | APR_POLLERR;
+		}
+		else if (ARES_GETSOCK_WRITABLE(bitmask, i))
+		{
+			aprFds[nactive].reqevents = APR_POLLOUT | APR_POLLERR;
+		} else {
+			continue;
+		}
+
+		apr_socket_t *aprSock = NULL;
+
+		status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool);
+		if (status != APR_SUCCESS)
+		{
+			ll_apr_warn_status(status);
+			goto bail_pool;
+		}
+
+		aprFds[nactive].desc.s = aprSock;
+		aprFds[nactive].desc_type = APR_POLL_SOCKET;
+		aprFds[nactive].p = pool;
+		aprFds[nactive].rtnevents = 0;
+		aprFds[nactive].client_data = &socks[i];
+
+		nactive++;
+	}
+
+	if (nactive > 0)
+	{
+		status = apr_poll(aprFds, nactive, &nsds, timeout);
+
+		if (status != APR_SUCCESS && status != APR_TIMEUP)
+		{
+			ll_apr_warn_status(status);
+		}
+
+		for (int i = 0; i < nactive; i++)
+		{
+			int evts = aprFds[i].rtnevents;
+			int ifd = (evts & (APR_POLLIN | APR_POLLERR))
+				? *((int *) aprFds[i].client_data) : ARES_SOCKET_BAD;
+			int ofd = (evts & (APR_POLLOUT | APR_POLLERR))
+				? *((int *) aprFds[i].client_data) : ARES_SOCKET_BAD;
+					
+			ares_process_fd(chan_, ifd, ofd);
+		}
+	}
+
+bail_pool:
+	apr_pool_destroy(pool);
+
+bail:
+	return nsds > 0;
+}
+
+bool LLAres::processAll()
+{
+	bool anyProcessed = false, ret;
+
+	do {
+		timeval tv;
+
+		ret = ares_timeout(chan_, NULL, &tv) != NULL;
+
+		if (ret)
+		{
+			ret = process(tv.tv_sec * 1000000LL + tv.tv_usec);
+			anyProcessed |= ret;
+		}
+	} while (ret);
+
+	return anyProcessed;
+}
+
+int LLAres::expandName(const char *encoded, const char *abuf, size_t alen,
+					   std::string &s, size_t &enclen)
+{
+	char *t;
+	int ret;
+	long e;
+	
+	ret = ares_expand_name((const unsigned char *) encoded,
+						   (const unsigned char *) abuf, alen, &t, &e);
+	if (ret == ARES_SUCCESS)
+	{
+		s.assign(t);
+		enclen = e;
+		ares_free_string(t);
+	}
+	return ret;
+}
+
+const char *LLAres::strerror(int code)
+{
+	return ares_strerror(code);
+}
+
+LLAres *gAres;
+
+LLAres *ll_init_ares()
+{
+	if (gAres == NULL)
+	{
+		gAres = new LLAres();
+	}
+	return gAres;
+}
+
+LLDnsRecord::LLDnsRecord(LLResType type, const std::string &name,
+						 unsigned ttl)
+	: LLRefCount(),
+	  mType(type),
+	  mName(name),
+	  mTTL(ttl)
+{
+}
+
+LLHostRecord::LLHostRecord(LLResType type, const std::string &name,
+						   unsigned ttl)
+	: LLDnsRecord(type, name, ttl)
+{
+}
+
+int LLHostRecord::parse(const char *buf, size_t len, const char *pos,
+						size_t rrlen)
+{
+	int ret;
+
+	ret = LLAres::expandName(pos, buf, len, mHost);
+	if (ret != ARES_SUCCESS)
+	{
+		goto bail;
+	}
+	
+	ret = ARES_SUCCESS;
+
+bail:
+	return ret;
+}
+
+LLCnameRecord::LLCnameRecord(const std::string &name, unsigned ttl)
+	: LLHostRecord(RES_CNAME, name, ttl)
+{
+}
+
+LLPtrRecord::LLPtrRecord(const std::string &name, unsigned ttl)
+	: LLHostRecord(RES_PTR, name, ttl)
+{
+}
+
+LLAddrRecord::LLAddrRecord(LLResType type, const std::string &name,
+						   unsigned ttl)
+	: LLDnsRecord(type, name, ttl)
+{
+}
+
+LLARecord::LLARecord(const std::string &name, unsigned ttl)
+	: LLAddrRecord(RES_A, name, ttl)
+{
+}
+
+int LLARecord::parse(const char *buf, size_t len, const char *pos,
+					 size_t rrlen)
+{
+	int ret;
+
+	if (rrlen != sizeof(mSA.sin.sin_addr.s_addr))
+	{
+		ret = ARES_EBADRESP;
+		goto bail;
+	}
+	
+	memset(&mSA, 0, sizeof(mSA));
+	memcpy(&mSA.sin.sin_addr.s_addr, pos, rrlen);
+	mSA.sin.sin_family = AF_INET6;
+	mSize = sizeof(mSA.sin);
+	
+	ret = ARES_SUCCESS;
+
+bail:
+	return ret;
+}
+
+LLAaaaRecord::LLAaaaRecord(const std::string &name, unsigned ttl)
+	: LLAddrRecord(RES_AAAA, name, ttl)
+{
+}
+
+int LLAaaaRecord::parse(const char *buf, size_t len, const char *pos,
+						size_t rrlen)
+{
+	int ret;
+
+	if (rrlen != sizeof(mSA.sin6.sin6_addr))
+	{
+		ret = ARES_EBADRESP;
+		goto bail;
+	}
+	
+	memset(&mSA, 0, sizeof(mSA));
+	memcpy(&mSA.sin6.sin6_addr.s6_addr, pos, rrlen);
+	mSA.sin6.sin6_family = AF_INET6;
+	mSize = sizeof(mSA.sin6);
+	
+	ret = ARES_SUCCESS;
+
+bail:
+	return ret;
+}
+
+LLSrvRecord::LLSrvRecord(const std::string &name, unsigned ttl)
+	: LLHostRecord(RES_SRV, name, ttl)
+{
+}
+
+int LLSrvRecord::parse(const char *buf, size_t len, const char *pos,
+					   size_t rrlen)
+{
+	int ret;
+
+	if (rrlen < 6)
+	{
+		ret = ARES_EBADRESP;
+		goto bail;
+	}
+
+	memcpy(&mPriority, pos, 2);
+	memcpy(&mWeight, pos + 2, 2);
+	memcpy(&mPort, pos + 4, 2);
+
+	mPriority = ntohs(mPriority);
+	mWeight = ntohs(mWeight);
+	mPort = ntohs(mPort);
+
+	ret = LLHostRecord::parse(buf, len, pos + 6, rrlen - 6);
+	
+bail:
+	return ret;
+}
+
+LLNsRecord::LLNsRecord(const std::string &name, unsigned ttl)
+	: LLHostRecord(RES_NS, name, ttl)
+{
+}
+
+void LLAres::UriRewriteResponder::queryError(int code)
+{
+	std::vector<std::string> uris;
+	uris.push_back(mUri.asString());
+	rewriteResult(uris);
+}
+
+void LLAres::UriRewriteResponder::querySuccess()
+{
+	std::vector<std::string> uris;
+
+	if (mType != RES_SRV)
+	{
+		goto bail;
+	}
+		
+	for (size_t i = 0; i < mAnswers.size(); i++)
+	{
+		const LLSrvRecord *r = (const LLSrvRecord *) mAnswers[i].get();
+
+		if (r->type() == RES_SRV)
+		{
+			// Check the domain in the response to ensure that it's
+			// the same as the domain in the request, so that bad guys
+			// can't forge responses that point to their own login
+			// servers with their own certificates.
+
+			// Hard-coding the domain to check here is a bit of a
+			// hack.  Hoist it to an outer caller if anyone ever needs
+			// this functionality on other domains.
+
+			static const std::string domain(".lindenlab.com");
+			const std::string &host = r->host();
+
+			std::string::size_type s = host.find(domain) + domain.length();
+				
+			if (s != host.length() && s != host.length() - 1)
+			{
+				continue;
+			}
+			
+			LLURI uri(mUri.scheme(),
+					  mUri.userName(),
+					  mUri.password(),
+					  r->host(),
+					  mUri.defaultPort() ? r->port() : mUri.hostPort(),
+					  mUri.escapedPath(),
+					  mUri.escapedQuery());
+			uris.push_back(uri.asString());
+		}
+	}
+
+	if (!uris.empty())
+	{
+		goto done;
+	}
+
+bail:
+	uris.push_back(mUri.asString());
+
+done:
+	rewriteResult(uris);
+}
+
+void LLAres::UriRewriteResponder::rewriteResult(
+	const std::vector<std::string> &uris)
+{
+	llinfos << "LLAres::UriRewriteResponder::rewriteResult not implemented"
+			<< llendl;
+
+	for (size_t i = 0; i < uris.size(); i++)
+	{
+		llinfos << "[" << i << "] " << uris[i] << llendl;
+	}
+}
diff --git a/linden/indra/llmessage/llares.h b/linden/indra/llmessage/llares.h
new file mode 100644
index 0000000..5d72170
--- /dev/null
+++ b/linden/indra/llmessage/llares.h
@@ -0,0 +1,572 @@
+/** 
+ * @file llares.h
+ * @author Bryan O'Sullivan
+ * @date 2007-08-15
+ * @brief Wrapper for asynchronous DNS lookups.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLARES_H
+#define LL_LLARES_H
+
+#ifdef LL_WINDOWS
+# include <ws2tcpip.h>
+#endif
+
+#ifdef LL_STANDALONE
+# include <ares.h>
+#else
+# include <ares/ares.h>
+#endif
+
+#include "llmemory.h"
+#include "lluri.h"
+
+class LLQueryResponder;
+
+/**
+ * @brief Supported DNS RR types.
+ */
+enum LLResType
+{
+	RES_INVALID = 0,			/**< Cookie. */
+	RES_A = 1,					/**< "A" record. IPv4 address. */
+	RES_NS = 2,					/**< "NS" record. Authoritative server. */
+	RES_CNAME = 5,				/**< "CNAME" record. Canonical name. */
+	RES_PTR = 12,				/**< "PTR" record. Domain name pointer. */
+	RES_AAAA = 28,				/**< "AAAA" record. IPv6 Address. */
+	RES_SRV = 33,				/**< "SRV" record. Server Selection. */
+	RES_MAX = 65536				/**< Sentinel; RR types are 16 bits wide. */
+};
+
+/**
+ * @class LLDnsRecord
+ * @brief Base class for all DNS RR types.
+ */
+class LLDnsRecord : public LLRefCount
+{
+protected:
+	friend class LLQueryResponder;
+
+	LLResType mType;
+	std::string mName;
+	unsigned mTTL;
+	
+	virtual int parse(const char *buf, size_t len, const char *pos,
+					  size_t rrlen) = 0;
+
+	LLDnsRecord(LLResType type, const std::string &name, unsigned ttl);
+	
+public:
+	/**
+	 * @brief Record name.
+	 */
+	const std::string &name() const { return mName; }
+
+	/**
+	 * @brief Time-to-live value, in seconds.
+	 */
+	unsigned ttl() const { return mTTL; }
+
+	/**
+	 * @brief RR type.
+	 */
+	LLResType type() const { return mType; }
+};
+
+/**
+ * @class LLAddrRecord
+ * @brief Base class for address-related RRs.
+ */
+class LLAddrRecord : public LLDnsRecord
+{
+protected:
+	friend class LLQueryResponder;
+
+	LLAddrRecord(LLResType type, const std::string &name, unsigned ttl);
+
+	union 
+	{
+		sockaddr sa;
+		sockaddr_in sin;
+		sockaddr_in6 sin6;
+	} mSA;
+
+	socklen_t mSize;
+
+public:
+	/**
+	 * @brief Generic socket address.
+	 */
+	const sockaddr &addr() const { return mSA.sa; }
+
+	/**
+	 * @brief Size of the socket structure.
+	 */
+	socklen_t size() const { return mSize; }
+};
+
+/**
+ * @class LLARecord
+ * @brief A RR, for IPv4 addresses.
+ */
+class LLARecord : public LLAddrRecord
+{
+protected:
+	friend class LLQueryResponder;
+
+	LLARecord(const std::string &name, unsigned ttl);
+
+	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+public:
+	/**
+	 * @brief Socket address.
+	 */
+	const sockaddr_in &addr_in() const { return mSA.sin; }
+};
+
+/**
+ * @class LLAaaaRecord
+ * @brief AAAA RR, for IPv6 addresses.
+ */
+class LLAaaaRecord : public LLAddrRecord
+{
+protected:
+	friend class LLQueryResponder;
+
+	LLAaaaRecord(const std::string &name, unsigned ttl);
+
+	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+public:
+	/**
+	 * @brief Socket address.
+	 */
+	const sockaddr_in6 &addr_in6() const { return mSA.sin6; }
+};
+	
+/**
+ * @class LLHostRecord
+ * @brief Base class for host-related RRs.
+ */
+class LLHostRecord : public LLDnsRecord
+{
+protected:
+	LLHostRecord(LLResType type, const std::string &name, unsigned ttl);
+
+	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+	std::string mHost;
+
+public:
+	/**
+	 * @brief Host name.
+	 */
+	const std::string &host() const { return mHost; }
+};
+	
+/**
+ * @class LLCnameRecord
+ * @brief CNAME RR.
+ */
+class LLCnameRecord : public LLHostRecord
+{
+protected:
+	friend class LLQueryResponder;
+
+	LLCnameRecord(const std::string &name, unsigned ttl);
+};
+	
+/**
+ * @class LLPtrRecord
+ * @brief PTR RR.
+ */
+class LLPtrRecord : public LLHostRecord
+{
+protected:
+	friend class LLQueryResponder;
+
+	LLPtrRecord(const std::string &name, unsigned ttl);
+};
+
+/**
+ * @class LLSrvRecord
+ * @brief SRV RR.
+ */
+class LLSrvRecord : public LLHostRecord
+{
+protected:
+	U16 mPriority;
+	U16 mWeight;
+	U16 mPort;
+
+	int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+public:
+	LLSrvRecord(const std::string &name, unsigned ttl);
+
+	/**
+	 * @brief Service priority.
+	 */
+	U16 priority() const { return mPriority; }
+
+	/**
+	 * @brief Service weight.
+	 */
+	U16 weight() const { return mWeight; }
+
+	/**
+	 * @brief Port number of service.
+	 */
+	U16 port() const { return mPort; }
+
+	/**
+	 * @brief Functor for sorting SRV records by priority.
+	 */
+	struct ComparePriorityLowest
+	{
+		bool operator()(const LLSrvRecord& lhs, const LLSrvRecord& rhs)
+		{
+			return lhs.mPriority < rhs.mPriority;
+		}
+	};
+};
+	
+/**
+ * @class LLNsRecord
+ * @brief NS RR.
+ */
+class LLNsRecord : public LLHostRecord
+{
+public:
+	LLNsRecord(const std::string &name, unsigned ttl);
+};
+
+class LLQueryResponder;
+
+/**
+ * @class LLAres
+ * @brief Asynchronous address resolver.
+ */
+class LLAres
+{
+public:
+    /**
+	 * @class HostResponder
+	 * @brief Base class for responding to hostname lookups.
+	 * @see LLAres::getHostByName
+	 */
+	class HostResponder : public LLRefCount
+	{
+	public:
+		virtual ~HostResponder();
+
+		virtual void hostResult(const hostent *ent);
+		virtual void hostError(int code);
+	};
+
+    /**
+	 * @class NameInfoResponder
+	 * @brief Base class for responding to address lookups.
+	 * @see LLAres::getNameInfo
+	 */
+	class NameInfoResponder : public LLRefCount
+	{
+	public:
+		virtual ~NameInfoResponder();
+
+		virtual void nameInfoResult(const char *node, const char *service);
+		virtual void nameInfoError(int code);
+	};
+
+    /**
+	 * @class QueryResponder
+	 * @brief Base class for responding to custom searches.
+	 * @see LLAres::search
+	 */
+	class QueryResponder : public LLRefCount
+	{
+	public:
+		virtual ~QueryResponder();
+
+		virtual void queryResult(const char *buf, size_t len);
+		virtual void queryError(int code);
+	};
+
+	class SrvResponder;
+	class UriRewriteResponder;
+		
+	LLAres();
+
+	~LLAres();
+
+	/**
+	 * Cancel all outstanding requests.  The error methods of the
+	 * corresponding responders will be called, with ARES_ETIMEOUT.
+	 */
+	void cancel();
+	
+	/**
+	 * Look up the address of a host.
+	 *
+	 * @param name name of host to look up
+	 * @param resp responder to call with result
+	 * @param family AF_INET for IPv4 addresses, AF_INET6 for IPv6
+	 */
+	void getHostByName(const std::string &name, HostResponder *resp,
+					   int family = AF_INET) {
+		getHostByName(name.c_str(), resp, family);
+	}
+
+	/**
+	 * Look up the address of a host.
+	 *
+	 * @param name name of host to look up
+	 * @param resp responder to call with result
+	 * @param family AF_INET for IPv4 addresses, AF_INET6 for IPv6
+	 */
+	void getHostByName(const char *name, HostResponder *resp,
+					   int family = PF_INET);
+
+	/**
+	 * Look up the name associated with a socket address.
+	 *
+	 * @param sa socket address to look up
+	 * @param salen size of socket address
+	 * @param flags flags to use
+	 * @param resp responder to call with result
+	 */
+	void getNameInfo(const struct sockaddr &sa, socklen_t salen, int flags,
+					 NameInfoResponder *resp);
+
+	/**
+	 * Look up SRV (service location) records for a service name.
+	 *
+	 * @param name service name (e.g. "_https._tcp.login.agni.lindenlab.com")
+	 * @param resp responder to call with result
+	 */
+	void getSrvRecords(const std::string &name, SrvResponder *resp);
+
+	/**
+	 * Rewrite a URI, using SRV (service location) records for its
+	 * protocol if available.  If no SRV records are published, the
+	 * existing URI is handed to the responder.
+	 *
+	 * @param uri URI to rewrite
+	 * @param resp responder to call with result
+	 */
+	void rewriteURI(const std::string &uri,
+					UriRewriteResponder *resp);
+
+	/**
+	 * Start a custom search.
+	 *
+	 * @param query query to make
+	 * @param type type of query to perform
+	 * @param resp responder to call with result
+	 */
+	void search(const std::string &query, LLResType type,
+				QueryResponder *resp);
+
+	/**
+	 * Process any outstanding queries.  This method takes an optional
+	 * timeout parameter (specified in microseconds).  If provided, it
+	 * will block the calling thread for that length of time to await
+	 * possible responses. A timeout of zero will return immediately
+	 * if there are no responses or timeouts to process.
+	 *
+	 * @param timeoutUsecs number of microseconds to block before timing out
+	 * @return whether any responses were processed
+	 */
+	bool process(U64 timeoutUsecs = 0);
+
+	/**
+	 * Process all outstanding queries, blocking the calling thread
+	 * until all have either been responded to or timed out.
+	 *
+	 * @return whether any responses were processed
+	 */
+	bool processAll();
+	
+	/**
+	 * Expand a DNS-encoded compressed string into a normal string.
+	 *
+	 * @param encoded the encoded name (null-terminated)
+	 * @param abuf the response buffer in which the string is embedded
+	 * @param alen the length of the response buffer
+	 * @param s the string into which to place the result
+	 * @return ARES_SUCCESS on success, otherwise an error indicator
+	 */
+	static int expandName(const char *encoded, const char *abuf, size_t alen,
+						  std::string &s) {
+		size_t ignore;
+		return expandName(encoded, abuf, alen, s, ignore);
+	}
+	
+	static int expandName(const char *encoded, const char *abuf, size_t alen,
+						  std::string &s, size_t &enclen);
+
+	/**
+	 * Return a string describing an error code.
+	 */
+	static const char *strerror(int code);
+
+protected:
+	ares_channel chan_;
+
+};
+	
+/**
+ * An ordered collection of DNS resource records.
+ */
+typedef std::vector<LLPointer<LLDnsRecord> > dns_rrs_t;
+
+/**
+ * @class LLQueryResponder
+ * @brief Base class for friendly handling of DNS query responses.
+ *
+ * This class parses a DNS response and represents it in a friendly
+ * manner.
+ *
+ * @see LLDnsRecord
+ * @see LLARecord
+ * @see LLNsRecord
+ * @see LLCnameRecord
+ * @see LLPtrRecord
+ * @see LLAaaaRecord
+ * @see LLSrvRecord
+ */
+class LLQueryResponder : public LLAres::QueryResponder
+{
+protected:
+	int mResult;
+	std::string mQuery;
+	LLResType mType;
+	
+	dns_rrs_t mAnswers;
+	dns_rrs_t mAuthorities;
+	dns_rrs_t mAdditional;
+
+	/**
+	 * Parse a single RR.
+	 */
+	int parseRR(const char *buf, size_t len, const char *&pos,
+				LLPointer<LLDnsRecord> &r);
+	/**
+	 * Parse one section of a response.
+	 */
+	int parseSection(const char *buf, size_t len,
+					 size_t count, const char *& pos, dns_rrs_t &rrs);
+
+	void queryResult(const char *buf, size_t len);
+	virtual void querySuccess();
+
+public:
+	LLQueryResponder();
+
+	/**
+	 * Indicate whether the response could be parsed successfully.
+	 */
+	bool valid() const { return mResult == ARES_SUCCESS; }
+
+	/**
+	 * The more detailed result of parsing the response.
+	 */
+	int result() const { return mResult; }
+	
+	/**
+	 * Return the query embedded in the response.
+	 */
+	const std::string &query() const { return mQuery; }
+
+	/**
+	 * Return the contents of the "answers" section of the response.
+	 */
+	const dns_rrs_t &answers() const { return mAnswers; }
+
+	/**
+	 * Return the contents of the "authorities" section of the
+	 * response.
+	 */
+	const dns_rrs_t &authorities() const { return mAuthorities; }
+
+	/**
+	 * Return the contents of the "additional records" section of the
+	 * response.
+	 */
+	const dns_rrs_t &additional() const { return mAdditional; }
+};
+
+/**
+ * @class LLAres::SrvResponder
+ * @brief Class for handling SRV query responses.
+ */
+class LLAres::SrvResponder : public LLQueryResponder
+{
+public:
+	friend void LLAres::getSrvRecords(const std::string &name,
+									  SrvResponder *resp);
+	void querySuccess();
+	void queryError(int code);
+
+	virtual void srvResult(const dns_rrs_t &ents);
+	virtual void srvError(int code);
+};
+
+/**
+ * @class LLAres::UriRewriteResponder
+ * @brief Class for handling URI rewrites based on SRV records.
+ */
+class LLAres::UriRewriteResponder : public LLQueryResponder
+{
+protected:
+	LLURI mUri;
+
+public:
+	friend void LLAres::rewriteURI(const std::string &uri,
+								   UriRewriteResponder *resp);
+	void querySuccess();
+	void queryError(int code);
+
+	virtual void rewriteResult(const std::vector<std::string> &uris);
+};
+	
+/**
+ * Singleton responder.
+ */
+extern LLAres *gAres;
+
+/**
+ * Set up the singleton responder.  It's safe to call this more than
+ * once from within a single thread, but this function is not
+ * thread safe.
+ */
+extern LLAres *ll_init_ares();
+
+#endif // LL_LLARES_H
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index a6077e5..fa14a2b 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -42,6 +42,7 @@
 #include "llstring.h"
 #include "lldir.h"
 #include "llsd.h"
+#include "llframetimer.h"
 
 // this library includes
 #include "message.h"
@@ -58,7 +59,10 @@
 LLAssetStorage *gAssetStorage = NULL;
 LLMetrics *LLAssetStorage::metric_recipient = NULL;
 
-const LLUUID CATEGORIZE_LOST_AND_FOUND_ID("00000000-0000-0000-0000-000000000010");
+const LLUUID CATEGORIZE_LOST_AND_FOUND_ID(std::string("00000000-0000-0000-0000-000000000010"));
+
+const U64 TOXIC_ASSET_LIFETIME = (120 * 1000000);		// microseconds
+
 
 ///----------------------------------------------------------------------------
 /// LLAssetInfo
@@ -133,20 +137,20 @@ void LLAssetInfo::setFromNameValue( const LLNameValue& nv )
 	str.assign( nv.mName );
 	pos1 = str.find('|');
 	buf.assign( str, 0, pos1++ );
-	mType = LLAssetType::lookup( buf.c_str() );
+	mType = LLAssetType::lookup( buf );
 	buf.assign( str, pos1, std::string::npos );
-	mUuid.set( buf.c_str() );
+	mUuid.set( buf );
 
 	// convert the value to useful information
 	str.assign( nv.getAsset() );
 	pos1 = str.find('|');
 	buf.assign( str, 0, pos1++ );
-	mCreatorID.set( buf.c_str() );
+	mCreatorID.set( buf );
 	pos2 = str.find( '|', pos1 );
 	buf.assign( str, pos1, (pos2++) - pos1 );
-	setName( buf.c_str() );
+	setName( buf );
 	buf.assign( str, pos2, std::string::npos );
-	setDescription( buf.c_str() );
+	setDescription( buf );
 	llinfos << "uuid: " << mUuid << llendl;
 	llinfos << "creator: " << mCreatorID << llendl;
 }
@@ -314,6 +318,9 @@ LLAssetStorage::~LLAssetStorage()
 		// unregister our callbacks with the message system
 		gMessageSystem->setHandlerFuncFast(_PREHASH_AssetUploadComplete, NULL, NULL);
 	}
+
+	// Clear the toxic asset map
+	mToxicAssetMap.clear();
 }
 
 void LLAssetStorage::setUpstream(const LLHost &upstream_host)
@@ -1231,16 +1238,20 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo
 void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 status, LLExtStat ext_status)
 {
 	LLLegacyAssetRequest *legacy = (LLLegacyAssetRequest *)user_data;
-	char filename[LL_MAX_PATH] = "";	/* Flawfinder: ignore */ 
+	std::string filename;
+
+	// Check if the asset is marked toxic, and don't load bad stuff
+	BOOL toxic = gAssetStorage->isAssetToxic( uuid );
 
-	if (! status)
+	if ( !status
+		&& !toxic )
 	{
 		LLVFile file(vfs, uuid, type);
 
-		char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */ 
+		std::string uuid_str;
 
 		uuid.toString(uuid_str);
-		snprintf(filename,sizeof(filename),"%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));	/* Flawfinder: ignore */
+		filename = llformat("%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));
 
 		LLFILE* fp = LLFile::fopen(filename, "wb");	/* Flawfinder: ignore */ 
 		if (fp)
@@ -1264,7 +1275,7 @@ void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAss
 		}
 	}
 
-	legacy->mDownCallback(filename, uuid, legacy->mUserData, status, ext_status);
+	legacy->mDownCallback(filename.c_str(), uuid, legacy->mUserData, status, ext_status);
 	delete legacy;
 }
 
@@ -1283,7 +1294,7 @@ void LLAssetStorage::storeAssetData(
 {
 	llwarns << "storeAssetData: wrong version called" << llendl;
 	// LLAssetStorage metric: Virtual base call
-	reportMetric( LLUUID::null, asset_type, NULL, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 1" );
+	reportMetric( LLUUID::null, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 1" );
 }
 
 // virtual
@@ -1302,13 +1313,13 @@ void LLAssetStorage::storeAssetData(
 {
 	llwarns << "storeAssetData: wrong version called" << llendl;
 	// LLAssetStorage metric: Virtual base call
-	reportMetric( asset_id, asset_type, NULL, requesting_agent_id, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 2" );
+	reportMetric( asset_id, asset_type, LLStringUtil::null, requesting_agent_id, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 2" );
 }
 
 // virtual
 // this does nothing, viewer and sim both override this.
 void LLAssetStorage::storeAssetData(
-	const char* filename,
+	const std::string& filename,
 	const LLUUID& asset_id,
 	LLAssetType::EType asset_type,
 	LLStoreAssetCallback callback,
@@ -1320,13 +1331,13 @@ void LLAssetStorage::storeAssetData(
 {
 	llwarns << "storeAssetData: wrong version called" << llendl;
 	// LLAssetStorage metric: Virtual base call
-	reportMetric( asset_id, asset_type, NULL, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 3" );
+	reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 3" );
 }
 
 // virtual
 // this does nothing, viewer and sim both override this.
 void LLAssetStorage::storeAssetData(
-	const char* filename,
+	const std::string& filename,
 	const LLTransactionID &transactoin_id,
 	LLAssetType::EType asset_type,
 	LLStoreAssetCallback callback,
@@ -1338,7 +1349,7 @@ void LLAssetStorage::storeAssetData(
 {
 	llwarns << "storeAssetData: wrong version called" << llendl;
 	// LLAssetStorage metric: Virtual base call
-	reportMetric( LLUUID::null, asset_type, NULL, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 4" );
+	reportMetric( LLUUID::null, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 4" );
 }
 
 // static
@@ -1385,9 +1396,9 @@ void LLAssetStorage::clearTempAssetData()
 { }
 
 // static
-void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const char *filename,
+void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const std::string& in_filename,
 								   const LLUUID& agent_id, S32 asset_size, EMetricResult result,
-								   const char *file, const S32 line, const char *message )
+								   const char *file, const S32 line, const std::string& in_message )
 {
 	if( !metric_recipient )
 	{
@@ -1395,18 +1406,13 @@ void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::ET
 		return;
 	}
 
-	filename = filename ? filename : "";
-	file = file ? file : "";
-
-	// Create revised message - message = "message :: file:line"
-	std::string new_message; //( message );
-	new_message = message; // << " " << file << " " << line;
-	new_message += " :: ";
-	new_message += filename;
-	char line_string[16];
-	sprintf( line_string, ":%d", line );
-	new_message += line_string;
-	message = new_message.c_str();
+	std::string filename(in_filename);
+	if (filename.empty())
+		filename = ll_safe_string(file);
+	
+	// Create revised message - new_message = "in_message :: file:line"
+	std::stringstream new_message;
+	new_message << in_message << " :: " << filename << ":" << line;
 
 	// Change always_report to true if debugging... do not check it in this way
 	static bool always_report = false;
@@ -1419,15 +1425,68 @@ void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::ET
 		LLSD stats;
 		stats["asset_id"] = asset_id;
 		stats["asset_type"] = asset_type;
-		stats["filename"] = filename? filename : "";
+		stats["filename"] = filename;
 		stats["agent_id"] = agent_id;
 		stats["asset_size"] = (S32)asset_size;
 		stats["result"] = (S32)result;
 
-		metric_recipient->recordEventDetails( metric_name, message, success, stats);
+		metric_recipient->recordEventDetails( metric_name, new_message.str(), success, stats);
 	}
 	else
 	{
-		metric_recipient->recordEvent(metric_name, message, success);
+		metric_recipient->recordEvent(metric_name, new_message.str(), success);
+	}
+}
+
+
+// Check if an asset is in the toxic map.  If it is, the entry is updated
+BOOL	LLAssetStorage::isAssetToxic( const LLUUID& uuid )
+{
+	BOOL is_toxic = FALSE;
+
+	if ( !uuid.isNull() )
+	{
+		toxic_asset_map_t::iterator iter = mToxicAssetMap.find( uuid );
+		if ( iter != mToxicAssetMap.end() )
+		{	// Found toxic asset
+			(*iter).second = LLFrameTimer::getTotalTime() + TOXIC_ASSET_LIFETIME;
+			is_toxic = TRUE;
+		} 
 	}
+	return is_toxic;
 }
+
+
+
+
+// Clean the toxic asset list, remove old entries
+void	LLAssetStorage::flushOldToxicAssets( BOOL force_it )
+{
+	// Scan and look for old entries
+	U64 now = LLFrameTimer::getTotalTime();
+	toxic_asset_map_t::iterator iter = mToxicAssetMap.begin();
+	while ( iter != mToxicAssetMap.end() )
+	{
+		if ( force_it
+			|| (*iter).second < now )
+		{	// Too old - remove it
+			mToxicAssetMap.erase( iter++ );
+		}
+		else
+		{
+			iter++;
+		}
+	}
+}
+
+
+// Add an item to the toxic asset map
+void	LLAssetStorage::markAssetToxic( const LLUUID& uuid )
+{	
+	if ( !uuid.isNull() )
+	{
+		// Set the value to the current time.  Creates a new entry if needed
+		mToxicAssetMap[ uuid ] = LLFrameTimer::getTotalTime() + TOXIC_ASSET_LIFETIME;
+	}
+}
+
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index 739242a..86bf66a 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -197,7 +197,8 @@ public:
 };
 
 
-
+// Map of known bad assets
+typedef std::map<LLUUID,U64,lluuid_less> toxic_asset_map_t;
 
 typedef void (*LLGetAssetCallback)(LLVFS *vfs, const LLUUID &asset_id,
 										 LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
@@ -231,6 +232,9 @@ protected:
 	request_list_t mPendingUploads;
 	request_list_t mPendingLocalUploads;
 	
+	// Map of toxic assets - these caused problems when recently rezzed, so avoid them
+	toxic_asset_map_t	mToxicAssetMap;		// Objects in this list are known to cause problems and are not loaded
+
 public:
 	LLAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
 				   LLVFS *vfs, const LLHost &upstream_host);
@@ -291,6 +295,15 @@ public:
 						 const LLUUID &asset_id, LLAssetType::EType atype,
 						 LLGetAssetCallback cb, void *user_data, BOOL is_priority = FALSE); // Get a particular inventory item.
 
+	// Check if an asset is in the toxic map.  If it is, the entry is updated
+	BOOL		isAssetToxic( const LLUUID& uuid );
+
+	// Clean the toxic asset list, remove old entries
+	void		flushOldToxicAssets( BOOL force_it );
+
+	// Add an item to the toxic asset map
+	void		markAssetToxic( const LLUUID& uuid );
+
 protected:
 	virtual LLSD getPendingDetails(const request_list_t* requests,
 	 				LLAssetType::EType asset_type,
@@ -365,7 +378,7 @@ public:
 	 * AssetID version.
 	 */
 	virtual void storeAssetData(
-		const char* filename,
+		const std::string& filename,
 		const LLUUID& asset_id,
 		LLAssetType::EType type,
 		LLStoreAssetCallback callback,
@@ -379,7 +392,7 @@ public:
 	 * TransactionID version
 	 */
 	virtual void storeAssetData(
-		const char * filename,
+		const std::string& filename,
 		const LLTransactionID &transaction_id,
 		LLAssetType::EType type,
 		LLStoreAssetCallback callback,
@@ -438,9 +451,9 @@ protected:
 
 	static class LLMetrics *metric_recipient;
 
-	static void reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const char *filename,
-					   const LLUUID& agent_id, S32 asset_size, EMetricResult result,
-					   const char *file, const S32 line, const char *message ); 
+	static void reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const std::string& filename,
+							  const LLUUID& agent_id, S32 asset_size, EMetricResult result,
+							  const char* file, const S32 line, const std::string& message ); 
 public:
 	static void setMetricRecipient( LLMetrics *recip )
 	{
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 9adf10d..70e1ccf 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -43,10 +43,9 @@
 #include "message.h"
 
 // Constants
-// probably need a setUIString() call in the interface
-const char* const CN_WAITING = "(Loading...)"; // *TODO: translate
-const char* const CN_NOBODY = "(nobody)"; // *TODO: translate
-const char* const CN_NONE = "(none)"; // *TODO: translate
+static const std::string CN_WAITING("(Loading...)"); // *TODO: translate
+static const std::string CN_NOBODY("(nobody)"); // *TODO: translate
+static const std::string CN_NONE("(none)"); // *TODO: translate
 
 // llsd serialization constants
 static const std::string AGENTS("agents");
@@ -78,16 +77,13 @@ public:
 public:
 	bool mIsGroup;
 	U32 mCreateTime;	// unix time_t
-	char mFirstName[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
-	char mLastName[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
-	char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+	std::string mFirstName;
+	std::string mLastName;
+	std::string mGroupName;
 };
 
 LLCacheNameEntry::LLCacheNameEntry()
 {
-	mFirstName[0] = '\0';
-	mLastName[0]  = '\0';
-	mGroupName[0] = '\0';
 }
 
 
@@ -235,7 +231,7 @@ public:
 	static void handleUUIDGroupNameRequest(LLMessageSystem* msg, void** userdata);
 	static void handleUUIDGroupNameReply(LLMessageSystem* msg, void** userdata);
 
-	void notifyObservers(const LLUUID& id, const char* first, const char* last, BOOL group);
+	void notifyObservers(const LLUUID& id, const std::string& first, const std::string& last, BOOL group);
 };
 
 
@@ -390,8 +386,8 @@ void LLCacheName::importFile(LLFILE* fp)
 		LLCacheNameEntry* entry = new LLCacheNameEntry();
 		entry->mIsGroup = false;
 		entry->mCreateTime = create_time;
-		LLString::copy(entry->mFirstName, firstname, DB_FIRST_NAME_BUF_SIZE);
-		LLString::copy(entry->mLastName, lastname, DB_LAST_NAME_BUF_SIZE);
+		entry->mFirstName = firstname;
+		entry->mLastName = lastname;
 		impl.mCache[id] = entry;
 
 		count++;
@@ -426,12 +422,8 @@ bool LLCacheName::importFile(std::istream& istr)
 		LLCacheNameEntry* entry = new LLCacheNameEntry();
 		entry->mIsGroup = false;
 		entry->mCreateTime = ctime;
-		std::string first = agent[FIRST].asString();
-		first.copy(entry->mFirstName, DB_FIRST_NAME_BUF_SIZE, 0);
-		entry->mFirstName[llmin(first.size(),(std::string::size_type)DB_FIRST_NAME_BUF_SIZE-1)] = '\0';
-		std::string last = agent[LAST].asString();
-		last.copy(entry->mLastName, DB_LAST_NAME_BUF_SIZE, 0);
-		entry->mLastName[llmin(last.size(),(std::string::size_type)DB_LAST_NAME_BUF_SIZE-1)] = '\0';
+		entry->mFirstName = agent[FIRST].asString();
+		entry->mLastName = agent[LAST].asString();
 		impl.mCache[id] = entry;
 		++count;
 	}
@@ -451,9 +443,7 @@ bool LLCacheName::importFile(std::istream& istr)
 		LLCacheNameEntry* entry = new LLCacheNameEntry();
 		entry->mIsGroup = true;
 		entry->mCreateTime = ctime;
-		std::string name = group[NAME].asString();
-		name.copy(entry->mGroupName, DB_GROUP_NAME_BUF_SIZE, 0);
-		entry->mGroupName[llmin(name.size(), (std::string::size_type)DB_GROUP_NAME_BUF_SIZE-1)] = '\0';
+		entry->mGroupName = group[NAME].asString();
 		impl.mCache[id] = entry;
 		++count;
 	}
@@ -471,8 +461,8 @@ void LLCacheName::exportFile(std::ostream& ostr)
 		// Only write entries for which we have valid data.
 		LLCacheNameEntry* entry = iter->second;
 		if(!entry
-		   || (NULL != strchr(entry->mFirstName, '?'))
-		   || (NULL != strchr(entry->mGroupName, '?')))
+		   || (std::string::npos != entry->mFirstName.find('?'))
+		   || (std::string::npos != entry->mGroupName.find('?')))
 		{
 			continue;
 		}
@@ -480,13 +470,13 @@ void LLCacheName::exportFile(std::ostream& ostr)
 		// store it
 		LLUUID id = iter->first;
 		std::string id_str = id.asString();
-		if(entry->mFirstName[0] && entry->mLastName[0])
+		if(!entry->mFirstName.empty() && !entry->mLastName.empty())
 		{
 			data[AGENTS][id_str][FIRST] = entry->mFirstName;
 			data[AGENTS][id_str][LAST] = entry->mLastName;
 			data[AGENTS][id_str][CTIME] = (S32)entry->mCreateTime;
 		}
-		else if(entry->mIsGroup && entry->mGroupName[0])
+		else if(entry->mIsGroup && !entry->mGroupName.empty())
 		{
 			data[GROUPS][id_str][NAME] = entry->mGroupName;
 			data[GROUPS][id_str][CTIME] = (S32)entry->mCreateTime;
@@ -534,16 +524,6 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
 	return res;
 }
 
-// *TODO: Deprecate
-BOOL LLCacheName::getName(const LLUUID& id, char* first, char* last)
-{
-	std::string first_name, last_name;
-	BOOL res = getName(id, first_name, last_name);
-	strcpy(first, first_name.c_str());
-	strcpy(last, last_name.c_str());
-	return res;
-}
-
 BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 {
 	if(id.isNull())
@@ -553,7 +533,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 	}
 
 	LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache,id);
-	if (entry && !entry->mGroupName[0])
+	if (entry && entry->mGroupName.empty())
 	{
 		// COUNTER-HACK to combat James' HACK in exportFile()...
 		// this group name was loaded from a name cache that did not
@@ -578,16 +558,6 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 	}
 }
 
-// *TODO: Deprecate
-BOOL LLCacheName::getGroupName(const LLUUID& id, char* group)
-{
-	std::string group_name;
-	BOOL res = getGroupName(id, group_name);
-	strcpy(group, group_name.c_str());
-	return res;
-}
-
-
 // TODO: Make the cache name callback take a SINGLE std::string,
 // not a separate first and last name.
 void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data)
@@ -716,9 +686,9 @@ void LLCacheName::dumpStats()
 }
 
 //static 
-LLString LLCacheName::getDefaultName()
+std::string LLCacheName::getDefaultName()
 {
-	return LLString(CN_WAITING);
+	return CN_WAITING;
 }
 
 void LLCacheName::Impl::processPendingAsks()
@@ -813,7 +783,7 @@ void LLCacheName::Impl::sendRequest(
 }
 
 void LLCacheName::Impl::notifyObservers(const LLUUID& id,
-	const char* first, const char* last, BOOL is_group)
+	const std::string& first, const std::string& last, BOOL is_group)
 {
 	for (Observers::const_iterator i = mObservers.begin(),
 								   end = mObservers.end();
@@ -917,19 +887,17 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
 		entry->mCreateTime = (U32)time(NULL);
 		if (!isGroup)
 		{
-			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_FirstName, DB_FIRST_NAME_BUF_SIZE, entry->mFirstName, i);
-			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_LastName,  DB_LAST_NAME_BUF_SIZE, entry->mLastName, i);
+			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_FirstName, entry->mFirstName, i);
+			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_LastName,  entry->mLastName, i);
 		}
 		else
 		{
-			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_GroupName, DB_GROUP_NAME_BUF_SIZE, entry->mGroupName, i);
+			msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_GroupName, entry->mGroupName, i);
 		}
 
 		if (!isGroup)
 		{
-			notifyObservers(id,
-							entry->mFirstName, entry->mLastName,
-							FALSE);
+			notifyObservers(id, entry->mFirstName, entry->mLastName, FALSE);
 		}
 		else
 		{
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index e7d5a44..965b4ba 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -37,7 +37,7 @@ class LLHost;
 class LLUUID;
 
 // agent_id/group_id, first_name, last_name, is_group, user_data
-typedef void (*LLCacheNameCallback)(const LLUUID&, const char*, const char*, BOOL, void*);
+typedef void (*LLCacheNameCallback)(const LLUUID&, const std::string&, const std::string&, BOOL, void*);
 
 // Here's the theory:
 // If you request a name that isn't in the cache, it returns "waiting"
@@ -75,7 +75,6 @@ public:
 	// last must be at least DB_LAST_NAME_BUF_SIZE characters.
 	// If not available, copies the string "waiting".
 	// Returns TRUE iff available.
-	BOOL getName(const LLUUID& id, char* first, char* last);
 	BOOL getName(const LLUUID& id, std::string& first, std::string& last);
 	BOOL getFullName(const LLUUID& id, std::string& fullname);
 	
@@ -83,7 +82,6 @@ public:
 	// provided. The caller must allocate at least
 	// DB_GROUP_NAME_BUF_SIZE characters. If not available, this
 	// method copies the string "waiting". Returns TRUE iff available.
-	BOOL getGroupName(const LLUUID& id, char* group);
 	BOOL getGroupName(const LLUUID& id, std::string& group);
 
 	// Call the callback with the group or avatar name.
@@ -107,7 +105,7 @@ public:
 	void dump();		// Dumps the contents of the cache
 	void dumpStats();	// Dumps the sizes of the cache and associated queues.
 
-	static LLString getDefaultName();
+	static std::string getDefaultName();
 
 private:
 
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 7b369cb..12a1520 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -184,7 +184,7 @@ LLCircuitData::~LLCircuitData()
 		std::ostream_iterator<TPACKETID> append(str, " ");
 		str << "MSG: -> " << mHost << "\tABORTING RELIABLE:\t";
 		std::copy(doomed.begin(), doomed.end(), append);
-		llinfos << str.str().c_str() << llendl;
+		llinfos << str.str() << llendl;
 	}
 }
 
@@ -204,7 +204,7 @@ void LLCircuitData::ackReliablePacket(TPACKETID packet_num)
 			std::ostringstream str;
 			str << "MSG: <- " << packetp->mHost << "\tRELIABLE ACKED:\t"
 				<< packetp->mPacketID;
-			llinfos << str.str().c_str() << llendl;
+			llinfos << str.str() << llendl;
 		}
 		if (packetp->mCallback)
 		{
@@ -238,7 +238,7 @@ void LLCircuitData::ackReliablePacket(TPACKETID packet_num)
 			std::ostringstream str;
 			str << "MSG: <- " << packetp->mHost << "\tRELIABLE ACKED:\t"
 				<< packetp->mPacketID;
-			llinfos << str.str().c_str() << llendl;
+			llinfos << str.str() << llendl;
 		}
 		if (packetp->mCallback)
 		{
@@ -342,7 +342,7 @@ S32 LLCircuitData::resendUnackedPackets(const F64 now)
 				std::ostringstream str;
 				str << "MSG: -> " << packetp->mHost
 					<< "\tRESENDING RELIABLE:\t" << packetp->mPacketID;
-				llinfos << str.str().c_str() << llendl;
+				llinfos << str.str() << llendl;
 			}
 
 			packetp->mBuffer[0] |= LL_RESENT_FLAG;  // tag packet id as being a resend	
@@ -403,7 +403,7 @@ S32 LLCircuitData::resendUnackedPackets(const F64 now)
 				std::ostringstream str;
 				str << "MSG: -> " << packetp->mHost << "\tABORTING RELIABLE:\t"
 					<< packetp->mPacketID;
-				llinfos << str.str().c_str() << llendl;
+				llinfos << str.str() << llendl;
 			}
 
 			if (packetp->mCallback)
@@ -710,7 +710,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
 			{
 				std::ostringstream str;
 				str << "MSG: <- " << mHost << "\tRECOVERING LOST:\t" << id;
-				llinfos << str.str().c_str() << llendl;
+				llinfos << str.str() << llendl;
 			}
 			//			llinfos << "removing potential lost: " << id << llendl;
 			mPotentialLostPackets.erase(id);
@@ -729,7 +729,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
 						std::ostringstream str;
 						str << "MSG: <- " << mHost << "\tPACKET GAP:\t"
 							<< index;
-						llinfos << str.str().c_str() << llendl;
+						llinfos << str.str() << llendl;
 					}
 
 //						llinfos << "adding potential lost: " << index << llendl;
@@ -747,7 +747,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
 					std::ostringstream str;
 					str << "MSG: <- " << mHost << "\tPACKET GAP:\t"
 						<< id << " expected " << index;
-					llinfos << str.str().c_str() << llendl;
+					llinfos << str.str() << llendl;
 				}
 			}
 				
@@ -969,7 +969,7 @@ BOOL LLCircuitData::updateWatchDogTimers(LLMessageSystem *msgsys)
 				std::ostringstream str;
 				str << "MSG: <- " << mHost << "\tLOST PACKET:\t"
 					<< (*it).first;
-				llinfos << str.str().c_str() << llendl;
+				llinfos << str.str() << llendl;
 			}
 			mPotentialLostPackets.erase(it++);
 		}
@@ -1114,7 +1114,7 @@ void LLCircuit::sendAcks()
 				str << "MSG: -> " << cd->mHost << "\tPACKET ACKS:\t";
 				std::ostream_iterator<TPACKETID> append(str, " ");
 				std::copy(cd->mAcks.begin(), cd->mAcks.end(), append);
-				llinfos << str.str().c_str() << llendl;
+				llinfos << str.str() << llendl;
 			}
 
 			// empty out the acks list
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index f03cebc..834ec4b 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -101,6 +101,12 @@ void LLCurl::setCAFile(const std::string& file)
 	sCAFile = file;
 }
 
+//static
+std::string LLCurl::getVersionString()
+{
+	return std::string(curl_version());
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 LLCurl::Responder::Responder()
@@ -113,6 +119,15 @@ LLCurl::Responder::~Responder()
 }
 
 // virtual
+void LLCurl::Responder::error(
+	U32 status,
+	const std::string& reason,
+	const LLSD&)
+{
+	error(status, reason);
+}
+
+// virtual
 void LLCurl::Responder::error(U32 status, const std::string& reason)
 {
 	llinfos << status << ": " << reason << llendl;
@@ -124,38 +139,16 @@ void LLCurl::Responder::result(const LLSD& content)
 }
 
 // virtual
-void LLCurl::Responder::completedRaw(U32 status, const std::string& reason,
-									 const LLChannelDescriptors& channels,
-									 const LLIOPipe::buffer_ptr_t& buffer)
+void LLCurl::Responder::completedRaw(
+	U32 status,
+	const std::string& reason,
+	const LLChannelDescriptors& channels,
+	const LLIOPipe::buffer_ptr_t& buffer)
 {
-	if (isGoodStatus(status))
-	{
-		LLSD content;
-		LLBufferStream istr(channels, buffer.get());
-		LLSDSerialize::fromXML(content, istr);
-/*
-		const S32 parseError = -1;
-		if(LLSDSerialize::fromXML(content, istr) == parseError)
-		{
-			mStatus = 498;
-			mReason = "Client Parse Error";
-		}
-*/
-		completed(status, reason, content);
-	}
-	else if (status == 400)
-	{
-		// Get reason from buffer
-		char tbuf[4096];
-		S32 len = 4096;
-		buffer->readAfter(channels.in(), NULL, (U8*)tbuf, len);
-		tbuf[len] = 0;
-		completed(status, std::string(tbuf), LLSD());
-	}
-	else
-	{
-		completed(status, reason, LLSD());
-	}
+	LLSD content;
+	LLBufferStream istr(channels, buffer.get());
+	LLSDSerialize::fromXML(content, istr);
+	completed(status, reason, content);
 }
 
 // virtual
@@ -167,7 +160,7 @@ void LLCurl::Responder::completed(U32 status, const std::string& reason, const L
 	}
 	else
 	{
-		error(status, reason);
+		error(status, reason, content);
 	}
 }
 
@@ -281,7 +274,7 @@ LLCurl::Easy::~Easy()
 	curl_easy_cleanup(mCurlEasyHandle);
 	--gCurlEasyCount;
 	curl_slist_free_all(mHeaders);
-	for_each(mStrings.begin(), mStrings.end(), DeletePointer());
+	for_each(mStrings.begin(), mStrings.end(), DeletePointerArray());
 }
 
 void LLCurl::Easy::resetState()
@@ -882,6 +875,7 @@ void LLCurlEasyRequest::sendRequest(const std::string& url)
 {
 	llassert_always(!mRequestSent);
 	mRequestSent = true;
+	lldebugs << url << llendl;
 	if (mEasy)
 	{
 		mEasy->setHeaders();
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index 2737f6e..0c2caad 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -84,17 +84,31 @@ public:
 			return((200 <= status) && (status < 300));
 		}
 		
+		virtual void error(
+			U32 status,
+			const std::string& reason,
+			const LLSD& content);
+			//< called by completed() on bad status 
+
 		virtual void error(U32 status, const std::string& reason);
-			// called with non-200 status codes
+			//< called by default error(status, reason, content)
 		
 		virtual void result(const LLSD& content);
-		
-		// Override point for clients that may want to use this class when the response is some other format besides LLSD
-		virtual void completedRaw(U32 status, const std::string& reason,
-								  const LLChannelDescriptors& channels,
-								  const LLIOPipe::buffer_ptr_t& buffer);
+			//< called by completed for good status codes.
+
+		virtual void completedRaw(
+			U32 status,
+			const std::string& reason,
+			const LLChannelDescriptors& channels,
+			const LLIOPipe::buffer_ptr_t& buffer);
+			/**< Override point for clients that may want to use this
+			   class when the response is some other format besides LLSD
+			*/
 
-		virtual void completed(U32 status, const std::string& reason, const LLSD& content);
+		virtual void completed(
+			U32 status,
+			const std::string& reason,
+			const LLSD& content);
 			/**< The default implemetnation calls
 				either:
 				* result(), or
@@ -120,6 +134,11 @@ public:
 	 * @ brief Set certificate authority path used to verify HTTPS certs.
 	 */
 	static void setCAPath(const std::string& path);
+
+	/**
+	 * @ brief Return human-readable string describing libcurl version.
+	 */
+	static std::string getVersionString();
 	
 	/**
 	 * @ brief Get certificate authority file used to verify HTTPS certs.
diff --git a/linden/indra/llmessage/lldatapacker.cpp b/linden/indra/llmessage/lldatapacker.cpp
index ec198f7..2c7c036 100644
--- a/linden/indra/llmessage/lldatapacker.cpp
+++ b/linden/indra/llmessage/lldatapacker.cpp
@@ -170,16 +170,16 @@ BOOL LLDataPacker::unpackFixed(F32 &value, const char *name,
 // LLDataPackerBinaryBuffer implementation
 //---------------------------------------------------------------------------
 
-BOOL LLDataPackerBinaryBuffer::packString(const char *value, const char *name)
+BOOL LLDataPackerBinaryBuffer::packString(const std::string& value, const char *name)
 {
 	BOOL success = TRUE;
-	S32 length = (S32)strlen(value) + 1; /*Flawfinder: ignore*/
+	S32 length = value.length()+1;
 
 	success &= verifyLength(length, name);
 
 	if (mWriteEnabled) 
 	{
-		htonmemcpy(mCurBufferp, value, MVT_VARIABLE, length);  
+		htonmemcpy(mCurBufferp, value.c_str(), MVT_VARIABLE, length);  
 	}
 	mCurBufferp += length;
 	return success;
@@ -577,18 +577,18 @@ void LLDataPackerBinaryBuffer::dumpBufferToLog()
 //---------------------------------------------------------------------------
 // LLDataPackerAsciiBuffer implementation
 //---------------------------------------------------------------------------
-BOOL LLDataPackerAsciiBuffer::packString(const char *value, const char *name)
+BOOL LLDataPackerAsciiBuffer::packString(const std::string& value, const char *name)
 {
 	BOOL success = TRUE;
 	writeIndentedName(name);
 	int numCopied = 0;
 	if (mWriteEnabled) 
 	{
-		numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", value);		/* Flawfinder: ignore */
+		numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", value.c_str());		/* Flawfinder: ignore */
 	}
 	else
 	{
-		numCopied = (S32)strlen(value) + 1; /*Flawfinder: ignore*/
+		numCopied = value.length() + 1; /*Flawfinder: ignore*/
 	}
 
 	// snprintf returns number of bytes that would have been written
@@ -1242,9 +1242,9 @@ BOOL LLDataPackerAsciiBuffer::packUUID(const LLUUID &value, const char *name)
 	int numCopied = 0;
 	if (mWriteEnabled)
 	{
-		char tmp_str[64]; /* Flawfinder: ignore */ 
+		std::string tmp_str;
 		value.toString(tmp_str);
-	    	numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", tmp_str);	/* Flawfinder: ignore */
+		numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", tmp_str.c_str());	/* Flawfinder: ignore */
 	}
 	else
 	{
@@ -1376,13 +1376,13 @@ std::string convertF32ToString(F32 val)
 //---------------------------------------------------------------------------
 // LLDataPackerAsciiFile implementation
 //---------------------------------------------------------------------------
-BOOL LLDataPackerAsciiFile::packString(const char *value, const char *name)
+BOOL LLDataPackerAsciiFile::packString(const std::string& value, const char *name)
 {
 	BOOL success = TRUE;
 	writeIndentedName(name);
 	if (mFP)
 	{
-		fprintf(mFP,"%s\n", value);	
+		fprintf(mFP,"%s\n", value.c_str());	
 	}
 	else if (mOutputStream)
 	{
@@ -1829,11 +1829,11 @@ BOOL LLDataPackerAsciiFile::packUUID(const LLUUID &value, const char *name)
 {
 	BOOL success = TRUE;
 	writeIndentedName(name);
-	char tmp_str[64]; /*Flawfinder: ignore */
+	std::string tmp_str;
 	value.toString(tmp_str);
 	if (mFP)
 	{
-		fprintf(mFP,"%s\n", tmp_str);
+		fprintf(mFP,"%s\n", tmp_str.c_str());
 	}
 	else if (mOutputStream)
 	{
@@ -1877,7 +1877,7 @@ void LLDataPackerAsciiFile::writeIndentedName(const char *name)
 	}
 	else if (mOutputStream)
 	{
-		*mOutputStream << indent_buf.c_str() << name << "\t";
+		*mOutputStream << indent_buf << name << "\t";
 	}
 }
 
diff --git a/linden/indra/llmessage/lldatapacker.h b/linden/indra/llmessage/lldatapacker.h
index b1aa8fe..47dee99 100644
--- a/linden/indra/llmessage/lldatapacker.h
+++ b/linden/indra/llmessage/lldatapacker.h
@@ -49,7 +49,7 @@ public:
 
 	virtual BOOL		hasNext() const = 0;
 
-	virtual BOOL		packString(const char *value, const char *name) = 0;
+	virtual BOOL		packString(const std::string& value, const char *name) = 0;
 	virtual BOOL		unpackString(std::string& value, const char *name) = 0;
 
 	virtual BOOL		packBinaryData(const U8 *value, S32 size, const char *name) = 0;
@@ -127,7 +127,7 @@ public:
 	{
 	}
 
-	/*virtual*/ BOOL		packString(const char *value, const char *name);
+	/*virtual*/ BOOL		packString(const std::string& value, const char *name);
 	/*virtual*/ BOOL		unpackString(std::string& value, const char *name);
 
 	/*virtual*/ BOOL		packBinaryData(const U8 *value, S32 size, const char *name);
@@ -229,7 +229,7 @@ public:
 		mWriteEnabled = FALSE;
 	}
 
-	/*virtual*/ BOOL		packString(const char *value, const char *name);
+	/*virtual*/ BOOL		packString(const std::string& value, const char *name);
 	/*virtual*/ BOOL		unpackString(std::string& value, const char *name);
 
 	/*virtual*/ BOOL		packBinaryData(const U8 *value, S32 size, const char *name);
@@ -358,7 +358,7 @@ public:
 	{
 	}
 
-	/*virtual*/ BOOL		packString(const char *value, const char *name);
+	/*virtual*/ BOOL		packString(const std::string& value, const char *name);
 	/*virtual*/ BOOL		unpackString(std::string& value, const char *name);
 
 	/*virtual*/ BOOL		packBinaryData(const U8 *value, S32 size, const char *name);
diff --git a/linden/indra/llmessage/lldispatcher.cpp b/linden/indra/llmessage/lldispatcher.cpp
index 0270721..541da42 100644
--- a/linden/indra/llmessage/lldispatcher.cpp
+++ b/linden/indra/llmessage/lldispatcher.cpp
@@ -111,8 +111,7 @@ bool LLDispatcher::unpackMessage(
 		LLDispatcher::sparam_t& parameters)
 {
 	char buf[MAX_STRING];	/*Flawfinder: ignore*/
-	msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, MAX_STRING, buf);
-	method.assign(buf);
+	msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
 	msg->getUUIDFast(_PREHASH_MethodData, _PREHASH_Invoice, invoice);
 	S32 size;
 	S32 count = msg->getNumberOfBlocksFast(_PREHASH_ParamList);
diff --git a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
index b3ebd0b..a3c33dd 100644
--- a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
+++ b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
@@ -81,7 +81,7 @@
 #include <sstream>
 #include <iterator>
 #include <xmlrpc-epi/xmlrpc.h>
-#include "apr-1/apr_base64.h"
+#include "apr_base64.h"
 
 #include "llbuffer.h"
 #include "llbufferstream.h"
diff --git a/linden/indra/llmessage/llhost.cpp b/linden/indra/llmessage/llhost.cpp
index e139f6d..34a0f92 100644
--- a/linden/indra/llmessage/llhost.cpp
+++ b/linden/indra/llmessage/llhost.cpp
@@ -66,34 +66,15 @@ LLHost::LLHost(const std::string& ip_and_port)
 	}
 }
 
-void LLHost::getString(char* buffer, S32 length) const
+std::string LLHost::getString() const
 {
-	if (((U32) length) < MAXADDRSTR + 1 + 5)
-	{
-		llerrs << "LLHost::getString - string too short" << llendl;
-		return;
-	}
-
-	snprintf(buffer, length, "%s:%u", u32_to_ip_string(mIP), mPort); 	/* Flawfinder: ignore */
-}
-
-void LLHost::getIPString(char* buffer, S32 length) const
-{
-	if ( ((U32) length) < MAXADDRSTR)
-	{
-		llerrs << "LLHost::getIPString - string too short" << llendl;
-		return;
-	}
-
-	snprintf(buffer, length, "%s", u32_to_ip_string(mIP));	/* Flawfinder: ignore */
+	return llformat("%s:%u", u32_to_ip_string(mIP), mPort);
 }
 
 
 std::string LLHost::getIPandPort() const
 {
-	char buffer[MAXADDRSTR + 1 + 5];	/*Flawfinder: ignore*/
-	getString(buffer, sizeof(buffer));
-	return buffer;
+	return getString();
 }
 
 
@@ -103,35 +84,6 @@ std::string LLHost::getIPString() const
 }
 
 
-void LLHost::getHostName(char *buf, S32 len) const
-{
-	hostent *he;
-
-	if (INVALID_HOST_IP_ADDRESS == mIP)
-	{
-		llwarns << "LLHost::getHostName() : Invalid IP address" << llendl;
-		buf[0] = '\0';
-		return;
-	}
-	he = gethostbyaddr((char *)&mIP, sizeof(mIP), AF_INET);
-	if (!he)
-	{
-#if LL_WINDOWS
-		llwarns << "LLHost::getHostName() : Couldn't find host name for address " << mIP << ", Error: " 
-			<< WSAGetLastError() << llendl;
-#else
-		llwarns << "LLHost::getHostName() : Couldn't find host name for address " << mIP << ", Error: " 
-			<< h_errno << llendl;
-#endif
-		buf[0] = '\0';						
-	}
-	else
-	{
-		strncpy(buf, he->h_name, len); /*Flawfinder: ignore*/
-		buf[len-1] = '\0';
-	}
-}
-
 std::string LLHost::getHostName() const
 {
 	hostent* he;
@@ -158,28 +110,20 @@ std::string LLHost::getHostName() const
 	}
 }
 
-BOOL LLHost::setHostByName(const char *string)
+BOOL LLHost::setHostByName(const std::string& hostname)
 {
 	hostent *he;
-	char local_name[MAX_STRING];  /*Flawfinder: ignore*/
-
-	if (strlen(string)+1 > MAX_STRING) /*Flawfinder: ignore*/
-	{
-		llerrs << "LLHost::setHostByName() : Address string is too long: " 
-			<< string << llendl;
-	}
+	std::string local_name(hostname);
 
-	strncpy(local_name, string,MAX_STRING);  /*Flawfinder: ignore*/
-	local_name[MAX_STRING-1] = '\0';
 #if LL_WINDOWS
 	// We may need an equivalent for Linux, but not sure - djs
-	_strupr(local_name);
+	LLStringUtil::toUpper(local_name);
 #endif
 
-	he = gethostbyname(local_name);	
+	he = gethostbyname(local_name.c_str());	
 	if(!he) 
 	{
-		U32 ip_address = inet_addr(string);
+		U32 ip_address = inet_addr(hostname.c_str());
 		he = gethostbyaddr((char *)&ip_address, sizeof(ip_address), AF_INET);
 	}
 
diff --git a/linden/indra/llmessage/llhost.h b/linden/indra/llmessage/llhost.h
index 0b3afe8..819e7ca 100644
--- a/linden/indra/llmessage/llhost.h
+++ b/linden/indra/llmessage/llhost.h
@@ -61,10 +61,10 @@ public:
 		mIP = ipv4_addr;
 	}
 
-	LLHost( const char *ipv4_addr, U32 port )
+	LLHost( const std::string& ipv4_addr, U32 port )
 	:	mPort( port )
 	{ 
-		mIP = ip_string_to_u32(ipv4_addr);
+		mIP = ip_string_to_u32(ipv4_addr.c_str());
 	}
 
 	explicit LLHost(const U64 ip_port)
@@ -82,11 +82,11 @@ public:
 
 	// MANIPULATORS
 	void	set( U32 ip, U32 port )				{ mIP = ip; mPort = port; }
-	void	set( const char* ipstr, U32 port )	{ mIP = ip_string_to_u32(ipstr); mPort = port; }
-	void	setAddress( const char* ipstr )		{ mIP = ip_string_to_u32(ipstr); }
+	void	set( const std::string& ipstr, U32 port )	{ mIP = ip_string_to_u32(ipstr.c_str()); mPort = port; }
+	void	setAddress( const std::string& ipstr )		{ mIP = ip_string_to_u32(ipstr.c_str()); }
 	void	setAddress( U32 ip )				{ mIP = ip; }
 	void	setPort( U32 port )					{ mPort = port; }
-	BOOL    setHostByName(const char *hname);
+	BOOL    setHostByName(const std::string& hname);
 
 	LLHost&	operator=(const LLHost &rhs);
 	void    invalidate()                        { mIP = INVALID_HOST_IP_ADDRESS; mPort = INVALID_PORT;};
@@ -96,10 +96,8 @@ public:
 	U32		getPort() const								{ return mPort; }
 	BOOL	isOk() const								{ return (mIP != INVALID_HOST_IP_ADDRESS) && (mPort != INVALID_PORT); }
 	size_t	hash() const								{ return (mIP << 16) | (mPort & 0xffff); }
-	void	getString(char* buffer, S32 length) const;	    // writes IP:port into buffer
-	void	getIPString(char* buffer, S32 length) const;	// writes IP into buffer
+	std::string getString() const;
 	std::string getIPString() const;
-	void    getHostName(char *buf, S32 len) const;
 	std::string getHostName() const;
 	std::string getIPandPort() const;
 
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 49896c6..fdd521f 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -81,8 +81,8 @@ class LLHTTPAssetRequest : public LLAssetRequest
 {
 public:
 	LLHTTPAssetRequest(LLHTTPAssetStorage *asp, const LLUUID &uuid, 
-					LLAssetType::EType type, LLAssetStorage::ERequestType rt,
-					const char *url, CURLM *curl_multi);
+					   LLAssetType::EType type, LLAssetStorage::ERequestType rt,
+					   const std::string& url, CURLM *curl_multi);
 	virtual ~LLHTTPAssetRequest();
 	
 	void setupCurlHandle();
@@ -103,7 +103,7 @@ public:
 
 	CURL  *mCurlHandle;
 	CURLM *mCurlMultiHandle;
-	char  *mURLBuffer;
+	std::string mURLBuffer;
 	struct curl_slist *mHTTPHeaders;
 	LLVFile *mVFile;
 	LLUUID  mTmpUUID;
@@ -122,7 +122,7 @@ LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp,
 						const LLUUID &uuid, 
 						LLAssetType::EType type, 
 						LLAssetStorage::ERequestType rt,
-						const char *url, 
+						const std::string& url, 
 						CURLM *curl_multi)
 	: LLAssetRequest(uuid, type),
 	mZInitialized(false)
@@ -137,11 +137,7 @@ LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp,
 	mZInputBuffer = NULL;
 	mZInputExhausted = false;
 	
-	mURLBuffer = new char[strlen(url) + 1]; /*Flawfinder: ignore*/
-	if (mURLBuffer)
-	{
-	    strcpy(mURLBuffer, url);	/*Flawfinder: ignore*/
-	}
+	mURLBuffer = url;
 }
 
 LLHTTPAssetRequest::~LLHTTPAssetRequest()
@@ -156,7 +152,6 @@ LLHTTPAssetRequest::~LLHTTPAssetRequest()
 	{
 		curl_slist_free_all(mHTTPHeaders);
 	}
-	delete[] mURLBuffer;
 	delete   mVFile;
 	finishCompressedUpload();
 }
@@ -242,7 +237,7 @@ void LLHTTPAssetRequest::setupCurlHandle()
 	mCurlHandle = curl_easy_init();
 	curl_easy_setopt(mCurlHandle, CURLOPT_NOSIGNAL, 1);
 	curl_easy_setopt(mCurlHandle, CURLOPT_NOPROGRESS, 1);
-	curl_easy_setopt(mCurlHandle, CURLOPT_URL, mURLBuffer);
+	curl_easy_setopt(mCurlHandle, CURLOPT_URL, mURLBuffer.c_str());
 	curl_easy_setopt(mCurlHandle, CURLOPT_PRIVATE, this);
 	if (LLAssetStorage::RT_DOWNLOAD == mRequestType)
 	{
@@ -400,9 +395,9 @@ size_t LLHTTPAssetRequest::curlCompressedUploadCallback(
 
 LLHTTPAssetStorage::LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
 									 LLVFS *vfs, const LLHost &upstream_host,
-									 const char *web_host,
-									 const char *local_web_host,
-									 const char *host_name)
+									 const std::string& web_host,
+									 const std::string& local_web_host,
+									 const std::string& host_name)
 	: LLAssetStorage(msg, xfer, vfs, upstream_host)
 {
 	_init(web_host, local_web_host, host_name);
@@ -410,15 +405,15 @@ LLHTTPAssetStorage::LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer
 
 LLHTTPAssetStorage::LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
 									   LLVFS *vfs,
-									   const char *web_host,
-									   const char *local_web_host,
-									   const char *host_name)
+									   const std::string& web_host,
+									   const std::string& local_web_host,
+									   const std::string& host_name)
 	: LLAssetStorage(msg, xfer, vfs)
 {
 	_init(web_host, local_web_host, host_name);
 }
 
-void LLHTTPAssetStorage::_init(const char *web_host, const char *local_web_host, const char* host_name)
+void LLHTTPAssetStorage::_init(const std::string& web_host, const std::string& local_web_host, const std::string& host_name)
 {
 	mBaseURL = web_host;
 	mLocalBaseURL = local_web_host;
@@ -470,7 +465,7 @@ void LLHTTPAssetStorage::storeAssetData(
 		{
 			message = "Added to upload queue";
 		}
-		reportMetric( uuid, type, NULL, requesting_agent_id, size, MR_OKAY, __FILE__, __LINE__, message );
+		reportMetric( uuid, type, LLStringUtil::null, requesting_agent_id, size, MR_OKAY, __FILE__, __LINE__, message );
 
 		// this will get picked up and transmitted in checkForTimeouts
 		if(store_local)
@@ -492,7 +487,7 @@ void LLHTTPAssetStorage::storeAssetData(
 		if (callback)
 		{
 			// LLAssetStorage metric: Zero size VFS
-			reportMetric( uuid, type, NULL, requesting_agent_id, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
+			reportMetric( uuid, type, LLStringUtil::null, requesting_agent_id, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
 			callback(uuid, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LL_EXSTAT_NONEXISTENT_FILE);
 		}
 	}
@@ -500,7 +495,7 @@ void LLHTTPAssetStorage::storeAssetData(
 
 // virtual
 void LLHTTPAssetStorage::storeAssetData(
-	const char* filename,
+	const std::string& filename,
 	const LLUUID& asset_id,
 	LLAssetType::EType asset_type,
 	LLStoreAssetCallback callback,
@@ -597,7 +592,7 @@ LLSD LLHTTPAssetStorage::getPendingDetails(LLAssetStorage::ERequestType rt,
 			LLSD& pending = sd["requests"][i];
 			// See if this pending request is running.
 			const LLAssetRequest* req = findRequest(running, 
-									LLAssetType::lookup(pending["type"].asString().c_str()),
+									LLAssetType::lookup(pending["type"].asString()),
 									pending["asset_id"]);
 			if (req)
 			{
@@ -768,11 +763,11 @@ void LLHTTPAssetStorage::checkForTimeouts()
 		// Setup this curl download request
 		// We need to generate a new request here
 		// since the one in the list could go away
-		char tmp_url[MAX_STRING]; /*Flawfinder: ignore*/
-		char uuid_str[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
+		std::string tmp_url;
+		std::string uuid_str;
 		req->getUUID().toString(uuid_str);
 		std::string base_url = getBaseURL(req->getUUID(), req->getType());
-		snprintf(tmp_url, sizeof(tmp_url), "%s/%36s.%s", base_url.c_str() , uuid_str, LLAssetType::lookup(req->getType()));	/* Flawfinder: ignore */
+		tmp_url = llformat("%s/%36s.%s", base_url.c_str() , uuid_str.c_str(), LLAssetType::lookup(req->getType()));
 
 		LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
 										req->getType(), RT_DOWNLOAD, tmp_url, mCurlMultiHandle);
@@ -805,12 +800,11 @@ void LLHTTPAssetStorage::checkForTimeouts()
 
 		bool do_compress = req->getType() == LLAssetType::AT_OBJECT;
 
-		char tmp_url[MAX_STRING];/*Flawfinder: ignore*/
-		char uuid_str[UUID_STR_LENGTH];/*Flawfinder: ignore*/
+		std::string tmp_url;
+		std::string uuid_str;
 		req->getUUID().toString(uuid_str);
-		snprintf(tmp_url, sizeof(tmp_url), 					/* Flawfinder: ignore */
-				do_compress ? "%s/%s.%s.gz" : "%s/%s.%s",
-				mBaseURL.c_str(), uuid_str, LLAssetType::lookup(req->getType())); 
+		tmp_url = mBaseURL + "/" + uuid_str + "." + LLAssetType::lookup(req->getType());
+		if (do_compress) tmp_url += ".gz";
 
 		LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
 									req->getType(), RT_UPLOAD, tmp_url, mCurlMultiHandle);
@@ -876,12 +870,12 @@ void LLHTTPAssetStorage::checkForTimeouts()
 		// setup this curl upload request
 		LLVFile file(mVFS, req->getUUID(), req->getType());
 
-		char tmp_url[MAX_STRING]; /*Flawfinder: ignore*/
-		char uuid_str[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
+		std::string tmp_url;
+		std::string uuid_str;
 		req->getUUID().toString(uuid_str);
 		
 		// KLW - All temporary uploads are saved locally "http://localhost:12041/asset"
-		snprintf(tmp_url, sizeof(tmp_url), "%s/%36s.%s", mLocalBaseURL.c_str(), uuid_str, LLAssetType::lookup(req->getType())); 	/* Flawfinder: ignore */
+		tmp_url = llformat("%s/%36s.%s", mLocalBaseURL.c_str(), uuid_str.c_str(), LLAssetType::lookup(req->getType()));
 
 		LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
 										req->getType(), RT_LOCALUPLOAD, tmp_url, mCurlMultiHandle);
@@ -1160,7 +1154,7 @@ size_t LLHTTPAssetStorage::nullOutputCallback(void *data, size_t size, size_t nm
 
 // blocking asset fetch which bypasses the VFS
 // this is a very limited function for use by the simstate loader and other one-offs
-S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata)
+S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const std::string &url, const std::string& filename, progress_callback callback, void *userdata)
 {
 	// *NOTE: There is no guarantee that the uuid and the asset_type match
 	// - not that it matters. - Doug
@@ -1174,7 +1168,7 @@ S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asse
 	}
 
 	// make sure we use the normal curl setup, even though we don't really need a request object
-	LLHTTPAssetRequest req(this, uuid, asset_type, RT_DOWNLOAD, url.c_str(), mCurlMultiHandle);
+	LLHTTPAssetRequest req(this, uuid, asset_type, RT_DOWNLOAD, url, mCurlMultiHandle);
 	req.mFP = fp;
 	
 	req.setupCurlHandle();
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 71e973a..585b281 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -48,15 +48,15 @@ class LLHTTPAssetStorage : public LLAssetStorage
 public:
 	LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
 					   LLVFS *vfs, const LLHost &upstream_host,
-					   const char *web_host,
-					   const char *local_web_host,
-					   const char *host_name);
+					   const std::string& web_host,
+					   const std::string& local_web_host,
+					   const std::string& host_name);
 
 	LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
 					   LLVFS *vfs,
-					   const char *web_host,
-					   const char *local_web_host,
-					   const char *host_name);
+					   const std::string& web_host,
+					   const std::string& local_web_host,
+					   const std::string& host_name);
 
 
 	virtual ~LLHTTPAssetStorage();
@@ -74,7 +74,7 @@ public:
 		F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
 	virtual void storeAssetData(
-		const char* filename,
+		const std::string& filename,
 		const LLUUID& asset_id,
 		LLAssetType::EType atype,
 		LLStoreAssetCallback callback,
@@ -99,7 +99,7 @@ public:
 	// Hack.  One off curl download an URL to a file.  Probably should be elsewhere.
 	// Only used by lldynamicstate.  The API is broken, and should be replaced with
 	// a generic HTTP file fetch - Doug 9/25/06
-	S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata);
+	S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const std::string &url, const std::string& filename, progress_callback callback, void *userdata);
 	
 	LLAssetRequest* findNextRequest(request_list_t& pending, request_list_t& running);
 
@@ -135,7 +135,7 @@ protected:
 						   void *user_data, BOOL duplicate, BOOL is_priority);
 
 private:
-	void _init(const char *web_host, const char *local_web_host, const char* host_name);
+	void _init(const std::string& web_host, const std::string& local_web_host, const std::string& host_name);
 
 	// This will return the correct base URI for any http asset request
 	std::string getBaseURL(const LLUUID& asset_id, LLAssetType::EType asset_type);
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 22c0c68..caeaee1 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -122,7 +122,7 @@ namespace
 	{
 	public:
 		RawInjector(const U8* data, S32 size) : mData(data), mSize(size) {}
-		virtual ~RawInjector() {}
+		virtual ~RawInjector() {delete mData;}
 
 		const char* contentType() { return "application/octet-stream"; }
 
@@ -152,17 +152,22 @@ namespace
 		{
 			LLBufferStream ostream(channels, buffer.get());
 
-			llifstream fstream(mFilename.c_str(), std::iostream::binary | std::iostream::out);
-            fstream.seekg(0, std::ios::end);
-            U32 fileSize = fstream.tellg();
-            fstream.seekg(0, std::ios::beg);
-			char* fileBuffer;
-			fileBuffer = new char [fileSize];
-            fstream.read(fileBuffer, fileSize);
-            ostream.write(fileBuffer, fileSize);
-			fstream.close();
-			eos = true;
-			return STATUS_DONE;
+			llifstream fstream(mFilename, std::iostream::binary | std::iostream::out);
+			if(fstream.is_open())
+			{
+				fstream.seekg(0, std::ios::end);
+				U32 fileSize = fstream.tellg();
+				fstream.seekg(0, std::ios::beg);
+				char* fileBuffer;
+				fileBuffer = new char [fileSize];
+				fstream.read(fileBuffer, fileSize);
+				ostream.write(fileBuffer, fileSize);
+				fstream.close();
+				eos = true;
+				return STATUS_DONE;
+			}
+			
+			return STATUS_ERROR;
 		}
 
 		const std::string mFilename;
@@ -199,14 +204,13 @@ namespace
 	LLPumpIO* theClientPump = NULL;
 }
 
-static void request(const std::string& url,
-					LLURLRequest::ERequestAction method,
-					Injector* body_injector,
-					LLCurl::ResponderPtr responder,
-					const LLSD& headers = LLSD(),
-					const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
-					S32 offset = 0,
-					S32 bytes = 0)
+static void request(
+	const std::string& url,
+	LLURLRequest::ERequestAction method,
+	Injector* body_injector,
+	LLCurl::ResponderPtr responder,
+	const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
+	const LLSD& headers = LLSD())
 {
 	if (!LLHTTPClient::hasPump())
 	{
@@ -215,7 +219,7 @@ static void request(const std::string& url,
 	}
 	LLPumpIO::chain_t chain;
 
-	LLURLRequest *req = new LLURLRequest(method, url);
+	LLURLRequest* req = new LLURLRequest(method, url);
 	req->checkRootCertificate(true);
 
     // Insert custom headers is the caller sent any
@@ -234,10 +238,10 @@ static void request(const std::string& url,
             //to not use the proxy (read: llurlrequest.cpp)
             if ((iter->first == "Pragma") && (iter->second.asString() == ""))
             {
-                req->useProxy(FALSE);
+                req->useProxy(false);
             }
             header << iter->first << ": " << iter->second.asString() ;
-            llinfos << "header = " << header.str() << llendl;
+            lldebugs << "header = " << header.str() << llendl;
             req->addHeader(header.str().c_str());
         }
     }
@@ -257,25 +261,27 @@ static void request(const std::string& url,
    		chain.push_back(LLIOPipe::ptr_t(body_injector));
 	}
 
-	if (method == LLURLRequest::HTTP_GET && (offset > 0 || bytes > 0))
-	{
-		std::string range = llformat("Range: bytes=%d-%d", offset,offset+bytes-1);
-		req->addHeader(range.c_str());
-   	}
-	
 	chain.push_back(LLIOPipe::ptr_t(req));
 
 	theClientPump->addChain(chain, timeout);
 }
 
 
-void LLHTTPClient::getByteRange(const std::string& url,
-								S32 offset, S32 bytes,
-								ResponderPtr responder,
-								const LLSD& headers,
-								const F32 timeout)
+void LLHTTPClient::getByteRange(
+	const std::string& url,
+	S32 offset,
+	S32 bytes,
+	ResponderPtr responder,
+	const LLSD& hdrs,
+	const F32 timeout)
 {
-    request(url, LLURLRequest::HTTP_GET, NULL, responder, LLSD(), timeout, offset, bytes);
+	LLSD headers = hdrs;
+	if(offset > 0 || bytes > 0)
+	{
+		std::string range = llformat("bytes=%d-%d", offset, offset+bytes-1);
+		headers["Range"] = range;
+	}
+    request(url,LLURLRequest::HTTP_GET, NULL, responder, timeout, headers);
 }
 
 void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F32 timeout)
@@ -285,11 +291,11 @@ void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F3
 
 void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
 {
-	request(url, LLURLRequest::HTTP_GET, NULL, responder, headers, timeout);
+	request(url, LLURLRequest::HTTP_GET, NULL, responder, timeout, headers);
 }
 void LLHTTPClient::getHeaderOnly(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
 {
-	request(url, LLURLRequest::HTTP_HEAD, NULL, responder, headers, timeout);
+	request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout, headers);
 }
 void LLHTTPClient::getHeaderOnly(const std::string& url, ResponderPtr responder, const F32 timeout)
 {
@@ -401,17 +407,11 @@ void LLHTTPClient::post(const std::string& url, const LLSD& body, ResponderPtr r
 	request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout);
 }
 
-void LLHTTPClient::post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout)
 {
 	request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout);
 }
 
-void LLHTTPClient::del(const std::string& url, ResponderPtr responder, const F32 timeout)
-{
-	request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout);
-}
-
-#if 1
 void LLHTTPClient::postFile(const std::string& url, const std::string& filename, ResponderPtr responder, const F32 timeout)
 {
 	request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout);
@@ -422,7 +422,28 @@ void LLHTTPClient::postFile(const std::string& url, const LLUUID& uuid,
 {
 	request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout);
 }
-#endif
+
+// static
+void LLHTTPClient::del(
+	const std::string& url,
+	ResponderPtr responder,
+	const F32 timeout)
+{
+	request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout);
+}
+
+// static
+void LLHTTPClient::move(
+	const std::string& url,
+	const std::string& destination,
+	ResponderPtr responder,
+	const F32 timeout)
+{
+	LLSD headers;
+	headers["Destination"] = destination;
+	request(url, LLURLRequest::HTTP_MOVE, NULL, responder, timeout, headers);
+}
+
 
 void LLHTTPClient::setPump(LLPumpIO& pump)
 {
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index df31b44..50c6f7a 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -60,7 +60,8 @@ public:
 	typedef LLCurl::Responder Responder;
 	typedef LLCurl::ResponderPtr ResponderPtr;
 
-	// non-blocking
+	/** @name non-blocking API */
+	//@{
 	static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
 	static void getByteRange(const std::string& url, S32 offset, S32 bytes, ResponderPtr, const LLSD& headers=LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
 	static void get(const std::string& url, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
@@ -70,13 +71,38 @@ public:
 	static void getHeaderOnly(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
 	static void getHeaderOnly(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
 
-	///< non-blocking
 	static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-	static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+
+	/** Takes ownership of data and deletes it when sent */
+	static void postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+	
 	static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+	#
 	static void postFile(const std::string& url, const LLUUID& uuid,
 		LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
 
+	static void del(
+		const std::string& url,
+		ResponderPtr responder,
+		const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+		///< sends a DELETE method, but we can't call it delete in c++
+	
+	/**
+	 * @brief Send a MOVE webdav method
+	 *
+	 * @param url The complete serialized (and escaped) url to get.
+	 * @param destination The complete serialized destination url.
+	 * @param responder The responder that will handle the result.
+	 * @param timeout The number of seconds to give the server to respond.
+	 */
+	static void move(
+		const std::string& url,
+		const std::string& destination,
+		ResponderPtr responder,
+		const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+
+	//@}
+
 	/**
 	 * @brief Blocking HTTP get that returns an LLSD map of status and body.
 	 *
@@ -85,9 +111,7 @@ public:
 	 */
 	static LLSD blockingGet(const std::string& url);
 
-	static void del(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-		///< sends a DELETE method, but we can't call it delete in c++
-	
+
 	
 	static void setPump(LLPumpIO& pump);
 		///< must be called before any of the above calls are made
diff --git a/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index 46f2061..772fb17 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/indra/llmessage/llhttpnode.cpp
@@ -174,6 +174,26 @@ LLSD LLHTTPNode::del(const LLSD&) const
 	throw NotImplemented();
 }
 
+// virtual
+void  LLHTTPNode::options(ResponsePtr response, const LLSD& context) const
+{
+	//llinfos << "options context: " << context << llendl;
+
+	// default implementation constructs an url to the documentation.
+	std::string host = context[CONTEXT_REQUEST]["headers"]["host"].asString();
+	if(host.empty())
+	{
+		response->status(400, "Bad Request -- need Host header");
+		return;
+	}
+	std::ostringstream ostr;
+	ostr << "http://" << host << "/web/server/api";
+	ostr << context[CONTEXT_REQUEST]["path"].asString();
+	static const std::string DOC_HEADER("X-Documentation-URL");
+	response->addHeader(DOC_HEADER, ostr.str());
+	response->status(200, "OK");
+}
+
 
 // virtual
 LLHTTPNode* LLHTTPNode::getChild(const std::string& name, LLSD& context) const
@@ -386,6 +406,13 @@ void LLHTTPNode::Response::methodNotAllowed()
 	status(405, "Method Not Allowed");
 }
 
+void LLHTTPNode::Response::addHeader(
+	const std::string& name,
+	const std::string& value)
+{
+	mHeaders[name] = value;
+}
+
 void LLHTTPNode::describe(Description& desc) const
 {
 	desc.shortInfo("unknown service (missing describe() method)");
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index 02e8ceb..4339e5c 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -82,33 +82,79 @@ public:
 	*/
 	//@{
 public:	
-		virtual LLSD get() const;
-		virtual LLSD put(const LLSD& input) const;
-		virtual LLSD post(const LLSD& input) const;
 
-		virtual LLSD del(const LLSD& context) const;
+	virtual LLSD get() const;
+	virtual LLSD put(const LLSD& input) const;
+	virtual LLSD post(const LLSD& input) const;
+	virtual LLSD del(const LLSD& context) const;
 
-		class Response : public LLRefCount
-		{
-		protected:
-			virtual ~Response();
+	class Response : public LLRefCount
+	{
+	protected:
+		virtual ~Response();
 
-		public:
-			virtual void result(const LLSD&) = 0;
-			virtual void status(S32 code, const std::string& message) = 0;
+	public:
+		/**
+		 * @brief Return the LLSD content and a 200 OK.
+		 */
+		virtual void result(const LLSD&) = 0;
+
+		/**
+		 * @brief return status code and reason string on http header,
+		 * but do not return a payload.
+		 */
+		virtual void status(S32 code, const std::string& message) = 0;
+
+		/**
+		 * @brief Return no body, just status code and 'UNKNOWN ERROR'.
+		 */
+		void status(S32 code);
+
+		void notFound(const std::string& message);
+		void notFound();
+		void methodNotAllowed();
+
+		/**
+		 * @breif Add a name: value http header.
+		 *
+		 * No effort is made to ensure the response is a valid http
+		 * header.
+		 * The headers are stored as a map of header name : value.
+		 * Though HTTP allows the same header name to be transmitted
+		 * more than once, this implementation only stores a header
+		 * name once.
+		 * @param name The name of the header, eg, "Content-Encoding"
+		 * @param value The value of the header, eg, "gzip"
+		 */
+		void addHeader(const std::string& name, const std::string& value);
+
+	protected:
+		/**
+		 * @brief Headers to be sent back with the HTTP response.
+		 *
+		 * Protected class membership since derived classes are
+		 * expected to use it and there is no use case yet for other
+		 * uses. If such a use case arises, I suggest making a
+		 * headers() public method, and moving this member data into
+		 * private.
+		 */
+		LLSD mHeaders;
+	};
 
-			void status(S32 code);
-			void notFound(const std::string& message);
-			void notFound();
-			void methodNotAllowed();
-		};
 
-		typedef LLPointer<Response> ResponsePtr;
+	typedef LLPointer<Response> ResponsePtr;
 
-		virtual void get(ResponsePtr, const LLSD& context) const;
-		virtual void put(ResponsePtr, const LLSD& context, const LLSD& input) const;
-		virtual void post(ResponsePtr, const LLSD& context, const LLSD& input) const;
-		virtual void del(ResponsePtr, const LLSD& context) const;
+	virtual void get(ResponsePtr, const LLSD& context) const;
+	virtual void put(
+		ResponsePtr,
+		const LLSD& context,
+		const LLSD& input) const;
+	virtual void post(
+		ResponsePtr,
+		const LLSD& context,
+		const LLSD& input) const;
+	virtual void del(ResponsePtr, const LLSD& context) const;
+	virtual void options(ResponsePtr, const LLSD& context) const;
 	//@}
 	
 
diff --git a/linden/indra/llmessage/llhttpsender.cpp b/linden/indra/llmessage/llhttpsender.cpp
index f0b453d..f72a7be 100644
--- a/linden/indra/llmessage/llhttpsender.cpp
+++ b/linden/indra/llmessage/llhttpsender.cpp
@@ -52,7 +52,7 @@ LLHTTPSender::~LLHTTPSender()
 }
 
 //virtual 
-void LLHTTPSender::send(const LLHost& host, const char* name, 
+void LLHTTPSender::send(const LLHost& host, const std::string& name, 
 						const LLSD& body, 
 						LLHTTPClient::ResponderPtr response) const
 {
diff --git a/linden/indra/llmessage/llhttpsender.h b/linden/indra/llmessage/llhttpsender.h
index 86dd754..9073f48 100644
--- a/linden/indra/llmessage/llhttpsender.h
+++ b/linden/indra/llmessage/llhttpsender.h
@@ -45,7 +45,7 @@ class LLHTTPSender
 
 	/** @brief Send message to host with body, call response when done */ 
 	virtual void send(const LLHost& host, 
-					  const char* message, const LLSD& body, 
+					  const std::string& message, const LLSD& body, 
 					  LLHTTPClient::ResponderPtr response) const;
 
 	/** @brief Set sender for host, takes ownership of sender. */
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index 390a6fa..5012741 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -59,7 +59,7 @@ const S32 VOTE_UNANIMOUS = 2;
 const char EMPTY_BINARY_BUCKET[] = "";
 const S32 EMPTY_BINARY_BUCKET_SIZE = 1;
 const U32 NO_TIMESTAMP = 0;
-const char SYSTEM_FROM[] = "Second Life";
+const std::string SYSTEM_FROM("Second Life");
 const S32 IM_TTL = 1;
 
 
@@ -144,8 +144,8 @@ void LLIMInfo::packMessageBlock(LLMessageSystem* msg) const
 		mFromGroup,
 		LLUUID::null,
 		mToID,
-		mName.c_str(),
-		mMessage.c_str(),
+		mName,
+		mMessage,
 		mOffline,
 		mIMType,
 		mID,
@@ -163,8 +163,8 @@ void pack_instant_message(
 	BOOL from_group,
 	const LLUUID& session_id,
 	const LLUUID& to_id,
-	const char* name,
-	const char* message,
+	const std::string& name,
+	const std::string& message,
 	U8 offline,
 	EInstantMessage dialog,
 	const LLUUID& id,
@@ -202,8 +202,8 @@ void pack_instant_message_block(
 	BOOL from_group,
 	const LLUUID& session_id,
 	const LLUUID& to_id,
-	const char* name,
-	const char* message,
+	const std::string& name,
+	const std::string& message,
 	U8 offline,
 	EInstantMessage dialog,
 	const LLUUID& id,
@@ -229,10 +229,10 @@ void pack_instant_message_block(
 	msg->addU32Fast(_PREHASH_Timestamp, timestamp);
 	msg->addStringFast(_PREHASH_FromAgentName, name);
 	S32 bytes_left = MTUBYTES;
-	if(message)
+	if(!message.empty())
 	{
 		char buffer[MTUBYTES];
-		int num_written = snprintf(buffer, MTUBYTES, "%s", message);	/* Flawfinder: ignore */
+		int num_written = snprintf(buffer, MTUBYTES, "%s", message.c_str());	/* Flawfinder: ignore */
 		// snprintf returns number of bytes that would have been written
 		// had the output not being truncated. In that case, it will
 		// return either -1 or value >= passed in size value . So a check needs to be added
@@ -281,13 +281,9 @@ void LLIMInfo::unpackMessageBlock(LLMessageSystem* msg)
 	mIMType = (EInstantMessage) dialog;
 	msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ID, mID);
 	msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_Timestamp, mTimeStamp);
-	char name[DB_FULL_NAME_BUF_SIZE];	/*Flawfinder: ignore*/
-	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, DB_FULL_NAME_BUF_SIZE, name);
-	mName.assign(name);
+	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, mName);
 
-	char message[DB_IM_MSG_BUF_SIZE];	/*Flawfinder: ignore*/
-	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message, DB_IM_MSG_BUF_SIZE, message);
-	mMessage.assign(message);
+	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message, mMessage);
 
 	S32 binary_bucket_size = llmin(
 		MTUBYTES,
diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index 35127c3..d95b551 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -222,7 +222,7 @@ extern const char EMPTY_BINARY_BUCKET[];
 extern const S32 EMPTY_BINARY_BUCKET_SIZE;
 
 extern const U32 NO_TIMESTAMP;
-extern const char SYSTEM_FROM[];
+extern const std::string SYSTEM_FROM;
 
 // Number of retry attempts on sending the im.
 extern const S32 IM_TTL;
@@ -289,8 +289,8 @@ void pack_instant_message(
 	BOOL from_group,
 	const LLUUID& session_id,
 	const LLUUID& to_id,
-	const char* name,
-	const char* message,
+	const std::string& name,
+	const std::string& message,
 	U8 offline = IM_ONLINE,
 	EInstantMessage dialog = IM_NOTHING_SPECIAL,
 	const LLUUID& id = LLUUID::null,
@@ -307,8 +307,8 @@ void pack_instant_message_block(
 	BOOL from_group,
 	const LLUUID& session_id,
 	const LLUUID& to_id,
-	const char* name,
-	const char* message,
+	const std::string& name,
+	const std::string& message,
 	U8 offline = IM_ONLINE,
 	EInstantMessage dialog = IM_NOTHING_SPECIAL,
 	const LLUUID& id = LLUUID::null,
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index 2ebf117..d4155f6 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -57,10 +57,13 @@
 static const char HTTP_VERSION_STR[] = "HTTP/1.0";
 static const std::string CONTEXT_REQUEST("request");
 static const std::string CONTEXT_RESPONSE("response");
+static const std::string CONTEXT_VERB("verb");
+static const std::string CONTEXT_HEADERS("headers");
 static const std::string HTTP_VERB_GET("GET");
 static const std::string HTTP_VERB_PUT("PUT");
 static const std::string HTTP_VERB_POST("POST");
 static const std::string HTTP_VERB_DELETE("DELETE");
+static const std::string HTTP_VERB_OPTIONS("OPTIONS");
 
 static LLIOHTTPServer::timing_callback_t sTimingCallback = NULL;
 static void* sTimingCallbackData = NULL;
@@ -130,6 +133,7 @@ private:
 	LLSD mGoodResult;
 	S32 mStatusCode;
 	std::string mStatusMessage;	
+	LLSD mHeaders;
 };
 
 LLIOPipe::EStatus LLHTTPPipe::process_impl(
@@ -164,7 +168,7 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
 		static LLTimer timer;
 		timer.reset();
 
-		std::string verb = context[CONTEXT_REQUEST]["verb"];
+		std::string verb = context[CONTEXT_REQUEST][CONTEXT_VERB];
 		if(verb == HTTP_VERB_GET)
 		{
 			mNode.get(LLHTTPNode::ResponsePtr(mResponse), context);
@@ -185,6 +189,10 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
 		{
 			mNode.del(LLHTTPNode::ResponsePtr(mResponse), context);
 		}		
+		else if(verb == HTTP_VERB_OPTIONS)
+		{
+			mNode.options(LLHTTPNode::ResponsePtr(mResponse), context);
+		}		
 		else 
 		{
 		    mResponse->methodNotAllowed();
@@ -231,7 +239,9 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
 
 		case STATE_GOOD_RESULT:
 		{
-			context[CONTEXT_RESPONSE]["contentType"] = "application/xml";
+			LLSD headers = mHeaders;
+			headers["Content-Type"] = "application/xml";
+			context[CONTEXT_RESPONSE][CONTEXT_HEADERS] = headers;
 			LLBufferStream ostr(channels, buffer.get());
 			LLSDSerialize::toXML(mGoodResult, ostr);
 
@@ -240,7 +250,9 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
 
 		case STATE_STATUS_RESULT:
 		{
-			context[CONTEXT_RESPONSE]["contentType"] = "text/plain";
+			LLSD headers = mHeaders;
+			headers["Content-Type"] = "text/plain";
+			context[CONTEXT_RESPONSE][CONTEXT_HEADERS] = headers;
 			context[CONTEXT_RESPONSE]["statusCode"] = mStatusCode;
 			context[CONTEXT_RESPONSE]["statusMessage"] = mStatusMessage;
 			LLBufferStream ostr(channels, buffer.get());
@@ -287,6 +299,7 @@ void LLHTTPPipe::Response::result(const LLSD& r)
 	mPipe->mStatusMessage = "OK";
 	mPipe->mGoodResult = r;
 	mPipe->mState = STATE_GOOD_RESULT;
+	mPipe->mHeaders = mHeaders;
 	mPipe->unlockChain();	
 }
 
@@ -302,6 +315,7 @@ void LLHTTPPipe::Response::status(S32 code, const std::string& message)
 	mPipe->mStatusCode = code;
 	mPipe->mStatusMessage = message;
 	mPipe->mState = STATE_STATUS_RESULT;
+	mPipe->mHeaders = mHeaders;
 	mPipe->unlockChain();
 }
 
@@ -389,17 +403,24 @@ LLIOPipe::EStatus LLHTTPResponseHeader::process_impl(
 		}
 		
 		ostr << HTTP_VERSION_STR << " " << code << " " << message << "\r\n";
-		
-		std::string type = context[CONTEXT_RESPONSE]["contentType"].asString();
-		if (!type.empty())
-		{
-			ostr << "Content-Type: " << type << "\r\n";
-		}
 		S32 content_length = buffer->countAfter(channels.in(), NULL);
 		if(0 < content_length)
 		{
 			ostr << "Content-Length: " << content_length << "\r\n";
 		}
+		// *NOTE: This guard can go away once the LLSD static map
+		// iterator is available. Phoenix. 2008-05-09
+		LLSD headers = context[CONTEXT_RESPONSE][CONTEXT_HEADERS];
+		if(headers.isDefined())
+		{
+			LLSD::map_iterator iter = headers.beginMap();
+			LLSD::map_iterator end = headers.endMap();
+			for(; iter != end; ++iter)
+			{
+				ostr << (*iter).first << ": " << (*iter).second.asString()
+					<< "\r\n";
+			}
+		}
 		ostr << "\r\n";
 
 		LLChangeChannel change(channels.in(), channels.out());
@@ -606,11 +627,12 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 				read_next_line = true;
 				LLMemoryStream header((U8*)buf, len);
 				header >> mVerb;
-				
+
 				if((HTTP_VERB_GET == mVerb)
 				   || (HTTP_VERB_POST == mVerb)
 				   || (HTTP_VERB_PUT == mVerb)
-				   || (HTTP_VERB_DELETE == mVerb))
+				   || (HTTP_VERB_DELETE == mVerb)
+				   || (HTTP_VERB_OPTIONS == mVerb))
 				{
 					header >> mAbsPathAndQuery;
 					header >> mVersion;
@@ -685,7 +707,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 					read_next_line = true;
 					std::string name(buf, pos_colon - buf);
 					std::string value(pos_colon + 2);
-					LLString::toLower(name);
+					LLStringUtil::toLower(name);
 					if("content-length" == name)
 					{
 						lldebugs << "Content-Length: " << value << llendl;
@@ -693,7 +715,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 					}
 					else
 					{
-						LLString::trimTail(value);
+						LLStringUtil::trimTail(value);
 						mHeaders[name] = value;
 					}
 				}
@@ -721,7 +743,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 	{
 		// hey, hey, we should have everything now, so we pass it to
 		// a content handler.
-		context[CONTEXT_REQUEST]["verb"] = mVerb;
+		context[CONTEXT_REQUEST][CONTEXT_VERB] = mVerb;
 		const LLHTTPNode* node = mRootNode.traverse(mPath, context);
 		if(node)
 		{
@@ -765,7 +787,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 				= mBuildContext["remote-host"];
 			context[CONTEXT_REQUEST]["remote-port"]
 				= mBuildContext["remote-port"];
-			context[CONTEXT_REQUEST]["headers"] = mHeaders;
+			context[CONTEXT_REQUEST][CONTEXT_HEADERS] = mHeaders;
 
 			const LLChainIOFactory* protocolHandler
 				= node->getProtocolHandler();
diff --git a/linden/indra/llmessage/lliopipe.cpp b/linden/indra/llmessage/lliopipe.cpp
index 3b52fae..1e40940 100644
--- a/linden/indra/llmessage/lliopipe.cpp
+++ b/linden/indra/llmessage/lliopipe.cpp
@@ -55,6 +55,7 @@ static const std::string STATUS_ERROR_NAMES[LLIOPipe::STATUS_ERROR_COUNT] =
 	std::string("STATUS_EXPIRED"),
 };
 
+#ifdef LL_DEBUG_PUMPS
 // Debugging schmutz for deadlock
 const char	*gPumpFile = "";
 S32			gPumpLine = 0;
@@ -64,6 +65,7 @@ void pump_debug(const char *file, S32 line)
 	gPumpFile = file;
 	gPumpLine = line;
 }
+#endif /* LL_DEBUG_PUMPS */
 
 /**
  * LLIOPipe
diff --git a/linden/indra/llmessage/lliopipe.h b/linden/indra/llmessage/lliopipe.h
index 97c6246..a451dd7 100644
--- a/linden/indra/llmessage/lliopipe.h
+++ b/linden/indra/llmessage/lliopipe.h
@@ -36,7 +36,7 @@
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
-#include "apr-1/apr_poll.h"
+#include "apr_poll.h"
 
 #include "llsd.h"
 
@@ -46,11 +46,14 @@ class LLBufferArray;
 class LLChannelDescriptors;
 
 // Debugging schmutz for deadlocks
-#define LL_DEBUG_PUMPS
+//#define LL_DEBUG_PUMPS
 #ifdef LL_DEBUG_PUMPS
 void pump_debug(const char *file, S32 line);
 #define PUMP_DEBUG pump_debug(__FILE__, __LINE__);
 #define END_PUMP_DEBUG pump_debug("none", 0);
+#else /* LL_DEBUG_PUMPS */
+#define PUMP_DEBUG
+#define END_PUMP_DEBUG
 #endif
 
 
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 26fd0b2..dec83b0 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -68,7 +68,7 @@ bool is_addr_in_use(apr_status_t status)
 // Define this to see the actual file descriptors being tossed around.
 //#define LL_DEBUG_SOCKET_FILE_DESCRIPTORS 1
 #if LL_DEBUG_SOCKET_FILE_DESCRIPTORS
-#include "apr-1/apr_portable.h"
+#include "apr_portable.h"
 #endif
 #endif
 
@@ -220,11 +220,11 @@ bool LLSocket::blockingConnect(const LLHost& host)
 {
 	if(!mSocket) return false;
 	apr_sockaddr_t* sa = NULL;
-	char ip_address[MAXADDRSTR];	/*Flawfinder: ignore*/
-	host.getIPString(ip_address, MAXADDRSTR);
+	std::string ip_address;
+	ip_address = host.getIPString();
 	if(ll_apr_warn_status(apr_sockaddr_info_get(
 		&sa,
-		ip_address,
+		ip_address.c_str(),
 		APR_UNSPEC,
 		host.getPort(),
 		0,
diff --git a/linden/indra/llmessage/lliosocket.h b/linden/indra/llmessage/lliosocket.h
index f0b788e..5b6c11f 100644
--- a/linden/indra/llmessage/lliosocket.h
+++ b/linden/indra/llmessage/lliosocket.h
@@ -43,8 +43,8 @@
  */
 
 #include "lliopipe.h"
-#include "apr-1/apr_pools.h"
-#include "apr-1/apr_network_io.h"
+#include "apr_pools.h"
+#include "apr_network_io.h"
 #include "llchainio.h"
 
 class LLHost;
diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index 659803a..8ae7206 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -42,10 +42,9 @@
 
 #include <string>
 #include <sstream>
-#include <boost/regex.hpp>
 
-#include "apr-1/apr_pools.h"
-#include "apr-1/apr_network_io.h"
+#include "apr_pools.h"
+#include "apr_network_io.h"
 
 #include "llapr.h"
 #include "llbase32.h"	// IM-to-email address
@@ -66,8 +65,6 @@ static apr_pool_t* gMailPool;
 static apr_sockaddr_t* gSockAddr;
 static apr_socket_t* gMailSocket;
 
-// According to RFC2822
-static const boost::regex valid_subject_chars("[\\x1-\\x9\\xb\\xc\\xe-\\x7f]*");
 bool connect_smtp();
 void disconnect_smtp();
  
@@ -173,6 +170,22 @@ void LLMail::enable(bool mail_enabled)
 	gMailEnabled = mail_enabled;
 }
 
+// Test a subject line for RFC2822 compliance.
+static bool valid_subject_chars(const char *subject)
+{
+	for (; *subject != '\0'; subject++)
+	{
+		unsigned char c = *subject;
+
+		if (c == '\xa' || c == '\xd' || c > '\x7f')
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
 // static
 std::string LLMail::buildSMTPTransaction(
 	const char* from_name,
@@ -187,7 +200,7 @@ std::string LLMail::buildSMTPTransaction(
 			<< " from address." << llendl;
 		return std::string();
 	}
-	if(! boost::regex_match(subject, valid_subject_chars))
+	if(!valid_subject_chars(subject))
 	{
 		llinfos << "send_mail build_smtp_transaction reject: bad subject header: "
 			<< "to=<" << to_address
@@ -352,7 +365,7 @@ std::string LLMail::encryptIMEmailAddress(const LLUUID& from_agent_id,
 	std::string address = LLBase32::encode(encrypted, encrypted_size);
 
 	// Make it more pretty for humans.
-	LLString::toLower(address);
+	LLStringUtil::toLower(address);
 
 	delete [] encrypted;
 
diff --git a/linden/indra/llmessage/llmessage.vcproj b/linden/indra/llmessage/llmessage.vcproj
deleted file mode 100644
index b011c24..0000000
--- a/linden/indra/llmessage/llmessage.vcproj
+++ /dev/null
@@ -1,675 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llmessage"
-	ProjectGUID="{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-	RootNamespace="llmessage"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llassetstorage.cpp">
-			</File>
-			<File
-				RelativePath=".\llblowfishcipher.cpp">
-			</File>
-			<File
-				RelativePath=".\llbuffer.cpp">
-			</File>
-			<File
-				RelativePath=".\llbufferstream.cpp">
-			</File>
-			<File
-				RelativePath=".\llcachename.cpp">
-			</File>
-			<File
-				RelativePath=".\llchainio.cpp">
-			</File>
-			<File
-				RelativePath=".\llcircuit.cpp">
-			</File>
-			<File
-				RelativePath=".\llclassifiedflags.cpp">
-			</File>
-			<File
-				RelativePath=".\llcurl.cpp">
-			</File>
-			<File
-				RelativePath=".\lldatapacker.cpp">
-			</File>
-			<File
-				RelativePath=".\lldispatcher.cpp">
-			</File>
-			<File
-				RelativePath=".\llfiltersd2xmlrpc.cpp">
-			</File>
-			<File
-				RelativePath=".\llhost.cpp">
-			</File>
-			<File
-				RelativePath=".\llhttpassetstorage.cpp">
-			</File>
-			<File
-				RelativePath=".\llhttpassetstorage.h">
-			</File>
-			<File
-				RelativePath=".\llhttpclient.cpp">
-			</File>
-			<File
-				RelativePath=".\llhttpnode.cpp">
-			</File>
-			<File
-				RelativePath=".\llhttpsender.cpp">
-			</File>
-			<File
-				RelativePath=".\llinstantmessage.cpp">
-			</File>
-			<File
-				RelativePath=".\lliobuffer.cpp">
-			</File>
-			<File
-				RelativePath=".\lliohttpserver.cpp">
-			</File>
-			<File
-				RelativePath=".\lliopipe.cpp">
-			</File>
-			<File
-				RelativePath=".\lliosocket.cpp">
-			</File>
-			<File
-				RelativePath=".\llioutil.cpp">
-			</File>
-			<File
-				RelativePath=".\llmail.cpp">
-			</File>
-			<File
-				RelativePath=".\llmessagebuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\llmessageconfig.cpp">
-			</File>
-			<File
-				RelativePath=".\llmessagereader.cpp">
-			</File>
-			<File
-				RelativePath=".\llmessagetemplate.cpp">
-			</File>
-			<File
-				RelativePath=".\llmessagetemplateparser.cpp">
-			</File>
-			<File
-				RelativePath=".\llmessagethrottle.cpp">
-			</File>
-			<File
-				RelativePath=".\llmime.cpp">
-			</File>
-			<File
-				RelativePath=".\llnamevalue.cpp">
-			</File>
-			<File
-				RelativePath=".\llnullcipher.cpp">
-			</File>
-			<File
-				RelativePath=".\llpacketack.cpp">
-			</File>
-			<File
-				RelativePath=".\llpacketbuffer.cpp">
-			</File>
-			<File
-				RelativePath=".\llpacketring.cpp">
-			</File>
-			<File
-				RelativePath=".\llpartdata.cpp">
-			</File>
-			<File
-				RelativePath=".\llpumpio.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdappservices.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdhttpserver.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdrpcclient.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdrpcserver.cpp">
-			</File>
-			<File
-				RelativePath=".\llservice.cpp">
-			</File>
-			<File
-				RelativePath=".\llservicebuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagebuilder.cpp">
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagereader.cpp">
-			</File>
-			<File
-				RelativePath=".\llthrottle.cpp">
-			</File>
-			<File
-				RelativePath=".\lltransfermanager.cpp">
-			</File>
-			<File
-				RelativePath=".\lltransfersourceasset.cpp">
-			</File>
-			<File
-				RelativePath=".\lltransfersourcefile.cpp">
-			</File>
-			<File
-				RelativePath=".\lltransfertargetfile.cpp">
-			</File>
-			<File
-				RelativePath=".\lltransfertargetvfile.cpp">
-			</File>
-			<File
-				RelativePath=".\llurlrequest.cpp">
-			</File>
-			<File
-				RelativePath=".\lluseroperation.cpp">
-			</File>
-			<File
-				RelativePath=".\llxfer.cpp">
-			</File>
-			<File
-				RelativePath=".\llxfer_file.cpp">
-			</File>
-			<File
-				RelativePath=".\llxfer_mem.cpp">
-			</File>
-			<File
-				RelativePath=".\llxfer_vfile.cpp">
-			</File>
-			<File
-				RelativePath=".\llxfermanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llxorcipher.cpp">
-			</File>
-			<File
-				RelativePath=".\message.cpp">
-			</File>
-			<File
-				RelativePath=".\message_prehash.cpp">
-			</File>
-			<File
-				RelativePath=".\message_string_table.cpp">
-			</File>
-			<File
-				RelativePath=".\net.cpp">
-			</File>
-			<File
-				RelativePath=".\network.cpp">
-			</File>
-			<File
-				RelativePath=".\partsyspacket.cpp">
-			</File>
-			<File
-				RelativePath=".\patch_code.cpp">
-			</File>
-			<File
-				RelativePath=".\patch_dct.cpp">
-			</File>
-			<File
-				RelativePath=".\patch_idct.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\camera.h">
-			</File>
-			<File
-				RelativePath=".\coordframe.h">
-			</File>
-			<File
-				RelativePath=".\llassetstorage.h">
-			</File>
-			<File
-				RelativePath=".\llblowfishcipher.h">
-			</File>
-			<File
-				RelativePath=".\llbuffer.h">
-			</File>
-			<File
-				RelativePath=".\llbufferstream.h">
-			</File>
-			<File
-				RelativePath=".\llcachename.h">
-			</File>
-			<File
-				RelativePath=".\llcamera.h">
-			</File>
-			<File
-				RelativePath=".\llchainio.h">
-			</File>
-			<File
-				RelativePath=".\llcipher.h">
-			</File>
-			<File
-				RelativePath=".\llcircuit.h">
-			</File>
-			<File
-				RelativePath=".\llclassifiedflags.h">
-			</File>
-			<File
-				RelativePath=".\llcoordframe.h">
-			</File>
-			<File
-				RelativePath=".\llcurl.h">
-			</File>
-			<File
-				RelativePath=".\lldatapacker.h">
-			</File>
-			<File
-				RelativePath=".\lldbstrings.h">
-			</File>
-			<File
-				RelativePath=".\lldispatcher.h">
-			</File>
-			<File
-				RelativePath=".\lleventflags.h">
-			</File>
-			<File
-				RelativePath=".\llfiltersd2xmlrpc.h">
-			</File>
-			<File
-				RelativePath=".\llfollowcamparams.h">
-			</File>
-			<File
-				RelativePath=".\llhost.h">
-			</File>
-			<File
-				RelativePath=".\llhttpclient.h">
-			</File>
-			<File
-				RelativePath=".\llhttpnode.h">
-			</File>
-			<File
-				RelativePath=".\llhttpsender.h">
-			</File>
-			<File
-				RelativePath=".\llinstantmessage.h">
-			</File>
-			<File
-				RelativePath=".\llinvite.h">
-			</File>
-			<File
-				RelativePath=".\lliobuffer.h">
-			</File>
-			<File
-				RelativePath=".\lliohttpserver.h">
-			</File>
-			<File
-				RelativePath=".\lliopipe.h">
-			</File>
-			<File
-				RelativePath=".\lliosocket.h">
-			</File>
-			<File
-				RelativePath=".\llioutil.h">
-			</File>
-			<File
-				RelativePath=".\llloginflags.h">
-			</File>
-			<File
-				RelativePath=".\lllsltransmit.h">
-			</File>
-			<File
-				RelativePath=".\llmail.h">
-			</File>
-			<File
-				RelativePath=".\llmessagebuilder.h">
-			</File>
-			<File
-				RelativePath=".\llmessageconfig.h">
-			</File>
-			<File
-				RelativePath=".\llmessagereader.h">
-			</File>
-			<File
-				RelativePath=".\llmessagetemplate.h">
-			</File>
-			<File
-				RelativePath=".\llmessagetemplateparser.h">
-			</File>
-			<File
-				RelativePath=".\llmessagethrottle.h">
-			</File>
-			<File
-				RelativePath=".\llmime.h">
-			</File>
-			<File
-				RelativePath=".\llnamevalue.h">
-			</File>
-			<File
-				RelativePath=".\llnullcipher.h">
-			</File>
-			<File
-				RelativePath=".\llpacketack.h">
-			</File>
-			<File
-				RelativePath=".\llpacketbuffer.h">
-			</File>
-			<File
-				RelativePath=".\llpacketring.h">
-			</File>
-			<File
-				RelativePath=".\llpartdata.h">
-			</File>
-			<File
-				RelativePath=".\llpumpio.h">
-			</File>
-			<File
-				RelativePath=".\llqueryflags.h">
-			</File>
-			<File
-				RelativePath=".\llregionflags.h">
-			</File>
-			<File
-				RelativePath=".\llregionhandle.h">
-			</File>
-			<File
-				RelativePath=".\llsdappservices.h">
-			</File>
-			<File
-				RelativePath=".\llsdhttpserver.h">
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder.h">
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader.h">
-			</File>
-			<File
-				RelativePath=".\llsdrpcclient.h">
-			</File>
-			<File
-				RelativePath=".\llsdrpcserver.h">
-			</File>
-			<File
-				RelativePath=".\llservice.h">
-			</File>
-			<File
-				RelativePath=".\llservicebuilder.h">
-			</File>
-			<File
-				RelativePath=".\lltaskname.h">
-			</File>
-			<File
-				RelativePath=".\llteleportflags.h">
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagebuilder.h">
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagereader.h">
-			</File>
-			<File
-				RelativePath=".\llthrottle.h">
-			</File>
-			<File
-				RelativePath=".\lltransfermanager.h">
-			</File>
-			<File
-				RelativePath=".\lltransfersourceasset.h">
-			</File>
-			<File
-				RelativePath=".\lltransfersourcefile.h">
-			</File>
-			<File
-				RelativePath=".\lltransfertargetfile.h">
-			</File>
-			<File
-				RelativePath=".\lltransfertargetvfile.h">
-			</File>
-			<File
-				RelativePath=".\llurlrequest.h">
-			</File>
-			<File
-				RelativePath=".\lluseroperation.h">
-			</File>
-			<File
-				RelativePath=".\llvehicleparams.h">
-			</File>
-			<File
-				RelativePath=".\llxfer.h">
-			</File>
-			<File
-				RelativePath=".\llxfer_file.h">
-			</File>
-			<File
-				RelativePath=".\llxfer_mem.h">
-			</File>
-			<File
-				RelativePath=".\llxfer_vfile.h">
-			</File>
-			<File
-				RelativePath=".\llxfermanager.h">
-			</File>
-			<File
-				RelativePath=".\llxorcipher.h">
-			</File>
-			<File
-				RelativePath=".\machine.h">
-			</File>
-			<File
-				RelativePath=".\mean_collision_data.h">
-			</File>
-			<File
-				RelativePath=".\message.h">
-			</File>
-			<File
-				RelativePath=".\message_prehash.h">
-			</File>
-			<File
-				RelativePath=".\net.h">
-			</File>
-			<File
-				RelativePath=".\network.h">
-			</File>
-			<File
-				RelativePath=".\partsyspacket.h">
-			</File>
-			<File
-				RelativePath=".\patch_code.h">
-			</File>
-			<File
-				RelativePath=".\patch_dct.h">
-			</File>
-			<File
-				RelativePath=".\sound_ids.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-		<File
-			RelativePath="..\..\scripts\messages\message_template.msg">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmessage/llmessage_vc8.vcproj b/linden/indra/llmessage/llmessage_vc8.vcproj
deleted file mode 100644
index 96f81f7..0000000
--- a/linden/indra/llmessage/llmessage_vc8.vcproj
+++ /dev/null
@@ -1,921 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llmessage"
-	ProjectGUID="{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-	RootNamespace="llmessage"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llassetstorage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llblowfishcipher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbufferstream.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcachename.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llchainio.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcircuit.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedflags.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldatapacker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfiltersd2xmlrpc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhost.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpassetstorage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpclient.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpnode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpsender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinstantmessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliobuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliohttpserver.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliopipe.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliosocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llioutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmail.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessageconfig.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagereader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplateparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagethrottle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmime.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamevalue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnullcipher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketack.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketbuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpartdata.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpumpio.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdappservices.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdhttpserver.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcclient.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcserver.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llservice.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llservicebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagereader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llthrottle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfermanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourceasset.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourcefile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetvfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlrequest.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluseroperation.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_file.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_mem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_vfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfermanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxorcipher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\message.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\message_prehash.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\message_string_table.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\net.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\network.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\partsyspacket.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_code.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_dct.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_idct.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\camera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\coordframe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llblowfishcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbufferstream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcachename.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llchainio.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcircuit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoordframe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldatapacker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldbstrings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldispatcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfiltersd2xmlrpc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfollowcamparams.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhost.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpnode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpsender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinstantmessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinvite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliobuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliohttpserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliopipe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliosocket.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llioutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llloginflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllsltransmit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmail.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessageconfig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagereader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplateparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagethrottle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmime.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamevalue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnullcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpartdata.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpumpio.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llqueryflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionhandle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdappservices.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdhttpserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llservice.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llservicebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltaskname.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llteleportflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagereader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llthrottle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfermanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourceasset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourcefile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetvfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlrequest.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluseroperation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvehicleparams.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_file.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_mem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_vfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfermanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxorcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\machine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mean_collision_data.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message_prehash.h"
-				>
-			</File>
-			<File
-				RelativePath=".\net.h"
-				>
-			</File>
-			<File
-				RelativePath=".\network.h"
-				>
-			</File>
-			<File
-				RelativePath=".\partsyspacket.h"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_code.h"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_dct.h"
-				>
-			</File>
-			<File
-				RelativePath=".\sound_ids.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath="..\..\scripts\messages\message_template.msg"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmessage/llmessage_vc9.vcproj b/linden/indra/llmessage/llmessage_vc9.vcproj
deleted file mode 100644
index e9f4889..0000000
--- a/linden/indra/llmessage/llmessage_vc9.vcproj
+++ /dev/null
@@ -1,922 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llmessage"
-	ProjectGUID="{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-	RootNamespace="llmessage"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llmessage.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llassetstorage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llblowfishcipher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbufferstream.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcachename.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llchainio.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcircuit.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedflags.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldatapacker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfiltersd2xmlrpc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhost.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpassetstorage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpclient.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpnode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpsender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinstantmessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliobuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliohttpserver.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliopipe.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliosocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llioutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmail.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessageconfig.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagereader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplateparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagethrottle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmime.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamevalue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnullcipher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketack.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketbuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpartdata.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpumpio.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdappservices.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdhttpserver.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcclient.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcserver.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llservice.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llservicebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagebuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagereader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llthrottle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfermanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourceasset.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourcefile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetvfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlrequest.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluseroperation.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_file.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_mem.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_vfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfermanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxorcipher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\message.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\message_prehash.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\message_string_table.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\net.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\network.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\partsyspacket.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_code.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_dct.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_idct.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\camera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\coordframe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llblowfishcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbufferstream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcachename.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llchainio.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcircuit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcoordframe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldatapacker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldbstrings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldispatcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfiltersd2xmlrpc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfollowcamparams.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhost.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpnode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpsender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinstantmessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinvite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliobuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliohttpserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliopipe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliosocket.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llioutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llloginflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllsltransmit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmail.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessageconfig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagereader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagetemplateparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessagethrottle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmime.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamevalue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnullcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpacketring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpartdata.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpumpio.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llqueryflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionhandle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdappservices.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdhttpserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdrpcserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llservice.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llservicebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltaskname.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llteleportflags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagereader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llthrottle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfermanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourceasset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfersourcefile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltransfertargetvfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlrequest.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluseroperation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvehicleparams.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_file.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_mem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_vfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfermanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxorcipher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\machine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mean_collision_data.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message_prehash.h"
-				>
-			</File>
-			<File
-				RelativePath=".\net.h"
-				>
-			</File>
-			<File
-				RelativePath=".\network.h"
-				>
-			</File>
-			<File
-				RelativePath=".\partsyspacket.h"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_code.h"
-				>
-			</File>
-			<File
-				RelativePath=".\patch_dct.h"
-				>
-			</File>
-			<File
-				RelativePath=".\sound_ids.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath="..\..\scripts\messages\message_template.msg"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description=""
-					CommandLine=""
-					Outputs=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index e23ed07..498cfff 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -52,13 +52,14 @@ static LLSD sMessages;
 class LLMessageConfigFile : public LLLiveFile
 {
 public:
-	LLMessageConfigFile()
-        : LLLiveFile(filename(), messageConfigRefreshRate)
+	LLMessageConfigFile() :
+		LLLiveFile(filename(), messageConfigRefreshRate),
+		mMaxQueuedEvents(0)
             { }
 
-    static std::string filename();
+	static std::string filename();
 
-    LLSD mMessages;
+	LLSD mMessages;
 	std::string mServerDefault;
 	
 	static LLMessageConfigFile& instance();
@@ -66,7 +67,7 @@ public:
 
 	/* virtual */ void loadFile();
 	void loadServerDefaults(const LLSD& data);
-	 void loadMaxQueuedEvents(const LLSD& data);
+	void loadMaxQueuedEvents(const LLSD& data);
 	void loadMessages(const LLSD& data);
 	void loadCapBans(const LLSD& blacklist);
 	void loadMessageBans(const LLSD& blacklist);
@@ -74,7 +75,10 @@ public:
 
 public:
 	LLSD mCapBans;
-	 S32 mMaxQueuedEvents;
+	S32 mMaxQueuedEvents;
+
+private:
+	static const S32 DEFAULT_MAX_QUEUED_EVENTS = 100;
 };
 
 std::string LLMessageConfigFile::filename()
@@ -97,7 +101,7 @@ void LLMessageConfigFile::loadFile()
 {
 	LLSD data;
     {
-        llifstream file(filename().c_str());
+        llifstream file(filename());
         
         if (file.is_open())
         {
@@ -125,7 +129,6 @@ void LLMessageConfigFile::loadServerDefaults(const LLSD& data)
 	mServerDefault = data["serverDefaults"][sServerName].asString();
 }
 
-const S32 DEFAULT_MAX_QUEUED_EVENTS = 100;
 void LLMessageConfigFile::loadMaxQueuedEvents(const LLSD& data)
 {
 	 if (data.has("maxQueuedEvents"))
diff --git a/linden/indra/llmessage/llmessagereader.h b/linden/indra/llmessage/llmessagereader.h
index 1e74da9..9fae682 100644
--- a/linden/indra/llmessage/llmessagereader.h
+++ b/linden/indra/llmessage/llmessagereader.h
@@ -69,6 +69,7 @@ class LLMessageReader
 	virtual void getIPAddr(const char *block, const char *var, U32 &ip, S32 blocknum = 0) = 0;
 	virtual void getIPPort(const char *block, const char *var, U16 &port, S32 blocknum = 0) = 0;
 	virtual void getString(const char *block, const char *var, S32 buffer_size, char *buffer, S32 blocknum = 0) = 0;
+	virtual void getString(const char *block, const char *var, std::string& outstr, S32 blocknum = 0) = 0;
 
 	virtual S32	getNumberOfBlocks(const char *blockname) = 0;
 	virtual S32	getSize(const char *blockname, const char *varname) = 0;
diff --git a/linden/indra/llmessage/llmessagetemplateparser.cpp b/linden/indra/llmessage/llmessagetemplateparser.cpp
index 969a0d9..d6adba8 100644
--- a/linden/indra/llmessage/llmessagetemplateparser.cpp
+++ b/linden/indra/llmessage/llmessagetemplateparser.cpp
@@ -161,7 +161,7 @@ S32 get_checker_number(char checker)
 }
 
 // check token based on passed simplified regular expression
-BOOL	b_check_token(const char *token, char *regexp)
+BOOL	b_check_token(const char *token, const char *regexp)
 {
 	S32 tptr, rptr = 0;
 	S32 current_checker, next_checker = 0;
diff --git a/linden/indra/llmessage/llmessagethrottle.cpp b/linden/indra/llmessage/llmessagethrottle.cpp
index 84733ba..ad9df26 100644
--- a/linden/indra/llmessage/llmessagethrottle.cpp
+++ b/linden/indra/llmessage/llmessagethrottle.cpp
@@ -110,7 +110,7 @@ void LLMessageThrottle::pruneEntries()
 	}
 }
 
-BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const char* mesg)
+BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg)
 {
 	message_list_t* message_list = &(mMessageList[MTC_VIEWER_ALERT]);
 
@@ -144,7 +144,7 @@ BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const char* mesg)
 	}
 }
 
-BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, const char* mesg)
+BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, const std::string& mesg)
 {
 	message_list_t* message_list = &(mMessageList[MTC_AGENT_ALERT]);
 
diff --git a/linden/indra/llmessage/llmessagethrottle.h b/linden/indra/llmessage/llmessagethrottle.h
index 8be08b3..2f27f13 100644
--- a/linden/indra/llmessage/llmessagethrottle.h
+++ b/linden/indra/llmessage/llmessagethrottle.h
@@ -64,8 +64,8 @@ public:
 	LLMessageThrottle();
 	~LLMessageThrottle();
 
-	BOOL addViewerAlert	(const LLUUID& to, const char* mesg);
-	BOOL addAgentAlert	(const LLUUID& agent, const LLUUID& task, const char* mesg);
+	BOOL addViewerAlert	(const LLUUID& to, const std::string& mesg);
+	BOOL addAgentAlert	(const LLUUID& agent, const LLUUID& task, const std::string& mesg);
 
 	void pruneEntries();
 
diff --git a/linden/indra/llmessage/llmime.cpp b/linden/indra/llmessage/llmime.cpp
index 48e73fb..2093255 100644
--- a/linden/indra/llmessage/llmime.cpp
+++ b/linden/indra/llmessage/llmime.cpp
@@ -439,9 +439,7 @@ bool LLMimeParser::Impl::parseHeaders(
 		std::string value(colon);
 		for(S32 ii = 0; ii < KNOWN_HEADER_COUNT; ++ii)
 		{
-			if(0 == LLString::compareInsensitive(
-				name.c_str(),
-				KNOWN_HEADER[ii].c_str()))
+			if(0 == LLStringUtil::compareInsensitive(name, KNOWN_HEADER[ii]))
 			{
 				name = KNOWN_HEADER[ii];
 				break;
@@ -525,7 +523,7 @@ void LLMimeParser::Impl::scanPastSeparator(
 		{
 			mContinue = false;
 		}
-		if(0 == LLString::compareStrings(mBuffer, separator.c_str()))
+		if(0 == LLStringUtil::compareStrings(std::string(mBuffer), separator))
 		{
 			found_separator = true;
 		}
diff --git a/linden/indra/llmessage/llnamevalue.cpp b/linden/indra/llmessage/llnamevalue.cpp
index 18bd5ac..c44f6ce 100644
--- a/linden/indra/llmessage/llnamevalue.cpp
+++ b/linden/indra/llmessage/llnamevalue.cpp
@@ -155,7 +155,7 @@ void LLNameValue::init(const char *name, const char *data, const char *type, con
 	else if (!strcmp(mStringType, "U64"))
 	{
 		mType = NVT_U64;
-		mNameValueReference.u64 = new U64(str_to_U64(data));
+		mNameValueReference.u64 = new U64(str_to_U64(ll_safe_string(data)));
 	}
 	else if (!strcmp(mStringType, "VEC3"))
 	{
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index f60ee2b..c92612f 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -36,7 +36,7 @@
 
 #include <map>
 #include <set>
-#include "apr-1/apr_poll.h"
+#include "apr_poll.h"
 
 #include "llapr.h"
 #include "llmemtype.h"
@@ -49,7 +49,7 @@
 //#define LL_DEBUG_PIPE_TYPE_IN_PUMP 1
 //#define LL_DEBUG_POLL_FILE_DESCRIPTORS 1
 #if LL_DEBUG_POLL_FILE_DESCRIPTORS
-#include "apr-1/apr_portable.h"
+#include "apr_portable.h"
 #endif
 #endif
 
@@ -261,7 +261,7 @@ bool LLPumpIO::addChain(
 bool LLPumpIO::setTimeoutSeconds(F32 timeout)
 {
 	// If no chain is running, return failure.
-	if(current_chain_t() == mCurrentChain)
+	if(mRunningChains.end() == mCurrentChain)
 	{
 		return false;
 	}
@@ -365,7 +365,7 @@ S32 LLPumpIO::setLock()
 	// lock the runner at the same time.
 
 	// If no chain is running, return failure.
-	if(current_chain_t() == mCurrentChain)
+	if(mRunningChains.end() == mCurrentChain)
 	{
 		return 0;
 	}
@@ -414,7 +414,7 @@ bool LLPumpIO::sleepChain(F64 seconds)
 bool LLPumpIO::copyCurrentLinkInfo(links_t& links) const
 {
 	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
-	if(current_chain_t() == mCurrentChain)
+	if(mRunningChains.end() == mCurrentChain)
 	{
 		return false;
 	}
@@ -584,6 +584,7 @@ void LLPumpIO::pump(const S32& poll_timeout)
 		}
 		PUMP_DEBUG;
 		mCurrentChain = run_chain;
+		
 		if((*run_chain).mDescriptors.empty())
 		{
 			// if there are no conditionals, just process this chain.
@@ -702,7 +703,7 @@ void LLPumpIO::pump(const S32& poll_timeout)
 
 	PUMP_DEBUG;
 	// null out the chain
-	mCurrentChain = current_chain_t();
+	mCurrentChain = mRunningChains.end();
 	END_PUMP_DEBUG;
 }
 
diff --git a/linden/indra/llmessage/llpumpio.h b/linden/indra/llmessage/llpumpio.h
index 68db329..d2392a3 100644
--- a/linden/indra/llmessage/llpumpio.h
+++ b/linden/indra/llmessage/llpumpio.h
@@ -39,7 +39,7 @@
 #include <sys/param.h>
 #endif
 
-#include "apr-1/apr_pools.h"
+#include "apr_pools.h"
 #include "llbuffer.h"
 #include "llframetimer.h"
 #include "lliopipe.h"
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index 1675478..af010ae 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -94,8 +94,8 @@ const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
 const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
 
 const U32 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29);
-const U32 REGION_FLAGS_DENY_AGEUNVERIFIED		= (1 << 30);
-
+const U32 REGION_FLAGS_DENY_AGEUNVERIFIED	= (1 << 30);
+const U32 REGION_FLAGS_SKIP_MONO_SCRIPTS	= (1 << 31);
 
 const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
 								 REGION_FLAGS_ALLOW_SET_HOME |
diff --git a/linden/indra/llmessage/llsdmessagereader.cpp b/linden/indra/llmessage/llsdmessagereader.cpp
index 70cc455..1f0effa 100755
--- a/linden/indra/llmessage/llsdmessagereader.cpp
+++ b/linden/indra/llmessage/llsdmessagereader.cpp
@@ -37,7 +37,15 @@
 #include "llsdmessagebuilder.h"
 #include "llsdutil.h"
 
-LLSDMessageReader::LLSDMessageReader()
+#include "v3math.h"
+#include "v4math.h"
+#include "v3dmath.h"
+#include "v2math.h"
+#include "llquaternion.h"
+#include "v4color.h"
+
+LLSDMessageReader::LLSDMessageReader() :
+	mMessageName(NULL)
 {
 }
 
@@ -63,14 +71,20 @@ LLSD getLLSD(const LLSD& input, const char* block, const char* var, S32 blocknum
 	}
 	if(! input[block].isArray())
 	{
-		llerrs << "block " << block << " not found" << llendl;
+		// NOTE: babbage: need to return default for missing blocks to allow
+		// backwards/forwards compatibility - handlers must cope with default
+		// values.
+		llwarns << "block " << block << " not found" << llendl;
 		return LLSD();
 	}
 
 	LLSD result = input[block][blocknum][var]; 
 	if(result.isUndefined())
 	{
-		llerrs << "var " << var << " not found" << llendl;
+		// NOTE: babbage: need to return default for missing vars to allow
+		// backwards/forwards compatibility - handlers must cope with default
+		// values.
+		llwarns << "var " << var << " not found" << llendl;
 	}
 	return result;
 }
@@ -235,6 +249,12 @@ void LLSDMessageReader::getString(const char *block, const char *var,
 	buffer[data_size] = '\0';
 }
 
+//virtual 
+void LLSDMessageReader::getString(const char *block, const char *var, 
+						   std::string& outstr, S32 blocknum)
+{
+	outstr = getLLSD(mMessage, block, var, blocknum).asString();
+}
 
 //virtual 
 S32	LLSDMessageReader::getNumberOfBlocks(const char *blockname)
diff --git a/linden/indra/llmessage/llsdmessagereader.h b/linden/indra/llmessage/llsdmessagereader.h
index 698f751..9afa4a2 100755
--- a/linden/indra/llmessage/llsdmessagereader.h
+++ b/linden/indra/llmessage/llsdmessagereader.h
@@ -87,6 +87,8 @@ public:
 						   S32 blocknum = 0);
 	virtual void getString(const char *block, const char *var, 
 						   S32 buffer_size, char *buffer, S32 blocknum = 0);
+	virtual void getString(const char *block, const char *var, std::string& outstr,
+						   S32 blocknum = 0);
 
 	virtual S32	getNumberOfBlocks(const char *blockname);
 	virtual S32	getSize(const char *blockname, const char *varname);
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp
index 138ab2d..96f49ab 100644
--- a/linden/indra/llmessage/llservicebuilder.cpp
+++ b/linden/indra/llmessage/llservicebuilder.cpp
@@ -39,7 +39,7 @@
 void LLServiceBuilder::loadServiceDefinitionsFromFile(
 	const std::string& service_filename)
 {
-	llifstream service_file(service_filename.c_str(), std::ios::binary);
+	llifstream service_file(service_filename, std::ios::binary);
 	if(service_file.is_open())
 	{
 		LLSD service_data;
@@ -111,10 +111,13 @@ std::string LLServiceBuilder::buildServiceURI(
 	const std::string& service_name,
 	const LLSD& option_map)
 {
-	std::string service_url = buildServiceURI(service_name);
-    
-	// Find the Service Name
-	if(!service_url.empty() && option_map.isMap())
+	return russ_format(buildServiceURI(service_name), option_map);
+}
+
+std::string russ_format(const std::string& format_str, const LLSD& context)
+{
+	std::string service_url(format_str);
+	if(!service_url.empty() && context.isMap())
 	{
 		// throw in a ridiculously large limiter to make sure we don't
 		// loop forever with bad input.
@@ -134,9 +137,9 @@ std::string LLServiceBuilder::buildServiceURI(
 			std::string::iterator end(service_url.end());
 			std::string::iterator deepest_node(service_url.end());
 			std::string::iterator deepest_node_end(service_url.end());
-			//parse out the variables to replace by going through {}s one at a time,
-			// starting with the "deepest" in series {{}},
-			// and otherwise replacing right-to-left
+			// parse out the variables to replace by going through {}s
+			// one at a time, starting with the "deepest" in series
+			// {{}}, and otherwise replacing right-to-left
 			for(; iter != end; ++iter)
 			{
 				switch(*iter)
@@ -171,7 +174,7 @@ std::string LLServiceBuilder::buildServiceURI(
 			// params and straight string substitution, so it's a
 			// known distance of 2 to skip the directive.
 			std::string key(deepest_node + 2, deepest_node_end);
-			LLSD value = option_map[key];
+			LLSD value = context[key];
 			switch(*(deepest_node + 1))
 			{
 			case '$':
@@ -184,7 +187,9 @@ std::string LLServiceBuilder::buildServiceURI(
 				}
 				else
 				{
-					llwarns << "Unknown key: " << key << " in option map: " << LLSDOStreamer<LLSDNotationFormatter>(option_map) << llendl;
+					llwarns << "Unknown key: " << key << " in option map: "
+						<< LLSDOStreamer<LLSDNotationFormatter>(context)
+						<< llendl;
 					keep_looping = false;
 				}
 				break;
@@ -212,50 +217,3 @@ std::string LLServiceBuilder::buildServiceURI(
 	}
 	return service_url;
 }
-
-
-
-// Old, not as good implementation. Phoenix 2007-10-15
-#if 0
-		// Do brace replacements - NOT CURRENTLY RECURSIVE
-		for(LLSD::map_const_iterator option_itr = option_map.beginMap();
-			option_itr != option_map.endMap();
-			++option_itr)
-		{
-			std::string variable_name = "{$";
-			variable_name.append((*option_itr).first);
-			variable_name.append("}");
-			std::string::size_type find_pos = service_url.find(variable_name);
-			if(find_pos != std::string::npos)
-			{
-				service_url.replace(
-					find_pos,
-					variable_name.length(),
-					(*option_itr).second.asString());
-				continue;
-			}
-			variable_name.assign("{%");
-			variable_name.append((*option_itr).first);
-			variable_name.append("}");
-			find_pos = service_url.find(variable_name);
-			if(find_pos != std::string::npos)
-			{
-				std::string query_str = LLURI::mapToQueryString(
-					(*option_itr).second);
-				service_url.replace(
-					find_pos,
-					variable_name.length(),
-					query_str);
-			}
-		}
-	}
-
-	if (service_url.find('{') != std::string::npos)
-	{
-		llwarns << "Constructed a likely bogus service URL: " << service_url
-				<< llendl;
-	}
-
-	return service_url;
-}
-#endif
diff --git a/linden/indra/llmessage/llservicebuilder.h b/linden/indra/llmessage/llservicebuilder.h
index f19ba9a..ce95488 100644
--- a/linden/indra/llmessage/llservicebuilder.h
+++ b/linden/indra/llmessage/llservicebuilder.h
@@ -38,11 +38,24 @@
 
 class LLSD;
 
+/**
+ * @brief  Format format string according to rules for RUSS.
+ *
+ * This function appears alongside the service builder since the
+ * algorithm was originally implemented there. This can eventually be
+ * moved when someone wants to take the time.
+ * @see https://osiris.lindenlab.com/mediawiki/index.php/Recursive_URL_Substitution_Syntax
+ * @param format_str The input string to format.
+ * @param context A map used for string substitutions.
+ * @return Returns the formatted string. If no match is found for a
+ * substitution target, the braces remain intact.
+ */
+std::string russ_format(const std::string& format_str, const LLSD& context);
+
 /** 
  * @class LLServiceBuilder
  * @brief This class builds urls for us to use when making web service calls.
  */
-
 class LLServiceBuilder
 {
 	LOG_CLASS(LLServiceBuilder);
diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index 0d81383..f5da14b 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -171,9 +171,6 @@ S32 LLTemplateMessageReader::getNumberOfBlocks(const char *blockname)
 	
 	if (iter == mCurrentRMessageData->mMemberBlocks.end())
 	{
-//		sprintf(errmsg, "Block %s not in message %s", bnamep, mCurrentRMessageData->mName);
-//		llerrs << errmsg << llendl;
-//		return -1;
 		return 0;
 	}
 
@@ -433,6 +430,15 @@ inline void LLTemplateMessageReader::getString(const char *block, const char *va
 	s[buffer_size - 1] = '\0';
 }
 
+inline void LLTemplateMessageReader::getString(const char *block, const char *var, std::string& outstr, S32 blocknum )
+{
+	char s[MTUBYTES];
+	s[0] = '\0';
+	getData(block, var, s, 0, blocknum, MTUBYTES);
+	s[MTUBYTES - 1] = '\0';
+	outstr = s;
+}
+
 //virtual 
 S32 LLTemplateMessageReader::getMessageSize() const
 {
@@ -568,7 +574,9 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
 			// repeat number is a single byte
 			if (decode_pos >= mReceiveSize)
 			{
-				logRanOffEndOfPacket(sender, decode_pos, 1);
+				// commented out - hetgrid says that missing variable blocks
+				// at end of message are legal
+				// logRanOffEndOfPacket(sender, decode_pos, 1);
 
 				// default to 0 repeats
 				repeat_number = 0;
diff --git a/linden/indra/llmessage/lltemplatemessagereader.h b/linden/indra/llmessage/lltemplatemessagereader.h
index 1448c2d..98f41ae 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.h
+++ b/linden/indra/llmessage/lltemplatemessagereader.h
@@ -88,6 +88,8 @@ public:
 						   S32 blocknum = 0);
 	virtual void getString(const char *block, const char *var, 
 						   S32 buffer_size, char *buffer, S32 blocknum = 0);
+	virtual void getString(const char *block, const char *var,  std::string& outstr,
+						   S32 blocknum = 0);
 
 	virtual S32	getNumberOfBlocks(const char *blockname);
 	virtual S32	getSize(const char *blockname, const char *varname);
diff --git a/linden/indra/llmessage/lltransfersourcefile.cpp b/linden/indra/llmessage/lltransfersourcefile.cpp
index 4b60cf3..a372f66 100644
--- a/linden/indra/llmessage/lltransfersourcefile.cpp
+++ b/linden/indra/llmessage/lltransfersourcefile.cpp
@@ -67,7 +67,7 @@ void LLTransferSourceFile::initTransfer()
 		return;
 	}
 	// Look for the file.
-	mFP = LLFile::fopen(mParams.getFilename().c_str(), "rb");		/* Flawfinder: ignore */
+	mFP = LLFile::fopen(mParams.getFilename(), "rb");		/* Flawfinder: ignore */
 	if (!mFP)
 	{
 		sendTransferStatus(LLTS_ERROR);
@@ -134,9 +134,9 @@ void LLTransferSourceFile::completionCallback(const LLTSCode status)
 
 	}
 	// Delete the file iff the filename begins with "TEMP"
-	if (mParams.getDeleteOnCompletion() && memcmp(mParams.getFilename().c_str(), "TEMP", 4) == 0)
+	if (mParams.getDeleteOnCompletion() && mParams.getFilename().substr(0, 4) == "TEMP")
 	{
-		LLFile::remove(mParams.getFilename().c_str());
+		LLFile::remove(mParams.getFilename());
 	}
 }
 
@@ -162,7 +162,7 @@ LLTransferSourceParamsFile::LLTransferSourceParamsFile() :
 
 void LLTransferSourceParamsFile::packParams(LLDataPacker &dp) const
 {
-	dp.packString(mFilename.c_str(), "Filename");
+	dp.packString(mFilename, "Filename");
 	dp.packU8((U8)mDeleteOnCompletion, "Delete");
 }
 
diff --git a/linden/indra/llmessage/lltransfersourcefile.h b/linden/indra/llmessage/lltransfersourcefile.h
index 030f80e..3137e1c 100644
--- a/linden/indra/llmessage/lltransfersourcefile.h
+++ b/linden/indra/llmessage/lltransfersourcefile.h
@@ -42,7 +42,7 @@ public:
 	/*virtual*/ void packParams(LLDataPacker &dp) const;
 	/*virtual*/ BOOL unpackParams(LLDataPacker &dp);
 
-	void setFilename(const LLString &filename)		{ mFilename = filename; }
+	void setFilename(const std::string &filename)		{ mFilename = filename; }
 	std::string getFilename() const					{ return mFilename; }
 
 	void setDeleteOnCompletion(BOOL enabled)		{ mDeleteOnCompletion = enabled; }
diff --git a/linden/indra/llmessage/lltransfertargetfile.cpp b/linden/indra/llmessage/lltransfertargetfile.cpp
index f1f602d..2723cb7 100644
--- a/linden/indra/llmessage/lltransfertargetfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetfile.cpp
@@ -80,7 +80,7 @@ LLTSCode LLTransferTargetFile::dataCallback(const S32 packet_id, U8 *in_datap, c
 
 	if (!mFP)
 	{
-		mFP = LLFile::fopen(mParams.mFilename.c_str(), "wb");		/* Flawfinder: ignore */		
+		mFP = LLFile::fopen(mParams.mFilename, "wb");		/* Flawfinder: ignore */		
 
 		if (!mFP)
 		{
@@ -122,7 +122,7 @@ void LLTransferTargetFile::completionCallback(const LLTSCode status)
 		if (mFP)
 		{
 			// Only need to remove file if we successfully opened it.
-			LLFile::remove(mParams.mFilename.c_str());
+			LLFile::remove(mParams.mFilename);
 		}
 	default:
 		break;
diff --git a/linden/indra/llmessage/lltransfertargetfile.h b/linden/indra/llmessage/lltransfertargetfile.h
index 02c0c11..4d92ec1 100644
--- a/linden/indra/llmessage/lltransfertargetfile.h
+++ b/linden/indra/llmessage/lltransfertargetfile.h
@@ -40,12 +40,12 @@ class LLTransferTargetParamsFile : public LLTransferTargetParams
 {
 public:
 	LLTransferTargetParamsFile() : LLTransferTargetParams(LLTTT_FILE) {}
-	void setFilename(const LLString& filename)	{ mFilename = filename; }
+	void setFilename(const std::string& filename)	{ mFilename = filename; }
 	void setCallback(LLTTFCompleteCallback cb, void *user_data)		{ mCompleteCallback = cb; mUserData = user_data; }
 
 	friend class LLTransferTargetFile;
 protected:
-	LLString				mFilename;
+	std::string				mFilename;
 	LLTTFCompleteCallback	mCompleteCallback;
 	void *					mUserData;
 };
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index 5760197..42f3f04 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -42,7 +42,7 @@
 #include "llpumpio.h"
 #include "llsd.h"
 #include "llstring.h"
-#include "apr-1/apr_env.h"
+#include "apr_env.h"
 
 static const U32 HTTP_STATUS_PIPE_ERROR = 499;
 
@@ -385,6 +385,13 @@ bool LLURLRequest::configure()
 		rv = true;
 		break;
 
+	case HTTP_MOVE:
+		// Set the handle for an http post
+		mDetail->mCurlRequest->setoptString(CURLOPT_CUSTOMREQUEST, "MOVE");
+		// *NOTE: should we check for the Destination header?
+		rv = true;
+		break;
+
 	default:
 		llwarns << "Unhandled URLRequest action: " << mAction << llendl;
 		break;
@@ -535,7 +542,7 @@ LLIOPipe::EStatus LLContextURLExtractor::process_impl(
 	// find the context url
 	if(context.has(CONTEXT_DEST_URI_SD_LABEL))
 	{
-		mRequest->setURL(context[CONTEXT_DEST_URI_SD_LABEL]);
+		mRequest->setURL(context[CONTEXT_DEST_URI_SD_LABEL].asString());
 		return STATUS_DONE;
 	}
 	return STATUS_ERROR;
diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index b6da56b..888b962 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -76,6 +76,7 @@ public:
 		HTTP_PUT,
 		HTTP_POST,
 		HTTP_DELETE,
+		HTTP_MOVE, // Caller will need to set 'Destination' header
 		REQUEST_ACTION_COUNT
 	};
 
diff --git a/linden/indra/llmessage/llxfer.cpp b/linden/indra/llmessage/llxfer.cpp
index 5430213..ab7b1ee 100644
--- a/linden/indra/llmessage/llxfer.cpp
+++ b/linden/indra/llmessage/llxfer.cpp
@@ -103,7 +103,7 @@ void LLXfer::free ()
 
 S32 LLXfer::startSend (U64 xfer_id, const LLHost &remote_host)
 {
-	llwarns << "undifferentiated LLXfer::startSend for " << getName() << llendl;
+	llwarns << "undifferentiated LLXfer::startSend for " << getFileName() << llendl;
 	return (-1);
 }
 
@@ -119,7 +119,7 @@ void LLXfer::setXferSize (S32 xfer_size)
 
 S32 LLXfer::startDownload()
 {
-	llwarns << "undifferentiated LLXfer::startDownload for " << getName()
+	llwarns << "undifferentiated LLXfer::startDownload for " << getFileName()
 			<< llendl;
 	return (-1);
 }
@@ -293,13 +293,13 @@ S32 LLXfer::processEOF()
 
 	if (LL_ERR_NOERR == mCallbackResult)
 	{
-		llinfos << "xfer from " << mRemoteHost << " complete: " << getName()
+		llinfos << "xfer from " << mRemoteHost << " complete: " << getFileName()
 				<< llendl;
 	}
 	else
 	{
 		llinfos << "xfer from " << mRemoteHost << " failed, code "
-				<< mCallbackResult << ": " << getName() << llendl;
+				<< mCallbackResult << ": " << getFileName() << llendl;
 	}
 
 	if (mCallback)
@@ -327,7 +327,7 @@ void LLXfer::abort (S32 result_code)
 {
 	mCallbackResult = result_code;
 
-	llinfos << "Aborting xfer from " << mRemoteHost << " named " << getName()
+	llinfos << "Aborting xfer from " << mRemoteHost << " named " << getFileName()
 			<< " - error: " << result_code << llendl;
 
 	gMessageSystem->newMessageFast(_PREHASH_AbortXfer);
@@ -343,11 +343,9 @@ void LLXfer::abort (S32 result_code)
 
 ///////////////////////////////////////////////////////////
 
-const char * LLXfer::getName() 
+std::string LLXfer::getFileName() 
 {
-	static char tmp_str[256];		/* Flawfinder: ignore */
-
-	return (U64_to_str(mID, tmp_str, sizeof(tmp_str)));
+	return U64_to_str(mID);
 }
 
 ///////////////////////////////////////////////////////////
@@ -367,7 +365,7 @@ S32 LLXfer::getMaxBufferSize ()
 
 std::ostream& operator<< (std::ostream& os, LLXfer &hh)
 {
-	os << hh.getName() ;
+	os << hh.getFileName() ;
 	return os;
 }
 
diff --git a/linden/indra/llmessage/llxfer.h b/linden/indra/llmessage/llxfer.h
index 603b4d7..259f1ac 100644
--- a/linden/indra/llmessage/llxfer.h
+++ b/linden/indra/llmessage/llxfer.h
@@ -106,7 +106,7 @@ class LLXfer
 	virtual void setXferSize (S32 data_size);
 	virtual S32  getMaxBufferSize();
 
-	virtual const char *getName();
+	virtual std::string getFileName();
 
 	virtual U32 getXferTypeTag();
 
diff --git a/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index 840d84c..da12d54 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/indra/llmessage/llxfer_file.cpp
@@ -47,17 +47,17 @@
 const U32 LL_MAX_XFER_FILE_BUFFER = 65536;
 
 // local function to copy a file
-S32 copy_file(const char* from, const char* to);
+S32 copy_file(const std::string& from, const std::string& to);
 
 ///////////////////////////////////////////////////////////
 
 LLXfer_File::LLXfer_File (S32 chunk_size)
 : LLXfer(chunk_size)
 {
-	init(LLString::null, FALSE, chunk_size);
+	init(LLStringUtil::null, FALSE, chunk_size);
 }
 
-LLXfer_File::LLXfer_File (const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
+LLXfer_File::LLXfer_File (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
 : LLXfer(chunk_size)
 {
 	init(local_filename, delete_local_on_completion, chunk_size);
@@ -72,24 +72,24 @@ LLXfer_File::~LLXfer_File ()
 
 ///////////////////////////////////////////////////////////
 
-void LLXfer_File::init (const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
+void LLXfer_File::init (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
 {
 
 	mFp = NULL;
-	mLocalFilename[0] = 0;
-	mRemoteFilename[0] = 0;
+	mLocalFilename.clear();
+	mRemoteFilename.clear();
 	mRemotePath = LL_PATH_NONE;
-	mTempFilename[0] = 0;
+	mTempFilename.clear();
 	mDeleteLocalOnCompletion = FALSE;
 	mDeleteRemoteOnCompletion = FALSE;
 
 	if (!local_filename.empty())
 	{
-		strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH-1);
-		mLocalFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
+		mLocalFilename =  local_filename.substr(0,LL_MAX_PATH-1);
 
 		// You can only automatically delete .tmp file as a safeguard against nasty messages.
-		mDeleteLocalOnCompletion = (delete_local_on_completion && (strstr(mLocalFilename,".tmp") == &mLocalFilename[strlen(mLocalFilename)-4]));		/* Flawfinder : ignore */
+		std::string exten = mLocalFilename.substr(mLocalFilename.length()-4, 4);
+		mDeleteLocalOnCompletion = (delete_local_on_completion && exten == ".tmp");
 	}
 }
 	
@@ -121,8 +121,8 @@ void LLXfer_File::free ()
 ///////////////////////////////////////////////////////////
 
 S32 LLXfer_File::initializeRequest(U64 xfer_id,
-				   const LLString& local_filename,
-				   const LLString& remote_filename,
+				   const std::string& local_filename,
+				   const std::string& remote_filename,
 				   ELLPath remote_path,
 				   const LLHost& remote_host,
 				   BOOL delete_remote_on_completion,
@@ -132,15 +132,13 @@ S32 LLXfer_File::initializeRequest(U64 xfer_id,
  	S32 retval = 0;  // presume success
 	
 	mID = xfer_id;
-	strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH-1);
-	mLocalFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
-	strncpy(mRemoteFilename,remote_filename.c_str(), LL_MAX_PATH-1);
-	mRemoteFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
+	mLocalFilename = local_filename;
+	mRemoteFilename = remote_filename;
 	mRemotePath = remote_path;
 	mRemoteHost = remote_host;
 	mDeleteRemoteOnCompletion = delete_remote_on_completion;
 
-	snprintf(mTempFilename, sizeof(mTempFilename), "%s",gDirUtilp->getTempFilename().c_str());	/* Flawfinder: ignore */
+	mTempFilename = gDirUtilp->getTempFilename();
 
 	mCallback = callback;
 	mCallbackDataHandle = user_data;
@@ -343,7 +341,7 @@ S32 LLXfer_File::processEOF()
 				if(copy_file(mTempFilename, mLocalFilename) == 0)
 				{
 					llinfos << "Rename across mounts; copying+unlinking the file instead." << llendl;
-					unlink(mTempFilename);
+					unlink(mTempFilename.c_str());
 				}
 				else
 				{
@@ -384,14 +382,14 @@ S32 LLXfer_File::processEOF()
 
 ///////////////////////////////////////////////////////////
 
-BOOL LLXfer_File::matchesLocalFilename(const LLString& filename) 
+BOOL LLXfer_File::matchesLocalFilename(const std::string& filename) 
 {
 	return (filename == mLocalFilename);
 }
 
 ///////////////////////////////////////////////////////////
 
-BOOL LLXfer_File::matchesRemoteFilename(const LLString& filename, ELLPath remote_path) 
+BOOL LLXfer_File::matchesRemoteFilename(const std::string& filename, ELLPath remote_path) 
 {
 	return ((filename == mRemoteFilename) && (remote_path == mRemotePath));
 }
@@ -399,9 +397,9 @@ BOOL LLXfer_File::matchesRemoteFilename(const LLString& filename, ELLPath remote
 
 ///////////////////////////////////////////////////////////
 
-const char * LLXfer_File::getName() 
+std::string LLXfer_File::getFileName() 
 {
-	return (mLocalFilename);
+	return mLocalFilename;
 }
 
 ///////////////////////////////////////////////////////////
@@ -421,7 +419,7 @@ U32 LLXfer_File::getXferTypeTag()
 // function. It does not really spam enough information, but is useful
 // for this cpp file, because this should never be called in a
 // production environment.
-S32 copy_file(const char* from, const char* to)
+S32 copy_file(const std::string& from, const std::string& to)
 {
 	S32 rv = 0;
 	LLFILE* in = LLFile::fopen(from, "rb");	/*Flawfinder: ignore*/
diff --git a/linden/indra/llmessage/llxfer_file.h b/linden/indra/llmessage/llxfer_file.h
index b5294ad..78f77a8 100644
--- a/linden/indra/llmessage/llxfer_file.h
+++ b/linden/indra/llmessage/llxfer_file.h
@@ -39,25 +39,25 @@ class LLXfer_File : public LLXfer
 {
  protected:
  	LLFILE *mFp;
-	char mLocalFilename[LL_MAX_PATH];		/* Flawfinder : ignore */
-	char mRemoteFilename[LL_MAX_PATH];		/* Flawfinder : ignore */
+	std::string mLocalFilename;
+	std::string mRemoteFilename;
 	ELLPath mRemotePath;
-	char mTempFilename[LL_MAX_PATH];		/* Flawfinder : ignore */
+	std::string mTempFilename;
 
 	BOOL mDeleteLocalOnCompletion;
 	BOOL mDeleteRemoteOnCompletion;
 
  public:
 	LLXfer_File (S32 chunk_size);
-	LLXfer_File (const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
+	LLXfer_File (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
 	virtual ~LLXfer_File();
 
-	virtual void init(const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
+	virtual void init(const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
 	virtual void free();
 
 	virtual S32 initializeRequest(U64 xfer_id,
-								  const LLString& local_filename,
-								  const LLString& remote_filename,
+								  const std::string& local_filename,
+								  const std::string& remote_filename,
 								  ELLPath remote_path,
 								  const LLHost& remote_host,
 								  BOOL delete_remote_on_completion,
@@ -72,14 +72,14 @@ class LLXfer_File : public LLXfer
 	virtual S32 suck(S32 start_position);
 	virtual S32 flush();
 
-	virtual BOOL matchesLocalFilename(const LLString& filename);
-	virtual BOOL matchesRemoteFilename(const LLString& filename, ELLPath remote_path);
+	virtual BOOL matchesLocalFilename(const std::string& filename);
+	virtual BOOL matchesRemoteFilename(const std::string& filename, ELLPath remote_path);
 
 	virtual S32  getMaxBufferSize();
 
 	virtual U32 getXferTypeTag();
 
-	virtual const char *getName();
+	virtual std::string getFileName();
 };
 
 #endif
diff --git a/linden/indra/llmessage/llxfer_mem.cpp b/linden/indra/llmessage/llxfer_mem.cpp
index 614f027..3404520 100644
--- a/linden/indra/llmessage/llxfer_mem.cpp
+++ b/linden/indra/llmessage/llxfer_mem.cpp
@@ -55,7 +55,7 @@ LLXfer_Mem::~LLXfer_Mem ()
 
 void LLXfer_Mem::init ()
 {
-	mRemoteFilename[0] = '\0';
+	mRemoteFilename.clear();
 	mRemotePath = LL_PATH_NONE;
 	mDeleteRemoteOnCompletion = FALSE;
 }
@@ -120,7 +120,7 @@ S32 LLXfer_Mem::startSend (U64 xfer_id, const LLHost &remote_host)
 	mID = xfer_id;
    	mPacketNum = -1;
 
-//	cout << "Sending file: " << getName() << endl;
+//	cout << "Sending file: " << getFileName() << endl;
 
 	mStatus = e_LL_XFER_PENDING;
 
@@ -135,7 +135,7 @@ S32 LLXfer_Mem::processEOF()
 
 	mStatus = e_LL_XFER_COMPLETE;
 
-	llinfos << "xfer complete: " << getName() << llendl;
+	llinfos << "xfer complete: " << getFileName() << llendl;
 
 	if (mCallback)
 	{
@@ -165,8 +165,7 @@ S32 LLXfer_Mem::initializeRequest(U64 xfer_id,
 	mCallbackDataHandle = user_data;
 	mCallbackResult = LL_ERR_NOERR;
 
-	strncpy(mRemoteFilename, remote_filename.c_str(), LL_MAX_PATH-1);
-	mRemoteFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
+	mRemoteFilename = remote_filename;
 	mRemotePath = remote_path;
 	mDeleteRemoteOnCompletion = delete_remote_on_completion;
 
diff --git a/linden/indra/llmessage/llxfer_mem.h b/linden/indra/llmessage/llxfer_mem.h
index a3d6ca5..0e67a06 100644
--- a/linden/indra/llmessage/llxfer_mem.h
+++ b/linden/indra/llmessage/llxfer_mem.h
@@ -42,7 +42,7 @@ class LLXfer_Mem : public LLXfer
  private:
  protected:
 	void (*mCallback)(void *, S32, void **, S32, LLExtStat);	
-	char mRemoteFilename[LL_MAX_PATH];		/* Flawfinder : ignore */
+	std::string mRemoteFilename;
 	ELLPath mRemotePath;
 	BOOL mDeleteRemoteOnCompletion;
 
diff --git a/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index 69d580a..aede763 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/indra/llmessage/llxfer_vfile.cpp
@@ -74,10 +74,10 @@ void LLXfer_VFile::init (LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType
 
 	mVFile = NULL;
 
-	char id_string[UUID_STR_LENGTH];			/* Flawfinder : ignore */
+	std::string id_string;
 	mLocalID.toString(id_string);
 
-	snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType));		/* Flawfinder : ignore */
+	mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
 }
 	
 ///////////////////////////////////////////////////////////
@@ -118,10 +118,10 @@ S32 LLXfer_VFile::initializeRequest(U64 xfer_id,
 	mCallbackDataHandle = user_data;
 	mCallbackResult = LL_ERR_NOERR;
 
-	char id_string[UUID_STR_LENGTH];		/* Flawfinder : ignore */
+	std::string id_string;
 	mLocalID.toString(id_string);
 
-	snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType));		/* Flawfinder : ignore */
+	mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
 
 	llinfos << "Requesting " << mName << llendl;
 
@@ -328,7 +328,7 @@ BOOL LLXfer_VFile::matchesRemoteFile(const LLUUID &id, LLAssetType::EType type)
 
 //////////////////////////////////////////////////////////
 
-const char * LLXfer_VFile::getName() 
+std::string LLXfer_VFile::getFileName() 
 {
 	return mName;
 }
diff --git a/linden/indra/llmessage/llxfer_vfile.h b/linden/indra/llmessage/llxfer_vfile.h
index 8c0bebb..12d38ba 100644
--- a/linden/indra/llmessage/llxfer_vfile.h
+++ b/linden/indra/llmessage/llxfer_vfile.h
@@ -50,7 +50,7 @@ class LLXfer_VFile : public LLXfer
 
 	LLVFS *mVFS;
 
-	char mName[MAX_STRING];		/* Flawfinder : ignore */
+	std::string mName;
 
  public:
 	LLXfer_VFile ();
@@ -85,7 +85,7 @@ class LLXfer_VFile : public LLXfer
 
 	virtual U32 getXferTypeTag();
 
-	virtual const char *getName();
+	virtual std::string getFileName();
 };
 
 #endif
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index 8bf9813..90188b6 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -406,8 +406,8 @@ U64 LLXferManager::registerXfer(const void *datap, const S32 length)
 
 ///////////////////////////////////////////////////////////
 
-void LLXferManager::requestFile(const char* local_filename,
-								const char* remote_filename,
+void LLXferManager::requestFile(const std::string& local_filename,
+								const std::string& remote_filename,
 								ELLPath remote_path,
 								const LLHost& remote_host,
 								BOOL delete_remote_on_completion,
@@ -444,7 +444,7 @@ void LLXferManager::requestFile(const char* local_filename,
 		// Note: according to AaronB, this is here to deal with locks on files that were
 		// in transit during a crash,
 		if(delete_remote_on_completion &&
-		   (strstr(remote_filename,".tmp") == &remote_filename[strlen(remote_filename)-4]))		/* Flawfinder : ignore */
+		   (remote_filename.substr(remote_filename.length()-4) == ".tmp"))
 		{
 			LLFile::remove(local_filename);
 		}
@@ -464,7 +464,7 @@ void LLXferManager::requestFile(const char* local_filename,
 	}
 }
 
-void LLXferManager::requestFile(const char* remote_filename,
+void LLXferManager::requestFile(const std::string& remote_filename,
 								ELLPath remote_path,
 								const LLHost& remote_host,
 								BOOL delete_remote_on_completion,
@@ -540,7 +540,7 @@ void LLXferManager::requestVFile(const LLUUID& local_id,
 
 /*
 void LLXferManager::requestXfer(
-								const char *local_filename, 
+								const std::string& local_filename, 
 								BOOL delete_remote_on_completion,
 								U64 xfer_id, 
 								const LLHost &remote_host, 
@@ -634,11 +634,11 @@ void LLXferManager::processReceiveData (LLMessageSystem *mesgsys, void ** /*user
 		// confirm it if it was a resend of the last one, since the confirmation might have gotten dropped
 		if (decodePacketNum(packetnum) == (xferp->mPacketNum - 1))
 		{
-			llinfos << "Reconfirming xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " packet " << packetnum << llendl; 			sendConfirmPacket(mesgsys, id, decodePacketNum(packetnum), mesgsys->getSender());
+			llinfos << "Reconfirming xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " packet " << packetnum << llendl; 			sendConfirmPacket(mesgsys, id, decodePacketNum(packetnum), mesgsys->getSender());
 		}
 		else
 		{
-			llinfos << "Ignoring xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " recv'd packet " << packetnum << "; expecting " << xferp->mPacketNum << llendl;
+			llinfos << "Ignoring xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " recv'd packet " << packetnum << "; expecting " << xferp->mPacketNum << llendl;
 		}
 		return;		
 	}
@@ -717,7 +717,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
 {
 		
 	U64 id;
-	char local_filename[MAX_STRING];		/* Flawfinder : ignore */
+	std::string local_filename;
 	ELLPath local_path = LL_PATH_NONE;
 	S32 result = LL_ERR_NOERR;
 	LLUUID	uuid;
@@ -732,7 +732,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
 	llinfos << "xfer request id: " << U64_to_str(id, U64_BUF, sizeof(U64_BUF))
 		   << " to " << mesgsys->getSender() << llendl;
 
-	mesgsys->getStringFast(_PREHASH_XferID, _PREHASH_Filename, MAX_STRING, local_filename);
+	mesgsys->getStringFast(_PREHASH_XferID, _PREHASH_Filename, local_filename);
 	
 	U8 local_path_u8;
 	mesgsys->getU8("XferID", "FilePath", local_path_u8);
@@ -780,7 +780,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
 			llerrs << "Xfer allcoation error" << llendl;
 		}
 	}
-	else if (strlen(local_filename))		/* Flawfinder : ignore */
+	else if (!local_filename.empty())
 	{
 		std::string expanded_filename = gDirUtilp->getExpandedFilename( local_path, local_filename );
 		llinfos << "starting file transfer: " <<  expanded_filename << " to " << mesgsys->getSender() << llendl;
@@ -923,7 +923,7 @@ void LLXferManager::retransmitUnackedPackets ()
 		{
 			if (xferp->mRetries > LL_PACKET_RETRY_LIMIT)
 			{
-				llinfos << "dropping xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " packet retransmit limit exceeded, xfer dropped" << llendl;
+				llinfos << "dropping xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " packet retransmit limit exceeded, xfer dropped" << llendl;
 				xferp->abort(LL_ERR_TCP_TIMEOUT);
 				delp = xferp;
 				xferp = xferp->mNext;
@@ -931,7 +931,7 @@ void LLXferManager::retransmitUnackedPackets ()
 			}
 			else
 			{
-				llinfos << "resending xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " packet unconfirmed after: "<< et << " sec, packet " << xferp->mPacketNum << llendl;
+				llinfos << "resending xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " packet unconfirmed after: "<< et << " sec, packet " << xferp->mPacketNum << llendl;
 				xferp->resendLastPacket();
 				xferp = xferp->mNext;
 			}
@@ -946,7 +946,7 @@ void LLXferManager::retransmitUnackedPackets ()
 		}
 		else if (xferp->mStatus == e_LL_XFER_ABORTED)
 		{
-			llwarns << "Removing aborted xfer " << xferp->mRemoteHost << ":" << xferp->getName() << llendl;
+			llwarns << "Removing aborted xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << llendl;
 			delp = xferp;
 			xferp = xferp->mNext;
 			removeXfer(delp,&mSendList);
diff --git a/linden/indra/llmessage/llxfermanager.h b/linden/indra/llmessage/llxfermanager.h
index 82cd8e9..12b3ec0 100644
--- a/linden/indra/llmessage/llxfermanager.h
+++ b/linden/indra/llmessage/llxfermanager.h
@@ -143,8 +143,8 @@ class LLXferManager
 
 // file requesting routines
 // .. to file
-	virtual void requestFile(const char* local_filename,
-							 const char* remote_filename,
+	virtual void requestFile(const std::string& local_filename,
+							 const std::string& remote_filename,
 							 ELLPath remote_path,
 							 const LLHost& remote_host,
  							 BOOL delete_remote_on_completion,
@@ -153,7 +153,7 @@ class LLXferManager
 							 BOOL use_big_packets = FALSE);
 
 // .. to memory
-	virtual void requestFile(const char* remote_filename, 
+	virtual void requestFile(const std::string& remote_filename, 
 							 ELLPath remote_path,
 							 const LLHost &remote_host,
  							 BOOL delete_remote_on_completion,
diff --git a/linden/indra/llmessage/mean_collision_data.h b/linden/indra/llmessage/mean_collision_data.h
index 1f245f9..0f09c3e 100644
--- a/linden/indra/llmessage/mean_collision_data.h
+++ b/linden/indra/llmessage/mean_collision_data.h
@@ -55,15 +55,13 @@ class LLMeanCollisionData
 public:
 	LLMeanCollisionData(const LLUUID &victim, const LLUUID &perp, time_t time, EMeanCollisionType type, F32 mag)
 		: mVictim(victim), mPerp(perp), mTime(time), mType(type), mMag(mag)
-	{ mFirstName[0] = 0; mLastName[0] =  0; }
+	{
+	}
 	
 	LLMeanCollisionData(LLMeanCollisionData *mcd)
-		: mVictim(mcd->mVictim), mPerp(mcd->mPerp), mTime(mcd->mTime), mType(mcd->mType), mMag(mcd->mMag)
-	{ 
-		strncpy(mFirstName, mcd->mFirstName, sizeof(mFirstName) -1); /* Flawfinder: Ignore */
-		mFirstName[sizeof(mFirstName) -1] = '\0'; 
-		strncpy(mLastName, mcd->mLastName, sizeof(mLastName) -1); /* Flawfinder: Ignore */
-		mLastName[sizeof(mLastName) -1] = '\0';
+		: mVictim(mcd->mVictim), mPerp(mcd->mPerp), mTime(mcd->mTime), mType(mcd->mType), mMag(mcd->mMag),
+		  mFirstName(mcd->mFirstName), mLastName(mcd->mLastName)
+	{
 	}		
 	
 	friend std::ostream&	 operator<<(std::ostream& s, const LLMeanCollisionData &a)
@@ -96,8 +94,8 @@ public:
 	time_t mTime;
 	EMeanCollisionType mType;
 	F32	   mMag;
-	char   mFirstName[DB_FIRST_NAME_BUF_SIZE];		/* Flawfinder: Ignore */
-	char   mLastName[DB_LAST_NAME_BUF_SIZE];		/* Flawfinder: Ignore */
+	std::string mFirstName;
+	std::string mLastName;
 };
 
 
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index f3aac29..27f9d12 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -46,9 +46,9 @@
 #include <sstream>
 
 #include "llapr.h"
-#include "apr-1/apr_portable.h"
-#include "apr-1/apr_network_io.h"
-#include "apr-1/apr_poll.h"
+#include "apr_portable.h"
+#include "apr_network_io.h"
+#include "apr_poll.h"
 
 // linden library headers
 #include "indra_constants.h"
@@ -286,10 +286,11 @@ void LLMessageSystem::init()
 }
 
 // Read file and build message templates
-LLMessageSystem::LLMessageSystem(const char *filename, U32 port, 
+LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port, 
 								 S32 version_major,
 								 S32 version_minor,
-								 S32 version_patch)
+								 S32 version_patch,
+								 bool failure_is_fatal)
 {
 	init();
 
@@ -306,7 +307,7 @@ LLMessageSystem::LLMessageSystem(const char *filename, U32 port,
 
 	mCircuitPrintFreq = 60.f;		// seconds
 
-	loadTemplateFile(filename);
+	loadTemplateFile(filename, failure_is_fatal);
 
 	mTemplateMessageBuilder = new LLTemplateMessageBuilder(mMessageTemplates);
 	mLLSDMessageBuilder = new LLSDMessageBuilder();
@@ -365,9 +366,9 @@ LLMessageSystem::LLMessageSystem(const char *filename, U32 port,
 
 
 // Read file and build message templates
-void LLMessageSystem::loadTemplateFile(const char* filename)
+void LLMessageSystem::loadTemplateFile(const std::string& filename, bool failure_is_fatal)
 {
-	if(!filename)
+	if(filename.empty())
 	{
 		LL_ERRS("Messaging") << "No template filename specified" << llendl;
 		mbError = TRUE;
@@ -377,7 +378,11 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
 	std::string template_body;
 	if(!_read_file_into_string(template_body, filename))
 	{
-		LL_WARNS("Messaging") << "Failed to open template: " << filename << llendl;
+		if (failure_is_fatal) {
+			LL_ERRS("Messaging") << "Failed to open template: " << filename << llendl;
+		} else {
+			LL_WARNS("Messaging") << "Failed to open template: " << filename << llendl;
+		}
 		mbError = TRUE;
 		return;
 	}
@@ -686,9 +691,9 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
 					{
 						std::ostringstream str;
 						str << "MSG: <- " << host;
-						char buffer[MAX_STRING]; /* Flawfinder: ignore*/
-						snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", receive_size, (mIncomingCompressedSize ? mIncomingCompressedSize : receive_size), mCurrentRecvPacketID);	/* Flawfinder: ignore */
-						str << buffer << "(unknown)"
+						std::string tbuf;
+						tbuf = llformat( "\t%6d\t%6d\t%6d ", receive_size, (mIncomingCompressedSize ? mIncomingCompressedSize : receive_size), mCurrentRecvPacketID);
+						str << tbuf << "(unknown)"
 							<< (recv_reliable ? " reliable" : "")
 							<< " resent "
 							<< ((acks > 0) ? "acks" : "")
@@ -816,10 +821,9 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
 
 									LLMsgBlkData *msg_block_data = mCurrentRMessageData->mMemberBlocks[bnamep];
 
-									char errmsg[1024];
 									if (!msg_block_data)
 									{
-										sprintf(errmsg, "Block %s #%d not in message %s", block_name, blocknum, mCurrentRMessageData->mName);
+										std::string errmsg = llformat("Block %s #%d not in message %s", block_name, blocknum, mCurrentRMessageData->mName);
 										LL_ERRS("Messaging") << errmsg << llendl;
 									}
 
@@ -827,7 +831,7 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
 
 									if (!vardata.getName())
 									{
-										sprintf(errmsg, "Variable %s not in message %s block %s", vnamep, mCurrentRMessageData->mName, bnamep);
+										std::string errmsg = llformat("Variable %s not in message %s block %s", vnamep, mCurrentRMessageData->mName, bnamep);
 										LL_ERRS("Messaging") << errmsg << llendl;
 									}
 
@@ -1378,8 +1382,8 @@ S32 LLMessageSystem::sendMessage(const LLHost &host)
 	{
 		std::ostringstream str;
 		str << "MSG: -> " << host;
-		char buffer[MAX_STRING];			/* Flawfinder: ignore */
-		snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", mSendSize, buffer_length, cdp->getPacketOutID());		/* Flawfinder: ignore */
+		std::string buffer;
+		buffer = llformat( "\t%6d\t%6d\t%6d ", mSendSize, buffer_length, cdp->getPacketOutID());
 		str << buffer
 			<< mMessageBuilder->getMessageName()
 			<< (mSendReliable ? " reliable " : "");
@@ -1407,8 +1411,8 @@ void LLMessageSystem::logMsgFromInvalidCircuit( const LLHost& host, BOOL recv_re
 	{
 		std::ostringstream str;
 		str << "MSG: <- " << host;
-		char buffer[MAX_STRING];			/* Flawfinder: ignore */
-		snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize: mMessageReader->getMessageSize()), mCurrentRecvPacketID);		/* Flawfinder: ignore */
+		std::string buffer;
+		buffer = llformat( "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize: mMessageReader->getMessageSize()), mCurrentRecvPacketID);
 		str << buffer
 			<< nullToEmpty(mMessageReader->getMessageName())
 			<< (recv_reliable ? " reliable" : "")
@@ -1512,8 +1516,8 @@ void LLMessageSystem::logValidMsg(LLCircuitData *cdp, const LLHost& host, BOOL r
 	{
 		std::ostringstream str;
 		str << "MSG: <- " << host;
-		char buffer[MAX_STRING];			/* Flawfinder: ignore */
-		snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize : mMessageReader->getMessageSize()), mCurrentRecvPacketID);		/* Flawfinder: ignore */
+		std::string buffer;
+		buffer = llformat( "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize : mMessageReader->getMessageSize()), mCurrentRecvPacketID);
 		str << buffer
 			<< nullToEmpty(mMessageReader->getMessageName())
 			<< (recv_reliable ? " reliable" : "")
@@ -2086,20 +2090,18 @@ void LLMessageSystem::processUseCircuitCode(LLMessageSystem* msg,
 // static
 void LLMessageSystem::processError(LLMessageSystem* msg, void**)
 {
-	char buffer[MTUBYTES];
 	S32 error_code = 0;
 	msg->getS32("Data", "Code", error_code);
 	std::string error_token;
-	msg->getString("Data", "Token", MTUBYTES, buffer);
-	error_token.assign(buffer);
+	msg->getString("Data", "Token", error_token);
+
 	LLUUID error_id;
 	msg->getUUID("Data", "ID", error_id);
 	std::string error_system;
-	msg->getString("Data", "System", MTUBYTES, buffer);
-	error_system.assign(buffer);
+	msg->getString("Data", "System", error_system);
+
 	std::string error_message;
-	msg->getString("Data", "Message", MTUBYTES, buffer);
-	error_message.assign(buffer);
+	msg->getString("Data", "Message", error_message);
 
 	LL_WARNS("Messaging") << "Message error from " << msg->getSender() << " - "
 		<< error_code << " " << error_token << " " << error_id << " \""
@@ -2415,7 +2417,8 @@ void process_deny_trusted_circuit(LLMessageSystem *msg, void **)
 void dump_prehash_files()
 {
 	U32 i;
-	LLFILE* fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w");	/* Flawfinder: ignore */
+	std::string filename("../../indra/llmessage/message_prehash.h");
+	LLFILE* fp = LLFile::fopen(filename, "w");	/* Flawfinder: ignore */
 	if (fp)
 	{
 		fprintf(
@@ -2445,7 +2448,8 @@ void dump_prehash_files()
 		fprintf(fp, "\n\n#endif\n");
 		fclose(fp);
 	}
-	fp = LLFile::fopen("../../indra/llmessage/message_prehash.cpp", "w");	/* Flawfinder: ignore */
+	filename = std::string("../../indra/llmessage/message_prehash.cpp");
+	fp = LLFile::fopen(filename, "w");	/* Flawfinder: ignore */
 	if (fp)
 	{
 		fprintf(
@@ -2475,22 +2479,24 @@ void dump_prehash_files()
 	}
 }
 
-BOOL start_messaging_system(
+bool start_messaging_system(
 	const std::string& template_name,
 	U32 port,
 	S32 version_major,
 	S32 version_minor,
 	S32 version_patch,
-	BOOL b_dump_prehash_file,
+	bool b_dump_prehash_file,
 	const std::string& secret,
-	const LLUseCircuitCodeResponder* responder)
+	const LLUseCircuitCodeResponder* responder,
+	bool failure_is_fatal)
 {
 	gMessageSystem = new LLMessageSystem(
-		template_name.c_str(),
+		template_name,
 		port, 
 		version_major, 
 		version_minor, 
-		version_patch);
+		version_patch,
+		failure_is_fatal);
 	g_shared_secret.assign(secret);
 
 	if (!gMessageSystem)
@@ -2579,79 +2585,79 @@ void LLMessageSystem::stopLogging()
 
 void LLMessageSystem::summarizeLogs(std::ostream& str)
 {
-	char buffer[MAX_STRING];  	/* Flawfinder: ignore */ 
-	char tmp_str[MAX_STRING];	 /* Flawfinder: ignore */ 
+ 	std::string buffer;
+	std::string tmp_str;
 	F32 run_time = mMessageSystemTimer.getElapsedTimeF32();
 	str << "START MESSAGE LOG SUMMARY" << std::endl;
-	snprintf(buffer, MAX_STRING, "Run time: %12.3f seconds", run_time);	/* Flawfinder: ignore */
+	buffer = llformat( "Run time: %12.3f seconds", run_time);
 
 	// Incoming
 	str << buffer << std::endl << "Incoming:" << std::endl;
-	U64_to_str(mTotalBytesIn, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total bytes received:      %20s (%5.2f kbits per second)", tmp_str, ((F32)mTotalBytesIn * 0.008f) / run_time);	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mTotalBytesIn);
+	buffer = llformat( "Total bytes received:      %20s (%5.2f kbits per second)", tmp_str.c_str(), ((F32)mTotalBytesIn * 0.008f) / run_time);
 	str << buffer << std::endl;
-	U64_to_str(mPacketsIn, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total packets received:    %20s (%5.2f packets per second)", tmp_str, ((F32) mPacketsIn / run_time));	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mPacketsIn);
+	buffer = llformat( "Total packets received:    %20s (%5.2f packets per second)", tmp_str.c_str(), ((F32) mPacketsIn / run_time));
 	str << buffer << std::endl;
-	snprintf(buffer, MAX_STRING, "Average packet size:       %20.0f bytes", (F32)mTotalBytesIn / (F32)mPacketsIn);	/* Flawfinder: ignore */
+	buffer = llformat( "Average packet size:       %20.0f bytes", (F32)mTotalBytesIn / (F32)mPacketsIn);
 	str << buffer << std::endl;
-	U64_to_str(mReliablePacketsIn, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total reliable packets:    %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mReliablePacketsIn)/((F32) mPacketsIn + 1));		/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mReliablePacketsIn);
+	buffer = llformat( "Total reliable packets:    %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mReliablePacketsIn)/((F32) mPacketsIn + 1));
 	str << buffer << std::endl;
-	U64_to_str(mCompressedPacketsIn, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total compressed packets:  %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mCompressedPacketsIn)/((F32) mPacketsIn + 1));	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mCompressedPacketsIn);
+	buffer = llformat( "Total compressed packets:  %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mCompressedPacketsIn)/((F32) mPacketsIn + 1));
 	str << buffer << std::endl;
 	S64 savings = mUncompressedBytesIn - mCompressedBytesIn;
-	U64_to_str(savings, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total compression savings: %20s bytes", tmp_str);	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(savings);
+	buffer = llformat( "Total compression savings: %20s bytes", tmp_str.c_str());
 	str << buffer << std::endl;
-	U64_to_str(savings/(mCompressedPacketsIn +1), tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str, ((F32) mUncompressedBytesIn)/((F32) mCompressedBytesIn+1));	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(savings/(mCompressedPacketsIn +1));
+	buffer = llformat( "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mUncompressedBytesIn)/((F32) mCompressedBytesIn+1));
 	str << buffer << std::endl;
-	U64_to_str(savings/(mPacketsIn+1), tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str, ((F32) mTotalBytesIn + (F32) savings)/((F32) mTotalBytesIn + 1.f));	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(savings/(mPacketsIn+1));
+	buffer = llformat( "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mTotalBytesIn + (F32) savings)/((F32) mTotalBytesIn + 1.f));
 
 	// Outgoing
 	str << buffer << std::endl << std::endl << "Outgoing:" << std::endl;
-	U64_to_str(mTotalBytesOut, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total bytes sent:          %20s (%5.2f kbits per second)", tmp_str, ((F32)mTotalBytesOut * 0.008f) / run_time );	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mTotalBytesOut);
+	buffer = llformat( "Total bytes sent:          %20s (%5.2f kbits per second)", tmp_str.c_str(), ((F32)mTotalBytesOut * 0.008f) / run_time );
 	str << buffer << std::endl;
-	U64_to_str(mPacketsOut, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total packets sent:        %20s (%5.2f packets per second)", tmp_str, ((F32)mPacketsOut / run_time));	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mPacketsOut);
+	buffer = llformat( "Total packets sent:        %20s (%5.2f packets per second)", tmp_str.c_str(), ((F32)mPacketsOut / run_time));
 	str << buffer << std::endl;
-	snprintf(buffer, MAX_STRING, "Average packet size:       %20.0f bytes", (F32)mTotalBytesOut / (F32)mPacketsOut);	/* Flawfinder: ignore */
+	buffer = llformat( "Average packet size:       %20.0f bytes", (F32)mTotalBytesOut / (F32)mPacketsOut);
 	str << buffer << std::endl;
-	U64_to_str(mReliablePacketsOut, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total reliable packets:    %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mReliablePacketsOut)/((F32) mPacketsOut + 1));		/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mReliablePacketsOut);
+	buffer = llformat( "Total reliable packets:    %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mReliablePacketsOut)/((F32) mPacketsOut + 1));
 	str << buffer << std::endl;
-	U64_to_str(mCompressedPacketsOut, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total compressed packets:  %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mCompressedPacketsOut)/((F32) mPacketsOut + 1));		/* Flawfinder: ignore */
+	tmp_str = U64_to_str(mCompressedPacketsOut);
+	buffer = llformat( "Total compressed packets:  %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mCompressedPacketsOut)/((F32) mPacketsOut + 1));
 	str << buffer << std::endl;
 	savings = mUncompressedBytesOut - mCompressedBytesOut;
-	U64_to_str(savings, tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Total compression savings: %20s bytes", tmp_str);	/* Flawfinder: ignore */
+	tmp_str = U64_to_str(savings);
+	buffer = llformat( "Total compression savings: %20s bytes", tmp_str.c_str());
 	str << buffer << std::endl;
-	U64_to_str(savings/(mCompressedPacketsOut +1), tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str, ((F32) mUncompressedBytesOut)/((F32) mCompressedBytesOut+1));		/* Flawfinder: ignore */
+	tmp_str = U64_to_str(savings/(mCompressedPacketsOut +1));
+	buffer = llformat( "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mUncompressedBytesOut)/((F32) mCompressedBytesOut+1));
 	str << buffer << std::endl;
-	U64_to_str(savings/(mPacketsOut+1), tmp_str, sizeof(tmp_str));
-	snprintf(buffer, MAX_STRING, "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str, ((F32) mTotalBytesOut + (F32) savings)/((F32) mTotalBytesOut + 1.f));		/* Flawfinder: ignore */
+	tmp_str = U64_to_str(savings/(mPacketsOut+1));
+	buffer = llformat( "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mTotalBytesOut + (F32) savings)/((F32) mTotalBytesOut + 1.f));
 	str << buffer << std::endl << std::endl;
-	snprintf(buffer, MAX_STRING, "SendPacket failures:       %20d", mSendPacketFailureCount);	/* Flawfinder: ignore */
+	buffer = llformat( "SendPacket failures:       %20d", mSendPacketFailureCount);
 	str << buffer << std::endl;
-	snprintf(buffer, MAX_STRING, "Dropped packets:           %20d", mDroppedPackets);	/* Flawfinder: ignore */
+	buffer = llformat( "Dropped packets:           %20d", mDroppedPackets);
 	str << buffer << std::endl;
-	snprintf(buffer, MAX_STRING, "Resent packets:            %20d", mResentPackets);	/* Flawfinder: ignore */
+	buffer = llformat( "Resent packets:            %20d", mResentPackets);
 	str << buffer << std::endl;
-	snprintf(buffer, MAX_STRING, "Failed reliable resends:   %20d", mFailedResendPackets);	/* Flawfinder: ignore */
+	buffer = llformat( "Failed reliable resends:   %20d", mFailedResendPackets);
 	str << buffer << std::endl;
-	snprintf(buffer, MAX_STRING, "Off-circuit rejected packets: %17d", mOffCircuitPackets);	/* Flawfinder: ignore */
+	buffer = llformat( "Off-circuit rejected packets: %17d", mOffCircuitPackets);
 	str << buffer << std::endl;
-	snprintf(buffer, MAX_STRING, "On-circuit invalid packets:   %17d", mInvalidOnCircuitPackets);		/* Flawfinder: ignore */
+	buffer = llformat( "On-circuit invalid packets:   %17d", mInvalidOnCircuitPackets);
 	str << buffer << std::endl << std::endl;
 
 	str << "Decoding: " << std::endl;
-	snprintf(buffer, MAX_STRING, "%35s%10s%10s%10s%10s", "Message", "Count", "Time", "Max", "Avg");	/* Flawfinder: ignore */
+	buffer = llformat( "%35s%10s%10s%10s%10s", "Message", "Count", "Time", "Max", "Avg");
 	str << buffer << std:: endl;	
 	F32 avg;
 	for (message_template_name_map_t::const_iterator iter = mMessageTemplates.begin(),
@@ -2662,7 +2668,7 @@ void LLMessageSystem::summarizeLogs(std::ostream& str)
 		if(mt->mTotalDecoded > 0)
 		{
 			avg = mt->mTotalDecodeTime / (F32)mt->mTotalDecoded;
-			snprintf(buffer, MAX_STRING, "%35s%10u%10f%10f%10f", mt->mName, mt->mTotalDecoded, mt->mTotalDecodeTime, mt->mMaxDecodeTimePerMsg, avg);	/* Flawfinder: ignore */
+			buffer = llformat( "%35s%10u%10f%10f%10f", mt->mName, mt->mTotalDecoded, mt->mTotalDecodeTime, mt->mMaxDecodeTimePerMsg, avg);
 			str << buffer << std::endl;
 		}
 	}
@@ -3928,6 +3934,20 @@ void LLMessageSystem::getString(const char *block, const char *var,
 				  blocknum);
 }
 
+void LLMessageSystem::getStringFast(const char *block, const char *var, 
+									std::string& outstr, S32 blocknum)
+{
+	mMessageReader->getString(block, var, outstr, blocknum);
+}
+
+void LLMessageSystem::getString(const char *block, const char *var, 
+								std::string& outstr, S32 blocknum )
+{
+	getStringFast(LLMessageStringTable::getInstance()->getString(block), 
+				  LLMessageStringTable::getInstance()->getString(var), outstr, 
+				  blocknum);
+}
+
 S32	LLMessageSystem::getNumberOfBlocksFast(const char *blockname)
 {
 	return mMessageReader->getNumberOfBlocks(blockname);
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index 00abff4..8807521 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -283,8 +283,9 @@ public:
 
 public:
 	// Read file and build message templates
-	LLMessageSystem(const char *filename, U32 port, S32 version_major,
-		S32 version_minor, S32 version_patch);
+	LLMessageSystem(const std::string& filename, U32 port, S32 version_major,
+					S32 version_minor, S32 version_patch,
+					bool failure_is_fatal = true);
 
 	~LLMessageSystem();
 
@@ -294,7 +295,7 @@ public:
 	// Read file and build message templates filename must point to a
 	// valid string which specifies the path of a valid linden
 	// template.
-	void loadTemplateFile(const char* filename);
+	void loadTemplateFile(const std::string& filename, bool failure_is_fatal);
 
 
 	// methods for building, sending, receiving, and handling messages
@@ -515,6 +516,8 @@ public:
 	void	getIPPort(	const char *block, const char *var, U16 &port, S32 blocknum = 0);
 	void getStringFast(	const char *block, const char *var, S32 buffer_size, char *buffer, S32 blocknum = 0);
 	void	getString(	const char *block, const char *var, S32 buffer_size, char *buffer, S32 blocknum = 0);
+	void getStringFast(	const char *block, const char *var, std::string& outstr, S32 blocknum = 0);
+	void	getString(	const char *block, const char *var, std::string& outstr, S32 blocknum = 0);
 
 
 	// Utility functions to generate a replay-resistant digest check
@@ -764,16 +767,17 @@ extern LLMessageSystem	*gMessageSystem;
 
 // Must specific overall system version, which is used to determine
 // if a patch is available in the message template checksum verification.
-// Return TRUE if able to initialize system.
-BOOL start_messaging_system(
+// Return true if able to initialize system.
+bool start_messaging_system(
 	const std::string& template_name,
 	U32 port, 
 	S32 version_major,
 	S32 version_minor,
 	S32 version_patch,
-	BOOL b_dump_prehash_file,
+	bool b_dump_prehash_file,
 	const std::string& secret,
-	const LLUseCircuitCodeResponder* responder = NULL);
+	const LLUseCircuitCodeResponder* responder = NULL,
+	bool failure_is_fatal = true);
 
 void end_messaging_system();
 
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index 745271f..2ac1319 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -1371,4 +1371,7 @@ char* _PREHASH_OwnerMask = LLMessageStringTable::getInstance()->getString("Owner
 char* _PREHASH_TransferInventoryAck = LLMessageStringTable::getInstance()->getString("TransferInventoryAck");
 char* _PREHASH_RegionDenyAgeUnverified = LLMessageStringTable::getInstance()->getString("RegionDenyAgeUnverified");
 char* _PREHASH_AgeVerificationBlock = LLMessageStringTable::getInstance()->getString("AgeVerificationBlock");
+char* _PREHASH_UCoord = LLMessageStringTable::getInstance()->getString("UCoord");
+char* _PREHASH_VCoord = LLMessageStringTable::getInstance()->getString("VCoord");
+char* _PREHASH_FaceIndex = LLMessageStringTable::getInstance()->getString("FaceIndex");
 
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index e65d539..0ee02be 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -1371,6 +1371,8 @@ extern char * _PREHASH_OwnerMask;
 extern char * _PREHASH_TransferInventoryAck;
 extern char * _PREHASH_RegionDenyAgeUnverified;
 extern char * _PREHASH_AgeVerificationBlock;
-
+extern char * _PREHASH_UCoord;
+extern char * _PREHASH_VCoord;
+extern char * _PREHASH_FaceIndex;
 
 #endif
diff --git a/linden/indra/llprimitive/CMakeLists.txt b/linden/indra/llprimitive/CMakeLists.txt
new file mode 100644
index 0000000..5dc4c70
--- /dev/null
+++ b/linden/indra/llprimitive/CMakeLists.txt
@@ -0,0 +1,49 @@
+# -*- cmake -*-
+
+project(llprimitive)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llprimitive_SOURCE_FILES
+    llmaterialtable.cpp
+    llprimitive.cpp
+    lltextureanim.cpp
+    lltextureentry.cpp
+    lltreeparams.cpp
+    llvolumemessage.cpp
+    llvolumexml.cpp
+    )
+
+set(llprimitive_HEADER_FILES
+    CMakeLists.txt
+
+    legacy_object_types.h
+    llmaterialtable.h
+    llprimitive.h
+    lltextureanim.h
+    lltextureentry.h
+    lltreeparams.h
+    lltree_common.h
+    llvolumemessage.h
+    llvolumexml.h
+    material_codes.h
+    object_flags.h
+    )
+        
+set_source_files_properties(${llprimitive_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llprimitive_SOURCE_FILES ${llprimitive_HEADER_FILES})
+
+add_library (llprimitive ${llprimitive_SOURCE_FILES})
diff --git a/linden/indra/llprimitive/files.lst b/linden/indra/llprimitive/files.lst
deleted file mode 100644
index b9f5dbc..0000000
--- a/linden/indra/llprimitive/files.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-llprimitive/llmaterialtable.cpp
-llprimitive/llprimitive.cpp
-llprimitive/lltextureanim.cpp
-llprimitive/lltextureentry.cpp
-llprimitive/lltreeparams.cpp
-llprimitive/llvolumemessage.cpp
-llprimitive/llvolumexml.cpp
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp
index 5e45e44..4fb6904 100644
--- a/linden/indra/llprimitive/llmaterialtable.cpp
+++ b/linden/indra/llprimitive/llmaterialtable.cpp
@@ -125,14 +125,15 @@ LLMaterialTable::~LLMaterialTable()
 
 void LLMaterialTable::initBasicTable()
 {
-	add(LL_MCODE_STONE,"Stone", LL_DEFAULT_STONE_UUID);	
-	add(LL_MCODE_METAL,"Metal", LL_DEFAULT_METAL_UUID);
-	add(LL_MCODE_GLASS,"Glass", LL_DEFAULT_GLASS_UUID);
-	add(LL_MCODE_WOOD,"Wood", LL_DEFAULT_WOOD_UUID);
-	add(LL_MCODE_FLESH,"Flesh", LL_DEFAULT_FLESH_UUID);
-	add(LL_MCODE_PLASTIC,"Plastic", LL_DEFAULT_PLASTIC_UUID);
-	add(LL_MCODE_RUBBER,"Rubber", LL_DEFAULT_RUBBER_UUID);
-	add(LL_MCODE_LIGHT,"Light", LL_DEFAULT_LIGHT_UUID);
+	// *TODO: Translate
+	add(LL_MCODE_STONE,std::string("Stone"), LL_DEFAULT_STONE_UUID);	
+	add(LL_MCODE_METAL,std::string("Metal"), LL_DEFAULT_METAL_UUID);
+	add(LL_MCODE_GLASS,std::string("Glass"), LL_DEFAULT_GLASS_UUID);
+	add(LL_MCODE_WOOD,std::string("Wood"), LL_DEFAULT_WOOD_UUID);
+	add(LL_MCODE_FLESH,std::string("Flesh"), LL_DEFAULT_FLESH_UUID);
+	add(LL_MCODE_PLASTIC,std::string("Plastic"), LL_DEFAULT_PLASTIC_UUID);
+	add(LL_MCODE_RUBBER,std::string("Rubber"), LL_DEFAULT_RUBBER_UUID);
+	add(LL_MCODE_LIGHT,std::string("Light"), LL_DEFAULT_LIGHT_UUID);
 
 	// specify densities for these materials. . . 
     // these were taken from http://www.mcelwee.net/html/densities_of_various_materials.html
@@ -331,7 +332,7 @@ void LLMaterialTable::initBasicTable()
 	}
 }
 
-BOOL LLMaterialTable::add(U8 mcode, char* name, const LLUUID &uuid)
+BOOL LLMaterialTable::add(U8 mcode, const std::string& name, const LLUUID &uuid)
 {
 	LLMaterialInfo *infop;
 
@@ -466,13 +467,13 @@ BOOL LLMaterialTable::addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32
 	return FALSE;
 }
 
-LLUUID LLMaterialTable::getDefaultTextureID(char* name)
+LLUUID LLMaterialTable::getDefaultTextureID(const std::string& name)
 {
 	for (info_list_t::iterator iter = mMaterialInfoList.begin();
 		 iter != mMaterialInfoList.end(); ++iter)
 	{
 		LLMaterialInfo *infop = *iter;
-		if (!strcmp(name, infop->mName))
+		if (name == infop->mName)
 		{
 			return infop->mDefaultTextureID;
 		}
@@ -499,13 +500,13 @@ LLUUID LLMaterialTable::getDefaultTextureID(U8 mcode)
 }
 
 
-U8 LLMaterialTable::getMCode(const char* name)
+U8 LLMaterialTable::getMCode(const std::string& name)
 {
 	for (info_list_t::iterator iter = mMaterialInfoList.begin();
 		 iter != mMaterialInfoList.end(); ++iter)
 	{
 		LLMaterialInfo *infop = *iter;
-		if (!strcmp(name, infop->mName))
+		if (name == infop->mName)
 		{
 			return infop->mMCode;
 		}
@@ -515,7 +516,7 @@ U8 LLMaterialTable::getMCode(const char* name)
 }
 
 
-char* LLMaterialTable::getName(U8 mcode)
+std::string LLMaterialTable::getName(U8 mcode)
 {
 	mcode &= LL_MCODE_MASK;
 	for (info_list_t::iterator iter = mMaterialInfoList.begin();
diff --git a/linden/indra/llprimitive/llmaterialtable.h b/linden/indra/llprimitive/llmaterialtable.h
index 863fb25..8290195 100644
--- a/linden/indra/llprimitive/llmaterialtable.h
+++ b/linden/indra/llprimitive/llmaterialtable.h
@@ -67,7 +67,7 @@ class LLMaterialInfo
 {
 public:
 	U8		    mMCode;
-	char		mName[LLMATERIAL_INFO_NAME_LENGTH];	/* Flawfinder: ignore */
+	std::string	mName;
 	LLUUID		mDefaultTextureID;
 	LLUUID		mShatterSoundID;
 	F32         mDensity;           // kg/m^3
@@ -79,24 +79,20 @@ public:
 	F32			mDamageModifier;	// modifier on KE based damage
 	F32			mEPModifier;		// modifier on mass based EP total
 
-	LLMaterialInfo(U8 mcode, char* name, const LLUUID &uuid)
+	LLMaterialInfo(U8 mcode, const std::string& name, const LLUUID &uuid)
 	{
 		init(mcode,name,uuid);
 	};
 
-	void init(U8 mcode, char* name, const LLUUID &uuid)
+	void init(U8 mcode, const std::string& name, const LLUUID &uuid)
 	{
-		mName[0] = 0;
 		mDensity = 1000.f;             // default to 1000.0 (water)
 		mHPModifier = 1.f;
 		mDamageModifier = 1.f;
 		mEPModifier = 1.f;
 
 		mMCode = mcode;
-		if (name)
-		{
-			LLString::copy(mName,name,LLMATERIAL_INFO_NAME_LENGTH);
-		}
+		mName = name;
 		mDefaultTextureID = uuid;		
 	};
 
@@ -150,7 +146,7 @@ public:
 
 	void initBasicTable();
 
-	BOOL add(U8 mcode, char* name, const LLUUID &uuid);	                 
+	BOOL add(U8 mcode, const std::string& name, const LLUUID &uuid);	                 
 	BOOL addCollisionSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
 	BOOL addSlidingSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
 	BOOL addRollingSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
@@ -160,10 +156,10 @@ public:
 	BOOL addRestitution(U8 mcode, const F32 &restitution);
 	BOOL addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32 &damage_mod, const F32 &ep_mod);
 
-	LLUUID getDefaultTextureID(char* name);					// LLUUID::null if not found
+	LLUUID getDefaultTextureID(const std::string& name);					// LLUUID::null if not found
 	LLUUID getDefaultTextureID(U8 mcode);					// LLUUID::null if not found
-	U8     getMCode(const char* name);						// 0 if not found
-	char*  getName(U8 mcode);
+	U8     getMCode(const std::string& name);						// 0 if not found
+	std::string getName(U8 mcode);
 
 	F32 getDensity(U8 mcode);						        // kg/m^3, 0 if not found
 	F32 getFriction(U8 mcode);						        // physics values
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index 3ddf92e..bbfa53e 100644
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -760,15 +760,14 @@ U8 LLPrimitive::pCodeToLegacy(const LLPCode pcode)
 
 // static
 // Don't crash or llerrs here!  This function is used for debug strings.
-const char * LLPrimitive::pCodeToString(const LLPCode pcode)
+std::string LLPrimitive::pCodeToString(const LLPCode pcode)
 {
-	static char pcode_string[255];	/* Flawfinder: ignore */
+	std::string pcode_string;
 
 	U8 base_code = pcode & LL_PCODE_BASE_MASK;
-	pcode_string[0] = 0;
 	if (!pcode)
 	{
-		snprintf(pcode_string, sizeof(pcode_string), "null");	/* Flawfinder: ignore */
+		pcode_string = "null";
 	}
 	else if ((base_code) == LL_PCODE_LEGACY)
 	{
@@ -776,66 +775,66 @@ const char * LLPrimitive::pCodeToString(const LLPCode pcode)
 		switch (pcode)
 		{
 		case LL_PCODE_LEGACY_GRASS:
-			snprintf(pcode_string, sizeof(pcode_string), "grass");	/* Flawfinder: ignore */
+		  pcode_string = "grass";
 			break;
 		case LL_PCODE_LEGACY_PART_SYS:
-			snprintf(pcode_string, sizeof(pcode_string), "particle system");	/* Flawfinder: ignore */
+		  pcode_string = "particle system";
 			break;
 		case LL_PCODE_LEGACY_AVATAR:
-			snprintf(pcode_string, sizeof(pcode_string), "avatar");	/* Flawfinder: ignore */
+		  pcode_string = "avatar";
 			break;
 		case LL_PCODE_LEGACY_TEXT_BUBBLE:
-			snprintf(pcode_string, sizeof(pcode_string), "text bubble");	/* Flawfinder: ignore */
+		  pcode_string = "text bubble";
 			break;
 		case LL_PCODE_LEGACY_TREE:
-			snprintf(pcode_string, sizeof(pcode_string), "tree");		/* Flawfinder: ignore */
+		  pcode_string = "tree";
 			break;
 		case LL_PCODE_TREE_NEW:
-			snprintf(pcode_string, sizeof(pcode_string), "tree_new");	/* Flawfinder: ignore */
+		  pcode_string = "tree_new";
 			break;
 		default:
-			snprintf(pcode_string, sizeof(pcode_string), "unknown legacy pcode %i",(U32)pcode);	/* Flawfinder: ignore */
+		  pcode_string = llformat( "unknown legacy pcode %i",(U32)pcode);
 		}
 	}
 	else
 	{
-		char shape[32];	/* Flawfinder: ignore */
-		char mask[32];	/* Flawfinder: ignore */
+		std::string shape;
+		std::string mask;
 		if (base_code == LL_PCODE_CUBE)
 		{
-			snprintf(shape, sizeof(shape), "cube");	/* Flawfinder: ignore */
+			shape = "cube";
 		}
 		else if (base_code == LL_PCODE_CYLINDER)
 		{
-			snprintf(shape, sizeof(shape), "cylinder");	/* Flawfinder: ignore */
+			shape = "cylinder";
 		}
 		else if (base_code == LL_PCODE_CONE)
 		{
-			snprintf(shape, sizeof(shape), "cone");	/* Flawfinder: ignore */
+			shape = "cone";
 		}
 		else if (base_code == LL_PCODE_PRISM)
 		{
-			snprintf(shape, sizeof(shape), "prism");	/* Flawfinder: ignore */
+			shape = "prism";
 		}
 		else if (base_code == LL_PCODE_PYRAMID)
 		{
-			snprintf(shape, sizeof(shape), "pyramid");		/* Flawfinder: ignore */
+			shape = "pyramid";
 		}
 		else if (base_code == LL_PCODE_SPHERE)
 		{
-			snprintf(shape, sizeof(shape), "sphere");		/* Flawfinder: ignore */
+			shape = "sphere";
 		}
 		else if (base_code == LL_PCODE_TETRAHEDRON)
 		{
-			snprintf(shape, sizeof(shape), "tetrahedron");		/* Flawfinder: ignore */
+			shape = "tetrahedron";
 		}
 		else if (base_code == LL_PCODE_VOLUME)
 		{
-			snprintf(shape, sizeof(shape), "volume");		/* Flawfinder: ignore */
+			shape = "volume";
 		}
 		else if (base_code == LL_PCODE_APP)
 		{
-			snprintf(shape, sizeof(shape), "app");		/* Flawfinder: ignore */
+			shape = "app";
 		}
 		else
 		{
@@ -845,35 +844,27 @@ const char * LLPrimitive::pCodeToString(const LLPCode pcode)
 		U8 mask_code = pcode & (~LL_PCODE_BASE_MASK);
 		if (base_code == LL_PCODE_APP)
 		{
-			snprintf(mask, sizeof(mask), "%x", mask_code);		/* Flawfinder: ignore */
+			mask = llformat( "%x", mask_code);
 		}
 		else if (mask_code & LL_PCODE_HEMI_MASK)
 		{
-			snprintf(mask, sizeof(mask), "hemi");		/* Flawfinder: ignore */
+			mask = "hemi";
 		}
 		else 
 		{
-			snprintf(mask, sizeof(mask), "%x", mask_code);		/* Flawfinder: ignore */
+			mask = llformat( "%x", mask_code);
 		}
 
-		// extra sanity against snprintf() being naturally crap
-		mask[sizeof(mask)-1] = '\0';
-		shape[sizeof(shape)-1] = '\0';
-
 		if (mask[0])
 		{
-			snprintf(pcode_string, sizeof(pcode_string), "%s-%s", shape, mask);		/* Flawfinder: ignore */
+			pcode_string = llformat( "%s-%s", shape.c_str(), mask.c_str());
 		}
 		else
 		{
-			snprintf(pcode_string, sizeof(pcode_string), "%s", shape);		/* Flawfinder: ignore */
+			pcode_string = llformat( "%s", shape.c_str());
 		}
 	}
 
-	// Be really sure that pcode_string is nul-terminated after we've
-	// been using crappy snprintf() to build it.
-	pcode_string[sizeof(pcode_string)-1] = '\0';
-
 	return pcode_string;
 }
 
@@ -993,7 +984,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
 	S32 i;
 
 	/*
-	LLString old_mask_string;
+	std::string old_mask_string;
 	for (i = 0; i < 9; i++)
 	{
 		if (old_face_mask & (1 << i))
@@ -1005,7 +996,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
 			old_mask_string.append("0");
 		}
 	}
-	LLString new_mask_string;
+	std::string new_mask_string;
 	for (i = 0; i < 9; i++)
 	{
 		if (new_face_mask & (1 << i))
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index e698a31..82df35c 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -378,7 +378,7 @@ public:
 #endif
 	
 	LLPCode				getPCode() const			{ return mPrimitiveCode; }
-	const char *		getPCodeString() const		{ return pCodeToString(mPrimitiveCode); }
+	std::string			getPCodeString() const		{ return pCodeToString(mPrimitiveCode); }
 	const LLVector3&	getAngularVelocity() const	{ return mAngularVelocity; }
 	const LLVector3&	getVelocity() const			{ return mVelocity; }
 	const LLVector3&	getAcceleration() const		{ return mAcceleration; }
@@ -400,7 +400,7 @@ public:
 	void removeFlags(U32 flags) { mMiscFlags &= ~flags; }
 	U32 getFlags() const { return mMiscFlags; }
 
-	static const char *pCodeToString(const LLPCode pcode);
+	static std::string pCodeToString(const LLPCode pcode);
 	static LLPCode legacyToPCode(const U8 legacy);
 	static U8 pCodeToLegacy(const LLPCode pcode);
 	static bool getTESTAxes(const U8 face, U32* s_axis, U32* t_axis);
diff --git a/linden/indra/llprimitive/llprimitive.vcproj b/linden/indra/llprimitive/llprimitive.vcproj
deleted file mode 100644
index 620ace4..0000000
--- a/linden/indra/llprimitive/llprimitive.vcproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llprimitive"
-	ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;LL_CURRENT_HAVOK_VERSION=460"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;LL_CURRENT_HAVOK_VERSION=460"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;LL_CURRENT_HAVOK_VERSION=460"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llmaterialtable.cpp">
-			</File>
-			<File
-				RelativePath=".\llprimitive.cpp">
-			</File>
-			<File
-				RelativePath=".\lltextureanim.cpp">
-			</File>
-			<File
-				RelativePath=".\lltextureentry.cpp">
-			</File>
-			<File
-				RelativePath=".\lltreeparams.cpp">
-			</File>
-			<File
-				RelativePath=".\llvolumemessage.cpp">
-			</File>
-			<File
-				RelativePath=".\llvolumexml.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\legacy_object_types.h">
-			</File>
-			<File
-				RelativePath=".\llmaterialtable.h">
-			</File>
-			<File
-				RelativePath=".\llprimitive.h">
-			</File>
-			<File
-				RelativePath=".\llprimlinkinfo.h">
-			</File>
-			<File
-				RelativePath=".\lltextureanim.h">
-			</File>
-			<File
-				RelativePath=".\lltextureentry.h">
-			</File>
-			<File
-				RelativePath=".\lltree_common.h">
-			</File>
-			<File
-				RelativePath=".\lltreeparams.h">
-			</File>
-			<File
-				RelativePath=".\llvolumemessage.h">
-			</File>
-			<File
-				RelativePath=".\llvolumexml.h">
-			</File>
-			<File
-				RelativePath=".\material_codes.h">
-			</File>
-			<File
-				RelativePath=".\object_flags.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llprimitive/llprimitive_vc8.vcproj b/linden/indra/llprimitive/llprimitive_vc8.vcproj
deleted file mode 100644
index 860f88a..0000000
--- a/linden/indra/llprimitive/llprimitive_vc8.vcproj
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llprimitive"
-	ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
-	RootNamespace="llprimitive"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llmaterialtable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprimitive.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureanim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureentry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltreeparams.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumexml.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\legacy_object_types.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaterialtable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprimitive.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureanim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureentry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltree_common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltreeparams.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumexml.h"
-				>
-			</File>
-			<File
-				RelativePath=".\material_codes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\object_flags.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llprimitive/llprimitive_vc9.vcproj b/linden/indra/llprimitive/llprimitive_vc9.vcproj
deleted file mode 100644
index 1e04970..0000000
--- a/linden/indra/llprimitive/llprimitive_vc9.vcproj
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llprimitive"
-	ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}"
-	RootNamespace="llprimitive"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llprimitive.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llmaterialtable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprimitive.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureanim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureentry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltreeparams.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumexml.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\legacy_object_types.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaterialtable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprimitive.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureanim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureentry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltree_common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltreeparams.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumemessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvolumexml.h"
-				>
-			</File>
-			<File
-				RelativePath=".\material_codes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\object_flags.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llrender/CMakeLists.txt b/linden/indra/llrender/CMakeLists.txt
new file mode 100644
index 0000000..76858d9
--- /dev/null
+++ b/linden/indra/llrender/CMakeLists.txt
@@ -0,0 +1,83 @@
+# -*- cmake -*-
+
+project(llrender)
+
+include(00-Common)
+include(FreeType)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLRender)
+include(LLWindow)
+
+include_directories(
+    ${FREETYPE_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLRENDER_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    )
+
+set(llrender_SOURCE_FILES
+    llcubemap.cpp
+    llfont.cpp
+    llfontgl.cpp
+    llgldbg.cpp
+    llglslshader.cpp
+    llimagegl.cpp
+    llpostprocess.cpp
+    llrender.cpp
+    llrendersphere.cpp
+    llrendertarget.cpp
+    llshadermgr.cpp
+    llvertexbuffer.cpp
+    )
+    
+set(llrender_HEADER_FILES
+    CMakeLists.txt
+
+    llcubemap.h
+    llfontgl.h
+    llfont.h
+    llgl.h
+    llgldbg.h
+    llglheaders.h
+    llglslshader.h
+    llglstates.h
+    llgltypes.h
+    llimagegl.h
+    llpostprocess.h
+    llrender.h
+    llrendersphere.h
+    llrendertarget.h
+    llshadermgr.h
+    llvertexbuffer.h
+    )
+
+set_source_files_properties(${llrender_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llrender_SOURCE_FILES ${llrender_HEADER_FILES})
+
+if (SERVER AND NOT WINDOWS AND NOT DARWIN)
+  copy_server_sources(
+      llgl
+      )
+
+
+  set_source_files_properties(
+    ${server_SOURCE_FILES}
+    PROPERTIES
+    COMPILE_FLAGS "-DLL_MESA=1 -DLL_MESA_HEADLESS=1"
+    )
+  add_library (llrenderheadless
+    ${llrender_SOURCE_FILES}
+    ${server_SOURCE_FILES}
+    )
+else (SERVER AND NOT WINDOWS AND NOT DARWIN)
+  list(APPEND llrender_SOURCE_FILES
+      llgl.cpp
+      )
+endif (SERVER AND NOT WINDOWS AND NOT DARWIN)
+add_library (llrender ${llrender_SOURCE_FILES})
diff --git a/linden/indra/llrender/files.darwin.lst b/linden/indra/llrender/files.darwin.lst
deleted file mode 100644
index 2d27570..0000000
--- a/linden/indra/llrender/files.darwin.lst
+++ /dev/null
@@ -1 +0,0 @@
-llrender/llagpmempoolapple.cpp
diff --git a/linden/indra/llrender/files.lst b/linden/indra/llrender/files.lst
deleted file mode 100644
index 5dc9579..0000000
--- a/linden/indra/llrender/files.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-llrender/llfont.cpp
-llrender/llfontgl.cpp
-llrender/llgldbg.cpp
-llrender/llrender.cpp
-llrender/llimagegl.cpp
-llrender/llrendertarget.cpp
-llrender/llvertexbuffer.cpp
diff --git a/linden/indra/llrender/llcubemap.cpp b/linden/indra/llrender/llcubemap.cpp
new file mode 100644
index 0000000..563d616
--- /dev/null
+++ b/linden/indra/llrender/llcubemap.cpp
@@ -0,0 +1,532 @@
+/** 
+ * @file llcubemap.cpp
+ * @brief LLCubeMap class implementation
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+
+#include "llworkerthread.h"
+
+#include "llcubemap.h"
+
+#include "v4coloru.h"
+#include "v3math.h"
+#include "v3dmath.h"
+#include "m3math.h"
+#include "m4math.h"
+#include "llcamera.h"
+
+#include "llrender.h"
+
+#include "llglheaders.h"
+
+const F32 epsilon = 1e-7f;
+const U16 RESOLUTION = 64;
+
+#if LL_DARWIN
+// mipmap generation on cubemap textures seems to be broken on the Mac for at least some cards.
+// Since the cubemap is small (64x64 per face) and doesn't have any fine detail, turning off mipmaps is a usable workaround.
+const BOOL use_cube_mipmaps = FALSE;
+#else
+const BOOL use_cube_mipmaps = FALSE;  //current build works best without cube mipmaps
+#endif
+
+bool LLCubeMap::sUseCubeMaps = true;
+
+LLCubeMap::LLCubeMap()
+	: mTextureStage(0),
+	  mTextureCoordStage(0),
+	  mMatrixStage(0)
+{
+}
+
+LLCubeMap::~LLCubeMap()
+{
+}
+
+void LLCubeMap::initGL()
+{
+	llassert(gGLManager.mInited);
+
+	if (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)
+	{
+		mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
+		mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
+		mTargets[2] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB;
+		mTargets[3] = GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB;
+		mTargets[4] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB;
+		mTargets[5] = GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB;
+		
+		// Not initialized, do stuff.
+		if (mImages[0].isNull())
+		{
+			GLuint texname = 0;
+			
+			glGenTextures(1, &texname);
+
+			for (int i = 0; i < 6; i++)
+			{
+				mImages[i] = new LLImageGL(64, 64, 4, (use_cube_mipmaps? TRUE : FALSE));
+				mImages[i]->setTarget(mTargets[i], GL_TEXTURE_CUBE_MAP_ARB);
+				mRawImages[i] = new LLImageRaw(64, 64, 4);
+				mImages[i]->createGLTexture(0, mRawImages[i], texname);
+				
+				glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, texname);
+				mImages[i]->setClampCubemap (TRUE, TRUE, TRUE);
+				stop_glerror();
+			}
+		}
+		disable();
+	}
+	else
+	{
+		llwarns << "Using cube map without extension!" << llendl
+	}
+}
+
+void LLCubeMap::initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages)
+{
+	bool flip_x[6] =	{ false, true,  false, false, true,  false };
+	bool flip_y[6] = 	{ true,  true,  true,  false, true,  true  };
+	bool transpose[6] = { false, false, false, false, true,  true  };
+	
+	// Yes, I know that this is inefficient! - djs 08/08/02
+	for (int i = 0; i < 6; i++)
+	{
+		const U8 *sd = rawimages[i]->getData();
+		U8 *td = mRawImages[i]->getData();
+
+		S32 offset = 0;
+		S32 sx, sy, so;
+		for (int y = 0; y < 64; y++)
+		{
+			for (int x = 0; x < 64; x++)
+			{
+				sx = x;
+				sy = y;
+				if (flip_y[i])
+				{
+					sy = 63 - y;
+				}
+				if (flip_x[i])
+				{
+					sx = 63 - x;
+				}
+				if (transpose[i])
+				{
+					S32 temp = sx;
+					sx = sy;
+					sy = temp;
+				}
+
+				so = 64*sy + sx;
+				so *= 4;
+				*(td + offset++) = *(sd + so++);
+				*(td + offset++) = *(sd + so++);
+				*(td + offset++) = *(sd + so++);
+				*(td + offset++) = *(sd + so++);
+			}
+		}
+	}
+}
+
+void LLCubeMap::initGLData()
+{
+	for (int i = 0; i < 6; i++)
+	{
+		mImages[i]->setSubImage(mRawImages[i], 0, 0, 64, 64);
+	}
+}
+
+void LLCubeMap::init(const std::vector<LLPointer<LLImageRaw> >& rawimages)
+{
+	if (!gGLManager.mIsDisabled)
+	{
+		initGL();
+		initRawData(rawimages);
+		initGLData();
+	}
+}
+
+GLuint LLCubeMap::getGLName()
+{
+	return mImages[0]->getTexName();
+}
+
+void LLCubeMap::bind()
+{
+	if (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)
+	{
+		// We assume that if they have cube mapping, they have multitexturing.
+		if (mTextureStage > 0)
+		{
+			gGL.getTexUnit(mTextureStage)->activate();
+		}
+		glEnable(GL_TEXTURE_CUBE_MAP_ARB);
+		glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, mImages[0]->getTexName());
+
+		mImages[0]->setMipFilterNearest (FALSE, FALSE);
+		if (mTextureStage > 0)
+		{
+			gGL.getTexUnit(0)->activate();
+		}
+	}
+	else
+	{
+		llwarns << "Using cube map without extension!" << llendl
+	}
+}
+
+void LLCubeMap::enable(S32 stage)
+{
+	enableTexture(stage);
+	enableTextureCoords(stage);
+}
+
+void LLCubeMap::enableTexture(S32 stage)
+{
+	mTextureStage = stage;
+	if (gGLManager.mHasCubeMap && stage >= 0 && LLCubeMap::sUseCubeMaps)
+	{
+		if (stage > 0)
+		{
+			gGL.getTexUnit(stage)->activate();
+		}
+		
+		glEnable(GL_TEXTURE_CUBE_MAP_ARB);
+		
+		if (stage > 0)
+		{
+			gGL.getTexUnit(0)->activate();
+		}
+	}
+}
+
+void LLCubeMap::enableTextureCoords(S32 stage)
+{
+	mTextureCoordStage = stage;
+	if (gGLManager.mHasCubeMap && stage >= 0 && LLCubeMap::sUseCubeMaps)
+	{
+		if (stage > 0)
+		{
+			gGL.getTexUnit(stage)->activate();
+		}
+		
+		glEnable(GL_TEXTURE_GEN_R);
+		glEnable(GL_TEXTURE_GEN_S);
+		glEnable(GL_TEXTURE_GEN_T);
+
+		glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP);
+		glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP);
+		glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP);
+		
+		if (stage > 0)
+		{
+			gGL.getTexUnit(0)->activate();
+		}
+	}
+}
+
+void LLCubeMap::disable(void)
+{
+	disableTexture();
+	disableTextureCoords();
+}
+
+void LLCubeMap::disableTexture(void)
+{
+	if (gGLManager.mHasCubeMap && mTextureStage >= 0 && LLCubeMap::sUseCubeMaps)
+	{
+		if (mTextureStage > 0)
+		{
+			gGL.getTexUnit(mTextureStage)->activate();
+		}
+		glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
+		glDisable(GL_TEXTURE_CUBE_MAP_ARB);
+		if (mTextureStage > 0)
+		{
+			gGL.getTexUnit(0)->activate();
+		}
+	}
+}
+
+void LLCubeMap::disableTextureCoords(void)
+{
+	if (gGLManager.mHasCubeMap && mTextureCoordStage >= 0 && LLCubeMap::sUseCubeMaps)
+	{
+		if (mTextureCoordStage > 0)
+		{
+			gGL.getTexUnit(mTextureCoordStage)->activate();
+		}
+		glDisable(GL_TEXTURE_GEN_S);
+		glDisable(GL_TEXTURE_GEN_T);
+		glDisable(GL_TEXTURE_GEN_R);
+		if (mTextureCoordStage > 0)
+		{
+			gGL.getTexUnit(0)->activate();
+		}
+	}
+}
+
+void LLCubeMap::setMatrix(S32 stage)
+{
+	mMatrixStage = stage;
+	
+	if (stage > 0)
+	{
+		gGL.getTexUnit(stage)->activate();
+	}
+
+	LLVector3 x(LLVector3d(gGLModelView+0));
+	LLVector3 y(LLVector3d(gGLModelView+4));
+	LLVector3 z(LLVector3d(gGLModelView+8));
+
+	LLMatrix3 mat3;
+	mat3.setRows(x,y,z);
+	LLMatrix4 trans(mat3);
+	trans.transpose();
+
+	glMatrixMode(GL_TEXTURE);
+	glPushMatrix();
+	glLoadMatrixf((F32 *)trans.mMatrix);
+	glMatrixMode(GL_MODELVIEW);
+	
+	if (stage > 0)
+	{
+		gGL.getTexUnit(0)->activate();
+	}
+}
+
+void LLCubeMap::restoreMatrix()
+{
+	if (mMatrixStage > 0)
+	{
+		gGL.getTexUnit(mMatrixStage)->activate();
+	}
+	glMatrixMode(GL_TEXTURE);
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+	
+	if (mMatrixStage > 0)
+	{
+		gGL.getTexUnit(0)->activate();
+	}
+}
+
+void LLCubeMap::setReflection (void)
+{
+	glBindTexture (GL_TEXTURE_CUBE_MAP_ARB, getGLName());
+	mImages[0]->setMipFilterNearest (FALSE, FALSE);
+	mImages[0]->setClampCubemap (TRUE, TRUE);
+}
+
+LLVector3 LLCubeMap::map(U8 side, U16 v_val, U16 h_val) const
+{
+	LLVector3 dir;
+
+	const U8 curr_coef = side >> 1; // 0/1 = X axis, 2/3 = Y, 4/5 = Z
+	const S8 side_dir = (((side & 1) << 1) - 1);  // even = -1, odd = 1
+	const U8 i_coef = (curr_coef + 1) % 3;
+	const U8 j_coef = (i_coef + 1) % 3;
+
+	dir.mV[curr_coef] = side_dir;
+
+	switch (side)
+	{
+	case 0: // negative X
+		dir.mV[i_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
+		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
+		break;
+	case 1: // positive X
+		dir.mV[i_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
+		dir.mV[j_coef] = -F32((h_val<<1) + 1) / RESOLUTION + 1;
+		break;
+	case 2:	// negative Y
+		dir.mV[i_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
+		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
+		break;
+	case 3:	// positive Y
+		dir.mV[i_coef] = F32((v_val<<1) + 1) / RESOLUTION - 1;
+		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
+		break;
+	case 4:	// negative Z
+		dir.mV[i_coef] = -F32((h_val<<1) + 1) / RESOLUTION + 1;
+		dir.mV[j_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
+		break;
+	case 5: // positive Z
+		dir.mV[i_coef] = -F32((h_val<<1) + 1) / RESOLUTION + 1;
+		dir.mV[j_coef] = F32((v_val<<1) + 1) / RESOLUTION - 1;
+		break;
+	default:
+		dir.mV[i_coef] = F32((v_val<<1) + 1) / RESOLUTION - 1;
+		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
+	}
+
+	dir.normVec();
+	return dir;
+}
+
+
+BOOL LLCubeMap::project(F32& v_val, F32& h_val, BOOL& outside,
+						U8 side, const LLVector3& dir) const
+{
+	const U8 curr_coef = side >> 1; // 0/1 = X axis, 2/3 = Y, 4/5 = Z
+	const S8 side_dir = (((side & 1) << 1) - 1);  // even = -1, odd = 1
+	const U8 i_coef = (curr_coef + 1) % 3;
+	const U8 j_coef = (i_coef + 1) % 3;
+
+	outside = TRUE;
+	if (side_dir * dir.mV[curr_coef] < 0)
+		return FALSE;
+
+	LLVector3 ray;
+
+	F32 norm_val = fabs(dir.mV[curr_coef]);
+
+	if (norm_val < epsilon)
+		norm_val = 1e-5f;
+
+	ray.mV[curr_coef] = side_dir;
+	ray.mV[i_coef] = dir.mV[i_coef] / norm_val;
+	ray.mV[j_coef] = dir.mV[j_coef] / norm_val;
+
+
+	const F32 i_val = (ray.mV[i_coef] + 1) * 0.5f * RESOLUTION;
+	const F32 j_val = (ray.mV[j_coef] + 1) * 0.5f * RESOLUTION;
+
+	switch (side)
+	{
+	case 0: // negative X
+		v_val = RESOLUTION - i_val;
+		h_val = j_val;
+		break;
+	case 1: // positive X
+		v_val = RESOLUTION - i_val;
+		h_val = RESOLUTION - j_val;
+		break;
+	case 2:	// negative Y
+		v_val = RESOLUTION - i_val;
+		h_val = j_val;
+		break;
+	case 3:	// positive Y
+		v_val = i_val;
+		h_val = j_val;
+		break;
+	case 4:	// negative Z
+		v_val = RESOLUTION - j_val;
+		h_val = RESOLUTION - i_val;
+		break;
+	case 5: // positive Z
+		v_val = RESOLUTION - j_val;
+		h_val = i_val;
+		break;
+	default:
+		v_val = i_val;
+		h_val = j_val;
+	}
+
+	outside =  ((v_val < 0) || (v_val > RESOLUTION) ||
+		(h_val < 0) || (h_val > RESOLUTION));
+
+	return TRUE;
+}
+
+BOOL LLCubeMap::project(F32& v_min, F32& v_max, F32& h_min, F32& h_max, 
+						U8 side, LLVector3 dir[4]) const
+{
+	v_min = h_min = RESOLUTION;
+	v_max = h_max = 0;
+
+	BOOL fully_outside = TRUE;
+	for (U8 vtx = 0; vtx < 4; ++vtx)
+	{
+		F32 v_val, h_val;
+		BOOL outside;
+		BOOL consider = project(v_val, h_val, outside, side, dir[vtx]);
+		if (!outside)
+			fully_outside = FALSE;
+		if (consider)
+		{
+			if (v_val < v_min) v_min = v_val;
+			if (v_val > v_max) v_max = v_val;
+			if (h_val < h_min) h_min = h_val;
+			if (h_val > h_max) h_max = h_val;
+		}
+	}
+
+	v_min = llmax(0.0f, v_min);
+	v_max = llmin(RESOLUTION - epsilon, v_max);
+	h_min = llmax(0.0f, h_min);
+	h_max = llmin(RESOLUTION - epsilon, h_max);
+
+	return !fully_outside;
+}
+
+
+void LLCubeMap::paintIn(LLVector3 dir[4], const LLColor4U& col)
+{
+	F32 v_min, v_max, h_min, h_max;
+	LLVector3 center = dir[0] + dir[1] + dir[2] + dir[3];
+	center.normVec();
+
+	for (U8 side = 0; side < 6; ++side)
+	{
+		if (!project(v_min, v_max, h_min, h_max, side, dir))
+			continue;
+
+		U8 *td = mRawImages[side]->getData();
+		
+		U16 v_minu = (U16) v_min;
+		U16 v_maxu = (U16) (ceil(v_max) + 0.5);
+		U16 h_minu = (U16) h_min;
+		U16 h_maxu = (U16) (ceil(h_max) + 0.5);
+
+		for (U16 v = v_minu; v < v_maxu; ++v)
+			for (U16 h = h_minu; h < h_maxu; ++h)
+		//for (U16 v = 0; v < RESOLUTION; ++v)
+		//	for (U16 h = 0; h < RESOLUTION; ++h)
+			{
+				const LLVector3 ray = map(side, v, h);
+				if (ray * center > 0.999)
+				{
+					const U32 offset = (RESOLUTION * v + h) * 4;
+					for (U8 cc = 0; cc < 3; ++cc)
+						td[offset + cc] = U8((td[offset + cc] + col.mV[cc]) * 0.5);
+				}
+			}
+		mImages[side]->setSubImage(mRawImages[side], 0, 0, 64, 64);
+	}
+}
+
+void LLCubeMap::destroyGL()
+{
+	for (S32 i = 0; i < 6; i++)
+	{
+		mImages[i] = NULL;
+	}
+}
diff --git a/linden/indra/llrender/llcubemap.h b/linden/indra/llrender/llcubemap.h
new file mode 100644
index 0000000..45bfa16
--- /dev/null
+++ b/linden/indra/llrender/llcubemap.h
@@ -0,0 +1,89 @@
+/** 
+ * @file llcubemap.h
+ * @brief LLCubeMap class definition
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLCUBEMAP_H
+#define LL_LLCUBEMAP_H
+
+#include "llgl.h"
+
+#include <vector>
+
+class LLVector3;
+
+// Environment map hack!
+class LLCubeMap : public LLRefCount
+{
+public:
+	LLCubeMap();
+	void init(const std::vector<LLPointer<LLImageRaw> >& rawimages);
+	void initGL();
+	void initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages);
+	void initGLData();
+
+	void bind();
+	void enable(S32 stage);
+	
+	void enableTexture(S32 stage);
+	void enableTextureCoords(S32 stage);
+	
+	void disable(void);
+	void disableTexture(void);
+	void disableTextureCoords(void);
+	void setMatrix(S32 stage);
+	void restoreMatrix();
+	void setReflection (void);
+
+	void finishPaint();
+
+	GLuint getGLName();
+
+	LLVector3 map(U8 side, U16 v_val, U16 h_val) const;
+	BOOL project(F32& v_val, F32& h_val, BOOL& outside,
+						U8 side, const LLVector3& dir) const;
+	BOOL project(F32& v_min, F32& v_max, F32& h_min, F32& h_max, 
+						U8 side, LLVector3 dir[4]) const;
+	void paintIn(LLVector3 dir[4], const LLColor4U& col);
+	void destroyGL();
+
+public:
+	static bool sUseCubeMaps;
+
+protected:
+	~LLCubeMap();
+	LLGLenum mTargets[6];
+	LLPointer<LLImageGL> mImages[6];
+	LLPointer<LLImageRaw> mRawImages[6];
+	S32 mTextureStage;
+	S32 mTextureCoordStage;
+	S32 mMatrixStage;
+};
+
+#endif
diff --git a/linden/indra/llrender/llfont.h b/linden/indra/llrender/llfont.h
index 071e508..d937dfd 100644
--- a/linden/indra/llrender/llfont.h
+++ b/linden/indra/llrender/llfont.h
@@ -121,11 +121,11 @@ public:
 //	                     ^     ^
 //						 |     |
 //				xxx x    |Ascender
-//	           x   x     |     |
+//	           x   x     v     |
 //	---------   xxxx-------------- Baseline
-//	^		       x	 |     |
-//  | descender    x     |     |
-//	v			xxxx     v     |LineHeight
+//	^		       x	       |
+//  | Descender    x           |
+//	v			xxxx           |LineHeight
 //  -----------------------    |
 //                             v
 //	------------------------------
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 253bf50..a328196 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -48,7 +48,7 @@ F32 LLFontGL::sHorizDPI = 96.f;
 F32 LLFontGL::sScaleX = 1.f;
 F32 LLFontGL::sScaleY = 1.f;
 BOOL LLFontGL::sDisplayFont = TRUE ;
-LLString LLFontGL::sAppDir;
+std::string LLFontGL::sAppDir;
 
 LLFontGL* LLFontGL::sMonospace = NULL;
 LLFontGL* LLFontGL::sSansSerifSmall = NULL;
@@ -93,7 +93,7 @@ F32 llfont_round_y(F32 y)
 }
 
 // static
-U8 LLFontGL::getStyleFromString(const LLString &style)
+U8 LLFontGL::getStyleFromString(const std::string &style)
 {
 	S32 ret = 0;
 	if (style.find("NORMAL") != style.npos)
@@ -166,9 +166,9 @@ void LLFontGL::reset()
 }
 
 // static 
-LLString LLFontGL::getFontPathSystem()
+std::string LLFontGL::getFontPathSystem()
 {
-	LLString system_path;
+	std::string system_path;
 
 	// Try to figure out where the system's font files are stored.
 	char *system_root = NULL;
@@ -199,9 +199,9 @@ LLString LLFontGL::getFontPathSystem()
 
 
 // static 
-LLString LLFontGL::getFontPathLocal()
+std::string LLFontGL::getFontPathLocal()
 {
-	LLString local_path;
+	std::string local_path;
 
 	// Backup files if we can't load from system fonts directory.
 	// We could store this in an end-user writable directory to allow
@@ -220,10 +220,10 @@ LLString LLFontGL::getFontPathLocal()
 }
 
 //static
-bool LLFontGL::loadFaceFallback(LLFontList *fontlistp, const LLString& fontname, const F32 point_size)
+bool LLFontGL::loadFaceFallback(LLFontList *fontlistp, const std::string& fontname, const F32 point_size)
 {
-	LLString local_path = getFontPathLocal();
-	LLString sys_path = getFontPathSystem();
+	std::string local_path = getFontPathLocal();
+	std::string sys_path = getFontPathSystem();
 	
 	// The fontname string may contain multiple font file names separated by semicolons.
 	// Break it apart and try loading each one, in order.
@@ -235,7 +235,7 @@ bool LLFontGL::loadFaceFallback(LLFontList *fontlistp, const LLString& fontname,
 	for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
 	{
 		LLFont *fontp = new LLFont();
-		LLString font_path = local_path + *token_iter;
+		std::string font_path = local_path + *token_iter;
 		if (!fontp->loadFace(font_path, point_size, sVertDPI, sHorizDPI, 2, TRUE))
 		{
 			font_path = sys_path + *token_iter;
@@ -258,13 +258,13 @@ bool LLFontGL::loadFaceFallback(LLFontList *fontlistp, const LLString& fontname,
 }
 
 //static
-bool LLFontGL::loadFace(LLFontGL *fontp, const LLString& fontname, const F32 point_size, LLFontList *fallback_fontp)
+bool LLFontGL::loadFace(LLFontGL *fontp, const std::string& fontname, const F32 point_size, LLFontList *fallback_fontp)
 {
-	LLString local_path = getFontPathLocal();
-	LLString font_path = local_path + fontname;
+	std::string local_path = getFontPathLocal();
+	std::string font_path = local_path + fontname;
 	if (!fontp->loadFace(font_path, point_size, sVertDPI, sHorizDPI, 2, FALSE))
 	{
-		LLString sys_path = getFontPathSystem();
+		std::string sys_path = getFontPathSystem();
 		font_path = sys_path + fontname;
 		if (!fontp->loadFace(font_path, point_size, sVertDPI, sHorizDPI, 2, FALSE))
 		{
@@ -280,12 +280,12 @@ bool LLFontGL::loadFace(LLFontGL *fontp, const LLString& fontname, const F32 poi
 
 // static
 BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
-				const LLString& monospace_file, F32 monospace_size,
-				const LLString& sansserif_file,
-				const LLString& sanserif_fallback_file, F32 ss_fallback_scale,
+				const std::string& monospace_file, F32 monospace_size,
+				const std::string& sansserif_file,
+				const std::string& sanserif_fallback_file, F32 ss_fallback_scale,
 				F32 small_size, F32 medium_size, F32 big_size, F32 huge_size,
-				const LLString& sansserif_bold_file, F32 bold_size,
-				const LLString& app_dir)
+				const std::string& sansserif_bold_file, F32 bold_size,
+				const std::string& app_dir)
 {
 	BOOL failed = FALSE;
 	sVertDPI = (F32)llfloor(screen_dpi * y_scale);
@@ -554,7 +554,7 @@ BOOL LLFontGL::addChar(const llwchar wch)
 }
 
 
-S32 LLFontGL::renderUTF8(const LLString &text, const S32 offset, 
+S32 LLFontGL::renderUTF8(const std::string &text, const S32 offset, 
 					 const F32 x, const F32 y,
 					 const LLColor4 &color,
 					 const HAlign halign, const VAlign valign,
@@ -726,7 +726,7 @@ S32 LLFontGL::render(const LLWString &wstr,
 		if (getWidthF32(wstr.c_str(), 0, max_chars) * sScaleX > scaled_max_pixels)
 		{
 			// use four dots for ellipsis width to generate padding
-			const LLWString dots(utf8str_to_wstring(LLString("....")));
+			const LLWString dots(utf8str_to_wstring(std::string("....")));
 			scaled_max_pixels = llmax(0, scaled_max_pixels - llround(getWidthF32(dots.c_str())));
 			draw_ellipses = TRUE;
 		}
@@ -879,7 +879,7 @@ S32 LLFontGL::render(const LLWString &wstr,
 		//glLoadIdentity();
 		//gGL.translatef(sCurOrigin.mX, sCurOrigin.mY, 0.0f);
 		//glScalef(sScaleX, sScaleY, 1.f);
-		renderUTF8("...", 
+		renderUTF8(std::string("..."), 
 				0,
 				cur_x / sScaleX, (F32)y,
 				color,
@@ -902,7 +902,7 @@ LLImageGL *LLFontGL::getImageGL() const
 	return mImageGLp;
 }
 
-S32 LLFontGL::getWidth(const LLString& utf8text) const
+S32 LLFontGL::getWidth(const std::string& utf8text) const
 {
 	LLWString wtext = utf8str_to_wstring(utf8text);
 	return getWidth(wtext.c_str(), 0, S32_MAX);
@@ -913,7 +913,7 @@ S32 LLFontGL::getWidth(const llwchar* wchars) const
 	return getWidth(wchars, 0, S32_MAX);
 }
 
-S32 LLFontGL::getWidth(const LLString& utf8text, const S32 begin_offset, const S32 max_chars) const
+S32 LLFontGL::getWidth(const std::string& utf8text, const S32 begin_offset, const S32 max_chars) const
 {
 	LLWString wtext = utf8str_to_wstring(utf8text);
 	return getWidth(wtext.c_str(), begin_offset, max_chars);
@@ -925,7 +925,7 @@ S32 LLFontGL::getWidth(const llwchar* wchars, const S32 begin_offset, const S32
 	return llround(width);
 }
 
-F32 LLFontGL::getWidthF32(const LLString& utf8text) const
+F32 LLFontGL::getWidthF32(const std::string& utf8text) const
 {
 	LLWString wtext = utf8str_to_wstring(utf8text);
 	return getWidthF32(wtext.c_str(), 0, S32_MAX);
@@ -936,7 +936,7 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars) const
 	return getWidthF32(wchars, 0, S32_MAX);
 }
 
-F32 LLFontGL::getWidthF32(const LLString& utf8text, const S32 begin_offset, const S32 max_chars ) const
+F32 LLFontGL::getWidthF32(const std::string& utf8text, const S32 begin_offset, const S32 max_chars ) const
 {
 	LLWString wtext = utf8str_to_wstring(utf8text);
 	return getWidthF32(wtext.c_str(), begin_offset, max_chars);
@@ -1312,7 +1312,7 @@ void LLFontGL::clearEmbeddedChars()
 	mEmbeddedChars.clear();
 }
 
-void LLFontGL::addEmbeddedChar( llwchar wc, LLImageGL* image, const LLString& label )
+void LLFontGL::addEmbeddedChar( llwchar wc, LLImageGL* image, const std::string& label )
 {
 	LLWString wlabel = utf8str_to_wstring(label);
 	addEmbeddedChar(wc, image, wlabel);
@@ -1429,40 +1429,40 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con
 }
 
 // static
-LLString LLFontGL::nameFromFont(const LLFontGL* fontp)
+std::string LLFontGL::nameFromFont(const LLFontGL* fontp)
 {
 	if (fontp == sSansSerifHuge)
 	{
-		return LLString("SansSerifHuge");
+		return std::string("SansSerifHuge");
 	}
 	else if (fontp == sSansSerifSmall)
 	{
-		return LLString("SansSerifSmall");
+		return std::string("SansSerifSmall");
 	}
 	else if (fontp == sSansSerif)
 	{
-		return LLString("SansSerif");
+		return std::string("SansSerif");
 	}
 	else if (fontp == sSansSerifBig)
 	{
-		return LLString("SansSerifBig");
+		return std::string("SansSerifBig");
 	}
 	else if (fontp == sSansSerifBold)
 	{
-		return LLString("SansSerifBold");
+		return std::string("SansSerifBold");
 	}
 	else if (fontp == sMonospace)
 	{
-		return LLString("Monospace");
+		return std::string("Monospace");
 	}
 	else
 	{
-		return LLString();
+		return std::string();
 	}
 }
 
 // static
-LLFontGL* LLFontGL::fontFromName(const LLString& font_name)
+LLFontGL* LLFontGL::fontFromName(const std::string& font_name)
 {
 	LLFontGL* gl_font = NULL;
 	if (font_name == "SansSerifHuge")
@@ -1493,16 +1493,16 @@ LLFontGL* LLFontGL::fontFromName(const LLString& font_name)
 }
 
 // static
-LLString LLFontGL::nameFromHAlign(LLFontGL::HAlign align)
+std::string LLFontGL::nameFromHAlign(LLFontGL::HAlign align)
 {
-	if (align == LEFT)			return LLString("left");
-	else if (align == RIGHT)	return LLString("right");
-	else if (align == HCENTER)	return LLString("center");
-	else return LLString();
+	if (align == LEFT)			return std::string("left");
+	else if (align == RIGHT)	return std::string("right");
+	else if (align == HCENTER)	return std::string("center");
+	else return std::string();
 }
 
 // static
-LLFontGL::HAlign LLFontGL::hAlignFromName(const LLString& name)
+LLFontGL::HAlign LLFontGL::hAlignFromName(const std::string& name)
 {
 	LLFontGL::HAlign gl_hfont_align = LLFontGL::LEFT;
 	if (name == "left")
@@ -1522,17 +1522,17 @@ LLFontGL::HAlign LLFontGL::hAlignFromName(const LLString& name)
 }
 
 // static
-LLString LLFontGL::nameFromVAlign(LLFontGL::VAlign align)
+std::string LLFontGL::nameFromVAlign(LLFontGL::VAlign align)
 {
-	if (align == TOP)			return LLString("top");
-	else if (align == VCENTER)	return LLString("center");
-	else if (align == BASELINE)	return LLString("baseline");
-	else if (align == BOTTOM)	return LLString("bottom");
-	else return LLString();
+	if (align == TOP)			return std::string("top");
+	else if (align == VCENTER)	return std::string("center");
+	else if (align == BASELINE)	return std::string("baseline");
+	else if (align == BOTTOM)	return std::string("bottom");
+	else return std::string();
 }
 
 // static
-LLFontGL::VAlign LLFontGL::vAlignFromName(const LLString& name)
+LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
 {
 	LLFontGL::VAlign gl_vfont_align = LLFontGL::BASELINE;
 	if (name == "top")
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 01046af..3f88e62 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -73,7 +73,7 @@ public:
 	};
 	
 	// Takes a string with potentially several flags, i.e. "NORMAL|BOLD|ITALIC"
-	static U8 getStyleFromString(const LLString &style);
+	static U8 getStyleFromString(const std::string &style);
 
 	LLFontGL();
 	LLFontGL(const LLFontGL &source);
@@ -85,24 +85,24 @@ public:
 	LLFontGL &operator=(const LLFontGL &source);
 
 	static BOOL initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
-								 const LLString& monospace_file, F32 monospace_size,
-								 const LLString& sansserif_file,
-								 const LLString& sansserif_fallback_file, F32 ss_fallback_scale,
+								 const std::string& monospace_file, F32 monospace_size,
+								 const std::string& sansserif_file,
+								 const std::string& sansserif_fallback_file, F32 ss_fallback_scale,
 								 F32 small_size, F32 medium_size, F32 large_size, F32 huge_size,
-								 const LLString& sansserif_bold_file, F32 bold_size,
-								 const LLString& app_dir = LLString::null);
+								 const std::string& sansserif_bold_file, F32 bold_size,
+								 const std::string& app_dir = LLStringUtil::null);
 
 	static void	destroyDefaultFonts();
 	static void destroyGL();
 
-	static bool loadFaceFallback(LLFontList *fontp, const LLString& fontname, const F32 point_size);
-	static bool loadFace(LLFontGL *fontp, const LLString& fontname, const F32 point_size, LLFontList *fallback_fontp);
+	static bool loadFaceFallback(LLFontList *fontp, const std::string& fontname, const F32 point_size);
+	static bool loadFace(LLFontGL *fontp, const std::string& fontname, const F32 point_size, LLFontList *fallback_fontp);
 	/* virtual*/ BOOL loadFace(const std::string& filename,
 							    const F32 point_size, const F32 vert_dpi, const F32 horz_dpi,
 							    const S32 components, BOOL is_fallback);
 
 
-	S32 renderUTF8(const LLString &text, const S32 begin_offset,
+	S32 renderUTF8(const std::string &text, const S32 begin_offset,
 				   S32 x, S32 y,
 				   const LLColor4 &color) const
 	{
@@ -111,7 +111,7 @@ public:
 						  S32_MAX, S32_MAX, NULL, FALSE);
 	}
 	
-	S32 renderUTF8(const LLString &text, const S32 begin_offset,
+	S32 renderUTF8(const std::string &text, const S32 begin_offset,
 				   S32 x, S32 y,
 				   const LLColor4 &color,
 				   HAlign halign, VAlign valign, U8 style = NORMAL) const
@@ -122,7 +122,7 @@ public:
 	}
 	
 	// renderUTF8 does a conversion, so is slower!
-	S32 renderUTF8(const LLString &text,
+	S32 renderUTF8(const std::string &text,
 		S32 begin_offset,
 		F32 x, F32 y,
 		const LLColor4 &color,
@@ -162,14 +162,14 @@ public:
 	/*virtual*/ F32 getAscenderHeight() const	{ return (F32)llround(mAscender / sScaleY); }
 	/*virtual*/ F32 getDescenderHeight() const	{ return (F32)llround(mDescender / sScaleY); }
 	
-	virtual S32 getWidth(const LLString& utf8text) const;
+	virtual S32 getWidth(const std::string& utf8text) const;
 	virtual S32 getWidth(const llwchar* wchars) const;
-	virtual S32 getWidth(const LLString& utf8text, const S32 offset, const S32 max_chars ) const;
+	virtual S32 getWidth(const std::string& utf8text, const S32 offset, const S32 max_chars ) const;
 	virtual S32 getWidth(const llwchar* wchars, const S32 offset, const S32 max_chars, BOOL use_embedded = FALSE) const;
 
-	virtual F32 getWidthF32(const LLString& utf8text) const;
+	virtual F32 getWidthF32(const std::string& utf8text) const;
 	virtual F32 getWidthF32(const llwchar* wchars) const;
-	virtual F32 getWidthF32(const LLString& text, const S32 offset, const S32 max_chars ) const;
+	virtual F32 getWidthF32(const std::string& text, const S32 offset, const S32 max_chars ) const;
 	virtual F32 getWidthF32(const llwchar* wchars, const S32 offset, const S32 max_chars, BOOL use_embedded = FALSE ) const;
 
 	// The following are called often, frequently with large buffers, so do not use a string interface
@@ -191,18 +191,18 @@ public:
 
 	LLImageGL *getImageGL() const;
 
-	void	   addEmbeddedChar( llwchar wc, LLImageGL* image, const LLString& label);
+	void	   addEmbeddedChar( llwchar wc, LLImageGL* image, const std::string& label);
 	void	   addEmbeddedChar( llwchar wc, LLImageGL* image, const LLWString& label);
 	void	   removeEmbeddedChar( llwchar wc );
 
-	static LLString nameFromFont(const LLFontGL* fontp);
-	static LLFontGL* fontFromName(const LLString& name);
+	static std::string nameFromFont(const LLFontGL* fontp);
+	static LLFontGL* fontFromName(const std::string& name);
 
-	static LLString nameFromHAlign(LLFontGL::HAlign align);
-	static LLFontGL::HAlign hAlignFromName(const LLString& name);
+	static std::string nameFromHAlign(LLFontGL::HAlign align);
+	static LLFontGL::HAlign hAlignFromName(const std::string& name);
 
-	static LLString nameFromVAlign(LLFontGL::VAlign align);
-	static LLFontGL::VAlign vAlignFromName(const LLString& name);
+	static std::string nameFromVAlign(LLFontGL::VAlign align);
+	static LLFontGL::VAlign vAlignFromName(const std::string& name);
 
 	static void setFontDisplay(BOOL flag) { sDisplayFont = flag ; }
 
@@ -225,7 +225,7 @@ public:
 	static F32 sScaleX;
 	static F32 sScaleY;
 	static BOOL     sDisplayFont ;
-	static LLString sAppDir;			// For loading fonts
+	static std::string sAppDir;			// For loading fonts
 		
 	static LLFontGL*	sMonospace;		// medium
 	static LLFontList*	sMonospaceFallback;
@@ -249,8 +249,8 @@ public:
 
 protected:
 	/*virtual*/ BOOL addChar(const llwchar wch);
-	static LLString getFontPathLocal();
-	static LLString getFontPathSystem();	
+	static std::string getFontPathLocal();
+	static std::string getFontPathSystem();
 
 protected:
 	LLPointer<LLImageRaw>	mRawImageGLp;
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
new file mode 100644
index 0000000..843bc79
--- /dev/null
+++ b/linden/indra/llrender/llgl.cpp
@@ -0,0 +1,1763 @@
+/** 
+ * @file llgl.cpp
+ * @brief LLGL implementation
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// This file sets some global GL parameters, and implements some 
+// useful functions for GL operations.
+
+#define GLH_EXT_SINGLE_FILE
+
+#include "linden_common.h"
+
+#include "boost/tokenizer.hpp"
+
+#include "llsys.h"
+
+#include "llgl.h"
+#include "llrender.h"
+
+#include "llerror.h"
+#include "llquaternion.h"
+#include "llmath.h"
+#include "m4math.h"
+#include "llstring.h"
+
+#include "llglheaders.h"
+
+#ifdef _DEBUG
+//#define GL_STATE_VERIFY
+#endif
+
+BOOL gDebugGL = FALSE;
+BOOL gClothRipple = FALSE;
+BOOL gNoRender = FALSE;
+LLMatrix4 gGLObliqueProjectionInverse;
+
+#define LL_GL_NAME_POOLING 0
+
+LLGLNamePool::pool_list_t LLGLNamePool::sInstances;
+
+#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
+// ATI prototypes
+// vertex blending prototypes
+PFNGLWEIGHTPOINTERARBPROC			glWeightPointerARB = NULL;
+PFNGLVERTEXBLENDARBPROC				glVertexBlendARB = NULL;
+PFNGLWEIGHTFVARBPROC				glWeightfvARB = NULL;
+
+// Vertex buffer object prototypes
+PFNGLBINDBUFFERARBPROC				glBindBufferARB = NULL;
+PFNGLDELETEBUFFERSARBPROC			glDeleteBuffersARB = NULL;
+PFNGLGENBUFFERSARBPROC				glGenBuffersARB = NULL;
+PFNGLISBUFFERARBPROC				glIsBufferARB = NULL;
+PFNGLBUFFERDATAARBPROC				glBufferDataARB = NULL;
+PFNGLBUFFERSUBDATAARBPROC			glBufferSubDataARB = NULL;
+PFNGLGETBUFFERSUBDATAARBPROC		glGetBufferSubDataARB = NULL;
+PFNGLMAPBUFFERARBPROC				glMapBufferARB = NULL;
+PFNGLUNMAPBUFFERARBPROC				glUnmapBufferARB = NULL;
+PFNGLGETBUFFERPARAMETERIVARBPROC	glGetBufferParameterivARB = NULL;
+PFNGLGETBUFFERPOINTERVARBPROC		glGetBufferPointervARB = NULL;
+
+// vertex object prototypes
+PFNGLNEWOBJECTBUFFERATIPROC			glNewObjectBufferATI = NULL;
+PFNGLISOBJECTBUFFERATIPROC			glIsObjectBufferATI = NULL;
+PFNGLUPDATEOBJECTBUFFERATIPROC		glUpdateObjectBufferATI = NULL;
+PFNGLGETOBJECTBUFFERFVATIPROC		glGetObjectBufferfvATI = NULL;
+PFNGLGETOBJECTBUFFERIVATIPROC		glGetObjectBufferivATI = NULL;
+PFNGLFREEOBJECTBUFFERATIPROC		glFreeObjectBufferATI = NULL;
+PFNGLARRAYOBJECTATIPROC				glArrayObjectATI = NULL;
+PFNGLVERTEXATTRIBARRAYOBJECTATIPROC	glVertexAttribArrayObjectATI = NULL;
+PFNGLGETARRAYOBJECTFVATIPROC		glGetArrayObjectfvATI = NULL;
+PFNGLGETARRAYOBJECTIVATIPROC		glGetArrayObjectivATI = NULL;
+PFNGLVARIANTARRAYOBJECTATIPROC		glVariantObjectArrayATI = NULL;
+PFNGLGETVARIANTARRAYOBJECTFVATIPROC	glGetVariantArrayObjectfvATI = NULL;
+PFNGLGETVARIANTARRAYOBJECTIVATIPROC	glGetVariantArrayObjectivATI = NULL;
+
+// GL_ARB_occlusion_query
+PFNGLGENQUERIESARBPROC glGenQueriesARB = NULL;
+PFNGLDELETEQUERIESARBPROC glDeleteQueriesARB = NULL;
+PFNGLISQUERYARBPROC glIsQueryARB = NULL;
+PFNGLBEGINQUERYARBPROC glBeginQueryARB = NULL;
+PFNGLENDQUERYARBPROC glEndQueryARB = NULL;
+PFNGLGETQUERYIVARBPROC glGetQueryivARB = NULL;
+PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB = NULL;
+PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB = NULL;
+
+// GL_ARB_point_parameters
+PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB = NULL;
+PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB = NULL;
+
+// GL_EXT_framebuffer_object
+PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT = NULL;
+PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT = NULL;
+PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT = NULL;
+PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT = NULL;
+PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT = NULL;
+PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT = NULL;
+PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT = NULL;
+PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT = NULL;
+PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT = NULL;
+PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT = NULL;
+PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT = NULL;
+PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT = NULL;
+PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT = NULL;
+PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT = NULL;
+
+//shader object prototypes
+PFNGLDELETEOBJECTARBPROC glDeleteObjectARB = NULL;
+PFNGLGETHANDLEARBPROC glGetHandleARB = NULL;
+PFNGLDETACHOBJECTARBPROC glDetachObjectARB = NULL;
+PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB = NULL;
+PFNGLSHADERSOURCEARBPROC glShaderSourceARB = NULL;
+PFNGLCOMPILESHADERARBPROC glCompileShaderARB = NULL;
+PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB = NULL;
+PFNGLATTACHOBJECTARBPROC glAttachObjectARB = NULL;
+PFNGLLINKPROGRAMARBPROC glLinkProgramARB = NULL;
+PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = NULL;
+PFNGLVALIDATEPROGRAMARBPROC glValidateProgramARB = NULL;
+PFNGLUNIFORM1FARBPROC glUniform1fARB = NULL;
+PFNGLUNIFORM2FARBPROC glUniform2fARB = NULL;
+PFNGLUNIFORM3FARBPROC glUniform3fARB = NULL;
+PFNGLUNIFORM4FARBPROC glUniform4fARB = NULL;
+PFNGLUNIFORM1IARBPROC glUniform1iARB = NULL;
+PFNGLUNIFORM2IARBPROC glUniform2iARB = NULL;
+PFNGLUNIFORM3IARBPROC glUniform3iARB = NULL;
+PFNGLUNIFORM4IARBPROC glUniform4iARB = NULL;
+PFNGLUNIFORM1FVARBPROC glUniform1fvARB = NULL;
+PFNGLUNIFORM2FVARBPROC glUniform2fvARB = NULL;
+PFNGLUNIFORM3FVARBPROC glUniform3fvARB = NULL;
+PFNGLUNIFORM4FVARBPROC glUniform4fvARB = NULL;
+PFNGLUNIFORM1IVARBPROC glUniform1ivARB = NULL;
+PFNGLUNIFORM2IVARBPROC glUniform2ivARB = NULL;
+PFNGLUNIFORM3IVARBPROC glUniform3ivARB = NULL;
+PFNGLUNIFORM4IVARBPROC glUniform4ivARB = NULL;
+PFNGLUNIFORMMATRIX2FVARBPROC glUniformMatrix2fvARB = NULL;
+PFNGLUNIFORMMATRIX3FVARBPROC glUniformMatrix3fvARB = NULL;
+PFNGLUNIFORMMATRIX4FVARBPROC glUniformMatrix4fvARB = NULL;
+PFNGLGETOBJECTPARAMETERFVARBPROC glGetObjectParameterfvARB = NULL;
+PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB = NULL;
+PFNGLGETINFOLOGARBPROC glGetInfoLogARB = NULL;
+PFNGLGETATTACHEDOBJECTSARBPROC glGetAttachedObjectsARB = NULL;
+PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB = NULL;
+PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB = NULL;
+PFNGLGETUNIFORMFVARBPROC glGetUniformfvARB = NULL;
+PFNGLGETUNIFORMIVARBPROC glGetUniformivARB = NULL;
+PFNGLGETSHADERSOURCEARBPROC glGetShaderSourceARB = NULL;
+
+// vertex shader prototypes
+#if LL_LINUX
+PFNGLVERTEXATTRIB1DARBPROC glVertexAttrib1dARB = NULL;
+PFNGLVERTEXATTRIB1DVARBPROC glVertexAttrib1dvARB = NULL;
+PFNGLVERTEXATTRIB1FARBPROC glVertexAttrib1fARB = NULL;
+PFNGLVERTEXATTRIB1FVARBPROC glVertexAttrib1fvARB = NULL;
+PFNGLVERTEXATTRIB1SARBPROC glVertexAttrib1sARB = NULL;
+PFNGLVERTEXATTRIB1SVARBPROC glVertexAttrib1svARB = NULL;
+PFNGLVERTEXATTRIB2DARBPROC glVertexAttrib2dARB = NULL;
+PFNGLVERTEXATTRIB2DVARBPROC glVertexAttrib2dvARB = NULL;
+PFNGLVERTEXATTRIB2FARBPROC glVertexAttrib2fARB = NULL;
+PFNGLVERTEXATTRIB2FVARBPROC glVertexAttrib2fvARB = NULL;
+PFNGLVERTEXATTRIB2SARBPROC glVertexAttrib2sARB = NULL;
+PFNGLVERTEXATTRIB2SVARBPROC glVertexAttrib2svARB = NULL;
+PFNGLVERTEXATTRIB3DARBPROC glVertexAttrib3dARB = NULL;
+PFNGLVERTEXATTRIB3DVARBPROC glVertexAttrib3dvARB = NULL;
+PFNGLVERTEXATTRIB3FARBPROC glVertexAttrib3fARB = NULL;
+PFNGLVERTEXATTRIB3FVARBPROC glVertexAttrib3fvARB = NULL;
+PFNGLVERTEXATTRIB3SARBPROC glVertexAttrib3sARB = NULL;
+PFNGLVERTEXATTRIB3SVARBPROC glVertexAttrib3svARB = NULL;
+#endif // LL_LINUX
+PFNGLVERTEXATTRIB4NBVARBPROC glVertexAttrib4nbvARB = NULL;
+PFNGLVERTEXATTRIB4NIVARBPROC glVertexAttrib4nivARB = NULL;
+PFNGLVERTEXATTRIB4NSVARBPROC glVertexAttrib4nsvARB = NULL;
+PFNGLVERTEXATTRIB4NUBARBPROC glVertexAttrib4nubARB = NULL;
+PFNGLVERTEXATTRIB4NUBVARBPROC glVertexAttrib4nubvARB = NULL;
+PFNGLVERTEXATTRIB4NUIVARBPROC glVertexAttrib4nuivARB = NULL;
+PFNGLVERTEXATTRIB4NUSVARBPROC glVertexAttrib4nusvARB = NULL;
+#if LL_LINUX
+PFNGLVERTEXATTRIB4BVARBPROC glVertexAttrib4bvARB = NULL;
+PFNGLVERTEXATTRIB4DARBPROC glVertexAttrib4dARB = NULL;
+PFNGLVERTEXATTRIB4DVARBPROC glVertexAttrib4dvARB = NULL;
+PFNGLVERTEXATTRIB4FARBPROC glVertexAttrib4fARB = NULL;
+PFNGLVERTEXATTRIB4FVARBPROC glVertexAttrib4fvARB = NULL;
+PFNGLVERTEXATTRIB4IVARBPROC glVertexAttrib4ivARB = NULL;
+PFNGLVERTEXATTRIB4SARBPROC glVertexAttrib4sARB = NULL;
+PFNGLVERTEXATTRIB4SVARBPROC glVertexAttrib4svARB = NULL;
+PFNGLVERTEXATTRIB4UBVARBPROC glVertexAttrib4ubvARB = NULL;
+PFNGLVERTEXATTRIB4UIVARBPROC glVertexAttrib4uivARB = NULL;
+PFNGLVERTEXATTRIB4USVARBPROC glVertexAttrib4usvARB = NULL;
+PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB = NULL;
+PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB = NULL;
+PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB = NULL;
+PFNGLPROGRAMSTRINGARBPROC glProgramStringARB = NULL;
+PFNGLBINDPROGRAMARBPROC glBindProgramARB = NULL;
+PFNGLDELETEPROGRAMSARBPROC glDeleteProgramsARB = NULL;
+PFNGLGENPROGRAMSARBPROC glGenProgramsARB = NULL;
+PFNGLPROGRAMENVPARAMETER4DARBPROC glProgramEnvParameter4dARB = NULL;
+PFNGLPROGRAMENVPARAMETER4DVARBPROC glProgramEnvParameter4dvARB = NULL;
+PFNGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB = NULL;
+PFNGLPROGRAMENVPARAMETER4FVARBPROC glProgramEnvParameter4fvARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4DARBPROC glProgramLocalParameter4dARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4DVARBPROC glProgramLocalParameter4dvARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4FARBPROC glProgramLocalParameter4fARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4FVARBPROC glProgramLocalParameter4fvARB = NULL;
+PFNGLGETPROGRAMENVPARAMETERDVARBPROC glGetProgramEnvParameterdvARB = NULL;
+PFNGLGETPROGRAMENVPARAMETERFVARBPROC glGetProgramEnvParameterfvARB = NULL;
+PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC glGetProgramLocalParameterdvARB = NULL;
+PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC glGetProgramLocalParameterfvARB = NULL;
+PFNGLGETPROGRAMIVARBPROC glGetProgramivARB = NULL;
+PFNGLGETPROGRAMSTRINGARBPROC glGetProgramStringARB = NULL;
+PFNGLGETVERTEXATTRIBDVARBPROC glGetVertexAttribdvARB = NULL;
+PFNGLGETVERTEXATTRIBFVARBPROC glGetVertexAttribfvARB = NULL;
+PFNGLGETVERTEXATTRIBIVARBPROC glGetVertexAttribivARB = NULL;
+PFNGLGETVERTEXATTRIBPOINTERVARBPROC glGetVertexAttribPointervARB = NULL;
+PFNGLISPROGRAMARBPROC glIsProgramARB = NULL;
+#endif // LL_LINUX
+PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB = NULL;
+PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB = NULL;
+PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB = NULL;
+
+#if LL_WINDOWS
+PFNWGLSWAPINTERVALEXTPROC			wglSwapIntervalEXT = NULL;
+#endif
+
+#if LL_LINUX
+PFNGLCOLORTABLEEXTPROC glColorTableEXT = NULL;
+#endif // LL_LINUX
+
+#endif
+
+LLGLManager gGLManager;
+
+LLGLManager::LLGLManager() :
+	mInited(FALSE),
+	mIsDisabled(FALSE),
+
+	mHasMultitexture(FALSE),
+	mNumTextureUnits(1),
+	mHasMipMapGeneration(FALSE),
+	mHasPalettedTextures(FALSE),
+	mHasCompressedTextures(FALSE),
+	mHasFramebufferObject(FALSE),
+
+	mHasVertexBufferObject(FALSE),
+	mHasPBuffer(FALSE),
+	mHasShaderObjects(FALSE),
+	mHasVertexShader(FALSE),
+	mHasFragmentShader(FALSE),
+	mHasOcclusionQuery(FALSE),
+	mHasPointParameters(FALSE),
+
+	mHasAnisotropic(FALSE),
+	mHasARBEnvCombine(FALSE),
+	mHasCubeMap(FALSE),
+
+	mIsATI(FALSE),
+	mIsNVIDIA(FALSE),
+	mIsIntel(FALSE),
+	mIsGF2or4MX(FALSE),
+	mIsGF3(FALSE),
+	mIsGFFX(FALSE),
+	mATIOffsetVerticalLines(FALSE),
+	mATIOldDriver(FALSE),
+
+	mHasRequirements(TRUE),
+
+	mHasSeparateSpecularColor(FALSE),
+
+	mDriverVersionMajor(1),
+	mDriverVersionMinor(0),
+	mDriverVersionRelease(0),
+	mGLVersion(1.0f),
+		
+	mVRAM(0),
+	mGLMaxVertexRange(0),
+	mGLMaxIndexRange(0)
+{
+}
+
+//---------------------------------------------------------------------
+// Global initialization for GL
+//---------------------------------------------------------------------
+void LLGLManager::initWGL()
+{
+	mHasPBuffer = FALSE;
+#if LL_WINDOWS && !LL_MESA_HEADLESS
+	if (!glh_init_extensions("WGL_ARB_pixel_format"))
+	{
+		LL_WARNS("RenderInit") << "No ARB pixel format extensions" << LL_ENDL;
+	}
+
+	if (ExtensionExists("WGL_EXT_swap_control", gGLHExts.mSysExts))
+	{
+        GLH_EXT_NAME(wglSwapIntervalEXT) = (PFNWGLSWAPINTERVALEXTPROC)GLH_EXT_GET_PROC_ADDRESS("wglSwapIntervalEXT");
+	}
+
+	if( !glh_init_extensions("WGL_ARB_pbuffer") )
+	{
+		LL_WARNS("RenderInit") << "No ARB WGL PBuffer extensions" << LL_ENDL;
+	}
+
+	if( !glh_init_extensions("WGL_ARB_render_texture") )
+	{
+		LL_WARNS("RenderInit") << "No ARB WGL render texture extensions" << LL_ENDL;
+	}
+
+	mHasPBuffer = ExtensionExists("WGL_ARB_pbuffer", gGLHExts.mSysExts) &&
+					ExtensionExists("WGL_ARB_render_texture", gGLHExts.mSysExts) &&
+					ExtensionExists("WGL_ARB_pixel_format", gGLHExts.mSysExts);
+#endif
+}
+
+// return false if unable (or unwilling due to old drivers) to init GL
+bool LLGLManager::initGL()
+{
+	if (mInited)
+	{
+		LL_ERRS("RenderInit") << "Calling init on LLGLManager after already initialized!" << LL_ENDL;
+	}
+
+	GLint alpha_bits;
+	glGetIntegerv( GL_ALPHA_BITS, &alpha_bits );
+	if( 8 != alpha_bits )
+	{
+		LL_WARNS("RenderInit") << "Frame buffer has less than 8 bits of alpha.  Avatar texture compositing will fail." << LL_ENDL;
+	}
+
+	// Extract video card strings and convert to upper case to
+	// work around driver-to-driver variation in capitalization.
+	mGLVendor = std::string((const char *)glGetString(GL_VENDOR));
+	LLStringUtil::toUpper(mGLVendor);
+
+	mGLRenderer = std::string((const char *)glGetString(GL_RENDERER));
+	LLStringUtil::toUpper(mGLRenderer);
+
+	parse_gl_version( &mDriverVersionMajor, 
+		&mDriverVersionMinor, 
+		&mDriverVersionRelease, 
+		&mDriverVersionVendorString );
+
+	mGLVersion = mDriverVersionMajor + mDriverVersionMinor * .1f;
+	
+	// Trailing space necessary to keep "nVidia Corpor_ati_on" cards
+	// from being recognized as ATI.
+	if (mGLVendor.substr(0,4) == "ATI ")
+	{
+		mGLVendorShort = "ATI";
+		BOOL mobile = FALSE;
+		if (mGLRenderer.find("MOBILITY") != std::string::npos)
+		{
+			mobile = TRUE;
+		}
+		mIsATI = TRUE;
+
+#if LL_WINDOWS && !LL_MESA_HEADLESS
+		if (mDriverVersionRelease < 3842)
+		{
+			mATIOffsetVerticalLines = TRUE;
+		}
+#endif // LL_WINDOWS
+
+#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
+		// release 7277 is a point at which we verify that ATI OpenGL
+		// drivers get pretty stable with SL, ~Catalyst 8.2,
+		// for both Win32 and Linux.
+		if (mDriverVersionRelease < 7277 &&
+		    mDriverVersionRelease != 0) // 0 == Undetectable driver version - these get to pretend to be new ATI drivers, though that decision may be revisited.
+		{
+			mATIOldDriver = TRUE;
+		}
+#endif // (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
+	}
+	else if (mGLVendor.find("NVIDIA ") != std::string::npos)
+	{
+		mGLVendorShort = "NVIDIA";
+		mIsNVIDIA = TRUE;
+		if (   mGLRenderer.find("GEFORCE4 MX") != std::string::npos
+			|| mGLRenderer.find("GEFORCE2") != std::string::npos
+			|| mGLRenderer.find("GEFORCE 2") != std::string::npos
+			|| mGLRenderer.find("GEFORCE4 460 GO") != std::string::npos
+			|| mGLRenderer.find("GEFORCE4 440 GO") != std::string::npos
+			|| mGLRenderer.find("GEFORCE4 420 GO") != std::string::npos)
+		{
+			mIsGF2or4MX = TRUE;
+		}
+		else if (mGLRenderer.find("GEFORCE FX") != std::string::npos
+				 || mGLRenderer.find("QUADRO FX") != std::string::npos
+				 || mGLRenderer.find("NV34") != std::string::npos)
+		{
+			mIsGFFX = TRUE;
+		}
+		else if(mGLRenderer.find("GEFORCE3") != std::string::npos)
+		{
+			mIsGF3 = TRUE;
+		}
+
+	}
+	else if (mGLVendor.find("INTEL") != std::string::npos
+#if LL_LINUX
+		 // The Mesa-based drivers put this in the Renderer string,
+		 // not the Vendor string.
+		 || mGLRenderer.find("INTEL") != std::string::npos
+#endif //LL_LINUX
+		 )
+	{
+		mGLVendorShort = "INTEL";
+		mIsIntel = TRUE;
+	}
+	else
+	{
+		mGLVendorShort = "MISC";
+	}
+	
+	// This is called here because it depends on the setting of mIsGF2or4MX, and sets up mHasMultitexture.
+	initExtensions();
+
+	if (mHasMultitexture)
+	{
+		GLint num_tex_units;		
+		glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &num_tex_units);
+		mNumTextureUnits = llmin(num_tex_units, (GLint)MAX_GL_TEXTURE_UNITS);
+		if (mIsIntel)
+		{
+			mNumTextureUnits = llmin(mNumTextureUnits, 2);
+		}
+	}
+	else
+	{
+		mHasRequirements = FALSE;
+
+		// We don't support cards that don't support the GL_ARB_multitexture extension
+		LL_WARNS("RenderInit") << "GL Drivers do not support GL_ARB_multitexture" << LL_ENDL;
+		return false;
+	}
+	
+
+	initGLStates();
+	return true;
+}
+
+void LLGLManager::getGLInfo(LLSD& info)
+{
+	info["GLInfo"]["GLVendor"] = std::string((const char *)glGetString(GL_VENDOR));
+	info["GLInfo"]["GLRenderer"] = std::string((const char *)glGetString(GL_RENDERER));
+	info["GLInfo"]["GLVersion"] = std::string((const char *)glGetString(GL_VERSION));
+
+#if !LL_MESA_HEADLESS
+	std::string all_exts = ll_safe_string((const char *)gGLHExts.mSysExts);
+	boost::char_separator<char> sep(" ");
+	boost::tokenizer<boost::char_separator<char> > tok(all_exts, sep);
+	for(boost::tokenizer<boost::char_separator<char> >::iterator i = tok.begin(); i != tok.end(); ++i)
+	{
+		info["GLInfo"]["GLExtensions"].append(*i);
+	}
+#endif
+}
+
+std::string LLGLManager::getGLInfoString()
+{
+	std::string info_str;
+	std::string all_exts, line;
+
+	info_str += std::string("GL_VENDOR      ") + ll_safe_string((const char *)glGetString(GL_VENDOR)) + std::string("\n");
+	info_str += std::string("GL_RENDERER    ") + ll_safe_string((const char *)glGetString(GL_RENDERER)) + std::string("\n");
+	info_str += std::string("GL_VERSION     ") + ll_safe_string((const char *)glGetString(GL_VERSION)) + std::string("\n");
+
+#if !LL_MESA_HEADLESS
+	all_exts = (const char *)gGLHExts.mSysExts;
+	LLStringUtil::replaceChar(all_exts, ' ', '\n');
+	info_str += std::string("GL_EXTENSIONS:\n") + all_exts + std::string("\n");
+#endif
+	
+	return info_str;
+}
+
+void LLGLManager::printGLInfoString()
+{
+	std::string info_str;
+	std::string all_exts, line;
+	
+	LL_INFOS("RenderInit") << "GL_VENDOR:     " << ((const char *)glGetString(GL_VENDOR)) << LL_ENDL;
+	LL_INFOS("RenderInit") << "GL_RENDERER:   " << ((const char *)glGetString(GL_RENDERER)) << LL_ENDL;
+	LL_INFOS("RenderInit") << "GL_VERSION:    " << ((const char *)glGetString(GL_VERSION)) << LL_ENDL;
+
+#if !LL_MESA_HEADLESS
+	all_exts = std::string(gGLHExts.mSysExts);
+	LLStringUtil::replaceChar(all_exts, ' ', '\n');
+	LL_DEBUGS("RenderInit") << "GL_EXTENSIONS:\n" << all_exts << LL_ENDL;
+#endif
+}
+
+std::string LLGLManager::getRawGLString()
+{
+	std::string gl_string;
+	gl_string = ll_safe_string((char*)glGetString(GL_VENDOR)) + " " + ll_safe_string((char*)glGetString(GL_RENDERER));
+	return gl_string;
+}
+
+void LLGLManager::shutdownGL()
+{
+	if (mInited)
+	{
+		glFinish();
+		stop_glerror();
+		mInited = FALSE;
+	}
+}
+
+// these are used to turn software blending on. They appear in the Debug/Avatar menu
+// presence of vertex skinning/blending or vertex programs will set these to FALSE by default.
+
+extern LLCPUInfo gSysCPU;
+
+void LLGLManager::initExtensions()
+{
+#if LL_MESA_HEADLESS
+# if GL_ARB_multitexture
+	mHasMultitexture = TRUE;
+# else
+	mHasMultitexture = FALSE;
+# endif
+# if GL_ARB_texture_env_combine
+	mHasARBEnvCombine = TRUE;	
+# else
+	mHasARBEnvCombine = FALSE;
+# endif
+# if GL_ARB_texture_compression
+	mHasCompressedTextures = TRUE;
+# else
+	mHasCompressedTextures = FALSE;
+# endif
+# if GL_ARB_vertex_buffer_object
+	mHasVertexBufferObject = TRUE;
+# else
+	mHasVertexBufferObject = FALSE;
+# endif
+# if GL_EXT_framebuffer_object
+	mHasFramebufferObject = TRUE;
+# else
+	mHasFramebufferObject = FALSE;
+# endif
+	mHasMipMapGeneration = FALSE;
+	mHasPalettedTextures = FALSE;
+	mHasSeparateSpecularColor = FALSE;
+	mHasAnisotropic = FALSE;
+	mHasCubeMap = FALSE;
+	mHasOcclusionQuery = FALSE;
+	mHasPointParameters = FALSE;
+	mHasShaderObjects = FALSE;
+	mHasVertexShader = FALSE;
+	mHasFragmentShader = FALSE;
+#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");
+	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");
+	mHasCubeMap = ExtensionExists("GL_ARB_texture_cube_map", gGLHExts.mSysExts);
+	mHasARBEnvCombine = ExtensionExists("GL_ARB_texture_env_combine", gGLHExts.mSysExts);
+	mHasCompressedTextures = glh_init_extensions("GL_ARB_texture_compression");
+	mHasOcclusionQuery = ExtensionExists("GL_ARB_occlusion_query", gGLHExts.mSysExts);
+	mHasVertexBufferObject = ExtensionExists("GL_ARB_vertex_buffer_object", gGLHExts.mSysExts);
+	// mask out FBO support when packed_depth_stencil isn't there 'cause we need it for LLRenderTarget -Brad
+	mHasFramebufferObject = ExtensionExists("GL_EXT_framebuffer_object", gGLHExts.mSysExts)
+		&& ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts);
+#if !LL_DARWIN
+	mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
+#endif
+	mHasShaderObjects = ExtensionExists("GL_ARB_shader_objects", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
+	mHasVertexShader = ExtensionExists("GL_ARB_vertex_program", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_vertex_shader", gGLHExts.mSysExts)
+						&& ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
+	mHasFragmentShader = ExtensionExists("GL_ARB_fragment_shader", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
+#endif
+
+#if LL_LINUX
+	// Our extension support for the Linux Client is very young with some
+	// potential driver gotchas, so offer a semi-secret way to turn it off.
+	if (getenv("LL_GL_NOEXT"))	/* Flawfinder: ignore */
+	{
+		//mHasMultitexture = FALSE; // NEEDED!
+		mHasARBEnvCombine = FALSE;
+		mHasCompressedTextures = FALSE;
+		mHasVertexBufferObject = FALSE;
+		mHasFramebufferObject = FALSE;
+		mHasMipMapGeneration = FALSE;
+		mHasPalettedTextures = FALSE;
+		mHasSeparateSpecularColor = FALSE;
+		mHasAnisotropic = FALSE;
+		mHasCubeMap = FALSE;
+		mHasOcclusionQuery = FALSE;
+		mHasPointParameters = FALSE;
+		mHasShaderObjects = FALSE;
+		mHasVertexShader = FALSE;
+		mHasFragmentShader = FALSE;
+		LL_WARNS("RenderInit") << "GL extension support DISABLED via LL_GL_NOEXT" << LL_ENDL;
+	}
+	else if (getenv("LL_GL_BASICEXT"))	/* Flawfinder: ignore */
+	{
+		// This switch attempts to turn off all support for exotic
+		// extensions which I believe correspond to fatal driver
+		// bug reports.  This should be the default until we get a
+		// proper blacklist/whitelist on Linux.
+		mHasMipMapGeneration = FALSE;
+		mHasPalettedTextures = FALSE;
+		mHasAnisotropic = FALSE;
+		//mHasCubeMap = FALSE; // apparently fatal on Intel 915 & similar
+		//mHasOcclusionQuery = FALSE; // source of many ATI system hangs
+		mHasShaderObjects = FALSE;
+		mHasVertexShader = FALSE;
+		mHasFragmentShader = FALSE;
+		LL_WARNS("RenderInit") << "GL extension support forced to SIMPLE level via LL_GL_BASICEXT" << LL_ENDL;
+	}
+	if (getenv("LL_GL_BLACKLIST"))	/* Flawfinder: ignore */
+	{
+		// This lets advanced troubleshooters disable specific
+		// GL extensions to isolate problems with their hardware.
+		// SL-28126
+		const char *const blacklist = getenv("LL_GL_BLACKLIST");	/* Flawfinder: ignore */
+		LL_WARNS("RenderInit") << "GL extension support partially disabled via LL_GL_BLACKLIST: " << blacklist << LL_ENDL;
+		if (strchr(blacklist,'a')) mHasARBEnvCombine = FALSE;
+		if (strchr(blacklist,'b')) mHasCompressedTextures = FALSE;
+		if (strchr(blacklist,'c')) mHasVertexBufferObject = FALSE;
+		if (strchr(blacklist,'d')) mHasMipMapGeneration = FALSE;//S
+		if (strchr(blacklist,'e')) mHasPalettedTextures = FALSE;//S
+// 		if (strchr(blacklist,'f')) mHasNVVertexArrayRange = FALSE;//S
+// 		if (strchr(blacklist,'g')) mHasNVFence = FALSE;//S
+		if (strchr(blacklist,'h')) mHasSeparateSpecularColor = FALSE;
+		if (strchr(blacklist,'i')) mHasAnisotropic = FALSE;//S
+		if (strchr(blacklist,'j')) mHasCubeMap = FALSE;//S
+// 		if (strchr(blacklist,'k')) mHasATIVAO = FALSE;//S
+		if (strchr(blacklist,'l')) mHasOcclusionQuery = FALSE;
+		if (strchr(blacklist,'m')) mHasShaderObjects = FALSE;//S
+		if (strchr(blacklist,'n')) mHasVertexShader = FALSE;//S
+		if (strchr(blacklist,'o')) mHasFragmentShader = FALSE;//S
+		if (strchr(blacklist,'p')) mHasPointParameters = FALSE;//S
+		if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
+	}
+#endif // LL_LINUX
+
+#if LL_DARWIN || LL_LINUX
+	// MBW -- 12/4/2003 -- Using paletted textures causes a bunch of avatar rendering problems on the Mac.
+	// Not sure if this is due to driver problems or incorrect use of the extension, but I'm disabling it for now.
+	// Tofu - 2006-10-03 -- Same problem on Linux.
+	mHasPalettedTextures = false;
+#endif
+	
+	if (!mHasMultitexture)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize multitexturing" << LL_ENDL;
+	}
+	if (!mHasMipMapGeneration)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize mipmap generation" << LL_ENDL;
+	}
+	if (!mHasARBEnvCombine)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_env_combine" << LL_ENDL;
+	}
+	if (!mHasPalettedTextures)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_EXT_paletted_texture" << LL_ENDL;
+	}
+	if (!mHasSeparateSpecularColor)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize separate specular color" << LL_ENDL;
+	}
+	if (!mHasAnisotropic)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize anisotropic filtering" << LL_ENDL;
+	}
+	if (!mHasCompressedTextures)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_compression" << LL_ENDL;
+	}
+	if (!mHasOcclusionQuery)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_occlusion_query" << LL_ENDL;
+	}
+	if (!mHasPointParameters)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_point_parameters" << LL_ENDL;
+	}
+	if (!mHasShaderObjects)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_shader_objects" << LL_ENDL;
+	}
+	if (!mHasVertexShader)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_vertex_shader" << LL_ENDL;
+	}
+	if (!mHasFragmentShader)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_fragment_shader" << LL_ENDL;
+	}
+
+	// Disable certain things due to known bugs
+	if (mIsIntel && mHasMipMapGeneration)
+	{
+		LL_INFOS("RenderInit") << "Disabling mip-map generation for Intel GPUs" << LL_ENDL;
+		mHasMipMapGeneration = FALSE;
+	}
+	if (mIsATI && mHasMipMapGeneration)
+	{
+		LL_INFOS("RenderInit") << "Disabling mip-map generation for ATI GPUs (performance opt)" << LL_ENDL;
+		mHasMipMapGeneration = FALSE;
+	}
+	
+	// Misc
+	glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, (GLint*) &mGLMaxVertexRange);
+	glGetIntegerv(GL_MAX_ELEMENTS_INDICES, (GLint*) &mGLMaxIndexRange);
+	
+#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
+	LL_DEBUGS("RenderInit") << "GL Probe: Getting symbols" << LL_ENDL;
+	if (mHasVertexBufferObject)
+	{
+		glBindBufferARB = (PFNGLBINDBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBindBufferARB");
+		if (glBindBufferARB)
+		{
+			glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteBuffersARB");
+			glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenBuffersARB");
+			glIsBufferARB = (PFNGLISBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsBufferARB");
+			glBufferDataARB = (PFNGLBUFFERDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferDataARB");
+			glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferSubDataARB");
+			glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferSubDataARB");
+			glMapBufferARB = (PFNGLMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMapBufferARB");
+			glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glUnmapBufferARB");
+			glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferParameterivARB");
+			glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferPointervARB");
+		}
+		else
+		{
+			mHasVertexBufferObject = FALSE;
+		}
+	}
+	if (mHasFramebufferObject)
+	{
+		glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glIsRenderbufferEXT");
+		glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBindRenderbufferEXT");
+		glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteRenderbuffersEXT");
+		glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenRenderbuffersEXT");
+		glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glRenderbufferStorageEXT");
+		glGetRenderbufferParameterivEXT = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGetRenderbufferParameterivEXT");
+		glIsFramebufferEXT = (PFNGLISFRAMEBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glIsFramebufferEXT");
+		glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBindFramebufferEXT");
+		glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteFramebuffersEXT");
+		glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenFramebuffersEXT");
+		glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glCheckFramebufferStatusEXT");
+		glFramebufferTexture1DEXT = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferTexture1DEXT");
+		glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferTexture2DEXT");
+		glFramebufferTexture3DEXT = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferTexture3DEXT");
+		glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferRenderbufferEXT");
+		glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGetFramebufferAttachmentParameterivEXT");
+		glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenerateMipmapEXT");
+	}
+#if !LL_LINUX
+	// This is expected to be a static symbol on Linux GL implementations
+	glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawRangeElements");
+	if (!glDrawRangeElements)
+	{
+		mGLMaxVertexRange = 0;
+		mGLMaxIndexRange = 0;
+	}
+#endif // !LL_LINUX
+#if LL_LINUX
+	// On Linux we need to get glColorTableEXT dynamically.
+	if (mHasPalettedTextures)
+	{
+		glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableEXT");
+	}
+#endif // LL_LINUX
+	if (mHasOcclusionQuery)
+	{
+		glGenQueriesARB = (PFNGLGENQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenQueriesARB");
+		glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteQueriesARB");
+		glIsQueryARB = (PFNGLISQUERYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsQueryARB");
+		glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBeginQueryARB");
+		glEndQueryARB = (PFNGLENDQUERYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glEndQueryARB");
+		glGetQueryivARB = (PFNGLGETQUERYIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryivARB");
+		glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryObjectivARB");
+		glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryObjectuivARB");
+	}
+	if (mHasPointParameters)
+	{
+		glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfARB");
+		glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfvARB");
+	}
+	if (mHasShaderObjects)
+	{
+		glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteObjectARB");
+		glGetHandleARB = (PFNGLGETHANDLEARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetHandleARB");
+		glDetachObjectARB = (PFNGLDETACHOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDetachObjectARB");
+		glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glCreateShaderObjectARB");
+		glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC) GLH_EXT_GET_PROC_ADDRESS("glShaderSourceARB");
+		glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC) GLH_EXT_GET_PROC_ADDRESS("glCompileShaderARB");
+		glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glCreateProgramObjectARB");
+		glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glAttachObjectARB");
+		glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glLinkProgramARB");
+		glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUseProgramObjectARB");
+		glValidateProgramARB = (PFNGLVALIDATEPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glValidateProgramARB");
+		glUniform1fARB = (PFNGLUNIFORM1FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1fARB");
+		glUniform2fARB = (PFNGLUNIFORM2FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2fARB");
+		glUniform3fARB = (PFNGLUNIFORM3FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3fARB");
+		glUniform4fARB = (PFNGLUNIFORM4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4fARB");
+		glUniform1iARB = (PFNGLUNIFORM1IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1iARB");
+		glUniform2iARB = (PFNGLUNIFORM2IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2iARB");
+		glUniform3iARB = (PFNGLUNIFORM3IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3iARB");
+		glUniform4iARB = (PFNGLUNIFORM4IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4iARB");
+		glUniform1fvARB = (PFNGLUNIFORM1FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1fvARB");
+		glUniform2fvARB = (PFNGLUNIFORM2FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2fvARB");
+		glUniform3fvARB = (PFNGLUNIFORM3FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3fvARB");
+		glUniform4fvARB = (PFNGLUNIFORM4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4fvARB");
+		glUniform1ivARB = (PFNGLUNIFORM1IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1ivARB");
+		glUniform2ivARB = (PFNGLUNIFORM2IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2ivARB");
+		glUniform3ivARB = (PFNGLUNIFORM3IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3ivARB");
+		glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4ivARB");
+		glUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniformMatrix2fvARB");
+		glUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniformMatrix3fvARB");
+		glUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniformMatrix4fvARB");
+		glGetObjectParameterfvARB = (PFNGLGETOBJECTPARAMETERFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetObjectParameterfvARB");
+		glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetObjectParameterivARB");
+		glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetInfoLogARB");
+		glGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetAttachedObjectsARB");
+		glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetUniformLocationARB");
+		glGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetActiveUniformARB");
+		glGetUniformfvARB = (PFNGLGETUNIFORMFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetUniformfvARB");
+		glGetUniformivARB = (PFNGLGETUNIFORMIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetUniformivARB");
+		glGetShaderSourceARB = (PFNGLGETSHADERSOURCEARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetShaderSourceARB");
+	}
+	if (mHasVertexShader)
+	{
+		glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetAttribLocationARB");
+		glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glBindAttribLocationARB");
+		glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetActiveAttribARB");
+		glVertexAttrib1dARB = (PFNGLVERTEXATTRIB1DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dARB");
+		glVertexAttrib1dvARB = (PFNGLVERTEXATTRIB1DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dvARB");
+		glVertexAttrib1fARB = (PFNGLVERTEXATTRIB1FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fARB");
+		glVertexAttrib1fvARB = (PFNGLVERTEXATTRIB1FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fvARB");
+		glVertexAttrib1sARB = (PFNGLVERTEXATTRIB1SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1sARB");
+		glVertexAttrib1svARB = (PFNGLVERTEXATTRIB1SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1svARB");
+		glVertexAttrib2dARB = (PFNGLVERTEXATTRIB2DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dARB");
+		glVertexAttrib2dvARB = (PFNGLVERTEXATTRIB2DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dvARB");
+		glVertexAttrib2fARB = (PFNGLVERTEXATTRIB2FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fARB");
+		glVertexAttrib2fvARB = (PFNGLVERTEXATTRIB2FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fvARB");
+		glVertexAttrib2sARB = (PFNGLVERTEXATTRIB2SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2sARB");
+		glVertexAttrib2svARB = (PFNGLVERTEXATTRIB2SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2svARB");
+		glVertexAttrib3dARB = (PFNGLVERTEXATTRIB3DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dARB");
+		glVertexAttrib3dvARB = (PFNGLVERTEXATTRIB3DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dvARB");
+		glVertexAttrib3fARB = (PFNGLVERTEXATTRIB3FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fARB");
+		glVertexAttrib3fvARB = (PFNGLVERTEXATTRIB3FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fvARB");
+		glVertexAttrib3sARB = (PFNGLVERTEXATTRIB3SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3sARB");
+		glVertexAttrib3svARB = (PFNGLVERTEXATTRIB3SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3svARB");
+		glVertexAttrib4nbvARB = (PFNGLVERTEXATTRIB4NBVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nbvARB");
+		glVertexAttrib4nivARB = (PFNGLVERTEXATTRIB4NIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nivARB");
+		glVertexAttrib4nsvARB = (PFNGLVERTEXATTRIB4NSVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nsvARB");
+		glVertexAttrib4nubARB = (PFNGLVERTEXATTRIB4NUBARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nubARB");
+		glVertexAttrib4nubvARB = (PFNGLVERTEXATTRIB4NUBVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nubvARB");
+		glVertexAttrib4nuivARB = (PFNGLVERTEXATTRIB4NUIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nuivARB");
+		glVertexAttrib4nusvARB = (PFNGLVERTEXATTRIB4NUSVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nusvARB");
+		glVertexAttrib4bvARB = (PFNGLVERTEXATTRIB4BVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4bvARB");
+		glVertexAttrib4dARB = (PFNGLVERTEXATTRIB4DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dARB");
+		glVertexAttrib4dvARB = (PFNGLVERTEXATTRIB4DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dvARB");
+		glVertexAttrib4fARB = (PFNGLVERTEXATTRIB4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fARB");
+		glVertexAttrib4fvARB = (PFNGLVERTEXATTRIB4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fvARB");
+		glVertexAttrib4ivARB = (PFNGLVERTEXATTRIB4IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ivARB");
+		glVertexAttrib4sARB = (PFNGLVERTEXATTRIB4SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4sARB");
+		glVertexAttrib4svARB = (PFNGLVERTEXATTRIB4SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4svARB");
+		glVertexAttrib4ubvARB = (PFNGLVERTEXATTRIB4UBVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ubvARB");
+		glVertexAttrib4uivARB = (PFNGLVERTEXATTRIB4UIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4uivARB");
+		glVertexAttrib4usvARB = (PFNGLVERTEXATTRIB4USVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4usvARB");
+		glVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttribPointerARB");
+		glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC) GLH_EXT_GET_PROC_ADDRESS("glEnableVertexAttribArrayARB");
+		glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDisableVertexAttribArrayARB");
+		glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramStringARB");
+		glBindProgramARB = (PFNGLBINDPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glBindProgramARB");
+		glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteProgramsARB");
+		glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGenProgramsARB");
+		glProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dARB");
+		glProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dvARB");
+		glProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fARB");
+		glProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fvARB");
+		glProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dARB");
+		glProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dvARB");
+		glProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fARB");
+		glProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fvARB");
+		glGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterdvARB");
+		glGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterfvARB");
+		glGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterdvARB");
+		glGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterfvARB");
+		glGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramivARB");
+		glGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramStringARB");
+		glGetVertexAttribdvARB = (PFNGLGETVERTEXATTRIBDVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribdvARB");
+		glGetVertexAttribfvARB = (PFNGLGETVERTEXATTRIBFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribfvARB");
+		glGetVertexAttribivARB = (PFNGLGETVERTEXATTRIBIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribivARB");
+		glGetVertexAttribPointervARB = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glgetVertexAttribPointervARB");
+		glIsProgramARB = (PFNGLISPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glIsProgramARB");
+	}
+	LL_DEBUGS("RenderInit") << "GL Probe: Got symbols" << LL_ENDL;
+#endif
+
+	mInited = TRUE;
+}
+
+void rotate_quat(LLQuaternion& rotation)
+{
+	F32 angle_radians, x, y, z;
+	rotation.getAngleAxis(&angle_radians, &x, &y, &z);
+	glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
+}
+
+void flush_glerror()
+{
+	glGetError();
+}
+
+void assert_glerror()
+{
+	if (gNoRender || !gDebugGL) 
+	{
+		return;
+	}
+	if (!gGLManager.mInited)
+	{
+		LL_ERRS("RenderInit") << "GL not initialized" << LL_ENDL;
+	}
+	//  Create or update texture to be used with this data 
+	GLenum error;
+	error = glGetError();
+	BOOL quit = FALSE;
+	while (error)
+	{
+		quit = TRUE;
+#ifndef LL_LINUX // *FIX: !  This should be an error for linux as well.
+		GLubyte const * gl_error_msg = gluErrorString(error);
+		if (NULL != gl_error_msg)
+		{
+			LL_WARNS("RenderState") << "GL Error:" << gl_error_msg << LL_ENDL;
+		}
+		else
+		{
+			// gluErrorString returns NULL for some extensions' error codes.
+			// you'll probably have to grep for the number in glext.h.
+			LL_WARNS("RenderState") << "GL Error: UNKNOWN 0x" << std::hex << error << LL_ENDL;
+		}
+		error = glGetError();
+#endif
+	}
+
+	if (quit)
+	{
+		llerrs << "One or more unhandled GL errors." << llendl;
+	}
+}
+
+void clear_glerror()
+{
+	//  Create or update texture to be used with this data 
+	GLenum error;
+	error = glGetError();
+}
+
+///////////////////////////////////////////////////////////////
+//
+// LLGLState
+//
+
+// Static members
+std::map<LLGLenum, LLGLboolean> LLGLState::sStateMap;
+
+GLboolean LLGLDepthTest::sDepthEnabled = GL_FALSE; // OpenGL default
+GLenum LLGLDepthTest::sDepthFunc = GL_LESS; // OpenGL default
+GLboolean LLGLDepthTest::sWriteEnabled = GL_TRUE; // OpenGL default
+
+//static
+void LLGLState::initClass() 
+{
+	sStateMap[GL_DITHER] = GL_TRUE;
+	sStateMap[GL_TEXTURE_2D] = GL_TRUE;
+
+	//make sure multisample defaults to disabled
+	sStateMap[GL_MULTISAMPLE_ARB] = GL_FALSE;
+	glDisable(GL_MULTISAMPLE_ARB);
+
+	//default vertex arrays to enabled.
+	glEnableClientState(GL_VERTEX_ARRAY);
+}
+
+//static
+void LLGLState::restoreGL()
+{
+	sStateMap.clear();
+	initClass();
+}
+
+//static
+// Really shouldn't be needed, but seems we sometimes do.
+void LLGLState::resetTextureStates()
+{
+	gGL.flush();
+	GLint maxTextureUnits;
+	
+	glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &maxTextureUnits);
+	for (S32 j = maxTextureUnits-1; j >=0; j--)
+	{
+		gGL.getTexUnit(j)->activate();
+		glClientActiveTextureARB(GL_TEXTURE0_ARB+j);
+		j == 0 ? glEnable(GL_TEXTURE_2D) : glDisable(GL_TEXTURE_2D);
+	}
+}
+
+void LLGLState::dumpStates() 
+{
+	LL_INFOS("RenderState") << "GL States:" << LL_ENDL;
+	for (std::map<LLGLenum, LLGLboolean>::iterator iter = sStateMap.begin();
+		 iter != sStateMap.end(); ++iter)
+	{
+		LL_INFOS("RenderState") << llformat(" 0x%04x : %s",(S32)iter->first,iter->second?"TRUE":"FALSE") << LL_ENDL;
+	}
+}
+
+void LLGLState::checkStates(const std::string& msg)  
+{
+	if (!gDebugGL)
+	{
+		return;
+	}
+
+	stop_glerror();
+
+	GLint activeTexture;
+	glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture);
+	
+	if (activeTexture != GL_TEXTURE0_ARB)
+	{
+		LL_GL_ERRS << "Texture channel corrupted. " << LL_ENDL;
+	}
+	
+	GLint src;
+	GLint dst;
+	glGetIntegerv(GL_BLEND_SRC, &src);
+	glGetIntegerv(GL_BLEND_DST, &dst);
+	
+	if (src != GL_SRC_ALPHA || dst != GL_ONE_MINUS_SRC_ALPHA)
+	{
+		LL_GL_ERRS << "Blend function corrupted: " << std::hex << src << " " << std::hex << dst << "  " << msg << LL_ENDL;
+	}
+	
+	for (std::map<LLGLenum, LLGLboolean>::iterator iter = sStateMap.begin();
+		 iter != sStateMap.end(); ++iter)
+	{
+		LLGLenum state = iter->first;
+		LLGLboolean cur_state = iter->second;
+		LLGLboolean gl_state = glIsEnabled(state);
+		if(cur_state != gl_state)
+		{
+			dumpStates();
+			LL_GL_ERRS << llformat("LLGLState error. State: 0x%04x",state) << LL_ENDL;
+		}
+	}
+	
+	stop_glerror();
+}
+
+void LLGLState::checkTextureChannels(const std::string& msg)
+{
+	if (!gDebugGL)
+	{
+		return;
+	}
+
+	GLint activeTexture;
+	glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture);
+	
+	BOOL error = FALSE;
+
+	if (activeTexture != GL_TEXTURE0_ARB)
+	{
+		error = TRUE;
+ 		LL_WARNS("RenderState") << "Active texture channel corrupted. " << LL_ENDL;
+	}
+	else if (!glIsEnabled(GL_TEXTURE_2D))
+	{
+		error = TRUE;
+		LL_WARNS("RenderState") << "GL_TEXTURE_2D not enabled on texture channel 0." << LL_ENDL;
+	}
+	else 
+	{
+		GLint tex_env_mode = 0;
+
+		glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &tex_env_mode);
+		if (tex_env_mode != GL_MODULATE)
+		{
+			error = TRUE;
+			LL_WARNS("RenderState") << "GL_TEXTURE_ENV_MODE invalid: " << std::hex << tex_env_mode << LL_ENDL;
+		}
+	}
+
+	GLint maxTextureUnits;
+	glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &maxTextureUnits);
+
+	static const char* label[] =
+	{
+		"GL_TEXTURE_2D",
+		"GL_TEXTURE_COORD_ARRAY",
+		"GL_TEXTURE_1D",
+		"GL_TEXTURE_CUBE_MAP_ARB",
+		"GL_TEXTURE_GEN_S",
+		"GL_TEXTURE_GEN_T",
+		"GL_TEXTURE_GEN_Q",
+		"GL_TEXTURE_GEN_R"
+	};
+
+	static GLint value[] =
+	{
+		GL_TEXTURE_2D,
+		GL_TEXTURE_COORD_ARRAY,
+		GL_TEXTURE_1D,
+		GL_TEXTURE_CUBE_MAP_ARB,
+		GL_TEXTURE_GEN_S,
+		GL_TEXTURE_GEN_T,
+		GL_TEXTURE_GEN_Q,
+		GL_TEXTURE_GEN_R
+	};
+
+	GLint stackDepth = 0;
+	LLMatrix4 identity;
+	LLMatrix4 matrix;
+
+	for (GLint i = 0; i < maxTextureUnits; i++)
+	{
+		gGL.getTexUnit(i)->activate();
+		glClientActiveTextureARB(GL_TEXTURE0_ARB+i);
+
+		glGetIntegerv(GL_TEXTURE_STACK_DEPTH, &stackDepth);
+
+		if (stackDepth != 1)
+		{
+			error = TRUE;
+			LL_WARNS("RenderState") << "Texture matrix stack corrupted." << LL_ENDL;
+		}
+
+		glGetFloatv(GL_TEXTURE_MATRIX, (GLfloat*) matrix.mMatrix);
+
+		if (matrix != identity)
+		{
+			error = TRUE;
+			LL_WARNS("RenderState") << "Texture matrix in channel " << i << " corrupt." << LL_ENDL;
+		}
+
+		for (S32 j = (i == 0 ? 1 : 0); j < 8; j++)
+		{
+			if (glIsEnabled(value[j]))
+			{
+				error = TRUE;
+				LL_WARNS("RenderState") << "Texture channel " << i << " still has " << label[j] << " enabled." << LL_ENDL;
+			}
+		}
+	}
+
+	gGL.getTexUnit(0)->activate();
+	glClientActiveTextureARB(GL_TEXTURE0_ARB);
+
+	if (error)
+	{
+		LL_GL_ERRS << "GL texture state corruption detected.  " << msg << LL_ENDL;
+	}
+}
+
+void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
+{
+	if (!gDebugGL)
+	{
+		return;
+	}
+
+	stop_glerror();
+	BOOL error = FALSE;
+
+	GLint active_texture;
+	glGetIntegerv(GL_CLIENT_ACTIVE_TEXTURE_ARB, &active_texture);
+
+	if (active_texture != GL_TEXTURE0_ARB)
+	{
+		llwarns << "Client active texture corrupted: " << active_texture << llendl;
+		error = TRUE;
+	}
+
+	glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &active_texture);
+	if (active_texture != GL_TEXTURE0_ARB)
+	{
+		llwarns << "Active texture corrupted: " << active_texture << llendl;
+		error = TRUE;
+	}
+
+	static const char* label[] =
+	{
+		"GL_VERTEX_ARRAY",
+		"GL_NORMAL_ARRAY",
+		"GL_COLOR_ARRAY",
+		"GL_TEXTURE_COORD_ARRAY"
+	};
+
+	static GLint value[] =
+	{
+		GL_VERTEX_ARRAY,
+		GL_NORMAL_ARRAY,
+		GL_COLOR_ARRAY,
+		GL_TEXTURE_COORD_ARRAY
+	};
+
+	 U32 mask[] = 
+	{ //copied from llvertexbuffer.h
+		0x0001, //MAP_VERTEX,
+		0x0002, //MAP_NORMAL,
+		0x0010, //MAP_COLOR,
+		0x0004, //MAP_TEXCOORD
+	};
+
+
+	for (S32 j = 0; j < 4; j++)
+	{
+		if (glIsEnabled(value[j]))
+		{
+			if (!(mask[j] & data_mask))
+			{
+				error = TRUE;
+				LL_WARNS("RenderState") << "GL still has " << label[j] << " enabled." << LL_ENDL;
+			}
+		}
+		else
+		{
+			if (mask[j] & data_mask)
+			{
+				error = TRUE;
+				LL_WARNS("RenderState") << "GL does not have " << label[j] << " enabled." << LL_ENDL;
+			}
+		}
+	}
+
+	glClientActiveTextureARB(GL_TEXTURE1_ARB);
+	gGL.getTexUnit(1)->activate();
+	if (glIsEnabled(GL_TEXTURE_COORD_ARRAY))
+	{
+		if (!(data_mask & 0x0008))
+		{
+			error = TRUE;
+			LL_WARNS("RenderState") << "GL still has GL_TEXTURE_COORD_ARRAY enabled on channel 1." << LL_ENDL;
+		}
+	}
+	else
+	{
+		if (data_mask & 0x0008)
+		{
+			error = TRUE;
+			LL_WARNS("RenderState") << "GL does not have GL_TEXTURE_COORD_ARRAY enabled on channel 1." << LL_ENDL;
+		}
+	}
+
+	if (glIsEnabled(GL_TEXTURE_2D))
+	{
+		if (!(data_mask & 0x0008))
+		{
+			error = TRUE;
+			LL_WARNS("RenderState") << "GL still has GL_TEXTURE_2D enabled on channel 1." << LL_ENDL;
+		}
+	}
+	else
+	{
+		if (data_mask & 0x0008)
+		{
+			error = TRUE;
+			LL_WARNS("RenderState") << "GL does not have GL_TEXTURE_2D enabled on channel 1." << LL_ENDL;
+		}
+	}
+
+	glClientActiveTextureARB(GL_TEXTURE0_ARB);
+	gGL.getTexUnit(0)->activate();
+
+	if (error)
+	{
+		LL_GL_ERRS << "GL client array corruption detected.  " << msg << LL_ENDL;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////
+
+LLGLState::LLGLState(LLGLenum state, S32 enabled) :
+	mState(state), mWasEnabled(FALSE), mIsEnabled(FALSE)
+{
+	stop_glerror();
+	if (state)
+	{
+		mWasEnabled = sStateMap[state];
+		llassert(mWasEnabled == glIsEnabled(state));
+		setEnabled(enabled);
+		stop_glerror();
+	}
+}
+
+void LLGLState::setEnabled(S32 enabled)
+{
+	if (!mState)
+	{
+		return;
+	}
+	if (enabled == CURRENT_STATE)
+	{
+		enabled = sStateMap[mState] == GL_TRUE ? TRUE : FALSE;
+	}
+	else if (enabled == TRUE && sStateMap[mState] != GL_TRUE)
+	{
+		gGL.flush();
+		glEnable(mState);
+		sStateMap[mState] = GL_TRUE;
+	}
+	else if (enabled == FALSE && sStateMap[mState] != GL_FALSE)
+	{
+		gGL.flush();
+		glDisable(mState);
+		sStateMap[mState] = GL_FALSE;
+	}
+	mIsEnabled = enabled;
+}
+
+LLGLState::~LLGLState() 
+{
+	stop_glerror();
+	if (mState)
+	{
+		if (gDebugGL)
+		{
+			llassert_always(sStateMap[mState] == glIsEnabled(mState));
+		}
+
+		if (mIsEnabled != mWasEnabled)
+		{
+			gGL.flush();
+			if (mWasEnabled)
+			{
+				glEnable(mState);
+				sStateMap[mState] = GL_TRUE;
+			}
+			else
+			{
+				glDisable(mState);
+				sStateMap[mState] = GL_FALSE;
+			}
+		}
+	}
+	stop_glerror();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+void LLGLManager::initGLStates()
+{
+	//gl states moved to classes in llglstates.h
+	LLGLState::initClass();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+void enable_vertex_weighting(const S32 index)
+{
+#if GL_ARB_vertex_program
+	if (index > 0) glEnableVertexAttribArrayARB(index);	// vertex weights
+#endif
+}
+
+void disable_vertex_weighting(const S32 index)
+{
+#if GL_ARB_vertex_program
+	if (index > 0) glDisableVertexAttribArrayARB(index);	// vertex weights
+#endif
+}
+
+void enable_binormals(const S32 index)
+{
+#if GL_ARB_vertex_program
+	if (index > 0)
+	{
+		glEnableVertexAttribArrayARB(index);	// binormals
+	}
+#endif
+}
+
+void disable_binormals(const S32 index)
+{
+#if GL_ARB_vertex_program
+	if (index > 0)
+	{
+		glDisableVertexAttribArrayARB(index);	// binormals
+	}
+#endif
+}
+
+
+void enable_cloth_weights(const S32 index)
+{
+#if GL_ARB_vertex_program
+	if (index > 0)	glEnableVertexAttribArrayARB(index);
+#endif
+}
+
+void disable_cloth_weights(const S32 index)
+{
+#if GL_ARB_vertex_program
+	if (index > 0) glDisableVertexAttribArrayARB(index);
+#endif
+}
+
+void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights)
+{
+#if GL_ARB_vertex_program
+	if (index > 0) glVertexAttribPointerARB(index, 1, GL_FLOAT, FALSE, stride, weights);
+	stop_glerror();
+#endif
+}
+
+void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights)
+{
+#if GL_ARB_vertex_program
+	if (index > 0) glVertexAttribPointerARB(index, 4, GL_FLOAT, TRUE, stride, weights);
+	stop_glerror();
+#endif
+}
+
+void set_binormals(const S32 index, const U32 stride,const LLVector3 *binormals)
+{
+#if GL_ARB_vertex_program
+	if (index > 0) glVertexAttribPointerARB(index, 3, GL_FLOAT, FALSE, stride, binormals);
+	stop_glerror();
+#endif
+}
+
+
+void set_palette(U8 *palette_data)
+{
+	if (gGLManager.mHasPalettedTextures)
+	{
+		glColorTableEXT(GL_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette_data);
+	}
+}
+
+
+void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific )
+{
+	// GL_VERSION returns a null-terminated string with the format: 
+	// <major>.<minor>[.<release>] [<vendor specific>]
+
+	const char* version = (const char*) glGetString(GL_VERSION);
+	*major = 0;
+	*minor = 0;
+	*release = 0;
+	vendor_specific->assign("");
+
+	if( !version )
+	{
+		return;
+	}
+
+	std::string ver_copy( version );
+	S32 len = (S32)strlen( version );	/* Flawfinder: ignore */
+	S32 i = 0;
+	S32 start;
+	// Find the major version
+	start = i;
+	for( ; i < len; i++ )
+	{
+		if( '.' == version[i] )
+		{
+			break;
+		}
+	}
+	std::string major_str = ver_copy.substr(start,i-start);
+	LLStringUtil::convertToS32(major_str, *major);
+
+	if( '.' == version[i] )
+	{
+		i++;
+	}
+
+	// Find the minor version
+	start = i;
+	for( ; i < len; i++ )
+	{
+		if( ('.' == version[i]) || isspace(version[i]) )
+		{
+			break;
+		}
+	}
+	std::string minor_str = ver_copy.substr(start,i-start);
+	LLStringUtil::convertToS32(minor_str, *minor);
+
+	// Find the release number (optional)
+	if( '.' == version[i] )
+	{
+		i++;
+
+		start = i;
+		for( ; i < len; i++ )
+		{
+			if( isspace(version[i]) )
+			{
+				break;
+			}
+		}
+
+		std::string release_str = ver_copy.substr(start,i-start);
+		LLStringUtil::convertToS32(release_str, *release);
+	}
+
+	// Skip over any white space
+	while( version[i] && isspace( version[i] ) )
+	{
+		i++;
+	}
+
+	// Copy the vendor-specific string (optional)
+	if( version[i] )
+	{
+		vendor_specific->assign( version + i );
+	}
+}
+
+LLGLUserClipPlane::LLGLUserClipPlane(const LLPlane& p, const glh::matrix4f& modelview, const glh::matrix4f& projection)
+{
+	mModelview = modelview;
+	mProjection = projection;
+
+	setPlane(p.mV[0], p.mV[1], p.mV[2], p.mV[3]);
+}
+
+void LLGLUserClipPlane::setPlane(F32 a, F32 b, F32 c, F32 d)
+{
+	glh::matrix4f& P = mProjection;
+	glh::matrix4f& M = mModelview;
+    
+	glh::matrix4f invtrans_MVP = (P * M).inverse().transpose();
+    glh::vec4f oplane(a,b,c,d);
+    glh::vec4f cplane;
+    invtrans_MVP.mult_matrix_vec(oplane, cplane);
+
+    cplane /= fabs(cplane[2]); // normalize such that depth is not scaled
+    cplane[3] -= 1;
+
+    if(cplane[2] < 0)
+        cplane *= -1;
+
+    glh::matrix4f suffix;
+    suffix.set_row(2, cplane);
+    glh::matrix4f newP = suffix * P;
+    glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+    glLoadMatrixf(newP.m);
+	gGLObliqueProjectionInverse = LLMatrix4(newP.inverse().transpose().m);
+    glMatrixMode(GL_MODELVIEW);
+}
+
+LLGLUserClipPlane::~LLGLUserClipPlane()
+{
+	glMatrixMode(GL_PROJECTION);
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+}
+
+LLGLNamePool::LLGLNamePool()
+{
+}
+
+void LLGLNamePool::registerPool(LLGLNamePool* pool)
+{
+	pool_list_t::iterator iter = std::find(sInstances.begin(), sInstances.end(), pool);
+	if (iter == sInstances.end())
+	{
+		sInstances.push_back(pool);
+	}
+}
+
+LLGLNamePool::~LLGLNamePool()
+{
+	pool_list_t::iterator iter = std::find(sInstances.begin(), sInstances.end(), this);
+	if (iter != sInstances.end())
+	{
+		sInstances.erase(iter);
+	}
+}
+
+void LLGLNamePool::upkeep()
+{
+	std::sort(mNameList.begin(), mNameList.end(), CompareUsed());
+}
+
+void LLGLNamePool::cleanup()
+{
+	for (name_list_t::iterator iter = mNameList.begin(); iter != mNameList.end(); ++iter)
+	{
+		releaseName(iter->name);
+	}
+
+	mNameList.clear();
+}
+
+GLuint LLGLNamePool::allocate()
+{
+#if LL_GL_NAME_POOLING
+	for (name_list_t::iterator iter = mNameList.begin(); iter != mNameList.end(); ++iter)
+	{
+		if (!iter->used)
+		{
+			iter->used = TRUE;
+			return iter->name;
+		}
+	}
+
+	NameEntry entry;
+	entry.name = allocateName();
+	entry.used = TRUE;
+	mNameList.push_back(entry);
+
+	return entry.name;
+#else
+	return allocateName();
+#endif
+}
+
+void LLGLNamePool::release(GLuint name)
+{
+#if LL_GL_NAME_POOLING
+	for (name_list_t::iterator iter = mNameList.begin(); iter != mNameList.end(); ++iter)
+	{
+		if (iter->name == name)
+		{
+			if (iter->used)
+			{
+				iter->used = FALSE;
+				return;
+			}
+			else
+			{
+				llerrs << "Attempted to release a pooled name that is not in use!" << llendl;
+			}
+		}
+	}
+	llerrs << "Attempted to release a non pooled name!" << llendl;
+#else
+	releaseName(name);
+#endif
+}
+
+//static
+void LLGLNamePool::upkeepPools()
+{
+	for (pool_list_t::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+	{
+		LLGLNamePool* pool = *iter;
+		pool->upkeep();
+	}
+}
+
+//static
+void LLGLNamePool::cleanupPools()
+{
+	for (pool_list_t::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+	{
+		LLGLNamePool* pool = *iter;
+		pool->cleanup();
+	}
+}
+
+LLGLDepthTest::LLGLDepthTest(GLboolean depth_enabled, GLboolean write_enabled, GLenum depth_func)
+: mPrevDepthEnabled(sDepthEnabled), mPrevDepthFunc(sDepthFunc), mPrevWriteEnabled(sWriteEnabled)
+{
+	if (depth_enabled != sDepthEnabled)
+	{
+		gGL.flush();
+		if (depth_enabled) glEnable(GL_DEPTH_TEST);
+		else glDisable(GL_DEPTH_TEST);
+		sDepthEnabled = depth_enabled;
+	}
+	if (depth_func != sDepthFunc)
+	{
+		gGL.flush();
+		glDepthFunc(depth_func);
+		sDepthFunc = depth_func;
+	}
+	if (write_enabled != sWriteEnabled)
+	{
+		gGL.flush();
+		glDepthMask(write_enabled);
+		sWriteEnabled = write_enabled;
+	}
+}
+
+LLGLDepthTest::~LLGLDepthTest()
+{
+	if (sDepthEnabled != mPrevDepthEnabled )
+	{
+		gGL.flush();
+		if (mPrevDepthEnabled) glEnable(GL_DEPTH_TEST);
+		else glDisable(GL_DEPTH_TEST);
+		sDepthEnabled = mPrevDepthEnabled;
+	}
+	if (sDepthFunc != mPrevDepthFunc)
+	{
+		gGL.flush();
+		glDepthFunc(mPrevDepthFunc);
+		sDepthFunc = mPrevDepthFunc;
+	}
+	if (sWriteEnabled != mPrevWriteEnabled )
+	{
+		gGL.flush();
+		glDepthMask(mPrevWriteEnabled);
+		sWriteEnabled = mPrevWriteEnabled;
+	}
+}
+
+LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
+{
+	for (U32 i = 0; i < 4; i++)
+	{
+		P.element(2, i) = P.element(3, i) * 0.99999f;
+	}
+
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadMatrixf(P.m);
+	glMatrixMode(GL_MODELVIEW);
+}
+
+LLGLClampToFarClip::~LLGLClampToFarClip()
+{
+	glMatrixMode(GL_PROJECTION);
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+}
+
diff --git a/linden/indra/llrender/llgl.h b/linden/indra/llrender/llgl.h
new file mode 100644
index 0000000..cb368d7
--- /dev/null
+++ b/linden/indra/llrender/llgl.h
@@ -0,0 +1,378 @@
+/** 
+ * @file llgl.h
+ * @brief LLGL definition
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLGL_H
+#define LL_LLGL_H
+
+// This file contains various stuff for handling gl extensions and other gl related stuff.
+
+#include <string>
+#include <map>
+
+#include "llerror.h"
+#include "v4color.h"
+#include "llstring.h"
+#include "stdtypes.h"
+#include "v4math.h"
+#include "llplane.h"
+#include "llgltypes.h"
+
+#include "llglheaders.h"
+#include "glh/glh_linear.h"
+
+extern BOOL gDebugGL;
+
+#define LL_GL_ERRS LL_ERRS("RenderState")
+
+class LLSD;
+
+// Manage GL extensions...
+class LLGLManager
+{
+public:
+	LLGLManager();
+
+	bool initGL();
+	void shutdownGL();
+
+	void initWGL(); // Initializes stupid WGL extensions
+
+	std::string getRawGLString(); // For sending to simulator
+
+	BOOL mInited;
+	BOOL mIsDisabled;
+
+	// Extensions used by everyone
+	BOOL mHasMultitexture;
+	S32	 mNumTextureUnits;
+	BOOL mHasMipMapGeneration;
+	BOOL mHasPalettedTextures;
+	BOOL mHasCompressedTextures;
+	BOOL mHasFramebufferObject;
+
+	// ARB Extensions
+	BOOL mHasVertexBufferObject;
+	BOOL mHasPBuffer;
+	BOOL mHasShaderObjects;
+	BOOL mHasVertexShader;
+	BOOL mHasFragmentShader;
+	BOOL mHasOcclusionQuery;
+	BOOL mHasPointParameters;
+
+	// Other extensions.
+	BOOL mHasAnisotropic;
+	BOOL mHasARBEnvCombine;
+	BOOL mHasCubeMap;
+
+	// Vendor-specific extensions
+	BOOL mIsATI;
+	BOOL mIsNVIDIA;
+	BOOL mIsIntel;
+	BOOL mIsGF2or4MX;
+	BOOL mIsGF3;
+	BOOL mIsGFFX;
+	BOOL mATIOffsetVerticalLines;
+	BOOL mATIOldDriver;
+
+	// Whether this version of GL is good enough for SL to use
+	BOOL mHasRequirements;
+
+	// Misc extensions
+	BOOL mHasSeparateSpecularColor;
+	
+	S32 mDriverVersionMajor;
+	S32 mDriverVersionMinor;
+	S32 mDriverVersionRelease;
+	F32 mGLVersion; // e.g = 1.4
+	std::string mDriverVersionVendorString;
+
+	S32 mVRAM; // VRAM in MB
+	S32 mGLMaxVertexRange;
+	S32 mGLMaxIndexRange;
+	
+	void getPixelFormat(); // Get the best pixel format
+
+	std::string getGLInfoString();
+	void printGLInfoString();
+	void getGLInfo(LLSD& info);
+
+	// In ALL CAPS
+	std::string mGLVendor;
+	std::string mGLVendorShort;
+
+	// In ALL CAPS
+	std::string mGLRenderer;
+
+private:
+	void initExtensions();
+	void initGLStates();
+	void initGLImages();
+};
+
+extern LLGLManager gGLManager;
+
+class LLQuaternion;
+class LLMatrix4;
+
+void rotate_quat(LLQuaternion& rotation);
+
+void flush_glerror(); // Flush GL errors when we know we're handling them correctly.
+
+void assert_glerror();
+
+void clear_glerror();
+
+//#if LL_DEBUG
+# define stop_glerror() assert_glerror()
+# define llglassertok() assert_glerror()
+//#else
+//# define stop_glerror()
+//# define llglassertok()
+//#endif
+
+#define llglassertok_always() assert_glerror()
+
+////////////////////////
+//
+// Note: U32's are GLEnum's...
+//
+
+// This is a class for GL state management
+
+/*
+	GL STATE MANAGEMENT DESCRIPTION
+
+	LLGLState and its two subclasses, LLGLEnable and LLGLDisable, manage the current 
+	enable/disable states of the GL to prevent redundant setting of state within a 
+	render path or the accidental corruption of what state the next path expects.
+
+	Essentially, wherever you would call glEnable set a state and then
+	subsequently reset it by calling glDisable (or vice versa), make an instance of 
+	LLGLEnable with the state you want to set, and assume it will be restored to its
+	original state when that instance of LLGLEnable is destroyed.  It is good practice
+	to exploit stack frame controls for optimal setting/unsetting and readability of 
+	code.  In llglstates.h, there are a collection of helper classes that define groups
+	of enables/disables that can cause multiple states to be set with the creation of
+	one instance.  
+
+	Sample usage:
+
+	//disable lighting for rendering hud objects
+	//INCORRECT USAGE
+	LLGLEnable lighting(GL_LIGHTING);
+	renderHUD();
+	LLGLDisable lighting(GL_LIGHTING);
+
+	//CORRECT USAGE
+	{
+		LLGLEnable lighting(GL_LIGHTING);
+		renderHUD();
+	}
+
+	If a state is to be set on a conditional, the following mechanism
+	is useful:
+
+	{
+		LLGLEnable lighting(light_hud ? GL_LIGHTING : 0);
+		renderHUD();
+	}
+
+	A LLGLState initialized with a parameter of 0 does nothing.
+
+	LLGLState works by maintaining a map of the current GL states, and ignoring redundant
+	enables/disables.  If a redundant call is attempted, it becomes a noop, otherwise,
+	it is set in the constructor and reset in the destructor.  
+
+	For debugging GL state corruption, running with debug enabled will trigger asserts
+	if the existing GL state does not match the expected GL state.
+
+*/
+class LLGLState
+{
+public:
+	static void initClass();
+	static void restoreGL();
+
+	static void resetTextureStates();
+	static void dumpStates();
+	static void checkStates(const std::string& msg = "");
+	static void checkTextureChannels(const std::string& msg = "");
+	static void checkClientArrays(const std::string& msg = "", U32 data_mask = 0x0001);
+	
+protected:
+	static std::map<LLGLenum, LLGLboolean> sStateMap;
+	
+public:
+	enum { CURRENT_STATE = -2 };
+	LLGLState(LLGLenum state, S32 enabled = CURRENT_STATE);
+	~LLGLState();
+	void setEnabled(S32 enabled);
+	void enable() { setEnabled(TRUE); }
+	void disable() { setEnabled(FALSE); }
+protected:
+	LLGLenum mState;
+	BOOL mWasEnabled;
+	BOOL mIsEnabled;
+};
+
+// New LLGLState class wrappers that don't depend on actual GL flags.
+class LLGLEnableBlending : public LLGLState
+{
+public:
+	LLGLEnableBlending(bool enable);
+};
+
+class LLGLEnableAlphaReject : public LLGLState
+{
+public:
+	LLGLEnableAlphaReject(bool enable);
+};
+
+/// TODO: Being deprecated.
+class LLGLEnable : public LLGLState
+{
+public:
+	LLGLEnable(LLGLenum state) : LLGLState(state, TRUE) {}
+};
+
+/// TODO: Being deprecated.
+class LLGLDisable : public LLGLState
+{
+public:
+	LLGLDisable(LLGLenum state) : LLGLState(state, FALSE) {}
+};
+
+/*
+  Store and modify projection matrix to create an oblique
+  projection that clips to the specified plane.  Oblique
+  projections alter values in the depth buffer, so this
+  class should not be used mid-renderpass.  
+
+  Restores projection matrix on destruction.
+  GL_MODELVIEW_MATRIX is active whenever program execution
+  leaves this class.
+  Does not stack.
+  Caches inverse of projection matrix used in gGLObliqueProjectionInverse
+*/
+class LLGLUserClipPlane 
+{
+public:
+	
+	LLGLUserClipPlane(const LLPlane& plane, const glh::matrix4f& modelview, const glh::matrix4f& projection);
+	~LLGLUserClipPlane();
+
+	void setPlane(F32 a, F32 b, F32 c, F32 d);
+
+private:
+	glh::matrix4f mProjection;
+	glh::matrix4f mModelview;
+};
+
+/*
+  Modify and load projection matrix to push depth values to far clip plane.
+
+  Restores projection matrix on destruction.
+  GL_MODELVIEW_MATRIX is active whenever program execution
+  leaves this class.
+  Does not stack.
+*/
+class LLGLClampToFarClip
+{
+public:
+	LLGLClampToFarClip(glh::matrix4f projection);
+	~LLGLClampToFarClip();
+};
+
+/*
+	Generic pooling scheme for things which use GL names (used for occlusion queries and vertex buffer objects).
+	Prevents thrashing of GL name caches by avoiding calls to glGenFoo and glDeleteFoo.
+*/
+class LLGLNamePool
+{
+public:
+	typedef struct
+	{
+		GLuint name;
+		BOOL used;
+	} NameEntry;
+
+	struct CompareUsed
+	{
+		bool operator()(const NameEntry& lhs, const NameEntry& rhs)
+		{
+			return lhs.used < rhs.used;  //FALSE entries first
+		}
+	};
+
+	typedef std::vector<NameEntry> name_list_t;
+	name_list_t mNameList;
+
+	LLGLNamePool();
+	virtual ~LLGLNamePool();
+	
+	void upkeep();
+	void cleanup();
+	
+	GLuint allocate();
+	void release(GLuint name);
+	
+	static void registerPool(LLGLNamePool* pool);
+	static void upkeepPools();
+	static void cleanupPools();
+
+protected:
+	typedef std::vector<LLGLNamePool*> pool_list_t;
+	static pool_list_t sInstances;
+	
+	virtual GLuint allocateName() = 0;
+	virtual void releaseName(GLuint name) = 0;
+};
+
+extern LLMatrix4 gGLObliqueProjectionInverse;
+
+#include "llglstates.h"
+
+void init_glstates();
+void enable_vertex_weighting(const S32 index);
+void disable_vertex_weighting(const S32 index);
+void enable_binormals(const S32 index);
+void disable_binormals(const S32 index);
+void enable_cloth_weights(const S32 index);
+void disable_cloth_weights(const S32 index);
+void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights);
+void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights);
+void set_binormals(const S32 index, const U32 stride, const LLVector3 *binormals);
+void set_palette(U8* palette_data);
+void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific );
+
+extern BOOL gClothRipple;
+extern BOOL gNoRender;
+#endif // LL_LLGL_H
diff --git a/linden/indra/llrender/llgldbg.cpp b/linden/indra/llrender/llgldbg.cpp
index 953ba3a..526215b 100644
--- a/linden/indra/llrender/llgldbg.cpp
+++ b/linden/indra/llrender/llgldbg.cpp
@@ -43,7 +43,7 @@
 //------------------------------------------------------------------------
 // cmstr()
 //------------------------------------------------------------------------
-char *cmstr(int i)
+const char *cmstr(int i)
 {
 	switch( i )
 	{
@@ -59,7 +59,7 @@ char *cmstr(int i)
 //------------------------------------------------------------------------
 // facestr()
 //------------------------------------------------------------------------
-char *facestr(int i)
+const char *facestr(int i)
 {
 	switch( i )
 	{
@@ -81,7 +81,7 @@ const char *boolstr(int b)
 //------------------------------------------------------------------------
 // fv4()
 //------------------------------------------------------------------------
-char *fv4(F32 *f)
+const char *fv4(F32 *f)
 {
 	static char str[128];
 	sprintf(str, "%8.3f %8.3f %8.3f %8.3f", f[0], f[1], f[2], f[3]);
@@ -91,7 +91,7 @@ char *fv4(F32 *f)
 //------------------------------------------------------------------------
 // fv3()
 //------------------------------------------------------------------------
-char *fv3(F32 *f)
+const char *fv3(F32 *f)
 {
 	static char str[128];	/* Flawfinder: ignore */
 	snprintf(str, sizeof(str), "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]);	/* Flawfinder: ignore */
@@ -101,7 +101,7 @@ char *fv3(F32 *f)
 //------------------------------------------------------------------------
 // fv1()
 //------------------------------------------------------------------------
-char *fv1(F32 *f)
+const char *fv1(F32 *f)
 {
 	static char str[128];	/* Flawfinder: ignore */
 	snprintf(str, sizeof(str), "%8.3f", f[0]);		/* Flawfinder: ignore */
diff --git a/linden/indra/llrender/llglheaders.h b/linden/indra/llrender/llglheaders.h
new file mode 100644
index 0000000..f047262
--- /dev/null
+++ b/linden/indra/llrender/llglheaders.h
@@ -0,0 +1,588 @@
+/** 
+ * @file llglheaders.h
+ * @brief LLGL definitions
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLGLHEADERS_H
+#define LL_LLGLHEADERS_H
+
+#if LL_MESA
+//----------------------------------------------------------------------------
+// MESA headers
+// quotes so we get libraries/.../GL/ version
+#define GL_GLEXT_PROTOTYPES
+#include "GL/gl.h"
+#include "GL/glext.h"
+#include "GL/glu.h"
+
+// The __APPLE__ kludge is to make glh_extensions.h not symbol-clash horribly
+# define __APPLE__
+# include "GL/glh_extensions.h"
+# undef __APPLE__
+
+#elif LL_LINUX
+//----------------------------------------------------------------------------
+// Linux, MESA headers, but not necessarily assuming MESA runtime.
+// quotes so we get libraries/.../GL/ version
+#include "GL/gl.h"
+#include "GL/glext.h"
+#include "GL/glu.h"
+
+
+#if LL_LINUX && !LL_MESA_HEADLESS
+// The __APPLE__ kludge is to make glh_extensions.h not symbol-clash horribly
+# define __APPLE__
+# include "GL/glh_extensions.h"
+# undef __APPLE__
+
+/* Although SDL very likely ends up calling glXGetProcAddress() itself,
+   if we use SDL_GL_GetProcAddress() then we get bogus addresses back on
+   some systems.  Weird. */
+/*# include "SDL/SDL.h"
+  # define GLH_EXT_GET_PROC_ADDRESS(p) SDL_GL_GetProcAddress(p) */
+#define GLX_GLXEXT_PROTOTYPES 1
+# include "GL/glx.h"
+# include "GL/glxext.h"
+// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
+// is considered 'legacy' but works on more machines.
+# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p))
+// Whee, the X headers define 'Status'.  Undefine to avoid confusion.
+#undef Status
+#endif // LL_LINUX && !LL_MESA_HEADLESS
+
+
+// GL_ARB_vertex_buffer_object
+extern PFNGLBINDBUFFERARBPROC		glBindBufferARB;
+extern PFNGLDELETEBUFFERSARBPROC	glDeleteBuffersARB;
+extern PFNGLGENBUFFERSARBPROC		glGenBuffersARB;
+extern PFNGLISBUFFERARBPROC			glIsBufferARB;
+extern PFNGLBUFFERDATAARBPROC		glBufferDataARB;
+extern PFNGLBUFFERSUBDATAARBPROC	glBufferSubDataARB;
+extern PFNGLGETBUFFERSUBDATAARBPROC glGetBufferSubDataARB;
+extern PFNGLMAPBUFFERARBPROC		glMapBufferARB;
+extern PFNGLUNMAPBUFFERARBPROC		glUnmapBufferARB;
+extern PFNGLGETBUFFERPARAMETERIVARBPROC	glGetBufferParameterivARB;
+extern PFNGLGETBUFFERPOINTERVARBPROC	glGetBufferPointervARB;
+
+// GL_ATI_vertex_array_object
+extern PFNGLNEWOBJECTBUFFERATIPROC			glNewObjectBufferATI;
+extern PFNGLISOBJECTBUFFERATIPROC			glIsObjectBufferATI;
+extern PFNGLUPDATEOBJECTBUFFERATIPROC		glUpdateObjectBufferATI;
+extern PFNGLGETOBJECTBUFFERFVATIPROC		glGetObjectBufferfvATI;
+extern PFNGLGETOBJECTBUFFERIVATIPROC		glGetObjectBufferivATI;
+extern PFNGLFREEOBJECTBUFFERATIPROC		    glFreeObjectBufferATI;
+extern PFNGLARRAYOBJECTATIPROC				glArrayObjectATI;
+extern PFNGLVERTEXATTRIBARRAYOBJECTATIPROC	glVertexAttribArrayObjectATI;
+extern PFNGLGETARRAYOBJECTFVATIPROC			glGetArrayObjectfvATI;
+extern PFNGLGETARRAYOBJECTIVATIPROC			glGetArrayObjectivATI;
+extern PFNGLVARIANTARRAYOBJECTATIPROC		glVariantObjectArrayATI;
+extern PFNGLGETVARIANTARRAYOBJECTFVATIPROC	glGetVariantArrayObjectfvATI;
+extern PFNGLGETVARIANTARRAYOBJECTIVATIPROC	glGetVariantArrayObjectivATI;
+
+// GL_ARB_occlusion_query
+extern PFNGLGENQUERIESARBPROC glGenQueriesARB;
+extern PFNGLDELETEQUERIESARBPROC glDeleteQueriesARB;
+extern PFNGLISQUERYARBPROC glIsQueryARB;
+extern PFNGLBEGINQUERYARBPROC glBeginQueryARB;
+extern PFNGLENDQUERYARBPROC glEndQueryARB;
+extern PFNGLGETQUERYIVARBPROC glGetQueryivARB;
+extern PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB;
+extern PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB;
+
+// GL_ARB_point_parameters
+extern PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB;
+extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB;
+
+// GL_ARB_shader_objects
+extern PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
+extern PFNGLGETHANDLEARBPROC glGetHandleARB;
+extern PFNGLDETACHOBJECTARBPROC glDetachObjectARB;
+extern PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
+extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
+extern PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
+extern PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
+extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
+extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
+extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
+extern PFNGLVALIDATEPROGRAMARBPROC glValidateProgramARB;
+extern PFNGLUNIFORM1FARBPROC glUniform1fARB;
+extern PFNGLUNIFORM2FARBPROC glUniform2fARB;
+extern PFNGLUNIFORM3FARBPROC glUniform3fARB;
+extern PFNGLUNIFORM4FARBPROC glUniform4fARB;
+extern PFNGLUNIFORM1IARBPROC glUniform1iARB;
+extern PFNGLUNIFORM2IARBPROC glUniform2iARB;
+extern PFNGLUNIFORM3IARBPROC glUniform3iARB;
+extern PFNGLUNIFORM4IARBPROC glUniform4iARB;
+extern PFNGLUNIFORM1FVARBPROC glUniform1fvARB;
+extern PFNGLUNIFORM2FVARBPROC glUniform2fvARB;
+extern PFNGLUNIFORM3FVARBPROC glUniform3fvARB;
+extern PFNGLUNIFORM4FVARBPROC glUniform4fvARB;
+extern PFNGLUNIFORM1IVARBPROC glUniform1ivARB;
+extern PFNGLUNIFORM2IVARBPROC glUniform2ivARB;
+extern PFNGLUNIFORM3IVARBPROC glUniform3ivARB;
+extern PFNGLUNIFORM4IVARBPROC glUniform4ivARB;
+extern PFNGLUNIFORMMATRIX2FVARBPROC glUniformMatrix2fvARB;
+extern PFNGLUNIFORMMATRIX3FVARBPROC glUniformMatrix3fvARB;
+extern PFNGLUNIFORMMATRIX4FVARBPROC glUniformMatrix4fvARB;
+extern PFNGLGETOBJECTPARAMETERFVARBPROC glGetObjectParameterfvARB;
+extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
+extern PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
+extern PFNGLGETATTACHEDOBJECTSARBPROC glGetAttachedObjectsARB;
+extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
+extern PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB;
+extern PFNGLGETUNIFORMFVARBPROC glGetUniformfvARB;
+extern PFNGLGETUNIFORMIVARBPROC glGetUniformivARB;
+extern PFNGLGETSHADERSOURCEARBPROC glGetShaderSourceARB;
+
+// GL_ARB_vertex_shader
+extern PFNGLVERTEXATTRIB1DARBPROC glVertexAttrib1dARB;
+extern PFNGLVERTEXATTRIB1DVARBPROC glVertexAttrib1dvARB;
+extern PFNGLVERTEXATTRIB1FARBPROC glVertexAttrib1fARB;
+extern PFNGLVERTEXATTRIB1FVARBPROC glVertexAttrib1fvARB;
+extern PFNGLVERTEXATTRIB1SARBPROC glVertexAttrib1sARB;
+extern PFNGLVERTEXATTRIB1SVARBPROC glVertexAttrib1svARB;
+extern PFNGLVERTEXATTRIB2DARBPROC glVertexAttrib2dARB;
+extern PFNGLVERTEXATTRIB2DVARBPROC glVertexAttrib2dvARB;
+extern PFNGLVERTEXATTRIB2FARBPROC glVertexAttrib2fARB;
+extern PFNGLVERTEXATTRIB2FVARBPROC glVertexAttrib2fvARB;
+extern PFNGLVERTEXATTRIB2SARBPROC glVertexAttrib2sARB;
+extern PFNGLVERTEXATTRIB2SVARBPROC glVertexAttrib2svARB;
+extern PFNGLVERTEXATTRIB3DARBPROC glVertexAttrib3dARB;
+extern PFNGLVERTEXATTRIB3DVARBPROC glVertexAttrib3dvARB;
+extern PFNGLVERTEXATTRIB3FARBPROC glVertexAttrib3fARB;
+extern PFNGLVERTEXATTRIB3FVARBPROC glVertexAttrib3fvARB;
+extern PFNGLVERTEXATTRIB3SARBPROC glVertexAttrib3sARB;
+extern PFNGLVERTEXATTRIB3SVARBPROC glVertexAttrib3svARB;
+extern PFNGLVERTEXATTRIB4NBVARBPROC glVertexAttrib4nbvARB;
+extern PFNGLVERTEXATTRIB4NIVARBPROC glVertexAttrib4nivARB;
+extern PFNGLVERTEXATTRIB4NSVARBPROC glVertexAttrib4nsvARB;
+extern PFNGLVERTEXATTRIB4NUBARBPROC glVertexAttrib4nubARB;
+extern PFNGLVERTEXATTRIB4NUBVARBPROC glVertexAttrib4nubvARB;
+extern PFNGLVERTEXATTRIB4NUIVARBPROC glVertexAttrib4nuivARB;
+extern PFNGLVERTEXATTRIB4NUSVARBPROC glVertexAttrib4nusvARB;
+extern PFNGLVERTEXATTRIB4BVARBPROC glVertexAttrib4bvARB;
+extern PFNGLVERTEXATTRIB4DARBPROC glVertexAttrib4dARB;
+extern PFNGLVERTEXATTRIB4DVARBPROC glVertexAttrib4dvARB;
+extern PFNGLVERTEXATTRIB4FARBPROC glVertexAttrib4fARB;
+extern PFNGLVERTEXATTRIB4FVARBPROC glVertexAttrib4fvARB;
+extern PFNGLVERTEXATTRIB4IVARBPROC glVertexAttrib4ivARB;
+extern PFNGLVERTEXATTRIB4SARBPROC glVertexAttrib4sARB;
+extern PFNGLVERTEXATTRIB4SVARBPROC glVertexAttrib4svARB;
+extern PFNGLVERTEXATTRIB4UBVARBPROC glVertexAttrib4ubvARB;
+extern PFNGLVERTEXATTRIB4UIVARBPROC glVertexAttrib4uivARB;
+extern PFNGLVERTEXATTRIB4USVARBPROC glVertexAttrib4usvARB;
+extern PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB;
+extern PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB;
+extern PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB;
+extern PFNGLPROGRAMSTRINGARBPROC glProgramStringARB;
+extern PFNGLBINDPROGRAMARBPROC glBindProgramARB;
+extern PFNGLDELETEPROGRAMSARBPROC glDeleteProgramsARB;
+extern PFNGLGENPROGRAMSARBPROC glGenProgramsARB;
+extern PFNGLPROGRAMENVPARAMETER4DARBPROC glProgramEnvParameter4dARB;
+extern PFNGLPROGRAMENVPARAMETER4DVARBPROC glProgramEnvParameter4dvARB;
+extern PFNGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB;
+extern PFNGLPROGRAMENVPARAMETER4FVARBPROC glProgramEnvParameter4fvARB;
+extern PFNGLPROGRAMLOCALPARAMETER4DARBPROC glProgramLocalParameter4dARB;
+extern PFNGLPROGRAMLOCALPARAMETER4DVARBPROC glProgramLocalParameter4dvARB;
+extern PFNGLPROGRAMLOCALPARAMETER4FARBPROC glProgramLocalParameter4fARB;
+extern PFNGLPROGRAMLOCALPARAMETER4FVARBPROC glProgramLocalParameter4fvARB;
+extern PFNGLGETPROGRAMENVPARAMETERDVARBPROC glGetProgramEnvParameterdvARB;
+extern PFNGLGETPROGRAMENVPARAMETERFVARBPROC glGetProgramEnvParameterfvARB;
+extern PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC glGetProgramLocalParameterdvARB;
+extern PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC glGetProgramLocalParameterfvARB;
+extern PFNGLGETPROGRAMIVARBPROC glGetProgramivARB;
+extern PFNGLGETPROGRAMSTRINGARBPROC glGetProgramStringARB;
+extern PFNGLGETVERTEXATTRIBDVARBPROC glGetVertexAttribdvARB;
+extern PFNGLGETVERTEXATTRIBFVARBPROC glGetVertexAttribfvARB;
+extern PFNGLGETVERTEXATTRIBIVARBPROC glGetVertexAttribivARB;
+extern PFNGLGETVERTEXATTRIBPOINTERVARBPROC glGetVertexAttribPointervARB;
+extern PFNGLISPROGRAMARBPROC glIsProgramARB;
+extern PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB;
+extern PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB;
+extern PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB;
+
+extern PFNGLCOMPRESSEDTEXIMAGE2DARBPROC glCompressedTexImage2DARB;
+extern PFNGLGETCOMPRESSEDTEXIMAGEARBPROC glGetCompressedTexImageARB;
+
+extern PFNGLCOLORTABLEEXTPROC glColorTableEXT;
+
+//GL_EXT_framebuffer_object
+extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
+extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
+extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
+extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
+extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
+extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
+extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
+extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
+extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
+extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
+extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
+extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
+extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
+extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
+extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
+extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
+
+
+#elif LL_WINDOWS
+
+// windows gl headers depend on things like APIENTRY, so include windows.
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <windows.h>
+
+//----------------------------------------------------------------------------
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+// quotes so we get libraries/.../GL/ version
+#include "GL/glext.h"
+#include "GL/glh_extensions.h"
+
+
+// GL_ARB_vertex_buffer_object
+extern PFNGLBINDBUFFERARBPROC		glBindBufferARB;
+extern PFNGLDELETEBUFFERSARBPROC	glDeleteBuffersARB;
+extern PFNGLGENBUFFERSARBPROC		glGenBuffersARB;
+extern PFNGLISBUFFERARBPROC			glIsBufferARB;
+extern PFNGLBUFFERDATAARBPROC		glBufferDataARB;
+extern PFNGLBUFFERSUBDATAARBPROC	glBufferSubDataARB;
+extern PFNGLGETBUFFERSUBDATAARBPROC glGetBufferSubDataARB;
+extern PFNGLMAPBUFFERARBPROC		glMapBufferARB;
+extern PFNGLUNMAPBUFFERARBPROC		glUnmapBufferARB;
+extern PFNGLGETBUFFERPARAMETERIVARBPROC	glGetBufferParameterivARB;
+extern PFNGLGETBUFFERPOINTERVARBPROC	glGetBufferPointervARB;
+
+// GL_ATI_vertex_array_object
+extern PFNGLNEWOBJECTBUFFERATIPROC			glNewObjectBufferATI;
+extern PFNGLISOBJECTBUFFERATIPROC			glIsObjectBufferATI;
+extern PFNGLUPDATEOBJECTBUFFERATIPROC		glUpdateObjectBufferATI;
+extern PFNGLGETOBJECTBUFFERFVATIPROC		glGetObjectBufferfvATI;
+extern PFNGLGETOBJECTBUFFERIVATIPROC		glGetObjectBufferivATI;
+extern PFNGLFREEOBJECTBUFFERATIPROC		    glFreeObjectBufferATI;
+extern PFNGLARRAYOBJECTATIPROC				glArrayObjectATI;
+extern PFNGLVERTEXATTRIBARRAYOBJECTATIPROC	glVertexAttribArrayObjectATI;
+extern PFNGLGETARRAYOBJECTFVATIPROC			glGetArrayObjectfvATI;
+extern PFNGLGETARRAYOBJECTIVATIPROC			glGetArrayObjectivATI;
+extern PFNGLVARIANTARRAYOBJECTATIPROC		glVariantObjectArrayATI;
+extern PFNGLGETVARIANTARRAYOBJECTFVATIPROC	glGetVariantArrayObjectfvATI;
+extern PFNGLGETVARIANTARRAYOBJECTIVATIPROC	glGetVariantArrayObjectivATI;
+
+extern PFNWGLSWAPINTERVALEXTPROC			wglSwapIntervalEXT;
+
+// GL_ARB_occlusion_query
+extern PFNGLGENQUERIESARBPROC glGenQueriesARB;
+extern PFNGLDELETEQUERIESARBPROC glDeleteQueriesARB;
+extern PFNGLISQUERYARBPROC glIsQueryARB;
+extern PFNGLBEGINQUERYARBPROC glBeginQueryARB;
+extern PFNGLENDQUERYARBPROC glEndQueryARB;
+extern PFNGLGETQUERYIVARBPROC glGetQueryivARB;
+extern PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB;
+extern PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB;
+
+// GL_ARB_point_parameters
+extern PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB;
+extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB;
+
+// GL_ARB_shader_objects
+extern PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
+extern PFNGLGETHANDLEARBPROC glGetHandleARB;
+extern PFNGLDETACHOBJECTARBPROC glDetachObjectARB;
+extern PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
+extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
+extern PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
+extern PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
+extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
+extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
+extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
+extern PFNGLVALIDATEPROGRAMARBPROC glValidateProgramARB;
+extern PFNGLUNIFORM1FARBPROC glUniform1fARB;
+extern PFNGLUNIFORM2FARBPROC glUniform2fARB;
+extern PFNGLUNIFORM3FARBPROC glUniform3fARB;
+extern PFNGLUNIFORM4FARBPROC glUniform4fARB;
+extern PFNGLUNIFORM1IARBPROC glUniform1iARB;
+extern PFNGLUNIFORM2IARBPROC glUniform2iARB;
+extern PFNGLUNIFORM3IARBPROC glUniform3iARB;
+extern PFNGLUNIFORM4IARBPROC glUniform4iARB;
+extern PFNGLUNIFORM1FVARBPROC glUniform1fvARB;
+extern PFNGLUNIFORM2FVARBPROC glUniform2fvARB;
+extern PFNGLUNIFORM3FVARBPROC glUniform3fvARB;
+extern PFNGLUNIFORM4FVARBPROC glUniform4fvARB;
+extern PFNGLUNIFORM1IVARBPROC glUniform1ivARB;
+extern PFNGLUNIFORM2IVARBPROC glUniform2ivARB;
+extern PFNGLUNIFORM3IVARBPROC glUniform3ivARB;
+extern PFNGLUNIFORM4IVARBPROC glUniform4ivARB;
+extern PFNGLUNIFORMMATRIX2FVARBPROC glUniformMatrix2fvARB;
+extern PFNGLUNIFORMMATRIX3FVARBPROC glUniformMatrix3fvARB;
+extern PFNGLUNIFORMMATRIX4FVARBPROC glUniformMatrix4fvARB;
+extern PFNGLGETOBJECTPARAMETERFVARBPROC glGetObjectParameterfvARB;
+extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
+extern PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
+extern PFNGLGETATTACHEDOBJECTSARBPROC glGetAttachedObjectsARB;
+extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
+extern PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB;
+extern PFNGLGETUNIFORMFVARBPROC glGetUniformfvARB;
+extern PFNGLGETUNIFORMIVARBPROC glGetUniformivARB;
+extern PFNGLGETSHADERSOURCEARBPROC glGetShaderSourceARB;
+
+// GL_ARB_vertex_shader
+extern PFNGLVERTEXATTRIB1DARBPROC glVertexAttrib1dARB;
+extern PFNGLVERTEXATTRIB1DVARBPROC glVertexAttrib1dvARB;
+extern PFNGLVERTEXATTRIB1FARBPROC glVertexAttrib1fARB;
+extern PFNGLVERTEXATTRIB1FVARBPROC glVertexAttrib1fvARB;
+extern PFNGLVERTEXATTRIB1SARBPROC glVertexAttrib1sARB;
+extern PFNGLVERTEXATTRIB1SVARBPROC glVertexAttrib1svARB;
+extern PFNGLVERTEXATTRIB2DARBPROC glVertexAttrib2dARB;
+extern PFNGLVERTEXATTRIB2DVARBPROC glVertexAttrib2dvARB;
+extern PFNGLVERTEXATTRIB2FARBPROC glVertexAttrib2fARB;
+extern PFNGLVERTEXATTRIB2FVARBPROC glVertexAttrib2fvARB;
+extern PFNGLVERTEXATTRIB2SARBPROC glVertexAttrib2sARB;
+extern PFNGLVERTEXATTRIB2SVARBPROC glVertexAttrib2svARB;
+extern PFNGLVERTEXATTRIB3DARBPROC glVertexAttrib3dARB;
+extern PFNGLVERTEXATTRIB3DVARBPROC glVertexAttrib3dvARB;
+extern PFNGLVERTEXATTRIB3FARBPROC glVertexAttrib3fARB;
+extern PFNGLVERTEXATTRIB3FVARBPROC glVertexAttrib3fvARB;
+extern PFNGLVERTEXATTRIB3SARBPROC glVertexAttrib3sARB;
+extern PFNGLVERTEXATTRIB3SVARBPROC glVertexAttrib3svARB;
+extern PFNGLVERTEXATTRIB4NBVARBPROC glVertexAttrib4nbvARB;
+extern PFNGLVERTEXATTRIB4NIVARBPROC glVertexAttrib4nivARB;
+extern PFNGLVERTEXATTRIB4NSVARBPROC glVertexAttrib4nsvARB;
+extern PFNGLVERTEXATTRIB4NUBARBPROC glVertexAttrib4nubARB;
+extern PFNGLVERTEXATTRIB4NUBVARBPROC glVertexAttrib4nubvARB;
+extern PFNGLVERTEXATTRIB4NUIVARBPROC glVertexAttrib4nuivARB;
+extern PFNGLVERTEXATTRIB4NUSVARBPROC glVertexAttrib4nusvARB;
+extern PFNGLVERTEXATTRIB4BVARBPROC glVertexAttrib4bvARB;
+extern PFNGLVERTEXATTRIB4DARBPROC glVertexAttrib4dARB;
+extern PFNGLVERTEXATTRIB4DVARBPROC glVertexAttrib4dvARB;
+extern PFNGLVERTEXATTRIB4FARBPROC glVertexAttrib4fARB;
+extern PFNGLVERTEXATTRIB4FVARBPROC glVertexAttrib4fvARB;
+extern PFNGLVERTEXATTRIB4IVARBPROC glVertexAttrib4ivARB;
+extern PFNGLVERTEXATTRIB4SARBPROC glVertexAttrib4sARB;
+extern PFNGLVERTEXATTRIB4SVARBPROC glVertexAttrib4svARB;
+extern PFNGLVERTEXATTRIB4UBVARBPROC glVertexAttrib4ubvARB;
+extern PFNGLVERTEXATTRIB4UIVARBPROC glVertexAttrib4uivARB;
+extern PFNGLVERTEXATTRIB4USVARBPROC glVertexAttrib4usvARB;
+extern PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB;
+extern PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB;
+extern PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB;
+extern PFNGLPROGRAMSTRINGARBPROC glProgramStringARB;
+extern PFNGLBINDPROGRAMARBPROC glBindProgramARB;
+extern PFNGLDELETEPROGRAMSARBPROC glDeleteProgramsARB;
+extern PFNGLGENPROGRAMSARBPROC glGenProgramsARB;
+extern PFNGLPROGRAMENVPARAMETER4DARBPROC glProgramEnvParameter4dARB;
+extern PFNGLPROGRAMENVPARAMETER4DVARBPROC glProgramEnvParameter4dvARB;
+extern PFNGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB;
+extern PFNGLPROGRAMENVPARAMETER4FVARBPROC glProgramEnvParameter4fvARB;
+extern PFNGLPROGRAMLOCALPARAMETER4DARBPROC glProgramLocalParameter4dARB;
+extern PFNGLPROGRAMLOCALPARAMETER4DVARBPROC glProgramLocalParameter4dvARB;
+extern PFNGLPROGRAMLOCALPARAMETER4FARBPROC glProgramLocalParameter4fARB;
+extern PFNGLPROGRAMLOCALPARAMETER4FVARBPROC glProgramLocalParameter4fvARB;
+extern PFNGLGETPROGRAMENVPARAMETERDVARBPROC glGetProgramEnvParameterdvARB;
+extern PFNGLGETPROGRAMENVPARAMETERFVARBPROC glGetProgramEnvParameterfvARB;
+extern PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC glGetProgramLocalParameterdvARB;
+extern PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC glGetProgramLocalParameterfvARB;
+extern PFNGLGETPROGRAMIVARBPROC glGetProgramivARB;
+extern PFNGLGETPROGRAMSTRINGARBPROC glGetProgramStringARB;
+extern PFNGLGETVERTEXATTRIBDVARBPROC glGetVertexAttribdvARB;
+extern PFNGLGETVERTEXATTRIBFVARBPROC glGetVertexAttribfvARB;
+extern PFNGLGETVERTEXATTRIBIVARBPROC glGetVertexAttribivARB;
+extern PFNGLGETVERTEXATTRIBPOINTERVARBPROC glGetVertexAttribPointervARB;
+extern PFNGLISPROGRAMARBPROC glIsProgramARB;
+extern PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB;
+extern PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB;
+extern PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB;
+
+//GL_EXT_framebuffer_object
+extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
+extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
+extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
+extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
+extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
+extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
+extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
+extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
+extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
+extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
+extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
+extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
+extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
+extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
+extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
+extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
+
+
+#elif LL_DARWIN
+//----------------------------------------------------------------------------
+// LL_DARWIN
+
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+
+#define GL_EXT_separate_specular_color 1
+#include <OpenGL/glext.h>
+
+#include "GL/glh_extensions.h"
+
+// These symbols don't exist on 10.3.9, so they have to be declared weak.  Redeclaring them here fixes the problem.
+// Note that they also must not be called on 10.3.9.  This should be taken care of by a runtime check for the existence of the GL extension.
+#include <AvailabilityMacros.h>
+
+// GL_EXT_framebuffer_object
+extern GLboolean glIsRenderbufferEXT(GLuint renderbuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glBindRenderbufferEXT(GLenum target, GLuint renderbuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glDeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glGenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glRenderbufferStorageEXT(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glGetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern GLboolean glIsFramebufferEXT(GLuint framebuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glBindFramebufferEXT(GLenum target, GLuint framebuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glDeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glGenFramebuffersEXT(GLsizei n, GLuint *framebuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern GLenum glCheckFramebufferStatusEXT(GLenum target) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glFramebufferTexture1DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glFramebufferTexture2DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glFramebufferTexture3DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glFramebufferRenderbufferEXT(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glGetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, GLenum pname, GLint *params) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+extern void glGenerateMipmapEXT(GLenum target) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+//
+// Define vertex buffer object headers on Mac
+//
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+#endif
+
+
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef intptr_t GLintptrARB;
+typedef intptr_t GLsizeiptrARB;
+#endif
+
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef GL_GLEXT_FUNCTION_POINTERS
+typedef void (* glBindBufferARBProcPtr) (GLenum target, GLuint buffer);
+typedef void (* glDeleteBufferARBProcPtr) (GLsizei n, const GLuint *buffers);
+typedef void (* glGenBuffersARBProcPtr) (GLsizei n, GLuint *buffers);
+typedef GLboolean (* glIsBufferARBProcPtr) (GLuint buffer);
+typedef void (* glBufferDataARBProcPtr) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+typedef void (* glBufferSubDataARBProcPtr) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+typedef void (* glGetBufferSubDataARBProcPtr) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+typedef GLvoid* (* glMapBufferARBProcPtr) (GLenum target, GLenum access);	/* Flawfinder: ignore */
+typedef GLboolean (* glUnmapBufferARBProcPtr) (GLenum target);
+typedef void (* glGetBufferParameterivARBProcPtr) (GLenum target, GLenum pname, GLint *params);
+typedef void (* glGetBufferPointervARBProcPtr) (GLenum target, GLenum pname, GLvoid* *params);
+#else
+extern void glBindBufferARB (GLenum, GLuint);
+extern void glDeleteBuffersARB (GLsizei, const GLuint *);
+extern void glGenBuffersARB (GLsizei, GLuint *);
+extern GLboolean glIsBufferARB (GLuint);
+extern void glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
+extern void glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
+extern void glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
+extern GLvoid* glMapBufferARB (GLenum, GLenum);
+extern GLboolean glUnmapBufferARB (GLenum);
+extern void glGetBufferParameterivARB (GLenum, GLenum, GLint *);
+extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_FUNCTION_POINTERS */
+#endif
+
+// May be needed for DARWIN...
+// #ifndef GL_ARB_compressed_tex_image
+// #define GL_ARB_compressed_tex_image 1
+// #ifdef GL_GLEXT_FUNCTION_POINTERS
+// typedef void (* glCompressedTexImage1D) (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid*);
+// typedef void (* glCompressedTexImage2D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
+// typedef void (* glCompressedTexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
+// typedef void (* glCompressedTexSubImage1D) (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid*);
+// typedef void (* glCompressedTexSubImage2D) (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
+// typedef void (* glCompressedTexSubImage3D) (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
+// typedef void (* glGetCompressedTexImage) (GLenum, GLint, GLvoid*);
+// #else
+// extern void glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid*);
+// extern void glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
+// extern void glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
+// extern void glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid*);
+// extern void glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
+// extern void glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
+// extern void glGetCompressedTexImage (GLenum, GLint, GLvoid*);
+// #endif /* GL_GLEXT_FUNCTION_POINTERS */
+// #endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <AGL/gl.h>
+
+#endif // LL_MESA / LL_WINDOWS / LL_DARWIN
+
+
+#endif // LL_LLGLHEADERS_H
diff --git a/linden/indra/llrender/llglimmediate.cpp b/linden/indra/llrender/llglimmediate.cpp
index 17c2182..9b60e49 100644
--- a/linden/indra/llrender/llglimmediate.cpp
+++ b/linden/indra/llrender/llglimmediate.cpp
@@ -1 +1,265 @@
+<<<<<<< .working
 #error This file has been renamed llrender.cpp
+=======
+/** 
+ * @file llglimmediate.cpp
+ * @brief LLGLImmediate implementation
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llglimmediate.h"
+#include "llvertexbuffer.h"
+
+LLGLImmediate gGL;
+
+const U32 immediate_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXCOORD;
+
+LLGLImmediate::LLGLImmediate()
+{
+	mCount = 0;
+	mMode = LLVertexBuffer::TRIANGLES;
+	mBuffer = new LLVertexBuffer(immediate_mask, 0);
+	mBuffer->allocateBuffer(4096, 0, TRUE);
+	mBuffer->getVertexStrider(mVerticesp);
+	mBuffer->getTexCoordStrider(mTexcoordsp);
+	mBuffer->getColorStrider(mColorsp);
+}
+
+void LLGLImmediate::translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z)
+{
+	flush();
+	glTranslatef(x,y,z);
+}
+
+void LLGLImmediate::scalef(const GLfloat& x, const GLfloat& y, const GLfloat& z)
+{
+	flush();
+	glScalef(x,y,z);
+}
+
+void LLGLImmediate::pushMatrix()
+{
+	flush();
+	glPushMatrix();
+}
+
+void LLGLImmediate::popMatrix()
+{
+	flush();
+	glPopMatrix();
+}
+
+void LLGLImmediate::blendFunc(GLenum sfactor, GLenum dfactor)
+{
+	flush();
+	glBlendFunc(sfactor, dfactor);
+}
+
+void LLGLImmediate::begin(const GLuint& mode)
+{
+	if (mode != mMode)
+	{
+		if (mMode == LLVertexBuffer::QUADS ||
+			mMode == LLVertexBuffer::LINES ||
+			mMode == LLVertexBuffer::TRIANGLES ||
+			mMode == LLVertexBuffer::POINTS)
+		{
+			flush();
+		}
+		else if (mCount != 0)
+		{
+			llerrs << "gGL.begin() called redundantly." << llendl;
+		}
+		
+		mMode = mode;
+	}
+}
+
+void LLGLImmediate::end()
+{ 
+	if (mCount == 0)
+	{
+		return;
+		//IMM_ERRS << "GL begin and end called with no vertices specified." << llendl;
+	}
+
+	if ((mMode != LLVertexBuffer::QUADS && 
+		mMode != LLVertexBuffer::LINES &&
+		mMode != LLVertexBuffer::TRIANGLES &&
+		mMode != LLVertexBuffer::POINTS) ||
+		mCount > 2048)
+	{
+		flush();
+	}
+}
+
+void LLGLImmediate::flush()
+{
+	if (mCount > 0)
+	{
+#if 0
+		if (!glIsEnabled(GL_VERTEX_ARRAY))
+		{
+			llerrs << "foo 1" << llendl;
+		}
+
+		if (!glIsEnabled(GL_COLOR_ARRAY))
+		{
+			llerrs << "foo 2" << llendl;
+		}
+
+		if (!glIsEnabled(GL_TEXTURE_COORD_ARRAY))
+		{
+			llerrs << "foo 3" << llendl;
+		}
+
+		if (glIsEnabled(GL_NORMAL_ARRAY))
+		{
+			llerrs << "foo 7" << llendl;
+		}
+
+		GLvoid* pointer;
+
+		glGetPointerv(GL_VERTEX_ARRAY_POINTER, &pointer);
+		if (pointer != &(mBuffer[0].v))
+		{
+			llerrs << "foo 4" << llendl;
+		}
+
+		glGetPointerv(GL_COLOR_ARRAY_POINTER, &pointer);
+		if (pointer != &(mBuffer[0].c))
+		{
+			llerrs << "foo 5" << llendl;
+		}
+
+		glGetPointerv(GL_TEXTURE_COORD_ARRAY_POINTER, &pointer);
+		if (pointer != &(mBuffer[0].uv))
+		{
+			llerrs << "foo 6" << llendl;
+		}
+#endif
+				
+		mBuffer->setBuffer(immediate_mask);
+		mBuffer->drawArrays(mMode, 0, mCount);
+
+		mVerticesp[0] = mVerticesp[mCount];
+		mTexcoordsp[0] = mTexcoordsp[mCount];
+		mColorsp[0] = mColorsp[mCount];
+		mCount = 0;
+	}
+}
+
+void LLGLImmediate::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z)
+{ 
+	if (mCount >= 4096)
+	{
+	//	llwarns << "GL immediate mode overflow.  Some geometry not drawn." << llendl;
+		return;
+	}
+
+	mVerticesp[mCount] = LLVector3(x,y,z);
+	mCount++;
+	if (mCount < 4096)
+	{
+		mVerticesp[mCount] = mVerticesp[mCount-1];
+		mColorsp[mCount] = mColorsp[mCount-1];
+		mTexcoordsp[mCount] = mTexcoordsp[mCount-1];
+	}
+}
+
+void LLGLImmediate::vertex2i(const GLint& x, const GLint& y)
+{
+	vertex3f((GLfloat) x, (GLfloat) y, 0);	
+}
+
+void LLGLImmediate::vertex2f(const GLfloat& x, const GLfloat& y)
+{ 
+	vertex3f(x,y,0);
+}
+
+void LLGLImmediate::vertex2fv(const GLfloat* v)
+{ 
+	vertex3f(v[0], v[1], 0);
+}
+
+void LLGLImmediate::vertex3fv(const GLfloat* v)
+{
+	vertex3f(v[0], v[1], v[2]);
+}
+
+void LLGLImmediate::texCoord2f(const GLfloat& x, const GLfloat& y)
+{ 
+	mTexcoordsp[mCount] = LLVector2(x,y);
+}
+
+void LLGLImmediate::texCoord2i(const GLint& x, const GLint& y)
+{ 
+	texCoord2f((GLfloat) x, (GLfloat) y);
+}
+
+void LLGLImmediate::texCoord2fv(const GLfloat* tc)
+{ 
+	texCoord2f(tc[0], tc[1]);
+}
+
+void LLGLImmediate::color4ub(const GLubyte& r, const GLubyte& g, const GLubyte& b, const GLubyte& a)
+{
+	mColorsp[mCount] = LLColor4U(r,g,b,a);
+}
+
+void LLGLImmediate::color4ubv(const GLubyte* c)
+{
+	color4ub(c[0], c[1], c[2], c[3]);
+}
+
+void LLGLImmediate::color4f(const GLfloat& r, const GLfloat& g, const GLfloat& b, const GLfloat& a)
+{
+	color4ub((GLubyte) (llclamp(r, 0.f, 1.f)*255),
+		(GLubyte) (llclamp(g, 0.f, 1.f)*255),
+		(GLubyte) (llclamp(b, 0.f, 1.f)*255),
+		(GLubyte) (llclamp(a, 0.f, 1.f)*255));
+}
+
+void LLGLImmediate::color4fv(const GLfloat* c)
+{ 
+	color4f(c[0],c[1],c[2],c[3]);
+}
+
+void LLGLImmediate::color3f(const GLfloat& r, const GLfloat& g, const GLfloat& b)
+{ 
+	color4f(r,g,b,1);
+}
+
+void LLGLImmediate::color3fv(const GLfloat* c)
+{ 
+	color4f(c[0],c[1],c[2],1);
+}
+
+>>>>>>> .merge-right.r88690
diff --git a/linden/indra/llrender/llglimmediate.h b/linden/indra/llrender/llglimmediate.h
index 4a7a0eb..2d7d768 100644
--- a/linden/indra/llrender/llglimmediate.h
+++ b/linden/indra/llrender/llglimmediate.h
@@ -1 +1,98 @@
+<<<<<<< .working
 #error This file has been renamed llrender.h
+=======
+/** 
+ * @file llglimmediate.h
+ * @brief LLGLImmediate definition
+ *
+ *	This class acts as a wrapper for OpenGL immediate calls concerning glBegin and glEnd.
+ *	The goal of this class is to minimize the number of api calls due to legacy rendering
+ *	code, and to define an interface for a multiple rendering API abstraction of the UI
+ *	rendering.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLGLIMMEDIATE_H
+#define LL_LLGLIMMEDIATE_H
+
+#include "stdtypes.h"
+#include "llgltypes.h"
+#include "llglheaders.h"
+#include "llvertexbuffer.h"
+
+class LLGLImmediate
+{
+public:
+	LLGLImmediate();
+
+	void translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z);
+	void scalef(const GLfloat& x, const GLfloat& y, const GLfloat& z);
+	void pushMatrix();
+	void popMatrix();
+	void blendFunc(GLenum sfactor, GLenum dfactor);
+	void flush();
+
+	void begin(const GLuint& mode);
+	void end();
+	void vertex2i(const GLint& x, const GLint& y);
+	void vertex2f(const GLfloat& x, const GLfloat& y);
+	void vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z);
+	void vertex2fv(const GLfloat* v);
+	void vertex3fv(const GLfloat* v);
+	
+	void texCoord2i(const GLint& x, const GLint& y);
+	void texCoord2f(const GLfloat& x, const GLfloat& y);
+	void texCoord2fv(const GLfloat* tc);
+
+	void color4ub(const GLubyte& r, const GLubyte& g, const GLubyte& b, const GLubyte& a);
+	void color4f(const GLfloat& r, const GLfloat& g, const GLfloat& b, const GLfloat& a);
+	void color4fv(const GLfloat* c);
+	void color3f(const GLfloat& r, const GLfloat& g, const GLfloat& b);
+	void color3fv(const GLfloat* c);
+	void color4ubv(const GLubyte* c);
+	
+	typedef struct Vertex
+	{
+		GLfloat v[3];
+		GLubyte c[4];
+		GLfloat uv[2];
+	};
+
+private:
+	U32 mCount;
+	U32 mMode;
+	LLPointer<LLVertexBuffer> mBuffer;
+	LLStrider<LLVector3> mVerticesp;
+	LLStrider<LLVector2> mTexcoordsp;
+	LLStrider<LLColor4U> mColorsp;
+};
+
+extern LLGLImmediate gGL;
+
+#endif
+>>>>>>> .merge-right.r88690
diff --git a/linden/indra/llrender/llglslshader.cpp b/linden/indra/llrender/llglslshader.cpp
new file mode 100644
index 0000000..26984e1
--- /dev/null
+++ b/linden/indra/llrender/llglslshader.cpp
@@ -0,0 +1,823 @@
+/** 
+ * @file llglslshader.cpp
+ * @brief GLSL helper functions and state.
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llglslshader.h"
+
+#include "llshadermgr.h"
+#include "llfile.h"
+#include "llrender.h"
+
+#if LL_DARWIN
+#include "OpenGL/OpenGL.h"
+#endif
+
+#ifdef LL_RELEASE_FOR_DOWNLOAD
+#define UNIFORM_ERRS LL_WARNS_ONCE("Shader")
+#else
+#define UNIFORM_ERRS LL_ERRS("Shader")
+#endif
+
+// Lots of STL stuff in here, using namespace std to keep things more readable
+using std::vector;
+using std::pair;
+using std::make_pair;
+using std::string;
+
+BOOL shouldChange(const LLVector4& v1, const LLVector4& v2)
+{
+	return v1 != v2;
+}
+
+LLShaderFeatures::LLShaderFeatures()
+: calculatesLighting(false), isShiny(false), isFullbright(false), hasWaterFog(false),
+hasTransport(false), hasSkinning(false), hasAtmospherics(false), isSpecular(false),
+hasGamma(false), hasLighting(false), calculatesAtmospherics(false)
+{
+}
+
+//===============================
+// LLGLSL Shader implementation
+//===============================
+LLGLSLShader::LLGLSLShader()
+: mProgramObject(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT)
+{
+}
+
+void LLGLSLShader::unload()
+{
+	stop_glerror();
+	mAttribute.clear();
+	mTexture.clear();
+	mUniform.clear();
+	mShaderFiles.clear();
+
+	if (mProgramObject)
+	{
+		GLhandleARB obj[1024];
+		GLsizei count;
+
+		glGetAttachedObjectsARB(mProgramObject, 1024, &count, obj);
+		for (GLsizei i = 0; i < count; i++)
+		{
+			glDeleteObjectARB(obj[i]);
+		}
+
+		glDeleteObjectARB(mProgramObject);
+
+		mProgramObject = 0;
+	}
+	
+	//hack to make apple not complain
+	glGetError();
+	
+	stop_glerror();
+}
+
+BOOL LLGLSLShader::createShader(vector<string> * attributes,
+								vector<string> * uniforms)
+{
+	llassert_always(!mShaderFiles.empty());
+	BOOL success = TRUE;
+
+	// Create program
+	mProgramObject = glCreateProgramObjectARB();
+	
+	// Attach existing objects
+	if (!LLShaderMgr::instance()->attachShaderFeatures(this))
+	{
+		return FALSE;
+	}
+
+	vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin();
+	for ( ; fileIter != mShaderFiles.end(); fileIter++ )
+	{
+		GLhandleARB shaderhandle = LLShaderMgr::instance()->loadShaderFile((*fileIter).first, mShaderLevel, (*fileIter).second);
+		LL_DEBUGS("ShaderLoading") << "SHADER FILE: " << (*fileIter).first << " mShaderLevel=" << mShaderLevel << LL_ENDL;
+		if (mShaderLevel > 0)
+		{
+			attachObject(shaderhandle);
+		}
+		else
+		{
+			success = FALSE;
+		}
+	}
+
+	// Map attributes and uniforms
+	if (success)
+	{
+		success = mapAttributes(attributes);
+	}
+	if (success)
+	{
+		success = mapUniforms(uniforms);
+	}
+	if( !success )
+	{
+		LL_WARNS("ShaderLoading") << "Failed to link shader: " << mName << LL_ENDL;
+
+		// Try again using a lower shader level;
+		if (mShaderLevel > 0)
+		{
+			LL_WARNS("ShaderLoading") << "Failed to link using shader level " << mShaderLevel << " trying again using shader level " << (mShaderLevel - 1) << LL_ENDL;
+			mShaderLevel--;
+			return createShader(attributes,uniforms);
+		}
+	}
+	return success;
+}
+
+BOOL LLGLSLShader::attachObject(std::string object)
+{
+	if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)
+	{
+		stop_glerror();
+		glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]);
+		stop_glerror();
+		return TRUE;
+	}
+	else
+	{
+		LL_WARNS("ShaderLoading") << "Attempting to attach shader object that hasn't been compiled: " << object << LL_ENDL;
+		return FALSE;
+	}
+}
+
+void LLGLSLShader::attachObject(GLhandleARB object)
+{
+	if (object != 0)
+	{
+		stop_glerror();
+		glAttachObjectARB(mProgramObject, object);
+		stop_glerror();
+	}
+	else
+	{
+		LL_WARNS("ShaderLoading") << "Attempting to attach non existing shader object. " << LL_ENDL;
+	}
+}
+
+void LLGLSLShader::attachObjects(GLhandleARB* objects, S32 count)
+{
+	for (S32 i = 0; i < count; i++)
+	{
+		attachObject(objects[i]);
+	}
+}
+
+BOOL LLGLSLShader::mapAttributes(const vector<string> * attributes)
+{
+	//link the program
+	BOOL res = link();
+
+	mAttribute.clear();
+	U32 numAttributes = (attributes == NULL) ? 0 : attributes->size();
+	mAttribute.resize(LLShaderMgr::instance()->mReservedAttribs.size() + numAttributes, -1);
+	
+	if (res)
+	{ //read back channel locations
+
+		//read back reserved channels first
+		for (U32 i = 0; i < (S32) LLShaderMgr::instance()->mReservedAttribs.size(); i++)
+		{
+			const char* name = LLShaderMgr::instance()->mReservedAttribs[i].c_str();
+			S32 index = glGetAttribLocationARB(mProgramObject, (const GLcharARB *)name);
+			if (index != -1)
+			{
+				mAttribute[i] = index;
+				LL_DEBUGS("ShaderLoading") << "Attribute " << name << " assigned to channel " << index << LL_ENDL;
+			}
+		}
+		if (attributes != NULL)
+		{
+			for (U32 i = 0; i < numAttributes; i++)
+			{
+				const char* name = (*attributes)[i].c_str();
+				S32 index = glGetAttribLocationARB(mProgramObject, name);
+				if (index != -1)
+				{
+					mAttribute[LLShaderMgr::instance()->mReservedAttribs.size() + i] = index;
+					LL_DEBUGS("ShaderLoading") << "Attribute " << name << " assigned to channel " << index << LL_ENDL;
+				}
+			}
+		}
+
+		return TRUE;
+	}
+	
+	return FALSE;
+}
+
+void LLGLSLShader::mapUniform(GLint index, const vector<string> * uniforms)
+{
+	if (index == -1)
+	{
+		return;
+	}
+
+	GLenum type;
+	GLsizei length;
+	GLint size;
+	char name[1024];		/* Flawfinder: ignore */
+	name[0] = 0;
+
+	glGetActiveUniformARB(mProgramObject, index, 1024, &length, &size, &type, (GLcharARB *)name);
+	S32 location = glGetUniformLocationARB(mProgramObject, name);
+	if (location != -1)
+	{
+		mUniformMap[name] = location;
+		LL_DEBUGS("ShaderLoading") << "Uniform " << name << " is at location " << location << LL_ENDL;
+	
+		//find the index of this uniform
+		for (S32 i = 0; i < (S32) LLShaderMgr::instance()->mReservedUniforms.size(); i++)
+		{
+			if ( (mUniform[i] == -1)
+				&& (LLShaderMgr::instance()->mReservedUniforms[i].compare(0, length, name, LLShaderMgr::instance()->mReservedUniforms[i].length()) == 0))
+			{
+				//found it
+				mUniform[i] = location;
+				mTexture[i] = mapUniformTextureChannel(location, type);
+				return;
+			}
+		}
+
+		if (uniforms != NULL)
+		{
+			for (U32 i = 0; i < uniforms->size(); i++)
+			{
+				if ( (mUniform[i+LLShaderMgr::instance()->mReservedUniforms.size()] == -1)
+					&& ((*uniforms)[i].compare(0, length, name, (*uniforms)[i].length()) == 0))
+				{
+					//found it
+					mUniform[i+LLShaderMgr::instance()->mReservedUniforms.size()] = location;
+					mTexture[i+LLShaderMgr::instance()->mReservedUniforms.size()] = mapUniformTextureChannel(location, type);
+					return;
+				}
+			}
+		}
+	}
+ }
+
+GLint LLGLSLShader::mapUniformTextureChannel(GLint location, GLenum type)
+{
+	if (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB)
+	{	//this here is a texture
+		glUniform1iARB(location, mActiveTextureChannels);
+		LL_DEBUGS("ShaderLoading") << "Assigned to texture channel " << mActiveTextureChannels << LL_ENDL;
+		return mActiveTextureChannels++;
+	}
+	return -1;
+}
+
+BOOL LLGLSLShader::mapUniforms(const vector<string> * uniforms)
+{
+	BOOL res = TRUE;
+	
+	mActiveTextureChannels = 0;
+	mUniform.clear();
+	mUniformMap.clear();
+	mTexture.clear();
+	mValue.clear();
+	//initialize arrays
+	U32 numUniforms = (uniforms == NULL) ? 0 : uniforms->size();
+	mUniform.resize(numUniforms + LLShaderMgr::instance()->mReservedUniforms.size(), -1);
+	mTexture.resize(numUniforms + LLShaderMgr::instance()->mReservedUniforms.size(), -1);
+	
+	bind();
+
+	//get the number of active uniforms
+	GLint activeCount;
+	glGetObjectParameterivARB(mProgramObject, GL_OBJECT_ACTIVE_UNIFORMS_ARB, &activeCount);
+
+	for (S32 i = 0; i < activeCount; i++)
+	{
+		mapUniform(i, uniforms);
+	}
+
+	unbind();
+
+	return res;
+}
+
+BOOL LLGLSLShader::link(BOOL suppress_errors)
+{
+	return LLShaderMgr::instance()->linkProgramObject(mProgramObject, suppress_errors);
+}
+
+void LLGLSLShader::bind()
+{
+	if (gGLManager.mHasShaderObjects)
+	{
+		glUseProgramObjectARB(mProgramObject);
+
+		if (mUniformsDirty)
+		{
+			LLShaderMgr::instance()->updateShaderUniforms(this);
+			mUniformsDirty = FALSE;
+		}
+	}
+}
+
+void LLGLSLShader::unbind()
+{
+	if (gGLManager.mHasShaderObjects)
+	{
+		for (U32 i = 0; i < mAttribute.size(); ++i)
+		{
+			vertexAttrib4f(i, 0,0,0,1);
+		}
+		glUseProgramObjectARB(0);
+	}
+}
+
+void LLGLSLShader::bindNoShader(void)
+{
+	glUseProgramObjectARB(0);
+}
+
+S32 LLGLSLShader::enableTexture(S32 uniform, S32 mode)
+{
+	if (uniform < 0 || uniform >= (S32)mTexture.size())
+	{
+		UNIFORM_ERRS << "Uniform out of range: " << uniform << LL_ENDL;
+		return -1;
+	}
+	S32 index = mTexture[uniform];
+	if (index != -1)
+	{
+		gGL.getTexUnit(index)->activate();
+		glEnable(mode);
+	}
+	return index;
+}
+
+S32 LLGLSLShader::disableTexture(S32 uniform, S32 mode)
+{
+	if (uniform < 0 || uniform >= (S32)mTexture.size())
+	{
+		UNIFORM_ERRS << "Uniform out of range: " << uniform << LL_ENDL;
+		return -1;
+	}
+	S32 index = mTexture[uniform];
+	if (index != -1)
+	{
+		gGL.getTexUnit(index)->activate();
+		glDisable(mode);
+	}
+	return index;
+}
+
+void LLGLSLShader::uniform1f(U32 index, GLfloat x)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			if (iter == mValue.end() || iter->second.mV[0] != x)
+			{
+				glUniform1fARB(mUniform[index], x);
+				mValue[mUniform[index]] = LLVector4(x,0.f,0.f,0.f);
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniform2f(U32 index, GLfloat x, GLfloat y)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			LLVector4 vec(x,y,0.f,0.f);
+			if (iter == mValue.end() || shouldChange(iter->second,vec))
+			{
+				glUniform2fARB(mUniform[index], x, y);
+				mValue[mUniform[index]] = vec;
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniform3f(U32 index, GLfloat x, GLfloat y, GLfloat z)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			LLVector4 vec(x,y,z,0.f);
+			if (iter == mValue.end() || shouldChange(iter->second,vec))
+			{
+				glUniform3fARB(mUniform[index], x, y, z);
+				mValue[mUniform[index]] = vec;
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniform4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			LLVector4 vec(x,y,z,w);
+			if (iter == mValue.end() || shouldChange(iter->second,vec))
+			{
+				glUniform4fARB(mUniform[index], x, y, z, w);
+				mValue[mUniform[index]] = vec;
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniform1fv(U32 index, U32 count, const GLfloat* v)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			LLVector4 vec(v[0],0.f,0.f,0.f);
+			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+			{
+				glUniform1fvARB(mUniform[index], count, v);
+				mValue[mUniform[index]] = vec;
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniform2fv(U32 index, U32 count, const GLfloat* v)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			LLVector4 vec(v[0],v[1],0.f,0.f);
+			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+			{
+				glUniform2fvARB(mUniform[index], count, v);
+				mValue[mUniform[index]] = vec;
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniform3fv(U32 index, U32 count, const GLfloat* v)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			LLVector4 vec(v[0],v[1],v[2],0.f);
+			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+			{
+				glUniform3fvARB(mUniform[index], count, v);
+				mValue[mUniform[index]] = vec;
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniform4fv(U32 index, U32 count, const GLfloat* v)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
+			LLVector4 vec(v[0],v[1],v[2],v[3]);
+			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+			{
+				glUniform4fvARB(mUniform[index], count, v);
+				mValue[mUniform[index]] = vec;
+			}
+		}
+	}
+}
+
+void LLGLSLShader::uniformMatrix2fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			glUniformMatrix2fvARB(mUniform[index], count, transpose, v);
+		}
+	}
+}
+
+void LLGLSLShader::uniformMatrix3fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			glUniformMatrix3fvARB(mUniform[index], count, transpose, v);
+		}
+	}
+}
+
+void LLGLSLShader::uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v)
+{
+	if (mProgramObject > 0)
+	{	
+		if (mUniform.size() <= index)
+		{
+			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
+			return;
+		}
+
+		if (mUniform[index] >= 0)
+		{
+			glUniformMatrix4fvARB(mUniform[index], count, transpose, v);
+		}
+	}
+}
+
+GLint LLGLSLShader::getUniformLocation(const string& uniform)
+{
+	if (mProgramObject > 0)
+	{
+		std::map<string, GLint>::iterator iter = mUniformMap.find(uniform);
+		if (iter != mUniformMap.end())
+		{
+			llassert(iter->second == glGetUniformLocationARB(mProgramObject, uniform.c_str()));
+			return iter->second;
+		}
+	}
+
+	return -1;
+}
+
+void LLGLSLShader::uniform1f(const string& uniform, GLfloat v)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		LLVector4 vec(v,0.f,0.f,0.f);
+		if (iter == mValue.end() || shouldChange(iter->second,vec))
+		{
+			glUniform1fARB(location, v);
+			mValue[location] = vec;
+		}
+	}
+}
+
+void LLGLSLShader::uniform2f(const string& uniform, GLfloat x, GLfloat y)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		LLVector4 vec(x,y,0.f,0.f);
+		if (iter == mValue.end() || shouldChange(iter->second,vec))
+		{
+			glUniform2fARB(location, x,y);
+			mValue[location] = vec;
+		}
+	}
+
+}
+
+void LLGLSLShader::uniform3f(const string& uniform, GLfloat x, GLfloat y, GLfloat z)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		LLVector4 vec(x,y,z,0.f);
+		if (iter == mValue.end() || shouldChange(iter->second,vec))
+		{
+			glUniform3fARB(location, x,y,z);
+			mValue[location] = vec;
+		}
+	}
+}
+
+void LLGLSLShader::uniform4f(const string& uniform, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+	GLint location = getUniformLocation(uniform);
+
+	if (location >= 0)
+	{
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		LLVector4 vec(x,y,z,w);
+		if (iter == mValue.end() || shouldChange(iter->second,vec))
+		{
+			glUniform4fARB(location, x,y,z,w);
+			mValue[location] = vec;
+		}
+	}
+}
+
+void LLGLSLShader::uniform1fv(const string& uniform, U32 count, const GLfloat* v)
+{
+	GLint location = getUniformLocation(uniform);
+
+	if (location >= 0)
+	{
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		LLVector4 vec(v[0],0.f,0.f,0.f);
+		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+		{
+			glUniform1fvARB(location, count, v);
+			mValue[location] = vec;
+		}
+	}
+}
+
+void LLGLSLShader::uniform2fv(const string& uniform, U32 count, const GLfloat* v)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		LLVector4 vec(v[0],v[1],0.f,0.f);
+		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+		{
+			glUniform2fvARB(location, count, v);
+			mValue[location] = vec;
+		}
+	}
+}
+
+void LLGLSLShader::uniform3fv(const string& uniform, U32 count, const GLfloat* v)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		LLVector4 vec(v[0],v[1],v[2],0.f);
+		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+		{
+			glUniform3fvARB(location, count, v);
+			mValue[location] = vec;
+		}
+	}
+}
+
+void LLGLSLShader::uniform4fv(const string& uniform, U32 count, const GLfloat* v)
+{
+	GLint location = getUniformLocation(uniform);
+
+	if (location >= 0)
+	{
+		LLVector4 vec(v);
+		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
+		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
+		{
+			glUniform4fvARB(location, count, v);
+			mValue[location] = vec;
+		}
+	}
+}
+
+void LLGLSLShader::uniformMatrix2fv(const string& uniform, U32 count, GLboolean transpose, const GLfloat* v)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		glUniformMatrix2fvARB(location, count, transpose, v);
+	}
+}
+
+void LLGLSLShader::uniformMatrix3fv(const string& uniform, U32 count, GLboolean transpose, const GLfloat* v)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		glUniformMatrix3fvARB(location, count, transpose, v);
+	}
+}
+
+void LLGLSLShader::uniformMatrix4fv(const string& uniform, U32 count, GLboolean transpose, const GLfloat* v)
+{
+	GLint location = getUniformLocation(uniform);
+				
+	if (location >= 0)
+	{
+		glUniformMatrix4fvARB(location, count, transpose, v);
+	}
+}
+
+
+void LLGLSLShader::vertexAttrib4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+	if (mAttribute[index] > 0)
+	{
+		glVertexAttrib4fARB(mAttribute[index], x, y, z, w);
+	}
+}
+
+void LLGLSLShader::vertexAttrib4fv(U32 index, GLfloat* v)
+{
+	if (mAttribute[index] > 0)
+	{
+		glVertexAttrib4fvARB(mAttribute[index], v);
+	}
+}
diff --git a/linden/indra/llrender/llglslshader.h b/linden/indra/llrender/llglslshader.h
new file mode 100644
index 0000000..0fa8e41
--- /dev/null
+++ b/linden/indra/llrender/llglslshader.h
@@ -0,0 +1,139 @@
+/** 
+ * @file llglslshader.h
+ * @brief GLSL shader wrappers
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLGLSLSHADER_H
+#define LL_LLGLSLSHADER_H
+
+#include "llgl.h"
+
+class LLShaderFeatures
+{
+public:
+	bool calculatesLighting;
+	bool calculatesAtmospherics;
+	bool hasLighting; // implies no transport (it's possible to have neither though)
+	bool isShiny;
+	bool isFullbright; // implies no lighting
+	bool isSpecular;
+	bool hasWaterFog; // implies no gamma
+	bool hasTransport; // implies no lighting (it's possible to have neither though)
+	bool hasSkinning;	
+	bool hasAtmospherics;
+	bool hasGamma;
+
+	// char numLights;
+	
+	LLShaderFeatures();
+};
+
+class LLGLSLShader
+{
+public:
+
+	enum 
+	{
+		SG_DEFAULT = 0,
+		SG_SKY,
+		SG_WATER
+	};
+	
+	LLGLSLShader();
+
+	void unload();
+	BOOL createShader(std::vector<std::string> * attributes,
+						std::vector<std::string> * uniforms);
+	BOOL attachObject(std::string object);
+	void attachObject(GLhandleARB object);
+	void attachObjects(GLhandleARB* objects = NULL, S32 count = 0);
+	BOOL mapAttributes(const std::vector<std::string> * attributes);
+	BOOL mapUniforms(const std::vector<std::string> * uniforms);
+	void mapUniform(GLint index, const std::vector<std::string> * uniforms);
+	void uniform1f(U32 index, GLfloat v);
+	void uniform2f(U32 index, GLfloat x, GLfloat y);
+	void uniform3f(U32 index, GLfloat x, GLfloat y, GLfloat z);
+	void uniform4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+	void uniform1fv(U32 index, U32 count, const GLfloat* v);
+	void uniform2fv(U32 index, U32 count, const GLfloat* v);
+	void uniform3fv(U32 index, U32 count, const GLfloat* v);
+	void uniform4fv(U32 index, U32 count, const GLfloat* v);
+	void uniform1f(const std::string& uniform, GLfloat v);
+	void uniform2f(const std::string& uniform, GLfloat x, GLfloat y);
+	void uniform3f(const std::string& uniform, GLfloat x, GLfloat y, GLfloat z);
+	void uniform4f(const std::string& uniform, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+	void uniform1fv(const std::string& uniform, U32 count, const GLfloat* v);
+	void uniform2fv(const std::string& uniform, U32 count, const GLfloat* v);
+	void uniform3fv(const std::string& uniform, U32 count, const GLfloat* v);
+	void uniform4fv(const std::string& uniform, U32 count, const GLfloat* v);
+	void uniformMatrix2fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v);
+	void uniformMatrix3fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v);
+	void uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v);
+	void uniformMatrix2fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v);
+	void uniformMatrix3fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v);
+	void uniformMatrix4fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v);
+
+	void vertexAttrib4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+	void vertexAttrib4fv(U32 index, GLfloat* v);
+	
+	GLint getUniformLocation(const std::string& uniform);
+	
+	GLint mapUniformTextureChannel(GLint location, GLenum type);
+	
+
+	//enable/disable texture channel for specified uniform
+	//if given texture uniform is active in the shader, 
+	//the corresponding channel will be active upon return
+	//returns channel texture is enabled in from [0-MAX)
+	S32 enableTexture(S32 uniform, S32 mode = GL_TEXTURE_2D);
+	S32 disableTexture(S32 uniform, S32 mode = GL_TEXTURE_2D); 
+	
+    BOOL link(BOOL suppress_errors = FALSE);
+	void bind();
+	void unbind();
+
+	// Unbinds any previously bound shader by explicitly binding no shader.
+	static void bindNoShader(void);
+
+	GLhandleARB mProgramObject;
+	std::vector<GLint> mAttribute; //lookup table of attribute enum to attribute channel
+	std::vector<GLint> mUniform;   //lookup table of uniform enum to uniform location
+	std::map<std::string, GLint> mUniformMap;  //lookup map of uniform name to uniform location
+	std::map<GLint, LLVector4> mValue; //lookup map of uniform location to last known value
+	std::vector<GLint> mTexture;
+	S32 mActiveTextureChannels;
+	S32 mShaderLevel;
+	S32 mShaderGroup;
+	BOOL mUniformsDirty;
+	LLShaderFeatures mFeatures;
+	std::vector< std::pair< std::string, GLenum > > mShaderFiles;
+	std::string mName;
+};
+
+#endif
diff --git a/linden/indra/llrender/llglstates.h b/linden/indra/llrender/llglstates.h
new file mode 100644
index 0000000..e53640c
--- /dev/null
+++ b/linden/indra/llrender/llglstates.h
@@ -0,0 +1,302 @@
+/** 
+ * @file llglstates.h
+ * @brief LLGL states definitions
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+//THIS HEADER SHOULD ONLY BE INCLUDED FROM llgl.h
+#ifndef LL_LLGLSTATES_H
+#define LL_LLGLSTATES_H
+
+#include "llimagegl.h"
+
+//----------------------------------------------------------------------------
+
+class LLGLDepthTest
+{
+	// Enabled by default
+public:
+	LLGLDepthTest(GLboolean depth_enabled, GLboolean write_enabled = GL_TRUE, GLenum depth_func = GL_LEQUAL);
+	
+	~LLGLDepthTest();
+	
+	GLboolean mPrevDepthEnabled;
+	GLenum mPrevDepthFunc;
+	GLboolean mPrevWriteEnabled;
+private:
+	static GLboolean sDepthEnabled; // defaults to GL_FALSE
+	static GLenum sDepthFunc; // defaults to GL_LESS
+	static GLboolean sWriteEnabled; // defaults to GL_TRUE
+};
+
+//----------------------------------------------------------------------------
+
+class LLGLSDefault
+{
+protected:
+	LLGLEnable mColorMaterial;
+	LLGLDisable mAlphaTest, mBlend, mCullFace, mDither, mFog, 
+		mLineSmooth, mLineStipple, mNormalize, mPolygonSmooth,
+		mTextureGenQ, mTextureGenR, mTextureGenS, mTextureGenT,
+		mGLMultisample;
+public:
+	LLGLSDefault()
+		:
+		// Enable
+		mColorMaterial(GL_COLOR_MATERIAL),
+		// Disable
+		mAlphaTest(GL_ALPHA_TEST),
+		mBlend(GL_BLEND), 
+		mCullFace(GL_CULL_FACE),
+		mDither(GL_DITHER),
+		mFog(GL_FOG), 
+		mLineSmooth(GL_LINE_SMOOTH),
+		mLineStipple(GL_LINE_STIPPLE),
+		mNormalize(GL_NORMALIZE),
+		mPolygonSmooth(GL_POLYGON_SMOOTH),
+		mTextureGenQ(GL_TEXTURE_GEN_Q), 
+		mTextureGenR(GL_TEXTURE_GEN_R),
+		mTextureGenS(GL_TEXTURE_GEN_S), 
+		mTextureGenT(GL_TEXTURE_GEN_T),
+		mGLMultisample(GL_MULTISAMPLE_ARB)
+	{ }
+};
+
+class LLGLSNoTexture 
+{
+public:
+	LLGLSNoTexture()
+	{ LLImageGL::unbindTexture(0); }
+};
+
+class LLGLSObjectSelect
+{ 
+protected:
+	LLGLDisable mBlend, mFog, mAlphaTest;
+	LLGLEnable mCullFace;
+public:
+	LLGLSObjectSelect()
+		: mBlend(GL_BLEND), mFog(GL_FOG), 
+		  mAlphaTest(GL_ALPHA_TEST),
+		  mCullFace(GL_CULL_FACE)
+	{ LLImageGL::unbindTexture(0); }
+};
+
+class LLGLSObjectSelectAlpha
+{
+protected:
+	LLGLEnable mAlphaTest;
+public:
+	LLGLSObjectSelectAlpha()
+		: mAlphaTest(GL_ALPHA_TEST)
+	{}
+};
+
+//----------------------------------------------------------------------------
+
+class LLGLSUIDefault
+{ 
+protected:
+	LLGLEnable mBlend, mAlphaTest;
+	LLGLDisable mCullFace;
+	LLGLDepthTest mDepthTest;
+public:
+	LLGLSUIDefault() 
+		: mBlend(GL_BLEND), mAlphaTest(GL_ALPHA_TEST),
+		  mCullFace(GL_CULL_FACE),
+		  mDepthTest(GL_FALSE, GL_TRUE, GL_LEQUAL)
+	{}
+};
+
+class LLGLSNoAlphaTest // : public LLGLSUIDefault
+{
+protected:
+	LLGLDisable mAlphaTest;
+public:
+	LLGLSNoAlphaTest()
+		: mAlphaTest(GL_ALPHA_TEST)
+	{}
+};
+
+class LLGLSNoTextureNoAlphaTest // : public LLGLSUIDefault
+{
+protected:
+	LLGLDisable mAlphaTest;
+public:
+	LLGLSNoTextureNoAlphaTest()
+		: mAlphaTest(GL_ALPHA_TEST)
+		  
+	{ LLImageGL::unbindTexture(0); }
+};
+
+//----------------------------------------------------------------------------
+
+class LLGLSFog
+{
+protected:
+	LLGLEnable mFog;
+public:
+	LLGLSFog()
+		: mFog(GL_FOG)
+	{}
+};
+
+class LLGLSNoFog
+{
+protected:
+	LLGLDisable mFog;
+public:
+	LLGLSNoFog()
+		: mFog(GL_FOG)
+	{}
+};
+
+//----------------------------------------------------------------------------
+
+class LLGLSPipeline
+{ 
+protected:
+	LLGLEnable mCullFace;
+	LLGLDepthTest mDepthTest;
+public:
+	LLGLSPipeline()
+		: mCullFace(GL_CULL_FACE),
+		  mDepthTest(GL_TRUE, GL_TRUE, GL_LEQUAL)
+	{ }		
+};
+
+class LLGLSPipelineAlpha // : public LLGLSPipeline
+{ 
+protected:
+	LLGLEnable mBlend, mAlphaTest;
+public:
+	LLGLSPipelineAlpha()
+		: mBlend(GL_BLEND),
+		  mAlphaTest(GL_ALPHA_TEST)
+	{ }
+};
+
+class LLGLSPipelineEmbossBump
+{
+protected:
+	LLGLDisable mFog;
+public:
+	LLGLSPipelineEmbossBump()
+		: mFog(GL_FOG)
+	{ }
+};
+
+class LLGLSPipelineSelection
+{ 
+protected:
+	LLGLDisable mCullFace;
+public:
+	LLGLSPipelineSelection()
+		: mCullFace(GL_CULL_FACE)
+	{}
+};
+
+class LLGLSPipelineAvatar
+{
+protected:
+	LLGLEnable mNormalize;
+public:
+	LLGLSPipelineAvatar()
+		: mNormalize(GL_NORMALIZE)
+	{}
+};
+
+class LLGLSPipelineSkyBox
+{ 
+protected:
+	LLGLDisable mAlphaTest, mCullFace, mFog;
+public:
+	LLGLSPipelineSkyBox()
+		: mAlphaTest(GL_ALPHA_TEST), mCullFace(GL_CULL_FACE), mFog(GL_FOG)
+	{ }
+};
+
+class LLGLSTracker
+{
+protected:
+	LLGLEnable mCullFace, mBlend, mAlphaTest;
+public:
+	LLGLSTracker() :
+		mCullFace(GL_CULL_FACE),
+		mBlend(GL_BLEND),
+		mAlphaTest(GL_ALPHA_TEST)
+		
+	{ LLImageGL::unbindTexture(0); }
+};
+
+//----------------------------------------------------------------------------
+
+class LLGLSSpecular
+{
+public:
+	LLGLSSpecular(const LLColor4& color, F32 shininess)
+	{
+		if (shininess > 0.0f)
+		{
+			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, color.mV);
+			S32 shiny = (S32)(shininess*128.f);
+			shiny = llclamp(shiny,0,128);
+			glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, shiny);
+		}
+	}
+	~LLGLSSpecular()
+	{
+		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, LLColor4(0.f,0.f,0.f,0.f).mV);
+		glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 0);
+	}
+};
+
+//----------------------------------------------------------------------------
+
+
+class LLGLSBlendFunc : public LLGLSPipeline {
+protected:
+	GLint mSavedSrc, mSavedDst;
+	LLGLEnable mBlend;
+
+public:
+	LLGLSBlendFunc(GLenum srcFunc, GLenum dstFunc) :
+		mBlend(GL_BLEND)
+	{
+		glGetIntegerv(GL_BLEND_SRC, &mSavedSrc);
+		glGetIntegerv(GL_BLEND_DST, &mSavedDst);
+		glBlendFunc(srcFunc, dstFunc);
+	}
+
+	~LLGLSBlendFunc(void) {
+		glBlendFunc(mSavedSrc, mSavedDst);
+	}
+};
+
+
+#endif
diff --git a/linden/indra/llrender/llgltypes.h b/linden/indra/llrender/llgltypes.h
new file mode 100644
index 0000000..d22d5fa
--- /dev/null
+++ b/linden/indra/llrender/llgltypes.h
@@ -0,0 +1,44 @@
+/** 
+ * @file llgltypes.h
+ * @brief LLGL definition
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
+ * Copyright (c) 2006-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLGLTYPES_H
+#define LLGLTYPES_H
+
+#define MAX_GL_TEXTURE_UNITS 16
+
+typedef U32 LLGLenum;
+typedef U32 LLGLuint;
+typedef S32 LLGLint;
+typedef F32 LLGLfloat;
+typedef F64 LLGLdouble;
+typedef U8 LLGLboolean;
+
+#endif
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index a402814..a871758 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -836,7 +836,7 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S
 		llwarns << "Trying to create a texture while GL is disabled!" << llendl;
 		return FALSE;
 	}
-	llassert(gGLManager.mInited || gNoRender);
+	llassert(gGLManager.mInited);
 	stop_glerror();
 
 	if (discard_level < 0)
diff --git a/linden/indra/llrender/llpostprocess.cpp b/linden/indra/llrender/llpostprocess.cpp
new file mode 100644
index 0000000..c884951
--- /dev/null
+++ b/linden/indra/llrender/llpostprocess.cpp
@@ -0,0 +1,574 @@
+/** 
+ * @file llpostprocess.cpp
+ * @brief LLPostProcess class implementation
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llpostprocess.h"
+#include "llglslshader.h"
+#include "llsdserialize.h"
+#include "llrender.h"
+
+
+LLPostProcess * gPostProcess = NULL;
+
+
+static const unsigned int NOISE_SIZE = 512;
+
+/// CALCULATING LUMINANCE (Using NTSC lum weights)
+/// http://en.wikipedia.org/wiki/Luma_%28video%29
+static const float LUMINANCE_R = 0.299f;
+static const float LUMINANCE_G = 0.587f;
+static const float LUMINANCE_B = 0.114f;
+
+static const char * const XML_FILENAME = "postprocesseffects.xml";
+
+LLPostProcess::LLPostProcess(void) : 
+					sceneRenderTexture(0), noiseTexture(0),
+					tempBloomTexture(0),
+					initialized(false),  
+					mAllEffects(LLSD::emptyMap()),
+					screenW(1), screenH(1)
+{
+	/*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
+	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
+	LL_DEBUGS2("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
+
+	llifstream effectsXML(pathName);
+
+	if (effectsXML)
+	{
+		LLPointer<LLSDParser> parser = new LLSDXMLParser();
+
+		parser->parse(effectsXML, mAllEffects, LLSDSerialize::SIZE_UNLIMITED);
+	}
+
+	if (!mAllEffects.has("default"))
+	{
+		LLSD & defaultEffect = (mAllEffects["default"] = LLSD::emptyMap());
+
+		defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
+		defaultEffect["enable_bloom"] = LLSD::Boolean(false);
+		defaultEffect["enable_color_filter"] = LLSD::Boolean(false);
+
+		/// NVG Defaults
+		defaultEffect["brightness_multiplier"] = 3.0;
+		defaultEffect["noise_size"] = 25.0;
+		defaultEffect["noise_strength"] = 0.4;
+
+		// TODO BTest potentially add this to tweaks?
+		noiseTextureScale = 1.0f;
+		
+		/// Bloom Defaults
+		defaultEffect["extract_low"] = 0.95;
+		defaultEffect["extract_high"] = 1.0;
+		defaultEffect["bloom_width"] = 2.25;
+		defaultEffect["bloom_strength"] = 1.5;
+
+		/// Color Filter Defaults
+		defaultEffect["brightness"] = 1.0;
+		defaultEffect["contrast"] = 1.0;
+		defaultEffect["saturation"] = 1.0;
+
+		LLSD& contrastBase = (defaultEffect["contrast_base"] = LLSD::emptyArray());
+		contrastBase.append(1.0);
+		contrastBase.append(1.0);
+		contrastBase.append(1.0);
+		contrastBase.append(0.5);
+	}
+
+	setSelectedEffect("default");
+	*/
+}
+
+LLPostProcess::~LLPostProcess(void)
+{
+	glDeleteTextures(1, &sceneRenderTexture);
+	glDeleteTextures(1, &noiseTexture);
+	glDeleteTextures(1, &tempBloomTexture);
+}
+
+// static
+void LLPostProcess::initClass(void)
+{
+	//this will cause system to crash at second time login
+	//if first time login fails due to network connection --- bao
+	//***llassert_always(gPostProcess == NULL);
+	//replaced by the following line:
+	if(gPostProcess)
+		return ;
+	
+	
+	gPostProcess = new LLPostProcess();
+}
+
+// static
+void LLPostProcess::cleanupClass()
+{
+	delete gPostProcess;
+	gPostProcess = NULL;
+}
+
+void LLPostProcess::setSelectedEffect(std::string const & effectName)
+{
+	mSelectedEffectName = effectName;
+	static_cast<LLSD &>(tweaks) = mAllEffects[effectName];
+}
+
+void LLPostProcess::saveEffect(std::string const & effectName)
+{
+	/*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
+	mAllEffects[effectName] = tweaks;
+
+	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
+	//llinfos << "Saving PostProcess Effects settings to " << pathName << llendl;
+
+	llofstream effectsXML(pathName);
+
+	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
+
+	formatter->format(mAllEffects, effectsXML);
+	*/
+}
+
+void LLPostProcess::apply(unsigned int width, unsigned int height)
+{
+	if (!initialized || width != screenW || height != screenH){
+		initialize(width, height);
+	}
+	if (shadersEnabled()){
+		doEffects();
+	}
+}
+
+void LLPostProcess::initialize(unsigned int width, unsigned int height)
+{
+	screenW = width;
+	screenH = height;
+	createTexture(sceneRenderTexture, screenW, screenH);
+	initialized = true;
+
+	checkError();
+	createNightVisionShader();
+	createBloomShader();
+	createColorFilterShader();
+	checkError();
+}
+
+inline bool LLPostProcess::shadersEnabled(void)
+{
+	return (tweaks.useColorFilter().asBoolean() ||
+			tweaks.useNightVisionShader().asBoolean() ||
+			tweaks.useBloomShader().asBoolean() );
+
+}
+
+void LLPostProcess::applyShaders(void)
+{
+	if (tweaks.useColorFilter()){
+		applyColorFilterShader();
+		checkError();
+	}	
+	if (tweaks.useNightVisionShader()){
+		/// If any of the above shaders have been called update the frame buffer;
+		if (tweaks.useColorFilter()){
+			copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+		}
+		applyNightVisionShader();
+		checkError();
+	}
+	if (tweaks.useBloomShader()){
+		/// If any of the above shaders have been called update the frame buffer;
+		if (tweaks.useColorFilter().asBoolean() || tweaks.useNightVisionShader().asBoolean()){
+			copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+		}
+		applyBloomShader();
+		checkError();
+	}
+}
+
+void LLPostProcess::applyColorFilterShader(void)
+{	
+	/*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
+	gPostColorFilterProgram.bind();
+
+	gGL.getTexUnit(0)->activate();
+	glEnable(GL_TEXTURE_RECTANGLE_ARB);	
+
+	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, sceneRenderTexture);
+
+	getShaderUniforms(colorFilterUniforms, gPostColorFilterProgram.mProgramObject);
+	glUniform1iARB(colorFilterUniforms["RenderTexture"], 0);
+	glUniform1fARB(colorFilterUniforms["brightness"], tweaks.getBrightness());
+	glUniform1fARB(colorFilterUniforms["contrast"], tweaks.getContrast());
+	float baseI = (tweaks.getContrastBaseR() + tweaks.getContrastBaseG() + tweaks.getContrastBaseB()) / 3.0f;
+	baseI = tweaks.getContrastBaseIntensity() / ((baseI < 0.001f) ? 0.001f : baseI);
+	float baseR = tweaks.getContrastBaseR() * baseI;
+	float baseG = tweaks.getContrastBaseG() * baseI;
+	float baseB = tweaks.getContrastBaseB() * baseI;
+	glUniform3fARB(colorFilterUniforms["contrastBase"], baseR, baseG, baseB);
+	glUniform1fARB(colorFilterUniforms["saturation"], tweaks.getSaturation());
+	glUniform3fARB(colorFilterUniforms["lumWeights"], LUMINANCE_R, LUMINANCE_G, LUMINANCE_B);
+	
+	LLGLEnable blend(GL_BLEND);
+	gGL.setSceneBlendType(LLRender::BT_REPLACE);
+	LLGLDepthTest depth(GL_FALSE);
+		
+	/// Draw a screen space quad
+	drawOrthoQuad(screenW, screenH, QUAD_NORMAL);
+	gPostColorFilterProgram.unbind();
+	*/
+}
+
+void LLPostProcess::createColorFilterShader(void)
+{
+	/// Define uniform names
+	colorFilterUniforms["RenderTexture"] = 0;
+	colorFilterUniforms["brightness"] = 0;
+	colorFilterUniforms["contrast"] = 0;
+	colorFilterUniforms["contrastBase"] = 0;
+	colorFilterUniforms["saturation"] = 0;
+	colorFilterUniforms["lumWeights"] = 0;
+}
+
+void LLPostProcess::applyNightVisionShader(void)
+{	
+	/*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
+	gPostNightVisionProgram.bind();
+
+	gGL.getTexUnit(0)->activate();
+	glEnable(GL_TEXTURE_RECTANGLE_ARB);	
+
+	getShaderUniforms(nightVisionUniforms, gPostNightVisionProgram.mProgramObject);
+	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, sceneRenderTexture);
+	glUniform1iARB(nightVisionUniforms["RenderTexture"], 0);
+
+	gGL.getTexUnit(1)->activate();
+	glEnable(GL_TEXTURE_2D);	
+
+	glBindTexture(GL_TEXTURE_2D, noiseTexture);
+	glUniform1iARB(nightVisionUniforms["NoiseTexture"], 1);
+
+	
+	glUniform1fARB(nightVisionUniforms["brightMult"], tweaks.getBrightMult());
+	glUniform1fARB(nightVisionUniforms["noiseStrength"], tweaks.getNoiseStrength());
+	noiseTextureScale = 0.01f + ((101.f - tweaks.getNoiseSize()) / 100.f);
+	noiseTextureScale *= (screenH / NOISE_SIZE);
+
+
+	glUniform3fARB(nightVisionUniforms["lumWeights"], LUMINANCE_R, LUMINANCE_G, LUMINANCE_B);
+	
+	LLGLEnable blend(GL_BLEND);
+	gGL.setSceneBlendType(LLRender::BT_REPLACE);
+	LLGLDepthTest depth(GL_FALSE);
+		
+	/// Draw a screen space quad
+	drawOrthoQuad(screenW, screenH, QUAD_NOISE);
+	gPostNightVisionProgram.unbind();
+	gGL.getTexUnit(0)->activate();
+	*/
+}
+
+void LLPostProcess::createNightVisionShader(void)
+{
+	/// Define uniform names
+	nightVisionUniforms["RenderTexture"] = 0;
+	nightVisionUniforms["NoiseTexture"] = 0;
+	nightVisionUniforms["brightMult"] = 0;	
+	nightVisionUniforms["noiseStrength"] = 0;
+	nightVisionUniforms["lumWeights"] = 0;	
+
+	createNoiseTexture(noiseTexture);
+}
+
+void LLPostProcess::applyBloomShader(void)
+{
+
+}
+
+void LLPostProcess::createBloomShader(void)
+{
+	createTexture(tempBloomTexture, unsigned(screenW * 0.5), unsigned(screenH * 0.5));
+
+	/// Create Bloom Extract Shader
+	bloomExtractUniforms["RenderTexture"] = 0;
+	bloomExtractUniforms["extractLow"] = 0;
+	bloomExtractUniforms["extractHigh"] = 0;	
+	bloomExtractUniforms["lumWeights"] = 0;	
+	
+	/// Create Bloom Blur Shader
+	bloomBlurUniforms["RenderTexture"] = 0;
+	bloomBlurUniforms["bloomStrength"] = 0;	
+	bloomBlurUniforms["texelSize"] = 0;
+	bloomBlurUniforms["blurDirection"] = 0;
+	bloomBlurUniforms["blurWidth"] = 0;
+}
+
+void LLPostProcess::getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog)
+{
+	/// Find uniform locations and insert into map	
+	std::map<const char *, GLuint>::iterator i;
+	for (i  = uniforms.begin(); i != uniforms.end(); ++i){
+		i->second = glGetUniformLocationARB(prog, i->first);
+	}
+}
+
+void LLPostProcess::doEffects(void)
+{
+	/// Save GL State
+	glPushAttrib(GL_ALL_ATTRIB_BITS);
+	glPushClientAttrib(GL_ALL_ATTRIB_BITS);
+
+	/// Copy the screen buffer to the render texture
+	copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+
+	/// Clear the frame buffer.
+	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+	glClear(GL_COLOR_BUFFER_BIT);
+	
+	/// Change to an orthogonal view
+	viewOrthogonal(screenW, screenH);
+	
+	checkError();
+	applyShaders();
+	
+	LLGLSLShader::bindNoShader();
+	checkError();
+
+	/// Change to a perspective view
+	viewPerspective();	
+
+	/// Reset GL State
+	glPopClientAttrib();
+	glPopAttrib();
+	checkError();
+}
+
+void LLPostProcess::copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height)
+{
+	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
+	glCopyTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, 0, 0, width, height, 0);
+}
+
+void LLPostProcess::drawOrthoQuad(unsigned int width, unsigned int height, QuadType type)
+{
+#if 0
+	float noiseX = 0.f;
+	float noiseY = 0.f;
+	float screenRatio = 1.0f;
+
+	if (type == QUAD_NOISE){
+		noiseX = ((float) rand() / (float) RAND_MAX);
+		noiseY = ((float) rand() / (float) RAND_MAX);
+		screenRatio = (float) width / (float) height;
+	}
+	
+
+	glBegin(GL_QUADS);
+		if (type != QUAD_BLOOM_EXTRACT){
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, (GLfloat) height);
+		} else {
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, (GLfloat) height * 2.0f);
+		}
+		if (type == QUAD_NOISE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
+									noiseX,
+									noiseTextureScale + noiseY);
+		} else if (type == QUAD_BLOOM_COMBINE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0.f, (GLfloat) height * 0.5f);
+		}
+		glVertex2f(0.f, (GLfloat) screenH - height);
+
+		if (type != QUAD_BLOOM_EXTRACT){
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, 0.f);
+		} else {
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, 0.f);
+		}
+		if (type == QUAD_NOISE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
+									noiseX,
+									noiseY);
+		} else if (type == QUAD_BLOOM_COMBINE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0.f, 0.f);
+		}
+		glVertex2f(0.f, (GLfloat) height + (screenH - height));
+
+		
+		if (type != QUAD_BLOOM_EXTRACT){
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width, 0.f);
+		} else {
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width * 2.0f, 0.f);
+		}
+		if (type == QUAD_NOISE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
+									screenRatio * noiseTextureScale + noiseX,
+									noiseY);
+		} else if (type == QUAD_BLOOM_COMBINE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, (GLfloat) width * 0.5f, 0.f);
+		}
+		glVertex2f((GLfloat) width, (GLfloat) height + (screenH - height));
+
+		
+		if (type != QUAD_BLOOM_EXTRACT){
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width, (GLfloat) height);
+		} else {
+			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width * 2.0f, (GLfloat) height * 2.0f);
+		}
+		if (type == QUAD_NOISE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
+									screenRatio * noiseTextureScale + noiseX,
+									noiseTextureScale + noiseY);
+		} else if (type == QUAD_BLOOM_COMBINE){
+			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, (GLfloat) width * 0.5f, (GLfloat) height * 0.5f);
+		}
+		glVertex2f((GLfloat) width, (GLfloat) screenH - height);
+	glEnd();
+#endif
+}
+
+void LLPostProcess::viewOrthogonal(unsigned int width, unsigned int height)
+{
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadIdentity();
+	glOrtho( 0.f, (GLdouble) width , (GLdouble) height , 0.f, -1.f, 1.f );
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	glLoadIdentity();
+}
+
+void LLPostProcess::viewPerspective(void)
+{
+	glMatrixMode( GL_PROJECTION );
+	glPopMatrix();
+	glMatrixMode( GL_MODELVIEW );
+	glPopMatrix();
+}
+
+void LLPostProcess::changeOrthogonal(unsigned int width, unsigned int height)
+{
+	viewPerspective();
+	viewOrthogonal(width, height);
+}
+
+void LLPostProcess::createTexture(GLuint & texture, unsigned int width, unsigned int height)
+{
+	if (texture != 0){
+		glDeleteTextures(1, &texture);
+	}
+
+	std::vector<GLubyte> data(width * height * 4, 0);
+
+	glGenTextures(1, &texture);
+	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
+	glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 4, width, height, 0,
+		GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
+	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+}
+
+void LLPostProcess::createNoiseTexture(GLuint & texture)
+{
+	if (texture != 0){
+		glDeleteTextures(1, &texture);
+	}
+	glGenTextures(1, &texture);
+
+	std::vector<GLubyte> buffer(NOISE_SIZE * NOISE_SIZE);
+	for (unsigned int i = 0; i < NOISE_SIZE; i++){
+		for (unsigned int k = 0; k < NOISE_SIZE; k++){
+			buffer[(i * NOISE_SIZE) + k] = (GLubyte)((double) rand() / ((double) RAND_MAX + 1.f) * 255.f);
+		}
+	}
+	glBindTexture(GL_TEXTURE_2D, texture);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+}
+
+bool LLPostProcess::checkError(void)
+{
+	GLenum glErr;
+    bool    retCode = false;
+
+    glErr = glGetError();
+    while (glErr != GL_NO_ERROR)
+    {
+		// shaderErrorLog << (const char *) gluErrorString(glErr) << std::endl;
+		char const * err_str_raw = (const char *) gluErrorString(glErr);
+
+		if(err_str_raw == NULL)
+		{
+			std::ostringstream err_builder;
+			err_builder << "unknown error number " << glErr;
+			mShaderErrorString = err_builder.str();
+		}
+		else
+		{
+			mShaderErrorString = err_str_raw;
+		}
+
+        retCode = true;
+        glErr = glGetError();
+    }
+    return retCode;
+}
+
+void LLPostProcess::checkShaderError(GLhandleARB shader)
+{
+    GLint infologLength = 0;
+    GLint charsWritten  = 0;
+    GLchar *infoLog;
+
+    checkError();  // Check for OpenGL errors
+
+    glGetObjectParameterivARB(shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &infologLength);
+
+    checkError();  // Check for OpenGL errors
+
+    if (infologLength > 0)
+    {
+        infoLog = (GLchar *)malloc(infologLength);
+        if (infoLog == NULL)
+        {
+            /// Could not allocate infolog buffer
+            return;
+        }
+        glGetInfoLogARB(shader, infologLength, &charsWritten, infoLog);
+		// shaderErrorLog << (char *) infoLog << std::endl;
+		mShaderErrorString = (char *) infoLog;
+        free(infoLog);
+    }
+    checkError();  // Check for OpenGL errors
+}
diff --git a/linden/indra/llrender/llpostprocess.h b/linden/indra/llrender/llpostprocess.h
new file mode 100644
index 0000000..cd9f477
--- /dev/null
+++ b/linden/indra/llrender/llpostprocess.h
@@ -0,0 +1,268 @@
+/** 
+ * @file llpostprocess.h
+ * @brief LLPostProcess class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_POSTPROCESS_H
+#define LL_POSTPROCESS_H
+
+#include <map>
+#include <fstream>
+#include "llgl.h"
+#include "llglheaders.h"
+
+class LLPostProcess 
+{
+public:
+
+	typedef enum _QuadType {
+		QUAD_NORMAL,
+		QUAD_NOISE,
+		QUAD_BLOOM_EXTRACT,
+		QUAD_BLOOM_COMBINE
+	} QuadType;
+
+	/// GLSL Shader Encapsulation Struct
+	typedef std::map<const char *, GLuint> glslUniforms;
+
+	struct PostProcessTweaks : public LLSD {
+		inline PostProcessTweaks() : LLSD(LLSD::emptyMap())
+		{
+		}
+
+		inline LLSD & brightMult() {
+			return (*this)["brightness_multiplier"];
+		}
+
+		inline LLSD & noiseStrength() {
+			return (*this)["noise_strength"];
+		}
+
+		inline LLSD & noiseSize() {
+			return (*this)["noise_size"];
+		}
+
+		inline LLSD & extractLow() {
+			return (*this)["extract_low"];
+		}
+
+		inline LLSD & extractHigh() {
+			return (*this)["extract_high"];
+		}
+
+		inline LLSD & bloomWidth() {
+			return (*this)["bloom_width"];
+		}
+
+		inline LLSD & bloomStrength() {
+			return (*this)["bloom_strength"];
+		}
+
+		inline LLSD & brightness() {
+			return (*this)["brightness"];
+		}
+
+		inline LLSD & contrast() {
+			return (*this)["contrast"];
+		}
+
+		inline LLSD & contrastBaseR() {
+			return (*this)["contrast_base"][0];
+		}
+
+		inline LLSD & contrastBaseG() {
+			return (*this)["contrast_base"][1];
+		}
+
+		inline LLSD & contrastBaseB() {
+			return (*this)["contrast_base"][2];
+		}
+
+		inline LLSD & contrastBaseIntensity() {
+			return (*this)["contrast_base"][3];
+		}
+
+		inline LLSD & saturation() {
+			return (*this)["saturation"];
+		}
+
+		inline LLSD & useNightVisionShader() {
+			return (*this)["enable_night_vision"];
+		}
+
+		inline LLSD & useBloomShader() {
+			return (*this)["enable_bloom"];
+		}
+
+		inline LLSD & useColorFilter() {
+			return (*this)["enable_color_filter"];
+		}
+
+
+		inline F32 getBrightMult() const {
+			return F32((*this)["brightness_multiplier"].asReal());
+		}
+
+		inline F32 getNoiseStrength() const {
+			return F32((*this)["noise_strength"].asReal());
+		}
+
+		inline F32 getNoiseSize() const {
+			return F32((*this)["noise_size"].asReal());
+		}
+
+		inline F32 getExtractLow() const {
+			return F32((*this)["extract_low"].asReal());
+		}
+
+		inline F32 getExtractHigh() const {
+			return F32((*this)["extract_high"].asReal());
+		}
+
+		inline F32 getBloomWidth() const {
+			return F32((*this)["bloom_width"].asReal());
+		}
+
+		inline F32 getBloomStrength() const {
+			return F32((*this)["bloom_strength"].asReal());
+		}
+
+		inline F32 getBrightness() const {
+			return F32((*this)["brightness"].asReal());
+		}
+
+		inline F32 getContrast() const {
+			return F32((*this)["contrast"].asReal());
+		}
+
+		inline F32 getContrastBaseR() const {
+			return F32((*this)["contrast_base"][0].asReal());
+		}
+
+		inline F32 getContrastBaseG() const {
+			return F32((*this)["contrast_base"][1].asReal());
+		}
+
+		inline F32 getContrastBaseB() const {
+			return F32((*this)["contrast_base"][2].asReal());
+		}
+
+		inline F32 getContrastBaseIntensity() const {
+			return F32((*this)["contrast_base"][3].asReal());
+		}
+
+		inline F32 getSaturation() const {
+			return F32((*this)["saturation"].asReal());
+		}
+
+	};
+	
+	GLuint sceneRenderTexture;
+	GLuint noiseTexture;
+	GLuint tempBloomTexture;
+	bool initialized;
+	PostProcessTweaks tweaks;
+
+	// the map of all availible effects
+	LLSD mAllEffects;
+
+public:
+	LLPostProcess(void);
+
+	~LLPostProcess(void);
+
+	void apply(unsigned int width, unsigned int height);
+
+	/// Perform global initialization for this class.
+	static void initClass(void);
+
+	// Cleanup of global data that's only inited once per class.
+	static void cleanupClass();
+
+	void setSelectedEffect(std::string const & effectName);
+
+	inline std::string const & getSelectedEffect(void) const {
+		return mSelectedEffectName;
+	}
+
+	void saveEffect(std::string const & effectName);
+
+private:
+		/// read in from file
+	std::string mShaderErrorString;
+	unsigned int screenW;
+	unsigned int screenH;
+
+	float noiseTextureScale;
+	
+	/// Shader Uniforms
+	glslUniforms nightVisionUniforms;
+	glslUniforms bloomExtractUniforms;
+	glslUniforms bloomBlurUniforms;
+	glslUniforms colorFilterUniforms;
+
+	// the name of currently selected effect in mAllEffects
+	// invariant: tweaks == mAllEffects[mSelectedEffectName]
+	std::string mSelectedEffectName;
+
+	/// General functions
+	void initialize(unsigned int width, unsigned int height);
+	void doEffects(void);
+	void applyShaders(void);
+	bool shadersEnabled(void);
+
+	/// Night Vision Functions
+	void createNightVisionShader(void);
+	void applyNightVisionShader(void);
+
+	/// Bloom Functions
+	void createBloomShader(void);
+	void applyBloomShader(void);
+
+	/// Color Filter Functions
+	void createColorFilterShader(void);
+	void applyColorFilterShader(void);
+
+	/// OpenGL Helper Functions
+	void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog);
+	void createTexture(GLuint & texture, unsigned int width, unsigned int height);
+	void copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height);
+	void createNoiseTexture(GLuint & texture);
+	bool checkError(void);
+	void checkShaderError(GLhandleARB shader);
+	void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);
+	void viewOrthogonal(unsigned int width, unsigned int height);
+	void changeOrthogonal(unsigned int width, unsigned int height);
+	void viewPerspective(void);
+};
+
+extern LLPostProcess * gPostProcess;
+
+
+#endif // LL_POSTPROCESS_H
diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp
index e9c1227..13edf8a 100644
--- a/linden/indra/llrender/llrender.cpp
+++ b/linden/indra/llrender/llrender.cpp
@@ -36,6 +36,12 @@
 
 LLRender gGL;
 
+// Handy copies of last good GL matrices
+F64	gGLModelView[16];
+F64	gGLLastModelView[16];
+F64 gGLProjection[16];
+S32	gGLViewport[4];
+
 static const U32 LL_NUM_TEXTURE_LAYERS = 8; 
 
 static GLenum sGLCompareFunc[] =
@@ -445,6 +451,12 @@ void LLRender::translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z)
 	glTranslatef(x,y,z);
 }
 
+void LLRender::scalef(const GLfloat& x, const GLfloat& y, const GLfloat& z)
+{
+	flush();
+	glScalef(x,y,z);
+}
+
 void LLRender::pushMatrix()
 {
 	flush();
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index 03280fe..edf46ff 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -178,6 +178,7 @@ public:
 	~LLRender();
 
 	void translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z);
+	void scalef(const GLfloat& x, const GLfloat& y, const GLfloat& z);
 	void pushMatrix();
 	void popMatrix();
 
@@ -232,7 +233,10 @@ private:
 	std::vector<LLTexUnit*> mTexUnits;
 };
 
-
+extern F64 gGLModelView[16];
+extern F64 gGLLastModelView[16];
+extern F64 gGLProjection[16];
+extern S32 gGLViewport[4];
 
 extern LLRender gGL;
 
diff --git a/linden/indra/llrender/llrender.vcproj b/linden/indra/llrender/llrender.vcproj
deleted file mode 100644
index d9144cb..0000000
--- a/linden/indra/llrender/llrender.vcproj
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llrender"
-	ProjectGUID="{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="3"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llfont.cpp">
-			</File>
-			<File
-				RelativePath=".\llfontgl.cpp">
-			</File>
-			<File
-				RelativePath=".\llgldbg.cpp">
-			</File>
-			<File
-				RelativePath=".\llrender.cpp">
-			</File>
-			<File
-				RelativePath=".\llimagegl.cpp">
-			</File>
-			<File
-				RelativePath=".\llrendertarget.cpp">
-			</File>
-			<File
-				RelativePath=".\llvertexbuffer.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\glext.h">
-			</File>
-			<File
-				RelativePath=".\llagpmempool.h">
-			</File>
-			<File
-				RelativePath=".\llagpmempoolarb.h">
-			</File>
-			<File
-				RelativePath=".\llagpmempoolati.h">
-			</File>
-			<File
-				RelativePath=".\llagpmempoolnv.h">
-			</File>
-			<File
-				RelativePath=".\llfont.h">
-			</File>
-			<File
-				RelativePath=".\llfontgl.h">
-			</File>
-			<File
-				RelativePath=".\llgldbg.h">
-			</File>
-			<File
-				RelativePath=".\llrender.h">
-			</File>
-			<File
-				RelativePath=".\llimagegl.h">
-			</File>
-			<File
-				RelativePath=".\llrendertarget.h">
-			</File>
-			<File
-				RelativePath=".\llvertexbuffer.h">
-			</File>
-			<File
-				RelativePath=".\llvertexprogramgl.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llrender/llrender_vc8.vcproj b/linden/indra/llrender/llrender_vc8.vcproj
deleted file mode 100644
index 2147cec..0000000
--- a/linden/indra/llrender/llrender_vc8.vcproj
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llrender"
-	ProjectGUID="{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
-	RootNamespace="llrender"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llfont.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfontgl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgldbg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagegl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendertarget.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvertexbuffer.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\glext.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempoolarb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempoolati.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempoolnv.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfont.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfontgl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgldbg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagegl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendertarget.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvertexbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvertexprogramgl.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llrender/llrender_vc9.vcproj b/linden/indra/llrender/llrender_vc9.vcproj
deleted file mode 100644
index 67385e6..0000000
--- a/linden/indra/llrender/llrender_vc9.vcproj
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llrender"
-	ProjectGUID="{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"
-	RootNamespace="llrender"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llrender.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llfont.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfontgl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgldbg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagegl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendertarget.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvertexbuffer.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\glext.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempoolarb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempoolati.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagpmempoolnv.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfont.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfontgl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgldbg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimagegl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendertarget.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvertexbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvertexprogramgl.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llrender/llrendersphere.cpp b/linden/indra/llrender/llrendersphere.cpp
new file mode 100644
index 0000000..0c3cd19
--- /dev/null
+++ b/linden/indra/llrender/llrendersphere.cpp
@@ -0,0 +1,182 @@
+/** 
+ * @file llrendersphere.cpp
+ * @brief implementation of the LLRenderSphere class.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+//	Sphere creates a set of display lists that can then be called to create 
+//	a lit sphere at different LOD levels.  You only need one instance of sphere 
+//	per viewer - then call the appropriate list.  
+
+#include "linden_common.h"
+
+#include "llrendersphere.h"
+#include "llerror.h"
+
+#include "llglheaders.h"
+
+GLUquadricObj *gQuadObj2 = NULL;
+LLRenderSphere gSphere;
+
+void drawSolidSphere(GLdouble radius, GLint slices, GLint stacks);
+
+void drawSolidSphere(GLdouble radius, GLint slices, GLint stacks)
+{
+	if (!gQuadObj2)
+	{
+		gQuadObj2 = gluNewQuadric();
+		if (!gQuadObj2)
+		{
+			llwarns << "drawSolidSphere couldn't allocate quadric" << llendl;
+			return;
+		}
+	}
+
+	gluQuadricDrawStyle(gQuadObj2, GLU_FILL);
+	gluQuadricNormals(gQuadObj2, GLU_SMOOTH);
+	// If we ever changed/used the texture or orientation state
+	// of quadObj, we'd need to change it to the defaults here
+	// with gluQuadricTexture and/or gluQuadricOrientation.
+	gluQuadricTexture(gQuadObj2, GL_TRUE);
+	gluSphere(gQuadObj2, radius, slices, stacks);
+}
+
+
+// lat = 0 is Z-axis
+// lon = 0, lat = 90 at X-axis
+void lat2xyz(LLVector3 * result, F32 lat, F32 lon)
+{
+	// Convert a latitude and longitude to x,y,z on a normal sphere and return it in result
+	F32 r;
+	result->mV[VX] = (F32) (cos(lon * DEG_TO_RAD) * sin(lat * DEG_TO_RAD));
+	result->mV[VY] = (F32) (sin(lon * DEG_TO_RAD) * sin(lat * DEG_TO_RAD));
+	r = (F32) pow(result->mV[VX] * result->mV[VX] + result->mV[VY] * result->mV[VY], 0.5f);
+	if (r == 1.0f) 
+	{
+		result->mV[VZ] = 0.0f;
+	}
+	else
+	{
+		result->mV[VZ] = (F32) pow(1 - r*r, 0.5f);
+		if (lat > 90.01)
+		{
+			result->mV[VZ] *= -1.0;
+		}
+	}
+}
+
+void lat2xyz_rad(LLVector3 * result, F32 lat, F32 lon)
+{
+	// Convert a latitude and longitude to x,y,z on a normal sphere and return it in result
+	F32 r;
+	result->mV[VX] = (F32) (cos(lon) * sin(lat));
+	result->mV[VY] = (F32) (sin(lon) * sin(lat));
+	r = (F32) pow(result->mV[VX] * result->mV[VX] + result->mV[VY] * result->mV[VY], 0.5f);
+	if (r == 1.0f) 
+		result->mV[VZ] = 0.0f;
+	else
+	{
+		result->mV[VZ] = (F32) pow(1 - r*r, 0.5f);
+		if (lat > F_PI_BY_TWO) result->mV[VZ] *= -1.0;
+	}
+}
+
+// A couple thoughts on sphere drawing:
+// 1) You need more slices than stacks, but little less than 2:1
+// 2) At low LOD, setting stacks to an odd number avoids a "band" around the equator, making things look smoother
+void LLRenderSphere::prerender()
+{
+	//  Create a series of display lists for different LODs
+	mDList[0] = glGenLists(1);
+	glNewList(mDList[0], GL_COMPILE);
+	drawSolidSphere(1.0, 30, 20);
+	glEndList();
+
+	mDList[1] = glGenLists(1);
+	glNewList(mDList[1], GL_COMPILE);
+	drawSolidSphere(1.0, 20, 15);
+	glEndList();
+
+	mDList[2] = glGenLists(1);
+	glNewList(mDList[2], GL_COMPILE);
+	drawSolidSphere(1.0, 12, 8);
+	glEndList();
+
+	mDList[3] = glGenLists(1);
+	glNewList(mDList[3], GL_COMPILE);
+	drawSolidSphere(1.0, 8, 5);
+	glEndList();
+}
+
+void LLRenderSphere::cleanupGL()
+{
+	for (S32 detail = 0; detail < 4; detail++)
+	{
+		glDeleteLists(mDList[detail], 1);
+		mDList[detail] = 0;
+	}
+	
+	if (gQuadObj2)
+	{
+		gluDeleteQuadric(gQuadObj2);
+		gQuadObj2 = NULL;
+	}
+}
+
+// Constants here are empirically derived from my eyeballs, JNC
+//
+// The toughest adjustment is the cutoff for the lowest LOD
+// Maybe we should have more LODs at the low end?
+void LLRenderSphere::render(F32 pixel_area)
+{
+	S32 level_of_detail;
+
+	if (pixel_area > 10000.f)
+	{
+		level_of_detail = 0;
+	}
+	else if (pixel_area > 800.f)
+	{
+		level_of_detail = 1;
+	}
+	else if (pixel_area > 100.f)
+	{
+		level_of_detail = 2;
+	}
+	else
+	{
+		level_of_detail = 3;
+	}
+	glCallList(mDList[level_of_detail]);
+}
+
+
+void LLRenderSphere::render()
+{
+	glCallList(mDList[0]);
+}
diff --git a/linden/indra/llrender/llrendersphere.h b/linden/indra/llrender/llrendersphere.h
new file mode 100644
index 0000000..ace57e4
--- /dev/null
+++ b/linden/indra/llrender/llrendersphere.h
@@ -0,0 +1,47 @@
+/** 
+ * @file llrendersphere.h
+ * @brief interface for the LLRenderSphere class.
+ *
+ * $LicenseInfo:firstyear=2001&license=internal$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLRENDERSPHERE_H
+#define LL_LLRENDERSPHERE_H
+
+#include "llmath.h"
+#include "v3math.h"
+#include "v4math.h"
+#include "m3math.h"
+#include "m4math.h"
+#include "v4color.h"
+#include "llgl.h"
+
+void lat2xyz(LLVector3 * result, F32 lat, F32 lon);			// utility routine
+
+class LLRenderSphere  
+{
+public:
+	LLGLuint	mDList[5];
+
+	void prerender();
+	void cleanupGL();
+	void render(F32 pixel_area);		// of a box of size 1.0 at that position
+	void render();						// render at highest LOD
+};
+
+extern LLRenderSphere gSphere;
+#endif
diff --git a/linden/indra/llrender/llrendertarget.cpp b/linden/indra/llrender/llrendertarget.cpp
index 708c582..e18ec56 100644
--- a/linden/indra/llrender/llrendertarget.cpp
+++ b/linden/indra/llrender/llrendertarget.cpp
@@ -99,11 +99,16 @@ void LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth, U32
 
 		glGenFramebuffersEXT(1, (GLuint *) &mFBO);
 
+		stop_glerror();
+
 		glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mFBO);
 
+		stop_glerror();
+
 		if (mDepth)
 		{
 			glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, mUsage, mDepth, 0);
+			stop_glerror();
 			glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, mUsage, mDepth, 0);
 			stop_glerror();
 		}
diff --git a/linden/indra/llrender/llshadermgr.cpp b/linden/indra/llrender/llshadermgr.cpp
new file mode 100644
index 0000000..4416775
--- /dev/null
+++ b/linden/indra/llrender/llshadermgr.cpp
@@ -0,0 +1,513 @@
+/** 
+ * @file llshadermgr.cpp
+ * @brief Shader manager implementation.
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llshadermgr.h"
+
+#include "llfile.h"
+#include "llrender.h"
+
+#if LL_DARWIN
+#include "OpenGL/OpenGL.h"
+#endif
+
+#ifdef LL_RELEASE_FOR_DOWNLOAD
+#define UNIFORM_ERRS LL_WARNS_ONCE("Shader")
+#else
+#define UNIFORM_ERRS LL_ERRS("Shader")
+#endif
+
+// Lots of STL stuff in here, using namespace std to keep things more readable
+using std::vector;
+using std::pair;
+using std::make_pair;
+using std::string;
+
+LLShaderMgr * LLShaderMgr::sInstance = NULL;
+
+LLShaderMgr::LLShaderMgr()
+{
+}
+
+
+LLShaderMgr::~LLShaderMgr()
+{
+}
+
+// static
+LLShaderMgr * LLShaderMgr::instance()
+{
+	if(NULL == sInstance)
+	{
+		LL_ERRS("Shaders") << "LLShaderMgr should already have been instantiated by the application!" << LL_ENDL;
+	}
+
+	return sInstance;
+}
+
+BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
+{
+	llassert_always(shader != NULL);
+	LLShaderFeatures *features = & shader->mFeatures;
+	
+	//////////////////////////////////////
+	// Attach Vertex Shader Features First
+	//////////////////////////////////////
+	
+	// NOTE order of shader object attaching is VERY IMPORTANT!!!
+	if (features->calculatesAtmospherics)
+	{
+		if (!shader->attachObject("windlight/atmosphericsVarsV.glsl"))
+		{
+			return FALSE;
+		}
+	}
+
+	if (features->calculatesLighting)
+	{
+		if (!shader->attachObject("windlight/atmosphericsHelpersV.glsl"))
+		{
+			return FALSE;
+		}
+		
+		if (features->isSpecular)
+		{
+			if (!shader->attachObject("lighting/lightFuncSpecularV.glsl"))
+			{
+				return FALSE;
+			}
+			
+			if (!shader->attachObject("lighting/sumLightsSpecularV.glsl"))
+			{
+				return FALSE;
+			}
+			
+			if (!shader->attachObject("lighting/lightSpecularV.glsl"))
+			{
+				return FALSE;
+			}
+		}
+		else 
+		{
+			if (!shader->attachObject("lighting/lightFuncV.glsl"))
+			{
+				return FALSE;
+			}
+			
+			if (!shader->attachObject("lighting/sumLightsV.glsl"))
+			{
+				return FALSE;
+			}
+			
+			if (!shader->attachObject("lighting/lightV.glsl"))
+			{
+				return FALSE;
+			}
+		}
+	}
+	
+	// NOTE order of shader object attaching is VERY IMPORTANT!!!
+	if (features->calculatesAtmospherics)
+	{
+		if (!shader->attachObject("windlight/atmosphericsV.glsl"))
+		{
+			return FALSE;
+		}
+	}
+
+	if (features->hasSkinning)
+	{
+		if (!shader->attachObject("avatar/avatarSkinV.glsl"))
+		{
+			return FALSE;
+		}
+	}
+	
+	///////////////////////////////////////
+	// Attach Fragment Shader Features Next
+	///////////////////////////////////////
+
+	if(features->calculatesAtmospherics)
+	{
+		if (!shader->attachObject("windlight/atmosphericsVarsF.glsl"))
+		{
+			return FALSE;
+		}
+	}
+
+	// NOTE order of shader object attaching is VERY IMPORTANT!!!
+	if (features->hasGamma)
+	{
+		if (!shader->attachObject("windlight/gammaF.glsl"))
+		{
+			return FALSE;
+		}
+	}
+	
+	if (features->hasAtmospherics)
+	{
+		if (!shader->attachObject("windlight/atmosphericsF.glsl"))
+		{
+			return FALSE;
+		}
+	}
+	
+	if (features->hasTransport)
+	{
+		if (!shader->attachObject("windlight/transportF.glsl"))
+		{
+			return FALSE;
+		}
+
+		// Test hasFullbright and hasShiny and attach fullbright and 
+		// fullbright shiny atmos transport if we split them out.
+	}
+
+	// NOTE order of shader object attaching is VERY IMPORTANT!!!
+	if (features->hasWaterFog)
+	{
+		if (!shader->attachObject("environment/waterFogF.glsl"))
+		{
+			return FALSE;
+		}
+	}
+	
+	if (features->hasLighting)
+	{
+	
+		if (features->hasWaterFog)
+		{
+			if (!shader->attachObject("lighting/lightWaterF.glsl"))
+			{
+				return FALSE;
+			}
+		}
+		
+		else
+		{
+			if (!shader->attachObject("lighting/lightF.glsl"))
+			{
+				return FALSE;
+			}
+		}		
+	}
+	
+	// NOTE order of shader object attaching is VERY IMPORTANT!!!
+	else if (features->isFullbright)
+	{
+	
+		if (features->hasWaterFog)
+		{
+			if (!shader->attachObject("lighting/lightFullbrightWaterF.glsl"))
+			{
+				return FALSE;
+			}
+		}
+		
+		else if (features->isShiny)
+		{
+			if (!shader->attachObject("lighting/lightFullbrightShinyF.glsl"))
+			{
+				return FALSE;
+			}
+		}
+		
+		else
+		{
+			if (!shader->attachObject("lighting/lightFullbrightF.glsl"))
+			{
+				return FALSE;
+			}
+		}
+	}
+
+	// NOTE order of shader object attaching is VERY IMPORTANT!!!
+	else if (features->isShiny)
+	{
+	
+		if (features->hasWaterFog)
+		{
+			if (!shader->attachObject("lighting/lightShinyWaterF.glsl"))
+			{
+				return FALSE;
+			}
+		}
+		
+		else 
+		{
+			if (!shader->attachObject("lighting/lightShinyF.glsl"))
+			{
+				return FALSE;
+			}
+		}
+	}
+	return TRUE;
+}
+
+//============================================================================
+// Load Shader
+
+static std::string get_object_log(GLhandleARB ret)
+{
+	std::string res;
+	
+	//get log length 
+	GLint length;
+	glGetObjectParameterivARB(ret, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
+	if (length > 0)
+	{
+		//the log could be any size, so allocate appropriately
+		GLcharARB* log = new GLcharARB[length];
+		glGetInfoLogARB(ret, length, &length, log);
+		res = std::string((char *)log);
+		delete[] log;
+	}
+	return res;
+}
+
+void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns) 
+{
+	std::string log = get_object_log(ret);
+	if ( log.length() > 0 )
+	{
+		if (warns)
+		{
+			LL_WARNS("ShaderLoading") << log << LL_ENDL;
+		}
+		else
+		{
+			LL_DEBUGS("ShaderLoading") << log << LL_ENDL;
+		}
+}
+}
+
+GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type)
+{
+	GLenum error;
+	error = glGetError();
+	if (error != GL_NO_ERROR)
+	{
+		LL_WARNS("ShaderLoading") << "GL ERROR entering loadShaderFile(): " << error << LL_ENDL;
+	}
+	
+	LL_DEBUGS("ShaderLoading") << "Loading shader file: " << filename << " class " << shader_level << LL_ENDL;
+
+	if (filename.empty()) 
+	{
+		return 0;
+	}
+
+
+	//read in from file
+	LLFILE* file = NULL;
+
+	S32 try_gpu_class = shader_level;
+	S32 gpu_class;
+
+	//find the most relevant file
+	for (gpu_class = try_gpu_class; gpu_class > 0; gpu_class--)
+	{	//search from the current gpu class down to class 1 to find the most relevant shader
+		std::stringstream fname;
+		fname << getShaderDirPrefix();
+		fname << gpu_class << "/" << filename;
+		
+ 		LL_DEBUGS("ShaderLoading") << "Looking in " << fname.str() << LL_ENDL;
+		file = LLFile::fopen(fname.str(), "r");		/* Flawfinder: ignore */
+		if (file)
+		{
+			LL_INFOS("ShaderLoading") << "Loading file: shaders/class" << gpu_class << "/" << filename << " (Want class " << gpu_class << ")" << LL_ENDL;
+			break; // done
+		}
+	}
+	
+	if (file == NULL)
+	{
+		LL_WARNS("ShaderLoading") << "GLSL Shader file not found: " << filename << LL_ENDL;
+		return 0;
+	}
+
+	//we can't have any lines longer than 1024 characters 
+	//or any shaders longer than 1024 lines... deal - DaveP
+	GLcharARB buff[1024];
+	GLcharARB* text[1024];
+	GLuint count = 0;
+
+
+	//copy file into memory
+	while(fgets((char *)buff, 1024, file) != NULL && count < (sizeof(buff)/sizeof(buff[0]))) 
+	{
+		text[count++] = (GLcharARB *)strdup((char *)buff); 
+	}
+	fclose(file);
+
+	//create shader object
+	GLhandleARB ret = glCreateShaderObjectARB(type);
+	error = glGetError();
+	if (error != GL_NO_ERROR)
+	{
+		LL_WARNS("ShaderLoading") << "GL ERROR in glCreateShaderObjectARB: " << error << LL_ENDL;
+	}
+	else
+	{
+		//load source
+		glShaderSourceARB(ret, count, (const GLcharARB**) text, NULL);
+		error = glGetError();
+		if (error != GL_NO_ERROR)
+		{
+			LL_WARNS("ShaderLoading") << "GL ERROR in glShaderSourceARB: " << error << LL_ENDL;
+		}
+		else
+		{
+			//compile source
+			glCompileShaderARB(ret);
+			error = glGetError();
+			if (error != GL_NO_ERROR)
+			{
+				LL_WARNS("ShaderLoading") << "GL ERROR in glCompileShaderARB: " << error << LL_ENDL;
+			}
+		}
+	}
+	//free memory
+	for (GLuint i = 0; i < count; i++)
+	{
+		free(text[i]);
+	}
+	if (error == GL_NO_ERROR)
+	{
+		//check for errors
+		GLint success = GL_TRUE;
+		glGetObjectParameterivARB(ret, GL_OBJECT_COMPILE_STATUS_ARB, &success);
+		error = glGetError();
+		if (error != GL_NO_ERROR || success == GL_FALSE) 
+		{
+			//an error occured, print log
+			LL_WARNS("ShaderLoading") << "GLSL Compilation Error: (" << error << ") in " << filename << LL_ENDL;
+			dumpObjectLog(ret);
+			ret = 0;
+		}
+	}
+	else
+	{
+		ret = 0;
+	}
+	stop_glerror();
+
+	//successfully loaded, save results
+	if (ret)
+	{
+		// Add shader file to map
+		mShaderObjects[filename] = ret;
+		shader_level = try_gpu_class;
+	}
+	else
+	{
+		if (shader_level > 1)
+		{
+			shader_level--;
+			return loadShaderFile(filename,shader_level,type);
+		}
+		LL_WARNS("ShaderLoading") << "Failed to load " << filename << LL_ENDL;	
+	}
+	return ret;
+}
+
+BOOL LLShaderMgr::linkProgramObject(GLhandleARB obj, BOOL suppress_errors) 
+{
+	//check for errors
+	glLinkProgramARB(obj);
+	GLint success = GL_TRUE;
+	glGetObjectParameterivARB(obj, GL_OBJECT_LINK_STATUS_ARB, &success);
+	if (!suppress_errors && success == GL_FALSE) 
+	{
+		//an error occured, print log
+		LL_WARNS("ShaderLoading") << "GLSL Linker Error:" << LL_ENDL;
+	}
+
+// NOTE: Removing LL_DARWIN block as it doesn't seem to actually give the correct answer, 
+// but want it for reference once I move it.
+#if 0
+	// Force an evaluation of the gl state so the driver can tell if the shader will run in hardware or software
+	// per Apple's suggestion   
+	glBegin(gGL.mMode);
+	glEnd();
+
+	// Query whether the shader can or cannot run in hardware
+	// http://developer.apple.com/qa/qa2007/qa1502.html
+	long vertexGPUProcessing;
+	CGLContextObj ctx = CGLGetCurrentContext();
+	CGLGetParameter (ctx, kCGLCPGPUVertexProcessing, &vertexGPUProcessing);	
+	long fragmentGPUProcessing;
+	CGLGetParameter (ctx, kCGLCPGPUFragmentProcessing, &fragmentGPUProcessing);
+	if (!fragmentGPUProcessing || !vertexGPUProcessing)
+	{
+		LL_WARNS("ShaderLoading") << "GLSL Linker: Running in Software:" << LL_ENDL;
+		success = GL_FALSE;
+		suppress_errors = FALSE;		
+	}
+	
+#else
+	std::string log = get_object_log(obj);
+	LLStringUtil::toLower(log);
+	if (log.find("software") != std::string::npos)
+	{
+		LL_WARNS("ShaderLoading") << "GLSL Linker: Running in Software:" << LL_ENDL;
+		success = GL_FALSE;
+		suppress_errors = FALSE;
+	}
+#endif
+	if (!suppress_errors)
+	{
+        dumpObjectLog(obj, !success);
+	}
+
+	return success;
+}
+
+BOOL LLShaderMgr::validateProgramObject(GLhandleARB obj)
+{
+	//check program validity against current GL
+	glValidateProgramARB(obj);
+	GLint success = GL_TRUE;
+	glGetObjectParameterivARB(obj, GL_OBJECT_VALIDATE_STATUS_ARB, &success);
+	if (success == GL_FALSE)
+	{
+		LL_WARNS("ShaderLoading") << "GLSL program not valid: " << LL_ENDL;
+		dumpObjectLog(obj);
+	}
+	else
+	{
+		dumpObjectLog(obj, FALSE);
+	}
+
+	return success;
+}
+
diff --git a/linden/indra/llrender/llshadermgr.h b/linden/indra/llrender/llshadermgr.h
new file mode 100644
index 0000000..8918416
--- /dev/null
+++ b/linden/indra/llrender/llshadermgr.h
@@ -0,0 +1,75 @@
+/** 
+ * @file llshadermgr.h
+ * @brief Shader Manager
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_SHADERMGR_H
+#define LL_SHADERMGR_H
+
+#include "llgl.h"
+#include "llglslshader.h"
+
+class LLShaderMgr
+{
+public:
+	LLShaderMgr();
+	virtual ~LLShaderMgr();
+
+	// singleton pattern implementation
+	static LLShaderMgr * instance();
+
+	BOOL attachShaderFeatures(LLGLSLShader * shader);
+	void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE);
+	BOOL	linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE);
+	BOOL	validateProgramObject(GLhandleARB obj);
+	GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type);
+
+	// Implemented in the application to actually point to the shader directory.
+	virtual std::string getShaderDirPrefix(void) = 0; // Pure Virtual
+
+	// Implemented in the application to actually update out of date uniforms for a particular shader
+	virtual void updateShaderUniforms(LLGLSLShader * shader) = 0; // Pure Virtual
+
+public:
+	// Map of shader names to compiled
+	std::map<std::string, GLhandleARB> mShaderObjects;
+
+	//global (reserved slot) shader parameters
+	std::vector<std::string> mReservedAttribs;
+
+	std::vector<std::string> mReservedUniforms;
+
+protected:
+
+	// our parameter manager singleton instance
+	static LLShaderMgr * sInstance;
+
+}; //LLShaderMgr
+
+#endif
diff --git a/linden/indra/llrender/llvertexbuffer.cpp b/linden/indra/llrender/llvertexbuffer.cpp
index 9635ae3..547663b 100644
--- a/linden/indra/llrender/llvertexbuffer.cpp
+++ b/linden/indra/llrender/llvertexbuffer.cpp
@@ -190,10 +190,12 @@ void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indi
 	if (mode > NUM_MODES)
 	{
 		llerrs << "Invalid draw mode: " << mode << llendl;
+		return;
 	}
 
 	glDrawRangeElements(sGLMode[mode], start, end, count, GL_UNSIGNED_SHORT, 
 		((U16*) getIndicesPointer()) + indices_offset);
+	stop_glerror();
 }
 
 void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const
@@ -217,6 +219,7 @@ void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const
 	if (mode > NUM_MODES)
 	{
 		llerrs << "Invalid draw mode: " << mode << llendl;
+		return;
 	}
 
 	glDrawElements(sGLMode[mode], count, GL_UNSIGNED_SHORT,
@@ -240,9 +243,11 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const
 	if (mode > NUM_MODES)
 	{
 		llerrs << "Invalid draw mode: " << mode << llendl;
+		return;
 	}
 
 	glDrawArrays(sGLMode[mode], first, count);
+	stop_glerror();
 }
 
 //static
diff --git a/linden/indra/llrender/llvertexbuffer.h b/linden/indra/llrender/llvertexbuffer.h
index 64a6f60..8edcf69 100644
--- a/linden/indra/llrender/llvertexbuffer.h
+++ b/linden/indra/llrender/llvertexbuffer.h
@@ -41,6 +41,7 @@
 #include "llmemory.h"
 #include <set>
 #include <vector>
+#include <list>
 
 //============================================================================
 // NOTES
diff --git a/linden/indra/llui/CMakeLists.txt b/linden/indra/llui/CMakeLists.txt
new file mode 100644
index 0000000..77efec5
--- /dev/null
+++ b/linden/indra/llui/CMakeLists.txt
@@ -0,0 +1,133 @@
+# -*- cmake -*-
+
+project(llui)
+
+include(00-Common)
+include(LLAudio)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLMessage)
+include(LLRender)
+include(LLWindow)
+include(LLVFS)
+include(LLXML)
+
+include_directories(
+    ${LLAUDIO_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLRENDER_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llui_SOURCE_FILES
+    llalertdialog.cpp
+    llbutton.cpp
+    llcheckboxctrl.cpp
+    llclipboard.cpp
+    llcombobox.cpp
+    llctrlselectioninterface.cpp
+    lldraghandle.cpp
+    lleditmenuhandler.cpp
+    llfloater.cpp
+    llfocusmgr.cpp
+    lliconctrl.cpp
+    llkeywords.cpp
+    lllineeditor.cpp
+    llmenugl.cpp
+    llmodaldialog.cpp
+    llmultislider.cpp
+    llmultisliderctrl.cpp
+    llpanel.cpp
+    llradiogroup.cpp
+    llresizebar.cpp
+    llresizehandle.cpp
+    llresmgr.cpp
+    llrootview.cpp
+    llscrollbar.cpp
+    llscrollcontainer.cpp
+    llscrollingpanellist.cpp
+    llscrolllistctrl.cpp
+    llslider.cpp
+    llsliderctrl.cpp
+    llspinctrl.cpp
+    llstyle.cpp
+    lltabcontainer.cpp
+    lltabcontainervertical.cpp
+    lltextbox.cpp
+    lltexteditor.cpp
+    llui.cpp
+    lluictrl.cpp
+    lluictrlfactory.cpp
+    lluistring.cpp
+    llundo.cpp
+    llviewborder.cpp
+    llview.cpp
+    llviewquery.cpp
+    )
+    
+set(llui_HEADER_FILES
+    CMakeLists.txt
+
+    llalertdialog.h
+    llbutton.h
+    llcallbackmap.h
+    llcheckboxctrl.h
+    llclipboard.h
+    llcombobox.h
+    llctrlselectioninterface.h
+    lldraghandle.h
+    lleditmenuhandler.h
+    llfloater.h
+    llfocusmgr.h
+    llhtmlhelp.h
+    lliconctrl.h
+    llkeywords.h
+    lllineeditor.h
+    llmemberlistener.h
+    llmenugl.h
+    llmodaldialog.h
+    llmultisliderctrl.h
+    llmultislider.h
+    llpanel.h
+    llradiogroup.h
+    llresizebar.h
+    llresizehandle.h
+    llresmgr.h
+    llrootview.h
+    llscrollbar.h
+    llscrollcontainer.h
+    llscrollingpanellist.h
+    llscrolllistctrl.h
+    llsliderctrl.h
+    llslider.h
+    llspinctrl.h
+    llstyle.h
+    lltabcontainer.h
+    lltabcontainervertical.h
+    lltextbox.h
+    lltexteditor.h
+    lluiconstants.h
+    lluictrlfactory.h
+    lluictrl.h
+    lluifwd.h
+    llui.h
+    lluistring.h
+    lluixmltags.h
+    llundo.h
+    llviewborder.h
+    llview.h
+    llviewquery.h
+    )
+
+set_source_files_properties(${llui_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES})
+
+add_library (llui ${llui_SOURCE_FILES})
diff --git a/linden/indra/llui/files.lst b/linden/indra/llui/files.lst
deleted file mode 100644
index 56bc2c3..0000000
--- a/linden/indra/llui/files.lst
+++ /dev/null
@@ -1,46 +0,0 @@
-llui/llalertdialog.cpp
-llui/llbutton.cpp
-llui/llcheckboxctrl.cpp
-llui/llclipboard.cpp
-llui/llcombobox.cpp
-llui/llctrlselectioninterface.cpp
-llui/lldraghandle.cpp
-llui/lleditmenuhandler.cpp
-llui/llfloater.cpp
-llui/llfocusmgr.cpp
-llui/lliconctrl.cpp
-llui/llkeywords.cpp
-llui/lllineeditor.cpp
-llui/llmenugl.cpp
-llui/llmodaldialog.cpp
-llui/llmultislider.cpp
-llui/llmultisliderctrl.cpp
-llui/llpanel.cpp
-llui/llradiogroup.cpp
-llui/llresizebar.cpp
-llui/llresizehandle.cpp
-llui/llresmgr.cpp
-llui/llrootview.cpp
-llui/llscrollbar.cpp
-llui/llscrollcontainer.cpp
-llui/llscrollingpanellist.cpp
-llui/llscrolllistctrl.cpp
-llui/llslider.cpp
-llui/llsliderctrl.cpp
-llui/llspinctrl.cpp
-llui/llstyle.cpp
-llui/lltabcontainer.cpp
-llui/lltabcontainervertical.cpp
-llui/lltextbox.cpp
-llui/lltexteditor.cpp
-llui/llui.cpp
-llui/lluictrl.cpp
-llui/lluictrlfactory.cpp
-llui/lluistring.cpp
-llui/llundo.cpp
-llui/llview.cpp
-llui/llviewborder.cpp
-llui/llviewquery.cpp
-llui/llmultislider.cpp
-llui/llmultisliderctrl.cpp
-
diff --git a/linden/indra/llui/llalertdialog.cpp b/linden/indra/llui/llalertdialog.cpp
index 4ca9dc8..4be07e9 100644
--- a/linden/indra/llui/llalertdialog.cpp
+++ b/linden/indra/llui/llalertdialog.cpp
@@ -55,23 +55,23 @@ const S32 MSG_PAD = 8;
 /*static*/ LLAlertDialog::template_map_t LLAlertDialog::sAlertTemplates;
 /*static*/ LLAlertDialog::template_map_t LLAlertDialog::sIgnorableTemplates;
 /*static*/ LLControlGroup* LLAlertDialog::sSettings = NULL;
-/*static*/ std::map<LLString,LLAlertDialog*> LLAlertDialog::sUniqueActiveMap;
+/*static*/ std::map<std::string,LLAlertDialog*> LLAlertDialog::sUniqueActiveMap;
 /*static*/ LLAlertDialog::display_callback_t LLAlertDialog::sDisplayCallback;
-/*static*/ LLString LLAlertDialog::sStringSkipNextTime("Skip this dialog next time");
-/*static*/ LLString LLAlertDialog::sStringAlwaysChoose("Always choose this option");
+/*static*/ std::string LLAlertDialog::sStringSkipNextTime("Skip this dialog next time");
+/*static*/ std::string LLAlertDialog::sStringAlwaysChoose("Always choose this option");
 /*static*/ LLAlertDialog::URLLoader* LLAlertDialog::sURLLoader;
 
 
 //static
-LLAlertDialog* LLAlertDialog::createXml( const LLString& xml_desc,
+LLAlertDialog* LLAlertDialog::createXml( const std::string& xml_desc,
 										 alert_callback_t callback, void *user_data)
 {
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	return createXml(xml_desc, args, callback, user_data);
 }
 
 //static
-LLAlertDialog* LLAlertDialog::createXml( const LLString& xml_desc, const LLString::format_map_t& args,
+LLAlertDialog* LLAlertDialog::createXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 										 alert_callback_t callback, void *user_data)
 {
 	template_map_t::iterator iter = sAlertTemplates.find(xml_desc);
@@ -85,7 +85,7 @@ LLAlertDialog* LLAlertDialog::createXml( const LLString& xml_desc, const LLStrin
 	}
 	else
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[ALERT_NAME]"] = xml_desc;
 		llwarns << "Missing Alert: [" << xml_desc << "]" << llendl;
 		LLAlertDialog* dialogp = LLAlertDialog::showXml("MissingAlert", args);
@@ -98,15 +98,15 @@ LLAlertDialog* LLAlertDialog::createXml( const LLString& xml_desc, const LLStrin
 }
 
 //static
-LLAlertDialog* LLAlertDialog::showXml( const LLString& xml_desc,
+LLAlertDialog* LLAlertDialog::showXml( const std::string& xml_desc,
 							 alert_callback_t callback, void *user_data)
 {
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	return showXml(xml_desc, args, callback, user_data);
 }
 
 //static
-LLAlertDialog* LLAlertDialog::showXml( const LLString& xml_desc, const LLString::format_map_t& args,
+LLAlertDialog* LLAlertDialog::showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 							 alert_callback_t callback, void *user_data)
 {
 	LLAlertDialog* dialog = createXml(xml_desc, args, callback, user_data);
@@ -114,10 +114,10 @@ LLAlertDialog* LLAlertDialog::showXml( const LLString& xml_desc, const LLString:
 }
 
 //static
-LLAlertDialog* LLAlertDialog::showCritical( const LLString& desc, alert_callback_t callback, void *user_data)
+LLAlertDialog* LLAlertDialog::showCritical( const std::string& desc, alert_callback_t callback, void *user_data)
 {
 	LLAlertDialogTemplate xml_template;
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	xml_template.mTitle = "Critical Error";
 	xml_template.mMessage = desc;
 	xml_template.mModal = TRUE;
@@ -135,7 +135,7 @@ static const S32 BTN_HPAD = 8;
 static const LLFONT_ID font_name = LLFONT_SANSSERIF;
 
 LLAlertDialog::LLAlertDialog( const LLAlertDialogTemplate* xml_template,
-							  const LLString::format_map_t& args,
+							  const LLStringUtil::format_map_t& args,
 							  alert_callback_t callback, void *user_data)
 	:	LLModalDialog( xml_template->mTitle, 100, 100, xml_template->mModal ),  // dummy size.  Will reshape below.
 		mCallback( callback ),
@@ -156,7 +156,7 @@ LLAlertDialog::LLAlertDialog( const LLAlertDialogTemplate* xml_template,
 {
 	mURL = xml_template->mURL;
 	mURLOption = xml_template->mURLOption;
-	createDialog(&(xml_template->mOptions), xml_template->mDefaultOption,
+	createDialog(xml_template->mOptions, xml_template->mDefaultOption,
 				 xml_template->mMessage, args,
 				 xml_template->mEditLineText);
 	setTitle(xml_template->mTitle);
@@ -226,7 +226,7 @@ bool LLAlertDialog::show()
 	// Check to see if we are already displaying the alert
 	if (mUnique)
 	{
-		std::map<LLString,LLAlertDialog*>::iterator iter = sUniqueActiveMap.find(mLabel);
+		std::map<std::string,LLAlertDialog*>::iterator iter = sUniqueActiveMap.find(mLabel);
 		if (iter != sUniqueActiveMap.end())
 		{
 			gFloaterView->bringToFront(iter->second);
@@ -254,18 +254,18 @@ bool LLAlertDialog::show()
 	return true;
 }
 
-void LLAlertDialog::format(LLString& msg, const LLString::format_map_t& args)
+void LLAlertDialog::format(std::string& msg, const LLStringUtil::format_map_t& args)
 {
 	// XUI:translate!
-	LLString::format_map_t targs = args;
+	LLStringUtil::format_map_t targs = args;
 	targs["[SECOND_LIFE]"] = "Second Life";
 	targs["[_URL]"] = mURL;
-	LLString::format(msg, targs);
+	LLStringUtil::format(msg, targs);
 }
 
-void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 default_option,
-								 const LLString& msg_in, const LLString::format_map_t& args,
-								 const LLString& edit_text)
+void LLAlertDialog::createDialog(const options_list_t& options_in, S32 default_option,
+								 const std::string& msg_in, const LLStringUtil::format_map_t& args,
+								 const std::string& edit_text)
 {
 	setBackgroundVisible(TRUE);
 	setBackgroundOpaque(TRUE);
@@ -274,9 +274,11 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 	const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
 	const S32 EDITOR_HEIGHT = 20;
 
+	const options_list_t* optionsp = &options_in;
+	
 	// Buttons
-	std::vector<LLString> default_option_list;
-	mNumOptions = optionsp->size();
+	options_list_t default_option_list;
+	mNumOptions = options_in.size();
 	if( 0 == mNumOptions )
 	{
 		default_option_list.push_back("Close");
@@ -285,12 +287,13 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 		mNumOptions = 1;
 	}
 
-	const std::vector<LLString>& options = *optionsp;
+	const options_list_t& options= *optionsp;
+	
 	mButtonData = new ButtonData[mNumOptions];
 
 	// Calc total width of buttons
 	S32 button_width = 0;
-	S32 sp = font->getWidth("OO");
+	S32 sp = font->getWidth(std::string("OO"));
 	for( S32 i = 0; i < mNumOptions; i++ )
 	{
 		S32 w = S32(font->getWidth( options[i] ) + 0.99f) + sp + 2 * LLBUTTON_H_PAD;
@@ -304,10 +307,10 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 
 	// Message: create text box using raw string, as text has been structure deliberately
 	// Use size of created text box to generate dialog box size
-	LLString msg = msg_in;
+	std::string msg = msg_in;
 	format( msg, args );		 
 	llwarns << "Alert: " << msg << llendl;
-	LLTextBox* msg_box = new LLTextBox( "Alert message", msg, (F32)MAX_ALLOWED_MSG_WIDTH, font );
+	LLTextBox* msg_box = new LLTextBox( std::string("Alert message"), msg, (F32)MAX_ALLOWED_MSG_WIDTH, font );
 
 	const LLRect& text_rect = msg_box->getRect();
 	S32 dialog_width = llmax( btn_total_width, text_rect.getWidth() ) + 2 * HPAD;
@@ -339,7 +342,7 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 
 	if (mCaution)
 	{
-		LLIconCtrl* icon = new LLIconCtrl("icon", LLRect(msg_x, msg_y, msg_x+32, msg_y-32), "notify_caution_icon.tga");
+		LLIconCtrl* icon = new LLIconCtrl(std::string("icon"), LLRect(msg_x, msg_y, msg_x+32, msg_y-32), std::string("notify_caution_icon.tga"));
 		icon->setMouseOpaque(FALSE);
 		addChild(icon);
 		msg_x += 32 + HPAD;
@@ -362,13 +365,12 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 		LLRect button_rect;
 		button_rect.setOriginAndSize( button_left, VPAD, button_width, BTN_HEIGHT );
 
-		LLButton* btn = new LLButton(
-			"btn", button_rect,
-			"","", "", 
-			&LLAlertDialog::onButtonPressed, (void*)(&mButtonData[i]),
-			font,
-			options[i], 
-			options[i]);
+		LLButton* btn = new LLButton(std::string("btn"), button_rect,
+									 LLStringUtil::null, LLStringUtil::null, LLStringUtil::null, 
+									 &LLAlertDialog::onButtonPressed, (void*)(&mButtonData[i]),
+									 font,
+									 options[i], 
+									 options[i]);
 
 		mButtonData[i].mSelf = this;
 		mButtonData[i].mButton = btn;
@@ -388,7 +390,7 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 	if (edit_text.size() > 0)
 	{
 		S32 y = VPAD + BTN_HEIGHT + VPAD/2;
-		mLineEditor = new LLLineEditor("lineeditor",
+		mLineEditor = new LLLineEditor(std::string("lineeditor"),
 			LLRect( HPAD, y+EDITOR_HEIGHT, dialog_width-HPAD, y),
 			edit_text,
 			LLFontGL::sSansSerif,
@@ -397,7 +399,7 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 	}
 }
 
-bool LLAlertDialog::setCheckBox( const LLString& check_title, const LLString& check_control )
+bool LLAlertDialog::setCheckBox( const std::string& check_title, const std::string& check_control )
 {
 	const LLFontGL* font = LLResMgr::getInstance()->getRes( font_name );
 	const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
@@ -420,7 +422,7 @@ bool LLAlertDialog::setCheckBox( const LLString& check_title, const LLString& ch
 	check_rect.setOriginAndSize(msg_x, VPAD+BTN_HEIGHT+LINE_HEIGHT/2, 
 								max_msg_width, LINE_HEIGHT);
 
-	mCheck = new LLCheckboxCtrl("check", check_rect, check_title, font);
+	mCheck = new LLCheckboxCtrl(std::string("check"), check_rect, check_title, font);
 	addChild(mCheck);
 
 	// mCheck is sometimes "show again" and sometimes "hide" :-(
@@ -508,7 +510,7 @@ void LLAlertDialog::handleCallbacks()
 }
 BOOL LLAlertDialog::hasTitleBar() const
 {
-	return (getTitle() != "" && getTitle() != " ")	// has title
+	return (getCurrentTitle() != "" && getCurrentTitle() != " ")	// has title
 			|| isMinimizeable()
 			|| isCloseable();
 }
@@ -586,11 +588,11 @@ void LLAlertDialog::setEditTextCallback(alert_text_callback_t callback, void *us
 	}
 }
 
-void LLAlertDialog::setEditTextArgs(const LLString::format_map_t& edit_args)
+void LLAlertDialog::setEditTextArgs(const LLStringUtil::format_map_t& edit_args)
 {
 	if (mLineEditor)
 	{
-		LLString msg = mLineEditor->getText();
+		std::string msg = mLineEditor->getText();
 		format(msg, edit_args);
 		mLineEditor->setText(msg);
 	}
@@ -625,7 +627,7 @@ void LLAlertDialog::onButtonPressed( void* userdata )
 //=============================================================================
 
 //static
-const LLString& LLAlertDialog::getTemplateMessage(const LLString& xml_desc)
+const std::string& LLAlertDialog::getTemplateMessage(const std::string& xml_desc)
 {
 	template_map_t::iterator iter = sAlertTemplates.find(xml_desc);
 	if (iter != sAlertTemplates.end())
@@ -639,7 +641,7 @@ const LLString& LLAlertDialog::getTemplateMessage(const LLString& xml_desc)
 }
 
 //static
-bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* settings, BOOL settings_only)
+bool LLAlertDialog::parseAlerts(const std::string& xml_filename, LLControlGroup* settings, BOOL settings_only)
 {
 	LLXMLNodePtr root;
 	BOOL success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
@@ -663,7 +665,7 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
 	{
 		if (alert->hasName("global"))
 		{
-			LLString global_name;
+			std::string global_name;
 			if (alert->getAttributeString("name", global_name))
 			{
 				if (global_name == "skipnexttime")
@@ -686,7 +688,7 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
 		LLAlertDialogTemplate* xml_template = settings_only ? NULL : new LLAlertDialogTemplate;
 
 		// name=
-		LLString alert_name;
+		std::string alert_name;
 		if (alert->getAttributeString("name", alert_name))
 		{
 			if (xml_template)
@@ -701,7 +703,7 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
 			continue;
 		}
 		// title=
-		LLString title;
+		std::string title;
 		if (alert->getAttributeString("title", title))
 		{
 			if (xml_template)
@@ -767,10 +769,10 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
 			// <option>
 			if (child->hasName("option"))
 			{
-				LLString label = child->getTextContents();
+				std::string label = child->getTextContents();
 				BOOL is_default = FALSE;
 				child->getAttributeBOOL("default", is_default);
-				LLString ignore_text;
+				std::string ignore_text;
 				if (!child->getAttributeString("ignore", ignore_text))
 				{
 					ignore_text = label;
@@ -802,9 +804,9 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
 			// <ignore>
 			if (child->hasName("ignore"))
 			{
-				LLString ignore_text = child->getTextContents();
+				std::string ignore_text = child->getTextContents();
 				// label=
-				LLString name;
+				std::string name;
 				child->getAttributeString("name", name);
 				
 				//always set to alert_name for the sake of i18n
@@ -839,7 +841,7 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
 					}
 					if (add_settings)
 					{
-						settings->declareS32("Default" + name, default_option, "Default option number for this alert dialog");
+						settings->declareS32(std::string("Default") + name, default_option, std::string("Default option number for this alert dialog"));
 					}
 				}
 			}
diff --git a/linden/indra/llui/llalertdialog.h b/linden/indra/llui/llalertdialog.h
index 8633164..fc3bdea 100644
--- a/linden/indra/llui/llalertdialog.h
+++ b/linden/indra/llui/llalertdialog.h
@@ -47,8 +47,10 @@ class LLAlertDialog : public LLModalDialog
 {
 public:
 	typedef void (*alert_callback_t)(S32 option, void* user_data);
-	typedef void (*alert_text_callback_t)(S32 option, const LLString& text, void* user_data);
+	typedef void (*alert_text_callback_t)(S32 option, const std::string& text, void* user_data);
 	typedef bool (*display_callback_t)(S32 modal);
+	typedef std::vector<std::string> options_list_t;
+	
 	enum { IGNORE_USE_DEFAULT=1, IGNORE_USE_SAVED=2, IGNORE_SHOW_AGAIN=3 };
 
 	class URLLoader
@@ -65,7 +67,7 @@ public:
 	
 public:
 	// User's responsibility to call show() after creating these.
-	LLAlertDialog( const LLAlertDialogTemplate* xml_template, const LLString::format_map_t& args,
+	LLAlertDialog( const LLAlertDialogTemplate* xml_template, const LLStringUtil::format_map_t& args,
 				   alert_callback_t callback = NULL, void *user_data = NULL);
 
 	virtual BOOL	handleKeyHere(KEY key, MASK mask );
@@ -74,13 +76,13 @@ public:
 	virtual void	setVisible( BOOL visible );
 	virtual void	onClose(bool app_quitting);
 
-	bool 			setCheckBox( const LLString&, const LLString& );	
+	bool 			setCheckBox( const std::string&, const std::string& );	
 	void			setOptionEnabled( S32 option, BOOL enable );
 	void			setCaution(BOOL val = TRUE) { mCaution = val; }
 	// If mUnique==TRUE only one copy of this message should exist
 	void			setUnique(BOOL val = TRUE) { mUnique = val; }
 	void			setEditTextCallback(alert_text_callback_t callback, void *user_data);
-	void			setEditTextArgs(const LLString::format_map_t& edit_args);
+	void			setEditTextArgs(const LLStringUtil::format_map_t& edit_args);
 	void			setDrawAsterixes(BOOL enable);
 	
 	bool			show();	// May instantly destroy the message if it is unique (returns false)
@@ -88,44 +90,45 @@ public:
 	//statics
 	static void		onButtonPressed(void* userdata);
 
-	static LLAlertDialog* createXml( const LLString& xml_desc,
+	static LLAlertDialog* createXml( const std::string& xml_desc,
 									 alert_callback_t callback = NULL, void *user_data = NULL);
-	static LLAlertDialog* createXml( const LLString& xml_desc, const LLString::format_map_t& args,
+	static LLAlertDialog* createXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 									 alert_callback_t callback = NULL, void *user_data = NULL);
 	
-	static LLAlertDialog* 	showXml( const LLString& xml_desc,
+	static LLAlertDialog* 	showXml( const std::string& xml_desc,
 							 alert_callback_t callback = NULL, void *user_data = NULL);
-	static LLAlertDialog* 	showXml( const LLString& xml_desc, const LLString::format_map_t& args,
+	static LLAlertDialog* 	showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 							 alert_callback_t callback = NULL, void *user_data = NULL);
 
-	static LLAlertDialog* 	showCritical( const LLString& msg, alert_callback_t callback = NULL, void *user_data = NULL);
+	static LLAlertDialog* 	showCritical( const std::string& msg, alert_callback_t callback = NULL, void *user_data = NULL);
 	
-	static bool parseAlerts(const LLString& xml_filename, LLControlGroup* settings = NULL, BOOL settings_only = FALSE);
-	static const LLString& getTemplateMessage(const LLString& xml_desc);
+	static bool parseAlerts(const std::string& xml_filename, LLControlGroup* settings = NULL, BOOL settings_only = FALSE);
+	static const std::string& getTemplateMessage(const std::string& xml_desc);
 
 	static void setDisplayCallback(display_callback_t callback) { sDisplayCallback = callback; }
 
-	void format(LLString& msg, const LLString::format_map_t& args);
+private:
+	void format(std::string& msg, const LLStringUtil::format_map_t& args);
 
+public:
 	static LLControlGroup* sSettings;
 
 	// use LLPointer so they delete themselves when sTemplates is destroyed
-	typedef std::map<LLString, LLPointer<LLAlertDialogTemplate> > template_map_t;
+	typedef std::map<std::string, LLPointer<LLAlertDialogTemplate> > template_map_t;
 	static template_map_t sAlertTemplates; // by mLabel
 	static template_map_t sIgnorableTemplates; // by mIgnoreLabel
 
-
 private:
 
-	static std::map<LLString, LLAlertDialog*> sUniqueActiveMap;
+	static std::map<std::string, LLAlertDialog*> sUniqueActiveMap;
 	static display_callback_t sDisplayCallback;
 
-	static LLString sStringSkipNextTime;
-	static LLString sStringAlwaysChoose;
+	static std::string sStringSkipNextTime;
+	static std::string sStringAlwaysChoose;
 
-	void createDialog(const std::vector<LLString>* options, S32 default_option,
-					  const LLString& msg, const LLString::format_map_t& args,
-					  const LLString& edit_text);
+	void createDialog(const options_list_t& options_in, S32 default_option,
+					  const std::string& msg, const LLStringUtil::format_map_t& args,
+					  const std::string& edit_text);
 	
 	virtual ~LLAlertDialog();
 	void handleCallbacks();
@@ -150,14 +153,14 @@ private:
 	BOOL	mCaution;
 	BOOL	mUnique;
 	S32		mIgnorable;
-	LLString mLabel;
-	LLString mIgnoreLabel;
+	std::string mLabel;
+	std::string mIgnoreLabel;
 	LLFrameTimer mDefaultBtnTimer;
 	// For Dialogs that take a line as text as input:
 	LLLineEditor* mLineEditor;
 	alert_text_callback_t mTextCallback;
 	// For Dialogs linked to a URL
-	LLString mURL;		 		// Some alerts will direct the resident to a URL
+	std::string mURL;		 		// Some alerts will direct the resident to a URL
 	S32 mURLOption;
 
 private:
@@ -171,7 +174,7 @@ class LLAlertDialogTemplate : public LLRefCount
 public:
 	LLAlertDialogTemplate() : mTitle(), mURLOption(0), mModal(FALSE), mCaution(FALSE), mUnique(FALSE), mIgnorable(0), mDefaultOption(0) {}
 	
-	void addOption(const LLString& label, const LLString& ignore_text, BOOL is_default = FALSE)
+	void addOption(const std::string& label, const std::string& ignore_text, BOOL is_default = FALSE)
 	{
 		if (is_default)
 		{
@@ -203,21 +206,21 @@ public:
 
 	
 public:
-	LLString mLabel;			// Handle for access from code, etc
-	LLString mTitle;			// (optional) text to display in title bar
-	LLString mMessage;			// Message to display
-	LLString mIgnoreListText; 	// Text to display in enable/disable dialog (if mIgnorable == TRUE)
-	LLString mIgnoreLabel; 		// Handle for ignore variable (may be shared by multiple templates)
-	LLString mURL;		 		// Some alerts will direct the resident to a URL
+	std::string mLabel;			// Handle for access from code, etc
+	std::string mTitle;			// (optional) text to display in title bar
+	std::string mMessage;			// Message to display
+	std::string mIgnoreListText; 	// Text to display in enable/disable dialog (if mIgnorable == TRUE)
+	std::string mIgnoreLabel; 		// Handle for ignore variable (may be shared by multiple templates)
+	std::string mURL;		 		// Some alerts will direct the resident to a URL
 	S32 mURLOption;
 	BOOL mModal;
 	BOOL mCaution;
 	BOOL mUnique;
 	S32 mIgnorable; // 0 = Never Ignore, 1 = Do default option, 2 = Do saved option
-	std::vector<LLString> mOptions;
-	std::vector<LLString> mOptionDefaultText;
+	LLAlertDialog::options_list_t mOptions;
+	LLAlertDialog::options_list_t mOptionDefaultText;
 	S32 mDefaultOption;
-	LLString mEditLineText;
+	std::string mEditLineText;
 };
 
 #endif  // LL_ALERTDIALOG_H
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 3eead67..508500a 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -39,13 +39,10 @@
 
 // Project includes
 #include "llkeyboard.h"
-#include "llgl.h"
 #include "llui.h"
 #include "lluiconstants.h"
-//#include "llcallbacklist.h"
 #include "llresmgr.h"
 #include "llcriticaldamp.h"
-#include "llglheaders.h"
 #include "llfocusmgr.h"
 #include "llwindow.h"
 #include "llrender.h"
@@ -62,7 +59,7 @@ S32 BTN_HEIGHT		= 0;
 S32 BTN_GRID		= 12;
 S32 BORDER_SIZE = 1;
 
-LLButton::LLButton(	const LLString& name, const LLRect& rect, const LLString& control_name, void (*click_callback)(void*), void *callback_data)
+LLButton::LLButton(	const std::string& name, const LLRect& rect, const std::string& control_name, void (*click_callback)(void*), void *callback_data)
 :	LLUICtrl(name, rect, TRUE, NULL, NULL),
 	mClickedCallback( click_callback ),
 	mMouseDownCallback( NULL ),
@@ -96,10 +93,10 @@ LLButton::LLButton(	const LLString& name, const LLRect& rect, const LLString& co
 	mUnselectedLabel = name;
 	mSelectedLabel = name;
 
-	setImageUnselected("button_enabled_32x128.tga");
-	setImageSelected("button_enabled_selected_32x128.tga");
-	setImageDisabled("button_disabled_32x128.tga");
-	setImageDisabledSelected("button_disabled_32x128.tga");
+	setImageUnselected(std::string("button_enabled_32x128.tga"));
+	setImageSelected(std::string("button_enabled_selected_32x128.tga"));
+	setImageDisabled(std::string("button_disabled_32x128.tga"));
+	setImageDisabledSelected(std::string("button_disabled_32x128.tga"));
 
 	mImageColor = LLUI::sColorsGroup->getColor( "ButtonImageColor" );
 	mDisabledImageColor = LLUI::sColorsGroup->getColor( "ButtonImageColor" );
@@ -108,15 +105,15 @@ LLButton::LLButton(	const LLString& name, const LLRect& rect, const LLString& co
 }
 
 
-LLButton::LLButton(const LLString& name, const LLRect& rect, 
-				   const LLString &unselected_image_name, 
-				   const LLString &selected_image_name, 
-				   const LLString& control_name,
+LLButton::LLButton(const std::string& name, const LLRect& rect, 
+				   const std::string &unselected_image_name, 
+				   const std::string &selected_image_name, 
+				   const std::string& control_name,
 				   void (*click_callback)(void*),
 				   void *callback_data,
 				   const LLFontGL *font,
-				   const LLString& unselected_label, 
-				   const LLString& selected_label )
+				   const std::string& unselected_label, 
+				   const std::string& selected_label )
 :	LLUICtrl(name, rect, TRUE, NULL, NULL),
 	mClickedCallback( click_callback ),
 	mMouseDownCallback( NULL ),
@@ -165,8 +162,8 @@ LLButton::LLButton(const LLString& name, const LLRect& rect,
 	}
 	else
 	{
-		setImageUnselected("button_enabled_32x128.tga");
-		setImageDisabled("button_disabled_32x128.tga");
+		setImageUnselected(std::string("button_enabled_32x128.tga"));
+		setImageDisabled(std::string("button_disabled_32x128.tga"));
 	}
 
 	if( selected_image_name != "" )
@@ -180,19 +177,19 @@ LLButton::LLButton(const LLString& name, const LLRect& rect,
 	}
 	else
 	{
-		setImageSelected("button_enabled_selected_32x128.tga");
-		setImageDisabledSelected("button_disabled_32x128.tga");
+		setImageSelected(std::string("button_enabled_selected_32x128.tga"));
+		setImageDisabledSelected(std::string("button_disabled_32x128.tga"));
 	}
 
 	init(click_callback, callback_data, font, control_name);
 }
 
-void LLButton::init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const LLString& control_name)
+void LLButton::init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const std::string& control_name)
 {
 	mGLFont = ( font ? font : LLFontGL::sSansSerif);
 
 	// Hack to make sure there is space for at least one character
-	if (getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(" "))
+	if (getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" ")))
 	{
 		// Use old defaults
 		mLeftHPad = LLBUTTON_ORIG_H_PAD;
@@ -211,6 +208,7 @@ void LLButton::init(void (*click_callback)(void*), void *callback_data, const LL
 	mHighlightColor = (				LLUI::sColorsGroup->getColor( "ButtonUnselectedFgColor" ) );
 	mUnselectedBgColor = (				LLUI::sColorsGroup->getColor( "ButtonUnselectedBgColor" ) );
 	mSelectedBgColor = (				LLUI::sColorsGroup->getColor( "ButtonSelectedBgColor" ) );
+	mFlashBgColor = (				LLUI::sColorsGroup->getColor( "ButtonFlashBgColor" ) );
 
 	mImageOverlayAlignment = LLFontGL::HCENTER;
 	mImageOverlayColor = LLColor4::white;
@@ -324,7 +322,7 @@ BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
 	}
 
 	mMouseDownTimer.start();
-	mMouseDownFrame = LLFrameTimer::getFrameCount();
+	mMouseDownFrame = (S32) LLFrameTimer::getFrameCount();
 	
 	if (getSoundFlags() & MOUSE_DOWN)
 	{
@@ -388,7 +386,7 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
 	if (mMouseDownTimer.getStarted() && NULL != mHeldDownCallback)
 	{
 		F32 elapsed = getHeldDownTime();
-		if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= LLFrameTimer::getFrameCount() - mMouseDownFrame)
+		if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= (S32)LLFrameTimer::getFrameCount() - mMouseDownFrame)
 		{
 			mHeldDownCallback( mCallbackUserData );		
 		}
@@ -436,7 +434,9 @@ void LLButton::draw()
 					|| mToggleState;
 	
 	BOOL use_glow_effect = FALSE;
-	if ( mNeedsHighlight || flash )
+	LLColor4 glow_color = LLColor4::white;
+	LLRender::eBlendType glow_type = LLRender::BT_ADD_WITH_ALPHA;
+	if ( mNeedsHighlight )
 	{
 		if (pressed)
 		{
@@ -472,6 +472,16 @@ void LLButton::draw()
 		mImagep = mImageUnselected;
 	}
 
+	if (mFlashing)
+	{
+		use_glow_effect = TRUE;
+		glow_type = LLRender::BT_ALPHA; // blend the glow
+		if (mNeedsHighlight) // highlighted AND flashing
+			glow_color = (glow_color*0.5f + mFlashBgColor*0.5f) % 2.0f; // average between flash and highlight colour, with sum of the opacity
+		else
+			glow_color = mFlashBgColor;
+	}
+
 	// Override if more data is available
 	// HACK: Use gray checked state to mean either:
 	//   enabled and tentative
@@ -558,7 +568,10 @@ void LLButton::draw()
 	
 	if (use_glow_effect)
 	{
-		mCurGlowStrength = lerp(mCurGlowStrength, mHoverGlowStrength, LLCriticalDamp::getInterpolant(0.05f));
+		mCurGlowStrength = lerp(mCurGlowStrength,
+					mFlashing ? (flash? 1.0 : 0.0)
+					: mHoverGlowStrength,
+					LLCriticalDamp::getInterpolant(0.05f));
 	}
 	else
 	{
@@ -574,8 +587,8 @@ void LLButton::draw()
 			mImagep->draw(getLocalRect(), getEnabled() ? mImageColor : mDisabledImageColor  );
 			if (mCurGlowStrength > 0.01f)
 			{
-				gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
-				mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
+				gGL.setSceneBlendType(glow_type);
+				mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), glow_color % mCurGlowStrength);
 				gGL.setSceneBlendType(LLRender::BT_ALPHA);
 			}
 		}
@@ -584,8 +597,8 @@ void LLButton::draw()
 			mImagep->draw(0, 0, getEnabled() ? mImageColor : mDisabledImageColor );
 			if (mCurGlowStrength > 0.01f)
 			{
-				gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
-				mImagep->drawSolid(0, 0, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
+				gGL.setSceneBlendType(glow_type);
+				mImagep->drawSolid(0, 0, glow_color % mCurGlowStrength);
 				gGL.setSceneBlendType(LLRender::BT_ALPHA);
 			}
 		}
@@ -670,7 +683,7 @@ void LLButton::draw()
 	// Draw label
 	if( !label.empty() )
 	{
-		LLWString::trim(label);
+		LLWStringUtil::trim(label);
 
 		S32 x;
 		switch( mHAlign )
@@ -777,7 +790,7 @@ void LLButton::setLabel( const LLStringExplicit& label )
 }
 
 //virtual
-BOOL LLButton::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLButton::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	mUnselectedLabel.setArg(key, text);
 	mSelectedLabel.setArg(key, text);
@@ -809,7 +822,7 @@ void LLButton::setImageUnselected(LLPointer<LLUIImage> image)
 	mImageUnselected = image;
 }
 
-void LLButton::setImages( const LLString &image_name, const LLString &selected_name )
+void LLButton::setImages( const std::string &image_name, const std::string &selected_name )
 {
 	setImageUnselected(image_name);
 	setImageSelected(selected_name);
@@ -846,7 +859,7 @@ void LLButton::setImageDisabledSelected(LLPointer<LLUIImage> image)
 	mDisabledImageColor.mV[VALPHA] *= 0.5f;
 }
 
-void LLButton::setDisabledImages( const LLString &image_name, const LLString &selected_name, const LLColor4& c )
+void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name, const LLColor4& c )
 {
 	setImageDisabled(image_name);
 	setImageDisabledSelected(selected_name);
@@ -858,7 +871,7 @@ void LLButton::setImageHoverSelected(LLPointer<LLUIImage> image)
 	mImageHoverSelected = image;
 }
 
-void LLButton::setDisabledImages( const LLString &image_name, const LLString &selected_name)
+void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name)
 {
 	LLColor4 clr = mImageColor;
 	clr.mV[VALPHA] *= .5f;
@@ -870,13 +883,13 @@ void LLButton::setImageHoverUnselected(LLPointer<LLUIImage> image)
 	mImageHoverUnselected = image;
 }
 
-void LLButton::setHoverImages( const LLString& image_name, const LLString& selected_name )
+void LLButton::setHoverImages( const std::string& image_name, const std::string& selected_name )
 {
 	setImageHoverUnselected(image_name);
 	setImageHoverSelected(selected_name);
 }
 
-void LLButton::setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment, const LLColor4& color)
+void LLButton::setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment, const LLColor4& color)
 {
 	if (image_name.empty())
 	{
@@ -915,54 +928,54 @@ S32 round_up(S32 grid, S32 value)
 	}
 }
 
-void			LLButton::setImageUnselected(const LLString &image_name)
+void			LLButton::setImageUnselected(const std::string &image_name)
 {	
 	setImageUnselected(LLUI::getUIImage(image_name));
 	mImageUnselectedName = image_name;
 }
 
-void			LLButton::setImageSelected(const LLString &image_name)
+void			LLButton::setImageSelected(const std::string &image_name)
 {	
 	setImageSelected(LLUI::getUIImage(image_name));
 	mImageSelectedName = image_name;
 }
 
-void			LLButton::setImageHoverSelected(const LLString &image_name)
+void			LLButton::setImageHoverSelected(const std::string &image_name)
 {
 	setImageHoverSelected(LLUI::getUIImage(image_name));
 	mImageHoverSelectedName = image_name;
 }
 
-void			LLButton::setImageHoverUnselected(const LLString &image_name)
+void			LLButton::setImageHoverUnselected(const std::string &image_name)
 {
 	setImageHoverUnselected(LLUI::getUIImage(image_name));
 	mImageHoverUnselectedName = image_name;
 }
 
-void			LLButton::setImageDisabled(const LLString &image_name)
+void			LLButton::setImageDisabled(const std::string &image_name)
 {
 	setImageDisabled(LLUI::getUIImage(image_name));
 	mImageDisabledName = image_name;
 }
 
-void			LLButton::setImageDisabledSelected(const LLString &image_name)
+void			LLButton::setImageDisabledSelected(const std::string &image_name)
 {
 	setImageDisabledSelected(LLUI::getUIImage(image_name));
 	mImageDisabledSelectedName = image_name;
 }
 
 void LLButton::addImageAttributeToXML(LLXMLNodePtr node, 
-									  const LLString& image_name,
+									  const std::string& image_name,
 									  const LLUUID&	image_id,
-									  const LLString& xml_tag_name) const
+									  const std::string& xml_tag_name) const
 {
 	if( !image_name.empty() )
 	{
-		node->createChild(xml_tag_name, TRUE)->setStringValue(image_name);
+		node->createChild(xml_tag_name.c_str(), TRUE)->setStringValue(image_name);
 	}
 	else if( image_id != LLUUID::null )
 	{
-		node->createChild(xml_tag_name + "_id", TRUE)->setUUIDValue(image_id);
+		node->createChild((xml_tag_name + "_id").c_str(), TRUE)->setUUIDValue(image_id);
 	}
 }
 
@@ -976,12 +989,12 @@ LLXMLNodePtr LLButton::getXML(bool save_children) const
 	node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
 	node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(mHAlign));
 
-	addImageAttributeToXML(node,mImageUnselectedName,mImageUnselectedID,"image_unselected");
-	addImageAttributeToXML(node,mImageSelectedName,mImageSelectedID,"image_selected");
-	addImageAttributeToXML(node,mImageHoverSelectedName,mImageHoverSelectedID,"image_hover_selected");
-	addImageAttributeToXML(node,mImageHoverUnselectedName,mImageHoverUnselectedID,"image_hover_unselected");
-	addImageAttributeToXML(node,mImageDisabledName,mImageDisabledID,"image_disabled");
-	addImageAttributeToXML(node,mImageDisabledSelectedName,mImageDisabledSelectedID,"image_disabled_selected");
+	addImageAttributeToXML(node,mImageUnselectedName,mImageUnselectedID,std::string("image_unselected"));
+	addImageAttributeToXML(node,mImageSelectedName,mImageSelectedID,std::string("image_selected"));
+	addImageAttributeToXML(node,mImageHoverSelectedName,mImageHoverSelectedID,std::string("image_hover_selected"));
+	addImageAttributeToXML(node,mImageHoverUnselectedName,mImageHoverUnselectedID,std::string("image_hover_unselected"));
+	addImageAttributeToXML(node,mImageDisabledName,mImageDisabledID,std::string("image_disabled"));
+	addImageAttributeToXML(node,mImageDisabledSelectedName,mImageDisabledSelectedID,std::string("image_disabled_selected"));
 
 	node->createChild("scale_image", TRUE)->setBoolValue(mScaleImage);
 
@@ -1004,40 +1017,40 @@ void clicked_help(void* data)
 // static
 LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("button");
+	std::string name("button");
 	node->getAttributeString("name", name);
 
-	LLString label = name;
+	std::string label = name;
 	node->getAttributeString("label", label);
 
-	LLString label_selected = label;
+	std::string label_selected = label;
 	node->getAttributeString("label_selected", label_selected);
 
 	LLFontGL* font = selectFont(node);
 
-	LLString	image_unselected;
+	std::string	image_unselected;
 	if (node->hasAttribute("image_unselected")) node->getAttributeString("image_unselected",image_unselected);
 	
-	LLString	image_selected;
+	std::string	image_selected;
 	if (node->hasAttribute("image_selected")) node->getAttributeString("image_selected",image_selected);
 	
-	LLString	image_hover_selected;
+	std::string	image_hover_selected;
 	if (node->hasAttribute("image_hover_selected")) node->getAttributeString("image_hover_selected",image_hover_selected);
 	
-	LLString	image_hover_unselected;
+	std::string	image_hover_unselected;
 	if (node->hasAttribute("image_hover_unselected")) node->getAttributeString("image_hover_unselected",image_hover_unselected);
 	
-	LLString	image_disabled_selected;
+	std::string	image_disabled_selected;
 	if (node->hasAttribute("image_disabled_selected")) node->getAttributeString("image_disabled_selected",image_disabled_selected);
 	
-	LLString	image_disabled;
+	std::string	image_disabled;
 	if (node->hasAttribute("image_disabled")) node->getAttributeString("image_disabled",image_disabled);
 
-	LLString	image_overlay;
+	std::string	image_overlay;
 	node->getAttributeString("image_overlay", image_overlay);
 
 	LLFontGL::HAlign image_overlay_alignment = LLFontGL::HCENTER;
-	LLString image_overlay_alignment_string;
+	std::string image_overlay_alignment_string;
 	if (node->hasAttribute("image_overlay_alignment"))
 	{
 		node->getAttributeString("image_overlay_alignment", image_overlay_alignment_string);
@@ -1049,7 +1062,7 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
 			LLRect(),
 			image_unselected,
 			image_selected,
-			"", 
+			LLStringUtil::null, 
 			NULL, 
 			parent,
 			font,
@@ -1063,15 +1076,15 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
 	node->getAttributeBOOL("toggle", is_toggle);
 	button->setIsToggle(is_toggle);
 
-	if(image_hover_selected != LLString::null) button->setImageHoverSelected(image_hover_selected);
+	if(image_hover_selected != LLStringUtil::null) button->setImageHoverSelected(image_hover_selected);
 	
-	if(image_hover_unselected != LLString::null) button->setImageHoverUnselected(image_hover_unselected);
+	if(image_hover_unselected != LLStringUtil::null) button->setImageHoverUnselected(image_hover_unselected);
 	
-	if(image_disabled_selected != LLString::null) button->setImageDisabledSelected(image_disabled_selected );
+	if(image_disabled_selected != LLStringUtil::null) button->setImageDisabledSelected(image_disabled_selected );
 	
-	if(image_disabled != LLString::null) button->setImageDisabled(image_disabled);
+	if(image_disabled != LLStringUtil::null) button->setImageDisabled(image_disabled);
 	
-	if(image_overlay != LLString::null) button->setImageOverlay(image_overlay, image_overlay_alignment);
+	if(image_overlay != LLStringUtil::null) button->setImageOverlay(image_overlay, image_overlay_alignment);
 
 	if (node->hasAttribute("halign"))
 	{
@@ -1097,7 +1110,7 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
 		
 	if (node->hasAttribute("help_url")) 
 	{
-		LLString	help_url;
+		std::string	help_url;
 		node->getAttributeString("help_url",help_url);
 		button->setHelpURLCallback(help_url);
 	}
@@ -1107,7 +1120,7 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
 	return button;
 }
 
-void LLButton::setHelpURLCallback(const LLString &help_url)
+void LLButton::setHelpURLCallback(const std::string &help_url)
 {
 	mHelpURL = help_url;
 	setClickedCallback(clicked_help,this);
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index a101a3c..e9497bd 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -72,25 +72,25 @@ class LLButton
 {
 public:
 	// simple button with text label
-	LLButton(const LLString& name, const LLRect &rect, const LLString& control_name = LLString(), 
+	LLButton(const std::string& name, const LLRect &rect, const std::string& control_name = std::string(), 
 			 void (*on_click)(void*) = NULL, void *data = NULL);
 
-	LLButton(const LLString& name, const LLRect& rect, 
-			 const LLString &unselected_image,
-			 const LLString &selected_image,
-			 const LLString& control_name,	
+	LLButton(const std::string& name, const LLRect& rect, 
+			 const std::string &unselected_image,
+			 const std::string &selected_image,
+			 const std::string& control_name,	
 			 void (*click_callback)(void*),
 			 void *callback_data = NULL,
 			 const LLFontGL* mGLFont = NULL,
-			 const LLString& unselected_label = LLString::null,
-			 const LLString& selected_label = LLString::null );
+			 const std::string& unselected_label = LLStringUtil::null,
+			 const std::string& selected_label = LLStringUtil::null );
 
 	virtual ~LLButton();
-	void init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const LLString& control_name);
+	void init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const std::string& control_name);
 
 	
-	void			addImageAttributeToXML(LLXMLNodePtr node, const LLString& imageName,
-										const LLUUID&	imageID,const LLString&	xmlTagName) const;
+	void			addImageAttributeToXML(LLXMLNodePtr node, const std::string& imageName,
+										const LLUUID&	imageID,const std::string&	xmlTagName) const;
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 	static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
@@ -130,24 +130,24 @@ public:
 	void			setLeftHPad( S32 pad )					{ mLeftHPad = pad; }
 	void			setRightHPad( S32 pad )					{ mRightHPad = pad; }
 
-	const LLString	getLabelUnselected() const { return wstring_to_utf8str(mUnselectedLabel); }
-	const LLString	getLabelSelected() const { return wstring_to_utf8str(mSelectedLabel); }
+	const std::string	getLabelUnselected() const { return wstring_to_utf8str(mUnselectedLabel); }
+	const std::string	getLabelSelected() const { return wstring_to_utf8str(mSelectedLabel); }
 
-	void			setImageColor(const LLString& color_control);
+	void			setImageColor(const std::string& color_control);
 	void			setImageColor(const LLColor4& c);
 	virtual void	setColor(const LLColor4& c);
 
-	void			setImages(const LLString &image_name, const LLString &selected_name);
-	void			setDisabledImages(const LLString &image_name, const LLString &selected_name);
-	void			setDisabledImages(const LLString &image_name, const LLString &selected_name, const LLColor4& c);
+	void			setImages(const std::string &image_name, const std::string &selected_name);
+	void			setDisabledImages(const std::string &image_name, const std::string &selected_name);
+	void			setDisabledImages(const std::string &image_name, const std::string &selected_name, const LLColor4& c);
 	
-	void			setHoverImages(const LLString &image_name, const LLString &selected_name);
+	void			setHoverImages(const std::string &image_name, const std::string &selected_name);
 
 	void			setDisabledImageColor(const LLColor4& c)		{ mDisabledImageColor = c; }
 
 	void			setDisabledSelectedLabelColor( const LLColor4& c )	{ mDisabledSelectedLabelColor = c; }
 
-	void			setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
+	void			setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
 	LLPointer<LLUIImage> getImageOverlay() { return mImageOverlay; }
 	
 
@@ -155,7 +155,7 @@ public:
 	virtual LLSD	getValue() const;
 
 	void			setLabel( const LLStringExplicit& label);
-	virtual BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 	void			setLabelUnselected(const LLStringExplicit& label);
 	void			setLabelSelected(const LLStringExplicit& label);
 	void			setDisabledLabel(const LLStringExplicit& disabled_label);
@@ -175,14 +175,14 @@ public:
 
 	void			setHoverGlowStrength(F32 strength) { mHoverGlowStrength = strength; }
 
-	void			setImageUnselected(const LLString &image_name);
-	const LLString& getImageUnselectedName() const { return mImageUnselectedName; }
-	void			setImageSelected(const LLString &image_name);
-	const LLString& getImageSelectedName() const { return mImageSelectedName; }
-	void			setImageHoverSelected(const LLString &image_name);
-	void			setImageHoverUnselected(const LLString &image_name);
-	void			setImageDisabled(const LLString &image_name);
-	void			setImageDisabledSelected(const LLString &image_name);
+	void			setImageUnselected(const std::string &image_name);
+	const std::string& getImageUnselectedName() const { return mImageUnselectedName; }
+	void			setImageSelected(const std::string &image_name);
+	const std::string& getImageSelectedName() const { return mImageSelectedName; }
+	void			setImageHoverSelected(const std::string &image_name);
+	void			setImageHoverUnselected(const std::string &image_name);
+	void			setImageDisabled(const std::string &image_name);
+	void			setImageDisabledSelected(const std::string &image_name);
 
 	void			setImageUnselected(LLPointer<LLUIImage> image);
 	void			setImageSelected(LLPointer<LLUIImage> image);
@@ -194,8 +194,8 @@ public:
 	void			setCommitOnReturn(BOOL commit) { mCommitOnReturn = commit; }
 	BOOL			getCommitOnReturn() const { return mCommitOnReturn; }
 
-	void			setHelpURLCallback(const LLString &help_url);
-	const LLString&	getHelpURL() const { return mHelpURL; }
+	void			setHelpURLCallback(const std::string &help_url);
+	const std::string&	getHelpURL() const { return mHelpURL; }
 
 protected:
 
@@ -257,16 +257,17 @@ private:
 	LLUUID			mImageHoverUnselectedID;
 	LLUUID			mImageDisabledID;
 	LLUUID			mImageDisabledSelectedID;
-	LLString		mImageUnselectedName;
-	LLString		mImageSelectedName;
-	LLString		mImageHoverSelectedName;
-	LLString		mImageHoverUnselectedName;
-	LLString		mImageDisabledName;
-	LLString		mImageDisabledSelectedName;
+	std::string		mImageUnselectedName;
+	std::string		mImageSelectedName;
+	std::string		mImageHoverSelectedName;
+	std::string		mImageHoverUnselectedName;
+	std::string		mImageDisabledName;
+	std::string		mImageDisabledSelectedName;
 
 	LLColor4		mHighlightColor;
 	LLColor4		mUnselectedBgColor;
 	LLColor4		mSelectedBgColor;
+	LLColor4		mFlashBgColor;
 
 	LLColor4		mImageColor;
 	LLColor4		mDisabledImageColor;
@@ -291,7 +292,7 @@ private:
 	BOOL			mNeedsHighlight;
 	BOOL			mCommitOnReturn;
 
-	LLString		mHelpURL;
+	std::string		mHelpURL;
 
 	LLPointer<LLUIImage> mImagep;
 
diff --git a/linden/indra/llui/llcallbackmap.h b/linden/indra/llui/llcallbackmap.h
index 9241751..6f2d3bf 100644
--- a/linden/indra/llui/llcallbackmap.h
+++ b/linden/indra/llui/llcallbackmap.h
@@ -41,7 +41,7 @@ public:
 	// callback definition.
 	typedef void* (*callback_t)(void* data);
 	
-	typedef std::map<LLString, LLCallbackMap> map_t;
+	typedef std::map<std::string, LLCallbackMap> map_t;
 	typedef map_t::iterator map_iter_t;
 	typedef map_t::const_iterator map_const_iter_t;
 
diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index 33de4da..d383640 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -51,14 +51,14 @@ const U32 MAX_STRING_LENGTH = 10;
 static LLRegisterWidget<LLCheckBoxCtrl> r("check_box");
 
  
-LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect, 
-							    const LLString& label, 
+LLCheckBoxCtrl::LLCheckBoxCtrl(const std::string& name, const LLRect& rect, 
+							    const std::string& label, 
 								const LLFontGL* font,
 								void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
 								void* callback_user_data,
 								BOOL initial_value,
 								BOOL use_radio_style,
-								const LLString& control_which)
+								const std::string& control_which)
 :	LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data, FOLLOWS_LEFT | FOLLOWS_TOP),
 	mTextEnabledColor( LLUI::sColorsGroup->getColor( "LabelTextColor" ) ),
 	mTextDisabledColor( LLUI::sColorsGroup->getColor( "LabelDisabledColor" ) ),
@@ -93,13 +93,13 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
 
 	// *HACK Get rid of this with SL-55508... 
 	// this allows blank check boxes and radio boxes for now
-	LLString local_label = label;
+	std::string local_label = label;
 	if(local_label.empty())
 	{
 		local_label = " ";
 	}
 
-	mLabel = new LLTextBox( "CheckboxCtrl Label", label_rect, local_label.c_str(), mFont );
+	mLabel = new LLTextBox( std::string("CheckboxCtrl Label"), label_rect, local_label, mFont );
 	mLabel->setFollowsLeft();
 	mLabel->setFollowsBottom();
 	addChild(mLabel);
@@ -112,18 +112,17 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
 		LLCHECKBOXCTRL_VPAD,
 		LLCHECKBOXCTRL_BTN_SIZE + LLCHECKBOXCTRL_SPACING + text_width + LLCHECKBOXCTRL_HPAD,
 		llmax( text_height, LLCHECKBOXCTRL_BTN_SIZE ) + LLCHECKBOXCTRL_VPAD);
-	LLString active_true_id, active_false_id;
-	LLString inactive_true_id, inactive_false_id;
+	std::string active_true_id, active_false_id;
+	std::string inactive_true_id, inactive_false_id;
 	if (mRadioStyle)
 	{
 		active_true_id = "UIImgRadioActiveSelectedUUID";
 		active_false_id = "UIImgRadioActiveUUID";
 		inactive_true_id = "UIImgRadioInactiveSelectedUUID";
 		inactive_false_id = "UIImgRadioInactiveUUID";
-		mButton = new LLButton(
-			"Radio control button", btn_rect,
-			active_false_id, active_true_id, control_which,
-			&LLCheckBoxCtrl::onButtonPress, this, LLFontGL::sSansSerif ); 
+		mButton = new LLButton(std::string("Radio control button"), btn_rect,
+							   active_false_id, active_true_id, control_which,
+							   &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::sSansSerif ); 
 		mButton->setDisabledImages( inactive_false_id, inactive_true_id );
 		mButton->setHoverGlowStrength(0.35f);
 	}
@@ -133,10 +132,9 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
 		active_true_id = "UIImgCheckboxActiveSelectedUUID";
 		inactive_true_id = "UIImgCheckboxInactiveSelectedUUID";
 		inactive_false_id = "UIImgCheckboxInactiveUUID";
-		mButton = new LLButton(
-			"Checkbox control button", btn_rect,
-			active_false_id, active_true_id, control_which,
-			&LLCheckBoxCtrl::onButtonPress, this, LLFontGL::sSansSerif ); 
+		mButton = new LLButton(std::string("Checkbox control button"), btn_rect,
+							   active_false_id, active_true_id, control_which,
+							   &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::sSansSerif ); 
 		mButton->setDisabledImages( inactive_false_id, inactive_true_id );
 		mButton->setHoverGlowStrength(0.35f);
 	}
@@ -253,12 +251,12 @@ void LLCheckBoxCtrl::setLabel( const LLStringExplicit& label )
 	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
 }
 
-LLString LLCheckBoxCtrl::getLabel() const
+std::string LLCheckBoxCtrl::getLabel() const
 {
 	return mLabel->getText();
 }
 
-BOOL LLCheckBoxCtrl::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLCheckBoxCtrl::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	BOOL res = mLabel->setTextArg(key, text);
 	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
@@ -266,13 +264,13 @@ BOOL LLCheckBoxCtrl::setLabelArg( const LLString& key, const LLStringExplicit& t
 }
 
 //virtual
-LLString LLCheckBoxCtrl::getControlName() const
+std::string LLCheckBoxCtrl::getControlName() const
 {
 	return mButton->getControlName();
 }
 
 // virtual
-void LLCheckBoxCtrl::setControlName(const LLString& control_name, LLView* context)
+void LLCheckBoxCtrl::setControlName(const std::string& control_name, LLView* context)
 {
 	mButton->setControlName(control_name, context);
 }
@@ -307,7 +305,7 @@ LLXMLNodePtr LLCheckBoxCtrl::getXML(bool save_children) const
 
 	node->createChild("label", TRUE)->setStringValue(mLabel->getText());
 
-	LLString control_name = mButton->getControlName();
+	std::string control_name = mButton->getControlName();
 	
 	node->createChild("initial_value", TRUE)->setBoolValue(mInitialValue);
 
@@ -321,10 +319,10 @@ LLXMLNodePtr LLCheckBoxCtrl::getXML(bool save_children) const
 // static
 LLView* LLCheckBoxCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("checkbox");
+	std::string name("checkbox");
 	node->getAttributeString("name", name);
 
-	LLString label("");
+	std::string label("");
 	node->getAttributeString("label", label);
 
 	LLFontGL* font = LLView::selectFont(node);
diff --git a/linden/indra/llui/llcheckboxctrl.h b/linden/indra/llui/llcheckboxctrl.h
index 6518272..659ba82 100644
--- a/linden/indra/llui/llcheckboxctrl.h
+++ b/linden/indra/llui/llcheckboxctrl.h
@@ -65,13 +65,13 @@ class LLCheckBoxCtrl
 : public LLUICtrl
 {
 public:
-	LLCheckBoxCtrl(const LLString& name, const LLRect& rect, const LLString& label,	
+	LLCheckBoxCtrl(const std::string& name, const LLRect& rect, const std::string& label,	
 		const LLFontGL* font = NULL,
 		void (*commit_callback)(LLUICtrl*, void*) = NULL,
 		void* callback_userdata = NULL,
 		BOOL initial_value = FALSE,
 		BOOL use_radio_style = FALSE, // if true, draw radio button style icons
-		const LLString& control_which = LLString::null);
+		const std::string& control_which = LLStringUtil::null);
 	virtual ~LLCheckBoxCtrl();
 
 	// LLView interface
@@ -93,7 +93,7 @@ public:
 	virtual void		setTentative(BOOL b)	{ mButton->setTentative(b); }
 	virtual BOOL		getTentative() const	{ return mButton->getTentative(); }
 
-	virtual BOOL		setLabelArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL		setLabelArg( const std::string& key, const LLStringExplicit& text );
 
 	virtual void		clear();
 	virtual void		onCommit();
@@ -105,10 +105,10 @@ public:
 	void				setDisabledColor( const LLColor4 &color ) { mTextDisabledColor = color; }
 
 	void				setLabel( const LLStringExplicit& label );
-	LLString			getLabel() const;
+	std::string			getLabel() const;
 
-	virtual void		setControlName(const LLString& control_name, LLView* context);
-	virtual LLString 	getControlName() const;
+	virtual void		setControlName(const std::string& control_name, LLView* context);
+	virtual std::string 	getControlName() const;
 
 	static void			onButtonPress(void *userdata);
 
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index d5edba7..48050db 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -59,7 +59,7 @@ S32 MAX_COMBO_WIDTH = 500;
 
 static LLRegisterWidget<LLComboBox> r1("combo_box");
 
-LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString& label,
+LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::string& label,
 	void (*commit_callback)(LLUICtrl*,void*),
 	void *callback_userdata
 	)
@@ -78,12 +78,12 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
 	// Text label button
 	mButton = new LLButton(label,
 								LLRect(), 
-								LLString::null,
+								LLStringUtil::null,
 								NULL, this);
-	mButton->setImageUnselected("square_btn_32x128.tga");
-	mButton->setImageSelected("square_btn_selected_32x128.tga");
-	mButton->setImageDisabled("square_btn_32x128.tga");
-	mButton->setImageDisabledSelected("square_btn_selected_32x128.tga");
+	mButton->setImageUnselected(std::string("square_btn_32x128.tga"));
+	mButton->setImageSelected(std::string("square_btn_selected_32x128.tga"));
+	mButton->setImageDisabled(std::string("square_btn_32x128.tga"));
+	mButton->setImageDisabledSelected(std::string("square_btn_selected_32x128.tga"));
 	mButton->setScaleImage(TRUE);
 
 	mButton->setMouseDownCallback(onButtonDown);
@@ -94,9 +94,8 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
 	addChild(mButton);
 
 	// disallow multiple selection
-	mList = new LLScrollListCtrl(
-		"ComboBox", LLRect(), 
-		&LLComboBox::onItemSelected, this, FALSE);
+	mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), 
+								 &LLComboBox::onItemSelected, this, FALSE);
 	mList->setVisible(FALSE);
 	mList->setBgWriteableColor( LLColor4(1,1,1,1) );
 	mList->setCommitOnKeyboardMovement(FALSE);
@@ -149,10 +148,10 @@ LLXMLNodePtr LLComboBox::getXML(bool save_children) const
 // static
 LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("combo_box");
+	std::string name("combo_box");
 	node->getAttributeString("name", name);
 
-	LLString label("");
+	std::string label("");
 	node->getAttributeString("label", label);
 
 	LLRect rect;
@@ -175,7 +174,7 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
 
 	combo_box->initFromXML(node, parent);
 
-	const LLString& contents = node->getValue();
+	const std::string& contents = node->getValue();
 
 	if (contents.find_first_not_of(" \n\t") != contents.npos)
 	{
@@ -188,9 +187,9 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
 		{
 			if (child->hasName("combo_item"))
 			{
-				LLString label = child->getTextContents();
+				std::string label = child->getTextContents();
 
-				LLString value = label;
+				std::string value = label;
 				child->getAttributeString("value", value);
 
 				combo_box->add(label, LLSD(value) );
@@ -213,12 +212,12 @@ void LLComboBox::clear()
 { 
 	if (mTextEntry)
 	{
-		mTextEntry->setText(LLString::null);
+		mTextEntry->setText(LLStringUtil::null);
 	}
-	mButton->setLabelSelected(LLString::null);
-	mButton->setLabelUnselected(LLString::null);
-	mButton->setDisabledLabel(LLString::null);
-	mButton->setDisabledSelectedLabel(LLString::null);
+	mButton->setLabelSelected(LLStringUtil::null);
+	mButton->setLabelUnselected(LLStringUtil::null);
+	mButton->setDisabledLabel(LLStringUtil::null);
+	mButton->setDisabledSelectedLabel(LLStringUtil::null);
 	mList->deselectAllItems();
 }
 
@@ -256,7 +255,7 @@ void	LLComboBox::resetDirty()
 
 
 // add item "name" to menu
-LLScrollListItem* LLComboBox::add(const LLString& name, EAddPosition pos, BOOL enabled)
+LLScrollListItem* LLComboBox::add(const std::string& name, EAddPosition pos, BOOL enabled)
 {
 	LLScrollListItem* item = mList->addSimpleElement(name, pos);
 	item->setEnabled(enabled);
@@ -265,7 +264,7 @@ LLScrollListItem* LLComboBox::add(const LLString& name, EAddPosition pos, BOOL e
 }
 
 // add item "name" with a unique id to menu
-LLScrollListItem* LLComboBox::add(const LLString& name, const LLUUID& id, EAddPosition pos, BOOL enabled )
+LLScrollListItem* LLComboBox::add(const std::string& name, const LLUUID& id, EAddPosition pos, BOOL enabled )
 {
 	LLScrollListItem* item = mList->addSimpleElement(name, pos, id);
 	item->setEnabled(enabled);
@@ -274,7 +273,7 @@ LLScrollListItem* LLComboBox::add(const LLString& name, const LLUUID& id, EAddPo
 }
 
 // add item "name" with attached userdata
-LLScrollListItem* LLComboBox::add(const LLString& name, void* userdata, EAddPosition pos, BOOL enabled )
+LLScrollListItem* LLComboBox::add(const std::string& name, void* userdata, EAddPosition pos, BOOL enabled )
 {
 	LLScrollListItem* item = mList->addSimpleElement(name, pos);
 	item->setEnabled(enabled);
@@ -284,7 +283,7 @@ LLScrollListItem* LLComboBox::add(const LLString& name, void* userdata, EAddPosi
 }
 
 // add item "name" with attached generic data
-LLScrollListItem* LLComboBox::add(const LLString& name, LLSD value, EAddPosition pos, BOOL enabled )
+LLScrollListItem* LLComboBox::add(const std::string& name, LLSD value, EAddPosition pos, BOOL enabled )
 {
 	LLScrollListItem* item = mList->addSimpleElement(name, pos, value);
 	item->setEnabled(enabled);
@@ -299,7 +298,7 @@ LLScrollListItem* LLComboBox::addSeparator(EAddPosition pos)
 
 void LLComboBox::sortByName()
 {
-	mList->sortByColumn(0, TRUE);
+	mList->sortByColumnIndex(0, TRUE);
 }
 
 
@@ -331,9 +330,9 @@ void LLComboBox::setValue(const LLSD& value)
 	}
 }
 
-const LLString LLComboBox::getSimple() const
+const std::string LLComboBox::getSimple() const
 {
-	const LLString res = mList->getSelectedItemLabel();
+	const std::string res = mList->getSelectedItemLabel();
 	if (res.empty() && mAllowTextEntry)
 	{
 		return mTextEntry->getText();
@@ -344,7 +343,7 @@ const LLString LLComboBox::getSimple() const
 	}
 }
 
-const LLString LLComboBox::getSelectedItemLabel(S32 column) const
+const std::string LLComboBox::getSelectedItemLabel(S32 column) const
 {
 	return mList->getSelectedItemLabel(column);
 }
@@ -392,7 +391,7 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
 }
 
 
-BOOL LLComboBox::remove(const LLString& name)
+BOOL LLComboBox::remove(const std::string& name)
 {
 	BOOL found = mList->selectItemByLabel(name);
 
@@ -495,10 +494,10 @@ void LLComboBox::updateLayout()
 			LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
 			text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
 			// clear label on button
-			LLString cur_label = mButton->getLabelSelected();
-			mTextEntry = new LLLineEditor("combo_text_entry",
+			std::string cur_label = mButton->getLabelSelected();
+			mTextEntry = new LLLineEditor(std::string("combo_text_entry"),
 										text_entry_rect,
-										"",
+										LLStringUtil::null,
 										LLFontGL::sSansSerifSmall,
 										mMaxChars,
 										onTextCommit,
@@ -520,7 +519,7 @@ void LLComboBox::updateLayout()
 		}
 
 		// clear label on button
-		setLabel(LLString::null);
+		setLabel(LLStringUtil::null);
 
 		mButton->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP | FOLLOWS_RIGHT);
 	}
@@ -647,7 +646,7 @@ void LLComboBox::showList()
 void LLComboBox::hideList()
 {
 	//*HACK: store the original value explicitly somewhere, not just in label
-	LLString orig_selection = mAllowTextEntry ? mTextEntry->getText() : mButton->getLabelSelected();
+	std::string orig_selection = mAllowTextEntry ? mTextEntry->getText() : mButton->getLabelSelected();
 
 	// assert selection in list
 	mList->selectItemByLabel(orig_selection, FALSE);
@@ -712,7 +711,7 @@ void LLComboBox::onItemSelected(LLUICtrl* item, void *userdata)
 	// Note: item is the LLScrollListCtrl
 	LLComboBox *self = (LLComboBox *) userdata;
 
-	const LLString name = self->mList->getSelectedItemLabel();
+	const std::string name = self->mList->getSelectedItemLabel();
 
 	S32 cur_id = self->getCurrentIndex();
 	if (cur_id != -1)
@@ -733,9 +732,9 @@ void LLComboBox::onItemSelected(LLUICtrl* item, void *userdata)
 	self->onCommit();
 }
 
-BOOL LLComboBox::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLComboBox::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
-    LLString tool_tip;
+    std::string tool_tip;
 
 	if(LLUICtrl::handleToolTip(x, y, msg, sticky_rect_screen))
 	{
@@ -775,6 +774,12 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
 	BOOL result = FALSE;
 	if (hasFocus())
 	{
+		if (mList->getVisible() 
+			&& key == KEY_ESCAPE && mask == MASK_NONE)
+		{
+			hideList();
+			return TRUE;
+		}
 		//give list a chance to pop up and handle key
 		LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
 		if (last_selected_item)
@@ -925,7 +930,7 @@ void LLComboBox::updateSelection()
 	// user-entered portion of string, based on assumption that any selected
     // text was a result of auto-completion
 	LLWString user_wstring = mTextEntry->hasSelection() ? left_wstring : mTextEntry->getWText();
-	LLString full_string = mTextEntry->getText();
+	std::string full_string = mTextEntry->getText();
 
 	// go ahead and arrange drop down list on first typed character, even
 	// though we aren't showing it... some code relies on prearrange
@@ -963,7 +968,7 @@ void LLComboBox::updateSelection()
 void LLComboBox::onTextCommit(LLUICtrl* caller, void* user_data)
 {
 	LLComboBox* self = (LLComboBox*)user_data;
-	LLString text = self->mTextEntry->getText();
+	std::string text = self->mTextEntry->getText();
 	self->setSimple(text);
 	self->onCommit();
 	self->mTextEntry->selectAll();
@@ -1002,7 +1007,7 @@ void LLComboBox::clearColumns()
 	mList->clearColumns();
 }
 
-void LLComboBox::setColumnLabel(const LLString& column, const LLString& label)
+void LLComboBox::setColumnLabel(const std::string& column, const std::string& label)
 {
 	mList->setColumnLabel(column, label);
 }
@@ -1012,7 +1017,7 @@ LLScrollListItem* LLComboBox::addElement(const LLSD& value, EAddPosition pos, vo
 	return mList->addElement(value, pos, userdata);
 }
 
-LLScrollListItem* LLComboBox::addSimpleElement(const LLString& value, EAddPosition pos, const LLSD& id)
+LLScrollListItem* LLComboBox::addSimpleElement(const std::string& value, EAddPosition pos, const LLSD& id)
 {
 	return mList->addSimpleElement(value, pos, id);
 }
@@ -1022,8 +1027,9 @@ void LLComboBox::clearRows()
 	mList->clearRows();
 }
 
-void LLComboBox::sortByColumn(LLString name, BOOL ascending)
+void LLComboBox::sortByColumn(const std::string& name, BOOL ascending)
 {
+	mList->sortByColumn(name, ascending);
 }
 
 //============================================================================
@@ -1100,19 +1106,19 @@ static LLRegisterWidget<LLFlyoutButton> r2("flyout_button");
 const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24;
 
 LLFlyoutButton::LLFlyoutButton(
-		const LLString& name, 
+		const std::string& name, 
 		const LLRect &rect,
-		const LLString& label,
+		const std::string& label,
 		void (*commit_callback)(LLUICtrl*, void*) ,
 		void *callback_userdata)
-:		LLComboBox(name, rect, LLString::null, commit_callback, callback_userdata),
+:		LLComboBox(name, rect, LLStringUtil::null, commit_callback, callback_userdata),
 		mToggleState(FALSE),
 		mActionButton(NULL)
 {
 	// Always use text box 
 	// Text label button
 	mActionButton = new LLButton(label,
-					LLRect(), LLString::null, NULL, this);
+					LLRect(), LLStringUtil::null, NULL, this);
 	mActionButton->setScaleImage(TRUE);
 
 	mActionButton->setClickedCallback(onActionButtonClick);
@@ -1145,10 +1151,10 @@ LLFlyoutButton::LLFlyoutButton(
 //static 
 LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name = "flyout_button";
+	std::string name = "flyout_button";
 	node->getAttributeString("name", name);
 
-	LLString label("");
+	std::string label("");
 	node->getAttributeString("label", label);
 
 	LLRect rect;
@@ -1162,7 +1168,7 @@ LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 							callback,
 							NULL);
 
-	LLString list_position;
+	std::string list_position;
 	node->getAttributeString("list_position", list_position);
 	if (list_position == "below")
 	{
@@ -1181,9 +1187,9 @@ LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 	{
 		if (child->hasName("flyout_button_item"))
 		{
-			LLString label = child->getTextContents();
+			std::string label = child->getTextContents();
 
-			LLString value = label;
+			std::string value = label;
 			child->getAttributeString("value", value);
 
 			flyout_button->add(label, LLSD(value) );
@@ -1225,7 +1231,7 @@ void LLFlyoutButton::draw()
 
 	//FIXME: this should be an attribute of comboboxes, whether they have a distinct label or
 	// the label reflects the last selected item, for now we have to manually remove the label
-	mButton->setLabel(LLString::null);
+	mButton->setLabel(LLStringUtil::null);
 	LLComboBox::draw();	
 }
 
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index b35d078..a9dc1c1 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -64,9 +64,9 @@ public:
 	} EPreferredPosition;
 
 	LLComboBox(
-		const LLString& name, 
+		const std::string& name, 
 		const LLRect &rect,
-		const LLString& label,
+		const std::string& label,
 		void (*commit_callback)(LLUICtrl*, void*) = NULL,
 		void *callback_userdata = NULL
 		);
@@ -83,7 +83,7 @@ public:
 
 	virtual void	setEnabled(BOOL enabled);
 
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
 	virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
 
@@ -107,10 +107,10 @@ public:
 	void			setAllowTextEntry(BOOL allow, S32 max_chars = 50, BOOL make_tentative = TRUE);
 	void			setTextEntry(const LLStringExplicit& text);
 
-	LLScrollListItem*	add(const LLString& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);	// add item "name" to menu
-	LLScrollListItem*	add(const LLString& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-	LLScrollListItem*	add(const LLString& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-	LLScrollListItem*	add(const LLString& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+	LLScrollListItem*	add(const std::string& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);	// add item "name" to menu
+	LLScrollListItem*	add(const std::string& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+	LLScrollListItem*	add(const std::string& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+	LLScrollListItem*	add(const std::string& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
 	LLScrollListItem*	addSeparator(EAddPosition pos = ADD_BOTTOM);
 	BOOL			remove( S32 index );	// remove item by index, return TRUE if found and removed
 	void			removeall() { clearRows(); }
@@ -120,15 +120,15 @@ public:
 	// Select current item by name using selectItemByLabel.  Returns FALSE if not found.
 	BOOL			setSimple(const LLStringExplicit& name);
 	// Get name of current item. Returns an empty string if not found.
-	const LLString	getSimple() const;
+	const std::string	getSimple() const;
 	// Get contents of column x of selected row
-	const LLString getSelectedItemLabel(S32 column = 0) const;
+	const std::string getSelectedItemLabel(S32 column = 0) const;
 
 	// Sets the label, which doesn't have to exist in the label.
 	// This is probably a UI abuse.
 	void			setLabel(const LLStringExplicit& name);
 
-	BOOL			remove(const LLString& name);	// remove item "name", return TRUE if found and removed
+	BOOL			remove(const std::string& name);	// remove item "name", return TRUE if found and removed
 	
 	BOOL			setCurrentByIndex( S32 index );
 	S32				getCurrentIndex() const;
@@ -145,11 +145,11 @@ public:
 	// Overwrites the default column (See LLScrollListCtrl for format)
 	virtual void 	addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM);
 	virtual void 	clearColumns();
-	virtual void	setColumnLabel(const LLString& column, const LLString& label);
+	virtual void	setColumnLabel(const std::string& column, const std::string& label);
 	virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
-	virtual LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
+	virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
 	virtual void 	clearRows();
-	virtual void 	sortByColumn(LLString name, BOOL ascending);
+	virtual void 	sortByColumn(const std::string& name, BOOL ascending);
 
 	// LLCtrlSelectionInterface functions
 	virtual BOOL	getCanSelect() const				{ return TRUE; }
@@ -203,9 +203,9 @@ class LLFlyoutButton : public LLComboBox
 {
 public:
 	LLFlyoutButton(
-		const LLString& name, 
+		const std::string& name, 
 		const LLRect &rect,
-		const LLString& label,
+		const std::string& label,
 		void (*commit_callback)(LLUICtrl*, void*) = NULL,
 		void *callback_userdata = NULL);
 
diff --git a/linden/indra/llui/llctrlselectioninterface.cpp b/linden/indra/llui/llctrlselectioninterface.cpp
index 996f5b3..3ef0f83 100644
--- a/linden/indra/llui/llctrlselectioninterface.cpp
+++ b/linden/indra/llui/llctrlselectioninterface.cpp
@@ -53,12 +53,12 @@ BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value)
 LLCtrlListInterface::~LLCtrlListInterface()
 { }
 
-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value)
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const std::string& value)
 {
 	return addSimpleElement(value, ADD_BOTTOM, LLSD());
 }
 
-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value, EAddPosition pos)
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const std::string& value, EAddPosition pos)
 {
 	return addSimpleElement(value, pos, LLSD());
 }
diff --git a/linden/indra/llui/llctrlselectioninterface.h b/linden/indra/llui/llctrlselectioninterface.h
index f303861..67743de 100644
--- a/linden/indra/llui/llctrlselectioninterface.h
+++ b/linden/indra/llui/llctrlselectioninterface.h
@@ -84,16 +84,16 @@ public:
 	
 	virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM) = 0;
 	virtual void clearColumns() = 0;
-	virtual void setColumnLabel(const LLString& column, const LLString& label) = 0;
+	virtual void setColumnLabel(const std::string& column, const std::string& label) = 0;
 	// TomY TODO: Document this
 	virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL) = 0;
 
-	LLScrollListItem* addSimpleElement(const LLString& value); // defaults to bottom
-	LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos); // defaults to no LLSD() id
-	virtual LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos, const LLSD& id) = 0;
+	LLScrollListItem* addSimpleElement(const std::string& value); // defaults to bottom
+	LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos); // defaults to no LLSD() id
+	virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos, const LLSD& id) = 0;
 
 	virtual void clearRows() = 0;
-	virtual void sortByColumn(LLString name, BOOL ascending) = 0;
+	virtual void sortByColumn(const std::string& name, BOOL ascending) = 0;
 };
 
 class LLCtrlScrollInterface
diff --git a/linden/indra/llui/lldraghandle.cpp b/linden/indra/llui/lldraghandle.cpp
index f033371..bec2da5 100644
--- a/linden/indra/llui/lldraghandle.cpp
+++ b/linden/indra/llui/lldraghandle.cpp
@@ -55,7 +55,7 @@ const S32 RIGHT_PAD = BORDER_PAD + 32; // HACK: space for close btn and minimize
 
 S32 LLDragHandle::sSnapMargin = 5;
 
-LLDragHandle::LLDragHandle( const LLString& name, const LLRect& rect, const LLString& title )
+LLDragHandle::LLDragHandle( const std::string& name, const LLRect& rect, const std::string& title )
 :	LLView( name, rect, TRUE ),
 	mDragLastScreenX( 0 ),
 	mDragLastScreenY( 0 ),
@@ -94,27 +94,27 @@ void LLDragHandle::setTitleBox(LLTextBox* titlebox)
 	}
 }
 
-LLDragHandleTop::LLDragHandleTop(const LLString& name, const LLRect &rect, const LLString& title)
+LLDragHandleTop::LLDragHandleTop(const std::string& name, const LLRect &rect, const std::string& title)
 :	LLDragHandle(name, rect, title)
 {
 	setFollowsAll();
 	setTitle( title );
 }
 
-LLDragHandleLeft::LLDragHandleLeft(const LLString& name, const LLRect &rect, const LLString& title)
+LLDragHandleLeft::LLDragHandleLeft(const std::string& name, const LLRect &rect, const std::string& title)
 :	LLDragHandle(name, rect, title)
 {
 	setFollowsAll();
 	setTitle( title );
 }
 
-void LLDragHandleTop::setTitle(const LLString& title)
+void LLDragHandleTop::setTitle(const std::string& title)
 {
-	LLString trimmed_title = title;
-	LLString::trim(trimmed_title);
+	std::string trimmed_title = title;
+	LLStringUtil::trim(trimmed_title);
 
 	const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
-	LLTextBox* titlebox = new LLTextBox( "Drag Handle Title", getRect(), trimmed_title, font );
+	LLTextBox* titlebox = new LLTextBox( std::string("Drag Handle Title"), getRect(), trimmed_title, font );
 	titlebox->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT);
 	titlebox->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
 	
@@ -123,22 +123,22 @@ void LLDragHandleTop::setTitle(const LLString& title)
 }
 
 
-const LLString& LLDragHandleTop::getTitle() const
+const std::string& LLDragHandleTop::getTitle() const
 {
-	return getTitleBox() == NULL ? LLString::null : getTitleBox()->getText();
+	return getTitleBox() == NULL ? LLStringUtil::null : getTitleBox()->getText();
 }
 
 
-void LLDragHandleLeft::setTitle(const LLString& )
+void LLDragHandleLeft::setTitle(const std::string& )
 {
 	setTitleBox(NULL);
 	/* no title on left edge */
 }
 
 
-const LLString& LLDragHandleLeft::getTitle() const
+const std::string& LLDragHandleLeft::getTitle() const
 {
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
 
diff --git a/linden/indra/llui/lldraghandle.h b/linden/indra/llui/lldraghandle.h
index fc10639..6882c7f 100644
--- a/linden/indra/llui/lldraghandle.h
+++ b/linden/indra/llui/lldraghandle.h
@@ -44,7 +44,7 @@ class LLTextBox;
 class LLDragHandle : public LLView
 {
 public:
-	LLDragHandle(const LLString& name, const LLRect& rect, const LLString& title );
+	LLDragHandle(const std::string& name, const LLRect& rect, const std::string& title );
 	virtual ~LLDragHandle() { setTitleBox(NULL); }
 
 	virtual void setValue(const LLSD& value);
@@ -55,8 +55,8 @@ public:
 	S32				getMaxTitleWidth() const { return mMaxTitleWidth; }
 	void			setTitleVisible(BOOL visible);
 
-	virtual void	setTitle( const LLString& title ) = 0;
-	virtual const LLString&	getTitle() const = 0;
+	virtual void	setTitle( const std::string& title ) = 0;
+	virtual const std::string&	getTitle() const = 0;
 
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
@@ -88,10 +88,10 @@ class LLDragHandleTop
 : public LLDragHandle
 {
 public:
-	LLDragHandleTop(const LLString& name, const LLRect& rect, const LLString& title );
+	LLDragHandleTop(const std::string& name, const LLRect& rect, const std::string& title );
 
-	virtual void	setTitle( const LLString& title );
-	virtual const LLString& getTitle() const;
+	virtual void	setTitle( const std::string& title );
+	virtual const std::string& getTitle() const;
 	virtual void	draw();
 	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
@@ -105,10 +105,10 @@ class LLDragHandleLeft
 : public LLDragHandle
 {
 public:
-	LLDragHandleLeft(const LLString& name, const LLRect& rect, const LLString& title );
+	LLDragHandleLeft(const std::string& name, const LLRect& rect, const std::string& title );
 
-	virtual void	setTitle( const LLString& title );
-	virtual const LLString& getTitle() const;
+	virtual void	setTitle( const std::string& title );
+	virtual const std::string& getTitle() const;
 	virtual void	draw();
 	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 759fae0..e795ad2 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -56,14 +56,12 @@
 #include "lltabcontainer.h"
 #include "v2math.h"
 
-extern BOOL gNoRender;
-
 const S32 MINIMIZED_WIDTH = 160;
 const S32 CLOSE_BOX_FROM_TOP = 1;
 // use this to control "jumping" behavior when Ctrl-Tabbing
 const S32 TABBED_FLOATER_OFFSET = 0;
 
-LLString	LLFloater::sButtonActiveImageNames[BUTTON_COUNT] = 
+std::string	LLFloater::sButtonActiveImageNames[BUTTON_COUNT] = 
 {
 	"UIImgBtnCloseActiveUUID",		//BUTTON_CLOSE
 	"UIImgBtnRestoreActiveUUID",	//BUTTON_RESTORE
@@ -72,7 +70,7 @@ LLString	LLFloater::sButtonActiveImageNames[BUTTON_COUNT] =
 	"UIImgBtnCloseActiveUUID",		//BUTTON_EDIT
 };
 
-LLString	LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] = 
+std::string	LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] = 
 {
 	"UIImgBtnCloseInactiveUUID",	//BUTTON_CLOSE
 	"UIImgBtnRestoreInactiveUUID",	//BUTTON_RESTORE
@@ -81,7 +79,7 @@ LLString	LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] =
 	"UIImgBtnCloseInactiveUUID",	//BUTTON_EDIT
 };
 
-LLString	LLFloater::sButtonPressedImageNames[BUTTON_COUNT] = 
+std::string	LLFloater::sButtonPressedImageNames[BUTTON_COUNT] = 
 {
 	"UIImgBtnClosePressedUUID",		//BUTTON_CLOSE
 	"UIImgBtnRestorePressedUUID",	//BUTTON_RESTORE
@@ -90,7 +88,7 @@ LLString	LLFloater::sButtonPressedImageNames[BUTTON_COUNT] =
 	"UIImgBtnClosePressedUUID",		//BUTTON_EDIT
 };
 
-LLString	LLFloater::sButtonNames[BUTTON_COUNT] = 
+std::string	LLFloater::sButtonNames[BUTTON_COUNT] = 
 {
 	"llfloater_close_btn",	//BUTTON_CLOSE
 	"llfloater_restore_btn",	//BUTTON_RESTORE
@@ -99,7 +97,7 @@ LLString	LLFloater::sButtonNames[BUTTON_COUNT] =
 	"llfloater_edit_btn",		//BUTTON_EDIT
 };
 
-LLString	LLFloater::sButtonToolTips[BUTTON_COUNT] = 
+std::string	LLFloater::sButtonToolTips[BUTTON_COUNT] = 
 {
 #ifdef LL_DARWIN
 	"Close (Cmd-W)",	//BUTTON_CLOSE
@@ -145,7 +143,7 @@ LLFloater::LLFloater() :
 	mHandle.bind(this);
 }
 
-LLFloater::LLFloater(const LLString& name)
+LLFloater::LLFloater(const std::string& name)
 :	LLPanel(name), mAutoFocus(TRUE) // automatically take focus when opened
 {
 	for (S32 i = 0; i < BUTTON_COUNT; i++)
@@ -153,12 +151,12 @@ LLFloater::LLFloater(const LLString& name)
 		mButtonsEnabled[i] = FALSE;
 		mButtons[i] = NULL;
 	}
-	LLString title; // null string
+	std::string title; // null string
 	initFloater(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults
 }
 
 
-LLFloater::LLFloater(const LLString& name, const LLRect& rect, const LLString& title, 
+LLFloater::LLFloater(const std::string& name, const LLRect& rect, const std::string& title, 
 	BOOL resizable, 
 	S32 min_width, 
 	S32 min_height,
@@ -176,7 +174,7 @@ LLFloater::LLFloater(const LLString& name, const LLRect& rect, const LLString& t
 	initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
 }
 
-LLFloater::LLFloater(const LLString& name, const LLString& rect_control, const LLString& title, 
+LLFloater::LLFloater(const std::string& name, const std::string& rect_control, const std::string& title, 
 	BOOL resizable, 
 	S32 min_width, 
 	S32 min_height,
@@ -196,7 +194,7 @@ LLFloater::LLFloater(const LLString& name, const LLString& rect_control, const L
 
 
 // Note: Floaters constructed from XML call init() twice!
-void LLFloater::initFloater(const LLString& title,
+void LLFloater::initFloater(const std::string& title,
 					 BOOL resizable, S32 min_width, S32 min_height,
 					 BOOL drag_on_left, BOOL minimizable, BOOL close_btn)
 {
@@ -291,12 +289,12 @@ void LLFloater::initFloater(const LLString& title,
 			0, 0,
 			DRAG_HANDLE_WIDTH,
 			getRect().getHeight() - LLPANEL_BORDER_WIDTH - close_box_size);
-		mDragHandle = new LLDragHandleLeft("drag", drag_handle_rect, title );
+		mDragHandle = new LLDragHandleLeft(std::string("drag"), drag_handle_rect, title );
 	}
 	else // drag on top
 	{
 		LLRect drag_handle_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
-		mDragHandle = new LLDragHandleTop( "Drag Handle", drag_handle_rect, title );
+		mDragHandle = new LLDragHandleTop( std::string("Drag Handle"), drag_handle_rect, title );
 	}
 	addChild(mDragHandle);
 
@@ -310,28 +308,28 @@ void LLFloater::initFloater(const LLString& title,
 		// Resize bars (sides)
 		const S32 RESIZE_BAR_THICKNESS = 3;
 		mResizeBar[LLResizeBar::LEFT] = new LLResizeBar( 
-			"resizebar_left",
+			std::string("resizebar_left"),
 			this,
 			LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0), 
 			min_width, S32_MAX, LLResizeBar::LEFT );
 		addChild( mResizeBar[0] );
 
 		mResizeBar[LLResizeBar::TOP] = new LLResizeBar( 
-			"resizebar_top",
+			std::string("resizebar_top"),
 			this,
 			LLRect( 0, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_BAR_THICKNESS), 
 			min_height, S32_MAX, LLResizeBar::TOP );
 		addChild( mResizeBar[1] );
 
 		mResizeBar[LLResizeBar::RIGHT] = new LLResizeBar( 
-			"resizebar_right",
+			std::string("resizebar_right"),
 			this,
 			LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0), 
 			min_width, S32_MAX, LLResizeBar::RIGHT );
 		addChild( mResizeBar[2] );
 
 		mResizeBar[LLResizeBar::BOTTOM] = new LLResizeBar( 
-			"resizebar_bottom",
+			std::string("resizebar_bottom"),
 			this,
 			LLRect( 0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0), 
 			min_height, S32_MAX, LLResizeBar::BOTTOM );
@@ -340,28 +338,29 @@ void LLFloater::initFloater(const LLString& title,
 
 		// Resize handles (corners)
 		mResizeHandle[0] = new LLResizeHandle( 
-			"Resize Handle",
+			std::string("Resize Handle"),
 			LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT, getRect().getWidth(), 0),
 			min_width,
 			min_height,
 			LLResizeHandle::RIGHT_BOTTOM);
 		addChild(mResizeHandle[0]);
 
-		mResizeHandle[1] = new LLResizeHandle( "resize", 
+		mResizeHandle[1] = new LLResizeHandle(
+			std::string("resize"), 
 			LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_HANDLE_HEIGHT),
 			min_width,
 			min_height,
 			LLResizeHandle::RIGHT_TOP );
 		addChild(mResizeHandle[1]);
 		
-		mResizeHandle[2] = new LLResizeHandle( "resize", 
-			LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
-			min_width,
-			min_height,
-			LLResizeHandle::LEFT_BOTTOM );
+		mResizeHandle[2] = new LLResizeHandle( std::string("resize"), 
+											   LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
+											   min_width,
+											   min_height,
+											   LLResizeHandle::LEFT_BOTTOM );
 		addChild(mResizeHandle[2]);
 
-		mResizeHandle[3] = new LLResizeHandle( "resize", 
+		mResizeHandle[3] = new LLResizeHandle( std::string("resize"), 
 			LLRect( 0, getRect().getHeight(), RESIZE_HANDLE_WIDTH, getRect().getHeight() - RESIZE_HANDLE_HEIGHT ),
 			min_width,
 			min_height,
@@ -650,31 +649,62 @@ void LLFloater::applyRectControl()
 	}
 }
 
-void LLFloater::setTitle( const LLString& title )
+void LLFloater::applyTitle()
 {
 	if (gNoRender)
 	{
 		return;
 	}
-	if (mDragHandle)
-		mDragHandle->setTitle( title );
+
+	if (!mDragHandle)
+	{
+		return;
+	}
+
+	if (isMinimized() && !mShortTitle.empty())
+	{
+		mDragHandle->setTitle( mShortTitle );
+	}
+	else
+	{
+		mDragHandle->setTitle ( mTitle );
+	}
+}
+
+const std::string& LLFloater::getCurrentTitle() const
+{
+	return mDragHandle ? mDragHandle->getTitle() : LLStringUtil::null;
 }
 
-const LLString& LLFloater::getTitle() const
+void LLFloater::setTitle( const std::string& title )
 {
-	return mDragHandle ? mDragHandle->getTitle() : LLString::null;
+	mTitle = title;
+	applyTitle();
 }
 
-void LLFloater::setShortTitle( const LLString& short_title )
+std::string LLFloater::getTitle()
+{
+	if (mTitle.empty())
+	{
+		return mDragHandle ? mDragHandle->getTitle() : LLStringUtil::null;
+	}
+	else
+	{
+		return mTitle;
+	}
+}
+
+void LLFloater::setShortTitle( const std::string& short_title )
 {
 	mShortTitle = short_title;
+	applyTitle();
 }
 
-LLString LLFloater::getShortTitle()
+std::string LLFloater::getShortTitle()
 {
 	if (mShortTitle.empty())
 	{
-		return mDragHandle ? mDragHandle->getTitle() : LLString::null;
+		return mDragHandle ? mDragHandle->getTitle() : LLStringUtil::null;
 	}
 	else
 	{
@@ -841,7 +871,7 @@ void LLFloater::setMinimized(BOOL minimize)
 				mResizeHandle[i]->setEnabled(FALSE);
 			}
 		}
-
+		
 		mMinimized = TRUE;
 
 		// Reshape *after* setting mMinimized
@@ -890,12 +920,15 @@ void LLFloater::setMinimized(BOOL minimize)
 				mResizeHandle[i]->setEnabled(isResizable());
 			}
 		}
-
+		
 		mMinimized = FALSE;
 
 		// Reshape *after* setting mMinimized
 		reshape( mExpandedRect.getWidth(), mExpandedRect.getHeight(), TRUE );
 	}
+	
+	applyTitle ();
+
 	make_ui_sound("UISndWindowClose");
 	updateButtons();
 }
@@ -1083,38 +1116,37 @@ void LLFloater::removeDependentFloater(LLFloater* floaterp)
 	floaterp->mDependeeHandle = LLHandle<LLFloater>();
 }
 
-// virtual
-BOOL LLFloater::handleMouseDown(S32 x, S32 y, MASK mask)
+BOOL LLFloater::offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButtons index)
 {
-	if( mMinimized )
+	if( mButtonsEnabled[index] )
 	{
-		// Offer the click to the close button.
-		if( mButtonsEnabled[BUTTON_CLOSE] )
-		{
-			S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft;
-			S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom;
-
-			if (mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y)
-				&& mButtons[BUTTON_CLOSE]->handleMouseDown(local_x, local_y, mask))
-			{
-				// close button handled it, return
-				return TRUE;
-			}
-		}
+		LLButton* my_butt = mButtons[index];
+		S32 local_x = x - my_butt->getRect().mLeft;
+		S32 local_y = y - my_butt->getRect().mBottom;
 
-		// Offer the click to the restore button.
-		if( mButtonsEnabled[BUTTON_RESTORE] )
+		if (
+			my_butt->pointInView(local_x, local_y) &&
+			my_butt->handleMouseDown(local_x, local_y, mask))
 		{
-			S32 local_x = x - mButtons[BUTTON_RESTORE]->getRect().mLeft;
-			S32 local_y = y - mButtons[BUTTON_RESTORE]->getRect().mBottom;
-
-			if (mButtons[BUTTON_RESTORE]->pointInView(local_x, local_y)
-				&& mButtons[BUTTON_RESTORE]->handleMouseDown(local_x, local_y, mask))
-			{
-				// restore button handled it, return
-				return TRUE;
-			}
+			// the button handled it
+			return TRUE;
 		}
+	}
+	return FALSE;
+}
+
+// virtual
+BOOL LLFloater::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	if( mMinimized )
+	{
+		// Offer the click to titlebar buttons.
+		// Note: this block and the offerClickToButton helper method can be removed
+		// because the parent container will handle it for us but we'll keep it here
+		// for safety until after reworking the panel code to manage hidden children.
+		if(offerClickToButton(x, y, mask, BUTTON_CLOSE)) return TRUE;
+		if(offerClickToButton(x, y, mask, BUTTON_RESTORE)) return TRUE;
+		if(offerClickToButton(x, y, mask, BUTTON_TEAR_OFF)) return TRUE;
 
 		// Otherwise pass to drag handle for movement
 		return mDragHandle->handleMouseDown(x, y, mask);
@@ -1249,6 +1281,7 @@ void LLFloater::onClickTearOff(void *userdata)
 		LLMultiFloater* new_host = (LLMultiFloater*)self->mLastHostHandle.get();
 		if (new_host)
 		{
+			self->setMinimized(FALSE); // to reenable minimize button if it was minimized
 			new_host->showFloater(self);
 			// make sure host is visible
 			new_host->open();
@@ -1341,7 +1374,7 @@ void LLFloater::draw()
 			gl_rect_2d( left, top, right, bottom, getTransparentColor() );
 		}
 
-		if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getTitle().empty())
+		if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getCurrentTitle().empty())
 		{
 			// draw highlight on title bar to indicate focus.  RDW
 			const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
@@ -1421,31 +1454,15 @@ void LLFloater::draw()
 
 void	LLFloater::setCanMinimize(BOOL can_minimize)
 {
-	// removing minimize/restore button programmatically,
-	// go ahead and uniminimize floater
+	// if removing minimize/restore button programmatically,
+	// go ahead and unminimize floater
 	if (!can_minimize)
 	{
 		setMinimized(FALSE);
 	}
 
-	if (can_minimize)
-	{
-		if (isMinimized())
-		{
-			mButtonsEnabled[BUTTON_MINIMIZE] = FALSE;
-			mButtonsEnabled[BUTTON_RESTORE] = TRUE;
-		}
-		else
-		{
-			mButtonsEnabled[BUTTON_MINIMIZE] = TRUE;
-			mButtonsEnabled[BUTTON_RESTORE] = FALSE;
-		}
-	}
-	else
-	{
-		mButtonsEnabled[BUTTON_MINIMIZE] = FALSE;
-		mButtonsEnabled[BUTTON_RESTORE] = FALSE;
-	}
+	mButtonsEnabled[BUTTON_MINIMIZE] = can_minimize && !isMinimized();
+	mButtonsEnabled[BUTTON_RESTORE]  = can_minimize &&  isMinimized();
 
 	updateButtons();
 }
@@ -1484,28 +1501,28 @@ void	LLFloater::setCanResize(BOOL can_resize)
 		// Resize bars (sides)
 		const S32 RESIZE_BAR_THICKNESS = 3;
 		mResizeBar[0] = new LLResizeBar( 
-			"resizebar_left",
+			std::string("resizebar_left"),
 			this,
 			LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0), 
 			mMinWidth, S32_MAX, LLResizeBar::LEFT );
 		addChild( mResizeBar[0] );
 
 		mResizeBar[1] = new LLResizeBar( 
-			"resizebar_top",
+			std::string("resizebar_top"),
 			this,
 			LLRect( 0, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_BAR_THICKNESS), 
 			mMinHeight, S32_MAX, LLResizeBar::TOP );
 		addChild( mResizeBar[1] );
 
 		mResizeBar[2] = new LLResizeBar( 
-			"resizebar_right",
+			std::string("resizebar_right"),
 			this,
 			LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0), 
 			mMinWidth, S32_MAX, LLResizeBar::RIGHT );
 		addChild( mResizeBar[2] );
 
 		mResizeBar[3] = new LLResizeBar( 
-			"resizebar_bottom",
+			std::string("resizebar_bottom"),
 			this,
 			LLRect( 0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0), 
 			mMinHeight, S32_MAX, LLResizeBar::BOTTOM );
@@ -1514,28 +1531,28 @@ void	LLFloater::setCanResize(BOOL can_resize)
 
 		// Resize handles (corners)
 		mResizeHandle[0] = new LLResizeHandle( 
-			"Resize Handle",
+			std::string("Resize Handle"),
 			LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT, getRect().getWidth(), 0),
 			mMinWidth,
 			mMinHeight,
 			LLResizeHandle::RIGHT_BOTTOM);
 		addChild(mResizeHandle[0]);
 
-		mResizeHandle[1] = new LLResizeHandle( "resize", 
+		mResizeHandle[1] = new LLResizeHandle( std::string("resize"), 
 			LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_HANDLE_HEIGHT),
 			mMinWidth,
 			mMinHeight,
 			LLResizeHandle::RIGHT_TOP );
 		addChild(mResizeHandle[1]);
 		
-		mResizeHandle[2] = new LLResizeHandle( "resize", 
-			LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
-			mMinWidth,
-			mMinHeight,
-			LLResizeHandle::LEFT_BOTTOM );
+		mResizeHandle[2] = new LLResizeHandle( std::string("resize"), 
+											   LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
+											   mMinWidth,
+											   mMinHeight,
+											   LLResizeHandle::LEFT_BOTTOM );
 		addChild(mResizeHandle[2]);
 
-		mResizeHandle[3] = new LLResizeHandle( "resize", 
+		mResizeHandle[3] = new LLResizeHandle( std::string("resize"), 
 			LLRect( 0, getRect().getHeight(), RESIZE_HANDLE_WIDTH, getRect().getHeight() - RESIZE_HANDLE_HEIGHT ),
 			mMinWidth,
 			mMinHeight,
@@ -1633,7 +1650,7 @@ void LLFloater::buildButtons()
 			btn_rect,
 			sButtonActiveImageNames[i],
 			sButtonPressedImageNames[i],
-			"",
+			LLStringUtil::null,
 			sButtonCallbacks[i],
 			this,
 			LLFontGL::sSansSerif);
@@ -1657,7 +1674,7 @@ void LLFloater::buildButtons()
 /////////////////////////////////////////////////////
 // LLFloaterView
 
-LLFloaterView::LLFloaterView( const LLString& name, const LLRect& rect )
+LLFloaterView::LLFloaterView( const std::string& name, const LLRect& rect )
 :	LLUICtrl( name, rect, FALSE, NULL, NULL, FOLLOWS_ALL ),
 	mFocusCycleMode(FALSE),
 	mSnapOffsetBottom(0)
@@ -2377,7 +2394,7 @@ LLMultiFloater::LLMultiFloater(LLTabContainer::TabPosition tab_pos) :
 
 }
 
-LLMultiFloater::LLMultiFloater(const LLString &name) :
+LLMultiFloater::LLMultiFloater(const std::string &name) :
 	LLFloater(name),
 	mTabContainer(NULL),
 	mTabPos(LLTabContainer::TOP),
@@ -2388,7 +2405,7 @@ LLMultiFloater::LLMultiFloater(const LLString &name) :
 }
 
 LLMultiFloater::LLMultiFloater(
-	const LLString& name,
+	const std::string& name,
 	const LLRect& rect,
 	LLTabContainer::TabPosition tab_pos,
 	BOOL auto_resize) : 
@@ -2399,7 +2416,7 @@ LLMultiFloater::LLMultiFloater(
 	mOrigMinWidth(0),
 	mOrigMinHeight(0)
 {
-	mTabContainer = new LLTabContainer("Preview Tabs", 
+	mTabContainer = new LLTabContainer(std::string("Preview Tabs"), 
 		LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0), 
 		mTabPos, 
 		FALSE, 
@@ -2414,8 +2431,8 @@ LLMultiFloater::LLMultiFloater(
 }
 
 LLMultiFloater::LLMultiFloater(
-	const LLString& name,
-	const LLString& rect_control,
+	const std::string& name,
+	const std::string& rect_control,
 	LLTabContainer::TabPosition tab_pos,
 	BOOL auto_resize) : 
 	LLFloater(name, rect_control, name),
@@ -2425,7 +2442,7 @@ LLMultiFloater::LLMultiFloater(
 	mOrigMinWidth(0),
 	mOrigMinHeight(0)
 {
-	mTabContainer = new LLTabContainer("Preview Tabs", 
+	mTabContainer = new LLTabContainer(std::string("Preview Tabs"), 
 		LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0), 
 		mTabPos, 
 		FALSE, 
@@ -2863,7 +2880,7 @@ LLXMLNodePtr LLFloater::getXML(bool save_children) const
 {
 	LLXMLNodePtr node = LLPanel::getXML();
 
-	node->createChild("title", TRUE)->setStringValue(getTitle());
+	node->createChild("title", TRUE)->setStringValue(getCurrentTitle());
 
 	node->createChild("can_resize", TRUE)->setBoolValue(isResizable());
 
@@ -2885,12 +2902,12 @@ LLXMLNodePtr LLFloater::getXML(bool save_children) const
 // static
 LLView* LLFloater::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("floater");
+	std::string name("floater");
 	node->getAttributeString("name", name);
 
 	LLFloater *floaterp = new LLFloater(name);
 
-	LLString filename;
+	std::string filename;
 	node->getAttributeString("filename", filename);
 
 	if (filename.empty())
@@ -2909,10 +2926,10 @@ LLView* LLFloater::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
 void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory, BOOL open)	/* Flawfinder: ignore */
 {
-	LLString name(getName());
-	LLString title(getTitle());
-	LLString short_title(getShortTitle());
-	LLString rect_control("");
+	std::string name(getName());
+	std::string title(getCurrentTitle());
+	std::string short_title(getShortTitle());
+	std::string rect_control("");
 	BOOL resizable = isResizable();
 	S32 min_width = getMinWidth();
 	S32 min_height = getMinHeight();
@@ -2950,6 +2967,9 @@ void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
 			minimizable,
 			close_btn);
 
+	setTitle(title);
+	applyTitle ();
+
 	setShortTitle(short_title);
 
 	BOOL can_tear_off;
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 7b4e003..636125e 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -86,8 +86,8 @@ public:
 	};
 	
 	LLFloater();
- 	LLFloater(const LLString& name); //simple constructor for data-driven initialization
-	LLFloater(	const LLString& name, const LLRect& rect, const LLString& title,
+ 	LLFloater(const std::string& name); //simple constructor for data-driven initialization
+	LLFloater(	const std::string& name, const LLRect& rect, const std::string& title,
 		BOOL resizable = FALSE,
 		S32 min_width = DEFAULT_MIN_WIDTH,
 		S32 min_height = DEFAULT_MIN_HEIGHT,
@@ -96,7 +96,7 @@ public:
 		BOOL close_btn = TRUE,
 		BOOL bordered = BORDER_NO);
 
-	LLFloater(	const LLString& name, const LLString& rect_control, const LLString& title,
+	LLFloater(	const std::string& name, const std::string& rect_control, const std::string& title,
 		BOOL resizable = FALSE,
 		S32 min_width = DEFAULT_MIN_WIDTH, 
 		S32 min_height = DEFAULT_MIN_HEIGHT,
@@ -119,7 +119,7 @@ public:
 
 	// Can be called multiple times to reset floater parameters.
 	// Deletes all children of the floater.
-	virtual void		initFloater(const LLString& title, BOOL resizable, 
+	virtual void		initFloater(const std::string& title, BOOL resizable, 
 						S32 min_width, S32 min_height, BOOL drag_on_left,
 						BOOL minimizable, BOOL close_btn);
 
@@ -142,17 +142,19 @@ public:
 
 	LLMultiFloater* getHost() { return (LLMultiFloater*)mHostHandle.get(); }
 
-	void			setTitle( const LLString& title );
-	const LLString&	getTitle() const;
-	void			setShortTitle( const LLString& short_title );
-	LLString		getShortTitle();
+	void			applyTitle();
+	const std::string&	getCurrentTitle() const;
+	void			setTitle( const std::string& title);
+	std::string		getTitle();
+	void			setShortTitle( const std::string& short_title );
+	std::string		getShortTitle();
 	void			setTitleVisible(bool visible);
 	virtual void	setMinimized(BOOL b);
 	void			moveResizeHandlesToFront();
 	void			addDependentFloater(LLFloater* dependent, BOOL reposition = TRUE);
 	void			addDependentFloater(LLHandle<LLFloater> dependent_handle, BOOL reposition = TRUE);
-	LLFloater*      getDependee() { return (LLFloater*)mDependeeHandle.get(); }
-	void            removeDependentFloater(LLFloater* dependent);
+	LLFloater*		getDependee() { return (LLFloater*)mDependeeHandle.get(); }
+	void		removeDependentFloater(LLFloater* dependent);
 	BOOL			isMinimized()					{ return mMinimized; }
 	BOOL			isFrontmost();
 	BOOL			isDependent()					{ return !mDependeeHandle.isDead(); }
@@ -221,8 +223,8 @@ protected:
 	virtual void	bringToFront(S32 x, S32 y);
 	virtual void	setVisibleAndFrontmost(BOOL take_focus=TRUE);    
 	
-	void            setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized
-    const LLRect&    getExpandedRect() const { return mExpandedRect; }
+	void		setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized
+	const LLRect&	getExpandedRect() const { return mExpandedRect; }
 
 	void			setAutoFocus(BOOL focus) { mAutoFocus = focus; } // whether to automatically take focus when opened
 	LLDragHandle*	getDragHandle() const { return mDragHandle; }
@@ -236,17 +238,19 @@ private:
 	void			createMinimizeButton();
 	void			updateButtons();
 	void			buildButtons();
+	BOOL			offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButtons index);
 
 	LLRect			mExpandedRect;
 	LLDragHandle*	mDragHandle;
 	LLResizeBar*	mResizeBar[4];
-	LLResizeHandle* mResizeHandle[4];
+	LLResizeHandle*	mResizeHandle[4];
 	LLButton		*mMinimizeButton;
 	BOOL			mCanTearOff;
 	BOOL			mMinimized;
 	BOOL			mForeground;
 	LLHandle<LLFloater>	mDependeeHandle;
-	LLString		mShortTitle;
+	std::string		mTitle;
+	std::string		mShortTitle;
 
 	BOOL			mFirstLook;			// TRUE if the _next_ time this floater is visible will be the first time in the session that it is visible.
 
@@ -259,7 +263,7 @@ private:
 	typedef std::set<LLHandle<LLFloater> > handle_set_t;
 	typedef std::set<LLHandle<LLFloater> >::iterator handle_set_iter_t;
 	handle_set_t	mDependents;
-	bool            mDragOnLeft;
+	bool			mDragOnLeft;
 
 	BOOL			mButtonsEnabled[BUTTON_COUNT];
 	LLButton*		mButtons[BUTTON_COUNT];
@@ -272,11 +276,11 @@ private:
 
 	static LLMultiFloater* sHostp;
 	static BOOL		sEditModeEnabled;
-	static LLString	sButtonActiveImageNames[BUTTON_COUNT];
-	static LLString	sButtonInactiveImageNames[BUTTON_COUNT];
-	static LLString	sButtonPressedImageNames[BUTTON_COUNT];
-	static LLString	sButtonNames[BUTTON_COUNT];
-	static LLString	sButtonToolTips[BUTTON_COUNT];
+	static std::string	sButtonActiveImageNames[BUTTON_COUNT];
+	static std::string	sButtonInactiveImageNames[BUTTON_COUNT];
+	static std::string	sButtonPressedImageNames[BUTTON_COUNT];
+	static std::string	sButtonNames[BUTTON_COUNT];
+	static std::string	sButtonToolTips[BUTTON_COUNT];
 	typedef void (*click_callback)(void *);
 	static click_callback sButtonCallbacks[BUTTON_COUNT];
 
@@ -301,7 +305,7 @@ private:
 class LLFloaterView : public LLUICtrl
 {
 public:
-	LLFloaterView( const LLString& name, const LLRect& rect );
+	LLFloaterView( const std::string& name, const LLRect& rect );
 
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	void reshapeFloater(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical);
@@ -361,9 +365,9 @@ class LLMultiFloater : public LLFloater
 public:
 	LLMultiFloater();
 	LLMultiFloater(LLTabContainer::TabPosition tab_pos);
-	LLMultiFloater(const LLString& name);
-	LLMultiFloater(const LLString& name, const LLRect& rect, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
-	LLMultiFloater(const LLString& name, const LLString& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
+	LLMultiFloater(const std::string& name);
+	LLMultiFloater(const std::string& name, const LLRect& rect, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
+	LLMultiFloater(const std::string& name, const std::string& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
 	virtual ~LLMultiFloater() {};
 
 	virtual BOOL postBuild();
@@ -387,8 +391,8 @@ public:
 	virtual void selectNextFloater();
 	virtual void selectPrevFloater();
 
-	virtual LLFloater* getActiveFloater();
-	virtual BOOL       isFloaterFlashing(LLFloater* floaterp);
+	virtual LLFloater*	getActiveFloater();
+	virtual BOOL		isFloaterFlashing(LLFloater* floaterp);
 	virtual S32			getFloaterCount();
 
 	virtual void setFloaterFlashing(LLFloater* floaterp, BOOL flashing);
diff --git a/linden/indra/llui/llfocusmgr.cpp b/linden/indra/llui/llfocusmgr.cpp
index e2d1f46..517e148 100644
--- a/linden/indra/llui/llfocusmgr.cpp
+++ b/linden/indra/llui/llfocusmgr.cpp
@@ -120,7 +120,7 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke
 		mFocusTimer.reset();
 
 		#ifdef _DEBUG
-			mKeyboardFocusName = new_focus ? new_focus->getName() : "none";
+			mKeyboardFocusName = new_focus ? new_focus->getName() : std::string("none");
 		#endif
 
 		// If we've got a default keyboard focus, and the caller is
@@ -202,7 +202,7 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLView* focus )
 	{
 		mKeyboardFocus = NULL;
 		#ifdef _DEBUG
-			mKeyboardFocusName = "none";
+			mKeyboardFocusName = std::string("none");
 		#endif
 	}
 }
@@ -243,7 +243,7 @@ void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor )
 		}
 
 		#ifdef _DEBUG
-			mMouseCaptorName = new_captor ? new_captor->getName() : "none";
+			mMouseCaptorName = new_captor ? new_captor->getName() : std::string("none");
 		#endif
 	}
 }
@@ -258,7 +258,7 @@ void LLFocusMgr::removeMouseCaptureWithoutCallback( const LLMouseHandler* captor
 	{
 		mMouseCaptor = NULL;
 		#ifdef _DEBUG
-			mMouseCaptorName = "none";
+			mMouseCaptorName = std::string("none");
 		#endif
 	}
 }
@@ -289,7 +289,7 @@ void LLFocusMgr::setTopCtrl( LLUICtrl* new_top  )
 		mTopCtrl = new_top;
 
 		#ifdef _DEBUG
-			mTopCtrlName = new_top ? new_top->getName() : "none";
+			mTopCtrlName = new_top ? new_top->getName() : std::string("none");
 		#endif
 
 		if (old_top)
@@ -305,7 +305,7 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( const LLUICtrl* top_view )
 	{
 		mTopCtrl = NULL;
 		#ifdef _DEBUG
-			mTopCtrlName = "none";
+			mTopCtrlName = std::string("none");
 		#endif
 	}
 }
diff --git a/linden/indra/llui/llfocusmgr.h b/linden/indra/llui/llfocusmgr.h
index 49aba93..e1b3d88 100644
--- a/linden/indra/llui/llfocusmgr.h
+++ b/linden/indra/llui/llfocusmgr.h
@@ -114,9 +114,9 @@ private:
 	focus_history_map_t mFocusHistory;
 
 	#ifdef _DEBUG
-		LLString		mMouseCaptorName;
-		LLString		mKeyboardFocusName;
-		LLString		mTopCtrlName;
+		std::string		mMouseCaptorName;
+		std::string		mKeyboardFocusName;
+		std::string		mTopCtrlName;
 	#endif
 };
 
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index f35de85..6d1a678 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -44,7 +44,7 @@ const F32 RESOLUTION_BUMP = 1.f;
 
 static LLRegisterWidget<LLIconCtrl> r("icon");
 
-LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &image_id)
+LLIconCtrl::LLIconCtrl(const std::string& name, const LLRect &rect, const LLUUID &image_id)
 :	LLUICtrl(name, 
 			 rect, 
 			 FALSE, // mouse opaque
@@ -56,7 +56,7 @@ LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &i
 	setTabStop(FALSE);
 }
 
-LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLString &image_name)
+LLIconCtrl::LLIconCtrl(const std::string& name, const LLRect &rect, const std::string &image_name)
 :	LLUICtrl(name, 
 			 rect, 
 			 FALSE, // mouse opaque
@@ -76,7 +76,7 @@ LLIconCtrl::~LLIconCtrl()
 }
 
 
-void LLIconCtrl::setImage(const LLString& image_name)
+void LLIconCtrl::setImage(const std::string& image_name)
 {
 	//RN: support UUIDs masquerading as strings
 	if (LLUUID::validate(image_name))
@@ -148,13 +148,13 @@ LLXMLNodePtr LLIconCtrl::getXML(bool save_children) const
 
 LLView* LLIconCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("icon");
+	std::string name("icon");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
 	createRect(node, rect, parent, LLRect());
 
-	LLString image_name;
+	std::string image_name;
 	if (node->hasAttribute("image_name"))
 	{
 		node->getAttributeString("image_name", image_name);
diff --git a/linden/indra/llui/lliconctrl.h b/linden/indra/llui/lliconctrl.h
index 055b504..5cb8e98 100644
--- a/linden/indra/llui/lliconctrl.h
+++ b/linden/indra/llui/lliconctrl.h
@@ -48,17 +48,17 @@ class LLIconCtrl
 : public LLUICtrl
 {
 public:
-	LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &image_id);
-	LLIconCtrl(const LLString& name, const LLRect &rect, const LLString &image_name);
+	LLIconCtrl(const std::string& name, const LLRect &rect, const LLUUID &image_id);
+	LLIconCtrl(const std::string& name, const LLRect &rect, const std::string &image_name);
 	virtual ~LLIconCtrl();
 
 	// llview overrides
 	virtual void	draw();
 
-	void			setImage(const LLString& image_name);
+	void			setImage(const std::string& image_name);
 	void			setImage(const LLUUID& image_name);
 	const LLUUID	&getImage() const						{ return mImageID; }
-	LLString		getImageName() const						{ return mImageName; }
+	std::string		getImageName() const						{ return mImageName; }
 
 	// Takes a UUID, wraps get/setImage
 	virtual void	setValue(const LLSD& value );
@@ -71,7 +71,7 @@ public:
 
 private:
 	LLColor4		mColor;
-	LLString		mImageName;
+	std::string		mImageName;
 	LLUUID			mImageID;
 	LLPointer<LLUIImage>	mImagep;
 };
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index d5d0d23..35f032a 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -69,7 +69,7 @@ LLKeywords::~LLKeywords()
 	std::for_each(mDelimiterTokenList.begin(), mDelimiterTokenList.end(), DeletePointer());
 }
 
-BOOL LLKeywords::loadFromFile( const LLString& filename )
+BOOL LLKeywords::loadFromFile( const std::string& filename )
 {
 	mLoaded = FALSE;
 
@@ -80,7 +80,7 @@ BOOL LLKeywords::loadFromFile( const LLString& filename )
 	char	buffer[BUFFER_SIZE];	/* Flawfinder: ignore */
 
 	llifstream file;
-	file.open(filename.c_str());	/* Flawfinder: ignore */
+	file.open(filename);	/* Flawfinder: ignore */
 	if( file.fail() )
 	{
 		llinfos << "LLKeywords::loadFromFile()  Unable to open file: " << filename << llendl;
@@ -106,52 +106,51 @@ BOOL LLKeywords::loadFromFile( const LLString& filename )
 	}
 
 	// start of line (SOL)
-	const char SOL_COMMENT[] = "#";
-	const char SOL_WORD[] = "[word ";
-	const char SOL_LINE[] = "[line ";
-	const char SOL_ONE_SIDED_DELIMITER[] = "[one_sided_delimiter ";
-	const char SOL_TWO_SIDED_DELIMITER[] = "[two_sided_delimiter ";
+	std::string SOL_COMMENT("#");
+	std::string SOL_WORD("[word ");
+	std::string SOL_LINE("[line ");
+	std::string SOL_ONE_SIDED_DELIMITER("[one_sided_delimiter ");
+	std::string SOL_TWO_SIDED_DELIMITER("[two_sided_delimiter ");
 
 	LLColor3 cur_color( 1, 0, 0 );
 	LLKeywordToken::TOKEN_TYPE cur_type = LLKeywordToken::WORD;
 
 	while (!file.eof())
 	{
+		buffer[0] = 0;
 		file.getline( buffer, BUFFER_SIZE );
-		if( !strncmp( buffer, SOL_COMMENT, strlen(SOL_COMMENT) ) )	/* Flawfinder: ignore */
+		std::string line(buffer);
+		if( line.find(SOL_COMMENT) == 0 )
 		{
 			continue;
 		}
-		else
-		if( !strncmp( buffer, SOL_WORD, strlen(SOL_WORD) ) )	/* Flawfinder: ignore */
+		else if( line.find(SOL_WORD) == 0 )
 		{
-			cur_color = readColor( buffer + strlen(SOL_WORD) );	/* Flawfinder: ignore */
+			cur_color = readColor( line.substr(SOL_WORD.size()) );
 			cur_type = LLKeywordToken::WORD;
 			continue;
 		}
-		else
-		if( !strncmp( buffer, SOL_LINE, strlen(SOL_LINE) ) )	/* Flawfinder: ignore */
+		else if( line.find(SOL_LINE) == 0 )
 		{
-			cur_color = readColor( buffer + strlen(SOL_LINE) );	/* Flawfinder: ignore */
+			cur_color = readColor( line.substr(SOL_LINE.size()) );
 			cur_type = LLKeywordToken::LINE;
 			continue;
 		}
-		else
-		if( !strncmp( buffer, SOL_TWO_SIDED_DELIMITER, strlen(SOL_TWO_SIDED_DELIMITER) ) )	/* Flawfinder: ignore */
+		else if( line.find(SOL_TWO_SIDED_DELIMITER) == 0 )
 		{
-			cur_color = readColor( buffer + strlen(SOL_TWO_SIDED_DELIMITER) );	/* Flawfinder: ignore */
+			cur_color = readColor( line.substr(SOL_TWO_SIDED_DELIMITER.size()) );
 			cur_type = LLKeywordToken::TWO_SIDED_DELIMITER;
 			continue;
 		}
-		if( !strncmp( buffer, SOL_ONE_SIDED_DELIMITER, strlen(SOL_ONE_SIDED_DELIMITER) ) )	/* Flawfinder: ignore */
+		else if( line.find(SOL_ONE_SIDED_DELIMITER) == 0 )	
 		{
-			cur_color = readColor( buffer + strlen(SOL_ONE_SIDED_DELIMITER) );	/* Flawfinder: ignore */
+			cur_color = readColor( line.substr(SOL_ONE_SIDED_DELIMITER.size()) );
 			cur_type = LLKeywordToken::ONE_SIDED_DELIMITER;
 			continue;
 		}
 
-		LLString token_buffer( buffer );
-		LLString::trim(token_buffer);
+		std::string token_buffer( line );
+		LLStringUtil::trim(token_buffer);
 		
 		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 		boost::char_separator<char> sep_word("", " \t");
@@ -161,26 +160,26 @@ BOOL LLKeywords::loadFromFile( const LLString& filename )
 		if( !token_buffer.empty() && token_word_iter != word_tokens.end() )
 		{
 			// first word is keyword
-			LLString keyword = (*token_word_iter);
-			LLString::trim(keyword);
+			std::string keyword = (*token_word_iter);
+			LLStringUtil::trim(keyword);
 
 			// following words are tooltip
-			LLString tool_tip;
+			std::string tool_tip;
 			while (++token_word_iter != word_tokens.end())
 			{
 				tool_tip += (*token_word_iter);
 			}
-			LLString::trim(tool_tip);
+			LLStringUtil::trim(tool_tip);
 			
 			if( !tool_tip.empty() )
 			{
 				// Replace : with \n for multi-line tool tips.
-				LLString::replaceChar( tool_tip, ':', '\n' );
+				LLStringUtil::replaceChar( tool_tip, ':', '\n' );
 				addToken(cur_type, keyword, cur_color, tool_tip );
 			}
 			else
 			{
-				addToken(cur_type, keyword, cur_color, NULL );
+				addToken(cur_type, keyword, cur_color, LLStringUtil::null );
 			}
 		}
 	}
@@ -193,9 +192,9 @@ BOOL LLKeywords::loadFromFile( const LLString& filename )
 
 // Add the token as described
 void LLKeywords::addToken(LLKeywordToken::TOKEN_TYPE type,
-						  const LLString& key_in,
+						  const std::string& key_in,
 						  const LLColor3& color,
-						  const LLString& tool_tip_in )
+						  const std::string& tool_tip_in )
 {
 	LLWString key = utf8str_to_wstring(key_in);
 	LLWString tool_tip = utf8str_to_wstring(tool_tip_in);
@@ -219,7 +218,7 @@ void LLKeywords::addToken(LLKeywordToken::TOKEN_TYPE type,
 	}
 }
 
-LLColor3 LLKeywords::readColor( const LLString& s )
+LLColor3 LLKeywords::readColor( const std::string& s )
 {
 	F32 r, g, b;
 	r = g = b = 0.0f;
@@ -296,7 +295,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 						}
 						S32 seg_end = cur - base;
 						
-						//llinfos << "Seg: [" << (char*)LLString( base, seg_start, seg_end-seg_start) << "]" << llendl;
 						LLTextSegment* text_segment = new LLTextSegment( cur_token->getColor(), seg_start, seg_end );
 						text_segment->setToken( cur_token );
 						insertSegment( seg_list, text_segment, text_len, defaultColor);
@@ -406,7 +404,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 					}
 
 
-					//llinfos << "Seg: [" << (char*)LLString( base, seg_start, seg_end-seg_start ) << "]" << llendl;
 					LLTextSegment* text_segment = new LLTextSegment( cur_delimiter->getColor(), seg_start, seg_end );
 					text_segment->setToken( cur_delimiter );
 					insertSegment( seg_list, text_segment, text_len, defaultColor);
@@ -518,7 +515,7 @@ void LLKeywordToken::dump()
 		mColor.mV[VX] << ", " <<
 		mColor.mV[VY] << ", " <<
 		mColor.mV[VZ] << "] [" <<
-		mToken.c_str() << "]" <<
+		wstring_to_utf8str(mToken) << "]" <<
 		llendl;
 }
 
diff --git a/linden/indra/llui/llkeywords.h b/linden/indra/llui/llkeywords.h
index 61c3c57..e3361f6 100644
--- a/linden/indra/llui/llkeywords.h
+++ b/linden/indra/llui/llkeywords.h
@@ -80,16 +80,16 @@ public:
 	LLKeywords();
 	~LLKeywords();
 
-	BOOL		loadFromFile(const LLString& filename);
+	BOOL		loadFromFile(const std::string& filename);
 	BOOL		isLoaded() const	{ return mLoaded; }
 
 	void		findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text, const LLColor4 &defaultColor );
 
 	// Add the token as described
 	void addToken(LLKeywordToken::TOKEN_TYPE type,
-					const LLString& key,
+					const std::string& key,
 					const LLColor3& color,
-					const LLString& tool_tip = LLString::null);
+					const std::string& tool_tip = LLStringUtil::null);
 
 	typedef std::map<LLWString, LLKeywordToken*> word_token_map_t;
 	typedef word_token_map_t::const_iterator keyword_iterator_t;
@@ -101,7 +101,7 @@ public:
 #endif
 
 private:
-	LLColor3	readColor(const LLString& s);
+	LLColor3	readColor(const std::string& s);
 	void		insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor);
 
 	BOOL		mLoaded;
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index a12c9d8..12d1929 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -39,7 +39,6 @@
 #include "llmath.h"
 #include "llfontgl.h"
 #include "llgl.h"
-#include "sound_ids.h"
 #include "lltimer.h"
 
 //#include "llclipboard.h"
@@ -88,8 +87,8 @@ static LLRegisterWidget<LLLineEditor> r1("line_editor");
 // Member functions
 //
  
-LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
-						   const LLString& default_text, const LLFontGL* font,
+LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
+						   const std::string& default_text, const LLFontGL* font,
 						   S32 max_length_bytes,
 						   void (*commit_callback)(LLUICtrl* caller, void* user_data ),
 						   void (*keystroke_callback)(LLLineEditor* caller, void* user_data ),
@@ -167,7 +166,7 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
 	// Scalable UI somehow made these rectangles off-by-one.
 	// I don't know why. JC
 	LLRect border_rect(0, getRect().getHeight()-1, getRect().getWidth()-1, 0);
-	mBorder = new LLViewBorder( "line ed border", border_rect, border_bevel, border_style, mBorderThickness );
+	mBorder = new LLViewBorder( std::string("line ed border"), border_rect, border_bevel, border_style, mBorderThickness );
 	addChild( mBorder );
 	mBorder->setFollows(FOLLOWS_LEFT|FOLLOWS_RIGHT|FOLLOWS_TOP|FOLLOWS_BOTTOM);
 
@@ -299,7 +298,7 @@ void LLLineEditor::setText(const LLStringExplicit &new_text)
 	// also consider entire string selected when mSelectAllonFocusReceived is set on an empty, focused line editor
 	all_selected = all_selected || (len == 0 && hasFocus() && mSelectAllonFocusReceived);
 
-	LLString truncated_utf8 = new_text;
+	std::string truncated_utf8 = new_text;
 	if (truncated_utf8.size() > (U32)mMaxLengthBytes)
 	{	
 		truncated_utf8 = utf8str_truncate(new_text, mMaxLengthBytes);
@@ -960,9 +959,9 @@ void LLLineEditor::paste()
 
 			// Clean up string (replace tabs and returns and remove characters that our fonts don't support.)
 			LLWString clean_string(paste);
-			LLWString::replaceTabsWithSpaces(clean_string, 1);
+			LLWStringUtil::replaceTabsWithSpaces(clean_string, 1);
 			//clean_string = wstring_detabify(paste, 1);
-			LLWString::replaceChar(clean_string, '\n', mReplaceNewlinesWithSpaces ? ' ' : 182); // 182 == paragraph character
+			LLWStringUtil::replaceChar(clean_string, '\n', mReplaceNewlinesWithSpaces ? ' ' : 182); // 182 == paragraph character
 
 			// Insert the string
 
@@ -1396,11 +1395,11 @@ void LLLineEditor::draw()
 {
 	S32 text_len = mText.length();
 
-	LLString saved_text;
+	std::string saved_text;
 	if (mDrawAsterixes)
 	{
 		saved_text = mText.getString();
-		LLString text;
+		std::string text;
 		for (S32 i = 0; i < mText.length(); i++)
 		{
 			text += '*';
@@ -1595,7 +1594,7 @@ void LLLineEditor::draw()
 				S32 cursor_right = cursor_left + UI_LINEEDITOR_CURSOR_THICKNESS;
 				if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())
 				{
-					const LLWString space(utf8str_to_wstring(LLString(" ")));
+					const LLWString space(utf8str_to_wstring(std::string(" ")));
 					S32 wswidth = mGLFont->getWidth(space.c_str());
 					S32 width = mGLFont->getWidth(mText.getWString().c_str(), getCursor(), 1) + 1;
 					cursor_right = cursor_left + llmax(wswidth, width);
@@ -1623,6 +1622,23 @@ void LLLineEditor::draw()
 			}
 		}
 
+		//draw label if no text is provided
+		//but we should draw it in a different color
+		//to give indication that it is not text you typed in
+		if (0 == mText.length() && mReadOnly)
+		{
+			mGLFont->render(mLabel.getWString(), 0,
+							mMinHPixels, (F32)text_bottom,
+							label_color,
+							LLFontGL::LEFT,
+							LLFontGL::BOTTOM,
+							LLFontGL::NORMAL,
+							S32_MAX,
+							mMaxHPixels - llround(rendered_pixels_right),
+							&rendered_pixels_right, FALSE);
+		}
+
+
 		// Draw children (border)
 		//mBorder->setVisible(TRUE);
 		mBorder->setKeyboardFocusHighlight( TRUE );
@@ -1635,10 +1651,11 @@ void LLLineEditor::draw()
 		// draw label if no text provided
 		if (0 == mText.length())
 		{
-			mGLFont->render(mLabel.getWString(), 0, 
+			mGLFont->render(mLabel.getWString(), 0,
 							mMinHPixels, (F32)text_bottom,
 							label_color,
-							LLFontGL::LEFT, LLFontGL::BOTTOM,
+							LLFontGL::LEFT,
+							LLFontGL::BOTTOM,
 							LLFontGL::NORMAL,
 							S32_MAX,
 							mMaxHPixels - llround(rendered_pixels_right),
@@ -1772,7 +1789,7 @@ BOOL LLLineEditor::prevalidateFloat(const LLWString &str)
 
 	BOOL success = TRUE;
 	LLWString trimmed = str;
-	LLWString::trim(trimmed);
+	LLWStringUtil::trim(trimmed);
 	S32 len = trimmed.length();
 	if( 0 < len )
 	{
@@ -1804,7 +1821,7 @@ BOOL LLLineEditor::prevalidateFloat(const LLWString &str)
 BOOL LLLineEditor::isPartOfWord(llwchar c) { return (c == '_') || isalnum(c); }
 
 // static
-BOOL LLLineEditor::postvalidateFloat(const LLString &str)
+BOOL LLLineEditor::postvalidateFloat(const std::string &str)
 {
 	LLLocale locale(LLLocale::USER_LOCALE);
 
@@ -1813,7 +1830,7 @@ BOOL LLLineEditor::postvalidateFloat(const LLString &str)
 	BOOL has_digit = FALSE;
 
 	LLWString trimmed = utf8str_to_wstring(str);
-	LLWString::trim(trimmed);
+	LLWStringUtil::trim(trimmed);
 	S32 len = trimmed.length();
 	if( 0 < len )
 	{
@@ -1873,7 +1890,7 @@ BOOL LLLineEditor::prevalidateInt(const LLWString &str)
 
 	BOOL success = TRUE;
 	LLWString trimmed = str;
-	LLWString::trim(trimmed);
+	LLWStringUtil::trim(trimmed);
 	S32 len = trimmed.length();
 	if( 0 < len )
 	{
@@ -1904,7 +1921,7 @@ BOOL LLLineEditor::prevalidatePositiveS32(const LLWString &str)
 	LLLocale locale(LLLocale::USER_LOCALE);
 
 	LLWString trimmed = str;
-	LLWString::trim(trimmed);
+	LLWStringUtil::trim(trimmed);
 	S32 len = trimmed.length();
 	BOOL success = TRUE;
 	if(0 < len)
@@ -1938,7 +1955,7 @@ BOOL LLLineEditor::prevalidateNonNegativeS32(const LLWString &str)
 	LLLocale locale(LLLocale::USER_LOCALE);
 
 	LLWString trimmed = str;
-	LLWString::trim(trimmed);
+	LLWStringUtil::trim(trimmed);
 	S32 len = trimmed.length();
 	BOOL success = TRUE;
 	if(0 < len)
@@ -2093,7 +2110,7 @@ LLXMLNodePtr LLLineEditor::getXML(bool save_children) const
 
 	if (mBorder)
 	{
-		LLString bevel;
+		std::string bevel;
 		switch(mBorder->getBevel())
 		{
 		default:
@@ -2104,7 +2121,7 @@ LLXMLNodePtr LLLineEditor::getXML(bool save_children) const
 		}
 		node->createChild("bevel_style", TRUE)->setStringValue(bevel);
 
-		LLString style;
+		std::string style;
 		switch(mBorder->getStyle())
 		{
 		default:
@@ -2141,7 +2158,7 @@ LLXMLNodePtr LLLineEditor::getXML(bool save_children) const
 // static
 LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("line_editor");
+	std::string name("line_editor");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -2152,15 +2169,15 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 
 	LLFontGL* font = LLView::selectFont(node);
 
-	LLString text = node->getTextContents().substr(0, max_text_length - 1);
+	std::string text = node->getTextContents().substr(0, max_text_length - 1);
 
 	LLViewBorder::EBevel bevel_style = LLViewBorder::BEVEL_IN;
 	LLViewBorder::getBevelFromAttribute(node, bevel_style);
 	
 	LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE;
-	LLString border_string;
+	std::string border_string;
 	node->getAttributeString("border_style", border_string);
-	LLString::toLower(border_string);
+	LLStringUtil::toLower(border_string);
 
 	if (border_string == "texture")
 	{
@@ -2186,7 +2203,7 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 								border_style,
 								border_thickness);
 
-	LLString label;
+	std::string label;
 	if(node->getAttributeString("label", label))
 	{
 		line_editor->setLabel(label);
@@ -2216,10 +2233,10 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 		line_editor->setSelectAllonFocusReceived(selectall);
 	}
 
-	LLString prevalidate;
+	std::string prevalidate;
 	if(node->getAttributeString("prevalidate", prevalidate))
 	{
-		LLString::toLower(prevalidate);
+		LLStringUtil::toLower(prevalidate);
 
 		if ("ascii" == prevalidate)
 		{
@@ -2271,11 +2288,11 @@ void LLLineEditor::cleanupClass()
 }
 
 /* static */ 
-LLPointer<LLUIImage> LLLineEditor::parseImage(LLString name, LLXMLNodePtr from, LLPointer<LLUIImage> def)
+LLPointer<LLUIImage> LLLineEditor::parseImage(std::string name, LLXMLNodePtr from, LLPointer<LLUIImage> def)
 {
-	LLString xml_name;
-	if (from->hasAttribute(name)) from->getAttributeString(name, xml_name);
-	if (xml_name == LLString::null) return def;
+	std::string xml_name;
+	if (from->hasAttribute(name.c_str())) from->getAttributeString(name.c_str(), xml_name);
+	if (xml_name == LLStringUtil::null) return def;
 	LLPointer<LLUIImage> image = LLUI::getUIImage(xml_name);
 	return image.isNull() ? def : image;
 }
@@ -2283,7 +2300,7 @@ LLPointer<LLUIImage> LLLineEditor::parseImage(LLString name, LLXMLNodePtr from,
 void LLLineEditor::setColorParameters(LLXMLNodePtr node)
 {
 	// overrides default image if supplied.
-	mImage = parseImage("image", node, mImage);
+	mImage = parseImage(std::string("image"), node, mImage);
 
 	LLColor4 color;
 	if (LLUICtrlFactory::getAttributeColor(node,"cursor_color", color)) 
@@ -2316,13 +2333,13 @@ void LLLineEditor::setColorParameters(LLXMLNodePtr node)
 	}
 }
 
-BOOL LLLineEditor::setTextArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLLineEditor::setTextArg( const std::string& key, const LLStringExplicit& text )
 {
 	mText.setArg(key, text);
 	return TRUE;
 }
 
-BOOL LLLineEditor::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLLineEditor::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	mLabel.setArg(key, text);
 	return TRUE;
@@ -2553,28 +2570,39 @@ void LLLineEditor::setReplaceNewlinesWithSpaces(BOOL replace)
 	mReplaceNewlinesWithSpaces = replace;
 }
 
+LLWString LLLineEditor::getConvertedText() const
+{
+	LLWString text = getWText();
+	LLWStringUtil::trim(text);
+	if (!mReplaceNewlinesWithSpaces)
+	{
+		LLWStringUtil::replaceChar(text,182,'\n'); // Convert paragraph symbols back into newlines.
+	}
+	return text;
+}
+
 static LLRegisterWidget<LLSearchEditor> r2("search_editor");
 
 
-LLSearchEditor::LLSearchEditor(const LLString& name, 
+LLSearchEditor::LLSearchEditor(const std::string& name, 
 		const LLRect& rect,
 		S32 max_length_bytes,
-		void (*search_callback)(const LLString& search_string, void* user_data),
+		void (*search_callback)(const std::string& search_string, void* user_data),
 		void* userdata)
 	: 
 		LLUICtrl(name, rect, TRUE, NULL, userdata),
 		mSearchCallback(search_callback)
 {
 	LLRect search_edit_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-	mSearchEdit = new LLLineEditor("search edit",
-			search_edit_rect,
-			LLString::null,
-			NULL,
-			max_length_bytes,
-			NULL,
-			onSearchEdit,
-			NULL,
-			this);
+	mSearchEdit = new LLLineEditor(std::string("search edit"),
+								   search_edit_rect,
+								   LLStringUtil::null,
+								   NULL,
+								   max_length_bytes,
+								   NULL,
+								   onSearchEdit,
+								   NULL,
+								   this);
 
 	mSearchEdit->setFollowsAll();
 	mSearchEdit->setSelectAllonFocusReceived(TRUE);
@@ -2583,15 +2611,15 @@ LLSearchEditor::LLSearchEditor(const LLString& name,
 
 	S32 btn_width = rect.getHeight(); // button is square, and as tall as search editor
 	LLRect clear_btn_rect(rect.getWidth() - btn_width, rect.getHeight(), rect.getWidth(), 0);
-	mClearSearchButton = new LLButton("clear search", 
+	mClearSearchButton = new LLButton(std::string("clear search"), 
 								clear_btn_rect, 
-								"icn_clear_lineeditor.tga",
-								"UIImgBtnCloseInactiveUUID",
-								LLString::null,
+								std::string("icn_clear_lineeditor.tga"),
+								std::string("UIImgBtnCloseInactiveUUID"),
+								LLStringUtil::null,
 								onClearSearch,
 								this,
 								NULL,
-								LLString::null);
+								LLStringUtil::null);
 	mClearSearchButton->setFollowsRight();
 	mClearSearchButton->setFollowsTop();
 	mClearSearchButton->setImageColor(LLUI::sColorsGroup->getColor("TextFgTentativeColor"));
@@ -2615,13 +2643,13 @@ LLSD LLSearchEditor::getValue() const
 }
 
 //virtual
-BOOL LLSearchEditor::setTextArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLSearchEditor::setTextArg( const std::string& key, const LLStringExplicit& text )
 {
 	return mSearchEdit->setTextArg(key, text);
 }
 
 //virtual
-BOOL LLSearchEditor::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLSearchEditor::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	return mSearchEdit->setLabelArg(key, text);
 }
@@ -2658,17 +2686,17 @@ void LLSearchEditor::onClearSearch(void* user_data)
 {
 	LLSearchEditor* search_editor = (LLSearchEditor*)user_data;
 
-	search_editor->setText(LLString::null);
+	search_editor->setText(LLStringUtil::null);
 	if (search_editor->mSearchCallback)
 	{
-		search_editor->mSearchCallback(LLString::null, search_editor->mCallbackUserData);
+		search_editor->mSearchCallback(LLStringUtil::null, search_editor->mCallbackUserData);
 	}
 }
 
 // static
 LLView* LLSearchEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("search_editor");
+	std::string name("search_editor");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -2677,14 +2705,14 @@ LLView* LLSearchEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 	S32 max_text_length = 128;
 	node->getAttributeS32("max_length", max_text_length);
 
-	LLString text = node->getValue().substr(0, max_text_length - 1);
+	std::string text = node->getValue().substr(0, max_text_length - 1);
 
 	LLSearchEditor* search_editor = new LLSearchEditor(name,
 								rect, 
 								max_text_length,
 								NULL, NULL);
 
-	LLString label;
+	std::string label;
 	if(node->getAttributeString("label", label))
 	{
 		search_editor->mSearchEdit->setLabel(label);
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index c96e34d..09a240b 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -63,9 +63,9 @@ class LLLineEditor
 {
 
 public:
-	LLLineEditor(const LLString& name, 
+	LLLineEditor(const std::string& name, 
 				 const LLRect& rect,
-				 const LLString& default_text = LLString::null,
+				 const std::string& default_text = LLStringUtil::null,
 				 const LLFontGL* glfont = NULL,
 				 S32 max_length_bytes = 254,
 				 void (*commit_callback)(LLUICtrl* caller, void* user_data) = NULL,
@@ -132,14 +132,16 @@ public:
 	// assumes UTF8 text
 	virtual void	setValue(const LLSD& value ) { setText(value.asString()); }
 	virtual LLSD	getValue() const { return LLSD(getText()); }
-	virtual BOOL	setTextArg( const LLString& key, const LLStringExplicit& text );
-	virtual BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setTextArg( const std::string& key, const LLStringExplicit& text );
+	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 
 	void			setLabel(const LLStringExplicit &new_label) { mLabel = new_label; }
 	void			setText(const LLStringExplicit &new_text);
 
-	const LLString& getText() const		{ return mText.getString(); }
+	const std::string& getText() const		{ return mText.getString(); }
 	const LLWString& getWText() const	{ return mText.getWString(); }
+	LLWString getConvertedText() const; // trimmed text with paragraphs converted to newlines
+
 	S32				getLength() const	{ return mText.length(); }
 
 	S32				getCursor()	const	{ return mCursorPos; }
@@ -205,7 +207,7 @@ public:
 	static BOOL		prevalidatePrintableNoSpace(const LLWString &str);
 	static BOOL		prevalidateASCII(const LLWString &str);
 
-	static BOOL		postvalidateFloat(const LLString &str);
+	static BOOL		postvalidateFloat(const std::string &str);
 
 	// line history support:
 	void			setEnableLineHistory( BOOL enabled ) { mHaveHistory = enabled; } // switches line history on or off 
@@ -242,12 +244,12 @@ private:
 
 protected:
 	LLUIString		mText;					// The string being edited.
-	LLString		mPrevText;				// Saved string for 'ESC' revert
+	std::string		mPrevText;				// Saved string for 'ESC' revert
 	LLUIString		mLabel;					// text label that is visible when no user text provided
 
 	// line history support:
 	BOOL		mHaveHistory;				// flag for enabled line history
-	std::vector<LLString> mLineHistory;		// line history storage
+	std::vector<std::string> mLineHistory;		// line history storage
 	U32			mCurrentHistoryLine;		// currently browsed history line
 
 	LLViewBorder* mBorder;
@@ -307,7 +309,7 @@ protected:
 private:
 	// Utility on top of LLUI::getUIImage, looks up a named image in a given XML node and returns it if possible
 	// or returns a given default image if anything in the process fails.
-	static LLPointer<LLUIImage> parseImage(LLString name, LLXMLNodePtr from, LLPointer<LLUIImage> def);
+	static LLPointer<LLUIImage> parseImage(std::string name, LLXMLNodePtr from, LLPointer<LLUIImage> def);
 	// Global instance used as default for member instance below.
 	static LLPointer<LLUIImage> sImage;
 	// Instances that by default point to the statics but can be overidden in XML.
@@ -341,10 +343,10 @@ private:
 			ed->mPrevText = mText;
 		}
 
-		LLString getText()   { return mText; }
+		std::string getText()   { return mText; }
 
 	private:
-		LLString mText;
+		std::string mText;
 		S32		mCursorPos;
 		S32		mScrollHPos;
 		BOOL	mIsSelecting;
@@ -362,10 +364,10 @@ private:
 class LLSearchEditor : public LLUICtrl
 {
 public:
-	LLSearchEditor(const LLString& name, 
+	LLSearchEditor(const std::string& name, 
 		const LLRect& rect,
 		S32 max_length_bytes,
-		void (*search_callback)(const LLString& search_string, void* user_data),
+		void (*search_callback)(const std::string& search_string, void* user_data),
 		void* userdata);
 
 	virtual ~LLSearchEditor() {}
@@ -376,13 +378,13 @@ public:
 
 	void setText(const LLStringExplicit &new_text) { mSearchEdit->setText(new_text); }
 
-	void setSearchCallback(void (*search_callback)(const LLString& search_string, void* user_data), void* data) { mSearchCallback = search_callback; mCallbackUserData = data; }
+	void setSearchCallback(void (*search_callback)(const std::string& search_string, void* user_data), void* data) { mSearchCallback = search_callback; mCallbackUserData = data; }
 
 	// LLUICtrl interface
 	virtual void	setValue(const LLSD& value );
 	virtual LLSD	getValue() const;
-	virtual BOOL	setTextArg(  const LLString& key, const LLStringExplicit& text );
-	virtual BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setTextArg( const std::string& key, const LLStringExplicit& text );
+	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 	virtual void	clear();
 
 private:
@@ -391,7 +393,7 @@ private:
 
 	LLLineEditor* mSearchEdit;
 	class LLButton* mClearSearchButton;
-	void (*mSearchCallback)(const LLString& search_string, void* user_data);
+	void (*mSearchCallback)(const std::string& search_string, void* user_data);
 
 };
 
diff --git a/linden/indra/llui/llmemberlistener.h b/linden/indra/llui/llmemberlistener.h
index 6f4ba8b..a81f767 100644
--- a/linden/indra/llui/llmemberlistener.h
+++ b/linden/indra/llui/llmemberlistener.h
@@ -66,7 +66,7 @@ class LLMemberListener : public LLSimpleListener
 public:
 	LLMemberListener() : mPtr(NULL), mRegisteredName() { }
 
-	void registerListener(T *pointer, const LLString& register_name)
+	void registerListener(T *pointer, const std::string& register_name)
 	{
 		mPtr = pointer;
 		mRegisteredName = register_name;
@@ -78,7 +78,7 @@ public:
 
 protected:
 	T *mPtr; // The object that this listener manipulates
-	LLString mRegisteredName;
+	std::string mRegisteredName;
 };
 
 
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 5e46ab7..24cc47e 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -46,7 +46,6 @@
 #include "llmenugl.h"
 
 #include "llmath.h"
-#include "llgl.h"
 #include "llrender.h"
 #include "llfocusmgr.h"
 #include "llfont.h"
@@ -59,7 +58,6 @@
 #include "llresmgr.h"
 #include "llui.h"
 
-#include "llglheaders.h"
 #include "llstl.h"
 
 #include "v2math.h"
@@ -76,10 +74,10 @@ S32 MENU_BAR_WIDTH = 0;
 /// Local function declarations, constants, enums, and typedefs
 ///============================================================================
 
-const LLString SEPARATOR_NAME("separator");
-const LLString TEAROFF_SEPARATOR_LABEL( "~~~~~~~~~~~" );
-const LLString SEPARATOR_LABEL( "-----------" );
-const LLString VERTICAL_SEPARATOR_LABEL( "|" );
+const std::string SEPARATOR_NAME("separator");
+const std::string TEAROFF_SEPARATOR_LABEL( "~~~~~~~~~~~" );
+const std::string SEPARATOR_LABEL( "-----------" );
+const std::string VERTICAL_SEPARATOR_LABEL( "|" );
 
 const S32 LABEL_BOTTOM_PAD_PIXELS = 2;
 
@@ -100,10 +98,10 @@ const U32 SEPARATOR_HEIGHT_PIXELS = 8;
 const S32 TEAROFF_SEPARATOR_HEIGHT_PIXELS = 10;
 const S32 MENU_ITEM_PADDING = 4;
 
-const LLString BOOLEAN_TRUE_PREFIX( "X" );
-const LLString BRANCH_SUFFIX( ">" );
-const LLString ARROW_UP  ("^^^^^^^");
-const LLString ARROW_DOWN("vvvvvvv");
+const std::string BOOLEAN_TRUE_PREFIX( "X" );
+const std::string BRANCH_SUFFIX( ">" );
+const std::string ARROW_UP  ("^^^^^^^");
+const std::string ARROW_DOWN("vvvvvvv");
 
 const F32 MAX_MOUSE_SLOPE_SUB_MENU = 0.9f;
 
@@ -132,7 +130,7 @@ const F32 ACTIVATE_HIGHLIGHT_TIME = 0.3f;
 ///============================================================================
 
 // Default constructor
-LLMenuItemGL::LLMenuItemGL( const LLString& name, const LLString& label, KEY key, MASK mask ) :
+LLMenuItemGL::LLMenuItemGL( const std::string& name, const std::string& label, KEY key, MASK mask ) :
 	LLView( name, TRUE ),
 	mJumpKey(KEY_NONE),
 	mAcceleratorKey( key ),
@@ -222,7 +220,7 @@ BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp)
 
 			// *NOTE: get calling code to throw up warning or route
 			// warning messages back to app-provided output
-			//	LLString warning;
+			//	std::string warning;
 			//	warning.append("Duplicate key binding <");
 			//	appendAcceleratorString( warning );
 			//	warning.append("> for menu items:\n    ");
@@ -252,7 +250,7 @@ BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp)
 
 // This function appends the character string representation of
 // the current accelerator key and mask to the provided string.
-void LLMenuItemGL::appendAcceleratorString( LLString& st ) const
+void LLMenuItemGL::appendAcceleratorString( std::string& st ) const
 {
 	// break early if this is a silly thing to do.
 	if( KEY_NONE == mAcceleratorKey )
@@ -288,7 +286,7 @@ void LLMenuItemGL::appendAcceleratorString( LLString& st ) const
 		st.append( "Shift-" );
 #endif
 
-	LLString keystr = LLKeyboard::stringFromKey( mAcceleratorKey );
+	std::string keystr = LLKeyboard::stringFromKey( mAcceleratorKey );
 	if ((mAcceleratorMask & MASK_NORMALKEYS) &&
 		(keystr[0] == '-' || keystr[0] == '='))
 	{
@@ -336,7 +334,7 @@ U32 LLMenuItemGL::getNominalWidth( void ) const
 	if( KEY_NONE != mAcceleratorKey )
 	{
 		width += ACCEL_PAD_PIXELS;
-		LLString temp;
+		std::string temp;
 		appendAcceleratorString( temp );
 		width += mFont->getWidth( temp );
 	}
@@ -348,7 +346,7 @@ U32 LLMenuItemGL::getNominalWidth( void ) const
 void LLMenuItemGL::buildDrawLabel( void )
 {
 	mDrawAccelLabel.clear();
-	LLString st = mDrawAccelLabel.getString();
+	std::string st = mDrawAccelLabel.getString();
 	appendAcceleratorString( st );
 	mDrawAccelLabel = st;
 }
@@ -493,8 +491,8 @@ void LLMenuItemGL::draw( void )
 	// underline "jump" key only when keyboard navigation has been initiated
 	if (getMenu()->jumpKeysActive() && LLMenuGL::getKeyboardMode())
 	{
-		LLString upper_case_label = mLabel.getString();
-		LLString::toUpper(upper_case_label);
+		std::string upper_case_label = mLabel.getString();
+		LLStringUtil::toUpper(upper_case_label);
 		std::string::size_type offset = upper_case_label.find(mJumpKey);
 		if (offset != std::string::npos)
 		{
@@ -508,7 +506,7 @@ void LLMenuItemGL::draw( void )
 	setHover(FALSE);
 }
 
-BOOL LLMenuItemGL::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLMenuItemGL::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	mLabel.setArg(key, text);
 	return TRUE;
@@ -523,9 +521,9 @@ BOOL LLMenuItemGL::setLabelArg( const LLString& key, const LLStringExplicit& tex
 class LLMenuItemSeparatorGL : public LLMenuItemGL
 {
 public:
-	LLMenuItemSeparatorGL( const LLString &name = SEPARATOR_NAME );
+	LLMenuItemSeparatorGL( const std::string &name = SEPARATOR_NAME );
 
-	virtual LLString getType() const	{ return "separator"; }
+	virtual std::string getType() const	{ return "separator"; }
 
 	// doIt() - do the primary funcationality of the menu item.
 	virtual void doIt( void ) {}
@@ -538,7 +536,7 @@ public:
 	virtual U32 getNominalHeight( void ) const { return SEPARATOR_HEIGHT_PIXELS; }
 };
 
-LLMenuItemSeparatorGL::LLMenuItemSeparatorGL( const LLString &name ) :
+LLMenuItemSeparatorGL::LLMenuItemSeparatorGL( const std::string &name ) :
 	LLMenuItemGL( name, SEPARATOR_LABEL )
 {
 }
@@ -617,7 +615,7 @@ LLMenuItemVerticalSeparatorGL::LLMenuItemVerticalSeparatorGL( void )
 // Class LLMenuItemTearOffGL
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 LLMenuItemTearOffGL::LLMenuItemTearOffGL(LLHandle<LLFloater> parent_floater_handle) : 
-	LLMenuItemGL("tear off", TEAROFF_SEPARATOR_LABEL), 
+	LLMenuItemGL(std::string("tear off"), TEAROFF_SEPARATOR_LABEL), 
 	mParentHandle(parent_floater_handle)
 {
 }
@@ -696,7 +694,7 @@ U32 LLMenuItemTearOffGL::getNominalHeight( void ) const
 class LLMenuItemBlankGL : public LLMenuItemGL
 {
 public:
-	LLMenuItemBlankGL( void ) :	LLMenuItemGL( "", "" )
+	LLMenuItemBlankGL( void ) :	LLMenuItemGL( LLStringUtil::null, LLStringUtil::null )
 	{
 		setEnabled(FALSE);
 	}
@@ -709,8 +707,8 @@ public:
 /// Class LLMenuItemCallGL
 ///============================================================================
 
-LLMenuItemCallGL::LLMenuItemCallGL( const LLString& name, 
-									const LLString& label, 
+LLMenuItemCallGL::LLMenuItemCallGL( const std::string& name, 
+									const std::string& label, 
 									menu_callback clicked_cb, 
 								    enabled_callback enabled_cb,
 									void* user_data,
@@ -727,7 +725,7 @@ LLMenuItemCallGL::LLMenuItemCallGL( const LLString& name,
 	if(!enabled) setEnabled(FALSE);
 }
 
-LLMenuItemCallGL::LLMenuItemCallGL( const LLString& name, 
+LLMenuItemCallGL::LLMenuItemCallGL( const std::string& name, 
 									menu_callback clicked_cb, 
 								    enabled_callback enabled_cb,
 									void* user_data,
@@ -744,8 +742,8 @@ LLMenuItemCallGL::LLMenuItemCallGL( const LLString& name,
 	if(!enabled) setEnabled(FALSE);
 }
 
-LLMenuItemCallGL::LLMenuItemCallGL(const LLString& name,
-								   const LLString& label,
+LLMenuItemCallGL::LLMenuItemCallGL(const std::string& name,
+								   const std::string& label,
 								   menu_callback clicked_cb,
 								   enabled_callback enabled_cb,
 								   label_callback label_cb,
@@ -763,7 +761,7 @@ LLMenuItemCallGL::LLMenuItemCallGL(const LLString& name,
 	if(!enabled) setEnabled(FALSE);
 }
 
-LLMenuItemCallGL::LLMenuItemCallGL(const LLString& name,
+LLMenuItemCallGL::LLMenuItemCallGL(const std::string& name,
 								   menu_callback clicked_cb,
 								   enabled_callback enabled_cb,
 								   label_callback label_cb,
@@ -781,7 +779,7 @@ LLMenuItemCallGL::LLMenuItemCallGL(const LLString& name,
 	if(!enabled) setEnabled(FALSE);
 }
 
-void LLMenuItemCallGL::setEnabledControl(LLString enabled_control, LLView *context)
+void LLMenuItemCallGL::setEnabledControl(std::string enabled_control, LLView *context)
 {
 	// Register new listener
 	if (!enabled_control.empty())
@@ -798,7 +796,7 @@ void LLMenuItemCallGL::setEnabledControl(LLString enabled_control, LLView *conte
 	}
 }
 
-void LLMenuItemCallGL::setVisibleControl(LLString visible_control, LLView *context)
+void LLMenuItemCallGL::setVisibleControl(std::string visible_control, LLView *context)
 {
 	// Register new listener
 	if (!visible_control.empty())
@@ -826,7 +824,7 @@ LLXMLNodePtr LLMenuItemCallGL::getXML(bool save_children) const
 	std::vector<LLListenerEntry>::iterator itor;
 	for (itor = listeners.begin(); itor != listeners.end(); ++itor)
 	{
-		LLString listener_name = findEventListener((LLSimpleListener*)itor->listener);
+		std::string listener_name = findEventListener((LLSimpleListener*)itor->listener);
 		if (!listener_name.empty())
 		{
 			LLXMLNodePtr child_node = node->createChild("on_click", FALSE);
@@ -864,7 +862,7 @@ void LLMenuItemCallGL::buildDrawLabel( void )
 	}
 	if(mLabelCallback)
 	{
-		LLString label;
+		std::string label;
 		mLabelCallback(label, mUserData);
 		mLabel = label;
 	}
@@ -896,8 +894,8 @@ BOOL LLMenuItemCallGL::handleAcceleratorKey( KEY key, MASK mask )
 /// Class LLMenuItemCheckGL
 ///============================================================================
 
-LLMenuItemCheckGL::LLMenuItemCheckGL ( const LLString& name, 
-									   const LLString& label,
+LLMenuItemCheckGL::LLMenuItemCheckGL ( const std::string& name, 
+									   const std::string& label,
 									   menu_callback clicked_cb,
 									   enabled_callback enabled_cb,
 									   check_callback check_cb,
@@ -909,7 +907,7 @@ LLMenuItemCheckGL::LLMenuItemCheckGL ( const LLString& name,
 {
 }
 
-LLMenuItemCheckGL::LLMenuItemCheckGL ( const LLString& name, 
+LLMenuItemCheckGL::LLMenuItemCheckGL ( const std::string& name, 
 									   menu_callback clicked_cb,
 									   enabled_callback enabled_cb,
 									   check_callback check_cb,
@@ -921,11 +919,11 @@ LLMenuItemCheckGL::LLMenuItemCheckGL ( const LLString& name,
 {
 }
 
-LLMenuItemCheckGL::LLMenuItemCheckGL ( const LLString& name, 
-									   const LLString& label,
+LLMenuItemCheckGL::LLMenuItemCheckGL ( const std::string& name, 
+									   const std::string& label,
 									   menu_callback clicked_cb,
 									   enabled_callback enabled_cb,
-									   LLString control_name,
+									   std::string control_name,
 									   LLView *context,
 									   void* user_data,
 									   KEY key, MASK mask ) :
@@ -949,7 +947,7 @@ void LLMenuItemCheckGL::setValue(const LLSD& value)
 	}
 }
 
-void LLMenuItemCheckGL::setCheckedControl(LLString checked_control, LLView *context)
+void LLMenuItemCheckGL::setCheckedControl(std::string checked_control, LLView *context)
 {
 	// Register new listener
 	if (!checked_control.empty())
@@ -992,14 +990,14 @@ void LLMenuItemCheckGL::buildDrawLabel( void )
 /// Class LLMenuItemToggleGL
 ///============================================================================
 
-LLMenuItemToggleGL::LLMenuItemToggleGL( const LLString& name, const LLString& label, BOOL* toggle,
+LLMenuItemToggleGL::LLMenuItemToggleGL( const std::string& name, const std::string& label, BOOL* toggle,
 										KEY key, MASK mask ) :
 	LLMenuItemGL( name, label, key, mask ),
 	mToggle( toggle )
 {
 }
 
-LLMenuItemToggleGL::LLMenuItemToggleGL( const LLString& name, BOOL* toggle,
+LLMenuItemToggleGL::LLMenuItemToggleGL( const std::string& name, BOOL* toggle,
 										KEY key, MASK mask ) :
 	LLMenuItemGL( name, name, key, mask ),
 	mToggle( toggle )
@@ -1019,7 +1017,7 @@ void LLMenuItemToggleGL::buildDrawLabel( void )
 		mDrawBoolLabel.clear();
 	}
 	mDrawAccelLabel.clear();
-	LLString st = mDrawAccelLabel;
+	std::string st = mDrawAccelLabel;
 	appendAcceleratorString( st );
 	mDrawAccelLabel = st;
 }
@@ -1035,7 +1033,7 @@ void LLMenuItemToggleGL::doIt( void )
 }
 
 
-LLMenuItemBranchGL::LLMenuItemBranchGL( const LLString& name, const LLString& label, LLMenuGL* branch,
+LLMenuItemBranchGL::LLMenuItemBranchGL( const std::string& name, const std::string& label, LLMenuGL* branch,
 										KEY key, MASK mask ) :
 	LLMenuItemGL( name, label, key, mask ),
 	mBranch( branch )
@@ -1045,7 +1043,7 @@ LLMenuItemBranchGL::LLMenuItemBranchGL( const LLString& name, const LLString& la
 }
 
 // virtual
-LLView* LLMenuItemBranchGL::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLMenuItemBranchGL::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
 {
 	// richard: this is redundant with parent, remove
 	if (mBranch->getName() == name)
@@ -1111,7 +1109,7 @@ BOOL LLMenuItemBranchGL::addToAcceleratorList(std::list<LLKeyBinding*> *listp)
 void LLMenuItemBranchGL::buildDrawLabel( void )
 {
 	mDrawAccelLabel.clear();
-	LLString st = mDrawAccelLabel;
+	std::string st = mDrawAccelLabel;
 	appendAcceleratorString( st );
 	mDrawAccelLabel = st;
 	mDrawBranchLabel = BRANCH_SUFFIX;
@@ -1327,10 +1325,10 @@ class LLMenuItemBranchDownGL : public LLMenuItemBranchGL
 protected:
 
 public:
-	LLMenuItemBranchDownGL( const LLString& name, const LLString& label, LLMenuGL* branch,
+	LLMenuItemBranchDownGL( const std::string& name, const std::string& label, LLMenuGL* branch,
 							KEY key = KEY_NONE, MASK mask = MASK_NONE );
 
-	virtual LLString getType() const	{ return "menu"; }
+	virtual std::string getType() const	{ return "menu"; }
 
 	// returns the normal width of this control in pixels - this is
 	// used for calculating the widest item, as well as for horizontal
@@ -1358,8 +1356,8 @@ public:
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 };
 
-LLMenuItemBranchDownGL::LLMenuItemBranchDownGL( const LLString& name,
-												const LLString& label,
+LLMenuItemBranchDownGL::LLMenuItemBranchDownGL( const std::string& name,
+												const std::string& label,
 												LLMenuGL* branch, 
 												KEY key, MASK mask ) :
 	LLMenuItemBranchGL( name, label, branch, key, mask )
@@ -1380,7 +1378,7 @@ U32 LLMenuItemBranchDownGL::getNominalWidth( void ) const
 void LLMenuItemBranchDownGL::buildDrawLabel( void )
 {
 	mDrawAccelLabel.clear();
-	LLString st = mDrawAccelLabel;
+	std::string st = mDrawAccelLabel;
 	appendAcceleratorString( st );
 	mDrawAccelLabel = st;
 }
@@ -1593,8 +1591,8 @@ void LLMenuItemBranchDownGL::draw( void )
 	// underline navigation key only when keyboard navigation has been initiated
 	if (getMenu()->jumpKeysActive() && LLMenuGL::getKeyboardMode())
 	{
-		LLString upper_case_label = mLabel.getString();
-		LLString::toUpper(upper_case_label);
+		std::string upper_case_label = mLabel.getString();
+		LLStringUtil::toUpper(upper_case_label);
 		std::string::size_type offset = upper_case_label.find(getJumpKey());
 		if (offset != std::string::npos)
 		{
@@ -1617,7 +1615,7 @@ void LLMenuItemBranchDownGL::draw( void )
 static LLRegisterWidget<LLMenuGL> r1("menu");
 
 // Default constructor
-LLMenuGL::LLMenuGL( const LLString& name, const LLString& label, LLHandle<LLFloater> parent_floater_handle )
+LLMenuGL::LLMenuGL( const std::string& name, const std::string& label, LLHandle<LLFloater> parent_floater_handle )
 :	LLUICtrl( name, LLRect(), FALSE, NULL, NULL ),
 	mBackgroundColor( sDefaultBackgroundColor ),
 	mBgVisible( TRUE ),
@@ -1642,7 +1640,7 @@ LLMenuGL::LLMenuGL( const LLString& name, const LLString& label, LLHandle<LLFloa
 	setTabStop(FALSE);
 }
 
-LLMenuGL::LLMenuGL( const LLString& label, LLHandle<LLFloater> parent_floater_handle )
+LLMenuGL::LLMenuGL( const std::string& label, LLHandle<LLFloater> parent_floater_handle )
 :	LLUICtrl( label, LLRect(), FALSE, NULL, NULL ),
 	mBackgroundColor( sDefaultBackgroundColor ),
 	mBgVisible( TRUE ),
@@ -1751,10 +1749,10 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 	{
 		LLMenuItemGL *item = NULL;
 
-		LLString type;
-		LLString item_name;
-		LLString source_label;
-		LLString item_label;
+		std::string type;
+		std::string item_name;
+		std::string source_label;
+		std::string item_label;
 		KEY		 jump_key = KEY_NONE;
 
 		child->getAttributeString("type", type);
@@ -1796,7 +1794,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 				child->getAttributeBOOL("useMacCtrl", useMacCtrl);
 #endif // LL_DARWIN
 				
-				LLString shortcut;
+				std::string shortcut;
 				child->getAttributeString("shortcut", shortcut);
 				if (shortcut.find("control") != shortcut.npos)
 				{
@@ -1817,7 +1815,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 					mask |= MASK_SHIFT;
 				}
 				S32 pipe_pos = shortcut.rfind("|");
-				LLString key_str = shortcut.substr(pipe_pos+1);
+				std::string key_str = shortcut.substr(pipe_pos+1);
 
 				KEY key = KEY_NONE;
 				LLKeyboard::keyFromString(key_str, &key);
@@ -1827,7 +1825,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 
 				if (child->hasName(LL_MENU_ITEM_CHECK_GL_TAG))
 				{
-					LLString control_name;
+					std::string control_name;
 					child->getAttributeString("control_name", control_name);
 
 					new_item = new LLMenuItemCheckGL(item_name, item_label, 0, 0, control_name, parent, 0, key, mask);
@@ -1836,15 +1834,15 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 					{
 						if (call_child->hasName("on_check"))
 						{
-							LLString callback_name;
-							LLString control_name = "";
+							std::string callback_name;
+							std::string control_name;
 							if (call_child->hasAttribute("function"))
 							{
 								call_child->getAttributeString("function", callback_name);
 
 								control_name = callback_name;
 
-								LLString callback_data = item_name;
+								std::string callback_data = item_name;
 								if (call_child->hasAttribute("userdata"))
 								{
 									call_child->getAttributeString("userdata", callback_data);
@@ -1890,10 +1888,10 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 				{
 					if (call_child->hasName("on_click"))
 					{
-						LLString callback_name;
+						std::string callback_name;
 						call_child->getAttributeString("function", callback_name);
 
-						LLString callback_data = item_name;
+						std::string callback_data = item_name;
 						if (call_child->hasAttribute("userdata"))
 						{
 							call_child->getAttributeString("userdata", callback_data);
@@ -1907,15 +1905,15 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 					}
 					if (call_child->hasName("on_enable"))
 					{
-						LLString callback_name;
-						LLString control_name = "";
+						std::string callback_name;
+						std::string control_name;
 						if (call_child->hasAttribute("function"))
 						{
 							call_child->getAttributeString("function", callback_name);
 
 							control_name = callback_name;
 
-							LLString callback_data = "";
+							std::string callback_data;
 							if (call_child->hasAttribute("userdata"))
 							{
 								call_child->getAttributeString("userdata", callback_data);
@@ -1947,15 +1945,15 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 					}
 					if (call_child->hasName("on_visible"))
 					{
-						LLString callback_name;
-						LLString control_name = "";
+						std::string callback_name;
+						std::string control_name;
 						if (call_child->hasAttribute("function"))
 						{
 							call_child->getAttributeString("function", callback_name);
 
 							control_name = callback_name;
 
-							LLString callback_data = "";
+							std::string callback_data;
 							if (call_child->hasAttribute("userdata"))
 							{
 								call_child->getAttributeString("userdata", callback_data);
@@ -2047,14 +2045,14 @@ BOOL LLMenuGL::isOpen()
 // static
 LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("menu");
+	std::string name("menu");
 	node->getAttributeString("name", name);
 
-	LLString label = name;
+	std::string label = name;
 	node->getAttributeString("label", label);
 
 	// parse jump key out of label
-	LLString new_menu_label;
+	std::string new_menu_label;
 
 	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 	boost::char_separator<char> sep("_");
@@ -2134,7 +2132,7 @@ void LLMenuGL::arrange( void )
 		U32 max_width = getTornOff() ? U32_MAX : menu_region_rect.getWidth();
 		U32 max_height = getTornOff() ? U32_MAX : menu_region_rect.getHeight();
 		// *FIX: create the item first and then ask for its dimensions?
-		S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::sSansSerif->getWidth( "More" );
+		S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::sSansSerif->getWidth( std::string("More") );
 		S32 spillover_item_height = llround(LLFontGL::sSansSerif->getLineHeight()) + MENU_ITEM_PADDING;
 
 		if (mHorizontalLayout)
@@ -2251,13 +2249,13 @@ void LLMenuGL::createSpilloverBranch()
 		delete mSpilloverMenu;
 		// technically, you can't tear off spillover menus, but we're passing the handle
 		// along just to be safe
-		mSpilloverMenu = new LLMenuGL("More", "More", mParentFloaterHandle);
+		mSpilloverMenu = new LLMenuGL(std::string("More"), std::string("More"), mParentFloaterHandle);
 		mSpilloverMenu->updateParent(LLMenuGL::sMenuContainer);
 		// Inherit colors
 		mSpilloverMenu->setBackgroundColor( mBackgroundColor );
 		mSpilloverMenu->setCanTearOff(FALSE);
 
-		mSpilloverBranch = new LLMenuItemBranchGL("More", "More", mSpilloverMenu);
+		mSpilloverBranch = new LLMenuItemBranchGL(std::string("More"), std::string("More"), mSpilloverMenu);
 		mSpilloverBranch->setFontStyle(LLFontGL::ITALIC);
 	}
 }
@@ -2297,8 +2295,8 @@ void LLMenuGL::createJumpKeys()
 {
 	mJumpKeys.clear();
 
-	std::set<LLString> unique_words;
-	std::set<LLString> shared_words;
+	std::set<std::string> unique_words;
+	std::set<std::string> shared_words;
 
 	item_list_t::iterator item_it;
 	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
@@ -2306,8 +2304,8 @@ void LLMenuGL::createJumpKeys()
 
 	for(item_it = mItems.begin(); item_it != mItems.end(); ++item_it)
 	{
-		LLString uppercase_label = (*item_it)->getLabel();
-		LLString::toUpper(uppercase_label);
+		std::string uppercase_label = (*item_it)->getLabel();
+		LLStringUtil::toUpper(uppercase_label);
 
 		tokenizer tokens(uppercase_label, sep);
 		tokenizer::iterator token_iter;
@@ -2352,8 +2350,8 @@ void LLMenuGL::createJumpKeys()
 		{
 			continue;
 		}
-		LLString uppercase_label = (*item_it)->getLabel();
-		LLString::toUpper(uppercase_label);
+		std::string uppercase_label = (*item_it)->getLabel();
+		LLStringUtil::toUpper(uppercase_label);
 
 		tokenizer tokens(uppercase_label, sep);
 		tokenizer::iterator token_iter;
@@ -2361,7 +2359,7 @@ void LLMenuGL::createJumpKeys()
 		BOOL found_key = FALSE;
 		for( token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
 		{
-			LLString uppercase_word = *token_iter;
+			std::string uppercase_word = *token_iter;
 
 			// this word is not shared with other menu entries...
 			if (shared_words.find(*token_iter) == shared_words.end())
@@ -2441,9 +2439,13 @@ BOOL LLMenuGL::append( LLMenuItemGL* item )
 }
 
 // add a separator to this menu
-BOOL LLMenuGL::appendSeparator( const LLString &separator_name )
+BOOL LLMenuGL::appendSeparator( const std::string &separator_name )
 {
-	LLMenuItemGL* separator = new LLMenuItemSeparatorGL(separator_name);
+	LLMenuItemGL* separator;
+	if (separator_name.empty())
+		separator = new LLMenuItemSeparatorGL(std::string("separator"));
+	else
+		separator = new LLMenuItemSeparatorGL(separator_name);
 	return append( separator );
 }
 
@@ -2480,7 +2482,7 @@ void LLMenuGL::setEnabledSubMenus(BOOL enable)
 
 // setItemEnabled() - pass the label and the enable flag for a menu
 // item. TRUE will make sure it's enabled, FALSE will disable it.
-void LLMenuGL::setItemEnabled( const LLString& name, BOOL enable )
+void LLMenuGL::setItemEnabled( const std::string& name, BOOL enable )
 {
 	item_list_t::iterator item_iter;
 	for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
@@ -2494,7 +2496,7 @@ void LLMenuGL::setItemEnabled( const LLString& name, BOOL enable )
 	}
 }
 
-void LLMenuGL::setItemVisible( const LLString& name, BOOL visible )
+void LLMenuGL::setItemVisible( const std::string& name, BOOL visible )
 {
 	item_list_t::iterator item_iter;
 	for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
@@ -2873,7 +2875,7 @@ void LLMenuGL::setVisible(BOOL visible)
 	}
 }
 
-LLMenuGL* LLMenuGL::getChildMenuByName(const LLString& name, BOOL recurse) const
+LLMenuGL* LLMenuGL::getChildMenuByName(const std::string& name, BOOL recurse) const
 {
 	LLView* view = getChildView(name, recurse, FALSE);
 	if (view)
@@ -2965,7 +2967,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 class LLPieMenuBranch : public LLMenuItemGL
 {
 public:
-	LLPieMenuBranch(const LLString& name, const LLString& label, LLPieMenu* branch);
+	LLPieMenuBranch(const std::string& name, const std::string& label, LLPieMenu* branch);
 
 	// called to rebuild the draw label
 	virtual void buildDrawLabel( void );
@@ -2979,8 +2981,8 @@ protected:
 	LLPieMenu* mBranch;
 };
 
-LLPieMenuBranch::LLPieMenuBranch(const LLString& name,
-								 const LLString& label,
+LLPieMenuBranch::LLPieMenuBranch(const std::string& name,
+								 const std::string& label,
 								 LLPieMenu* branch) 
 :	LLMenuItemGL( name, label, KEY_NONE, MASK_NONE ),
 	mBranch( branch )
@@ -3013,7 +3015,7 @@ void LLPieMenuBranch::buildDrawLabel( void )
 	}
 
 	mDrawAccelLabel.clear();
-	LLString st = mDrawAccelLabel;
+	std::string st = mDrawAccelLabel;
 	appendAcceleratorString( st );
 	mDrawAccelLabel = st;
 	
@@ -3039,7 +3041,7 @@ void LLPieMenuBranch::doIt( void )
 // class LLPieMenu
 // A circular menu of items, icons, etc.
 //-----------------------------------------------------------------------------
-LLPieMenu::LLPieMenu(const LLString& name, const LLString& label)
+LLPieMenu::LLPieMenu(const std::string& name, const std::string& label)
 :	LLMenuGL(name, label),
 	mFirstMouseDown(FALSE),
 	mUseInfiniteRadius(FALSE),
@@ -3054,7 +3056,7 @@ LLPieMenu::LLPieMenu(const LLString& name, const LLString& label)
 	setCanTearOff(FALSE);
 }
 
-LLPieMenu::LLPieMenu(const LLString& name)
+LLPieMenu::LLPieMenu(const std::string& name)
 :	LLMenuGL(name, name),
 	mFirstMouseDown(FALSE),
 	mUseInfiniteRadius(FALSE),
@@ -3078,9 +3080,9 @@ void LLPieMenu::initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *fac
 		if (child->hasName(LL_PIE_MENU_TAG))
 		{
 			// SUBMENU
-			LLString name("menu");
+			std::string name("menu");
 			child->getAttributeString("name", name);
-			LLString label(name);
+			std::string label(name);
 			child->getAttributeString("label", label);
 
 			LLPieMenu *submenu = new LLPieMenu(name, label);
@@ -3458,7 +3460,7 @@ BOOL LLPieMenu::append(LLMenuItemGL *item)
 }
 
 // virtual
-BOOL LLPieMenu::appendSeparator(const LLString &separator_name)
+BOOL LLPieMenu::appendSeparator(const std::string &separator_name)
 {
 	LLMenuItemGL* separator = new LLMenuItemBlankGL();
 	separator->setFont( LLFontGL::sSansSerifSmall );
@@ -3482,8 +3484,8 @@ BOOL LLPieMenu::appendPieMenu(LLPieMenu *menu)
 // virtual
 void LLPieMenu::arrange()
 {
-	const S32 rect_height = 180;
-	const S32 rect_width = 180;
+	const S32 rect_height = 190;
+	const S32 rect_width = 190;
 
 	// all divide by 6
 	const S32 CARD_X = 60;
@@ -3739,7 +3741,7 @@ void LLPieMenu::hide(BOOL item_selected)
 static LLRegisterWidget<LLMenuBarGL> r2("menu_bar");
 
 // Default constructor
-LLMenuBarGL::LLMenuBarGL( const LLString& name ) : LLMenuGL ( name, name )
+LLMenuBarGL::LLMenuBarGL( const std::string& name ) : LLMenuGL ( name, name )
 {
 	mHorizontalLayout = TRUE;
 	setCanTearOff(FALSE);
@@ -3784,7 +3786,7 @@ LLXMLNodePtr LLMenuBarGL::getXML(bool save_children) const
 
 LLView* LLMenuBarGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("menu");
+	std::string name("menu");
 	node->getAttributeString("name", name);
 
 	BOOL opaque = FALSE;
@@ -3879,6 +3881,8 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
 		}
 		else
 		{
+			// close menus originating from other menu bars when first opening menu via keyboard
+			LLMenuGL::sMenuContainer->hideMenus();
 			highlightNextItem(NULL);
 			LLMenuGL::setKeyboardMode(TRUE);
 		}
@@ -3898,6 +3902,13 @@ BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask)
 	{
 		mAltKeyTrigger = FALSE;
 	}
+	
+	if (key == KEY_ESCAPE && mask == MASK_NONE)
+	{
+		LLMenuGL::setKeyboardMode(FALSE);
+		// if any menus are visible, this will return TRUE, stopping further processing of ESCAPE key
+		return LLMenuGL::sMenuContainer->hideMenus();
+	}
 
 	// before processing any other key, check to see if ALT key has triggered menu access
 	checkMenuTrigger();
@@ -3921,13 +3932,38 @@ BOOL LLMenuBarGL::handleJumpKey(KEY key)
 	return TRUE;
 }
 
+BOOL LLMenuBarGL::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	// clicks on menu bar closes existing menus from other contexts but leave
+	// own menu open so that we get toggle behavior
+	if (!getHighlightedItem() || !getHighlightedItem()->isActive())
+	{
+		LLMenuGL::sMenuContainer->hideMenus();
+	}
+
+	return LLMenuGL::handleMouseDown(x, y, mask);
+}
+
+BOOL LLMenuBarGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	// clicks on menu bar closes existing menus from other contexts but leave
+	// own menu open so that we get toggle behavior
+	if (!getHighlightedItem() || !getHighlightedItem()->isActive())
+	{
+		LLMenuGL::sMenuContainer->hideMenus();
+	}
+
+	return LLMenuGL::handleMouseDown(x, y, mask);
+}
+
+
 void LLMenuBarGL::draw()
 {
 	LLMenuItemGL* itemp = getHighlightedItem();
 	// If we are in mouse-control mode and the mouse cursor is not hovering over
-	// the current highlighted menu item and it isn't open, then remove the highlight.
-	// This is done via a polling mechanism here, as we don't receive notifications when
-	// the mouse cursor moves off of us
+	// the current highlighted menu item and it isn't open, then remove the
+	// highlight. This is done via a polling mechanism here, as we don't receive
+    // notifications when the mouse cursor moves off of us
 	if (itemp && !itemp->isOpen() && !itemp->getHover() && !LLMenuGL::getKeyboardMode())
 	{
 		clearHoverItem();
@@ -3954,6 +3990,9 @@ void LLMenuBarGL::checkMenuTrigger()
 			}
 			else
 			{
+				// close menus originating from other menu bars
+				LLMenuGL::sMenuContainer->hideMenus();
+
 				highlightNextItem(NULL);
 				LLMenuGL::setKeyboardMode(TRUE);
 			}
@@ -4011,7 +4050,7 @@ S32 LLMenuBarGL::getRightmostMenuEdge()
 }
 
 // add a vertical separator to this menu
-BOOL LLMenuBarGL::appendSeparator( const LLString &separator_name )
+BOOL LLMenuBarGL::appendSeparator( const std::string &separator_name )
 {
 	LLMenuItemGL* separator = new LLMenuItemVerticalSeparatorGL();
 	return append( separator );
@@ -4110,14 +4149,14 @@ BOOL LLMenuBarGL::handleHover( S32 x, S32 y, MASK mask )
 /// Class LLMenuHolderGL
 ///============================================================================
 LLMenuHolderGL::LLMenuHolderGL()
-:	LLPanel("Menu Holder")
+	:	LLPanel(std::string("Menu Holder"))
 {
 	setMouseOpaque(FALSE);
 	sItemActivationTimer.stop();
 	mCanHide = TRUE;
 }
 
-LLMenuHolderGL::LLMenuHolderGL(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows) 
+LLMenuHolderGL::LLMenuHolderGL(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows) 
 :	LLPanel(name, rect, FALSE)
 {
 	setMouseOpaque(mouse_opaque);
@@ -4362,6 +4401,7 @@ LLTearOffMenu* LLTearOffMenu::create(LLMenuGL* menup)
 	// keep onscreen
 	gFloaterView->adjustToFitScreen(tearoffp, FALSE);
 	tearoffp->open();	/* Flawfinder: ignore */
+
 	return tearoffp;
 }
 
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index e7b009a..8561f1b 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -67,7 +67,7 @@ typedef BOOL (*check_callback)(void*);
 // This callback is potentially used by LLMenuItemCallGL. If provided,
 // this function is called whenever it's time to determine the label's
 // contents. Put the contents of the label in the provided parameter.
-typedef void (*label_callback)(LLString&,void*);
+typedef void (*label_callback)(std::string&,void*);
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLMenuItemGL
@@ -88,13 +88,13 @@ public:
 	static void setHighlightFGColor( const LLColor4& color ) { sHighlightForeground = color; }
 	static const LLColor4& getHighlightFGColor() { return sHighlightForeground; }
 
-	LLMenuItemGL( const LLString& name, const LLString& label, KEY key = KEY_NONE, MASK = MASK_NONE );
+	LLMenuItemGL( const std::string& name, const std::string& label, KEY key = KEY_NONE, MASK = MASK_NONE );
 
 	virtual void setValue(const LLSD& value) { setLabel(value.asString()); }
 
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 
-	virtual LLString getType() const	{ return "item"; }
+	virtual std::string getType() const	{ return "item"; }
 
 	virtual BOOL handleHover(S32 x, S32 y, MASK mask);
 
@@ -122,8 +122,8 @@ public:
 
 	// change the label
 	void setLabel( const LLStringExplicit& label ) { mLabel = label; }	
-	LLString getLabel( void ) const { return mLabel.getString(); }
-	virtual BOOL setLabelArg( const LLString& key, const LLStringExplicit& text );
+	std::string getLabel( void ) const { return mLabel.getString(); }
+	virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
 
 	// Get the parent menu for this item
 	virtual class LLMenuGL*	getMenu();
@@ -177,7 +177,7 @@ protected:
 
 	// This function appends the character string representation of
 	// the current accelerator key and mask to the provided string.
-	void appendAcceleratorString( LLString& st ) const;
+	void appendAcceleratorString( std::string& st ) const;
 
 	KEY mAcceleratorKey;
 	MASK mAcceleratorMask;
@@ -226,15 +226,15 @@ class LLMenuItemCallGL : public LLMenuItemGL, public LLObservable
 {
 public:
 	// normal constructor
-	LLMenuItemCallGL( const LLString& name,
+	LLMenuItemCallGL( const std::string& name,
  					  menu_callback clicked_cb, 
 					  enabled_callback enabled_cb = NULL,
 					  void* user_data = NULL, 
 					  KEY key = KEY_NONE, MASK mask = MASK_NONE,
 					  BOOL enabled = TRUE,
 					  on_disabled_callback on_disabled_cb = NULL);
-	LLMenuItemCallGL( const LLString& name,
-					  const LLString& label,
+	LLMenuItemCallGL( const std::string& name,
+					  const std::string& label,
  					  menu_callback clicked_cb, 
 					  enabled_callback enabled_cb = NULL,
 					  void* user_data = NULL, 
@@ -243,8 +243,8 @@ public:
 					  on_disabled_callback on_disabled_cb = NULL);
 
 	// constructor for when you want to trap the arrange method.
-	LLMenuItemCallGL( const LLString& name,
-					  const LLString& label,
+	LLMenuItemCallGL( const std::string& name,
+					  const std::string& label,
 					  menu_callback clicked_cb,
 					  enabled_callback enabled_cb,
 					  label_callback label_cb,
@@ -252,7 +252,7 @@ public:
 					  KEY key = KEY_NONE, MASK mask = MASK_NONE,
 					  BOOL enabled = TRUE,
 					  on_disabled_callback on_disabled_c = NULL);
-	LLMenuItemCallGL( const LLString& name,
+	LLMenuItemCallGL( const std::string& name,
 					  menu_callback clicked_cb,
 					  enabled_callback enabled_cb,
 					  label_callback label_cb,
@@ -262,11 +262,11 @@ public:
 					  on_disabled_callback on_disabled_c = NULL);
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 
-	virtual LLString getType() const	{ return "call"; }
+	virtual std::string getType() const	{ return "call"; }
 
 
-	void setEnabledControl(LLString enabled_control, LLView *context);
-	void setVisibleControl(LLString enabled_control, LLView *context);
+	void setEnabledControl(std::string enabled_control, LLView *context);
+	void setVisibleControl(std::string enabled_control, LLView *context);
 
 	void setMenuCallback(menu_callback callback, void* data) { mCallback = callback;  mUserData = data; };
 	menu_callback getMenuCallback() const { return mCallback; }
@@ -310,34 +310,34 @@ class LLMenuItemCheckGL
 :	public LLMenuItemCallGL
 {
 public:
-	LLMenuItemCheckGL( const LLString& name, 
-					   const LLString& label,
+	LLMenuItemCheckGL( const std::string& name, 
+					   const std::string& label,
 					   menu_callback callback,
 					   enabled_callback enabled_cb,
 					   check_callback check,
 					   void* user_data,
 					   KEY key = KEY_NONE, MASK mask = MASK_NONE );
-	LLMenuItemCheckGL( const LLString& name, 
+	LLMenuItemCheckGL( const std::string& name, 
 					   menu_callback callback,
 					   enabled_callback enabled_cb,
 					   check_callback check,
 					   void* user_data,
 					   KEY key = KEY_NONE, MASK mask = MASK_NONE );
-	LLMenuItemCheckGL( const LLString& name, 
-					   const LLString& label,
+	LLMenuItemCheckGL( const std::string& name, 
+					   const std::string& label,
 					   menu_callback callback,
 					   enabled_callback enabled_cb,
-					   LLString control_name,
+					   std::string control_name,
 					   LLView *context,
 					   void* user_data,
 					   KEY key = KEY_NONE, MASK mask = MASK_NONE );
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 
-	void setCheckedControl(LLString checked_control, LLView *context);
+	void setCheckedControl(std::string checked_control, LLView *context);
 
 	virtual void setValue(const LLSD& value);
 
-	virtual LLString getType() const	{ return "check"; }
+	virtual std::string getType() const	{ return "check"; }
 
 	// called to rebuild the draw label
 	virtual void buildDrawLabel( void );
@@ -358,15 +358,15 @@ private:
 class LLMenuItemToggleGL : public LLMenuItemGL
 {
 public:
-	LLMenuItemToggleGL( const LLString& name, const LLString& label,
+	LLMenuItemToggleGL( const std::string& name, const std::string& label,
 						BOOL* toggle, 
 						KEY key = KEY_NONE, MASK mask = MASK_NONE );
 
-	LLMenuItemToggleGL( const LLString& name,
+	LLMenuItemToggleGL( const std::string& name,
 						BOOL* toggle, 
 						KEY key = KEY_NONE, MASK mask = MASK_NONE );
 
-	virtual LLString getType() const	{ return "toggle"; }
+	virtual std::string getType() const	{ return "toggle"; }
 
 	// called to rebuild the draw label
 	virtual void buildDrawLabel( void );
@@ -401,8 +401,8 @@ class LLMenuGL
 	// let branching menu items use my protected traversal methods
 	friend class LLMenuItemBranchGL;
 public:
-	LLMenuGL( const LLString& name, const LLString& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>());
-	LLMenuGL( const LLString& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>() );
+	LLMenuGL( const std::string& name, const std::string& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>());
+	LLMenuGL( const std::string& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>() );
 	virtual ~LLMenuGL( void );
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 	static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -419,12 +419,12 @@ public:
 
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 
-	LLMenuGL* getChildMenuByName(const LLString& name, BOOL recurse) const;
+	LLMenuGL* getChildMenuByName(const std::string& name, BOOL recurse) const;
 	
 	BOOL clearHoverItem();
 
 	// return the name label
-	const LLString& getLabel( void ) const { return mLabel.getString(); }
+	const std::string& getLabel( void ) const { return mLabel.getString(); }
 	void setLabel(const LLStringExplicit& label) { mLabel = label; }
 
 	// background colors
@@ -438,7 +438,7 @@ public:
 	virtual BOOL append( LLMenuItemGL* item );
 
 	// add a separator to this menu
-	virtual BOOL appendSeparator( const LLString &separator_name = "separator" );
+	virtual BOOL appendSeparator( const std::string &separator_name = LLStringUtil::null );
 
 	// add a menu - this will create a cascading menu
 	virtual BOOL appendMenu( LLMenuGL* menu );
@@ -449,12 +449,12 @@ public:
 	// setItemEnabled() - pass the name and the enable flag for a
 	// menu item. TRUE will make sure it's enabled, FALSE will disable
 	// it.
-	void setItemEnabled( const LLString& name, BOOL enable ); 
+	void setItemEnabled( const std::string& name, BOOL enable ); 
 	
 	// propagate message to submenus
 	void setEnabledSubMenus(BOOL enable);
 
-	void setItemVisible( const LLString& name, BOOL visible);
+	void setItemVisible( const std::string& name, BOOL visible);
 	
 	// sets the left,bottom corner of menu, useful for popups
 	void setLeftAndBottom(S32 left, S32 bottom);
@@ -499,7 +499,7 @@ public:
 	void setDropShadowed( const BOOL shadowed );
 
 	void setParentMenuItem( LLMenuItemGL* parent_menu_item ) { mParentMenuItem = parent_menu_item; }
-	LLMenuItemGL* getParentMenuItem() { return mParentMenuItem; }
+	LLMenuItemGL* getParentMenuItem() const { return mParentMenuItem; }
 
 	void setTornOff(BOOL torn_off);
 	BOOL getTornOff() { return mTornOff; }
@@ -561,11 +561,11 @@ private:
 class LLMenuItemBranchGL : public LLMenuItemGL
 {
 public:
-	LLMenuItemBranchGL( const LLString& name, const LLString& label, LLMenuGL* branch,
+	LLMenuItemBranchGL( const std::string& name, const std::string& label, LLMenuGL* branch,
 						KEY key = KEY_NONE, MASK mask = MASK_NONE );
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 
-	virtual LLString getType() const { return "menu"; }
+	virtual std::string getType() const { return "menu"; }
 
 	virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
 
@@ -606,7 +606,7 @@ public:
 
 	virtual void openMenu();
 
-	virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 
 private:
 	LLMenuGL* mBranch;
@@ -623,8 +623,8 @@ class LLPieMenu
 : public LLMenuGL
 {
 public:
-	LLPieMenu(const LLString& name, const LLString& label);
-	LLPieMenu(const LLString& name);
+	LLPieMenu(const std::string& name, const std::string& label);
+	LLPieMenu(const std::string& name);
 	virtual ~LLPieMenu() {}
 
 	void initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *factory);
@@ -642,7 +642,7 @@ public:
 	virtual void drawBackground(LLMenuItemGL* itemp, LLColor4& color);
 
 	virtual BOOL append(LLMenuItemGL* item);
-	virtual BOOL appendSeparator( const LLString &separator_name = "separator" );
+	virtual BOOL appendSeparator( const std::string &separator_name = LLStringUtil::null );
 
 	BOOL appendPieMenu(LLPieMenu *menu);
 
@@ -682,7 +682,7 @@ private:
 class LLMenuBarGL : public LLMenuGL
 {
 public:
-	LLMenuBarGL( const LLString& name );
+	LLMenuBarGL( const std::string& name );
 	virtual ~LLMenuBarGL();
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 	static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -690,6 +690,8 @@ public:
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
 	virtual BOOL handleJumpKey(KEY key);
+	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 
 	// rearrange the child rects so they fit the shape of the menu
 	// bar.
@@ -698,7 +700,7 @@ public:
 	virtual BOOL jumpKeysActive();
 
 	// add a vertical separator to this menu
-	virtual BOOL appendSeparator( const LLString &separator_name = "separator" );
+	virtual BOOL appendSeparator( const std::string &separator_name = LLStringUtil::null );
 
 	// add a menu - this will create a drop down menu.
 	virtual BOOL appendMenu( LLMenuGL* menu );
@@ -727,7 +729,7 @@ class LLMenuHolderGL : public LLPanel
 {
 public:
 	LLMenuHolderGL();
-	LLMenuHolderGL(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows = FOLLOWS_NONE);
+	LLMenuHolderGL(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows = FOLLOWS_NONE);
 	virtual ~LLMenuHolderGL() {}
 
 	virtual BOOL hideMenus();
@@ -789,7 +791,7 @@ class LLMenuItemTearOffGL : public LLMenuItemGL
 public:
 	LLMenuItemTearOffGL( LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
 
-	virtual LLString getType() const { return "tearoff_menu"; }
+	virtual std::string getType() const { return "tearoff_menu"; }
 
 	virtual void doIt(void);
 	virtual void draw(void);
diff --git a/linden/indra/llui/llmodaldialog.cpp b/linden/indra/llui/llmodaldialog.cpp
index 160495d..1b05b0e 100644
--- a/linden/indra/llui/llmodaldialog.cpp
+++ b/linden/indra/llui/llmodaldialog.cpp
@@ -43,8 +43,8 @@
 // static
 std::list<LLModalDialog*> LLModalDialog::sModalStack;
 
-LLModalDialog::LLModalDialog( const LLString& title, S32 width, S32 height, BOOL modal )
-	: LLFloater( "modal container",
+LLModalDialog::LLModalDialog( const std::string& title, S32 width, S32 height, BOOL modal )
+	: LLFloater( std::string("modal container"),
 				 LLRect( 0, height, width, 0 ),
 				 title,
 				 FALSE, // resizable
diff --git a/linden/indra/llui/llmodaldialog.h b/linden/indra/llui/llmodaldialog.h
index 77bd9db..d38b7a6 100644
--- a/linden/indra/llui/llmodaldialog.h
+++ b/linden/indra/llui/llmodaldialog.h
@@ -44,7 +44,7 @@ class LLModalDialog;
 class LLModalDialog : public LLFloater
 {
 public:
-	LLModalDialog( const LLString& title, S32 width, S32 height, BOOL modal = true );
+	LLModalDialog( const std::string& title, S32 width, S32 height, BOOL modal = true );
 	/*virtual*/ ~LLModalDialog();
 
 	/*virtual*/ void	open();	/* Flawfinder: ignore */
diff --git a/linden/indra/llui/llmultislider.cpp b/linden/indra/llui/llmultislider.cpp
index dfa36fa..227cf98 100644
--- a/linden/indra/llui/llmultislider.cpp
+++ b/linden/indra/llui/llmultislider.cpp
@@ -54,7 +54,7 @@ const S32 EXTRA_TRIANGLE_HEIGHT = -2;
 S32 LLMultiSlider::mNameCounter = 0;
 
 LLMultiSlider::LLMultiSlider( 
-	const LLString& name,
+	const std::string& name,
 	const LLRect& rect,
 	void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
 	void* callback_userdata,
@@ -66,7 +66,7 @@ LLMultiSlider::LLMultiSlider(
 	BOOL allow_overlap,
 	BOOL draw_track,
 	BOOL use_triangle,
-	const LLString& control_name)
+	const std::string& control_name)
 	:
 	LLUICtrl( name, rect, TRUE,	on_commit_callback, callback_userdata, 
 		FOLLOWS_LEFT | FOLLOWS_TOP),
@@ -91,7 +91,7 @@ LLMultiSlider::LLMultiSlider(
 	mMouseUpCallback( NULL )
 {
 	mValue.emptyMap();
-	mCurSlider = LLString::null;
+	mCurSlider = LLStringUtil::null;
 
 	// properly handle setting the starting thumb rect
 	// do it this way to handle both the operating-on-settings
@@ -100,7 +100,7 @@ LLMultiSlider::LLMultiSlider(
 	setValue(getValue());
 }
 
-void LLMultiSlider::setSliderValue(const LLString& name, F32 value, BOOL from_event)
+void LLMultiSlider::setSliderValue(const std::string& name, F32 value, BOOL from_event)
 {
 	// exit if not there
 	if(!mValue.has(name)) {
@@ -174,30 +174,30 @@ void LLMultiSlider::setValue(const LLSD& value)
 	}
 }
 
-F32 LLMultiSlider::getSliderValue(const LLString& name) const
+F32 LLMultiSlider::getSliderValue(const std::string& name) const
 {
 	return (F32)mValue[name].asReal();
 }
 
-void LLMultiSlider::setCurSlider(const LLString& name)
+void LLMultiSlider::setCurSlider(const std::string& name)
 {
 	if(mValue.has(name)) {
 		mCurSlider = name;
 	}
 }
 
-const LLString& LLMultiSlider::addSlider()
+const std::string& LLMultiSlider::addSlider()
 {
 	return addSlider(mInitialValue);
 }
 
-const LLString& LLMultiSlider::addSlider(F32 val)
+const std::string& LLMultiSlider::addSlider(F32 val)
 {
 	std::stringstream newName;
 	F32 initVal = val;
 
 	if(mValue.size() >= mMaxNumSliders) {
-		return LLString::null;
+		return LLStringUtil::null;
 	}
 
 	// create a new name
@@ -206,7 +206,7 @@ const LLString& LLMultiSlider::addSlider(F32 val)
 
 	bool foundOne = findUnusedValue(initVal);
 	if(!foundOne) {
-		return LLString::null;
+		return LLStringUtil::null;
 	}
 
 	// add a new thumb rect
@@ -269,7 +269,7 @@ bool LLMultiSlider::findUnusedValue(F32& initVal)
 }
 
 
-void LLMultiSlider::deleteSlider(const LLString& name)
+void LLMultiSlider::deleteSlider(const std::string& name)
 {
 	// can't delete last slider
 	if(mValue.size() <= 0) {
@@ -282,7 +282,7 @@ void LLMultiSlider::deleteSlider(const LLString& name)
 
 	// set to the last created
 	if(mValue.size() > 0) {
-		std::map<LLString, LLRect>::iterator mIt = mThumbRects.end();
+		std::map<std::string, LLRect>::iterator mIt = mThumbRects.end();
 		mIt--;
 		mCurSlider = mIt->first;
 	}
@@ -365,7 +365,7 @@ BOOL LLMultiSlider::handleMouseDown(S32 x, S32 y, MASK mask)
 	else
 	{
 		// scroll through thumbs to see if we have a new one selected and select that one
-		std::map<LLString, LLRect>::iterator mIt = mThumbRects.begin();
+		std::map<std::string, LLRect>::iterator mIt = mThumbRects.begin();
 		for(; mIt != mThumbRects.end(); mIt++) {
 			
 			// check if inside.  If so, set current slider and continue
@@ -425,8 +425,8 @@ void LLMultiSlider::draw()
 {
 	LLColor4 curThumbColor;
 
-	std::map<LLString, LLRect>::iterator mIt;
-	std::map<LLString, LLRect>::iterator curSldrIt;
+	std::map<std::string, LLRect>::iterator mIt;
+	std::map<std::string, LLRect>::iterator curSldrIt;
 
 	// Draw background and thumb.
 
@@ -582,7 +582,7 @@ LLXMLNodePtr LLMultiSlider::getXML(bool save_children) const
 //static
 LLView* LLMultiSlider::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("multi_slider_bar");
+	std::string name("multi_slider_bar");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
diff --git a/linden/indra/llui/llmultislider.h b/linden/indra/llui/llmultislider.h
index df6153a..001ed26 100644
--- a/linden/indra/llui/llmultislider.h
+++ b/linden/indra/llui/llmultislider.h
@@ -41,7 +41,7 @@ class LLMultiSlider : public LLUICtrl
 {
 public:
 	LLMultiSlider( 
-		const LLString& name,
+		const std::string& name,
 		const LLRect& rect,
 		void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
 		void* callback_userdata,
@@ -53,17 +53,17 @@ public:
 		BOOL allow_overlap,
 		BOOL draw_track,
 		BOOL use_triangle,
-		const LLString& control_name = LLString::null );
+		const std::string& control_name = LLStringUtil::null );
 
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 	static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
-	void			setSliderValue(const LLString& name, F32 value, BOOL from_event = FALSE);
-	F32				getSliderValue(const LLString& name) const;
+	void			setSliderValue(const std::string& name, F32 value, BOOL from_event = FALSE);
+	F32				getSliderValue(const std::string& name) const;
 
-	const LLString& getCurSlider() const					{ return mCurSlider; }
+	const std::string& getCurSlider() const					{ return mCurSlider; }
 	F32				getCurSliderValue() const				{ return getSliderValue(mCurSlider); }
-	void			setCurSlider(const LLString& name);
+	void			setCurSlider(const std::string& name);
 	void			setCurSliderValue(F32 val, BOOL from_event = false) { setSliderValue(mCurSlider, val, from_event); }
 
 	virtual void	setValue(const LLSD& value);
@@ -83,9 +83,9 @@ public:
 	void			setMouseUpCallback(	void (*cb)(LLUICtrl* ctrl, void* userdata) ) { mMouseUpCallback = cb; }
 
 	bool findUnusedValue(F32& initVal);
-	const LLString&	addSlider();
-	const LLString&	addSlider(F32 val);
-	void			deleteSlider(const LLString& name);
+	const std::string&	addSlider();
+	const std::string&	addSlider(F32 val);
+	void			deleteSlider(const std::string& name);
 	void			deleteCurSlider()			{ deleteSlider(mCurSlider); }
 	void			clear();
 
@@ -101,7 +101,7 @@ protected:
 	F32				mMinValue;
 	F32				mMaxValue;
 	F32				mIncrement;
-	LLString		mCurSlider;
+	std::string		mCurSlider;
 	static S32		mNameCounter;
 
 	S32				mMaxNumSliders;
@@ -112,7 +112,7 @@ protected:
 	S32				mMouseOffset;
 	LLRect			mDragStartThumbRect;
 
-	std::map<LLString, LLRect>	mThumbRects;
+	std::map<std::string, LLRect>	mThumbRects;
 	LLColor4		mTrackColor;
 	LLColor4		mThumbOutlineColor;
 	LLColor4		mThumbCenterColor;
diff --git a/linden/indra/llui/llmultisliderctrl.cpp b/linden/indra/llui/llmultisliderctrl.cpp
index c242d18..673887b 100644
--- a/linden/indra/llui/llmultisliderctrl.cpp
+++ b/linden/indra/llui/llmultisliderctrl.cpp
@@ -55,8 +55,8 @@ static LLRegisterWidget<LLMultiSliderCtrl> r("multi_slider");
 const U32 MAX_STRING_LENGTH = 10;
 
  
-LLMultiSliderCtrl::LLMultiSliderCtrl(const LLString& name, const LLRect& rect, 
-						   const LLString& label,
+LLMultiSliderCtrl::LLMultiSliderCtrl(const std::string& name, const LLRect& rect, 
+						   const std::string& label,
 						   const LLFontGL* font,
 						   S32 label_width,
 						   S32 text_left,
@@ -68,7 +68,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLString& name, const LLRect& rect,
 						   S32 max_sliders, BOOL allow_overlap,
 						   BOOL draw_track,
 						   BOOL use_triangle,
-						   const LLString& control_which)
+						   const std::string& control_which)
 	: LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data ),
 	  mFont(font),
 	  mShowText( show_text ),
@@ -96,7 +96,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLString& name, const LLRect& rect,
 			label_width = font->getWidth(label);
 		}
 		LLRect label_rect( left, top, label_width, bottom );
-		mLabelBox = new LLTextBox( "MultiSliderCtrl Label", label_rect, label.c_str(), font );
+		mLabelBox = new LLTextBox( std::string("MultiSliderCtrl Label"), label_rect, label, font );
 		addChild(mLabelBox);
 	}
 
@@ -109,7 +109,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLString& name, const LLRect& rect,
 	S32 slider_left = label_width ? label_width + MULTI_SLIDERCTRL_SPACING : 0;
 	LLRect slider_rect( slider_left, top, slider_right, bottom );
 	mMultiSlider = new LLMultiSlider( 
-		"multi_slider",
+		std::string("multi_slider"),
 		slider_rect, 
 		LLMultiSliderCtrl::onSliderCommit, this, 
 		initial_value, min_value, max_value, increment,
@@ -124,8 +124,8 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLString& name, const LLRect& rect,
 		LLRect text_rect( text_left, top, getRect().getWidth(), bottom );
 		if( can_edit_text )
 		{
-			mEditor = new LLLineEditor( "MultiSliderCtrl Editor", text_rect,
-				"", font,
+			mEditor = new LLLineEditor( std::string("MultiSliderCtrl Editor"), text_rect,
+				LLStringUtil::null, font,
 				MAX_STRING_LENGTH,
 				&LLMultiSliderCtrl::onEditorCommit, NULL, NULL, this,
 				&LLLineEditor::prevalidateFloat );
@@ -140,7 +140,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLString& name, const LLRect& rect,
 		}
 		else
 		{
-			mTextBox = new LLTextBox( "MultiSliderCtrl Text", text_rect,	"",	font);
+			mTextBox = new LLTextBox( std::string("MultiSliderCtrl Text"), text_rect,	LLStringUtil::null,	font);
 			mTextBox->setFollowsLeft();
 			mTextBox->setFollowsBottom();
 			addChild(mTextBox);
@@ -172,20 +172,20 @@ void LLMultiSliderCtrl::setValue(const LLSD& value)
 	updateText();
 }
 
-void LLMultiSliderCtrl::setSliderValue(const LLString& name, F32 v, BOOL from_event)
+void LLMultiSliderCtrl::setSliderValue(const std::string& name, F32 v, BOOL from_event)
 {
 	mMultiSlider->setSliderValue(name, v, from_event );
 	mCurValue = mMultiSlider->getCurSliderValue();
 	updateText();
 }
 
-void LLMultiSliderCtrl::setCurSlider(const LLString& name)
+void LLMultiSliderCtrl::setCurSlider(const std::string& name)
 {
 	mMultiSlider->setCurSlider(name);
 	mCurValue = mMultiSlider->getCurSliderValue();
 }
 
-BOOL LLMultiSliderCtrl::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLMultiSliderCtrl::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	BOOL res = FALSE;
 	if (mLabelBox)
@@ -210,13 +210,13 @@ BOOL LLMultiSliderCtrl::setLabelArg( const LLString& key, const LLStringExplicit
 	return res;
 }
 
-const LLString& LLMultiSliderCtrl::addSlider()
+const std::string& LLMultiSliderCtrl::addSlider()
 {
-	const LLString& name = mMultiSlider->addSlider();
+	const std::string& name = mMultiSlider->addSlider();
 	
 	// if it returns null, pass it on
-	if(name == LLString::null) {
-		return LLString::null;
+	if(name == LLStringUtil::null) {
+		return LLStringUtil::null;
 	}
 
 	// otherwise, update stuff
@@ -225,13 +225,13 @@ const LLString& LLMultiSliderCtrl::addSlider()
 	return name;
 }
 
-const LLString& LLMultiSliderCtrl::addSlider(F32 val)
+const std::string& LLMultiSliderCtrl::addSlider(F32 val)
 {
-	const LLString& name = mMultiSlider->addSlider(val);
+	const std::string& name = mMultiSlider->addSlider(val);
 
 	// if it returns null, pass it on
-	if(name == LLString::null) {
-		return LLString::null;
+	if(name == LLStringUtil::null) {
+		return LLStringUtil::null;
 	}
 
 	// otherwise, update stuff
@@ -240,7 +240,7 @@ const LLString& LLMultiSliderCtrl::addSlider(F32 val)
 	return name;
 }
 
-void LLMultiSliderCtrl::deleteSlider(const LLString& name)
+void LLMultiSliderCtrl::deleteSlider(const std::string& name)
 {
 	mMultiSlider->deleteSlider(name);
 	mCurValue = mMultiSlider->getCurSliderValue();
@@ -253,11 +253,11 @@ void LLMultiSliderCtrl::clear()
 	setCurSliderValue(0.0f);
 	if( mEditor )
 	{
-		mEditor->setText(LLString(""));
+		mEditor->setText(std::string(""));
 	}
 	if( mTextBox )
 	{
-		mTextBox->setText(LLString(""));
+		mTextBox->setText(std::string(""));
 	}
 
 	// get rid of sliders
@@ -279,8 +279,8 @@ void LLMultiSliderCtrl::updateText()
 		// Don't display very small negative values as -0.000
 		F32 displayed_value = (F32)(floor(getCurSliderValue() * pow(10.0, (F64)mPrecision) + 0.5) / pow(10.0, (F64)mPrecision));
 
-		LLString format = llformat("%%.%df", mPrecision);
-		LLString text = llformat(format.c_str(), displayed_value);
+		std::string format = llformat("%%.%df", mPrecision);
+		std::string text = llformat(format.c_str(), displayed_value);
 		if( mEditor )
 		{
 			mEditor->setText( text );
@@ -302,7 +302,7 @@ void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
 	F32 val = self->mCurValue;
 	F32 saved_val = self->mCurValue;
 
-	LLString text = self->mEditor->getText();
+	std::string text = self->mEditor->getText();
 	if( LLLineEditor::postvalidateFloat( text ) )
 	{
 		LLLocale locale(LLLocale::USER_LOCALE);
@@ -484,13 +484,13 @@ void LLMultiSliderCtrl::reportInvalidData()
 }
 
 //virtual
-LLString LLMultiSliderCtrl::getControlName() const
+std::string LLMultiSliderCtrl::getControlName() const
 {
 	return mMultiSlider->getControlName();
 }
 
 // virtual
-void LLMultiSliderCtrl::setControlName(const LLString& control_name, LLView* context)
+void LLMultiSliderCtrl::setControlName(const std::string& control_name, LLView* context)
 {
 	mMultiSlider->setControlName(control_name, context);
 }
@@ -529,10 +529,10 @@ LLXMLNodePtr LLMultiSliderCtrl::getXML(bool save_children) const
 
 LLView* LLMultiSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("multi_slider");
+	std::string name("multi_slider");
 	node->getAttributeString("name", name);
 
-	LLString label;
+	std::string label;
 	node->getAttributeString("label", label);
 
 	LLRect rect;
@@ -588,13 +588,13 @@ LLView* LLMultiSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFa
 	{
 		// calculate the size of the text box (log max_value is number of digits - 1 so plus 1)
 		if ( max_value )
-			text_left = font->getWidth("0") * ( static_cast < S32 > ( log10  ( max_value ) ) + precision + 1 );
+			text_left = font->getWidth(std::string("0")) * ( static_cast < S32 > ( log10  ( max_value ) ) + precision + 1 );
 
 		if ( increment < 1.0f )
-			text_left += font->getWidth(".");	// (mostly) take account of decimal point in value
+			text_left += font->getWidth(std::string("."));	// (mostly) take account of decimal point in value
 
 		if ( min_value < 0.0f || max_value < 0.0f )
-			text_left += font->getWidth("-");	// (mostly) take account of minus sign 
+			text_left += font->getWidth(std::string("-"));	// (mostly) take account of minus sign 
 
 		// padding to make things look nicer
 		text_left += 8;
diff --git a/linden/indra/llui/llmultisliderctrl.h b/linden/indra/llui/llmultisliderctrl.h
index 6a298c8..1f41d81 100644
--- a/linden/indra/llui/llmultisliderctrl.h
+++ b/linden/indra/llui/llmultisliderctrl.h
@@ -55,9 +55,9 @@ class LLSlider;
 class LLMultiSliderCtrl : public LLUICtrl
 {
 public:
-	LLMultiSliderCtrl(const LLString& name, 
+	LLMultiSliderCtrl(const std::string& name, 
 		const LLRect& rect, 
-		const LLString& label, 
+		const std::string& label, 
 		const LLFontGL* font,
 		S32 slider_left,
 		S32 text_left,
@@ -68,22 +68,22 @@ public:
 		F32 initial_value, F32 min_value, F32 max_value, F32 increment,
 		S32 max_sliders, BOOL allow_overlap, BOOL draw_track,
 		BOOL use_triangle,
-		const LLString& control_which = LLString::null );
+		const std::string& control_which = LLStringUtil::null );
 
 	virtual ~LLMultiSliderCtrl();
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 	static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
-	F32				getSliderValue(const LLString& name) const;
-	void			setSliderValue(const LLString& name, F32 v, BOOL from_event = FALSE);
+	F32				getSliderValue(const std::string& name) const;
+	void			setSliderValue(const std::string& name, F32 v, BOOL from_event = FALSE);
 
 	virtual void	setValue(const LLSD& value );
 	virtual LLSD	getValue() const		{ return mMultiSlider->getValue(); }
-	virtual BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 
-	const LLString& getCurSlider() const					{ return mMultiSlider->getCurSlider(); }
+	const std::string& getCurSlider() const					{ return mMultiSlider->getCurSlider(); }
 	F32				getCurSliderValue() const				{ return mCurValue; }
-	void			setCurSlider(const LLString& name);		
+	void			setCurSlider(const std::string& name);		
 	void			setCurSliderValue(F32 val, BOOL from_event = false) { setSliderValue(mMultiSlider->getCurSlider(), val, from_event); }
 
 	virtual void	setMinValue(LLSD min_value)	{ setMinValue((F32)min_value.asReal()); }
@@ -99,15 +99,15 @@ public:
 	void			setIncrement(F32 increment) {mMultiSlider->setIncrement(increment);}
 
 	/// for adding and deleting sliders
-	const LLString&	addSlider();
-	const LLString&	addSlider(F32 val);
-	void			deleteSlider(const LLString& name);
+	const std::string&	addSlider();
+	const std::string&	addSlider(F32 val);
+	void			deleteSlider(const std::string& name);
 	void			deleteCurSlider()			{ deleteSlider(mMultiSlider->getCurSlider()); }
 
 	F32				getMinValue() { return mMultiSlider->getMinValue(); }
 	F32				getMaxValue() { return mMultiSlider->getMaxValue(); }
 
-	void			setLabel(const LLString& label)				{ if (mLabelBox) mLabelBox->setText(label); }
+	void			setLabel(const std::string& label)				{ if (mLabelBox) mLabelBox->setText(label); }
 	void			setLabelColor(const LLColor4& c)			{ mTextEnabledColor = c; }
 	void			setDisabledLabelColor(const LLColor4& c)	{ mTextDisabledColor = c; }
 
@@ -119,8 +119,8 @@ public:
 	virtual void	setTentative(BOOL b);			// marks value as tentative
 	virtual void	onCommit();						// mark not tentative, then commit
 
-	virtual void		setControlName(const LLString& control_name, LLView* context);
-	virtual LLString 	getControlName() const;
+	virtual void		setControlName(const std::string& control_name, LLView* context);
+	virtual std::string 	getControlName() const;
 	
 	static void		onSliderCommit(LLUICtrl* caller, void* userdata);
 	static void		onSliderMouseDown(LLUICtrl* caller,void* userdata);
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 7db3725..f1ccb01 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -55,8 +55,6 @@
 #include "llbutton.h"
 
 // LLLayoutStack
-#include "llgl.h"
-#include "llglheaders.h"
 #include "llresizebar.h"
 #include "llcriticaldamp.h"
 
@@ -88,10 +86,10 @@ LLPanel::LLPanel()
 : mRectControl()
 {
 	init();
-	setName("panel");
+	setName(std::string("panel"));
 }
 
-LLPanel::LLPanel(const LLString& name)
+LLPanel::LLPanel(const std::string& name)
 :	LLUICtrl(name, LLRect(0, 0, 0, 0), TRUE, NULL, NULL),
 	mRectControl()
 {
@@ -99,7 +97,7 @@ LLPanel::LLPanel(const LLString& name)
 }
 
 
-LLPanel::LLPanel(const LLString& name, const LLRect& rect, BOOL bordered)
+LLPanel::LLPanel(const std::string& name, const LLRect& rect, BOOL bordered)
 :	LLUICtrl(name, rect, TRUE, NULL, NULL),
 	mRectControl()
 {
@@ -111,7 +109,7 @@ LLPanel::LLPanel(const LLString& name, const LLRect& rect, BOOL bordered)
 }
 
 
-LLPanel::LLPanel(const LLString& name, const LLString& rect_control, BOOL bordered)
+LLPanel::LLPanel(const std::string& name, const std::string& rect_control, BOOL bordered)
 :	LLUICtrl(name, LLUI::sConfigGroup->getRect(rect_control), TRUE, NULL, NULL),
 	mRectControl( rect_control )
 {
@@ -143,7 +141,7 @@ void LLPanel::addBorder(LLViewBorder::EBevel border_bevel,
 						LLViewBorder::EStyle border_style, S32 border_thickness)
 {
 	removeBorder();
-	mBorder = new LLViewBorder( "panel border", 
+	mBorder = new LLViewBorder( std::string("panel border"), 
 								LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), 
 								border_bevel, border_style, border_thickness );
 	mBorder->setSaveToXML(false);
@@ -248,7 +246,7 @@ void LLPanel::setDefaultBtn(LLButton* btn)
 	}
 }
 
-void LLPanel::setDefaultBtn(const LLString& id)
+void LLPanel::setDefaultBtn(const std::string& id)
 {
 	LLButton *button = getChild<LLButton>(id);
 	if (button)
@@ -346,14 +344,14 @@ BOOL LLPanel::checkRequirements()
 {
 	if (!mRequirementsError.empty())
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[COMPONENTS]"] = mRequirementsError;
 		args["[FLOATER]"] = getName();
 
 		llwarns << getName() << " failed requirements check on: \n"  
 				<< mRequirementsError << llendl;
 			
-		alertXml("FailedRequirementsCheck", args);
+		alertXml(std::string("FailedRequirementsCheck"), args);
 		mRequirementsError.clear();
 		return FALSE;
 	}
@@ -362,7 +360,7 @@ BOOL LLPanel::checkRequirements()
 }
 
 //static
-void LLPanel::alertXml(LLString label, LLString::format_map_t args)
+void LLPanel::alertXml(const std::string& label, LLStringUtil::format_map_t args)
 {
 	sAlertQueue.push(LLAlertInfo(label,args));
 }
@@ -462,7 +460,7 @@ LLXMLNodePtr LLPanel::getXML(bool save_children) const
 
 LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *factory)
 {
-	LLString name("panel");
+	std::string name("panel");
 	node->getAttributeString("name", name);
 
 	LLPanel* panelp = factory->createFactoryPanel(name);
@@ -491,7 +489,7 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *fac
 
 BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name = getName();
+	std::string name = getName();
 	node->getAttributeString("name", name);
 	setName(name);
 
@@ -499,7 +497,7 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
 	initChildrenXML(node, factory);
 
-	LLString xml_filename;
+	std::string xml_filename;
 	node->getAttributeString("filename", xml_filename);
 
 	BOOL didPost;
@@ -538,7 +536,7 @@ void LLPanel::initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory)
 		// look for string declarations for programmatic text
 		if (child->hasName("string"))
 		{
-			LLString string_name;
+			std::string string_name;
 			child->getAttributeString("name", string_name);
 			if (!string_name.empty())
 			{
@@ -566,9 +564,9 @@ void LLPanel::setPanelParameters(LLXMLNodePtr node, LLView* parent)
 		LLViewBorder::getBevelFromAttribute(node, bevel_style);
 
 		LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE;
-		LLString border_string;
+		std::string border_string;
 		node->getAttributeString("border_style", border_string);
-		LLString::toLower(border_string);
+		LLStringUtil::toLower(border_string);
 
 		if (border_string == "texture")
 		{
@@ -603,12 +601,12 @@ void LLPanel::setPanelParameters(LLXMLNodePtr node, LLView* parent)
 	LLUICtrlFactory::getAttributeColor(node,"bg_alpha_color", color);
 	setTransparentColor(color);
 
-	LLString label = getLabel();
+	std::string label = getLabel();
 	node->getAttributeString("label", label);
 	setLabel(label);
 }
 
-LLString LLPanel::getString(const LLString& name, const LLString::format_map_t& args) const
+std::string LLPanel::getString(const std::string& name, const LLStringUtil::format_map_t& args) const
 {
 	ui_string_map_t::const_iterator found_it = mUIStrings.find(name);
 	if (found_it != mUIStrings.end())
@@ -618,7 +616,7 @@ LLString LLPanel::getString(const LLString& name, const LLString::format_map_t&
 		formatted_string.setArgList(args);
 		return formatted_string.getString();
 	}
-	LLString err_str("Failed to find string " + name + " in panel " + getName());
+	std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate
 	// *TODO: once the QAR-369 ui-cleanup work on settings is in we need to change the following line to be
 	//if(LLUI::sConfigGroup->getBOOL("QAMode"))
 	if(LLUI::sQAMode)
@@ -629,10 +627,10 @@ LLString LLPanel::getString(const LLString& name, const LLString::format_map_t&
 	{
 		llwarns << err_str << llendl;
 	}
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
-LLUIString LLPanel::getUIString(const LLString& name) const
+LLUIString LLPanel::getUIString(const std::string& name) const
 {
 	ui_string_map_t::const_iterator found_it = mUIStrings.find(name);
 	if (found_it != mUIStrings.end())
@@ -640,11 +638,11 @@ LLUIString LLPanel::getUIString(const LLString& name) const
 		return found_it->second;
 	}
 	llerrs << "Failed to find string " << name << " in panel " << getName() << llendl;
-	return LLUIString(LLString::null);
+	return LLUIString(LLStringUtil::null);
 }
 
 
-void LLPanel::childSetVisible(const LLString& id, bool visible)
+void LLPanel::childSetVisible(const std::string& id, bool visible)
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -653,7 +651,7 @@ void LLPanel::childSetVisible(const LLString& id, bool visible)
 	}
 }
 
-bool LLPanel::childIsVisible(const LLString& id) const
+bool LLPanel::childIsVisible(const std::string& id) const
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -663,7 +661,7 @@ bool LLPanel::childIsVisible(const LLString& id) const
 	return false;
 }
 
-void LLPanel::childSetEnabled(const LLString& id, bool enabled)
+void LLPanel::childSetEnabled(const std::string& id, bool enabled)
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -672,7 +670,7 @@ void LLPanel::childSetEnabled(const LLString& id, bool enabled)
 	}
 }
 
-void LLPanel::childSetTentative(const LLString& id, bool tentative)
+void LLPanel::childSetTentative(const std::string& id, bool tentative)
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -681,7 +679,7 @@ void LLPanel::childSetTentative(const LLString& id, bool tentative)
 	}
 }
 
-bool LLPanel::childIsEnabled(const LLString& id) const
+bool LLPanel::childIsEnabled(const std::string& id) const
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -692,7 +690,7 @@ bool LLPanel::childIsEnabled(const LLString& id) const
 }
 
 
-void LLPanel::childSetToolTip(const LLString& id, const LLString& msg)
+void LLPanel::childSetToolTip(const std::string& id, const std::string& msg)
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -701,7 +699,7 @@ void LLPanel::childSetToolTip(const LLString& id, const LLString& msg)
 	}
 }
 
-void LLPanel::childSetRect(const LLString& id, const LLRect& rect)
+void LLPanel::childSetRect(const std::string& id, const LLRect& rect)
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -710,7 +708,7 @@ void LLPanel::childSetRect(const LLString& id, const LLRect& rect)
 	}
 }
 
-bool LLPanel::childGetRect(const LLString& id, LLRect& rect) const
+bool LLPanel::childGetRect(const std::string& id, LLRect& rect) const
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -721,7 +719,7 @@ bool LLPanel::childGetRect(const LLString& id, LLRect& rect) const
 	return false;
 }
 
-void LLPanel::childSetFocus(const LLString& id, BOOL focus)
+void LLPanel::childSetFocus(const std::string& id, BOOL focus)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -730,7 +728,7 @@ void LLPanel::childSetFocus(const LLString& id, BOOL focus)
 	}
 }
 
-BOOL LLPanel::childHasFocus(const LLString& id)
+BOOL LLPanel::childHasFocus(const std::string& id)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -745,7 +743,7 @@ BOOL LLPanel::childHasFocus(const LLString& id)
 }
 
 
-void LLPanel::childSetFocusChangedCallback(const LLString& id, void (*cb)(LLFocusableElement*, void*), void* user_data)
+void LLPanel::childSetFocusChangedCallback(const std::string& id, void (*cb)(LLFocusableElement*, void*), void* user_data)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -754,7 +752,7 @@ void LLPanel::childSetFocusChangedCallback(const LLString& id, void (*cb)(LLFocu
 	}
 }
 
-void LLPanel::childSetCommitCallback(const LLString& id, void (*cb)(LLUICtrl*, void*), void *userdata )
+void LLPanel::childSetCommitCallback(const std::string& id, void (*cb)(LLUICtrl*, void*), void *userdata )
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -764,7 +762,7 @@ void LLPanel::childSetCommitCallback(const LLString& id, void (*cb)(LLUICtrl*, v
 	}
 }
 
-void LLPanel::childSetDoubleClickCallback(const LLString& id, void (*cb)(void*), void *userdata )
+void LLPanel::childSetDoubleClickCallback(const std::string& id, void (*cb)(void*), void *userdata )
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -777,7 +775,7 @@ void LLPanel::childSetDoubleClickCallback(const LLString& id, void (*cb)(void*),
 	}
 }
 
-void LLPanel::childSetValidate(const LLString& id, BOOL (*cb)(LLUICtrl*, void*))
+void LLPanel::childSetValidate(const std::string& id, BOOL (*cb)(LLUICtrl*, void*))
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -786,7 +784,7 @@ void LLPanel::childSetValidate(const LLString& id, BOOL (*cb)(LLUICtrl*, void*))
 	}
 }
 
-void LLPanel::childSetUserData(const LLString& id, void* userdata)
+void LLPanel::childSetUserData(const std::string& id, void* userdata)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -795,7 +793,7 @@ void LLPanel::childSetUserData(const LLString& id, void* userdata)
 	}
 }
 
-void LLPanel::childSetColor(const LLString& id, const LLColor4& color)
+void LLPanel::childSetColor(const std::string& id, const LLColor4& color)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -804,7 +802,7 @@ void LLPanel::childSetColor(const LLString& id, const LLColor4& color)
 	}
 }
 
-LLCtrlSelectionInterface* LLPanel::childGetSelectionInterface(const LLString& id) const
+LLCtrlSelectionInterface* LLPanel::childGetSelectionInterface(const std::string& id) const
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -814,7 +812,7 @@ LLCtrlSelectionInterface* LLPanel::childGetSelectionInterface(const LLString& id
 	return NULL;
 }
 
-LLCtrlListInterface* LLPanel::childGetListInterface(const LLString& id) const
+LLCtrlListInterface* LLPanel::childGetListInterface(const std::string& id) const
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -824,7 +822,7 @@ LLCtrlListInterface* LLPanel::childGetListInterface(const LLString& id) const
 	return NULL;
 }
 
-LLCtrlScrollInterface* LLPanel::childGetScrollInterface(const LLString& id) const
+LLCtrlScrollInterface* LLPanel::childGetScrollInterface(const std::string& id) const
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -834,7 +832,7 @@ LLCtrlScrollInterface* LLPanel::childGetScrollInterface(const LLString& id) cons
 	return NULL;
 }
 
-void LLPanel::childSetValue(const LLString& id, LLSD value)
+void LLPanel::childSetValue(const std::string& id, LLSD value)
 {
 	LLView* child = getChild<LLView>(id, true);
 	if (child)
@@ -843,7 +841,7 @@ void LLPanel::childSetValue(const LLString& id, LLSD value)
 	}
 }
 
-LLSD LLPanel::childGetValue(const LLString& id) const
+LLSD LLPanel::childGetValue(const std::string& id) const
 {
 	LLView* child = getChild<LLView>(id, true);
 	if (child)
@@ -854,7 +852,7 @@ LLSD LLPanel::childGetValue(const LLString& id) const
 	return LLSD();
 }
 
-BOOL LLPanel::childSetTextArg(const LLString& id, const LLString& key, const LLStringExplicit& text)
+BOOL LLPanel::childSetTextArg(const std::string& id, const std::string& key, const LLStringExplicit& text)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -864,7 +862,7 @@ BOOL LLPanel::childSetTextArg(const LLString& id, const LLString& key, const LLS
 	return FALSE;
 }
 
-BOOL LLPanel::childSetLabelArg(const LLString& id, const LLString& key, const LLStringExplicit& text)
+BOOL LLPanel::childSetLabelArg(const std::string& id, const std::string& key, const LLStringExplicit& text)
 {
 	LLView* child = getChild<LLView>(id);
 	if (child)
@@ -874,7 +872,7 @@ BOOL LLPanel::childSetLabelArg(const LLString& id, const LLString& key, const LL
 	return FALSE;
 }
 
-BOOL LLPanel::childSetToolTipArg(const LLString& id, const LLString& key, const LLStringExplicit& text)
+BOOL LLPanel::childSetToolTipArg(const std::string& id, const std::string& key, const LLStringExplicit& text)
 {
 	LLView* child = getChildView(id, true, FALSE);
 	if (child)
@@ -884,7 +882,7 @@ BOOL LLPanel::childSetToolTipArg(const LLString& id, const LLString& key, const
 	return FALSE;
 }
 
-void LLPanel::childSetMinValue(const LLString& id, LLSD min_value)
+void LLPanel::childSetMinValue(const std::string& id, LLSD min_value)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -893,7 +891,7 @@ void LLPanel::childSetMinValue(const LLString& id, LLSD min_value)
 	}
 }
 
-void LLPanel::childSetMaxValue(const LLString& id, LLSD max_value)
+void LLPanel::childSetMaxValue(const std::string& id, LLSD max_value)
 {
 	LLUICtrl* child = getChild<LLUICtrl>(id, true);
 	if (child)
@@ -902,7 +900,7 @@ void LLPanel::childSetMaxValue(const LLString& id, LLSD max_value)
 	}
 }
 
-void LLPanel::childShowTab(const LLString& id, const LLString& tabname, bool visible)
+void LLPanel::childShowTab(const std::string& id, const std::string& tabname, bool visible)
 {
 	LLTabContainer* child = getChild<LLTabContainer>(id);
 	if (child)
@@ -911,7 +909,7 @@ void LLPanel::childShowTab(const LLString& id, const LLString& tabname, bool vis
 	}
 }
 
-LLPanel *LLPanel::childGetVisibleTab(const LLString& id) const
+LLPanel *LLPanel::childGetVisibleTab(const std::string& id) const
 {
 	LLTabContainer* child = getChild<LLTabContainer>(id);
 	if (child)
@@ -921,7 +919,7 @@ LLPanel *LLPanel::childGetVisibleTab(const LLString& id) const
 	return NULL;
 }
 
-void LLPanel::childSetTabChangeCallback(const LLString& id, const LLString& tabname, void (*on_tab_clicked)(void*, bool), void *userdata)
+void LLPanel::childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata)
 {
 	LLTabContainer* child = getChild<LLTabContainer>(id);
 	if (child)
@@ -935,7 +933,7 @@ void LLPanel::childSetTabChangeCallback(const LLString& id, const LLString& tabn
 	}
 }
 
-void LLPanel::childSetKeystrokeCallback(const LLString& id, void (*keystroke_callback)(LLLineEditor* caller, void* user_data), void *user_data)
+void LLPanel::childSetKeystrokeCallback(const std::string& id, void (*keystroke_callback)(LLLineEditor* caller, void* user_data), void *user_data)
 {
 	LLLineEditor* child = getChild<LLLineEditor>(id);
 	if (child)
@@ -948,7 +946,7 @@ void LLPanel::childSetKeystrokeCallback(const LLString& id, void (*keystroke_cal
 	}
 }
 
-void LLPanel::childSetPrevalidate(const LLString& id, BOOL (*func)(const LLWString &) )
+void LLPanel::childSetPrevalidate(const std::string& id, BOOL (*func)(const LLWString &) )
 {
 	LLLineEditor* child = getChild<LLLineEditor>(id);
 	if (child)
@@ -957,7 +955,7 @@ void LLPanel::childSetPrevalidate(const LLString& id, BOOL (*func)(const LLWStri
 	}
 }
 
-void LLPanel::childSetWrappedText(const LLString& id, const LLString& text, bool visible)
+void LLPanel::childSetWrappedText(const std::string& id, const std::string& text, bool visible)
 {
 	LLTextBox* child = getChild<LLTextBox>(id);
 	if (child)
@@ -967,7 +965,7 @@ void LLPanel::childSetWrappedText(const LLString& id, const LLString& text, bool
 	}
 }
 
-void LLPanel::childSetAction(const LLString& id, void(*function)(void*), void* value)
+void LLPanel::childSetAction(const std::string& id, void(*function)(void*), void* value)
 {
 	LLButton* button = getChild<LLButton>(id);
 	if (button)
@@ -976,7 +974,7 @@ void LLPanel::childSetAction(const LLString& id, void(*function)(void*), void* v
 	}
 }
 
-void LLPanel::childSetActionTextbox(const LLString& id, void(*function)(void*))
+void LLPanel::childSetActionTextbox(const std::string& id, void(*function)(void*))
 {
 	LLTextBox* textbox = getChild<LLTextBox>(id);
 	if (textbox)
@@ -985,7 +983,7 @@ void LLPanel::childSetActionTextbox(const LLString& id, void(*function)(void*))
 	}
 }
 
-void LLPanel::childSetControlName(const LLString& id, const LLString& control_name)
+void LLPanel::childSetControlName(const std::string& id, const std::string& control_name)
 {
 	LLView* view = getChild<LLView>(id);
 	if (view)
@@ -995,7 +993,7 @@ void LLPanel::childSetControlName(const LLString& id, const LLString& control_na
 }
 
 //virtual
-LLView* LLPanel::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLPanel::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
 {
 	// just get child, don't try to create a dummy one
 	LLView* view = LLUICtrl::getChildView(name, recurse, FALSE);
@@ -1010,7 +1008,7 @@ LLView* LLPanel::getChildView(const LLString& name, BOOL recurse, BOOL create_if
 	return view;
 }
 
-void LLPanel::childNotFound(const LLString& id) const
+void LLPanel::childNotFound(const std::string& id) const
 {
 	if (mExpectedMembers.find(id) == mExpectedMembers.end())
 	{
@@ -1024,7 +1022,7 @@ void LLPanel::childDisplayNotFound()
 	{
 		return;
 	}
-	LLString msg;
+	std::string msg;
 	expected_members_list_t::iterator itor;
 	for (itor=mNewExpectedMembers.begin(); itor!=mNewExpectedMembers.end(); ++itor)
 	{
@@ -1033,7 +1031,7 @@ void LLPanel::childDisplayNotFound()
 		mExpectedMembers.insert(*itor);
 	}
 	mNewExpectedMembers.clear();
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[CONTROLS]"] = msg;
 	LLAlertDialog::showXml("FloaterNotFound", args);
 }
@@ -1073,7 +1071,7 @@ struct LLLayoutStack::LLEmbeddedPanel
 		{
 			min_dim = mMinWidth;
 		}
-		mResizeBar = new LLResizeBar("resizer", mPanel, LLRect(), min_dim, S32_MAX, side);
+		mResizeBar = new LLResizeBar(std::string("resizer"), mPanel, LLRect(), min_dim, S32_MAX, side);
 		mResizeBar->setEnableSnapping(FALSE);
 		// panels initialized as hidden should not start out partially visible
 		if (!mPanel->getVisible())
@@ -1168,7 +1166,7 @@ LLXMLNodePtr LLLayoutStack::getXML(bool save_children) const
 //static 
 LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString orientation_string("vertical");
+	std::string orientation_string("vertical");
 	node->getAttributeString("orientation", orientation_string);
 
 	eLayoutOrientation orientation = VERTICAL;
@@ -1192,7 +1190,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
 	// don't allow negative spacing values
 	layout_stackp->mPanelSpacing = llmax(layout_stackp->mPanelSpacing, 0);
 
-	LLString name("stack");
+	std::string name("stack");
 	node->getAttributeString("name", name);
 
 	layout_stackp->setName(name);
@@ -1225,7 +1223,7 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
 			BOOL user_resize = FALSE;
 			child->getAttributeBOOL("user_resize", user_resize);
 
-			LLPanel* panelp = new LLPanel("auto_panel");
+			LLPanel* panelp = new LLPanel(std::string("auto_panel"));
 			LLView* new_child = factory->createWidget(panelp, child);
 			if (new_child)
 			{
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index c7627ff..46cde5b 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -51,10 +51,10 @@ const BOOL BORDER_NO = FALSE;
 
 struct LLAlertInfo
 {
-	LLString mLabel;
-	LLString::format_map_t mArgs;
+	std::string mLabel;
+	LLStringUtil::format_map_t mArgs;
 
-	LLAlertInfo(LLString label, LLString::format_map_t args) : mLabel(label), mArgs(args) { }
+	LLAlertInfo(std::string label, LLStringUtil::format_map_t args) : mLabel(label), mArgs(args) { }
 	LLAlertInfo(){}
 };
 
@@ -71,13 +71,13 @@ public:
 
 	// minimal constructor for data-driven initialization
 	LLPanel();
-	LLPanel(const LLString& name);
+	LLPanel(const std::string& name);
 
 	// Position and size not saved
-	LLPanel(const LLString& name, const LLRect& rect, BOOL bordered = TRUE);
+	LLPanel(const std::string& name, const LLRect& rect, BOOL bordered = TRUE);
 
 	// Position and size are saved to rect_control
-	LLPanel(const LLString& name, const LLString& rect_control, BOOL bordered = TRUE);	
+	LLPanel(const std::string& name, const std::string& rect_control, BOOL bordered = TRUE);	
 	
 	/*virtual*/ ~LLPanel();
 
@@ -87,7 +87,7 @@ public:
 	/*virtual*/ BOOL	handleKeyHere( KEY key, MASK mask );
 	/*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
 	// Override to set not found list:
-	virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 
 	// From LLFocusableElement
 	/*virtual*/ void	setFocus( BOOL b );
@@ -105,7 +105,7 @@ public:
 	BOOL			hasBorder() const { return mBorder != NULL; }
 	void			setBorderVisible( BOOL b );
 
-	template <class T> void requires(LLString name)
+	template <class T> void requires(const std::string& name)
 	{
 		// check for widget with matching type and name
 		if (LLView::getChild<T>(name) == NULL)
@@ -115,7 +115,7 @@ public:
 	}
 	
 	// requires LLView by default
-	void requires(LLString name)
+	void requires(const std::string& name)
 	{
 		requires<LLView>(name);
 	}
@@ -130,13 +130,13 @@ public:
 	void			setBackgroundOpaque(BOOL b)		{ mBgOpaque = b; }
 	BOOL			isBackgroundOpaque() const { return mBgOpaque; }
 	void			setDefaultBtn(LLButton* btn = NULL);
-	void			setDefaultBtn(const LLString& id);
+	void			setDefaultBtn(const std::string& id);
 	void			updateDefaultBtn();
 	void			setLabel(const LLStringExplicit& label) { mLabel = label; }
-	LLString		getLabel() const { return mLabel; }
+	std::string		getLabel() const { return mLabel; }
 	
-	void            setRectControl(const LLString& rect_control) { mRectControl.assign(rect_control); }
-	const LLString&	getRectControl() const { return mRectControl; }
+	void            setRectControl(const std::string& rect_control) { mRectControl.assign(rect_control); }
+	const std::string&	getRectControl() const { return mRectControl; }
 	void			storeRectControl();
 
 	void			setCtrlsEnabled(BOOL b);
@@ -151,83 +151,83 @@ public:
 	void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory);
 	void setPanelParameters(LLXMLNodePtr node, LLView *parentp);
 
-	LLString getString(const LLString& name, const LLString::format_map_t& args = LLUIString::sNullArgs) const;
-	LLUIString getUIString(const LLString& name) const;
+	std::string getString(const std::string& name, const LLStringUtil::format_map_t& args = LLUIString::sNullArgs) const;
+	LLUIString getUIString(const std::string& name) const;
 
 	// ** Wrappers for setting child properties by name ** -TomY
 
 	// LLView
-	void childSetVisible(const LLString& name, bool visible);
-	void childShow(const LLString& name) { childSetVisible(name, true); }
-	void childHide(const LLString& name) { childSetVisible(name, false); }
-	bool childIsVisible(const LLString& id) const;
-	void childSetTentative(const LLString& name, bool tentative);
+	void childSetVisible(const std::string& name, bool visible);
+	void childShow(const std::string& name) { childSetVisible(name, true); }
+	void childHide(const std::string& name) { childSetVisible(name, false); }
+	bool childIsVisible(const std::string& id) const;
+	void childSetTentative(const std::string& name, bool tentative);
 
-	void childSetEnabled(const LLString& name, bool enabled);
-	void childEnable(const LLString& name)	{ childSetEnabled(name, true); }
-	void childDisable(const LLString& name) { childSetEnabled(name, false); };
-	bool childIsEnabled(const LLString& id) const;
+	void childSetEnabled(const std::string& name, bool enabled);
+	void childEnable(const std::string& name)	{ childSetEnabled(name, true); }
+	void childDisable(const std::string& name) { childSetEnabled(name, false); };
+	bool childIsEnabled(const std::string& id) const;
 
-	void childSetToolTip(const LLString& id, const LLString& msg);
-	void childSetRect(const LLString& id, const LLRect &rect);
-	bool childGetRect(const LLString& id, LLRect& rect) const;
+	void childSetToolTip(const std::string& id, const std::string& msg);
+	void childSetRect(const std::string& id, const LLRect &rect);
+	bool childGetRect(const std::string& id, LLRect& rect) const;
 
 	// LLUICtrl
-	void childSetFocus(const LLString& id, BOOL focus = TRUE);
-	BOOL childHasFocus(const LLString& id);
-	void childSetFocusChangedCallback(const LLString& id, void (*cb)(LLFocusableElement*, void*), void* user_data = NULL);
+	void childSetFocus(const std::string& id, BOOL focus = TRUE);
+	BOOL childHasFocus(const std::string& id);
+	void childSetFocusChangedCallback(const std::string& id, void (*cb)(LLFocusableElement*, void*), void* user_data = NULL);
 	
-	void childSetCommitCallback(const LLString& id, void (*cb)(LLUICtrl*, void*), void* userdata = NULL );
-	void childSetDoubleClickCallback(const LLString& id, void (*cb)(void*), void* userdata = NULL );
-	void childSetValidate(const LLString& id, BOOL (*cb)(LLUICtrl*, void*) );
-	void childSetUserData(const LLString& id, void* userdata);
+	void childSetCommitCallback(const std::string& id, void (*cb)(LLUICtrl*, void*), void* userdata = NULL );
+	void childSetDoubleClickCallback(const std::string& id, void (*cb)(void*), void* userdata = NULL );
+	void childSetValidate(const std::string& id, BOOL (*cb)(LLUICtrl*, void*) );
+	void childSetUserData(const std::string& id, void* userdata);
 
-	void childSetColor(const LLString& id, const LLColor4& color);
+	void childSetColor(const std::string& id, const LLColor4& color);
 
-	LLCtrlSelectionInterface* childGetSelectionInterface(const LLString& id) const;
-	LLCtrlListInterface* childGetListInterface(const LLString& id) const;
-	LLCtrlScrollInterface* childGetScrollInterface(const LLString& id) const;
+	LLCtrlSelectionInterface* childGetSelectionInterface(const std::string& id) const;
+	LLCtrlListInterface* childGetListInterface(const std::string& id) const;
+	LLCtrlScrollInterface* childGetScrollInterface(const std::string& id) const;
 
 	// This is the magic bullet for data-driven UI
-	void childSetValue(const LLString& id, LLSD value);
-	LLSD childGetValue(const LLString& id) const;
+	void childSetValue(const std::string& id, LLSD value);
+	LLSD childGetValue(const std::string& id) const;
 
 	// For setting text / label replacement params, e.g. "Hello [NAME]"
 	// Not implemented for all types, defaults to noop, returns FALSE if not applicaple
-	BOOL childSetTextArg(const LLString& id, const LLString& key, const LLStringExplicit& text);
-	BOOL childSetLabelArg(const LLString& id, const LLString& key, const LLStringExplicit& text);
-	BOOL childSetToolTipArg(const LLString& id, const LLString& key, const LLStringExplicit& text);
+	BOOL childSetTextArg(const std::string& id, const std::string& key, const LLStringExplicit& text);
+	BOOL childSetLabelArg(const std::string& id, const std::string& key, const LLStringExplicit& text);
+	BOOL childSetToolTipArg(const std::string& id, const std::string& key, const LLStringExplicit& text);
 	
 	// LLSlider / LLMultiSlider / LLSpinCtrl
-	void childSetMinValue(const LLString& id, LLSD min_value);
-	void childSetMaxValue(const LLString& id, LLSD max_value);
+	void childSetMinValue(const std::string& id, LLSD min_value);
+	void childSetMaxValue(const std::string& id, LLSD max_value);
 
 	// LLTabContainer
-	void childShowTab(const LLString& id, const LLString& tabname, bool visible = true);
-	LLPanel *childGetVisibleTab(const LLString& id) const;
-	void childSetTabChangeCallback(const LLString& id, const LLString& tabname, void (*on_tab_clicked)(void*, bool), void *userdata);
+	void childShowTab(const std::string& id, const std::string& tabname, bool visible = true);
+	LLPanel *childGetVisibleTab(const std::string& id) const;
+	void childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata);
 
 	// LLTextBox
-	void childSetWrappedText(const LLString& id, const LLString& text, bool visible = true);
+	void childSetWrappedText(const std::string& id, const std::string& text, bool visible = true);
 
 	// LLTextBox/LLTextEditor/LLLineEditor
-	void childSetText(const LLString& id, const LLStringExplicit& text) { childSetValue(id, LLSD(text)); }
-	LLString childGetText(const LLString& id) const { return childGetValue(id).asString(); }
+	void childSetText(const std::string& id, const LLStringExplicit& text) { childSetValue(id, LLSD(text)); }
+	std::string childGetText(const std::string& id) const { return childGetValue(id).asString(); }
 
 	// LLLineEditor
-	void childSetKeystrokeCallback(const LLString& id, void (*keystroke_callback)(LLLineEditor* caller, void* user_data), void *user_data);
-	void childSetPrevalidate(const LLString& id, BOOL (*func)(const LLWString &) );
+	void childSetKeystrokeCallback(const std::string& id, void (*keystroke_callback)(LLLineEditor* caller, void* user_data), void *user_data);
+	void childSetPrevalidate(const std::string& id, BOOL (*func)(const LLWString &) );
 
 	// LLButton
-	void childSetAction(const LLString& id, void(*function)(void*), void* value);
-	void childSetActionTextbox(const LLString& id, void(*function)(void*));
-	void childSetControlName(const LLString& id, const LLString& control_name);
+	void childSetAction(const std::string& id, void(*function)(void*), void* value);
+	void childSetActionTextbox(const std::string& id, void(*function)(void*));
+	void childSetControlName(const std::string& id, const std::string& control_name);
 
 	// Error reporting
-	void childNotFound(const LLString& id) const;
+	void childNotFound(const std::string& id) const;
 	void childDisplayNotFound();
 
-	static void		alertXml(LLString label, LLString::format_map_t args = LLString::format_map_t());
+	static void		alertXml(const std::string& label, LLStringUtil::format_map_t args = LLStringUtil::format_map_t());
 	static BOOL		nextAlert(LLAlertInfo &alert);
 	static LLView*	fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 	
@@ -245,11 +245,11 @@ private:
 	virtual void	addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group);
 
 	// Unified error reporting for the child* functions
-	typedef std::set<LLString> expected_members_list_t;
+	typedef std::set<std::string> expected_members_list_t;
 	mutable expected_members_list_t mExpectedMembers;
 	mutable expected_members_list_t mNewExpectedMembers;
 
-	LLString		mRectControl;
+	std::string		mRectControl;
 	LLColor4		mBgColorAlpha;
 	LLColor4		mBgColorOpaque;
 	LLColor4		mDefaultBtnHighlight;
@@ -257,14 +257,14 @@ private:
 	BOOL			mBgOpaque;
 	LLViewBorder*	mBorder;
 	LLButton*		mDefaultBtn;
-	LLString		mLabel;
+	std::string		mLabel;
 	S32				mLastTabGroup;
 	LLRootHandle<LLPanel> mPanelHandle;
 
-	typedef std::map<LLString, LLUIString> ui_string_map_t;
+	typedef std::map<std::string, LLUIString> ui_string_map_t;
 	ui_string_map_t	mUIStrings;
 
-	LLString		mRequirementsError;
+	std::string		mRequirementsError;
 
 	typedef std::queue<LLAlertInfo> alert_queue_t;
 	static alert_queue_t sAlertQueue;
diff --git a/linden/indra/llui/llradiogroup.cpp b/linden/indra/llui/llradiogroup.cpp
index d7373f1..e518069 100644
--- a/linden/indra/llui/llradiogroup.cpp
+++ b/linden/indra/llui/llradiogroup.cpp
@@ -44,8 +44,8 @@
 
 static LLRegisterWidget<LLRadioGroup> r("radio_group");
 
-LLRadioGroup::LLRadioGroup(const LLString& name, const LLRect& rect,
-						   const LLString& control_name,
+LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
+						   const std::string& control_name,
 						   LLUICtrlCallback callback,
 						   void* userdata,
 						   BOOL border)
@@ -56,7 +56,7 @@ LLRadioGroup::LLRadioGroup(const LLString& name, const LLRect& rect,
 	init(border);
 }
 
-LLRadioGroup::LLRadioGroup(const LLString& name, const LLRect& rect,
+LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
 						   S32 initial_index,
 						   LLUICtrlCallback callback,
 						   void* userdata,
@@ -71,7 +71,7 @@ void LLRadioGroup::init(BOOL border)
 {
 	if (border)
 	{
-		addChild( new LLViewBorder( "radio group border", 
+		addChild( new LLViewBorder( std::string("radio group border"), 
 									LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), 
 									LLViewBorder::BEVEL_NONE, 
 									LLViewBorder::STYLE_LINE, 
@@ -252,7 +252,7 @@ void LLRadioGroup::draw()
 
 // When adding a button, we need to ensure that the radio
 // group gets a message when the button is clicked.
-LLRadioCtrl* LLRadioGroup::addRadioButton(const LLString& name, const LLString& label, const LLRect& rect, const LLFontGL* font )
+LLRadioCtrl* LLRadioGroup::addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font )
 {
 	// Highlight will get fixed in draw method above
 	LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font,
@@ -298,7 +298,7 @@ void LLRadioGroup::onClickButton(LLUICtrl* ui_ctrl, void* userdata)
 
 void LLRadioGroup::setValue( const LLSD& value )
 {
-	LLString value_name = value.asString();
+	std::string value_name = value.asString();
 	int idx = 0;
 	for (button_list_t::const_iterator iter = mRadioButtons.begin();
 		 iter != mRadioButtons.end(); ++iter)
@@ -357,7 +357,7 @@ LLXMLNodePtr LLRadioGroup::getXML(bool save_children) const
 
 		LLXMLNodePtr child_node = radio->LLView::getXML();
 		child_node->setStringValue(radio->getLabel());
-		child_node->setName("radio_item");
+		child_node->setName(std::string("radio_item"));
 
 		node->addChild(child_node);
 	}
@@ -368,7 +368,7 @@ LLXMLNodePtr LLRadioGroup::getXML(bool save_children) const
 // static
 LLView* LLRadioGroup::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("radio_group");
+	std::string name("radio_group");
 	node->getAttributeString("name", name);
 
 	U32 initial_value = 0;
@@ -387,7 +387,7 @@ LLView* LLRadioGroup::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 		NULL,
 		draw_border);
 
-	const LLString& contents = node->getValue();
+	const std::string& contents = node->getValue();
 
 	LLRect group_rect = radio_group->getRect();
 
@@ -406,10 +406,10 @@ LLView* LLRadioGroup::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 	
 		while(token_iter != tokens.end())
 		{
-			const char* line = token_iter->c_str();
+			const std::string& line = *token_iter;
 			LLRect rect(HPAD, cur_y, group_rect.getWidth() - (2 * HPAD), cur_y - 15);
 			cur_y -= VPAD + 15;
-			radio_group->addRadioButton("radio", line, rect, font);
+			radio_group->addRadioButton(std::string("radio"), line, rect, font);
 			++token_iter;
 		}
 		llwarns << "Legacy radio group format used! Please convert to use <radio_item> tags!" << llendl;
@@ -425,10 +425,10 @@ LLView* LLRadioGroup::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 				LLRect item_rect;
 				createRect(child, item_rect, radio_group, rect);
 
-				LLString radioname("radio");
+				std::string radioname("radio");
 				child->getAttributeString("name", radioname);
-				LLString item_label = child->getTextContents();
-				LLRadioCtrl* radio = radio_group->addRadioButton(radioname, item_label.c_str(), item_rect, font);
+				std::string item_label = child->getTextContents();
+				LLRadioCtrl* radio = radio_group->addRadioButton(radioname, item_label, item_rect, font);
 
 				radio->initFromXML(child, radio_group);
 			}
diff --git a/linden/indra/llui/llradiogroup.h b/linden/indra/llui/llradiogroup.h
index e208b79..c8b96db 100644
--- a/linden/indra/llui/llradiogroup.h
+++ b/linden/indra/llui/llradiogroup.h
@@ -43,7 +43,7 @@
 class LLRadioCtrl : public LLCheckBoxCtrl 
 {
 public:
-	LLRadioCtrl(const LLString& name, const LLRect& rect, const LLString& label, const LLFontGL* font = NULL,
+	LLRadioCtrl(const std::string& name, const LLRect& rect, const std::string& label, const LLFontGL* font = NULL,
 		void (*commit_callback)(LLUICtrl*, void*) = NULL, void* callback_userdata = NULL) :
 				LLCheckBoxCtrl(name, rect, label, font, commit_callback, callback_userdata, FALSE, RADIO_STYLE)
 	{
@@ -67,15 +67,15 @@ public:
 	// Build a radio group.  The number (0...n-1) of the currently selected
 	// element will be stored in the named control.  After the control is
 	// changed the callback will be called.
-	LLRadioGroup(const LLString& name, const LLRect& rect, 
-		const LLString& control_name, 
+	LLRadioGroup(const std::string& name, const LLRect& rect, 
+		const std::string& control_name, 
 		LLUICtrlCallback callback = NULL,
 		void* userdata = NULL,
 		BOOL border = TRUE);
 
 	// Another radio group constructor, but this one doesn't rely on
 	// needing a control
-	LLRadioGroup(const LLString& name, const LLRect& rect,
+	LLRadioGroup(const std::string& name, const LLRect& rect,
 				 S32 initial_index,
 				 LLUICtrlCallback callback = NULL,
 				 void* userdata = NULL,
@@ -106,7 +106,7 @@ public:
 	// You must use this method to add buttons to a radio group.
 	// Don't use addChild -- it won't set the callback function
 	// correctly.
-	LLRadioCtrl* addRadioButton(const LLString& name, const LLString& label, const LLRect& rect, const LLFontGL* font);
+	LLRadioCtrl* addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font);
 	LLRadioCtrl* getRadioButton(const S32& index) { return mRadioButtons[index]; }
 	// Update the control as needed.  Userdata must be a pointer to the button.
 	static void onClickButton(LLUICtrl* radio, void* userdata);
diff --git a/linden/indra/llui/llresizebar.cpp b/linden/indra/llui/llresizebar.cpp
index fd571a1..d8a7b92 100644
--- a/linden/indra/llui/llresizebar.cpp
+++ b/linden/indra/llui/llresizebar.cpp
@@ -39,7 +39,7 @@
 #include "llfocusmgr.h"
 #include "llwindow.h"
 
-LLResizeBar::LLResizeBar( const LLString& name, LLView* resizing_view, const LLRect& rect, S32 min_size, S32 max_size, Side side )
+LLResizeBar::LLResizeBar( const std::string& name, LLView* resizing_view, const LLRect& rect, S32 min_size, S32 max_size, Side side )
 	:
 	LLView( name, rect, TRUE ),
 	mDragLastScreenX( 0 ),
diff --git a/linden/indra/llui/llresizebar.h b/linden/indra/llui/llresizebar.h
index f8a7514..70dc7eb 100644
--- a/linden/indra/llui/llresizebar.h
+++ b/linden/indra/llui/llresizebar.h
@@ -40,7 +40,7 @@ class LLResizeBar : public LLView
 public:
 	enum Side { LEFT, TOP, RIGHT, BOTTOM };
 
-	LLResizeBar(const LLString& name, LLView* resizing_view, const LLRect& rect, S32 min_size, S32 max_size, Side side );
+	LLResizeBar(const std::string& name, LLView* resizing_view, const LLRect& rect, S32 min_size, S32 max_size, Side side );
 
 //	virtual void	draw();  No appearance
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/llui/llresizehandle.cpp b/linden/indra/llui/llresizehandle.cpp
index 3aa968f..340dff5 100644
--- a/linden/indra/llui/llresizehandle.cpp
+++ b/linden/indra/llui/llresizehandle.cpp
@@ -43,7 +43,7 @@
 
 const S32 RESIZE_BORDER_WIDTH = 3;
 
-LLResizeHandle::LLResizeHandle( const LLString& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner )
+LLResizeHandle::LLResizeHandle( const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner )
 	:
 	LLView( name, rect, TRUE ),
 	mDragLastScreenX( 0 ),
diff --git a/linden/indra/llui/llresizehandle.h b/linden/indra/llui/llresizehandle.h
index 5302612..46d3827 100644
--- a/linden/indra/llui/llresizehandle.h
+++ b/linden/indra/llui/llresizehandle.h
@@ -44,7 +44,7 @@ public:
 	enum ECorner { LEFT_TOP, LEFT_BOTTOM, RIGHT_TOP, RIGHT_BOTTOM };
 
 	
-	LLResizeHandle(const LLString& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM );
+	LLResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM );
 
 	virtual void	draw();
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index b5b9174..bd05d43 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -292,7 +292,7 @@ std::string LLResMgr::getMonetaryString( S32 input ) const
 	BOOL negative_before = negative && (conv->n_sign_posn != 2);
 	BOOL negative_after = negative && (conv->n_sign_posn == 2);
 
-	LLString digits = llformat("%u", abs(input));
+	std::string digits = llformat("%u", abs(input));
 	if( !grouping || !grouping[0] )
 	{
 		if( negative_before )
@@ -378,10 +378,10 @@ std::string LLResMgr::getMonetaryString( S32 input ) const
 	return output;
 }
 
-void LLResMgr::getIntegerString( LLString& output, S32 input ) const
+void LLResMgr::getIntegerString( std::string& output, S32 input ) const
 {
 	S32 fraction = 0;
-	LLString fraction_string;
+	std::string fraction_string;
 	S32 remaining_count = input;
 	while(remaining_count > 0)
 	{
@@ -415,16 +415,16 @@ void LLResMgr::getIntegerString( LLString& output, S32 input ) const
 	}
 }
 
-const LLString LLFONT_ID_NAMES[] =
+const std::string LLFONT_ID_NAMES[] =
 {
-	LLString("OCRA"),
-	LLString("SANSSERIF"),
-	LLString("SANSSERIF_SMALL"),
-	LLString("SANSSERIF_BIG"),
-	LLString("SMALL"),
+	std::string("OCRA"),
+	std::string("SANSSERIF"),
+	std::string("SANSSERIF_SMALL"),
+	std::string("SANSSERIF_BIG"),
+	std::string("SMALL"),
 };
 
-const LLFontGL* LLResMgr::getRes( LLString font_id ) const
+const LLFontGL* LLResMgr::getRes( std::string font_id ) const
 {
 	for (S32 i=0; i<LLFONT_COUNT; ++i)
 	{
@@ -437,21 +437,21 @@ const LLFontGL* LLResMgr::getRes( LLString font_id ) const
 }
 
 #if LL_WINDOWS
-const LLString LLLocale::USER_LOCALE("English_United States.1252");// = LLString::null;
-const LLString LLLocale::SYSTEM_LOCALE("English_United States.1252");
+const std::string LLLocale::USER_LOCALE("English_United States.1252");// = LLStringUtil::null;
+const std::string LLLocale::SYSTEM_LOCALE("English_United States.1252");
 #elif LL_DARWIN
-const LLString LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLString::null;
-const LLString LLLocale::SYSTEM_LOCALE("en_US.iso8859-1");
+const std::string LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLStringUtil::null;
+const std::string LLLocale::SYSTEM_LOCALE("en_US.iso8859-1");
 #elif LL_SOLARIS
-const LLString LLLocale::USER_LOCALE("en_US.ISO8859-1");
-const LLString LLLocale::SYSTEM_LOCALE("C");
+const std::string LLLocale::USER_LOCALE("en_US.ISO8859-1");
+const std::string LLLocale::SYSTEM_LOCALE("C");
 #else // LL_LINUX likes this
-const LLString LLLocale::USER_LOCALE("en_US.utf8");
-const LLString LLLocale::SYSTEM_LOCALE("C");
+const std::string LLLocale::USER_LOCALE("en_US.utf8");
+const std::string LLLocale::SYSTEM_LOCALE("C");
 #endif
 
 
-LLLocale::LLLocale(const LLString& locale_string)
+LLLocale::LLLocale(const std::string& locale_string)
 {
 	mPrevLocaleString = setlocale( LC_ALL, NULL );
 	char* new_locale_string = setlocale( LC_ALL, locale_string.c_str());
diff --git a/linden/indra/llui/llresmgr.h b/linden/indra/llui/llresmgr.h
index f9ec115..d7bc86c 100644
--- a/linden/indra/llui/llresmgr.h
+++ b/linden/indra/llui/llresmgr.h
@@ -71,11 +71,11 @@ public:
 	char				getMonetaryDecimalPoint() const;	
 	char				getMonetaryThousandsSeparator() const;
 	std::string			getMonetaryString( S32 input ) const;
-	void				getIntegerString( LLString& output, S32 input ) const;
+	void				getIntegerString( std::string& output, S32 input ) const;
 
 //	const char*			getRes( LLSTR_ID string_id ) const		{ return mStrings[ string_id ]; }
 	const LLFontGL*		getRes( LLFONT_ID font_id ) const		{ return mFonts[ font_id ]; }
-	const LLFontGL*		getRes( LLString font_id ) const;
+	const LLFontGL*		getRes( std::string font_id ) const;
 
 private:
 	LLLOCALE_ID			mLocale;
@@ -92,14 +92,14 @@ private:
 class LLLocale
 {
 public:
-	LLLocale(const LLString& locale_string);
+	LLLocale(const std::string& locale_string);
 	virtual ~LLLocale();
 
-	static const LLString USER_LOCALE;
-	static const LLString SYSTEM_LOCALE;
+	static const std::string USER_LOCALE;
+	static const std::string SYSTEM_LOCALE;
 
 private:
-	LLString	mPrevLocaleString;
+	std::string	mPrevLocaleString;
 };
 
 #endif  // LL_RESMGR_
diff --git a/linden/indra/llui/llrootview.cpp b/linden/indra/llui/llrootview.cpp
index cea9ded..fa7c730 100644
--- a/linden/indra/llui/llrootview.cpp
+++ b/linden/indra/llui/llrootview.cpp
@@ -32,7 +32,7 @@
 
 #include "llrootview.h"
 
-LLRootView::LLRootView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows)
+LLRootView::LLRootView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows)
 : LLView(name,rect,mouse_opaque,follows) 
 { }
 
diff --git a/linden/indra/llui/llrootview.h b/linden/indra/llui/llrootview.h
index f4c047c..9936f2d 100644
--- a/linden/indra/llui/llrootview.h
+++ b/linden/indra/llui/llrootview.h
@@ -37,7 +37,7 @@
 class LLRootView : public LLView
 {
 public:
-	LLRootView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
+	LLRootView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
 };
 
 #endif
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index 3d412c1..b011325 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -41,15 +41,13 @@
 #include "llcriticaldamp.h"
 #include "llkeyboard.h"
 #include "llui.h"
-//#include "llviewerimagelist.h"
 #include "llfocusmgr.h"
 #include "llwindow.h"
-#include "llglheaders.h"
 #include "llcontrol.h"
 #include "llrender.h"
 
 LLScrollbar::LLScrollbar(
-		const LLString& name, LLRect rect,
+		const std::string& name, LLRect rect,
 		LLScrollbar::ORIENTATION orientation,
 		S32 doc_size, S32 doc_pos, S32 page_size,
 		void (*change_callback)( S32 new_pos, LLScrollbar* self, void* userdata ),
@@ -84,10 +82,10 @@ LLScrollbar::LLScrollbar(
 	
 	// Page up and page down buttons
 	LLRect line_up_rect;
-	LLString line_up_img;
-	LLString line_up_selected_img;
-	LLString line_down_img;
-	LLString line_down_selected_img;
+	std::string line_up_img;
+	std::string line_up_selected_img;
+	std::string line_down_img;
+	std::string line_down_selected_img;
 
 	LLRect line_down_rect;
 
@@ -113,10 +111,9 @@ LLScrollbar::LLScrollbar(
 		line_down_selected_img="UIImgBtnScrollRightInUUID";
 	}
 
-	LLButton* line_up_btn = new LLButton(
-		"Line Up", line_up_rect,
-		line_up_img, line_up_selected_img, "",
-		&LLScrollbar::onLineUpBtnPressed, this, LLFontGL::sSansSerif );
+	LLButton* line_up_btn = new LLButton(std::string("Line Up"), line_up_rect,
+										 line_up_img, line_up_selected_img, LLStringUtil::null,
+										 &LLScrollbar::onLineUpBtnPressed, this, LLFontGL::sSansSerif );
 	if( LLScrollbar::VERTICAL == mOrientation )
 	{
 		line_up_btn->setFollowsRight();
@@ -132,10 +129,9 @@ LLScrollbar::LLScrollbar(
 	line_up_btn->setTabStop(FALSE);
 	addChild(line_up_btn);
 
-	LLButton* line_down_btn = new LLButton(
-		"Line Down", line_down_rect,
-		line_down_img, line_down_selected_img, "",
-		&LLScrollbar::onLineDownBtnPressed, this, LLFontGL::sSansSerif );
+	LLButton* line_down_btn = new LLButton(std::string("Line Down"), line_down_rect,
+										   line_down_img, line_down_selected_img, LLStringUtil::null,
+										   &LLScrollbar::onLineDownBtnPressed, this, LLFontGL::sSansSerif );
 	line_down_btn->setFollowsRight();
 	line_down_btn->setFollowsBottom();
 	line_down_btn->setHeldDownCallback( &LLScrollbar::onLineDownBtnPressed );
@@ -419,7 +415,7 @@ BOOL LLScrollbar::handleScrollWheel(S32 x, S32 y, S32 clicks)
 }
 
 BOOL LLScrollbar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-									EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, LLString &tooltip_msg)
+									EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg)
 {
 	// enable this to get drag and drop to control scrollbars
 	//if (!drop)
diff --git a/linden/indra/llui/llscrollbar.h b/linden/indra/llui/llscrollbar.h
index 52f19d1..cb0ad97 100644
--- a/linden/indra/llui/llscrollbar.h
+++ b/linden/indra/llui/llscrollbar.h
@@ -51,7 +51,7 @@ class LLScrollbar
 public:
 	enum ORIENTATION { HORIZONTAL, VERTICAL };
 
-	LLScrollbar(const LLString& name, LLRect rect,
+	LLScrollbar(const std::string& name, LLRect rect,
 		ORIENTATION orientation,
 		S32 doc_size, S32 doc_pos, S32 page_size,
 		void(*change_callback)( S32 new_pos, LLScrollbar* self, void* userdata ),
@@ -69,7 +69,7 @@ public:
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, 
-		EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, LLString &tooltip_msg);
+		EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg);
 
 	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index 1217a58..1ba2923 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -32,9 +32,7 @@
 
 #include "linden_common.h"
 
-#include "llgl.h"
 #include "llrender.h"
-
 #include "llscrollcontainer.h"
 #include "llscrollbar.h"
 #include "llui.h"
@@ -45,8 +43,6 @@
 #include "lluictrlfactory.h"
 #include "llfontgl.h"
 
-#include "llglheaders.h"
-
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -64,7 +60,7 @@ static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
 static LLRegisterWidget<LLScrollableContainerView> r("scroll_container");
 
 // Default constructor
-LLScrollableContainerView::LLScrollableContainerView( const LLString& name,
+LLScrollableContainerView::LLScrollableContainerView( const std::string& name,
 													  const LLRect& rect,
 													  LLView* scrolled_view,
 													  BOOL is_opaque,
@@ -86,7 +82,7 @@ LLScrollableContainerView::LLScrollableContainerView( const LLString& name,
 }
 
 // LLUICtrl constructor
-LLScrollableContainerView::LLScrollableContainerView( const LLString& name, const LLRect& rect,
+LLScrollableContainerView::LLScrollableContainerView( const std::string& name, const LLRect& rect,
 							   LLUICtrl* scrolled_ctrl, BOOL is_opaque,
 							   const LLColor4& bg_color) :
 	LLUICtrl( name, rect, FALSE, NULL, NULL ),
@@ -108,7 +104,7 @@ LLScrollableContainerView::LLScrollableContainerView( const LLString& name, cons
 void LLScrollableContainerView::init()
 {
 	LLRect border_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
-	mBorder = new LLViewBorder( "scroll border", border_rect, LLViewBorder::BEVEL_IN );
+	mBorder = new LLViewBorder( std::string("scroll border"), border_rect, LLViewBorder::BEVEL_IN );
 	addChild( mBorder );
 
 	mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 );
@@ -116,7 +112,7 @@ void LLScrollableContainerView::init()
 
 	LLRect vertical_scroll_rect = mInnerRect;
 	vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - SCROLLBAR_SIZE;
-	mScrollbar[VERTICAL] = new LLScrollbar( "scrollable vertical",
+	mScrollbar[VERTICAL] = new LLScrollbar( std::string("scrollable vertical"),
 											vertical_scroll_rect,
 											LLScrollbar::VERTICAL,
 											mInnerRect.getHeight(), 
@@ -132,7 +128,7 @@ void LLScrollableContainerView::init()
 	
 	LLRect horizontal_scroll_rect = mInnerRect;
 	horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + SCROLLBAR_SIZE;
-	mScrollbar[HORIZONTAL] = new LLScrollbar( "scrollable horizontal",
+	mScrollbar[HORIZONTAL] = new LLScrollbar( std::string("scrollable horizontal"),
 											  horizontal_scroll_rect,
 											  LLScrollbar::HORIZONTAL,
 											  mInnerRect.getWidth(),
@@ -268,7 +264,7 @@ BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
 												  EDragAndDropType cargo_type,
 												  void* cargo_data,
 												  EAcceptance* accept,
-												  LLString& tooltip_msg)
+												  std::string& tooltip_msg)
 {
 	// Scroll folder view if needed.  Never accepts a drag or drop.
 	*accept = ACCEPT_NO;
@@ -340,7 +336,7 @@ BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
 }
 
 
-BOOL LLScrollableContainerView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect)
+BOOL LLScrollableContainerView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect)
 {
 	S32 local_x, local_y;
 	for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
@@ -704,7 +700,7 @@ LLXMLNodePtr LLScrollableContainerView::getXML(bool save_children) const
 
 LLView* LLScrollableContainerView::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("scroll_container");
+	std::string name("scroll_container");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -742,7 +738,7 @@ LLView* LLScrollableContainerView::fromXML(LLXMLNodePtr node, LLView *parent, LL
 
 	if (panelp == NULL)
 	{
-		panelp = new LLPanel("dummy", LLRect::null, FALSE);
+		panelp = new LLPanel(std::string("dummy"), LLRect::null, FALSE);
 	}
 
 	ret->mScrolledView = panelp;
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index b6999e6..3e42dd4 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -59,10 +59,10 @@ public:
 	// scrollbars have priority for mouse and keyboard events.
 	enum SCROLL_ORIENTATION { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
 
-	LLScrollableContainerView( const LLString& name, const LLRect& rect,
+	LLScrollableContainerView( const std::string& name, const LLRect& rect,
 							   LLView* scrolled_view, BOOL is_opaque = FALSE,
 							   const LLColor4& bg_color = LLColor4(0,0,0,0) );
-	LLScrollableContainerView( const LLString& name, const LLRect& rect,
+	LLScrollableContainerView( const std::string& name, const LLRect& rect,
 							   LLUICtrl* scrolled_ctrl, BOOL is_opaque = FALSE,
 							   const LLColor4& bg_color = LLColor4(0,0,0,0) );
 	virtual ~LLScrollableContainerView( void );
@@ -94,9 +94,9 @@ public:
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg);
+								   std::string& tooltip_msg);
 
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	virtual void	draw();
 
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
diff --git a/linden/indra/llui/llscrollingpanellist.cpp b/linden/indra/llui/llscrollingpanellist.cpp
index c9cdf3f..cc4b8f4 100644
--- a/linden/indra/llui/llscrollingpanellist.cpp
+++ b/linden/indra/llui/llscrollingpanellist.cpp
@@ -141,7 +141,7 @@ void LLScrollingPanelList::draw()
 // static
 LLView* LLScrollingPanelList::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-    LLString name("scrolling_panel_list");
+    std::string name("scrolling_panel_list");
     node->getAttributeString("name", name);
 
     LLRect rect;
diff --git a/linden/indra/llui/llscrollingpanellist.h b/linden/indra/llui/llscrollingpanellist.h
index 7729250..2b8072d 100644
--- a/linden/indra/llui/llscrollingpanellist.h
+++ b/linden/indra/llui/llscrollingpanellist.h
@@ -41,7 +41,7 @@
 class LLScrollingPanel : public LLPanel
 {
 public:
-	LLScrollingPanel(const LLString& name, const LLRect& rect) : LLPanel(name, rect) { }
+	LLScrollingPanel(const std::string& name, const LLRect& rect) : LLPanel(name, rect) { }
 	virtual void updatePanel(BOOL allow_modify) = 0;
 };
 
@@ -52,7 +52,7 @@ public:
 class LLScrollingPanelList : public LLUICtrl
 {
 public:
-	LLScrollingPanelList(const LLString& name, const LLRect& rect)
+	LLScrollingPanelList(const std::string& name, const LLRect& rect)
 		:	LLUICtrl(name, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_BOTTOM ) {}
 
 	virtual void setValue(const LLSD& value) {};
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 307d045..6561bb5 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -42,9 +42,7 @@
 #include "llcheckboxctrl.h"
 #include "llclipboard.h"
 #include "llfocusmgr.h"
-#include "llgl.h"
 #include "llrender.h"
-#include "llglheaders.h"
 #include "llresmgr.h"
 #include "llscrollbar.h"
 #include "llstring.h"
@@ -85,7 +83,7 @@ struct SortScrollListItem
 			S32 order = sort_ascending ? 1 : -1; // ascending or descending sort for this column?
 			if (cell1 && cell2)
 			{
-				sort_result = order * LLString::compareDict(cell1->getValue().asString(), cell2->getValue().asString());
+				sort_result = order * LLStringUtil::compareDict(cell1->getValue().asString(), cell2->getValue().asString());
 				if (sort_result != 0)
 				{
 					break; // we have a sort order!
@@ -133,7 +131,7 @@ void LLScrollListIcon::setValue(const LLSD& value)
 	}
 	else
 	{
-		LLString value_string = value.asString();
+		std::string value_string = value.asString();
 		if (LLUUID::validate(value_string))
 		{
 			setValue(LLUUID(value_string));
@@ -239,7 +237,7 @@ void LLScrollListSeparator::draw(const LLColor4& color, const LLColor4& highligh
 //
 U32 LLScrollListText::sCount = 0;
 
-LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font, S32 width, U8 font_style, LLFontGL::HAlign font_alignment, LLColor4& color, BOOL use_color, BOOL visible)
+LLScrollListText::LLScrollListText( const std::string& text, const LLFontGL* font, S32 width, U8 font_style, LLFontGL::HAlign font_alignment, LLColor4& color, BOOL use_color, BOOL visible)
 :	LLScrollListCell(width),
 	mText( text ),
 	mFont( font ),
@@ -418,9 +416,9 @@ void LLScrollListItem::setColumn( S32 column, LLScrollListCell *cell )
 	}
 }
 
-LLString LLScrollListItem::getContentsCSV() const
+std::string LLScrollListItem::getContentsCSV() const
 {
-	LLString ret;
+	std::string ret;
 
 	S32 count = getNumColumns();
 	for (S32 i=0; i<count; ++i)
@@ -476,7 +474,7 @@ void LLScrollListItem::setEnabled(BOOL b)
 //---------------------------------------------------------------------------
 // LLScrollListItemComment
 //---------------------------------------------------------------------------
-LLScrollListItemComment::LLScrollListItemComment(const LLString& comment_string, const LLColor4& color)
+LLScrollListItemComment::LLScrollListItemComment(const std::string& comment_string, const LLColor4& color)
 : LLScrollListItem(FALSE),
 	mColor(color)
 {
@@ -541,7 +539,7 @@ void LLScrollListItemSeparator::draw(const LLRect& rect, const LLColor4& fg_colo
 // LLScrollListCtrl
 //---------------------------------------------------------------------------
 
-LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
+LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
 	void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
 	void* callback_user_data,
 	BOOL allow_multiple_selection,
@@ -605,12 +603,12 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
 		mItemListRect.mBottom,
 		SCROLLBAR_SIZE,
 		mItemListRect.getHeight());
-	mScrollbar = new LLScrollbar( "Scrollbar", scroll_rect,
-		LLScrollbar::VERTICAL,
-		getItemCount(),
-		mScrollLines,
-		mPageLines,
-		&LLScrollListCtrl::onScrollChange, this );
+	mScrollbar = new LLScrollbar( std::string("Scrollbar"), scroll_rect,
+								  LLScrollbar::VERTICAL,
+								  getItemCount(),
+								  mScrollLines,
+								  mPageLines,
+								  &LLScrollListCtrl::onScrollChange, this );
 	mScrollbar->setFollowsRight();
 	mScrollbar->setFollowsTop();
 	mScrollbar->setFollowsBottom();
@@ -623,7 +621,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
 	if (show_border)
 	{
 		LLRect border_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
-		mBorder = new LLViewBorder( "dlg border", border_rect, LLViewBorder::BEVEL_IN, LLViewBorder::STYLE_LINE, 1 );
+		mBorder = new LLViewBorder( std::string("dlg border"), border_rect, LLViewBorder::BEVEL_IN, LLViewBorder::STYLE_LINE, 1 );
 		addChild(mBorder);
 	}
 
@@ -758,7 +756,7 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllData() const
 // returns first matching item
 LLScrollListItem* LLScrollListCtrl::getItem(const LLSD& sd) const
 {
-	LLString string_val = sd.asString();
+	std::string string_val = sd.asString();
 
 	item_list::const_iterator iter;
 	for(iter = mItemList.begin(); iter != mItemList.end(); iter++)
@@ -1405,7 +1403,7 @@ void LLScrollListCtrl::deselectAllItems(BOOL no_commit_on_change)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Use this to add comment text such as "Searching", which ignores column settings of list
 
-LLScrollListItem* LLScrollListCtrl::addCommentText(const LLString& comment_text, EAddPosition pos)
+LLScrollListItem* LLScrollListCtrl::addCommentText(const std::string& comment_text, EAddPosition pos)
 {
 	LLScrollListItem* item = NULL;
 	if (getItemCount() < mMaxItemCount)
@@ -1426,7 +1424,7 @@ LLScrollListItem* LLScrollListCtrl::addSeparator(EAddPosition pos)
 
 // Selects first enabled item of the given name.
 // Returns false if item not found.
-BOOL LLScrollListCtrl::selectItemByLabel(const LLString& label, BOOL case_sensitive)
+BOOL LLScrollListCtrl::selectItemByLabel(const std::string& label, BOOL case_sensitive)
 {
 	// ensure that no stale items are selected, even if we don't find a match
 	deselectAllItems(TRUE);
@@ -1436,10 +1434,10 @@ BOOL LLScrollListCtrl::selectItemByLabel(const LLString& label, BOOL case_sensit
 		return FALSE;
 	}
 
-	LLString target_text = label;
+	std::string target_text = label;
 	if (!case_sensitive)
 	{
-		LLString::toLower(target_text);
+		LLStringUtil::toLower(target_text);
 	}
 
 	BOOL found = FALSE;
@@ -1450,10 +1448,10 @@ BOOL LLScrollListCtrl::selectItemByLabel(const LLString& label, BOOL case_sensit
 	{
 		LLScrollListItem* item = *iter;
 		// Only select enabled items with matching names
-		LLString item_text = item->getColumn(0)->getValue().asString();
+		std::string item_text = item->getColumn(0)->getValue().asString();
 		if (!case_sensitive)
 		{
-			LLString::toLower(item_text);
+			LLStringUtil::toLower(item_text);
 		}
 		BOOL select = !found && item->getEnabled() && item_text == target_text;
 		if (select)
@@ -1473,7 +1471,7 @@ BOOL LLScrollListCtrl::selectItemByLabel(const LLString& label, BOOL case_sensit
 }
 
 
-BOOL LLScrollListCtrl::selectItemByPrefix(const LLString& target, BOOL case_sensitive)
+BOOL LLScrollListCtrl::selectItemByPrefix(const std::string& target, BOOL case_sensitive)
 {
 	return selectItemByPrefix(utf8str_to_wstring(target), case_sensitive);
 }
@@ -1510,7 +1508,7 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
 		if (!case_sensitive)
 		{
 			// do comparisons in lower case
-			LLWString::toLower(target_trimmed);
+			LLWStringUtil::toLower(target_trimmed);
 		}
 
 		for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
@@ -1526,11 +1524,11 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
 			LLWString item_label = utf8str_to_wstring(cellp->getValue().asString());
 			if (!case_sensitive)
 			{
-				LLWString::toLower(item_label);
+				LLWStringUtil::toLower(item_label);
 			}
 			// remove extraneous whitespace from searchable label
 			LLWString trimmed_label = item_label;
-			LLWString::trim(trimmed_label);
+			LLWStringUtil::trim(trimmed_label);
 			
 			BOOL select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
 
@@ -1554,7 +1552,7 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
 	return found;
 }
 
-const LLString LLScrollListCtrl::getSelectedItemLabel(S32 column) const
+const std::string LLScrollListCtrl::getSelectedItemLabel(S32 column) const
 {
 	LLScrollListItem* item;
 
@@ -1564,14 +1562,14 @@ const LLString LLScrollListCtrl::getSelectedItemLabel(S32 column) const
 		return item->getColumn(column)->getValue().asString();
 	}
 
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // "StringUUID" interface: use this when you're creating a list that contains non-unique strings each of which
 // has an associated, unique UUID, and only one of which can be selected at a time.
 
-LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const LLString& item_text, const LLUUID& id, EAddPosition pos, BOOL enabled, S32 column_width)
+LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos, BOOL enabled, S32 column_width)
 {
 	LLScrollListItem* item = NULL;
 	if (getItemCount() < mMaxItemCount)
@@ -1799,7 +1797,7 @@ BOOL LLScrollListCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return handled;
 }
 
-BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
 	S32 column_index = getColumnIndexFromOffset(x);
 	LLScrollListColumn* columnp = getColumn(column_index);
@@ -2539,7 +2537,7 @@ void LLScrollListCtrl::onScrollChange( S32 new_pos, LLScrollbar* scrollbar, void
 }
 
 
-void LLScrollListCtrl::sortByColumn(LLString name, BOOL ascending)
+void LLScrollListCtrl::sortByColumn(const std::string& name, BOOL ascending)
 {
 	if (name.empty())
 	{
@@ -2547,15 +2545,15 @@ void LLScrollListCtrl::sortByColumn(LLString name, BOOL ascending)
 		return;
 	}
 
-	std::map<LLString, LLScrollListColumn>::iterator itor = mColumns.find(name);
+	std::map<std::string, LLScrollListColumn>::iterator itor = mColumns.find(name);
 	if (itor != mColumns.end())
 	{
-		sortByColumn((*itor).second.mIndex, ascending);
+		sortByColumnIndex((*itor).second.mIndex, ascending);
 	}
 }
 
 // First column is column 0
-void  LLScrollListCtrl::sortByColumn(U32 column, BOOL ascending)
+void  LLScrollListCtrl::sortByColumnIndex(U32 column, BOOL ascending)
 {
 	if (setSort(column, ascending))
 	{
@@ -2582,7 +2580,7 @@ void LLScrollListCtrl::dirtyColumns()
 	// just in case someone indexes into it immediately
 	mColumnsIndexed.resize(mColumns.size());
 
-	std::map<LLString, LLScrollListColumn>::iterator column_itor;
+	std::map<std::string, LLScrollListColumn>::iterator column_itor;
 	for (column_itor = mColumns.begin(); column_itor != mColumns.end(); ++column_itor)
 	{
 		LLScrollListColumn *column = &column_itor->second;
@@ -2671,7 +2669,7 @@ LLXMLNodePtr LLScrollListCtrl::getXML(bool save_children) const
 
 	// Contents
 
-	std::map<LLString, LLScrollListColumn>::const_iterator itor;
+	std::map<std::string, LLScrollListColumn>::const_iterator itor;
 	std::vector<const LLScrollListColumn*> sorted_list;
 	sorted_list.resize(mColumns.size());
 	for (itor = mColumns.begin(); itor != mColumns.end(); ++itor)
@@ -2763,7 +2761,7 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
 // static
 LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("scroll_list");
+	std::string name("scroll_list");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -2813,7 +2811,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 
 	if (sort_column >= 0)
 	{
-		scroll_list->sortByColumn(sort_column, sort_ascending);
+		scroll_list->sortByColumnIndex(sort_column, sort_ascending);
 	}
 
 	LLSD columns;
@@ -2824,19 +2822,19 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 	{
 		if (child->hasName("column"))
 		{
-			LLString labelname("");
+			std::string labelname("");
 			child->getAttributeString("label", labelname);
 
-			LLString columnname(labelname);
+			std::string columnname(labelname);
 			child->getAttributeString("name", columnname);
 
-			LLString sortname(columnname);
+			std::string sortname(columnname);
 			child->getAttributeString("sort", sortname);
 		
 			BOOL sort_ascending = TRUE;
 			child->getAttributeBOOL("sort_ascending", sort_ascending);
 
-			LLString imagename;
+			std::string imagename;
 			child->getAttributeString("image", imagename);
 
 			BOOL columndynamicwidth = FALSE;
@@ -2845,7 +2843,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 			S32 columnwidth = -1;
 			child->getAttributeS32("width", columnwidth);	
 
-			LLString tooltip;
+			std::string tooltip;
 			child->getAttributeString("tool_tip", tooltip);
 
 			if(!columndynamicwidth) total_static += llmax(0, columnwidth);
@@ -2890,15 +2888,15 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 			{
 				if (row_child->hasName("column"))
 				{
-					LLString value = row_child->getTextContents();
+					std::string value = row_child->getTextContents();
 
-					LLString columnname("");
+					std::string columnname("");
 					row_child->getAttributeString("name", columnname);
 
-					LLString font("");
+					std::string font("");
 					row_child->getAttributeString("font", font);
 
-					LLString font_style("");
+					std::string font_style("");
 					row_child->getAttributeString("font-style", font_style);
 
 					row["columns"][column_idx]["column"] = columnname;
@@ -2912,7 +2910,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 		}
 	}
 
-	LLString contents = node->getTextContents();
+	std::string contents = node->getTextContents();
 	if (!contents.empty())
 	{
 		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
@@ -2922,7 +2920,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 
 		while(token_iter != tokens.end())
 		{
-			const char* line = token_iter->c_str();
+			const std::string& line = *token_iter;
 			scroll_list->addSimpleElement(line);
 			++token_iter;
 		}
@@ -2936,7 +2934,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 // virtual
 void	LLScrollListCtrl::copy()
 {
-	LLString buffer;
+	std::string buffer;
 
 	std::vector<LLScrollListItem*> items = getAllSelected();
 	std::vector<LLScrollListItem*>::iterator itor;
@@ -3006,7 +3004,7 @@ BOOL	LLScrollListCtrl::canDeselect() const
 
 void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
 {
-	LLString name = column["name"].asString();
+	std::string name = column["name"].asString();
 	// if no column name provided, just use ordinal as name
 	if (name.empty())
 	{
@@ -3037,7 +3035,7 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
 			S32 top = mItemListRect.mTop;
 			S32 left = mItemListRect.mLeft;
 			{
-				std::map<LLString, LLScrollListColumn>::iterator itor;
+				std::map<std::string, LLScrollListColumn>::iterator itor;
 				for (itor = mColumns.begin(); itor != mColumns.end(); ++itor)
 				{
 					if (itor->second.mIndex < new_column->mIndex &&
@@ -3047,7 +3045,7 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
 					}
 				}
 			}
-			LLString button_name = "btn_" + name;
+			std::string button_name = "btn_" + name;
 			S32 right = left+new_column->mWidth;
 			if (new_column->mIndex != (S32)mColumns.size()-1)
 			{
@@ -3108,7 +3106,7 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
 		ascending = !parent->mSortColumns.back().second;
 	}
 
-	parent->sortByColumn(column_index, ascending);
+	parent->sortByColumnIndex(column_index, ascending);
 
 	if (parent->mOnSortChangedCallback)
 	{
@@ -3131,7 +3129,7 @@ BOOL LLScrollListCtrl::needsSorting()
 
 void LLScrollListCtrl::clearColumns()
 {
-	std::map<LLString, LLScrollListColumn>::iterator itor;
+	std::map<std::string, LLScrollListColumn>::iterator itor;
 	for (itor = mColumns.begin(); itor != mColumns.end(); ++itor)
 	{
 		LLColumnHeader *header = itor->second.mHeader;
@@ -3145,9 +3143,9 @@ void LLScrollListCtrl::clearColumns()
 	mSortColumns.clear();
 }
 
-void LLScrollListCtrl::setColumnLabel(const LLString& column, const LLString& label)
+void LLScrollListCtrl::setColumnLabel(const std::string& column, const std::string& label)
 {
-	std::map<LLString, LLScrollListColumn>::iterator itor = mColumns.find(column);
+	std::map<std::string, LLScrollListColumn>::iterator itor = mColumns.find(column);
 	if (itor != mColumns.end())
 	{
 		itor->second.mLabel = label;
@@ -3201,7 +3199,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 			// skip unused columns in item passed in
 			continue;
 		}
-		LLString column = (*itor)["column"].asString();
+		std::string column = (*itor)["column"].asString();
 
 		LLScrollListColumn* columnp = NULL;
 
@@ -3213,7 +3211,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 			column = new_name.str();
 		}
 
-		std::map<LLString, LLScrollListColumn>::iterator column_itor;
+		std::map<std::string, LLScrollListColumn>::iterator column_itor;
 		column_itor = mColumns.find(column);
 		if (column_itor != mColumns.end()) 
 		{
@@ -3244,11 +3242,19 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 		S32 index = columnp->mIndex;
 		S32 width = columnp->mWidth;
 		LLFontGL::HAlign font_alignment = columnp->mFontAlignment;
-
+		LLColor4 fcolor = LLColor4::black;
+		
 		LLSD value = (*itor)["value"];
-		LLString fontname = (*itor)["font"].asString();
-		LLString fontstyle = (*itor)["font-style"].asString();
-		LLString type = (*itor)["type"].asString();
+		std::string fontname = (*itor)["font"].asString();
+		std::string fontstyle = (*itor)["font-style"].asString();
+		std::string type = (*itor)["type"].asString();
+		
+		if ((*itor).has("font-color"))
+		{
+			LLSD sd_color = (*itor)["font-color"];
+			fcolor.setValue(sd_color);
+		}
+		
 		BOOL has_color = (*itor).has("color");
 		LLColor4 color = ((*itor)["color"]);
 		BOOL enabled = !(*itor).has("enabled") || (*itor)["enabled"].asBoolean() == true;
@@ -3271,8 +3277,8 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 		}
 		else if (type == "checkbox")
 		{
-			LLCheckBoxCtrl* ctrl = new LLCheckBoxCtrl("check",
-														LLRect(0, width, width, 0), " ");
+			LLCheckBoxCtrl* ctrl = new LLCheckBoxCtrl(std::string("check"),
+													  LLRect(0, width, width, 0), std::string(" "));
 			ctrl->setEnabled(enabled);
 			ctrl->setValue(value);
 			LLScrollListCheck* cell = new LLScrollListCheck(ctrl,width);
@@ -3293,7 +3299,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 		}
 		else
 		{
-			LLScrollListText* cell = new LLScrollListText(value.asString(), font, width, font_style, font_alignment);
+			LLScrollListText* cell = new LLScrollListText(value.asString(), font, width, font_style, font_alignment, fcolor, TRUE);
 			if (has_color)
 			{
 				cell->setColor(color);
@@ -3315,7 +3321,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 		if (new_item->getColumn(column_idx) == NULL)
 		{
 			LLScrollListColumn* column_ptr = &column_it->second;
-			new_item->setColumn(column_idx, new LLScrollListText("", LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
+			new_item->setColumn(column_idx, new LLScrollListText(LLStringUtil::null, LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
 		}
 	}
 
@@ -3324,7 +3330,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 	return new_item;
 }
 
-LLScrollListItem* LLScrollListCtrl::addSimpleElement(const LLString& value, EAddPosition pos, const LLSD& id)
+LLScrollListItem* LLScrollListCtrl::addSimpleElement(const std::string& value, EAddPosition pos, const LLSD& id)
 {
 	LLSD entry_id = id;
 
@@ -3441,7 +3447,7 @@ void LLScrollListCtrl::onFocusLost()
 	LLUICtrl::onFocusLost();
 }
 
-LLColumnHeader::LLColumnHeader(const LLString& label, const LLRect &rect, LLScrollListColumn* column, const LLFontGL* fontp) : 
+LLColumnHeader::LLColumnHeader(const std::string& label, const LLRect &rect, LLScrollListColumn* column, const LLFontGL* fontp) : 
 	LLComboBox(label, rect, label, NULL, NULL), 
 	mColumn(column),
 	mOrigLabel(label),
@@ -3460,15 +3466,15 @@ LLColumnHeader::LLColumnHeader(const LLString& label, const LLRect &rect, LLScro
 
 	mButton->setCallbackUserData(this);
 
-	mAscendingText = "[LOW]...[HIGH](Ascending)";
-	mDescendingText = "[HIGH]...[LOW](Descending)";
+	mAscendingText = std::string("[LOW]...[HIGH](Ascending)"); // *TODO: Translate
+	mDescendingText = std::string("[HIGH]...[LOW](Descending)"); // *TODO: Translate
 
 	mList->reshape(llmax(mList->getRect().getWidth(), 110, getRect().getWidth()), mList->getRect().getHeight());
 
 	// resize handles on left and right
 	const S32 RESIZE_BAR_THICKNESS = 3;
 	mResizeBar = new LLResizeBar( 
-		"resizebar",
+		std::string("resizebar"),
 		this,
 		LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0), 
 		MIN_COLUMN_WIDTH, S32_MAX, LLResizeBar::RIGHT );
@@ -3521,7 +3527,7 @@ BOOL LLColumnHeader::handleDoubleClick(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 
-void LLColumnHeader::setImage(const LLString &image_name)
+void LLColumnHeader::setImage(const std::string &image_name)
 {
 	if (mButton)
 	{
@@ -3574,8 +3580,8 @@ void LLColumnHeader::showList()
 		// move sort column over to this column and do initial sort
 		mColumn->mParentCtrl->sortByColumn(mColumn->mSortingColumn, mColumn->mParentCtrl->getSortAscending());
 
-		LLString low_item_text;
-		LLString high_item_text;
+		std::string low_item_text;
+		std::string high_item_text;
 
 		LLScrollListItem* itemp = mColumn->mParentCtrl->getFirstData();
 		if (itemp)
@@ -3611,11 +3617,11 @@ void LLColumnHeader::showList()
 			}
 		}
 
-		LLString::truncate(low_item_text, 3);
-		LLString::truncate(high_item_text, 3);
+		LLStringUtil::truncate(low_item_text, 3);
+		LLStringUtil::truncate(high_item_text, 3);
 
-		LLString ascending_string;
-		LLString descending_string;
+		std::string ascending_string;
+		std::string descending_string;
 
 		if (low_item_text.empty() || high_item_text.empty())
 		{
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 667a89a..6f26c8d 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -65,7 +65,7 @@ public:
 	virtual S32				getWidth() const {return mWidth;}
 	virtual S32				getContentWidth() const { return 0; }
 	virtual S32				getHeight() const = 0;
-	virtual const LLSD		getValue() const { return LLString::null; }
+	virtual const LLSD		getValue() const { return LLStringUtil::null; }
 	virtual void			setValue(const LLSD& value) { }
 	virtual BOOL			getVisible() const { return TRUE; }
 	virtual void			setWidth(S32 width) { mWidth = width; }
@@ -100,7 +100,7 @@ public:
 class LLScrollListText : public LLScrollListCell
 {
 public:
-	LLScrollListText( const LLString& text, const LLFontGL* font, S32 width = 0, U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
+	LLScrollListText( const std::string& text, const LLFontGL* font, S32 width = 0, U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
 	/*virtual*/ ~LLScrollListText();
 
 	virtual void    draw(const LLColor4& color, const LLColor4& highlight_color) const;
@@ -145,7 +145,7 @@ public:
 	virtual void	draw(const LLColor4& color, const LLColor4& highlight_color) const;
 	virtual S32		getWidth() const;
 	virtual S32		getHeight() const			{ return mIcon ? mIcon->getHeight() : 0; }
-	virtual const LLSD		getValue() const { return mIcon.isNull() ? LLString::null : mIcon->getName(); }
+	virtual const LLSD		getValue() const { return mIcon.isNull() ? LLStringUtil::null : mIcon->getName(); }
 	virtual void	setColor(const LLColor4&);
 	virtual BOOL	isText()const { return FALSE; }
 	virtual void	setValue(const LLSD& value);
@@ -201,7 +201,7 @@ public:
 		mFontAlignment(LLFontGL::LEFT)
 	{ }
 
-	LLScrollListColumn(LLString name, LLString label, S32 width, F32 relwidth) : 
+	LLScrollListColumn(std::string name, std::string label, S32 width, F32 relwidth) : 
 		mName(name), 
 		mSortingColumn(name), 
         	mSortAscending(TRUE), 
@@ -265,15 +265,16 @@ public:
 		mIndex = -1;
 		mParentCtrl = NULL;
 		mHeader = NULL;
+		mFontAlignment = LLFontGL::LEFT;
 	}
 
 	// Public data is fine so long as this remains a simple struct-like data class.
 	// If it ever gets any smarter than that, these should all become private
 	// with protected or public accessor methods added as needed. -MG
-	LLString			mName;
-	LLString			mSortingColumn;
+	std::string			mName;
+	std::string			mSortingColumn;
 	BOOL				mSortAscending;
-	LLString			mLabel;
+	std::string			mLabel;
 	S32					mWidth;
 	F32					mRelWidth;
 	BOOL				mDynamicWidth;
@@ -287,7 +288,7 @@ public:
 class LLColumnHeader : public LLComboBox
 {
 public:
-	LLColumnHeader(const LLString& label, const LLRect &rect, LLScrollListColumn* column, const LLFontGL *font = NULL);
+	LLColumnHeader(const std::string& label, const LLRect &rect, LLScrollListColumn* column, const LLFontGL *font = NULL);
 	~LLColumnHeader();
 
 	/*virtual*/ void draw();
@@ -297,12 +298,12 @@ public:
 	/*virtual*/ LLView*	findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding);
 	/*virtual*/ void userSetShape(const LLRect& new_rect);
 	
-	void setImage(const LLString &image_name);
+	void setImage(const std::string &image_name);
 	LLScrollListColumn* getColumn() { return mColumn; }
 	void setHasResizableElement(BOOL resizable);
 	BOOL canResize();
 	void enableResizeBar(BOOL enable);
-	LLString getLabel() { return mOrigLabel; }
+	std::string getLabel() { return mOrigLabel; }
 
 	static void onSelectSort(LLUICtrl* ctrl, void* user_data);
 	static void onClick(void* user_data);
@@ -312,7 +313,7 @@ public:
 private:
 	LLScrollListColumn* mColumn;
 	LLResizeBar*		mResizeBar;
-	LLString			mOrigLabel;
+	std::string			mOrigLabel;
 	LLUIString			mAscendingText;
 	LLUIString			mDescendingText;
 	BOOL				mShowSortOptions;
@@ -343,7 +344,7 @@ public:
 
 	// If width = 0, just use the width of the text.  Otherwise override with
 	// specified width in pixels.
-	void	addColumn( const LLString& text, const LLFontGL* font, S32 width = 0 , U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, BOOL visible = TRUE)
+	void	addColumn( const std::string& text, const LLFontGL* font, S32 width = 0 , U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, BOOL visible = TRUE)
 				{ mColumns.push_back( new LLScrollListText(text, font, width, font_style, font_alignment, LLColor4::black, FALSE, visible) ); }
 
 	void	addColumn( LLUIImagePtr icon, S32 width = 0 )
@@ -360,7 +361,7 @@ public:
 
 	LLScrollListCell *getColumn(const S32 i) const	{ if (0 <= i && i < (S32)mColumns.size()) { return mColumns[i]; } return NULL; }
 
-	LLString getContentsCSV() const;
+	std::string getContentsCSV() const;
 
 	virtual void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
 
@@ -380,7 +381,7 @@ private:
 class LLScrollListItemComment : public LLScrollListItem
 {
 public:
-	LLScrollListItemComment(const LLString& comment_string, const LLColor4& color);
+	LLScrollListItemComment(const std::string& comment_string, const LLColor4& color);
 
 	/*virtual*/ void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
 private:
@@ -400,7 +401,7 @@ class LLScrollListCtrl : public LLUICtrl, public LLEditMenuHandler,
 {
 public:
 	LLScrollListCtrl(
-		const LLString& name,
+		const std::string& name,
 		const LLRect& rect,
 		void (*commit_callback)(LLUICtrl*, void*),
 		void* callback_userdata,
@@ -419,14 +420,14 @@ public:
 	
 	// Sets an array of column descriptors
 	void 	   		setColumnHeadings(LLSD headings);
-	void   			sortByColumn(U32 column, BOOL ascending);
+	void   			sortByColumnIndex(U32 column, BOOL ascending);
 	
 	// LLCtrlListInterface functions
 	virtual S32  getItemCount() const;
 	// Adds a single column descriptor: ["name" : string, "label" : string, "width" : integer, "relwidth" : integer ]
 	virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM);
 	virtual void clearColumns();
-	virtual void setColumnLabel(const LLString& column, const LLString& label);
+	virtual void setColumnLabel(const std::string& column, const std::string& label);
 
 	virtual LLScrollListColumn* getColumn(S32 index);
 	virtual S32 getNumColumns() const { return mColumnsIndexed.size(); }
@@ -438,7 +439,7 @@ public:
 	// Simple add element. Takes a single array of:
 	// [ "value" => value, "font" => font, "font-style" => style ]
 	virtual void clearRows(); // clears all elements
-	virtual void sortByColumn(LLString name, BOOL ascending);
+	virtual void sortByColumn(const std::string& name, BOOL ascending);
 
 	// These functions take and return an array of arrays of elements, as above
 	virtual void	setValue(const LLSD& value );
@@ -493,24 +494,24 @@ public:
 	S32				getItemIndex( LLScrollListItem* item ) const;
 	S32				getItemIndex( const LLUUID& item_id ) const;
 
-	LLScrollListItem* addCommentText( const LLString& comment_text, EAddPosition pos = ADD_BOTTOM);
+	LLScrollListItem* addCommentText( const std::string& comment_text, EAddPosition pos = ADD_BOTTOM);
 	LLScrollListItem* addSeparator(EAddPosition pos);
 
 	// "Simple" interface: use this when you're creating a list that contains only unique strings, only
 	// one of which can be selected at a time.
-	virtual LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
+	virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
 
 
-	BOOL			selectItemByLabel( const LLString& item, BOOL case_sensitive = TRUE );		// FALSE if item not found
-	BOOL			selectItemByPrefix(const LLString& target, BOOL case_sensitive = TRUE);
+	BOOL			selectItemByLabel( const std::string& item, BOOL case_sensitive = TRUE );		// FALSE if item not found
+	BOOL			selectItemByPrefix(const std::string& target, BOOL case_sensitive = TRUE);
 	BOOL			selectItemByPrefix(const LLWString& target, BOOL case_sensitive = TRUE);
-	const LLString	getSelectedItemLabel(S32 column = 0) const;
+	const std::string	getSelectedItemLabel(S32 column = 0) const;
 	LLSD			getSelectedValue();
 
 	// DEPRECATED: Use LLSD versions of addCommentText() and getSelectedValue().
 	// "StringUUID" interface: use this when you're creating a list that contains non-unique strings each of which
 	// has an associated, unique UUID, and only one of which can be selected at a time.
-	LLScrollListItem*	addStringUUIDItem(const LLString& item_text, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE, S32 column_width = 0);
+	LLScrollListItem*	addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE, S32 column_width = 0);
 	LLUUID				getStringUUIDSelectedItem() const;
 
 	LLScrollListItem*	getFirstSelected() const;
@@ -568,7 +569,7 @@ public:
 	/*virtual*/ BOOL	handleKeyHere(KEY key, MASK mask);
 	/*virtual*/ BOOL	handleUnicodeCharHere(llwchar uni_char);
 	/*virtual*/ BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
-	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
+	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	/*virtual*/ void	setEnabled(BOOL enabled);
 	/*virtual*/ void	setFocus( BOOL b );
 	/*virtual*/ void	onFocusReceived();
@@ -719,7 +720,7 @@ private:
 
 	BOOL			mSorted;
 	
-	typedef std::map<LLString, LLScrollListColumn> column_map_t;
+	typedef std::map<std::string, LLScrollListColumn> column_map_t;
 	column_map_t mColumns;
 
 	BOOL			mDirty;
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 12d794c..4cc558f 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -46,7 +46,7 @@ static LLRegisterWidget<LLSlider> r2("volume_slider");
 
 
 LLSlider::LLSlider( 
-	const LLString& name,
+	const std::string& name,
 	const LLRect& rect,
 	void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
 	void* callback_userdata,
@@ -55,7 +55,7 @@ LLSlider::LLSlider(
 	F32 max_value,
 	F32 increment,
 	BOOL volume,
-	const LLString& control_name)
+	const std::string& control_name)
 	:
 	LLUICtrl( name, rect, TRUE,	on_commit_callback, callback_userdata, 
 		FOLLOWS_LEFT | FOLLOWS_TOP),
@@ -303,7 +303,7 @@ LLXMLNodePtr LLSlider::getXML(bool save_children) const
 //static
 LLView* LLSlider::fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory)
 {
-	LLString name("slider_bar");
+	std::string name("slider_bar");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 1c9d5e1..b963beb 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -41,7 +41,7 @@ class LLSlider : public LLUICtrl
 {
 public:
 	LLSlider( 
-		const LLString& name,
+		const std::string& name,
 		const LLRect& rect,
 		void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
 		void* callback_userdata,
@@ -50,7 +50,7 @@ public:
 		F32 max_value,
 		F32 increment,
 		BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no?  -MG
-		const LLString& control_name = LLString::null );
+		const std::string& control_name = LLStringUtil::null );
 
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
 	static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index d3dc35f..a47f133 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -34,7 +34,6 @@
 #include "llsliderctrl.h"
 
 #include "audioengine.h"
-#include "sound_ids.h"
 
 #include "llmath.h"
 #include "llfontgl.h"
@@ -54,8 +53,8 @@ const U32 MAX_STRING_LENGTH = 10;
 
 static LLRegisterWidget<LLSliderCtrl> r("slider");
  
-LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect, 
-						   const LLString& label,
+LLSliderCtrl::LLSliderCtrl(const std::string& name, const LLRect& rect, 
+						   const std::string& label,
 						   const LLFontGL* font,
 						   S32 label_width,
 						   S32 text_left,
@@ -65,7 +64,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect,
 						   void (*commit_callback)(LLUICtrl*, void*),
 						   void* callback_user_data,
 						   F32 initial_value, F32 min_value, F32 max_value, F32 increment,
-						   const LLString& control_which)
+						   const std::string& control_which)
 	: LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data ),
 	  mFont(font),
 	  mShowText( show_text ),
@@ -94,7 +93,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect,
 			label_width = font->getWidth(label);
 		}
 		LLRect label_rect( left, top, label_width, bottom );
-		mLabelBox = new LLTextBox( "SliderCtrl Label", label_rect, label.c_str(), font );
+		mLabelBox = new LLTextBox( std::string("SliderCtrl Label"), label_rect, label, font );
 		addChild(mLabelBox);
 	}
 
@@ -106,12 +105,11 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect,
 
 	S32 slider_left = label_width ? label_width + SLIDERCTRL_SPACING : 0;
 	LLRect slider_rect( slider_left, top, slider_right, bottom );
-	mSlider = new LLSlider( 
-		"slider",
-		slider_rect, 
-		LLSliderCtrl::onSliderCommit, this, 
-		initial_value, min_value, max_value, increment, volume,
-		control_which );
+	mSlider = new LLSlider(std::string("slider"),
+						   slider_rect, 
+						   LLSliderCtrl::onSliderCommit, this, 
+						   initial_value, min_value, max_value, increment, volume,
+						   control_which );
 	addChild( mSlider );
 	
 	if( show_text )
@@ -119,11 +117,11 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect,
 		LLRect text_rect( text_left, top, getRect().getWidth(), bottom );
 		if( can_edit_text )
 		{
-			mEditor = new LLLineEditor( "SliderCtrl Editor", text_rect,
-				"", font,
-				MAX_STRING_LENGTH,
-				&LLSliderCtrl::onEditorCommit, NULL, NULL, this,
-				&LLLineEditor::prevalidateFloat );
+			mEditor = new LLLineEditor( std::string("SliderCtrl Editor"), text_rect,
+										LLStringUtil::null, font,
+										MAX_STRING_LENGTH,
+										&LLSliderCtrl::onEditorCommit, NULL, NULL, this,
+										&LLLineEditor::prevalidateFloat );
 			mEditor->setFollowsLeft();
 			mEditor->setFollowsBottom();
 			mEditor->setFocusReceivedCallback( &LLSliderCtrl::onEditorGainFocus, this );
@@ -135,7 +133,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect,
 		}
 		else
 		{
-			mTextBox = new LLTextBox( "SliderCtrl Text", text_rect,	"",	font);
+			mTextBox = new LLTextBox( std::string("SliderCtrl Text"), text_rect,	LLStringUtil::null,	font);
 			mTextBox->setFollowsLeft();
 			mTextBox->setFollowsBottom();
 			addChild(mTextBox);
@@ -163,7 +161,7 @@ void LLSliderCtrl::setValue(F32 v, BOOL from_event)
 	updateText();
 }
 
-BOOL LLSliderCtrl::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLSliderCtrl::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	BOOL res = FALSE;
 	if (mLabelBox)
@@ -193,11 +191,11 @@ void LLSliderCtrl::clear()
 	setValue(0.0f);
 	if( mEditor )
 	{
-		mEditor->setText( LLString::null );
+		mEditor->setText( LLStringUtil::null );
 	}
 	if( mTextBox )
 	{
-		mTextBox->setText( LLString::null );
+		mTextBox->setText( LLStringUtil::null );
 	}
 
 }
@@ -211,8 +209,8 @@ void LLSliderCtrl::updateText()
 		// Don't display very small negative values as -0.000
 		F32 displayed_value = (F32)(floor(getValueF32() * pow(10.0, (F64)mPrecision) + 0.5) / pow(10.0, (F64)mPrecision));
 
-		LLString format = llformat("%%.%df", mPrecision);
-		LLString text = llformat(format.c_str(), displayed_value);
+		std::string format = llformat("%%.%df", mPrecision);
+		std::string text = llformat(format.c_str(), displayed_value);
 		if( mEditor )
 		{
 			mEditor->setText( text );
@@ -234,7 +232,7 @@ void LLSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
 	F32 val = self->mValue;
 	F32 saved_val = self->mValue;
 
-	LLString text = self->mEditor->getText();
+	std::string text = self->mEditor->getText();
 	if( LLLineEditor::postvalidateFloat( text ) )
 	{
 		LLLocale locale(LLLocale::USER_LOCALE);
@@ -451,10 +449,10 @@ LLXMLNodePtr LLSliderCtrl::getXML(bool save_children) const
 
 LLView* LLSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("slider");
+	std::string name("slider");
 	node->getAttributeString("name", name);
 
-	LLString label;
+	std::string label;
 	node->getAttributeString("label", label);
 
 	LLRect rect;
@@ -500,13 +498,13 @@ LLView* LLSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 	{
 		// calculate the size of the text box (log max_value is number of digits - 1 so plus 1)
 		if ( max_value )
-			text_left = font->getWidth("0") * ( static_cast < S32 > ( log10  ( max_value ) ) + precision + 1 );
+			text_left = font->getWidth(std::string("0")) * ( static_cast < S32 > ( log10  ( max_value ) ) + precision + 1 );
 
 		if ( increment < 1.0f )
-			text_left += font->getWidth(".");	// (mostly) take account of decimal point in value
+			text_left += font->getWidth(std::string("."));	// (mostly) take account of decimal point in value
 
 		if ( min_value < 0.0f || max_value < 0.0f )
-			text_left += font->getWidth("-");	// (mostly) take account of minus sign 
+			text_left += font->getWidth(std::string("-"));	// (mostly) take account of minus sign 
 
 		// padding to make things look nicer
 		text_left += 8;
diff --git a/linden/indra/llui/llsliderctrl.h b/linden/indra/llui/llsliderctrl.h
index 0c8a8b6..7df255c 100644
--- a/linden/indra/llui/llsliderctrl.h
+++ b/linden/indra/llui/llsliderctrl.h
@@ -48,9 +48,9 @@ const S32	SLIDERCTRL_HEIGHT		=  16;
 class LLSliderCtrl : public LLUICtrl
 {
 public:
-	LLSliderCtrl(const LLString& name, 
+	LLSliderCtrl(const std::string& name, 
 		const LLRect& rect, 
-		const LLString& label, 
+		const std::string& label, 
 		const LLFontGL* font,
 		S32 slider_left,
 		S32 text_left,
@@ -60,7 +60,7 @@ public:
 		void (*commit_callback)(LLUICtrl*, void*),
 		void* callback_userdata,
 		F32 initial_value, F32 min_value, F32 max_value, F32 increment,
-		const LLString& control_which = LLString::null );
+		const std::string& control_which = LLStringUtil::null );
 
 	virtual ~LLSliderCtrl() {} // Children all cleaned up by default view destructor.
 
@@ -72,7 +72,7 @@ public:
 
 	virtual void	setValue(const LLSD& value)	{ setValue((F32)value.asReal(), TRUE); }
 	virtual LLSD	getValue() const			{ return LLSD(getValueF32()); }
-	virtual BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 
 	virtual void	setMinValue(LLSD min_value)	{ setMinValue((F32)min_value.asReal()); }
 	virtual void	setMaxValue(LLSD max_value)	{ setMaxValue((F32)max_value.asReal()); }
@@ -101,13 +101,13 @@ public:
 	virtual void	setTentative(BOOL b);			// marks value as tentative
 	virtual void	onCommit();						// mark not tentative, then commit
 
-	virtual void		setControlName(const LLString& control_name, LLView* context)
+	virtual void		setControlName(const std::string& control_name, LLView* context)
 	{
 		LLView::setControlName(control_name, context);
 		mSlider->setControlName(control_name, context);
 	}
 
-	virtual LLString 	getControlName() const { return mSlider->getControlName(); }
+	virtual std::string getControlName() const { return mSlider->getControlName(); }
 	
 	static void		onSliderCommit(LLUICtrl* caller, void* userdata);
 	static void		onSliderMouseDown(LLUICtrl* caller,void* userdata);
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index f196975..a106af4 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -44,7 +44,6 @@
 #include "lltextbox.h"
 #include "llkeyboard.h"
 #include "llmath.h"
-#include "sound_ids.h"
 #include "audioengine.h"
 #include "llcontrol.h"
 #include "llfocusmgr.h"
@@ -54,11 +53,11 @@ const U32 MAX_STRING_LENGTH = 32;
 
 static LLRegisterWidget<LLSpinCtrl> r2("spinner");
  
-LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString& label, const LLFontGL* font,
+LLSpinCtrl::LLSpinCtrl(	const std::string& name, const LLRect& rect, const std::string& label, const LLFontGL* font,
 	void (*commit_callback)(LLUICtrl*, void*),
 	void* callback_user_data,
 	F32 initial_value, F32 min_value, F32 max_value, F32 increment,
-	const LLString& control_name,
+	const std::string& control_name,
 	S32 label_width)
 	:
 	LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data, FOLLOWS_LEFT | FOLLOWS_TOP ),
@@ -83,7 +82,7 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
 	if( !label.empty() )
 	{
 		LLRect label_rect( 0, centered_top, label_width, centered_bottom );
-		mLabelBox = new LLTextBox( "SpinCtrl Label", label_rect, label.c_str(), font );
+		mLabelBox = new LLTextBox( std::string("SpinCtrl Label"), label_rect, label, font );
 		addChild(mLabelBox);
 
 		btn_left += label_rect.mRight + SPINCTRL_SPACING;
@@ -93,14 +92,13 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
 	
 	// Spin buttons
 	LLRect up_rect( btn_left, top, btn_right, top - SPINCTRL_BTN_HEIGHT );
-	LLString out_id = "UIImgBtnSpinUpOutUUID";
-	LLString in_id = "UIImgBtnSpinUpInUUID";
-	mUpBtn = new LLButton(
-		"SpinCtrl Up", up_rect,
-		out_id,
-		in_id,
-		"",
-		&LLSpinCtrl::onUpBtn, this, LLFontGL::sSansSerif );
+	std::string out_id = "UIImgBtnSpinUpOutUUID";
+	std::string in_id = "UIImgBtnSpinUpInUUID";
+	mUpBtn = new LLButton(std::string("SpinCtrl Up"), up_rect,
+								   out_id,
+								   in_id,
+								   LLStringUtil::null,
+								   &LLSpinCtrl::onUpBtn, this, LLFontGL::sSansSerif );
 	mUpBtn->setFollowsLeft();
 	mUpBtn->setFollowsBottom();
 	mUpBtn->setHeldDownCallback( &LLSpinCtrl::onUpBtn );
@@ -110,12 +108,11 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
 	LLRect down_rect( btn_left, top - SPINCTRL_BTN_HEIGHT, btn_right, bottom );
 	out_id = "UIImgBtnSpinDownOutUUID";
 	in_id = "UIImgBtnSpinDownInUUID";
-	mDownBtn = new LLButton(
-		"SpinCtrl Down", down_rect,
-		out_id,
-		in_id,
-		"",
-		&LLSpinCtrl::onDownBtn, this, LLFontGL::sSansSerif );
+	mDownBtn = new LLButton(std::string("SpinCtrl Down"), down_rect,
+							out_id,
+							in_id,
+							LLStringUtil::null,
+							&LLSpinCtrl::onDownBtn, this, LLFontGL::sSansSerif );
 	mDownBtn->setFollowsLeft();
 	mDownBtn->setFollowsBottom();
 	mDownBtn->setHeldDownCallback( &LLSpinCtrl::onDownBtn );
@@ -123,10 +120,10 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
 	addChild(mDownBtn);
 
 	LLRect editor_rect( btn_right + 1, centered_top, getRect().getWidth(), centered_bottom );
-	mEditor = new LLLineEditor( "SpinCtrl Editor", editor_rect, "",	font,
-		MAX_STRING_LENGTH,
-		&LLSpinCtrl::onEditorCommit, NULL, NULL, this,
-		&LLLineEditor::prevalidateFloat );
+	mEditor = new LLLineEditor( std::string("SpinCtrl Editor"), editor_rect, LLStringUtil::null, font,
+								MAX_STRING_LENGTH,
+								&LLSpinCtrl::onEditorCommit, NULL, NULL, this,
+								&LLLineEditor::prevalidateFloat );
 	mEditor->setFollowsLeft();
 	mEditor->setFollowsBottom();
 	mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus, this );
@@ -283,8 +280,8 @@ void LLSpinCtrl::updateEditor()
 //		displayed_value = 0.f;
 //	}
 
-	LLString format = llformat("%%.%df", mPrecision);
-	LLString text = llformat(format.c_str(), displayed_value);
+	std::string format = llformat("%%.%df", mPrecision);
+	std::string text = llformat(format.c_str(), displayed_value);
 	mEditor->setText( text );
 }
 
@@ -295,7 +292,7 @@ void LLSpinCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
 	LLSpinCtrl* self = (LLSpinCtrl*) userdata;
 	llassert( caller == self->mEditor );
 
-	LLString text = self->mEditor->getText();
+	std::string text = self->mEditor->getText();
 	if( LLLineEditor::postvalidateFloat( text ) )
 	{
 		LLLocale locale(LLLocale::USER_LOCALE);
@@ -399,6 +396,12 @@ void LLSpinCtrl::setLabel(const LLStringExplicit& label)
 	}
 }
 
+void LLSpinCtrl::setAllowEdit(BOOL allow_edit)
+{
+	mEditor->setEnabled(allow_edit);
+	mAllowEdit = allow_edit;
+}
+
 void LLSpinCtrl::onTabInto()
 {
 	mEditor->onTabInto(); 
@@ -494,10 +497,10 @@ LLXMLNodePtr LLSpinCtrl::getXML(bool save_children) const
 
 LLView* LLSpinCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("spinner");
+	std::string name("spinner");
 	node->getAttributeString("name", name);
 
-	LLString label;
+	std::string label;
 	node->getAttributeString("label", label);
 
 	LLRect rect;
@@ -523,6 +526,9 @@ LLView* LLSpinCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
 	S32 label_width = llmin(40, rect.getWidth() - 40);
 	node->getAttributeS32("label_width", label_width);
 
+	BOOL allow_text_entry = TRUE;
+	node->getAttributeBOOL("allow_text_entry", allow_text_entry);
+
 	LLUICtrlCallback callback = NULL;
 
 	if(label.empty())
@@ -540,12 +546,13 @@ LLView* LLSpinCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
 							min_value, 
 							max_value, 
 							increment,
-							"",
+							LLStringUtil::null,
 							label_width);
 
 	spinner->setPrecision(precision);
 
 	spinner->initFromXML(node, parent);
+	spinner->setAllowEdit(allow_text_entry);
 
 	return spinner;
 }
diff --git a/linden/indra/llui/llspinctrl.h b/linden/indra/llui/llspinctrl.h
index 5d040fd..0cc6661 100644
--- a/linden/indra/llui/llspinctrl.h
+++ b/linden/indra/llui/llspinctrl.h
@@ -52,13 +52,13 @@ class LLSpinCtrl
 : public LLUICtrl
 {
 public:
-	LLSpinCtrl(const LLString& name, const LLRect& rect,
-		const LLString& label,
+	LLSpinCtrl(const std::string& name, const LLRect& rect,
+		const std::string& label,
 		const LLFontGL* font,
 		void (*commit_callback)(LLUICtrl*, void*),
 		void* callback_userdata,
 		F32 initial_value, F32 min_value, F32 max_value, F32 increment,
-		const LLString& control_name = LLString(),
+		const std::string& control_name = std::string(),
 		S32 label_width = SPINCTRL_DEFAULT_LABEL_WIDTH );
 
 	virtual ~LLSpinCtrl() {} // Children all cleaned up by default view destructor.
@@ -93,6 +93,7 @@ public:
 	void			setLabel(const LLStringExplicit& label);
 	void			setLabelColor(const LLColor4& c)			{ mTextEnabledColor = c; }
 	void			setDisabledLabelColor(const LLColor4& c)	{ mTextDisabledColor = c; }
+	void			setAllowEdit(BOOL allow_edit);
 
 	virtual void	onTabInto();
 
@@ -134,6 +135,7 @@ private:
 	class LLButton*		mDownBtn;
 
 	BOOL			mbHasBeenSet;
+	BOOL			mAllowEdit;
 };
 
 #endif  // LL_LLSPINCTRL_H
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index 58cf200..6130416 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -39,7 +39,7 @@
 
 LLStyle::LLStyle()
 {
-	init(TRUE, LLColor4(0,0,0,1),"");
+	init(TRUE, LLColor4(0,0,0,1),LLStringUtil::null);
 }
 
 LLStyle::LLStyle(const LLStyle &style)
@@ -62,21 +62,21 @@ LLStyle::LLStyle(const LLStyle &style)
 	}
 	else
 	{
-		init(TRUE, LLColor4(0,0,0,1),"");
+		init(TRUE, LLColor4(0,0,0,1),LLStringUtil::null);
 	}
 }
 
-LLStyle::LLStyle(BOOL is_visible, const LLColor4 &color, const LLString& font_name)
+LLStyle::LLStyle(BOOL is_visible, const LLColor4 &color, const std::string& font_name)
 {
 	init(is_visible, color, font_name);
 }
 
-void LLStyle::init(BOOL is_visible, const LLColor4 &color, const LLString& font_name)
+void LLStyle::init(BOOL is_visible, const LLColor4 &color, const std::string& font_name)
 {
 	mVisible = is_visible;
 	mColor = color;
 	setFontName(font_name);
-	setLinkHREF("");
+	setLinkHREF(LLStringUtil::null);
 	mItalic = FALSE;
 	mBold = FALSE;
 	mUnderline = FALSE;
@@ -110,12 +110,12 @@ LLStyle &LLStyle::operator=(const LLStyle &rhs)
 }
 
 
-void LLStyle::setFontName(const LLString& fontname)
+void LLStyle::setFontName(const std::string& fontname)
 {
 	mFontName = fontname;
 
-	LLString fontname_lc = fontname;
-	LLString::toLower(fontname_lc);
+	std::string fontname_lc = fontname;
+	LLStringUtil::toLower(fontname_lc);
 	
 	mFontID = LLFONT_OCRA; // default
 	
@@ -138,7 +138,7 @@ void LLStyle::setFontName(const LLString& fontname)
 }
 
 
-void LLStyle::setLinkHREF(const LLString& href)
+void LLStyle::setLinkHREF(const std::string& href)
 {
 	mLink = href;
 }
diff --git a/linden/indra/llui/llstyle.h b/linden/indra/llui/llstyle.h
index 56f1398..d235e15 100644
--- a/linden/indra/llui/llstyle.h
+++ b/linden/indra/llui/llstyle.h
@@ -42,11 +42,11 @@ class LLStyle : public LLRefCount
 public:
 	LLStyle();
 	LLStyle(const LLStyle &style);
-	LLStyle(BOOL is_visible, const LLColor4 &color, const LLString& font_name);
+	LLStyle(BOOL is_visible, const LLColor4 &color, const std::string& font_name);
 
 	LLStyle &operator=(const LLStyle &rhs);
 
-	virtual void init (BOOL is_visible, const LLColor4 &color, const LLString& font_name);
+	virtual void init (BOOL is_visible, const LLColor4 &color, const std::string& font_name);
 
 	virtual const LLColor4& getColor() const { return mColor; }
 	virtual void setColor(const LLColor4 &color) { mColor = color; }
@@ -54,12 +54,12 @@ public:
 	virtual BOOL isVisible() const;
 	virtual void setVisible(BOOL is_visible);
 
-	virtual const LLString& getFontString() const { return mFontName; }
-	virtual void setFontName(const LLString& fontname);
+	virtual const std::string& getFontString() const { return mFontName; }
+	virtual void setFontName(const std::string& fontname);
 	virtual LLFONT_ID getFontID() const { return mFontID; }
 
-	virtual const LLString& getLinkHREF() const { return mLink; }
-	virtual void setLinkHREF(const LLString& href);
+	virtual const std::string& getLinkHREF() const { return mLink; }
+	virtual void setLinkHREF(const std::string& href);
 	virtual BOOL isLink() const;
 
 	virtual LLUIImagePtr getImage() const;
@@ -105,9 +105,9 @@ protected:
 private:
 	BOOL		mVisible;
 	LLColor4	mColor;
-	LLString	mFontName;
+	std::string	mFontName;
 	LLFONT_ID   mFontID;
-	LLString	mLink;
+	std::string	mLink;
 	LLUIImagePtr mImagep;
 	BOOL		mIsEmbeddedItem;
 };
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 827d4fb..7bf1485 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -42,7 +42,6 @@
 #include "lltabcontainervertical.h"
 #include "llrender.h"
 
-
 const F32 SCROLL_STEP_TIME = 0.4f;
 const F32 SCROLL_DELAY_TIME = 0.5f;
 const S32 TAB_PADDING = 15;
@@ -66,7 +65,7 @@ const S32 TABCNTRV_PAD = 0;
 
 static LLRegisterWidget<LLTabContainer> r("tab_container");
 
-LLTabContainer::LLTabContainer(const LLString& name, const LLRect& rect, TabPosition pos,
+LLTabContainer::LLTabContainer(const std::string& name, const LLRect& rect, TabPosition pos,
 							   BOOL bordered, BOOL is_vertical )
 	: 
 	LLPanel(name, rect, bordered),
@@ -122,7 +121,7 @@ void LLTabContainer::reshape(S32 width, S32 height, BOOL called_from_parent)
 }
 
 //virtual
-LLView* LLTabContainer::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLTabContainer::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
 {
 	tuple_list_t::const_iterator itor;
 	for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
@@ -153,24 +152,43 @@ LLView* LLTabContainer::getChildView(const LLString& name, BOOL recurse, BOOL cr
 void LLTabContainer::draw()
 {
 	S32 target_pixel_scroll = 0;
-	S32 cur_scroll_pos = mIsVertical ? 0 : getScrollPos();
+	S32 cur_scroll_pos = getScrollPos();
 	if (cur_scroll_pos > 0)
 	{
-		S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE  + TABCNTR_ARROW_BTN_SIZE + 1);
-		for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
+		if (!mIsVertical)
 		{
-			if (cur_scroll_pos == 0)
+			S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE  + TABCNTR_ARROW_BTN_SIZE + 1);
+			for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
 			{
-				break;
+				if (cur_scroll_pos == 0)
+				{
+					break;
+				}
+				target_pixel_scroll += (*iter)->mButton->getRect().getWidth();
+				cur_scroll_pos--;
 			}
-			target_pixel_scroll += (*iter)->mButton->getRect().getWidth();
-			cur_scroll_pos--;
-		}
 
-		// Show part of the tab to the left of what is fully visible
-		target_pixel_scroll -= TABCNTR_TAB_PARTIAL_WIDTH;
-		// clamp so that rightmost tab never leaves right side of screen
-		target_pixel_scroll = llmin(mTotalTabWidth - available_width_with_arrows, target_pixel_scroll);
+			// Show part of the tab to the left of what is fully visible
+			target_pixel_scroll -= TABCNTR_TAB_PARTIAL_WIDTH;
+			// clamp so that rightmost tab never leaves right side of screen
+			target_pixel_scroll = llmin(mTotalTabWidth - available_width_with_arrows, target_pixel_scroll);
+		}
+		else
+		{
+			S32 available_height_with_arrows = getRect().getHeight() - getTopBorderHeight() - (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + TABCNTR_ARROW_BTN_SIZE + 1);
+			for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
+			{
+				if (cur_scroll_pos==0)
+				{
+					break;
+				}
+				target_pixel_scroll += (*iter)->mButton->getRect().getHeight();
+				cur_scroll_pos--;
+			}
+			S32 total_tab_height = (BTN_HEIGHT + TABCNTRV_PAD) * getTabCount() + TABCNTRV_PAD;
+			// clamp so that the bottom tab never leaves bottom of panel
+			target_pixel_scroll = llmin(total_tab_height - available_height_with_arrows, target_pixel_scroll);
+		}
 	}
 
 	setScrollPosPixels((S32)lerp((F32)getScrollPosPixels(), (F32)target_pixel_scroll, LLCriticalDamp::getInterpolant(0.08f)));
@@ -461,7 +479,7 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
 }
 
 // virtual
-BOOL LLTabContainer::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect )
+BOOL LLTabContainer::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect )
 {
 	BOOL handled = LLPanel::handleToolTip( x, y, msg, sticky_rect );
 	if (!handled && getTabCount() > 0) 
@@ -605,7 +623,7 @@ LLXMLNodePtr LLTabContainer::getXML(bool save_children) const
 }
 
 // virtual
-BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDragAndDropType type, void* cargo_data, EAcceptance *accept, LLString	&tooltip)
+BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDragAndDropType type, void* cargo_data, EAcceptance *accept, std::string	&tooltip)
 {
 	BOOL has_scroll_arrows = (getMaxScrollPos() > 0);
 
@@ -613,13 +631,13 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDrag
 	{
 		if (has_scroll_arrows)
 		{
-			if (mJumpPrevArrowBtn->getRect().pointInRect(x,	y))
+			if (mJumpPrevArrowBtn && mJumpPrevArrowBtn->getRect().pointInRect(x, y))
 			{
 				S32	local_x	= x	- mJumpPrevArrowBtn->getRect().mLeft;
 				S32	local_y	= y	- mJumpPrevArrowBtn->getRect().mBottom;
 				mJumpPrevArrowBtn->handleHover(local_x,	local_y, mask);
 			}
-			if (mJumpNextArrowBtn->getRect().pointInRect(x,	y))
+			if (mJumpNextArrowBtn && mJumpNextArrowBtn->getRect().pointInRect(x, y))
 			{
 				S32	local_x	= x	- mJumpNextArrowBtn->getRect().mLeft;
 				S32	local_y	= y	- mJumpNextArrowBtn->getRect().mBottom;
@@ -657,7 +675,7 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDrag
 }
 
 void LLTabContainer::addTabPanel(LLPanel* child, 
-								 const LLString& label, 
+								 const std::string& label, 
 								 BOOL select, 
 								 void (*on_tab_clicked)(void*, bool), 
 								 void* userdata,
@@ -674,8 +692,8 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 
 	// Store the original label for possible xml export.
 	child->setLabel(label);
-	LLString trimmed_label = label;
-	LLString::trim(trimmed_label);
+	std::string trimmed_label = label;
+	LLStringUtil::trim(trimmed_label);
 
 	S32 button_width = mMinTabWidth;
 	if (!mIsVertical)
@@ -724,8 +742,8 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 
 	// Tab button
 	LLRect btn_rect;  // Note: btn_rect.mLeft is just a dummy.  Will be updated in draw().
-	LLString tab_img;
-	LLString tab_selected_img;
+	std::string tab_img;
+	std::string tab_selected_img;
 	S32 tab_fudge = 1;		//  To make new tab art look better, nudge buttons up 1 pel
 
 	if (mIsVertical)
@@ -756,21 +774,21 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 		btn_rect.translate(0, -LLBUTTON_V_PAD-2);
 		textbox = new LLTextBox(trimmed_label, btn_rect, trimmed_label, font);
 		
-		btn = new LLButton("", LLRect(0,0,0,0));
+		btn = new LLButton(LLStringUtil::null, LLRect(0,0,0,0));
 	}
 	else
 	{
 		if (mIsVertical)
 		{
-			btn = new LLButton("vert tab button",
+			btn = new LLButton(std::string("vert tab button"),
 							   btn_rect,
-							   "",
-							   "", 
-							   "", 
+							   LLStringUtil::null,
+							   LLStringUtil::null, 
+							   LLStringUtil::null, 
 							   &LLTabContainer::onTabBtn, NULL,
 							   font,
 							   trimmed_label, trimmed_label);
-			btn->setImages("tab_left.tga", "tab_left_selected.tga");
+			btn->setImages(std::string("tab_left.tga"), std::string("tab_left_selected.tga"));
 			btn->setScaleImage(TRUE);
 			btn->setHAlign(LLFontGL::LEFT);
 			btn->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
@@ -782,13 +800,13 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 		}
 		else
 		{
-			LLString tooltip = trimmed_label;
+			std::string tooltip = trimmed_label;
 			tooltip += "\nAlt-Left arrow for previous tab";
 			tooltip += "\nAlt-Right arrow for next tab";
 
-			btn = new LLButton(LLString(child->getName()) + " tab",
+			btn = new LLButton(std::string(child->getName()) + " tab",
 							   btn_rect, 
-							   "", "", "",
+							   LLStringUtil::null, LLStringUtil::null, LLStringUtil::null,
 							   &LLTabContainer::onTabBtn, NULL, // set userdata below
 							   font,
 							   trimmed_label, trimmed_label );
@@ -845,7 +863,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 	updateMaxScrollPos();
 }
 
-void LLTabContainer::addPlaceholder(LLPanel* child, const LLString& label)
+void LLTabContainer::addPlaceholder(LLPanel* child, const std::string& label)
 {
 	addTabPanel(child, label, FALSE, NULL, NULL, 0, TRUE);
 }
@@ -1012,7 +1030,7 @@ S32 LLTabContainer::getIndexForPanel(LLPanel* panel)
 	return -1;
 }
 
-S32 LLTabContainer::getPanelIndexByTitle(const LLString& title)
+S32 LLTabContainer::getPanelIndexByTitle(const std::string& title)
 {
 	for (S32 index = 0 ; index < (S32)mTabList.size(); index++)
 	{
@@ -1024,7 +1042,7 @@ S32 LLTabContainer::getPanelIndexByTitle(const LLString& title)
 	return -1;
 }
 
-LLPanel *LLTabContainer::getPanelByName(const LLString& name)
+LLPanel *LLTabContainer::getPanelByName(const std::string& name)
 {
 	for (S32 index = 0 ; index < (S32)mTabList.size(); index++)
 	{
@@ -1038,7 +1056,7 @@ LLPanel *LLTabContainer::getPanelByName(const LLString& name)
 }
 
 // Change the name of the button for the current tab.
-void LLTabContainer::setCurrentTabName(const LLString& name)
+void LLTabContainer::setCurrentTabName(const std::string& name)
 {
 	// Might not have a tab selected
 	if (mCurrentTabIdx < 0) return;
@@ -1212,7 +1230,7 @@ BOOL LLTabContainer::selectTab(S32 which)
 	return is_visible;
 }
 
-BOOL LLTabContainer::selectTabByName(const LLString& name)
+BOOL LLTabContainer::selectTabByName(const std::string& name)
 {
 	LLPanel* panel = getPanelByName(name);
 	if (!panel)
@@ -1276,7 +1294,7 @@ void LLTabContainer::setTabImage(LLPanel* child, std::string image_name, const L
 	}
 }
 
-void LLTabContainer::setTitle(const LLString& title)
+void LLTabContainer::setTitle(const std::string& title)
 {	
 	if (mTitleBox)
 	{
@@ -1284,14 +1302,14 @@ void LLTabContainer::setTitle(const LLString& title)
 	}
 }
 
-const LLString LLTabContainer::getPanelTitle(S32 index)
+const std::string LLTabContainer::getPanelTitle(S32 index)
 {
 	if (index >= 0 && index < (S32)mTabList.size())
 	{
 		LLButton* tab_button = mTabList[index]->mButton;
 		return tab_button->getLabelSelected();
 	}
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
 void LLTabContainer::setTopBorderHeight(S32 height)
@@ -1329,7 +1347,7 @@ void LLTabContainer::setRightTabBtnOffset(S32 offset)
 	updateMaxScrollPos();
 }
 
-void LLTabContainer::setPanelTitle(S32 index, const LLString& title)
+void LLTabContainer::setPanelTitle(S32 index, const std::string& title)
 {
 	if (index >= 0 && index < getTabCount())
 	{
@@ -1435,7 +1453,7 @@ void LLTabContainer::onPrevBtnHeld( void* userdata )
 // static
 LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("tab_container");
+	std::string name("tab_container");
 	node->getAttributeString("name", name);
 
 	// Figure out if we are creating a vertical or horizontal tab container.
@@ -1443,9 +1461,9 @@ LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 	LLTabContainer::TabPosition tab_position = LLTabContainer::TOP;
 	if (node->hasAttribute("tab_position"))
 	{
-		LLString tab_position_string;
+		std::string tab_position_string;
 		node->getAttributeString("tab_position", tab_position_string);
-		LLString::toLower(tab_position_string);
+		LLStringUtil::toLower(tab_position_string);
 
 		if ("top" == tab_position_string)
 		{
@@ -1507,7 +1525,7 @@ LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 		if (control && control->isPanel())
 		{
 			LLPanel* panelp = (LLPanel*)control;
-			LLString label;
+			std::string label;
 			child->getAttributeString("label", label);
 			if (label.empty())
 			{
@@ -1515,7 +1533,7 @@ LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 			}
 			BOOL placeholder = FALSE;
 			child->getAttributeBOOL("placeholder", placeholder);
-			tab_container->addTabPanel(panelp, label.c_str(), false,
+			tab_container->addTabPanel(panelp, label, false,
 									   NULL, NULL, 0, placeholder);
 		}
 	}
@@ -1539,8 +1557,8 @@ void LLTabContainer::initButtons()
 		return; // Don't have a rect yet or already got called
 	}
 	
-	LLString out_id;
-	LLString in_id;
+	std::string out_id;
+	std::string in_id;
 
 	if (mIsVertical)
 	{
@@ -1556,16 +1574,16 @@ void LLTabContainer::initButtons()
 
 		out_id = "UIImgBtnScrollUpOutUUID";
 		in_id = "UIImgBtnScrollUpInUUID";
-		mPrevArrowBtn = new LLButton("Up Arrow", up_arrow_btn_rect,
-									 out_id, in_id, "",
+		mPrevArrowBtn = new LLButton(std::string("Up Arrow"), up_arrow_btn_rect,
+									 out_id, in_id, LLStringUtil::null,
 									 &onPrevBtn, this, NULL );
 		mPrevArrowBtn->setFollowsTop();
 		mPrevArrowBtn->setFollowsLeft();
 
 		out_id = "UIImgBtnScrollDownOutUUID";
 		in_id = "UIImgBtnScrollDownInUUID";
-		mNextArrowBtn = new LLButton("Down Arrow", down_arrow_btn_rect,
-									 out_id, in_id, "",
+		mNextArrowBtn = new LLButton(std::string("Down Arrow"), down_arrow_btn_rect,
+									 out_id, in_id, LLStringUtil::null,
 									 &onNextBtn, this, NULL );
 		mNextArrowBtn->setFollowsBottom();
 		mNextArrowBtn->setFollowsLeft();
@@ -1604,31 +1622,31 @@ void LLTabContainer::initButtons()
 
 		out_id = "UIImgBtnJumpLeftOutUUID";
 		in_id = "UIImgBtnJumpLeftInUUID";
-		mJumpPrevArrowBtn = new LLButton("Jump Left Arrow", jump_left_arrow_btn_rect,
-										 out_id, in_id, "",
+		mJumpPrevArrowBtn = new LLButton(std::string("Jump Left Arrow"), jump_left_arrow_btn_rect,
+										 out_id, in_id, LLStringUtil::null,
 										 &LLTabContainer::onJumpFirstBtn, this, LLFontGL::sSansSerif );
 		mJumpPrevArrowBtn->setFollowsLeft();
 
 		out_id = "UIImgBtnScrollLeftOutUUID";
 		in_id = "UIImgBtnScrollLeftInUUID";
-		mPrevArrowBtn = new LLButton("Left Arrow", left_arrow_btn_rect,
-									 out_id, in_id, "",
+		mPrevArrowBtn = new LLButton(std::string("Left Arrow"), left_arrow_btn_rect,
+									 out_id, in_id, LLStringUtil::null,
 									 &LLTabContainer::onPrevBtn, this, LLFontGL::sSansSerif );
 		mPrevArrowBtn->setHeldDownCallback(onPrevBtnHeld);
 		mPrevArrowBtn->setFollowsLeft();
 	
 		out_id = "UIImgBtnJumpRightOutUUID";
 		in_id = "UIImgBtnJumpRightInUUID";
-		mJumpNextArrowBtn = new LLButton("Jump Right Arrow", jump_right_arrow_btn_rect,
-										 out_id, in_id, "",
+		mJumpNextArrowBtn = new LLButton(std::string("Jump Right Arrow"), jump_right_arrow_btn_rect,
+										 out_id, in_id, LLStringUtil::null,
 										 &LLTabContainer::onJumpLastBtn, this,
 										 LLFontGL::sSansSerif);
 		mJumpNextArrowBtn->setFollowsRight();
 
 		out_id = "UIImgBtnScrollRightOutUUID";
 		in_id = "UIImgBtnScrollRightInUUID";
-		mNextArrowBtn = new LLButton("Right Arrow", right_arrow_btn_rect,
-									 out_id, in_id, "",
+		mNextArrowBtn = new LLButton(std::string("Right Arrow"), right_arrow_btn_rect,
+									 out_id, in_id, LLStringUtil::null,
 									 &LLTabContainer::onNextBtn, this,
 									 LLFontGL::sSansSerif);
 		mNextArrowBtn->setFollowsRight();
@@ -1795,3 +1813,4 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y)
 }
 
 
+
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 16f8be5..8d4218a 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -55,7 +55,7 @@ public:
 		RIGHT_OF_CURRENT
 	} eInsertionPoint;
 
-	LLTabContainer( const LLString& name, const LLRect& rect, TabPosition pos,
+	LLTabContainer( const std::string& name, const LLRect& rect, TabPosition pos,
 					BOOL bordered, BOOL is_vertical);
 
 	/*virtual*/ ~LLTabContainer();
@@ -68,23 +68,23 @@ public:
 	/*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask );
 	/*virtual*/ BOOL handleHover( S32 x, S32 y, MASK mask );
 	/*virtual*/ BOOL handleMouseUp( S32 x, S32 y, MASK mask );
-	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect );
+	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect );
 	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
 	/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,
 									   EDragAndDropType type, void* cargo_data,
-									   EAcceptance* accept, LLString& tooltip);
+									   EAcceptance* accept, std::string& tooltip);
 	/*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
-	/*virtual*/ LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	/*virtual*/ LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 
 	void 		addTabPanel(LLPanel* child, 
-							const LLString& label, 
+							const std::string& label, 
 							BOOL select = FALSE,  
 							void (*on_tab_clicked)(void*, bool) = NULL, 
 							void* userdata = NULL,
 							S32 indent = 0,
 							BOOL placeholder = FALSE,
 							eInsertionPoint insertion_point = END);
-	void 		addPlaceholder(LLPanel* child, const LLString& label);
+	void 		addPlaceholder(LLPanel* child, const std::string& label);
 	void 		removeTabPanel( LLPanel* child );
 	void 		lockTabs(S32 num_tabs = 0);
 	void 		unlockTabs();
@@ -96,9 +96,9 @@ public:
 	S32			getTabCount();
 	LLPanel*	getPanelByIndex(S32 index);
 	S32			getIndexForPanel(LLPanel* panel);
-	S32			getPanelIndexByTitle(const LLString& title);
-	LLPanel*	getPanelByName(const LLString& name);
-	void		setCurrentTabName(const LLString& name);
+	S32			getPanelIndexByTitle(const std::string& title);
+	LLPanel*	getPanelByName(const std::string& name);
+	void		setCurrentTabName(const std::string& name);
 
 	void		selectFirstTab();
 	void		selectLastTab();
@@ -106,13 +106,13 @@ public:
 	 void		selectPrevTab();
 	BOOL 		selectTabPanel( LLPanel* child );
 	BOOL 		selectTab(S32 which);
-	BOOL 		selectTabByName(const LLString& title);
+	BOOL 		selectTabByName(const std::string& title);
 
 	BOOL        getTabPanelFlashing(LLPanel* child);
 	void		setTabPanelFlashing(LLPanel* child, BOOL state);
 	void 		setTabImage(LLPanel* child, std::string img_name, const LLColor4& color = LLColor4::white);
-	void		setTitle( const LLString& title );
-	const LLString getPanelTitle(S32 index);
+	void		setTitle( const std::string& title );
+	const std::string getPanelTitle(S32 index);
 
 	void		setTopBorderHeight(S32 height);
 	S32			getTopBorderHeight() const;
@@ -121,7 +121,7 @@ public:
 	void 		setTabUserData(LLPanel* tab, void* userdata);
 
 	void 		setRightTabBtnOffset( S32 offset );
-	void 		setPanelTitle(S32 index, const LLString& title);
+	void 		setPanelTitle(S32 index, const std::string& title);
 
 	TabPosition getTabPosition() const { return mTabPosition; }
 	void		setMinTabWidth(S32 width) { mMinTabWidth = width; }
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index 0f411b8..6997c61 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -36,7 +36,7 @@
 
 static LLRegisterWidget<LLTextBox> r("text");
 
-LLTextBox::LLTextBox(const LLString& name, const LLRect& rect, const LLString& text,
+LLTextBox::LLTextBox(const std::string& name, const LLRect& rect, const std::string& text,
 					 const LLFontGL* font, BOOL mouse_opaque)
 :	LLUICtrl(name, rect, mouse_opaque, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP ),
 	mFontGL(font ? font : LLFontGL::sSansSerifSmall),
@@ -63,7 +63,7 @@ LLTextBox::LLTextBox(const LLString& name, const LLRect& rect, const LLString& t
 	setTabStop(FALSE);
 }
 
-LLTextBox::LLTextBox(const LLString& name, const LLString& text, F32 max_width,
+LLTextBox::LLTextBox(const std::string& name, const std::string& text, F32 max_width,
 					 const LLFontGL* font, BOOL mouse_opaque) :
 	LLUICtrl(name, LLRect(0, 0, 1, 1), mouse_opaque, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),	
 	mFontGL(font ? font : LLFontGL::sSansSerifSmall),
@@ -91,7 +91,7 @@ LLTextBox::LLTextBox(const LLString& name, const LLString& text, F32 max_width,
 	setTabStop(FALSE);
 }
 
-LLTextBox::LLTextBox(const LLString& name_and_label, const LLRect& rect) :
+LLTextBox::LLTextBox(const std::string& name_and_label, const LLRect& rect) :
 	LLUICtrl(name_and_label, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),	
 	mFontGL(LLFontGL::sSansSerifSmall),
 	mTextColor(LLUI::sColorsGroup->getColor("LabelTextColor")),
@@ -113,7 +113,7 @@ LLTextBox::LLTextBox(const LLString& name_and_label, const LLRect& rect) :
 	setTabStop(FALSE);
 }
 
-LLTextBox::LLTextBox(const LLString& name_and_label) :
+LLTextBox::LLTextBox(const std::string& name_and_label) :
 	LLUICtrl(name_and_label, LLRect(0, 0, 1, 1), TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),	
 	mFontGL(LLFontGL::sSansSerifSmall),
 	mTextColor(LLUI::sColorsGroup->getColor("LabelTextColor")),
@@ -211,15 +211,15 @@ void LLTextBox::setLineLengths()
 {
 	mLineLengthList.clear();
 	
-	LLString::size_type  cur = 0;
-	LLString::size_type  len = mText.getWString().size();
+	std::string::size_type  cur = 0;
+	std::string::size_type  len = mText.getWString().size();
 
 	while (cur < len) 
 	{
-		LLString::size_type end = mText.getWString().find('\n', cur);
-		LLString::size_type runLen;
+		std::string::size_type end = mText.getWString().find('\n', cur);
+		std::string::size_type runLen;
 		
-		if (end == LLString::npos)
+		if (end == std::string::npos)
 		{
 			runLen = len - cur;
 			cur = len;
@@ -276,7 +276,7 @@ void LLTextBox::setWrappedText(const LLStringExplicit& in_text, F32 max_width)
 		}
 	}
 
-	LLString final_text = wstring_to_utf8str(final_wtext);
+	std::string final_text = wstring_to_utf8str(final_wtext);
 	setText(final_text);
 }
 
@@ -316,7 +316,7 @@ S32 LLTextBox::getTextPixelHeight()
 }
 
 
-BOOL LLTextBox::setTextArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text )
 {
 	mText.setArg(key, text);
 	setLineLengths();
@@ -451,11 +451,11 @@ LLXMLNodePtr LLTextBox::getXML(bool save_children) const
 // static
 LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("text_box");
+	std::string name("text_box");
 	node->getAttributeString("name", name);
 	LLFontGL* font = LLView::selectFont(node);
 
-	LLString text = node->getTextContents();
+	std::string text = node->getTextContents();
 
 	LLTextBox* text_box = new LLTextBox(name,
 		LLRect(),
@@ -469,7 +469,7 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
 	text_box->initFromXML(node, parent);
 
-	LLString font_style;
+	std::string font_style;
 	if (node->getAttributeString("font-style", font_style))
 	{
 		text_box->mFontStyle = LLFontGL::getStyleFromString(font_style);
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h
index ffe6f4c..c2211fb 100644
--- a/linden/indra/llui/lltextbox.h
+++ b/linden/indra/llui/lltextbox.h
@@ -45,16 +45,16 @@ public:
 	// By default, follows top and left and is mouse-opaque.
 	// If no text, text = name.
 	// If no font, uses default system font.
-	LLTextBox(const LLString& name, const LLRect& rect, const LLString& text,
+	LLTextBox(const std::string& name, const LLRect& rect, const std::string& text,
 			  const LLFontGL* font = NULL, BOOL mouse_opaque = TRUE );
 
 	// Construct a textbox which handles word wrapping for us.
-	LLTextBox(const LLString& name, const LLString& text, F32 max_width = 200,
+	LLTextBox(const std::string& name, const std::string& text, F32 max_width = 200,
 			  const LLFontGL* font = NULL, BOOL mouse_opaque = TRUE );
 
 	// "Simple" constructors for text boxes that have the same name and label *TO BE DEPRECATED*
-	LLTextBox(const LLString& name_and_label, const LLRect& rect);
-	LLTextBox(const LLString& name_and_label);
+	LLTextBox(const std::string& name_and_label, const LLRect& rect);
+	LLTextBox(const std::string& name_and_label);
 
 	virtual ~LLTextBox() {}
 
@@ -95,13 +95,13 @@ public:
 
 	void			reshapeToFitText();
 
-	const LLString&	getText() const							{ return mText.getString(); }
+	const std::string&	getText() const							{ return mText.getString(); }
 	S32				getTextPixelWidth();
 	S32				getTextPixelHeight();
 
 	virtual void	setValue(const LLSD& value )			{ setText(value.asString()); }
 	virtual LLSD	getValue() const						{ return LLSD(getText()); }
-	virtual BOOL	setTextArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setTextArg( const std::string& key, const LLStringExplicit& text );
 
 private:
 	void			setLineLengths();
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 71522e5..e56002f 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -36,13 +36,11 @@
 #include "lltexteditor.h"
 
 #include "llfontgl.h"
-#include "llgl.h"
 #include "llrender.h"
 #include "llui.h"
 #include "lluictrlfactory.h"
 #include "llrect.h"
 #include "llfocusmgr.h"
-#include "sound_ids.h"
 #include "lltimer.h"
 #include "llmath.h"
 
@@ -58,7 +56,6 @@
 #include "llcontrol.h"
 #include "llimagegl.h"
 #include "llwindow.h"
-#include "llglheaders.h"
 #include <queue>
 
 // 
@@ -75,6 +72,8 @@ const S32	UI_TEXTEDITOR_BUFFER_BLOCK_SIZE = 512;
 const S32	UI_TEXTEDITOR_BORDER = 1;
 const S32	UI_TEXTEDITOR_H_PAD = 4;
 const S32	UI_TEXTEDITOR_V_PAD_TOP = 4;
+const S32	UI_TEXTEDITOR_LINE_NUMBER_MARGIN = 32;
+const S32	UI_TEXTEDITOR_LINE_NUMBER_DIGITS = 4;
 const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32	CURSOR_THICKNESS = 2;
 const S32	SPACES_PER_TAB = 4;
@@ -88,8 +87,9 @@ const S32	PREEDIT_STANDOUT_GAP = 1;
 const S32	PREEDIT_STANDOUT_POSITION = 2;
 const S32	PREEDIT_STANDOUT_THICKNESS = 2;
 
+
 LLColor4 LLTextEditor::mLinkColor = LLColor4::blue;
-void (* LLTextEditor::mURLcallback)(const char*)              = NULL;
+void (* LLTextEditor::mURLcallback)(const std::string&)   = NULL;
 bool (* LLTextEditor::mSecondlifeURLcallback)(const std::string&)   = NULL;
 bool (* LLTextEditor::mSecondlifeURLcallbackRightClick)(const std::string&)   = NULL;
 
@@ -107,7 +107,7 @@ public:
 	virtual BOOL execute( LLTextEditor* editor, S32* delta )
 	{
 		*delta = insert(editor, getPosition(), mWString );
-		LLWString::truncate(mWString, *delta);
+		LLWStringUtil::truncate(mWString, *delta);
 		//mWString = wstring_truncate(mWString, *delta);
 		return (*delta != 0);
 	}	
@@ -145,7 +145,7 @@ public:
 	virtual BOOL execute( LLTextEditor* editor, S32* delta )
 	{
 		*delta = insert(editor, getPosition(), mWString);
-		LLWString::truncate(mWString, *delta);
+		LLWStringUtil::truncate(mWString, *delta);
 		//mWString = wstring_truncate(mWString, *delta);
 		return (*delta != 0);
 	}
@@ -243,10 +243,10 @@ private:
 ///////////////////////////////////////////////////////////////////
 
 LLTextEditor::LLTextEditor(	
-	const LLString& name, 
+	const std::string& name, 
 	const LLRect& rect, 
 	S32 max_length,						// In bytes
-	const LLString &default_text, 
+	const std::string &default_text, 
 	const LLFontGL* font,
 	BOOL allow_embedded_items)
 	:	
@@ -260,6 +260,7 @@ LLTextEditor::LLTextEditor(
 	mIsSelecting( FALSE ),
 	mSelectionStart( 0 ),
 	mSelectionEnd( 0 ),
+	mScrolledToBottom( FALSE ),
 	mOnScrollEndCallback( NULL ),
 	mOnScrollEndData( NULL ),
 	mCursorColor(		LLUI::sColorsGroup->getColor( "TextCursorColor" ) ),
@@ -271,6 +272,7 @@ LLTextEditor::LLTextEditor(
 	mFocusBgColor(		LLUI::sColorsGroup->getColor( "TextBgFocusColor" ) ),
 	mReadOnly(FALSE),
 	mWordWrap( FALSE ),
+	mShowLineNumbers ( FALSE ),
 	mTabsToNextField( TRUE ),
 	mCommitOnFocusLost( FALSE ),
 	mHideScrollbarForShortDocs( FALSE ),
@@ -311,7 +313,7 @@ LLTextEditor::LLTextEditor(
 		SCROLLBAR_SIZE,
 		getRect().getHeight() - 1);
 	S32 lines_in_doc = getLineCount();
-	mScrollbar = new LLScrollbar( "Scrollbar", scroll_rect,
+	mScrollbar = new LLScrollbar( std::string("Scrollbar"), scroll_rect,
 		LLScrollbar::VERTICAL,
 		lines_in_doc,						
 		0,						
@@ -325,7 +327,7 @@ LLTextEditor::LLTextEditor(
 	mScrollbar->setOnScrollEndCallback(mOnScrollEndCallback, mOnScrollEndData);
 	addChild(mScrollbar);
 
-	mBorder = new LLViewBorder( "text ed border", LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), LLViewBorder::BEVEL_IN, LLViewBorder::STYLE_LINE, UI_TEXTEDITOR_BORDER );
+	mBorder = new LLViewBorder( std::string("text ed border"), LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), LLViewBorder::BEVEL_IN, LLViewBorder::STYLE_LINE, UI_TEXTEDITOR_BORDER );
 	addChild( mBorder );
 
 	appendText(default_text, FALSE, FALSE);
@@ -333,7 +335,7 @@ LLTextEditor::LLTextEditor(
 	resetDirty();		// Update saved text state
 
 	mParseHTML=FALSE;
-	mHTML="";
+	mHTML.clear();
 }
 
 
@@ -399,7 +401,8 @@ void LLTextEditor::updateLineStartList(S32 startpos)
 	{
 		mLineStartList.push_back(line_info(seg_idx,seg_offset));
 		BOOL line_ended = FALSE;
-		S32 line_width = 0;
+		S32 start_x = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;
+		S32 line_width = start_x;
 		while(!line_ended && seg_idx < seg_num)
 		{
 			LLTextSegment* segment = mSegments[seg_idx];
@@ -429,7 +432,7 @@ void LLTextEditor::updateLineStartList(S32 startpos)
 				const llwchar* str = mWText.c_str() + start_idx;
 				S32 drawn = mGLFont->maxDrawableChars(str, (F32)abs(mTextRect.getWidth()) - line_width,
 													  end_idx - start_idx, mWordWrap, mAllowEmbeddedItems );
-				if( 0 == drawn && line_width == 0)
+				if( 0 == drawn && line_width == start_x)
 				{
 					// If at the beginning of a line, draw at least one character, even if it doesn't all fit.
 					drawn = 1;
@@ -496,7 +499,7 @@ BOOL LLTextEditor::truncate()
 
 void LLTextEditor::setText(const LLStringExplicit &utf8str)
 {
-	// LLString::removeCRLF(utf8str);
+	// LLStringUtil::removeCRLF(utf8str);
 	mUTF8Text = utf8str_removeCRLF(utf8str);
 	// mUTF8Text = utf8str;
 	mWText = utf8str_to_wstring(mUTF8Text);
@@ -538,7 +541,7 @@ void LLTextEditor::setValue(const LLSD& value)
 	setText(value.asString());
 }
 
-const LLString& LLTextEditor::getText() const
+const std::string& LLTextEditor::getText() const
 {
 	if (!mTextIsUpToDate)
 	{
@@ -591,7 +594,7 @@ void LLTextEditor::setHideScrollbarForShortDocs(BOOL b)
 	}
 }
 
-void LLTextEditor::selectNext(const LLString& search_text_in, BOOL case_insensitive, BOOL wrap)
+void LLTextEditor::selectNext(const std::string& search_text_in, BOOL case_insensitive, BOOL wrap)
 {
 	if (search_text_in.empty())
 	{
@@ -602,8 +605,8 @@ void LLTextEditor::selectNext(const LLString& search_text_in, BOOL case_insensit
 	LLWString search_text = utf8str_to_wstring(search_text_in);
 	if (case_insensitive)
 	{
-		LLWString::toLower(text);
-		LLWString::toLower(search_text);
+		LLWStringUtil::toLower(text);
+		LLWStringUtil::toLower(search_text);
 	}
 	
 	if (mIsSelecting)
@@ -641,7 +644,7 @@ void LLTextEditor::selectNext(const LLString& search_text_in, BOOL case_insensit
 	mSelectionStart = llmin((S32)getLength(), (S32)(mCursorPos + search_text.size()));
 }
 
-BOOL LLTextEditor::replaceText(const LLString& search_text_in, const LLString& replace_text,
+BOOL LLTextEditor::replaceText(const std::string& search_text_in, const std::string& replace_text,
 							   BOOL case_insensitive, BOOL wrap)
 {
 	BOOL replaced = FALSE;
@@ -659,8 +662,8 @@ BOOL LLTextEditor::replaceText(const LLString& search_text_in, const LLString& r
 
 		if (case_insensitive)
 		{
-			LLWString::toLower(selected_text);
-			LLWString::toLower(search_text);
+			LLWStringUtil::toLower(selected_text);
+			LLWStringUtil::toLower(search_text);
 		}
 
 		if (selected_text == search_text)
@@ -674,7 +677,7 @@ BOOL LLTextEditor::replaceText(const LLString& search_text_in, const LLString& r
 	return replaced;
 }
 
-void LLTextEditor::replaceTextAll(const LLString& search_text, const LLString& replace_text, BOOL case_insensitive)
+void LLTextEditor::replaceTextAll(const std::string& search_text, const std::string& replace_text, BOOL case_insensitive)
 {
 	S32 cur_pos = mScrollbar->getDocPos();
 
@@ -800,7 +803,12 @@ void LLTextEditor::getSelectedSegments(std::vector<const LLTextSegment*>& segmen
 
 S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const
 {
-		// If round is true, if the position is on the right half of a character, the cursor
+	if(mShowLineNumbers)
+	{
+		local_x -= UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
+	}
+
+	// If round is true, if the position is on the right half of a character, the cursor
 	// will be put to its right.  If round is false, the cursor will always be put to the
 	// character's left.
 
@@ -1061,7 +1069,7 @@ void LLTextEditor::selectAll()
 }
 
 
-BOOL LLTextEditor::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
 	for ( child_list_const_iter_t child_it = getChildList()->begin();
 		  child_it != getChildList()->end(); ++child_it)
@@ -1392,7 +1400,7 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 BOOL LLTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
 					  BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
 					  EAcceptance *accept,
-					  LLString& tooltip_msg)
+					  std::string& tooltip_msg)
 {
 	*accept = ACCEPT_NO;
 
@@ -1879,7 +1887,7 @@ void LLTextEditor::paste()
 
 	// Clean up string (replace tabs and remove characters that our fonts don't support).
 	LLWString clean_string(paste);
-	LLWString::replaceTabsWithSpaces(clean_string, SPACES_PER_TAB);
+	LLWStringUtil::replaceTabsWithSpaces(clean_string, SPACES_PER_TAB);
 	if( mAllowEmbeddedItems )
 	{
 		const llwchar LF = 10;
@@ -2469,20 +2477,15 @@ void LLTextEditor::drawBackground()
 	S32 right = getRect().getWidth();
 	S32 bottom = 0;
 
-	LLColor4 bg_color = mReadOnlyBgColor;
-
-	if( !mReadOnly )
-	{
-		if (gFocusMgr.getKeyboardFocus() == this)
-		{
-			bg_color = mFocusBgColor;
-		}
-		else
-		{
-			bg_color = mWriteableBgColor;
-		}
+	LLColor4 bg_color = mReadOnly ? mReadOnlyBgColor
+		: gFocusMgr.getKeyboardFocus() == this ? mFocusBgColor : mWriteableBgColor;
+	if( mShowLineNumbers ) {
+		gl_rect_2d(left, top, UI_TEXTEDITOR_LINE_NUMBER_MARGIN, bottom, mReadOnlyBgColor ); // line number area always read-only
+		gl_rect_2d(UI_TEXTEDITOR_LINE_NUMBER_MARGIN, top, right, bottom, bg_color); // body text area to the right of line numbers
+		gl_rect_2d(UI_TEXTEDITOR_LINE_NUMBER_MARGIN, top, UI_TEXTEDITOR_LINE_NUMBER_MARGIN-1, bottom, LLColor4::grey3); // separator
+	} else {
+		gl_rect_2d(left, top, right, bottom, bg_color); // body text area
 	}
-	gl_rect_2d(left, top, right, bottom, bg_color);
 
 	LLView::draw();
 }
@@ -2570,7 +2573,7 @@ void LLTextEditor::drawSelectionBackground()
 			{
 				// extend selection slightly beyond end of line
 				// to indicate selection of newline character (use "n" character to determine width)
-				const LLWString nstr(utf8str_to_wstring(LLString("n")));
+				const LLWString nstr(utf8str_to_wstring(std::string("n")));
 				line_endings.push(mTextRect.mLeft + mGLFont->getWidth(line, 0, line_end - line_start, mAllowEmbeddedItems) + mGLFont->getWidth(nstr.c_str()));
 			}
 			
@@ -2595,12 +2598,13 @@ void LLTextEditor::drawSelectionBackground()
 			const LLColor4& color = mReadOnly ? mReadOnlyBgColor : mWriteableBgColor;
 			F32 alpha = hasFocus() ? 1.f : 0.5f;
 			gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
+			S32 margin_offset = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;
 
 			if( selection_left_y == selection_right_y )
 			{
 				// Draw from selection start to selection end
-				gl_rect_2d( selection_left_x, selection_left_y + line_height + 1,
-					selection_right_x, selection_right_y);
+				gl_rect_2d( selection_left_x + margin_offset, selection_left_y + line_height + 1,
+					selection_right_x + margin_offset, selection_right_y);
 			}
 			else
 			{
@@ -2612,16 +2616,16 @@ void LLTextEditor::drawSelectionBackground()
 				
 				S32 line_end = line_endings.front();
 				line_endings.pop();
-				gl_rect_2d( selection_left_x, selection_left_y + line_height + 1,
-					line_end, selection_left_y );
+				gl_rect_2d( selection_left_x + margin_offset, selection_left_y + line_height + 1,
+					line_end + margin_offset, selection_left_y );
 
 				S32 line_num = left_line_num + 1;
 				while(line_endings.size())
 				{
 					S32 vert_offset = -(line_num - left_line_num) * line_height;
 					// Draw the block between the two lines
-					gl_rect_2d( mTextRect.mLeft, selection_left_y + vert_offset + line_height + 1,
-						line_endings.front(), selection_left_y + vert_offset);
+					gl_rect_2d( mTextRect.mLeft + margin_offset, selection_left_y + vert_offset + line_height + 1,
+						line_endings.front() + margin_offset, selection_left_y + vert_offset);
 					line_endings.pop();
 					line_num++;
 				}
@@ -2631,8 +2635,8 @@ void LLTextEditor::drawSelectionBackground()
 				{
 					selection_right_x += CURSOR_THICKNESS;
 				}
-				gl_rect_2d( mTextRect.mLeft, selection_right_y + line_height + 1,
-					selection_right_x, selection_right_y );
+				gl_rect_2d( mTextRect.mLeft + margin_offset, selection_right_y + line_height + 1,
+					selection_right_x + margin_offset, selection_right_y );
 			}
 		}
 	}
@@ -2695,6 +2699,11 @@ void LLTextEditor::drawCursor()
 			cur_pos++;
 		}
 
+		if(mShowLineNumbers)
+		{
+			cursor_left += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
+		}
+
 		// Draw the cursor
 		if( cursor_visible )
 		{
@@ -2707,7 +2716,7 @@ void LLTextEditor::drawCursor()
 				if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())
 				{
 					cursor_left += CURSOR_THICKNESS;
-					const LLWString space(utf8str_to_wstring(LLString(" ")));
+					const LLWString space(utf8str_to_wstring(std::string(" ")));
 					F32 spacew = mGLFont->getWidthF32(space.c_str());
 					if (mCursorPos == line_end)
 					{
@@ -2861,10 +2870,7 @@ void LLTextEditor::drawText()
 {
 	const LLWString &text = mWText;
 	const S32 text_len = getLength();
-	if( text_len <= 0 )
-	{
-		return;
-	}
+	if( text_len <= 0 ) return;
 	S32 selection_left = -1;
 	S32 selection_right = -1;
 	// Draw selection even if we don't have keyboard focus for search/replace
@@ -2876,14 +2882,26 @@ void LLTextEditor::drawText()
 
 	LLGLSUIDefault gls_ui;
 
-	S32 cur_line = mScrollbar->getDocPos();
+	// There are several concepts that are important for understanding the following drawing code.
+	// The document is logically a sequence of characters (stored in a LLWString).
+	// Variables below with "start" or "end" in their names refer to positions or offsets into it.
+	// Next there are two kinds of "line" variables to understand. Newline characters in the
+	// character sequence represent logical lines. These are what get numbered and so variables
+	// representing this kind of line have "num" in their names.
+	// The others represent line fragments or displayed lines which the scrollbar deals with.
+	// When the "show line numbers" property is turned on, we draw line numbers to the left of the 
+	// beginning of each logical line and not in front of wrapped "continuation" display lines. -MG
+
+	S32 cur_line = mScrollbar->getDocPos(); // scrollbar counts each wrap as a new line.
 	S32 num_lines = getLineCount();
-	if (cur_line >= num_lines)
-	{
-		return;
-	}
-	
+	if (cur_line >= num_lines) return;
 	S32 line_start = getLineStart(cur_line);
+	S32 prev_start = getLineStart(cur_line-1);
+	S32 cur_line_num  = getLineForPosition(line_start); // doesn't count wraps. i.e. only counts newlines.
+	S32 prev_line_num = getLineForPosition(prev_start);
+	BOOL cur_line_is_continuation = cur_line_num > 0 && cur_line_num == prev_line_num;
+	BOOL line_wraps = FALSE;
+	
 	LLTextSegment t(line_start);
 	segment_list_t::iterator seg_iter;
 	seg_iter = std::upper_bound(mSegments.begin(), mSegments.end(), &t, LLTextSegment::compare());
@@ -2902,12 +2920,36 @@ void LLTextEditor::drawText()
 			next_start = getLineStart(cur_line + 1);
 			line_end = next_start;
 		}
-		if ( text[line_end-1] == '\n' )
+		line_wraps = text[line_end-1] != '\n';
+		if ( ! line_wraps )
 		{
-			--line_end;
+			--line_end; // don't attempt to draw the newline char.
 		}
 		
-		F32 text_x = (F32)mTextRect.mLeft;
+		F32 text_start = (F32)mTextRect.mLeft;
+		F32 text_x = text_start + (mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0);
+		
+		// draw the line numbers
+		if( mShowLineNumbers && !cur_line_is_continuation) 
+		{
+			const LLFontGL *num_font = LLFontGL::sMonospace;
+			F32 y_top = text_y + ((F32)llround(num_font->getLineHeight()) / 2);
+			const LLWString ltext = utf8str_to_wstring(llformat("%*d", UI_TEXTEDITOR_LINE_NUMBER_DIGITS, cur_line_num ));
+			BOOL is_cur_line = getCurrentLine() == cur_line_num;
+			const U8 style = is_cur_line ? LLFontGL::BOLD : LLFontGL::NORMAL;
+			const LLColor4 fg_color = is_cur_line ? mCursorColor : mReadOnlyFgColor;
+			num_font->render( 
+				ltext, // string to draw
+				0, // begin offset
+				3., // x
+				y_top, // y
+				fg_color, 
+				LLFontGL::LEFT, // horizontal alignment
+				LLFontGL::VCENTER, // vertical alignment
+				style, 
+				S32_MAX, // max chars
+				UI_TEXTEDITOR_LINE_NUMBER_MARGIN); // max pixels
+		}
 
 		S32 seg_start = line_start;
 		while( seg_start < line_end )
@@ -2952,16 +2994,28 @@ void LLTextEditor::drawText()
 
 				drawClippedSegment( text, seg_start, clipped_end, text_x, text_y, selection_left, selection_right, style, &text_x );
 
+				if( text_x == text_start && mShowLineNumbers ) 
+				{
+					text_x += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
+				}
+
 				// Note: text_x is incremented by drawClippedSegment()
 				seg_start += clipped_len;
 			}
 		}
 
-			// move down one line
-			text_y -= (F32)line_height;
+		// move down one line
+		text_y -= (F32)line_height;
+
+		if( line_wraps )
+		{
+			cur_line_num--;
+		}
+		cur_line_is_continuation = line_wraps; // so as to not not number the continuation lines
 
 		line_start = next_start;
 		cur_line++;
+		cur_line_num++;
 	}
 }
 
@@ -3083,7 +3137,7 @@ void LLTextEditor::onTabInto()
 // virtual
 void LLTextEditor::clear()
 {
-	setText(LLString::null);
+	setText(LLStringUtil::null);
 }
 
 // Start or stop the editor from accepting text-editing keystrokes
@@ -3260,8 +3314,7 @@ void LLTextEditor::setCursorAndScrollToEnd()
 	updateScrollFromCursor();
 }
 
-
-void LLTextEditor::getCurrentLineAndColumn( S32* line, S32* col, BOOL include_wordwrap )
+void LLTextEditor::getLineAndColumnForPosition( S32 position, S32* line, S32* col, BOOL include_wordwrap )
 {
 	if( include_wordwrap )
 	{
@@ -3273,7 +3326,7 @@ void LLTextEditor::getCurrentLineAndColumn( S32* line, S32* col, BOOL include_wo
 		S32 line_count = 0;
 		S32 line_start = 0;
 		S32 i;
-		for( i = 0; text[i] && (i < mCursorPos); i++ )
+		for( i = 0; text[i] && (i < position); i++ )
 		{
 			if( '\n' == text[i] )
 			{
@@ -3286,6 +3339,23 @@ void LLTextEditor::getCurrentLineAndColumn( S32* line, S32* col, BOOL include_wo
 	}
 }
 
+void LLTextEditor::getCurrentLineAndColumn( S32* line, S32* col, BOOL include_wordwrap ) 
+{ 
+	getLineAndColumnForPosition(mCursorPos, line, col, include_wordwrap); 
+}
+
+S32 LLTextEditor::getCurrentLine()
+{
+	return getLineForPosition(mCursorPos);
+}
+
+S32 LLTextEditor::getLineForPosition(S32 position)
+{
+	S32 line, col;
+	getLineAndColumnForPosition(position, &line, &col, FALSE);
+	return line;
+}
+
 
 void LLTextEditor::endOfLine()
 {
@@ -3364,20 +3434,26 @@ void LLTextEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	LLView::reshape( width, height, called_from_parent );
 
-	// if scrolled to bottom, stay at bottom
-	// unless user is editing text
-	if (mScrolledToBottom && mTrackBottom && !hasFocus())
-	{
-		endOfDoc();
-	}
-
+	// do this first after reshape, because other things depend on
+	// up-to-date mTextRect
 	updateTextRect();
+	
+	updateLineStartList();
+
+	// propagate shape information to scrollbar
+	mScrollbar->setDocSize( getLineCount() );
 
 	S32 line_height = llround( mGLFont->getLineHeight() );
 	S32 page_lines = mTextRect.getHeight() / line_height;
 	mScrollbar->setPageSize( page_lines );
 
-	updateLineStartList();
+	// if scrolled to bottom, stay at bottom
+	// unless user is editing text
+	// do this after updating page size
+	if (mScrolledToBottom && mTrackBottom && !hasFocus())
+	{
+		endOfDoc();
+	}
 }
 
 void LLTextEditor::autoIndent()
@@ -3411,7 +3487,7 @@ void LLTextEditor::autoIndent()
 }
 
 // Inserts new text at the cursor position
-void LLTextEditor::insertText(const LLString &new_text)
+void LLTextEditor::insertText(const std::string &new_text)
 {
 	BOOL enabled = getEnabled();
 	setEnabled( TRUE );
@@ -3431,11 +3507,11 @@ void LLTextEditor::insertText(const LLString &new_text)
 }
 
 
-void LLTextEditor::appendColoredText(const LLString &new_text, 
+void LLTextEditor::appendColoredText(const std::string &new_text, 
 									 bool allow_undo, 
 									 bool prepend_newline,
 									 const LLColor4 &color,
-									 const LLString& font_name)
+									 const std::string& font_name)
 {
 	LLStyleSP style(new LLStyle);
 	style->setVisible(true);
@@ -3444,7 +3520,7 @@ void LLTextEditor::appendColoredText(const LLString &new_text,
 	appendStyledText(new_text, allow_undo, prepend_newline, &style);
 }
 
-void LLTextEditor::appendStyledText(const LLString &new_text, 
+void LLTextEditor::appendStyledText(const std::string &new_text, 
 									 bool allow_undo, 
 									 bool prepend_newline,
 									 const LLStyleSP *stylep)
@@ -3453,7 +3529,7 @@ void LLTextEditor::appendStyledText(const LLString &new_text,
 	{
 
 		S32 start=0,end=0;
-		LLString text = new_text;
+		std::string text = new_text;
 		while ( findHTML(text, &start, &end) )
 		{
 			LLStyleSP html(new LLStyle);
@@ -3487,7 +3563,7 @@ void LLTextEditor::appendStyledText(const LLString &new_text,
 }
 
 // Appends new text to end of document
-void LLTextEditor::appendText(const LLString &new_text, bool allow_undo, bool prepend_newline,
+void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool prepend_newline,
 							  const LLStyleSP *stylep)
 {
 	// Save old state
@@ -3507,7 +3583,7 @@ void LLTextEditor::appendText(const LLString &new_text, bool allow_undo, bool pr
 	if (getLength() != 0
 		&& prepend_newline)
 	{
-		LLString final_text = "\n";
+		std::string final_text = "\n";
 		final_text += new_text;
 		append(utf8str_to_wstring(final_text), TRUE);
 	}
@@ -3543,6 +3619,10 @@ void LLTextEditor::appendText(const LLString &new_text, bool allow_undo, bool pr
 	{
 		mSelectionStart = selection_start;
 		mSelectionEnd = selection_end;
+
+
+
+
 		mIsSelecting = was_selecting;
 		setCursorPos(cursor_pos);
 	}
@@ -3559,6 +3639,14 @@ void LLTextEditor::appendText(const LLString &new_text, bool allow_undo, bool pr
 	{
 		blockUndo();
 	}
+
+	// if scrolled to bottom, stay at bottom
+	// unless user is editing text
+	// do this after updating page size
+	if (mScrolledToBottom && mTrackBottom && !hasFocus())
+	{
+		endOfDoc();
+	}
 }
 
 void LLTextEditor::removeTextFromEnd(S32 num_chars)
@@ -3688,20 +3776,18 @@ void LLTextEditor::updateTextRect()
 		getRect().getHeight() - 2 * UI_TEXTEDITOR_BORDER - UI_TEXTEDITOR_V_PAD_TOP );
 }
 
-void LLTextEditor::loadKeywords(const LLString& filename,
-								const LLDynamicArray<const char*>& funcs,
-								const LLDynamicArray<const char*>& tooltips,
+void LLTextEditor::loadKeywords(const std::string& filename,
+								const std::vector<std::string>& funcs,
+								const std::vector<std::string>& tooltips,
 								const LLColor3& color)
 {
 	if(mKeywords.loadFromFile(filename))
 	{
-		S32 count = funcs.count();
-		LLString name;
+		S32 count = llmin(funcs.size(), tooltips.size());
 		for(S32 i = 0; i < count; i++)
 		{
-			name = funcs.get(i);
-			name = utf8str_trim(name);
-			mKeywords.addToken(LLKeywordToken::WORD, name.c_str(), color, tooltips.get(i) );
+			std::string name = utf8str_trim(funcs[i]);
+			mKeywords.addToken(LLKeywordToken::WORD, name, color, tooltips[i] );
 		}
 
 		mKeywords.findSegments( &mSegments, mWText, mDefaultColor );
@@ -3843,9 +3929,9 @@ BOOL LLTextEditor::handleMouseUpOverSegment(S32 x, S32 y, MASK mask)
 				//Special handling for slurls
 			if ( (mSecondlifeURLcallback!=NULL) && !(*mSecondlifeURLcallback)(mHTML) )
 			{
-				if (mURLcallback!=NULL) (*mURLcallback)(mHTML.c_str());
+				if (mURLcallback!=NULL) (*mURLcallback)(mHTML);
 			}
-			mHTML="";
+			mHTML.clear();
 		}
 	}
 
@@ -3897,7 +3983,7 @@ void LLTextEditor::setOnScrollEndCallback(void (*callback)(void*), void* userdat
 ///////////////////////////////////////////////////////////////////
 // Hack for Notecards
 
-BOOL LLTextEditor::importBuffer(const LLString& buffer )
+BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
 {
 	std::istringstream instream(buffer);
 	
@@ -3986,7 +4072,7 @@ BOOL LLTextEditor::importBuffer(const LLString& buffer )
 	return success;
 }
 
-BOOL LLTextEditor::exportBuffer(LLString &buffer )
+BOOL LLTextEditor::exportBuffer(std::string &buffer )
 {
 	std::ostringstream outstream(buffer);
 	
@@ -4003,7 +4089,11 @@ BOOL LLTextEditor::exportBuffer(LLString &buffer )
 //////////////////////////////////////////////////////////////////////////
 // LLTextSegment
 
-LLTextSegment::LLTextSegment(S32 start) : mStart(start)
+LLTextSegment::LLTextSegment(S32 start) :
+	mStart(start),
+	mEnd(0),
+	mToken(NULL),
+	mIsDefault(FALSE)
 {
 } 
 LLTextSegment::LLTextSegment( const LLStyleSP& style, S32 start, S32 end ) :
@@ -4015,7 +4105,7 @@ LLTextSegment::LLTextSegment( const LLStyleSP& style, S32 start, S32 end ) :
 {
 }
 LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end, BOOL is_visible) :
-	mStyle(new LLStyle(is_visible,color,"")),
+	mStyle(new LLStyle(is_visible,color,LLStringUtil::null)),
 	mStart( start),
 	mEnd( end ),
 	mToken(NULL),
@@ -4023,7 +4113,7 @@ LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end, BOOL is
 {
 }
 LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end ) :
-	mStyle(new LLStyle(TRUE, color,"" )),
+	mStyle(new LLStyle(TRUE, color,LLStringUtil::null )),
 	mStart( start),
 	mEnd( end ),
 	mToken(NULL),
@@ -4031,7 +4121,7 @@ LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end ) :
 {
 }
 LLTextSegment::LLTextSegment( const LLColor3& color, S32 start, S32 end ) :
-	mStyle(new LLStyle(TRUE, color,"" )),
+	mStyle(new LLStyle(TRUE, color,LLStringUtil::null )),
 	mStart( start),
 	mEnd( end ),
 	mToken(NULL),
@@ -4039,7 +4129,7 @@ LLTextSegment::LLTextSegment( const LLColor3& color, S32 start, S32 end ) :
 {
 }
 
-BOOL LLTextSegment::getToolTip(LLString& msg) const
+BOOL LLTextSegment::getToolTip(std::string& msg) const
 {
 	if (mToken && !mToken->getToolTip().empty())
 	{
@@ -4094,7 +4184,7 @@ LLXMLNodePtr LLTextEditor::getXML(bool save_children) const
 // static
 LLView* LLTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("text_editor");
+	std::string name("text_editor");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -4108,7 +4198,7 @@ LLView* LLTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 
 	LLFontGL* font = LLView::selectFont(node);
 
-	LLString text = node->getTextContents().substr(0, max_text_length - 1);
+	std::string text = node->getTextContents().substr(0, max_text_length - 1);
 
 	LLTextEditor* text_editor = new LLTextEditor(name, 
 								rect,
@@ -4134,6 +4224,8 @@ void LLTextEditor::setTextEditorParameters(LLXMLNodePtr node)
 	node->getAttributeBOOL("word_wrap", word_wrap);
 	setWordWrap(word_wrap);
 
+	node->getAttributeBOOL("show_line_numbers", mShowLineNumbers);
+
 	node->getAttributeBOOL("track_bottom", mTrackBottom);
 
 	LLColor4 color;
@@ -4160,26 +4252,29 @@ void LLTextEditor::setTextEditorParameters(LLXMLNodePtr node)
 }
 
 ///////////////////////////////////////////////////////////////////
-S32 LLTextEditor::findHTMLToken(const LLString &line, S32 pos, BOOL reverse) const
+// Refactoring note: We may eventually want to replace this with boost::regex or 
+// boost::tokenizer capabilities since we've already fixed at least two JIRAs
+// concerning logic issues associated with this function.
+S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse) const
 {
-	LLString openers=" \t('\"[{<>";
-	LLString closers=" \t)'\"]}><;";
+	std::string openers=" \t\n('\"[{<>";
+	std::string closers=" \t\n)'\"]}><;";
 
-	S32 m2;
-	S32 retval;
+	S32 m2 = 0;
+	S32 retval = 0;
 	
 	if (reverse)
 	{
 		
-		for (retval=pos; retval>0; retval--)
+		for (retval=pos; retval >= 0; retval--)
 		{
 			m2 = openers.find(line.substr(retval,1));
 			if (m2 >= 0)
 			{
-				retval++;
 				break;
 			}
 		}
+		return retval+1;
 	} 
 	else
 	{
@@ -4192,12 +4287,11 @@ S32 LLTextEditor::findHTMLToken(const LLString &line, S32 pos, BOOL reverse) con
 				break;
 			}
 		} 
-	}		
-	
-	return retval;
+		return retval;
+	}
 }
 
-BOOL LLTextEditor::findHTML(const LLString &line, S32 *begin, S32 *end) const
+BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end) const
 {
 	  
 	S32 m1,m2,m3;
@@ -4214,7 +4308,7 @@ BOOL LLTextEditor::findHTML(const LLString &line, S32 *begin, S32 *end) const
 		m2 = line.substr(*begin,(m1 - *begin)).find("http");
 		m3 = line.substr(*begin,(m1 - *begin)).find("secondlife");
 	
-		LLString badneighbors=".,<>?';\"][}{=-+_)(*&^%$#@!~`\t\r\n\\";
+		std::string badneighbors=".,<>?';\"][}{=-+_)(*&^%$#@!~`\t\r\n\\";
 	
 		if (m2 >= 0 || m3>=0)
 		{
@@ -4240,7 +4334,7 @@ BOOL LLTextEditor::findHTML(const LLString &line, S32 *begin, S32 *end) const
 
 			if ( ( *end - m1 ) > 2 && m1 > *begin)
 			{
-				LLString badneighbors=".,<>/?';\"][}{=-+_)(*&^%$#@!~`";
+				std::string badneighbors=".,<>/?';\"][}{=-+_)(*&^%$#@!~`";
 				m2 = badneighbors.find(line.substr(m1+1,1));
 				m3 = badneighbors.find(line.substr(m1-1,1));
 				if (m3<0 && m2<0)
@@ -4256,8 +4350,8 @@ BOOL LLTextEditor::findHTML(const LLString &line, S32 *begin, S32 *end) const
 	{
 		S32 strpos, strpos2;
 
-		LLString url     = line.substr(*begin,*end - *begin);
-		LLString slurlID = "slurl.com/secondlife/";
+		std::string url     = line.substr(*begin,*end - *begin);
+		std::string slurlID = "slurl.com/secondlife/";
 		strpos = url.find(slurlID);
 		
 		if (strpos < 0)
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index d5a68ca..3cff91d 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -62,10 +62,10 @@ public:
 	static const llwchar LAST_EMBEDDED_CHAR =  0x10ffff;
 	static const S32 MAX_EMBEDDED_ITEMS = LAST_EMBEDDED_CHAR - FIRST_EMBEDDED_CHAR + 1;
 
-	LLTextEditor(const LLString& name,
+	LLTextEditor(const std::string& name,
 				 const LLRect& rect,
 				 S32 max_length,
-				 const LLString &default_text, 
+				 const std::string &default_text, 
 				 const LLFontGL* glfont = NULL,
 				 BOOL allow_embedded_items = FALSE);
 
@@ -85,10 +85,10 @@ public:
 	virtual BOOL	handleKeyHere(KEY key, MASK mask );
 	virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
 
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 									  EDragAndDropType cargo_type, void *cargo_data,
-									  EAcceptance *accept, LLString& tooltip_msg);
+									  EAcceptance *accept, std::string& tooltip_msg);
 	virtual void	onMouseCaptureLost();
 
 	// view overrides
@@ -123,9 +123,9 @@ public:
 	virtual void	deselect();
 	virtual BOOL	canDeselect() const;
 
-	void			selectNext(const LLString& search_text_in, BOOL case_insensitive, BOOL wrap = TRUE);
-	BOOL			replaceText(const LLString& search_text, const LLString& replace_text, BOOL case_insensitive, BOOL wrap = TRUE);
-	void			replaceTextAll(const LLString& search_text, const LLString& replace_text, BOOL case_insensitive);
+	void			selectNext(const std::string& search_text_in, BOOL case_insensitive, BOOL wrap = TRUE);
+	BOOL			replaceText(const std::string& search_text, const std::string& replace_text, BOOL case_insensitive, BOOL wrap = TRUE);
+	void			replaceTextAll(const std::string& search_text, const std::string& replace_text, BOOL case_insensitive);
 	
 	// Undo/redo stack
 	void			blockUndo();
@@ -136,17 +136,17 @@ public:
 	BOOL			allowsEmbeddedItems() const { return mAllowEmbeddedItems; }
 
 	// inserts text at cursor
-	void			insertText(const LLString &text);
+	void			insertText(const std::string &text);
 	// appends text at end
-	void 			appendText(const LLString &wtext, bool allow_undo, bool prepend_newline,
+	void 			appendText(const std::string &wtext, bool allow_undo, bool prepend_newline,
 							   const LLStyleSP *stylep = NULL);
 
-	void 			appendColoredText(const LLString &wtext, bool allow_undo, 
+	void 			appendColoredText(const std::string &wtext, bool allow_undo, 
 									  bool prepend_newline,
 									  const LLColor4 &color,
-									  const LLString& font_name = LLString::null);
+									  const std::string& font_name = LLStringUtil::null);
 	// if styled text starts a line, you need to prepend a newline.
-	void 			appendStyledText(const LLString &new_text, bool allow_undo, 
+	void 			appendStyledText(const std::string &new_text, bool allow_undo, 
 									 bool prepend_newline,
 									 const LLStyleSP *stylep = NULL);
 
@@ -160,12 +160,14 @@ public:
 	void			setCursorPos(S32 offset);
 	void			setCursorAndScrollToEnd();
 
+	void			getLineAndColumnForPosition( S32 position,  S32* line, S32* col, BOOL include_wordwrap );
 	void			getCurrentLineAndColumn( S32* line, S32* col, BOOL include_wordwrap );
+	S32				getLineForPosition(S32 position);
+	S32				getCurrentLine();
 
-	// Keywords support
-	void			loadKeywords(const LLString& filename,
-								 const LLDynamicArray<const char*>& funcs,
-								 const LLDynamicArray<const char*>& tooltips,
+	void			loadKeywords(const std::string& filename,
+								 const std::vector<std::string>& funcs,
+								 const std::vector<std::string>& tooltips,
 								 const LLColor3& func_color);
 	LLKeywords::keyword_iterator_t keywordsBegin()	{ return mKeywords.begin(); }
 	LLKeywords::keyword_iterator_t keywordsEnd()	{ return mKeywords.end(); }
@@ -195,8 +197,8 @@ public:
 	void			setCommitOnFocusLost(BOOL b)			{ mCommitOnFocusLost = b; }
 
 	// Hack to handle Notecards
-	virtual BOOL	importBuffer(const LLString& buffer );
-	virtual BOOL	exportBuffer(LLString& buffer );
+	virtual BOOL	importBuffer(const char* buffer, S32 length );
+	virtual BOOL	exportBuffer(std::string& buffer );
 
 	// If takes focus, will take keyboard focus on click.
 	void			setTakesFocus(BOOL b)					{ mTakesFocus = b; }
@@ -210,7 +212,7 @@ public:
 
 	// Callbacks
 	static void		setLinkColor(LLColor4 color) { mLinkColor = color; }
-	static void		setURLCallbacks(void (*callback1) (const char* url), 
+	static void		setURLCallbacks(void (*callback1) (const std::string& url), 
 									bool (*callback2) (const std::string& url),      
 									bool (*callback3) (const std::string& url)	) 
 									{ mURLcallback = callback1; mSecondlifeURLcallback = callback2; mSecondlifeURLcallbackRightClick = callback3;}
@@ -221,7 +223,7 @@ public:
 	void 			setValue(const LLSD& value);
 	LLSD 			getValue() const;
 
- 	const LLString&	getText() const;
+ 	const std::string&	getText() const;
 	
 	// Non-undoable
 	void			setText(const LLStringExplicit &utf8str);
@@ -261,7 +263,7 @@ protected:
 	void			updateTextRect();
 	const LLRect&	getTextRect() const { return mTextRect; }
 
-	void 			assignEmbedded(const LLString &s);
+	void 			assignEmbedded(const std::string &s);
 	BOOL 			truncate();				// Returns true if truncation occurs
 	
 	static BOOL		isPartOfWord(llwchar c) { return (c == '_') || isalnum(c); }
@@ -313,8 +315,8 @@ protected:
 	virtual void	bindEmbeddedChars(LLFontGL* font) const {}
 	virtual void	unbindEmbeddedChars(LLFontGL* font) const {}
 	
-	S32				findHTMLToken(const LLString &line, S32 pos, BOOL reverse) const;
-	BOOL			findHTML(const LLString &line, S32 *begin, S32 *end) const;
+	S32				findHTMLToken(const std::string &line, S32 pos, BOOL reverse) const;
+	BOOL			findHTML(const std::string &line, S32 *begin, S32 *end) const;
 
 	// Abstract inner base class representing an undoable editor command.
 	// Concrete sub-classes can be defined for operations such as insert, remove, etc.
@@ -399,7 +401,7 @@ protected:
 	S32				mLastSelectionY;
 
 	BOOL			mParseHTML;
-	LLString		mHTML;
+	std::string		mHTML;
 
 	typedef std::vector<LLTextSegment *> segment_list_t;
 	segment_list_t mSegments;
@@ -436,7 +438,7 @@ private:
 	//
 	LLKeywords		mKeywords;
 	static LLColor4 mLinkColor;
-	static void			(*mURLcallback) (const char* url);
+	static void			(*mURLcallback) (const std::string& url);
 	static bool			(*mSecondlifeURLcallback) (const std::string& url);
 	static bool			(*mSecondlifeURLcallbackRightClick) (const std::string& url);
 
@@ -447,7 +449,7 @@ private:
 	class LLTextCmdRemove;
 
 	LLWString		mWText;
-	mutable LLString mUTF8Text;
+	mutable std::string mUTF8Text;
 	mutable BOOL	mTextIsUpToDate;
 	
 	S32				mMaxTextByteLength;		// Maximum length mText is allowed to be in bytes
@@ -501,6 +503,7 @@ private:
 
 	BOOL			mReadOnly;
 	BOOL			mWordWrap;
+	BOOL			mShowLineNumbers;
 
 	BOOL			mTabsToNextField;		// if true, tab moves focus to next field, else inserts spaces
 	BOOL			mCommitOnFocusLost;
@@ -544,7 +547,7 @@ public:
 	BOOL 				getIsDefault() const   				{ return mIsDefault; }
 	void				setToken( LLKeywordToken* token )	{ mToken = token; }
 	LLKeywordToken*		getToken() const					{ return mToken; }
-	BOOL				getToolTip( LLString& msg ) const;
+	BOOL				getToolTip( std::string& msg ) const;
 
 	void				dump() const;
 
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 11889be..1fc9244 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -41,25 +41,19 @@
 #include "audioengine.h"
 #include "v2math.h"
 #include "v4color.h"
-#include "llgl.h"
 #include "llrender.h"
 #include "llrect.h"
 #include "llimagegl.h"
-//#include "llviewerimage.h"
 #include "lldir.h"
 #include "llfontgl.h"
 
 // Project includes
-//#include "audioengine.h"
 #include "llcontrol.h"
-//#include "llstartup.h"
 #include "llui.h"
 #include "llview.h"
 #include "lllineeditor.h"
 #include "llwindow.h"
 
-#include "llglheaders.h"
-
 //
 // Globals
 //
@@ -69,8 +63,8 @@ const LLColor4 UI_VERTEX_COLOR(1.f, 1.f, 1.f, 1.f);
 BOOL gShowTextEditCursor = TRUE;
 
 // Language for UI construction
-std::map<LLString, LLString> gTranslation;
-std::list<LLString> gUntranslated;
+std::map<std::string, std::string> gTranslation;
+std::list<std::string> gUntranslated;
 
 LLControlGroup* LLUI::sConfigGroup = NULL;
 LLControlGroup* LLUI::sColorsGroup = NULL;
@@ -86,8 +80,9 @@ BOOL            LLUI::sQAMode = FALSE;
 //
 // Functions
 //
-void make_ui_sound(const LLString& name)
+void make_ui_sound(const char* namep)
 {
+	std::string name = ll_safe_string(namep);
 	if (!LLUI::sConfigGroup->controlExists(name))
 	{
 		llwarns << "tried to make ui sound for unknown sound name: " << name << llendl;	
@@ -1563,7 +1558,7 @@ void LLUI::initClass(LLControlGroup* config,
 					 LLImageProviderInterface* image_provider,
 					 LLUIAudioCallback audio_callback,
 					 const LLVector2* scale_factor,
-					 const LLString& language)
+					 const std::string& language)
 {
 	sConfigGroup = config;
 	sColorsGroup = colors;
@@ -1653,10 +1648,10 @@ void LLUI::setCursorPositionLocal(const LLView* viewp, S32 x, S32 y)
 }
 
 //static
-LLString LLUI::locateSkin(const LLString& filename)
+std::string LLUI::locateSkin(const std::string& filename)
 {
-	LLString slash = gDirUtilp->getDirDelimiter();
-	LLString found_file = filename;
+	std::string slash = gDirUtilp->getDirDelimiter();
+	std::string found_file = filename;
 	if (!gDirUtilp->fileExists(found_file))
 	{
 		found_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename); // Should be CUSTOM_SKINS?
@@ -1665,18 +1660,18 @@ LLString LLUI::locateSkin(const LLString& filename)
 	{
 		if (!gDirUtilp->fileExists(found_file))
 		{
-			LLString localization(sConfigGroup->getString("Language"));		
+			std::string localization(sConfigGroup->getString("Language"));		
 			if(localization == "default")
 			{
 				localization = sConfigGroup->getString("SystemLanguage");
 			}
-			LLString local_skin = "xui" + slash + localization + slash + filename;
+			std::string local_skin = "xui" + slash + localization + slash + filename;
 			found_file = gDirUtilp->findSkinnedFilename(local_skin);
 		}
 	}
 	if (!gDirUtilp->fileExists(found_file))
 	{
-		LLString local_skin = "xui" + slash + "en-us" + slash + filename;
+		std::string local_skin = "xui" + slash + "en-us" + slash + filename;
 		found_file = gDirUtilp->findSkinnedFilename(local_skin);
 	}
 	if (!gDirUtilp->fileExists(found_file))
@@ -1724,7 +1719,7 @@ void LLUI::glRectToScreen(const LLRect& gl, LLRect *screen)
 }
 
 //static 
-LLUIImage* LLUI::getUIImage(const LLString& name)
+LLUIImage* LLUI::getUIImage(const std::string& name)
 {
 	if (!name.empty())
 		return sImageProvider->getUIImage(name);
@@ -1812,7 +1807,7 @@ LLLocalClipRect::LLLocalClipRect(const LLRect &rect, BOOL enabled)
 // LLUIImage
 //
 
-LLUIImage::LLUIImage(const LLString& name, LLPointer<LLImageGL> image) :
+LLUIImage::LLUIImage(const std::string& name, LLPointer<LLImageGL> image) :
 						mName(name),
 						mImage(image),
 						mScaleRegion(0.f, 1.f, 1.f, 0.f),
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index 0b06913..4c1bb22 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -56,7 +56,7 @@ class LLUIImage;
 
 // UI colors
 extern const LLColor4 UI_VERTEX_COLOR;
-void make_ui_sound(const LLString& name);
+void make_ui_sound(const char* name);
 
 BOOL ui_point_in_rect(S32 x, S32 y, S32 left, S32 top, S32 right, S32 bottom);
 void gl_state_for_2d(S32 width, S32 height);
@@ -144,7 +144,7 @@ inline void gl_rect_2d_offset_local( const LLRect& rect, S32 pixel_offset, BOOL
 // void init_tr();
 
 // Returns a string from the string table in the correct language
-// LLString tr(const LLString& english_chars);
+// std::string tr(const std::string& english_chars);
 
 // Used to hide the flashing text cursor when window doesn't have focus.
 extern BOOL gShowTextEditCursor;
@@ -164,7 +164,7 @@ public:
 						  LLImageProviderInterface* image_provider,
 						  LLUIAudioCallback audio_callback = NULL,
 						  const LLVector2 *scale_factor = NULL,
-						  const LLString& language = LLString::null);
+						  const std::string& language = LLStringUtil::null);
 	static void cleanupClass();
 
 	static void pushMatrix();
@@ -173,12 +173,12 @@ public:
 	static void translate(F32 x, F32 y, F32 z = 0.0f);
 
 	//helper functions (should probably move free standing rendering helper functions here)
-	static LLString locateSkin(const LLString& filename);
+	static std::string locateSkin(const std::string& filename);
 	static void setCursorPositionScreen(S32 x, S32 y);
 	static void setCursorPositionLocal(const LLView* viewp, S32 x, S32 y);
 	static void setScaleFactor(const LLVector2& scale_factor);
 	static void setLineWidth(F32 width);
-	static LLUIImage* getUIImage(const LLString& name);
+	static LLUIImage* getUIImage(const std::string& name);
 	static LLVector2 getWindowSize();
 	static void screenPointToGL(S32 screen_x, S32 screen_y, S32 *gl_x, S32 *gl_y);
 	static void glPointToScreen(S32 gl_x, S32 gl_y, S32 *screen_x, S32 *screen_y);
@@ -411,7 +411,7 @@ public:
 class LLUIImage : public LLRefCount
 {
 public:
-	LLUIImage(const LLString& name, LLPointer<LLImageGL> image);
+	LLUIImage(const std::string& name, LLPointer<LLImageGL> image);
 
 	void setClipRegion(const LLRectf& region);
 	void setScaleRegion(const LLRectf& region);
@@ -431,7 +431,7 @@ public:
 	void drawBorder(const LLRect& rect, const LLColor4& color, S32 border_width) const { drawBorder(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color, border_width); }
 	void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, mImage->getWidth(0), mImage->getHeight(0), color, border_width); }
 	
-	const LLString& getName() const { return mName; }
+	const std::string& getName() const { return mName; }
 
 	S32 getWidth() const;
 	S32 getHeight() const;
@@ -441,7 +441,7 @@ public:
 	S32 getTextureHeight() const;
 
 protected:
-	LLString			mName;
+	std::string			mName;
 	LLRectf				mScaleRegion;
 	LLRectf				mClipRegion;
 	LLPointer<LLImageGL> mImage;
@@ -592,7 +592,7 @@ public:
 	LLImageProviderInterface() {};
 	virtual ~LLImageProviderInterface() {};
 
-	virtual LLUIImagePtr getUIImage(const LLString& name) = 0;
+	virtual LLUIImagePtr getUIImage(const std::string& name) = 0;
 	virtual LLUIImagePtr getUIImageByID(const LLUUID& id) = 0;
 	virtual void cleanUp() = 0;
 };
diff --git a/linden/indra/llui/llui.vcproj b/linden/indra/llui/llui.vcproj
deleted file mode 100644
index f5e7df5..0000000
--- a/linden/indra/llui/llui.vcproj
+++ /dev/null
@@ -1,446 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llui"
-	ProjectGUID="{DE55D666-6A3D-476C-937F-109269B83681}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llalertdialog.cpp">
-			</File>
-			<File
-				RelativePath=".\llbutton.cpp">
-			</File>
-			<File
-				RelativePath=".\llcheckboxctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llclipboard.cpp">
-			</File>
-			<File
-				RelativePath=".\llcombobox.cpp">
-			</File>
-			<File
-				RelativePath=".\llctrlselectioninterface.cpp">
-			</File>
-			<File
-				RelativePath=".\lldraghandle.cpp">
-			</File>
-			<File
-				RelativePath=".\lleditmenuhandler.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloater.cpp">
-			</File>
-			<File
-				RelativePath=".\llfocusmgr.cpp">
-			</File>
-			<File
-				RelativePath=".\lliconctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeywords.cpp">
-			</File>
-			<File
-				RelativePath=".\lllineeditor.cpp">
-			</File>
-			<File
-				RelativePath=".\llmenugl.cpp">
-			</File>
-			<File
-				RelativePath=".\llmodaldialog.cpp">
-			</File>
-			<File
-				RelativePath=".\llmultislider.cpp">
-			</File>
-			<File
-				RelativePath=".\llmultisliderctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanel.cpp">
-			</File>
-			<File
-				RelativePath=".\llradiogroup.cpp">
-			</File>
-			<File
-				RelativePath=".\llresizebar.cpp">
-			</File>
-			<File
-				RelativePath=".\llresizehandle.cpp">
-			</File>
-			<File
-				RelativePath=".\llresmgr.cpp">
-			</File>
-			<File
-				RelativePath=".\llrootview.cpp">
-			</File>
-			<File
-				RelativePath=".\llscrollbar.cpp">
-			</File>
-			<File
-				RelativePath=".\llscrollcontainer.cpp">
-			</File>
-			<File
-				RelativePath=".\llscrollingpanellist.cpp">
-			</File>
-			<File
-				RelativePath=".\llscrolllistctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llslider.cpp">
-			</File>
-			<File
-				RelativePath=".\llsliderctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llspinctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llstyle.cpp">
-			</File>
-			<File
-				RelativePath=".\lltabcontainer.cpp">
-			</File>
-			<File
-				RelativePath=".\lltabcontainervertical.cpp">
-			</File>
-			<File
-				RelativePath=".\lltextbox.cpp">
-			</File>
-			<File
-				RelativePath=".\lltexteditor.cpp">
-			</File>
-			<File
-				RelativePath=".\llui.cpp">
-			</File>
-			<File
-				RelativePath=".\lluictrl.cpp">
-			</File>
-			<File
-				RelativePath=".\lluictrlfactory.cpp">
-			</File>
-			<File
-				RelativePath=".\lluistring.cpp">
-			</File>
-			<File
-				RelativePath=".\llundo.cpp">
-			</File>
-			<File
-				RelativePath=".\llview.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewborder.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewquery.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llalertdialog.h">
-			</File>
-			<File
-				RelativePath=".\llbutton.h">
-			</File>
-			<File
-				RelativePath=".\llcallbackmap.h">
-			</File>
-			<File
-				RelativePath=".\llcheckboxctrl.h">
-			</File>
-			<File
-				RelativePath=".\llclipboard.h">
-			</File>
-			<File
-				RelativePath=".\llcombobox.h">
-			</File>
-			<File
-				RelativePath=".\llctrlselectioninterface.h">
-			</File>
-			<File
-				RelativePath=".\lldraghandle.h">
-			</File>
-			<File
-				RelativePath=".\lleditmenuhandler.h">
-			</File>
-			<File
-				RelativePath=".\llfloater.h">
-			</File>
-			<File
-				RelativePath=".\llfocusmgr.h">
-			</File>
-			<File
-				RelativePath=".\llhtmlhelp.h">
-			</File>
-			<File
-				RelativePath=".\lliconctrl.h">
-			</File>
-			<File
-				RelativePath=".\llkeywords.h">
-			</File>
-			<File
-				RelativePath=".\lllineeditor.h">
-			</File>
-			<File
-				RelativePath=".\llmemberlistener.h">
-			</File>
-			<File
-				RelativePath=".\llmenugl.h">
-			</File>
-			<File
-				RelativePath=".\llmodaldialog.h">
-			</File>
-			<File
-				RelativePath=".\llmultislider.h">
-			</File>
-			<File
-				RelativePath=".\llmultisliderctrl.h">
-			</File>
-			<File
-				RelativePath=".\llpanel.h">
-			</File>
-			<File
-				RelativePath=".\llradiogroup.h">
-			</File>
-			<File
-				RelativePath=".\llresizebar.h">
-			</File>
-			<File
-				RelativePath=".\llresizehandle.h">
-			</File>
-			<File
-				RelativePath=".\llresmgr.h">
-			</File>
-			<File
-				RelativePath=".\llrootview.h">
-			</File>
-			<File
-				RelativePath=".\llscrollbar.h">
-			</File>
-			<File
-				RelativePath=".\llscrollcontainer.h">
-			</File>
-			<File
-				RelativePath=".\llscrollingpanellist.h">
-			</File>
-			<File
-				RelativePath=".\llscrolllistctrl.h">
-			</File>
-			<File
-				RelativePath=".\llslider.h">
-			</File>
-			<File
-				RelativePath=".\llsliderctrl.h">
-			</File>
-			<File
-				RelativePath=".\llspinctrl.h">
-			</File>
-			<File
-				RelativePath=".\llstyle.h">
-			</File>
-			<File
-				RelativePath=".\lltabcontainer.h">
-			</File>
-			<File
-				RelativePath=".\lltabcontainervertical.h">
-			</File>
-			<File
-				RelativePath=".\lltextbox.h">
-			</File>
-			<File
-				RelativePath=".\lltexteditor.h">
-			</File>
-			<File
-				RelativePath=".\llui.h">
-			</File>
-			<File
-				RelativePath=".\lluiconstants.h">
-			</File>
-			<File
-				RelativePath=".\lluictrl.h">
-			</File>
-			<File
-				RelativePath=".\lluictrlfactory.h">
-			</File>
-			<File
-				RelativePath=".\lluifwd.h">
-			</File>
-			<File
-				RelativePath=".\lluistring.h">
-			</File>
-			<File
-				RelativePath=".\lluixmltags.h">
-			</File>
-			<File
-				RelativePath=".\llundo.h">
-			</File>
-			<File
-				RelativePath=".\llview.h">
-			</File>
-			<File
-				RelativePath=".\llviewborder.h">
-			</File>
-			<File
-				RelativePath=".\llviewquery.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llui/llui_vc8.vcproj b/linden/indra/llui/llui_vc8.vcproj
deleted file mode 100644
index daef3f6..0000000
--- a/linden/indra/llui/llui_vc8.vcproj
+++ /dev/null
@@ -1,611 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llui"
-	ProjectGUID="{DE55D666-6A3D-476C-937F-109269B83681}"
-	RootNamespace="llui"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llalertdialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbutton.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcheckboxctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclipboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcombobox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llctrlselectioninterface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldraghandle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditmenuhandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfocusmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliconctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeywords.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllineeditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenugl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmodaldialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultislider.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultisliderctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llradiogroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizebar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizehandle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llresmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrootview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollcontainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollingpanellist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrolllistctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llslider.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsliderctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llspinctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstyle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainervertical.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexteditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llui.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrlfactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluistring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llundo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewborder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewquery.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llalertdialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbutton.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallbackmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcheckboxctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclipboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcombobox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llctrlselectioninterface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldraghandle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditmenuhandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfocusmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhtmlhelp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliconctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeywords.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllineeditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemberlistener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenugl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmodaldialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultislider.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultisliderctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llradiogroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizebar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizehandle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrootview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollcontainer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollingpanellist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrolllistctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llslider.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsliderctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llspinctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstyle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainervertical.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexteditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluiconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrlfactory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluistring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluixmltags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llundo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewborder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewquery.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llui/llui_vc9.vcproj b/linden/indra/llui/llui_vc9.vcproj
deleted file mode 100644
index cedc726..0000000
--- a/linden/indra/llui/llui_vc9.vcproj
+++ /dev/null
@@ -1,612 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llui"
-	ProjectGUID="{DE55D666-6A3D-476C-937F-109269B83681}"
-	RootNamespace="llui"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llui.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llalertdialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbutton.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcheckboxctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclipboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcombobox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llctrlselectioninterface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldraghandle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditmenuhandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfocusmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliconctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeywords.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllineeditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenugl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmodaldialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultislider.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultisliderctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llradiogroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizebar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizehandle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llresmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrootview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollcontainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollingpanellist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrolllistctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llslider.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsliderctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llspinctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstyle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainervertical.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexteditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llui.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrlfactory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluistring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llundo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewborder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewquery.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llalertdialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbutton.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallbackmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcheckboxctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclipboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcombobox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llctrlselectioninterface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldraghandle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleditmenuhandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfocusmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhtmlhelp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lliconctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeywords.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllineeditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemberlistener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenugl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmodaldialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultislider.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmultisliderctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llradiogroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizebar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresizehandle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrootview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollcontainer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrollingpanellist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llscrolllistctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llslider.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsliderctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llspinctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstyle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltabcontainervertical.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexteditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluiconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluictrlfactory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluistring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluixmltags.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llundo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewborder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewquery.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llui/lluictrl.cpp b/linden/indra/llui/lluictrl.cpp
index 66504b7..ddafa74 100644
--- a/linden/indra/llui/lluictrl.cpp
+++ b/linden/indra/llui/lluictrl.cpp
@@ -98,7 +98,7 @@ LLUICtrl::LLUICtrl() :
 {
 }
 
-LLUICtrl::LLUICtrl(const LLString& name, const LLRect& rect, BOOL mouse_opaque,
+LLUICtrl::LLUICtrl(const std::string& name, const LLRect& rect, BOOL mouse_opaque,
 	void (*on_commit_callback)(LLUICtrl*, void*),
 	void* callback_userdata,
 	U32 reshape)
@@ -147,13 +147,13 @@ LLSD LLUICtrl::getValue() const
 }
 
 // virtual
-BOOL LLUICtrl::setTextArg( const LLString& key, const LLStringExplicit& text ) 
+BOOL LLUICtrl::setTextArg( const std::string& key, const LLStringExplicit& text ) 
 { 
 	return FALSE; 
 }
 
 // virtual
-BOOL LLUICtrl::setLabelArg( const LLString& key, const LLStringExplicit& text ) 
+BOOL LLUICtrl::setLabelArg( const std::string& key, const LLStringExplicit& text ) 
 { 
 	return FALSE; 
 }
@@ -495,7 +495,7 @@ LLUICtrl* LLUICtrl::findRootMostFocusRoot() const
 
 /*
 // Don't let the children handle the tool tip.  Handle it here instead.
-BOOL LLUICtrl::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLUICtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
 	BOOL handled = FALSE;
 	if (getVisible() && pointInView( x, y ) ) 
diff --git a/linden/indra/llui/lluictrl.h b/linden/indra/llui/lluictrl.h
index 7bc5eeb..b63f79b 100644
--- a/linden/indra/llui/lluictrl.h
+++ b/linden/indra/llui/lluictrl.h
@@ -69,7 +69,7 @@ public:
 	typedef BOOL (*LLUICtrlValidate)(LLUICtrl* ctrl, void* userdata);
 
 	LLUICtrl();
-	LLUICtrl( const LLString& name, const LLRect& rect, BOOL mouse_opaque,
+	LLUICtrl( const std::string& name, const LLRect& rect, BOOL mouse_opaque,
 		LLUICtrlCallback callback,
 		void* callback_userdata,
 		U32 reshape=FOLLOWS_NONE);
@@ -78,7 +78,7 @@ public:
 	// LLView interface
 	/*virtual*/ void	initFromXML(LLXMLNodePtr node, LLView* parent);
 	/*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
-	/*virtual*/ BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text );
+	/*virtual*/ BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 	/*virtual*/ void	onFocusReceived();
 	/*virtual*/ void	onFocusLost();
 	/*virtual*/ BOOL	isCtrl() const;
@@ -97,7 +97,7 @@ public:
 	virtual class LLCtrlScrollInterface* getScrollInterface();
 
 	virtual LLSD	getValue() const;
-	virtual BOOL	setTextArg(  const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setTextArg(  const std::string& key, const LLStringExplicit& text );
 	virtual void	setIsChrome(BOOL is_chrome);
 
 	virtual BOOL	acceptsTextInput() const; // Defaults to false
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 212c1c5..bcd4876 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -76,18 +76,18 @@ const S32 VPAD = 4;
 const S32 FLOATER_H_MARGIN = 15;
 const S32 MIN_WIDGET_HEIGHT = 10;
 
-std::vector<LLString> LLUICtrlFactory::sXUIPaths;
+std::vector<std::string> LLUICtrlFactory::sXUIPaths;
 
 // UI Ctrl class for padding
 class LLUICtrlLocate : public LLUICtrl
 {
 public:
-	LLUICtrlLocate() : LLUICtrl("locate", LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
+	LLUICtrlLocate() : LLUICtrl(std::string("locate"), LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
 	virtual void draw() { }
 
 	static LLView *fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 	{
-		LLString name("pad");
+		std::string name("pad");
 		node->getAttributeString("name", name);
 
 		LLUICtrlLocate *new_ctrl = new LLUICtrlLocate();
@@ -117,7 +117,7 @@ LLUICtrlFactory::~LLUICtrlFactory()
 
 void LLUICtrlFactory::setupPaths()
 {
-	LLString filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
+	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
 
 	LLXMLNodePtr root;
 	BOOL success  = LLXMLNode::parseFile(filename, root, NULL);
@@ -130,7 +130,7 @@ void LLUICtrlFactory::setupPaths()
 		for (path = root->getFirstChild(); path.notNull(); path = path->getNextSibling())
 		{
 			LLUIString path_val_ui(path->getValue());
-			LLString language = "en-us";
+			std::string language = "en-us";
 			if (LLUI::sConfigGroup)
 			{
 				language = LLUI::sConfigGroup->getString("Language");
@@ -149,8 +149,8 @@ void LLUICtrlFactory::setupPaths()
 	}
 	else // parsing failed
 	{
-		LLString slash = gDirUtilp->getDirDelimiter();
-		LLString dir = "xui" + slash + "en-us";
+		std::string slash = gDirUtilp->getDirDelimiter();
+		std::string dir = "xui" + slash + "en-us";
 		llwarns << "XUI::config file unable to open: " << filename << llendl;
 		sXUIPaths.push_back(dir);
 	}
@@ -161,7 +161,7 @@ void LLUICtrlFactory::setupPaths()
 //-----------------------------------------------------------------------------
 // getLayeredXMLNode()
 //-----------------------------------------------------------------------------
-bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodePtr& root)
+bool LLUICtrlFactory::getLayeredXMLNode(const std::string &xui_filename, LLXMLNodePtr& root)
 {
 	std::string full_filename = gDirUtilp->findSkinnedFilename(sXUIPaths.front(), xui_filename);
 	if (full_filename.empty())
@@ -182,12 +182,12 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodeP
 
 	LLXMLNodePtr updateRoot;
 
-	std::vector<LLString>::const_iterator itor;
+	std::vector<std::string>::const_iterator itor;
 
 	for (itor = sXUIPaths.begin(), ++itor; itor != sXUIPaths.end(); ++itor)
 	{
-		LLString nodeName;
-		LLString updateName;
+		std::string nodeName;
+		std::string updateName;
 
 		std::string layer_filename = gDirUtilp->findSkinnedFilename((*itor), xui_filename);
 		if(layer_filename.empty())
@@ -218,7 +218,7 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodeP
 //-----------------------------------------------------------------------------
 // buildFloater()
 //-----------------------------------------------------------------------------
-void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const LLString &filename, 
+void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filename, 
 									const LLCallbackMap::map_t* factory_map, BOOL open) /* Flawfinder: ignore */
 {
 	LLXMLNodePtr root;
@@ -259,9 +259,9 @@ void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const LLString &filename
 //-----------------------------------------------------------------------------
 // saveToXML()
 //-----------------------------------------------------------------------------
-S32 LLUICtrlFactory::saveToXML(LLView* viewp, const LLString& filename)
+S32 LLUICtrlFactory::saveToXML(LLView* viewp, const std::string& filename)
 {
-	llofstream out(filename.c_str());
+	llofstream out(filename);
 	if (!out.good())
 	{
 		llwarns << "Unable to open " << filename << " for output." << llendl;
@@ -281,7 +281,7 @@ S32 LLUICtrlFactory::saveToXML(LLView* viewp, const LLString& filename)
 //-----------------------------------------------------------------------------
 // buildPanel()
 //-----------------------------------------------------------------------------
-BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
+BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename,
 									const LLCallbackMap::map_t* factory_map)
 {
 	BOOL didPost = FALSE;
@@ -325,7 +325,7 @@ BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename,
 //-----------------------------------------------------------------------------
 // buildMenu()
 //-----------------------------------------------------------------------------
-LLMenuGL *LLUICtrlFactory::buildMenu(const LLString &filename, LLView* parentp)
+LLMenuGL *LLUICtrlFactory::buildMenu(const std::string &filename, LLView* parentp)
 {
 	// TomY TODO: Break this function into buildMenu and buildMenuBar
 	LLXMLNodePtr root;
@@ -363,7 +363,7 @@ LLMenuGL *LLUICtrlFactory::buildMenu(const LLString &filename, LLView* parentp)
 //-----------------------------------------------------------------------------
 // buildMenu()
 //-----------------------------------------------------------------------------
-LLPieMenu *LLUICtrlFactory::buildPieMenu(const LLString &filename, LLView* parentp)
+LLPieMenu *LLUICtrlFactory::buildPieMenu(const std::string &filename, LLView* parentp)
 {
 	LLXMLNodePtr root;
 
@@ -379,7 +379,7 @@ LLPieMenu *LLUICtrlFactory::buildPieMenu(const LLString &filename, LLView* paren
 		return NULL;
 	}
 
-	LLString name("menu");
+	std::string name("menu");
 	root->getAttributeString("name", name);
 
 	LLPieMenu *menu = new LLPieMenu(name);
@@ -404,7 +404,7 @@ void LLUICtrlFactory::rebuild()
 		built_panel_it != mBuiltPanels.end();
 		++built_panel_it)
 	{
-		LLString filename = built_panel_it->second;
+		std::string filename = built_panel_it->second;
 		LLPanel* panelp = built_panel_it->first.get();
 		if (!panelp)
 		{
@@ -432,7 +432,7 @@ void LLUICtrlFactory::rebuild()
 		{
 			continue;
 		}
-		LLString filename = built_floater_it->second;
+		std::string filename = built_floater_it->second;
 		llinfos << "Rebuilding UI floater " << floaterp->getName()
 			<< " from " << filename
 			<< llendl;
@@ -452,8 +452,8 @@ void LLUICtrlFactory::rebuild()
 
 LLView *LLUICtrlFactory::createCtrlWidget(LLPanel *parent, LLXMLNodePtr node)
 {
-	LLString ctrl_type = node->getName()->mString;
-	LLString::toLower(ctrl_type);
+	std::string ctrl_type = node->getName()->mString;
+	LLStringUtil::toLower(ctrl_type);
 	
 	LLWidgetClassRegistry::factory_func_t func = LLWidgetClassRegistry::getInstance()->getCreatorFunc(ctrl_type);
 
@@ -494,7 +494,7 @@ LLView* LLUICtrlFactory::createWidget(LLPanel *parent, LLXMLNodePtr node)
 //-----------------------------------------------------------------------------
 // createFactoryPanel()
 //-----------------------------------------------------------------------------
-LLPanel* LLUICtrlFactory::createFactoryPanel(LLString name)
+LLPanel* LLUICtrlFactory::createFactoryPanel(const std::string& name)
 {
 	std::deque<const LLCallbackMap::map_t*>::iterator itor;
 	for (itor = mFactoryStack.begin(); itor != mFactoryStack.end(); ++itor)
@@ -516,10 +516,10 @@ LLPanel* LLUICtrlFactory::createFactoryPanel(LLString name)
 //-----------------------------------------------------------------------------
 
 //static
-BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const LLString& name, LLColor4& color)
+BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color)
 {
-	LLString colorstring;
-	BOOL res = node->getAttributeString(name, colorstring);
+	std::string colorstring;
+	BOOL res = node->getAttributeString(name.c_str(), colorstring);
 	if (res && LLUI::sColorsGroup)
 	{
 		if (LLUI::sColorsGroup->controlExists(colorstring))
@@ -533,11 +533,11 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const LLString& name,
 	}
 	if (!res)
 	{
-		res = LLColor4::parseColor(colorstring.c_str(), &color);
+		res = LLColor4::parseColor(colorstring, &color);
 	}	
 	if (!res)
 	{
-		res = node->getAttributeColor(name, color);
+		res = node->getAttributeColor(name.c_str(), color);
 	}
 	return res;
 }
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index 16170ac..559c8e5 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -50,44 +50,44 @@ public:
 
 	void setupPaths();
 
-	void buildFloater(LLFloater* floaterp, const LLString &filename, 
+	void buildFloater(LLFloater* floaterp, const std::string &filename, 
 					const LLCallbackMap::map_t* factory_map = NULL, BOOL open = TRUE);
-	BOOL buildPanel(LLPanel* panelp, const LLString &filename,
+	BOOL buildPanel(LLPanel* panelp, const std::string &filename,
 					const LLCallbackMap::map_t* factory_map = NULL);
 
 	void removePanel(LLPanel* panelp) { mBuiltPanels.erase(panelp->getHandle()); }
 	void removeFloater(LLFloater* floaterp) { mBuiltFloaters.erase(floaterp->getHandle()); }
 
-	class LLMenuGL *buildMenu(const LLString &filename, LLView* parentp);
-	class LLPieMenu *buildPieMenu(const LLString &filename, LLView* parentp);
+	class LLMenuGL *buildMenu(const std::string &filename, LLView* parentp);
+	class LLPieMenu *buildPieMenu(const std::string &filename, LLView* parentp);
 
 	// Does what you want for LLFloaters and LLPanels
 	// Returns 0 on success
-	S32 saveToXML(LLView* viewp, const LLString& filename);
+	S32 saveToXML(LLView* viewp, const std::string& filename);
 
 	// Rebuilds all currently built panels.
 	void rebuild();
 
-	static BOOL getAttributeColor(LLXMLNodePtr node, const LLString& name, LLColor4& color);
+	static BOOL getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color);
 
-	LLPanel* createFactoryPanel(LLString name);
+	LLPanel* createFactoryPanel(const std::string& name);
 
 	virtual LLView* createCtrlWidget(LLPanel *parent, LLXMLNodePtr node);
 	virtual LLView* createWidget(LLPanel *parent, LLXMLNodePtr node);
 
-	static bool getLayeredXMLNode(const LLString &filename, LLXMLNodePtr& root);
+	static bool getLayeredXMLNode(const std::string &filename, LLXMLNodePtr& root);
 
 private:
 
-	typedef std::map<LLHandle<LLPanel>, LLString> built_panel_t;
+	typedef std::map<LLHandle<LLPanel>, std::string> built_panel_t;
 	built_panel_t mBuiltPanels;
 
-	typedef std::map<LLHandle<LLFloater>, LLString> built_floater_t;
+	typedef std::map<LLHandle<LLFloater>, std::string> built_floater_t;
 	built_floater_t mBuiltFloaters;
 
 	std::deque<const LLCallbackMap::map_t*> mFactoryStack;
 
-	static std::vector<LLString> sXUIPaths;
+	static std::vector<std::string> sXUIPaths;
 
 	LLPanel* mDummyPanel;
 };
diff --git a/linden/indra/llui/lluistring.cpp b/linden/indra/llui/lluistring.cpp
index 2eb7f28..52b83bd 100644
--- a/linden/indra/llui/lluistring.cpp
+++ b/linden/indra/llui/lluistring.cpp
@@ -32,29 +32,29 @@
 #include "linden_common.h"
 #include "lluistring.h"
 
-const LLString::format_map_t LLUIString::sNullArgs;
+const LLStringUtil::format_map_t LLUIString::sNullArgs;
 
 
-LLUIString::LLUIString(const LLString& instring, const LLString::format_map_t& args)
+LLUIString::LLUIString(const std::string& instring, const LLStringUtil::format_map_t& args)
 	: mOrig(instring),
 	  mArgs(args)
 {
 	format();
 }
 
-void LLUIString::assign(const LLString& s)
+void LLUIString::assign(const std::string& s)
 {
 	mOrig = s;
 	format();
 }
 
-void LLUIString::setArgList(const LLString::format_map_t& args)
+void LLUIString::setArgList(const LLStringUtil::format_map_t& args)
 {
 	mArgs = args;
 	format();
 }
 
-void LLUIString::setArg(const LLString& key, const LLString& replacement)
+void LLUIString::setArg(const std::string& key, const std::string& replacement)
 {
 	mArgs[key] = replacement;
 	format();
@@ -64,7 +64,7 @@ void LLUIString::truncate(S32 maxchars)
 {
 	if (mWResult.size() > (size_t)maxchars)
 	{
-		LLWString::truncate(mWResult, maxchars);
+		LLWStringUtil::truncate(mWResult, maxchars);
 		mResult = wstring_to_utf8str(mWResult);
 	}
 }
@@ -98,6 +98,6 @@ void LLUIString::clear()
 void LLUIString::format()
 {
 	mResult = mOrig;
-	LLString::format(mResult, mArgs);
+	LLStringUtil::format(mResult, mArgs);
 	mWResult = utf8str_to_wstring(mResult);
 }
diff --git a/linden/indra/llui/lluistring.h b/linden/indra/llui/lluistring.h
index e8a86f4..b6c715f 100644
--- a/linden/indra/llui/lluistring.h
+++ b/linden/indra/llui/lluistring.h
@@ -1,7 +1,7 @@
 /** 
  * @file lluistring.h
  * @author: Steve Bennetts
- * @brief A fancy wrapper for LLString supporting argument substitutions.
+ * @brief A fancy wrapper for std::string supporting argument substitutions.
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
@@ -47,15 +47,15 @@
 // LLUIString mMessage("Welcome [USERNAME] to [SECONDLIFE]!");
 // mMessage.setArg("[USERNAME]", "Steve");
 // mMessage.setArg("[SECONDLIFE]", "Second Life");
-// llinfos << mMessage.getString().c_str() << llendl; // outputs "Welcome Steve to Second Life"
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to Second Life"
 // mMessage.setArg("[USERNAME]", "Joe");
-// llinfos << mMessage.getString().c_str() << llendl; // outputs "Welcome Joe to Second Life"
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to Second Life"
 // mMessage = "Recepción a la [SECONDLIFE] [USERNAME]"
 // mMessage.setArg("[SECONDLIFE]", "Segunda Vida");
-// llinfos << mMessage.getString().c_str() << llendl; // outputs "Recepción a la Segunda Vida Joe"
+// llinfos << mMessage.getString() << llendl; // outputs "Recepción a la Segunda Vida Joe"
 
 // Implementation Notes:
-// Attempting to have operator[](const LLString& s) return mArgs[s] fails because we have
+// Attempting to have operator[](const std::string& s) return mArgs[s] fails because we have
 // to call format() after the assignment happens.
 
 class LLUIString
@@ -64,17 +64,17 @@ public:
 	// These methods all perform appropriate argument substitution
 	// and modify mOrig where appropriate
 	LLUIString() {}
-	LLUIString(const LLString& instring, const LLString::format_map_t& args);
-	LLUIString(const LLString& instring) { assign(instring); }
+	LLUIString(const std::string& instring, const LLStringUtil::format_map_t& args);
+	LLUIString(const std::string& instring) { assign(instring); }
 
-	void assign(const LLString& instring);
-	LLUIString& operator=(const LLString& s) { assign(s); return *this; }
+	void assign(const std::string& instring);
+	LLUIString& operator=(const std::string& s) { assign(s); return *this; }
 
-	void setArgList(const LLString::format_map_t& args);
-	void setArg(const LLString& key, const LLString& replacement);
+	void setArgList(const LLStringUtil::format_map_t& args);
+	void setArg(const std::string& key, const std::string& replacement);
 
-	const LLString& getString() const { return mResult; }
-	operator LLString() const { return mResult; }
+	const std::string& getString() const { return mResult; }
+	operator std::string() const { return mResult; }
 
 	const LLWString& getWString() const { return mWResult; }
 	operator LLWString() const { return mWResult; }
@@ -92,15 +92,15 @@ public:
 	void insert(S32 charidx, const LLWString& wchars);
 	void replace(S32 charidx, llwchar wc);
 	
-	static const LLString::format_map_t sNullArgs;
+	static const LLStringUtil::format_map_t sNullArgs;
 
 private:
 	void format();	
 	
-	LLString mOrig;
-	LLString mResult;
+	std::string mOrig;
+	std::string mResult;
 	LLWString mWResult; // for displaying
-	LLString::format_map_t mArgs;
+	LLStringUtil::format_map_t mArgs;
 };
 
 #endif // LL_LLUISTRING_H
diff --git a/linden/indra/llui/lluixmltags.h b/linden/indra/llui/lluixmltags.h
index cfc57b1..5209199 100644
--- a/linden/indra/llui/lluixmltags.h
+++ b/linden/indra/llui/lluixmltags.h
@@ -31,7 +31,7 @@
 #ifndef LL_UI_XML_TAGS_H
 #define LL_UI_XML_TAGS_H
 
-const LLString
+const std::string
 	LL_BUTTON_TAG("button"),
 	LL_UI_CTRL_LOCATE_TAG("locate"),
 	LL_PAD_TAG("pad"),
@@ -120,6 +120,6 @@ const LLString
 	LL_JOYSTICK_SLIDE("joystick_slide"),
 	LL_JOYSTICK_TURN("joystick_turn"),
 	LL_GROUP_DROP_TARGET_TAG("group_drop_target"),
-	LL_LAYOUT_STACK_TAG("layout_stack");
-#define LL_FLYOUT_BUTTON_TAG "flyout_button"
+	LL_LAYOUT_STACK_TAG("layout_stack"),
+	LL_FLYOUT_BUTTON_TAG("flyout_button");
 #endif
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 91c9564..034c49b 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -41,8 +41,6 @@
 #include "llevent.h"
 #include "llfontgl.h"
 #include "llfocusmgr.h"
-#include "llgl.h"
-#include "llglheaders.h"
 #include "llrect.h"
 #include "llstl.h"
 #include "llui.h"	// colors saved settings
@@ -64,8 +62,7 @@ BOOL	LLView::sDebugRects = FALSE;
 BOOL	LLView::sDebugKeys = FALSE;
 S32		LLView::sDepth = 0;
 BOOL	LLView::sDebugMouseHandling = FALSE;
-LLString LLView::sMouseHandlerMessage;
-S32	LLView::sSelectID = GL_NAME_UI_RESERVED;
+std::string LLView::sMouseHandlerMessage;
 BOOL	LLView::sEditingUI = FALSE;
 BOOL	LLView::sForceReshape = FALSE;
 LLView*	LLView::sEditingUIView = NULL;
@@ -92,7 +89,7 @@ LLView::LLView() :
 {
 }
 
-LLView::LLView(const LLString& name, BOOL mouse_opaque) :
+LLView::LLView(const std::string& name, BOOL mouse_opaque) :
 	mParentView(NULL),
 	mName(name),
 	mReshapeFlags(FOLLOWS_NONE),
@@ -111,7 +108,7 @@ LLView::LLView(const LLString& name, BOOL mouse_opaque) :
 
 
 LLView::LLView(
-	const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 reshape) :
+	const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 reshape) :
 	mParentView(NULL),
 	mName(name),
 	mRect(rect),
@@ -196,7 +193,7 @@ BOOL LLView::setToolTipArg(const LLStringExplicit& key, const LLStringExplicit&
 	return TRUE;
 }
 
-void LLView::setToolTipArgs( const LLString::format_map_t& args )
+void LLView::setToolTipArgs( const LLStringUtil::format_map_t& args )
 {
 	mToolTipMsg.setArgList(args);
 }
@@ -223,9 +220,9 @@ BOOL LLView::getUseBoundingRect()
 }
 
 // virtual
-const LLString& LLView::getName() const
+const std::string& LLView::getName() const
 {
-	static const LLString unnamed("(no name)");
+	static const std::string unnamed("(no name)");
 	return mName.empty() ? unnamed : mName;
 }
 
@@ -462,7 +459,7 @@ void LLView::setEnabled(BOOL enabled)
 }
 
 //virtual
-BOOL LLView::setLabelArg( const LLString& key, const LLStringExplicit& text )
+BOOL LLView::setLabelArg( const std::string& key, const LLStringExplicit& text )
 {
 	return FALSE;
 }
@@ -668,11 +665,11 @@ BOOL LLView::handleHover(S32 x, S32 y, MASK mask)
 	return handled;
 }
 
-LLString LLView::getShowNamesToolTip()
+std::string LLView::getShowNamesToolTip()
 {
 	LLView* view = getParent();
-	LLString name;
-	LLString tool_tip = mName;
+	std::string name;
+	std::string tool_tip = mName;
 
 	while (view)
 	{
@@ -680,7 +677,7 @@ LLString LLView::getShowNamesToolTip()
 
 		if (name == "root") break;
 
-		if (view->getToolTip().find(".xml") != LLString::npos)
+		if (view->getToolTip().find(".xml") != std::string::npos)
 		{
 			tool_tip = view->getToolTip() + "/" +  tool_tip;
 			break;
@@ -697,11 +694,11 @@ LLString LLView::getShowNamesToolTip()
 }
 
 
-BOOL LLView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
 	BOOL handled = FALSE;
 
-    LLString tool_tip;
+	std::string tool_tip;
 
 	for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
 	{
@@ -721,15 +718,15 @@ BOOL LLView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_scre
 	tool_tip = mToolTipMsg.getString();
 	if (
 		LLUI::sShowXUINames &&
-		(tool_tip.find(".xml", 0) == LLString::npos) && 
-		(mName.find("Drag", 0) == LLString::npos))
+		(tool_tip.find(".xml", 0) == std::string::npos) && 
+		(mName.find("Drag", 0) == std::string::npos))
 	{
 		tool_tip = getShowNamesToolTip();
 	}
 
-	BOOL showNamesTextBox = LLUI::sShowXUINames && dynamic_cast<LLTextBox*>(this) != NULL;
+	BOOL show_names_text_box = LLUI::sShowXUINames && dynamic_cast<LLTextBox*>(this) != NULL;
 
-	if( !handled && (blockMouseEvent(x, y) || showNamesTextBox) && !tool_tip.empty())
+	if( !handled && (blockMouseEvent(x, y) || show_names_text_box))
 	{
 
 		msg = tool_tip;
@@ -826,7 +823,7 @@ BOOL LLView::handleUnicodeCharHere(llwchar uni_char )
 BOOL LLView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 							   EDragAndDropType cargo_type, void* cargo_data,
 							   EAcceptance* accept,
-							   LLString& tooltip_msg)
+							   std::string& tooltip_msg)
 {
 	// CRO this is an experiment to allow drag and drop into object inventory based on the DragAndDrop tool's permissions rather than the parent
 	BOOL handled = childrenHandleDragAndDrop( x, y, mask, drop,
@@ -849,7 +846,7 @@ LLView* LLView::childrenHandleDragAndDrop(S32 x, S32 y, MASK mask,
 									   EDragAndDropType cargo_type,
 									   void* cargo_data,
 									   EAcceptance* accept,
-									   LLString& tooltip_msg)
+									   std::string& tooltip_msg)
 {
 	LLView* handled_view = FALSE;
 	// CRO this is an experiment to allow drag and drop into object inventory based on the DragAndDrop tool's permissions rather than the parent
@@ -989,7 +986,7 @@ LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
 			{
 				if (sDebugMouseHandling)
 				{
-					sMouseHandlerMessage = LLString("->") + viewp->mName.c_str() + sMouseHandlerMessage;
+					sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
 				}
 
 				handled_view = viewp;
@@ -1017,7 +1014,7 @@ LLView* LLView::childrenHandleHover(S32 x, S32 y, MASK mask)
 			{
 				if (sDebugMouseHandling)
 				{
-					sMouseHandlerMessage = LLString("->") + viewp->mName.c_str() + sMouseHandlerMessage;
+					sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
 				}
 
 				handled_view = viewp;
@@ -1095,7 +1092,7 @@ LLView* LLView::childrenHandleMouseDown(S32 x, S32 y, MASK mask)
 		{
 			if (sDebugMouseHandling)
 			{
-				sMouseHandlerMessage = LLString("->") + viewp->mName.c_str() + sMouseHandlerMessage;
+				sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
 			}
 			handled_view = viewp;
 			break;
@@ -1122,7 +1119,7 @@ LLView* LLView::childrenHandleRightMouseDown(S32 x, S32 y, MASK mask)
 			{
 				if (sDebugMouseHandling)
 				{
-					sMouseHandlerMessage = LLString("->") + viewp->mName.c_str() + sMouseHandlerMessage;
+					sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
 				}
 				handled_view = viewp;
 				break;
@@ -1150,7 +1147,7 @@ LLView* LLView::childrenHandleDoubleClick(S32 x, S32 y, MASK mask)
 			{
 				if (sDebugMouseHandling)
 				{
-					sMouseHandlerMessage = LLString("->") + viewp->mName.c_str() + sMouseHandlerMessage;
+					sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
 				}
 				handled_view = viewp;
 				break;
@@ -1180,7 +1177,7 @@ LLView* LLView::childrenHandleMouseUp(S32 x, S32 y, MASK mask)
 			{
 				if (sDebugMouseHandling)
 				{
-					sMouseHandlerMessage = LLString("->") + viewp->mName.c_str() + sMouseHandlerMessage;
+					sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
 				}
 				handled_view = viewp;
 				break;
@@ -1207,7 +1204,7 @@ LLView* LLView::childrenHandleRightMouseUp(S32 x, S32 y, MASK mask)
 			{
 				if (sDebugMouseHandling)
 				{
-					sMouseHandlerMessage = LLString("->") + viewp->mName.c_str() + sMouseHandlerMessage;
+					sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
 				}
 				handled_view = viewp;
 				break;
@@ -1328,7 +1325,7 @@ void LLView::drawDebugRect()
 			gGL.color4fv( border_color.mV );
 			x = debug_rect.getWidth()/2;
 			y = debug_rect.getHeight()/2;
-			LLString debug_text = llformat("%s (%d x %d)", getName().c_str(),
+			std::string debug_text = llformat("%s (%d x %d)", getName().c_str(),
 										debug_rect.getWidth(), debug_rect.getHeight());
 			LLFontGL::sSansSerifSmall->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
 												LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL,
@@ -1539,7 +1536,7 @@ BOOL LLView::hasAncestor(const LLView* parentp) const
 
 //-----------------------------------------------------------------------------
 
-BOOL LLView::childHasKeyboardFocus( const LLString& childname ) const
+BOOL LLView::childHasKeyboardFocus( const std::string& childname ) const
 {
 	LLView *child = getChildView(childname, TRUE, FALSE);
 	if (child)
@@ -1554,7 +1551,7 @@ BOOL LLView::childHasKeyboardFocus( const LLString& childname ) const
 
 //-----------------------------------------------------------------------------
 
-BOOL LLView::hasChild(const LLString& childname, BOOL recurse) const
+BOOL LLView::hasChild(const std::string& childname, BOOL recurse) const
 {
 	return getChildView(childname, recurse, FALSE) != NULL;
 }
@@ -1562,7 +1559,7 @@ BOOL LLView::hasChild(const LLString& childname, BOOL recurse) const
 //-----------------------------------------------------------------------------
 // getChildView()
 //-----------------------------------------------------------------------------
-LLView* LLView::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLView::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
 {
 	//richard: should we allow empty names?
 	//if(name.empty())
@@ -1925,33 +1922,18 @@ LLView* LLView::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fact
 
 // static
 void LLView::addColorXML(LLXMLNodePtr node, const LLColor4& color,
-							const LLString& xml_name, const LLString& control_name)
+							const char* xml_name, const char* control_name)
 {
-	if (color != LLUI::sColorsGroup->getColor(control_name))
+	if (color != LLUI::sColorsGroup->getColor(ll_safe_string(control_name)))
 	{
 		node->createChild(xml_name, TRUE)->setFloatValue(4, color.mV);
 	}
 }
 
-// static
-void LLView::saveColorToXML(std::ostream& out, const LLColor4& color,
-							const LLString& xml_name, const LLString& control_name,
-							const LLString& indent)
-{
-	if (color != LLUI::sColorsGroup->getColor(control_name))
-	{
-		out << indent << xml_name << "=\"" 
-			<< color.mV[VRED] << ", " 
-			<< color.mV[VGREEN] << ", " 
-			<< color.mV[VBLUE] << ", " 
-			<< color.mV[VALPHA] << "\"\n";
-	}
-}
-
 //static 
-LLString LLView::escapeXML(const LLString& xml, LLString& indent)
+std::string LLView::escapeXML(const std::string& xml, std::string& indent)
 {
-	LLString ret = indent + "\"" + LLXMLNode::escapeXML(xml);
+	std::string ret = indent + "\"" + LLXMLNode::escapeXML(xml);
 
 	//replace every newline with a close quote, new line, indent, open quote
 	size_t index = ret.size()-1;
@@ -2406,12 +2388,12 @@ LLView*	LLView::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESna
 // Listener dispatch functions
 //-----------------------------------------------------------------------------
 
-void LLView::registerEventListener(LLString name, LLSimpleListener* function)
+void LLView::registerEventListener(std::string name, LLSimpleListener* function)
 {
-	mDispatchList.insert(std::pair<LLString, LLSimpleListener*>(name, function));
+	mDispatchList.insert(std::pair<std::string, LLSimpleListener*>(name, function));
 }
 
-void LLView::deregisterEventListener(LLString name)
+void LLView::deregisterEventListener(std::string name)
 {
 	dispatch_list_t::iterator itor = mDispatchList.find(name);
 	if (itor != mDispatchList.end())
@@ -2420,7 +2402,7 @@ void LLView::deregisterEventListener(LLString name)
 	}
 }
 
-LLString LLView::findEventListener(LLSimpleListener *listener) const
+std::string LLView::findEventListener(LLSimpleListener *listener) const
 {
 	dispatch_list_t::const_iterator itor;
 	for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor)
@@ -2434,10 +2416,10 @@ LLString LLView::findEventListener(LLSimpleListener *listener) const
 	{
 		return mParentView->findEventListener(listener);
 	}
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
-LLSimpleListener* LLView::getListenerByName(const LLString& callback_name)
+LLSimpleListener* LLView::getListenerByName(const std::string& callback_name)
 {
 	LLSimpleListener* callback = NULL;
 	dispatch_list_t::iterator itor = mDispatchList.find(callback_name);
@@ -2452,7 +2434,7 @@ LLSimpleListener* LLView::getListenerByName(const LLString& callback_name)
 	return callback;
 }
 
-LLControlVariable *LLView::findControl(LLString name)
+LLControlVariable *LLView::findControl(const std::string& name)
 {
 	control_map_t::iterator itor = mFloaterControls.find(name);
 	if (itor != mFloaterControls.end())
@@ -2496,7 +2478,7 @@ U32 LLView::createRect(LLXMLNodePtr node, LLRect &rect, LLView* parent_view, con
 		}
 	}
 
-	LLString rect_control;
+	std::string rect_control;
 	node->getAttributeString("rect_control", rect_control);
 	if (! rect_control.empty())
 	{
@@ -2657,14 +2639,14 @@ void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
 
 	if (node->hasAttribute("control_name"))
 	{
-		LLString control_name;
+		std::string control_name;
 		node->getAttributeString("control_name", control_name);
 		setControlName(control_name, NULL);
 	}
 
 	if (node->hasAttribute("tool_tip"))
 	{
-		LLString tool_tip_msg("");
+		std::string tool_tip_msg;
 		node->getAttributeString("tool_tip", tool_tip_msg);
 		setToolTip(tool_tip_msg);
 	}
@@ -2697,7 +2679,7 @@ void LLView::parseFollowsFlags(LLXMLNodePtr node)
 	{
 		setFollowsNone();
 
-		LLString follows;
+		std::string follows;
 		node->getAttributeString("follows", follows);
 
 		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
@@ -2741,10 +2723,10 @@ LLFontGL* LLView::selectFont(LLXMLNodePtr node)
 
 	if (node->hasAttribute("font"))
 	{
-		LLString font_name;
+		std::string font_name;
 		node->getAttributeString("font", font_name);
 
-		gl_font = LLFontGL::fontFromName(font_name.c_str());
+		gl_font = LLFontGL::fontFromName(font_name);
 	}
 	return gl_font;
 }
@@ -2756,7 +2738,7 @@ LLFontGL::HAlign LLView::selectFontHAlign(LLXMLNodePtr node)
 
 	if (node->hasAttribute("halign"))
 	{
-		LLString horizontal_align_name;
+		std::string horizontal_align_name;
 		node->getAttributeString("halign", horizontal_align_name);
 		gl_hfont_align = LLFontGL::hAlignFromName(horizontal_align_name);
 	}
@@ -2770,7 +2752,7 @@ LLFontGL::VAlign LLView::selectFontVAlign(LLXMLNodePtr node)
 
 	if (node->hasAttribute("valign"))
 	{
-		LLString vert_align_name;
+		std::string vert_align_name;
 		node->getAttributeString("valign", vert_align_name);
 		gl_vfont_align = LLFontGL::vAlignFromName(vert_align_name);
 	}
@@ -2784,7 +2766,7 @@ LLFontGL::StyleFlags LLView::selectFontStyle(LLXMLNodePtr node)
 
 	if (node->hasAttribute("style"))
 	{
-		LLString style_flags_name;
+		std::string style_flags_name;
 		node->getAttributeString("style", style_flags_name);
 
 		if (style_flags_name == "normal")
@@ -2810,7 +2792,7 @@ LLFontGL::StyleFlags LLView::selectFontStyle(LLXMLNodePtr node)
 
 bool LLView::setControlValue(const LLSD& value)
 {
-	LLString ctrlname = getControlName();
+	std::string ctrlname = getControlName();
 	if (!ctrlname.empty())
 	{
 		LLUI::sConfigGroup->setValue(ctrlname, value);
@@ -2820,7 +2802,7 @@ bool LLView::setControlValue(const LLSD& value)
 }
 
 //virtual
-void LLView::setControlName(const LLString& control_name, LLView *context)
+void LLView::setControlName(const std::string& control_name, LLView *context)
 {
 	if (context == NULL)
 	{
@@ -2872,12 +2854,12 @@ bool LLView::controlListener(const LLSD& newvalue, LLHandle<LLView> handle, std:
 	return false;
 }
 
-void LLView::addBoolControl(LLString name, bool initial_value)
+void LLView::addBoolControl(const std::string& name, bool initial_value)
 {
-	mFloaterControls[name] = new LLControlVariable(name, TYPE_BOOLEAN, initial_value, "Internal floater control");
+	mFloaterControls[name] = new LLControlVariable(name, TYPE_BOOLEAN, initial_value, std::string("Internal floater control"));
 }
 
-LLControlVariable *LLView::getControl(LLString name)
+LLControlVariable *LLView::getControl(const std::string& name)
 {
 	control_map_t::iterator itor = mFloaterControls.find(name);
 	if (itor != mFloaterControls.end())
@@ -2912,20 +2894,20 @@ LLWidgetClassRegistry::LLWidgetClassRegistry()
 { 
 }
 
-void LLWidgetClassRegistry::registerCtrl(const LLString& tag, LLWidgetClassRegistry::factory_func_t function)
+void LLWidgetClassRegistry::registerCtrl(const std::string& tag, LLWidgetClassRegistry::factory_func_t function)
 { 
-	LLString lower_case_tag = tag;
-	LLString::toLower(lower_case_tag);
+	std::string lower_case_tag = tag;
+	LLStringUtil::toLower(lower_case_tag);
 	
 	mCreatorFunctions[lower_case_tag] = function;
 }
 
-BOOL LLWidgetClassRegistry::isTagRegistered(const LLString &tag)
+BOOL LLWidgetClassRegistry::isTagRegistered(const std::string &tag)
 { 
 	return mCreatorFunctions.find(tag) != mCreatorFunctions.end();
 }
 
-LLWidgetClassRegistry::factory_func_t LLWidgetClassRegistry::getCreatorFunc(const LLString& ctrl_type)
+LLWidgetClassRegistry::factory_func_t LLWidgetClassRegistry::getCreatorFunc(const std::string& ctrl_type)
 { 
 	factory_map_t::const_iterator found_it = mCreatorFunctions.find(ctrl_type);
 	if (found_it == mCreatorFunctions.end())
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 9a04ed7..b65edd7 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -89,7 +89,7 @@ virtual void	setVisible(BOOL visible);
 		LLFloater, LLAlertDialog, LLMenuItemGL, LLModalDialog
 virtual void	setEnabled(BOOL enabled)	{ mEnabled = enabled; }
 		LLCheckBoxCtrl, LLComboBox, LLLineEditor, LLMenuGL, LLRadioGroup, etc
-virtual BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text ) { return FALSE; }
+virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text ) { return FALSE; }
 		LLUICtrl, LLButton, LLCheckBoxCtrl, LLLineEditor, LLMenuGL, LLSliderCtrl
 virtual void	onVisibilityChange ( BOOL curVisibilityIn );
 		LLMenuGL
@@ -114,7 +114,7 @@ virtual BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent);
 		*
 virtual BOOL	handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
 		*
-virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,EDragAndDropType cargo_type,void* cargo_data,EAcceptance* accept,LLString& tooltip_msg);
+virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,EDragAndDropType cargo_type,void* cargo_data,EAcceptance* accept,std::string& tooltip_msg);
 		*
 virtual void	draw();
 		*
@@ -128,11 +128,11 @@ virtual void onFocusLost() {}
 		LLUICtrl, LLScrollListCtrl, LLMenuGL, LLLineEditor, LLComboBox
 virtual void onFocusReceived() {}
 		LLUICtrl, LLTextEditor, LLScrollListVtrl, LLMenuGL, LLLineEditor
-virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 		LLTabContainer, LLPanel, LLMenuGL
-virtual void	setControlName(const LLString& control, LLView *context);
+virtual void	setControlName(const std::string& control, LLView *context);
 		LLSliderCtrl, LLCheckBoxCtrl
-virtual LLString getControlName() const { return mControlName; }
+virtual std::string getControlName() const { return mControlName; }
 		LLSliderCtrl, LLCheckBoxCtrl
 virtual bool	handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
 		LLMenuItem
@@ -154,11 +154,11 @@ class LLWidgetClassRegistry : public LLSingleton<LLWidgetClassRegistry>
 	friend class LLSingleton<LLWidgetClassRegistry>;
 public:
 	typedef LLView* (*factory_func_t)(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-	typedef std::map<LLString, factory_func_t> factory_map_t;
+	typedef std::map<std::string, factory_func_t> factory_map_t;
 
-	void registerCtrl(const LLString& xml_tag, factory_func_t function);
-	BOOL isTagRegistered(const LLString& xml_tag);
-	factory_func_t getCreatorFunc(const LLString& xml_tag);
+	void registerCtrl(const std::string& xml_tag, factory_func_t function);
+	BOOL isTagRegistered(const std::string& xml_tag);
+	factory_func_t getCreatorFunc(const std::string& xml_tag);
 
 	// get (first) xml tag for a given class
 	template <class T> std::string getTag()
@@ -179,7 +179,7 @@ private:
 	LLWidgetClassRegistry();
 	virtual ~LLWidgetClassRegistry() {};
 
-	typedef std::set<LLString> ctrl_name_set_t;
+	typedef std::set<std::string> ctrl_name_set_t;
 	ctrl_name_set_t mUICtrlNames;
 
 	// map of xml tags to widget creator functions
@@ -252,8 +252,8 @@ public:
 	typedef child_tab_order_t::const_reverse_iterator	child_tab_order_const_reverse_iter_t;
 
 	LLView();
-	LLView(const LLString& name, BOOL mouse_opaque);
-	LLView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
+	LLView(const std::string& name, BOOL mouse_opaque);
+	LLView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
 
 	virtual ~LLView();
 
@@ -274,7 +274,7 @@ public:
 	BOOL		getMouseOpaque() const			{ return mMouseOpaque; }
 	void		setToolTip( const LLStringExplicit& msg );
 	BOOL		setToolTipArg( const LLStringExplicit& key, const LLStringExplicit& text );
-	void		setToolTipArgs( const LLString::format_map_t& args );
+	void		setToolTipArgs( const LLStringUtil::format_map_t& args );
 
 	virtual void setRect(const LLRect &rect);
 	void		setFollows(U32 flags)			{ mReshapeFlags = flags; }
@@ -288,11 +288,11 @@ public:
 	void		setFollowsAll()					{ mReshapeFlags |= FOLLOWS_ALL; }
 
 	void        setSoundFlags(U8 flags)			{ mSoundFlags = flags; }
-	void		setName(LLString name)			{ mName = name; }
+	void		setName(std::string name)			{ mName = name; }
 	void		setUseBoundingRect( BOOL use_bounding_rect );
 	BOOL		getUseBoundingRect();
 
-	const LLString& getToolTip() const			{ return mToolTipMsg.getString(); }
+	const std::string& getToolTip() const			{ return mToolTipMsg.getString(); }
 
 	void		sendChildToFront(LLView* child);
 	void		sendChildToBack(LLView* child);
@@ -340,7 +340,7 @@ public:
 	BOOL			getEnabled() const			{ return mEnabled; }
 	U8              getSoundFlags() const       { return mSoundFlags; }
 
-	virtual BOOL	setLabelArg( const LLString& key, const LLStringExplicit& text );
+	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 
 	virtual void	onVisibilityChange ( BOOL curVisibilityIn );
 
@@ -374,8 +374,8 @@ public:
 	S32			getChildCount()	const			{ return (S32)mChildList.size(); }
 	template<class _Pr3> void sortChildren(_Pr3 _Pred) { mChildList.sort(_Pred); }
 	BOOL		hasAncestor(const LLView* parentp) const;
-	BOOL		hasChild(const LLString& childname, BOOL recurse = FALSE) const;
-	BOOL 		childHasKeyboardFocus( const LLString& childname ) const;
+	BOOL		hasChild(const std::string& childname, BOOL recurse = FALSE) const;
+	BOOL 		childHasKeyboardFocus( const std::string& childname ) const;
 
 
 	//
@@ -403,9 +403,9 @@ public:
 									  EDragAndDropType cargo_type,
 									  void* cargo_data,
 									  EAcceptance* accept,
-									  LLString& tooltip_msg);
+									  std::string& tooltip_msg);
 
-	LLString getShowNamesToolTip();
+	std::string getShowNamesToolTip();
 
 	virtual void	draw();
 
@@ -439,19 +439,19 @@ public:
 	void localRectToScreen( const LLRect& local, LLRect* screen ) const;
 	
 	// Listener dispatching functions (Dispatcher deletes pointers to listeners on deregistration or destruction)
-	LLSimpleListener* getListenerByName(const LLString &callback_name);
-	void registerEventListener(LLString name, LLSimpleListener* function);
-	void deregisterEventListener(LLString name);
-	LLString findEventListener(LLSimpleListener *listener) const;
-	void addListenerToControl(LLEventDispatcher *observer, const LLString& name, LLSD filter, LLSD userdata);
+	LLSimpleListener* getListenerByName(const std::string& callback_name);
+	void registerEventListener(std::string name, LLSimpleListener* function);
+	void deregisterEventListener(std::string name);
+	std::string findEventListener(LLSimpleListener *listener) const;
+	void addListenerToControl(LLEventDispatcher *observer, const std::string& name, LLSD filter, LLSD userdata);
 
-	void addBoolControl(LLString name, bool initial_value);
-	LLControlVariable *getControl(LLString name);
-	LLControlVariable *findControl(LLString name);
+	void addBoolControl(const std::string& name, bool initial_value);
+	LLControlVariable *getControl(const std::string& name);
+	LLControlVariable *findControl(const std::string& name);
 
 	bool setControlValue(const LLSD& value);
-	virtual void	setControlName(const LLString& control, LLView *context);
-	virtual LLString getControlName() const { return mControlName; }
+	virtual void	setControlName(const std::string& control, LLView *context);
+	virtual std::string getControlName() const { return mControlName; }
 //	virtual bool	handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
 	virtual void	setValue(const LLSD& value);
 	virtual LLSD	getValue() const;
@@ -467,15 +467,15 @@ public:
 	/*virtual*/ BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
 	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);	
-	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect); // Display mToolTipMsg if no child handles it.
-	/*virtual*/ const LLString&	getName() const;
+	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect); // Display mToolTipMsg if no child handles it.
+	/*virtual*/ const std::string&	getName() const;
 	/*virtual*/ void	onMouseCaptureLost();
 	/*virtual*/ BOOL	hasMouseCapture();
 	/*virtual*/ BOOL isView(); // Hack to support LLFocusMgr
 	/*virtual*/ void	screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const;
 	/*virtual*/ void	localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const;
 
-	template <class T> T* getChild(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const
+	template <class T> T* getChild(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const
 	{
 		LLView* child = getChildView(name, recurse, FALSE);
 		T* result = dynamic_cast<T*>(child);
@@ -495,22 +495,22 @@ public:
 		return result;
 	}
 
-	virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+	virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 
-	template <class T> T* createDummyWidget(const LLString& name) const
+	template <class T> T* createDummyWidget(const std::string& name) const
 	{
 		T* widget = getDummyWidget<T>(name);
 		if (!widget)
 		{
 			// get xml tag name corresponding to requested widget type (e.g. "button")
-			LLString xml_tag = LLWidgetClassRegistry::getInstance()->getTag<T>();
+			std::string xml_tag = LLWidgetClassRegistry::getInstance()->getTag<T>();
 			if (xml_tag.empty())
 			{
 				llwarns << "No xml tag registered for this class " << llendl;
 				return NULL;
 			}
 			// create dummy xml node (<button name="foo"/>)
-			LLXMLNodePtr new_node_ptr = new LLXMLNode(xml_tag, FALSE);
+			LLXMLNodePtr new_node_ptr = new LLXMLNode(xml_tag.c_str(), FALSE);
 			new_node_ptr->createChild("name", TRUE)->setStringValue(name);
 			
 			widget = dynamic_cast<T*>(createWidget(new_node_ptr));
@@ -518,7 +518,7 @@ public:
 			{
 				// need non-const to update private dummy widget cache
 				llwarns << "Making dummy " << xml_tag << " named " << name << " in " << getName() << llendl;
-				const_cast<LLView*>(this)->mDummyWidgets.insert(std::make_pair(name, widget));
+				mDummyWidgets.insert(std::make_pair(name, widget));
 			}
 			else
 			{
@@ -530,7 +530,7 @@ public:
 		return widget;
 	}
 
-	template <class T> T* getDummyWidget(const LLString& name) const
+	template <class T> T* getDummyWidget(const std::string& name) const
 	{
 		dummy_widget_map_t::const_iterator found_it = mDummyWidgets.find(name);
 		if (found_it == mDummyWidgets.end())
@@ -554,17 +554,14 @@ public:
 	
 	// Only saves color if different from default setting.
 	static void addColorXML(LLXMLNodePtr node, const LLColor4& color,
-							const LLString& xml_name, const LLString& control_name);
-	static void saveColorToXML(std::ostream& out, const LLColor4& color,
-							   const LLString& xml_name, const LLString& control_name,
-							   const LLString& indent); // DEPRECATED
+							const char* xml_name, const char* control_name);
 	// Escapes " (quot) ' (apos) & (amp) < (lt) > (gt)
-	//static LLString escapeXML(const LLString& xml);
+	//static std::string escapeXML(const std::string& xml);
 	static LLWString escapeXML(const LLWString& xml);
 	
 	//same as above, but wraps multiple lines in quotes and prepends
 	//indent as leading white space on each line
-	static LLString escapeXML(const LLString& xml, LLString& indent);
+	static std::string escapeXML(const std::string& xml, std::string& indent);
 
 	// focuses the item in the list after the currently-focused item, wrapping if necessary
 	static	BOOL focusNext(LLView::child_list_t & result);
@@ -594,7 +591,7 @@ protected:
 											  EDragAndDropType type,
 											  void* data,
 											  EAcceptance* accept,
-											  LLString& tooltip_msg);
+											  std::string& tooltip_msg);
 
 	LLView*	childrenHandleHover(S32 x, S32 y, MASK mask);
 	LLView* childrenHandleMouseUp(S32 x, S32 y, MASK mask);
@@ -606,14 +603,14 @@ protected:
 
 	static bool controlListener(const LLSD& newvalue, LLHandle<LLView> handle, std::string type);
 
-	typedef std::map<LLString, LLControlVariable*> control_map_t;
+	typedef std::map<std::string, LLControlVariable*> control_map_t;
 	control_map_t mFloaterControls;
 
 private:
 	LLView*		mParentView;
 	child_list_t mChildList;
 
-	LLString	mName;
+	std::string	mName;
 	// location in pixels, relative to surrounding structure, bottom,left=0,0
 	LLRect		mRect;
 	LLRect		mBoundingRect;
@@ -643,13 +640,13 @@ private:
 
 	static LLWindow* sWindow;	// All root views must know about their window.
 
-	typedef std::map<LLString, LLPointer<LLSimpleListener> > dispatch_list_t;
+	typedef std::map<std::string, LLPointer<LLSimpleListener> > dispatch_list_t;
 	dispatch_list_t mDispatchList;
 
-	LLString		mControlName;
+	std::string		mControlName;
 
-	typedef std::map<LLString, LLView*> dummy_widget_map_t;
-	dummy_widget_map_t mDummyWidgets;
+	typedef std::map<std::string, LLView*> dummy_widget_map_t;
+	mutable dummy_widget_map_t mDummyWidgets;
 
 	boost::signals::connection mControlConnection;
 	
@@ -658,7 +655,7 @@ public:
 	static BOOL sDebugKeys;
 	static S32	sDepth;
 	static BOOL sDebugMouseHandling;
-	static LLString sMouseHandlerMessage;
+	static std::string sMouseHandlerMessage;
 	static S32	sSelectID;
 	static BOOL sEditingUI;
 	static LLView* sEditingUIView;
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index c354ac5..8a5beea 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -35,7 +35,7 @@
 
 static LLRegisterWidget<LLViewBorder> r("view_border");
 
-LLViewBorder::LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel, EStyle style, S32 width )
+LLViewBorder::LLViewBorder( const std::string& name, const LLRect& rect, EBevel bevel, EStyle style, S32 width )
 	:
 	LLView( name, rect, FALSE ),
 	mBevel( bevel ),
@@ -277,9 +277,9 @@ BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel
 {
 	if (node->hasAttribute("bevel_style"))
 	{
-		LLString bevel_string;
+		std::string bevel_string;
 		node->getAttributeString("bevel_style", bevel_string);
-		LLString::toLower(bevel_string);
+		LLStringUtil::toLower(bevel_string);
 
 		if (bevel_string == "none")
 		{
@@ -306,7 +306,7 @@ BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel
 // static
 LLView* LLViewBorder::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("view_border");
+	std::string name("view_border");
 	node->getAttributeString("name", name);
 
 	LLViewBorder::EBevel bevel_style = LLViewBorder::BEVEL_IN;
diff --git a/linden/indra/llui/llviewborder.h b/linden/indra/llui/llviewborder.h
index eacb2b5..2297491 100644
--- a/linden/indra/llui/llviewborder.h
+++ b/linden/indra/llui/llviewborder.h
@@ -41,7 +41,7 @@ public:
 	enum EBevel { BEVEL_IN, BEVEL_OUT, BEVEL_BRIGHT, BEVEL_NONE };
 	enum EStyle { STYLE_LINE, STYLE_TEXTURE };
 
-	LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 );
+	LLViewBorder( const std::string& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 );
 
 	virtual void setValue(const LLSD& val) { setRect(LLRect(val)); }
 
diff --git a/linden/indra/llvfs/CMakeLists.txt b/linden/indra/llvfs/CMakeLists.txt
new file mode 100644
index 0000000..9f136f7
--- /dev/null
+++ b/linden/indra/llvfs/CMakeLists.txt
@@ -0,0 +1,58 @@
+# -*- cmake -*-
+
+project(llvfs)
+
+include(00-Common)
+include(LLCommon)
+include(UnixInstall)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    )
+
+set(llvfs_SOURCE_FILES
+    lldir.cpp
+    lllfsthread.cpp
+    llvfile.cpp
+    llvfs.cpp
+    llvfsthread.cpp
+    )
+
+set(llvfs_HEADER_FILES
+    CMakeLists.txt
+
+    lldir.h
+    lllfsthread.h
+    llvfile.h
+    llvfs.h
+    llvfsthread.h
+    )
+
+if (DARWIN)
+  LIST(APPEND llvfs_SOURCE_FILES lldir_mac.cpp)
+  LIST(APPEND llvfs_HEADER_FILES lldir_mac.h)
+endif (DARWIN)
+
+if (LINUX)
+  LIST(APPEND llvfs_SOURCE_FILES lldir_linux.cpp)
+  LIST(APPEND llvfs_HEADER_FILES lldir_linux.h)
+
+  if (VIEWER AND INSTALL)
+    set_source_files_properties(lldir_linux.cpp
+                                PROPERTIES COMPILE_FLAGS
+                                "-DAPP_RO_DATA_DIR=\\\"${APP_SHARE_DIR}\\\""
+                                )
+  endif (VIEWER AND INSTALL)
+endif (LINUX)
+
+if (WINDOWS)
+  LIST(APPEND llvfs_SOURCE_FILES lldir_win32.cpp)
+  LIST(APPEND llvfs_HEADER_FILES lldir_win32.h)
+endif (WINDOWS)
+
+set_source_files_properties(${llvfs_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llvfs_SOURCE_FILES ${llvfs_HEADER_FILES})
+
+add_library (llvfs ${llvfs_SOURCE_FILES})
diff --git a/linden/indra/llvfs/files.linux.lst b/linden/indra/llvfs/files.linux.lst
deleted file mode 100755
index 2c306eb..0000000
--- a/linden/indra/llvfs/files.linux.lst
+++ /dev/null
@@ -1 +0,0 @@
-llvfs/lldir_linux.cpp
diff --git a/linden/indra/llvfs/files.lst b/linden/indra/llvfs/files.lst
deleted file mode 100644
index 758ab48..0000000
--- a/linden/indra/llvfs/files.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-llvfs/lldir.cpp
-llvfs/lllfsthread.cpp
-llvfs/llvfile.cpp
-llvfs/llvfs.cpp
-llvfs/llvfsthread.cpp
diff --git a/linden/indra/llvfs/files.sunos5.lst b/linden/indra/llvfs/files.sunos5.lst
deleted file mode 100644
index f1b74d8..0000000
--- a/linden/indra/llvfs/files.sunos5.lst
+++ /dev/null
@@ -1 +0,0 @@
-llvfs/lldir_solaris.cpp
diff --git a/linden/indra/llvfs/files.win32.lst b/linden/indra/llvfs/files.win32.lst
deleted file mode 100755
index 34920d1..0000000
--- a/linden/indra/llvfs/files.win32.lst
+++ /dev/null
@@ -1 +0,0 @@
-llvfs/lldir_win32.cpp
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 246595a..6d6b7aa 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -59,8 +59,19 @@ LLDir_Linux gDirUtil;
 
 LLDir *gDirUtilp = (LLDir *)&gDirUtil;
 
-LLDir::LLDir() 
-: mDirDelimiter("/") // fallback to forward slash if not overridden
+LLDir::LLDir()
+:	mAppName(""),
+	mExecutablePathAndName(""),
+	mExecutableFilename(""),
+	mExecutableDir(""),
+	mAppRODataDir(""),
+	mOSUserDir(""),
+	mOSUserAppDir(""),
+	mLindenUserDir(""),
+	mOSCacheDir(""),
+	mCAFile(""),
+	mTempDir(""),
+	mDirDelimiter("/") // fallback to forward slash if not overridden
 {
 }
 
@@ -90,7 +101,7 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask)
 		S32 retry_count = 0;
 		while (retry_count < 5)
 		{
-			if (0 != LLFile::remove(fullpath.c_str()))
+			if (0 != LLFile::remove(fullpath))
 			{
 				result = errno;
 				llwarns << "Problem removing " << fullpath << " - errorcode: "
@@ -205,13 +216,20 @@ const std::string  LLDir::getCacheDir(bool get_default) const
 	if (mCacheDir.empty() || get_default)
 	{
 		std::string res;
-		if (getOSUserAppDir().empty())
+		if (getOSCacheDir().empty())
 		{
-			res = "data";
+			if (getOSUserAppDir().empty())
+			{
+				res = "data";
+			}
+			else
+			{
+				res = getOSUserAppDir() + mDirDelimiter + "cache";
+			}
 		}
 		else
 		{
-			res = getOSUserAppDir() + mDirDelimiter + "cache";
+			res = getOSCacheDir() + mDirDelimiter + "SecondLife";
 		}
 		return res;
 	}
@@ -221,6 +239,12 @@ const std::string  LLDir::getCacheDir(bool get_default) const
 	}
 }
 
+const std::string &LLDir::getOSCacheDir() const
+{
+	return mOSCacheDir;
+}
+
+
 const std::string &LLDir::getCAFile() const
 {
 	return mCAFile;
@@ -350,6 +374,9 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
 		prefix += mDirDelimiter;
 		prefix += "browser_profile";
 		break;
+
+	case LL_PATH_EXECUTABLE:
+		prefix = getExecutableDir();
 		
 	default:
 		llassert(0);
@@ -395,6 +422,40 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
 	return expanded_filename;
 }
 
+std::string LLDir::getBaseFileName(const std::string& filepath, bool strip_exten) const
+{
+	std::size_t offset = filepath.find_last_of(getDirDelimiter());
+	offset = (offset == std::string::npos) ? 0 : offset+1;
+	std::string res = filepath.substr(offset, std::string::npos);
+	if (strip_exten)
+	{
+		offset = res.find_last_of('.');
+		if (offset != std::string::npos &&
+		    offset != 0) // if basename STARTS with '.', don't strip
+		{
+			res = res.substr(0, offset);
+		}
+	}
+	return res;
+}
+
+std::string LLDir::getDirName(const std::string& filepath) const
+{
+	std::size_t offset = filepath.find_last_of(getDirDelimiter());
+	S32 len = (offset == std::string::npos) ? 0 : offset;
+	std::string dirname = filepath.substr(0, len);
+	return dirname;
+}
+
+std::string LLDir::getExtension(const std::string& filepath) const
+{
+	std::string basename = getBaseFileName(filepath, false);
+	std::size_t offset = basename.find_last_of('.');
+	std::string exten = (offset == std::string::npos || offset == 0) ? "" : basename.substr(offset+1);
+	LLStringUtil::toLower(exten);
+	return exten;
+}
+
 std::string LLDir::findSkinnedFilename(const std::string &filename) const
 {
 	return findSkinnedFilename("", "", filename);
@@ -419,11 +480,10 @@ std::string LLDir::findSkinnedFilename(const std::string &subdir1, const std::st
 	return found_file;
 }
 
-
 std::string LLDir::getTempFilename() const
 {
 	LLUUID random_uuid;
-	char uuid_str[64];	/* Flawfinder: ignore */ 
+	std::string uuid_str;
 
 	random_uuid.generate();
 	random_uuid.toString(uuid_str);
@@ -443,15 +503,15 @@ void LLDir::setLindenUserDir(const std::string &first, const std::string &last)
 	{
 		// some platforms have case-sensitive filesystems, so be
 		// utterly consistent with our firstname/lastname case.
-		LLString firstlower(first);
-		LLString::toLower(firstlower);
-		LLString lastlower(last);
-		LLString::toLower(lastlower);
+		std::string firstlower(first);
+		LLStringUtil::toLower(firstlower);
+		std::string lastlower(last);
+		LLStringUtil::toLower(lastlower);
 		mLindenUserDir = getOSUserAppDir();
 		mLindenUserDir += mDirDelimiter;
-		mLindenUserDir += firstlower.c_str();
+		mLindenUserDir += firstlower;
 		mLindenUserDir += "_";
-		mLindenUserDir += lastlower.c_str();
+		mLindenUserDir += lastlower;
 	}
 	else
 	{
@@ -480,15 +540,15 @@ void LLDir::setPerAccountChatLogsDir(const std::string &first, const std::string
 	{
 		// some platforms have case-sensitive filesystems, so be
 		// utterly consistent with our firstname/lastname case.
-		LLString firstlower(first);
-		LLString::toLower(firstlower);
-		LLString lastlower(last);
-		LLString::toLower(lastlower);
+		std::string firstlower(first);
+		LLStringUtil::toLower(firstlower);
+		std::string lastlower(last);
+		LLStringUtil::toLower(lastlower);
 		mPerAccountChatLogsDir = getChatLogsDir();
 		mPerAccountChatLogsDir += mDirDelimiter;
-		mPerAccountChatLogsDir += firstlower.c_str();
+		mPerAccountChatLogsDir += firstlower;
 		mPerAccountChatLogsDir += "_";
-		mPerAccountChatLogsDir += lastlower.c_str();
+		mPerAccountChatLogsDir += lastlower;
 	}
 	else
 	{
@@ -531,13 +591,13 @@ bool LLDir::setCacheDir(const std::string &path)
 	}
 	else
 	{
-		LLFile::mkdir(path.c_str());
+		LLFile::mkdir(path);
 		std::string tempname = path + mDirDelimiter + "temp";
-		LLFILE* file = LLFile::fopen(tempname.c_str(),"wt");
+		LLFILE* file = LLFile::fopen(tempname,"wt");
 		if (file)
 		{
 			fclose(file);
-			LLFile::remove(tempname.c_str());
+			LLFile::remove(tempname);
 			mCacheDir = path;
 			return true;
 		}
@@ -570,15 +630,15 @@ void dir_exists_or_crash(const std::string &dir_name)
 #if LL_WINDOWS
 	// *FIX: lame - it doesn't do the same thing on windows. not so
 	// important since we don't deploy simulator to windows boxes.
-	LLFile::mkdir(dir_name.c_str(), 0700);
+	LLFile::mkdir(dir_name, 0700);
 #else
 	struct stat dir_stat;
-	if(0 != LLFile::stat(dir_name.c_str(), &dir_stat))
+	if(0 != LLFile::stat(dir_name, &dir_stat))
 	{
 		S32 stat_rv = errno;
 		if(ENOENT == stat_rv)
 		{
-		   if(0 != LLFile::mkdir(dir_name.c_str(), 0700))		// octal
+		   if(0 != LLFile::mkdir(dir_name, 0700))		// octal
 		   {
 			   llerrs << "Unable to create directory: " << dir_name << llendl;
 		   }
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 8734c44..dbddf7d 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -51,7 +51,8 @@ typedef enum ELLPath
 	LL_PATH_PER_ACCOUNT_CHAT_LOGS = 13,
 	LL_PATH_MOZILLA_PROFILE = 14,
 //	LL_PATH_HTML = 15,
-	LL_PATH_LAST = 16
+	LL_PATH_EXECUTABLE = 16,
+	LL_PATH_LAST
 } ELLPath;
 
 
@@ -86,6 +87,7 @@ class LLDir
 	const std::string &getPerAccountChatLogsDir() const;	// Location of the per account chat logs dir.
 	const std::string &getTempDir() const;			// Common temporary directory
 	const std::string  getCacheDir(bool get_default = false) const;	// Location of the cache.
+	const std::string &getOSCacheDir() const;		// location of OS-specific cache folder (may be empty string)
 	const std::string &getCAFile() const;			// File containing TLS certificate authorities
 	const std::string &getDirDelimiter() const;	// directory separator for platform (ie. '\' or '/' or ':')
 	const std::string &getSkinDir() const;		// User-specified skin folder.
@@ -98,13 +100,17 @@ class LLDir
 	std::string getExpandedFilename(ELLPath location, const std::string &subdir, const std::string &filename) const;
 	std::string getExpandedFilename(ELLPath location, const std::string &subdir1, const std::string &subdir2, const std::string &filename) const;
 
+	// Base and Directory name extraction
+	std::string getBaseFileName(const std::string& filepath, bool strip_exten = false) const;
+	std::string getDirName(const std::string& filepath) const;
+	std::string getExtension(const std::string& filepath) const; // Excludes '.', e.g getExtension("foo.wav") == "wav"
+	
 	// these methods search the various skin paths for the specified file in the following order:
 	// getUserSkinDir(), getSkinDir(), getDefaultSkinDir()
 	std::string findSkinnedFilename(const std::string &filename) const;
 	std::string findSkinnedFilename(const std::string &subdir, const std::string &filename) const;
 	std::string findSkinnedFilename(const std::string &subdir1, const std::string &subdir2, const std::string &filename) const;
 
-
 	// random filename in common temporary directory
 	std::string getTempFilename() const;
 
@@ -131,6 +137,7 @@ protected:
 	std::string mCAFile;				 // Location of the TLS certificate authority PEM file.
 	std::string mTempDir;
 	std::string mCacheDir;
+	std::string mOSCacheDir;
 	std::string mDirDelimiter;
 	std::string mSkinDir;			// Location for current skin info.
 	std::string mDefaultSkinDir;			// Location for default skin info.
diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index 9aa4da3..481d23d 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -93,7 +93,11 @@ LLDir_Linux::LLDir_Linux()
 	mExecutablePathAndName = "";
 	mExecutableDir = tmp_str;
 	mWorkingDir = tmp_str;
+#ifdef APP_RO_DATA_DIR
+	mAppRODataDir = APP_RO_DATA_DIR;
+#else
 	mAppRODataDir = tmp_str;
+#endif
 	mOSUserDir = getCurrentUserHome(tmp_str);
 	mOSUserAppDir = "";
 	mLindenUserDir = tmp_str;
@@ -138,8 +142,8 @@ void LLDir_Linux::initAppDirs(const std::string &app_name)
 {
 	mAppName = app_name;
 
-	LLString upper_app_name(app_name);
-	LLString::toUpper(upper_app_name);
+	std::string upper_app_name(app_name);
+	LLStringUtil::toUpper(upper_app_name);
 
 	char* app_home_env = getenv((upper_app_name + "_USER_DIR").c_str());	/* Flawfinder: ignore */ 
 	if (app_home_env)
@@ -153,14 +157,14 @@ void LLDir_Linux::initAppDirs(const std::string &app_name)
 		mOSUserAppDir = mOSUserDir;
 		mOSUserAppDir += "/";
 		mOSUserAppDir += ".";
-		LLString lower_app_name(app_name);
-		LLString::toLower(lower_app_name);
+		std::string lower_app_name(app_name);
+		LLStringUtil::toLower(lower_app_name);
 		mOSUserAppDir += lower_app_name;
 	}
 
 	// create any directories we expect to write to.
 
-	int res = LLFile::mkdir(mOSUserAppDir.c_str());
+	int res = LLFile::mkdir(mOSUserAppDir);
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -171,7 +175,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name)
 		}
 	}
 
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -180,7 +184,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -189,7 +193,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -198,7 +202,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 8b1be53..fd8f087 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -159,13 +159,22 @@ LLDir_Mac::LLDir_Mac()
 				
 				// Create our sub-dirs
 				(void) CFCreateDirectory(&newFileRef, CFSTR("data"), NULL);
-				(void) CFCreateDirectory(&newFileRef, CFSTR("cache"), NULL);
+				//(void) CFCreateDirectory(&newFileRef, CFSTR("cache"), NULL);
 				(void) CFCreateDirectory(&newFileRef, CFSTR("logs"), NULL);
 				(void) CFCreateDirectory(&newFileRef, CFSTR("user_settings"), NULL);
 				(void) CFCreateDirectory(&newFileRef, CFSTR("browser_profile"), NULL);
 			}
 		}
 		
+		//mOSCacheDir
+		FSRef cacheDirRef;
+		error = FSFindFolder(kUserDomain, kCachedDataFolderType, true, &cacheDirRef);
+		if (error == noErr)
+		{
+			FSRefToLLString(&cacheDirRef, mOSCacheDir);
+			(void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL);
+		}
+		
 		// mOSUserAppDir
 		mOSUserAppDir = mOSUserDir;
 		
diff --git a/linden/indra/llvfs/lldir_solaris.cpp b/linden/indra/llvfs/lldir_solaris.cpp
index 2143bb2..62c1eb7 100644
--- a/linden/indra/llvfs/lldir_solaris.cpp
+++ b/linden/indra/llvfs/lldir_solaris.cpp
@@ -152,8 +152,8 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
 {
 	mAppName = app_name;
 
-	LLString upper_app_name(app_name);
-	LLString::toUpper(upper_app_name);
+	std::string upper_app_name(app_name);
+	LLStringUtil::toUpper(upper_app_name);
 
 	char* app_home_env = getenv((upper_app_name + "_USER_DIR").c_str());	/* Flawfinder: ignore */ 
 	if (app_home_env)
@@ -167,14 +167,14 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
 		mOSUserAppDir = mOSUserDir;
 		mOSUserAppDir += "/";
 		mOSUserAppDir += ".";
-		LLString lower_app_name(app_name);
-		LLString::toLower(lower_app_name);
+		std::string lower_app_name(app_name);
+		LLStringUtil::toLower(lower_app_name);
 		mOSUserAppDir += lower_app_name;
 	}
 
 	// create any directories we expect to write to.
 
-	int res = LLFile::mkdir(mOSUserAppDir.c_str());
+	int res = LLFile::mkdir(mOSUserAppDir);
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -185,7 +185,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
 		}
 	}
 
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -194,7 +194,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -203,7 +203,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -212,7 +212,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index 8904dff..99d5e18 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -116,10 +116,16 @@ LLDir_Win32::LLDir_Win32()
 	GetCurrentDirectory(MAX_PATH, w_str);
 	mExecutableDir = utf16str_to_utf8str(llutf16string(w_str));
 #endif
+	
+	mAppRODataDir = getCurPath();
+	// *FIX:Mani - The following is the old way we did things. I'm keeping this around
+	// in case there is some really good reason to make mAppRODataDir == mExecutableDir
+	/*
 	if (strstr(mExecutableDir.c_str(), "indra\\newview"))
 		mAppRODataDir = getCurPath();
 	else
 		mAppRODataDir = mExecutableDir;
+	*/
 }
 
 LLDir_Win32::~LLDir_Win32()
@@ -135,7 +141,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name)
 	mOSUserAppDir += "\\";
 	mOSUserAppDir += app_name;
 
-	int res = LLFile::mkdir(mOSUserAppDir.c_str());
+	int res = LLFile::mkdir(mOSUserAppDir);
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -147,7 +153,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name)
 	}
 	//dumpCurrentDirectories();
 
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -156,7 +162,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -165,7 +171,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -174,7 +180,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name)
 		}
 	}
 	
-	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"").c_str());
+	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,""));
 	if (res == -1)
 	{
 		if (errno != EEXIST)
@@ -343,7 +349,7 @@ BOOL LLDir_Win32::fileExists(const std::string &filename) const
 	llstat stat_data;
 	// Check the age of the file
 	// Now, we see if the files we've gathered are recent...
-	int res = LLFile::stat(filename.c_str(), &stat_data);
+	int res = LLFile::stat(filename, &stat_data);
 	if (!res)
 	{
 		return TRUE;
diff --git a/linden/indra/llvfs/lllfsthread.cpp b/linden/indra/llvfs/lllfsthread.cpp
index 4510392..7dce4d9 100644
--- a/linden/indra/llvfs/lllfsthread.cpp
+++ b/linden/indra/llvfs/lllfsthread.cpp
@@ -30,7 +30,6 @@
  */
 
 #include "linden_common.h"
-#include "llmath.h"
 #include "lllfsthread.h"
 #include "llstl.h"
 #include "llapr.h"
@@ -82,7 +81,7 @@ LLLFSThread::~LLLFSThread()
 
 //----------------------------------------------------------------------------
 
-LLLFSThread::handle_t LLLFSThread::read(const LLString& filename,	/* Flawfinder: ignore */ 
+LLLFSThread::handle_t LLLFSThread::read(const std::string& filename,	/* Flawfinder: ignore */ 
 										U8* buffer, S32 offset, S32 numbytes,
 										Responder* responder, U32 priority)
 {
@@ -105,7 +104,7 @@ LLLFSThread::handle_t LLLFSThread::read(const LLString& filename,	/* Flawfinder:
 	return handle;
 }
 
-LLLFSThread::handle_t LLLFSThread::write(const LLString& filename,
+LLLFSThread::handle_t LLLFSThread::write(const std::string& filename,
 										 U8* buffer, S32 offset, S32 numbytes,
 										 Responder* responder, U32 priority)
 {
@@ -131,7 +130,7 @@ LLLFSThread::handle_t LLLFSThread::write(const LLString& filename,
 
 LLLFSThread::Request::Request(LLLFSThread* thread,
 							  handle_t handle, U32 priority,
-							  operation_t op, const LLString& filename,
+							  operation_t op, const std::string& filename,
 							  U8* buffer, S32 offset, S32 numbytes,
 							  Responder* responder) :
 	QueuedRequest(handle, priority, FLAG_AUTO_COMPLETE),
diff --git a/linden/indra/llvfs/lllfsthread.h b/linden/indra/llvfs/lllfsthread.h
index b073422..eebec48 100644
--- a/linden/indra/llvfs/lllfsthread.h
+++ b/linden/indra/llvfs/lllfsthread.h
@@ -75,7 +75,7 @@ public:
 	public:
 		Request(LLLFSThread* thread,
 				handle_t handle, U32 priority, 
-				operation_t op, const LLString& filename,
+				operation_t op, const std::string& filename,
 				U8* buffer, S32 offset, S32 numbytes,
 				Responder* responder);
 
@@ -95,7 +95,7 @@ public:
 		{
 			return mBuffer;
 		}
-		const LLString& getFilename()
+		const std::string& getFilename()
 		{
 			return mFileName;
 		}
@@ -108,7 +108,7 @@ public:
 		LLLFSThread* mThread;
 		operation_t mOperation;
 		
-		LLString mFileName;
+		std::string mFileName;
 		
 		U8* mBuffer;	// dest for reads, source for writes, new UUID for rename
 		S32 mOffset;	// offset into file, -1 = append (WRITE only)
@@ -124,10 +124,10 @@ public:
 	~LLLFSThread();	
 
 	// Return a Request handle
-	handle_t read(const LLString& filename,	/* Flawfinder: ignore */ 
+	handle_t read(const std::string& filename,	/* Flawfinder: ignore */ 
 				  U8* buffer, S32 offset, S32 numbytes,
 				  Responder* responder, U32 pri=0);
-	handle_t write(const LLString& filename,
+	handle_t write(const std::string& filename,
 				   U8* buffer, S32 offset, S32 numbytes,
 				   Responder* responder, U32 pri=0);
 	
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index 7903e83..b3d02a5 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -232,7 +232,7 @@ struct LLVFSFileBlock_less
 const S32 LLVFSFileBlock::SERIAL_SIZE = 34;
      
     
-LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash)
+LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash)
 :	mRemoveAfterCrash(remove_after_crash)
 {
 	mDataMutex = new LLMutex(0);
@@ -244,15 +244,8 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
 	}
 	mValid = VFSVALID_OK;
 	mReadOnly = read_only;
-	mIndexFilename = new char[strlen(index_filename) + 1];	/* Flawfinder: ignore */
-	mDataFilename = new char[strlen(data_filename) + 1];	/* Flawfinder: ignore */
-	if (mIndexFilename == NULL || mDataFilename  == NULL)
-	{
-		LL_ERRS("VFS") << "Memory Allocation Failure" << LL_ENDL;
-		return;
-	}
-	strcpy(mIndexFilename, index_filename);	/* Flawfinder: ignore */
-	strcpy(mDataFilename, data_filename);	/* Flawfinder: ignore */
+	mIndexFilename = index_filename;
+	mDataFilename = data_filename;
     
 	const char *file_mode = mReadOnly ? "rb" : "r+b";
     
@@ -276,23 +269,13 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
 		{
 			LL_WARNS("VFS") << "Can't open VFS data file " << mDataFilename << " attempting to use alternate" << LL_ENDL;
     
-			char *temp_index = new char[strlen(mIndexFilename) + 10];	/* Flawfinder: ignore */
-			if (!temp_index)
-			{
-				LL_ERRS("VFS") << "Out of the memory in LLVFS::LLVFS()" << LL_ENDL;
-				return;
-			}
-			char *temp_data = new char[strlen(mDataFilename) + 10];	/* Flawfinder: ignore */
-			if (!temp_data)
-			{
-				LL_ERRS("VFS") << "Out of the memory in LLVFS::LLVFS()" << LL_ENDL;
-				return;
-			}
+			std::string temp_index;
+			std::string temp_data;
 
 			for (U32 count = 0; count < 256; count++)
 			{
-				sprintf(temp_index, "%s.%u", mIndexFilename, count);	/* Flawfinder: ignore */
-				sprintf(temp_data, "%s.%u", mDataFilename, count);	/* Flawfinder: ignore */
+				temp_index = mIndexFilename + llformat(".%u",count);
+				temp_data = mDataFilename + llformat(".%u", count);
     
 				// try just opening, then creating, each alternate
 				if ((mDataFP = openAndLock(temp_data, "r+b", FALSE)))
@@ -312,14 +295,9 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
 			{
 				LL_WARNS("VFS") << "Couldn't open vfs data file after trying many alternates" << LL_ENDL;
 				mValid = VFSVALID_BAD_CANNOT_CREATE;
-				delete[] temp_index;
-				delete[] temp_data;
 				return;
 			}
 
-			delete[] mIndexFilename;
-			delete[] mDataFilename;
-    
 			mIndexFilename = temp_index;
 			mDataFilename = temp_data;
 		}
@@ -335,13 +313,7 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
 	if (!mReadOnly && mRemoveAfterCrash)
 	{
 		llstat marker_info;
-		char* marker = new char[strlen(mDataFilename) + strlen(".open") + 1];	/* Flawfinder: ignore */
-		if (!marker )
-		{
-			LL_ERRS("VFS") << "Out of memory in LLVFS::LLVFS()" << LL_ENDL;
-			return;
-		}
-		sprintf(marker, "%s.open", mDataFilename);	/* Flawfinder: ignore */
+		std::string marker = mDataFilename + ".open";
 		if (!LLFile::stat(marker, &marker_info))
 		{
 			// marker exists, kill the lock and the VFS files
@@ -366,8 +338,6 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
 				presizeDataFile(presize);
 			}
 		}
-		delete [] marker;
-		marker = NULL;
 	}
 
 	// determine the real file size
@@ -590,21 +560,13 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
 	// Open marker file to look for bad shutdowns
 	if (!mReadOnly && mRemoveAfterCrash)
 	{
-		char* marker = new char[strlen(mDataFilename) + strlen(".open") + 1];
-		if (!marker)
-		{
-			LL_ERRS("VFS") << "Out of memory in LLVFS::LLVFS()" << LL_ENDL;
-			return;
-		}
-		sprintf(marker, "%s.open", mDataFilename);	/* Flawfinder: ignore */
+		std::string marker = mDataFilename + ".open";
 		LLFILE* marker_fp = LLFile::fopen(marker, "w");	/* Flawfinder: ignore */
 		if (marker_fp)
 		{
 			fclose(marker_fp);
 			marker_fp = NULL;
 		}
-		delete [] marker;
-		marker = NULL;
 	}
 
 	LL_WARNS("VFS") << "Using index file " << mIndexFilename << LL_ENDL;
@@ -640,23 +602,10 @@ LLVFS::~LLVFS()
 	// Remove marker file
 	if (!mReadOnly && mRemoveAfterCrash)
 	{
-		char* marker_file = new char[strlen(mDataFilename) + strlen(".open") + 1];
-		if (marker_file == NULL)
-		{
-			LL_ERRS("VFS") << "Memory Allocation Failure" << LL_ENDL;
-			return;
-		}
-		sprintf(marker_file, "%s.open", mDataFilename);	/* Flawfinder: ignore */
-		LLFile::remove(marker_file);
-		delete [] marker_file;
-		marker_file = NULL;
+		std::string marker = mDataFilename + ".open";
+		LLFile::remove(marker);
 	}
 
-	delete[] mIndexFilename;
-	mIndexFilename = NULL;
-	delete[] mDataFilename;
-	mDataFilename = NULL;
-
 	delete mDataMutex;
 }
 
@@ -2042,31 +1991,30 @@ void LLVFS::dumpStatistics()
 }
 
 // Debug Only!
-LLString get_extension(LLAssetType::EType type)
+std::string get_extension(LLAssetType::EType type)
 {
-	LLString extension;
+	std::string extension;
 	switch(type)
 	{
-	  case LLAssetType::AT_TEXTURE:
-		extension = ".j2c";
+	case LLAssetType::AT_TEXTURE:
+		extension = ".jp2";	// formerly ".j2c"
 		break;
-	  case LLAssetType::AT_SOUND:
+	case LLAssetType::AT_SOUND:
 		extension = ".ogg";
 		break;
-	  case LLAssetType::AT_SOUND_WAV:
+	case LLAssetType::AT_SOUND_WAV:
 		extension = ".wav";
 		break;
-	  case LLAssetType::AT_TEXTURE_TGA:
+	case LLAssetType::AT_TEXTURE_TGA:
 		extension = ".tga";
 		break;
-	  case LLAssetType::AT_IMAGE_JPEG:
-		extension = ".jpeg";
-		break;
-	  case LLAssetType::AT_ANIMATION:
+	case LLAssetType::AT_ANIMATION:
 		extension = ".lla";
 		break;
-	  default:
-		extension = ".data";
+	default:
+		// Just use the asset server filename extension in most cases
+		extension += ".";
+		extension += LLAssetType::lookup(type);
 		break;
 	}
 	return extension;
@@ -2085,7 +2033,7 @@ void LLVFS::listFiles()
 		if (length != BLOCK_LENGTH_INVALID && size > 0)
 		{
 			LLUUID id = file_spec.mFileID;
-			LLString extension = get_extension(file_spec.mFileType);
+			std::string extension = get_extension(file_spec.mFileType);
 			llinfos << " File: " << id
 					<< " Type: " << LLAssetType::getDesc(file_spec.mFileType)
 					<< " Size: " << size
@@ -2101,6 +2049,7 @@ void LLVFS::dumpFiles()
 {
 	lockData();
 	
+	S32 files_extracted = 0;
 	for (fileblock_map::iterator it = mFileBlocks.begin(); it != mFileBlocks.end(); ++it)
 	{
 		LLVFSFileSpecifier file_spec = it->first;
@@ -2117,17 +2066,20 @@ void LLVFS::dumpFiles()
 			getData(id, type, buffer, 0, size);
 			lockData();
 			
-			LLString extension = get_extension(type);
-			LLString filename = id.asString() + extension;
+			std::string extension = get_extension(type);
+			std::string filename = id.asString() + extension;
 			llinfos << " Writing " << filename << llendl;
 			apr_file_t* file = ll_apr_file_open(filename, LL_APR_WB);
 			ll_apr_file_write(file, buffer, size);
 			apr_file_close(file);
 			delete[] buffer;
+			files_extracted++;
 		}
 	}
 	
 	unlockData();
+
+	llinfos << "Extracted " << files_extracted << " files out of " << mFileBlocks.size() << llendl;
 }
 
 //============================================================================
@@ -2135,7 +2087,7 @@ void LLVFS::dumpFiles()
 //============================================================================
 
 // static
-LLFILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock)
+LLFILE *LLVFS::openAndLock(const std::string& filename, const char* mode, BOOL read_lock)
 {
 #if LL_WINDOWS
     	
@@ -2153,7 +2105,7 @@ LLFILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_loc
         fl.l_start = 0;
         fl.l_len = 1;
 #else // !LL_SOLARIS
-	if (strstr(mode, "w"))
+	if (strchr(mode, 'w') != NULL)
 	{
 		fp = LLFile::fopen(filename, "rb");	/* Flawfinder: ignore */
 		if (fp)
diff --git a/linden/indra/llvfs/llvfs.h b/linden/indra/llvfs/llvfs.h
index 7465bb4..06015b6 100644
--- a/linden/indra/llvfs/llvfs.h
+++ b/linden/indra/llvfs/llvfs.h
@@ -78,7 +78,7 @@ class LLVFS
 {
 public:
 	// Pass 0 to not presize
-	LLVFS(const char *index_filename, const char *data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash);
+	LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash);
 	~LLVFS();
 
 	BOOL isValid() const			{ return (VFSVALID_OK == mValid); }
@@ -131,8 +131,8 @@ protected:
 	void sync(LLVFSFileBlock *block, BOOL remove = FALSE);
 	void presizeDataFile(const U32 size);
 
-	static LLFILE *openAndLock(const char *filename, const char *mode, BOOL read_lock);
-	static void unlockAndClose(LLFILE *fp);
+	static LLFILE *openAndLock(const std::string& filename, const char* mode, BOOL read_lock);
+	static void unlockAndClose(FILE *fp);
 	
 	// Can initiate LRU-based file removal to make space.
 	// The immune file block will not be removed.
@@ -158,8 +158,8 @@ protected:
 
 	std::deque<S32> mIndexHoles;
 
-	char *mIndexFilename;
-	char *mDataFilename;
+	std::string mIndexFilename;
+	std::string mDataFilename;
 	BOOL mReadOnly;
 
 	EVFSValid mValid;
diff --git a/linden/indra/llvfs/llvfs.vcproj b/linden/indra/llvfs/llvfs.vcproj
deleted file mode 100644
index 85f5617..0000000
--- a/linden/indra/llvfs/llvfs.vcproj
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llvfs"
-	ProjectGUID="{D37774F4-253D-4760-BF64-372A943224A1}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\lldir.cpp">
-			</File>
-			<File
-				RelativePath=".\lldir_win32.cpp">
-			</File>
-			<File
-				RelativePath=".\lllfsthread.cpp">
-			</File>
-			<File
-				RelativePath=".\llvfile.cpp">
-			</File>
-			<File
-				RelativePath=".\llvfs.cpp">
-			</File>
-			<File
-				RelativePath=".\llvfsthread.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\lldir.h">
-			</File>
-			<File
-				RelativePath=".\lldir_win32.h">
-			</File>
-			<File
-				RelativePath=".\lllfsthread.h">
-			</File>
-			<File
-				RelativePath=".\llvfile.h">
-			</File>
-			<File
-				RelativePath=".\llvfs.h">
-			</File>
-			<File
-				RelativePath=".\llvfsthread.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llvfs/llvfs_vc8.vcproj b/linden/indra/llvfs/llvfs_vc8.vcproj
deleted file mode 100644
index 20ed299..0000000
--- a/linden/indra/llvfs/llvfs_vc8.vcproj
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llvfs"
-	ProjectGUID="{D37774F4-253D-4760-BF64-372A943224A1}"
-	RootNamespace="llvfs"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lldir.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldir_win32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllfsthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfsthread.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\lldir.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldir_win32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllfsthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfsthread.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llvfs/llvfs_vc9.vcproj b/linden/indra/llvfs/llvfs_vc9.vcproj
deleted file mode 100644
index 97045e2..0000000
--- a/linden/indra/llvfs/llvfs_vc9.vcproj
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llvfs"
-	ProjectGUID="{D37774F4-253D-4760-BF64-372A943224A1}"
-	RootNamespace="llvfs"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llvfs.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lldir.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldir_win32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllfsthread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfsthread.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\lldir.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldir_win32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllfsthread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvfsthread.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llvfs/llvfsthread.cpp b/linden/indra/llvfs/llvfsthread.cpp
index 92bf3dd..ff27475 100644
--- a/linden/indra/llvfs/llvfsthread.cpp
+++ b/linden/indra/llvfs/llvfsthread.cpp
@@ -30,7 +30,6 @@
  */
 
 #include "linden_common.h"
-#include "llmath.h"
 #include "llvfsthread.h"
 #include "llstl.h"
 
diff --git a/linden/indra/llvfs/llvfsthread.h b/linden/indra/llvfs/llvfsthread.h
index 0dc818a..5f1c6ac 100644
--- a/linden/indra/llvfs/llvfsthread.h
+++ b/linden/indra/llvfs/llvfsthread.h
@@ -87,9 +87,9 @@ public:
 		}
 		std::string getFilename()
 		{
-			char tbuf[40];	/* Flawfinder: ignore */
-			mFileID.toString(tbuf);
-			return std::string(tbuf);
+			std::string tstring;
+			mFileID.toString(tstring);
+			return tstring;
 		}
 		
 		/*virtual*/ bool processRequest();
diff --git a/linden/indra/llwindow/CMakeLists.txt b/linden/indra/llwindow/CMakeLists.txt
new file mode 100644
index 0000000..95e315f
--- /dev/null
+++ b/linden/indra/llwindow/CMakeLists.txt
@@ -0,0 +1,147 @@
+# -*- cmake -*-
+#
+# Compared to other libraries, compiling this one is a mess.  The
+# reason is that we have several source files that have two different
+# sets of behaviour, depending on whether they're intended to be part
+# of the viewer or the map server.
+#
+# Unfortunately, the affected code is a rat's nest of #ifdefs, so it's
+# easier to play compilation tricks than to actually fix the problem.
+
+project(llwindow)
+
+include(00-Common)
+include(DirectX)
+include(LLCommon)
+include(LLImage)
+include(LLMath)
+include(LLRender)
+include(LLVFS)
+include(LLWindow)
+include(LLXML)
+include(Mozlib)
+include(UI)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLRENDER_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llwindow_SOURCE_FILES
+    llkeyboard.cpp
+    llwindowheadless.cpp
+    )
+
+set(llwindows_HEADER_FILES
+    CMakeLists.txt
+
+    llkeyboard.h
+    llwindowheadless.h
+    )
+
+set(viewer_SOURCE_FILES
+    llwindow.cpp
+    )
+
+set(viewer_HEADER_FILES
+    llwindow.h
+    llpreeditor.h
+    llmousehandler.h
+    )
+
+if (DARWIN)
+  list(APPEND llwindow_SOURCE_FILES
+    llkeyboardmacosx.cpp
+    llwindowmacosx.cpp
+    llwindowmacosx-objc.mm
+    )
+  list(APPEND llwindow_HEADER_FILES
+    llkeyboardmacosx.h
+    llwindowmacosx.h
+    llwindowmacosx-objc.h
+    )
+
+  # We use a bunch of deprecated system APIs.
+  set_source_files_properties(
+      llkeyboardmacosx.cpp
+      llwindowmacosx.cpp
+      PROPERTIES
+      COMPILE_FLAGS "-Wno-deprecated-declarations -fpascal-strings"
+      )
+endif (DARWIN)
+
+if (LINUX)
+  list(APPEND viewer_SOURCE_FILES 
+       llkeyboardsdl.cpp 
+       llwindowsdl.cpp
+       )
+  list(APPEND viewer_HEADER_FILES
+       llkeyboardsdl.h
+       llwindowsdl.h
+       )
+endif (LINUX)
+
+if (WINDOWS)
+  list(APPEND llwindow_SOURCE_FILES
+       llwindowwin32.cpp
+       lldxhardware.cpp
+       llkeyboardwin32.cpp
+       )
+  list(APPEND llwindow_HEADER_FILES
+       llwindowwin32.h
+       lldxhardware.h
+       llkeyboardwin32.h
+       )
+endif (WINDOWS)
+
+if (SOLARIS)
+  list(APPEND llwindow_SOURCE_FILES
+       llwindowsolaris.cpp
+       )
+  list(APPEND llwindow_HEADER_FILES
+       llwindowsolaris.h
+       )
+endif (SOLARIS)
+
+set_source_files_properties(${llwindow_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+if (SERVER AND NOT WINDOWS AND NOT DARWIN)
+  set(server_SOURCE_FILES
+       llwindowmesaheadless.cpp
+       )
+  set(server_HEADER_FILES
+       llwindowmesaheadless.h
+       )
+  copy_server_sources(
+      llwindow
+      )
+
+
+  set_source_files_properties(
+    ${server_SOURCE_FILES}
+    PROPERTIES
+    COMPILE_FLAGS "-DLL_MESA=1 -DLL_MESA_HEADLESS=1"
+    )
+  add_library (llwindowheadless
+    ${llwindow_SOURCE_FILES}
+    ${server_SOURCE_FILES}
+    )
+endif (SERVER AND NOT WINDOWS AND NOT DARWIN)
+
+if (llwindow_HEADER_FILES)
+  list(APPEND llwindow_SOURCE_FILES ${llwindow_HEADER_FILES})
+endif (llwindow_HEADER_FILES)
+  list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
+
+if (VIEWER)
+  add_library (llwindow
+    ${llwindow_SOURCE_FILES}
+    ${viewer_SOURCE_FILES}
+    )
+endif (VIEWER)
diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h
new file mode 100644
index 0000000..b936b5d
--- /dev/null
+++ b/linden/indra/llwindow/GL/glh_extensions.h
@@ -0,0 +1,207 @@
+/*
+ *  glh_extensions.h
+ *  From nVidia Corporation, downloaded 2006-12-18 from:
+ *  http://developer.nvidia.com/attach/8196
+ *  ("NVParse Library with Source (.zip) (2390 KB)")
+ *
+ *  License (quoted from license_info.txt in aforementioned file):
+ *  "The files bison.exe, bison.simple, and flex.exe are covered by
+ *  the GPL.  All other files in this distribution can be used however
+ *  you want."
+ */
+
+#ifndef GLH_EXTENSIONS
+#define GLH_EXTENSIONS
+
+#include <string.h>
+#include <stdio.h>
+
+#ifdef _WIN32
+# include <windows.h>
+#endif
+
+#ifndef __APPLE__
+#include <GL/gl.h>
+#endif
+
+#ifdef _WIN32
+# include "GL/wglext.h"
+#endif
+
+#define CHECK_MEMORY(ptr) \
+    if (NULL == ptr) { \
+		printf("Error allocating memory in file %s, line %d\n", __FILE__, __LINE__); \
+		exit(-1); \
+	}
+
+#ifdef GLH_EXT_SINGLE_FILE
+#  define GLH_EXTENSIONS_SINGLE_FILE  // have to do this because glh_genext.h unsets GLH_EXT_SINGLE_FILE
+#endif
+
+#include "glh_genext.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef GLH_EXTENSIONS_SINGLE_FILE
+
+class GLHExts
+{
+public:
+	GLHExts()
+	{
+		mSysExts = NULL;
+//		mUnsupportedExts = NULL;
+	}
+	~GLHExts()
+	{
+		if (mSysExts)
+		{
+			free(mSysExts);
+		}
+//		if (mUnsupportedExts)
+//		{
+//			free(mUnsupportedExts);
+//		}
+	}
+	char *mSysExts;
+//	char *mUnsupportedExts;
+};
+
+GLHExts gGLHExts;
+
+static int ExtensionExists(const char* extName, const char* sysExts)
+{
+    char *padExtName = (char*)malloc(strlen(extName) + 2);
+    strcat(strcpy(padExtName, extName), " ");
+
+	if (0 == strcmp(extName, "GL_VERSION_1_2")) {
+		const char *version = (const char*)glGetString(GL_VERSION);
+		if (strstr(version, "1.0") == version || strstr(version, "1.1") == version) {
+			return FALSE;
+		} else {
+			return TRUE;
+		}
+	}
+    if (strstr(sysExts, padExtName)) {
+		free(padExtName);
+        return TRUE;
+    } else {
+		free(padExtName);
+        return FALSE;
+    }
+}
+
+static const char* EatWhiteSpace(const char *str)
+{
+	for (; *str && (' ' == *str || '\t' == *str || '\n' == *str); str++);
+	return str;
+}
+
+static const char* EatNonWhiteSpace(const char *str)
+{
+	for (; *str && (' ' != *str && '\t' != *str && '\n' != *str); str++);
+	return str;
+}
+
+
+int glh_init_extensions(const char *origReqExts)
+{
+	// Length of requested extensions string
+	unsigned reqExtsLen;
+	char *reqExts;
+	// Ptr for individual extensions within reqExts
+	char *reqExt;
+	int success = TRUE;
+
+	// build space-padded extension string
+	if (NULL == gGLHExts.mSysExts) {
+		const char *extensions = (const char*)glGetString(GL_EXTENSIONS);
+		int sysExtsLen = (int)strlen(extensions);
+		const char *winsys_extensions = 0;		
+		int winsysExtsLen = 0;
+#ifdef _WIN32
+		{
+			PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB = 0;
+			wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
+			if(wglGetExtensionsStringARB)
+			{
+				winsys_extensions = wglGetExtensionsStringARB(wglGetCurrentDC());
+				winsysExtsLen = (S32)strlen(winsys_extensions);
+			}
+		}
+#endif
+		// Add 2 bytes, one for padding space, one for terminating NULL
+		gGLHExts.mSysExts = (char*)malloc(sysExtsLen + winsysExtsLen + 3);
+		CHECK_MEMORY(gGLHExts.mSysExts);
+		strcpy(gGLHExts.mSysExts, extensions);
+		gGLHExts.mSysExts[sysExtsLen] = ' ';
+		gGLHExts.mSysExts[sysExtsLen + 1] = 0;
+		if (winsysExtsLen)
+		{
+			strcat(gGLHExts.mSysExts, winsys_extensions);
+		}
+		gGLHExts.mSysExts[sysExtsLen + 1 + winsysExtsLen] = ' ';
+		gGLHExts.mSysExts[sysExtsLen + 1 + winsysExtsLen + 1] = 0;
+	}
+
+	if (NULL == origReqExts)
+	{
+		return TRUE;
+	}
+	reqExts = strdup(origReqExts);
+	reqExtsLen = (S32)strlen(reqExts);
+	/*
+	if (NULL == gGLHExts.mUnsupportedExts)
+	{
+		gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1);
+	}
+	else if (reqExtsLen > strlen(gGLHExts.mUnsupportedExts))
+	{
+		gGLHExts.mUnsupportedExts = (char*)realloc(gGLHExts.mUnsupportedExts, reqExtsLen + 1);
+	}
+	CHECK_MEMORY(gGLHExts.mUnsupportedExts);
+	*gGLHExts.mUnsupportedExts = 0;
+	*/
+
+	// Parse requested extension list
+	for (reqExt = reqExts;
+		(reqExt = (char*)EatWhiteSpace(reqExt)) && *reqExt;
+		reqExt = (char*)EatNonWhiteSpace(reqExt))
+	{
+		char *extEnd = (char*)EatNonWhiteSpace(reqExt);
+		char saveChar = *extEnd;
+		*extEnd = (char)0;
+		
+		if (!ExtensionExists(reqExt, gGLHExts.mSysExts) ||
+			!glh_init_extension(reqExt)) {
+			/*
+			// add reqExt to end of unsupportedExts
+			strcat(gGLHExts.mUnsupportedExts, reqExt);
+			strcat(gGLHExts.mUnsupportedExts, " ");
+			*/
+			success = FALSE;
+		}
+		*extEnd = saveChar;
+	}
+	free(reqExts);
+	return success;
+}
+
+const char* glh_get_unsupported_extensions()
+{
+	return "";
+//	return (const char*)gGLHExts.mUnsupportedExts;
+}
+
+#else
+int glh_init_extensions(const char *origReqExts);
+const char* glh_get_unsupported_extensions();
+#endif /* GLH_EXT_SINGLE_FILE */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GLH_EXTENSIONS */
diff --git a/linden/indra/llwindow/GL/glh_genext.h b/linden/indra/llwindow/GL/glh_genext.h
new file mode 100644
index 0000000..8d42025
--- /dev/null
+++ b/linden/indra/llwindow/GL/glh_genext.h
@@ -0,0 +1,1671 @@
+/*
+ *  glh_genext.h
+ *  From nVidia Corporation, downloaded 2006-12-18 from:
+ *  http://developer.nvidia.com/attach/8196
+ *  ("NVParse Library with Source (.zip) (2390 KB)")
+ *
+ *  License (quoted from license_info.txt in aforementioned file):
+ *  "The files bison.exe, bison.simple, and flex.exe are covered by
+ *  the GPL.  All other files in this distribution can be used however
+ *  you want."
+ */
+
+/* File generated by extgen.cpp -- do not modify */
+#ifndef GLH_GENEXT_H
+#define GLH_GENEXT_H
+
+// MBW -- None of this is necessary on Mac OS.
+#ifndef __APPLE__
+
+#include <GL/gl.h>
+#include <GL/glext.h>
+
+#ifdef _WIN32 /* supports windows, x -- need to generalize */
+#  include <GL/wglext.h>
+#  define GLH_EXT_GET_PROC_ADDRESS(p)   wglGetProcAddress(p) 
+#else if GLX_VERSION_1_3
+#  include <GL/glxext.h>
+#  define GLH_EXT_GET_PROC_ADDRESS(p)   glXGetProcAddressARB(p) 
+#endif
+
+#ifdef GLH_EXT_SINGLE_FILE
+	#define GLH_EXTERN
+ #define GLH_INITIALIZER = 0
+#else
+	#define GLH_EXTERN extern
+ #define GLH_INITIALIZER
+#endif
+
+#define GLH__PREPROCESSOR_GYMNASTICS2(a,b) a##b
+#define GLH__PREPROCESSOR_GYMNASTICS(a,b) GLH__PREPROCESSOR_GYMNASTICS2(a,b)
+
+#ifndef GLH_EXT_PREFIX
+# define GLH_EXT_NAME(a) a
+#else
+# define GLH_EXT_NAME(a) GLH__PREPROCESSOR_GYMNASTICS(GLH_EXT_PREFIX,a)
+#endif
+
+#ifndef _WIN32
+# ifndef GLH_CORE_1_2_PREFIX
+#  define GLH_CORE_1_2_PREFIX _
+# endif
+#endif
+
+#ifndef GLH_CORE_1_2_PREFIX
+# define GLH_CORE_1_2_NAME(a) a
+#else
+# define GLH_CORE_1_2_NAME(a) GLH__PREPROCESSOR_GYMNASTICS(GLH_CORE_1_2_PREFIX,a)
+#endif
+
+#ifdef GL_ARB_multitexture
+    GLH_EXTERN PFNGLMULTITEXCOORD1DARBPROC GLH_EXT_NAME(glMultiTexCoord1dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD1DVARBPROC GLH_EXT_NAME(glMultiTexCoord1dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD1FARBPROC GLH_EXT_NAME(glMultiTexCoord1fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD1FVARBPROC GLH_EXT_NAME(glMultiTexCoord1fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD1IARBPROC GLH_EXT_NAME(glMultiTexCoord1iARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD1IVARBPROC GLH_EXT_NAME(glMultiTexCoord1ivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD1SARBPROC GLH_EXT_NAME(glMultiTexCoord1sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD1SVARBPROC GLH_EXT_NAME(glMultiTexCoord1svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2DARBPROC GLH_EXT_NAME(glMultiTexCoord2dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2DVARBPROC GLH_EXT_NAME(glMultiTexCoord2dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2FARBPROC GLH_EXT_NAME(glMultiTexCoord2fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2FVARBPROC GLH_EXT_NAME(glMultiTexCoord2fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2IARBPROC GLH_EXT_NAME(glMultiTexCoord2iARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2IVARBPROC GLH_EXT_NAME(glMultiTexCoord2ivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2SARBPROC GLH_EXT_NAME(glMultiTexCoord2sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD2SVARBPROC GLH_EXT_NAME(glMultiTexCoord2svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3DARBPROC GLH_EXT_NAME(glMultiTexCoord3dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3DVARBPROC GLH_EXT_NAME(glMultiTexCoord3dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3FARBPROC GLH_EXT_NAME(glMultiTexCoord3fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3FVARBPROC GLH_EXT_NAME(glMultiTexCoord3fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3IARBPROC GLH_EXT_NAME(glMultiTexCoord3iARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3IVARBPROC GLH_EXT_NAME(glMultiTexCoord3ivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3SARBPROC GLH_EXT_NAME(glMultiTexCoord3sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD3SVARBPROC GLH_EXT_NAME(glMultiTexCoord3svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4DARBPROC GLH_EXT_NAME(glMultiTexCoord4dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4DVARBPROC GLH_EXT_NAME(glMultiTexCoord4dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4FARBPROC GLH_EXT_NAME(glMultiTexCoord4fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4FVARBPROC GLH_EXT_NAME(glMultiTexCoord4fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4IARBPROC GLH_EXT_NAME(glMultiTexCoord4iARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4IVARBPROC GLH_EXT_NAME(glMultiTexCoord4ivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4SARBPROC GLH_EXT_NAME(glMultiTexCoord4sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTITEXCOORD4SVARBPROC GLH_EXT_NAME(glMultiTexCoord4svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLACTIVETEXTUREARBPROC GLH_EXT_NAME(glActiveTextureARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCLIENTACTIVETEXTUREARBPROC GLH_EXT_NAME(glClientActiveTextureARB) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_ARB_texture_border_clamp
+#endif
+
+#ifdef GL_ARB_texture_compression
+    GLH_EXTERN PFNGLCOMPRESSEDTEXIMAGE3DARBPROC GLH_EXT_NAME(glCompressedTexImage3DARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMPRESSEDTEXIMAGE2DARBPROC GLH_EXT_NAME(glCompressedTexImage2DARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMPRESSEDTEXIMAGE1DARBPROC GLH_EXT_NAME(glCompressedTexImage1DARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC GLH_EXT_NAME(glCompressedTexSubImage3DARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC GLH_EXT_NAME(glCompressedTexSubImage2DARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC GLH_EXT_NAME(glCompressedTexSubImage1DARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GLH_EXT_NAME(glGetCompressedTexImageARB) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_ARB_texture_cube_map
+#endif
+
+#ifdef GL_ARB_transpose_matrix
+    GLH_EXTERN PFNGLLOADTRANSPOSEMATRIXFARBPROC GLH_EXT_NAME(glLoadTransposeMatrixfARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLLOADTRANSPOSEMATRIXDARBPROC GLH_EXT_NAME(glLoadTransposeMatrixdARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTTRANSPOSEMATRIXFARBPROC GLH_EXT_NAME(glMultTransposeMatrixfARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMULTTRANSPOSEMATRIXDARBPROC GLH_EXT_NAME(glMultTransposeMatrixdARB) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_ARB_vertex_program
+    GLH_EXTERN PFNGLVERTEXATTRIB1SARBPROC GLH_EXT_NAME(glVertexAttrib1sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1FARBPROC GLH_EXT_NAME(glVertexAttrib1fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1DARBPROC GLH_EXT_NAME(glVertexAttrib1dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2SARBPROC GLH_EXT_NAME(glVertexAttrib2sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2FARBPROC GLH_EXT_NAME(glVertexAttrib2fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2DARBPROC GLH_EXT_NAME(glVertexAttrib2dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3SARBPROC GLH_EXT_NAME(glVertexAttrib3sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3FARBPROC GLH_EXT_NAME(glVertexAttrib3fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3DARBPROC GLH_EXT_NAME(glVertexAttrib3dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4SARBPROC GLH_EXT_NAME(glVertexAttrib4sARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4FARBPROC GLH_EXT_NAME(glVertexAttrib4fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4DARBPROC GLH_EXT_NAME(glVertexAttrib4dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4NUBARBPROC GLH_EXT_NAME(glVertexAttrib4NubARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1SVARBPROC GLH_EXT_NAME(glVertexAttrib1svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1FVARBPROC GLH_EXT_NAME(glVertexAttrib1fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1DVARBPROC GLH_EXT_NAME(glVertexAttrib1dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2SVARBPROC GLH_EXT_NAME(glVertexAttrib2svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2FVARBPROC GLH_EXT_NAME(glVertexAttrib2fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2DVARBPROC GLH_EXT_NAME(glVertexAttrib2dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3SVARBPROC GLH_EXT_NAME(glVertexAttrib3svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3FVARBPROC GLH_EXT_NAME(glVertexAttrib3fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3DVARBPROC GLH_EXT_NAME(glVertexAttrib3dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4BVARBPROC GLH_EXT_NAME(glVertexAttrib4bvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4SVARBPROC GLH_EXT_NAME(glVertexAttrib4svARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4IVARBPROC GLH_EXT_NAME(glVertexAttrib4ivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4UBVARBPROC GLH_EXT_NAME(glVertexAttrib4ubvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4USVARBPROC GLH_EXT_NAME(glVertexAttrib4usvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4UIVARBPROC GLH_EXT_NAME(glVertexAttrib4uivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4FVARBPROC GLH_EXT_NAME(glVertexAttrib4fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4DVARBPROC GLH_EXT_NAME(glVertexAttrib4dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4NBVARBPROC GLH_EXT_NAME(glVertexAttrib4NbvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4NSVARBPROC GLH_EXT_NAME(glVertexAttrib4NsvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4NIVARBPROC GLH_EXT_NAME(glVertexAttrib4NivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4NUBVARBPROC GLH_EXT_NAME(glVertexAttrib4NubvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4NUSVARBPROC GLH_EXT_NAME(glVertexAttrib4NusvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4NUIVARBPROC GLH_EXT_NAME(glVertexAttrib4NuivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBPOINTERARBPROC GLH_EXT_NAME(glVertexAttribPointerARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLENABLEVERTEXATTRIBARRAYARBPROC GLH_EXT_NAME(glEnableVertexAttribArrayARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLDISABLEVERTEXATTRIBARRAYARBPROC GLH_EXT_NAME(glDisableVertexAttribArrayARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMSTRINGARBPROC GLH_EXT_NAME(glProgramStringARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLBINDPROGRAMARBPROC GLH_EXT_NAME(glBindProgramARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLDELETEPROGRAMSARBPROC GLH_EXT_NAME(glDeleteProgramsARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGENPROGRAMSARBPROC GLH_EXT_NAME(glGenProgramsARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4DARBPROC GLH_EXT_NAME(glProgramEnvParameter4dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4DVARBPROC GLH_EXT_NAME(glProgramEnvParameter4dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4FARBPROC GLH_EXT_NAME(glProgramEnvParameter4fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4FVARBPROC GLH_EXT_NAME(glProgramEnvParameter4fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4DARBPROC GLH_EXT_NAME(glProgramLocalParameter4dARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4DVARBPROC GLH_EXT_NAME(glProgramLocalParameter4dvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4FARBPROC GLH_EXT_NAME(glProgramLocalParameter4fARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4FVARBPROC GLH_EXT_NAME(glProgramLocalParameter4fvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMENVPARAMETERDVARBPROC GLH_EXT_NAME(glGetProgramEnvParameterdvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMENVPARAMETERFVARBPROC GLH_EXT_NAME(glGetProgramEnvParameterfvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC GLH_EXT_NAME(glGetProgramLocalParameterdvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC GLH_EXT_NAME(glGetProgramLocalParameterfvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMIVARBPROC GLH_EXT_NAME(glGetProgramivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMSTRINGARBPROC GLH_EXT_NAME(glGetProgramStringARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBDVARBPROC GLH_EXT_NAME(glGetVertexAttribdvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBFVARBPROC GLH_EXT_NAME(glGetVertexAttribfvARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBIVARBPROC GLH_EXT_NAME(glGetVertexAttribivARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBPOINTERVARBPROC GLH_EXT_NAME(glGetVertexAttribPointervARB) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLISPROGRAMARBPROC GLH_EXT_NAME(glIsProgramARB) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_abgr
+#endif
+
+#ifdef GL_EXT_bgra
+#endif
+
+#ifdef GL_EXT_blend_color
+    GLH_EXTERN PFNGLBLENDCOLOREXTPROC GLH_EXT_NAME(glBlendColorEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_blend_minmax
+    GLH_EXTERN PFNGLBLENDEQUATIONEXTPROC GLH_EXT_NAME(glBlendEquationEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_blend_subtract
+#endif
+
+#ifdef GL_EXT_compiled_vertex_array
+    GLH_EXTERN PFNGLLOCKARRAYSEXTPROC GLH_EXT_NAME(glLockArraysEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLUNLOCKARRAYSEXTPROC GLH_EXT_NAME(glUnlockArraysEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_fog_coord
+    GLH_EXTERN PFNGLFOGCOORDDEXTPROC GLH_EXT_NAME(glFogCoorddEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLFOGCOORDDVEXTPROC GLH_EXT_NAME(glFogCoorddvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLFOGCOORDFEXTPROC GLH_EXT_NAME(glFogCoordfEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLFOGCOORDFVEXTPROC GLH_EXT_NAME(glFogCoordfvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLFOGCOORDPOINTEREXTPROC GLH_EXT_NAME(glFogCoordPointerEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_light_max_exponent
+#endif
+
+#ifdef GL_EXT_packed_pixels
+#endif
+
+#ifdef GL_EXT_paletted_texture
+    GLH_EXTERN PFNGLCOLORSUBTABLEEXTPROC GLH_EXT_NAME(glColorSubTableEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOLORTABLEEXTPROC GLH_EXT_NAME(glColorTableEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOLORTABLEEXTPROC GLH_EXT_NAME(glGetColorTableEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERFVEXTPROC GLH_EXT_NAME(glGetColorTableParameterfvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERIVEXTPROC GLH_EXT_NAME(glGetColorTableParameterivEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_point_parameters
+    GLH_EXTERN PFNGLPOINTPARAMETERFEXTPROC GLH_EXT_NAME(glPointParameterfEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPOINTPARAMETERFVEXTPROC GLH_EXT_NAME(glPointParameterfvEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_rescale_normal
+#endif
+
+#ifdef GL_EXT_secondary_color
+    GLH_EXTERN PFNGLSECONDARYCOLOR3BEXTPROC GLH_EXT_NAME(glSecondaryColor3bEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3BVEXTPROC GLH_EXT_NAME(glSecondaryColor3bvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3DEXTPROC GLH_EXT_NAME(glSecondaryColor3dEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3DVEXTPROC GLH_EXT_NAME(glSecondaryColor3dvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3FEXTPROC GLH_EXT_NAME(glSecondaryColor3fEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3FVEXTPROC GLH_EXT_NAME(glSecondaryColor3fvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3IEXTPROC GLH_EXT_NAME(glSecondaryColor3iEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3IVEXTPROC GLH_EXT_NAME(glSecondaryColor3ivEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3SEXTPROC GLH_EXT_NAME(glSecondaryColor3sEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3SVEXTPROC GLH_EXT_NAME(glSecondaryColor3svEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3UBEXTPROC GLH_EXT_NAME(glSecondaryColor3ubEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3UBVEXTPROC GLH_EXT_NAME(glSecondaryColor3ubvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3UIEXTPROC GLH_EXT_NAME(glSecondaryColor3uiEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3UIVEXTPROC GLH_EXT_NAME(glSecondaryColor3uivEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3USEXTPROC GLH_EXT_NAME(glSecondaryColor3usEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLOR3USVEXTPROC GLH_EXT_NAME(glSecondaryColor3usvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSECONDARYCOLORPOINTEREXTPROC GLH_EXT_NAME(glSecondaryColorPointerEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_separate_specular_color
+#endif
+
+#ifdef GL_EXT_shared_texture_palette
+#endif
+
+#ifdef GL_EXT_stencil_wrap
+#endif
+
+#ifdef GL_EXT_texture_compression_s3tc
+#endif
+
+#ifdef GL_EXT_texture_cube_map
+#endif
+
+#ifdef GL_EXT_texture_edge_clamp
+#endif
+
+#ifdef GL_EXT_texture_env_add
+#endif
+
+#ifdef GL_EXT_texture_env_combine
+#endif
+
+#ifdef GL_EXT_texture_filter_anisotropic
+#endif
+
+#ifdef GL_EXT_texture_lod_bias
+#endif
+
+#ifdef GL_EXT_texture_object
+    GLH_EXTERN PFNGLARETEXTURESRESIDENTEXTPROC GLH_EXT_NAME(glAreTexturesResidentEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLBINDTEXTUREEXTPROC GLH_EXT_NAME(glBindTextureEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLDELETETEXTURESEXTPROC GLH_EXT_NAME(glDeleteTexturesEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGENTEXTURESEXTPROC GLH_EXT_NAME(glGenTexturesEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLISTEXTUREEXTPROC GLH_EXT_NAME(glIsTextureEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPRIORITIZETEXTURESEXTPROC GLH_EXT_NAME(glPrioritizeTexturesEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_texture3D
+    GLH_EXTERN PFNGLTEXIMAGE3DEXTPROC GLH_EXT_NAME(glTexImage3DEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_vertex_array
+    GLH_EXTERN PFNGLARRAYELEMENTEXTPROC GLH_EXT_NAME(glArrayElementEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOLORPOINTEREXTPROC GLH_EXT_NAME(glColorPointerEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLEDGEFLAGPOINTEREXTPROC GLH_EXT_NAME(glEdgeFlagPointerEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPOINTERVEXTPROC GLH_EXT_NAME(glGetPointervEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLINDEXPOINTEREXTPROC GLH_EXT_NAME(glIndexPointerEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLNORMALPOINTEREXTPROC GLH_EXT_NAME(glNormalPointerEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLTEXCOORDPOINTEREXTPROC GLH_EXT_NAME(glTexCoordPointerEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXPOINTEREXTPROC GLH_EXT_NAME(glVertexPointerEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLDRAWARRAYSEXTPROC GLH_EXT_NAME(glDrawArraysEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_EXT_vertex_weighting
+    GLH_EXTERN PFNGLVERTEXWEIGHTFEXTPROC GLH_EXT_NAME(glVertexWeightfEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXWEIGHTFVEXTPROC GLH_EXT_NAME(glVertexWeightfvEXT) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXWEIGHTPOINTEREXTPROC GLH_EXT_NAME(glVertexWeightPointerEXT) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_NV_blend_square
+#endif
+
+#ifdef GL_NV_evaluators
+    GLH_EXTERN PFNGLMAPCONTROLPOINTSNVPROC GLH_EXT_NAME(glMapControlPointsNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMAPPARAMETERIVNVPROC GLH_EXT_NAME(glMapParameterivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLMAPPARAMETERFVNVPROC GLH_EXT_NAME(glMapParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETMAPCONTROLPOINTSNVPROC GLH_EXT_NAME(glGetMapControlPointsNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETMAPPARAMETERIVNVPROC GLH_EXT_NAME(glGetMapParameterivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETMAPPARAMETERFVNVPROC GLH_EXT_NAME(glGetMapParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETMAPATTRIBPARAMETERIVNVPROC GLH_EXT_NAME(glGetMapAttribParameterivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETMAPATTRIBPARAMETERFVNVPROC GLH_EXT_NAME(glGetMapAttribParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLEVALMAPSNVPROC GLH_EXT_NAME(glEvalMapsNV) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_NV_fence
+    GLH_EXTERN PFNGLGENFENCESNVPROC GLH_EXT_NAME(glGenFencesNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLDELETEFENCESNVPROC GLH_EXT_NAME(glDeleteFencesNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLSETFENCENVPROC GLH_EXT_NAME(glSetFenceNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLTESTFENCENVPROC GLH_EXT_NAME(glTestFenceNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLFINISHFENCENVPROC GLH_EXT_NAME(glFinishFenceNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLISFENCENVPROC GLH_EXT_NAME(glIsFenceNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETFENCEIVNVPROC GLH_EXT_NAME(glGetFenceivNV) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_NV_fog_distance
+#endif
+
+#ifdef GL_NV_packed_depth_stencil
+#endif
+
+#ifdef GL_NV_register_combiners
+    GLH_EXTERN PFNGLCOMBINERPARAMETERFVNVPROC GLH_EXT_NAME(glCombinerParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMBINERPARAMETERFNVPROC GLH_EXT_NAME(glCombinerParameterfNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMBINERPARAMETERIVNVPROC GLH_EXT_NAME(glCombinerParameterivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMBINERPARAMETERINVPROC GLH_EXT_NAME(glCombinerParameteriNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMBINERINPUTNVPROC GLH_EXT_NAME(glCombinerInputNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOMBINEROUTPUTNVPROC GLH_EXT_NAME(glCombinerOutputNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLFINALCOMBINERINPUTNVPROC GLH_EXT_NAME(glFinalCombinerInputNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC GLH_EXT_NAME(glGetCombinerInputParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC GLH_EXT_NAME(glGetCombinerInputParameterivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC GLH_EXT_NAME(glGetCombinerOutputParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC GLH_EXT_NAME(glGetCombinerOutputParameterivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC GLH_EXT_NAME(glGetFinalCombinerInputParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC GLH_EXT_NAME(glGetFinalCombinerInputParameterivNV) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_NV_register_combiners2
+    GLH_EXTERN PFNGLCOMBINERSTAGEPARAMETERFVNVPROC GLH_EXT_NAME(glCombinerStageParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC GLH_EXT_NAME(glGetCombinerStageParameterfvNV) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_NV_texgen_reflection
+#endif
+
+#ifdef GL_NV_texture_env_combine4
+#endif
+
+#ifdef GL_NV_texture_rectangle
+#endif
+
+#ifdef GL_NV_texture_shader
+#endif
+
+#ifdef GL_NV_vertex_array_range
+    GLH_EXTERN PFNGLFLUSHVERTEXARRAYRANGENVPROC GLH_EXT_NAME(glFlushVertexArrayRangeNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXARRAYRANGENVPROC GLH_EXT_NAME(glVertexArrayRangeNV) GLH_INITIALIZER;
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLALLOCATEMEMORYNVPROC GLH_EXT_NAME(wglAllocateMemoryNV) GLH_INITIALIZER;
+# endif
+# ifdef GLX_VERSION_1_3
+    GLH_EXTERN PFNGLXALLOCATEMEMORYNVPROC GLH_EXT_NAME(glXAllocateMemoryNV) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLFREEMEMORYNVPROC GLH_EXT_NAME(wglFreeMemoryNV) GLH_INITIALIZER;
+# endif
+# ifdef GLX_VERSION_1_3
+    GLH_EXTERN PFNGLXFREEMEMORYNVPROC GLH_EXT_NAME(glXFreeMemoryNV) GLH_INITIALIZER;
+# endif
+#endif
+
+#ifdef GL_NV_vertex_program
+    GLH_EXTERN PFNGLAREPROGRAMSRESIDENTNVPROC GLH_EXT_NAME(glAreProgramsResidentNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLBINDPROGRAMNVPROC GLH_EXT_NAME(glBindProgramNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLDELETEPROGRAMSNVPROC GLH_EXT_NAME(glDeleteProgramsNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLEXECUTEPROGRAMNVPROC GLH_EXT_NAME(glExecuteProgramNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGENPROGRAMSNVPROC GLH_EXT_NAME(glGenProgramsNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMPARAMETERDVNVPROC GLH_EXT_NAME(glGetProgramParameterdvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMPARAMETERFVNVPROC GLH_EXT_NAME(glGetProgramParameterfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMIVNVPROC GLH_EXT_NAME(glGetProgramivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETPROGRAMSTRINGNVPROC GLH_EXT_NAME(glGetProgramStringNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETTRACKMATRIXIVNVPROC GLH_EXT_NAME(glGetTrackMatrixivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBDVNVPROC GLH_EXT_NAME(glGetVertexAttribdvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBFVNVPROC GLH_EXT_NAME(glGetVertexAttribfvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBIVNVPROC GLH_EXT_NAME(glGetVertexAttribivNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETVERTEXATTRIBPOINTERVNVPROC GLH_EXT_NAME(glGetVertexAttribPointervNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLISPROGRAMNVPROC GLH_EXT_NAME(glIsProgramNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLLOADPROGRAMNVPROC GLH_EXT_NAME(glLoadProgramNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMPARAMETER4DNVPROC GLH_EXT_NAME(glProgramParameter4dNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMPARAMETER4DVNVPROC GLH_EXT_NAME(glProgramParameter4dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMPARAMETER4FNVPROC GLH_EXT_NAME(glProgramParameter4fNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMPARAMETER4FVNVPROC GLH_EXT_NAME(glProgramParameter4fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMPARAMETERS4DVNVPROC GLH_EXT_NAME(glProgramParameters4dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLPROGRAMPARAMETERS4FVNVPROC GLH_EXT_NAME(glProgramParameters4fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLREQUESTRESIDENTPROGRAMSNVPROC GLH_EXT_NAME(glRequestResidentProgramsNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLTRACKMATRIXNVPROC GLH_EXT_NAME(glTrackMatrixNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBPOINTERNVPROC GLH_EXT_NAME(glVertexAttribPointerNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1DNVPROC GLH_EXT_NAME(glVertexAttrib1dNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1DVNVPROC GLH_EXT_NAME(glVertexAttrib1dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1FNVPROC GLH_EXT_NAME(glVertexAttrib1fNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1FVNVPROC GLH_EXT_NAME(glVertexAttrib1fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1SNVPROC GLH_EXT_NAME(glVertexAttrib1sNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB1SVNVPROC GLH_EXT_NAME(glVertexAttrib1svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2DNVPROC GLH_EXT_NAME(glVertexAttrib2dNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2DVNVPROC GLH_EXT_NAME(glVertexAttrib2dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2FNVPROC GLH_EXT_NAME(glVertexAttrib2fNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2FVNVPROC GLH_EXT_NAME(glVertexAttrib2fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2SNVPROC GLH_EXT_NAME(glVertexAttrib2sNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB2SVNVPROC GLH_EXT_NAME(glVertexAttrib2svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3DNVPROC GLH_EXT_NAME(glVertexAttrib3dNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3DVNVPROC GLH_EXT_NAME(glVertexAttrib3dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3FNVPROC GLH_EXT_NAME(glVertexAttrib3fNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3FVNVPROC GLH_EXT_NAME(glVertexAttrib3fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3SNVPROC GLH_EXT_NAME(glVertexAttrib3sNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB3SVNVPROC GLH_EXT_NAME(glVertexAttrib3svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4DNVPROC GLH_EXT_NAME(glVertexAttrib4dNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4DVNVPROC GLH_EXT_NAME(glVertexAttrib4dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4FNVPROC GLH_EXT_NAME(glVertexAttrib4fNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4FVNVPROC GLH_EXT_NAME(glVertexAttrib4fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4SNVPROC GLH_EXT_NAME(glVertexAttrib4sNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4SVNVPROC GLH_EXT_NAME(glVertexAttrib4svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIB4UBVNVPROC GLH_EXT_NAME(glVertexAttrib4ubvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS1DVNVPROC GLH_EXT_NAME(glVertexAttribs1dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS1FVNVPROC GLH_EXT_NAME(glVertexAttribs1fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS1SVNVPROC GLH_EXT_NAME(glVertexAttribs1svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS2DVNVPROC GLH_EXT_NAME(glVertexAttribs2dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS2FVNVPROC GLH_EXT_NAME(glVertexAttribs2fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS2SVNVPROC GLH_EXT_NAME(glVertexAttribs2svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS3DVNVPROC GLH_EXT_NAME(glVertexAttribs3dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS3FVNVPROC GLH_EXT_NAME(glVertexAttribs3fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS3SVNVPROC GLH_EXT_NAME(glVertexAttribs3svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS4DVNVPROC GLH_EXT_NAME(glVertexAttribs4dvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS4FVNVPROC GLH_EXT_NAME(glVertexAttribs4fvNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS4SVNVPROC GLH_EXT_NAME(glVertexAttribs4svNV) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLVERTEXATTRIBS4UBVNVPROC GLH_EXT_NAME(glVertexAttribs4ubvNV) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_SGIS_generate_mipmap
+#endif
+
+#ifdef GL_SGIS_texture_lod
+#endif
+
+#ifdef GL_SGIX_depth_texture
+#endif
+
+#ifdef GL_SGIX_shadow
+#endif
+
+#ifdef GL_VERSION_1_2
+    /* These routines are prefixed by the preprocessor constant
+       GLH_CORE_1_2_PREFIX to avoid colliding with the OpenGL 1.2 namespace. */
+    GLH_EXTERN PFNGLBLENDCOLORPROC GLH_CORE_1_2_NAME(glBlendColor) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLBLENDEQUATIONPROC GLH_CORE_1_2_NAME(glBlendEquation) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLDRAWRANGEELEMENTSPROC GLH_CORE_1_2_NAME(glDrawRangeElements) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOLORTABLEPROC GLH_CORE_1_2_NAME(glColorTable) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOLORTABLEPARAMETERFVPROC GLH_CORE_1_2_NAME(glColorTableParameterfv) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOLORTABLEPARAMETERIVPROC GLH_CORE_1_2_NAME(glColorTableParameteriv) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOPYCOLORTABLEPROC GLH_CORE_1_2_NAME(glCopyColorTable) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOLORTABLEPROC GLH_CORE_1_2_NAME(glGetColorTable) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERFVPROC GLH_CORE_1_2_NAME(glGetColorTableParameterfv) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERIVPROC GLH_CORE_1_2_NAME(glGetColorTableParameteriv) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLTEXIMAGE3DPROC GLH_CORE_1_2_NAME(glTexImage3D) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLTEXSUBIMAGE3DPROC GLH_CORE_1_2_NAME(glTexSubImage3D) GLH_INITIALIZER;
+    GLH_EXTERN PFNGLCOPYTEXSUBIMAGE3DPROC GLH_CORE_1_2_NAME(glCopyTexSubImage3D) GLH_INITIALIZER;
+#endif
+
+#ifdef GL_WIN_swap_hint
+    GLH_EXTERN PFNGLADDSWAPHINTRECTWINPROC GLH_EXT_NAME(glAddSwapHintRectWIN) GLH_INITIALIZER;
+#endif
+
+#ifdef WGL_ARB_pbuffer
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLCREATEPBUFFERARBPROC GLH_EXT_NAME(wglCreatePbufferARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLGETPBUFFERDCARBPROC GLH_EXT_NAME(wglGetPbufferDCARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLRELEASEPBUFFERDCARBPROC GLH_EXT_NAME(wglReleasePbufferDCARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLDESTROYPBUFFERARBPROC GLH_EXT_NAME(wglDestroyPbufferARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLQUERYPBUFFERARBPROC GLH_EXT_NAME(wglQueryPbufferARB) GLH_INITIALIZER;
+# endif
+#endif
+
+#ifdef WGL_ARB_render_texture
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLBINDTEXIMAGEARBPROC GLH_EXT_NAME(wglBindTexImageARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLRELEASETEXIMAGEARBPROC GLH_EXT_NAME(wglReleaseTexImageARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLSETPBUFFERATTRIBARBPROC GLH_EXT_NAME(wglSetPbufferAttribARB) GLH_INITIALIZER;
+# endif
+#endif
+
+#ifdef WGL_ARB_pixel_format
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLGETPIXELFORMATATTRIBIVARBPROC GLH_EXT_NAME(wglGetPixelFormatAttribivARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLGETPIXELFORMATATTRIBFVARBPROC GLH_EXT_NAME(wglGetPixelFormatAttribfvARB) GLH_INITIALIZER;
+# endif
+# ifdef _WIN32
+    GLH_EXTERN PFNWGLCHOOSEPIXELFORMATARBPROC GLH_EXT_NAME(wglChoosePixelFormatARB) GLH_INITIALIZER;
+# endif
+#endif
+
+
+#ifdef GLH_EXT_SINGLE_FILE
+
+int glh_init_extension(const char* extension)
+{
+    if (NULL == extension) {
+        return FALSE;
+#ifdef GL_ARB_multitexture
+    } else if (0 == strcmp(extension, "GL_ARB_multitexture")) {
+        GLH_EXT_NAME(glMultiTexCoord1dARB) = (PFNGLMULTITEXCOORD1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1dARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1dARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord1dvARB) = (PFNGLMULTITEXCOORD1DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1dvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1dvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord1fARB) = (PFNGLMULTITEXCOORD1FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1fARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1fARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord1fvARB) = (PFNGLMULTITEXCOORD1FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1fvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1fvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord1iARB) = (PFNGLMULTITEXCOORD1IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1iARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1iARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord1ivARB) = (PFNGLMULTITEXCOORD1IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1ivARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1ivARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord1sARB) = (PFNGLMULTITEXCOORD1SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1sARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1sARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord1svARB) = (PFNGLMULTITEXCOORD1SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1svARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord1svARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2dARB) = (PFNGLMULTITEXCOORD2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2dARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2dARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2dvARB) = (PFNGLMULTITEXCOORD2DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2dvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2dvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2fARB) = (PFNGLMULTITEXCOORD2FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2fARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2fARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2fvARB) = (PFNGLMULTITEXCOORD2FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2fvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2fvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2iARB) = (PFNGLMULTITEXCOORD2IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2iARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2iARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2ivARB) = (PFNGLMULTITEXCOORD2IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2ivARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2ivARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2sARB) = (PFNGLMULTITEXCOORD2SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2sARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2sARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord2svARB) = (PFNGLMULTITEXCOORD2SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2svARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord2svARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3dARB) = (PFNGLMULTITEXCOORD3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3dARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3dARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3dvARB) = (PFNGLMULTITEXCOORD3DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3dvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3dvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3fARB) = (PFNGLMULTITEXCOORD3FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3fARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3fARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3fvARB) = (PFNGLMULTITEXCOORD3FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3fvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3fvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3iARB) = (PFNGLMULTITEXCOORD3IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3iARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3iARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3ivARB) = (PFNGLMULTITEXCOORD3IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3ivARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3ivARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3sARB) = (PFNGLMULTITEXCOORD3SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3sARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3sARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord3svARB) = (PFNGLMULTITEXCOORD3SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3svARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord3svARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4dARB) = (PFNGLMULTITEXCOORD4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4dARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4dARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4dvARB) = (PFNGLMULTITEXCOORD4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4dvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4dvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4fARB) = (PFNGLMULTITEXCOORD4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4fARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4fARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4fvARB) = (PFNGLMULTITEXCOORD4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4fvARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4fvARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4iARB) = (PFNGLMULTITEXCOORD4IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4iARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4iARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4ivARB) = (PFNGLMULTITEXCOORD4IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4ivARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4ivARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4sARB) = (PFNGLMULTITEXCOORD4SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4sARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4sARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultiTexCoord4svARB) = (PFNGLMULTITEXCOORD4SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4svARB");
+        if (NULL == GLH_EXT_NAME(glMultiTexCoord4svARB))
+            return FALSE;
+        GLH_EXT_NAME(glActiveTextureARB) = (PFNGLACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glActiveTextureARB");
+        if (NULL == GLH_EXT_NAME(glActiveTextureARB))
+            return FALSE;
+        GLH_EXT_NAME(glClientActiveTextureARB) = (PFNGLCLIENTACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glClientActiveTextureARB");
+        if (NULL == GLH_EXT_NAME(glClientActiveTextureARB))
+            return FALSE;
+#endif
+
+#ifdef GL_ARB_texture_border_clamp
+    } else if (0 == strcmp(extension, "GL_ARB_texture_border_clamp")) {
+#endif
+
+#ifdef GL_ARB_texture_compression
+    } else if (0 == strcmp(extension, "GL_ARB_texture_compression")) {
+        GLH_EXT_NAME(glCompressedTexImage3DARB) = (PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexImage3DARB");
+        if (NULL == GLH_EXT_NAME(glCompressedTexImage3DARB))
+            return FALSE;
+        GLH_EXT_NAME(glCompressedTexImage2DARB) = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexImage2DARB");
+        if (NULL == GLH_EXT_NAME(glCompressedTexImage2DARB))
+            return FALSE;
+        GLH_EXT_NAME(glCompressedTexImage1DARB) = (PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexImage1DARB");
+        if (NULL == GLH_EXT_NAME(glCompressedTexImage1DARB))
+            return FALSE;
+        GLH_EXT_NAME(glCompressedTexSubImage3DARB) = (PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexSubImage3DARB");
+        if (NULL == GLH_EXT_NAME(glCompressedTexSubImage3DARB))
+            return FALSE;
+        GLH_EXT_NAME(glCompressedTexSubImage2DARB) = (PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexSubImage2DARB");
+        if (NULL == GLH_EXT_NAME(glCompressedTexSubImage2DARB))
+            return FALSE;
+        GLH_EXT_NAME(glCompressedTexSubImage1DARB) = (PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexSubImage1DARB");
+        if (NULL == GLH_EXT_NAME(glCompressedTexSubImage1DARB))
+            return FALSE;
+        GLH_EXT_NAME(glGetCompressedTexImageARB) = (PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCompressedTexImageARB");
+        if (NULL == GLH_EXT_NAME(glGetCompressedTexImageARB))
+            return FALSE;
+#endif
+
+#ifdef GL_ARB_texture_cube_map
+    } else if (0 == strcmp(extension, "GL_ARB_texture_cube_map")) {
+#endif
+
+#ifdef GL_ARB_transpose_matrix
+    } else if (0 == strcmp(extension, "GL_ARB_transpose_matrix")) {
+        GLH_EXT_NAME(glLoadTransposeMatrixfARB) = (PFNGLLOADTRANSPOSEMATRIXFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glLoadTransposeMatrixfARB");
+        if (NULL == GLH_EXT_NAME(glLoadTransposeMatrixfARB))
+            return FALSE;
+        GLH_EXT_NAME(glLoadTransposeMatrixdARB) = (PFNGLLOADTRANSPOSEMATRIXDARBPROC)GLH_EXT_GET_PROC_ADDRESS("glLoadTransposeMatrixdARB");
+        if (NULL == GLH_EXT_NAME(glLoadTransposeMatrixdARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultTransposeMatrixfARB) = (PFNGLMULTTRANSPOSEMATRIXFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultTransposeMatrixfARB");
+        if (NULL == GLH_EXT_NAME(glMultTransposeMatrixfARB))
+            return FALSE;
+        GLH_EXT_NAME(glMultTransposeMatrixdARB) = (PFNGLMULTTRANSPOSEMATRIXDARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultTransposeMatrixdARB");
+        if (NULL == GLH_EXT_NAME(glMultTransposeMatrixdARB))
+            return FALSE;
+#endif
+
+#ifdef GL_ARB_vertex_program
+    } else if (0 == strcmp(extension, "GL_ARB_vertex_program")) {
+        GLH_EXT_NAME(glVertexAttrib1sARB) = (PFNGLVERTEXATTRIB1SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1sARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1sARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib1fARB) = (PFNGLVERTEXATTRIB1FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1fARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib1dARB) = (PFNGLVERTEXATTRIB1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1dARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib2sARB) = (PFNGLVERTEXATTRIB2SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2sARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2sARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib2fARB) = (PFNGLVERTEXATTRIB2FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2fARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib2dARB) = (PFNGLVERTEXATTRIB2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2dARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib3sARB) = (PFNGLVERTEXATTRIB3SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3sARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3sARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib3fARB) = (PFNGLVERTEXATTRIB3FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3fARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib3dARB) = (PFNGLVERTEXATTRIB3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3dARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4sARB) = (PFNGLVERTEXATTRIB4SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4sARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4sARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4fARB) = (PFNGLVERTEXATTRIB4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4fARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4dARB) = (PFNGLVERTEXATTRIB4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4dARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4NubARB) = (PFNGLVERTEXATTRIB4NUBARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NubARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4NubARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib1svARB) = (PFNGLVERTEXATTRIB1SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1svARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1svARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib1fvARB) = (PFNGLVERTEXATTRIB1FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1fvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib1dvARB) = (PFNGLVERTEXATTRIB1DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1dvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib2svARB) = (PFNGLVERTEXATTRIB2SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2svARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2svARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib2fvARB) = (PFNGLVERTEXATTRIB2FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2fvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib2dvARB) = (PFNGLVERTEXATTRIB2DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2dvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib3svARB) = (PFNGLVERTEXATTRIB3SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3svARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3svARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib3fvARB) = (PFNGLVERTEXATTRIB3FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3fvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib3dvARB) = (PFNGLVERTEXATTRIB3DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3dvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4bvARB) = (PFNGLVERTEXATTRIB4BVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4bvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4bvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4svARB) = (PFNGLVERTEXATTRIB4SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4svARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4svARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4ivARB) = (PFNGLVERTEXATTRIB4IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ivARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4ivARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4ubvARB) = (PFNGLVERTEXATTRIB4UBVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ubvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4ubvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4usvARB) = (PFNGLVERTEXATTRIB4USVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4usvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4usvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4uivARB) = (PFNGLVERTEXATTRIB4UIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4uivARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4uivARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4fvARB) = (PFNGLVERTEXATTRIB4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4fvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4dvARB) = (PFNGLVERTEXATTRIB4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4dvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4NbvARB) = (PFNGLVERTEXATTRIB4NBVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NbvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4NbvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4NsvARB) = (PFNGLVERTEXATTRIB4NSVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NsvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4NsvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4NivARB) = (PFNGLVERTEXATTRIB4NIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NivARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4NivARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4NubvARB) = (PFNGLVERTEXATTRIB4NUBVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NubvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4NubvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4NusvARB) = (PFNGLVERTEXATTRIB4NUSVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NusvARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4NusvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttrib4NuivARB) = (PFNGLVERTEXATTRIB4NUIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NuivARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4NuivARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glVertexAttribPointerARB) = (PFNGLVERTEXATTRIBPOINTERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribPointerARB");
+        if (NULL == GLH_EXT_NAME(glVertexAttribPointerARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glEnableVertexAttribArrayARB) = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glEnableVertexAttribArrayARB");
+        if (NULL == GLH_EXT_NAME(glEnableVertexAttribArrayARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glDisableVertexAttribArrayARB) = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDisableVertexAttribArrayARB");
+        if (NULL == GLH_EXT_NAME(glDisableVertexAttribArrayARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramStringARB) = (PFNGLPROGRAMSTRINGARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramStringARB");
+        if (NULL == GLH_EXT_NAME(glProgramStringARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glBindProgramARB) = (PFNGLBINDPROGRAMARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBindProgramARB");
+        if (NULL == GLH_EXT_NAME(glBindProgramARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glDeleteProgramsARB) = (PFNGLDELETEPROGRAMSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteProgramsARB");
+        if (NULL == GLH_EXT_NAME(glDeleteProgramsARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGenProgramsARB) = (PFNGLGENPROGRAMSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenProgramsARB");
+        if (NULL == GLH_EXT_NAME(glGenProgramsARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramEnvParameter4dARB) = (PFNGLPROGRAMENVPARAMETER4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dARB");
+        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4dARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramEnvParameter4dvARB) = (PFNGLPROGRAMENVPARAMETER4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dvARB");
+        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4dvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramEnvParameter4fARB) = (PFNGLPROGRAMENVPARAMETER4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fARB");
+        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4fARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramEnvParameter4fvARB) = (PFNGLPROGRAMENVPARAMETER4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fvARB");
+        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4fvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramLocalParameter4dARB) = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dARB");
+        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4dARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramLocalParameter4dvARB) = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dvARB");
+        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4dvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramLocalParameter4fARB) = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fARB");
+        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4fARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glProgramLocalParameter4fvARB) = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fvARB");
+        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4fvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetProgramEnvParameterdvARB) = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterdvARB");
+        if (NULL == GLH_EXT_NAME(glGetProgramEnvParameterdvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetProgramEnvParameterfvARB) = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterfvARB");
+        if (NULL == GLH_EXT_NAME(glGetProgramEnvParameterfvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetProgramLocalParameterdvARB) = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterdvARB");
+        if (NULL == GLH_EXT_NAME(glGetProgramLocalParameterdvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetProgramLocalParameterfvARB) = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterfvARB");
+        if (NULL == GLH_EXT_NAME(glGetProgramLocalParameterfvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetProgramivARB) = (PFNGLGETPROGRAMIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramivARB");
+        if (NULL == GLH_EXT_NAME(glGetProgramivARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetProgramStringARB) = (PFNGLGETPROGRAMSTRINGARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramStringARB");
+        if (NULL == GLH_EXT_NAME(glGetProgramStringARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetVertexAttribdvARB) = (PFNGLGETVERTEXATTRIBDVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribdvARB");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribdvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetVertexAttribfvARB) = (PFNGLGETVERTEXATTRIBFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribfvARB");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribfvARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetVertexAttribivARB) = (PFNGLGETVERTEXATTRIBIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribivARB");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribivARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glGetVertexAttribPointervARB) = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribPointervARB");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribPointervARB))
+            return GL_FALSE;
+        GLH_EXT_NAME(glIsProgramARB) = (PFNGLISPROGRAMARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsProgramARB");
+        if (NULL == GLH_EXT_NAME(glIsProgramARB))
+            return GL_FALSE;
+#endif
+
+#ifdef GL_EXT_abgr
+    } else if (0 == strcmp(extension, "GL_EXT_abgr")) {
+#endif
+
+#ifdef GL_EXT_bgra
+    } else if (0 == strcmp(extension, "GL_EXT_bgra")) {
+#endif
+
+#ifdef GL_EXT_blend_color
+    } else if (0 == strcmp(extension, "GL_EXT_blend_color")) {
+        GLH_EXT_NAME(glBlendColorEXT) = (PFNGLBLENDCOLOREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendColorEXT");
+        if (NULL == GLH_EXT_NAME(glBlendColorEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_blend_minmax
+    } else if (0 == strcmp(extension, "GL_EXT_blend_minmax")) {
+        GLH_EXT_NAME(glBlendEquationEXT) = (PFNGLBLENDEQUATIONEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendEquationEXT");
+        if (NULL == GLH_EXT_NAME(glBlendEquationEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_blend_subtract
+    } else if (0 == strcmp(extension, "GL_EXT_blend_subtract")) {
+#endif
+
+#ifdef GL_EXT_compiled_vertex_array
+    } else if (0 == strcmp(extension, "GL_EXT_compiled_vertex_array")) {
+        GLH_EXT_NAME(glLockArraysEXT) = (PFNGLLOCKARRAYSEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glLockArraysEXT");
+        if (NULL == GLH_EXT_NAME(glLockArraysEXT))
+            return FALSE;
+        GLH_EXT_NAME(glUnlockArraysEXT) = (PFNGLUNLOCKARRAYSEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glUnlockArraysEXT");
+        if (NULL == GLH_EXT_NAME(glUnlockArraysEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_fog_coord
+    } else if (0 == strcmp(extension, "GL_EXT_fog_coord")) {
+        GLH_EXT_NAME(glFogCoorddEXT) = (PFNGLFOGCOORDDEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoorddEXT");
+        if (NULL == GLH_EXT_NAME(glFogCoorddEXT))
+            return FALSE;
+        GLH_EXT_NAME(glFogCoorddvEXT) = (PFNGLFOGCOORDDVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoorddvEXT");
+        if (NULL == GLH_EXT_NAME(glFogCoorddvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glFogCoordfEXT) = (PFNGLFOGCOORDFEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoordfEXT");
+        if (NULL == GLH_EXT_NAME(glFogCoordfEXT))
+            return FALSE;
+        GLH_EXT_NAME(glFogCoordfvEXT) = (PFNGLFOGCOORDFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoordfvEXT");
+        if (NULL == GLH_EXT_NAME(glFogCoordfvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glFogCoordPointerEXT) = (PFNGLFOGCOORDPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoordPointerEXT");
+        if (NULL == GLH_EXT_NAME(glFogCoordPointerEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_light_max_exponent
+    } else if (0 == strcmp(extension, "GL_EXT_light_max_exponent")) {
+#endif
+
+#ifdef GL_EXT_packed_pixels
+    } else if (0 == strcmp(extension, "GL_EXT_packed_pixels")) {
+#endif
+
+#ifdef GL_EXT_paletted_texture
+    } else if (0 == strcmp(extension, "GL_EXT_paletted_texture")) {
+        GLH_EXT_NAME(glColorSubTableEXT) = (PFNGLCOLORSUBTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorSubTableEXT");
+        if (NULL == GLH_EXT_NAME(glColorSubTableEXT))
+            return FALSE;
+        GLH_EXT_NAME(glColorTableEXT) = (PFNGLCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableEXT");
+        if (NULL == GLH_EXT_NAME(glColorTableEXT))
+            return FALSE;
+        GLH_EXT_NAME(glGetColorTableEXT) = (PFNGLGETCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableEXT");
+        if (NULL == GLH_EXT_NAME(glGetColorTableEXT))
+            return FALSE;
+        GLH_EXT_NAME(glGetColorTableParameterfvEXT) = (PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameterfvEXT");
+        if (NULL == GLH_EXT_NAME(glGetColorTableParameterfvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glGetColorTableParameterivEXT) = (PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameterivEXT");
+        if (NULL == GLH_EXT_NAME(glGetColorTableParameterivEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_point_parameters
+    } else if (0 == strcmp(extension, "GL_EXT_point_parameters")) {
+        GLH_EXT_NAME(glPointParameterfEXT) = (PFNGLPOINTPARAMETERFEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfEXT");
+        if (NULL == GLH_EXT_NAME(glPointParameterfEXT))
+            return FALSE;
+        GLH_EXT_NAME(glPointParameterfvEXT) = (PFNGLPOINTPARAMETERFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfvEXT");
+        if (NULL == GLH_EXT_NAME(glPointParameterfvEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_rescale_normal
+    } else if (0 == strcmp(extension, "GL_EXT_rescale_normal")) {
+#endif
+
+#ifdef GL_EXT_secondary_color
+    } else if (0 == strcmp(extension, "GL_EXT_secondary_color")) {
+        GLH_EXT_NAME(glSecondaryColor3bEXT) = (PFNGLSECONDARYCOLOR3BEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3bEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3bEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3bvEXT) = (PFNGLSECONDARYCOLOR3BVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3bvEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3bvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3dEXT) = (PFNGLSECONDARYCOLOR3DEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3dEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3dEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3dvEXT) = (PFNGLSECONDARYCOLOR3DVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3dvEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3dvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3fEXT) = (PFNGLSECONDARYCOLOR3FEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3fEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3fEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3fvEXT) = (PFNGLSECONDARYCOLOR3FVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3fvEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3fvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3iEXT) = (PFNGLSECONDARYCOLOR3IEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3iEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3iEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3ivEXT) = (PFNGLSECONDARYCOLOR3IVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3ivEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3ivEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3sEXT) = (PFNGLSECONDARYCOLOR3SEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3sEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3sEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3svEXT) = (PFNGLSECONDARYCOLOR3SVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3svEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3svEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3ubEXT) = (PFNGLSECONDARYCOLOR3UBEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3ubEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3ubEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3ubvEXT) = (PFNGLSECONDARYCOLOR3UBVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3ubvEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3ubvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3uiEXT) = (PFNGLSECONDARYCOLOR3UIEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3uiEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3uiEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3uivEXT) = (PFNGLSECONDARYCOLOR3UIVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3uivEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3uivEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3usEXT) = (PFNGLSECONDARYCOLOR3USEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3usEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3usEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColor3usvEXT) = (PFNGLSECONDARYCOLOR3USVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3usvEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColor3usvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glSecondaryColorPointerEXT) = (PFNGLSECONDARYCOLORPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColorPointerEXT");
+        if (NULL == GLH_EXT_NAME(glSecondaryColorPointerEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_separate_specular_color
+    } else if (0 == strcmp(extension, "GL_EXT_separate_specular_color")) {
+#endif
+
+#ifdef GL_EXT_shared_texture_palette
+    } else if (0 == strcmp(extension, "GL_EXT_shared_texture_palette")) {
+#endif
+
+#ifdef GL_EXT_stencil_wrap
+    } else if (0 == strcmp(extension, "GL_EXT_stencil_wrap")) {
+#endif
+
+#ifdef GL_EXT_texture_compression_s3tc
+    } else if (0 == strcmp(extension, "GL_EXT_texture_compression_s3tc")) {
+#endif
+
+#ifdef GL_EXT_texture_cube_map
+    } else if (0 == strcmp(extension, "GL_EXT_texture_cube_map")) {
+#endif
+
+#ifdef GL_EXT_texture_edge_clamp
+    } else if (0 == strcmp(extension, "GL_EXT_texture_edge_clamp")) {
+#endif
+
+#ifdef GL_EXT_texture_env_add
+    } else if (0 == strcmp(extension, "GL_EXT_texture_env_add")) {
+#endif
+
+#ifdef GL_EXT_texture_env_combine
+    } else if (0 == strcmp(extension, "GL_EXT_texture_env_combine")) {
+#endif
+
+#ifdef GL_EXT_texture_filter_anisotropic
+    } else if (0 == strcmp(extension, "GL_EXT_texture_filter_anisotropic")) {
+#endif
+
+#ifdef GL_EXT_texture_lod_bias
+    } else if (0 == strcmp(extension, "GL_EXT_texture_lod_bias")) {
+#endif
+
+#ifdef GL_EXT_texture_object
+    } else if (0 == strcmp(extension, "GL_EXT_texture_object")) {
+        GLH_EXT_NAME(glAreTexturesResidentEXT) = (PFNGLARETEXTURESRESIDENTEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glAreTexturesResidentEXT");
+        if (NULL == GLH_EXT_NAME(glAreTexturesResidentEXT))
+            return FALSE;
+        GLH_EXT_NAME(glBindTextureEXT) = (PFNGLBINDTEXTUREEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glBindTextureEXT");
+        if (NULL == GLH_EXT_NAME(glBindTextureEXT))
+            return FALSE;
+        GLH_EXT_NAME(glDeleteTexturesEXT) = (PFNGLDELETETEXTURESEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteTexturesEXT");
+        if (NULL == GLH_EXT_NAME(glDeleteTexturesEXT))
+            return FALSE;
+        GLH_EXT_NAME(glGenTexturesEXT) = (PFNGLGENTEXTURESEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGenTexturesEXT");
+        if (NULL == GLH_EXT_NAME(glGenTexturesEXT))
+            return FALSE;
+        GLH_EXT_NAME(glIsTextureEXT) = (PFNGLISTEXTUREEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glIsTextureEXT");
+        if (NULL == GLH_EXT_NAME(glIsTextureEXT))
+            return FALSE;
+        GLH_EXT_NAME(glPrioritizeTexturesEXT) = (PFNGLPRIORITIZETEXTURESEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glPrioritizeTexturesEXT");
+        if (NULL == GLH_EXT_NAME(glPrioritizeTexturesEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_texture3D
+    } else if (0 == strcmp(extension, "GL_EXT_texture3D")) {
+        GLH_EXT_NAME(glTexImage3DEXT) = (PFNGLTEXIMAGE3DEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glTexImage3DEXT");
+        if (NULL == GLH_EXT_NAME(glTexImage3DEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_vertex_array
+    } else if (0 == strcmp(extension, "GL_EXT_vertex_array")) {
+        GLH_EXT_NAME(glArrayElementEXT) = (PFNGLARRAYELEMENTEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glArrayElementEXT");
+        if (NULL == GLH_EXT_NAME(glArrayElementEXT))
+            return FALSE;
+        GLH_EXT_NAME(glColorPointerEXT) = (PFNGLCOLORPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorPointerEXT");
+        if (NULL == GLH_EXT_NAME(glColorPointerEXT))
+            return FALSE;
+        GLH_EXT_NAME(glEdgeFlagPointerEXT) = (PFNGLEDGEFLAGPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glEdgeFlagPointerEXT");
+        if (NULL == GLH_EXT_NAME(glEdgeFlagPointerEXT))
+            return FALSE;
+        GLH_EXT_NAME(glGetPointervEXT) = (PFNGLGETPOINTERVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetPointervEXT");
+        if (NULL == GLH_EXT_NAME(glGetPointervEXT))
+            return FALSE;
+        GLH_EXT_NAME(glIndexPointerEXT) = (PFNGLINDEXPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glIndexPointerEXT");
+        if (NULL == GLH_EXT_NAME(glIndexPointerEXT))
+            return FALSE;
+        GLH_EXT_NAME(glNormalPointerEXT) = (PFNGLNORMALPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glNormalPointerEXT");
+        if (NULL == GLH_EXT_NAME(glNormalPointerEXT))
+            return FALSE;
+        GLH_EXT_NAME(glTexCoordPointerEXT) = (PFNGLTEXCOORDPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glTexCoordPointerEXT");
+        if (NULL == GLH_EXT_NAME(glTexCoordPointerEXT))
+            return FALSE;
+        GLH_EXT_NAME(glVertexPointerEXT) = (PFNGLVERTEXPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexPointerEXT");
+        if (NULL == GLH_EXT_NAME(glVertexPointerEXT))
+            return FALSE;
+        GLH_EXT_NAME(glDrawArraysEXT) = (PFNGLDRAWARRAYSEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawArraysEXT");
+        if (NULL == GLH_EXT_NAME(glDrawArraysEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_EXT_vertex_weighting
+    } else if (0 == strcmp(extension, "GL_EXT_vertex_weighting")) {
+        GLH_EXT_NAME(glVertexWeightfEXT) = (PFNGLVERTEXWEIGHTFEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexWeightfEXT");
+        if (NULL == GLH_EXT_NAME(glVertexWeightfEXT))
+            return FALSE;
+        GLH_EXT_NAME(glVertexWeightfvEXT) = (PFNGLVERTEXWEIGHTFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexWeightfvEXT");
+        if (NULL == GLH_EXT_NAME(glVertexWeightfvEXT))
+            return FALSE;
+        GLH_EXT_NAME(glVertexWeightPointerEXT) = (PFNGLVERTEXWEIGHTPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexWeightPointerEXT");
+        if (NULL == GLH_EXT_NAME(glVertexWeightPointerEXT))
+            return FALSE;
+#endif
+
+#ifdef GL_NV_blend_square
+    } else if (0 == strcmp(extension, "GL_NV_blend_square")) {
+#endif
+
+#ifdef GL_NV_evaluators
+    } else if (0 == strcmp(extension, "GL_NV_evaluators")) {
+        GLH_EXT_NAME(glMapControlPointsNV) = (PFNGLMAPCONTROLPOINTSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glMapControlPointsNV");
+        if (NULL == GLH_EXT_NAME(glMapControlPointsNV))
+            return FALSE;
+        GLH_EXT_NAME(glMapParameterivNV) = (PFNGLMAPPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glMapParameterivNV");
+        if (NULL == GLH_EXT_NAME(glMapParameterivNV))
+            return FALSE;
+        GLH_EXT_NAME(glMapParameterfvNV) = (PFNGLMAPPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glMapParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glMapParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetMapControlPointsNV) = (PFNGLGETMAPCONTROLPOINTSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapControlPointsNV");
+        if (NULL == GLH_EXT_NAME(glGetMapControlPointsNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetMapParameterivNV) = (PFNGLGETMAPPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapParameterivNV");
+        if (NULL == GLH_EXT_NAME(glGetMapParameterivNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetMapParameterfvNV) = (PFNGLGETMAPPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glGetMapParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetMapAttribParameterivNV) = (PFNGLGETMAPATTRIBPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapAttribParameterivNV");
+        if (NULL == GLH_EXT_NAME(glGetMapAttribParameterivNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetMapAttribParameterfvNV) = (PFNGLGETMAPATTRIBPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapAttribParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glGetMapAttribParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glEvalMapsNV) = (PFNGLEVALMAPSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glEvalMapsNV");
+        if (NULL == GLH_EXT_NAME(glEvalMapsNV))
+            return FALSE;
+#endif
+
+#ifdef GL_NV_fence
+    } else if (0 == strcmp(extension, "GL_NV_fence")) {
+        GLH_EXT_NAME(glGenFencesNV) = (PFNGLGENFENCESNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGenFencesNV");
+        if (NULL == GLH_EXT_NAME(glGenFencesNV))
+            return FALSE;
+        GLH_EXT_NAME(glDeleteFencesNV) = (PFNGLDELETEFENCESNVPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteFencesNV");
+        if (NULL == GLH_EXT_NAME(glDeleteFencesNV))
+            return FALSE;
+        GLH_EXT_NAME(glSetFenceNV) = (PFNGLSETFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glSetFenceNV");
+        if (NULL == GLH_EXT_NAME(glSetFenceNV))
+            return FALSE;
+        GLH_EXT_NAME(glTestFenceNV) = (PFNGLTESTFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glTestFenceNV");
+        if (NULL == GLH_EXT_NAME(glTestFenceNV))
+            return FALSE;
+        GLH_EXT_NAME(glFinishFenceNV) = (PFNGLFINISHFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glFinishFenceNV");
+        if (NULL == GLH_EXT_NAME(glFinishFenceNV))
+            return FALSE;
+        GLH_EXT_NAME(glIsFenceNV) = (PFNGLISFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glIsFenceNV");
+        if (NULL == GLH_EXT_NAME(glIsFenceNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetFenceivNV) = (PFNGLGETFENCEIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetFenceivNV");
+        if (NULL == GLH_EXT_NAME(glGetFenceivNV))
+            return FALSE;
+#endif
+
+#ifdef GL_NV_fog_distance
+    } else if (0 == strcmp(extension, "GL_NV_fog_distance")) {
+#endif
+
+#ifdef GL_NV_packed_depth_stencil
+    } else if (0 == strcmp(extension, "GL_NV_packed_depth_stencil")) {
+#endif
+
+#ifdef GL_NV_register_combiners
+    } else if (0 == strcmp(extension, "GL_NV_register_combiners")) {
+        GLH_EXT_NAME(glCombinerParameterfvNV) = (PFNGLCOMBINERPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glCombinerParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glCombinerParameterfNV) = (PFNGLCOMBINERPARAMETERFNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameterfNV");
+        if (NULL == GLH_EXT_NAME(glCombinerParameterfNV))
+            return FALSE;
+        GLH_EXT_NAME(glCombinerParameterivNV) = (PFNGLCOMBINERPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameterivNV");
+        if (NULL == GLH_EXT_NAME(glCombinerParameterivNV))
+            return FALSE;
+        GLH_EXT_NAME(glCombinerParameteriNV) = (PFNGLCOMBINERPARAMETERINVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameteriNV");
+        if (NULL == GLH_EXT_NAME(glCombinerParameteriNV))
+            return FALSE;
+        GLH_EXT_NAME(glCombinerInputNV) = (PFNGLCOMBINERINPUTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerInputNV");
+        if (NULL == GLH_EXT_NAME(glCombinerInputNV))
+            return FALSE;
+        GLH_EXT_NAME(glCombinerOutputNV) = (PFNGLCOMBINEROUTPUTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerOutputNV");
+        if (NULL == GLH_EXT_NAME(glCombinerOutputNV))
+            return FALSE;
+        GLH_EXT_NAME(glFinalCombinerInputNV) = (PFNGLFINALCOMBINERINPUTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glFinalCombinerInputNV");
+        if (NULL == GLH_EXT_NAME(glFinalCombinerInputNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetCombinerInputParameterfvNV) = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerInputParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glGetCombinerInputParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetCombinerInputParameterivNV) = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerInputParameterivNV");
+        if (NULL == GLH_EXT_NAME(glGetCombinerInputParameterivNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetCombinerOutputParameterfvNV) = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerOutputParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glGetCombinerOutputParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetCombinerOutputParameterivNV) = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerOutputParameterivNV");
+        if (NULL == GLH_EXT_NAME(glGetCombinerOutputParameterivNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetFinalCombinerInputParameterfvNV) = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetFinalCombinerInputParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glGetFinalCombinerInputParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetFinalCombinerInputParameterivNV) = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetFinalCombinerInputParameterivNV");
+        if (NULL == GLH_EXT_NAME(glGetFinalCombinerInputParameterivNV))
+            return FALSE;
+#endif
+
+#ifdef GL_NV_register_combiners2
+    } else if (0 == strcmp(extension, "GL_NV_register_combiners2")) {
+        GLH_EXT_NAME(glCombinerStageParameterfvNV) = (PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerStageParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glCombinerStageParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetCombinerStageParameterfvNV) = (PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerStageParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glGetCombinerStageParameterfvNV))
+            return FALSE;
+#endif
+
+#ifdef GL_NV_texgen_reflection
+    } else if (0 == strcmp(extension, "GL_NV_texgen_reflection")) {
+#endif
+
+#ifdef GL_NV_texture_env_combine4
+    } else if (0 == strcmp(extension, "GL_NV_texture_env_combine4")) {
+#endif
+
+#ifdef GL_NV_texture_rectangle
+    } else if (0 == strcmp(extension, "GL_NV_texture_rectangle")) {
+#endif
+
+#ifdef GL_NV_texture_shader
+    } else if (0 == strcmp(extension, "GL_NV_texture_shader")) {
+#endif
+
+#ifdef GL_NV_vertex_array_range
+    } else if (0 == strcmp(extension, "GL_NV_vertex_array_range")) {
+        GLH_EXT_NAME(glFlushVertexArrayRangeNV) = (PFNGLFLUSHVERTEXARRAYRANGENVPROC)GLH_EXT_GET_PROC_ADDRESS("glFlushVertexArrayRangeNV");
+        if (NULL == GLH_EXT_NAME(glFlushVertexArrayRangeNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexArrayRangeNV) = (PFNGLVERTEXARRAYRANGENVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexArrayRangeNV");
+        if (NULL == GLH_EXT_NAME(glVertexArrayRangeNV))
+            return FALSE;
+# ifdef _WIN32
+        GLH_EXT_NAME(wglAllocateMemoryNV) = (PFNWGLALLOCATEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("wglAllocateMemoryNV");
+        if (NULL == GLH_EXT_NAME(wglAllocateMemoryNV))
+            return FALSE;
+# endif
+# ifdef GLX_VERSION_1_3
+        GLH_EXT_NAME(glXAllocateMemoryNV) = (PFNGLXALLOCATEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("glXAllocateMemoryNV");
+        if (NULL == GLH_EXT_NAME(glXAllocateMemoryNV))
+            return FALSE;
+# endif
+# ifdef _WIN32
+        GLH_EXT_NAME(wglFreeMemoryNV) = (PFNWGLFREEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("wglFreeMemoryNV");
+        if (NULL == GLH_EXT_NAME(wglFreeMemoryNV))
+            return FALSE;
+# endif
+# ifdef GLX_VERSION_1_3
+        GLH_EXT_NAME(glXFreeMemoryNV) = (PFNGLXFREEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("glXFreeMemoryNV");
+        if (NULL == GLH_EXT_NAME(glXFreeMemoryNV))
+            return FALSE;
+# endif
+#endif
+
+#ifdef GL_NV_vertex_program
+    } else if (0 == strcmp(extension, "GL_NV_vertex_program")) {
+        GLH_EXT_NAME(glAreProgramsResidentNV) = (PFNGLAREPROGRAMSRESIDENTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glAreProgramsResidentNV");
+        if (NULL == GLH_EXT_NAME(glAreProgramsResidentNV))
+            return FALSE;
+        GLH_EXT_NAME(glBindProgramNV) = (PFNGLBINDPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glBindProgramNV");
+        if (NULL == GLH_EXT_NAME(glBindProgramNV))
+            return FALSE;
+        GLH_EXT_NAME(glDeleteProgramsNV) = (PFNGLDELETEPROGRAMSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteProgramsNV");
+        if (NULL == GLH_EXT_NAME(glDeleteProgramsNV))
+            return FALSE;
+        GLH_EXT_NAME(glExecuteProgramNV) = (PFNGLEXECUTEPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glExecuteProgramNV");
+        if (NULL == GLH_EXT_NAME(glExecuteProgramNV))
+            return FALSE;
+        GLH_EXT_NAME(glGenProgramsNV) = (PFNGLGENPROGRAMSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGenProgramsNV");
+        if (NULL == GLH_EXT_NAME(glGenProgramsNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetProgramParameterdvNV) = (PFNGLGETPROGRAMPARAMETERDVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramParameterdvNV");
+        if (NULL == GLH_EXT_NAME(glGetProgramParameterdvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetProgramParameterfvNV) = (PFNGLGETPROGRAMPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramParameterfvNV");
+        if (NULL == GLH_EXT_NAME(glGetProgramParameterfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetProgramivNV) = (PFNGLGETPROGRAMIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramivNV");
+        if (NULL == GLH_EXT_NAME(glGetProgramivNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetProgramStringNV) = (PFNGLGETPROGRAMSTRINGNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramStringNV");
+        if (NULL == GLH_EXT_NAME(glGetProgramStringNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetTrackMatrixivNV) = (PFNGLGETTRACKMATRIXIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetTrackMatrixivNV");
+        if (NULL == GLH_EXT_NAME(glGetTrackMatrixivNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetVertexAttribdvNV) = (PFNGLGETVERTEXATTRIBDVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribdvNV");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribdvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetVertexAttribfvNV) = (PFNGLGETVERTEXATTRIBFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribfvNV");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribfvNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetVertexAttribivNV) = (PFNGLGETVERTEXATTRIBIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribivNV");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribivNV))
+            return FALSE;
+        GLH_EXT_NAME(glGetVertexAttribPointervNV) = (PFNGLGETVERTEXATTRIBPOINTERVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribPointervNV");
+        if (NULL == GLH_EXT_NAME(glGetVertexAttribPointervNV))
+            return FALSE;
+        GLH_EXT_NAME(glIsProgramNV) = (PFNGLISPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glIsProgramNV");
+        if (NULL == GLH_EXT_NAME(glIsProgramNV))
+            return FALSE;
+        GLH_EXT_NAME(glLoadProgramNV) = (PFNGLLOADPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glLoadProgramNV");
+        if (NULL == GLH_EXT_NAME(glLoadProgramNV))
+            return FALSE;
+        GLH_EXT_NAME(glProgramParameter4dNV) = (PFNGLPROGRAMPARAMETER4DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4dNV");
+        if (NULL == GLH_EXT_NAME(glProgramParameter4dNV))
+            return FALSE;
+        GLH_EXT_NAME(glProgramParameter4dvNV) = (PFNGLPROGRAMPARAMETER4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4dvNV");
+        if (NULL == GLH_EXT_NAME(glProgramParameter4dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glProgramParameter4fNV) = (PFNGLPROGRAMPARAMETER4FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4fNV");
+        if (NULL == GLH_EXT_NAME(glProgramParameter4fNV))
+            return FALSE;
+        GLH_EXT_NAME(glProgramParameter4fvNV) = (PFNGLPROGRAMPARAMETER4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4fvNV");
+        if (NULL == GLH_EXT_NAME(glProgramParameter4fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glProgramParameters4dvNV) = (PFNGLPROGRAMPARAMETERS4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameters4dvNV");
+        if (NULL == GLH_EXT_NAME(glProgramParameters4dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glProgramParameters4fvNV) = (PFNGLPROGRAMPARAMETERS4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameters4fvNV");
+        if (NULL == GLH_EXT_NAME(glProgramParameters4fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glRequestResidentProgramsNV) = (PFNGLREQUESTRESIDENTPROGRAMSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glRequestResidentProgramsNV");
+        if (NULL == GLH_EXT_NAME(glRequestResidentProgramsNV))
+            return FALSE;
+        GLH_EXT_NAME(glTrackMatrixNV) = (PFNGLTRACKMATRIXNVPROC)GLH_EXT_GET_PROC_ADDRESS("glTrackMatrixNV");
+        if (NULL == GLH_EXT_NAME(glTrackMatrixNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribPointerNV) = (PFNGLVERTEXATTRIBPOINTERNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribPointerNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribPointerNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib1dNV) = (PFNGLVERTEXATTRIB1DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1dNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib1dvNV) = (PFNGLVERTEXATTRIB1DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib1fNV) = (PFNGLVERTEXATTRIB1FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1fNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib1fvNV) = (PFNGLVERTEXATTRIB1FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib1sNV) = (PFNGLVERTEXATTRIB1SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1sNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1sNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib1svNV) = (PFNGLVERTEXATTRIB1SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib1svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib2dNV) = (PFNGLVERTEXATTRIB2DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2dNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib2dvNV) = (PFNGLVERTEXATTRIB2DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib2fNV) = (PFNGLVERTEXATTRIB2FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2fNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib2fvNV) = (PFNGLVERTEXATTRIB2FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib2sNV) = (PFNGLVERTEXATTRIB2SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2sNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2sNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib2svNV) = (PFNGLVERTEXATTRIB2SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib2svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib3dNV) = (PFNGLVERTEXATTRIB3DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3dNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib3dvNV) = (PFNGLVERTEXATTRIB3DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib3fNV) = (PFNGLVERTEXATTRIB3FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3fNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib3fvNV) = (PFNGLVERTEXATTRIB3FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib3sNV) = (PFNGLVERTEXATTRIB3SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3sNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3sNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib3svNV) = (PFNGLVERTEXATTRIB3SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib3svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib4dNV) = (PFNGLVERTEXATTRIB4DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4dNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib4dvNV) = (PFNGLVERTEXATTRIB4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib4fNV) = (PFNGLVERTEXATTRIB4FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4fNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib4fvNV) = (PFNGLVERTEXATTRIB4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib4sNV) = (PFNGLVERTEXATTRIB4SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4sNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4sNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib4svNV) = (PFNGLVERTEXATTRIB4SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttrib4ubvNV) = (PFNGLVERTEXATTRIB4UBVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ubvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttrib4ubvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs1dvNV) = (PFNGLVERTEXATTRIBS1DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs1dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs1dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs1fvNV) = (PFNGLVERTEXATTRIBS1FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs1fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs1fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs1svNV) = (PFNGLVERTEXATTRIBS1SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs1svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs1svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs2dvNV) = (PFNGLVERTEXATTRIBS2DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs2dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs2dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs2fvNV) = (PFNGLVERTEXATTRIBS2FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs2fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs2fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs2svNV) = (PFNGLVERTEXATTRIBS2SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs2svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs2svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs3dvNV) = (PFNGLVERTEXATTRIBS3DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs3dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs3dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs3fvNV) = (PFNGLVERTEXATTRIBS3FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs3fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs3fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs3svNV) = (PFNGLVERTEXATTRIBS3SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs3svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs3svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs4dvNV) = (PFNGLVERTEXATTRIBS4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4dvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs4dvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs4fvNV) = (PFNGLVERTEXATTRIBS4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4fvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs4fvNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs4svNV) = (PFNGLVERTEXATTRIBS4SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4svNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs4svNV))
+            return FALSE;
+        GLH_EXT_NAME(glVertexAttribs4ubvNV) = (PFNGLVERTEXATTRIBS4UBVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4ubvNV");
+        if (NULL == GLH_EXT_NAME(glVertexAttribs4ubvNV))
+            return FALSE;
+#endif
+
+#ifdef GL_SGIS_generate_mipmap
+    } else if (0 == strcmp(extension, "GL_SGIS_generate_mipmap")) {
+#endif
+
+#ifdef GL_SGIS_texture_lod
+    } else if (0 == strcmp(extension, "GL_SGIS_texture_lod")) {
+#endif
+
+#ifdef GL_SGIX_depth_texture
+    } else if (0 == strcmp(extension, "GL_SGIX_depth_texture")) {
+#endif
+
+#ifdef GL_SGIX_shadow
+    } else if (0 == strcmp(extension, "GL_SGIX_shadow")) {
+#endif
+
+#ifdef GL_VERSION_1_2
+    } else if (0 == strcmp(extension, "GL_VERSION_1_2")) {
+        GLH_CORE_1_2_NAME(glBlendColor) = (PFNGLBLENDCOLORPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendColor");
+        if (NULL == GLH_CORE_1_2_NAME(glBlendColor))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glBlendEquation) = (PFNGLBLENDEQUATIONPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendEquation");
+        if (NULL == GLH_CORE_1_2_NAME(glBlendEquation))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glDrawRangeElements) = (PFNGLDRAWRANGEELEMENTSPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawRangeElements");
+        if (NULL == GLH_CORE_1_2_NAME(glDrawRangeElements))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glColorTable) = (PFNGLCOLORTABLEPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTable");
+        if (NULL == GLH_CORE_1_2_NAME(glColorTable))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glColorTableParameterfv) = (PFNGLCOLORTABLEPARAMETERFVPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableParameterfv");
+        if (NULL == GLH_CORE_1_2_NAME(glColorTableParameterfv))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glColorTableParameteriv) = (PFNGLCOLORTABLEPARAMETERIVPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableParameteriv");
+        if (NULL == GLH_CORE_1_2_NAME(glColorTableParameteriv))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glCopyColorTable) = (PFNGLCOPYCOLORTABLEPROC)GLH_EXT_GET_PROC_ADDRESS("glCopyColorTable");
+        if (NULL == GLH_CORE_1_2_NAME(glCopyColorTable))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glGetColorTable) = (PFNGLGETCOLORTABLEPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTable");
+        if (NULL == GLH_CORE_1_2_NAME(glGetColorTable))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glGetColorTableParameterfv) = (PFNGLGETCOLORTABLEPARAMETERFVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameterfv");
+        if (NULL == GLH_CORE_1_2_NAME(glGetColorTableParameterfv))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glGetColorTableParameteriv) = (PFNGLGETCOLORTABLEPARAMETERIVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameteriv");
+        if (NULL == GLH_CORE_1_2_NAME(glGetColorTableParameteriv))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glTexImage3D) = (PFNGLTEXIMAGE3DPROC)GLH_EXT_GET_PROC_ADDRESS("glTexImage3D");
+        if (NULL == GLH_CORE_1_2_NAME(glTexImage3D))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glTexSubImage3D) = (PFNGLTEXSUBIMAGE3DPROC)GLH_EXT_GET_PROC_ADDRESS("glTexSubImage3D");
+        if (NULL == GLH_CORE_1_2_NAME(glTexSubImage3D))
+            return FALSE;
+        GLH_CORE_1_2_NAME(glCopyTexSubImage3D) = (PFNGLCOPYTEXSUBIMAGE3DPROC)GLH_EXT_GET_PROC_ADDRESS("glCopyTexSubImage3D");
+        if (NULL == GLH_CORE_1_2_NAME(glCopyTexSubImage3D))
+            return FALSE;
+#endif
+
+#ifdef GL_WIN_swap_hint
+    } else if (0 == strcmp(extension, "GL_WIN_swap_hint")) {
+        GLH_EXT_NAME(glAddSwapHintRectWIN) = (PFNGLADDSWAPHINTRECTWINPROC)GLH_EXT_GET_PROC_ADDRESS("glAddSwapHintRectWIN");
+        if (NULL == GLH_EXT_NAME(glAddSwapHintRectWIN))
+            return FALSE;
+#endif
+
+#ifdef WGL_ARB_pbuffer
+    } else if (0 == strcmp(extension, "WGL_ARB_pbuffer")) {
+# ifdef _WIN32
+        GLH_EXT_NAME(wglCreatePbufferARB) = (PFNWGLCREATEPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglCreatePbufferARB");
+        if (NULL == GLH_EXT_NAME(wglCreatePbufferARB))
+            return FALSE;
+# endif
+# ifdef _WIN32
+        GLH_EXT_NAME(wglGetPbufferDCARB) = (PFNWGLGETPBUFFERDCARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetPbufferDCARB");
+        if (NULL == GLH_EXT_NAME(wglGetPbufferDCARB))
+            return FALSE;
+# endif
+# ifdef _WIN32
+        GLH_EXT_NAME(wglReleasePbufferDCARB) = (PFNWGLRELEASEPBUFFERDCARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglReleasePbufferDCARB");
+        if (NULL == GLH_EXT_NAME(wglReleasePbufferDCARB))
+            return FALSE;
+# endif
+# ifdef _WIN32
+        GLH_EXT_NAME(wglDestroyPbufferARB) = (PFNWGLDESTROYPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglDestroyPbufferARB");
+        if (NULL == GLH_EXT_NAME(wglDestroyPbufferARB))
+            return FALSE;
+# endif
+# ifdef _WIN32
+        GLH_EXT_NAME(wglQueryPbufferARB) = (PFNWGLQUERYPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglQueryPbufferARB");
+        if (NULL == GLH_EXT_NAME(wglQueryPbufferARB))
+            return FALSE;
+# endif
+#endif
+
+#ifdef WGL_ARB_render_texture
+# ifdef _WIN32
+		GLH_EXT_NAME(wglBindTexImageARB) = (PFNWGLBINDTEXIMAGEARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglBindTexImageARB");
+		if (NULL == GLH_EXT_NAME(wglBindTexImageARB))
+			return FALSE;
+# endif
+# ifdef _WIN32
+		GLH_EXT_NAME(wglReleaseTexImageARB) = (PFNWGLRELEASETEXIMAGEARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglReleaseTexImageARB");
+		if (NULL == GLH_EXT_NAME(wglReleaseTexImageARB))
+			return FALSE;
+# endif
+# ifdef _WIN32
+		GLH_EXT_NAME(wglSetPbufferAttribARB) = (PFNWGLSETPBUFFERATTRIBARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglSetPbufferAttribARB");
+		if (NULL == GLH_EXT_NAME(wglSetPbufferAttribARB))
+			return FALSE;
+# endif
+#endif
+
+#ifdef WGL_ARB_pixel_format
+    } else if (0 == strcmp(extension, "WGL_ARB_pixel_format")) {
+# ifdef _WIN32
+        GLH_EXT_NAME(wglGetPixelFormatAttribivARB) = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetPixelFormatAttribivARB");
+        if (NULL == GLH_EXT_NAME(wglGetPixelFormatAttribivARB))
+            return FALSE;
+# endif
+# ifdef _WIN32
+        GLH_EXT_NAME(wglGetPixelFormatAttribfvARB) = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetPixelFormatAttribfvARB");
+        if (NULL == GLH_EXT_NAME(wglGetPixelFormatAttribfvARB))
+            return FALSE;
+# endif
+# ifdef _WIN32
+        GLH_EXT_NAME(wglChoosePixelFormatARB) = (PFNWGLCHOOSEPIXELFORMATARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglChoosePixelFormatARB");
+        if (NULL == GLH_EXT_NAME(wglChoosePixelFormatARB))
+            return FALSE;
+# endif
+#endif
+
+    } else {
+        return FALSE;
+    }
+    return TRUE;
+}
+#endif
+
+#else // defined(__APPLE__)
+
+#ifdef GLH_EXT_SINGLE_FILE
+
+int glh_init_extension(const char* extension)
+{
+	// MBW -- XXX -- Should this check for extension availability?
+	return TRUE;
+}
+#endif // GLH_EXT_SINGLE_FILE
+
+#endif // defined(__APPLE__)
+
+#undef GLH_EXT_SINGLE_FILE
+
+#endif /* GLH_GENEXT_H */
diff --git a/linden/indra/llwindow/files.darwin.lst b/linden/indra/llwindow/files.darwin.lst
deleted file mode 100644
index e8eca9b..0000000
--- a/linden/indra/llwindow/files.darwin.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-llwindow/llkeyboardmacosx.cpp
-llwindow/llwindowmacosx.cpp
diff --git a/linden/indra/llwindow/files.linux.lst b/linden/indra/llwindow/files.linux.lst
deleted file mode 100644
index a2dfa07..0000000
--- a/linden/indra/llwindow/files.linux.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-llwindow/llkeyboardsdl.cpp
-llwindow/llwindowsdl.cpp
-llwindow/llwindowmesaheadless.cpp
diff --git a/linden/indra/llwindow/files.lst b/linden/indra/llwindow/files.lst
deleted file mode 100644
index 1c16b09..0000000
--- a/linden/indra/llwindow/files.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-llwindow/lldxhardware.cpp
-llwindow/llgl.cpp
-llwindow/llkeyboard.cpp
-llwindow/llwindow.cpp
-llwindow/llwindowheadless.cpp
diff --git a/linden/indra/llwindow/files.sunos5.lst b/linden/indra/llwindow/files.sunos5.lst
deleted file mode 100644
index a2dfa07..0000000
--- a/linden/indra/llwindow/files.sunos5.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-llwindow/llkeyboardsdl.cpp
-llwindow/llwindowsdl.cpp
-llwindow/llwindowmesaheadless.cpp
diff --git a/linden/indra/llwindow/files.win32.lst b/linden/indra/llwindow/files.win32.lst
deleted file mode 100644
index 1abcb6e..0000000
--- a/linden/indra/llwindow/files.win32.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-llwindow/llkeyboardwin32.cpp
-llwindow/llwindowwin32.cpp
diff --git a/linden/indra/llwindow/lldxhardware.cpp b/linden/indra/llwindow/lldxhardware.cpp
index c2d94c3..ec4230c 100644
--- a/linden/indra/llwindow/lldxhardware.cpp
+++ b/linden/indra/llwindow/lldxhardware.cpp
@@ -150,7 +150,7 @@ S32 LLVersion::getField(const S32 field_num)
 	}
 }
 
-LLString LLDXDriverFile::dump()
+std::string LLDXDriverFile::dump()
 {
 	if (gWriteDebug)
 	{
@@ -237,7 +237,7 @@ void LLDXHardware::cleanup()
 }
 
 /*
-LLString LLDXHardware::dumpDevices()
+std::string LLDXHardware::dumpDevices()
 {
 	if (gWriteDebug)
 	{
diff --git a/linden/indra/llwindow/lldxhardware.h b/linden/indra/llwindow/lldxhardware.h
index 12d106a..d63120c 100644
--- a/linden/indra/llwindow/lldxhardware.h
+++ b/linden/indra/llwindow/lldxhardware.h
@@ -53,7 +53,7 @@ protected:
 class LLDXDriverFile
 {
 public:
-	LLString dump();
+	std::string dump();
 
 public:
 	std::string mFilepath;
@@ -103,7 +103,7 @@ public:
 	// ANY of them to match and return.
 	// LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
 
-	// LLString dumpDevices();
+	// std::string dumpDevices();
 public:
 	typedef std::map<std::string, LLDXDevice *> device_map_t;
 	// device_map_t mDevices;
diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
deleted file mode 100644
index debf2e3..0000000
--- a/linden/indra/llwindow/llgl.cpp
+++ /dev/null
@@ -1,1734 +0,0 @@
-/** 
- * @file llgl.cpp
- * @brief LLGL implementation
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-// This file sets some global GL parameters, and implements some 
-// useful functions for GL operations.
-
-#define GLH_EXT_SINGLE_FILE
-
-#include "linden_common.h"
-
-#include "boost/tokenizer.hpp"
-
-#include "llsys.h"
-
-#include "llgl.h"
-#include "llrender.h"
-
-#include "llerror.h"
-#include "llquaternion.h"
-#include "llmath.h"
-#include "m4math.h"
-#include "llstring.h"
-
-#include "llglheaders.h"
-
-#ifdef _DEBUG
-//#define GL_STATE_VERIFY
-#endif
-
-BOOL gDebugGL = FALSE;
-BOOL gClothRipple = FALSE;
-BOOL gNoRender = FALSE;
-LLMatrix4 gGLObliqueProjectionInverse;
-
-LLGLNamePool::pool_list_t LLGLNamePool::sInstances;
-
-#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
-// ATI prototypes
-// vertex blending prototypes
-PFNGLWEIGHTPOINTERARBPROC			glWeightPointerARB = NULL;
-PFNGLVERTEXBLENDARBPROC				glVertexBlendARB = NULL;
-PFNGLWEIGHTFVARBPROC				glWeightfvARB = NULL;
-
-// Vertex buffer object prototypes
-PFNGLBINDBUFFERARBPROC				glBindBufferARB = NULL;
-PFNGLDELETEBUFFERSARBPROC			glDeleteBuffersARB = NULL;
-PFNGLGENBUFFERSARBPROC				glGenBuffersARB = NULL;
-PFNGLISBUFFERARBPROC				glIsBufferARB = NULL;
-PFNGLBUFFERDATAARBPROC				glBufferDataARB = NULL;
-PFNGLBUFFERSUBDATAARBPROC			glBufferSubDataARB = NULL;
-PFNGLGETBUFFERSUBDATAARBPROC		glGetBufferSubDataARB = NULL;
-PFNGLMAPBUFFERARBPROC				glMapBufferARB = NULL;
-PFNGLUNMAPBUFFERARBPROC				glUnmapBufferARB = NULL;
-PFNGLGETBUFFERPARAMETERIVARBPROC	glGetBufferParameterivARB = NULL;
-PFNGLGETBUFFERPOINTERVARBPROC		glGetBufferPointervARB = NULL;
-
-// vertex object prototypes
-PFNGLNEWOBJECTBUFFERATIPROC			glNewObjectBufferATI = NULL;
-PFNGLISOBJECTBUFFERATIPROC			glIsObjectBufferATI = NULL;
-PFNGLUPDATEOBJECTBUFFERATIPROC		glUpdateObjectBufferATI = NULL;
-PFNGLGETOBJECTBUFFERFVATIPROC		glGetObjectBufferfvATI = NULL;
-PFNGLGETOBJECTBUFFERIVATIPROC		glGetObjectBufferivATI = NULL;
-PFNGLFREEOBJECTBUFFERATIPROC		glFreeObjectBufferATI = NULL;
-PFNGLARRAYOBJECTATIPROC				glArrayObjectATI = NULL;
-PFNGLVERTEXATTRIBARRAYOBJECTATIPROC	glVertexAttribArrayObjectATI = NULL;
-PFNGLGETARRAYOBJECTFVATIPROC		glGetArrayObjectfvATI = NULL;
-PFNGLGETARRAYOBJECTIVATIPROC		glGetArrayObjectivATI = NULL;
-PFNGLVARIANTARRAYOBJECTATIPROC		glVariantObjectArrayATI = NULL;
-PFNGLGETVARIANTARRAYOBJECTFVATIPROC	glGetVariantArrayObjectfvATI = NULL;
-PFNGLGETVARIANTARRAYOBJECTIVATIPROC	glGetVariantArrayObjectivATI = NULL;
-
-// GL_ARB_occlusion_query
-PFNGLGENQUERIESARBPROC glGenQueriesARB = NULL;
-PFNGLDELETEQUERIESARBPROC glDeleteQueriesARB = NULL;
-PFNGLISQUERYARBPROC glIsQueryARB = NULL;
-PFNGLBEGINQUERYARBPROC glBeginQueryARB = NULL;
-PFNGLENDQUERYARBPROC glEndQueryARB = NULL;
-PFNGLGETQUERYIVARBPROC glGetQueryivARB = NULL;
-PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB = NULL;
-PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB = NULL;
-
-// GL_ARB_point_parameters
-PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB = NULL;
-PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB = NULL;
-
-// GL_EXT_framebuffer_object
-PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT = NULL;
-PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT = NULL;
-PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT = NULL;
-PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT = NULL;
-PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT = NULL;
-PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT = NULL;
-PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT = NULL;
-PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT = NULL;
-PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT = NULL;
-PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT = NULL;
-PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT = NULL;
-PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT = NULL;
-PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT = NULL;
-PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT = NULL;
-PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT = NULL;
-PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT = NULL;
-PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT = NULL;
-
-//shader object prototypes
-PFNGLDELETEOBJECTARBPROC glDeleteObjectARB = NULL;
-PFNGLGETHANDLEARBPROC glGetHandleARB = NULL;
-PFNGLDETACHOBJECTARBPROC glDetachObjectARB = NULL;
-PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB = NULL;
-PFNGLSHADERSOURCEARBPROC glShaderSourceARB = NULL;
-PFNGLCOMPILESHADERARBPROC glCompileShaderARB = NULL;
-PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB = NULL;
-PFNGLATTACHOBJECTARBPROC glAttachObjectARB = NULL;
-PFNGLLINKPROGRAMARBPROC glLinkProgramARB = NULL;
-PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = NULL;
-PFNGLVALIDATEPROGRAMARBPROC glValidateProgramARB = NULL;
-PFNGLUNIFORM1FARBPROC glUniform1fARB = NULL;
-PFNGLUNIFORM2FARBPROC glUniform2fARB = NULL;
-PFNGLUNIFORM3FARBPROC glUniform3fARB = NULL;
-PFNGLUNIFORM4FARBPROC glUniform4fARB = NULL;
-PFNGLUNIFORM1IARBPROC glUniform1iARB = NULL;
-PFNGLUNIFORM2IARBPROC glUniform2iARB = NULL;
-PFNGLUNIFORM3IARBPROC glUniform3iARB = NULL;
-PFNGLUNIFORM4IARBPROC glUniform4iARB = NULL;
-PFNGLUNIFORM1FVARBPROC glUniform1fvARB = NULL;
-PFNGLUNIFORM2FVARBPROC glUniform2fvARB = NULL;
-PFNGLUNIFORM3FVARBPROC glUniform3fvARB = NULL;
-PFNGLUNIFORM4FVARBPROC glUniform4fvARB = NULL;
-PFNGLUNIFORM1IVARBPROC glUniform1ivARB = NULL;
-PFNGLUNIFORM2IVARBPROC glUniform2ivARB = NULL;
-PFNGLUNIFORM3IVARBPROC glUniform3ivARB = NULL;
-PFNGLUNIFORM4IVARBPROC glUniform4ivARB = NULL;
-PFNGLUNIFORMMATRIX2FVARBPROC glUniformMatrix2fvARB = NULL;
-PFNGLUNIFORMMATRIX3FVARBPROC glUniformMatrix3fvARB = NULL;
-PFNGLUNIFORMMATRIX4FVARBPROC glUniformMatrix4fvARB = NULL;
-PFNGLGETOBJECTPARAMETERFVARBPROC glGetObjectParameterfvARB = NULL;
-PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB = NULL;
-PFNGLGETINFOLOGARBPROC glGetInfoLogARB = NULL;
-PFNGLGETATTACHEDOBJECTSARBPROC glGetAttachedObjectsARB = NULL;
-PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB = NULL;
-PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB = NULL;
-PFNGLGETUNIFORMFVARBPROC glGetUniformfvARB = NULL;
-PFNGLGETUNIFORMIVARBPROC glGetUniformivARB = NULL;
-PFNGLGETSHADERSOURCEARBPROC glGetShaderSourceARB = NULL;
-
-// vertex shader prototypes
-#if LL_LINUX
-PFNGLVERTEXATTRIB1DARBPROC glVertexAttrib1dARB = NULL;
-PFNGLVERTEXATTRIB1DVARBPROC glVertexAttrib1dvARB = NULL;
-PFNGLVERTEXATTRIB1FARBPROC glVertexAttrib1fARB = NULL;
-PFNGLVERTEXATTRIB1FVARBPROC glVertexAttrib1fvARB = NULL;
-PFNGLVERTEXATTRIB1SARBPROC glVertexAttrib1sARB = NULL;
-PFNGLVERTEXATTRIB1SVARBPROC glVertexAttrib1svARB = NULL;
-PFNGLVERTEXATTRIB2DARBPROC glVertexAttrib2dARB = NULL;
-PFNGLVERTEXATTRIB2DVARBPROC glVertexAttrib2dvARB = NULL;
-PFNGLVERTEXATTRIB2FARBPROC glVertexAttrib2fARB = NULL;
-PFNGLVERTEXATTRIB2FVARBPROC glVertexAttrib2fvARB = NULL;
-PFNGLVERTEXATTRIB2SARBPROC glVertexAttrib2sARB = NULL;
-PFNGLVERTEXATTRIB2SVARBPROC glVertexAttrib2svARB = NULL;
-PFNGLVERTEXATTRIB3DARBPROC glVertexAttrib3dARB = NULL;
-PFNGLVERTEXATTRIB3DVARBPROC glVertexAttrib3dvARB = NULL;
-PFNGLVERTEXATTRIB3FARBPROC glVertexAttrib3fARB = NULL;
-PFNGLVERTEXATTRIB3FVARBPROC glVertexAttrib3fvARB = NULL;
-PFNGLVERTEXATTRIB3SARBPROC glVertexAttrib3sARB = NULL;
-PFNGLVERTEXATTRIB3SVARBPROC glVertexAttrib3svARB = NULL;
-#endif // LL_LINUX
-PFNGLVERTEXATTRIB4NBVARBPROC glVertexAttrib4nbvARB = NULL;
-PFNGLVERTEXATTRIB4NIVARBPROC glVertexAttrib4nivARB = NULL;
-PFNGLVERTEXATTRIB4NSVARBPROC glVertexAttrib4nsvARB = NULL;
-PFNGLVERTEXATTRIB4NUBARBPROC glVertexAttrib4nubARB = NULL;
-PFNGLVERTEXATTRIB4NUBVARBPROC glVertexAttrib4nubvARB = NULL;
-PFNGLVERTEXATTRIB4NUIVARBPROC glVertexAttrib4nuivARB = NULL;
-PFNGLVERTEXATTRIB4NUSVARBPROC glVertexAttrib4nusvARB = NULL;
-#if LL_LINUX
-PFNGLVERTEXATTRIB4BVARBPROC glVertexAttrib4bvARB = NULL;
-PFNGLVERTEXATTRIB4DARBPROC glVertexAttrib4dARB = NULL;
-PFNGLVERTEXATTRIB4DVARBPROC glVertexAttrib4dvARB = NULL;
-PFNGLVERTEXATTRIB4FARBPROC glVertexAttrib4fARB = NULL;
-PFNGLVERTEXATTRIB4FVARBPROC glVertexAttrib4fvARB = NULL;
-PFNGLVERTEXATTRIB4IVARBPROC glVertexAttrib4ivARB = NULL;
-PFNGLVERTEXATTRIB4SARBPROC glVertexAttrib4sARB = NULL;
-PFNGLVERTEXATTRIB4SVARBPROC glVertexAttrib4svARB = NULL;
-PFNGLVERTEXATTRIB4UBVARBPROC glVertexAttrib4ubvARB = NULL;
-PFNGLVERTEXATTRIB4UIVARBPROC glVertexAttrib4uivARB = NULL;
-PFNGLVERTEXATTRIB4USVARBPROC glVertexAttrib4usvARB = NULL;
-PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB = NULL;
-PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB = NULL;
-PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB = NULL;
-PFNGLPROGRAMSTRINGARBPROC glProgramStringARB = NULL;
-PFNGLBINDPROGRAMARBPROC glBindProgramARB = NULL;
-PFNGLDELETEPROGRAMSARBPROC glDeleteProgramsARB = NULL;
-PFNGLGENPROGRAMSARBPROC glGenProgramsARB = NULL;
-PFNGLPROGRAMENVPARAMETER4DARBPROC glProgramEnvParameter4dARB = NULL;
-PFNGLPROGRAMENVPARAMETER4DVARBPROC glProgramEnvParameter4dvARB = NULL;
-PFNGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB = NULL;
-PFNGLPROGRAMENVPARAMETER4FVARBPROC glProgramEnvParameter4fvARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4DARBPROC glProgramLocalParameter4dARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4DVARBPROC glProgramLocalParameter4dvARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4FARBPROC glProgramLocalParameter4fARB = NULL;
-PFNGLPROGRAMLOCALPARAMETER4FVARBPROC glProgramLocalParameter4fvARB = NULL;
-PFNGLGETPROGRAMENVPARAMETERDVARBPROC glGetProgramEnvParameterdvARB = NULL;
-PFNGLGETPROGRAMENVPARAMETERFVARBPROC glGetProgramEnvParameterfvARB = NULL;
-PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC glGetProgramLocalParameterdvARB = NULL;
-PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC glGetProgramLocalParameterfvARB = NULL;
-PFNGLGETPROGRAMIVARBPROC glGetProgramivARB = NULL;
-PFNGLGETPROGRAMSTRINGARBPROC glGetProgramStringARB = NULL;
-PFNGLGETVERTEXATTRIBDVARBPROC glGetVertexAttribdvARB = NULL;
-PFNGLGETVERTEXATTRIBFVARBPROC glGetVertexAttribfvARB = NULL;
-PFNGLGETVERTEXATTRIBIVARBPROC glGetVertexAttribivARB = NULL;
-PFNGLGETVERTEXATTRIBPOINTERVARBPROC glGetVertexAttribPointervARB = NULL;
-PFNGLISPROGRAMARBPROC glIsProgramARB = NULL;
-#endif // LL_LINUX
-PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB = NULL;
-PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB = NULL;
-PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB = NULL;
-
-#if LL_WINDOWS
-PFNWGLSWAPINTERVALEXTPROC			wglSwapIntervalEXT = NULL;
-#endif
-
-#if LL_LINUX
-PFNGLCOLORTABLEEXTPROC glColorTableEXT = NULL;
-#endif // LL_LINUX
-
-#endif
-
-LLGLManager gGLManager;
-
-LLGLManager::LLGLManager() :
-	mInited(FALSE),
-	mIsDisabled(FALSE),
-
-	mHasMultitexture(FALSE),
-	mNumTextureUnits(1),
-	mHasMipMapGeneration(FALSE),
-	mHasPalettedTextures(FALSE),
-	mHasCompressedTextures(FALSE),
-	mHasFramebufferObject(FALSE),
-
-	mHasVertexBufferObject(FALSE),
-	mHasPBuffer(FALSE),
-	mHasShaderObjects(FALSE),
-	mHasVertexShader(FALSE),
-	mHasFragmentShader(FALSE),
-	mHasOcclusionQuery(FALSE),
-	mHasPointParameters(FALSE),
-
-	mHasAnisotropic(FALSE),
-	mHasARBEnvCombine(FALSE),
-	mHasCubeMap(FALSE),
-
-	mIsATI(FALSE),
-	mIsNVIDIA(FALSE),
-	mIsIntel(FALSE),
-	mIsGF2or4MX(FALSE),
-	mIsGF3(FALSE),
-	mIsGFFX(FALSE),
-	mATIOffsetVerticalLines(FALSE),
-
-	mHasRequirements(TRUE),
-
-	mHasSeparateSpecularColor(FALSE),
-
-	mDriverVersionMajor(1),
-	mDriverVersionMinor(0),
-	mDriverVersionRelease(0),
-	mGLVersion(1.0f),
-		
-	mVRAM(0),
-	mGLMaxVertexRange(0),
-	mGLMaxIndexRange(0)
-{
-}
-
-//---------------------------------------------------------------------
-// Global initialization for GL
-//---------------------------------------------------------------------
-void LLGLManager::initWGL()
-{
-	mHasPBuffer = FALSE;
-#if LL_WINDOWS && !LL_MESA_HEADLESS
-	if (!glh_init_extensions("WGL_ARB_pixel_format"))
-	{
-		LL_WARNS("RenderInit") << "No ARB pixel format extensions" << LL_ENDL;
-	}
-
-	if (ExtensionExists("WGL_EXT_swap_control", gGLHExts.mSysExts))
-	{
-        GLH_EXT_NAME(wglSwapIntervalEXT) = (PFNWGLSWAPINTERVALEXTPROC)GLH_EXT_GET_PROC_ADDRESS("wglSwapIntervalEXT");
-	}
-
-	if( !glh_init_extensions("WGL_ARB_pbuffer") )
-	{
-		LL_WARNS("RenderInit") << "No ARB WGL PBuffer extensions" << LL_ENDL;
-	}
-
-	if( !glh_init_extensions("WGL_ARB_render_texture") )
-	{
-		LL_WARNS("RenderInit") << "No ARB WGL render texture extensions" << LL_ENDL;
-	}
-
-	mHasPBuffer = ExtensionExists("WGL_ARB_pbuffer", gGLHExts.mSysExts) &&
-					ExtensionExists("WGL_ARB_render_texture", gGLHExts.mSysExts) &&
-					ExtensionExists("WGL_ARB_pixel_format", gGLHExts.mSysExts);
-#endif
-}
-
-// return false if unable (or unwilling due to old drivers) to init GL
-bool LLGLManager::initGL()
-{
-	if (mInited)
-	{
-		LL_ERRS("RenderInit") << "Calling init on LLGLManager after already initialized!" << LL_ENDL;
-	}
-
-	GLint alpha_bits;
-	glGetIntegerv( GL_ALPHA_BITS, &alpha_bits );
-	if( 8 != alpha_bits )
-	{
-		LL_WARNS("RenderInit") << "Frame buffer has less than 8 bits of alpha.  Avatar texture compositing will fail." << LL_ENDL;
-	}
-
-	// Extract video card strings and convert to upper case to
-	// work around driver-to-driver variation in capitalization.
-	mGLVendor = LLString((const char *)glGetString(GL_VENDOR));
-	LLString::toUpper(mGLVendor);
-
-	mGLRenderer = LLString((const char *)glGetString(GL_RENDERER));
-	LLString::toUpper(mGLRenderer);
-
-	parse_gl_version( &mDriverVersionMajor, 
-		&mDriverVersionMinor, 
-		&mDriverVersionRelease, 
-		&mDriverVersionVendorString );
-
-	mGLVersion = mDriverVersionMajor + mDriverVersionMinor * .1f;
-	
-	// Trailing space necessary to keep "nVidia Corpor_ati_on" cards
-	// from being recognized as ATI.
-	if (mGLVendor.substr(0,4) == "ATI ")
-	{
-		mGLVendorShort = "ATI";
-		BOOL mobile = FALSE;
-		if (mGLRenderer.find("MOBILITY") != LLString::npos)
-		{
-			mobile = TRUE;
-		}
-		mIsATI = TRUE;
-
-#if LL_WINDOWS && !LL_MESA_HEADLESS
-		if (mDriverVersionRelease < 3842)
-		{
-			mATIOffsetVerticalLines = TRUE;
-		}
-#endif // LL_WINDOWS
-	}
-	else if (mGLVendor.find("NVIDIA ") != LLString::npos)
-	{
-		mGLVendorShort = "NVIDIA";
-		mIsNVIDIA = TRUE;
-		if (   mGLRenderer.find("GEFORCE4 MX") != LLString::npos
-			|| mGLRenderer.find("GEFORCE2") != LLString::npos
-			|| mGLRenderer.find("GEFORCE 2") != LLString::npos
-			|| mGLRenderer.find("GEFORCE4 460 GO") != LLString::npos
-			|| mGLRenderer.find("GEFORCE4 440 GO") != LLString::npos
-			|| mGLRenderer.find("GEFORCE4 420 GO") != LLString::npos)
-		{
-			mIsGF2or4MX = TRUE;
-		}
-		else if (mGLRenderer.find("GEFORCE FX") != LLString::npos
-				 || mGLRenderer.find("QUADRO FX") != LLString::npos
-				 || mGLRenderer.find("NV34") != LLString::npos)
-		{
-			mIsGFFX = TRUE;
-		}
-		else if(mGLRenderer.find("GEFORCE3") != LLString::npos)
-		{
-			mIsGF3 = TRUE;
-		}
-
-	}
-	else if (mGLVendor.find("INTEL") != LLString::npos
-#if LL_LINUX
-		 // The Mesa-based drivers put this in the Renderer string,
-		 // not the Vendor string.
-		 || mGLRenderer.find("INTEL") != LLString::npos
-#endif //LL_LINUX
-		 )
-	{
-		mGLVendorShort = "INTEL";
-		mIsIntel = TRUE;
-	}
-	else
-	{
-		mGLVendorShort = "MISC";
-	}
-	
-	// This is called here because it depends on the setting of mIsGF2or4MX, and sets up mHasMultitexture.
-	initExtensions();
-
-	if (mHasMultitexture)
-	{
-		GLint num_tex_units;		
-		glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &num_tex_units);
-		mNumTextureUnits = llmin(num_tex_units, (GLint)MAX_GL_TEXTURE_UNITS);
-		if (mIsIntel)
-		{
-			mNumTextureUnits = llmin(mNumTextureUnits, 2);
-		}
-	}
-	else
-	{
-		mHasRequirements = FALSE;
-
-		// We don't support cards that don't support the GL_ARB_multitexture extension
-		LL_WARNS("RenderInit") << "GL Drivers do not support GL_ARB_multitexture" << LL_ENDL;
-		return false;
-	}
-	
-
-	initGLStates();
-	return true;
-}
-
-void LLGLManager::getGLInfo(LLSD& info)
-{
-	info["GLInfo"]["GLVendor"] = LLString((const char *)glGetString(GL_VENDOR));
-	info["GLInfo"]["GLRenderer"] = LLString((const char *)glGetString(GL_RENDERER));
-	info["GLInfo"]["GLVersion"] = LLString((const char *)glGetString(GL_VERSION));
-
-#if !LL_MESA_HEADLESS
-	LLString all_exts = (const char *)gGLHExts.mSysExts;
-	boost::char_separator<char> sep(" ");
-	boost::tokenizer<boost::char_separator<char> > tok(all_exts, sep);
-	for(boost::tokenizer<boost::char_separator<char> >::iterator i = tok.begin(); i != tok.end(); ++i)
-	{
-		info["GLInfo"]["GLExtensions"].append(*i);
-	}
-#endif
-}
-
-LLString LLGLManager::getGLInfoString()
-{
-	LLString info_str;
-	LLString all_exts, line;
-
-	info_str += LLString("GL_VENDOR      ") + LLString((const char *)glGetString(GL_VENDOR)) + LLString("\n");
-	info_str += LLString("GL_RENDERER    ") + LLString((const char *)glGetString(GL_RENDERER)) + LLString("\n");
-	info_str += LLString("GL_VERSION     ") + LLString((const char *)glGetString(GL_VERSION)) + LLString("\n");
-
-#if !LL_MESA_HEADLESS
-	all_exts = (const char *)gGLHExts.mSysExts;
-	LLString::replaceChar(all_exts, ' ', '\n');
-	info_str += LLString("GL_EXTENSIONS:\n") + all_exts + LLString("\n");
-#endif
-	
-	return info_str;
-}
-
-void LLGLManager::printGLInfoString()
-{
-	LLString info_str;
-	LLString all_exts, line;
-	
-	LL_INFOS("RenderInit") << "GL_VENDOR:     " << ((const char *)glGetString(GL_VENDOR)) << LL_ENDL;
-	LL_INFOS("RenderInit") << "GL_RENDERER:   " << ((const char *)glGetString(GL_RENDERER)) << LL_ENDL;
-	LL_INFOS("RenderInit") << "GL_VERSION:    " << ((const char *)glGetString(GL_VERSION)) << LL_ENDL;
-
-#if !LL_MESA_HEADLESS
-	all_exts = (const char *)gGLHExts.mSysExts;
-	LLString::replaceChar(all_exts, ' ', '\n');
-	LL_DEBUGS("RenderInit") << "GL_EXTENSIONS:\n" << all_exts << LL_ENDL;
-#endif
-}
-
-LLString LLGLManager::getRawGLString()
-{
-	LLString gl_string;
-	gl_string.assign((char*)glGetString(GL_VENDOR));
-	gl_string.append(" ");
-	gl_string.append((char*)glGetString(GL_RENDERER));
-	return gl_string;
-}
-
-void LLGLManager::shutdownGL()
-{
-	if (mInited)
-	{
-		glFinish();
-		stop_glerror();
-		mInited = FALSE;
-	}
-}
-
-// these are used to turn software blending on. They appear in the Debug/Avatar menu
-// presence of vertex skinning/blending or vertex programs will set these to FALSE by default.
-
-extern LLCPUInfo gSysCPU;
-
-void LLGLManager::initExtensions()
-{
-#if LL_MESA_HEADLESS
-# if GL_ARB_multitexture
-	mHasMultitexture = TRUE;
-# else
-	mHasMultitexture = FALSE;
-# endif
-# if GL_ARB_texture_env_combine
-	mHasARBEnvCombine = TRUE;	
-# else
-	mHasARBEnvCombine = FALSE;
-# endif
-# if GL_ARB_texture_compression
-	mHasCompressedTextures = TRUE;
-# else
-	mHasCompressedTextures = FALSE;
-# endif
-# if GL_ARB_vertex_buffer_object
-	mHasVertexBufferObject = TRUE;
-# else
-	mHasVertexBufferObject = FALSE;
-# endif
-# if GL_EXT_framebuffer_object
-	mHasFramebufferObject = TRUE;
-# else
-	mHasFramebufferObject = FALSE;
-# endif
-	mHasMipMapGeneration = FALSE;
-	mHasPalettedTextures = FALSE;
-	mHasSeparateSpecularColor = FALSE;
-	mHasAnisotropic = FALSE;
-	mHasCubeMap = FALSE;
-	mHasOcclusionQuery = FALSE;
-	mHasPointParameters = FALSE;
-	mHasShaderObjects = FALSE;
-	mHasVertexShader = FALSE;
-	mHasFragmentShader = FALSE;
-#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");
-	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");
-	mHasCubeMap = ExtensionExists("GL_ARB_texture_cube_map", gGLHExts.mSysExts);
-	mHasARBEnvCombine = ExtensionExists("GL_ARB_texture_env_combine", gGLHExts.mSysExts);
-	mHasCompressedTextures = glh_init_extensions("GL_ARB_texture_compression");
-	mHasOcclusionQuery = ExtensionExists("GL_ARB_occlusion_query", gGLHExts.mSysExts);
-	mHasVertexBufferObject = ExtensionExists("GL_ARB_vertex_buffer_object", gGLHExts.mSysExts);
-	// mask out FBO support when packed_depth_stencil isn't there 'cause we need it for LLRenderTarget -Brad
-	mHasFramebufferObject = ExtensionExists("GL_EXT_framebuffer_object", gGLHExts.mSysExts)
-		&& ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts);
-#if !LL_DARWIN
-	mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
-#endif
-	mHasShaderObjects = ExtensionExists("GL_ARB_shader_objects", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
-	mHasVertexShader = ExtensionExists("GL_ARB_vertex_program", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_vertex_shader", gGLHExts.mSysExts)
-						&& ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
-	mHasFragmentShader = ExtensionExists("GL_ARB_fragment_shader", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
-#endif
-
-#if LL_LINUX
-	// Our extension support for the Linux Client is very young with some
-	// potential driver gotchas, so offer a semi-secret way to turn it off.
-	if (getenv("LL_GL_NOEXT"))	/* Flawfinder: ignore */
-	{
-		//mHasMultitexture = FALSE; // NEEDED!
-		mHasARBEnvCombine = FALSE;
-		mHasCompressedTextures = FALSE;
-		mHasVertexBufferObject = FALSE;
-		mHasFramebufferObject = FALSE;
-		mHasMipMapGeneration = FALSE;
-		mHasPalettedTextures = FALSE;
-		mHasSeparateSpecularColor = FALSE;
-		mHasAnisotropic = FALSE;
-		mHasCubeMap = FALSE;
-		mHasOcclusionQuery = FALSE;
-		mHasPointParameters = FALSE;
-		mHasShaderObjects = FALSE;
-		mHasVertexShader = FALSE;
-		mHasFragmentShader = FALSE;
-		LL_WARNS("RenderInit") << "GL extension support DISABLED via LL_GL_NOEXT" << LL_ENDL;
-	}
-	else if (getenv("LL_GL_BASICEXT"))	/* Flawfinder: ignore */
-	{
-		// This switch attempts to turn off all support for exotic
-		// extensions which I believe correspond to fatal driver
-		// bug reports.  This should be the default until we get a
-		// proper blacklist/whitelist on Linux.
-		mHasMipMapGeneration = FALSE;
-		mHasPalettedTextures = FALSE;
-		mHasAnisotropic = FALSE;
-		//mHasCubeMap = FALSE; // apparently fatal on Intel 915 & similar
-		//mHasOcclusionQuery = FALSE; // source of many ATI system hangs
-		mHasShaderObjects = FALSE;
-		mHasVertexShader = FALSE;
-		mHasFragmentShader = FALSE;
-		LL_WARNS("RenderInit") << "GL extension support forced to SIMPLE level via LL_GL_BASICEXT" << LL_ENDL;
-	}
-	if (getenv("LL_GL_BLACKLIST"))	/* Flawfinder: ignore */
-	{
-		// This lets advanced troubleshooters disable specific
-		// GL extensions to isolate problems with their hardware.
-		// SL-28126
-		const char *const blacklist = getenv("LL_GL_BLACKLIST");	/* Flawfinder: ignore */
-		LL_WARNS("RenderInit") << "GL extension support partially disabled via LL_GL_BLACKLIST: " << blacklist << LL_ENDL;
-		if (strchr(blacklist,'a')) mHasARBEnvCombine = FALSE;
-		if (strchr(blacklist,'b')) mHasCompressedTextures = FALSE;
-		if (strchr(blacklist,'c')) mHasVertexBufferObject = FALSE;
-		if (strchr(blacklist,'d')) mHasMipMapGeneration = FALSE;//S
-		if (strchr(blacklist,'e')) mHasPalettedTextures = FALSE;//S
-// 		if (strchr(blacklist,'f')) mHasNVVertexArrayRange = FALSE;//S
-// 		if (strchr(blacklist,'g')) mHasNVFence = FALSE;//S
-		if (strchr(blacklist,'h')) mHasSeparateSpecularColor = FALSE;
-		if (strchr(blacklist,'i')) mHasAnisotropic = FALSE;//S
-		if (strchr(blacklist,'j')) mHasCubeMap = FALSE;//S
-// 		if (strchr(blacklist,'k')) mHasATIVAO = FALSE;//S
-		if (strchr(blacklist,'l')) mHasOcclusionQuery = FALSE;
-		if (strchr(blacklist,'m')) mHasShaderObjects = FALSE;//S
-		if (strchr(blacklist,'n')) mHasVertexShader = FALSE;//S
-		if (strchr(blacklist,'o')) mHasFragmentShader = FALSE;//S
-		if (strchr(blacklist,'p')) mHasPointParameters = FALSE;//S
-		if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
-	}
-#endif // LL_LINUX
-
-#if LL_DARWIN || LL_LINUX
-	// MBW -- 12/4/2003 -- Using paletted textures causes a bunch of avatar rendering problems on the Mac.
-	// Not sure if this is due to driver problems or incorrect use of the extension, but I'm disabling it for now.
-	// Tofu - 2006-10-03 -- Same problem on Linux.
-	mHasPalettedTextures = false;
-#endif
-	
-	if (!mHasMultitexture)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize multitexturing" << LL_ENDL;
-	}
-	if (!mHasMipMapGeneration)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize mipmap generation" << LL_ENDL;
-	}
-	if (!mHasARBEnvCombine)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_env_combine" << LL_ENDL;
-	}
-	if (!mHasPalettedTextures)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_EXT_paletted_texture" << LL_ENDL;
-	}
-	if (!mHasSeparateSpecularColor)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize separate specular color" << LL_ENDL;
-	}
-	if (!mHasAnisotropic)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize anisotropic filtering" << LL_ENDL;
-	}
-	if (!mHasCompressedTextures)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_compression" << LL_ENDL;
-	}
-	if (!mHasOcclusionQuery)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_occlusion_query" << LL_ENDL;
-	}
-	if (!mHasPointParameters)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_point_parameters" << LL_ENDL;
-	}
-	if (!mHasShaderObjects)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_shader_objects" << LL_ENDL;
-	}
-	if (!mHasVertexShader)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_vertex_shader" << LL_ENDL;
-	}
-	if (!mHasFragmentShader)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_fragment_shader" << LL_ENDL;
-	}
-
-	// Disable certain things due to known bugs
-	if (mIsIntel && mHasMipMapGeneration)
-	{
-		LL_INFOS("RenderInit") << "Disabling mip-map generation for Intel GPUs" << LL_ENDL;
-		mHasMipMapGeneration = FALSE;
-	}
-	if (mIsATI && mHasMipMapGeneration)
-	{
-		LL_INFOS("RenderInit") << "Disabling mip-map generation for ATI GPUs (performance opt)" << LL_ENDL;
-		mHasMipMapGeneration = FALSE;
-	}
-	
-	// Misc
-	glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, (GLint*) &mGLMaxVertexRange);
-	glGetIntegerv(GL_MAX_ELEMENTS_INDICES, (GLint*) &mGLMaxIndexRange);
-	
-#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
-	LL_DEBUGS("RenderInit") << "GL Probe: Getting symbols" << LL_ENDL;
-	if (mHasVertexBufferObject)
-	{
-		glBindBufferARB = (PFNGLBINDBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBindBufferARB");
-		if (glBindBufferARB)
-		{
-			glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteBuffersARB");
-			glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenBuffersARB");
-			glIsBufferARB = (PFNGLISBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsBufferARB");
-			glBufferDataARB = (PFNGLBUFFERDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferDataARB");
-			glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferSubDataARB");
-			glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferSubDataARB");
-			glMapBufferARB = (PFNGLMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMapBufferARB");
-			glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glUnmapBufferARB");
-			glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferParameterivARB");
-			glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferPointervARB");
-		}
-		else
-		{
-			mHasVertexBufferObject = FALSE;
-		}
-	}
-	if (mHasFramebufferObject)
-	{
-		glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glIsRenderbufferEXT");
-		glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBindRenderbufferEXT");
-		glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteRenderbuffersEXT");
-		glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenRenderbuffersEXT");
-		glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glRenderbufferStorageEXT");
-		glGetRenderbufferParameterivEXT = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGetRenderbufferParameterivEXT");
-		glIsFramebufferEXT = (PFNGLISFRAMEBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glIsFramebufferEXT");
-		glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBindFramebufferEXT");
-		glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteFramebuffersEXT");
-		glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenFramebuffersEXT");
-		glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glCheckFramebufferStatusEXT");
-		glFramebufferTexture1DEXT = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferTexture1DEXT");
-		glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferTexture2DEXT");
-		glFramebufferTexture3DEXT = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferTexture3DEXT");
-		glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glFramebufferRenderbufferEXT");
-		glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGetFramebufferAttachmentParameterivEXT");
-		glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenerateMipmapEXT");
-	}
-#if !LL_LINUX
-	// This is expected to be a static symbol on Linux GL implementations
-	glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawRangeElements");
-	if (!glDrawRangeElements)
-	{
-		mGLMaxVertexRange = 0;
-		mGLMaxIndexRange = 0;
-	}
-#endif // !LL_LINUX
-#if LL_LINUX
-	// On Linux we need to get glColorTableEXT dynamically.
-	if (mHasPalettedTextures)
-	{
-		glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableEXT");
-	}
-#endif // LL_LINUX
-	if (mHasOcclusionQuery)
-	{
-		glGenQueriesARB = (PFNGLGENQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenQueriesARB");
-		glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteQueriesARB");
-		glIsQueryARB = (PFNGLISQUERYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsQueryARB");
-		glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBeginQueryARB");
-		glEndQueryARB = (PFNGLENDQUERYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glEndQueryARB");
-		glGetQueryivARB = (PFNGLGETQUERYIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryivARB");
-		glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryObjectivARB");
-		glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryObjectuivARB");
-	}
-	if (mHasPointParameters)
-	{
-		glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfARB");
-		glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfvARB");
-	}
-	if (mHasShaderObjects)
-	{
-		glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteObjectARB");
-		glGetHandleARB = (PFNGLGETHANDLEARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetHandleARB");
-		glDetachObjectARB = (PFNGLDETACHOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDetachObjectARB");
-		glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glCreateShaderObjectARB");
-		glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC) GLH_EXT_GET_PROC_ADDRESS("glShaderSourceARB");
-		glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC) GLH_EXT_GET_PROC_ADDRESS("glCompileShaderARB");
-		glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glCreateProgramObjectARB");
-		glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glAttachObjectARB");
-		glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glLinkProgramARB");
-		glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUseProgramObjectARB");
-		glValidateProgramARB = (PFNGLVALIDATEPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glValidateProgramARB");
-		glUniform1fARB = (PFNGLUNIFORM1FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1fARB");
-		glUniform2fARB = (PFNGLUNIFORM2FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2fARB");
-		glUniform3fARB = (PFNGLUNIFORM3FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3fARB");
-		glUniform4fARB = (PFNGLUNIFORM4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4fARB");
-		glUniform1iARB = (PFNGLUNIFORM1IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1iARB");
-		glUniform2iARB = (PFNGLUNIFORM2IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2iARB");
-		glUniform3iARB = (PFNGLUNIFORM3IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3iARB");
-		glUniform4iARB = (PFNGLUNIFORM4IARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4iARB");
-		glUniform1fvARB = (PFNGLUNIFORM1FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1fvARB");
-		glUniform2fvARB = (PFNGLUNIFORM2FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2fvARB");
-		glUniform3fvARB = (PFNGLUNIFORM3FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3fvARB");
-		glUniform4fvARB = (PFNGLUNIFORM4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4fvARB");
-		glUniform1ivARB = (PFNGLUNIFORM1IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform1ivARB");
-		glUniform2ivARB = (PFNGLUNIFORM2IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform2ivARB");
-		glUniform3ivARB = (PFNGLUNIFORM3IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform3ivARB");
-		glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniform4ivARB");
-		glUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniformMatrix2fvARB");
-		glUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniformMatrix3fvARB");
-		glUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glUniformMatrix4fvARB");
-		glGetObjectParameterfvARB = (PFNGLGETOBJECTPARAMETERFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetObjectParameterfvARB");
-		glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetObjectParameterivARB");
-		glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetInfoLogARB");
-		glGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetAttachedObjectsARB");
-		glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetUniformLocationARB");
-		glGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetActiveUniformARB");
-		glGetUniformfvARB = (PFNGLGETUNIFORMFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetUniformfvARB");
-		glGetUniformivARB = (PFNGLGETUNIFORMIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetUniformivARB");
-		glGetShaderSourceARB = (PFNGLGETSHADERSOURCEARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetShaderSourceARB");
-	}
-	if (mHasVertexShader)
-	{
-		glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetAttribLocationARB");
-		glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glBindAttribLocationARB");
-		glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetActiveAttribARB");
-		glVertexAttrib1dARB = (PFNGLVERTEXATTRIB1DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dARB");
-		glVertexAttrib1dvARB = (PFNGLVERTEXATTRIB1DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dvARB");
-		glVertexAttrib1fARB = (PFNGLVERTEXATTRIB1FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fARB");
-		glVertexAttrib1fvARB = (PFNGLVERTEXATTRIB1FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fvARB");
-		glVertexAttrib1sARB = (PFNGLVERTEXATTRIB1SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1sARB");
-		glVertexAttrib1svARB = (PFNGLVERTEXATTRIB1SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1svARB");
-		glVertexAttrib2dARB = (PFNGLVERTEXATTRIB2DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dARB");
-		glVertexAttrib2dvARB = (PFNGLVERTEXATTRIB2DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dvARB");
-		glVertexAttrib2fARB = (PFNGLVERTEXATTRIB2FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fARB");
-		glVertexAttrib2fvARB = (PFNGLVERTEXATTRIB2FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fvARB");
-		glVertexAttrib2sARB = (PFNGLVERTEXATTRIB2SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2sARB");
-		glVertexAttrib2svARB = (PFNGLVERTEXATTRIB2SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2svARB");
-		glVertexAttrib3dARB = (PFNGLVERTEXATTRIB3DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dARB");
-		glVertexAttrib3dvARB = (PFNGLVERTEXATTRIB3DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dvARB");
-		glVertexAttrib3fARB = (PFNGLVERTEXATTRIB3FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fARB");
-		glVertexAttrib3fvARB = (PFNGLVERTEXATTRIB3FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fvARB");
-		glVertexAttrib3sARB = (PFNGLVERTEXATTRIB3SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3sARB");
-		glVertexAttrib3svARB = (PFNGLVERTEXATTRIB3SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3svARB");
-		glVertexAttrib4nbvARB = (PFNGLVERTEXATTRIB4NBVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nbvARB");
-		glVertexAttrib4nivARB = (PFNGLVERTEXATTRIB4NIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nivARB");
-		glVertexAttrib4nsvARB = (PFNGLVERTEXATTRIB4NSVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nsvARB");
-		glVertexAttrib4nubARB = (PFNGLVERTEXATTRIB4NUBARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nubARB");
-		glVertexAttrib4nubvARB = (PFNGLVERTEXATTRIB4NUBVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nubvARB");
-		glVertexAttrib4nuivARB = (PFNGLVERTEXATTRIB4NUIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nuivARB");
-		glVertexAttrib4nusvARB = (PFNGLVERTEXATTRIB4NUSVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4nusvARB");
-		glVertexAttrib4bvARB = (PFNGLVERTEXATTRIB4BVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4bvARB");
-		glVertexAttrib4dARB = (PFNGLVERTEXATTRIB4DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dARB");
-		glVertexAttrib4dvARB = (PFNGLVERTEXATTRIB4DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dvARB");
-		glVertexAttrib4fARB = (PFNGLVERTEXATTRIB4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fARB");
-		glVertexAttrib4fvARB = (PFNGLVERTEXATTRIB4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fvARB");
-		glVertexAttrib4ivARB = (PFNGLVERTEXATTRIB4IVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ivARB");
-		glVertexAttrib4sARB = (PFNGLVERTEXATTRIB4SARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4sARB");
-		glVertexAttrib4svARB = (PFNGLVERTEXATTRIB4SVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4svARB");
-		glVertexAttrib4ubvARB = (PFNGLVERTEXATTRIB4UBVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ubvARB");
-		glVertexAttrib4uivARB = (PFNGLVERTEXATTRIB4UIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4uivARB");
-		glVertexAttrib4usvARB = (PFNGLVERTEXATTRIB4USVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4usvARB");
-		glVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC) GLH_EXT_GET_PROC_ADDRESS("glVertexAttribPointerARB");
-		glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC) GLH_EXT_GET_PROC_ADDRESS("glEnableVertexAttribArrayARB");
-		glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDisableVertexAttribArrayARB");
-		glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramStringARB");
-		glBindProgramARB = (PFNGLBINDPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glBindProgramARB");
-		glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteProgramsARB");
-		glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGenProgramsARB");
-		glProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dARB");
-		glProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dvARB");
-		glProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fARB");
-		glProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fvARB");
-		glProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dARB");
-		glProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dvARB");
-		glProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fARB");
-		glProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fvARB");
-		glGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterdvARB");
-		glGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterfvARB");
-		glGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterdvARB");
-		glGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterfvARB");
-		glGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramivARB");
-		glGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetProgramStringARB");
-		glGetVertexAttribdvARB = (PFNGLGETVERTEXATTRIBDVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribdvARB");
-		glGetVertexAttribfvARB = (PFNGLGETVERTEXATTRIBFVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribfvARB");
-		glGetVertexAttribivARB = (PFNGLGETVERTEXATTRIBIVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribivARB");
-		glGetVertexAttribPointervARB = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC) GLH_EXT_GET_PROC_ADDRESS("glgetVertexAttribPointervARB");
-		glIsProgramARB = (PFNGLISPROGRAMARBPROC) GLH_EXT_GET_PROC_ADDRESS("glIsProgramARB");
-	}
-	LL_DEBUGS("RenderInit") << "GL Probe: Got symbols" << LL_ENDL;
-#endif
-
-	mInited = TRUE;
-}
-
-void rotate_quat(LLQuaternion& rotation)
-{
-	F32 angle_radians, x, y, z;
-	rotation.getAngleAxis(&angle_radians, &x, &y, &z);
-	glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
-}
-
-void flush_glerror()
-{
-	glGetError();
-}
-
-void assert_glerror()
-{
-	if (gNoRender || !gDebugGL) 
-	{
-		return;
-	}
-	if (!gGLManager.mInited)
-	{
-		LL_ERRS("RenderInit") << "GL not initialized" << LL_ENDL;
-	}
-	//  Create or update texture to be used with this data 
-	GLenum error;
-	error = glGetError();
-	BOOL quit = FALSE;
-	while (error)
-	{
-		quit = TRUE;
-#ifndef LL_LINUX // *FIX: !  This should be an error for linux as well.
-		GLubyte const * gl_error_msg = gluErrorString(error);
-		if (NULL != gl_error_msg)
-		{
-			LL_WARNS("RenderState") << "GL Error:" << gl_error_msg << LL_ENDL;
-		}
-		else
-		{
-			// gluErrorString returns NULL for some extensions' error codes.
-			// you'll probably have to grep for the number in glext.h.
-			LL_WARNS("RenderState") << "GL Error: UNKNOWN 0x" << std::hex << error << LL_ENDL;
-		}
-		error = glGetError();
-#endif
-	}
-
-	if (quit)
-	{
-		llerrs << "One or more unhandled GL errors." << llendl;
-	}
-}
-
-void clear_glerror()
-{
-	//  Create or update texture to be used with this data 
-	GLenum error;
-	error = glGetError();
-}
-
-///////////////////////////////////////////////////////////////
-//
-// LLGLState
-//
-
-// Static members
-std::map<LLGLenum, LLGLboolean> LLGLState::sStateMap;
-
-GLboolean LLGLDepthTest::sDepthEnabled = GL_FALSE; // OpenGL default
-GLenum LLGLDepthTest::sDepthFunc = GL_LESS; // OpenGL default
-GLboolean LLGLDepthTest::sWriteEnabled = GL_TRUE; // OpenGL default
-
-//static
-void LLGLState::initClass() 
-{
-	sStateMap[GL_DITHER] = GL_TRUE;
-	sStateMap[GL_TEXTURE_2D] = GL_TRUE;
-
-	//make sure vertex arrays are enabled
-	glEnableClientState(GL_VERTEX_ARRAY);
-
-	//make sure multi sampling is disabled by default
-	glDisable(GL_MULTISAMPLE_ARB);
-}
-
-//static
-void LLGLState::restoreGL()
-{
-	sStateMap.clear();
-	initClass();
-}
-
-//static
-// Really shouldn't be needed, but seems we sometimes do.
-void LLGLState::resetTextureStates()
-{
-	gGL.flush();
-	GLint maxTextureUnits;
-	
-	glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &maxTextureUnits);
-	for (S32 j = maxTextureUnits-1; j >=0; j--)
-	{
-		gGL.getTexUnit(j)->activate();
-		glClientActiveTextureARB(GL_TEXTURE0_ARB+j);
-		j == 0 ? glEnable(GL_TEXTURE_2D) : glDisable(GL_TEXTURE_2D);
-	}
-}
-
-void LLGLState::dumpStates() 
-{
-	LL_INFOS("RenderState") << "GL States:" << LL_ENDL;
-	for (std::map<LLGLenum, LLGLboolean>::iterator iter = sStateMap.begin();
-		 iter != sStateMap.end(); ++iter)
-	{
-		LL_INFOS("RenderState") << llformat(" 0x%04x : %s",(S32)iter->first,iter->second?"TRUE":"FALSE") << LL_ENDL;
-	}
-}
-
-void LLGLState::checkStates()  
-{
-	if (!gDebugGL)
-	{
-		return;
-	}
-
-	stop_glerror();
-
-	GLint activeTexture;
-	glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture);
-	
-	if (activeTexture != GL_TEXTURE0_ARB)
-	{
-		LL_GL_ERRS << "Texture channel corrupted. " << LL_ENDL;
-	}
-	
-	GLint src;
-	GLint dst;
-	glGetIntegerv(GL_BLEND_SRC, &src);
-	glGetIntegerv(GL_BLEND_DST, &dst);
-	
-	if (src != GL_SRC_ALPHA || dst != GL_ONE_MINUS_SRC_ALPHA)
-	{
-		LL_GL_ERRS << "Blend function corrupted: " << std::hex << src << " " << std::hex << dst << LL_ENDL;
-	}
-	
-	for (std::map<LLGLenum, LLGLboolean>::iterator iter = sStateMap.begin();
-		 iter != sStateMap.end(); ++iter)
-	{
-		LLGLenum state = iter->first;
-		LLGLboolean cur_state = iter->second;
-		LLGLboolean gl_state = glIsEnabled(state);
-		if(cur_state != gl_state)
-		{
-			dumpStates();
-			LL_GL_ERRS << llformat("LLGLState error. State: 0x%04x",state) << LL_ENDL;
-		}
-	}
-	
-	stop_glerror();
-}
-
-void LLGLState::checkTextureChannels()
-{
-	if (!gDebugGL)
-	{
-		return;
-	}
-
-	GLint activeTexture;
-	glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture);
-	
-	BOOL error = FALSE;
-
-	if (activeTexture != GL_TEXTURE0_ARB)
-	{
-		error = TRUE;
- 		LL_WARNS("RenderState") << "Active texture channel corrupted. " << LL_ENDL;
-	}
-	else if (!glIsEnabled(GL_TEXTURE_2D))
-	{
-		error = TRUE;
-		LL_WARNS("RenderState") << "GL_TEXTURE_2D not enabled on texture channel 0." << LL_ENDL;
-	}
-	else 
-	{
-		GLint tex_env_mode = 0;
-
-		glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &tex_env_mode);
-		if (tex_env_mode != GL_MODULATE)
-		{
-			error = TRUE;
-			LL_WARNS("RenderState") << "GL_TEXTURE_ENV_MODE invalid: " << std::hex << tex_env_mode << LL_ENDL;
-		}
-	}
-
-	GLint maxTextureUnits;
-	glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &maxTextureUnits);
-
-	static const char* label[] =
-	{
-		"GL_TEXTURE_2D",
-		"GL_TEXTURE_COORD_ARRAY",
-		"GL_TEXTURE_1D",
-		"GL_TEXTURE_CUBE_MAP_ARB",
-		"GL_TEXTURE_GEN_S",
-		"GL_TEXTURE_GEN_T",
-		"GL_TEXTURE_GEN_Q",
-		"GL_TEXTURE_GEN_R"
-	};
-
-	static GLint value[] =
-	{
-		GL_TEXTURE_2D,
-		GL_TEXTURE_COORD_ARRAY,
-		GL_TEXTURE_1D,
-		GL_TEXTURE_CUBE_MAP_ARB,
-		GL_TEXTURE_GEN_S,
-		GL_TEXTURE_GEN_T,
-		GL_TEXTURE_GEN_Q,
-		GL_TEXTURE_GEN_R
-	};
-
-	GLint stackDepth = 0;
-	LLMatrix4 identity;
-	LLMatrix4 matrix;
-
-	for (GLint i = 0; i < maxTextureUnits; i++)
-	{
-		gGL.getTexUnit(i)->activate();
-		glClientActiveTextureARB(GL_TEXTURE0_ARB+i);
-
-		glGetIntegerv(GL_TEXTURE_STACK_DEPTH, &stackDepth);
-
-		if (stackDepth != 1)
-		{
-			error = TRUE;
-			LL_WARNS("RenderState") << "Texture matrix stack corrupted." << LL_ENDL;
-		}
-
-		glGetFloatv(GL_TEXTURE_MATRIX, (GLfloat*) matrix.mMatrix);
-
-		if (matrix != identity)
-		{
-			error = TRUE;
-			LL_WARNS("RenderState") << "Texture matrix in channel " << i << " corrupt." << LL_ENDL;
-		}
-
-		for (S32 j = (i == 0 ? 1 : 0); j < 8; j++)
-		{
-			if (glIsEnabled(value[j]))
-			{
-				error = TRUE;
-				LL_WARNS("RenderState") << "Texture channel " << i << " still has " << label[j] << " enabled." << LL_ENDL;
-			}
-		}
-	}
-
-	gGL.getTexUnit(0)->activate();
-	glClientActiveTextureARB(GL_TEXTURE0_ARB);
-
-	if (error)
-	{
-		LL_GL_ERRS << "GL texture state corruption detected." << LL_ENDL;
-	}
-}
-
-void LLGLState::checkClientArrays(U32 data_mask)
-{
-	if (!gDebugGL)
-	{
-		return;
-	}
-
-	stop_glerror();
-	BOOL error = FALSE;
-
-	GLint active_texture;
-	glGetIntegerv(GL_CLIENT_ACTIVE_TEXTURE_ARB, &active_texture);
-
-	if (active_texture != GL_TEXTURE0_ARB)
-	{
-		llwarns << "Client active texture corrupted: " << active_texture << llendl;
-		error = TRUE;
-	}
-
-	glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &active_texture);
-	if (active_texture != GL_TEXTURE0_ARB)
-	{
-		llwarns << "Active texture corrupted: " << active_texture << llendl;
-		error = TRUE;
-	}
-
-	static const char* label[] =
-	{
-		"GL_VERTEX_ARRAY",
-		"GL_NORMAL_ARRAY",
-		"GL_COLOR_ARRAY",
-		"GL_TEXTURE_COORD_ARRAY"
-	};
-
-	static GLint value[] =
-	{
-		GL_VERTEX_ARRAY,
-		GL_NORMAL_ARRAY,
-		GL_COLOR_ARRAY,
-		GL_TEXTURE_COORD_ARRAY
-	};
-
-	 U32 mask[] = 
-	{ //copied from llvertexbuffer.h
-		0x0001, //MAP_VERTEX,
-		0x0002, //MAP_NORMAL,
-		0x0010, //MAP_COLOR,
-		0x0004, //MAP_TEXCOORD
-	};
-
-
-	for (S32 j = 0; j < 4; j++)
-	{
-		if (glIsEnabled(value[j]))
-		{
-			if (!(mask[j] & data_mask))
-			{
-				error = TRUE;
-				LL_WARNS("RenderState") << "GL still has " << label[j] << " enabled." << LL_ENDL;
-			}
-		}
-		else
-		{
-			if (mask[j] & data_mask)
-			{
-				error = TRUE;
-				LL_WARNS("RenderState") << "GL does not have " << label[j] << " enabled." << LL_ENDL;
-			}
-		}
-	}
-
-	glClientActiveTextureARB(GL_TEXTURE1_ARB);
-	gGL.getTexUnit(1)->activate();
-	if (glIsEnabled(GL_TEXTURE_COORD_ARRAY))
-	{
-		if (!(data_mask & 0x0008))
-		{
-			error = TRUE;
-			LL_WARNS("RenderState") << "GL still has GL_TEXTURE_COORD_ARRAY enabled on channel 1." << LL_ENDL;
-		}
-	}
-	else
-	{
-		if (data_mask & 0x0008)
-		{
-			error = TRUE;
-			LL_WARNS("RenderState") << "GL does not have GL_TEXTURE_COORD_ARRAY enabled on channel 1." << LL_ENDL;
-		}
-	}
-
-	if (glIsEnabled(GL_TEXTURE_2D))
-	{
-		if (!(data_mask & 0x0008))
-		{
-			error = TRUE;
-			LL_WARNS("RenderState") << "GL still has GL_TEXTURE_2D enabled on channel 1." << LL_ENDL;
-		}
-	}
-	else
-	{
-		if (data_mask & 0x0008)
-		{
-			error = TRUE;
-			LL_WARNS("RenderState") << "GL does not have GL_TEXTURE_2D enabled on channel 1." << LL_ENDL;
-		}
-	}
-
-	glClientActiveTextureARB(GL_TEXTURE0_ARB);
-	gGL.getTexUnit(0)->activate();
-
-	if (error)
-	{
-		LL_GL_ERRS << "GL client array corruption detected." << LL_ENDL;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////
-
-LLGLState::LLGLState(LLGLenum state, S32 enabled) :
-	mState(state), mWasEnabled(FALSE), mIsEnabled(FALSE)
-{
-	stop_glerror();
-	if (state)
-	{
-		mWasEnabled = sStateMap[state];
-		llassert(mWasEnabled == glIsEnabled(state));
-		setEnabled(enabled);
-		stop_glerror();
-	}
-}
-
-void LLGLState::setEnabled(S32 enabled)
-{
-	if (!mState)
-	{
-		return;
-	}
-	if (enabled == CURRENT_STATE)
-	{
-		enabled = sStateMap[mState] == GL_TRUE ? TRUE : FALSE;
-	}
-	else if (enabled == TRUE && sStateMap[mState] != GL_TRUE)
-	{
-		gGL.flush();
-		glEnable(mState);
-		sStateMap[mState] = GL_TRUE;
-	}
-	else if (enabled == FALSE && sStateMap[mState] != GL_FALSE)
-	{
-		gGL.flush();
-		glDisable(mState);
-		sStateMap[mState] = GL_FALSE;
-	}
-	mIsEnabled = enabled;
-}
-
-LLGLState::~LLGLState() 
-{
-	stop_glerror();
-	if (mState)
-	{
-		if (gDebugGL)
-		{
-			llassert_always(sStateMap[mState] == glIsEnabled(mState));
-		}
-
-		if (mIsEnabled != mWasEnabled)
-		{
-			gGL.flush();
-			if (mWasEnabled)
-			{
-				glEnable(mState);
-				sStateMap[mState] = GL_TRUE;
-			}
-			else
-			{
-				glDisable(mState);
-				sStateMap[mState] = GL_FALSE;
-			}
-		}
-	}
-	stop_glerror();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void LLGLManager::initGLStates()
-{
-	//gl states moved to classes in llglstates.h
-	LLGLState::initClass();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void enable_vertex_weighting(const S32 index)
-{
-#if GL_ARB_vertex_program
-	if (index > 0) glEnableVertexAttribArrayARB(index);	// vertex weights
-#endif
-}
-
-void disable_vertex_weighting(const S32 index)
-{
-#if GL_ARB_vertex_program
-	if (index > 0) glDisableVertexAttribArrayARB(index);	// vertex weights
-#endif
-}
-
-void enable_binormals(const S32 index)
-{
-#if GL_ARB_vertex_program
-	if (index > 0)
-	{
-		glEnableVertexAttribArrayARB(index);	// binormals
-	}
-#endif
-}
-
-void disable_binormals(const S32 index)
-{
-#if GL_ARB_vertex_program
-	if (index > 0)
-	{
-		glDisableVertexAttribArrayARB(index);	// binormals
-	}
-#endif
-}
-
-
-void enable_cloth_weights(const S32 index)
-{
-#if GL_ARB_vertex_program
-	if (index > 0)	glEnableVertexAttribArrayARB(index);
-#endif
-}
-
-void disable_cloth_weights(const S32 index)
-{
-#if GL_ARB_vertex_program
-	if (index > 0) glDisableVertexAttribArrayARB(index);
-#endif
-}
-
-void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights)
-{
-#if GL_ARB_vertex_program
-	if (index > 0) glVertexAttribPointerARB(index, 1, GL_FLOAT, FALSE, stride, weights);
-	stop_glerror();
-#endif
-}
-
-void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights)
-{
-#if GL_ARB_vertex_program
-	if (index > 0) glVertexAttribPointerARB(index, 4, GL_FLOAT, TRUE, stride, weights);
-	stop_glerror();
-#endif
-}
-
-void set_binormals(const S32 index, const U32 stride,const LLVector3 *binormals)
-{
-#if GL_ARB_vertex_program
-	if (index > 0) glVertexAttribPointerARB(index, 3, GL_FLOAT, FALSE, stride, binormals);
-	stop_glerror();
-#endif
-}
-
-
-void set_palette(U8 *palette_data)
-{
-	if (gGLManager.mHasPalettedTextures)
-	{
-		glColorTableEXT(GL_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette_data);
-	}
-}
-
-
-void parse_gl_version( S32* major, S32* minor, S32* release, LLString* vendor_specific )
-{
-	// GL_VERSION returns a null-terminated string with the format: 
-	// <major>.<minor>[.<release>] [<vendor specific>]
-
-	const char* version = (const char*) glGetString(GL_VERSION);
-	*major = 0;
-	*minor = 0;
-	*release = 0;
-	vendor_specific->assign("");
-
-	if( !version )
-	{
-		return;
-	}
-
-	LLString ver_copy( version );
-	S32 len = (S32)strlen( version );	/* Flawfinder: ignore */
-	S32 i = 0;
-	S32 start;
-	// Find the major version
-	start = i;
-	for( ; i < len; i++ )
-	{
-		if( '.' == version[i] )
-		{
-			break;
-		}
-	}
-	LLString major_str = ver_copy.substr(start,i-start);
-	LLString::convertToS32(major_str, *major);
-
-	if( '.' == version[i] )
-	{
-		i++;
-	}
-
-	// Find the minor version
-	start = i;
-	for( ; i < len; i++ )
-	{
-		if( ('.' == version[i]) || isspace(version[i]) )
-		{
-			break;
-		}
-	}
-	LLString minor_str = ver_copy.substr(start,i-start);
-	LLString::convertToS32(minor_str, *minor);
-
-	// Find the release number (optional)
-	if( '.' == version[i] )
-	{
-		i++;
-
-		start = i;
-		for( ; i < len; i++ )
-		{
-			if( isspace(version[i]) )
-			{
-				break;
-			}
-		}
-
-		LLString release_str = ver_copy.substr(start,i-start);
-		LLString::convertToS32(release_str, *release);
-	}
-
-	// Skip over any white space
-	while( version[i] && isspace( version[i] ) )
-	{
-		i++;
-	}
-
-	// Copy the vendor-specific string (optional)
-	if( version[i] )
-	{
-		vendor_specific->assign( version + i );
-	}
-}
-
-LLGLUserClipPlane::LLGLUserClipPlane(const LLPlane& p, const glh::matrix4f& modelview, const glh::matrix4f& projection)
-{
-	mModelview = modelview;
-	mProjection = projection;
-
-	setPlane(p.mV[0], p.mV[1], p.mV[2], p.mV[3]);
-}
-
-void LLGLUserClipPlane::setPlane(F32 a, F32 b, F32 c, F32 d)
-{
-	glh::matrix4f& P = mProjection;
-	glh::matrix4f& M = mModelview;
-    
-	glh::matrix4f invtrans_MVP = (P * M).inverse().transpose();
-    glh::vec4f oplane(a,b,c,d);
-    glh::vec4f cplane;
-    invtrans_MVP.mult_matrix_vec(oplane, cplane);
-
-    cplane /= fabs(cplane[2]); // normalize such that depth is not scaled
-    cplane[3] -= 1;
-
-    if(cplane[2] < 0)
-        cplane *= -1;
-
-    glh::matrix4f suffix;
-    suffix.set_row(2, cplane);
-    glh::matrix4f newP = suffix * P;
-    glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-    glLoadMatrixf(newP.m);
-	gGLObliqueProjectionInverse = LLMatrix4(newP.inverse().transpose().m);
-    glMatrixMode(GL_MODELVIEW);
-}
-
-LLGLUserClipPlane::~LLGLUserClipPlane()
-{
-	glMatrixMode(GL_PROJECTION);
-	glPopMatrix();
-	glMatrixMode(GL_MODELVIEW);
-}
-
-LLGLNamePool::LLGLNamePool()
-{
-}
-
-void LLGLNamePool::registerPool(LLGLNamePool* pool)
-{
-	pool_list_t::iterator iter = std::find(sInstances.begin(), sInstances.end(), pool);
-	if (iter == sInstances.end())
-	{
-		sInstances.push_back(pool);
-	}
-}
-
-LLGLNamePool::~LLGLNamePool()
-{
-	pool_list_t::iterator iter = std::find(sInstances.begin(), sInstances.end(), this);
-	if (iter != sInstances.end())
-	{
-		sInstances.erase(iter);
-	}
-}
-
-void LLGLNamePool::upkeep()
-{
-	std::sort(mNameList.begin(), mNameList.end(), CompareUsed());
-}
-
-void LLGLNamePool::cleanup()
-{
-	for (name_list_t::iterator iter = mNameList.begin(); iter != mNameList.end(); ++iter)
-	{
-		releaseName(iter->name);
-	}
-
-	mNameList.clear();
-}
-
-GLuint LLGLNamePool::allocate()
-{
-	for (name_list_t::iterator iter = mNameList.begin(); iter != mNameList.end(); ++iter)
-	{
-		if (!iter->used)
-		{
-			iter->used = TRUE;
-			return iter->name;
-		}
-	}
-
-	NameEntry entry;
-	entry.name = allocateName();
-	entry.used = TRUE;
-	mNameList.push_back(entry);
-
-	return entry.name;
-}
-
-void LLGLNamePool::release(GLuint name)
-{
-	for (name_list_t::iterator iter = mNameList.begin(); iter != mNameList.end(); ++iter)
-	{
-		if (iter->name == name)
-		{
-			iter->used = FALSE;
-			return;
-		}
-	}
-}
-
-//static
-void LLGLNamePool::upkeepPools()
-{
-	for (pool_list_t::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
-	{
-		LLGLNamePool* pool = *iter;
-		pool->upkeep();
-	}
-}
-
-//static
-void LLGLNamePool::cleanupPools()
-{
-	for (pool_list_t::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
-	{
-		LLGLNamePool* pool = *iter;
-		pool->cleanup();
-	}
-}
-
-LLGLDepthTest::LLGLDepthTest(GLboolean depth_enabled, GLboolean write_enabled, GLenum depth_func)
-: mPrevDepthEnabled(sDepthEnabled), mPrevDepthFunc(sDepthFunc), mPrevWriteEnabled(sWriteEnabled)
-{
-	if (depth_enabled != sDepthEnabled)
-	{
-		gGL.flush();
-		if (depth_enabled) glEnable(GL_DEPTH_TEST);
-		else glDisable(GL_DEPTH_TEST);
-		sDepthEnabled = depth_enabled;
-	}
-	if (depth_func != sDepthFunc)
-	{
-		gGL.flush();
-		glDepthFunc(depth_func);
-		sDepthFunc = depth_func;
-	}
-	if (write_enabled != sWriteEnabled)
-	{
-		gGL.flush();
-		glDepthMask(write_enabled);
-		sWriteEnabled = write_enabled;
-	}
-}
-
-LLGLDepthTest::~LLGLDepthTest()
-{
-	if (sDepthEnabled != mPrevDepthEnabled )
-	{
-		gGL.flush();
-		if (mPrevDepthEnabled) glEnable(GL_DEPTH_TEST);
-		else glDisable(GL_DEPTH_TEST);
-		sDepthEnabled = mPrevDepthEnabled;
-	}
-	if (sDepthFunc != mPrevDepthFunc)
-	{
-		gGL.flush();
-		glDepthFunc(mPrevDepthFunc);
-		sDepthFunc = mPrevDepthFunc;
-	}
-	if (sWriteEnabled != mPrevWriteEnabled )
-	{
-		gGL.flush();
-		glDepthMask(mPrevWriteEnabled);
-		sWriteEnabled = mPrevWriteEnabled;
-	}
-}
-
-LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
-{
-	for (U32 i = 0; i < 4; i++)
-	{
-		P.element(2, i) = P.element(3, i) * 0.99999f;
-	}
-
-	glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-	glLoadMatrixf(P.m);
-	glMatrixMode(GL_MODELVIEW);
-}
-
-LLGLClampToFarClip::~LLGLClampToFarClip()
-{
-	glMatrixMode(GL_PROJECTION);
-	glPopMatrix();
-	glMatrixMode(GL_MODELVIEW);
-}
-
diff --git a/linden/indra/llwindow/llgl.h b/linden/indra/llwindow/llgl.h
deleted file mode 100644
index 2618dca..0000000
--- a/linden/indra/llwindow/llgl.h
+++ /dev/null
@@ -1,377 +0,0 @@
-/** 
- * @file llgl.h
- * @brief LLGL definition
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLGL_H
-#define LL_LLGL_H
-
-// This file contains various stuff for handling gl extensions and other gl related stuff.
-
-#include <string>
-#include <map>
-
-#include "llerror.h"
-#include "v4color.h"
-#include "llstring.h"
-#include "stdtypes.h"
-#include "v4math.h"
-#include "llplane.h"
-#include "llgltypes.h"
-
-#include "llglheaders.h"
-#include "glh/glh_linear.h"
-
-extern BOOL gDebugGL;
-
-#define LL_GL_ERRS LL_ERRS("RenderState")
-
-class LLSD;
-
-// Manage GL extensions...
-class LLGLManager
-{
-public:
-	LLGLManager();
-
-	bool initGL();
-	void shutdownGL();
-
-	void initWGL(); // Initializes stupid WGL extensions
-
-	LLString getRawGLString(); // For sending to simulator
-
-	BOOL mInited;
-	BOOL mIsDisabled;
-
-	// Extensions used by everyone
-	BOOL mHasMultitexture;
-	S32	 mNumTextureUnits;
-	BOOL mHasMipMapGeneration;
-	BOOL mHasPalettedTextures;
-	BOOL mHasCompressedTextures;
-	BOOL mHasFramebufferObject;
-
-	// ARB Extensions
-	BOOL mHasVertexBufferObject;
-	BOOL mHasPBuffer;
-	BOOL mHasShaderObjects;
-	BOOL mHasVertexShader;
-	BOOL mHasFragmentShader;
-	BOOL mHasOcclusionQuery;
-	BOOL mHasPointParameters;
-
-	// Other extensions.
-	BOOL mHasAnisotropic;
-	BOOL mHasARBEnvCombine;
-	BOOL mHasCubeMap;
-
-	// Vendor-specific extensions
-	BOOL mIsATI;
-	BOOL mIsNVIDIA;
-	BOOL mIsIntel;
-	BOOL mIsGF2or4MX;
-	BOOL mIsGF3;
-	BOOL mIsGFFX;
-	BOOL mATIOffsetVerticalLines;
-
-	// Whether this version of GL is good enough for SL to use
-	BOOL mHasRequirements;
-
-	// Misc extensions
-	BOOL mHasSeparateSpecularColor;
-	
-	S32 mDriverVersionMajor;
-	S32 mDriverVersionMinor;
-	S32 mDriverVersionRelease;
-	F32 mGLVersion; // e.g = 1.4
-	LLString mDriverVersionVendorString;
-
-	S32 mVRAM; // VRAM in MB
-	S32 mGLMaxVertexRange;
-	S32 mGLMaxIndexRange;
-	
-	void getPixelFormat(); // Get the best pixel format
-
-	LLString getGLInfoString();
-	void printGLInfoString();
-	void getGLInfo(LLSD& info);
-
-	// In ALL CAPS
-	LLString mGLVendor;
-	LLString mGLVendorShort;
-
-	// In ALL CAPS
-	LLString mGLRenderer;
-
-private:
-	void initExtensions();
-	void initGLStates();
-	void initGLImages();
-};
-
-extern LLGLManager gGLManager;
-
-class LLQuaternion;
-class LLMatrix4;
-
-void rotate_quat(LLQuaternion& rotation);
-
-void flush_glerror(); // Flush GL errors when we know we're handling them correctly.
-
-void assert_glerror();
-
-void clear_glerror();
-
-//#if LL_DEBUG
-# define stop_glerror() assert_glerror()
-# define llglassertok() assert_glerror()
-//#else
-//# define stop_glerror()
-//# define llglassertok()
-//#endif
-
-#define llglassertok_always() assert_glerror()
-
-////////////////////////
-//
-// Note: U32's are GLEnum's...
-//
-
-// This is a class for GL state management
-
-/*
-	GL STATE MANAGEMENT DESCRIPTION
-
-	LLGLState and its two subclasses, LLGLEnable and LLGLDisable, manage the current 
-	enable/disable states of the GL to prevent redundant setting of state within a 
-	render path or the accidental corruption of what state the next path expects.
-
-	Essentially, wherever you would call glEnable set a state and then
-	subsequently reset it by calling glDisable (or vice versa), make an instance of 
-	LLGLEnable with the state you want to set, and assume it will be restored to its
-	original state when that instance of LLGLEnable is destroyed.  It is good practice
-	to exploit stack frame controls for optimal setting/unsetting and readability of 
-	code.  In llglstates.h, there are a collection of helper classes that define groups
-	of enables/disables that can cause multiple states to be set with the creation of
-	one instance.  
-
-	Sample usage:
-
-	//disable lighting for rendering hud objects
-	//INCORRECT USAGE
-	LLGLEnable lighting(GL_LIGHTING);
-	renderHUD();
-	LLGLDisable lighting(GL_LIGHTING);
-
-	//CORRECT USAGE
-	{
-		LLGLEnable lighting(GL_LIGHTING);
-		renderHUD();
-	}
-
-	If a state is to be set on a conditional, the following mechanism
-	is useful:
-
-	{
-		LLGLEnable lighting(light_hud ? GL_LIGHTING : 0);
-		renderHUD();
-	}
-
-	A LLGLState initialized with a parameter of 0 does nothing.
-
-	LLGLState works by maintaining a map of the current GL states, and ignoring redundant
-	enables/disables.  If a redundant call is attempted, it becomes a noop, otherwise,
-	it is set in the constructor and reset in the destructor.  
-
-	For debugging GL state corruption, running with debug enabled will trigger asserts
-	if the existing GL state does not match the expected GL state.
-
-*/
-class LLGLState
-{
-public:
-	static void initClass();
-	static void restoreGL();
-
-	static void resetTextureStates();
-	static void dumpStates();
-	static void checkStates();
-	static void checkTextureChannels();
-	static void checkClientArrays(U32 data_mask = 0x0001);
-	
-protected:
-	static std::map<LLGLenum, LLGLboolean> sStateMap;
-	
-public:
-	enum { CURRENT_STATE = -2 };
-	LLGLState(LLGLenum state, S32 enabled = CURRENT_STATE);
-	~LLGLState();
-	void setEnabled(S32 enabled);
-	void enable() { setEnabled(TRUE); }
-	void disable() { setEnabled(FALSE); }
-protected:
-	LLGLenum mState;
-	BOOL mWasEnabled;
-	BOOL mIsEnabled;
-};
-
-// New LLGLState class wrappers that don't depend on actual GL flags.
-class LLGLEnableBlending : public LLGLState
-{
-public:
-	LLGLEnableBlending(bool enable);
-};
-
-class LLGLEnableAlphaReject : public LLGLState
-{
-public:
-	LLGLEnableAlphaReject(bool enable);
-};
-
-/// TODO: Being deprecated.
-class LLGLEnable : public LLGLState
-{
-public:
-	LLGLEnable(LLGLenum state) : LLGLState(state, TRUE) {}
-};
-
-/// TODO: Being deprecated.
-class LLGLDisable : public LLGLState
-{
-public:
-	LLGLDisable(LLGLenum state) : LLGLState(state, FALSE) {}
-};
-
-/*
-  Store and modify projection matrix to create an oblique
-  projection that clips to the specified plane.  Oblique
-  projections alter values in the depth buffer, so this
-  class should not be used mid-renderpass.  
-
-  Restores projection matrix on destruction.
-  GL_MODELVIEW_MATRIX is active whenever program execution
-  leaves this class.
-  Does not stack.
-  Caches inverse of projection matrix used in gGLObliqueProjectionInverse
-*/
-class LLGLUserClipPlane 
-{
-public:
-	
-	LLGLUserClipPlane(const LLPlane& plane, const glh::matrix4f& modelview, const glh::matrix4f& projection);
-	~LLGLUserClipPlane();
-
-	void setPlane(F32 a, F32 b, F32 c, F32 d);
-
-private:
-	glh::matrix4f mProjection;
-	glh::matrix4f mModelview;
-};
-
-/*
-  Modify and load projection matrix to push depth values to far clip plane.
-
-  Restores projection matrix on destruction.
-  GL_MODELVIEW_MATRIX is active whenever program execution
-  leaves this class.
-  Does not stack.
-*/
-class LLGLClampToFarClip
-{
-public:
-	LLGLClampToFarClip(glh::matrix4f projection);
-	~LLGLClampToFarClip();
-};
-
-/*
-	Generic pooling scheme for things which use GL names (used for occlusion queries and vertex buffer objects).
-	Prevents thrashing of GL name caches by avoiding calls to glGenFoo and glDeleteFoo.
-*/
-class LLGLNamePool
-{
-public:
-	typedef struct
-	{
-		GLuint name;
-		BOOL used;
-	} NameEntry;
-
-	struct CompareUsed
-	{
-		bool operator()(const NameEntry& lhs, const NameEntry& rhs)
-		{
-			return lhs.used < rhs.used;  //FALSE entries first
-		}
-	};
-
-	typedef std::vector<NameEntry> name_list_t;
-	name_list_t mNameList;
-
-	LLGLNamePool();
-	virtual ~LLGLNamePool();
-	
-	void upkeep();
-	void cleanup();
-	
-	GLuint allocate();
-	void release(GLuint name);
-	
-	static void registerPool(LLGLNamePool* pool);
-	static void upkeepPools();
-	static void cleanupPools();
-
-protected:
-	typedef std::vector<LLGLNamePool*> pool_list_t;
-	static pool_list_t sInstances;
-	
-	virtual GLuint allocateName() = 0;
-	virtual void releaseName(GLuint name) = 0;
-};
-
-extern LLMatrix4 gGLObliqueProjectionInverse;
-
-#include "llglstates.h"
-
-void init_glstates();
-void enable_vertex_weighting(const S32 index);
-void disable_vertex_weighting(const S32 index);
-void enable_binormals(const S32 index);
-void disable_binormals(const S32 index);
-void enable_cloth_weights(const S32 index);
-void disable_cloth_weights(const S32 index);
-void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights);
-void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights);
-void set_binormals(const S32 index, const U32 stride, const LLVector3 *binormals);
-void set_palette(U8* palette_data);
-void parse_gl_version( S32* major, S32* minor, S32* release, LLString* vendor_specific );
-
-extern BOOL gClothRipple;
-extern BOOL gNoRender;
-#endif // LL_LLGL_H
diff --git a/linden/indra/llwindow/llglheaders.h b/linden/indra/llwindow/llglheaders.h
deleted file mode 100644
index d66fbe4..0000000
--- a/linden/indra/llwindow/llglheaders.h
+++ /dev/null
@@ -1,597 +0,0 @@
-/** 
- * @file llglheaders.h
- * @brief LLGL definitions
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLGLHEADERS_H
-#define LL_LLGLHEADERS_H
-
-#if LL_LINUX
-# ifndef LL_MESA
-#  define LL_MESA 1 // force MESA
-# endif
-# ifndef LL_MESA_HEADLESS
-#  define LL_MESA_HEADLESS 1 // force MESA HEADLESS
-# endif
-#endif
-
-#if LL_MESA
-//----------------------------------------------------------------------------
-// MESA headers
-// quotes so we get libraries/.../GL/ version
-#define GL_GLEXT_PROTOTYPES
-#include "GL/gl.h"
-#include "GL/glext.h"
-#include "GL/glu.h"
-
-// The __APPLE__ kludge is to make glh_extensions.h not symbol-clash horribly
-# define __APPLE__
-# include "GL/glh_extensions.h"
-# undef __APPLE__
-
-#elif LL_LINUX
-//----------------------------------------------------------------------------
-// Linux, MESA headers, but not necessarily assuming MESA runtime.
-// quotes so we get libraries/.../GL/ version
-#include "GL/gl.h"
-#include "GL/glext.h"
-#include "GL/glu.h"
-
-
-#if LL_LINUX && !LL_MESA_HEADLESS
-// The __APPLE__ kludge is to make glh_extensions.h not symbol-clash horribly
-# define __APPLE__
-# include "GL/glh_extensions.h"
-# undef __APPLE__
-
-/* Although SDL very likely ends up calling glXGetProcAddress() itself,
-   if we use SDL_GL_GetProcAddress() then we get bogus addresses back on
-   some systems.  Weird. */
-/*# include "SDL/SDL.h"
-  # define GLH_EXT_GET_PROC_ADDRESS(p) SDL_GL_GetProcAddress(p) */
-#define GLX_GLXEXT_PROTOTYPES 1
-# include "GL/glx.h"
-# include "GL/glxext.h"
-// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
-// is considered 'legacy' but works on more machines.
-# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p))
-// Whee, the X headers define 'Status'.  Undefine to avoid confusion.
-#undef Status
-#endif // LL_LINUX && !LL_MESA_HEADLESS
-
-
-// GL_ARB_vertex_buffer_object
-extern PFNGLBINDBUFFERARBPROC		glBindBufferARB;
-extern PFNGLDELETEBUFFERSARBPROC	glDeleteBuffersARB;
-extern PFNGLGENBUFFERSARBPROC		glGenBuffersARB;
-extern PFNGLISBUFFERARBPROC			glIsBufferARB;
-extern PFNGLBUFFERDATAARBPROC		glBufferDataARB;
-extern PFNGLBUFFERSUBDATAARBPROC	glBufferSubDataARB;
-extern PFNGLGETBUFFERSUBDATAARBPROC glGetBufferSubDataARB;
-extern PFNGLMAPBUFFERARBPROC		glMapBufferARB;
-extern PFNGLUNMAPBUFFERARBPROC		glUnmapBufferARB;
-extern PFNGLGETBUFFERPARAMETERIVARBPROC	glGetBufferParameterivARB;
-extern PFNGLGETBUFFERPOINTERVARBPROC	glGetBufferPointervARB;
-
-// GL_ATI_vertex_array_object
-extern PFNGLNEWOBJECTBUFFERATIPROC			glNewObjectBufferATI;
-extern PFNGLISOBJECTBUFFERATIPROC			glIsObjectBufferATI;
-extern PFNGLUPDATEOBJECTBUFFERATIPROC		glUpdateObjectBufferATI;
-extern PFNGLGETOBJECTBUFFERFVATIPROC		glGetObjectBufferfvATI;
-extern PFNGLGETOBJECTBUFFERIVATIPROC		glGetObjectBufferivATI;
-extern PFNGLFREEOBJECTBUFFERATIPROC		    glFreeObjectBufferATI;
-extern PFNGLARRAYOBJECTATIPROC				glArrayObjectATI;
-extern PFNGLVERTEXATTRIBARRAYOBJECTATIPROC	glVertexAttribArrayObjectATI;
-extern PFNGLGETARRAYOBJECTFVATIPROC			glGetArrayObjectfvATI;
-extern PFNGLGETARRAYOBJECTIVATIPROC			glGetArrayObjectivATI;
-extern PFNGLVARIANTARRAYOBJECTATIPROC		glVariantObjectArrayATI;
-extern PFNGLGETVARIANTARRAYOBJECTFVATIPROC	glGetVariantArrayObjectfvATI;
-extern PFNGLGETVARIANTARRAYOBJECTIVATIPROC	glGetVariantArrayObjectivATI;
-
-// GL_ARB_occlusion_query
-extern PFNGLGENQUERIESARBPROC glGenQueriesARB;
-extern PFNGLDELETEQUERIESARBPROC glDeleteQueriesARB;
-extern PFNGLISQUERYARBPROC glIsQueryARB;
-extern PFNGLBEGINQUERYARBPROC glBeginQueryARB;
-extern PFNGLENDQUERYARBPROC glEndQueryARB;
-extern PFNGLGETQUERYIVARBPROC glGetQueryivARB;
-extern PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB;
-extern PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB;
-
-// GL_ARB_point_parameters
-extern PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB;
-extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB;
-
-// GL_ARB_shader_objects
-extern PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
-extern PFNGLGETHANDLEARBPROC glGetHandleARB;
-extern PFNGLDETACHOBJECTARBPROC glDetachObjectARB;
-extern PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
-extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
-extern PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
-extern PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
-extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
-extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
-extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
-extern PFNGLVALIDATEPROGRAMARBPROC glValidateProgramARB;
-extern PFNGLUNIFORM1FARBPROC glUniform1fARB;
-extern PFNGLUNIFORM2FARBPROC glUniform2fARB;
-extern PFNGLUNIFORM3FARBPROC glUniform3fARB;
-extern PFNGLUNIFORM4FARBPROC glUniform4fARB;
-extern PFNGLUNIFORM1IARBPROC glUniform1iARB;
-extern PFNGLUNIFORM2IARBPROC glUniform2iARB;
-extern PFNGLUNIFORM3IARBPROC glUniform3iARB;
-extern PFNGLUNIFORM4IARBPROC glUniform4iARB;
-extern PFNGLUNIFORM1FVARBPROC glUniform1fvARB;
-extern PFNGLUNIFORM2FVARBPROC glUniform2fvARB;
-extern PFNGLUNIFORM3FVARBPROC glUniform3fvARB;
-extern PFNGLUNIFORM4FVARBPROC glUniform4fvARB;
-extern PFNGLUNIFORM1IVARBPROC glUniform1ivARB;
-extern PFNGLUNIFORM2IVARBPROC glUniform2ivARB;
-extern PFNGLUNIFORM3IVARBPROC glUniform3ivARB;
-extern PFNGLUNIFORM4IVARBPROC glUniform4ivARB;
-extern PFNGLUNIFORMMATRIX2FVARBPROC glUniformMatrix2fvARB;
-extern PFNGLUNIFORMMATRIX3FVARBPROC glUniformMatrix3fvARB;
-extern PFNGLUNIFORMMATRIX4FVARBPROC glUniformMatrix4fvARB;
-extern PFNGLGETOBJECTPARAMETERFVARBPROC glGetObjectParameterfvARB;
-extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
-extern PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
-extern PFNGLGETATTACHEDOBJECTSARBPROC glGetAttachedObjectsARB;
-extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
-extern PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB;
-extern PFNGLGETUNIFORMFVARBPROC glGetUniformfvARB;
-extern PFNGLGETUNIFORMIVARBPROC glGetUniformivARB;
-extern PFNGLGETSHADERSOURCEARBPROC glGetShaderSourceARB;
-
-// GL_ARB_vertex_shader
-extern PFNGLVERTEXATTRIB1DARBPROC glVertexAttrib1dARB;
-extern PFNGLVERTEXATTRIB1DVARBPROC glVertexAttrib1dvARB;
-extern PFNGLVERTEXATTRIB1FARBPROC glVertexAttrib1fARB;
-extern PFNGLVERTEXATTRIB1FVARBPROC glVertexAttrib1fvARB;
-extern PFNGLVERTEXATTRIB1SARBPROC glVertexAttrib1sARB;
-extern PFNGLVERTEXATTRIB1SVARBPROC glVertexAttrib1svARB;
-extern PFNGLVERTEXATTRIB2DARBPROC glVertexAttrib2dARB;
-extern PFNGLVERTEXATTRIB2DVARBPROC glVertexAttrib2dvARB;
-extern PFNGLVERTEXATTRIB2FARBPROC glVertexAttrib2fARB;
-extern PFNGLVERTEXATTRIB2FVARBPROC glVertexAttrib2fvARB;
-extern PFNGLVERTEXATTRIB2SARBPROC glVertexAttrib2sARB;
-extern PFNGLVERTEXATTRIB2SVARBPROC glVertexAttrib2svARB;
-extern PFNGLVERTEXATTRIB3DARBPROC glVertexAttrib3dARB;
-extern PFNGLVERTEXATTRIB3DVARBPROC glVertexAttrib3dvARB;
-extern PFNGLVERTEXATTRIB3FARBPROC glVertexAttrib3fARB;
-extern PFNGLVERTEXATTRIB3FVARBPROC glVertexAttrib3fvARB;
-extern PFNGLVERTEXATTRIB3SARBPROC glVertexAttrib3sARB;
-extern PFNGLVERTEXATTRIB3SVARBPROC glVertexAttrib3svARB;
-extern PFNGLVERTEXATTRIB4NBVARBPROC glVertexAttrib4nbvARB;
-extern PFNGLVERTEXATTRIB4NIVARBPROC glVertexAttrib4nivARB;
-extern PFNGLVERTEXATTRIB4NSVARBPROC glVertexAttrib4nsvARB;
-extern PFNGLVERTEXATTRIB4NUBARBPROC glVertexAttrib4nubARB;
-extern PFNGLVERTEXATTRIB4NUBVARBPROC glVertexAttrib4nubvARB;
-extern PFNGLVERTEXATTRIB4NUIVARBPROC glVertexAttrib4nuivARB;
-extern PFNGLVERTEXATTRIB4NUSVARBPROC glVertexAttrib4nusvARB;
-extern PFNGLVERTEXATTRIB4BVARBPROC glVertexAttrib4bvARB;
-extern PFNGLVERTEXATTRIB4DARBPROC glVertexAttrib4dARB;
-extern PFNGLVERTEXATTRIB4DVARBPROC glVertexAttrib4dvARB;
-extern PFNGLVERTEXATTRIB4FARBPROC glVertexAttrib4fARB;
-extern PFNGLVERTEXATTRIB4FVARBPROC glVertexAttrib4fvARB;
-extern PFNGLVERTEXATTRIB4IVARBPROC glVertexAttrib4ivARB;
-extern PFNGLVERTEXATTRIB4SARBPROC glVertexAttrib4sARB;
-extern PFNGLVERTEXATTRIB4SVARBPROC glVertexAttrib4svARB;
-extern PFNGLVERTEXATTRIB4UBVARBPROC glVertexAttrib4ubvARB;
-extern PFNGLVERTEXATTRIB4UIVARBPROC glVertexAttrib4uivARB;
-extern PFNGLVERTEXATTRIB4USVARBPROC glVertexAttrib4usvARB;
-extern PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB;
-extern PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB;
-extern PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB;
-extern PFNGLPROGRAMSTRINGARBPROC glProgramStringARB;
-extern PFNGLBINDPROGRAMARBPROC glBindProgramARB;
-extern PFNGLDELETEPROGRAMSARBPROC glDeleteProgramsARB;
-extern PFNGLGENPROGRAMSARBPROC glGenProgramsARB;
-extern PFNGLPROGRAMENVPARAMETER4DARBPROC glProgramEnvParameter4dARB;
-extern PFNGLPROGRAMENVPARAMETER4DVARBPROC glProgramEnvParameter4dvARB;
-extern PFNGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB;
-extern PFNGLPROGRAMENVPARAMETER4FVARBPROC glProgramEnvParameter4fvARB;
-extern PFNGLPROGRAMLOCALPARAMETER4DARBPROC glProgramLocalParameter4dARB;
-extern PFNGLPROGRAMLOCALPARAMETER4DVARBPROC glProgramLocalParameter4dvARB;
-extern PFNGLPROGRAMLOCALPARAMETER4FARBPROC glProgramLocalParameter4fARB;
-extern PFNGLPROGRAMLOCALPARAMETER4FVARBPROC glProgramLocalParameter4fvARB;
-extern PFNGLGETPROGRAMENVPARAMETERDVARBPROC glGetProgramEnvParameterdvARB;
-extern PFNGLGETPROGRAMENVPARAMETERFVARBPROC glGetProgramEnvParameterfvARB;
-extern PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC glGetProgramLocalParameterdvARB;
-extern PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC glGetProgramLocalParameterfvARB;
-extern PFNGLGETPROGRAMIVARBPROC glGetProgramivARB;
-extern PFNGLGETPROGRAMSTRINGARBPROC glGetProgramStringARB;
-extern PFNGLGETVERTEXATTRIBDVARBPROC glGetVertexAttribdvARB;
-extern PFNGLGETVERTEXATTRIBFVARBPROC glGetVertexAttribfvARB;
-extern PFNGLGETVERTEXATTRIBIVARBPROC glGetVertexAttribivARB;
-extern PFNGLGETVERTEXATTRIBPOINTERVARBPROC glGetVertexAttribPointervARB;
-extern PFNGLISPROGRAMARBPROC glIsProgramARB;
-extern PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB;
-extern PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB;
-extern PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB;
-
-extern PFNGLCOMPRESSEDTEXIMAGE2DARBPROC glCompressedTexImage2DARB;
-extern PFNGLGETCOMPRESSEDTEXIMAGEARBPROC glGetCompressedTexImageARB;
-
-extern PFNGLCOLORTABLEEXTPROC glColorTableEXT;
-
-//GL_EXT_framebuffer_object
-extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
-extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
-extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
-extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
-extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
-extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
-extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
-extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
-extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
-extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
-extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
-extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
-extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
-extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
-extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
-extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
-extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
-
-
-#elif LL_WINDOWS
-
-// windows gl headers depend on things like APIENTRY, so include windows.
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-#include <windows.h>
-
-//----------------------------------------------------------------------------
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-// quotes so we get libraries/.../GL/ version
-#include "GL/glext.h"
-#include "GL/glh_extensions.h"
-
-
-// GL_ARB_vertex_buffer_object
-extern PFNGLBINDBUFFERARBPROC		glBindBufferARB;
-extern PFNGLDELETEBUFFERSARBPROC	glDeleteBuffersARB;
-extern PFNGLGENBUFFERSARBPROC		glGenBuffersARB;
-extern PFNGLISBUFFERARBPROC			glIsBufferARB;
-extern PFNGLBUFFERDATAARBPROC		glBufferDataARB;
-extern PFNGLBUFFERSUBDATAARBPROC	glBufferSubDataARB;
-extern PFNGLGETBUFFERSUBDATAARBPROC glGetBufferSubDataARB;
-extern PFNGLMAPBUFFERARBPROC		glMapBufferARB;
-extern PFNGLUNMAPBUFFERARBPROC		glUnmapBufferARB;
-extern PFNGLGETBUFFERPARAMETERIVARBPROC	glGetBufferParameterivARB;
-extern PFNGLGETBUFFERPOINTERVARBPROC	glGetBufferPointervARB;
-
-// GL_ATI_vertex_array_object
-extern PFNGLNEWOBJECTBUFFERATIPROC			glNewObjectBufferATI;
-extern PFNGLISOBJECTBUFFERATIPROC			glIsObjectBufferATI;
-extern PFNGLUPDATEOBJECTBUFFERATIPROC		glUpdateObjectBufferATI;
-extern PFNGLGETOBJECTBUFFERFVATIPROC		glGetObjectBufferfvATI;
-extern PFNGLGETOBJECTBUFFERIVATIPROC		glGetObjectBufferivATI;
-extern PFNGLFREEOBJECTBUFFERATIPROC		    glFreeObjectBufferATI;
-extern PFNGLARRAYOBJECTATIPROC				glArrayObjectATI;
-extern PFNGLVERTEXATTRIBARRAYOBJECTATIPROC	glVertexAttribArrayObjectATI;
-extern PFNGLGETARRAYOBJECTFVATIPROC			glGetArrayObjectfvATI;
-extern PFNGLGETARRAYOBJECTIVATIPROC			glGetArrayObjectivATI;
-extern PFNGLVARIANTARRAYOBJECTATIPROC		glVariantObjectArrayATI;
-extern PFNGLGETVARIANTARRAYOBJECTFVATIPROC	glGetVariantArrayObjectfvATI;
-extern PFNGLGETVARIANTARRAYOBJECTIVATIPROC	glGetVariantArrayObjectivATI;
-
-extern PFNWGLSWAPINTERVALEXTPROC			wglSwapIntervalEXT;
-
-// GL_ARB_occlusion_query
-extern PFNGLGENQUERIESARBPROC glGenQueriesARB;
-extern PFNGLDELETEQUERIESARBPROC glDeleteQueriesARB;
-extern PFNGLISQUERYARBPROC glIsQueryARB;
-extern PFNGLBEGINQUERYARBPROC glBeginQueryARB;
-extern PFNGLENDQUERYARBPROC glEndQueryARB;
-extern PFNGLGETQUERYIVARBPROC glGetQueryivARB;
-extern PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB;
-extern PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB;
-
-// GL_ARB_point_parameters
-extern PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB;
-extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB;
-
-// GL_ARB_shader_objects
-extern PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
-extern PFNGLGETHANDLEARBPROC glGetHandleARB;
-extern PFNGLDETACHOBJECTARBPROC glDetachObjectARB;
-extern PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
-extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
-extern PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
-extern PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
-extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
-extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
-extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
-extern PFNGLVALIDATEPROGRAMARBPROC glValidateProgramARB;
-extern PFNGLUNIFORM1FARBPROC glUniform1fARB;
-extern PFNGLUNIFORM2FARBPROC glUniform2fARB;
-extern PFNGLUNIFORM3FARBPROC glUniform3fARB;
-extern PFNGLUNIFORM4FARBPROC glUniform4fARB;
-extern PFNGLUNIFORM1IARBPROC glUniform1iARB;
-extern PFNGLUNIFORM2IARBPROC glUniform2iARB;
-extern PFNGLUNIFORM3IARBPROC glUniform3iARB;
-extern PFNGLUNIFORM4IARBPROC glUniform4iARB;
-extern PFNGLUNIFORM1FVARBPROC glUniform1fvARB;
-extern PFNGLUNIFORM2FVARBPROC glUniform2fvARB;
-extern PFNGLUNIFORM3FVARBPROC glUniform3fvARB;
-extern PFNGLUNIFORM4FVARBPROC glUniform4fvARB;
-extern PFNGLUNIFORM1IVARBPROC glUniform1ivARB;
-extern PFNGLUNIFORM2IVARBPROC glUniform2ivARB;
-extern PFNGLUNIFORM3IVARBPROC glUniform3ivARB;
-extern PFNGLUNIFORM4IVARBPROC glUniform4ivARB;
-extern PFNGLUNIFORMMATRIX2FVARBPROC glUniformMatrix2fvARB;
-extern PFNGLUNIFORMMATRIX3FVARBPROC glUniformMatrix3fvARB;
-extern PFNGLUNIFORMMATRIX4FVARBPROC glUniformMatrix4fvARB;
-extern PFNGLGETOBJECTPARAMETERFVARBPROC glGetObjectParameterfvARB;
-extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
-extern PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
-extern PFNGLGETATTACHEDOBJECTSARBPROC glGetAttachedObjectsARB;
-extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
-extern PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB;
-extern PFNGLGETUNIFORMFVARBPROC glGetUniformfvARB;
-extern PFNGLGETUNIFORMIVARBPROC glGetUniformivARB;
-extern PFNGLGETSHADERSOURCEARBPROC glGetShaderSourceARB;
-
-// GL_ARB_vertex_shader
-extern PFNGLVERTEXATTRIB1DARBPROC glVertexAttrib1dARB;
-extern PFNGLVERTEXATTRIB1DVARBPROC glVertexAttrib1dvARB;
-extern PFNGLVERTEXATTRIB1FARBPROC glVertexAttrib1fARB;
-extern PFNGLVERTEXATTRIB1FVARBPROC glVertexAttrib1fvARB;
-extern PFNGLVERTEXATTRIB1SARBPROC glVertexAttrib1sARB;
-extern PFNGLVERTEXATTRIB1SVARBPROC glVertexAttrib1svARB;
-extern PFNGLVERTEXATTRIB2DARBPROC glVertexAttrib2dARB;
-extern PFNGLVERTEXATTRIB2DVARBPROC glVertexAttrib2dvARB;
-extern PFNGLVERTEXATTRIB2FARBPROC glVertexAttrib2fARB;
-extern PFNGLVERTEXATTRIB2FVARBPROC glVertexAttrib2fvARB;
-extern PFNGLVERTEXATTRIB2SARBPROC glVertexAttrib2sARB;
-extern PFNGLVERTEXATTRIB2SVARBPROC glVertexAttrib2svARB;
-extern PFNGLVERTEXATTRIB3DARBPROC glVertexAttrib3dARB;
-extern PFNGLVERTEXATTRIB3DVARBPROC glVertexAttrib3dvARB;
-extern PFNGLVERTEXATTRIB3FARBPROC glVertexAttrib3fARB;
-extern PFNGLVERTEXATTRIB3FVARBPROC glVertexAttrib3fvARB;
-extern PFNGLVERTEXATTRIB3SARBPROC glVertexAttrib3sARB;
-extern PFNGLVERTEXATTRIB3SVARBPROC glVertexAttrib3svARB;
-extern PFNGLVERTEXATTRIB4NBVARBPROC glVertexAttrib4nbvARB;
-extern PFNGLVERTEXATTRIB4NIVARBPROC glVertexAttrib4nivARB;
-extern PFNGLVERTEXATTRIB4NSVARBPROC glVertexAttrib4nsvARB;
-extern PFNGLVERTEXATTRIB4NUBARBPROC glVertexAttrib4nubARB;
-extern PFNGLVERTEXATTRIB4NUBVARBPROC glVertexAttrib4nubvARB;
-extern PFNGLVERTEXATTRIB4NUIVARBPROC glVertexAttrib4nuivARB;
-extern PFNGLVERTEXATTRIB4NUSVARBPROC glVertexAttrib4nusvARB;
-extern PFNGLVERTEXATTRIB4BVARBPROC glVertexAttrib4bvARB;
-extern PFNGLVERTEXATTRIB4DARBPROC glVertexAttrib4dARB;
-extern PFNGLVERTEXATTRIB4DVARBPROC glVertexAttrib4dvARB;
-extern PFNGLVERTEXATTRIB4FARBPROC glVertexAttrib4fARB;
-extern PFNGLVERTEXATTRIB4FVARBPROC glVertexAttrib4fvARB;
-extern PFNGLVERTEXATTRIB4IVARBPROC glVertexAttrib4ivARB;
-extern PFNGLVERTEXATTRIB4SARBPROC glVertexAttrib4sARB;
-extern PFNGLVERTEXATTRIB4SVARBPROC glVertexAttrib4svARB;
-extern PFNGLVERTEXATTRIB4UBVARBPROC glVertexAttrib4ubvARB;
-extern PFNGLVERTEXATTRIB4UIVARBPROC glVertexAttrib4uivARB;
-extern PFNGLVERTEXATTRIB4USVARBPROC glVertexAttrib4usvARB;
-extern PFNGLVERTEXATTRIBPOINTERARBPROC glVertexAttribPointerARB;
-extern PFNGLENABLEVERTEXATTRIBARRAYARBPROC glEnableVertexAttribArrayARB;
-extern PFNGLDISABLEVERTEXATTRIBARRAYARBPROC glDisableVertexAttribArrayARB;
-extern PFNGLPROGRAMSTRINGARBPROC glProgramStringARB;
-extern PFNGLBINDPROGRAMARBPROC glBindProgramARB;
-extern PFNGLDELETEPROGRAMSARBPROC glDeleteProgramsARB;
-extern PFNGLGENPROGRAMSARBPROC glGenProgramsARB;
-extern PFNGLPROGRAMENVPARAMETER4DARBPROC glProgramEnvParameter4dARB;
-extern PFNGLPROGRAMENVPARAMETER4DVARBPROC glProgramEnvParameter4dvARB;
-extern PFNGLPROGRAMENVPARAMETER4FARBPROC glProgramEnvParameter4fARB;
-extern PFNGLPROGRAMENVPARAMETER4FVARBPROC glProgramEnvParameter4fvARB;
-extern PFNGLPROGRAMLOCALPARAMETER4DARBPROC glProgramLocalParameter4dARB;
-extern PFNGLPROGRAMLOCALPARAMETER4DVARBPROC glProgramLocalParameter4dvARB;
-extern PFNGLPROGRAMLOCALPARAMETER4FARBPROC glProgramLocalParameter4fARB;
-extern PFNGLPROGRAMLOCALPARAMETER4FVARBPROC glProgramLocalParameter4fvARB;
-extern PFNGLGETPROGRAMENVPARAMETERDVARBPROC glGetProgramEnvParameterdvARB;
-extern PFNGLGETPROGRAMENVPARAMETERFVARBPROC glGetProgramEnvParameterfvARB;
-extern PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC glGetProgramLocalParameterdvARB;
-extern PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC glGetProgramLocalParameterfvARB;
-extern PFNGLGETPROGRAMIVARBPROC glGetProgramivARB;
-extern PFNGLGETPROGRAMSTRINGARBPROC glGetProgramStringARB;
-extern PFNGLGETVERTEXATTRIBDVARBPROC glGetVertexAttribdvARB;
-extern PFNGLGETVERTEXATTRIBFVARBPROC glGetVertexAttribfvARB;
-extern PFNGLGETVERTEXATTRIBIVARBPROC glGetVertexAttribivARB;
-extern PFNGLGETVERTEXATTRIBPOINTERVARBPROC glGetVertexAttribPointervARB;
-extern PFNGLISPROGRAMARBPROC glIsProgramARB;
-extern PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB;
-extern PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB;
-extern PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB;
-
-//GL_EXT_framebuffer_object
-extern PFNGLISRENDERBUFFEREXTPROC glIsRenderbufferEXT;
-extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
-extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
-extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
-extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
-extern PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC glGetRenderbufferParameterivEXT;
-extern PFNGLISFRAMEBUFFEREXTPROC glIsFramebufferEXT;
-extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
-extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
-extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
-extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
-extern PFNGLFRAMEBUFFERTEXTURE1DEXTPROC glFramebufferTexture1DEXT;
-extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
-extern PFNGLFRAMEBUFFERTEXTURE3DEXTPROC glFramebufferTexture3DEXT;
-extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
-extern PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT;
-extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
-
-
-#elif LL_DARWIN
-//----------------------------------------------------------------------------
-// LL_DARWIN
-
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-
-#define GL_EXT_separate_specular_color 1
-#include <OpenGL/glext.h>
-
-#include "GL/glh_extensions.h"
-
-// These symbols don't exist on 10.3.9, so they have to be declared weak.  Redeclaring them here fixes the problem.
-// Note that they also must not be called on 10.3.9.  This should be taken care of by a runtime check for the existence of the GL extension.
-#include <AvailabilityMacros.h>
-
-// GL_EXT_framebuffer_object
-extern GLboolean glIsRenderbufferEXT(GLuint renderbuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glBindRenderbufferEXT(GLenum target, GLuint renderbuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glDeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glGenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glRenderbufferStorageEXT(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glGetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern GLboolean glIsFramebufferEXT(GLuint framebuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glBindFramebufferEXT(GLenum target, GLuint framebuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glDeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glGenFramebuffersEXT(GLsizei n, GLuint *framebuffers) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern GLenum glCheckFramebufferStatusEXT(GLenum target) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glFramebufferTexture1DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glFramebufferTexture2DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glFramebufferTexture3DEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glFramebufferRenderbufferEXT(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glGetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, GLenum pname, GLint *params) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-extern void glGenerateMipmapEXT(GLenum target) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-//
-// Define vertex buffer object headers on Mac
-//
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef intptr_t GLintptrARB;
-typedef intptr_t GLsizeiptrARB;
-#endif
-
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_FUNCTION_POINTERS
-typedef void (* glBindBufferARBProcPtr) (GLenum target, GLuint buffer);
-typedef void (* glDeleteBufferARBProcPtr) (GLsizei n, const GLuint *buffers);
-typedef void (* glGenBuffersARBProcPtr) (GLsizei n, GLuint *buffers);
-typedef GLboolean (* glIsBufferARBProcPtr) (GLuint buffer);
-typedef void (* glBufferDataARBProcPtr) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (* glBufferSubDataARBProcPtr) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (* glGetBufferSubDataARBProcPtr) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (* glMapBufferARBProcPtr) (GLenum target, GLenum access);	/* Flawfinder: ignore */
-typedef GLboolean (* glUnmapBufferARBProcPtr) (GLenum target);
-typedef void (* glGetBufferParameterivARBProcPtr) (GLenum target, GLenum pname, GLint *params);
-typedef void (* glGetBufferPointervARBProcPtr) (GLenum target, GLenum pname, GLvoid* *params);
-#else
-extern void glBindBufferARB (GLenum, GLuint);
-extern void glDeleteBuffersARB (GLsizei, const GLuint *);
-extern void glGenBuffersARB (GLsizei, GLuint *);
-extern GLboolean glIsBufferARB (GLuint);
-extern void glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-extern void glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-extern void glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-extern GLvoid* glMapBufferARB (GLenum, GLenum);
-extern GLboolean glUnmapBufferARB (GLenum);
-extern void glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_FUNCTION_POINTERS */
-#endif
-
-// May be needed for DARWIN...
-// #ifndef GL_ARB_compressed_tex_image
-// #define GL_ARB_compressed_tex_image 1
-// #ifdef GL_GLEXT_FUNCTION_POINTERS
-// typedef void (* glCompressedTexImage1D) (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid*);
-// typedef void (* glCompressedTexImage2D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
-// typedef void (* glCompressedTexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
-// typedef void (* glCompressedTexSubImage1D) (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid*);
-// typedef void (* glCompressedTexSubImage2D) (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
-// typedef void (* glCompressedTexSubImage3D) (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
-// typedef void (* glGetCompressedTexImage) (GLenum, GLint, GLvoid*);
-// #else
-// extern void glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid*);
-// extern void glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
-// extern void glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*);
-// extern void glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid*);
-// extern void glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
-// extern void glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*);
-// extern void glGetCompressedTexImage (GLenum, GLint, GLvoid*);
-// #endif /* GL_GLEXT_FUNCTION_POINTERS */
-// #endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <AGL/gl.h>
-
-#endif // LL_MESA / LL_WINDOWS / LL_DARWIN
-
-
-#endif // LL_LLGLHEADERS_H
diff --git a/linden/indra/llwindow/llglstates.h b/linden/indra/llwindow/llglstates.h
deleted file mode 100644
index e53640c..0000000
--- a/linden/indra/llwindow/llglstates.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/** 
- * @file llglstates.h
- * @brief LLGL states definitions
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-//THIS HEADER SHOULD ONLY BE INCLUDED FROM llgl.h
-#ifndef LL_LLGLSTATES_H
-#define LL_LLGLSTATES_H
-
-#include "llimagegl.h"
-
-//----------------------------------------------------------------------------
-
-class LLGLDepthTest
-{
-	// Enabled by default
-public:
-	LLGLDepthTest(GLboolean depth_enabled, GLboolean write_enabled = GL_TRUE, GLenum depth_func = GL_LEQUAL);
-	
-	~LLGLDepthTest();
-	
-	GLboolean mPrevDepthEnabled;
-	GLenum mPrevDepthFunc;
-	GLboolean mPrevWriteEnabled;
-private:
-	static GLboolean sDepthEnabled; // defaults to GL_FALSE
-	static GLenum sDepthFunc; // defaults to GL_LESS
-	static GLboolean sWriteEnabled; // defaults to GL_TRUE
-};
-
-//----------------------------------------------------------------------------
-
-class LLGLSDefault
-{
-protected:
-	LLGLEnable mColorMaterial;
-	LLGLDisable mAlphaTest, mBlend, mCullFace, mDither, mFog, 
-		mLineSmooth, mLineStipple, mNormalize, mPolygonSmooth,
-		mTextureGenQ, mTextureGenR, mTextureGenS, mTextureGenT,
-		mGLMultisample;
-public:
-	LLGLSDefault()
-		:
-		// Enable
-		mColorMaterial(GL_COLOR_MATERIAL),
-		// Disable
-		mAlphaTest(GL_ALPHA_TEST),
-		mBlend(GL_BLEND), 
-		mCullFace(GL_CULL_FACE),
-		mDither(GL_DITHER),
-		mFog(GL_FOG), 
-		mLineSmooth(GL_LINE_SMOOTH),
-		mLineStipple(GL_LINE_STIPPLE),
-		mNormalize(GL_NORMALIZE),
-		mPolygonSmooth(GL_POLYGON_SMOOTH),
-		mTextureGenQ(GL_TEXTURE_GEN_Q), 
-		mTextureGenR(GL_TEXTURE_GEN_R),
-		mTextureGenS(GL_TEXTURE_GEN_S), 
-		mTextureGenT(GL_TEXTURE_GEN_T),
-		mGLMultisample(GL_MULTISAMPLE_ARB)
-	{ }
-};
-
-class LLGLSNoTexture 
-{
-public:
-	LLGLSNoTexture()
-	{ LLImageGL::unbindTexture(0); }
-};
-
-class LLGLSObjectSelect
-{ 
-protected:
-	LLGLDisable mBlend, mFog, mAlphaTest;
-	LLGLEnable mCullFace;
-public:
-	LLGLSObjectSelect()
-		: mBlend(GL_BLEND), mFog(GL_FOG), 
-		  mAlphaTest(GL_ALPHA_TEST),
-		  mCullFace(GL_CULL_FACE)
-	{ LLImageGL::unbindTexture(0); }
-};
-
-class LLGLSObjectSelectAlpha
-{
-protected:
-	LLGLEnable mAlphaTest;
-public:
-	LLGLSObjectSelectAlpha()
-		: mAlphaTest(GL_ALPHA_TEST)
-	{}
-};
-
-//----------------------------------------------------------------------------
-
-class LLGLSUIDefault
-{ 
-protected:
-	LLGLEnable mBlend, mAlphaTest;
-	LLGLDisable mCullFace;
-	LLGLDepthTest mDepthTest;
-public:
-	LLGLSUIDefault() 
-		: mBlend(GL_BLEND), mAlphaTest(GL_ALPHA_TEST),
-		  mCullFace(GL_CULL_FACE),
-		  mDepthTest(GL_FALSE, GL_TRUE, GL_LEQUAL)
-	{}
-};
-
-class LLGLSNoAlphaTest // : public LLGLSUIDefault
-{
-protected:
-	LLGLDisable mAlphaTest;
-public:
-	LLGLSNoAlphaTest()
-		: mAlphaTest(GL_ALPHA_TEST)
-	{}
-};
-
-class LLGLSNoTextureNoAlphaTest // : public LLGLSUIDefault
-{
-protected:
-	LLGLDisable mAlphaTest;
-public:
-	LLGLSNoTextureNoAlphaTest()
-		: mAlphaTest(GL_ALPHA_TEST)
-		  
-	{ LLImageGL::unbindTexture(0); }
-};
-
-//----------------------------------------------------------------------------
-
-class LLGLSFog
-{
-protected:
-	LLGLEnable mFog;
-public:
-	LLGLSFog()
-		: mFog(GL_FOG)
-	{}
-};
-
-class LLGLSNoFog
-{
-protected:
-	LLGLDisable mFog;
-public:
-	LLGLSNoFog()
-		: mFog(GL_FOG)
-	{}
-};
-
-//----------------------------------------------------------------------------
-
-class LLGLSPipeline
-{ 
-protected:
-	LLGLEnable mCullFace;
-	LLGLDepthTest mDepthTest;
-public:
-	LLGLSPipeline()
-		: mCullFace(GL_CULL_FACE),
-		  mDepthTest(GL_TRUE, GL_TRUE, GL_LEQUAL)
-	{ }		
-};
-
-class LLGLSPipelineAlpha // : public LLGLSPipeline
-{ 
-protected:
-	LLGLEnable mBlend, mAlphaTest;
-public:
-	LLGLSPipelineAlpha()
-		: mBlend(GL_BLEND),
-		  mAlphaTest(GL_ALPHA_TEST)
-	{ }
-};
-
-class LLGLSPipelineEmbossBump
-{
-protected:
-	LLGLDisable mFog;
-public:
-	LLGLSPipelineEmbossBump()
-		: mFog(GL_FOG)
-	{ }
-};
-
-class LLGLSPipelineSelection
-{ 
-protected:
-	LLGLDisable mCullFace;
-public:
-	LLGLSPipelineSelection()
-		: mCullFace(GL_CULL_FACE)
-	{}
-};
-
-class LLGLSPipelineAvatar
-{
-protected:
-	LLGLEnable mNormalize;
-public:
-	LLGLSPipelineAvatar()
-		: mNormalize(GL_NORMALIZE)
-	{}
-};
-
-class LLGLSPipelineSkyBox
-{ 
-protected:
-	LLGLDisable mAlphaTest, mCullFace, mFog;
-public:
-	LLGLSPipelineSkyBox()
-		: mAlphaTest(GL_ALPHA_TEST), mCullFace(GL_CULL_FACE), mFog(GL_FOG)
-	{ }
-};
-
-class LLGLSTracker
-{
-protected:
-	LLGLEnable mCullFace, mBlend, mAlphaTest;
-public:
-	LLGLSTracker() :
-		mCullFace(GL_CULL_FACE),
-		mBlend(GL_BLEND),
-		mAlphaTest(GL_ALPHA_TEST)
-		
-	{ LLImageGL::unbindTexture(0); }
-};
-
-//----------------------------------------------------------------------------
-
-class LLGLSSpecular
-{
-public:
-	LLGLSSpecular(const LLColor4& color, F32 shininess)
-	{
-		if (shininess > 0.0f)
-		{
-			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, color.mV);
-			S32 shiny = (S32)(shininess*128.f);
-			shiny = llclamp(shiny,0,128);
-			glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, shiny);
-		}
-	}
-	~LLGLSSpecular()
-	{
-		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, LLColor4(0.f,0.f,0.f,0.f).mV);
-		glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 0);
-	}
-};
-
-//----------------------------------------------------------------------------
-
-
-class LLGLSBlendFunc : public LLGLSPipeline {
-protected:
-	GLint mSavedSrc, mSavedDst;
-	LLGLEnable mBlend;
-
-public:
-	LLGLSBlendFunc(GLenum srcFunc, GLenum dstFunc) :
-		mBlend(GL_BLEND)
-	{
-		glGetIntegerv(GL_BLEND_SRC, &mSavedSrc);
-		glGetIntegerv(GL_BLEND_DST, &mSavedDst);
-		glBlendFunc(srcFunc, dstFunc);
-	}
-
-	~LLGLSBlendFunc(void) {
-		glBlendFunc(mSavedSrc, mSavedDst);
-	}
-};
-
-
-#endif
diff --git a/linden/indra/llwindow/llgltypes.h b/linden/indra/llwindow/llgltypes.h
deleted file mode 100644
index d22d5fa..0000000
--- a/linden/indra/llwindow/llgltypes.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/** 
- * @file llgltypes.h
- * @brief LLGL definition
- *
- * $LicenseInfo:firstyear=2006&license=viewergpl$
- * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LLGLTYPES_H
-#define LLGLTYPES_H
-
-#define MAX_GL_TEXTURE_UNITS 16
-
-typedef U32 LLGLenum;
-typedef U32 LLGLuint;
-typedef S32 LLGLint;
-typedef F32 LLGLfloat;
-typedef F64 LLGLdouble;
-typedef U8 LLGLboolean;
-
-#endif
diff --git a/linden/indra/llwindow/llkeyboard.cpp b/linden/indra/llwindow/llkeyboard.cpp
index c6502ed..cc6f73b 100644
--- a/linden/indra/llwindow/llkeyboard.cpp
+++ b/linden/indra/llwindow/llkeyboard.cpp
@@ -43,8 +43,8 @@
 LLKeyboard *gKeyboard = NULL;
 
 //static
-std::map<KEY,LLString> LLKeyboard::sKeysToNames;
-std::map<LLString,KEY> LLKeyboard::sNamesToKeys;
+std::map<KEY,std::string> LLKeyboard::sKeysToNames;
+std::map<std::string,KEY> LLKeyboard::sNamesToKeys;
 
 //
 // Class Implementation
@@ -67,6 +67,7 @@ LLKeyboard::LLKeyboard() : mCallbacks(NULL), mNumpadDistinct(ND_NUMLOCK_OFF)
 
 	mInsertMode = LL_KIM_INSERT;
 	mCurTranslatedKey = KEY_NONE;
+	mCurScanKey = KEY_NONE;
 
 	addKeyName(' ', "Space" );
 	addKeyName(KEY_RETURN, "Enter" );
@@ -143,11 +144,11 @@ LLKeyboard::~LLKeyboard()
 	// nothing
 }
 
-void LLKeyboard::addKeyName(KEY key, const LLString& name)
+void LLKeyboard::addKeyName(KEY key, const std::string& name)
 {
 	sKeysToNames[key] = name;
-	LLString nameuc = name;
-	LLString::toUpper(nameuc);
+	std::string nameuc = name;
+	LLStringUtil::toUpper(nameuc);
 	sNamesToKeys[nameuc] = key;
 }
 
@@ -293,9 +294,9 @@ S32 LLKeyboard::getKeyElapsedFrameCount(KEY key)
 }
 
 // static
-BOOL LLKeyboard::keyFromString(const LLString& str, KEY *key)
+BOOL LLKeyboard::keyFromString(const std::string& str, KEY *key)
 {
-	LLString instring(str);
+	std::string instring(str);
 	size_t length = instring.size();
 
 	if (length < 1)
@@ -317,7 +318,7 @@ BOOL LLKeyboard::keyFromString(const LLString& str, KEY *key)
 		}
 	}
 
-	LLString::toUpper(instring);
+	LLStringUtil::toUpper(instring);
 	KEY res = get_if_there(sNamesToKeys, instring, (KEY)0);
 	if (res != 0)
 	{
@@ -330,15 +331,15 @@ BOOL LLKeyboard::keyFromString(const LLString& str, KEY *key)
 
 
 // static
-LLString LLKeyboard::stringFromKey(KEY key)
+std::string LLKeyboard::stringFromKey(KEY key)
 {
-	LLString res = get_if_there(sKeysToNames, key, LLString::null);
+	std::string res = get_if_there(sKeysToNames, key, std::string());
 	if (res.empty())
 	{
 		char buffer[2];		/* Flawfinder: ignore */
 		buffer[0] = key;
 		buffer[1] = '\0';
-		res = LLString(buffer);
+		res = std::string(buffer);
 	}
 	return res;
 }
@@ -346,9 +347,9 @@ LLString LLKeyboard::stringFromKey(KEY key)
 
 
 //static
-BOOL LLKeyboard::maskFromString(const LLString& str, MASK *mask)
+BOOL LLKeyboard::maskFromString(const std::string& str, MASK *mask)
 {
-	LLString instring(str);
+	std::string instring(str);
 	if (instring == "NONE")
 	{
 		*mask = MASK_NONE;
diff --git a/linden/indra/llwindow/llkeyboard.h b/linden/indra/llwindow/llkeyboard.h
index d9ce376..4d0b86d 100644
--- a/linden/indra/llwindow/llkeyboard.h
+++ b/linden/indra/llwindow/llkeyboard.h
@@ -107,9 +107,9 @@ public:
 	EKeyboardInsertMode getInsertMode()	{ return mInsertMode; }
 	void toggleInsertMode();
 
-	static BOOL		maskFromString(const LLString& str, MASK *mask);		// False on failure
-	static BOOL		keyFromString(const LLString& str, KEY *key);			// False on failure
-	static LLString	stringFromKey(KEY key);
+	static BOOL		maskFromString(const std::string& str, MASK *mask);		// False on failure
+	static BOOL		keyFromString(const std::string& str, KEY *key);			// False on failure
+	static std::string stringFromKey(KEY key);
 
 	e_numpad_distinct getNumpadDistinct() { return mNumpadDistinct; }
 	void setNumpadDistinct(e_numpad_distinct val) { mNumpadDistinct = val; }
@@ -119,7 +119,7 @@ public:
 	S32				getKeyElapsedFrameCount( KEY key );  // Returns time in frames since key was pressed.
 
 protected:
-	void 			addKeyName(KEY key, const LLString& name);
+	void 			addKeyName(KEY key, const std::string& name);
 
 protected:
 	std::map<U16, KEY>	mTranslateKeyMap;		// Map of translations from OS keys to Linden KEYs
@@ -139,8 +139,8 @@ protected:
 
 	EKeyboardInsertMode mInsertMode;
 
-	static std::map<KEY,LLString> sKeysToNames;
-	static std::map<LLString,KEY> sNamesToKeys;
+	static std::map<KEY,std::string> sKeysToNames;
+	static std::map<std::string,KEY> sNamesToKeys;
 };
 
 extern LLKeyboard *gKeyboard;
diff --git a/linden/indra/llwindow/lllogitechlcd.cpp b/linden/indra/llwindow/lllogitechlcd.cpp
deleted file mode 100644
index 81e97a0..0000000
--- a/linden/indra/llwindow/lllogitechlcd.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-/** 
- * @file lcd.cpp
- * @brief cLcd panel class
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#if LL_LCD_COMPILE
-
-#include "EZ_LCD.h"
-#include "../newview/res/resource.h"
-#include "llcontrol.h"
-extern LLControlGroup gSavedSettings;
-
-#ifndef LL_LOGITECH_LCD_H
-#include "lllogitechlcd.h"
-#endif
-
-#define WAIT_DURATION 7
-#define DEBOUNCE_DURATION 0.3f
-
-LLLCDPageGroup::LLLCDPageGroup(CEzLcd *LCD, int type, HICON SLIcon):
-mType(type),
-mHandle(NULL),
-mSLIcon(SLIcon),
-mDisplayPage(false),
-mLCD(LCD)
-{
-	mPageArray.clear();	
-}
-
-LLLCDPageGroup::~LLLCDPageGroup()
-{
-	mPageArray.clear();
-}
-
-void llDefaultPageGroup::UpdateDetails()
-{
-	mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex);
-}
-
-void llDefaultPageGroup::GetDisplayable()
-{
-
-}
-
-llDefaultPageGroup::llDefaultPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
-:LLLCDPageGroup(LCD, type, SLIcon)
-{
-	// create a new specific page
-	LLLCDSpecificPage newPage;
-	newPage.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_MEDIUM, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 20);
-	mLCD->SetText(title, _T("Second Life Display"));
-	newPage.mDisplayItemArray.push_back(title);
-
-	// and then insert it
-	mPageArray.push_back(newPage);
-}
-
-LLLCD::LLLCD(HINSTANCE instance):
-mInited(false),
-mDisplayTimer(),
-mDebounceTimer(),
-mPageToShow(-1),
-mInstance(instance),
-mDestinationLCD(-1),
-mFirstTimeThru(true),
-mCurrentGroupBeingShown(NULL),
-mSLIcon(NULL)
-{
-	HRESULT     res_ = S_OK;
-
-	// Create instance of EzLcd.
-	mLCD = new CEzLcd();
-
-	// Have it initialize itself
-	res_ = mLCD->InitYourself(_T("Second Life"));
-
-	if (res_ != S_OK)
-	{
-		// Something went wrong, when connecting to the LCD Manager software. We need to get out now
-		delete mLCD;
-		return;
-	}
-	mInited = true;
-
-	// preload the Second Life Icon
-	mSLIcon = static_cast<HICON>(LoadImage(mInstance,
-		MAKEINTRESOURCE(IDI_LCD_LL_ICON),
-		IMAGE_ICON, 
-		32, 
-		32, 
-		LR_MONOCHROME));
-
-	// have to do this first so screens are added to the list and updateDisplay actually does something.
-	mLCD->Update();
-}
-
-LLLCD::~LLLCD()
-{
-	// remove the instance of the LCD controller
-	if (mInited == true)
-	{
-		delete mLCD;
-
-		// free up the used pages
-		int loopSize = mPageGroupArray.size();
-		for(int i= 0; i<loopSize; i++)
-		{
-			free (mPageGroupArray[i]);
-		}
-	}
-}
-
-LLLCDPageGroup *LLLCD::GetNextPageToDisplay()
-{
-	// find group with current page in it.
-
-	int groupSize = mPageGroupArray.size();
-	for(int x=1; x< groupSize; x++)
-	{
-		if (mPageGroupArray[x]->mDisplayPage)
-		{
-			// now walk all the pages in the page group we are looking at
-			int numPages = mPageGroupArray[x]->mPageArray.size();
-			for (int zx = 0; zx< numPages; zx++)
-			{
-				// found it.
-				if (mPageToShow == mPageGroupArray[x]->mPageArray[zx].mPageIndex)
-				{
-					// move to the next one
-					if (zx < numPages-1)
-					{
-						mPageToShow = mPageGroupArray[x]->mPageArray[zx+1].mPageIndex;
-						return mPageGroupArray[x];
-					}
-					else
-					{
-						for(int y=x+1; y< groupSize; y++)
-						{
-							if (mPageGroupArray[y]->mDisplayPage)
-							{
-								mPageToShow = mPageGroupArray[y]->mPageArray[0].mPageIndex;
-								return mPageGroupArray[y];
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// ok, didn't find it. Start again at the beginning and find the first group that's enabled
-	for(int x=1; x< groupSize; x++)
-	{
-		if (mPageGroupArray[x]->mDisplayPage)
-		{
-			mPageToShow = mPageGroupArray[x]->mPageArray[0].mPageIndex;
-			return mPageGroupArray[x];
-		}
-	}
-	// if we got this far, we should display the default screen
-	mPageToShow = mPageGroupArray[0]->mPageArray[0].mPageIndex;
-	return mPageGroupArray[0];
-}
-
-void LLLCD::SetUpDisplayPages()
-{
-	// work out if destination has changed
-	int destinationLCD = gSavedSettings.getS32("LCDDestination");
-	switch(destinationLCD)
-	{
-	case 0:
-		destinationLCD = LGLCD_DEVICE_FAMILY_KEYBOARD_G15;
-		break;
-	case 1:
-		destinationLCD = LGLCD_DEVICE_FAMILY_SPEAKERS_Z10;
-		break;
-	}
-	// set destination if it's changed
-	if (mDestinationLCD != destinationLCD)
-	{
-		mDestinationLCD = destinationLCD;
-		mLCD->SetDeviceFamilyToUse(destinationLCD);
-	}
-	int loopSize = mPageGroupArray.size();
-	for(int i= 0; i<loopSize; i++)
-	{
-		mPageGroupArray[i]->GetDisplayable();
-	}
-}
-
-void LLLCD::UpdateDisplay()
-{
-	if (mInited)
-	{
-		// reset pages if anything has changed
-		SetUpDisplayPages();
-		if (mLCD->IsConnected())
-		{		
-			// Switching back and forth between the pages that we've created
-			if (mDisplayTimer.getElapsedTimeF32() > WAIT_DURATION || mFirstTimeThru)
-			{
-				mCurrentGroupBeingShown = GetNextPageToDisplay();
-				mDisplayTimer.reset();
-				mFirstTimeThru = false;
-			}
-
-			// Check if button 1 triggered
-			if ((mLCD->ButtonIsPressed(LG_BUTTON_1)
-				|| mLCD->ButtonIsPressed(LG_BUTTON_2)
-				|| mLCD->ButtonIsPressed(LG_BUTTON_3)
-				|| mLCD->ButtonIsPressed(LG_BUTTON_4)
-				) && mDebounceTimer.getElapsedTimeF32() > DEBOUNCE_DURATION)
-			{
-				// if so, move us on a page
-				mCurrentGroupBeingShown = GetNextPageToDisplay();
-				mDisplayTimer.reset();
-				mDebounceTimer.reset();
-			}
-
-			// update that which is being show
-			mCurrentGroupBeingShown->UpdateDetails();
-			
-			// set which page is shown
-			mLCD->ShowPage(mPageToShow);
-
-			// Must run the following every loop.
-			mLCD->Update();
-		}
-	}
-}
-
-
-// accessor functions
-bool LLLCD::Enabled()
-{
-	return mInited;
-}
-
-BOOL LLLCD::AreZ10Available()
-{
-	if (mInited == true)
-	{
-		return mLCD->AnyDeviceOfThisFamilyPresent(LGLCD_DEVICE_FAMILY_SPEAKERS_Z10);
-	}
-	return false;
-}
-
-BOOL LLLCD::IsG15Available()
-{
-	if (mInited == true)
-	{
-		return mLCD->AnyDeviceOfThisFamilyPresent(LGLCD_DEVICE_FAMILY_KEYBOARD_G15);
-	}
-	return false;
-}
-
-#endif
diff --git a/linden/indra/llwindow/lllogitechlcd.h b/linden/indra/llwindow/lllogitechlcd.h
deleted file mode 100644
index 47a6acd..0000000
--- a/linden/indra/llwindow/lllogitechlcd.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/** 
- * @file lcd.h
- * @brief Description of the LCD owner class.
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LOGITECH_LCD_H
-#define LL_LOGITECH_LCD_H
-
-#include <vector>
-#include "llFrametimer.h"
-
-class CEzLcd;
-
-// TO Add a new display page groups, duplicate the Region or Debug or Chat class, then modify what's actually displayed (ie how many pages and whats in them)
-// in the constructor and update display functions.
-// Remember to add in a new enum type for the new display type, and add in functions to actually create/update or remove this page in the SetupDisplayPages function
-// And, of course, add the new option to the Menu in llpanelLCDoption.xml, and save details (duplicate the ones for debug or region).
-
-// this defines one pages worth of display items.
-class LLLCDSpecificPage
-{
-public:
-	int mPageIndex;
-	typedef std::vector<HANDLE> displayItemArray_t;
-	// array of indexes that come from the lcd display sdk for specific items being displayed on a given page
-	displayItemArray_t mDisplayItemArray;
-};
-
-// this defines a group of pages - associated with a specific type of display, like Debug, Linden Account info, region etc
-// NOTE this can have more than one page associated with it - so it has an array of cLCDSpecificPage for each page.
-class LLLCDPageGroup
-{
-public:
-	LLLCDPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual ~LLLCDPageGroup();
-	virtual void UpdateDetails() = 0; 
-	virtual void GetDisplayable() = 0;
-	int		mType;
-	HANDLE	mHandle;
-	typedef std::vector<LLLCDSpecificPage> pageArray_t;
-	pageArray_t mPageArray;
-	BOOL	mDisplayPage;
-protected:
-
-	CEzLcd	*mLCD;
-	HICON	mSLIcon;
-};
-
-
-// class that defines the Default page - used if nothing else is enabled
-class llDefaultPageGroup : public LLLCDPageGroup
-{
-public:
-	llDefaultPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual void UpdateDetails();
-	virtual void GetDisplayable();
-};
-
-// Root class - contains pointers to actual LCD display object, and arrays of page groups to be displayed
-class LLLCD
-{
-public:
-	enum
-	{
-		kLCDDefault,
-		kLCDDebug,
-		kLCDChat,
-		kLCDRegion,
-		kLCDLinden,
-		kLCDIM,
-		kLCDDebugConsole,
-		kMaxLCDPageGroups
-	};
-	LLLCD(HINSTANCE instance);
-	~LLLCD();
-	void UpdateDisplay();
-	bool Enabled();
-	BOOL AreZ10Available();
-	BOOL IsG15Available();
-
-	typedef std::vector<LLLCDPageGroup *> pageGroupArray_t;
-	pageGroupArray_t mPageGroupArray;
-	HICON mSLIcon;
-	CEzLcd	*mLCD;
-private:
-
-	// member functions to display data
-	void SetUpDisplayPages();
-	LLLCDPageGroup *GetNextPageToDisplay();
-
-	LLLCDPageGroup *mCurrentGroupBeingShown;
-
-	// members
-	bool mInited;
-	
-	int	mPageToShow;
-	LLFrameTimer	mDisplayTimer;
-	LLFrameTimer	mDebounceTimer;
-	HINSTANCE mInstance;		// necessary for loading some icons for the dot matrix LCD display to use
-	bool mFirstTimeThru;
-
-
-	// actual display set up variables
-	int mDestinationLCD;
-};
-
-
-
-#endif
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index b511dcd..119197f 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -43,7 +43,11 @@ class LLMouseHandler
 public:
 	LLMouseHandler() {}
 	virtual ~LLMouseHandler() {}
-	
+	typedef enum {
+		SHOW_NEVER,
+		SHOW_IF_NOT_BLOCKED,
+		SHOW_ALWAYS,
+	} EShowToolTip;
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) = 0;
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) = 0;
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) = 0;
@@ -51,8 +55,9 @@ public:
 	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
 	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask) = 0;
 	virtual BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen) = 0;
-	virtual const LLString& getName() const = 0;
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) = 0;
+	virtual EShowToolTip getShowToolTip() { return SHOW_IF_NOT_BLOCKED; };
+	virtual const std::string& getName() const = 0;
 
 	virtual void	onMouseCaptureLost() = 0;
 
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index ffb6393..890143d 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -58,13 +58,13 @@ BOOL gDebugClicks = FALSE;
 BOOL gDebugWindowProc = FALSE;
 
 const S32 gURLProtocolWhitelistCount = 3;
-const char* gURLProtocolWhitelist[] = { "file", "http", "https" };
+const std::string gURLProtocolWhitelist[] = { "file:", "http:", "https:" };
 
 // CP: added a handler list - this is what's used to open the protocol and is based on registry entry
 //	   only meaningful difference currently is that file: protocols are opened using http:
 //	   since no protocol handler exists in registry for file:
 //     Important - these lists should match - protocol to handler
-const char* gURLProtocolWhitelistHandler[] = { "http", "http", "https" };	
+const std::string gURLProtocolWhitelistHandler[] = { "http", "http", "https" };	
 
 BOOL LLWindowCallbacks::handleTranslatedKeyDown(const KEY key, const MASK mask, BOOL repeated)
 {
@@ -203,7 +203,7 @@ BOOL LLWindowCallbacks::handleDeviceChange(LLWindow *window)
 	return FALSE;
 }
 
-S32 OSMessageBox(const char* text, const char* caption, U32 type)
+S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type)
 {
 	// Properly hide the splash screen when displaying the message box
 	BOOL was_visible = FALSE;
@@ -285,6 +285,12 @@ void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
 	}
 }
 
+void *LLWindow::getMediaWindow()
+{
+	// Default to returning the platform window.
+	return getPlatformWindow();
+}
+
 // static
 std::string LLWindow::getFontListSans()
 {
@@ -389,7 +395,7 @@ void LLSplashScreen::show()
 }
 
 //static
-void LLSplashScreen::update(const char* str)
+void LLSplashScreen::update(const std::string& str)
 {
 	LLSplashScreen::show();
 	if (gSplashScreenp)
@@ -417,8 +423,8 @@ void LLSplashScreen::hide()
 static std::set<LLWindow*> sWindowList;
 
 LLWindow* LLWindowManager::createWindow(
-	char *title,
-	char *name,
+	const std::string& title,
+	const std::string& name,
 	LLCoordScreen upper_left,
 	LLCoordScreen size,
 	U32 flags,
@@ -434,7 +440,7 @@ LLWindow* LLWindowManager::createWindow(
 }
 
 LLWindow* LLWindowManager::createWindow(
-	char *title, char *name, S32 x, S32 y, S32 width, S32 height, U32 flags,
+	const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height, U32 flags,
 	BOOL fullscreen, 
 	BOOL clearBg,
 	BOOL disable_vsync,
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index a63c8d5..82e95a8 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -32,8 +32,6 @@
 #ifndef LL_LLWINDOW_H
 #define LL_LLWINDOW_H
 
-#include <sys/stat.h>
-
 #include "llrect.h"
 #include "llcoord.h"
 #include "llstring.h"
@@ -197,10 +195,6 @@ public:
 	virtual void bringToFront() = 0;
 	virtual void focusClient() { };		// this may not have meaning or be required on other platforms, therefore, it's not abstract
 	
-	virtual S32 stat( const char* file_name, struct stat* stat_info ) = 0;
-	virtual BOOL sendEmail(const char* address,const char* subject,const char* body_text, const char* attachment=NULL, const char* attachment_displayed_name=NULL ) = 0;
-
-
 	// handy coordinate space conversion routines
 	// NB: screen to window and vice verse won't work on width/height coordinate pairs,
 	// as the conversion must take into account left AND right border widths, etc.
@@ -225,14 +219,18 @@ public:
 // opens system default color picker
 	virtual BOOL dialog_color_picker (F32 *r, F32 *g, F32 *b) { return FALSE; };
 
-// return a platform-specific window reference (HWND on Windows, WindowRef on the Mac)
+// return a platform-specific window reference (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
 	virtual void *getPlatformWindow() = 0;
+
+// return the platform-specific window reference we use to initialize llmozlib (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
+	virtual void *getMediaWindow();
 	
 	// control platform's Language Text Input mechanisms.
 	virtual void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b) {}
 	virtual void setLanguageTextInput( const LLCoordGL & pos ) {};
 	virtual void updateLanguageTextInputArea() {}
 	virtual void interruptLanguageTextInput() {}
+	virtual void spawnWebBrowser(const std::string& escaped_url) {};
 
 	static std::string getFontListSans();
 
@@ -293,13 +291,13 @@ public:
 	static LLSplashScreen * create();
 	static void show();
 	static void hide();
-	static void update(const char* string);
+	static void update(const std::string& string);
 
 	static bool isVisible();
 protected:
 	// These are overridden by the platform implementation
 	virtual void showImpl() = 0;
-	virtual void updateImpl(const char* string) = 0;
+	virtual void updateImpl(const std::string& string) = 0;
 	virtual void hideImpl() = 0;
 
 	static BOOL sVisible;
@@ -307,7 +305,7 @@ protected:
 };
 
 // Platform-neutral for accessing the platform specific message box
-S32 OSMessageBox(const char* text, const char* caption, U32 type);
+S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type);
 const U32 OSMB_OK = 0;
 const U32 OSMB_OKCANCEL = 1;
 const U32 OSMB_YESNO = 2;
@@ -325,8 +323,8 @@ class LLWindowManager
 {
 public:
 	static LLWindow* createWindow(
-		char *title,
-		char *name,
+		const std::string& title,
+		const std::string& name,
 		LLCoordScreen upper_left = LLCoordScreen(10, 10),
 		LLCoordScreen size = LLCoordScreen(320, 240),
 		U32 flags = 0,
@@ -336,7 +334,7 @@ public:
 		BOOL use_gl = TRUE,
 		BOOL ignore_pixel_depth = FALSE);
 	static LLWindow *createWindow(
-		char* title, char* name, S32 x, S32 y, S32 width, S32 height,
+		const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
 		U32 flags = 0,
 		BOOL fullscreen = FALSE,
 		BOOL clearBg = FALSE,
@@ -355,11 +353,8 @@ extern BOOL gDebugWindowProc;
 
 // Protocols, like "http" and "https" we support in URLs
 extern const S32 gURLProtocolWhitelistCount;
-extern const char* gURLProtocolWhitelist[];
-extern const char* gURLProtocolWhitelistHandler[];
-
-// Loads a URL with the user's default browser
-void spawn_web_browser(const char* escaped_url);
+extern const std::string gURLProtocolWhitelist[];
+extern const std::string gURLProtocolWhitelistHandler[];
 
 void simpleEscapeString ( std::string& stringIn  );
 
diff --git a/linden/indra/llwindow/llwindow.vcproj b/linden/indra/llwindow/llwindow.vcproj
deleted file mode 100644
index 0243c72..0000000
--- a/linden/indra/llwindow/llwindow.vcproj
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llwindow"
-	ProjectGUID="{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;..\..\libraries\i686-win32\include;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;..\..\libraries\i686-win32\include;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				AdditionalOptions="/Oy-"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="DebugMesaHeadless|Win32"
-			OutputDirectory="../lib_debug/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;..\..\libraries\i686-win32\include;..\..\libraries\include\GLMESA;..\..\libraries\i686-win32\include;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;LL_MESA;LL_MESA_HEADLESS"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow_mesaheadless.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\lldxhardware.cpp">
-			</File>
-			<File
-				RelativePath=".\llgl.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeyboard.cpp">
-			</File>
-			<File
-				RelativePath=".\llkeyboardwin32.cpp">
-			</File>
-			<File
-				RelativePath=".\lllogitechlcd.cpp">
-			</File>
-			<File
-				RelativePath=".\llwindow.cpp">
-			</File>
-			<File
-				RelativePath=".\llwindowheadless.cpp">
-			</File>
-			<File
-				RelativePath=".\llwindowmesaheadless.cpp">
-			</File>
-			<File
-				RelativePath=".\llwindowwin32.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\lldxhardware.h">
-			</File>
-			<File
-				RelativePath=".\llgl.h">
-			</File>
-			<File
-				RelativePath=".\llglheaders.h">
-			</File>
-			<File
-				RelativePath=".\llglstates.h">
-			</File>
-			<File
-				RelativePath=".\llgltypes.h">
-			</File>
-			<File
-				RelativePath=".\llkeyboard.h">
-			</File>
-			<File
-				RelativePath=".\llkeyboardwin32.h">
-			</File>
-			<File
-				RelativePath=".\lllogitechlcd.h">
-			</File>
-			<File
-				RelativePath=".\llmousehandler.h">
-			</File>
-			<File
-				RelativePath=".\llpreeditor.h">
-			</File>
-			<File
-				RelativePath=".\llwindow.h">
-			</File>
-			<File
-				RelativePath=".\llwindowheadless.h">
-			</File>
-			<File
-				RelativePath=".\llwindowmesaheadless.h">
-			</File>
-			<File
-				RelativePath=".\llwindowwin32.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llwindow/llwindow_vc8.vcproj b/linden/indra/llwindow/llwindow_vc8.vcproj
deleted file mode 100644
index 69ec460..0000000
--- a/linden/indra/llwindow/llwindow_vc8.vcproj
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llwindow"
-	ProjectGUID="{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"
-	RootNamespace="llwindow"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugMesaHeadless|Win32"
-			OutputDirectory="../lib_debug/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\GLMESA;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;LL_MESA;LL_MESA_HEADLESS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow_mesaheadless.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lldxhardware.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboardwin32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogitechlcd.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindow.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowheadless.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowmesaheadless.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowwin32.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\lldxhardware.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llglheaders.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llglstates.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgltypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboardwin32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogitechlcd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmousehandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowheadless.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowmesaheadless.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowwin32.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llwindow/llwindow_vc9.vcproj b/linden/indra/llwindow/llwindow_vc9.vcproj
deleted file mode 100644
index 991c296..0000000
--- a/linden/indra/llwindow/llwindow_vc9.vcproj
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llwindow"
-	ProjectGUID="{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"
-	RootNamespace="llwindow"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DebugMesaHeadless|Win32"
-			OutputDirectory="../lib_debug/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\GLMESA;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;LL_MESA;LL_MESA_HEADLESS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow_mesaheadless.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\llrender;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llwindow.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lldxhardware.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboardwin32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogitechlcd.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindow.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowheadless.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowmesaheadless.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowwin32.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\lldxhardware.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llglheaders.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llglstates.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgltypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llkeyboardwin32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogitechlcd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmousehandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowheadless.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowmesaheadless.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindowwin32.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llwindow/llwindowheadless.cpp b/linden/indra/llwindow/llwindowheadless.cpp
index 441b4e9..c8f0c5c 100644
--- a/linden/indra/llwindow/llwindowheadless.cpp
+++ b/linden/indra/llwindow/llwindowheadless.cpp
@@ -37,7 +37,7 @@
 //
 // LLWindowHeadless
 //
-LLWindowHeadless::LLWindowHeadless(char *title, char *name, S32 x, S32 y, S32 width, S32 height,
+LLWindowHeadless::LLWindowHeadless(const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
 							 U32 flags,  BOOL fullscreen, BOOL clearBg,
 							 BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth)
 	: LLWindow(fullscreen, flags)
diff --git a/linden/indra/llwindow/llwindowheadless.h b/linden/indra/llwindow/llwindowheadless.h
index 7cef7d8..fffb2ed 100644
--- a/linden/indra/llwindow/llwindowheadless.h
+++ b/linden/indra/llwindow/llwindowheadless.h
@@ -77,12 +77,6 @@ public:
 	/*virtual*/ void delayInputProcessing() {};
 	/*virtual*/ void swapBuffers();
 
-	/*virtual*/ LLString getTempFileName() {return LLString(""); };
-	/*virtual*/ void deleteFile( const char* file_name ) {};
-	/*virtual*/ S32 stat( const char* file_name, struct stat* stat_info ) {return 0; };
-	/*virtual*/ BOOL sendEmail(const char* address,const char* subject,const char* body_text,const char* attachment=NULL, const char* attachment_displayed_name=NULL) { return FALSE; };
-
-
 	// handy coordinate space conversion routines
 	/*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to) { return FALSE; };
 	/*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to) { return FALSE; };
@@ -99,7 +93,7 @@ public:
 	/*virtual*/ void *getPlatformWindow() { return 0; };
 	/*virtual*/ void bringToFront() {};
 	
-	LLWindowHeadless(char *title, char *name, S32 x, S32 y, S32 width, S32 height,
+	LLWindowHeadless(const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
 				  U32 flags,  BOOL fullscreen, BOOL clearBg,
 				  BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth);
 	virtual ~LLWindowHeadless();
@@ -114,7 +108,7 @@ public:
 	virtual ~LLSplashScreenHeadless() {};
 
 	/*virtual*/ void showImpl() {};
-	/*virtual*/ void updateImpl(const char* mesg) {};
+	/*virtual*/ void updateImpl(const std::string& mesg) {};
 	/*virtual*/ void hideImpl() {};
 
 };
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 5ab0ba6..5102173 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -29,8 +29,6 @@
  * $/LicenseInfo$
  */
 
-#if LL_DARWIN
-
 #include "linden_common.h"
 
 #include <Carbon/Carbon.h>
@@ -42,10 +40,6 @@
 #include "llgl.h"
 #include "llstring.h"
 #include "lldir.h"
-#include "llviewercontrol.h"
-
-#include "llglheaders.h"
-
 #include "indra_constants.h"
 
 #include "llwindowmacosx-objc.h"
@@ -66,37 +60,16 @@ const S32	MAX_NUM_RESOLUTIONS = 32;
 // LLWindowMacOSX
 //
 
-// Cross-platform bits:
+BOOL LLWindowMacOSX::sUseMultGL = FALSE;
+WindowRef LLWindowMacOSX::sMediaWindow = NULL;
 
-void show_window_creation_error(const char* title)
-{
-	llwarns << title << llendl;
-	/*
-	OSMessageBox(
-	"Second Life is unable to run because it can't set up your display.\n"
-	"We need to be able to make a 32-bit color window at 1024x768, with\n"
-	"an 8 bit alpha channel.\n"
-	"\n"
-	"First, be sure your monitor is set to True Color (32-bit) in\n"
-	"Start -> Control Panels -> Display -> Settings.\n"
-	"\n"
-	"Otherwise, this may be due to video card driver issues.\n"
-	"Please make sure you have the latest video card drivers installed.\n"
-	"ATI drivers are available at http://www.ati.com/\n"
-	"nVidia drivers are available at http://www.nvidia.com/\n"
-	"\n"
-	"If you continue to receive this message, contact customer service.",
-	title,
-	OSMB_OK);
-	*/
-}
+// Cross-platform bits:
 
 BOOL check_for_card(const char* RENDERER, const char* bad_card)
 {
 	if (!strnicmp(RENDERER, bad_card, strlen(bad_card)))
 	{
-		char buffer[1024];/* Flawfinder: ignore */
-		snprintf(buffer, sizeof(buffer), 
+		std::string buffer = llformat(
 			"Your video card appears to be a %s, which Second Life does not support.\n"
 			"\n"
 			"Second Life requires a video card with 32 Mb of memory or more, as well as\n"
@@ -110,7 +83,7 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
 			"You can try to run Second Life, but it will probably crash or run\n"
 			"very slowly.  Try anyway?",
 			bad_card);
-		S32 button = OSMessageBox(buffer, "Unsupported video card", OSMB_YESNO);
+		S32 button = OSMessageBox(buffer.c_str(), "Unsupported video card", OSMB_YESNO);
 		if (OSBTN_YES == button)
 		{
 			return FALSE;
@@ -124,8 +97,6 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
 	return FALSE;
 }
 
-
-
 // Switch to determine whether we capture all displays, or just the main one.
 // We may want to base this on the setting of _DEBUG...
 
@@ -242,7 +213,7 @@ static LLWindowMacOSX *gWindowImplementation = NULL;
 
 
 
-LLWindowMacOSX::LLWindowMacOSX(char *title, char *name, S32 x, S32 y, S32 width,
+LLWindowMacOSX::LLWindowMacOSX(const std::string& title, const std::string& name, S32 x, S32 y, S32 width,
 							   S32 height, U32 flags,
 							   BOOL fullscreen, BOOL clearBg,
 							   BOOL disable_vsync, BOOL use_gl,
@@ -289,10 +260,11 @@ LLWindowMacOSX::LLWindowMacOSX(char *title, char *name, S32 x, S32 y, S32 width,
 	mOriginalAspectRatio = (double)CGDisplayPixelsWide(mDisplay) / (double)CGDisplayPixelsHigh(mDisplay);
 
 	// Stash the window title
-	strcpy((char*)mWindowTitle + 1, title); /* Flawfinder: ignore */
-	mWindowTitle[0] = strlen(title);	/* Flawfinder: ignore */
+	strcpy((char*)mWindowTitle + 1, title.c_str()); /* Flawfinder: ignore */
+	mWindowTitle[0] = title.length();
 
 	mEventHandlerUPP = NewEventHandlerUPP(staticEventHandler);
+	mMoveEventCampartorUPP = NewEventComparatorUPP(staticMoveEventComparator);
 	mGlobalHandlerRef = NULL;
 	mWindowHandlerRef = NULL;
 
@@ -467,8 +439,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 			mFullscreenBits    = -1;
 			mFullscreenRefresh = -1;
 
-			char error[256];	/* Flawfinder: ignore */
-			snprintf(error, sizeof(error), "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);	
+			std::string error= llformat("Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);	
 			OSMessageBox(error, "Error", OSMB_OK);
 		}
 	}
@@ -809,7 +780,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 	aglSetInteger(mContext, AGL_SWAP_INTERVAL, &frames_per_swap);  
 
 	//enable multi-threaded OpenGL
-	if (gSavedSettings.getBOOL("RenderAppleUseMultGL"))
+	if (sUseMultGL)
 	{
 		CGLError cgl_err;
 		CGLContextObj ctx = CGLGetCurrentContext();
@@ -826,9 +797,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 		}
 	}
 
-	//make sure multisample starts off disabled
-	glDisable(GL_MULTISAMPLE_ARB);
-	
 	// Don't need to get the current gamma, since there's a call that restores it to the system defaults.
 	return TRUE;
 }
@@ -1445,6 +1413,11 @@ BOOL LLWindowMacOSX::setCursorPosition(const LLCoordWindow position)
 	// Under certain circumstances, this will trigger us to decouple the cursor.
 	adjustCursorDecouple(true);
 
+	// trigger mouse move callback
+	LLCoordGL gl_pos;
+	convertCoords(position, &gl_pos);
+	mCallbacks->handleMouseMove(this, gl_pos, (MASK)0);
+
 	return result;
 }
 
@@ -1515,6 +1488,7 @@ void LLWindowMacOSX::adjustCursorDecouple(bool warpingMouse)
 				//			llinfos << "adjustCursorDecouple: decoupling cursor" << llendl;
 				CGAssociateMouseAndMouseCursorPosition(false);
 				mCursorDecoupled = true;
+				FlushSpecificEventsFromQueue(GetCurrentEventQueue(), mMoveEventCampartorUPP, NULL);
 				mCursorIgnoreNextDelta = TRUE;
 			}
 		}
@@ -1610,11 +1584,6 @@ void LLWindowMacOSX::afterDialog()
 }
 
 
-S32 LLWindowMacOSX::stat(const char* file_name, struct stat* stat_info)
-{
-	return ::stat( file_name, stat_info );
-}
-
 void LLWindowMacOSX::flashIcon(F32 seconds)
 {
 	// Don't do this if we're already started, since this would try to install the NMRec twice.
@@ -1744,15 +1713,6 @@ BOOL LLWindowMacOSX::copyTextToClipboard(const LLWString &s)
 }
 
 
-BOOL LLWindowMacOSX::sendEmail(const char* address, const char* subject, const char* body_text,
-									   const char* attachment, const char* attachment_displayed_name )
-{
-	// MBW -- XXX -- Um... yeah.  I'll get to this later.
-
-	return false;
-}
-
-
 // protected
 BOOL LLWindowMacOSX::resetDisplayResolution()
 {
@@ -1949,13 +1909,30 @@ BOOL LLWindowMacOSX::convertCoords(LLCoordGL from, LLCoordScreen *to)
 
 
 
-void LLWindowMacOSX::setupFailure(const char* text, const char* caption, U32 type)
+void LLWindowMacOSX::setupFailure(const std::string& text, const std::string& caption, U32 type)
 {
 	destroyContext();
 
 	OSMessageBox(text, caption, type);
 }
 
+pascal Boolean LLWindowMacOSX::staticMoveEventComparator( EventRef event, void* data)
+{
+	UInt32 				evtClass = GetEventClass (event);
+	UInt32 				evtKind = GetEventKind (event);
+
+	if ((evtClass == kEventClassMouse) && ((evtKind == kEventMouseDragged) || (evtKind == kEventMouseMoved)))
+	{
+		return true;
+	}
+
+	else
+	{
+		return false;
+	}
+}
+
+
 pascal OSStatus LLWindowMacOSX::staticEventHandler(EventHandlerCallRef myHandler, EventRef event, void* userData)
 {
 	LLWindowMacOSX *self = (LLWindowMacOSX*)userData;
@@ -3020,20 +2997,13 @@ void LLSplashScreenMacOSX::showImpl()
 #endif
 }
 
-void LLSplashScreenMacOSX::updateImpl(const char* mesg)
+void LLSplashScreenMacOSX::updateImpl(const std::string& mesg)
 {
 	if(mWindow != NULL)
 	{
 		CFStringRef string = NULL;
 
-		if(mesg != NULL)
-		{
-			string = CFStringCreateWithCString(NULL, mesg, kCFStringEncodingUTF8);
-		}
-		else
-		{
-			string = CFStringCreateWithCString(NULL, "", kCFStringEncodingUTF8);
-		}
+		string = CFStringCreateWithCString(NULL, mesg.c_str(), kCFStringEncodingUTF8);
 
 		if(string != NULL)
 		{
@@ -3068,7 +3038,7 @@ void LLSplashScreenMacOSX::hideImpl()
 
 
 
-S32 OSMessageBoxMacOSX(const char* text, const char* caption, U32 type)
+S32 OSMessageBoxMacOSX(const std::string& text, const std::string& caption, U32 type)
 {
 	S32 result = OSBTN_CANCEL;
 	SInt16 retval_mac = 1;
@@ -3079,23 +3049,8 @@ S32 OSMessageBoxMacOSX(const char* text, const char* caption, U32 type)
 	AlertType alertType = kAlertCautionAlert;
 	OSStatus err;
 
-	if(text != NULL)
-	{
-		explanationString = CFStringCreateWithCString(NULL, text, kCFStringEncodingUTF8);
-	}
-	else
-	{
-		explanationString = CFStringCreateWithCString(NULL, "", kCFStringEncodingUTF8);
-	}
-
-	if(caption != NULL)
-	{
-		errorString = CFStringCreateWithCString(NULL, caption, kCFStringEncodingUTF8);
-	}
-	else
-	{
-		errorString = CFStringCreateWithCString(NULL, "", kCFStringEncodingUTF8);
-	}
+	explanationString = CFStringCreateWithCString(NULL, text.c_str(), kCFStringEncodingUTF8);
+	errorString = CFStringCreateWithCString(NULL, caption.c_str(), kCFStringEncodingUTF8);
 
 	params.version = kStdCFStringAlertVersionOne;
 	params.movable = false;
@@ -3179,15 +3134,13 @@ S32 OSMessageBoxMacOSX(const char* text, const char* caption, U32 type)
 
 // Open a URL with the user's default web browser.
 // Must begin with protocol identifier.
-void spawn_web_browser(const char* escaped_url)
+void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
 {
 	bool found = false;
 	S32 i;
 	for (i = 0; i < gURLProtocolWhitelistCount; i++)
 	{
-		S32 len = strlen(gURLProtocolWhitelist[i]);	/* Flawfinder: ignore */
-		if (!strncmp(escaped_url, gURLProtocolWhitelist[i], len)
-			&& escaped_url[len] == ':')
+		if (escaped_url.find(gURLProtocolWhitelist[i]) != std::string::npos)
 		{
 			found = true;
 			break;
@@ -3196,7 +3149,7 @@ void spawn_web_browser(const char* escaped_url)
 
 	if (!found)
 	{
-		llwarns << "spawn_web_browser() called for url with protocol not on whitelist: " << escaped_url << llendl;
+		llwarns << "spawn_web_browser called for url with protocol not on whitelist: " << escaped_url << llendl;
 		return;
 	}
 
@@ -3205,7 +3158,7 @@ void spawn_web_browser(const char* escaped_url)
 
 	llinfos << "Opening URL " << escaped_url << llendl;
 
-	CFStringRef	stringRef = CFStringCreateWithCString(NULL, escaped_url, kCFStringEncodingUTF8);
+	CFStringRef	stringRef = CFStringCreateWithCString(NULL, escaped_url.c_str(), kCFStringEncodingUTF8);
 	if (stringRef)
 	{
 		// This will succeed if the string is a full URL, including the http://
@@ -3268,25 +3221,34 @@ BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
 	return (retval);
 }
 
-static WindowRef dummywindowref = NULL;
 
 void *LLWindowMacOSX::getPlatformWindow()
 {
-	if(mWindow != NULL)
-		return (void*)mWindow;
+	// NOTE: this will be NULL in fullscreen mode.  Plan accordingly.
+	return (void*)mWindow;
+}
+
+void *LLWindowMacOSX::getMediaWindow()
+{
+	/* 
+		Mozilla needs to be initialized with a WindowRef to function properly.  
+		(There's no good reason for this, since it shouldn't be interacting with our window in any way, but that's another issue.)
+		If we're in windowed mode, we _could_ hand it our actual window pointer, but a subsequent switch to fullscreen will destroy that window, 
+		which trips up Mozilla.
+		Instead of using our actual window, we create an invisible window which will persist for the lifetime of the application and pass that to Mozilla.
+		This satisfies its deep-seated need to latch onto a WindowRef and solves the issue with switching between fullscreen and windowed modes.
 
-	// If we're in fullscreen mode, there's no window pointer available.
-	// Since Mozilla needs one to function, create a dummy window here.
-	// Note that we will never destroy it, but since only one will be created per run of the application, that's okay.
+		Note that we will never destroy this window (by design!), but since only one will ever be created per run of the application, that's okay.
+	*/
 	
-	if(dummywindowref == NULL)
+	if(sMediaWindow == NULL)
 	{
 		Rect window_rect = {100, 100, 200, 200};
 
-		dummywindowref = NewCWindow(
+		sMediaWindow = NewCWindow(
 			NULL,
 			&window_rect,
-			"\p",
+			(ConstStr255Param) "\p",
 			false,				// Create the window invisible.  
 			zoomDocProc,		// Window with a grow box and a zoom box
 			kLastWindowOfClass,		// create it behind other windows
@@ -3294,7 +3256,7 @@ void *LLWindowMacOSX::getPlatformWindow()
 			0);
 	}
 	
-	return (void*)dummywindowref;
+	return (void*)sMediaWindow;
 }
 
 void LLWindowMacOSX::stopDockTileBounce()
@@ -3402,5 +3364,3 @@ std::string LLWindowMacOSX::getFontListSans()
 	// The third filename is in UTF8, but it shows up in the font menu as "STHeiti Light"
 	return "\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 Pro W3.otf;\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 ProN W3.otf;AppleGothic.dfont;AppleGothic.ttf;\xe5\x8d\x8e\xe6\x96\x87\xe7\xbb\x86\xe9\xbb\x91.ttf";
 }
-
-#endif // LL_DARWIN
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index d8a0788..bc0b7d4 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -86,12 +86,6 @@ public:
 	/*virtual*/ void delayInputProcessing() {};
 	/*virtual*/ void swapBuffers();
 
-	/*virtual*/ LLString getTempFileName();
-	/*virtual*/ void deleteFile( const char* file_name );
-	/*virtual*/ S32 stat( const char* file_name, struct stat* stat_info );
-	/*virtual*/ BOOL sendEmail(const char* address,const char* subject,const char* body_text,const char* attachment=NULL, const char* attachment_displayed_name=NULL);
-
-
 	// handy coordinate space conversion routines
 	/*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to);
 	/*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to);
@@ -111,16 +105,18 @@ public:
 	/*virtual*/ BOOL dialog_color_picker(F32 *r, F32 *g, F32 *b);
 
 	/*virtual*/ void *getPlatformWindow();
+	/*virtual*/ void *getMediaWindow();
 	/*virtual*/ void bringToFront() {};
 	
 	/*virtual*/ void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b);
 	/*virtual*/ void interruptLanguageTextInput();
+	/*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
 
 	static std::string getFontListSans();
 
 protected:
 	LLWindowMacOSX(
-		char *title, char *name, int x, int y, int width, int height, U32 flags,
+		const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags,
 		BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
 		BOOL ignore_pixel_depth,
 		U32 fsaa_samples);
@@ -154,8 +150,9 @@ protected:
 	// create or re-create the GL context/window.  Called from the constructor and switchContext().
 	BOOL createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL disable_vsync);
 	void destroyContext();
-	void setupFailure(const char* text, const char* caption, U32 type);
+	void setupFailure(const std::string& text, const std::string& caption, U32 type);
 	static pascal OSStatus staticEventHandler (EventHandlerCallRef myHandler, EventRef event, void* userData);
+	static pascal Boolean staticMoveEventComparator( EventRef event, void* data);
 	OSStatus eventHandler (EventHandlerCallRef myHandler, EventRef event);
 	void adjustCursorDecouple(bool warpingMouse = false);
 	void fixWindowSize(void);
@@ -174,6 +171,8 @@ protected:
 	EventHandlerUPP 	mEventHandlerUPP;
 	EventHandlerRef		mGlobalHandlerRef;
 	EventHandlerRef		mWindowHandlerRef;
+	EventComparatorUPP  mMoveEventCampartorUPP;
+	
 	Rect		mOldMouseClip;  // Screen rect to which the mouse cursor was globally constrained before we changed it in clipMouse()
 	Str255 		mWindowTitle;
 	double		mOriginalAspectRatio;
@@ -203,7 +202,11 @@ protected:
 	LangCode	mTSMLangCode;
 	LLPreeditor*	mPreeditor;
 	
+	static BOOL	sUseMultGL;
+
 	friend class LLWindowManager;
+	static WindowRef sMediaWindow;
+
 };
 
 
@@ -214,14 +217,14 @@ public:
 	virtual ~LLSplashScreenMacOSX();
 
 	/*virtual*/ void showImpl();
-	/*virtual*/ void updateImpl(const char* mesg);
+	/*virtual*/ void updateImpl(const std::string& mesg);
 	/*virtual*/ void hideImpl();
 
 private:
 	WindowRef   mWindow;
 };
 
-S32 OSMessageBoxMacOSX(const char* text, const char* caption, U32 type);
+S32 OSMessageBoxMacOSX(const std::string& text, const std::string& caption, U32 type);
 
 void load_url_external(const char* url);
 
diff --git a/linden/indra/llwindow/llwindowmesaheadless.cpp b/linden/indra/llwindow/llwindowmesaheadless.cpp
index 01b00af..0ffd4e3 100644
--- a/linden/indra/llwindow/llwindowmesaheadless.cpp
+++ b/linden/indra/llwindow/llwindowmesaheadless.cpp
@@ -29,14 +29,11 @@
  * $/LicenseInfo$
  */
 
-#if LL_MESA_HEADLESS
-
 #include "linden_common.h"
 #include "indra_constants.h"
 
 #include "llwindowmesaheadless.h"
 #include "llgl.h"
-#include "llglheaders.h"
 
 #define MESA_CHANNEL_TYPE GL_UNSIGNED_SHORT
 #define MESA_CHANNEL_SIZE 2
@@ -46,7 +43,7 @@ U16 *gMesaBuffer = NULL;
 //
 // LLWindowMesaHeadless
 //
-LLWindowMesaHeadless::LLWindowMesaHeadless(char *title, char *name, S32 x, S32 y, S32 width, S32 height,
+LLWindowMesaHeadless::LLWindowMesaHeadless(const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
 							 U32 flags,  BOOL fullscreen, BOOL clearBg,
 							 BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth)
 	: LLWindow(fullscreen, flags)
@@ -83,5 +80,3 @@ void LLWindowMesaHeadless::swapBuffers()
 {
 	glFinish();
 }
-
-#endif
diff --git a/linden/indra/llwindow/llwindowmesaheadless.h b/linden/indra/llwindow/llwindowmesaheadless.h
index fb32e38..86d8372 100644
--- a/linden/indra/llwindow/llwindowmesaheadless.h
+++ b/linden/indra/llwindow/llwindowmesaheadless.h
@@ -81,12 +81,6 @@ public:
 	/*virtual*/ void delayInputProcessing() {};
 	/*virtual*/ void swapBuffers();
 
-	/*virtual*/ LLString getTempFileName() {return LLString(""); };
-	/*virtual*/ void deleteFile( const char* file_name ) {};
-	/*virtual*/ S32 stat( const char* file_name, struct stat* stat_info ) {return 0; };
-	/*virtual*/ BOOL sendEmail(const char* address,const char* subject,const char* body_text,const char* attachment=NULL, const char* attachment_displayed_name=NULL) { return FALSE; };
-
-
 	// handy coordinate space conversion routines
 	/*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to) { return FALSE; };
 	/*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to) { return FALSE; };
@@ -103,7 +97,7 @@ public:
 	/*virtual*/ void *getPlatformWindow() { return 0; };
 	/*virtual*/ void bringToFront() {};
 	
-	LLWindowMesaHeadless(char *title, char *name, S32 x, S32 y, S32 width, S32 height,
+	LLWindowMesaHeadless(const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
 				  U32 flags,  BOOL fullscreen, BOOL clearBg,
 				  BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth);
 	~LLWindowMesaHeadless();
@@ -120,7 +114,7 @@ public:
 	virtual ~LLSplashScreenMesaHeadless() {};
 
 	/*virtual*/ void showImpl() {};
-	/*virtual*/ void updateImpl(const char* mesg) {};
+	/*virtual*/ void updateImpl(const std::string& mesg) {};
 	/*virtual*/ void hideImpl() {};
 
 };
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 0d1d622..e5d15c4 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -41,8 +41,6 @@
 #include "lldir.h"
 #include "llfindlocale.h"
 
-#include "llglheaders.h"
-
 #include "indra_constants.h"
 
 #if LL_GTK
@@ -66,7 +64,10 @@ extern "C" {
 
 extern BOOL gDebugWindowProc;
 
-const S32	MAX_NUM_RESOLUTIONS = 32;
+const S32 MAX_NUM_RESOLUTIONS = 200;
+
+// static variable for ATI mouse cursor crash work-around:
+static bool ATIbug = false;
 
 //
 // LLWindowSDL
@@ -183,43 +184,7 @@ Display* get_SDL_Display(void)
 #endif // LL_X11
 
 
-BOOL check_for_card(const char* RENDERER, const char* bad_card)
-{
-	if (!strncasecmp(RENDERER, bad_card, strlen(bad_card)))
-	{
-		char buffer[1024];	/* Flawfinder: ignore */
-		snprintf(buffer, sizeof(buffer),	
-			"Your video card appears to be a %s, which Second Life does not support.\n"
-			"\n"
-			"Second Life requires a video card with 32 Mb of memory or more, as well as\n"
-			"multitexture support.  We explicitly support nVidia GeForce 2 or better, \n"
-			"and ATI Radeon 8500 or better.\n"
-			"\n"
-			"If you own a supported card and continue to receive this message, try \n"
-			"updating to the latest video card drivers. Otherwise look in the\n"
-			"secondlife.com support section or e-mail technical support\n"
-			"\n"
-			"You can try to run Second Life, but it will probably crash or run\n"
-			"very slowly.  Try anyway?",
-			bad_card);
-		S32 button = OSMessageBox(buffer, "Unsupported video card", OSMB_YESNO);
-		if (OSBTN_YES == button)
-		{
-			return FALSE;
-		}
-		else
-		{
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-
-
-LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
+LLWindowSDL::LLWindowSDL(const std::string& title, S32 x, S32 y, S32 width,
 							   S32 height, U32 flags,
 							   BOOL fullscreen, BOOL clearBg,
 							   BOOL disable_vsync, BOOL use_gl,
@@ -260,18 +225,11 @@ LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
 	// Get the original aspect ratio of the main device.
 	mOriginalAspectRatio = 1024.0 / 768.0;  // !!! *FIX: ? //(double)CGDisplayPixelsWide(mDisplay) / (double)CGDisplayPixelsHigh(mDisplay);
 
-	if (!title)
-		title = "SDL Window";  // *FIX: (???)
-
-	// Stash the window title
-	mWindowTitle = new char[strlen(title) + 1]; /* Flawfinder: ignore */
-	if(mWindowTitle == NULL)
-	{
-		llwarns << "Memory allocation failure" << llendl;
-		return;
-	}
+	if (title.empty())
+		mWindowTitle = "SDL Window";  // *FIX: (???)
+	else
+		mWindowTitle = title;
 
-	strcpy(mWindowTitle, title); /* Flawfinder: ignore */
 	// Create the GL context and set it up for windowed or fullscreen, as appropriate.
 	if(createContext(x, y, width, height, 32, fullscreen, disable_vsync))
 	{
@@ -485,7 +443,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 	}
 
 	SDL_EnableUNICODE(1);
-	SDL_WM_SetCaption(mWindowTitle, mWindowTitle);
+	SDL_WM_SetCaption(mWindowTitle.c_str(), mWindowTitle.c_str());
 
 	// Set the application icon.
 	SDL_Surface *bmpsurface;
@@ -635,8 +593,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 			mFullscreenBits    = -1;
 			mFullscreenRefresh = -1;
 
-			char error[256];	/* Flawfinder: ignore */
-			snprintf(error, sizeof(error), "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);	
+			std::string error = llformat("Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);	
 			OSMessageBox(error, "Error", OSMB_OK);
 		}
 	}
@@ -826,8 +783,6 @@ LLWindowSDL::~LLWindowSDL()
 		delete []mSupportedResolutions;
 	}
 
-	delete[] mWindowTitle;
-
 	gWindowImplementation = NULL;
 }
 
@@ -1208,11 +1163,6 @@ void LLWindowSDL::afterDialog()
 }
 
 
-S32 LLWindowSDL::stat(const char* file_name, struct stat* stat_info)
-{
-	return ::stat( file_name, stat_info );
-}
-
 #if LL_X11
 // set/reset the XWMHints flag for 'urgency' that usually makes the icon flash
 void LLWindowSDL::x11_set_urgent(BOOL urgent)
@@ -1777,15 +1727,6 @@ BOOL LLWindowSDL::copyTextToClipboard(const LLWString &s)
 }
 #endif // LL_X11
 
-BOOL LLWindowSDL::sendEmail(const char* address, const char* subject, const char* body_text,
-									   const char* attachment, const char* attachment_displayed_name )
-{
-	// MBW -- XXX -- Um... yeah.  I'll get to this later.
-
-	return FALSE;
-}
-
-
 LLWindow::LLWindowResolution* LLWindowSDL::getSupportedResolutions(S32 &num_resolutions)
 {
 	if (!mSupportedResolutions)
@@ -1797,7 +1738,7 @@ LLWindow::LLWindowResolution* LLWindowSDL::getSupportedResolutions(S32 &num_reso
         if ( (modes != NULL) && (modes != ((SDL_Rect **) -1)) )
         {
             int count = 0;
-            while (*modes)  // they're sorted biggest to smallest, so find end...
+            while (*modes && count<MAX_NUM_RESOLUTIONS)  // they're sorted biggest to smallest, so find end...
             {
                 modes++;
                 count++;
@@ -1890,7 +1831,7 @@ BOOL LLWindowSDL::convertCoords(LLCoordGL from, LLCoordScreen *to)
 
 
 
-void LLWindowSDL::setupFailure(const char* text, const char* caption, U32 type)
+void LLWindowSDL::setupFailure(const std::string& text, const std::string& caption, U32 type)
 {
 	destroyContext();
 
@@ -2337,6 +2278,12 @@ static SDL_Cursor *makeSDLCursorFromBMP(const char *filename, int hotx, int hoty
 
 void LLWindowSDL::setCursor(ECursorType cursor)
 {
+	if (ATIbug) {
+		// cursor-updating is very flaky when this bug is
+		// present; do nothing.
+		return;
+	}
+
 	if (mCurrentCursor != cursor)
 	{
 		if (cursor < UI_CURSOR_COUNT)
@@ -2409,6 +2356,11 @@ void LLWindowSDL::initCursors()
 	mSDLCursors[UI_CURSOR_TOOLPAUSE] = makeSDLCursorFromBMP("toolpause.BMP",0,0);
 	mSDLCursors[UI_CURSOR_TOOLMEDIAOPEN] = makeSDLCursorFromBMP("toolmediaopen.BMP",0,0);
 	mSDLCursors[UI_CURSOR_PIPETTE] = makeSDLCursorFromBMP("lltoolpipette.BMP",2,28);
+
+	if (getenv("LL_ATI_MOUSE_CURSOR_BUG") != NULL) {
+		llinfos << "Disabling cursor updating due to LL_ATI_MOUSE_CURSOR_BUG" << llendl;
+		ATIbug = true;
+	}
 }
 
 void LLWindowSDL::quitCursors()
@@ -2520,7 +2472,7 @@ void LLSplashScreenSDL::showImpl()
 {
 }
 
-void LLSplashScreenSDL::updateImpl(const char* mesg)
+void LLSplashScreenSDL::updateImpl(const std::string& mesg)
 {
 }
 
@@ -2541,7 +2493,7 @@ static void response_callback (GtkDialog *dialog,
 	gtk_main_quit();
 }
 
-S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type)
+S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 type)
 {
 	S32 rtn = OSBTN_CANCEL;
 
@@ -2578,9 +2530,7 @@ S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type)
 			buttons = GTK_BUTTONS_YES_NO;
 			break;
 		}
-		win = gtk_message_dialog_new(NULL,
-                                             flags, messagetype, buttons,
-                                             text);
+		win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, text.c_str());
 
 # if LL_X11
 		// Make GTK tell the window manager to associate this
@@ -2602,8 +2552,8 @@ S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type)
 		gtk_window_set_type_hint(GTK_WINDOW(win),
 					 GDK_WINDOW_TYPE_HINT_DIALOG);
 
-		if (caption)
-			gtk_window_set_title(GTK_WINDOW(win), caption);
+		if (!caption.empty())
+			gtk_window_set_title(GTK_WINDOW(win), caption.c_str());
 
 		gint response = GTK_RESPONSE_NONE;
 		g_signal_connect (win,
@@ -2727,7 +2677,7 @@ BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
 	return rtn;
 }
 #else
-S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type)
+S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 type)
 {
 	llinfos << "MSGBOX: " << caption << ": " << text << llendl;
 	return 0;
@@ -2739,29 +2689,12 @@ BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
 }
 #endif // LL_GTK
 
-// Open a URL with the user's default web browser.
-// Must begin with protocol identifier.
-void spawn_web_browser(const char* escaped_url)
-{
-	llinfos << "spawn_web_browser: " << escaped_url << llendl;
-	
 #if LL_LINUX || LL_SOLARIS
-# if LL_X11
-	if (gWindowImplementation && gWindowImplementation->mSDL_Display)
-	{
-		maybe_lock_display();
-		// Just in case - before forking.
-		XSync(gWindowImplementation->mSDL_Display, False);
-		maybe_unlock_display();
-	}
-# endif // LL_X11
-
-	std::string cmd;
-	cmd  = gDirUtilp->getAppRODataDir();
-	cmd += gDirUtilp->getDirDelimiter();
-	cmd += "launch_url.sh";
-	char* const argv[] = {(char*)cmd.c_str(), (char*)escaped_url, NULL};
-
+// extracted from spawnWebBrowser for clarity and to eliminate
+//  compiler confusion regarding close(int fd) vs. LLWindow::close()
+void exec_cmd(const std::string& cmd, const std::string& arg)
+{
+	char* const argv[] = {(char*)cmd.c_str(), (char*)arg.c_str(), NULL};
 	fflush(NULL);
 	pid_t pid = fork();
 	if (pid == 0)
@@ -2786,6 +2719,32 @@ void spawn_web_browser(const char* escaped_url)
 			llwarns << "fork failure." << llendl;
 		}
 	}
+}
+#endif
+
+// Open a URL with the user's default web browser.
+// Must begin with protocol identifier.
+void LLWindowSDL::spawnWebBrowser(const std::string& escaped_url)
+{
+	llinfos << "spawn_web_browser: " << escaped_url << llendl;
+	
+#if LL_LINUX || LL_SOLARIS
+# if LL_X11
+	if (mSDL_Display)
+	{
+		maybe_lock_display();
+		// Just in case - before forking.
+		XSync(mSDL_Display, False);
+		maybe_unlock_display();
+	}
+# endif // LL_X11
+
+	std::string cmd, arg;
+	cmd  = gDirUtilp->getAppRODataDir().c_str();
+	cmd += gDirUtilp->getDirDelimiter().c_str();
+	cmd += "launch_url.sh";
+	arg = escaped_url;
+	exec_cmd(cmd, arg);
 #endif // LL_LINUX || LL_SOLARIS
 
 	llinfos << "spawn_web_browser returning." << llendl;
@@ -2871,14 +2830,18 @@ std::string LLWindowSDL::getFontListSans()
 	{
 		if (success >= 2 && locale->lang) // confident!
 		{
+			LL_INFOS("AppInit") << "Language " << locale->lang << LL_ENDL;
+			LL_INFOS("AppInit") << "Location " << locale->country << LL_ENDL;
+			LL_INFOS("AppInit") << "Variant " << locale->variant << LL_ENDL;
+
 			llinfos << "Preferring fonts of language: "
 				<< locale->lang
 				<< llendl;
 			sort_order = "lang=" + std::string(locale->lang) + ":"
 				+ sort_order;
 		}
-		FL_FreeLocale(&locale);
 	}
+	FL_FreeLocale(&locale);
 
 	if (!FcInit())
 	{
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 5aed4e6..a395ccd 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -92,11 +92,6 @@ public:
 	/*virtual*/ void gatherInput();
 	/*virtual*/ void swapBuffers();
 
-	/*virtual*/ LLString getTempFileName();
-	/*virtual*/ void deleteFile( const char* file_name );
-	/*virtual*/ S32 stat( const char* file_name, struct stat* stat_info );
-	/*virtual*/ BOOL sendEmail(const char* address,const char* subject,const char* body_text,const char* attachment=NULL, const char* attachment_displayed_name=NULL);
-
     /*virtual*/ void delayInputProcessing() { };
 
 	// handy coordinate space conversion routines
@@ -120,6 +115,8 @@ public:
 	/*virtual*/ void *getPlatformWindow();
 	/*virtual*/ void bringToFront();
 
+	/*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
+	
 	static std::string getFontListSans();
 
 	// Not great that these are public, but they have to be accessible
@@ -134,7 +131,7 @@ public:
 
 protected:
 	LLWindowSDL(
-		char *title, int x, int y, int width, int height, U32 flags,
+		const std::string& title, int x, int y, int width, int height, U32 flags,
 		BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
 		BOOL ignore_pixel_depth, U32 fsaa_samples);
 	~LLWindowSDL();
@@ -164,7 +161,7 @@ protected:
 	// create or re-create the GL context/window.  Called from the constructor and switchContext().
 	BOOL createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL disable_vsync);
 	void destroyContext();
-	void setupFailure(const char* text, const char* caption, U32 type);
+	void setupFailure(const std::string& text, const std::string& caption, U32 type);
 	void adjustCursorDecouple(bool warpingMouse = false);
 	void fixWindowSize(void);
 	U32 SDLCheckGrabbyKeys(SDLKey keysym, BOOL gain);
@@ -176,7 +173,7 @@ protected:
 	U32             mGrabbyKeyFlags;
 	int			mReallyCapturedCount;
 	SDL_Surface *	mWindow;
-	char * 		mWindowTitle;
+	std::string mWindowTitle;
 	double		mOriginalAspectRatio;
 	BOOL		mCursorDecoupled;
 	S32			mCursorLastEventDeltaX;
@@ -220,11 +217,11 @@ public:
 	virtual ~LLSplashScreenSDL();
 
 	/*virtual*/ void showImpl();
-	/*virtual*/ void updateImpl(const char* mesg);
+	/*virtual*/ void updateImpl(const std::string& mesg);
 	/*virtual*/ void hideImpl();
 };
 
-S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type);
+S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 type);
 
 void load_url_external(const char* url);
 
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 2001899..047fa31 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -54,8 +54,6 @@
 #include "llstring.h"
 #include "lldir.h"
 
-#include "llglheaders.h"
-
 #include "indra_constants.h"
 
 #include "llpreeditor.h"
@@ -82,7 +80,7 @@ LLW32MsgCallback gAsyncMsgCallback = NULL;
 // LLWindowWin32
 //
 
-void show_window_creation_error(const char* title)
+void show_window_creation_error(const std::string& title)
 {
 	LL_WARNS("Window") << title << LL_ENDL;
 }
@@ -359,7 +357,7 @@ LLWinImm::~LLWinImm()
 }
 
 
-LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
+LLWindowWin32::LLWindowWin32(const std::string& title, const std::string& name, S32 x, S32 y, S32 width,
 							 S32 height, U32 flags, 
 							 BOOL fullscreen, BOOL clearBg,
 							 BOOL disable_vsync, BOOL use_gl,
@@ -386,7 +384,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
 	RECT			window_rect;
 
 	// Set the window title
-	if (!title)
+	if (title.empty())
 	{
 		mWindowTitle = new WCHAR[50];
 		wsprintf(mWindowTitle, L"OpenGL Window");
@@ -394,12 +392,12 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
 	else
 	{
 		mWindowTitle = new WCHAR[256]; // Assume title length < 255 chars.
-		mbstowcs(mWindowTitle, title, 255);
+		mbstowcs(mWindowTitle, title.c_str(), 255);
 		mWindowTitle[255] = 0;
 	}
 
 	// Set the window class name
-	if (!name)
+	if (name.empty())
 	{
 		mWindowClassName = new WCHAR[50];
 		wsprintf(mWindowClassName, L"OpenGL Window");
@@ -407,7 +405,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
 	else
 	{
 		mWindowClassName = new WCHAR[256]; // Assume title length < 255 chars.
-		mbstowcs(mWindowClassName, name, 255);
+		mbstowcs(mWindowClassName, name.c_str(), 255);
 		mWindowClassName[255] = 0;
 	}
 
@@ -571,8 +569,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
 			mFullscreenBits    = -1;
 			mFullscreenRefresh = -1;
 
-			char error[256];	/* Flawfinder: ignore */
-			snprintf(error, sizeof(error), "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);	/* Flawfinder: ignore */
+			std::string error = llformat("Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);
 			OSMessageBox(error, "Error", OSMB_OK);
 		}
 	}
@@ -1390,6 +1387,20 @@ BOOL LLWindowWin32::setCursorPosition(const LLCoordWindow position)
 		return FALSE;
 	}
 
+	// Inform the application of the new mouse position (needed for per-frame
+	// hover/picking to function).
+	LLCoordGL gl_pos;
+	convertCoords(position, &gl_pos);
+	mCallbacks->handleMouseMove(this, gl_pos, (MASK)0);
+	
+	// DEV-18951 VWR-8524 Camera moves wildly when alt-clicking.
+	// Because we have preemptively notified the application of the new
+	// mouse position via handleMouseMove() above, we need to clear out
+	// any stale mouse move events.  RN/JC
+	MSG msg;
+	while (PeekMessage(&msg, NULL, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE))
+	{ }
+
 	return SetCursorPos(screen_pos.mX, screen_pos.mY);
 }
 
@@ -1942,6 +1953,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->convertCoords(window_coord, &gl_coord);
 				}
 				MASK mask = gKeyboard->currentMask(TRUE);
+				// generate move event to update mouse coordinates
+				window_imp->mCallbacks->handleMouseMove(window_imp, gl_coord, mask);
 				if (window_imp->mCallbacks->handleMouseDown(window_imp, gl_coord, mask))
 				{
 					return 0;
@@ -1969,6 +1982,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->convertCoords(window_coord, &gl_coord);
 				}
 				MASK mask = gKeyboard->currentMask(TRUE);
+				// generate move event to update mouse coordinates
+				window_imp->mCallbacks->handleMouseMove(window_imp, gl_coord, mask);
 				if (window_imp->mCallbacks->handleDoubleClick(window_imp, gl_coord, mask) )
 				{
 					return 0;
@@ -1999,6 +2014,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->convertCoords(window_coord, &gl_coord);
 				}
 				MASK mask = gKeyboard->currentMask(TRUE);
+				// generate move event to update mouse coordinates
+				window_imp->mCallbacks->handleMouseMove(window_imp, gl_coord, mask);
 				if (window_imp->mCallbacks->handleMouseUp(window_imp, gl_coord, mask))
 				{
 					return 0;
@@ -2015,7 +2032,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->interruptLanguageTextInput();
 				}
 
-				// Because we move the cursor position in tllviewerhe app, we need to query
+				// Because we move the cursor position in the llviewerapp, we need to query
 				// to find out where the cursor at the time the event is handled.
 				// If we don't do this, many clicks could get buffered up, and if the
 				// first click changes the cursor position, all subsequent clicks
@@ -2031,6 +2048,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->convertCoords(window_coord, &gl_coord);
 				}
 				MASK mask = gKeyboard->currentMask(TRUE);
+				// generate move event to update mouse coordinates
+				window_imp->mCallbacks->handleMouseMove(window_imp, gl_coord, mask);
 				if (window_imp->mCallbacks->handleRightMouseDown(window_imp, gl_coord, mask))
 				{
 					return 0;
@@ -2057,6 +2076,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->convertCoords(window_coord, &gl_coord);
 				}
 				MASK mask = gKeyboard->currentMask(TRUE);
+				// generate move event to update mouse coordinates
+				window_imp->mCallbacks->handleMouseMove(window_imp, gl_coord, mask);
 				if (window_imp->mCallbacks->handleRightMouseUp(window_imp, gl_coord, mask))
 				{
 					return 0;
@@ -2089,6 +2110,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->convertCoords(window_coord, &gl_coord);
 				}
 				MASK mask = gKeyboard->currentMask(TRUE);
+				// generate move event to update mouse coordinates
+				window_imp->mCallbacks->handleMouseMove(window_imp, gl_coord, mask);
 				if (window_imp->mCallbacks->handleMiddleMouseDown(window_imp, gl_coord, mask))
 				{
 					return 0;
@@ -2115,6 +2138,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 					window_imp->convertCoords(window_coord, &gl_coord);
 				}
 				MASK mask = gKeyboard->currentMask(TRUE);
+				// generate move event to update mouse coordinates
+				window_imp->mCallbacks->handleMouseMove(window_imp, gl_coord, mask);
 				if (window_imp->mCallbacks->handleMiddleMouseUp(window_imp, gl_coord, mask))
 				{
 					return 0;
@@ -2376,7 +2401,7 @@ BOOL LLWindowWin32::pasteTextFromClipboard(LLWString &dst)
 				if (utf16str)
 				{
 					dst = utf16str_to_wstring(utf16str);
-					LLWString::removeCRLF(dst);
+					LLWStringUtil::removeCRLF(dst);
 					GlobalUnlock(h_data);
 					success = TRUE;
 				}
@@ -2399,7 +2424,7 @@ BOOL LLWindowWin32::copyTextToClipboard(const LLWString& wstr)
 
 		// Provide a copy of the data in Unicode format.
 		LLWString sanitized_string(wstr);
-		LLWString::addCRLF(sanitized_string);
+		LLWStringUtil::addCRLF(sanitized_string);
 		llutf16string out_utf16 = wstring_to_utf16str(sanitized_string);
 		const size_t size_utf16 = (out_utf16.length() + 1) * sizeof(WCHAR);
 
@@ -2486,86 +2511,6 @@ BOOL LLWindowWin32::getClientRectInScreenSpace( RECT* rectp )
 	return success;
 }
 
-
-BOOL LLWindowWin32::sendEmail(const char* address, const char* subject, const char* body_text,
-									   const char* attachment, const char* attachment_displayed_name )
-{
-	// Based on "A SendMail() DLL" by Greg Turner, Windows Developer Magazine, Nov. 1997.
-	// See article for use of GetProcAddress
-	// No restrictions on use.
-
-	enum SendResult
-	{
-		LL_EMAIL_SUCCESS,
-		LL_EMAIL_MAPI_NOT_INSTALLED,	// No MAPI Server (eg Microsoft Exchange) installed
-		LL_EMAIL_MAPILOAD_FAILED,		// Load of MAPI32.DLL failed
-		LL_EMAIL_SEND_FAILED			// The message send itself failed
-	};
-
-	SendResult  result = LL_EMAIL_SUCCESS;
-
-	U32 mapi_installed = GetProfileInt(L"Mail", L"MAPI", 0);
-	if( !mapi_installed)
-	{
-		result = LL_EMAIL_MAPI_NOT_INSTALLED;
-	}
-	else
-	{
-		HINSTANCE hMAPIInst = LoadLibrary(L"MAPI32.DLL");	/* Flawfinder: ignore */
-		if(!hMAPIInst)
-		{
-			result =  LL_EMAIL_MAPILOAD_FAILED;
-		}
-		else
-		{
-			LPMAPISENDMAIL	pMAPISendMail   = (LPMAPISENDMAIL)	GetProcAddress(hMAPIInst, "MAPISendMail");
-
-			// Send the message
-			MapiRecipDesc recipients[1];
-			recipients[0].ulReserved = 0;
-			recipients[0].ulRecipClass = MAPI_TO;
-			recipients[0].lpszName = (char*)address;
-			recipients[0].lpszAddress = (char*)address;
-			recipients[0].ulEIDSize = 0;
-			recipients[0].lpEntryID = 0;
-
-			MapiFileDesc files[1];
-			files[0].ulReserved = 0;
-			files[0].flFlags = 0;				// non-OLE file
-			files[0].nPosition = -1;			// Leave file location in email unspecified.
-			files[0].lpszPathName = (char*)attachment; // Must be fully qualified name, including drive letter.
-			files[0].lpszFileName = (char*)attachment_displayed_name;		// If NULL, uses attachment as displayed name.
-			files[0].lpFileType = NULL;			// Recipient will have to figure out what kind of file this is.
-
-			MapiMessage msg;
-			memset(&msg, 0, sizeof(msg));
-			msg.lpszSubject         = (char*)subject;		// may be NULL
-			msg.lpszNoteText        = (char*)body_text;
-			msg.nRecipCount         = address ? 1 : 0;
-			msg.lpRecips            = address ? recipients : NULL;
-			msg.nFileCount			= attachment ? 1 : 0;
-			msg.lpFiles				= attachment ? files : NULL;
-
-			U32 success = pMAPISendMail(0, (U32) mWindowHandle, &msg, MAPI_DIALOG|MAPI_LOGON_UI|MAPI_NEW_SESSION, 0);
-			if(success != SUCCESS_SUCCESS)
-			{
-				result = LL_EMAIL_SEND_FAILED;
-			}
-
-			FreeLibrary(hMAPIInst);
-		}
-	}
-
-	return result == LL_EMAIL_SUCCESS;
-}
-
-
-S32 LLWindowWin32::stat(const char* file_name, struct stat* stat_info)
-{
-	llassert( sizeof(struct stat) == sizeof(struct _stat) );  // They are defined identically in sys/stat.h, but I'm paranoid.
-	return LLFile::stat( file_name, (struct _stat*) stat_info );
-}
-
 void LLWindowWin32::flashIcon(F32 seconds)
 {
 	FLASHWINFO flash_info;
@@ -2803,12 +2748,12 @@ void LLSplashScreenWin32::showImpl()
 }
 
 
-void LLSplashScreenWin32::updateImpl(const char *mesg)
+void LLSplashScreenWin32::updateImpl(const std::string& mesg)
 {
 	if (!mWindow) return;
 
 	WCHAR w_mesg[1024];
-	mbstowcs(w_mesg, mesg, 1024);
+	mbstowcs(w_mesg, mesg.c_str(), 1024);
 
 	SendDlgItemMessage(mWindow,
 		666,		// HACK: text id
@@ -2840,7 +2785,7 @@ LRESULT CALLBACK LLSplashScreenWin32::windowProc(HWND h_wnd, UINT u_msg,
 // Helper Funcs
 //
 
-S32 OSMessageBoxWin32(const char* text, const char* caption, U32 type)
+S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 type)
 {
 	UINT uType;
 
@@ -2861,7 +2806,7 @@ S32 OSMessageBoxWin32(const char* text, const char* caption, U32 type)
 	}
 
 	// HACK! Doesn't properly handle wide strings!
-	int retval_win = MessageBoxA(NULL, text, caption, uType);
+	int retval_win = MessageBoxA(NULL, text.c_str(), caption.c_str(), uType);
 	S32 retval;
 
 	switch(retval_win)
@@ -2887,15 +2832,13 @@ S32 OSMessageBoxWin32(const char* text, const char* caption, U32 type)
 }
 
 
-void spawn_web_browser(const char* escaped_url )
+void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
 {
 	bool found = false;
 	S32 i;
 	for (i = 0; i < gURLProtocolWhitelistCount; i++)
 	{
-		S32 len = strlen(gURLProtocolWhitelist[i]);	/* Flawfinder: ignore */
-		if (!strncmp(escaped_url, gURLProtocolWhitelist[i], len)
-			&& escaped_url[len] == ':')
+		if (escaped_url.find(gURLProtocolWhitelist[i]) == 0)
 		{
 			found = true;
 			break;
@@ -2931,10 +2874,9 @@ void spawn_web_browser(const char* escaped_url )
 	// Figure out the user's default web browser
 	// HKEY_CLASSES_ROOT\http\shell\open\command
 	/*
-	char reg_path_str[256];	// Flawfinder: ignore
-	snprintf(reg_path_str, sizeof(reg_path_str), "%s\\shell\\open\\command", gURLProtocolWhitelistHandler[i]);	// Flawfinder: ignore
+	std::string reg_path_str = gURLProtocolWhitelistHandler[i] + "\\shell\\open\\command";
 	WCHAR reg_path_wstr[256];
-	mbstowcs(reg_path_wstr, reg_path_str, sizeof(reg_path_wstr)/sizeof(reg_path_wstr[0]));
+	mbstowcs(reg_path_wstr, reg_path_str.c_str(), sizeof(reg_path_wstr)/sizeof(reg_path_wstr[0]));
 
 	HKEY key;
 	WCHAR browser_open_wstr[1024];
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index feb1c74..ebabcae 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -86,12 +86,6 @@ public:
 	/*virtual*/ void delayInputProcessing();
 	/*virtual*/ void swapBuffers();
 
-	/*virtual*/ LLString getTempFileName();
-	/*virtual*/ void deleteFile( const char* file_name );
-	/*virtual*/ S32 stat( const char* file_name, struct stat* stat_info );
-	/*virtual*/ BOOL sendEmail(const char* address,const char* subject,const char* body_text,const char* attachment=NULL, const char* attachment_displayed_name=NULL);
-
-
 	// handy coordinate space conversion routines
 	/*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to);
 	/*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to);
@@ -115,12 +109,13 @@ public:
 	/*virtual*/ void setLanguageTextInput( const LLCoordGL & pos );
 	/*virtual*/ void updateLanguageTextInputArea();
 	/*virtual*/ void interruptLanguageTextInput();
+	/*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
 
 	static std::string getFontListSans();
 
 protected:
 	LLWindowWin32(
-		char *title, char *name, int x, int y, int width, int height, U32 flags, 
+		const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, 
 		BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
 		BOOL ignore_pixel_depth, U32 fsaa_samples);
 	~LLWindowWin32();
@@ -220,7 +215,7 @@ public:
 	virtual ~LLSplashScreenWin32();
 
 	/*virtual*/ void showImpl();
-	/*virtual*/ void updateImpl(const char* mesg);
+	/*virtual*/ void updateImpl(const std::string& mesg);
 	/*virtual*/ void hideImpl();
 
 #if LL_WINDOWS
@@ -239,6 +234,6 @@ extern LPWSTR gIconResource;
 
 static void	handleMessage( const MSG& msg );
 
-S32 OSMessageBoxWin32(const char* text, const char* caption, U32 type);
+S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 type);
 
 #endif //LL_LLWINDOWWIN32_H
diff --git a/linden/indra/llxml/CMakeLists.txt b/linden/indra/llxml/CMakeLists.txt
new file mode 100644
index 0000000..d86bc0d
--- /dev/null
+++ b/linden/indra/llxml/CMakeLists.txt
@@ -0,0 +1,36 @@
+# -*- cmake -*-
+
+project(llxml)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    )
+
+set(llxml_SOURCE_FILES
+    llcontrol.cpp
+    llxmlnode.cpp
+    llxmlparser.cpp
+    llxmltree.cpp
+    )
+
+set(llxml_HEADER_FILES
+    CMakeLists.txt
+
+    llcontrol.h
+    llxmlnode.h
+    llxmlparser.h
+    llxmltree.h
+    )
+
+set_source_files_properties(${llxml_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llxml_SOURCE_FILES ${llxml_HEADER_FILES})
+
+add_library (llxml ${llxml_SOURCE_FILES})
diff --git a/linden/indra/llxml/files.lst b/linden/indra/llxml/files.lst
deleted file mode 100644
index 5fec309..0000000
--- a/linden/indra/llxml/files.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-llxml/llcontrol.cpp
-llxml/llxmlnode.cpp
-llxml/llxmlparser.cpp
-llxml/llxmltree.cpp
diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index f88ac69..8fa58e8 100644
--- a/linden/indra/llxml/llcontrol.cpp
+++ b/linden/indra/llxml/llcontrol.cpp
@@ -49,7 +49,7 @@
 #include "llxmltree.h"
 #include "llsdserialize.h"
 
-#if LL_RELEASE_FOR_DOWNLOAD
+#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #define CONTROL_ERRS LL_WARNS("ControlErrors")
 #else
 #define CONTROL_ERRS LL_ERRS("ControlErrors")
@@ -99,8 +99,8 @@ bool LLControlVariable::llsd_compare(const LLSD& a, const LLSD & b)
 	return result;
 }
 
-LLControlVariable::LLControlVariable(const LLString& name, eControlType type,
-							 LLSD initial, const LLString& comment,
+LLControlVariable::LLControlVariable(const std::string& name, eControlType type,
+							 LLSD initial, const std::string& comment,
 							 bool persist)
 	: mName(name),
 	  mComment(comment),
@@ -129,7 +129,7 @@ LLSD LLControlVariable::getComparableValue(const LLSD& value)
 	if(TYPE_BOOLEAN == type() && value.isString())
 	{
 		BOOL temp;
-		if(LLString::convertToBOOL(value.asString(), temp)) 
+		if(LLStringUtil::convertToBOOL(value.asString(), temp)) 
 		{
 			storable_value = (bool)temp;
 		}
@@ -246,7 +246,7 @@ LLSD LLControlVariable::getSaveValue() const
 	return mValues[0];
 }
 
-LLPointer<LLControlVariable> LLControlGroup::getControl(const LLString& name)
+LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
 {
 	ctrl_name_table_t::iterator iter = mNameTable.find(name);
 	return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second;
@@ -281,7 +281,7 @@ void LLControlGroup::cleanup()
 	mNameTable.clear();
 }
 
-eControlType LLControlGroup::typeStringToEnum(const LLString& typestr)
+eControlType LLControlGroup::typeStringToEnum(const std::string& typestr)
 {
 	for(int i = 0; i < (int)TYPE_COUNT; ++i)
 	{
@@ -290,12 +290,12 @@ eControlType LLControlGroup::typeStringToEnum(const LLString& typestr)
 	return (eControlType)-1;
 }
 
-LLString LLControlGroup::typeEnumToString(eControlType typeenum)
+std::string LLControlGroup::typeEnumToString(eControlType typeenum)
 {
 	return mTypeString[typeenum];
 }
 
-BOOL LLControlGroup::declareControl(const LLString& name, eControlType type, const LLSD initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, BOOL persist)
 {
 	if(mNameTable.find(name) != mNameTable.end())
 	{
@@ -310,67 +310,67 @@ BOOL LLControlGroup::declareControl(const LLString& name, eControlType type, con
 	return TRUE;
 }
 
-BOOL LLControlGroup::declareU32(const LLString& name, const U32 initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareU32(const std::string& name, const U32 initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_U32, (LLSD::Integer) initial_val, comment, persist);
 }
 
-BOOL LLControlGroup::declareS32(const LLString& name, const S32 initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareS32(const std::string& name, const S32 initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_S32, initial_val, comment, persist);
 }
 
-BOOL LLControlGroup::declareF32(const LLString& name, const F32 initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareF32(const std::string& name, const F32 initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_F32, initial_val, comment, persist);
 }
 
-BOOL LLControlGroup::declareBOOL(const LLString& name, const BOOL initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareBOOL(const std::string& name, const BOOL initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_BOOLEAN, initial_val, comment, persist);
 }
 
-BOOL LLControlGroup::declareString(const LLString& name, const LLString& initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareString(const std::string& name, const std::string& initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_STRING, initial_val, comment, persist);
 }
 
-BOOL LLControlGroup::declareVec3(const LLString& name, const LLVector3 &initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareVec3(const std::string& name, const LLVector3 &initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_VEC3, initial_val.getValue(), comment, persist);
 }
 
-BOOL LLControlGroup::declareVec3d(const LLString& name, const LLVector3d &initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareVec3d(const std::string& name, const LLVector3d &initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_VEC3D, initial_val.getValue(), comment, persist);
 }
 
-BOOL LLControlGroup::declareRect(const LLString& name, const LLRect &initial_val, const LLString& comment, BOOL persist)
+BOOL LLControlGroup::declareRect(const std::string& name, const LLRect &initial_val, const std::string& comment, BOOL persist)
 {
 	return declareControl(name, TYPE_RECT, initial_val.getValue(), comment, persist);
 }
 
-BOOL LLControlGroup::declareColor4U(const LLString& name, const LLColor4U &initial_val, const LLString& comment, BOOL persist )
+BOOL LLControlGroup::declareColor4U(const std::string& name, const LLColor4U &initial_val, const std::string& comment, BOOL persist )
 {
 	return declareControl(name, TYPE_COL4U, initial_val.getValue(), comment, persist);
 }
 
-BOOL LLControlGroup::declareColor4(const LLString& name, const LLColor4 &initial_val, const LLString& comment, BOOL persist )
+BOOL LLControlGroup::declareColor4(const std::string& name, const LLColor4 &initial_val, const std::string& comment, BOOL persist )
 {
 	return declareControl(name, TYPE_COL4, initial_val.getValue(), comment, persist);
 }
 
-BOOL LLControlGroup::declareColor3(const LLString& name, const LLColor3 &initial_val, const LLString& comment, BOOL persist )
+BOOL LLControlGroup::declareColor3(const std::string& name, const LLColor3 &initial_val, const std::string& comment, BOOL persist )
 {
 	return declareControl(name, TYPE_COL3, initial_val.getValue(), comment, persist);
 }
 
-BOOL LLControlGroup::declareLLSD(const LLString& name, const LLSD &initial_val, const LLString& comment, BOOL persist )
+BOOL LLControlGroup::declareLLSD(const std::string& name, const LLSD &initial_val, const std::string& comment, BOOL persist )
 {
 	return declareControl(name, TYPE_LLSD, initial_val, comment, persist);
 }
 
-BOOL LLControlGroup::getBOOL(const LLString& name)
+BOOL LLControlGroup::getBOOL(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -383,7 +383,7 @@ BOOL LLControlGroup::getBOOL(const LLString& name)
 	}
 }
 
-S32 LLControlGroup::getS32(const LLString& name)
+S32 LLControlGroup::getS32(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -396,7 +396,7 @@ S32 LLControlGroup::getS32(const LLString& name)
 	}
 }
 
-U32 LLControlGroup::getU32(const LLString& name)
+U32 LLControlGroup::getU32(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -409,7 +409,7 @@ U32 LLControlGroup::getU32(const LLString& name)
 	}
 }
 
-F32 LLControlGroup::getF32(const LLString& name)
+F32 LLControlGroup::getF32(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -422,16 +422,16 @@ F32 LLControlGroup::getF32(const LLString& name)
 	}
 }
 
-LLString LLControlGroup::findString(const LLString& name)
+std::string LLControlGroup::findString(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
 	if (control && control->isType(TYPE_STRING))
 		return control->get().asString();
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
-LLString LLControlGroup::getString(const LLString& name)
+std::string LLControlGroup::getString(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -440,24 +440,24 @@ LLString LLControlGroup::getString(const LLString& name)
 	else
 	{
 		CONTROL_ERRS << "Invalid string control " << name << llendl;
-		return LLString::null;
+		return LLStringUtil::null;
 	}
 }
 
-LLWString LLControlGroup::getWString(const LLString& name)
+LLWString LLControlGroup::getWString(const std::string& name)
 {
 	return utf8str_to_wstring(getString(name));
 }
 
-LLString LLControlGroup::getText(const LLString& name)
+std::string LLControlGroup::getText(const std::string& name)
 {
-	LLString utf8_string = getString(name);
-	LLString::replaceChar(utf8_string, '^', '\n');
-	LLString::replaceChar(utf8_string, '%', ' ');
+	std::string utf8_string = getString(name);
+	LLStringUtil::replaceChar(utf8_string, '^', '\n');
+	LLStringUtil::replaceChar(utf8_string, '%', ' ');
 	return (utf8_string);
 }
 
-LLVector3 LLControlGroup::getVector3(const LLString& name)
+LLVector3 LLControlGroup::getVector3(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -470,7 +470,7 @@ LLVector3 LLControlGroup::getVector3(const LLString& name)
 	}
 }
 
-LLVector3d LLControlGroup::getVector3d(const LLString& name)
+LLVector3d LLControlGroup::getVector3d(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -483,7 +483,7 @@ LLVector3d LLControlGroup::getVector3d(const LLString& name)
 	}
 }
 
-LLRect LLControlGroup::getRect(const LLString& name)
+LLRect LLControlGroup::getRect(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -497,7 +497,7 @@ LLRect LLControlGroup::getRect(const LLString& name)
 }
 
 
-LLColor4 LLControlGroup::getColor(const LLString& name)
+LLColor4 LLControlGroup::getColor(const std::string& name)
 {
 	ctrl_name_table_t::const_iterator i = mNameTable.find(name);
 
@@ -529,7 +529,7 @@ LLColor4 LLControlGroup::getColor(const LLString& name)
 	}
 }
 
-LLColor4U LLControlGroup::getColor4U(const LLString& name)
+LLColor4U LLControlGroup::getColor4U(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -542,7 +542,7 @@ LLColor4U LLControlGroup::getColor4U(const LLString& name)
 	}
 }
 
-LLColor4 LLControlGroup::getColor4(const LLString& name)
+LLColor4 LLControlGroup::getColor4(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -555,7 +555,7 @@ LLColor4 LLControlGroup::getColor4(const LLString& name)
 	}
 }
 
-LLColor3 LLControlGroup::getColor3(const LLString& name)
+LLColor3 LLControlGroup::getColor3(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -568,7 +568,7 @@ LLColor3 LLControlGroup::getColor3(const LLString& name)
 	}
 }
 
-LLSD LLControlGroup::getLLSD(const LLString& name)
+LLSD LLControlGroup::getLLSD(const std::string& name)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -578,7 +578,7 @@ LLSD LLControlGroup::getLLSD(const LLString& name)
 	return LLSD();
 }
 
-BOOL LLControlGroup::controlExists(const LLString& name)
+BOOL LLControlGroup::controlExists(const std::string& name)
 {
 	ctrl_name_table_t::iterator iter = mNameTable.find(name);
 	return iter != mNameTable.end();
@@ -588,7 +588,7 @@ BOOL LLControlGroup::controlExists(const LLString& name)
 // Set functions
 //-------------------------------------------------------------------
 
-void LLControlGroup::setBOOL(const LLString& name, BOOL val)
+void LLControlGroup::setBOOL(const std::string& name, BOOL val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -603,7 +603,7 @@ void LLControlGroup::setBOOL(const LLString& name, BOOL val)
 }
 
 
-void LLControlGroup::setS32(const LLString& name, S32 val)
+void LLControlGroup::setS32(const std::string& name, S32 val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -618,7 +618,7 @@ void LLControlGroup::setS32(const LLString& name, S32 val)
 }
 
 
-void LLControlGroup::setF32(const LLString& name, F32 val)
+void LLControlGroup::setF32(const std::string& name, F32 val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -633,7 +633,7 @@ void LLControlGroup::setF32(const LLString& name, F32 val)
 }
 
 
-void LLControlGroup::setU32(const LLString& name, U32 val)
+void LLControlGroup::setU32(const std::string& name, U32 val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -648,7 +648,7 @@ void LLControlGroup::setU32(const LLString& name, U32 val)
 }
 
 
-void LLControlGroup::setString(const LLString& name, const LLString &val)
+void LLControlGroup::setString(const std::string& name, const std::string &val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -663,7 +663,7 @@ void LLControlGroup::setString(const LLString& name, const LLString &val)
 }
 
 
-void LLControlGroup::setVector3(const LLString& name, const LLVector3 &val)
+void LLControlGroup::setVector3(const std::string& name, const LLVector3 &val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -677,7 +677,7 @@ void LLControlGroup::setVector3(const LLString& name, const LLVector3 &val)
 	}
 }
 
-void LLControlGroup::setVector3d(const LLString& name, const LLVector3d &val)
+void LLControlGroup::setVector3d(const std::string& name, const LLVector3d &val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -691,7 +691,7 @@ void LLControlGroup::setVector3d(const LLString& name, const LLVector3d &val)
 	}
 }
 
-void LLControlGroup::setRect(const LLString& name, const LLRect &val)
+void LLControlGroup::setRect(const std::string& name, const LLRect &val)
 {
 	LLControlVariable* control = getControl(name);
 
@@ -705,7 +705,7 @@ void LLControlGroup::setRect(const LLString& name, const LLRect &val)
 	}
 }
 
-void LLControlGroup::setColor4U(const LLString& name, const LLColor4U &val)
+void LLControlGroup::setColor4U(const std::string& name, const LLColor4U &val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -719,7 +719,7 @@ void LLControlGroup::setColor4U(const LLString& name, const LLColor4U &val)
 	}
 }
 
-void LLControlGroup::setColor4(const LLString& name, const LLColor4 &val)
+void LLControlGroup::setColor4(const std::string& name, const LLColor4 &val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -733,7 +733,7 @@ void LLControlGroup::setColor4(const LLString& name, const LLColor4 &val)
 	}
 }
 
-void LLControlGroup::setLLSD(const LLString& name, const LLSD& val)
+void LLControlGroup::setLLSD(const std::string& name, const LLSD& val)
 {
 	LLControlVariable* control = getControl(name);
 	
@@ -747,7 +747,7 @@ void LLControlGroup::setLLSD(const LLString& name, const LLSD& val)
 	}
 }
 
-void LLControlGroup::setValue(const LLString& name, const LLSD& val)
+void LLControlGroup::setValue(const std::string& name, const LLSD& val)
 {
 	if (name.empty())
 	{
@@ -771,9 +771,9 @@ void LLControlGroup::setValue(const LLString& name, const LLSD& val)
 //---------------------------------------------------------------
 
 // Returns number of controls loaded, so 0 if failure
-U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_declaration, eControlType declare_as)
+U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require_declaration, eControlType declare_as)
 {
-	LLString name;
+	std::string name;
 
 	LLXmlTree xml_controls;
 
@@ -832,14 +832,14 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
 			switch(declare_as)
 			{
 			case TYPE_COL4:
-				declareColor4(name, LLColor4::white, "", NO_PERSIST);
+				declareColor4(name, LLColor4::white, LLStringUtil::null, NO_PERSIST);
 				break;
 			case TYPE_COL4U:
-				declareColor4U(name, LLColor4U::white, "", NO_PERSIST);
+				declareColor4U(name, LLColor4U::white, LLStringUtil::null, NO_PERSIST);
 				break;
 			case TYPE_STRING:
 			default:
-				declareString(name, LLString::null, "", NO_PERSIST);
+				declareString(name, LLStringUtil::null, LLStringUtil::null, NO_PERSIST);
 				break;
 			}
 		}
@@ -891,12 +891,8 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
 			break;
 		case TYPE_STRING:
 			{
-				LLString string;
+				std::string string;
 				child_nodep->getAttributeString("value", string);
-				if (string == LLString::null)
-				{
-					string = "";
-				}
 				control->set(string);
 				validitems++;
 			}
@@ -923,7 +919,7 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
 		case TYPE_RECT:
 			{
 				//RN: hack to support reading rectangles from a string
-				LLString rect_string;
+				std::string rect_string;
 
 				child_nodep->getAttributeString("value", rect_string);
 				std::istringstream istream(rect_string);
@@ -977,7 +973,7 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
 	return validitems;
 }
 
-U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
+U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only)
 {
 	LLSD settings;
 	int num_saved = 0;
@@ -1007,7 +1003,7 @@ U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
 		}
 	}
 	llofstream file;
-	file.open(filename.c_str());
+	file.open(filename);
 	if (file.is_open())
 	{
 		LLSDSerialize::toPrettyXML(settings, file);
@@ -1023,13 +1019,13 @@ U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
 	return num_saved;
 }
 
-U32 LLControlGroup::loadFromFile(const LLString& filename, bool set_default_values)
+U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values)
 {
-	LLString name;
+	std::string name;
 	LLSD settings;
 	LLSD control_map;
 	llifstream infile;
-	infile.open(filename.c_str());
+	infile.open(filename);
 	if(!infile.is_open())
 	{
 		llwarns << "Cannot find file " << filename << " to load." << llendl;
@@ -1127,10 +1123,10 @@ void LLControlGroup::applyToAll(ApplyFunctor* func)
 //============================================================================
 // First-use
 
-static LLString get_warn_name(const LLString& name)
+static std::string get_warn_name(const std::string& name)
 {
-	LLString warnname = "Warn" + name;
-	for (LLString::iterator iter = warnname.begin(); iter != warnname.end(); ++iter)
+	std::string warnname = "Warn" + name;
+	for (std::string::iterator iter = warnname.begin(); iter != warnname.end(); ++iter)
 	{
 		char c = *iter;
 		if (!isalnum(c))
@@ -1141,32 +1137,32 @@ static LLString get_warn_name(const LLString& name)
 	return warnname;
 }
 
-void LLControlGroup::addWarning(const LLString& name)
+void LLControlGroup::addWarning(const std::string& name)
 {
-	LLString warnname = get_warn_name(name);
+	std::string warnname = get_warn_name(name);
 	if(mNameTable.find(warnname) == mNameTable.end())
 	{
-		LLString comment = LLString("Enables ") + name + LLString(" warning dialog");
+		std::string comment = std::string("Enables ") + name + std::string(" warning dialog");
 		declareBOOL(warnname, TRUE, comment);
 		mWarnings.insert(warnname);
 	}
 }
 
-BOOL LLControlGroup::getWarning(const LLString& name)
+BOOL LLControlGroup::getWarning(const std::string& name)
 {
-	LLString warnname = get_warn_name(name);
+	std::string warnname = get_warn_name(name);
 	return getBOOL(warnname);
 }
 
-void LLControlGroup::setWarning(const LLString& name, BOOL val)
+void LLControlGroup::setWarning(const std::string& name, BOOL val)
 {
-	LLString warnname = get_warn_name(name);
+	std::string warnname = get_warn_name(name);
 	setBOOL(warnname, val);
 }
 
 void LLControlGroup::resetWarnings()
 {
-	for (std::set<LLString>::iterator iter = mWarnings.begin();
+	for (std::set<std::string>::iterator iter = mWarnings.begin();
 		 iter != mWarnings.end(); ++iter)
 	{
 		setBOOL(*iter, TRUE);
diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h
index 2500ae0..6205964 100644
--- a/linden/indra/llxml/llcontrol.h
+++ b/linden/indra/llxml/llcontrol.h
@@ -89,8 +89,8 @@ class LLControlVariable : public LLRefCount
 	typedef boost::signal<void(const LLSD&)> signal_t;
 
 private:
-	LLString		mName;
-	LLString		mComment;
+	std::string		mName;
+	std::string		mComment;
 	eControlType	mType;
 	bool mPersist;
 	std::vector<LLSD> mValues;
@@ -98,14 +98,14 @@ private:
 	signal_t mSignal;
 	
 public:
-	LLControlVariable(const LLString& name, eControlType type,
-					  LLSD initial, const LLString& comment,
+	LLControlVariable(const std::string& name, eControlType type,
+					  LLSD initial, const std::string& comment,
 					  bool persist = true);
 
 	virtual ~LLControlVariable();
 	
-	const LLString& getName() const { return mName; }
-	const LLString& getComment() const { return mComment; }
+	const std::string& getName() const { return mName; }
+	const std::string& getComment() const { return mComment; }
 
 	eControlType type()		{ return mType; }
 	bool isType(eControlType tp) { return tp == mType; }
@@ -142,95 +142,95 @@ private:
 class LLControlGroup
 {
 protected:
-	typedef std::map<LLString, LLPointer<LLControlVariable> > ctrl_name_table_t;
+	typedef std::map<std::string, LLPointer<LLControlVariable> > ctrl_name_table_t;
 	ctrl_name_table_t mNameTable;
-	std::set<LLString> mWarnings;
-	LLString mTypeString[TYPE_COUNT];
+	std::set<std::string> mWarnings;
+	std::string mTypeString[TYPE_COUNT];
 
-	eControlType typeStringToEnum(const LLString& typestr);
-	LLString typeEnumToString(eControlType typeenum);	
+	eControlType typeStringToEnum(const std::string& typestr);
+	std::string typeEnumToString(eControlType typeenum);	
 public:
 	LLControlGroup();
 	~LLControlGroup();
 	void cleanup();
 	
-	LLPointer<LLControlVariable> getControl(const LLString& name);
+	LLPointer<LLControlVariable> getControl(const std::string& name);
 
 	struct ApplyFunctor
 	{
 		virtual ~ApplyFunctor() {};
-		virtual void apply(const LLString& name, LLControlVariable* control) = 0;
+		virtual void apply(const std::string& name, LLControlVariable* control) = 0;
 	};
 	void applyToAll(ApplyFunctor* func);
 	
-	BOOL declareControl(const LLString& name, eControlType type, const LLSD initial_val, const LLString& comment, BOOL persist);
-	BOOL declareU32(const LLString& name, U32 initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareS32(const LLString& name, S32 initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareF32(const LLString& name, F32 initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareBOOL(const LLString& name, BOOL initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareString(const LLString& name, const LLString &initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareVec3(const LLString& name, const LLVector3 &initial_val,const LLString& comment,  BOOL persist = TRUE);
-	BOOL declareVec3d(const LLString& name, const LLVector3d &initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareRect(const LLString& name, const LLRect &initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareColor4U(const LLString& name, const LLColor4U &initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareColor4(const LLString& name, const LLColor4 &initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareColor3(const LLString& name, const LLColor3 &initial_val, const LLString& comment, BOOL persist = TRUE);
-	BOOL declareLLSD(const LLString& name, const LLSD &initial_val, const LLString& comment, BOOL persist = TRUE);
+	BOOL declareControl(const std::string& name, eControlType type, const LLSD initial_val, const std::string& comment, BOOL persist);
+	BOOL declareU32(const std::string& name, U32 initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareS32(const std::string& name, S32 initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareF32(const std::string& name, F32 initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareBOOL(const std::string& name, BOOL initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareString(const std::string& name, const std::string &initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareVec3(const std::string& name, const LLVector3 &initial_val,const std::string& comment,  BOOL persist = TRUE);
+	BOOL declareVec3d(const std::string& name, const LLVector3d &initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareRect(const std::string& name, const LLRect &initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareColor4U(const std::string& name, const LLColor4U &initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareColor4(const std::string& name, const LLColor4 &initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareColor3(const std::string& name, const LLColor3 &initial_val, const std::string& comment, BOOL persist = TRUE);
+	BOOL declareLLSD(const std::string& name, const LLSD &initial_val, const std::string& comment, BOOL persist = TRUE);
 	
-	LLString 	findString(const LLString& name);
+	std::string 	findString(const std::string& name);
 
-	LLString 	getString(const LLString& name);
-	LLWString	getWString(const LLString& name);
-	LLString	getText(const LLString& name);
-	LLVector3	getVector3(const LLString& name);
-	LLVector3d	getVector3d(const LLString& name);
-	LLRect		getRect(const LLString& name);
-	BOOL		getBOOL(const LLString& name);
-	S32			getS32(const LLString& name);
-	F32			getF32(const LLString& name);
-	U32			getU32(const LLString& name);
-	LLSD        getLLSD(const LLString& name);
+	std::string 	getString(const std::string& name);
+	LLWString	getWString(const std::string& name);
+	std::string	getText(const std::string& name);
+	LLVector3	getVector3(const std::string& name);
+	LLVector3d	getVector3d(const std::string& name);
+	LLRect		getRect(const std::string& name);
+	BOOL		getBOOL(const std::string& name);
+	S32			getS32(const std::string& name);
+	F32			getF32(const std::string& name);
+	U32			getU32(const std::string& name);
+	LLSD        getLLSD(const std::string& name);
 
 
 	// Note: If an LLColor4U control exists, it will cast it to the correct
 	// LLColor4 for you.
-	LLColor4	getColor(const LLString& name);
-	LLColor4U	getColor4U(const LLString& name);
-	LLColor4	getColor4(const LLString& name);
-	LLColor3	getColor3(const LLString& name);
-
-	void	setBOOL(const LLString& name, BOOL val);
-	void	setS32(const LLString& name, S32 val);
-	void	setF32(const LLString& name, F32 val);
-	void	setU32(const LLString& name, U32 val);
-	void	setString(const LLString&  name, const LLString& val);
-	void	setVector3(const LLString& name, const LLVector3 &val);
-	void	setVector3d(const LLString& name, const LLVector3d &val);
-	void	setRect(const LLString& name, const LLRect &val);
-	void	setColor4U(const LLString& name, const LLColor4U &val);
-	void	setColor4(const LLString& name, const LLColor4 &val);
-	void	setColor3(const LLString& name, const LLColor3 &val);
-	void    setLLSD(const LLString& name, const LLSD& val);
-	void	setValue(const LLString& name, const LLSD& val);
+	LLColor4	getColor(const std::string& name);
+	LLColor4U	getColor4U(const std::string& name);
+	LLColor4	getColor4(const std::string& name);
+	LLColor3	getColor3(const std::string& name);
+
+	void	setBOOL(const std::string& name, BOOL val);
+	void	setS32(const std::string& name, S32 val);
+	void	setF32(const std::string& name, F32 val);
+	void	setU32(const std::string& name, U32 val);
+	void	setString(const std::string&  name, const std::string& val);
+	void	setVector3(const std::string& name, const LLVector3 &val);
+	void	setVector3d(const std::string& name, const LLVector3d &val);
+	void	setRect(const std::string& name, const LLRect &val);
+	void	setColor4U(const std::string& name, const LLColor4U &val);
+	void	setColor4(const std::string& name, const LLColor4 &val);
+	void	setColor3(const std::string& name, const LLColor3 &val);
+	void    setLLSD(const std::string& name, const LLSD& val);
+	void	setValue(const std::string& name, const LLSD& val);
 	
 	
-	BOOL    controlExists(const LLString& name);
+	BOOL    controlExists(const std::string& name);
 
 	// Returns number of controls loaded, 0 if failed
 	// If require_declaration is false, will auto-declare controls it finds
 	// as the given type.
-	U32	loadFromFileLegacy(const LLString& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING);
- 	U32 saveToFile(const LLString& filename, BOOL nondefault_only);
- 	U32	loadFromFile(const LLString& filename, bool default_values = false);
+	U32	loadFromFileLegacy(const std::string& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING);
+ 	U32 saveToFile(const std::string& filename, BOOL nondefault_only);
+ 	U32	loadFromFile(const std::string& filename, bool default_values = false);
 	void	resetToDefaults();
 
 	
 	// Ignorable Warnings
 	
 	// Add a config variable to be reset on resetWarnings()
-	void addWarning(const LLString& name);
-	BOOL getWarning(const LLString& name);
-	void setWarning(const LLString& name, BOOL val);
+	void addWarning(const std::string& name);
+	BOOL getWarning(const std::string& name);
+	void setWarning(const std::string& name, BOOL val);
 	
 	// Resets all ignorables
 	void resetWarnings();
diff --git a/linden/indra/llxml/llxml.vcproj b/linden/indra/llxml/llxml.vcproj
deleted file mode 100644
index be4ff97..0000000
--- a/linden/indra/llxml/llxml.vcproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="llxml"
-	ProjectGUID="{A5470DA6-0C3A-4602-B930-43DB25511A59}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llcontrol.cpp">
-			</File>
-			<File
-				RelativePath=".\llxmlnode.cpp">
-			</File>
-			<File
-				RelativePath=".\llxmlparser.cpp">
-			</File>
-			<File
-				RelativePath=".\llxmltree.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llcontrol.h">
-			</File>
-			<File
-				RelativePath=".\llxmlnode.h">
-			</File>
-			<File
-				RelativePath=".\llxmlparser.h">
-			</File>
-			<File
-				RelativePath=".\llxmltree.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llxml/llxml_vc8.vcproj b/linden/indra/llxml/llxml_vc8.vcproj
deleted file mode 100644
index b39ae53..0000000
--- a/linden/indra/llxml/llxml_vc8.vcproj
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="llxml"
-	ProjectGUID="{A5470DA6-0C3A-4602-B930-43DB25511A59}"
-	RootNamespace="llxml"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llcontrol.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlnode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmltree.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llcontrol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlnode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmltree.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llxml/llxml_vc9.vcproj b/linden/indra/llxml/llxml_vc9.vcproj
deleted file mode 100644
index eb719c9..0000000
--- a/linden/indra/llxml/llxml_vc9.vcproj
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="llxml"
-	ProjectGUID="{A5470DA6-0C3A-4602-B930-43DB25511A59}"
-	RootNamespace="llxml"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/llxml.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llcontrol.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlnode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmltree.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llcontrol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlnode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmltree.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index f9852d3..145e6e0 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -55,6 +55,7 @@ BOOL LLXMLNode::sStripWhitespaceValues = FALSE;
 
 LLXMLNode::LLXMLNode() : 
 	mID(""),
+	mParser(NULL),
 	mIsAttribute(FALSE),
 	mVersionMajor(0), 
 	mVersionMinor(0), 
@@ -70,8 +71,9 @@ LLXMLNode::LLXMLNode() :
 {
 }
 
-LLXMLNode::LLXMLNode(const LLString& name, BOOL is_attribute) : 
+LLXMLNode::LLXMLNode(const char* name, BOOL is_attribute) : 
 	mID(""),
+	mParser(NULL),
 	mIsAttribute(is_attribute),
 	mVersionMajor(0), 
 	mVersionMinor(0), 
@@ -89,6 +91,7 @@ LLXMLNode::LLXMLNode(const LLString& name, BOOL is_attribute) :
 
 LLXMLNode::LLXMLNode(LLStringTableEntry* name, BOOL is_attribute) : 
 	mID(""),
+	mParser(NULL),
 	mIsAttribute(is_attribute),
 	mVersionMajor(0), 
 	mVersionMinor(0), 
@@ -212,7 +215,7 @@ void LLXMLNode::addChild(LLXMLNodePtr new_child)
 	new_child->mParent = this;
 	if (new_child->mIsAttribute)
 	{
-		mAttributes.insert(std::pair<LLStringTableEntry*, LLXMLNodePtr>(new_child->mName, new_child));
+		mAttributes.insert(std::make_pair(new_child->mName, new_child));
 	}
 	else
 	{
@@ -222,7 +225,7 @@ void LLXMLNode::addChild(LLXMLNodePtr new_child)
 			mChildren->head = new_child;
 			mChildren->tail = new_child;
 		}
-		mChildren->map.insert(std::pair<LLStringTableEntry*, LLXMLNodePtr>(new_child->mName, new_child));
+		mChildren->map.insert(std::make_pair(new_child->mName, new_child));
 
 		if (mChildren->tail != new_child)
 		{
@@ -236,7 +239,7 @@ void LLXMLNode::addChild(LLXMLNodePtr new_child)
 }
 
 // virtual 
-LLXMLNodePtr LLXMLNode::createChild(const LLString& name, BOOL is_attribute)
+LLXMLNodePtr LLXMLNode::createChild(const char* name, BOOL is_attribute)
 {
 	return createChild(gStringTable.addStringEntry(name), is_attribute);
 }
@@ -245,7 +248,7 @@ LLXMLNodePtr LLXMLNode::createChild(const LLString& name, BOOL is_attribute)
 LLXMLNodePtr LLXMLNode::createChild(LLStringTableEntry* name, BOOL is_attribute)
 {
 	LLXMLNode* ret = new LLXMLNode(name, is_attribute);
-	ret->mID = "";
+	ret->mID.clear();
 	addChild(ret);
 	return ret;
 }
@@ -309,7 +312,7 @@ void XMLCALL StartXMLNode(void *userData,
 	// Create a new node
 	LLXMLNode *new_node_ptr = new LLXMLNode(name, FALSE);
 	LLXMLNodePtr new_node = new_node_ptr;
-	new_node->mID = "";
+	new_node->mID.clear();
 	LLXMLNodePtr ptr_new_node = new_node;
 
 	// Set the parent-child relationship with the current active node
@@ -331,8 +334,8 @@ void XMLCALL StartXMLNode(void *userData,
 	U32 pos = 0;
 	while (atts[pos] != NULL)
 	{
-		LLString attr_name = atts[pos];
-		LLString attr_value = atts[pos+1];
+		std::string attr_name = atts[pos];
+		std::string attr_value = atts[pos+1];
 
 		// Special cases
 		if ('i' == attr_name[0] && "id" == attr_name)
@@ -410,9 +413,9 @@ void XMLCALL StartXMLNode(void *userData,
 
 		// only one attribute child per description
 		LLXMLNodePtr attr_node;
-		if (!new_node->getAttribute(attr_name, attr_node, FALSE))
+		if (!new_node->getAttribute(attr_name.c_str(), attr_node, FALSE))
 		{
-			attr_node = new LLXMLNode(attr_name, TRUE);
+			attr_node = new LLXMLNode(attr_name.c_str(), TRUE);
 		}
 		attr_node->setValue(attr_value);
 		new_node->addChild(attr_node);
@@ -436,7 +439,7 @@ void XMLCALL EndXMLNode(void *userData,
 	// SJB: total hack:
 	if (LLXMLNode::sStripWhitespaceValues)
 	{
-		LLString value = node->getValue();
+		std::string value = node->getValue();
 		BOOL is_empty = TRUE;
 		for (std::string::size_type s = 0; s < value.length(); s++)
 		{
@@ -460,13 +463,13 @@ void XMLCALL XMLData(void *userData,
                      int len)
 {
 	LLXMLNode* current_node = (LLXMLNode *)userData;
-	LLString value = current_node->getValue();
+	std::string value = current_node->getValue();
 	if (LLXMLNode::sStripEscapedStrings)
 	{
 		if (s[0] == '\"' && s[len-1] == '\"')
 		{
 			// Special-case: Escaped string.
-			LLString unescaped_string;
+			std::string unescaped_string;
 			for (S32 pos=1; pos<len-1; ++pos)
 			{
 				if (s[pos] == '\\' && s[pos+1] == '\\')
@@ -489,7 +492,7 @@ void XMLCALL XMLData(void *userData,
 			return;
 		}
 	}
-	value.append(LLString(s, 0, len));
+	value.append(std::string(s, len));
 	current_node->setValue(value);
 }
 
@@ -537,8 +540,8 @@ bool LLXMLNode::updateNode(
 	{
 		for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
 		{
-			LLString nodeName;
-			LLString updateName;
+			std::string nodeName;
+			std::string updateName;
 
 			updateChild->getAttributeString("name", updateName);
 			child->getAttributeString("name", nodeName);		
@@ -566,13 +569,11 @@ bool LLXMLNode::updateNode(
 
 
 // static
-bool LLXMLNode::parseFile(
-	LLString filename,
-	LLXMLNodePtr& node,
-	LLXMLNode* defaults_tree)
+bool LLXMLNode::parseFile(const std::string& filename, LLXMLNodePtr& node, LLXMLNode* defaults_tree)
 {
 	// Read file
-	LLFILE* fp = LLFile::fopen(filename.c_str(), "rb");		/* Flawfinder: ignore */
+	LL_DEBUGS("XMLNode") << "parsing XML file: " << filename << LL_ENDL;
+	LLFILE* fp = LLFile::fopen(filename, "rb");		/* Flawfinder: ignore */
 	if (fp == NULL)
 	{
 		node = new LLXMLNode();
@@ -746,7 +747,7 @@ void LLXMLNode::writeHeaderToFile(LLFILE *fOut)
 	fprintf(fOut, "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n");
 }
 
-void LLXMLNode::writeToFile(LLFILE *fOut, LLString indent)
+void LLXMLNode::writeToFile(LLFILE *fOut, const std::string& indent)
 {
 	if (isFullyDefault())
 	{
@@ -756,14 +757,14 @@ void LLXMLNode::writeToFile(LLFILE *fOut, LLString indent)
 
 	std::ostringstream ostream;
 	writeToOstream(ostream, indent);
-	LLString outstring = ostream.str();
+	std::string outstring = ostream.str();
 	if (fwrite(outstring.c_str(), 1, outstring.length(), fOut) != outstring.length())
 	{
 		llwarns << "Short write" << llendl;
 	}
 }
 
-void LLXMLNode::writeToOstream(std::ostream& output_stream, const LLString& indent)
+void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& indent)
 {
 	if (isFullyDefault())
 	{
@@ -777,12 +778,12 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const LLString& inde
 	BOOL has_default_length = mDefault.isNull()?FALSE:(mLength == mDefault->mLength);
 
 	// stream the name
-	output_stream << indent.c_str() << "<" << mName->mString;
+	output_stream << indent << "<" << mName->mString;
 
 	// ID
 	if (mID != "")
 	{
-		output_stream << " id=\"" << mID.c_str() << "\"";
+		output_stream << " id=\"" << mID << "\"";
 	}
 
 	// Type
@@ -862,7 +863,7 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const LLString& inde
 			LLXMLNodePtr child = (*attr_itr).second;
 			if (child->mDefault.isNull() || child->mDefault->mValue != child->mValue)
 			{
-				LLString attr = child->mName->mString;
+				std::string attr = child->mName->mString;
 				if (attr == "id" ||
 					attr == "type" ||
 					attr == "encoding" ||
@@ -873,7 +874,7 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const LLString& inde
 					continue; // skip built-in attributes
 				}
 				
-				LLString attr_str = llformat(" %s=\"%s\"",
+				std::string attr_str = llformat(" %s=\"%s\"",
 											 attr.c_str(),
 											 escapeXML(child->mValue).c_str());
 				if (col_pos + (S32)attr_str.length() > MAX_COLUMN_WIDTH)
@@ -898,7 +899,7 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const LLString& inde
 		if (mChildren)
 		{
 			// stream non-attributes
-			LLString next_indent = indent + "\t";
+			std::string next_indent = indent + "\t";
 			for (LLXMLNode* child = getFirstChild(); child; child = child->getNextSibling())
 			{
 				child->writeToOstream(output_stream, next_indent);
@@ -906,19 +907,19 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const LLString& inde
 		}
 		if (!mValue.empty())
 		{
-			LLString contents = getTextContents();
-			output_stream << indent.c_str() << "\t" << escapeXML(contents) << "\n";
+			std::string contents = getTextContents();
+			output_stream << indent << "\t" << escapeXML(contents) << "\n";
 		}
-		output_stream << indent.c_str() << "</" << mName->mString << ">\n";
+		output_stream << indent << "</" << mName->mString << ">\n";
 	}
 }
 
-void LLXMLNode::findName(const LLString& name, LLXMLNodeList &results)
+void LLXMLNode::findName(const std::string& name, LLXMLNodeList &results)
 {
     LLStringTableEntry* name_entry = gStringTable.checkStringEntry(name);
 	if (name_entry == mName)
 	{
-		results.insert(std::pair<LLString, LLXMLNode*>(this->mName->mString, this));
+		results.insert(std::make_pair(this->mName->mString, this));
 		return;
 	}
 	if (mChildren)
@@ -937,7 +938,7 @@ void LLXMLNode::findName(LLStringTableEntry* name, LLXMLNodeList &results)
 {
 	if (name == mName)
 	{
-		results.insert(std::pair<LLString, LLXMLNode*>(this->mName->mString, this));
+		results.insert(std::make_pair(this->mName->mString, this));
 		return;
 	}
 	if (mChildren)
@@ -952,11 +953,11 @@ void LLXMLNode::findName(LLStringTableEntry* name, LLXMLNodeList &results)
 	}
 }
 
-void LLXMLNode::findID(const LLString& id, LLXMLNodeList &results)
+void LLXMLNode::findID(const std::string& id, LLXMLNodeList &results)
 {
 	if (id == mID)
 	{
-		results.insert(std::pair<LLString, LLXMLNode*>(this->mName->mString, this));
+		results.insert(std::make_pair(this->mName->mString, this));
 		return;
 	}
 	if (mChildren)
@@ -1015,7 +1016,7 @@ void LLXMLNode::scrubToTree(LLXMLNode *tree)
 	}
 }
 
-bool LLXMLNode::getChild(const LLString& name, LLXMLNodePtr& node, BOOL use_default_if_missing)
+bool LLXMLNode::getChild(const char* name, LLXMLNodePtr& node, BOOL use_default_if_missing)
 {
     return getChild(gStringTable.checkStringEntry(name), node, use_default_if_missing);
 }
@@ -1039,7 +1040,7 @@ bool LLXMLNode::getChild(const LLStringTableEntry* name, LLXMLNodePtr& node, BOO
 	return false;
 }
 
-void LLXMLNode::getChildren(const LLString& name, LLXMLNodeList &children, BOOL use_default_if_missing) const
+void LLXMLNode::getChildren(const char* name, LLXMLNodeList &children, BOOL use_default_if_missing) const
 {
     getChildren(gStringTable.checkStringEntry(name), children, use_default_if_missing);
 }
@@ -1059,7 +1060,7 @@ void LLXMLNode::getChildren(const LLStringTableEntry* name, LLXMLNodeList &child
 				{
 					break;
 				}
-				children.insert(std::pair<LLString, LLXMLNodePtr>(child->mName->mString, child));
+				children.insert(std::make_pair(child->mName->mString, child));
 				child_itr++;
 			}
 		}
@@ -1070,7 +1071,7 @@ void LLXMLNode::getChildren(const LLStringTableEntry* name, LLXMLNodeList &child
 	}
 }
 
-bool LLXMLNode::getAttribute(const LLString& name, LLXMLNodePtr& node, BOOL use_default_if_missing)
+bool LLXMLNode::getAttribute(const char* name, LLXMLNodePtr& node, BOOL use_default_if_missing)
 {
     return getAttribute(gStringTable.checkStringEntry(name), node, use_default_if_missing);
 }
@@ -1091,7 +1092,7 @@ bool LLXMLNode::getAttribute(const LLStringTableEntry* name, LLXMLNodePtr& node,
 	return false;
 }
 
-bool LLXMLNode::setAttributeString(const LLString& attr, const LLString& value)
+bool LLXMLNode::setAttributeString(const char* attr, const std::string& value)
 {
 	LLStringTableEntry* name = gStringTable.checkStringEntry(attr);
 	LLXMLAttribList::const_iterator child_itr = mAttributes.find(name);
@@ -1104,25 +1105,25 @@ bool LLXMLNode::setAttributeString(const LLString& attr, const LLString& value)
 	return false;
 }
 
-BOOL LLXMLNode::hasAttribute(const LLString& name )
+BOOL LLXMLNode::hasAttribute(const char* name )
 {
 	LLXMLNodePtr node;
 	return getAttribute(name, node);
 }
 
-BOOL LLXMLNode::getAttributeBOOL(const LLString& name, BOOL& value )
+BOOL LLXMLNode::getAttributeBOOL(const char* name, BOOL& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getBoolValue(1, &value));
 }
 
-BOOL LLXMLNode::getAttributeU8(const LLString& name, U8& value )
+BOOL LLXMLNode::getAttributeU8(const char* name, U8& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getByteValue(1, &value));
 }
 
-BOOL LLXMLNode::getAttributeS8(const LLString& name, S8& value )
+BOOL LLXMLNode::getAttributeS8(const char* name, S8& value )
 {
 	LLXMLNodePtr node;
 	S32 val;
@@ -1134,7 +1135,7 @@ BOOL LLXMLNode::getAttributeS8(const LLString& name, S8& value )
 	return true;
 }
 
-BOOL LLXMLNode::getAttributeU16(const LLString& name, U16& value )
+BOOL LLXMLNode::getAttributeU16(const char* name, U16& value )
 {
 	LLXMLNodePtr node;
 	U32 val;
@@ -1146,7 +1147,7 @@ BOOL LLXMLNode::getAttributeU16(const LLString& name, U16& value )
 	return true;
 }
 
-BOOL LLXMLNode::getAttributeS16(const LLString& name, S16& value )
+BOOL LLXMLNode::getAttributeS16(const char* name, S16& value )
 {
 	LLXMLNodePtr node;
 	S32 val;
@@ -1158,73 +1159,73 @@ BOOL LLXMLNode::getAttributeS16(const LLString& name, S16& value )
 	return true;
 }
 
-BOOL LLXMLNode::getAttributeU32(const LLString& name, U32& value )
+BOOL LLXMLNode::getAttributeU32(const char* name, U32& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getUnsignedValue(1, &value));
 }
 
-BOOL LLXMLNode::getAttributeS32(const LLString& name, S32& value )
+BOOL LLXMLNode::getAttributeS32(const char* name, S32& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getIntValue(1, &value));
 }
 
-BOOL LLXMLNode::getAttributeF32(const LLString& name, F32& value )
+BOOL LLXMLNode::getAttributeF32(const char* name, F32& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getFloatValue(1, &value));
 }
 
-BOOL LLXMLNode::getAttributeF64(const LLString& name, F64& value )
+BOOL LLXMLNode::getAttributeF64(const char* name, F64& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getDoubleValue(1, &value));
 }
 
-BOOL LLXMLNode::getAttributeColor(const LLString& name, LLColor4& value )
+BOOL LLXMLNode::getAttributeColor(const char* name, LLColor4& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getFloatValue(4, value.mV));
 }
 
-BOOL LLXMLNode::getAttributeColor4(const LLString& name, LLColor4& value )
+BOOL LLXMLNode::getAttributeColor4(const char* name, LLColor4& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getFloatValue(4, value.mV));
 }
 
-BOOL LLXMLNode::getAttributeColor4U(const LLString& name, LLColor4U& value )
+BOOL LLXMLNode::getAttributeColor4U(const char* name, LLColor4U& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getByteValue(4, value.mV));
 }
 
-BOOL LLXMLNode::getAttributeVector3(const LLString& name, LLVector3& value )
+BOOL LLXMLNode::getAttributeVector3(const char* name, LLVector3& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getFloatValue(3, value.mV));
 }
 
-BOOL LLXMLNode::getAttributeVector3d(const LLString& name, LLVector3d& value )
+BOOL LLXMLNode::getAttributeVector3d(const char* name, LLVector3d& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getDoubleValue(3, value.mdV));
 }
 
-BOOL LLXMLNode::getAttributeQuat(const LLString& name, LLQuaternion& value )
+BOOL LLXMLNode::getAttributeQuat(const char* name, LLQuaternion& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getFloatValue(4, value.mQ));
 }
 
-BOOL LLXMLNode::getAttributeUUID(const LLString& name, LLUUID& value )
+BOOL LLXMLNode::getAttributeUUID(const char* name, LLUUID& value )
 {
 	LLXMLNodePtr node;
 	return (getAttribute(name, node) && node->getUUIDValue(1, &value));
 }
 
-BOOL LLXMLNode::getAttributeString(const LLString& name, LLString& value )
+BOOL LLXMLNode::getAttributeString(const char* name, std::string& value )
 {
 	LLXMLNodePtr node;
 	if (!getAttribute(name, node))
@@ -1536,14 +1537,14 @@ U32 LLXMLNode::getBoolValue(U32 expected_length, BOOL *array)
 		return 0;
 	}
 
-	LLString *str_array = new LLString[expected_length];
+	std::string *str_array = new std::string[expected_length];
 
 	U32 length = getStringValue(expected_length, str_array);
 
 	U32 ret_length = 0;
 	for (U32 i=0; i<length; ++i)
 	{
-		LLString::toLower(str_array[i]);
+		LLStringUtil::toLower(str_array[i]);
 		if (str_array[i] == "false")
 		{
 			array[ret_length++] = FALSE;
@@ -1872,7 +1873,7 @@ U32 LLXMLNode::getDoubleValue(U32 expected_length, F64 *array, Encoding encoding
 	return i;
 }
 
-U32 LLXMLNode::getStringValue(U32 expected_length, LLString *array)
+U32 LLXMLNode::getStringValue(U32 expected_length, std::string *array)
 {
 	llassert(array);
 
@@ -1947,7 +1948,7 @@ U32 LLXMLNode::getUUIDValue(U32 expected_length, LLUUID *array)
 		memcpy(uuid_string, value_string, (UUID_STR_LENGTH-1));		/* Flawfinder: ignore */
 		uuid_string[(UUID_STR_LENGTH-1)] = 0;
 
-		if (!LLUUID::parseUUID(uuid_string, &uuid_value))
+		if (!LLUUID::parseUUID(std::string(uuid_string), &uuid_value))
 		{
 			break;
 		}
@@ -1975,7 +1976,7 @@ U32 LLXMLNode::getNodeRefValue(U32 expected_length, LLXMLNode **array)
 		return 0;
 	}
 
-	LLString *string_array = new LLString[expected_length];
+	std::string *string_array = new std::string[expected_length];
 
 	U32 num_strings = getStringValue(expected_length, string_array);
 
@@ -2015,7 +2016,7 @@ void LLXMLNode::setBoolValue(U32 length, const BOOL *array)
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	for (U32 pos=0; pos<length; ++pos)
 	{
 		if (pos > 0)
@@ -2038,7 +2039,7 @@ void LLXMLNode::setByteValue(U32 length, const U8* const array, Encoding encodin
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
 	{
 		for (U32 pos=0; pos<length; ++pos)
@@ -2081,7 +2082,7 @@ void LLXMLNode::setIntValue(U32 length, const S32 *array, Encoding encoding)
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
 	{
 		for (U32 pos=0; pos<length; ++pos)
@@ -2128,7 +2129,7 @@ void LLXMLNode::setUnsignedValue(U32 length, const U32* array, Encoding encoding
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
 	{
 		for (U32 pos=0; pos<length; ++pos)
@@ -2177,7 +2178,7 @@ void LLXMLNode::setLongValue(U32 length, const U64* array, Encoding encoding)
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
 	{
 		for (U32 pos=0; pos<length; ++pos)
@@ -2226,21 +2227,21 @@ void LLXMLNode::setFloatValue(U32 length, const F32 *array, Encoding encoding, U
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
 	{
-		char format_string[10];		/* Flawfinder: ignore */
+		std::string format_string;
 		if (precision > 0)
 		{
 			if (precision > 25)
 			{
 				precision = 25;
 			}
-			snprintf(format_string, sizeof(format_string), "%%.%dg", precision);	/* Flawfinder: ignore */
+			format_string = llformat( "%%.%dg", precision);
 		}
 		else
 		{
-			snprintf(format_string, sizeof(format_string), "%%g");		/* Flawfinder: ignore */
+			format_string = llformat( "%%g");
 		}
 
 		for (U32 pos=0; pos<length; ++pos)
@@ -2248,11 +2249,11 @@ void LLXMLNode::setFloatValue(U32 length, const F32 *array, Encoding encoding, U
 			if (pos > 0)
 			{
 				new_value.append(" ");
-				new_value.append(llformat(format_string, array[pos]));
+				new_value.append(llformat(format_string.c_str(), array[pos]));
 			}
 			else
 			{
-				new_value.assign(llformat(format_string, array[pos]));
+				new_value.assign(llformat(format_string.c_str(), array[pos]));
 			}
 		}
 		mValue = new_value;
@@ -2277,32 +2278,32 @@ void LLXMLNode::setDoubleValue(U32 length, const F64 *array, Encoding encoding,
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
 	{
-		char format_string[10];		/* Flawfinder: ignore */
+		std::string format_string;
 		if (precision > 0)
 		{
 			if (precision > 25)
 			{
 				precision = 25;
 			}
-			snprintf(format_string, sizeof(format_string), "%%.%dg", precision);	/* Flawfinder: ignore */
+			format_string = llformat( "%%.%dg", precision);
 		}
 		else
 		{
-			snprintf(format_string, sizeof(format_string), "%%g");		/* Flawfinder: ignore */
+			format_string = llformat( "%%g");
 		}
 		for (U32 pos=0; pos<length; ++pos)
 		{
 			if (pos > 0)
 			{
 				new_value.append(" ");
-				new_value.append(llformat(format_string, array[pos]));
+				new_value.append(llformat(format_string.c_str(), array[pos]));
 			}
 			else
 			{
-				new_value.assign(llformat(format_string, array[pos]));
+				new_value.assign(llformat(format_string.c_str(), array[pos]));
 			}
 		}
 		mValue = new_value;
@@ -2325,10 +2326,10 @@ void LLXMLNode::setDoubleValue(U32 length, const F64 *array, Encoding encoding,
 }
 
 // static
-LLString LLXMLNode::escapeXML(const LLString& xml)
+std::string LLXMLNode::escapeXML(const std::string& xml)
 {
-	LLString out;
-	for (LLString::size_type i = 0; i < xml.size(); ++i)
+	std::string out;
+	for (std::string::size_type i = 0; i < xml.size(); ++i)
 	{
 		char c = xml[i];
 		switch(c)
@@ -2344,11 +2345,11 @@ LLString LLXMLNode::escapeXML(const LLString& xml)
 	return out;
 }
 
-void LLXMLNode::setStringValue(U32 length, const LLString *array)
+void LLXMLNode::setStringValue(U32 length, const std::string *array)
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	for (U32 pos=0; pos<length; ++pos)
 	{
 		new_value.append(escapeXML(array[pos]));
@@ -2365,7 +2366,7 @@ void LLXMLNode::setUUIDValue(U32 length, const LLUUID *array)
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	for (U32 pos=0; pos<length; ++pos)
 	{
 		new_value.append(array[pos].asString());
@@ -2382,7 +2383,7 @@ void LLXMLNode::setNodeRefValue(U32 length, const LLXMLNode **array)
 {
 	if (length == 0) return;
 
-	LLString new_value;
+	std::string new_value;
 	for (U32 pos=0; pos<length; ++pos)
 	{
 		if (array[pos]->mID != "")
@@ -2402,7 +2403,7 @@ void LLXMLNode::setNodeRefValue(U32 length, const LLXMLNode **array)
 	mType = TYPE_NODEREF;
 }
 
-void LLXMLNode::setValue(const LLString& value)
+void LLXMLNode::setValue(const std::string& value)
 {
 	if (TYPE_CONTAINER == mType)
 	{
@@ -2439,7 +2440,7 @@ void LLXMLNode::findDefault(LLXMLNode *defaults_list)
 	mDefault = NULL;
 }
 
-BOOL LLXMLNode::deleteChildren(const LLString& name)
+BOOL LLXMLNode::deleteChildren(const std::string& name)
 {
 	U32 removed_count = 0;
 	LLXMLNodeList node_list;
@@ -2491,7 +2492,7 @@ void LLXMLNode::setAttributes(LLXMLNode::ValueType type, U32 precision, LLXMLNod
 	mLength = length;
 }
 
-void LLXMLNode::setName(const LLString& name)
+void LLXMLNode::setName(const std::string& name)
 {
 	setName(gStringTable.addStringEntry(name));
 }
@@ -2512,10 +2513,11 @@ void LLXMLNode::setName(LLStringTableEntry* name)
 	}
 }
 
-void LLXMLNode::appendValue(const LLString& value)
-{
-	mValue.append(value);
-}
+// Unused
+// void LLXMLNode::appendValue(const std::string& value)
+// {
+// 	mValue.append(value);
+// }
 
 U32 LLXMLNode::getChildCount() const 
 { 
@@ -2565,14 +2567,13 @@ LLXMLNode *get_rand_node(LLXMLNode *node)
 void LLXMLNode::createUnitTest(S32 max_num_children)
 {
 	// Random ID
-	char rand_id[20];		/* Flawfinder: ignore */
+	std::string rand_id;
 	U32 rand_id_len = get_rand(10)+5;
-	U32 pos = 0;
-	for (; pos<rand_id_len; ++pos)
+	for (U32 pos = 0; pos<rand_id_len; ++pos)
 	{
-		rand_id[pos] = get_rand(26)+'a';
+		char c = 'a' + get_rand(26);
+		rand_id.append(1, c);
 	}
-	rand_id[pos] = 0;
 	mID = rand_id;
 
 	if (max_num_children < 2)
@@ -2594,26 +2595,24 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
 	for (U32 child_num=0; child_num<num_children; ++child_num)
 	{
 		// Random Name
-		char child_name[20];		/* Flawfinder: ignore */
+		std::string child_name;
 		U32 child_name_len = get_rand(10)+5;
-		pos = 0;
-		for (; pos<child_name_len; ++pos)
+		for (U32 pos = 0; pos<child_name_len; ++pos)
 		{
-			child_name[pos] = get_rand(26)+'a';
+			char c = 'a' + get_rand(26);
+			child_name.append(1, c);
 		}
-		child_name[pos] = 0;
 
-		LLXMLNode *new_child = createChild(child_name, FALSE);
+		LLXMLNode *new_child = createChild(child_name.c_str(), FALSE);
 
 		// Random ID
-		char child_id[20];		/* Flawfinder: ignore */
+		std::string child_id;
 		U32 child_id_len = get_rand(10)+5;
-		pos = 0;
-		for (; pos<child_id_len; ++pos)
+		for (U32 pos=0; pos<child_id_len; ++pos)
 		{
-			child_id[pos] = get_rand(26)+'a';
+			char c = 'a' + get_rand(26);
+			child_id.append(1, c);
 		}
-		child_id[pos] = 0;
 		new_child->mID = child_id;
 
 		// Random Length
@@ -2747,7 +2746,7 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
 	createChild("float_checksum", TRUE)->setUnsignedValue(1, &float_checksum, LLXMLNode::ENCODING_HEX);
 }
 
-BOOL LLXMLNode::performUnitTest(LLString &error_buffer)
+BOOL LLXMLNode::performUnitTest(std::string &error_buffer)
 {
 	if (!mChildren)
 	{
@@ -3021,10 +3020,10 @@ LLXMLNodePtr LLXMLNode::getNextSibling()
 	return ret;
 }
 
-LLString LLXMLNode::getTextContents() const
+std::string LLXMLNode::getTextContents() const
 {
 	std::string msg;
-	LLString contents = mValue;
+	std::string contents = mValue;
 	std::string::size_type n = contents.find_first_not_of(" \t\n");
 	if (n != std::string::npos && contents[n] == '\"')
 	{
@@ -3068,10 +3067,10 @@ LLString LLXMLNode::getTextContents() const
 	else
 	{
 		// Case 2: node has embedded text (beginning and trailing whitespace trimmed)
-		LLString::size_type start = mValue.find_first_not_of(" \t\n");
+		std::string::size_type start = mValue.find_first_not_of(" \t\n");
 		if (start != mValue.npos)
 		{
-			LLString::size_type end = mValue.find_last_not_of(" \t\n");
+			std::string::size_type end = mValue.find_last_not_of(" \t\n");
 			if (end != mValue.npos)
 			{
 				msg = mValue.substr(start, end+1-start);
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index 269108c..ed170f6 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -49,6 +49,13 @@
 #include "llstringtable.h"
 
 
+class LLVector3;
+class LLVector3d;
+class LLQuaternion;
+class LLUUID;
+class LLColor4;
+class LLColor4U;
+
 
 struct CompareAttributes
 {
@@ -68,10 +75,18 @@ struct CompareAttributes
 
 class LLXMLNode;
 typedef LLPointer<LLXMLNode> LLXMLNodePtr;
-typedef std::multimap<LLString, LLXMLNodePtr > LLXMLNodeList;
+typedef std::multimap<std::string, LLXMLNodePtr > LLXMLNodeList;
 typedef std::multimap<const LLStringTableEntry *, LLXMLNodePtr > LLXMLChildList;
 typedef std::map<const LLStringTableEntry *, LLXMLNodePtr, CompareAttributes> LLXMLAttribList;
 
+class LLColor4;
+class LLColor4U;
+class LLQuaternion;
+class LLVector3;
+class LLVector3d;
+class LLVector4;
+class LLVector4U;
+
 struct LLXMLChildren
 {
 	LLXMLChildList map;			// Map of children names->pointers
@@ -107,7 +122,7 @@ protected:
 
 public:
 	LLXMLNode();
-	LLXMLNode(const LLString& name, BOOL is_attribute);
+	LLXMLNode(const char* name, BOOL is_attribute);
 	LLXMLNode(LLStringTableEntry* name, BOOL is_attribute);
 
 	BOOL isNull();
@@ -118,7 +133,7 @@ public:
 
     // Serialization
 	static bool parseFile(
-		LLString filename,
+		const std::string& filename,
 		LLXMLNodePtr& node, 
 		LLXMLNode* defaults_tree);
 	static bool parseBuffer(
@@ -134,16 +149,16 @@ public:
 	LLXMLNodePtr& node,
 	LLXMLNodePtr& update_node);
 	static void writeHeaderToFile(LLFILE *fOut);
-    void writeToFile(LLFILE *fOut, LLString indent = LLString());
-    void writeToOstream(std::ostream& output_stream, const LLString& indent = LLString());
+    void writeToFile(LLFILE *fOut, const std::string& indent = std::string());
+    void writeToOstream(std::ostream& output_stream, const std::string& indent = std::string());
 
     // Utility
-    void findName(const LLString& name, LLXMLNodeList &results);
+    void findName(const std::string& name, LLXMLNodeList &results);
     void findName(LLStringTableEntry* name, LLXMLNodeList &results);
-    void findID(const LLString& id, LLXMLNodeList &results);
+    void findID(const std::string& id, LLXMLNodeList &results);
 
 
-    virtual LLXMLNodePtr createChild(const LLString& name, BOOL is_attribute);
+    virtual LLXMLNodePtr createChild(const char* name, BOOL is_attribute);
     virtual LLXMLNodePtr createChild(LLStringTableEntry* name, BOOL is_attribute);
 
 
@@ -155,49 +170,49 @@ public:
     U32 getLongValue(U32 expected_length, U64 *array, Encoding encoding = ENCODING_DEFAULT);
     U32 getFloatValue(U32 expected_length, F32 *array, Encoding encoding = ENCODING_DEFAULT);
     U32 getDoubleValue(U32 expected_length, F64 *array, Encoding encoding = ENCODING_DEFAULT);
-    U32 getStringValue(U32 expected_length, LLString *array);
+    U32 getStringValue(U32 expected_length, std::string *array);
     U32 getUUIDValue(U32 expected_length, LLUUID *array);
     U32 getNodeRefValue(U32 expected_length, LLXMLNode **array);
 
-	BOOL hasAttribute(const LLString& name );
-
-	BOOL getAttributeBOOL(const LLString& name, BOOL& value );
-	BOOL getAttributeU8(const LLString& name, U8& value );
-	BOOL getAttributeS8(const LLString& name, S8& value );
-	BOOL getAttributeU16(const LLString& name, U16& value );
-	BOOL getAttributeS16(const LLString& name, S16& value );
-	BOOL getAttributeU32(const LLString& name, U32& value );
-	BOOL getAttributeS32(const LLString& name, S32& value );
-	BOOL getAttributeF32(const LLString& name, F32& value );
-	BOOL getAttributeF64(const LLString& name, F64& value );
-	BOOL getAttributeColor(const LLString& name, LLColor4& value );
-	BOOL getAttributeColor4(const LLString& name, LLColor4& value );
-	BOOL getAttributeColor4U(const LLString& name, LLColor4U& value );
-	BOOL getAttributeVector3(const LLString& name, LLVector3& value );
-	BOOL getAttributeVector3d(const LLString& name, LLVector3d& value );
-	BOOL getAttributeQuat(const LLString& name, LLQuaternion& value );
-	BOOL getAttributeUUID(const LLString& name, LLUUID& value );
-	BOOL getAttributeString(const LLString& name, LLString& value );
+	BOOL hasAttribute(const char* name );
+
+	BOOL getAttributeBOOL(const char* name, BOOL& value );
+	BOOL getAttributeU8(const char* name, U8& value );
+	BOOL getAttributeS8(const char* name, S8& value );
+	BOOL getAttributeU16(const char* name, U16& value );
+	BOOL getAttributeS16(const char* name, S16& value );
+	BOOL getAttributeU32(const char* name, U32& value );
+	BOOL getAttributeS32(const char* name, S32& value );
+	BOOL getAttributeF32(const char* name, F32& value );
+	BOOL getAttributeF64(const char* name, F64& value );
+	BOOL getAttributeColor(const char* name, LLColor4& value );
+	BOOL getAttributeColor4(const char* name, LLColor4& value );
+	BOOL getAttributeColor4U(const char* name, LLColor4U& value );
+	BOOL getAttributeVector3(const char* name, LLVector3& value );
+	BOOL getAttributeVector3d(const char* name, LLVector3d& value );
+	BOOL getAttributeQuat(const char* name, LLQuaternion& value );
+	BOOL getAttributeUUID(const char* name, LLUUID& value );
+	BOOL getAttributeString(const char* name, std::string& value );
 
     const ValueType& getType() const { return mType; }
     U32 getLength() const { return mLength; }
     U32 getPrecision() const { return mPrecision; }
-    const LLString& getValue() const { return mValue; }
-	LLString getTextContents() const;
+    const std::string& getValue() const { return mValue; }
+	std::string getTextContents() const;
     const LLStringTableEntry* getName() const { return mName; }
 	BOOL hasName(const char* name) const { return mName == gStringTable.checkStringEntry(name); }
-	BOOL hasName(LLString name) const { return mName == gStringTable.checkStringEntry(name.c_str()); }
-    const LLString& getID() const { return mID; }
+	BOOL hasName(const std::string& name) const { return mName == gStringTable.checkStringEntry(name.c_str()); }
+    const std::string& getID() const { return mID; }
 
     U32 getChildCount() const;
     // getChild returns a Null LLXMLNode (not a NULL pointer) if there is no such child.
     // This child has no value so any getTYPEValue() calls on it will return 0.
-    bool getChild(const LLString& name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
+    bool getChild(const char* name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
     bool getChild(const LLStringTableEntry* name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
-    void getChildren(const LLString& name, LLXMLNodeList &children, BOOL use_default_if_missing = TRUE) const;
+    void getChildren(const char* name, LLXMLNodeList &children, BOOL use_default_if_missing = TRUE) const;
     void getChildren(const LLStringTableEntry* name, LLXMLNodeList &children, BOOL use_default_if_missing = TRUE) const;
 
-	bool getAttribute(const LLString& name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
+	bool getAttribute(const char* name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
 	bool getAttribute(const LLStringTableEntry* name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
 
 	// The following skip over attributes
@@ -208,7 +223,7 @@ public:
 
 	// Setters
 
-	bool setAttributeString(const LLString& attr, const LLString& value);
+	bool setAttributeString(const char* attr, const std::string& value);
 	
 	void setBoolValue(const BOOL value)	{ setBoolValue(1, &value); }
 	void setByteValue(const U8 value, Encoding encoding = ENCODING_DEFAULT) { setByteValue(1, &value, encoding); }
@@ -217,7 +232,7 @@ public:
 	void setLongValue(const U64 value, Encoding encoding = ENCODING_DEFAULT) { setLongValue(1, &value, encoding); }
 	void setFloatValue(const F32 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setFloatValue(1, &value, encoding); }
 	void setDoubleValue(const F64 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setDoubleValue(1, &value, encoding); }
-	void setStringValue(const LLString value) { setStringValue(1, &value); }
+	void setStringValue(const std::string& value) { setStringValue(1, &value); }
 	void setUUIDValue(const LLUUID value) { setUUIDValue(1, &value); }
 	void setNodeRefValue(const LLXMLNode *value) { setNodeRefValue(1, &value); }
 
@@ -228,16 +243,16 @@ public:
 	void setLongValue(U32 length, const U64 *array, Encoding encoding = ENCODING_DEFAULT);
 	void setFloatValue(U32 length, const F32 *array, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0);
 	void setDoubleValue(U32 length, const F64 *array, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0);
-	void setStringValue(U32 length, const LLString *array);
+	void setStringValue(U32 length, const std::string *array);
 	void setUUIDValue(U32 length, const LLUUID *array);
 	void setNodeRefValue(U32 length, const LLXMLNode **array);
-	void setValue(const LLString& value);
-	void setName(const LLString& name);
+	void setValue(const std::string& value);
+	void setName(const std::string& name);
 	void setName(LLStringTableEntry* name);
 
 	// Escapes " (quot) ' (apos) & (amp) < (lt) > (gt)
 	// TomY TODO: Make this private
-	static LLString escapeXML(const LLString& xml);
+	static std::string escapeXML(const std::string& xml);
 
 	// Set the default node corresponding to this default node
 	void setDefault(LLXMLNode *default_node);
@@ -250,20 +265,20 @@ public:
 	// Delete any child nodes that aren't among the tree's children, recursive
 	void scrubToTree(LLXMLNode *tree);
 
-	BOOL deleteChildren(const LLString& name);
+	BOOL deleteChildren(const std::string& name);
 	BOOL deleteChildren(LLStringTableEntry* name);
 	void setAttributes(ValueType type, U32 precision, Encoding encoding, U32 length);
-	void appendValue(const LLString& value);
+// 	void appendValue(const std::string& value); // Unused
 
 	// Unit Testing
 	void createUnitTest(S32 max_num_children);
-	BOOL performUnitTest(LLString &error_buffer);
+	BOOL performUnitTest(std::string &error_buffer);
 
 protected:
 	BOOL removeChild(LLXMLNode* child);
 
 public:
-	LLString mID;				// The ID attribute of this node
+	std::string mID;				// The ID attribute of this node
 
 	XML_Parser *mParser;		// Temporary pointer while loading
 
@@ -286,7 +301,7 @@ public:
 	
 protected:
 	LLStringTableEntry *mName;		// The name of this node
-	LLString mValue;			// The value of this node (use getters/setters only)
+	std::string mValue;			// The value of this node (use getters/setters only)
 
 	LLXMLNodePtr mDefault;		// Mirror node in the default tree
 
diff --git a/linden/indra/llxml/llxmlparser.cpp b/linden/indra/llxml/llxmlparser.cpp
index 3b4d944..b0a3a05 100644
--- a/linden/indra/llxml/llxmlparser.cpp
+++ b/linden/indra/llxml/llxmlparser.cpp
@@ -45,7 +45,7 @@ LLXmlParser::LLXmlParser()
 	mParser( NULL ),
 	mDepth( 0 )
 {
-	strcpy( mAuxErrorString, "no error" );		/* Flawfinder: ignore */
+	mAuxErrorString = "no error";
 
 	// Override the document's declared encoding.
 	mParser = XML_ParserCreate(NULL);
@@ -77,10 +77,10 @@ BOOL LLXmlParser::parseFile(const std::string &path)
 	
 	BOOL success = TRUE;
 
-	LLFILE* file = LLFile::fopen(path.c_str(), "rb");		/* Flawfinder: ignore */
+	LLFILE* file = LLFile::fopen(path, "rb");		/* Flawfinder: ignore */
 	if( !file )
 	{
-		snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Couldn't open file %s", path.c_str());	/* Flawfinder: ignore */
+		mAuxErrorString = llformat( "Couldn't open file %s", path.c_str());
 		success = FALSE;
 	}
 	else
@@ -94,7 +94,7 @@ BOOL LLXmlParser::parseFile(const std::string &path)
 		void* buffer = XML_GetBuffer(mParser, buffer_size);
 		if( !buffer ) 
 		{
-			snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Unable to allocate XML buffer while reading file %s", path.c_str() );	/* Flawfinder: ignore */
+			mAuxErrorString = llformat( "Unable to allocate XML buffer while reading file %s", path.c_str() );
 			success = FALSE;
 			goto exit_label;
 		}
@@ -102,14 +102,14 @@ BOOL LLXmlParser::parseFile(const std::string &path)
 		bytes_read = (S32)fread(buffer, 1, buffer_size, file);
 		if( bytes_read <= 0 )
 		{
-			snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while reading file  %s", path.c_str() );	/* Flawfinder: ignore */
+			mAuxErrorString = llformat( "Error while reading file  %s", path.c_str() );
 			success = FALSE;
 			goto exit_label;
 		}
 		
 		if( !XML_ParseBuffer(mParser, bytes_read, TRUE ) )
 		{
-			snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while parsing file  %s", path.c_str() );	/* Flawfinder: ignore */
+			mAuxErrorString = llformat( "Error while parsing file  %s", path.c_str() );
 			success = FALSE;
 		}
 
@@ -146,7 +146,7 @@ const char* LLXmlParser::getErrorString()
 	const char* error_string = XML_ErrorString(XML_GetErrorCode( mParser ));
 	if( !error_string )
 	{
-		error_string = mAuxErrorString;
+		error_string = mAuxErrorString.c_str();
 	}
 	return error_string;
 }
diff --git a/linden/indra/llxml/llxmlparser.h b/linden/indra/llxml/llxmlparser.h
index 7ce5524..4717d5d 100644
--- a/linden/indra/llxml/llxmlparser.h
+++ b/linden/indra/llxml/llxmlparser.h
@@ -132,7 +132,7 @@ public:
 protected:
 	XML_Parser		mParser;
 	int				mDepth;
-	char			mAuxErrorString[1024];		/*Flawfinder: ignore*/
+	std::string		mAuxErrorString;
 };
 
 #endif  // LL_LLXMLPARSER_H
diff --git a/linden/indra/llxml/llxmltree.cpp b/linden/indra/llxml/llxmltree.cpp
index 4ac05f9..0c24d9f 100644
--- a/linden/indra/llxml/llxmltree.cpp
+++ b/linden/indra/llxml/llxmltree.cpp
@@ -90,11 +90,11 @@ void LLXmlTree::dump()
 	}
 }
 
-void LLXmlTree::dumpNode( LLXmlTreeNode* node, const LLString& prefix )
+void LLXmlTree::dumpNode( LLXmlTreeNode* node, const std::string& prefix )
 {
 	node->dump( prefix );
 
-	LLString new_prefix = prefix + "    ";
+	std::string new_prefix = prefix + "    ";
 	for( LLXmlTreeNode* child = node->getFirstChild(); child; child = node->getNextChild() )
 	{
 		dumpNode( child, new_prefix );
@@ -121,7 +121,7 @@ LLXmlTreeNode::~LLXmlTreeNode()
 		delete *child_iter;
 }
  
-void LLXmlTreeNode::dump( const LLString& prefix )
+void LLXmlTreeNode::dump( const std::string& prefix )
 {
 	llinfos << prefix << mName ;
 	if( !mContents.empty() )
@@ -132,7 +132,7 @@ void LLXmlTreeNode::dump( const LLString& prefix )
 	for (iter=mAttributes.begin(); iter != mAttributes.end(); iter++)
 	{
 		LLStdStringHandle key = iter->first;
-		const LLString* value = iter->second;
+		const std::string* value = iter->second;
 		llcont << prefix << " " << key << "=" << (value->empty() ? "NULL" : *value);
 	}
 	llcont << llendl;
@@ -148,7 +148,7 @@ BOOL LLXmlTreeNode::hasAttribute(const std::string& name)
 void LLXmlTreeNode::addAttribute(const std::string& name, const std::string& value)
 {
 	LLStdStringHandle canonical_name = LLXmlTree::sAttributeKeys.addString( name );
-	const LLString *newstr = new LLString(value);
+	const std::string *newstr = new std::string(value);
 	mAttributes[canonical_name] = newstr; // insert + copy
 }
 
@@ -204,103 +204,103 @@ void LLXmlTreeNode::addChild(LLXmlTreeNode* child)
 
 BOOL LLXmlTreeNode::getFastAttributeBOOL(LLStdStringHandle canonical_name, BOOL& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToBOOL( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToBOOL( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeU8(LLStdStringHandle canonical_name, U8& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToU8( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToU8( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeS8(LLStdStringHandle canonical_name, S8& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToS8( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToS8( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeS16(LLStdStringHandle canonical_name, S16& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToS16( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToS16( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeU16(LLStdStringHandle canonical_name, U16& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToU16( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToU16( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeU32(LLStdStringHandle canonical_name, U32& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToU32( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToU32( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeS32(LLStdStringHandle canonical_name, S32& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToS32( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToS32( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeF32(LLStdStringHandle canonical_name, F32& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToF32( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToF32( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeF64(LLStdStringHandle canonical_name, F64& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s && LLString::convertToF64( *s, value );
+	const std::string *s = getAttribute( canonical_name );
+	return s && LLStringUtil::convertToF64( *s, value );
 }
 
 BOOL LLXmlTreeNode::getFastAttributeColor(LLStdStringHandle canonical_name, LLColor4& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s ? LLColor4::parseColor(s->c_str(), &value) : FALSE;
+	const std::string *s = getAttribute( canonical_name );
+	return s ? LLColor4::parseColor(*s, &value) : FALSE;
 }
 
 BOOL LLXmlTreeNode::getFastAttributeColor4(LLStdStringHandle canonical_name, LLColor4& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s ? LLColor4::parseColor4(s->c_str(), &value) : FALSE;
+	const std::string *s = getAttribute( canonical_name );
+	return s ? LLColor4::parseColor4(*s, &value) : FALSE;
 }
 
 BOOL LLXmlTreeNode::getFastAttributeColor4U(LLStdStringHandle canonical_name, LLColor4U& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s ? LLColor4U::parseColor4U(s->c_str(), &value ) : FALSE;
+	const std::string *s = getAttribute( canonical_name );
+	return s ? LLColor4U::parseColor4U(*s, &value ) : FALSE;
 }
 
 BOOL LLXmlTreeNode::getFastAttributeVector3(LLStdStringHandle canonical_name, LLVector3& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s ? LLVector3::parseVector3(s->c_str(), &value ) : FALSE;
+	const std::string *s = getAttribute( canonical_name );
+	return s ? LLVector3::parseVector3(*s, &value ) : FALSE;
 }
 
 BOOL LLXmlTreeNode::getFastAttributeVector3d(LLStdStringHandle canonical_name, LLVector3d& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s ? LLVector3d::parseVector3d(s->c_str(),  &value ) : FALSE;
+	const std::string *s = getAttribute( canonical_name );
+	return s ? LLVector3d::parseVector3d(*s,  &value ) : FALSE;
 }
 
 BOOL LLXmlTreeNode::getFastAttributeQuat(LLStdStringHandle canonical_name, LLQuaternion& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s ? LLQuaternion::parseQuat(s->c_str(), &value ) : FALSE;
+	const std::string *s = getAttribute( canonical_name );
+	return s ? LLQuaternion::parseQuat(*s, &value ) : FALSE;
 }
 
 BOOL LLXmlTreeNode::getFastAttributeUUID(LLStdStringHandle canonical_name, LLUUID& value)
 {
-	const LLString *s = getAttribute( canonical_name );
-	return s ? LLUUID::parseUUID(s->c_str(), &value ) : FALSE;
+	const std::string *s = getAttribute( canonical_name );
+	return s ? LLUUID::parseUUID(*s, &value ) : FALSE;
 }
 
-BOOL LLXmlTreeNode::getFastAttributeString(LLStdStringHandle canonical_name, LLString& value)
+BOOL LLXmlTreeNode::getFastAttributeString(LLStdStringHandle canonical_name, std::string& value)
 {
-	const LLString *s = getAttribute( canonical_name );
+	const std::string *s = getAttribute( canonical_name );
 	if( !s )
 	{
 		return FALSE;
@@ -409,7 +409,7 @@ BOOL LLXmlTreeNode::getAttributeUUID(const std::string& name, LLUUID& value)
 	return getFastAttributeUUID(canonical_name, value);
 }
 
-BOOL LLXmlTreeNode::getAttributeString(const std::string& name, LLString& value)
+BOOL LLXmlTreeNode::getAttributeString(const std::string& name, std::string& value)
 {
 	LLStdStringHandle canonical_name = LLXmlTree::sAttributeKeys.addString( name );
 	return getFastAttributeString(canonical_name, value);
@@ -437,7 +437,7 @@ The quick brown fox
   
 */
 
-LLString LLXmlTreeNode::getTextContents()
+std::string LLXmlTreeNode::getTextContents()
 {
 	std::string msg;
 	LLXmlTreeNode* p = getChildByName("p");
@@ -541,7 +541,7 @@ BOOL LLXmlTreeParser::parseFile(const std::string &path, LLXmlTreeNode** root, B
 
 const std::string& LLXmlTreeParser::tabs()
 {
-	static LLString s;
+	static std::string s;
 	s = "";
 	S32 num_tabs = getDepth() - 1;
 	for( S32 i = 0; i < num_tabs; i++)
@@ -602,8 +602,8 @@ void LLXmlTreeParser::endElement(const char* name)
 
 	if( !mCurrent->mContents.empty() )
 	{
-		LLString::trim(mCurrent->mContents);
-		LLString::removeCRLF(mCurrent->mContents);
+		LLStringUtil::trim(mCurrent->mContents);
+		LLStringUtil::removeCRLF(mCurrent->mContents);
 	}
 
 	mCurrent = mCurrent->getParent();
@@ -611,7 +611,8 @@ void LLXmlTreeParser::endElement(const char* name)
 
 void LLXmlTreeParser::characterData(const char *s, int len) 
 {
-	LLString str(s, len);
+	std::string str;
+	if (s) str = std::string(s, len);
 	if( mDump )
 	{
 		llinfos << tabs() << "CharacterData " << str << llendl;
@@ -659,7 +660,8 @@ void LLXmlTreeParser::defaultData(const char *s, int len)
 {
 	if( mDump )
 	{
-		LLString str(s, len);
+		std::string str;
+		if (s) str = std::string(s, len);
 		llinfos << tabs() << "defaultData " << str << llendl;
 	}
 }
diff --git a/linden/indra/llxml/llxmltree.h b/linden/indra/llxml/llxmltree.h
index 87fe4f5..5d475d0 100644
--- a/linden/indra/llxml/llxmltree.h
+++ b/linden/indra/llxml/llxmltree.h
@@ -65,7 +65,7 @@ public:
 	LLXmlTreeNode*	getRoot() { return mRoot; }
 
 	void			dump();
-	void			dumpNode( LLXmlTreeNode* node, const LLString &prefix );
+	void			dumpNode( LLXmlTreeNode* node, const std::string& prefix );
 
 	static LLStdStringHandle addAttributeString( const std::string& name)
 	{
@@ -126,7 +126,7 @@ public:
 	BOOL			getFastAttributeVector3d(	LLStdStringHandle cannonical_name, LLVector3d& value );
 	BOOL			getFastAttributeQuat(		LLStdStringHandle cannonical_name, LLQuaternion& value );
 	BOOL			getFastAttributeUUID(		LLStdStringHandle cannonical_name, LLUUID& value );
-	BOOL			getFastAttributeString(		LLStdStringHandle cannonical_name, LLString& value );
+	BOOL			getFastAttributeString(		LLStdStringHandle cannonical_name, std::string& value );
 
 	// Normal versions find 'name' in LLXmlTree::sAttributeKeys then call fast versions
 	virtual BOOL		getAttributeBOOL(		const std::string& name, BOOL& value );
@@ -145,13 +145,13 @@ public:
 	virtual BOOL		getAttributeVector3d(	const std::string& name, LLVector3d& value );
 	virtual BOOL		getAttributeQuat(		const std::string& name, LLQuaternion& value );
 	virtual BOOL		getAttributeUUID(		const std::string& name, LLUUID& value );
-	virtual BOOL		getAttributeString(		const std::string& name, LLString& value );
+	virtual BOOL		getAttributeString(		const std::string& name, std::string& value );
 
-	const LLString& getContents()
+	const std::string& getContents()
 	{
 		return mContents;
 	}
-	LLString getTextContents();
+	std::string getTextContents();
 
 	LLXmlTreeNode*	getParent()							{ return mParent; }
 	LLXmlTreeNode*	getFirstChild();
@@ -161,7 +161,7 @@ public:
 	LLXmlTreeNode*  getNextNamedChild();				// returns next child with name, NULL if none
 
 protected:
-	const LLString* getAttribute( LLStdStringHandle name)
+	const std::string* getAttribute( LLStdStringHandle name)
 	{
 		attribute_map_t::iterator iter = mAttributes.find(name);
 		return (iter == mAttributes.end()) ? 0 : iter->second;
@@ -172,15 +172,15 @@ private:
 	void			appendContents( const std::string& str );
 	void			addChild( LLXmlTreeNode* child );
 
-	void			dump( const LLString& prefix );
+	void			dump( const std::string& prefix );
 
 protected:
-	typedef std::map<LLStdStringHandle, const LLString*> attribute_map_t;
+	typedef std::map<LLStdStringHandle, const std::string*> attribute_map_t;
 	attribute_map_t						mAttributes;
 
 private:
-	LLString							mName;
-	LLString							mContents;
+	std::string							mName;
+	std::string							mContents;
 	
 	typedef std::list<class LLXmlTreeNode *> child_list_t;
 	child_list_t						mChildList;
diff --git a/linden/indra/lscript/CMakeLists.txt b/linden/indra/lscript/CMakeLists.txt
new file mode 100644
index 0000000..c655aef
--- /dev/null
+++ b/linden/indra/lscript/CMakeLists.txt
@@ -0,0 +1,18 @@
+# -*- cmake -*-
+
+set(lscript_HEADER_FILES
+    lscript_alloc.h
+    lscript_byteconvert.h
+    lscript_byteformat.h
+    lscript_execute.h
+    lscript_export.h
+    lscript_http.h
+    lscript_library.h
+    lscript_rt_interface.h
+    )
+
+add_subdirectory(lscript_compile)
+add_subdirectory(lscript_execute)
+
+add_subdirectory(lscript_library)
+
diff --git a/linden/indra/lscript/files.lst b/linden/indra/lscript/files.lst
deleted file mode 100644
index 3413b4e..0000000
--- a/linden/indra/lscript/files.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-lscript/lscript_compile/indra.l.cpp
-lscript/lscript_compile/indra.y.cpp
-lscript/lscript_compile/lscript_alloc.cpp
-lscript/lscript_compile/lscript_bytecode.cpp
-lscript/lscript_compile/lscript_error.cpp
-lscript/lscript_compile/lscript_heap.cpp
-lscript/lscript_compile/lscript_resource.cpp
-lscript/lscript_compile/lscript_scope.cpp
-lscript/lscript_compile/lscript_tree.cpp
-lscript/lscript_compile/lscript_typecheck.cpp
-lscript/lscript_execute/lscript_execute.cpp
-lscript/lscript_execute/lscript_heapruntime.cpp
-lscript/lscript_execute/lscript_readlso.cpp
-lscript/lscript_library/lscript_alloc.cpp
-lscript/lscript_library/lscript_library.cpp
-lscript/lscript_library/lscript_export.cpp
diff --git a/linden/indra/lscript/lscript_byteconvert.h b/linden/indra/lscript/lscript_byteconvert.h
index e17f3fc..9530b63 100644
--- a/linden/indra/lscript/lscript_byteconvert.h
+++ b/linden/indra/lscript/lscript_byteconvert.h
@@ -415,7 +415,7 @@ inline void set_fault(const U8 *stream, LSCRIPTRunTimeFaults fault)
 			reset_hp_to_safe_spot(stream);
 //		    lsa_print_heap((U8 *)stream);
 	   }
-       fr = LSCRIPTRunTimeFaultBits[fault];
+       fr = fault;
        set_register((U8 *)stream, LREG_FR, fr);
    }
 }
@@ -1110,7 +1110,7 @@ inline void safe_heap_bytestream_count_char(U8 *stream, S32 &offset)
 		;
 }
 
-inline void safe_instruction_char2bytestream(U8 *stream, S32 &offset, char *buffer)
+inline void safe_instruction_char2bytestream(U8 *stream, S32 &offset, const char* buffer)
 {
 	while (  (safe_instruction_check_address(stream, offset, 1))
 		   &&(*(stream + offset++) = *buffer++))
diff --git a/linden/indra/lscript/lscript_byteformat.h b/linden/indra/lscript/lscript_byteformat.h
index 1e54e9c..1f201d8 100644
--- a/linden/indra/lscript/lscript_byteformat.h
+++ b/linden/indra/lscript/lscript_byteformat.h
@@ -512,25 +512,11 @@ typedef enum e_lscript_runtime_faults
 	LSRF_CHAT_OVERRUN,
 	LSRF_TOO_MANY_LISTENS,
 	LSRF_NESTING_LISTS,
+	LSRF_CLI,
 	LSRF_EOF
 } LSCRIPTRunTimeFaults;
 
-extern char* LSCRIPTRunTimeFaultStrings[LSRF_EOF]; 	/*Flawfinder: ignore*/
-
-const S32 LSCRIPTRunTimeFaultBits[LSRF_EOF] =
-{
-	0,		//	LSRF_INVALID
-	1,		//	LSRF_MATH
-	2,		//	LSRF_STACK_HEAP_COLLISION
-	3,		//	LSREF_BOUND_CHECK_ERROR
-	4,		//	LSREF_HEAP_ERROR
-	5,		//	LSREF_VERSION_MISMATCH
-	6,		//	LSREF_MISSING_INVENTORY
-	7,		//	LSRF_SANDBOX
-	8,		//	LSRF_CHAT_OVERRUN
-	9,		//	LSRF_TOO_MANY_LISTENS
-	10,		//	LSRF_NESTING_LISTS
-};
+extern const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF]; 	/*Flawfinder: ignore*/
 
 typedef enum e_lscript_runtime_permissions
 {
diff --git a/linden/indra/lscript/lscript_compile/CMakeLists.txt b/linden/indra/lscript/lscript_compile/CMakeLists.txt
new file mode 100644
index 0000000..252085b
--- /dev/null
+++ b/linden/indra/lscript/lscript_compile/CMakeLists.txt
@@ -0,0 +1,148 @@
+# -*- cmake -*-
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLInventory)
+include(LScript)
+
+include(FindCygwin)
+
+find_program(FLEX flex
+             "C:/Program Files/GnuWin32/bin"
+             ${CYGWIN_INSTALL_PATH}/bin
+             /bin
+             /usr/bin
+             /usr/local/bin
+             )
+mark_as_advanced(FLEX)
+
+find_program(BISON bison
+             "C:/Program Files/GnuWin32/bin"
+             ${CYGWIN_INSTALL_PATH}/bin
+             /bin
+             /usr/bin
+             /usr/local/bin
+             )
+mark_as_advanced(BISON)
+
+find_program(M4 m4
+             "C:/Program Files/GnuWin32/bin"
+             ${CYGWIN_INSTALL_PATH}/bin
+             /bin
+             /usr/bin
+             /usr/local/bin
+             )
+mark_as_advanced(M4)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLINVENTORY_INCLUDE_DIRS}
+    ${LSCRIPT_INCLUDE_DIRS}
+    )
+
+set(lscript_generated_SOURCE_FILES
+    indra.l.cpp
+    indra.y.cpp
+    )
+
+set(lscript_compile_SOURCE_FILES
+    lscript_alloc.cpp
+    lscript_bytecode.cpp
+    lscript_error.cpp
+    lscript_heap.cpp
+    lscript_resource.cpp
+    lscript_scope.cpp
+    lscript_tree.cpp
+    lscript_typecheck.cpp
+    )
+    
+set(lscript_compile_HEADER_FILES
+    CMakeLists.txt
+
+    indra.l
+    indra.y
+
+    ../lscript_alloc.h
+    ../lscript_byteformat.h
+    ../lscript_byteconvert.h
+    ../lscript_http.h
+
+    lscript_error.h
+    lscript_bytecode.h
+    lscript_heap.h
+    lscript_resource.h
+    lscript_scope.h
+    lscript_tree.h
+    lscript_typecheck.h
+    )
+
+set_source_files_properties(${lscript_compile_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+set_source_files_properties(${lscript_generated_SOURCE_FILES}
+                            PROPERTIES HEADER_FILE_ONLY FALSE GENERATED TRUE)
+
+list(APPEND lscript_compile_SOURCE_FILES ${lscript_generated_SOURCE_FILES} ${lscript_compile_HEADER_FILES})
+
+add_custom_command(
+    OUTPUT
+      ${CMAKE_CURRENT_BINARY_DIR}/indra.l.cpp
+    COMMAND ${FLEX}
+    ARGS
+      -o${CMAKE_CURRENT_BINARY_DIR}/indra.l.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/indra.l
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/indra.l
+    )
+
+if (WINDOWS)
+  set_source_files_properties(indra.l.cpp
+                              PROPERTIES COMPILE_FLAGS /DYY_NO_UNISTD_H)
+endif (WINDOWS)
+
+if (WINDOWS)
+  get_filename_component(M4_PATH ${M4} PATH)
+  add_custom_command(
+      OUTPUT
+        ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
+      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bison.bat
+        ${BISON} ${M4_PATH}
+        ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
+      DEPENDS
+        ${CMAKE_CURRENT_SOURCE_DIR}/bison.bat
+        ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
+      )
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/windows)
+else (WINDOWS)
+  add_custom_command(
+      OUTPUT
+        ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
+      COMMAND
+        ${BISON}
+      ARGS
+        -d -o ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
+      DEPENDS
+        ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
+      )
+endif (WINDOWS)
+
+if (DARWIN)
+  # Mac OS X 10.4 compatibility
+  add_custom_command(
+    OUTPUT
+      ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
+    COMMAND
+      mv
+      ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp.h
+      ${CMAKE_CURRENT_BINARY_DIR}/indra.y.hpp
+    )
+endif (DARWIN)
+
+add_library (lscript_compile ${lscript_compile_SOURCE_FILES})
diff --git a/linden/indra/lscript/lscript_compile/bison.bat b/linden/indra/lscript/lscript_compile/bison.bat
new file mode 100644
index 0000000..54cf023
--- /dev/null
+++ b/linden/indra/lscript/lscript_compile/bison.bat
@@ -0,0 +1,11 @@
+@REM Run bison under Windows.  This script is needed so that bison can
+@REM find m4, even if neither program is present in PATH.
+
+@set bison=%1
+set M4PATH=%2
+set M4=
+@set output=%3
+@set input=%4
+
+set PATH=%M4PATH%;%PATH%
+%bison% -d -o %output% %input%
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 74e32fd..49ed6fc 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -19,11 +19,7 @@ FS			(f|F)
 #include "lscript_tree.h"
 #include "lscript_typecheck.h"
 #include "lscript_resource.h"
-#if LL_WINDOWS
-#include "ytab.h"
-#else
-#include "indra.y.h"
-#endif
+#include "indra.y.hpp"
 #include "lltimer.h"
 #include "indra_constants.h"
 #include "llagentconstants.h"
@@ -505,6 +501,9 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PRIM_SCULPT_TYPE_TORUS"	{ count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_TORUS; return(INTEGER_CONSTANT); }
 "PRIM_SCULPT_TYPE_PLANE"	{ count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_PLANE; return(INTEGER_CONSTANT); }
 "PRIM_SCULPT_TYPE_CYLINDER"	{ count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_CYLINDER; return(INTEGER_CONSTANT); }
+"PRIM_SCULPT_TYPE_MASK" 	{ count(); yylval.ival = LSL_PRIM_SCULPT_TYPE_MASK; return(INTEGER_CONSTANT); }
+"PRIM_SCULPT_FLAG_MIRROR" 	{ count(); yylval.ival = LSL_PRIM_SCULPT_FLAG_MIRROR; return(INTEGER_CONSTANT); }
+"PRIM_SCULPT_FLAG_INVERT" 	{ count(); yylval.ival = LSL_PRIM_SCULPT_FLAG_INVERT; return(INTEGER_CONSTANT); }
 
 "MASK_BASE"				{ count(); yylval.ival = 0; return(INTEGER_CONSTANT); }
 "MASK_OWNER"			{ count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
@@ -680,7 +679,7 @@ int yyerror(const char *fmt, ...)
 //#define EMIT_CIL_ASSEMBLER
 
 BOOL lscript_compile(const char* src_filename, const char* dst_filename,
-					 const char* err_filename, BOOL is_god_like)
+					 const char* err_filename, BOOL compile_to_mono, const char* class_name, BOOL is_god_like)
 {
 	BOOL			b_parse_ok = FALSE;
 	BOOL			b_dummy = FALSE;
@@ -696,10 +695,10 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
 	init_temp_jumps();
 	gAllocationManager = new LLScriptAllocationManager();
 
-	yyin = LLFile::fopen(src_filename, "r");
+	yyin = LLFile::fopen(std::string(src_filename), "r");
 	if (yyin)
 	{
-		yyout = LLFile::fopen(err_filename, "w");
+		yyout = LLFile::fopen(std::string(err_filename), "w");
 
 		// Reset the lexer's internal buffering.
 
@@ -722,6 +721,8 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
 			}
 
 			gScriptp->mGodLike = is_god_like;
+			
+			gScriptp->setClassName(class_name);
 
 			gScopeStringTable = new LLStringTable(16384);
 #ifdef EMERGENCY_DEBUG_PRINTOUTS
@@ -737,34 +738,25 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
 #ifdef EMERGENCY_DEBUG_PRINTOUTS
 				gScriptp->recurse(yyout, 0, 0, LSCP_EMIT_ASSEMBLY, LSPRUNE_INVALID,  b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
 #endif
-#ifdef EMIT_CIL_ASSEMBLER
-				const char* cil_output_file_name = dst_filename? dst_filename : "lscript.cil";
-				LLFILE* cilout = LLFile::fopen(cil_output_file_name, "w");
-				if(NULL == cilout)
+				if(TRUE == compile_to_mono)
 				{
-					fprintf(yyout, "Error opening cil output file %s\n", cil_output_file_name);
+					gScriptp->recurse(yyout, 0, 0, LSCP_EMIT_CIL_ASSEMBLY, LSPRUNE_INVALID,  b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
 				}
 				else
 				{
-					gScriptp->recurse(cilout, 0, 0, LSCP_EMIT_CIL_ASSEMBLY, LSPRUNE_INVALID,  b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
-					if(fclose(cilout) == EOF)
-					{
-						fprintf(yyout, "Error closing cil output file %s\n", cil_output_file_name);
-					}
+					gScriptp->recurse(yyout, 0, 0, LSCP_EMIT_BYTE_CODE, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
 				}
-#endif
-				gScriptp->recurse(yyout, 0, 0, LSCP_EMIT_BYTE_CODE, LSPRUNE_INVALID, b_dummy, NULL, type, type, b_dummy_count, NULL, NULL, 0, NULL, 0, NULL);
 			}
 			delete gScopeStringTable;
 			gScopeStringTable = NULL;
 #ifdef EMERGENCY_DEBUG_PRINTOUTS
 			fclose(compfile);
 #endif
+			fclose(yyout);
 		}
-		fclose(yyout);
+		fclose(yyin);
 	}
 
-	fclose(yyin);
 	delete gAllocationManager;
 	delete gScopeStringTable;
 	
@@ -772,13 +764,15 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
 }
 
 
-BOOL lscript_compile(char *filename, BOOL is_god_like = FALSE)
+BOOL lscript_compile(char *filename, BOOL compile_to_mono, BOOL is_god_like = FALSE)
 {
 	char src_filename[MAX_STRING];
 	sprintf(src_filename, "%s.lsl", filename);
 	char err_filename[MAX_STRING];
 	sprintf(err_filename, "%s.out", filename);
-	return lscript_compile(src_filename, NULL, err_filename, is_god_like);
+	char class_name[MAX_STRING];
+	sprintf(class_name, "%s", filename);
+	return lscript_compile(src_filename, NULL, err_filename, compile_to_mono, class_name, is_god_like);
 }
 
 
diff --git a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
index 31ab909..7c2b07f 100644
--- a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
@@ -101,7 +101,7 @@ void LLScriptByteCodeChunk::addU16(U16 data)
 	addBytes(temp, 2);
 }
 
-void LLScriptByteCodeChunk::addBytes(U8 *bytes, S32 size)
+void LLScriptByteCodeChunk::addBytes(const U8 *bytes, S32 size)
 {
 	if (mCodeChunk)
 	{
@@ -118,7 +118,7 @@ void LLScriptByteCodeChunk::addBytes(U8 *bytes, S32 size)
 	mCurrentOffset += size;
 }
 
-void LLScriptByteCodeChunk::addBytes(char *bytes, S32 size)
+void LLScriptByteCodeChunk::addBytes(const char *bytes, S32 size)
 {
 	if (mCodeChunk)
 	{
diff --git a/linden/indra/lscript/lscript_compile/lscript_bytecode.h b/linden/indra/lscript/lscript_compile/lscript_bytecode.h
index 272aa60..0da1e37 100644
--- a/linden/indra/lscript/lscript_compile/lscript_bytecode.h
+++ b/linden/indra/lscript/lscript_compile/lscript_bytecode.h
@@ -56,8 +56,8 @@ public:
 
 	void addByte(U8 byte);
 	void addU16(U16 data);
-	void addBytes(U8 *bytes, S32 size);
-	void addBytes(char *bytes, S32 size);
+	void addBytes(const U8 *bytes, S32 size);
+	void addBytes(const char *bytes, S32 size);
 	void addBytes(S32 size);
 	void addBytesDontInc(S32 size);
 	void addInteger(S32 value);
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
deleted file mode 100644
index a95c05e..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile.vcproj
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="lscript_compile"
-	ProjectGUID="{44CE6D82-7320-4609-8FC3-5965C19F4808}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;YY_NO_UNISTD_H"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4065"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;YY_NO_UNISTD_H"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4065"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;YY_NO_UNISTD_H"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4065"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\lex_yy.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_alloc.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_bytecode.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_error.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_heap.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_resource.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_scope.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_tree.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_typecheck.cpp">
-			</File>
-			<File
-				RelativePath=".\ytab.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\generated_lex_yy.hpp">
-			</File>
-			<File
-				RelativePath=".\generated_ytab.hpp">
-			</File>
-			<File
-				RelativePath=".\lscript_bytecode.h">
-			</File>
-			<File
-				RelativePath=".\lscript_error.h">
-			</File>
-			<File
-				RelativePath=".\lscript_heap.h">
-			</File>
-			<File
-				RelativePath=".\lscript_resource.h">
-			</File>
-			<File
-				RelativePath=".\lscript_scope.h">
-			</File>
-			<File
-				RelativePath=".\lscript_tree.h">
-			</File>
-			<File
-				RelativePath=".\lscript_typecheck.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj
deleted file mode 100755
index af823d0..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile_fb.vcproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="lscript_compile_fb"
-	ProjectGUID="{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
-	RootNamespace="lscript_compile_fb"
-	Keyword="MakeFileProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug_fb"
-			ConfigurationType="10">
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Release_fb"
-			ConfigurationType="10">
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-		<File
-			RelativePath=".\indra.l">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="flex.exe -olex_yy.cpp indra.l
-"
-					Outputs="lex_yy.cpp"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="flex.exe -olex_yy.cpp indra.l"
-					Outputs="lex_yy.cpp"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\indra.y">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="bison.exe -y -d -v -o ytab.cpp indra.y
-mv.exe ytab.hpp ytab.h"
-					Outputs="ytab.cpp;ytab.h"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="bison.exe -y -d -v -o ytab.cpp indra.y
-mv.exe ytab.hpp ytab.h"
-					Outputs="ytab.cpp;ytab.h"/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
deleted file mode 100644
index 91561b9..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="lscript_compile_fb_vc8"
-	ProjectGUID="{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
-	RootNamespace="lscript_compile_fb"
-	Keyword="MakeFileProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug_fb"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Release_fb"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\indra.l"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="flex.exe -olex_yy.cpp indra.l&#x0D;&#x0A;"
-					Outputs="lex_yy.cpp"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="flex.exe -olex_yy.cpp indra.l&#x0D;&#x0A;"
-					Outputs="lex_yy.cpp"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\indra.y"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="bison.exe -y -d -v -o ytab.cpp indra.y&#x0D;&#x0A;mv.exe ytab.hpp ytab.h&#x0D;&#x0A;"
-					Outputs="ytab.cpp;ytab.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="bison.exe -y -d -v -o ytab.cpp indra.y&#x0D;&#x0A;mv.exe ytab.hpp ytab.h&#x0D;&#x0A;"
-					Outputs="ytab.cpp;ytab.h"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc9.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc9.vcproj
deleted file mode 100644
index 62f3ada..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc9.vcproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="lscript_compile_fb_vc8"
-	ProjectGUID="{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
-	RootNamespace="lscript_compile_fb"
-	Keyword="MakeFileProj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug_fb"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Release_fb"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\indra.l"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="flex.exe -olex_yy.cpp indra.l"
-					Outputs="lex_yy.cpp"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="flex.exe -olex_yy.cpp indra.l"
-					Outputs="lex_yy.cpp"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\indra.y"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="bison.exe -y -d -v -o ytab.cpp indra.y&#x0D;&#x0A;mv.exe ytab.hpp ytab.h&#x0D;&#x0A;"
-					Outputs="ytab.cpp;ytab.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="bison.exe -y -d -v -o ytab.cpp indra.y&#x0D;&#x0A;mv.exe ytab.hpp ytab.h&#x0D;&#x0A;"
-					Outputs="ytab.cpp;ytab.h"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_ly.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_ly.vcproj
deleted file mode 100644
index c324ed9..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile_ly.vcproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="lscript_compile_ly"
-	ProjectGUID="{FF8ECB70-C788-47D4-91BF-F88448AE8940}"
-	RootNamespace="lscript_compile_ly"
-	Keyword="MakeFileProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug_ly"
-			ConfigurationType="10">
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Release_ly"
-			ConfigurationType="10">
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-		<File
-			RelativePath=".\indra.l">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
-..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l
-"
-					Outputs="lex_yy.cpp"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
-..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l
-"
-					Outputs="lex_yy.cpp"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\indra.y">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
-..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y
-"
-					Outputs="ytab.cpp;ytab.h"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
-..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y
-"
-					Outputs="ytab.cpp;ytab.h"/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_ly_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_ly_vc8.vcproj
deleted file mode 100644
index f55385e..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile_ly_vc8.vcproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="lscript_compile_ly"
-	ProjectGUID="{FF8ECB70-C788-47D4-91BF-F88448AE8940}"
-	RootNamespace="lscript_compile_ly"
-	Keyword="MakeFileProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Debug_ly"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="Release_ly"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\indra.l"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l&#x0D;&#x0A;"
-					Outputs="lex_yy.cpp"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building lex_yy.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l&#x0D;&#x0A;"
-					Outputs="lex_yy.cpp"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\indra.y"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y&#x0D;&#x0A;"
-					Outputs="ytab.cpp;ytab.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building ytab.cpp"
-					CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y&#x0D;&#x0A;"
-					Outputs="ytab.cpp;ytab.h"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
deleted file mode 100644
index 9972c52..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="lscript_compile"
-	ProjectGUID="{44CE6D82-7320-4609-8FC3-5965C19F4808}"
-	RootNamespace="lscript_compile"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;YY_NO_UNISTD_H"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;YY_NO_UNISTD_H"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;YY_NO_UNISTD_H"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lex_yy.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_alloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_bytecode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_error.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_resource.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_scope.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_tree.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_typecheck.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ytab.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\generated_lex_yy.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\generated_ytab.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_bytecode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_error.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_scope.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_tree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_typecheck.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_vc9.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_vc9.vcproj
deleted file mode 100644
index 6167895..0000000
--- a/linden/indra/lscript/lscript_compile/lscript_compile_vc9.vcproj
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="lscript_compile"
-	ProjectGUID="{44CE6D82-7320-4609-8FC3-5965C19F4808}"
-	RootNamespace="lscript_compile"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;YY_NO_UNISTD_H"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;YY_NO_UNISTD_H"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;YY_NO_UNISTD_H"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_compile.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lex_yy.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_alloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_bytecode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_error.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_resource.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_scope.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_tree.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_typecheck.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ytab.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\generated_lex_yy.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\generated_ytab.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_bytecode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_error.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_scope.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_tree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_typecheck.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_error.cpp b/linden/indra/lscript/lscript_compile/lscript_error.cpp
index b3c1ffa..3b92bca 100644
--- a/linden/indra/lscript/lscript_compile/lscript_error.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_error.cpp
@@ -49,13 +49,13 @@ void LLScriptFilePosition::fdotabs(LLFILE *fp, S32 tabs, S32 tabsize)
 	}
 }
 
-char* gWarningText[LSWARN_EOF] = 	 	/*Flawfinder: ignore*/
+const char* gWarningText[LSWARN_EOF] = 	 	/*Flawfinder: ignore*/
 {
 	"INVALID",
 	"Dead code found beyond return statement"
 };
 
-char* gErrorText[LSERROR_EOF] = 	/*Flawfinder: ignore*/
+const char* gErrorText[LSERROR_EOF] = 	/*Flawfinder: ignore*/
 {
 	"INVALID",
 	"Syntax error",
@@ -72,7 +72,10 @@ char* gErrorText[LSERROR_EOF] = 	/*Flawfinder: ignore*/
 	"Use of vector or quaternion method on incorrect type",
 	"Lists can't be included in lists",
 	"Unitialized variables can't be included in lists",
-	"Declaration requires a new scope -- use { and }"
+	"Declaration requires a new scope -- use { and }",
+	"CIL assembler failed",
+	"Bytecode transformer failed",
+	"Bytecode verification failed"
 };
 
 void LLScriptGenerateErrorText::writeWarning(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTWarnings warning)
@@ -98,3 +101,8 @@ void LLScriptGenerateErrorText::writeError(LLFILE *fp, S32 line, S32 col, LSCRIP
 	fprintf(fp, "(%d, %d) : ERROR : %s\n", line, col, gErrorText[error]);
 	mTotalErrors++;
 }
+
+std::string getLScriptErrorString(LSCRIPTErrors error)
+{
+	return gErrorText[error];
+}
diff --git a/linden/indra/lscript/lscript_compile/lscript_error.h b/linden/indra/lscript/lscript_compile/lscript_error.h
index b5fcadb..5ae8582 100644
--- a/linden/indra/lscript/lscript_compile/lscript_error.h
+++ b/linden/indra/lscript/lscript_compile/lscript_error.h
@@ -124,6 +124,9 @@ typedef enum e_lscript_errors
 	LSERROR_NO_LISTS_IN_LISTS,
 	LSERROR_NO_UNITIALIZED_VARIABLES_IN_LISTS,
 	LSERROR_NEED_NEW_SCOPE,
+	LSERROR_CIL_ASSEMBLER_FAILED = 16, // Mono build error.
+	LSERROR_BYTECODE_TRANSFORM_FAILED = 17, // Mono build error.
+	LSERROR_BYTECODE_VERIFICATION_FAILED, // Mono build error.
 	LSERROR_EOF
 } LSCRIPTErrors;
 
@@ -147,6 +150,8 @@ public:
 	S32 mTotalWarnings;
 };
 
+std::string getLScriptErrorString(LSCRIPTErrors error);
+
 extern LLScriptGenerateErrorText gErrorToText;
 
 #endif
diff --git a/linden/indra/lscript/lscript_compile/lscript_scope.h b/linden/indra/lscript/lscript_compile/lscript_scope.h
index 8174566..a9c1c45 100644
--- a/linden/indra/lscript/lscript_compile/lscript_scope.h
+++ b/linden/indra/lscript/lscript_compile/lscript_scope.h
@@ -277,14 +277,14 @@ public:
 class LLScriptScopeEntry
 {
 public:
-	LLScriptScopeEntry(char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type, S32 count = 0)
+	LLScriptScopeEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type, S32 count = 0)
 		: mIdentifier(identifier), mIDType(idtype), mType(type), mOffset(0), mSize(0), mAssignable(NULL), mCount(count), mLibraryNumber(0)
 	{
 	}
 
 	~LLScriptScopeEntry() {}
 
-	char						*mIdentifier;
+	const char					*mIdentifier;
 	LSCRIPTIdentifierType		mIDType;
 	LSCRIPTType					mType;
 	S32							mOffset;
@@ -309,9 +309,9 @@ public:
 		mEntryMap.deleteAllData();
 	}
 
-	LLScriptScopeEntry *addEntry(char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
+	LLScriptScopeEntry *addEntry(const char *identifier, LSCRIPTIdentifierType idtype, LSCRIPTType type)
 	{
-		char *name = mSTable->addString(identifier);
+		const char *name = mSTable->addString(identifier);
 		if (!mEntryMap.checkData(name))
 		{
 			if (idtype == LIT_FUNCTION)
@@ -329,9 +329,9 @@ public:
 		}
 	}
 
-	BOOL checkEntry(char *identifier)
+	BOOL checkEntry(const char *identifier)
 	{
-		char *name = mSTable->addString(identifier);
+		const char *name = mSTable->addString(identifier);
 		if (mEntryMap.checkData(name))
 		{
 			return TRUE;
@@ -343,9 +343,9 @@ public:
 		}
 	}
 
-	LLScriptScopeEntry *findEntry(char *identifier)
+	LLScriptScopeEntry *findEntry(const char *identifier)
 	{
-		char			*name = mSTable->addString(identifier);
+		const char		*name = mSTable->addString(identifier);
 		LLScriptScope	*scope = this;
 
 		while (scope)
@@ -360,9 +360,9 @@ public:
 		return NULL;
 	}
 
-	LLScriptScopeEntry *findEntryTyped(char *identifier, LSCRIPTIdentifierType idtype)
+	LLScriptScopeEntry *findEntryTyped(const char *identifier, LSCRIPTIdentifierType idtype)
 	{
-		char			*name = mSTable->addString(identifier);
+		const char		*name = mSTable->addString(identifier);
 		LLScriptScope	*scope = this;
 
 		while (scope)
@@ -397,7 +397,7 @@ public:
 		mParentScope = scope;
 	}
 
-	LLMap<char *, LLScriptScopeEntry *>	mEntryMap;
+	LLMap<const char *, LLScriptScopeEntry *>	mEntryMap;
 	LLScriptScope						*mParentScope;
 	LLStringTable						*mSTable;
 	S32									mFunctionCount;
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
index 204f738..71e7f19 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -43,7 +43,8 @@
 
 //#define LSL_INCLUDE_DEBUG_INFO
 
-void print_cil_box(LLFILE* fp, LSCRIPTType type)
+
+static void print_cil_box(LLFILE* fp, LSCRIPTType type)
 {
 	switch(type)
 	{
@@ -51,24 +52,28 @@ void print_cil_box(LLFILE* fp, LSCRIPTType type)
 		fprintf(fp, "box [mscorlib]System.Int32\n");
 		break;
 	case LST_FLOATINGPOINT:
-		fprintf(fp, "box [mscorlib]System.Double\n");
+		fprintf(fp, "box [mscorlib]System.Single\n");
 		break;
 	case LST_STRING:
+		// System.String is not a System.ValueType,
+		// so does not need to be boxed.
+		break;
 	case LST_KEY:
-		fprintf(fp, "box [mscorlib]System.String\n");
+		fprintf(fp, "box [ScriptTypes]LindenLab.SecondLife.Key\n");
 		break;
 	case LST_VECTOR:
-		fprintf(fp, "box [LScriptLibrary]LLVector\n");
+		fprintf(fp, "box [ScriptTypes]LindenLab.SecondLife.Vector\n");
 		break;
 	case LST_QUATERNION:
-		fprintf(fp, "box [LScriptLibrary]LLQuaternion\n");
+		fprintf(fp, "box [ScriptTypes]LindenLab.SecondLife.Quaternion\n");
 		break;
 	default:
+		llassert(false);
 		break;
 	}
 }
 
-void print_cil_type(LLFILE* fp, LSCRIPTType type)
+static void print_cil_type(LLFILE* fp, LSCRIPTType type)
 {
 	switch(type)
 	{
@@ -79,14 +84,16 @@ void print_cil_type(LLFILE* fp, LSCRIPTType type)
 		fprintf(fp, "float32");
 		break;
 	case LST_STRING:
-	case LST_KEY:
 		fprintf(fp, "string");
+		break;		
+	case LST_KEY:
+		fprintf(fp, "valuetype [ScriptTypes]LindenLab.SecondLife.Key");
 		break;
 	case LST_VECTOR:
-		fprintf(fp, "valuetype [LScriptLibrary]LLVector");
+		fprintf(fp, "class [ScriptTypes]LindenLab.SecondLife.Vector");
 		break;
 	case LST_QUATERNION:
-		fprintf(fp, "valuetype [LScriptLibrary]LLQuaternion");
+		fprintf(fp, "class [ScriptTypes]LindenLab.SecondLife.Quaternion");
 		break;
 	case LST_LIST:
 		fprintf(fp, "class [mscorlib]System.Collections.ArrayList");
@@ -189,6 +196,7 @@ void LLScriptConstantInteger::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		fprintf(fp, "ldc.i4 %d\n", mValue);
+		type = mType;
 		break;
 	default:
 		break;
@@ -236,7 +244,13 @@ void LLScriptConstantFloat::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		fprintf(fp, "ldc.r8 %5.5f\n", mValue); // NOTE: Precision?
+	        {
+		        double v = (double)mValue;
+			U8 * p = (U8 *)&v; // See ECMA-335 Partition VI, Appendix C.4.6 Examples, line 4
+			fprintf(fp, "ldc.r8 (%02x %02x %02x %02x %02x %02x %02x %02x)\n", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+			type = mType;
+		}
+		break;
 	default:
 		break;
 	}
@@ -247,16 +261,34 @@ S32 LLScriptConstantFloat::getSize()
 	return LSCRIPTDataSize[LST_FLOATINGPOINT];
 }
 
-void print_escape_quotes(LLFILE* fp, const char* str)
+void print_escaped(LLFILE* fp, const char* str)
 {
   putc('"', fp);
   for(const char* c = str; *c != '\0'; ++c)
   {
-	  if(*c == '"')
+	  switch(*c)
 	  {
-		  putc('\\', fp);
+	  case '"':
+		putc('\\', fp);
+		putc(*c, fp);
+		break;
+	  case '\n':
+		putc('\\', fp);
+		putc('n', fp);
+		break;
+	  case '\t':
+		putc(' ', fp);
+		putc(' ', fp);
+		putc(' ', fp);
+		putc(' ', fp);
+		break;
+	  case '\\':
+		putc('\\', fp);
+		putc('\\', fp);
+		break;
+	  default:
+		putc(*c, fp);
 	  }
-	  putc(*c, fp);
   }
   putc('"', fp);
 }
@@ -293,7 +325,7 @@ void LLScriptConstantString::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 	case LSCP_TO_STACK:
 		{
 			chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGS]);
-			chunk->addBytes(mValue, (S32)strlen(mValue) + 1);	 	/*Flawfinder: ignore*/
+			chunk->addBytes(mValue, (S32)strlen(mValue) + 1);
 			type = mType;
 		}
 		break;
@@ -304,7 +336,7 @@ void LLScriptConstantString::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		fprintf(fp, "ldstr ");
-		print_escape_quotes(fp, mValue);
+		print_escaped(fp, mValue);
 		fprintf(fp, "\n");
 	default:
 		break;
@@ -313,10 +345,9 @@ void LLScriptConstantString::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 
 S32 LLScriptConstantString::getSize()
 {
-	return (S32)strlen(mValue) + 1;		/*Flawfinder: ignore*/
+	return (S32)strlen(mValue) + 1;
 }
 
-
 void LLScriptIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -388,7 +419,7 @@ void LLScriptIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		fprintf(fp, "%s", mName);
+		fprintf(fp, "'%s'", mName);
 		break;
 	default:
 		break;
@@ -428,6 +459,12 @@ S32 LLScriptSimpleAssignable::getSize()
 	return 0;
 }
 
+static void print_cil_member(LLFILE* fp, LLScriptIdentifier *ident)
+{
+	print_cil_type(fp, ident->mScopeEntry->mType);
+	fprintf(fp, " %s::'%s'\n", gScriptp->getClassName(), ident->mScopeEntry->mIdentifier);
+}
+
 void LLScriptSAIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -497,6 +534,19 @@ void LLScriptSAIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			}
 		}
 		break;
+
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		{
+			fprintf(fp, "ldarg.0\n");
+			fprintf(fp, "ldfld ");
+			print_cil_member(fp, mIdentifier);
+			fprintf(fp, "\n");
+			if (mNextp)
+			{
+				mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			}
+			break;
+		}
 	default:
 		mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		if (mNextp)
@@ -553,7 +603,8 @@ S32 LLScriptSAConstant::getSize()
 	return mConstant->getSize();
 }
 
-void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
+
+static void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 {
 	switch(srcType)
 	{
@@ -567,9 +618,8 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 			fprintf(fp, "call string class [mscorlib]System.Convert::ToString(int32)\n");
 			break;
 		case LST_LIST:
-			fprintf(fp, "box [mscorlib]System.Int32\n");
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LScriptLibrary]LScriptInternal::CreateList()\n");
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LScriptLibrary]LScriptInternal::AddReturnList(object, class [mscorlib]System.Collections.ArrayList)\n");
+			print_cil_box(fp, LST_INTEGER);
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
 			break;
 		default:
 			break;
@@ -582,10 +632,11 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 			fprintf(fp, "conv.i4\n");
 			break;
 		case LST_STRING:
-			fprintf(fp, "call string class [mscorlib]System.Convert::ToString(float32)\n");
+			fprintf(fp, "call string [LslLibrary]LindenLab.SecondLife.LslRunTime::ToString(float32)\n");
 			break;
 		case LST_LIST:
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList [LScriptLibrary]LScriptInternal::CreateList(object)\n");
+			print_cil_box(fp, LST_FLOATINGPOINT);
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
 			break;
 		default:
 			break;
@@ -595,19 +646,22 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 		switch(targetType)
 		{
 		case LST_INTEGER:
-			fprintf(fp, "call int32 valuetype [mscorlib]System.Int32::Parse(string)\n");
+			fprintf(fp, "call int32 [LslLibrary]LindenLab.SecondLife.LslRunTime::StringToInt(string)\n");
 			break;
 		case LST_FLOATINGPOINT:
-			fprintf(fp, "call float64 valuetype [mscorlib]System.Double::Parse(string)\n");
+			fprintf(fp, "call float32 [LslLibrary]LindenLab.SecondLife.LslRunTime::StringToFloat(string)\n");
 			break;
+		case LST_KEY:
+			fprintf(fp, "call valuetype [ScriptTypes]LindenLab.SecondLife.Key class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateKey'(string)\n");
+			break;	
 		case LST_LIST:
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList [LScriptLibrary]LScriptInternal::CreateList(object)\n");
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
 			break;
 		case LST_VECTOR:
-			fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'Parse'(string)\n");
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'ParseVector'(string)\n");
 			break;
 		case LST_QUATERNION:
-			fprintf(fp, "call valuetype [LScriptLibrary]LLQuaternion valuetype [LScriptLibrary]LLQuaternion::'Parse'(string)\n");
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'ParseQuaternion'(string)\n");
 			break;
 		default:
 			break;
@@ -619,9 +673,11 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 		case LST_KEY:
 			break;
 		case LST_STRING:
+			fprintf(fp, "call string [LslUserScript]LindenLab.SecondLife.LslUserScript::'ToString'(valuetype [ScriptTypes]LindenLab.SecondLife.Key)\n");
 			break;
 		case LST_LIST:
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList [LScriptLibrary]LScriptInternal::CreateList(object)\n");
+			print_cil_box(fp, LST_KEY);
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
 			break;
 		default:
 			break;
@@ -633,10 +689,11 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 		case LST_VECTOR:
 			break;
 		case LST_STRING:
-			fprintf(fp, "call string valuetype [LScriptLibrary]LLVector::'ToString'(valuetype [LScriptLibrary]LLVector)\n");
+			fprintf(fp, "call string [LslUserScript]LindenLab.SecondLife.LslUserScript::'ToString'(valuetype [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 			break;
 		case LST_LIST:
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList [LScriptLibrary]LScriptInternal::CreateList(object)\n");
+			print_cil_box(fp, LST_VECTOR);
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
 			break;
 		default:
 			break;
@@ -648,10 +705,11 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 		case LST_QUATERNION:
 			break;
 		case LST_STRING:
-			fprintf(fp, "call string valuetype [LScriptLibrary]LLQuaternion::'ToString'(valuetype [LScriptLibrary]LLQuaternion)\n");
+			fprintf(fp, "call string [LslUserScript]LindenLab.SecondLife.LslUserScript::'ToString'(valuetype [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
 			break;
 		case LST_LIST:
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList [LScriptLibrary]LScriptInternal::CreateList(object)\n");
+			print_cil_box(fp, LST_QUATERNION);
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList(object)\n");
 			break;
 		default:
 			break;
@@ -663,7 +721,7 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 		case LST_LIST:
 			break;
 		case LST_STRING:
-			fprintf(fp, "call string [LScriptLibrary]LScriptInternal::ListToString(class [mscorlib]System.Collections.ArrayList)\n");
+			fprintf(fp, "call string [LslLibrary]LindenLab.SecondLife.LslRunTime::ListToString(class [mscorlib]System.Collections.ArrayList)\n");
 			break;
 		default:
 			break;
@@ -674,10 +732,57 @@ void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType)
 	}
 }
 
-bool is_SA_constant_integer(LLScriptSimpleAssignable* sa)
+static void print_cil_numeric_cast(LLFILE* fp, LSCRIPTType currentArg, LSCRIPTType otherArg)
 {
-	// HACK: Downcast based on type.
-	return (sa->mType == LSSAT_CONSTANT && ((LLScriptSAConstant*) sa)->mConstant->mType == LST_INTEGER);
+	if((currentArg == LST_INTEGER) && ((otherArg == LST_FLOATINGPOINT) || (otherArg == LST_VECTOR)))
+	{
+		print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
+	}
+}
+
+static void print_cil_assignment_cast(LLFILE* fp, LSCRIPTType src,
+									  LSCRIPTType dest)
+{
+	if (LST_STRING == src && LST_KEY == dest)
+	{
+		print_cil_cast(fp, src, dest);
+	}
+	else if(LST_KEY == src && LST_STRING == dest)
+	{
+		print_cil_cast(fp, src, dest);
+	}
+	else
+	{
+		print_cil_numeric_cast(fp, src, dest);
+	}
+}
+ 
+// HACK! Babbage: should be converted to virtual on LSCRIPTSimpleAssignableType to avoid downcasts.
+LSCRIPTType get_type(LLScriptSimpleAssignable* sa)
+{
+	LSCRIPTType result = LST_NULL;
+	switch(sa->mType)
+	{
+	case LSSAT_IDENTIFIER:
+		result = ((LLScriptSAIdentifier*) sa)->mIdentifier->mScopeEntry->mType;
+		break;
+	case LSSAT_CONSTANT:
+		result = ((LLScriptSAConstant*) sa)->mConstant->mType;
+		break;
+	case LSSAT_VECTOR_CONSTANT:
+		result = LST_VECTOR;
+		break;
+	case LSSAT_QUATERNION_CONSTANT:
+		result = LST_QUATERNION;
+		break;
+	case LSSAT_LIST_CONSTANT:
+		result = LST_LIST;
+		break;
+	default:
+		result = LST_UNDEFINED;
+		break;
+	}
+	return result;
 }
 
 void LLScriptSAVector::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
@@ -786,23 +891,23 @@ void LLScriptSAVector::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 
 		// Load arguments.
 		mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if(is_SA_constant_integer(mEntry1))
+		if(LST_INTEGER == get_type(mEntry1))
 		{
 			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
 		}
 		mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if(is_SA_constant_integer(mEntry3))
+		if(LST_INTEGER == get_type(mEntry2))
 		{
 			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
 		}
 		mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if(is_SA_constant_integer(mEntry3))
+		if(LST_INTEGER == get_type(mEntry3))
 		{
 			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
 		}
 		
 		// Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
-		fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'create'(float32, float32, float32)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
 
 		// Next.
 		if (mNextp)
@@ -952,28 +1057,28 @@ void LLScriptSAQuaternion::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 
 		// Load arguments.
 		mEntry1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if(is_SA_constant_integer(mEntry1))
+		if(LST_INTEGER == get_type(mEntry1))
 		{
 			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
 		}
 		mEntry2->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if(is_SA_constant_integer(mEntry2))
+		if(LST_INTEGER == get_type(mEntry2))
 		{
 			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
 		}
 		mEntry3->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if(is_SA_constant_integer(mEntry3))
+		if(LST_INTEGER == get_type(mEntry3))
 		{
 			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
 		}
 		mEntry4->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if(is_SA_constant_integer(mEntry4))
+		if(LST_INTEGER == get_type(mEntry4))
 		{
 			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
 		}
 		
 		// Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
-		fprintf(fp, "call valuetype [LScriptLibrary]LLQuaternion valuetype [LScriptLibrary]LLQuaternion::'create'(float32, float32, float32, float32)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
 
 		// Next.
 		if (mNextp)
@@ -1049,6 +1154,40 @@ void LLScriptSAList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 			}
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		{
+			// Create list.
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
+
+			// Add elements.
+			LLScriptSimpleAssignable* current_entry = mEntryList;
+			LLScriptSimpleAssignable* next_entry = NULL;
+			while(NULL != current_entry)
+			{
+				next_entry = current_entry->mNextp;
+
+				// Null mNextp pointer, so only current list element is processed.
+				current_entry->mNextp = NULL;
+				current_entry->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+
+				// Restore mNextp pointer.
+				current_entry->mNextp = next_entry;
+
+				// Box element and store in list.
+				print_cil_box(fp, get_type(current_entry));
+				fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(class [mscorlib]System.Collections.ArrayList, object)\n");
+
+				// Process next element.
+				current_entry = next_entry;
+			}
+
+			// Process next list.
+			if (mNextp)
+			{
+				mNextp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			}
+		}
+		break;
 	default:
 		if (mEntryList)
 			mEntryList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, ldata);
@@ -1093,6 +1232,45 @@ void LLScriptGlobalVariable::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 	}
 }
 
+// Push initialised variable of type on to stack.
+static void print_cil_init_variable(LLFILE* fp, LSCRIPTType type)
+{
+	switch(type)
+	{
+	case LST_INTEGER:
+		fprintf(fp, "ldc.i4.0\n");
+		break;
+	case LST_FLOATINGPOINT:
+		fprintf(fp, "ldc.r8 0\n");
+		break;
+	case LST_STRING:
+		fprintf(fp, "ldstr \"\"\n");
+		break;
+	case LST_KEY:
+		fprintf(fp, "ldstr \"\"\n");
+		fprintf(fp, "call valuetype [ScriptTypes]LindenLab.SecondLife.Key class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateKey'(string)\n");
+		break;
+	case LST_VECTOR:
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
+		break;
+	case LST_QUATERNION:
+		fprintf(fp, "ldc.r8 1\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
+		break;
+	case LST_LIST:
+		fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
+		break;
+	default:
+		break;
+	}
+}
+
 void LLScriptGlobalVariable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -1164,7 +1342,7 @@ void LLScriptGlobalVariable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 			// it also includes the name of the variable as well as the type
 			// plus 4 bytes of offset from it's apparent address to the actual data
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			count += strlen(mIdentifier->mName) + 1 + 1 + 4;	/*Flawfinder: ignore*/
+			count += strlen(mIdentifier->mName) + 1 + 1 + 4;
 #else
 			count += 1 + 1 + 4;
 #endif
@@ -1187,7 +1365,7 @@ void LLScriptGlobalVariable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 			chunk->addBytes(&vtype, 1);
 			// null terminated name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);	/*Flawfinder: ignore*/
+			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
 #else
 			chunk->addBytes(1);
 #endif
@@ -1257,16 +1435,27 @@ void LLScriptGlobalVariable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 	case LSCP_EMIT_CIL_ASSEMBLY:
 
 		// Initialisation inside ctor.
+		fprintf(fp, "ldarg.0\n");
 		if (mAssignable)
 		{
-			fprintf(fp, "ldarg.0\n");
-			mAssignable->recurse(fp, tabs, tabsize, LSCP_EMIT_CIL_ASSEMBLY, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp, "stfld ");
-			mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp," LSL::");
-			mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp, "\n");
+			// Initialise to value.
+			mAssignable->recurse(fp, tabs, tabsize, LSCP_EMIT_CIL_ASSEMBLY,
+								 ptype, prunearg, scope, type, basetype,
+								 count, chunk, heap, stacksize, entry,
+								 entrycount, NULL);
+			print_cil_assignment_cast(fp, get_type(mAssignable), mType->mType);
+		}
+		else
+		{
+			// Initialise to zero.
+			print_cil_init_variable(fp, mType->mType);
 		}
+		// Store value.
+		fprintf(fp, "stfld ");
+		mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp," %s::", gScriptp->getClassName());
+		mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, "\n");
 		break;
 	default:
 		mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -1298,6 +1487,20 @@ S32 LLScriptEvent::getSize()
 	printf("Event Base Class -- should never get here!\n");
 	return 0;
 }
+static void checkForDuplicateHandler(LLFILE *fp, LLScriptFilePosition *pos, 
+				     LLScriptScope *scope,
+				     const char* name)
+{
+    LLScriptScope *parent = scope->mParentScope;
+    if (parent->checkEntry((char*)name))
+    {
+        gErrorToText.writeError(fp, pos, LSERROR_DUPLICATE_NAME);
+    }
+    else
+    {
+        parent->addEntry(((char*)name), LIT_HANDLER, LST_NULL);
+    }
+}
 
 void LLScriptStateEntryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
@@ -1314,11 +1517,14 @@ void LLScriptStateEntryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 	case LSCP_EMIT_ASSEMBLY:
 		fprintf(fp, "state_entry()\n");
 		break;
+	case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "state_entry");
+	        break;
 	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "state_entry";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
@@ -1347,6 +1553,9 @@ void LLScriptStateExitEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		fdotabs(fp, tabs, tabsize);
 		fprintf(fp, "state_exit()\n");
 		break;
+        case LSCP_SCOPE_PASS1:
+                checkForDuplicateHandler(fp, this, scope, "state_exit");
+	        break;
 	case LSCP_EMIT_ASSEMBLY:
 		fprintf(fp, "state_exit()\n");
 		break;
@@ -1354,7 +1563,7 @@ void LLScriptStateExitEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "state_exit";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
@@ -1388,6 +1597,7 @@ void LLScriptTouchStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 		break;
 		break;
 	case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "touch_start");
 		if (scope->checkEntry(mCount->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1412,11 +1622,18 @@ void LLScriptTouchStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "touch_start";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
-			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "touch_start( int32 ");
+		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
+		break;
 	default:
 		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1446,6 +1663,7 @@ void LLScriptTouchEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		break;
 		break;
 	case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "touch");
 		if (scope->checkEntry(mCount->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1470,11 +1688,18 @@ void LLScriptTouchEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "touch";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
-			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "touch( int32 ");
+		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
+		break;
 	default:
 		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1504,6 +1729,7 @@ void LLScriptTouchEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 		break;
 		break;
 	case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "touch_end");
 		if (scope->checkEntry(mCount->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1528,11 +1754,18 @@ void LLScriptTouchEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "touch_end";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
-			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "touch_end( int32 ");
+		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
+		break;
 	default:
 		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1562,6 +1795,7 @@ void LLScriptCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSC
 		break;
 		break;
 	case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "collision_start");
 		if (scope->checkEntry(mCount->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1586,11 +1820,17 @@ void LLScriptCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSC
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "collision_start";
-			chunk->addBytes(name, (S32)strlen(name) + 1);		/*Flawfinder: ignore*/
-			chunk->addBytes(mCount->mName, (S32)strlen(mCount->mName) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, (S32)strlen(name) + 1);
+			chunk->addBytes(mCount->mName, (S32)strlen(mCount->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "collision_start( int32 ");
+		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1620,6 +1860,7 @@ void LLScriptCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		break;
 		break;
 	case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "collision");
 		if (scope->checkEntry(mCount->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1644,11 +1885,16 @@ void LLScriptCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "collision";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
-			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fprintf(fp, "collision( int32 ");
+		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1678,6 +1924,7 @@ void LLScriptCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRI
 		break;
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "collision_end");
 		if (scope->checkEntry(mCount->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1702,11 +1949,17 @@ void LLScriptCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRI
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "collision_end";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
-			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "collision_end( int32 ");
+		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mCount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1735,6 +1988,7 @@ void LLScriptLandCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize,
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "land_collision_start");
 		if (scope->checkEntry(mPosition->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1759,11 +2013,17 @@ void LLScriptLandCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize,
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "land_collision_start";
-			chunk->addBytes(name, strlen(name) + 1);		/*Flawfinder: ignore*/
-			chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "land_collision_start( class [ScriptTypes]LindenLab.SecondLife.Vector ");
+		mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1794,6 +2054,7 @@ void LLScriptLandCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCR
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "land_collision");
 		if (scope->checkEntry(mPosition->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1818,11 +2079,17 @@ void LLScriptLandCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCR
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "land_collision";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "land_collision( class [ScriptTypes]LindenLab.SecondLife.Vector ");
+		mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1852,6 +2119,7 @@ void LLScriptLandCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, L
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "land_collision_end");
 		if (scope->checkEntry(mPosition->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1875,12 +2143,18 @@ void LLScriptLandCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, L
 	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			char name[] = "land_collision_end";	/*Flawfinder: ignore*/
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);	/*Flawfinder: ignore*/
+			char name[] = "land_collision_end";
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "land_collision_end( class [ScriptTypes]LindenLab.SecondLife.Vector ");
+		mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1910,6 +2184,7 @@ void LLScriptInventoryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "changed");
 		if (scope->checkEntry(mChange->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1934,11 +2209,17 @@ void LLScriptInventoryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "changed";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mChange->mName, strlen(mChange->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mChange->mName, strlen(mChange->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "changed( int32 ");
+		mChange->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mChange->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -1967,6 +2248,7 @@ void LLScriptAttachEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "attach");
 		if (scope->checkEntry(mAttach->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -1991,11 +2273,17 @@ void LLScriptAttachEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "attach";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mAttach->mName, strlen(mAttach->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mAttach->mName, strlen(mAttach->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "attach( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mAttach->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )\n");
+		break;
 	default:
 		mAttach->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -2026,6 +2314,7 @@ void LLScriptDataserverEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "dataserver");
 		if (scope->checkEntry(mID->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2061,12 +2350,20 @@ void LLScriptDataserverEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "dataserver";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mID->mName, strlen(mID->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mData->mName, strlen(mData->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
+			chunk->addBytes(mData->mName, strlen(mData->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "dataserver( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mData->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mData->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2095,14 +2392,21 @@ void LLScriptTimerEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 	case LSCP_EMIT_ASSEMBLY:
 		fprintf(fp, "timer()\n");
 		break;
+        case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "timer");
+	  break;
+
 	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "timer";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fprintf(fp, "timer()");
+		break;
 	default:
 		break;
 	}
@@ -2126,14 +2430,21 @@ void LLScriptMovingStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIP
 		fdotabs(fp, tabs, tabsize);
 		fprintf(fp, "moving_start()\n");
 		break;
+        case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "moving_start");
+	  break;
+
 	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "moving_start";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fprintf(fp, "moving_start()");
+		break;
 	default:
 		break;
 	}
@@ -2157,14 +2468,21 @@ void LLScriptMovingEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		fdotabs(fp, tabs, tabsize);
 		fprintf(fp, "moving_end()\n");
 		break;
+        case LSCP_SCOPE_PASS1:
+          checkForDuplicateHandler(fp, this, scope, "moving_end");
+          break;
+
 	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "moving_end";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fprintf(fp, "moving_end()");
+		break;
 	default:
 		break;
 	}
@@ -2191,6 +2509,7 @@ void LLScriptRTPEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "run_time_perms");
 		if (scope->checkEntry(mRTPermissions->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2215,11 +2534,18 @@ void LLScriptRTPEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "chat";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mRTPermissions->mName, strlen(mRTPermissions->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mRTPermissions->mName, strlen(mRTPermissions->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		// NOTE: Not replicating LSL2 bug by calling RTP event hander "chat"
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "run_time_perms( int32 ");
+		mRTPermissions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mRTPermissions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -2254,6 +2580,7 @@ void LLScriptChatEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+		checkForDuplicateHandler(fp, this, scope, "listen"); // note: this is actually listen in lsl source
 		if (scope->checkEntry(mChannel->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2311,14 +2638,26 @@ void LLScriptChatEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "chat";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mName->mName, strlen(mName->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mID->mName, strlen(mID->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mMessage->mName, strlen(mMessage->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);
+			chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
+			chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
+			chunk->addBytes(mMessage->mName, strlen(mMessage->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "chat( int32 ");
+		mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mMessage->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2350,6 +2689,7 @@ void LLScriptSensorEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "sensor");
 		if (scope->checkEntry(mNumber->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2374,11 +2714,17 @@ void LLScriptSensorEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "sensor";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "sensor( int32 ");
+		mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -2407,6 +2753,7 @@ void LLScriptObjectRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "object_rez");
 		if (scope->checkEntry(mID->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2431,11 +2778,17 @@ void LLScriptObjectRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "sensor";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mID->mName, strlen(mID->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "object_rez( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -2468,6 +2821,7 @@ void LLScriptControlEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "control");
 		if (scope->checkEntry(mName->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2514,13 +2868,23 @@ void LLScriptControlEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "control";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mName->mName, strlen(mName->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mLevels->mName, strlen(mLevels->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mEdges->mName, strlen(mEdges->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
+			chunk->addBytes(mLevels->mName, strlen(mLevels->mName) + 1);
+			chunk->addBytes(mEdges->mName, strlen(mEdges->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "control( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", int32 ");
+		mLevels->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", int32 ");
+		mEdges->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mLevels->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2557,6 +2921,7 @@ void LLScriptLinkMessageEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIP
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "link_message");
 		if (scope->checkEntry(mSender->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2614,14 +2979,26 @@ void LLScriptLinkMessageEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIP
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "link_message";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mNum->mName, strlen(mNum->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mStr->mName, strlen(mStr->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mID->mName, strlen(mID->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);
+			chunk->addBytes(mNum->mName, strlen(mNum->mName) + 1);
+			chunk->addBytes(mStr->mName, strlen(mStr->mName) + 1);
+			chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "link_message( int32 ");
+		mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", int32 ");
+		mNum->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mStr->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mNum->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2663,6 +3040,7 @@ void LLScriptRemoteEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "remote_event");
 		if (scope->checkEntry(mType->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2742,16 +3120,32 @@ void LLScriptRemoteEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "remote_event";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mType->mName, strlen(mType->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mMessageID->mName, strlen(mMessageID->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mIntVal->mName, strlen(mIntVal->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mStrVal->mName, strlen(mStrVal->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mType->mName, strlen(mType->mName) + 1);
+			chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);
+			chunk->addBytes(mMessageID->mName, strlen(mMessageID->mName) + 1);
+			chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);
+			chunk->addBytes(mIntVal->mName, strlen(mIntVal->mName) + 1);
+			chunk->addBytes(mStrVal->mName, strlen(mStrVal->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "remote_event( int32 ");
+		mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mMessageID->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mSender->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", int32 ");
+		mIntVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mStrVal->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mChannel->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2784,7 +3178,7 @@ void LLScriptHTTPResponseEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRI
 		mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, ", integer ");
 		mStatus->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, ", list ");
+		fprintf(fp, ", class [mscorlib]System.Collections.ArrayList ");
 		mMetadata->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, ", string ");
 		mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2792,6 +3186,7 @@ void LLScriptHTTPResponseEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRI
 		break;
 		
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "http_response");
 		if (scope->checkEntry(mRequestId->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2857,15 +3252,26 @@ void LLScriptHTTPResponseEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRI
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "http_response";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mRequestId->mName, strlen(mRequestId->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mStatus->mName, strlen(mStatus->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mMetadata->mName, strlen(mMetadata->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mRequestId->mName, strlen(mRequestId->mName) + 1);
+			chunk->addBytes(mStatus->mName, strlen(mStatus->mName) + 1);
+			chunk->addBytes(mMetadata->mName, strlen(mMetadata->mName) + 1);
+			chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);
 #endif
 		}
 		break;
-		
+	case LSCP_EMIT_CIL_ASSEMBLY:
+	        fdotabs(fp, tabs, tabsize);
+   	        fprintf(fp, "http_response( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", int32 ");
+		mStatus->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", class [mscorlib]System.Collections.ArrayList ");
+		mMetadata->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )\n");
+		break;
 	default:
 		mRequestId->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mStatus->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2900,6 +3306,7 @@ void LLScriptMoneyEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "money");
 		if (scope->checkEntry(mName->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -2935,12 +3342,20 @@ void LLScriptMoneyEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "money";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mName->mName, strlen(mName->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mAmount->mName, strlen(mAmount->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
+			chunk->addBytes(mAmount->mName, strlen(mAmount->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "money( valuetype [ScriptTypes]LindenLab.SecondLife.Key ");
+		mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", int32 ");
+		mAmount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mName->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mAmount->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -2978,6 +3393,7 @@ void LLScriptEmailEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "email");
 		if (scope->checkEntry(mTime->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -3046,15 +3462,29 @@ void LLScriptEmailEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "email";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mTime->mName, strlen(mTime->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mAddress->mName, strlen(mAddress->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mSubject->mName, strlen(mSubject->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mTime->mName, strlen(mTime->mName) + 1);
+			chunk->addBytes(mAddress->mName, strlen(mAddress->mName) + 1);
+			chunk->addBytes(mSubject->mName, strlen(mSubject->mName) + 1);
+			chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);
+			chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "email( string ");
+		mTime->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mAddress->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mSubject->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", string ");
+		mBody->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", int32 ");
+		mNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mTime->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mAddress->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -3087,6 +3517,7 @@ void LLScriptRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "rez");
 		if (scope->checkEntry(mStartParam->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -3111,11 +3542,17 @@ void LLScriptRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "rez";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
-			chunk->addBytes(mStartParam->mName, strlen(mStartParam->mName) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mStartParam->mName, strlen(mStartParam->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "rez( int32 ");
+		mStartParam->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mStartParam->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -3143,14 +3580,20 @@ void LLScriptNoSensorEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 	case LSCP_EMIT_ASSEMBLY:
 		fprintf(fp, "no_sensor()\n");
 		break;
-	case LSCP_EMIT_BYTE_CODE:
+        case LSCP_SCOPE_PASS1:
+     	        checkForDuplicateHandler(fp, this, scope, "no_sensor");
+	        break;
+  	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "no_sensor";
-			chunk->addBytes(name, strlen(name) + 1); 		/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fprintf(fp, "no_sensor()");
+		break;
 	default:
 		break;
 	}
@@ -3181,6 +3624,7 @@ void LLScriptAtTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "at_target");
 		if (scope->checkEntry(mTargetNumber->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -3226,14 +3670,24 @@ void LLScriptAtTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			char name[] = "at_target";	/*Flawfinder: ignore*/
-			chunk->addBytes(name, strlen(name) + 1);	/*Flawfinder: ignore*/
-			chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1); 	/*Flawfinder: ignore*/
-			chunk->addBytes(mTargetPosition->mName, strlen(mTargetPosition->mName) + 1); 	/*Flawfinder: ignore*/
-			chunk->addBytes(mOurPosition->mName, strlen(mOurPosition->mName) + 1);		 	/*Flawfinder: ignore*/
+			char name[] = "at_target";
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);
+			chunk->addBytes(mTargetPosition->mName, strlen(mTargetPosition->mName) + 1);
+			chunk->addBytes(mOurPosition->mName, strlen(mOurPosition->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "at_target( int32 ");
+		mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Vector ");
+		mTargetPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Vector ");
+		mOurPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mTargetPosition->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -3265,14 +3719,21 @@ void LLScriptNotAtTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 	case LSCP_EMIT_ASSEMBLY:
 		fprintf(fp, "not_at_target()\n");
 		break;
+        case LSCP_SCOPE_PASS1:
+	        checkForDuplicateHandler(fp, this, scope, "not_at_target");
+	        break;
+
 	case LSCP_EMIT_BYTE_CODE:
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			char name[] = "not_at_target";	/*Flawfinder: ignore*/
-			chunk->addBytes(name, strlen(name) + 1); 	/*Flawfinder: ignore*/
+			char name[] = "not_at_target";
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fprintf(fp, "not_at_target()");
+		break;
 	default:
 		break;
 	}
@@ -3294,7 +3755,7 @@ void LLScriptAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 	case LSCP_PRETTY_PRINT:
 	case LSCP_EMIT_ASSEMBLY:
 		fdotabs(fp, tabs, tabsize);
-		fprintf(fp, "at_target( integer ");
+		fprintf(fp, "at_rot_target( integer ");
 		mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, ", quaternion ");
 		mTargetRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -3303,6 +3764,7 @@ void LLScriptAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		fprintf(fp, " )\n");
 		break;
 	case LSCP_SCOPE_PASS1:
+		checkForDuplicateHandler(fp, this, scope, "at_rot_target");
 		if (scope->checkEntry(mTargetNumber->mName))
 		{
 			gErrorToText.writeError(fp, this, LSERROR_DUPLICATE_NAME);
@@ -3349,13 +3811,23 @@ void LLScriptAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "at_rot_target";
-			chunk->addBytes(name, strlen(name) + 1); 	/*Flawfinder: ignore*/
-			chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1); 	/*Flawfinder: ignore*/
-			chunk->addBytes(mTargetRotation->mName, strlen(mTargetRotation->mName) + 1); 	/*Flawfinder: ignore*/
-			chunk->addBytes(mOurRotation->mName, strlen(mOurRotation->mName) + 1); 	/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
+			chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);
+			chunk->addBytes(mTargetRotation->mName, strlen(mTargetRotation->mName) + 1);
+			chunk->addBytes(mOurRotation->mName, strlen(mOurRotation->mName) + 1);
 #endif
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fdotabs(fp, tabs, tabsize);
+		fprintf(fp, "at_rot_target( int32 ");
+		mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Quaternion ");
+		mTargetRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, ", class [ScriptTypes]LindenLab.SecondLife.Quaternion ");
+		mOurRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, " )");
+		break;
 	default:
 		mTargetNumber->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mTargetRotation->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -3391,10 +3863,17 @@ void LLScriptNotAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
 		{
 #ifdef LSL_INCLUDE_DEBUG_INFO
 			char name[] = "not_at_rot_target";
-			chunk->addBytes(name, strlen(name) + 1);	 	/*Flawfinder: ignore*/
+			chunk->addBytes(name, strlen(name) + 1);
 #endif
 		}
 		break;
+        case LSCP_SCOPE_PASS1:
+	  checkForDuplicateHandler(fp, this, scope, "not_at_rot_target");
+	  break;
+
+	case LSCP_EMIT_CIL_ASSEMBLY:
+		fprintf(fp, "not_at_rot_target()");
+		break;
 	default:
 		break;
 	}
@@ -3563,6 +4042,25 @@ S32 LLScriptForExpressionList::getSize()
 	return 0;
 }
 
+// CIL code generation requires both caller and callee scope entries, so cannot use normal recurse signature.
+// TODO: Refactor general purpose recurse calls in to pass specific virtuals using visitor pattern to select method by pass and node type.
+static void print_cil_func_expression_list(LLScriptFuncExpressionList* self, LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata, LLScriptScopeEntry *callee_entry)
+{
+	self->mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+	LSCRIPTType argtype = callee_entry->mFunctionArgs.getType(entrycount);
+	if (argtype != self->mFirstp->mReturnType)
+	{
+		print_cil_cast(fp, self->mFirstp->mReturnType, argtype);
+	}
+	entrycount++;
+	if (self->mSecondp)
+	{
+		llassert(LET_FUNC_EXPRESSION_LIST == self->mSecondp->mType);
+		print_cil_func_expression_list((LLScriptFuncExpressionList*) self->mSecondp, fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL, callee_entry);
+
+	}
+}
+
 void LLScriptFuncExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -3660,31 +4158,6 @@ void LLScriptFuncExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCR
 			}
 		}
 		break;
-	/* TODO: Fix conflict between global/local variable determination needing caller scope and cast determination here needs callee scope...
-	case LSCP_EMIT_CIL_ASSEMBLY:
-		{
-			mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			LSCRIPTType argtype = entry->mFunctionArgs.getType(entrycount);
-			if (argtype != mFirstp->mReturnType)
-			{
-				print_cil_cast(fp, mFirstp->mReturnType, argtype);
-			}
-			entrycount++;
-			if (mSecondp)
-			{
-				mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-				if (mSecondp->mReturnType)
-				{
-					argtype = entry->mFunctionArgs.getType(entrycount);
-					if (argtype != mSecondp->mReturnType)
-					{
-						print_cil_cast(fp, mFirstp->mReturnType, argtype);
-					}
-				}
-			}
-		}
-		break;
-		*/
 	default:
 		mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		if (mSecondp)
@@ -3753,8 +4226,13 @@ void LLScriptListExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCR
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		// Evaluate expressions in reverse order so first expression is on top of stack.
-		// Results can then be popped and appended to list to result in list with correct order.
+		mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		if (mFirstp->mType != LET_LIST_EXPRESSION_LIST)
+		{
+			// Box value.
+			print_cil_box(fp, mFirstp->mReturnType);
+			++count;
+		}
 		if (mSecondp)
 		{
 			mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -3762,18 +4240,9 @@ void LLScriptListExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCR
 			{
 				// Box value.
 				print_cil_box(fp, mSecondp->mReturnType);
-
 				++count;
 			}
 		}
-		mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		if (mFirstp->mType != LET_LIST_EXPRESSION_LIST)
-		{
-			// Box value.
-			print_cil_box(fp, mFirstp->mReturnType);
-
-			++count;
-		}
 		break;
 	default:
 		mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -3793,14 +4262,22 @@ S32 LLScriptListExpressionList::getSize()
 // Returns true if identifier is a parameter and false if identifier is a local variable within function_scope.
 bool is_parameter(LLScriptIdentifier* identifier, LLScriptScopeEntry* function_scope)
 {
-	// Function offset stores offset of first local.
-	// Compare variable offset with function offset to
-	// determine whether variable is local or parameter.
-	return (identifier->mScopeEntry->mOffset < function_scope->mOffset);
+	// Function stores offset of first local.
+	if(0 == function_scope->mOffset)
+	{
+		// Function offset 0 -> no parameters -> identifier is a local.
+		return false;
+	}
+	else
+	{
+		// Compare variable offset with function offset to
+		// determine whether variable is local or parameter.
+		return (identifier->mScopeEntry->mOffset < function_scope->mOffset);
+	}
 }
 
 // If assignment is to global variable, pushes this pointer on to stack.
-void print_cil_load_address(LLFILE* fp, LLScriptExpression* exp, LLScriptScopeEntry* function_scope)
+static void print_cil_load_address(LLFILE* fp, LLScriptExpression* exp, LLScriptScopeEntry* function_scope)
 {
 	LLScriptLValue *lvalue = (LLScriptLValue *) exp;
 	LLScriptIdentifier *ident = lvalue->mIdentifier;
@@ -3811,7 +4288,7 @@ void print_cil_load_address(LLFILE* fp, LLScriptExpression* exp, LLScriptScopeEn
 		fprintf(fp, "ldarg.0\n");
 	}
 
-	// If accessor, load address of object.
+	// If accessor, load value type address, consumed by ldfld.
 	if(lvalue->mAccessor)
 	{
 		if(ident->mScopeEntry->mIDType == LIT_VARIABLE)
@@ -3819,7 +4296,7 @@ void print_cil_load_address(LLFILE* fp, LLScriptExpression* exp, LLScriptScopeEn
 			if(is_parameter(ident, function_scope))
 			{
 				// Parameter, load by name.
-				fprintf(fp, "ldarga.s %s\n", ident->mScopeEntry->mIdentifier);
+				fprintf(fp, "ldarga.s '%s'\n", ident->mScopeEntry->mIdentifier);
 			}
 			else
 			{
@@ -3830,13 +4307,13 @@ void print_cil_load_address(LLFILE* fp, LLScriptExpression* exp, LLScriptScopeEn
 		else if (ident->mScopeEntry->mIDType == LIT_GLOBAL)
 		{
 			fprintf(fp, "ldflda ");
-			print_cil_type(fp, ident->mScopeEntry->mType);
-			fprintf(fp, " LSL::%s\n", ident->mScopeEntry->mIdentifier);
+			print_cil_member(fp, ident);
 		}
 	}
 }
 
-void print_cil_accessor(LLFILE* fp, LLScriptLValue *lvalue)
+static void print_cil_accessor(LLFILE* fp, LLScriptLValue *lvalue)
+
 {
 	LLScriptIdentifier *ident = lvalue->mIdentifier;
 	print_cil_type(fp, lvalue->mReturnType);
@@ -3845,12 +4322,6 @@ void print_cil_accessor(LLFILE* fp, LLScriptLValue *lvalue)
 	fprintf(fp, "::%s\n", lvalue->mAccessor->mName);
 }
 
-void print_cil_member(LLFILE* fp, LLScriptIdentifier *ident)
-{
-	print_cil_type(fp, ident->mScopeEntry->mType);
-	fprintf(fp, " LSL::%s\n", ident->mScopeEntry->mIdentifier);
-}
-
 void LLScriptLValue::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -4106,7 +4577,7 @@ void LLScriptLValue::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 			if(is_parameter(mIdentifier, entry))
 			{
 				// Parameter, load by name.
-				fprintf(fp, "ldarg.s %s\n", mIdentifier->mScopeEntry->mIdentifier);
+				fprintf(fp, "ldarg.s '%s'\n", mIdentifier->mScopeEntry->mIdentifier);
 			}
 			else
 			{
@@ -4136,7 +4607,7 @@ S32 LLScriptLValue::getSize()
 	return 0;
 }
 
-void print_asignment(LLFILE *fp, LLScriptExpression *exp)
+static void print_assignment(LLFILE *fp, LLScriptExpression *exp)
 {
 	LLScriptLValue *lvalue = (LLScriptLValue *)exp;
 	LLScriptIdentifier *ident = lvalue->mIdentifier;
@@ -4164,7 +4635,7 @@ void print_asignment(LLFILE *fp, LLScriptExpression *exp)
 	}
 }
 
-void print_cil_asignment(LLFILE *fp, LLScriptExpression *exp, LLScriptScopeEntry* function_scope)
+static void print_cil_assignment(LLFILE *fp, LLScriptExpression *exp, LLScriptScopeEntry* function_scope)
 {
 	LLScriptLValue *lvalue = (LLScriptLValue *) exp;
 	LLScriptIdentifier *ident = lvalue->mIdentifier;
@@ -4191,7 +4662,7 @@ void print_cil_asignment(LLFILE *fp, LLScriptExpression *exp, LLScriptScopeEntry
 			if(is_parameter(ident, function_scope))
 			{
 				// Parameter, store by name.
-				fprintf(fp, "starg.s %s\n", ident->mScopeEntry->mIdentifier);
+				fprintf(fp, "starg.s '%s'\n", ident->mScopeEntry->mIdentifier);
 			}
 			else
 			{
@@ -4319,14 +4790,6 @@ void store2stack(LLScriptExpression *exp, LLScriptExpression *lv, LLScriptByteCo
 	chunk->addInteger(address);
 }
 
-void print_cil_numeric_cast(LLFILE* fp, LSCRIPTType currentArg, LSCRIPTType otherArg)
-{
-	if((currentArg == LST_INTEGER) && (otherArg == LST_FLOATINGPOINT))
-	{
-		print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
-	}
-}
-
 void LLScriptAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -4344,7 +4807,7 @@ void LLScriptAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		{
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			print_cast(fp, mReturnType, mRightType);
-			print_asignment(fp, mLValue);
+			print_assignment(fp, mLValue);
 		}
 		break;
 	case LSCP_TYPE:
@@ -4370,8 +4833,8 @@ void LLScriptAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		{
 			print_cil_load_address(fp, mLValue, entry);
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			print_cil_numeric_cast(fp, mRightType, mReturnType);
-			print_cil_asignment(fp, mLValue, entry);
+			print_cil_assignment_cast(fp, mRightType, mReturnType);
+			print_cil_assignment(fp, mLValue, entry);
 		}
 		break;
 	default:
@@ -4387,8 +4850,15 @@ S32 LLScriptAssignment::getSize()
 	return 0;
 }
 
-void print_cil_add(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
+static void print_cil_add(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 {
+	if(LST_LIST == right_type && LST_LIST != left_type)
+	{
+		print_cil_box(fp, left_type);
+		fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Prepend(class [mscorlib]System.Collections.ArrayList, object)\n");
+		return;
+	}
+
 	switch(left_type)
 	{
 	case LST_INTEGER:
@@ -4402,27 +4872,49 @@ void print_cil_add(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 	case LST_KEY:
 
 		// String concatenation.
-		fprintf(fp, "call string valuetype [mscorlib]System.String::Concat(string, string)");
+		fprintf(fp, "call string valuetype [LslUserScript]LindenLab.SecondLife.LslUserScript::Add(string, string)\n");
 		break;
 	
 	case LST_VECTOR:
 
 		// Vector addition.
-		// TODO: Inline (requires temporary variables, which must be identified in earlier pass).
-		fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'add_vec'(valuetype [LScriptLibrary]LLVector, valuetype [LScriptLibrary]LLVector)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Add'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 		break;
 
 	case LST_QUATERNION:
 
 		// Rotation addition.
-		// TODO: Inline (requires temporary variables, which must be identified in earlier pass).
-		fprintf(fp, "call valuetype [LScriptLibrary]LLQuaternion valuetype [LScriptLibrary]LLQuaternion::'add_quat'(valuetype [LScriptLibrary]LLQuaternion, valuetype [LScriptLibrary]LLQuaternion)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Add'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
 		break;
 
 	case LST_LIST:
-		print_cil_box(fp, right_type);
-		fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LScriptLibrary]LScriptInternal::AddReturnList(class [mscorlib]System.Collections.ArrayList, object)\n");
-		break;
+		switch(right_type)
+		{
+		case LST_LIST:
+			// Concatenate lists.
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
+			break;
+		case LST_INTEGER:
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(int32, class [mscorlib]System.Collections.ArrayList)\n");
+			break;
+		case LST_FLOATINGPOINT:
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(float32, class [mscorlib]System.Collections.ArrayList)\n");
+			break;
+		case LST_STRING:
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(string, class [mscorlib]System.Collections.ArrayList)\n");
+			break;
+		case LST_KEY:
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(valuetype [ScriptTypes]LindenLab.SecondLife.Key, class [mscorlib]System.Collections.ArrayList)\n");
+			break;			
+		case LST_VECTOR:
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(valuetype [ScriptTypes]LindenLab.SecondLife.Vector, class [mscorlib]System.Collections.ArrayList)\n");
+			break;
+		case LST_QUATERNION:
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Append(valuetype [ScriptTypes]LindenLab.SecondLife.Quaternion, class [mscorlib]System.Collections.ArrayList)\n");
+			break;
+		default:
+			break;
+		}
 
 	default:
 		break;
@@ -4447,7 +4939,7 @@ void LLScriptAddAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "ADD %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
-			print_asignment(fp, mLValue);
+			print_assignment(fp, mLValue);
 		}
 		break;
 	case LSCP_TYPE:
@@ -4475,12 +4967,12 @@ void LLScriptAddAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
 			print_cil_load_address(fp, mLValue, entry);
-			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
+			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			print_cil_add(fp, mLValue->mReturnType, mRightSide->mReturnType);
-			print_cil_asignment(fp, mLValue, entry);
+			print_cil_assignment(fp, mLValue, entry);
 		}
 		break;
 	default:
@@ -4496,29 +4988,30 @@ S32 LLScriptAddAssignment::getSize()
 	return 0;
 }
 
-void print_cil_sub(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
+static void print_cil_sub(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 {
 	switch(left_type)
 	{
 	case LST_INTEGER:
+		if(LST_INTEGER == right_type)
+		{	
+			fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Subtract(int32, int32)\n");
+			break;
+		}
 	case LST_FLOATINGPOINT:
-
 		// Numeric subtraction.
-		fprintf(fp, "sub\n");
+		fprintf(fp, "call float64 [LslUserScript]LindenLab.SecondLife.LslUserScript::Subtract(float64, float64)\n");
 		break;
-	
 	case LST_VECTOR:
 
 		// Vector subtraction.
-		// TODO: Inline (requires temporary variables, which must be identified in earlier pass).
-		fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'subtract_vec'(valuetype [LScriptLibrary]LLVector, valuetype [LScriptLibrary]LLVector)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Subtract'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 		break;
 
 	case LST_QUATERNION:
 
 		// Rotation subtraction.
-		// TODO: Inline (requires temporary variables, which must be identified in earlier pass).
-		fprintf(fp, "call valuetype [LScriptLibrary]LLQuaternion valuetype [LScriptLibrary]LLQuaternion::'subtract_quat'(valuetype [LScriptLibrary]LLQuaternion, valuetype [LScriptLibrary]LLQuaternion)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Subtract'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
 		break;
 
 	default:
@@ -4546,7 +5039,7 @@ void LLScriptSubAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "SUB %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
-			print_asignment(fp, mLValue);
+			print_assignment(fp, mLValue);
 		}
 		break;
 	case LSCP_TYPE:
@@ -4574,12 +5067,12 @@ void LLScriptSubAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
 			print_cil_load_address(fp, mLValue, entry);
-			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
+			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			print_cil_sub(fp, mLValue->mReturnType, mRightSide->mReturnType);
-			print_cil_asignment(fp, mLValue, entry);
+			print_cil_assignment(fp, mLValue, entry);
 		}
 		break;
 	default:
@@ -4595,41 +5088,93 @@ S32 LLScriptSubAssignment::getSize()
 	return 0;
 }
 
-void print_cil_mul(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
+static void print_cil_neg(LLFILE* fp, LSCRIPTType type)
 {
-	switch(left_type)
+        switch(type)
 	{
 	case LST_INTEGER:
 	case LST_FLOATINGPOINT:
+	  fprintf(fp, "neg\n");
+	  break;
+	case LST_VECTOR:
+	  fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Negate'(class [ScriptTypes]LindenLab.SecondLife.Vector)\n");	  
+	  break;
+	case LST_QUATERNION:
+	  fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Negate'(class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");	  
+	  break;
+	default:
+	  break;
+	}
+}
 
-		// Numeric multiplication.
-		fprintf(fp, "mul\n");
+static void print_cil_mul(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
+{
+	switch(left_type)
+	{
+	case LST_INTEGER:
+
+		switch(right_type)
+		{
+		case LST_INTEGER:
+		case LST_FLOATINGPOINT:
+
+			// Numeric multiplication.
+			fprintf(fp, "mul\n");
+			break;
+
+		case LST_VECTOR:
+
+			// Vector scaling.
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Vector, float32)\n");
+			break;
+		default:
+			break;
+		}
 		break;
-	
-	case LST_VECTOR:
+
+	case LST_FLOATINGPOINT:
 
 		switch(right_type)
 		{
 		case LST_INTEGER:
+		case LST_FLOATINGPOINT:
 
-			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
+			// Numeric multiplication.
+			fprintf(fp, "mul\n");
+			break;
+
+		case LST_VECTOR:
 
+			// Vector scaling.
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Vector, float32)\n");
+			break;
+
+		default:
+			break;
+		}
+		break;
+		
+	case LST_VECTOR:
+
+		switch(right_type)
+		{
+		case LST_INTEGER:
 		case LST_FLOATINGPOINT:
 
 			// Vector scaling.
-			fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'multiply_float'(valuetype [LScriptLibrary]LLVector, float32)\n");
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(float32, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 			break;
 
 		case LST_VECTOR:
 
 			// Dot product.
-			fprintf(fp, "call float32 valuetype [LScriptLibrary]LLVector::'multiply_vec'(valuetype [LScriptLibrary]LLVector, valuetype [LScriptLibrary]LLVector)\n");
+			fprintf(fp, "call float32 class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 			break;
 
 		case LST_QUATERNION:
 
 			// Vector rotation.
-			fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'multiply_quat'(valuetype [LScriptLibrary]LLVector, valuetype [LScriptLibrary]LLQuaternion)\n");
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 			break;
 
 		default:
@@ -4640,7 +5185,7 @@ void print_cil_mul(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 	case LST_QUATERNION:
 
 		// Rotation multiplication.
-		fprintf(fp, "call valuetype [LScriptLibrary]LLQuaternion valuetype [LScriptLibrary]LLQuaternion::'multiply_quat'(valuetype [LScriptLibrary]LLQuaternion, valuetype [LScriptLibrary]LLQuaternion)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Multiply'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
 		break;
 
 	default:
@@ -4668,7 +5213,7 @@ void LLScriptMulAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "MUL %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
-			print_asignment(fp, mLValue);
+			print_assignment(fp, mLValue);
 		}
 		break;
 	case LSCP_TYPE:
@@ -4677,7 +5222,7 @@ void LLScriptMulAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			mLeftType = type;
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mRightType = type;
-			if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType))
+			if (!legal_binary_expression(mReturnType, mLeftType, mRightType, mType) /*|| !legal_assignment(mLValue->mReturnType, mReturnType)*/)
 			{
 				gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
 			}
@@ -4696,12 +5241,17 @@ void LLScriptMulAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
 			print_cil_load_address(fp, mLValue, entry);
-			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
+			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			print_cil_mul(fp, mLValue->mReturnType, mRightSide->mReturnType);
-			print_cil_asignment(fp, mLValue, entry);
+			if((mLValue->mReturnType == LST_INTEGER) && 
+			   (mRightSide->mReturnType == LST_FLOATINGPOINT))
+			{
+			    print_cil_cast(fp, LST_FLOATINGPOINT, LST_INTEGER);
+			} 
+			print_cil_assignment(fp, mLValue, entry);
 		}
 		break;
 	default:
@@ -4717,15 +5267,20 @@ S32 LLScriptMulAssignment::getSize()
 	return 0;
 }
 
-void print_cil_div(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
+static void print_cil_div(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 {
 	switch(left_type)
 	{
 	case LST_INTEGER:
+		if(LST_INTEGER == right_type)
+		{
+			fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Divide(int32, int32)\n");
+			break;
+		}
 	case LST_FLOATINGPOINT:
 
-		// Numeric addition.
-		fprintf(fp, "div\n");
+		// Numeric division.
+		fprintf(fp, "call float64 [LslUserScript]LindenLab.SecondLife.LslUserScript::Divide(float64, float64)\n");
 		break;
 	
 	case LST_VECTOR:
@@ -4733,19 +5288,16 @@ void print_cil_div(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 		switch(right_type)
 		{
 		case LST_INTEGER:
-
-			print_cil_cast(fp, LST_INTEGER, LST_FLOATINGPOINT);
-
 		case LST_FLOATINGPOINT:
 
 			// Scale.
-			fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'divide_float'(valuetype [LScriptLibrary]LLVector, float32)\n");
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Divide'(float32, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 			break;
 
 		case LST_QUATERNION:
 
 			// Inverse rotation.
-			fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'divide_quat'(valuetype [LScriptLibrary]LLVector, valuetype [LScriptLibrary]LLQuaternion)\n");
+			fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Divide'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 			break;
 
 		default:
@@ -4755,7 +5307,7 @@ void print_cil_div(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 
 	case LST_QUATERNION:
 
-		fprintf(fp, "call valuetype [LScriptLibrary]LLQuaternion valuetype [LScriptLibrary]LLQuaternion::'divide_quat'(valuetype [LScriptLibrary]LLQuaternion, valuetype [LScriptLibrary]LLQuaternion)\n");		
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Divide'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");		
 		break;
 
 	default:
@@ -4783,7 +5335,7 @@ void LLScriptDivAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "DIV %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
-			print_asignment(fp, mLValue);
+			print_assignment(fp, mLValue);
 		}
 		break;
 	case LSCP_TYPE:
@@ -4811,12 +5363,12 @@ void LLScriptDivAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
 			print_cil_load_address(fp, mLValue, entry);
-			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			print_cil_numeric_cast(fp, mRightSide->mReturnType, mLValue->mReturnType);
+			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_numeric_cast(fp, mLValue->mReturnType, mRightSide->mReturnType);
 			print_cil_div(fp, mLValue->mReturnType, mRightSide->mReturnType);
-			print_cil_asignment(fp, mLValue, entry);
+			print_cil_assignment(fp, mLValue, entry);
 		}
 		break;
 	default:
@@ -4832,20 +5384,20 @@ S32 LLScriptDivAssignment::getSize()
 	return 0;
 }
 
-void print_cil_mod(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
+static void print_cil_mod(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 {
 	switch(left_type)
 	{
 	case LST_INTEGER:
 
 		// Numeric remainder.
-		fprintf(fp, "rem\n");
+		fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Modulo(int32, int32)\n");
 		break;
 	
 	case LST_VECTOR:
 
 		// Vector cross product.
-		fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'mod_vec'(valuetype [LScriptLibrary]LLVector, valuetype [LScriptLibrary]LLVector)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'Modulo'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 		break;
 
 	default:
@@ -4873,7 +5425,7 @@ void LLScriptModAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "MOD %s, %s\n", LSCRIPTTypeNames[mRightType], LSCRIPTTypeNames[mLeftType]);
-			print_asignment(fp, mLValue);
+			print_assignment(fp, mLValue);
 		}
 		break;
 	case LSCP_TYPE:
@@ -4901,10 +5453,10 @@ void LLScriptModAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
 			print_cil_load_address(fp, mLValue, entry);
-			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			mLValue->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			print_cil_mod(fp, mLValue->mReturnType, mRightSide->mReturnType);
-			print_cil_asignment(fp, mLValue, entry);
+			print_cil_assignment(fp, mLValue, entry);
 		}
 		break;
 	default:
@@ -4920,9 +5472,10 @@ S32 LLScriptModAssignment::getSize()
 	return 0;
 }
 
-void print_cil_eq(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
+static void print_cil_eq(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 {
-	switch(left_type)
+	
+	switch(right_type)
 	{
 	case LST_INTEGER:
 	case LST_FLOATINGPOINT:
@@ -4932,26 +5485,36 @@ void print_cil_eq(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type)
 		break;
 
 	case LST_STRING:
-	case LST_KEY:
-
+	        // NOTE: babbage: strings and keys can be compared, so a cast
+	        // may be required
+	        print_cil_cast(fp, left_type, right_type);
 		// String equality.
 		fprintf(fp, "call bool valuetype [mscorlib]System.String::op_Equality(string, string)\n");
 		break;
+		
+	case LST_KEY:
+	        // NOTE: babbage: strings and keys can be compared, so a cast 
+	        // may be required
+	        print_cil_cast(fp, left_type, right_type);
+
+		// Key equality.
+		fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(valuetype [ScriptTypes]LindenLab.SecondLife.Key, valuetype [ScriptTypes]LindenLab.SecondLife.Key)\n");
+		break;
 	
 	case LST_VECTOR:
 
 		// Vector equality.
-		fprintf(fp, "call bool [LScriptLibrary]LLVector::'equals_vec'(valuetype [LScriptLibrary]LLVector, valuetype [LScriptLibrary]LLVector)\n");
+		fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
 		break;
 
 	case LST_QUATERNION:
 
 		// Rotation equality.
-		fprintf(fp, "call bool [LScriptLibrary]LLQuaternion::'equals_quat'(valuetype [LScriptLibrary]LLQuaternion, valuetype [LScriptLibrary]LLQuaternion)\n");
+		fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
 		break;
 
 	case LST_LIST:
-		fprintf(fp, "call bool [LScriptLibrary]LScriptInternal::EqualsList(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
+		fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::Equals(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
 		break;
 
 	default:
@@ -5002,10 +5565,10 @@ void LLScriptEquality::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		print_cil_eq(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		break;
 	default:
@@ -5063,10 +5626,19 @@ void LLScriptNotEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "ceq\n");
-		fprintf(fp, "ldc.i4.0\n");
-		fprintf(fp, "ceq\n"); // Compare result of first compare equal with 0 to get compare not equal.
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
+		if (LST_LIST == mLeftSide->mReturnType)
+		{
+		    fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::NotEquals(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
+		}
+		else
+		{  
+		    print_cil_eq(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
+		    fprintf(fp, "ldc.i4.0\n");
+		    fprintf(fp, "ceq\n"); // Compare result of first compare equal with 0 to get compare not equal.
+		}    
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5081,6 +5653,14 @@ S32 LLScriptNotEquals::getSize()
 	return 0;
 }
 
+static void print_cil_lte(LLFILE* fp)
+{
+	// NOTE: LSL pushes operands backwards, so <= becomes >=
+	fprintf(fp, "clt\n");
+	fprintf(fp, "ldc.i4.0\n");
+	fprintf(fp, "ceq\n");
+}
+
 void LLScriptLessEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -5122,11 +5702,11 @@ void LLScriptLessEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "cgt\n"); // Test greater than.
-		fprintf(fp, "ldc.i4.0\n"); // Use (b == 0) implementation of boolean not.
-		fprintf(fp, "ceq\n"); // Apply boolean not to greater than. If not greater than, then less or equal.
+		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
+		print_cil_lte(fp);
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5141,6 +5721,14 @@ S32 LLScriptLessEquals::getSize()
 	return 0;
 }
 
+static void print_cil_gte(LLFILE* fp)
+{   
+	// NOTE: LSL pushes operands backwards, so >= becomes <=
+	fprintf(fp, "cgt\n");
+	fprintf(fp, "ldc.i4.0\n");
+	fprintf(fp, "ceq\n");
+}
+
 void LLScriptGreaterEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -5182,11 +5770,11 @@ void LLScriptGreaterEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "clt\n"); // Test less than.
-		fprintf(fp, "ldc.i4.0\n"); // Use (b == 0) implementation of boolean not.
-		fprintf(fp, "ceq\n"); // Apply boolean not to less than. If not less than, then greater or equal.
+		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
+		print_cil_gte(fp);
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5201,6 +5789,12 @@ S32 LLScriptGreaterEquals::getSize()
 	return 0;
 }
 
+static void print_cil_lt(LLFILE* fp)
+{
+	// NOTE: LSL pushes operands backwards, so < becomes >
+	fprintf(fp, "cgt\n");
+}
+
 void LLScriptLessThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -5242,9 +5836,11 @@ void LLScriptLessThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "clt\n");
+		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
+		print_cil_lt(fp);
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5259,6 +5855,12 @@ S32 LLScriptLessThan::getSize()
 	return 0;
 }
 
+static void print_cil_gt(LLFILE* fp)
+{   
+    // NOTE: LSL pushes operands backwards, so > becomes <
+	fprintf(fp, "clt\n");
+}
+
 void LLScriptGreaterThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -5300,9 +5902,11 @@ void LLScriptGreaterThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "cgt\n");
+		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
+		print_cil_gt(fp);
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5358,10 +5962,10 @@ void LLScriptPlus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		print_cil_add(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		break;
 	default:
@@ -5418,10 +6022,10 @@ void LLScriptMinus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		print_cil_sub(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		break;
 	default:
@@ -5478,10 +6082,10 @@ void LLScriptTimes::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		print_cil_mul(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		break;
 	default:
@@ -5538,10 +6142,10 @@ void LLScriptDivide::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		print_cil_numeric_cast(fp, mRightSide->mReturnType, mLeftSide->mReturnType);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_numeric_cast(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		print_cil_div(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		break;
 	default:
@@ -5598,8 +6202,8 @@ void LLScriptMod::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		print_cil_mod(fp, mLeftSide->mReturnType, mRightSide->mReturnType);
 		break;
 	default:
@@ -5654,8 +6258,8 @@ void LLScriptBitAnd::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, "and\n");
 		break;
 	default:
@@ -5710,8 +6314,8 @@ void LLScriptBitOr::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, "or\n");
 		break;
 	default:
@@ -5766,8 +6370,8 @@ void LLScriptBitXor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, "xor\n");
 		break;
 	default:
@@ -5822,9 +6426,15 @@ void LLScriptBooleanAnd::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "and\n");
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
+		fprintf(fp, "or\n");
+                fprintf(fp, "ldc.i4.0\n");
+                fprintf(fp, "ceq\n");
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5881,6 +6491,10 @@ void LLScriptBooleanOr::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, "or\n");
+                fprintf(fp, "ldc.i4.0\n");
+                fprintf(fp, "ceq\n");
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5934,9 +6548,9 @@ void LLScriptShiftLeft::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "shl\n");
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::ShiftLeft(int32, int32)\n");
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -5991,9 +6605,9 @@ void LLScriptShiftRight::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		mRightSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "shr\n");
+		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		fprintf(fp, "call int32 [LslUserScript]LindenLab.SecondLife.LslUserScript::ShiftRight(int32, int32)\n");
 		break;
 	default:
 		mLeftSide->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -6076,6 +6690,12 @@ void LLScriptUnaryMinus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
 			chunk->addByte(typebyte);
 		}
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+	    {
+			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_neg(fp, mLeftType);
+	    }
+	    break;
 	default:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -6219,7 +6839,7 @@ void LLScriptPreIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
-			print_asignment(fp, mExpression);
+			print_assignment(fp, mExpression);
 		}
 		break;
 	case LSCP_TYPE:
@@ -6266,21 +6886,21 @@ void LLScriptPreIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			print_cil_load_address(fp, mExpression, entry);
 			if (mReturnType == LST_INTEGER)
 			{
-				fprintf(fp, "ldc.i4.1\n");
 				mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+				fprintf(fp, "ldc.i4.1\n");
 				fprintf(fp, "add\n");
 			}
 			else if (mReturnType == LST_FLOATINGPOINT)
 			{
-				fprintf(fp, "ldc.r8.1\n");
 				mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+				fprintf(fp, "ldc.r8 1\n");
 				fprintf(fp, "add\n");
 			}
 			else
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
-			print_cil_asignment(fp, mExpression, entry);
+			print_cil_assignment(fp, mExpression, entry);
 		}
 		break;
 	default:
@@ -6327,7 +6947,7 @@ void LLScriptPreDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
-			print_asignment(fp, mExpression);
+			print_assignment(fp, mExpression);
 		}
 		break;
 	case LSCP_TYPE:
@@ -6374,21 +6994,21 @@ void LLScriptPreDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			print_cil_load_address(fp, mExpression, entry);
 			if (mReturnType == LST_INTEGER)
 			{
-				fprintf(fp, "ldc.i4.1\n");
 				mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+				fprintf(fp, "ldc.i4.1\n");
 				fprintf(fp, "sub\n");
 			}
 			else if (mReturnType == LST_FLOATINGPOINT)
 			{
-				fprintf(fp, "ldc.r8.1\n");
 				mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+				fprintf(fp, "ldc.r8 1\n");
 				fprintf(fp, "sub\n");
 			}
 			else
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
-			print_cil_asignment(fp, mExpression, entry);
+			print_cil_assignment(fp, mExpression, entry);
 		}
 		break;
 	default:
@@ -6555,7 +7175,7 @@ void LLScriptVectorInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRI
 			print_cil_cast(fp, mExpression3->mReturnType, LST_FLOATINGPOINT);
 		}
 		// Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
-		fprintf(fp, "call valuetype [LScriptLibrary]LLVector valuetype [LScriptLibrary]LLVector::'create'(float32, float32, float32)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
 		break;
 	default:
 		mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -6696,7 +7316,7 @@ void LLScriptQuaternionInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, L
 		}
 
 		// Call named ctor, which leaves new Vector on stack, so it can be saved in to local or argument just like a primitive type.
-		fprintf(fp, "call valuetype [LScriptLibrary]LLQuaternion valuetype [LScriptLibrary]LLQuaternion::'create'(float32, float32, float32, float32)\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
 		break;
 	default:
 		mExpression1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -6743,14 +7363,15 @@ void LLScriptListInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 		mReturnType = type = LST_LIST;
 		break;
 	case LSCP_TO_STACK:
+	{
 		if (mExpressionList)
 		{
 			pass = LSCP_TO_STACK;
-			count = 0;
-			mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			U64 list_element_count = 0;
+			mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, list_element_count, chunk, heap, stacksize, entry, entrycount, NULL);
 			chunk->addByte(LSCRIPTOpCodes[LOPC_STACKTOL]);
-			chunk->addInteger((S32)count);
-			count = 0;
+			chunk->addInteger((S32)list_element_count);
+			
 		}
 		else
 		{
@@ -6758,26 +7379,26 @@ void LLScriptListInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 			chunk->addInteger(0);
 		}
 		break;
+	}
 	case LSCP_EMIT_CIL_ASSEMBLY:
-
+	{
 		// Push boxed elements on stack.
-		count = 0;
+		U64 list_element_count = 0;
 		if (mExpressionList)
 		{
-			mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, list_element_count, chunk, heap, stacksize, entry, entrycount, NULL);
 		}
 
-		// Create list on stack, consuming first boxed element.
-		fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LScriptLibrary]LScriptInternal::CreateList()\n");
+		// Create list on stack.
+		fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
 
-		// Call AddReturnList to add remaining boxed expressions.
-		for(U64 i = 0; i < count; i++)
+		// Call Prepend to add remaining boxed expressions.
+		for(U64 i = 0; i < list_element_count; i++)
 		{
-			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LScriptLibrary]LScriptInternal::AddReturnList(object, class [mscorlib]System.Collections.ArrayList)\n");
+			fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::Prepend(object, class [mscorlib]System.Collections.ArrayList)\n");
 		}
-		count = 0;
-		
 		break;
+	}
 	default:
 		if (mExpressionList)
 		{
@@ -6824,7 +7445,7 @@ void LLScriptPostIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
-			print_asignment(fp, mExpression);
+			print_assignment(fp, mExpression);
 			fprintf(fp, "%s\n", LSCRIPTTypePop[mReturnType]);
 		}
 		break;
@@ -6893,24 +7514,34 @@ void LLScriptPostIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
+			// Push original value on to stack.
+			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+
+			// Load address if needed for store.
 			print_cil_load_address(fp, mExpression, entry);
+
+			// Load value again.
+			// TODO: Work out if sideeffects can result in 2 evaluations of expression giving different values.
+			// Original LSL2 uses this method, so any bugs due to side effects will probably be identical ;-)
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp,"dup\n"); // Copy expression result to use as increment operand.
 			if (mReturnType == LST_INTEGER)
 			{
 				fprintf(fp, "ldc.i4.1\n");
 			}
 			else if (mReturnType == LST_FLOATINGPOINT)
 			{
-				fprintf(fp, "ldc.r8.1\n");
+				fprintf(fp, "ldc.r8 1\n");
 			}
 			else
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
 			fprintf(fp, "add\n");
-			print_cil_asignment(fp, mExpression, entry);
-			fprintf(fp, "pop\n"); // Pop assignment result to leave original expression result on stack. TODO: Optimise away redundant pop/dup pairs.
+			print_cil_assignment(fp, mExpression, entry);
+
+			// Pop assignment result to leave original expression result on stack. 
+			// TODO: Optimise away redundant pop/dup pairs.
+			fprintf(fp, "pop\n"); 
 		}
 		break;
 	default:
@@ -6956,7 +7587,7 @@ void LLScriptPostDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
-			print_asignment(fp, mExpression);
+			print_assignment(fp, mExpression);
 			fprintf(fp, "%s\n", LSCRIPTTypePop[mReturnType]);
 		}
 		break;
@@ -7025,24 +7656,34 @@ void LLScriptPostDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
+			// Push original value on to stack.
+			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+
+			// Load address if needed for store.
 			print_cil_load_address(fp, mExpression, entry);
+
+			// Load value again.
+			// TODO: Work out if sideeffects can result in 2 evaluations of expression giving different values.
+			// Original LSL2 uses this method, so any bugs due to side effects will probably be identical ;-)
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp,"dup\n"); // Copy expression result to use as decrement operand.
 			if (mReturnType == LST_INTEGER)
 			{
 				fprintf(fp, "ldc.i4.1\n");
 			}
 			else if (mReturnType == LST_FLOATINGPOINT)
 			{
-				fprintf(fp, "ldc.r8.1\n");
+				fprintf(fp, "ldc.r8 1\n");
 			}
 			else
 			{
 				fprintf(fp, "Unexpected Type\n");
 			}
 			fprintf(fp, "sub\n");
-			print_cil_asignment(fp, mExpression, entry);
-			fprintf(fp, "pop\n"); // Pop assignment result to leave original expression result on stack. TODO: Optimise away redundant pop/dup pairs.
+			print_cil_assignment(fp, mExpression, entry);
+
+			// Pop assignment result to leave original expression result on stack. 
+			// TODO: Optimise away redundant pop/dup pairs.
+			fprintf(fp, "pop\n"); 
 		}
 		break;
 	default:
@@ -7058,16 +7699,19 @@ S32 LLScriptPostDecrement::getSize()
 }
 
 // Generate arg list.
-void print_cil_arg_list(LLFILE *fp, LLScriptFuncExpressionList* exp_list)
+static void print_cil_arg_list(LLFILE *fp, LLScriptArgString& args)
 {
-	// Print first argument.
-	print_cil_type(fp, exp_list->mFirstp->mReturnType);
-
-	// Recursively print next arguments.
-	if(exp_list->mSecondp != NULL)
+	int i = 0;
+	bool finished = (i >= args.getNumber());
+	while(! finished)
 	{
-		fprintf(fp, ", ");
-		print_cil_arg_list(fp, (LLScriptFuncExpressionList*) exp_list->mSecondp);
+		print_cil_type(fp, args.getType(i));
+		++i;
+		finished = (i >= args.getNumber());
+		if(! finished)
+		{
+			fprintf(fp, ", ");
+		}
 	}
 }
 
@@ -7146,7 +7790,7 @@ void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 					gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
 				}
 			}
-			else if (argcount != strlen(mIdentifier->mScopeEntry->mFunctionArgs.mString))	 	/*Flawfinder: ignore*/
+			else if (argcount != strlen(mIdentifier->mScopeEntry->mFunctionArgs.mString))
 			{
 				gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
 			}
@@ -7217,13 +7861,15 @@ void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			// Load args on to stack.
 			if (mExpressionList)
 			{
-				mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry /* Needed for is_parameter calls */, 0, NULL);
+				//mExpressionList->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry /* Needed for is_parameter calls */, 0, NULL);
+				llassert(LET_FUNC_EXPRESSION_LIST == mExpressionList->mType);
+				print_cil_func_expression_list((LLScriptFuncExpressionList*) mExpressionList, fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry /* Caller entry needed for is_parameter calls */, 0, NULL, mIdentifier->mScopeEntry /* Callee entry needed for argument casting */);
 			}
 
 			// Make call.
 			if (! library_call)
 			{
-				fprintf(fp, "callvirt instance ");
+				fprintf(fp, "call instance ");
 			}
 			else
 			{
@@ -7233,16 +7879,18 @@ void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			fprintf(fp, " class ");
 			if (library_call)
 			{
-				fprintf(fp, "[LScriptLibrary]LScriptLibrary");
+				fprintf(fp, "[LslLibrary]LindenLab.SecondLife.Library::'");
 			}
 			else
 			{
-				fprintf(fp, "LSL");
+				// Prefix function name with g to distinguish from
+				// event handlers.
+				fprintf(fp, gScriptp->getClassName());
+				fprintf(fp, "::'g");
 			}
-			fprintf(fp, "::");
-			mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp, "(");
-			if (mExpressionList) {print_cil_arg_list(fp, (LLScriptFuncExpressionList*) mExpressionList);}
+			fprintf(fp, mIdentifier->mName);
+			fprintf(fp, "'(");
+			print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs);
 			fprintf(fp, ")\n");
 		}
 		break;
@@ -7287,6 +7935,11 @@ void LLScriptPrint::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		chunk->addByte(LSCRIPTOpCodes[LOPC_PRINT]);
 		chunk->addByte(LSCRIPTTypeByte[mLeftType]);
 		break;
+	case LSCP_EMIT_CIL_ASSEMBLY:
+	        mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		print_cil_cast(fp, mLeftType, LST_STRING);
+ 	        fprintf(fp, "call void class [LslLibrary]LindenLab.SecondLife.Library::Print(string)");
+	        break;
 	default:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -7404,8 +8057,19 @@ void LLScriptStatementSequence::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRI
 		mFirstp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		if (prunearg)
 		{
+			// babbage: only warn on first dead code block found.
+			if(ptype != LSPRUNE_DEAD_CODE)
+			{
+				gErrorToText.writeWarning(fp, this, LSWARN_DEAD_CODE);
+			}
+			
+			// babbage: set prune type to LSPRUNE_DEAD_CODE to mask other
+			// prune errors.
 			ptype = LSPRUNE_DEAD_CODE;
-			gErrorToText.writeWarning(fp, this, LSWARN_DEAD_CODE);
+			
+			// babbage: reset prunearg, to track whether return needed at
+			// end of dead code path as CIL always needs a return/throw.
+			prunearg = FALSE;
 		}
 		mSecondp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		break;
@@ -7444,10 +8108,7 @@ void LLScriptNOOP::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 		fprintf(fp, ";\n");
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	default:
 		break;
@@ -7462,7 +8123,7 @@ void add_exit_pops(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry)
 
 	if (entry->mLocals.mString)
 	{
-		number = (S32)strlen(entry->mLocals.mString); 	/*Flawfinder: ignore*/
+		number = (S32)strlen(entry->mLocals.mString);
 		for (i = number - 1; i >= 0; i--)
 		{
 			switch(entry->mLocals.getType(i))
@@ -7495,7 +8156,7 @@ void add_exit_pops(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry)
 
 	if (entry->mFunctionArgs.mString)
 	{
-		number = (S32)strlen(entry->mFunctionArgs.mString); 	/*Flawfinder: ignore*/
+		number = (S32)strlen(entry->mFunctionArgs.mString);
 		for (i = number - 1; i >= 0; i--)
 		{
 			switch(entry->mFunctionArgs.getType(i))
@@ -7534,7 +8195,7 @@ void print_exit_pops(LLFILE *fp, LLScriptScopeEntry *entry)
 
 	if (entry->mLocals.mString)
 	{
-		number = (S32)strlen(entry->mLocals.mString); 	/*Flawfinder: ignore*/
+		number = (S32)strlen(entry->mLocals.mString);
 		for (i = number - 1; i >= 0; i--)
 		{
 			fprintf(fp, "%s", LSCRIPTTypePop[entry->mLocals.getType(i)]);
@@ -7543,7 +8204,7 @@ void print_exit_pops(LLFILE *fp, LLScriptScopeEntry *entry)
 
 	if (entry->mFunctionArgs.mString)
 	{
-		number = (S32)strlen(entry->mFunctionArgs.mString); 	/*Flawfinder: ignore*/
+		number = (S32)strlen(entry->mFunctionArgs.mString);
 		for (i = number - 1; i >= 0; i--)
 		{
 			fprintf(fp, "%s", LSCRIPTTypePop[entry->mFunctionArgs.getType(i)]);
@@ -7583,10 +8244,7 @@ void LLScriptStateChange::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		{
 			gErrorToText.writeError(fp, this, LSERROR_STATE_CHANGE_IN_GLOBAL);
 		}
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_SCOPE_PASS2:
 		{
@@ -7610,10 +8268,10 @@ void LLScriptStateChange::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
-		fprintf(fp, "ldstr \"");
-		mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "\"\n");
-		fprintf(fp, "call void class [LScriptLibrary]LScriptInternal::change_state(string)\n");
+		fprintf(fp, "ldarg.0\n");
+		fprintf(fp, "ldstr \"%s\"\n", mIdentifier->mName);
+		fprintf(fp, "call instance void class [LslUserScript]LindenLab.SecondLife.LslUserScript::ChangeState(string)\n");
+		fprintf(fp, "ret\n");
 		break;
 	default:
 		mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -7647,10 +8305,7 @@ void LLScriptJump::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 		fprintf(fp, "\n");
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_SCOPE_PASS2:
 		{
@@ -7820,6 +8475,10 @@ void LLScriptReturn::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 				mType = basetype;
 			}
 		}
+		else if (basetype != LST_NULL)
+		{
+		        gErrorToText.writeError(fp, this, LSERROR_TYPE_MISMATCH);
+		}
 		break;
 	case LSCP_EMIT_BYTE_CODE:
 		if (mExpression)
@@ -7863,6 +8522,7 @@ void LLScriptReturn::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 		if (mExpression)
 		{
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_cast(fp, mExpression->mReturnType, mType);
 		}
 		fprintf(fp, "ret\n");
 		break;
@@ -7902,10 +8562,7 @@ void LLScriptExpressionStatement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSC
 		}
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_EMIT_BYTE_CODE:
 		mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -7951,6 +8608,58 @@ S32 LLScriptIf::getSize()
 	return 0;
 }
 
+static void print_cil_if_test(LLFILE* fp, LSCRIPTType type)
+{
+	switch(type)
+	{
+	case LST_INTEGER:
+		break;
+	case LST_FLOATINGPOINT:
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ceq\n");
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
+		break;
+	case LST_VECTOR:
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Vector class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateVector'(float32, float32, float32)\n");
+		fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Vector, class [ScriptTypes]LindenLab.SecondLife.Vector)\n");
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
+		break;
+	case LST_QUATERNION:
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 0\n");
+		fprintf(fp, "ldc.r8 1\n");
+		fprintf(fp, "call class [ScriptTypes]LindenLab.SecondLife.Quaternion class [LslUserScript]LindenLab.SecondLife.LslUserScript::'CreateQuaternion'(float32, float32, float32, float32)\n");
+		fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::'Equals'(class [ScriptTypes]LindenLab.SecondLife.Quaternion, class [ScriptTypes]LindenLab.SecondLife.Quaternion)\n");
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
+		break;
+	case LST_KEY:
+		fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::'IsNonNullUuid'(valuetype [ScriptTypes]LindenLab.SecondLife.Key)\n");
+		break;		
+	case LST_STRING:
+		fprintf(fp, "ldstr \"\"\n");
+		fprintf(fp, "call bool string::op_Equality(string, string)\n");
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
+		break;
+	case LST_LIST:
+		fprintf(fp, "call class [mscorlib]System.Collections.ArrayList class [LslUserScript]LindenLab.SecondLife.LslUserScript::CreateList()\n");
+		fprintf(fp, "call bool [LslUserScript]LindenLab.SecondLife.LslUserScript::Equals(class [mscorlib]System.Collections.ArrayList, class [mscorlib]System.Collections.ArrayList)\n");
+		fprintf(fp, "ldc.i4.0\n");
+		fprintf(fp, "ceq\n");
+		break;		
+	default:
+		break;
+	}
+
+}
+
 void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata)
 {
 	if (gErrorToText.getErrors())
@@ -7976,10 +8685,7 @@ void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass p
 		}
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8004,6 +8710,7 @@ void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass p
 		{
 			S32 tjump = gTempJumpCount++;
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_if_test(fp, mExpression->mReturnType);
 			fprintf(fp, "brfalse LabelTempJump%d\n", tjump);
 			mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "LabelTempJump%d:\n", tjump);
@@ -8093,6 +8800,7 @@ void LLScriptIfElse::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 			S32 tjump1 =  gTempJumpCount++;
 			S32 tjump2 =  gTempJumpCount++;
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_if_test(fp, mExpression->mReturnType);
 			fprintf(fp, "brfalse LabelTempJump%d\n", tjump1);
 			mStatement1->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "br LabelTempJump%d\n", tjump2);
@@ -8155,10 +8863,7 @@ void LLScriptFor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 		}
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		if(mSequence)
@@ -8203,6 +8908,7 @@ void LLScriptFor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 				mSequence->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "LabelTempJump%d:\n", tjump1);
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_if_test(fp, mExpression->mReturnType);
 			fprintf(fp, "brfalse LabelTempJump%d\n", tjump2);
 			if(mStatement)
 				mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8257,10 +8963,7 @@ void LLScriptDoWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompileP
 		}
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8287,6 +8990,7 @@ void LLScriptDoWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompileP
 			fprintf(fp, "LabelTempJump%d:\n", tjump1);
 			mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_if_test(fp, mExpression->mReturnType);
 			fprintf(fp, "brtrue LabelTempJump%d\n", tjump1);
 		}
 		break;
@@ -8331,10 +9035,7 @@ void LLScriptWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		}
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_TYPE:
 		mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8367,6 +9068,7 @@ void LLScriptWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 			S32 tjump2 =  gTempJumpCount++;
 			fprintf(fp, "LabelTempJump%d:\n", tjump1);
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			print_cil_if_test(fp, mExpression->mReturnType);
 			fprintf(fp, "brfalse LabelTempJump%d\n", tjump2);
 			mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 			fprintf(fp, "br LabelTempJump%d\n", tjump1);
@@ -8429,10 +9131,7 @@ void LLScriptDeclaration::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		}
 		break;
 	case LSCP_PRUNE:
-		if (ptype == LSPRUNE_DEAD_CODE)
-			prunearg = TRUE;
-		else
-			prunearg = FALSE;
+		prunearg = FALSE;
 		break;
 	case LSCP_SCOPE_PASS1:
 		// Check to see if a declaration is valid here.
@@ -8604,24 +9303,13 @@ void LLScriptDeclaration::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		if (mExpression)
 		{
 			mExpression->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			if (mIdentifier->mScopeEntry->mIDType == LIT_VARIABLE)
-			{
-				if(is_parameter(mIdentifier, entry))
-				{
-					// Parameter, store by name.
-					fprintf(fp, "starg.s %s\n", mIdentifier->mScopeEntry->mIdentifier);
-				}
-				else
-				{
-					// Local, store by index.
-					fprintf(fp, "stloc.s %d\n", mIdentifier->mScopeEntry->mCount);
-				}
-			}
-			else if (mIdentifier->mScopeEntry->mIDType == LIT_GLOBAL)
-			{
-				gErrorToText.writeError(fp, this, LSERROR_UNDEFINED_NAME);
-			}
+			print_cil_cast(fp, mExpression->mReturnType, mIdentifier->mScopeEntry->mType);
 		}
+		else
+		{
+			print_cil_init_variable(fp, mIdentifier->mScopeEntry->mType);
+		}
+		fprintf(fp, "stloc.s %d\n", mIdentifier->mScopeEntry->mCount);
 		break;
 	default:
 		if (mExpression)
@@ -8751,7 +9439,7 @@ S32 LLScriptEventHandler::getSize()
 
 U64 gCurrentHandler = 0;
 
-void print_cil_local_init(LLFILE* fp, LLScriptScopeEntry* scopeEntry)
+static void print_cil_local_init(LLFILE* fp, LLScriptScopeEntry* scopeEntry)
 {
 	if(scopeEntry->mLocals.getNumber() > 0)
 	{
@@ -8956,6 +9644,10 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 		// first determine resource counts for globals
 		count = 0;
 		mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+
+		// Store offset of first local as with global functions, so locals and arguments can be distinguished with is_parameter when compiling to CIL.
+		mScopeEntry->mOffset = (S32) count;
+
 		if (mStatement)
 		{
 			entrycount = 0;
@@ -9024,8 +9716,11 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 		// Method signature prefix.
 		fprintf(fp, ".method public hidebysig instance default void ");
 
-		// Mangle event handler name by prefixing it with state name. Allows state changing by finding handlers prefixed with new state name.
-		fprintf(fp, entry->mIdentifier);	 	/*Flawfinder: ignore*/
+		// Mangle event handler name by prefixing it with state name.
+		// Allows state changing by finding handlers prefixed with new
+		// state name. Prefix disambiguates functions and event handlers.
+		fprintf(fp, "e");
+		fprintf(fp, entry->mIdentifier);
 
 		// Handler name and arguments.
 		mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -9047,7 +9742,11 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 		}
 
 		// Function footer.
-		fprintf(fp, "\nret\n"); // TODO: Check whether return needed?
+		if (mbNeedTrailingReturn)
+		{
+			// TODO: throw exception?
+			fprintf(fp, "ret\n");
+		}
 		fprintf(fp, "}\n");
 
 		break;
@@ -9161,7 +9860,7 @@ void LLScriptFunctionDec::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 			chunk->addBytes(&typereturn, 1);
 			// name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);	 	/*Flawfinder: ignore*/
+			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
 #else
 			chunk->addBytes(1);
 #endif
@@ -9176,6 +9875,10 @@ void LLScriptFunctionDec::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
 		mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		fprintf(fp, " ");
 		mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+		if(NULL != mNextp)
+		{
+			fprintf(fp, ",");
+		}
 		break;
 	default:
 		mType->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -9398,7 +10101,7 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 
 			// null terminated function name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);	 	/*Flawfinder: ignore*/
+			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
 #else
 			chunk->addBytes(1);
 #endif
@@ -9444,11 +10147,13 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
 		{
-			// Function header.
+			// Function header. Prefix function name with g to distinguish
+			// from event handlers.
 			fprintf(fp, ".method public hidebysig instance default ");
 			print_cil_type(fp, mType ? mType->mType : LST_NULL);
-			fprintf(fp, " ");
-			mIdentifier->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			fprintf(fp, " 'g");
+			fprintf(fp, mIdentifier->mName);
+			fprintf(fp, "'");
 			if (mParameters)
 			{
 				fprintf(fp, "( ");
@@ -9473,6 +10178,7 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 			// Function footer.
 			if (mbNeedTrailingReturn)
 			{
+				// TODO: throw exception?
 				fprintf(fp, "ret\n");
 			}
 			fprintf(fp, "}\n");
@@ -9587,10 +10293,12 @@ void LLScriptState::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 		{
 			mIdentifier->mScopeEntry = scope->addEntry(mIdentifier->mName, LIT_STATE, LST_NULL);
 		}
+		mStateScope = new LLScriptScope(gScopeStringTable);
+		mStateScope->addParentScope(scope);
 		// now do the events
 		if (mEvent)
 		{
-			mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			mEvent->recurse(fp, tabs, tabsize, pass, ptype, prunearg, mStateScope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 		}
 		break;
 	case LSCP_SCOPE_PASS2:
@@ -9649,7 +10357,7 @@ void LLScriptState::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 
 			// null terminated state name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);	 	/*Flawfinder: ignore*/
+			chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
 #else
 			chunk->addBytes(1);
 #endif
@@ -9693,6 +10401,38 @@ void LLScriptState::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
 	gonext(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
 }
 
+// Converts string to a valid CIL class name and stores the result 
+// in the supplied buffer, which should be at least 32 chars long.
+// If the string starts with a UUID, all characters in the UUID are included
+// in the generated name.
+void to_class_name(char* buffer, const char* string)
+{
+	strcpy(buffer, "LSL-");
+	strcat(buffer, string);
+	char* current_char = buffer;
+	while((*current_char) != 0)
+	{
+		if(isalnum(*current_char))
+		{
+			++current_char;
+		}
+		else if((*current_char) == '-')
+		{
+			(*current_char) = '_';
+			++current_char;
+		}
+		else
+		{
+			(*current_char) = 0;
+		}
+	}
+}
+
+void LLScriptScript::setClassName(const char* class_name)
+{
+	to_class_name(mClassName, class_name);
+}
+
 S32 LLScriptScript::getSize()
 {
 	return 0;
@@ -9704,8 +10444,8 @@ LLScriptScript::LLScriptScript(LLScritpGlobalStorage *globals,
 	mStates(states), mGlobalScope(NULL), mGlobals(NULL), mGlobalFunctions(NULL), mGodLike(FALSE)
 {
 	const char DEFAULT_BYTECODE_FILENAME[] = "lscript.lso";
-	strncpy(mBytecodeDest, DEFAULT_BYTECODE_FILENAME, sizeof(mBytecodeDest) -1); 	/*Flawfinder: ignore*/
-	mBytecodeDest[MAX_STRING-1] = '\0';
+
+	mBytecodeDest = DEFAULT_BYTECODE_FILENAME;
 	LLScriptGlobalVariable	*tvar;
 	LLScriptGlobalFunctions	*tfunc;
 	LLScritpGlobalStorage *temp;
@@ -9751,17 +10491,14 @@ LLScriptScript::LLScriptScript(LLScritpGlobalStorage *globals,
 
 void LLScriptScript::setBytecodeDest(const char* dst_filename)
 {
-	strncpy(mBytecodeDest, dst_filename, MAX_STRING); 	/*Flawfinder: ignore*/
-	mBytecodeDest[MAX_STRING-1] = '\0';
+	mBytecodeDest = ll_safe_string(dst_filename);
 }
 
-void print_cil_globals(LLFILE* fp, LLScriptGlobalVariable* global)
+static void print_cil_globals(LLFILE* fp, LLScriptGlobalVariable* global)
 {
-	fprintf(fp, ".field private ");
+	fprintf(fp, ".field public ");
 	print_cil_type(fp, global->mType->mType);
-	fprintf(fp, " ");
-	fprintf(fp, global->mIdentifier->mName);		/*Flawfinder: ignore*/
-	fprintf(fp, "\n");
+	fprintf(fp, " '%s'\n", global->mIdentifier->mName);
 	if(NULL != global->mNextp)
 	{
 		print_cil_globals(fp, global->mNextp);
@@ -9804,7 +10541,7 @@ void LLScriptScript::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 			mGlobalScope = new LLScriptScope(gScopeStringTable);
 			// zeroth, add library functions to global scope
 			S32 i;
-			char *arg;
+			const char *arg;
 			LLScriptScopeEntry *sentry;
 			for (i = 0; i < gScriptLibrary.mNextNumber; i++)
 			{
@@ -9948,72 +10685,66 @@ void LLScriptScript::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
 		}
 		break;
 	case LSCP_EMIT_CIL_ASSEMBLY:
+		{
+			LLFILE *bcfp = LLFile::fopen(mBytecodeDest, "wb");
 
-		// Output dependencies.
-		fprintf(fp, ".assembly extern mscorlib {.ver 1:0:5000:0}\n");
-		fprintf(fp, ".assembly extern LScriptLibrary {.ver 0:0:0:0}\n");
-
-		// Output assembly name.
-		fprintf(fp, ".assembly 'lsl' {.ver 0:0:0:0}\n");
+			// Output dependencies.
+			fprintf(bcfp, ".assembly extern mscorlib {.ver 1:0:5000:0}\n");
+			fprintf(bcfp, ".assembly extern LslLibrary {.ver 0:1:0:0}\n");
+			fprintf(bcfp, ".assembly extern LslUserScript {.ver 0:1:0:0}\n");
+			fprintf(bcfp, ".assembly extern ScriptTypes {.ver 0:1:0:0}\n");
 
-		// Output class header.
-		fprintf(fp, ".class public auto ansi beforefieldinit LSL extends [mscorlib]System.Object\n");
-		fprintf(fp, "{\n");
+			// Output assembly name.
+			fprintf(bcfp, ".assembly '%s' {.ver 0:0:0:0}\n", gScriptp->getClassName());
 
-		// Output globals as members.
-		if(NULL != mGlobals)
-		{
-			print_cil_globals(fp, mGlobals);
-		}
+			// Output class header.
+			fprintf(bcfp, ".class public auto ansi serializable beforefieldinit %s extends [LslUserScript]LindenLab.SecondLife.LslUserScript\n", gScriptp->getClassName());
+			fprintf(bcfp, "{\n");
 
-		// Output "runtime". Only needed to allow stand alone execution. Not needed when compiling to DLL and using embedded runtime.
-		fprintf(fp, ".method public static  hidebysig default void Main ()  cil managed\n");
-		fprintf(fp, "{\n");
-		fprintf(fp, ".entrypoint\n");
-		fprintf(fp, ".maxstack 2\n");
-		fprintf(fp, ".locals init (class LSL V_0)\n");
-		fprintf(fp, "newobj instance void class LSL::.ctor()\n");
-		fprintf(fp, "stloc.0\n");
-		fprintf(fp, "ldloc.0\n");
-		fprintf(fp, "callvirt instance void class LSL::defaultstate_entry()\n");
-		fprintf(fp, "ret\n");
-		fprintf(fp, "}\n");
+			// Output globals as members.
+			if(NULL != mGlobals)
+			{
+				print_cil_globals(bcfp, mGlobals);
+			}
 
-		// Output ctor header.
-		fprintf(fp, ".method public hidebysig  specialname  rtspecialname instance default void .ctor ()  cil managed\n");
-		fprintf(fp, "{\n");
-		fprintf(fp, ".maxstack 500\n");
+			// Output ctor header.
+			fprintf(bcfp, ".method public hidebysig  specialname  rtspecialname instance default void .ctor ()  cil managed\n");
+			fprintf(bcfp, "{\n");
+			fprintf(bcfp, ".maxstack 500\n");
 
-		// Initialise globals as members in ctor.
-		if (mGlobals)
-		{
-			fdotabs(fp, tabs, tabsize);
-			mGlobals->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp, "\n");
-		}
+			// Initialise globals as members in ctor.
+			if (mGlobals)
+			{
+				fdotabs(bcfp, tabs, tabsize);
+				mGlobals->recurse(bcfp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+				fprintf(bcfp, "\n");
+			}
 
-		// Output ctor footer.
-		fprintf(fp, "ldarg.0\n");
-		fprintf(fp, "call instance void valuetype [mscorlib]System.Object::.ctor()\n");
-		fprintf(fp, "ret\n");
-		fprintf(fp, "}\n");
+			// Output ctor footer.
+			fprintf(bcfp, "ldarg.0\n");
+			fprintf(bcfp, "call instance void [LslUserScript]LindenLab.SecondLife.LslUserScript::.ctor()\n");
+			fprintf(bcfp, "ret\n");
+			fprintf(bcfp, "}\n");
 
-		// Output functions as methods.
-		if (mGlobalFunctions)
-		{
-			fdotabs(fp, tabs, tabsize);
-			mGlobalFunctions->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-			fprintf(fp, "\n");
-		}
+			// Output functions as methods.
+			if (mGlobalFunctions)
+			{
+				fdotabs(bcfp, tabs, tabsize);
+				mGlobalFunctions->recurse(bcfp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+				fprintf(bcfp, "\n");
+			}
 
-		// Output states as name mangled methods.
-		fdotabs(fp, tabs, tabsize);
-		mStates->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
-		fprintf(fp, "\n");
+			// Output states as name mangled methods.
+			fdotabs(bcfp, tabs, tabsize);
+			mStates->recurse(bcfp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
+			fprintf(bcfp, "\n");
 
-		// Output class footer.
-		fprintf(fp, "}\n");
+			// Output class footer.
+			fprintf(bcfp, "}\n");
 
+			// Close file.
+			fclose(bcfp);
+		}
 		break;
 	default:
 		if (mGlobals)
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.h b/linden/indra/lscript/lscript_compile/lscript_tree.h
index 1c2ba1f..7c0d883 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.h
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.h
@@ -2197,11 +2197,11 @@ public:
 	void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata);
 	S32 getSize();
 
-	LSCRIPTStateType		mType;
-	LLScriptIdentifier		*mIdentifier;
-	LLScriptEventHandler	*mEvent;
-	LLScriptState			*mNextp;
-
+	LSCRIPTStateType mType;
+	LLScriptIdentifier *mIdentifier;
+	LLScriptEventHandler *mEvent;
+	LLScriptState *mNextp;
+	LLScriptScope *mStateScope;
 };
 
 class LLScritpGlobalStorage : public LLScriptFilePosition
@@ -2262,6 +2262,9 @@ public:
 
 	void setBytecodeDest(const char* dst_filename);
 
+	void setClassName(const char* class_name);
+	const char* getClassName() {return mClassName;}
+
 	LLScriptState			*mStates;
 	LLScriptScope			*mGlobalScope;
 	LLScriptGlobalVariable	*mGlobals;
@@ -2269,7 +2272,8 @@ public:
 	BOOL					mGodLike;
 
 private:
-	char mBytecodeDest[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string mBytecodeDest;
+	char mClassName[MAX_STRING];
 };
 
 class LLScriptAllocationManager
diff --git a/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp b/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp
index 8c3738d..118aea0 100644
--- a/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_typecheck.cpp
@@ -66,7 +66,13 @@ LSCRIPTType implicit_casts(LSCRIPTType left_side, LSCRIPTType right_side)
 	{
 		// shouldn't be doing an operation on void types
 	case LST_NULL:
-		return LST_NULL;
+		switch(right_side)
+		{
+		case LST_NULL:
+			return LST_NULL;
+		default:
+			return LST_UNDEFINED;
+		}
 	// shouldn't be doing an operation on undefined types
 	case LST_UNDEFINED:
 		return LST_UNDEFINED;
diff --git a/linden/indra/lscript/lscript_execute.h b/linden/indra/lscript/lscript_execute.h
index 997e04d..ac23ff3 100644
--- a/linden/indra/lscript/lscript_execute.h
+++ b/linden/indra/lscript/lscript_execute.h
@@ -367,20 +367,158 @@ public:
 class LLScriptExecute
 {
 public:
-	LLScriptExecute(LLFILE *fp);
-	LLScriptExecute(U8 *buffer);
-	~LLScriptExecute();
+	LLScriptExecute();
+	virtual ~LLScriptExecute() {;}
+
+	virtual S32 getVersion() = 0;
+	virtual void deleteAllEvents() = 0;
+	virtual void addEvent(LLScriptDataCollection* event) = 0;
+	virtual U32 getEventCount() = 0;
+	virtual void removeEventType(LSCRIPTStateEventType event_type) = 0;
+	virtual S32 getFaults() = 0;
+	virtual void setFault(LSCRIPTRunTimeFaults fault) = 0;
+	virtual	U32 getFreeMemory() = 0;
+	virtual S32 getParameter() = 0;
+	virtual void setParameter(S32 value) = 0;
+	virtual F32 getSleep() const = 0;
+	virtual void setSleep(F32 value) = 0;
+	virtual F32 getEnergy() const = 0;
+	virtual void setEnergy(F32 value) = 0;
+	virtual U64 getCurrentEvents(S32 version) = 0;
+	virtual void setCurrentEvents(U64 value, S32 version) = 0;
+	virtual U64 getEventHandlers(S32 version) = 0;
+	virtual void setEventHandlers(U64 value, S32 version) = 0;
+	virtual U64 getCurrentHandler(S32 version) = 0;
+	virtual void setCurrentHandler(U64 value, S32 version) = 0;
+	virtual BOOL isFinished() const = 0;
+	virtual BOOL isStateChangePending() const = 0;
+	virtual S32 writeState(U8 **dest, U32 header_size, U32 footer_size) = 0; // Allocate memory for header, state and footer return size of state.
+	virtual U32 getEventsSavedSize() = 0; // Returns 0 if events are written with state.
+	virtual S32 writeEvents(U8 *dest) = 0; // Must write and return exactly the number of bytes returned by getEventsSavedSize.
+	virtual void readEvents(U8* src, S32& offset) = 0;
+	virtual S32 readState(U8 *src) = 0; // Returns number of bytes read.
+	virtual void reset();
+	virtual const U8* getBytecode() const = 0;
+	virtual U32 getBytecodeSize() const = 0;
+	virtual bool isMono() const = 0;
+	virtual void error() {;} // Processing that must be performed when error flag is set and so run is not called.
+	
+	// Run current event handler for a maximum of time_slice seconds.
+	// Updates current handler and current events registers.
+	virtual void resumeEventHandler(BOOL b_print, const LLUUID &id, F32 time_slice) = 0;
+
+	// Run handler for event for a maximum of time_slice seconds.
+	// Updates current handler and current events registers.
+	virtual void callEventHandler(LSCRIPTStateEventType event, S32 major_version, const LLUUID &id, F32 time_slice) = 0;;
+
+	// Run handler for next queued event for maximum of time_slice seconds. 
+	// Updates current handler and current events registers.
+	// Removes processed event from queue.
+	virtual void callNextQueuedEventHandler(U64 event_register, S32 major_version, const LLUUID &id, F32 time_slice) = 0;
+
+	// Run handler for event for a maximum of time_slice seconds.
+	// Updates current handler and current events registers.
+	// Removes processed event from queue.
+	virtual void callQueuedEventHandler(LSCRIPTStateEventType event, S32 major_version, const LLUUID &id, F32 time_slice) = 0;
+
+	// Switch to next state.
+	// Returns new set of handled events.
+	virtual U64 nextState() = 0; 
+
+	// Returns time taken.
+	virtual F32 runQuanta(BOOL b_print, const LLUUID &id,
+						  const char **errorstr, 
+						  BOOL &state_transition, F32 quanta,
+						  U32& events_processed, LLTimer& timer);
+
+	// Run smallest possible amount of code: an instruction for LSL2, a segment
+	// between save tests for Mono
+	void runInstructions(BOOL b_print, const LLUUID &id,
+						 const char **errorstr, 
+						 BOOL &state_transition, U32& events_processed,
+						 F32 quanta);
+
+	bool isYieldDue() const;
+
+	void setReset(BOOL b) {mReset = b;}
+	BOOL getReset() const { return mReset; }
+
+private:
+
+	BOOL mReset;
+};
+
+class LLScriptExecuteLSL2 : public LLScriptExecute
+{
+public:
+	LLScriptExecuteLSL2(LLFILE *fp);
+	LLScriptExecuteLSL2(const U8* bytecode, U32 bytecode_size);
+	virtual ~LLScriptExecuteLSL2();
+
+	virtual S32 getVersion() {return get_register(mBuffer, LREG_VN);}
+	virtual void deleteAllEvents() {mEventData.mEventDataList.deleteAllData();}
+	virtual void addEvent(LLScriptDataCollection* event);
+	virtual U32 getEventCount() {return mEventData.mEventDataList.getLength();}
+	virtual void removeEventType(LSCRIPTStateEventType event_type);
+	virtual S32 getFaults() {return get_register(mBuffer, LREG_FR);}
+	virtual void setFault(LSCRIPTRunTimeFaults fault) {set_fault(mBuffer, fault);}
+	virtual U32 getFreeMemory();
+	virtual S32 getParameter();
+	virtual void setParameter(S32 value);
+	virtual F32 getSleep() const;
+	virtual void setSleep(F32 value);
+	virtual F32 getEnergy() const;
+	virtual void setEnergy(F32 value);
+	virtual U64 getCurrentEvents(S32 version) {return get_event_register(mBuffer, LREG_CE, version);}
+	virtual void setCurrentEvents(U64 value, S32 version) {return set_event_register(mBuffer, LREG_CE, value, version);}
+	virtual U64 getEventHandlers(S32 version) {return get_event_register(mBuffer, LREG_ER, version);}
+	virtual void setEventHandlers(U64 value, S32 version) {set_event_register(mBuffer, LREG_ER, value, version);}
+	virtual U64 getCurrentHandler(S32 version);
+	virtual void setCurrentHandler(U64 value, S32 version) {return set_event_register(mBuffer, LREG_IE, value, version);}	
+	virtual BOOL isFinished() const {return get_register(mBuffer, LREG_IP) == 0;}
+	virtual BOOL isStateChangePending() const {return get_register(mBuffer, LREG_CS) != get_register(mBuffer, LREG_NS);}
+	virtual S32 writeState(U8 **dest, U32 header_size, U32 footer_size); // Not including Events.
+	virtual U32 getEventsSavedSize() {return mEventData.getSavedSize();}
+	virtual S32 writeEvents(U8 *dest) {return mEventData.write2bytestream(dest);}
+	virtual void readEvents(U8* src, S32& offset) {mEventData.set(src, offset);}
+	virtual S32 writeBytecode(U8 **dest);
+	virtual S32 readState(U8 *src);
+	virtual void reset();
+	virtual const U8* getBytecode() const {return mBytecode;}
+	virtual U32 getBytecodeSize() const {return mBytecodeSize;}
+	virtual bool isMono() const {return false;}
+
+	// Run current event handler for a maximum of time_slice seconds.
+	// Updates current handler and current events registers.
+	virtual void resumeEventHandler(BOOL b_print, const LLUUID &id, F32 time_slice);
+
+	// Run handler for event for a maximum of time_slice seconds.
+	// Updates current handler and current events registers.
+	virtual void callEventHandler(LSCRIPTStateEventType event, S32 major_version, const LLUUID &id, F32 time_slice);
+
+	// Run handler for next queued event for maximum of time_slice seconds. 
+	// Updates current handler and current events registers.
+	// Removes processed event from queue.
+	virtual void callNextQueuedEventHandler(U64 event_register, S32 major_version, const LLUUID &id, F32 time_slice);
+
+	// Run handler for event for a maximum of time_slice seconds.
+	// Updates current handler and current events registers.
+	// Removes processed event from queue.
+	virtual void callQueuedEventHandler(LSCRIPTStateEventType event, S32 major_version, const LLUUID &id, F32 time_slice);
+
+	// Switch to next state.
+	// Returns new set of handled events.
+	virtual U64 nextState(); 
 
 	void init();
-	U32 run(BOOL b_print, const LLUUID &id, char **errorstr, BOOL &state_transition);
 
 	BOOL (*mExecuteFuncs[0x100])(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id);
 
 	U32						mInstructionCount;
 	U8						*mBuffer;
 	LLScriptEventData		mEventData;
-
-	static S64 sGlobalInstructionCount;
+	U8*						mBytecode; // Initial state and bytecode.
+	U32						mBytecodeSize;
 
 private:
 	void		recordBoundaryError( const LLUUID &id );
diff --git a/linden/indra/lscript/lscript_execute/CMakeLists.txt b/linden/indra/lscript/lscript_execute/CMakeLists.txt
new file mode 100644
index 0000000..f30915b
--- /dev/null
+++ b/linden/indra/lscript/lscript_execute/CMakeLists.txt
@@ -0,0 +1,34 @@
+# -*- cmake -*-
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LScript)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LSCRIPT_INCLUDE_DIRS}
+    )
+
+set(lscript_execute_SOURCE_FILES
+    lscript_execute.cpp
+    lscript_heapruntime.cpp
+    lscript_readlso.cpp
+    )
+
+set(lscript_execute_HEADER_FILES
+    CMakeLists.txt
+
+    ../lscript_execute.h
+    ../lscript_rt_interface.h
+    lscript_heapruntime.h
+    lscript_readlso.h
+    )
+
+set_source_files_properties(${lscript_execute_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND lscript_execute_SOURCE_FILES ${lscript_execute_HEADER_FILES})
+
+add_library (lscript_execute ${lscript_execute_SOURCE_FILES})
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
index 643f3f6..3adfe32 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -31,6 +31,7 @@
 
 #include "linden_common.h"
 
+#include <algorithm>
 #include <sstream>
 
 #include "lscript_execute.h"
@@ -43,9 +44,9 @@
 void (*binary_operations[LST_EOF][LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 void (*unary_operations[LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 
-char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] =		/*Flawfinder: ignore*/
+const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] =		/*Flawfinder: ignore*/
 {
-	"invalid",				//	LSRF_INVALID,
+	"Invalid",				//	LSRF_INVALID,
 	"Math Error",			//	LSRF_MATH,
 	"Stack-Heap Collision",	//	LSRF_STACK_HEAP_COLLISION,
 	"Bounds Check Error",	//	LSRF_BOUND_CHECK_ERROR,
@@ -55,13 +56,11 @@ char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] =		/*Flawfinder: ignore*/
 	"Hit Sandbox Limit",	//	LSRF_SANDBOX,
 	"Chat Overrun",			//	LSRF_CHAT_OVERRUN,
 	"Too Many Listens",			  //	LSRF_TOO_MANY_LISTENS,
-	"Lists may not contain lists" //	LSRF_NESTING_LISTS,
+	"Lists may not contain lists", //	LSRF_NESTING_LISTS,
+	"CLI Exception" // LSRF_CLI
 };
 
-//static
-S64 LLScriptExecute::sGlobalInstructionCount = 0;
-
-LLScriptExecute::LLScriptExecute(LLFILE *fp)
+LLScriptExecuteLSL2::LLScriptExecuteLSL2(LLFILE *fp)
 {
 	U8  sizearray[4];
 	S32 filesize;
@@ -84,19 +83,26 @@ LLScriptExecute::LLScriptExecute(LLFILE *fp)
 	init();
 }
 
-LLScriptExecute::LLScriptExecute(U8 *buffer)
+LLScriptExecuteLSL2::LLScriptExecuteLSL2(const U8* bytecode, U32 bytecode_size)
 {
-	mBuffer = buffer;
-
+	mBuffer = new U8[TOP_OF_MEMORY];
+	memset(mBuffer + bytecode_size, 0, TOP_OF_MEMORY - bytecode_size);
+	S32 src_offset = 0;
+	S32 dest_offset = 0;
+	bytestream2bytestream(mBuffer, dest_offset, bytecode, src_offset, bytecode_size);
+	mBytecodeSize = bytecode_size;
+	mBytecode = new U8[mBytecodeSize];
+	memcpy(mBytecode, bytecode, mBytecodeSize);
 	init();
 }
 
-LLScriptExecute::~LLScriptExecute()
+LLScriptExecuteLSL2::~LLScriptExecuteLSL2()
 {
-	delete [] mBuffer;
+	delete[] mBuffer;
+	delete[] mBytecode;
 }
 
-void LLScriptExecute::init()
+void LLScriptExecuteLSL2::init()
 {
 	S32 i, j;
 
@@ -270,7 +276,7 @@ void LLScriptExecute::init()
 
 
 // Utility routine for when there's a boundary error parsing bytecode
-void LLScriptExecute::recordBoundaryError( const LLUUID &id )
+void LLScriptExecuteLSL2::recordBoundaryError( const LLUUID &id )
 {
 	set_fault(mBuffer, LSRF_BOUND_CHECK_ERROR);
 	llwarns << "Script boundary error for ID " << id << llendl;
@@ -278,7 +284,7 @@ void LLScriptExecute::recordBoundaryError( const LLUUID &id )
 
 
 //	set IP to the event handler with some error checking
-void LLScriptExecute::setStateEventOpcoodeStartSafely( S32 state, LSCRIPTStateEventType event, const LLUUID &id )
+void LLScriptExecuteLSL2::setStateEventOpcoodeStartSafely( S32 state, LSCRIPTStateEventType event, const LLUUID &id )
 {
 	S32			opcode_start = get_state_event_opcoode_start( mBuffer, state, event );
 	if ( opcode_start == -1 )
@@ -296,12 +302,474 @@ void LLScriptExecute::setStateEventOpcoodeStartSafely( S32 state, LSCRIPTStateEv
 
 S32 lscript_push_variable(LLScriptLibData *data, U8 *buffer);
 
-U32 LLScriptExecute::run(BOOL b_print, const LLUUID &id, char **errorstr, BOOL &state_transition)
+void LLScriptExecuteLSL2::resumeEventHandler(BOOL b_print, const LLUUID &id, F32 time_slice)
+{
+	//	call opcode run function pointer with buffer and IP
+	mInstructionCount++;
+	S32 value = get_register(mBuffer, LREG_IP);
+	S32 tvalue = value;
+	S32	opcode = safe_instruction_bytestream2byte(mBuffer, tvalue);
+	mExecuteFuncs[opcode](mBuffer, value, b_print, id);
+	set_ip(mBuffer, value);
+	add_register_fp(mBuffer, LREG_ESR, -0.1f);
+	//	lsa_print_heap(mBuffer);
+
+	if (b_print)
+	{
+		lsa_print_heap(mBuffer);
+		printf("ip: 0x%X\n", get_register(mBuffer, LREG_IP));
+		printf("sp: 0x%X\n", get_register(mBuffer, LREG_SP));
+		printf("bp: 0x%X\n", get_register(mBuffer, LREG_BP));
+		printf("hr: 0x%X\n", get_register(mBuffer, LREG_HR));
+		printf("hp: 0x%X\n", get_register(mBuffer, LREG_HP));
+	}
+
+	// NOTE: Babbage: all mExecuteFuncs return false.
+}
+
+void LLScriptExecuteLSL2::callEventHandler(LSCRIPTStateEventType event, S32 major_version, const LLUUID &id, F32 time_slice)
+{
+	// push a zero to be popped
+	lscript_push(mBuffer, 0);
+	// push sp as current bp
+	S32 sp = get_register(mBuffer, LREG_SP);
+	lscript_push(mBuffer, sp);
+
+	// Update current handler and current events registers.
+	set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
+	U64 current_events = get_event_register(mBuffer, LREG_CE, major_version);
+	current_events &= ~LSCRIPTStateBitField[event];
+	set_event_register(mBuffer, LREG_CE, current_events, major_version);
+
+	// now, push any additional stack space
+	U32 current_state = get_register(mBuffer, LREG_CS);
+	S32 additional_size = get_event_stack_size(mBuffer, current_state, event);
+	lscript_pusharge(mBuffer, additional_size);
+
+	// now set the bp correctly
+	sp = get_register(mBuffer, LREG_SP);
+	sp += additional_size;
+	set_bp(mBuffer, sp);
+
+	// set IP to the function
+	S32			opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
+	set_ip(mBuffer, opcode_start);
+}
+
+//void callStateExitHandler()
+//{
+//	// push a zero to be popped
+//	lscript_push(mBuffer, 0);
+//	// push sp as current bp
+//	S32 sp = get_register(mBuffer, LREG_SP);
+//	lscript_push(mBuffer, sp);
+//
+//	// now, push any additional stack space
+//	S32 additional_size = get_event_stack_size(mBuffer, current_state, LSTT_STATE_EXIT);
+//	lscript_pusharge(mBuffer, additional_size);
+//
+//	sp = get_register(mBuffer, LREG_SP);
+//	sp += additional_size;
+//	set_bp(mBuffer, sp);
+//
+//	// set IP to the event handler
+//	S32			opcode_start = get_state_event_opcoode_start(mBuffer, current_state, LSTT_STATE_EXIT);
+//	set_ip(mBuffer, opcode_start);
+//}
+//
+//void callStateEntryHandler()
+//{
+//	// push a zero to be popped
+//	lscript_push(mBuffer, 0);
+//	// push sp as current bp
+//	S32 sp = get_register(mBuffer, LREG_SP);
+//	lscript_push(mBuffer, sp);
+//
+//	event = return_first_event((S32)LSCRIPTStateBitField[LSTT_STATE_ENTRY]);
+//	set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
+//	current_events &= ~LSCRIPTStateBitField[event];
+//	set_event_register(mBuffer, LREG_CE, current_events, major_version);
+//
+//	// now, push any additional stack space
+//	S32 additional_size = get_event_stack_size(mBuffer, current_state, event) - size;
+//	lscript_pusharge(mBuffer, additional_size);
+//
+//	// now set the bp correctly
+//	sp = get_register(mBuffer, LREG_SP);
+//	sp += additional_size + size;
+//	set_bp(mBuffer, sp);
+//	// set IP to the function
+//	S32			opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
+//	set_ip(mBuffer, opcode_start);
+//}
+
+void LLScriptExecuteLSL2::callQueuedEventHandler(LSCRIPTStateEventType event, S32 major_version, const LLUUID &id, F32 time_slice)
+{
+	LLScriptDataCollection* eventdata;
+
+	for (eventdata = mEventData.mEventDataList.getFirstData(); eventdata; eventdata = mEventData.mEventDataList.getNextData())
+	{
+		if (eventdata->mType == event)
+		{
+			// push a zero to be popped
+			lscript_push(mBuffer, 0);
+			// push sp as current bp
+			S32 sp = get_register(mBuffer, LREG_SP);
+			lscript_push(mBuffer, sp);
+
+			// Update current handler and current events registers.
+			set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
+			U64 current_events = get_event_register(mBuffer, LREG_CE, major_version);
+			current_events &= ~LSCRIPTStateBitField[event];
+			set_event_register(mBuffer, LREG_CE, current_events, major_version);
+
+			// push any arguments that need to be pushed onto the stack
+			// last piece of data will be type LST_NULL
+			LLScriptLibData	*data = eventdata->mData;
+			U32 size = 0;
+			while (data->mType)
+			{
+				size += lscript_push_variable(data, mBuffer);
+				data++;
+			}
+			// now, push any additional stack space
+			U32 current_state = get_register(mBuffer, LREG_CS);
+			S32 additional_size = get_event_stack_size(mBuffer, current_state, event) - size;
+			lscript_pusharge(mBuffer, additional_size);
+
+			// now set the bp correctly
+			sp = get_register(mBuffer, LREG_SP);
+			sp += additional_size + size;
+			set_bp(mBuffer, sp);
+
+			// set IP to the function
+			S32			opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
+			set_ip(mBuffer, opcode_start);
+
+			mEventData.mEventDataList.deleteCurrentData();
+			break;
+		}
+	}
+}
+
+void LLScriptExecuteLSL2::callNextQueuedEventHandler(U64 event_register, S32 major_version, const LLUUID &id, F32 time_slice)
+{
+	LLScriptDataCollection* eventdata = mEventData.getNextEvent();
+	if (eventdata)
+	{
+		LSCRIPTStateEventType event = eventdata->mType;
+
+		// make sure that we can actually handle this one
+		if (LSCRIPTStateBitField[event] & event_register)
+		{
+			// push a zero to be popped
+			lscript_push(mBuffer, 0);
+			// push sp as current bp
+			S32 sp = get_register(mBuffer, LREG_SP);
+			lscript_push(mBuffer, sp);
+
+			// Update current handler and current events registers.
+			set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
+			U64 current_events = get_event_register(mBuffer, LREG_CE, major_version);
+			current_events &= ~LSCRIPTStateBitField[event];
+			set_event_register(mBuffer, LREG_CE, current_events, major_version);
+
+			// push any arguments that need to be pushed onto the stack
+			// last piece of data will be type LST_NULL
+			LLScriptLibData	*data = eventdata->mData;
+			U32 size = 0;
+			while (data->mType)
+			{
+				size += lscript_push_variable(data, mBuffer);
+				data++;
+			}
+
+			// now, push any additional stack space
+			U32 current_state = get_register(mBuffer, LREG_CS);
+			S32 additional_size = get_event_stack_size(mBuffer, current_state, event) - size;
+			lscript_pusharge(mBuffer, additional_size);
+
+			// now set the bp correctly
+			sp = get_register(mBuffer, LREG_SP);
+			sp += additional_size + size;
+			set_bp(mBuffer, sp);
+
+			// set IP to the function
+			S32			opcode_start = get_state_event_opcoode_start(mBuffer, current_state, event);
+			set_ip(mBuffer, opcode_start);
+		}
+		else
+		{
+			llwarns << "Shit, somehow got an event that we're not registered for!" << llendl;
+		}
+		delete eventdata;
+	}
+}
+
+U64 LLScriptExecuteLSL2::nextState()
+{
+	// copy NS to CS
+	S32 next_state = get_register(mBuffer, LREG_NS);
+	set_register(mBuffer, LREG_CS, next_state);
+
+	// copy new state's handled events into ER (SR + CS*4 + 4)
+	return get_handled_events(mBuffer, next_state);
+}
+
+//virtual 
+void LLScriptExecuteLSL2::addEvent(LLScriptDataCollection* event)
+{
+	mEventData.addEventData(event);
+}
+
+//virtual 
+void LLScriptExecuteLSL2::removeEventType(LSCRIPTStateEventType event_type)
+{
+	mEventData.removeEventType(event_type);
+}
+
+//virtual 
+F32 LLScriptExecuteLSL2::getSleep() const
+{
+	return get_register_fp(mBuffer, LREG_SLR);
+}
+
+//virtual 
+void LLScriptExecuteLSL2::setSleep(F32 value)
+{
+	set_register_fp(mBuffer, LREG_SLR, value);
+}
+
+//virtual 
+U64 LLScriptExecuteLSL2::getCurrentHandler(S32 version)
+{
+	return get_event_register(mBuffer, LREG_IE, version);
+}
+
+//virtual 
+F32 LLScriptExecuteLSL2::getEnergy() const
+{
+	return get_register_fp(mBuffer, LREG_ESR);
+}
+
+//virtual 
+void LLScriptExecuteLSL2::setEnergy(F32 value)
+{
+	set_register_fp(mBuffer, LREG_ESR, value);
+}
+
+//virtual 
+U32 LLScriptExecuteLSL2::getFreeMemory()
+{
+	return get_register(mBuffer, LREG_SP) - get_register(mBuffer, LREG_HP);
+}
+
+//virtual 
+S32 LLScriptExecuteLSL2::getParameter()
+{
+	return get_register(mBuffer, LREG_PR);
+}
+
+//virtual 
+void LLScriptExecuteLSL2::setParameter(S32 value)
+{
+	set_register(mBuffer, LREG_PR, value);
+}
+
+
+S32 LLScriptExecuteLSL2::writeState(U8 **dest, U32 header_size, U32 footer_size)
+{
+	// data format:
+	// 4 bytes of size of Registers, Name and Description, and Global Variables
+	// Registers, Name and Description, and Global Variables data
+	// 4 bytes of size of Heap
+	// Heap data
+	// 4 bytes of stack size
+	// Stack data
+
+	S32 registers_size = get_register(mBuffer, LREG_GFR);
+
+	if (get_register(mBuffer, LREG_HP) > TOP_OF_MEMORY)
+		reset_hp_to_safe_spot(mBuffer);
+
+	S32 heap_size = get_register(mBuffer, LREG_HP) - get_register(mBuffer, LREG_HR);
+	S32 stack_size = get_register(mBuffer, LREG_TM) - get_register(mBuffer, LREG_SP);
+	S32 total_size = registers_size + LSCRIPTDataSize[LST_INTEGER] + 
+						heap_size + LSCRIPTDataSize[LST_INTEGER] + 
+						stack_size + LSCRIPTDataSize[LST_INTEGER];
+
+	// actually allocate data
+	delete[] *dest;
+	*dest = new U8[header_size + total_size + footer_size];
+	memset(*dest, 0, header_size + total_size + footer_size);
+	S32 dest_offset = header_size;
+	S32 src_offset = 0;
+
+	// registers
+	integer2bytestream(*dest, dest_offset, registers_size);
+
+	// llinfos << "Writing CE: " << getCurrentEvents() << llendl;
+	bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, registers_size);
+
+	// heap
+	integer2bytestream(*dest, dest_offset, heap_size);
+
+	src_offset = get_register(mBuffer, LREG_HR);
+	bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, heap_size);
+
+	// stack
+	integer2bytestream(*dest, dest_offset, stack_size);
+
+	src_offset = get_register(mBuffer, LREG_SP);
+	bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, stack_size);
+
+	return total_size;
+}
+
+S32 LLScriptExecuteLSL2::writeBytecode(U8 **dest)
+{
+	// data format:
+	// registers through top of heap
+	// Heap data
+	S32 total_size = get_register(mBuffer, LREG_HP);
+
+	// actually allocate data
+	delete [] *dest;
+	*dest = new U8[total_size];
+	S32 dest_offset = 0;
+	S32 src_offset = 0;
+
+	bytestream2bytestream(*dest, dest_offset, mBuffer, src_offset, total_size);
+
+	return total_size;
+}
+
+S32 LLScriptExecuteLSL2::readState(U8 *src)
+{
+	// first, blitz heap and stack
+	S32 hr = get_register(mBuffer, LREG_HR);
+	S32 tm = get_register(mBuffer, LREG_TM);
+	memset(mBuffer + hr, 0, tm - hr);
+
+	S32 src_offset = 0;
+	S32 dest_offset = 0;
+	S32 size;
+
+	// read register size
+	size = bytestream2integer(src, src_offset);
+
+	// copy data into register area
+	bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
+//	llinfos << "Read CE: " << getCurrentEvents() << llendl;
+	if (get_register(mBuffer, LREG_TM) != TOP_OF_MEMORY)
+	{
+		llwarns << "Invalid state. Top of memory register does not match"
+				<< " constant." << llendl;
+		reset_hp_to_safe_spot(mBuffer);
+		return -1;
+	}
+	
+	// read heap size
+	size = bytestream2integer(src, src_offset);
+
+	// set dest offset
+	dest_offset = get_register(mBuffer, LREG_HR);
+
+	if (dest_offset + size > TOP_OF_MEMORY)
+	{
+		reset_hp_to_safe_spot(mBuffer);
+		return -1;
+	}
+
+	// copy data into heap area
+	bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
+
+	// read stack size
+	size = bytestream2integer(src, src_offset);
+
+	// set dest offset
+	dest_offset = get_register(mBuffer, LREG_SP);
+
+	if (dest_offset + size > TOP_OF_MEMORY)
+	{
+		reset_hp_to_safe_spot(mBuffer);
+		return -1;
+	}
+
+	// copy data into heap area
+	bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
+
+	// Return offset to first byte after read data.
+	return src_offset;
+}
+
+void LLScriptExecuteLSL2::reset()
+{
+	LLScriptExecute::reset();
+
+	const U8 *src = getBytecode();
+	S32 size = getBytecodeSize();
+
+	if (!src)
+		return;
+
+	// first, blitz heap and stack
+	S32 hr = get_register(mBuffer, LREG_HR);
+	S32 tm = get_register(mBuffer, LREG_TM);
+	memset(mBuffer + hr, 0, tm - hr);
+
+	S32 dest_offset = 0;
+	S32 src_offset = 0;
+
+	bytestream2bytestream(mBuffer, dest_offset, src, src_offset, size);
+}
+
+LLScriptExecute::LLScriptExecute() :
+	mReset(FALSE)
+{
+}
+
+void LLScriptExecute::reset()
+{
+	mReset = FALSE;
+}
+
+bool LLScriptExecute::isYieldDue() const
+{
+	if(mReset)
+	{
+		return true;
+	}
+			
+	if(getSleep() > 0.f)
+	{
+		return true;
+	}
+
+	if(isFinished())
+	{
+		return true;
+	}
+
+	if(isStateChangePending())
+	{
+		return true;
+	}
+
+	return false;
+}
+
+// Run smallest number of instructions possible: 
+// a single instruction for LSL2, a segment between save tests for Mono
+void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id, 
+									 const char **errorstr, 
+									 BOOL &state_transition, 
+									 U32& events_processed,
+									 F32 quanta)
 {
 	//  is there a fault?
 	//	if yes, print out message and exit
-	state_transition = FALSE;
-	S32 value = get_register(mBuffer, LREG_VN);
+	S32 value = getVersion();
 	S32 major_version = 0;
 	if (value == LSL2_VERSION1_END_NUMBER)
 	{
@@ -313,323 +781,151 @@ U32 LLScriptExecute::run(BOOL b_print, const LLUUID &id, char **errorstr, BOOL &
 	}
 	else
 	{
-		set_fault(mBuffer, LSRF_VERSION_MISMATCH);
+		setFault(LSRF_VERSION_MISMATCH);
 	}
-	value = get_register(mBuffer, LREG_FR);
-	if (value)
+	value = getFaults();
+	if (value > LSRF_INVALID && value < LSRF_EOF)
 	{
 		if (b_print)
 		{
 			printf("Error!\n");
 		}
 		*errorstr = LSCRIPTRunTimeFaultStrings[value];
-		return NO_DELETE_FLAG;
+		return;
 	}
 	else
 	{
 		*errorstr = NULL;
 	}
 
-	//  Get IP
-	//  is IP nonzero?
-	value = get_register(mBuffer, LREG_IP);
-
-	if (value)
+	if (! isFinished())
 	{
-	//	if yes, we're in opcodes, execute the next opcode by:
-	//	call opcode run function pointer with buffer and IP
-		mInstructionCount++;
-		sGlobalInstructionCount++;
-		S32 tvalue = value;
-		S32	opcode = safe_instruction_bytestream2byte(mBuffer, tvalue);
-		S32 b_ret_val = mExecuteFuncs[opcode](mBuffer, value, b_print, id);
-		set_ip(mBuffer, value);
-		add_register_fp(mBuffer, LREG_ESR, -0.1f);
-	//	lsa_print_heap(mBuffer);
-
-		if (b_print)
-		{
-			lsa_print_heap(mBuffer);
-			printf("ip: 0x%X\n", get_register(mBuffer, LREG_IP));
-			printf("sp: 0x%X\n", get_register(mBuffer, LREG_SP));
-			printf("bp: 0x%X\n", get_register(mBuffer, LREG_BP));
-			printf("hr: 0x%X\n", get_register(mBuffer, LREG_HR));
-			printf("hp: 0x%X\n", get_register(mBuffer, LREG_HP));
-		}
-	//			update IP
-		if (b_ret_val)
-		{
-			return DELETE_FLAG | CREDIT_MONEY_FLAG;
-		}
-		else
-		{
-			return NO_DELETE_FLAG;
-		}
+		resumeEventHandler(b_print, id, quanta);
+		return;
 	}
 	else
 	{
 		// make sure that IE is zero
-		set_event_register(mBuffer, LREG_IE, 0, major_version);
-
-	//	if no, we're in a state and waiting for an event
-		S32 next_state = get_register(mBuffer, LREG_NS);
-		S32 current_state = get_register(mBuffer, LREG_CS);
-		U64 current_events = get_event_register(mBuffer, LREG_CE, major_version);
-		U64 event_register = get_event_register(mBuffer, LREG_ER, major_version);
-	//	check NS to see if need to switch states (NS != CS)
-		if (next_state != current_state)
+		setCurrentHandler(0, major_version);
+
+		//	if no, we're in a state and waiting for an event
+		U64 current_events = getCurrentEvents(major_version);
+		U64 event_register = getEventHandlers(major_version);
+
+		//	check NS to see if need to switch states (NS != CS)
+		if (isStateChangePending())
 		{
 			state_transition = TRUE;
+
 			// ok, blow away any pending events
-			mEventData.mEventDataList.deleteAllData();
+			deleteAllEvents();
 
-	//		if yes, check state exit flag is set
+			// if yes, check state exit flag is set
 			if (current_events & LSCRIPTStateBitField[LSTT_STATE_EXIT])
 			{
-	//			if yes, clear state exit flag
-				set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[LSTT_STATE_EXIT], major_version);
+				// if yes, clear state exit flag
+				setCurrentHandler(LSCRIPTStateBitField[LSTT_STATE_EXIT], major_version);
 				current_events &= ~LSCRIPTStateBitField[LSTT_STATE_EXIT];
-				set_event_register(mBuffer, LREG_CE, current_events, major_version);
-	//			check state exit event handler
-	//				if there is a handler, call it
+				setCurrentEvents(current_events, major_version);
+
+				// check state exit event handler
+				// if there is a handler, call it
 				if (event_register & LSCRIPTStateBitField[LSTT_STATE_EXIT])
 				{
-		//			push a zero to be popped
-					lscript_push(mBuffer, 0);
-		//			push sp as current bp
-					S32 sp = get_register(mBuffer, LREG_SP);
-					lscript_push(mBuffer, sp);
-
-		//			now, push any additional stack space
-					S32 additional_size = get_event_stack_size(mBuffer, current_state, LSTT_STATE_EXIT);
-					if ( additional_size == -1 )
-					{	
-						recordBoundaryError( id );
-					}
-					else
-					{
-						lscript_pusharge(mBuffer, additional_size);
-
-						sp = get_register(mBuffer, LREG_SP);
-						sp += additional_size;
-						set_bp(mBuffer, sp);
-		//				set IP to the event handler
-						setStateEventOpcoodeStartSafely( current_state, LSTT_STATE_EXIT, id );
-					}
-					return NO_DELETE_FLAG;
+					++events_processed;
+					callEventHandler(LSTT_STATE_EXIT, major_version, id, quanta);
+					return;
 				}
 			}
-	//		if no handler or no state exit flag switch to new state
-	//		set state entry flag and clear other CE flags
+
+			// if no handler or no state exit flag switch to new state
+			// set state entry flag and clear other CE flags
 			current_events = LSCRIPTStateBitField[LSTT_STATE_ENTRY];
-			set_event_register(mBuffer, LREG_CE, current_events, major_version);
-	//		copy NS to CS
-			set_register(mBuffer, LREG_CS, next_state);
-	//		copy new state's handled events into ER (SR + CS*4 + 4)
-			U64 handled_events = get_handled_events(mBuffer, next_state);
-			set_event_register(mBuffer, LREG_ER, handled_events, major_version);
+			setCurrentEvents(current_events, major_version);
+
+			U64 handled_events = nextState();
+			setEventHandlers(handled_events, major_version);
 		}
-//		check to see if any current events are covered by events handled by this state (CE & ER != 0)
-// now, we want to look like we were called like a function
-//		0x0000:		00 00 00 00 (return ip)
-//		0x0004:		bp			(current sp)
-//		0x0008:		parameters
-//		push sp
-//		add parameter size
-//		pop bp
-//		set ip
-
-		S32 size = 0;
-//			try to get next event from stack
+
+		// try to get next event from stack
 		BOOL b_done = FALSE;
 		LSCRIPTStateEventType event = LSTT_NULL;
-		LLScriptDataCollection *eventdata;
 
-		next_state = get_register(mBuffer, LREG_NS);
-		current_state = get_register(mBuffer, LREG_CS);
-		current_events = get_event_register(mBuffer, LREG_CE, major_version);
-		event_register = get_event_register(mBuffer, LREG_ER, major_version);
+		current_events = getCurrentEvents(major_version);
+		event_register = getEventHandlers(major_version);
 
 		// first, check to see if state_entry or onrez are raised and handled
-		if (  (current_events & LSCRIPTStateBitField[LSTT_STATE_ENTRY])
+		if ((current_events & LSCRIPTStateBitField[LSTT_STATE_ENTRY])
 			&&(current_events & event_register))
 		{
-			// ok, this is easy since there isn't any data waiting, just set it
-			//			push a zero to be popped
-			lscript_push(mBuffer, 0);
-//			push sp as current bp
-			S32 sp = get_register(mBuffer, LREG_SP);
-			lscript_push(mBuffer, sp);
-
-			event = return_first_event((S32)LSCRIPTStateBitField[LSTT_STATE_ENTRY]);
-			set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
-			current_events &= ~LSCRIPTStateBitField[event];
-			set_event_register(mBuffer, LREG_CE, current_events, major_version);
-//			now, push any additional stack space
-			S32 additional_size = get_event_stack_size(mBuffer, current_state, event);
-			if ( additional_size == -1 )
-			{	// b_done will be set, so we'll exit the loop at the bottom
-				recordBoundaryError( id );
-			}
-			else
-			{
-				additional_size -= size;
-				lscript_pusharge(mBuffer, additional_size);
-
-//			now set the bp correctly
-				sp = get_register(mBuffer, LREG_SP);
-				sp += additional_size + size;
-				set_bp(mBuffer, sp);
-//			set IP to the function
-				setStateEventOpcoodeStartSafely( current_state, event, id );
-			}
+			++events_processed;
+			callEventHandler(LSTT_STATE_ENTRY, major_version, id, quanta);
 			b_done = TRUE;
 		}
-		else if (  (current_events & LSCRIPTStateBitField[LSTT_REZ])
-				&&(current_events & event_register))
+		else if ((current_events & LSCRIPTStateBitField[LSTT_REZ])
+				 &&(current_events & event_register))
 		{
-			for (eventdata = mEventData.mEventDataList.getFirstData(); eventdata; eventdata = mEventData.mEventDataList.getNextData())
-			{
-				if (eventdata->mType & LSCRIPTStateBitField[LSTT_REZ])
-				{
-					//			push a zero to be popped
-					lscript_push(mBuffer, 0);
-		//			push sp as current bp
-					S32 sp = get_register(mBuffer, LREG_SP);
-					lscript_push(mBuffer, sp);
-
-					set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
-					current_events &= ~LSCRIPTStateBitField[event];
-					set_event_register(mBuffer, LREG_CE, current_events, major_version);
-
-	//				push any arguments that need to be pushed onto the stack
-					// last piece of data will be type LST_NULL
-					LLScriptLibData	*data = eventdata->mData;
-					while (data->mType)
-					{
-						size += lscript_push_variable(data, mBuffer);
-						data++;
-					}
-		//			now, push any additional stack space
-					S32 additional_size = get_event_stack_size(mBuffer, current_state, event);
-					if ( additional_size == -1 )
-					{	// b_done will be set, so we'll exit the loop at the bottom
-						recordBoundaryError( id );
-					}
-					else
-					{
-						additional_size -= size;
-						lscript_pusharge(mBuffer, additional_size);
-
-			//			now set the bp correctly
-						sp = get_register(mBuffer, LREG_SP);
-						sp += additional_size + size;
-						set_bp(mBuffer, sp);
-			//			set IP to the function
-						setStateEventOpcoodeStartSafely( current_state, event, id );
-						mEventData.mEventDataList.deleteCurrentData();
-					}
-					b_done = TRUE;
-					break;
-				}
-			}
+			++events_processed;
+			callQueuedEventHandler(LSTT_REZ, major_version, id, quanta);
+			b_done = TRUE;
 		}
 
 		while (!b_done)
 		{
-			eventdata = mEventData.getNextEvent();
-			if (eventdata)
+			// Call handler for next queued event.
+			if(getEventCount() > 0)
 			{
-				event = eventdata->mType;
-
-				// make sure that we can actually handle this one
-				if (LSCRIPTStateBitField[event] & event_register)
-				{
-					//			push a zero to be popped
-					lscript_push(mBuffer, 0);
-		//			push sp as current bp
-					S32 sp = get_register(mBuffer, LREG_SP);
-					lscript_push(mBuffer, sp);
-
-					set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
-					current_events &= ~LSCRIPTStateBitField[event];
-					set_event_register(mBuffer, LREG_CE, current_events, major_version);
-
-	//				push any arguments that need to be pushed onto the stack
-					// last piece of data will be type LST_NULL
-					LLScriptLibData	*data = eventdata->mData;
-					while (data->mType)
-					{
-						size += lscript_push_variable(data, mBuffer);
-						data++;
-					}
-					b_done = TRUE;
-		//			now, push any additional stack space
-					S32 additional_size = get_event_stack_size(mBuffer, current_state, event);
-					if ( additional_size == -1 )
-					{	// b_done was just set, so we'll exit the loop at the bottom
-						recordBoundaryError( id );
-					}
-					else
-					{
-						additional_size -= size;
-						lscript_pusharge(mBuffer, additional_size);
-
-			//			now set the bp correctly
-						sp = get_register(mBuffer, LREG_SP);
-						sp += additional_size + size;
-						set_bp(mBuffer, sp);
-			//			set IP to the function
-						setStateEventOpcoodeStartSafely( current_state, event, id );
-					}
-				}
-				else
-				{
-					llwarns << "Shit, somehow got an event that we're not registered for!" << llendl;
-				}
-				delete eventdata;
+				++events_processed;
+				callNextQueuedEventHandler(event_register, major_version, id, quanta);
+				b_done = TRUE;
 			}
 			else
 			{
-//				if no data waiting, do it the old way:
+				// if no data waiting, do it the old way:
 				U64 handled_current = current_events & event_register;
 				if (handled_current)
 				{
-					//			push a zero to be popped
-					lscript_push(mBuffer, 0);
-		//			push sp as current bp
-					S32 sp = get_register(mBuffer, LREG_SP);
-					lscript_push(mBuffer, sp);
-
 					event = return_first_event((S32)handled_current);
-					set_event_register(mBuffer, LREG_IE, LSCRIPTStateBitField[event], major_version);
-					current_events &= ~LSCRIPTStateBitField[event];
-					set_event_register(mBuffer, LREG_CE, current_events, major_version);
-		//			now, push any additional stack space
-					S32 additional_size = get_event_stack_size(mBuffer, current_state, event);
-					if ( additional_size == -1 )
-					{	// b_done will be set, so we'll exit the loop at the bottom
-						recordBoundaryError( id );
-					}
-					else
-					{
-						additional_size -= size;
-						lscript_pusharge(mBuffer, additional_size);
-
-			//			now set the bp correctly
-						sp = get_register(mBuffer, LREG_SP);
-						sp += additional_size + size;
-						set_bp(mBuffer, sp);
-			//			set IP to the function
-						setStateEventOpcoodeStartSafely( current_state, event, id );
-					}
+					++events_processed;
+					callEventHandler(event, major_version, id, quanta);
 				}
 				b_done = TRUE;
 			}
-		}	// while (!b_done)
-	} // end of else ...  in state processing code
+		}
+	}
+}
 
-	return NO_DELETE_FLAG;
+// Run for a single timeslice, or until a yield is due
+F32 LLScriptExecute::runQuanta(BOOL b_print, const LLUUID &id, const char **errorstr, BOOL &state_transition, F32 quanta, U32& events_processed, LLTimer& timer)
+{
+	U32 timer_checks = 0;
+	F32 inloop = 0;
+
+	// Loop while not finished, yield not due and time remaining
+	// NOTE: Default implementation does not do adaptive timer skipping
+	// to preserve current LSL behaviour and not break scripts that rely
+	// on current execution speed.
+	while(true)
+	{
+		runInstructions(b_print, id, errorstr, state_transition, 
+						events_processed, quanta);
+		
+		static const S32 lsl_timer_check_skip = 4;
+		if(isYieldDue())
+		{
+			break;
+		}
+		else if(timer_checks++ == lsl_timer_check_skip)
+		{
+			inloop = timer.getElapsedTimeF32();
+			if(inloop > quanta)
+			{
+				break;
+			}
+			timer_checks = 0;
+		}
+	}
+	return inloop;
 }
 
 BOOL run_noop(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
@@ -2309,14 +2605,24 @@ void list_list_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
 	}
 }
 
+static U8 safe_op_index(U8 index)
+{
+	if(index >= LST_EOF)
+	{
+		// Operations on LST_NULL will always be unknown_operation.
+		index = LST_NULL;
+	}
+	return index;
+}
+
 BOOL run_add(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 {
 	if (b_print)
 		printf("[0x%X]\tADD ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2334,8 +2640,8 @@ BOOL run_sub(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tSUB ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2352,8 +2658,8 @@ BOOL run_mul(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tMUL ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2370,8 +2676,8 @@ BOOL run_div(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tDIV ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2388,8 +2694,8 @@ BOOL run_mod(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tMOD ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2407,8 +2713,8 @@ BOOL run_eq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tEQ ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2425,8 +2731,8 @@ BOOL run_neq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tNEQ ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2443,8 +2749,8 @@ BOOL run_leq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tLEQ ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2461,8 +2767,8 @@ BOOL run_geq(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tGEQ ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2479,8 +2785,8 @@ BOOL run_less(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tLESS ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2497,8 +2803,8 @@ BOOL run_greater(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 		printf("[0x%X]\tGREATER ", offset);
 	offset++;
 	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
-	U8 arg1 = arg >> 4;
-	U8 arg2 = arg & 0xf;
+	U8 arg1 = safe_op_index(arg >> 4);
+	U8 arg2 = safe_op_index(arg & 0xf);
 	if (b_print)
 	{
 		print_type(arg1);
@@ -2640,13 +2946,12 @@ void quaternion_operation(U8 *buffer, LSCRIPTOpCodesEnum opcode)
 	}
 }
 
-
 BOOL run_neg(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 {
 	if (b_print)
 		printf("[0x%X]\tNEG ", offset);
 	offset++;
-	U8 arg = safe_instruction_bytestream2byte(buffer, offset);
+	U8 arg = safe_op_index(safe_instruction_bytestream2byte(buffer, offset));
 	if (b_print)
 	{
 		print_type(arg);
@@ -3675,56 +3980,50 @@ BOOL run_print(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 }
 
 
-void lscript_run(char *filename, BOOL b_debug)
+void lscript_run(const std::string& filename, BOOL b_debug)
 {
 	LLTimer	timer;
-	if (filename == NULL)
+
+	const char *error;
+	BOOL b_state;
+	LLScriptExecuteLSL2 *execute = NULL;
+
+	if (filename.empty())
 	{
 		llerrs << "filename is NULL" << llendl;
 		// Just reporting error is likely not enough. Need
 		// to check how to abort or error out gracefully
 		// from this function. XXXTBD
 	}
-	else
+	LLFILE* file = LLFile::fopen(filename, "r");  /* Flawfinder: ignore */
+	if(file)
 	{
-		char *error;
-		BOOL b_state;
-		LLScriptExecute *execute = NULL;
-
-		LLFILE* file = LLFile::fopen(filename, "r");
-		if (file)
-		{
-			execute = new LLScriptExecute(file);
-			// note: LLScriptExecute() closes file for us
-		}
-		file = LLFile::fopen(filename, "r");
-		if (file)
-		{
-			LLFILE* fp = LLFile::fopen("lscript.parse", "w");		/*Flawfinder: ignore*/
-			LLScriptLSOParse *parse = new LLScriptLSOParse(file);
-			parse->printData(fp);
-			delete parse;
-			fclose(file);
-			fclose(fp);
-		}
-		file = LLFile::fopen(filename, "r");
-		if (file && execute)
-		{
-			timer.reset();
-			while (!execute->run(b_debug, LLUUID::null, &error, b_state))
-				;
-			F32 time = timer.getElapsedTimeF32();
-			F32 ips = execute->mInstructionCount / time;
-			llinfos << execute->mInstructionCount << " instructions in " << time << " seconds" << llendl;
-			llinfos << ips/1000 << "K instructions per second" << llendl;
-			printf("ip: 0x%X\n", get_register(execute->mBuffer, LREG_IP));
-			printf("sp: 0x%X\n", get_register(execute->mBuffer, LREG_SP));
-			printf("bp: 0x%X\n", get_register(execute->mBuffer, LREG_BP));
-			printf("hr: 0x%X\n", get_register(execute->mBuffer, LREG_HR));
-			printf("hp: 0x%X\n", get_register(execute->mBuffer, LREG_HP));
-			delete execute;
-			fclose(file);
-		}
+		execute = new LLScriptExecuteLSL2(file);
+		fclose(file);
+	}
+	if (execute)
+	{
+		timer.reset();
+		F32 time_slice = 3600.0f; // 1 hr.
+		U32 events_processed = 0;
+
+		do {
+			LLTimer timer2;
+			execute->runQuanta(b_debug, LLUUID::null, &error, b_state, 
+							   time_slice, events_processed, timer2);
+		} while (!execute->isFinished());
+
+		F32 time = timer.getElapsedTimeF32();
+		F32 ips = execute->mInstructionCount / time;
+		llinfos << execute->mInstructionCount << " instructions in " << time << " seconds" << llendl;
+		llinfos << ips/1000 << "K instructions per second" << llendl;
+		printf("ip: 0x%X\n", get_register(execute->mBuffer, LREG_IP));
+		printf("sp: 0x%X\n", get_register(execute->mBuffer, LREG_SP));
+		printf("bp: 0x%X\n", get_register(execute->mBuffer, LREG_BP));
+		printf("hr: 0x%X\n", get_register(execute->mBuffer, LREG_HR));
+		printf("hp: 0x%X\n", get_register(execute->mBuffer, LREG_HP));
+		delete execute;
+		fclose(file);
 	}
 }
 
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
deleted file mode 100644
index 682ee83..0000000
--- a/linden/indra/lscript/lscript_execute/lscript_execute.vcproj
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="lscript_execute"
-	ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\lscript_execute.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_heapruntime.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_readlso.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\lscript_byteconvert.h">
-			</File>
-			<File
-				RelativePath="..\lscript_byteformat.h">
-			</File>
-			<File
-				RelativePath="..\lscript_execute.h">
-			</File>
-			<File
-				RelativePath=".\lscript_heapruntime.h">
-			</File>
-			<File
-				RelativePath=".\lscript_readlso.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
deleted file mode 100644
index 8a1e4c6..0000000
--- a/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="lscript_execute"
-	ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
-	RootNamespace="lscript_execute"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lscript_execute.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heapruntime.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_readlso.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\lscript_byteconvert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_byteformat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_execute.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heapruntime.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_readlso.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj
deleted file mode 100644
index eb41122..0000000
--- a/linden/indra/lscript/lscript_execute/lscript_execute_vc9.vcproj
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="lscript_execute"
-	ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"
-	RootNamespace="lscript_execute"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_execute.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lscript_execute.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heapruntime.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_readlso.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\lscript_byteconvert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_byteformat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_execute.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_heapruntime.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_readlso.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_execute_mono/assembly.cpp b/linden/indra/lscript/lscript_execute_mono/assembly.cpp
new file mode 100644
index 0000000..dd8b284
--- /dev/null
+++ b/linden/indra/lscript/lscript_execute_mono/assembly.cpp
@@ -0,0 +1,74 @@
+/**
+ * @file llassembly.cpp
+ * @brief keeps track of user scripts, ensures that only one copy exists for each
+ *
+ * $LicenseInfo:firstyear=2007&license=internal$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llassembly.h"
+#include <map>
+
+
+static std::map<std::string, LLAssembly*> sAssemblyMap;
+
+boost::intrusive_ptr<LLAssembly> LLAssembly::create(const std::string& name, 
+													const U8* buffer, U32 size)
+{
+	std::map<std::string, LLAssembly*>::iterator it = sAssemblyMap.find(name);
+	if (it != sAssemblyMap.end())
+	{
+		return it->second;
+	}
+	else
+	{
+		LLAssembly* a = new LLAssembly(name, buffer, size);
+		sAssemblyMap[name] = a;
+		return a;
+	}
+}
+
+
+LLAssembly::LLAssembly(const std::string &name, const U8* buffer, U32 size) : 
+	mName(name), mRefCount(0), mBuffer(buffer, buffer+size)
+{
+}
+
+LLAssembly::~LLAssembly() 
+{
+	std::map<std::string, LLAssembly*>::iterator it = sAssemblyMap.find(mName);
+	if (it != sAssemblyMap.end())
+	{
+		sAssemblyMap.erase(it);
+	}
+}
+
+
+void intrusive_ptr_add_ref(LLAssembly* p)
+{
+	++(p->mRefCount);
+}
+
+void intrusive_ptr_release(LLAssembly* p)
+{
+	if (0 == --(p->mRefCount))
+	{
+		delete p;
+	}
+}
+
+
diff --git a/linden/indra/lscript/lscript_execute_mono/size.cpp b/linden/indra/lscript/lscript_execute_mono/size.cpp
new file mode 100644
index 0000000..f9ca7a3
--- /dev/null
+++ b/linden/indra/lscript/lscript_execute_mono/size.cpp
@@ -0,0 +1,182 @@
+/** 
+ * NOTE: none of this actually applies as this file was taken from mono/samples
+ * @file size.c
+ * @brief file from mono samples 
+ *
+ * $LicenseInfo:firstyear=2007&license=internal$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include <glib.h>
+#include <mono/jit/jit.h>
+#include <mono/metadata/environment.h>
+#include <mono/metadata/profiler.h>
+#include <mono/metadata/tokentype.h>
+#include <mono/metadata/debug-helpers.h>
+#include <mono/metadata/llassembly.h>
+#include <string.h>
+
+#include "stdtypes.h"
+#include "linden_common.h"
+
+#define FIELD_ATTRIBUTE_STATIC 0x10
+#define FIELD_ATTRIBUTE_HAS_FIELD_RVA 0x100
+
+static int memory_usage (MonoObject *obj, GHashTable *visited, 
+			 int (*functor)(MonoObject*, MonoType*, int));
+
+static int
+memory_usage_array (MonoArray *array, GHashTable *visited,
+		    int (*functor)(MonoObject*, MonoType*, int))
+{
+  int total = 0;
+  MonoClass *array_class = mono_object_get_class ((MonoObject *) array);
+  MonoClass *element_class = mono_class_get_element_class (array_class);
+  MonoType *element_type = mono_class_get_type (element_class);
+
+  if (MONO_TYPE_IS_REFERENCE (element_type)) {
+    int i;
+
+    for (i = 0; i < mono_array_length (array); i++) {
+      MonoObject *element = (MonoObject*)mono_array_get (array, gpointer, i);
+
+      if (element != NULL)
+	total += memory_usage (element, visited, functor);
+    }
+  }
+
+  return total;
+}
+
+static int
+memory_usage (MonoObject *obj, GHashTable *visited, 
+	      int (*functor)(MonoObject*, MonoType*, int))
+{
+  int total = 0;
+  MonoClass *klass;
+  MonoType *type;
+  gpointer iter = NULL;
+  MonoClassField *field;
+
+  if (g_hash_table_lookup (visited, obj))
+    return 0;
+
+  g_hash_table_insert (visited, obj, obj);
+
+  klass = mono_object_get_class (obj);
+  type = mono_class_get_type (klass);
+
+  /* This is an array, so drill down into it */
+  if (type->type == MONO_TYPE_SZARRAY)
+    total += memory_usage_array ((MonoArray *) obj, visited, functor);
+
+  while ((field = mono_class_get_fields (klass, &iter)) != NULL) {
+    MonoType *ftype = mono_field_get_type (field);
+    gpointer value;
+
+    if ((ftype->attrs & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0)
+      continue;
+
+    /* FIXME: There are probably other types we need to drill down into */
+    switch (ftype->type) {
+
+    case MONO_TYPE_CLASS:
+    case MONO_TYPE_OBJECT:
+      mono_field_get_value (obj, field, &value);
+
+      if (value != NULL)
+	total += memory_usage ((MonoObject *) value, visited, functor);
+
+      break;
+
+    case MONO_TYPE_STRING:
+      mono_field_get_value (obj, field, &value);
+      if (value != NULL) 
+	total += mono_object_get_size ((MonoObject *) value);
+      break;
+
+    case MONO_TYPE_SZARRAY:
+      mono_field_get_value (obj, field, &value);
+
+      if (value != NULL) {
+	total += memory_usage_array ((MonoArray *) value, visited, functor);
+	total += mono_object_get_size ((MonoObject *) value);
+      }
+
+      break;
+
+    default:
+      /* printf ("Got type 0x%x\n", ftype->type); */
+      /* ignore, this will be included in mono_object_get_size () */
+      break;
+    }
+  }
+
+  total = functor(obj, type, total);
+
+  return total;
+}
+
+
+int addObjectSize(MonoObject* obj, MonoType* type, int total) 
+{
+  return total + mono_object_get_size (obj);
+}
+
+/*
+ * Only returns data for instances, not for static fields, those might
+ * be larger, or hold larger structures
+ */
+int
+GetMemoryUsage (MonoObject *obj)
+{
+  GHashTable *visited = g_hash_table_new (NULL, NULL);
+  int n;
+  
+  n = memory_usage (obj, visited, addObjectSize);
+
+  g_hash_table_destroy (visited);
+  
+  return n;
+}
+
+
+
+int printObjectSize(MonoObject* obj, MonoType* type, int total) 
+{
+  total += mono_object_get_size (obj);
+  llinfos << "Object type: " << mono_type_full_name(type) << " size: "
+	  << total << llendl;
+    
+  return total;
+}
+
+/*
+ * Only returns data for instances, not for static fields, those might
+ * be larger, or hold larger structures
+ */
+int
+PrintMemoryUsage (MonoObject *obj)
+{
+  GHashTable *visited = g_hash_table_new (NULL, NULL);
+  int n;
+  
+  n = memory_usage (obj, visited, printObjectSize);
+
+  g_hash_table_destroy (visited);
+  
+  return n;
+}
diff --git a/linden/indra/lscript/lscript_library.h b/linden/indra/lscript/lscript_library.h
index 458ab25..077c02b 100644
--- a/linden/indra/lscript/lscript_library.h
+++ b/linden/indra/lscript/lscript_library.h
@@ -43,16 +43,16 @@ class LLScriptLibData;
 class LLScriptLibraryFunction
 {
 public:
-	LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), char *name, char *ret_type, char *args, char *desc, BOOL god_only = FALSE);
+	LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, const char *desc, BOOL god_only = FALSE);
 	~LLScriptLibraryFunction();
 
 	F32  mEnergyUse;
 	F32  mSleepTime;
 	void (*mExecFunc)(LLScriptLibData *, LLScriptLibData *, const LLUUID &);
-	char *mName;
-	char *mReturnType;
-	char *mArgs;
-	char *mDesc;
+	const char *mName;
+	const char *mReturnType;
+	const char *mArgs;
+	const char *mDesc;
 	BOOL mGodOnly;
 };
 
@@ -65,7 +65,7 @@ public:
 	void init();
 
 	void addFunction(LLScriptLibraryFunction *func);
-	void assignExec(char *name, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &));
+	void assignExec(const char *name, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &));
 
 	S32						mNextNumber;
 	LLScriptLibraryFunction	**mFunctions;
@@ -146,9 +146,9 @@ public:
 		return FALSE;
 	}
 
-	S32 getListLength()
+	S32 getListLength() const
 	{
-		LLScriptLibData *data = this;
+		const LLScriptLibData *data = this;
 		S32 retval = 0;
 		while (data->mListp)
 		{
@@ -365,7 +365,7 @@ public:
 	void print(std::ostream &s, BOOL b_prepend_comma);
 	void print_separator(std::ostream& ostr, BOOL b_prepend_sep, char* sep);
 
-	void setFromCSV(char *src)
+	void setFromCSV(const char *src)
 	{
 		mType = LST_STRING;
 		mString = new char[strlen(src) + 1];	/* Flawfinder: ignore */
@@ -387,27 +387,10 @@ public:
 
 	LLScriptLibData(const LLUUID &id) : mType(LST_KEY), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
 	{
-		mKey = new char[UUID_STR_LENGTH];
-		id.toString(mKey);
-	}
-
-	LLScriptLibData(char *string) : mType(LST_STRING), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
-	{
-		if (!string)
-		{
-			mString = new char[1];
-			mString[0] = 0;
-		}
-		else
-		{
-			mString = new char[strlen(string) + 1];	/* Flawfinder: ignore */
-			if (mString == NULL)
-			{
-				llerrs << "Memory Allocation Failed" << llendl;
-				return;
-			}
-			strcpy(mString, string);	/* Flawfinder: ignore */
-		}
+		std::string idstr;
+		id.toString(idstr);
+		mKey = new char[idstr.length()+1];
+		LLStringUtil::copy(mKey,idstr.c_str(),idstr.length()+1);
 	}
 
 	LLScriptLibData(const char *string) : mType(LST_STRING), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
diff --git a/linden/indra/lscript/lscript_library/CMakeLists.txt b/linden/indra/lscript/lscript_library/CMakeLists.txt
new file mode 100644
index 0000000..f6bc67a
--- /dev/null
+++ b/linden/indra/lscript/lscript_library/CMakeLists.txt
@@ -0,0 +1,32 @@
+# -*- cmake -*-
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LScript)
+
+set(lscript_library_SOURCE_FILES
+    lscript_alloc.cpp
+    lscript_export.cpp
+    lscript_library.cpp
+    )
+
+set(lscript_library_HEADER_FILES
+    CMakeLists.txt
+
+    ../lscript_library.h
+    ../lscript_export.h
+    )
+
+set_source_files_properties(${lscript_library_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND lscript_library_SOURCE_FILES ${lscript_library_HEADER_FILES})
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LSCRIPT_INCLUDE_DIRS}
+    )
+
+add_library (lscript_library ${lscript_library_SOURCE_FILES})
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 14019d0..e7d8284 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -398,9 +398,8 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraPos", "v", "", "vector llGetCameraPos()\nGets current camera position for agent task has permissions for."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraRot", "q", "", "rotation llGetCameraRot()\nGets current camera orientation for agent task has permissions for."));
 	
-	addFunction(new LLScriptLibraryFunction(10.f, 2.f, dummy_func, "llSetPrimURL", NULL, "s", "llSetPrimURL(string url)\nUpdates the URL for the web page shown on the sides of the object."));
+	addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llSetPrimURL", NULL, "s", "llSetPrimURL(string url)\nUpdates the URL for the web page shown on the sides of the object."));
 	addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llRefreshPrimURL", NULL, "", "llRefreshPrimURL()\nReloads the web page shown on the sides of the object."));
-	
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llEscapeURL", "s", "s", "string llEscapeURL(string url)\nReturns and escaped/encoded version of url, replacing spaces with %20 etc."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llUnescapeURL", "s", "s", "string llUnescapeURL(string url)\nReturns and unescaped/unencoded version of url, replacing %20 with spaces etc."));
 
@@ -436,10 +435,20 @@ void LLScriptLibrary::init()
 	
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si", "string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRegionSay", NULL, "is", "llRegionSay(integer channel, string msg)\nbroadcasts msg to entire region on channel (not 0.)"));
-
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl", "list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR."));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetClickAction", NULL, "i", "llSetClickAction(integer action)\nSets the action performed when a prim is clicked upon."));
+
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetRegionAgentCount", "i", NULL, "int llGetRegionAgentCount()\nreturns the number of agents in a region"));
+	addFunction(new LLScriptLibraryFunction(10.f, 1.f, dummy_func, "llTextBox", NULL, "ksi", "llTextBox(key avatar, string message, integer chat_channel\nShows a dialog box on the avatar's screen with the message.\nA text box asks for input, and if entered the text is chatted on chat_channel."));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetAgentLanguage", "s", "k", "string llGetAgentLanguage(key id)\nGets the agents preferred language.."));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llDetectedTouchUV", "v", "i", "vector llDetectedTouchUV(integer number)\nreturns the u and v coordinates in the first two components of a vector, for a triggered touch event"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llDetectedTouchFace", "i", "i", "integer llDetectedTouchFace(integer number)\nreturns the index of the face on the object for a triggered touch event"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llDetectedTouchPos", "v", "i", "vector llDetectedTouchPos(integer number)\nreturns the position touched for a triggered touch event"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llDetectedTouchNormal", "v", "i", "vector llDetectedTouchNormal(integer number)\nreturns the surface normal for a triggered touch event"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llDetectedTouchBinormal", "v", "i", "vector llDetectedTouchBinormal(integer number)\nreturns the surface binormal for a triggered touch event"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llDetectedTouchST", "v", "i", "vector llDetectedTouchST(integer number)\nreturns the s and t coordinates in the first two components of a vector, for a triggered touch event"));
+
 
-		addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetClickAction", NULL, "i", "llSetClickAction(integer action)\nSets the action performed when a prim is clicked upon."));
 
 	// energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
 
@@ -448,32 +457,14 @@ void LLScriptLibrary::init()
 	// existing scripts will crash.
 }
 
-	//Ventrella Follow Cam Script Stuff
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPitch",				NULL, "f", "llSetCamPitch(-45 to 80)\n(Adjusts the angular amount that the camera aims straight ahead vs. straight down, maintaining the same distance. Analogous to 'incidence'."));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamVerticalOffset",		NULL, "f", "llSetCamVerticalOffset(-2 to 2)\nAdjusts the vertical position of the camera focus position relative to the subject"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPositionLag",			NULL, "f", "llSetCamPositionLag(0 to 3) \nHow much the camera lags as it tries to move towards its 'ideal' position"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamFocusLag",			NULL, "f", "llSetCamFocusLag(0 to 3)\nHow much the camera lags as it tries to aim towards the subject"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamDistance",			NULL, "f", "llSetCamDistance(0.5 to 10)\nSets how far away the camera wants to be from its subject"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamBehindnessAngle",		NULL, "f", "llSetCamBehindnessAngle(0 to 180)\nSets the angle in degrees within which the camera is not constrained by changes in subject rotation"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamBehindnessLag",		NULL, "f", "llSetCamBehindnessLag(0 to 3)\nSets how strongly the camera is forced to stay behind the target if outside of behindness angle"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPositionThreshold",	NULL, "f", "llSetCamPositionThreshold(0 to 4)\nSets the radius of a sphere around the camera's ideal position within which it is not affected by subject motion"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamFocusThreshold",		NULL, "f", "llSetCamFocusThreshold(0 to 4)\nSets the radius of a sphere around the camera's subject position within which its focus is not affected by subject motion"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamScriptControl",				NULL, "i", "llSetCamScriptControl(TRUE or FALSE)\nTurns on or off scripted control of the camera"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPosition",			NULL, "v", "llSetCamPosition(vector)\nSets the position of the camera"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamFocus",				NULL, "v", "llSetCamFocus(vector focus)\nSets the focus (target position) of the camera"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPositionLocked",		NULL, "i", "llSetCamPositionLocked(TRUE or FALSE)\nLocks the camera position so it will not move"));
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamFocusLocked",			NULL, "i", "llSetCamFocusLocked(TRUE or FALSE)\nLocks the camera focus so it will not move"));
-
-	//addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetForSale", "i", "ii", "integer llSetForSale(integer selltype, integer price)\nSets this object for sale in mode selltype for price.  Returns TRUE if successfully set for sale."));
-
-LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), char *name, char *ret_type, char *args, char *desc, BOOL god_only)
+LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, const char *desc, BOOL god_only)
 		: mEnergyUse(eu), mSleepTime(st), mExecFunc(exec_func), mName(name), mReturnType(ret_type), mArgs(args), mGodOnly(god_only)
 {
-	mDesc = new char[512];
+	char *mDesc_ = new char[512];
 	if (mSleepTime)
 	{
 		snprintf(	/* Flawfinder: ignore */
-			mDesc,
+			mDesc_,
 			512,
 			"%s\nSleeps script for %.1f seconds.",
 			desc,
@@ -481,9 +472,10 @@ LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_fun
 	}
 	else
 	{
-		strncpy(mDesc, desc, 512);	/* Flawfinder: ignore */
-		mDesc[511] = '\0'; // just in case.
+		strncpy(mDesc_, desc, 512);	/* Flawfinder: ignore */
+		mDesc_[511] = '\0'; // just in case.
 	}
+	mDesc = mDesc_;
 }
 
 LLScriptLibraryFunction::~LLScriptLibraryFunction()
@@ -507,7 +499,7 @@ void LLScriptLibrary::addFunction(LLScriptLibraryFunction *func)
 	mNextNumber++;
 }
 
-void LLScriptLibrary::assignExec(char *name, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &))
+void LLScriptLibrary::assignExec(const char *name, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &))
 {
 	S32 i;
 	for (i = 0; i < mNextNumber; i++)
diff --git a/linden/indra/lscript/lscript_library/lscript_library.vcproj b/linden/indra/lscript/lscript_library/lscript_library.vcproj
deleted file mode 100644
index 1a42773..0000000
--- a/linden/indra/lscript/lscript_library/lscript_library.vcproj
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="lscript_library"
-	ProjectGUID="{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\lscript_alloc.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_export.cpp">
-			</File>
-			<File
-				RelativePath=".\lscript_library.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\lscript_alloc.h">
-			</File>
-			<File
-				RelativePath="..\lscript_export.h">
-			</File>
-			<File
-				RelativePath="..\lscript_library.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj b/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
deleted file mode 100644
index 38a951b..0000000
--- a/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="lscript_library"
-	ProjectGUID="{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
-	RootNamespace="lscript_library"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lscript_alloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_export.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_library.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\lscript_alloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_export.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_library.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_library/lscript_library_vc9.vcproj b/linden/indra/lscript/lscript_library/lscript_library_vc9.vcproj
deleted file mode 100644
index 63ffbac..0000000
--- a/linden/indra/lscript/lscript_library/lscript_library_vc9.vcproj
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="lscript_library"
-	ProjectGUID="{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
-	RootNamespace="lscript_library"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/lscript_library.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\lscript_alloc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_export.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lscript_library.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\lscript_alloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_export.h"
-				>
-			</File>
-			<File
-				RelativePath="..\lscript_library.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_rt_interface.h b/linden/indra/lscript/lscript_rt_interface.h
index ec474a0..32545ca 100644
--- a/linden/indra/lscript/lscript_rt_interface.h
+++ b/linden/indra/lscript/lscript_rt_interface.h
@@ -32,10 +32,10 @@
 #ifndef LL_LSCRIPT_RT_INTERFACE_H
 #define LL_LSCRIPT_RT_INTERFACE_H
 
-BOOL lscript_compile(char *filename, BOOL is_god_like = FALSE);
+BOOL lscript_compile(char *filename, BOOL compile_to_mono, BOOL is_god_like = FALSE);
 BOOL lscript_compile(const char* src_filename, const char* dst_filename,
-					 const char* err_filename, BOOL is_god_like = FALSE);
-void lscript_run(char *filename, BOOL b_debug);
+					 const char* err_filename, BOOL compile_to_mono, const char* class_name, BOOL is_god_like = FALSE);
+void lscript_run(const std::string& filename, BOOL b_debug);
 
 
 #endif
diff --git a/linden/indra/mac_crash_logger/CMakeLists.txt b/linden/indra/mac_crash_logger/CMakeLists.txt
new file mode 100644
index 0000000..9cddb56
--- /dev/null
+++ b/linden/indra/mac_crash_logger/CMakeLists.txt
@@ -0,0 +1,79 @@
+# -*- cmake -*-
+
+project(mac_crash_logger)
+
+include(00-Common)
+include(Boost)
+include(LLCommon)
+include(LLCrashLogger)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLXML)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLCRASHLOGGER_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(mac_crash_logger_SOURCE_FILES
+    mac_crash_logger.cpp
+    llcrashloggermac.cpp
+    )
+
+set(mac_crash_logger_HEADER_FILES
+    CMakeLists.txt
+
+    llcrashloggermac.h
+    )
+
+set_source_files_properties(${mac_crash_logger_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_HEADER_FILES})
+
+set(mac_crash_logger_RESOURCE_FILES
+  Info.plist
+  CrashReporter.nib/
+  )
+set_source_files_properties(
+  ${mac_crash_logger_RESOURCE_FILES}
+  PROPERTIES
+  HEADER_FILE_ONLY TRUE
+  )
+set_source_files_properties(
+  Info.plist
+  PROPERTIES
+  MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
+  )
+SOURCE_GROUP("Resources" FILES ${mac_crash_logger_RESOURCE_FILES})
+list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_RESOURCE_FILES})
+
+add_executable(mac-crash-logger
+  MACOSX_BUNDLE
+  ${mac_crash_logger_SOURCE_FILES})
+
+target_link_libraries(mac-crash-logger
+    ${LLCRASHLOGGER_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    ${BOOST_SIGNALS_LIBRARY}
+    )
+
+add_custom_command(
+  TARGET mac-crash-logger POST_BUILD
+  COMMAND ${CMAKE_COMMAND}
+  ARGS
+    -E
+    copy_directory
+    ${CMAKE_CURRENT_SOURCE_DIR}/CrashReporter.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
+  )
+
diff --git a/linden/indra/mac_crash_logger/llcrashloggermac.cpp b/linden/indra/mac_crash_logger/llcrashloggermac.cpp
index 36d8285..8ed2ec7 100644
--- a/linden/indra/mac_crash_logger/llcrashloggermac.cpp
+++ b/linden/indra/mac_crash_logger/llcrashloggermac.cpp
@@ -57,7 +57,7 @@ LLFILE *gDebugFile = NULL;
 
 WindowRef gWindow = NULL;
 EventHandlerRef gEventHandler = NULL;
-LLString gUserNotes = "";
+std::string gUserNotes = "";
 bool gSendReport = false;
 bool gRememberChoice = false;
 IBNibRef nib = NULL;
@@ -217,16 +217,16 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles()
 		if(FSRefMakePath(&folder, (UInt8*)&path, sizeof(path)) == noErr)
 		{
 			struct stat dw_stat;
-			LLString mBuf;
+			std::string mBuf;
 			bool isLeopard = false;
 			// Try the 10.3 path first...
-			LLString dw_file_name = LLString(path) + LLString("/CrashReporter/Second Life.crash.log");
+			std::string dw_file_name = std::string(path) + std::string("/CrashReporter/Second Life.crash.log");
 			int res = stat(dw_file_name.c_str(), &dw_stat);
 
 			if (res)
 			{
 				// Try the 10.2 one next...
-				dw_file_name = LLString(path) + LLString("/Second Life.crash.log");
+				dw_file_name = std::string(path) + std::string("/Second Life.crash.log");
 				res = stat(dw_file_name.c_str(), &dw_stat);
 			}
 	
@@ -235,8 +235,8 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles()
 				//10.5: Like 10.3+, except it puts the crash time in the file instead of dividing it up
 				//using asterisks. Get a directory listing, search for files starting with second life,
 				//use the last one found.
-				LLString old_file_name, current_file_name, pathname, mask;
-				pathname = LLString(path) + LLString("/CrashReporter/");
+				std::string old_file_name, current_file_name, pathname, mask;
+				pathname = std::string(path) + std::string("/CrashReporter/");
 				mask = "Second Life*";
 				while(gDirUtilp->getNextFileInDir(pathname, mask, current_file_name, false))
 				{
@@ -331,7 +331,7 @@ bool LLCrashLoggerMac::mainLoop()
 	return true;
 }
 
-void LLCrashLoggerMac::updateApplication(LLString message)
+void LLCrashLoggerMac::updateApplication(const std::string& message)
 {
 	LLCrashLogger::updateApplication();
 }
diff --git a/linden/indra/mac_crash_logger/llcrashloggermac.h b/linden/indra/mac_crash_logger/llcrashloggermac.h
index 5577b52..292579d 100644
--- a/linden/indra/mac_crash_logger/llcrashloggermac.h
+++ b/linden/indra/mac_crash_logger/llcrashloggermac.h
@@ -43,7 +43,7 @@ public:
 	~LLCrashLoggerMac(void);
 	virtual bool init();
 	virtual bool mainLoop();
-	virtual void updateApplication(LLString message = "");
+	virtual void updateApplication(const std::string& message = LLStringUtil::null);
 	virtual bool cleanup();
 	virtual void gatherPlatformSpecificFiles();
 };
diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt
new file mode 100644
index 0000000..3ac5aee
--- /dev/null
+++ b/linden/indra/mac_updater/CMakeLists.txt
@@ -0,0 +1,82 @@
+# -*- cmake -*-
+
+project(mac_updater)
+
+include(00-Common)
+include(CURL)
+include(LLCommon)
+include(LLVFS)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    )
+
+set(mac_updater_SOURCE_FILES
+    mac_updater.cpp
+    FSCopyObject.c
+    GenLinkedList.c
+    MoreFilesX.c
+    )
+
+set(mac_updater_HEADER_FILES
+    CMakeLists.txt
+
+    FSCopyObject.h
+    GenLinkedList.h
+    MoreFilesX.h
+    )
+
+set_source_files_properties(
+    FSCopyObject.c
+    MoreFilesX.c
+    PROPERTIES
+    COMPILE_FLAGS -Wno-deprecated-declarations
+    )
+
+set_source_files_properties(${mac_updater_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND mac_updater_SOURCE_FILES ${mac_updater_HEADER_FILES})
+
+
+set(mac_updater_RESOURCE_FILES
+  Info.plist
+  AutoUpdater.nib/
+  )
+set_source_files_properties(
+  ${mac_updater_RESOURCE_FILES}
+  PROPERTIES
+  HEADER_FILE_ONLY TRUE
+  )
+set_source_files_properties(
+  Info.plist
+  PROPERTIES
+  MACOSX_PACKAGE_LOCATION . # will it blend? + poppy
+  )
+SOURCE_GROUP("Resources" FILES ${mac_updater_RESOURCE_FILES})
+list(APPEND mac_updater_SOURCE_FILES ${mac_updater_RESOURCE_FILES})
+
+
+add_executable(mac-updater
+  MACOSX_BUNDLE
+  ${mac_updater_SOURCE_FILES})
+
+target_link_libraries(mac-updater
+    ${LLVFS_LIBRARIES}
+    ${CURL_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    )
+
+add_custom_command(
+  TARGET mac-updater POST_BUILD
+  COMMAND ${CMAKE_COMMAND}
+  ARGS
+    -E
+    copy_directory
+    ${CMAKE_CURRENT_SOURCE_DIR}/AutoUpdater.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
+  )
+
+
diff --git a/linden/indra/mac_updater/MoreFilesX.c b/linden/indra/mac_updater/MoreFilesX.c
index 283628d..a157b6a 100644
--- a/linden/indra/mac_updater/MoreFilesX.c
+++ b/linden/indra/mac_updater/MoreFilesX.c
@@ -2298,6 +2298,7 @@ BadParameter:
 
 /*****************************************************************************/
 
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
 OSErr
 FSVolumeMount(
 	const void *volMountInfo,
@@ -2321,6 +2322,7 @@ BadParameter:
 
 	return ( result );
 }
+#endif
 
 /*****************************************************************************/
 
diff --git a/linden/indra/mac_updater/MoreFilesX.h b/linden/indra/mac_updater/MoreFilesX.h
index 2502905..b6793db 100644
--- a/linden/indra/mac_updater/MoreFilesX.h
+++ b/linden/indra/mac_updater/MoreFilesX.h
@@ -1509,10 +1509,12 @@ FSGetVolMountInfo(
 
 #pragma mark FSVolumeMount
 
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER
 OSErr
 FSVolumeMount(
 	const void *volMountInfo,
 	FSVolumeRefNum *volRefNum);
+#endif
 
 /*
 	The VolumeMount function mounts a volume using a volume mounting
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 15e28ac..c2f9f4d 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -50,6 +50,8 @@
 #include "MoreFilesX.h"
 #include "FSCopyObject.h"
 
+#include "llerrorcontrol.h"
+
 enum
 {
 	kEventClassCustom = 'Cust',
@@ -345,6 +347,16 @@ int main(int argc, char **argv)
 	// We assume that all the logs we're looking for reside on the current drive
 	gDirUtilp->initAppDirs("SecondLife");
 
+	LLError::initForApplication( gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+
+	// Rename current log file to ".old"
+	std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "updater.log.old");
+	std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "updater.log");
+	LLFile::rename(log_file.c_str(), old_log_file.c_str());
+
+	// Set the log file to updater.log
+	LLError::logToFile(log_file);
+
 	/////////////////////////////////////////
 	//
 	// Process command line arguments
@@ -986,7 +998,7 @@ void *updatethreadproc(void*)
 		
 		// NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder,
 		//		but if our cleanup fails, this makes it much harder for the user to unmount the image.
-		LLString mountOutput;
+		std::string mountOutput;
 		FILE* mounter = popen("hdiutil attach SecondLife.dmg -mountpoint mnt", "r");		/* Flawfinder: ignore */
 		
 		if(mounter == NULL)
diff --git a/linden/indra/newview/AutoUpdater-Info.plist b/linden/indra/newview/AutoUpdater-Info.plist
deleted file mode 100644
index 9115477..0000000
--- a/linden/indra/newview/AutoUpdater-Info.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>AutoUpdater</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.autoupdater</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
-</dict>
-</plist>
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
new file mode 100644
index 0000000..e93ea57
--- /dev/null
+++ b/linden/indra/newview/CMakeLists.txt
@@ -0,0 +1,1490 @@
+# -*- cmake -*-
+
+project(viewer)
+
+include(00-Common)
+include(Boost)
+include(BuildVersion)
+include(DirectX)
+include(ELFIO)
+include(FMOD)
+include(FindOpenGL)
+include(LLAudio)
+include(LLCharacter)
+include(LLCommon)
+include(LLImage)
+include(LLImageJ2COJ)
+include(LLInventory)
+include(LLMath)
+include(LLMedia)
+include(LLMessage)
+include(LLPrimitive)
+include(LLRender)
+include(LLUI)
+include(LLVFS)
+include(LLWindow)
+include(LLXML)
+include(LScript)
+include(Linking)
+include(Mozlib)
+include(NDOF)
+include(TemplateCheck)
+include(UI)
+include(UnixInstall)
+include(LLKDU)
+include(ViewerMiscLibs)
+
+if (WINDOWS)
+    include(CopyWinLibs)
+endif (WINDOWS)
+
+include_directories(
+    ${ELFIO_INCLUDE_DIR}
+    ${LLAUDIO_INCLUDE_DIRS}
+    ${LLCHARACTER_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLIMAGE_INCLUDE_DIRS}
+    ${LLINVENTORY_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMEDIA_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLPRIMITIVE_INCLUDE_DIRS}
+    ${LLRENDER_INCLUDE_DIRS}
+    ${LLUI_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    ${LSCRIPT_INCLUDE_DIRS}
+    ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
+    )
+
+set(viewer_SOURCE_FILES
+    llagent.cpp
+    llagentdata.cpp
+    llagentlanguage.cpp
+    llagentpilot.cpp
+    llanimstatelabels.cpp
+    llappviewer.cpp
+    llassetuploadresponders.cpp
+    llassetuploadqueue.cpp
+    llaudiosourcevo.cpp
+    llbbox.cpp
+    llbox.cpp
+    llcallbacklist.cpp
+    llcallingcard.cpp
+    llcaphttpsender.cpp
+    llchatbar.cpp
+    llclassifiedinfo.cpp
+    llclassifiedstatsresponder.cpp
+    llcloud.cpp
+    llcolorscheme.cpp
+    llcolorswatch.cpp
+    llcommandhandler.cpp
+    llcommandlineparser.cpp
+    llcompass.cpp
+    llcompilequeue.cpp
+    llconfirmationmanager.cpp
+    llconsole.cpp
+    llcontainerview.cpp
+    llcurrencyuimanager.cpp
+    llcylinder.cpp
+    lldebugmessagebox.cpp
+    lldebugview.cpp
+    lldelayedgestureerror.cpp
+    lldirpicker.cpp
+    lldrawable.cpp
+    lldrawpoolalpha.cpp
+    lldrawpoolavatar.cpp
+    lldrawpoolbump.cpp
+    lldrawpool.cpp
+    lldrawpoolground.cpp
+    lldrawpoolsimple.cpp
+    lldrawpoolsky.cpp
+    lldrawpoolterrain.cpp
+    lldrawpooltree.cpp
+    lldrawpoolwater.cpp
+    lldrawpoolwlsky.cpp
+    lldriverparam.cpp
+    lldynamictexture.cpp
+    llemote.cpp
+    lleventinfo.cpp
+    lleventnotifier.cpp
+    lleventpoll.cpp
+    llface.cpp
+    llfasttimerview.cpp
+    llfeaturemanager.cpp
+    llfilepicker.cpp
+    llfirstuse.cpp
+    llflexibleobject.cpp
+    llfloaterabout.cpp
+    llfloateractivespeakers.cpp
+    llfloateranimpreview.cpp
+    llfloaterauction.cpp
+    llfloateravatarinfo.cpp
+    llfloateravatarpicker.cpp
+    llfloateravatartextures.cpp
+    llfloaterbuildoptions.cpp
+    llfloaterbump.cpp
+    llfloaterbuycontents.cpp
+    llfloaterbuy.cpp
+    llfloaterbuycurrency.cpp
+    llfloaterbuyland.cpp
+    llfloatercamera.cpp
+    llfloaterchat.cpp
+    llfloaterchatterbox.cpp
+    llfloaterclassified.cpp
+    llfloaterclothing.cpp
+    llfloatercolorpicker.cpp
+    llfloatercustomize.cpp
+    llfloaterdaycycle.cpp
+    llfloaterdirectory.cpp
+    llfloatereditui.cpp
+    llfloaterenvsettings.cpp
+    llfloaterevent.cpp
+    llfloaterfriends.cpp
+    llfloatergesture.cpp
+    llfloatergodtools.cpp
+    llfloatergroupinfo.cpp
+    llfloatergroupinvite.cpp
+    llfloatergroups.cpp
+    llfloaterhardwaresettings.cpp
+    llfloaterhtml.cpp
+    llfloaterhtmlhelp.cpp
+    llfloaterhud.cpp
+    llfloaterimagepreview.cpp
+    llfloaterinspect.cpp
+    llfloaterjoystick.cpp
+    llfloaterlagmeter.cpp
+    llfloaterland.cpp
+    llfloaterlandholdings.cpp
+    llfloaterlandmark.cpp
+    llfloatermap.cpp
+    llfloatermemleak.cpp
+    llfloatermute.cpp
+    llfloaternamedesc.cpp
+    llfloaternewim.cpp
+    llfloateropenobject.cpp
+    llfloaterparcel.cpp
+    llfloaterpermissionsmgr.cpp
+    llfloaterpostcard.cpp
+    llfloaterpostprocess.cpp
+    llfloaterpreference.cpp
+    llfloaterproperties.cpp
+    llfloaterregioninfo.cpp
+    llfloaterreporter.cpp
+    llfloaterscriptdebug.cpp
+    llfloatersellland.cpp
+    llfloatersettingsdebug.cpp
+    llfloatersnapshot.cpp
+    llfloaterstats.cpp
+    llfloatertelehub.cpp
+    llfloatertest.cpp
+    llfloatertools.cpp
+    llfloatertopobjects.cpp
+    llfloatertos.cpp
+    llfloaterurldisplay.cpp
+    llfloaterurlentry.cpp
+    llfloatervoicedevicesettings.cpp
+    llfloaterwater.cpp
+    llfloaterwindlight.cpp
+    llfloaterworldmap.cpp
+    llfolderview.cpp
+    llfollowcam.cpp
+    llframestats.cpp
+    llframestatview.cpp
+    llgenepool.cpp
+    llgesturemgr.cpp
+    llgivemoney.cpp
+    llglsandbox.cpp
+    llgroupmgr.cpp
+    llgroupnotify.cpp
+    llhoverview.cpp
+    llhudeffectbeam.cpp
+    llhudeffect.cpp
+    llhudeffectlookat.cpp
+    llhudeffectpointat.cpp
+    llhudeffecttrail.cpp
+    llhudicon.cpp
+    llhudmanager.cpp
+    llhudobject.cpp
+    llhudrender.cpp
+    llhudtext.cpp
+    llhudview.cpp
+    llimpanel.cpp
+    llimview.cpp
+    llinventoryactions.cpp
+    llinventorybridge.cpp
+    llinventoryclipboard.cpp
+    llinventorymodel.cpp
+    llinventoryview.cpp
+    lljoystickbutton.cpp
+    lllandmarklist.cpp
+    lllogchat.cpp
+    llmanip.cpp
+    llmaniprotate.cpp
+    llmanipscale.cpp
+    llmaniptranslate.cpp
+    llmapresponders.cpp
+    llmediaremotectrl.cpp
+    llmemoryview.cpp
+    llmenucommands.cpp
+    llmimetypes.cpp
+    llmorphview.cpp
+    llmoveview.cpp
+    llmutelist.cpp
+    llnamebox.cpp
+    llnameeditor.cpp
+    llnamelistctrl.cpp
+    llnetmap.cpp
+    llnotify.cpp
+    lloverlaybar.cpp
+    llpanelaudioprefs.cpp
+    llpanelaudiovolume.cpp
+    llpanelavatar.cpp
+    llpanelclassified.cpp
+    llpanelcontents.cpp
+    llpaneldebug.cpp
+    llpaneldirbrowser.cpp
+    llpaneldirclassified.cpp
+    llpaneldirevents.cpp
+    llpaneldirfind.cpp
+    llpaneldirgroups.cpp
+    llpaneldirland.cpp
+    llpaneldirpeople.cpp
+    llpaneldirplaces.cpp
+    llpaneldirpopular.cpp
+    llpaneldisplay.cpp
+    llpanelevent.cpp
+    llpanelface.cpp
+    llpanelgeneral.cpp
+    llpanelgroup.cpp
+    llpanelgroupgeneral.cpp
+    llpanelgroupinvite.cpp
+    llpanelgrouplandmoney.cpp
+    llpanelgroupnotices.cpp
+    llpanelgrouproles.cpp
+    llpanelgroupvoting.cpp
+    llpanelinput.cpp
+    llpanelinventory.cpp
+    llpanelland.cpp
+    llpanellandmedia.cpp
+    llpanellandobjects.cpp
+    llpanellandoptions.cpp
+    llpanellogin.cpp
+    llpanelmorph.cpp
+    llpanelmsgs.cpp
+    llpanelnetwork.cpp
+    llpanelobject.cpp
+    llpanelpermissions.cpp
+    llpanelpick.cpp
+    llpanelplace.cpp
+    llpanelskins.cpp
+    llpanelvolume.cpp
+    llpanelweb.cpp
+    llparcelselection.cpp
+    llpatchvertexarray.cpp
+    llpolymesh.cpp
+    llpolymorph.cpp
+    llprefschat.cpp
+    llprefsim.cpp
+    llprefsvoice.cpp
+    llpreviewanim.cpp
+    llpreview.cpp
+    llpreviewgesture.cpp
+    llpreviewlandmark.cpp
+    llpreviewnotecard.cpp
+    llpreviewscript.cpp
+    llpreviewsound.cpp
+    llpreviewtexture.cpp
+    llprogressview.cpp
+    llregionposition.cpp
+    llremoteparcelrequest.cpp
+    llsavedsettingsglue.cpp
+    llselectmgr.cpp
+    llsky.cpp
+    llspatialpartition.cpp
+    llsprite.cpp
+    llsrv.cpp
+    llstartup.cpp
+    llstatbar.cpp
+    llstatgraph.cpp
+    llstatusbar.cpp
+    llstatview.cpp
+    llstylemap.cpp
+    llsurface.cpp
+    llsurfacepatch.cpp
+    lltexlayer.cpp
+    lltexturecache.cpp
+    lltexturectrl.cpp
+    lltexturefetch.cpp
+    lltextureview.cpp
+    lltoolbar.cpp
+    lltoolbrush.cpp
+    lltoolcomp.cpp
+    lltool.cpp
+    lltooldraganddrop.cpp
+    lltoolface.cpp
+    lltoolfocus.cpp
+    lltoolgrab.cpp
+    lltoolgun.cpp
+    lltoolindividual.cpp
+    lltoolmgr.cpp
+    lltoolmorph.cpp
+    lltoolobjpicker.cpp
+    lltoolpie.cpp
+    lltoolpipette.cpp
+    lltoolplacer.cpp
+    lltoolselect.cpp
+    lltoolselectland.cpp
+    lltoolselectrect.cpp
+    lltoolview.cpp
+    lltracker.cpp
+    lltrans.cpp
+    lluploaddialog.cpp
+    llurl.cpp
+    llurldispatcher.cpp
+    llurlhistory.cpp
+    llurlsimstring.cpp
+    llurlwhitelist.cpp
+    lluserauth.cpp
+    llvectorperfoptions.cpp
+    llvelocitybar.cpp
+    llviewchildren.cpp
+    llviewerassetstorage.cpp
+    llvieweraudio.cpp
+    llviewercamera.cpp
+    llviewercontrol.cpp
+    llviewerdisplay.cpp
+    llviewergenericmessage.cpp
+    llviewergesture.cpp
+    llviewerimage.cpp
+    llviewerimagelist.cpp
+    llviewerinventory.cpp
+    llviewerjointattachment.cpp
+    llviewerjoint.cpp
+    llviewerjointmesh.cpp
+    llviewerjointmesh_sse2.cpp
+    llviewerjointmesh_sse.cpp
+    llviewerjointmesh_vec.cpp
+    llviewerjoystick.cpp
+    llviewerkeyboard.cpp
+    llviewerlayer.cpp
+    llviewermedia.cpp
+    llviewermenu.cpp
+    llviewermenufile.cpp
+    llviewermessage.cpp
+    llviewernetwork.cpp
+    llviewerobject.cpp
+    llviewerobjectlist.cpp
+    llviewerparcelmedia.cpp
+    llviewerparcelmediaautoplay.cpp
+    llviewerparcelmgr.cpp
+    llviewerparceloverlay.cpp
+    llviewerpartsim.cpp
+    llviewerpartsource.cpp
+    llviewerregion.cpp
+    llviewershadermgr.cpp
+    llviewerstats.cpp
+    llviewertexteditor.cpp
+    llviewertextureanim.cpp
+    llviewerthrottle.cpp
+    llviewervisualparam.cpp
+    llviewerwindow.cpp
+    llvlcomposition.cpp
+    llvlmanager.cpp
+    llvoavatar.cpp
+    llvocache.cpp
+    llvoclouds.cpp
+    llvograss.cpp
+    llvoground.cpp
+    llvoiceclient.cpp
+    llvoiceremotectrl.cpp
+    llvoicevisualizer.cpp
+    llvoinventorylistener.cpp
+    llvopartgroup.cpp
+    llvosky.cpp
+    llvosurfacepatch.cpp
+    llvotextbubble.cpp
+    llvotree.cpp
+    llvovolume.cpp
+    llvowater.cpp
+    llvowlsky.cpp
+    llwatchdog.cpp
+    llwaterparammanager.cpp
+    llwaterparamset.cpp
+    llwearable.cpp
+    llwearablelist.cpp
+    llweb.cpp
+    llwebbrowserctrl.cpp
+    llwind.cpp
+    llwlanimator.cpp
+    llwldaycycle.cpp
+    llwlparammanager.cpp
+    llwlparamset.cpp
+    llworld.cpp
+    llworldmap.cpp
+    llworldmapview.cpp
+    llxmlrpctransaction.cpp
+    noise.cpp
+    pipeline.cpp
+    )
+
+if (LINUX)
+  # We can't set these flags for Darwin, because they get passed to
+  # the PPC compiler.  Ugh.
+
+  set_source_files_properties(
+      llviewerjointmesh_sse.cpp
+      PROPERTIES COMPILE_FLAGS "-msse -mfpmath=sse"
+      )
+  set_source_files_properties(
+      llviewerjointmesh_sse2.cpp
+      PROPERTIES COMPILE_FLAGS "-msse2 -mfpmath=sse"
+      )
+endif (LINUX)
+
+set(viewer_HEADER_FILES
+    CMakeLists.txt
+    ViewerInstall.cmake
+
+    llagent.h
+    llagentdata.h
+    llagentlanguage.h
+    llagentpilot.h
+    llanimstatelabels.h
+    llappearance.h
+    llappviewer.h
+    llassetuploadresponders.h
+    llassetuploadqueue.h
+    llaudiosourcevo.h
+    llbbox.h
+    llbox.h
+    llcallbacklist.h
+    llcallingcard.h
+    llcaphttpsender.h
+    llchatbar.h
+    llclassifiedinfo.h
+    llclassifiedstatsresponder.h
+    llcloud.h
+    llcolorscheme.h
+    llcolorswatch.h
+    llcommandhandler.h
+    llcommandlineparser.h
+    llcompass.h
+    llcompilequeue.h
+    llconfirmationmanager.h
+    llconsole.h
+    llcontainerview.h
+    llcurrencyuimanager.h
+    llcylinder.h
+    lldebugmessagebox.h
+    lldebugview.h
+    lldelayedgestureerror.h
+    lldirpicker.h
+    lldrawable.h
+    lldrawpool.h
+    lldrawpoolalpha.h
+    lldrawpoolavatar.h
+    lldrawpoolbump.h
+    lldrawpoolclouds.h
+    lldrawpoolground.h
+    lldrawpoolsimple.h
+    lldrawpoolsky.h
+    lldrawpoolterrain.h
+    lldrawpooltree.h
+    lldrawpoolwater.h
+    lldrawpoolwlsky.h
+    lldriverparam.h
+    lldynamictexture.h
+    llemote.h
+    lleventinfo.h
+    lleventnotifier.h
+    lleventpoll.h
+    llface.h
+    llfasttimerview.h
+    llfeaturemanager.h
+    llfilepicker.h
+    llfirstuse.h
+    llflexibleobject.h
+    llfloaterabout.h
+    llfloateractivespeakers.h
+    llfloateranimpreview.h
+    llfloaterauction.h
+    llfloateravatarinfo.h
+    llfloateravatarpicker.h
+    llfloateravatartextures.h
+    llfloaterbuildoptions.h
+    llfloaterbump.h
+    llfloaterbuy.h
+    llfloaterbuycontents.h
+    llfloaterbuycurrency.h
+    llfloaterbuyland.h
+    llfloatercamera.h
+    llfloaterchat.h
+    llfloaterchatterbox.h
+    llfloaterclassified.h
+    llfloaterclothing.h
+    llfloatercolorpicker.h
+    llfloatercustomize.h
+    llfloaterdaycycle.h
+    llfloaterdirectory.h
+    llfloatereditui.h
+    llfloaterenvsettings.h
+    llfloaterevent.h
+    llfloaterfriends.h
+    llfloatergesture.h
+    llfloatergodtools.h
+    llfloatergroupinfo.h
+    llfloatergroupinvite.h
+    llfloatergroups.h
+    llfloaterhardwaresettings.h
+    llfloaterhtml.h
+    llfloaterhtmlhelp.h
+    llfloaterhud.h
+    llfloaterimagepreview.h
+    llfloaterinspect.h
+    llfloaterjoystick.h
+    llfloaterlagmeter.h
+    llfloaterland.h
+    llfloaterlandholdings.h
+    llfloaterlandmark.h
+    llfloatermap.h
+    llfloatermemleak.h
+    llfloatermute.h
+    llfloaternamedesc.h
+    llfloaternewim.h
+    llfloateropenobject.h
+    llfloaterparcel.h
+    llfloaterpermissionsmgr.h
+    llfloaterpostcard.h
+    llfloaterpostprocess.h
+    llfloaterpreference.h
+    llfloaterproperties.h
+    llfloaterregioninfo.h
+    llfloaterreporter.h
+    llfloaterscriptdebug.h
+    llfloatersellland.h
+    llfloatersettingsdebug.h
+    llfloatersnapshot.h
+    llfloaterstats.h
+    llfloatertelehub.h
+    llfloatertest.h
+    llfloatertools.h
+    llfloatertopobjects.h
+    llfloatertos.h
+    llfloaterurldisplay.h
+    llfloaterurlentry.h
+    llfloatervoicedevicesettings.h
+    llfloaterwater.h
+    llfloaterwindlight.h
+    llfloaterworldmap.h
+    llfolderview.h
+    llfollowcam.h
+    llframestats.h
+    llframestatview.h
+    llgenepool.h
+    llgesturemgr.h
+    llgivemoney.h
+    llgroupmgr.h
+    llgroupnotify.h
+    llhoverview.h
+    llhudeffect.h
+    llhudeffectbeam.h
+    llhudeffectlookat.h
+    llhudeffectpointat.h
+    llhudeffecttrail.h
+    llhudicon.h
+    llhudmanager.h
+    llhudobject.h
+    llhudrender.h
+    llhudtext.h
+    llhudview.h
+    llimpanel.h
+    llimview.h
+    llinventorybridge.h
+    llinventoryclipboard.h
+    llinventorymodel.h
+    llinventoryview.h
+    lljoystickbutton.h
+    lllandmarklist.h
+    lllightconstants.h
+    lllogchat.h
+    llmanip.h
+    llmaniprotate.h
+    llmanipscale.h
+    llmaniptranslate.h
+    llmapresponders.h
+    llmediaremotectrl.h
+    llmemoryview.h
+    llmenucommands.h
+    llmimetypes.h
+    llmorphview.h
+    llmoveview.h
+    llmutelist.h
+    llnamebox.h
+    llnameeditor.h
+    llnamelistctrl.h
+    llnetmap.h
+    llnotify.h
+    lloverlaybar.h
+    llpanelaudioprefs.h
+    llpanelaudiovolume.h
+    llpanelavatar.h
+    llpanelclassified.h
+    llpanelcontents.h
+    llpaneldebug.h
+    llpaneldirbrowser.h
+    llpaneldirclassified.h
+    llpaneldirevents.h
+    llpaneldirfind.h
+    llpaneldirgroups.h
+    llpaneldirland.h
+    llpaneldirpeople.h
+    llpaneldirplaces.h
+    llpaneldirpopular.h
+    llpaneldisplay.h
+    llpanelevent.h
+    llpanelface.h
+    llpanelgeneral.h
+    llpanelgroup.h
+    llpanelgroupgeneral.h
+    llpanelgroupinvite.h
+    llpanelgrouplandmoney.h
+    llpanelgroupnotices.h
+    llpanelgrouproles.h
+    llpanelgroupvoting.h
+    llpanelinput.h
+    llpanelinventory.h
+    llpanelland.h
+    llpanellandmedia.h
+    llpanellandobjects.h
+    llpanellandoptions.h
+    llpanelLCD.h
+    llpanellogin.h
+    llpanelmorph.h
+    llpanelmsgs.h
+    llpanelnetwork.h
+    llpanelobject.h
+    llpanelpermissions.h
+    llpanelpick.h
+    llpanelplace.h
+    llpanelskins.h
+    llpanelvolume.h
+    llpanelweb.h
+    llparcelselection.h
+    llpatchvertexarray.h
+    llpolymesh.h
+    llpolymorph.h
+    llprefschat.h
+    llprefsim.h
+    llprefsvoice.h
+    llpreview.h
+    llpreviewanim.h
+    llpreviewgesture.h
+    llpreviewlandmark.h
+    llpreviewnotecard.h
+    llpreviewscript.h
+    llpreviewsound.h
+    llpreviewtexture.h
+    llprogressview.h
+    llregionposition.h
+    llremoteparcelrequest.h
+    llresourcedata.h
+    llsavedsettingsglue.h
+    llselectmgr.h
+    llsky.h
+    llspatialpartition.h
+    llsprite.h
+    llsrv.h
+    llstartup.h
+    llstatbar.h
+    llstatgraph.h
+    llstatusbar.h
+    llstatview.h
+    llstylemap.h
+    llsurface.h
+    llsurfacepatch.h
+    lltable.h
+    lltexlayer.h
+    lltexturecache.h
+    lltexturectrl.h
+    lltexturefetch.h
+    lltextureview.h
+    lltool.h
+    lltoolbar.h
+    lltoolbrush.h
+    lltoolcomp.h
+    lltooldraganddrop.h
+    lltoolface.h
+    lltoolfocus.h
+    lltoolgrab.h
+    lltoolgun.h
+    lltoolindividual.h
+    lltoolmgr.h
+    lltoolmorph.h
+    lltoolobjpicker.h
+    lltoolpie.h
+    lltoolpipette.h
+    lltoolplacer.h
+    lltoolselect.h
+    lltoolselectland.h
+    lltoolselectrect.h
+    lltoolview.h
+    lltracker.h
+    lltrans.h
+    lluiconstants.h
+    lluploaddialog.h
+    llurl.h
+    llurldispatcher.h
+    llurlhistory.h
+    llurlsimstring.h
+    llurlwhitelist.h
+    lluserauth.h
+    llvectorperfoptions.h
+    llvelocitybar.h
+    llviewchildren.h
+    llviewerassetstorage.h
+    llvieweraudio.h
+    llviewerbuild.h
+    llviewercamera.h
+    llviewercontrol.h
+    llviewerdisplay.h
+    llviewergenericmessage.h
+    llviewergesture.h
+    llviewerimage.h
+    llviewerimagelist.h
+    llviewerinventory.h
+    llviewerjoint.h
+    llviewerjointattachment.h
+    llviewerjointmesh.h
+    llviewerjoystick.h
+    llviewerkeyboard.h
+    llviewerlayer.h
+    llviewermedia.h
+    llviewermenu.h
+    llviewermenufile.h
+    llviewermessage.h
+    llviewernetwork.h
+    llviewerobject.h
+    llviewerobjectlist.h
+    llviewerparcelmedia.h
+    llviewerparcelmediaautoplay.h
+    llviewerparcelmgr.h
+    llviewerparceloverlay.h
+    llviewerpartsim.h
+    llviewerpartsource.h
+    llviewerprecompiledheaders.h
+    llviewerregion.h
+    llviewershadermgr.h
+    llviewerstats.h
+    llviewertexteditor.h
+    llviewertextureanim.h
+    llviewerthrottle.h
+    llviewervisualparam.h
+    llviewerwindow.h
+    llvlcomposition.h
+    llvlmanager.h
+    llvoavatar.h
+    llvocache.h
+    llvoclouds.h
+    llvograss.h
+    llvoground.h
+    llvoiceclient.h
+    llvoiceremotectrl.h
+    llvoicevisualizer.h
+    llvoinventorylistener.h
+    llvopartgroup.h
+    llvosky.h
+    llvosurfacepatch.h
+    llvotextbubble.h
+    llvotree.h
+    llvotreenew.h
+    llvovolume.h
+    llvowater.h
+    llvowlsky.h
+    llwatchdog.h
+    llwaterparammanager.h
+    llwaterparamset.h
+    llwearable.h
+    llwearablelist.h
+    llweb.h
+    llwebbrowserctrl.h
+    llwind.h
+    llwindebug.h
+    llwlanimator.h
+    llwldaycycle.h
+    llwlparammanager.h
+    llwlparamset.h
+    llworld.h
+    llworldmap.h
+    llworldmapview.h
+    llxmlrpctransaction.h
+    macmain.h
+    noise.h
+    pipeline.h
+    randgauss.h
+    VertexCache.h
+    VorbisFramework.h
+    )
+
+source_group("CMake Rules" FILES ViewerInstall.cmake)
+
+if (DARWIN)
+  LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp)
+
+  find_library(AGL_LIBRARY AGL)
+  find_library(APPKIT_LIBRARY AppKit)
+  find_library(COCOA_LIBRARY Cocoa)
+  find_library(IOKIT_LIBRARY IOKit)
+
+  set(viewer_LIBRARIES
+    ${COCOA_LIBRARY}
+    ${AGL_LIBRARY}
+    ${IOKIT_LIBRARY}
+    )
+
+  # Add resource files to the project.
+  set(viewer_RESOURCE_FILES
+    secondlife.icns
+    macview.r
+    gpu_table.txt
+    Info-SecondLife.plist
+    SecondLife.nib/
+    # CMake doesn't seem to support Xcode language variants well just yet
+    English.lproj/InfoPlist.strings
+    English.lproj/language.txt
+    German.lproj/language.txt
+    Japanese.lproj/language.txt
+    Korean.lproj/language.txt
+    )
+  set_source_files_properties(
+    ${viewer_RESOURCE_FILES}
+    PROPERTIES
+    HEADER_FILE_ONLY TRUE
+    #MACOSX_PACKAGE_LOCATION Resources #don't do this! this tells cmake to copy the files.
+    )
+  SOURCE_GROUP("Resources" FILES ${viewer_RESOURCE_FILES})
+  list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})
+endif (DARWIN)
+
+if (LINUX)
+    LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
+    LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
+
+    set(viewer_LIBRARIES
+        Xinerama
+        )
+endif (LINUX)
+
+if (WINDOWS)
+    list(APPEND viewer_SOURCE_FILES
+         llappviewerwin32.cpp
+         llwindebug.cpp
+         )
+
+    list(APPEND viewer_HEADER_FILES
+         llappviewerwin32.h
+         llwindebug.h
+         )
+
+    # precompiled header configuration
+    # llviewerprecompiledheaders.cpp generates
+    # the .pch file.
+    # All sources added to viewer_SOURCE_FILES 
+    # at this point use it.
+    set_source_files_properties(llviewerprecompiledheaders.cpp
+        PROPERTIES
+        COMPILE_FLAGS "/Ycllviewerprecompiledheaders.h"
+        )        
+    foreach( src_file ${viewer_SOURCE_FILES} )
+        set_source_files_properties(
+            ${src_file}
+            PROPERTIES
+            COMPILE_FLAGS "/Yullviewerprecompiledheaders.h"
+            )        
+    endforeach( src_file ${viewer_SOURCE_FILES} )
+    list(APPEND viewer_SOURCE_FILES llviewerprecompiledheaders.cpp)
+    
+    # Add resource files to the project.
+    # viewerRes.rc is the only buildable file, but
+    # the rest are all dependencies of it.
+    set(viewer_RESOURCE_FILES
+        res/arrow.cur
+        res/arrowcop.cur
+        res/arrowcopmulti.cur
+        res/arrowdrag.cur
+        res/bitmap2.bmp
+        res/circleandline.cur
+        res/icon1.ico
+        res/install_icon.BMP
+        res/install_icon.ico
+        res/llarrow.cur
+        res/llarrowdrag.cur
+        res/llarrowdragmulti.cur
+        res/llarrowlocked.cur
+        res/llgrablocked.cur
+        res/llno.cur
+        res/llnolocked.cur
+        res/lltoolcamera.cur
+        res/lltoolcreate.cur
+        res/lltoolfocus.cur
+        res/lltoolgrab.cur
+        res/lltoolland.cur
+        res/lltoolpan.cur
+        res/lltoolpipette.cur
+        res/lltoolrotate.cur
+        res/lltoolscale.cur
+        res/lltooltranslate.cur
+        res/lltoolzoomin.cur
+        res/lltoolzoomout.cur
+        res/ll_icon.BMP
+        res/ll_icon.ico
+        res/loginbackground.bmp
+        res/resource.h
+        res/toolbuy.cur
+        res/toolopen.cur
+        res/toolpay.cur
+        res/toolpickobject.cur
+        res/toolpickobject2.cur
+        res/toolpickobject3.cur
+        res/toolpipette.cur
+        res/toolsit.cur
+        res/uninstall_icon.BMP
+        res/uninstall_icon.ico
+        )
+
+    set_source_files_properties(${viewer_RESOURCE_FILES}
+                                PROPERTIES HEADER_FILE_ONLY TRUE)
+
+    set(viewer_RESOURCE_FILES 
+        res/viewerRes.rc 
+        ${viewer_RESOURCE_FILES}
+        )
+
+    SOURCE_GROUP("Resource Files" FILES ${viewer_RESOURCE_FILES})
+
+    list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})
+
+    find_library(DINPUT_LIBRARY dinput8 ${DIRECTX_LIBRARY_DIR})
+    find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
+    mark_as_advanced(
+        DINPUT_LIBRARY
+        DXGUID_LIBRARY
+        )
+
+    set(viewer_LIBRARIES
+        advapi32
+        comdlg32
+        ${DINPUT_LIBRARY}
+        ${DXGUID_LIBRARY}
+        fmodvc
+        gdi32
+        kernel32
+        odbc32
+        odbccp32
+        ole32
+        oleaut32
+        opengl32
+        shell32
+        user32
+        Vfw32
+        winspool
+        )
+
+    find_library(INTEL_MEMOPS_LIBRARY
+                 NAMES ll_intel_memops
+                 PATHS
+                 optimized ${ARCH_PREBUILT_DIRS_RELEASE}
+                 debug ${ARCH_PREBUILT_DIRS_DEBUG}
+                 )
+    mark_as_advanced(INTEL_MEMOPS_LIBRARY)
+
+    if (INTEL_MEMOPS_LIBRARY)
+      list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY})
+    endif (INTEL_MEMOPS_LIBRARY)
+endif (WINDOWS)
+
+# Add the xui files. This is handy for searching for xui elements
+# from within the IDE
+set(viewer_XUI_FILES
+    skins/default/colors.xml
+    skins/default/colors_base.xml
+    skins/default/xui/en-us/alerts.xml
+    skins/default/xui/en-us/floater_about_land.xml
+    skins/default/xui/en-us/floater_about.xml
+    skins/default/xui/en-us/floater_active_speakers.xml
+    skins/default/xui/en-us/floater_animation_preview.xml
+    skins/default/xui/en-us/floater_auction.xml
+    skins/default/xui/en-us/floater_audio_volume.xml
+    skins/default/xui/en-us/floater_avatar_picker.xml
+    skins/default/xui/en-us/floater_avatar_textures.xml
+    skins/default/xui/en-us/floater_build_options.xml
+    skins/default/xui/en-us/floater_bumps.xml
+    skins/default/xui/en-us/floater_buy_contents.xml
+    skins/default/xui/en-us/floater_buy_currency.xml
+    skins/default/xui/en-us/floater_buy_land.xml
+    skins/default/xui/en-us/floater_buy_object.xml
+    skins/default/xui/en-us/floater_camera.xml
+    skins/default/xui/en-us/floater_chat_history.xml
+    skins/default/xui/en-us/floater_chatterbox.xml
+    skins/default/xui/en-us/floater_choose_group.xml
+    skins/default/xui/en-us/floater_clothing.xml
+    skins/default/xui/en-us/floater_color_picker.xml
+    skins/default/xui/en-us/floater_critical.xml
+    skins/default/xui/en-us/floater_customize.xml
+    skins/default/xui/en-us/floater_day_cycle_options.xml
+    skins/default/xui/en-us/floater_device_settings.xml
+    skins/default/xui/en-us/floater_directory.xml
+    skins/default/xui/en-us/floater_env_settings.xml
+    skins/default/xui/en-us/floater_gesture.xml
+    skins/default/xui/en-us/floater_god_tools.xml
+    skins/default/xui/en-us/floater_group_info.xml
+    skins/default/xui/en-us/floater_hardware_settings.xml
+    skins/default/xui/en-us/floater_html.xml
+    skins/default/xui/en-us/floater_hud.xml
+    skins/default/xui/en-us/floater_image_preview.xml
+    skins/default/xui/en-us/floater_import.xml
+    skins/default/xui/en-us/floater_im.xml
+    skins/default/xui/en-us/floater_inspect.xml
+    skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+    skins/default/xui/en-us/floater_instant_message_group.xml
+    skins/default/xui/en-us/floater_instant_message.xml
+    skins/default/xui/en-us/floater_inventory_item_properties.xml
+    skins/default/xui/en-us/floater_inventory_view_finder.xml
+    skins/default/xui/en-us/floater_inventory.xml
+    skins/default/xui/en-us/floater_joystick.xml
+    skins/default/xui/en-us/floater_lagmeter.xml
+    skins/default/xui/en-us/floater_land_holdings.xml
+    skins/default/xui/en-us/floater_landmark_ctrl.xml
+    skins/default/xui/en-us/floater_live_lsleditor.xml
+    skins/default/xui/en-us/floater_lsl_guide.xml
+    skins/default/xui/en-us/floater_media_browser.xml
+    skins/default/xui/en-us/floater_moveview.xml
+    skins/default/xui/en-us/floater_mute_object.xml
+    skins/default/xui/en-us/floater_mute.xml
+    skins/default/xui/en-us/floater_my_friends.xml
+    skins/default/xui/en-us/floater_name_description.xml
+    skins/default/xui/en-us/floater_new_im.xml
+    skins/default/xui/en-us/floater_new_outfit_dialog.xml
+    skins/default/xui/en-us/floater_openobject.xml
+    skins/default/xui/en-us/floater_pay_object.xml
+    skins/default/xui/en-us/floater_pay.xml
+    skins/default/xui/en-us/floater_postcard.xml
+    skins/default/xui/en-us/floater_post_process.xml
+    skins/default/xui/en-us/floater_preferences.xml
+    skins/default/xui/en-us/floater_preview_animation.xml
+    skins/default/xui/en-us/floater_preview_classified.xml
+    skins/default/xui/en-us/floater_preview_embedded_texture.xml
+    skins/default/xui/en-us/floater_preview_event.xml
+    skins/default/xui/en-us/floater_preview_existing_landmark.xml
+    skins/default/xui/en-us/floater_preview_gesture.xml
+    skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
+    skins/default/xui/en-us/floater_preview_notecard.xml
+    skins/default/xui/en-us/floater_preview_sound.xml
+    skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
+    skins/default/xui/en-us/floater_preview_texture.xml
+    skins/default/xui/en-us/floater_preview_url.xml
+    skins/default/xui/en-us/floater_price_for_listing.xml
+    skins/default/xui/en-us/floater_profile.xml
+    skins/default/xui/en-us/floater_region_info.xml
+    skins/default/xui/en-us/floater_report_abuse.xml
+    skins/default/xui/en-us/floater_report_bug.xml
+    skins/default/xui/en-us/floater_script_debug.xml
+    skins/default/xui/en-us/floater_script_ed_panel.xml
+    skins/default/xui/en-us/floater_script_preview.xml
+    skins/default/xui/en-us/floater_script_queue.xml
+    skins/default/xui/en-us/floater_script_search.xml
+    skins/default/xui/en-us/floater_select_key.xml
+    skins/default/xui/en-us/floater_sell_land.xml
+    skins/default/xui/en-us/floater_settings_debug.xml
+    skins/default/xui/en-us/floater_sim_release_message.xml
+    skins/default/xui/en-us/floater_snapshot.xml
+    skins/default/xui/en-us/floater_sound_preview.xml
+    skins/default/xui/en-us/floater_telehub.xml
+    skins/default/xui/en-us/floater_test.xml
+    skins/default/xui/en-us/floater_texture_ctrl.xml
+    skins/default/xui/en-us/floater_tools.xml
+    skins/default/xui/en-us/floater_top_objects.xml
+    skins/default/xui/en-us/floater_tos.xml
+    skins/default/xui/en-us/floater_url_entry.xml
+    skins/default/xui/en-us/floater_voice_wizard.xml
+    skins/default/xui/en-us/floater_water.xml
+    skins/default/xui/en-us/floater_wearable_save_as.xml
+    skins/default/xui/en-us/floater_windlight_options.xml
+    skins/default/xui/en-us/floater_world_map.xml
+    skins/default/xui/en-us/menu_inventory.xml
+    skins/default/xui/en-us/menu_login.xml
+    skins/default/xui/en-us/menu_pie_attachment.xml
+    skins/default/xui/en-us/menu_pie_avatar.xml
+    skins/default/xui/en-us/menu_pie_land.xml
+    skins/default/xui/en-us/menu_pie_object.xml
+    skins/default/xui/en-us/menu_pie_self.xml
+    skins/default/xui/en-us/menu_slurl.xml
+    skins/default/xui/en-us/menu_viewer.xml
+    skins/default/xui/en-us/mime_types.xml
+    skins/default/xui/en-us/notify.xml
+    skins/default/xui/en-us/panel_audio_device.xml
+    skins/default/xui/en-us/panel_audio.xml
+    skins/default/xui/en-us/panel_avatar_classified.xml
+    skins/default/xui/en-us/panel_avatar_pick.xml
+    skins/default/xui/en-us/panel_avatar.xml
+    skins/default/xui/en-us/panel_bars.xml
+    skins/default/xui/en-us/panel_bg_tab.xml
+    skins/default/xui/en-us/panel_bg_toolbar.xml
+    skins/default/xui/en-us/panel_chat_bar.xml
+    skins/default/xui/en-us/panel_classified.xml
+    skins/default/xui/en-us/panel_event.xml
+    skins/default/xui/en-us/panel_friends.xml
+    skins/default/xui/en-us/panel_group_finder.xml
+    skins/default/xui/en-us/panel_group_general.xml
+    skins/default/xui/en-us/panel_group_invite.xml
+    skins/default/xui/en-us/panel_group_land_money.xml
+    skins/default/xui/en-us/panel_group_notices.xml
+    skins/default/xui/en-us/panel_group_roles.xml
+    skins/default/xui/en-us/panel_groups.xml
+    skins/default/xui/en-us/panel_group_voting.xml
+    skins/default/xui/en-us/panel_group.xml
+    skins/default/xui/en-us/panel_land_covenant.xml
+    skins/default/xui/en-us/panel_login.xml
+    skins/default/xui/en-us/panel_master_volume.xml
+    skins/default/xui/en-us/panel_media_controls.xml
+    skins/default/xui/en-us/panel_media_remote_expanded.xml
+    skins/default/xui/en-us/panel_media_remote.xml
+    skins/default/xui/en-us/panel_overlaybar.xml
+    skins/default/xui/en-us/panel_place_small.xml
+    skins/default/xui/en-us/panel_place.xml
+    skins/default/xui/en-us/panel_preferences_audio.xml
+    skins/default/xui/en-us/panel_preferences_chat.xml
+    skins/default/xui/en-us/panel_preferences_general.xml
+    skins/default/xui/en-us/panel_preferences_graphics1.xml
+    skins/default/xui/en-us/panel_preferences_im.xml
+    skins/default/xui/en-us/panel_preferences_input.xml
+    skins/default/xui/en-us/panel_preferences_network.xml
+    skins/default/xui/en-us/panel_preferences_popups.xml
+    skins/default/xui/en-us/panel_preferences_voice.xml
+    skins/default/xui/en-us/panel_preferences_web.xml
+    skins/default/xui/en-us/panel_region_covenant.xml
+    skins/default/xui/en-us/panel_region_debug.xml
+    skins/default/xui/en-us/panel_region_estate.xml
+    skins/default/xui/en-us/panel_region_general.xml
+    skins/default/xui/en-us/panel_region_terrain.xml
+    skins/default/xui/en-us/panel_region_texture.xml
+    skins/default/xui/en-us/panel_scrolling_param.xml
+    skins/default/xui/en-us/panel_speaker_controls.xml
+    skins/default/xui/en-us/panel_status_bar.xml
+    skins/default/xui/en-us/panel_toolbar.xml
+    skins/default/xui/en-us/panel_top_pick.xml
+    skins/default/xui/en-us/panel_voice_controls.xml
+    skins/default/xui/en-us/panel_voice_enable.xml
+    skins/default/xui/en-us/panel_voice_options.xml
+    skins/default/xui/en-us/panel_voice_remote_expanded.xml
+    skins/default/xui/en-us/panel_voice_remote.xml
+    skins/default/xui/en-us/role_actions.xml
+    skins/default/xui/en-us/strings.xml
+    skins/default/xui/en-us/teleport_strings.xml
+    skins/default/xui/en-us/xui_version.xml
+    )
+
+source_group("XUI Files" FILES ${viewer_XUI_FILES})
+
+set_source_files_properties(${viewer_XUI_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
+
+set(viewer_APPSETTINGS_FILES
+    app_settings/anim.ini
+    app_settings/cmd_line.xml
+    app_settings/grass.xml
+    app_settings/high_graphics.xml
+    app_settings/keys.ini
+    app_settings/keywords.ini
+    app_settings/logcontrol.xml
+    app_settings/low_graphics.xml
+    app_settings/mid_graphics.xml
+    app_settings/settings.xml
+    app_settings/settings_crash_behavior.xml
+    app_settings/settings_files.xml
+    app_settings/settings_per_account.xml
+    app_settings/std_bump.ini
+    app_settings/trees.xml
+    app_settings/ultra_graphics.xml
+    app_settings/viewerart.xml
+    ${CMAKE_SOURCE_DIR}/../etc/message.xml
+    ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
+    )
+
+source_group("App Settings" FILES ${viewer_APPSETTINGS_FILES})
+
+set_source_files_properties(${viewer_APPSETTINGS_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND viewer_SOURCE_FILES ${viewer_APPSETTINGS_FILES})
+
+set(viewer_CHARACTER_FILES
+    character/attentions.xml
+    character/attentionsN.xml
+    character/avatar_lad.xml
+    character/avatar_skeleton.xml
+    character/genepool.xml
+    )
+
+source_group("Character File" FILES ${viewer_CHARACTER_FILES})
+
+set_source_files_properties(${viewer_CHARACTER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
+
+if (FMOD)
+  set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS -DLL_FMOD)
+
+  if (NOT WINDOWS)
+    set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
+    add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
+    set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY})
+    if (DARWIN)
+      list(APPEND fmodwrapper_needed_LIBRARIES ${CARBON_LIBRARY})
+      set_target_properties(
+        fmodwrapper
+        PROPERTIES
+        BUILD_WITH_INSTALL_RPATH 1
+        INSTALL_NAME_DIR "@executable_path/../Resources"
+        )
+    endif (DARWIN)
+    set(FMODWRAPPER_LIBRARY fmodwrapper)
+    target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
+  endif (NOT WINDOWS)
+endif (FMOD)
+
+list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
+
+set_source_files_properties(${viewer_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+add_executable(secondlife-bin
+    WIN32
+    MACOSX_BUNDLE
+    ${viewer_SOURCE_FILES}
+    )
+check_message_template(secondlife-bin)
+
+if (LLKDU_LIBRARY)
+  add_dependencies(secondlife-bin ${LLKDU_LIBRARY})
+endif (LLKDU_LIBRARY)
+
+set(PACKAGE OFF CACHE BOOL
+    "Add a package target that builds an installer package.")
+
+if (WINDOWS)
+    if(MSVC71)
+        set(release_flags "/MAP:Release/secondlife-bin.map /MAPINFO:LINES")
+    else(MSVC71)
+        set(release_flags "/MAP:Release/secondlife-bin.map")
+    endif(MSVC71)
+    
+    set_target_properties(secondlife-bin
+        PROPERTIES
+        LINK_FLAGS "/debug /NODEFAULTLIB:MSVCRT /SUBSYSTEM:WINDOWS"
+        LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD"
+        LINK_FLAGS_RELEASE ${release_flags}
+        )
+
+    # sets the 'working directory' for debugging from visual studio.
+    if (NOT UNATTENDED)
+        add_custom_command(
+            TARGET secondlife-bin PRE_BUILD
+            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
+            ARGS
+              --solution 
+              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
+              --workingdir
+              secondlife-bin
+              ${CMAKE_CURRENT_SOURCE_DIR}
+            COMMENT "Setting the secondlife-bin working directory for debugging."
+            )
+    endif (NOT UNATTENDED)
+
+    add_custom_command(
+        TARGET secondlife-bin PRE_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_if_different
+          ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/messages/message_template.msg
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message_template.msg
+        COMMENT "Copying message_template.msg to the runtime folder."
+        )
+
+    add_custom_command(
+        TARGET secondlife-bin PRE_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_if_different
+          ${CMAKE_CURRENT_SOURCE_DIR}/../../etc/message.xml
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message.xml
+        COMMENT "Copying message.xml to the runtime folder."
+        )
+       
+    add_dependencies(secondlife-bin copy_win_libs)
+
+    if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
+      add_dependencies(secondlife-bin copy_win_scripts)
+    endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
+        
+    add_custom_command(
+        OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+          --configuration=${CMAKE_CFG_INTDIR}
+          --channel=${VIEWER_CHANNEL}
+          --login_channel=${VIEWER_CHANNEL}
+          --grid=${GRID}
+          --source=${CMAKE_CURRENT_SOURCE_DIR}
+              --artwork=${ARTWORK_DIR}
+              --build=${CMAKE_CURRENT_BINARY_DIR}
+              --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+              --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
+        DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+        )
+    if (PACKAGE)
+      add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
+      add_dependencies(package windows-updater windows-crash-logger)
+    endif (PACKAGE)
+endif (WINDOWS)
+
+target_link_libraries(secondlife-bin
+    ${LLAUDIO_LIBRARIES}
+    ${LLCHARACTER_LIBRARIES}
+    ${LLIMAGE_LIBRARIES}
+    ${LLIMAGEJ2COJ_LIBRARIES}
+    ${LLINVENTORY_LIBRARIES}
+    ${LLMEDIA_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLPRIMITIVE_LIBRARIES}
+    ${LLRENDER_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
+    ${LLUI_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLWINDOW_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LSCRIPT_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    ${viewer_LIBRARIES}
+    ${BOOST_PROGRAM_OPTIONS_LIBRARY}
+    ${BOOST_REGEX_LIBRARY}
+    ${BOOST_SIGNALS_LIBRARY}
+    ${OPENGL_LIBRARIES}
+    ${FMODWRAPPER_LIBRARY}
+    ${OPENGL_LIBRARIES}
+    ${MOZLIB_LIBRARIES}
+    ${SDL_LIBRARY}
+    ${SMARTHEAP_LIBRARY}
+    ${UI_LIBRARIES}
+    ${NDOF_LIBRARY}
+    ${QUICKTIME_LIBRARY}
+    ${WINDOWS_LIBRARIES}
+    ${XMLRPCEPI_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+    ${ELFIO_LIBRARIES}
+    )
+
+build_version(viewer)
+
+set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
+    "Path to artwork files.")
+
+
+if (LINUX)
+  add_custom_command(
+      OUTPUT secondlife-stripped
+      COMMAND strip
+      ARGS --strip-debug -o secondlife-stripped secondlife-bin
+      DEPENDS secondlife-bin
+      )
+
+  set(product SecondLife-${ARCH}-${viewer_VERSION})
+
+  add_custom_command(
+      OUTPUT ${product}.tar.bz2
+      COMMAND ${PYTHON_EXECUTABLE}
+      ARGS
+        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+        --grid=${GRID}
+        --channel=${VIEWER_CHANNEL}
+        --login_channel=${VIEWER_CHANNEL}
+        --installer_name=${product}
+        --arch=${ARCH}
+        --source=${CMAKE_CURRENT_SOURCE_DIR}
+        --artwork=${ARTWORK_DIR}
+        --build=${CMAKE_CURRENT_BINARY_DIR}
+        --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
+        --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+      DEPENDS secondlife-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      )
+
+  if (NOT INSTALL)
+    add_custom_target(package ALL DEPENDS ${product}.tar.bz2)
+    add_dependencies(package linux-crash-logger-stripped)
+  endif (NOT INSTALL)
+endif (LINUX)
+
+if (DARWIN)
+  set(product "Second Life")
+  set_target_properties(
+    secondlife-bin
+    PROPERTIES
+    OUTPUT_NAME "${product}"
+    MACOSX_BUNDLE_INFO_STRING "info string - localize me"
+    MACOSX_BUNDLE_ICON_FILE "secondlife.icns"
+    MACOSX_BUNDLE_GUI_IDENTIFIER "Second Life"
+    MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
+    MACOSX_BUNDLE_BUNDLE_NAME "Second Life"
+    MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf"
+    MACOSX_BUNDLE_BUNDLE_VERSION "asdf"
+    MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer"
+    )
+
+  add_custom_command(
+    TARGET secondlife-bin POST_BUILD
+    COMMAND ${PYTHON_EXECUTABLE}
+    ARGS
+      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      --grid=${GRID}
+      --actions=copy
+      --configuration=${CMAKE_CFG_INTDIR}
+      --source=${CMAKE_CURRENT_SOURCE_DIR}
+      --artwork=${ARTWORK_DIR}
+      --build=${CMAKE_CURRENT_BINARY_DIR}
+      --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+    DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+    )
+
+  if (PACKAGE)
+    add_custom_target(package
+      COMMAND
+        ${PYTHON_EXECUTABLE}
+        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+        --grid=${GRID}
+        --configuration=${CMAKE_CFG_INTDIR}
+        --channel=${VIEWER_CHANNEL}
+        --login_channel=${VIEWER_CHANNEL}
+        --source=${CMAKE_CURRENT_SOURCE_DIR}
+        --artwork=${ARTWORK_DIR}
+        --build=${CMAKE_CURRENT_BINARY_DIR}
+        --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+        --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+      DEPENDS
+        secondlife-bin
+        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      )
+      add_dependencies(package mac-updater mac-crash-logger)
+  endif (PACKAGE)
+endif (DARWIN)
+
+if (INSTALL)
+  include(${CMAKE_CURRENT_SOURCE_DIR}/ViewerInstall.cmake)
+endif (INSTALL)
diff --git a/linden/indra/newview/CrashReporter.nib/classes.nib b/linden/indra/newview/CrashReporter.nib/classes.nib
deleted file mode 100644
index c4b887e..0000000
--- a/linden/indra/newview/CrashReporter.nib/classes.nib
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/linden/indra/newview/CrashReporter.nib/info.nib b/linden/indra/newview/CrashReporter.nib/info.nib
deleted file mode 100644
index b541744..0000000
--- a/linden/indra/newview/CrashReporter.nib/info.nib
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBFramework Version</key>
-	<string>629</string>
-	<key>IBLastKnownRelativeProjectPath</key>
-	<string>../macview.xcodeproj</string>
-	<key>IBOldestOS</key>
-	<integer>5</integer>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>193</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>9B18</string>
-	<key>targetFramework</key>
-	<string>IBCarbonFramework</string>
-</dict>
-</plist>
diff --git a/linden/indra/newview/CrashReporter.nib/objects.xib b/linden/indra/newview/CrashReporter.nib/objects.xib
deleted file mode 100644
index 1099f56..0000000
--- a/linden/indra/newview/CrashReporter.nib/objects.xib
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<object class="NSIBObjectData">
-  <object name="rootObject" class="NSCustomObject" id="1">
-  </object>
-  <array count="7" name="allObjects">
-    <object class="IBCarbonStaticText" id="181">
-      <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
-      <string name="bounds">20 20 231 487 </string>
-    </object>
-    <object class="IBCarbonButton" id="183">
-      <ostype name="command">not!</ostype>
-      <int name="buttonType">2</int>
-      <string name="title">Don&apos;t Send</string>
-      <string name="bounds">414 390 434 487 </string>
-    </object>
-    <object class="IBCarbonRootControl" id="167">
-      <array count="5" name="subviews">
-        <reference idRef="181"/>
-        <object class="IBCarbonButton" id="182">
-          <ostype name="command">ok  </ostype>
-          <string name="title">Send Report</string>
-          <string name="bounds">414 273 434 378 </string>
-        </object>
-        <reference idRef="183"/>
-        <object class="IBCarbonEditText" id="185">
-          <ostype name="controlSignature">text</ostype>
-          <boolean name="isUnicode">TRUE</boolean>
-          <string name="bounds">242 23 391 484 </string>
-        </object>
-        <object class="IBCarbonCheckBox" id="193">
-          <ostype name="controlSignature">remb</ostype>
-          <int name="initialState">1</int>
-          <string name="title">Remember This Choice</string>
-          <string name="bounds">415 20 433 186 </string>
-        </object>
-      </array>
-      <string name="bounds">0 0 454 507 </string>
-    </object>
-    <object class="IBCarbonWindow" id="166">
-      <int name="carbonWindowClass">2</int>
-      <int name="themeBrush">3</int>
-      <int name="windowPosition">7</int>
-      <string name="title">Second Life Crash Logger</string>
-      <reference name="rootControl" idRef="167"/>
-      <string name="windowRect">257 653 711 1160 </string>
-      <string name="ScreenRectAtEncodeTime">0 0 768 1024 </string>
-    </object>
-    <reference idRef="193"/>
-    <reference idRef="185"/>
-    <reference idRef="182"/>
-  </array>
-  <array count="7" name="allParents">
-    <reference idRef="167"/>
-    <reference idRef="167"/>
-    <reference idRef="166"/>
-    <reference idRef="1"/>
-    <reference idRef="167"/>
-    <reference idRef="167"/>
-    <reference idRef="167"/>
-  </array>
-  <dictionary count="2" name="nameTable">
-    <string>CrashReporter</string>
-    <reference idRef="166"/>
-    <string>File&apos;s Owner</string>
-    <reference idRef="1"/>
-  </dictionary>
-  <string name="targetFramework">IBCarbonFramework</string>
-  <unsigned_int name="nextObjectID">194</unsigned_int>
-</object>
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 7272173..881483e 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.20.6.86975";
-CFBundleGetInfoString = "Second Life version 1.20.6.86975, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.20.9.87416";
+CFBundleGetInfoString = "Second Life version 1.20.9.87416, Copyright 2004-2008 Linden Research, Inc.";
+
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index fa50503..b889d45 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.20.6.86975</string>
+	<string>1.20.9.87416</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/linden/indra/newview/ViewerInstall.cmake b/linden/indra/newview/ViewerInstall.cmake
new file mode 100644
index 0000000..55069ad
--- /dev/null
+++ b/linden/indra/newview/ViewerInstall.cmake
@@ -0,0 +1,28 @@
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/secondlife-bin
+        DESTINATION ${APP_BINARY_DIR}
+        )
+
+install(DIRECTORY skins app_settings linux_tools
+        DESTINATION ${APP_SHARE_DIR}
+        PATTERN ".svn" EXCLUDE
+        )
+
+find_file(IS_ARTWORK_PRESENT NAMES avatar_lad.xml
+          PATHS ${VIEWER_DIR}/newview/character)
+
+if (IS_ARTWORK_PRESENT)
+  install(DIRECTORY res res-sdl character
+          DESTINATION ${APP_SHARE_DIR}
+          PATTERN ".svn" EXCLUDE
+          )
+else (IS_ARTWORK_PRESENT)
+  message(STATUS "WARNING: Artwork is not present, and will not be installed")
+endif (IS_ARTWORK_PRESENT)
+
+install(FILES featuretable_linux.txt featuretable_solaris.txt gpu_table.txt
+        DESTINATION ${APP_SHARE_DIR}
+        )
+
+install(FILES ${SCRIPTS_DIR}/messages/message_template.msg
+        DESTINATION ${APP_SHARE_DIR}/app_settings
+        )
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index b6892dc..23c88dc 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -404,6 +404,9 @@ PRIM_SCULPT_TYPE_SPHERE		Stitch edges in a sphere-like way
 PRIM_SCULPT_TYPE_TORUS		Stitch edges in a torus-like way
 PRIM_SCULPT_TYPE_PLANE		Do not stitch edges
 PRIM_SCULPT_TYPE_CYLINDER	Stitch edges in a cylinder-like way
+PRIM_SCULPT_TYPE_MASK		Mask used to determine stitching type
+PRIM_SCULPT_FLAG_INVERT     Flag to specify that the surface normals should be inverted
+PRIM_SCULPT_FLAG_MIRROR     Flag to specify that the prim should be reflected along X axis
 
 MASK_BASE				Base permissions
 MASK_OWNER				Owner permissions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e31c149..c181ce8 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -23,6 +23,22 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>UserChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of your chat messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.0196078431372</real>
+                <real>0.6862745098039</real>
+                <real>0.9803921568627</real>
+                <real>1</real>
+            </array>
+        </map>
     <key>AgentChatColor</key>
     <map>
       <key>Comment</key>
@@ -670,6 +686,17 @@
       <key>Value</key>
       <string>http://www.secondlife.com</string>
     </map>
+    <key>BlockAvatarAppearanceMessages</key>
+        <map>
+        <key>Comment</key>
+            <string>Ignore's appearance messages (for simulating Ruth)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
     <key>BrowserProxyAddress</key>
     <map>
       <key>Comment</key>
@@ -888,7 +915,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>3</integer>
+      <integer>8</integer>
     </map>
     <key>ButtonFlashRate</key>
     <map>
@@ -899,7 +926,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>2.0</real>
+      <real>1.25</real>
     </map>
     <key>ButtonHPad</key>
     <map>
@@ -1131,7 +1158,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>15.0</real>
+      <real>20.0</real>
     </map>
     <key>ChatShowTimestamps</key>
     <map>
@@ -1864,7 +1891,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.40000000596</real>
+      <real>0.700</real>
     </map>
     <key>ConsoleBufferSize</key>
     <map>
@@ -2594,7 +2621,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>speaker_name</string>
+      <string>speaking_status</string>
     </map>
     <key>FloaterAdvancedSkyRect</key>
     <map>
@@ -4126,6 +4153,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LSLFindCaseInsensitivity</key>
+        <map>
+        <key>Comment</key>
+            <string>Use case insensitivity when searching in LSL editor</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
     <key>LSLHelpRect</key>
     <map>
       <key>Comment</key>
@@ -4175,6 +4213,17 @@
       <key>Value</key>
       <string>default</string>
     </map>
+    <key>LanguageIsPublic</key>
+        <map>
+        <key>Comment</key>
+            <string>Let other residents see our language information</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
     <key>LastFeatureVersion</key>
     <map>
       <key>Comment</key>
@@ -4439,6 +4488,17 @@
       <key>Value</key>
       <real>20.0</real>
     </map>
+    <key>MainloopTimeoutDefault</key>
+        <map>
+        <key>Comment</key>
+            <string>Timeout duration for mainloop lock detection, in seconds.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>10.0</real>
+        </map>
     <key>MapOverlayIndex</key>
     <map>
       <key>Comment</key>
@@ -4461,17 +4521,6 @@
       <key>Value</key>
       <real>128.0</real>
     </map>
-    <key>MapShowClassifieds</key>
-    <map>
-      <key>Comment</key>
-      <string>Show locations associated with classified ads on world map</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>MapShowEvents</key>
     <map>
       <key>Comment</key>
@@ -4911,17 +4960,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>NoQuickTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Disable quicktime playback.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>NoVerifySSLCert</key>
     <map>
       <key>Comment</key>
@@ -5025,10 +5063,10 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0.699999988079</real>
-        <real>0.899999976158</real>
-        <real>0.699999988079</real>
-        <real>1.0</real>
+        <real>1</real>
+        <real>0.5</real>
+        <real>0.0</real>
+        <real>1</real>
       </array>
     </map>
     <key>OpenDebugStatAdvanced</key>
@@ -5217,6 +5255,28 @@
       <key>Value</key>
       <real>0.34999999404</real>
     </map>
+    <key>PicksPerSecondMouseMoving</key>
+    <map>
+      <key>Comment</key>
+      <string>How often to perform hover picks while the mouse is moving (picks per second)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>5.0</real>
+    </map>
+    <key>PicksPerSecondMouseStationary</key>
+    <map>
+      <key>Comment</key>
+      <string>How often to perform hover picks while the mouse is stationary (picks per second)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.0</real>
+    </map>
     <key>PieMenuLineWidth</key>
     <map>
       <key>Comment</key>
@@ -5569,6 +5629,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LandBrushForce</key>
+        <map>
+        <key>Comment</key>
+            <string>Multiplier for land modification brush force.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1.0</real>
+        </map>
     <key>RecentItemsSortOrder</key>
     <map>
       <key>Comment</key>
@@ -5635,6 +5706,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>RenderAttachedLights</key>
+        <map>
+        <key>Comment</key>
+            <string>Render lighted prims that are attached to avatars</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderAttachedParticles</key>
+        <map>
+        <key>Comment</key>
+            <string>Render particle systems that are attached to avatars</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map> 
     <key>RenderAvatarCloth</key>
     <map>
       <key>Comment</key>
@@ -5721,7 +5814,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>RenderDebugPipeline</key>
     <map>
@@ -6792,17 +6885,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowDepthBuffer</key>
-    <map>
-      <key>Comment</key>
-      <string>Show depth buffer contents</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ShowDirectory</key>
     <map>
       <key>Comment</key>
@@ -6968,12 +7050,23 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>ShowInInventory</key>
+        <map>
+        <key>Comment</key>
+            <string>Automatically opens inventory to show accepted objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
     <key>ShowObjectUpdates</key>
     <map>
       <key>Comment</key>
       <string>Show when update messages are received for individual objects</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
@@ -7089,7 +7182,18 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowVoiceChannelPopup</key>
+	<key>ShowTutorial</key>
+	<map>
+		<key>Comment</key>
+		<string>Show tutorial window on login</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
+	<key>ShowVoiceChannelPopup</key>
     <map>
       <key>Comment</key>
       <string>Controls visibility of the current voice channel popup above the voice tab</string>
@@ -7305,6 +7409,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SnapshotFormat</key>
+    <map>
+      <key>Comment</key>
+      <string>Save snapshots in this format (0 = PNG, 1 = JPEG, 2 = BMP)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>  
     <key>SnapshotLocalLastResolution</key>
     <map>
       <key>Comment</key>
@@ -9935,7 +10050,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>WaterEditPresets</key>
     <map>
diff --git a/linden/indra/newview/crashreporter-Info.plist b/linden/indra/newview/crashreporter-Info.plist
deleted file mode 100644
index 8e97e9a..0000000
--- a/linden/indra/newview/crashreporter-Info.plist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>crashreporter</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.crashreporter</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
-</dict>
-</plist>
diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index 032d9bf..0a12958 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 16
+version 17
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -394,48 +394,20 @@ list ATI_Radeon_X1600
 Disregard128DefaultDrawDistance	1	0
 list ATI_Radeon_X1700 
 Disregard128DefaultDrawDistance	1	0
-
 list ATI_Mobility_Radeon_X1xxx
 Disregard128DefaultDrawDistance	1	0
-
-
-
-// Avatar hardware skinning causes
-// invisible avatars on x2600... so I masked
-// out other possible bad ones till it's fixed in 8.2
-
 list ATI_Radeon_HD_2300
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
 Disregard128DefaultDrawDistance	1	0
 list ATI_Radeon_HD_2400
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
 Disregard128DefaultDrawDistance	1	0
-list ATI_Radeon_HD_2600
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_Radeon_HD_2900
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_Radeon_HD_3800
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-
 list ATI_ASUS_AH24xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
 Disregard128DefaultDrawDistance	1	0
-list ATI_ASUS_AH26xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_ASUS_EAH24xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_ASUS_EAH26xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_ASUS_EAH38xx
+
+
+// Avatar hardware skinning causes invisible avatars
+// on various ATI chipsets on drivers before 8.2
+
+list ATIOldDriver
 RenderAvatarVP				0	0
 RenderAvatarCloth			0	0
 
diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt
index 88570e3..3eaa781 100644
--- a/linden/indra/newview/featuretable_linux.txt
+++ b/linden/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 16
+version 17
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -45,6 +45,7 @@ RenderUseImpostors			1	1
 RenderVBOEnable				1	1
 RenderVolumeLODFactor		1	2.0
 RenderWaterReflections		1	1
+UseStartScreen				1	1
 UseOcclusion				1	1
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
@@ -241,25 +242,108 @@ RenderVBOEnable				1	0
 list Intel
 RenderAnisotropic			1	0
 RenderLightingDetail		1	0
-RenderTerrainDetail			1	0
-RenderVBOEnable				1	0
+// Avoid some Intel crashes on Linux
 RenderCubeMap				0	0
 
-
 list GeForce2
 RenderAnisotropic			1	0
 RenderLightingDetail		1	0
 RenderMaxPartCount			1	2048
 RenderTerrainDetail			1	0
+RenderVBOEnable				1	1
 
-list Intel_965
+list SiS
 UseOcclusion				0	0
 
-list ATI
+
+list Intel_830M
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_845G					
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_855GM				
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_865G			
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_900		
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_915GM	
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_915G					
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_945GM			
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_945G
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_950
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_965
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
 UseOcclusion				0	0
-WindLightUseAtmosShaders	0	0
+
+list Intel_G33
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_Bear_Lake	
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_Broadwater 
+RenderTerrainDetail			1	0
 RenderVBOEnable				1	0
 
+list Intel_Brookdale	
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_Montara
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+list Intel_Springdale
+RenderTerrainDetail			1	0
+RenderVBOEnable				1	0
+
+
+list ATI_FireGL_5200
+RenderVBOEnable				1	0
+WindLightUseAtmosShaders	0	0
+
+
+list ATI_Mobility_Radeon_7xxx
+RenderVBOEnable				0	0
+
+list ATI_Radeon_7xxx
+RenderVBOEnable				0	0
+
+list ATI_All-in-Wonder_Radeon
+RenderVBOEnable				0	0
+
+list ATI_All-in-Wonder_7500
+RenderVBOEnable				0	0
+
+
 list ATI_Mobility_Radeon_9800
 RenderAvatarCloth			0	0
 VertexShaderEnable			0	0
@@ -302,58 +386,35 @@ list ATI_Radeon_X700
 Disregard128DefaultDrawDistance	1	0
 list ATI_Radeon_X1300 
 Disregard128DefaultDrawDistance	1	0
+UseStartScreen					0	0
 list ATI_Radeon_X1400 
 Disregard128DefaultDrawDistance	1	0
 list ATI_Radeon_X1500 
 Disregard128DefaultDrawDistance	1	0
+UseStartScreen					0	0
 list ATI_Radeon_X1600 
 Disregard128DefaultDrawDistance	1	0
 list ATI_Radeon_X1700 
 Disregard128DefaultDrawDistance	1	0
 list ATI_Mobility_Radeon_X1xxx
 Disregard128DefaultDrawDistance	1	0
-
-
-
-
-// Avatar hardware skinning causes
-// invisible avatars on HD 2400... so I masked
-// out other possible bad ones till it's fixed
-
 list ATI_Radeon_HD_2300
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
 Disregard128DefaultDrawDistance	1	0
 list ATI_Radeon_HD_2400
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
 Disregard128DefaultDrawDistance	1	0
-list ATI_Radeon_HD_2600
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_Radeon_HD_2900
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_Radeon_HD_3800
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-
 list ATI_ASUS_AH24xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
 Disregard128DefaultDrawDistance	1	0
-list ATI_ASUS_AH26xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_ASUS_EAH24xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_ASUS_EAH26xx
-RenderAvatarVP				0	0
-RenderAvatarCloth			0	0
-list ATI_ASUS_EAH38xx
+
+
+// Avatar hardware skinning causes invisible avatars
+// on various ATI chipsets on drivers before 8.2
+
+list ATIOldDriver
 RenderAvatarVP				0	0
 RenderAvatarCloth			0	0
+// Avoid driver crashes with some features on Linux with old ATI drivers
+UseOcclusion				0	0
+WindLightUseAtmosShaders	0	0
 
 
 /// Tweaked NVIDIA
@@ -387,6 +448,8 @@ Disregard128DefaultDrawDistance	1	0
 list NVIDIA_GeForce_6600
 Disregard128DefaultDrawDistance	1	0
 
+list NVIDIA_G73
+Disregard128DefaultDrawDistance	1	0
 
 list NVIDIA_GeForce_Go_6100
 RenderVBOEnable				1	0
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt
index d19e4ed..fab8ea9 100644
--- a/linden/indra/newview/featuretable_mac.txt
+++ b/linden/indra/newview/featuretable_mac.txt
@@ -342,6 +342,8 @@ Disregard96DefaultDrawDistance	1	0
 
 list NVIDIA_GeForce_8600
 RenderTextureMemoryMultiple			1	0.375	
+RenderUseImpostors				0	0
+UseOcclusion				0	0
 
 /// tweaked ATI to 96 Draw distance
 
diff --git a/linden/indra/newview/files.lst b/linden/indra/newview/files.lst
deleted file mode 100644
index 3233ade..0000000
--- a/linden/indra/newview/files.lst
+++ /dev/null
@@ -1,373 +0,0 @@
-newview/llagent.cpp
-newview/llagentdata.cpp
-newview/llagentpilot.cpp
-newview/llanimstatelabels.cpp
-newview/llappviewer.cpp
-newview/llappviewerlinux.cpp
-newview/llassetuploadresponders.cpp
-newview/llaudiosourcevo.cpp
-newview/llbbox.cpp
-newview/llbox.cpp
-newview/llcallbacklist.cpp
-newview/llcallingcard.cpp
-newview/llcaphttpsender.cpp
-newview/llchatbar.cpp
-newview/llclassifiedinfo.cpp
-newview/llclassifiedstatsresponder.cpp
-newview/llcloud.cpp
-newview/llcolorscheme.cpp
-newview/llcolorswatch.cpp
-newview/llcommandhandler.cpp
-newview/llcommandlineparser.cpp
-newview/llcompass.cpp
-newview/llcompilequeue.cpp
-newview/llconfirmationmanager.cpp
-newview/llconsole.cpp
-newview/llcontainerview.cpp
-newview/llcubemap.cpp
-newview/llcurrencyuimanager.cpp
-newview/llcylinder.cpp
-newview/lldebugmessagebox.cpp
-newview/lldebugview.cpp
-newview/lldelayedgestureerror.cpp
-newview/lldirpicker.cpp
-newview/lldrawable.cpp
-newview/lldrawpool.cpp
-newview/lldrawpoolalpha.cpp
-newview/lldrawpoolavatar.cpp
-newview/lldrawpoolbump.cpp
-newview/lldrawpoolground.cpp
-newview/lldrawpoolsimple.cpp
-newview/lldrawpoolsky.cpp
-newview/lldrawpoolterrain.cpp
-newview/lldrawpooltree.cpp
-newview/lldrawpoolwater.cpp
-newview/lldrawpoolwlsky.cpp
-newview/lldriverparam.cpp
-newview/lldynamictexture.cpp
-newview/llemote.cpp
-newview/lleventinfo.cpp
-newview/lleventnotifier.cpp
-newview/lleventpoll.cpp
-newview/llface.cpp
-newview/llfasttimerview.cpp
-newview/llfeaturemanager.cpp
-newview/llfilepicker.cpp
-newview/llfirstuse.cpp
-newview/llflexibleobject.cpp
-newview/llfloaterabout.cpp
-newview/llfloateractivespeakers.cpp
-newview/llfloateranimpreview.cpp
-newview/llfloaterauction.cpp
-newview/llfloateravatarinfo.cpp
-newview/llfloateravatarpicker.cpp
-newview/llfloateravatartextures.cpp
-newview/llfloaterbuildoptions.cpp
-newview/llfloaterbump.cpp
-newview/llfloaterbuy.cpp
-newview/llfloaterbuycontents.cpp
-newview/llfloaterbuycurrency.cpp
-newview/llfloaterbuyland.cpp
-newview/llfloatercamera.cpp
-newview/llfloaterchat.cpp
-newview/llfloaterchatterbox.cpp
-newview/llfloaterclassified.cpp
-newview/llfloaterclothing.cpp
-newview/llfloatercolorpicker.cpp
-newview/llfloatercustomize.cpp
-newview/llfloaterdaycycle.cpp
-newview/llfloaterdirectory.cpp
-newview/llfloatereditui.cpp
-newview/llfloaterenvsettings.cpp
-newview/llfloaterevent.cpp
-newview/llfloaterfriends.cpp
-newview/llfloatergesture.cpp
-newview/llfloatergodtools.cpp
-newview/llfloatergroupinfo.cpp
-newview/llfloatergroupinvite.cpp
-newview/llfloatergroups.cpp
-newview/llfloaterhardwaresettings.cpp
-newview/llfloaterhtml.cpp
-newview/llfloaterhtmlhelp.cpp
-newview/llfloaterhud.cpp
-newview/llfloaterimagepreview.cpp
-newview/llfloaterinspect.cpp
-newview/llfloaterjoystick.cpp
-newview/llfloaterlagmeter.cpp
-newview/llfloaterland.cpp
-newview/llfloaterlandholdings.cpp
-newview/llfloaterlandmark.cpp
-newview/llfloatermap.cpp
-newview/llfloatermute.cpp
-newview/llfloaternamedesc.cpp
-newview/llfloaternewim.cpp
-newview/llfloateropenobject.cpp
-newview/llfloaterparcel.cpp
-newview/llfloaterpermissionsmgr.cpp
-newview/llfloaterpostcard.cpp
-newview/llfloaterpostprocess.cpp
-newview/llfloaterpreference.cpp
-newview/llfloaterproperties.cpp
-newview/llfloaterregioninfo.cpp
-newview/llfloaterreleasemsg.cpp
-newview/llfloaterreporter.cpp
-newview/llfloaterscriptdebug.cpp
-newview/llfloatersettingsdebug.cpp
-newview/llfloatersellland.cpp
-newview/llfloatersnapshot.cpp
-newview/llfloaterstats.cpp
-newview/llfloatertelehub.cpp
-newview/llfloatertest.cpp
-newview/llfloatertools.cpp
-newview/llfloatertopobjects.cpp
-newview/llfloatertos.cpp
-newview/llfloaterurldisplay.cpp
-newview/llfloaterurlentry.cpp
-newview/llfloatervoicedevicesettings.cpp
-newview/llfloaterwater.cpp
-newview/llfloaterwindlight.cpp
-newview/llfloaterworldmap.cpp
-newview/llfolderview.cpp
-newview/llfollowcam.cpp
-newview/llframestats.cpp
-newview/llframestatview.cpp
-newview/llgenepool.cpp
-newview/llgesturemgr.cpp
-newview/llgivemoney.cpp
-newview/llglsandbox.cpp
-newview/llglslshader.cpp
-newview/llgroupmgr.cpp
-newview/llgroupnotify.cpp
-newview/llhippo.cpp
-newview/llhoverview.cpp
-newview/llhudeffect.cpp
-newview/llhudeffectbeam.cpp
-newview/llhudeffectlookat.cpp
-newview/llhudeffectpointat.cpp
-newview/llhudeffecttrail.cpp
-newview/llhudicon.cpp
-newview/llhudmanager.cpp
-newview/llhudobject.cpp
-newview/llhudrender.cpp
-newview/llhudtext.cpp
-newview/llhudview.cpp
-newview/llimpanel.cpp
-newview/llimview.cpp
-newview/llinventoryactions.cpp
-newview/llinventorybridge.cpp
-newview/llinventoryclipboard.cpp
-newview/llinventorymodel.cpp
-newview/llinventoryview.cpp
-newview/lljoystickbutton.cpp
-newview/lllandmarklist.cpp
-newview/lllogchat.cpp
-newview/llmanip.cpp
-newview/llmaniprotate.cpp
-newview/llmanipscale.cpp
-newview/llmaniptranslate.cpp
-newview/llmapresponders.cpp
-newview/llmediaremotectrl.cpp
-newview/llmemoryview.cpp
-newview/llmenucommands.cpp
-newview/llmimetypes.cpp
-newview/llmorphview.cpp
-newview/llmoveview.cpp
-newview/llmutelist.cpp
-newview/llnamebox.cpp
-newview/llnameeditor.cpp
-newview/llnamelistctrl.cpp
-newview/llnetmap.cpp
-newview/llnotify.cpp
-newview/lloverlaybar.cpp
-newview/llpanelaudioprefs.cpp
-newview/llpanelaudiovolume.cpp
-newview/llpanelavatar.cpp
-newview/llpanelclassified.cpp
-newview/llpanelcontents.cpp
-newview/llpaneldebug.cpp
-newview/llpaneldirbrowser.cpp
-newview/llpaneldirclassified.cpp
-newview/llpaneldirevents.cpp
-newview/llpaneldirfind.cpp
-newview/llpaneldirgroups.cpp
-newview/llpaneldirland.cpp
-newview/llpaneldirpeople.cpp
-newview/llpaneldirplaces.cpp
-newview/llpaneldirpopular.cpp
-newview/llpaneldisplay.cpp
-newview/llpanelevent.cpp
-newview/llpanelface.cpp
-newview/llpanelgeneral.cpp
-newview/llpanelgroup.cpp
-newview/llpanelgroupgeneral.cpp
-newview/llpanelgroupinvite.cpp
-newview/llpanelgrouplandmoney.cpp
-newview/llpanelgroupnotices.cpp
-newview/llpanelgrouproles.cpp
-newview/llpanelgroupvoting.cpp
-newview/llpanelinput.cpp
-newview/llpanelinventory.cpp
-newview/llpanelland.cpp
-newview/llpanellandmedia.cpp
-newview/llpanellandobjects.cpp
-newview/llpanellandoptions.cpp
-newview/llpanellogin.cpp
-newview/llpanelmorph.cpp
-newview/llpanelmsgs.cpp
-newview/llpanelnetwork.cpp
-newview/llpanelobject.cpp
-newview/llpanelpermissions.cpp
-newview/llpanelpick.cpp
-newview/llpanelplace.cpp
-newview/llpanelskins.cpp
-newview/llpanelvolume.cpp
-newview/llpanelweb.cpp
-newview/llparcelselection.cpp
-newview/llpatchvertexarray.cpp
-newview/llpolymesh.cpp
-newview/llpolymorph.cpp
-newview/llpostprocess.cpp
-newview/llprefschat.cpp
-newview/llprefsim.cpp
-newview/llprefsvoice.cpp
-newview/llpreview.cpp
-newview/llpreviewanim.cpp
-newview/llpreviewgesture.cpp
-newview/llpreviewlandmark.cpp
-newview/llpreviewnotecard.cpp
-newview/llpreviewscript.cpp
-newview/llpreviewsound.cpp
-newview/llpreviewtexture.cpp
-newview/llprogressview.cpp
-newview/llregionposition.cpp
-newview/llremoteparcelrequest.cpp
-newview/llsavedsettingsglue.cpp
-newview/llselectmgr.cpp
-newview/llsky.cpp
-newview/llspatialpartition.cpp
-newview/llrendersphere.cpp
-newview/llsprite.cpp
-newview/llsrv.cpp
-newview/llstartup.cpp
-newview/llstatbar.cpp
-newview/llstatgraph.cpp
-newview/llstatusbar.cpp
-newview/llstatview.cpp
-newview/llstylemap.cpp
-newview/llsurface.cpp
-newview/llsurfacepatch.cpp
-newview/lltexlayer.cpp
-newview/lltexturecache.cpp
-newview/lltexturectrl.cpp
-newview/lltexturefetch.cpp
-newview/lltextureview.cpp
-newview/lltool.cpp
-newview/lltoolbar.cpp
-newview/lltoolbrush.cpp
-newview/lltoolcomp.cpp
-newview/lltooldraganddrop.cpp
-newview/lltoolface.cpp
-newview/lltoolfocus.cpp
-newview/lltoolgrab.cpp
-newview/lltoolgun.cpp
-newview/lltoolindividual.cpp
-newview/lltoolmgr.cpp
-newview/lltoolmorph.cpp
-newview/lltoolobjpicker.cpp
-newview/lltoolpie.cpp
-newview/lltoolpipette.cpp
-newview/lltoolplacer.cpp
-newview/lltoolselect.cpp
-newview/lltoolselectland.cpp
-newview/lltoolselectrect.cpp
-newview/lltoolview.cpp
-newview/lltracker.cpp
-newview/lltrans.cpp
-newview/lluploaddialog.cpp
-newview/llurl.cpp
-newview/llurldispatcher.cpp
-newview/llurlhistory.cpp
-newview/llurlsimstring.cpp
-newview/llurlwhitelist.cpp
-newview/lluserauth.cpp
-newview/llvectorperfoptions.cpp
-newview/llvelocitybar.cpp
-newview/llviewchildren.cpp
-newview/llviewerassetstorage.cpp
-newview/llvieweraudio.cpp
-newview/llviewercamera.cpp
-newview/llviewercontrol.cpp
-newview/llviewerdisplay.cpp
-newview/llviewergenericmessage.cpp
-newview/llviewergesture.cpp
-newview/llviewerimage.cpp
-newview/llviewerimagelist.cpp
-newview/llviewerinventory.cpp
-newview/llviewerjoint.cpp
-newview/llviewerjointattachment.cpp
-newview/llviewerjointmesh.cpp
-newview/llviewerjointmesh_sse.cpp
-newview/llviewerjointmesh_sse2.cpp
-newview/llviewerjointmesh_vec.cpp
-newview/llviewerjoystick.cpp
-newview/llviewerkeyboard.cpp
-newview/llviewerlayer.cpp
-newview/llviewermedia.cpp
-newview/llviewermenu.cpp
-newview/llviewermenufile.cpp
-newview/llviewermessage.cpp
-newview/llviewernetwork.cpp
-newview/llviewerobject.cpp
-newview/llviewerobjectlist.cpp
-newview/llviewerparcelmedia.cpp
-newview/llviewerparcelmediaautoplay.cpp
-newview/llviewerparcelmgr.cpp
-newview/llviewerparceloverlay.cpp
-newview/llviewerpartsim.cpp
-newview/llviewerpartsource.cpp
-newview/llviewerprecompiledheaders.cpp
-newview/llviewerregion.cpp
-newview/llviewerstats.cpp
-newview/llviewertexteditor.cpp
-newview/llviewertextureanim.cpp
-newview/llviewerthrottle.cpp
-newview/llviewervisualparam.cpp
-newview/llviewerwindow.cpp
-newview/llvlcomposition.cpp
-newview/llvlmanager.cpp
-newview/llvoavatar.cpp
-newview/llvocache.cpp
-newview/llvoclouds.cpp
-newview/llvograss.cpp
-newview/llvoground.cpp
-newview/llvoiceclient.cpp
-newview/llvoiceremotectrl.cpp
-newview/llvoicevisualizer.cpp
-newview/llvoinventorylistener.cpp
-newview/llvopartgroup.cpp
-newview/llvosky.cpp
-newview/llvosurfacepatch.cpp
-newview/llvotextbubble.cpp
-newview/llvotree.cpp
-newview/llvovolume.cpp
-newview/llvowater.cpp
-newview/llvowlsky.cpp
-newview/llwatchdog.cpp
-newview/llwaterparammanager.cpp
-newview/llwaterparamset.cpp
-newview/llwearable.cpp
-newview/llwearablelist.cpp
-newview/llweb.cpp
-newview/llwebbrowserctrl.cpp
-newview/llwind.cpp
-newview/llwindebug.cpp
-newview/llwlanimator.cpp
-newview/llwldaycycle.cpp
-newview/llwlparammanager.cpp
-newview/llwlparamset.cpp
-newview/llworld.cpp
-newview/llworldmap.cpp
-newview/llworldmapview.cpp
-newview/llxmlrpctransaction.cpp
-newview/noise.cpp
-newview/pipeline.cpp
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index 52ea166..7e7be97 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -35,6 +35,7 @@ ATI All-in-Wonder Radeon 		.*ATI.*All-in-Wonder Radeon.*		0		1
 ATI ASUS A9xxx					.*ATI.*ASUS.*A9.*					1		1
 ATI ASUS AH24xx					.*ATI.*ASUS.*AH24.*					1		1
 ATI ASUS AH26xx					.*ATI.*ASUS.*AH26.*					3		1
+ATI ASUS AH36xx					.*ATI.*ASUS.*AH36.*					3		1
 ATI ASUS AX3xx					.*ATI.*ASUS.*AX3.*					1		1
 ATI ASUS AX5xx					.*ATI.*ASUS.*AX5.*					1		1
 ATI ASUS AX8xx					.*ATI.*ASUS.*AX8.* 					2		1
@@ -43,8 +44,13 @@ ATI ASUS EAH26xx				.*ATI.*ASUS.*EAH26.*				3		1
 ATI ASUS EAH34xx				.*ATI.*ASUS.*EAH34.*				1		1
 ATI ASUS EAH36xx				.*ATI.*ASUS.*EAH36.*				3		1
 ATI ASUS EAH38xx				.*ATI.*ASUS.*EAH38.*				3		1
+ATI ASUS EAH48xx				.*ATI.*ASUS.*EAH48.*				3		1
 ATI ASUS X1xxx					.*ATI.*ASUS.*X1.*					2		1
+ATI ASUS X7xx					.*ATI.*ASUS.*X7.*					1		1
 ATI Diamond X550				.*ATI.*Diamond X550.*				1		1
+ATI Diamond X13xx				.*ATI.*Diamond X13.*				1		1
+ATI Diamond X16xx				.*ATI.*Diamond X16.*				1		1
+ATI Diamond X19xx				.*ATI.*Diamond X19.*				1		1
 ATI FireGL 5200					.*ATI.*FireGL V52.*					0		1
 ATI FireGL 5xxx					.*ATI.*FireGL V5.*					1		1
 ATI FireGL						.*ATI.*Fire.*GL.*					0		1
@@ -61,22 +67,24 @@ ATI Mobility Radeon 8xxx		.*ATI.*Mobility.*Radeon 8.*			0		1
 ATI Mobility Radeon 9800		.*ATI.*Mobility.*98.*				1		1
 ATI Mobility Radeon 9700		.*ATI.*Mobility.*97.*				1		1
 ATI Mobility Radeon 9600		.*ATI.*Mobility.*96.*				0		1
-ATI Mobility Radeon X1xxx		.*ATI.*Mobility.*X1.*				1		1
-ATI Mobility Radeon X2xxx		.*ATI.*Mobility.*X2.*				1		1
+ATI Mobility Radeon X1xxx		.*ATI.*Mobility.*X1.*				0		1
+ATI Mobility Radeon X2xxx		.*ATI.*Mobility.*X2.*				0		1
 ATI Mobility Radeon X3xx		.*ATI.*Mobility.*X3.*				1		1
 ATI Mobility Radeon X6xx		.*ATI.*Mobility.*X6.*				1		1
 ATI Mobility Radeon X7xx		.*ATI.*Mobility.*X7.*				1		1
-ATI Mobility Radeon Xxxx		.*ATI.*Mobility.*X.*				1		1
+ATI Mobility Radeon Xxxx		.*ATI.*Mobility.*X.*				0		1
 ATI Mobility Radeon				.*ATI.*Mobility.*					0		1
-ATI Radeon HD 2300				.*ATI.*Radeon HD 23.*				1		1
+ATI Radeon HD 2300				.*ATI.*Radeon HD 23.*				0		1
 ATI Radeon HD 2400				.*ATI.*Radeon HD.*24.*				1		1
 ATI Radeon HD 2600				.*ATI.*Radeon HD 26.*				2		1
 ATI Radeon HD 2900				.*ATI.*Radeon HD 29.*				3		1
-ATI Radeon HD 3400				.*ATI.*Radeon HD 34.*				1		1
-ATI Radeon HD 3600				.*ATI.*Radeon HD 36.*				3		1
-ATI Radeon HD 3800				.*ATI.*Radeon HD 38.*				3		1
-ATI Radeon HD 4800				.*ATI.*Radeon HD 48.*				3		1
+ATI Radeon HD 3400				.*ATI.*Radeon HD.*34.*				1		1
+ATI Radeon HD 3600				.*ATI.*Radeon HD.*36.*				3		1
+ATI Radeon HD 3800				.*ATI.*Radeon HD.*38.*				3		1
+ATI Radeon HD 4800				.*ATI.*Radeon HD.*48.*				3		1
 ATI Radeon OpenGL				.*ATI.*Radeon OpenGL.* 				0		0
+ATI Radeon 2100					.*ATI.*Radeon 21.*					0		1
+ATI Radeon 3100					.*ATI.*Radeon 31.*					1		1
 ATI Radeon 7xxx					.*ATI.*Radeon 7.*					0		1
 ATI Radeon 8xxx					.*ATI.*Radeon 8.*					0		1
 ATI Radeon 9000					.*ATI.*Radeon 90.*					0		1
@@ -100,9 +108,9 @@ ATI Radeon X1600				.*ATI.*Radeon X16.*					1		1
 ATI Radeon X1700				.*ATI.*Radeon X17.*					1		1
 ATI Radeon X1800				.*ATI.*Radeon X18.*					3		1
 ATI Radeon X1900				.*ATI.*Radeon X19.*					3		1
-ATI Radeon X300					.*ATI.*Radeon *X3.*					1		1
-ATI Radeon X400					.*ATI.*Radeon X4.*					1		1
-ATI Radeon X500					.*ATI.*Radeon X5.*					1		1
+ATI Radeon X300					.*ATI.*Radeon *X3.*					0		1
+ATI Radeon X400					.*ATI.*Radeon X4.*					0		1
+ATI Radeon X500					.*ATI.*Radeon X5.*					0		1
 ATI Radeon X600					.*ATI.*Radeon X6.*					1		1
 ATI Radeon X700					.*ATI.*Radeon X7.*					1		1
 ATI Radeon X800					.*ATI.*Radeon X8.*					2		1
@@ -112,7 +120,7 @@ ATI Rage 128					.*ATI.*Rage 128.*					0		1
 ATI RV250						.*ATI.*RV250.*						0		1
 ATI RV530						.*ATI.*RV530.*						1		1
 ATI RX700						.*ATI.*RX700.*						1		1
-Intel X3100						.*Intel.*X3100.*					1		1
+Intel X3100						.*Intel.*X3100.*					0		1
 Intel 830M						.*Intel.*830M						0		0
 Intel 845G						.*Intel.*845G						0		0
 Intel 855GM						.*Intel.*855GM						0		0
@@ -132,6 +140,8 @@ Intel Montara					.*Intel.*Montara.*					0		0
 Intel Springdale				.*Intel.*Springdale.*				0		0
 Matrox							.*Matrox.*							0		0
 Mesa							.*Mesa.*							0		0
+NVIDIA GTX 260					.*NVIDIA.*GeForce.*GTX.*260.*		3		1
+NVIDIA GTX 280					.*NVIDIA.*GeForce.*GTX.*280.*		3		1
 NVIDIA G72						.*NVIDIA.*G72.*						1		1
 NVIDIA G73						.*NVIDIA.*G73.*						1		1
 NVIDIA GeForce					.*GeForce 256.*						0		0
@@ -142,7 +152,7 @@ NVIDIA GeForce 4 MX				.*NVIDIA.*GeForce4 MX.*				0		1
 NVIDIA GeForce 4 Ti				.*NVIDIA.*GeForce4 Ti.*				0		1
 NVIDIA GeForce 6100				.*NVIDIA.*GeForce 61.*				0		1
 NVIDIA GeForce 6200				.*NVIDIA.*GeForce 62.*				0		1
-NVIDIA GeForce 6500				.*NVIDIA.*GeForce 65.*				1		1
+NVIDIA GeForce 6500				.*NVIDIA.*GeForce 65.*				0		1
 NVIDIA GeForce 6600				.*NVIDIA.*GeForce 66.*				1		1
 NVIDIA GeForce 6700				.*NVIDIA.*GeForce 67.*				2		1
 NVIDIA GeForce 6800				.*NVIDIA.*GeForce 68.*				2		1
@@ -154,6 +164,7 @@ NVIDIA GeForce 7500				.*NVIDIA.*GeForce 75.*				1		1
 NVIDIA GeForce 7600				.*NVIDIA.*GeForce 76.*				2		1
 NVIDIA GeForce 7800				.*NVIDIA.*GeForce 78.*				2		1
 NVIDIA GeForce 7900				.*NVIDIA.*GeForce 79.*				2		1
+NVIDIA GeForce 8200				.*NVIDIA.*GeForce 82.*				1		1
 NVIDIA GeForce 8300				.*NVIDIA.*GeForce 83.*				1		1
 NVIDIA GeForce 8400				.*NVIDIA.*GeForce 84.*				1		1
 NVIDIA GeForce 8500				.*NVIDIA.*GeForce 85.*				3		1
@@ -167,7 +178,7 @@ NVIDIA GeForce 9800				.*NVIDIA.*GeForce 98.*				3		1
 NVIDIA GeForce FX 5100			.*NVIDIA.*GeForce FX 51.*			0		1
 NVIDIA GeForce FX 5200			.*NVIDIA.*GeForce FX 52.*			0		1
 NVIDIA GeForce FX 5500			.*NVIDIA.*GeForce FX 55.*			0		1
-NVIDIA GeForce FX 5600			.*NVIDIA.*GeForce FX 56.*			1		1
+NVIDIA GeForce FX 5600			.*NVIDIA.*GeForce FX 56.*			0		1
 NVIDIA GeForce FX 5700			.*NVIDIA.*GeForce FX 57.*			1		1
 NVIDIA GeForce FX 5800			.*NVIDIA.*GeForce FX 58.*			1		1
 NVIDIA GeForce FX 5900			.*NVIDIA.*GeForce FX 59.*			1		1
diff --git a/linden/indra/newview/installers/darwin/firstlook-dmg/Applications-alias.r b/linden/indra/newview/installers/darwin/firstlook-dmg/Applications-alias.r
new file mode 100644
index 0000000..aa3cfb8
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/firstlook-dmg/Applications-alias.r
@@ -0,0 +1,6996 @@
+data 'alis' (0) {
+	$"0000 0000 0112 0002 0001 036D 6277 0000"            /* ...........mbw.. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 C135 A717 482B 0000 0000"            /* ......Á5§.H+.... */
+	$"0002 0C41 7070 6C69 6361 7469 6F6E 7300"            /* ...Applications. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 00E2 4F18 C2E8 9FB0 0000 0000 0000"            /* ...âO.Â蟰...... */
+	$"0000 FFFF FFFF 0000 0920 0000 0000 0000"            /* ..ÿÿÿÿ..Æ ...... */
+	$"0000 0000 0000 0000 0003 6D62 7700 0010"            /* ..........mbw... */
+	$"0008 0000 C136 0987 0000 0011 0008 0000"            /* ....Á6Ƈ........ */
+	$"C2E9 0220 0000 0001 0000 0002 0010 6D62"            /* Âé. ..........mb */
+	$"773A 4170 706C 6963 6174 696F 6E73 000E"            /* w:Applications.. */
+	$"001A 000C 0041 0070 0070 006C 0069 0063"            /* .....A.p.p.l.i.c */
+	$"0061 0074 0069 006F 006E 0073 000F 0008"            /* .a.t.i.o.n.s.... */
+	$"0003 006D 0062 0077 0012 000C 4170 706C"            /* ...m.b.w....Appl */
+	$"6963 6174 696F 6E73 0013 0001 2F00 FFFF"            /* ications..../.ÿÿ */
+	$"0000"                                               /* .. */
+};
+
+
+data 'icns' (-16455) {
+	$"6963 6E73 0001 B3AC 6973 3332 0000 0224"            /* icns..³¬is32...$ */
+	$"9F00 005F 8061 005D 8700 055D 9AA2 A0A4"            /* Ÿ.._€a.]‡..]š¢ ¤ */
+	$"8986 0008 557D B3B2 B1B3 A881 8081 8104"            /* ‰†..U}³²±³¨�€��. */
+	$"826F 577E AF82 A801 B3AE 82AD 03AF 7B7A"            /* ‚oW~¯‚¨.³®‚­.¯{z */
+	$"A781 A203 9EB7 C89D 81A2 03A6 776E 9A80"            /* §�¢.ž·È��¢.¦wnš€ */
+	$"9705 959F D3DC A295 8097 5899 6C67 8F8D"            /* —.•ŸÓÜ¢•€—X™lg�� */
+	$"8E89 85C9 BCA9 C883 898D 8D8E 6561 8585"            /* Ž‰…ɼ©Èƒ‰��Žea…… */
+	$"83A8 B7F3 BAB4 DFB6 AA84 8585 605E 7B7D"            /* ƒ¨·óº´ß¶ª„……`^{} */
+	$"79D0 F9E0 F0F2 DAE1 D87C 7D7B 5D5B 7476"            /* yÐùàðòÚáØ|}{][tv */
+	$"7099 D876 7373 76CA 8A72 7673 5B5A 6D70"            /* p™ØvssvÊŠrvs[Zmp */
+	$"6B9B 816C 6F6F 67B3 C567 706C 5A59 686B"            /* k›�loog³ÅgplZYhk */
+	$"6B67 686B 806A 056B 6F6A 6B67 5A88 5900"            /* kghk€j.kojkgZˆY. */
+	$"5882 598A 5801 0059 9F00 0482 8383 8480"            /* X‚YŠX..YŸ..‚ƒƒ„€ */
+	$"8700 057F B7BE BDC0 A786 0008 799E D0CE"            /* ‡...·¾½À§†..yžÐÎ */
+	$"CECF C5A1 A081 A105 A390 7AA0 D0CA 80C9"            /* ÎÏÅ¡ �¡.£�z ÐÊ€É */
+	$"01CA D183 CE03 D09C 9ECD 81C9 03C7 D4DE"            /* .ÊуÎ.ÐœžÍ�É.ÇÔÞ */
+	$"C681 C903 CD9A 94C5 80C2 05C1 C6E3 E9C8"            /* Æ�É.Íš”Å€Â.ÁÆãéÈ */
+	$"C180 C20D C491 8DBD BBBC B9B6 DDD7 CCDD"            /* Á€Â.Ä‘�½»¼¹¶Ý×ÌÝ */
+	$"B5B9 80BC 468B 87B4 B4B3 C8D1 F7D3 CFEA"            /* µ¹€¼F‹‡´´³ÈÑ÷ÓÏê */
+	$"D0C9 B4B4 B385 83AA ABA9 E0FB EAF5 F6E5"            /* ÐÉ´´³…ƒª«©àûêõöå */
+	$"EAE5 AAAB A981 80A0 A39E BAE4 A2A0 A1A2"            /* ê媫©�€ £žºä¢ ¡¢ */
+	$"DAAF 9FA3 9F7F 7E97 9B97 B8A6 979A 9A94"            /* Ú¯Ÿ£Ÿ.~—›—¸¦—šš” */
+	$"CAD6 949B 977D 7D90 9493 9091 8293 0496"            /* ÊÖ”›—}}�”“�‘‚“.– */
+	$"9294 907D 8E7C 8A7B 0100 7C9F 0000 7A80"            /* ’”�}Ž|Š{..|Ÿ..z€ */
+	$"7C00 7887 0005 77B1 B8B7 BBA0 8600 0871"            /* |.x‡..w±¸·» †..q */
+	$"97CB C9C8 CAC0 9B99 819A 049C 8972 99CA"            /* —ËÉÈÊÀ›™�š.œ‰r™Ê */
+	$"82C3 00CB 83C8 03CA 9596 C681 C203 BFCF"            /* ‚Ã.˃È.Ê•–Æ�Â.¿Ï */
+	$"DABF 81C2 03C6 938C BD80 BA05 B9BF E0E7"            /* Ú¿�Â.Æ“Œ½€º.¹¿àç */
+	$"C1B9 80BA 57BC 8985 B5B3 B3B0 ADD9 D2C6"            /* Á¹€ºW¼‰…µ³³°­ÙÒÆ */
+	$"D9AC B0B3 B3B4 827F ACAB AAC2 CCF6 CECA"            /* Ù¬°³³´‚.¬«ªÂÌöÎÊ */
+	$"E8CB C3AB ACAA 7D7B A1A3 A0DD FAE9 F4F5"            /* èË묪}{¡£ Ýúéôõ */
+	$"E3E8 E3A2 A3A0 7A78 989B 96B3 E29A 9898"            /* ãè㢣 zx˜›–³âš˜˜ */
+	$"9AD7 A897 9B97 7776 8F93 8FB2 9F8F 9292"            /* š×¨—›—wv�“�²Ÿ�’’ */
+	$"8BC5 D28C 938F 7575 888C 8B89 8982 8B04"            /* ‹ÅÒŒ“�uuˆŒ‹‰‰‚‹. */
+	$"8F8A 8C88 758E 748A 7301 0074 7338 6D6B"            /* �ŠŒˆuŽtŠs..ts8mk */
+	$"0000 0108 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 1E24 2424 1600 0000 0000"            /* .......$$$...... */
+	$"0000 0000 0011 BDC8 C8C8 9600 0000 0000"            /* ......½ÈÈÈ–..... */
+	$"0000 0000 048C FFFF FFFF F5A7 9C9E 9E9E"            /* .....Œÿÿÿÿõ§œžžž */
+	$"9E9E 6003 8AFF FCFC FCFC FEFF FFFF FFFF"            /* žž`.Šÿüüüüþÿÿÿÿÿ */
+	$"FFFF FF7A 89FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿz‰ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF7A 73FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿzsÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF64 62FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿdbÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF53 53FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿSSÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF45 48FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿEHÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF3C 41FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿ<Aÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FD35 3DFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿý5=ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FA30 3CFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿú0<ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FB2F 1247 4B4A 4A4A 4A4A 4A4A 4A4A"            /* ÿÿû/.GKJJJJJJJJJ */
+	$"4A4B 450F 0101 0201 0101 0101 0101 0101"            /* JKE............. */
+	$"0102 0001 696C 3332 0000 05AB FF00 BE00"            /* ....il32...«ÿ.¾. */
+	$"025A 7881 847F 0064 9200 0262 BBC4 83C2"            /* .Zx�„..d’..b»ÄƒÂ */
+	$"02C7 8451 9000 0255 86BF 84BC 03BF A064"            /* .Ç„Q�..U†¿„¼.¿ d */
+	$"6389 6400 6281 0003 5770 A2A2 85A1 01A3"            /* c‰d.b�..Wp¢¢…¡.£ */
+	$"9D89 9B07 9C97 6758 005B 95AC 88A7 02A8"            /* �‰›.œ—gX.[•¬ˆ§.¨ */
+	$"A4A7 89A8 05AB 925A 61A7 AE88 AC03 ABCA"            /* ¤§‰¨.«’Za§®ˆ¬.«Ê */
+	$"AEAB 88AC 05AE A15E 5B9A A788 A503 A0D7"            /* ®«ˆ¬.®¡^[š§ˆ¥. × */
+	$"D79F 88A5 05A8 9559 5990 A288 9F04 9BAB"            /* ןˆ¥.¨•YY�¢ˆŸ.›« */
+	$"FBAE 9C87 9F05 A28B 5857 879D 879A 0595"            /* û®œ‡Ÿ.¢‹XW‡�‡š.• */
+	$"BDD6 E6E3 9487 9A05 9D82 5656 7F97 8594"            /* ½Öæ㔇š.�‚VV.—…” */
+	$"0995 8FB3 F4CF B1FF AD90 9585 9405 977A"            /* Æ•�³ôϱÿ­�•…”.—z */
+	$"0000 7793 8690 078D CDF8 B886 E8E5 8B86"            /* ..w“†�.�Íø¸†è勆 */
+	$"9005 9372 0000 708F 828C 808B 0984 BBF7"            /* �.“r..p�‚Œ€‹Æ„»÷ */
+	$"C687 85AB FFA9 8580 8B82 8C05 8E6D 0000"            /* Ƈ…«ÿ©…€‹‚Œ.Žm.. */
+	$"6B8A 8287 0D88 8785 8FF3 FDA1 8186 84E5"            /* kŠ‚‡.ˆ‡…�óý¡�†„å */
+	$"E484 8684 8705 8868 0000 6685 8183 117E"            /* 䄆„‡.ˆh..f…�ƒ.~ */
+	$"B3E3 D0D2 FFDC D4DF DDDB D2FD D0DE E2B7"            /* ³ãÐÒÿÜÔßÝÛÒýÐÞâ· */
+	$"8082 8304 6400 0062 8081 7F06 76C5 FFDB"            /* €‚ƒ.d..b€�..vÅÿÛ */
+	$"F9F3 E381 FF06 F6D4 BFF4 FFD3 7882 7F03"            /* ùóã�ÿ.öÔ¿ôÿÓx‚.. */
+	$"6100 005F 827B 0675 B0D9 E1FF C8D8 82DF"            /* a.._‚{.u°ÙáÿÈØ‚ß */
+	$"05BF F3C9 DCB9 7681 7B04 7A5E 0000 5C82"            /* .¿óÉܹv�{.z^..\‚ */
+	$"7706 786F 96FF E879 7281 7306 7278 C8C2"            /* w.xo–ÿèyr�s.rxÈÂ */
+	$"7074 7880 7706 7875 5C00 005A 7382 7405"            /* ptx€w.xu\..Zs‚t. */
+	$"71C1 E19A 6D74 8173 0574 6BA2 FFAD 6C81"            /* qÁášmt�s.tk¢ÿ­l� */
+	$"7406 7571 5B00 005A 6F81 7104 6F77 F2AF"            /* t.uq[..Zo�q.owò¯ */
+	$"6984 7105 6E7E FAFB 836D 8071 0772 6D5A"            /* i„q.n~úûƒm€q.rmZ */
+	$"0000 586C 6F80 6E03 6C7B 9368 866E 0467"            /* ..Xlo€n.l{“h†n.g */
+	$"C3FA 8B69 806E 076F 6A59 0000 586A 6E81"            /* Ãú‹i€n.ojY..Xjn� */
+	$"6D01 6C68 876D 036B 717D 6B81 6D07 6E69"            /* m.lh‡m.kq}k�m.ni */
+	$"5900 0058 666A 8E69 0168 6682 6903 6A65"            /* Y..XfjŽi.hf‚i.je */
+	$"5900 BD59 0000 9B59 9E00 FF00 BE00 027D"            /* Y.½Y..›Yž.ÿ.¾..} */
+	$"98A0 829E 029F 9E85 9200 0284 D5DE 83DC"            /* ˜ ‚ž.Ÿž…’..„ÕÞƒÜ */
+	$"02E0 A275 9000 0279 A7DB 84D8 03DB BD87"            /* .à¢u�..y§Û„Ø.Û½‡ */
+	$"8689 8700 8581 0003 7A92 C0C0 85BF 01C0"            /* †‰‡.…�..z’ÀÀ…¿.À */
+	$"BB89 B907 BAB4 887B 007E B7CC 88C7 01C8"            /* »‰¹.º´ˆ{.~·ÌˆÇ.È */
+	$"C68A C805 CBB2 7C84 CAD1 89CF 02DE CFCE"            /* ÆŠÈ.˲|„ÊщÏ.ÞÏÎ */
+	$"88CF 05D2 C380 7FBF CC88 CA03 C7E8 E5C6"            /* ˆÏ.ÒÀ.¿ÌˆÊ.ÇèåÆ */
+	$"88CA 05CD B87C 7CB7 CA88 C704 C4CD FCCD"            /* ˆÊ.͸||·ÊˆÇ.ÄÍüÍ */
+	$"C587 C705 CAB0 7A7A AFC7 87C4 05C1 D4E3"            /* ŇÇ.Ê°zz¯Ç‡Ä.ÁÔã */
+	$"F0ED C087 C405 C8A8 7979 A7C4 85C0 09C1"            /* ðíÀ‡Ä.Ȩyy§Ä…ÀÆÁ */
+	$"BDD0 F7E1 D1FF CDBE C185 C005 C4A1 0000"            /* ½Ð÷áÑÿ;Á…À.Ä¡.. */
+	$"A0C1 86BD 07BA DEFB D5B7 F2EE B986 BD05"            /*  Á†½.ºÞûÕ·ò½. */
+	$"C09A 0000 9ABE 85BA 09B6 D4F9 DBB8 B6CD"            /* Àš..š¾…ºÆ¶ÔùÛ¸¶Í */
+	$"FFCA B785 BA05 BD94 0000 94B9 83B6 0EB4"            /* ÿÊ·…º.½”..”¹ƒ¶.´ */
+	$"B3B9 F7FE C4B0 B4B2 EFED B2B4 B4B5 82B6"            /* ³¹÷þÄ°´²ïí²´´µ‚¶ */
+	$"05B8 8F00 008E B481 B211 AFCD EBDF E0FF"            /* .¸�..Ž´�².¯Íëßàÿ */
+	$"E8E2 E9E8 E6E0 FEDF E8EA D0B0 81B2 05B3"            /* èâéèæàþßèêа�².³ */
+	$"8A00 0089 AF81 AD06 A8D9 FFE7 FBF7 EB81"            /* Š..‰¯�­.¨Ùÿçû÷ë� */
+	$"FF06 F9E1 D3F8 FFE3 A980 AD05 AEAD 8600"            /* ÿ.ùáÓøÿã©€­.®­†. */
+	$"0086 82A9 06A5 CBE5 EAFF DAE5 82EA 05D3"            /* .†‚©.¥ËåêÿÚå‚ê.Ó */
+	$"F7DA E8D1 A680 A906 AAA7 8300 0082 A382"            /* ÷ÚèѦ€©.ª§ƒ..‚£‚ */
+	$"A405 9FB7 FFF0 A5A1 81A2 05A1 A5D9 D39F"            /* ¤.Ÿ·ÿð¥¡�¢.¡¥ÙÓŸ */
+	$"A281 A406 A5A1 8000 0080 9F82 A004 9ED2"            /* ¢�¤.¥¡€..€Ÿ‚ .žÒ */
+	$"E9BA 9B83 A004 9ABF FFC5 9A81 A007 A19C"            /* 麛ƒ .š¿ÿÅš� .¡œ */
+	$"7F00 007E 999D 809B 059A 9FF6 C696 9C83"            /* ...~™�€›.šŸöÆ–œƒ */
+	$"9B05 99A4 FBFB A799 809B 079C 977D 0000"            /* ›.™¤ûû§™€›.œ—}.. */
+	$"7C95 9980 9803 97A1 B295 8698 0494 D5FC"            /* |•™€˜.—¡²•†˜.”Õü */
+	$"AC95 8098 0799 937C 0000 7C93 9782 9600"            /* ¬•€˜.™“|..|“—‚–. */
+	$"9387 9603 9599 A295 8196 0797 917C 0000"            /* “‡–.•™¢•�–.—‘|.. */
+	$"7B8E 928D 9102 9290 8F82 9103 928C 7B00"            /* {Ž’�‘.’��‚‘.’Œ{. */
+	$"BD7C 0000 9B7C 9E00 FF00 BE00 0275 9199"            /* ½|..›|ž.ÿ.¾..u‘™ */
+	$"8498 007E 9200 027D D0D9 83D7 02DB 9B6C"            /* „˜.~’..}ÐÙƒ×.Û›l */
+	$"9000 0271 A0D5 84D2 03D5 B67F 7E89 7F00"            /* �..q Õ„Ò.Õ¶.~‰.. */
+	$"7D81 0003 728B BBBB 85BA 02BB B6B3 88B4"            /* }�..r‹»»…º.»¶³ˆ´ */
+	$"08B5 AF81 7300 76B0 C6C2 87C1 01C2 C089"            /* .µ¯�s.v°Æ‡Á.ÂÀ‰ */
+	$"C206 C3C5 AB75 7CC3 CA89 C801 DBC9 89C8"            /* Â.ÃÅ«u|ÃʉÈ.ÛÉ‰È */
+	$"05CB BD78 77B9 C588 C304 C0E5 E2BF C487"            /* .˽xw¹ÅˆÃ.Àåâ¿Ä‡ */
+	$"C305 C6B2 7574 B0C3 87C0 05BF BCC7 FCC7"            /* Ã.Ʋut°Ã‡À.¿¼ÇüÇ */
+	$"BE87 C005 C3A9 7272 A7BF 87BC 05B9 D0E1"            /* ¾‡À.érr§¿‡¼.¹Ðá */
+	$"EEEB B887 BC05 C0A1 7171 A0BC 86B8 07B5"            /* î븇¼.À¡qq ¼†¸.µ */
+	$"CBF6 DDCB FFC7 B586 B805 BB99 0000 98B9"            /* ËöÝËÿǵ†¸.»™..˜¹ */
+	$"86B5 07B2 DBFA D0AE F0EC B186 B505 B892"            /* †µ.²ÛúЮð챆µ.¸’ */
+	$"0000 91B5 82B2 80B1 09AC D0F9 D7AF ADC7"            /* ..‘µ‚²€±Æ¬Ðùׯ­Ç */
+	$"FFC4 AD80 B182 B205 B48C 0000 8BB1 81AD"            /* ÿÄ­€±‚².´Œ..‹±�­ */
+	$"11AE ADAC ABB1 F6FD BDA8 ABAA EDEB A9AB"            /* .®­¬«±öý½¨«ªíë©« */
+	$"ACAC AE81 AD05 AF87 0000 86AB 81A9 11A6"            /* ¬¬®�­.¯‡..†«�©.¦ */
+	$"C8E9 DCDE FFE5 DFE7 E6E4 DDFE DCE6 E9CB"            /* ÈéÜÞÿåßçæäÝþÜæéË */
+	$"A781 A905 AA82 0000 81A6 81A5 069F D6FF"            /* §�©.ª‚..�¦�¥.ŸÖÿ */
+	$"E4FA F6EA 81FF 06F8 DFCF F7FF E0A0 80A5"            /* äúöê�ÿ.øßÏ÷ÿà €¥ */
+	$"05A6 A47E 0000 7D82 A006 9BC6 E3E8 FFD6"            /* .¦¤~..}‚ .›ÆãèÿÖ */
+	$"E282 E805 CFF6 D7E6 CC9C 80A0 06A1 9E7B"            /* â‚è.Ïö×æÌœ€ .¡ž{ */
+	$"0000 7A9B 829C 0496 B1FF EF9D 8399 049C"            /* ..z›‚œ.–±ÿï�ƒ™.œ */
+	$"D6D0 969A 819C 069D 9979 0000 7897 8198"            /* ÖЖš�œ.�™y..x—�˜ */
+	$"0597 95CF E7B4 9283 9704 91BA FFC0 9181"            /* .—•Ïç´’ƒ—.‘ºÿÀ‘� */
+	$"9807 9994 7700 0076 9295 8094 0493 98F5"            /* ˜.™”w..v’•€”.“˜õ */
+	$"C28E 8494 0592 9DFB FBA0 9180 9407 958F"            /* ÂŽ„”.’�ûû ‘€”.•� */
+	$"7500 0074 8E91 8090 038F 9AAC 8C86 9004"            /* u..tŽ‘€�.�š¬Œ†�. */
+	$"8BD1 FBA6 8C80 9007 918B 7400 0074 8B8F"            /* ‹Ñû¦Œ€�.‘‹t..t‹� */
+	$"808E 048F 8E8B 8E8F 848E 048F 8D91 9B8D"            /* €Ž.�Ž‹Ž�„Ž.��‘›� */
+	$"818E 078F 8974 0000 7487 8B8E 8A01 8987"            /* �Ž.�‰t..t‡‹ŽŠ.‰‡ */
+	$"828A 038B 8574 00BD 7400 009B 749E 006C"            /* ‚Š.‹…t.½t..›tž.l */
+	$"386D 6B00 0004 0800 0000 0000 0000 0000"            /* 8mk............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0B76 8889 8989"            /* ...........vˆ‰‰‰ */
+	$"8989 8988 3800 0000 0000 0000 0000 0000"            /* ‰‰‰ˆ8........... */
+	$"0000 0000 0000 0000 0000 36FF FFFF FFFF"            /* ..........6ÿÿÿÿÿ */
+	$"FFFF FFFF A301 0000 0000 0000 0000 0000"            /* ÿÿÿÿ£........... */
+	$"0000 0000 0000 0000 0006 A4FF FFFF FFFF"            /* ..........¤ÿÿÿÿÿ */
+	$"FFFF FFFF DE59 3F40 4040 4040 4040 4040"            /* ÿÿÿÿÞY?@@@@@@@@@ */
+	$"4040 4033 0000 0000 1384 F8F3 F3F3 F3F3"            /* @@@3.....„øóóóóó */
+	$"F3F3 F3F3 F7F9 F7F7 F7F7 F7F7 F7F7 F7F7"            /* óóóó÷ù÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F1 520D 001D E1FF FAFB FBFB FBFB"            /* ÷÷÷ñR...áÿúûûûûû */
+	$"FBFB FBFB FBFB FBFB FBFB FBFB FBFB FBFB"            /* ûûûûûûûûûûûûûûûû */
+	$"FBFB FBFB FFCD 0E39 FFFF FFFF FFFF FFFF"            /* ûûûûÿÍ.9ÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 1F26 F6FF FFFF FFFF FFFF"            /* ÿÿÿÿÿø.&öÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE5 1318 ECFF FFFF FFFF FFFF"            /* ÿÿÿÿÿå..ìÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD5 0A0F DDFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÕÂ.Ýÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC6 0206 D0FF FFFF FFFF FFFF"            /* ÿÿÿÿÿÆ..Ðÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB6 0000 C2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¶..Âÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 0000 B2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¥..²ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF95 0000 A4FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ•..¤ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF87 0000 96FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ‡..–ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF7A 0000 8AFF FFFF FFFF FFFF"            /* ÿÿÿÿÿz..Šÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6D 0000 7FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿm...ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF63 0000 77FF FFFF FFFF FFFF"            /* ÿÿÿÿÿc..wÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5A 0000 6FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿZ..oÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF54 0000 69FF FFFF FFFF FFFF"            /* ÿÿÿÿÿT..iÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4F 0000 65FF FFFF FFFF FFFF"            /* ÿÿÿÿÿO..eÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4C 0000 64FF FFFF FFFF FFFF"            /* ÿÿÿÿÿL..dÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4B 0000 61FF FFFF FFFF FFFF"            /* ÿÿÿÿÿK..aÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF48 0004 2C6D 7574 7474 7474"            /* ÿÿÿÿÿH..,muttttt */
+	$"7474 7474 7474 7474 7474 7474 7474 7474"            /* tttttttttttttttt */
+	$"7474 7475 6824 0202 0D18 1C1C 1C1C 1C1C"            /* tttuh$.......... */
+	$"1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C"            /* ................ */
+	$"1C1C 1C1C 170C 0100 0103 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0301 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0069 6833 3200 0009 DEFF"            /* .......ih32..ÆÞÿ */
+	$"00FF 00FF 00AD 0001 5E66 8865 0261 5859"            /* .ÿ.ÿ.­..^fˆe.aXY */
+	$"9C00 025E A6BA 87B7 04B9 AE67 5659 9B00"            /* œ..^¦º‡·.¹®gVY›. */
+	$"0266 BABF 87BE 04BF BC70 5459 9A00 0252"            /* .fº¿‡¾.¿¼pTYš..R */
+	$"81BD 89BA 03BC 8652 5491 5585 0003 5580"            /* �½‰º.¼†RT‘U…..U€ */
+	$"B7BA 89B9 02BA B497 918F 0191 7683 0003"            /* ·º‰¹.º´—‘�.‘vƒ.. */
+	$"5864 9399 8B97 0098 929B 039D 855F 5A80"            /* Xd“™‹—.˜’›.�…_Z€ */
+	$"0002 649D A990 A500 A490 A509 A6A9 9B65"            /* ..d�©�¥.¤�¥Æ¦©›e */
+	$"0000 85B4 AFAF 8EAE 03B0 AEAC AF8E AE07"            /* ..…´¯¯Ž®.°®¬¯Ž®. */
+	$"AFAF B280 0000 80AD 8FA9 04A8 B2E7 ACA8"            /* ¯¯²€..€­�©.¨²ç¬¨ */
+	$"90A9 05AB 7A00 0076 A98F A604 A5A4 F1E0"            /* �©.«z..v©�¦.¥¤ñà */
+	$"A08F A606 A7A6 7100 006D A390 A204 9DC8"            /*  �¦.§¦q..m£�¢.�È */
+	$"FFB9 9C8E A207 A3A0 6A00 0065 9D9F 8D9E"            /* ÿ¹œŽ¢.£ j..e�Ÿ�ž */
+	$"069F 9C96 A2FA EF9C 8E9E 079F 9A65 0000"            /* .Ÿœ–¢úž.Ÿše.. */
+	$"6097 9C8D 9B07 97A5 E2C6 D2FF C394 8D9B"            /* `—œ�›.—¥âÆÒÿÔ�› */
+	$"079C 9461 0000 5E90 988C 9709 959A D5CE"            /* .œ”a..^�˜Œ—Æ•šÕÎ */
+	$"E4B2 FCF4 9A95 8C97 0799 8D5E 0000 5A8B"            /* ä²üôš•Œ—.™�^..Z‹ */
+	$"968C 9409 8EC8 FFF6 C18D DDFF C78C 8C94"            /* –Œ”ÆŽÈÿöÁ�ÝÿÇŒŒ” */
+	$"0796 875B 0000 5885 938B 910B 8F8F E5FF"            /* .–‡[..X…“‹‘.��åÿ */
+	$"FFA9 87AA FFF7 988E 8B91 0793 8159 0000"            /* ÿ©‡ªÿ÷˜Ž‹‘.“�Y.. */
+	$"577F 908B 8E0B 87CF D4D0 CA89 8D8B E0FF"            /* W.�‹Ž.‡ÏÔÐʉ�‹àÿ */
+	$"C786 8B8E 0790 7B58 0000 5779 8C86 8A81"            /* dž‹Ž.�{X..WyŒ†Š� */
+	$"8B0D 84A5 FFFF E38B 898B 85A8 FFF8 9387"            /* ‹.„¥ÿÿ㋉‹…¨ÿø“‡ */
+	$"818B 868A 078C 7557 0000 5674 8A85 8800"            /* �‹†Š.ŒuW..VtŠ…ˆ. */
+	$"8680 820E 8385 E4FF FFB9 7C83 8381 7FDD"            /* †€‚.ƒ…äÿÿ¹|ƒƒ�.Ý */
+	$"FFC6 7E81 8200 8585 8807 8A71 5759 0056"            /* ÿÆ~�‚.……ˆ.ŠqWY.V */
+	$"6F87 8485 1983 929F A3A0 94B0 FFFF E39D"            /* o‡„….ƒ’Ÿ£ ”°ÿÿã� */
+	$"9F9E 9DA3 9AB0 FBF4 98A0 A09F A192 8484"            /* Ÿž�£š°ûô˜  Ÿ¡’„„ */
+	$"8507 876D 5759 0056 6984 8482 197C A7EB"            /* ….‡mWY.Vi„„‚.|§ë */
+	$"FBF1 C2EC FFFB C1ED F2F6 ECFB EDD9 DBFF"            /* ûñÂìÿûÁíòöìûíÙÛÿ */
+	$"D4EE F0F6 F6B7 7C84 8207 8369 5700 5956"            /* Ôîðöö·|„‚.ƒiW.YV */
+	$"6481 847F 0979 A3FF FFEB CCFF FFD5 E084"            /* d�„.Æy£ÿÿëÌÿÿÕà„ */
+	$"FF03 C8F1 BCC4 80FF 01C0 7785 7F06 6557"            /* ÿ.Èñ¼Ä€ÿ.Àw…..eW */
+	$"5959 5661 7E84 7D08 76A3 FFFF C3F4 FFF5"            /* YYVa~„}.v£ÿÿÃôÿõ */
+	$"CB85 FF08 EDA8 CCC0 F2FF FFC1 7485 7D06"            /* Ë…ÿ.í¨ÌÀòÿÿÁt…}. */
+	$"6358 5959 575E 7B84 7A09 7692 D0BE D6FF"            /* cXYYW^{„zÆv’оÖÿ */
+	$"FFC2 B9D0 84CF 08CD B9FF F1B1 CED0 A574"            /* ÿ¹ЄÏ.͹ÿñ±ÎÐ¥t */
+	$"847A 0679 6058 5959 585D 8678 0776 6A9C"            /* „z.y`XYYX]†x.vjœ */
+	$"FFFF F081 7086 7106 75D1 D89D 6A71 7484"            /* ÿÿð�p†q.uÑØ�jqt„ */
+	$"7808 7976 5E58 5959 585B 7486 7505 73B9"            /* x.yv^XYYX[t†u.s¹ */
+	$"F5FF AC6D 8775 0570 8CEB F889 6F85 7508"            /* õÿ¬m‡u.pŒëø‰o…u. */
+	$"7672 5C58 5959 5859 7285 7306 6F8A E1C6"            /* vr\XYYXYr…s.oŠáÆ */
+	$"C176 7287 7306 7179 EEFF E173 7184 7308"            /* Ávr‡s.qyîÿásq„s. */
+	$"7470 5B58 5959 5859 7085 7205 6B97 FFE7"            /* tp[XYYXYp…r.k—ÿç */
+	$"776E 8972 0569 C6FF FFB4 6A84 7202 736E"            /* wn‰r.iÆÿÿ´j„r.sn */
+	$"5A81 5901 586D 856F 0567 B9D9 786B 7089"            /* Z�Y.Xm…o.g¹Ùxkp‰ */
+	$"6F06 6993 FFFF F173 6D83 6F01 706B 8259"            /* o.i“ÿÿñsmƒo.pk‚Y */
+	$"0157 6B85 6E03 6C8C 7269 8B6E 066D 6BD3"            /* .Wk…n.lŒri‹n.mkÓ */
+	$"FFCB 6C6D 836E 026F 6958 8159 0256 6A6E"            /* ÿËlmƒn.oiX�Y.Vjn */
+	$"856D 0169 6B8D 6D04 6A73 8A6D 6B84 6D02"            /* …m.ik�m.jsŠmk„m. */
+	$"6E68 5881 5902 566A 6E98 6D02 6B67 6C85"            /* nhX�Y.Vjn˜m.kgl… */
+	$"6D02 6E68 5881 5902 5665 69A3 6802 6963"            /* m.nhX�Y.Vei£h.ic */
+	$"5881 5901 5858 A559 0058 B059 0000 AB59"            /* X�Y.XX¥Y.X°Y..«Y */
+	$"8000 A959 DF00 FF00 FF00 FF00 AD00 0081"            /* €.©Yß.ÿ.ÿ.ÿ.­..� */
+	$"8987 0283 7B7C 9C00 0280 C1D3 87D1 04D2"            /* ‰‡.ƒ{|œ..€ÁÓ‡Ñ.Ò */
+	$"C787 7A7C 9B00 0288 D4DA 87D9 04DA D68F"            /* LJz|›..ˆÔÚ‡Ù.ÚÖ� */
+	$"787C 9A00 0276 A2D8 89D6 02D7 A476 9278"            /* x|š..v¢Ø‰Ö.פv’x */
+	$"8500 0379 A2D3 D789 D503 D6D0 B5AD 90AE"            /* …..y¢Ó׉Õ.Öе­�® */
+	$"01B0 9683 0003 7C87 B1B7 8BB5 00B6 92B9"            /* .°–ƒ..|‡±·‹µ.¶’¹ */
+	$"03BA A282 7D80 0003 87BD C8C5 90C4 00C5"            /* .º¢‚}€..‡½ÈÅ�Ä.Å */
+	$"8FC4 08C5 C8B9 8700 00A7 D6D1 90D0 01CD"            /* �Ä.Åȹ‡..§ÖÑ�Ð.Í */
+	$"CF90 D006 D1D3 A000 00A3 D18F CD04 CCD1"            /* Ï�Ð.ÑÓ ..£Ñ�Í.ÌÑ */
+	$"EECC CC90 CD05 CF9B 0000 9ACE 90CB 03CA"            /* îÌÌ�Í.Ï›..šÎ�Ë.Ê */
+	$"F7E9 C68F CB07 CCCB 9300 0091 C9C9 8FC8"            /* ÷éÆ�Ë.ÌË“..‘ÉÉ�È */
+	$"04C6 DFFF D2C5 8EC8 07C9 C68D 0000 8BC5"            /* .ÆßÿÒÅŽÈ.ÉÆ�..‹Å */
+	$"C78D C606 C7C5 BFC7 FDF3 C38E C607 C7C0"            /* Ç�Æ.ÇÅ¿ÇýóÃŽÆ.ÇÀ */
+	$"8800 0086 C0C5 8DC4 07C2 C7EB DAE4 FFD9"            /* ˆ..†ÀÅ�Ä.ÂÇëÚäÿÙ */
+	$"C08D C407 C6BC 8400 0082 BBC4 8CC2 09C1"            /* À�Ä.Ƽ„..‚»ÄŒÂÆÁ */
+	$"C2E2 DEED D1FD F7C1 C18C C207 C4B6 8100"            /* ÂâÞíÑý÷ÁÁŒÂ.Ķ�. */
+	$"007F B5C2 8CC0 09BC DBFF F8D7 BBEA FFDB"            /* ..µÂŒÀƼÛÿø×»êÿÛ */
+	$"BA8C C007 C2B0 7E00 007C B0C0 8BBE 0BBD"            /* ºŒÀ.°~..|°À‹¾.½ */
+	$"BAED FFFF CCB8 CCFF F9BF BC8B BE07 C0AA"            /* ºíÿÿ̸Ìÿù¿¼‹¾.Àª */
+	$"7C00 007B ABBF 8BBC 0BB7 DEE1 DFDF B9BB"            /* |..{«¿‹¼.·Þáßß¹» */
+	$"BAED FFDA B78B BC07 BFA5 7B00 007A A5BC"            /* ºíÿÚ·‹¼.¿¥{..z¥¼ */
+	$"89B9 0EBA B6C6 FFFF ECB9 B9BA B6CB FFFA"            /* ‰¹.º¶Æÿÿì¹¹º¶Ëÿú */
+	$"BCB8 8AB9 07BC 9F7A 0000 799F B984 B601"            /* ¼¸Š¹.¼Ÿz..yŸ¹„¶. */
+	$"B7B5 82B3 0CEC FFFF D4AF B3B3 B2B1 EAFF"            /* ·µ‚³.ìÿÿÔ¯³³²±êÿ */
+	$"D9B0 81B3 01B5 B784 B607 B899 797C 0079"            /* Ù°�³.µ·„¶.¸™y|.y */
+	$"99B7 84B4 13B3 B9BE C1C0 B9CB FFFF EDBE"            /* ™·„´.³¹¾ÁÀ¹Ëÿÿí¾ */
+	$"BFBE BEC1 BCCB FCF7 BB80 BF02 C0B9 B384"            /* ¿¾¾Á¼Ëü÷»€¿.À¹³„ */
+	$"B407 B694 797C 0079 93B4 84B1 19AD C7F1"            /* ´.¶”y|.y“´„±.­Çñ */
+	$"FBF5 D6F1 FFFD D5F2 F5F8 F1FB F2E4 E7FF"            /* ûõÖñÿýÕòõøñûòäçÿ */
+	$"E2F3 F4F8 F8D0 AD84 B107 B290 7A00 7C79"            /* âóôøøЭ„±.²�z.|y */
+	$"8DB0 84AE 09AA C3FF FFF2 DCFF FFE2 E984"            /* �°„®ÆªÃÿÿòÜÿÿâé„ */
+	$"FF03 D9F6 D1D8 80FF 01D6 A985 AE06 8C7A"            /* ÿ.ÙöÑØ€ÿ.Ö©…®.Œz */
+	$"7C7C 7989 AD84 AB08 A7C3 FFFF D5F7 FFF8"            /* ||y‰­„«.§ÃÿÿÕ÷ÿø */
+	$"DA85 FF08 F2C2 DAD3 F6FF FFD7 A583 AB08"            /* Ú…ÿ.òÂÚÓöÿÿ×¥ƒ«. */
+	$"ACAA 897A 7C7C 7A86 A984 A809 A5B7 E0D3"            /* ¬ª‰z||z†©„¨Æ¥·àÓ */
+	$"E2FF FFD6 D0E0 84DF 08DD CFFF F5CB DFE0"            /* âÿÿÖÐà„ß.ÝÏÿõËßà */
+	$"C3A4 83A8 07A9 A686 7A7C 7C7A 8386 A506"            /* 䃨.©¦†z||zƒ†¥. */
+	$"A39B BAFF FFF5 AA87 A006 A3DF E2BA 9BA1"            /* £›ºÿÿõª‡ .£ß⺛¡ */
+	$"A284 A507 A6A2 837B 7C7C 7B82 87A2 059F"            /* ¢„¥.¦¢ƒ{||{‚‡¢.Ÿ */
+	$"CCF8 FFC7 9C87 A205 9EAF F0F9 AD9E 85A2"            /* ÌøÿÇœ‡¢.ž¯ðù­ž…¢ */
+	$"08A3 9F81 7B7C 7C7B 7F9D 859F 069C AEE8"            /* .£Ÿ�{||{.�…Ÿ.œ®è */
+	$"D4D3 A09E 879F 069D A3F4 FFE8 9D9E 849F"            /* ÔÓ ž‡Ÿ.�£ôÿè�ž„Ÿ */
+	$"09A0 9B7F 7B7C 7C7B 7E9A 9D84 9C05 98B5"            /* Æ ›.{||{~š�„œ.˜µ */
+	$"FFEE 9F99 899C 0596 D7FF FFC9 9684 9C09"            /* ÿ‰œ.–×ÿÿÉ–„œÆ */
+	$"9D97 7E7B 7C7C 7B7C 989B 849A 0494 CCE4"            /* �—~{||{|˜›„š.”Ìä */
+	$"A097 8A9A 0695 B3FF FFF4 9C99 839A 019B"            /*  —Šš.•³ÿÿôœ™ƒš.› */
+	$"9482 7C02 7B95 9984 9803 97AD 9B95 8B98"            /* ”‚|.{•™„˜.—­›•‹˜ */
+	$"0697 96E0 FFDA 9797 8398 0199 9282 7C02"            /* .—–àÿÚ——ƒ˜.™’‚|. */
+	$"7A93 9785 9601 9395 8D96 0494 9AAB 9695"            /* z“—…–.“•�–.”š«–• */
+	$"8496 0297 8F7B 817C 027A 9297 9896 0294"            /* „–.—�{�|.z’—˜–.” */
+	$"9295 8596 0297 8F7B 817C 027A 8C91 A390"            /* ’•…–.—�{�|.zŒ‘£� */
+	$"0291 897A 817C 017B 7BA5 7C00 7BB0 7C00"            /* .‘‰z�|.{{¥|.{°|. */
+	$"00AB 7C80 00A9 7CDF 00FF 00FF 00FF 00AD"            /* .«|€.©|ß.ÿ.ÿ.ÿ.­ */
+	$"0000 7A89 8002 7C73 749C 0002 79BC CE87"            /* ..z‰€.|stœ..y¼Î‡ */
+	$"CC04 CDC2 8172 749B 0002 80CF D587 D304"            /* Ì.ÍÂ�rt›..€ÏÕ‡Ó. */
+	$"D4D1 8870 749A 0002 6E9B D288 D003 D1D2"            /* Ôшptš..n›ÒˆÐ.ÑÒ */
+	$"9E6E 9270 8500 0371 9BCE D289 D002 D1CB"            /* žn’p…..q›ÎÒ‰Ð.ÑË */
+	$"AF91 A801 AA90 8300 0474 80AC B2AF 8AB0"            /* ¯‘¨.ª�ƒ..t€¬²¯Š° */
+	$"02B1 B3B4 90B3 03B5 9D7A 7580 0002 80B7"            /* .±³´�³.µ�zu€..€· */
+	$"C3A4 BF09 C0C3 B57F 0000 A0CF CACA 8DC9"            /* ä¿ÆÀõ... ÏÊÊ�É */
+	$"04CA CAC6 C8CA 8EC9 07CA CACD 9900 009C"            /* .ÊÊÆÈÊŽÉ.ÊÊÍ™..œ */
+	$"CA8F C604 C5CB EDC5 C58F C606 C7C8 9400"            /* Ê�Æ.ÅËíÅÅ�Æ.ÇÈ”. */
+	$"0093 C790 C403 C3F6 E7BF 8FC4 07C5 C48B"            /* .“Ç�Ä.Ãöç¿�Ä.ÅÄ‹ */
+	$"0000 8AC2 C28F C104 BEDA FFCE BE8E C107"            /* ..ŠÂÂ�Á.¾ÚÿξŽÁ. */
+	$"C2BF 8600 0083 BEC0 8DBF 06C0 BEB8 C1FC"            /* ¿†..ƒ¾À�¿.À¾¸Áü */
+	$"F3BC 8EBF 07C0 BA81 0000 7EB9 BE8D BD07"            /* 󼎿.Àº�..~¹¾�½. */
+	$"BAC0 E9D6 E1FF D5B8 8DBD 07BF B57C 0000"            /* ºÀéÖáÿÕ¸�½.¿µ|.. */
+	$"7AB3 BC8C BA09 B9BB DFDB EBCB FDF7 BAB9"            /* z³¼ŒºÆ¹»ßÛëËý÷º¹ */
+	$"8CBA 07BC AE79 0000 77AE B98C B709 B3D7"            /* Œº.¼®y..w®¹Œ·Æ³× */
+	$"FFF8 D3B2 E8FF D7B1 8CB7 07B9 A876 0000"            /* ÿøÓ²èÿ×±Œ·.¹¨v.. */
+	$"74A9 B78A B50C B6B5 B2EC FFFF C6AF C6FF"            /* t©·Šµ.¶µ²ìÿÿƯÆÿ */
+	$"F9B8 B48B B507 B7A3 7400 0073 A3B6 8BB3"            /* ù¸´‹µ.·£t..s£¶‹³ */
+	$"0BAE DBDE DDDB B0B3 B1EA FFD7 AE8B B307"            /* .®ÛÞÝÛ°³±êÿ×®‹³. */
+	$"B59D 7300 0072 9CB3 8AB0 04AD C0FF FFEA"            /* µ�s..rœ³Š°.­Àÿÿê */
+	$"80B0 05AD C4FF F9B4 AF8A B007 B397 7200"            /* €°.­Äÿù´¯Š°.³—r. */
+	$"0071 97B1 85AE 00AC 80AA 0EAB AAEA FFFF"            /* .q—±…®.¬€ª.«ªêÿÿ */
+	$"CFA6 AAAA A9A7 E7FF D5A7 81AA 00AC 85AE"            /* Ϧªª©§çÿÕ§�ª.¬…® */
+	$"07B0 9171 7400 7191 AE84 AB13 AAB2 B9BB"            /* .°‘qt.q‘®„«.ª²¹» */
+	$"BAB2 C6FF FFEB B7B9 B8B7 BBB6 C5FC F7B5"            /* º²Æÿÿë·¹¸·»¶Åü÷µ */
+	$"80B9 01BA B285 AB07 AD8C 7174 0070 8BAB"            /* €¹.º²…«.­Œqt.p‹« */
+	$"84A8 19A4 C1EF FBF4 D2F0 FFFC D1F1 F4F8"            /* „¨.¤ÁïûôÒðÿüÑñôø */
+	$"F0FB F1E2 E5FF DFF2 F3F8 F8CB A484 A807"            /* ðûñâåÿßòóøøˤ„¨. */
+	$"A988 7200 7471 85A7 84A5 09A1 BDFF FFF0"            /* ©ˆr.tq…§„¥Æ¡½ÿÿð */
+	$"D9FF FFE0 E784 FF03 D6F5 CDD4 80FF 01D2"            /* Ùÿÿàç„ÿ.ÖõÍÔ€ÿ.Ò */
+	$"9F85 A506 8472 7474 7181 A484 A208 9EBD"            /* Ÿ…¥.„rttq�¤„¢.ž½ */
+	$"FFFF D2F6 FFF7 D785 FF08 F1BD D8CF F6FF"            /* ÿÿÒöÿ÷×…ÿ.ñ½ØÏöÿ */
+	$"FFD3 9C83 A208 A3A2 8172 7474 727E A084"            /* ÿÓœƒ¢.£¢�rttr~ „ */
+	$"9F09 9CB0 DDCF DFFF FFD2 CCDD 84DC 08DA"            /* ŸÆœ°ÝÏßÿÿÒÌÝ„Ü.Ú */
+	$"CBFF F4C6 DCDD BE9B 839F 08A0 9E7E 7274"            /* ËÿôÆÜݾ›ƒŸ. ž~rt */
+	$"7472 7C9D 849C 089D 9B93 B5FF FFF4 A397"            /* tr|�„œ.�›“µÿÿô£— */
+	$"8598 0897 9BDD E0B4 9398 9A9D 839C 089D"            /* …˜.—›Ýà´“˜š�ƒœ.� */
+	$"9A7B 7374 7473 7998 8699 0597 C8F7 FFC1"            /* š{sttsy˜†™.—È÷ÿÁ */
+	$"9387 9905 96A9 EEF9 A695 8599 089A 9679"            /* “‡™.–©îù¦•…™.š–y */
+	$"7374 7473 7795 8596 0693 A7E6 D1D0 9895"            /* sttsw•…–.“§æÑИ• */
+	$"8796 0695 9BF3 FFE7 9595 8496 0897 9377"            /* ‡–.•›óÿç••„–.—“w */
+	$"7374 7473 7693 8595 058F B0FF ED98 9289"            /* sttsv“…•.�°ÿ혒‰ */
+	$"9505 8ED4 FFFF C58E 8495 0996 9076 7374"            /* •.ŽÔÿÿÅŽ„•Æ–�vst */
+	$"7473 7490 9384 9204 8BC8 E299 8F8A 9206"            /* tst�“„’.‹Èâ™�Š’. */
+	$"8DAD FFFF F494 9183 9202 938C 7581 7402"            /* �­ÿÿô”‘ƒ’.“Œu�t. */
+	$"738D 9184 9003 8EA7 938D 8B90 068F 8EDD"            /* s�‘„�.Ž§“�‹�.�ŽÝ */
+	$"FFD7 8E8F 8390 0191 8A82 7402 728B 8F85"            /* ÿ׎�ƒ�.‘Š‚t.r‹�… */
+	$"8E01 8B8D 8D8E 048C 93A4 8E8D 848E 028F"            /* Ž.‹��Ž.Œ“¤Ž�„Ž.� */
+	$"8773 8174 0272 8B8F 988E 028C 8A8D 858E"            /* ‡s�t.r‹�˜Ž.ŒŠ�…Ž */
+	$"028F 8773 8174 0272 8489 A388 0289 8173"            /* .�‡s�t.r„‰£ˆ.‰�s */
+	$"8174 0173 73A5 7400 73B0 7400 00AB 7480"            /* �t.ss¥t.s°t..«t€ */
+	$"00A9 74DF 0068 386D 6B00 0009 0800 0000"            /* .©tß.h8mk..Æ.... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 002E 4549 4A4A 4A4A 4A4A 4A4A 4A4A"            /* ....EIJJJJJJJJJJ */
+	$"3B0A 0400 0000 0000 0000 0000 0000 0000"            /* ;Â.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 2FF9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ../ùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FD52 0802 0000 0000 0000 0000 0000 0000"            /* ýR.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 4DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Mÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FF7E 1306 0000 0000 0000 0000 0000 0000"            /* ÿ~.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0002 ABFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..«ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFBB 2C11 0B0B 0B0B 0B0B 0B0B 0B0B 0B0B"            /* ÿ»,............. */
+	$"0B0B 0B0B 0B0B 0903 0000 0000 0000 0000"            /* ......Æ......... */
+	$"08B2 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .²ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF DFCC CCCC CCCC CCCC CCCC CCCC CCCC"            /* ÿÿßÌÌÌÌÌÌÌÌÌÌÌÌÌ */
+	$"CCCC CCCC CCCC CBC9 8000 0000 0000 0026"            /* ÌÌÌÌÌÌËÉ€......& */
+	$"71F2 EDEE EFEF EFEF EFEF EFEF EFEF EFEF"            /* qòíîïïïïïïïïïïïï */
+	$"EFEF F4F7 F7F7 F7F7 F7F7 F7F7 F7F7 F7F7"            /* ïïô÷÷÷÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F7 F7F7 F7F5 CE41 2000 0000 5EF7"            /* ÷÷÷÷÷÷÷õÎA ...^÷ */
+	$"FFF8 F8F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ÿøøùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F8 FAFF EE41 0000 C4FF"            /* ùùùùùùùøúÿîA..Äÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFA1 0000 B6FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ¡..¶ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF91 0000 A2FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ‘..¢ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF7A 0000 8FFF"            /* ÿÿÿÿÿÿÿÿÿÿÿz..�ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF68 0000 79FF"            /* ÿÿÿÿÿÿÿÿÿÿÿh..yÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF57 0000 5EFF"            /* ÿÿÿÿÿÿÿÿÿÿÿW..^ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF48 0000 4BFF"            /* ÿÿÿÿÿÿÿÿÿÿÿH..Kÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FD3B 0000 3FFE"            /* ÿÿÿÿÿÿÿÿÿÿý;..?þ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF F62F 0000 33F8"            /* ÿÿÿÿÿÿÿÿÿÿö/..3ø */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF ED23 0000 27F2"            /* ÿÿÿÿÿÿÿÿÿÿí#..'ò */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF DE1A 0000 1FE9"            /* ÿÿÿÿÿÿÿÿÿÿÞ....é */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF CE10 0000 1ADF"            /* ÿÿÿÿÿÿÿÿÿÿÎ....ß */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF C10B 0100 14D5"            /* ÿÿÿÿÿÿÿÿÿÿÁ....Õ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF B509 0100 0FCD"            /* ÿÿÿÿÿÿÿÿÿÿµÆ...Í */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF AA07 0001 0BC2"            /* ÿÿÿÿÿÿÿÿÿÿª.... */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF A005 0101 09B3"            /* ÿÿÿÿÿÿÿÿÿÿ ...Ƴ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 9504 0101 08A6"            /* ÿÿÿÿÿÿÿÿÿÿ•....¦ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8D04 0101 069A"            /* ÿÿÿÿÿÿÿÿÿÿ�....š */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8505 0101 0691"            /* ÿÿÿÿÿÿÿÿÿÿ…....‘ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7D05 0101 078B"            /* ÿÿÿÿÿÿÿÿÿÿ}....‹ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7606 0101 0885"            /* ÿÿÿÿÿÿÿÿÿÿv....… */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7106 0102 0881"            /* ÿÿÿÿÿÿÿÿÿÿq....� */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6D07 0102 0A7E"            /* ÿÿÿÿÿÿÿÿÿÿm...Â~ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6A08 0102 0B7B"            /* ÿÿÿÿÿÿÿÿÿÿj....{ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6709 0102 0C7C"            /* ÿÿÿÿÿÿÿÿÿÿgÆ...| */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 670A 0102 0C75"            /* ÿÿÿÿÿÿÿÿÿÿgÂ...u */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 600B 0102 113A"            /* ÿÿÿÿÿÿÿÿÿÿ`....: */
+	$"7B85 8585 8585 8585 8585 8585 8585 8585"            /* {……………………………………… */
+	$"8585 8585 8585 8585 8585 8585 8585 8585"            /* ………………………………………… */
+	$"8585 8585 8585 8585 8574 310F 0101 0B1E"            /* ………………………t1..... */
+	$"2B34 3535 3535 3535 3535 3535 3535 3535"            /* +455555555555555 */
+	$"3535 3535 3535 3535 3535 3535 3535 3535"            /* 5555555555555555 */
+	$"3535 3535 3535 3535 332A 1C0A 0100 040C"            /* 555555553*.Â.... */
+	$"1418 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1813 0B03 0000 0002"            /* ................ */
+	$"0304 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0402 0100 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0069 7433"            /* .............it3 */
+	$"3200 0025 F700 0000 00FF 00FF 00FF 00FF"            /* 2..%÷....ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 59D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.ŸY× */
+	$"00A6 59D3 0001 5959 8000 9D58 8459 D000"            /* .¦YÓ..YY€.�X„YÐ. */
+	$"0359 5900 569F 5901 5658 8359 D000 0257"            /* .YY.VŸY.VXƒYÐ..W */
+	$"6287 9D95 0494 917F 5E58 8359 CD00 0459"            /* b‡�•.”‘.^XƒYÍ..Y */
+	$"005C 9ABA 9EBC 03B9 AE85 5883 59CD 0004"            /* .\šºž¼.¹®…XƒYÍ.. */
+	$"5900 6EB3 BE9E BF04 BEB6 9D62 5782 59CD"            /* Y.n³¾ž¿.¾¶�bW‚YÍ */
+	$"0003 5900 74B6 A0BE 03B8 9F63 5782 59CC"            /* ..Y.t¶ ¾.¸ŸcW‚YÌ */
+	$"0004 5959 547A B8A0 BC03 B7A0 6357 8359"            /* ..YYTz¸ ¼.· cWƒY */
+	$"CB00 0459 5954 88B9 A0BB 03B7 A366 56B8"            /* Ë..YYTˆ¹ ».·£fV¸ */
+	$"5995 0005 5959 005B A0B9 A0BA 03B8 AA73"            /* Y•..YY.[ ¹ º.¸ªs */
+	$"55BA 5992 0006 5959 0053 7BB4 B9A0 BA04"            /* UºY’..YY.S{´¹ º. */
+	$"B9B2 905A 56BA 5990 0006 5959 0054 73AB"            /* ¹²�ZVºY�..YY.Ts« */
+	$"B8A2 B903 B5AB 865E B756 0300 5859 598E"            /* ¸¢¹.µ«†^·V..XYYŽ */
+	$"0007 5959 005A 83AD B6B7 A2B8 04B7 B4AD"            /* ..YY.Zƒ­¶·¢¸.·´­ */
+	$"9B87 B57D 047B 725D 0059 8D00 0759 5900"            /* ›‡µ}.{r].Y�..YY. */
+	$"5A8F B2B6 B6A4 B704 B6B5 B4B2 B1B4 B003"            /* Z�²¶¶¤·.¶µ´²±´°. */
+	$"ADA0 7600 8059 8900 8159 0355 77AC B0E2"            /* ­ v.€Y‰.�Y.Uw¬°â */
+	$"B103 AFA4 7D56 8259 8600 0159 5980 0003"            /* ±.¯¤}V‚Y†..YY€.. */
+	$"5279 9697 E298 0496 9073 5456 8000 0159"            /* Ry–—â˜.–�sTV€..Y */
+	$"5984 0008 5900 5457 6268 686D 7284 73A1"            /* Y„..Y.TWbhhmr„s¡ */
+	$"74B9 7309 706C 6868 6763 5900 5959 8200"            /* t¹sÆplhhgcY.YY‚. */
+	$"0759 0052 6E96 A4A7 A8E7 A980 A706 A6A0"            /* .Y.Rn–¤§¨ç©€§.¦  */
+	$"8E6A 5759 5982 0002 536F A782 B0E5 AF81"            /* ŽjWYY‚..So§‚°å¯� */
+	$"B006 AFAF AB99 6A00 5980 0004 5900 5A9B"            /* °.¯¯«™j.Y€..Y.Z› */
+	$"AEF0 AF0B AEA6 895B 0059 0000 5900 6CA7"            /* ®ð¯.®¦‰[.Y..Y.l§ */
+	$"B4AE 03AF ABAE AFB7 AE0A A996 6500 5900"            /* ´®.¯«®¯·®Â©–e.Y. */
+	$"0059 5470 A7B3 AD05 AEA8 A299 A8AE B6AD"            /* .YTp§³­.®¨¢™¨®¶­ */
+	$"0AA8 9666 0059 0059 5900 6CA3 B4AB 05A6"            /* ¨–f.Y.YY.l£´«.¦ */
+	$"EDE9 99A7 ACB5 AB0A A692 6200 5900 5959"            /* í陧¬µ«Â¦’b.Y.YY */
+	$"0063 9EB3 A905 A8A8 ECFF E195 B6A9 0BA3"            /* .cž³©.¨¨ìÿᕶ©.£ */
+	$"8D5F 5859 0059 5900 6099 A7B3 A806 A4DC"            /* �_XY.YY.`™§³¨.¤Ü */
+	$"FFFF CA96 AAB4 A80B A187 5B58 5900 5959"            /* ÿÿÊ–ª´¨.¡‡[XY.YY */
+	$"005C 94A6 B3A7 01A3 C580 FF02 AD9D A8B3"            /* .\”¦³§.£Å€ÿ.­�¨³ */
+	$"A70B 9F82 5A58 5900 5959 5857 8DA5 B3A6"            /* §.Ÿ‚ZXY.YYXW�¥³¦ */
+	$"07A4 AEF8 FFFF ED97 A4B2 A603 A59C 7C58"            /* .¤®øÿÿí—¤²¦.¥œ|X */
+	$"8359 0257 87A3 B4A4 01A1 E180 FF02 CB94"            /* ƒY.W‡£´¤.¡á€ÿ.Ë” */
+	$"A6B1 A403 A399 7657 8359 0254 80A1 B4A2"            /* ¦±¤.£™vWƒY.T€¡´¢ */
+	$"019D C180 FF03 FEA4 9BA3 B0A2 03A1 9672"            /* .�Á€ÿ.þ¤›£°¢.¡–r */
+	$"5783 5902 547A 9FB4 A202 A0A6 F380 FF02"            /* WƒY.TzŸ´¢. ¦ó€ÿ. */
+	$"E192 A3B0 A203 A094 6D56 8359 0255 759D"            /* á’£°¢. ”mVƒY.Uu� */
+	$"B5A0 019B D381 FF02 B495 A1AF A006 9D90"            /* µ .›Ó�ÿ.´•¡¯ .�� */
+	$"6957 5959 0080 5902 546D 9BB1 9E00 9F80"            /* iWYY.€Y.Tm›±ž.Ÿ€ */
+	$"A002 9CAF FD80 FF02 EF93 9DAF 9E06 9B8C"            /*  .œ¯ý€ÿ.ï“�¯ž.›Œ */
+	$"6657 5959 0080 5902 5568 97B0 9D07 9F95"            /* fWYY.€Y.Uh—°�.Ÿ• */
+	$"8A89 8B98 9CE2 81FF 02C3 8F9E AE9D 0699"            /* Š‰‹˜œâ�ÿ.Ã�ž®�.™ */
+	$"8861 5759 5900 8059 0256 6494 AF9C 089D"            /* ˆaWYY.€Y.Vd”¯œ.� */
+	$"8C9E D0DD C793 8CBC 81FF 02F7 9899 AE9C"            /* ŒžÐÝÇ“Œ¼�ÿ.÷˜™®œ */
+	$"0697 855F 5859 5900 8059 0257 5E91 AF9B"            /* .—…_XYY.€Y.W^‘¯› */
+	$"0195 B781 FF03 F69B 96ED 81FF 02CE 8B9C"            /* .•·�ÿ.ö›–í�ÿ.΋œ */
+	$"AD9B 0D95 815D 5859 5900 0059 5957 5B8C"            /* ­›.•�]XYY..YYW[Œ */
+	$"98AD 9903 9889 9AD8 81FF 02E0 89C4 81FF"            /* ˜­™.˜‰šØ�ÿ.à‰Ä�ÿ */
+	$"02FD 9E93 AD99 0D93 7C5A 5859 5900 0059"            /* .ýž“­™.“|ZXYY..Y */
+	$"5958 5987 96AC 970C 9889 D3CE 88A1 E8FF"            /* YXY‡–¬—.˜‰ÓΈ¡èÿ */
+	$"FFF9 9B9D F481 FF02 D788 98AC 9702 9079"            /* ÿù›�ô�ÿ.׈˜¬—.�y */
+	$"5A80 5901 0000 8059 0255 8395 AB96 0D97"            /* Z€Y...€Y.Uƒ•«–.— */
+	$"8DA4 FFFF F6B2 84B4 F6FB A28E CC82 FF02"            /* �¤ÿÿö²„´öû¢ŽÌ‚ÿ. */
+	$"A28F 97AB 9601 8E75 8159 0100 0080 5902"            /* ¢�—«–.Žu�Y...€Y. */
+	$"547F 94AB 9502 9688 E481 FF07 E99E 8CBC"            /* T.”«•.–ˆä�ÿ.鞌¼ */
+	$"9991 A2F8 81FF 02DD 8896 AA95 0394 8D71"            /* ™‘¢ø�ÿ.݈–ª•.”�q */
+	$"5880 5901 0000 8059 0255 7993 AA94 0295"            /* X€Y...€Y.Uy“ª”.• */
+	$"87B4 84FF 05D4 8C93 948F D182 FF02 A68C"            /* ‡´„ÿ.ÔŒ“”�Ñ‚ÿ.¦Œ */
+	$"95A9 9403 938A 6D57 8059 0700 0059 595A"            /* •©”.“ŠmW€Y...YYZ */
+	$"5374 91AA 9302 908C F284 FF06 DD92 9293"            /* St‘ª“.�Œò„ÿ.Ý’’“ */
+	$"8FA4 FB81 FF01 E086 AA93 0391 876A 5780"            /* �¤û�ÿ.à†ª“.‘‡jW€ */
+	$"5907 0000 5959 5A53 6F8F A991 0292 87CA"            /* Y...YYZSo�©‘.’‡Ê */
+	$"84FF 02F8 A18D 8091 018D D782 FF02 A788"            /* „ÿ.ø¡�€‘.�ׂÿ.§ˆ */
+	$"92A8 9103 8F84 6757 8059 0100 0080 5902"            /* ’¨‘.�„gW€Y...€Y. */
+	$"556B 8DA9 9002 8E85 DB84 FF01 C78A 8190"            /* Uk�©�.Ž…Û„ÿ.ÇŠ�� */
+	$"028B A8FE 81FF 01E2 84A9 9003 8E82 6357"            /* .‹¨þ�ÿ.â„©�.Ž‚cW */
+	$"8059 0100 0080 5902 5466 8CA8 9005 9186"            /* €Y...€Y.TfŒ¨�.‘† */
+	$"AB85 A6EE 81FF 02EE 958E 8190 028F 8CDC"            /* «…¦î�ÿ.î•Ž��.�ŒÜ */
+	$"82FF 02AA 8591 A790 038D 7F62 5880 5901"            /* ‚ÿ.ª…‘§�.�.bX€Y. */
+	$"0000 8059 0254 618A A78E 0C8F 84A5 FFF0"            /* ..€Y.TaŠ§Ž.�„¥ÿð */
+	$"A480 BBF9 FFFF B688 838E 0189 A982 FF01"            /* ¤€»ùÿÿ¶ˆƒŽ.‰©‚ÿ. */
+	$"E583 A88E 038B 7C5F 5880 5901 0000 8059"            /* 僨Ž.‹|_X€Y...€Y */
+	$"0256 5F87 A78D 028C 83E8 80FF 06DF 9087"            /* .V_‡§�.Œƒè€ÿ.ß�‡ */
+	$"D4E0 8C8C 838D 028C 8ADE 82FF 02AB 838E"            /* ÔàŒŒƒ�.ŒŠÞ‚ÿ.«ƒŽ */
+	$"A68D 038A 7A5D 5880 5901 0000 8059 0257"            /* ¦�.Šz]X€Y...€Y.W */
+	$"5C84 A68C 028D 7EB7 83FF 03C9 8B8E 8B85"            /* \„¦Œ.�~·ƒÿ.É‹Ž‹… */
+	$"8C01 87AA 82FF 01E6 82A7 8C03 8877 5C58"            /* Œ.‡ª‚ÿ.悧Œ.ˆw\X */
+	$"8059 0100 0080 5902 5757 81A6 8A02 878A"            /* €Y...€Y.WW�¦Š.‡Š */
+	$"F584 FF01 CB83 868A 0289 88E0 82FF 02A8"            /* õ„ÿ.˃†Š.‰ˆà‚ÿ.¨ */
+	$"808B A58A 0386 735B 5880 5901 0000 8059"            /* €‹¥Š.†s[X€Y...€Y */
+	$"0258 557F A58A 028B 7BC9 84FF 02F6 9987"            /* .XU.¥Š.‹{É„ÿ.ö™‡ */
+	$"878A 0184 AB82 FF01 E580 A68A 0285 715A"            /* ‡Š.„«‚ÿ.倦Š.…qZ */
+	$"8159 0100 0081 5902 577B 88A3 8902 8A81"            /* �Y...�Y.W{ˆ£‰.Š� */
+	$"9685 FF01 BF82 8889 0288 87E0 82FF 02A7"            /* –…ÿ.¿‚ˆ‰.ˆ‡à‚ÿ.§ */
+	$"7F8A A489 0183 6F82 5901 0000 8159 0254"            /* .Š¤‰.ƒo‚Y...�Y.T */
+	$"7787 A488 017A DC84 FF02 EA8C 8689 8801"            /* w‡¤ˆ.zÜ„ÿ.ꌆ‰ˆ. */
+	$"82A9 82FF 01E3 7EA4 8802 8781 6C82 5901"            /* ‚©‚ÿ.ã~¤ˆ.‡�l‚Y. */
+	$"0000 8159 0151 7497 860E 8784 8686 8486"            /* ..�Y.Qt—†.‡„††„† */
+	$"8684 8685 8486 877B A685 FF11 AD7D 8685"            /* †„†…„†‡{¦…ÿ.­}†… */
+	$"8486 8584 8784 8487 8485 8783 83DF 82FF"            /* „†…„‡„„‡„…‡ƒƒß‚ÿ */
+	$"0FA4 7D87 8584 8785 8487 8485 8784 8586"            /* .¤}‡…„‡…„‡„…‡„…† */
+	$"8596 8602 7F69 5881 5901 0000 8059 035A"            /* …–†..iX�Y...€Y.Z */
+	$"5170 8496 850E 8182 7F7F 827F 8082 7E81"            /* Qp„–….�‚..‚.€‚~� */
+	$"8280 837E EC84 FF12 DB7E 817F 8082 7E81"            /* ‚€ƒ~ì„ÿ.Û~�.€‚~� */
+	$"827E 8182 7E82 817E 827B A682 FF10 E07B"            /* ‚~�‚~‚�~‚{¦‚ÿ.à{ */
+	$"8380 827E 8181 7E82 817E 8280 7F81 8494"            /* ƒ€‚~��~‚�~‚€.�„” */
+	$"8503 847D 6758 8159 0100 0080 5903 5A53"            /* ….„}gX�Y...€Y.ZS */
+	$"6E84 9585 0E82 90FB BCAC FFA4 B9FF 9BD3"            /* n„•….‚�û¼¬ÿ¤¹ÿ›Ó */
+	$"FC97 7BB9 84FF 14FC 91AA FFA8 BFFF 92D1"            /* ü—{¹„ÿ.ü‘ªÿ¨¿ÿ’Ñ */
+	$"FB92 E5ED 87F4 DC95 FFCB 73DF 82FF 0FA0"            /* û’åí‡ôÜ•ÿËsß‚ÿ.  */
+	$"79DC F889 E5ED 90F6 D88F FFC7 AAC2 7D94"            /* yÜø‰åí�öØ�ÿǪÂ}” */
+	$"8503 847C 6558 8159 0100 0080 5903 5A52"            /* ….„|eX�Y...€Y.ZR */
+	$"6983 9584 0E81 92FF BCAA FFC4 D2FF 96D4"            /* iƒ•„.�’ÿ¼ªÿÄÒÿ–Ô */
+	$"FF9A 82F8 84FF 14C6 78CE FFA6 BFFF B6E4"            /* ÿš‚ø„ÿ.ÆxÎÿ¦¿ÿ¶ä */
+	$"FF8D E8F9 AFFE DE91 FFE3 899E 82FF 0FDB"            /* ÿ�èù¯þÞ‘ÿ㉞‚ÿ.Û */
+	$"74E2 FFB1 F3F0 8AFA E9B4 FFC8 A6C7 7C94"            /* tâÿ±óðŠúé´ÿȦÇ|” */
+	$"8403 8379 6258 8159 0100 0080 5903 5A51"            /* „.ƒybX�Y...€Y.ZQ */
+	$"6581 9582 047F 90FF D5C8 81FF 04BB E5F9"            /* e�•‚..�ÿÕÈ�ÿ.»åù */
+	$"86CA 84FF 06F2 82D6 FFFF C6D6 80FF 02FC"            /* †Ê„ÿ.ò‚ÖÿÿÆÖ€ÿ.ü */
+	$"B5EF 80FF 06E9 B8FF FFFA 8AD6 82FF 0196"            /* µï€ÿ.é¸ÿÿúŠÖ‚ÿ.– */
+	$"C680 FF02 F4B4 FA80 FF03 DCC9 C57A 9482"            /* Æ€ÿ.ô´ú€ÿ.ÜÉÅz”‚ */
+	$"0381 7761 5881 5901 0000 8059 035A 5262"            /* .�waX�Y...€Y.ZRb */
+	$"7F95 8102 7E8F FA85 FF01 B190 85FF 01AC"            /* .•�.~�ú…ÿ.±�…ÿ.¬ */
+	$"9A90 FF01 C494 82FF 02D5 8DF9 87FF 01BF"            /* š�ÿ.Ä”‚ÿ.Õ�ù‡ÿ.¿ */
+	$"7994 8103 8075 5F58 8159 0100 0081 5902"            /* y”�.€u_X�Y...�Y. */
+	$"5461 7D95 8002 7D8E FA84 FF02 E779 DD84"            /* Ta}•€.}Žú„ÿ.çyÝ„ */
+	$"FF02 E47C E690 FF02 FC8A D281 FF02 FC8C"            /* ÿ.ä|æ�ÿ.üŠÒ�ÿ.üŒ */
+	$"C787 FF01 BF77 9480 037E 725E 5881 5901"            /* LJÿ.¿w”€.~r^X�Y. */
+	$"0000 8159 0254 5D7C 957F 027C 8EFA 84FF"            /* ..�Y.T]|•..|Žú„ÿ */
+	$"019C A285 FF01 97AD 92FF 01C7 8F80 FF04"            /* .œ¢…ÿ.—­’ÿ.Ç�€ÿ. */
+	$"FBC0 748B F986 FF01 BE76 947F 037D 715C"            /* ûÀt‹ù†ÿ.¾v”..}q\ */
+	$"5881 5901 0000 8159 0254 597B 957F 027C"            /* X�Y...�Y.TY{•..| */
+	$"8EFA 83FF 02D7 7BEF 84FF 02D1 7EF4 92FF"            /* Žúƒÿ.×{ï„ÿ.Ñ~ô’ÿ */
+	$"09FE 8CC9 F8CB 8C64 9F83 C386 FF01 BE76"            /* ÆþŒÉøËŒdŸƒÃ†ÿ.¾v */
+	$"947F 037C 6F5B 5881 5901 0000 8159 0355"            /* ”..|o[X�Y...�Y.U */
+	$"5779 7E94 7D02 7A8C FA82 FF02 FD8A B884"            /* Wy~”}.zŒú‚ÿ.ýŠ¸„ */
+	$"FF02 FA86 C094 FF09 CF74 7C64 7FCB FFC0"            /* ÿ.ú†À”ÿÆÏt|d.ËÿÀ */
+	$"80F7 85FF 01BD 7494 7D02 7A6D 5B82 5901"            /* €÷…ÿ.½t”}.zm[‚Y. */
+	$"0000 8159 0256 5677 957C 0279 8BFA 82FF"            /* ..�Y.VVw•|.y‹ú‚ÿ */
+	$"02C3 82FB 84FF 02BB 86FE 95FF 088C 99D5"            /* .Âû„ÿ.»†þ•ÿ.Œ™Õ */
+	$"FCFF FFFA 7FBC 85FF 01BD 7394 7C02 796B"            /* üÿÿú.¼…ÿ.½s”|.yk */
+	$"5A82 5901 0000 8159 0257 5575 957B 0277"            /* Z‚Y...�Y.WUu•{.w */
+	$"8BFA 81FF 02F4 7DCE 84FF 02EE 7BD6 96FF"            /* ‹ú�ÿ.ô}΄ÿ.î{Ö–ÿ */
+	$"01D0 A782 FF02 C47B F484 FF01 BC72 947B"            /* .Ч‚ÿ.Ä{ô„ÿ.¼r”{ */
+	$"0178 6983 5901 0000 8159 0258 5272 957A"            /* .xiƒY...�Y.XRr•z */
+	$"0877 8AE8 EEEC ECF2 AA91 85FF 02A8 92F2"            /* .wŠèîììòª‘…ÿ.¨’ò */
+	$"95EC 03ED ED93 DC81 FF03 FD83 B2F2 82EC"            /* •ì.íí“Ü�ÿ.ýƒ²ò‚ì */
+	$"02F3 B573 947A 0176 6783 5901 0000 8159"            /* .óµs”z.vgƒY...�Y */
+	$"0258 5070 9679 007A 817F 027E 71E3 84FF"            /* .XPp–y.z�..~qã„ÿ */
+	$"03DF 797F 8096 7F02 8078 A382 FF02 C970"            /* .ßy.€–..€x£‚ÿ.Ép */
+	$"8083 7F00 7D95 7902 7565 5882 5901 0000"            /* €ƒ..}•y.ueX‚Y... */
+	$"8159 0258 4F6F 9779 8077 0278 69AB 85FF"            /* �Y.XOo—y€w.xi«…ÿ */
+	$"029B 7378 9977 0178 DF81 FF02 B468 7583"            /* .›sx™w.xß�ÿ.´huƒ */
+	$"7700 7895 7902 7464 5882 5901 0000 8259"            /* w.x•y.tdX‚Y...‚Y */
+	$"0150 6D9A 7802 747A F384 FF02 CD72 779A"            /* .Pmšx.tzó„ÿ.Írwš */
+	$"7808 71A0 FFFF D98C 8FC6 6D9C 7801 7363"            /* x.q ÿÿÙŒ�Æmœx.sc */
+	$"8359 0100 0082 5901 516B 9A77 016B C484"            /* ƒY...‚Y.Qkšw.kÄ„ */
+	$"FF02 F68A 729B 770A 7677 9B8A 80BD FDFF"            /* ÿ.öŠr›wÂvw›Š€½ýÿ */
+	$"9C6A 789A 7702 7261 5882 5901 0000 8159"            /* œjxšw.raX‚Y...�Y */
+	$"035A 4F68 7598 7602 737B F184 FF01 B96E"            /* .ZOhu˜v.s{ñ„ÿ.¹n */
+	$"9D76 0371 85D7 FB80 FF02 F076 719A 7602"            /* �v.q…×û€ÿ.ðvqšv. */
+	$"7060 5882 5901 0000 8159 035A 4E66 7498"            /* p`X‚Y...�Y.ZNft˜ */
+	$"7504 7380 77C3 FE81 FF02 E97B 729D 7502"            /* u.s€wÃþ�ÿ.é{r�u. */
+	$"727F EF82 FF01 CD66 9A75 026F 5E58 8259"            /* r.ï‚ÿ.Ífšu.o^X‚Y */
+	$"0100 0081 5903 5A4D 6473 9774 0672 76EE"            /* ...�Y.ZMds—t.rvî */
+	$"CC73 83DA 80FF 01A4 6C9F 7401 6CBE 83FF"            /* ÌsƒÚ€ÿ.¤lŸt.l¾ƒÿ */
+	$"02A5 6575 9874 026D 5C58 8259 0100 0081"            /* .¥eu˜t.m\X‚Y...� */
+	$"5902 5A4D 6298 730B 6F82 FAFF F9AD 6A97"            /* Y.ZMb˜s.o‚úÿù­j— */
+	$"F1DC 7172 9F73 016D 9283 FF03 F981 6B74"            /* ñÜqrŸs.m’ƒÿ.ù�kt */
+	$"9773 026C 5B58 8259 0100 0081 5902 5A4D"            /* —s.l[X‚Y...�Y.ZM */
+	$"6098 7301 6C94 81FF 04EC 957B 8470 A073"            /* `˜s.l”�ÿ.ì•{„p s */
+	$"0271 75E7 83FF 02DD 6972 9773 026B 5C58"            /* .quçƒÿ.Ýir—s.k\X */
+	$"8259 0100 0081 5902 5A50 5F98 7201 69A8"            /* ‚Y...�Y.ZP_˜r.i¨ */
+	$"83FF 019B 69A2 7201 6ABF 84FF 02AF 6473"            /* ƒÿ.›i¢r.j¿„ÿ.¯ds */
+	$"9672 026A 5B58 8259 0100 0081 5903 5A51"            /* –r.j[X‚Y...�Y.ZQ */
+	$"5D70 9771 0167 BD81 FF02 F6A1 6FA3 7101"            /* ]p—q.g½�ÿ.ö¡o£q. */
+	$"6B94 84FF 02F7 7B6D 9671 0169 5A83 5901"            /* k”„ÿ.÷{m–q.iZƒY. */
+	$"0000 8159 035A 505B 6F97 7101 69D5 80FF"            /* ..�Y.ZP[o—q.iÕ€ÿ */
+	$"03E8 8B68 70A3 7102 6F74 E984 FF02 BC65"            /* .è‹hp£q.oté„ÿ.¼e */
+	$"7294 7102 7067 5883 5901 0000 8159 035A"            /* r”q.pgXƒY...�Y.Z */
+	$"5059 6F96 7007 6F6F E7FF FFD4 7A69 A670"            /* PYo–p.ooçÿÿÔzi¦p */
+	$"0168 BD84 FF02 EC71 6E94 7002 6F67 5883"            /* .h½„ÿ.ìqn”p.ogXƒ */
+	$"5901 0000 8159 035A 5058 6E96 6F06 6C79"            /* Y...�Y.ZPXn–o.ly */
+	$"F7FF BD6E 6BA7 6F02 6A8B FD83 FF02 FC83"            /* ÷ÿ½nk§o.j‹ýƒÿ.üƒ */
+	$"6B94 6F02 6E66 5783 5901 0000 8159 035A"            /* k”o.nfWƒY...�Y.Z */
+	$"5056 6D96 6E05 688E FBA5 676C A86E 026D"            /* PVm–n.hŽû¥gl¨n.m */
+	$"6AD0 83FF 02F5 7D6B 946E 026D 6456 8359"            /* jЃÿ.õ}k”n.mdVƒY */
+	$"0100 0081 5903 5A4F 556C 966D 0468 9294"            /* ...�Y.ZOUl–m.h’” */
+	$"656C AA6D 0268 87F8 82FF 01BC 6995 6D02"            /* elªm.h‡ø‚ÿ.¼i•m. */
+	$"6C63 5683 5901 0000 8159 035A 5054 6C97"            /* lcVƒY...�Y.ZPTl— */
+	$"6D01 6C68 AD6D 0866 9EF7 FFFF F3B1 6C6B"            /* m.lh­m.fž÷ÿÿó±lk */
+	$"956D 026C 6256 8359 0100 0081 5903 5A50"            /* •m.lbVƒY...�Y.ZP */
+	$"546C CA6D 0667 81A6 9D7A 666C 966D 026C"            /* TlÊm.g�¦�zfl–m.l */
+	$"6256 8359 0100 0081 5903 5A51 536C CB6D"            /* bVƒY...�Y.ZQSlËm */
+	$"0369 6565 6998 6D02 6C62 5783 5901 0000"            /* .ieei˜m.lbWƒY... */
+	$"8159 035A 5152 6AEA 6C02 6B61 5783 5901"            /* �Y.ZQRjêl.kaWƒY. */
+	$"0000 8159 035A 5252 6AEA 6C02 6B61 5783"            /* ..�Y.ZRRjêl.kaWƒ */
+	$"5901 0000 8159 035A 5252 6AEA 6C02 6B61"            /* Y...�Y.ZRRjêl.ka */
+	$"5783 5901 0000 8159 035A 5352 6AEA 6C02"            /* WƒY...�Y.ZSRjêl. */
+	$"6B61 5783 5900 0082 5903 5A54 5168 EA6B"            /* kaWƒY..‚Y.ZTQhêk */
+	$"0269 5E56 8359 0000 8359 0257 4D5E EA63"            /* .i^VƒY..ƒY.WM^êc */
+	$"0260 5756 8359 0100 0082 5902 5A55 53EA"            /* .`WVƒY...‚Y.ZUSê */
+	$"5601 5556 8459 0100 00FB 5901 0000 FB59"            /* V.UV„Y...ûY...ûY */
+	$"0100 00FB 5901 0000 FB59 0100 00FA 5981"            /* ...ûY...ûY...úY� */
+	$"00F9 5982 00F7 5983 00F6 5986 00F3 59FF"            /* .ùY‚.÷Yƒ.öY†.óYÿ */
+	$"00FF 0000 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ...ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00DF 009F 7CD7 00A6 7CD3"            /* .ÿ.ÿ.ÿ.ß.Ÿ|×.¦|Ó */
+	$"0001 7C7C 8000 9D7B 847C D000 037C 7C00"            /* ..||€.�{„|Ð..||. */
+	$"7C9F 7F01 7B7B 837C D000 027B 88A5 9EB0"            /* |Ÿ..{{ƒ|Ð..{ˆ¥ž° */
+	$"03AC 9D81 7B83 7CCD 0004 7C00 81B3 D09E"            /* .¬��{ƒ|Í..|.�³Ðž */
+	$"D302 D0C3 A184 7CCD 0004 7C00 8FCA D79F"            /* Ó.Ðá„|Í..|.�Êן */
+	$"D803 CEB4 837A 827C CD00 037C 0095 CEA0"            /* Ø.δƒz‚|Í..|.•Î  */
+	$"D803 D1B7 847A 827C CC00 047C 7C78 9BD0"            /* Ø.Ñ·„z‚|Ì..||x›Ð */
+	$"A0D7 03D1 B884 7A83 7CCB 0004 7C7C 79A8"            /*  ×.Ѹ„zƒ|Ë..||y¨ */
+	$"D3A0 D703 D2BC 867A B87C 9500 057C 7C00"            /* Ó ×.Ò¼†z¸|•..||. */
+	$"81BD D5A0 D603 D3C3 9278 BA7C 9200 067C"            /* �½Õ Ö.ÓÃ’xº|’..| */
+	$"7C00 799D CED5 A0D6 04D4 CBAC 7D79 BA7C"            /* |.y�ÎÕ Ö.Ôˬ}yº| */
+	$"9000 067C 7C00 7B97 C5D3 A2D5 03D1 C4A3"            /* �..||.{—ÅÓ¢Õ.ÑÄ£ */
+	$"8280 7AB4 7B03 007B 7C7C 8E00 077C 7C00"            /* ‚€z´{..{||Ž..||. */
+	$"81A4 C8D2 D4A2 D505 D4D0 C8B7 A69F B19E"            /* �¤ÈÒÔ¢Õ.ÔÐÈ·¦Ÿ±ž */
+	$"079F 9F9E 9D94 8100 7C8D 0007 7C7C 0081"            /* .ŸŸž�”�.|�..||.� */
+	$"ADCD D3D3 A4D4 03D3 D2D0 CE80 CCB2 CB03"            /* ­ÍÓÓ¤Ô.ÓÒÐ΀̲Ë. */
+	$"C7B9 9500 807C 8900 817C 037A 98C6 CDE2"            /* ǹ•.€|‰.�|.z˜ÆÍâ */
+	$"CE03 CCBE 9B7A 827C 8600 017C 7C80 0002"            /* Î.̾›z‚|†..||€.. */
+	$"7697 B181 B403 B5B5 B4B4 9EB5 01B4 B4B6"            /* v—±�´.µµ´´žµ.´´¶ */
+	$"B506 B4B4 B3AA 9177 7980 0001 7C7C 8400"            /* µ.´´³ª‘wy€..||„. */
+	$"097C 0078 7D87 8B8B 8D94 95E2 960A 9592"            /* Æ|.x}‡‹‹�”•â–•’ */
+	$"8E8C 8B8B 867D 007C 7C82 0009 7C00 7892"            /* ŽŒ‹‹†}.||‚.Æ|.x’ */
+	$"B5C1 C4C5 C6C6 81C7 03C6 C6C7 C79E C601"            /* µÁÄÅÆÆ�Ç.ÆÆÇÇžÆ. */
+	$"C7C7 82C6 01C7 C7AC C683 C70A C6C6 C4C3"            /* ÇÇ‚Æ.ÇǬƃÇÂÆÆÄà */
+	$"C3BD AB8C 7A7C 7C82 0005 7893 C5CE CFD0"            /* ý«Œz||‚..x“ÅÎÏÐ */
+	$"E9CF 08D0 D0CF CEC9 B58B 007C 8000 047C"            /* éÏ.ÐÐÏÎɵ‹.|€..| */
+	$"0080 B9CE F0D0 0CCF C5A7 7E00 7C00 007C"            /* .€¹ÎðÐ.Ïŧ~.|..| */
+	$"008F C5CE B3CF 03D0 CDCF D0B7 CF0A C9B2"            /* .�ÅγÏ.ÐÍÏзÏÂɲ */
+	$"8600 7C00 007C 7894 C6B3 CF05 D0CB BEBA"            /* †.|..|x”ƳÏ.Ð˾º */
+	$"CCD0 B6CF 0ACA B487 007C 007C 7C00 8FC4"            /* ÌжÏÂÊ´‡.|.||.�Ä */
+	$"B4CE 05C9 F2ED B9CC CFB5 CE0B C8B1 8400"            /* ´Î.Éòí¹ÌϵÎ.ȱ„. */
+	$"7C00 7C7C 0089 C0CC B3CD 05CC F3FF E7B9"            /* |.||.‰À̳Í.Ìóÿç¹ */
+	$"CEB5 CD0B C5AC 817B 7C00 7C7C 0085 BCCB"            /* εÍ.Ŭ�{|.||.…¼Ë */
+	$"B3CC 06C9 EAFF FFD8 BDCE B4CC 0BC4 A77D"            /* ³Ì.ÉêÿÿؽδÌ.ħ} */
+	$"7B7C 007C 7C00 81B6 CAB3 CC01 C9DC 80FF"            /* {|.||.�¶Ê³Ì.ÉÜ€ÿ */
+	$"02C6 C4CD B2CC 0DCB C1A3 7D7B 7C00 7C7C"            /* .ÆÄͲÌ.ËÁ£}{|.|| */
+	$"7B7D B1C9 CBB2 CA07 C9CF FBFF FFF1 BACB"            /* {}±É˲Ê.ÉÏûÿÿñºË */
+	$"B2CA 03C9 BE9D 7B83 7C02 7BAB C8B4 CA01"            /* ²Ê.ɾ�{ƒ|.{«È´Ê. */
+	$"C8ED 80FF 02D9 BCCB B1CA 03C9 BC98 7A83"            /* Èí€ÿ.ټ˱Ê.ɼ˜zƒ */
+	$"7C02 7AA5 C6B4 C901 C6DA 80FF 03FD C1C4"            /* |.z¥Æ´É.ÆÚ€ÿ.ýÁÄ */
+	$"CAB0 C903 C7B9 957A 837C 0279 9FC4 B4C8"            /* Ê°É.ǹ•zƒ|.yŸÄ´È */
+	$"02C7 CAF7 80FF 02E8 B8C9 B0C8 03C5 B68F"            /* .ÇÊ÷€ÿ.è¸É°È.Ŷ� */
+	$"7A83 7C02 799A C2B5 C701 C4E4 81FF 02CA"            /* zƒ|.yšÂµÇ.Ää�ÿ.Ê */
+	$"BFC8 AFC7 06C4 B38B 7A7C 7C00 807C 0278"            /* ¿È¯Ç.ij‹z||.€|.x */
+	$"93C0 B1C6 00C7 80C8 02C4 CFFD 80FF 01F2"            /* “À±Æ.Ç€È.ÄÏý€ÿ.ò */
+	$"B8B0 C606 C2AF 897A 7C7C 0080 7C02 798F"            /* ¸°Æ.¯‰z||.€|.y� */
+	$"BEB0 C607 C8C0 B4B2 B6C3 C6ED 81FF 02D4"            /* ¾°Æ.ÈÀ´²¶ÃÆí�ÿ.Ô */
+	$"BBC7 AEC6 06C1 AC84 7A7C 7C00 807C 0279"            /* »Ç®Æ.Á¬„z||.€|.y */
+	$"8BBB AFC5 08C6 B6BA DCE5 D5B3 BAD8 81FF"            /* ‹»¯Å.ƶºÜåÕ³ºØ�ÿ */
+	$"02F9 BBC4 AEC5 06C0 A982 7B7C 7C00 807C"            /* .ù»Ä®Å.À©‚{||.€| */
+	$"027A 85B7 AEC4 02C5 C1CE 81FF 03F7 BAC1"            /* .z…·®Ä.ÅÁÎ�ÿ.÷ºÁ */
+	$"F481 FF02 DCB7 C6AD C40D BDA5 817B 7C7C"            /* ô�ÿ.Ü·Æ­Ä.½¥�{|| */
+	$"0000 7C7C 7A83 B4C3 ADC4 03C3 B3BE E981"            /* ..||zƒ´Ã­Ä.ó¾é� */
+	$"FF02 E8B6 DC81 FF02 FDBE C0AD C40D BCA1"            /* ÿ.è¶Ü�ÿ.ý¾À­Ä.¼¡ */
+	$"7E7B 7C7C 0000 7C7C 7B80 B0C2 ACC3 0CC4"            /* ~{||..||{€°Â¬Ã.Ä */
+	$"B5DD DAAE C4F2 FFFF FAC2 C5F8 81FF 02E2"            /* µÝÚ®ÄòÿÿúÂÅø�ÿ.â */
+	$"B5C4 ACC3 01B9 9D81 7C07 0000 7C7C 7B7C"            /* µÄ¬Ã.¹��|...||{| */
+	$"ABC0 ABC1 0DC2 BCC1 FFFF F7C7 ACD0 FBFC"            /* «À«Á.¼Áÿÿ÷ǬÐûü */
+	$"C7BC E082 FF02 C0BD C2AB C101 B79A 817C"            /* Ǽà‚ÿ.À½Â«Á.·š�| */
+	$"0100 0080 7C02 7BA7 BFAB C102 C2B2 EB81"            /* ...€|.{§¿«Á.²ë� */
+	$"FF07 EDB9 B3D7 C3BF C7FA 81FF 02E6 B3C2"            /* ÿ.í¹³×ÿÇú�ÿ.æ³Â */
+	$"AAC1 03C0 B595 7B80 7C01 0000 807C 027A"            /* ªÁ.Àµ•{€|...€|.z */
+	$"A3BE AAC0 02C1 B6CA 84FF 05DE B8C0 C0BD"            /* £¾ªÀ.Á¶Ê„ÿ.Þ¸ÀÀ½ */
+	$"E382 FF02 C2BA C1A9 C003 BFB2 927A 807C"            /* ã‚ÿ.ºÁ©À.¿²’z€| */
+	$"0100 0080 7C02 789D BCAA BF02 BEB3 F584"            /* ...€|.x�¼ª¿.¾³õ„ */
+	$"FF06 EBBF BEBF BDC9 FC81 FF02 E8B2 C0A9"            /* ÿ.뿾¿½Éü�ÿ.è²À© */
+	$"BF03 BEB0 8F7A 807C 0100 0080 7C02 7898"            /* ¿.¾°�z€|...€|.x˜ */
+	$"BAA9 BE02 BFB5 D984 FF02 FBC7 BC80 BE01"            /* º©¾.¿µÙ„ÿ.ûǼ€¾. */
+	$"BBE7 82FF 02C3 B7BF A8BE 03BC AD8B 7A80"            /* »ç‚ÿ.÷¿¨¾.¼­‹z€ */
+	$"7C01 0000 807C 0278 95B9 A9BD 02BC B3E9"            /* |...€|.x•¹©½.¼³é */
+	$"84FF 01DD B981 BD02 BACB FE81 FF02 EAB0"            /* „ÿ.ݹ�½.ºËþ�ÿ.ê° */
+	$"BEA8 BD03 BAAA 887A 807C 0100 0080 7C02"            /* ¾¨½.ºªˆz€|...€|. */
+	$"7890 B8A8 BD05 BEB2 C1AC C7F6 81FF 02F4"            /* x�¸¨½.¾²Á¬Çö�ÿ.ô */
+	$"C0BC 82BD 01BB EA82 FF02 C4B6 BEA7 BD03"            /* À¼‚½.»ê‚ÿ.Ķ¾§½. */
+	$"BAA8 867A 807C 0100 0080 7C02 788B B5A7"            /* º¨†z€|...€|.x‹µ§ */
+	$"BC0C BDB5 C1FF F2BD AAD5 FCFF FFD3 B983"            /* ¼.½µÁÿò½ªÕüÿÿÓ¹ƒ */
+	$"BC01 B9CC 82FF 02EB AFBD A7BC 03B8 A584"            /* ¼.¹Ì‚ÿ.믽§¼.¸¥„ */
+	$"7B80 7C01 0000 807C 0279 88B3 A8BC 01AE"            /* {€|...€|.yˆ³¨¼.® */
+	$"ED80 FF06 E5B1 B1E6 ECBB BB84 BC01 B9EB"            /* í€ÿ.å±±æì»»„¼.¹ë */
+	$"82FF 02C5 B4BD A6BC 03B7 A381 7B80 7C01"            /* ‚ÿ.Å´½¦¼.·£�{€|. */
+	$"0000 807C 027A 85B1 A6BB 02BC AFCC 82FF"            /* ..€|.z…±¦».¼¯Ì‚ÿ */
+	$"04FE D6AF BBBA 85BB 01B7 CC82 FF02 ECAE"            /* .þÖ¯»º…».·Ì‚ÿ.ì® */
+	$"BCA6 BB03 B5A0 807B 807C 0100 0080 7C03"            /* ¼¦».µ €{€|...€|. */
+	$"7A80 ADB9 A5BA 02B8 B0F7 84FF 01DE B486"            /* z€­¹¥º.¸°÷„ÿ.Þ´† */
+	$"BA02 B9B8 EB82 FF02 C3B2 BBA5 BA03 B39C"            /* º.¹¸ë‚ÿ.ò»¥º.³œ */
+	$"7F7B 807C 0100 0080 7C03 7B7E AAB7 A4B8"            /* .{€|...€|.{~ª·¤¸ */
+	$"02BA ABD8 84FF 02F9 C1B6 87B8 01B5 CC82"            /* .º«Ø„ÿ.ùÁ¶‡¸.µÌ‚ */
+	$"FF02 EBAC B9A5 B803 B199 7D7B 807C 0100"            /* ÿ.묹¥¸.±™}{€|.. */
+	$"0080 7C03 7B7D A7B6 A4B7 02B2 B7FE 84FF"            /* .€|.{}§¶¤·.²·þ„ÿ */
+	$"01D7 B388 B702 B6B6 EB82 FF02 C2B0 B8A4"            /* .׳ˆ·.¶¶ë‚ÿ.°¸¤ */
+	$"B701 AF96 827C 0100 0081 7C02 7BA3 B5A3"            /* ·.¯–‚|...�|.{£µ£ */
+	$"B602 B7A8 E584 FF02 F1B8 B589 B601 B3CA"            /* ¶.·¨å„ÿ.ñ¸µ‰¶.³Ê */
+	$"82FF 02EA AAB7 A4B6 01AD 9382 7C01 0000"            /* ‚ÿ.ꪷ¤¶.­“‚|... */
+	$"817C 0278 9FB4 97B5 0DB4 B5B6 B4B6 B5B4"            /* �|.xŸ´—µ.´µ¶´¶µ´ */
+	$"B6B5 B4B6 B6AD C085 FF11 CCB0 B6B5 B4B6"            /* ¶µ´¶¶­À…ÿ.Ì°¶µ´¶ */
+	$"B5B4 B6B5 B4B6 B4B5 B6B3 B4EB 82FF 0EC0"            /* µ´¶µ´¶´µ¶³´ë‚ÿ.À */
+	$"AFB6 B5B4 B6B4 B4B6 B4B5 B6B4 B5B6 97B5"            /* ¯¶µ´¶´´¶´µ¶´µ¶—µ */
+	$"01AB 9082 7C01 0000 817C 0278 9CB3 95B5"            /* .«�‚|...�|.xœ³•µ */
+	$"0FB6 AFA7 A9AA A7AA AAA7 ABA9 A7AC B1A9"            /* .¶¯§©ª§ªª§«©§¬±© */
+	$"F084 FF12 E9AA A6AA AAA7 ABA9 A7AB A8A8"            /* ð„ÿ.骦ªª§«©§«¨¨ */
+	$"ACA8 A8AB A7A5 C882 FF0F E8A8 B2A8 A8AB"            /* ¬¨¨«§¥È‚ÿ.訲¨¨« */
+	$"A8A8 ACA8 A9AC A7A9 AAAB 95B5 03B4 A98E"            /* ¨¨¬¨©¬§©ª«•µ.´©Ž */
+	$"7B81 7C01 0000 817C 0278 99B2 95B4 0EB3"            /* {�|...�|.x™²•´.³ */
+	$"B7F9 D2C7 FFC1 CEFF BCE1 FABB AACD 84FF"            /* ·ùÒÇÿÁÎÿ¼áú»ªÍ„ÿ */
+	$"14FD BAC6 FFC5 D3FF B7DF F9B7 EBF2 B0F6"            /* .ýºÆÿÅÓÿ·ßù·ëò°ö */
+	$"E6B9 FDDA A7EB 82FF 0FBD AAE6 F8B0 EBF1"            /* æ¹ýÚ§ë‚ÿ.½ªæø°ëñ */
+	$"B5F7 E3B4 FED9 C5D5 AF94 B403 B3A7 8B7B"            /* µ÷ã´þÙÅÕ¯”´.³§‹{ */
+	$"817C 0100 0081 7C02 7794 B195 B30E B1B9"            /* �|...�|.w”±•³.±¹ */
+	$"FFD2 C7FF D3DE FFBA E3FF BDAA F984 FF14"            /* ÿÒÇÿÓÞÿºãÿ½ªù„ÿ. */
+	$"DBA2 DAFF C4D4 FFCA EBFE B4EF FBC4 FEE9"            /* Û¢ÚÿÄÔÿÊëþ´ïûÄþé */
+	$"B6FF EAAB C082 FF0F E4A3 ECFF C5F6 F5B2"            /* ¶ÿê«À‚ÿ.ä£ìÿÅöõ² */
+	$"FBEF C8FF DAC4 DAAE 94B3 03B2 A589 7B81"            /* ûïÈÿÚÄÚ®”³.²¥‰{� */
+	$"7C01 0000 807C 037D 7690 AE95 B104 AFB7"            /* |...€|.}v�®•±.¯· */
+	$"FFE0 D681 FF04 CDEC FCAE D884 FF06 F7AC"            /* ÿàÖ�ÿ.Íìü®Ø„ÿ.÷¬ */
+	$"E0FF FFD4 E180 FF02 FDC9 F380 FF06 EFCA"            /* àÿÿÔá€ÿ.ýÉó€ÿ.ïÊ */
+	$"FFFF FAAE E582 FF01 B6DA 80FF 02F7 C7FB"            /* ÿÿú®å‚ÿ.¶Ú€ÿ.÷Çû */
+	$"80FF 03E5 D6D9 AC94 B103 B0A2 877B 817C"            /* €ÿ.åÖÙ¬”±.°¢‡{�| */
+	$"0100 0081 7C02 768D AC95 B002 AEB7 FB85"            /* ...�|.v�¬•°.®·û… */
+	$"FF01 CDB1 85FF 01C9 B890 FF01 D5B8 82FF"            /* ÿ.ͱ…ÿ.ɸ�ÿ.Õ¸‚ÿ */
+	$"02E0 B3FC 87FF 01D5 AA94 B003 AE9F 857B"            /* .à³ü‡ÿ.Õª”°.®Ÿ…{ */
+	$"817C 0100 0081 7C02 788A AB95 AF02 ADB6"            /* �|...�|.xŠ«•¯.­¶ */
+	$"FB84 FF02 F0A5 E584 FF02 EEA6 EC90 FF02"            /* û„ÿ.ð¥å„ÿ.î¦ì�ÿ. */
+	$"FCAE E281 FF02 FCB4 DB87 FF01 D5A9 94AF"            /* ü®â�ÿ.ü´Û‡ÿ.Õ©”¯ */
+	$"03AC 9D83 7B81 7C01 0000 817C 0278 86A9"            /* .¬�ƒ{�|...�|.x†© */
+	$"95AD 02AB B4FB 84FF 01BE BD85 FF01 BAC3"            /* •­.«´û„ÿ.¾½…ÿ.ºÃ */
+	$"92FF 01D6 B480 FF04 FCD8 A4B3 FB86 FF01"            /* ’ÿ.Ö´€ÿ.üؤ³û†ÿ. */
+	$"D4A7 94AD 03AB 9A81 7B81 7C01 0000 817C"            /* Ô§”­.«š�{�|...�| */
+	$"0278 83A7 95AC 02AA B3FB 83FF 02E5 A3F2"            /* .xƒ§•¬.ª³ûƒÿ.å£ò */
+	$"84FF 02E1 A5F6 92FF 09FD AEDC FBDE B595"            /* „ÿ.á¥ö’ÿÆý®ÜûÞµ• */
+	$"B6A9 D886 FF01 D3A6 94AC 03A9 9880 7B81"            /* ¶©Ø†ÿ.Ó¦”¬.©˜€{� */
+	$"7C01 0000 817C 0278 80A5 95AC 02AA B3FB"            /* |...�|.x€¥•¬.ª³û */
+	$"82FF 02FE B0CB 84FF 02FC ADD0 94FF 09DB"            /* ‚ÿ.þ°Ë„ÿ.ü­Ð”ÿÆÛ */
+	$"A1A8 95A2 D6FF D1AA FA85 FF01 D3A6 94AC"            /* ¡¨•¢ÖÿѪú…ÿ.Ó¦”¬ */
+	$"03A8 967F 7B81 7C01 0000 817C 0279 7FA3"            /* .¨–.{�|...�|.y.£ */
+	$"95AB 02A9 B2FB 82FF 02D7 A7FB 84FF 02D2"            /* •«.©²û‚ÿ.קû„ÿ.Ò */
+	$"AAFD 95FF 08AD B4DD FCFF FFFA A5D3 85FF"            /* ªý•ÿ.­´Ýüÿÿú¥Ó…ÿ */
+	$"01D3 A594 AB03 A694 7E7B 817C 0100 0081"            /* .Ó¥”«.¦”~{�|...� */
+	$"7C02 7A7D A095 A902 A7B1 FB81 FF02 F8A5"            /* |.z} •©.§±û�ÿ.ø¥ */
+	$"DA84 FF02 F4A4 E096 FF01 DCC2 82FF 02D3"            /* Ú„ÿ.ô¤à–ÿ.Ü‚ÿ.Ó */
+	$"A5F8 84FF 01D2 A394 A902 A491 7D82 7C01"            /* ¥ø„ÿ.Ò£”©.¤‘}‚|. */
+	$"0000 817C 027A 7A9E 95A8 08A6 B1EF F3F2"            /* ..�|.zzž•¨.¦±ïóò */
+	$"F2F6 C6B0 85FF 02C5 B4F5 95F2 03F3 F2B5"            /* òöÆ°…ÿ.Å´õ•ò.óòµ */
+	$"E881 FF03 FCA7 CCF6 82F2 02F7 CDA3 94A8"            /* è�ÿ.ü§Ìö‚ò.÷Í£”¨ */
+	$"01A3 8F83 7C01 0000 817C 027B 779C 96A7"            /* .£�ƒ|...�|.{wœ–§ */
+	$"00A8 82AB 019C E984 FF03 E9A6 AAAC 96AB"            /* .¨‚«.œé„ÿ.馪¬–« */
+	$"02AC A6C1 82FF 02D8 A0AC 83AB 00A9 95A7"            /* .¬¦Á‚ÿ.Ø ¬ƒ«.©•§ */
+	$"01A1 8D83 7C01 0000 817C 037B 7699 A595"            /* .¡�ƒ|...�|.{v™¥• */
+	$"A600 A580 A402 A599 C085 FF02 BCA1 A599"            /* ¦.¥€¤.¥™À…ÿ.¼¡¥™ */
+	$"A401 A5E9 81FF 02CB 96A3 83A4 00A5 95A6"            /* ¤.¥é�ÿ.Ë–£ƒ¤.¥•¦ */
+	$"029F 8A7B 827C 0100 0082 7C02 7596 A399"            /* .ŸŠ{‚|...‚|.u–£™ */
+	$"A402 A29F F584 FF01 DDA0 9BA4 09A0 BFFF"            /* ¤.¢Ÿõ„ÿ.Ý ›¤Æ ¿ÿ */
+	$"FFE6 ADAB D299 A59B A402 9D88 7B82 7C01"            /* ÿæ­«Ò™¥›¤.�ˆ{‚|. */
+	$"0000 827C 0276 94A2 98A3 02A4 98D1 84FF"            /* ..‚|.v”¢˜£.¤˜Ñ„ÿ */
+	$"02F9 AFA0 9CA3 09A4 B9A9 A0CB FCFF B599"            /* .ù¯ œ£Æ¤¹© Ëüÿµ™ */
+	$"A49A A302 9C87 7B82 7C01 0000 827C 0275"            /* ¤š£.œ‡{‚|...‚|.u */
+	$"92A2 98A3 02A1 A4F5 84FF 01CF 9E9D A303"            /* ’¢˜£.¡¤õ„ÿ.Ïž�£. */
+	$"A0A9 DEFB 80FF 02F3 9CA0 9AA3 029B 867B"            /*  ©Þû€ÿ.󜠚£.›†{ */
+	$"827C 0100 0081 7C03 7D74 8FA1 97A2 05A3"            /* ‚|...�|.}t�¡—¢.£ */
+	$"9FA0 9ED6 FE81 FF02 F0A6 A09D A202 A0A9"            /* Ÿ žÖþ�ÿ.ð¦ �¢. © */
+	$"F382 FF01 D893 9AA2 0299 837B 827C 0100"            /* ó‚ÿ.Ø“š¢.™ƒ{‚|.. */
+	$"0081 7C03 7D73 8D9F 97A0 069F 9FF1 D697"            /* .�|.}s�Ÿ— .ŸŸñÖ— */
+	$"A6E6 80FF 01C1 9B9F A001 9BD2 83FF 02BB"            /* ¦æ€ÿ.Á›Ÿ .›Òƒÿ.» */
+	$"94A1 98A0 0297 827B 827C 0100 0081 7C03"            /* ”¡˜ .—‚{‚|...�|. */
+	$"7D72 8A9E 979F 0B9D A6FB FFF9 BF91 B6F6"            /* }rŠž—Ÿ.�¦ûÿù¿‘¶ö */
+	$"E69E 9E9F 9F01 9BB4 83FF 03FA A199 A096"            /* æžžŸŸ.›´ƒÿ.ú¡™ – */
+	$"9F03 9E95 807B 827C 0100 0081 7C03 7D72"            /* Ÿ.ž•€{‚|...�|.}r */
+	$"889D 979E 0199 B281 FF04 EFAD 9EA9 9CA0"            /* ˆ�—ž.™²�ÿ.ï­ž©œ  */
+	$"9E02 9D9F EE83 FF01 E492 979E 039D 9480"            /* ž.�Ÿîƒÿ.ä’—ž.�”€ */
+	$"7B82 7C01 0000 817C 037D 7487 9B97 9D01"            /* {‚|...�|.}t‡›—�. */
+	$"96BF 82FF 02FE B697 A29D 0198 D184 FF02"            /* –¿‚ÿ.þ¶—¢�.˜Ñ„ÿ. */
+	$"C191 9E95 9D03 9C92 7F7B 827C 0100 0081"            /* Á‘ž•�.œ’.{‚|...� */
+	$"7C03 7D75 849A 979C 0194 CE81 FF02 F8BD"            /* |.}u„š—œ.”Î�ÿ.ø½ */
+	$"9BA3 9C01 98B4 84FF 02F8 9D99 959C 039B"            /* ›£œ.˜´„ÿ.ø�™•œ.› */
+	$"907E 7B82 7C01 0000 817C 037D 7482 9997"            /* �~{‚|...�|.}t‚™— */
+	$"9B01 94DF 80FF 03EE AD95 9AA3 9B02 9A9D"            /* ›.”߀ÿ.î­•š£›.š� */
+	$"EF84 FF02 CC91 9C94 9B03 9A8F 7C7B 827C"            /* ï„ÿ.Ì‘œ”›.š�|{‚| */
+	$"0100 0081 7C03 7D74 8098 979A 0697 ECFF"            /* ...�|.}t€˜—š.—ìÿ */
+	$"FFE0 A195 A69A 0195 D084 FF02 F098 9994"            /* ÿà¡•¦š.•Ð„ÿ.𘙔 */
+	$"9A02 998D 7B83 7C01 0000 817C 037D 737E"            /* š.™�{ƒ|...�|.}s~ */
+	$"9896 9A06 989F F9FF D099 97A7 9A02 96AD"            /* ˜–š.˜ŸùÿЙ—§š.–­ */
+	$"FD83 FF02 FCA6 9794 9A02 998D 7B83 7C01"            /* ýƒÿ.ü¦—”š.™�{ƒ|. */
+	$"0000 817C 037D 737D 9796 9905 95AD FCBE"            /* ..�|.}s}—–™.•­ü¾ */
+	$"9498 A999 0196 DD83 FF02 F7A3 9794 9902"            /* ”˜©™.–݃ÿ.÷£—”™. */
+	$"988C 7A83 7C01 0000 817C 037D 737B 9696"            /* ˜Œzƒ|...�|.}s{–– */
+	$"9803 95B0 B392 AB98 0294 AAF9 82FF 01CF"            /* ˜.•°³’«˜.”ªù‚ÿ.Ï */
+	$"9595 9802 978A 7A83 7C01 0000 817C 037D"            /* ••˜.—Šzƒ|...�|.} */
+	$"747B 9498 9700 94AD 9708 93B9 F9FF FFF6"            /* t{”˜—.”­—.“¹ùÿÿö */
+	$"C797 9695 9702 9688 7983 7C01 0000 817C"            /* Ç—–•—.–ˆyƒ|...�| */
+	$"037D 7479 93CA 9606 92A4 BEB8 9F91 9596"            /* .}ty“Ê–.’¤¾¸Ÿ‘•– */
+	$"9602 9588 7983 7C01 0000 817C 037D 7478"            /* –.•ˆyƒ|...�|.}tx */
+	$"93CB 9603 9390 9193 9896 0294 8779 837C"            /* “Ë–.“�‘“˜–.”‡yƒ| */
+	$"0100 0081 7C03 7D75 7892 EA95 0293 8679"            /* ...�|.}ux’ê•.“†y */
+	$"837C 0100 0081 7C03 7D75 7892 EA95 0293"            /* ƒ|...�|.}ux’ê•.“ */
+	$"8679 837C 0100 0081 7C03 7D76 7792 EA95"            /* †yƒ|...�|.}vw’ê• */
+	$"0293 8679 837C 0100 0081 7C03 7D76 7792"            /* .“†yƒ|...�|.}vw’ */
+	$"EA95 0293 8579 837C 0000 827C 037D 7776"            /* ê•.“…yƒ|..‚|.}wv */
+	$"8FEA 9402 9182 7883 7C00 0083 7C03 7A70"            /* �ê”.‘‚xƒ|..ƒ|.zp */
+	$"8288 E989 0285 7A79 837C 0100 0082 7C02"            /* ‚ˆé‰.…zyƒ|...‚|. */
+	$"7D78 76EA 7901 7779 847C 0100 00FB 7C01"            /* }xvêy.wy„|...û|. */
+	$"0000 FB7C 0100 00FB 7C01 0000 FB7C 0100"            /* ..û|...û|...û|.. */
+	$"00FA 7C81 00F9 7C82 00F7 7C83 00F6 7C86"            /* .ú|�.ù|‚.÷|ƒ.ö|† */
+	$"00F3 7CFF 00FF 0000 00FF 00FF 00FF 00FF"            /* .ó|ÿ.ÿ...ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 74D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.Ÿt× */
+	$"00A6 74D3 0001 7474 8000 9D73 8474 D000"            /* .¦tÓ..tt€.�s„tÐ. */
+	$"0374 7400 749E 7702 7673 7283 74D0 0003"            /* .tt.tžw.vsrƒtÐ.. */
+	$"7381 9FAB 9DAC 03A8 977A 7383 74CD 0004"            /* s�Ÿ«�¬.¨—zsƒtÍ.. */
+	$"7400 79AF CC9E CF03 CCBF 9B73 8374 CD00"            /* t.y¯ÌžÏ.Ì¿›sƒtÍ. */
+	$"0474 0088 C6D2 9FD3 03CA AF7C 7282 74CD"            /* .t.ˆÆÒŸÓ.ʯ|r‚tÍ */
+	$"0003 7400 8EC9 A0D3 03CC B27D 7282 74CC"            /* ..t.ŽÉ Ó.̲}r‚tÌ */
+	$"0004 7474 7094 CBA0 D203 CCB3 7C72 8374"            /* ..ttp”Ë Ò.̳|rƒt */
+	$"CB00 0474 7471 A1CE A0D1 03CC B67F 72B8"            /* Ë..ttq¡Î Ñ.̶.r¸ */
+	$"7495 0005 7474 0078 B7D0 A0D1 03CE BE8B"            /* t•..tt.x·Ð Ñ.ξ‹ */
+	$"70BA 7492 0006 7474 0070 96C9 CFA0 D004"            /* pºt’..tt.p–ÉÏ Ð. */
+	$"CFC6 A675 71BA 7490 0006 7474 0072 8FC0"            /* ÏƦuqºt�..tt.r�À */
+	$"CDA2 CF03 CBBF 9D7A B672 0473 0073 7474"            /* Í¢Ï.Ë¿�z¶r.s.stt */
+	$"8E00 0674 7400 799D C3CD A3CF 04CE CAC3"            /* Ž..tt.y�ÃÍ£Ï.ÎÊà */
+	$"B2A0 B598 0496 8D79 0074 8D00 0774 7400"            /* ² µ˜.–�y.t�..tt. */
+	$"79A8 C8CE CEA4 CF03 CECD CBC9 B5C7 03C3"            /* y¨ÈÎΤÏ.ÎÍËɵÇ.à */
+	$"B58F 0080 7489 0081 7403 7192 C1C8 E2C9"            /* µ�.€t‰.�t.q’ÁÈâÉ */
+	$"03C7 B995 7282 7486 0001 7474 8000 026E"            /* .ǹ•r‚t†..tt€..n */
+	$"91AC E3AF 04AE A58A 6F71 8000 0174 7484"            /* ‘¬ã¯.®¥Šoq€..tt„ */
+	$"0008 7400 7075 8085 8487 8E80 8FAA 9000"            /* ..t.pu€…„‡Ž€�ª�. */
+	$"8FB0 9080 8F09 8B87 8584 847F 7600 7474"            /* �°�€�Æ‹‡…„„.v.tt */
+	$"8200 0774 0070 8BAF BCBF C0E7 C109 C0BF"            /* ‚..t.p‹¯¼¿ÀçÁÆÀ¿ */
+	$"BEBE B8A6 8572 7474 8200 0370 8DC0 C9EE"            /* ¾¾¸¦…rtt‚..p�ÀÉî */
+	$"CA05 C9C4 B185 0074 8000 0474 0078 B4C8"            /* Ê.Éı….t€..t.x´È */
+	$"F0CA 0CC9 BFA1 7600 7400 0074 0088 BFC8"            /* ðÊ.É¿¡v.t..t.ˆ¿È */
+	$"B3C9 03CA C7C9 CAB7 C90A C3AD 7F00 7400"            /* ³É.ÊÇÉÊ·ÉÂí..t. */
+	$"0074 708C C0B3 C805 C9C3 B8B3 C4C9 B6C8"            /* .tpŒÀ³È.Éø³ÄÉ¶È */
+	$"0AC3 AE7F 0074 0074 7400 88BD B4C7 05C2"            /* Âî..t.tt.ˆ½´Ç. */
+	$"F1EC B2C4 C8B5 C70B C1AB 7C00 7400 7474"            /* ñì²ÄȵÇ.Á«|.t.tt */
+	$"0082 BAC6 B3C7 04C6 F2FF E6B3 B6C7 0BC0"            /* .‚ºÆ³Ç.Æòÿ泶Ç.À */
+	$"A67A 7374 0074 7400 7DB5 C5B3 C606 C3E7"            /* ¦zst.tt.}µÅ³Æ.Ãç */
+	$"FFFF D5B6 C8B4 C60B BDA1 7573 7400 7474"            /* ÿÿնȴÆ.½¡ust.tt */
+	$"0079 B0C4 B3C5 01C2 D880 FF02 C0BD C6B2"            /* .y°Ä³Å.ÂØ€ÿ.À½Æ² */
+	$"C50C C4BB 9D75 7374 0074 7473 75AA C2B3"            /* Å.Ä»�ust.ttsuªÂ³ */
+	$"C406 C3C9 FAFF FFF0 B3B3 C403 C3B8 9673"            /* Ä.ÃÉúÿÿð³³Ä.ø–s */
+	$"8474 01A5 C1B4 C301 C1EB 80FF 02D6 B4C5"            /* „t.¥Á´Ã.Áë€ÿ.Ö´Å */
+	$"B1C3 03C2 B591 7283 7402 719E BFB4 C201"            /* ±Ã.µ‘rƒt.qž¿´Â. */
+	$"BFD5 80FF 03FD BBBD C3B0 C203 C0B2 8E72"            /* ¿Õ€ÿ.ý»½Ã°Â.À²Žr */
+	$"8374 0270 99BD B4C1 02C0 C4F6 80FF 02E6"            /* ƒt.p™½´Á.ÀÄö€ÿ.æ */
+	$"B1C2 B0C1 03BE AF87 7283 7402 7193 BBB5"            /* ±Â°Á.¾¯‡rƒt.q“»µ */
+	$"C001 BCE1 81FF 02C6 B7C1 AFC0 06BD AC84"            /* À.¼á�ÿ.Æ·Á¯À.½¬„ */
+	$"7274 7400 8074 0270 8CB9 B1BF 00C0 80C1"            /* rtt.€t.pŒ¹±¿.À€Á */
+	$"02BD CAFD 80FF 01F1 B1B0 BF06 BBA9 8172"            /* .½Êý€ÿ.ñ±°¿.»©�r */
+	$"7474 0080 7402 7088 B7B0 BF07 C1B9 ACAB"            /* tt.€t.pˆ·°¿.Á¹¬« */
+	$"AEBC BEEB 81FF 02D1 B3C0 AEBF 06BA A67C"            /* ®¼¾ë�ÿ.ѳÀ®¿.º¦| */
+	$"7274 7400 8074 0271 83B4 AFBE 08BF AFB4"            /* rtt.€t.qƒ´¯¾.¿¯´ */
+	$"D9E3 D2AD B1D3 81FF 02F8 B4BC AEBE 06B8"            /* ÙãÒ­±Ó�ÿ.ø´¼®¾.¸ */
+	$"A27A 7374 7400 8074 0372 7DB1 BCAE BD01"            /* ¢zstt.€t.r}±¼®½. */
+	$"B9CA 81FF 03F6 B4B9 F381 FF02 D8AF BEAD"            /* ¹Ê�ÿ.ö´¹ó�ÿ.د¾­ */
+	$"BD0D B69F 7973 7474 0000 7474 727A ADBB"            /* ½.¶Ÿystt..ttrz­» */
+	$"ADBC 03BB ABB7 E681 FF02 E6AE D881 FF02"            /* ­¼.»«·æ�ÿ.æ®Ø�ÿ. */
+	$"FDB7 B8AD BC0D B49A 7673 7474 0000 7474"            /* ý·¸­¼.´švstt..tt */
+	$"7378 A9BA ACBB 0CBC ACDB D7A6 BDF0 FFFF"            /* sx©º¬».¼¬Ûצ½ðÿÿ */
+	$"FABA BEF7 81FF 02DF ACBC ACBB 01B2 9781"            /* úº¾÷�ÿ.߬¼¬».²—� */
+	$"7407 0000 7474 7374 A4B8 ABB9 0DBA B3BB"            /* t...ttst¤¸«¹.º³» */
+	$"FFFF F7C2 A4CB FAFC C0B4 DC82 FF02 BAB4"            /* ÿÿ÷¤ËúüÀ´Ü‚ÿ.º´ */
+	$"BAAB B901 B093 8174 0100 0080 7402 729F"            /* º«¹.°“�t...€t.rŸ */
+	$"B6AB B902 BAAA E981 FF07 ECB3 ABD1 BBB6"            /* ¶«¹.ºªé�ÿ.쳫ѻ¶ */
+	$"C0FA 81FF 02E4 AABA AAB9 03B8 AD8E 7380"            /* Àú�ÿ.䪺ª¹.¸­Žs€ */
+	$"7401 0000 8074 0272 9BB6 AAB8 02B9 ADC6"            /* t...€t.r›¶ª¸.¹­Æ */
+	$"84FF 05DC AFB7 B8B4 E082 FF02 BCB1 B9A9"            /* „ÿ.ܯ·¸´à‚ÿ.¼±¹© */
+	$"B803 B6AB 8A72 8074 0100 0080 7402 7095"            /* ¸.¶«Šr€t...€t.p• */
+	$"B4AA B602 B5AB F484 FF06 E9B6 B5B6 B4C2"            /* ´ª¶.µ«ô„ÿ.鶵¶´Â */
+	$"FC81 FF02 E6A9 B7A9 B603 B5A8 8872 8074"            /* ü�ÿ.æ©·©¶.µ¨ˆr€t */
+	$"0100 0080 7402 6F91 B3A9 B602 B7AD D684"            /* ...€t.o‘³©¶.·­Ö„ */
+	$"FF02 FAC0 B480 B601 B3E4 82FF 02BD AFB7"            /* ÿ.úÀ´€¶.³ä‚ÿ.½¯· */
+	$"A8B6 03B4 A584 7280 7401 0000 8074 0270"            /* ¨¶.´¥„r€t...€t.p */
+	$"8DB2 A9B6 02B4 ACE7 84FF 01D9 B181 B602"            /* �²©¶.´¬ç„ÿ.Ù±�¶. */
+	$"B3C5 FE81 FF02 E8A8 B7A8 B603 B3A3 8172"            /* ³Åþ�ÿ.訷¨¶.³£�r */
+	$"8074 0100 0080 7402 7087 B0A8 B505 B6AA"            /* €t...€t.p‡°¨µ.¶ª */
+	$"BDA4 C1F5 81FF 02F3 B8B4 82B5 01B2 E782"            /* ½¤Áõ�ÿ.ó¸´‚µ.²ç‚ */
+	$"FF02 BFAD B6A7 B503 B2A1 7F72 8074 0100"            /* ÿ.¿­¶§µ.²¡.r€t.. */
+	$"0080 7402 7083 ADA7 B40C B5AC BBFF F2B8"            /* .€t.pƒ­§´.µ¬»ÿò¸ */
+	$"A2D0 FBFF FFCE B083 B401 B1C5 82FF 02EA"            /* ¢Ðûÿÿΰƒ´.±Å‚ÿ.ê */
+	$"A7B5 A7B4 03B0 9E7C 7380 7401 0000 8074"            /* §µ§´.°ž|s€t...€t */
+	$"0271 80AB A8B3 01A5 EC80 FF06 E4AA A9E2"            /* .q€«¨³.¥ì€ÿ.䪩â */
+	$"EAB2 B284 B301 B1E8 82FF 02BF ABB4 A6B3"            /* ê²²„³.±è‚ÿ.¿«´¦³ */
+	$"03AE 9B79 7380 7401 0000 8074 0272 7DA8"            /* .®›ys€t...€t.r}¨ */
+	$"A6B2 02B3 A6C8 82FF 04FE D3A8 B2B1 85B2"            /* ¦².³¦È‚ÿ.þÓ¨²±…² */
+	$"01AE C582 FF02 EAA6 B3A6 B203 AC98 7873"            /* .®Å‚ÿ.꦳¦².¬˜xs */
+	$"8074 0100 0080 7403 7278 A5B0 A5B1 02AF"            /* €t...€t.rx¥°¥±.¯ */
+	$"A9F7 84FF 01DA AB86 B102 B0AF E982 FF02"            /* ©÷„ÿ.Ú«†±.°¯é‚ÿ. */
+	$"BEA9 B2A5 B103 AB95 7773 8074 0100 0080"            /* ¾©²¥±.«•ws€t...€ */
+	$"7403 7276 A2AF A4B0 02B1 A2D5 84FF 02F8"            /* t.rv¢¯¤°.±¢Õ„ÿ.ø */
+	$"BAAE 87B0 01AC C682 FF02 EAA4 B1A5 B003"            /* º®‡°.¬Æ‚ÿ.ꤱ¥°. */
+	$"A991 7573 8074 0100 0080 7402 7375 9FA4"            /* ©‘us€t...€t.suŸ¤ */
+	$"AE03 AFA9 B0FE 84FF 01D3 AA88 AE02 ADAD"            /* ®.¯©°þ„ÿ.Óªˆ®.­­ */
+	$"E982 FF02 BCA7 AFA4 AE01 A78E 8274 0100"            /* é‚ÿ.¼§¯¤®.§Ž‚t.. */
+	$"0081 7402 729B ADA3 AE02 AFA0 E384 FF02"            /* .�t.r›­£®.¯ ã„ÿ. */
+	$"F0B0 AD89 AE01 AAC4 82FF 02E9 A2AF A4AE"            /* ð°­‰®.ªÄ‚ÿ.颯¤® */
+	$"01A5 8C82 7401 0000 8174 0270 98AC 97AD"            /* .¥Œ‚t...�t.p˜¬—­ */
+	$"0DAC ADAE ACAE ADAC AEAD ACAE AEA4 BB85"            /* .¬­®¬®­¬®­¬®®¤»… */
+	$"FF11 C7A7 AEAD ACAE ADAC AEAC ACAE ACAD"            /* ÿ.ǧ®­¬®­¬®¬¬®¬­ */
+	$"AEAB ABE9 82FF 0EBB A6AE ADAC AEAC ACAE"            /* ®««é‚ÿ.»¦®­¬®¬¬® */
+	$"ACAD AEAC ADAE 97AD 01A3 8982 7401 0000"            /* ¬­®¬­®—­.£‰‚t... */
+	$"8174 0270 94AA 95AC 0FAD A79F A1A2 9FA2"            /* �t.p”ª•¬.­§Ÿ¡¢Ÿ¢ */
+	$"A29F A2A1 9FA4 A9A1 EF84 FF12 E6A2 9FA2"            /* ¢Ÿ¢¡Ÿ¤©¡ï„ÿ.梟¢ */
+	$"A1A0 A3A1 A0A2 A0A0 A3A0 A0A2 9F9D C282"            /* ¡ £¡ ¢  £  ¢Ÿ�‚ */
+	$"FF10 E6A0 A9A0 A0A2 A0A0 A2A0 A1A3 A0A1"            /* ÿ.æ ©  ¢  ¢ ¡£ ¡ */
+	$"A2A2 AB94 AC03 ABA1 8673 8174 0100 0081"            /* ¢¢«”¬.«¡†s�t...� */
+	$"7402 7091 A995 AB0E A9AF FACE C2FF BCCA"            /* t.p‘©•«.©¯úÎÂÿ¼Ê */
+	$"FFB6 DEFA B4A1 C884 FF14 FDB2 C0FF BFCF"            /* ÿ¶Þú´¡È„ÿ.ý²Àÿ¿Ï */
+	$"FFAF DCFA AFEA F1A8 F5E4 B2FE D79D E982"            /* ÿ¯Üú¯êñ¨õä²þ×�é‚ */
+	$"FF0F B8A1 E4F8 A9EA F0AE F7E0 ACFF D5C0"            /* ÿ.¸¡äø©êð®÷à¬ÿÕÀ */
+	$"D1A5 94AB 03AA 9F84 7381 7401 0000 8174"            /* Ñ¥”«.ªŸ„s�t...�t */
+	$"026F 8CA8 95A9 0EA7 B1FF CEC2 FFD0 DBFF"            /* .oŒ¨•©.§±ÿÎÂÿÐÛÿ */
+	$"B3E0 FFB6 A2F9 84FF 14D7 99D8 FFBE D0FF"            /* ³àÿ¶¢ù„ÿ.×™Øÿ¾Ðÿ */
+	$"C5E9 FFAC EEFA C0FE E7B0 FFE8 A3B9 82FF"            /* Åéÿ¬îúÀþç°ÿ裹‚ÿ */
+	$"0FE2 99EA FFC1 F5F4 ABFB EDC4 FFD7 BED6"            /* .â™êÿÁõô«ûíÄÿ×¾Ö */
+	$"A394 A903 A89C 8173 8174 0100 0080 7403"            /* £”©.¨œ�s�t...€t. */
+	$"756E 88A6 95A8 04A6 B0FF DDD3 81FF 04C9"            /* unˆ¦•¨.¦°ÿÝÓ�ÿ.É */
+	$"EBFB A6D5 84FF 06F6 A3DE FFFF D1DE 80FF"            /* ëû¦Õ„ÿ.ö£ÞÿÿÑÞ€ÿ */
+	$"02FD C4F2 80FF 06EE C6FF FFFA A7E2 82FF"            /* .ýÄò€ÿ.îÆÿÿú§â‚ÿ */
+	$"01B0 D780 FF02 F6C3 FB80 FF03 E3D3 D5A2"            /* .°×€ÿ.öÃû€ÿ.ãÓÕ¢ */
+	$"94A8 03A7 9A7F 7381 7401 0000 8074 0375"            /* ”¨.§š.s�t...€t.u */
+	$"6E85 A495 A702 A5AF FA85 FF01 C7AB 85FF"            /* n…¤•§.¥¯ú…ÿ.Ç«…ÿ */
+	$"01C4 B290 FF01 D1B1 82FF 02DD ACFB 87FF"            /* .IJ�ÿ.ѱ‚ÿ.ݬû‡ÿ */
+	$"01D1 A194 A703 A598 7D73 8174 0100 0081"            /* .Ñ¡”§.¥˜}s�t...� */
+	$"7402 7082 A295 A602 A4AE FB84 FF02 EF9C"            /* t.p‚¢•¦.¤®û„ÿ.ïœ */
+	$"E484 FF02 EC9E EB90 FF02 FCA7 DF81 FF02"            /* ä„ÿ.ìžë�ÿ.ü§ß�ÿ. */
+	$"FCAD D787 FF01 D0A0 94A6 03A3 957B 7381"            /* ü­×‡ÿ.Р”¦.£•{s� */
+	$"7401 0000 8174 0270 7EA1 95A6 02A4 AEFB"            /* t...�t.p~¡•¦.¤®û */
+	$"84FF 01B8 B885 FF01 B4BF 92FF 01D4 AD80"            /* „ÿ.¸¸…ÿ.´¿’ÿ.Ô­€ */
+	$"FF04 FCD4 9CAC FA86 FF01 D0A0 94A6 03A3"            /* ÿ.üÔœ¬ú†ÿ.Р”¦.£ */
+	$"937A 7381 7401 0000 8174 0270 7B9F 95A4"            /* “zs�t...�t.p{Ÿ•¤ */
+	$"02A2 ACFA 83FF 02E3 9BF1 84FF 02DE 9EF5"            /* .¢¬úƒÿ.ã›ñ„ÿ.Þžõ */
+	$"92FF 09FD A8D9 FADB AD8B B1A1 D486 FF01"            /* ’ÿÆý¨ÙúÛ­‹±¡Ô†ÿ. */
+	$"CF9E 94A4 03A1 9178 7381 7401 0000 8174"            /* Ïž”¤.¡‘xs�t...�t */
+	$"0270 779D 95A3 02A1 ACFA 82FF 02FD A9C7"            /* .pw�•£.¡¬ú‚ÿ.ý©Ç */
+	$"84FF 02FC A5CD 94FF 09D9 989F 8B9B D3FF"            /* „ÿ.ü¥Í”ÿÆÙ˜Ÿ‹›Óÿ */
+	$"CDA1 F985 FF01 CF9D 94A3 03A0 8E77 7381"            /* Í¡ù…ÿ.Ï�”£. Žws� */
+	$"7401 0000 8174 0271 779A 95A2 02A0 ABFA"            /* t...�t.qwš•¢. «ú */
+	$"82FF 02D4 A0FB 84FF 02CE A2FD 95FF 08A6"            /* ‚ÿ.Ô û„ÿ.΢ý•ÿ.¦ */
+	$"AEDB FCFF FFFA 9ECF 85FF 01CE 9C94 A203"            /* ®ÛüÿÿúžÏ…ÿ.Îœ”¢. */
+	$"9E8C 7673 8174 0100 0081 7402 7275 9895"            /* žŒvs�t...�t.ru˜• */
+	$"A102 9FAA FA81 FF02 F79D D784 FF02 F29C"            /* ¡.Ÿªú�ÿ.÷�ׄÿ.òœ */
+	$"DE96 FF01 DABD 82FF 02D0 9DF8 84FF 01CE"            /* Þ–ÿ.Ú½‚ÿ.Ð�ø„ÿ.Î */
+	$"9A94 A102 9C8A 7582 7401 0000 8174 0272"            /* š”¡.œŠu‚t...�t.r */
+	$"7196 959F 089D A9EE F2F1 F1F6 C0AA 85FF"            /* q–•Ÿ.�©îòññöÀª…ÿ */
+	$"02C0 ADF5 95F1 03F2 F1AE E681 FF03 FCA0"            /* .À­õ•ñ.òñ®æ�ÿ.ü  */
+	$"C7F5 82F1 02F6 C89A 949F 029A 8775 8274"            /* Çõ‚ñ.öÈš”Ÿ.š‡u‚t */
+	$"0100 0081 7402 736F 9396 9E00 9F82 A201"            /* ...�t.so“–ž.Ÿ‚¢. */
+	$"93E8 84FF 03E8 9EA2 A396 A202 A39D BB82"            /* “è„ÿ.螢£–¢.£�»‚ */
+	$"FF02 D597 A383 A200 A195 9E01 9985 8374"            /* ÿ.Õ—£ƒ¢.¡•ž.™…ƒt */
+	$"0100 0081 7403 736E 929D 959E 009D 809C"            /* ...�t.sn’�•ž.�€œ */
+	$"029D 91BC 84FF 03FE B599 9D99 9C01 9DE7"            /* .�‘¼„ÿ.þµ™�™œ.�ç */
+	$"81FF 02C7 8D9B 839C 009D 959E 0198 8383"            /* �ÿ.Ç�›ƒœ.�•ž.˜ƒƒ */
+	$"7401 0000 8274 016E 8F9A 9C02 9A98 F484"            /* t...‚t.n�šœ.š˜ô„ */
+	$"FF01 DA99 9B9C 0997 B9FF FFE4 A7A6 CF91"            /* ÿ.Ú™›œÆ—¹ÿÿ䧦ϑ */
+	$"9D9B 9C02 9681 7382 7401 0000 8274 026F"            /* �›œ.–�s‚t...‚t.o */
+	$"8C9A 989B 029C 90CF 84FF 02F8 A998 9D9B"            /* Œš˜›.œ�Ï„ÿ.ø©˜�› */
+	$"08B3 A39A C8FC FFB0 919C 9A9B 0294 8073"            /* .³£šÈüÿ°‘œš›.”€s */
+	$"8274 0100 0082 7402 6D8A 9998 9A02 989C"            /* ‚t...‚t.mŠ™˜š.˜œ */
+	$"F484 FF01 CB94 9D9A 0397 A2DD FB80 FF02"            /* ô„ÿ.Ë”�š.—¢Ýû€ÿ. */
+	$"F294 979A 9A02 927E 7382 7401 0000 8174"            /* ò”—šš.’~s‚t...�t */
+	$"0375 6B87 9898 9904 969A 96D2 FE81 FF02"            /* .uk‡˜˜™.–š–Òþ�ÿ. */
+	$"EF9E 979D 9902 97A1 F382 FF02 D68A 9A99"            /* ïž—�™.—¡ó‚ÿ.ÖŠš™ */
+	$"9902 917C 7382 7401 0000 8174 0375 6A85"            /* ™.‘|s‚t...�t.uj… */
+	$"9797 9806 9798 F1D3 8F9F E480 FF01 BB92"            /* ——˜.—˜ñÓ�Ÿä€ÿ.»’ */
+	$"9F98 0192 CF83 FF02 B68A 9998 9802 8F7B"            /* Ÿ˜.’σÿ.¶Š™˜˜.�{ */
+	$"7382 7401 0000 8174 0375 6A82 9597 960B"            /* s‚t...�t.uj‚•—–. */
+	$"939F FBFF F9BB 89B0 F5E4 9595 9F96 0192"            /* “Ÿûÿù»‰°õä••Ÿ–.’ */
+	$"AD83 FF03 FA9B 9097 9796 028D 7973 8274"            /* ­ƒÿ.ú›�——–.�ys‚t */
+	$"0100 0081 7403 756A 8195 9796 0191 AC81"            /* ...�t.uj�•—–.‘¬� */
+	$"FF04 EEA8 97A2 94A0 9602 9597 EC83 FF01"            /* ÿ.¢” –.•—ìƒÿ. */
+	$"E28A 9796 0395 8C78 7382 7401 0000 8174"            /* ⊗–.•Œxs‚t...�t */
+	$"0375 6C7F 9497 9501 8EBB 82FF 02FE B28E"            /* .ul.”—•.Ž»‚ÿ.þ²Ž */
+	$"A295 018F CE84 FF02 BD89 9695 9503 948B"            /* ¢•.�΄ÿ.½‰–••.”‹ */
+	$"7873 8274 0100 0081 7403 756D 7D92 9794"            /* xs‚t...�t.um}’—” */
+	$"018C CB81 FF02 F8B8 93A3 9401 90AE 84FF"            /* .ŒË�ÿ.ø¸“£”.�®„ÿ */
+	$"02F7 9691 9594 0393 8A77 7382 7401 0000"            /* .÷–‘•”.“Šws‚t... */
+	$"8174 0375 6C7B 9197 9301 8CDD 80FF 02ED"            /* �t.ul{‘—“.ŒÝ€ÿ.í */
+	$"A78D A493 0292 96EE 84FF 02C8 8894 9493"            /* §�¤“.’–î„ÿ.Ȉ””“ */
+	$"0392 8875 7382 7401 0000 8174 0375 6C79"            /* .’ˆus‚t...�t.uly */
+	$"9096 9207 9190 EBFF FFDE 9A8D A692 018C"            /* �–’.‘�ëÿÿÞš�¦’.Œ */
+	$"CC84 FF02 EF91 9194 9201 9186 8474 0100"            /* Ì„ÿ.ï‘‘”’.‘†„t.. */
+	$"0081 7403 756B 7790 9692 0690 97F8 FFCC"            /* .�t.ukw�–’.�—øÿÌ */
+	$"918E A792 028E A6FD 83FF 02FC 9F8F 9492"            /* ‘Ž§’.Ž¦ýƒÿ.üŸ�”’ */
+	$"0191 8584 7401 0000 8174 0375 6B75 8E96"            /* .‘…„t...�t.ukuŽ– */
+	$"9005 8BA7 FCBA 8B8E A990 018D DB83 FF02"            /* �.‹§üº‹Ž©�.�Ûƒÿ. */
+	$"F79B 8D94 9002 8F83 7383 7401 0000 8174"            /* ÷›�”�.�ƒsƒt...�t */
+	$"0375 6C74 8E96 9004 8CAA AD89 8FAA 9002"            /* .ultŽ–�.Œª­‰�ª�. */
+	$"8CA3 F982 FF01 CB8C 9590 028F 8373 8374"            /* Œ£ù‚ÿ.ËŒ•�.�ƒsƒt */
+	$"0100 0081 7403 756B 728D 988F 008B AD8F"            /* ...�t.ukr�˜�.‹­� */
+	$"088A B4F9 FFFF F6C3 8E8E 958F 028E 8172"            /* .Š´ùÿÿöÃŽŽ•�.Ž�r */
+	$"8374 0100 0081 7403 756C 718C CA8E 068A"            /* ƒt...�t.ulqŒÊŽ.Š */
+	$"9DBA B398 898D 968E 028D 8072 8374 0100"            /* �º³˜‰�–Ž.�€rƒt.. */
+	$"0081 7403 756C 718B CB8E 038B 8888 8B98"            /* .�t.ulq‹ËŽ.‹ˆˆ‹˜ */
+	$"8E02 8C80 7283 7401 0000 8174 0375 6D71"            /* Ž.Œ€rƒt...�t.umq */
+	$"8BEA 8E02 8C80 7283 7401 0000 8174 0375"            /* ‹êŽ.Œ€rƒt...�t.u */
+	$"6D70 8AEA 8D02 8B7F 7283 7401 0000 8174"            /* mpŠê�.‹.rƒt...�t */
+	$"0375 6E70 8AEA 8D02 8B7E 7283 7401 0000"            /* .unpŠê�.‹~rƒt... */
+	$"8174 0375 6E70 8AEA 8D02 8B7E 7283 7400"            /* �t.unpŠê�.‹~rƒt. */
+	$"0082 7403 756F 6E88 EA8C 0289 7B71 8374"            /* .‚t.uonˆêŒ.‰{qƒt */
+	$"0000 8374 0372 697B 81E9 8202 7E73 7283"            /* ..ƒt.ri{�é‚.~srƒ */
+	$"7401 0000 8274 0475 706E 7172 E671 0372"            /* t...‚t.upnqræq.r */
+	$"7270 7284 7401 0000 FB74 0100 00FB 7401"            /* rpr„t...ût...ût. */
+	$"0000 FB74 0100 00FB 7401 0000 FA74 8100"            /* ..ût...ût...út�. */
+	$"F974 8200 F774 8300 F674 8600 F374 FF00"            /* ùt‚.÷tƒ.öt†.ótÿ. */
+	$"FF00 0000 7438 6D6B 0000 4008 0000 0000"            /* ÿ...t8mk..@..... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0101 0101 0202 0202 0202 0202 0202 0202"            /* ................ */
+	$"0202 0202 0202 0202 0202 0202 0202 0101"            /* ................ */
+	$"0101 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0102 0202"            /* ................ */
+	$"0304 0505 0606 0606 0606 0606 0606 0606"            /* ................ */
+	$"0606 0606 0606 0606 0606 0606 0606 0505"            /* ................ */
+	$"0503 0302 0100 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0001 0100 0000"            /* ................ */
+	$"0204 0506 0707 0707 0707 0707 0707 0707"            /* ................ */
+	$"0707 0707 0707 0707 0707 0707 0707 0606"            /* ................ */
+	$"090A 0805 0302 0100 0000 0000 0000 0000"            /* ÆÂ.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0101 001C 2F31"            /* ............../1 */
+	$"3436 383A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A"            /* 468::::::::::::: */
+	$"3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A34"            /* :::::::::::::::4 */
+	$"120B 0F0B 0704 0201 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0004 8FF3 FAF9"            /* ............�óúù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 FAFA"            /* ùùùùùùùùùùùùùùúú */
+	$"C433 1112 0C07 0402 0100 0000 0000 0000"            /* Ä3.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 0067 FFFF FFFF"            /* ...........gÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFC3 201A 130C 0703 0100 0000 0000 0000"            /* ÿÃ ............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 00A9 FFFF FFFF"            /* ...........©ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFF8 4A20 1B11 0A05 0200 0000 0000 0000"            /* ÿøJ ..Â......... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0002 00B6 FFFF FFFF"            /* ...........¶ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFB 5928 2216 0D07 0200 0000 0000 0000"            /* ÿûY("........... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0103 07CC FFFF FFFF"            /* ...........Ìÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFD 6231 291B 1109 0401 0000 0000 0000"            /* ÿýb1)..Æ........ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0201 21F0 FFFF FFFF"            /* ..........!ðÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 7337 2F21 160D 0704 0303 0303 0303"            /* ÿÿs7/!.......... */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0302 0201 0100"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0001 0500 69FF FFFF FFFF"            /* ..........iÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 9A38 3628 1C14 0E0A 0909 0909 0909"            /* ÿÿš86(...ÂÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0807 0604 0302"            /* ÆÆÆÆÆÆÆÆÆÆ...... */
+	$"0100 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0203 0021 DFFF FFFF FFFF"            /* .........!ßÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF E653 312D 231B 1512 1011 1010 1010"            /* ÿÿæS1-#......... */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 0E0C 0A08 0504"            /* ............Â... */
+	$"0301 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0002 0200 34D3 FFFF FFFF FFFF"            /* ........4Óÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFD6 6E40 312A 2522 2121 2121 2121"            /* ÿÿÿÖn@1*%"!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2120 1E1B 1814 0D00"            /* !!!!!!!!! ...... */
+	$"0203 0100 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0102 006C F4FF FFFF FFFF FFFF"            /* .......lôÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FEE8 DAD9 D9D8 D8D8 D8D8 D8D8"            /* ÿÿÿÿþèÚÙÙØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D7D7 D6D5 D5A9"            /* ØØØØØØØØØØ××ÖÕÕ© */
+	$"1E00 0200 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0001 0300 71FF FFFF FFFF FFFF FFFF"            /* ......qÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"8500 0402 0100 0000 0000 0000 0000 0000"            /* …............... */
+	$"0001 0203 0317 E1FF FFFF FFFF FFFF FFFF"            /* ......áÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"9E03 0905 0302 0100 0000 0000 0000 0000"            /* ž.Æ............. */
+	$"0201 0000 002C E4E8 E8E9 EAEB ECEC EDED"            /* .....,äèèéêëììíí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED ECEC ECEC ECEC ECEC ECEC ECEC"            /* ííííìììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEB EAE9 E8F4"            /* ìììììììììììëêéèô */
+	$"8E02 0400 0000 0202 0000 0000 0000 0002"            /* Ž............... */
+	$"0012 6297 A3A9 BBBD C0C4 C7CA CCCD CECE"            /* ..b—£©»½ÀÄÇÊÌÍÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CDCD CCCC CCCC CBCB CBCB CBCB"            /* ÎÎÎÎÍÍÌÌÌÌËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBC9 C8C5 C2C0"            /* ËËËËËËËËËËËÉÈÅÂÀ */
+	$"B5A6 A5A1 8236 0002 0100 0000 0000 0100"            /* µ¦¥¡‚6.......... */
+	$"35DC FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 5Üÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFE 8901 0101 0000 0000 001B"            /* ÿÿÿÿÿþ‰......... */
+	$"DFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF73 0002 0000 0001 0082"            /* ÿÿÿÿÿÿÿs.......‚ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE4 1800 0100 0001 00C0"            /* ÿÿÿÿÿÿÿä.......À */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4500 0200 0002 02C6"            /* ÿÿÿÿÿÿÿÿE......Æ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4C00 0200 0103 00B3"            /* ÿÿÿÿÿÿÿÿL......³ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFE 3D00 0300 0104 009C"            /* ÿÿÿÿÿÿÿþ=......œ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFF4 2C04 0400 0105 0087"            /* ÿÿÿÿÿÿÿô,......‡ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE8 2007 0400 0105 0073"            /* ÿÿÿÿÿÿÿè ......s */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFD9 1808 0400 0105 015C"            /* ÿÿÿÿÿÿÿÙ.......\ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFC7 0E0A 0401 0105 034A"            /* ÿÿÿÿÿÿÿÇ.Â.....J */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFB5 0A0A 0402 0105 043C"            /* ÿÿÿÿÿÿÿµÂÂ.....< */
+	$"FBFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFA1 080A 0402 0105 062B"            /* ÿÿÿÿÿÿÿ¡.Â.....+ */
+	$"F2FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* òÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF8E 050A 0402 0104 0720"            /* ÿÿÿÿÿÿÿŽ.Â.....  */
+	$"E7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF7C 0609 0300 0104 0817"            /* ÿÿÿÿÿÿÿ|.Æ...... */
+	$"D8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF68 0709 0300 0104 0A0E"            /* ÿÿÿÿÿÿÿh.Æ....Â. */
+	$"C8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Èÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF55 0809 0300 0104 0A0A"            /* ÿÿÿÿÿÿÿU.Æ....ÂÂ */
+	$"B7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ·ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF47 0909 0300 0104 0A07"            /* ÿÿÿÿÿÿÿGÆÆ....Â. */
+	$"A4FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ¤ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF F638 0B08 0300 0004 0A05"            /* ÿÿÿÿÿÿö8......Â. */
+	$"91FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ‘ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF EE2B 0C08 0300 0004 0905"            /* ÿÿÿÿÿÿî+......Æ. */
+	$"81FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* �ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF E224 0D08 0300 0003 0906"            /* ÿÿÿÿÿÿâ$......Æ. */
+	$"71FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* qÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF D51C 0E08 0300 0003 0907"            /* ÿÿÿÿÿÿÕ.......Æ. */
+	$"5EFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ^ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF C714 0F07 0200 0003 0908"            /* ÿÿÿÿÿÿÇ.......Æ. */
+	$"4FFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF B811 0E07 0200 0003 090A"            /* ÿÿÿÿÿÿ¸.......ÆÂ */
+	$"43FD FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Cýÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF A70E 0F07 0200 0003 080B"            /* ÿÿÿÿÿÿ§......... */
+	$"34F5 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 4õÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 960C 0E06 0200 0002 080D"            /* ÿÿÿÿÿÿ–......... */
+	$"29EB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* )ëÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 850C 0E07 0200 0003 080E"            /* ÿÿÿÿÿÿ…......... */
+	$"22E0 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* "àÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 760D 0E06 0200 0003 080F"            /* ÿÿÿÿÿÿv......... */
+	$"1BD3 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Óÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 650E 0E06 0200 0002 080F"            /* ÿÿÿÿÿÿe......... */
+	$"14C7 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 580E 0D06 0200 0002 070F"            /* ÿÿÿÿÿÿX......... */
+	$"11B9 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .¹ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 4E10 0D06 0100 0002 070F"            /* ÿÿÿÿÿÿN......... */
+	$"10AB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .«ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 4211 0D06 0200 0002 070F"            /* ÿÿÿÿÿøB......... */
+	$"0D9B FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .›ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF1 3513 0D06 0200 0002 080F"            /* ÿÿÿÿÿñ5......... */
+	$"0C8D FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE9 2E13 0D05 0100 0002 070F"            /* ÿÿÿÿÿé.......... */
+	$"0D81 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFDF 2914 0D06 0100 0002 070F"            /* ÿÿÿÿÿß)......... */
+	$"0E73 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .sÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD4 2215 0C06 0100 0002 070F"            /* ÿÿÿÿÿÔ"......... */
+	$"0F64 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .dÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC9 1C16 0C05 0100 0002 070F"            /* ÿÿÿÿÿÉ.......... */
+	$"1058 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Xÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFBD 1A15 0C05 0100 0002 070F"            /* ÿÿÿÿÿ½.......... */
+	$"114F FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB2 1815 0C05 0100 0002 070E"            /* ÿÿÿÿÿ².......... */
+	$"1246 FAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Fúÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 1615 0C05 0100 0002 070E"            /* ÿÿÿÿÿ¥.......... */
+	$"133B F4FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .;ôÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF98 1515 0C05 0100 0002 060E"            /* ÿÿÿÿÿ˜.......... */
+	$"1533 EEFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .3îÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF8D 1515 0B05 0100 0002 070E"            /* ÿÿÿÿÿ�.......... */
+	$"152F E6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ./æÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF82 1615 0B05 0100 0002 070E"            /* ÿÿÿÿÿ‚.......... */
+	$"1629 DDFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .)Ýÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF77 1615 0B05 0100 0002 060E"            /* ÿÿÿÿÿw.......... */
+	$"1624 D5FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Õÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6B 1715 0B05 0100 0002 060E"            /* ÿÿÿÿÿk.......... */
+	$"1720 CCFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Ìÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF61 1815 0B05 0100 0002 060E"            /* ÿÿÿÿÿa.......... */
+	$"181D C3FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Ãÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5B 1914 0B05 0100 0002 060E"            /* ÿÿÿÿÿ[.......... */
+	$"181C BAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..ºÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FE54 1A14 0B05 0100 0002 070E"            /* ÿÿÿÿþT.......... */
+	$"181B B0FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..°ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F94C 1B15 0B04 0100 0002 060E"            /* ÿÿÿÿùL.......... */
+	$"181A A6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..¦ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F544 1C15 0B05 0100 0002 070E"            /* ÿÿÿÿõD.......... */
+	$"1819 9DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..�ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F13D 1D14 0B04 0100 0002 060E"            /* ÿÿÿÿñ=.......... */
+	$"1819 95FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..•ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF EB3A 1D14 0B05 0100 0002 070E"            /* ÿÿÿÿë:.......... */
+	$"1819 8EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Žÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF E537 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿå7.......... */
+	$"181A 86FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..†ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF DF34 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿß4.......... */
+	$"181B 7EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..~ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D930 1F15 0B05 0100 0002 070E"            /* ÿÿÿÿÙ0.......... */
+	$"181B 78FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..xÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D32D 1F15 0B05 0100 0002 070F"            /* ÿÿÿÿÓ-.......... */
+	$"191C 71FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..qÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF CE29 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÎ) ......... */
+	$"191D 6AFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..jÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C828 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÈ( ......... */
+	$"191D 65FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..eÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C328 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÃ( ......... */
+	$"191E 61FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..aÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF BE28 2115 0B05 0100 0002 070F"            /* ÿÿÿÿ¾(!......... */
+	$"191F 5DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..]ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B827 2115 0C05 0100 0002 070F"            /* ÿÿÿÿ¸'!......... */
+	$"1920 5AFE FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Zþÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B427 2115 0C05 0100 0003 0710"            /* ÿÿÿÿ´'!......... */
+	$"1A21 58FD FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Xýÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B026 2115 0C05 0100 0003 0810"            /* ÿÿÿÿ°&!......... */
+	$"1A21 55FB FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Uûÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF AC26 2116 0C05 0200 0003 0810"            /* ÿÿÿÿ¬&!......... */
+	$"1A22 52F9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ."Rùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A826 2215 0C05 0100 0003 0810"            /* ÿÿÿÿ¨&"......... */
+	$"1A23 4FF7 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .#O÷ÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A426 2316 0D06 0200 0003 0811"            /* ÿÿÿÿ¤&#......... */
+	$"1B24 4DF6 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Möÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A126 2316 0D06 0200 0003 0911"            /* ÿÿÿÿ¡&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9F26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿŸ&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9E26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿž&#.......Æ. */
+	$"1C26 4BF4 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Kôÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9D27 2317 0D06 0200 0004 0912"            /* ÿÿÿÿ�'#.......Æ. */
+	$"1C26 4AF3 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Jóÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9C27 2417 0D06 0200 0104 0912"            /* ÿÿÿÿœ'$.......Æ. */
+	$"1C26 47F2 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Gòÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9A27 2417 0D06 0200 0103 0911"            /* ÿÿÿÿš'$.......Æ. */
+	$"1B27 37D1 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .'7Ñÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 7329 2316 0D06 0200 0003 0810"            /* ÿÿÿÿs)#......... */
+	$"1A27 2F59 B7C6 C6C7 C7C7 C7C7 C7C7 C7C7"            /* .'/Y·ÆÆÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C5 C689 372D 2015 0C06 0200 0003 070E"            /* ÇÅƉ7- ......... */
+	$"1723 3037 3C46 4C4F 5050 5050 5050 5050"            /* .#07<FLOPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"4D49 4138 352A 1D13 0A05 0100 0003 060C"            /* MIA85*..Â....... */
+	$"141E 2934 3D44 494C 4D4E 4E4E 4E4E 4E4E"            /* ..)4=DILMNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4D"            /* NNNNNNNNNNNNNNNM */
+	$"4B46 4039 2F24 1910 0904 0100 0002 050A"            /* KF@9/$..Æ...... */
+	$"1018 212B 3339 3D40 4142 4242 4242 4242"            /* ..!+39=@ABBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4140"            /* BBBBBBBBBBBBBBA@ */
+	$"3F3B 352F 261D 140D 0703 0100 0002 0407"            /* ?;5/&........... */
+	$"0C12 1920 272C 2F32 3233 3333 3333 3333"            /* ... ',/223333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3332"            /* 3333333333333332 */
+	$"302D 2924 1D16 0F09 0502 0100 0001 0305"            /* 0-)$...Æ........ */
+	$"080D 1217 1C1F 2223 2425 2525 2525 2525"            /* ......"#$%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2524"            /* %%%%%%%%%%%%%%%$ */
+	$"2221 1E19 1510 0B07 0402 0000 0000 0103"            /* "!.............. */
+	$"0609 0C10 1315 1718 1919 1919 1919 1919"            /* .Æ.............. */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1918"            /* ................ */
+	$"1716 1411 0E0A 0704 0201 0000 0000 0002"            /* .....Â.......... */
+	$"0305 0709 0B0D 0E0F 0F0F 0F0F 0F0F 0F0F"            /* ...Æ............ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0D 0C0A 0806 0402 0100 0000 0000 0001"            /* ...Â............ */
+	$"0103 0304 0607 0708 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0707 0605 0403 0201 0000 0000 0000 0000"            /* ................ */
+	$"0001 0102 0202 0203 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0202 0202 0201 0100 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 6963 3038"            /* ............ic08 */
+	$"0000 5CBD 0000 000C 6A50 2020 0D0A 870A"            /* ..\½....jP  .‡ */
+	$"0000 0014 6674 7970 6A70 3220 0000 0000"            /* ....ftypjp2 .... */
+	$"6A70 3220 0000 004F 6A70 3268 0000 0016"            /* jp2 ...Ojp2h.... */
+	$"6968 6472 0000 0100 0000 0100 0004 0707"            /* ihdr............ */
+	$"0100 0000 000F 636F 6C72 0100 0000 0000"            /* ......colr...... */
+	$"1000 0000 2263 6465 6600 0400 0000 0000"            /* ...."cdef....... */
+	$"0100 0300 0100 0000 0100 0000 0200 0200"            /* ................ */
+	$"0000 0300 0000 006A 7032 63FF 4FFF 5100"            /* .......jp2cÿOÿQ. */
+	$"3200 0000 0001 0000 0001 0000 0000 0000"            /* 2............... */
+	$"0000 0000 0001 0000 0001 0000 0000 0000"            /* ................ */
+	$"0000 0000 0407 0101 0701 0107 0101 0701"            /* ................ */
+	$"01FF 5200 0C00 0000 0101 0504 0400 01FF"            /* .ÿR............ÿ */
+	$"5C00 1320 5058 5860 5858 6058 5860 5858"            /* \.. PXX`XX`XX`XX */
+	$"5850 5058 FF64 0011 0001 4B61 6B61 6475"            /* XPPXÿd....Kakadu */
+	$"2D76 352E 322E 31FF 9000 0A00 0000 005B"            /* -v5.2.1ÿ�.Â....[ */
+	$"D000 01FF 93CF C100 1507 F18D 1991 E793"            /* Ð..ÿ“ÏÁ...ñ�.‘ç“ */
+	$"D8B4 6B7C 459C 4F68 E4BF E0FF 0D3D C2DF"            /* Ø´k|EœOhä¿àÿ.=Âß */
+	$"FC16 8F7F 6C3A 7FEA ACD5 8632 D1AD 37A6"            /* ü.�.l:.ê¬Õ†2Ñ­7¦ */
+	$"22E3 4753 734F 3BFA 0372 1596 A8F1 7183"            /* "ãGSsO;ú.r.–¨ñqƒ */
+	$"2F17 0A65 C5C2 6A8E C0F9 1000 39CE 9180"            /* /.ÂeÅÂjŽÀù..9Α€ */
+	$"AE4A F551 B521 2839 FEE4 4D31 9F98 9F17"            /* ®JõQµ!(9þäM1Ÿ˜Ÿ. */
+	$"29F2 C91D 3B35 397E 15A1 8246 C3EA 3107"            /* )òÉ.;59~.¡‚FÃê1. */
+	$"5630 A744 5105 404A C843 0AE4 304B 4FE9"            /* V0§DQ.@JÈCÂä0KOé */
+	$"81E4 4C91 DF64 6885 8D23 6517 B254 DE23"            /* �äL‘ßdh…�#e.²TÞ# */
+	$"6101 3C94 9245 923D 4F4C 0F02 784C F319"            /* a.<”’E’=OL..xLó. */
+	$"CFC0 FC11 7EC2 D9C4 3907 5FDC 553A F1E1"            /* ÏÀü.~ÂÙÄ9._ÜU:ñá */
+	$"F2BC 6420 59D8 7D25 F42A 5BA5 8E8E 7166"            /* ò¼d YØ}%ô*[¥ŽŽqf */
+	$"AD5D 5C91 CC75 1452 ACDA 64CA 3249 CCE3"            /* ­]\‘Ìu.R¬ÚdÊ2IÌã */
+	$"6874 83E2 633E 64E7 8159 4AA2 FD3C 638D"            /* htƒâc>dç�YJ¢ý<c� */
+	$"F978 C3ED 328F C0F2 1F81 A80C BB81 9421"            /* ùxÃí2�Àò.�¨.»�”! */
+	$"980D F457 0EA7 7782 676F 2AB3 EE8F 99C2"            /* ˜.ôW.§w‚go*³î�™Â */
+	$"2221 9D95 8C80 C3A8 91F3 4C08 6A03 DE45"            /* "!�•Œ€Ã¨‘óL.j.ÞE */
+	$"A985 9B7B 9ED3 A9A4 D929 A97F A125 FE22"            /* ©…›{žÓ©¤Ù)©.¡%þ" */
+	$"A893 77F3 EF0F C15C 3969 A153 3A7C 3110"            /* ¨“wóï.Á\9i¡S:|1. */
+	$"7A9C 9227 D2F6 BCA8 1A04 0219 8F36 21B7"            /* zœ’'Òö¼¨....�6!· */
+	$"B37C 2AB6 678A 1675 BA9E 03B4 53BA 33B9"            /* ³|*¶gŠ.uºž.´Sº3¹ */
+	$"06AD 96D8 BDBC BFC8 5134 C040 7EBA B756"            /* .­–ؽ¼¿ÈQ4À@~º·V */
+	$"E619 DC67 BC83 BB39 AA42 65E1 5BBC 45B4"            /* æ.Üg¼ƒ»9ªBeá[¼E´ */
+	$"ECB6 E6ED D098 3C9F E17B 876D A039 553E"            /* ì¶æíИ<Ÿá{‡m 9U> */
+	$"5CF9 2D3F 6F47 4854 7085 62C1 C65D C07C"            /* \ù-?oGHTp…bÁÆ]À| */
+	$"86A0 3E43 500F 90D0 4787 8CE8 726C 5109"            /* † >CP.�ÐG‡ŒèrlQÆ */
+	$"FD68 8099 E8FE 2A66 2F02 78F5 C78B 6A34"            /* ýh€™èþ*f/.xõÇ‹j4 */
+	$"0A9E 25FE 0DE3 E3C8 BD7B 3530 98D5 CF03"            /* ž%þ.ããȽ{50˜ÕÏ. */
+	$"CE64 A57D 620C 87C5 65B4 7BE1 34BC 3058"            /* Îd¥}b.‡Åe´{á4¼0X */
+	$"572A 9EBF 5E0C 5A01 80A3 B334 DF5A E1B8"            /* W*ž¿^.Z.€£³4ßZḠ*/
+	$"08C3 5C30 2CC4 C1F5 1341 F516 40FA 8A00"            /* .Ã\0,ÄÁõ.Aõ.@úŠ. */
+	$"477D B516 AD2F 4DD3 BE8C 58F0 7C77 A236"            /* G}µ.­/MÓ¾ŒXð|w¢6 */
+	$"DD43 6611 D582 F050 DC31 59D0 194D A6FD"            /* ÝCf.Õ‚ðPÜ1YÐ.M¦ý */
+	$"652E FA16 4BA7 25FE 0DE3 E3D9 B950 06E2"            /* e.ú.K§%þ.ããÙ¹P.â */
+	$"3A8A DA86 827A 4C68 5798 55FC FD46 A583"            /* :ŠÚ†‚zLhW˜UüýF¥ƒ */
+	$"064D 8FB0 29D9 8DAD 53CC 5229 B675 ACAB"            /* .M�°)Ù�­SÌR)¶u¬« */
+	$"8EED 34BC 2F12 142E 446C 0DF7 0BC3 D6E7"            /* Ží4¼/...Dl.÷.ÃÖç */
+	$"A086 8D72 6AE7 9270 B97C D981 C7F1 C38A"            /*  †�rjç’p¹|Ù�ÇñÊ */
+	$"47EE E585 FC19 FCE3 668C C7E0 471F 813C"            /* Gîå…ü.üãfŒÇàG.�< */
+	$"3F02 0005 B422 0345 FC66 9A91 446D DDCA"            /* ?...´".Eüfš‘DmÝÊ */
+	$"449B CCDB 8E8F A0B8 3942 A8FC 6409 F7F3"            /* D›ÌÛŽ� ¸9B¨üdÆ÷ó */
+	$"ED01 353A 2B01 1B0C 2939 619B 9890 94E7"            /* í.5:+...)9a›˜�”ç */
+	$"5FDA 75F2 7323 BF3A 7AED 757E 42D6 C336"            /* _Úuòs#¿:zíu~BÖÃ6 */
+	$"E74E 6B5F 2D43 4780 CA1C C462 6507 4801"            /* çNk_-CG€Ê.Äbe.H. */
+	$"EDEF 5B2A 7297 8FC6 1E13 E7FA 56B5 4279"            /* íï[*r—�Æ..çúVµBy */
+	$"5BB4 B307 F4DE E273 4FC3 E9B1 72C3 EDA2"            /* [´³.ôÞâsOÃé±rÃí¢ */
+	$"A3F0 A9E0 FB5D C018 B35C 8B45 CD63 99FE"            /* £ð©àû]À.³\‹EÍc™þ */
+	$"11FB 8993 21D1 BA8B 69EB 5CB9 F258 468F"            /* .û‰“!Ѻ‹ië\¹òXF� */
+	$"73D4 6804 C6E6 045E AE54 954C D0E5 D836"            /* sÔh.Ææ.^®T•LÐåØ6 */
+	$"EA0D DB9A 2806 36FA B3E9 5973 789D 6591"            /* ê.Ûš(.6ú³éYsx�e‘ */
+	$"1EC2 F271 E9E2 5681 C542 A2FC F4EF 8111"            /* .ÂòqéâV�ÅB¢üôï�. */
+	$"59D5 FC91 9749 52A3 EA37 B239 4939 8625"            /* YÕü‘—IR£ê7²9I9†% */
+	$"F248 18D2 075A 80A1 8005 9ED2 437F C705"            /* òH.Ò.Z€¡€.žÒC.Ç. */
+	$"2BFD 308C F1F0 E1BC 8FDA F5D5 50D9 9770"            /* +ý0Œñðá¼�ÚõÕPÙ—p */
+	$"7EF5 213F 91F6 5B8B 189D EE67 70EF F40A"            /* ~õ!?‘ö[‹.�îgpïô */
+	$"2E24 C54B F37D 4941 FCD2 7779 5C8B 59CC"            /* .$ÅKó}IAüÒwy\‹YÌ */
+	$"F284 3377 A496 0399 6F17 47AC B5EA 3A84"            /* ò„3w¤–.™o.G¬µê:„ */
+	$"844E DC13 D058 BE9F 1BBE 8CE0 E615 D2E1"            /* „NÜ.ÐX¾Ÿ.¾Œàæ.Òá */
+	$"88A5 9DA6 9FB4 4EDE B804 ED14 A7EA 54E0"            /* ˆ¥�¦Ÿ´NÞ¸.í.§êTà */
+	$"5A87 311B 5E69 70F5 EDA3 2E78 8862 7603"            /* Z‡1.^ipõí£.xˆbv. */
+	$"7761 094D 4A69 5AB0 A9BB 3F4F 92BE 205B"            /* waÆMJiZ°©»?O’¾ [ */
+	$"A226 24D5 C8B2 CCF7 E064 31C7 E727 6E2C"            /* ¢&$ÕȲÌ÷àd1Çç'n, */
+	$"D6A1 347F 41CD 5F70 E1C0 1AFC 4FBC 81A9"            /* Ö¡4.AÍ_páÀ.üO¼�© */
+	$"A884 F03A CD84 B581 1F03 A523 838B 8038"            /* ¨„ð:Í„µ�..¥#ƒ‹€8 */
+	$"02F4 6DE8 98FC EDD6 B331 21F7 4AC5 A31E"            /* .ômè˜üíÖ³1!÷JÅ£. */
+	$"9EB4 E770 D465 386E 18A6 D1BE EF6D B008"            /* ž´çpÔe8n.¦Ñ¾ïm°. */
+	$"63E6 1066 1374 4D10 3270 8C7F F297 F91D"            /* cæ.f.tM.2pŒ.ò—ù. */
+	$"DA61 677B 29FD A878 B122 E33C 17E3 8ED1"            /* Úag{)ý¨x±"ã<.ãŽÑ */
+	$"FB8E 4407 8B82 32AD 1B50 09DF BDA8 C80E"            /* ûŽD.‹‚2­.PÆß½¨È. */
+	$"7E28 ED9D A005 4297 B9C1 8D66 CA77 C41D"            /* ~(í� .B—¹Á�fÊwÄ. */
+	$"41C5 E3B3 F94D 96E5 1308 7C59 1EB8 0871"            /* AÅã³ùM–å..|Y.¸.q */
+	$"C7A4 FED7 47F2 F800 6889 A21D 1FF4 9E93"            /* Ǥþ×Gòø.h‰¢..ôž“ */
+	$"1321 7377 D96E 86F5 A0CB EB17 C77A 81C0"            /* .!swÙn†õ Ëë.Çz�À */
+	$"7C8D A01F 0E91 00F9 1D00 94FD 4D32 E5DB"            /* |� ..‘.ù..”ýM2åÛ */
+	$"0482 DEB8 CF1C 792A EA3B DECA 4470 4898"            /* .‚Þ¸Ï.y*ê;ÞÊDpH˜ */
+	$"81C0 5457 FE66 63DD CAF3 0B98 08E1 DC3F"            /* �ÀTWþfcÝÊó.˜.áÜ? */
+	$"CF68 7F31 9BEE 73EF A3A5 8D57 8969 EEC3"            /* Ïh.1›îs�W‰iîà */
+	$"0F13 3ED9 390D FC4C B37F C4F7 01E4 B115"            /* ..>Ù9.üL³.Ä÷.ä±. */
+	$"E9F9 9526 00FA 10D0 0D64 4CC5 8481 D231"            /* éù•&.ú.Ð.dLÅ„�Ò1 */
+	$"DE6D 483E 8046 7F58 5BD3 1FFC CF82 297A"            /* ÞmH>€F.X[Ó.üÏ‚)z */
+	$"88A1 7E78 0668 3222 9E8B A287 30A3 DB10"            /* ˆ¡~x.h2"ž‹¢‡0£Û. */
+	$"A77F A842 87FC 164E 92B8 96DF 4920 EEC2"            /* §.¨B‡ü.N’¸–ßI î */
+	$"47B6 83F1 F68F 9309 63CE FAAC 3C8F 9FCF"            /* G¶ƒñö�“ÆcÎú¬<�ŸÏ */
+	$"A166 9621 ADC0 0ABB 7F1A 7E3C A4AD 3755"            /* ¡f–!­À»..~<¤­7U */
+	$"E2D8 E26D CAD1 6F24 F808 BC0D E94B EEBC"            /* âØâmÊÑo$ø.¼.éKî¼ */
+	$"D601 C1F5 30C1 F53B C0FA 97C0 90E6 901B"            /* Ö.Áõ0Áõ;Àú—À�æ�. */
+	$"71C2 1EAB 8A4C 52A4 4431 058C DFB9 4148"            /* qÂ.«ŠLR¤D1.Œß¹AH */
+	$"185C 1E93 01C6 82D3 C81B 6398 8173 189D"            /* .\.“.Æ‚ÓÈ.c˜�s.� */
+	$"F73C 4887 5155 0C95 0088 4C69 0A27 3F39"            /* ÷<H‡QU.•.ˆLiÂ'?9 */
+	$"8CCA 32D8 1FD7 A3F4 CDD8 6275 5E7E 3619"            /* ŒÊ2Ø.×£ôÍØbu^~6. */
+	$"8D18 68C9 D2C7 0FCB 18EA FB01 5A68 4A52"            /* �.hÉÒÇ.Ë.êû.ZhJR */
+	$"3C08 5313 5ED2 9B7D 31B5 953C 2F92 22F7"            /* <.S.^Ò›}1µ•</’"÷ */
+	$"3764 04E8 A9A6 C747 8DFD 9730 01DD 82E1"            /* 7d.試ÇG�ý—0.Ý‚á */
+	$"B08A FD72 7C33 A9BF AFEA 7188 AC4B 2B45"            /* °Šýr|3©¿¯êqˆ¬K+E */
+	$"BBB2 7826 6704 5864 9BAF 91FC 6BD3 E9D7"            /* »²x&g.Xd›¯‘ükÓé× */
+	$"0E30 E428 0FB2 4836 F94F 7CB9 3723 72A2"            /* .0ä(.²H6ùO|¹7#r¢ */
+	$"AB4C C0EB ED8F 823B B8D6 C4A6 E4B5 B41C"            /* «LÀëí�‚;¸ÖĦ䵴. */
+	$"B0FC 0171 880F E77C 1EF8 9645 A8B4 969A"            /* °ü.qˆ.ç|.ø–E¨´–š */
+	$"5420 86B9 71CE 0DE5 7A40 B41A DD85 6B30"            /* T †¹qÎ.åz@´.Ý…k0 */
+	$"F02A 3B61 92B4 7A95 269E BF9F DDB3 9FB7"            /* ð*;a’´z•&ž¿ŸÝ³Ÿ· */
+	$"746B 1514 C89D 391B F835 73B8 0F1C 2567"            /* tk..È�9.ø5s¸..%g */
+	$"A0C2 6B37 DFCE 5F4C 1DCD FD79 5CDA A8FF"            /*  Âk7ßÎ_L.Íýy\Ú¨ÿ */
+	$"0603 9014 308F AEB3 EDB7 D721 1709 3897"            /* ..�.0�®³í·×!.Æ8— */
+	$"D3AB 181E 53BE 4025 3492 41C2 5EC7 BFC0"            /* Ó«..S¾@%4’AÂ^Ç¿À */
+	$"EA12 19D0 6158 530B A57B 8A2B 8DFF 18AF"            /* ê..ÐaXS.¥{Š+�ÿ.¯ */
+	$"7651 65CF CD26 3F05 987E 0760 9C3C E3A6"            /* vQeÏÍ&?.˜~.`œ<㦠*/
+	$"86C0 DAB4 C6ED 7F19 8034 85FE DA7E 7963"            /* †ÀÚ´Æí..€4…þÚ~yc */
+	$"AFF2 9CBE 6AAA B6BB B2D3 6F41 BB45 B1EB"            /* ¯òœ¾jª¶»²ÓoA»E±ë */
+	$"9CC2 8803 907A 5CE1 F2D9 AF69 FF22 7DE8"            /* œÂˆ.�z\áòÙ¯iÿ"}è */
+	$"D328 C2A1 0F97 2EE2 9575 E0E6 A665 B85A"            /* Ó(¡.—.â•uàæ¦e¸Z */
+	$"C5D7 6FA0 FE24 BC68 9D74 6CEB C4F9 615C"            /* Å×o þ$¼h�tlëÄùa\ */
+	$"4F34 48B3 7A64 2540 B64F EFBE 8D0F E427"            /* O4H³zd%@¶Oï¾�.ä' */
+	$"4CCA 6DB3 83AC C5F6 EE52 7A43 8172 41E4"            /* LÊm³ƒ¬ÅöîRzC�rAä */
+	$"2CE3 DF2F 1496 97DE 6AD1 2FFF 7E52 D993"            /* ,ãß/.–—ÞjÑ/ÿ~RÙ“ */
+	$"8AF9 AAA3 B192 0991 BFAE 4829 001E 963B"            /* Šùª£±’Æ‘¿®H)..–; */
+	$"019C 8A5D 78E8 6A56 F78C B81A F4D0 6312"            /* .œŠ]xèjV÷Œ¸.ôÐc. */
+	$"C0C4 A9BF 7CA5 75D9 9C23 F3EA 4F39 B325"            /* ÀÄ©¿|¥uÙœ#óêO9³% */
+	$"F6DE 6EF4 7D48 A279 8EA9 5395 0FBC C63F"            /* öÞnô}H¢yŽ©S•.¼Æ? */
+	$"679F CE93 2206 ECA9 079C 2BB7 D094 6A7B"            /* gŸÎ“".ì©.œ+·Ð”j{ */
+	$"1077 277F 88A6 21AE 84C3 EDD4 38FC 36B2"            /* .w'.ˆ¦!®„ÃíÔ8ü6² */
+	$"1F86 8F00 8F56 8825 7713 9061 800A A4CD"            /* .†�.�Vˆ%w.�a€Â¤Í */
+	$"E3D3 0F3C B0AC 0C87 E368 8544 F251 5C39"            /* ãÓ.<°¬.‡ãh…DòQ\9 */
+	$"7D90 1BEF 7805 D624 7380 0A19 E093 3058"            /* }�.ïx.Ö$s€Â.à“0X */
+	$"1C90 467F 5C70 4932 3947 4A95 A450 36C8"            /* .�F.\pI29GJ•¤P6È */
+	$"D4D5 CA85 9922 FA12 D0D8 96CA 9A2F 40A2"            /* ÔÕÊ…™"ú.ÐØ–Êš/@¢ */
+	$"F105 054F 8C56 C164 85B5 C4E6 3EAB D76A"            /* ñ..OŒVÁd…µÄæ>«×j */
+	$"A227 4F09 072C 4682 9B0F 995C 7551 94E7"            /* ¢'OÆ.,F‚›.™\uQ”ç */
+	$"419A 0098 0283 19E8 0489 687B 4F66 B74C"            /* Aš.˜.ƒ.è.‰h{Of·L */
+	$"7F59 C07A A552 B04D 628F E401 E55C A4ED"            /* .YÀz¥R°Mb�ä.å\¤í */
+	$"390F C34D 81BB 9F88 0C50 F50F 9FBD A377"            /* 9.ÃM�»Ÿˆ.Põ.Ÿ½£w */
+	$"F538 3F9C E243 FF47 D346 87F2 444B C479"            /* õ8?œâCÿGÓF‡òDKÄy */
+	$"F6B3 1C76 5125 F487 0FAF 294A DA20 EC56"            /* ö³.vQ%ô‡.¯)JÚ ìV */
+	$"07AB DE07 14C2 1721 F3E0 D687 1F67 039D"            /* .«Þ..Â.!óàÖ‡.g.� */
+	$"461F 0D82 9CAA B2D4 DFC6 6AA5 D31E 4D01"            /* F..‚œª²ÔßÆj¥Ó.M. */
+	$"5AC2 B2BD FD97 7D6E 00D1 7ADF 377C 15A7"            /* Z²½ý—}n.Ñzß7|.§ */
+	$"9681 C7B2 8168 D706 425B 35EF 7298 C053"            /* –�Dz�h×.B[5ïr˜ÀS */
+	$"E198 B5E2 B835 712B 1AD8 BA77 CF86 83A3"            /* ᘵâ¸5q+.غwφƒ£ */
+	$"B0B9 C5E6 F37A A3DE D93B 8EC8 132F A52A"            /* °¹Åæóz£ÞÙ;ŽÈ./¥* */
+	$"AB20 E166 F719 7130 6482 5BE2 605B D78E"            /* « áf÷.q0d‚[â`[׎ */
+	$"672D 7AE6 3906 DA75 0E3D 1962 8A60 9294"            /* g-zæ9.Úu.=.bŠ`’” */
+	$"1FC8 C0F3 216D 815D 4DDE 5DDE D8AB 3F9C"            /* .ÈÀó!m�]MÞ]ÞØ«?œ */
+	$"7F9F 24B3 7BBF CCB9 2F80 19B6 70AE 1B3D"            /* .Ÿ$³{¿Ì¹/€.¶p®.= */
+	$"C71A 1F7C 81D2 639F 0D03 24EA D4B1 D351"            /* Ç..|�ÒcŸ..$êÔ±ÓQ */
+	$"DD10 FBD5 EA3F 4957 A7ED 04C6 384D C10F"            /* Ý.ûÕê?IW§í.Æ8MÁ. */
+	$"8A55 0C03 694F 0D18 70D8 0AC3 33C0 17D1"            /* ŠU..iO..pØÂÃ3À.Ñ */
+	$"73BB E85F 5204 090F FDFE 8AC5 9AD6 22D5"            /* s»è_R.Æ.ýþŠÅšÖ"Õ */
+	$"CA31 A6DE EF44 D910 B34A 0E59 7866 536F"            /* Ê1¦ÞïDÙ.³J.YxfSo */
+	$"9B0B A341 3AB8 C06C C64F 3F86 8160 DFB9"            /* ›.£A:¸ÀlÆO?†�`ß¹ */
+	$"A709 59D8 88C3 3316 9FFA F83F 5120 E40E"            /* §ÆY؈Ã3.Ÿúø?Q ä. */
+	$"4DEA C88F C418 37F6 4C0B 7606 9632 EEC5"            /* MêÈ�Ä.7öL.v.–2îÅ */
+	$"6380 FB25 A69F AAE2 0888 B722 008F 35CB"            /* c€û%¦Ÿªâ.ˆ·".�5Ë */
+	$"F6A7 90BF D0DB 6367 A14B 5A86 EE98 FD18"            /* ö§�¿ÐÛcg¡KZ†î˜ý. */
+	$"A629 1BAB 3BE2 920D E99D BEC2 88B4 F909"            /* ¦).«;â’.é�¾Âˆ´ùÆ */
+	$"66B1 535D 3940 AF78 8200 0C46 142A EA2A"            /* f±S]9@¯x‚..F.*ê* */
+	$"A991 95E8 FD2B D30B 0E4A 76E2 A97B FAA7"            /* ©‘•èý+Ó..Jvâ©{ú§ */
+	$"97E2 9B30 54FA 5E97 962A 7E83 5711 A707"            /* —â›0Tú^—–*~ƒW.§. */
+	$"2A21 3729 2046 9C41 8282 A161 E5F6 AB24"            /* *!7) FœA‚‚¡aåö«$ */
+	$"3324 74CF 1AF6 C935 D884 0008 DC18 663C"            /* 3$tÏ.öÉ5Ø„..Ü.f< */
+	$"3A00 25E4 92D7 8F23 4C07 3C63 DB6E 4924"            /* :.%ä’×�#L.<cÛnI$ */
+	$"7362 34C9 2F1D 105B 97E2 03BF 648F C21C"            /* sb4É/..[—â.¿d�Â. */
+	$"C6AC 3657 2C72 ADAA 2889 0623 6A5D ACEC"            /* Ƭ6W,r­ª(‰.#j]¬ì */
+	$"3210 738F 51F5 CC65 9EA9 7AD3 95CB B265"            /* 2.s�QõÌež©zӕ˲e */
+	$"D54E 6E1D E2A7 2673 E6C2 C247 2FFD C10E"            /* ÕNn.â§&sæÂÂG/ýÁ. */
+	$"5FC5 C1E1 2511 5C8F 6063 92AB E4B9 8212"            /* _ÅÁá%.\�`c’«ä¹‚. */
+	$"3643 6D53 2492 3E58 3E71 15E3 A3B7 AB2A"            /* 6CmS$’>X>q.㣷«* */
+	$"A998 FE5A 74DB 537A CE3D CD46 49B6 DB6D"            /* ©˜þZtÛSzÎ=ÍFI¶Ûm */
+	$"B6DB 6DB2 8EE9 1D6F 6480 8613 D8D2 7D8F"            /* ¶Ûm²Žé.od€†.ØÒ}� */
+	$"5615 3EAB B25B 722D ECB8 ED12 70F2 BA06"            /* V.>«²[r-ì¸í.pòº. */
+	$"E5A2 45C1 547C F861 A7D5 8E1C 08BC 346B"            /* å¢EÁT|øa§ÕŽ..¼4k */
+	$"2730 C670 2FD8 F159 6ABE 2092 ED98 AC34"            /* '0Æp/ØñYj¾ ’혬4 */
+	$"B4CA 8565 90CF 0034 6E68 F777 9672 F29D"            /* ´Ê…e�Ï.4nh÷w–rò� */
+	$"4621 6E73 9C90 5C3D A8DB F5B0 CACF A63E"            /* F!nsœ�\=¨Ûõ°ÊϦ> */
+	$"861E 8B9E F490 8E15 69BC A01D EF59 E898"            /* †.‹žô�Ž.i¼ .ïYè˜ */
+	$"7040 B817 5AA9 BFB1 09A0 FE74 D2F7 BEA8"            /* p@¸.Z©¿±Æ þtÒ÷¾¨ */
+	$"A4F3 FEAC 38A4 409E B504 9CC9 EAA3 533B"            /* ¤óþ¬8¤@žµ.œÉê£S; */
+	$"153D F710 FC9E 2055 A395 C374 2AF9 E7C5"            /* .=÷.üž U£•Ãt*ùçÅ */
+	$"E1E8 7F74 3CDB D568 B606 A9D5 B7AE E207"            /* áè.t<ÛÕh¶.©Õ·®â. */
+	$"947E 2E65 1C27 336D 927A 4F86 5422 0E04"            /* ”~.e.'3m’zO†T".. */
+	$"42C7 668A 9403 EAB7 21A3 C9F1 18BC 5380"            /* BÇfŠ”.ê·!£Éñ.¼S€ */
+	$"BED7 07B5 F9B1 B798 8727 D54A 7A6E E493"            /* ¾×.µù±·˜‡'ÕJznä“ */
+	$"5271 F27D 7C35 DCEE D0BC CB31 C1FB 879F"            /* Rqò}|5ÜîмË1Áû‡Ÿ */
+	$"E074 9EB9 D7BE C9ED D2C8 BD00 C7FC D05B"            /* àtž¹×¾ÉíÒȽ.ÇüÐ[ */
+	$"2B2C 9647 A924 9F22 A06D 62B4 A946 77B7"            /* +,–G©$Ÿ" mb´©Fw· */
+	$"AD6D 60EE C841 997D A7E8 7AD2 AFA8 EEC4"            /* ­m`îÈA™}§èzÒ¯¨îÄ */
+	$"D61F FC06 FD7A E761 AA33 0F74 A08F 8E5B"            /* Ö.ü.ýzçaª3.t �Ž[ */
+	$"B7C0 7C9A 1201 F0F5 6403 E4D0 60D8 92D9"            /* ·À|š..ðõd.äÐ`Ø’Ù */
+	$"84ED 064F 1B29 D7A7 1D77 F4B3 61D6 2651"            /* „í.O.)ק.wô³aÖ&Q */
+	$"329E 2CA5 53B4 956D 1061 3A3A A73B FC8E"            /* 2ž,¥S´•m.a::§;üŽ */
+	$"DD3C 60C9 F855 32FB 3C04 6287 50F7 6BB3"            /* Ý<`ÉøU2û<.b‡P÷k³ */
+	$"B84A 05A6 3145 A832 3BBC CA56 115B 9D7F"            /* ¸J.¦1E¨2;¼ÊV.[�. */
+	$"8ADB 5660 429D 1FF6 4E6D 4899 EFDA 592F"            /* ŠÛV`B�.öNmH™ïÚY/ */
+	$"19DC 9790 802A 1C17 2250 ADEC 0312 2C23"            /* .Ü—�€*.."P­ì..,# */
+	$"223B 1EC8 482C 6E26 DD67 528F 7CDC 1841"            /* ";.ÈH,n&ÝgR�|Ü.A */
+	$"DBCB CF9E 6D26 B564 4FD4 0AB5 DA0B ADE2"            /* ÛËÏžm&µdOÔµÚ.­â */
+	$"C129 D895 00FF 105B 0D0B F4DB 286A B347"            /* Á)Ø•.ÿ.[..ôÛ(j³G */
+	$"A261 30A9 0A9B 7A0D 585B 3991 3217 6FF7"            /* ¢a0©Â›z.X[9‘2.o÷ */
+	$"A368 D6A8 E862 161A 3584 613E 04D9 DBCB"            /* £hÖ¨èb..5„a>.ÙÛË */
+	$"4D96 66A3 B736 F802 D67A 309F 04E6 AFD8"            /* M–f£·6ø.Öz0Ÿ.æ¯Ø */
+	$"888E A8A5 4461 F1F0 1B6B 2DC4 0DFE C676"            /* ˆŽ¨¥Dañð.k-Ä.þÆv */
+	$"8D4E 3750 C3E6 C233 EFC5 368B 6113 5B53"            /* �N7PÃæÂ3ïÅ6‹a.[S */
+	$"08E0 C259 1B88 AA0C 74B0 862E 1024 BB3F"            /* .àÂY.ˆª.t°†..$»? */
+	$"2816 B320 715C 5DFA 9FF0 CBC3 6A85 777A"            /* (.³ q\]úŸðËÃj…wz */
+	$"23CB F89B D813 6706 313E 2CF5 A163 0848"            /* #Ëø›Ø.g.1>,õ¡c.H */
+	$"94C9 3288 B556 53DD 2A45 2302 F28E 7ED1"            /* ”É2ˆµVSÝ*E#.òŽ~Ñ */
+	$"B5A0 67C8 53BB 4CE4 45D9 317F 92AB B13B"            /* µ gÈS»LäEÙ1.’«±; */
+	$"7246 F6DE 5348 49C9 42A1 CA62 64B0 209E"            /* rFöÞSHIÉB¡Êbd° ž */
+	$"43F2 DF7C 9BBC 097F C94A EA52 8D01 ADEF"            /* Còß|›¼Æ.ÉJêR�.­ï */
+	$"5241 7C9B 2876 75F4 D748 AF9D 6FBB 3306"            /* RA|›(vuô×H¯�o»3. */
+	$"0AD1 3953 6C99 5BB7 F1F5 1C1F BCE7 CA83"            /* ÂÑ9Sl™[·ñõ..¼çʃ */
+	$"08C1 6811 FBC5 AE18 343C C6F5 E515 F9CF"            /* .Áh.ûÅ®.4<Æõå.ùÏ */
+	$"FE48 C6E9 956E 6712 DDCA D62C 7F37 6DFE"            /* þHÆé•ng.ÝÊÖ,.7mþ */
+	$"2465 A8EE 1BAF E106 CA62 101F 0144 31DC"            /* $e¨î.¯á.Êb...D1Ü */
+	$"029E ED0F 9E47 F22E 0C17 0D31 E60B 1662"            /* .ží.žGò....1æ..b */
+	$"C1F5 5C90 7D5A 6D03 EAB6 C0C8 1653 E821"            /* Áõ\�}Zm.ê¶ÀÈ.Sè! */
+	$"5860 ED0B C711 39E5 E5C8 268D 2246 E3FB"            /* X`í.Ç.9ååÈ&�"Fãû */
+	$"68A4 3B12 A487 350D FE94 3722 65AC 949B"            /* h¤;.¤‡5.þ”7"e¬”› */
+	$"2526 7CD5 0E28 E093 CFE8 314C BE18 5B60"            /* %&|Õ.(à“Ïè1L¾.[` */
+	$"827E 154B 9609 2536 F890 A361 BA29 8211"            /* ‚~.K–Æ%6ø�£aº)‚. */
+	$"AF42 BEC6 1BCB CE6D 2910 8083 C890 D7FF"            /* ¯B¾Æ.ËÎm).€ƒÈ�×ÿ */
+	$"6F04 CEF4 F47C 0D92 00BD D90F 4095 0A48"            /* o.Îôô|.’.½Ù.@•ÂH */
+	$"4DC6 210C 351D 34A5 5FDA E576 1E1B 1684"            /* MÆ!.5.4¥_Úåv...„ */
+	$"F2A0 B30A 589C 1DBC 4831 E906 0D67 0CDD"            /* ò ³ÂXœ.¼H1é..g.Ý */
+	$"876B 994F 6D66 47DD AF40 7158 4385 738E"            /* ‡k™OmfGݯ@qXC…sŽ */
+	$"82F8 E637 9B5C 7389 0AA5 2A04 D105 5E88"            /* ‚øæ7›\s‰Â¥*.Ñ.^ˆ */
+	$"C2A2 2943 E125 6C2F 0AD1 1E5C AF1F CFF6"            /* ¢)Cá%l/ÂÑ.\¯.Ïö */
+	$"B39B C799 0F39 6151 6625 BB66 C3C3 418B"            /* ³›Ç™.9aQf%»fÃÃA‹ */
+	$"90A4 F6F7 BD30 7A04 88E6 0F8A 3F0B FF2C"            /* �¤ö÷½0z.ˆæ.Š?.ÿ, */
+	$"D18B 1D88 1442 EB54 A6FC D226 251A 015D"            /* Ñ‹.ˆ.BëT¦üÒ&%..] */
+	$"4DA8 32CA 371B 86EB 4E89 1415 9A41 6AD2"            /* M¨2Ê7.†ëN‰..šAjÒ */
+	$"1F0F 7656 41E5 B874 72E7 5F88 ABDA 28D7"            /* ..vVAå¸trç_ˆ«Ú(× */
+	$"37D5 EE40 567F F751 2591 01A3 03B9 EFCD"            /* 7Õî@V.÷Q%‘.£.¹ïÍ */
+	$"E0A8 8CC8 8C8E 0945 3036 453A 1787 59C4"            /* ਌ȌŽÆE06E:.‡YÄ */
+	$"B99C 02D2 D5F6 1B5E E34C 551E 8C43 9A20"            /* ¹œ.ÒÕö.^ãLU.ŒCš  */
+	$"981D 0B44 C6D1 E6AA 2B92 5F33 8016 C4F1"            /* ˜..DÆÑæª+’_3€.Äñ */
+	$"7AA6 E605 4676 A533 1D38 6ADA 9BC6 2C13"            /* z¦æ.Fv¥3.8jÚ›Æ,. */
+	$"385A 3DCE 7E2E B9A1 81BB 27C6 AFF8 FF5D"            /* 8Z=Î~.¹¡�»'Ưøÿ] */
+	$"A511 4C25 DC70 082C B597 3EC4 004C D4B8"            /* ¥.L%Üp.,µ—>Ä.LÔ¸ */
+	$"BE6A B79D EF70 2610 B57B FEFE 6ACC 9EEE"            /* ¾j·�ïp&.µ{þþjÌžî */
+	$"B94A 73A8 4B30 C207 7391 789E C0FE 6992"            /* ¹Js¨K0Â.s‘xžÀþi’ */
+	$"AB13 E2AA FF53 4B22 A338 0EA3 B476 D732"            /* «.âªÿSK"£8.£´v×2 */
+	$"EDA3 2009 3422 B4AA 64DE 26C3 5894 D6DD"            /* í£ Æ4"´ªdÞ&ÃX”ÖÝ */
+	$"F7A9 5A3B 6F31 5D2C EC22 1FAC 928B 647F"            /* ÷©Z;o1],ì".¬’‹d. */
+	$"1600 A961 11C3 FD11 E594 81F9 E0AC 20D4"            /* ..©a.Ãý.å”�ùà¬ Ô */
+	$"0DCA 9CE0 FF14 3BE3 3010 00E1 9DFE F0C8"            /* .Êœàÿ.;ã0..á�þðÈ */
+	$"70E7 D3A5 A7F9 884E 6941 CBCB FEBE 0C27"            /* pçÓ¥§ùˆNiAËËþ¾.' */
+	$"B3F5 BAA4 3068 BFC1 DB20 1E5F 9E83 BF7D"            /* ³õº¤0h¿ÁÛ ._žƒ¿} */
+	$"8EA3 8FB0 F355 FF02 DED2 5CC8 2B4D 4DA5"            /* Ž£�°óUÿ.ÞÒ\È+MM¥ */
+	$"8122 C96A CDAB B130 2D35 B73E 2EE9 0AA9"            /* �"ÉjÍ«±0-5·>.é© */
+	$"7DB8 B81D 7B0A 776B DFF3 2B02 1F6A EF5B"            /* }¸¸.{Âwkßó+..jï[ */
+	$"E6A6 177F D8C0 1C3B A88C 2154 18F3 BFB3"            /* æ¦..ØÀ.;¨Œ!T.ó¿³ */
+	$"F7EF 1249 860B F87F 60D6 AE06 B5B2 7824"            /* ÷ï.I†.ø.`Ö®.µ²x$ */
+	$"E601 91D7 1436 80CF 054C 9691 1321 B299"            /* æ.‘×.6€Ï.L–‘.!²™ */
+	$"11F3 2BA3 51F6 447E 1BC0 28CB 666B 9BA0"            /* .ó+£QöD~.À(Ëfk›  */
+	$"425A E39B 066C 1B7C 340B 950A BDCC E05D"            /* BZã›.l.|4.•Â½Ìà] */
+	$"C8DC 568C BDC6 54E9 0AA2 2D89 6E22 37E4"            /* ÈÜVŒ½ÆTé¢-‰n"7ä */
+	$"3508 39CC EE8F 8EE6 F926 626B E33F 4A06"            /* 5.9Ìî�Žæù&bkã?J. */
+	$"4CD1 AE16 9063 3119 5554 58CA BB53 4A73"            /* LѮ.�c1.UTXʻSJs */
+	$"AA2B 2A71 B86B 3E95 BED6 D9D2 9D59 3E60"            /* ª+*q¸k>•¾ÖÙÒ�Y>` */
+	$"C5D1 FA4C E6A7 880F 30D8 A679 6467 697E"            /* ÅÑúL槈.0ئydgi~ */
+	$"F327 EAA4 E0D1 01F9 9B74 AAA1 6CDD 7DA7"            /* ó'ê¤àÑ.ù›tª¡lÝ}§ */
+	$"D2AB C9CB 63D6 D3DF C778 C6ED 71A5 0571"            /* Ò«ÉËcÖÓßÇxÆíq¥.q */
+	$"C7E1 4EC7 E16C 43F0 75B1 3C9E 91EA AAAC"            /* ÇáNÇálCðu±<ž‘ꪬ */
+	$"9A2E A47E 8DF0 873E 2275 3F71 F986 DF3D"            /* š.¤~�ð‡>"u?qù†ß= */
+	$"DBE5 1F4C 0D83 C3F5 F2D4 5A7C 0BFB E4FC"            /* Ûå.L.ƒÃõòÔZ|.ûäü */
+	$"C83E D8A4 FAF4 F589 09F2 4909 40AA 2AA8"            /* È>ؤúôõ‰ÆòIÆ@ª*¨ */
+	$"C190 BE4D D484 1408 6EAD 722F 6BA6 7502"            /* Á�¾MÔ„..n­r/k¦u. */
+	$"A53F 1B9A BE86 841A FC60 53F3 8AE9 2E4C"            /* ¥?.š¾†„.ü`SóŠé.L */
+	$"4B8E 1D09 F47C 3BAA CFB7 80DE 6A41 F007"            /* KŽ.Æô|;ªÏ·€ÞjAð. */
+	$"80A3 413A C568 5C02 6166 E8AF 9B6C EF86"            /* €£A:Åh\.af诛lï† */
+	$"F178 273B A803 89E9 520A ACFC 0E98 6198"            /* ñx';¨.‰éR¬ü.˜a˜ */
+	$"6ECE D094 76D1 8AF8 1035 D0C8 B9E5 ECC9"            /* nÎДvÑŠø.5ÐȹåìÉ */
+	$"08E6 748A F28B B0E0 F9AB 71B4 7971 9626"            /* .ætŠò‹°àù«q´yq–& */
+	$"5397 5D5A 31CB 5F9E 7C98 8300 72B1 2C67"            /* S—]Z1Ë_ž|˜ƒ.r±,g */
+	$"A38D 0C02 C603 C0C2 2000 E528 0CAA 9472"            /* £�..Æ.À .å(.ª”r */
+	$"3115 8C05 0EE6 3F33 3F6D B6DB 64C7 AAB2"            /* 1.Œ..æ?3?m¶ÛdǪ² */
+	$"94EA DD85 D3DF F14E FF3F D3A2 778B 3749"            /* ”êÝ…ÓßñNÿ?Ó¢w‹7I */
+	$"B31B 6DB6 C5B6 5311 C782 3FCF 2880 6695"            /* ³.m¶Å¶S.Ç‚?Ï(€f• */
+	$"085A 35C2 3938 420E 8705 50BD 51C3 BD21"            /* .Z5Â98B.‡.P½Qý! */
+	$"41B9 C3ED 3A76 367F 40F5 DA53 3618 DF7A"            /* A¹Ãí:v6.@õÚS6.ßz */
+	$"EE11 B2D6 D9AD 4351 7D8F BC5A 7217 9352"            /* î.²ÖÙ­CQ}�¼Zr.“R */
+	$"D43F 54B9 F618 3E0E 5FF8 1599 CD00 5489"            /* Ô?T¹ö.>._ø.™Í.T‰ */
+	$"459D 1B65 0538 7A92 D8EC 6AD5 E756 776E"            /* E�.e.8z’ØìjÕçVwn */
+	$"5B66 A07C 36D6 A4B0 2E00 21E0 ABFC 2AB8"            /* [f |6Ö¤°..!à«ü*¸ */
+	$"F387 5784 0DB9 1978 67FE DEFF 0CCC CCCC"            /* ó‡W„.¹.xgþÞÿ.ÌÌÌ */
+	$"CCCC CCCC CCCC CCD3 5F84 850A F245 C370"            /* ÌÌÌÌÌÌÌÓ_„…ÂòEÃp */
+	$"786E 76C5 56A5 8C9B FC7F 6869 3085 EB26"            /* xnvÅV¥Œ›ü.hi0…ë& */
+	$"6162 A234 8BF4 868D 0BA5 77FA 56D2 31FD"            /* ab¢4‹ô†�.¥wúVÒ1ý */
+	$"7436 0147 944C 2AAE C8C1 DE46 2A3A 2449"            /* t6.G”L*®ÈÁÞF*:$I */
+	$"EAD0 8E9E FF0B 129F 7F9C 1436 A6BC 10E6"            /* êÐŽžÿ..Ÿ.œ.6¦¼.æ */
+	$"3116 7A98 5FF6 97E9 FC84 7136 FEA5 C122"            /* 1.z˜_ö—éü„q6þ¥Á" */
+	$"E58F 44D6 D7A4 0AD3 E9B4 7C91 B833 1F91"            /* å�DÖפÂÓé´|‘¸3.‘ */
+	$"5F0F D8F7 8A80 6560 B332 081A C68D 0FF9"            /* _.Ø÷Š€e`³2..Æ�.ù */
+	$"899F 2CC7 E1D6 FC7E 1DEB C3ED EA04 F55D"            /* ‰Ÿ,ÇáÖü~.ëÃíê.õ] */
+	$"017D B775 48A1 A844 EAB2 8E3A 5FF2 20AF"            /* .}·uH¡¨D겎:_ò ¯ */
+	$"6231 D1B0 D4D9 D308 999B 09F2 95B1 7071"            /* b1Ñ°ÔÙÓ.™›Æò•±pq */
+	$"F57C 1F1E 7960 4639 6A62 5BC6 9E5A D45D"            /* õ|..y`F9jb[ÆžZÔ] */
+	$"F339 9597 BF1B 62EB D128 B3D8 9BD3 52BF"            /* ó9•—¿.bëÑ(³Ø›ÓR¿ */
+	$"0703 43F9 E1C7 940E EA41 F4B1 75E4 891F"            /* ..CùáÇ”.êAô±uä‰. */
+	$"09A4 D439 7DFF 6AB7 EB4F 1253 A9C0 8BBE"            /* ƤÔ9}ÿj·ëO.S©À‹¾ */
+	$"40A0 3CE6 965D F886 A9EF 7E69 712D 41C2"            /* @ <æ–]ø†©ï~iq-A */
+	$"0062 6917 5D06 6548 9FD6 1470 4A0C 8545"            /* .bi.].eHŸÖ.pJ.…E */
+	$"8417 6C73 0C2D DF44 0E4A D5F9 7443 D629"            /* „.ls.-ßD.JÕùtCÖ) */
+	$"E62D DE53 CCFA EAEA E08A F0E1 9D37 9616"            /* æ-ÞSÌúêêàŠðá�7–. */
+	$"C0DA 1FD4 6A42 6CE6 1D10 AB6A 911A 19D2"            /* ÀÚ.ÔjBlæ..«j‘..Ò */
+	$"47A0 4AC5 6A3C 12FF 0FE8 3AFB 7DFD 3D27"            /* G JÅj<.ÿ.è:û}ý=' */
+	$"42C6 E2BA 6DDE D1ED 21CE 1EA0 F444 055B"            /* BÆâºmÞÑí!Î. ôD.[ */
+	$"122A 41EE D8C1 144C B39C 0EEA 014E 7448"            /* .*AîØÁ.L³œ.ê.NtH */
+	$"0B72 7C2C 92B6 0CAC 3CB5 ADA7 8BF8 0C56"            /* .r|,’¶.¬<µ­§‹ø.V */
+	$"1DD5 B763 907F 6B60 8A85 ED4A F87D FBDC"            /* .Õ·c�.k`Š…íJø}ûÜ */
+	$"391D 822B CBF5 7266 0E6B B2D4 32DE 606C"            /* 9.‚+Ëõrf.k²Ô2Þ`l */
+	$"014E 64BF F969 E3A5 C8E4 09EC B205 6391"            /* .Nd¿ùiã¥ÈäÆì².c‘ */
+	$"3081 96F5 9A80 0599 50D2 38FF 635B 9C35"            /* 0�–õš€.™PÒ8ÿc[œ5 */
+	$"97CF A325 D94F B8E1 A794 EABC DA8A 7CC3"            /* —Ï£%ÙO¸á§”ê¼ÚŠ|à */
+	$"8713 2EBB 1EA6 69B0 9A72 A93D 874A 1F30"            /* ‡..».¦i°šr©=‡J.0 */
+	$"4C7B B341 B8CF F61E 7CEE 60CC E9B0 6D85"            /* L{³A¸Ïö.|î`Ìé°m… */
+	$"4F96 977D F85D F85A 08AF 46EF F259 FD70"            /* O–—}ø]øZ.¯FïòYýp */
+	$"E364 C54D 1F3D C951 B1DD 2CB4 8B94 9350"            /* ãdÅM.=ÉQ±Ý,´‹”“P */
+	$"8FFC CD4E D39E 2FF5 DC65 9DB7 2133 6E97"            /* �üÍNÓž/õÜe�·!3n— */
+	$"9705 2AA6 2625 534E B2A2 D775 FCFA 60E0"            /* —.*¦&%SN²¢×uüú`à */
+	$"4929 3681 2E72 5087 F3CD FB3A 6386 36A2"            /* I)6�.rP‡óÍû:c†6¢ */
+	$"5E62 8705 57E4 8441 1986 1487 E88F C834"            /* ^b‡.Wä„A.†.‡è�È4 */
+	$"C59D D57C CCA2 D56F 3889 44AC 0E4D 0E88"            /* Å�Õ|Ì¢Õo8‰D¬.M.ˆ */
+	$"2592 A50A F98D DF1D 17F2 78BD D4AB FDB4"            /* %’¥Âù�ß..òx½Ô«ý´ */
+	$"4249 FBDE 3E56 BE58 B587 88B4 8D75 299F"            /* BIûÞ>V¾Xµ‡ˆ´�u)Ÿ */
+	$"4C92 6D9A 6B17 6153 9A65 4770 E0EC BBEF"            /* L’mšk.aSšeGpàì»ï */
+	$"2F91 8C35 8FFA 04AF 880C D9B6 204A D65E"            /* /‘Œ5�ú.¯ˆ.Ù¶ JÖ^ */
+	$"68DD DBE7 63BC E1C5 CCDD E994 3796 10EF"            /* hÝÛçc¼áÅÌÝé”7–.ï */
+	$"354D C0E7 7A72 E57E EFAC 7C75 E4CE F47F"            /* 5MÀçzrå~ï¬|uäÎô. */
+	$"2E82 A8D0 6401 3CC4 1ACC 4513 1211 DCC9"            /* .‚¨Ðd.<Ä.ÌE...ÜÉ */
+	$"BD7A 47CA F093 83C7 38EB 866D 1ED5 AC6C"            /* ½zGÊð“ƒÇ8ë†m.Õ¬l */
+	$"FF01 C348 CFA1 2532 DAD5 2BDD 8CCC 71C1"            /* ÿ.ÃHÏ¡%2ÚÕ+ÝŒÌqÁ */
+	$"1208 75AA 308B 4796 A89E 0EAF AB67 422A"            /* ..uª0‹G–¨ž.¯«gB* */
+	$"AA43 8162 68BC 9878 8578 419C AB2E 9518"            /* ªC�bh¼˜x…xAœ«.•. */
+	$"A9E0 4298 DB46 36D7 ADD0 DE21 DC41 AEA7"            /* ©àB˜ÛF6×­ÐÞ!ÜA®§ */
+	$"A05D 795D AB14 E247 6750 3EA8 0A31 5A06"            /*  ]y]«.âGgP>¨Â1Z. */
+	$"FAEC AD07 ECF7 C636 A068 22AA E179 7613"            /* úì­.ì÷Æ6 h"ªáyv. */
+	$"30F9 831C 0AFA 38C0 E20B 96A9 464E B57A"            /* 0ùƒ.Âú8Àâ.–©FNµz */
+	$"5AF3 D612 DC70 2A8D 1D09 C7C9 967F 7F7B"            /* ZóÖ.Üp*�.ÆÇÉ–..{ */
+	$"F47F 4017 A722 9853 37C2 DE55 34CF 104E"            /* ô.@.§"˜S7ÂÞU4Ï.N */
+	$"9DD3 35DF DEE2 589C FAF1 07DE 1803 86B1"            /* �Ó5ßÞâXœúñ.Þ..†± */
+	$"2DE6 6B46 FC45 F24E 8718 3B6E D557 8008"            /* -ækFüEòN‡.;nÕW€. */
+	$"FF3B 8EC2 28BD 6146 3EF6 A0FB 0BCA 37C1"            /* ÿ;ŽÂ(½aF>ö û.Ê7Á */
+	$"749B 49F2 F419 9EC5 DC0A A6DE 0CFC 1BD2"            /* t›Iòô.žÅܦÞ.ü.Ò */
+	$"AAF5 4920 1AB3 842A 1813 606E 97CD 0EC2"            /* ªõI .³„*..`n—Í. */
+	$"50D4 84CD F427 569F 776D 940A A6F7 68D7"            /* PÔ„Íô'VŸwm”¦÷h× */
+	$"2A18 4C6D 2056 D254 1226 7F3C 1ED0 7AB8"            /* *.Lm VÒT.&.<.Ðz¸ */
+	$"BEFE 2050 50E6 C5FB 173C 1857 FF7F 86D9"            /* ¾þ PPæÅû.<.Wÿ.†Ù */
+	$"6CE3 E235 1AFA CBB4 D2BE 4E64 9713 B880"            /* lãâ5.úË´Ò¾Nd—.¸€ */
+	$"0C41 2E14 401B D14F 5BA4 AD20 7060 C05E"            /* .A..@.ÑO[¤­ p`À^ */
+	$"2011 000E C557 2951 009C A584 6178 50E8"            /*  ...ÅW)Q.œ¥„axPè */
+	$"6E0D 922F BFF7 EC41 A907 0D2B EF09 3CE0"            /* n.’/¿÷ìA©..+ïÆ<à */
+	$"6344 B3D6 742A 0448 042D 44C3 390B 089B"            /* cD³Öt*.H.-DÃ9..› */
+	$"B0FF 2877 1C62 BE1E AC48 09B0 4667 19BC"            /* °ÿ(w.b¾.¬HÆ°Fg.¼ */
+	$"319D 1FEA ABB5 1EE9 02D8 C845 A20C 2E3F"            /* 1�.ꫵ.é.ØÈE¢..? */
+	$"7010 FA38 E2A0 1F01 2933 0557 19BD 9DCD"            /* p.ú8â ..)3.W.½�Í */
+	$"5486 F044 5838 C953 CC32 2DF8 6A04 30ED"            /* T†ðDX8ÉSÌ2-øj.0í */
+	$"2C42 0A7D 1B38 7F94 4936 5908 39F1 424F"            /* ,BÂ}.8.”I6Y.9ñBO */
+	$"2BFF 7F46 F53E 11D3 DA1E 41B4 67AB 296E"            /* +ÿ.Fõ>.ÓÚ.A´g«)n */
+	$"0B59 6213 9E16 1568 8787 ED75 8822 A102"            /* .Yb.ž..h‡‡íuˆ"¡. */
+	$"DAAC D7D6 FA63 ED91 52D2 E98C 6EEB ABBB"            /* Ú¬×Öúcí‘RÒéŒnë«» */
+	$"5465 7C7C 0CEB 3016 0CC6 5793 D7FF 7FFB"            /* Te||.ë0..ÆW“×ÿ.û */
+	$"34E7 7BDE 794E 6D8C 392D 051A 478B 4AD7"            /* 4ç{ÞyNmŒ9-..G‹J× */
+	$"028C 3119 EDCA 833C 2F1B A23A 5C69 908F"            /* .Œ1.íʃ</.¢:\i�� */
+	$"6F17 C143 83FF 31A8 709D 7BFA B0E4 A884"            /* o.ÁCƒÿ1¨p�{ú°ä¨„ */
+	$"E3DC 88CC DF54 C132 6671 A0D0 B4C3 7721"            /* ã܈ÌßTÁ2fq Ð´Ãw! */
+	$"B5F0 84FF 0FDA 1588 5865 1B6B 94E3 9B46"            /* µð„ÿ.Ú.ˆXe.k”ã›F */
+	$"5CA1 7767 09F4 3448 2242 114C 2705 2C38"            /* \¡wgÆô4H"B.L'.,8 */
+	$"4565 F286 ABC2 AFF5 809D 0C5B BB5E 009C"            /* Eeò†«Â¯õ€�.[»^.œ */
+	$"FCBA BC4C 84FF 45EF F42B 3F8E DEE0 A531"            /* üº¼L„ÿEïô+?ŽÞà¥1 */
+	$"DBBB 2113 7C30 8BB7 76FF 7E55 E6BC 012B"            /* Û»!.|0‹·vÿ~Uæ¼.+ */
+	$"EBDE EF62 0981 DCE1 AC6E 5AD7 D8AD 0560"            /* ëÞïbÆ�Üá¬nZ×Ø­.` */
+	$"5B36 3A62 5B57 3E03 75AC 25FB B396 1086"            /* [6:b[W>.u¬%û³–.† */
+	$"5EF0 4C11 ACE0 90D2 6568 EB55 75AB FF24"            /* ^ðL.¬à�ÒehëUu«ÿ$ */
+	$"54B8 0E77 3110 5C67 3138 8369 5BEA 3458"            /* T¸.w1.\g18ƒi[ê4X */
+	$"7FFE 6000 9940 0044 18C6 1A34 14B6 9CD2"            /* .þ`.™@.D.Æ.4.¶œÒ */
+	$"C039 2A00 00CC 8F27 9EFE FF80 1CAA 8000"            /* À9*..Ì�'žþÿ€.ª€. */
+	$"0000 0000 D9B1 C1D0 BFE1 D01D 2DD4 E3DF"            /* ....Ù±ÁпáÐ.-Ôãß */
+	$"949B 6DB6 DB6D B83D 6B98 82BC 446D 0CB3"            /* ”›m¶Ûm¸=k˜‚¼Dm.³ */
+	$"55A5 C140 D9E5 5E98 37AF 0E38 4474 B8DC"            /* U¥Á@Ùå^˜7¯.8Dt¸Ü */
+	$"FCFA B14E BD14 730B DAA0 4B18 1B4D 81E7"            /* üú±N½.s.Ú K..M�ç */
+	$"B8A8 26E7 EFB0 8272 4619 2A00 0000 0000"            /* ¸¨&çï°‚rF.*..... */
+	$"0000 0000 0000 060D CD91 05BE 3A07 80DE"            /* ........Í‘.¾:.€Þ */
+	$"29D6 2680 7867 5359 9411 F430 48D9 A22D"            /* )Ö&€xgSY”.ô0HÙ¢- */
+	$"DF74 0855 C0C4 C5AA D3F4 FC40 5815 C5FC"            /* ßt.UÀÄŪÓôü@X.Åü */
+	$"B741 3001 FF7F FDC6 00B8 F1BA FEC9 B662"            /* ·A0.ÿ.ýÆ.¸ñºþɶb */
+	$"4973 2EE9 5029 E237 296D D4A4 04DE 4DB9"            /* Is.éP)â7)mÔ¤.ÞM¹ */
+	$"5305 FD42 9A82 6842 EF09 9DA2 201D C6EF"            /* S.ýBš‚hBïÆ�¢ .Æï */
+	$"4078 4FC3 038C B201 A1C0 0791 7B09 CF18"            /* @xOÃ.Œ².¡À.‘{ÆÏ. */
+	$"D61B DABD 0409 372B F69D 3CF8 E2E1 31A1"            /* Ö.Ú½.Æ7+ö�<øâá1¡ */
+	$"023B B0FD 60B3 3933 16F2 C716 9259 82F8"            /* .;°ý`³93.òÇ.’Y‚ø */
+	$"77BB 3A47 46D2 D998 7AA1 01E1 DF78 8000"            /* w»:GFÒÙ˜z¡.áßx€. */
+	$"0000 0001 D8FD 4FB2 C620 0000 005A CD78"            /* ....ØýO²Æ ...ZÍx */
+	$"B755 53CD E910 3B50 96A8 4000 0000 0003"            /* ·USÍé.;P–¨@..... */
+	$"FD6F 5DD1 31D8 A087 6BC5 09F3 E81E B49F"            /* ýo]Ñ1Ø ‡kÅÆóè.´Ÿ */
+	$"5A88 0DB9 2492 4924 9234 EE49 0E46 EE5B"            /* Zˆ.¹$’I$’4îI.Fî[ */
+	$"8D2A E866 7AD0 1F3C 936D 50EF 6EF5 FDE7"            /* �*èfzÐ.<“mPïnõýç */
+	$"BFFE 6EFF 82AD 0EDF 556D B01D C573 CA68"            /* ¿þnÿ‚­.ßUm°.ÅsÊh */
+	$"985A F307 82C5 D933 4C26 B9EE EEF7 D4C6"            /* ˜Zó.‚ÅÙ3L&¹îî÷ÔÆ */
+	$"BFB5 4130 F610 4AFE 602E 3723 0C95 0000"            /* ¿µA0ö.Jþ`.7#.•.. */
+	$"0000 0000 0000 0000 0002 7F7E DE44 DDEB"            /* ...........~ÞDÝë */
+	$"B8B1 0AB8 BA80 7F79 D59C 851A 0244 B8D1"            /* ¸±Â¸º€.yÕœ…..D¸Ñ */
+	$"6B92 AB1A 4997 5556 C0C7 5935 05AD B380"            /* k’«.I—UVÀÇY5.­³€ */
+	$"318D A387 1E5F 1523 0170 B5DB D9FA 0E80"            /* 1�£‡._.#.pµÛÙú.€ */
+	$"7342 6634 1E36 FB10 615A 1862 FF53 1545"            /* sBf4.6û.aZ.bÿS.E */
+	$"C795 B42C 8282 534C 3AFD D370 7621 820E"            /* Ç•´,‚‚SL:ýÓpv!‚. */
+	$"9EDA AF3A 476B 3537 E327 52DE 4A99 73D1"            /* žÚ¯:Gk57ã'RÞJ™sÑ */
+	$"0718 7C16 82D5 99A5 32DD 0E83 9C4F 60F8"            /* ..|.‚Õ™¥2Ý.ƒœO`ø */
+	$"0743 325D 2056 84FF 06BC C6BB 338C 64CF"            /* .C2] V„ÿ.¼Æ»3ŒdÏ */
+	$"B7B9 C4C7 9800 E4DA EE0A 6636 DEE8 B8F8"            /* ·¹Äǘ.äÚîÂf6Þè¸ø */
+	$"739E 1EBD 408C C620 9790 A337 E987 2E54"            /* sž.½@ŒÆ —�£7é‡.T */
+	$"DD4A E501 C0BF 44E6 E8EF ACCF 028F 253C"            /* ÝJå.À¿Dæèï¬Ï.�%< */
+	$"F466 FA92 BEE6 A066 F4B6 5B41 CA80 3567"            /* ôfú’¾æ fô¶[AÊ€5g */
+	$"A079 E31D CEE9 CD64 0AED 265D E591 B98C"            /*  yã.ÎéÍdÂí&]呹Œ */
+	$"DF22 C203 3C43 E1D8 5D64 CA99 E6C7 EF30"            /* ß"Â.<CáØ]dÊ™æÇï0 */
+	$"68AF F4C9 97D5 F961 48CF 954C 2832 33A3"            /* h¯ôÉ—ÕùaHÏ•L(23£ */
+	$"0088 1417 0D84 DDE1 23FA C81D 487D C9AB"            /* .ˆ...„Ýá#úÈ.H}É« */
+	$"F239 ABB4 24E0 6694 291C 885C 23CE F212"            /* ò9«´$àf”).ˆ\#Îò. */
+	$"29F4 5656 7DD1 182A 2C11 AAEF 7534 24EE"            /* )ôVV}Ñ.*,.ªïu4$î */
+	$"9886 347F 28AD 6952 0A82 E9A4 6AA9 9390"            /* ˜†4.(­iR‚é¤j©“� */
+	$"06A8 EF47 527A EDF2 894B 5234 A900 82B1"            /* .¨ïGRzíò‰KR4©.‚± */
+	$"724D 791B 676C BC97 B3A5 94F7 137E FE8D"            /* rMy.gl¼—³¥”÷.~þ� */
+	$"50F5 C1EE 0C5B 1F3D CEF4 DD64 709C 095B"            /* PõÁî.[.=ÎôÝdpœÆ[ */
+	$"A51A B239 3EC3 C9BA 39EC DBE2 FB9A 3C6F"            /* ¥.²9>Ãɺ9ìÛâûš<o */
+	$"BBC4 DE3E C5AF 0043 DC2D AE64 C0A7 2039"            /* »ÄÞ>ů.CÜ-®dÀ§ 9 */
+	$"A6C9 6079 72D6 0BC7 C501 A3A4 5EF4 A060"            /* ¦É`yrÖ.ÇÅ.£¤^ô ` */
+	$"C46E FCB9 1958 AD83 1176 0776 81C2 13C2"            /* Änü¹.X­ƒ.v.v�Â. */
+	$"DF08 4A76 137F DC5C 4867 0493 EE96 8373"            /* ß.Jv..Ü\Hg.“î–ƒs */
+	$"4644 13A4 F789 39FF 813B D226 575A 5A18"            /* FD.¤÷‰9ÿ�;Ò&WZZ. */
+	$"3AF5 4B88 2747 3D47 681F 9670 0069 DD02"            /* :õKˆ'G=Gh.–p.iÝ. */
+	$"4252 ADB0 D6FB F1F1 1432 C24B D920 7290"            /* BR­°Öûññ.2ÂKÙ r� */
+	$"3709 3D60 15D9 0C49 23EC 77F8 F791 F132"            /* 7Æ=`.Ù.I#ìwø÷‘ñ2 */
+	$"046E 0D05 9AFA 210A 9992 29D9 7AA6 F18E"            /* .n..šú!™’)Ùz¦ñŽ */
+	$"E245 75E0 018F BCEB 8D1B C2D0 083E 985F"            /* âEuà.�¼ë�.ÂÐ.>˜_ */
+	$"B791 554D F5F5 AD71 E064 75E6 1F3A D463"            /* ·‘UMõõ­qàduæ.:Ôc */
+	$"9A59 0A43 3457 BD7C 44A7 5C5E 9D19 C5D8"            /* šYÂC4W½|D§\^�.ÅØ */
+	$"5880 C2CC 5DF0 2964 C0FD ABA1 004B 008D"            /* X€ÂÌ]ð)dÀý«¡.K.� */
+	$"5205 7F2E 0843 E484 2D37 9C34 2425 7AFF"            /* R....Cä„-7œ4$%zÿ */
+	$"7021 D907 B6E1 F5E5 02C3 F3DD 44C8 2252"            /* p!Ù.¶áõå.ÃóÝDÈ"R */
+	$"0649 3C1A 1A80 449A 64D1 1720 76D6 4987"            /* .I<..€DšdÑ. vÖI‡ */
+	$"B4B1 E749 E899 BF69 5B35 F925 2EE6 6CE6"            /* ´±çI虿i[5ù%.ælæ */
+	$"B4FD CEB3 54C0 7C9D 4380 F93B 5701 F274"            /* ´ýγTÀ|�C€ù;W.òt */
+	$"C4F3 CC20 F972 1FD1 56B3 911D 2995 5FC9"            /* ÄóÌ ùr.ÑV³‘.)•_É */
+	$"1F35 BAE0 9AC7 3082 1372 C1D5 4B23 D79E"            /* .5ºàšÇ0‚.rÁÕK#מ */
+	$"EF63 A93F 8E74 26FB AC68 CDBE BD3E 9720"            /* ïc©?Žt&û¬h;½>—  */
+	$"DF71 956D 5D26 559E 2795 2F1B F798 7821"            /* ßq•m]&Už'•/.÷˜x! */
+	$"F3CB 1E6F 2351 11BD 0EFF 19B2 40A2 1C7F"            /* óË.o#Q.½.ÿ.²@¢.. */
+	$"267D D302 F6AE 5410 1E96 40DC 386E CB7B"            /* &}Ó.ö®T..–@Ü8nË{ */
+	$"7EA3 5CF7 46BA 8758 D0EE 12B3 34DF 46FE"            /* ~£\÷Fº‡XÐî.³4ßFþ */
+	$"517B E0F8 7E28 83A5 E93A C06D 7C3F 254B"            /* Q{àø~(ƒ¥é:Àm|?%K */
+	$"53DF 91ED F6AB FD0A 53A0 5257 F9B8 E8B7"            /* Sß‘íö«ýÂS RWù¸è· */
+	$"5A14 6036 C6DA E3FE C29D 799F 8B43 46D6"            /* Z.`6ÆÚãþÂ�yŸ‹CFÖ */
+	$"94DF 1954 073C 7C30 40F4 A00D 93D4 AADF"            /* ”ß.T.<|0@ô .“ﻧ */
+	$"4839 EF36 F92A 3758 97CE 955A 3521 3CB5"            /* H9ï6ù*7X—ΕZ5!<µ */
+	$"8269 30A7 2A93 6A40 07BE DCC3 50B6 C86B"            /* ‚i0§*“j@.¾ÜÃP¶Èk */
+	$"CE9A AF28 3B80 4FE6 873C DB8E A29C 15DC"            /* Κ¯(;€Oæ‡<ÛŽ¢œ.Ü */
+	$"81A8 F841 4F77 6237 7267 55C4 1289 2DA1"            /* �¨øAOwb7rgUÄ.‰-¡ */
+	$"8392 424A 398F 9FA7 8DBE 2CC6 44E9 A005"            /* ƒ’BJ9�Ÿ§�¾,ÆDé . */
+	$"0E57 6638 ADDD 9F15 D32E 13A9 F752 67BA"            /* .Wf8­ÝŸ.Ó..©÷Rgº */
+	$"9F1D 753C 0023 2BC1 2C48 19AF FF28 66E6"            /* Ÿ.u<.#+Á,H.¯ÿ(fæ */
+	$"0A05 1D62 536F C372 7DEC 5069 B44D AFD4"            /* Â..bSoÃr}ìPi´M¯Ô */
+	$"BE3C 9C16 161E 95B4 89E7 B034 4524 E373"            /* ¾<œ...•´‰ç°4E$ãs */
+	$"D4A2 2F82 F1BB 8F20 7861 0F95 7CDF C184"            /* Ô¢/‚ñ»� xa.•|ßÁ„ */
+	$"5B65 6015 001B F6BD 5D52 D4BC 3A42 FD56"            /* [e`...ö½]RÔ¼:BýV */
+	$"D48F 3358 7432 09BD FF19 625D 3A11 13DA"            /* Ô�3Xt2ƽÿ.b]:..Ú */
+	$"F222 12E8 5A1B 12BF 9B3B A234 A367 8FB6"            /* ò".èZ..¿›;¢4£g�¶ */
+	$"4BF2 EE99 DB11 5D13 7021 71B4 2280 A1BC"            /* Kòî™Û.].p!q´"€¡¼ */
+	$"2AEF ECB5 D7EC 047C 0860 9676 78B1 CA76"            /* *ïìµ×ì.|.`–vx±Êv */
+	$"9AFB C995 D4EB 900A AD98 6423 E572 B68C"            /* šûÉ•Ôë�­˜d#år¶Œ */
+	$"A271 A30B D157 8E95 8250 29BB 0323 E26C"            /* ¢q£.ÑWŽ•‚P)».#âl */
+	$"9223 91C7 0CD4 F0B0 442E 1BD3 1473 C699"            /* ’#‘Ç.Ôð°D..Ó.sÆ™ */
+	$"2D1C 8791 C699 920E 72C0 0D3E F6E9 9E2B"            /* -.‡‘Æ™’.rÀ.>öéž+ */
+	$"60B6 A87F 6CBE 146C 1224 90FC BF7B C6A9"            /* `¶¨.l¾.l.$�ü¿{Æ© */
+	$"090E 3EAD C89D 5065 414B 3A1C F271 9327"            /* Æ.>­È�PeAK:.òq“' */
+	$"D490 CD2B FBB3 BEFF 768D 4601 635B A746"            /* Ô�Í+û³¾ÿv�F.c[§F */
+	$"8A4B 0981 8B8F EA85 D255 2113 8792 CC76"            /* ŠKÆ�‹�ê…ÒU!.‡’Ìv */
+	$"DE84 B950 C5F4 A4C1 D4EF 7D52 CC74 CCEE"            /* Þ„¹PÅô¤ÁÔï}RÌtÌî */
+	$"B40E B94F 9467 15CA 1DE0 3557 BF09 D787"            /* ´.¹O”g.Ê.à5W¿Æׇ */
+	$"ED66 345A E153 B4DC EF7C 2952 3161 5A99"            /* íf4ZáS´Üï|)R1aZ™ */
+	$"A193 D5EB 40F5 1300 65FA 8DFD 621A AE94"            /* ¡“Õë@õ..eú�ýb.®” */
+	$"30CD 6D25 A0FC 942E 37AC 52C8 CEAD 2D1F"            /* 0Ím% ü”.7¬RÈέ-. */
+	$"87D5 D078 F173 F5AD 7A56 DD1B 10C3 F9BF"            /* ‡ÕÐxñsõ­zVÝ..Ãù¿ */
+	$"69C1 9E6B E021 A0C7 84BF D87A 8AA8 327C"            /* iÁžkà! Ç„¿ØzŠ¨2| */
+	$"7D48 0D97 E584 FF7F AE07 2001 BF6C 2691"            /* }H.—å„ÿ.®. .¿l&‘ */
+	$"3032 E118 8741 42AD 7709 3086 8488 F9D3"            /* 02á.‡AB­wÆ0†„ˆùÓ */
+	$"0353 D79E 2E21 8F21 46CC 005C DA8A 0229"            /* .Sמ.!�!FÌ.\ÚŠ.) */
+	$"A56B A72A C69E FCF7 7558 5D72 0050 2BDE"            /* ¥k§*Æžü÷uX]r.P+Þ */
+	$"0F36 E4F0 C744 89FC 37F0 7ECA F488 FE8C"            /* .6äðÇD‰ü7ð~ÊôˆþŒ */
+	$"1B6B 0158 B34D 1EA6 9B1F 154E FF79 01D4"            /* .k.X³M.¦›..Nÿy.Ô */
+	$"725F D9CF D9BF CCFF 439D 8F5C A92D D20D"            /* r_ÙÏÙ¿ÌÿC��\©-Ò. */
+	$"0613 88F8 5C1C B6BD 07B9 9078 151D 8353"            /* ..ˆø\.¶½.¹�x..ƒS */
+	$"0E68 8495 D521 92D8 E92D CF9B 10E6 ABDC"            /* .h„•Õ!’Øé-Ï›.æ«Ü */
+	$"53D9 DFB2 F2AF F964 14E3 74D6 3D64 01E2"            /* SÙß²ò¯ùd.ãtÖ=d.â */
+	$"FAFB 2D0B D303 DCF7 7718 E6CF 30DB 3FAE"            /* úû-.Ó.Ü÷w.æÏ0Û?® */
+	$"2873 3339 54A3 1E48 04D2 FDF2 E863 6201"            /* (s39T£.H.Òýòècb. */
+	$"01D1 182C 4C2A D85D AE26 DE15 9796 494C"            /* .Ñ.,L*Ø]®&Þ.—–IL */
+	$"82EA B4C0 2D3C 3D3E 1732 2ACA AC27 B7DB"            /* ‚ê´À-<=>.2*ʬ'·Û */
+	$"5CED 6F9D 3EDB FF04 5E83 BE60 1636 AE2C"            /* \ío�>Ûÿ.^ƒ¾`.6®, */
+	$"754D 2928 7128 ACFD 15E8 C1A0 30A5 1063"            /* uM)(q(¬ý.èÁ 0¥.c */
+	$"1E6F 10F7 A946 B9B4 D921 5DB3 113F 332E"            /* .o.÷©F¹´Ù!]³.?3. */
+	$"61B8 AB3D 2F87 E081 C9D9 32B7 1060 785A"            /* a¸«=/‡à�ÉÙ2·.`xZ */
+	$"EFDD F472 0283 E235 4D42 E903 A06B 51CB"            /* ïÝôr.ƒâ5MBé. kQË */
+	$"39DC A412 A492 918E 235E F57C E4CE 4E0F"            /* 9ܤ.¤’‘Ž#^õ|äÎN. */
+	$"6BE6 7036 FA8A 7B2C 21FE 60B1 6FCA 7654"            /* kæp6úŠ{,!þ`±oÊvT */
+	$"C9FD DCDF E497 B2A6 D6D5 87ED 9D3B 5B86"            /* ÉýÜßä—²¦ÖÕ‡í�;[† */
+	$"DA51 6B5B AE3E 520B 1DB3 5A6B 2B4D A777"            /* ÚQk[®>R..³Zk+M§w */
+	$"4F13 A04C 7D4F 819B 1FEB 086D 5F34 6643"            /* O. L}O�›.ë.m_4fC */
+	$"0208 693A D70C 55B2 7A07 BC27 3A41 B739"            /* ..i:×.U²z.¼':A·9 */
+	$"C1F5 7425 07D5 D74C 1F56 F680 F1C4 B0CB"            /* Áõt%.Õ×L.Vö€ñÄ°Ë */
+	$"F3E0 DE80 53FC 256D EFD0 6B64 028C EC70"            /* óàÞ€Sü%mïÐkd.Œìp */
+	$"4973 06D4 242C DAAA 8373 DFAC B0C9 14A1"            /* Is.Ô$,Úªƒs߬°É.¡ */
+	$"BFBC 0BB4 E250 919E 3D2B B388 3A89 FB02"            /* ¿¼.´âP‘ž=+³ˆ:‰û. */
+	$"9796 86E6 20F8 C26C 8120 349C 757A 6875"            /* —–†æ øÂl� 4œuzhu */
+	$"F63E AE68 84C3 03A3 6F64 F9EE F892 2CF8"            /* ö>®h„Ã.£odùîø’,ø */
+	$"61C1 B13A E941 0D67 DA36 4C05 9565 DC85"            /* aÁ±:éA.gÚ6L.•eÜ… */
+	$"D7F8 6EB9 D903 D428 F59A 3EBF C73E 5E95"            /* ×øn¹Ù.Ô(õš>¿Ç>^• */
+	$"764D 15FB 98F2 BECE 0FC8 EA3C 4E51 E1DD"            /* vM.û˜ò¾Î.Èê<NQáÝ */
+	$"5253 CE7A 2D16 8527 AF8E 9A17 757A A42F"            /* RSÎz-.…'¯Žš.uz¤/ */
+	$"6CA9 6BB3 7787 D84F 8E20 EA1F FB2D 15E3"            /* l©k³w‡ØOŽ ê.û-.ã */
+	$"0D2C 45A8 8C80 7DA1 89DB 5F46 F3FB 2871"            /* .,E¨Œ€}¡‰Û_Fóû(q */
+	$"539E 8CCA 5C03 EF20 B6B5 4956 EB82 172C"            /* SžŒÊ\.ï ¶µIVë‚., */
+	$"AB28 0D6D 4DF9 1F61 6F8D 61FE E962 778D"            /* «(.mMù.ao�aþébw� */
+	$"0C8E EC55 3BDC EC81 C9D1 E7D5 A811 C69A"            /* .ŽìU;Üì�ÉÑçÕ¨.Æš */
+	$"6186 BC2C 75B4 DD3D C207 1151 4C3B 4175"            /* a†¼,u´Ý=Â..QL;Au */
+	$"942E 2ACF D3C7 7122 9D89 31B3 0918 EDC0"            /* ”.*ÏÓÇq"�‰1³Æ.íÀ */
+	$"9D45 75D8 DE61 5036 6D9F 3373 4827 7ADE"            /* �EuØÞaP6mŸ3sH'zÞ */
+	$"1BD1 16E8 8905 37D4 D811 1077 B359 0FF6"            /* .Ñ.è‰.7ÔØ..w³Y.ö */
+	$"0460 F360 20A5 B532 3418 142A B432 C2E9"            /* .`ó` ¥µ24..*´2Âé */
+	$"A0D6 DB04 317D 28F3 C893 AAE3 19B1 5742"            /*  ÖÛ.1}(óÈ“ªã.±WB */
+	$"7BF6 615C 0EAC F35E 0CD4 B142 A289 5458"            /* {öa\.¬ó^.Ô±B¢‰TX */
+	$"D699 1584 46FF 7174 758F B1F8 F540 F427"            /* Ö™.„Fÿqtu�±øõ@ô' */
+	$"A496 8795 E66B 3DDC FB80 D0B8 9411 7240"            /* ¤–‡•æk=Üû€Ð¸”.r@ */
+	$"0374 54DC B2CA C982 BD5E FD06 4B02 5E8D"            /* .tTܲÊÉ‚½^ý.K.^� */
+	$"A958 79AA 5BE6 B5A2 76C3 7C23 0D45 6768"            /* ©Xyª[æµ¢vÃ|#.Egh */
+	$"D726 8259 FD2E E5CE 9B70 0600 22E7 82A3"            /* ×&‚Yý.åΛp.."ç‚£ */
+	$"8E14 9626 C4EC EED9 E7D8 13C9 623F 3DEB"            /* Ž.–&ÄìîÙçØ.Éb?=ë */
+	$"357B E617 A43A C9D4 328A C30A FF45 71BA"            /* 5{æ.¤:ÉÔ2ŠÃÂÿEqº */
+	$"1F8B 3945 8E06 0CF0 4749 0840 6F5A EDDB"            /* .‹9EŽ..ðGI.@oZíÛ */
+	$"29AC E877 27BD 6C8C A131 8A1C 9228 0FC5"            /* )¬èw'½lŒ¡1Š.’(.Å */
+	$"A029 D1A1 324D EFCE EB3F 2B92 150D FB8C"            /*  )Ñ¡2MïÎë?+’..ûŒ */
+	$"5399 1ABD D375 08BF 8F3F E788 684D 3064"            /* S™.½Óu.¿�?çˆhM0d */
+	$"70B4 A733 4AB6 239A DC03 724F C8B8 F1BB"            /* p´§3J¶#šÜ.rOȸñ» */
+	$"8F1F A795 FF18 8256 0050 FF74 EDF1 3D05"            /* �.§•ÿ.‚V.Pÿtíñ=. */
+	$"6CB0 E566 9272 E493 C085 3D06 3116 4ECE"            /* l°åf’rä“À…=.1.NÎ */
+	$"402D 329F 4BBB 2598 A7CF BEE1 333D 9019"            /* @-2ŸK»%˜§Ï¾á3=�. */
+	$"61BB 1A29 2616 E907 2CD6 F64C 456F 9881"            /* a».)&.é.,ÖöLEo˜� */
+	$"725B 5C38 A40D 60D3 6B4F FDF1 87D7 4786"            /* r[\8¤.`ÓkOýñ‡×G† */
+	$"29BF CAEB 223A 044D 0F61 FDE6 0A3E 7727"            /* )¿Êë":.M.aýæÂ>w' */
+	$"DDEE 0A95 231F 04AC B6EF D134 C09D 1540"            /* Ýî•#..¬¶ïÑ4À�.@ */
+	$"0E94 57E2 8418 C208 1F26 7396 96A0 D08F"            /* .”Wâ„.Â..&s–– Ð� */
+	$"0CC0 40C8 C596 39BA 0CAE A6ED F8E8 7D6B"            /* .À@ÈÅ–9º.®¦íøè}k */
+	$"A76C 391B 6113 555F 62E0 6E14 5D27 E7BC"            /* §l9.a.U_bàn.]'ç¼ */
+	$"EDB7 D038 DED2 7BEE FC9D 6211 241E 0795"            /* í·Ð8ÞÒ{îü�b.$..• */
+	$"9CDE 1607 B4C7 828E 24D2 4E9F FCA0 36EA"            /* œÞ..´Ç‚Ž$ÒNŸü 6ê */
+	$"004C C960 1680 01CE 7FF6 A201 EDAB 1ADF"            /* .LÉ`.€.Î.ö¢.í«.ß */
+	$"80D8 4524 390C 23DD EA8E 062C 5DDB 3C57"            /* €ØE$9.#ÝêŽ.,]Û<W */
+	$"BAEC 18E5 1ECE 91D7 A40E 08ED 23EA 55B6"            /* ºì.å.Αפ..í#êU¶ */
+	$"AA2C F48A 7B0E 8CAE 90DD 5840 41FF 7F4C"            /* ª,ôŠ{.Œ®�ÝX@Aÿ.L */
+	$"47AD E774 87C4 9AB1 9CAD E633 DECD 3E36"            /* G­çt‡Äš±œ­æ3ÞÍ>6 */
+	$"00C2 0E05 134F 4802 3846 3575 1902 676D"            /* .Â...OH.8F5u..gm */
+	$"1006 D8AE 0D5F 1934 78F6 0721 F3C4 1000"            /* ..Ø®._.4xö.!óÄ.. */
+	$"8991 FA85 45B5 37A9 5A0C 54EE 014B 297B"            /* ‰‘ú…Eµ7©Z.Tî.K){ */
+	$"52F2 5ADD 7422 C97B EAA9 D291 45A7 A44A"            /* RòZÝt"É{ê©Ò‘E§¤J */
+	$"40FE AE73 5086 C7D3 85FD D734 67F2 8909"            /* @þ®sP†ÇÓ…ý×4gò‰Æ */
+	$"506D 36D8 2361 990C 802F A59E B603 9C94"            /* Pm6Ø#a™.€/¥ž¶.œ” */
+	$"F7BD AED9 8518 8651 DFFE 3D0E E920 E874"            /* ÷½®Ù….†Qßþ=.é èt */
+	$"FEB0 EE3C 3242 C249 4704 EEA8 9EFA DC61"            /* þ°î<2BÂIG.úÜa */
+	$"49C6 929E 2A9D 51CD FE0A FF02 3DDB 01EC"            /* IÆ’ž*�QÍþÂÿ.=Û.ì */
+	$"80E8 630A B0C8 C9FC 7693 C60B 07E8 5D2F"            /* €èc°ÈÉüv“Æ..è]/ */
+	$"B97A 9F04 444E C836 DD68 FF12 EC9C 7E4F"            /* ¹zŸ.DNÈ6Ýhÿ.ìœ~O */
+	$"3CE9 83A8 191A 1E61 05F8 90FF 67E8 011A"            /* <部...a.ø�ÿgè.. */
+	$"71EA 3EE8 AFBD 6328 ED84 9807 788D F3BC"            /* qê>诽c(턘.x�ó¼ */
+	$"2FA0 A210 7FFF 1D02 2519 4EC7 2A80 7FD0"            /* / ¢..ÿ..%.NÇ*€.Ð */
+	$"2064 A8F4 CC78 5EC8 88AF F1AB 868B 9F8D"            /*  d¨ôÌx^Ȉ¯ñ«†‹Ÿ� */
+	$"883E 3FDA D188 FBB7 3AFC 0C72 E01A CEF3"            /* ˆ>?Úшû·:ü.rà.Îó */
+	$"21E1 1718 4FDB 9A43 3767 424A 639B DFFE"            /* !á..OÛšC7gBJc›ßþ */
+	$"CA5F 7BA9 8F82 3EA6 6D4E 6986 6945 80DE"            /* Ê_{©�‚>¦mNi†iE€Þ */
+	$"8274 4927 166A 6062 DF1D 0A72 F23B FA5A"            /* ‚tI'.j`bß.Ârò;úZ */
+	$"4DE4 5D19 54FC 488B 5237 FF5F 7B81 62C5"            /* Mä].TüH‹R7ÿ_{�bÅ */
+	$"F6B7 B580 3016 11B6 22CF 63B8 428A D39A"            /* ö·µ€0..¶"Ïc¸BŠÓš */
+	$"5AC3 80FF 7310 8386 FF54 F361 304F 3BB5"            /* ZÀÿs.ƒ†ÿTóa0O;µ */
+	$"A7EB 0419 7DFB 6E56 20A8 3670 9018 9CB3"            /* §ë..}ûnV ¨6p�.œ³ */
+	$"4B35 7082 32A7 E917 9CF8 FF7F FF80 0A6C"            /* K5p‚2§é.œøÿ.ÿ€Âl */
+	$"A48C 447E 3ECF 411D 89E4 F923 373B DCBE"            /* ¤ŒD~>ÏA.‰äù#7;ܾ */
+	$"2CE8 6580 0F87 1A23 1D93 62AE 48EF DEB8"            /* ,èe€.‡.#.“b®HïÞ¸ */
+	$"5DE8 DB68 1CA3 8D4B D3FE A476 7B3D ACAA"            /* ]èÛh.£�KÓþ¤v{=¬ª */
+	$"284F 83EB 428F A201 D122 CB1A CCB2 C1FE"            /* (OƒëB�¢.Ñ"Ë.̲Áþ */
+	$"367F 60D3 155D 8C00 22D8 ED33 D56B 1DE2"            /* 6.`Ó.]Œ."Øí3Õk.â */
+	$"98B0 A4A9 E041 2BF1 AA58 E78D 47E5 929F"            /* ˜°¤©àA+ñªXç�Gå’Ÿ */
+	$"85DA 699E C45A 0064 B931 CF2B 4169 44F0"            /* …ÚižÄZ.d¹1Ï+AiDð */
+	$"4B4F 083B 3D7C B2B2 D87B 785E 91A8 C614"            /* KO.;=|²²Ø{x^‘¨Æ. */
+	$"6EE6 A63C C8A7 B9E3 839D E245 4128 3BF9"            /* næ¦<ȧ¹ãƒ�âEA(;ù */
+	$"98CD 0C23 72EB E3A9 D21F 1BC2 4E13 274B"            /* ˜Í.#rëã©Ò..ÂN.'K */
+	$"19C8 CB39 5E7A D218 FBDB 0C42 51A1 1203"            /* .ÈË9^zÒ.ûÛ.BQ¡.. */
+	$"C0EB CDC2 9249 E461 1DE4 3DB6 FDFE 1334"            /* ÀëÍÂ’Iäa.ä=¶ýþ.4 */
+	$"1952 8231 CD71 A170 C55B 1FD0 6706 57F0"            /* .R‚1Íq¡pÅ[.Ðg.Wð */
+	$"282D 09A2 0893 A5BA 0314 43DD 32AF 3478"            /* (-Æ¢.“¥º..CÝ2¯4x */
+	$"EF6C 15F0 55C9 6A47 ECFE 3F3F 4DB4 5ED8"            /* ïl.ðUÉjGìþ??M´^Ø */
+	$"EFF8 8CA5 71F9 6669 078C 550C 943A 7046"            /* ïøŒ¥qùfi.ŒU.”:pF */
+	$"C031 6CE2 4681 4177 2913 CFE7 D857 C62A"            /* À1lâF�Aw).ÏçØWÆ* */
+	$"4652 88E2 8830 DF42 9C3D 2D76 E710 A8F1"            /* FRˆâˆ0ßBœ=-vç.¨ñ */
+	$"3626 45F2 55CC 008C EAB8 B891 A5F3 1AD2"            /* 6&EòUÌ.Œê¸¸‘¥ó.Ò */
+	$"AB11 6C48 3F18 40C0 51F0 DB88 0BD1 168C"            /* «.lH?.@ÀQðÛˆ.Ñ.Œ */
+	$"2E54 2DA6 CC60 BB05 4700 2C4E 179B 271B"            /* .T-¦Ì`».G.,N.›'. */
+	$"688C 1EE9 4D9A C781 8108 296B FE4F 028A"            /* hŒ.éMšÇ��.)kþO.Š */
+	$"63D6 6EDF 6FEB FC17 BDFE 7A70 B48E D94E"            /* cÖnßoëü.½þzp´ŽÙN */
+	$"D985 3384 1BD2 B4C9 5213 B0D1 041B 876C"            /* Ù…3„.Ò´ÉR.°Ñ..‡l */
+	$"131C 4A9C 947B A79C A466 9779 E7C9 D2E1"            /* ..Jœ”{§œ¤f—yçÉÒá */
+	$"4E9F 0509 30E0 1115 E5C7 CAED 197B 818A"            /* NŸ.Æ0à..åÇÊí.{�Š */
+	$"324D 8F8E ED44 BF44 5340 D647 1776 B983"            /* 2M�ŽíD¿DS@ÖG.v¹ƒ */
+	$"6D8C 88B1 6976 F7EB AFDB 6638 CAD3 F275"            /* mŒˆ±iv÷ë¯Ûf8ÊÓòu */
+	$"D93A 6CD3 9D6E C617 3969 D8E5 3059 947B"            /* Ù:lÓ�nÆ.9iØå0Y”{ */
+	$"6AFA 0E9B A19C 24C9 E1DC 089D 3545 89E4"            /* jú.›¡œ$ÉáÜ.�5E‰ä */
+	$"E860 FB54 068C B464 EE9B 66B7 F267 34CF"            /* è`ûT.Œ´dî›f·òg4Ï */
+	$"1276 C6B2 47E6 8284 300B D1A9 1409 0C93"            /* .vƲGæ‚„0.Ñ©.Æ.“ */
+	$"E36A 8095 409A 7352 FF7A 0F50 A5E2 E678"            /* ãj€•@šsRÿz.P¥âæx */
+	$"C195 0898 E51E EB15 8D7A E918 29A6 D5CE"            /* Á•.˜å.ë.�zé.)¦ÕÎ */
+	$"4DBC 978B 2CAA 9BA7 8727 EA1C 1C7A 6CC2"            /* M¼—‹,ª›§‡'ê..zl */
+	$"D172 DDF5 4BD4 9C69 607B 609F AEC8 FD84"            /* ÑrÝõKÔœi`{`Ÿ®Èý„ */
+	$"1DDA A076 C7E1 A7B1 F86C BC7E 1720 EB83"            /* .Ú vÇ᧱øl¼~. ëƒ */
+	$"095B F1C8 7239 10FD 6A26 D10E 534B E257"            /* Æ[ñÈr9.ýj&Ñ.SKâW */
+	$"B691 5D92 6949 E7D8 7470 AA8C 421F F945"            /* ¶‘]’iIçØtpªŒB.ùE */
+	$"99F6 9492 B806 E264 47B0 4EF5 6206 734E"            /* ™ö”’¸.âdG°Nõb.sN */
+	$"944B 102F A688 23A4 EAB0 CCEA 0017 0156"            /* ”K./¦ˆ#¤ê°Ìê...V */
+	$"A8C9 2A3F FF49 4137 E23A 09D0 97BB 0E5F"            /* ¨É*?ÿIA7â:ÆЗ»._ */
+	$"E2A2 2247 4980 6A20 B443 3E0B 0465 B9EF"            /* â¢"GI€j ´C>..e¹ï */
+	$"C490 B954 3AEA ABB7 3D53 111D 8897 551C"            /* Ä�¹T:ê«·=S..ˆ—U. */
+	$"B865 1EA2 33F2 AD50 D488 1D6D 9733 27F3"            /* ¸e.¢3ò­PÔˆ.m—3'ó */
+	$"78AC C946 FB3C 4D2F 6580 1B3A 3368 3D54"            /* x¬ÉFû<M/e€.:3h=T */
+	$"55DF 6B52 1A54 9010 C4D2 12C8 D497 9CDB"            /* UßkR.T�.ÄÒ.ÈÔ—œÛ */
+	$"173A 0609 66F1 C6C0 FD02 47A0 B2E2 D2E6"            /* .:.ÆfñÆÀý.G ²âÒæ */
+	$"096E F870 0776 4898 2F2B 84CF BA83 D656"            /* Ænøp.vH˜/+„ϺƒÖV */
+	$"7F77 79FF 0F1D 2A6E 03C6 4D0F E3EF D23B"            /* .wyÿ..*n.ÆM.ãïÒ; */
+	$"6F82 5F72 6701 98DF 5A63 DA7B 0ABC 75E2"            /* o‚_rg.˜ßZcÚ{¼uâ */
+	$"382D 0D93 3C8C 5308 19EA EF8D 7922 CD36"            /* 8-.“<ŒS..êï�y"Í6 */
+	$"ED21 EB4D 3D77 5A8A 1380 E238 22E5 84AA"            /* í!ëM=wZŠ.€â8"優 */
+	$"4488 7DCE 91A0 CB4B 67FA 74AF EA3D 1C8E"            /* Dˆ}Α ËKgút¯ê=.Ž */
+	$"9279 611D FD02 D08F D952 B05D 2C11 B545"            /* ’ya.ý.Ð�ÙR°],.µE */
+	$"5F17 FF5C 1E9C 6A77 DA2F A474 B20C F5A2"            /* _.ÿ\.œjwÚ/¤t².õ¢ */
+	$"B2D4 176F 97E4 CE9E B576 C3E0 0F3D ECB9"            /* ²Ô.o—äΞµvÃà.=ì¹ */
+	$"7B35 DEBB 5ABA 9738 36F8 524D 74D8 08FF"            /* {5Þ»Zº—86øRMtØ.ÿ */
+	$"29A7 9B08 5B43 7C17 FB53 234E 4806 B0C3"            /* )§›.[C|.ûS#NH.°Ã */
+	$"AF3A FF38 CCAF FEAA C60F D103 32AC 7D7F"            /* ¯:ÿ8̯þªÆ.Ñ.2¬}. */
+	$"D2B8 51C1 7B7D 56FD 7CFB D2B5 C55B 7C7D"            /* Ò¸QÁ{}Vý|ûÒµÅ[|} */
+	$"7D30 10C2 4181 3358 5DD6 4625 4FFC EA30"            /* }0.ÂA�3X]ÖF%Oüê0 */
+	$"3402 194F 6D0B 53D8 3C64 54AE E8DA 7874"            /* 4..Om.SØ<dT®èÚxt */
+	$"7FF1 DE25 3147 0AF0 D5B6 7BF7 88DD 5199"            /* .ñÞ%1GÂðÕ¶{÷ˆÝQ™ */
+	$"611E 526D B6DB 6DB6 DB69 9C6E 7A40 821D"            /* a.Rm¶Ûm¶Ûiœnz@‚. */
+	$"4416 6952 04BB 9C0A F19B 2C62 E698 A4F5"            /* D.iR.»œÂñ›,b昤õ */
+	$"9B83 3C59 8217 0000 0034 8080 DB92 4924"            /* ›ƒ<Y‚....4€€Û’I$ */
+	$"9249 247D 32D0 9B20 73FF 7E44 A49A 44BB"            /* ’I$}2Л sÿ~D¤šD» */
+	$"EB45 3E31 A4A0 C0CC BBC0 B29E 7771 4FDE"            /* ëE>1¤ ÀÌ»À²žwqOÞ */
+	$"1679 23F1 DE12 5574 68E3 60A1 9C00 CBEC"            /* .y#ñÞ.Uthã`¡œ.Ëì */
+	$"9C44 9009 0000 08DE 28C3 2776 AAA2 829A"            /* œD�Æ...Þ(Ã'vª¢‚š */
+	$"05E0 47E9 0001 48A9 672C 0775 EE58 F075"            /* .àGé..H©g,.uîXðu */
+	$"7458 B48A 5455 DB33 3524 BE73 1D7C E223"            /* tX´ŠTUÛ35$¾s.|â# */
+	$"4EC4 732C EC4B 128D 341C 790C 00A2 1309"            /* NÄs,ìK.�4.y..¢.Æ */
+	$"2D0B 5EA7 B07B C82C 976B 68C2 642A F095"            /* -.^§°{È,—khÂd*ð• */
+	$"A1C4 010E C94E D8A9 34BB FD3E 2B2F 92EC"            /* ¡Ä..ÉNØ©4»ý>+/’ì */
+	$"30E1 A7B3 040B C920 3FFF 7FA1 317B 90F7"            /* 0᧳..É ?ÿ.¡1{�÷ */
+	$"C744 40B8 8325 4036 82FB 0C6C D800 19C4"            /* ÇD@¸ƒ%@6‚û.lØ..Ä */
+	$"2631 C4B8 3160 8649 2492 4924 9248 A747"            /* &1ĸ1`†I$’I$’H§G */
+	$"3D41 A17D 23A6 9AC7 9000 0000 0000 0000"            /* =A¡}#¦šÇ�....... */
+	$"0000 0019 1A70 8823 BB21 7C62 4556 F257"            /* .....pˆ#»!|bEVòW */
+	$"62C0 CF0B 72EE F37E 64EC 43C2 AE04 9F58"            /* bÀÏ.rîó~dìC®.ŸX */
+	$"94DC E128 91EC BAA2 DADD 57A7 D5F7 1972"            /* ”Üá(‘캢ÚÝW§Õ÷.r */
+	$"7543 9A9A 0DB3 C3FD 42E0 19A3 8F45 7FDF"            /* uCšš.³ÃýBà.£�E.ß */
+	$"CEB1 A7E5 8A09 5B4A F9E6 294B C5DC 80C9"            /* α§åŠÆ[Jùæ)KÅÜ€É */
+	$"9AEE 0729 374F 04FD 79D6 7170 D940 14F0"            /* šî.)7O.ýyÖqpÙ@.ð */
+	$"830F 0B71 50E7 3C76 97AF 0F71 A32D DC5A"            /* ƒ..qPç<v—¯.q£-ÜZ */
+	$"28A9 FE90 6CC0 9484 30D1 FCCD 4991 0758"            /* (©þ�lÀ”„0ÑüÍI‘.X */
+	$"BE36 B1DE 3A2E B6F8 2756 C568 2A7F D038"            /* ¾6±Þ:.¶ø'VÅh*.Ð8 */
+	$"2397 6E8F 32E0 C1AC 3736 32A3 C18E 13C4"            /* #—n�2àÁ¬762£ÁŽ.Ä */
+	$"D298 8703 F9AF E24B A630 0627 6E63 ED70"            /* Ò˜‡.ù¯âK¦0.'ncíp */
+	$"0662 A833 6515 7225 C79D 8C1F 7410 45BF"            /* .b¨3e.r%Ç�Œ.t.E¿ */
+	$"5019 F088 7C6C 43FC AE88 B794 5847 505F"            /* P.ðˆ|lCü®ˆ·”XGP_ */
+	$"2B73 6E58 E20E 18A2 01B4 DF7F F5BD D4BC"            /* +snXâ..¢.´ß.õ½Ô¼ */
+	$"B259 706B 754E 9740 BBF2 54FC FCB8 B293"            /* ²YpkuN—@»òTüü¸²“ */
+	$"4CEA 3670 D04B 8C42 B7C2 314D 1F53 956B"            /* Lê6pÐKŒB·Â1M.S•k */
+	$"CB14 9D05 8288 E7F0 D4FF 70AE EFB7 A10B"            /* Ë.�.‚ˆçðÔÿp®ï·¡. */
+	$"EDDE 3CFE 1B9D 7DBA 7B7D BD13 DF6F 45B8"            /* íÞ<þ.�}º{}½.ßoE¸ */
+	$"FE1A 077D B444 FAB6 46FB 75FC E8AB DECC"            /* þ..}´Dú¶Fûuüè«ÞÌ */
+	$"AF0D 6C8A C695 8734 8A7A 5A21 F65D 05F6"            /* ¯.lŠÆ•‡4ŠzZ!ö].ö */
+	$"A417 27AC 998E 3646 07A8 0055 19DC B524"            /* ¤.'¬™Ž6F.¨.U.ܵ$ */
+	$"D2F2 842C DF9F BECA C26B C9C9 D0FD CA3B"            /* Òò„,ߟ¾ÊÂkÉÉÐýÊ; */
+	$"DB1B 3F81 F6A7 4465 001E 5552 4D0D 3BF3"            /* Û.?�ö§De..URM.;ó */
+	$"0140 A2E9 7D63 8456 F9C7 665D F7FC 2DBF"            /* .@¢é}c„VùÇf]÷ü-¿ */
+	$"1B41 0667 7939 1B16 4997 5584 3CFE 81B9"            /* .A.gy9..I—U„<þ�¹ */
+	$"C4A8 B346 EC6D E726 2560 5CB8 8B84 7699"            /* Ĩ³Fìmç&%`\¸‹„v™ */
+	$"3999 2CA0 91D9 A05A C96C 660C 267B 74A0"            /* 9™, ‘Ù ZÉlf.&{t  */
+	$"B935 73EB D464 D860 2694 7584 A4D4 DC52"            /* ¹5sëÔdØ`&”u„¤ÔÜR */
+	$"D136 D49A 1BEA 53F5 AE2F C19E 44E9 BA0A"            /* Ñ6Ôš.êSõ®/ÁžDéºÂ */
+	$"5D83 6587 7792 3DCB 449A B33E 4632 A395"            /* ]ƒe‡w’=ËDš³>F2£• */
+	$"57A3 0EC0 B3A3 969D 9DF0 6ACC 859F FF7F"            /* W£.À³£–��ðjÌ…Ÿÿ. */
+	$"FF27 DAA0 AF8E 216C E5D8 874A 530F 555E"            /* ÿ'Ú ¯Ž!lå؇JS.U^ */
+	$"AF3F E231 5BAF F7B6 8E73 5742 2717 4031"            /* ¯?â1[¯÷¶ŽsWB'.@1 */
+	$"175D 5FDA F402 B756 AEAE 7E7E BFEE CE68"            /* .]_Úô.·V®®~~¿îÎh */
+	$"7878 870D 01C2 C2A4 61D5 64E3 E195 B914"            /* xx‡..¤aÕdãᕹ. */
+	$"A45F FF52 DC14 F5E9 E037 65E3 5477 62A5"            /* ¤_ÿRÜ.õéà7eãTwb¥ */
+	$"3EEC CA32 6558 5965 8B6E 3F13 9DB2 1361"            /* >ìÊ2eXYe‹n?.�².a */
+	$"8426 9FD7 B329 4E75 FF1D 9B78 9735 4B1B"            /* „&Ÿ×³)Nuÿ.›x—5K. */
+	$"D80E 1781 192F 6777 8F94 F6A2 5016 726D"            /* Ø..�./gw�”ö¢P.rm */
+	$"1E0D D2CB 6F87 B3C6 09A2 1FE3 915E 8943"            /* ..ÒËo‡³ÆÆ¢.ã‘^‰C */
+	$"FE6C 6743 4733 D5BC A9DD 5338 C9E1 AF50"            /* þlgCG3Õ¼©ÝS8Éá¯P */
+	$"3634 C26C 0C1F 94E7 50B2 4310 DD62 4F09"            /* 64Âl..”çP²C.ÝbOÆ */
+	$"ABCD 7821 8B7B 7B87 2EEA 25A1 9D3C 55CC"            /* «Íx!‹{{‡.ê%¡�<UÌ */
+	$"0644 1B14 3456 2E32 C013 815C 66C7 0526"            /* .D..4V.2À.�\fÇ.& */
+	$"E24D CE15 B8FB 5D8B 0506 E30A 1D6A E2ED"            /* âMÎ.¸û]‹..ãÂ.jâí */
+	$"6145 D124 0EC9 1FAB 4E50 06C2 9DA5 8F6C"            /* aEÑ$.É.«NP.Â�¥�l */
+	$"C072 D11E BFEE DFE6 F6C7 12F4 E89C 35B7"            /* ÀrÑ.¿îßæöÇ.ôèœ5· */
+	$"097E 2E25 393F CEA3 03C6 D3C7 DED5 3882"            /* Æ~.%9?Σ.ÆÓÇÞÕ8‚ */
+	$"ED26 A3FD 9130 95B5 F3FA D31A 691F 8E09"            /* í&£ý‘0•µóúÓ.i.ŽÆ */
+	$"BFA8 7D7B 85BD B179 5C20 2855 1268 F9AF"            /* ¿¨}{…½±y\ (U.hù¯ */
+	$"553D 939E 6FC6 C67E 4611 F88C BBD4 773C"            /* U=“žoÆÆ~F.øŒ»Ôw< */
+	$"5F16 D598 D5C5 E649 B66E FD8D A2D7 9807"            /* _.Õ˜ÕÅæI¶ný�¢×˜. */
+	$"EDA2 4621 2CF5 DDE3 C078 6455 1C29 3A07"            /* í¢F!,õÝãÀxdU.):. */
+	$"E992 C5DE 8D33 041B 83C6 56F6 7C95 168E"            /* é’ÅÞ�3..ƒÆVö|•.Ž */
+	$"6127 40D2 DE11 CFF2 3379 DC22 20E3 5E1B"            /* a'@ÒÞ.Ïò3yÜ" ã^. */
+	$"DE83 DBB5 5B8A 8572 3DF2 2890 DC56 BE6E"            /* ÞƒÛµ[Š…r=ò(�ÜV¾n */
+	$"D15F 9396 ECD4 725F 2E18 7616 394A 64C3"            /* Ñ_“–ìÔr_..v.9Jdà */
+	$"FDAA E6F2 3D6D 46BC B270 5B8F ACB4 9CAE"            /* ýªæò=mF¼²p[�¬´œ® */
+	$"0D0D 3F29 6A02 1E92 347A E406 A52D 111A"            /* ..?)j..’4zä.¥-.. */
+	$"2E79 0340 1D82 C861 0C40 1963 3397 A4FD"            /* .y.@.‚Èa.@.c3—¤ý */
+	$"A998 0B63 E30A 7AA3 A5BC 8A8E 9CD0 4795"            /* ©˜.cãÂz£¥¼ŠŽœÐG• */
+	$"7538 7FB2 EC9A 952C CE29 C80F 369C 4E8D"            /* u8.²ìš•,Î)È.6œN� */
+	$"8000 1C55 D5F3 E2AD 812E 4FAA AC2C D9BB"            /* €..UÕóâ­�.Oª¬,Ù» */
+	$"F4CD 5568 5643 826F 3A38 91BD 6F70 92D3"            /* ôÍUhVC‚o:8‘½op’Ó */
+	$"23EC DB91 0FC4 C3BB 7542 023B 85F0 36C3"            /* #ìÛ‘.ÄûuB.;…ð6à */
+	$"8BF6 F6F8 4E77 EEE5 851F 219A CF99 7D9E"            /* ‹ööøNwîå….!šÏ™}ž */
+	$"856D A687 BC63 8E39 0407 B007 D184 10BD"            /* …m¦‡¼cŽ9..°.Ñ„.½ */
+	$"D9EF ACB1 B75A 46FA F95E 42DF 377B E2F7"            /* Ùבּ·ZFúù^Bß7{â÷ */
+	$"BEF2 357A 861C F486 B3F7 57E1 D39B 095B"            /* ¾ò5z†.ô†³÷WáÓ›Æ[ */
+	$"40C0 925C 0CA1 7885 CFEA 48B7 33E9 E8DE"            /* @À’\.¡x…ÏêH·3éèÞ */
+	$"D178 1E15 91D1 F6C5 BC87 CB7E CCC6 DEDE"            /* Ñx..‘Ñöż‡Ë~ÌÆÞÞ */
+	$"B017 A4C1 0B0F DD17 660E CB97 C098 C773"            /* °.¤Á..Ý.f.Ë—À˜Çs */
+	$"8A0A F4DB 59BD A218 055E 5348 05D8 B304"            /* ŠÂôÛY½¢..^SH.س. */
+	$"9F23 E1B1 0754 6DA2 FF33 34CB 2B12 7114"            /* Ÿ#á±.Tm¢ÿ34Ë+.q. */
+	$"62D2 4CA8 8091 CD34 8467 2752 B77A AA5B"            /* bÒL¨€‘Í4„g'R·zª[ */
+	$"15FC 2E56 7A29 9351 B6A4 AEE5 B56D 354D"            /* .ü.Vz)“Q¶¤®åµm5M */
+	$"3ED2 FA71 25E9 F887 B187 BADB B11B 2E01"            /* >Òúq%éø‡±‡ºÛ±... */
+	$"93B3 4206 45ED 7238 3F80 1441 50CA CCBA"            /* “³B.Eír8?€.APÊ̺ */
+	$"EF59 3BC5 4236 2ABF 9150 7335 49C5 0216"            /* ïY;ÅB6*¿‘Ps5IÅ.. */
+	$"F97B D5A5 1EF5 A69D 8B34 C25B 73E1 DA52"            /* ù{Õ¥.õ¦�‹4Â[sáÚR */
+	$"79E5 9EB1 9CB1 0952 B3F5 E221 D426 4759"            /* yåž±œ±ÆR³õâ!Ô&GY */
+	$"D5CF 2D18 CC2A 270A 859D F10C 8108 52FF"            /* ÕÏ-.Ì*'Â…�ñ.�.Rÿ */
+	$"2A7D D39E EFFD 568C 2DB3 7BD5 62D0 2403"            /* *}ÓžïýVŒ-³{ÕbÐ$. */
+	$"69D1 A4B6 2D24 E485 973D F6A5 E6DC 1DB5"            /* iѤ¶-$ä…—=ö¥æÜ.µ */
+	$"BF0B E185 5592 E3A0 6046 E050 5151 9546"            /* ¿.á…U’ã `FàPQQ•F */
+	$"17F7 0CF6 222F 17E0 40E5 3EF5 74EE BAB6"            /* .÷.ö"/.à@å>õt */
+	$"55BD 76C1 DD80 39C8 BAE0 37B8 398A B370"            /* U½vÁÝ€9Ⱥà7¸9Š³p */
+	$"D400 0C29 5DC9 94FF 069B 36E2 CD79 195F"            /* Ô..)]É”ÿ.›6âÍy._ */
+	$"5B9B 1237 1F18 C560 C901 F9A4 184B 7570"            /* [›.7..Å`É.ù¤.Kup */
+	$"433E 75BE 0297 C641 7D9B 7092 8D64 96F5"            /* C>u¾.—ÆA}›p’�d–õ */
+	$"D70C 9B66 71D3 09B1 F635 0FC3 0B49 7D6E"            /* ×.›fqÓƱö5.Ã.I}n */
+	$"660C 8E1D 0257 672B 97EE C2A5 7B84 729E"            /* f.Ž..Wg+—îÂ¥{„rž */
+	$"6516 585E 354F 2E22 88A7 A515 B945 3745"            /* e.X^5O."ˆ§¥.¹E7E */
+	$"F6A5 5CB2 E212 10AD AB6F 07F5 FDA3 09EB"            /* ö¥\²â..­«o.õý£Æë */
+	$"A053 313B 9A8E 757D E132 D483 DC78 0882"            /*  S1;šŽu}á2ÔƒÜx.‚ */
+	$"A63C 95E0 036C 4626 F66B 5F6C 39A1 9401"            /* ¦<•à.lF&ök_l9¡”. */
+	$"7276 4DCE 4487 7D8C 12A3 B713 9139 AC0A"            /* rvMÎD‡}Œ.£·.‘9¬Â */
+	$"18AD 4DFD 2A3D 69E7 E76E 593C 8DAB FD56"            /* .­Mý*=iççnY<�«ýV */
+	$"F959 BA6B FBA3 2853 D610 4DB0 7A30 3A09"            /* ùYºkû£(SÖ.M°z0:Æ */
+	$"916B DFF7 B3B4 F8D3 9619 0FD9 8FBC FC6B"            /* ‘kß÷³´øÓ–..Ù�¼ük */
+	$"D73D ABD2 4C41 6AD0 6584 AF19 3074 AF6E"            /* ×=«ÒLAjÐe„¯.0t¯n */
+	$"369C BEB1 76D5 D311 6172 F157 D522 DDED"            /* 6œ¾±vÕÓ.arñWÕ"Ýí */
+	$"D4ED 0230 0BB5 E881 0E6B 9C4F 111F 4F6E"            /* Ôí.0.µè�.kœO..On */
+	$"7CAD 4745 7BBF DA70 A9C4 051E FDEA 206C"            /* |­GE{¿Úp©Ä..ýê l */
+	$"9983 0E2D 4A4A A4DE 82E9 DAAF 5748 37AE"            /* ™ƒ.-JJ¤Þ‚éÚ¯WH7® */
+	$"4046 DCCB 0D1A 80DA 1804 20E2 F7CF AD69"            /* @FÜË..€Ú.. â÷Ï­i */
+	$"F9D8 5106 D02D 16E9 4437 9560 B618 1126"            /* ùØQ.Ð-.éD7•`¶..& */
+	$"95A2 4B23 89C4 78EE 898E D80C 8E49 5201"            /* •¢K#‰ÄxØ.ŽIR. */
+	$"2095 ABAF 9CA5 0F8E CB22 00D4 4289 59B3"            /*  •«¯œ¥.ŽË".ÔB‰Y³ */
+	$"1835 1395 8AE5 3A88 7185 E7DD 57F3 4CE4"            /* .5.•Šå:ˆq…çÝWóLä */
+	$"1465 C878 6B72 7146 2AF1 F053 5B31 7697"            /* .eÈxkrqF*ñðS[1v— */
+	$"7300 A777 3919 099E BD1C 79C3 24C4 A355"            /* s.§w9.Æž½.yÃ$Ä£U */
+	$"0C88 C727 1831 D498 E513 47A5 F25F DDBE"            /* .ˆÇ'.1Ô˜å.G¥ò_ݾ */
+	$"46E7 40B5 EBCC 080F 6915 3FDF EDB9 A9B1"            /* Fç@µëÌ..i.?ßí¹©± */
+	$"39ED D794 60E1 A5A2 0EEC 7A09 46BF 201E"            /* 9í×”`ᥢ.ìzÆF¿ . */
+	$"311F EEEE 88EF C6C1 C10D E238 50C9 7F01"            /* 1.îîˆïÆÁÁ.â8PÉ.. */
+	$"DFF1 17BA D8F4 0017 47E7 75F2 4D82 679E"            /* ßñ.ºØô..GçuòM‚gž */
+	$"6867 60A4 6222 77B9 319B 186D FCB3 168A"            /* hg`¤b"w¹1›.mü³.Š */
+	$"EAF3 C227 1082 D7ED 2C70 E619 8676 0186"            /* êóÂ'.‚×í,pæ.†v.† */
+	$"8C23 5DE5 D4A0 61CB CDE4 AED5 E008 6F3C"            /* Œ#]åÔ aËÍä®Õà.o< */
+	$"D894 AC14 6FEC 5D4C C2FF 3A6C 512F E475"            /* Ø”¬.oì]LÂÿ:lQ/äu */
+	$"FCB8 DFA4 EB46 2DF4 E133 5858 364B 54E1"            /* ü¸ß¤ëF-ôá3XX6KTá */
+	$"A6E1 5D0C 157E D987 DF95 B1FB 3723 4F2F"            /* ¦á]..~هߕ±û7#O/ */
+	$"C9BF C6D4 D979 412E D0EB B285 8DFF 7CAC"            /* É¿ÆÔÙyA.Ðë²…�ÿ|¬ */
+	$"F1BF 1825 8B89 9992 3848 C666 4184 4906"            /* ñ¿.%‹‰™’8HÆfA„I. */
+	$"0D61 6B58 9355 A5D9 C940 B6F2 6918 82E1"            /* .akX“U¥ÙÉ@¶òi.‚á */
+	$"FF7D 4F5F FE94 5208 650B B780 0D2B DD4F"            /* ÿ}O_þ”R.e.·€.+ÝO */
+	$"5874 3627 2353 6328 06B9 908C 6C95 D898"            /* Xt6'#Sc(.¹�Œl•Ø˜ */
+	$"8C24 1D0F 641B 7763 CFBE E88A BB05 8639"            /* Œ$..d.wcϾ芻.†9 */
+	$"D91C 4A38 3A3F 75C6 61BD BFED CA10 2A73"            /* Ù.J8:?uÆa½¿íÊ.*s */
+	$"E3C5 E85C BF5B 0346 2105 4286 300D D812"            /* ãÅè\¿[.F!.B†0.Ø. */
+	$"8BE4 DAE4 292B A765 338E 7E42 50F1 8046"            /* ‹äÚä)+§e3Ž~BPñ€F */
+	$"3FDC 1A85 4616 61E5 7321 18D9 5AB9 8903"            /* ?Ü.…F.aås!.ÙZ¹‰. */
+	$"90BD 6F89 E7D0 35D1 0AA3 BBAE 3CF8 A7B7"            /* �½o‰çÐ5Ñ£»®<ø§· */
+	$"73C8 8B94 B409 16EC 60A6 E819 BCA7 BA66"            /* sÈ‹”´Æ.ì`¦è.¼§ºf */
+	$"2245 524C 718C 635D E4F7 ACA0 02C3 E0A7"            /* "ERLqŒc]ä÷¬ .Ãৠ*/
+	$"B542 0FF5 7029 FF4D 1D88 E3B3 D657 802B"            /* µB.õp)ÿM.ˆã³ÖW€+ */
+	$"8068 9BD4 B17F 9A6B CC1C 4B53 246F 81E5"            /* €h›Ô±.škÌ.KS$o�å */
+	$"9168 48EC 4B44 3FFF 7B8B 5777 5677 134E"            /* ‘hHìKD?ÿ{‹WwVw.N */
+	$"1B8E 8C91 429F CE85 86EF 62B4 71AF EAE7"            /* .ŽŒ‘BŸÎ…†ïb´q¯êç */
+	$"E333 7BD3 2825 7230 C950 0000 1B8D 8BA6"            /* ã3{Ó(%r0ÉP...�‹¦ */
+	$"04C1 56DC 30F0 619E DD6C D196 C91E 1ED4"            /* .ÁVÜ0ðažÝlÑ–É..Ô */
+	$"1285 94A8 F775 05A9 3440 78FF 7E52 8833"            /* .…”¨÷u.©4@xÿ~Rˆ3 */
+	$"E8A1 A4E4 4580 38DD ADE1 3BD5 AD19 74E6"            /* 衤äE€8Ý­á;Õ­.tæ */
+	$"EEA1 B4B1 0B0B 9BE9 08EC DB78 E6AA 37E5"            /* î¡´±..›é.ìÛxæª7å */
+	$"AD06 72A6 51FC 0004 4737 BF1A 89FF 7E11"            /* ­.r¦Qü..G7¿.‰ÿ~. */
+	$"0A68 EAD7 BDA5 4D5B 2C8D 0C7A 952E 2190"            /* Âhê×½¥M[,�.z•.!� */
+	$"8451 1B38 CEFD 2835 5ADD BDA2 01C2 A3D6"            /* „Q.8Îý(5Zݽ¢.壅 */
+	$"6046 4BD8 41DF D8B6 D9B1 1F96 5FF8 CC56"            /* `FKØAßضٱ.–_øÌV */
+	$"A63B 6E14 5035 26D6 946D 1F59 4D17 5507"            /* ¦;n.P5&Ö”m.YM.U. */
+	$"85F7 2DAF A737 4E30 9097 2E2E DAF8 37D1"            /* …÷-¯§7N0�—..Úø7Ñ */
+	$"D987 4E59 ABFD CDF3 AAC3 30D1 8616 FAB3"            /* Ù‡NY«ýÍóªÃ0ц.ú³ */
+	$"2914 92AA 6913 C36F 66DA 4B0B 18FE DD55"            /* ).’ªi.ÃofÚK..þÝU */
+	$"1D2A 3F00 D80C 2423 D923 95C6 E11D 0069"            /* .*?.Ø.$#Ù#•Æá..i */
+	$"B5C9 0803 0907 B950 13DF 48EC F794 3D36"            /* µÉ..Æ.¹P.ßHì÷”=6 */
+	$"5249 2492 4924 9249 2489 9EF6 DC36 9A6B"            /* RI$’I$’I$‰žöÜ6šk */
+	$"1751 415E A37F 47EC A4EA 67AC A222 733C"            /* .QA^£.Gì¤êg¬¢"s< */
+	$"467D 1FFE C727 E6AA 6E99 C584 A87E DFFF"            /* F}.þÇ'æªn™Å„¨~ßÿ */
+	$"7FC3 7592 8204 71A2 6088 C38B 6E65 868E"            /* .Ãu’‚.q¢`ˆÃ‹ne†Ž */
+	$"5A3F FF7F F919 4069 CF10 A302 5125 525C"            /* Z?ÿ.ù.@iÏ.£.Q%R\ */
+	$"A443 88AF 4104 7807 1410 84BA E955 76E8"            /* ¤Cˆ¯A.x...„ºéUvè */
+	$"5F35 B612 A668 5694 9249 2492 4924 9249"            /* _5¶.¦hV”’I$’I$’I */
+	$"2492 4924 4C25 1941 A4EB 1996 7A28 19C1"            /* $’I$L%.A¤ë.–z(.Á */
+	$"A1B0 01D7 ACB2 3F83 42DC D154 27C9 F11F"            /* ¡°.׬²?ƒBÜÑT'Éñ. */
+	$"FC46 90B1 89C4 F78A 4C6F 5C2A 833D 8425"            /* üF�±‰Ä÷ŠLo\*ƒ=„% */
+	$"D837 CA14 E4C7 7F8A 9833 99B7 E589 1376"            /* Ø7Ê.äÇ.Š˜3™·å‰.v */
+	$"C867 FF1D 200A 4C9B 624E 68E3 11AE C8AF"            /* Ègÿ. ÂL›bNhã.®È¯ */
+	$"1723 C741 CEAC 16CE C548 72FF 15CD 3E67"            /* .#ÇAά.ÎÅHrÿ.Í>g */
+	$"AF2C 323F 0FD0 6752 4973 55BD CC10 05B4"            /* ¯,2?.ÐgRIsU½Ì..´ */
+	$"AB3F 9302 00C3 EE70 1BA4 B650 FAB2 5821"            /* «?“..Ãîp.¤¶Pú²X! */
+	$"3856 3872 1B02 7D70 F1F9 0B28 A9DC CAE7"            /* 8V8r..}pñù.(©ÜÊç */
+	$"D9E7 6252 A768 A7DE 0FB1 FCB1 F54B 98C4"            /* ÙçbR§h§Þ.±ü±õK˜Ä */
+	$"7B6E 5E24 BC53 F945 741F 66A0 A51E EE5A"            /* {n^$¼SùEt.f ¥.îZ */
+	$"2A0D B951 4EEE A88B 4F2F C326 F326 1D12"            /* *.¹QNO/Ã&ó&.. */
+	$"524A 9E48 CC53 44EF C54F 1737 8505 46CF"            /* RJžHÌSDïÅO.7….FÏ */
+	$"351E 4354 05C7 C832 2A7D 8899 D009 E617"            /* 5.CT.ÇÈ2*}ˆ™ÐÆæ. */
+	$"0334 305D 9497 D845 E6D3 2CD2 178F 1316"            /* .40]”—ØEæÓ,Ò.�.. */
+	$"65AD 239E 2ED5 ECCB 402A E728 09B5 E847"            /* e­#ž.ÕìË@*ç(ƵèG */
+	$"65BD 3F31 CAC5 F9D8 6606 B8AF 4F84 89FE"            /* e½?1ÊÅùØf.¸¯O„‰þ */
+	$"9004 4730 30BC E58F 5FB3 38CF 36B9 38FC"            /* �.G00¼å�_³8Ï6¹8ü */
+	$"FB9D 07EA D13F 9DB9 7185 0E88 0E3B 06E5"            /* û�.êÑ?�¹q….ˆ.;.å */
+	$"D476 CFCA 1587 3067 9257 B5DF 1E83 E7FF"            /* ÔvÏÊ.‡0g’Wµß.ƒçÿ */
+	$"7FFF 7FFF 0E68 E181 AC15 B980 2AFB 1D80"            /* .ÿ.ÿ.há�¬.¹€*û.€ */
+	$"C5BB A88D E36A 4DC5 94CF 6DB2 0694 F977"            /* Å»¨�ãjMÅ”Ïm².”ùw */
+	$"D708 02D1 F380 6773 016A CA84 3B1C 6A33"            /* ×..Ñó€gs.jÊ„;.j3 */
+	$"5AAC BA2D FEC5 7542 51FC 68D0 CDDD EA44"            /* Z¬º-þÅuBQühÐÍÝêD */
+	$"788E 2F96 D80C F159 FF45 3316 1494 A7F5"            /* xŽ/–Ø.ñYÿE3..”§õ */
+	$"98B4 FC39 0062 D59B 52A6 32CB F97C ABD6"            /* ˜´ü9.bÕ›R¦2Ëù|«Ö */
+	$"42AE AE46 6AA7 D986 0A4E DCDD 717E 8B7C"            /* B®®Fj§Ù†ÂNÜÝq~‹| */
+	$"8FB8 B396 65A6 83FF 6A4A A5C1 597F 70AF"            /* �¸³–e¦ƒÿjJ¥ÁY.p¯ */
+	$"DC96 E2EC 0C1D 7A00 3428 2C60 DE32 8DB8"            /* Ü–âì..z.4(,`Þ2�¸ */
+	$"1604 C249 5E82 1F5B 6C23 E562 B2D4 754E"            /* ..ÂI^‚.[l#åb²ÔuN */
+	$"7F73 442A 25D3 C42A 6A6D 5D09 0E8C 2E67"            /* .sD*%ÓÄ*jm]Æ.Œ.g */
+	$"95EC 08FE B505 8B5A A4A8 0000 0000 0000"            /* •ì.þµ.‹Z¤¨...... */
+	$"0000 0000 6121 26B3 27C3 AEC0 FF52 2FEE"            /* ....a!&³'îÀÿR/î */
+	$"D4F3 92BB 06E2 ABE4 35DC A278 9084 B2F0"            /* Ôó’».â«ä5Ü¢x�„²ð */
+	$"EE1A ADB2 F770 3D4E 120A FD01 B042 CD00"            /* î.­²÷p=N.Âý.°BÍ. */
+	$"B9C2 B661 40B0 E5FC DC59 59F0 61C5 53A7"            /* ¹Â¶a@°åüÜYYðaÅS§ */
+	$"7AC1 7EDC 77B7 1C84 0F9A E321 389C E693"            /* zÁ~Üw·.„.šã!8œæ“ */
+	$"AC98 5160 DDD0 C9A9 BE17 ED52 A10A 300C"            /* ¬˜Q`ÝÐÉ©¾.íR¡Â0. */
+	$"88ED BB5A 80DA C23B 1196 0C7C 6BA8 D4EA"            /* ˆí»Z€ÚÂ;.–.|k¨Ôê */
+	$"4FAB 08A9 EBE3 1CC9 6782 F6A9 85A4 1829"            /* O«.©ëã.Ég‚ö©…¤.) */
+	$"48BB D188 41E8 65BA 28BB 8AC1 8368 DC2F"            /* H»ÑˆAèeº(»ŠÁƒhÜ/ */
+	$"B2DE 61FE 95C0 BD88 C027 9CD9 3819 8A81"            /* ²Þaþ•À½ˆÀ'œÙ8.Š� */
+	$"20FF 616C DEAE C6EA 15A3 D12F 764A B4E2"            /*  ÿalÞ®Æê.£Ñ/vJ´â */
+	$"ECA3 AF32 36FF 29B0 E3CD 5046 527E 39B7"            /* 죯26ÿ)°ãÍPFR~9· */
+	$"921A ABF8 F0CB 7040 5FCD A182 4C57 986D"            /* ’.«øðËp@_Í¡‚LW˜m */
+	$"1115 DD94 687C 3663 7CFB 6C40 642D C8CA"            /* ..Ý”h|6c|ûl@d-ÈÊ */
+	$"1117 B5A9 8025 123D 9406 58F9 96B5 321E"            /* ..µ©€%.=”.Xù–µ2. */
+	$"7646 4BFD 48DE 0B9B DBEF B79F B6C7 031E"            /* vFKýHÞ.›Ûï·Ÿ¶Ç.. */
+	$"1D3B 1D18 B35D 2813 5601 3924 6AE1 FC21"            /* .;..³](.V.9$jáü! */
+	$"60B9 0B9F 6B4B AFB9 15D8 C57A 5345 7461"            /* `¹.ŸkK¯¹.ØÅzSEta */
+	$"0EF9 4B6B 88D1 7833 02DF 4FB8 DBEC 836A"            /* .ùKkˆÑx3.ßO¸Ûìƒj */
+	$"BEA7 3972 93C0 F973 37B5 C84F 1655 031C"            /* ¾§9r“Àùs7µÈO.U.. */
+	$"674D 741E 308E E3BA 6684 5BB0 4506 AB40"            /* gMt.0Žãºf„[°E.«@ */
+	$"14DE BFF2 9B38 4026 C5C2 3A44 FDFF 25CB"            /* .Þ¿ò›8@&ÅÂ:Dýÿ%Ë */
+	$"072E 1D99 62E3 22B8 DE8D 9CF1 79FA 1D38"            /* ...™bã"¸Þ�œñyú.8 */
+	$"8900 17CB A72B 8124 7EAF CF2F FC8D 34D6"            /* ‰..˧+�$~¯Ï/ü�4Ö */
+	$"E0AC 58ED 8BC1 0DAA 7964 FB91 BF08 EFA6"            /* à¬Xí‹Á.ªydû‘¿.ï¦ */
+	$"42FF 7FFF 7FE3 AF13 7C4B 1CF4 D643 3CD3"            /* Bÿ.ÿ.ã¯.|K.ôÖC<Ó */
+	$"5F1A 08BB 7C56 5CFB 6D27 04DE C66A 9AF1"            /* _..»|V\ûm'.ÞÆjšñ */
+	$"2053 D4B2 EE60 44FF 2A89 1FFC DFCC 57C1"            /*  SÔ²î`Dÿ*‰.üßÌWÁ */
+	$"3800 1290 7854 7902 FF7A 9A36 D71E F8D1"            /* 8..�xTy.ÿzš6×.øÑ */
+	$"D439 471B D02F 4A39 E5BC D25F FDF0 8B54"            /* Ô9G.Ð/J9å¼Ò_ýð‹T */
+	$"AE0A 3677 2625 B286 7DEC 8FF7 2457 2B25"            /* ®Â6w&%²†}ì�÷$W+% */
+	$"C066 2A4E A605 EE16 7244 CCFD D3D3 FDA1"            /* Àf*N¦.î.rDÌýÓÓý¡ */
+	$"F3B8 76C3 1C5F 491C 0165 8735 D71D 19AD"            /* ó¸vÃ._I..e‡5×..­ */
+	$"9BB1 A40D E5BA 9D1C E34B B71C 9CF0 EC7A"            /* ›±¤.åº�.ãK·.œðìz */
+	$"5E87 C4F0 A326 0913 9E2C 6517 50A3 E72B"            /* ^‡Äð£&Æ.ž,e.P£ç+ */
+	$"87FE D348 2E5D 0A00 0000 0000 0000 0000"            /* ‡þÓH.]Â......... */
+	$"0002 2C86 A73D 4030 2FE4 D32C 2B56 C74C"            /* ..,†§=@0/äÓ,+VÇL */
+	$"0869 A5C9 151A 69B9 9390 DA50 4411 8FFF"            /* .i¥É..i¹“�ÚPD.�ÿ */
+	$"4938 4E36 F9DD 09FB E4A0 C339 2431 ED8B"            /* I8N6ùÝÆûä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FF4F E2A2 F01A C90F 02E3 51CD B477"            /* #fÿOâ¢ð.É..ãQÍ´w */
+	$"2230 690A B47C E28B 463C 2E88 7579 7943"            /* "0i´|â‹F<.ˆuyyC */
+	$"5055 6D0A EEC5 F3BF 2404 37D8 EFE1 71AC"            /* PUmÂîÅó¿$.7Øïáq¬ */
+	$"6AFE A3E4 A7EB 28BF BFFE 4373 E5FF 7E4A"            /* jþ£ä§ë(¿¿þCsåÿ~J */
+	$"2D5D 1ED3 6D78 1657 9914 A061 7958 972C"            /* -].Ómx.W™. ayX—, */
+	$"56FB D5B0 1FFD A18B 7A29 0C81 295B DF7C"            /* VûÕ°.ý¡‹z).�)[ß| */
+	$"83E3 CD36 0E66 7E2B D8FA 3096 AA44 7F9B"            /* ƒãÍ6.f~+Øú0–ªD.› */
+	$"F0B9 EA48 8CC7 0FFF 7E1C F394 CC5B 6A25"            /* ð¹êHŒÇ.ÿ~.ó”Ì[j% */
+	$"FD4C CECC 630B 38B7 D621 F081 73EE 9D40"            /* ýLÎÌc.8·Ö!ð�sî�@ */
+	$"7FAD FADD 8111 6492 599E DD2C 3600 FF6C"            /* .­úÝ�.d’YžÝ,6.ÿl */
+	$"5A8D B0B8 2AE7 668D C5A0 826B FA0D C5B1"            /* Z�°¸*çf�Å ‚kú.ű */
+	$"6873 D749 B533 9627 C2F6 4922 63F7 8944"            /* hs×Iµ3–'ÂöI"c÷‰D */
+	$"15C5 A1F9 8539 A21A 1CEB 1C2D 7D1B 0516"            /* .Å¡ù…9¢..ë.-}... */
+	$"FD6C 5D4F 92A3 14D9 126F C5FC 4116 B499"            /* ýl]O’£.Ù.oÅüA.´™ */
+	$"D878 D889 9123 D3C8 4637 36E3 8644 6F0B"            /* Øx؉‘#ÓÈF76ã†Do. */
+	$"D2C6 A599 B793 1367 B548 23BD 8836 11E5"            /* ÒÆ¥™·“.gµH#½ˆ6.å */
+	$"C323 7AD5 0534 3D05 A4E6 70B3 0376 2B0C"            /* Ã#zÕ.4=.¤æp³.v+. */
+	$"A964 173B F0BC 2A52 7FE4 2A53 85C2 22B2"            /* ©d.;ð¼*R.ä*S…Â"² */
+	$"B83F 7185 FB4C 3769 5B3E 4A24 E7E1 D0FD"            /* ¸?q…ûL7i[>J$çáÐý */
+	$"9B17 8737 FE8B E4C7 9FC1 0E30 D904 D0C5"            /* ›.‡7þ‹äÇŸÁ.0Ù.ÐÅ */
+	$"D2F5 05E4 3CD6 5FA7 B9AF FB98 755E 0BAF"            /* Òõ.ä<Ö_§¹¯û˜u^.¯ */
+	$"E4EE 408D A8BE 5E58 07A6 059D 1B33 37F3"            /* äî@�¨¾^X.¦.�.37ó */
+	$"8D14 871A 7FC6 43ED 6A6F 8F41 9681 095E"            /* �.‡..ÆCíjo�A–�Æ^ */
+	$"EE46 5BA4 1E15 F5F2 3063 E524 A62A 7C7F"            /* îF[¤..õò0cå$¦*|. */
+	$"0E38 5D00 A378 8F6D 3861 2088 EDD7 AC24"            /* .8].£x�m8a ˆí׬$ */
+	$"D3B6 B052 DE10 357D B65A 1414 4596 8E3D"            /* Ó¶°RÞ.5}¶Z..E–Ž= */
+	$"97E3 D838 9ACC 3C84 AF82 EA8D 8BD3 0180"            /* —ãØ8šÌ<„¯‚ê�‹Ó.€ */
+	$"1582 0654 BB61 1047 ACA1 29D3 7CFA 00C8"            /* .‚.T»a.G¬¡)Ó|ú.È */
+	$"BABC 146B 250C 8D19 8A4E A8B3 50D6 B986"            /* º¼.k%.�.ŠN¨³PÖ¹† */
+	$"2AD6 CEFA 02D6 AE11 FF7C B0A2 E6E0 30E9"            /* *ÖÎú.Ö®.ÿ|°¢æà0é */
+	$"D904 4C03 3BC1 8B68 5892 30B8 7D69 C2D6"            /* Ù.L.;Á‹hX’0¸}iÂÖ */
+	$"A9F8 56A2 7417 1E31 186F 09A1 4C11 6DCA"            /* ©øV¢t..1.oÆ¡L.mÊ */
+	$"A62E 5FCC F59A CCE8 6A29 B0DF E2BC E8BF"            /* ¦._ÌõšÌèj)°ßâ¼è¿ */
+	$"92DF 70C1 8B09 21DF 1440 1684 4413 2A60"            /* ’ßpÁ‹Æ!ß.@.„D.*` */
+	$"E033 6D92 8573 E63C 2746 6F40 D8F0 D0C9"            /* à3m’…sæ<'Fo@ØðÐÉ */
+	$"10AF 85A2 CFBF 373B B250 85E4 C1D3 85D2"            /* .¯…¢Ï¿7;²P…äÁÓ…Ò */
+	$"E167 1222 DF4A 67D9 B3D6 55B4 B047 8675"            /* ág."ßJgÙ³ÖU´°G†u */
+	$"C803 6AE5 E5AE AF92 C4B7 591A A040 98AC"            /* È.jå宯’Ä·Y. @˜¬ */
+	$"4412 45F8 BBC8 6482 F7BD 81B2 98FE 9D0B"            /* D.Eø»Èd‚÷½�²˜þ�. */
+	$"DAB1 2959 952C 9115 3504 9A24 BBA4 A04C"            /* Ú±)Y•,‘.5.š$»¤ L */
+	$"4125 5810 54F5 C268 63C2 1DB9 11CF 85BB"            /* A%X.TõÂhcÂ.¹.Ï…» */
+	$"D941 F5A1 0239 DED3 856D BBE5 7CF3 49C3"            /* ÙAõ¡.9ÞÓ…m»å|óIà */
+	$"C9CF 1BD1 A953 F58A F9AF E704 E70E 43B7"            /* ÉÏ.Ñ©SõŠù¯ç.ç.C· */
+	$"2B51 BE14 4FF3 262C 914B 90AF F2A9 E060"            /* +Q¾.Oó&,‘K�¯ò©à` */
+	$"6A24 6553 B776 C48D 19AD ECD3 2DD3 8ECF"            /* j$eS·vÄ�.­ìÓ-ÓŽÏ */
+	$"9EC7 8A0D 97F4 3C69 6E56 0881 1136 C147"            /* žÇŠ.—ô<inV.�.6ÁG */
+	$"E7D3 6FE5 A0C6 D7DC BCB0 76AC C4F8 DD65"            /* çÓoå Æ×ܼ°v¬ÄøÝe */
+	$"A5F9 02BF 2BFD 9A2C 354D 24C2 E088 6B63"            /* ¥ù.¿+ýš,5M$Âàˆkc */
+	$"E514 C014 E8F4 F5C2 B529 74FB EC02 032B"            /* å.À.èôõµ)tûì..+ */
+	$"A54B 696E B602 7D58 4542 824D BD8C 40FA"            /* ¥Kin¶.}XEB‚M½Œ@ú */
+	$"F675 5CD4 71C9 058E 7062 0E1B 10CC 72A9"            /* öu\ÔqÉ.Žpb...Ìr© */
+	$"95B8 C5FD 7EAF 995C 62ED DDE4 6579 3181"            /* •¸Åý~¯™\bíÝäey1� */
+	$"8BA1 A02B 1559 F5BC E9C9 914D 8CEB D7D8"            /* ‹¡ +.Yõ¼éÉ‘MŒë×Ø */
+	$"7D81 20C0 A609 18D2 B679 7C08 FB00 E4C6"            /* }� À¦Æ.Ò¶y|.û.äÆ */
+	$"2797 518E 32CE 67CE 3C8E 6796 A832 F712"            /* '—QŽ2ÎgÎ<Žg–¨2÷. */
+	$"0037 059C 96CD 85A0 98E6 5D20 05F2 EC61"            /* .7.œ–Í… ˜æ] .òìa */
+	$"335D AFFF 14BC 3EF9 0779 7A53 BAA4 F47A"            /* 3]¯ÿ.¼>ù.yzSº¤ôz */
+	$"6926 DAD2 72F9 5D4B 1014 8BD5 A4FA 68EA"            /* i&ÚÒrù]K..‹Õ¤úhê */
+	$"D9F9 F684 BFD5 F2ED FB9E 4C18 91C3 FF17"            /* Ùùö„¿ÕòíûžL.‘Ãÿ. */
+	$"2D17 D99A DE29 FE6E 63A4 C901 8642 9357"            /* -.ÙšÞ)þnc¤É.†B“W */
+	$"3120 4386 1938 E7D2 572D 0C59 E3C9 7FED"            /* 1 C†.8çÒW-.YãÉ.í */
+	$"30FA E54A CEF8 A94C F92D AF19 76EA 3372"            /* 0úåJÎø©Lù-¯.vê3r */
+	$"B4E1 E7C5 8239 A4AC A247 4838 55E8 EB9B"            /* ´áçÅ‚9¤¬¢GH8Uèë› */
+	$"DE7D 94E9 DBD7 07FB D488 1672 E61D 9E4C"            /* Þ}”éÛ×.ûÔˆ.ræ.žL */
+	$"6DF2 97D5 4936 F89A 5CBC D37A 8C2C F7ED"            /* mò—ÕI6øš\¼ÓzŒ,÷í */
+	$"9755 19F2 0350 AB2E D851 F0B7 78B5 9770"            /* —U.ò.P«.ØQð·xµ—p */
+	$"4DF3 4212 9C9C CA3B 403A BA7B D497 9410"            /* MóB.œœÊ;@:º{Ô—”. */
+	$"04C6 288B 5058 5DC9 EB79 AB85 622C 9A55"            /* .Æ(‹PX]Éëy«…b,šU */
+	$"2DA7 C113 9315 7CAE D84E 6B50 4062 AE94"            /* -§Á.“.|®ØNkP@b®” */
+	$"8F5E 7969 4BA5 56B2 E881 8C02 ED3B 5259"            /* �^yiK¥V²è�Œ.í;RY */
+	$"24CE C98A 4348 12B1 314F E3E3 B6A3 4E61"            /* $ÎÉŠCH.±1Oã㶣Na */
+	$"A426 6350 E380 B0B5 DEFF 64CF 72D6 D4B9"            /* ¤&cP〰µÞÿdÏrÖÔ¹ */
+	$"907C 9BE0 7E4D 39F9 2BB7 C3DE D7C3 DCD8"            /* �|›à~M9ù+·ÃÞ×ÃÜØ */
+	$"1F93 775F 0F44 DF0F A717 C3E9 D603 F269"            /* .“w_.Dß.§.ÃéÖ.òi */
+	$"FBE1 D36F 87B3 6F87 B280 E8AB DECC AF0D"            /* ûáÓo‡³o‡²€è«Þ̯. */
+	$"6C8A C695 8734 87EB A75F 5130 05EC 9BA8"            /* lŠÆ•‡4‡ë§_Q0.웨 */
+	$"78DB 85A2 680C 75A0 EDD1 4AA2 7E1B BAFF"            /* xÛ…¢h.u íÑJ¢~.ºÿ */
+	$"5AFC FD6C 3E36 A6D9 923A 2DCE 24BC 35EF"            /* Züýl>6¦Ù’:-Î$¼5ï */
+	$"27F4 8813 7CC4 0141 3CD9 9568 BFE6 BBB3"            /* 'ôˆ.|Ä.A<Ù•h¿æ»³ */
+	$"219B 0442 5227 3796 635D 0DE7 499A A701"            /* !›.BR'7–c].çIš§. */
+	$"7F74 FB13 F9DF E737 08AB 0A91 3D9E B77D"            /* .tû.ùßç7.«Â‘=ž·} */
+	$"E616 57BB 8BAF 7A0D 1B28 42E6 D653 6BD3"            /* æ.W»‹¯z..(BæÖSkÓ */
+	$"D7A8 9A2B 0905 6198 8809 E5D0 D0A4 F589"            /* רš+Æ.a˜ˆÆåÐФõ‰ */
+	$"3D04 8161 C4CB 7BC9 96E2 9DA4 1C59 C982"            /* =.�aÄË{É–â�¤.YÉ‚ */
+	$"4705 B1BE 1E05 E391 5E89 43FE 6C67 4342"            /* G.±¾..ã‘^‰CþlgCB */
+	$"636F 80C5 6A98 16E6 6B80 27C8 D0D9 B28C"            /* co€Åj˜.æk€'ÈÐÙ²Œ */
+	$"6FD4 E109 61AB 8FCB D4CB 19ED 2BE7 B510"            /* oÔáÆa«�ËÔË.í+çµ. */
+	$"C0E8 5883 0642 92A1 6094 7E45 5D3F 819A"            /* ÀèXƒ.B’¡`”~E]?�š */
+	$"4B6F AE8E ED0B 4B30 ABB1 2789 5C58 EEFD"            /* Ko®Ží.K0«±'‰\Xîý */
+	$"06C9 EF2B 2A12 1731 7581 4428 C72D 2501"            /* .Éï+*..1u�D(Ç-%. */
+	$"2C14 0DA4 2C98 035F FEA8 51A2 0E61 4C50"            /* ,..¤,˜._þ¨Q¢.aLP */
+	$"4A65 60DE FA1C F36C 62D9 A3FA 93A6 4CAC"            /* Je`Þú.ólbÙ£ú“¦L¬ */
+	$"C1D0 079D 912F A133 724B 13CC AFF4 1382"            /* ÁÐ.�‘/¡3rK.̯ô.‚ */
+	$"D61F 8AF2 A48B CCA6 5D66 4F61 E6BE 657B"            /* Ö.Šò¤‹Ì¦]fOaæ¾e{ */
+	$"7F5B 6F20 397A BBC2 3F23 86DF 2355 4A18"            /* .[o 9z»Â?#†ß#UJ. */
+	$"15DB CB3E 201F FF7C 4AC9 C764 B098 CA46"            /* .ÛË> .ÿ|JÉÇd°˜ÊF */
+	$"C2CF 44C6 42E7 D30A FD05 380F 6BD3 24C1"            /* ÂÏDÆBçÓÂý.8.kÓ$Á */
+	$"3998 C5C1 E7D5 0E2C 8D50 7FBB 7A11 6CB7"            /* 9˜ÅÁçÕ.,�P.»z.l· */
+	$"B80F 5A84 44BE E746 C43C 6B5D F055 7A3B"            /* ¸.Z„D¾çFÄ<k]ðUz; */
+	$"77CB BFA9 2B73 06AF 9C8B AF37 F600 E568"            /* wË¿©+s.¯œ‹¯7ö.åh */
+	$"EE70 09D2 B0A7 C201 94D9 AC58 E9A2 9D53"            /* îpÆÒ°§Â.”Ù¬Xé¢�S */
+	$"94C0 D1C9 E379 E453 E4C7 27C5 C3F8 1161"            /* ”ÀÑÉãyäSäÇ'ÅÃø.a */
+	$"D631 3F3C 0CFE 13A3 F6EB 3048 F049 CF11"            /* Ö1?<.þ.£öë0HðIÏ. */
+	$"5962 65AE 5D8E F911 A2E2 7787 6C78 F63C"            /* Ybe®]Žù.¢âw‡lxö< */
+	$"E24C ED5B F634 B2B9 9DDF 51B0 94B9 1ABF"            /* âLí[ö4²¹�ßQ°”¹.¿ */
+	$"BE93 4236 35A6 613E 3D1B C8FD 0587 27C7"            /* ¾“B65¦a>=.Èý.‡'Ç */
+	$"F936 55E0 D0CE BF1A 50D8 51CE 6253 0293"            /* ù6UàÐο.PØQÎbS.“ */
+	$"1958 3FA2 BF6C 54A5 B158 4236 7F88 7DE4"            /* .X?¢¿lT¥±XB6.ˆ}ä */
+	$"C231 6D0B 62F1 2C6C 1A1D F8AA 0317 C52D"            /* Â1m.bñ,l..øª..Å- */
+	$"D9D5 0B61 312B A074 B2B8 1905 FCF9 A102"            /* ÙÕ.a1+ t²¸..üù¡. */
+	$"6188 616D 74E6 8232 245D 9C8A 4FD8 E2FD"            /* aˆamtæ‚2$]œŠOØâý */
+	$"0C6C 8F2E 5C82 5724 C542 3AE5 BA0A EE0B"            /* .l�.\‚W$ÅB:åºÂî. */
+	$"2A14 BCDE 8005 4446 25B1 CF8A 6744 9F5C"            /* *.¼Þ€.DF%±ÏŠgDŸ\ */
+	$"9B09 6571 3003 9F52 A42A 7669 CCAA 7A75"            /* ›Æeq0.ŸR¤*vi̪zu */
+	$"F807 2530 7BA9 1474 F318 5A7B E64A 5DD7"            /* ø.%0{©.tó.Z{æJ]× */
+	$"A6F2 13B0 AFA5 7BF8 46DC CABF 4D80 CC26"            /* ¦ò.°¯¥{øFÜÊ¿M€Ì& */
+	$"5838 4016 3C05 4550 C62F 1504 5B79 0816"            /* X8@.<.EPÆ/..[y.. */
+	$"556C 8524 5DDA E914 92F1 3124 5C5B 3213"            /* Ul…$]Úé.’ñ1$\[2. */
+	$"7851 D9B8 EE79 46CF 3F06 1EAB 662A FD9E"            /* xQÙ¸îyFÏ?..«f*ýž */
+	$"E7D8 2E8C 938F 43FA B1B1 34B0 9207 34EC"            /* çØ.Œ“�Cú±±4°’.4ì */
+	$"7A09 46BF 201E 311F EEEE 88EF C6C1 C10D"            /* zÆF¿ .1.îîˆïÆÁÁ. */
+	$"E238 50C9 7F01 DFF0 2170 EDD1 7471 8C14"            /* â8PÉ..ßð!píÑtqŒ. */
+	$"FB17 6678 A8B9 6611 9713 D8BB 8840 427C"            /* û.fx¨¹f.—.Ø»ˆ@B| */
+	$"8E5E 1608 D5E6 79B6 0BD7 3592 5D97 3864"            /* Ž^..Õæy¶.×5’]—8d */
+	$"71DF 6137 C0E6 2EB0 F71D 466C CFFF 50EF"            /* qßa7Àæ.°÷.FlÏÿPï */
+	$"FE99 2E4D 0DBB 537F 32F1 DECB D5D4 39DF"            /* þ™.M.»S.2ñÞËÕÔ9ß */
+	$"4FCC 2FC2 C399 8EB9 FC8B 2806 3FB7 F227"            /* OÌ/ÂÙŽ¹ü‹(.?·ò' */
+	$"BA12 A288 9858 9159 B6ED 0DBF 3DCC 8FA1"            /* º.¢ˆ˜X‘Y¶í.¿=Ì�¡ */
+	$"9CF5 836D 499F B9E7 DB4E 497F D3A4 57BF"            /* œõƒmIŸ¹çÛNI.Ó¤W¿ */
+	$"9F0A EECE 8E29 127A 82FF 4222 75AC 32D4"            /* ŸÂîÎŽ).z‚ÿB"u¬2Ô */
+	$"6540 8040 4137 9EB4 EFFF 7FEC 9D37 60B4"            /* e@€@A7ž´ïÿ.ì�7`´ */
+	$"184A 9567 71E4 F5FE 1C55 BB95 9FD8 BE6D"            /* .J•gqäõþ.U»•ŸØ¾m */
+	$"037F 052C 035B 91D7 903B 6EEC 1642 3D18"            /* ...,.[‘×�;nì.B=. */
+	$"0B05 FEC5 4C0C 9ED3 BFA5 94AF CBB1 E725"            /* ..þÅL.žÓ¿¥”¯Ë±ç% */
+	$"DFC3 AF74 2485 D5A2 7F79 1275 C7DD ADE1"            /* ßït$…Õ¢.y.uÇÝ­á */
+	$"3BD5 AD19 74E6 EE9F 6846 7900 C09D 090B"            /* ;Õ­.tæîŸhFy.À�Æ. */
+	$"C17C FB0F 2C9F 4DEB B9FE 7152 A47E B1CB"            /* Á|û.,ŸMë¹þqR¤~±Ë */
+	$"FB0E 7108 21C7 EFAB 8FA3 8AF0 2FDC 17A9"            /* û.q.!Çï«�£Šð/Ü.© */
+	$"2565 5082 BEBF 4DDD 0699 3265 82AE D421"            /* %eP‚¾¿MÝ.™2e‚®Ô! */
+	$"3776 341F C56C ECDA B302 0306 AE5F 37FF"            /* 7v4.ÅlìÚ³...®_7ÿ */
+	$"7FB7 1192 8D68 5475 EE0B 4D80 6149 DEBB"            /* .·.’�hTuî.M€aIÞ» */
+	$"F9A7 D7E7 A35D 9515 8000 4F04 C4D6 670C"            /* ù§×ç£]•.€.O.ÄÖg. */
+	$"54B7 93BB D264 43E0 E8D4 2D4D D3E2 AEB0"            /* T·“»ÒdCàèÔ-MÓâ®° */
+	$"FBAE F5BD A155 A8F2 07B4 AAA6 CE0A 84CC"            /* û®õ½¡U¨ò.´ª¦ÎÂ„Ì */
+	$"907F D5C4 9900 8FE2 0E0D F385 55A0 CDFF"            /* �.ÕÄ™.�â..ó…U Íÿ */
+	$"7FFE D776 193F A5C4 0334 DD15 7A6A 0890"            /* .þ×v.?¥Ä.4Ý.zj.� */
+	$"DE98 5707 7799 9A5B D638 31B9 982B 5623"            /* Þ˜W.w™š[Ö81¹˜+V# */
+	$"3AFA A84A 20E7 417C F56E 7776 0C54 0765"            /* :ú¨J çA|õnwv.T.e */
+	$"91DE A19E 3DD2 4D8B F9F9 0D61 6343 0746"            /* ‘Þ¡ž=ÒM‹ùù.acC.F */
+	$"7D72 600B 4E15 FC8F 60FA A273 4348 A86E"            /* }r`.N.ü�`ú¢sCH¨n */
+	$"E11A CD6B 3FFF 7ED1 E486 AAAA A380 045A"            /* á.Ík?ÿ~Ñ䆪ª£€.Z */
+	$"70E5 3753 4FFF 7FC6 ADBE 8E71 66FF 8165"            /* på7SOÿ.Æ­¾Žqfÿ�e */
+	$"D782 24E8 7399 0C15 03BF 29B5 5685 FDA1"            /* ׂ$ès™...¿)µV…ý¡ */
+	$"5BAD 5751 6D53 799A A7C6 572E 6A37 B46A"            /* [­WQmSyš§ÆW.j7´j */
+	$"B9BF 05BF 3131 F7DB E3B8 8F11 EE2F 13D6"            /* ¹¿.¿11÷Ûã¸�.î/.Ö */
+	$"7DE9 D552 0B25 FEAF AEFE F0A7 FBE9 487F"            /* }éÕR.%þ¯®þð§ûéH. */
+	$"9085 0FFA 23FE A9DB 0494 B0E1 FEFD 1D50"            /* �….ú#þ©Û.”°áþý.P */
+	$"15B4 6548 AAA0 0182 C5FF 7D24 05C8 B15E"            /* .´eHª .‚Åÿ}$.ȱ^ */
+	$"E45F A508 3C68 CA73 3A57 A35E 462D 9213"            /* ä_¥.<hÊs:W£^F-’. */
+	$"9D19 A4FE F266 C323 64FF 7B71 19F7 0BC3"            /* �.¤þòfÃ#dÿ{q.÷.Ã */
+	$"062C 20C4 9745 F075 6FFF 31F0 A3AD 4C84"            /* ., Ä—Eðuoÿ1ð£­L„ */
+	$"00F3 104C 0064 3899 0DB9 8128 CB5F FF46"            /* .ó.L.d8™.¹�(Ë_ÿF */
+	$"7184 41CB 7E58 4C0B ADD5 CBB2 1A61 E3D6"            /* q„AË~XL.­Õ˲.aãÖ */
+	$"B45F 489E 7FE9 D915 2B77 0776 98BD B3A6"            /* ´_Hž.éÙ.+w.v˜½³¦ */
+	$"230E B817 1D5A D937 3251 2449 6B0A 5A13"            /* #.¸..ZÙ72Q$IkÂZ. */
+	$"C4E0 BB45 CB72 9758 9E56 158D B1E6 9590"            /* Äà»EËr—XžV.�±æ•� */
+	$"4FC4 0611 EDBC 426F 6D2B D932 D595 A74E"            /* OÄ..í¼Bom+Ù2Õ•§N */
+	$"8728 58CD BD02 9746 DBA2 7EAB 0F07 363C"            /* ‡(Xͽ.—FÛ¢~«..6< */
+	$"BAB3 1228 E02A BDB4 373F F3FB FF7D 8D0D"            /* º³.(à*½´7?óûÿ}�. */
+	$"2193 09F4 7603 A017 98B1 421E 7A47 D126"            /* !“Æôv. .˜±B.zGÑ& */
+	$"82FD 5449 B97F F864 5CD5 19F6 A8A4 F216"            /* ‚ýTI¹.ød\Õ.ö¨¤ò. */
+	$"A4B3 FF7F E820 4C58 DE4B 944B 6FD4 F4DA"            /* ¤³ÿ.è LXÞK”KoÔôÚ */
+	$"596E A688 456C 3F0D 7844 1596 2BED 0D5D"            /* Yn¦ˆEl?.xD.–+í.] */
+	$"FAFB 8D2E D7D0 ABCB B2BE 8D80 E74D 9EDC"            /* úû�.×Ы˲¾�€çMžÜ */
+	$"7FFF 7FC9 2FB9 3BDA F47A B9C2 E1B8 5CC8"            /* .ÿ.É/¹;Úôz¹Âá¸\È */
+	$"14AB D534 7208 32FE 73D2 EF23 862E 10F8"            /* .«Õ4r.2þsÒï#†..ø */
+	$"C16F 1FFF 6FBB FA97 5167 CDAD 4886 8FC2"            /* Áo.ÿo»ú—QgÍ­H†� */
+	$"BFFF 7FFE 2B73 126E 1EC8 C82A 3F6D 6CC3"            /* ¿ÿ.þ+s.n.ÈÈ*?mlà */
+	$"D98A D501 1DC2 82FD FF57 9731 B866 2A7D"            /* ÙŠÕ..‚ýÿW—1¸f*} */
+	$"C983 5F41 893F 2D09 F81C E373 42C2 5963"            /* Ƀ_A‰?-Æø.ãsBÂYc */
+	$"7E9F C269 2B8B C21A 8247 D433 0DF7 491E"            /* ~ŸÂi+‹Â.‚GÔ3.÷I. */
+	$"D1BF 3D9E F4BD 1B50 8034 4EE9 4A69 B155"            /* Ñ¿=žô½.P€4NéJi±U */
+	$"849A B0F7 8CEA 3FD0 E4A0 C339 2431 ED8B"            /* „š°÷Œê?Ðä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FD9F 7F36 9703 7BCA 1455 6A98 F02E"            /* #fýŸ.6—.{Ê.Uj˜ð. */
+	$"1EDC 4707 C9A6 B325 A6E4 637D 612B B3DD"            /* .ÜG.ɦ³%¦äc}a+³Ý */
+	$"1E5A 3660 EEB0 BEFA 2C50 307B 5887 6D39"            /* .Z6`î°¾ú,P0{X‡m9 */
+	$"0EC7 2D81 C32E 6B72 8546 30E4 133F 3D3B"            /* .Ç-�Ã.kr…F0ä.?=; */
+	$"0A76 21AA 4387 8F29 03C8 1C32 755C F553"            /* Âv!ªC‡�).È.2u\õS */
+	$"5CA1 C16A 02EC 4654 97C8 6F10 BA2A 16E0"            /* \¡Áj.ìFT—Èo.º*.à */
+	$"DB18 605E 8A18 8A6E 4F35 1EF7 8C57 F8B2"            /* Û.`^Š.ŠnO5.÷ŒWø² */
+	$"0020 4D0A 1739 2287 ADE2 B0C2 D816 17D2"            /* . MÂ.9"‡­â°ÂØ..Ò */
+	$"21F8 3104 FEA8 38E3 8644 6F0B D2C6 A599"            /* !ø1.þ¨8ã†Do.ÒÆ¥™ */
+	$"B793 1367 B548 23BD 8836 1143 D5DB 2720"            /* ·“.gµH#½ˆ6.CÕÛ'  */
+	$"73BB 1485 DEAF C96F 24E8 AA26 56B9 89D3"            /* s».…Þ¯Éo$èª&V¹‰Ó */
+	$"8F8D 2F3E 5EA5 466C BE3C 6879 6C0A 5891"            /* ��/>^¥Fl¾<hylÂX‘ */
+	$"974E 6F22 0E47 66D4 BD1F 6A7D 1885 42CC"            /* —No".GfÔ½.j}.…BÌ */
+	$"7E13 126E AC98 74B7 B093 BDFF 37DB E527"            /* ~..n¬˜t·°“½ÿ7Ûå' */
+	$"E6D0 CF2A D7E6 E7EB 1095 05AF 6407 BB9B"            /* æÐÏ*×æçë.•.¯d.»› */
+	$"0227 D5EB 260A C844 340F B249 E84F 58A7"            /* .'Õë&ÂÈD4.²IèOX§ */
+	$"FA14 9D34 7614 73A6 BE73 ED76 B2CD 4515"            /* ú.�4v.s¦¾sív²ÍE. */
+	$"F26C 3AD7 7C32 5480 5A3A C4DF 123A EA95"            /* òl:×|2T€Z:Äß.:ê• */
+	$"D2B4 A3D8 F88D E685 6505 A999 DD9E C8D1"            /* Ò´£Øø�æ…e.©™ÝžÈÑ */
+	$"A073 3702 5A8F 3598 F7DC A36F 0058 065E"            /*  s7.Z�5˜÷Ü£o.X.^ */
+	$"65E6 B5AC 2A85 0F1C 43BF 8A10 43A0 BB10"            /* e浬*…..C¿Š.C ». */
+	$"4C3A 8F4F 95AD 253D EEE9 FBE8 4023 4647"            /* L:�O•­%=îéûè@#FG */
+	$"7A75 8F1C 9245 3C51 3FF5 BD2B DFD3 57EF"            /* zu�.’E<Q?õ½+ßÓWï */
+	$"1FB4 900F 4546 6EFA A7AE 45EB EAE9 7B9D"            /* .´�.EFnú§®Eëêé{� */
+	$"6408 1DCB F7AC BE44 7D08 1482 2257 A9CF"            /* d..Ë÷¬¾D}..‚"W©Ï */
+	$"8B78 3610 9816 9518 A64C 215A 4569 6C5F"            /* ‹x6.˜.•.¦L!ZEil_ */
+	$"57E0 4F89 F77C 88D6 ADFC 8E42 9299 A2C9"            /* WàO‰÷|ˆÖ­üŽB’™¢É */
+	$"0F7C EA0A 7E98 B7AF 70ED 09A8 0759 B1A7"            /* .|êÂ~˜·¯píƨ.Y±§ */
+	$"C18E 2CC9 883F A788 A2F1 57B9 7A0E F384"            /* ÁŽ,Ɉ?§ˆ¢ñW¹z.ó„ */
+	$"F0CE 46F0 E10A ED6F CE17 2BE1 25D5 3A36"            /* ðÎFðáÂíoÎ.+á%Õ:6 */
+	$"5C6A F3AA F2D1 7225 6C5C 514F 8F1F 64A5"            /* \jóªòÑr%l\QO�.d¥ */
+	$"B08E D05D 3E2E B3E4 DE48 12A9 7DC6 6E03"            /* °ŽÐ]>.³äÞH.©}Æn. */
+	$"05B3 2AD0 EF87 EFB1 6D03 06E4 85AB 36C6"            /* .³*Ðï‡ï±m..ä…«6Æ */
+	$"9BF6 8382 74F2 F321 62DF 269C 8D95 8FBD"            /* ›öƒ‚tòó!bß&œ�•�½ */
+	$"C4CA 7278 FDBA C51B A4FC C224 BD43 5F76"            /* ÄÊrxýºÅ.¤üÂ$½C_v */
+	$"F9D9 0970 5EAA 5F05 FDCB 50DE 35E7 A82E"            /* ùÙÆp^ª_.ýËPÞ5ç¨. */
+	$"1E7E 584D 33D8 EF90 B221 622F 778E 460D"            /* .~XM3Øï�²!b/wŽF. */
+	$"6DC9 383F CF41 7B89 7414 97EF EFE2 CC75"            /* mÉ8?ÏA{‰t.—ïïâÌu */
+	$"8895 6AFD C6E8 610E 5E29 7AE1 FAAF 9FD5"            /* ˆ•jýÆèa.^)záú¯ŸÕ */
+	$"435F 3F61 6F9F AC78 7EAD 62BE 7DF7 7CFD"            /* C_?aoŸ¬x~­b¾}÷|ý */
+	$"D3FD 5BAF 83F5 5B37 CF6D BE7E 9DDF 3F4D"            /* Óý[¯ƒõ[7Ïm¾~�ß?M */
+	$"80E8 ABDE CCAF 0D6C 8AC6 9587 348A 7A5A"            /* €è«Þ̯.lŠÆ•‡4ŠzZ */
+	$"21F6 5D05 F6A4 1727 AC99 8E36 4607 A805"            /* !ö].ö¤.'¬™Ž6F.¨. */
+	$"1CA8 FB12 6979 4216 6FCF DF65 6135 AFF9"            /* .¨û.iyB.oÏßea5¯ù */
+	$"5A1E 01C1 15A0 4F38 E547 6F65 858D 0788"            /* Z..Á. O8åGoe…�.ˆ */
+	$"49E3 07A2 D476 B767 EC21 FF65 559D 3B3F"            /* Iã.¢Ôv·gì!ÿeU�;? */
+	$"B8A5 C1A8 6496 5183 24E6 93A6 DF2F 52F1"            /* ¸¥Á¨d–Qƒ$擦ß/Rñ */
+	$"19CA BFD7 1479 8040 2F9C 0DB9 00F0 49C5"            /* .Ê¿×.y€@/œ.¹.ðIÅ */
+	$"3D32 5B0C 9453 8D1F 452F D9E7 75FD CD61"            /* =2[.”S�.E/ÙçuýÍa */
+	$"44A9 62C3 F0C8 BAF0 6A66 A4D4 AA8B 73B0"            /* D©bÃðȺðjf¤Ôª‹s° */
+	$"C942 686A 4A1E E3A7 2343 A0ED D595 9AFC"            /* ÉBhjJ.ã§#C íÕ•šü */
+	$"5546 0ACB FD23 6F2E DCEE ABBD 70E7 FA93"            /* UFÂËý#o.Üpçú“ */
+	$"3FFF 7FC5 7D31 FA1C D910 1C70 6CDC 3362"            /* ?ÿ.Å}1ú.Ù..plÜ3b */
+	$"B0A1 C6F3 16D1 BE51 73D2 4697 37CA 8197"            /* °¡Æó.ѾQsÒF—7Ê�— */
+	$"A8C6 89C1 FF78 99EB 31B8 5F88 7B08 C557"            /* ¨Æ‰Áÿx™ë1¸_ˆ{.ÅW */
+	$"5483 A35C 0713 94D5 D2DF B84C 36CA D9EC"            /* Tƒ£\..”ÕÒ߸L6ÊÙì */
+	$"8FC7 A305 814F 8B04 07D2 E391 5E89 43FE"            /* �Ç£.�O‹..Òã‘^‰Cþ */
+	$"6C67 4343 91DB DD56 C1D2 FEA6 9F1F 346F"            /* lgCC‘ÛÝVÁÒþ¦Ÿ.4o */
+	$"714B 79E1 7AC7 53A1 9934 69F4 E886 5A9C"            /* qKyázÇS¡™4iôè†Zœ */
+	$"6F9A D26F DD48 5F60 A72A 7E20 77F8 1BE8"            /* ošÒoÝH_`§*~ wø.è */
+	$"91B9 9018 8124 7694 3664 4202 7B94 1007"            /* ‘¹�.�$v”6dB.{”.. */
+	$"4234 15FC 04A2 6DE0 DC6B 5EDE 4332 F592"            /* B4.ü.¢màÜk^ÞC2õ’ */
+	$"779A A3BD 8E84 5464 DE08 6BAE AE2F 6EEF"            /* wš£½Ž„TdÞ.k®®/nï */
+	$"CB75 5862 59D8 1362 5D60 79D2 137C 7606"            /* ËuXbYØ.b]`yÒ.|v. */
+	$"F2B1 06DE 8A2F B76A A7D9 84DB 8F52 1107"            /* ò±.ÞŠ/·j§Ù„Û�R.. */
+	$"A42C 9803 2476 0448 42C9 A9E5 D0F5 9110"            /* ¤,˜.$v.HBÉ©åÐõ‘. */
+	$"2FAB AAF4 0752 81C9 6064 B8F7 6CEB 438E"            /* /«ªô.R�É`d¸÷lëCŽ */
+	$"DC4B 916C 21F0 1C8F 2A6A 1919 9E26 2B36"            /* ÜK‘l!ð.�*j..ž&+6 */
+	$"3E51 F543 F7C5 2549 66D0 2F14 D18F 42F1"            /* >QõC÷Å%IfÐ/.Ñ�Bñ */
+	$"397B BA52 99ED 853C E07D 629B 92A1 2589"            /* 9{ºR™í…<à}b›’¡%‰ */
+	$"B3A9 B812 DC8D A368 3204 F8AA 7549 AF2B"            /* ³©¸.Ü�£h2.øªuI¯+ */
+	$"2DE7 529C 1ECB 9747 A4B8 F6EC 8DDC 0AC4"            /* -çRœ.Ë—G¤¸öì�ÜÂÄ */
+	$"2C31 F042 C407 3F18 FD32 9280 60E4 60D8"            /* ,1ðBÄ.?.ý2’€`ä`Ø */
+	$"77B5 C019 A5FF 6E0D 8E35 A78E C7AA E95B"            /* wµÀ.¥ÿn.Ž5§ŽÇªé[ */
+	$"D37C D883 5DD2 756B 385A 08BB 7708 AA5E"            /* Ó|؃]Òuk8Z.»w.ª^ */
+	$"5B89 0628 F831 7775 3555 A523 BF2F 721A"            /* [‰.(ø1wu5U¥#¿/r. */
+	$"099B E6B4 5128 9EA6 41E1 9B8B 18C1 928C"            /* Æ›æ´Q(ž¦Aᛋ.Á’Œ */
+	$"72A0 BD1E 84D6 836A C947 0982 284A 9238"            /* r ½.„ÖƒjÉGÆ‚(J’8 */
+	$"A06F E390 1BD5 BBFD 323F BA86 2091 BAD5"            /*  oã�.Õ»ý2?º† ‘ºÕ */
+	$"351D 16C5 1D44 E8C7 66C7 D469 047D 5548"            /* 5..Å.DèÇfÇÔi.}UH */
+	$"7049 7B42 B682 DF4C 68DE B5D2 2EDC C105"            /* pI{B¶‚ßLhÞµÒ.ÜÁ. */
+	$"4047 9A7E 0403 F48B 6215 C3ED 8DBA 12E9"            /* @Gš~..ô‹b.Ãí�º.é */
+	$"EEFB B61B 906E F6F6 DDFD D030 CD1C 47FD"            /* îû¶.�nööÝýÐ0Í.Gý */
+	$"7C37 E7C7 DC08 213E 3C33 08E6 74A0 F400"            /* |7çÇÜ.!><3.æt ô. */
+	$"7CFC 3B85 1A2E 5ACA 573F F24C 7D2C 0E3B"            /* |ü;…..ZÊW?òL},.; */
+	$"2A6D CEDC 6C9C 6E97 A572 915F A892 3833"            /* *mÎÜlœn—¥r‘_¨’83 */
+	$"A08F 0070 A602 FB49 0EA6 62FC 4237 C568"            /*  �.p¦.ûI.¦büB7Åh */
+	$"E937 1DC1 1FC2 C3F1 AA30 AC4D DDB8 E747"            /* é7.Á.ÂÃñª0¬MݸçG */
+	$"5EE4 FD73 8124 56EB ADBE 6DB3 F27B 80C0"            /* ^äýs�$Vë­¾m³ò{€À */
+	$"E536 971B 511B C76B AB20 8BA4 4DCD BFCB"            /* å6—.Q.Çk« ‹¤MÍ¿Ë */
+	$"4A0C 34DC 3DDC 9BEF 5122 89D0 99D1 9BE7"            /* J.4Ü=Ü›ïQ"‰Ð™Ñ›ç */
+	$"8840 002A A77A 25E2 9C2C F9BC 78F9 FB0E"            /* ˆ@.*§z%âœ,ù¼xùû. */
+	$"0DB7 4F14 B07A 12F6 65D3 ABE1 660D A84A"            /* .·O.°z.öeÓ«áf.¨J */
+	$"EFF9 A799 1852 8ED0 9582 B79A D812 1BE6"            /* ïù§™.RŽÐ•‚·šØ..æ */
+	$"F3D0 D5FA 9C76 5EBD DBFD 42A9 F7B3 885E"            /* óÐÕúœv^½ÛýB©÷³ˆ^ */
+	$"4A68 DBE7 9663 FB7F 1AC4 5004 197F 97F0"            /* JhÛç–cû..ÄP...—ð */
+	$"F57B 135D 19ED E0E0 1C84 139C BA3B 2493"            /* õ{.].íàà.„.œº;$“ */
+	$"D997 333D B6A7 9E83 619C FCE9 9875 134D"            /* Ù—3=¶§žƒaœüé˜u.M */
+	$"4B31 FCB3 5808 B917 C8BB 0B67 4564 488E"            /* K1ü³X.¹.È».gEdHŽ */
+	$"3554 8125 C3A4 DB4A 0BB2 E501 244C 1F49"            /* 5T�%äÛJ.²å.$L.I */
+	$"C6A7 51E4 6C51 A134 3DF4 CE21 2993 FF3B"            /* ƧQälQ¡4=ôÎ!)“ÿ; */
+	$"80F6 AE0B B9F8 D1D5 8853 4531 6806 4F3E"            /* €ö®.¹øÑÕˆSE1h.O> */
+	$"D2B6 5F62 796A 683C D3C9 A22B 6D56 C497"            /* Ò¶_byjh<ÓÉ¢+mVÄ— */
+	$"D854 2E14 C281 0F94 0220 BEE7 3754 D077"            /* ØT..Â�.”. ¾ç7TÐw */
+	$"EDB0 0F0E 95C1 A40B 55C9 B5AE 4DA8 A8A6"            /* í°..•Á¤.Uɵ®M¨¨¦ */
+	$"ADD6 4A11 DE81 B148 70D3 FA4F 795C 9171"            /* ­ÖJ.Þ�±HpÓúOy\‘q */
+	$"C72E 7EF2 454C 0336 BE4A EE68 960E 25BA"            /* Ç.~òEL.6¾Jîh–.%º */
+	$"E686 01F4 6FF5 3C7C 8B33 60D8 24D3 70A1"            /* æ†.ôoõ<|‹3`Ø$Óp¡ */
+	$"06C6 E616 29D4 63D6 3334 379F 743E 745D"            /* .Ææ.)ÔcÖ347Ÿt>t] */
+	$"4EF5 ECB5 072E 9F62 0750 F7BA 6FDE B6B0"            /* Nõìµ..Ÿb.P÷ºoÞ¶° */
+	$"0BD0 4FCC 8F59 9B13 0C77 0A30 9BAE DF36"            /* .ÐOÌ�Y›..wÂ0›®ß6 */
+	$"B13D D861 E92A 12C7 EC7A 0946 BF20 1E31"            /* ±=Øaé*.ÇìzÆF¿ .1 */
+	$"1FEE EE88 EFC6 C1C1 0DE2 3850 C97F 01DF"            /* .îîˆïÆÁÁ.â8PÉ..ß */
+	$"F021 605A D52A 570D 7089 0C1B B3FE 8B4D"            /* ð!`ZÕ*W.p‰..³þ‹M */
+	$"E441 70AC 5F71 3FCE 527F EBF4 048A A307"            /* äAp¬_q?ÎR.ëô.Š£. */
+	$"CEFD 4EB0 87ED BFE2 A36C 51B9 EAD3 37C6"            /* ÎýN°‡í¿â£lQ¹êÓ7Æ */
+	$"E8F0 9A3D 8F78 8747 81D4 33F0 9EEB 5EA0"            /* èðš=�x‡G�Ô3ðžë^  */
+	$"6FE0 A580 6B6B C126 1CE3 F1B2 DC9C CFCE"            /* oीkkÁ&.ãñ²ÜœÏÎ */
+	$"42EE 7E91 EF2F 0DDF CFDE 75EB 554D 6941"            /* Bî~‘ï/.ßÏÞuëUMiA */
+	$"07A5 21BE AD52 7CC1 49B5 FE74 AE40 F70F"            /* .¥!¾­R|ÁIµþt®@÷. */
+	$"AB3B 0C16 98F5 7742 3DCE 842D 0B2B 2FEB"            /* «;..˜õwB=΄-.+/ë */
+	$"5E90 DEBC 8BA9 81AC 40CC 0030 2853 FE9C"            /* ^�Þ¼‹©�¬@Ì.0(Sþœ */
+	$"6FC2 569B 2CD1 6200 2881 802D 7697 8442"            /* oÂV›,Ñb.(�€-v—„B */
+	$"92C8 666B BC90 3252 F4D3 9BD2 AD14 0027"            /* ’Èfk¼�2RôÓ›Ò­..' */
+	$"CE11 F5A4 437B 3F80 B250 AA4C 23B6 AD83"            /* Î.õ¤C{?€²PªL#¶­ƒ */
+	$"277E 5EF0 8132 6331 9325 D1A3 CFB6 6F73"            /* '~^ð�2c1“%ѣ϶os */
+	$"D37D 780F 91CC CD40 6234 2FE2 F097 1681"            /* Ó}x.‘ÌÍ@b4/âð—.� */
+	$"6097 88BD BFFF 18F5 2CBB FF67 FDBC 2F07"            /* `—ˆ½¿ÿ.õ,»ÿgý¼/. */
+	$"67FF 7FFF 1946 84C7 A551 03FF 7F52 A7C2"            /* gÿ.ÿ.F„Ç¥Q.ÿ.R§Â */
+	$"8AC8 1080 56FF 0C48 1804 A884 A5A2 08FF"            /* ŠÈ.€Vÿ.H..¨„¥¢.ÿ */
+	$"7FF5 3220 8043 9005 C25D DE15 02FB 7F2B"            /* .õ2 €C�.Â]Þ..û.+ */
+	$"8205 5CA8 40BE EFB1 78F0 2656 2AD4 14FF"            /* ‚.\¨@¾ï±xð&V*Ô.ÿ */
+	$"7505 20CD 8BE2 8B15 47BB 9E26 105E 15DD"            /* u. Í‹â‹.G»ž&.^.Ý */
+	$"21A7 82AE E19D FE27 5D8B DDAD E13B D5AD"            /* !§‚®á�þ']‹Ý­á;Õ­ */
+	$"1974 E6EE 9F68 4679 00C0 9D09 0BC1 7CFB"            /* .tæîŸhFy.À�Æ.Á|û */
+	$"0F2C 9F4E 082C 2CB4 569B A7B0 0009 E098"            /* .,ŸN.,,´V›§°.Æà˜ */
+	$"9AB0 9892 B1FF 6957 1D78 2613 4289 24C6"            /* š°˜’±ÿiW.x&.B‰$Æ */
+	$"12BC E2EF C9AE E6D9 784F C157 77AB 3470"            /* .¼âïÉ®æÙxOÁWw«4p */
+	$"D8C7 C746 1978 322D D4E9 FA24 B8B2 5054"            /* ØÇÇF.x2-Ôéú$¸²PT */
+	$"D643 8270 9090 D6D8 0C24 16E5 1146 421C"            /* ÖC‚p��ÖØ.$.å.FB. */
+	$"D6A2 40D9 1864 A800 0000 0000 0001 4554"            /* Ö¢@Ù.d¨.......ET */
+	$"031E 793B 33D3 FD4A CE0A 3D8A 9D46 37B0"            /* ..y;3ÓýJÎÂ=Š�F7° */
+	$"4D2C 6F04 2BFF 071C 023F E153 6688 1815"            /* M,o.+ÿ...?áSfˆ.. */
+	$"BA20 BF61 DDDF 2979 84E3 3348 50F6 E9B8"            /* º ¿aÝß)y„ã3HPöé¸ */
+	$"634A 8937 FF7F F1AE E84B C95A 771F 4C9C"            /* cJ‰7ÿ.ñ®èKÉZw.Lœ */
+	$"3FFE 0734 7D7F 6E35 4A2E 21E0 E52F FF7E"            /* ?þ.4}.n5J.!àå/ÿ~ */
+	$"8532 8513 7869 A6E6 495D 3E58 F349 1EF5"            /* …2….xi¦æI]>XóI.õ */
+	$"886C 6441 9091 82E8 0C24 1507 0E02 A105"            /* ˆldA�‘‚è.$....¡. */
+	$"95C5 1409 096C 9A37 F758 F13A 5ABF 149E"            /* •Å.ÆÆlš7÷Xñ:Z¿.ž */
+	$"DA31 52E9 0DA9 0BFF 45EB 20C7 1A1C E54C"            /* Ú1Ré.©.ÿEë Ç..åL */
+	$"29D1 6C8E D1EC 9D59 F945 4303 373F FF7F"            /* )ÑlŽÑì�YùEC.7?ÿ. */
+	$"CE95 B027 88F7 AB06 28B9 92E7 D540 BC2B"            /* Ε°'ˆ÷«.(¹’çÕ@¼+ */
+	$"7167 8C6C C87E 32B0 C904 7D7D 278E E519"            /* qgŒlÈ~2°É.}}'Žå. */
+	$"707D 2C42 1714 C425 F9D0 DC01 D910 23DB"            /* p},B..Ä%ùÐÜ.Ù.#Û */
+	$"E7F3 391C A4E6 FAE1 C850 5A1F 456A 6690"            /* çó9.¤æúáÈPZ.Ejf� */
+	$"3F37 F970 3841 73D3 1095 39CF 10A3 40F8"            /* ?7ùp8AsÓ.•9Ï.£@ø */
+	$"4CCC 4985 E3D5 127F 7CF4 92BC DCE9 2335"            /* LÌI…ãÕ..|ô’¼Üé#5 */
+	$"43FB 7460 8D5C C121 CFF2 1165 1CCE BBB2"            /* Cût`�\Á!Ïò.e.λ² */
+	$"5EA8 0279 2C97 E45B A43D 328C 7A6C 5EBC"            /* ^¨.y,—ä[¤=2Œzl^¼ */
+	$"61DD BB2C E34E 25E4 1725 3C6B EC12 BFEF"            /* aÝ»,ãN%ä.%<kì.¿ï */
+	$"3E5E 0ACF 766D 9D4E 8978 2AC5 F138 755A"            /* >^ÂÏvm�N‰x*Åñ8uZ */
+	$"CBDD 8421 F74E 9A07 A070 16ED 100C 769A"            /* ËÝ„!÷Nš. p.í..vš */
+	$"6571 1FA0 4D62 8ADC A3F1 0AAA 2253 1A39"            /* eq. MbŠÜ£ñª"S.9 */
+	$"0006 DF51 B09A 2267 BA13 3AD9 0120 8520"            /* ..ßQ°š"gº.:Ù. …  */
+	$"7375 BB11 0715 9FFF 7FFF 276F 9A44 4D02"            /* su»...Ÿÿ.ÿ'ošDM. */
+	$"9DF2 BE32 729A 8C71 FBC9 4C73 FA4B 1D24"            /* �ò¾2ršŒqûÉLsúK.$ */
+	$"4115 B69E 4FFF 7FFF 45B5 7091 9925 CEBD"            /* A.¶žOÿ.ÿEµp‘™%ν */
+	$"6A4E 1AA3 BFFF 7FFD AA3B 4043 EE5A 76B0"            /* jN.£¿ÿ.ýª;@CîZv° */
+	$"A073 CF17 7A58 3A06 649C B972 3CB8 897B"            /*  sÏ.zX:.dœ¹r<¸‰{ */
+	$"31E2 637A 05AC 83FA B94C 0F75 7113 FF7B"            /* 1âcz.¬ƒú¹L.uq.ÿ{ */
+	$"E690 225A FB16 A961 626A B7FE 22EF 864B"            /* æ�"Zû.©abj·þ"ï†K */
+	$"F464 1D62 4127 02B3 DB08 1C01 3ECE 1326"            /* ôd.bA'.³Û...>Î.& */
+	$"CF03 BF05 5771 4992 75FE 29FC 5FFF 60D5"            /* Ï.¿.WqI’uþ)ü_ÿ`Õ */
+	$"DCC3 1B1F 40FF 6990 DC69 3E47 D09A 6E6A"            /* ÜÃ..@ÿi�Üi>GКnj */
+	$"2866 9BA8 D74C BAAA 204E 05F9 DBFE E679"            /* (f›¨×Lºª N.ùÛþæy */
+	$"E76C 383D 9F92 BB32 1E14 2CA1 CBD5 E93C"            /* çl8=Ÿ’»2..,¡ËÕé< */
+	$"6C00 DFA2 B04F D650 3F14 60FF 7F73 29C3"            /* l.ߢ°OÖP?.`ÿ.s)à */
+	$"E20E 5672 C31B 6D72 FDCF 8097 B8B0 1482"            /* â.VrÃ.mrýÏ€—¸°.‚ */
+	$"C37E 4C4A 28FA 6E67 F061 E00C 371B 8655"            /* Ã~LJ(úngðaà.7.†U */
+	$"BDCB 2942 6AB1 0E31 38D3 6948 0D3F 6FEF"            /* ½Ë)Bj±.18ÓiH.?oï */
+	$"C2AB 669A E502 2490 C158 FC07 05F0 348A"            /* «fšå.$�ÁXü..ð4Š */
+	$"0505 F0B2 E7E3 F934 19DA 2DB9 9686 603E"            /* ..ð²çãù4.Ú-¹–†`> */
+	$"C2C3 4B2F EB95 FB4E 62D2 F085 4364 9DCA"            /* ÂÃK/ë•ûNbÒð…Cd�Ê */
+	$"A6E8 94F8 CC41 2603 5BFC 4E90 C05F 068D"            /* ¦è”øÌA&.[üN�À_.� */
+	$"414C 618C 8860 58B1 7059 0B4C 39E8 FB58"            /* ALaŒˆ`X±pY.L9èûX */
+	$"C413 43C6 BF39 CC12 6E5B F65C F671 DD29"            /* Ä.CÆ¿9Ì.n[ö\öqÝ) */
+	$"8A03 BC15 FF06 2028 49E4 BF04 E6FC D4FD"            /* Š.¼.ÿ. (Iä¿.æüÔý */
+	$"401A CB9C 5F7F EFE7 8F41 E707 7803 9F1A"            /* @.Ëœ_.ïç�Aç.x.Ÿ. */
+	$"715F 951E E63A 9B4C 1404 32AA B5B7 98B0"            /* q_•.æ:›L..2ªµ·˜° */
+	$"D5F4 CD69 DD15 9E81 D2FD 09F7 462D AF3E"            /* ÕôÍiÝ.ž�ÒýÆ÷F-¯> */
+	$"31DA 85C4 5053 8460 C06C 7018 908C 4821"            /* 1Ú…ÄPS„`Àlp.�ŒH! */
+	$"D8AB AC44 7666 44D1 EA04 8979 3A4A A0FE"            /* Ø«¬DvfDÑê.‰y:J þ */
+	$"27D7 B0C3 DBAA 5233 F376 3CA8 4968 DF8A"            /* '×°ÃÛªR3óv<¨Ihߊ */
+	$"874C 2117 6A15 4664 03FF 7FFF 7F7C 2D12"            /* ‡L!.j.Fd.ÿ.ÿ.|-. */
+	$"B28B 8A4C 6D72 1106 16E0 BF7F 9822 2424"            /* ²‹ŠLmr...à¿.˜"$$ */
+	$"3C1B CBC8 2F76 1AC7 FF7F FF7F EB42 22AA"            /* <.ËÈ/v.Çÿ.ÿ.ëB"ª */
+	$"F30A 0C9D 6086 E561 E1BC C1D9 4E7F FADF"            /* óÂ.�`†åaá¼ÁÙN.úß */
+	$"A85C B34C E2D4 FCF6 1A29 34F3 3B42 1DFC"            /* ¨\³LâÔüö.)4ó;B.ü */
+	$"C6BD 370B D203 B0C4 1C7D C348 1EE7 EAD9"            /* ƽ7.Ò.°Ä.}ÃH.çêÙ */
+	$"3145 E7FB 36CC 8E64 AB70 81DC 65E1 2C1D"            /* 1Eçû6ÌŽd«p�Üeá,. */
+	$"9CB5 18A0 1C95 7DE2 96DF C185 7A40 50C7"            /* œµ. .•}â–ßÁ…z@PÇ */
+	$"E32C FCC1 FF6B 14F5 05FE 0E1C 8757 8D82"            /* ã,üÁÿk.õ.þ..‡W�‚ */
+	$"3A41 284E 2906 8316 564F F479 4DCF FF7E"            /* :A(N).ƒ.VOôyMÏÿ~ */
+	$"5F11 3745 AC7F ED8D BC93 4205 7E12 E036"            /* _.7E¬.í�¼“B.~.à6 */
+	$"0BE4 4B4F F99C F369 6B38 263E 63EC 6311"            /* .äKOùœóik8&>cìc. */
+	$"D577 8B5D 7957 D24D 7D64 A2B5 1107 4625"            /* Õw‹]yWÒM}d¢µ..F% */
+	$"E1EB 2460 41A2 E878 5967 CEAE AE16 D8D5"            /* áë$`A¢èxYgή®.ØÕ */
+	$"F960 B484 0B49 7253 26F2 714E 6A13 03E4"            /* ù`´„.IrS&òqNj..ä */
+	$"A0C3 3924 31ED 8B79 3D63 5412 C097 F9C3"            /*  Ã9$1í‹y=cT.À—ùÃ */
+	$"79AD A97D EEE5 EF23 66FF 15BD C854 5DFB"            /* y­©}îåï#fÿ.½ÈT]û */
+	$"5921 E05C 6A39 B68E 6444 6D55 3B7D 6DDA"            /* Y!à\j9¶ŽdDmU;}mÚ */
+	$"9003 8F53 5C49 D978 31CD 41C5 DD62 7DE4"            /* �.�S\IÙx1ÍAÅÝb}ä */
+	$"2F24 5932 A14F 9C9C 97B6 2652 5988 7970"            /* /$Y2¡Oœœ—¶&RYˆyp */
+	$"F890 8A5C 9614 EBF4 DAC8 15D1 6F3C 07E4"            /* ø�Š\–.ëôÚÈ.Ño<.ä */
+	$"7B8B F763 6803 394F 2291 8D88 EB1B 3136"            /* {‹÷ch.9O"‘�ˆë.16 */
+	$"10C9 5077 060A 7DB0 A890 CB7B 947F AD8B"            /* .ÉPw.Â}°¨�Ë{”.­‹ */
+	$"0AAF 67FF 5D78 615A E459 013B 6923 5E0E"            /* ¯gÿ]xaZäY.;i#^. */
+	$"900D BA9C DFF2 37D0 0508 B5F3 EA48 FADE"            /* �.ºœßò7Ð..µóêHúÞ */
+	$"D348 3F2F 8E71 E6CD B6BE 8941 8773 0E17"            /* ÓH?/ŽqæͶ¾‰A‡s.. */
+	$"E97A B699 5A4F 21C1 0766 538B B29A B8CA"            /* éz¶™ZO!Á.fS‹²š¸Ê */
+	$"FBAE 21FA 76A0 B197 C613 E523 B127 1FE4"            /* û®!úv ±—Æ.å#±'.ä */
+	$"0AA8 798D 688E 8F27 E386 446F 0BD2 C6A5"            /* ¨y�hŽ�'ã†Do.ÒÆ¥ */
+	$"99B7 9313 67B5 4823 BD88 3611 E5A8 8054"            /* ™·“.gµH#½ˆ6.娀T */
+	$"3C15 C120 1B02 5B2A 2195 DD25 F90A 48A6"            /* <.Á ..[*!•Ý%ùÂH¦ */
+	$"BF92 56B9 4639 F2BD AC5F 3350 9699 14A7"            /* ¿’V¹F9ò½¬_3P–™.§ */
+	$"30A2 4B91 C33D 3175 F806 15AA 4B01 558F"            /* 0¢K‘Ã=1uø..ªK.U� */
+	$"400B 8148 DAF5 29FD 0561 1CA8 7239 51F4"            /* @.�HÚõ)ý.a.¨r9Qô */
+	$"A169 A92B EE2F 4F3D 2F96 029B 186B 7219"            /* ¡i©+î/O=/–.›.kr. */
+	$"C673 0E85 6FAC 9889 C64A 90AE DBAF E8E3"            /* Æs.…o¬˜‰ÆJ�®Û¯èã */
+	$"6607 DF2A C332 C690 840A 817A ABFF 3302"            /* f.ß*Ã2Æ�„Â�z«ÿ3. */
+	$"1464 A65F E1B3 04B0 90C6 51E5 6A2E 7EA2"            /* .d¦_á³.°�ÆQåj.~¢ */
+	$"9222 EABA 0632 2F13 B1A3 2337 85B4 E390"            /* ’"êº.2/.±£#7…´ã� */
+	$"766A 98DB BDDD 9813 F7BD 8AEA 1AB2 BEEC"            /* vj˜Û½Ý˜.÷½Šê.²¾ì */
+	$"BEE3 F4B7 EE35 6BB8 ADE1 E772 AEB0 7E66"            /* ¾ãô·î5k¸­áçr®°~f */
+	$"3F99 05C1 3339 69B2 C1D5 4CC7 DB0B 3C67"            /* ?™.Á39i²ÁÕLÇÛ.<g */
+	$"7F80 43C8 7B29 FA49 8C64 3FEB 6406 35FE"            /* .€CÈ{)úIŒd?ëd.5þ */
+	$"FAEB 4922 9410 5352 D4C0 00CB 72EA 56CE"            /* úëI"”.SRÔÀ.ËrêVÎ */
+	$"22F8 673A D3E8 AAFA E992 5B7F 827C A83D"            /* "øg:Óèªúé’[.‚|¨= */
+	$"586F 54B4 69F8 C6B7 FF14 CFD4 4069 C50F"            /* XoT´iøÆ·ÿ.ÏÔ@iÅ. */
+	$"9E23 797E DE78 5B86 FCAE BDE5 B920 9551"            /* ž#y~Þx[†ü®½å¹ •Q */
+	$"22EC 4155 0582 10F4 BF8C 144A 3251 97F3"            /* "ìAU.‚.ô¿Œ.J2Q—ó */
+	$"2E7D 1E04 969B 4C15 8BDB FAC1 9743 2B6C"            /* .}..–›L.‹ÛúÁ—C+l */
+	$"6EF5 C95E 47CB A380 A635 C17D AD97 42EA"            /* nõÉ^GË£€¦5Á}­—Bê */
+	$"88A1 A63E FC76 A19C AE08 C868 115F 098D"            /* ˆ¡¦>üv¡œ®.Èh._Æ� */
+	$"A1BE 16D4 3BF4 91C9 6CF1 DBE0 E0CA 0DAA"            /* ¡¾.Ô;ô‘ÉlñÛààÊ.ª */
+	$"EFCB 2A06 908B 7BAC CCF3 4CF8 179A 615E"            /* ïË*.�‹{¬ÌóLø.ša^ */
+	$"590D AB18 CB49 E032 B8ED 2A8E 584A ACDC"            /* Y.«.ËIà2¸í*ŽXJ¬Ü */
+	$"4797 F732 B8C9 24A4 0E5C 85A0 FED8 E30A"            /* G—÷2¸É$¤.\… þØã */
+	$"ECBF 08FB CDC1 E09D 9556 837A E086 95AC"            /* ì¿.ûÍÁà�•Vƒzà†•¬ */
+	$"BA2C E411 756E F132 9CE6 EDC4 6C90 B09E"            /* º,ä.unñ2œæíÄl�°ž */
+	$"3C59 DE78 44D0 E445 BCA0 3AE0 05D9 7440"            /* <YÞxDÐäE¼ :à.Ùt@ */
+	$"F09F 10EA E0BA 4596 84F5 81A2 550E 57A7"            /* ðŸ.êàºE–„õ�¢U.W§ */
+	$"F2A8 B2DD D612 A18F D74A 671D B70C 994A"            /* ò¨²ÝÖ.¡�×Jg.·.™J */
+	$"9441 8E10 12B8 80F0 6249 2075 CD39 3667"            /* ”AŽ..¸€ðbI uÍ96g */
+	$"6632 AFDD 5E48 6B22 15CC 179A C6FA 47AE"            /* f2¯Ý^Hk".Ì.šÆúG® */
+	$"66AF 7AFB 033D 03F1 B829 B852 F1BF 55DB"            /* f¯zû.=.ñ¸)¸Rñ¿UÛ */
+	$"17F6 E1EF A955 F266 ACFE 75F4 34FC 38B0"            /* .öáï©Uòf¬þuô4ü8° */
+	$"0068 7DD6 016E 98D4 57DB 6220 D269 4BE9"            /* .h}Ö.n˜ÔWÛb ÒiKé */
+	$"8007 22E8 9D82 8FCE EB41 317B D0FA 323B"            /* €."è�‚�ÎëA1{Ðú2; */
+	$"B2C0 06D3 99E3 ED9A 2423 78CD AE34 CF5B"            /* ²À.Ó™ãíš$#xÍ®4Ï[ */
+	$"58DA 8F69 9604 4804 8682 B58C C1DA 1E21"            /* XÚ�i–.H.†‚µŒÁÚ.! */
+	$"0E4E F709 83E1 B335 F208 6565 C882 70A0"            /* .N÷ƃá³5ò.eeÈ‚p  */
+	$"2F58 5379 3999 7F2E E63D 81E4 C2EB 58E3"            /* /XSy9™..æ=�äÂëXã */
+	$"4605 35E7 76D7 C7D0 AEDA 26C5 8BB6 0F99"            /* F.5çv×ÇЮÚ&Å‹¶.™ */
+	$"77C0 D3D6 9870 8279 4C2E 29C6 518F 13E6"            /* wÀÓÖ˜p‚yL.)ÆQ�.æ */
+	$"1373 FCB8 FD55 3D8F 8322 F8F4 CD80 3C09"            /* .sü¸ýU=�ƒ"øôÍ€<Æ */
+	$"1496 931A E1BF 0AE6 2842 6FF7 6986 6AEE"            /* .–“.á¿Âæ(Bo÷i†jî */
+	$"1AE9 FF0A 947D E3F6 D93F B59B F6D5 5FB6"            /* .éÿ”}ãöÙ?µ›öÕ_¶ */
+	$"AAC7 EDD1 1FDB 5A5F 5549 7D55 2E1F B6A4"            /* ªÇíÑ.ÛZ_UI}U..¶¤ */
+	$"FDAA F7D4 DF7D 4E80 F173 72EC 2AD6 46CC"            /* ýª÷Ôß}N€ñsrì*ÖFÌ */
+	$"6653 9F8A F548 8CD9 F7CC 0758 DFBD 1976"            /* fSŸŠõHŒÙ÷Ì.Xß½.v */
+	$"0832 03BE 1A6C 242F 4978 025D 37A6 D46A"            /* .2.¾.l$/Ix.]7¦Ôj */
+	$"B859 037D 5250 D0D6 8FC0 4C05 AAAB 7F38"            /* ¸Y.}RPÐÖ�ÀL.ª«.8 */
+	$"799B 43F9 E370 D367 B412 8CC2 F941 E270"            /* y›CùãpÓg´.ŒÂùAâp */
+	$"A967 1978 577B 7A22 541A 7DDD A593 75E5"            /* ©g.xW{z"T.}Ý¥“uå */
+	$"6B05 D950 D953 DA5E 7EBF D5D3 4314 5006"            /* k.ÙPÙSÚ^~¿ÕÓC.P. */
+	$"8EC3 8474 6B41 83B3 7B16 9C95 721B 5405"            /* ŽÃ„tkAƒ³{.œ•r.T. */
+	$"F4AE A41F 92D8 56DA F2C9 4BF8 5B0A EBC6"            /* ô®¤.’ØVÚòÉKø[ÂëÆ */
+	$"29D5 F4F3 36B9 A6D7 3BC4 75D7 972C 7465"            /* )Õôó6¹¦×;Äu×—,te */
+	$"CCBE 21FA 6EAF 6B26 465B 4676 356D E640"            /* ̾!ún¯k&F[Fv5mæ@ */
+	$"04C3 0E39 C431 FBA5 2B53 E001 8F9D 37F5"            /* .Ã.9Ä1û¥+Sà.��7õ */
+	$"F289 EC84 85B8 5FC3 F74A 734B E0B1 ED8C"            /* ò‰ì„…¸_Ã÷JsKà±íŒ */
+	$"5DF4 6678 22E4 887C A45B 1478 DFC3 A9E9"            /* ]ôfx"äˆ|¤[.xßéé */
+	$"F234 5723 01B3 2685 2754 8133 8699 21C8"            /* ò4W#.³&…'T�3†™!È */
+	$"180A 27F8 174C FED5 8F71 4082 C4E8 DB83"            /* .Â'ø.LþÕ�q@‚ÄèÛƒ */
+	$"BDA4 4506 3FA4 5286 5D63 00F7 905D A740"            /* ½¤E.?¤R†]c.÷�]§@ */
+	$"5251 07FA 22F8 1334 FBA6 5640 7199 FA41"            /* RQ.ú"ø.4û¦V@q™úA */
+	$"A3C7 3CC1 ECF5 7F43 A9AE FBD5 C1F0 18B3"            /* £Ç<Áìõ.C©®ûÕÁð.³ */
+	$"7072 4809 0A4C 8127 6E10 5F7C 335C CC28"            /* prHÆÂL�'n._|3\Ì( */
+	$"B723 3D12 724D 3DE5 37B3 1C2A 136D 2258"            /* ·#=.rM=å7³.*.m"X */
+	$"DCE6 BFA4 0DAD FB6E 72C1 70F7 6D71 785D"            /* Ü濤.­ûnrÁp÷mqx] */
+	$"BC75 69CE CE3B CF7A 170E 8343 CBA9 DE66"            /* ¼uiÎÎ;Ïz..ƒCË©Þf */
+	$"06ED 779C AA9F F28D 943D 5E3E DEDE 4769"            /* .íwœªŸò�”=^>ÞÞGi */
+	$"289C 5523 9792 EFAC 19A6 A945 B504 9446"            /* (œU#—’ï¬.¦©Eµ.”F */
+	$"A4DF BAA6 B5EB BAEF 7B92 3E08 6D17 870F"            /* ¤ßº¦µëºï{’>.m.‡. */
+	$"9E0A 487E 8A60 90B5 E555 CD4F D2F1 FE67"            /* žÂH~Š`�µåUÍOÒñþg */
+	$"88DE BB6A E653 A2B6 F9C7 B226 2544 A167"            /* ˆÞ»jæS¢¶ùDz&%D¡g */
+	$"5DF7 5F35 F38B DB99 30F8 C210 AF41 C7A4"            /* ]÷_5ó‹Û™0øÂ.¯AǤ */
+	$"167B 30B4 8B8D 0821 4ADB EFC6 5728 A86D"            /* .{0´‹�.!JÛïÆW(¨m */
+	$"99A8 2A1D 51E2 4CE5 AEA5 7ECC 23CB 628B"            /* ™¨*.QâL宥~Ì#Ëb‹ */
+	$"E438 F41A A280 CF2E 8E51 5004 A9BA 64AB"            /* ä8ô.¢€Ï.ŽQP.©ºd« */
+	$"B0AA 608C 8C19 38F7 567B 0C45 B7C5 0E2D"            /* °ª`ŒŒ.8÷V{.E·Å.- */
+	$"0F3D A192 B0F5 A567 4EE1 9FF5 F085 979A"            /* .=¡’°õ¥gNáŸõð…—š */
+	$"13DA 6FC3 89D0 0370 C986 5F44 AADD CAB9"            /* .ÚoÉÐ.pɆ_DªÝʹ */
+	$"FBD0 8CDE 18D9 8FED 715E 264F 0D69 2CEF"            /* ûÐŒÞ.Ù�íq^&O.i,ï */
+	$"63F0 7A64 D65B 094A 6976 E6D4 E3DC 1583"            /* cðzdÖ[ÆJivæÔãÜ.ƒ */
+	$"FE8C BD22 992E 3FDB AF18 03A7 0A74 8333"            /* þŒ½"™.?Û¯..§Âtƒ3 */
+	$"76E3 5195 C7FA A180 5123 7E0C 544B 9C8C"            /* vãQ•Çú¡€Q#~.TKœŒ */
+	$"928D 3DF6 F330 4D6E 8049 11AF 064E 4E3B"            /* ’�=öó0Mn€I.¯.NN; */
+	$"B937 EE03 A4D2 F530 4513 47F0 5E98 E060"            /* ¹7î.¤Òõ0E.Gð^˜à` */
+	$"72C6 46EC B761 FAB4 B0FA 9A80 FF78 5408"            /* rÆFì·aú´°úš€ÿxT. */
+	$"9152 452E 0111 2383 5E5F 6C4F FC53 0EDE"            /* ‘RE...#ƒ^_lOüS.Þ */
+	$"1092 66D3 5F38 1AC8 1412 561A 4017 9110"            /* .’fÓ_8.È..V.@.‘. */
+	$"CA19 3E6F 8803 0908 5F57 A2E2 4744 E3C4"            /* Ê.>oˆ.Æ._W¢âGDãÄ */
+	$"F1BF 49F6 836F E294 610B 4098 2761 1502"            /* ñ¿Iöƒoâ”a.@˜'a.. */
+	$"CCB2 0C11 81DD 05B4 ACD8 8F28 C5DD 1DD8"            /* ̲..�Ý.´¬Ø�(ÅÝ.Ø */
+	$"58E0 C1E1 70A8 42BF 456F FE20 1261 1F81"            /* XàÁáp¨B¿Eoþ .a.� */
+	$"08AC FEB1 F89C 3576 EF94 A20C 255F 3B3F"            /* .¬þ±øœ5v.%_;? */
+	$"5E6B B0C0 4B3F EADC 8536 55E9 8144 C946"            /* ^k°ÀK?êÜ…6Ué�DÉF */
+	$"7613 8662 DCB1 C761 2BDA 412D C7D6 2D5C"            /* v.†bܱÇa+ÚA-ÇÖ-\ */
+	$"BCC0 F84E 54E4 9B0B BDF7 4F45 FCA6 D6AE"            /* ¼ÀøNTä›.½÷OEü¦Ö® */
+	$"1754 31D1 E6CB 94F4 D163 2B1D 017D 4171"            /* .T1ÑæË”ôÑc+..}Aq */
+	$"ABE0 0285 395D 3D23 42D7 E641 348A 0C2E"            /* «à.…9]=#B×æA4Š.. */
+	$"9C16 42C9 8E99 B654 8046 C365 EA71 CE64"            /* œ.BÉŽ™¶T€FÃeêqÎd */
+	$"B762 0E4D 7C48 617B CDB9 6264 2C81 4A9F"            /* ·b.M|Ha{͹bd,�JŸ */
+	$"8600 50B2 B985 EB73 DB96 82EA FF7D 1E50"            /* †.P²¹…ësÛ–‚êÿ}.P */
+	$"6A49 AEA3 78E3 2DFD 0D59 3013 F257 AAA9"            /* jI®£xã-ý.Y0.òWª© */
+	$"0E5D 81DA E983 8D48 41BE DF0B FB34 AEA5"            /* .]�Úéƒ�HA¾ß.û4®¥ */
+	$"07B6 B0AA 1E53 1D9F B9C7 4CE5 8D46 6151"            /* .¶°ª.S.Ÿ¹ÇLå�FaQ */
+	$"8000 0C24 1D66 1946 1073 4456 2361 E486"            /* €..$.f.F.sDV#aä† */
+	$"120F 29F0 6121 2D6A AF51 0C82 F68C B571"            /* ..)ða!-j¯Q.‚öŒµq */
+	$"77AD BE59 9145 D105 DE8C 9500 0000 0000"            /* w­¾Y‘EÑ.ÞŒ•..... */
+	$"0000 0032 BC9A BD52 00B4 6C6F 3753 1A96"            /* ...2¼š½R.´lo7S.– */
+	$"9B00 FCD3 F055 A11A AFB1 FB95 1610 88D0"            /* ›.üÓðU¡.¯±û•..ˆÐ */
+	$"8D32 9653 FC10 55FD B965 C1A9 B6BD 2245"            /* �2–Sü.Uý¹eÁ©¶½"E */
+	$"D48B 8230 2EF5 56F1 6618 9F91 FEC4 4106"            /* Ô‹‚0.õVñf.Ÿ‘þÄA. */
+	$"F23B 7C8A 0320 79EA D7A0 D75F 09BD B985"            /* ò;|Š. yê× ×_ƽ¹… */
+	$"C22B E2F0 0508 64BA AA2F 2414 19D7 311D"            /* Â+âð..dºª/$..×1. */
+	$"F709 E05C 809B 9E62 83F8 FF13 2DE3 01D6"            /* ÷Æà\€›žbƒøÿ.-ã.Ö */
+	$"8ADC F118 5A80 77C8 DABC 2FB5 CEF6 FCFB"            /* ŠÜñ.Z€wÈÚ¼/µÎöüû */
+	$"7A94 2773 6CEC FAE2 7865 753C E612 E4AF"            /* z”'slìúâxeu<æ.ä¯ */
+	$"657C 5C67 8FB3 1E56 A319 1ED1 FE48 0D8D"            /* e|\g�³.V£..ÑþH.� */
+	$"2431 B10B 8E15 0A4B FF7F 7EB8 D068 5015"            /* $1±.Ž.ÂKÿ.~¸ÐhP. */
+	$"151E C37C 0390 F6CC 64A8 0000 0000 0000"            /* ..Ã|.�öÌd¨...... */
+	$"0000 0002 5991 79E8 2B17 082C ABCB DA90"            /* ....Y‘yè+..,«ËÚ� */
+	$"CE92 8CB0 E992 0710 2B8F CAAB D217 C4E9"            /* Î’Œ°é’..+�Ê«Ò.Äé */
+	$"E55E 11D2 6200 B530 5EF4 6932 1CBF EA6C"            /* å^.Òb.µ0^ôi2.¿êl */
+	$"E58D 2AA9 68C2 89FF 7903 A6ED D674 F1FC"            /* å�*©h‰ÿy.¦íÖtñü */
+	$"A256 3564 F7E0 4DDF CDA1 2729 F7FF 6EB2"            /* ¢V5d÷àMßÍ¡')÷ÿn² */
+	$"9D35 70A9 5447 924B B8E1 71D3 4A8A DECB"            /* �5p©TG’K¸áqÓJŠÞË */
+	$"93E1 8FA0 140E C9B7 6124 8020 D660 3D22"            /* “á� ..É·a$€ Ö`=" */
+	$"C708 222E 7289 B890 0002 00E1 2BC6 84B9"            /* Ç.".r‰¸�...á+Æ„¹ */
+	$"25DF 442F 97FF 7FEF 68EC 7325 B92C A150"            /* %ßD/—ÿ.ïhìs%¹,¡P */
+	$"EE19 48C3 2540 0000 0000 0000 0000 0749"            /* î.HÃ%@.........I */
+	$"DD4A 9891 375B B0E0 C176 A698 672E F295"            /* ÝJ˜‘7[°àÁv¦˜g.ò• */
+	$"0311 7B3E 2B87 B4B8 7FB3 5DF7 9C67 CBEA"            /* ..{>+‡´¸.³]÷œgËê */
+	$"6A19 4107 C9F4 2B19 6829 179A 3FFF 7E8C"            /* j.A.Éô+.h).š?ÿ~Œ */
+	$"44A2 15E8 8E37 B422 F825 1862 58FF 7FFE"            /* D¢.èŽ7´"ø%.bXÿ.þ */
+	$"8EA1 D38C 727A 3071 1FF0 541F 6AB4 EA83"            /* Ž¡ÓŒrz0q.ðT.j´êƒ */
+	$"44A0 086A BAD7 6966 FC5D 0E72 A66C C301"            /* D .jº×ifü].r¦lÃ. */
+	$"3E1F B82C 9192 20D5 0322 858F 224C 87F5"            /* >.¸,‘’ Õ."…�"L‡õ */
+	$"E940 85ED 7B36 EC96 D05C 21FF 7B10 59E1"            /* é@…í{6ì–Ð\!ÿ{.Yá */
+	$"E125 6C79 7852 2031 F3BA 34FB 6E57 BC3B"            /* á%lyxR 1óº4ûnW¼; */
+	$"69F0 C303 3A2A A573 D1E0 9836 C703 D02C"            /* iðÃ.:*¥sÑà˜6Ç.Ð, */
+	$"58CC 3DA7 FF0D 4301 F607 07C1 31FA 7F66"            /* XÌ=§ÿ.C.ö..Á1ú.f */
+	$"89BD A759 90CD 107A E5BD 6398 D7BE F7BB"            /* ‰½§Y�Í.zå½c˜×¾÷» */
+	$"E273 D09A F8EE D21B 1015 A513 18F5 5C7D"            /* âsКøîÒ...¥..õ\} */
+	$"FD20 E7C9 C6BE 3105 7A4B 831D 251B 4C36"            /* ý çÉƾ1.zKƒ.%.L6 */
+	$"2A49 3EAC 1A86 9F87 09CC 0B00 2CF4 643C"            /* *I>¬.†Ÿ‡ÆÌ..,ôd< */
+	$"7012 8574 D28F 952D E959 1093 FE7E F021"            /* p.…tÒ�•-éY.“þ~ð! */
+	$"028C 74ED 0E90 8DCD 5F06 B4BE EA1A 4C53"            /* .Œtí.��Í_.´¾ê.LS */
+	$"A47F 3706 93CB 8FAB 7864 D123 4A39 B6BA"            /* ¤.7.“Ë�«xdÑ#J9¶º */
+	$"CDCB 8AA9 2128 54FA CFB5 C4E1 F470 AD6E"            /* ÍËŠ©!(TúϵÄáôp­n */
+	$"6A05 07C9 72AA 562E F22F C922 BCF9 7DDF"            /* j..ÉrªV.ò/É"¼ù}ß */
+	$"3565 1AD4 F707 7DC0 1038 129E 4EA0 297E"            /* 5e.Ô÷.}À.8.žN )~ */
+	$"1037 3516 64BB FF75 539A 5C03 F7A3 C14D"            /* .75.d»ÿuSš\.÷£ÁM */
+	$"C617 50C8 14F1 7C95 0372 1443 C3F0 7ED4"            /* Æ.PÈ.ñ|•.r.CÃð~Ô */
+	$"EFDA FA88 BDD2 E947 7A43 A4A3 2339 CD58"            /* ïÚúˆ½ÒéGzC¤£#9ÍX */
+	$"526C 8407 8211 1949 6431 DB89 390B EB27"            /* Rl„.‚..Id1Û‰9.ë' */
+	$"9975 F04F D507 AC80 5D51 95B0 992A 1AC6"            /* ™uðOÕ.¬€]Q•°™*.Æ */
+	$"8699 86CC E64E 441C 2EFD 4F8C 70C1 DB2A"            /* †™†ÌæND..ýOŒpÁÛ* */
+	$"5395 8DF7 E279 AA65 BA32 2FD1 48C9 F400"            /* S•�÷âyªeº2/ÑHÉô. */
+	$"D0EA 663D 92FF 053E 130C A1A9 491B E583"            /* Ðêf=’ÿ.>..¡©I.åƒ */
+	$"6133 2EE1 AFBE 86B8 D218 B698 906D A5B9"            /* a3.᯾†¸Ò.¶˜�m¥¹ */
+	$"ACD3 9DC7 8720 C668 E134 1A1C 9C71 EA49"            /* ¬Ó�LJ Æhá4..œqêI */
+	$"7AE9 9276 56E9 78BB 5679 18E2 6044 2763"            /* zé’vVéx»Vy.â`D'c */
+	$"2342 64F4 3952 2712 F704 B2E8 C1D2 35CC"            /* #Bdô9R'.÷.²èÁÒ5Ì */
+	$"F0AB 5ABD 61A0 1CD5 5316 0E78 22E6 B807"            /* ð«Z½a .ÕS..x"æ¸. */
+	$"8774 CA36 91EF 0BFF D969 6330 3900 00D1"            /* ‡tÊ6‘ï.ÿÙic09..Ñ */
+	$"2300 0000 0C6A 5020 200D 0A87 0A00 0000"            /* #....jP  .‡Â... */
+	$"1466 7479 706A 7032 2000 0000 006A 7032"            /* .ftypjp2 ....jp2 */
+	$"2000 0000 4F6A 7032 6800 0000 1669 6864"            /*  ...Ojp2h....ihd */
+	$"7200 0002 0000 0002 0000 0407 0701 0000"            /* r............... */
+	$"0000 0F63 6F6C 7201 0000 0000 0010 0000"            /* ...colr......... */
+	$"0022 6364 6566 0004 0000 0000 0001 0003"            /* ."cdef.......... */
+	$"0001 0000 0001 0000 0002 0002 0000 0003"            /* ................ */
+	$"0000 0000 6A70 3263 FF4F FF51 0032 0000"            /* ....jp2cÿOÿQ.2.. */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0004 0701 0107 0101 0701 0107 0101 FF52"            /* ..............ÿR */
+	$"000C 0000 0001 0105 0404 0001 FF5C 0013"            /* ............ÿ\.. */
+	$"2050 5858 6058 5860 5858 6058 5858 5050"            /*  PXX`XX`XX`XXXPP */
+	$"58FF 6400 1100 014B 616B 6164 752D 7635"            /* Xÿd....Kakadu-v5 */
+	$"2E32 2E31 FF90 000A 0000 0000 D036 0001"            /* .2.1ÿ�.Â....Ð6.. */
+	$"FF93 CFC2 DC03 54F9 36EC A8DC 2A8C 3701"            /* ÿ“ÏÂÜ.Tù6ì¨Ü*Œ7. */
+	$"118B 95C3 F2B2 5A7A 0428 C30A 2C64 B704"            /* .‹•Ãò²Zz.(ÃÂ,d·. */
+	$"5C3C 6DED 8696 4890 6404 5638 430C 59C5"            /* \<m톖H�d.V8C.YŠ*/
+	$"D913 B06B 0B08 E00E 1802 6D82 7225 E695"            /* Ù.°k..à...m‚r%æ• */
+	$"9F1E E7B0 D1DF 323C 61DC 1F25 E3FF 83E2"            /* Ÿ.ç°Ñß2<aÜ.%ãÿƒâ */
+	$"A49A DED4 4495 A948 5B70 9E5A 01F1 2431"            /* ¤šÞÔD•©H[pžZ.ñ$1 */
+	$"8EE5 2B54 2863 9041 FAE9 9E9F 1B85 E206"            /* Žå+T(c�Aú鞟.…â. */
+	$"4104 106C 5027 632A 8716 C3A5 F047 B3D5"            /* A..lP'c*‡.Ã¥ðG³Õ */
+	$"EE2B 19CD 2B75 17D8 DFB6 E2BF 491E A41F"            /* î+.Í+u.Ø߶â¿I.¤. */
+	$"BC48 3493 DEFB 453D 64DE DEA0 68DB EF5B"            /* ¼H4“ÞûE=dÞÞ hÛï[ */
+	$"1E69 8F3F C55C 1FF6 1823 1543 F483 DF20"            /* .i�?Å\.ö.#.Côƒß  */
+	$"F5B4 08F4 5D20 4DF0 7D7D 2007 2ACA 5B5E"            /* õ´.ô] Mð}} .*Ê[^ */
+	$"159F EF4A 505D 811D A8A3 5476 5539 B45B"            /* .ŸïJP]�.¨£TvU9´[ */
+	$"3113 1AC7 00F3 F1A7 E9E3 9E88 5D91 6CD5"            /* 1..Ç.óñ§é㞈]‘lÕ */
+	$"2CC0 F92B 2063 FF29 4B0E 775A 06EE 75CC"            /* ,Àù+ cÿ)K.wZ.îuÌ */
+	$"DA54 AC2F B72D 1C25 1E46 A4F8 C3E1 7D8D"            /* ÚT¬/·-.%.F¤øÃá}� */
+	$"85AE BBE6 3DBE EC4A 35F7 3B36 1FBF BC38"            /* …®»æ=¾ìJ5÷;6.¿¼8 */
+	$"2DC1 785C D644 2BED AB51 1950 2643 8730"            /* -Áx\ÖD+í«Q.P&C‡0 */
+	$"2AE9 E4EB 1B8E 8F90 BA0C FF2F 6F65 5F28"            /* *éäë.Ž��º.ÿ/oe_( */
+	$"1A3F 9398 FF20 01A2 69A0 02C9 8D1B C3EA"            /* .?“˜ÿ .¢i .É�.Ãê */
+	$"A600 6417 3CA3 9E84 93EF 063D 59DC 702C"            /* ¦.d.<£ž„“ï.=YÜp, */
+	$"959D C3A6 B1ED DEF1 F321 5BA6 FCCD 7762"            /* •�æ±íÞñó![¦üÍwb */
+	$"6C23 7398 AA59 4BBA 0052 B8A7 0608 1AAC"            /* l#s˜ªYKº.R¸§...¬ */
+	$"5B2E AF60 17F4 278E 6433 6F75 7839 CED2"            /* [.¯`.ô'Žd3oux9ÎÒ */
+	$"F32E 5D7D 9D40 B145 4CFB A25C D8D7 4BCB"            /* ó.]}�@±ELû¢\Ø×KË */
+	$"956D 88DD 4B92 64BF 4CD4 AFD5 6E56 9859"            /* •mˆÝK’d¿LÔ¯ÕnV˜Y */
+	$"ABEF BB40 AD0E 6E1F 9B3B 16A3 D9D3 58DF"            /* «ï»@­.n.›;.£ÙÓXß */
+	$"584E C303 1DAD D18B 6082 9C29 88EB 5163"            /* XNÃ..­Ñ‹`‚œ)ˆëQc */
+	$"A42D 061A 1570 64A9 0F1C E00D 56D9 E0CB"            /* ¤-...pd©..à.VÙàË */
+	$"7C66 799C 8EB4 BFCA CF5C CFC2 B611 4F0C"            /* |fyœŽ´¿ÊÏ\϶.O. */
+	$"AFDE 008C 3580 A270 0C1A 3737 50A1 9A89"            /* ¯Þ.Œ5€¢p..77P¡š‰ */
+	$"2546 BB2C 62A0 57BE 59CB C00A 1EE9 0F1D"            /* %F»,b W¾YËÀÂ.é.. */
+	$"C528 40D4 EA69 D281 AED4 B078 F27A 0B42"            /* Å(@ÔêiÒ�®Ô°xòz.B */
+	$"7AD2 DADD 146B 7FFF 223D 6A74 2041 4FCF"            /* zÒÚÝ.k.ÿ"=jt AOÏ */
+	$"46E1 60C8 9ABE 841E E18D 1712 DB6D 902B"            /* Fá`Èš¾„.á�..Ûm�+ */
+	$"7BE6 56DA 7E4B 1704 A373 2802 B120 0184"            /* {æVÚ~K..£s(.± .„ */
+	$"0681 4499 2739 CE73 9CE8 99D8 C352 337C"            /* .�D™'9Îsœè™ØÃR3| */
+	$"06AB BB71 6257 16EF B535 4972 8C2F 2EE0"            /* .«»qbW.ïµ5IrŒ/.à */
+	$"85CC 8431 D867 47EE CC43 6E87 A485 2316"            /* …Ì„1ØgGîÌCn‡¤…#. */
+	$"4927 AE22 C12D 49CE 739C E61C 97D0 99CC"            /* I'®"Á-IÎsœæ.—Ð™Ì */
+	$"3DC5 F26B 1A31 E742 3E56 464B 2944 108E"            /* =Åòk.1çB>VFK)D.Ž */
+	$"CB0C F4C7 E144 47E1 47C1 F6BD 8089 21DB"            /* Ë.ôÇáDGáGÁö½€‰!Û */
+	$"8279 4533 01BF B9CC C444 AD53 5F75 D706"            /* ‚yE3.¿¹ÌÄD­S_u×. */
+	$"3FDD CA27 5D6C 9F54 1CCF F838 38E4 B2E4"            /* ?ÝÊ']lŸT.Ïø88ä²ä */
+	$"F9FF 429F 59FE D27B 4A5E A69F 2C21 38F6"            /* ùÿBŸYþÒ{J^¦Ÿ,!8ö */
+	$"5A74 D405 2FEE 50B8 E5F1 C489 2693 5B33"            /* ZtÔ./îP¸åñĉ&“[3 */
+	$"D2C2 9DEC 68ED F55C 1FAC 1401 8D66 795A"            /* ÒÂ�ìhíõ\.¬..�fyZ */
+	$"F5F3 27A3 5874 6681 9AC6 F41D A4E6 40DA"            /* õó'£Xtf�šÆô.¤æ@Ú */
+	$"3EE5 CCEE 340C AF72 87FD 6B2A EB94 88EC"            /* >åÌî4.¯r‡ýk*딈ì */
+	$"A61D A536 7AC2 C6B8 85D9 CEBD 146C 83B5"            /* ¦.¥6zÂƸ…Ùν.lƒµ */
+	$"F5E0 A3C7 B524 BC64 B6B5 91A6 BF91 C547"            /* õà£Çµ$¼d¶µ‘¦¿‘ÅG */
+	$"BD87 811F D58E 8E51 BB89 FA6C 5257 33D9"            /* ½‡�.ÕŽŽQ»‰úlRW3Ù */
+	$"A964 A4AB 3BB9 9608 BECC 0D9C D6B9 3D3A"            /* ©d¤«;¹–.¾Ì.œÖ¹=: */
+	$"CB64 28BE 3B07 6318 DF9D C134 9F16 567A"            /* Ëd(¾;.c.ß�Á4Ÿ.Vz */
+	$"8127 5FFD F396 BA0C B86F AA17 2301 022A"            /* �'_ýó–º.¸oª.#..* */
+	$"3742 CE95 B1AF F858 C503 8156 35E0 8F2C"            /* 7BΕ±¯øXÅ.�V5à�, */
+	$"67D7 2D41 1F0B 5284 1535 AF16 6540 FB65"            /* g×-A..R„.5¯.e@ûe */
+	$"65BC 5F6B 136D 73A5 1C5D 3D92 FF5F 8494"            /* e¼_k.ms¥.]=’ÿ_„” */
+	$"FDBF E0C5 821F 072A 0EEB B855 6B42 CEE8"            /* ý¿àÅ‚..*.ë¸UkBÎè */
+	$"ABEE 381E 894E DF1E 29DD 4B78 3F0A F5EB"            /* «î8.‰Nß.)ÝKx?Âõë */
+	$"B9F8 61B8 8266 3BD8 A2AC 5BC1 38F4 5098"            /* ¹øa¸‚f;Ø¢¬[Á8ôP˜ */
+	$"3951 2437 1798 7BF9 EA00 12BF CF3E 9166"            /* 9Q$7.˜{ùê..¿Ï>‘f */
+	$"8253 6FF0 B942 70D7 C729 0866 33F7 3484"            /* ‚Soð¹Bp×Ç).f3÷4„ */
+	$"ADF8 C3D2 4EF6 1DF4 0E6F 8E64 B470 1D5E"            /* ­øÃÒNö.ô.oŽd´p.^ */
+	$"F311 9BD1 EDE1 BA5D 7601 2053 D70A FDCD"            /* ó.›Ñíáº]v. S×ÂýÍ */
+	$"82C0 1BDA A35C FAD2 67AD E569 7851 10A7"            /* ‚À.Ú£\úÒg­åixQ.§ */
+	$"EF9A 3533 EC03 E813 08B6 D984 1A1D 3DC0"            /* ïš53ì.è..¶Ù„..=À */
+	$"7C8E E03E 4A44 03E4 7894 FF1F 080E 2BFD"            /* |Žà>JD.äx”ÿ...+ý */
+	$"EEB4 E64A C757 389B 5780 3AF8 248C 580D"            /* î´æJÇW8›W€:ø$ŒX. */
+	$"461B D417 66BA CEB2 2042 3C84 DAF9 C127"            /* F.Ô.fºÎ² B<„ÚùÁ' */
+	$"63E9 168C A9E3 D418 61E8 C46C CF01 F59B"            /* cé.Œ©ãÔ.aèÄlÏ.õ› */
+	$"4518 8833 3E62 5B14 BFD1 41A8 45D6 D311"            /* E.ˆ3>b[.¿ÑA¨EÖÓ. */
+	$"8431 80DB 1FD5 5839 DE81 BCD9 EAFB EE26"            /* „1€Û.ÕX9Þ�¼Ùêûî& */
+	$"33DD 9E73 0B6F F957 26EE E7BA E0DA FF22"            /* 3Ýžs.oùW&îçºàÚÿ" */
+	$"EA50 24BF A182 089D 749A 6AAF BFF2 224D"            /* êP$¿¡‚.�tšj¯¿ò"M */
+	$"30D4 11D0 E07A A012 587A 0633 92B4 CBFC"            /* 0Ô.Ðàz .Xz.3’´Ëü */
+	$"8E1B E5AC 9025 A74D 2819 3F9D 8132 B795"            /* Ž.å¬�%§M(.?��2·• */
+	$"458E 4651 1589 158D D24C A5B0 CBFA 359E"            /* EŽFQ.‰.�ÒL¥°Ëú5ž */
+	$"BDB0 E4FB BFE3 5854 3E88 A646 71B1 9CB2"            /* ½°äû¿ãXT>ˆ¦Fq±œ² */
+	$"BB4E BA8E E170 8CBF C1F5 3141 F537 C0FA"            /* »NºŽápŒ¿Áõ1Aõ7Àú */
+	$"9780 6448 BA3B 94D6 3E8B 7AF0 0B5A C7A2"            /* —€dHº;”Ö>‹zð.ZÇ¢ */
+	$"4D05 C6BB 7F47 7102 F66E E4E8 3681 1C97"            /* M.Æ».Gq.önäè6�.— */
+	$"0996 4491 F713 2A24 3756 2715 4B55 762F"            /* Æ–D‘÷.*$7V'.KUv/ */
+	$"78CB 2608 0563 73F7 5626 9F35 0C54 6822"            /* xË&..cs÷V&Ÿ5.Th" */
+	$"F061 792A 4AFC 163A 9F83 8F82 638B 524D"            /* ðay*Jü.:Ÿƒ�‚c‹RM */
+	$"C21C 3735 DB76 6F4B 01F2 3E7E 5755 5945"            /* Â.75ÛvoK.ò>~WUYE */
+	$"6149 AAEE 1A88 7748 DC47 79E4 0660 318C"            /* aIªî.ˆwHÜGyä.`1Œ */
+	$"AA94 E92D 9879 C9C1 AC17 C828 7BBB 997A"            /* ª”é-˜yÉÁ¬.È({»™z */
+	$"315E 858F F31D 3522 A6D2 B3BD E548 DBA2"            /* 1^…�ó.5"¦Ò³½åHÛ¢ */
+	$"3274 749B 11C1 9570 D715 0350 4CC4 6820"            /* 2tt›.Á•p×..PLÄh  */
+	$"560A 8542 A38D 913B 3863 FF5C 97F2 9BA5"            /* VÂ…B£�‘;8cÿ\—ò›¥ */
+	$"893F 6C9B 15A2 EE40 BCD6 2676 80A9 AC89"            /* ‰?l›.¢î@¼Ö&v€©¬‰ */
+	$"9054 849D 859C 8DCD 181B 64F4 6D7B 71B4"            /* �T„�…œ�Í..dôm{q´ */
+	$"FBD3 0C84 21D4 CC6C CF84 F40A A3CD C958"            /* ûÓ.„!ÔÌlÏ„ô£ÍÉX */
+	$"928E 97E5 346C 6497 2888 7903 5B0B 3277"            /* ’Ž—å4ld—(ˆy.[.2w */
+	$"B4D6 9AA4 86C3 C691 CA1A 3C92 FCFB 02DE"            /* ´Öš¤†ÃÆ‘Ê.<’üû.Þ */
+	$"A25E 5C5C C6A8 1CE2 F5B5 88AB 3673 F912"            /* ¢^\\ƨ.âõµˆ«6sù. */
+	$"96AF E6BC 67FF 40CC 068D C6E3 8435 48AF"            /* –¯æ¼gÿ@Ì.�Æã„5H¯ */
+	$"B929 F509 0F59 3410 A9A6 1087 8352 11EC"            /* ¹)õÆ.Y4.©¦.‡ƒR.ì */
+	$"23CF CD2E 3F05 487E 0740 9BE7 236F 56FB"            /* #ÏÍ.?.H~.@›ç#oVû */
+	$"D0F4 677F 9514 C6E9 50BB A61A 6135 73FB"            /* Ðôg.•.ÆéP»¦.a5sû */
+	$"37AA FA5C 0967 671C 8485 5326 6EB5 4955"            /* 7ªú\Ægg.„…S&nµIU */
+	$"1AAE 5FCE C271 D992 9E8C B0DF 7795 E0F2"            /* .®_ÎÂqÙ’žŒ°ßw•àò */
+	$"A17A B50F E53A FE12 756F D1A1 5CE1 7C9B"            /* ¡zµ.å:þ.uoÑ¡\á|› */
+	$"D185 2C1A 9224 BC62 5C98 FA35 1649 6EA7"            /* Ñ…,.’$¼b\˜ú5.In§ */
+	$"4C7C C191 DF92 9D7A 6FE9 71D9 9A11 5A19"            /* L|Á‘ß’�zoéqÙš.Z. */
+	$"214D F951 38FA C459 E39A 6DAE 1253 31DF"            /* !MùQ8úÄYãšm®.S1ß */
+	$"B335 3337 39D2 7591 BFC1 31E6 887A 8BAB"            /* ³5379Òu‘¿Á1æˆz‹« */
+	$"ECCD 7A58 8E4A AD65 A7E1 5FC6 8EB0 DA82"            /* ìÍzXŽJ­e§á_ÆŽ°Ú‚ */
+	$"0F81 6849 5CE5 AB32 B763 1227 3F4C 5691"            /* .�hI\å«2·c.'?LV‘ */
+	$"43C7 DD24 E8D9 C4F3 7BB0 4666 7A24 1C5B"            /* CÇÝ$èÙÄó{°Ffz$.[ */
+	$"F57D 719F 2BDB 3794 66BA BBB6 9D8D A662"            /* õ}qŸ+Û7”fº»¶��¦b */
+	$"CF99 4DDC E533 96D6 EEE0 3FC7 BFB8 B1B7"            /* Ï™MÜå3–Öîà?Ç¿¸±· */
+	$"9AE3 57C7 E1A8 B1F8 6C5C 3F0D 19C1 812D"            /* šãWÇᨱøl\?..Á�- */
+	$"8D31 C88B C396 B5E7 3CE0 4E2C AE73 7876"            /* �1ȋÖµç<àN,®sxv */
+	$"0436 A295 BEC6 BDF1 C604 C41C 94E6 E7C1"            /* .6¢•¾Æ½ñÆ.Ä.”æçÁ */
+	$"AC78 356A B92A DB37 3360 3372 6638 0C5C"            /* ¬x5j¹*Û73`3rf8.\ */
+	$"F388 7CDE 4045 060F E713 C4C3 321E E08B"            /* óˆ|Þ@E..ç.ÄÃ2.à‹ */
+	$"0810 71EE A6AB C032 2B85 C34C 2671 8143"            /* ..qÀ2+…ÃL&q�C */
+	$"AFDE 07D1 A40C D86A ADBE B961 EAA3 54BD"            /* ¯Þ.Ѥ.Øj­¾¹aê£T½ */
+	$"804D 6FA9 AA3F 7FBE BCD9 E785 A230 EA4E"            /* €Mo©ª?.¾¼Ùç…¢0êN */
+	$"1C08 1DF6 8373 7754 5039 7854 1192 1512"            /* ...öƒswTP9xT.’.. */
+	$"B956 E9A7 575E E3DB F5F9 4B02 F739 F2BB"            /* ¹Vé§W^ãÛõùK.÷9ò» */
+	$"91B2 73E1 3D19 EBB6 AD2F 291C 5BAC 5EEA"            /* ‘²sá=.붭/).[¬^ê */
+	$"EEDF 8DA7 5FCA 8E8C 952D 8FD0 441C 5BA4"            /* îß�§_ÊŽŒ•-�ÐD.[¤ */
+	$"8AF6 21BE 1FAF DAE3 DADD EA91 EF73 58A0"            /* Šö!¾.¯ÚãÚÝê‘ïsX  */
+	$"29E6 89B2 E279 B02A D092 DD08 6187 9095"            /* )扲ây°*Ð’Ý.a‡�• */
+	$"5C85 C903 0DD2 9ED3 538B D9BB E936 8ABB"            /* \…É..ÒžÓS‹Ù»é6Š» */
+	$"E203 DD03 2944 5317 7BC3 0297 2125 F198"            /* â.Ý.)DS.{Ã.—!%ñ˜ */
+	$"D117 8DDB E382 71F8 D0A7 14B1 6D7A A0EB"            /* Ñ.�Ûã‚qøЧ.±mz ë */
+	$"7C6F 7651 D2EC ECA7 F670 D09F 6CF6 30DB"            /* |ovQÒìì§öpПlö0Û */
+	$"0830 39B5 BC45 3915 4054 4490 A7BA 5CEC"            /* .09µ¼E9.@TD�§º\ì */
+	$"D37B FBC2 7890 B18F DEEA 4966 D46D 5FD2"            /* Ó{ûÂx�±�ÞêIfÔm_Ò */
+	$"7811 AAD0 8EBF FB40 0F30 D8A4 2B71 5A03"            /* x.ªÐŽ¿û@.0ؤ+qZ. */
+	$"636A C360 C889 891D D420 A828 E337 41CC"            /* cjÃ`ȉ‰.Ô ¨(ã7AÌ */
+	$"3314 5473 B91F 7B78 2B3B AC7A 1127 F2DE"            /* 3.Ts¹.{x+;¬z.'òÞ */
+	$"E997 2101 6008 26AE 43D5 7CE7 8532 B9CE"            /* é—!.`.&®CÕ|ç…2¹Î */
+	$"A81A 710E 5D87 49D7 3EF6 65A3 D533 977E"            /* ¨.q.]‡I×>öe£Õ3—~ */
+	$"7BE9 0CA7 8B28 9ADA AF4F 45A5 99BD E21D"            /* {é.§‹(šÚ¯OE¥™½â. */
+	$"D4B1 BB33 2508 C8D1 31E5 E9FB F917 A8E1"            /* Ô±»3%.ÈÑ1åéûù.¨á */
+	$"2955 9008 F531 9010 575A 3AFB 59F4 CD63"            /* )U�.õ1�.WZ:ûYôÍc */
+	$"3EEE 2409 BCD4 E5F1 1418 6155 B6D7 A94B"            /* >î$ƼÔåñ..aU¶×©K */
+	$"1D48 79A8 2F32 0770 476B CE28 023A DC86"            /* .Hy¨/2.pGkÎ(.:܆ */
+	$"E008 813B E64A 39F5 58CE 3E75 DAA6 BD7A"            /* à.�;æJ9õXÎ>uÚ¦½z */
+	$"1528 FF50 0738 C132 5569 3C99 C4BC A20F"            /* .(ÿP.8Á2Ui<™Ä¼¢. */
+	$"6DED 9310 6FE1 8BE4 BF4D D0B1 993E 0FD3"            /* mí“.oá‹ä¿Mб™>.Ó */
+	$"4938 1302 E4A8 FDA2 A7D2 4615 CD89 1E52"            /* I8..ä¨ý¢§ÒF.͉.R */
+	$"4160 51F8 BABB FEED 4281 0E0C 31CD 91D7"            /* A`Qøº»þíB�..1Í‘× */
+	$"C7CF E302 E155 4188 0F06 097F 6906 2EC9"            /* ÇÏã.áUAˆ..Æ.i..É */
+	$"BE00 A1FB 0D99 8FB1 3B3D E3D3 70B8 4296"            /* ¾.¡û.™�±;=ãÓp¸B– */
+	$"F199 E066 15B5 920C 38A2 695F F2E8 81E1"            /* ñ™àf.µ’.8¢i_òè�á */
+	$"E0EC 34E5 97B3 9580 459F A2D9 E267 B847"            /* àì4å—³•€EŸ¢Ùâg¸G */
+	$"E302 3AA0 8631 8C61 5F8E 88DE 2FBB 394B"            /* ã.: †1Œa_ŽˆÞ/»9K */
+	$"B9EC 234B 6515 BDF3 BA80 AA30 3D50 2F90"            /* ¹ì#Ke.½óº€ª0=P/� */
+	$"C26A D743 2198 707A 2DC1 9C64 1647 1FA3"            /* Âj×C!˜pz-Áœd.G.£ */
+	$"43A2 B1C7 C95D 1E19 9650 E616 F24B C118"            /* C¢±ÇÉ]..–Pæ.òKÁ. */
+	$"FB68 CE23 485E BF50 ACF8 F669 B5A3 92AA"            /* ûhÎ#H^¿P¬øöiµ£’ª */
+	$"5625 BF48 8584 A6E7 DAC0 E203 2AF0 89A0"            /* V%¿H…„¦çÚÀâ.*ð‰  */
+	$"DB92 4924 9249 1BF5 D855 0470 51D0 AAE2"            /* Û’I$’I.õØU.pQЪâ */
+	$"A1E5 FBC9 CB80 1798 2EB3 EB1E 9FD4 46E7"            /* ¡åûÉË€.˜.³ë.ŸÔFç */
+	$"63DB F02E 204B D35F 54DE 0FD3 2F81 FB63"            /* cÛð. KÓ_TÞ.Ó/�ûc */
+	$"9CEC 37F1 C9FF 5B63 B13D BFBD 1169 0415"            /* œì7ñÉÿ[c±=¿½.i.. */
+	$"0E97 DA89 25E3 92C7 01F5 50E6 2181 A536"            /* .—Ú‰%ã’Ç.õPæ!�¥6 */
+	$"4020 C49B 1977 1BF5 5226 FD7D 668A D76F"            /* @ Ä›.w.õR&ý}fŠ×o */
+	$"2954 58F1 F44F 2935 F136 18BD C844 05FD"            /* )TXñôO)5ñ6.½ÈD.ý */
+	$"E325 9012 9E92 6EC3 E822 D06F A958 C54C"            /* ã%�.ž’nÃè"Ðo©XÅL */
+	$"6A4D 0A98 093C 481D 1424 7964 E810 7A60"            /* jM˜Æ<H..$ydè.z` */
+	$"F2C0 8287 A7F4 B307 FBDF 2550 567E 01EA"            /* òÀ‚‡§ô³.ûß%PV~.ê */
+	$"2C45 4614 9A0A 04E8 397B 3DEC 6CDA CA95"            /* ,EF.šÂ.è9{=ìlÚÊ• */
+	$"B754 699A FF29 B46B D6E3 BB8C 153C AEC0"            /* ·Tišÿ)´kÖ㻌.<®À */
+	$"BEFF 46AD 744B B945 4C07 F7F7 178D 059E"            /* ¾ÿF­tK¹EL.÷÷.�.ž */
+	$"2E80 10C4 6DD6 F19E B649 73D6 8C57 7A6C"            /* .€.ÄmÖñž¶IsÖŒWzl */
+	$"45DE 3D43 22DE C54A DFCD 64EA 9D77 1AC6"            /* EÞ=C"ÞÅJßÍdê�w.Æ */
+	$"E15E A9A7 0D83 D53C 100B EC25 2B93 1D27"            /* á^©§.ƒÕ<..ì%+“.' */
+	$"367A 864E D9C4 F0B9 DF5C 538D B2C0 24EE"            /* 6z†NÙÄð¹ß\S�²À$î */
+	$"46E7 424C 2127 6BED B492 3354 86C9 D855"            /* FçBL!'kí´’3T†ÉØU */
+	$"317B 6BE2 8205 C07C 9A42 03E4 D6B0 0F93"            /* 1{kâ‚.À|šB.äÖ°.“ */
+	$"4400 AFF0 AE8C D6D6 6729 AEBE 9CDE 5C69"            /* D.¯ð®ŒÖÖg)®¾œÞ\i */
+	$"D95C 01A0 28AF 1E57 B12C CA6D F010 ED89"            /* Ù\. (¯.W±,Êmð.í‰ */
+	$"4C46 38AA BAFC D67E 9E98 C6CA 85E4 433E"            /* LF8ªºüÖ~ž˜ÆÊ…äC> */
+	$"C450 03B7 E8DE 17B3 9CE7 02E1 BE72 100B"            /* ÄP.·èÞ.³œç.á¾r.. */
+	$"2EF5 787D 0D12 FC3B 855A 3F97 1850 05EF"            /* .õx}..ü;…Z?—.P.ï */
+	$"A05D 7CC2 405B BA6D 9175 7C99 BE1C 2370"            /*  ]|Â@[ºm‘u|™¾.#p */
+	$"1F57 2085 13F8 B672 728D 1152 8232 1EE4"            /* .W ….ø¶rr�.R‚2.ä */
+	$"A666 BFD0 06A8 6CFF 3D73 D895 5968 A54A"            /* ¦f¿Ð.¨lÿ=sØ•Yh¥J */
+	$"3219 63AB D4CD 8E7D 52F3 D260 CE4D E329"            /* 2.c«ÔÍŽ}RóÒ`ÎMã) */
+	$"F554 C837 34CC 2866 FA1E 1F34 B209 B8C3"            /* õTÈ74Ì(fú..4²Æ¸Ã */
+	$"097B 8DBC 8788 F621 2A57 5468 5FD8 852B"            /* Æ{�¼‡ˆö!*WTh_Ø…+ */
+	$"08A9 45F3 71A8 A26B F63C 2DB1 750F A833"            /* .©Eóq¨¢kö<-±u.¨3 */
+	$"4767 6D8A B551 FF10 9E54 AD5D EE2E 2207"            /* GgmŠµQÿ.žT­]î.". */
+	$"44EA 0D21 75D4 779D E96D 49FF 47CE D775"            /* Dê.!uÔw�émIÿGÎ×u */
+	$"D7B0 2380 5F1C 4185 EF0B BECB 1A55 9696"            /* ×°#€_.A…ï.¾Ë.U–– */
+	$"81B8 94F2 4F5B 07D8 D5EC 9E2A 049D 5E87"            /* �¸”òO[.ØÕìž*.�^‡ */
+	$"2601 FB44 4AD5 C57B A7B0 8088 B723 134E"            /* &.ûDJÕÅ{§°€ˆ·#.N */
+	$"0B8A 375E B972 F34F F25A 2B68 3F15 4496"            /* .Š7^¹róOòZ+h?.D– */
+	$"5734 FE10 D742 67F9 9FFF 639C FAFD 23DB"            /* W4þ.×BgùŸÿcœúý#Û */
+	$"B90C F402 17F0 81C6 2656 EFD0 E011 C866"            /* ¹.ô..ð�Æ&VïÐà.Èf */
+	$"15C8 4927 3415 BEC1 7876 E693 74CB DBEA"            /* .ÈI'4.¾Áxvæ“tËÛê */
+	$"7206 2246 23EC DCCA 51CD 72C1 8C41 1B85"            /* r."F#ìÜÊQÍrÁŒA.… */
+	$"AE9B 6FA5 4286 03FB 7000 D94F 5A8B 8A85"            /* ®›o¥B†.ûp.ÙOZ‹Š… */
+	$"2F34 7575 E7AB 08FF 3CBD 328D D95D BDF5"            /* /4uuç«.ÿ<½2�Ù]½õ */
+	$"8070 0FAD B573 A91E 5F83 D32D 3337 A5B7"            /* €p.­µs©._ƒÓ-37¥· */
+	$"C6A7 3048 8D7C 3F01 F6BF 1BAB D684 0585"            /* Ƨ0H�|?.ö¿.«Ö„.… */
+	$"798A A28D 68A6 4993 22BC F35C E3A7 BABE"            /* yŠ¢�h¦I“"¼ó\㧺¾ */
+	$"0D5B 7E43 2B91 5DA6 6821 0495 4B22 33C0"            /* .[~C+‘]¦h!.•K"3À */
+	$"1217 1302 A7EB 1093 C8BD 3622 F0FD 14C3"            /* ....§ë.“Ƚ6"ðý.à */
+	$"EDBA 60FA B4C2 07D5 6D80 C177 9C23 24FE"            /* íº`ú´Â.Õm€Áwœ#$þ */
+	$"C9E7 77A7 1945 4C1A 8945 129A 2581 498D"            /* Éçw§.EL.‰E.š%�I� */
+	$"F2BD 5AD6 EF89 4D80 3EC2 DA29 E093 A726"            /* ò½ZÖï‰M€>ÂÚ)à“§& */
+	$"88F1 0796 E9F0 8F36 D342 7AD3 DEC2 2CCA"            /* ˆñ.–éð�6ÓBzÓÞÂ,Ê */
+	$"45B9 35A0 DE31 D18B 2954 C38C 4B3A EEA2"            /* E¹5 Þ1Ñ‹)TÃŒK:î¢ */
+	$"5CD5 333D 6C59 23C7 17B3 C98C 65EE 8117"            /* \Õ3=lY#Ç.³ÉŒeî�. */
+	$"22A2 574D D223 581B D09B 6473 3F85 6E2A"            /* "¢WMÒ#X.Лds?…n* */
+	$"81B5 F600 CAB6 1A02 3B24 D726 4344 536F"            /* �µö.ʶ..;$×&CDSo */
+	$"99AB 09C8 96EA B41B 01C9 7AC8 9478 B8AB"            /* ™«ÆÈ–ê´..ÉzÈ”x¸« */
+	$"69E3 1BF1 1100 AFF3 C59C 01FB 8EF9 047D"            /* iã.ñ..¯óÅœ.ûŽù.} */
+	$"21EF 11DE D2CA BEE2 8372 5DDB C39C DE6E"            /* !ï.ÞÒʾâƒr]ÛÃœÞn */
+	$"B652 35FE FDFB F1E8 2E91 778A 86C3 3117"            /* ¶R5þýûñè.‘wŠ†Ã1. */
+	$"87D8 A7D5 7862 68B7 30C1 3B32 D209 0256"            /* ‡Ø§Õxbh·0Á;2ÒÆ.V */
+	$"2BF7 DFEF 17C3 FC30 EF1D 9327 7041 FC3C"            /* +÷ßï.Ãü0ï.“'pAü< */
+	$"674F 3069 DAB2 0EA5 BB48 DC2C DC66 F660"            /* gO0iÚ².¥»HÜ,Üfö` */
+	$"9C9B C7C8 3734 C68B 7D5A 60A1 DF3D D3A8"            /* œ›ÇÈ74Æ‹}Z`¡ß=Ó¨ */
+	$"E60C D15A 11C7 FB3B F75A 358E A7F7 16CB"            /* æ.ÑZ.Çû;÷Z5Ž§÷.Ë */
+	$"67B5 097E E2A2 DE6C E40A FD52 8F75 43EF"            /* gµÆ~â¢ÞläÂýR�uCï */
+	$"F5DF 5A51 BBF5 A074 791F F54F 9724 23C3"            /* õßZQ»õ ty.õO—$#Ã */
+	$"F5E6 C4A3 E22C 1E06 3B71 A9A2 1C17 0109"            /* õæÄ£â,..;q©¢...Æ */
+	$"1B59 2742 AB03 0497 3E5A AD73 7FD3 DA51"            /* .Y'B«..—>Z­s.ÓÚQ */
+	$"9F17 A10E B9CF 7503 3395 8788 9D9D 4A58"            /* Ÿ.¡.¹Ïu.3•‡ˆ��JX */
+	$"F9B8 4A61 3DDA 7489 8086 9EAC 4D7D 62DD"            /* ù¸Ja=Út‰€†ž¬M}bÝ */
+	$"BF8B 9462 1CC0 6912 69BE 3BFE FED7 3174"            /* ¿‹”b.Ài.i¾;þþ×1t */
+	$"CAA6 A806 FF59 B963 ABEE 508B F428 D15C"            /* ʦ¨.ÿY¹c«îP‹ô(Ñ\ */
+	$"82FC BA30 6907 C572 F2BD C0DB E9A2 44AF"            /* ‚üº0i.Årò½ÀÛé¢D¯ */
+	$"EED6 81F7 C602 F802 0374 CD1D 0F41 5E2E"            /* îÖ�÷Æ.ø..tÍ..A^. */
+	$"F54F E7AB C492 54F8 C570 48A6 1603 35D3"            /* õOç«Ä’TøÅpH¦..5Ó */
+	$"EA1A 6A6D FD79 27E3 F928 4E16 3A2D 43FE"            /* ê.jmýy'ãù(N.:-Cþ */
+	$"6C3D AFC6 FA1C 578C 7BA9 7343 5B2C 7BB9"            /* l=¯Æú.WŒ{©sC[,{¹ */
+	$"0614 915A 24C4 CAC1 A2D3 0EAF EAE8 7257"            /* ..‘Z$ÄÊÁ¢Ó.¯êèrW */
+	$"EA2D 1ED2 3FFE 26A7 3E28 28D0 1AE1 D790"            /* ê-.Ò?þ&§>((Ð.á×� */
+	$"A25D 1C6C BA20 E196 1EEC 9720 92EE 6E62"            /* ¢].lº á–.ì— ’înb */
+	$"E218 5609 944E 9A2E 9228 117A 6065 93FF"            /* â.VÆ”Nš.’(.z`e“ÿ */
+	$"2B32 B2C1 7876 E657 E39E 8641 F202 62B4"            /* +2²ÁxvæW㞆Aò.b´ */
+	$"20C5 99D9 F9E5 7D83 D807 EDB7 9A34 475B"            /*  Å™Ùùå}ƒØ.í·š4G[ */
+	$"4F45 9AE8 ACD6 3098 A0C2 8D14 CBDB 9A2B"            /* OEšè¬Ö0˜ Â�.ËÛš+ */
+	$"0EF7 CB30 8B49 169F 1ECD 6F33 F063 65DA"            /* .÷Ë0‹I.Ÿ.Ío3ðceÚ */
+	$"2A2F F0B0 EE29 91F7 CA11 748C 5E4E A447"            /* *.ð°î)‘÷Ê.tŒ^N¤G */
+	$"0F7F 4B32 DB7A 366C 27C4 F178 33B7 5E9B"            /* ..K2Ûz6l'Äñx3·^› */
+	$"BAAF 29CD A3EF 39BB 5FAD AD2B 5DCA 09E8"            /* º¯)Í£ï9»_­­+]ÊÆè */
+	$"DB9A DD07 84DD 870E 2A4C 850B BD04 7F9A"            /* ÛšÝ.„݇.*L….½..š */
+	$"1354 1DAA 0819 F583 1F47 5905 6597 5F07"            /* .T.ª..õƒ.GY.e—_. */
+	$"7ED6 DFFA BA65 FA6C D01D F65F F833 D479"            /* ~ÖßúºeúlÐ.ö_ø3Ôy */
+	$"BFD3 F3D8 57BB 3718 EBC8 5A2D 732E 464E"            /* ¿ÓóØW»7.ëÈZ-s.FN */
+	$"6B46 9512 778B 8066 D5DA D21A 819D 5384"            /* kF•.w‹€fÕÚÒ.��S„ */
+	$"A84C AE56 92E2 2E9A 4D27 8A21 E02D 67FC"            /* ¨L®V’â.šM'Š!à-gü */
+	$"EAA4 B3D5 9306 1D06 CC9A 84C8 D6C4 C7E1"            /* ꤳՓ...Ìš„ÈÖÄÇá */
+	$"4F47 E168 43F0 6EB1 9276 ED11 2C29 F1CB"            /* OGáhCðn±’ví.,)ñË */
+	$"90AB 1975 3405 422B 78EC 7776 FA5C 0A2C"            /* �«.u4.B+xìwvú\Â, */
+	$"F4B1 4F40 32CE D338 8911 EAB4 4CFC 7765"            /* ô±O@2ÎÓ8‰.ê´Lüwe */
+	$"D9ED C10E 114B 0909 1122 6832 A41E 3365"            /* ÙíÁ..KÆÆ."h2¤.3e */
+	$"96EF FC81 A398 2FE8 0464 5D18 0C9F C1AF"            /* –ïü�£˜/è.d]..ŸÁ¯ */
+	$"8E6F 42CA BDC9 1DC4 770E 1C2E 01BD 62DB"            /* ŽoBʽÉ.Äw....½bÛ */
+	$"7798 4167 FC4F B27D D7E6 32CE 7F95 954F"            /* w˜AgüO²}×æ2Î.••O */
+	$"653C 833E B4F1 C6C2 307E 0796 686E 6F5C"            /* e<ƒ>´ñÆÂ0~.–hno\ */
+	$"6EE2 6260 4C0B 5329 36D8 839E 5F08 319C"            /* nâb`L.S)6؃ž_.1œ */
+	$"4CAE 85DE 6B64 F427 1358 C9FF 57B9 AF78"            /* L®…Þkdô'.XÉÿW¹¯x */
+	$"332B 82A6 0EBF 0F83 7A3C 8004 1402 6A12"            /* 3+‚¦.¿.ƒz<€...j. */
+	$"FEE8 1612 2D8A 47FE 5BDE 2714 B393 E32F"            /* þè..-ŠGþ[Þ'.³“ã/ */
+	$"013E BD7E 14FA 285D BF61 7CDA 3A92 734A"            /* .>½~.ú(]¿a|Ú:’sJ */
+	$"520E 978D 8736 6AA9 847B 05C9 F28B 3D9A"            /* R.—�‡6j©„{.Éò‹=š */
+	$"9B2E 721C 9082 3EC1 362C D516 D306 1EB9"            /* ›.r.�‚>Á6,Õ.Ó..¹ */
+	$"A95C EC63 3111 4ED2 054A EFF8 F26A 0E36"            /* ©\ìc1.NÒ.Jïøòj.6 */
+	$"7445 26A0 464F CEDC 924D B183 FAEF 28F7"            /* tE& FOÎÜ’M±ƒúï(÷ */
+	$"AF76 2DBA F15C 4F45 4BFD E003 CDC1 A878"            /* ¯v-ºñ\OEKýà.ÍÁ¨x */
+	$"6FB4 207C 2A45 1ED9 CE49 2495 F6A9 77E8"            /* o´ |*E.ÙÎI$•ö©wè */
+	$"E7FF 7FFF 7FFF 7FFF 70EC F373 E872 28BA"            /* çÿ.ÿ.ÿ.ÿpìósèr(º */
+	$"A0BB 38E4 AC79 94DA 6562 832A 9A7B EEA8"            /*  »8ä¬y”Úebƒ*š{î¨ */
+	$"6B09 FEA7 9249 2005 E7D1 D721 4761 B6DB"            /* kÆþ§’I .çÑ×!Ga¶Û */
+	$"6DB6 DB6D 98C5 C208 FD98 41AA F430 3EAE"            /* m¶Ûm˜ÅÂ.ý˜Aªô0>® */
+	$"7118 7229 50B1 07D8 C5CA 010D 4AB4 DE82"            /* q.r)P±.ØÅÊ..J´Þ‚ */
+	$"53D3 E184 6561 DE5F 7236 BBF5 550D 4A83"            /* SÓá„eaÞ_r6»õU.Jƒ */
+	$"555B 5C0F 9C0E F052 0080 F4AC 3912 DD30"            /* U[\.œ.ðR.€ô¬9.Ý0 */
+	$"47C9 B77E C632 15D7 8EB6 CD51 0454 A805"            /* GÉ·~Æ2.׎¶ÍQ.T¨. */
+	$"2DAD F687 6CB7 B37F 2289 759F F7D5 8839"            /* -­ö‡l·³."‰uŸ÷Õˆ9 */
+	$"B3E6 BCA5 AA89 9D9D 599A 5BDD 54B9 7F7D"            /* ³æ¼¥ª‰��Yš[ÝT¹.} */
+	$"2770 11ED 2217 C539 0204 16FF 728A C52A"            /* 'p.í".Å9...ÿrŠÅ* */
+	$"2D24 5FC7 E1D7 C47E 1DE8 C3F0 EA38 E730"            /* -$_Çá×Ä~.èÃðê8ç0 */
+	$"2D9D 0AC5 991A F5DD 38EC 007B A963 8B4D"            /* -�ÂÅ™.õÝ8ì.{©c‹M */
+	$"51BA A9FC AE25 908A 1B70 9145 EBA2 38C4"            /* Qº©ü®%�Š.p‘Eë¢8Ä */
+	$"168F 70BB 10A5 CAA5 A249 1974 03F3 AB57"            /* .�p».¥Ê¥¢I.t.ó«W */
+	$"3611 30C5 1F14 529F 040A A8EC EBDF F2FF"            /* 6.0Å..RŸ.¨ìëßòÿ */
+	$"232B 83FE C2D0 59D9 93C2 2A8A F86A 997F"            /* #+ƒþÂÐYÙ“Â*Šøj™. */
+	$"3207 03A7 C406 E96C C96F 23F1 1490 95DF"            /* 2..§Ä.élÉo#ñ.�•ß */
+	$"4024 67DC 3DE6 E1B1 EB60 1026 8786 531C"            /* @$gÜ=æá±ë`.&‡†S. */
+	$"9A51 378D EE86 881F 496C 8854 9459 7799"            /* šQ7�.IlˆT”Yw™ */
+	$"11EC 4196 0C22 0F05 3762 D8F4 C348 7299"            /* .ìA–."..7bØôÃHr™ */
+	$"793E 0718 14D3 D09C C192 80E1 9F7C 5CFA"            /* y>...ÓÐœÁ’€áŸ|\ú */
+	$"429C 7960 2F8B 9063 C7E1 1447 7F52 D850"            /* Bœy`/‹�cÇá.G.RØP */
+	$"B80A F1D8 BE98 DC3C 9C44 3AB7 3DA7 E08C"            /* ¸Âñؾ˜Ü<œD:·=§àŒ */
+	$"E7B6 07CE 2B69 C0E9 0C21 6133 1EC5 DAB5"            /* ç¶.Î+iÀé.!a3.ÅÚµ */
+	$"B079 413B FBA4 0259 78B8 DA3A E6D1 4AAC"            /* °yA;û¤.Yx¸Ú:æÑJ¬ */
+	$"2459 93C8 AD9A D69C AC40 5CF7 7385 1B18"            /* $Y“È­šÖœ¬@\÷s….. */
+	$"D67D 82BD 5E44 3DF8 5D2F E6D3 CE47 0191"            /* Ö}‚½^D=ø]/æÓÎG.‘ */
+	$"6E57 0F2F E8E8 9FF0 14BC 21F1 7720 6F34"            /* nW./èèŸð.¼!ñw o4 */
+	$"1EEE 5EF6 F8FD 5481 44E3 AB6B B06E 2556"            /* .î^öøýT�Dã«k°n%V */
+	$"6F07 AD65 FC95 7C32 7487 10A0 3C20 9CA7"            /* o.­eü•|2t‡. < œ§ */
+	$"B0EB F703 2D09 F0A6 D3FD 55F6 354B EDB0"            /* °ë÷.-Æð¦ÓýUö5Kí° */
+	$"179B B267 B9EB 8DA1 ED8E 7D0F 1AFF 4D50"            /* .›²g¹ë�¡íŽ}..ÿMP */
+	$"C1C7 A686 586C 6A26 3B0B 4292 60A0 A804"            /* ÁǦ†Xlj&;.B’` ¨. */
+	$"04F6 5FDB 0F76 E2BC D680 20B5 46AE 399D"            /* .ö_Û.vâ¼Ö€ µF®9� */
+	$"CC54 82A4 1DCA 08E7 E2B4 6710 ABD8 FC18"            /* ÌT‚¤.Ê.çâ´g.«Øü. */
+	$"949B 7076 11CD 598E 2A8B 99FC CC28 EC17"            /* ”›pv.ÍYŽ*‹™üÌ(ì. */
+	$"451C DE31 F7F4 C47E 3ABB AF03 FDC6 D875"            /* E.Þ1÷ôÄ~:»¯.ýÆØu */
+	$"BD0C AB3E B78F F942 A53E E5F8 CA09 414D"            /* ½.«>·�ùB¥>åøÊÆAM */
+	$"7544 D5B4 8367 3256 6D8C CB66 6DE7 E99C"            /* uDÕ´ƒg2VmŒËfmçéœ */
+	$"88E9 FCDC EB55 F67B 20E7 F44D 7616 6B29"            /* ˆéüÜëUö{ çôMv.k) */
+	$"124A C9AB 95C7 E9A8 209D EDA5 499F 2D2F"            /* .JÉ«•Çé¨ �í¥IŸ-/ */
+	$"20E5 DE8C 2EEE 92AF 4BD6 484B 7E18 2D81"            /*  åÞŒ.î’¯KÖHK~.-� */
+	$"0502 F439 C742 BA21 693B 43C5 60DF 8BA0"            /* ..ô9ÇBº!i;CÅ`ß‹  */
+	$"9EAC 0A98 DFE4 DB4B 0BE1 E526 9B74 5982"            /* ž¬Â˜ßäÛK.áå&›tY‚ */
+	$"1817 EA6B 067A D3E4 8786 883D 26DB D361"            /* ..êk.zÓ䇆ˆ=&ÛÓa */
+	$"C40F 89F4 B31F 2AF3 1369 FDA9 889A 5620"            /* Ä.‰ô³.*ó.iý©ˆšV  */
+	$"9AE7 4384 7184 9D7F 6C37 F79B 9422 ADF3"            /* šçC„q„�.l7÷›”"­ó */
+	$"2BEA A620 14CF 0267 110E AB20 594B F1DA"            /* +ê¦ .Ï.g..« YKñÚ */
+	$"9D7F DB53 3723 1A4E 0DEC DF68 3A10 078F"            /* �.ÛS7#.N.ìßh:..� */
+	$"8CA5 471B 4400 0975 92AA A351 8C66 5DDA"            /* Œ¥G.D.Æu’ª£QŒf]Ú */
+	$"0E4E C7B1 286F 2F7C E0EB 24CC 0A8B CAF8"            /* .NDZ(o/|àë$Ì‹Êø */
+	$"4F0F 75E5 CACF 26F5 0FFE 86A8 1E77 5F03"            /* O.uåÊÏ&õ.þ†¨.w_. */
+	$"A8B5 A544 F04B A521 B3FA 854A 64FA 70CD"            /* ¨µ¥DðK¥!³ú…JdúpÍ */
+	$"526F 97AE 807A 05FC 3F67 2471 61E5 2715"            /* Ro—®€z.ü?g$qaå'. */
+	$"5774 E452 7E4A CDDA 6E48 0DA2 04B3 3A29"            /* WtäR~JÍÚnH.¢.³:) */
+	$"DE10 8F75 3A3A 559D A881 B948 74F3 AB92"            /* Þ.�u::U�¨�¹Htó«’ */
+	$"B154 0F88 A11B A00B 25ED 9A59 B894 618E"            /* ±T.ˆ¡. .%íšY¸”aŽ */
+	$"AD45 3D59 9C08 49EA 076C CD63 8F49 B714"            /* ­E=Yœ.Iê.lÍc�I·. */
+	$"32B3 8743 2506 F55A C011 CBEF C94A 8606"            /* 2³‡C%.õZÀ.ËïÉJ†. */
+	$"EDE4 BE7D 2DC9 8830 6C23 91E0 0209 440C"            /* íä¾}-Ɉ0l#‘à.ÆD. */
+	$"9409 1457 6CA0 2201 8FF4 7573 54F8 CCEC"            /* ”Æ.Wl ".�ôusTøÌì */
+	$"D201 4A3A 66A6 B191 4E14 4CB1 08B4 2100"            /* Ò.J:f¦±‘N.L±.´!. */
+	$"BCF2 3A0D 696F 4582 F8B0 3A60 2D09 E9A7"            /* ¼ò:.ioE‚ø°:`-Æé§ */
+	$"8E83 CF44 A16A 6516 31C1 B51E 2DFE BDAC"            /* ŽƒÏD¡je.1Áµ.-þ½¬ */
+	$"356B F402 856C BEA0 109C A125 A759 E580"            /* 5kô.…l¾ .œ¡%§Yå€ */
+	$"3501 F500 F252 9533 F180 6E7D 30A8 FD62"            /* 5.õ.òR•3ñ€n}0¨ýb */
+	$"7FD6 B4EB 9120 8504 493A DD87 D79A 0CB1"            /* .Ö´ë‘ ….I:݇ך.± */
+	$"B674 7010 830D 8A38 5B44 B11D 3632 3FA5"            /* ¶tp.ƒ.Š8[D±.62?¥ */
+	$"CE31 CE9A 1670 AF20 16F6 BDA6 4980 002E"            /* Î1Κ.p¯ .ö½¦I€.. */
+	$"3E9E 8AB0 8B1F 63C5 28C3 7914 2833 137F"            /* >žŠ°‹.cÅ(Ãy.(3.. */
+	$"0915 DD39 7D38 49A3 6054 B5DC 2509 EE11"            /* Æ.Ý9}8I£`TµÜ%Æî. */
+	$"D68A 5C2A C75B 5B9F 7A9A FF3A D06F 3331"            /* ÖŠ\*Ç[[Ÿzšÿ:Ðo31 */
+	$"29E6 A9F4 8AD5 E0D9 7FB9 84B1 F403 8910"            /* )æ©ôŠÕàÙ.¹„±ô.‰. */
+	$"1168 1270 19E2 E385 0353 0FFF 697F 96BE"            /* .h.p.âã….S.ÿi.–¾ */
+	$"EF55 21CA 25A1 CE5E 0CD7 03A9 094F 51FE"            /* ïU!Ê%¡Î^.×.©ÆOQþ */
+	$"5314 E59F 90EB 907A E37A DD9D 182A E41C"            /* S.åŸ�ë�zãzÝ�.*ä. */
+	$"CFFB 7262 0D9E B904 8D95 2DE3 E02B F5CB"            /* Ïûrb.ž¹.�•-ãà+õË */
+	$"BF61 6012 924E 50D3 2D8D 6C25 FC60 8D19"            /* ¿a`.’NPÓ-�l%ü`�. */
+	$"9855 8BF2 5400 0000 04E3 7684 B40E 9EE7"            /* ˜U‹òT....ãv„´.žç */
+	$"21F8 CB76 250B 7CE0 2605 7C84 7E9F F226"            /* !øËv%.|à&.|„~Ÿò& */
+	$"6B94 0DB5 02AA 61E7 A9FF 5D9F A9F2 B546"            /* k”.µ.ªaç©ÿ]Ÿ©òµF */
+	$"2417 2E4D B238 ADDF 9233 5911 1D61 D35A"            /* $..M²8­ß’3Y..aÓZ */
+	$"8788 DF34 284A 9664 B91E 7A11 4568 B395"            /* ‡ˆß4(J–d¹.z.Eh³• */
+	$"7C74 C891 2A46 C056 EE92 0459 D81C A41F"            /* |tÈ‘*FÀVî’.YØ.¤. */
+	$"CA5E 4752 3ADE 89AB 995B 2BF2 D070 41B1"            /* Ê^GR:Þ‰«™[+òÐpA± */
+	$"EBFE 65BF FF61 55F5 5460 A4E0 33CF 7F1E"            /* ëþe¿ÿaUõT`¤à3Ï.. */
+	$"691A 0DA4 9372 4DCD 4A7C FF30 7DA5 4AD0"            /* i..¤“rMÍJ|ÿ0}¥JÐ */
+	$"1236 3C90 00C2 4517 FF78 771E DA05 952D"            /* .6<�.ÂE.ÿxw.Ú.•- */
+	$"1085 D433 FD50 1E6F D583 2585 CBD6 5CFC"            /* .…Ô3ýP.oÕƒ%…ËÖ\ü */
+	$"9EF2 539B BE7A CCA1 ABF6 5AED 484B FF78"            /* žòS›¾zÌ¡«öZíHKÿx */
+	$"D6BD 435E E56E 5510 3047 49DE C511 72CF"            /* Ö½C^ånU.0GIÞÅ.rÏ */
+	$"72A0 B2CE 5E4D E2DA 0AFA FEDE BDFD 3167"            /* r ²Î^MâÚÂúþÞ½ý1g */
+	$"02FE 3FBE A1B9 7A5F 205B 7D60 1BA3 C975"            /* .þ?¾¡¹z_ [}`.£Éu */
+	$"5949 A641 5A3E 5AF2 F237 53BE FCAC 71F1"            /* YI¦AZ>Zòò7S¾ü¬qñ */
+	$"E3E3 6AEB 35B9 41BD C4B6 3400 DBA0 4B7F"            /* ããjë5¹A½Ä¶4.Û K. */
+	$"FF79 17FD 23F9 918D E532 F6BD F949 B633"            /* ÿy.ý#ù‘�å2ö½ùI¶3 */
+	$"6A36 7600 17D8 C912 DB72 6F48 869C 0D66"            /* j6v..ØÉ.ÛroH†œ.f */
+	$"1410 074A 8F5B 629C 5B8B F293 6DB6 DB6D"            /* ...J�[bœ[‹ò“m¶Ûm */
+	$"B6DB 6740 B8F8 BF85 2938 ECDA 6390 6537"            /* ¶Ûg@¸ø¿…)8ìÚc�e7 */
+	$"5986 A2A6 B52C A20D F057 C41F 660A C203"            /* Y†¢¦µ,¢.ðWÄ.fÂÂ. */
+	$"E5C1 68B0 9D56 DAD8 F20C 665C 5D04 4BA2"            /* åÁh°�VÚØò.f\].K¢ */
+	$"46FF 7DB5 4880 6121 2EA3 5D2A 82F4 B18A"            /* Fÿ}µH€a!.£]*‚ô±Š */
+	$"50FC 2D12 DEFE 1F4D 01BF 3315 10D3 5D94"            /* Pü-.Þþ.M.¿3..Ó]” */
+	$"11B1 0221 28B8 56D9 4CED 012D D9C9 4005"            /* .±.!(¸VÙLí.-ÙÉ@. */
+	$"316F E887 29A8 3E83 9E25 FF1F A4C1 5D25"            /* 1oè‡)¨>ƒž%ÿ.¤Á]% */
+	$"8893 36E0 73BE DE25 456A 4678 B7C5 AD7A"            /* ˆ“6às¾Þ%EjFx·Å­z */
+	$"90C9 3950 942F 1459 C737 31EF 991F 241B"            /* �É9P”/.YÇ71ï™.$. */
+	$"C294 7CFB 9461 B43A 8D37 8A6D BBC8 D7F6"            /* ”|û”a´:�7Šm»È×ö */
+	$"A128 281D DF2B EAC5 A154 E6D9 FF53 984D"            /* ¡((.ß+êÅ¡TæÙÿS˜M */
+	$"550E 9C70 3F64 0E0E 0940 0AFC 5CC9 CF43"            /* U.œp?d..Æ@Âü\ÉÏC */
+	$"7184 3D0F 9FDE 08DF EC31 B86E 0D38 AF71"            /* q„=.ŸÞ.ßì1¸n.8¯q */
+	$"29F1 A21D 7847 7150 6DCA 9211 C778 F1A4"            /* )ñ¢.xGqPmÊ’.Çxñ¤ */
+	$"26AA B90D 1A39 DB92 4924 9249 2493 36D2"            /* &ª¹..9Û’I$’I$“6Ò */
+	$"4924 9249 2492 49FE 069C E7B9 CB0D 4E87"            /* I$’I$’Iþ.œç¹Ë.N‡ */
+	$"7D9E 9D29 FC64 8A6F 6185 2BD9 806F 760B"            /* }ž�)üdŠoa…+Ù€ov. */
+	$"464D 4732 BD90 0E7D CABF 2B6F 2A78 8608"            /* FMG2½�.}Ê¿+o*x†. */
+	$"DEF5 406F D401 3FD4 AE82 058D D6C8 B980"            /* Þõ@oÔ.?Ô®‚.�Öȹ€ */
+	$"FECA D9B9 E7B6 3982 9FD3 81EA 544B 30BD"            /* þÊÙ¹ç¶9‚ŸÓ�êTK0½ */
+	$"7E56 FD78 66FD 5A41 D0BD 7714 5FAF 2A1E"            /* ~VýxfýZAнw._¯*. */
+	$"8FDA B705 EAAE F6F2 D69C 9812 7194 A56E"            /* �Ú·.ê®öòÖœ˜.q”¥n */
+	$"DB55 BF75 C4E4 BDCD 9FC2 ACAD C428 829F"            /* ÛU¿uÄä½ÍŸÂ¬­Ä(‚Ÿ */
+	$"2409 3BB2 A894 8020 A8E7 FC16 F4FF 4E84"            /* $Æ;²¨”€ ¨çü.ôÿN„ */
+	$"C06E 889C 1C74 96AD 5420 F825 1A2B 015C"            /* Ànˆœ.t–­T ø%.+.\ */
+	$"6BC2 31EE 64AB 7A44 15E5 3458 8040 AEEF"            /* kÂ1îd«zD.å4X€@®ï */
+	$"F6BD 7D58 6478 8344 018F D3C6 2E33 69A4"            /* ö½}XdxƒD.�ÓÆ.3i¤ */
+	$"E5E8 721A 5B2F 777B C0D8 0A05 2CE7 EEC8"            /* åèr.[/w{ÀØÂ.,çîÈ */
+	$"69EF 417B A960 D320 842E 84DE D442 AB2F"            /* iïA{©`Ó „.„ÞÔB«/ */
+	$"3B31 84FE DCFC A608 2E09 AA42 60F6 DB2E"            /* ;1„þÜü¦..ƪB`öÛ. */
+	$"DA5B C95D D10A 77BE AD48 B5FF 0557 A5AC"            /* Ú[É]ÑÂw¾­Hµÿ.W¥¬ */
+	$"327B F763 FDA1 32BF 7308 3EFC 0C2B 2D22"            /* 2{÷cý¡2¿s.>ü.+-" */
+	$"584A F9CA BFB4 78FF 6E67 42CC B491 492B"            /* XJùÊ¿´xÿngBÌ´‘I+ */
+	$"17C3 C746 9966 5780 BA6C 2798 472E 1CFF"            /* .ÃÇF™fW€ºl'˜G..ÿ */
+	$"6A32 69A0 86E0 44C6 1679 08F9 9928 48D9"            /* j2i †àDÆ.y.ù™(HÙ */
+	$"3DA0 CBA0 1E5E 2618 7162 51C9 DEF0 56A0"            /* = Ë .^&.qbQÉÞðV  */
+	$"1924 F126 CAAD F248 A1A4 2816 13A7 FE76"            /* .$ñ&Ê­òH¡¤(..§þv */
+	$"594E 647C 36C4 C014 CDC7 5C89 DBAB 9854"            /* YNd|6ÄÀ.ÍÇ\‰Û«˜T */
+	$"9094 FC96 5FED 7476 AA3C DF0B B47B C123"            /* �”ü–_ítvª<ß.´{Á# */
+	$"BE6D CD5A BA07 CC19 94FC DC37 B85C 0FD2"            /* ¾mÍZº.Ì.”üÜ7¸\.Ò */
+	$"9FED 62E6 F910 2F49 529E CE10 9738 D296"            /* Ÿíbæù./IRžÎ.—8Ò– */
+	$"A81C 1A0D 0FBF 7CAE DB93 40C0 3BC9 5A0C"            /* ¨....¿|®Û“@À;ÉZ. */
+	$"B23D FBD4 3863 C520 03A0 D966 5327 A0A2"            /* ²=ûÔ8cÅ . ÙfS' ¢ */
+	$"DD06 B7A1 942B 0A75 CB23 8664 4159 8647"            /* Ý.·¡”+ÂuË#†dAY†G */
+	$"2725 DAF6 693A 58D7 7A7D B34A 393D FE7A"            /* '%Úöi:X×z}³J9=þz */
+	$"C105 C374 193C 123C 130E 062C 8AB2 32FD"            /* Á.Ãt.<.<...,Š²2ý */
+	$"80E0 72E3 6AEA 2078 5D7C D3E5 4E20 D927"            /* €àrãjê x]|ÓåN Ù' */
+	$"157E 9DC5 1A29 2F0F C326 AFE3 3ACF C361"            /* .~�Å.)/.Ã&¯ã:ÏÃa */
+	$"8C45 D79C EB27 7441 E4C7 8BFD 5832 DB93"            /* ŒEלë'tAäÇ‹ýX2Û“ */
+	$"78F5 B9DB BA4E 329E A262 C467 88DC C540"            /* xõ¹ÛºN2ž¢bÄgˆÜÅ@ */
+	$"78E0 4E55 34F3 806E 2DEA B371 E9B5 D8DF"            /* xàNU4ó€n-ê³qéµØß */
+	$"5EDA B5B9 1C48 5A11 ECAB E4F8 67B7 C76E"            /* ^Úµ¹.HZ.ì«äøg·Çn */
+	$"460F 8E6A C7BA B5F8 75F2 9105 1480 FD1A"            /* F.ŽjǺµøuò‘..€ý. */
+	$"80EB DB48 6115 AA6E 9AEA A07C 57B0 1A7F"            /* €ëÛHa.ªnšê |W°.. */
+	$"0CBF D5DE 47A7 89BE 4CAE 19FE 7B79 5839"            /* .¿ÕÞG§‰¾L®.þ{yX9 */
+	$"232D 495E 476C E267 D9D2 5257 F0E6 3EB5"            /* #-I^GlâgÙÒRWðæ>µ */
+	$"F140 AAAF 1E36 BA04 086A EEC5 3232 7958"            /* ñ@ª¯.6º..jîÅ22yX */
+	$"72E3 FCC3 9488 B44C 0C15 EF6B 811B CF97"            /* rãüÔˆ´L..ïk�.Ï— */
+	$"0532 2B88 663D 8675 6050 AB94 A435 C0FC"            /* .2+ˆf=†u`P«”¤5Àü */
+	$"9E08 9873 92AF 6859 F7F5 64B0 0BA5 FA68"            /* ž.˜s’¯hY÷õd°.¥úh */
+	$"3557 0898 9E0D 5795 BF67 2866 5FB6 63C6"            /* 5W.˜ž.W•¿g(f_¶cÆ */
+	$"4F82 42CE A682 DC8D CB18 D4FE 6252 95D1"            /* O‚BΦ‚Ü�Ë.ÔþbR•Ñ */
+	$"C85C 6B2C 0FC0 7C9D 5A80 F93B 8900 F93A"            /* È\k,.À|�Z€ù;‰.ù: */
+	$"8EE6 7513 4AFA 1609 3CEE D5EB B420 A1CE"            /* Žæu.Jú.Æ<îÕë´ ¡Î */
+	$"318D 6F67 720A 7F84 4127 C0F2 9193 35CE"            /* 1�ogrÂ.„A'Àò‘“5Î */
+	$"6D97 9682 5E5D B9FC 5A97 3B71 AB1F 64AA"            /* m—–‚^]¹üZ—;q«.dª */
+	$"3383 1F0E C0E9 26BE E6EB 24CD 499F F2BA"            /* 3ƒ..Àé&¾æë$ÍIŸòº */
+	$"997D E886 6FF8 C6B5 0607 1259 7715 7539"            /* ™}è†oøƵ...Yw.u9 */
+	$"4B57 F7A9 56A7 A04B 031F 0786 6C02 E7BC"            /* KW÷©V§ K...†l.ç¼ */
+	$"8256 7F27 A39A B66D 6B95 6C11 CDE4 C580"            /* ‚V.'£š¶mk•l.ÍäÅ€ */
+	$"54DE 7E26 129C EB67 ABC8 455E 6CC3 453E"            /* TÞ~&.œëg«ÈE^lÃE> */
+	$"F9A8 3ED5 9B43 4EB8 384E 0F7B 28E0 16FF"            /* ù¨>Õ›CN¸8N.{(à.ÿ */
+	$"1342 18B1 31B6 EAEF 4C40 36F7 0CFF 6AFF"            /* .B.±1¶êïL@6÷.ÿjÿ */
+	$"8059 5D1C 275B 4F7D B392 4DB0 5E5D 4304"            /* €Y].'[O}³’M°^]C. */
+	$"4848 2A3A C93F BAD6 638D 315A 8771 1150"            /* HH*:É?ºÖc�1Z‡q.P */
+	$"1D41 B6A7 C9B8 782E 19D8 F8E7 07EB ED20"            /* .A¶§É¸x..Øøç.ëí  */
+	$"7D4E AFFF 5FD2 4FA0 2B48 B549 6A50 AD81"            /* }N¯ÿ_ÒO +HµIjP­� */
+	$"F11D 357F 7CB2 4B8B F28B 6C97 2C23 58A3"            /* ñ.5.|²K‹ò‹l—,#X£ */
+	$"92E8 2BFB 77F2 1ECE 7A2A C437 47E3 A833"            /* ’è+ûwò.Îz*Ä7Gã¨3 */
+	$"D60C C3CA 168A 85B8 620C 109C 4134 35BF"            /* Ö.ÃÊ.Š…¸b..œA45¿ */
+	$"ECCB 3629 944F AD29 444A C4B6 F019 F19B"            /* ìË6)”O­)DJĶð.ñ› */
+	$"4189 B1D3 8F28 65B9 85D8 C715 2E1A 267D"            /* A‰±Ó�(e¹…ØÇ...&} */
+	$"A7DB 4C90 9829 BC86 E14C 9F44 757D 5436"            /* §ÛL�˜)¼†áLŸDu}T6 */
+	$"9C38 979D 3654 9A63 E572 7864 E513 A083"            /* œ8—�6Tšcårxdå. ƒ */
+	$"C943 97C5 A88B 23A2 4ECC E4F1 AEED F3EC"            /* ÉC—Ũ‹#¢NÌäñ®íóì */
+	$"C57D F254 B087 7E1F 81B3 59E6 E2A0 E5CB"            /* Å}òT°‡~.�³Yæâ åË */
+	$"B710 EF71 0598 01BF 1400 3814 0759 EDA8"            /* ·.ïq.˜.¿..8..Yí¨ */
+	$"386C 3DF0 F1C5 CA93 612F C58D 71BA 6ED6"            /* 8l=ðñÅÊ“a/Å�qºnÖ */
+	$"FE35 90B4 9C10 A938 33B6 6987 E407 AE7B"            /* þ5�´œ.©83¶i‡ä.®{ */
+	$"5B1A 8E0E BE53 1C94 D747 9303 2ED9 13FA"            /* [.Ž.¾S.”×G“..Ù.ú */
+	$"226C F38A 7134 3CF6 1923 B85F A254 0048"            /* "lóŠq4<ö.#¸_¢T.H */
+	$"A765 B678 FC9C 1E2C E183 FC80 CA83 9572"            /* §e¶xüœ.,áƒü€Êƒ•r */
+	$"E573 B224 9894 7316 C931 4A49 C28F 6E33"            /* ås²$˜”s.É1JIÂ�n3 */
+	$"B579 EE14 84BC 61CC 351B 41FB 7095 5F8C"            /* µyî.„¼aÌ5.Aûp•_Œ */
+	$"1B15 6DAF FF7F F8EA 5A11 5453 6ECA 1C02"            /* ..m¯ÿ.øêZ.TSnÊ.. */
+	$"C8A4 F40F AD00 7BC9 EDFD AC3A 28E4 546F"            /* Ȥô.­.{Éíý¬:(äTo */
+	$"1E36 BE45 897E F5D5 BE25 E84B 57C6 9080"            /* .6¾E‰~õÕ¾%èKWÆ�€ */
+	$"B6C4 79B8 153B 110F D90B 215D 401C 0453"            /* ¶Äy¸.;..Ù.!]@..S */
+	$"8243 BF4A CDAE 9270 0658 462F E0C7 82A8"            /* ‚C¿JÍ®’p.XF/àÇ‚¨ */
+	$"E155 C547 D144 EBAD 74EC EAFF 7799 6D50"            /* áUÅGÑDë­tìêÿw™mP */
+	$"D0F9 6BA4 D8B3 0FBB B75B BC48 D5BA 8EAB"            /* Ðùk¤Ø³.»·[¼HÕºŽ« */
+	$"FF7F 3A2A 820F D817 FB8B 7590 ED4A 3D7B"            /* ÿ.:*‚.Ø.û‹u�íJ={ */
+	$"DAF8 C05F BDCF 1B7C 8862 53A8 95D6 C0DF"            /* ÚøÀ_½Ï.|ˆbS¨•ÖÀß */
+	$"4069 36DA 0739 783C C432 1E0C 7DA6 2D70"            /* @i6Ú.9x<Ä2..}¦-p */
+	$"B33A C5AD 810A FBBD E9BB B776 6463 9FDC"            /* ³:Å­�Âû½é»·vdcŸÜ */
+	$"B401 211D 81BA A9FA 8761 ED36 A1EF 439D"            /* ´.!.�º©ú‡aí6¡ïC� */
+	$"9880 BE88 E045 3068 F59F 7AD7 EFFF 7FFC"            /* ˜€¾ˆàE0hõŸz×ïÿ.ü */
+	$"5562 1F00 0818 22D6 5002 F762 7A20 0DC0"            /* Ub...."ÖP.÷bz .À */
+	$"3ADD FF5D 1851 D391 F011 0000 0000 0000"            /* :Ýÿ].QÓ‘ð....... */
+	$"0000 0000 0138 5715 ED61 F2C5 2C28 30C0"            /* .....8W.íaòÅ,(0À */
+	$"F669 9389 6153 3A95 E010 CCA0 2FEF B36F"            /* öi“‰aS:•à.Ì /ï³o */
+	$"9576 F8C0 F17B 27F6 F6FA 412C 70C7 CF14"            /* •vøÀñ{'ööúA,pÇÏ. */
+	$"7625 6871 7FE2 16C9 B6E9 5BF1 1A16 E2F0"            /* v%hq.â.ɶé[ñ..âð */
+	$"945D E51E CCF9 0970 E586 517C 475F 8856"            /* ”]å.ÌùÆpå†Q|G_ˆV */
+	$"CA0C 1DD9 E001 D7BC 1876 745C 8077 672D"            /* Ê..Ùà.×¼.vt\€wg- */
+	$"CECA FF0B 01D1 76FA 32F5 C047 26FB 451F"            /* ÎÊÿ..Ñvú2õÀG&ûE. */
+	$"5261 79B6 5990 79C9 4DF7 5B69 D548 E894"            /* Ray¶Y�yÉM÷[iÕHè” */
+	$"F249 0C84 D3F0 9555 7B99 EA27 FA38 184E"            /* òI.„Óð•U{™ê'ú8.N */
+	$"F863 AFA1 CE80 AEBC CB89 DD99 B8E2 0BEC"            /* øc¯¡Î€®¼Ë‰Ý™¸â.ì */
+	$"2F74 E534 3FF4 B50A 4B04 02B1 C178 B189"            /* /tå4?ôµÂK..±Áx±‰ */
+	$"D30F 77DC 8A15 8C9E AF87 1DCD D545 AC6B"            /* Ó.wÜŠ.Œž¯‡.ÍÕE¬k */
+	$"CAFB 832B E240 6752 8EF2 9BDF 76E8 621D"            /* Êûƒ+â@gRŽò›ßvèb. */
+	$"892E 384C 7BF0 4DE8 F910 7689 C3F0 E7E9"            /* ‰.8L{ðMèù.v‰Ãðçé */
+	$"E401 C781 F341 A84F 6922 E97B FC22 E259"            /* ä.Ç�óA¨Oi"é{ü"âY */
+	$"6B26 9B03 14A7 DFA1 B7BD CBED 9539 5DE3"            /* k&›..§ß¡·½Ëí•9]ã */
+	$"2041 2F5F A37A 2F23 00FC 6424 D7F8 902E"            /*  A/_£z/#.üd$×ø�. */
+	$"7261 227B B4EC F4D1 9C18 22C3 8CA5 EFF8"            /* ra"{´ìôÑœ."ÃŒ¥ïø */
+	$"5701 6734 9110 8B4E D9E0 EE8F 7FEA 202F"            /* W.g4‘.‹NÙàî�.ê / */
+	$"CFF7 5CC7 6107 0B22 B0BE A87B 32EF 0FA8"            /* Ï÷\Ça.."°¾¨{2ï.¨ */
+	$"3D2D 794E 556E 6089 ACBA D46C 17EC A9DC"            /* =-yNUn`‰¬ºÔl.ì©Ü */
+	$"0F4E D57D B8C8 EED1 F9D4 F96A 7BEE 3794"            /* .NÕ}¸ÈîÑùÔùj{î7” */
+	$"49DE 3AA7 EE2E 0B25 A47C 966A D90D C792"            /* IÞ:§î..%¤|–jÙ.Ç’ */
+	$"6304 7C05 C6EB A26D 83B8 3E0C AAF5 AFFE"            /* c.|.Æë¢mƒ¸>.ªõ¯þ */
+	$"FDC3 F7C4 C0A3 C3ED E8D2 0FAB AC58 1F56"            /* ýÃ÷ÄÀ£ÃíèÒ.«¬X.V */
+	$"FF40 F44B 4289 C6D7 CC17 A019 AD4A C889"            /* ÿ@ôKB‰Æ×Ì. .­Jȉ */
+	$"67AD 0673 32A0 B6BA 087E 7279 19C2 025F"            /* g­.s2 ¶º.~ry.Â._ */
+	$"DB0E 0E97 02D9 2268 5BCA CDE6 B94E 8D9B"            /* Û..—.Ù"h[ÊÍæ¹N�› */
+	$"03EB D786 1698 2D8A 2ECD 432E D615 931F"            /* .ë׆.˜-Š.ÍC.Ö.“. */
+	$"452B 5D40 0950 5BBE A70F BD95 9F0E 8B95"            /* E+]@ÆP[¾§.½•Ÿ.‹• */
+	$"86B7 47DE 0757 BFE4 9775 3082 9D22 863A"            /* †·GÞ.W¿ä—u0‚�"†: */
+	$"E404 B84C 5E88 8424 31DD 689A D234 88E2"            /* ä.¸L^ˆ„$1ÝhšÒ4ˆâ */
+	$"971F 9E59 429C 6C7E 3670 8F7C 8F86 A80D"            /* —.žYBœl~6p�|�†¨. */
+	$"848E E78B 5331 058E E444 FEC2 269A 7E23"            /* „Žç‹S1.ŽäDþÂ&š~# */
+	$"608D 0502 E075 F7A4 DACF 515F AA08 31C1"            /* `�..àu÷¤ÚÏQ_ª.1Á */
+	$"1275 02C0 F37E F465 ADE9 1918 F1F0 0E4F"            /* .u.Àó~ôe­é..ñð.O */
+	$"E5A4 41A5 F655 22D9 946A 7FEC 0720 3D3A"            /* å¤A¥öU"Ù”j.ì. =: */
+	$"4961 05B2 F02D 51D2 1212 084B B3EA 5DC9"            /* Ia.²ð-QÒ...K³ê]É */
+	$"F986 5763 A2AC E2AC 1144 5DC3 E6A5 D092"            /* ù†Wc¢¬â¬.D]Ãæ¥Ð’ */
+	$"3654 3737 A598 21C2 34FF 097C B8B8 5934"            /* 6T77¥˜!Â4ÿÆ|¸¸Y4 */
+	$"C947 05C9 B4BA F52B 99FF 3AFE 6B15 2CAE"            /* ÉG.É´ºõ+™ÿ:þk.,® */
+	$"06CF D962 CCDE D937 D4AE B3D9 7E92 E2AF"            /* .ÏÙbÌÞÙ7Ô®³Ù~’⯠*/
+	$"8F4E 31CE 06E7 0AD8 71DB 4456 7101 E221"            /* �N1Î.çÂØqÛDVq.â! */
+	$"74AC 1159 9EDF 9841 CFA3 E04F DECF 6FD3"            /* t¬.Yžß˜AÏ£àOÞÏoÓ */
+	$"90CC C22F 63B0 45CC C98B 3125 33C0 CFBA"            /* �ÌÂ/c°EÌÉ‹1%3ÀϺ */
+	$"4CE7 3FAD F2E4 85E7 0C74 35A5 97E9 8672"            /* Lç?­òä…ç.t5¥—é†r */
+	$"9180 E059 EF0F C416 E25F 0E83 095A 36AA"            /* ‘€àYï.Ä.â_.ƒÆZ6ª */
+	$"8E74 F1F7 11A8 49DD C47E 5098 D576 DC41"            /* Žtñ÷.¨IÝÄ~P˜ÕvÜA */
+	$"D6FC 7C37 E307 A2DB 997E A046 C114 CF04"            /* Öü|7ã.¢Û™~ FÁ.Ï. */
+	$"FD8E 32D1 2AC6 3A81 C8B6 C680 6E60 7826"            /* ýŽ2Ñ*Æ:�ȶƀn`x& */
+	$"9A40 9C80 BA1B 4DE8 854B 09D9 33B3 95BE"            /* š@œ€º.Mè…KÆÙ3³•¾ */
+	$"7CE5 CCA3 C463 5D1C 1F2B A160 E208 AA0A"            /* |åÌ£Äc]..+¡`â.ªÂ */
+	$"D00F 1933 5FB5 2705 4E9C 3733 0FD0 2AA0"            /* Ð..3_µ'.Nœ73.Ð*  */
+	$"D116 F240 05EA 53BB 5A5A 0A4B 3D9E FCB7"            /* Ñ.ò@.êS»ZZÂK=žü· */
+	$"FE35 1D0B 1E56 C4AA 9B6C 8CE6 10CA DAA5"            /* þ5...VĪ›lŒæ.ÊÚ¥ */
+	$"6DF1 6F74 C332 BD93 556E 89F5 A94A 232D"            /* mñotÃ2½“Un‰õ©J#- */
+	$"E9EF C950 666C 7D3E D1BA C98F 4489 3C5D"            /* éïÉPfl}>ѺÉ�D‰<] */
+	$"F7FC 88D4 C90E EE9D 7691 C976 2CFE 6BA0"            /* ÷üˆÔÉ.î�v‘Év,þk  */
+	$"B53E 5C59 749E FEBC 4AB4 490C A3B6 5187"            /* µ>\Ytžþ¼J´I.£¶Q‡ */
+	$"4A10 1076 6348 AEC1 054B 0A98 9196 29C3"            /* J..vcH®Á.K˜‘–)à */
+	$"F995 50E4 E003 F099 9495 7ECC 1C78 C536"            /* ù•Päà.ð™”•~Ì.xÅ6 */
+	$"AA8D 7305 BE7F FF72 99F7 25ED 4C38 0896"            /* ª�s.¾.ÿr™÷%íL8.– */
+	$"A1BE F2D4 016E B744 CBB7 9CEE 1C88 5E3D"            /* ¡¾òÔ.n·DË·œî.ˆ^= */
+	$"1B9E E3CB 29D2 AAA7 C3F6 41F4 B6C0 5861"            /* .žãË)Òª§ÃöAô¶ÀXa */
+	$"93D3 4773 858E 3470 E670 4F94 E206 FBA3"            /* “ÓGs…Ž4pæpO”â.û£ */
+	$"7050 2A3D 6DC0 004E 32D7 6043 4E5E C44F"            /* pP*=mÀ.N2×`CN^ÄO */
+	$"284A 3214 97B7 19DE 41C4 6204 56CB 1695"            /* (J2.—·.ÞAÄb.VË.• */
+	$"BAD8 C308 0FFE BEB7 FE14 C6AC CEE8 5022"            /* ºØÃ..þ¾·þ.ƬÎèP" */
+	$"C27A 2CCA 4714 4C52 3975 615D A1C8 62BF"            /* Âz,ÊG.LR9ua]¡Èb¿ */
+	$"C477 FF7E 2637 3B89 8C43 6E09 285B 2D1A"            /* Äwÿ~&7;‰ŒCnÆ([-. */
+	$"8E9E 4110 CE7B E30A E21C A140 02C8 D0AD"            /* ŽžA.Î{ãÂâ.¡@.ÈЭ */
+	$"630B 5488 7CE7 B884 393A 6FDD 5A68 7FB9"            /* c.Tˆ|縄9:oÝZh.¹ */
+	$"60EC C73B 143E 3F61 3E31 1A3E 8438 7944"            /* `ìÇ;.>?a>1.>„8yD */
+	$"B652 14AE 63CA 803C 9B67 C6FE 2F5D 4CD0"            /* ¶R.®cÊ€<›gÆþ/]LÐ */
+	$"3A63 1328 8809 A4AB B4A1 8664 FE90 F03E"            /* :c.(ˆÆ¤«´¡†dþ�ð> */
+	$"18E2 7982 7DDC A444 1306 4546 61B2 A710"            /* .ây‚}ܤD..EFa²§. */
+	$"CCED 529C 92CB D547 22F5 0DB0 B10F 8450"            /* ÌíRœ’ËÕG"õ.°±.„P */
+	$"E5AC 253A 6937 BFBD D0C6 8AED 14C7 787E"            /* å¬%:i7¿½ÐÆŠí.Çx~ */
+	$"21E7 860D 8567 633D A9E6 0466 93A5 6789"            /* !ç†.…gc=©æ.f“¥g‰ */
+	$"D643 2EEE 7542 7B02 086A 83C4 AD3C 785C"            /* ÖC.îuB{..jƒÄ­<x\ */
+	$"E3B4 BFC0 C27C 3762 1D98 0A0C B43D 8107"            /* ã´¿ÀÂ|7b.˜Â.´=�. */
+	$"3003 FF74 C626 1BC1 44AA 08A0 7A68 0ADE"            /* 0.ÿtÆ&.ÁDª. zhÂÞ */
+	$"E9BD 94DB 3644 AA13 CFCA A9CB 0E8F 9061"            /* é½”Û6Dª.ÏÊ©Ë.��a */
+	$"73BC 6A23 359D C129 F184 4EBA BE0F A772"            /* s¼j#5�Á)ñ„Nº¾.§r */
+	$"9AB6 7DDC C179 81DB 9FDC EDA3 E6C5 21E2"            /* š¶}ÜÁy�ÛŸÜí£æÅ!â */
+	$"7049 87BC 00E3 34F5 8066 3FFE 7CA7 A588"            /* pI‡¼.ã4õ€f?þ|§¥ˆ */
+	$"6277 30DE 8FC1 950A A652 5B12 B0A4 B8BE"            /* bw0Þ�Á•Â¦R[.°¤¸¾ */
+	$"2297 4261 CB90 AEBB F3CB 2BEE 2FA8 149E"            /* "—BaË�®»óË+î/¨.ž */
+	$"11E6 487B 3EFA 45B9 E4A8 17DF DF8E D5FF"            /* .æH{>úE¹ä¨.ßߎÕÿ */
+	$"750C 2E52 4F3F 5960 B3B7 3DEB CFE3 4EC3"            /* u..RO?Y`³·=ëÏãNà */
+	$"676F D76A F8C3 67EB 383B 042A C000 1CF5"            /* go×jøÃgë8;.*À..õ */
+	$"FB57 51DF 4E0F 9709 4A58 F371 8A53 79CD"            /* ûWQßN.—ÆJXóqŠSyÍ */
+	$"B935 29C8 5953 BBFB B216 24F0 FF5C F1BE"            /* ¹5)ÈYS»û².$ðÿ\ñ¾ */
+	$"1649 C9BE 754A CC45 62C3 44A2 3E12 A872"            /* .IɾuJÌEbÃD¢>.¨r */
+	$"736B 05DD F77C C7C6 F33D 8224 147E D163"            /* sk.Ý÷|ÇÆó=‚$.~Ñc */
+	$"02B4 0BC6 297A FA75 03A7 BFDD 709A A878"            /* .´.Æ)zúu.§¿Ýpš¨x */
+	$"734A 7236 791A BFF6 9F21 CC67 268D 160D"            /* sJr6y.¿öŸ!Ìg&�.. */
+	$"A6D0 7988 72CF 6475 146C 81EB 8249 518A"            /* ¦ÐyˆrÏdu.l�ë‚IQŠ */
+	$"49B7 0389 FDB6 9CEB DCA2 41ED 085D 4E85"            /* I·.‰ý¶œëÜ¢Aí.]N… */
+	$"03E4 3F4E D8CF 25E1 658D 38F6 8F88 A499"            /* .ä?NØÏ%áe�8ö�ˆ¤™ */
+	$"B64A DD79 FDF2 39FB 5CEC F29B 714A 733B"            /* ¶JÝyýò9û\ìò›qJs; */
+	$"76E4 94E5 F567 3A71 28F0 13A6 7A74 CD91"            /* vä”åõg:q(ð.¦ztÍ‘ */
+	$"5804 065E D3C7 09B7 ED19 51E5 0913 4436"            /* X..^ÓÇÆ·í.QåÆ.D6 */
+	$"9791 BB58 10F3 7183 5DB6 4874 65D2 AAD2"            /* —‘»X.óqƒ]¶HteÒªÒ */
+	$"DBA2 C761 A70F 3EEE 9256 2EF0 945D E52D"            /* Û¢Ça§.>î’V.ð”]å- */
+	$"34CF 10DF B2AF 8E14 A5A4 E24F 0051 F63E"            /* 4Ï.ß²¯Ž.¥¤âO.Qö> */
+	$"F11C 5DAC 6D8D DEDD A585 96FC A2AB A5FF"            /* ñ.]¬m�ÞÝ¥…–ü¢«¥ÿ */
+	$"5298 6349 DB41 9276 C1C6 F1E2 9ABF 822B"            /* R˜cIÛA’vÁÆñâš¿‚+ */
+	$"346F 8679 726C 666A 9638 246A EABE 54A9"            /* 4o†yrlfj–8$jê¾T© */
+	$"49DD F22A BC62 5867 51F2 FDBD B33B 40E0"            /* IÝò*¼bXgQòý½³;@à */
+	$"220F 075D 031C EAAE 3CDE 67CF 2269 E26D"            /* "..]..ê®<ÞgÏ"iâm */
+	$"BEF3 1873 E610 D43E 8F03 A14F F04F 980B"            /* ¾ó.sæ.Ô>�.¡OðO˜. */
+	$"69FF 1E4A 1925 DDE6 B473 84B5 6F53 75DD"            /* iÿ.J.%Ýæ´s„µoSuÝ */
+	$"CF71 C4C0 72DC 5403 7E7B 1A9B 6F16 BA87"            /* ÏqÄÀrÜT.~{.›o.º‡ */
+	$"A44D D4A2 8029 E15A 8C17 BE55 A30B 87B3"            /* ¤MÔ¢€)áZŒ.¾U£.‡³ */
+	$"DC5B CED9 2E4C A8F3 939B 6F82 8885 9BD5"            /* Ü[ÎÙ.L¨ó“›o‚ˆ…›Õ */
+	$"905B 6EE2 E3C9 D45E DE91 DD46 7EDD 23BB"            /* �[nâãÉÔ^Þ‘ÝF~Ý#» */
+	$"6852 2BD3 3D31 2755 2D1B 7431 35EB 6CBD"            /* hR+Ó=1'U-.t15ël½ */
+	$"638C 9E5D F0EB 9AE0 49BC D327 7536 BCB3"            /* cŒž]ðëšàI¼Ó'u6¼³ */
+	$"65F1 992B E073 9D25 980D A244 7F9E 749F"            /* eñ™+às�%˜.¢D.žtŸ */
+	$"53BD D08A C5EF 64A2 D672 7A55 9146 5CAD"            /* S½ÐŠÅïd¢ÖrzU‘F\­ */
+	$"7839 E1B6 7543 4556 146E C347 33E3 2798"            /* x9á¶uCEV.nÃG3ã'˜ */
+	$"4752 6F78 AAA5 AE5E 7B02 CD92 D5F1 FD30"            /* GRoxª¥®^{.Í’Õñý0 */
+	$"F78A 7BFB 03AB CF34 58BF 3810 B8A7 CDAB"            /* ÷Š{û.«Ï4X¿8.¸§Í« */
+	$"A573 658E 260A 7C50 000F 00AC D13F 618E"            /* ¥seŽ&Â|P...¬Ñ?aŽ */
+	$"A241 9458 3945 9D59 3F9B 13C5 04CC 600E"            /* ¢A”X9E�Y?›.Å.Ì`. */
+	$"FC51 8C8D FBA0 4150 5832 4539 730B 4631"            /* üQŒ�û APX2E9s.F1 */
+	$"0598 EE14 817C B560 97C5 B953 64D4 980D"            /* .˜î.�|µ`—ŹSdÔ˜. */
+	$"C379 6FFF 3E63 6746 7BE8 D3AB 5215 B47F"            /* Ãyoÿ>cgF{èÓ«R.´. */
+	$"3CAE 42E4 D4BF B7BF 6580 3319 6A71 C2E9"            /* <®BäÔ¿·¿e€3.jqÂé */
+	$"48AA 2C5E 9D78 B9C3 F8DA B858 D5AB 99F4"            /* Hª,^�x¹ÃøÚ¸XÕ«™ô */
+	$"B04F EAAC D0DE 2302 F874 7E64 A69B 89CE"            /* °Oê¬ÐÞ#.øt~d¦›‰Î */
+	$"AEAB A73F F815 0D06 B24E 39EC D8E9 EFB7"            /* ®«§?ø...²N9ìØéï· */
+	$"ED32 55A0 8E21 B52A E55C 17AE E07B 42F4"            /* í2U Ž!µ*å\.®à{Bô */
+	$"D451 CB7C E941 1578 3EE3 9565 087E 9A05"            /* ÔQË|éA.x>ã•e.~š. */
+	$"B5FC 403A AAA2 25CE 5AC1 B658 1EE9 9A53"            /* µü@:ª¢%ÎZÁ¶X.éšS */
+	$"4000 51DF 95E8 C605 97AC C7E1 A8B1 F86C"            /* @.Qß•èÆ.—¬Çᨱøl */
+	$"7C3F 0BCC E410 8FA7 78C0 7964 BDD0 E341"            /* |?.Ìä.�§xÀyd½ÐãA */
+	$"5DC5 D977 EF99 460C FC48 A51A B5CD DE47"            /* ]ÅÙwï™F.üH¥.µÍÞG */
+	$"F9E2 194D 1F2D B2B6 556B 0F68 BD1B 5BEA"            /* ùâ.M.-²¶Uk.h½.[ê */
+	$"9FDD 1280 92A3 EF96 132C 22F6 CA8A 1C20"            /* ŸÝ.€’£ï–.,"öÊŠ.  */
+	$"54DA F163 6119 BC02 7AE6 10CA A16B 993A"            /* TÚñca.¼.zæ.Ê¡k™: */
+	$"E22B CC58 D181 40E6 EA99 0897 5166 4C1F"            /* â+ÌXÑ�@æê™.—QfL. */
+	$"6D58 D092 5119 1AF5 0C2B 1DC6 029D F0E8"            /* mXÐ’Q..õ.+.Æ.�ðè */
+	$"1F6F 9F5C 17D8 68A0 F600 5C68 5C16 4269"            /* .oŸ\.Øh ö.\h\.Bi */
+	$"F5A9 4D97 32DE 3A9C 6609 86C2 1D0F BA56"            /* õ©M—2Þ:œfƆÂ..ºV */
+	$"3C8C 1046 E0DC 2ECB 9BDB D61E 6955 CE38"            /* <Œ.FàÜ.Ë›ÛÖ.iUÎ8 */
+	$"DB97 859B 9E73 78BF FDEB ED74 0C4E 4203"            /* Û—…›žsx¿ýëít.NB. */
+	$"431D 69C4 635D D1EA 1A9A 6462 BE48 DDB9"            /* C.iÄc]Ñê.šdb¾Hݹ */
+	$"6E63 C4D8 8886 51CB 19E6 A7C9 5941 8443"            /* ncÄ؈†QË.æ§ÉYA„C */
+	$"57E5 8C3B B907 FF17 4B41 08DA 7AFC 1B8B"            /* WåŒ;¹.ÿ.KA.Úzü.‹ */
+	$"9B05 622E 1F81 91D8 2C60 9C6A 3B23 608B"            /* ›.b..�‘Ø,`œj;#`‹ */
+	$"F2EC E527 70F9 D963 D302 D7AC 18E2 2692"            /* òìå'pùÙcÓ.׬.â&’ */
+	$"AE0C D915 7E30 5B09 305C 8F5D 1346 3FF2"            /* ®.Ù.~0[Æ0\�].F?ò */
+	$"8635 ECEC 1CB7 962D 0846 3FA9 5920 C1B0"            /* †5ìì.·–-.F?©Y Á° */
+	$"5582 FF3A 24E0 FAAE 8FAE 3843 DFCF B74F"            /* U‚ÿ:$àú®�®8CßÏ·O */
+	$"CAEC 5602 D1C5 1760 5ECD 92C8 1DD1 4ABE"            /* ÊìV.ÑÅ.`^Í’È.ÑJ¾ */
+	$"2336 8A90 E444 6753 D3E0 0F02 8E99 7393"            /* #6Š�äDgSÓà..Ž™s“ */
+	$"8B26 6C9F BFB4 64DE 7867 73F7 10F0 477A"            /* ‹&lŸ¿´dÞxgs÷.ðGz */
+	$"8383 ADA5 49C3 722B 1FD7 0BB5 4118 4714"            /* ƒƒ­¥IÃr+.×.µA.G. */
+	$"D5F9 6C20 CDD0 8151 EAB4 457F FF4E 314C"            /* Õùl ÍÐ�Qê´E.ÿN1L */
+	$"6E7F 04DB DE0C 611B 62AC 2A4E 869C 06FB"            /* n..ÛÞ.a.b¬*N†œ.û */
+	$"DB81 F238 C4FC 149E 8176 3F0C 4B83 0DFF"            /* Û�ò8Äü.ž�v?.Kƒ.ÿ */
+	$"7FB4 A5F5 80C7 E4F0 47AD 8D3F 5426 B12A"            /* .´¥õ€ÇäðG­�?T&±* */
+	$"8678 11E1 A0EF 5439 31D8 E97E 3AE9 E4DD"            /* †x.á ïT91Øé~:éäÝ */
+	$"3DB7 4A94 7FFF 7135 0C02 ACE2 70F5 626B"            /* =·J”.ÿq5..¬âpõbk */
+	$"271A 4401 DF00 AE70 E43B D3F8 75AD 0DAB"            /* '.D.ß.®pä;Óøu­.« */
+	$"794A C0C7 928F 8621 BE61 DA60 A89F 8E95"            /* yJÀÇ’�†!¾aÚ`¨ŸŽ• */
+	$"64E1 4B82 9CA5 D1CB 26FA 3B49 2FDF 8007"            /* dáK‚œ¥ÑË&ú;I/߀. */
+	$"60B1 1C23 B192 973E 87DD 9323 E697 CA76"            /* `±.#±’—>‡Ý“#æ—Êv */
+	$"03D6 B09A 33FA 5CEC 856D 1D12 5249 2492"            /* .Ö°š3ú\ì…m..RI$’ */
+	$"4924 9249 2492 4924 9231 8B0A C6C2 C882"            /* I$’I$’I$’1‹ÂÆÂÈ‚ */
+	$"FC66 E59C E646 38B0 B26F A097 FEA2 30FE"            /* üfåœæF8°²o —þ¢0þ */
+	$"F5B9 90DC 3FEF 3116 73C4 7B20 6C09 EA40"            /* õ¹�Ü?ï1.sÄ{ lÆê@ */
+	$"AB90 6257 8BAD 951C 002E 138D 7274 121D"            /* «�bW‹­•....�rt.. */
+	$"B91E 66F5 6038 8257 FD9A 18C9 0155 522C"            /* ¹.fõ`8‚Wýš.É.UR, */
+	$"D6CC 0F6A 6A4A 09F3 0C4A B702 47FF 7FFC"            /* ÖÌ.jjJÆó.J·.Gÿ.ü */
+	$"B504 0034 6682 CE19 CA7C 50BE F8B0 9DCB"            /* µ..4f‚Î.Ê|P¾ø°�Ë */
+	$"0092 4924 9248 F298 B4D2 A612 6CEE 878F"            /* .’I$’Hò˜´Ò¦.lî‡� */
+	$"FF7F FF5F 8F59 B3E0 FE9F A74E 506D C924"            /* ÿ.ÿ_�Y³àþŸ§NPmÉ$ */
+	$"9249 2492 4924 9249 2492 4924 924D 57A2"            /* ’I$’I$’I$’I$’MW¢ */
+	$"2CC8 426C 393A 96E4 50FB 0ACE 8874 7A86"            /* ,ÈBl9:–äPûÂΈtz† */
+	$"2B20 84D4 0F34 1532 DFF0 D633 0231 0F65"            /* + „Ô.4.2ßðÖ3.1.e */
+	$"91D1 8E19 A917 CD2A 8D35 89BE F64E D1A8"            /* ‘ÑŽ.©.Í*�5‰¾öNѨ */
+	$"926C AE06 3A49 80F9 C1FE 0E81 52D8 5A8C"            /* ’l®.:I€ùÁþ.�RØZŒ */
+	$"7A00 5EF2 9F04 3659 74EC D695 94B6 5B90"            /* z.^òŸ.6YtìÖ•”¶[� */
+	$"89C0 E661 DFC4 5E69 965B 4D1D 4B76 7C0E"            /* ‰ÀæaßÄ^i–[M.Kv|. */
+	$"89D2 C1E8 B1EF CF9E 5E96 3977 AEA6 532B"            /* ‰ÒÁè±ïÏž^–9w®¦S+ */
+	$"68B1 BD73 2BE6 BB5B 766E FA91 5C36 628C"            /* h±½s+æ»[vnú‘\6bŒ */
+	$"F45F FEEA C7DF 49F0 278F F459 E9B6 BDAC"            /* ô_þêÇßIð'�ôY鶽¬ */
+	$"1A28 F485 45C5 2761 DC37 C72A 8A17 2D08"            /* .(ô…EÅ'aÜ7Ç*Š.-. */
+	$"5130 E9D5 E1BD 2D59 07B5 2290 00F9 F737"            /* Q0éÕá½-Y.µ"�.ù÷7 */
+	$"C1F4 5C78 1058 C4C6 13AB AE5C 45DE ACB4"            /* Áô\x.XÄÆ.«®\EÞ¬´ */
+	$"7DC9 03C4 0F82 7850 6F9E 5FD3 9223 36FE"            /* }É.Ä.‚xPož_Ó’#6þ */
+	$"8A1D 1D99 FBB3 646B 206B FC7E 668E 4730"            /* Š..™û³dk kü~fŽG0 */
+	$"7C8C 79D9 A37A 427B 1E91 E7A1 DED2 E57D"            /* |ŒyÙ£zB{.‘ç¡ÞÒå} */
+	$"E167 967A 8B9F A6C0 A36F 68E8 D03C 84C6"            /* ág–z‹Ÿ¦À£ohèÐ<„Æ */
+	$"E952 3CAF 039F 18CD 236C 4AE1 FB74 D7F6"            /* éR<¯.Ÿ.Í#lJáût×ö */
+	$"DFBF B7A4 AFDB D27E 2FB7 7BBF 86F0 DF6F"            /* ß¿·¤¯ÛÒ~/·{¿†ðßo */
+	$"4F9F C3A7 EC7F 0D0F BEDB 1EFB 77AA FB77"            /* OŸÃ§ì...¾Û.ûwªûw */
+	$"2CED 1CDE F39E A2F3 567D 91E9 4703 B8A2"            /* ,í.Þóž¢óV}‘éG.¸¢ */
+	$"5006 2494 6271 81F3 3B95 0B89 EDD5 7FE8"            /* P.$”bq�ó;•.‰íÕ.è */
+	$"B864 3D84 75CD 7478 A5D6 28C8 D483 39EF"            /* ¸d=„uÍtx¥Ö(ÈÔƒ9ï */
+	$"86CA 5763 87CA 97CF A9D4 AFA9 0450 6744"            /* †ÊWc‡Ê—Ï©Ô¯©.PgD */
+	$"16E3 8C0B 0015 88DA 5244 1AB2 9790 35B0"            /* .ãŒ...ˆÚRD.²—�5° */
+	$"0489 B911 D871 2BB4 6576 C185 22B7 1F86"            /* .‰¹.Øq+´evÁ…"·.† */
+	$"230A 3CD3 ECB5 20A6 23BA A068 A53E 8EAD"            /* #Â<Óìµ ¦#º h¥>Ž­ */
+	$"3793 46B5 BA07 96A8 DF28 6A66 CE05 73CE"            /* 7“Fµº.–¨ß(jfÎ.sÎ */
+	$"1938 F9A6 9CBC 0D7F F193 E0D5 09CC 3426"            /* .8ù¦œ¼..ñ“àÕÆÌ4& */
+	$"4BB1 52B9 F337 0537 FA01 B010 5471 B015"            /* K±R¹ó7.7ú.°.Tq°. */
+	$"754C A1A6 E071 800C 1A26 243D 172B 1497"            /* uL¡¦àq€..&$=.+.— */
+	$"E5DF 1EB1 6A6C 6761 3BA6 52C0 C0B4 69BD"            /* åß.±jlga;¦RÀÀ´i½ */
+	$"E6B4 275E EB6E 42BF D693 8928 15A4 9DB2"            /* æ´'^ënB¿Ö“‰(.¤�² */
+	$"D8FA E273 6C04 CBB5 06A9 8096 5E97 5D11"            /* Øúâsl.˵.©€–^—]. */
+	$"0B1B 8E93 BDCC 1AE8 4CBA 9413 A729 F6A7"            /* ..Ž“½Ì.èLº”.§)ö§ */
+	$"F24D 467F 0316 BF60 F777 C2E3 7FAA DC07"            /* òMF...¿`÷wÂã.ªÜ. */
+	$"148F 5C26 91C3 20B8 F3A0 9088 F893 6D47"            /* .�\&‘à ¸ó �ˆø“mG */
+	$"7AC1 A0D9 5483 8281 5B98 28AE 9EAB 94F0"            /* zÁ ÙTƒ‚�[˜(®ž«”ð */
+	$"9B68 08E3 E3DA 7E3A AA84 9EED F083 117F"            /* ›h.ããÚ~:ª„žíðƒ.. */
+	$"FE75 781E E394 EEEC F9AC 21D6 FF5E DD57"            /* þux.ã”îìù¬!Öÿ^ÝW */
+	$"96CF A7DF 3C0D 7E2F F9E7 F212 83EE E629"            /* –ϧß<.~/ùçò.ƒîæ) */
+	$"9543 AA61 C10A 4B12 1DD8 6835 405A D739"            /* •CªaÁÂK..Øh5@Z×9 */
+	$"DBD7 1628 2816 909D 1DEB 81F2 16AF 8953"            /* Û×.((.��.ë�ò.¯‰S */
+	$"9239 B79D A64A 3275 E506 BFD3 0198 776C"            /* ’9·�¦J2uå.¿Ó.˜wl */
+	$"F4C2 39CD 4CF8 2482 D781 526A 7D82 0B83"            /* ôÂ9ÍLø$‚×�Rj}‚.ƒ */
+	$"120C B2AB 1FC0 2DAA 4A72 ACD9 B4C7 926A"            /* ..²«.À-ªJr¬Ù´Ç’j */
+	$"CE69 46FA C67E 904D 12D4 D6EC 2F77 AC43"            /* ÎiFúÆ~�M.ÔÖì/w¬C */
+	$"0A82 A09A 8FAC 59F0 D192 4F8F E6D1 A8B3"            /* ‚ š�¬YðÑ’O�æѨ³ */
+	$"26FD EAD1 7727 E253 F826 580D 8786 8EAD"            /* &ýêÑw'âSø&X.‡†Ž­ */
+	$"4561 33FC 6C93 72E4 3F53 3E92 5E78 9597"            /* Ea3ül“rä?S>’^x•— */
+	$"895F 61B9 D382 514D 839E D4E8 A40B 6F99"            /* ‰_a¹Ó‚QMƒžÔè¤.o™ */
+	$"0BEC 889F F976 6F24 AEAC 2A18 479B 9CD0"            /* .숟ùvo$®¬*.G›œÐ */
+	$"A58D E4A8 4940 D7A9 26A7 8649 C387 22EB"            /* ¥�ä¨I@ש&§†IÇ"ë */
+	$"10F3 AB7F 805D 57F4 6918 508A 429D FC32"            /* .ó«.€]Wôi.PŠB�ü2 */
+	$"0E49 3480 E5A6 0267 54A6 D677 422D 1B62"            /* .I4€å¦.gT¦ÖwB-.b */
+	$"4DFB C3A4 2E01 8C0D 029D D238 87B0 230E"            /* Mûä..Œ..�Ò8‡°#. */
+	$"AB6E AEFD 64F3 F7AE 7BD7 DA13 2BCC DCFB"            /* «n®ýdó÷®{×Ú.+ÌÜû */
+	$"13EC E7EE A36F 86C6 A2D8 DD70 6174 04FA"            /* .ìçî£o†Æ¢ØÝpat.ú */
+	$"B7F7 A3BF 9C4C F99C C177 9B27 9148 3998"            /* ·÷£¿œLùœÁw›'‘H9˜ */
+	$"013A 4B0C E3A5 6905 6ADC 739C 3586 7009"            /* .:K.ã¥i.jÜsœ5†pÆ */
+	$"38DA 0496 C25E DFB2 F2AB 34C0 F138 4F81"            /* 8Ú.–Â^ß²ò«4Àñ8O� */
+	$"7240 2774 4588 B153 267B DBBE DFDE AEAD"            /* r@'tEˆ±S&{Û¾ßÞ®­ */
+	$"1D90 BA71 2B83 D108 1CDB 8B36 7837 8AAA"            /* .�ºq+ƒÑ..Û‹6x7Šª */
+	$"299C 2916 D66C CC2E 2FCF B0E3 228A 88C1"            /* )œ).ÖlÌ./Ï°ã"ŠˆÁ */
+	$"568F 12D8 D599 AB3F 29DE 1FA6 9336 132F"            /* V�.ØÕ™«?)Þ.¦“6./ */
+	$"521E 8EB9 9BD4 30E4 362E 349E 209A 6EB6"            /* R.Ž¹›Ô0ä6.4ž šn¶ */
+	$"D5CC 985B E51E 8A74 B9A0 1718 2753 A1E0"            /* Õ̘[å.Št¹ ..'S¡à */
+	$"BDCC 77CC 5697 641D B916 AB08 C12F 102F"            /* ½ÌwÌV—d.¹.«.Á/./ */
+	$"59A0 4283 27A8 9F9E 1980 381A 4785 E896"            /* Y Bƒ'¨Ÿž.€8.G…è– */
+	$"B9C8 A383 0C1E EBDE A8DC D1A0 00FB 61C2"            /* ¹È£ƒ..ëÞ¨ÜÑ .ûa */
+	$"70F1 84C8 8368 337E DA6C 7A1A 014F 77C3"            /* pñ„ȃh3~Úlz..Owà */
+	$"EFFF 0CCC F88E E539 B4FF 3187 54EA 4B2E"            /* ïÿ.ÌøŽå9´ÿ1‡TêK. */
+	$"27BF 1121 0DCD 456F 5AB4 E115 9E30 8B1C"            /* '¿.!.ÍEoZ´á.ž0‹. */
+	$"FCFB 8634 E35F E3F0 2A65 8EC0 775F C0EE"            /* üû†4ã_ãð*eŽÀw_Àî */
+	$"37B2 6C5A AA44 2B7C 889A 5854 FBB4 DC29"            /* 7²lZªD+|ˆšXTû´Ü) */
+	$"E875 94AB D4F4 19C2 5989 594D 6B55 CB5E"            /* èu”«Ôô.ÂY‰YMkUË^ */
+	$"012C A350 BF1C 322E 6DC6 6CFB 052A B48D"            /* .,£P¿.2.mÆlû.*´� */
+	$"2FFE D908 D443 2FB2 706F 13A8 B2BF 2E97"            /* /þÙ.ÔC/²po.¨²¿.— */
+	$"D7EF 6FE2 7D0B 4D6C 89E6 24BB D547 A266"            /* ×ïoâ}.Ml‰æ$»ÕG¢f */
+	$"3B92 FF58 BE83 0D95 D587 B51D B83A B360"            /* ;’ÿX¾ƒ.•Õ‡µ.¸:³` */
+	$"DF16 A55F 5D17 5ED7 C7D7 88FD D24B 89C4"            /* ß.¥_].^×Ç׈ýÒK‰Ä */
+	$"17FF 1CE0 2FC5 E332 79FF 6532 D599 2C36"            /* .ÿ.à/Åã2yÿe2Õ™,6 */
+	$"7360 56F2 6017 1165 F8CD AC09 6435 530F"            /* s`Vò`..eøͬÆd5S. */
+	$"8E48 0152 06AE 7F31 9D5A A12E EC4A 26BD"            /* ŽH.R.®.1�Z¡.ìJ&½ */
+	$"1D28 2D81 EBF2 625A 03C8 8240 FAB0 343C"            /* .(-�ëòbZ.È‚@ú°4< */
+	$"3460 4650 A369 CBAF D533 EC55 DB4D 46F7"            /* 4`FP£i˯Õ3ìUÛMF÷ */
+	$"45C4 1B75 581D CC26 9E29 8B0F C424 5512"            /* EÄ.uX.Ì&ž)‹.Ä$U. */
+	$"9417 F11C 77C1 F3FD 57B1 487F D8F8 A086"            /* ”.ñ.wÁóýW±H.Øø † */
+	$"E60E 2356 E9E1 F3EC 7F31 52E1 E3DB C75E"            /* æ.#Véáóì.1RáãÛÇ^ */
+	$"7A4B 2D19 8F06 AB86 5A88 F23D C312 C565"            /* zK-.�.«†Zˆò=Ã.Åe */
+	$"1AF0 4B35 F0D9 D100 6634 A377 90C1 A69A"            /* .ðK5ðÙÑ.f4£w�Á¦š */
+	$"1C64 495A BEF2 5A5C 1714 0504 2639 71A2"            /* .dIZ¾òZ\....&9q¢ */
+	$"5989 FF6E F887 5ADD 9843 A719 60CC 5185"            /* Y‰ÿnø‡ZݘC§.`ÌQ… */
+	$"B308 2551 F63A 7543 2A92 3949 FCC5 5023"            /* ³.%Qö:uC*’9IüÅP# */
+	$"5A92 FE32 A26E FF00 9CFC 0CFF 4A08 60C7"            /* Z’þ2¢nÿ.œü.ÿJ.`Ç */
+	$"F76C 480A E682 3C58 66B8 7045 CDBA 616C"            /* ÷lHÂæ‚<Xf¸pEͺal */
+	$"9995 BEC1 809B 0892 A7EC 43EC 7FE8 F49F"            /* ™•¾Á€›.’§ìCì.èôŸ */
+	$"9E4B AFD6 66BB 0B88 38ED B165 9C1D F096"            /* žK¯Öf».ˆ8í±eœ.ð– */
+	$"64EC FD43 9A7A BC84 8CEF 2E65 F99B 4B43"            /* dìýCšz¼„Œï.eù›KC */
+	$"7D47 3AE8 D0DB A066 308B 201D FF3F ABC1"            /* }G:èÐÛ f0‹ .ÿ?«Á */
+	$"CD0D B822 3734 A23E AF05 D1E1 F9F5 AF09"            /* Í.¸"74¢>¯.Ñáùõ¯Æ */
+	$"6428 F517 1201 C3F1 1B80 0DD2 DCD9 CA31"            /* d(õ...Ãñ.€.ÒÜÙÊ1 */
+	$"B022 DAFB D990 A8B1 6FF1 004E 4847 E5C8"            /* °"ÚûÙ�¨±oñ.NHGåÈ */
+	$"0580 DA86 704F E2FF 7E83 5167 5C3F ADB2"            /* .€Ú†pOâÿ~ƒQg\?­² */
+	$"4C44 A9D9 DB84 C360 68ED 1BF0 068E 04BF"            /* LD©ÙÛ„Ã`hí.ð.Ž.¿ */
+	$"D16E B55F 0701 3739 42FA E15C 0EA2 BF81"            /* Ñnµ_..79Búá\.¢¿� */
+	$"31C1 F1A3 A766 CAB8 C82E C96B 4868 D491"            /* 1Áñ£§fʸÈ.ÉkHhÔ‘ */
+	$"5ACB 6EED 4027 0C73 AACA 730C ECA6 DE42"            /* ZËní@'.sªÊs.ì¦ÞB */
+	$"38DA E07E CE64 BC49 7FDD FCCB 07B3 45BF"            /* 8Úà~Îd¼I.ÝüË.³E¿ */
+	$"B9DC FF13 039F D40E 43BB ACE4 B8F8 31F5"            /* ¹Üÿ..ŸÔ.C»¬ä¸ø1õ */
+	$"6743 9390 0B87 C9B1 194A 0200 FB53 29CD"            /* gC“�.‡É±.J..ûS)Í */
+	$"3141 15F5 3C38 9F70 2B7E 0E46 B5A7 5C94"            /* 1A.õ<8Ÿp+~.Fµ§\” */
+	$"AED4 E415 1639 7B49 20DA 1541 9742 A3A6"            /* ®Ôä..9{I Ú.A—B£¦ */
+	$"B873 4C7C 9112 1322 7D7F 5F6E 14AB 57FC"            /* ¸sL|‘.."}._n.«Wü */
+	$"A01D 94EC BC05 F45B C4C4 1FC3 D61B F5D3"            /*  .”ì¼.ô[ÄÄ.ÃÖ.õÓ */
+	$"0E62 9C2F CAE6 C609 B0D2 803B AF5F CC7F"            /* .bœ/ÊæÆÆ°Ò€;¯_Ì. */
+	$"4085 5B49 F81B 0AB3 DB0C 27C1 7A95 45D6"            /* @…[Iø.³Û.'Áz•EÖ */
+	$"CDDD 4F06 1A20 A7FE 22F6 EA13 EB6E C723"            /* ÍÝO.. §þ"öê.ënÇ# */
+	$"87B9 A058 CAF9 9F59 C9C9 6AAD 8358 5147"            /* ‡¹ XÊùŸYÉÉj­ƒXQG */
+	$"2B3E 2FD8 506F A48B 305C 97C7 5D25 5C75"            /* +>/ØPo¤‹0\—Ç]%\u */
+	$"C5B1 E7B4 CBC7 C76A 2FE5 1669 302C 2318"            /* űç´ËÇÇj/å.i0,#. */
+	$"CB1D BB38 5B47 3563 F041 0F00 C23A B1E9"            /* Ë.»8[G5cðA..Â:±é */
+	$"1972 D9C9 2F2F 4013 F8EF A6CA 7E8E 705C"            /* .rÙÉ//@.øï¦Ê~Žp\ */
+	$"0CB6 1301 5ED4 25E6 F7D9 999D AB8F 4CAC"            /* .¶..^Ô%æ÷Ù™�«�L¬ */
+	$"6FF2 04C8 8307 016C 6E46 645B 5488 79C0"            /* oò.ȃ..lnFd[TˆyÀ */
+	$"C0E5 8A2A 46EB DB4C 65A0 27FC 6230 781C"            /* ÀåŠ*FëÛLe 'üb0x. */
+	$"EDB8 4666 1604 1937 9603 A2AA D8C3 43A6"            /* í¸Ff...7–.¢ªØÃC¦ */
+	$"E254 D745 866F D24A DD91 397E C575 F187"            /* âT×E†oÒJÝ‘9~Åuñ‡ */
+	$"193B F5F5 819B 7D57 EC83 0871 ED1B 64F6"            /* .;õõ�›}Wìƒ.qí.dö */
+	$"E47A E1B0 65F9 67DF 5680 3642 52AA BB4B"            /* äzá°eùgßV€6BRª»K */
+	$"BA52 D8BA 8AF7 0A96 412A 92B2 045F 9739"            /* ºRغŠ÷–A*’²._—9 */
+	$"3A52 D961 6BC6 1D2E D90D 29A7 E9DE 2651"            /* :RÙakÆ..Ù.)§éÞ&Q */
+	$"CE3F 9921 03BC 7A7A CBFD 63E2 4C7C 9025"            /* Î?™!.¼zzËýcâL|�% */
+	$"BCC3 D509 745E 9AE4 1675 0242 26EE E4F6"            /* ¼ÃÕÆt^šä.u.B&îäö */
+	$"B04B CFB3 E37F EADB 2840 E47E 0209 C8C5"            /* °Kϳã.êÛ(@ä~.ÆÈÅ */
+	$"56FC 6228 BB57 F43A BE32 0753 73FB EAE2"            /* Vüb(»Wô:¾2.Ssûêâ */
+	$"55B4 D581 42C8 10B8 AEA9 67C4 F685 982C"            /* U´Õ�BÈ.¸®©gÄö…˜, */
+	$"3104 095F DCBD 3701 8749 9CBA A7A5 B714"            /* 1.Æ_ܽ7.‡Iœº§¥·. */
+	$"FDED FAA3 F034 54D8 728F 8640 4A61 560C"            /* ýíú£ð4TØr�†@JaV. */
+	$"50D4 B224 A5F1 6715 6C8B 7EC6 BF5C 120D"            /* PÔ²$¥ñg.l‹~Æ¿\.. */
+	$"8797 B25E B0E1 C57E 69AF 1FF2 99C3 44B5"            /* ‡—²^°áÅ~i¯.ò™ÃDµ */
+	$"0508 0061 1F44 795F 27C0 511E 0796 9740"            /* ...a.Dy_'ÀQ..–—@ */
+	$"14FF 4C51 5651 34F3 658D 4CA8 3FBF 43CC"            /* .ÿLQVQ4óe�L¨?¿CÌ */
+	$"8813 D372 1723 7DB5 6D44 4524 4E91 B644"            /* ˆ.Ór.#}µmDE$N‘¶D */
+	$"4B7D CDEC E0E0 8468 622D 87FE 80E3 E097"            /* K}Íìàà„hb-‡þ€ãà— */
+	$"303D 8894 1FFF 7FA6 9AAB C6E0 0B83 3EDD"            /* 0=ˆ”.ÿ.¦š«Æà.ƒ>Ý */
+	$"86A5 43D3 C650 0008 D364 A800 0000 0000"            /* †¥CÓÆP..Ód¨..... */
+	$"0000 07D7 8F92 61B9 E6E0 BCBF CD4A AB76"            /* ...×�’a¹æ༿ÍJ«v */
+	$"5B6E 246A 8DFB D274 41F9 3583 773D 5165"            /* [n$j�ûÒtAù5ƒw=Qe */
+	$"2139 B773 476E DF91 33F0 8CDA F420 613F"            /* !9·sGnß‘3ðŒÚô a? */
+	$"9B35 33C9 8298 A661 A5DB 2CEF 1A1C BC3E"            /* ›53É‚˜¦a¥Û,ï..¼> */
+	$"09B4 5415 8511 4FE5 3FF8 B88C 339D C169"            /* Æ´T.….Oå?ø¸Œ3�Ái */
+	$"9608 FF62 B2D6 285A 80A2 22C9 E4AA 5A99"            /* –.ÿb²Ö(Z€¢"ÉäªZ™ */
+	$"B3F5 E9D4 7FFF 7FF4 7D5C 4CC0 788F 0EB6"            /* ³õéÔ.ÿ.ô}\LÀx�.¶ */
+	$"8024 0000 0A1E 1F40 0000 0000 0000 0000"            /* €$..Â..@........ */
+	$"CA54 CF6A 897B B6D7 9C90 87E9 FF6A 22A0"            /* ÊTÏj‰{¶×œ�‡éÿj"  */
+	$"0765 4AE8 B827 B7A1 C412 4000 0000 0000"            /* .eJè¸'·¡Ä.@..... */
+	$"0000 2222 DAB7 AEED C4EB AFCB FF79 6610"            /* ..""Ú·®íÄë¯Ëÿyf. */
+	$"A362 D5F2 1401 DA9F 8978 3FC3 FF60 341C"            /* £bÕò..ÚŸ‰x?Ãÿ`4. */
+	$"524C CBF3 AF64 9BA4 637F F217 CA8C A4CE"            /* RLËó¯d›¤c.ò.ÊŒ¤Î */
+	$"A881 46DE C63F CB0B 4C86 F71C CDFF 6CDC"            /* ¨�FÞÆ?Ë.L†÷.ÍÿlÜ */
+	$"3C86 AFD6 02EF 25B3 E392 0238 14ED F9FF"            /* <†¯Ö.ï%³ã’.8.íùÿ */
+	$"71EA 1A7B 7848 281D C18D 83C1 F0D1 C115"            /* qê.{xH(.Á�ƒÁðÑÁ. */
+	$"C525 7E38 9E60 32A4 CED2 A5DE 8006 1212"            /* Å%~8ž`2¤ÎÒ¥Þ€... */
+	$"7136 14A1 74D1 9C7D F74C 708E 43DE 4154"            /* q6.¡tÑœ}÷LpŽCÞAT */
+	$"2939 179A 87BB 2AAF 7401 4404 CB30 458F"            /* )9.š‡»*¯t.D.Ë0E� */
+	$"F1B7 EE42 3E46 458F B220 6F30 EE24 7D86"            /* ñ·îB>FE�² o0î$}† */
+	$"2D28 3CA7 C184 60D3 4EBC 9C79 C402 02FC"            /* -(<§Á„`ÓN¼œyÄ..ü */
+	$"553C C62D DDC0 3D0C F12B C1FF 546D A4FF"            /* U<Æ-ÝÀ=.ñ+ÁÿTm¤ÿ */
+	$"5885 6B1B 9EF6 2206 8FB5 1CB0 2D3D B922"            /* X…k.žö".�µ.°-=¹" */
+	$"644F D104 0152 70F8 BF41 4D6E 4F05 B928"            /* dOÑ..Rpø¿AMnO.¹( */
+	$"396A 4A92 9B1B 24AB 4611 6D95 87D6 2D7C"            /* 9jJ’›.$«F.m•‡Ö-| */
+	$"7546 B839 A3B1 C612 0F2A 796E 7911 5FF9"            /* uF¸9£±Æ..*yny._ù */
+	$"03C4 D13E EF00 2DEF 9CFE FDDE 3A2C FF3E"            /* .ÄÑ>ï.-ïœþýÞ:,ÿ> */
+	$"4567 F432 3673 3F84 8787 B65C 7A4F 2007"            /* Egô26s?„‡‡¶\zO . */
+	$"FF7C D894 A762 3872 8FA4 9563 D178 5039"            /* ÿ|Ø”§b8r�¤•cÑxP9 */
+	$"C4BD 2EB4 0491 2A80 0000 0000 0000 0001"            /* Ľ.´.‘*€........ */
+	$"F172 6FA1 09F2 9F35 F3BC 2E0B 8E46 2557"            /* ñro¡ÆòŸ5ó¼..ŽF%W */
+	$"67C5 4F12 D1CF F08C BC61 0F89 E4A4 9249"            /* gÅO.ÑÏðŒ¼a.‰ä¤’I */
+	$"2492 4924 9249 221B 4708 65ED 84CA FDD2"            /* $’I$’I".G.eí„ÊýÒ */
+	$"D193 7C69 0CA3 95EF DDF2 33FF 556E D976"            /* Ñ“|i.£•ïÝò3ÿUnÙv */
+	$"2E4D FDCE E0FC 8669 83FF 768E 3CBB 179B"            /* .MýÎàü†iƒÿvŽ<».› */
+	$"DBB9 253D BFFF 79F1 5006 27BF 5548 40B9"            /* Û¹%=¿ÿyñP.'¿UH@¹ */
+	$"BADC F963 10BA 8BD9 367F E03A 6E29 5908"            /* ºÜùc.º‹Ù6.à:n)Y. */
+	$"0000 0000 0000 0000 0028 8080 0000 000A"            /* .........(€€... */
+	$"6370 D000 0142 83C0 0000 0011 CD3F D940"            /* cpÐ..BƒÀ....Í?Ù@ */
+	$"0022 C990 C912 501C 14FC 1926 5412 0E88"            /* ."É�É.P..ü.&T..ˆ */
+	$"C32F B2ED E7A4 9249 2492 4924 9249 247E"            /* Ã/²í礒I$’I$’I$~ */
+	$"FB2C 999E D2ED 6DFF 783B 4C3A 3DB7 14A5"            /* û,™žÒímÿx;L:=·.¥ */
+	$"872C 2B85 8FC2 72EA 3412 FCA8 32E0 7A2E"            /* ‡,+…�Ârê4.ü¨2àz. */
+	$"B109 F66C 3F99 7C32 2761 1522 7B9C 1851"            /* ±Æöl?™|2'a."{œ.Q */
+	$"B3CB 5373 0652 CE79 D8C5 B721 03D7 CD81"            /* ³ËSs.RÎyØÅ·!.×Í� */
+	$"A03A CD5F CECF B58A 4122 7ED2 9FFF 7FFF"            /*  :Í_ÎϵŠA"~ÒŸÿ.ÿ */
+	$"1575 DF0B 430B 0A6C 6108 B421 B33F E9FA"            /* .uß.C.Âla.´!³?éú */
+	$"AC06 391C EB01 17F4 3BF4 4CDA 87DA 516F"            /* ¬.9.ë..ô;ôLÚ‡ÚQo */
+	$"EFA3 E7F9 651A 6902 C269 AF79 2EA4 D861"            /* ï£çùe.i.Âi¯y.¤Øa */
+	$"CBC1 7F37 146D 4163 38BB B16B AAD4 9AC2"            /* ËÁ.7.mAc8»±kªÔšÂ */
+	$"424A B3CE 1368 78EF B4B0 FE68 2FBA 0CB2"            /* BJ³Î.hxï´°þh/º.² */
+	$"E672 A89D 999E 64CD 417A 98A3 8458 0603"            /* ær¨�™ždÍAz˜£„X.. */
+	$"C03D 9F9E B15E 8418 0FC6 F3E0 BA39 A3C1"            /* À=Ÿž±^„..Æóàº9£Á */
+	$"9929 0547 9C29 FC76 57CA B1E5 F887 AE73"            /* ™).Gœ)üvWʱåø‡®s */
+	$"78AA BA9F FF7F C07C 00F0 28E9 7533 0FC1"            /* xªºŸÿ.À|.ð(éu3.Á */
+	$"097C 4ABC F3CB 6604 EEC2 5194 A1F2 A201"            /* Æ|J¼óËf.îÂQ”¡ò¢. */
+	$"D6B0 C5F3 4AA3 8FD8 34DC A382 0CD4 134E"            /* Ö°ÅóJ£�Ø4Ü£‚.Ô.N */
+	$"8275 37F5 2388 74C6 1A6C F889 1037 A348"            /* ‚u7õ#ˆtÆ.lø‰.7£H */
+	$"ACB4 EFF5 B446 564C C6DC 75F7 8445 013F"            /* ¬´ïõ´FVLÆÜu÷„E.? */
+	$"79FF 407B 05EE 9C66 8A53 FF7A 367A 6D06"            /* yÿ@{.îœfŠSÿz6zm. */
+	$"9ADF CBDD 25B5 0629 78A0 A071 35BA EE49"            /* šßËÝ%µ.)x  q5ºîI */
+	$"64E9 3EA3 9A07 917A 66E3 090C B916 3BF5"            /* dé>£š.‘zfãÆ.¹.;õ */
+	$"10D7 77D5 7281 248E 3F09 0C0F 319E 7F71"            /* .×wÕr�$Ž?Æ..1ž.q */
+	$"98DA A34A C823 06A4 6BFD 8EA1 8C71 EB25"            /* ˜Ú£JÈ#.¤kýŽ¡Œqë% */
+	$"E5FC 0BA1 DB35 9514 A229 56F0 7E42 9FD0"            /* åü.¡Û5•.¢)Vð~BŸÐ */
+	$"5435 3CB7 AED9 0A4F 625B A493 D1B2 C654"            /* T5<·®ÙÂOb[¤“ѲÆT */
+	$"F691 87F9 F8E9 7459 1823 E06B 57D6 C638"            /* ö‘‡ùøétY.#àkWÖÆ8 */
+	$"7EE2 8CA0 1D79 4000 0000 0000 0000 0000"            /* ~⌠.y@......... */
+	$"0000 0000 442A 0D8C 8522 4E1A 3752 5040"            /* ....D*.Œ…"N.7RP@ */
+	$"E53D EE69 0B70 A6BF 9D0D D725 D66E 8D50"            /* å=îi.p¦¿�.×%Ön�P */
+	$"10DB 966B 649B 0CA3 958B 6457 90CC 214A"            /* .Û–kd›.£•‹dW�Ì!J */
+	$"C4C0 27A2 95F4 98AD 14C2 1892 EBE7 864B"            /* ÄÀ'¢•ô˜­.Â.’ëç†K */
+	$"18AA 55C7 50D2 4A15 7F4E 566A 9C13 9C52"            /* .ªUÇPÒJ..NVjœ.œR */
+	$"AC77 FE86 B3A2 5D92 D112 516C BA99 60EE"            /* ¬wþ†³¢]’Ñ.Qlº™`î */
+	$"221A F194 D9DF FF5F FF6B 77F9 4B01 4F8F"            /* ".ñ”Ùßÿ_ÿkwùK.O� */
+	$"F681 8614 2F3E 31E3 EABB 7C34 6025 A491"            /* ö�†./>1ãê»|4`%¤‘ */
+	$"9BC1 A348 628D 34AE 751A F8F7 7521 7F48"            /* ›Á£Hb�4®u.ø÷u!.H */
+	$"68A4 6B9C F66F 252D 6021 9C97 39AB B637"            /* h¤kœöo%-`!œ—9«¶7 */
+	$"3B5D E8FB 56EE 824A F65D C84D E23C 7BF2"            /* ;]èûVî‚Jö]ÈMâ<{ò */
+	$"5400 0000 0000 0000 0000 0000 0014 080D"            /* T............... */
+	$"B05B 4688 1F60 376D 2209 1DE1 7E75 CD30"            /* °[Fˆ.`7m"Æ.á~uÍ0 */
+	$"5D2F 627B A077 8D86 2001 62AF 1031 6853"            /* ]/b{ w�† .b¯.1hS */
+	$"2A8E 0308 16F6 C4EC E5B6 814A 1DF2 23EB"            /* *Ž...öÄìå¶�J.ò#ë */
+	$"8C16 64F9 A1ED 8A1F 346E 2E1C 5ACB 4376"            /* Œ.dù¡íŠ.4n..ZËCv */
+	$"5014 B885 5212 5294 8F4F DF56 7339 8A5D"            /* P.¸…R.R”�OßVs9Š] */
+	$"03C0 A05F D60B 5D58 2677 CD67 A4EE 3803"            /* .À _Ö.]X&wÍg¤î8. */
+	$"B2B1 9AD5 A41A C3EF 3281 3FFF 780A A5BD"            /* ²±šÕ¤.Ãï2�?ÿxÂ¥½ */
+	$"861B 62F7 456F 1021 93CD A115 BD61 7E4C"            /* †.b÷Eo.!“Í¡.½a~L */
+	$"2306 D6BF D5D9 18AF 12BB 22D9 E32E 6976"            /* #.Ö¿ÕÙ.¯.»"Ùã.iv */
+	$"9282 5E47 A842 7983 2C87 64C5 6215 A0D9"            /* ’‚^G¨Byƒ,‡dÅb. Ù */
+	$"E45A EFAE 74F3 E5E5 7679 A7C0 D366 649C"            /* äZï®tóååvy§ÀÓfdœ */
+	$"9EF3 D763 2D6C D0AD 48E5 7A2A 9454 8B34"            /* žó×c-lЭHåz*”T‹4 */
+	$"B7FF 7FCD F604 90E4 2716 1C40 DD8A 8B1A"            /* ·ÿ.Íö.�ä'..@ÝŠ‹. */
+	$"24C8 2F0C 06AC 999A 58B7 C15E E6B1 431B"            /* $È/..¬™šX·Á^æ±C. */
+	$"73D1 FEC5 5182 4A2D 33CB E920 AFBE 9F5A"            /* sÑþÅQ‚J-3Ëé ¯¾ŸZ */
+	$"0478 C2F3 80D7 241A 2E07 8BF3 FD3F 471A"            /* .xÂó€×$...‹óý?G. */
+	$"7C53 1C79 2F17 C32F D5C6 B977 E2F9 9D80"            /* |S.y/.Ã/Õƹwâù�€ */
+	$"558B 7336 75BC 5945 3986 BD1C CE95 EA07"            /* U‹s6u¼YE9†½.Εê. */
+	$"7152 C778 65AD 73E9 F1B7 24D4 BDB0 7F24"            /* qRÇxe­séñ·$Ô½°.$ */
+	$"BACD 3C51 D344 33D7 21C7 BE9A 915D 2808"            /* ºÍ<QÓD3×!Ǿš‘](. */
+	$"3E68 3F1B 43AE 8F30 CE7F FF67 1C78 8498"            /* >h?.C®�0Î.ÿg.x„˜ */
+	$"08D8 E1D9 3F1A E50B EB7C E564 6F4C 57F3"            /* .ØáÙ?.å.ë|ådoLWó */
+	$"9E60 5F9B 244E 83A9 33C9 668A 3951 7E33"            /* ž`_›$Nƒ©3ÉfŠ9Q~3 */
+	$"31D7 01E7 0342 6BC0 7FD1 7488 2BE1 9AD1"            /* 1×.ç.BkÀ.Ñtˆ+ášÑ */
+	$"1938 BBD8 7710 BAD3 BB92 2C80 A162 B2EF"            /* .8»Øw.ºÓ»’,€¡b²ï */
+	$"3FEA 6FC2 47D2 0D0E 28AB 03DA 4B34 4027"            /* ?êoÂGÒ..(«.ÚK4@' */
+	$"7FFD 87BC 9D96 E076 3C00 0000 0000 0000"            /* .ý‡¼�–àv<....... */
+	$"0000 0000 0000 136C 1721 95F0 1991 3F80"            /* .......l.!•ð.‘?€ */
+	$"65DC 1F3F AEA0 BE5C 71D2 94CE C7FF 7FFF"            /* eÜ.?® ¾\qÒ”ÎÇÿ.ÿ */
+	$"7917 BEAD D458 935A 563C CC9C 6C0D CFFF"            /* y.¾­ÔX“ZV<Ìœl.Ïÿ */
+	$"55DA 93C2 F199 3D1E C4C2 3C5F A7BC D48E"            /* UÚ“Âñ™=.ÄÂ<_§¼ÔŽ */
+	$"4980 037B 9FCC F7BC 6E1E 78CD 2838 DC58"            /* I€.{ŸÌ÷¼n.xÍ(8ÜX */
+	$"F156 C827 88EA BFF7 BD95 BBD6 FE11 C305"            /* ñVÈ'ˆê¿÷½•»Öþ.Ã. */
+	$"A1D2 FA2A EA0B E56B 285B 91FE 551E F5E2"            /* ¡Òú*ê.åk([‘þU.õâ */
+	$"687C 5A51 1A67 64D3 BD76 4937 F455 4C94"            /* h|ZQ.gdÓ½vI7ôUL” */
+	$"6A7E B888 CB40 7AA3 DDEE 8BD8 2D9F 1EB6"            /* j~¸ˆË@z£Ýî‹Ø-Ÿ.¶ */
+	$"48DF 9C66 6BF3 A26A 3CC4 2D4D E47A 6D9A"            /* Hßœfkó¢j<Ä-Mäzmš */
+	$"DAB1 1DA4 083A D994 4416 C0D2 2E63 539E"            /* Ú±.¤.:Ù”D.ÀÒ.cSž */
+	$"7274 3C04 85F4 D7B5 EDEF 507A B2B7 1832"            /* rt<.…ô×µíïPz²·.2 */
+	$"6615 A186 4A80 0000 0000 0000 0000 0000"            /* f.¡†J€.......... */
+	$"07CF BF6C 3626 7453 BF7D 8B57 26C9 F556"            /* .Ï¿l6&tS¿}‹W&ÉõV */
+	$"1F12 0BB9 5DC4 797D 3C69 7DB2 2FFF 7F33"            /* ...¹]Äy}<i}²/ÿ.3 */
+	$"81FC E4ED 4BF8 9180 3FD2 0142 3F2D 1DF0"            /* �üäíKø‘€?Ò.B?-.ð */
+	$"097B D61C 019A C409 B506 26FC D55D 7AE9"            /* Æ{Ö..šÄƵ.&üÕ]zé */
+	$"3464 6C57 13E7 565F 2553 70C3 3EC7 87AC"            /* 4dlW.çV_%SpÃ>LJ¬ */
+	$"3161 5289 3A6A FC0B E254 CAFA 6A32 2F8C"            /* 1aR‰:jü.âTÊúj2/Œ */
+	$"8B76 FA87 DADD 0333 2250 0058 F5C6 21CD"            /* ‹vú‡ÚÝ.3"P.XõÆ!Í */
+	$"D094 5CD5 10DD 2FA0 B74B 06FB AA9B 2B62"            /* Д\Õ.Ý/ ·K.ûª›+b */
+	$"E36D 708E B8F5 0739 3097 7F03 47BE 48F5"            /* ãmpŽ¸õ.90—..G¾Hõ */
+	$"D079 1641 CA5D DF28 C92B 0EFA B18F CE6F"            /* Ðy.AÊ]ß(É+.ú±�Îo */
+	$"6648 DB26 DE5C 1D17 2BD3 28AF DD89 801C"            /* fHÛ&Þ\..+Ó(¯Ý‰€. */
+	$"AB0D 40D1 9016 D542 63A0 8222 9D7A F0F5"            /* «.@Ñ�.ÕBc ‚"�zðõ */
+	$"A171 2D28 3D2C C22E 09AB 3AA9 C50B 7545"            /* ¡q-(=,Â.Æ«:©Å.uE */
+	$"4C64 18E8 8E67 3A7D DDBE 36CE 2F97 5AD0"            /* Ld.èŽg:}ݾ6Î/—ZÐ */
+	$"E4F0 8AFB 6071 6268 E5F6 09EA 245F 9F87"            /* äðŠû`qbhåöÆê$_Ÿ‡ */
+	$"E304 242C 234C 9FF7 1D0A 11C7 4FE7 20BC"            /* ã.$,#LŸ÷.Â.ÇOç ¼ */
+	$"EC58 1A4B 5A8E DE45 0E5F 4A03 4C8A 5051"            /* ìX.KZŽÞE._J.LŠPQ */
+	$"E410 4405 321B BD82 AC69 94F7 AA5E 5C65"            /* ä.D.2.½‚¬i”÷ª^\e */
+	$"436F 861A C95F 1AB0 2E2B 9689 AA43 B247"            /* Co†.É_.°.+–‰ªC²G */
+	$"6DE3 4E9E F205 F221 D175 86BB 4434 C0EE"            /* mãNžò.ò!Ñu†»D4Àî */
+	$"C472 EA2B 499D 63FA B4C8 FAB3 91F3 060D"            /* Ärê+I�cú´Èú³‘ó.. */
+	$"C203 A636 1D98 6B00 D678 0D3C BE92 309E"            /* Â.¦6.˜k.Öx.<¾’0ž */
+	$"759A 11D4 B514 24FB E4D2 7089 76DE 42DD"            /* uš.Ôµ.$ûäÒp‰vÞBÝ */
+	$"5338 4798 5943 4A6B 500A 472E 77BE AEBD"            /* S8G˜YCJkPÂG.w¾®½ */
+	$"93B0 117A 0E2D A8E4 DFED 5A76 1775 2BFF"            /* “°.z.-¨äßíZv.u+ÿ */
+	$"1A84 CBE1 B007 D3EA 11B0 9BB8 4B3F BB56"            /* .„Ëá°.Óê.°›¸K?»V */
+	$"33F6 B242 4C5C A63D 638F 1BA5 0AC5 698D"            /* 3ö²BL\¦=c�.¥ÂÅi� */
+	$"45B3 D343 D769 FEEE C45D 50B0 9AAA 4146"            /* E³ÓC×iþîÄ]P°šªAF */
+	$"0BFA F8CC 694B A42D FC1E C3F1 54F0 D3F9"            /* .úøÌiK¤-ü.ÃñTðÓù */
+	$"F051 5182 D373 5210 38AA F9B0 D3F3 6B07"            /* ðQQ‚ÓsR.8ªù°Óók. */
+	$"C944 7FCA 2126 D17A 01B1 7763 CDE8 D5FF"            /* ÉD.Ê!&Ñz.±wcÍèÕÿ */
+	$"00F4 08D7 4060 339C D8E2 7EA4 B00D 3171"            /* .ô.×@`3œØâ~¤°.1q */
+	$"ABB0 7F47 D146 13B9 398E 14B3 C55D 10AF"            /* «°.GÑF.¹9Ž.³Å].¯ */
+	$"8D0A 2444 26A0 EFEA 6CB2 51FD EA28 0FD7"            /* �Â$D& ïêl²Qýê(.× */
+	$"4E2F F54F 0066 62F2 66F3 334C 5D9D 77ED"            /* N/õO.fbòfó3L]�wí */
+	$"F3D0 12ED 7A95 89A1 B928 8429 DCFB 8C68"            /* óÐ.íz•‰¡¹(„)ÜûŒh */
+	$"C35C 3C77 5D7D 5180 A012 ADA3 AE60 AAE0"            /* Ã\<w]}Q€ .­£®`ªà */
+	$"0D88 09A4 4F7B FAC4 A2FD 327D E109 4F0B"            /* .ˆÆ¤O{úÄ¢ý2}áÆO. */
+	$"3343 C0ED D985 7402 93E2 7A2E 09B4 09A6"            /* 3CÀíÙ…t.“âz.ƴƦ */
+	$"5348 2E51 C037 BE62 C1A7 15C4 B9C8 7F4B"            /* SH.QÀ7¾bÁ§.ĹÈ.K */
+	$"FC22 3596 D989 C701 6701 5488 1001 22B2"            /* ü"5–Ù‰Ç.g.Tˆ.."² */
+	$"C06A A5D5 2C94 6BA9 D1C6 2B33 5910 8B1F"            /* Àj¥Õ,”k©ÑÆ+3Y.‹. */
+	$"0B0D 5531 BE0F 3E72 9C60 75A8 2669 220D"            /* ..U1¾.>rœ`u¨&i". */
+	$"E140 D538 7CD4 5763 D708 6D5E 45C0 AE61"            /* á@Õ8|ÔWc×.m^EÀ®a */
+	$"EC8B E180 1D9C 712C 4DB9 F177 6733 0F76"            /* ì‹á€.œq,M¹ñwg3.v */
+	$"9A72 7AD0 D18D 2BE6 9DCE 6294 4092 CE8E"            /* šrzÐÑ�+æ�Îb”@’ÎŽ */
+	$"ACED 8B00 B050 AE53 C09C 98D6 CFD1 4208"            /* ¬í‹.°P®SÀœ˜ÖÏÑB. */
+	$"DEB2 AF01 5ED7 E1F4 4EAA 0B09 2263 FE09"            /* Þ²¯.^×áôNª.Æ"cþÆ */
+	$"2771 6EB7 9181 1DFE A5DD 9A12 4592 02FD"            /* 'qn·‘�.þ¥Ýš.E’.ý */
+	$"5F2D D4D6 5C15 B454 B07C 9B6A B9F9 AEC2"            /* _-ÔÖ\.´T°|›j¹ù®Â */
+	$"D883 1F5F B9B1 8258 6732 C7E3 5C90 DB16"            /* ؃._¹±‚Xg2Çã\�Û. */
+	$"42EC D875 2B9D FEAF 1FED BD80 261D BAAE"            /* BìØu+�þ¯.í½€&.º® */
+	$"3799 FDC7 DBE5 E769 A11C 3304 5D3B 419C"            /* 7™ýÇÛåçi¡.3.];Aœ */
+	$"5844 E615 EE7A 5DCE 272E D055 121D 1F84"            /* XDæ.îz]Î'.ÐU...„ */
+	$"2EC6 E6B1 A7DA D03A D600 6D58 4FF0 9196"            /* .Æ汧ÚÐ:Ö.mXOð‘– */
+	$"FBCA CDDC 1B8D 9D1A BB7B 3782 0F3F 626C"            /* ûÊÍÜ.��.»{7‚.?bl */
+	$"26AA AF34 6A20 8210 1E96 ED21 5A26 EF04"            /* &ª¯4j ‚..–í!Z&ï. */
+	$"5F66 5C2D A8A4 F3BC 1871 AD1D FE4D 8C8B"            /* _f\-¨¤ó¼.q­.þMŒ‹ */
+	$"F1E5 A382 654B 08C7 EFC4 BFBA C29B 5C73"            /* ñ壂eK.ÇïÄ¿ºÂ›\s */
+	$"2420 9390 3B75 6DE6 0208 6F4F BB53 B2AA"            /* $ “�;umæ..oO»S²ª */
+	$"AD28 4360 1A8A 4301 088C 6F17 68CC 9180"            /* ­(C`.ŠC..Œo.hÌ‘€ */
+	$"D757 7012 3BE3 C4AB DF05 97B9 4B57 B6FC"            /* ×Wp.;ãÄ«ß.—¹KW¶ü */
+	$"7693 36DE 89E8 E2AB 4352 A782 4520 DA28"            /* v“6Þ‰èâ«CR§‚E Ú( */
+	$"F1F2 34D6 2EAE E401 ED61 1E2E 4E74 D4EB"            /* ñò4Ö.®ä.ía..NtÔë */
+	$"98A9 94AD F856 8EE1 E3D0 06FC AA37 31E5"            /* ˜©”­øVŽáãÐ.üª71å */
+	$"1047 113E C151 CE86 B6A4 0F82 E5D9 CE50"            /* .G.>ÁQΆ¶¤.‚åÙÎP */
+	$"57A8 8F86 AFAD 21D1 2C4C F181 8BD7 106C"            /* W¨�†¯­!Ñ,Lñ�‹×.l */
+	$"3C77 649E 038E 3C63 66F4 EE1A 2906 755C"            /* <wdž.Ž<cfôî.).u\ */
+	$"EDD8 6093 6868 531C 9FA3 C5C9 3F3C 7786"            /* íØ`“hhS.Ÿ£ÅÉ?<w† */
+	$"BCC4 440C 13F9 0BCB 76BA 9364 A3CC 344F"            /* ¼ÄD..ù.Ëvº“d£Ì4O */
+	$"128B D594 CB9D A2DC 6C03 CA48 2D9E 9706"            /* .‹Õ”Ë�¢Ül.ÊH-ž—. */
+	$"A281 5170 A91B 0033 4552 2A9A BF6F D4A9"            /* ¢�Qp©..3ER*š¿oÔ© */
+	$"61B6 F6C1 7959 FDD2 8F3F C94B 2B90 29BB"            /* a¶öÁyYýÒ�?ÉK+�)» */
+	$"9FAA A83B FEFF 80A3 1EC2 B2D9 77CF 963B"            /* Ÿª¨;þÿ€£.²ÙwÏ–; */
+	$"85FF 5728 5CDD 2F01 7556 8155 F8AA 7984"            /* …ÿW(\Ý/.uV�Uøªy„ */
+	$"7543 0C18 A1FC 0353 DF5F D368 41E9 E0EF"            /* uC..¡ü.Sß_ÓhAéàï */
+	$"C363 A78F 3FE9 41E9 5F77 19A4 A811 FF43"            /* Ãc§�?éAé_w.¤¨.ÿC */
+	$"8EE8 3FBA 00FA 54F6 15F5 CF3B 39A6 0984"            /* Žè?º.úTö.õÏ;9¦Æ„ */
+	$"CC99 7AE1 8E5B 71A9 1575 DB95 F166 D52F"            /* Ì™záŽ[q©.uÛ•ñfÕ/ */
+	$"A270 08D4 9515 3B89 2EA1 A097 12A3 B4E9"            /* ¢p.Ô•.;‰.¡ —.£´é */
+	$"5BFB AE47 8FD7 60F0 33DA E91B 234B 5D2F"            /* [û®G�×`ð3Úé.#K]/ */
+	$"7C4B 00C2 60F1 7260 B78A 1835 B440 611B"            /* |K.Â`ñr`·Š.5´@a. */
+	$"042D F768 F9C9 8785 50AD 8421 77D4 B97A"            /* .-÷hùɇ…P­„!wÔ¹z */
+	$"6B02 828C E758 8B31 1E92 DF7F BE67 3DAB"            /* k.‚ŒçX‹1.’ß.¾g=« */
+	$"E5F8 F1FB FD8C 34F4 4B2F 98BF 24A9 4DF2"            /* åøñûýŒ4ôK/˜¿$©Mò */
+	$"32A9 A661 B01E F960 12E1 9C18 F197 CEA7"            /* 2©¦a°.ù`.áœ.ñ—Χ */
+	$"E1C4 4AB4 7CEB 2CE2 33F3 C23C F3FD 2CF9"            /* áÄJ´|ë,â3óÂ<óý,ù */
+	$"F132 8395 3D39 FD9D 983D 4454 9758 856B"            /* ñ2ƒ•=9ý�˜=DT—X…k */
+	$"6556 B234 72B0 C2CA 71CA 9CEB 7AE4 FD7C"            /* eV²4r°ÂÊqÊœëzäý| */
+	$"0E3F 1930 6B17 7074 C216 3D9C 24BF 5B97"            /* .?.0k.ptÂ.=œ$¿[— */
+	$"A7EA 25F0 9DCC AFA5 BBEF 47E9 D7E6 7B0E"            /* §ê%ð�̯¥»ïGé×æ{. */
+	$"E02F 87A2 EF87 68FC 9BF7 F274 5F00 FC3D"            /* à/‡¢ï‡hü›÷òt_.ü= */
+	$"A5F8 7AC7 F0FA A5F8 7D42 C03F 0F42 FE1D"            /* ¥øzÇðú¥ø}BÀ?.Bþ. */
+	$"ABF0 F7CF E1EE 40ED 1CBC E67A C7C3 33E9"            /* «ð÷Ïáî@í.¼æzÇÃ3é */
+	$"75CE 6202 697A FF68 B299 C0A6 2F39 4F64"            /* uÎb.izÿh²™À¦/9Od */
+	$"6775 1459 6387 68C9 941E E328 B150 8D7C"            /* gu.Yc‡hÉ”.ã(±P�| */
+	$"24C4 D953 4443 9A50 E4CC 4E41 B3A9 F28A"            /* $ÄÙSDCšPäÌNA³©òŠ */
+	$"BB0E 943C 0DAB C98A 023C 332B AE2D AF60"            /* ».”<.«ÉŠ.<3+®-¯` */
+	$"4D30 BA77 9D1A 93DC CEBB 7560 EA33 084C"            /* M0ºw�.“Üλu`ê3.L */
+	$"BCFD 2F47 685E 4CC9 8A76 F1C8 04AB 126F"            /* ¼ý/Gh^LÉŠvñÈ.«.o */
+	$"B9FD 4A34 E181 4147 9F56 2AB4 EB2C 50EF"            /* ¹ýJ4á�AGŸV*´ë,Pï */
+	$"D652 4543 763B B857 210B 2B4A BB50 0EAE"            /* ÖRECv;¸W!.+J»P.® */
+	$"90BD EEEC F92B DD18 0881 9B3A C6DF A028"            /* �½îìù+Ý..�›:Æß ( */
+	$"45EB 36D7 50B4 D756 FB49 9F08 D74D 037B"            /* Eë6×P´×VûIŸ.×M.{ */
+	$"83A1 001C 0977 1DCC 81D0 B6B9 828A 6851"            /* ƒ¡..Æw.Ì�ж¹‚ŠhQ */
+	$"3CAC B3FF 572B 543A 4C73 3F35 0561 EC81"            /* <¬³ÿW+T:Ls?5.aì� */
+	$"A8D4 82BC 9148 5E30 FF3E 3164 C43E 5461"            /* ¨Ô‚¼‘H^0ÿ>1dÄ>Ta */
+	$"4BD0 139E 6390 0E05 4793 56B8 5080 CBF6"            /* KÐ.žc�..G“V¸P€Ëö */
+	$"9E70 BEA1 FB26 DD1E AEE1 E78D 0D32 FA02"            /* žp¾¡û&Ý.®áç�.2ú. */
+	$"43FC FBC6 7464 2C9A 14AD 2C7C 0969 995F"            /* CüûÆtd,š.­,|Æi™_ */
+	$"6363 3037 9C34 C5F8 42DF B339 D2B0 5C45"            /* cc07œ4ÅøBß³9Ò°\E */
+	$"6130 509D 28E7 D3A7 9308 74ED 9265 B7F9"            /* a0P�(çÓ§“.tí’e·ù */
+	$"0F54 D265 33D9 EB57 07C4 852B E3C8 771F"            /* .TÒe3ÙëW.Ä…+ãÈw. */
+	$"21F8 ADA3 D807 625C 513A E395 604B 0D6A"            /* !ø­£Ø.b\Q:ã•`K.j */
+	$"A9FC 297E 63AF 7622 23B6 63E1 EF25 F572"            /* ©ü)~c¯v"#¶cáï%õr */
+	$"01B0 400D 18C6 C9FA 6AF5 3E26 4199 6E68"            /* .°@..ÆÉújõ>&A™nh */
+	$"99B5 B3A9 F861 3419 C6C7 B65C D0F6 353B"            /* ™µ³©øa4.ÆǶ\Ðö5; */
+	$"6551 1B0A 9D82 1F07 4185 8C46 5867 DC22"            /* eQ.Â�‚..A…ŒFXgÜ" */
+	$"BD38 AFF7 27BA 1114 9266 5EF4 1EA9 89B4"            /* ½8¯÷'º..’f^ô.©‰´ */
+	$"A634 E917 65E5 502E 8028 D24E 725F 0C22"            /* ¦4é.eåP.€(ÒNr_." */
+	$"1513 7B38 5FEA 3150 520B 6D8A 03D8 F796"            /* ..{8_ê1PR.mŠ.Ø÷– */
+	$"D183 D8FA 82E2 C147 B662 593B 9FC8 A2A0"            /* уØú‚âÁG¶bY;ŸÈ¢  */
+	$"C63B D151 D905 072C 02E5 919B 0BE9 6D76"            /* Æ;ÑQÙ..,.å‘›.émv */
+	$"4BEF 7D51 FF67 C2F2 BB61 DDD2 7981 0B7E"            /* Kï}QÿgÂò»aÝÒy�.~ */
+	$"D406 3679 DFA4 FAE3 A33C 28AC 06C6 93C1"            /* Ô.6yߤúã£<(¬.Æ“Á */
+	$"B82F 53DB 1EB8 A6F3 5A24 A44A 1A76 9204"            /* ¸/SÛ.¸¦óZ$¤J.v’. */
+	$"6543 FC80 18DA 3C5D 395B 01DC D7E8 C21E"            /* eCü€.Ú<]9[.Ü×èÂ. */
+	$"A66C 9AE3 08D6 DBFC EE95 9E73 F71D 7CCA"            /* ¦lšã.ÖÛüî•žs÷.|Ê */
+	$"2A6A F6D2 11D9 AC28 BEDE 8E1B 65EF A995"            /* *jöÒ.Ù¬(¾ÞŽ.eï©• */
+	$"F7B5 B19D 5F63 F42B D0AD D69A BD47 1EED"            /* ÷µ±�_cô+Э֚½G.í */
+	$"2E5C 0276 3AEA F6D9 6E3F 314C 7F5F 52C3"            /* .\.v:êöÙn?1L._RÃ */
+	$"093D C8A9 23E4 C154 5587 294A 98A9 0643"            /* Æ=È©#äÁTU‡)J˜©.C */
+	$"AF18 0D20 51A4 6FE1 F326 11E7 5A91 2919"            /* ¯.. Q¤oáó&.çZ‘). */
+	$"DD53 B13B 2CB3 DE77 FAB9 420E BAFB 305B"            /* ÝS±;,³Þwú¹B.ºû0[ */
+	$"E9AB 7A2B 623B 78FE 346D 8BB6 BA40 AE40"            /* é«z+b;xþ4m‹¶º@®@ */
+	$"5B6D 6D53 81A1 076D 7058 E792 E410 3FA7"            /* [mmS�¡.mpXç’ä.?§ */
+	$"AD06 7E2E 5158 D129 9233 6E1D 6B7C C701"            /* ­.~.QXÑ)’3n.k|Ç. */
+	$"D61D 42D8 472F D5E2 2710 0B6C 828A 2352"            /* Ö.BØG/Õâ'..l‚Š#R */
+	$"D400 65FA E227 A938 1832 18CC 2BCE 19A8"            /* Ô.eúâ'©8.2.Ì+Î.¨ */
+	$"773C 3CB1 C6BD D722 8EE1 8AE2 4D4B 97D4"            /* w<<±Æ½×"ŽáŠâMK—Ô */
+	$"1763 37E4 2F93 8578 534E 0BA9 B493 3B80"            /* .c7ä/“…xSN.©´“;€ */
+	$"F018 28BE 2A52 15B2 8499 08A8 005F F028"            /* ð.(¾*R.²„™.¨._ð( */
+	$"ADFD ACEB 238F 922A 75E4 1C65 F2C3 F14B"            /* ­ý¬ë#�’*uä.eòÃñK */
+	$"213D 7263 4A9A 1C80 12BD 5895 0EC8 B955"            /* !=rcJš.€.½X•.ȹU */
+	$"8CD0 FB81 63CF FF7F B545 85DF E201 36A9"            /* ŒÐû�cÏÿ.µE…ßâ.6© */
+	$"E524 1BD6 EDDA 7C33 8CD2 E114 BA93 51E0"            /* å$.ÖíÚ|3ŒÒá.º“Qà */
+	$"A113 A12A FBEA 8570 B5FE E1B6 7963 5B31"            /* ¡.¡*ûê…pµþá¶yc[1 */
+	$"512A 99B1 3A59 E50E C584 DD7F FF7F FF7E"            /* Q*™±:Yå.Å„Ý.ÿ.ÿ~ */
+	$"D3C9 019B 1FBC DB70 2C2A 14A6 E7F1 0147"            /* ÓÉ.›.¼Ûp,*.¦çñ.G */
+	$"5F3A A36C 6F8A 9038 ABD8 EB8F FF7F FE79"            /* _:£loŠ�8«Øë�ÿ.þy */
+	$"6C12 2D6F FD6D F9A0 0392 0E82 0296 3C14"            /* l.-oýmù .’.‚.–<. */
+	$"FEFA 803C A3D4 1049 CF30 E22F 6542 7ABF"            /* þú€<£Ô.IÏ0â/eBz¿ */
+	$"378E 66B2 9091 D396 B953 DCF5 66D3 C5B5"            /* 7Žf²�‘Ó–¹SÜõfÓŵ */
+	$"7719 028C 5C0F F898 00A1 0C1D E181 F9C7"            /* w..Œ\.ø˜.¡..á�ùÇ */
+	$"2E46 06D4 D623 1256 EFAE 89E3 4FFF 7FDD"            /* .F.ÔÖ#.VﮉãOÿ.Ý */
+	$"F00D 4E11 65D5 B8F9 7C0B A045 AC4A 1E42"            /* ð.N.eÕ¸ù|. E¬J.B */
+	$"221C B512 5480 EF2D CB80 A089 3603 2CA1"            /* ".µ.T€ï-Ë€ ‰6.,¡ */
+	$"391C 7925 C817 92E3 8438 C438 08D1 0637"            /* 9.y%È.’ã„8Ä8.Ñ.7 */
+	$"9FCD F4C2 C04C 40BB A484 5043 0C1E 7C85"            /* ŸÍôÂÀL@»¤„PC..|… */
+	$"D7F6 1F6D BFC7 60AA 4D18 A399 9A13 CCD0"            /* ×ö.m¿Ç`ªM.£™š.ÌÐ */
+	$"26DA 3F97 24CB E902 0668 67F7 FE63 7A2E"            /* &Ú?—$Ëé..hg÷þcz. */
+	$"16D6 987F FF7F AFC1 5C35 E63D BA36 6227"            /* .Ö˜.ÿ.¯Á\5æ=º6b' */
+	$"FF7C FD39 8B8B 1A5F 6026 831B 0764 8805"            /* ÿ|ý9‹‹._`&ƒ..dˆ. */
+	$"E40B 0F19 7FFF 7FFC DEBC DD5B 9008 0000"            /* ä....ÿ.üÞ¼Ý[�... */
+	$"0C24 1D44 4641 3BC8 4248 E229 62D2 088D"            /* .$.DFA;ÈBHâ)bÒ.� */
+	$"117F DE8D 0B52 C3FD 1DD9 3823 F138 4C98"            /* ..Þ�.RÃý.Ù8#ñ8L˜ */
+	$"58A8 2683 519C F914 4961 5226 891F F863"            /* X¨&ƒQœù.IaR&‰.øc */
+	$"3FF2 B19F 113D BFEF 9D12 30C6 66BD E2A6"            /* ?ò±Ÿ.=¿ï�.0Æf½â¦ */
+	$"5D8C BE7E BE19 3D8F 03F2 5D26 FF7F FF7E"            /* ]Œ¾~¾.=�.ò]&ÿ.ÿ~ */
+	$"A82B 5E03 E7A8 E8F1 8C4D B6F1 F0E2 FC36"            /* ¨+^.ç¨èñŒM¶ñðâü6 */
+	$"DE7A 2F55 38B1 B436 2E50 7D25 E3F0 82C8"            /* Þz/U8±´6.P}%ãð‚È */
+	$"580F 0D19 C280 415C 2A7F FCD9 C720 E649"            /* X...€A\*.üÙÇ æI */
+	$"4064 2624 04AC 0B71 41FD 3937 8359 4137"            /* @d&$.¬.qAý97ƒYA7 */
+	$"8CA9 B642 C318 BD37 82D3 B786 8217 3252"            /* Œ©¶BÃ.½7‚Ó·†‚.2R */
+	$"44EA 4598 57D2 2F66 957F 39FE D712 F449"            /* DêE˜WÒ/f•.9þ×.ôI */
+	$"213A BEBB B6CC F551 FF7F EB0A AE45 8497"            /* !:¾»¶ÌõQÿ.ë®E„— */
+	$"0F4C FD34 4090 01FE CFC8 51AA C32A 7D95"            /* .Lý4@�.þÏÈQªÃ*}• */
+	$"D414 2609 E22F 1B7D E10E 97BB 05D1 9D04"            /* Ô.&Æâ/.}á.—».Ñ�. */
+	$"0592 9271 0D39 AB59 F165 0D09 549C B4E3"            /* .’’q.9«Yñe.ÆTœ´ã */
+	$"AEE5 555F 00A3 5E0A E4D3 BAFE 1EC6 2FCE"            /* ®åU_.£^ÂäÓºþ.Æ/Î */
+	$"FB04 C9BC 71D8 A42D 2F70 9FE1 EC17 C31D"            /* û.ɼqؤ-/pŸáì.Ã. */
+	$"ECB2 0A82 EFB1 914C F6D2 E54C 5316 B6C4"            /* ì²Â‚ﱑLöÒåLS.¶Ä */
+	$"4FFF 653B FD6E 27A6 9959 244B F458 B35C"            /* Oÿe;ýn'¦™Y$KôX³\ */
+	$"865C EB94 2CD7 7343 B74C C211 8A4D 2A99"            /* †\ë”,×sC·LÂ.ŠM*™ */
+	$"732E 3B43 CEAC C300 A520 924D 6F1F 8295"            /* s.;CάÃ.¥ ’Mo.‚• */
+	$"DF36 1FD4 E8F0 9221 6313 1B33 0C98 2721"            /* ß6.Ôèð’!c..3.˜'! */
+	$"8F55 5BA1 0E46 A755 1D7F A914 458D 9FFF"            /* �U[¡.F§U..©.E�Ÿÿ */
+	$"33CF 4CE3 AFC6 3383 BC4D A7E9 F546 FDCB"            /* 3ÏLã¯Æ3ƒ¼M§éõFýË */
+	$"8276 7778 2BBA EF7C 3677 6251 58C0 9EFF"            /* ‚vwx+ºï|6wbQXÀžÿ */
+	$"526C C883 6CFF 7FFF 7D4C 3F9F BD74 6BE9"            /* Rlȃlÿ.ÿ}L?Ÿ½tké */
+	$"B6EB 9003 823B 235D 6AD9 B382 FC45 F10C"            /* ¶ë�.‚;#]jÙ³‚üEñ. */
+	$"8282 90ED 9D47 E949 FADC 7B04 1C1C 9EF1"            /* ‚‚�í�GéIúÜ{...žñ */
+	$"1ABB 270D 07BE 1943 4E14 70E0 48FF 81EE"            /* .»'..¾.CN.pàHÿ�î */
+	$"CE8A 5AAD 3CE9 090D 3126 F96A AEBA 5853"            /* ΊZ­<éÆ.1&ùj®ºXS */
+	$"D02E ADE8 4614 E2B7 2E7E 3DB6 DE6A 77A8"            /* Ð.­èF.â·.~=¶Þjw¨ */
+	$"48D0 2DBB BAF4 E94C 735D 27D6 87FF 7F80"            /* HÐ-»ºôéLs]'Ö‡ÿ.€ */
+	$"5BCC 3CA6 1168 D9E0 38B4 22B2 2154 02AA"            /* [Ì<¦.hÙà8´"²!T.ª */
+	$"A1FF 6D87 EB2B F3EB 3814 9F74 DEF3 4D86"            /* ¡ÿm‡ë+óë8.ŸtÞóM† */
+	$"ED68 7E75 9E81 1FD9 170B E013 7E4D 97B3"            /* íh~už�.Ù..à.~M—³ */
+	$"51B0 6B2A 42AF EEB4 899B D2A2 6AC9 8EBF"            /* Q°k*B¯î´‰›Ò¢jÉŽ¿ */
+	$"2858 9FFC 5050 3364 8F2D 313E 94A9 5ED5"            /* (XŸüPP3d�-1>”©^Õ */
+	$"6213 E9DD 6FF6 5813 72DA FE40 0F70 06C4"            /* b.éÝoöX.rÚþ@.p.Ä */
+	$"FF7D 053C 3E69 C976 DDFF 02D9 4688 D8D7"            /* ÿ}.<>iÉvÝÿ.ÙFˆØ× */
+	$"8DEF 5187 FCA3 40EE 3167 B6DD 7EE6 42AB"            /* �ïQ‡ü£@î1g¶Ý~æB« */
+	$"B07A DB20 DC1D 7016 631F 8FB0 C83A 9CC2"            /* °zÛ Ü.p.c.�°È:œÂ */
+	$"66B9 304B 74F5 03F7 217C D3E3 6000 ECE6"            /* f¹0Ktõ.÷!|Óã`.ìæ */
+	$"A319 FD9E 4131 7E74 59C6 FB3F 1B51 FE89"            /* £.ýžA1~tYÆû?.Qþ‰ */
+	$"52D3 C845 1BF0 4BFE 3BAE 4940 9830 8E9C"            /* RÓÈE.ðKþ;®I@˜0Žœ */
+	$"F843 F6A2 218E B2E2 8092 8E0E 3889 8137"            /* øCö¢!Ž²â€’Ž.8‰�7 */
+	$"583C 394F CCE6 3D1B 37B8 C9A4 D805 B9E4"            /* X<9OÌæ=.7¸É¤Ø.¹ä */
+	$"A037 E45D 1167 9627 81E0 538C 1B6D EA0E"            /*  7ä].g–'�àSŒ.mê. */
+	$"18CD 8E3C EE0C 5E0C B048 8DD2 C804 CA38"            /* .ÍŽ<î.^.°H�ÒÈ.Ê8 */
+	$"8678 CAA9 5EE1 8B6C E7D9 FDE1 5C14 D52A"            /* †xÊ©^á‹lçÙýá\.Õ* */
+	$"67F3 8A12 F698 857A 5692 1FB3 FF27 FE1B"            /* góŠ.ö˜…zV’.³ÿ'þ. */
+	$"7E31 5D25 B4A2 3647 FF07 064A 4D7B F160"            /* ~1]%´¢6Gÿ..JM{ñ` */
+	$"62D7 81CE 0940 AE5F CAEB F1A6 10C4 CB0E"            /* b×�ÎÆ@®_Êëñ¦.ÄË. */
+	$"3D77 2C40 0146 8C72 B765 F6A9 3047 E748"            /* =w,@.FŒr·eö©0GçH */
+	$"0239 A725 8B4C 56F0 7E86 9A24 53D7 4832"            /* .9§%‹LVð~†š$S×H2 */
+	$"7924 73CB 4431 4977 0487 03FC F1B3 A21C"            /* y$sËD1Iw.‡.üñ³¢. */
+	$"2792 0B05 8183 8348 8EC0 2635 47D9 B51D"            /* '’..�ƒƒHŽÀ&5GÙµ. */
+	$"CE40 1FA4 20C5 93A8 BEB4 B8CD 93D8 A79E"            /* Î@.¤ Å“¨¾´¸Í“اž */
+	$"62C5 846C 964D 0404 BE21 3AA5 9EC3 4450"            /* bÅ„l–M..¾!:¥žÃDP */
+	$"FAEE 938A A428 E4D0 7F1B 46A8 7AEC 97FB"            /* úî“Š¤(äÐ..F¨zì—û */
+	$"1AFF 71DA F26D B5B1 E6F2 66B4 865E 1F12"            /* .ÿqÚòmµ±æòf´†^.. */
+	$"CE0F 3A8A EDF1 6321 BC5A 22D5 D3D6 BE19"            /* Î.:Šíñc!¼Z"ÕÓÖ¾. */
+	$"671A 38C3 11E8 FC9D 93AC 895A 1B84 7C9B"            /* g.8Ã.èü�“¬‰Z.„|› */
+	$"979F 5DC5 BBE6 19A8 5D03 BE83 6FA4 B8F2"            /* —Ÿ]Å»æ.¨].¾ƒo¤¸ò */
+	$"AFCD 8115 B21B C1D5 80B4 5E20 3B19 9E48"            /* ¯Í�.².ÁÕ€´^ ;.žH */
+	$"29C0 68DA F799 EC0D 56B3 7049 5EC1 11CB"            /* )ÀhÚ÷™ì.V³pI^Á.Ë */
+	$"CBAF FA0A 5AF1 22F1 3A4C 6F13 635A C681"            /* ˯úÂZñ"ñ:Lo.cZÆ� */
+	$"06DA 8B44 A35B CF31 9B6F 57E6 AEC2 8D59"            /* .Ú‹D£[Ï1›oWæ®Â�Y */
+	$"1556 A43E A289 74DC C398 B209 31B9 8CD0"            /* .V¤>¢‰tÜزÆ1¹ŒÐ */
+	$"07BE D253 76AB 7D79 4F26 D099 7AE8 E52C"            /* .¾ÒSv«}yO&Йzèå, */
+	$"EA35 D7BB E968 CAA0 5F61 EAE5 E9A1 E903"            /* ê5×»éhÊ _aêåé¡é. */
+	$"100E ED2C 5A66 21E2 1426 BE74 7A19 8C98"            /* ..í,Zf!â.&¾tz.Œ˜ */
+	$"3D67 A4D2 370F C95D 7131 2D31 0971 6022"            /* =g¤Ò7.É]q1-1Æq`" */
+	$"F4F2 359E 1FBD D23A CD94 4467 205E F7B1"            /* ôò5ž.½Ò:Í”Dg ^÷± */
+	$"5D18 EE91 9078 176B ADC2 65EB EECF D1A8"            /* ].î‘�x.k­ÂeëîÏѨ */
+	$"F1B3 B999 E7CC 3079 BD9C 82D8 DF6E 29E0"            /* ñ³¹™çÌ0y½œ‚Øßn)à */
+	$"9502 EC8D 5C13 629B 109E A7C0 F438 6674"            /* •.ì�\.b›.ž§Àô8ft */
+	$"C48B E75A 7CAC 28AE 3E9C 0ECF 9ADF F7BF"            /* Ä‹çZ|¬(®>œ.Ïšß÷¿ */
+	$"C51A E20D 64F1 B1DD C986 0C6F 6BFF 5102"            /* Å.â.dñ±ÝɆ.okÿQ. */
+	$"B233 B826 EBC9 35E2 9799 0A0F E81D 0816"            /* ²3¸&ëÉ5â—™Â.è... */
+	$"E01C B1A8 E4D9 1CCF 7F2E 4DB3 371B 83C0"            /* à.±¨äÙ.Ï..M³7.ƒÀ */
+	$"9DFD A603 83D6 4412 7DCF 2E2F 85D8 8259"            /* �ý¦.ƒÖD.}Ï./…Ø‚Y */
+	$"DC97 798F 2E8A 09F5 C1A7 1E56 55F3 BFD0"            /* Ü—y�.ŠÆõÁ§.VUó¿Ð */
+	$"34CE 311A 98BE C87C 8CCE 6EDF C85C A788"            /* 4Î1.˜¾È|ŒÎnßÈ\§ˆ */
+	$"AA7E 47D5 72AF 1842 5C5F 9D6A C586 CA4C"            /* ª~GÕr¯.B\_�jņÊL */
+	$"34D3 6315 D6CA 0D6D 5B75 6C85 551B E270"            /* 4Óc.ÖÊ.m[ul…U.âp */
+	$"E9DD 6127 C363 1F5A 0AA4 8F55 114F 9ED3"            /* éÝa'Ãc.Z¤�U.OžÓ */
+	$"034E A968 1BF1 513A 2F0D 3E61 612A 15E6"            /* .N©h.ñQ:/.>aa*.æ */
+	$"B89F 1877 F38E 8C96 20C3 1952 A559 62AE"            /* ¸Ÿ.w󎌖 Ã.R¥Yb® */
+	$"20E0 BE7D BF7C FAA3 F56C FF75 6D5E 07E7"            /*  à¾}¿|ú£õlÿum^.ç */
+	$"EB87 E7E9 BFE7 EE37 E7EE B60B E7DA F7CF"            /* ë‡çé¿çî7çî¶.çÚ÷Ï */
+	$"A6FF 2B5C 2F9F AC00 ED1C BCF0 084D B6D5"            /* ¦ÿ+\/Ÿ¬.í.¼ð.M¶Õ */
+	$"A3F8 3A1B 179B 5659 AE02 A536 8D65 B1A0"            /* £ø:..›VY®.¥6�e±  */
+	$"F806 81C6 9453 B9E5 1E84 EF36 3D8C 9922"            /* ø.�Æ”S¹å.„ï6=Œ™" */
+	$"A841 EBC7 584D 175D A8CF 5AE5 52F4 364A"            /* ¨AëÇXM.]¨ÏZåRô6J */
+	$"CACB F4FA 59D1 6C18 1FE0 5F96 0F70 465A"            /* ÊËôúYÑl..à_–.pFZ */
+	$"7CFD 0C37 59FF 6248 10C6 4872 8573 D54E"            /* |ý.7YÿbH.ÆHr…sÕN */
+	$"7839 337E D900 4336 CF58 B59C BCC4 602F"            /* x93~Ù.C6ÏXµœ¼Ä`/ */
+	$"EA1A 205F CD8D 635B AE0D 5750 3316 72C7"            /* ê. _Í�c[®.WP3.rÇ */
+	$"A765 C2F2 CF8C 52FB 1892 F55E B7A5 6D85"            /* §eÂòÏŒRû.’õ^·¥m… */
+	$"5782 FAB6 FBB5 CDF3 2DC2 0256 2927 4F4F"            /* W‚ú¶ûµÍó-Â.V)'OO */
+	$"1F92 5F99 B540 87DD 7A80 991B 0677 AB00"            /* .’_™µ@‡Ýz€™..w«. */
+	$"2D82 C5F6 11F7 F21B 2652 B798 75D5 42A6"            /* -‚Åö.÷ò.&R·˜uÕB¦ */
+	$"7757 E0E7 3C3F DBA5 6106 9F44 1800 E044"            /* wWàç<?Û¥a.ŸD..àD */
+	$"5844 8C9D 83C0 C5D3 6B95 CE2A 3EBC D7FD"            /* XDŒ�ƒÀÅÓk•Î*>¼×ý */
+	$"B79B E645 6FD3 A5EE ECE2 C9A7 53C7 B2E3"            /* ·›æEoÓ¥îìâɧSDzã */
+	$"C659 D5C5 0FBD 7C88 93C3 D3D9 D81F 0AEB"            /* ÆYÕÅ.½|ˆ“ÃÓÙØ.Âë */
+	$"5784 8BF9 DAD7 993D 0C8B 9873 08A4 254B"            /* W„‹ùÚ×™=.‹˜s.¤%K */
+	$"2452 F95D 29CA 8B3E D48D 18FB C813 4ECB"            /* $Rù])Ê‹>Ô�.ûÈ.NË */
+	$"D118 E3FA 926C 7A5F E5CC F774 D1DB B5C1"            /* Ñ.ãú’lz_åÌ÷tÑÛµÁ */
+	$"579A 2647 619A 67A0 423D 6C64 B3A6 9357"            /* Wš&Gašg B=ld³¦“W */
+	$"B8C6 8FBE A3AC E380 E548 5ED3 D83D 7DB9"            /* ¸Æ�¾£¬ã€åH^ÓØ=}¹ */
+	$"93E8 9071 F6E0 168F 6BEC F674 6D08 F4DA"            /* “è�qöà.�kìötm.ôÚ */
+	$"C1F7 11FD DEF8 2420 30DA 71E2 C605 81EB"            /* Á÷.ýÞø$ 0ÚqâÆ.�ë */
+	$"565B D461 AF6E 3127 34AC BA64 C660 14E1"            /* V[Ôa¯n1'4¬ºdÆ`.á */
+	$"F6AB DA92 386B 3E7B BD42 90E9 ABA2 6EE7"            /* ö«Ú’8k>{½B�é«¢nç */
+	$"8D0D 373C D280 46EC 6746 310C EA41 862B"            /* �.7<Ò€FìgF1.êA†+ */
+	$"6D1B 7BE9 93AF 17F6 1D3A E7AB CA55 8A4B"            /* m.{铯.ö.:ç«ÊUŠK */
+	$"E867 6EF3 29DF FF5F B839 75E1 FA04 DD81"            /* ègnó)ßÿ_¸9uáú.Ý� */
+	$"B6C9 DA44 D268 3B1A FF63 60F5 37A5 DDCB"            /* ¶ÉÚDÒh;.ÿc`õ7¥ÝË */
+	$"1AB3 5275 7692 7F15 F8E8 6A96 CEB4 D9E5"            /* .³Ruv’..øèj–δÙå */
+	$"3E5A 0E16 B1D0 B056 D0D2 0360 0900 5773"            /* >Z..±Ð°VÐÒ.`Æ.Ws */
+	$"BB3F C215 FD55 C9BF E3FC 48A1 CFAB BD39"            /* »?Â.ýUÉ¿ãüH¡Ï«½9 */
+	$"CD3D 906E 21CB C3DD E4D3 548C 4731 E777"            /* Í=�n!ËÃÝäÓTŒG1çw */
+	$"EE15 C0DE CEBC 0F2F 85A6 9822 F1FF 7B2F"            /* î.ÀÞμ./…¦˜"ñÿ{/ */
+	$"2530 48C7 0C39 3659 CD03 06C5 7C8E 3D49"            /* %0HÇ.96YÍ..Å|Ž=I */
+	$"FED5 7B72 4652 772C 39C7 8F1B 63E8 2DC1"            /* þÕ{rFRw,9Ç�.cè-Á */
+	$"1242 CA35 E396 6103 15DF D939 0597 B8D4"            /* .BÊ5ã–a..ßÙ9.—¸Ô */
+	$"8858 ACE3 3C32 6EE5 69A3 8512 3447 2B3B"            /* ˆX¬ã<2nåi£….4G+; */
+	$"0647 8C1F 2D31 4E57 0D03 BE26 5235 5275"            /* .GŒ.-1NW..¾&R5Ru */
+	$"74E8 B8F6 CF32 E077 8C51 41DB ED67 EE30"            /* tè¸öÏ2àwŒQAÛígî0 */
+	$"AD97 7956 D279 B0A8 768D 00E3 F604 A240"            /* ­—yVÒy°¨v�.ãö.¢@ */
+	$"9656 5BCD B309 D0CD 3ECE C477 31EC F88D"            /* –V[ͳÆÐÍ>ÎÄw1ìø� */
+	$"782F 8B9E 37FA A741 C636 7B55 D047 64A4"            /* x/‹ž7ú§AÆ6{UÐGd¤ */
+	$"E2EC C69D F609 F38F 821E 8D20 8709 87FF"            /* âìÆ�öÆó�‚.� ‡Æ‡ÿ */
+	$"3C3A B1ED C420 1F0B 52E3 8999 C684 30F3"            /* <:±íÄ ..R㉙Ƅ0ó */
+	$"C4ED 7FA9 3A2C D0E7 AE48 1AC2 7196 9347"            /* Äí.©:,Ðç®H.Âq–“G */
+	$"6BC9 BEE1 4112 4209 93CA 307A 7FF7 8B12"            /* kɾáA.BÆ“Ê0z.÷‹. */
+	$"EE76 8890 A529 33CC F435 A84F 9414 A719"            /* îvˆ�¥)3Ìô5¨O”.§. */
+	$"BFB2 6305 201F 372D 567F 30DF 2E47 D0B9"            /* ¿²c. .7-V.0ß.Gй */
+	$"C68F 5126 7EAA D95A 12D0 DA8A 8CF4 8A2A"            /* Æ�Q&~ªÙZ.ÐÚŠŒôŠ* */
+	$"CBAE 0509 B614 A9E1 2CA2 D0E0 F017 E395"            /* Ë®.ƶ.©á,¢Ðàð.ã• */
+	$"AF82 85B5 4509 E75C 8E4D 5465 7DF2 CF39"            /* ¯‚…µEÆç\ŽMTe}òÏ9 */
+	$"ACFB DD5B C683 62C0 0B1C B7B9 EAEC 049C"            /* ¬ûÝ[ƃbÀ..·¹êì.œ */
+	$"8045 0178 6757 E317 872D ABC2 B077 6EF6"            /* €E.xgWã.‡-«Â°wnö */
+	$"3612 4132 3DD7 D39B B49A 04A8 207D 6135"            /* 6.A2=×Ó›´š.¨ }a5 */
+	$"C64F 3A0F 5028 7B6B 953E 8F19 920A 718F"            /* ÆO:.P({k•>�.’Âq� */
+	$"08E9 A079 EC51 A08F 4A77 5130 C807 9BC2"            /* .é yìQ �JwQ0È.›Â */
+	$"B37B 4C7B 9BAA 40F3 4E94 BE51 C027 32B5"            /* ³{L{›ª@óN”¾QÀ'2µ */
+	$"751F 4793 7271 226E 82F3 CF14 8BC3 F927"            /* u.G“rq"n‚óÏ.‹Ãù' */
+	$"4C81 7F29 AB70 8B3B E948 86D6 569F FEC2"            /* L�.)«p‹;éH†ÖVŸþÂ */
+	$"BF6C 92F9 1011 3BE3 9E91 6458 1634 34A3"            /* ¿l’ù..;ãž‘dX.44£ */
+	$"3042 520F 5D64 6429 32CE 04FD 1B98 0698"            /* 0BR.]dd)2Î.ý.˜.˜ */
+	$"3A36 655C 86C7 C272 4B02 E259 0537 4DB8"            /* :6e\†ÇÂrK.âY.7M¸ */
+	$"C6C2 6980 ECFB 0FC1 C6D9 0A2C D00F 282A"            /* ÆÂi€ìû.ÁÆÙÂ,Ð.(* */
+	$"7A0B D91F 08CA 762C A629 048E 9BCC CFD2"            /* z.Ù..Êv,¦).Ž›ÌÏÒ */
+	$"1EBC 8F60 2F64 F24D F1FB 81C6 8AEC CFDB"            /* .¼�`/dòMñû�ÆŠìÏÛ */
+	$"623A 01A9 35D2 B5E1 B80A 2D32 084E 3857"            /* b:.©5Òµá¸Â-2.N8W */
+	$"C025 BCDA 4728 F3AD 35AD 9AAA E054 21B7"            /* À%¼ÚG(ó­5­šªàT!· */
+	$"A47E 62C5 9921 02C0 09E3 440D 063A 3789"            /* ¤~bÅ™!.ÀÆãD..:7‰ */
+	$"5072 E54A 4654 E148 AC2E 4A99 C6A5 3923"            /* PråJFTáH¬.J™Æ¥9# */
+	$"49B5 6906 6531 FD5E 7CCE 1C4B EEDE 7482"            /* Iµi.e1ý^|Î.KîÞt‚ */
+	$"9E3F 73AE C777 0214 C921 3131 C5CB 9F61"            /* ž?s®Çw..É!11ÅËŸa */
+	$"64A4 4E70 57C2 5C04 E25B 266E 6887 7477"            /* d¤NpWÂ\.â[&nh‡tw */
+	$"FCCB 1F0C 89F2 6CF6 713E 4D08 8AC8 9B0C"            /* üË..‰òlöq>M.ŠÈ›. */
+	$"00AC D9D7 A28A C219 B52B B46A D704 F919"            /* .¬Ù×¢ŠÂ.µ+´j×.ù. */
+	$"2050 6CCA 215A 299B 9129 9739 DA6F 3A67"            /*  PlÊ!Z)›‘)—9Úo:g */
+	$"FE12 2BF1 4F8B 26ED D21F F727 5B59 22F3"            /* þ.+ñO‹&íÒ.÷'[Y"ó */
+	$"2E05 F4A0 9754 F431 9AED 1B65 038C CD7F"            /* ..ô —Tô1ší.e.ŒÍ. */
+	$"8254 E3AE 035C 18D7 0E28 6300 0DF0 998D"            /* ‚Tã®.\.×.(c..ð™� */
+	$"0191 85AF C71B B3CF F0D6 3A8F B1AA 5E99"            /* .‘…¯Ç.³ÏðÖ:�±ª^™ */
+	$"BAB8 7C7F 0214 F864 4744 E747 7248 3C94"            /* º¸|...ødGDçGrH<” */
+	$"3AC8 CE04 1019 11ED 4BCC 76E9 FE4E 5728"            /* :ÈÎ....íKÌvéþNW( */
+	$"5BB0 986C D763 A3C7 AF8A 14E9 D24A AD17"            /* [°˜l×c£Ç¯Š.éÒJ­. */
+	$"FF66 611F B77C 0830 9093 A560 06FA E9CF"            /* ÿfa.·|.0�“¥`.úéÏ */
+	$"054B 5846 1681 5DBF 34F9 49A9 45E0 8F20"            /* .KXF.�]¿4ùI©Eà�  */
+	$"7FFD 6264 2193 031D A60F A111 B0B7 CFEE"            /* .ýbd!“..¦.¡.°·Ïî */
+	$"DE49 EC80 C0F1 D7F6 A495 900B 4126 40BE"            /* ÞIì€Àñ×ö¤•�.A&@¾ */
+	$"185B DFFE C7B0 12AC C143 AA85 70E5 81EF"            /* .[ßþÇ°.¬ÁCª…på�ï */
+	$"79CE 1662 08E4 203F 1706 40FB CC39 CA8F"            /* yÎ.b.ä ?..@ûÌ9Ê� */
+	$"8002 1CFA 3BCC 6B79 5C83 A4D2 7147 E38F"            /* €..ú;Ìky\ƒ¤ÒqGã� */
+	$"C93B F2E8 6A15 6D30 C314 E898 81E3 FF7B"            /* É;òèj.m0Ã.è˜�ãÿ{ */
+	$"5FC5 EE13 0449 1985 2CBC 73C7 C569 DCB1"            /* _Åî..I.…,¼sÇÅiܱ */
+	$"8024 F7CA CC7A FE3B CC15 4BCE 5B92 1BBB"            /* €$÷ÊÌzþ;Ì.KÎ[’.» */
+	$"0048 F291 579F FD20 F11A 1934 CC11 9C3F"            /* .Hò‘WŸý ñ..4Ì.œ? */
+	$"CE49 027A 9763 9E57 A2FF 7FFD 53E4 E50B"            /* ÎI.z—cžW¢ÿ.ýSäå. */
+	$"C747 02FF 7869 0537 1482 221E 0220 79D5"            /* ÇG.ÿxi.7.‚".. yÕ */
+	$"45B1 2E48 6A6C 8486 571F E1F1 BF39 0797"            /* E±.Hjl„†W.áñ¿9.— */
+	$"5D21 6964 EA9B 13F1 E6B7 C4B5 A2B7 E2BD"            /* ]!idê›.ñæ·Äµ¢·â½ */
+	$"09C2 B200 0000 0000 003E A392 6527 69B6"            /* Ʋ......>£’e'i¶ */
+	$"B189 8365 F55D 7A2B 0398 4196 BB60 D4F0"            /* ±‰ƒeõ]z+.˜A–»`Ôð */
+	$"06B6 100C 5B60 D76F 8FEE EFFB D525 0E2B"            /* .¶..[`×o�îïûÕ%.+ */
+	$"3535 B765 22E7 F77C CF5C 8907 7626 62C0"            /* 55·e"ç÷|Ï\‰.v&bÀ */
+	$"3B04 A170 EEA6 A399 F26B CD7E 92BC 9E13"            /* ;.¡p™òkÍ~’¼ž. */
+	$"9D2D 6907 B06F 6B9A 957D 3C57 DC9F 06E6"            /* �-i.°okš•}<WÜŸ.æ */
+	$"C3B6 16AD C91B E868 E000 1848 3BE4 5C3A"            /* ö.­É.èhà..H;ä\: */
+	$"1162 2272 401F 600B A973 281E 62B3 2654"            /* .b"r@.`.©s(.b³&T */
+	$"74B0 287C C53E A3DA 2A14 E38F 9FFE 3A8E"            /* t°(|Å>£Ú*.ã�Ÿþ:Ž */
+	$"0D69 7E9D 5B07 1396 ED52 69BC 3971 5630"            /* .i~�[..–íRi¼9qV0 */
+	$"7C63 8DA9 7A40 F364 CC6A FCAC DC7C 59DC"            /* |c�©z@ódÌjü¬Ü|YÜ */
+	$"278A 92E3 6FBF F936 7157 2583 232E E558"            /* 'Š’ão¿ù6qW%ƒ#.åX */
+	$"0000 C241 6B90 4DCB 6421 F85A B681 4812"            /* ..ÂAk�MËd!øZ¶�H. */
+	$"9165 5C06 0195 F213 DB9F 5E2F 4BDE A075"            /* ‘e\..•ò.ÛŸ^/KÞ u */
+	$"BD9A 741B 971B 3411 1F73 7FF8 D719 BA55"            /* ½št.—.4..s.ø×.ºU */
+	$"8048 404F FEEA FC74 AEB1 84FD 03F9 5D43"            /* €H@Oþêüt®±„ý.ù]C */
+	$"BE42 E61F FF7F F4CA BA56 9654 B757 FF60"            /* ¾Bæ.ÿ.ôʺV–T·Wÿ` */
+	$"CA39 3290 054C E785 0EA7 F04D AF3E B342"            /* Ê92�.Lç….§ðM¯>³B */
+	$"A80A 815D 3954 73F2 871A 51FF 7488 20CD"            /* ¨Â�]9Tsò‡.Qÿtˆ Í */
+	$"90F3 23B8 80FE C6BF 726C 5426 83F2 5400"            /* �ó#¸€þÆ¿rlT&ƒòT. */
+	$"0000 0000 0000 0000 BFA5 D802 777C F954"            /* ........¿¥Ø.w|ùT */
+	$"286B A586 76CF 26CE 72CA 6FE7 BD43 DB36"            /* (k¥†vÏ&ÎrÊoç½CÛ6 */
+	$"A826 870E 2EEF E2C4 2E22 E63C FF7F AF51"            /* ¨&‡..ïâÄ."æ<ÿ.¯Q */
+	$"40C1 B727 22F3 9ACC 894D 0C49 EC7A D998"            /* @Á·'"óšÌ‰M.IìzÙ˜ */
+	$"64A9 DD22 2545 B85C D621 0609 B73A 9D9F"            /* d©Ý"%E¸\Ö!.Æ·:�Ÿ */
+	$"FF7F FF7F C0F7 00E1 B069 1D76 3BA1 E98C"            /* ÿ.ÿ.À÷.á°i.v;¡éŒ */
+	$"5F1B 1E11 B6F6 EB6D 6316 9DBC D1B2 DC90"            /* _...¶öëmc.�¼Ñ²Ü� */
+	$"5E1D 5EE0 3C65 57D0 B69C 3782 D1BE 3A77"            /* ^.^à<eWжœ7‚Ѿ:w */
+	$"436E 462B 45B7 FF61 4FA4 A45B 8C34 39D8"            /* CnF+E·ÿaO¤¤[Œ49Ø */
+	$"1B35 B876 A5F1 F2AD 3F78 D289 1C2E E3B4"            /* .5¸v¥ñò­?xÒ‰..ã´ */
+	$"A28B 64FA 1E2C 0CCD 0B1C AD42 8866 DDD6"            /* ¢‹dú.,.Í..­BˆfÝÖ */
+	$"62F0 225B 8DF7 32B3 FC3C 79E9 000B 1CA9"            /* bð"[�÷2³ü<yé...© */
+	$"2C82 4874 34AB B158 47CD FA9F EBC8 0923"            /* ,‚Ht4«±XGÍúŸëÈÆ# */
+	$"B291 7229 8C3F E7FD 193C 330B A3B4 6969"            /* ²‘r)Œ?çý.<3.£´ii */
+	$"FCF6 E1BA 4C4A E64C B1BC 5BAF F402 C828"            /* üöáºLJæL±¼[¯ô.È( */
+	$"3A51 CC67 A851 E207 5A7C 3733 1031 FD5C"            /* :QÌg¨Qâ.Z|73.1ý\ */
+	$"E4D3 B69F FF67 2C6D 3FC7 D5B4 E63F 55B9"            /* äÓ¶Ÿÿg,m?ÇÕ´æ?U¹ */
+	$"FD5F 3DB1 4589 6ADF 54F0 F42A 498F 61C8"            /* ý_=±E‰jßTðô*I�aÈ */
+	$"4872 5CD7 F70D 9C80 8880 EB9A 1FE7 C715"            /* Hr\×÷.œ€ˆ€ëš.çÇ. */
+	$"E57A 280F 96CF 014C 0411 EF44 C4F2 C64F"            /* åz(.–Ï.L..ïDÄòÆO */
+	$"F91B A9D6 EB9E F615 096F E5C0 5B30 BB79"            /* ù.©Öëžö.ÆoåÀ[0»y */
+	$"D645 BF4F B70A 2C40 3D24 A4C4 5A01 F3DB"            /* ÖE¿O·Â,@=$¤ÄZ.óÛ */
+	$"8879 D458 F558 4C8E 3C87 E83C 9C30 F0C3"            /* ˆyÔXõXLŽ<‡è<œ0ðà */
+	$"F7EB BE6A 2B3B B9CB 4F2E 3B49 CA98 6025"            /* ÷ë¾j+;¹ËO.;Iʘ`% */
+	$"D6C7 6B39 ED18 A784 5410 F9CD 4FB5 9E32"            /* ÖÇk9í.§„T.ùÍOµž2 */
+	$"EABF F72F 6ECC 217F E295 4BDA F0C8 2678"            /* ê¿÷/nÌ!.â•KÚðÈ&x */
+	$"B0F7 3381 2299 1033 5300 BB1C E72F 1EE0"            /* °÷3�"™.3S.».ç/.à */
+	$"75D6 68D0 8C87 A574 580B 4AD8 7BC8 E1C4"            /* uÖhÐŒ‡¥tX.JØ{ÈáÄ */
+	$"64D3 76AA A080 1E28 FD04 890B B9A1 7E5C"            /* dÓvª €.(ý.‰.¹¡~\ */
+	$"79E2 31B9 1C3E DBAE 8BC6 DB23 53A4 0F06"            /* yâ1¹.>Û®‹ÆÛ#S¤.. */
+	$"74AA 7920 6233 E3BF B281 AFAA 957D FDFB"            /* tªy b3㿲�¯ª•}ýû */
+	$"216A 3ECE 3139 37DF 8885 620B 5D55 D0FD"            /* !j>Î197߈…b.]UÐý */
+	$"F796 6A70 CEFD 33D8 B369 178E 99C0 9FFF"            /* ÷–jpÎý3سi.Ž™ÀŸÿ */
+	$"7FD2 27D4 D615 4840 B836 A0B5 1D6F 2A5A"            /* .Ò'ÔÖ.H@¸6 µ.o*Z */
+	$"1338 2369 83A0 D409 0FA7 77EF 19B9 21E6"            /* .8#iƒ ÔÆ.§wï.¹!æ */
+	$"3E21 0CB0 D4D3 362A EA6F 6340 8D73 27FB"            /* >!.°ÔÓ6*êoc@�s'û */
+	$"C3EF 7823 33DF 7A8C 5C69 20C4 5816 72E4"            /* Ãïx#3ßzŒ\i ÄX.rä */
+	$"712C 3345 6755 76F3 FEAF 494B D0B4 3C8F"            /* q,3EgUvóþ¯IKд<� */
+	$"B83F A050 C3E9 4CA2 6A6E 7AD0 D7FF 5860"            /* ¸? PÃéL¢jnzÐ×ÿX` */
+	$"548E 54E7 C3B9 6DDF 462C 54BE 5EF9 1A41"            /* TŽTçùmßF,T¾^ù.A */
+	$"6A46 A4FB 1C36 1CA4 77EC 2899 F147 3422"            /* jF¤û.6.¤wì(™ñG4" */
+	$"843C 7FAE 123E 6894 9B7F 3125 EB0F 3129"            /* „<.®.>h”›.1%ë.1) */
+	$"9DC1 8469 CE90 BB6E 4F2C 385A 0FD1 9AC7"            /* �Á„iÎ�»nO,8Z.ÑšÇ */
+	$"3318 3BF0 B1AA A51A 9022 A143 29FF 7FC1"            /* 3.;𱪥.�"¡C)ÿ.Á */
+	$"0F0F 6570 67C4 7FA7 9906 DE4E 5439 A278"            /* ..epgÄ.§™.ÞNT9¢x */
+	$"34E1 3D57 BB0E 086E 4C71 4406 DA9D CA56"            /* 4á=W»..nLqD.Ú�ÊV */
+	$"3EFD D077 5DA5 CD7D C244 9128 F408 1F03"            /* >ýÐw]¥Í}ÂD‘(ô... */
+	$"0C8F FF4B 9274 2EC6 E208 13C5 EE1B 3CEA"            /* .�ÿK’t.Æâ..Åî.<ê */
+	$"C5C0 06F5 0FA1 11FF 7FE3 A446 32E6 F4DA"            /* ÅÀ.õ.¡.ÿ.ã¤F2æôÚ */
+	$"23EC 5108 3AE0 CD16 AFFF 3965 8196 56E2"            /* #ìQ.:àÍ.¯ÿ9e�–Vâ */
+	$"2881 4EB9 CA14 5C4A 8091 B176 8823 BF09"            /* (�N¹Ê.\J€‘±vˆ#¿Æ */
+	$"CED5 0D88 E6BB DD95 1B72 36E8 809C D432"            /* ÎÕ.ˆæ»Ý•.r6耜Ô2 */
+	$"872D C08C 7DCB B30E 548B AE16 0D85 6B49"            /* ‡-ÀŒ}˳.T‹®..…kI */
+	$"9B28 D491 ECD6 F598 691A 0891 135A 63A0"            /* ›(Ô‘ìÖõ˜i..‘.Zc  */
+	$"593C 1FFD 8A54 4FB9 F2AB 20FC 5CF3 1B88"            /* Y<.ýŠTO¹ò« ü\ó.ˆ */
+	$"EE7E 8355 45D6 87C8 28CE 7B33 92A2 D8D6"            /* î~ƒUEÖ‡È(Î{3’¢ØÖ */
+	$"E8DF EF94 500A 0D78 DE9F 8657 F7BD 7F40"            /* èßï”PÂ.xÞŸ†W÷½.@ */
+	$"5E07 0789 EDC7 F3A5 A0BF 3929 6B19 A460"            /* ^..‰íÇó¥ ¿9)k.¤` */
+	$"7A50 91FF 42EA 5F12 DFA5 E0A0 84CC E869"            /* zP‘ÿBê_.ߥࠄÌèi */
+	$"BB1F 6EDA 2238 5DB0 7F22 3521 F04B FF6B"            /* ».nÚ"8]°."5!ðKÿk */
+	$"6827 722A DD5F 3C9D D3F4 2BE3 614D 0A3F"            /* h'r*Ý_<�Óô+ãaMÂ? */
+	$"62C4 E6AC 95CA 5946 37E8 BC76 97FD 5167"            /* bÄ欕ÊYF7è¼v—ýQg */
+	$"C970 D4C7 0655 C470 5913 DBBD AA8C 87A4"            /* ÉpÔÇ.UÄpY.Û½ªŒ‡¤ */
+	$"3C63 0B7F 54CD 391E 574D F2D5 C728 20B7"            /* <c..TÍ9.WMòÕÇ( · */
+	$"9955 DAC8 72A5 DBBB F7ED 4C9F 6FFE 3A4E"            /* ™UÚÈr¥Û»÷íLŸoþ:N */
+	$"E165 1831 C0E5 8285 96C2 3959 1BE7 E884"            /* áe.1Àå‚…–Â9Y.çè„ */
+	$"E568 89C1 FD03 D443 F6D1 A7C9 4CFE F7B9"            /* åh‰Áý.ÔCöѧÉLþ÷¹ */
+	$"A0BA 5040 19D5 965F 0EB5 E503 4B32 E6C8"            /*  ºP@.Õ–_.µå.K2æÈ */
+	$"B9C1 DEBB B8B7 47DC A850 AF44 D3B7 F562"            /* ¹ÁÞ»¸·GܨP¯DÓ·õb */
+	$"4210 4DFF 42A0 3D9A 7C63 8124 22A9 B258"            /* B.MÿB =š|c�$"©²X */
+	$"2256 6243 3077 FF57 7389 3FB6 A096 0EAB"            /* "VbC0wÿWs‰?¶ –.« */
+	$"DD33 EF25 C4B0 7338 F6D7 8730 FF2E DD0A"            /* Ý3ï%Ä°s8öׇ0ÿ.Ý */
+	$"BBDA 7A6E EFE8 58EE D64B A09E 2B00 EC04"            /* »ÚznïèXîÖK ž+.ì. */
+	$"09C9 A9F4 82A0 3132 4829 65CA E93B B827"            /* ÆÉ©ô‚ 12H)eÊé;¸' */
+	$"E81F B387 132B 5D15 E526 6FEC 2CB1 407F"            /* è.³‡.+].å&oì,±@. */
+	$"8485 FF32 4933 D357 FC45 0E44 EE66 D960"            /* „…ÿ2I3ÓWüE.DîfÙ` */
+	$"5AA3 A13A FC0B D8E2 622E 0BEE 714F 2672"            /* Z£¡:ü.Øâb..îqO&r */
+	$"3850 26C4 E626 F9BA 418C BC8A 7481 C6BE"            /* 8P&Äæ&ùºAŒ¼Št�ƾ */
+	$"BFA6 0D72 0603 3452 46C0 9FDB BE63 34D9"            /* ¿¦.r..4RFÀŸÛ¾c4Ù */
+	$"9599 7519 804B F1CE 0FC8 7572 F58E EB32"            /* •™u.€KñÎ.ÈurõŽë2 */
+	$"3501 CBB0 C05B 5643 485A 0012 64C2 8022"            /* 5.Ë°À[VCHZ..d€" */
+	$"BD39 EB39 2B57 0AA3 3931 93D4 885E CDF2"            /* ½9ë9+W£91“Ôˆ^Íò */
+	$"818D 7734 36C2 BEE1 4F55 116C 47A9 DC40"            /* ��w46¾áOU.lG©Ü@ */
+	$"A8A8 4532 7C33 9D7E 070A BA9E 36F7 2445"            /* ¨¨E2|3�~.ºž6÷$E */
+	$"074C 181A 07B2 C470 FA15 8CCB C069 AD0F"            /* .L...²Äpú.ŒËÀi­. */
+	$"9DD2 8B21 6F22 7300 34B4 4378 25AB D9D2"            /* �Ò‹!o"s.4´Cx%«ÙÒ */
+	$"1D9B B7F7 2F9C C3B1 926F DE61 4463 90BD"            /* .›·÷/œÃ±’oÞaDc�½ */
+	$"BC76 27E7 A5B5 826F 908E 31BA 048F 97C1"            /* ¼v'祵‚o�Ž1º.�—Á */
+	$"1884 67A9 C4BA 4B2B 4A58 D0EE 0269 6832"            /* .„g©ÄºK+JXÐî.ih2 */
+	$"E8C6 03AA D2A2 D034 27AA D49E 9C01 069A"            /* èÆ.ªÒ¢Ð4'ªÔžœ..š */
+	$"1BDC C40B 3BA7 5F8D 0468 152D E505 7EC0"            /* .ÜÄ.;§_�.h.-å.~À */
+	$"6BBF C4F4 2F45 99CB 1872 C713 FA0D 055F"            /* k¿Äô/E™Ë.rÇ.ú.._ */
+	$"551D 6E4D 5794 CC71 BAB5 C560 4D20 9464"            /* U.nMW”ÌqºµÅ`M ”d */
+	$"9F8C 94BA 1C96 0987 1AB4 61BB BA86 751B"            /* ŸŒ”º.–Ƈ.´a»º†u. */
+	$"9B79 D06A 7A3D A663 FB31 8B86 E588 5D15"            /* ›yÐjz=¦cû1‹†åˆ]. */
+	$"4A09 8B2B 81FC AE85 0D5A 1D8C A5B7 6DD9"            /* JÆ‹+�ü®….Z.Œ¥·mÙ */
+	$"02F5 50CE 7017 1BDD 3D3D 86CB 250B 491B"            /* .õPÎp..Ý==†Ë%.I. */
+	$"AA1F 2D21 A416 E8E7 9A53 4299 8CDE CD59"            /* ª.-!¤.èçšSB™ŒÞÍY */
+	$"C678 B559 D85C C580 6795 AD5F F578 C9EE"            /* ÆxµYØ\Å€g•­_õxÉî */
+	$"73B2 8F4B 6EEA 6F07 F785 C1B3 374B E51F"            /* s²�Knêo.÷…Á³7Kå. */
+	$"46DC 728C 05A4 6932 792A DB50 4E9A FD82"            /* FÜrŒ.¤i2y*ÛPNšý‚ */
+	$"A8A2 5EB8 024D C558 D6BC 350C 97B0 B2E8"            /* ¨¢^¸.MÅXÖ¼5.—°²è */
+	$"8F42 92FD 604D 6FB7 74B6 6EBE 97F6 CE03"            /* �B’ý`Mo·t¶n¾—öÎ. */
+	$"0DFA C340 31C3 4C5E 0041 088B E097 383B"            /* .úÃ@1ÃL^.A.‹à—8; */
+	$"A236 97CC 8D2B 6F6D 0E58 4E56 1D49 32EC"            /* ¢6—Ì�+om.XNV.I2ì */
+	$"626C C303 42BB D30B B8DE 5868 3C2F E39B"            /* blÃ.B»Ó.¸ÞXh</ã› */
+	$"A07A 236D 0F21 C0DD 1A0A 933A 7710 6605"            /*  z#m.!ÀÝ.“:w.f. */
+	$"343E 8D1A 9384 4F16 C01E 5AF7 DF53 0B38"            /* 4>�.“„O.À.Z÷ßS.8 */
+	$"3615 80D7 428E 90F6 4620 02EA 4590 DF22"            /* 6.€×BŽ�öF .êE�ß" */
+	$"4B70 2FB2 CADA A529 F7FA E7C6 BC99 DFCD"            /* Kp/²ÊÚ¥)÷úçƼ™ßÍ */
+	$"5EE7 D677 B5BE F819 6A55 6070 E1A9 DF53"            /* ^çÖwµ¾ø.jU`pá©ßS */
+	$"3F82 0229 B6B7 D247 1967 8313 056F 9D27"            /* ?‚.)¶·ÒG.gƒ..o�' */
+	$"753E E4DD EB7F 1372 C0F7 D72E 349B 2F9B"            /* u>äÝë..rÀ÷×.4›/› */
+	$"686C C9AF 0896 0865 7A3A 5A9D 807F 292A"            /* hlɯ.–.ez:Z�€.)* */
+	$"8DDA A776 4B3C 0993 532D D682 A41B 9DC2"            /* �Ú§vK<Æ“S-Ö‚¤.� */
+	$"5113 9D60 934B 2055 D671 C6C4 1252 3CEF"            /* Q.�`“K UÖqÆÄ.R<ï */
+	$"C72F AC19 4BED 185D BC60 5957 F81B 8278"            /* Ç/¬.Kí.]¼`YWø.‚x */
+	$"20B5 9173 4A1B FDC9 295D 54B7 8AFE 6938"            /*  µ‘sJ.ýÉ)]T·Šþi8 */
+	$"FE49 BA78 3225 49A1 4243 823C 52B9 8489"            /* þIºx2%I¡BC‚<R¹„‰ */
+	$"9BDF 0AA1 9A6B 667D DCE2 FE18 C386 4EE9"            /* ›ß¡škf}Üâþ.ÆNé */
+	$"8AF7 92D0 4405 227C BD4C B9E4 34A7 2533"            /* Š÷’ÐD."|½L¹ä4§%3 */
+	$"D3C6 E915 D57B 681B B6DC FF03 D5D4 F1DD"            /* ÓÆé.Õ{h.¶Üÿ.ÕÔñÝ */
+	$"4FB5 BA54 262A 73C2 1CF4 4CD1 D842 E8C2"            /* OµºT&*sÂ.ôLÑØBè */
+	$"8169 3555 13EC 6A25 6DE0 3614 EC2E D1BB"            /* �i5U.ìj%mà6.ì.Ñ» */
+	$"E597 BFC6 2ACB 6879 11D1 870D E79E 8422"            /* å—¿Æ*Ëhy.ч.çž„" */
+	$"C01D 4032 8887 6DBA FBEC 3077 F220 49E3"            /* À.@2ˆ‡mºûì0wò Iã */
+	$"8693 0B00 9F45 0F57 0A39 DA8E EAA5 CD48"            /* †“..ŸE.WÂ9ÚŽê¥ÍH */
+	$"2C93 C3EC BDE0 71D5 5749 0952 441C E3F8"            /* ,“Ãì½àqÕWIÆRD.ãø */
+	$"597F C1E6 FB6B BBED AD71 FC34 CFF8 5877"            /* Y.Áæûk»í­qü4ÏøXw */
+	$"DB67 5F6D 798F E163 5F6B 1CFA A87B ED7C"            /* Ûg_my�ác_k.ú¨{í| */
+	$"F176 3065 72FF 443D BA6B 8FBD 9E85 806A"            /* ñv0erÿD=ºk�½ž…€j */
+	$"2A1B 368C 7A9E B1B1 93DE ABD8 263F 31B3"            /* *.6Œzž±±“Þ«Ø&?1³ */
+	$"1739 58F1 7233 FE7C 4EC4 32AA CDDB CF11"            /* .9Xñr3þ|NÄ2ªÍÛÏ. */
+	$"C519 9C61 B756 AF62 D55D 5D48 6AF7 4364"            /* Å.œa·V¯bÕ]]Hj÷Cd */
+	$"205E F14D AAD6 EFF5 2F0D CBE4 0F19 3159"            /*  ^ñMªÖïõ/.Ëä..1Y */
+	$"94F4 910E 4217 990B CABE EBF5 2B67 2EF6"            /* ”ô‘.B.™.ʾëõ+g.ö */
+	$"FE41 0C44 1C50 43EA 69F5 4E73 5569 82A1"            /* þA.D.PCêiõNsUi‚¡ */
+	$"C13C 4899 3AA9 5E13 5F76 BF98 2105 1842"            /* Á<H™:©^._v¿˜!..B */
+	$"AF34 9AFD CFC8 D1E7 3479 E1F3 C86F D06F"            /* ¯4šýÏÈÑç4yáóÈoÐo */
+	$"9ED9 9DD8 E2E0 4B44 19F4 03E6 9CC0 3474"            /* žÙ�ØâàKD.ô.æœÀ4t */
+	$"DFBD 078F D140 1C06 5F8C B6E2 665C 703A"            /* ß½.�Ñ@.._Œ¶âf\p: */
+	$"2841 642E F538 C531 697D 5064 11AD 9E8C"            /* (Ad.õ8Å1i}Pd.­žŒ */
+	$"5A53 3174 7302 762E 9708 BEF5 AD41 0C01"            /* ZS1ts.v.—.¾õ­A.. */
+	$"D744 85FC D963 416A 9A3A 6898 F067 5B1C"            /* ×D…üÙcAjš:h˜ðg[. */
+	$"873B 42B6 72C4 FF18 337A 8A24 EDCE 6B8B"            /* ‡;B¶rÄÿ.3zŠ$íÎk‹ */
+	$"BF06 0EA4 0227 A131 8620 B03C A2B9 729E"            /* ¿..¤.'¡1† °<¢¹rž */
+	$"1242 EC64 E340 5C5C 9BFF 120A BB1B 75E5"            /* .Bìdã@\\›ÿ.».uå */
+	$"385B 68AF C7B7 8BA5 1E7B 6FC1 DDB2 F642"            /* 8[h¯Ç·‹¥.{oÁݲöB */
+	$"FF56 4D21 66B3 EA8C 7095 8FBD 92CC 7315"            /* ÿVM!f³êŒp•�½’Ìs. */
+	$"665F B398 608C ADD4 11E0 DA38 734A C3DB"            /* f_³˜`Œ­Ô.àÚ8sJÃÛ */
+	$"9249 4640 27D6 D057 426E 651D BF14 F0DE"            /* ’IF@'ÖÐWBne.¿.ðÞ */
+	$"9130 2D17 8D66 9689 79BD 9A6D 5AF9 6C7C"            /* ‘0-.�f–‰y½šmZùl| */
+	$"94BF 8531 6507 5621 1C11 8D8F F3A5 83D9"            /* ”¿…1e.V!..��ó¥ƒÙ */
+	$"7EE3 1E6D 9B0A 8D44 F466 DE49 E606 E143"            /* ~ã.m›Â�DôfÞIæ.áC */
+	$"7E77 D417 D49D 9CF2 89AA B0FA 84A4 33A5"            /* ~wÔ.Ô�œò‰ª°ú„¤3¥ */
+	$"8279 A26A 82C5 27CF FB64 D227 994E C6A7"            /* ‚y¢j‚Å'ÏûdÒ'™NƧ */
+	$"531C 7B7D D333 20D4 F79E 7C21 CC1E 7ADA"            /* S.{}Ó3 Ô÷ž|!Ì.zÚ */
+	$"F978 DEBB 1FF2 7420 A72D DE6B AB74 8DC6"            /* ùxÞ».òt §-Þk«t�Æ */
+	$"DD0F 0386 BF57 5F23 4926 C874 D598 47A3"            /* Ý..†¿W_#I&ÈtÕ˜G£ */
+	$"FBC8 E9B0 38BB C695 B7F4 82A1 CC5F 1E22"            /* ûÈé°8»Æ•·ô‚¡Ì_." */
+	$"767C 20D5 E64D 44F1 B2D4 2298 C6A1 1842"            /* v| ÕæMDñ²Ô"˜Æ¡.B */
+	$"8139 0CC8 B9C5 284F 9FC8 945B 5342 94A8"            /* �9.ȹÅ(OŸÈ”[SB”¨ */
+	$"1A57 3351 E00E DB28 D5E3 9712 4346 6DBA"            /* .W3Qà.Û(Õã—.CFmº */
+	$"CC9B A1ED CD9B 778D 4523 1E9A AC69 8ED9"            /* Ì›¡íÍ›w�E#.š¬iŽÙ */
+	$"67C4 C16D A548 A029 0075 0185 8D06 B7F0"            /* gÄÁm¥H ).u.…�.·ð */
+	$"8258 D26A EB95 D437 F0D2 8E91 D536 F534"            /* ‚XÒjë•Ô7ðÒŽ‘Õ6õ4 */
+	$"30A1 6DE7 E4B8 48DF 246E 6A43 4FE6 AED0"            /* 0¡mçä¸Hß$njCOæ®Ð */
+	$"48A0 5E1E C339 6C40 BE36 CEB8 870B F9EB"            /* H ^.Ã9l@¾6θ‡.ùë */
+	$"5ED8 3CA2 B3FA 8CD9 2D26 FF79 6468 862D"            /* ^Ø<¢³úŒÙ-&ÿydh†- */
+	$"6B87 3072 15D5 5640 D5D4 B4BA EAD3 84F1"            /* k‡0r.ÕV@ÕÔ´ºêÓ„ñ */
+	$"6A43 F378 100E 8088 A3FE 989B E75B F67F"            /* jCóx..€ˆ£þ˜›ç[ö. */
+	$"5B25 3AE2 C08C 8CB0 08DD A37F 94DD 7F03"            /* [%:âÀŒŒ°.Ý£.”Ý.. */
+	$"35C9 DF27 9A9A B829 6326 A95D 91F7 0BA3"            /* 5Éß'šš¸)c&©]‘÷.£ */
+	$"7220 E220 F062 D8DE ADE2 2AD6 DDFD C9E4"            /* r â ðbØÞ­â*ÖÝýÉä */
+	$"FAAE 543D 3CCB 5230 74F7 3120 02FD 6B45"            /* ú®T=<ËR0t÷1 .ýkE */
+	$"A2AB 805B 13FB 1879 6060 5600 1847 98E5"            /* ¢«€[.û.y``V..G˜å */
+	$"BF65 2CD4 ACD7 15D0 B77E 5A0F 8095 95CA"            /* ¿e,Ô¬×.з~Z.€••Ê */
+	$"1847 D25F 7D32 1AE2 89EA 9D49 074D A3E5"            /* .GÒ_}2.â‰ê�I.M£å */
+	$"201E 8AC7 CB9C 43BC 0732 70E0 3C4F E625"            /*  .ŠÇËœC¼.2pà<Oæ% */
+	$"88E3 74DB 6FB7 7BE2 7006 F9E7 1F76 DBF3"            /* ˆãtÛo·{âp.ùç.vÛó */
+	$"C988 D665 F7AA 21E2 A5C1 E969 2917 3BA3"            /* ɈÖe÷ª!â¥Áéi).;£ */
+	$"17BF 925F F835 9827 813E DA4F EE9B 2DF3"            /* .¿’_ø5˜'�>ÚOî›-ó */
+	$"B640 95E8 70A5 B577 8C1D 99D5 797D D482"            /* ¶@•èp¥µwŒ.™Õy}Ô‚ */
+	$"E23A 56DD 644D 9623 FEE2 63D2 A3DB E146"            /* â:VÝdM–#þâcÒ£ÛáF */
+	$"FC39 35A7 6C28 63D8 5240 0C80 0000 0000"            /* ü95§l(cØR@.€.... */
+	$"0001 4095 99D3 7A7A 0A05 B673 69BC DA9C"            /* ..@•™ÓzzÂ.¶si¼Úœ */
+	$"A108 DDEA EE48 6385 0790 FEA1 1AFC 2CED"            /* ¡.ÝêîHc….�þ¡.ü,í */
+	$"2225 BE73 2ED7 00BB 2301 80FE 09DF E78E"            /* "%¾s.×.»#.€þÆßçŽ */
+	$"6FE6 4743 A0EE 0A03 4C9E F046 CDD8 E7F1"            /* oæGC îÂ.LžðFÍØçñ */
+	$"DB3F 1B67 F6E1 1F31 8096 90DF 5110 40B0"            /* Û?.göá.1€–�ßQ.@° */
+	$"0000 0000 0000 0000 C0B9 E0FC 41FB A11C"            /* ........À¹àüAû¡. */
+	$"4696 89A0 DE42 F8C7 27D0 3F03 AA51 70FD"            /* F–‰ ÞBøÇ'Ð?.ªQpý */
+	$"DC5F D7B9 AFD3 A0F3 7BAA A910 9E5C 259E"            /* Ü_×¹¯Ó ó{ª©.ž\%ž */
+	$"E4FB 8F8E 01C1 96E2 0768 FE5A 0A43 E2F8"            /* äû�Ž.Á–â.hþZÂCâø */
+	$"DA74 9500 C241 D1F6 3EFF 3F06 586F A511"            /* Út•.ÂAÑö>ÿ?.Xo¥. */
+	$"CCFE 8FE7 61E1 C392 D001 3F52 1CA8 CC23"            /* Ìþ�çaáÃ’Ð.?R.¨Ì# */
+	$"93F0 27DF 893F 4AC1 06C3 34DA 8953 BBC0"            /* “ð'߉?JÁ.Ã4Ú‰S»À */
+	$"84C0 4843 27E0 067E 5EBF FF7A 1540 4C0E"            /* „ÀHC'à.~^¿ÿz.@L. */
+	$"FA6C 44A1 A7BC DB24 6AD7 C367 EC93 33BF"            /* úlD¡§¼Û$j×Ãgì“3¿ */
+	$"FECB C1DF 83CC 5BF7 A7C0 DF62 2EFA 4283"            /* þËÁ߃Ì[÷§Àßb.úBƒ */
+	$"6E49 2492 4924 9249 2492 4924 9246 A4A5"            /* nI$’I$’I$’I$’F¤¥ */
+	$"7754 9685 B091 D8FF 1549 CF90 2079 3AFB"            /* wT–…°‘Øÿ.IÏ� y:û */
+	$"E925 85CC 62A2 E49B 476B 47B9 319B 630F"            /* é%…Ìb¢ä›GkG¹1›c. */
+	$"A6B8 182C E282 D1CD 920A 4EB3 21BF 943C"            /* ¦¸.,â‚ÑÍ’ÂN³!¿”< */
+	$"27BF CCDE BD6E 481A 188C F70B C257 8118"            /* '¿ÌÞ½nH..Œ÷.ÂW�. */
+	$"FBF7 FF78 F422 A3DB AE81 4980 0000 0000"            /* û÷ÿxô"£Û®�I€.... */
+	$"0000 0000 0000 1EE1 BFBB C300 0000 0000"            /* .......á¿»Ã..... */
+	$"0000 0000 0000 14FB 3FE1 1B7A D142 E13F"            /* .......û?á.zÑBá? */
+	$"5B6F 704A 61CF 957D 258E F744 FB26 8356"            /* [opJaÏ•}%Ž÷Dû&ƒV */
+	$"74AD 1DDB 02F2 CF85 7AEB 3A06 6F12 084E"            /* t­.Û.òÏ…zë:.o..N */
+	$"8E93 D6DA E4FE 9FBE 2D16 1C87 701F 55C3"            /* Ž“ÖÚäþŸ¾-..‡p.Uà */
+	$"9966 3E8F 36CB 6D9F F3F6 F8D3 B3B9 E2C1"            /* ™f>�6ËmŸóöøÓ³¹âÁ */
+	$"1019 C6E6 8FFF 7FDC 6948 D3AB C944 C64A"            /* ..Ææ�ÿ.ÜiHÓ«ÉDÆJ */
+	$"8000 0000 0000 0000 000A B0CB 3806 445C"            /* €........°Ë8.D\ */
+	$"7110 4CDE 3651 AC94 777C 8AB0 5382 04AF"            /* q.LÞ6Q¬”w|Š°S‚.¯ */
+	$"32E5 68C2 122F 8A5B 12A8 FF39 CF5E 72FB"            /* 2åhÂ./Š[.¨ÿ9Ï^rû */
+	$"EFD4 1669 47C6 525E 88EF 0AAC 1EE1 98B6"            /* ïÔ.iGÆR^ˆï¬.ᘶ */
+	$"0BFF 7FAF 8A4B 7158 F7D7 1707 DE93 841E"            /* .ÿ.¯ŠKqX÷×..Þ“„. */
+	$"3C82 3260 1FFF 1C8B 6A6E 8C66 0000 0000"            /* <‚2`.ÿ.‹jnŒf.... */
+	$"0000 0000 0000 0121 EF03 234C 3124 0000"            /* .......!ï.#L1$.. */
+	$"0000 0000 0000 0000 077C 5957 204B A2ED"            /* .........|YW K¢í */
+	$"59B8 F3C4 CC60 8A58 7E23 0B9F A0FD 1DC8"            /* Y¸óÄÌ`ŠX~#.Ÿ ý.È */
+	$"8E0F FE2B 5F9F 12D8 09B3 57BB 7818 3CF5"            /* Ž.þ+_Ÿ.ØƳW»x.<õ */
+	$"D579 D427 5198 BD86 E2FC 8775 915B 37A5"            /* ÕyÔ'Q˜½†âü‡u‘[7¥ */
+	$"B2E6 6BD8 8404 31D9 4C54 3621 6561 5C3E"            /* ²ækØ„.1ÙLT6!ea\> */
+	$"4A80 0000 0000 0000 0000 0014 D22D 6758"            /* J€..........Ò-gX */
+	$"336C 63A1 C13F 3E94 9877 8E90 4E5D 0C70"            /* 3lc¡Á?>”˜wŽ�N].p */
+	$"F80A 4262 C2CC C7E4 DAE8 526F 393F 4558"            /* øÂBbÂÌÇäÚèRo9?EX */
+	$"5CC9 5DDA B2FF 7ED5 F809 3A02 F1EE 2760"            /* \É]Ú²ÿ~ÕøÆ:.ñî'` */
+	$"FF7E 5037 F054 4A1B 9602 92EA 8D26 A198"            /* ÿ~P7ðTJ.–.’ê�&¡˜ */
+	$"9C4F 8238 A60E 7734 20F8 18FE 478F 5403"            /* œO‚8¦.w4 ø.þG�T. */
+	$"1658 618B A80F 879F 4A98 E809 DEB2 7CE9"            /* .Xa‹¨.‡ŸJ˜èÆÞ²|é */
+	$"9724 407B B8C8 A48D 4F33 9126 751B 9FC2"            /* —$@{¸È¤�O3‘&u.ŸÂ */
+	$"0283 44C3 5AFD 9546 FCE2 4212 4F5B 01D4"            /* .ƒDÃZý•FüâB.O[.Ô */
+	$"6E53 A032 DA91 40F4 4BDE 0C23 FF1E D5DE"            /* nS 2Ú‘@ôKÞ.#ÿ.ÕÞ */
+	$"B543 59DC C0DC 759A 6043 5883 A5FE C785"            /* µCYÜÀÜuš`CXƒ¥þÇ… */
+	$"BA68 9F46 C21A 4C50 20E3 0488 FB34 1043"            /* ºhŸFÂ.LP ã.ˆû4.C */
+	$"FC68 562B 635A EE8D E334 0C6F 25A9 E4C9"            /* ühV+cZî�ã4.o%©äÉ */
+	$"3484 2AC2 6188 7242 E3F6 AEAC 6F86 2DE2"            /* 4„*ÂaˆrBãö®¬o†-â */
+	$"C377 BD02 CB1C 9553 5485 6A5B E118 9BBD"            /* Ãw½.Ë.•ST…j[á.›½ */
+	$"DC6B 2C92 C6CC C866 6E7F FE63 AB01 FE7D"            /* Ük,’ÆÌÈfn.þc«.þ} */
+	$"FF7F BB81 EA94 87BE B101 F468 0E30 F111"            /* ÿ.»�ꔇ¾±.ôh.0ñ. */
+	$"7BC9 FA0D F87F BDD0 811B 8588 1AE7 8387"            /* {Éú.ø.½Ð�.…ˆ.烇 */
+	$"5C06 B3A9 E2ED 6E5B B524 35AA CBFF 50D6"            /* \.³©âín[µ$5ªËÿPÖ */
+	$"49D9 6918 3837 59BD E7CC 8796 B0AF 2729"            /* IÙi.87Y½ç̇–°¯') */
+	$"0512 5A97 66FF 1A85 E004 1882 0108 EA41"            /* ..Z—fÿ.…à..‚..êA */
+	$"BBCC 15E0 254C 59AF 877D 0722 15FB ADA1"            /* »Ì.à%LY¯‡}.".û­¡ */
+	$"84C2 9B83 DD5B C6B1 EE29 084C 08F7 06C8"            /* „›ƒÝ[Ʊî).L.÷.È */
+	$"4F07 9818 6BF2 66E2 582B 2F7D 29AD BAFA"            /* O.˜.kòfâX+/})­ºú */
+	$"8F9E 0AC8 60AE D10E 3E49 17BF E015 0C5E"            /* �žÂÈ`®Ñ.>I.¿à..^ */
+	$"5C51 5D5B 5BC1 6C83 C428 4505 E9BB 61CB"            /* \Q][[ÁlƒÄ(E.é»aË */
+	$"D7C2 F3C6 C102 73F5 409E D0CF B43E E497"            /* ×ÂóÆÁ.sõ@žÐÏ´>ä— */
+	$"C1E0 707B 3F6F EAA8 2F10 9285 7D9D 9F81"            /* Áàp{?oê¨/.’…}�Ÿ� */
+	$"303D 3A70 2B3F 4A45 558D 63F6 EEB9 CF21"            /* 0=:p+?JEU�cöî¹Ï! */
+	$"52C1 27C2 8439 0BE2 BE1F A553 A1C7 E44C"            /* RÁ'„9.â¾.¥S¡ÇäL */
+	$"5422 9BC0 356D 1B40 E53B 3064 AA69 F464"            /* T"›À5m.@å;0dªiôd */
+	$"7AA7 4E56 F7E2 7AE5 CB6E E538 8582 1927"            /* z§NV÷âzåËnå8…‚.' */
+	$"019D B4B0 E6D9 0F0E 9670 7723 62CF C422"            /* .�´°æÙ..–pw#bÏÄ" */
+	$"DD53 ED12 92AE 20B0 6B63 6CB3 C596 4F4E"            /* ÝSí.’® °kcl³Å–ON */
+	$"18B6 FD06 93B2 6F73 A740 770D C39F B873"            /* .¶ý.“²os§@w.߸s */
+	$"598F 3667 6F7A 29E9 9E6F 9D04 48DD A175"            /* Y�6goz)éžo�.HÝ¡u */
+	$"2AFC 61BD D706 2A8E 9789 F513 B8AF B8EA"            /* *üa½×.*Ž—‰õ.¸¯¸ê */
+	$"2426 7EDF 1EFA 1D19 7A50 D22F D15E 76FE"            /* $&~ß.ú..zPÒ/Ñ^vþ */
+	$"CD34 19AD 8126 775C A5FB B209 9658 F850"            /* Í4.­�&w\¥û²Æ–XøP */
+	$"F2FD A65F B487 9F50 7FF0 12FD BA8B FB6E"            /* òý¦_´‡ŸP.ð.ýº‹ûn */
+	$"49F5 50DF C349 B4F9 F4D7 EDEB 53BE DEB0"            /* IõPßÃI´ùô×íëS¾Þ° */
+	$"7F85 29FB 5DFF 36B9 BEDA 9BF8 3CF2 FDAE"            /* .…)û]ÿ6¹¾Ú›ø<òý® */
+	$"DFB5 ABBE D3DB ED2B FDBA CFFB 7606 FB74"            /* ßµ«¾ÓÛí+ýºÏûv.ût */
+	$"D3F8 6B96 83BA F7ED EB3F 7EDE AFE0 EECD"            /* Óøk–ƒº÷íë?~Þ¯àîÍ */
+	$"FB5E 7F6E 807E DB9B F6BD F0FE D32B EA21"            /* û^.n€~Û›ö½ðþÓ+ê! */
+	$"EFA8 1EFA 823F 6DCF FB6C 8BEA 6CFD B5AF"            /* ï¨.ú‚?mÏûl‹êlýµ¯ */
+	$"0774 CFDB D337 FB7A 3F83 BA5D F51F DF55"            /* .tÏÛÓ7ûz?ƒº]õ.ßU */
+	$"47FB 690F DA86 F791 DDD6 2CCB E6B8 C536"            /* Gûi.Ú†÷‘ÝÖ,Ëæ¸Å6 */
+	$"D512 AD5E 1B08 0B8A 8D03 2F75 60E5 6BF8"            /* Õ.­^...Š�./u`åkø */
+	$"447B C66A 7EC2 7912 B45F 8E48 277C D8E1"            /* D{Æj~Ây.´_ŽH'|Øá */
+	$"809C 5755 D718 BAAC F891 2AE5 F97C 3F5E"            /* €œWU×.º¬ø‘*åù|?^ */
+	$"0116 3A00 99F4 5896 E0EA B189 F5A5 7929"            /* ..:.™ôX–à걉õ¥y) */
+	$"C491 B57F 2232 B0C2 52F8 89B1 DB2F B284"            /* Ä‘µ."2°ÂRø‰±Û/²„ */
+	$"C1EE 0C43 EF76 FD94 F871 4077 7E19 EC36"            /* Áî.Cïvý”øq@w~.ì6 */
+	$"BBFA 6DFF 3C0B 5A98 89B4 84BB 56DB 5FC2"            /* »úmÿ<.Z˜‰´„»VÛ_ */
+	$"16C2 351A B46E AF45 AAC7 DD2E 97ED 970C"            /* .Â5.´n¯EªÇÝ.—í—. */
+	$"76D8 F8D0 42EB E639 28E8 BE33 A530 3B58"            /* vØøÐBëæ9(è¾3¥0;X */
+	$"2374 6B1C 97B0 1CD5 ACD5 615F FD30 62C6"            /* #tk.—°.Õ¬Õa_ý0bÆ */
+	$"899A 977D 4B74 CAB1 E9EE 6588 4E67 8733"            /* ‰š—}KtʱéîeˆNg‡3 */
+	$"B359 BCC7 DC7B 9884 E4A8 78CB 77E7 675D"            /* ³Y¼ÇÜ{˜„ä¨xËwçg] */
+	$"FF2D FCE4 7744 BDD1 A833 6BEC C481 2DA8"            /* ÿ-üäwD½Ñ¨3kìÄ�-¨ */
+	$"3D1C 5D57 7595 1DEB 2278 31AE 4188 B1F2"            /* =.]Wu•.ë"x1®Aˆ±ò */
+	$"54E1 113D DA75 96ED 71FF 1577 7820 4D22"            /* Tá.=Úu–íqÿ.wx M" */
+	$"2BD9 3841 A416 96A4 2549 1A9D 3A55 8E39"            /* +Ù8A¤.–¤%I.�:UŽ9 */
+	$"A929 4B4E E11F 0F88 8BB6 7E08 2210 9D21"            /* ©)KNá..ˆ‹¶~.".�! */
+	$"92BF 623B B974 D371 0208 1489 5713 0F66"            /* ’¿b;¹tÓq...‰W..f */
+	$"3C4C 8394 72A6 08A1 3D86 BA0C 198B CE8B"            /* <Lƒ”r¦.¡=†º..‹Î‹ */
+	$"FB71 18D8 E044 CE7C A642 F1E5 DC8B F8E6"            /* ûq.ØàDÎ|¦BñåÜ‹øæ */
+	$"2405 66E0 B6C5 6A4F B1AE 2231 3060 11D4"            /* $.fà¶ÅjO±®"10`.Ô */
+	$"9963 5EF4 BB3D 1F61 0807 0AE1 0DFC 4718"            /* ™c^ô»=.a..Âá.üG. */
+	$"6C97 80A7 D438 6A81 B76A 6E7E 7A64 87A1"            /* l—€§Ô8j�·jn~zd‡¡ */
+	$"1D7A 8744 3227 F565 4B4A E311 FA0F B477"            /* .z‡D2'õeKJã.ú.´w */
+	$"9DD6 0662 8844 7138 BDF8 CBCC 007F BDB6"            /* �Ö.bˆDq8½øËÌ..½¶ */
+	$"07C4 98CC 226B 9762 33D0 99EF 54D9 5800"            /* .ĘÌ"k—b3ЙïTÙX. */
+	$"509D C37B 39A7 E11B 8771 0999 AB8B AAA6"            /* P�Ã{9§á.‡qÆ™«‹ª¦ */
+	$"C463 6C38 7FB0 9121 2CA2 7634 BBEE 41FB"            /* Äcl8.°‘!,¢v4»îAû */
+	$"4F3B B050 3E38 15C4 98A6 216D 31C2 7057"            /* O;°P>8.ʦ!m1ÂpW */
+	$"0B3D 429A 6CFB 0819 EB4D B9D2 549F 6601"            /* .=Bšlû..ëM¹ÒTŸf. */
+	$"2436 5BEA 9DAC BBDA AB3A AB4F ABFF 768D"            /* $6[ê�¬»Ú«:«O«ÿv� */
+	$"E220 E451 7E45 49C5 21FD B2E6 DEFD 2505"            /* â äQ~EIÅ!ý²æÞý%. */
+	$"836B 3500 54D8 50B8 7538 C5BF B951 7FB2"            /* ƒk5.TØP¸u8Å¿¹Q.² */
+	$"F927 CBB1 7AA1 D0BD 51E2 D7F7 C440 5DA0"            /* ù'˱z¡Ð½Qâ×÷Ä@]  */
+	$"89EF FEEE BF2E A5E4 F98A B652 F25A D1DC"            /* ‰ïþî¿.¥äùŠ¶RòZÑÜ */
+	$"482A 40CB A288 250A 22CA BCB4 815D 077E"            /* H*@Ë¢ˆ%Â"ʼ´�].~ */
+	$"229E 59B2 8249 D336 A3C1 5D5B FAE5 483C"            /* "žY²‚IÓ6£Á][úåH< */
+	$"67F3 255E 1530 AFB1 D900 48FE 254B C54E"            /* gó%^.0¯±Ù.Hþ%KÅN */
+	$"42DC EE54 066B CE83 B1C9 F021 2031 8DF1"            /* BÜîT.k΃±Éð! 1�ñ */
+	$"FE58 9315 B761 79CA 409A 6CD6 337A 14A9"            /* þX“.·ayÊ@šlÖ3z.© */
+	$"8622 90BC 3474 727C 66CE 09C5 61B4 A386"            /* †"�¼4tr|fÎÆÅa´£† */
+	$"7509 819F 6EEB 5FCC C0A7 084A 7742 A6E3"            /* uÆ�Ÿnë_ÌÀ§.JwB¦ã */
+	$"F69A 90CA 24AD EB53 60AB 5FD0 FD6F 3DE6"            /* öš�Ê$­ëS`«_Ðýo=æ */
+	$"44CF 80FB A400 B71F 1DD4 C690 A3DB 54CF"            /* DÏ€û¤.·..ÔÆ�£ÛTÏ */
+	$"F492 7EC7 540C 048F 3D35 FD63 7593 751B"            /* ô’~ÇT..�=5ýcu“u. */
+	$"F88F 4B7D E355 6685 FD5F 2743 8DF3 D839"            /* ø�K}ãUf…ý_'C�óØ9 */
+	$"0894 99DB 1FAA 22B2 8800 8C9F D91F E60B"            /* .”™Û.ª"²ˆ.ŒŸÙ.æ. */
+	$"0EEE 2870 2932 2AE5 F401 11F0 8B2B 53DB"            /* .î(p)2*åô..ð‹+SÛ */
+	$"8028 E39D 744F E70B 11F3 A220 ABF4 FCD5"            /* €(ã�tOç..ó¢ «ôüÕ */
+	$"37C9 0AC8 8749 215E 1D89 4022 96D0 04FF"            /* 7ÉÂȇI!^.‰@"–Ð.ÿ */
+	$"0C57 AC3D 351A 8582 EBA4 EA2B B65B A14B"            /* .W¬=5.…‚ë¤ê+¶[¡K */
+	$"048B E031 DE15 251C 669F 8457 FF38 D131"            /* .‹à1Þ.%.fŸ„Wÿ8Ñ1 */
+	$"0027 BB20 9721 6636 A375 AFBA AF7B BDBA"            /* .'» —!f6£u¯º¯{½º */
+	$"05F3 3114 E55E DAA9 219F 9516 F3DF 12B4"            /* .ó1.å^Ú©!Ÿ•.óß.´ */
+	$"DA3F 83DF 13A0 9900 3FA6 17E9 B014 E404"            /* Ú?ƒß. ™.?¦.é°.ä. */
+	$"434D 02D4 4283 D73D F4D1 5D95 8B25 6A6A"            /* CM.ÔBƒ×=ôÑ]•‹%jj */
+	$"CD5E BA93 82DF 1A30 4B0D 0E21 65A1 0001"            /* Í^º“‚ß.0K..!e¡.. */
+	$"2869 F06A 8949 311F DB03 39EB E8E1 5BFB"            /* (iðj‰I1.Û.9ëèá[û */
+	$"F11C 05C6 2469 BAEA 4516 4CC4 DAF5 927A"            /* ñ..Æ$iºêE.LÄÚõ’z */
+	$"2CEB 3150 DB6F 4DE2 8EED 59C0 604F 9AE5"            /* ,ë1PÛoMâŽíYÀ`Ošå */
+	$"E136 83B0 F348 3D1A B44D 3A8E D77A B0DE"            /* á6ƒ°óH=.´M:Ž×z°Þ */
+	$"5267 1055 24F7 3C3D EB3E 08EF 97F9 4B29"            /* Rg.U$÷<=ë>.ï—ùK) */
+	$"454F 1B5D 4A6E 56E1 0F90 00A1 4467 7454"            /* EO.]JnVá.�.¡DgtT */
+	$"B556 362A 9A19 9E35 19E9 BFDF E2AD 91D6"            /* µV6*š.ž5.é¿ßâ­‘Ö */
+	$"7FB6 95B9 F19D 8D07 2FAF 3162 D880 0AA7"            /* .¶•¹ñ��./¯1b؀§ */
+	$"C9C4 94AD C49A 1231 2D9F 780F 6E3E 57D2"            /* ÉÄ”­Äš.1-Ÿx.n>WÒ */
+	$"8C1C 582C 179A 721C 7063 F056 F938 4EA1"            /* Œ.X,.šr.pcðVù8N¡ */
+	$"F3E4 E458 D254 280F 92CA ABDC 4ECF 3EB7"            /* óääXÒT(.’Ê«ÜNÏ>· */
+	$"95DF A3B8 45C0 1427 BA54 B2E2 D1BC B67D"            /* •ß£¸EÀ.'ºT²âѼ¶} */
+	$"5A0F EE12 37D4 BE1C 5785 A90D 2E62 B301"            /* Z.î.7Ô¾.W…©..b³. */
+	$"F66D A637 374B 17DA 7446 C318 3B11 4F50"            /* öm¦77K.ÚtFÃ.;.OP */
+	$"ED27 AEB2 D8F6 C3E4 AB48 5E7C 1D46 9463"            /* í'®²ØöÃä«H^|.F”c */
+	$"E7BA 9296 7BFA FDBB 39F2 7E86 1A5D 8FFA"            /* 纒–{úý»9ò~†.]�ú */
+	$"7E06 FC92 3472 7950 8B67 8329 FA9F 47AA"            /* ~.ü’4ryP‹gƒ)úŸGª */
+	$"51F3 01AD A6DA 224F E711 AF6F BA8F FA86"            /* Qó.­¦Ú"Oç.¯oº�ú† */
+	$"FF61 EBD1 5613 B076 3543 3515 FF1B 1E9C"            /* ÿaëÑV.°v5C5.ÿ..œ */
+	$"CE78 6A36 7CCF FD63 E9E3 00E6 EA60 1DBE"            /* Îxj6|Ïýcéã.æê`.¾ */
+	$"42FB 3E66 D69D 8BA6 A0E6 13E1 2087 20D7"            /* Bû>fÖ�‹¦ æ.á ‡ × */
+	$"7941 E3C4 C7C6 67FF 2C9C A486 253A C206"            /* yAãÄÇÆgÿ,œ¤†%:Â. */
+	$"F961 4A0E D9DD D32A 6D67 A012 B1A2 B549"            /* ùaJ.ÙÝÓ*mg .±¢µI */
+	$"3F58 8BA1 CA98 94EB 6099 570C D139 09AA"            /* ?X‹¡Ê˜”ë`™W.Ñ9ƪ */
+	$"8DEB C31A 0812 5DAD 2926 6846 D789 4430"            /* �ëÃ...]­)&hF׉D0 */
+	$"4931 16B5 0804 52F1 040D B0A7 DDD7 7052"            /* I1.µ..Rñ..°§Ý×pR */
+	$"4269 C765 98AA 3941 F9EE 987A 2EAD 46BE"            /* BiÇe˜ª9Aùî˜z.­F¾ */
+	$"AA2B DD79 D9F9 7AF7 9318 B633 97CC DB93"            /* ª+ÝyÙùz÷“.¶3—ÌÛ“ */
+	$"5AF7 23D4 08E5 1FD7 EA45 85E9 4C98 77B6"            /* Z÷#Ô.å.×êE…éL˜w¶ */
+	$"0038 8756 6C8F 1A76 8D36 D67C 0BBD 248F"            /* .8‡Vl�.v�6Ö|.½$� */
+	$"8465 4CC4 7B7A C1B7 6348 F763 66A7 F04E"            /* „eLÄ{zÁ·cH÷cf§ðN */
+	$"FF4E 1C72 1053 323F 9E55 F75D 4097 9C24"            /* ÿN.r.S2?žU÷]@—œ$ */
+	$"AD5D 3C1B 766A 50A8 7252 6563 2687 8251"            /* ­]<.vjP¨rRec&‡‚Q */
+	$"8AE2 2EAE 6AA9 6439 2831 281E 034D 7999"            /* Šâ.®j©d9(1(..My™ */
+	$"F46F 47C1 911D 553A D887 0E8F 6E83 1B48"            /* ôoGÁ‘.U:؇.�nƒ.H */
+	$"F0D9 C566 C0FF 0F02 5E68 EA76 7381 25B1"            /* ðÙÅfÀÿ..^hêvs�%± */
+	$"D388 A375 370B A655 625B B71A 191C CD9D"            /* Óˆ£u7.¦Ub[·...Í� */
+	$"F3CA 83B2 88D6 3712 B3E3 6CEA 19DC 3295"            /* óʃ²ˆÖ7.³ãlê.Ü2• */
+	$"3398 DF4F 1279 B346 1DD8 ED24 186F BEE1"            /* 3˜ßO.y³F.Øí$.o¾á */
+	$"8FD4 5FAD EAFF 6960 DE17 A0A4 B89E 7CF3"            /* �Ô_­êÿi`Þ. ¤¸ž|ó */
+	$"C360 9DA8 91BF 470F ECC0 C0AA E260 3430"            /* Ã`�¨‘¿G.ìÀÀªâ`40 */
+	$"EF4E CAD6 F964 05B0 8E27 C1F6 7516 4350"            /* ïNÊÖùd.°Ž'Áöu.CP */
+	$"B87D 7D16 703E 7972 1232 2E0F 6577 664C"            /* ¸}}.p>yr.2..ewfL */
+	$"8FA6 1414 7FB2 A33D A69E FD2F CF21 FC8F"            /* �¦...²£=¦žý/Ï!ü� */
+	$"23A5 6AED 3E28 34A0 F73F F7D6 7F7C 5B6B"            /* #¥jí>(4 ÷?÷Ö.|[k */
+	$"0596 8B6D BACA 52DF 8E72 CDBA E221 7092"            /* .–‹mºÊRߎrͺâ!p’ */
+	$"A3AB B99D 1EE3 3F21 1AD2 0F0B DC5A 8BE1"            /* £«¹�.ã?!.Ò..ÜZ‹á */
+	$"9E35 D891 9A60 EF28 5934 FA3B 8009 DC42"            /* ž5Ø‘š`ï(Y4ú;€ÆÜB */
+	$"11BE 487F D776 AF26 0EBD BF3E 8DCC B940"            /* .¾H.×v¯&.½¿>�̹@ */
+	$"2523 D6E1 447F EA8A 5F66 DE0B 0962 249E"            /* %#ÖáD.êŠ_fÞ.Æb$ž */
+	$"165D BB6D 1EBD 1237 021B F903 DEEF 78FE"            /* .]»m.½.7..ù.Þïxþ */
+	$"B3F3 76B7 429F 336D 0EFA FF47 5CBC E3DF"            /* ³óv·BŸ3m.úÿG\¼ãß */
+	$"FC44 41BA BC9D 67AE 0B43 D817 FBCE 4F36"            /* üDAº¼�g®.CØ.ûÎO6 */
+	$"8209 CCB5 38F6 712E 7DEA 4E9E 4B38 3B80"            /* ‚Æ̵8öq.}êNžK8;€ */
+	$"7B16 28E3 AB59 340E 93F0 4C65 C281 A4F1"            /* {.(ã«Y4.“ðLeÂ�¤ñ */
+	$"08E4 26A6 31AA B6A4 F784 BA8E C7FA 8919"            /* .ä&¦1ª¶¤÷„ºŽÇú‰. */
+	$"4B19 FA98 09C8 3C79 27DA CB39 881C 3B0E"            /* K.ú˜ÆÈ<y'ÚË9ˆ.;. */
+	$"9BEA 1EF3 D655 CFEB B4F7 0888 971D 69EF"            /* ›ê.óÖUÏë´÷.ˆ—.iï */
+	$"1105 0EF2 80B8 FF1E F0BE 107F 9AB0 6C52"            /* ...ò€¸ÿ.ð¾..š°lR */
+	$"FF78 3AA4 8FE0 3370 40DF C5E8 478A 2FCF"            /* ÿx:¤�à3p@ßÅèGŠ/Ï */
+	$"96C5 8D32 8E07 AA93 DA95 4D9B 60C6 2748"            /* –Å�2Ž.ª“Ú•M›`Æ'H */
+	$"C8F4 8347 D2D9 2E35 75E4 333A 6494 B177"            /* ÈôƒGÒÙ.5uä3:d”±w */
+	$"C836 6E4F AF08 CDB0 0FA5 D565 A0EC 946F"            /* È6nO¯.Í°.¥Õe ì”o */
+	$"ED5C 03F6 E5DB FA4F D29A BF8F BC7F 12D8"            /* í\.öåÛúOÒš¿�¼..Ø */
+	$"7730 8564 524D 4B31 F681 8C71 C5BC 1641"            /* w0…dRMK1ö�Œqż.A */
+	$"6988 F9CF 0385 B8EE 4C04 07DB 5AD2 531C"            /* iˆùÏ.…¸îL..ÛZÒS. */
+	$"48BA 3E6F E24E AF73 DB5E B729 A4BF 894A"            /* Hº>oâN¯sÛ^·)¤¿‰J */
+	$"782D E8F2 91C9 E628 322C F20C 2D0C 73DD"            /* x-èò‘Éæ(2,ò.-.sÝ */
+	$"F093 4ED7 63DF E121 E7B9 DB7E 530D E3BD"            /* ð“N×cßá!ç¹Û~S.ã½ */
+	$"3469 29CE 5768 BE0F 1E91 46B7 00A0 CC2E"            /* 4i)ÎWh¾..‘F·. Ì. */
+	$"183D 7D57 762C 062D 0707 EBA4 177D 73E8"            /* .=}Wv,.-..ë¤.}sè */
+	$"FA30 83A6 479B AA9A 702E B8FD 9B54 0FF3"            /* ú0ƒ¦G›ªšp.¸ý›T.ó */
+	$"8222 1EB0 4CDD 4CF7 F0AB 8972 B655 9426"            /* ‚".°LÝL÷ð«‰r¶U”& */
+	$"4EEE 3B88 A6D2 F8B9 6845 0467 D606 9DDD"            /* Nî;ˆ¦Òø¹hE.gÖ.�Ý */
+	$"C547 A61F 71E7 5A8E 6B83 51FD B2C1 A732"            /* ÅG¦.qçZŽkƒQý²Á§2 */
+	$"A6EA A0AA 6D13 E80B 0EC4 5DF4 348F FF6E"            /* ¦ê ªm.è..Ä]ô4�ÿn */
+	$"2289 CFB4 1AE2 18D1 340F B29B E1FF 16B1"            /* "‰Ï´.â.Ñ4.²›áÿ.± */
+	$"0F0F B5AD 260A 7FD9 B1F2 3D0C 404F 75A8"            /* ..µ­&Â.Ù±ò=.@Ou¨ */
+	$"E4DB 52EE 259B D762 E5E5 4FFD 22AC 4856"            /* äÛRî%›×bååOý"¬HV */
+	$"9C62 8DDB F5D8 58F8 4EC7 1110 30EC E0D8"            /* œb�ÛõØXøNÇ..0ìàØ */
+	$"7FED 0176 FEF2 53B3 75C6 34E1 A3A7 79DA"            /* .í.vþòS³uÆ4ᣧyÚ */
+	$"1FDC 42EC 83B2 F3EB 056C E41B 4E65 3699"            /* .ÜB샲óë.lä.Ne6™ */
+	$"4BD6 1AE3 85A9 DBF6 89D4 39B0 79F9 8877"            /* KÖ.ã…©Ûö‰Ô9°yùˆw */
+	$"161C 2CB5 3F3C 294B 8CA3 A6F6 556C 4CAD"            /* ..,µ?<)KŒ£¦öUlL­ */
+	$"A752 918D 7E61 BA54 02D2 CF5C AEBE 1A0B"            /* §R‘�~aºT.ÒÏ\®¾.. */
+	$"B75C A9CA 9876 AB0B 6028 4D8E D46C E479"            /* ·\©Ê˜v«.`(MŽÔläy */
+	$"A186 EA09 496E 0935 04E2 4C25 FA18 270B"            /* ¡†êÆInÆ5.âL%ú.'. */
+	$"A054 DE1C 1BD8 A089 9D95 1335 E93C 7C21"            /*  TÞ..Ø ‰�•.5é<|! */
+	$"435E A570 3C42 AA88 0075 BB20 20AF 90EC"            /* C^¥p<Bªˆ.u»  ¯�ì */
+	$"26F9 7E41 5CC7 2154 63A3 D965 075C 1A78"            /* &ù~A\Ç!Tc£Ùe.\.x */
+	$"2A13 753E DDD9 F846 467C EFC6 5308 2B46"            /* *.u>ÝÙøFF|ïÆS.+F */
+	$"5BD9 2BFF 5F26 72DB 523D D0FC CE49 47B0"            /* [Ù+ÿ_&rÛR=ÐüÎIG° */
+	$"D98B 4D36 1B60 7C3A 0707 F46A 8565 4CCB"            /* Ù‹M6.`|:..ôj…eLË */
+	$"5DC1 A50D C039 BF24 7418 78A7 6D4F DE55"            /* ]Á¥.À9¿$t.x§mOÞU */
+	$"1CB8 B787 158C 6C4D D840 920F 3130 7A92"            /* .¸·‡.ŒlMØ@’.10z’ */
+	$"1CF4 1B74 BC2B 8954 0A80 9636 BFC3 6330"            /* .ô.t¼+‰T€–6¿Ãc0 */
+	$"3E7F 7E4E A811 39F2 3D56 10D3 6A76 4E20"            /* >.~N¨.9ò=V.ÓjvN  */
+	$"F646 5CD3 9166 D2D6 046F E398 A934 2D04"            /* öF\Ó‘fÒÖ.o㘩4-. */
+	$"2E01 C602 1332 8274 6AE2 D5C9 6226 30B3"            /* ..Æ..2‚tjâÕÉb&0³ */
+	$"07DB FDF3 B3BB 6C31 B162 FF63 0639 8E6F"            /* .Ûýó³»l1±bÿc.9Žo */
+	$"3501 A54C 1AA6 42EB EDE7 885E EE2F A6D9"            /* 5.¥L.¦Bëíçˆ^î/¦Ù */
+	$"B74A AE20 8FFB 6FCF A537 642D F17F A45E"            /* ·J® �ûoÏ¥7d-ñ.¤^ */
+	$"EE37 DE05 7569 A81E F464 A35B 603B 4F40"            /* î7Þ.ui¨.ôd£[`;O@ */
+	$"D00F C3D2 D04A F943 AC3C 37E2 1B2B A1D3"            /* Ð.ÃÒÐJùC¬<7â.+¡Ó */
+	$"09D6 A92B F7CB B2FA 9FF7 97F2 83F9 BABC"            /* ÆÖ©+÷˲úŸ÷—òƒùº¼ */
+	$"E4BE F015 E804 97FC A16F 6E8B 9004 8424"            /* ä¾ð.è.—ü¡on‹�.„$ */
+	$"04F7 1295 0A15 3C1A AA5D 6A75 372A 0BB4"            /* .÷.•Â.<.ª]ju7*.´ */
+	$"4849 DD4A 012F D969 23A9 FBA7 C3EB D29F"            /* HIÝJ./Ùi#©û§ÃëÒŸ */
+	$"5CE0 BD6F 8436 26BB 1B52 3BCB DCAA 0791"            /* \à½o„6&».R;Ëܪ.‘ */
+	$"02B3 8EC7 5A89 D402 C9FF 058E E2C8 AD72"            /* .³ŽÇZ‰Ô.Éÿ.ŽâÈ­r */
+	$"01BF D9B3 FA52 B000 0000 3090 8B4E 8809"            /* .¿Ù³úR°...0�‹NˆÆ */
+	$"9E4F 59A7 8021 D030 169B 78E6 55B4 9FB8"            /* žOY§€!Ð0.›xæU´Ÿ¸ */
+	$"48A1 D2F4 BE8E A948 A89E 5E3E BE56 AE8C"            /* H¡Òô¾Ž©H¨ž^>¾V®Œ */
+	$"BF6C 6485 F435 4906 BE37 4D88 589A 85C0"            /* ¿ld…ô5I.¾7MˆXš…À */
+	$"5278 59EC 1FED 3652 3FE0 5229 0524 D686"            /* RxYì.í6R?àR).$Ö† */
+	$"1E5E 14D9 8C56 8742 9625 36BB 4674 0391"            /* .^.ÙŒV‡B–%6»Ft.‘ */
+	$"9647 FCC9 30C4 6D0D 5812 1271 E9C8 E89D"            /* –GüÉ0Äm.X..qéÈè� */
+	$"7F9B 3420 0269 5F58 4554 F964 BDDA E9F3"            /* .›4 .i_XETùd½Úéó */
+	$"973A 5B5F 4C59 107B 2D9E 87CB D896 1F13"            /* —:[_LY.{-ž‡ËØ–.. */
+	$"AC52 F00D 3600 9104 3FF2 399A 0158 5153"            /* ¬Rð.6.‘.?ò9š.XQS */
+	$"139A A5C2 51CC D2C7 D082 C2A0 E35B FE05"            /* .š¥ÂQÌÒÇЂ ã[þ. */
+	$"06C9 DBB4 7036 39DB 80AF 4642 9F53 170C"            /* .ÉÛ´p69Û€¯FBŸS.. */
+	$"2856 38D5 0FA7 B562 4ED8 3BB5 B48A B1C8"            /* (V8Õ.§µbNØ;µ´Š±È */
+	$"B20B 4B42 4499 C5C1 242B A1BA CB74 D8F1"            /* ².KBD™ÅÁ$+¡ºËtØñ */
+	$"1CF1 241E 7A2A B847 111D 13DC CD3C 05A3"            /* .ñ$.z*¸G...ÜÍ<.£ */
+	$"024F 25B5 41E2 0A15 E1C4 1A0E A5D8 0742"            /* .O%µAâÂ.áÄ..¥Ø.B */
+	$"A359 2372 FD88 7447 1DB7 F766 5B7F E63E"            /* £Y#rýˆtG.·÷f[.æ> */
+	$"26B8 BC6E 7B72 E331 2BE1 73BD 04A0 E941"            /* &¸¼n{rã1+ás½. éA */
+	$"45EC 9039 8769 8BFF 1624 8D43 CA24 9D0D"            /* Eì�9‡i‹ÿ.$�CÊ$�. */
+	$"A05B F467 7401 E777 0608 C4A6 A698 9A9B"            /*  [ôgt.çw..Ħ¦˜š› */
+	$"7066 11D3 606F 857E 18D8 D9D3 E226 38C0"            /* pf.Ó`o…~.ØÙÓâ&8À */
+	$"D89B 09D9 A2F1 0171 BAC9 D7BF AB2E BD58"            /* Ø›ÆÙ¢ñ.qºÉ׿«.½X */
+	$"7178 6CC2 608D 447D D92A 621C 1A82 B764"            /* qxlÂ`�D}Ù*b..‚·d */
+	$"2ABE CBE8 07C0 E2A6 9B83 46A8 1109 FC87"            /* *¾Ëè.À⦛ƒF¨.Æü‡ */
+	$"F083 9598 26AE 8847 7E22 278D 9311 59FC"            /* ðƒ•˜&®ˆG~"'�“.Yü */
+	$"2995 1D44 BA58 24BC 2A99 3946 0E00 9144"            /* )•.DºX$¼*™9F..‘D */
+	$"9113 0297 29E3 A7B5 B937 2D23 8405 86ED"            /* ‘..—)㧵¹7-#„.†í */
+	$"29F1 5254 6A8C 0FB8 4B13 F6C3 6028 2C14"            /* )ñRTjŒ.¸K.öÃ`(,. */
+	$"3B80 E317 225C 7A9B 405C 7E95 A2E4 311B"            /* ;€ã."\z›@\~•¢ä1. */
+	$"076A D7B8 A4B5 225A 1F29 FAA2 8239 D98F"            /* .j׸¤µ"Z.)ú¢‚9Ù� */
+	$"071A F302 DA24 AE80 2AC0 D108 035D EA76"            /* ..ó.Ú$®€*ÀÑ..]êv */
+	$"2F7E 850F 9E87 6B19 B2F1 F1E5 F5B3 A5AF"            /* /~….ž‡k.²ññåõ³¥¯ */
+	$"35BB D867 8257 8A48 5E4F 6983 E22E 6DAD"            /* 5»Øg‚WŠH^Oiƒâ.m­ */
+	$"D361 1505 ECF2 3F3C DB84 1861 E5AB 6793"            /* Óa..ìò?<Û„.aå«g“ */
+	$"910D 8F56 6BB5 FD17 29DB 242A 6946 8022"            /* ‘.�Vkµý.)Û$*iF€" */
+	$"7DAF 8120 02EB C840 3765 69EC BB8B F2FF"            /* }¯� .ëÈ@7ei컋òÿ */
+	$"6031 7BE4 EFC4 BECD 7BD7 CB0A 8B8C 75C2"            /* `1{äïľÍ{×Ë‹Œu */
+	$"E63A F4E4 B05B 1442 0CB1 BEBD E078 84F5"            /* æ:ôä°[.B.±¾½àx„õ */
+	$"3D95 24FA 952F 949B AD72 01B7 1CC7 4CA6"            /* =•$ú•/”›­r.·.ÇL¦ */
+	$"78C2 BA05 B757 517A 5CB1 A380 0C23 0680"            /* xº.·WQz\±£€.#.€ */
+	$"3113 0CBA 23B8 AA48 F832 B74F 997E 6E03"            /* 1..º#¸ªHø2·O™~n. */
+	$"D16C 577F 968F E9A4 73CA DA79 07B3 A5F1"            /* ÑlW.–�é¤sÊÚy.³¥ñ */
+	$"2D20 C13D F821 62F9 41A0 A7AA 472A 368A"            /* - Á=ø!bùA §ªG*6Š */
+	$"28EE 7686 F7B4 D5CF 225E 004E 709F C4E8"            /* (îv†÷´ÕÏ"^.NpŸÄè */
+	$"FCBC B778 C976 A1E0 1968 1EF9 E998 2DC2"            /* ü¼·xÉv¡à.h.ùé˜- */
+	$"1693 C645 A4F5 787A 5B10 45C0 F010 8596"            /* .“ÆE¤õxz[.EÀð.…– */
+	$"A0F6 E8AA 1BAC C958 C0F6 101E 0C4D 2E61"            /*  öèª.¬ÉXÀö...M.a */
+	$"B76E 4019 58DD 3058 000C 2375 6EBC 6599"            /* ·n@.XÝ0X..#un¼e™ */
+	$"BEA3 9ADC 0002 F98F 24B3 B036 EA0D F2FD"            /* ¾£šÜ..ù�$³°6ê.òý */
+	$"6823 E10A 59D7 5D0B F6C0 EFB2 7D9D A684"            /* h#áÂY×].öÀï²}�¦„ */
+	$"3084 4AD6 92F2 BFB2 57CA 7294 FF2D 53C8"            /* 0„JÖ’ò¿²WÊr”ÿ-SÈ */
+	$"8D05 254E 2360 582F CE0C E209 240D FAB4"            /* �.%N#`X/Î.âÆ$.ú´ */
+	$"C638 2103 7462 2AF1 5461 2036 09B4 294F"            /* Æ8!.tb*ñTa 6Æ´)O */
+	$"52A6 6553 F6B7 85F6 E77F A8B7 058C F201"            /* R¦eSö·…öç.¨·.Œò. */
+	$"19BA D75B 6612 0013 CFA6 F54F 8855 C000"            /* .º×[f...ϦõOˆUÀ. */
+	$"00BE 57DE C13B 77B0 AF81 F95D 8E88 7224"            /* .¾WÞÁ;w°¯�ù]Žˆr$ */
+	$"002F C7BE 1D06 F540 58EF 1909 1D8F 037F"            /* ./Ǿ..õ@Xï.Æ.�.. */
+	$"E973 290F 641E 8849 F996 EA66 D15C CA23"            /* és).d.ˆIù–êfÑ\Ê# */
+	$"C620 3090 94D8 F95F C58C 720B 7FFE 206C"            /* Æ 0�”Øù_ÅŒr..þ l */
+	$"A3E0 EE49 AE89 4586 6617 FE87 4D7B D300"            /* £àîI®‰E†f.þ‡M{Ó. */
+	$"4CF6 E77F A882 E041 362F 710E AC03 D573"            /* Löç.¨‚àA6/q.¬.Õs */
+	$"69FF 7480 0018 484B 0D10 C800 0000 0C24"            /* iÿt€..HK..È....$ */
+	$"183F ADBF D900 0184 8481 E82C C758 1848"            /* .?­¿Ù..„„�è,ÇX.H */
+	$"4840 6806 1212 B020 EA50 0818 484B F6E7"            /* H@h...° êP..HKöç */
+	$"7FA5 E774 6249 2F3D 5FF9 2FC0 0C24 1656"            /* .¥çtbI/=_ù/À.$.V */
+	$"1B91 8000 1846 D5F4 CA01 40C2 3F26 3D84"            /* .‘€..FÕôÊ.@Â?&=„ */
+	$"7B4A 811F 08D6 B47D 05C2 4402 D57B C1FC"            /* {J�..Ö´}.ÂD.Õ{Áü */
+	$"7D32 E6FE 8125 F24E 514B 2820 7323 F96F"            /* }2æþ�%òNQK( s#ùo */
+	$"B1F9 CDBD 94E4 C9BF 81D6 5A26 1C08 2131"            /* ±ùͽ”äÉ¿�ÖZ&..!1 */
+	$"FF58 608E A4BB BEFD 703F C3EA B596 2AEA"            /* ÿX`Ž¤»¾ýp?Ãêµ–*ê */
+	$"48B2 2319 2F7A B9BC A14D EAB4 49CF 89E9"            /* H²#./z¹¼¡Mê´Iωé */
+	$"D312 5979 1910 6519 C45E 4B88 F709 D65D"            /* Ó.Yy..e.Ä^Kˆ÷ÆÖ] */
+	$"BF0F 86DC C883 8469 9757 7FC7 FB91 A851"            /* ¿.†Üȃ„i—W.Çû‘¨Q */
+	$"7834 0232 03F5 F552 B022 E799 431E 3FE8"            /* x4.2.õõR°"ç™C.?è */
+	$"BE7C A37B AAE1 D04F 9795 EA98 CAB0 6816"            /* ¾|£{ªáÐO—•ê˜Ê°h. */
+	$"047F 244A 2BD3 E0CF B862 B172 B1B3 F027"            /* ..$J+Óàϸb±r±³ð' */
+	$"6505 A5AA 6AB2 5F8E B98F 85CB D487 2603"            /* e.¥ªj²_Ž¹�…ËÔ‡&. */
+	$"BDA4 4C6D 4B74 0A12 117F 6137 6A30 37CE"            /* ½¤LmKtÂ...a7j07Î */
+	$"0441 188C 63FC 46ED 5C9A B6A0 9012 6450"            /* .A.ŒcüFí\š¶ �.dP */
+	$"A042 C4D3 8E69 8930 0797 25B3 B70D 5C62"            /*  BÄÓŽi‰0.—%³·.\b */
+	$"6A83 3964 5EF1 4A28 508D FF7F E847 17D0"            /* jƒ9d^ñJ(P�ÿ.èG.Ð */
+	$"7C91 F4BC AA82 5462 99EF FF79 5A7A E45E"            /* |‘ô¼ª‚Tb™ïÿyZzä^ */
+	$"98FF 5B1E 90FE 7F80 9453 7AD1 4A63 8FFC"            /* ˜ÿ[.�þ.€”SzÑJc�ü */
+	$"1B61 796C 4B90 7FE9 1959 752B 8579 95F8"            /* .aylK�.é.Yu+…y•ø */
+	$"C5B9 7EC6 2D24 5185 1BCE 12D6 B418 B42C"            /* Ź~Æ-$Q….Î.Ö´.´, */
+	$"D40F 7AF7 657E 5184 9CAA 8834 B65C 4785"            /* Ô.z÷e~Q„œªˆ4¶\G… */
+	$"B934 7C3A 8000 0000 99F5 3F06 3790 6AF7"            /* ¹4|:€...™õ?.7�j÷ */
+	$"0769 9D8E F19F 4FF3 EDE6 D059 B97C A1F0"            /* .i�ŽñŸOóíæÐY¹|¡ð */
+	$"0CE2 4FAF B846 8CCE 52E4 E898 D2E0 00A3"            /* .âO¯¸FŒÎRäè˜Òà.£ */
+	$"CB3D F2B1 E7F7 0C30 FF13 DB29 474C C00D"            /* Ë=ò±ç÷.0ÿ.Û)GLÀ. */
+	$"C6B7 6A2D 2F89 8E2F BDE7 F2BA C3DD 591B"            /* Æ·j-/‰Ž/½çòºÃÝY. */
+	$"CEDE C7DD 35BA 492C BB53 2AF6 7315 AC30"            /* ÎÞÇÝ5ºI,»S*ös.¬0 */
+	$"17D7 1C05 3AE4 4AB3 8D31 0DC9 7A9F 0A76"            /* .×..:äJ³�1.ÉzŸÂv */
+	$"B4EE 95EE 6CB5 1C6A FE4F D27E 0966 CE51"            /* ´î•îlµ.jþOÒ~ÆfÎQ */
+	$"8607 E144 F4AD E999 5480 05FF 7FC2 C645"            /* †.áDô­é™T€.ÿ.ÂÆE */
+	$"D136 BB6E 89FA 9A2D F827 338F FEB9 B248"            /* Ñ6»n‰úš-ø'3�þ¹²H */
+	$"23A6 377D 0E53 BBF3 D290 3AD8 F58B CE4C"            /* #¦7}.S»óÒ�:Øõ‹ÎL */
+	$"24CA 8E49 76ED DA48 8856 904D C31F 305F"            /* $ÊŽIvíÚHˆV�MÃ.0_ */
+	$"C441 7DAA 86D8 3FE1 5EA7 E20A CDBC 5F2A"            /* ÄA}ª†Ø?á^§âÂͼ_* */
+	$"35DC 107F DDE2 D88C 7B38 D700 4C54 9C81"            /* 5Ü..ÝâØŒ{8×.LTœ� */
+	$"B8FD F39D 0F47 DE2B 6E17 7D4F E30F F60C"            /* ¸ýó�.GÞ+n.}Oã.ö. */
+	$"0895 5694 3006 1211 EFEC D7F8 F743 3D43"            /* .•V”0...ïì×ø÷C=C */
+	$"6BA5 7C06 9025 9188 E369 0FC8 94CB F38E"            /* k¥|.�%‘ˆãi.È”ËóŽ */
+	$"DF76 CA67 91C4 D786 F34F 1E56 332B 1404"            /* ßvÊg‘Ä׆óO.V3+.. */
+	$"B66B 2702 B13D 47B8 1FBD 38D7 A2DF 54EF"            /* ¶k'.±=G¸.½8×¢ßTï */
+	$"FD1C 00CC 5D05 5B28 3EBF 2FC7 7263 5880"            /* ý..Ì].[(>¿/ÇrcX€ */
+	$"0364 4A0B 982F 4A13 A55F 5D64 61D2 110C"            /* .dJ.˜/J.¥_]daÒ.. */
+	$"4319 318A 5BD6 94B7 DBA9 92F0 379B 0E87"            /* C.1Š[Ö”·Û©’ð7›.‡ */
+	$"4561 92A0 0000 0000 0000 12FE B897 0ABD"            /* Ea’ .......þ¸—½ */
+	$"B3C7 FEA8 AE43 B177 DA3F 2BA3 2D59 3358"            /* ³Çþ¨®C±wÚ?+£-Y3X */
+	$"9FAE 567F E53B 2877 9FFF 7FFF 7FFB 4B90"            /* Ÿ®V.å;(wŸÿ.ÿ.ûK� */
+	$"C00D FEA3 7DF6 39C4 C825 2952 2C65 8FFF"            /* À.þ£}ö9ÄÈ%)R,e�ÿ */
+	$"7E91 DB49 1333 7DEC 6471 1E2E 394E A080"            /* ~‘ÛI.3}ìdq..9N € */
+	$"C1C9 0DD4 62C4 4FC9 E332 BC0D F9DD FEAB"            /* ÁÉ.ÔbÄOÉã2¼.ùÝþ« */
+	$"9D33 8271 2A01 8484 B009 6058 624E 2736"            /* �3‚q*.„„°Æ`XbN'6 */
+	$"529C A0F4 BCBB 846D 32FD 407C FA84 2D52"            /* Rœ ô¼»„m2ý@|ú„-R */
+	$"21DC 1623 210B 0410 4061 212D 0386 04FF"            /* !Ü.#!...@a!-.†.ÿ */
+	$"7F72 1DFF 6F83 6A31 2B6E 0A6B D1F1 9A43"            /* .r.ÿoƒj1+nÂkÑñšC */
+	$"F340 2C47 D413 DFAC FF76 46AC 4BDD 55F0"            /* ó@,GÔ.߬ÿvF¬KÝUð */
+	$"2F9A 3BC6 613E 2F69 F45C 08F3 3FCB F83F"            /* /š;Æa>/iô\.ó?Ëø? */
+	$"F7D8 DC38 0F99 4764 0309 0948 41C6 1212"            /* ÷ØÜ8.™Gd.ÆÆHAÆ.. */
+	$"293B 5EA3 BE56 F760 BAEF 61FF 43D4 2891"            /* );^£¾V÷`ºïaÿCÔ(‘ */
+	$"A380 672E FF7E 4B98 FBFB 1ACD 90F6 4A7E"            /* £€g.ÿ~K˜ûû.Í�öJ~ */
+	$"3B14 E9F4 B1B4 4120 E600 AF42 0056 B131"            /* ;.éô±´A æ.¯B.V±1 */
+	$"0310 EF4F EA97 E030 9090 A298 F514 CEFA"            /* ..ïOê—à0��¢˜õ.Îú */
+	$"B200 0061 211A A495 FD76 5850 B8F7 1CF1"            /* ²..a!.¤•ývXP¸÷.ñ */
+	$"A979 F478 5BFF 7FFB E6D6 F6D8 03FF 7FFD"            /* ©yôx[ÿ.ûæÖöØ.ÿ.ý */
+	$"2A36 38D4 BA43 6280 D508 C4BD 735D 1C6F"            /* *68ÔºCb€Õ.Ľs].o */
+	$"2444 63E9 1C9A 969F 90A6 F34E D24D 94F2"            /* $Dcé.š–Ÿ�¦óNÒM”ò */
+	$"1A09 F86A 2762 886F FBA0 96EA 1DC7 0364"            /* .Æøj'bˆoû –ê.Ç.d */
+	$"6192 A000 0000 0000 0000 0000 0061 BE9F"            /* a’ ..........a¾Ÿ */
+	$"2C25 5C25 4958 1428 AA60 5ABF 5551 6084"            /* ,%\%IX.(ª`Z¿UQ`„ */
+	$"D319 B739 1DC3 F92F 03A7 CF66 39CC 13BE"            /* Ó.·9.Ãù/.§Ïf9Ì.¾ */
+	$"100A 204E 9A06 CBD9 A8ED 9E4D CEED AE53"            /* . Nš.ËÙ¨ížMÎí®S */
+	$"023D B3BF AC07 F70E F7DD 2601 E2B4 B214"            /* .=³¿¬.÷.÷Ý&.â´². */
+	$"3B1D 74CD 0F60 7063 EFC5 24B8 3B0F DF21"            /* ;.tÍ.`pcïÅ$¸;.ß! */
+	$"2929 3755 A800 7D09 63D9 1548 5D89 6D22"            /* ))7U¨.}ÆcÙ.H]‰m" */
+	$"FAEF 37DC EB96 FF52 0018 EBDF 464C 8B34"            /* úï7Üë–ÿR..ëßFL‹4 */
+	$"DF85 2990 1CF1 7C84 CEDC D384 5003 D5A1"            /* ß…)�.ñ|„ÎÜÓ„P.Õ¡ */
+	$"2797 DBDC FDFB 0E8C 3703 470D 1FD5 B974"            /* '—ÛÜýû.Œ7.G..Õ¹t */
+	$"5A32 CF32 3D2A 0213 FDC8 8A0C B595 4840"            /* Z2Ï2=*..ýÈŠ.µ•H@ */
+	$"C240 6E40 D585 AF4C 004A F98F FC90 E5BB"            /* Â@n@Õ…¯L.Jù�ü�å» */
+	$"D6AD 2A34 0A6E 1D4D 933D 2221 80B7 C8EF"            /* Ö­*4Ân.M“="!€·Èï */
+	$"7C61 2953 2991 F91A 61A3 B54E 56D2 77E1"            /* |a)S)‘ù.a£µNVÒwá */
+	$"1DB8 8B5F 5E9C 7D32 80A0 C23F BBE6 A2B2"            /* .¸‹_^œ}2€ Â?»æ¢² */
+	$"D49F C777 4BE6 FDA6 7B0F 2983 E19B 84FF"            /* ÔŸÇwKæý¦{.)ƒá›„ÿ */
+	$"4B7B 0DD6 A35E 60AD 632D D6D7 7030 0A9F"            /* K{.Ö£^`­c-Ö×p0Ÿ */
+	$"0FA2 0820 8451 9624 D0FF 1FB4 9B81 61CC"            /* .¢. „Q–$Ðÿ.´›�aÌ */
+	$"591F 6D98 E1AF 16E4 AF42 1FE0 B7C7 30DF"            /* Y.m˜á¯.ä¯B.à·Ç0ß */
+	$"CFFC EC14 15A1 B07A 4E11 ED5F BDB3 FD2A"            /* Ïüì..¡°zN.í_½³ý* */
+	$"84B1 6901 4333 27BB 2E8C 3329 2064 A800"            /* „±i.C3'».Œ3) d¨. */
+	$"0001 2FDE 803E 817B C369 A30F FCF0 FF1D"            /* ../Þ€>�{Ãi£.üðÿ. */
+	$"89A1 2FD7 FF71 B63D 19EC 98DE DFE2 D9B8"            /* ‰¡/×ÿq¶=.ì˜ÞßâÙ¸ */
+	$"9D39 1737 4722 2A89 D291 623B 279F BF0B"            /* �9.7G"*‰Ò‘b;'Ÿ¿. */
+	$"E8C0 8AF8 CBE4 0011 5D58 29AB 34B0 335C"            /* èÀŠøËä..]X)«4°3\ */
+	$"36B2 1383 D820 11B8 22DF 56E1 27EF 932D"            /* 6².ƒØ .¸"ßVá'ï“- */
+	$"30DE CC72 58E3 9BDD A88C 229A CBC8 A466"            /* 0ÞÌrXã›Ý¨Œ"šËȤf */
+	$"7C29 FDE8 E789 F28F 3258 A2DD 897B 1C6A"            /* |)ýèç‰ò�2X¢Ý‰{.j */
+	$"C048 306A EEA7 3DF0 F8D4 BECC CDBD 9E43"            /* ÀH0jî§=ðøÔ¾ÌͽžC */
+	$"A29D 8052 478B 6470 79B7 B38A 5743 CAE7"            /* ¢�€RG‹dpy·³ŠWCÊç */
+	$"0BD4 0F4A 23E1 4C85 39C9 DEB0 75AF 151E"            /* .Ô.J#áL…9ÉÞ°u¯.. */
+	$"45D5 1681 2BA4 74C9 13B5 746A E399 9467"            /* EÕ.�+¤tÉ.µtjã™”g */
+	$"E6B9 D503 7F7C D57D 4D5F 7FC8 DD43 7D9B"            /* æ¹Õ..|Õ}M_.ÈÝC}› */
+	$"3CDC F9AD 167C 162B 4E6C 2110 DB2C DF34"            /* <Üù­.|.+Nl!.Û,ß4 */
+	$"AEED CCE4 05AC 4057 9829 B161 9CA0 8159"            /* ®íÌä.¬@W˜)±aœ �Y */
+	$"A64F FD15 EC5A 4A51 CA6C FD10 9A25 4291"            /* ¦Oý.ìZJQÊlý.š%B‘ */
+	$"1E90 1FC2 3530 E0DB E4E6 232E CB64 AF95"            /* .�.Â50àÛäæ#.Ëd¯• */
+	$"9494 656D D395 3D62 9EDA 2EC1 DB02 1FAA"            /* ””emÓ•=bžÚ.ÁÛ..ª */
+	$"6778 0FC0 C4A2 CCA8 EDC0 4DA8 F889 162F"            /* gx.ÀĢ̨íÀM¨ø‰./ */
+	$"03F9 A9C1 C635 1DAD 2E22 580B 0B2B 83E3"            /* .ù©ÁÆ5.­."X..+ƒã */
+	$"EC02 5552 3AA8 91BA 45AF 5439 4265 71F6"            /* ì.UR:¨‘ºE¯T9Beqö */
+	$"3E7A 4412 5DE5 1863 50E6 C0ED C470 3ED9"            /* >zD.]å.cPæÀíÄp>Ù */
+	$"0E3F 48BA 54C5 915E 03F0 D836 6429 2A67"            /* .?HºTÅ‘^.ðØ6d)*g */
+	$"B7FA 6AF9 069E 8E67 2848 B570 C3AC 7746"            /* ·újù.žŽg(HµpìwF */
+	$"EB48 0A2F 4BE4 8EB3 3F8F 791F 0646 DEDF"            /* ëHÂ/K䎳?�y..FÞß */
+	$"316B EFDF 6FD8 C0B9 7319 CE94 8930 C6F6"            /* 1kïßoØÀ¹s.Δ‰0Æö */
+	$"6399 C4A9 79AD E967 4783 3F8D C538 3C15"            /* c™Ä©y­égGƒ?�Å8<. */
+	$"E5B7 CE98 22B7 5333 A938 B26F 0E1E EF2E"            /* å·Î˜"·S3©8²o..ï. */
+	$"74B9 72EF 9D8A 80B7 FDC1 8334 A5F9 DCFB"            /* t¹rï�Š€·ýÁƒ4¥ùÜû */
+	$"B891 BB38 373C 9BE8 59F4 6018 6E63 DA65"            /* ¸‘»87<›èYô`.ncÚe */
+	$"9B13 9DC8 28DB 3C15 0D2C 11FC 0E2D 7A0A"            /* ›.�È(Û<..,.ü.-z */
+	$"F8FF 671F C3FF 7F8E 1210 C212 EA5A 5F0B"            /* øÿg.Ãÿ.Ž..Â.êZ_. */
+	$"9727 F770 25A5 236D 9789 75C7 4089 11DD"            /* —'÷p%¥#m—‰uÇ@‰.Ý */
+	$"E472 3865 B217 B946 CF22 5225 27DE 566D"            /* är8e².¹FÏ"R%'ÞVm */
+	$"6799 4F82 0D46 59F5 E466 F9E7 71C3 FA80"            /* g™O‚.FYõäfùçqÃú€ */
+	$"7826 E598 FF48 E181 6CA8 5A7E C354 0CAA"            /* x&å˜ÿHá�l¨Z~ÃT.ª */
+	$"B01C 9EC4 181F 849B 6A13 FB8D C477 70BD"            /* °.žÄ..„›j.û�Äwp½ */
+	$"F46B 278C 4467 B0CF 3E21 805E EF97 9696"            /* ôk'ŒDg°Ï>!€^ï—–– */
+	$"CBB9 E3F6 B62E DC26 001A 408F D7E2 07C3"            /* ˹ãö¶.Ü&..@�×â.à */
+	$"C1A4 AD97 4235 8863 A088 1980 C505 6E1F"            /* Á¤­—B5ˆc ˆ.€Å.n. */
+	$"F392 0B24 B500 20DC 8295 5703 F9B9 FF70"            /* ó’.$µ. Ü‚•W.ù¹ÿp */
+	$"355C 9B8D BB49 898F 1AAB F65F 7D7E E28F"            /* 5\›�»I‰�.«ö_}~â� */
+	$"4300 BDCC FB20 4F67 CA07 0CAE 3BAD AA36"            /* C.½Ìû OgÊ..®;­ª6 */
+	$"A4D8 3358 4176 1AD6 01FA 0450 0000 0042"            /* ¤Ø3XAv.Ö.ú.P...B */
+	$"7B49 E0E8 A7D8 4EA9 E1A5 597B DB80 BA6D"            /* {Iàè§ØN©á¥Y{Û€ºm */
+	$"8010 25EA 0A26 833F DE77 DBF7 78B9 564B"            /* €.%êÂ&ƒ?ÞwÛ÷x¹VK */
+	$"57B2 AF8C BC92 97D7 46A1 23C1 B595 A2EE"            /* W²¯Œ¼’—×F¡#Áµ•¢î */
+	$"F8A9 29FA 42C2 3557 6345 80B1 FCFD F322"            /* ø©)úBÂ5WcE€±üýó" */
+	$"E992 9262 A83F E43D B059 CB12 D425 FEF2"            /* é’’b¨?ä=°YË.Ô%þò */
+	$"9932 1BD8 C65C ED82 D05E E15C 5E9C 76B7"            /* ™2.ØÆ\í‚Ð^á\^œv· */
+	$"7C64 FCDB A247 D388 3CCB 86B5 C486 2261"            /* |düÛ¢GÓˆ<ˆµÄ†"a */
+	$"BFD1 7213 39C3 0D69 6AF0 2476 B711 7E91"            /* ¿Ñr.9Ã.ijð$v·.~‘ */
+	$"6B53 6A04 4F3C 2781 A090 3118 6C3F 49BA"            /* kSj.O<'� �1.l?Iº */
+	$"B81A 3FEB D686 EFCE F487 8315 E33F 84DB"            /* ¸.?ëÖ†ïÎô‡ƒ.ã?„Û */
+	$"E2C9 F35F 28C5 10C4 FF7F FA4F E953 89FC"            /* âÉó_(Å.Äÿ.úOéS‰ü */
+	$"8B32 23C6 0D04 5E49 DADA F0FE BCA7 D2C9"            /* ‹2#Æ..^IÚÚðþ¼§ÒÉ */
+	$"5869 EAD4 F153 9BF5 A5EA 3298 CC8B 8721"            /* XiêÔñS›õ¥ê2˜Ì‹‡! */
+	$"F919 680B 3F8C 304A 2849 4970 41CF 0F60"            /* ù.h.?Œ0J(IIpAÏ.` */
+	$"76D9 5820 EF21 CD4A 205A 632F 7CC4 EFDF"            /* vÙX ï!ÍJ Zc/|Äïß */
+	$"33F3 CCA8 EDAF 405B 78E1 8F79 0F66 6573"            /* 3ǫ́í¯@[xá�y.fes */
+	$"35A2 AD75 1E18 6018 AF23 7C9D A008 1A01"            /* 5¢­u..`.¯#|� ... */
+	$"C5FE 69AA 2C8E D97E 244D D075 F213 0CC6"            /* Åþiª,ŽÙ~$MÐuò..Æ */
+	$"738F 4395 BBC0 5CB6 3ADC 3DA8 ACB8 E018"            /* s�C•»À\¶:Ü=¨¬¸à. */
+	$"BA5B 13DB 0F6A CB18 DEAC 9749 F5B5 361D"            /* º[.Û.jË.Þ¬—Iõµ6. */
+	$"CF3A C107 9606 179F F4C7 F3DE CB0B 1F53"            /* Ï:Á.–..ŸôÇóÞË..S */
+	$"F27E 5D3C 11AB 66B4 8037 0644 AE98 19BF"            /* ò~]<.«f´€7.D®˜.¿ */
+	$"D564 973A 0CF2 C96F 56D4 5CB8 666F C68C"            /* Õd—:.òÉoVÔ\¸foÆŒ */
+	$"1E73 E515 8B33 75D2 D3B4 B3A3 8CDE DE0C"            /* .så.‹3uÒÓ´³£ŒÞÞ. */
+	$"DA37 A3DF 44D2 B57E 2DB2 E891 D36F CC23"            /* Ú7£ßDÒµ~-²è‘ÓoÌ# */
+	$"ADE8 45BC BB30 78D7 77BD D4A8 087F C83F"            /* ­èE¼»0x×w½Ô¨..È? */
+	$"E49A 6873 FAC4 C12B 0056 5E18 C3CB C2E9"            /* äšhsúÄÁ+.V^.ÃËÂé */
+	$"DCAE F0E8 A75F 18DD B8DD 1DCD B0F5 3A1C"            /* Ü®ðè§_.ݸÝ.Í°õ:. */
+	$"3816 51A8 0D93 00D0 6FF6 8F07 E4BE EDF9"            /* 8.Q¨.“.Ðoö�.ä¾íù */
+	$"BF0E 6CAA 5384 5DF0 DF12 4CF4 E3B3 5D6C"            /* ¿.lªS„]ðß.Lôã³]l */
+	$"602A B6F1 C0E0 E520 B0D6 71FB 7996 4930"            /* `*¶ñÀàå °Öqûy–I0 */
+	$"23DD 3601 3653 C40D 1A64 DC2B D5C2 01C9"            /* #Ý6.6SÄ..dÜ+ÕÂ.É */
+	$"5002 6BBE 7338 81EE F87D 7687 0FE6 7CF9"            /* P.k¾s8�îø}v‡.æ|ù */
+	$"BAB6 5B35 1A25 421C 5BBA 4D82 4E1F B1D4"            /* º¶[5.%B.[ºM‚N.±Ô */
+	$"1907 FF78 F534 4A16 7BB6 B598 51F6 E4D3"            /* ..ÿxõ4J.{¶µ˜QöäÓ */
+	$"A04B 1198 B926 CFAE FC03 22E3 8360 E696"            /*  K.˜¹&Ï®ü."ãƒ`æ– */
+	$"F546 62F9 7178 F327 E245 4520 8D17 41C4"            /* õFbùqxó'âEE �.AÄ */
+	$"9EC6 EF8D 0924 9416 7901 CE87 5EBB 286D"            /* žÆï�Æ$”.y.·^»(m */
+	$"53BF 09FA 41F6 5FBA 8F4C 79A8 75BA 277A"            /* S¿ÆúAö_º�Ly¨uº'z */
+	$"7D42 642B 38EE 9A49 DEDB F1B3 80D0 E5D0"            /* }Bd+8îšIÞÛñ³€ÐåÐ */
+	$"2980 F797 E7D0 F90D 4B2F AFDD 4A69 3389"            /* )€÷—çÐù.K/¯ÝJi3‰ */
+	$"1418 EBD0 6DF0 E38D 6E2F D546 C1A8 C8DD"            /* ..ëÐmðã�n/ÕFÁ¨ÈÝ */
+	$"8977 E053 9C26 053A CF69 97F9 7FB4 9000"            /* ‰wàSœ&.:Ïi—ù.´�. */
+	$"0000 0115 0E67 B64C 0015 DD82 643D 6476"            /* .....g¶L..Ý‚d=dv */
+	$"ED28 6324 AD72 8124 1AF6 FB1B 21C9 0605"            /* í(c$­r�$.öû.!É.. */
+	$"FAE6 04A6 31BF 6D67 FF7B B889 831A 4FFD"            /* úæ.¦1¿mgÿ{¸‰ƒ.Oý */
+	$"6BF5 F098 23AB A490 39F7 6AFC 3832 E2E1"            /* kõð˜#«¤�9÷jü82âá */
+	$"11B2 ADB0 ECCA 83DE B4FF 3685 5106 75DE"            /* .²­°ìʃ޴ÿ6…Q.uÞ */
+	$"3047 28A0 EDBE AD29 17CD DA62 698B CE64"            /* 0G( í¾­).ÍÚbi‹Îd */
+	$"5999 2B8E BB7D C74F F009 A25D B2B5 BDD9"            /* Y™+Ž»}ÇOðÆ¢]²µ½Ù */
+	$"B852 BFFE 0B74 9C05 22D7 B0A3 2139 0979"            /* ¸R¿þ.tœ."×°£!9Æy */
+	$"5C29 BAE8 43DA F9E5 5383 AFD2 14EC 64AA"            /* \)ºèCÚùåSƒ¯Ò.ìdª */
+	$"442C CE71 74ED 5C27 4331 9374 AC77 47EE"            /* D,Îqtí\'C1“t¬wGî */
+	$"31AC 4C74 97BC 753C D5DC 3D8B F7D2 C612"            /* 1¬Lt—¼u<ÕÜ=‹÷ÒÆ. */
+	$"2399 F431 07A1 76CA DAE6 772B 309A C800"            /* #™ô1.¡vÊÚæw+0šÈ. */
+	$"9F2F D6DF A44C 48EB 853E 4140 A123 BCA3"            /* Ÿ/ÖߤLHë…>A@¡#¼£ */
+	$"D096 00DA 0822 DFB3 6887 B31F A18F 59BE"            /* Ж.Ú."ß³h‡³.¡�Y¾ */
+	$"6B25 B5CF CFA3 8806 85B7 ED84 B20B CDA2"            /* k%µÏÏ£ˆ.…·í„².Í¢ */
+	$"A0C8 404B 3FFF 7FF3 3816 5BF0 A16B 85D0"            /*  È@K?ÿ.ó8.[ð¡k…Ð */
+	$"B87F E4BB 21F9 A3BB 9103 2944 434A 5789"            /* ¸.ä»!ù£»‘.)DCJW‰ */
+	$"E3EC B1E3 6F3E 154A 37E4 ACA6 4B02 6C5B"            /* ãì±ão>.J7䬦K.l[ */
+	$"D23A D4D4 83CE F291 CD7F 114F 5935 8EE0"            /* Ò:ÔÔƒÎò‘Í..OY5Žà */
+	$"17EA F0B3 1D93 BC5F 2CF8 511C E99F 21D8"            /* .êð³.“¼_,øQ.éŸ!Ø */
+	$"E286 EB17 6FC2 C34B 1110 6398 03BF CB08"            /* â†ë.oÂÃK..c˜.¿Ë. */
+	$"0018 4848 E24D 90A5 63F9 B1F8 6E20 EF6E"            /* ..HHâM�¥cù±øn ïn */
+	$"25D5 858B 0AE4 2235 581B D4DA E01C B006"            /* %Õ…‹Âä"5X.ÔÚà.°. */
+	$"E5EB DE78 855B 19E7 4D80 DAC2 1E8F CB2B"            /* åëÞx…[.çM€ÚÂ.�Ë+ */
+	$"0EC8 3FFF 7759 B569 0861 20CC 1D71 2121"            /* .È?ÿwYµi.a Ì.q!! */
+	$"71A7 FA20 B34B EAB3 4260 A827 6E91 2B3C"            /* q§ú ³Kê³B`¨'n‘+< */
+	$"5479 449A 3161 D24E 8489 C00A 18A6 3FEC"            /* TyDš1aÒN„‰ÀÂ.¦?ì */
+	$"61F2 4C86 23C1 85DB 6ECA 221D BCC2 C25F"            /* aòL†#Á…ÛnÊ".¼ÂÂ_ */
+	$"EFFF 7891 F475 0E20 DC0A 8F85 8208 4541"            /* ïÿx‘ôu. ÜÂ�…‚.EA */
+	$"579B 5EE2 24C4 5C60 39B7 D9F1 ECFD 0F0C"            /* W›^â$Ä\`9·Ùñìý.. */
+	$"3719 72A8 A543 8BF5 94BF BF6C E6F7 E45A"            /* 7.r¨¥C‹õ”¿¿læ÷äZ */
+	$"C5CF 1FD7 32F5 2D70 041E 3641 2C46 E23D"            /* ÅÏ.×2õ-p..6A,Fâ= */
+	$"E072 6889 A892 A27F 44A8 564A 74A3 B421"            /* àrh‰¨’¢.D¨VJt£´! */
+	$"E1CC A0F3 50E2 2711 6919 76BE D84B D2FE"            /* áÌ óPâ'.i.v¾ØKÒþ */
+	$"AAED 2D64 7C8F 4C55 7FFF 7EFC 2CBF 05DE"            /* ªí-d|�LU.ÿ~ü,¿.Þ */
+	$"25B2 001C 00EC 6D17 ED17 E559 9DFA F731"            /* %²...ìm.í.åY�ú÷1 */
+	$"B21A 7394 8B35 5948 BA4F 5858 020F FF7C"            /* ².s”‹5YHºOXX..ÿ| */
+	$"C89D 1CFA F89B 9F9C 841F 19EF D626 E6DE"            /* È�.úø›Ÿœ„..ïÖ&æÞ */
+	$"DCC3 3148 38A0 C32F 898F BEC3 0AF3 318C"            /* ÜÃ1H8 Ã/‰�¾ÃÂó1Œ */
+	$"5E09 119B 43C8 9FE6 73B2 F4B9 9789 4BFC"            /* ^Æ.›CÈŸæs²ô¹—‰Kü */
+	$"99A2 FF7F FF7A 4FD0 8C64 F459 410C 013C"            /* ™¢ÿ.ÿzOÐŒdôYA..< */
+	$"1C6C 85B5 1C8F D078 995D 714E 1C60 3090"            /* .l…µ.�Ðx™]qN.`0� */
+	$"9058 77C4 BB80 5F57 1871 CA72 B2FD 0016"            /* �XwÄ»€_W.qÊr²ý.. */
+	$"BAA7 F84F F4E9 ACDF F766 8CB4 475D 2F0B"            /* º§øOôé¬ß÷fŒ´G]/. */
+	$"37BC 18C8 6162 79C2 BDD7 8753 204B A536"            /* 7¼.Èaby½ׇS K¥6 */
+	$"9CBE 4972 316A BCB1 9442 4238 B88F 2F48"            /* œ¾Ir1j¼±”BB8¸�/H */
+	$"7A45 5CD1 A306 3A23 5A78 354F CDB6 C0A5"            /* zE\Ñ£.:#Zx5OͶÀ¥ */
+	$"2A5C 19DA 0B0C CD84 8D85 D2B8 1DC9 059C"            /* *\.Ú..Í„�…Ò¸.É.œ */
+	$"A8C4 8118 4848 9372 9372 566C 21E5 2665"            /* ¨Ä�.HH“r“rVl!å&e */
+	$"D16C 6601 48A8 35CE 7FFF 7F19 B54E 7F04"            /* Ñlf.H¨5Î.ÿ..µN.. */
+	$"10EC 1AA3 13FF 4588 9722 A7AA B011 863C"            /* .ì.£.ÿEˆ—"§ª°.†< */
+	$"E4B1 717B 7C2D 21E6 267B 4B48 E790 FF76"            /* ä±q{|-!æ&{KHç�ÿv */
+	$"40CC F425 41CB 289F 809D 8170 A529 2EDA"            /* @Ìô%AË(Ÿ€��p¥).Ú */
+	$"A105 B3AF FB44 7951 B87A 0091 5B53 5979"            /* ¡.³¯ûDyQ¸z.‘[SYy */
+	$"CDC6 5976 6393 34F2 21FF 7FFF 7FFF 7D43"            /* ÍÆYvc“4ò!ÿ.ÿ.ÿ}C */
+	$"4F4B C77F 73C7 0454 BE9C BE9C 282E 440E"            /* OKÇ.sÇ.T¾œ¾œ(.D. */
+	$"0608 A380 6121 2103 DBD2 250B 5D57 9159"            /* ..£€a!!.ÛÒ%.]W‘Y */
+	$"B69A 28CF E66A 154F F84F F4E9 99ED 48C4"            /* ¶š(Ïæj.OøOôé™íHÄ */
+	$"CA7E BE76 FC67 A7CD DC26 1C00 0184 8463"            /* Ê~¾vüg§ÍÜ&...„„c */
+	$"69A8 C0A9 127C 5830 CC3A 380A C742 E4DE"            /* i¨À©.|X0Ì:8ÂÇBäÞ */
+	$"06F5 7999 556D FD9F 268B 895F FF4B 7BB9"            /* .õy™UmýŸ&‹‰_ÿK{¹ */
+	$"C201 52B7 B483 0906 65EC 1848 4750 6F27"            /* Â.R·´ƒÆ.eì.HGPo' */
+	$"C86C 1F27 9108 6253 0416 4CD3 30E4 7F77"            /* Èl.'‘.bS..LÓ0ä.w */
+	$"0705 8420 83B6 BCB6 29DE B71E 8DC5 851A"            /* ..„ ƒ¶¼¶)Þ·.�Å…. */
+	$"ABB0 83D8 F2E2 5113 55D2 AAF6 B3AB 7679"            /* «°ƒØòâQ.UÒªö³«vy */
+	$"49FE A1F8 6F30 0EC0 7D91 534C C78C DC5D"            /* Iþ¡øo0.À}‘SLÇŒÜ] */
+	$"5A42 CA06 37D8 E0ED 27FA 3E31 C849 D2BE"            /* ZBÊ.7Øàí'ú>1ÈIÒ¾ */
+	$"847C 0CCF 676F ACFE 91A3 0F62 B711 1897"            /* „|.Ïgo¬þ‘£.b·..— */
+	$"9DC3 8E37 3AF8 907E 0B69 1577 2856 AA36"            /* �ÃŽ7:ø�~.i.w(Vª6 */
+	$"FAC0 D56C 6686 0443 CA96 FDCD 051B 23A7"            /* úÀÕlf†.CÊ–ýÍ..#§ */
+	$"7DAC 8229 C5FC F840 103A 6407 49F7 6B32"            /* }¬‚)Åüø@.:d.I÷k2 */
+	$"254F 2B32 7FC1 F460 D5C0 5EE1 3046 612A"            /* %O+2.Áô`ÕÀ^á0Fa* */
+	$"1BC1 C143 7B76 B9EF ECCB 5EE9 8F0C 3F71"            /* .ÁÁC{v¹ïìË^é�.?q */
+	$"E805 8B9B 17B7 9ECE C237 AF5C 0062 E61E"            /* è.‹›.·žÎÂ7¯\.bæ. */
+	$"DF6C C1F7 904E 4379 2A9C 92FC 1B04 00A8"            /* ßlÁ÷�NCy*œ’ü...¨ */
+	$"F9D5 DB1B C4C6 9485 ABC2 1199 CCF2 0A47"            /* ùÕÛ.ÄÆ”…«Â.™ÌòÂG */
+	$"9693 C097 7AD0 449A FC53 DEC5 6EE8 6BF7"            /* –“À—zÐDšüSÞÅnèk÷ */
+	$"0D7D 4ED8 3426 DA7E ECF9 57ED 9252 9A6A"            /* .}NØ4&Ú~ìùWí’Ršj */
+	$"2B94 2614 1B6E A495 8261 4D5E DAEF 03FA"            /* +”&..n¤•‚aM^Úï.ú */
+	$"8A63 9496 E8AB A1A6 5B5C B03E E73E 2889"            /* Šc”–è«¡¦[\°>ç>(‰ */
+	$"D257 6C28 080A 68DC 226C 950F F55B E7CC"            /* ÒWl(.ÂhÜ"l•.õ[çÌ */
+	$"95AD FDA7 43EA 7489 A545 C0FC E9B0 2A25"            /* •­ý§Cêt‰¥EÀüé°*% */
+	$"719C EE06 9E5A 8FC0 D3B0 0C81 1EB0 C8C6"            /* qœî.žZ�ÀÓ°.�.°ÈÆ */
+	$"25BD B383 33BD B80D D9A9 48F3 7539 D7D5"            /* %½³ƒ3½¸.Ù©Hóu9×Õ */
+	$"8021 5EBA 94A7 83A3 69FE 8179 9106 BC56"            /* €!^º”§ƒ£iþ�y‘.¼V */
+	$"14A4 427B 8C09 BACB 2FC9 B8F3 CAFA E51C"            /* .¤B{ŒÆºË/ɸóÊúå. */
+	$"9C07 9A69 033C 6159 163E 6ED8 259D 7AAB"            /* œ.ši.<aY.>nØ%�z« */
+	$"D316 475C F6C7 BD0E 7972 4C59 DF3A D5B4"            /* Ó.G\öǽ.yrLYß:Õ´ */
+	$"44ED 7D01 B0FB 34D4 4C9C BC2D B8A6 5B65"            /* Dí}.°û4ÔLœ¼-¸¦[e */
+	$"134F 0C96 5CA1 21CC A249 F17D 4660 9835"            /* .O.–\¡!Ì¢Iñ}F`˜5 */
+	$"957C 7392 53A9 DE42 E650 604B 10E2 FF12"            /* •|s’S©ÞBæP`K.âÿ. */
+	$"B47A 044A 524A B8D3 60B5 A258 CEAB 55E8"            /* ´z.JRJ¸Ó`µ¢XΫUè */
+	$"5219 EC3E A9F6 0813 A2B4 930C EDE4 3BBE"            /* R.ì>©ö..¢´“.íä;¾ */
+	$"C0E3 7F93 1A3F 38EB 2DE3 492D A3BD FD00"            /* Àã.“.?8ë-ãI-£½ý. */
+	$"811C 530E 2FB8 9D68 2466 D288 EC29 9094"            /* �.S./¸�h$fÒˆì)�” */
+	$"A3C7 2D32 0A25 BA73 2023 08CA C360 2C72"            /* £Ç-2Â%ºs #.ÊÃ`,r */
+	$"8BA9 516A 7081 F2FF 1E84 E1C2 F841 77CE"            /* ‹©Qjp�òÿ.„áÂøAwÎ */
+	$"ABDF 6476 30A4 3018 F7F4 F3EE 1A5E 5DF0"            /* «ßdv0¤0.÷ôóî.^]ð */
+	$"CAAA AA77 C90D 52C4 6AA9 5755 33B9 1814"            /* ʪªwÉ.RÄj©WU3¹.. */
+	$"3528 E205 C379 648A E627 A23E D5DB 1CAE"            /* 5(â.ÃydŠæ'¢>ÕÛ.® */
+	$"4868 B7D4 F381 2534 1F48 2BCC 5211 3B0F"            /* Hh·Ôó�%4.H+ÌR.;. */
+	$"9692 B002 4CFB 1F83 3628 D1EB 5416 0648"            /* –’°.Lû.ƒ6(ÑëT..H */
+	$"F0F0 B0F8 C7C7 6E92 8C54 6859 791B 7890"            /* ðð°øÇÇn’ŒThYy.x� */
+	$"EBA3 BC74 5F3F C4AD 7C9D 6954 2D0C 15BF"            /* 룼t_?Ä­|�iT-..¿ */
+	$"F699 82A6 4170 D2F1 02A5 7EF3 6061 C9CF"            /* ö™‚¦ApÒñ.¥~ó`aÉÏ */
+	$"C370 E129 F805 8CC8 C670 CBDC 2D44 D349"            /* Ãpá)ø.ŒÈÆpËÜ-DÓI */
+	$"F3E5 C5F9 357E 3DF2 CDF3 DC8A 1F13 5B2D"            /* óåÅù5~=òÍóÜŠ..[- */
+	$"C544 448D 1038 8293 4EEA 75A4 0738 7D9F"            /* ÅDD�.8‚“Nêu¤.8}Ÿ */
+	$"C002 3D68 26D8 7B06 FB10 CCDF C4F3 5364"            /* À.=h&Ø{.û.ÌßÄóSd */
+	$"2342 154B F8FB 01ED 8893 9160 A3A0 B81D"            /* #B.Køû.툓‘`£ ¸. */
+	$"47A0 6C82 1CBA FAED 931D E025 BDFF 1535"            /* G l‚.ºúí“.à%½ÿ.5 */
+	$"CADF 68C5 41FD 3896 1AC9 F979 A885 F5AE"            /* ÊßhÅAý8–.Éùy¨…õ® */
+	$"EFBE C674 ED92 5FE9 E9AF FF52 D573 A6DD"            /* ï¾Ætí’_éé¯ÿRÕs¦Ý */
+	$"631B 27E4 62CB B76E 7020 EC65 75E2 DB6F"            /* c.'äbË·np ìeuâÛo */
+	$"0E10 980A 0EA3 2287 4CF8 D402 52B8 1491"            /* ..˜Â.£"‡LøÔ.R¸.‘ */
+	$"21C9 BC2B 48BC CBD4 464A C539 6CD5 28F1"            /* !ɼ+H¼ËÔFJÅ9lÕ(ñ */
+	$"CAE4 CA43 9CB8 B181 BF06 522B 4D19 8295"            /* ÊäÊCœ¸±�¿.R+M.‚• */
+	$"05C8 D7CD 8CFA D3E7 7BC9 630C DCDD 7C7E"            /* .È×ÍŒúÓç{Éc.ÜÝ|~ */
+	$"E4C6 D7DC 5E38 67CC 5934 9E8D 9552 B837"            /* äÆ×Ü^8gÌY4ž�•R¸7 */
+	$"53AE 6D39 FAB1 2EB6 886C 1855 26ED AD08"            /* S®m9ú±.¶ˆl.U&í­. */
+	$"1EBE 9570 EA2F DFFF 06F4 ABF3 4534 2831"            /* .¾•pê/ßÿ.ô«óE4(1 */
+	$"1AE2 0A99 2956 2A90 C2A4 58AC E49E F047"            /* .â™)V*�¤X¬äžðG */
+	$"A9BA C394 E8F4 6427 7966 A79C 4269 9ADD"            /* ©ºÃ”èôd'yf§œBišÝ */
+	$"AD1D 1A7E 375C D3FB 8C25 0B6B 0460 5EB9"            /* ­..~7\ÓûŒ%.k.`^¹ */
+	$"416C AE82 DFC3 09DA 1F69 8796 6897 8CD0"            /* Al®‚ßÃÆÚ.i‡–h—ŒÐ */
+	$"3E1B FF7D 9AE9 7F6D 4E84 967C 674F CA41"            /* >.ÿ}šé.mN„–|gOÊA */
+	$"44C1 0575 93A9 2599 66D0 AB7B 6260 D32C"            /* DÁ.u“©%™fЫ{b`Ó, */
+	$"94AF 7FC8 82FD F692 92FE B6ED A660 750F"            /* ”¯.È‚ýö’’þ¶í¦`u. */
+	$"80A2 A8AA E6F6 7B9F E894 ED71 D223 6F4B"            /* €¢¨ªæö{Ÿè”íqÒ#oK */
+	$"A203 F64C 7560 DBB1 6F9E EE9F 2945 C994"            /* ¢.öLu`Û±ožîŸ)EÉ” */
+	$"BA00 D3D1 6414 A300 4296 670B 2350 CDD1"            /* º.ÓÑd.£.B–g.#PÍÑ */
+	$"DF61 29E8 EC17 87B6 BC62 B6BD 5F31 13B2"            /* ßa)èì.‡¶¼b¶½_1.² */
+	$"48A2 F723 53C7 6955 969B ED83 6A9B 1B06"            /* H¢÷#SÇiU–›íƒj›.. */
+	$"C7D0 2584 430B 8C52 D00A 736B D6FB AEDB"            /* ÇÐ%„C.ŒRÐÂskÖû®Û */
+	$"2BA1 5095 759B 0AFF 5138 58EF 3DC2 B14D"            /* +¡P•u›ÂÿQ8Xï=±M */
+	$"3B7D 62D0 DE12 CFEF 17A3 32C4 C79A C2DA"            /* ;}bÐÞ.Ïï.£2ÄÇšÂÚ */
+	$"6BA1 6478 B1D3 2278 3787 6C30 08FD 6095"            /* k¡dx±Ó"x7‡l0.ý`• */
+	$"FF65 1DF4 7606 34C3 B4EE E609 A3BF 7085"            /* ÿe.ôv.4ôîæÆ£¿p… */
+	$"8B3B 2C80 D860 6043 10A4 24B1 2D80 880D"            /* ‹;,€Ø``C.¤$±-€ˆ. */
+	$"671A 9A76 E1D4 2304 B4E0 9E47 129D 6316"            /* g.šváÔ#.´àžG.�c. */
+	$"33DF C88C 3BB6 5232 475C D19D FA9B 3303"            /* 3ßÈŒ;¶R2G\Ñ�ú›3. */
+	$"2956 D8B1 08A5 2735 CD4D F130 C700 DA0D"            /* )Vر.¥'5ÍMñ0Ç.Ú. */
+	$"7BAE 21FA FB1B 35A5 957E 0211 955B 25D0"            /* {®!úû.5¥•~..•[%Ð */
+	$"A3DD B72F 5BCD 8792 418E BCB6 C727 DD0F"            /* £Ý·/[͇’AŽ¼¶Ç'Ý. */
+	$"2D42 F031 2A73 C1F9 7964 B937 1E77 A757"            /* -Bð1*sÁùyd¹7.w§W */
+	$"D158 CB02 80D3 C310 E1C5 709C 5C69 7F04"            /* ÑXË.€ÓÃ.áÅpœ\i.. */
+	$"4476 F017 3FF2 B891 0160 D681 AEBC F8C9"            /* Dvð.?ò¸‘.`Ö�®¼øÉ */
+	$"8F46 7922 4414 5CEE 0CA8 417B 33BB 5926"            /* �Fy"D.\î.¨A{3»Y& */
+	$"B7A6 7094 6363 C5F2 9AD7 1751 2456 3B83"            /* ·¦p”ccÅòš×.Q$V;ƒ */
+	$"9BB0 0ECD 1420 6141 A097 DBF4 802A 2377"            /* ›°.Í. aA —Ûô€*#w */
+	$"CDAC EFE9 4A16 4B3C 5058 A5DC 1C40 169E"            /* ͬïéJ.K<PX¥Ü.@.ž */
+	$"3999 F0C2 C418 2E8F 0951 664A 7082 F49F"            /* 9™ðÂÄ..�ÆQfJp‚ôŸ */
+	$"E576 B2B1 5918 E3EE 9B97 1686 6499 A572"            /* åv²±Y.ãî›—.†d™¥r */
+	$"B1F6 2F39 A798 6292 DE22 007B 60AD 1D94"            /* ±ö/9§˜b’Þ".{`­.” */
+	$"31BA 068D F15A 06DB 2654 6B52 F692 3C3A"            /* 1º.�ñZ.Û&TkRö’<: */
+	$"0DA8 A74B 30F6 3852 76F0 A897 9086 FBD5"            /* .¨§K0ö8Rvð¨—�†ûÕ */
+	$"1C78 047E 7BF2 08EE 7B45 85C5 6ED5 AA43"            /* .x.~{ò.î{E…ÅnÕªC */
+	$"F423 8A4E 4111 C68E 172E DD87 AF9E BF19"            /* ô#ŠNA.ÆŽ..݇¯ž¿. */
+	$"D4D2 020C 6FD5 EE3F F0E8 289E 4E6C 0871"            /* ÔÒ..oÕî?ðè(žNl.q */
+	$"1187 D3F1 E458 94F5 4519 BF3C D239 D86C"            /* .‡ÓñäX”õE.¿<Ò9Øl */
+	$"17F1 8916 4206 2346 ACD8 1F08 9A44 0AB3"            /* .ñ‰.B.#F¬Ø..šD³ */
+	$"CEE6 441D 78D5 2909 4CEA 46F7 D6C6 D21A"            /* ÎæD.xÕ)ÆLêF÷ÖÆÒ. */
+	$"6D41 BB64 ADFF 6252 5A80 3556 C459 2845"            /* mA»d­ÿbRZ€5VÄY(E */
+	$"C05D C2C5 1F69 4087 0380 C0FF 61AA D5D1"            /* À]ÂÅ.i@‡.€ÀÿaªÕÑ */
+	$"E5C2 5FC0 CEF4 2D59 B4A3 6BA8 343E 184B"            /* åÂ_ÀÎô-Y´£k¨4>.K */
+	$"89CE 81FD AC96 C691 FDE5 F993 B9CB 6302"            /* ‰Î�ý¬–Æ‘ýåù“¹Ëc. */
+	$"B8EE 86B4 A2F7 19EA DAFD D511 B59F BBD2"            /* ¸î†´¢÷.êÚýÕ.µŸ»Ò */
+	$"5D4E F6A3 BC58 51D5 273F 2E2E 2B6A 2755"            /* ]Nö£¼XQÕ'?..+j'U */
+	$"38A3 CA29 BFAB D31D CD53 B29C 7418 40DB"            /* 8£Ê)¿«Ó.ÍS²œt.@Û */
+	$"FD56 1BF6 9350 5411 CF5C 8D26 B1FA 754F"            /* ýV.ö“PT.Ï\�&±úuO */
+	$"E584 8277 6221 6866 257C 9FC9 65A5 6D93"            /* å„‚wb!hf%|ŸÉe¥m“ */
+	$"C524 B971 3F1D 34A0 BBF4 6B83 9722 CFAD"            /* Å$¹q?.4 »ôkƒ—"Ï­ */
+	$"8296 103F 53BB 1B22 8A84 2FAC 94DE 4994"            /* ‚–.?S»."Š„/¬”ÞI” */
+	$"2D31 56A5 DBCD B661 81D7 B360 4958 8FF5"            /* -1V¥ÛͶa�׳`IX�õ */
+	$"EB02 25A9 6386 8241 D936 A3CB AA88 9936"            /* ë.%©c†‚AÙ6£Ëªˆ™6 */
+	$"1698 4F59 765B 34EA 3741 D2D3 2DAC 854D"            /* .˜OYv[4ê7AÒÓ-¬…M */
+	$"366B C9A0 15F8 D2E6 7CCF 99EF A794 460C"            /* 6kÉ .øÒæ|ϙ倫F. */
+	$"934E C88B 2BF5 91F7 7BD1 3DC9 6ED3 91FE"            /* “NÈ‹+õ‘÷{Ñ=ÉnÓ‘þ */
+	$"E63B EDCC 3D4A CC1B AE5D 88D0 B241 20D1"            /* æ;íÌ=JÌ.®]ˆÐ²A Ñ */
+	$"AB6C 9FE2 E494 395E 8E3C 0EB0 1796 58CC"            /* «lŸâä”9^Ž<.°.–XÌ */
+	$"9791 D931 DB33 473E 003E 10CD B736 7295"            /* —‘Ù1Û3G>.>.Í·6r• */
+	$"DD81 B481 9A0A ED27 3C1E 6298 FD0D BDE0"            /* Ý�´�šÂí'<.b˜ý.½à */
+	$"11D6 8A21 79C1 DBB7 FEDC 6E48 8080 5ADB"            /* .ÖŠ!yÁÛ·þÜnH€€ZÛ */
+	$"E61D 9E0E E6A3 6D38 A028 4016 464D F534"            /* æ.ž.æ£m8 (@.FMõ4 */
+	$"D764 3AD7 55DF 3CAB 7B3D 12F5 9A8D DDCF"            /* ×d:×Uß<«{=.õš�ÝÏ */
+	$"6CCD 0387 C982 0FE9 D431 0FE3 E064 1700"            /* lÍ.‡É‚.éÔ1.ãàd.. */
+	$"1AAD F49E D6DE A939 8010 C91B 605B 4E0A"            /* .­ôžÖÞ©9€.É.`[NÂ */
+	$"FCBE ADE9 C17A EC1F 3990 9EB2 E6BF 92AA"            /* ü¾­éÁzì.9�ž²æ¿’ª */
+	$"951C D27F A984 10A9 22DC 996E FF6E 12AE"            /* •.Ò.©„.©"Ü™nÿn.® */
+	$"DC03 5AB3 2CA0 8291 4174 C69E AE28 DBA8"            /* Ü.Z³, ‚‘AtÆž®(Û¨ */
+	$"38A8 FF12 67D3 F8A3 00D6 2A2E A564 CEFA"            /* 8¨ÿ.gÓø£.Ö*.¥dÎú */
+	$"0F00 4B44 62A7 CA9F F072 2821 DD3C 6A34"            /* ..KDb§ÊŸðr(!Ý<j4 */
+	$"926C 8F3C 1548 D31A 021F 2604 252D A929"            /* ’l�<.HÓ...&.%-©) */
+	$"172B 8212 174F 2D2D CC7D DA15 F9A9 AD7E"            /* .+‚..O--Ì}Ú.ù©­~ */
+	$"59D3 7885 9215 C77B 6583 4D8F 3308 149C"            /* YÓx…’.Ç{eƒM�3..œ */
+	$"270A 4508 21C9 A05B CDE9 BEF1 C18A 4B74"            /* 'ÂE.!É [Íé¾ñÁŠKt */
+	$"F07B 0DFE 007B E5AF D9AA CED7 8661 34C7"            /* ð{.þ.{å¯ÙªÎ׆a4Ç */
+	$"AA26 21AC D09C 6BAA EABB A7C4 486E 40A5"            /* ª&!¬Ðœkªê»§ÄHn@¥ */
+	$"C791 976A 1EC3 534F 84EC E6E9 7363 FF08"            /* Ç‘—j.ÃSO„ìæéscÿ. */
+	$"5B20 0E29 000C 5E8F 3339 6210 65CC FD34"            /* [ .)..^�39b.eÌý4 */
+	$"76EB F1B2 76C6 5FDC C1A8 B0F5 53EE 103C"            /* vëñ²vÆ_ÜÁ¨°õSî.< */
+	$"50B0 650F 8459 9777 E890 E28A BB84 56B9"            /* P°e.„Y—wè�⊻„V¹ */
+	$"0522 90F9 5B81 C982 979E E507 A4BC 26C3"            /* ."�ù[�É‚—žå.¤¼&à */
+	$"E356 F2A9 C0D1 BFF3 F882 EC0E 6AA9 CA0D"            /* ãVò©ÀÑ¿óø‚ì.j©Ê. */
+	$"4419 16FB 9BEF 947E F848 19BF 5CB6 EA4E"            /* D..û›ï”~øH.¿\¶êN */
+	$"C290 F254 020B 51DB 8094 4D05 E9A5 21A0"            /* Â�òT..QÛ€”M.é¥!  */
+	$"D3E6 84EA 5A3E 4380 650C B24F 31DA 209F"            /* Óæ„êZ>C€e.²O1Ú Ÿ */
+	$"F51A 9108 7912 32B0 52A6 A901 CADB A758"            /* õ.‘.y.2°R¦©.ÊÛ§X */
+	$"C00A D516 E462 35B4 C071 131A 0F01 9A95"            /* ÀÂÕ.äb5´Àq....š• */
+	$"9739 F131 0E5F 7FBA D8AD 925F 992C 0187"            /* —9ñ1._.ºØ­’_™,.‡ */
+	$"D97C 832B 847E 1148 0402 0449 FB25 D0F1"            /* Ù|ƒ+„~.H...Iû%Ðñ */
+	$"C1F8 2B8E CE97 D5A4 BEFE 7F0D E420 E43E"            /* Áø+ŽÎ—Õ¤¾þ..ä ä> */
+	$"801A 448D 9D61 D23C 5956 3DEB A1A6 0858"            /* €.D��aÒ<YV=롦.X */
+	$"CD98 F32B 92E6 D960 C0E1 E542 294D 6FD3"            /* ͘ó+’æÙ`ÀáåB)MoÓ */
+	$"4234 37C9 3537 275F AC1E 936D 534A BF02"            /* B47É57'_¬.“mSJ¿. */
+	$"B742 8CAB BE88 E4FF 23DC D9EB 1FC4 9CF0"            /* ·BŒ«¾ˆäÿ#ÜÙë.Äœð */
+	$"C5D1 3F1D 5995 AD68 12E9 71B3 2100 AFB7"            /* ÅÑ?.Y•­h.éq³!.¯· */
+	$"CBF7 9ADB D5FF 48EE B1A2 AE4D E021 7C07"            /* Ë÷šÛÕÿHî±¢®Mà!|. */
+	$"5AD5 E94C A965 DFE8 B32A 23AB DE05 4FB1"            /* ZÕéL©eßè³*#«Þ.O± */
+	$"FDB7 ECC5 3611 73D9 B03C 399A D5F6 663D"            /* ý·ìÅ6.sÙ°<9šÕöf= */
+	$"0E78 0BEE 67D9 2F9D 0072 E938 509C 9779"            /* .x.îgÙ/�.ré8Pœ—y */
+	$"6C64 03A1 B8C9 C1C0 2256 29EA 112C FB1C"            /* ld.¡¸ÉÁÀ"V)ê.,û. */
+	$"766C DF51 83B1 388F 902E EE03 337E 689A"            /* vlßQƒ±8��.î.3~hš */
+	$"CA5A A9F0 09AF 3422 4115 D489 3FBD 22C1"            /* ÊZ©ðƯ4"A.Ô‰?½"Á */
+	$"4A4F 642A 0AC8 D01C 2950 18CA D441 780A"            /* JOd*ÂÈÐ.)P.ÊÔAx */
+	$"C929 A7FF 0AFA 956A A581 B590 9B7A 7D74"            /* É)§ÿÂú•j¥�µ�›z}t */
+	$"2084 3DC1 5D81 B12B DF9C 333D EFAD 0ADD"            /*  „=Á]�±+ßœ3=ï­ÂÝ */
+	$"3445 4F8C 132E F02F C2E7 E13F BE12 2F84"            /* 4EOŒ..ð/Âçá?¾./„ */
+	$"7FC3 D55F 876A BE1D 07F2 688D 774C FC3E"            /* .ÃÕ_‡j¾..òh�wLü> */
+	$"A177 C3EA 4FE4 AFFE 1BFF 61D3 2F87 4BFC"            /* ¡wÃêOä¯þ.ÿaÓ/‡Kü */
+	$"946E 03F8 6CFF 06A3 FC28 FE13 BF0F 6B7E"            /* ”n.ølÿ.£ü(þ.¿.k~ */
+	$"1EB8 FC3B 47E1 ECEE EEDF F87D 51FF 07D5"            /* .¸ü;Gáìîîßø}Qÿ.Õ */
+	$"0BBB 87E1 D3FF 0779 FC3B 6FE1 D378 0DF0"            /* .»‡áÓÿ.yü;oáÓx.ð */
+	$"BD7C 29EB A2DD 17F2 6ADB E1DB 7F0D 97E1"            /* ½|)ë¢Ý.òjÛáÛ..—á */
+	$"E84D 7750 FC3E 906F C3E8 35DD 42ED AFE1"            /* èMwPü>�oÃè5ÝBí¯á */
+	$"D33F 0E8D F86E 00F7 91DD 3D8B A94D D83C"            /* Ó?.�øn.÷‘Ý=‹©MØ< */
+	$"B51B 129C 103F 899D B929 4724 C188 2C29"            /* µ..œ.?‰�¹)G$Áˆ,) */
+	$"CE89 11F8 9065 1C37 E234 DFEF 60D7 3221"            /* Ή.ø�e.7â4ßï`×2! */
+	$"5343 F889 DCDB AFB3 6F20 F76A 31D9 986E"            /* SCø‰ÜÛ¯³o ÷j1Ù˜n */
+	$"A745 547E 6F18 076D A675 BA1A 1AAF 6558"            /* §ET~o..m¦uº..¯eX */
+	$"338A FF71 4707 0776 1B62 BCCC 89E5 4726"            /* 3ŠÿqG..v.b¼Ì‰åG& */
+	$"A7CB 8885 E07C DADC D741 3B1D D81F AB03"            /* §Ëˆ…à|ÚÜ×A;.Ø.«. */
+	$"2F84 F52D DFD5 7384 4649 7BA2 5AB1 14C8"            /* /„õ-ßÕs„FI{¢Z±.È */
+	$"3D8D B951 8183 C33A B08E 82CC EF1A F046"            /* =�¹Q�ƒÃ:°Ž‚Ìï.ðF */
+	$"5B62 C9E0 A926 F330 0A61 A30C 6194 7E1E"            /* [bÉà©&ó0Âa£.a”~. */
+	$"1EE9 3D0D 1ABE 5536 A026 8B32 830F C02F"            /* .é=..¾U6 &‹2ƒ.À/ */
+	$"3041 04B7 2C65 024D AC81 D2CC 03CA A08A"            /* 0A.·,e.M¬�ÒÌ.Ê Š */
+	$"B105 F3F1 C365 6BCE 9876 A867 7DBA 63AF"            /* ±.óñÃekΘv¨g}ºc¯ */
+	$"0973 495F DCC1 3552 54BA 5BDB 618D C6C0"            /* ÆsI_ÜÁ5RTº[Ûa�ÆÀ */
+	$"91B8 4489 141B A7D3 F188 8A97 DAB0 8942"            /* ‘¸D‰..§ÓñˆŠ—Ú°‰B */
+	$"EA67 F235 E18A 871B 4B0C DAC6 9050 BA9C"            /* êgò5ኇ.K.ÚÆ�Pºœ */
+	$"C432 95CE 13CA 93ED 4FD5 9495 377D C920"            /* Ä2•Î.Ê“íOÕ”•7}É  */
+	$"C8A2 F997 5348 8890 91D5 0A23 50BF 3C37"            /* È¢ù—SHˆ�‘ÕÂ#P¿<7 */
+	$"8372 7C96 32AA 1CD2 46BE 8220 C983 2A71"            /* ƒr|–2ª.ÒF¾‚ Ƀ*q */
+	$"7961 BF33 9590 C086 CCE9 578B 322E FB50"            /* ya¿3•�À†ÌéW‹2.ûP */
+	$"CB68 6459 C127 EB9B E974 EF02 59F4 FF4D"            /* ËhdYÁ'ë›étï.YôÿM */
+	$"4525 1874 6A9F 99EB DFCC C1B1 72EA 9FA0"            /* E%.tjŸ™ëßÌÁ±r꟠ */
+	$"DE00 BBB9 D95F 36B9 406E 3CE0 3BCF 32B6"            /* Þ.»¹Ù_6¹@n<à;Ï2¶ */
+	$"8DC0 55D6 C6DA 3622 8A6E 63F6 28AE 08AC"            /* �ÀUÖÆÚ6"Šncö(®.¬ */
+	$"03AC 288D 069A 750E CBBD 97D9 E42D BA93"            /* .¬(�.šu.˽—Ùä-º“ */
+	$"E82A 4EB3 C008 CC7C B6A7 6F70 F1BC FDAA"            /* è*N³À.Ì|¶§opñ¼ýª */
+	$"1DF4 D2E4 3ECB 9702 444E 278F 6B50 F00E"            /* .ôÒä>Ë—.DN'�kPð. */
+	$"C228 C132 E5E0 B4DE 93BF DBBD 2C85 ABF9"            /* Â(Á2åà´Þ“¿Û½,…«ù */
+	$"7FAD EC28 1D40 D390 5A2F 9B14 D348 8C76"            /* .­ì(.@Ó�Z/›.ÓHŒv */
+	$"C04B 1173 BF19 8F50 7E3D 8311 BB79 FDA8"            /* ÀK.s¿.�P~=ƒ.»yý¨ */
+	$"1FD4 24A9 5F59 8B76 709E 5C84 1902 8690"            /* .Ô$©_Y‹vpž\„..†� */
+	$"AD49 334F 5AE8 E376 288C BDE7 EE13 FBDE"            /* ­I3OZèãv(Œ½çî.ûÞ */
+	$"7606 0135 6DB2 DCD9 F5B3 E7E2 B2B8 8BE1"            /* v..5m²ÜÙõ³çⲸ‹á */
+	$"1985 85D2 0EC1 5CCD BC74 D88B 7206 5075"            /* .……Ò.Á\ͼtØ‹r.Pu */
+	$"FB92 BF92 C5CB B6E3 024D EB71 D909 AF79"            /* û’¿’Å˶ã.MëqÙƯy */
+	$"DD82 BBF2 37F1 1193 74D0 373D 4043 C292"            /* Ý‚»ò7ñ.“tÐ7=@CÂ’ */
+	$"0B1D 4E8F 04F4 A035 451A 7DCB 02DB D77E"            /* ..N�.ô 5E.}Ë.Û×~ */
+	$"DD1C 3667 1BA7 2584 C128 3835 4454 5C15"            /* Ý.6g.§%„Á(85DT\. */
+	$"5846 C7D1 4689 3D2A 1172 9BA8 9830 F037"            /* XFÇÑF‰=*.r›¨˜0ð7 */
+	$"0053 8FD6 4023 68C6 7122 CAC6 0325 5AF3"            /* .S�Ö@#hÆq"ÊÆ.%Zó */
+	$"E104 A423 C5AE F551 6DF6 7B11 D5EB FD34"            /* á.¤#Å®õQmö{.Õëý4 */
+	$"DF67 C50C 737D 74D5 D5EC 7027 A2D8 C79A"            /* ßgÅ.s}tÕÕìp'¢ØÇš */
+	$"200D A972 A30A 509A C3DE 483F 8B53 D69C"            /*  .©r£ÂPšÃÞH?‹SÖœ */
+	$"001F 47E9 BD2C 84EC DB83 B493 0326 DE6E"            /* ..Gé½,„ìÛƒ´“.&Þn */
+	$"336A 7C76 3225 8351 7B2D 37B5 D645 9866"            /* 3j|v2%ƒQ{-7µÖE˜f */
+	$"019E 6472 40C4 5853 3376 9D90 D3EA A727"            /* .ždr@ÄXS3v��Óê§' */
+	$"07A1 A4B8 A32F 475A 22A2 059C AB5B F13E"            /* .¡¤¸£/GZ"¢.œ«[ñ> */
+	$"E2DF 5B3E E6B5 B27F 28AF A15F 400C 7D9F"            /* âß[>æµ².(¯¡_@.}Ÿ */
+	$"43ED 33D4 9B4D CB64 E550 5FED FC2F E485"            /* Cí3Ô›MËdåP_íü/ä… */
+	$"271E 2DB1 6AE5 6793 EFE8 FCC5 A784 4C95"            /* '.-±jåg“ïèüŧ„L• */
+	$"E488 B5AC A528 BACB 10FF 4ABD D554 E56B"            /* 䈵¬¥(ºË.ÿJ½ÕTåk */
+	$"F72E 8ED7 5E48 60A4 82D0 381F A2D4 625C"            /* ÷.Ž×^H`¤‚Ð8.¢Ôb\ */
+	$"9F80 2A63 5FD3 DD0C EDA8 3DE3 281E A65C"            /* Ÿ€*c_ÓÝ.í¨=ã(.¦\ */
+	$"88EA 1A96 626D DC03 79BE C4ED EA60 4FC5"            /* ˆê.–bmÜ.y¾Äíê`OÅ */
+	$"BB10 D9D5 99AF 0534 65C2 05AE 8D23 82B0"            /* ».ÙÕ™¯.4eÂ.®�#‚° */
+	$"6FB7 881A 7BC5 0316 7A28 4B27 2763 A6C3"            /* o·ˆ.{Å..z(K''c¦Ã */
+	$"8FC7 073A 1391 81BB 707F 625D 355F B1DF"            /* �Ç.:.‘�»p.b]5_±ß */
+	$"A749 C3EE A157 EC1F 0F6C 70AB 1A36 5711"            /* §IÃî¡Wì..lp«.6W. */
+	$"C49B 1CA8 54A0 0FB9 6A2E 0F86 2E57 BC2F"            /* Ä›.¨T .¹j..†.W¼/ */
+	$"8CDD B76A F6DB 83F9 EEFF 4BF1 DE60 660E"            /* ŒÝ·jöÛƒùîÿKñÞ`f. */
+	$"BCBA 7D68 D5DE 8663 DF06 3F65 A981 38D7"            /* ¼º}hÕÞ†cß.?e©�8× */
+	$"CC20 EBAE 6143 C79E D2F3 DCF4 FA0F 433E"            /* Ì ë®aCÇžÒóÜôú.C> */
+	$"6DFE 4C5F 032A F6DD DD11 F85F 5003 22CD"            /* mþL_.*öÝÝ.ø_P."Í */
+	$"C07E F1CC 40B9 8D61 825D 77C7 91A6 BD49"            /* À~ñÌ@¹�a‚]wÇ‘¦½I */
+	$"2590 4BCD EB13 37A2 D5FA 2931 F311 9028"            /* %�KÍë.7¢Õú)1ó.�( */
+	$"6C02 96FC ACF5 1EA4 8E51 4BC9 FDE8 DFEF"            /* l.–ü¬õ.¤ŽQKÉýèßï */
+	$"C5A0 8082 7E0D C127 3A80 A65B 7989 CCEE"            /* Å €‚~.Á':€¦[y‰Ìî */
+	$"6F6A 8DDF FB5B 46A5 3757 7FC3 3EFD BC0A"            /* oj�ßû[F¥7W.Ã>ý¼Â */
+	$"8567 1CB0 3BE7 A153 D7CE 8F63 D2DC 8840"            /* …g.°;ç¡S×Î�cÒ܈@ */
+	$"D993 E028 0E86 AA99 3ADE CC55 A789 CFC8"            /* Ù“à(.†ª™:ÞÌU§‰ÏÈ */
+	$"D92B 9613 3850 B7B3 467A FA09 7D45 E174"            /* Ù+–.8P·³FzúÆ}Eát */
+	$"D351 3254 64A3 7FC5 0D8D 1EDB FEC9 3F05"            /* ÓQ2Td£.Å.�.ÛþÉ?. */
+	$"C3C2 264B ACB8 F3C3 1BFF 04A5 12CF C191"            /* ÃÂ&K¬¸óÃ.ÿ.¥.ÏÁ‘ */
+	$"8CA0 5985 E34C E583 A230 CD43 8602 BAAF"            /* Œ Y…ãL僢0ÍC†.º¯ */
+	$"1475 FCA7 B274 1314 051F AF06 089D 13B1"            /* .uü§²t....¯..�.± */
+	$"5C06 815E FAA5 6864 CECE D56A 127C 058B"            /* \.�^ú¥hdÎÎÕj.|.‹ */
+	$"1859 E9E8 7A98 4299 3CFF 70CE C2DD 8676"            /* .Yéèz˜B™<ÿpÎÂ݆v */
+	$"1798 5F8E 9960 922E 9226 3F9B 5657 890F"            /* .˜_Ž™`’.’&?›VW‰. */
+	$"75BC FECF 6919 6701 D086 0EA5 26BA 8B78"            /* u¼þÏi.g.І.¥&º‹x */
+	$"7381 41FC 19AD 7201 BFD9 B3D3 2F00 1A1C"            /* s�Aü.­r.¿Ù³Ó/... */
+	$"E689 F3BC 5FC7 0418 66A2 5AEE 0374 DE30"            /* æ‰ó¼_Ç..f¢Zî.tÞ0 */
+	$"DC4B 70F1 ACC6 2BC6 06E9 461F E71B CD5E"            /* ÜKpñ¬Æ+Æ.éF.ç.Í^ */
+	$"2766 D533 884B A37F 7820 5CCA 3D60 1C3A"            /* 'fÕ3ˆK£.x \Ê=`.: */
+	$"8865 509F C1F0 86B6 9A91 0A52 426E CF1D"            /* ˆePŸÁð†¶š‘ÂRBnÏ. */
+	$"4B52 7AFE 9519 ECDB 9DD3 BFA1 80F7 50BD"            /* KRzþ•.ìÛ�Ó¿¡€÷P½ */
+	$"D2DD 6FAB F00D 3600 9104 37AC 81AA F9C3"            /* ÒÝo«ð.6.‘.7¬�ªùà */
+	$"3933 A702 AC9C 42F1 4579 C5F2 CD99 165F"            /* 93§.¬œBñEyÅòÍ™._ */
+	$"2D84 FE8B D02C 055F F99C 1729 45C7 6B56"            /* -„þ‹Ð,._ùœ.)EÇkV */
+	$"EE73 818A 9940 BB46 1408 639B 9779 C805"            /* îs�Š™@»F..c›—yÈ. */
+	$"1B0B CC86 D42E E9BB 046D 0E93 7273 E00F"            /* ..̆Ô.é».m.“rsà. */
+	$"B7D5 D377 E0ED 2494 4623 5BDF C83C 54A5"            /* ·ÕÓwàí$”F#[ßÈ<T¥ */
+	$"6B6B D343 F20E AD4C B45C 2BF4 7C65 87A1"            /* kkÓCò.­L´\+ô|e‡¡ */
+	$"E2EA E2B7 FF17 F9A1 5606 D5A7 C113 F062"            /* âêâ·ÿ.ù¡V.Õ§Á.ðb */
+	$"D50E E647 922C 8746 7CBA 99C8 4400 979D"            /* Õ.æG’,‡F|º™ÈD.—� */
+	$"3D09 19E7 3A84 E245 ED1F 1C14 3967 45CE"            /* =Æ.ç:„âEí...9gEÎ */
+	$"2B06 C383 F2A6 2CEE 02E6 A2A7 1821 0F3F"            /* +.Ãò¦,î.梧.!.? */
+	$"4057 F9E9 B830 94C7 65AA C396 6F97 2721"            /* @Wùé¸0”ÇeªÃ–o—'! */
+	$"F1AC 6AF7 6C6C 3F02 D2F1 343D 8B42 0F6F"            /* ñ¬j÷ll?.Òñ4=‹B.o */
+	$"E2D4 A7D8 7158 F033 C573 AD72 01B7 1CC7"            /* âÔ§ØqXð3Ås­r.·.Ç */
+	$"4CA6 78C2 BABD BB30 5E03 BDEE DF19 8240"            /* L¦xº½»0^.½îß.‚@ */
+	$"9521 A43A B142 2F42 3590 AD8C B9FD A409"            /* •!¤:±B/B5�­Œ¹ý¤Æ */
+	$"9D77 38E7 B8F8 3BCD 4478 61C3 5768 0324"            /* �w8ç¸ø;ÍDxaÃWh.$ */
+	$"4E55 4240 1E87 1F93 D0BA 6929 C235 7E76"            /* NUB@.‡.“кi)Â5~v */
+	$"F6E8 AA1B AF13 15FD EB95 2609 BE7D BFE8"            /* öèª.¯..ýë•&ƾ}¿è */
+	$"3E51 8F2E 4780 4EE6 891E F83D FF7D D1C3"            /* >Q�.G€Næ‰.ø=ÿ}Ñà */
+	$"818F 28A2 2AC0 AD00 7F03 5781 2882 A44A"            /* ��(¢*À­...W�(‚¤J */
+	$"6728 D9F6 E77F A883 C794 71AC 55E9 8112"            /* g(Ùöç.¨ƒÇ”q¬Ué�. */
+	$"BF6F ECDA 9BD1 96B8 79AA A397 A6F2 C93F"            /* ¿oìڛі¸yª£—¦òÉ? */
+	$"3792 B8C4 8667 AAF4 659D 59F6 E77F A870"            /* 7’¸Ä†gªôe�Yöç.¨p */
+	$"24F1 5461 DB69 0F4C F8B3 F02A F6E7 7FA6"            /* $ñTaÛi.Lø³ð*öç.¦ */
+	$"26C9 5EDE 9BB6 A1C6 9467 854A 5327 BA38"            /* &É^Þ›¶¡Æ”g…JS'º8 */
+	$"F535 A01A B90A 9580 95A0 FE5C A623 DE0D"            /* õ5 .¹Â•€• þ\¦#Þ. */
+	$"6C3E BF23 66F2 9312 9490 EB88 1D63 7AF4"            /* l>¿#fò“.”�ëˆ.czô */
+	$"9F5B 7F45 9078 3A5F CC36 7702 EAD5 FA4D"            /* Ÿ[.E�x:_Ì6w.êÕúM */
+	$"5F9D 258B 14A8 A235 6490 6B7D 2B05 42C3"            /* _�%‹.¨¢5d�k}+.Bà */
+	$"2A5A 791E 92C3 B1E8 B323 FF74 81FC B063"            /* *Zy.’ñè³#ÿt�ü°c */
+	$"4A31 CBBC 91E2 A64A F935 FE79 4C07 1376"            /* J1˼‘â¦Jù5þyL..v */
+	$"002A 4795 5221 70B2 005C 41F9 D631 126F"            /* .*G•R!p².\AùÖ1.o */
+	$"FF7F DF03 06BD 7214 71AB 4EF3 8EEA 0261"            /* ÿ.ß..½r.q«NóŽê.a */
+	$"D054 C087 EA15 CBD2 4645 2F9F 3600 4144"            /* ÐTÀ‡ê.ËÒFE/Ÿ6.AD */
+	$"5671 C61E D3CB 8B84 A60D B58E FB69 C71F"            /* VqÆ.ÓË‹„¦.µŽûiÇ. */
+	$"B09A EDD9 AAC0 6FBA D7FE 8C4D 8262 6C73"            /* °šíÙªÀoº×þŒM‚bls */
+	$"9F69 0E81 7581 1D52 FB27 C979 1597 69EA"            /* Ÿi.�u�.Rû'Éy.—iê */
+	$"F1DF E906 0B77 2E21 D31A 5CCD 9474 95A2"            /* ñßé..w.!Ó.\Í”t•¢ */
+	$"CB48 AB27 5F53 B82F 1638 16A4 87CD ED1F"            /* ËH«'_S¸/.8.¤‡Íí. */
+	$"20BC 2894 5EE1 C84C 1AC1 1158 0293 024E"            /*  ¼(”^áÈL.Á.X.“.N */
+	$"1023 0E4F 9BD8 FA73 6E62 FF7F FD08 5797"            /* .#.O›Øúsnbÿ.ý.W— */
+	$"0788 A951 6DDA 2448 21D2 7FCA 20B4 E1BF"            /* .ˆ©QmÚ$H!Ò.Ê ´á¿ */
+	$"3262 89C7 5386 ACB1 8B89 6AC3 F907 1355"            /* 2b‰ÇS†¬±‹‰jÃù..U */
+	$"66D9 1E5A 5B54 19E9 2737 FF7C B8DF 1F5E"            /* fÙ.Z[T.é'7ÿ|¸ß.^ */
+	$"3592 B16D 6089 DE73 8F19 479D 626B 977D"            /* 5’±m`‰Þs�.G�bk—} */
+	$"185E F7A3 AF62 AD92 E5AC 2F74 B991 F96F"            /* .^÷£¯b­’å¬/t¹‘ùo */
+	$"211F 5AE0 4C27 344F A9E1 C731 DB20 A0FF"            /* !.ZàL'4O©áÇ1Û  ÿ */
+	$"7FFF 7F2E 356F CC55 C6B8 C2C9 2AEF 2D31"            /* .ÿ..5oÌUƸÂÉ*ï-1 */
+	$"EFEB D878 C16F B1B1 3D47 240C 489C 7153"            /* ïëØxÁo±±=G$.HœqS */
+	$"E5F8 A5C8 6E2C 7650 AED0 C4B7 43EA 67B6"            /* åø¥Èn,vP®ÐÄ·Cêg¶ */
+	$"94E4 7274 CFEB 4CF3 FD3E 8065 B9CC 35A5"            /* ”ärtÏëLóý>€e¹Ì5¥ */
+	$"21B1 3804 AD98 4F8A 6FFC 50DA 014C 442B"            /* !±8.­˜OŠoüPÚ.LD+ */
+	$"AA41 1455 BD94 B366 A37D CA82 7FFC DE57"            /* ªA.U½”³f£}Ê‚.üÞW */
+	$"2EA9 98C2 5510 E51E 24CC 0428 4C83 1BBE"            /* .©˜ÂU.å.$Ì.(Lƒ.¾ */
+	$"0A46 A6DD 6963 D4CB 24E8 748B ED10 7B6D"            /* ÂF¦ÝicÔË$èt‹í.{m */
+	$"E61C 86C3 C80E 3030 FCE9 2263 C956 95A1"            /* æ.†ÃÈ.00üé"cÉV•¡ */
+	$"AED0 C4B1 D07C F701 9DA0 ED2C C401 BC1A"            /* ®ÐıÐ|÷.� í,Ä.¼. */
+	$"9421 2D43 EF12 7494 8D46 CB82 3FE2 6439"            /* ”!-Cï.t”�FË‚?âd9 */
+	$"6BDE C8CE 23B7 9D2E B6F9 DF4B C1A9 A145"            /* kÞÈÎ#·�.¶ùßKÁ©¡E */
+	$"1512 85E6 30E6 98D1 AC22 EEBC 459C D841"            /* ..…æ0æ˜Ñ¬"î¼EœØA */
+	$"0A0F 1F31 2F75 7937 220F 7271 FE79 44A6"            /* Â..1/uy7".rqþyD¦ */
+	$"777E 1645 E0BA D980 0FFF 7D9F EC83 A930"            /* w~.EàºÙ€.ÿ}Ÿìƒ©0 */
+	$"D12B 216D 4D3F 4AD0 5EE9 DBC7 53D7 0A21"            /* Ñ+!mM?JÐ^éÛÇS×Â! */
+	$"2372 C608 6701 8AFA 8E33 4125 2B7E 38DA"            /* #rÆ.g.ŠúŽ3A%+~8Ú */
+	$"5990 99EE B1D0 B07C 9F9D 97DD D658 2C2A"            /* Y�™î±Ð°|Ÿ�—ÝÖX,* */
+	$"C7D6 4556 2AA7 297F ACBE 4802 B472 E76F"            /* ÇÖEV*§).¬¾H.´rço */
+	$"644F 2F11 17FF 7F9D CE1C 2989 7199 03B1"            /* dO/..ÿ.�Î.)‰q™.± */
+	$"E719 2B3B 1131 C4CC 808B BC7A 26A4 479F"            /* ç.+;.1ÄÌ€‹¼z&¤GŸ */
+	$"4824 6486 E338 DB65 A502 454C C415 B8D0"            /* H$d†ã8Ûe¥.ELÄ.¸Ð */
+	$"7C77 7323 E381 5958 F415 95B9 142E 85F8"            /* |ws#ã�YXô.•¹..…ø */
+	$"1742 E22F FF17 567B A195 DFF1 7EE0 8E40"            /* .Bâ/ÿ.V{¡•ßñ~àŽ@ */
+	$"431A B629 DDCE AED1 A925 9FCD 56B5 7945"            /* C.¶)Ýήѩ%ŸÍVµyE */
+	$"B8B9 77DF 732C CD1E 8137 2645 1135 9593"            /* ¸¹wßs,Í.�7&E.5•“ */
+	$"E31C 333B 30E2 518D E202 A1E0 FEA6 C40E"            /* ã.3;0âQ�â.¡àþ¦Ä. */
+	$"BB50 0174 C21D 0BFB 34C1 1A8D 8E5D FF77"            /* »P.tÂ..û4Á.�Ž]ÿw */
+	$"909A 8111 3123 8200 AFC2 0525 13A1 C383"            /* �š�.1#‚.¯Â.%.¡Ãƒ */
+	$"5472 BA45 8D58 8818 E5CD 6FEA D858 47C5"            /* TrºE�Xˆ.åÍoêØXGÅ */
+	$"F5A0 7773 3C86 1CE8 9A67 FAA7 5726 643B"            /* õ ws<†.èšgú§W&d; */
+	$"1BF8 C2C1 E7AD D3CE E89B 97C4 0210 1FAE"            /* .øÂÁç­ÓÎè›—Ä...® */
+	$"9319 1F1F 7F89 0B76 5918 7EF8 9947 CF44"            /* “....‰.vY.~ø™GÏD */
+	$"6B5C 4B5D 5067 58A7 F35E CF39 7D01 C555"            /* k\K]PgX§ó^Ï9}.ÅU */
+	$"FCD3 E0F6 C1A4 9C8A 0B34 2D33 A20D F664"            /* üÓàöÁ¤œŠ.4-3¢.öd */
+	$"C174 CCE8 CAA1 C45F 2974 101B 86E7 68FD"            /* ÁtÌèÊ¡Ä_)t..†çhý */
+	$"D6FE 8FE9 AC95 5D3D DE38 1829 E3B9 37FE"            /* Öþ�鬕]=Þ8.)ã¹7þ */
+	$"5008 F383 21C4 4D57 AE92 9F94 A9BB 3A76"            /* P.óƒ!ÄMW®’Ÿ”©»:v */
+	$"705F 8D2D 889C EB93 FD2B 05C5 89F2 500E"            /* p_�-ˆœë“ý+.ʼnòP. */
+	$"4220 A486 F348 D466 4D62 E368 540A 1D25"            /* B ¤†óHÔfMbãhTÂ.% */
+	$"AF7C A9EF 43CC E423 16FC 6EE5 C407 DDAE"            /* ¯|©ïCÌä#.ünåÄ.Ý® */
+	$"EB28 23D2 3FDE 40EF 2ED1 D53A B87B 9C40"            /* ë(#Ò?Þ@ï.ÑÕ:¸{œ@ */
+	$"80A2 77EF CC8F D34E C33F 7BB4 4748 E4A6"            /* €¢wïÌ�ÓNÃ?{´GHä¦ */
+	$"B177 05FF 085F CBF9 F1A0 8CA7 4200 32AC"            /* ±w.ÿ._Ëùñ Œ§B.2¬ */
+	$"7B87 A517 EA04 C96C F9A3 C6ED 5FFF 7FED"            /* {‡¥.ê.Élù£Æí_ÿ.í */
+	$"D5EB F835 3E15 6882 AED1 72BF B42C 87DE"            /* Õëø5>.h‚®Ñr¿´,‡Þ */
+	$"8111 0F7A 5DA6 CFEA 79A7 9174 89E8 E637"            /* �..z]¦Ïêy§‘t‰èæ7 */
+	$"7E56 B53E 9987 2013 8F1A 06A5 07A2 1856"            /* ~Vµ>™‡ .�..¥.¢.V */
+	$"FE30 E259 128A 968B 881F E88D 8566 98D7"            /* þ0âY.Š–‹ˆ.è�…f˜× */
+	$"C815 C397 64E8 9FAC 059A 5922 C863 F220"            /* È.×d蟬.šY"Ècò  */
+	$"EC2A 4AF8 5DB2 A77D FC6A 3AC1 357E D5CC"            /* ì*Jø]²§}üj:Á5~ÕÌ */
+	$"142B 85B0 FEE0 2579 D845 CDFD F507 4C58"            /* .+…°þà%yØEÍýõ.LX */
+	$"D86A F299 0BBC A0A8 39A4 03D9 2144 6B3E"            /* Øjò™.¼ ¨9¤.Ù!Dk> */
+	$"6D67 242B 0FEB B6F4 79CB 58ED 2338 DB9F"            /* mg$+.ë¶ôyËXí#8ÛŸ */
+	$"6EC7 1626 0FDD 0C77 1E00 2AE4 8B46 F39C"            /* nÇ.&.Ý.w..*ä‹Fóœ */
+	$"6268 EE5F FF49 B5C8 30E7 9859 E163 A9D4"            /* bhî_ÿIµÈ0ç˜Yác©Ô */
+	$"C50F BC0C 46BB BBC7 9FFF 7D54 E81B 8936"            /* Å.¼.F»»ÇŸÿ}Tè.‰6 */
+	$"A032 72E8 6576 5FEA 9A3F A5A9 9E58 B9C2"            /*  2rèev_êš?¥©žX¹Â */
+	$"A089 A039 5695 766F 3295 A1FF 7F5F FBDB"            /*  ‰ 9V•vo2•¡ÿ._ûÛ */
+	$"A3FD 1F1F 76AD 6787 B4D0 D1A5 E4EA 72F8"            /* £ý..v­g‡´ÐÑ¥äêrø */
+	$"0276 0C35 EC34 65A8 000A CA35 6AAE 1800"            /* .v.5ì4e¨.ÂÊ5j®.. */
+	$"99CA 1B65 F56D 6C3B DF33 AB08 94A3 15CF"            /* ™Ê.eõml;ß3«.”£.Ï */
+	$"C9B8 D32E 35D7 D32D 57E6 86D2 A5BE 2B3A"            /* ɸÓ.5×Ó-Wæ†Ò¥¾+: */
+	$"4535 2C10 41FE FDA9 E202 3927 BC4F 5F90"            /* E5,.Aþý©â.9'¼O_� */
+	$"E637 311C DB00 E394 09F3 005B 7DB3 0DFE"            /* æ71.Û.ã”Æó.[}³.þ */
+	$"9F1F CAA4 DD03 B381 8330 AB38 E13B 2F9C"            /* Ÿ.ʤÝ.³�ƒ0«8á;/œ */
+	$"3DB5 01C5 100A 5D16 5C8D 792C FA0E 1A85"            /* =µ.Å.Â].\�y,ú..… */
+	$"E3FF 467A 6333 E4F1 F27C 9E2B 161E 18F0"            /* ãÿFzc3äñò|ž+...ð */
+	$"3F30 9C2C 631D BE74 4B7F 6E21 3FBC 404E"            /* ?0œ,c.¾tK.n!?¼@N */
+	$"E063 4152 D02D 68E4 869C E7E9 E4E6 4E95"            /* àcARÐ-h䆜çéäæN• */
+	$"3A66 1FDA 1145 DFB4 0796 9F97 503C E2C9"            /* :f.Ú.Eß´.–Ÿ—P<âÉ */
+	$"7F49 D644 1290 98BD 8EA0 2FA1 CF00 E383"            /* .IÖD.�˜½Ž /¡Ï.ム*/
+	$"C003 7BFE D79B FF62 A38E 2C39 A64D 19FF"            /* À.{þ×›ÿb£Ž,9¦M.ÿ */
+	$"6A9D 976A 994B 6626 4F4D 7DC8 F0CA EDB7"            /* j�—j™Kf&OM}ÈðÊí· */
+	$"F99E 21E2 36B4 3AAB E787 C6A2 1783 F623"            /* ùž!â6´:«ç‡Æ¢.ƒö# */
+	$"8755 1F66 AFBC 2959 6E6E 2E61 AC85 2198"            /* ‡U.f¯¼)Ynn.a¬…!˜ */
+	$"9978 EDFD 334C F0D6 7F76 9AF2 47AF 5E4B"            /* ™xíý3LðÖ.všòG¯^K */
+	$"805C 54D3 5F2A 16C5 6675 C288 B44F F851"            /* €\TÓ_*.Åfuˆ´OøQ */
+	$"1CE9 9F21 BF10 92B9 2366 5D69 AE8E 9989"            /* .éŸ!¿.’¹#f]i®Ž™‰ */
+	$"36A6 F9E6 75A7 0D47 C8B5 8727 0138 2BFA"            /* 6¦ùæu§.Gȵ‡'.8+ú */
+	$"5C4A 649C 123C 225E 2CEC 2007 5016 3F11"            /* \Jdœ.<"^,ì .P.?. */
+	$"B8FF 60CB 7150 EBFD DFED 147E 0A98 E096"            /* ¸ÿ`ËqPëýßí.~Â˜à– */
+	$"6B76 3AF0 39A5 5BF2 880C E857 174C 8735"            /* kv:ð9¥[òˆ.èW.L‡5 */
+	$"ACF6 E4B7 3477 6293 FF7C 8515 A8DE 4E73"            /* ¬öä·4wb“ÿ|….¨ÞNs */
+	$"8E37 8A0C 4384 0CF3 FA01 15F5 9639 ED05"            /* Ž7Š.C„.óú..õ–9í. */
+	$"C86B 28A0 C331 14BC 2817 FE9B F96A D60D"            /* Èk( Ã1.¼(.þ›ùjÖ. */
+	$"EBCB 14DA FF7F FF47 8A61 A2C7 F01F 10B7"            /* ëË.Úÿ.ÿGŠa¢Çð..· */
+	$"3DAF B01C B484 F55D 457E E3EC CC41 95DE"            /* =¯°.´„õ]E~ãìÌA•Þ */
+	$"097E 8117 F77F FEFB A490 8B96 1300 2B37"            /* Æ~�.÷.þû¤�‹–..+7 */
+	$"19FA E04C 4188 E9F6 8950 0668 B082 8FD8"            /* .úàLAˆéö‰P.h°‚�Ø */
+	$"0B7D 6C32 4DBF F84F F4E9 ACAF 719A DC43"            /* .}l2M¿øOô鬯qšÜC */
+	$"9F8D A53E DF1A BDB0 AAA7 3267 9C2D 357A"            /* Ÿ�¥>ß.½°ª§2gœ-5z */
+	$"9CA7 1AE1 59C4 F467 83D3 308B 004A 42C2"            /* œ§.áYÄôgƒÓ0‹.JB */
+	$"909B F979 41CE AB25 C6D1 9FE9 46E1 E837"            /* �›ùyAΫ%ÆÑŸéFáè7 */
+	$"7ADF FF72 225E 4472 D323 F55C BE19 1E50"            /* zßÿr"^DrÓ#õ\¾..P */
+	$"BF94 6787 CADB F576 300A 054B 0A2D E9B2"            /* ¿”g‡ÊÛõv0Â.KÂ-é² */
+	$"5C15 DB84 E735 F76D 5477 D8A7 28AF FF7A"            /* \.Û„ç5÷mTwا(¯ÿz */
+	$"7EB8 06F8 4FF4 E999 ED48 02C4 F111 F61D"            /* ~¸.øOôé™íH.Äñ.ö. */
+	$"8A6C 1CC6 AE54 94E4 8C5D 7655 4ECC 205F"            /* Šl.Æ®T”äŒ]vUNÌ _ */
+	$"DBF9 1BA7 83CC 52E9 E9C9 52A4 1151 7DE4"            /* Ûù.§ƒÌRééÉR¤.Q}ä */
+	$"051B E140 3FC0 D60B 0C11 663F 98A9 8B53"            /* ..á@?ÀÖ...f?˜©‹S */
+	$"776E BD8D 7678 AD62 ACEE 033F D134 B61E"            /* wn½�vx­b¬î.?Ñ4¶. */
+	$"F86D 3384 AAE7 9074 F7CF 4509 F9B3 4F30"            /* øm3„ªç�t÷ÏEÆù³O0 */
+	$"F32D 840F 1DDA E6B1 BDD4 951F 2379 F890"            /* ó-„..Úæ±½Ô•.#yø� */
+	$"530A E915 A228 D3D8 B188 C692 2767 D628"            /* SÂé.¢(ÓرˆÆ’'gÖ( */
+	$"12F8 3FFA BA23 F76B 1D92 1FC1 EA73 30FC"            /* .ø?úº#÷k.’.Áês0ü */
+	$"CE72 0CA5 6695 6326 F93B B52F B9D4 F6F0"            /* Îr.¥f•c&ù;µ/¹Ôöð */
+	$"FF07 727B 80F9 EBFC 2176 788C 333F 4137"            /* ÿ.r{€ùëü!vxŒ3?A7 */
+	$"E82C D066 6088 A8EA 168F 40EA F1EE BDE8"            /* è,Ðf`ˆ¨ê.�@êñî½è */
+	$"C023 75BA 66F2 335A 98C0 31A8 2137 7A7B"            /* À#uºfò3Z˜À1¨!7z{ */
+	$"DA0F 3962 D4B3 3E6E A5A1 3A19 5EED 48A7"            /* Ú.9bÔ³>n¥¡:.^íH§ */
+	$"7617 DE46 D178 BC48 D85D 7821 DFEC B30D"            /* v.ÞFÑx¼HØ]x!ßì³. */
+	$"F84F B7CD 80ED 55C7 9E1A F58D 7085 F625"            /* øO·Í€íUÇž.õ�p…ö% */
+	$"F564 3BF5 A09E B353 4E45 2F0B FC02 ECFD"            /* õd;õ ž³SNE/.ü.ìý */
+	$"539F 529C A652 34F1 C0CC BC04 FCE0 2C7D"            /* SŸRœ¦R4ñÀ̼.üà,} */
+	$"A8A9 9E67 79E9 ADE4 ABEE BFF6 4793 1B91"            /* ¨©žgyé­ä«î¿öG“.‘ */
+	$"413A 4302 7FB5 190C CB09 0DC9 3B33 E18D"            /* A:C..µ..ËÆ.É;3á� */
+	$"DDAB 23C5 FABA 5DC1 554F C940 B964 7F6A"            /* Ý«#Åúº]ÁUOÉ@¹d.j */
+	$"A781 2032 BF9E 0262 7C99 CD96 9251 9FB6"            /* §� 2¿ž.b|™Í–’QŸ¶ */
+	$"1C69 9141 7A13 3022 DE48 DA68 C959 A0B5"            /* .i‘Az.0"ÞHÚhÉY µ */
+	$"0F3A F19A 9301 5051 5855 9D7B 5173 EE47"            /* .:ñš“.PQXU�{QsîG */
+	$"2B0D DB30 28CC 5E41 46F1 E79F 90B3 AB2A"            /* +.Û0(Ì^AFñçŸ�³«* */
+	$"CAEA 6128 10E1 2CC0 DDC2 EBF1 26F1 E1DC"            /* Êêa(.á,ÀÝÂëñ&ñáÜ */
+	$"EB87 87ED 55F3 827C A066 D932 FCF7 B134"            /* 뇇íUó‚| fÙ2ü÷±4 */
+	$"8BC9 CC70 B38C B019 8372 EA60 7C36 4D38"            /* ‹ÉÌp³Œ°.ƒrê`|6M8 */
+	$"F82F 16C2 2390 A91B 203A 8EBE D0EC E278"            /* ø/.Â#�©. :Ž¾Ðìâx */
+	$"7AC4 8493 A217 6AC3 B85A 470D D74A B91D"            /* zÄ„“¢.jøZG.×J¹. */
+	$"0180 7BAB 4088 5671 6268 5B4A 54FE C179"            /* .€{«@ˆVqbh[JTþÁy */
+	$"1600 7677 830B 0E81 EEB2 6124 33F8 DBBD"            /* ..vwƒ..�î²a$3øÛ½ */
+	$"1B35 D1F9 0568 3891 0ECB A836 5A86 9636"            /* .5Ñù.h8‘.˨6Z†–6 */
+	$"9F87 052F 0D66 8AA3 3362 1651 9B33 9057"            /* Ÿ‡./.fŠ£3b.Q›3�W */
+	$"5B98 05EB 23CE 099F 2358 444E 0D64 A9F9"            /* [˜.ë#ÎÆŸ#XDN.d©ù */
+	$"A569 7D56 A50D 6256 69AF BDD9 7847 D651"            /* ¥i}V¥.bVi¯½ÙxGÖQ */
+	$"73E2 F76E F277 58DC BFB9 7B8E 593C 0E97"            /* sâ÷nòwXÜ¿¹{ŽY<.— */
+	$"3C4E 507D FA6C 7984 FAC8 6C42 6882 78AC"            /* <NP}úly„úÈlBh‚x¬ */
+	$"E40D B7A2 4E43 998B 1C29 D7C6 B7BA 58C9"            /* ä.·¢NC™‹.)×Æ·ºXÉ */
+	$"3503 114B 86B8 CB5D B605 832D 98FE 0257"            /* 5..K†¸Ë]¶.ƒ-˜þ.W */
+	$"FB50 8CA0 43D4 71BE E330 1584 5983 668F"            /* ûPŒ CÔq¾ã0.„Yƒf� */
+	$"735C 2448 3B30 82E4 1932 5BF8 129F FE38"            /* s\$H;0‚ä.2[ø.Ÿþ8 */
+	$"749D 01ED DAFC 95B9 375D BBCB 60D9 FC58"            /* t�.íÚü•¹7]»Ë`ÙüX */
+	$"0796 AEFC 2337 F89E 01F5 48BD 0BAF A61F"            /* .–®ü#7øž.õH½.¯¦. */
+	$"3EC4 C092 DC6A 584C AAAF 1A9F A20F CEA4"            /* >ÄÀ’ÜjXLª¯.Ÿ¢.Τ */
+	$"884B 2DB6 09F4 F51B 546F CD71 F4D3 6452"            /* ˆK-¶Æôõ.ToÍqôÓdR */
+	$"B6E5 3EFF 66F8 0D60 D916 F755 1348 E250"            /* ¶å>ÿfø.`Ù.÷U.HâP */
+	$"D8E2 6858 B424 B84B D59A 6885 24D3 D845"            /* ØâhX´$¸KÕšh…$ÓØE */
+	$"692F 4313 B616 584F 7419 0661 0064 C281"            /* i/C.¶.XOt..a.dÂ� */
+	$"A873 131C 5296 042B 1FD5 3EED BFC2 659E"            /* ¨s..R–.+.Õ>í¿Âež */
+	$"C4C7 2720 8002 28DD 141A BBE7 99F8 028F"            /* ÄÇ' €.(Ý..»ç™ø.� */
+	$"8262 0577 5240 EB9A F866 2901 B75B 3FED"            /* ‚b.wR@ëšøf).·[?í */
+	$"9E78 9071 83FD 02BC FCDE 2135 42D1 F184"            /* žx�qƒý.¼üÞ!5BÑñ„ */
+	$"309D F47E DF10 F797 4268 120A D377 04A4"            /* 0�ô~ß.÷—Bh.ÂÓw.¤ */
+	$"2998 099E CA35 66AD FB20 8C14 1E0E 714E"            /* )˜ÆžÊ5f­û Œ...qN */
+	$"B9A7 70EE 5BA0 7A18 FC16 97EB 1A98 CB6C"            /* ¹§pî[ z.ü.—ë.˜Ël */
+	$"4B5D AC5B 3DC2 2062 E74A 18F2 0A76 6085"            /* K]¬[=Â bçJ.òÂv`… */
+	$"EF50 1C2F FE23 117A ED22 7BE8 0231 BC71"            /* ïP./þ#.zí"{è.1¼q */
+	$"707C 6736 BC3C 38AA 81C2 66B6 DCE5 13E9"            /* p|g6¼<8ª�Âf¶Üå.é */
+	$"3076 C7AD 8C4B A962 C37E 4605 CDC0 8247"            /* 0vÇ­ŒK©bÃ~F.ÍÀ‚G */
+	$"190C 41CD 6923 8D00 BC94 5B5F E2AB 443B"            /* ..AÍi#�.¼”[_â«D; */
+	$"3C5A 7FF6 213C 9E2D 9224 70B1 EA9B 7D36"            /* <Z.ö!<ž-’$p±ê›}6 */
+	$"E7EA 0D03 CB32 7413 AB26 CB30 1B56 CBDE"            /* çê..Ë2t.«&Ë0.VËÞ */
+	$"3C31 361D 24E2 F441 4D78 7825 1DA0 0C14"            /* <16.$âôAMxx%. .. */
+	$"5C84 B112 6FC1 77DB 42CA 7791 960B 9F09"            /* \„±.oÁwÛBÊw‘–.ŸÆ */
+	$"980A 5629 54C0 EC82 889A B0E3 38F4 E734"            /* ˜ÂV)TÀ삈š°ã8ôç4 */
+	$"FA91 D5CD 2C8F 43CD 5629 3DAD 81DA 5E0A"            /* ú‘ÕÍ,�CÍV)=­�Ú^Â */
+	$"C008 712F EAD3 2486 4CD2 C7BA 0FA9 BBD3"            /* À.q/êÓ$†LÒǺ.©»Ó */
+	$"6AC2 A912 7736 5A33 CC96 9EDC 9C5A 3084"            /* j©.w6Z3Ì–žÜœZ0„ */
+	$"C826 A3FB 0661 ED4B 9689 A921 22AB 2399"            /* È&£û.aíK–‰©!"«#™ */
+	$"6F2A 4A78 A5F8 A059 BE4B 7DFF 5D41 1A31"            /* o*Jx¥ø Y¾K}ÿ]A.1 */
+	$"E688 045C BD1E D1DB 7C5B 6B89 5C22 3CAF"            /* æˆ.\½.ÑÛ|[k‰\"<¯ */
+	$"F133 FF14 13A2 9A3F 6E42 54EB 5082 9F25"            /* ñ3ÿ..¢š?nBTëP‚Ÿ% */
+	$"7C07 6BA6 25EA A890 3560 E915 B058 CB68"            /* |.k¦%ê¨�5`é.°XËh */
+	$"3601 4B07 ACE7 EC8A 2897 F908 D405 455E"            /* 6.K.¬çìŠ(—ù.Ô.E^ */
+	$"5EDD 427E 791A EA3D 6ACE 3BC0 0D43 731A"            /* ^ÝB~y.ê=jÎ;À.Cs. */
+	$"C9C6 8C03 BD83 6F85 EF75 7246 2F8E 1CFB"            /* ÉÆŒ.½ƒo…ïurF/Ž.û */
+	$"8DC9 2726 593F 1D87 A822 399F 9770 324C"            /* �É'&Y?.‡¨"9Ÿ—p2L */
+	$"6ABF 38B9 E89E B2F5 D575 E7DB C449 63CF"            /* j¿8¹èž²õÕuçÛÄIcÏ */
+	$"EBE1 07BB 80A4 C099 6A15 9A47 96F3 8C8D"            /* ëá.»€¤À™j.šG–óŒ� */
+	$"49E1 1F78 2119 9460 CA7A F257 EDA1 104B"            /* Iá.x!.”`ÊzòWí¡.K */
+	$"5C68 0E57 188C 62B0 FBE3 CF4F 5251 6525"            /* \h.W.Œb°ûãÏORQe% */
+	$"CB59 5E3D C6F4 6B04 5B2D 1ED2 3BE1 02BB"            /* ËY^=Æôk.[-.Ò;á.» */
+	$"7207 12AA BFEC 50F4 83FE 2797 121B 3D14"            /* r..ª¿ìPôƒþ'—..=. */
+	$"DA23 BE41 D647 E5CA DD2D CD48 8C4D A094"            /* Ú#¾AÖGåÊÝ-ÍHŒM ” */
+	$"B1A9 4ED5 4735 8818 C4F1 597D 3211 5D12"            /* ±©NÕG5ˆ.ÄñY}2.]. */
+	$"D96B 5A38 AB9A 7E89 C503 13B0 8354 C887"            /* ÙkZ8«š~‰Å..°ƒTȇ */
+	$"F766 96F0 EDAE C6B6 17B4 E9A4 9230 C2F5"            /* ÷f–ðí®Æ¶.´é¤’0Âõ */
+	$"029D 3D72 A1CF 5BB9 E975 DBFF 06DC F5B2"            /* .�=r¡Ï[¹éuÛÿ.Üõ² */
+	$"686F 667B AD3E 1D8D 5BE4 0D6A 2CD7 DE66"            /* hof{­>.�[ä.j,×Þf */
+	$"BE8E C996 696D 58EC 6CFE 40AD 3C95 EAF1"            /* ¾ŽÉ–imXìlþ@­<•êñ */
+	$"4591 1D62 836E D2E3 4CD8 E4A6 F4F4 C456"            /* E‘.bƒnÒãLØä¦ôôÄV */
+	$"A70C B3BE AA22 A188 DAB5 D3F7 4B7B 865D"            /* §.³¾ª"¡ˆÚµÓ÷K{†] */
+	$"4D89 77E6 99A6 46C9 14BA 25E1 55C5 ADBD"            /* M‰w晦FÉ.º%áUÅ­½ */
+	$"4379 96AF 26DA A399 F009 AE75 248B 0285"            /* Cy–¯&Ú£™ðÆ®u$‹.… */
+	$"B370 5704 6429 C8AF 0BD3 A332 90B2 8351"            /* ³pW.d)ȯ.Ó£2�²ƒQ */
+	$"F715 32C9 347B EADE 2EBB 9D97 BF95 0C5A"            /* ÷.2É4{êÞ.»�—¿•.Z */
+	$"9203 1EC5 7A8E CF46 C28C 39A2 DE74 C656"            /* ’..ÅzŽÏFÂŒ9¢ÞtÆV */
+	$"F0BF 3ABF CE5F BE71 B7CE 2FF3 F41B F3EA"            /* ð¿:¿Î_¾q·Î/óô.óê */
+	$"8BE7 B07E AB17 4F87 74FC FDE8 EF9F BF3F"            /* ‹ç°~«.O‡tüýè? */
+	$"A9EB F3D5 3F3E 83BE 7BAF EA5F E0FE 7ADF"            /* ©ëóÕ?>ƒ¾{¯ê_àþzß */
+	$"E7A7 7F9D 3FE7 3BF9 FA77 F9FA 3FF9 F7C7"            /* ç§.�?ç;ùúwùú?ù÷Ç */
+	$"E7E9 871D E84F CFE8 83FC FE85 E3BB E7E7"            /* çé‡.èOÏèƒüþ…ã»çç */
+	$"AFFE 7D7F F9F5 57E7 AF70 6F9D 2DF3 9ED7"            /* ¯þ}.ùõWç¯po�-óž× */
+	$"C81E F903 FEAB 8EF9 F50D F254 3F3E A4D1"            /* È.ù.þ«Žùõ.òT?>¤Ñ */
+	$"DD53 F3F6 F37E 7EC9 4775 1BE4 77F9 EEBF"            /* ÝSóöó~~ÉGu.äwùî¿ */
+	$"9ED1 F9DC 00F7 91DD 3D8B A94D D83C 797F"            /* žÑùÜ.÷‘Ý=‹©MØ<y. */
+	$"4243 1F04 D29C 94E6 FA35 A9C7 9C1C 0762"            /* BC..Òœ”æú5©Çœ..b */
+	$"AA92 7DF8 65D6 B16D 30C6 E3F2 22D5 8971"            /* ª’}øeÖ±m0Æãò"Õ‰q */
+	$"F890 651C 37E3 1F4A 29A4 6637 D7AE 7CB9"            /* ø�e.7ã.J)¤f7×®|¹ */
+	$"14C7 D06B 2595 45F8 89DC DBAF B284 6ADA"            /* .ÇÐk%•Eø‰ÜÛ¯²„jÚ */
+	$"E4DB 9D25 F76C CDA3 EB7E 1B5A 4264 8145"            /* äÛ�%÷lÍ£ë~.ZBd�E */
+	$"547E 6F18 076D A675 BA1A 1AB1 0BF1 AEB6"            /* T~o..m¦uº..±.ñ®¶ */
+	$"C8C2 AAE0 489F 4E11 7F77 336A 41A4 C050"            /* ȪàHŸN..w3jA¤ÀP */
+	$"D19E AE10 BD35 C5EC DA71 BDEF A017 C32D"            /* Ñž®.½5ÅìÚq½ï .Ã- */
+	$"CB15 0C8E 0B75 C179 FB84 FDF2 DD5D C21F"            /* Ë..Ž.uÁyû„ýòÝ]Â. */
+	$"56A5 397D C437 A82F 65F9 2E68 A785 0AF3"            /* V¥9}Ä7¨/eù.h§…Âó */
+	$"B9F0 7781 E6B8 ACFA 09DC B57D 6317 B29B"            /* ¹ðw�測úÆܵ}c.²› */
+	$"C754 09FC 3635 9854 0DA1 A3BE D3EE CF40"            /* ÇTÆü65˜T.¡£¾ÓîÏ@ */
+	$"4BE4 A4D9 07C4 D65E 3887 C8A7 CD3A 83F5"            /* Kä¤Ù.ÄÖ^8‡È§Í:ƒõ */
+	$"DFA8 10A6 BB6D B811 852D 3877 8782 1E66"            /* ߨ.¦»m¸.…-8w‡‚.f */
+	$"AF11 43B8 CA3A 6146 3657 AFE0 B314 36CB"            /* ¯.C¸Ê:aF6W¯à³.6Ë */
+	$"8E1C 272D ED4B 634C AABA 0207 6A1A E2E3"            /* Ž.'-íKcLªº..j.âã */
+	$"C500 C0A4 894A BAD8 C9A1 0AE7 AC8D 750C"            /* Å.À¤‰JºØÉ¡Âç¬�u. */
+	$"7D84 FBCC DB2E EE05 B04A 002B B383 46DE"            /* }„ûÌÛ.î.°J.+³ƒFÞ */
+	$"C18D 5BBD B442 9E88 BBB2 89CC 0EBA CF5A"            /* Á�[½´Bžˆ»²‰Ì.ºÏZ */
+	$"5616 DDAB ED7B 4C2E 1C82 0C9D 4820 C0E8"            /* V.Ý«í{L..‚.�H Àè */
+	$"1C4E 39A5 9041 9E33 A20A A73D 821A 238A"            /* .N9¥�Až3¢Â§=‚.#Š */
+	$"3B24 14B9 D9A6 95AA F5B0 13C1 8CFD 790F"            /* ;$.¹Ù¦•ªõ°.ÁŒýy. */
+	$"33CB 82D3 FE12 0F27 F309 7453 05E0 DF8F"            /* 3Ë‚Óþ..'óÆtS.àß� */
+	$"AAE8 F77A 31BA 0118 43E1 7AE7 69DC 5D12"            /* ªè÷z1º..CázçiÜ]. */
+	$"BD53 9858 EA6D D8D3 174C FE4C F487 3CCF"            /* ½S˜XêmØÓ.LþLô‡<Ï */
+	$"9098 7872 8FC3 EBAC 4C76 F503 6915 A1B3"            /* �˜xr�Ãë¬Lvõ.i.¡³ */
+	$"5FF8 81CD E13D D511 AAB8 5C7B 1376 C87F"            /* _ø�Íá=Õ.ª¸\{.vÈ. */
+	$"2DA1 557D 2053 3341 CC15 418C 0911 5378"            /* -¡U} S3AÌ.AŒÆ.Sx */
+	$"5FFE 324E 1412 2046 B049 3A77 69B7 417F"            /* _þ2N.. F°I:wi·A. */
+	$"AC17 B8B0 7FDA 6D19 59F0 DD68 8A88 E55A"            /* ¬.¸°.Úm.YðÝhŠˆåZ */
+	$"8098 0888 3714 713A 1D17 BB8D F01C 6005"            /* €˜.ˆ7.q:..»�ð.`. */
+	$"8F2E 3D20 2753 1BB4 9BE3 DFD1 709F 99EB"            /* �.= 'S.´›ãßÑpŸ™ë */
+	$"DFCC C1B1 717B 7FA3 52BB C12D E6B7 24D2"            /* ßÌÁ±q{.£R»Á-æ·$Ò */
+	$"F448 F23D C196 1BAA D61B F422 41B4 D620"            /* ôHò=Á–.ªÖ.ô"A´Ö  */
+	$"466D 45F3 06F6 F631 3E88 5CDE F7F6 BC6F"            /* FmEó.öö1>ˆ\Þ÷ö¼o */
+	$"789C D06C 02CC 2E71 B6B0 03D2 297B BFCD"            /* xœÐl.Ì.q¶°.Ò){¿Í */
+	$"8C21 67AD CEE0 DB53 5749 A676 690C 11E3"            /* Œ!g­ÎàÛSWI¦vi..ã */
+	$"5AD2 905C 78E1 4AB0 E60E C920 4ECC 7CB6"            /* ZÒ�\xáJ°æ.É NÌ|¶ */
+	$"A76F 70F1 BCFD AA1D F4D2 E43F E203 D0C8"            /* §opñ¼ýª.ôÒä?â.ÐÈ */
+	$"E11E 61AF F1A7 5762 600E 65BB D870 818A"            /* á.a¯ñ§Wb`.e»Øp�Š */
+	$"CDF0 DFC4 8C9C 1926 678B 2732 C52F 98FD"            /* ÍðßÄŒœ.&g‹'2Å/˜ý */
+	$"33B3 EE23 138D 5E5F C9C3 FEF9 6111 E3E6"            /* 3³î#.�^_ÉÃþùa.ãæ */
+	$"AF79 A8A5 2949 D590 B463 EDF3 F72A 18FD"            /* ¯y¨¥)IÕ�´cíó÷*.ý */
+	$"BB23 233B 7924 2DD1 A335 B949 467E A30C"            /* »##;y$-Ñ£5¹IF~£. */
+	$"3185 5FE5 DB63 6748 B22D AB3F 8A8C 0926"            /* 1…_åÛcgH²-«?ŠŒÆ& */
+	$"5450 E925 A69D 1185 7300 D694 EA1F 4DF2"            /* TPé%¦�.…s.Ö”ê.Mò */
+	$"2413 F4ED 6D64 5B74 BBD5 0E65 26EF A8CD"            /* $.ôímd[t»Õ.e&ï¨Í */
+	$"5806 0C60 404F 90A0 06B6 AFD1 785F 9646"            /* X..`@O� .¶¯Ñx_–F */
+	$"B1AD 2A45 5777 33FA 49DB 8D3D AC2A BAEA"            /* ±­*EWw3úIÛ�=¬*ºê */
+	$"4527 B4DF 481A 6AB9 4485 05E6 7040 1B93"            /* E'´ßH.j¹D….æp@.“ */
+	$"D6E0 3BBF A334 E13B 68EC 934B C393 B621"            /* Öà;¿£4á;hì“KÓ¶! */
+	$"CFC8 69BE A6AC 672C 235E F1FC 4480 DE83"            /* ÏÈi¾¦¬g,#^ñüD€Þƒ */
+	$"32D7 D269 F78C F22D 5B9F F4DF DDDD D6DE"            /* 2×Òi÷Œò-[ŸôßÝÝÖÞ */
+	$"4C65 4D61 C1F0 26BF E4C3 D7C9 A034 163D"            /* LeMaÁð&¿äÃ×É 4.= */
+	$"FBAE 0167 4DF0 EBEF AA8B B742 2832 1F67"            /* û®.gMðë懲·B(2.g */
+	$"8CC0 80D0 4A6B 9843 DE59 2F7B F944 9DA4"            /* ŒÀ€ÐJk˜CÞY/{ùD�¤ */
+	$"343D 9AD9 9E0B C7B5 0B7D 2CA1 F638 8A3B"            /* 4=šÙž.ǵ.},¡ö8Š; */
+	$"BB38 A39B 025A 9BA9 34AC ACF0 063D 5483"            /* »8£›.Z›©4¬¬ð.=Tƒ */
+	$"FE57 22E4 EB2C C699 AEF3 8EFB 1C8C A23A"            /* þW"äë,Æ™®óŽû.Œ¢: */
+	$"2C15 D2EF AC9A 91C9 993A 4CB0 2DDC 0A32"            /* ,.Ò﬚‘É™:L°-ÜÂ2 */
+	$"14B9 50D2 8579 8F9D 5AF2 88DB E726 1B39"            /* .¹PÒ…y��ZòˆÛç&.9 */
+	$"3E06 69F9 F300 09E4 D3E8 BB4C A704 10E0"            /* >.iùó.ÆäÓè»L§..à */
+	$"F1D0 53DE 91D8 6723 A047 11C7 57B3 C46C"            /* ñÐSÞ‘Øg# G.ÇW³Äl */
+	$"84A7 C2E1 C7CC 185C 9F21 7E2B 0F2E 64B1"            /* „§ÂáÇÌ.\Ÿ!~+..d± */
+	$"D734 4142 C65E A2FB 9ABE B62D 076B 2B65"            /* ×4ABÆ^¢ûš¾¶-.k+e */
+	$"9D6E 63F1 4825 79A9 3936 C7A7 531F EF6A"            /* �ncñH%y©96ǧS.ïj */
+	$"F859 3084 0421 88A9 A648 8641 ACEB 95DE"            /* øY0„.!ˆ©¦H†A¬ë•Þ */
+	$"2E94 E3C9 442C 13AF CF63 0404 C5C6 5CE2"            /* .”ãÉD,.¯Ïc..ÅÆ\â */
+	$"CE90 F9CC A1B6 5713 031E C239 174F CC40"            /* Î�ùÌ¡¶W...Â9.OÌ@ */
+	$"BCA4 EA9A EB6A 1D24 7962 F735 AF5A B937"            /* ¼¤êšëj.$yb÷5¯Z¹7 */
+	$"AC3B A12E 10A8 D332 6FE3 8ED1 6F01 B198"            /* ¬;¡..¨Ó2oãŽÑo.±˜ */
+	$"1543 A6A1 367E E226 5D76 B860 E0E1 8963"            /* .C¦¡6~â&]v¸`àá‰c */
+	$"AA7A F9EE DABF DB52 28F6 69F9 273F 8729"            /* ªzùîÚ¿ÛR(öiù'?‡) */
+	$"1D00 C7D2 20B9 3483 2125 88FC 94C0 54A6"            /* ..ÇÒ ¹4ƒ!%ˆü”ÀT¦ */
+	$"42FE F4E5 DA50 F495 F88B 5986 21CB 22E8"            /* BþôåÚPô•ø‹Y†!Ë"è */
+	$"EE5E 0622 2CB0 BCC8 0C6B 2B2B 23EB 0506"            /* î^.",°¼È.k++#ë.. */
+	$"A40F 09C2 726F 0C1F B8D4 55D3 2FE4 D629"            /* ¤.ÆÂro..¸ÔUÓ/äÖ) */
+	$"94C2 C913 BB28 4394 A9D2 8684 9E47 0445"            /* ”ÂÉ.»(C”©Ò†„žG.E */
+	$"B6CF 3E21 7072 B435 310C D7A3 063D 942B"            /* ¶Ï>!pr´51.×£.=”+ */
+	$"6AE9 350C 9442 C76E 1E6B A8C1 18A3 4309"            /* jé5.”BÇn.k¨Á.£CÆ */
+	$"6D55 E62F FC4E C4E9 6CF8 241D FAC5 2CC9"            /* mUæ/üNÄélø$.úÅ,É */
+	$"E020 6B12 31A6 9B11 710B 8850 FABE 5D63"            /* à k.1¦›.q.ˆPú¾]c */
+	$"068A 4018 2A90 93A5 9715 531E 8E7B AD7A"            /* .Š@.*�“¥—.S.Ž{­z */
+	$"2921 115F 19CE 2B6A F643 DE89 2E76 890B"            /* )!._.Î+jöCÞ‰.v‰. */
+	$"5A69 1668 6A02 061F 4832 24EB FC82 6B4D"            /* Zi.hj...H2$ëü‚kM */
+	$"9B08 D22F CBBF D348 D18F 8B0C C684 6851"            /* ›.Ò/Ë¿ÓHÑ�‹.Æ„hQ */
+	$"6CA9 E2FA 43CE 8A9A 7A58 FB28 0208 A6E0"            /* l©âúCΊšzXû(..¦à */
+	$"1ACF CE23 C624 5A38 C640 72C0 26F1 2818"            /* .ÏÎ#Æ$Z8Æ@rÀ&ñ(. */
+	$"07FD 74D9 F3D6 ED38 CA01 6485 CE8C 41A3"            /* .ýtÙóÖí8Ê.d…ÎŒA£ */
+	$"02C6 18E5 E4D2 2043 FA62 8768 3E14 7E80"            /* .Æ.åäÒ Cúb‡h>.~€ */
+	$"F2EB 67AD F743 75A0 2DDF 8724 1468 F88D"            /* òëg­÷Cu -߇$.hø� */
+	$"9BF3 11EB 4D4C B372 D210 9B58 BAA0 646A"            /* ›ó.ëML³rÒ.›Xº dj */
+	$"222F 5E5A C781 1D86 5652 1B57 07AF C8FA"            /* "/^ZÇ�.†VR.W.¯Èú */
+	$"9E77 DD7B FCB9 1D4C 8573 7B03 95AC D2DA"            /* žwÝ{ü¹.L…s{.•¬ÒÚ */
+	$"3314 4FFC CAF4 39B5 EAF4 9617 2CC5 9258"            /* 3.OüÊô9µêô–.,Å’X */
+	$"8F99 8C44 8D44 DA10 F1A5 51F7 5533 F13B"            /* �™ŒD�DÚ.ñ¥Q÷U3ñ; */
+	$"CDDC B6D6 BE71 3C92 2628 3B69 DC32 C623"            /* Íܶ־q<’&(;iÜ2Æ# */
+	$"F497 3959 034A 67C3 10A8 26E2 572F B4B1"            /* ô—9Y.JgÃ.¨&âW/´± */
+	$"6C5C 3E47 FB9F AA7D D9A4 7A08 4BBA E854"            /* l\>GûŸª}Ù¤z.KºèT */
+	$"4370 CE77 C69A 11EB 1BD8 B9AF 8225 BC8E"            /* CpÎwÆš.ë.ع¯‚%¼Ž */
+	$"A261 1CAA A74D B531 A0B9 D462 35DF 9C21"            /* ¢a.ª§Mµ1 ¹Ôb5ßœ! */
+	$"73F1 EAC1 A13C E0BC AF6C 8111 03DF AF1F"            /* sñêÁ¡<༯l�..߯. */
+	$"4748 1866 322C 535A 7C5E D2BC 4304 3541"            /* GH.f2,SZ|^Ò¼C.5A */
+	$"F14E 8412 296B 2C37 B642 9B4A 6417 EABB"            /* ñN„.)k,7¶B›Jd.ê» */
+	$"9034 1260 1B81 AFCC F903 4FAA A3F2 339E"            /* �4.`.�¯Ìù.Oª£ò3ž */
+	$"F332 B080 8C32 31D7 4DEA B260 F190 43F1"            /* ó2°€Œ21×Mê²`ñ�Cñ */
+	$"CCD5 A584 5C1C 343F FB87 CEA5 F246 8EAC"            /* ÌÕ¥„\.4?û‡Î¥òFŽ¬ */
+	$"C407 302C FEE7 3F59 F4B8 74ED ED62 D373"            /* Ä.0,þç?Yô¸tííbÓs */
+	$"A4BA B53A 0554 5403 9C2C E745 1087 5546"            /* ¤ºµ:.TT.œ,çE.‡UF */
+	$"2671 7BA6 3A33 703E BEF5 CD28 10A5 462B"            /* &q{¦:3p>¾õÍ(.¥F+ */
+	$"D902 9493 B2FC 176F 34BA 5A2D D2BC 0CBB"            /* Ù.”“²ü.o4ºZ-Ò¼.» */
+	$"5AB7 B854 08D3 CD79 3C71 1A89 E643 2FBC"            /* Z·¸T.ÓÍy<q.‰æC/¼ */
+	$"5A24 FEA6 EC06 1F23 79D9 3886 F6F4 7FB9"            /* Z$þ¦ì..#yÙ8†öô.¹ */
+	$"F892 1A20 DC66 1EB1 D6FD 1C48 52DE 4267"            /* ø’. Üf.±Öý.HRÞBg */
+	$"77E2 620B 2DC0 6828 575C F7CA 74BC FE73"            /* wâb.-Àh(W\÷Êt¼þs */
+	$"FABD C9ED 4E8F 71A7 8CCD 8D80 8BD2 8AA3"            /* ú½ÉíN�q§ŒÍ�€‹ÒŠ£ */
+	$"45C0 EF2A 387D 038E 8B00 BA81 12CD F93F"            /* EÀï*8}.Ž‹.º�.Íù? */
+	$"E9BE 9134 2928 439B 69CF 3DB1 5DFC 3DAF"            /* 龑4)(C›iÏ=±]ü=¯ */
+	$"86CA 34A7 4574 C91C 3F99 3EA9 B6E9 F3AF"            /* †Ê4§EtÉ.?™>©¶éó¯ */
+	$"6757 09A3 C49E A9AD 7201 BFD9 B3FA 52B0"            /* gWƣĞ©­r.¿Ù³úR° */
+	$"0000 0030 908B 4E52 45F1 3CBE F04A D2E4"            /* ...0�‹NREñ<¾ðJÒä */
+	$"83AF 6AEA 78E9 A438 C877 BAAD 65CB C703"            /* ƒ¯jêxé¤8Èwº­eËÇ. */
+	$"70B2 B9DD E19B 6B8C 0CE9 E402 0C9F 94F0"            /* p²¹Ýá›kŒ.éä..Ÿ”ð */
+	$"21BC 4E05 C03C 012A 66EF D0BC 2B72 292E"            /* !¼N.À<.*fïм+r). */
+	$"3592 1FDB 2A5C 8D2D C2FF 5C5B 6AB8 F695"            /* 5’.Û*\�-Âÿ\[j¸ö• */
+	$"F279 2C54 0529 555A 6ACA 22A4 C28B D693"            /* òy,T.)UZjÊ"¤Â‹Ö“ */
+	$"1FC9 4492 43F3 A323 F990 0A31 9356 30D3"            /* .ÉD’Có£#ù�Â1“V0Ó */
+	$"D6F0 0D36 0091 043F F239 9D1E 114E 3693"            /* Öð.6.‘.?ò9�..N6“ */
+	$"DF1C 23DF A27A 5B11 A44D 9199 07D1 AF2C"            /* ß.#ߢz[.¤M‘™.ѯ, */
+	$"63EB 21C5 D29F 8644 8C6A 129A 9CB9 ED72"            /* cë!ÅÒŸ†DŒj.šœ¹ír */
+	$"9286 3E0E B604 539A F262 B727 9284 01F9"            /* ’†>.¶.Sšòb·'’„.ù */
+	$"5AE1 DA5A 8A02 140E 5275 5433 BCDF 8038"            /* ZáÚZŠ...RuT3¼ß€8 */
+	$"0050 856F A747 857B 8376 255A 9185 28CC"            /* .P…o§G…{ƒv%Z‘…(Ì */
+	$"301A EC7C B5D3 89CC A695 1C87 8266 7CA8"            /* 0.ì|µÓ‰Ì¦•.‡‚f|¨ */
+	$"A203 7467 426E 9507 3DB3 1F90 F66B DC9F"            /* ¢.tgBn•.=³.�ökÜŸ */
+	$"ACF6 CDB2 4FCC 5AE4 2F94 F555 CB9E D8AC"            /* ¬öͲOÌZä/”õU˞ج */
+	$"950B FF38 0FE4 5056 E5E8 F371 9A98 5697"            /* •.ÿ8.äPVåèóqš˜V— */
+	$"6319 5197 B545 E594 AADD B2F2 CA27 260D"            /* c.Q—µE唪ݲòÊ'&. */
+	$"9BAF 0E45 0846 5573 F96B 7AC1 CC89 E86E"            /* ›¯.E.FUsùkzÁ̉èn */
+	$"61E6 72E2 05E3 9F8D 26D8 F178 BCC0 0B18"            /* aærâ.ãŸ�&Øñx¼À.. */
+	$"967C EA80 F7C1 45AE 8FAE A41C 41B6 438E"            /* –|ê€÷ÁE®�®¤.A¶CŽ */
+	$"46EF 1094 D558 01A8 BBAD 7380 DA27 2772"            /* Fï.”ÕX.¨»­s€Ú''r */
+	$"9D67 1330 A48C 62EA 0643 14EC 3E22 A055"            /* �g.0¤Œbê.C.ì>" U */
+	$"4E39 4E23 853D C587 99C8 CFD2 AEBB 9843"            /* N9N#…=Ň™ÈÏÒ®»˜C */
+	$"ECC9 0241 3253 8CF1 E068 1936 3BB2 56D3"            /* ìÉ.A2SŒñàh.6;²VÓ */
+	$"46F7 6A71 98D1 A300 1337 B3B0 7ABB 5752"            /* F÷jq˜Ñ£..7³°z»WR */
+	$"DB7A 7F85 5CFE 59DE A852 6987 DC11 C6B5"            /* Ûz.…\þYÞ¨Ri‡Ü.Ƶ */
+	$"E45B 7DD1 1F3A D566 C16D 3FBF 7BAD 7201"            /* ä[}Ñ.:ÕfÁm?¿{­r. */
+	$"B71C C74C A678 C2BB 10FD 534A 5E5D 79C0"            /* ·.ÇL¦x».ýSJ^]yÀ */
+	$"000C 2336 9113 B9C5 5D4A 1756 1C8B 0CD6"            /* ..#6‘.¹Å]J.V.‹.Ö */
+	$"AA8B DFF5 6CE3 CDAB B9B4 D85C 93FF 76AA"            /* ª‹ßõlãÍ«¹´Ø\“ÿvª */
+	$"15CF CF39 A864 B236 A172 03A1 65A1 9F76"            /* .ÏÏ9¨d²6¡r.¡e¡Ÿv */
+	$"FF55 00DE C7D0 C767 2787 9EB3 7CE5 C5BC"            /* ÿU.ÞÇÐÇg'‡ž³|åż */
+	$"8E08 6085 37A2 229C 73D3 2CC5 F6E8 AA1B"            /* Ž.`…7¢"œsÓ,Åöèª. */
+	$"AF13 15FD EB95 2609 6006 23C6 7910 8FFE"            /* ¯..ýë•&Æ`.#Æy.�þ */
+	$"8C5E 60A6 A558 E899 0A05 0F37 EC94 8E51"            /* Œ^`¦¥Xè™Â..7씎Q */
+	$"7838 9A11 8483 88B0 E284 B88D CDEA 9D56"            /* x8š.„ƒˆ°â„¸�Íê�V */
+	$"5C7E CFA2 8001 847E ABC9 360E 17EA 2D34"            /* \~Ï¢€.„~«É6..ê-4 */
+	$"8314 96C0 3810 D88F A54E 6E7C 6030 76FA"            /* ƒ.–À8.Ø�¥Nn|`0vú */
+	$"18A4 A549 37FC 11F6 E77F A883 C794 71AC"            /* .¤¥I7ü.öç.¨ƒÇ”q¬ */
+	$"55F1 7F88 664A FEE4 01C4 5576 1BE6 9C41"            /* Uñ.ˆfJþä.ÄUv.æœA */
+	$"D800 6121 2FC0 E681 A16E 21AF D5FE 0E80"            /* Ø.a!/Àæ�¡n!¯Õþ.€ */
+	$"A800 0000 3090 8C40 9184 82DA 7187 51C6"            /* ¨...0�Œ@‘„‚Úq‡QÆ */
+	$"44DC C420 FF13 98AD D100 2C07 132C 8D6C"            /* DÜÄ ÿ.˜­Ñ.,..,�l */
+	$"5D16 A089 D8F6 E77F A870 24F1 5461 DB69"            /* ]. ‰Øöç.¨p$ñTaÛi */
+	$"0F41 5029 7A41 B55F 0000 0184 846A 850C"            /* .AP)zAµ_...„„j…. */
+	$"241E E628 EDA6 4000 3090 6AA2 F6E7 7FA6"            /* $.æ(í¦@.0�j¢öç.¦ */
+	$"26C9 5EDE 9BB6 A1B1 51E6 8D5D F800 0061"            /* &É^Þ›¶¡±Qæ�]ø..a */
+	$"19B3 E47D 6F6F DB03 0885 4A53 27BA 38F5"            /* .³ä}ooÛ..…JS'º8õ */
+	$"35A0 1AB9 0A95 8FAE 85E3 F528 5A8B E645"            /* 5 .¹Â•�®…ãõ(Z‹æE */
+	$"8419 0456 6A38 D0DA 4948 8987 2323 1216"            /* „..Vj8ÐÚIH‰‡##.. */
+	$"A4F8 FD1A C374 D30C BF43 CD86 B984 F23C"            /* ¤øý.ÃtÓ.¿C͆¹„ò< */
+	$"5487 B47F E217 F15A D8CF A66A 96A9 EAF3"            /* T‡´.â.ñZØϦj–©êó */
+	$"F966 0205 D320 1556 5C3C 073A 8E66 1E3F"            /* ùf..Ó .V\<.:Žf.? */
+	$"A74E FF2C BC45 E9DB 3B25 FF7F 46AD 13A9"            /* §Nÿ,¼EéÛ;%ÿ.F­.© */
+	$"5C21 458B 6AD4 829C 1DFB 54BA E5F2 3C76"            /* \!E‹jÔ‚œ.ûTºåò<v */
+	$"3898 11F6 D710 7470 00FC 0742 CA59 9E40"            /* 8˜.ö×.tp.ü.BÊYž@ */
+	$"757C 5952 61FF 4D28 0991 1673 9B01 06B9"            /* u|YRaÿM(Æ‘.s›..¹ */
+	$"3999 E9B5 06CD B1DA CB08 FF19 DE70 8D10"            /* 9™éµ.ͱÚË.ÿ.Þp�. */
+	$"E725 848E D27D 2B0B 54F0 B60B 26AB CD92"            /* ç%„ŽÒ}+.Tð¶.&«Í’ */
+	$"E4F8 C007 FF68 6933 E2FF 31D5 435B FF7F"            /* äøÀ.ÿhi3âÿ1ÕC[ÿ. */
+	$"9A8E 9845 007F FEDA 4C63 9892 513A ABD9"            /* šŽ˜E..þÚLc˜’Q:«Ù */
+	$"A98A C012 5C99 31C0 D48F E334 671D A695"            /* ©ŠÀ.\™1ÀÔ�ã4g.¦• */
+	$"C7EF 3AAA FF37 D381 4F42 983F FC4D AE82"            /* Çï:ªÿ7Ó�OB˜?üM®‚ */
+	$"FF43 6555 9E7F 10A3 7B95 415D 41FF 20B3"            /* ÿCeUž..£{•A]Aÿ ³ */
+	$"8CB1 7302 0000 0000 584E AB14 398C A865"            /* Œ±s.....XN«.9Œ¨e */
+	$"5A7B 1650 52EB 8BCE 3E92 461D 071B 8F21"            /* Z{.PRë‹Î>’F...�! */
+	$"2CFF 4F5F FD2E 999E B77D A47D 61B4 2C01"            /* ,ÿO_ý.™ž·}¤}a´,. */
+	$"D397 493D CB48 AB27 EB4A 13A7 8C89 7F64"            /* Ó—I=ËH«'ëJ.§Œ‰.d */
+	$"6C08 FF21 9696 98C7 6248 1615 541F EC81"            /* l.ÿ!––˜ÇbH..T.ì� */
+	$"8E18 FAED 5257 3D01 2CBB 74C1 DA64 81A0"            /* Ž.úíRW=.,»tÁÚd�  */
+	$"39BF B272 4068 15E8 A44A 007C 732C D9DC"            /* 9¿²r@h.è¤J.|s,ÙÜ */
+	$"1CF8 4612 8611 A36D 67BC 6E6A EA14 9D87"            /* .øF.†.£mg¼njê.�‡ */
+	$"2962 C4B4 5442 9564 BFAA D0FB 991F 4288"            /* )bÄ´TB•d¿ªÐû™.Bˆ */
+	$"7CB2 2A41 333E 7827 5070 F3A6 67FF 7FFF"            /* |²*A3>x'Ppó¦gÿ.ÿ */
+	$"7601 CFFE E44B 4413 809B 3877 B59D BC19"            /* v.ÏþäKD.€›8wµ�¼. */
+	$"548F 0A5B C1E9 A8D7 6B5D 8EC8 8A1A BB3D"            /* T�Â[Áé¨×k]ŽÈŠ.»= */
+	$"3CD1 3139 57CF 9E94 00E9 CF6E 3830 3561"            /* <Ñ19WÏž”.éÏn805a */
+	$"8DE4 A59F FD1B 45CF C608 D0FD 5D48 485E"            /* �䥟ý.EÏÆ.Ðý]HH^ */
+	$"D5A3 30A5 F9EE 5D55 B9C2 E552 3A9F B087"            /* Õ£0¥ùî]U¹ÂåR:Ÿ°‡ */
+	$"FE87 5DBC 5E73 0F16 9221 2B0D F399 AB6F"            /* þ‡]¼^s..’!+.ó™«o */
+	$"9950 0000 0000 0000 0008 2444 88CE 3BBD"            /* ™P........$DˆÎ;½ */
+	$"CC78 4932 9C47 DEFA 74E7 91BF 9827 FF7B"            /* ÌxI2œGÞútç‘¿˜'ÿ{ */
+	$"77EB 9B1B 9F7F FDAB 6552 35A1 0C22 E9C6"            /* wë›.Ÿ.ý«eR5¡."éÆ */
+	$"42E3 FF7F FF7F E9FD A23B 2F7D 3ADD FC90"            /* Bãÿ.ÿ.éý¢;/}:Ýü� */
+	$"E4A1 F8B9 0560 0F86 D7FE 3F46 C953 2A03"            /* ä¡ø¹.`.†×þ?FÉS*. */
+	$"F1C7 F5AE D0C4 B743 EA67 B694 E47D 45CD"            /* ñÇõ®ÐÄ·Cêg¶”ä}EÍ */
+	$"6F92 178A E383 8B71 800E D9AF A55A F149"            /* o’.Šãƒ‹q€.Ù¯¥ZñI */
+	$"A838 5671 4C9A 8915 447A CDA9 C6B7 DD68"            /* ¨8VqLš‰.DzÍ©Æ·Ýh */
+	$"A5FB F404 CF63 A62E CC5E 89D3 FDB2 C841"            /* ¥ûô.Ïc¦.Ì^‰Óý²ÈA */
+	$"7A37 5B5D 5958 4B46 20B1 D389 5188 F9FE"            /* z7[]YXKF ±Ó‰Qˆùþ */
+	$"8FF1 D718 6C8C 3254 0000 0000 0000 0000"            /* �ñ×.lŒ2T........ */
+	$"0000 00A1 EBEC C33A 8622 D0FF 7FFF 7FFF"            /* ...¡ëìÃ:†"Ðÿ.ÿ.ÿ */
+	$"705D C7FE 49E7 01B7 A65D D5BC 2041 80B0"            /* p]ÇþIç.·¦]Õ¼ A€° */
+	$"89ED F68A A000 F438 EBD0 C908 0B67 414F"            /* ‰íöŠ .ô8ëÐÉ..gAO */
+	$"C8F1 4312 2EC8 05E6 CA19 184F FF5B BA24"            /* ÈñC..È.æÊ..Oÿ[º$ */
+	$"57E8 A6B4 FBD3 FF79 4D8E FF44 BC50 6938"            /* W覴ûÓÿyMŽÿD¼Pi8 */
+	$"137F FF7D 6251 8D1A 9B33 CF7E 0BCB EAD7"            /* ..ÿ}bQ�.›3Ï~.Ëê× */
+	$"2E0D EAE0 0003 0906 AA2B 66A8 C950 0000"            /* ..êà..Æ.ª+f¨ÉP.. */
+	$"0000 0000 0000 0000 0001 1E1F F600 1848"            /* ............ö..H */
+	$"4BF6 7A7C F92D 3E7A 437E 2254 51EB 4AF5"            /* Köz|ù->zC~"TQëJõ */
+	$"C6BF 442A 12CD 51FF 7FFE B8AE D0C4 B1D0"            /* Æ¿D*.ÍQÿ.þ¸®ÐıР*/
+	$"7CF7 019D A0ED 2CC4 01BC 1A94 212D 43EF"            /* |÷.� í,Ä.¼.”!-Cï */
+	$"1274 9B67 94D5 062D 5FCC E23C 4816 416B"            /* .t›g”Õ.-_Ìâ<H.Ak */
+	$"1540 59C2 1D35 213D A11C EE70 8D15 5394"            /* .@YÂ.5!=¡.îp�.S” */
+	$"53C6 29CF 4E19 F4CF 5B94 7FFF 7F8B 2813"            /* SÆ)ÏN.ôÏ[”.ÿ.‹(. */
+	$"3E95 DE81 30D0 3188 2A75 4F35 CB11 DDD5"            /* >•Þ�0Ð1ˆ*uO5Ë.ÝÕ */
+	$"7FFD A983 95A9 71E7 A7A3 7D3F F944 0A7E"            /* .ý©ƒ•©q秣}?ùDÂ~ */
+	$"24D9 966F 6B6A 0FD0 23AC 7000 0000 0000"            /* $Ù–okj.Ð#¬p..... */
+	$"0009 D4AF 9196 E5A4 B8AC 407F F9EE C709"            /* .ÆÔ¯‘–夸¬@.ùîÇÆ */
+	$"F927 08C3 CA6C 3A3A D90F E306 BCC4 6D6C"            /* ù'.ÃÊl::Ù.ã.¼Äml */
+	$"C7A9 F042 6F4C FDC9 60AB A087 6338 8F12"            /* Ç©ðBoLýÉ`« ‡c8�. */
+	$"4D29 D00C C575 C7B5 9FA4 E96C 1FA0 AAFB"            /* M)Ð.ÅuǵŸ¤él. ªû */
+	$"09E9 8DF9 1BE0 C62D 3C1D F55B DD77 A0FD"            /* Æé�ù.àÆ-<.õ[Ýw ý */
+	$"5C16 D959 BA08 0000 0000 0000 0145 AE01"            /* \.ÙYº........E®. */
+	$"712A 0E06 1212 70CD 94A8 0A2C 18F5 1E3B"            /* q*....pÍ”¨Â,.õ.; */
+	$"52FA C8F6 56F3 F7E4 69E6 54A0 3FF6 2487"            /* RúÈöVó÷äiæT ?ö$‡ */
+	$"C65F 0EFF 7F4F 8D07 C817 FE78 727D 3C75"            /* Æ_.ÿ.O�.È.þxr}<u */
+	$"E4C6 1003 FECF 3E7E 6252 08C0 4A83 50D7"            /* äÆ..þÏ>~bR.ÀJƒP× */
+	$"DADA 8602 5949 900F D2B6 D10D 2661 3014"            /* ÚÚ†.YI�.Ò¶Ñ.&a0. */
+	$"4541 17FF 2106 00DF AC82 0046 09BB A5AF"            /* EA.ÿ!..߬‚.FÆ»¥¯ */
+	$"CE51 0EBF F9AD 787A 907F 9F9A 628F E16B"            /* ÎQ.¿ù­xz�.Ÿšb�ák */
+	$"C015 137E 9C68 FCFA A817 FF7F DD6B FDB6"            /* À..~œhüú¨.ÿ.Ýký¶ */
+	$"3DA3 7C9D 3309 0B8A B551 C370 4401 CD7F"            /* =£|�3Æ.ŠµQÃpD.Í. */
+	$"7503 8425 E297 1B3F FF49 4FF8 3583 685A"            /* u.„%â—.?ÿIOø5ƒhZ */
+	$"B273 A7F7 CEBF F27E D78C 3E35 5332 152B"            /* ²s§÷οò~׌>5S2.+ */
+	$"033C C7FF 7B97 1AF0 F2A4 3C88 CC7B B96E"            /* .<Çÿ{—.ðò¤<ˆÌ{¹n */
+	$"65B3 533C F2F8 5E4B 6DBF 7D78 A316 310F"            /* e³S<òø^Km¿}x£.1. */
+	$"6B09 FD62 88D7 77FF 7447 524E C235 00A3"            /* kÆýbˆ×wÿtGRNÂ5.£ */
+	$"8F5A 4BEE D240 6154 C17C 2CC2 68F0 A959"            /* �ZKîÒ@aTÁ|,Âhð©Y */
+	$"2F12 9B74 7E8E 423F BB1D BC9A C75B C618"            /* /.›t~ŽB?».¼šÇ[Æ. */
+	$"19D1 C6CB 0A15 BD77 99BD 96D3 CC07 F5AC"            /* .ÑÆËÂ.½w™½–ÓÌ.õ¬ */
+	$"D2ED DE5E F19D 5CFC B2B0 5407 0386 32C6"            /* ÒíÞ^ñ�\ü²°T..†2Æ */
+	$"5F49 7BAD 3270 BF81 CF97 C934 7E23 7237"            /* _I{­2p¿�Ï—É4~#r7 */
+	$"727B 0FA2 6DB0 D717 8C73 B109 E089 AAC5"            /* r{.¢m°×.Œs±Æà‰ªÅ */
+	$"7D98 9061 2956 EA75 0135 E870 3430 4E9B"            /* }˜�a)Vêu.5èp40N› */
+	$"C76C D3D6 7EEB 83DB 9EEB C9A0 983D 1327"            /* ÇlÓÖ~ëƒÛžëÉ ˜=.' */
+	$"62D8 FD62 CA51 7135 80B0 ABFF 431B 9843"            /* bØýbÊQq5€°«ÿC.˜C */
+	$"68B4 A929 44E4 1F3E E3A1 22AA 5E87 579C"            /* h´©)Dä.>ã¡"ª^‡Wœ */
+	$"745B 9CA4 438C BFC2 9A1B 17BE BA75 06E4"            /* t[œ¤CŒ¿Âš..¾ºu.ä */
+	$"0108 698C E4F2 341C 24CC 7913 6237 ED48"            /* ..iŒäò4.$Ìy.b7íH */
+	$"E797 4D7A 0D5A D1EA ACDF F974 4F9F 9139"            /* ç—Mz.ZÑê¬ßùtOŸ‘9 */
+	$"6A87 3972 A1C8 0A2B 1E8B 6DB7 B811 4AB0"            /* j‡9r¡ÈÂ+.‹m·¸.J° */
+	$"EEE8 BB23 959C 239D 4165 DBED ACE4 F133"            /* îè»#•œ#�AeÛí¬äñ3 */
+	$"8276 40BB C447 29FE 3EB6 5BA4 A6D0 2441"            /* ‚v@»ÄG)þ>¶[¤¦Ð$A */
+	$"1431 8B2D 8BFD 96B7 C8C2 9F9B DFB9 2B06"            /* .1‹-‹ý–·ÈŸ›ß¹+. */
+	$"E191 00FF 7E4B 8281 D609 D163 B8CB AF9A"            /* á‘.ÿ~K‚�ÖÆÑc¸Ë¯š */
+	$"0995 7385 27FC 3C6A 5310 024D BAD1 8013"            /* Æ•s…'ü<jS..MºÑ€. */
+	$"8995 3DF4 FA80 FE12 8F5F 40E5 09E6 E7E8"            /* ‰•=ôú€þ.�_@åÆæçè */
+	$"C5E7 1309 3E97 E278 0228 1693 F565 F83E"            /* Åç.Æ>—âx.(.“õeø> */
+	$"4161 0037 E0AA D0CC 3AED 4E56 04E8 4456"            /* Aa.7àªÐÌ:íNV.èDV */
+	$"6E50 4626 C7E0 0790 014E 329B 0DDB D87D"            /* nPF&Çà.�.N2›.ÛØ} */
+	$"4532 6482 3F51 D651 3F62 D6EB 3BCA 75EB"            /* E2d‚?QÖQ?bÖë;Êuë */
+	$"5444 A42F 3CFB 4146 19FB 5376 876F 6BC1"            /* TD¤/<ûAF.ûSv‡okÁ */
+	$"B80B 7787 71DF 4CAA D70A 98BC 98E1 15A1"            /* ¸.w‡qßLª×˜¼˜á.¡ */
+	$"7996 F17F FF7A 91CF 350C FA04 5753 7ECB"            /* y–ñ.ÿz‘Ï5.ú.WS~Ë */
+	$"29F1 A4AD F335 59DB A580 EAA3 98AD FEB0"            /* )ñ¤­ó5YÛ¥€ê£˜­þ° */
+	$"275E BABE 6679 9AD4 B246 75F2 ECAA B042"            /* '^º¾fyšÔ²Fuò쪰B */
+	$"92C9 745E 1C58 58FF 2570 9228 4EAF 6F65"            /* ’Ét^.XXÿ%p’(N¯oe */
+	$"56F3 1D0C 85AA 9468 8000 0000 0101 3082"            /* Vó..…ª”h€.....0‚ */
+	$"08FD E30F FF75 70BF FCCA 2225 E5FC 3464"            /* .ýã.ÿup¿üÊ"%åü4d */
+	$"00CA 6C43 E833 80DE 2895 5F84 4B08 CEFA"            /* .ÊlCè3€Þ(•_„K.Îú */
+	$"AA94 EE33 24E7 CA20 A668 4717 FD5F F7F2"            /* ª”î3$çÊ ¦hG.ý_÷ò */
+	$"59E7 D6C6 6D0D 8E0F 1AC3 BBFA 3890 8ACB"            /* YçÖÆm.Ž..ûú8�ŠË */
+	$"9250 6D82 E892 D4B9 1F14 D987 9818 877A"            /* ’Pm‚è’Ô¹..Ù‡˜.‡z */
+	$"66F0 905A B088 D761 B529 F02A 6964 6C65"            /* fð�Z°ˆ×aµ)ð*idle */
+	$"8FB8 9A87 7771 9A12 C8A6 7F9C 9905 D643"            /* �¸š‡wqš.Ȧ.œ™.ÖC */
+	$"E554 91F5 0C26 4299 30C6 BC87 B38C 86FB"            /* åT‘õ.&B™0Ƽ‡³Œ†û */
+	$"ED50 C019 3822 52A8 97C6 1F49 176D FB8C"            /* íPÀ.8"R¨—Æ.I.mûŒ */
+	$"87B7 E37C 196E 3695 357A E2B8 FDE5 736E"            /* ‡·ã|.n6•5zâ¸ýåsn */
+	$"DF11 6026 3CD9 51CF 2A50 6F8A 53B0 0F16"            /* ß.`&<ÙQÏ*PoŠS°.. */
+	$"938B 745A F84D 571C A582 9723 90B4 49D7"            /* “‹tZøMW.¥‚—#�´I× */
+	$"B11D 7BA6 45C1 2AFA D519 A471 60A3 17A9"            /* ±.{¦EÁ*úÕ.¤q`£.© */
+	$"2C13 6E04 D58E 3F37 0115 E4AE F51C 1BA8"            /* ,.n.ÕŽ?7..ä®õ..¨ */
+	$"EF7F 4C9F 7B47 8C5A D1D6 CAC7 D416 D6D4"            /* ï.LŸ{GŒZÑÖÊÇÔ.ÖÔ */
+	$"7F05 9504 5685 0D6D E0E8 6809 9307 7864"            /* ..•.V….màèhÆ“.xd */
+	$"1A86 1BA6 A321 D08C 1B0C 0981 9395 6DC0"            /* .†.¦£!ÐŒ..Æ�“•mÀ */
+	$"C74F ECF7 CA1B FF4B 1896 BDBE 4876 8A4B"            /* ÇOì÷Ê.ÿK.–½¾HvŠK */
+	$"519F CC3C 7813 BE21 C40C B001 30F4 4FC7"            /* QŸÌ<x.¾!Ä.°.0ôOÇ */
+	$"B76C B9FA 26F6 38C8 116D B8F0 0B9D 818F"            /* ·l¹ú&ö8È.m¸ð.��� */
+	$"56F9 F934 AE60 71FD E583 8D07 A4A4 DE41"            /* Vùù4®`qýåƒ�.¤¤ÞA */
+	$"FB75 B83F 384B 11C9 CC5E CD9D FF4C 05A8"            /* ûu¸?8K.ÉÌ^Í�ÿL.¨ */
+	$"D59F 1E59 4797 FF7F DFD8 391C E8BA 72E2"            /* ÕŸ.YG—ÿ.ßØ9.èºrâ */
+	$"C1F8 9F5C 5317 01E3 EC2D 4120 97D2 BAEC"            /* ÁøŸ\S..ãì-A —Òºì */
+	$"DBB0 FF30 FC56 2E43 3716 1B7B A8CD 19AE"            /* Û°ÿ0üV.C7..{¨Í.® */
+	$"7FFF 7FF4 468B FF45 749B 3C67 EE31 1651"            /* .ÿ.ôF‹ÿEt›<gî1.Q */
+	$"17B2 B21C A982 A185 E8A3 03BC 2DCB C09A"            /* .²².©‚¡…è£.¼-ËÀš */
+	$"8522 64CF BB21 6955 068D F002 871B 05F3"            /* …"dÏ»!iU.�ð.‡..ó */
+	$"9F44 7384 D624 E1FA A24D 67C7 BC5E F7BF"            /* ŸDs„Ö$áú¢MgǼ^÷¿ */
+	$"59BC DC3C BE4B 1456 0C6F F2C1 0841 038D"            /* Y¼Ü<¾K.V.oòÁ.A.� */
+	$"723C 14FA 4F19 0AD4 1F88 0A1B FF14 3D93"            /* r<.úO.ÂÔ.ˆÂ.ÿ.=“ */
+	$"27AA 6E0B 4AA7 6A11 E06D 5D82 C930 1B53"            /* 'ªn.J§j.àm]‚É0.S */
+	$"0227 A9AA 253A 41E6 31D5 8B87 DC08 819B"            /* .'©ª%:Aæ1Õ‹‡Ü.�› */
+	$"E5EE EA0F 6AA0 0000 0006 9BC0 594E 0004"            /* åîê.j ....›ÀYN.. */
+	$"D326 312C 0364 8835 C4D7 5040 3724 3CD9"            /* Ó&1,.dˆ5Ä×P@7$<Ù */
+	$"B889 2E14 12BC F0AD 9D2E 326B 1654 5952"            /* ¸‰...¼ð­�.2k.TYR */
+	$"2B5F 1A9D 5403 C9C5 A731 1B3C 3443 783C"            /* +_.�T.Éŧ1.<4Cx< */
+	$"A459 248B BBC7 DEDC 74AD E2A1 D647 5047"            /* ¤Y$‹»ÇÞÜt­â¡ÖGPG */
+	$"AD17 15AF FF5C 88C4 025F 4361 3F83 BFC9"            /* ­..¯ÿ\ˆÄ._Ca?ƒ¿É */
+	$"FF6D 7E58 128D 33D7 7076 E73A 9CF6 76D8"            /* ÿm~X.�3×pvç:œövØ */
+	$"A0FF 2C44 2029 0B59 B427 3BDC 915B 87CF"            /*  ÿ,D ).Y´';Ü‘[‡Ï */
+	$"75D6 EC52 7793 6DFA A4E2 9E2D 7D25 FBC2"            /* uÖìRw“mú¤âž-}%û */
+	$"2028 DE78 D868 BEC5 E9D2 BFFA 8B12 9265"            /*  (ÞxØh¾ÅéÒ¿ú‹.’e */
+	$"B01D 92F7 F71E 8782 F1CD 4E98 B46E 6DA5"            /* °.’÷÷.‡‚ñÍN˜´nm¥ */
+	$"8825 F851 1CE9 9F21 D8E2 86EB BAF4 126F"            /* ˆ%øQ.éŸ!Øâ†ëºô.o */
+	$"9CB3 0144 009A 6F38 0919 9C1F D0CE D23C"            /* œ³.D.šo8Æ.œ.ÐÎÒ< */
+	$"C9DD 9273 D8F6 6733 6E5A 2E7A 635C 8723"            /* ÉÝ’sØög3nZ.zc\‡# */
+	$"6E04 1283 1A43 02CA 74E4 8000 0309 08DB"            /* n..ƒ.C.Êtä€..Æ.Û */
+	$"EF05 DC00 D116 0D58 1A69 2055 1BA0 D8DE"            /* ï.Ü.Ñ..X.i U. ØÞ */
+	$"34B6 EA40 CC06 C673 559A 75F2 9B58 C474"            /* 4¶ê@Ì.ÆsUšuò›XÄt */
+	$"DD4C AB9A 9E6D 653B FCDF 4F33 3707 105E"            /* ÝL«šžme;üßO37..^ */
+	$"DBCE D327 45FB C663 E1AF 375B B106 B0B8"            /* ÛÎÓ'EûÆcá¯7[±.°¸ */
+	$"26EE AE4B 538A CF74 588E 928B 58C7 2D93"            /* &î®KSŠÏtXŽ’‹XÇ-“ */
+	$"371E BC81 0ED0 9F2C 1A18 8DD7 7E65 4FBF"            /* 7.¼�.П,..�×~eO¿ */
+	$"511B 63A1 8F26 2A08 A4D3 2BF3 96E6 FC32"            /* Q.c¡�&*.¤Ó+ó–æü2 */
+	$"D457 8287 D843 6D19 2458 0EA4 AC8F 0512"            /* ÔW‚‡ØCm.$X.¤¬�.. */
+	$"831D D4CA 9BFF 5A6E 951A 5897 451F 750C"            /* ƒ.ÔÊ›ÿZn•.X—E.u. */
+	$"CAD4 89C1 94A7 4BFA 4030 4828 1E37 C049"            /* ÊÔ‰Á”§Kú@0H(.7ÀI */
+	$"34C4 54B1 1054 2645 14E5 6DFF 7FFF 7328"            /* 4ÄT±.T&E.åmÿ.ÿs( */
+	$"F1A4 AAA2 4FD2 507D 86D5 FF7F FA43 F49A"            /* ñ¤ª¢OÒP}†Õÿ.úCôš */
+	$"5049 0839 5964 8186 EE46 1867 158E 9E2C"            /* PI.9Yd�†îF.g.Žž, */
+	$"D618 8FF5 D416 6838 6187 9CF7 21BC DE1F"            /* Ö.�õÔ.h8a‡œ÷!¼Þ. */
+	$"F84F F4E9 ACDB ECD8 6CA6 6725 85B4 4049"            /* øOôé¬ÛìØl¦g%…´@I */
+	$"AA9E 4935 7E1F 54E7 B0D5 A026 B073 899B"            /* ªžI5~.Tç°Õ &°s‰› */
+	$"51C4 8C2E 483C B3BF 38A0 4BCF 2042 EE90"            /* QÄŒ.H<³¿8 KÏ Bî� */
+	$"4E1B 8C94 420F 99A7 9EA1 7D96 12A3 8C8D"            /* N.Œ”B.™§ž¡}–.£Œ� */
+	$"819B C97D C518 51CB 0D8A A7A1 7159 EB10"            /* �›É}Å.QË.Š§¡qYë. */
+	$"4A27 5CD0 0ED7 2688 5F74 CE10 DF6A 5B4F"            /* J'\Ð.×&ˆ_tÎ.ßj[O */
+	$"E370 A282 105D 2F43 6E74 6B07 05EC 880E"            /* ãp¢‚.]/Cntk..ìˆ. */
+	$"15AF 5118 9D27 327D 2552 9996 020B 2D9A"            /* .¯Q.�'2}%R™–..-š */
+	$"9AFC 6849 6068 6491 42FA 889C 7949 285A"            /* šühI`hd‘BúˆœyI(Z */
+	$"7FFE 5B6D DAF2 7FFF 772D E08E B9E4 65A3"            /* .þ[mÚò.ÿw-àŽ¹äe£ */
+	$"B49A DDC8 FF52 8DA3 B318 F84F F4E9 99ED"            /* ´šÝÈÿR�£³.øOôé™í */
+	$"48C4 CA7E BE77 2634 6A22 1FAD 4752 8D9B"            /* HÄÊ~¾w&4j".­GR�› */
+	$"B935 0449 1A27 9EAB B000 C242 3BB7 72B7"            /* ¹5.I.'ž«°.ÂB;·r· */
+	$"3ACC B41F 0AC9 CFFD 58DA D99F 498A 21CF"            /* :Ì´.ÂÉÏýXÚÙŸIŠ!Ï */
+	$"50B8 A155 9BB3 B3DA 13FE 251F 14F2 3431"            /* P¸¡U›³³Ú.þ%..ò41 */
+	$"6DBF 2774 3EFC 55BB 9CB3 40A4 CA00 A112"            /* m¿'t>üU»œ³@¤Ê.¡. */
+	$"3E83 51D4 9D13 DE0D F86D 3384 AAE7 9074"            /* >ƒQÔ�.Þ.øm3„ªç�t */
+	$"F7CF 4509 F99A 70B2 2E74 43C3 1363 021F"            /* ÷ÏEÆùšp².tCÃ.c.. */
+	$"6482 E471 22FA 6265 2DF9 C302 43F8 9053"            /* d‚äq"úbe-ùÃ.Cø�S */
+	$"0AE9 15A2 28D4 FD7C 05AF C7B8 26D5 7C0F"            /* Âé.¢(Ôý|.¯Ç¸&Õ|. */
+	$"22E0 4735 518D BE4B 4E83 1EF8 3FFA BA23"            /* "àG5Q�¾KNƒ.ø?úº# */
+	$"3AE8 F76B 1D92 2038 64C1 EA73 30FC CE72"            /* :è÷k.’ 8dÁês0üÎr */
+	$"0CA5 6697 157E 55C4 8BAE E703 6FF5 F743"            /* .¥f—.~UÄ‹®ç.oõ÷C */
+	$"B456 C85F 3BFF 2629 95B7 02F4 F580 A49B"            /* ´VÈ_;ÿ&)•·.ôõ€¤› */
+	$"1587 2316 D131 66C1 C6DB F3DC C409 D801"            /* .‡#.Ñ1fÁÆÛóÜÄÆØ. */
+	$"E2DA 30B6 73FD 99EF AA26 25D7 DF07 FBEB"            /* âÚ0¶sý™ïª&%×ß.ûë */
+	$"094E 2E8E BD11 3C49 81BA E6BE 7666 ECBE"            /* ÆN.Ž½.<I�ºæ¾vfì¾ */
+	$"59D2 4ACC B4CE 3FAD 2173 25CB E42F 37B8"            /* YÒJÌ´Î?­!s%Ëä/7¸ */
+	$"F3CC 79EF 695C 10F4 0381 2D14 1B0F D632"            /* óÌyïi\.ô.�-...Ö2 */
+	$"8A1E 9C29 F617 6A4B 204E A147 C08D 1AA5"            /* Š.œ)ö.jK N¡GÀ�.¥ */
+	$"7418 DED9 DE83 A555 A75B AB00 C650 247F"            /* t.ÞÙÞƒ¥U§[«.ÆP$. */
+	$"0222 5558 731B 54DB 14F6 3A0E 1FAD A8D8"            /* ."UXs.TÛ.ö:..­¨Ø */
+	$"F327 DC8F AF3F 630B 3BA9 7933 8D30 458C"            /* ó'Ü�¯?c.;©y3�0EŒ */
+	$"4C2F 6E3A 0A64 DDC5 926A 71CB 2347 EE4D"            /* L/n:ÂdÝÅ’jqË#GîM */
+	$"647B D94D BE24 7F62 6A14 EBE2 696F 8735"            /* d{ÙM¾$.bj.ëâio‡5 */
+	$"A96F E268 6912 A4A9 3254 0293 CB09 0DC0"            /* ©oâhi.¤©2T.“ËÆ.À */
+	$"206B EB7B F6B9 0643 5E74 4F2C 555A AE2D"            /*  kë{ö¹.C^tO,UZ®- */
+	$"B16B 7FA3 8ADE 7EAC 764F 9A20 BC94 05F1"            /* ±k.£ŠÞ~¬vOš ¼”.ñ */
+	$"9AAC 0118 36B8 6B30 D696 6E84 EEC2 5342"            /* š¬..6¸k0Ö–n„îÂSB */
+	$"03A8 EFD3 CB37 D50D F676 35DB AD6C 280A"            /* .¨ïÓË7Õ.öv5Û­l( */
+	$"DB04 D23A 0922 A2E3 5F45 EBD1 5C49 F6AA"            /* Û.Ò:Æ"¢ã_EëÑ\Iöª */
+	$"4579 1BA2 D94E D3F0 7A7E C24E 79B0 5D24"            /* Ey.¢ÙNÓðz~ÂNy°]$ */
+	$"B98E 23E7 4C4F 54D9 A3CE 389F 63F6 2426"            /* ¹Ž#çLOTÙ£Î8Ÿcö$& */
+	$"7087 D921 86D6 709F 768D 5684 BB90 47B7"            /* p‡Ù!†ÖpŸv�V„»�G· */
+	$"AC32 98D7 E247 3668 E954 8105 EE44 AF58"            /* ¬2˜×âG6héT�.îD¯X */
+	$"13FF 573A 9F89 06C9 FB77 277E 08C9 09E9"            /* .ÿW:Ÿ‰.Éûw'~.ÉÆé */
+	$"B180 F96E C5AB 1E5D 3029 E229 CE1B B2AD"            /* ±€ùnÅ«.]0)â)Î.²­ */
+	$"BA11 DD98 0D9C 4C45 66DD 8553 3BA2 6F5B"            /* º.ݘ.œLEfÝ…S;¢o[ */
+	$"699B CEF3 48A7 6C31 63E6 E189 9C68 B9EC"            /* i›ÎóH§l1cæቜh¹ì */
+	$"A663 411F EBCB 41AB 8F7E 7EAD 87DA 5BF3"            /* ¦cA.ëËA«�~~­‡Ú[ó */
+	$"AAC9 975B AC1F 712B F7ED DEBD 04C3 B85A"            /* ªÉ—[¬.q+÷íÞ½.øZ */
+	$"470D D74A B91D 0180 7BAB 4088 5671 6268"            /* G.×J¹..€{«@ˆVqbh */
+	$"5B4A 54FE C179 1600 7677 830B 0E81 EEB4"            /* [JTþÁy..vwƒ..�î´ */
+	$"056E 79FF 8251 AB20 A6BC 15A5 E71F 7D4A"            /* .nyÿ‚Q« ¦¼.¥ç.}J */
+	$"2F6E 951A DE36 7A81 C704 9A4A F239 E1DC"            /* /n•.Þ6z�Ç.šJò9áÜ */
+	$"FF6C DE49 B4C8 F6C1 F764 8D19 4686 DFC2"            /* ÿlÞI´ÈöÁ÷d�.F†ß */
+	$"5C72 4A52 9784 F974 DCA4 A177 21DA 9869"            /* \rJR—„ùtܤ¡w!Ú˜i */
+	$"80A4 5BC6 FD54 A56B C7B1 4705 3A32 C896"            /* €¤[ÆýT¥kDZG.:2È– */
+	$"4539 25E5 90CC F228 B7F9 ADA5 CC2C 59CA"            /* E9%å�Ìò(·ù­¥Ì,YÊ */
+	$"D14D 4B86 9CC0 D367 7EF5 DB6D C2E1 06DB"            /* ÑMK†œÀÓg~õÛmÂá.Û */
+	$"58BC 0D97 DCFE 3CB1 EA45 C36F 1B60 83C9"            /* X¼.—Üþ<±êEÃo.`ƒÉ */
+	$"663F B883 83BA A69F 2653 0747 18C7 6D20"            /* f?¸ƒƒº¦Ÿ&S.G.Çm  */
+	$"F2C7 6E01 47DA AB9D 2D83 D5CE 1E9C 779A"            /* òÇn.GÚ«�-ƒÕÎ.œwš */
+	$"5FAE 6015 63DE 317A EFCA 7142 F3F8 A7E1"            /* _®`.cÞ1zïÊqBóø§á */
+	$"F739 60AB DF24 41BF EB6C AF15 7223 E56C"            /* ÷9`«ß$A¿ël¯.r#ål */
+	$"8D61 D9D1 C61F 8F8E 8435 6452 C45A 917B"            /* �aÙÑÆ.�Ž„5dRÄZ‘{ */
+	$"0856 B8BA 14E2 0A77 ABA0 E605 2E39 63EA"            /* .V¸º.âÂw« æ..9cê */
+	$"E7F5 4804 6535 7672 575F 37EA 9E69 1A1C"            /* çõH.e5vrW_7êži.. */
+	$"E380 CB7D C109 2D50 73EF 4119 54BE CBFE"            /* ã€Ë}ÁÆ-PsïA.T¾Ëþ */
+	$"4552 74A1 3E73 C457 1436 9DFF 3C25 8231"            /* ERt¡>sÄW.6�ÿ<%‚1 */
+	$"2C25 ACE4 F084 E842 60E8 355D 22BE 6FEE"            /* ,%¬äð„èB`è5]"¾oî */
+	$"93F9 DDE6 DAED 4E44 545A FE4E 5EA4 0487"            /* “ùÝæÚíNDTZþN^¤.‡ */
+	$"36F1 52AF 8683 2DE8 F30B 72DE E807 2068"            /* 6ñR¯†ƒ-èó.rÞè. h */
+	$"742B 7262 BF7E 516C D41F CA56 9DE1 E3B8"            /* t+rb¿~QlÔ.ÊV�á㸠*/
+	$"8D72 2993 C073 516D A343 DDE0 984D F06A"            /* �r)“ÀsQm£CÝà˜Mðj */
+	$"CD83 D22D C161 30D7 2E9A FED4 4E85 5D2E"            /* ̓Ò-Áa0×.šþÔN…]. */
+	$"CF72 2181 7F23 BC37 FF83 C30D 43E0 DBC7"            /* Ïr!�.#¼7ÿƒÃ.CàÛÇ */
+	$"A277 B4D9 4E68 1FB1 AF7B 6D8B 8F43 2A1B"            /* ¢w´ÙNh.±¯{m‹�C*. */
+	$"9FE4 6CCC E826 C4AA 96C9 98A9 4D3B 981F"            /* ŸälÌè&Ī–ɘ©M;˜. */
+	$"8786 8633 89B0 2B42 4266 BC27 0098 D2B3"            /* ‡††3‰°+BBf¼'.˜Ò³ */
+	$"E8E4 0D2C 6E14 D34D 3613 4568 4A1E 8E5E"            /* èä.,n.ÓM6.EhJ.Ž^ */
+	$"E328 D89C 85D3 D8C2 C15B 3533 989F F015"            /* ã(Øœ…ÓØÂÁ[53˜Ÿð. */
+	$"1B49 871D 031B 2DBE D49E 880D A557 0694"            /* .I‡...-¾Ôžˆ.¥W.” */
+	$"60C3 47A1 CD2A 961B F73C 94A3 6B17 4268"            /* `ÃG¡Í*–.÷<”£k.Bh */
+	$"F766 81DC 33BC 8C1D 5571 D2D7 FB1C 9378"            /* ÷f�Ü3¼Œ.UqÒ×û.“x */
+	$"01B7 BDCC 5DD0 9171 5FA1 50DA 7EBF 1586"            /* .·½Ì]Бq_¡PÚ~¿.† */
+	$"FA82 9E6F CBE4 0977 9C9C 2373 E789 5A3E"            /* ú‚žoËäÆwœœ#sç‰Z> */
+	$"8743 EB0E ED13 7955 DB28 2874 8065 2078"            /* ‡Cë.í.yUÛ((t€e x */
+	$"97A7 6C13 2283 729A CCF9 E449 A627 7652"            /* —§l."ƒršÌùäI¦'vR */
+	$"E821 2F1F 574E 6887 1830 6E01 5A8D 02FB"            /* è!/.WNh‡.0n.Z�.û */
+	$"DB61 8EEF 4E08 B607 26FA 2B4C FF47 38FE"            /* ÛaŽïN.¶.&ú+LÿG8þ */
+	$"9B7C A3E4 DB46 F898 CFE9 8F3C 8717 2975"            /* ›|£äÛFø˜Ïé�<‡.)u */
+	$"9BA2 582E 86D1 D882 C127 EFD7 E71A B5DD"            /* ›¢X.†ÑØ‚Á'ï×ç.µÝ */
+	$"7772 6391 2722 2884 AA0F 9C72 9A96 F4F8"            /* wrc‘'"(„ª.œrš–ôø */
+	$"BFF8 869A FD00 3B41 A8C7 DCD0 2834 270C"            /* ¿ø†šý.;A¨ÇÜÐ(4'. */
+	$"B93C 8702 5B16 8A32 0289 979B 0A35 3A7B"            /* ¹<‡.[.Š2.‰—›Â5:{ */
+	$"5870 6189 03C2 DD00 FAB2 B137 AB93 3EF5"            /* Xpa‰.ÂÝ.ú²±7«“>õ */
+	$"24E3 1FE1 A206 963E 1344 FE12 285A 5C52"            /* $ã.á¢.–>.Dþ.(Z\R */
+	$"692E D315 6C73 2CBE 7ADC 81BC EBC8 13EA"            /* i.Ó.ls,¾zÜ�¼ëÈ.ê */
+	$"796B 6056 E9E7 D971 6E09 7086 252C 6A19"            /* yk`VéçÙqnÆp†%,j. */
+	$"7351 153D F4C4 FE01 6235 917F B203 171A"            /* sQ.=ôÄþ.b5‘.²... */
+	$"1822 B42B 9226 D163 5572 7E7E C508 BEBA"            /* ."´+’&ÑcUr~~Å.¾º */
+	$"D0D2 1C24 8D62 565D C183 F78D 4726 0541"            /* ÐÒ.$�bV]Áƒ÷�G&.A */
+	$"F829 10C7 1B21 E59C C4E5 7688 6268 FABC"            /* ø).Ç.!åœÄåvˆbhú¼ */
+	$"C0B9 6C02 8820 3F44 54A7 8C83 F14F 61B8"            /* À¹l.ˆ ?DT§ŒƒñOa¸ */
+	$"707C AB32 9D59 F01E D18A 37FC 40F9 5C59"            /* p|«2�Yð.ÑŠ7ü@ù\Y */
+	$"EEA8 E442 FDC8 CA73 970F 6EE0 1348 AC8E"            /* î¨äBýÈÊs—.nà.H¬Ž */
+	$"9D65 4DA9 2820 AEDB A7F3 C1B4 8E3F 8780"            /* �eM©( ®Û§óÁ´Ž?‡€ */
+	$"8DA9 F7D9 F116 DD30 778E 4FB6 49D3 AFE8"            /* �©÷Ùñ.Ý0wŽO¶IÓ¯è */
+	$"74B1 EB63 92B8 4210 3B22 3613 6784 41A2"            /* t±ëc’¸B.;"6.g„A¢ */
+	$"5953 1EFF 16A9 1769 9852 73D0 B6C2 3523"            /* YS.ÿ.©.i˜RsжÂ5# */
+	$"854B 1247 531D 47C5 7AFC 1B6B F0C4 2E2F"            /* …K.GS.GÅzü.kðÄ./ */
+	$"6C60 82C9 9C4D 2FAD 25A5 BEC6 8590 7388"            /* l`‚ÉœM/­%¥¾Æ…�sˆ */
+	$"5D15 9A65 E013 D48B 7D9C 34B2 A617 75A8"            /* ].šeà.Ô‹}œ4²¦.u¨ */
+	$"8E8E 2D91 1AEC 26D5 8B9C D03C A02A A829"            /* ŽŽ-‘.ì&Õ‹œÐ< *¨) */
+	$"738D 9A4E 8F31 82A9 39B7 7CFE D412 810E"            /* s�šN�1‚©9·|þÔ.�. */
+	$"1372 6D79 8D49 BAC1 9FFB 5D52 56AD 488F"            /* .rmy�IºÁŸû]RV­H� */
+	$"4E1D A232 7348 1FE2 483F AB9F A23C 0997"            /* N.¢2sH.âH?«Ÿ¢<Æ— */
+	$"678D 1AB7 7F66 8927 7DED 2A66 E03B 05C9"            /* g�.·.f‰'}í*fà;.É */
+	$"0420 66A2 E0AE E1B9 259E 64C9 FF0E A7C7"            /* . f¢à®á¹%ždÉÿ.§Ç */
+	$"5E9D 69F4 DD50 394C 344E 9DA9 6BCA 3D9F"            /* ^�iôÝP9L4N�©kÊ=Ÿ */
+	$"8FA9 C156 3248 2310 8AB9 6131 B94F FF36"            /* �©ÁV2H#.Š¹a1¹Oÿ6 */
+	$"DF00 9E80 5713 E9AD 3B07 879E C876 E063"            /* ß.ž€W.é­;.‡žÈvàc */
+	$"38D8 2776 3081 5810 1760 927C D93C EE88"            /* 8Ø'v0�X..`’|Ù<îˆ */
+	$"518B 755A EBF1 B276 C65B 98DD 1421 8AA1"            /* Q‹uZëñ²vÆ[˜Ý.!Š¡ */
+	$"27D2 A8B2 5E3E B7B7 8F73 CDCB 9896 D80F"            /* 'Ò¨²^>··�s͢–Ø. */
+	$"1D50 2E28 4F54 26A9 E68F 822C 3031 0A5B"            /* .P.(OT&©æ�‚,01Â[ */
+	$"213A 8ED8 B1B8 C32C F5EF 6784 3641 A888"            /* !:ŽØ±¸Ã,õïg„6A¨ˆ */
+	$"1AF9 941B E9B2 42C0 D9BE AAD7 2727 9E13"            /* .ù”.é²BÀÙ¾ª×''ž. */
+	$"284F A530 1F62 679B 7860 E677 9E24 3663"            /* (O¥0.bg›x`æwž$6c */
+	$"E7D1 E4B5 D37B C274 9ECB CFA2 CC95 8A75"            /* çÑäµÓ{ÂtžËϢ̕Šu */
+	$"0C3A FB7D F074 1433 5EC7 1FC4 330E F221"            /* .:û}ðt.3^Ç.Ä3.ò! */
+	$"AE39 4A04 097F 4B21 27CD C193 39CB 3AB2"            /* ®9J.Æ.K!'ÍÁ“9Ë:² */
+	$"0B6E D8E0 54EA 0F75 15F9 D75D 0D82 624D"            /* .nØàTê.u.ù×].‚bM */
+	$"7D19 8E11 1AD0 764F CEA8 F0FE 2913 6841"            /* }.Ž..ÐvOΨðþ).hA */
+	$"89B8 CA62 C997 34B9 5950 4842 4F13 1ACD"            /* ‰¸ÊbÉ—4¹YPHBO..Í */
+	$"39AD 30CA 4ED2 A17D 0B09 206B 9426 EF50"            /* 9­0ÊNÒ¡}.Æ k”&ïP */
+	$"63C6 386E 74BB BDE0 420F 6154 5260 E1A2"            /* cÆ8nt»½àB.aTR`ᢠ*/
+	$"8546 3192 76D1 1F38 268E 7AC6 049F 321D"            /* …F1’vÑ.8&ŽzÆ.Ÿ2. */
+	$"CB51 35C7 067C 961B DA2F 4BCB E065 A8DB"            /* ËQ5Ç.|–.Ú/KËàe¨Û */
+	$"16C9 1F05 ABAF 93FF 333A F049 3161 6838"            /* .É..«¯“ÿ3:ðI1ah8 */
+	$"6E1A FEF2 564C 3F48 3800 BC9C F009 AF34"            /* n.þòVL?H8.¼œðƯ4 */
+	$"2241 15D4 764F 4764 CEDF 6D7D 2E9C 8141"            /* "A.ÔvOGdÎßm}.œ�A */
+	$"1E00 E109 D827 DDAA A47C 2854 9229 8998"            /* ..áÆØ'ݪ¤|(T’)‰˜ */
+	$"9175 1FFB 496B 36C7 3695 3631 390B 06E6"            /* ‘u.ûIk6Ç6•619..æ */
+	$"EB0D 3BA7 F1BE A2FF 6D3A 9FB6 FCFD ADEF"            /* ë.;§ñ¾¢ÿm:Ÿ¶üý­ï */
+	$"EDBA 3FDB 632F EDB1 BF6D BE7E DB9F 97ED"            /* íº?Ûc/í±¿m¾~ÛŸ—í */
+	$"45FD AB93 F6E8 7FED A7F7 DAC3 FC34 6F43"            /* Eý«“öè.í§÷ÚÃü4oC */
+	$"E1DB 5507 762F DB7E 5F51 DDF5 1DFE DD07"            /* áÛU.v/Û~_QÝõ.þÝ. */
+	$"E1FD A67F B4E6 7EDB 8BF6 AE3F B6BC D3E4"            /* áý¦.´æ~Û‹ö®?¶¼Óä */
+	$"D00B 0F87 A0FF 2AC3 3F6D 84F8 7475 99F2"            /* Ð..‡ ÿ*Ã?m„øtu™ò */
+	$"F382 BE95 100F 8FEE C1C8 D086 E345 E973"            /* 󂾕..�îÁÈІãEés */
+	$"0FE4 06B6 7813 7115 B8D0 D91B C698 D10D"            /* .ä.¶x.q.¸ÐÙ.ƘÑ. */
+	$"A370 844F 9330 E047 0201 F880 D146 6522"            /* £p„O“0àG..ø€ÑFe" */
+	$"8E52 12DE 3D1A 9231 5315 682E 4706 8685"            /* ŽR.Þ=.’1S.h.G.†… */
+	$"DA39 C538 9828 7ED0 714F 3E27 532A 3840"            /* Ú9Å8˜(~ÐqO>'S*8@ */
+	$"C912 3E46 8205 3243 7835 7284 12D6 CCF5"            /* É.>F‚.2Cx5r„.ÖÌõ */
+	$"36AF 0975 8A27 4F44 3857 B5A3 160D 1391"            /* 6¯ÆuŠ'OD8Wµ£...‘ */
+	$"8005 2453 86CB 51B3 E493 EA9C 707F 7047"            /* €.$S†ËQ³ä“êœp.pG */
+	$"1DA8 1386 91D1 6105 7D84 1563 FC52 D5D3"            /* .¨.†‘Ña.}„.cüRÕÓ */
+	$"EDA7 D4A0 4AC1 BB4E 49D6 62F4 CA92 CE8E"            /* í§Ô JÁ»NIÖbôÊ’ÎŽ */
+	$"8DE0 84DC 418D ACE2 71AD 9206 3C98 3281"            /* �à„ÜA�¬âq­’.<˜2� */
+	$"104E A1F2 8982 6ED6 223E B67B BE6A C51F"            /* .N¡ò‰‚nÖ">¶{¾jÅ. */
+	$"4BF8 6C35 B6A4 5EC8 87BB 4834 7CF3 16AC"            /* Køl5¶¤^ȇ»H4|ó.¬ */
+	$"2453 B3DA 3503 94D6 2E70 2B6F 975E 21DB"            /* $S³Ú5.”Ö.p+o—^!Û */
+	$"F409 0368 9A2E DFB2 7A4B 9A6F 4165 1173"            /* ôÆ.hš.ß²zKšoAe.s */
+	$"A53E 329A 7925 FB80 9664 2C09 A9E5 715C"            /* ¥>2šy%û€–d,Æ©åq\ */
+	$"E42F 8E14 EC68 05A8 D565 53C2 9C98 86A2"            /* ä/Ž.ìh.¨ÕeSÂœ˜†¢ */
+	$"2C2D 6443 A1D0 A619 2320 6CD3 FE48 8006"            /* ,-dC¡Ð¦.# lÓþH€. */
+	$"FC0F 3690 DF76 1FD8 2E16 0705 D91F EEBE"            /* ü.6�ßv.Ø....Ù.î¾ */
+	$"E961 32B9 E252 4F0E EE4A 6F73 AEBB 014A"            /* éa2¹âRO.îJos®».J */
+	$"8F45 1551 9123 7C3A 13F8 1B57 EB6A 0AFB"            /* �E.Q‘#|:.ø.WëjÂû */
+	$"9AE9 65F5 9FDE 5F1C 7C23 84F1 6DCD CC52"            /* šéeõŸÞ_.|#„ñmÍÌR */
+	$"97DD 03E6 C571 0C23 F06B 9F21 2E2C 79D5"            /* —Ý.æÅq.#ðkŸ!.,yÕ */
+	$"1827 1436 E6FB C5FB BA11 617B 9B32 3DCD"            /* .'.6æûÅûº.a{›2=Í */
+	$"B0AD AA8F 53D0 2F20 849C D667 9436 A677"            /* °­ª�SÐ/ „œÖg”6¦w */
+	$"38C9 1B5A 26E2 B4D4 29BB 2D9E 56D4 652D"            /* 8É.Z&â´Ô)»-žVÔe- */
+	$"9A12 FC7E FBD5 0075 3EC9 64FE D0CE 06A2"            /* š.ü~ûÕ.u>ÉdþÐÎ.¢ */
+	$"B63F 8731 DB8A 6917 26EA CCFC C1E6 10AA"            /* ¶?‡1ÛŠi.&êÌüÁæ.ª */
+	$"704E 20EA 7518 0416 6BBE 2867 9470 9FE6"            /* pN êu...k¾(g”pŸæ */
+	$"3D2A D178 6CD1 0B7D E518 4682 FC48 EA03"            /* =*ÑxlÑ.}å.F‚üHê. */
+	$"EFA0 ADEE B643 CDFD 796D C309 E13B 9DD3"            /* ï ­î¶CÍýymÃÆá;�Ó */
+	$"82CC 1237 8D6B 9CB9 0438 AF1A 6190 136E"            /* ‚Ì.7�kœ¹.8¯.a�.n */
+	$"A170 6109 4BA8 FD0B 4C10 DE61 71A9 A5FF"            /* ¡paÆK¨ý.L.Þaq©¥ÿ */
+	$"5AD1 3895 15D0 912A BC62 5344 A7FD 7B9B"            /* ZÑ8•.Б*¼bSD§ý{› */
+	$"0360 8C71 DD04 20C7 4685 E6B7 7941 7BD7"            /* .`ŒqÝ. ÇF…æ·yA{× */
+	$"DBBB 3F61 742B D692 AD3D B778 6442 3DD1"            /* Û»?at+Ö’­=·xdB=Ñ */
+	$"A97E 1312 9AF4 05C1 7B33 9FE2 B3F5 D16C"            /* ©~..šô.Á{3Ÿâ³õÑl */
+	$"875D 7109 13EC BB96 0664 DF60 1958 8DE5"            /* ‡]qÆ.ì»–.dß`.X�å */
+	$"5B3F 3E75 9D21 0415 CE9C 3172 87C7 FF05"            /* [?>u�!..Îœ1r‡Çÿ. */
+	$"F787 4F14 E63B 4DCE 247D B3A3 475C 5336"            /* ÷‡O.æ;MÎ$}³£G\S6 */
+	$"C794 AF23 6415 68C6 B893 1B16 8C81 3F43"            /* Ç”¯#d.hƸ“..Œ�?C */
+	$"C455 6EB8 8D5A 6919 4C3A D980 BFB1 3699"            /* ÄUn¸�Zi.L:Ù€¿±6™ */
+	$"C790 C7D1 7B05 12AA 803A 172B DEF2 00CC"            /* Ç�ÇÑ{..ª€:.+Þò.Ì */
+	$"FF38 62C8 1815 1D3A F60D 2B9B 87A0 05C5"            /* ÿ8bÈ...:ö.+›‡ .Å */
+	$"3587 0181 8754 06D7 2CFC 78B8 0C65 D5BC"            /* 5‡.�‡T.×,üx¸.eÕ¼ */
+	$"2903 C07C 0631 A0B9 E94E 192F DE4B 4924"            /* ).À|.1 ¹éN./ÞKI$ */
+	$"A4F0 BB9A 49C5 B751 38EB 7289 9806 FC5C"            /* ¤ð»šIÅ·Q8ër‰˜.ü\ */
+	$"D822 ED93 CA92 14B6 5056 017F 7826 CDE1"            /* Ø"í“Ê’.¶PV..x&Íá */
+	$"8401 9F6C A7F7 4AD5 E86F FDC3 05AF 6AE3"            /* „.Ÿl§÷JÕèoýÃ.¯jã */
+	$"5EED 07E3 E5ED 7EE7 FB97 0B99 E191 605B"            /* ^í.ãåí~çû—.™á‘`[ */
+	$"955A 6A3C 33C6 2BB8 9562 0E38 09C1 1ED9"            /* •Zj<3Æ+¸•b.8ÆÁ.Ù */
+	$"8914 73AF E9AA 7B2F 214E 7EEA 98E8 B976"            /* ‰.s¯éª{/!N~ê˜è¹v */
+	$"E058 E0B5 6DB4 5B1C F212 2C8E 0AE5 7100"            /* àXàµm´[.ò.,ŽÂåq. */
+	$"BC1E 84CD 0598 7CF9 EA4E 1E96 2B4A DE9E"            /* ¼.„Í.˜|ùêN.–+JÞž */
+	$"6CE9 E79B 0336 9059 E109 DF83 A2AE 9E74"            /* léç›.6�YáÆ߃¢®žt */
+	$"5BB1 0236 590C 66CD 0658 ECE5 50A2 EDDD"            /* [±.6Y.fÍ.XìåP¢íÝ */
+	$"D7BB DAF7 548B 7F21 2A40 7821 FDA2 62B6"            /* ×»Ú÷T‹.!*@x!ý¢b¶ */
+	$"C862 B0B2 96CF 27D5 EC9D F5C8 42D8 F42A"            /* Èb°²–Ï'Õì�õÈBØô* */
+	$"5962 F21A D191 6744 1AE2 64B4 6744 A1B2"            /* Ybò.Ñ‘gD.âd´gD¡² */
+	$"7625 FF0D F0CF A1F8 3273 C4B8 FCCE C2BC"            /* v%ÿ.ðÏ¡ø2sĸüμ */
+	$"EDD5 F0C6 765F 2446 5EF5 2195 04EE C94B"            /* íÕðÆv_$F^õ!•.îÉK */
+	$"C9C2 4F82 0D0F 6034 3560 64A8 C372 4E17"            /* ÉÂO‚..`45`d¨ÃrN. */
+	$"D4F6 B2DC 2162 A6DC 9B35 5F36 628E EA58"            /* Ôö²Ü!b¦Ü›5_6bŽêX */
+	$"B2EF D0B8 79FF 3F60 39DC 34C9 8DD1 C7DA"            /* ²ïиyÿ?`9Ü4É�ÑÇÚ */
+	$"BFFD 9220 B977 42CD 1F4E 00C7 1A7B F29F"            /* ¿ý’ ¹wBÍ.N.Ç.{òŸ */
+	$"9738 8D5E 3E5F BA1F D4BD 0592 2006 1216"            /* —8�^>_º.Ô½.’ ... */
+	$"D478 DE72 171A A49D 9C4A 0691 CD59 6FB3"            /* ÔxÞr..¤�œJ.‘ÍYo³ */
+	$"F3C5 B3CD DCC8 5794 133C 85B3 176A 0C6A"            /* óųÍÜÈW”.<…³.j.j */
+	$"323E C74F 7CE3 4042 38AB E9CA 5700 E39B"            /* 2>ÇO|ã@B8«éÊW.ã› */
+	$"26D3 62B7 59F8 966D A789 35AA C72D 9943"            /* &Ób·Yø–m§‰5ªÇ-™C */
+	$"C884 2E53 30B3 D351 EFCC 6BF8 9889 8AB6"            /* È„.S0³ÓQïÌkø˜‰Š¶ */
+	$"E284 F5A4 64BD F89F 98A4 8082 6292 48EB"            /* â„õ¤d½øŸ˜¤€‚b’Hë */
+	$"2039 4A80 D5D7 BEFC 2DC1 69A9 F484 9B4E"            /*  9J€Õ×¾ü-Ái©ô„›N */
+	$"94C9 6E87 31A6 6D4E 23DB 77A9 37D5 CEE9"            /* ”Én‡1¦mN#Ûw©7ÕÎé */
+	$"10B5 22DB 58B2 3DFB 973A E321 F02A 2985"            /* .µ"ÛX²=û—:ã!ð*)… */
+	$"AE7E F964 9A23 4B8D 90FD 75F4 9944 3CEB"            /* ®~ùdš#K��ýuô™D<ë */
+	$"C5C5 B0BA DA1C AA0A B59A EFCA 903A 972B"            /* ÅÅ°ºÚ.ªÂµšïÊ�:—+ */
+	$"10E9 2A66 2BAB 3E63 8312 E494 A82C AEE8"            /* .é*f+«>cƒ.䔨,®è */
+	$"DE3B 902F 4DE5 A934 7FA5 59D8 B355 75C7"            /* Þ;�/Må©4.¥YسUuÇ */
+	$"DC51 6208 6D60 DE89 F04A F698 FC35 5341"            /* ÜQb.m`Þ‰ðJö˜ü5SA */
+	$"A8C7 894B 5E8F 0638 0F21 36AB 23FF 37BF"            /* ¨Ç‰K^�.8.!6«#ÿ7¿ */
+	$"CA6E C0CE 1C93 9BB1 FEA7 49E8 9BA5 7F32"            /* ÊnÀÎ.“›±þ§I蛥.2 */
+	$"4C9D C8BA 821C 1E07 F277 BE63 241C D5F6"            /* L�Ⱥ‚...òw¾c$.Õö */
+	$"07CB 7A98 E51E B0FC B312 223C 21BF 5DEE"            /* .Ëz˜å.°ü³."<!¿]î */
+	$"0229 A0EE 8B90 5918 5910 F6A6 EEB6 503D"            /* .) î‹�Y.Y.ö¦î¶P= */
+	$"8E76 A3B6 E583 FEFF 5B3D F804 F6EE 956E"            /* Žv£¶åƒþÿ[=ø.öî•n */
+	$"FEE7 D95F 9D05 AE0B 4926 52B4 23C3 D17A"            /* þçÙ_�.®.I&R´#ÃÑz */
+	$"FC0F CC41 1264 0956 8CA2 6A30 C0D0 275F"            /* ü.ÌA.dÆVŒ¢j0ÀÐ'_ */
+	$"0CE8 C646 CC49 EF38 CC94 8B6C 1737 9636"            /* .èÆFÌIï8Ì”‹l.7–6 */
+	$"4EA7 0FE7 217B F3F1 A10D 7E49 242E 6F19"            /* N§.ç!{óñ¡.~I$.o. */
+	$"A8CF 369A 44DE 6C99 A9D4 24DA 6909 62C3"            /* ¨Ï6šDÞl™©Ô$ÚiÆbà */
+	$"0C4C D4CD D80E 72E6 FF6B A90E 7080 977B"            /* .LÔÍØ.ræÿk©.p€—{ */
+	$"4BEB 6A2A 72BB 0574 45FB 1E12 6408 C966"            /* Këj*r».tEû..d.Éf */
+	$"A632 9AC7 E67D 82C9 3FED 1E27 C1FA C47A"            /* ¦2šÇæ}‚É?í.'ÁúÄz */
+	$"AFCF 5719 3BCA 3975 BE3A 550B 6DC9 91CC"            /* ¯ÏW.;Ê9u¾:U.mÉ‘Ì */
+	$"F28E 751C 1B20 E7BB 58FF 0D92 2BF7 DE26"            /* òŽu.. ç»Xÿ.’+÷Þ& */
+	$"DFE3 B230 78F7 C64E ADF8 7741 F45A E3BC"            /* ßã²0x÷ÆN­øwAôZã¼ */
+	$"5185 1323 1C74 3288 F720 5DB7 B5C9 1EFD"            /* Q….#.t2ˆ÷ ]·µÉ.ý */
+	$"C844 7159 7047 A9BA 6CA1 403E CE2E 3522"            /* ÈDqYpG©ºl¡@>Î.5" */
+	$"1088 A628 490C 5F8D 64C4 7E17 CBD3 290D"            /* .ˆ¦(I._�dÄ~.ËÓ). */
+	$"91B1 B073 AD4A BF5B A1E9 6306 3E9A F87E"            /* ‘±°s­J¿[¡éc.>šø~ */
+	$"2DEC 7390 2CF5 3305 93C2 15DA 7FFF 7FC6"            /* -ìs�,õ3.“Â.Ú.ÿ.Æ */
+	$"0578 C93E BF93 5B69 25D4 E0F9 5726 0D7E"            /* .xÉ>¿“[i%ÔàùW&.~ */
+	$"9C06 C76B 1BF5 3206 F26C 4F57 6A13 7488"            /* œ.Çk.õ2.òlOWj.tˆ */
+	$"07F4 1787 316E 19B5 2CB4 D7B8 23EE BF15"            /* .ô.‡1n.µ,´×¸#î¿. */
+	$"84F7 C141 CE7E 358F F83B 081D 2680 C5CB"            /* „÷ÁAÎ~5�ø;..&€ÅË */
+	$"2002 0FFB D329 10E3 1880 E0F6 29FF 14F6"            /*  ..ûÓ).ã.€àö)ÿ.ö */
+	$"1447 24FF 4BDD 371B 00F3 0334 6FE5 D217"            /* .G$ÿKÝ7..ó.4oåÒ. */
+	$"8E7D 3CCB EC04 D019 0583 0792 D4F4 59E5"            /* Ž}<Ëì.Ð..ƒ.’ÔôYå */
+	$"0914 52FB CE7A 2EFD B899 ED16 38FB E1D4"            /* Æ.RûÎz.ý¸™í.8ûáÔ */
+	$"3312 BAAE 3EF3 45B7 2A77 62F3 4787 8900"            /* 3.º®>óE·*wbóG‡‰. */
+	$"050D 5A64 92D3 64E7 7950 4234 FCC0 0EC6"            /* ..Zd’ÓdçyPB4üÀ.Æ */
+	$"004C 8652 616B B5FF 87F6 72D0 400B 9574"            /* .L†Rakµÿ‡örÐ@.•t */
+	$"7ADD 2EE6 F979 EE70 393F 5E65 09EC 561B"            /* zÝ.æùyîp9?^eÆìV. */
+	$"2FF4 F6FA 9226 2AA7 C2D2 4517 2258 15C7"            /* /ôöú’&*§ÂÒE."X.Ç */
+	$"D27E DE80 0000 0009 BB69 0154 3C66 FD24"            /* Ò~Þ€...Æ»i.T<fý$ */
+	$"D6C1 DFFC 41CF 26FD 27E3 9482 7299 C4A3"            /* ÖÁßüAÏ&ý'㔂r™Ä£ */
+	$"A4B0 4F99 5ED7 6507 C196 C060 D7BD 7BA6"            /* ¤°O™^×e.Á–À`×½{¦ */
+	$"A0A2 C1E7 0ECE 98C4 36F0 B006 0526 5FC4"            /*  ¢Áç.ΘÄ6ð°..&_Ä */
+	$"CDEF A25D CE59 7B6F 507F C409 957F 43E6"            /* Íï¢]ÎY{oP.ÄÆ•.Cæ */
+	$"20AB C4BE 33C2 E794 46B7 5341 D8C9 5487"            /*  «Ä¾3Âç”F·SAØÉT‡ */
+	$"3000 A3E6 41BE 7D2A B553 6A8D C345 2E1E"            /* 0.£æA¾}*µSj�ÃE.. */
+	$"BF55 F536 52DD 101F D6C9 BB65 B7E4 0CFC"            /* ¿Uõ6RÝ..ÖÉ»e·ä.ü */
+	$"03D7 F641 F641 7A4F 8EE2 BA7A 352C ED91"            /* .×öAöAzOŽâºz5,í‘ */
+	$"9057 F893 C46F 62F7 A791 A8DE 8A25 BB17"            /* �Wø“Äob÷§‘¨ÞŠ%». */
+	$"F164 F2ED 43E5 A2E2 17E9 C95D DE1C 45F4"            /* ñdòíCå¢â.éÉ]Þ.Eô */
+	$"3019 8090 809D D124 EE5C B48E 6C92 2A74"            /* 0.€�€�Ñ$î\´Žl’*t */
+	$"ACA0 4F0A 1777 70CF EBEC 112A 9035 16AB"            /* ¬ OÂ.wpÏëì.*�5.« */
+	$"B36D 13D6 9F72 69CD E213 F146 6733 BAA3"            /* ³m.ÖŸriÍâ.ñFg3º£ */
+	$"0080 0000 0000 0000 0001 0151 0AD3 43F0"            /* .€.........QÂÓCð */
+	$"14A4 0000 61F0 20D9 9F3A 47FC 60A2 4780"            /* .¤..að ÙŸ:Gü`¢G€ */
+	$"F2D0 2A57 2C4C D349 5B9A 1BE3 0D39 80AD"            /* òÐ*W,LÓI[š.ã.9€­ */
+	$"72C4 873D 5028 F09E F0F5 700F B776 4B38"            /* rć=P(ðžðõp.·vK8 */
+	$"4FC6 7D26 AE5D 219E DDCE 4AA3 9AA9 FE19"            /* OÆ}&®]!žÝÎJ£š©þ. */
+	$"EC25 FEF0 0626 D259 8ECF 0364 6192 A000"            /* ì%þð.&ÒYŽÏ.da’ . */
+	$"0000 0000 0000 0000 0184 84B4 4FF0 1848"            /* .........„„´Oð.H */
+	$"4BC2 3700 0000 0000 0000 00B5 DA5E 3FF1"            /* KÂ7........µÚ^?ñ */
+	$"C9FC 9186 4A80 0000 0000 0000 0000 0000"            /* Éü‘†J€.......... */
+	$"0510 0FC3 251B 71C0 D918 64A8 0000 0000"            /* ...Ã%.qÀÙ.d¨.... */
+	$"0000 0000 0000 07E1 1EE1 F164 E11A 319D"            /* .......á.áñdá.1� */
+	$"3806 659F 8C35 7012 B17E 6096 52F0 8E96"            /* 8.eŸŒ5p.±~`–RðŽ– */
+	$"1438 1EBF 363A 49C9 51BD 3517 4ADA 7060"            /* .8.¿6:IÉQ½5.JÚp` */
+	$"0849 8F8B FCEC FD48 0000 54DF 4C0B E043"            /* .I�‹üìýH..TßL.àC */
+	$"F3B6 1CEB 518A F2B1 5A9C 9500 0000 0000"            /* ó¶.ëQŠò±Zœ•..... */
+	$"0196 C058 0636 AF4B 041F 37EC DE6F 4B4E"            /* .–ÀX.6¯K..7ìÞoKN */
+	$"291D A2A6 3CB8 9BAC 4B0C 5017 9031 0EF1"            /* ).¢¦<¸›¬K.P.�1.ñ */
+	$"3CF7 F63B 73A1 B4A6 9EA7 0513 C571 8EA8"            /* <÷ö;s¡´¦ž§..ÅqŽ¨ */
+	$"5D0A 28FC DCB6 D27A 0000 0000 0159 D076"            /* ]Â(üܶÒz.....YÐv */
+	$"3D1E 84A9 1C76 876E 7B6B 8519 1F9F 01C6"            /* =.„©.v‡n{k…..Ÿ.Æ */
+	$"1A11 B2A2 4841 4D47 5463 5D18 2AFE 54F5"            /* ..²¢HAMGTc].*þTõ */
+	$"591E 5FF1 39C7 C0CD 0D20 F366 59DE FE22"            /* Y._ñ9ÇÀÍ. ófYÞþ" */
+	$"B12C 4608 009D F105 49C8 16B5 417A 6079"            /* ±,F..�ñ.IÈ.µAz`y */
+	$"40B0 7E7A C4B3 83B8 485D 42B1 4000 0000"            /* @°~zijƒ¸H]B±@... */
+	$"0E9F 0340 5469 49BB 5767 B4BE 47AF 19B3"            /* .Ÿ.@TiI»Wg´¾G¯.³ */
+	$"4E69 B99F 25DF C3C0 1B9C 5455 41D2 F508"            /* Ni¹Ÿ%ßÃÀ.œTUAÒõ. */
+	$"9900 1F13 B43E C345 C4B3 C066 8A27 C3D3"            /* ™...´>ÃEijÀfŠ'ÃÓ */
+	$"7A8A 6368 2F2C 3F2F 5D43 59ED 5E40 9E4F"            /* zŠch/,?/]CYí^@žO */
+	$"59BB 6A03 B7F8 083A 021D F8F0 79AF 43B0"            /* Y»j.·ø.:..øðy¯C° */
+	$"2270 F775 B8D8 FB59 371A 8B22 9F0B 55FA"            /* "p÷u¸ØûY7.‹"Ÿ.Uú */
+	$"C9B1 5565 0914 AA67 2D9E 81B2 60FC 1333"            /* ɱUeÆ.ªg-ž�²`ü.3 */
+	$"318F 21E9 97E4 1400 F69E F709 7AE3 82A5"            /* 1�!é—ä..öž÷Æzã‚¥ */
+	$"C9DE 7D16 1DF8 EDF8 FC5E DB3E FC2A F822"            /* ÉÞ}..øíøü^Û>ü*ø" */
+	$"886E F247 9BC1 250E 905C 4AF7 4B22 3595"            /* ˆnòG›Á%.�\J÷K"5• */
+	$"0835 2567 EEC1 C4C8 B70D D782 6A22 C9DA"            /* .5%gîÁÄÈ·.ׂj"ÉÚ */
+	$"ADA3 0370 EED9 E428 E163 963A E6F0 5D4A"            /* ­£.pîÙä(ác–:æð]J */
+	$"F42A D11F B46D 7FBC 2D87 4274 4756 896E"            /* ô*Ñ.´m.¼-‡BtGV‰n */
+	$"C489 80C0 62F6 88A8 184A 79BE 3068 A9AF"            /* ĉ€Àböˆ¨.Jy¾0h©¯ */
+	$"D703 390B 1A76 3136 B799 726A AAA8 C23D"            /* ×.9..v16·™rjª¨Â= */
+	$"EEB0 E0F1 49E1 A6B7 204F 7BF3 6E44 F25E"            /* î°àñIᦷ O{ónDò^ */
+	$"7E0A 5125 CA89 B477 15CD 83CC CD21 C6BE"            /* ~ÂQ%ʉ´w.̓ÌÍ!ƾ */
+	$"F20B 99F3 C30C 5113 2E0A FF7E 1034 1BFF"            /* ò.™óÃ.Q..Âÿ~.4.ÿ */
+	$"0378 72CF B0EE D132 2A2D 14A9 E37F 6B10"            /* .xrÏ°îÑ2*-.©ã.k. */
+	$"B5CE 0500 0000 0000 0000 0160 A7E3 A715"            /* µÎ.........`§ã§. */
+	$"0C13 DE44 025B 9720 0000 0000 0000 0001"            /* ..ÞD.[— ........ */
+	$"E0F5 5A21 77FB C1F6 EAF0 244A EE78 B6FA"            /* àõZ!wûÁöêð$Jîx¶ú */
+	$"1769 3D98 AA28 2EB6 9826 A16B D6B8 BA89"            /* .i=˜ª(.¶˜&¡kÖ¸º‰ */
+	$"26C6 25C9 9E66 FD9C 6D2D FCDA FCB9 6AB2"            /* &Æ%Éžfýœm-üÚü¹j² */
+	$"B42A 7008 5069 CB61 D530 B47A FCFF 7F95"            /* ´*p.PiËaÕ0´züÿ.• */
+	$"FA58 2D11 111A 53BF FB17 59E1 63E7 0FAD"            /* úX-...S¿û.Yácç.­ */
+	$"B016 A862 3107 8DF0 7112 DD6A B6E3 2477"            /* °.¨b1.�ðq.Ýj¶ã$w */
+	$"3162 94F0 6826 75B0 D0B8 4C13 21C7 E4BC"            /* 1b”ðh&u°Ð¸L.!Çä¼ */
+	$"FB86 7A83 DF1C A4D9 C3B4 E3DE C334 1633"            /* û†zƒß.¤ÙôãÞÃ4.3 */
+	$"DC27 76B9 7ADF 50CA F95E C7C9 D5EB 402C"            /* Ü'v¹zßPÊù^ÇÉÕë@, */
+	$"276F A0B0 D88B CF4A 0FD2 380A E3E7 2BA5"            /* 'o °Ø‹ÏJ.Ò8Âãç+¥ */
+	$"DD24 A247 B631 75B1 6D3A 4C60 9BAB E4C5"            /* Ý$¢G¶1u±m:L`›«äÅ */
+	$"BBCB 2972 36B9 AC74 5FF5 B5DB 231B 95F3"            /* »Ë)r6¹¬t_õµÛ#.•ó */
+	$"7CFF 8E5F 86E9 1906 B3DF 75C7 0364 6192"            /* |ÿŽ_†é..³ßuÇ.da’ */
+	$"A000 0000 0000 0000 0000 003B B1A0 0000"            /*  ..........;± .. */
+	$"0000 0000 0000 0000 0000 0016 D51B CEEA"            /* ............Õ.Îê */
+	$"0406 C003 4E50 C0B8 8DB2 F37C FF8E 5F86"            /* ..À.NPÀ¸�²ó|ÿŽ_† */
+	$"E919 06B3 DF75 C703 6461 92A0 0000 0000"            /* é..³ßuÇ.da’ .... */
+	$"0000 0000 0000 3BB1 A000 0000 0000 0000"            /* ......;± ....... */
+	$"0000 0000 0000 16D5 1BCE EA04 06C0 034E"            /* .......Õ.Îê..À.N */
+	$"50C0 B88D B2F4 4BED 0C57 2F64 38E7 DFE6"            /* PÀ¸�²ôKí.W/d8çßæ */
+	$"95DB 93EF B9ED 1250 6A6A A6E3 4478 1E7E"            /* •Û“ï¹í.Pjj¦ãDx.~ */
+	$"F105 8E1B 961B 230C 9500 0000 0000 0C18"            /* ñ.Ž.–.#.•....... */
+	$"0EA3 5F13 6306 E1B5 4B22 3D26 79A1 06E4"            /* .£_.c.áµK"=&y¡.ä */
+	$"228F F320 0B74 8820 0000 0000 0000 0007"            /* "�ó .tˆ ........ */
+	$"9F62 443B 9A51 EAB0 7C1A A374 E7F1 52F3"            /* ŸbD;šQê°|.£tçñRó */
+	$"3BB8 C1E0 5919 6C04 A2E2 1032 6917 1394"            /* ;¸ÁàY.l.¢â.2i..” */
+	$"CCBE 472A 0652 C144 6D1E 755C ECF9 9725"            /* ̾G*.RÁDm.u\ìù—% */
+	$"A84A 55AE 7A0E 6730 FCA7 B6E0 FF31 08C0"            /* ¨JU®z.g0ü§¶àÿ1.À */
+	$"3E76 4DDC 9E24 A60B C4A7 4CDD C221 1941"            /* >vMÜž$¦.ħLÝÂ!.A */
+	$"0810 2DE3 206F C551 4910 77AA 762A 1FF2"            /* ..-ã oÅQI.wªv*.ò */
+	$"D39A 0ADC 1089 90F8 D098 1E77 BDD1 AF74"            /* ÓšÂÜ.‰�øИ.w½Ñ¯t */
+	$"4DEF D00D 0B2C CA2F 9EDC 27C4 35F9 F924"            /* MïÐ..,Ê/žÜ'Ä5ùù$ */
+	$"67FF 74E5 A746 B627 6267 F6D0 9B94 22D4"            /* gÿtå§F¶'bgöЛ”"Ô */
+	$"5FFE DF67 A7A9 E3CA 02A5 44D1 E926 DCA4"            /* _þßg§©ãÊ.¥DÑé&ܤ */
+	$"7490 4AB8 E094 7037 FF7C 8CF7 2A9B B784"            /* t�J¸à”p7ÿ|Œ÷*›·„ */
+	$"794E 9026 D48F FF7F F013 AABF F874 63DA"            /* yN�&Ô�ÿ.ð.ª¿øtcÚ */
+	$"0302 FBFA AA6A 31D5 E2DF 85F7 2ACD D98C"            /* ..ûúªj1Õâß…÷*ÍÙŒ */
+	$"175D 1243 F1C0 CEA2 344C B6FC ADCF C6AA"            /* .].CñÀ΢4L¶ü­Ïƪ */
+	$"5CAE FA82 783F 58DD 754D 5C63 A018 19F8"            /* \®ú‚x?XÝuM\c ..ø */
+	$"7EFE 8953 AE16 22B9 4ED7 43D2 8A0B FA52"            /* ~þ‰S®."¹N×CÒŠ.úR */
+	$"5703 08CA 555B E51E 307B 0565 E165 22F3"            /* W..ÊU[å.0{.eáe"ó */
+	$"7130 0CEC CA23 576D 8D58 BED1 FEB6 9A2F"            /* q0.ìÊ#Wm�X¾Ñþ¶š/ */
+	$"DCEA 3288 3EEC B12A D43C B191 2627 7723"            /* Üê2ˆ>ì±*Ô<±‘&'w# */
+	$"F40F 1B7A F1E3 9A7E 366D 7490 EE80 3570"            /* ô..zñãš~6mt�î€5p */
+	$"CB59 D05D F384 AA96 71FE 68E8 4D32 F9D2"            /* ËYÐ]󄪖qþhèM2ùÒ */
+	$"48BC 7B03 EA3B 879E 2E96 671F 8098 CE76"            /* H¼{.ê;‡ž.–g.€˜Îv */
+	$"87D8 0336 5C88 91F4 3C69 D76B 4DEF 29DA"            /* ‡Ø.6\ˆ‘ô<i×kMï)Ú */
+	$"F378 1035 720A CE61 C2E3 5776 CA53 F43B"            /* óx.5rÂÎaÂãWvÊSô; */
+	$"4FCB 79E4 5164 1270 A23E 6048 2089 7B12"            /* OËyäQd.p¢>`H ‰{. */
+	$"BCA8 E157 DFD5 E879 C14C 1B1A 3431 2856"            /* ¼¨áWßÕèyÁL..41(V */
+	$"0E74 D87F 7691 A923 632A 5EBC 6E95 6A46"            /* .tØ.v‘©#c*^¼n•jF */
+	$"8E68 7118 3704 6E41 37CB C9AC 7F84 1005"            /* Žhq.7.nA7Ëɬ.„.. */
+	$"C308 7C90 C6E0 B56C 8CF8 3C33 A97E C46C"            /* Ã.|�ÆàµlŒø<3©~Äl */
+	$"E373 91A9 4A3F 7331 481D 843F 0472 59DC"            /* ãs‘©J?s1H.„?.rYÜ */
+	$"0837 85BA 4867 C202 6BFC 7433 F093 530F"            /* .7…ºHgÂ.küt3ð“S. */
+	$"D721 8927 26CF AA6B B4E1 7981 FCE4 9F4E"            /* ×!‰'&Ϫk´áy�üäŸN */
+	$"1105 9E7B 7F68 1CE7 D811 E270 FCA3 9CDE"            /* ..ž{.h.çØ.âpü£œÞ */
+	$"BFE6 48BA AC07 B55E 4E7F 5946 115B B1DC"            /* ¿æHº¬.µ^N.YF.[±Ü */
+	$"F694 3A9B EADD 7971 E0F1 B6E1 C6FF 4337"            /* ö”:›êÝyqàñ¶áÆÿC7 */
+	$"F543 A074 FC74 AD1F 45BF 7867 C472 7605"            /* õC tüt­.E¿xgÄrv. */
+	$"1786 E496 2D22 22BE 5760 9ACE A5C9 22B9"            /* .†ä–-""¾W`šÎ¥É"¹ */
+	$"9A14 4136 93E4 3E4A 715C 6F69 8447 5764"            /* š.A6“ä>Jq\oi„GWd */
+	$"D761 77A8 2C3F E200 ACAD 8331 11D0 ABE6"            /* ×aw¨,?â.¬­ƒ1.Ыæ */
+	$"EA7B 5A22 58CF 097E 732F 894B E99C 6BAF"            /* ê{Z"XÏÆ~s/‰Kéœk¯ */
+	$"B36C 68AA 5668 EF92 66E9 DDF9 FF78 DB89"            /* ³lhªVhï’féÝùÿxÛ‰ */
+	$"FC78 2032 99D9 62F0 1380 3FE8 41DF F341"            /* üx 2™Ùbð.€?èAßóA */
+	$"F1FD 7F08 CE2E F09A 9335 6735 0FAD 8093"            /* ñý..Î.ðš“5g5.­€“ */
+	$"B6B1 53A2 964F EA7E 72A2 9A29 794D 98F0"            /* ¶±S¢–Oê~r¢š)yM˜ð */
+	$"DD57 AE65 C61E DDEC BDB4 35C2 D050 E063"            /* ÝW®eÆ.Ýì½´5ÂÐPàc */
+	$"5F54 BCA5 928D 786D CAE3 8F96 BFEB 027E"            /* _T¼¥’�xmÊã�–¿ë.~ */
+	$"6BBC 8795 7C88 1A2C 9908 36A1 6CAB 9268"            /* k¼‡•|ˆ.,™.6¡l«’h */
+	$"EB0D 816F F34D 55F5 B562 BCFF 4190 EE42"            /* ë.�oóMUõµb¼ÿA�îB */
+	$"F195 E7F3 E220 7E51 74A2 FA23 23F7 20F0"            /* ñ•çóâ ~Qt¢ú##÷ ð */
+	$"985F 011C 34B8 C988 C519 C623 81BC D026"            /* ˜_..4¸ÉˆÅ.Æ#�¼Ð& */
+	$"A8C5 B82C 7A7F 86F7 E60E 44F2 CD53 6FAB"            /* ¨Å¸,z.†÷æ.DòÍSo« */
+	$"2D69 1FD4 75B7 A011 80E7 09B3 B9CF 4503"            /* -i.Ôu· .€çƳ¹ÏE. */
+	$"F4A5 1DE3 AE8A 96F7 E245 0DF9 3859 24FA"            /* ô¥.㮊–÷âE.ù8Y$ú */
+	$"7B43 665F B15E D4D3 FB2A 666E FB6A 6CA8"            /* {Cf_±^ÔÓû*fnûjl¨ */
+	$"9CAF C052 D658 6DC3 BDD1 C752 21FA 6426"            /* œ¯ÀRÖXmýÑÇR!úd& */
+	$"857C D05D 41C2 0241 306C 6FD4 81E3 69F7"            /* …|Ð]AÂ.A0loÔ�ãi÷ */
+	$"A6F5 227F 39F9 780E 829A 17A9 C649 2BF5"            /* ¦õ".9ùx.‚š.©ÆI+õ */
+	$"01DD E500 A973 E599 890C A548 CE34 2877"            /* .Ýå.©s噉.¥HÎ4(w */
+	$"D160 A2EE 4B3B CC7A 0C87 6723 51FD C222"            /* Ñ`¢îK;Ìz.‡g#QýÂ" */
+	$"9BFB E72D 2769 6250 2054 22C9 ABB2 3125"            /* ›ûç-'ibP T"É«²1% */
+	$"7DA0 73A3 C083 1AAD 90F2 F0A8 C22D 9DF5"            /* } s£Àƒ.­�òð¨Â-�õ */
+	$"3FFB 6B56 18BE 61A6 B198 F1BC 1E4E 0CFE"            /* ?ûkV.¾a¦±˜ñ¼.N.þ */
+	$"B323 8275 A644 CAC4 D36B 9AF9 FCC8 5DEC"            /* ³#‚u¦DÊÄÓkšùüÈ]ì */
+	$"292B CC9B A0B6 9148 09DF E46D 1B2C 4EDF"            /* )+Ì› ¶‘HÆßäm.,Nß */
+	$"EDB9 2DB4 BAD5 C50B 2115 C476 E09A F407"            /* í¹-´ºÕÅ.!.Ävàšô. */
+	$"5EE8 2E9F 870F A319 32D4 EBEC CB7B FDE9"            /* ^è.Ÿ‡.£.2ÔëìË{ýé */
+	$"FB5C 0D41 61F3 BA97 0F9E 558F 6E39 C213"            /* û\.Aaóº—.žU�n9Â. */
+	$"3101 A5E8 ECEC 15E5 4F29 F69A 58CD D82D"            /* 1.¥èìì.åO)öšXÍØ- */
+	$"986E E8E0 6898 17CC 98C4 C851 AC75 9306"            /* ˜nèàh˜.̘ÄÈQ¬u“. */
+	$"5241 0350 E2EB 38CA 1682 6132 FF45 578A"            /* RA.Pâë8Ê.‚a2ÿEWŠ */
+	$"FA7F 7557 AC2C 9A18 3835 A62B 7D09 0992"            /* ú.uW¬,š.85¦+}ÆÆ’ */
+	$"EF78 BD49 5317 373A B07D 6420 DC30 5067"            /* ïx½IS.7:°}d Ü0Pg */
+	$"A659 F316 4436 8E8E 9786 1163 A6A5 B841"            /* ¦Yó.D6ŽŽ—†.c¦¥¸A */
+	$"99AA 4E1C 6163 309A 3C23 0208 FF4B 2967"            /* ™ªN.ac0š<#..ÿK)g */
+	$"B7F7 37E4 A337 D0DC C48A A742 FB2D C529"            /* ·÷7ä£7ÐÜÄŠ§Bû-Å) */
+	$"BC6C 5BBE BC5C 03B1 F87F D7EA F5AC B94B"            /* ¼l[¾¼\.±ø.×êõ¬¹K */
+	$"5A88 84AB E44E BE6A F337 96B0 7CB6 1140"            /* Zˆ„«äN¾jó7–°|¶.@ */
+	$"25CB 45D6 BE02 A9D4 7868 1EDD F660 7963"            /* %ËEÖ¾.©Ôxh.Ýö`yc */
+	$"B438 C030 3EA5 51FA F451 FA84 A6FF 2E5A"            /* ´8À0>¥QúôQú„¦ÿ.Z */
+	$"EA95 2300 C0F4 39AA 42BA 4120 4EEC AFDD"            /* ê•#.Àô9ªBºA Nì¯Ý */
+	$"20B4 6C42 0552 1177 6F1A AC6D FE8B 98E1"            /*  ´lB.R.wo.¬mþ‹˜á */
+	$"D3FB F52E BCE3 5BB1 7235 F597 3E0D 8C46"            /* Óûõ.¼ã[±r5õ—>.ŒF */
+	$"7361 1E2A C081 CA97 C8EA CD3F E91D 823F"            /* sa.*À�Ê—ÈêÍ?é.‚? */
+	$"73A7 5EA1 F641 9CBD 219D D7E4 EE0D 270E"            /* s§^¡öAœ½!�×äî.'. */
+	$"14DF F756 B4E5 062C 8251 4AD0 B090 A0AF"            /* .ß÷V´å.,‚QJа� ¯ */
+	$"CD2A 3C80 6068 C9CD C3D7 3D7F 258B 365A"            /* Í*<€`hÉÍÃ×=.%‹6Z */
+	$"5E1A 90DC D058 4ED9 DF50 6F40 07A9 2BDE"            /* ^.�ÜÐXNÙßPo@.©+Þ */
+	$"8486 5404 AB9C E323 0C4E D3DB 8352 0C0F"            /* „†T.«œã#.NÓÛƒR.. */
+	$"CD59 A5F5 56CC 0BB2 B603 85C3 C709 7D6E"            /* ÍY¥õVÌ.²¶.…ÃÇÆ}n */
+	$"A10E 33C2 AE0F D52F 5AD7 2279 E6EB 7E6C"            /* ¡.3®.Õ/Z×"yæë~l */
+	$"1757 589D C6DC B4FD 470C FFD9"                      /* .WX�ÆÜ´ýG.ÿÙ */
+};
+
diff --git a/linden/indra/newview/installers/darwin/firstlook-dmg/_DS_Store b/linden/indra/newview/installers/darwin/firstlook-dmg/_DS_Store
new file mode 100644
index 0000000..6c5a3f3
Binary files /dev/null and b/linden/indra/newview/installers/darwin/firstlook-dmg/_DS_Store differ
diff --git a/linden/indra/newview/installers/darwin/firstlook-dmg/_VolumeIcon.icns b/linden/indra/newview/installers/darwin/firstlook-dmg/_VolumeIcon.icns
new file mode 100644
index 0000000..da5307e
Binary files /dev/null and b/linden/indra/newview/installers/darwin/firstlook-dmg/_VolumeIcon.icns differ
diff --git a/linden/indra/newview/installers/darwin/firstlook-dmg/background.jpg b/linden/indra/newview/installers/darwin/firstlook-dmg/background.jpg
new file mode 100644
index 0000000..55294dc
Binary files /dev/null and b/linden/indra/newview/installers/darwin/firstlook-dmg/background.jpg differ
diff --git a/linden/indra/newview/installers/darwin/mac_image_DS_Store b/linden/indra/newview/installers/darwin/mac_image_DS_Store
deleted file mode 100644
index ac44787..0000000
Binary files a/linden/indra/newview/installers/darwin/mac_image_DS_Store and /dev/null differ
diff --git a/linden/indra/newview/installers/darwin/mac_image_background.tga b/linden/indra/newview/installers/darwin/mac_image_background.tga
deleted file mode 100644
index 2539366..0000000
Binary files a/linden/indra/newview/installers/darwin/mac_image_background.tga and /dev/null differ
diff --git a/linden/indra/newview/installers/darwin/mac_image_hidden b/linden/indra/newview/installers/darwin/mac_image_hidden
deleted file mode 100644
index a39bde4..0000000
--- a/linden/indra/newview/installers/darwin/mac_image_hidden
+++ /dev/null
@@ -1 +0,0 @@
-background.tga
diff --git a/linden/indra/newview/installers/darwin/publicnightly-dmg/Applications-alias.r b/linden/indra/newview/installers/darwin/publicnightly-dmg/Applications-alias.r
new file mode 100644
index 0000000..aa3cfb8
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/publicnightly-dmg/Applications-alias.r
@@ -0,0 +1,6996 @@
+data 'alis' (0) {
+	$"0000 0000 0112 0002 0001 036D 6277 0000"            /* ...........mbw.. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 C135 A717 482B 0000 0000"            /* ......Á5§.H+.... */
+	$"0002 0C41 7070 6C69 6361 7469 6F6E 7300"            /* ...Applications. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 00E2 4F18 C2E8 9FB0 0000 0000 0000"            /* ...âO.Â蟰...... */
+	$"0000 FFFF FFFF 0000 0920 0000 0000 0000"            /* ..ÿÿÿÿ..Æ ...... */
+	$"0000 0000 0000 0000 0003 6D62 7700 0010"            /* ..........mbw... */
+	$"0008 0000 C136 0987 0000 0011 0008 0000"            /* ....Á6Ƈ........ */
+	$"C2E9 0220 0000 0001 0000 0002 0010 6D62"            /* Âé. ..........mb */
+	$"773A 4170 706C 6963 6174 696F 6E73 000E"            /* w:Applications.. */
+	$"001A 000C 0041 0070 0070 006C 0069 0063"            /* .....A.p.p.l.i.c */
+	$"0061 0074 0069 006F 006E 0073 000F 0008"            /* .a.t.i.o.n.s.... */
+	$"0003 006D 0062 0077 0012 000C 4170 706C"            /* ...m.b.w....Appl */
+	$"6963 6174 696F 6E73 0013 0001 2F00 FFFF"            /* ications..../.ÿÿ */
+	$"0000"                                               /* .. */
+};
+
+
+data 'icns' (-16455) {
+	$"6963 6E73 0001 B3AC 6973 3332 0000 0224"            /* icns..³¬is32...$ */
+	$"9F00 005F 8061 005D 8700 055D 9AA2 A0A4"            /* Ÿ.._€a.]‡..]š¢ ¤ */
+	$"8986 0008 557D B3B2 B1B3 A881 8081 8104"            /* ‰†..U}³²±³¨�€��. */
+	$"826F 577E AF82 A801 B3AE 82AD 03AF 7B7A"            /* ‚oW~¯‚¨.³®‚­.¯{z */
+	$"A781 A203 9EB7 C89D 81A2 03A6 776E 9A80"            /* §�¢.ž·È��¢.¦wnš€ */
+	$"9705 959F D3DC A295 8097 5899 6C67 8F8D"            /* —.•ŸÓÜ¢•€—X™lg�� */
+	$"8E89 85C9 BCA9 C883 898D 8D8E 6561 8585"            /* Ž‰…ɼ©Èƒ‰��Žea…… */
+	$"83A8 B7F3 BAB4 DFB6 AA84 8585 605E 7B7D"            /* ƒ¨·óº´ß¶ª„……`^{} */
+	$"79D0 F9E0 F0F2 DAE1 D87C 7D7B 5D5B 7476"            /* yÐùàðòÚáØ|}{][tv */
+	$"7099 D876 7373 76CA 8A72 7673 5B5A 6D70"            /* p™ØvssvÊŠrvs[Zmp */
+	$"6B9B 816C 6F6F 67B3 C567 706C 5A59 686B"            /* k›�loog³ÅgplZYhk */
+	$"6B67 686B 806A 056B 6F6A 6B67 5A88 5900"            /* kghk€j.kojkgZˆY. */
+	$"5882 598A 5801 0059 9F00 0482 8383 8480"            /* X‚YŠX..YŸ..‚ƒƒ„€ */
+	$"8700 057F B7BE BDC0 A786 0008 799E D0CE"            /* ‡...·¾½À§†..yžÐÎ */
+	$"CECF C5A1 A081 A105 A390 7AA0 D0CA 80C9"            /* ÎÏÅ¡ �¡.£�z ÐÊ€É */
+	$"01CA D183 CE03 D09C 9ECD 81C9 03C7 D4DE"            /* .ÊуÎ.ÐœžÍ�É.ÇÔÞ */
+	$"C681 C903 CD9A 94C5 80C2 05C1 C6E3 E9C8"            /* Æ�É.Íš”Å€Â.ÁÆãéÈ */
+	$"C180 C20D C491 8DBD BBBC B9B6 DDD7 CCDD"            /* Á€Â.Ä‘�½»¼¹¶Ý×ÌÝ */
+	$"B5B9 80BC 468B 87B4 B4B3 C8D1 F7D3 CFEA"            /* µ¹€¼F‹‡´´³ÈÑ÷ÓÏê */
+	$"D0C9 B4B4 B385 83AA ABA9 E0FB EAF5 F6E5"            /* ÐÉ´´³…ƒª«©àûêõöå */
+	$"EAE5 AAAB A981 80A0 A39E BAE4 A2A0 A1A2"            /* ê媫©�€ £žºä¢ ¡¢ */
+	$"DAAF 9FA3 9F7F 7E97 9B97 B8A6 979A 9A94"            /* Ú¯Ÿ£Ÿ.~—›—¸¦—šš” */
+	$"CAD6 949B 977D 7D90 9493 9091 8293 0496"            /* ÊÖ”›—}}�”“�‘‚“.– */
+	$"9294 907D 8E7C 8A7B 0100 7C9F 0000 7A80"            /* ’”�}Ž|Š{..|Ÿ..z€ */
+	$"7C00 7887 0005 77B1 B8B7 BBA0 8600 0871"            /* |.x‡..w±¸·» †..q */
+	$"97CB C9C8 CAC0 9B99 819A 049C 8972 99CA"            /* —ËÉÈÊÀ›™�š.œ‰r™Ê */
+	$"82C3 00CB 83C8 03CA 9596 C681 C203 BFCF"            /* ‚Ã.˃È.Ê•–Æ�Â.¿Ï */
+	$"DABF 81C2 03C6 938C BD80 BA05 B9BF E0E7"            /* Ú¿�Â.Æ“Œ½€º.¹¿àç */
+	$"C1B9 80BA 57BC 8985 B5B3 B3B0 ADD9 D2C6"            /* Á¹€ºW¼‰…µ³³°­ÙÒÆ */
+	$"D9AC B0B3 B3B4 827F ACAB AAC2 CCF6 CECA"            /* Ù¬°³³´‚.¬«ªÂÌöÎÊ */
+	$"E8CB C3AB ACAA 7D7B A1A3 A0DD FAE9 F4F5"            /* èË묪}{¡£ Ýúéôõ */
+	$"E3E8 E3A2 A3A0 7A78 989B 96B3 E29A 9898"            /* ãè㢣 zx˜›–³âš˜˜ */
+	$"9AD7 A897 9B97 7776 8F93 8FB2 9F8F 9292"            /* š×¨—›—wv�“�²Ÿ�’’ */
+	$"8BC5 D28C 938F 7575 888C 8B89 8982 8B04"            /* ‹ÅÒŒ“�uuˆŒ‹‰‰‚‹. */
+	$"8F8A 8C88 758E 748A 7301 0074 7338 6D6B"            /* �ŠŒˆuŽtŠs..ts8mk */
+	$"0000 0108 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 1E24 2424 1600 0000 0000"            /* .......$$$...... */
+	$"0000 0000 0011 BDC8 C8C8 9600 0000 0000"            /* ......½ÈÈÈ–..... */
+	$"0000 0000 048C FFFF FFFF F5A7 9C9E 9E9E"            /* .....Œÿÿÿÿõ§œžžž */
+	$"9E9E 6003 8AFF FCFC FCFC FEFF FFFF FFFF"            /* žž`.Šÿüüüüþÿÿÿÿÿ */
+	$"FFFF FF7A 89FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿz‰ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF7A 73FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿzsÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF64 62FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿdbÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF53 53FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿSSÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF45 48FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿEHÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF3C 41FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿ<Aÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FD35 3DFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿý5=ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FA30 3CFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿú0<ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FB2F 1247 4B4A 4A4A 4A4A 4A4A 4A4A"            /* ÿÿû/.GKJJJJJJJJJ */
+	$"4A4B 450F 0101 0201 0101 0101 0101 0101"            /* JKE............. */
+	$"0102 0001 696C 3332 0000 05AB FF00 BE00"            /* ....il32...«ÿ.¾. */
+	$"025A 7881 847F 0064 9200 0262 BBC4 83C2"            /* .Zx�„..d’..b»ÄƒÂ */
+	$"02C7 8451 9000 0255 86BF 84BC 03BF A064"            /* .Ç„Q�..U†¿„¼.¿ d */
+	$"6389 6400 6281 0003 5770 A2A2 85A1 01A3"            /* c‰d.b�..Wp¢¢…¡.£ */
+	$"9D89 9B07 9C97 6758 005B 95AC 88A7 02A8"            /* �‰›.œ—gX.[•¬ˆ§.¨ */
+	$"A4A7 89A8 05AB 925A 61A7 AE88 AC03 ABCA"            /* ¤§‰¨.«’Za§®ˆ¬.«Ê */
+	$"AEAB 88AC 05AE A15E 5B9A A788 A503 A0D7"            /* ®«ˆ¬.®¡^[š§ˆ¥. × */
+	$"D79F 88A5 05A8 9559 5990 A288 9F04 9BAB"            /* ןˆ¥.¨•YY�¢ˆŸ.›« */
+	$"FBAE 9C87 9F05 A28B 5857 879D 879A 0595"            /* û®œ‡Ÿ.¢‹XW‡�‡š.• */
+	$"BDD6 E6E3 9487 9A05 9D82 5656 7F97 8594"            /* ½Öæ㔇š.�‚VV.—…” */
+	$"0995 8FB3 F4CF B1FF AD90 9585 9405 977A"            /* Æ•�³ôϱÿ­�•…”.—z */
+	$"0000 7793 8690 078D CDF8 B886 E8E5 8B86"            /* ..w“†�.�Íø¸†è勆 */
+	$"9005 9372 0000 708F 828C 808B 0984 BBF7"            /* �.“r..p�‚Œ€‹Æ„»÷ */
+	$"C687 85AB FFA9 8580 8B82 8C05 8E6D 0000"            /* Ƈ…«ÿ©…€‹‚Œ.Žm.. */
+	$"6B8A 8287 0D88 8785 8FF3 FDA1 8186 84E5"            /* kŠ‚‡.ˆ‡…�óý¡�†„å */
+	$"E484 8684 8705 8868 0000 6685 8183 117E"            /* 䄆„‡.ˆh..f…�ƒ.~ */
+	$"B3E3 D0D2 FFDC D4DF DDDB D2FD D0DE E2B7"            /* ³ãÐÒÿÜÔßÝÛÒýÐÞâ· */
+	$"8082 8304 6400 0062 8081 7F06 76C5 FFDB"            /* €‚ƒ.d..b€�..vÅÿÛ */
+	$"F9F3 E381 FF06 F6D4 BFF4 FFD3 7882 7F03"            /* ùóã�ÿ.öÔ¿ôÿÓx‚.. */
+	$"6100 005F 827B 0675 B0D9 E1FF C8D8 82DF"            /* a.._‚{.u°ÙáÿÈØ‚ß */
+	$"05BF F3C9 DCB9 7681 7B04 7A5E 0000 5C82"            /* .¿óÉܹv�{.z^..\‚ */
+	$"7706 786F 96FF E879 7281 7306 7278 C8C2"            /* w.xo–ÿèyr�s.rxÈÂ */
+	$"7074 7880 7706 7875 5C00 005A 7382 7405"            /* ptx€w.xu\..Zs‚t. */
+	$"71C1 E19A 6D74 8173 0574 6BA2 FFAD 6C81"            /* qÁášmt�s.tk¢ÿ­l� */
+	$"7406 7571 5B00 005A 6F81 7104 6F77 F2AF"            /* t.uq[..Zo�q.owò¯ */
+	$"6984 7105 6E7E FAFB 836D 8071 0772 6D5A"            /* i„q.n~úûƒm€q.rmZ */
+	$"0000 586C 6F80 6E03 6C7B 9368 866E 0467"            /* ..Xlo€n.l{“h†n.g */
+	$"C3FA 8B69 806E 076F 6A59 0000 586A 6E81"            /* Ãú‹i€n.ojY..Xjn� */
+	$"6D01 6C68 876D 036B 717D 6B81 6D07 6E69"            /* m.lh‡m.kq}k�m.ni */
+	$"5900 0058 666A 8E69 0168 6682 6903 6A65"            /* Y..XfjŽi.hf‚i.je */
+	$"5900 BD59 0000 9B59 9E00 FF00 BE00 027D"            /* Y.½Y..›Yž.ÿ.¾..} */
+	$"98A0 829E 029F 9E85 9200 0284 D5DE 83DC"            /* ˜ ‚ž.Ÿž…’..„ÕÞƒÜ */
+	$"02E0 A275 9000 0279 A7DB 84D8 03DB BD87"            /* .à¢u�..y§Û„Ø.Û½‡ */
+	$"8689 8700 8581 0003 7A92 C0C0 85BF 01C0"            /* †‰‡.…�..z’ÀÀ…¿.À */
+	$"BB89 B907 BAB4 887B 007E B7CC 88C7 01C8"            /* »‰¹.º´ˆ{.~·ÌˆÇ.È */
+	$"C68A C805 CBB2 7C84 CAD1 89CF 02DE CFCE"            /* ÆŠÈ.˲|„ÊщÏ.ÞÏÎ */
+	$"88CF 05D2 C380 7FBF CC88 CA03 C7E8 E5C6"            /* ˆÏ.ÒÀ.¿ÌˆÊ.ÇèåÆ */
+	$"88CA 05CD B87C 7CB7 CA88 C704 C4CD FCCD"            /* ˆÊ.͸||·ÊˆÇ.ÄÍüÍ */
+	$"C587 C705 CAB0 7A7A AFC7 87C4 05C1 D4E3"            /* ŇÇ.Ê°zz¯Ç‡Ä.ÁÔã */
+	$"F0ED C087 C405 C8A8 7979 A7C4 85C0 09C1"            /* ðíÀ‡Ä.Ȩyy§Ä…ÀÆÁ */
+	$"BDD0 F7E1 D1FF CDBE C185 C005 C4A1 0000"            /* ½Ð÷áÑÿ;Á…À.Ä¡.. */
+	$"A0C1 86BD 07BA DEFB D5B7 F2EE B986 BD05"            /*  Á†½.ºÞûÕ·ò½. */
+	$"C09A 0000 9ABE 85BA 09B6 D4F9 DBB8 B6CD"            /* Àš..š¾…ºÆ¶ÔùÛ¸¶Í */
+	$"FFCA B785 BA05 BD94 0000 94B9 83B6 0EB4"            /* ÿÊ·…º.½”..”¹ƒ¶.´ */
+	$"B3B9 F7FE C4B0 B4B2 EFED B2B4 B4B5 82B6"            /* ³¹÷þÄ°´²ïí²´´µ‚¶ */
+	$"05B8 8F00 008E B481 B211 AFCD EBDF E0FF"            /* .¸�..Ž´�².¯Íëßàÿ */
+	$"E8E2 E9E8 E6E0 FEDF E8EA D0B0 81B2 05B3"            /* èâéèæàþßèêа�².³ */
+	$"8A00 0089 AF81 AD06 A8D9 FFE7 FBF7 EB81"            /* Š..‰¯�­.¨Ùÿçû÷ë� */
+	$"FF06 F9E1 D3F8 FFE3 A980 AD05 AEAD 8600"            /* ÿ.ùáÓøÿã©€­.®­†. */
+	$"0086 82A9 06A5 CBE5 EAFF DAE5 82EA 05D3"            /* .†‚©.¥ËåêÿÚå‚ê.Ó */
+	$"F7DA E8D1 A680 A906 AAA7 8300 0082 A382"            /* ÷ÚèѦ€©.ª§ƒ..‚£‚ */
+	$"A405 9FB7 FFF0 A5A1 81A2 05A1 A5D9 D39F"            /* ¤.Ÿ·ÿð¥¡�¢.¡¥ÙÓŸ */
+	$"A281 A406 A5A1 8000 0080 9F82 A004 9ED2"            /* ¢�¤.¥¡€..€Ÿ‚ .žÒ */
+	$"E9BA 9B83 A004 9ABF FFC5 9A81 A007 A19C"            /* 麛ƒ .š¿ÿÅš� .¡œ */
+	$"7F00 007E 999D 809B 059A 9FF6 C696 9C83"            /* ...~™�€›.šŸöÆ–œƒ */
+	$"9B05 99A4 FBFB A799 809B 079C 977D 0000"            /* ›.™¤ûû§™€›.œ—}.. */
+	$"7C95 9980 9803 97A1 B295 8698 0494 D5FC"            /* |•™€˜.—¡²•†˜.”Õü */
+	$"AC95 8098 0799 937C 0000 7C93 9782 9600"            /* ¬•€˜.™“|..|“—‚–. */
+	$"9387 9603 9599 A295 8196 0797 917C 0000"            /* “‡–.•™¢•�–.—‘|.. */
+	$"7B8E 928D 9102 9290 8F82 9103 928C 7B00"            /* {Ž’�‘.’��‚‘.’Œ{. */
+	$"BD7C 0000 9B7C 9E00 FF00 BE00 0275 9199"            /* ½|..›|ž.ÿ.¾..u‘™ */
+	$"8498 007E 9200 027D D0D9 83D7 02DB 9B6C"            /* „˜.~’..}ÐÙƒ×.Û›l */
+	$"9000 0271 A0D5 84D2 03D5 B67F 7E89 7F00"            /* �..q Õ„Ò.Õ¶.~‰.. */
+	$"7D81 0003 728B BBBB 85BA 02BB B6B3 88B4"            /* }�..r‹»»…º.»¶³ˆ´ */
+	$"08B5 AF81 7300 76B0 C6C2 87C1 01C2 C089"            /* .µ¯�s.v°Æ‡Á.ÂÀ‰ */
+	$"C206 C3C5 AB75 7CC3 CA89 C801 DBC9 89C8"            /* Â.ÃÅ«u|ÃʉÈ.ÛÉ‰È */
+	$"05CB BD78 77B9 C588 C304 C0E5 E2BF C487"            /* .˽xw¹ÅˆÃ.Àåâ¿Ä‡ */
+	$"C305 C6B2 7574 B0C3 87C0 05BF BCC7 FCC7"            /* Ã.Ʋut°Ã‡À.¿¼ÇüÇ */
+	$"BE87 C005 C3A9 7272 A7BF 87BC 05B9 D0E1"            /* ¾‡À.érr§¿‡¼.¹Ðá */
+	$"EEEB B887 BC05 C0A1 7171 A0BC 86B8 07B5"            /* î븇¼.À¡qq ¼†¸.µ */
+	$"CBF6 DDCB FFC7 B586 B805 BB99 0000 98B9"            /* ËöÝËÿǵ†¸.»™..˜¹ */
+	$"86B5 07B2 DBFA D0AE F0EC B186 B505 B892"            /* †µ.²ÛúЮð챆µ.¸’ */
+	$"0000 91B5 82B2 80B1 09AC D0F9 D7AF ADC7"            /* ..‘µ‚²€±Æ¬Ðùׯ­Ç */
+	$"FFC4 AD80 B182 B205 B48C 0000 8BB1 81AD"            /* ÿÄ­€±‚².´Œ..‹±�­ */
+	$"11AE ADAC ABB1 F6FD BDA8 ABAA EDEB A9AB"            /* .®­¬«±öý½¨«ªíë©« */
+	$"ACAC AE81 AD05 AF87 0000 86AB 81A9 11A6"            /* ¬¬®�­.¯‡..†«�©.¦ */
+	$"C8E9 DCDE FFE5 DFE7 E6E4 DDFE DCE6 E9CB"            /* ÈéÜÞÿåßçæäÝþÜæéË */
+	$"A781 A905 AA82 0000 81A6 81A5 069F D6FF"            /* §�©.ª‚..�¦�¥.ŸÖÿ */
+	$"E4FA F6EA 81FF 06F8 DFCF F7FF E0A0 80A5"            /* äúöê�ÿ.øßÏ÷ÿà €¥ */
+	$"05A6 A47E 0000 7D82 A006 9BC6 E3E8 FFD6"            /* .¦¤~..}‚ .›ÆãèÿÖ */
+	$"E282 E805 CFF6 D7E6 CC9C 80A0 06A1 9E7B"            /* â‚è.Ïö×æÌœ€ .¡ž{ */
+	$"0000 7A9B 829C 0496 B1FF EF9D 8399 049C"            /* ..z›‚œ.–±ÿï�ƒ™.œ */
+	$"D6D0 969A 819C 069D 9979 0000 7897 8198"            /* ÖЖš�œ.�™y..x—�˜ */
+	$"0597 95CF E7B4 9283 9704 91BA FFC0 9181"            /* .—•Ïç´’ƒ—.‘ºÿÀ‘� */
+	$"9807 9994 7700 0076 9295 8094 0493 98F5"            /* ˜.™”w..v’•€”.“˜õ */
+	$"C28E 8494 0592 9DFB FBA0 9180 9407 958F"            /* ÂŽ„”.’�ûû ‘€”.•� */
+	$"7500 0074 8E91 8090 038F 9AAC 8C86 9004"            /* u..tŽ‘€�.�š¬Œ†�. */
+	$"8BD1 FBA6 8C80 9007 918B 7400 0074 8B8F"            /* ‹Ñû¦Œ€�.‘‹t..t‹� */
+	$"808E 048F 8E8B 8E8F 848E 048F 8D91 9B8D"            /* €Ž.�Ž‹Ž�„Ž.��‘›� */
+	$"818E 078F 8974 0000 7487 8B8E 8A01 8987"            /* �Ž.�‰t..t‡‹ŽŠ.‰‡ */
+	$"828A 038B 8574 00BD 7400 009B 749E 006C"            /* ‚Š.‹…t.½t..›tž.l */
+	$"386D 6B00 0004 0800 0000 0000 0000 0000"            /* 8mk............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0B76 8889 8989"            /* ...........vˆ‰‰‰ */
+	$"8989 8988 3800 0000 0000 0000 0000 0000"            /* ‰‰‰ˆ8........... */
+	$"0000 0000 0000 0000 0000 36FF FFFF FFFF"            /* ..........6ÿÿÿÿÿ */
+	$"FFFF FFFF A301 0000 0000 0000 0000 0000"            /* ÿÿÿÿ£........... */
+	$"0000 0000 0000 0000 0006 A4FF FFFF FFFF"            /* ..........¤ÿÿÿÿÿ */
+	$"FFFF FFFF DE59 3F40 4040 4040 4040 4040"            /* ÿÿÿÿÞY?@@@@@@@@@ */
+	$"4040 4033 0000 0000 1384 F8F3 F3F3 F3F3"            /* @@@3.....„øóóóóó */
+	$"F3F3 F3F3 F7F9 F7F7 F7F7 F7F7 F7F7 F7F7"            /* óóóó÷ù÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F1 520D 001D E1FF FAFB FBFB FBFB"            /* ÷÷÷ñR...áÿúûûûûû */
+	$"FBFB FBFB FBFB FBFB FBFB FBFB FBFB FBFB"            /* ûûûûûûûûûûûûûûûû */
+	$"FBFB FBFB FFCD 0E39 FFFF FFFF FFFF FFFF"            /* ûûûûÿÍ.9ÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 1F26 F6FF FFFF FFFF FFFF"            /* ÿÿÿÿÿø.&öÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE5 1318 ECFF FFFF FFFF FFFF"            /* ÿÿÿÿÿå..ìÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD5 0A0F DDFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÕÂ.Ýÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC6 0206 D0FF FFFF FFFF FFFF"            /* ÿÿÿÿÿÆ..Ðÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB6 0000 C2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¶..Âÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 0000 B2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¥..²ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF95 0000 A4FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ•..¤ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF87 0000 96FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ‡..–ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF7A 0000 8AFF FFFF FFFF FFFF"            /* ÿÿÿÿÿz..Šÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6D 0000 7FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿm...ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF63 0000 77FF FFFF FFFF FFFF"            /* ÿÿÿÿÿc..wÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5A 0000 6FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿZ..oÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF54 0000 69FF FFFF FFFF FFFF"            /* ÿÿÿÿÿT..iÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4F 0000 65FF FFFF FFFF FFFF"            /* ÿÿÿÿÿO..eÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4C 0000 64FF FFFF FFFF FFFF"            /* ÿÿÿÿÿL..dÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4B 0000 61FF FFFF FFFF FFFF"            /* ÿÿÿÿÿK..aÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF48 0004 2C6D 7574 7474 7474"            /* ÿÿÿÿÿH..,muttttt */
+	$"7474 7474 7474 7474 7474 7474 7474 7474"            /* tttttttttttttttt */
+	$"7474 7475 6824 0202 0D18 1C1C 1C1C 1C1C"            /* tttuh$.......... */
+	$"1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C"            /* ................ */
+	$"1C1C 1C1C 170C 0100 0103 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0301 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0069 6833 3200 0009 DEFF"            /* .......ih32..ÆÞÿ */
+	$"00FF 00FF 00AD 0001 5E66 8865 0261 5859"            /* .ÿ.ÿ.­..^fˆe.aXY */
+	$"9C00 025E A6BA 87B7 04B9 AE67 5659 9B00"            /* œ..^¦º‡·.¹®gVY›. */
+	$"0266 BABF 87BE 04BF BC70 5459 9A00 0252"            /* .fº¿‡¾.¿¼pTYš..R */
+	$"81BD 89BA 03BC 8652 5491 5585 0003 5580"            /* �½‰º.¼†RT‘U…..U€ */
+	$"B7BA 89B9 02BA B497 918F 0191 7683 0003"            /* ·º‰¹.º´—‘�.‘vƒ.. */
+	$"5864 9399 8B97 0098 929B 039D 855F 5A80"            /* Xd“™‹—.˜’›.�…_Z€ */
+	$"0002 649D A990 A500 A490 A509 A6A9 9B65"            /* ..d�©�¥.¤�¥Æ¦©›e */
+	$"0000 85B4 AFAF 8EAE 03B0 AEAC AF8E AE07"            /* ..…´¯¯Ž®.°®¬¯Ž®. */
+	$"AFAF B280 0000 80AD 8FA9 04A8 B2E7 ACA8"            /* ¯¯²€..€­�©.¨²ç¬¨ */
+	$"90A9 05AB 7A00 0076 A98F A604 A5A4 F1E0"            /* �©.«z..v©�¦.¥¤ñà */
+	$"A08F A606 A7A6 7100 006D A390 A204 9DC8"            /*  �¦.§¦q..m£�¢.�È */
+	$"FFB9 9C8E A207 A3A0 6A00 0065 9D9F 8D9E"            /* ÿ¹œŽ¢.£ j..e�Ÿ�ž */
+	$"069F 9C96 A2FA EF9C 8E9E 079F 9A65 0000"            /* .Ÿœ–¢úž.Ÿše.. */
+	$"6097 9C8D 9B07 97A5 E2C6 D2FF C394 8D9B"            /* `—œ�›.—¥âÆÒÿÔ�› */
+	$"079C 9461 0000 5E90 988C 9709 959A D5CE"            /* .œ”a..^�˜Œ—Æ•šÕÎ */
+	$"E4B2 FCF4 9A95 8C97 0799 8D5E 0000 5A8B"            /* ä²üôš•Œ—.™�^..Z‹ */
+	$"968C 9409 8EC8 FFF6 C18D DDFF C78C 8C94"            /* –Œ”ÆŽÈÿöÁ�ÝÿÇŒŒ” */
+	$"0796 875B 0000 5885 938B 910B 8F8F E5FF"            /* .–‡[..X…“‹‘.��åÿ */
+	$"FFA9 87AA FFF7 988E 8B91 0793 8159 0000"            /* ÿ©‡ªÿ÷˜Ž‹‘.“�Y.. */
+	$"577F 908B 8E0B 87CF D4D0 CA89 8D8B E0FF"            /* W.�‹Ž.‡ÏÔÐʉ�‹àÿ */
+	$"C786 8B8E 0790 7B58 0000 5779 8C86 8A81"            /* dž‹Ž.�{X..WyŒ†Š� */
+	$"8B0D 84A5 FFFF E38B 898B 85A8 FFF8 9387"            /* ‹.„¥ÿÿ㋉‹…¨ÿø“‡ */
+	$"818B 868A 078C 7557 0000 5674 8A85 8800"            /* �‹†Š.ŒuW..VtŠ…ˆ. */
+	$"8680 820E 8385 E4FF FFB9 7C83 8381 7FDD"            /* †€‚.ƒ…äÿÿ¹|ƒƒ�.Ý */
+	$"FFC6 7E81 8200 8585 8807 8A71 5759 0056"            /* ÿÆ~�‚.……ˆ.ŠqWY.V */
+	$"6F87 8485 1983 929F A3A0 94B0 FFFF E39D"            /* o‡„….ƒ’Ÿ£ ”°ÿÿã� */
+	$"9F9E 9DA3 9AB0 FBF4 98A0 A09F A192 8484"            /* Ÿž�£š°ûô˜  Ÿ¡’„„ */
+	$"8507 876D 5759 0056 6984 8482 197C A7EB"            /* ….‡mWY.Vi„„‚.|§ë */
+	$"FBF1 C2EC FFFB C1ED F2F6 ECFB EDD9 DBFF"            /* ûñÂìÿûÁíòöìûíÙÛÿ */
+	$"D4EE F0F6 F6B7 7C84 8207 8369 5700 5956"            /* Ôîðöö·|„‚.ƒiW.YV */
+	$"6481 847F 0979 A3FF FFEB CCFF FFD5 E084"            /* d�„.Æy£ÿÿëÌÿÿÕà„ */
+	$"FF03 C8F1 BCC4 80FF 01C0 7785 7F06 6557"            /* ÿ.Èñ¼Ä€ÿ.Àw…..eW */
+	$"5959 5661 7E84 7D08 76A3 FFFF C3F4 FFF5"            /* YYVa~„}.v£ÿÿÃôÿõ */
+	$"CB85 FF08 EDA8 CCC0 F2FF FFC1 7485 7D06"            /* Ë…ÿ.í¨ÌÀòÿÿÁt…}. */
+	$"6358 5959 575E 7B84 7A09 7692 D0BE D6FF"            /* cXYYW^{„zÆv’оÖÿ */
+	$"FFC2 B9D0 84CF 08CD B9FF F1B1 CED0 A574"            /* ÿ¹ЄÏ.͹ÿñ±ÎÐ¥t */
+	$"847A 0679 6058 5959 585D 8678 0776 6A9C"            /* „z.y`XYYX]†x.vjœ */
+	$"FFFF F081 7086 7106 75D1 D89D 6A71 7484"            /* ÿÿð�p†q.uÑØ�jqt„ */
+	$"7808 7976 5E58 5959 585B 7486 7505 73B9"            /* x.yv^XYYX[t†u.s¹ */
+	$"F5FF AC6D 8775 0570 8CEB F889 6F85 7508"            /* õÿ¬m‡u.pŒëø‰o…u. */
+	$"7672 5C58 5959 5859 7285 7306 6F8A E1C6"            /* vr\XYYXYr…s.oŠáÆ */
+	$"C176 7287 7306 7179 EEFF E173 7184 7308"            /* Ávr‡s.qyîÿásq„s. */
+	$"7470 5B58 5959 5859 7085 7205 6B97 FFE7"            /* tp[XYYXYp…r.k—ÿç */
+	$"776E 8972 0569 C6FF FFB4 6A84 7202 736E"            /* wn‰r.iÆÿÿ´j„r.sn */
+	$"5A81 5901 586D 856F 0567 B9D9 786B 7089"            /* Z�Y.Xm…o.g¹Ùxkp‰ */
+	$"6F06 6993 FFFF F173 6D83 6F01 706B 8259"            /* o.i“ÿÿñsmƒo.pk‚Y */
+	$"0157 6B85 6E03 6C8C 7269 8B6E 066D 6BD3"            /* .Wk…n.lŒri‹n.mkÓ */
+	$"FFCB 6C6D 836E 026F 6958 8159 0256 6A6E"            /* ÿËlmƒn.oiX�Y.Vjn */
+	$"856D 0169 6B8D 6D04 6A73 8A6D 6B84 6D02"            /* …m.ik�m.jsŠmk„m. */
+	$"6E68 5881 5902 566A 6E98 6D02 6B67 6C85"            /* nhX�Y.Vjn˜m.kgl… */
+	$"6D02 6E68 5881 5902 5665 69A3 6802 6963"            /* m.nhX�Y.Vei£h.ic */
+	$"5881 5901 5858 A559 0058 B059 0000 AB59"            /* X�Y.XX¥Y.X°Y..«Y */
+	$"8000 A959 DF00 FF00 FF00 FF00 AD00 0081"            /* €.©Yß.ÿ.ÿ.ÿ.­..� */
+	$"8987 0283 7B7C 9C00 0280 C1D3 87D1 04D2"            /* ‰‡.ƒ{|œ..€ÁÓ‡Ñ.Ò */
+	$"C787 7A7C 9B00 0288 D4DA 87D9 04DA D68F"            /* LJz|›..ˆÔÚ‡Ù.ÚÖ� */
+	$"787C 9A00 0276 A2D8 89D6 02D7 A476 9278"            /* x|š..v¢Ø‰Ö.פv’x */
+	$"8500 0379 A2D3 D789 D503 D6D0 B5AD 90AE"            /* …..y¢Ó׉Õ.Öе­�® */
+	$"01B0 9683 0003 7C87 B1B7 8BB5 00B6 92B9"            /* .°–ƒ..|‡±·‹µ.¶’¹ */
+	$"03BA A282 7D80 0003 87BD C8C5 90C4 00C5"            /* .º¢‚}€..‡½ÈÅ�Ä.Å */
+	$"8FC4 08C5 C8B9 8700 00A7 D6D1 90D0 01CD"            /* �Ä.Åȹ‡..§ÖÑ�Ð.Í */
+	$"CF90 D006 D1D3 A000 00A3 D18F CD04 CCD1"            /* Ï�Ð.ÑÓ ..£Ñ�Í.ÌÑ */
+	$"EECC CC90 CD05 CF9B 0000 9ACE 90CB 03CA"            /* îÌÌ�Í.Ï›..šÎ�Ë.Ê */
+	$"F7E9 C68F CB07 CCCB 9300 0091 C9C9 8FC8"            /* ÷éÆ�Ë.ÌË“..‘ÉÉ�È */
+	$"04C6 DFFF D2C5 8EC8 07C9 C68D 0000 8BC5"            /* .ÆßÿÒÅŽÈ.ÉÆ�..‹Å */
+	$"C78D C606 C7C5 BFC7 FDF3 C38E C607 C7C0"            /* Ç�Æ.ÇÅ¿ÇýóÃŽÆ.ÇÀ */
+	$"8800 0086 C0C5 8DC4 07C2 C7EB DAE4 FFD9"            /* ˆ..†ÀÅ�Ä.ÂÇëÚäÿÙ */
+	$"C08D C407 C6BC 8400 0082 BBC4 8CC2 09C1"            /* À�Ä.Ƽ„..‚»ÄŒÂÆÁ */
+	$"C2E2 DEED D1FD F7C1 C18C C207 C4B6 8100"            /* ÂâÞíÑý÷ÁÁŒÂ.Ķ�. */
+	$"007F B5C2 8CC0 09BC DBFF F8D7 BBEA FFDB"            /* ..µÂŒÀƼÛÿø×»êÿÛ */
+	$"BA8C C007 C2B0 7E00 007C B0C0 8BBE 0BBD"            /* ºŒÀ.°~..|°À‹¾.½ */
+	$"BAED FFFF CCB8 CCFF F9BF BC8B BE07 C0AA"            /* ºíÿÿ̸Ìÿù¿¼‹¾.Àª */
+	$"7C00 007B ABBF 8BBC 0BB7 DEE1 DFDF B9BB"            /* |..{«¿‹¼.·Þáßß¹» */
+	$"BAED FFDA B78B BC07 BFA5 7B00 007A A5BC"            /* ºíÿÚ·‹¼.¿¥{..z¥¼ */
+	$"89B9 0EBA B6C6 FFFF ECB9 B9BA B6CB FFFA"            /* ‰¹.º¶Æÿÿì¹¹º¶Ëÿú */
+	$"BCB8 8AB9 07BC 9F7A 0000 799F B984 B601"            /* ¼¸Š¹.¼Ÿz..yŸ¹„¶. */
+	$"B7B5 82B3 0CEC FFFF D4AF B3B3 B2B1 EAFF"            /* ·µ‚³.ìÿÿÔ¯³³²±êÿ */
+	$"D9B0 81B3 01B5 B784 B607 B899 797C 0079"            /* Ù°�³.µ·„¶.¸™y|.y */
+	$"99B7 84B4 13B3 B9BE C1C0 B9CB FFFF EDBE"            /* ™·„´.³¹¾ÁÀ¹Ëÿÿí¾ */
+	$"BFBE BEC1 BCCB FCF7 BB80 BF02 C0B9 B384"            /* ¿¾¾Á¼Ëü÷»€¿.À¹³„ */
+	$"B407 B694 797C 0079 93B4 84B1 19AD C7F1"            /* ´.¶”y|.y“´„±.­Çñ */
+	$"FBF5 D6F1 FFFD D5F2 F5F8 F1FB F2E4 E7FF"            /* ûõÖñÿýÕòõøñûòäçÿ */
+	$"E2F3 F4F8 F8D0 AD84 B107 B290 7A00 7C79"            /* âóôøøЭ„±.²�z.|y */
+	$"8DB0 84AE 09AA C3FF FFF2 DCFF FFE2 E984"            /* �°„®ÆªÃÿÿòÜÿÿâé„ */
+	$"FF03 D9F6 D1D8 80FF 01D6 A985 AE06 8C7A"            /* ÿ.ÙöÑØ€ÿ.Ö©…®.Œz */
+	$"7C7C 7989 AD84 AB08 A7C3 FFFF D5F7 FFF8"            /* ||y‰­„«.§ÃÿÿÕ÷ÿø */
+	$"DA85 FF08 F2C2 DAD3 F6FF FFD7 A583 AB08"            /* Ú…ÿ.òÂÚÓöÿÿ×¥ƒ«. */
+	$"ACAA 897A 7C7C 7A86 A984 A809 A5B7 E0D3"            /* ¬ª‰z||z†©„¨Æ¥·àÓ */
+	$"E2FF FFD6 D0E0 84DF 08DD CFFF F5CB DFE0"            /* âÿÿÖÐà„ß.ÝÏÿõËßà */
+	$"C3A4 83A8 07A9 A686 7A7C 7C7A 8386 A506"            /* 䃨.©¦†z||zƒ†¥. */
+	$"A39B BAFF FFF5 AA87 A006 A3DF E2BA 9BA1"            /* £›ºÿÿõª‡ .£ß⺛¡ */
+	$"A284 A507 A6A2 837B 7C7C 7B82 87A2 059F"            /* ¢„¥.¦¢ƒ{||{‚‡¢.Ÿ */
+	$"CCF8 FFC7 9C87 A205 9EAF F0F9 AD9E 85A2"            /* ÌøÿÇœ‡¢.ž¯ðù­ž…¢ */
+	$"08A3 9F81 7B7C 7C7B 7F9D 859F 069C AEE8"            /* .£Ÿ�{||{.�…Ÿ.œ®è */
+	$"D4D3 A09E 879F 069D A3F4 FFE8 9D9E 849F"            /* ÔÓ ž‡Ÿ.�£ôÿè�ž„Ÿ */
+	$"09A0 9B7F 7B7C 7C7B 7E9A 9D84 9C05 98B5"            /* Æ ›.{||{~š�„œ.˜µ */
+	$"FFEE 9F99 899C 0596 D7FF FFC9 9684 9C09"            /* ÿ‰œ.–×ÿÿÉ–„œÆ */
+	$"9D97 7E7B 7C7C 7B7C 989B 849A 0494 CCE4"            /* �—~{||{|˜›„š.”Ìä */
+	$"A097 8A9A 0695 B3FF FFF4 9C99 839A 019B"            /*  —Šš.•³ÿÿôœ™ƒš.› */
+	$"9482 7C02 7B95 9984 9803 97AD 9B95 8B98"            /* ”‚|.{•™„˜.—­›•‹˜ */
+	$"0697 96E0 FFDA 9797 8398 0199 9282 7C02"            /* .—–àÿÚ——ƒ˜.™’‚|. */
+	$"7A93 9785 9601 9395 8D96 0494 9AAB 9695"            /* z“—…–.“•�–.”š«–• */
+	$"8496 0297 8F7B 817C 027A 9297 9896 0294"            /* „–.—�{�|.z’—˜–.” */
+	$"9295 8596 0297 8F7B 817C 027A 8C91 A390"            /* ’•…–.—�{�|.zŒ‘£� */
+	$"0291 897A 817C 017B 7BA5 7C00 7BB0 7C00"            /* .‘‰z�|.{{¥|.{°|. */
+	$"00AB 7C80 00A9 7CDF 00FF 00FF 00FF 00AD"            /* .«|€.©|ß.ÿ.ÿ.ÿ.­ */
+	$"0000 7A89 8002 7C73 749C 0002 79BC CE87"            /* ..z‰€.|stœ..y¼Î‡ */
+	$"CC04 CDC2 8172 749B 0002 80CF D587 D304"            /* Ì.ÍÂ�rt›..€ÏÕ‡Ó. */
+	$"D4D1 8870 749A 0002 6E9B D288 D003 D1D2"            /* Ôшptš..n›ÒˆÐ.ÑÒ */
+	$"9E6E 9270 8500 0371 9BCE D289 D002 D1CB"            /* žn’p…..q›ÎÒ‰Ð.ÑË */
+	$"AF91 A801 AA90 8300 0474 80AC B2AF 8AB0"            /* ¯‘¨.ª�ƒ..t€¬²¯Š° */
+	$"02B1 B3B4 90B3 03B5 9D7A 7580 0002 80B7"            /* .±³´�³.µ�zu€..€· */
+	$"C3A4 BF09 C0C3 B57F 0000 A0CF CACA 8DC9"            /* ä¿ÆÀõ... ÏÊÊ�É */
+	$"04CA CAC6 C8CA 8EC9 07CA CACD 9900 009C"            /* .ÊÊÆÈÊŽÉ.ÊÊÍ™..œ */
+	$"CA8F C604 C5CB EDC5 C58F C606 C7C8 9400"            /* Ê�Æ.ÅËíÅÅ�Æ.ÇÈ”. */
+	$"0093 C790 C403 C3F6 E7BF 8FC4 07C5 C48B"            /* .“Ç�Ä.Ãöç¿�Ä.ÅÄ‹ */
+	$"0000 8AC2 C28F C104 BEDA FFCE BE8E C107"            /* ..ŠÂÂ�Á.¾ÚÿξŽÁ. */
+	$"C2BF 8600 0083 BEC0 8DBF 06C0 BEB8 C1FC"            /* ¿†..ƒ¾À�¿.À¾¸Áü */
+	$"F3BC 8EBF 07C0 BA81 0000 7EB9 BE8D BD07"            /* 󼎿.Àº�..~¹¾�½. */
+	$"BAC0 E9D6 E1FF D5B8 8DBD 07BF B57C 0000"            /* ºÀéÖáÿÕ¸�½.¿µ|.. */
+	$"7AB3 BC8C BA09 B9BB DFDB EBCB FDF7 BAB9"            /* z³¼ŒºÆ¹»ßÛëËý÷º¹ */
+	$"8CBA 07BC AE79 0000 77AE B98C B709 B3D7"            /* Œº.¼®y..w®¹Œ·Æ³× */
+	$"FFF8 D3B2 E8FF D7B1 8CB7 07B9 A876 0000"            /* ÿøÓ²èÿ×±Œ·.¹¨v.. */
+	$"74A9 B78A B50C B6B5 B2EC FFFF C6AF C6FF"            /* t©·Šµ.¶µ²ìÿÿƯÆÿ */
+	$"F9B8 B48B B507 B7A3 7400 0073 A3B6 8BB3"            /* ù¸´‹µ.·£t..s£¶‹³ */
+	$"0BAE DBDE DDDB B0B3 B1EA FFD7 AE8B B307"            /* .®ÛÞÝÛ°³±êÿ×®‹³. */
+	$"B59D 7300 0072 9CB3 8AB0 04AD C0FF FFEA"            /* µ�s..rœ³Š°.­Àÿÿê */
+	$"80B0 05AD C4FF F9B4 AF8A B007 B397 7200"            /* €°.­Äÿù´¯Š°.³—r. */
+	$"0071 97B1 85AE 00AC 80AA 0EAB AAEA FFFF"            /* .q—±…®.¬€ª.«ªêÿÿ */
+	$"CFA6 AAAA A9A7 E7FF D5A7 81AA 00AC 85AE"            /* Ϧªª©§çÿÕ§�ª.¬…® */
+	$"07B0 9171 7400 7191 AE84 AB13 AAB2 B9BB"            /* .°‘qt.q‘®„«.ª²¹» */
+	$"BAB2 C6FF FFEB B7B9 B8B7 BBB6 C5FC F7B5"            /* º²Æÿÿë·¹¸·»¶Åü÷µ */
+	$"80B9 01BA B285 AB07 AD8C 7174 0070 8BAB"            /* €¹.º²…«.­Œqt.p‹« */
+	$"84A8 19A4 C1EF FBF4 D2F0 FFFC D1F1 F4F8"            /* „¨.¤ÁïûôÒðÿüÑñôø */
+	$"F0FB F1E2 E5FF DFF2 F3F8 F8CB A484 A807"            /* ðûñâåÿßòóøøˤ„¨. */
+	$"A988 7200 7471 85A7 84A5 09A1 BDFF FFF0"            /* ©ˆr.tq…§„¥Æ¡½ÿÿð */
+	$"D9FF FFE0 E784 FF03 D6F5 CDD4 80FF 01D2"            /* Ùÿÿàç„ÿ.ÖõÍÔ€ÿ.Ò */
+	$"9F85 A506 8472 7474 7181 A484 A208 9EBD"            /* Ÿ…¥.„rttq�¤„¢.ž½ */
+	$"FFFF D2F6 FFF7 D785 FF08 F1BD D8CF F6FF"            /* ÿÿÒöÿ÷×…ÿ.ñ½ØÏöÿ */
+	$"FFD3 9C83 A208 A3A2 8172 7474 727E A084"            /* ÿÓœƒ¢.£¢�rttr~ „ */
+	$"9F09 9CB0 DDCF DFFF FFD2 CCDD 84DC 08DA"            /* ŸÆœ°ÝÏßÿÿÒÌÝ„Ü.Ú */
+	$"CBFF F4C6 DCDD BE9B 839F 08A0 9E7E 7274"            /* ËÿôÆÜݾ›ƒŸ. ž~rt */
+	$"7472 7C9D 849C 089D 9B93 B5FF FFF4 A397"            /* tr|�„œ.�›“µÿÿô£— */
+	$"8598 0897 9BDD E0B4 9398 9A9D 839C 089D"            /* …˜.—›Ýà´“˜š�ƒœ.� */
+	$"9A7B 7374 7473 7998 8699 0597 C8F7 FFC1"            /* š{sttsy˜†™.—È÷ÿÁ */
+	$"9387 9905 96A9 EEF9 A695 8599 089A 9679"            /* “‡™.–©îù¦•…™.š–y */
+	$"7374 7473 7795 8596 0693 A7E6 D1D0 9895"            /* sttsw•…–.“§æÑИ• */
+	$"8796 0695 9BF3 FFE7 9595 8496 0897 9377"            /* ‡–.•›óÿç••„–.—“w */
+	$"7374 7473 7693 8595 058F B0FF ED98 9289"            /* sttsv“…•.�°ÿ혒‰ */
+	$"9505 8ED4 FFFF C58E 8495 0996 9076 7374"            /* •.ŽÔÿÿÅŽ„•Æ–�vst */
+	$"7473 7490 9384 9204 8BC8 E299 8F8A 9206"            /* tst�“„’.‹Èâ™�Š’. */
+	$"8DAD FFFF F494 9183 9202 938C 7581 7402"            /* �­ÿÿô”‘ƒ’.“Œu�t. */
+	$"738D 9184 9003 8EA7 938D 8B90 068F 8EDD"            /* s�‘„�.Ž§“�‹�.�ŽÝ */
+	$"FFD7 8E8F 8390 0191 8A82 7402 728B 8F85"            /* ÿ׎�ƒ�.‘Š‚t.r‹�… */
+	$"8E01 8B8D 8D8E 048C 93A4 8E8D 848E 028F"            /* Ž.‹��Ž.Œ“¤Ž�„Ž.� */
+	$"8773 8174 0272 8B8F 988E 028C 8A8D 858E"            /* ‡s�t.r‹�˜Ž.ŒŠ�…Ž */
+	$"028F 8773 8174 0272 8489 A388 0289 8173"            /* .�‡s�t.r„‰£ˆ.‰�s */
+	$"8174 0173 73A5 7400 73B0 7400 00AB 7480"            /* �t.ss¥t.s°t..«t€ */
+	$"00A9 74DF 0068 386D 6B00 0009 0800 0000"            /* .©tß.h8mk..Æ.... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 002E 4549 4A4A 4A4A 4A4A 4A4A 4A4A"            /* ....EIJJJJJJJJJJ */
+	$"3B0A 0400 0000 0000 0000 0000 0000 0000"            /* ;Â.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 2FF9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ../ùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FD52 0802 0000 0000 0000 0000 0000 0000"            /* ýR.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 4DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Mÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FF7E 1306 0000 0000 0000 0000 0000 0000"            /* ÿ~.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0002 ABFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..«ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFBB 2C11 0B0B 0B0B 0B0B 0B0B 0B0B 0B0B"            /* ÿ»,............. */
+	$"0B0B 0B0B 0B0B 0903 0000 0000 0000 0000"            /* ......Æ......... */
+	$"08B2 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .²ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF DFCC CCCC CCCC CCCC CCCC CCCC CCCC"            /* ÿÿßÌÌÌÌÌÌÌÌÌÌÌÌÌ */
+	$"CCCC CCCC CCCC CBC9 8000 0000 0000 0026"            /* ÌÌÌÌÌÌËÉ€......& */
+	$"71F2 EDEE EFEF EFEF EFEF EFEF EFEF EFEF"            /* qòíîïïïïïïïïïïïï */
+	$"EFEF F4F7 F7F7 F7F7 F7F7 F7F7 F7F7 F7F7"            /* ïïô÷÷÷÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F7 F7F7 F7F5 CE41 2000 0000 5EF7"            /* ÷÷÷÷÷÷÷õÎA ...^÷ */
+	$"FFF8 F8F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ÿøøùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F8 FAFF EE41 0000 C4FF"            /* ùùùùùùùøúÿîA..Äÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFA1 0000 B6FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ¡..¶ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF91 0000 A2FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ‘..¢ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF7A 0000 8FFF"            /* ÿÿÿÿÿÿÿÿÿÿÿz..�ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF68 0000 79FF"            /* ÿÿÿÿÿÿÿÿÿÿÿh..yÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF57 0000 5EFF"            /* ÿÿÿÿÿÿÿÿÿÿÿW..^ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF48 0000 4BFF"            /* ÿÿÿÿÿÿÿÿÿÿÿH..Kÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FD3B 0000 3FFE"            /* ÿÿÿÿÿÿÿÿÿÿý;..?þ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF F62F 0000 33F8"            /* ÿÿÿÿÿÿÿÿÿÿö/..3ø */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF ED23 0000 27F2"            /* ÿÿÿÿÿÿÿÿÿÿí#..'ò */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF DE1A 0000 1FE9"            /* ÿÿÿÿÿÿÿÿÿÿÞ....é */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF CE10 0000 1ADF"            /* ÿÿÿÿÿÿÿÿÿÿÎ....ß */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF C10B 0100 14D5"            /* ÿÿÿÿÿÿÿÿÿÿÁ....Õ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF B509 0100 0FCD"            /* ÿÿÿÿÿÿÿÿÿÿµÆ...Í */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF AA07 0001 0BC2"            /* ÿÿÿÿÿÿÿÿÿÿª.... */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF A005 0101 09B3"            /* ÿÿÿÿÿÿÿÿÿÿ ...Ƴ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 9504 0101 08A6"            /* ÿÿÿÿÿÿÿÿÿÿ•....¦ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8D04 0101 069A"            /* ÿÿÿÿÿÿÿÿÿÿ�....š */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8505 0101 0691"            /* ÿÿÿÿÿÿÿÿÿÿ…....‘ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7D05 0101 078B"            /* ÿÿÿÿÿÿÿÿÿÿ}....‹ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7606 0101 0885"            /* ÿÿÿÿÿÿÿÿÿÿv....… */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7106 0102 0881"            /* ÿÿÿÿÿÿÿÿÿÿq....� */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6D07 0102 0A7E"            /* ÿÿÿÿÿÿÿÿÿÿm...Â~ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6A08 0102 0B7B"            /* ÿÿÿÿÿÿÿÿÿÿj....{ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6709 0102 0C7C"            /* ÿÿÿÿÿÿÿÿÿÿgÆ...| */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 670A 0102 0C75"            /* ÿÿÿÿÿÿÿÿÿÿgÂ...u */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 600B 0102 113A"            /* ÿÿÿÿÿÿÿÿÿÿ`....: */
+	$"7B85 8585 8585 8585 8585 8585 8585 8585"            /* {……………………………………… */
+	$"8585 8585 8585 8585 8585 8585 8585 8585"            /* ………………………………………… */
+	$"8585 8585 8585 8585 8574 310F 0101 0B1E"            /* ………………………t1..... */
+	$"2B34 3535 3535 3535 3535 3535 3535 3535"            /* +455555555555555 */
+	$"3535 3535 3535 3535 3535 3535 3535 3535"            /* 5555555555555555 */
+	$"3535 3535 3535 3535 332A 1C0A 0100 040C"            /* 555555553*.Â.... */
+	$"1418 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1813 0B03 0000 0002"            /* ................ */
+	$"0304 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0402 0100 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0069 7433"            /* .............it3 */
+	$"3200 0025 F700 0000 00FF 00FF 00FF 00FF"            /* 2..%÷....ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 59D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.ŸY× */
+	$"00A6 59D3 0001 5959 8000 9D58 8459 D000"            /* .¦YÓ..YY€.�X„YÐ. */
+	$"0359 5900 569F 5901 5658 8359 D000 0257"            /* .YY.VŸY.VXƒYÐ..W */
+	$"6287 9D95 0494 917F 5E58 8359 CD00 0459"            /* b‡�•.”‘.^XƒYÍ..Y */
+	$"005C 9ABA 9EBC 03B9 AE85 5883 59CD 0004"            /* .\šºž¼.¹®…XƒYÍ.. */
+	$"5900 6EB3 BE9E BF04 BEB6 9D62 5782 59CD"            /* Y.n³¾ž¿.¾¶�bW‚YÍ */
+	$"0003 5900 74B6 A0BE 03B8 9F63 5782 59CC"            /* ..Y.t¶ ¾.¸ŸcW‚YÌ */
+	$"0004 5959 547A B8A0 BC03 B7A0 6357 8359"            /* ..YYTz¸ ¼.· cWƒY */
+	$"CB00 0459 5954 88B9 A0BB 03B7 A366 56B8"            /* Ë..YYTˆ¹ ».·£fV¸ */
+	$"5995 0005 5959 005B A0B9 A0BA 03B8 AA73"            /* Y•..YY.[ ¹ º.¸ªs */
+	$"55BA 5992 0006 5959 0053 7BB4 B9A0 BA04"            /* UºY’..YY.S{´¹ º. */
+	$"B9B2 905A 56BA 5990 0006 5959 0054 73AB"            /* ¹²�ZVºY�..YY.Ts« */
+	$"B8A2 B903 B5AB 865E B756 0300 5859 598E"            /* ¸¢¹.µ«†^·V..XYYŽ */
+	$"0007 5959 005A 83AD B6B7 A2B8 04B7 B4AD"            /* ..YY.Zƒ­¶·¢¸.·´­ */
+	$"9B87 B57D 047B 725D 0059 8D00 0759 5900"            /* ›‡µ}.{r].Y�..YY. */
+	$"5A8F B2B6 B6A4 B704 B6B5 B4B2 B1B4 B003"            /* Z�²¶¶¤·.¶µ´²±´°. */
+	$"ADA0 7600 8059 8900 8159 0355 77AC B0E2"            /* ­ v.€Y‰.�Y.Uw¬°â */
+	$"B103 AFA4 7D56 8259 8600 0159 5980 0003"            /* ±.¯¤}V‚Y†..YY€.. */
+	$"5279 9697 E298 0496 9073 5456 8000 0159"            /* Ry–—â˜.–�sTV€..Y */
+	$"5984 0008 5900 5457 6268 686D 7284 73A1"            /* Y„..Y.TWbhhmr„s¡ */
+	$"74B9 7309 706C 6868 6763 5900 5959 8200"            /* t¹sÆplhhgcY.YY‚. */
+	$"0759 0052 6E96 A4A7 A8E7 A980 A706 A6A0"            /* .Y.Rn–¤§¨ç©€§.¦  */
+	$"8E6A 5759 5982 0002 536F A782 B0E5 AF81"            /* ŽjWYY‚..So§‚°å¯� */
+	$"B006 AFAF AB99 6A00 5980 0004 5900 5A9B"            /* °.¯¯«™j.Y€..Y.Z› */
+	$"AEF0 AF0B AEA6 895B 0059 0000 5900 6CA7"            /* ®ð¯.®¦‰[.Y..Y.l§ */
+	$"B4AE 03AF ABAE AFB7 AE0A A996 6500 5900"            /* ´®.¯«®¯·®Â©–e.Y. */
+	$"0059 5470 A7B3 AD05 AEA8 A299 A8AE B6AD"            /* .YTp§³­.®¨¢™¨®¶­ */
+	$"0AA8 9666 0059 0059 5900 6CA3 B4AB 05A6"            /* ¨–f.Y.YY.l£´«.¦ */
+	$"EDE9 99A7 ACB5 AB0A A692 6200 5900 5959"            /* í陧¬µ«Â¦’b.Y.YY */
+	$"0063 9EB3 A905 A8A8 ECFF E195 B6A9 0BA3"            /* .cž³©.¨¨ìÿᕶ©.£ */
+	$"8D5F 5859 0059 5900 6099 A7B3 A806 A4DC"            /* �_XY.YY.`™§³¨.¤Ü */
+	$"FFFF CA96 AAB4 A80B A187 5B58 5900 5959"            /* ÿÿÊ–ª´¨.¡‡[XY.YY */
+	$"005C 94A6 B3A7 01A3 C580 FF02 AD9D A8B3"            /* .\”¦³§.£Å€ÿ.­�¨³ */
+	$"A70B 9F82 5A58 5900 5959 5857 8DA5 B3A6"            /* §.Ÿ‚ZXY.YYXW�¥³¦ */
+	$"07A4 AEF8 FFFF ED97 A4B2 A603 A59C 7C58"            /* .¤®øÿÿí—¤²¦.¥œ|X */
+	$"8359 0257 87A3 B4A4 01A1 E180 FF02 CB94"            /* ƒY.W‡£´¤.¡á€ÿ.Ë” */
+	$"A6B1 A403 A399 7657 8359 0254 80A1 B4A2"            /* ¦±¤.£™vWƒY.T€¡´¢ */
+	$"019D C180 FF03 FEA4 9BA3 B0A2 03A1 9672"            /* .�Á€ÿ.þ¤›£°¢.¡–r */
+	$"5783 5902 547A 9FB4 A202 A0A6 F380 FF02"            /* WƒY.TzŸ´¢. ¦ó€ÿ. */
+	$"E192 A3B0 A203 A094 6D56 8359 0255 759D"            /* á’£°¢. ”mVƒY.Uu� */
+	$"B5A0 019B D381 FF02 B495 A1AF A006 9D90"            /* µ .›Ó�ÿ.´•¡¯ .�� */
+	$"6957 5959 0080 5902 546D 9BB1 9E00 9F80"            /* iWYY.€Y.Tm›±ž.Ÿ€ */
+	$"A002 9CAF FD80 FF02 EF93 9DAF 9E06 9B8C"            /*  .œ¯ý€ÿ.ï“�¯ž.›Œ */
+	$"6657 5959 0080 5902 5568 97B0 9D07 9F95"            /* fWYY.€Y.Uh—°�.Ÿ• */
+	$"8A89 8B98 9CE2 81FF 02C3 8F9E AE9D 0699"            /* Š‰‹˜œâ�ÿ.Ã�ž®�.™ */
+	$"8861 5759 5900 8059 0256 6494 AF9C 089D"            /* ˆaWYY.€Y.Vd”¯œ.� */
+	$"8C9E D0DD C793 8CBC 81FF 02F7 9899 AE9C"            /* ŒžÐÝÇ“Œ¼�ÿ.÷˜™®œ */
+	$"0697 855F 5859 5900 8059 0257 5E91 AF9B"            /* .—…_XYY.€Y.W^‘¯› */
+	$"0195 B781 FF03 F69B 96ED 81FF 02CE 8B9C"            /* .•·�ÿ.ö›–í�ÿ.΋œ */
+	$"AD9B 0D95 815D 5859 5900 0059 5957 5B8C"            /* ­›.•�]XYY..YYW[Œ */
+	$"98AD 9903 9889 9AD8 81FF 02E0 89C4 81FF"            /* ˜­™.˜‰šØ�ÿ.à‰Ä�ÿ */
+	$"02FD 9E93 AD99 0D93 7C5A 5859 5900 0059"            /* .ýž“­™.“|ZXYY..Y */
+	$"5958 5987 96AC 970C 9889 D3CE 88A1 E8FF"            /* YXY‡–¬—.˜‰ÓΈ¡èÿ */
+	$"FFF9 9B9D F481 FF02 D788 98AC 9702 9079"            /* ÿù›�ô�ÿ.׈˜¬—.�y */
+	$"5A80 5901 0000 8059 0255 8395 AB96 0D97"            /* Z€Y...€Y.Uƒ•«–.— */
+	$"8DA4 FFFF F6B2 84B4 F6FB A28E CC82 FF02"            /* �¤ÿÿö²„´öû¢ŽÌ‚ÿ. */
+	$"A28F 97AB 9601 8E75 8159 0100 0080 5902"            /* ¢�—«–.Žu�Y...€Y. */
+	$"547F 94AB 9502 9688 E481 FF07 E99E 8CBC"            /* T.”«•.–ˆä�ÿ.鞌¼ */
+	$"9991 A2F8 81FF 02DD 8896 AA95 0394 8D71"            /* ™‘¢ø�ÿ.݈–ª•.”�q */
+	$"5880 5901 0000 8059 0255 7993 AA94 0295"            /* X€Y...€Y.Uy“ª”.• */
+	$"87B4 84FF 05D4 8C93 948F D182 FF02 A68C"            /* ‡´„ÿ.ÔŒ“”�Ñ‚ÿ.¦Œ */
+	$"95A9 9403 938A 6D57 8059 0700 0059 595A"            /* •©”.“ŠmW€Y...YYZ */
+	$"5374 91AA 9302 908C F284 FF06 DD92 9293"            /* St‘ª“.�Œò„ÿ.Ý’’“ */
+	$"8FA4 FB81 FF01 E086 AA93 0391 876A 5780"            /* �¤û�ÿ.à†ª“.‘‡jW€ */
+	$"5907 0000 5959 5A53 6F8F A991 0292 87CA"            /* Y...YYZSo�©‘.’‡Ê */
+	$"84FF 02F8 A18D 8091 018D D782 FF02 A788"            /* „ÿ.ø¡�€‘.�ׂÿ.§ˆ */
+	$"92A8 9103 8F84 6757 8059 0100 0080 5902"            /* ’¨‘.�„gW€Y...€Y. */
+	$"556B 8DA9 9002 8E85 DB84 FF01 C78A 8190"            /* Uk�©�.Ž…Û„ÿ.ÇŠ�� */
+	$"028B A8FE 81FF 01E2 84A9 9003 8E82 6357"            /* .‹¨þ�ÿ.â„©�.Ž‚cW */
+	$"8059 0100 0080 5902 5466 8CA8 9005 9186"            /* €Y...€Y.TfŒ¨�.‘† */
+	$"AB85 A6EE 81FF 02EE 958E 8190 028F 8CDC"            /* «…¦î�ÿ.î•Ž��.�ŒÜ */
+	$"82FF 02AA 8591 A790 038D 7F62 5880 5901"            /* ‚ÿ.ª…‘§�.�.bX€Y. */
+	$"0000 8059 0254 618A A78E 0C8F 84A5 FFF0"            /* ..€Y.TaŠ§Ž.�„¥ÿð */
+	$"A480 BBF9 FFFF B688 838E 0189 A982 FF01"            /* ¤€»ùÿÿ¶ˆƒŽ.‰©‚ÿ. */
+	$"E583 A88E 038B 7C5F 5880 5901 0000 8059"            /* 僨Ž.‹|_X€Y...€Y */
+	$"0256 5F87 A78D 028C 83E8 80FF 06DF 9087"            /* .V_‡§�.Œƒè€ÿ.ß�‡ */
+	$"D4E0 8C8C 838D 028C 8ADE 82FF 02AB 838E"            /* ÔàŒŒƒ�.ŒŠÞ‚ÿ.«ƒŽ */
+	$"A68D 038A 7A5D 5880 5901 0000 8059 0257"            /* ¦�.Šz]X€Y...€Y.W */
+	$"5C84 A68C 028D 7EB7 83FF 03C9 8B8E 8B85"            /* \„¦Œ.�~·ƒÿ.É‹Ž‹… */
+	$"8C01 87AA 82FF 01E6 82A7 8C03 8877 5C58"            /* Œ.‡ª‚ÿ.悧Œ.ˆw\X */
+	$"8059 0100 0080 5902 5757 81A6 8A02 878A"            /* €Y...€Y.WW�¦Š.‡Š */
+	$"F584 FF01 CB83 868A 0289 88E0 82FF 02A8"            /* õ„ÿ.˃†Š.‰ˆà‚ÿ.¨ */
+	$"808B A58A 0386 735B 5880 5901 0000 8059"            /* €‹¥Š.†s[X€Y...€Y */
+	$"0258 557F A58A 028B 7BC9 84FF 02F6 9987"            /* .XU.¥Š.‹{É„ÿ.ö™‡ */
+	$"878A 0184 AB82 FF01 E580 A68A 0285 715A"            /* ‡Š.„«‚ÿ.倦Š.…qZ */
+	$"8159 0100 0081 5902 577B 88A3 8902 8A81"            /* �Y...�Y.W{ˆ£‰.Š� */
+	$"9685 FF01 BF82 8889 0288 87E0 82FF 02A7"            /* –…ÿ.¿‚ˆ‰.ˆ‡à‚ÿ.§ */
+	$"7F8A A489 0183 6F82 5901 0000 8159 0254"            /* .Š¤‰.ƒo‚Y...�Y.T */
+	$"7787 A488 017A DC84 FF02 EA8C 8689 8801"            /* w‡¤ˆ.zÜ„ÿ.ꌆ‰ˆ. */
+	$"82A9 82FF 01E3 7EA4 8802 8781 6C82 5901"            /* ‚©‚ÿ.ã~¤ˆ.‡�l‚Y. */
+	$"0000 8159 0151 7497 860E 8784 8686 8486"            /* ..�Y.Qt—†.‡„††„† */
+	$"8684 8685 8486 877B A685 FF11 AD7D 8685"            /* †„†…„†‡{¦…ÿ.­}†… */
+	$"8486 8584 8784 8487 8485 8783 83DF 82FF"            /* „†…„‡„„‡„…‡ƒƒß‚ÿ */
+	$"0FA4 7D87 8584 8785 8487 8485 8784 8586"            /* .¤}‡…„‡…„‡„…‡„…† */
+	$"8596 8602 7F69 5881 5901 0000 8059 035A"            /* …–†..iX�Y...€Y.Z */
+	$"5170 8496 850E 8182 7F7F 827F 8082 7E81"            /* Qp„–….�‚..‚.€‚~� */
+	$"8280 837E EC84 FF12 DB7E 817F 8082 7E81"            /* ‚€ƒ~ì„ÿ.Û~�.€‚~� */
+	$"827E 8182 7E82 817E 827B A682 FF10 E07B"            /* ‚~�‚~‚�~‚{¦‚ÿ.à{ */
+	$"8380 827E 8181 7E82 817E 8280 7F81 8494"            /* ƒ€‚~��~‚�~‚€.�„” */
+	$"8503 847D 6758 8159 0100 0080 5903 5A53"            /* ….„}gX�Y...€Y.ZS */
+	$"6E84 9585 0E82 90FB BCAC FFA4 B9FF 9BD3"            /* n„•….‚�û¼¬ÿ¤¹ÿ›Ó */
+	$"FC97 7BB9 84FF 14FC 91AA FFA8 BFFF 92D1"            /* ü—{¹„ÿ.ü‘ªÿ¨¿ÿ’Ñ */
+	$"FB92 E5ED 87F4 DC95 FFCB 73DF 82FF 0FA0"            /* û’åí‡ôÜ•ÿËsß‚ÿ.  */
+	$"79DC F889 E5ED 90F6 D88F FFC7 AAC2 7D94"            /* yÜø‰åí�öØ�ÿǪÂ}” */
+	$"8503 847C 6558 8159 0100 0080 5903 5A52"            /* ….„|eX�Y...€Y.ZR */
+	$"6983 9584 0E81 92FF BCAA FFC4 D2FF 96D4"            /* iƒ•„.�’ÿ¼ªÿÄÒÿ–Ô */
+	$"FF9A 82F8 84FF 14C6 78CE FFA6 BFFF B6E4"            /* ÿš‚ø„ÿ.ÆxÎÿ¦¿ÿ¶ä */
+	$"FF8D E8F9 AFFE DE91 FFE3 899E 82FF 0FDB"            /* ÿ�èù¯þÞ‘ÿ㉞‚ÿ.Û */
+	$"74E2 FFB1 F3F0 8AFA E9B4 FFC8 A6C7 7C94"            /* tâÿ±óðŠúé´ÿȦÇ|” */
+	$"8403 8379 6258 8159 0100 0080 5903 5A51"            /* „.ƒybX�Y...€Y.ZQ */
+	$"6581 9582 047F 90FF D5C8 81FF 04BB E5F9"            /* e�•‚..�ÿÕÈ�ÿ.»åù */
+	$"86CA 84FF 06F2 82D6 FFFF C6D6 80FF 02FC"            /* †Ê„ÿ.ò‚ÖÿÿÆÖ€ÿ.ü */
+	$"B5EF 80FF 06E9 B8FF FFFA 8AD6 82FF 0196"            /* µï€ÿ.é¸ÿÿúŠÖ‚ÿ.– */
+	$"C680 FF02 F4B4 FA80 FF03 DCC9 C57A 9482"            /* Æ€ÿ.ô´ú€ÿ.ÜÉÅz”‚ */
+	$"0381 7761 5881 5901 0000 8059 035A 5262"            /* .�waX�Y...€Y.ZRb */
+	$"7F95 8102 7E8F FA85 FF01 B190 85FF 01AC"            /* .•�.~�ú…ÿ.±�…ÿ.¬ */
+	$"9A90 FF01 C494 82FF 02D5 8DF9 87FF 01BF"            /* š�ÿ.Ä”‚ÿ.Õ�ù‡ÿ.¿ */
+	$"7994 8103 8075 5F58 8159 0100 0081 5902"            /* y”�.€u_X�Y...�Y. */
+	$"5461 7D95 8002 7D8E FA84 FF02 E779 DD84"            /* Ta}•€.}Žú„ÿ.çyÝ„ */
+	$"FF02 E47C E690 FF02 FC8A D281 FF02 FC8C"            /* ÿ.ä|æ�ÿ.üŠÒ�ÿ.üŒ */
+	$"C787 FF01 BF77 9480 037E 725E 5881 5901"            /* LJÿ.¿w”€.~r^X�Y. */
+	$"0000 8159 0254 5D7C 957F 027C 8EFA 84FF"            /* ..�Y.T]|•..|Žú„ÿ */
+	$"019C A285 FF01 97AD 92FF 01C7 8F80 FF04"            /* .œ¢…ÿ.—­’ÿ.Ç�€ÿ. */
+	$"FBC0 748B F986 FF01 BE76 947F 037D 715C"            /* ûÀt‹ù†ÿ.¾v”..}q\ */
+	$"5881 5901 0000 8159 0254 597B 957F 027C"            /* X�Y...�Y.TY{•..| */
+	$"8EFA 83FF 02D7 7BEF 84FF 02D1 7EF4 92FF"            /* Žúƒÿ.×{ï„ÿ.Ñ~ô’ÿ */
+	$"09FE 8CC9 F8CB 8C64 9F83 C386 FF01 BE76"            /* ÆþŒÉøËŒdŸƒÃ†ÿ.¾v */
+	$"947F 037C 6F5B 5881 5901 0000 8159 0355"            /* ”..|o[X�Y...�Y.U */
+	$"5779 7E94 7D02 7A8C FA82 FF02 FD8A B884"            /* Wy~”}.zŒú‚ÿ.ýŠ¸„ */
+	$"FF02 FA86 C094 FF09 CF74 7C64 7FCB FFC0"            /* ÿ.ú†À”ÿÆÏt|d.ËÿÀ */
+	$"80F7 85FF 01BD 7494 7D02 7A6D 5B82 5901"            /* €÷…ÿ.½t”}.zm[‚Y. */
+	$"0000 8159 0256 5677 957C 0279 8BFA 82FF"            /* ..�Y.VVw•|.y‹ú‚ÿ */
+	$"02C3 82FB 84FF 02BB 86FE 95FF 088C 99D5"            /* .Âû„ÿ.»†þ•ÿ.Œ™Õ */
+	$"FCFF FFFA 7FBC 85FF 01BD 7394 7C02 796B"            /* üÿÿú.¼…ÿ.½s”|.yk */
+	$"5A82 5901 0000 8159 0257 5575 957B 0277"            /* Z‚Y...�Y.WUu•{.w */
+	$"8BFA 81FF 02F4 7DCE 84FF 02EE 7BD6 96FF"            /* ‹ú�ÿ.ô}΄ÿ.î{Ö–ÿ */
+	$"01D0 A782 FF02 C47B F484 FF01 BC72 947B"            /* .Ч‚ÿ.Ä{ô„ÿ.¼r”{ */
+	$"0178 6983 5901 0000 8159 0258 5272 957A"            /* .xiƒY...�Y.XRr•z */
+	$"0877 8AE8 EEEC ECF2 AA91 85FF 02A8 92F2"            /* .wŠèîììòª‘…ÿ.¨’ò */
+	$"95EC 03ED ED93 DC81 FF03 FD83 B2F2 82EC"            /* •ì.íí“Ü�ÿ.ýƒ²ò‚ì */
+	$"02F3 B573 947A 0176 6783 5901 0000 8159"            /* .óµs”z.vgƒY...�Y */
+	$"0258 5070 9679 007A 817F 027E 71E3 84FF"            /* .XPp–y.z�..~qã„ÿ */
+	$"03DF 797F 8096 7F02 8078 A382 FF02 C970"            /* .ßy.€–..€x£‚ÿ.Ép */
+	$"8083 7F00 7D95 7902 7565 5882 5901 0000"            /* €ƒ..}•y.ueX‚Y... */
+	$"8159 0258 4F6F 9779 8077 0278 69AB 85FF"            /* �Y.XOo—y€w.xi«…ÿ */
+	$"029B 7378 9977 0178 DF81 FF02 B468 7583"            /* .›sx™w.xß�ÿ.´huƒ */
+	$"7700 7895 7902 7464 5882 5901 0000 8259"            /* w.x•y.tdX‚Y...‚Y */
+	$"0150 6D9A 7802 747A F384 FF02 CD72 779A"            /* .Pmšx.tzó„ÿ.Írwš */
+	$"7808 71A0 FFFF D98C 8FC6 6D9C 7801 7363"            /* x.q ÿÿÙŒ�Æmœx.sc */
+	$"8359 0100 0082 5901 516B 9A77 016B C484"            /* ƒY...‚Y.Qkšw.kÄ„ */
+	$"FF02 F68A 729B 770A 7677 9B8A 80BD FDFF"            /* ÿ.öŠr›wÂvw›Š€½ýÿ */
+	$"9C6A 789A 7702 7261 5882 5901 0000 8159"            /* œjxšw.raX‚Y...�Y */
+	$"035A 4F68 7598 7602 737B F184 FF01 B96E"            /* .ZOhu˜v.s{ñ„ÿ.¹n */
+	$"9D76 0371 85D7 FB80 FF02 F076 719A 7602"            /* �v.q…×û€ÿ.ðvqšv. */
+	$"7060 5882 5901 0000 8159 035A 4E66 7498"            /* p`X‚Y...�Y.ZNft˜ */
+	$"7504 7380 77C3 FE81 FF02 E97B 729D 7502"            /* u.s€wÃþ�ÿ.é{r�u. */
+	$"727F EF82 FF01 CD66 9A75 026F 5E58 8259"            /* r.ï‚ÿ.Ífšu.o^X‚Y */
+	$"0100 0081 5903 5A4D 6473 9774 0672 76EE"            /* ...�Y.ZMds—t.rvî */
+	$"CC73 83DA 80FF 01A4 6C9F 7401 6CBE 83FF"            /* ÌsƒÚ€ÿ.¤lŸt.l¾ƒÿ */
+	$"02A5 6575 9874 026D 5C58 8259 0100 0081"            /* .¥eu˜t.m\X‚Y...� */
+	$"5902 5A4D 6298 730B 6F82 FAFF F9AD 6A97"            /* Y.ZMb˜s.o‚úÿù­j— */
+	$"F1DC 7172 9F73 016D 9283 FF03 F981 6B74"            /* ñÜqrŸs.m’ƒÿ.ù�kt */
+	$"9773 026C 5B58 8259 0100 0081 5902 5A4D"            /* —s.l[X‚Y...�Y.ZM */
+	$"6098 7301 6C94 81FF 04EC 957B 8470 A073"            /* `˜s.l”�ÿ.ì•{„p s */
+	$"0271 75E7 83FF 02DD 6972 9773 026B 5C58"            /* .quçƒÿ.Ýir—s.k\X */
+	$"8259 0100 0081 5902 5A50 5F98 7201 69A8"            /* ‚Y...�Y.ZP_˜r.i¨ */
+	$"83FF 019B 69A2 7201 6ABF 84FF 02AF 6473"            /* ƒÿ.›i¢r.j¿„ÿ.¯ds */
+	$"9672 026A 5B58 8259 0100 0081 5903 5A51"            /* –r.j[X‚Y...�Y.ZQ */
+	$"5D70 9771 0167 BD81 FF02 F6A1 6FA3 7101"            /* ]p—q.g½�ÿ.ö¡o£q. */
+	$"6B94 84FF 02F7 7B6D 9671 0169 5A83 5901"            /* k”„ÿ.÷{m–q.iZƒY. */
+	$"0000 8159 035A 505B 6F97 7101 69D5 80FF"            /* ..�Y.ZP[o—q.iÕ€ÿ */
+	$"03E8 8B68 70A3 7102 6F74 E984 FF02 BC65"            /* .è‹hp£q.oté„ÿ.¼e */
+	$"7294 7102 7067 5883 5901 0000 8159 035A"            /* r”q.pgXƒY...�Y.Z */
+	$"5059 6F96 7007 6F6F E7FF FFD4 7A69 A670"            /* PYo–p.ooçÿÿÔzi¦p */
+	$"0168 BD84 FF02 EC71 6E94 7002 6F67 5883"            /* .h½„ÿ.ìqn”p.ogXƒ */
+	$"5901 0000 8159 035A 5058 6E96 6F06 6C79"            /* Y...�Y.ZPXn–o.ly */
+	$"F7FF BD6E 6BA7 6F02 6A8B FD83 FF02 FC83"            /* ÷ÿ½nk§o.j‹ýƒÿ.üƒ */
+	$"6B94 6F02 6E66 5783 5901 0000 8159 035A"            /* k”o.nfWƒY...�Y.Z */
+	$"5056 6D96 6E05 688E FBA5 676C A86E 026D"            /* PVm–n.hŽû¥gl¨n.m */
+	$"6AD0 83FF 02F5 7D6B 946E 026D 6456 8359"            /* jЃÿ.õ}k”n.mdVƒY */
+	$"0100 0081 5903 5A4F 556C 966D 0468 9294"            /* ...�Y.ZOUl–m.h’” */
+	$"656C AA6D 0268 87F8 82FF 01BC 6995 6D02"            /* elªm.h‡ø‚ÿ.¼i•m. */
+	$"6C63 5683 5901 0000 8159 035A 5054 6C97"            /* lcVƒY...�Y.ZPTl— */
+	$"6D01 6C68 AD6D 0866 9EF7 FFFF F3B1 6C6B"            /* m.lh­m.fž÷ÿÿó±lk */
+	$"956D 026C 6256 8359 0100 0081 5903 5A50"            /* •m.lbVƒY...�Y.ZP */
+	$"546C CA6D 0667 81A6 9D7A 666C 966D 026C"            /* TlÊm.g�¦�zfl–m.l */
+	$"6256 8359 0100 0081 5903 5A51 536C CB6D"            /* bVƒY...�Y.ZQSlËm */
+	$"0369 6565 6998 6D02 6C62 5783 5901 0000"            /* .ieei˜m.lbWƒY... */
+	$"8159 035A 5152 6AEA 6C02 6B61 5783 5901"            /* �Y.ZQRjêl.kaWƒY. */
+	$"0000 8159 035A 5252 6AEA 6C02 6B61 5783"            /* ..�Y.ZRRjêl.kaWƒ */
+	$"5901 0000 8159 035A 5252 6AEA 6C02 6B61"            /* Y...�Y.ZRRjêl.ka */
+	$"5783 5901 0000 8159 035A 5352 6AEA 6C02"            /* WƒY...�Y.ZSRjêl. */
+	$"6B61 5783 5900 0082 5903 5A54 5168 EA6B"            /* kaWƒY..‚Y.ZTQhêk */
+	$"0269 5E56 8359 0000 8359 0257 4D5E EA63"            /* .i^VƒY..ƒY.WM^êc */
+	$"0260 5756 8359 0100 0082 5902 5A55 53EA"            /* .`WVƒY...‚Y.ZUSê */
+	$"5601 5556 8459 0100 00FB 5901 0000 FB59"            /* V.UV„Y...ûY...ûY */
+	$"0100 00FB 5901 0000 FB59 0100 00FA 5981"            /* ...ûY...ûY...úY� */
+	$"00F9 5982 00F7 5983 00F6 5986 00F3 59FF"            /* .ùY‚.÷Yƒ.öY†.óYÿ */
+	$"00FF 0000 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ...ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00DF 009F 7CD7 00A6 7CD3"            /* .ÿ.ÿ.ÿ.ß.Ÿ|×.¦|Ó */
+	$"0001 7C7C 8000 9D7B 847C D000 037C 7C00"            /* ..||€.�{„|Ð..||. */
+	$"7C9F 7F01 7B7B 837C D000 027B 88A5 9EB0"            /* |Ÿ..{{ƒ|Ð..{ˆ¥ž° */
+	$"03AC 9D81 7B83 7CCD 0004 7C00 81B3 D09E"            /* .¬��{ƒ|Í..|.�³Ðž */
+	$"D302 D0C3 A184 7CCD 0004 7C00 8FCA D79F"            /* Ó.Ðá„|Í..|.�Êן */
+	$"D803 CEB4 837A 827C CD00 037C 0095 CEA0"            /* Ø.δƒz‚|Í..|.•Î  */
+	$"D803 D1B7 847A 827C CC00 047C 7C78 9BD0"            /* Ø.Ñ·„z‚|Ì..||x›Ð */
+	$"A0D7 03D1 B884 7A83 7CCB 0004 7C7C 79A8"            /*  ×.Ѹ„zƒ|Ë..||y¨ */
+	$"D3A0 D703 D2BC 867A B87C 9500 057C 7C00"            /* Ó ×.Ò¼†z¸|•..||. */
+	$"81BD D5A0 D603 D3C3 9278 BA7C 9200 067C"            /* �½Õ Ö.ÓÃ’xº|’..| */
+	$"7C00 799D CED5 A0D6 04D4 CBAC 7D79 BA7C"            /* |.y�ÎÕ Ö.Ôˬ}yº| */
+	$"9000 067C 7C00 7B97 C5D3 A2D5 03D1 C4A3"            /* �..||.{—ÅÓ¢Õ.ÑÄ£ */
+	$"8280 7AB4 7B03 007B 7C7C 8E00 077C 7C00"            /* ‚€z´{..{||Ž..||. */
+	$"81A4 C8D2 D4A2 D505 D4D0 C8B7 A69F B19E"            /* �¤ÈÒÔ¢Õ.ÔÐÈ·¦Ÿ±ž */
+	$"079F 9F9E 9D94 8100 7C8D 0007 7C7C 0081"            /* .ŸŸž�”�.|�..||.� */
+	$"ADCD D3D3 A4D4 03D3 D2D0 CE80 CCB2 CB03"            /* ­ÍÓÓ¤Ô.ÓÒÐ΀̲Ë. */
+	$"C7B9 9500 807C 8900 817C 037A 98C6 CDE2"            /* ǹ•.€|‰.�|.z˜ÆÍâ */
+	$"CE03 CCBE 9B7A 827C 8600 017C 7C80 0002"            /* Î.̾›z‚|†..||€.. */
+	$"7697 B181 B403 B5B5 B4B4 9EB5 01B4 B4B6"            /* v—±�´.µµ´´žµ.´´¶ */
+	$"B506 B4B4 B3AA 9177 7980 0001 7C7C 8400"            /* µ.´´³ª‘wy€..||„. */
+	$"097C 0078 7D87 8B8B 8D94 95E2 960A 9592"            /* Æ|.x}‡‹‹�”•â–•’ */
+	$"8E8C 8B8B 867D 007C 7C82 0009 7C00 7892"            /* ŽŒ‹‹†}.||‚.Æ|.x’ */
+	$"B5C1 C4C5 C6C6 81C7 03C6 C6C7 C79E C601"            /* µÁÄÅÆÆ�Ç.ÆÆÇÇžÆ. */
+	$"C7C7 82C6 01C7 C7AC C683 C70A C6C6 C4C3"            /* ÇÇ‚Æ.ÇǬƃÇÂÆÆÄà */
+	$"C3BD AB8C 7A7C 7C82 0005 7893 C5CE CFD0"            /* ý«Œz||‚..x“ÅÎÏÐ */
+	$"E9CF 08D0 D0CF CEC9 B58B 007C 8000 047C"            /* éÏ.ÐÐÏÎɵ‹.|€..| */
+	$"0080 B9CE F0D0 0CCF C5A7 7E00 7C00 007C"            /* .€¹ÎðÐ.Ïŧ~.|..| */
+	$"008F C5CE B3CF 03D0 CDCF D0B7 CF0A C9B2"            /* .�ÅγÏ.ÐÍÏзÏÂɲ */
+	$"8600 7C00 007C 7894 C6B3 CF05 D0CB BEBA"            /* †.|..|x”ƳÏ.Ð˾º */
+	$"CCD0 B6CF 0ACA B487 007C 007C 7C00 8FC4"            /* ÌжÏÂÊ´‡.|.||.�Ä */
+	$"B4CE 05C9 F2ED B9CC CFB5 CE0B C8B1 8400"            /* ´Î.Éòí¹ÌϵÎ.ȱ„. */
+	$"7C00 7C7C 0089 C0CC B3CD 05CC F3FF E7B9"            /* |.||.‰À̳Í.Ìóÿç¹ */
+	$"CEB5 CD0B C5AC 817B 7C00 7C7C 0085 BCCB"            /* εÍ.Ŭ�{|.||.…¼Ë */
+	$"B3CC 06C9 EAFF FFD8 BDCE B4CC 0BC4 A77D"            /* ³Ì.ÉêÿÿؽδÌ.ħ} */
+	$"7B7C 007C 7C00 81B6 CAB3 CC01 C9DC 80FF"            /* {|.||.�¶Ê³Ì.ÉÜ€ÿ */
+	$"02C6 C4CD B2CC 0DCB C1A3 7D7B 7C00 7C7C"            /* .ÆÄͲÌ.ËÁ£}{|.|| */
+	$"7B7D B1C9 CBB2 CA07 C9CF FBFF FFF1 BACB"            /* {}±É˲Ê.ÉÏûÿÿñºË */
+	$"B2CA 03C9 BE9D 7B83 7C02 7BAB C8B4 CA01"            /* ²Ê.ɾ�{ƒ|.{«È´Ê. */
+	$"C8ED 80FF 02D9 BCCB B1CA 03C9 BC98 7A83"            /* Èí€ÿ.ټ˱Ê.ɼ˜zƒ */
+	$"7C02 7AA5 C6B4 C901 C6DA 80FF 03FD C1C4"            /* |.z¥Æ´É.ÆÚ€ÿ.ýÁÄ */
+	$"CAB0 C903 C7B9 957A 837C 0279 9FC4 B4C8"            /* Ê°É.ǹ•zƒ|.yŸÄ´È */
+	$"02C7 CAF7 80FF 02E8 B8C9 B0C8 03C5 B68F"            /* .ÇÊ÷€ÿ.è¸É°È.Ŷ� */
+	$"7A83 7C02 799A C2B5 C701 C4E4 81FF 02CA"            /* zƒ|.yšÂµÇ.Ää�ÿ.Ê */
+	$"BFC8 AFC7 06C4 B38B 7A7C 7C00 807C 0278"            /* ¿È¯Ç.ij‹z||.€|.x */
+	$"93C0 B1C6 00C7 80C8 02C4 CFFD 80FF 01F2"            /* “À±Æ.Ç€È.ÄÏý€ÿ.ò */
+	$"B8B0 C606 C2AF 897A 7C7C 0080 7C02 798F"            /* ¸°Æ.¯‰z||.€|.y� */
+	$"BEB0 C607 C8C0 B4B2 B6C3 C6ED 81FF 02D4"            /* ¾°Æ.ÈÀ´²¶ÃÆí�ÿ.Ô */
+	$"BBC7 AEC6 06C1 AC84 7A7C 7C00 807C 0279"            /* »Ç®Æ.Á¬„z||.€|.y */
+	$"8BBB AFC5 08C6 B6BA DCE5 D5B3 BAD8 81FF"            /* ‹»¯Å.ƶºÜåÕ³ºØ�ÿ */
+	$"02F9 BBC4 AEC5 06C0 A982 7B7C 7C00 807C"            /* .ù»Ä®Å.À©‚{||.€| */
+	$"027A 85B7 AEC4 02C5 C1CE 81FF 03F7 BAC1"            /* .z…·®Ä.ÅÁÎ�ÿ.÷ºÁ */
+	$"F481 FF02 DCB7 C6AD C40D BDA5 817B 7C7C"            /* ô�ÿ.Ü·Æ­Ä.½¥�{|| */
+	$"0000 7C7C 7A83 B4C3 ADC4 03C3 B3BE E981"            /* ..||zƒ´Ã­Ä.ó¾é� */
+	$"FF02 E8B6 DC81 FF02 FDBE C0AD C40D BCA1"            /* ÿ.è¶Ü�ÿ.ý¾À­Ä.¼¡ */
+	$"7E7B 7C7C 0000 7C7C 7B80 B0C2 ACC3 0CC4"            /* ~{||..||{€°Â¬Ã.Ä */
+	$"B5DD DAAE C4F2 FFFF FAC2 C5F8 81FF 02E2"            /* µÝÚ®ÄòÿÿúÂÅø�ÿ.â */
+	$"B5C4 ACC3 01B9 9D81 7C07 0000 7C7C 7B7C"            /* µÄ¬Ã.¹��|...||{| */
+	$"ABC0 ABC1 0DC2 BCC1 FFFF F7C7 ACD0 FBFC"            /* «À«Á.¼Áÿÿ÷ǬÐûü */
+	$"C7BC E082 FF02 C0BD C2AB C101 B79A 817C"            /* Ǽà‚ÿ.À½Â«Á.·š�| */
+	$"0100 0080 7C02 7BA7 BFAB C102 C2B2 EB81"            /* ...€|.{§¿«Á.²ë� */
+	$"FF07 EDB9 B3D7 C3BF C7FA 81FF 02E6 B3C2"            /* ÿ.í¹³×ÿÇú�ÿ.æ³Â */
+	$"AAC1 03C0 B595 7B80 7C01 0000 807C 027A"            /* ªÁ.Àµ•{€|...€|.z */
+	$"A3BE AAC0 02C1 B6CA 84FF 05DE B8C0 C0BD"            /* £¾ªÀ.Á¶Ê„ÿ.Þ¸ÀÀ½ */
+	$"E382 FF02 C2BA C1A9 C003 BFB2 927A 807C"            /* ã‚ÿ.ºÁ©À.¿²’z€| */
+	$"0100 0080 7C02 789D BCAA BF02 BEB3 F584"            /* ...€|.x�¼ª¿.¾³õ„ */
+	$"FF06 EBBF BEBF BDC9 FC81 FF02 E8B2 C0A9"            /* ÿ.뿾¿½Éü�ÿ.è²À© */
+	$"BF03 BEB0 8F7A 807C 0100 0080 7C02 7898"            /* ¿.¾°�z€|...€|.x˜ */
+	$"BAA9 BE02 BFB5 D984 FF02 FBC7 BC80 BE01"            /* º©¾.¿µÙ„ÿ.ûǼ€¾. */
+	$"BBE7 82FF 02C3 B7BF A8BE 03BC AD8B 7A80"            /* »ç‚ÿ.÷¿¨¾.¼­‹z€ */
+	$"7C01 0000 807C 0278 95B9 A9BD 02BC B3E9"            /* |...€|.x•¹©½.¼³é */
+	$"84FF 01DD B981 BD02 BACB FE81 FF02 EAB0"            /* „ÿ.ݹ�½.ºËþ�ÿ.ê° */
+	$"BEA8 BD03 BAAA 887A 807C 0100 0080 7C02"            /* ¾¨½.ºªˆz€|...€|. */
+	$"7890 B8A8 BD05 BEB2 C1AC C7F6 81FF 02F4"            /* x�¸¨½.¾²Á¬Çö�ÿ.ô */
+	$"C0BC 82BD 01BB EA82 FF02 C4B6 BEA7 BD03"            /* À¼‚½.»ê‚ÿ.Ķ¾§½. */
+	$"BAA8 867A 807C 0100 0080 7C02 788B B5A7"            /* º¨†z€|...€|.x‹µ§ */
+	$"BC0C BDB5 C1FF F2BD AAD5 FCFF FFD3 B983"            /* ¼.½µÁÿò½ªÕüÿÿÓ¹ƒ */
+	$"BC01 B9CC 82FF 02EB AFBD A7BC 03B8 A584"            /* ¼.¹Ì‚ÿ.믽§¼.¸¥„ */
+	$"7B80 7C01 0000 807C 0279 88B3 A8BC 01AE"            /* {€|...€|.yˆ³¨¼.® */
+	$"ED80 FF06 E5B1 B1E6 ECBB BB84 BC01 B9EB"            /* í€ÿ.å±±æì»»„¼.¹ë */
+	$"82FF 02C5 B4BD A6BC 03B7 A381 7B80 7C01"            /* ‚ÿ.Å´½¦¼.·£�{€|. */
+	$"0000 807C 027A 85B1 A6BB 02BC AFCC 82FF"            /* ..€|.z…±¦».¼¯Ì‚ÿ */
+	$"04FE D6AF BBBA 85BB 01B7 CC82 FF02 ECAE"            /* .þÖ¯»º…».·Ì‚ÿ.ì® */
+	$"BCA6 BB03 B5A0 807B 807C 0100 0080 7C03"            /* ¼¦».µ €{€|...€|. */
+	$"7A80 ADB9 A5BA 02B8 B0F7 84FF 01DE B486"            /* z€­¹¥º.¸°÷„ÿ.Þ´† */
+	$"BA02 B9B8 EB82 FF02 C3B2 BBA5 BA03 B39C"            /* º.¹¸ë‚ÿ.ò»¥º.³œ */
+	$"7F7B 807C 0100 0080 7C03 7B7E AAB7 A4B8"            /* .{€|...€|.{~ª·¤¸ */
+	$"02BA ABD8 84FF 02F9 C1B6 87B8 01B5 CC82"            /* .º«Ø„ÿ.ùÁ¶‡¸.µÌ‚ */
+	$"FF02 EBAC B9A5 B803 B199 7D7B 807C 0100"            /* ÿ.묹¥¸.±™}{€|.. */
+	$"0080 7C03 7B7D A7B6 A4B7 02B2 B7FE 84FF"            /* .€|.{}§¶¤·.²·þ„ÿ */
+	$"01D7 B388 B702 B6B6 EB82 FF02 C2B0 B8A4"            /* .׳ˆ·.¶¶ë‚ÿ.°¸¤ */
+	$"B701 AF96 827C 0100 0081 7C02 7BA3 B5A3"            /* ·.¯–‚|...�|.{£µ£ */
+	$"B602 B7A8 E584 FF02 F1B8 B589 B601 B3CA"            /* ¶.·¨å„ÿ.ñ¸µ‰¶.³Ê */
+	$"82FF 02EA AAB7 A4B6 01AD 9382 7C01 0000"            /* ‚ÿ.ꪷ¤¶.­“‚|... */
+	$"817C 0278 9FB4 97B5 0DB4 B5B6 B4B6 B5B4"            /* �|.xŸ´—µ.´µ¶´¶µ´ */
+	$"B6B5 B4B6 B6AD C085 FF11 CCB0 B6B5 B4B6"            /* ¶µ´¶¶­À…ÿ.Ì°¶µ´¶ */
+	$"B5B4 B6B5 B4B6 B4B5 B6B3 B4EB 82FF 0EC0"            /* µ´¶µ´¶´µ¶³´ë‚ÿ.À */
+	$"AFB6 B5B4 B6B4 B4B6 B4B5 B6B4 B5B6 97B5"            /* ¯¶µ´¶´´¶´µ¶´µ¶—µ */
+	$"01AB 9082 7C01 0000 817C 0278 9CB3 95B5"            /* .«�‚|...�|.xœ³•µ */
+	$"0FB6 AFA7 A9AA A7AA AAA7 ABA9 A7AC B1A9"            /* .¶¯§©ª§ªª§«©§¬±© */
+	$"F084 FF12 E9AA A6AA AAA7 ABA9 A7AB A8A8"            /* ð„ÿ.骦ªª§«©§«¨¨ */
+	$"ACA8 A8AB A7A5 C882 FF0F E8A8 B2A8 A8AB"            /* ¬¨¨«§¥È‚ÿ.訲¨¨« */
+	$"A8A8 ACA8 A9AC A7A9 AAAB 95B5 03B4 A98E"            /* ¨¨¬¨©¬§©ª«•µ.´©Ž */
+	$"7B81 7C01 0000 817C 0278 99B2 95B4 0EB3"            /* {�|...�|.x™²•´.³ */
+	$"B7F9 D2C7 FFC1 CEFF BCE1 FABB AACD 84FF"            /* ·ùÒÇÿÁÎÿ¼áú»ªÍ„ÿ */
+	$"14FD BAC6 FFC5 D3FF B7DF F9B7 EBF2 B0F6"            /* .ýºÆÿÅÓÿ·ßù·ëò°ö */
+	$"E6B9 FDDA A7EB 82FF 0FBD AAE6 F8B0 EBF1"            /* æ¹ýÚ§ë‚ÿ.½ªæø°ëñ */
+	$"B5F7 E3B4 FED9 C5D5 AF94 B403 B3A7 8B7B"            /* µ÷ã´þÙÅÕ¯”´.³§‹{ */
+	$"817C 0100 0081 7C02 7794 B195 B30E B1B9"            /* �|...�|.w”±•³.±¹ */
+	$"FFD2 C7FF D3DE FFBA E3FF BDAA F984 FF14"            /* ÿÒÇÿÓÞÿºãÿ½ªù„ÿ. */
+	$"DBA2 DAFF C4D4 FFCA EBFE B4EF FBC4 FEE9"            /* Û¢ÚÿÄÔÿÊëþ´ïûÄþé */
+	$"B6FF EAAB C082 FF0F E4A3 ECFF C5F6 F5B2"            /* ¶ÿê«À‚ÿ.ä£ìÿÅöõ² */
+	$"FBEF C8FF DAC4 DAAE 94B3 03B2 A589 7B81"            /* ûïÈÿÚÄÚ®”³.²¥‰{� */
+	$"7C01 0000 807C 037D 7690 AE95 B104 AFB7"            /* |...€|.}v�®•±.¯· */
+	$"FFE0 D681 FF04 CDEC FCAE D884 FF06 F7AC"            /* ÿàÖ�ÿ.Íìü®Ø„ÿ.÷¬ */
+	$"E0FF FFD4 E180 FF02 FDC9 F380 FF06 EFCA"            /* àÿÿÔá€ÿ.ýÉó€ÿ.ïÊ */
+	$"FFFF FAAE E582 FF01 B6DA 80FF 02F7 C7FB"            /* ÿÿú®å‚ÿ.¶Ú€ÿ.÷Çû */
+	$"80FF 03E5 D6D9 AC94 B103 B0A2 877B 817C"            /* €ÿ.åÖÙ¬”±.°¢‡{�| */
+	$"0100 0081 7C02 768D AC95 B002 AEB7 FB85"            /* ...�|.v�¬•°.®·û… */
+	$"FF01 CDB1 85FF 01C9 B890 FF01 D5B8 82FF"            /* ÿ.ͱ…ÿ.ɸ�ÿ.Õ¸‚ÿ */
+	$"02E0 B3FC 87FF 01D5 AA94 B003 AE9F 857B"            /* .à³ü‡ÿ.Õª”°.®Ÿ…{ */
+	$"817C 0100 0081 7C02 788A AB95 AF02 ADB6"            /* �|...�|.xŠ«•¯.­¶ */
+	$"FB84 FF02 F0A5 E584 FF02 EEA6 EC90 FF02"            /* û„ÿ.ð¥å„ÿ.î¦ì�ÿ. */
+	$"FCAE E281 FF02 FCB4 DB87 FF01 D5A9 94AF"            /* ü®â�ÿ.ü´Û‡ÿ.Õ©”¯ */
+	$"03AC 9D83 7B81 7C01 0000 817C 0278 86A9"            /* .¬�ƒ{�|...�|.x†© */
+	$"95AD 02AB B4FB 84FF 01BE BD85 FF01 BAC3"            /* •­.«´û„ÿ.¾½…ÿ.ºÃ */
+	$"92FF 01D6 B480 FF04 FCD8 A4B3 FB86 FF01"            /* ’ÿ.Ö´€ÿ.üؤ³û†ÿ. */
+	$"D4A7 94AD 03AB 9A81 7B81 7C01 0000 817C"            /* Ô§”­.«š�{�|...�| */
+	$"0278 83A7 95AC 02AA B3FB 83FF 02E5 A3F2"            /* .xƒ§•¬.ª³ûƒÿ.å£ò */
+	$"84FF 02E1 A5F6 92FF 09FD AEDC FBDE B595"            /* „ÿ.á¥ö’ÿÆý®ÜûÞµ• */
+	$"B6A9 D886 FF01 D3A6 94AC 03A9 9880 7B81"            /* ¶©Ø†ÿ.Ó¦”¬.©˜€{� */
+	$"7C01 0000 817C 0278 80A5 95AC 02AA B3FB"            /* |...�|.x€¥•¬.ª³û */
+	$"82FF 02FE B0CB 84FF 02FC ADD0 94FF 09DB"            /* ‚ÿ.þ°Ë„ÿ.ü­Ð”ÿÆÛ */
+	$"A1A8 95A2 D6FF D1AA FA85 FF01 D3A6 94AC"            /* ¡¨•¢ÖÿѪú…ÿ.Ó¦”¬ */
+	$"03A8 967F 7B81 7C01 0000 817C 0279 7FA3"            /* .¨–.{�|...�|.y.£ */
+	$"95AB 02A9 B2FB 82FF 02D7 A7FB 84FF 02D2"            /* •«.©²û‚ÿ.קû„ÿ.Ò */
+	$"AAFD 95FF 08AD B4DD FCFF FFFA A5D3 85FF"            /* ªý•ÿ.­´Ýüÿÿú¥Ó…ÿ */
+	$"01D3 A594 AB03 A694 7E7B 817C 0100 0081"            /* .Ó¥”«.¦”~{�|...� */
+	$"7C02 7A7D A095 A902 A7B1 FB81 FF02 F8A5"            /* |.z} •©.§±û�ÿ.ø¥ */
+	$"DA84 FF02 F4A4 E096 FF01 DCC2 82FF 02D3"            /* Ú„ÿ.ô¤à–ÿ.Ü‚ÿ.Ó */
+	$"A5F8 84FF 01D2 A394 A902 A491 7D82 7C01"            /* ¥ø„ÿ.Ò£”©.¤‘}‚|. */
+	$"0000 817C 027A 7A9E 95A8 08A6 B1EF F3F2"            /* ..�|.zzž•¨.¦±ïóò */
+	$"F2F6 C6B0 85FF 02C5 B4F5 95F2 03F3 F2B5"            /* òöÆ°…ÿ.Å´õ•ò.óòµ */
+	$"E881 FF03 FCA7 CCF6 82F2 02F7 CDA3 94A8"            /* è�ÿ.ü§Ìö‚ò.÷Í£”¨ */
+	$"01A3 8F83 7C01 0000 817C 027B 779C 96A7"            /* .£�ƒ|...�|.{wœ–§ */
+	$"00A8 82AB 019C E984 FF03 E9A6 AAAC 96AB"            /* .¨‚«.œé„ÿ.馪¬–« */
+	$"02AC A6C1 82FF 02D8 A0AC 83AB 00A9 95A7"            /* .¬¦Á‚ÿ.Ø ¬ƒ«.©•§ */
+	$"01A1 8D83 7C01 0000 817C 037B 7699 A595"            /* .¡�ƒ|...�|.{v™¥• */
+	$"A600 A580 A402 A599 C085 FF02 BCA1 A599"            /* ¦.¥€¤.¥™À…ÿ.¼¡¥™ */
+	$"A401 A5E9 81FF 02CB 96A3 83A4 00A5 95A6"            /* ¤.¥é�ÿ.Ë–£ƒ¤.¥•¦ */
+	$"029F 8A7B 827C 0100 0082 7C02 7596 A399"            /* .ŸŠ{‚|...‚|.u–£™ */
+	$"A402 A29F F584 FF01 DDA0 9BA4 09A0 BFFF"            /* ¤.¢Ÿõ„ÿ.Ý ›¤Æ ¿ÿ */
+	$"FFE6 ADAB D299 A59B A402 9D88 7B82 7C01"            /* ÿæ­«Ò™¥›¤.�ˆ{‚|. */
+	$"0000 827C 0276 94A2 98A3 02A4 98D1 84FF"            /* ..‚|.v”¢˜£.¤˜Ñ„ÿ */
+	$"02F9 AFA0 9CA3 09A4 B9A9 A0CB FCFF B599"            /* .ù¯ œ£Æ¤¹© Ëüÿµ™ */
+	$"A49A A302 9C87 7B82 7C01 0000 827C 0275"            /* ¤š£.œ‡{‚|...‚|.u */
+	$"92A2 98A3 02A1 A4F5 84FF 01CF 9E9D A303"            /* ’¢˜£.¡¤õ„ÿ.Ïž�£. */
+	$"A0A9 DEFB 80FF 02F3 9CA0 9AA3 029B 867B"            /*  ©Þû€ÿ.󜠚£.›†{ */
+	$"827C 0100 0081 7C03 7D74 8FA1 97A2 05A3"            /* ‚|...�|.}t�¡—¢.£ */
+	$"9FA0 9ED6 FE81 FF02 F0A6 A09D A202 A0A9"            /* Ÿ žÖþ�ÿ.ð¦ �¢. © */
+	$"F382 FF01 D893 9AA2 0299 837B 827C 0100"            /* ó‚ÿ.Ø“š¢.™ƒ{‚|.. */
+	$"0081 7C03 7D73 8D9F 97A0 069F 9FF1 D697"            /* .�|.}s�Ÿ— .ŸŸñÖ— */
+	$"A6E6 80FF 01C1 9B9F A001 9BD2 83FF 02BB"            /* ¦æ€ÿ.Á›Ÿ .›Òƒÿ.» */
+	$"94A1 98A0 0297 827B 827C 0100 0081 7C03"            /* ”¡˜ .—‚{‚|...�|. */
+	$"7D72 8A9E 979F 0B9D A6FB FFF9 BF91 B6F6"            /* }rŠž—Ÿ.�¦ûÿù¿‘¶ö */
+	$"E69E 9E9F 9F01 9BB4 83FF 03FA A199 A096"            /* æžžŸŸ.›´ƒÿ.ú¡™ – */
+	$"9F03 9E95 807B 827C 0100 0081 7C03 7D72"            /* Ÿ.ž•€{‚|...�|.}r */
+	$"889D 979E 0199 B281 FF04 EFAD 9EA9 9CA0"            /* ˆ�—ž.™²�ÿ.ï­ž©œ  */
+	$"9E02 9D9F EE83 FF01 E492 979E 039D 9480"            /* ž.�Ÿîƒÿ.ä’—ž.�”€ */
+	$"7B82 7C01 0000 817C 037D 7487 9B97 9D01"            /* {‚|...�|.}t‡›—�. */
+	$"96BF 82FF 02FE B697 A29D 0198 D184 FF02"            /* –¿‚ÿ.þ¶—¢�.˜Ñ„ÿ. */
+	$"C191 9E95 9D03 9C92 7F7B 827C 0100 0081"            /* Á‘ž•�.œ’.{‚|...� */
+	$"7C03 7D75 849A 979C 0194 CE81 FF02 F8BD"            /* |.}u„š—œ.”Î�ÿ.ø½ */
+	$"9BA3 9C01 98B4 84FF 02F8 9D99 959C 039B"            /* ›£œ.˜´„ÿ.ø�™•œ.› */
+	$"907E 7B82 7C01 0000 817C 037D 7482 9997"            /* �~{‚|...�|.}t‚™— */
+	$"9B01 94DF 80FF 03EE AD95 9AA3 9B02 9A9D"            /* ›.”߀ÿ.î­•š£›.š� */
+	$"EF84 FF02 CC91 9C94 9B03 9A8F 7C7B 827C"            /* ï„ÿ.Ì‘œ”›.š�|{‚| */
+	$"0100 0081 7C03 7D74 8098 979A 0697 ECFF"            /* ...�|.}t€˜—š.—ìÿ */
+	$"FFE0 A195 A69A 0195 D084 FF02 F098 9994"            /* ÿà¡•¦š.•Ð„ÿ.𘙔 */
+	$"9A02 998D 7B83 7C01 0000 817C 037D 737E"            /* š.™�{ƒ|...�|.}s~ */
+	$"9896 9A06 989F F9FF D099 97A7 9A02 96AD"            /* ˜–š.˜ŸùÿЙ—§š.–­ */
+	$"FD83 FF02 FCA6 9794 9A02 998D 7B83 7C01"            /* ýƒÿ.ü¦—”š.™�{ƒ|. */
+	$"0000 817C 037D 737D 9796 9905 95AD FCBE"            /* ..�|.}s}—–™.•­ü¾ */
+	$"9498 A999 0196 DD83 FF02 F7A3 9794 9902"            /* ”˜©™.–݃ÿ.÷£—”™. */
+	$"988C 7A83 7C01 0000 817C 037D 737B 9696"            /* ˜Œzƒ|...�|.}s{–– */
+	$"9803 95B0 B392 AB98 0294 AAF9 82FF 01CF"            /* ˜.•°³’«˜.”ªù‚ÿ.Ï */
+	$"9595 9802 978A 7A83 7C01 0000 817C 037D"            /* ••˜.—Šzƒ|...�|.} */
+	$"747B 9498 9700 94AD 9708 93B9 F9FF FFF6"            /* t{”˜—.”­—.“¹ùÿÿö */
+	$"C797 9695 9702 9688 7983 7C01 0000 817C"            /* Ç—–•—.–ˆyƒ|...�| */
+	$"037D 7479 93CA 9606 92A4 BEB8 9F91 9596"            /* .}ty“Ê–.’¤¾¸Ÿ‘•– */
+	$"9602 9588 7983 7C01 0000 817C 037D 7478"            /* –.•ˆyƒ|...�|.}tx */
+	$"93CB 9603 9390 9193 9896 0294 8779 837C"            /* “Ë–.“�‘“˜–.”‡yƒ| */
+	$"0100 0081 7C03 7D75 7892 EA95 0293 8679"            /* ...�|.}ux’ê•.“†y */
+	$"837C 0100 0081 7C03 7D75 7892 EA95 0293"            /* ƒ|...�|.}ux’ê•.“ */
+	$"8679 837C 0100 0081 7C03 7D76 7792 EA95"            /* †yƒ|...�|.}vw’ê• */
+	$"0293 8679 837C 0100 0081 7C03 7D76 7792"            /* .“†yƒ|...�|.}vw’ */
+	$"EA95 0293 8579 837C 0000 827C 037D 7776"            /* ê•.“…yƒ|..‚|.}wv */
+	$"8FEA 9402 9182 7883 7C00 0083 7C03 7A70"            /* �ê”.‘‚xƒ|..ƒ|.zp */
+	$"8288 E989 0285 7A79 837C 0100 0082 7C02"            /* ‚ˆé‰.…zyƒ|...‚|. */
+	$"7D78 76EA 7901 7779 847C 0100 00FB 7C01"            /* }xvêy.wy„|...û|. */
+	$"0000 FB7C 0100 00FB 7C01 0000 FB7C 0100"            /* ..û|...û|...û|.. */
+	$"00FA 7C81 00F9 7C82 00F7 7C83 00F6 7C86"            /* .ú|�.ù|‚.÷|ƒ.ö|† */
+	$"00F3 7CFF 00FF 0000 00FF 00FF 00FF 00FF"            /* .ó|ÿ.ÿ...ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 74D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.Ÿt× */
+	$"00A6 74D3 0001 7474 8000 9D73 8474 D000"            /* .¦tÓ..tt€.�s„tÐ. */
+	$"0374 7400 749E 7702 7673 7283 74D0 0003"            /* .tt.tžw.vsrƒtÐ.. */
+	$"7381 9FAB 9DAC 03A8 977A 7383 74CD 0004"            /* s�Ÿ«�¬.¨—zsƒtÍ.. */
+	$"7400 79AF CC9E CF03 CCBF 9B73 8374 CD00"            /* t.y¯ÌžÏ.Ì¿›sƒtÍ. */
+	$"0474 0088 C6D2 9FD3 03CA AF7C 7282 74CD"            /* .t.ˆÆÒŸÓ.ʯ|r‚tÍ */
+	$"0003 7400 8EC9 A0D3 03CC B27D 7282 74CC"            /* ..t.ŽÉ Ó.̲}r‚tÌ */
+	$"0004 7474 7094 CBA0 D203 CCB3 7C72 8374"            /* ..ttp”Ë Ò.̳|rƒt */
+	$"CB00 0474 7471 A1CE A0D1 03CC B67F 72B8"            /* Ë..ttq¡Î Ñ.̶.r¸ */
+	$"7495 0005 7474 0078 B7D0 A0D1 03CE BE8B"            /* t•..tt.x·Ð Ñ.ξ‹ */
+	$"70BA 7492 0006 7474 0070 96C9 CFA0 D004"            /* pºt’..tt.p–ÉÏ Ð. */
+	$"CFC6 A675 71BA 7490 0006 7474 0072 8FC0"            /* ÏƦuqºt�..tt.r�À */
+	$"CDA2 CF03 CBBF 9D7A B672 0473 0073 7474"            /* Í¢Ï.Ë¿�z¶r.s.stt */
+	$"8E00 0674 7400 799D C3CD A3CF 04CE CAC3"            /* Ž..tt.y�ÃÍ£Ï.ÎÊà */
+	$"B2A0 B598 0496 8D79 0074 8D00 0774 7400"            /* ² µ˜.–�y.t�..tt. */
+	$"79A8 C8CE CEA4 CF03 CECD CBC9 B5C7 03C3"            /* y¨ÈÎΤÏ.ÎÍËɵÇ.à */
+	$"B58F 0080 7489 0081 7403 7192 C1C8 E2C9"            /* µ�.€t‰.�t.q’ÁÈâÉ */
+	$"03C7 B995 7282 7486 0001 7474 8000 026E"            /* .ǹ•r‚t†..tt€..n */
+	$"91AC E3AF 04AE A58A 6F71 8000 0174 7484"            /* ‘¬ã¯.®¥Šoq€..tt„ */
+	$"0008 7400 7075 8085 8487 8E80 8FAA 9000"            /* ..t.pu€…„‡Ž€�ª�. */
+	$"8FB0 9080 8F09 8B87 8584 847F 7600 7474"            /* �°�€�Æ‹‡…„„.v.tt */
+	$"8200 0774 0070 8BAF BCBF C0E7 C109 C0BF"            /* ‚..t.p‹¯¼¿ÀçÁÆÀ¿ */
+	$"BEBE B8A6 8572 7474 8200 0370 8DC0 C9EE"            /* ¾¾¸¦…rtt‚..p�ÀÉî */
+	$"CA05 C9C4 B185 0074 8000 0474 0078 B4C8"            /* Ê.Éı….t€..t.x´È */
+	$"F0CA 0CC9 BFA1 7600 7400 0074 0088 BFC8"            /* ðÊ.É¿¡v.t..t.ˆ¿È */
+	$"B3C9 03CA C7C9 CAB7 C90A C3AD 7F00 7400"            /* ³É.ÊÇÉÊ·ÉÂí..t. */
+	$"0074 708C C0B3 C805 C9C3 B8B3 C4C9 B6C8"            /* .tpŒÀ³È.Éø³ÄÉ¶È */
+	$"0AC3 AE7F 0074 0074 7400 88BD B4C7 05C2"            /* Âî..t.tt.ˆ½´Ç. */
+	$"F1EC B2C4 C8B5 C70B C1AB 7C00 7400 7474"            /* ñì²ÄȵÇ.Á«|.t.tt */
+	$"0082 BAC6 B3C7 04C6 F2FF E6B3 B6C7 0BC0"            /* .‚ºÆ³Ç.Æòÿ泶Ç.À */
+	$"A67A 7374 0074 7400 7DB5 C5B3 C606 C3E7"            /* ¦zst.tt.}µÅ³Æ.Ãç */
+	$"FFFF D5B6 C8B4 C60B BDA1 7573 7400 7474"            /* ÿÿնȴÆ.½¡ust.tt */
+	$"0079 B0C4 B3C5 01C2 D880 FF02 C0BD C6B2"            /* .y°Ä³Å.ÂØ€ÿ.À½Æ² */
+	$"C50C C4BB 9D75 7374 0074 7473 75AA C2B3"            /* Å.Ä»�ust.ttsuªÂ³ */
+	$"C406 C3C9 FAFF FFF0 B3B3 C403 C3B8 9673"            /* Ä.ÃÉúÿÿð³³Ä.ø–s */
+	$"8474 01A5 C1B4 C301 C1EB 80FF 02D6 B4C5"            /* „t.¥Á´Ã.Áë€ÿ.Ö´Å */
+	$"B1C3 03C2 B591 7283 7402 719E BFB4 C201"            /* ±Ã.µ‘rƒt.qž¿´Â. */
+	$"BFD5 80FF 03FD BBBD C3B0 C203 C0B2 8E72"            /* ¿Õ€ÿ.ý»½Ã°Â.À²Žr */
+	$"8374 0270 99BD B4C1 02C0 C4F6 80FF 02E6"            /* ƒt.p™½´Á.ÀÄö€ÿ.æ */
+	$"B1C2 B0C1 03BE AF87 7283 7402 7193 BBB5"            /* ±Â°Á.¾¯‡rƒt.q“»µ */
+	$"C001 BCE1 81FF 02C6 B7C1 AFC0 06BD AC84"            /* À.¼á�ÿ.Æ·Á¯À.½¬„ */
+	$"7274 7400 8074 0270 8CB9 B1BF 00C0 80C1"            /* rtt.€t.pŒ¹±¿.À€Á */
+	$"02BD CAFD 80FF 01F1 B1B0 BF06 BBA9 8172"            /* .½Êý€ÿ.ñ±°¿.»©�r */
+	$"7474 0080 7402 7088 B7B0 BF07 C1B9 ACAB"            /* tt.€t.pˆ·°¿.Á¹¬« */
+	$"AEBC BEEB 81FF 02D1 B3C0 AEBF 06BA A67C"            /* ®¼¾ë�ÿ.ѳÀ®¿.º¦| */
+	$"7274 7400 8074 0271 83B4 AFBE 08BF AFB4"            /* rtt.€t.qƒ´¯¾.¿¯´ */
+	$"D9E3 D2AD B1D3 81FF 02F8 B4BC AEBE 06B8"            /* ÙãÒ­±Ó�ÿ.ø´¼®¾.¸ */
+	$"A27A 7374 7400 8074 0372 7DB1 BCAE BD01"            /* ¢zstt.€t.r}±¼®½. */
+	$"B9CA 81FF 03F6 B4B9 F381 FF02 D8AF BEAD"            /* ¹Ê�ÿ.ö´¹ó�ÿ.د¾­ */
+	$"BD0D B69F 7973 7474 0000 7474 727A ADBB"            /* ½.¶Ÿystt..ttrz­» */
+	$"ADBC 03BB ABB7 E681 FF02 E6AE D881 FF02"            /* ­¼.»«·æ�ÿ.æ®Ø�ÿ. */
+	$"FDB7 B8AD BC0D B49A 7673 7474 0000 7474"            /* ý·¸­¼.´švstt..tt */
+	$"7378 A9BA ACBB 0CBC ACDB D7A6 BDF0 FFFF"            /* sx©º¬».¼¬Ûצ½ðÿÿ */
+	$"FABA BEF7 81FF 02DF ACBC ACBB 01B2 9781"            /* úº¾÷�ÿ.߬¼¬».²—� */
+	$"7407 0000 7474 7374 A4B8 ABB9 0DBA B3BB"            /* t...ttst¤¸«¹.º³» */
+	$"FFFF F7C2 A4CB FAFC C0B4 DC82 FF02 BAB4"            /* ÿÿ÷¤ËúüÀ´Ü‚ÿ.º´ */
+	$"BAAB B901 B093 8174 0100 0080 7402 729F"            /* º«¹.°“�t...€t.rŸ */
+	$"B6AB B902 BAAA E981 FF07 ECB3 ABD1 BBB6"            /* ¶«¹.ºªé�ÿ.쳫ѻ¶ */
+	$"C0FA 81FF 02E4 AABA AAB9 03B8 AD8E 7380"            /* Àú�ÿ.䪺ª¹.¸­Žs€ */
+	$"7401 0000 8074 0272 9BB6 AAB8 02B9 ADC6"            /* t...€t.r›¶ª¸.¹­Æ */
+	$"84FF 05DC AFB7 B8B4 E082 FF02 BCB1 B9A9"            /* „ÿ.ܯ·¸´à‚ÿ.¼±¹© */
+	$"B803 B6AB 8A72 8074 0100 0080 7402 7095"            /* ¸.¶«Šr€t...€t.p• */
+	$"B4AA B602 B5AB F484 FF06 E9B6 B5B6 B4C2"            /* ´ª¶.µ«ô„ÿ.鶵¶´Â */
+	$"FC81 FF02 E6A9 B7A9 B603 B5A8 8872 8074"            /* ü�ÿ.æ©·©¶.µ¨ˆr€t */
+	$"0100 0080 7402 6F91 B3A9 B602 B7AD D684"            /* ...€t.o‘³©¶.·­Ö„ */
+	$"FF02 FAC0 B480 B601 B3E4 82FF 02BD AFB7"            /* ÿ.úÀ´€¶.³ä‚ÿ.½¯· */
+	$"A8B6 03B4 A584 7280 7401 0000 8074 0270"            /* ¨¶.´¥„r€t...€t.p */
+	$"8DB2 A9B6 02B4 ACE7 84FF 01D9 B181 B602"            /* �²©¶.´¬ç„ÿ.Ù±�¶. */
+	$"B3C5 FE81 FF02 E8A8 B7A8 B603 B3A3 8172"            /* ³Åþ�ÿ.訷¨¶.³£�r */
+	$"8074 0100 0080 7402 7087 B0A8 B505 B6AA"            /* €t...€t.p‡°¨µ.¶ª */
+	$"BDA4 C1F5 81FF 02F3 B8B4 82B5 01B2 E782"            /* ½¤Áõ�ÿ.ó¸´‚µ.²ç‚ */
+	$"FF02 BFAD B6A7 B503 B2A1 7F72 8074 0100"            /* ÿ.¿­¶§µ.²¡.r€t.. */
+	$"0080 7402 7083 ADA7 B40C B5AC BBFF F2B8"            /* .€t.pƒ­§´.µ¬»ÿò¸ */
+	$"A2D0 FBFF FFCE B083 B401 B1C5 82FF 02EA"            /* ¢Ðûÿÿΰƒ´.±Å‚ÿ.ê */
+	$"A7B5 A7B4 03B0 9E7C 7380 7401 0000 8074"            /* §µ§´.°ž|s€t...€t */
+	$"0271 80AB A8B3 01A5 EC80 FF06 E4AA A9E2"            /* .q€«¨³.¥ì€ÿ.䪩â */
+	$"EAB2 B284 B301 B1E8 82FF 02BF ABB4 A6B3"            /* ê²²„³.±è‚ÿ.¿«´¦³ */
+	$"03AE 9B79 7380 7401 0000 8074 0272 7DA8"            /* .®›ys€t...€t.r}¨ */
+	$"A6B2 02B3 A6C8 82FF 04FE D3A8 B2B1 85B2"            /* ¦².³¦È‚ÿ.þÓ¨²±…² */
+	$"01AE C582 FF02 EAA6 B3A6 B203 AC98 7873"            /* .®Å‚ÿ.꦳¦².¬˜xs */
+	$"8074 0100 0080 7403 7278 A5B0 A5B1 02AF"            /* €t...€t.rx¥°¥±.¯ */
+	$"A9F7 84FF 01DA AB86 B102 B0AF E982 FF02"            /* ©÷„ÿ.Ú«†±.°¯é‚ÿ. */
+	$"BEA9 B2A5 B103 AB95 7773 8074 0100 0080"            /* ¾©²¥±.«•ws€t...€ */
+	$"7403 7276 A2AF A4B0 02B1 A2D5 84FF 02F8"            /* t.rv¢¯¤°.±¢Õ„ÿ.ø */
+	$"BAAE 87B0 01AC C682 FF02 EAA4 B1A5 B003"            /* º®‡°.¬Æ‚ÿ.ꤱ¥°. */
+	$"A991 7573 8074 0100 0080 7402 7375 9FA4"            /* ©‘us€t...€t.suŸ¤ */
+	$"AE03 AFA9 B0FE 84FF 01D3 AA88 AE02 ADAD"            /* ®.¯©°þ„ÿ.Óªˆ®.­­ */
+	$"E982 FF02 BCA7 AFA4 AE01 A78E 8274 0100"            /* é‚ÿ.¼§¯¤®.§Ž‚t.. */
+	$"0081 7402 729B ADA3 AE02 AFA0 E384 FF02"            /* .�t.r›­£®.¯ ã„ÿ. */
+	$"F0B0 AD89 AE01 AAC4 82FF 02E9 A2AF A4AE"            /* ð°­‰®.ªÄ‚ÿ.颯¤® */
+	$"01A5 8C82 7401 0000 8174 0270 98AC 97AD"            /* .¥Œ‚t...�t.p˜¬—­ */
+	$"0DAC ADAE ACAE ADAC AEAD ACAE AEA4 BB85"            /* .¬­®¬®­¬®­¬®®¤»… */
+	$"FF11 C7A7 AEAD ACAE ADAC AEAC ACAE ACAD"            /* ÿ.ǧ®­¬®­¬®¬¬®¬­ */
+	$"AEAB ABE9 82FF 0EBB A6AE ADAC AEAC ACAE"            /* ®««é‚ÿ.»¦®­¬®¬¬® */
+	$"ACAD AEAC ADAE 97AD 01A3 8982 7401 0000"            /* ¬­®¬­®—­.£‰‚t... */
+	$"8174 0270 94AA 95AC 0FAD A79F A1A2 9FA2"            /* �t.p”ª•¬.­§Ÿ¡¢Ÿ¢ */
+	$"A29F A2A1 9FA4 A9A1 EF84 FF12 E6A2 9FA2"            /* ¢Ÿ¢¡Ÿ¤©¡ï„ÿ.梟¢ */
+	$"A1A0 A3A1 A0A2 A0A0 A3A0 A0A2 9F9D C282"            /* ¡ £¡ ¢  £  ¢Ÿ�‚ */
+	$"FF10 E6A0 A9A0 A0A2 A0A0 A2A0 A1A3 A0A1"            /* ÿ.æ ©  ¢  ¢ ¡£ ¡ */
+	$"A2A2 AB94 AC03 ABA1 8673 8174 0100 0081"            /* ¢¢«”¬.«¡†s�t...� */
+	$"7402 7091 A995 AB0E A9AF FACE C2FF BCCA"            /* t.p‘©•«.©¯úÎÂÿ¼Ê */
+	$"FFB6 DEFA B4A1 C884 FF14 FDB2 C0FF BFCF"            /* ÿ¶Þú´¡È„ÿ.ý²Àÿ¿Ï */
+	$"FFAF DCFA AFEA F1A8 F5E4 B2FE D79D E982"            /* ÿ¯Üú¯êñ¨õä²þ×�é‚ */
+	$"FF0F B8A1 E4F8 A9EA F0AE F7E0 ACFF D5C0"            /* ÿ.¸¡äø©êð®÷à¬ÿÕÀ */
+	$"D1A5 94AB 03AA 9F84 7381 7401 0000 8174"            /* Ñ¥”«.ªŸ„s�t...�t */
+	$"026F 8CA8 95A9 0EA7 B1FF CEC2 FFD0 DBFF"            /* .oŒ¨•©.§±ÿÎÂÿÐÛÿ */
+	$"B3E0 FFB6 A2F9 84FF 14D7 99D8 FFBE D0FF"            /* ³àÿ¶¢ù„ÿ.×™Øÿ¾Ðÿ */
+	$"C5E9 FFAC EEFA C0FE E7B0 FFE8 A3B9 82FF"            /* Åéÿ¬îúÀþç°ÿ裹‚ÿ */
+	$"0FE2 99EA FFC1 F5F4 ABFB EDC4 FFD7 BED6"            /* .â™êÿÁõô«ûíÄÿ×¾Ö */
+	$"A394 A903 A89C 8173 8174 0100 0080 7403"            /* £”©.¨œ�s�t...€t. */
+	$"756E 88A6 95A8 04A6 B0FF DDD3 81FF 04C9"            /* unˆ¦•¨.¦°ÿÝÓ�ÿ.É */
+	$"EBFB A6D5 84FF 06F6 A3DE FFFF D1DE 80FF"            /* ëû¦Õ„ÿ.ö£ÞÿÿÑÞ€ÿ */
+	$"02FD C4F2 80FF 06EE C6FF FFFA A7E2 82FF"            /* .ýÄò€ÿ.îÆÿÿú§â‚ÿ */
+	$"01B0 D780 FF02 F6C3 FB80 FF03 E3D3 D5A2"            /* .°×€ÿ.öÃû€ÿ.ãÓÕ¢ */
+	$"94A8 03A7 9A7F 7381 7401 0000 8074 0375"            /* ”¨.§š.s�t...€t.u */
+	$"6E85 A495 A702 A5AF FA85 FF01 C7AB 85FF"            /* n…¤•§.¥¯ú…ÿ.Ç«…ÿ */
+	$"01C4 B290 FF01 D1B1 82FF 02DD ACFB 87FF"            /* .IJ�ÿ.ѱ‚ÿ.ݬû‡ÿ */
+	$"01D1 A194 A703 A598 7D73 8174 0100 0081"            /* .Ñ¡”§.¥˜}s�t...� */
+	$"7402 7082 A295 A602 A4AE FB84 FF02 EF9C"            /* t.p‚¢•¦.¤®û„ÿ.ïœ */
+	$"E484 FF02 EC9E EB90 FF02 FCA7 DF81 FF02"            /* ä„ÿ.ìžë�ÿ.ü§ß�ÿ. */
+	$"FCAD D787 FF01 D0A0 94A6 03A3 957B 7381"            /* ü­×‡ÿ.Р”¦.£•{s� */
+	$"7401 0000 8174 0270 7EA1 95A6 02A4 AEFB"            /* t...�t.p~¡•¦.¤®û */
+	$"84FF 01B8 B885 FF01 B4BF 92FF 01D4 AD80"            /* „ÿ.¸¸…ÿ.´¿’ÿ.Ô­€ */
+	$"FF04 FCD4 9CAC FA86 FF01 D0A0 94A6 03A3"            /* ÿ.üÔœ¬ú†ÿ.Р”¦.£ */
+	$"937A 7381 7401 0000 8174 0270 7B9F 95A4"            /* “zs�t...�t.p{Ÿ•¤ */
+	$"02A2 ACFA 83FF 02E3 9BF1 84FF 02DE 9EF5"            /* .¢¬úƒÿ.ã›ñ„ÿ.Þžõ */
+	$"92FF 09FD A8D9 FADB AD8B B1A1 D486 FF01"            /* ’ÿÆý¨ÙúÛ­‹±¡Ô†ÿ. */
+	$"CF9E 94A4 03A1 9178 7381 7401 0000 8174"            /* Ïž”¤.¡‘xs�t...�t */
+	$"0270 779D 95A3 02A1 ACFA 82FF 02FD A9C7"            /* .pw�•£.¡¬ú‚ÿ.ý©Ç */
+	$"84FF 02FC A5CD 94FF 09D9 989F 8B9B D3FF"            /* „ÿ.ü¥Í”ÿÆÙ˜Ÿ‹›Óÿ */
+	$"CDA1 F985 FF01 CF9D 94A3 03A0 8E77 7381"            /* Í¡ù…ÿ.Ï�”£. Žws� */
+	$"7401 0000 8174 0271 779A 95A2 02A0 ABFA"            /* t...�t.qwš•¢. «ú */
+	$"82FF 02D4 A0FB 84FF 02CE A2FD 95FF 08A6"            /* ‚ÿ.Ô û„ÿ.΢ý•ÿ.¦ */
+	$"AEDB FCFF FFFA 9ECF 85FF 01CE 9C94 A203"            /* ®ÛüÿÿúžÏ…ÿ.Îœ”¢. */
+	$"9E8C 7673 8174 0100 0081 7402 7275 9895"            /* žŒvs�t...�t.ru˜• */
+	$"A102 9FAA FA81 FF02 F79D D784 FF02 F29C"            /* ¡.Ÿªú�ÿ.÷�ׄÿ.òœ */
+	$"DE96 FF01 DABD 82FF 02D0 9DF8 84FF 01CE"            /* Þ–ÿ.Ú½‚ÿ.Ð�ø„ÿ.Î */
+	$"9A94 A102 9C8A 7582 7401 0000 8174 0272"            /* š”¡.œŠu‚t...�t.r */
+	$"7196 959F 089D A9EE F2F1 F1F6 C0AA 85FF"            /* q–•Ÿ.�©îòññöÀª…ÿ */
+	$"02C0 ADF5 95F1 03F2 F1AE E681 FF03 FCA0"            /* .À­õ•ñ.òñ®æ�ÿ.ü  */
+	$"C7F5 82F1 02F6 C89A 949F 029A 8775 8274"            /* Çõ‚ñ.öÈš”Ÿ.š‡u‚t */
+	$"0100 0081 7402 736F 9396 9E00 9F82 A201"            /* ...�t.so“–ž.Ÿ‚¢. */
+	$"93E8 84FF 03E8 9EA2 A396 A202 A39D BB82"            /* “è„ÿ.螢£–¢.£�»‚ */
+	$"FF02 D597 A383 A200 A195 9E01 9985 8374"            /* ÿ.Õ—£ƒ¢.¡•ž.™…ƒt */
+	$"0100 0081 7403 736E 929D 959E 009D 809C"            /* ...�t.sn’�•ž.�€œ */
+	$"029D 91BC 84FF 03FE B599 9D99 9C01 9DE7"            /* .�‘¼„ÿ.þµ™�™œ.�ç */
+	$"81FF 02C7 8D9B 839C 009D 959E 0198 8383"            /* �ÿ.Ç�›ƒœ.�•ž.˜ƒƒ */
+	$"7401 0000 8274 016E 8F9A 9C02 9A98 F484"            /* t...‚t.n�šœ.š˜ô„ */
+	$"FF01 DA99 9B9C 0997 B9FF FFE4 A7A6 CF91"            /* ÿ.Ú™›œÆ—¹ÿÿ䧦ϑ */
+	$"9D9B 9C02 9681 7382 7401 0000 8274 026F"            /* �›œ.–�s‚t...‚t.o */
+	$"8C9A 989B 029C 90CF 84FF 02F8 A998 9D9B"            /* Œš˜›.œ�Ï„ÿ.ø©˜�› */
+	$"08B3 A39A C8FC FFB0 919C 9A9B 0294 8073"            /* .³£šÈüÿ°‘œš›.”€s */
+	$"8274 0100 0082 7402 6D8A 9998 9A02 989C"            /* ‚t...‚t.mŠ™˜š.˜œ */
+	$"F484 FF01 CB94 9D9A 0397 A2DD FB80 FF02"            /* ô„ÿ.Ë”�š.—¢Ýû€ÿ. */
+	$"F294 979A 9A02 927E 7382 7401 0000 8174"            /* ò”—šš.’~s‚t...�t */
+	$"0375 6B87 9898 9904 969A 96D2 FE81 FF02"            /* .uk‡˜˜™.–š–Òþ�ÿ. */
+	$"EF9E 979D 9902 97A1 F382 FF02 D68A 9A99"            /* ïž—�™.—¡ó‚ÿ.ÖŠš™ */
+	$"9902 917C 7382 7401 0000 8174 0375 6A85"            /* ™.‘|s‚t...�t.uj… */
+	$"9797 9806 9798 F1D3 8F9F E480 FF01 BB92"            /* ——˜.—˜ñÓ�Ÿä€ÿ.»’ */
+	$"9F98 0192 CF83 FF02 B68A 9998 9802 8F7B"            /* Ÿ˜.’σÿ.¶Š™˜˜.�{ */
+	$"7382 7401 0000 8174 0375 6A82 9597 960B"            /* s‚t...�t.uj‚•—–. */
+	$"939F FBFF F9BB 89B0 F5E4 9595 9F96 0192"            /* “Ÿûÿù»‰°õä••Ÿ–.’ */
+	$"AD83 FF03 FA9B 9097 9796 028D 7973 8274"            /* ­ƒÿ.ú›�——–.�ys‚t */
+	$"0100 0081 7403 756A 8195 9796 0191 AC81"            /* ...�t.uj�•—–.‘¬� */
+	$"FF04 EEA8 97A2 94A0 9602 9597 EC83 FF01"            /* ÿ.¢” –.•—ìƒÿ. */
+	$"E28A 9796 0395 8C78 7382 7401 0000 8174"            /* ⊗–.•Œxs‚t...�t */
+	$"0375 6C7F 9497 9501 8EBB 82FF 02FE B28E"            /* .ul.”—•.Ž»‚ÿ.þ²Ž */
+	$"A295 018F CE84 FF02 BD89 9695 9503 948B"            /* ¢•.�΄ÿ.½‰–••.”‹ */
+	$"7873 8274 0100 0081 7403 756D 7D92 9794"            /* xs‚t...�t.um}’—” */
+	$"018C CB81 FF02 F8B8 93A3 9401 90AE 84FF"            /* .ŒË�ÿ.ø¸“£”.�®„ÿ */
+	$"02F7 9691 9594 0393 8A77 7382 7401 0000"            /* .÷–‘•”.“Šws‚t... */
+	$"8174 0375 6C7B 9197 9301 8CDD 80FF 02ED"            /* �t.ul{‘—“.ŒÝ€ÿ.í */
+	$"A78D A493 0292 96EE 84FF 02C8 8894 9493"            /* §�¤“.’–î„ÿ.Ȉ””“ */
+	$"0392 8875 7382 7401 0000 8174 0375 6C79"            /* .’ˆus‚t...�t.uly */
+	$"9096 9207 9190 EBFF FFDE 9A8D A692 018C"            /* �–’.‘�ëÿÿÞš�¦’.Œ */
+	$"CC84 FF02 EF91 9194 9201 9186 8474 0100"            /* Ì„ÿ.ï‘‘”’.‘†„t.. */
+	$"0081 7403 756B 7790 9692 0690 97F8 FFCC"            /* .�t.ukw�–’.�—øÿÌ */
+	$"918E A792 028E A6FD 83FF 02FC 9F8F 9492"            /* ‘Ž§’.Ž¦ýƒÿ.üŸ�”’ */
+	$"0191 8584 7401 0000 8174 0375 6B75 8E96"            /* .‘…„t...�t.ukuŽ– */
+	$"9005 8BA7 FCBA 8B8E A990 018D DB83 FF02"            /* �.‹§üº‹Ž©�.�Ûƒÿ. */
+	$"F79B 8D94 9002 8F83 7383 7401 0000 8174"            /* ÷›�”�.�ƒsƒt...�t */
+	$"0375 6C74 8E96 9004 8CAA AD89 8FAA 9002"            /* .ultŽ–�.Œª­‰�ª�. */
+	$"8CA3 F982 FF01 CB8C 9590 028F 8373 8374"            /* Œ£ù‚ÿ.ËŒ•�.�ƒsƒt */
+	$"0100 0081 7403 756B 728D 988F 008B AD8F"            /* ...�t.ukr�˜�.‹­� */
+	$"088A B4F9 FFFF F6C3 8E8E 958F 028E 8172"            /* .Š´ùÿÿöÃŽŽ•�.Ž�r */
+	$"8374 0100 0081 7403 756C 718C CA8E 068A"            /* ƒt...�t.ulqŒÊŽ.Š */
+	$"9DBA B398 898D 968E 028D 8072 8374 0100"            /* �º³˜‰�–Ž.�€rƒt.. */
+	$"0081 7403 756C 718B CB8E 038B 8888 8B98"            /* .�t.ulq‹ËŽ.‹ˆˆ‹˜ */
+	$"8E02 8C80 7283 7401 0000 8174 0375 6D71"            /* Ž.Œ€rƒt...�t.umq */
+	$"8BEA 8E02 8C80 7283 7401 0000 8174 0375"            /* ‹êŽ.Œ€rƒt...�t.u */
+	$"6D70 8AEA 8D02 8B7F 7283 7401 0000 8174"            /* mpŠê�.‹.rƒt...�t */
+	$"0375 6E70 8AEA 8D02 8B7E 7283 7401 0000"            /* .unpŠê�.‹~rƒt... */
+	$"8174 0375 6E70 8AEA 8D02 8B7E 7283 7400"            /* �t.unpŠê�.‹~rƒt. */
+	$"0082 7403 756F 6E88 EA8C 0289 7B71 8374"            /* .‚t.uonˆêŒ.‰{qƒt */
+	$"0000 8374 0372 697B 81E9 8202 7E73 7283"            /* ..ƒt.ri{�é‚.~srƒ */
+	$"7401 0000 8274 0475 706E 7172 E671 0372"            /* t...‚t.upnqræq.r */
+	$"7270 7284 7401 0000 FB74 0100 00FB 7401"            /* rpr„t...ût...ût. */
+	$"0000 FB74 0100 00FB 7401 0000 FA74 8100"            /* ..ût...ût...út�. */
+	$"F974 8200 F774 8300 F674 8600 F374 FF00"            /* ùt‚.÷tƒ.öt†.ótÿ. */
+	$"FF00 0000 7438 6D6B 0000 4008 0000 0000"            /* ÿ...t8mk..@..... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0101 0101 0202 0202 0202 0202 0202 0202"            /* ................ */
+	$"0202 0202 0202 0202 0202 0202 0202 0101"            /* ................ */
+	$"0101 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0102 0202"            /* ................ */
+	$"0304 0505 0606 0606 0606 0606 0606 0606"            /* ................ */
+	$"0606 0606 0606 0606 0606 0606 0606 0505"            /* ................ */
+	$"0503 0302 0100 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0001 0100 0000"            /* ................ */
+	$"0204 0506 0707 0707 0707 0707 0707 0707"            /* ................ */
+	$"0707 0707 0707 0707 0707 0707 0707 0606"            /* ................ */
+	$"090A 0805 0302 0100 0000 0000 0000 0000"            /* ÆÂ.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0101 001C 2F31"            /* ............../1 */
+	$"3436 383A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A"            /* 468::::::::::::: */
+	$"3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A34"            /* :::::::::::::::4 */
+	$"120B 0F0B 0704 0201 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0004 8FF3 FAF9"            /* ............�óúù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 FAFA"            /* ùùùùùùùùùùùùùùúú */
+	$"C433 1112 0C07 0402 0100 0000 0000 0000"            /* Ä3.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 0067 FFFF FFFF"            /* ...........gÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFC3 201A 130C 0703 0100 0000 0000 0000"            /* ÿÃ ............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 00A9 FFFF FFFF"            /* ...........©ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFF8 4A20 1B11 0A05 0200 0000 0000 0000"            /* ÿøJ ..Â......... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0002 00B6 FFFF FFFF"            /* ...........¶ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFB 5928 2216 0D07 0200 0000 0000 0000"            /* ÿûY("........... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0103 07CC FFFF FFFF"            /* ...........Ìÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFD 6231 291B 1109 0401 0000 0000 0000"            /* ÿýb1)..Æ........ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0201 21F0 FFFF FFFF"            /* ..........!ðÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 7337 2F21 160D 0704 0303 0303 0303"            /* ÿÿs7/!.......... */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0302 0201 0100"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0001 0500 69FF FFFF FFFF"            /* ..........iÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 9A38 3628 1C14 0E0A 0909 0909 0909"            /* ÿÿš86(...ÂÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0807 0604 0302"            /* ÆÆÆÆÆÆÆÆÆÆ...... */
+	$"0100 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0203 0021 DFFF FFFF FFFF"            /* .........!ßÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF E653 312D 231B 1512 1011 1010 1010"            /* ÿÿæS1-#......... */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 0E0C 0A08 0504"            /* ............Â... */
+	$"0301 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0002 0200 34D3 FFFF FFFF FFFF"            /* ........4Óÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFD6 6E40 312A 2522 2121 2121 2121"            /* ÿÿÿÖn@1*%"!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2120 1E1B 1814 0D00"            /* !!!!!!!!! ...... */
+	$"0203 0100 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0102 006C F4FF FFFF FFFF FFFF"            /* .......lôÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FEE8 DAD9 D9D8 D8D8 D8D8 D8D8"            /* ÿÿÿÿþèÚÙÙØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D7D7 D6D5 D5A9"            /* ØØØØØØØØØØ××ÖÕÕ© */
+	$"1E00 0200 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0001 0300 71FF FFFF FFFF FFFF FFFF"            /* ......qÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"8500 0402 0100 0000 0000 0000 0000 0000"            /* …............... */
+	$"0001 0203 0317 E1FF FFFF FFFF FFFF FFFF"            /* ......áÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"9E03 0905 0302 0100 0000 0000 0000 0000"            /* ž.Æ............. */
+	$"0201 0000 002C E4E8 E8E9 EAEB ECEC EDED"            /* .....,äèèéêëììíí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED ECEC ECEC ECEC ECEC ECEC ECEC"            /* ííííìììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEB EAE9 E8F4"            /* ìììììììììììëêéèô */
+	$"8E02 0400 0000 0202 0000 0000 0000 0002"            /* Ž............... */
+	$"0012 6297 A3A9 BBBD C0C4 C7CA CCCD CECE"            /* ..b—£©»½ÀÄÇÊÌÍÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CDCD CCCC CCCC CBCB CBCB CBCB"            /* ÎÎÎÎÍÍÌÌÌÌËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBC9 C8C5 C2C0"            /* ËËËËËËËËËËËÉÈÅÂÀ */
+	$"B5A6 A5A1 8236 0002 0100 0000 0000 0100"            /* µ¦¥¡‚6.......... */
+	$"35DC FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 5Üÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFE 8901 0101 0000 0000 001B"            /* ÿÿÿÿÿþ‰......... */
+	$"DFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF73 0002 0000 0001 0082"            /* ÿÿÿÿÿÿÿs.......‚ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE4 1800 0100 0001 00C0"            /* ÿÿÿÿÿÿÿä.......À */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4500 0200 0002 02C6"            /* ÿÿÿÿÿÿÿÿE......Æ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4C00 0200 0103 00B3"            /* ÿÿÿÿÿÿÿÿL......³ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFE 3D00 0300 0104 009C"            /* ÿÿÿÿÿÿÿþ=......œ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFF4 2C04 0400 0105 0087"            /* ÿÿÿÿÿÿÿô,......‡ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE8 2007 0400 0105 0073"            /* ÿÿÿÿÿÿÿè ......s */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFD9 1808 0400 0105 015C"            /* ÿÿÿÿÿÿÿÙ.......\ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFC7 0E0A 0401 0105 034A"            /* ÿÿÿÿÿÿÿÇ.Â.....J */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFB5 0A0A 0402 0105 043C"            /* ÿÿÿÿÿÿÿµÂÂ.....< */
+	$"FBFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFA1 080A 0402 0105 062B"            /* ÿÿÿÿÿÿÿ¡.Â.....+ */
+	$"F2FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* òÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF8E 050A 0402 0104 0720"            /* ÿÿÿÿÿÿÿŽ.Â.....  */
+	$"E7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF7C 0609 0300 0104 0817"            /* ÿÿÿÿÿÿÿ|.Æ...... */
+	$"D8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF68 0709 0300 0104 0A0E"            /* ÿÿÿÿÿÿÿh.Æ....Â. */
+	$"C8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Èÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF55 0809 0300 0104 0A0A"            /* ÿÿÿÿÿÿÿU.Æ....ÂÂ */
+	$"B7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ·ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF47 0909 0300 0104 0A07"            /* ÿÿÿÿÿÿÿGÆÆ....Â. */
+	$"A4FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ¤ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF F638 0B08 0300 0004 0A05"            /* ÿÿÿÿÿÿö8......Â. */
+	$"91FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ‘ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF EE2B 0C08 0300 0004 0905"            /* ÿÿÿÿÿÿî+......Æ. */
+	$"81FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* �ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF E224 0D08 0300 0003 0906"            /* ÿÿÿÿÿÿâ$......Æ. */
+	$"71FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* qÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF D51C 0E08 0300 0003 0907"            /* ÿÿÿÿÿÿÕ.......Æ. */
+	$"5EFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ^ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF C714 0F07 0200 0003 0908"            /* ÿÿÿÿÿÿÇ.......Æ. */
+	$"4FFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF B811 0E07 0200 0003 090A"            /* ÿÿÿÿÿÿ¸.......ÆÂ */
+	$"43FD FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Cýÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF A70E 0F07 0200 0003 080B"            /* ÿÿÿÿÿÿ§......... */
+	$"34F5 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 4õÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 960C 0E06 0200 0002 080D"            /* ÿÿÿÿÿÿ–......... */
+	$"29EB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* )ëÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 850C 0E07 0200 0003 080E"            /* ÿÿÿÿÿÿ…......... */
+	$"22E0 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* "àÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 760D 0E06 0200 0003 080F"            /* ÿÿÿÿÿÿv......... */
+	$"1BD3 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Óÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 650E 0E06 0200 0002 080F"            /* ÿÿÿÿÿÿe......... */
+	$"14C7 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 580E 0D06 0200 0002 070F"            /* ÿÿÿÿÿÿX......... */
+	$"11B9 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .¹ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 4E10 0D06 0100 0002 070F"            /* ÿÿÿÿÿÿN......... */
+	$"10AB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .«ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 4211 0D06 0200 0002 070F"            /* ÿÿÿÿÿøB......... */
+	$"0D9B FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .›ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF1 3513 0D06 0200 0002 080F"            /* ÿÿÿÿÿñ5......... */
+	$"0C8D FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE9 2E13 0D05 0100 0002 070F"            /* ÿÿÿÿÿé.......... */
+	$"0D81 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFDF 2914 0D06 0100 0002 070F"            /* ÿÿÿÿÿß)......... */
+	$"0E73 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .sÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD4 2215 0C06 0100 0002 070F"            /* ÿÿÿÿÿÔ"......... */
+	$"0F64 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .dÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC9 1C16 0C05 0100 0002 070F"            /* ÿÿÿÿÿÉ.......... */
+	$"1058 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Xÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFBD 1A15 0C05 0100 0002 070F"            /* ÿÿÿÿÿ½.......... */
+	$"114F FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB2 1815 0C05 0100 0002 070E"            /* ÿÿÿÿÿ².......... */
+	$"1246 FAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Fúÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 1615 0C05 0100 0002 070E"            /* ÿÿÿÿÿ¥.......... */
+	$"133B F4FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .;ôÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF98 1515 0C05 0100 0002 060E"            /* ÿÿÿÿÿ˜.......... */
+	$"1533 EEFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .3îÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF8D 1515 0B05 0100 0002 070E"            /* ÿÿÿÿÿ�.......... */
+	$"152F E6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ./æÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF82 1615 0B05 0100 0002 070E"            /* ÿÿÿÿÿ‚.......... */
+	$"1629 DDFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .)Ýÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF77 1615 0B05 0100 0002 060E"            /* ÿÿÿÿÿw.......... */
+	$"1624 D5FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Õÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6B 1715 0B05 0100 0002 060E"            /* ÿÿÿÿÿk.......... */
+	$"1720 CCFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Ìÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF61 1815 0B05 0100 0002 060E"            /* ÿÿÿÿÿa.......... */
+	$"181D C3FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Ãÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5B 1914 0B05 0100 0002 060E"            /* ÿÿÿÿÿ[.......... */
+	$"181C BAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..ºÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FE54 1A14 0B05 0100 0002 070E"            /* ÿÿÿÿþT.......... */
+	$"181B B0FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..°ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F94C 1B15 0B04 0100 0002 060E"            /* ÿÿÿÿùL.......... */
+	$"181A A6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..¦ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F544 1C15 0B05 0100 0002 070E"            /* ÿÿÿÿõD.......... */
+	$"1819 9DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..�ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F13D 1D14 0B04 0100 0002 060E"            /* ÿÿÿÿñ=.......... */
+	$"1819 95FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..•ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF EB3A 1D14 0B05 0100 0002 070E"            /* ÿÿÿÿë:.......... */
+	$"1819 8EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Žÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF E537 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿå7.......... */
+	$"181A 86FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..†ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF DF34 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿß4.......... */
+	$"181B 7EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..~ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D930 1F15 0B05 0100 0002 070E"            /* ÿÿÿÿÙ0.......... */
+	$"181B 78FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..xÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D32D 1F15 0B05 0100 0002 070F"            /* ÿÿÿÿÓ-.......... */
+	$"191C 71FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..qÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF CE29 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÎ) ......... */
+	$"191D 6AFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..jÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C828 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÈ( ......... */
+	$"191D 65FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..eÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C328 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÃ( ......... */
+	$"191E 61FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..aÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF BE28 2115 0B05 0100 0002 070F"            /* ÿÿÿÿ¾(!......... */
+	$"191F 5DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..]ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B827 2115 0C05 0100 0002 070F"            /* ÿÿÿÿ¸'!......... */
+	$"1920 5AFE FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Zþÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B427 2115 0C05 0100 0003 0710"            /* ÿÿÿÿ´'!......... */
+	$"1A21 58FD FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Xýÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B026 2115 0C05 0100 0003 0810"            /* ÿÿÿÿ°&!......... */
+	$"1A21 55FB FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Uûÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF AC26 2116 0C05 0200 0003 0810"            /* ÿÿÿÿ¬&!......... */
+	$"1A22 52F9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ."Rùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A826 2215 0C05 0100 0003 0810"            /* ÿÿÿÿ¨&"......... */
+	$"1A23 4FF7 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .#O÷ÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A426 2316 0D06 0200 0003 0811"            /* ÿÿÿÿ¤&#......... */
+	$"1B24 4DF6 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Möÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A126 2316 0D06 0200 0003 0911"            /* ÿÿÿÿ¡&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9F26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿŸ&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9E26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿž&#.......Æ. */
+	$"1C26 4BF4 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Kôÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9D27 2317 0D06 0200 0004 0912"            /* ÿÿÿÿ�'#.......Æ. */
+	$"1C26 4AF3 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Jóÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9C27 2417 0D06 0200 0104 0912"            /* ÿÿÿÿœ'$.......Æ. */
+	$"1C26 47F2 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Gòÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9A27 2417 0D06 0200 0103 0911"            /* ÿÿÿÿš'$.......Æ. */
+	$"1B27 37D1 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .'7Ñÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 7329 2316 0D06 0200 0003 0810"            /* ÿÿÿÿs)#......... */
+	$"1A27 2F59 B7C6 C6C7 C7C7 C7C7 C7C7 C7C7"            /* .'/Y·ÆÆÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C5 C689 372D 2015 0C06 0200 0003 070E"            /* ÇÅƉ7- ......... */
+	$"1723 3037 3C46 4C4F 5050 5050 5050 5050"            /* .#07<FLOPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"4D49 4138 352A 1D13 0A05 0100 0003 060C"            /* MIA85*..Â....... */
+	$"141E 2934 3D44 494C 4D4E 4E4E 4E4E 4E4E"            /* ..)4=DILMNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4D"            /* NNNNNNNNNNNNNNNM */
+	$"4B46 4039 2F24 1910 0904 0100 0002 050A"            /* KF@9/$..Æ...... */
+	$"1018 212B 3339 3D40 4142 4242 4242 4242"            /* ..!+39=@ABBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4140"            /* BBBBBBBBBBBBBBA@ */
+	$"3F3B 352F 261D 140D 0703 0100 0002 0407"            /* ?;5/&........... */
+	$"0C12 1920 272C 2F32 3233 3333 3333 3333"            /* ... ',/223333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3332"            /* 3333333333333332 */
+	$"302D 2924 1D16 0F09 0502 0100 0001 0305"            /* 0-)$...Æ........ */
+	$"080D 1217 1C1F 2223 2425 2525 2525 2525"            /* ......"#$%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2524"            /* %%%%%%%%%%%%%%%$ */
+	$"2221 1E19 1510 0B07 0402 0000 0000 0103"            /* "!.............. */
+	$"0609 0C10 1315 1718 1919 1919 1919 1919"            /* .Æ.............. */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1918"            /* ................ */
+	$"1716 1411 0E0A 0704 0201 0000 0000 0002"            /* .....Â.......... */
+	$"0305 0709 0B0D 0E0F 0F0F 0F0F 0F0F 0F0F"            /* ...Æ............ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0D 0C0A 0806 0402 0100 0000 0000 0001"            /* ...Â............ */
+	$"0103 0304 0607 0708 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0707 0605 0403 0201 0000 0000 0000 0000"            /* ................ */
+	$"0001 0102 0202 0203 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0202 0202 0201 0100 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 6963 3038"            /* ............ic08 */
+	$"0000 5CBD 0000 000C 6A50 2020 0D0A 870A"            /* ..\½....jP  .‡ */
+	$"0000 0014 6674 7970 6A70 3220 0000 0000"            /* ....ftypjp2 .... */
+	$"6A70 3220 0000 004F 6A70 3268 0000 0016"            /* jp2 ...Ojp2h.... */
+	$"6968 6472 0000 0100 0000 0100 0004 0707"            /* ihdr............ */
+	$"0100 0000 000F 636F 6C72 0100 0000 0000"            /* ......colr...... */
+	$"1000 0000 2263 6465 6600 0400 0000 0000"            /* ...."cdef....... */
+	$"0100 0300 0100 0000 0100 0000 0200 0200"            /* ................ */
+	$"0000 0300 0000 006A 7032 63FF 4FFF 5100"            /* .......jp2cÿOÿQ. */
+	$"3200 0000 0001 0000 0001 0000 0000 0000"            /* 2............... */
+	$"0000 0000 0001 0000 0001 0000 0000 0000"            /* ................ */
+	$"0000 0000 0407 0101 0701 0107 0101 0701"            /* ................ */
+	$"01FF 5200 0C00 0000 0101 0504 0400 01FF"            /* .ÿR............ÿ */
+	$"5C00 1320 5058 5860 5858 6058 5860 5858"            /* \.. PXX`XX`XX`XX */
+	$"5850 5058 FF64 0011 0001 4B61 6B61 6475"            /* XPPXÿd....Kakadu */
+	$"2D76 352E 322E 31FF 9000 0A00 0000 005B"            /* -v5.2.1ÿ�.Â....[ */
+	$"D000 01FF 93CF C100 1507 F18D 1991 E793"            /* Ð..ÿ“ÏÁ...ñ�.‘ç“ */
+	$"D8B4 6B7C 459C 4F68 E4BF E0FF 0D3D C2DF"            /* Ø´k|EœOhä¿àÿ.=Âß */
+	$"FC16 8F7F 6C3A 7FEA ACD5 8632 D1AD 37A6"            /* ü.�.l:.ê¬Õ†2Ñ­7¦ */
+	$"22E3 4753 734F 3BFA 0372 1596 A8F1 7183"            /* "ãGSsO;ú.r.–¨ñqƒ */
+	$"2F17 0A65 C5C2 6A8E C0F9 1000 39CE 9180"            /* /.ÂeÅÂjŽÀù..9Α€ */
+	$"AE4A F551 B521 2839 FEE4 4D31 9F98 9F17"            /* ®JõQµ!(9þäM1Ÿ˜Ÿ. */
+	$"29F2 C91D 3B35 397E 15A1 8246 C3EA 3107"            /* )òÉ.;59~.¡‚FÃê1. */
+	$"5630 A744 5105 404A C843 0AE4 304B 4FE9"            /* V0§DQ.@JÈCÂä0KOé */
+	$"81E4 4C91 DF64 6885 8D23 6517 B254 DE23"            /* �äL‘ßdh…�#e.²TÞ# */
+	$"6101 3C94 9245 923D 4F4C 0F02 784C F319"            /* a.<”’E’=OL..xLó. */
+	$"CFC0 FC11 7EC2 D9C4 3907 5FDC 553A F1E1"            /* ÏÀü.~ÂÙÄ9._ÜU:ñá */
+	$"F2BC 6420 59D8 7D25 F42A 5BA5 8E8E 7166"            /* ò¼d YØ}%ô*[¥ŽŽqf */
+	$"AD5D 5C91 CC75 1452 ACDA 64CA 3249 CCE3"            /* ­]\‘Ìu.R¬ÚdÊ2IÌã */
+	$"6874 83E2 633E 64E7 8159 4AA2 FD3C 638D"            /* htƒâc>dç�YJ¢ý<c� */
+	$"F978 C3ED 328F C0F2 1F81 A80C BB81 9421"            /* ùxÃí2�Àò.�¨.»�”! */
+	$"980D F457 0EA7 7782 676F 2AB3 EE8F 99C2"            /* ˜.ôW.§w‚go*³î�™Â */
+	$"2221 9D95 8C80 C3A8 91F3 4C08 6A03 DE45"            /* "!�•Œ€Ã¨‘óL.j.ÞE */
+	$"A985 9B7B 9ED3 A9A4 D929 A97F A125 FE22"            /* ©…›{žÓ©¤Ù)©.¡%þ" */
+	$"A893 77F3 EF0F C15C 3969 A153 3A7C 3110"            /* ¨“wóï.Á\9i¡S:|1. */
+	$"7A9C 9227 D2F6 BCA8 1A04 0219 8F36 21B7"            /* zœ’'Òö¼¨....�6!· */
+	$"B37C 2AB6 678A 1675 BA9E 03B4 53BA 33B9"            /* ³|*¶gŠ.uºž.´Sº3¹ */
+	$"06AD 96D8 BDBC BFC8 5134 C040 7EBA B756"            /* .­–ؽ¼¿ÈQ4À@~º·V */
+	$"E619 DC67 BC83 BB39 AA42 65E1 5BBC 45B4"            /* æ.Üg¼ƒ»9ªBeá[¼E´ */
+	$"ECB6 E6ED D098 3C9F E17B 876D A039 553E"            /* ì¶æíИ<Ÿá{‡m 9U> */
+	$"5CF9 2D3F 6F47 4854 7085 62C1 C65D C07C"            /* \ù-?oGHTp…bÁÆ]À| */
+	$"86A0 3E43 500F 90D0 4787 8CE8 726C 5109"            /* † >CP.�ÐG‡ŒèrlQÆ */
+	$"FD68 8099 E8FE 2A66 2F02 78F5 C78B 6A34"            /* ýh€™èþ*f/.xõÇ‹j4 */
+	$"0A9E 25FE 0DE3 E3C8 BD7B 3530 98D5 CF03"            /* ž%þ.ããȽ{50˜ÕÏ. */
+	$"CE64 A57D 620C 87C5 65B4 7BE1 34BC 3058"            /* Îd¥}b.‡Åe´{á4¼0X */
+	$"572A 9EBF 5E0C 5A01 80A3 B334 DF5A E1B8"            /* W*ž¿^.Z.€£³4ßZḠ*/
+	$"08C3 5C30 2CC4 C1F5 1341 F516 40FA 8A00"            /* .Ã\0,ÄÁõ.Aõ.@úŠ. */
+	$"477D B516 AD2F 4DD3 BE8C 58F0 7C77 A236"            /* G}µ.­/MÓ¾ŒXð|w¢6 */
+	$"DD43 6611 D582 F050 DC31 59D0 194D A6FD"            /* ÝCf.Õ‚ðPÜ1YÐ.M¦ý */
+	$"652E FA16 4BA7 25FE 0DE3 E3D9 B950 06E2"            /* e.ú.K§%þ.ããÙ¹P.â */
+	$"3A8A DA86 827A 4C68 5798 55FC FD46 A583"            /* :ŠÚ†‚zLhW˜UüýF¥ƒ */
+	$"064D 8FB0 29D9 8DAD 53CC 5229 B675 ACAB"            /* .M�°)Ù�­SÌR)¶u¬« */
+	$"8EED 34BC 2F12 142E 446C 0DF7 0BC3 D6E7"            /* Ží4¼/...Dl.÷.ÃÖç */
+	$"A086 8D72 6AE7 9270 B97C D981 C7F1 C38A"            /*  †�rjç’p¹|Ù�ÇñÊ */
+	$"47EE E585 FC19 FCE3 668C C7E0 471F 813C"            /* Gîå…ü.üãfŒÇàG.�< */
+	$"3F02 0005 B422 0345 FC66 9A91 446D DDCA"            /* ?...´".Eüfš‘DmÝÊ */
+	$"449B CCDB 8E8F A0B8 3942 A8FC 6409 F7F3"            /* D›ÌÛŽ� ¸9B¨üdÆ÷ó */
+	$"ED01 353A 2B01 1B0C 2939 619B 9890 94E7"            /* í.5:+...)9a›˜�”ç */
+	$"5FDA 75F2 7323 BF3A 7AED 757E 42D6 C336"            /* _Úuòs#¿:zíu~BÖÃ6 */
+	$"E74E 6B5F 2D43 4780 CA1C C462 6507 4801"            /* çNk_-CG€Ê.Äbe.H. */
+	$"EDEF 5B2A 7297 8FC6 1E13 E7FA 56B5 4279"            /* íï[*r—�Æ..çúVµBy */
+	$"5BB4 B307 F4DE E273 4FC3 E9B1 72C3 EDA2"            /* [´³.ôÞâsOÃé±rÃí¢ */
+	$"A3F0 A9E0 FB5D C018 B35C 8B45 CD63 99FE"            /* £ð©àû]À.³\‹EÍc™þ */
+	$"11FB 8993 21D1 BA8B 69EB 5CB9 F258 468F"            /* .û‰“!Ѻ‹ië\¹òXF� */
+	$"73D4 6804 C6E6 045E AE54 954C D0E5 D836"            /* sÔh.Ææ.^®T•LÐåØ6 */
+	$"EA0D DB9A 2806 36FA B3E9 5973 789D 6591"            /* ê.Ûš(.6ú³éYsx�e‘ */
+	$"1EC2 F271 E9E2 5681 C542 A2FC F4EF 8111"            /* .ÂòqéâV�ÅB¢üôï�. */
+	$"59D5 FC91 9749 52A3 EA37 B239 4939 8625"            /* YÕü‘—IR£ê7²9I9†% */
+	$"F248 18D2 075A 80A1 8005 9ED2 437F C705"            /* òH.Ò.Z€¡€.žÒC.Ç. */
+	$"2BFD 308C F1F0 E1BC 8FDA F5D5 50D9 9770"            /* +ý0Œñðá¼�ÚõÕPÙ—p */
+	$"7EF5 213F 91F6 5B8B 189D EE67 70EF F40A"            /* ~õ!?‘ö[‹.�îgpïô */
+	$"2E24 C54B F37D 4941 FCD2 7779 5C8B 59CC"            /* .$ÅKó}IAüÒwy\‹YÌ */
+	$"F284 3377 A496 0399 6F17 47AC B5EA 3A84"            /* ò„3w¤–.™o.G¬µê:„ */
+	$"844E DC13 D058 BE9F 1BBE 8CE0 E615 D2E1"            /* „NÜ.ÐX¾Ÿ.¾Œàæ.Òá */
+	$"88A5 9DA6 9FB4 4EDE B804 ED14 A7EA 54E0"            /* ˆ¥�¦Ÿ´NÞ¸.í.§êTà */
+	$"5A87 311B 5E69 70F5 EDA3 2E78 8862 7603"            /* Z‡1.^ipõí£.xˆbv. */
+	$"7761 094D 4A69 5AB0 A9BB 3F4F 92BE 205B"            /* waÆMJiZ°©»?O’¾ [ */
+	$"A226 24D5 C8B2 CCF7 E064 31C7 E727 6E2C"            /* ¢&$ÕȲÌ÷àd1Çç'n, */
+	$"D6A1 347F 41CD 5F70 E1C0 1AFC 4FBC 81A9"            /* Ö¡4.AÍ_páÀ.üO¼�© */
+	$"A884 F03A CD84 B581 1F03 A523 838B 8038"            /* ¨„ð:Í„µ�..¥#ƒ‹€8 */
+	$"02F4 6DE8 98FC EDD6 B331 21F7 4AC5 A31E"            /* .ômè˜üíÖ³1!÷JÅ£. */
+	$"9EB4 E770 D465 386E 18A6 D1BE EF6D B008"            /* ž´çpÔe8n.¦Ñ¾ïm°. */
+	$"63E6 1066 1374 4D10 3270 8C7F F297 F91D"            /* cæ.f.tM.2pŒ.ò—ù. */
+	$"DA61 677B 29FD A878 B122 E33C 17E3 8ED1"            /* Úag{)ý¨x±"ã<.ãŽÑ */
+	$"FB8E 4407 8B82 32AD 1B50 09DF BDA8 C80E"            /* ûŽD.‹‚2­.PÆß½¨È. */
+	$"7E28 ED9D A005 4297 B9C1 8D66 CA77 C41D"            /* ~(í� .B—¹Á�fÊwÄ. */
+	$"41C5 E3B3 F94D 96E5 1308 7C59 1EB8 0871"            /* AÅã³ùM–å..|Y.¸.q */
+	$"C7A4 FED7 47F2 F800 6889 A21D 1FF4 9E93"            /* Ǥþ×Gòø.h‰¢..ôž“ */
+	$"1321 7377 D96E 86F5 A0CB EB17 C77A 81C0"            /* .!swÙn†õ Ëë.Çz�À */
+	$"7C8D A01F 0E91 00F9 1D00 94FD 4D32 E5DB"            /* |� ..‘.ù..”ýM2åÛ */
+	$"0482 DEB8 CF1C 792A EA3B DECA 4470 4898"            /* .‚Þ¸Ï.y*ê;ÞÊDpH˜ */
+	$"81C0 5457 FE66 63DD CAF3 0B98 08E1 DC3F"            /* �ÀTWþfcÝÊó.˜.áÜ? */
+	$"CF68 7F31 9BEE 73EF A3A5 8D57 8969 EEC3"            /* Ïh.1›îs�W‰iîà */
+	$"0F13 3ED9 390D FC4C B37F C4F7 01E4 B115"            /* ..>Ù9.üL³.Ä÷.ä±. */
+	$"E9F9 9526 00FA 10D0 0D64 4CC5 8481 D231"            /* éù•&.ú.Ð.dLÅ„�Ò1 */
+	$"DE6D 483E 8046 7F58 5BD3 1FFC CF82 297A"            /* ÞmH>€F.X[Ó.üÏ‚)z */
+	$"88A1 7E78 0668 3222 9E8B A287 30A3 DB10"            /* ˆ¡~x.h2"ž‹¢‡0£Û. */
+	$"A77F A842 87FC 164E 92B8 96DF 4920 EEC2"            /* §.¨B‡ü.N’¸–ßI î */
+	$"47B6 83F1 F68F 9309 63CE FAAC 3C8F 9FCF"            /* G¶ƒñö�“ÆcÎú¬<�ŸÏ */
+	$"A166 9621 ADC0 0ABB 7F1A 7E3C A4AD 3755"            /* ¡f–!­À»..~<¤­7U */
+	$"E2D8 E26D CAD1 6F24 F808 BC0D E94B EEBC"            /* âØâmÊÑo$ø.¼.éKî¼ */
+	$"D601 C1F5 30C1 F53B C0FA 97C0 90E6 901B"            /* Ö.Áõ0Áõ;Àú—À�æ�. */
+	$"71C2 1EAB 8A4C 52A4 4431 058C DFB9 4148"            /* qÂ.«ŠLR¤D1.Œß¹AH */
+	$"185C 1E93 01C6 82D3 C81B 6398 8173 189D"            /* .\.“.Æ‚ÓÈ.c˜�s.� */
+	$"F73C 4887 5155 0C95 0088 4C69 0A27 3F39"            /* ÷<H‡QU.•.ˆLiÂ'?9 */
+	$"8CCA 32D8 1FD7 A3F4 CDD8 6275 5E7E 3619"            /* ŒÊ2Ø.×£ôÍØbu^~6. */
+	$"8D18 68C9 D2C7 0FCB 18EA FB01 5A68 4A52"            /* �.hÉÒÇ.Ë.êû.ZhJR */
+	$"3C08 5313 5ED2 9B7D 31B5 953C 2F92 22F7"            /* <.S.^Ò›}1µ•</’"÷ */
+	$"3764 04E8 A9A6 C747 8DFD 9730 01DD 82E1"            /* 7d.試ÇG�ý—0.Ý‚á */
+	$"B08A FD72 7C33 A9BF AFEA 7188 AC4B 2B45"            /* °Šýr|3©¿¯êqˆ¬K+E */
+	$"BBB2 7826 6704 5864 9BAF 91FC 6BD3 E9D7"            /* »²x&g.Xd›¯‘ükÓé× */
+	$"0E30 E428 0FB2 4836 F94F 7CB9 3723 72A2"            /* .0ä(.²H6ùO|¹7#r¢ */
+	$"AB4C C0EB ED8F 823B B8D6 C4A6 E4B5 B41C"            /* «LÀëí�‚;¸ÖĦ䵴. */
+	$"B0FC 0171 880F E77C 1EF8 9645 A8B4 969A"            /* °ü.qˆ.ç|.ø–E¨´–š */
+	$"5420 86B9 71CE 0DE5 7A40 B41A DD85 6B30"            /* T †¹qÎ.åz@´.Ý…k0 */
+	$"F02A 3B61 92B4 7A95 269E BF9F DDB3 9FB7"            /* ð*;a’´z•&ž¿ŸÝ³Ÿ· */
+	$"746B 1514 C89D 391B F835 73B8 0F1C 2567"            /* tk..È�9.ø5s¸..%g */
+	$"A0C2 6B37 DFCE 5F4C 1DCD FD79 5CDA A8FF"            /*  Âk7ßÎ_L.Íýy\Ú¨ÿ */
+	$"0603 9014 308F AEB3 EDB7 D721 1709 3897"            /* ..�.0�®³í·×!.Æ8— */
+	$"D3AB 181E 53BE 4025 3492 41C2 5EC7 BFC0"            /* Ó«..S¾@%4’AÂ^Ç¿À */
+	$"EA12 19D0 6158 530B A57B 8A2B 8DFF 18AF"            /* ê..ÐaXS.¥{Š+�ÿ.¯ */
+	$"7651 65CF CD26 3F05 987E 0760 9C3C E3A6"            /* vQeÏÍ&?.˜~.`œ<㦠*/
+	$"86C0 DAB4 C6ED 7F19 8034 85FE DA7E 7963"            /* †ÀÚ´Æí..€4…þÚ~yc */
+	$"AFF2 9CBE 6AAA B6BB B2D3 6F41 BB45 B1EB"            /* ¯òœ¾jª¶»²ÓoA»E±ë */
+	$"9CC2 8803 907A 5CE1 F2D9 AF69 FF22 7DE8"            /* œÂˆ.�z\áòÙ¯iÿ"}è */
+	$"D328 C2A1 0F97 2EE2 9575 E0E6 A665 B85A"            /* Ó(¡.—.â•uàæ¦e¸Z */
+	$"C5D7 6FA0 FE24 BC68 9D74 6CEB C4F9 615C"            /* Å×o þ$¼h�tlëÄùa\ */
+	$"4F34 48B3 7A64 2540 B64F EFBE 8D0F E427"            /* O4H³zd%@¶Oï¾�.ä' */
+	$"4CCA 6DB3 83AC C5F6 EE52 7A43 8172 41E4"            /* LÊm³ƒ¬ÅöîRzC�rAä */
+	$"2CE3 DF2F 1496 97DE 6AD1 2FFF 7E52 D993"            /* ,ãß/.–—ÞjÑ/ÿ~RÙ“ */
+	$"8AF9 AAA3 B192 0991 BFAE 4829 001E 963B"            /* Šùª£±’Æ‘¿®H)..–; */
+	$"019C 8A5D 78E8 6A56 F78C B81A F4D0 6312"            /* .œŠ]xèjV÷Œ¸.ôÐc. */
+	$"C0C4 A9BF 7CA5 75D9 9C23 F3EA 4F39 B325"            /* ÀÄ©¿|¥uÙœ#óêO9³% */
+	$"F6DE 6EF4 7D48 A279 8EA9 5395 0FBC C63F"            /* öÞnô}H¢yŽ©S•.¼Æ? */
+	$"679F CE93 2206 ECA9 079C 2BB7 D094 6A7B"            /* gŸÎ“".ì©.œ+·Ð”j{ */
+	$"1077 277F 88A6 21AE 84C3 EDD4 38FC 36B2"            /* .w'.ˆ¦!®„ÃíÔ8ü6² */
+	$"1F86 8F00 8F56 8825 7713 9061 800A A4CD"            /* .†�.�Vˆ%w.�a€Â¤Í */
+	$"E3D3 0F3C B0AC 0C87 E368 8544 F251 5C39"            /* ãÓ.<°¬.‡ãh…DòQ\9 */
+	$"7D90 1BEF 7805 D624 7380 0A19 E093 3058"            /* }�.ïx.Ö$s€Â.à“0X */
+	$"1C90 467F 5C70 4932 3947 4A95 A450 36C8"            /* .�F.\pI29GJ•¤P6È */
+	$"D4D5 CA85 9922 FA12 D0D8 96CA 9A2F 40A2"            /* ÔÕÊ…™"ú.ÐØ–Êš/@¢ */
+	$"F105 054F 8C56 C164 85B5 C4E6 3EAB D76A"            /* ñ..OŒVÁd…µÄæ>«×j */
+	$"A227 4F09 072C 4682 9B0F 995C 7551 94E7"            /* ¢'OÆ.,F‚›.™\uQ”ç */
+	$"419A 0098 0283 19E8 0489 687B 4F66 B74C"            /* Aš.˜.ƒ.è.‰h{Of·L */
+	$"7F59 C07A A552 B04D 628F E401 E55C A4ED"            /* .YÀz¥R°Mb�ä.å\¤í */
+	$"390F C34D 81BB 9F88 0C50 F50F 9FBD A377"            /* 9.ÃM�»Ÿˆ.Põ.Ÿ½£w */
+	$"F538 3F9C E243 FF47 D346 87F2 444B C479"            /* õ8?œâCÿGÓF‡òDKÄy */
+	$"F6B3 1C76 5125 F487 0FAF 294A DA20 EC56"            /* ö³.vQ%ô‡.¯)JÚ ìV */
+	$"07AB DE07 14C2 1721 F3E0 D687 1F67 039D"            /* .«Þ..Â.!óàÖ‡.g.� */
+	$"461F 0D82 9CAA B2D4 DFC6 6AA5 D31E 4D01"            /* F..‚œª²ÔßÆj¥Ó.M. */
+	$"5AC2 B2BD FD97 7D6E 00D1 7ADF 377C 15A7"            /* Z²½ý—}n.Ñzß7|.§ */
+	$"9681 C7B2 8168 D706 425B 35EF 7298 C053"            /* –�Dz�h×.B[5ïr˜ÀS */
+	$"E198 B5E2 B835 712B 1AD8 BA77 CF86 83A3"            /* ᘵâ¸5q+.غwφƒ£ */
+	$"B0B9 C5E6 F37A A3DE D93B 8EC8 132F A52A"            /* °¹Åæóz£ÞÙ;ŽÈ./¥* */
+	$"AB20 E166 F719 7130 6482 5BE2 605B D78E"            /* « áf÷.q0d‚[â`[׎ */
+	$"672D 7AE6 3906 DA75 0E3D 1962 8A60 9294"            /* g-zæ9.Úu.=.bŠ`’” */
+	$"1FC8 C0F3 216D 815D 4DDE 5DDE D8AB 3F9C"            /* .ÈÀó!m�]MÞ]ÞØ«?œ */
+	$"7F9F 24B3 7BBF CCB9 2F80 19B6 70AE 1B3D"            /* .Ÿ$³{¿Ì¹/€.¶p®.= */
+	$"C71A 1F7C 81D2 639F 0D03 24EA D4B1 D351"            /* Ç..|�ÒcŸ..$êÔ±ÓQ */
+	$"DD10 FBD5 EA3F 4957 A7ED 04C6 384D C10F"            /* Ý.ûÕê?IW§í.Æ8MÁ. */
+	$"8A55 0C03 694F 0D18 70D8 0AC3 33C0 17D1"            /* ŠU..iO..pØÂÃ3À.Ñ */
+	$"73BB E85F 5204 090F FDFE 8AC5 9AD6 22D5"            /* s»è_R.Æ.ýþŠÅšÖ"Õ */
+	$"CA31 A6DE EF44 D910 B34A 0E59 7866 536F"            /* Ê1¦ÞïDÙ.³J.YxfSo */
+	$"9B0B A341 3AB8 C06C C64F 3F86 8160 DFB9"            /* ›.£A:¸ÀlÆO?†�`ß¹ */
+	$"A709 59D8 88C3 3316 9FFA F83F 5120 E40E"            /* §ÆY؈Ã3.Ÿúø?Q ä. */
+	$"4DEA C88F C418 37F6 4C0B 7606 9632 EEC5"            /* MêÈ�Ä.7öL.v.–2îÅ */
+	$"6380 FB25 A69F AAE2 0888 B722 008F 35CB"            /* c€û%¦Ÿªâ.ˆ·".�5Ë */
+	$"F6A7 90BF D0DB 6367 A14B 5A86 EE98 FD18"            /* ö§�¿ÐÛcg¡KZ†î˜ý. */
+	$"A629 1BAB 3BE2 920D E99D BEC2 88B4 F909"            /* ¦).«;â’.é�¾Âˆ´ùÆ */
+	$"66B1 535D 3940 AF78 8200 0C46 142A EA2A"            /* f±S]9@¯x‚..F.*ê* */
+	$"A991 95E8 FD2B D30B 0E4A 76E2 A97B FAA7"            /* ©‘•èý+Ó..Jvâ©{ú§ */
+	$"97E2 9B30 54FA 5E97 962A 7E83 5711 A707"            /* —â›0Tú^—–*~ƒW.§. */
+	$"2A21 3729 2046 9C41 8282 A161 E5F6 AB24"            /* *!7) FœA‚‚¡aåö«$ */
+	$"3324 74CF 1AF6 C935 D884 0008 DC18 663C"            /* 3$tÏ.öÉ5Ø„..Ü.f< */
+	$"3A00 25E4 92D7 8F23 4C07 3C63 DB6E 4924"            /* :.%ä’×�#L.<cÛnI$ */
+	$"7362 34C9 2F1D 105B 97E2 03BF 648F C21C"            /* sb4É/..[—â.¿d�Â. */
+	$"C6AC 3657 2C72 ADAA 2889 0623 6A5D ACEC"            /* Ƭ6W,r­ª(‰.#j]¬ì */
+	$"3210 738F 51F5 CC65 9EA9 7AD3 95CB B265"            /* 2.s�QõÌež©zӕ˲e */
+	$"D54E 6E1D E2A7 2673 E6C2 C247 2FFD C10E"            /* ÕNn.â§&sæÂÂG/ýÁ. */
+	$"5FC5 C1E1 2511 5C8F 6063 92AB E4B9 8212"            /* _ÅÁá%.\�`c’«ä¹‚. */
+	$"3643 6D53 2492 3E58 3E71 15E3 A3B7 AB2A"            /* 6CmS$’>X>q.㣷«* */
+	$"A998 FE5A 74DB 537A CE3D CD46 49B6 DB6D"            /* ©˜þZtÛSzÎ=ÍFI¶Ûm */
+	$"B6DB 6DB2 8EE9 1D6F 6480 8613 D8D2 7D8F"            /* ¶Ûm²Žé.od€†.ØÒ}� */
+	$"5615 3EAB B25B 722D ECB8 ED12 70F2 BA06"            /* V.>«²[r-ì¸í.pòº. */
+	$"E5A2 45C1 547C F861 A7D5 8E1C 08BC 346B"            /* å¢EÁT|øa§ÕŽ..¼4k */
+	$"2730 C670 2FD8 F159 6ABE 2092 ED98 AC34"            /* '0Æp/ØñYj¾ ’혬4 */
+	$"B4CA 8565 90CF 0034 6E68 F777 9672 F29D"            /* ´Ê…e�Ï.4nh÷w–rò� */
+	$"4621 6E73 9C90 5C3D A8DB F5B0 CACF A63E"            /* F!nsœ�\=¨Ûõ°ÊϦ> */
+	$"861E 8B9E F490 8E15 69BC A01D EF59 E898"            /* †.‹žô�Ž.i¼ .ïYè˜ */
+	$"7040 B817 5AA9 BFB1 09A0 FE74 D2F7 BEA8"            /* p@¸.Z©¿±Æ þtÒ÷¾¨ */
+	$"A4F3 FEAC 38A4 409E B504 9CC9 EAA3 533B"            /* ¤óþ¬8¤@žµ.œÉê£S; */
+	$"153D F710 FC9E 2055 A395 C374 2AF9 E7C5"            /* .=÷.üž U£•Ãt*ùçÅ */
+	$"E1E8 7F74 3CDB D568 B606 A9D5 B7AE E207"            /* áè.t<ÛÕh¶.©Õ·®â. */
+	$"947E 2E65 1C27 336D 927A 4F86 5422 0E04"            /* ”~.e.'3m’zO†T".. */
+	$"42C7 668A 9403 EAB7 21A3 C9F1 18BC 5380"            /* BÇfŠ”.ê·!£Éñ.¼S€ */
+	$"BED7 07B5 F9B1 B798 8727 D54A 7A6E E493"            /* ¾×.µù±·˜‡'ÕJznä“ */
+	$"5271 F27D 7C35 DCEE D0BC CB31 C1FB 879F"            /* Rqò}|5ÜîмË1Áû‡Ÿ */
+	$"E074 9EB9 D7BE C9ED D2C8 BD00 C7FC D05B"            /* àtž¹×¾ÉíÒȽ.ÇüÐ[ */
+	$"2B2C 9647 A924 9F22 A06D 62B4 A946 77B7"            /* +,–G©$Ÿ" mb´©Fw· */
+	$"AD6D 60EE C841 997D A7E8 7AD2 AFA8 EEC4"            /* ­m`îÈA™}§èzÒ¯¨îÄ */
+	$"D61F FC06 FD7A E761 AA33 0F74 A08F 8E5B"            /* Ö.ü.ýzçaª3.t �Ž[ */
+	$"B7C0 7C9A 1201 F0F5 6403 E4D0 60D8 92D9"            /* ·À|š..ðõd.äÐ`Ø’Ù */
+	$"84ED 064F 1B29 D7A7 1D77 F4B3 61D6 2651"            /* „í.O.)ק.wô³aÖ&Q */
+	$"329E 2CA5 53B4 956D 1061 3A3A A73B FC8E"            /* 2ž,¥S´•m.a::§;üŽ */
+	$"DD3C 60C9 F855 32FB 3C04 6287 50F7 6BB3"            /* Ý<`ÉøU2û<.b‡P÷k³ */
+	$"B84A 05A6 3145 A832 3BBC CA56 115B 9D7F"            /* ¸J.¦1E¨2;¼ÊV.[�. */
+	$"8ADB 5660 429D 1FF6 4E6D 4899 EFDA 592F"            /* ŠÛV`B�.öNmH™ïÚY/ */
+	$"19DC 9790 802A 1C17 2250 ADEC 0312 2C23"            /* .Ü—�€*.."P­ì..,# */
+	$"223B 1EC8 482C 6E26 DD67 528F 7CDC 1841"            /* ";.ÈH,n&ÝgR�|Ü.A */
+	$"DBCB CF9E 6D26 B564 4FD4 0AB5 DA0B ADE2"            /* ÛËÏžm&µdOÔµÚ.­â */
+	$"C129 D895 00FF 105B 0D0B F4DB 286A B347"            /* Á)Ø•.ÿ.[..ôÛ(j³G */
+	$"A261 30A9 0A9B 7A0D 585B 3991 3217 6FF7"            /* ¢a0©Â›z.X[9‘2.o÷ */
+	$"A368 D6A8 E862 161A 3584 613E 04D9 DBCB"            /* £hÖ¨èb..5„a>.ÙÛË */
+	$"4D96 66A3 B736 F802 D67A 309F 04E6 AFD8"            /* M–f£·6ø.Öz0Ÿ.æ¯Ø */
+	$"888E A8A5 4461 F1F0 1B6B 2DC4 0DFE C676"            /* ˆŽ¨¥Dañð.k-Ä.þÆv */
+	$"8D4E 3750 C3E6 C233 EFC5 368B 6113 5B53"            /* �N7PÃæÂ3ïÅ6‹a.[S */
+	$"08E0 C259 1B88 AA0C 74B0 862E 1024 BB3F"            /* .àÂY.ˆª.t°†..$»? */
+	$"2816 B320 715C 5DFA 9FF0 CBC3 6A85 777A"            /* (.³ q\]úŸðËÃj…wz */
+	$"23CB F89B D813 6706 313E 2CF5 A163 0848"            /* #Ëø›Ø.g.1>,õ¡c.H */
+	$"94C9 3288 B556 53DD 2A45 2302 F28E 7ED1"            /* ”É2ˆµVSÝ*E#.òŽ~Ñ */
+	$"B5A0 67C8 53BB 4CE4 45D9 317F 92AB B13B"            /* µ gÈS»LäEÙ1.’«±; */
+	$"7246 F6DE 5348 49C9 42A1 CA62 64B0 209E"            /* rFöÞSHIÉB¡Êbd° ž */
+	$"43F2 DF7C 9BBC 097F C94A EA52 8D01 ADEF"            /* Còß|›¼Æ.ÉJêR�.­ï */
+	$"5241 7C9B 2876 75F4 D748 AF9D 6FBB 3306"            /* RA|›(vuô×H¯�o»3. */
+	$"0AD1 3953 6C99 5BB7 F1F5 1C1F BCE7 CA83"            /* ÂÑ9Sl™[·ñõ..¼çʃ */
+	$"08C1 6811 FBC5 AE18 343C C6F5 E515 F9CF"            /* .Áh.ûÅ®.4<Æõå.ùÏ */
+	$"FE48 C6E9 956E 6712 DDCA D62C 7F37 6DFE"            /* þHÆé•ng.ÝÊÖ,.7mþ */
+	$"2465 A8EE 1BAF E106 CA62 101F 0144 31DC"            /* $e¨î.¯á.Êb...D1Ü */
+	$"029E ED0F 9E47 F22E 0C17 0D31 E60B 1662"            /* .ží.žGò....1æ..b */
+	$"C1F5 5C90 7D5A 6D03 EAB6 C0C8 1653 E821"            /* Áõ\�}Zm.ê¶ÀÈ.Sè! */
+	$"5860 ED0B C711 39E5 E5C8 268D 2246 E3FB"            /* X`í.Ç.9ååÈ&�"Fãû */
+	$"68A4 3B12 A487 350D FE94 3722 65AC 949B"            /* h¤;.¤‡5.þ”7"e¬”› */
+	$"2526 7CD5 0E28 E093 CFE8 314C BE18 5B60"            /* %&|Õ.(à“Ïè1L¾.[` */
+	$"827E 154B 9609 2536 F890 A361 BA29 8211"            /* ‚~.K–Æ%6ø�£aº)‚. */
+	$"AF42 BEC6 1BCB CE6D 2910 8083 C890 D7FF"            /* ¯B¾Æ.ËÎm).€ƒÈ�×ÿ */
+	$"6F04 CEF4 F47C 0D92 00BD D90F 4095 0A48"            /* o.Îôô|.’.½Ù.@•ÂH */
+	$"4DC6 210C 351D 34A5 5FDA E576 1E1B 1684"            /* MÆ!.5.4¥_Úåv...„ */
+	$"F2A0 B30A 589C 1DBC 4831 E906 0D67 0CDD"            /* ò ³ÂXœ.¼H1é..g.Ý */
+	$"876B 994F 6D66 47DD AF40 7158 4385 738E"            /* ‡k™OmfGݯ@qXC…sŽ */
+	$"82F8 E637 9B5C 7389 0AA5 2A04 D105 5E88"            /* ‚øæ7›\s‰Â¥*.Ñ.^ˆ */
+	$"C2A2 2943 E125 6C2F 0AD1 1E5C AF1F CFF6"            /* ¢)Cá%l/ÂÑ.\¯.Ïö */
+	$"B39B C799 0F39 6151 6625 BB66 C3C3 418B"            /* ³›Ç™.9aQf%»fÃÃA‹ */
+	$"90A4 F6F7 BD30 7A04 88E6 0F8A 3F0B FF2C"            /* �¤ö÷½0z.ˆæ.Š?.ÿ, */
+	$"D18B 1D88 1442 EB54 A6FC D226 251A 015D"            /* Ñ‹.ˆ.BëT¦üÒ&%..] */
+	$"4DA8 32CA 371B 86EB 4E89 1415 9A41 6AD2"            /* M¨2Ê7.†ëN‰..šAjÒ */
+	$"1F0F 7656 41E5 B874 72E7 5F88 ABDA 28D7"            /* ..vVAå¸trç_ˆ«Ú(× */
+	$"37D5 EE40 567F F751 2591 01A3 03B9 EFCD"            /* 7Õî@V.÷Q%‘.£.¹ïÍ */
+	$"E0A8 8CC8 8C8E 0945 3036 453A 1787 59C4"            /* ਌ȌŽÆE06E:.‡YÄ */
+	$"B99C 02D2 D5F6 1B5E E34C 551E 8C43 9A20"            /* ¹œ.ÒÕö.^ãLU.ŒCš  */
+	$"981D 0B44 C6D1 E6AA 2B92 5F33 8016 C4F1"            /* ˜..DÆÑæª+’_3€.Äñ */
+	$"7AA6 E605 4676 A533 1D38 6ADA 9BC6 2C13"            /* z¦æ.Fv¥3.8jÚ›Æ,. */
+	$"385A 3DCE 7E2E B9A1 81BB 27C6 AFF8 FF5D"            /* 8Z=Î~.¹¡�»'Ưøÿ] */
+	$"A511 4C25 DC70 082C B597 3EC4 004C D4B8"            /* ¥.L%Üp.,µ—>Ä.LÔ¸ */
+	$"BE6A B79D EF70 2610 B57B FEFE 6ACC 9EEE"            /* ¾j·�ïp&.µ{þþjÌžî */
+	$"B94A 73A8 4B30 C207 7391 789E C0FE 6992"            /* ¹Js¨K0Â.s‘xžÀþi’ */
+	$"AB13 E2AA FF53 4B22 A338 0EA3 B476 D732"            /* «.âªÿSK"£8.£´v×2 */
+	$"EDA3 2009 3422 B4AA 64DE 26C3 5894 D6DD"            /* í£ Æ4"´ªdÞ&ÃX”ÖÝ */
+	$"F7A9 5A3B 6F31 5D2C EC22 1FAC 928B 647F"            /* ÷©Z;o1],ì".¬’‹d. */
+	$"1600 A961 11C3 FD11 E594 81F9 E0AC 20D4"            /* ..©a.Ãý.å”�ùà¬ Ô */
+	$"0DCA 9CE0 FF14 3BE3 3010 00E1 9DFE F0C8"            /* .Êœàÿ.;ã0..á�þðÈ */
+	$"70E7 D3A5 A7F9 884E 6941 CBCB FEBE 0C27"            /* pçÓ¥§ùˆNiAËËþ¾.' */
+	$"B3F5 BAA4 3068 BFC1 DB20 1E5F 9E83 BF7D"            /* ³õº¤0h¿ÁÛ ._žƒ¿} */
+	$"8EA3 8FB0 F355 FF02 DED2 5CC8 2B4D 4DA5"            /* Ž£�°óUÿ.ÞÒ\È+MM¥ */
+	$"8122 C96A CDAB B130 2D35 B73E 2EE9 0AA9"            /* �"ÉjÍ«±0-5·>.é© */
+	$"7DB8 B81D 7B0A 776B DFF3 2B02 1F6A EF5B"            /* }¸¸.{Âwkßó+..jï[ */
+	$"E6A6 177F D8C0 1C3B A88C 2154 18F3 BFB3"            /* æ¦..ØÀ.;¨Œ!T.ó¿³ */
+	$"F7EF 1249 860B F87F 60D6 AE06 B5B2 7824"            /* ÷ï.I†.ø.`Ö®.µ²x$ */
+	$"E601 91D7 1436 80CF 054C 9691 1321 B299"            /* æ.‘×.6€Ï.L–‘.!²™ */
+	$"11F3 2BA3 51F6 447E 1BC0 28CB 666B 9BA0"            /* .ó+£QöD~.À(Ëfk›  */
+	$"425A E39B 066C 1B7C 340B 950A BDCC E05D"            /* BZã›.l.|4.•Â½Ìà] */
+	$"C8DC 568C BDC6 54E9 0AA2 2D89 6E22 37E4"            /* ÈÜVŒ½ÆTé¢-‰n"7ä */
+	$"3508 39CC EE8F 8EE6 F926 626B E33F 4A06"            /* 5.9Ìî�Žæù&bkã?J. */
+	$"4CD1 AE16 9063 3119 5554 58CA BB53 4A73"            /* LѮ.�c1.UTXʻSJs */
+	$"AA2B 2A71 B86B 3E95 BED6 D9D2 9D59 3E60"            /* ª+*q¸k>•¾ÖÙÒ�Y>` */
+	$"C5D1 FA4C E6A7 880F 30D8 A679 6467 697E"            /* ÅÑúL槈.0ئydgi~ */
+	$"F327 EAA4 E0D1 01F9 9B74 AAA1 6CDD 7DA7"            /* ó'ê¤àÑ.ù›tª¡lÝ}§ */
+	$"D2AB C9CB 63D6 D3DF C778 C6ED 71A5 0571"            /* Ò«ÉËcÖÓßÇxÆíq¥.q */
+	$"C7E1 4EC7 E16C 43F0 75B1 3C9E 91EA AAAC"            /* ÇáNÇálCðu±<ž‘ꪬ */
+	$"9A2E A47E 8DF0 873E 2275 3F71 F986 DF3D"            /* š.¤~�ð‡>"u?qù†ß= */
+	$"DBE5 1F4C 0D83 C3F5 F2D4 5A7C 0BFB E4FC"            /* Ûå.L.ƒÃõòÔZ|.ûäü */
+	$"C83E D8A4 FAF4 F589 09F2 4909 40AA 2AA8"            /* È>ؤúôõ‰ÆòIÆ@ª*¨ */
+	$"C190 BE4D D484 1408 6EAD 722F 6BA6 7502"            /* Á�¾MÔ„..n­r/k¦u. */
+	$"A53F 1B9A BE86 841A FC60 53F3 8AE9 2E4C"            /* ¥?.š¾†„.ü`SóŠé.L */
+	$"4B8E 1D09 F47C 3BAA CFB7 80DE 6A41 F007"            /* KŽ.Æô|;ªÏ·€ÞjAð. */
+	$"80A3 413A C568 5C02 6166 E8AF 9B6C EF86"            /* €£A:Åh\.af诛lï† */
+	$"F178 273B A803 89E9 520A ACFC 0E98 6198"            /* ñx';¨.‰éR¬ü.˜a˜ */
+	$"6ECE D094 76D1 8AF8 1035 D0C8 B9E5 ECC9"            /* nÎДvÑŠø.5ÐȹåìÉ */
+	$"08E6 748A F28B B0E0 F9AB 71B4 7971 9626"            /* .ætŠò‹°àù«q´yq–& */
+	$"5397 5D5A 31CB 5F9E 7C98 8300 72B1 2C67"            /* S—]Z1Ë_ž|˜ƒ.r±,g */
+	$"A38D 0C02 C603 C0C2 2000 E528 0CAA 9472"            /* £�..Æ.À .å(.ª”r */
+	$"3115 8C05 0EE6 3F33 3F6D B6DB 64C7 AAB2"            /* 1.Œ..æ?3?m¶ÛdǪ² */
+	$"94EA DD85 D3DF F14E FF3F D3A2 778B 3749"            /* ”êÝ…ÓßñNÿ?Ó¢w‹7I */
+	$"B31B 6DB6 C5B6 5311 C782 3FCF 2880 6695"            /* ³.m¶Å¶S.Ç‚?Ï(€f• */
+	$"085A 35C2 3938 420E 8705 50BD 51C3 BD21"            /* .Z5Â98B.‡.P½Qý! */
+	$"41B9 C3ED 3A76 367F 40F5 DA53 3618 DF7A"            /* A¹Ãí:v6.@õÚS6.ßz */
+	$"EE11 B2D6 D9AD 4351 7D8F BC5A 7217 9352"            /* î.²ÖÙ­CQ}�¼Zr.“R */
+	$"D43F 54B9 F618 3E0E 5FF8 1599 CD00 5489"            /* Ô?T¹ö.>._ø.™Í.T‰ */
+	$"459D 1B65 0538 7A92 D8EC 6AD5 E756 776E"            /* E�.e.8z’ØìjÕçVwn */
+	$"5B66 A07C 36D6 A4B0 2E00 21E0 ABFC 2AB8"            /* [f |6Ö¤°..!à«ü*¸ */
+	$"F387 5784 0DB9 1978 67FE DEFF 0CCC CCCC"            /* ó‡W„.¹.xgþÞÿ.ÌÌÌ */
+	$"CCCC CCCC CCCC CCD3 5F84 850A F245 C370"            /* ÌÌÌÌÌÌÌÓ_„…ÂòEÃp */
+	$"786E 76C5 56A5 8C9B FC7F 6869 3085 EB26"            /* xnvÅV¥Œ›ü.hi0…ë& */
+	$"6162 A234 8BF4 868D 0BA5 77FA 56D2 31FD"            /* ab¢4‹ô†�.¥wúVÒ1ý */
+	$"7436 0147 944C 2AAE C8C1 DE46 2A3A 2449"            /* t6.G”L*®ÈÁÞF*:$I */
+	$"EAD0 8E9E FF0B 129F 7F9C 1436 A6BC 10E6"            /* êÐŽžÿ..Ÿ.œ.6¦¼.æ */
+	$"3116 7A98 5FF6 97E9 FC84 7136 FEA5 C122"            /* 1.z˜_ö—éü„q6þ¥Á" */
+	$"E58F 44D6 D7A4 0AD3 E9B4 7C91 B833 1F91"            /* å�DÖפÂÓé´|‘¸3.‘ */
+	$"5F0F D8F7 8A80 6560 B332 081A C68D 0FF9"            /* _.Ø÷Š€e`³2..Æ�.ù */
+	$"899F 2CC7 E1D6 FC7E 1DEB C3ED EA04 F55D"            /* ‰Ÿ,ÇáÖü~.ëÃíê.õ] */
+	$"017D B775 48A1 A844 EAB2 8E3A 5FF2 20AF"            /* .}·uH¡¨D겎:_ò ¯ */
+	$"6231 D1B0 D4D9 D308 999B 09F2 95B1 7071"            /* b1Ñ°ÔÙÓ.™›Æò•±pq */
+	$"F57C 1F1E 7960 4639 6A62 5BC6 9E5A D45D"            /* õ|..y`F9jb[ÆžZÔ] */
+	$"F339 9597 BF1B 62EB D128 B3D8 9BD3 52BF"            /* ó9•—¿.bëÑ(³Ø›ÓR¿ */
+	$"0703 43F9 E1C7 940E EA41 F4B1 75E4 891F"            /* ..CùáÇ”.êAô±uä‰. */
+	$"09A4 D439 7DFF 6AB7 EB4F 1253 A9C0 8BBE"            /* ƤÔ9}ÿj·ëO.S©À‹¾ */
+	$"40A0 3CE6 965D F886 A9EF 7E69 712D 41C2"            /* @ <æ–]ø†©ï~iq-A */
+	$"0062 6917 5D06 6548 9FD6 1470 4A0C 8545"            /* .bi.].eHŸÖ.pJ.…E */
+	$"8417 6C73 0C2D DF44 0E4A D5F9 7443 D629"            /* „.ls.-ßD.JÕùtCÖ) */
+	$"E62D DE53 CCFA EAEA E08A F0E1 9D37 9616"            /* æ-ÞSÌúêêàŠðá�7–. */
+	$"C0DA 1FD4 6A42 6CE6 1D10 AB6A 911A 19D2"            /* ÀÚ.ÔjBlæ..«j‘..Ò */
+	$"47A0 4AC5 6A3C 12FF 0FE8 3AFB 7DFD 3D27"            /* G JÅj<.ÿ.è:û}ý=' */
+	$"42C6 E2BA 6DDE D1ED 21CE 1EA0 F444 055B"            /* BÆâºmÞÑí!Î. ôD.[ */
+	$"122A 41EE D8C1 144C B39C 0EEA 014E 7448"            /* .*AîØÁ.L³œ.ê.NtH */
+	$"0B72 7C2C 92B6 0CAC 3CB5 ADA7 8BF8 0C56"            /* .r|,’¶.¬<µ­§‹ø.V */
+	$"1DD5 B763 907F 6B60 8A85 ED4A F87D FBDC"            /* .Õ·c�.k`Š…íJø}ûÜ */
+	$"391D 822B CBF5 7266 0E6B B2D4 32DE 606C"            /* 9.‚+Ëõrf.k²Ô2Þ`l */
+	$"014E 64BF F969 E3A5 C8E4 09EC B205 6391"            /* .Nd¿ùiã¥ÈäÆì².c‘ */
+	$"3081 96F5 9A80 0599 50D2 38FF 635B 9C35"            /* 0�–õš€.™PÒ8ÿc[œ5 */
+	$"97CF A325 D94F B8E1 A794 EABC DA8A 7CC3"            /* —Ï£%ÙO¸á§”ê¼ÚŠ|à */
+	$"8713 2EBB 1EA6 69B0 9A72 A93D 874A 1F30"            /* ‡..».¦i°šr©=‡J.0 */
+	$"4C7B B341 B8CF F61E 7CEE 60CC E9B0 6D85"            /* L{³A¸Ïö.|î`Ìé°m… */
+	$"4F96 977D F85D F85A 08AF 46EF F259 FD70"            /* O–—}ø]øZ.¯FïòYýp */
+	$"E364 C54D 1F3D C951 B1DD 2CB4 8B94 9350"            /* ãdÅM.=ÉQ±Ý,´‹”“P */
+	$"8FFC CD4E D39E 2FF5 DC65 9DB7 2133 6E97"            /* �üÍNÓž/õÜe�·!3n— */
+	$"9705 2AA6 2625 534E B2A2 D775 FCFA 60E0"            /* —.*¦&%SN²¢×uüú`à */
+	$"4929 3681 2E72 5087 F3CD FB3A 6386 36A2"            /* I)6�.rP‡óÍû:c†6¢ */
+	$"5E62 8705 57E4 8441 1986 1487 E88F C834"            /* ^b‡.Wä„A.†.‡è�È4 */
+	$"C59D D57C CCA2 D56F 3889 44AC 0E4D 0E88"            /* Å�Õ|Ì¢Õo8‰D¬.M.ˆ */
+	$"2592 A50A F98D DF1D 17F2 78BD D4AB FDB4"            /* %’¥Âù�ß..òx½Ô«ý´ */
+	$"4249 FBDE 3E56 BE58 B587 88B4 8D75 299F"            /* BIûÞ>V¾Xµ‡ˆ´�u)Ÿ */
+	$"4C92 6D9A 6B17 6153 9A65 4770 E0EC BBEF"            /* L’mšk.aSšeGpàì»ï */
+	$"2F91 8C35 8FFA 04AF 880C D9B6 204A D65E"            /* /‘Œ5�ú.¯ˆ.Ù¶ JÖ^ */
+	$"68DD DBE7 63BC E1C5 CCDD E994 3796 10EF"            /* hÝÛçc¼áÅÌÝé”7–.ï */
+	$"354D C0E7 7A72 E57E EFAC 7C75 E4CE F47F"            /* 5MÀçzrå~ï¬|uäÎô. */
+	$"2E82 A8D0 6401 3CC4 1ACC 4513 1211 DCC9"            /* .‚¨Ðd.<Ä.ÌE...ÜÉ */
+	$"BD7A 47CA F093 83C7 38EB 866D 1ED5 AC6C"            /* ½zGÊð“ƒÇ8ë†m.Õ¬l */
+	$"FF01 C348 CFA1 2532 DAD5 2BDD 8CCC 71C1"            /* ÿ.ÃHÏ¡%2ÚÕ+ÝŒÌqÁ */
+	$"1208 75AA 308B 4796 A89E 0EAF AB67 422A"            /* ..uª0‹G–¨ž.¯«gB* */
+	$"AA43 8162 68BC 9878 8578 419C AB2E 9518"            /* ªC�bh¼˜x…xAœ«.•. */
+	$"A9E0 4298 DB46 36D7 ADD0 DE21 DC41 AEA7"            /* ©àB˜ÛF6×­ÐÞ!ÜA®§ */
+	$"A05D 795D AB14 E247 6750 3EA8 0A31 5A06"            /*  ]y]«.âGgP>¨Â1Z. */
+	$"FAEC AD07 ECF7 C636 A068 22AA E179 7613"            /* úì­.ì÷Æ6 h"ªáyv. */
+	$"30F9 831C 0AFA 38C0 E20B 96A9 464E B57A"            /* 0ùƒ.Âú8Àâ.–©FNµz */
+	$"5AF3 D612 DC70 2A8D 1D09 C7C9 967F 7F7B"            /* ZóÖ.Üp*�.ÆÇÉ–..{ */
+	$"F47F 4017 A722 9853 37C2 DE55 34CF 104E"            /* ô.@.§"˜S7ÂÞU4Ï.N */
+	$"9DD3 35DF DEE2 589C FAF1 07DE 1803 86B1"            /* �Ó5ßÞâXœúñ.Þ..†± */
+	$"2DE6 6B46 FC45 F24E 8718 3B6E D557 8008"            /* -ækFüEòN‡.;nÕW€. */
+	$"FF3B 8EC2 28BD 6146 3EF6 A0FB 0BCA 37C1"            /* ÿ;ŽÂ(½aF>ö û.Ê7Á */
+	$"749B 49F2 F419 9EC5 DC0A A6DE 0CFC 1BD2"            /* t›Iòô.žÅܦÞ.ü.Ò */
+	$"AAF5 4920 1AB3 842A 1813 606E 97CD 0EC2"            /* ªõI .³„*..`n—Í. */
+	$"50D4 84CD F427 569F 776D 940A A6F7 68D7"            /* PÔ„Íô'VŸwm”¦÷h× */
+	$"2A18 4C6D 2056 D254 1226 7F3C 1ED0 7AB8"            /* *.Lm VÒT.&.<.Ðz¸ */
+	$"BEFE 2050 50E6 C5FB 173C 1857 FF7F 86D9"            /* ¾þ PPæÅû.<.Wÿ.†Ù */
+	$"6CE3 E235 1AFA CBB4 D2BE 4E64 9713 B880"            /* lãâ5.úË´Ò¾Nd—.¸€ */
+	$"0C41 2E14 401B D14F 5BA4 AD20 7060 C05E"            /* .A..@.ÑO[¤­ p`À^ */
+	$"2011 000E C557 2951 009C A584 6178 50E8"            /*  ...ÅW)Q.œ¥„axPè */
+	$"6E0D 922F BFF7 EC41 A907 0D2B EF09 3CE0"            /* n.’/¿÷ìA©..+ïÆ<à */
+	$"6344 B3D6 742A 0448 042D 44C3 390B 089B"            /* cD³Öt*.H.-DÃ9..› */
+	$"B0FF 2877 1C62 BE1E AC48 09B0 4667 19BC"            /* °ÿ(w.b¾.¬HÆ°Fg.¼ */
+	$"319D 1FEA ABB5 1EE9 02D8 C845 A20C 2E3F"            /* 1�.ꫵ.é.ØÈE¢..? */
+	$"7010 FA38 E2A0 1F01 2933 0557 19BD 9DCD"            /* p.ú8â ..)3.W.½�Í */
+	$"5486 F044 5838 C953 CC32 2DF8 6A04 30ED"            /* T†ðDX8ÉSÌ2-øj.0í */
+	$"2C42 0A7D 1B38 7F94 4936 5908 39F1 424F"            /* ,BÂ}.8.”I6Y.9ñBO */
+	$"2BFF 7F46 F53E 11D3 DA1E 41B4 67AB 296E"            /* +ÿ.Fõ>.ÓÚ.A´g«)n */
+	$"0B59 6213 9E16 1568 8787 ED75 8822 A102"            /* .Yb.ž..h‡‡íuˆ"¡. */
+	$"DAAC D7D6 FA63 ED91 52D2 E98C 6EEB ABBB"            /* Ú¬×Öúcí‘RÒéŒnë«» */
+	$"5465 7C7C 0CEB 3016 0CC6 5793 D7FF 7FFB"            /* Te||.ë0..ÆW“×ÿ.û */
+	$"34E7 7BDE 794E 6D8C 392D 051A 478B 4AD7"            /* 4ç{ÞyNmŒ9-..G‹J× */
+	$"028C 3119 EDCA 833C 2F1B A23A 5C69 908F"            /* .Œ1.íʃ</.¢:\i�� */
+	$"6F17 C143 83FF 31A8 709D 7BFA B0E4 A884"            /* o.ÁCƒÿ1¨p�{ú°ä¨„ */
+	$"E3DC 88CC DF54 C132 6671 A0D0 B4C3 7721"            /* ã܈ÌßTÁ2fq Ð´Ãw! */
+	$"B5F0 84FF 0FDA 1588 5865 1B6B 94E3 9B46"            /* µð„ÿ.Ú.ˆXe.k”ã›F */
+	$"5CA1 7767 09F4 3448 2242 114C 2705 2C38"            /* \¡wgÆô4H"B.L'.,8 */
+	$"4565 F286 ABC2 AFF5 809D 0C5B BB5E 009C"            /* Eeò†«Â¯õ€�.[»^.œ */
+	$"FCBA BC4C 84FF 45EF F42B 3F8E DEE0 A531"            /* üº¼L„ÿEïô+?ŽÞà¥1 */
+	$"DBBB 2113 7C30 8BB7 76FF 7E55 E6BC 012B"            /* Û»!.|0‹·vÿ~Uæ¼.+ */
+	$"EBDE EF62 0981 DCE1 AC6E 5AD7 D8AD 0560"            /* ëÞïbÆ�Üá¬nZ×Ø­.` */
+	$"5B36 3A62 5B57 3E03 75AC 25FB B396 1086"            /* [6:b[W>.u¬%û³–.† */
+	$"5EF0 4C11 ACE0 90D2 6568 EB55 75AB FF24"            /* ^ðL.¬à�ÒehëUu«ÿ$ */
+	$"54B8 0E77 3110 5C67 3138 8369 5BEA 3458"            /* T¸.w1.\g18ƒi[ê4X */
+	$"7FFE 6000 9940 0044 18C6 1A34 14B6 9CD2"            /* .þ`.™@.D.Æ.4.¶œÒ */
+	$"C039 2A00 00CC 8F27 9EFE FF80 1CAA 8000"            /* À9*..Ì�'žþÿ€.ª€. */
+	$"0000 0000 D9B1 C1D0 BFE1 D01D 2DD4 E3DF"            /* ....Ù±ÁпáÐ.-Ôãß */
+	$"949B 6DB6 DB6D B83D 6B98 82BC 446D 0CB3"            /* ”›m¶Ûm¸=k˜‚¼Dm.³ */
+	$"55A5 C140 D9E5 5E98 37AF 0E38 4474 B8DC"            /* U¥Á@Ùå^˜7¯.8Dt¸Ü */
+	$"FCFA B14E BD14 730B DAA0 4B18 1B4D 81E7"            /* üú±N½.s.Ú K..M�ç */
+	$"B8A8 26E7 EFB0 8272 4619 2A00 0000 0000"            /* ¸¨&çï°‚rF.*..... */
+	$"0000 0000 0000 060D CD91 05BE 3A07 80DE"            /* ........Í‘.¾:.€Þ */
+	$"29D6 2680 7867 5359 9411 F430 48D9 A22D"            /* )Ö&€xgSY”.ô0HÙ¢- */
+	$"DF74 0855 C0C4 C5AA D3F4 FC40 5815 C5FC"            /* ßt.UÀÄŪÓôü@X.Åü */
+	$"B741 3001 FF7F FDC6 00B8 F1BA FEC9 B662"            /* ·A0.ÿ.ýÆ.¸ñºþɶb */
+	$"4973 2EE9 5029 E237 296D D4A4 04DE 4DB9"            /* Is.éP)â7)mÔ¤.ÞM¹ */
+	$"5305 FD42 9A82 6842 EF09 9DA2 201D C6EF"            /* S.ýBš‚hBïÆ�¢ .Æï */
+	$"4078 4FC3 038C B201 A1C0 0791 7B09 CF18"            /* @xOÃ.Œ².¡À.‘{ÆÏ. */
+	$"D61B DABD 0409 372B F69D 3CF8 E2E1 31A1"            /* Ö.Ú½.Æ7+ö�<øâá1¡ */
+	$"023B B0FD 60B3 3933 16F2 C716 9259 82F8"            /* .;°ý`³93.òÇ.’Y‚ø */
+	$"77BB 3A47 46D2 D998 7AA1 01E1 DF78 8000"            /* w»:GFÒÙ˜z¡.áßx€. */
+	$"0000 0001 D8FD 4FB2 C620 0000 005A CD78"            /* ....ØýO²Æ ...ZÍx */
+	$"B755 53CD E910 3B50 96A8 4000 0000 0003"            /* ·USÍé.;P–¨@..... */
+	$"FD6F 5DD1 31D8 A087 6BC5 09F3 E81E B49F"            /* ýo]Ñ1Ø ‡kÅÆóè.´Ÿ */
+	$"5A88 0DB9 2492 4924 9234 EE49 0E46 EE5B"            /* Zˆ.¹$’I$’4îI.Fî[ */
+	$"8D2A E866 7AD0 1F3C 936D 50EF 6EF5 FDE7"            /* �*èfzÐ.<“mPïnõýç */
+	$"BFFE 6EFF 82AD 0EDF 556D B01D C573 CA68"            /* ¿þnÿ‚­.ßUm°.ÅsÊh */
+	$"985A F307 82C5 D933 4C26 B9EE EEF7 D4C6"            /* ˜Zó.‚ÅÙ3L&¹îî÷ÔÆ */
+	$"BFB5 4130 F610 4AFE 602E 3723 0C95 0000"            /* ¿µA0ö.Jþ`.7#.•.. */
+	$"0000 0000 0000 0000 0002 7F7E DE44 DDEB"            /* ...........~ÞDÝë */
+	$"B8B1 0AB8 BA80 7F79 D59C 851A 0244 B8D1"            /* ¸±Â¸º€.yÕœ…..D¸Ñ */
+	$"6B92 AB1A 4997 5556 C0C7 5935 05AD B380"            /* k’«.I—UVÀÇY5.­³€ */
+	$"318D A387 1E5F 1523 0170 B5DB D9FA 0E80"            /* 1�£‡._.#.pµÛÙú.€ */
+	$"7342 6634 1E36 FB10 615A 1862 FF53 1545"            /* sBf4.6û.aZ.bÿS.E */
+	$"C795 B42C 8282 534C 3AFD D370 7621 820E"            /* Ç•´,‚‚SL:ýÓpv!‚. */
+	$"9EDA AF3A 476B 3537 E327 52DE 4A99 73D1"            /* žÚ¯:Gk57ã'RÞJ™sÑ */
+	$"0718 7C16 82D5 99A5 32DD 0E83 9C4F 60F8"            /* ..|.‚Õ™¥2Ý.ƒœO`ø */
+	$"0743 325D 2056 84FF 06BC C6BB 338C 64CF"            /* .C2] V„ÿ.¼Æ»3ŒdÏ */
+	$"B7B9 C4C7 9800 E4DA EE0A 6636 DEE8 B8F8"            /* ·¹Äǘ.äÚîÂf6Þè¸ø */
+	$"739E 1EBD 408C C620 9790 A337 E987 2E54"            /* sž.½@ŒÆ —�£7é‡.T */
+	$"DD4A E501 C0BF 44E6 E8EF ACCF 028F 253C"            /* ÝJå.À¿Dæèï¬Ï.�%< */
+	$"F466 FA92 BEE6 A066 F4B6 5B41 CA80 3567"            /* ôfú’¾æ fô¶[AÊ€5g */
+	$"A079 E31D CEE9 CD64 0AED 265D E591 B98C"            /*  yã.ÎéÍdÂí&]呹Œ */
+	$"DF22 C203 3C43 E1D8 5D64 CA99 E6C7 EF30"            /* ß"Â.<CáØ]dÊ™æÇï0 */
+	$"68AF F4C9 97D5 F961 48CF 954C 2832 33A3"            /* h¯ôÉ—ÕùaHÏ•L(23£ */
+	$"0088 1417 0D84 DDE1 23FA C81D 487D C9AB"            /* .ˆ...„Ýá#úÈ.H}É« */
+	$"F239 ABB4 24E0 6694 291C 885C 23CE F212"            /* ò9«´$àf”).ˆ\#Îò. */
+	$"29F4 5656 7DD1 182A 2C11 AAEF 7534 24EE"            /* )ôVV}Ñ.*,.ªïu4$î */
+	$"9886 347F 28AD 6952 0A82 E9A4 6AA9 9390"            /* ˜†4.(­iR‚é¤j©“� */
+	$"06A8 EF47 527A EDF2 894B 5234 A900 82B1"            /* .¨ïGRzíò‰KR4©.‚± */
+	$"724D 791B 676C BC97 B3A5 94F7 137E FE8D"            /* rMy.gl¼—³¥”÷.~þ� */
+	$"50F5 C1EE 0C5B 1F3D CEF4 DD64 709C 095B"            /* PõÁî.[.=ÎôÝdpœÆ[ */
+	$"A51A B239 3EC3 C9BA 39EC DBE2 FB9A 3C6F"            /* ¥.²9>Ãɺ9ìÛâûš<o */
+	$"BBC4 DE3E C5AF 0043 DC2D AE64 C0A7 2039"            /* »ÄÞ>ů.CÜ-®dÀ§ 9 */
+	$"A6C9 6079 72D6 0BC7 C501 A3A4 5EF4 A060"            /* ¦É`yrÖ.ÇÅ.£¤^ô ` */
+	$"C46E FCB9 1958 AD83 1176 0776 81C2 13C2"            /* Änü¹.X­ƒ.v.v�Â. */
+	$"DF08 4A76 137F DC5C 4867 0493 EE96 8373"            /* ß.Jv..Ü\Hg.“î–ƒs */
+	$"4644 13A4 F789 39FF 813B D226 575A 5A18"            /* FD.¤÷‰9ÿ�;Ò&WZZ. */
+	$"3AF5 4B88 2747 3D47 681F 9670 0069 DD02"            /* :õKˆ'G=Gh.–p.iÝ. */
+	$"4252 ADB0 D6FB F1F1 1432 C24B D920 7290"            /* BR­°Öûññ.2ÂKÙ r� */
+	$"3709 3D60 15D9 0C49 23EC 77F8 F791 F132"            /* 7Æ=`.Ù.I#ìwø÷‘ñ2 */
+	$"046E 0D05 9AFA 210A 9992 29D9 7AA6 F18E"            /* .n..šú!™’)Ùz¦ñŽ */
+	$"E245 75E0 018F BCEB 8D1B C2D0 083E 985F"            /* âEuà.�¼ë�.ÂÐ.>˜_ */
+	$"B791 554D F5F5 AD71 E064 75E6 1F3A D463"            /* ·‘UMõõ­qàduæ.:Ôc */
+	$"9A59 0A43 3457 BD7C 44A7 5C5E 9D19 C5D8"            /* šYÂC4W½|D§\^�.ÅØ */
+	$"5880 C2CC 5DF0 2964 C0FD ABA1 004B 008D"            /* X€ÂÌ]ð)dÀý«¡.K.� */
+	$"5205 7F2E 0843 E484 2D37 9C34 2425 7AFF"            /* R....Cä„-7œ4$%zÿ */
+	$"7021 D907 B6E1 F5E5 02C3 F3DD 44C8 2252"            /* p!Ù.¶áõå.ÃóÝDÈ"R */
+	$"0649 3C1A 1A80 449A 64D1 1720 76D6 4987"            /* .I<..€DšdÑ. vÖI‡ */
+	$"B4B1 E749 E899 BF69 5B35 F925 2EE6 6CE6"            /* ´±çI虿i[5ù%.ælæ */
+	$"B4FD CEB3 54C0 7C9D 4380 F93B 5701 F274"            /* ´ýγTÀ|�C€ù;W.òt */
+	$"C4F3 CC20 F972 1FD1 56B3 911D 2995 5FC9"            /* ÄóÌ ùr.ÑV³‘.)•_É */
+	$"1F35 BAE0 9AC7 3082 1372 C1D5 4B23 D79E"            /* .5ºàšÇ0‚.rÁÕK#מ */
+	$"EF63 A93F 8E74 26FB AC68 CDBE BD3E 9720"            /* ïc©?Žt&û¬h;½>—  */
+	$"DF71 956D 5D26 559E 2795 2F1B F798 7821"            /* ßq•m]&Už'•/.÷˜x! */
+	$"F3CB 1E6F 2351 11BD 0EFF 19B2 40A2 1C7F"            /* óË.o#Q.½.ÿ.²@¢.. */
+	$"267D D302 F6AE 5410 1E96 40DC 386E CB7B"            /* &}Ó.ö®T..–@Ü8nË{ */
+	$"7EA3 5CF7 46BA 8758 D0EE 12B3 34DF 46FE"            /* ~£\÷Fº‡XÐî.³4ßFþ */
+	$"517B E0F8 7E28 83A5 E93A C06D 7C3F 254B"            /* Q{àø~(ƒ¥é:Àm|?%K */
+	$"53DF 91ED F6AB FD0A 53A0 5257 F9B8 E8B7"            /* Sß‘íö«ýÂS RWù¸è· */
+	$"5A14 6036 C6DA E3FE C29D 799F 8B43 46D6"            /* Z.`6ÆÚãþÂ�yŸ‹CFÖ */
+	$"94DF 1954 073C 7C30 40F4 A00D 93D4 AADF"            /* ”ß.T.<|0@ô .“ﻧ */
+	$"4839 EF36 F92A 3758 97CE 955A 3521 3CB5"            /* H9ï6ù*7X—ΕZ5!<µ */
+	$"8269 30A7 2A93 6A40 07BE DCC3 50B6 C86B"            /* ‚i0§*“j@.¾ÜÃP¶Èk */
+	$"CE9A AF28 3B80 4FE6 873C DB8E A29C 15DC"            /* Κ¯(;€Oæ‡<ÛŽ¢œ.Ü */
+	$"81A8 F841 4F77 6237 7267 55C4 1289 2DA1"            /* �¨øAOwb7rgUÄ.‰-¡ */
+	$"8392 424A 398F 9FA7 8DBE 2CC6 44E9 A005"            /* ƒ’BJ9�Ÿ§�¾,ÆDé . */
+	$"0E57 6638 ADDD 9F15 D32E 13A9 F752 67BA"            /* .Wf8­ÝŸ.Ó..©÷Rgº */
+	$"9F1D 753C 0023 2BC1 2C48 19AF FF28 66E6"            /* Ÿ.u<.#+Á,H.¯ÿ(fæ */
+	$"0A05 1D62 536F C372 7DEC 5069 B44D AFD4"            /* Â..bSoÃr}ìPi´M¯Ô */
+	$"BE3C 9C16 161E 95B4 89E7 B034 4524 E373"            /* ¾<œ...•´‰ç°4E$ãs */
+	$"D4A2 2F82 F1BB 8F20 7861 0F95 7CDF C184"            /* Ô¢/‚ñ»� xa.•|ßÁ„ */
+	$"5B65 6015 001B F6BD 5D52 D4BC 3A42 FD56"            /* [e`...ö½]RÔ¼:BýV */
+	$"D48F 3358 7432 09BD FF19 625D 3A11 13DA"            /* Ô�3Xt2ƽÿ.b]:..Ú */
+	$"F222 12E8 5A1B 12BF 9B3B A234 A367 8FB6"            /* ò".èZ..¿›;¢4£g�¶ */
+	$"4BF2 EE99 DB11 5D13 7021 71B4 2280 A1BC"            /* Kòî™Û.].p!q´"€¡¼ */
+	$"2AEF ECB5 D7EC 047C 0860 9676 78B1 CA76"            /* *ïìµ×ì.|.`–vx±Êv */
+	$"9AFB C995 D4EB 900A AD98 6423 E572 B68C"            /* šûÉ•Ôë�­˜d#år¶Œ */
+	$"A271 A30B D157 8E95 8250 29BB 0323 E26C"            /* ¢q£.ÑWŽ•‚P)».#âl */
+	$"9223 91C7 0CD4 F0B0 442E 1BD3 1473 C699"            /* ’#‘Ç.Ôð°D..Ó.sÆ™ */
+	$"2D1C 8791 C699 920E 72C0 0D3E F6E9 9E2B"            /* -.‡‘Æ™’.rÀ.>öéž+ */
+	$"60B6 A87F 6CBE 146C 1224 90FC BF7B C6A9"            /* `¶¨.l¾.l.$�ü¿{Æ© */
+	$"090E 3EAD C89D 5065 414B 3A1C F271 9327"            /* Æ.>­È�PeAK:.òq“' */
+	$"D490 CD2B FBB3 BEFF 768D 4601 635B A746"            /* Ô�Í+û³¾ÿv�F.c[§F */
+	$"8A4B 0981 8B8F EA85 D255 2113 8792 CC76"            /* ŠKÆ�‹�ê…ÒU!.‡’Ìv */
+	$"DE84 B950 C5F4 A4C1 D4EF 7D52 CC74 CCEE"            /* Þ„¹PÅô¤ÁÔï}RÌtÌî */
+	$"B40E B94F 9467 15CA 1DE0 3557 BF09 D787"            /* ´.¹O”g.Ê.à5W¿Æׇ */
+	$"ED66 345A E153 B4DC EF7C 2952 3161 5A99"            /* íf4ZáS´Üï|)R1aZ™ */
+	$"A193 D5EB 40F5 1300 65FA 8DFD 621A AE94"            /* ¡“Õë@õ..eú�ýb.®” */
+	$"30CD 6D25 A0FC 942E 37AC 52C8 CEAD 2D1F"            /* 0Ím% ü”.7¬RÈέ-. */
+	$"87D5 D078 F173 F5AD 7A56 DD1B 10C3 F9BF"            /* ‡ÕÐxñsõ­zVÝ..Ãù¿ */
+	$"69C1 9E6B E021 A0C7 84BF D87A 8AA8 327C"            /* iÁžkà! Ç„¿ØzŠ¨2| */
+	$"7D48 0D97 E584 FF7F AE07 2001 BF6C 2691"            /* }H.—å„ÿ.®. .¿l&‘ */
+	$"3032 E118 8741 42AD 7709 3086 8488 F9D3"            /* 02á.‡AB­wÆ0†„ˆùÓ */
+	$"0353 D79E 2E21 8F21 46CC 005C DA8A 0229"            /* .Sמ.!�!FÌ.\ÚŠ.) */
+	$"A56B A72A C69E FCF7 7558 5D72 0050 2BDE"            /* ¥k§*Æžü÷uX]r.P+Þ */
+	$"0F36 E4F0 C744 89FC 37F0 7ECA F488 FE8C"            /* .6äðÇD‰ü7ð~ÊôˆþŒ */
+	$"1B6B 0158 B34D 1EA6 9B1F 154E FF79 01D4"            /* .k.X³M.¦›..Nÿy.Ô */
+	$"725F D9CF D9BF CCFF 439D 8F5C A92D D20D"            /* r_ÙÏÙ¿ÌÿC��\©-Ò. */
+	$"0613 88F8 5C1C B6BD 07B9 9078 151D 8353"            /* ..ˆø\.¶½.¹�x..ƒS */
+	$"0E68 8495 D521 92D8 E92D CF9B 10E6 ABDC"            /* .h„•Õ!’Øé-Ï›.æ«Ü */
+	$"53D9 DFB2 F2AF F964 14E3 74D6 3D64 01E2"            /* SÙß²ò¯ùd.ãtÖ=d.â */
+	$"FAFB 2D0B D303 DCF7 7718 E6CF 30DB 3FAE"            /* úû-.Ó.Ü÷w.æÏ0Û?® */
+	$"2873 3339 54A3 1E48 04D2 FDF2 E863 6201"            /* (s39T£.H.Òýòècb. */
+	$"01D1 182C 4C2A D85D AE26 DE15 9796 494C"            /* .Ñ.,L*Ø]®&Þ.—–IL */
+	$"82EA B4C0 2D3C 3D3E 1732 2ACA AC27 B7DB"            /* ‚ê´À-<=>.2*ʬ'·Û */
+	$"5CED 6F9D 3EDB FF04 5E83 BE60 1636 AE2C"            /* \ío�>Ûÿ.^ƒ¾`.6®, */
+	$"754D 2928 7128 ACFD 15E8 C1A0 30A5 1063"            /* uM)(q(¬ý.èÁ 0¥.c */
+	$"1E6F 10F7 A946 B9B4 D921 5DB3 113F 332E"            /* .o.÷©F¹´Ù!]³.?3. */
+	$"61B8 AB3D 2F87 E081 C9D9 32B7 1060 785A"            /* a¸«=/‡à�ÉÙ2·.`xZ */
+	$"EFDD F472 0283 E235 4D42 E903 A06B 51CB"            /* ïÝôr.ƒâ5MBé. kQË */
+	$"39DC A412 A492 918E 235E F57C E4CE 4E0F"            /* 9ܤ.¤’‘Ž#^õ|äÎN. */
+	$"6BE6 7036 FA8A 7B2C 21FE 60B1 6FCA 7654"            /* kæp6úŠ{,!þ`±oÊvT */
+	$"C9FD DCDF E497 B2A6 D6D5 87ED 9D3B 5B86"            /* ÉýÜßä—²¦ÖÕ‡í�;[† */
+	$"DA51 6B5B AE3E 520B 1DB3 5A6B 2B4D A777"            /* ÚQk[®>R..³Zk+M§w */
+	$"4F13 A04C 7D4F 819B 1FEB 086D 5F34 6643"            /* O. L}O�›.ë.m_4fC */
+	$"0208 693A D70C 55B2 7A07 BC27 3A41 B739"            /* ..i:×.U²z.¼':A·9 */
+	$"C1F5 7425 07D5 D74C 1F56 F680 F1C4 B0CB"            /* Áõt%.Õ×L.Vö€ñÄ°Ë */
+	$"F3E0 DE80 53FC 256D EFD0 6B64 028C EC70"            /* óàÞ€Sü%mïÐkd.Œìp */
+	$"4973 06D4 242C DAAA 8373 DFAC B0C9 14A1"            /* Is.Ô$,Úªƒs߬°É.¡ */
+	$"BFBC 0BB4 E250 919E 3D2B B388 3A89 FB02"            /* ¿¼.´âP‘ž=+³ˆ:‰û. */
+	$"9796 86E6 20F8 C26C 8120 349C 757A 6875"            /* —–†æ øÂl� 4œuzhu */
+	$"F63E AE68 84C3 03A3 6F64 F9EE F892 2CF8"            /* ö>®h„Ã.£odùîø’,ø */
+	$"61C1 B13A E941 0D67 DA36 4C05 9565 DC85"            /* aÁ±:éA.gÚ6L.•eÜ… */
+	$"D7F8 6EB9 D903 D428 F59A 3EBF C73E 5E95"            /* ×øn¹Ù.Ô(õš>¿Ç>^• */
+	$"764D 15FB 98F2 BECE 0FC8 EA3C 4E51 E1DD"            /* vM.û˜ò¾Î.Èê<NQáÝ */
+	$"5253 CE7A 2D16 8527 AF8E 9A17 757A A42F"            /* RSÎz-.…'¯Žš.uz¤/ */
+	$"6CA9 6BB3 7787 D84F 8E20 EA1F FB2D 15E3"            /* l©k³w‡ØOŽ ê.û-.ã */
+	$"0D2C 45A8 8C80 7DA1 89DB 5F46 F3FB 2871"            /* .,E¨Œ€}¡‰Û_Fóû(q */
+	$"539E 8CCA 5C03 EF20 B6B5 4956 EB82 172C"            /* SžŒÊ\.ï ¶µIVë‚., */
+	$"AB28 0D6D 4DF9 1F61 6F8D 61FE E962 778D"            /* «(.mMù.ao�aþébw� */
+	$"0C8E EC55 3BDC EC81 C9D1 E7D5 A811 C69A"            /* .ŽìU;Üì�ÉÑçÕ¨.Æš */
+	$"6186 BC2C 75B4 DD3D C207 1151 4C3B 4175"            /* a†¼,u´Ý=Â..QL;Au */
+	$"942E 2ACF D3C7 7122 9D89 31B3 0918 EDC0"            /* ”.*ÏÓÇq"�‰1³Æ.íÀ */
+	$"9D45 75D8 DE61 5036 6D9F 3373 4827 7ADE"            /* �EuØÞaP6mŸ3sH'zÞ */
+	$"1BD1 16E8 8905 37D4 D811 1077 B359 0FF6"            /* .Ñ.è‰.7ÔØ..w³Y.ö */
+	$"0460 F360 20A5 B532 3418 142A B432 C2E9"            /* .`ó` ¥µ24..*´2Âé */
+	$"A0D6 DB04 317D 28F3 C893 AAE3 19B1 5742"            /*  ÖÛ.1}(óÈ“ªã.±WB */
+	$"7BF6 615C 0EAC F35E 0CD4 B142 A289 5458"            /* {öa\.¬ó^.Ô±B¢‰TX */
+	$"D699 1584 46FF 7174 758F B1F8 F540 F427"            /* Ö™.„Fÿqtu�±øõ@ô' */
+	$"A496 8795 E66B 3DDC FB80 D0B8 9411 7240"            /* ¤–‡•æk=Üû€Ð¸”.r@ */
+	$"0374 54DC B2CA C982 BD5E FD06 4B02 5E8D"            /* .tTܲÊÉ‚½^ý.K.^� */
+	$"A958 79AA 5BE6 B5A2 76C3 7C23 0D45 6768"            /* ©Xyª[æµ¢vÃ|#.Egh */
+	$"D726 8259 FD2E E5CE 9B70 0600 22E7 82A3"            /* ×&‚Yý.åΛp.."ç‚£ */
+	$"8E14 9626 C4EC EED9 E7D8 13C9 623F 3DEB"            /* Ž.–&ÄìîÙçØ.Éb?=ë */
+	$"357B E617 A43A C9D4 328A C30A FF45 71BA"            /* 5{æ.¤:ÉÔ2ŠÃÂÿEqº */
+	$"1F8B 3945 8E06 0CF0 4749 0840 6F5A EDDB"            /* .‹9EŽ..ðGI.@oZíÛ */
+	$"29AC E877 27BD 6C8C A131 8A1C 9228 0FC5"            /* )¬èw'½lŒ¡1Š.’(.Å */
+	$"A029 D1A1 324D EFCE EB3F 2B92 150D FB8C"            /*  )Ñ¡2MïÎë?+’..ûŒ */
+	$"5399 1ABD D375 08BF 8F3F E788 684D 3064"            /* S™.½Óu.¿�?çˆhM0d */
+	$"70B4 A733 4AB6 239A DC03 724F C8B8 F1BB"            /* p´§3J¶#šÜ.rOȸñ» */
+	$"8F1F A795 FF18 8256 0050 FF74 EDF1 3D05"            /* �.§•ÿ.‚V.Pÿtíñ=. */
+	$"6CB0 E566 9272 E493 C085 3D06 3116 4ECE"            /* l°åf’rä“À…=.1.NÎ */
+	$"402D 329F 4BBB 2598 A7CF BEE1 333D 9019"            /* @-2ŸK»%˜§Ï¾á3=�. */
+	$"61BB 1A29 2616 E907 2CD6 F64C 456F 9881"            /* a».)&.é.,ÖöLEo˜� */
+	$"725B 5C38 A40D 60D3 6B4F FDF1 87D7 4786"            /* r[\8¤.`ÓkOýñ‡×G† */
+	$"29BF CAEB 223A 044D 0F61 FDE6 0A3E 7727"            /* )¿Êë":.M.aýæÂ>w' */
+	$"DDEE 0A95 231F 04AC B6EF D134 C09D 1540"            /* Ýî•#..¬¶ïÑ4À�.@ */
+	$"0E94 57E2 8418 C208 1F26 7396 96A0 D08F"            /* .”Wâ„.Â..&s–– Ð� */
+	$"0CC0 40C8 C596 39BA 0CAE A6ED F8E8 7D6B"            /* .À@ÈÅ–9º.®¦íøè}k */
+	$"A76C 391B 6113 555F 62E0 6E14 5D27 E7BC"            /* §l9.a.U_bàn.]'ç¼ */
+	$"EDB7 D038 DED2 7BEE FC9D 6211 241E 0795"            /* í·Ð8ÞÒ{îü�b.$..• */
+	$"9CDE 1607 B4C7 828E 24D2 4E9F FCA0 36EA"            /* œÞ..´Ç‚Ž$ÒNŸü 6ê */
+	$"004C C960 1680 01CE 7FF6 A201 EDAB 1ADF"            /* .LÉ`.€.Î.ö¢.í«.ß */
+	$"80D8 4524 390C 23DD EA8E 062C 5DDB 3C57"            /* €ØE$9.#ÝêŽ.,]Û<W */
+	$"BAEC 18E5 1ECE 91D7 A40E 08ED 23EA 55B6"            /* ºì.å.Αפ..í#êU¶ */
+	$"AA2C F48A 7B0E 8CAE 90DD 5840 41FF 7F4C"            /* ª,ôŠ{.Œ®�ÝX@Aÿ.L */
+	$"47AD E774 87C4 9AB1 9CAD E633 DECD 3E36"            /* G­çt‡Äš±œ­æ3ÞÍ>6 */
+	$"00C2 0E05 134F 4802 3846 3575 1902 676D"            /* .Â...OH.8F5u..gm */
+	$"1006 D8AE 0D5F 1934 78F6 0721 F3C4 1000"            /* ..Ø®._.4xö.!óÄ.. */
+	$"8991 FA85 45B5 37A9 5A0C 54EE 014B 297B"            /* ‰‘ú…Eµ7©Z.Tî.K){ */
+	$"52F2 5ADD 7422 C97B EAA9 D291 45A7 A44A"            /* RòZÝt"É{ê©Ò‘E§¤J */
+	$"40FE AE73 5086 C7D3 85FD D734 67F2 8909"            /* @þ®sP†ÇÓ…ý×4gò‰Æ */
+	$"506D 36D8 2361 990C 802F A59E B603 9C94"            /* Pm6Ø#a™.€/¥ž¶.œ” */
+	$"F7BD AED9 8518 8651 DFFE 3D0E E920 E874"            /* ÷½®Ù….†Qßþ=.é èt */
+	$"FEB0 EE3C 3242 C249 4704 EEA8 9EFA DC61"            /* þ°î<2BÂIG.úÜa */
+	$"49C6 929E 2A9D 51CD FE0A FF02 3DDB 01EC"            /* IÆ’ž*�QÍþÂÿ.=Û.ì */
+	$"80E8 630A B0C8 C9FC 7693 C60B 07E8 5D2F"            /* €èc°ÈÉüv“Æ..è]/ */
+	$"B97A 9F04 444E C836 DD68 FF12 EC9C 7E4F"            /* ¹zŸ.DNÈ6Ýhÿ.ìœ~O */
+	$"3CE9 83A8 191A 1E61 05F8 90FF 67E8 011A"            /* <部...a.ø�ÿgè.. */
+	$"71EA 3EE8 AFBD 6328 ED84 9807 788D F3BC"            /* qê>诽c(턘.x�ó¼ */
+	$"2FA0 A210 7FFF 1D02 2519 4EC7 2A80 7FD0"            /* / ¢..ÿ..%.NÇ*€.Ð */
+	$"2064 A8F4 CC78 5EC8 88AF F1AB 868B 9F8D"            /*  d¨ôÌx^Ȉ¯ñ«†‹Ÿ� */
+	$"883E 3FDA D188 FBB7 3AFC 0C72 E01A CEF3"            /* ˆ>?Úшû·:ü.rà.Îó */
+	$"21E1 1718 4FDB 9A43 3767 424A 639B DFFE"            /* !á..OÛšC7gBJc›ßþ */
+	$"CA5F 7BA9 8F82 3EA6 6D4E 6986 6945 80DE"            /* Ê_{©�‚>¦mNi†iE€Þ */
+	$"8274 4927 166A 6062 DF1D 0A72 F23B FA5A"            /* ‚tI'.j`bß.Ârò;úZ */
+	$"4DE4 5D19 54FC 488B 5237 FF5F 7B81 62C5"            /* Mä].TüH‹R7ÿ_{�bÅ */
+	$"F6B7 B580 3016 11B6 22CF 63B8 428A D39A"            /* ö·µ€0..¶"Ïc¸BŠÓš */
+	$"5AC3 80FF 7310 8386 FF54 F361 304F 3BB5"            /* ZÀÿs.ƒ†ÿTóa0O;µ */
+	$"A7EB 0419 7DFB 6E56 20A8 3670 9018 9CB3"            /* §ë..}ûnV ¨6p�.œ³ */
+	$"4B35 7082 32A7 E917 9CF8 FF7F FF80 0A6C"            /* K5p‚2§é.œøÿ.ÿ€Âl */
+	$"A48C 447E 3ECF 411D 89E4 F923 373B DCBE"            /* ¤ŒD~>ÏA.‰äù#7;ܾ */
+	$"2CE8 6580 0F87 1A23 1D93 62AE 48EF DEB8"            /* ,èe€.‡.#.“b®HïÞ¸ */
+	$"5DE8 DB68 1CA3 8D4B D3FE A476 7B3D ACAA"            /* ]èÛh.£�KÓþ¤v{=¬ª */
+	$"284F 83EB 428F A201 D122 CB1A CCB2 C1FE"            /* (OƒëB�¢.Ñ"Ë.̲Áþ */
+	$"367F 60D3 155D 8C00 22D8 ED33 D56B 1DE2"            /* 6.`Ó.]Œ."Øí3Õk.â */
+	$"98B0 A4A9 E041 2BF1 AA58 E78D 47E5 929F"            /* ˜°¤©àA+ñªXç�Gå’Ÿ */
+	$"85DA 699E C45A 0064 B931 CF2B 4169 44F0"            /* …ÚižÄZ.d¹1Ï+AiDð */
+	$"4B4F 083B 3D7C B2B2 D87B 785E 91A8 C614"            /* KO.;=|²²Ø{x^‘¨Æ. */
+	$"6EE6 A63C C8A7 B9E3 839D E245 4128 3BF9"            /* næ¦<ȧ¹ãƒ�âEA(;ù */
+	$"98CD 0C23 72EB E3A9 D21F 1BC2 4E13 274B"            /* ˜Í.#rëã©Ò..ÂN.'K */
+	$"19C8 CB39 5E7A D218 FBDB 0C42 51A1 1203"            /* .ÈË9^zÒ.ûÛ.BQ¡.. */
+	$"C0EB CDC2 9249 E461 1DE4 3DB6 FDFE 1334"            /* ÀëÍÂ’Iäa.ä=¶ýþ.4 */
+	$"1952 8231 CD71 A170 C55B 1FD0 6706 57F0"            /* .R‚1Íq¡pÅ[.Ðg.Wð */
+	$"282D 09A2 0893 A5BA 0314 43DD 32AF 3478"            /* (-Æ¢.“¥º..CÝ2¯4x */
+	$"EF6C 15F0 55C9 6A47 ECFE 3F3F 4DB4 5ED8"            /* ïl.ðUÉjGìþ??M´^Ø */
+	$"EFF8 8CA5 71F9 6669 078C 550C 943A 7046"            /* ïøŒ¥qùfi.ŒU.”:pF */
+	$"C031 6CE2 4681 4177 2913 CFE7 D857 C62A"            /* À1lâF�Aw).ÏçØWÆ* */
+	$"4652 88E2 8830 DF42 9C3D 2D76 E710 A8F1"            /* FRˆâˆ0ßBœ=-vç.¨ñ */
+	$"3626 45F2 55CC 008C EAB8 B891 A5F3 1AD2"            /* 6&EòUÌ.Œê¸¸‘¥ó.Ò */
+	$"AB11 6C48 3F18 40C0 51F0 DB88 0BD1 168C"            /* «.lH?.@ÀQðÛˆ.Ñ.Œ */
+	$"2E54 2DA6 CC60 BB05 4700 2C4E 179B 271B"            /* .T-¦Ì`».G.,N.›'. */
+	$"688C 1EE9 4D9A C781 8108 296B FE4F 028A"            /* hŒ.éMšÇ��.)kþO.Š */
+	$"63D6 6EDF 6FEB FC17 BDFE 7A70 B48E D94E"            /* cÖnßoëü.½þzp´ŽÙN */
+	$"D985 3384 1BD2 B4C9 5213 B0D1 041B 876C"            /* Ù…3„.Ò´ÉR.°Ñ..‡l */
+	$"131C 4A9C 947B A79C A466 9779 E7C9 D2E1"            /* ..Jœ”{§œ¤f—yçÉÒá */
+	$"4E9F 0509 30E0 1115 E5C7 CAED 197B 818A"            /* NŸ.Æ0à..åÇÊí.{�Š */
+	$"324D 8F8E ED44 BF44 5340 D647 1776 B983"            /* 2M�ŽíD¿DS@ÖG.v¹ƒ */
+	$"6D8C 88B1 6976 F7EB AFDB 6638 CAD3 F275"            /* mŒˆ±iv÷ë¯Ûf8ÊÓòu */
+	$"D93A 6CD3 9D6E C617 3969 D8E5 3059 947B"            /* Ù:lÓ�nÆ.9iØå0Y”{ */
+	$"6AFA 0E9B A19C 24C9 E1DC 089D 3545 89E4"            /* jú.›¡œ$ÉáÜ.�5E‰ä */
+	$"E860 FB54 068C B464 EE9B 66B7 F267 34CF"            /* è`ûT.Œ´dî›f·òg4Ï */
+	$"1276 C6B2 47E6 8284 300B D1A9 1409 0C93"            /* .vƲGæ‚„0.Ñ©.Æ.“ */
+	$"E36A 8095 409A 7352 FF7A 0F50 A5E2 E678"            /* ãj€•@šsRÿz.P¥âæx */
+	$"C195 0898 E51E EB15 8D7A E918 29A6 D5CE"            /* Á•.˜å.ë.�zé.)¦ÕÎ */
+	$"4DBC 978B 2CAA 9BA7 8727 EA1C 1C7A 6CC2"            /* M¼—‹,ª›§‡'ê..zl */
+	$"D172 DDF5 4BD4 9C69 607B 609F AEC8 FD84"            /* ÑrÝõKÔœi`{`Ÿ®Èý„ */
+	$"1DDA A076 C7E1 A7B1 F86C BC7E 1720 EB83"            /* .Ú vÇ᧱øl¼~. ëƒ */
+	$"095B F1C8 7239 10FD 6A26 D10E 534B E257"            /* Æ[ñÈr9.ýj&Ñ.SKâW */
+	$"B691 5D92 6949 E7D8 7470 AA8C 421F F945"            /* ¶‘]’iIçØtpªŒB.ùE */
+	$"99F6 9492 B806 E264 47B0 4EF5 6206 734E"            /* ™ö”’¸.âdG°Nõb.sN */
+	$"944B 102F A688 23A4 EAB0 CCEA 0017 0156"            /* ”K./¦ˆ#¤ê°Ìê...V */
+	$"A8C9 2A3F FF49 4137 E23A 09D0 97BB 0E5F"            /* ¨É*?ÿIA7â:ÆЗ»._ */
+	$"E2A2 2247 4980 6A20 B443 3E0B 0465 B9EF"            /* â¢"GI€j ´C>..e¹ï */
+	$"C490 B954 3AEA ABB7 3D53 111D 8897 551C"            /* Ä�¹T:ê«·=S..ˆ—U. */
+	$"B865 1EA2 33F2 AD50 D488 1D6D 9733 27F3"            /* ¸e.¢3ò­PÔˆ.m—3'ó */
+	$"78AC C946 FB3C 4D2F 6580 1B3A 3368 3D54"            /* x¬ÉFû<M/e€.:3h=T */
+	$"55DF 6B52 1A54 9010 C4D2 12C8 D497 9CDB"            /* UßkR.T�.ÄÒ.ÈÔ—œÛ */
+	$"173A 0609 66F1 C6C0 FD02 47A0 B2E2 D2E6"            /* .:.ÆfñÆÀý.G ²âÒæ */
+	$"096E F870 0776 4898 2F2B 84CF BA83 D656"            /* Ænøp.vH˜/+„ϺƒÖV */
+	$"7F77 79FF 0F1D 2A6E 03C6 4D0F E3EF D23B"            /* .wyÿ..*n.ÆM.ãïÒ; */
+	$"6F82 5F72 6701 98DF 5A63 DA7B 0ABC 75E2"            /* o‚_rg.˜ßZcÚ{¼uâ */
+	$"382D 0D93 3C8C 5308 19EA EF8D 7922 CD36"            /* 8-.“<ŒS..êï�y"Í6 */
+	$"ED21 EB4D 3D77 5A8A 1380 E238 22E5 84AA"            /* í!ëM=wZŠ.€â8"優 */
+	$"4488 7DCE 91A0 CB4B 67FA 74AF EA3D 1C8E"            /* Dˆ}Α ËKgút¯ê=.Ž */
+	$"9279 611D FD02 D08F D952 B05D 2C11 B545"            /* ’ya.ý.Ð�ÙR°],.µE */
+	$"5F17 FF5C 1E9C 6A77 DA2F A474 B20C F5A2"            /* _.ÿ\.œjwÚ/¤t².õ¢ */
+	$"B2D4 176F 97E4 CE9E B576 C3E0 0F3D ECB9"            /* ²Ô.o—äΞµvÃà.=ì¹ */
+	$"7B35 DEBB 5ABA 9738 36F8 524D 74D8 08FF"            /* {5Þ»Zº—86øRMtØ.ÿ */
+	$"29A7 9B08 5B43 7C17 FB53 234E 4806 B0C3"            /* )§›.[C|.ûS#NH.°Ã */
+	$"AF3A FF38 CCAF FEAA C60F D103 32AC 7D7F"            /* ¯:ÿ8̯þªÆ.Ñ.2¬}. */
+	$"D2B8 51C1 7B7D 56FD 7CFB D2B5 C55B 7C7D"            /* Ò¸QÁ{}Vý|ûÒµÅ[|} */
+	$"7D30 10C2 4181 3358 5DD6 4625 4FFC EA30"            /* }0.ÂA�3X]ÖF%Oüê0 */
+	$"3402 194F 6D0B 53D8 3C64 54AE E8DA 7874"            /* 4..Om.SØ<dT®èÚxt */
+	$"7FF1 DE25 3147 0AF0 D5B6 7BF7 88DD 5199"            /* .ñÞ%1GÂðÕ¶{÷ˆÝQ™ */
+	$"611E 526D B6DB 6DB6 DB69 9C6E 7A40 821D"            /* a.Rm¶Ûm¶Ûiœnz@‚. */
+	$"4416 6952 04BB 9C0A F19B 2C62 E698 A4F5"            /* D.iR.»œÂñ›,b昤õ */
+	$"9B83 3C59 8217 0000 0034 8080 DB92 4924"            /* ›ƒ<Y‚....4€€Û’I$ */
+	$"9249 247D 32D0 9B20 73FF 7E44 A49A 44BB"            /* ’I$}2Л sÿ~D¤šD» */
+	$"EB45 3E31 A4A0 C0CC BBC0 B29E 7771 4FDE"            /* ëE>1¤ ÀÌ»À²žwqOÞ */
+	$"1679 23F1 DE12 5574 68E3 60A1 9C00 CBEC"            /* .y#ñÞ.Uthã`¡œ.Ëì */
+	$"9C44 9009 0000 08DE 28C3 2776 AAA2 829A"            /* œD�Æ...Þ(Ã'vª¢‚š */
+	$"05E0 47E9 0001 48A9 672C 0775 EE58 F075"            /* .àGé..H©g,.uîXðu */
+	$"7458 B48A 5455 DB33 3524 BE73 1D7C E223"            /* tX´ŠTUÛ35$¾s.|â# */
+	$"4EC4 732C EC4B 128D 341C 790C 00A2 1309"            /* NÄs,ìK.�4.y..¢.Æ */
+	$"2D0B 5EA7 B07B C82C 976B 68C2 642A F095"            /* -.^§°{È,—khÂd*ð• */
+	$"A1C4 010E C94E D8A9 34BB FD3E 2B2F 92EC"            /* ¡Ä..ÉNØ©4»ý>+/’ì */
+	$"30E1 A7B3 040B C920 3FFF 7FA1 317B 90F7"            /* 0᧳..É ?ÿ.¡1{�÷ */
+	$"C744 40B8 8325 4036 82FB 0C6C D800 19C4"            /* ÇD@¸ƒ%@6‚û.lØ..Ä */
+	$"2631 C4B8 3160 8649 2492 4924 9248 A747"            /* &1ĸ1`†I$’I$’H§G */
+	$"3D41 A17D 23A6 9AC7 9000 0000 0000 0000"            /* =A¡}#¦šÇ�....... */
+	$"0000 0019 1A70 8823 BB21 7C62 4556 F257"            /* .....pˆ#»!|bEVòW */
+	$"62C0 CF0B 72EE F37E 64EC 43C2 AE04 9F58"            /* bÀÏ.rîó~dìC®.ŸX */
+	$"94DC E128 91EC BAA2 DADD 57A7 D5F7 1972"            /* ”Üá(‘캢ÚÝW§Õ÷.r */
+	$"7543 9A9A 0DB3 C3FD 42E0 19A3 8F45 7FDF"            /* uCšš.³ÃýBà.£�E.ß */
+	$"CEB1 A7E5 8A09 5B4A F9E6 294B C5DC 80C9"            /* α§åŠÆ[Jùæ)KÅÜ€É */
+	$"9AEE 0729 374F 04FD 79D6 7170 D940 14F0"            /* šî.)7O.ýyÖqpÙ@.ð */
+	$"830F 0B71 50E7 3C76 97AF 0F71 A32D DC5A"            /* ƒ..qPç<v—¯.q£-ÜZ */
+	$"28A9 FE90 6CC0 9484 30D1 FCCD 4991 0758"            /* (©þ�lÀ”„0ÑüÍI‘.X */
+	$"BE36 B1DE 3A2E B6F8 2756 C568 2A7F D038"            /* ¾6±Þ:.¶ø'VÅh*.Ð8 */
+	$"2397 6E8F 32E0 C1AC 3736 32A3 C18E 13C4"            /* #—n�2àÁ¬762£ÁŽ.Ä */
+	$"D298 8703 F9AF E24B A630 0627 6E63 ED70"            /* Ò˜‡.ù¯âK¦0.'ncíp */
+	$"0662 A833 6515 7225 C79D 8C1F 7410 45BF"            /* .b¨3e.r%Ç�Œ.t.E¿ */
+	$"5019 F088 7C6C 43FC AE88 B794 5847 505F"            /* P.ðˆ|lCü®ˆ·”XGP_ */
+	$"2B73 6E58 E20E 18A2 01B4 DF7F F5BD D4BC"            /* +snXâ..¢.´ß.õ½Ô¼ */
+	$"B259 706B 754E 9740 BBF2 54FC FCB8 B293"            /* ²YpkuN—@»òTüü¸²“ */
+	$"4CEA 3670 D04B 8C42 B7C2 314D 1F53 956B"            /* Lê6pÐKŒB·Â1M.S•k */
+	$"CB14 9D05 8288 E7F0 D4FF 70AE EFB7 A10B"            /* Ë.�.‚ˆçðÔÿp®ï·¡. */
+	$"EDDE 3CFE 1B9D 7DBA 7B7D BD13 DF6F 45B8"            /* íÞ<þ.�}º{}½.ßoE¸ */
+	$"FE1A 077D B444 FAB6 46FB 75FC E8AB DECC"            /* þ..}´Dú¶Fûuüè«ÞÌ */
+	$"AF0D 6C8A C695 8734 8A7A 5A21 F65D 05F6"            /* ¯.lŠÆ•‡4ŠzZ!ö].ö */
+	$"A417 27AC 998E 3646 07A8 0055 19DC B524"            /* ¤.'¬™Ž6F.¨.U.ܵ$ */
+	$"D2F2 842C DF9F BECA C26B C9C9 D0FD CA3B"            /* Òò„,ߟ¾ÊÂkÉÉÐýÊ; */
+	$"DB1B 3F81 F6A7 4465 001E 5552 4D0D 3BF3"            /* Û.?�ö§De..URM.;ó */
+	$"0140 A2E9 7D63 8456 F9C7 665D F7FC 2DBF"            /* .@¢é}c„VùÇf]÷ü-¿ */
+	$"1B41 0667 7939 1B16 4997 5584 3CFE 81B9"            /* .A.gy9..I—U„<þ�¹ */
+	$"C4A8 B346 EC6D E726 2560 5CB8 8B84 7699"            /* Ĩ³Fìmç&%`\¸‹„v™ */
+	$"3999 2CA0 91D9 A05A C96C 660C 267B 74A0"            /* 9™, ‘Ù ZÉlf.&{t  */
+	$"B935 73EB D464 D860 2694 7584 A4D4 DC52"            /* ¹5sëÔdØ`&”u„¤ÔÜR */
+	$"D136 D49A 1BEA 53F5 AE2F C19E 44E9 BA0A"            /* Ñ6Ôš.êSõ®/ÁžDéºÂ */
+	$"5D83 6587 7792 3DCB 449A B33E 4632 A395"            /* ]ƒe‡w’=ËDš³>F2£• */
+	$"57A3 0EC0 B3A3 969D 9DF0 6ACC 859F FF7F"            /* W£.À³£–��ðjÌ…Ÿÿ. */
+	$"FF27 DAA0 AF8E 216C E5D8 874A 530F 555E"            /* ÿ'Ú ¯Ž!lå؇JS.U^ */
+	$"AF3F E231 5BAF F7B6 8E73 5742 2717 4031"            /* ¯?â1[¯÷¶ŽsWB'.@1 */
+	$"175D 5FDA F402 B756 AEAE 7E7E BFEE CE68"            /* .]_Úô.·V®®~~¿îÎh */
+	$"7878 870D 01C2 C2A4 61D5 64E3 E195 B914"            /* xx‡..¤aÕdãᕹ. */
+	$"A45F FF52 DC14 F5E9 E037 65E3 5477 62A5"            /* ¤_ÿRÜ.õéà7eãTwb¥ */
+	$"3EEC CA32 6558 5965 8B6E 3F13 9DB2 1361"            /* >ìÊ2eXYe‹n?.�².a */
+	$"8426 9FD7 B329 4E75 FF1D 9B78 9735 4B1B"            /* „&Ÿ×³)Nuÿ.›x—5K. */
+	$"D80E 1781 192F 6777 8F94 F6A2 5016 726D"            /* Ø..�./gw�”ö¢P.rm */
+	$"1E0D D2CB 6F87 B3C6 09A2 1FE3 915E 8943"            /* ..ÒËo‡³ÆÆ¢.ã‘^‰C */
+	$"FE6C 6743 4733 D5BC A9DD 5338 C9E1 AF50"            /* þlgCG3Õ¼©ÝS8Éá¯P */
+	$"3634 C26C 0C1F 94E7 50B2 4310 DD62 4F09"            /* 64Âl..”çP²C.ÝbOÆ */
+	$"ABCD 7821 8B7B 7B87 2EEA 25A1 9D3C 55CC"            /* «Íx!‹{{‡.ê%¡�<UÌ */
+	$"0644 1B14 3456 2E32 C013 815C 66C7 0526"            /* .D..4V.2À.�\fÇ.& */
+	$"E24D CE15 B8FB 5D8B 0506 E30A 1D6A E2ED"            /* âMÎ.¸û]‹..ãÂ.jâí */
+	$"6145 D124 0EC9 1FAB 4E50 06C2 9DA5 8F6C"            /* aEÑ$.É.«NP.Â�¥�l */
+	$"C072 D11E BFEE DFE6 F6C7 12F4 E89C 35B7"            /* ÀrÑ.¿îßæöÇ.ôèœ5· */
+	$"097E 2E25 393F CEA3 03C6 D3C7 DED5 3882"            /* Æ~.%9?Σ.ÆÓÇÞÕ8‚ */
+	$"ED26 A3FD 9130 95B5 F3FA D31A 691F 8E09"            /* í&£ý‘0•µóúÓ.i.ŽÆ */
+	$"BFA8 7D7B 85BD B179 5C20 2855 1268 F9AF"            /* ¿¨}{…½±y\ (U.hù¯ */
+	$"553D 939E 6FC6 C67E 4611 F88C BBD4 773C"            /* U=“žoÆÆ~F.øŒ»Ôw< */
+	$"5F16 D598 D5C5 E649 B66E FD8D A2D7 9807"            /* _.Õ˜ÕÅæI¶ný�¢×˜. */
+	$"EDA2 4621 2CF5 DDE3 C078 6455 1C29 3A07"            /* í¢F!,õÝãÀxdU.):. */
+	$"E992 C5DE 8D33 041B 83C6 56F6 7C95 168E"            /* é’ÅÞ�3..ƒÆVö|•.Ž */
+	$"6127 40D2 DE11 CFF2 3379 DC22 20E3 5E1B"            /* a'@ÒÞ.Ïò3yÜ" ã^. */
+	$"DE83 DBB5 5B8A 8572 3DF2 2890 DC56 BE6E"            /* ÞƒÛµ[Š…r=ò(�ÜV¾n */
+	$"D15F 9396 ECD4 725F 2E18 7616 394A 64C3"            /* Ñ_“–ìÔr_..v.9Jdà */
+	$"FDAA E6F2 3D6D 46BC B270 5B8F ACB4 9CAE"            /* ýªæò=mF¼²p[�¬´œ® */
+	$"0D0D 3F29 6A02 1E92 347A E406 A52D 111A"            /* ..?)j..’4zä.¥-.. */
+	$"2E79 0340 1D82 C861 0C40 1963 3397 A4FD"            /* .y.@.‚Èa.@.c3—¤ý */
+	$"A998 0B63 E30A 7AA3 A5BC 8A8E 9CD0 4795"            /* ©˜.cãÂz£¥¼ŠŽœÐG• */
+	$"7538 7FB2 EC9A 952C CE29 C80F 369C 4E8D"            /* u8.²ìš•,Î)È.6œN� */
+	$"8000 1C55 D5F3 E2AD 812E 4FAA AC2C D9BB"            /* €..UÕóâ­�.Oª¬,Ù» */
+	$"F4CD 5568 5643 826F 3A38 91BD 6F70 92D3"            /* ôÍUhVC‚o:8‘½op’Ó */
+	$"23EC DB91 0FC4 C3BB 7542 023B 85F0 36C3"            /* #ìÛ‘.ÄûuB.;…ð6à */
+	$"8BF6 F6F8 4E77 EEE5 851F 219A CF99 7D9E"            /* ‹ööøNwîå….!šÏ™}ž */
+	$"856D A687 BC63 8E39 0407 B007 D184 10BD"            /* …m¦‡¼cŽ9..°.Ñ„.½ */
+	$"D9EF ACB1 B75A 46FA F95E 42DF 377B E2F7"            /* Ùבּ·ZFúù^Bß7{â÷ */
+	$"BEF2 357A 861C F486 B3F7 57E1 D39B 095B"            /* ¾ò5z†.ô†³÷WáÓ›Æ[ */
+	$"40C0 925C 0CA1 7885 CFEA 48B7 33E9 E8DE"            /* @À’\.¡x…ÏêH·3éèÞ */
+	$"D178 1E15 91D1 F6C5 BC87 CB7E CCC6 DEDE"            /* Ñx..‘Ñöż‡Ë~ÌÆÞÞ */
+	$"B017 A4C1 0B0F DD17 660E CB97 C098 C773"            /* °.¤Á..Ý.f.Ë—À˜Çs */
+	$"8A0A F4DB 59BD A218 055E 5348 05D8 B304"            /* ŠÂôÛY½¢..^SH.س. */
+	$"9F23 E1B1 0754 6DA2 FF33 34CB 2B12 7114"            /* Ÿ#á±.Tm¢ÿ34Ë+.q. */
+	$"62D2 4CA8 8091 CD34 8467 2752 B77A AA5B"            /* bÒL¨€‘Í4„g'R·zª[ */
+	$"15FC 2E56 7A29 9351 B6A4 AEE5 B56D 354D"            /* .ü.Vz)“Q¶¤®åµm5M */
+	$"3ED2 FA71 25E9 F887 B187 BADB B11B 2E01"            /* >Òúq%éø‡±‡ºÛ±... */
+	$"93B3 4206 45ED 7238 3F80 1441 50CA CCBA"            /* “³B.Eír8?€.APÊ̺ */
+	$"EF59 3BC5 4236 2ABF 9150 7335 49C5 0216"            /* ïY;ÅB6*¿‘Ps5IÅ.. */
+	$"F97B D5A5 1EF5 A69D 8B34 C25B 73E1 DA52"            /* ù{Õ¥.õ¦�‹4Â[sáÚR */
+	$"79E5 9EB1 9CB1 0952 B3F5 E221 D426 4759"            /* yåž±œ±ÆR³õâ!Ô&GY */
+	$"D5CF 2D18 CC2A 270A 859D F10C 8108 52FF"            /* ÕÏ-.Ì*'Â…�ñ.�.Rÿ */
+	$"2A7D D39E EFFD 568C 2DB3 7BD5 62D0 2403"            /* *}ÓžïýVŒ-³{ÕbÐ$. */
+	$"69D1 A4B6 2D24 E485 973D F6A5 E6DC 1DB5"            /* iѤ¶-$ä…—=ö¥æÜ.µ */
+	$"BF0B E185 5592 E3A0 6046 E050 5151 9546"            /* ¿.á…U’ã `FàPQQ•F */
+	$"17F7 0CF6 222F 17E0 40E5 3EF5 74EE BAB6"            /* .÷.ö"/.à@å>õt */
+	$"55BD 76C1 DD80 39C8 BAE0 37B8 398A B370"            /* U½vÁÝ€9Ⱥà7¸9Š³p */
+	$"D400 0C29 5DC9 94FF 069B 36E2 CD79 195F"            /* Ô..)]É”ÿ.›6âÍy._ */
+	$"5B9B 1237 1F18 C560 C901 F9A4 184B 7570"            /* [›.7..Å`É.ù¤.Kup */
+	$"433E 75BE 0297 C641 7D9B 7092 8D64 96F5"            /* C>u¾.—ÆA}›p’�d–õ */
+	$"D70C 9B66 71D3 09B1 F635 0FC3 0B49 7D6E"            /* ×.›fqÓƱö5.Ã.I}n */
+	$"660C 8E1D 0257 672B 97EE C2A5 7B84 729E"            /* f.Ž..Wg+—îÂ¥{„rž */
+	$"6516 585E 354F 2E22 88A7 A515 B945 3745"            /* e.X^5O."ˆ§¥.¹E7E */
+	$"F6A5 5CB2 E212 10AD AB6F 07F5 FDA3 09EB"            /* ö¥\²â..­«o.õý£Æë */
+	$"A053 313B 9A8E 757D E132 D483 DC78 0882"            /*  S1;šŽu}á2ÔƒÜx.‚ */
+	$"A63C 95E0 036C 4626 F66B 5F6C 39A1 9401"            /* ¦<•à.lF&ök_l9¡”. */
+	$"7276 4DCE 4487 7D8C 12A3 B713 9139 AC0A"            /* rvMÎD‡}Œ.£·.‘9¬Â */
+	$"18AD 4DFD 2A3D 69E7 E76E 593C 8DAB FD56"            /* .­Mý*=iççnY<�«ýV */
+	$"F959 BA6B FBA3 2853 D610 4DB0 7A30 3A09"            /* ùYºkû£(SÖ.M°z0:Æ */
+	$"916B DFF7 B3B4 F8D3 9619 0FD9 8FBC FC6B"            /* ‘kß÷³´øÓ–..Ù�¼ük */
+	$"D73D ABD2 4C41 6AD0 6584 AF19 3074 AF6E"            /* ×=«ÒLAjÐe„¯.0t¯n */
+	$"369C BEB1 76D5 D311 6172 F157 D522 DDED"            /* 6œ¾±vÕÓ.arñWÕ"Ýí */
+	$"D4ED 0230 0BB5 E881 0E6B 9C4F 111F 4F6E"            /* Ôí.0.µè�.kœO..On */
+	$"7CAD 4745 7BBF DA70 A9C4 051E FDEA 206C"            /* |­GE{¿Úp©Ä..ýê l */
+	$"9983 0E2D 4A4A A4DE 82E9 DAAF 5748 37AE"            /* ™ƒ.-JJ¤Þ‚éÚ¯WH7® */
+	$"4046 DCCB 0D1A 80DA 1804 20E2 F7CF AD69"            /* @FÜË..€Ú.. â÷Ï­i */
+	$"F9D8 5106 D02D 16E9 4437 9560 B618 1126"            /* ùØQ.Ð-.éD7•`¶..& */
+	$"95A2 4B23 89C4 78EE 898E D80C 8E49 5201"            /* •¢K#‰ÄxØ.ŽIR. */
+	$"2095 ABAF 9CA5 0F8E CB22 00D4 4289 59B3"            /*  •«¯œ¥.ŽË".ÔB‰Y³ */
+	$"1835 1395 8AE5 3A88 7185 E7DD 57F3 4CE4"            /* .5.•Šå:ˆq…çÝWóLä */
+	$"1465 C878 6B72 7146 2AF1 F053 5B31 7697"            /* .eÈxkrqF*ñðS[1v— */
+	$"7300 A777 3919 099E BD1C 79C3 24C4 A355"            /* s.§w9.Æž½.yÃ$Ä£U */
+	$"0C88 C727 1831 D498 E513 47A5 F25F DDBE"            /* .ˆÇ'.1Ô˜å.G¥ò_ݾ */
+	$"46E7 40B5 EBCC 080F 6915 3FDF EDB9 A9B1"            /* Fç@µëÌ..i.?ßí¹©± */
+	$"39ED D794 60E1 A5A2 0EEC 7A09 46BF 201E"            /* 9í×”`ᥢ.ìzÆF¿ . */
+	$"311F EEEE 88EF C6C1 C10D E238 50C9 7F01"            /* 1.îîˆïÆÁÁ.â8PÉ.. */
+	$"DFF1 17BA D8F4 0017 47E7 75F2 4D82 679E"            /* ßñ.ºØô..GçuòM‚gž */
+	$"6867 60A4 6222 77B9 319B 186D FCB3 168A"            /* hg`¤b"w¹1›.mü³.Š */
+	$"EAF3 C227 1082 D7ED 2C70 E619 8676 0186"            /* êóÂ'.‚×í,pæ.†v.† */
+	$"8C23 5DE5 D4A0 61CB CDE4 AED5 E008 6F3C"            /* Œ#]åÔ aËÍä®Õà.o< */
+	$"D894 AC14 6FEC 5D4C C2FF 3A6C 512F E475"            /* Ø”¬.oì]LÂÿ:lQ/äu */
+	$"FCB8 DFA4 EB46 2DF4 E133 5858 364B 54E1"            /* ü¸ß¤ëF-ôá3XX6KTá */
+	$"A6E1 5D0C 157E D987 DF95 B1FB 3723 4F2F"            /* ¦á]..~هߕ±û7#O/ */
+	$"C9BF C6D4 D979 412E D0EB B285 8DFF 7CAC"            /* É¿ÆÔÙyA.Ðë²…�ÿ|¬ */
+	$"F1BF 1825 8B89 9992 3848 C666 4184 4906"            /* ñ¿.%‹‰™’8HÆfA„I. */
+	$"0D61 6B58 9355 A5D9 C940 B6F2 6918 82E1"            /* .akX“U¥ÙÉ@¶òi.‚á */
+	$"FF7D 4F5F FE94 5208 650B B780 0D2B DD4F"            /* ÿ}O_þ”R.e.·€.+ÝO */
+	$"5874 3627 2353 6328 06B9 908C 6C95 D898"            /* Xt6'#Sc(.¹�Œl•Ø˜ */
+	$"8C24 1D0F 641B 7763 CFBE E88A BB05 8639"            /* Œ$..d.wcϾ芻.†9 */
+	$"D91C 4A38 3A3F 75C6 61BD BFED CA10 2A73"            /* Ù.J8:?uÆa½¿íÊ.*s */
+	$"E3C5 E85C BF5B 0346 2105 4286 300D D812"            /* ãÅè\¿[.F!.B†0.Ø. */
+	$"8BE4 DAE4 292B A765 338E 7E42 50F1 8046"            /* ‹äÚä)+§e3Ž~BPñ€F */
+	$"3FDC 1A85 4616 61E5 7321 18D9 5AB9 8903"            /* ?Ü.…F.aås!.ÙZ¹‰. */
+	$"90BD 6F89 E7D0 35D1 0AA3 BBAE 3CF8 A7B7"            /* �½o‰çÐ5Ñ£»®<ø§· */
+	$"73C8 8B94 B409 16EC 60A6 E819 BCA7 BA66"            /* sÈ‹”´Æ.ì`¦è.¼§ºf */
+	$"2245 524C 718C 635D E4F7 ACA0 02C3 E0A7"            /* "ERLqŒc]ä÷¬ .Ãৠ*/
+	$"B542 0FF5 7029 FF4D 1D88 E3B3 D657 802B"            /* µB.õp)ÿM.ˆã³ÖW€+ */
+	$"8068 9BD4 B17F 9A6B CC1C 4B53 246F 81E5"            /* €h›Ô±.škÌ.KS$o�å */
+	$"9168 48EC 4B44 3FFF 7B8B 5777 5677 134E"            /* ‘hHìKD?ÿ{‹WwVw.N */
+	$"1B8E 8C91 429F CE85 86EF 62B4 71AF EAE7"            /* .ŽŒ‘BŸÎ…†ïb´q¯êç */
+	$"E333 7BD3 2825 7230 C950 0000 1B8D 8BA6"            /* ã3{Ó(%r0ÉP...�‹¦ */
+	$"04C1 56DC 30F0 619E DD6C D196 C91E 1ED4"            /* .ÁVÜ0ðažÝlÑ–É..Ô */
+	$"1285 94A8 F775 05A9 3440 78FF 7E52 8833"            /* .…”¨÷u.©4@xÿ~Rˆ3 */
+	$"E8A1 A4E4 4580 38DD ADE1 3BD5 AD19 74E6"            /* 衤äE€8Ý­á;Õ­.tæ */
+	$"EEA1 B4B1 0B0B 9BE9 08EC DB78 E6AA 37E5"            /* î¡´±..›é.ìÛxæª7å */
+	$"AD06 72A6 51FC 0004 4737 BF1A 89FF 7E11"            /* ­.r¦Qü..G7¿.‰ÿ~. */
+	$"0A68 EAD7 BDA5 4D5B 2C8D 0C7A 952E 2190"            /* Âhê×½¥M[,�.z•.!� */
+	$"8451 1B38 CEFD 2835 5ADD BDA2 01C2 A3D6"            /* „Q.8Îý(5Zݽ¢.壅 */
+	$"6046 4BD8 41DF D8B6 D9B1 1F96 5FF8 CC56"            /* `FKØAßضٱ.–_øÌV */
+	$"A63B 6E14 5035 26D6 946D 1F59 4D17 5507"            /* ¦;n.P5&Ö”m.YM.U. */
+	$"85F7 2DAF A737 4E30 9097 2E2E DAF8 37D1"            /* …÷-¯§7N0�—..Úø7Ñ */
+	$"D987 4E59 ABFD CDF3 AAC3 30D1 8616 FAB3"            /* Ù‡NY«ýÍóªÃ0ц.ú³ */
+	$"2914 92AA 6913 C36F 66DA 4B0B 18FE DD55"            /* ).’ªi.ÃofÚK..þÝU */
+	$"1D2A 3F00 D80C 2423 D923 95C6 E11D 0069"            /* .*?.Ø.$#Ù#•Æá..i */
+	$"B5C9 0803 0907 B950 13DF 48EC F794 3D36"            /* µÉ..Æ.¹P.ßHì÷”=6 */
+	$"5249 2492 4924 9249 2489 9EF6 DC36 9A6B"            /* RI$’I$’I$‰žöÜ6šk */
+	$"1751 415E A37F 47EC A4EA 67AC A222 733C"            /* .QA^£.Gì¤êg¬¢"s< */
+	$"467D 1FFE C727 E6AA 6E99 C584 A87E DFFF"            /* F}.þÇ'æªn™Å„¨~ßÿ */
+	$"7FC3 7592 8204 71A2 6088 C38B 6E65 868E"            /* .Ãu’‚.q¢`ˆÃ‹ne†Ž */
+	$"5A3F FF7F F919 4069 CF10 A302 5125 525C"            /* Z?ÿ.ù.@iÏ.£.Q%R\ */
+	$"A443 88AF 4104 7807 1410 84BA E955 76E8"            /* ¤Cˆ¯A.x...„ºéUvè */
+	$"5F35 B612 A668 5694 9249 2492 4924 9249"            /* _5¶.¦hV”’I$’I$’I */
+	$"2492 4924 4C25 1941 A4EB 1996 7A28 19C1"            /* $’I$L%.A¤ë.–z(.Á */
+	$"A1B0 01D7 ACB2 3F83 42DC D154 27C9 F11F"            /* ¡°.׬²?ƒBÜÑT'Éñ. */
+	$"FC46 90B1 89C4 F78A 4C6F 5C2A 833D 8425"            /* üF�±‰Ä÷ŠLo\*ƒ=„% */
+	$"D837 CA14 E4C7 7F8A 9833 99B7 E589 1376"            /* Ø7Ê.äÇ.Š˜3™·å‰.v */
+	$"C867 FF1D 200A 4C9B 624E 68E3 11AE C8AF"            /* Ègÿ. ÂL›bNhã.®È¯ */
+	$"1723 C741 CEAC 16CE C548 72FF 15CD 3E67"            /* .#ÇAά.ÎÅHrÿ.Í>g */
+	$"AF2C 323F 0FD0 6752 4973 55BD CC10 05B4"            /* ¯,2?.ÐgRIsU½Ì..´ */
+	$"AB3F 9302 00C3 EE70 1BA4 B650 FAB2 5821"            /* «?“..Ãîp.¤¶Pú²X! */
+	$"3856 3872 1B02 7D70 F1F9 0B28 A9DC CAE7"            /* 8V8r..}pñù.(©ÜÊç */
+	$"D9E7 6252 A768 A7DE 0FB1 FCB1 F54B 98C4"            /* ÙçbR§h§Þ.±ü±õK˜Ä */
+	$"7B6E 5E24 BC53 F945 741F 66A0 A51E EE5A"            /* {n^$¼SùEt.f ¥.îZ */
+	$"2A0D B951 4EEE A88B 4F2F C326 F326 1D12"            /* *.¹QNO/Ã&ó&.. */
+	$"524A 9E48 CC53 44EF C54F 1737 8505 46CF"            /* RJžHÌSDïÅO.7….FÏ */
+	$"351E 4354 05C7 C832 2A7D 8899 D009 E617"            /* 5.CT.ÇÈ2*}ˆ™ÐÆæ. */
+	$"0334 305D 9497 D845 E6D3 2CD2 178F 1316"            /* .40]”—ØEæÓ,Ò.�.. */
+	$"65AD 239E 2ED5 ECCB 402A E728 09B5 E847"            /* e­#ž.ÕìË@*ç(ƵèG */
+	$"65BD 3F31 CAC5 F9D8 6606 B8AF 4F84 89FE"            /* e½?1ÊÅùØf.¸¯O„‰þ */
+	$"9004 4730 30BC E58F 5FB3 38CF 36B9 38FC"            /* �.G00¼å�_³8Ï6¹8ü */
+	$"FB9D 07EA D13F 9DB9 7185 0E88 0E3B 06E5"            /* û�.êÑ?�¹q….ˆ.;.å */
+	$"D476 CFCA 1587 3067 9257 B5DF 1E83 E7FF"            /* ÔvÏÊ.‡0g’Wµß.ƒçÿ */
+	$"7FFF 7FFF 0E68 E181 AC15 B980 2AFB 1D80"            /* .ÿ.ÿ.há�¬.¹€*û.€ */
+	$"C5BB A88D E36A 4DC5 94CF 6DB2 0694 F977"            /* Å»¨�ãjMÅ”Ïm².”ùw */
+	$"D708 02D1 F380 6773 016A CA84 3B1C 6A33"            /* ×..Ñó€gs.jÊ„;.j3 */
+	$"5AAC BA2D FEC5 7542 51FC 68D0 CDDD EA44"            /* Z¬º-þÅuBQühÐÍÝêD */
+	$"788E 2F96 D80C F159 FF45 3316 1494 A7F5"            /* xŽ/–Ø.ñYÿE3..”§õ */
+	$"98B4 FC39 0062 D59B 52A6 32CB F97C ABD6"            /* ˜´ü9.bÕ›R¦2Ëù|«Ö */
+	$"42AE AE46 6AA7 D986 0A4E DCDD 717E 8B7C"            /* B®®Fj§Ù†ÂNÜÝq~‹| */
+	$"8FB8 B396 65A6 83FF 6A4A A5C1 597F 70AF"            /* �¸³–e¦ƒÿjJ¥ÁY.p¯ */
+	$"DC96 E2EC 0C1D 7A00 3428 2C60 DE32 8DB8"            /* Ü–âì..z.4(,`Þ2�¸ */
+	$"1604 C249 5E82 1F5B 6C23 E562 B2D4 754E"            /* ..ÂI^‚.[l#åb²ÔuN */
+	$"7F73 442A 25D3 C42A 6A6D 5D09 0E8C 2E67"            /* .sD*%ÓÄ*jm]Æ.Œ.g */
+	$"95EC 08FE B505 8B5A A4A8 0000 0000 0000"            /* •ì.þµ.‹Z¤¨...... */
+	$"0000 0000 6121 26B3 27C3 AEC0 FF52 2FEE"            /* ....a!&³'îÀÿR/î */
+	$"D4F3 92BB 06E2 ABE4 35DC A278 9084 B2F0"            /* Ôó’».â«ä5Ü¢x�„²ð */
+	$"EE1A ADB2 F770 3D4E 120A FD01 B042 CD00"            /* î.­²÷p=N.Âý.°BÍ. */
+	$"B9C2 B661 40B0 E5FC DC59 59F0 61C5 53A7"            /* ¹Â¶a@°åüÜYYðaÅS§ */
+	$"7AC1 7EDC 77B7 1C84 0F9A E321 389C E693"            /* zÁ~Üw·.„.šã!8œæ“ */
+	$"AC98 5160 DDD0 C9A9 BE17 ED52 A10A 300C"            /* ¬˜Q`ÝÐÉ©¾.íR¡Â0. */
+	$"88ED BB5A 80DA C23B 1196 0C7C 6BA8 D4EA"            /* ˆí»Z€ÚÂ;.–.|k¨Ôê */
+	$"4FAB 08A9 EBE3 1CC9 6782 F6A9 85A4 1829"            /* O«.©ëã.Ég‚ö©…¤.) */
+	$"48BB D188 41E8 65BA 28BB 8AC1 8368 DC2F"            /* H»ÑˆAèeº(»ŠÁƒhÜ/ */
+	$"B2DE 61FE 95C0 BD88 C027 9CD9 3819 8A81"            /* ²Þaþ•À½ˆÀ'œÙ8.Š� */
+	$"20FF 616C DEAE C6EA 15A3 D12F 764A B4E2"            /*  ÿalÞ®Æê.£Ñ/vJ´â */
+	$"ECA3 AF32 36FF 29B0 E3CD 5046 527E 39B7"            /* 죯26ÿ)°ãÍPFR~9· */
+	$"921A ABF8 F0CB 7040 5FCD A182 4C57 986D"            /* ’.«øðËp@_Í¡‚LW˜m */
+	$"1115 DD94 687C 3663 7CFB 6C40 642D C8CA"            /* ..Ý”h|6c|ûl@d-ÈÊ */
+	$"1117 B5A9 8025 123D 9406 58F9 96B5 321E"            /* ..µ©€%.=”.Xù–µ2. */
+	$"7646 4BFD 48DE 0B9B DBEF B79F B6C7 031E"            /* vFKýHÞ.›Ûï·Ÿ¶Ç.. */
+	$"1D3B 1D18 B35D 2813 5601 3924 6AE1 FC21"            /* .;..³](.V.9$jáü! */
+	$"60B9 0B9F 6B4B AFB9 15D8 C57A 5345 7461"            /* `¹.ŸkK¯¹.ØÅzSEta */
+	$"0EF9 4B6B 88D1 7833 02DF 4FB8 DBEC 836A"            /* .ùKkˆÑx3.ßO¸Ûìƒj */
+	$"BEA7 3972 93C0 F973 37B5 C84F 1655 031C"            /* ¾§9r“Àùs7µÈO.U.. */
+	$"674D 741E 308E E3BA 6684 5BB0 4506 AB40"            /* gMt.0Žãºf„[°E.«@ */
+	$"14DE BFF2 9B38 4026 C5C2 3A44 FDFF 25CB"            /* .Þ¿ò›8@&ÅÂ:Dýÿ%Ë */
+	$"072E 1D99 62E3 22B8 DE8D 9CF1 79FA 1D38"            /* ...™bã"¸Þ�œñyú.8 */
+	$"8900 17CB A72B 8124 7EAF CF2F FC8D 34D6"            /* ‰..˧+�$~¯Ï/ü�4Ö */
+	$"E0AC 58ED 8BC1 0DAA 7964 FB91 BF08 EFA6"            /* à¬Xí‹Á.ªydû‘¿.ï¦ */
+	$"42FF 7FFF 7FE3 AF13 7C4B 1CF4 D643 3CD3"            /* Bÿ.ÿ.ã¯.|K.ôÖC<Ó */
+	$"5F1A 08BB 7C56 5CFB 6D27 04DE C66A 9AF1"            /* _..»|V\ûm'.ÞÆjšñ */
+	$"2053 D4B2 EE60 44FF 2A89 1FFC DFCC 57C1"            /*  SÔ²î`Dÿ*‰.üßÌWÁ */
+	$"3800 1290 7854 7902 FF7A 9A36 D71E F8D1"            /* 8..�xTy.ÿzš6×.øÑ */
+	$"D439 471B D02F 4A39 E5BC D25F FDF0 8B54"            /* Ô9G.Ð/J9å¼Ò_ýð‹T */
+	$"AE0A 3677 2625 B286 7DEC 8FF7 2457 2B25"            /* ®Â6w&%²†}ì�÷$W+% */
+	$"C066 2A4E A605 EE16 7244 CCFD D3D3 FDA1"            /* Àf*N¦.î.rDÌýÓÓý¡ */
+	$"F3B8 76C3 1C5F 491C 0165 8735 D71D 19AD"            /* ó¸vÃ._I..e‡5×..­ */
+	$"9BB1 A40D E5BA 9D1C E34B B71C 9CF0 EC7A"            /* ›±¤.åº�.ãK·.œðìz */
+	$"5E87 C4F0 A326 0913 9E2C 6517 50A3 E72B"            /* ^‡Äð£&Æ.ž,e.P£ç+ */
+	$"87FE D348 2E5D 0A00 0000 0000 0000 0000"            /* ‡þÓH.]Â......... */
+	$"0002 2C86 A73D 4030 2FE4 D32C 2B56 C74C"            /* ..,†§=@0/äÓ,+VÇL */
+	$"0869 A5C9 151A 69B9 9390 DA50 4411 8FFF"            /* .i¥É..i¹“�ÚPD.�ÿ */
+	$"4938 4E36 F9DD 09FB E4A0 C339 2431 ED8B"            /* I8N6ùÝÆûä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FF4F E2A2 F01A C90F 02E3 51CD B477"            /* #fÿOâ¢ð.É..ãQÍ´w */
+	$"2230 690A B47C E28B 463C 2E88 7579 7943"            /* "0i´|â‹F<.ˆuyyC */
+	$"5055 6D0A EEC5 F3BF 2404 37D8 EFE1 71AC"            /* PUmÂîÅó¿$.7Øïáq¬ */
+	$"6AFE A3E4 A7EB 28BF BFFE 4373 E5FF 7E4A"            /* jþ£ä§ë(¿¿þCsåÿ~J */
+	$"2D5D 1ED3 6D78 1657 9914 A061 7958 972C"            /* -].Ómx.W™. ayX—, */
+	$"56FB D5B0 1FFD A18B 7A29 0C81 295B DF7C"            /* VûÕ°.ý¡‹z).�)[ß| */
+	$"83E3 CD36 0E66 7E2B D8FA 3096 AA44 7F9B"            /* ƒãÍ6.f~+Øú0–ªD.› */
+	$"F0B9 EA48 8CC7 0FFF 7E1C F394 CC5B 6A25"            /* ð¹êHŒÇ.ÿ~.ó”Ì[j% */
+	$"FD4C CECC 630B 38B7 D621 F081 73EE 9D40"            /* ýLÎÌc.8·Ö!ð�sî�@ */
+	$"7FAD FADD 8111 6492 599E DD2C 3600 FF6C"            /* .­úÝ�.d’YžÝ,6.ÿl */
+	$"5A8D B0B8 2AE7 668D C5A0 826B FA0D C5B1"            /* Z�°¸*çf�Å ‚kú.ű */
+	$"6873 D749 B533 9627 C2F6 4922 63F7 8944"            /* hs×Iµ3–'ÂöI"c÷‰D */
+	$"15C5 A1F9 8539 A21A 1CEB 1C2D 7D1B 0516"            /* .Å¡ù…9¢..ë.-}... */
+	$"FD6C 5D4F 92A3 14D9 126F C5FC 4116 B499"            /* ýl]O’£.Ù.oÅüA.´™ */
+	$"D878 D889 9123 D3C8 4637 36E3 8644 6F0B"            /* Øx؉‘#ÓÈF76ã†Do. */
+	$"D2C6 A599 B793 1367 B548 23BD 8836 11E5"            /* ÒÆ¥™·“.gµH#½ˆ6.å */
+	$"C323 7AD5 0534 3D05 A4E6 70B3 0376 2B0C"            /* Ã#zÕ.4=.¤æp³.v+. */
+	$"A964 173B F0BC 2A52 7FE4 2A53 85C2 22B2"            /* ©d.;ð¼*R.ä*S…Â"² */
+	$"B83F 7185 FB4C 3769 5B3E 4A24 E7E1 D0FD"            /* ¸?q…ûL7i[>J$çáÐý */
+	$"9B17 8737 FE8B E4C7 9FC1 0E30 D904 D0C5"            /* ›.‡7þ‹äÇŸÁ.0Ù.ÐÅ */
+	$"D2F5 05E4 3CD6 5FA7 B9AF FB98 755E 0BAF"            /* Òõ.ä<Ö_§¹¯û˜u^.¯ */
+	$"E4EE 408D A8BE 5E58 07A6 059D 1B33 37F3"            /* äî@�¨¾^X.¦.�.37ó */
+	$"8D14 871A 7FC6 43ED 6A6F 8F41 9681 095E"            /* �.‡..ÆCíjo�A–�Æ^ */
+	$"EE46 5BA4 1E15 F5F2 3063 E524 A62A 7C7F"            /* îF[¤..õò0cå$¦*|. */
+	$"0E38 5D00 A378 8F6D 3861 2088 EDD7 AC24"            /* .8].£x�m8a ˆí׬$ */
+	$"D3B6 B052 DE10 357D B65A 1414 4596 8E3D"            /* Ó¶°RÞ.5}¶Z..E–Ž= */
+	$"97E3 D838 9ACC 3C84 AF82 EA8D 8BD3 0180"            /* —ãØ8šÌ<„¯‚ê�‹Ó.€ */
+	$"1582 0654 BB61 1047 ACA1 29D3 7CFA 00C8"            /* .‚.T»a.G¬¡)Ó|ú.È */
+	$"BABC 146B 250C 8D19 8A4E A8B3 50D6 B986"            /* º¼.k%.�.ŠN¨³PÖ¹† */
+	$"2AD6 CEFA 02D6 AE11 FF7C B0A2 E6E0 30E9"            /* *ÖÎú.Ö®.ÿ|°¢æà0é */
+	$"D904 4C03 3BC1 8B68 5892 30B8 7D69 C2D6"            /* Ù.L.;Á‹hX’0¸}iÂÖ */
+	$"A9F8 56A2 7417 1E31 186F 09A1 4C11 6DCA"            /* ©øV¢t..1.oÆ¡L.mÊ */
+	$"A62E 5FCC F59A CCE8 6A29 B0DF E2BC E8BF"            /* ¦._ÌõšÌèj)°ßâ¼è¿ */
+	$"92DF 70C1 8B09 21DF 1440 1684 4413 2A60"            /* ’ßpÁ‹Æ!ß.@.„D.*` */
+	$"E033 6D92 8573 E63C 2746 6F40 D8F0 D0C9"            /* à3m’…sæ<'Fo@ØðÐÉ */
+	$"10AF 85A2 CFBF 373B B250 85E4 C1D3 85D2"            /* .¯…¢Ï¿7;²P…äÁÓ…Ò */
+	$"E167 1222 DF4A 67D9 B3D6 55B4 B047 8675"            /* ág."ßJgÙ³ÖU´°G†u */
+	$"C803 6AE5 E5AE AF92 C4B7 591A A040 98AC"            /* È.jå宯’Ä·Y. @˜¬ */
+	$"4412 45F8 BBC8 6482 F7BD 81B2 98FE 9D0B"            /* D.Eø»Èd‚÷½�²˜þ�. */
+	$"DAB1 2959 952C 9115 3504 9A24 BBA4 A04C"            /* Ú±)Y•,‘.5.š$»¤ L */
+	$"4125 5810 54F5 C268 63C2 1DB9 11CF 85BB"            /* A%X.TõÂhcÂ.¹.Ï…» */
+	$"D941 F5A1 0239 DED3 856D BBE5 7CF3 49C3"            /* ÙAõ¡.9ÞÓ…m»å|óIà */
+	$"C9CF 1BD1 A953 F58A F9AF E704 E70E 43B7"            /* ÉÏ.Ñ©SõŠù¯ç.ç.C· */
+	$"2B51 BE14 4FF3 262C 914B 90AF F2A9 E060"            /* +Q¾.Oó&,‘K�¯ò©à` */
+	$"6A24 6553 B776 C48D 19AD ECD3 2DD3 8ECF"            /* j$eS·vÄ�.­ìÓ-ÓŽÏ */
+	$"9EC7 8A0D 97F4 3C69 6E56 0881 1136 C147"            /* žÇŠ.—ô<inV.�.6ÁG */
+	$"E7D3 6FE5 A0C6 D7DC BCB0 76AC C4F8 DD65"            /* çÓoå Æ×ܼ°v¬ÄøÝe */
+	$"A5F9 02BF 2BFD 9A2C 354D 24C2 E088 6B63"            /* ¥ù.¿+ýš,5M$Âàˆkc */
+	$"E514 C014 E8F4 F5C2 B529 74FB EC02 032B"            /* å.À.èôõµ)tûì..+ */
+	$"A54B 696E B602 7D58 4542 824D BD8C 40FA"            /* ¥Kin¶.}XEB‚M½Œ@ú */
+	$"F675 5CD4 71C9 058E 7062 0E1B 10CC 72A9"            /* öu\ÔqÉ.Žpb...Ìr© */
+	$"95B8 C5FD 7EAF 995C 62ED DDE4 6579 3181"            /* •¸Åý~¯™\bíÝäey1� */
+	$"8BA1 A02B 1559 F5BC E9C9 914D 8CEB D7D8"            /* ‹¡ +.Yõ¼éÉ‘MŒë×Ø */
+	$"7D81 20C0 A609 18D2 B679 7C08 FB00 E4C6"            /* }� À¦Æ.Ò¶y|.û.äÆ */
+	$"2797 518E 32CE 67CE 3C8E 6796 A832 F712"            /* '—QŽ2ÎgÎ<Žg–¨2÷. */
+	$"0037 059C 96CD 85A0 98E6 5D20 05F2 EC61"            /* .7.œ–Í… ˜æ] .òìa */
+	$"335D AFFF 14BC 3EF9 0779 7A53 BAA4 F47A"            /* 3]¯ÿ.¼>ù.yzSº¤ôz */
+	$"6926 DAD2 72F9 5D4B 1014 8BD5 A4FA 68EA"            /* i&ÚÒrù]K..‹Õ¤úhê */
+	$"D9F9 F684 BFD5 F2ED FB9E 4C18 91C3 FF17"            /* Ùùö„¿ÕòíûžL.‘Ãÿ. */
+	$"2D17 D99A DE29 FE6E 63A4 C901 8642 9357"            /* -.ÙšÞ)þnc¤É.†B“W */
+	$"3120 4386 1938 E7D2 572D 0C59 E3C9 7FED"            /* 1 C†.8çÒW-.YãÉ.í */
+	$"30FA E54A CEF8 A94C F92D AF19 76EA 3372"            /* 0úåJÎø©Lù-¯.vê3r */
+	$"B4E1 E7C5 8239 A4AC A247 4838 55E8 EB9B"            /* ´áçÅ‚9¤¬¢GH8Uèë› */
+	$"DE7D 94E9 DBD7 07FB D488 1672 E61D 9E4C"            /* Þ}”éÛ×.ûÔˆ.ræ.žL */
+	$"6DF2 97D5 4936 F89A 5CBC D37A 8C2C F7ED"            /* mò—ÕI6øš\¼ÓzŒ,÷í */
+	$"9755 19F2 0350 AB2E D851 F0B7 78B5 9770"            /* —U.ò.P«.ØQð·xµ—p */
+	$"4DF3 4212 9C9C CA3B 403A BA7B D497 9410"            /* MóB.œœÊ;@:º{Ô—”. */
+	$"04C6 288B 5058 5DC9 EB79 AB85 622C 9A55"            /* .Æ(‹PX]Éëy«…b,šU */
+	$"2DA7 C113 9315 7CAE D84E 6B50 4062 AE94"            /* -§Á.“.|®ØNkP@b®” */
+	$"8F5E 7969 4BA5 56B2 E881 8C02 ED3B 5259"            /* �^yiK¥V²è�Œ.í;RY */
+	$"24CE C98A 4348 12B1 314F E3E3 B6A3 4E61"            /* $ÎÉŠCH.±1Oã㶣Na */
+	$"A426 6350 E380 B0B5 DEFF 64CF 72D6 D4B9"            /* ¤&cP〰µÞÿdÏrÖÔ¹ */
+	$"907C 9BE0 7E4D 39F9 2BB7 C3DE D7C3 DCD8"            /* �|›à~M9ù+·ÃÞ×ÃÜØ */
+	$"1F93 775F 0F44 DF0F A717 C3E9 D603 F269"            /* .“w_.Dß.§.ÃéÖ.òi */
+	$"FBE1 D36F 87B3 6F87 B280 E8AB DECC AF0D"            /* ûáÓo‡³o‡²€è«Þ̯. */
+	$"6C8A C695 8734 87EB A75F 5130 05EC 9BA8"            /* lŠÆ•‡4‡ë§_Q0.웨 */
+	$"78DB 85A2 680C 75A0 EDD1 4AA2 7E1B BAFF"            /* xÛ…¢h.u íÑJ¢~.ºÿ */
+	$"5AFC FD6C 3E36 A6D9 923A 2DCE 24BC 35EF"            /* Züýl>6¦Ù’:-Î$¼5ï */
+	$"27F4 8813 7CC4 0141 3CD9 9568 BFE6 BBB3"            /* 'ôˆ.|Ä.A<Ù•h¿æ»³ */
+	$"219B 0442 5227 3796 635D 0DE7 499A A701"            /* !›.BR'7–c].çIš§. */
+	$"7F74 FB13 F9DF E737 08AB 0A91 3D9E B77D"            /* .tû.ùßç7.«Â‘=ž·} */
+	$"E616 57BB 8BAF 7A0D 1B28 42E6 D653 6BD3"            /* æ.W»‹¯z..(BæÖSkÓ */
+	$"D7A8 9A2B 0905 6198 8809 E5D0 D0A4 F589"            /* רš+Æ.a˜ˆÆåÐФõ‰ */
+	$"3D04 8161 C4CB 7BC9 96E2 9DA4 1C59 C982"            /* =.�aÄË{É–â�¤.YÉ‚ */
+	$"4705 B1BE 1E05 E391 5E89 43FE 6C67 4342"            /* G.±¾..ã‘^‰CþlgCB */
+	$"636F 80C5 6A98 16E6 6B80 27C8 D0D9 B28C"            /* co€Åj˜.æk€'ÈÐÙ²Œ */
+	$"6FD4 E109 61AB 8FCB D4CB 19ED 2BE7 B510"            /* oÔáÆa«�ËÔË.í+çµ. */
+	$"C0E8 5883 0642 92A1 6094 7E45 5D3F 819A"            /* ÀèXƒ.B’¡`”~E]?�š */
+	$"4B6F AE8E ED0B 4B30 ABB1 2789 5C58 EEFD"            /* Ko®Ží.K0«±'‰\Xîý */
+	$"06C9 EF2B 2A12 1731 7581 4428 C72D 2501"            /* .Éï+*..1u�D(Ç-%. */
+	$"2C14 0DA4 2C98 035F FEA8 51A2 0E61 4C50"            /* ,..¤,˜._þ¨Q¢.aLP */
+	$"4A65 60DE FA1C F36C 62D9 A3FA 93A6 4CAC"            /* Je`Þú.ólbÙ£ú“¦L¬ */
+	$"C1D0 079D 912F A133 724B 13CC AFF4 1382"            /* ÁÐ.�‘/¡3rK.̯ô.‚ */
+	$"D61F 8AF2 A48B CCA6 5D66 4F61 E6BE 657B"            /* Ö.Šò¤‹Ì¦]fOaæ¾e{ */
+	$"7F5B 6F20 397A BBC2 3F23 86DF 2355 4A18"            /* .[o 9z»Â?#†ß#UJ. */
+	$"15DB CB3E 201F FF7C 4AC9 C764 B098 CA46"            /* .ÛË> .ÿ|JÉÇd°˜ÊF */
+	$"C2CF 44C6 42E7 D30A FD05 380F 6BD3 24C1"            /* ÂÏDÆBçÓÂý.8.kÓ$Á */
+	$"3998 C5C1 E7D5 0E2C 8D50 7FBB 7A11 6CB7"            /* 9˜ÅÁçÕ.,�P.»z.l· */
+	$"B80F 5A84 44BE E746 C43C 6B5D F055 7A3B"            /* ¸.Z„D¾çFÄ<k]ðUz; */
+	$"77CB BFA9 2B73 06AF 9C8B AF37 F600 E568"            /* wË¿©+s.¯œ‹¯7ö.åh */
+	$"EE70 09D2 B0A7 C201 94D9 AC58 E9A2 9D53"            /* îpÆÒ°§Â.”Ù¬Xé¢�S */
+	$"94C0 D1C9 E379 E453 E4C7 27C5 C3F8 1161"            /* ”ÀÑÉãyäSäÇ'ÅÃø.a */
+	$"D631 3F3C 0CFE 13A3 F6EB 3048 F049 CF11"            /* Ö1?<.þ.£öë0HðIÏ. */
+	$"5962 65AE 5D8E F911 A2E2 7787 6C78 F63C"            /* Ybe®]Žù.¢âw‡lxö< */
+	$"E24C ED5B F634 B2B9 9DDF 51B0 94B9 1ABF"            /* âLí[ö4²¹�ßQ°”¹.¿ */
+	$"BE93 4236 35A6 613E 3D1B C8FD 0587 27C7"            /* ¾“B65¦a>=.Èý.‡'Ç */
+	$"F936 55E0 D0CE BF1A 50D8 51CE 6253 0293"            /* ù6UàÐο.PØQÎbS.“ */
+	$"1958 3FA2 BF6C 54A5 B158 4236 7F88 7DE4"            /* .X?¢¿lT¥±XB6.ˆ}ä */
+	$"C231 6D0B 62F1 2C6C 1A1D F8AA 0317 C52D"            /* Â1m.bñ,l..øª..Å- */
+	$"D9D5 0B61 312B A074 B2B8 1905 FCF9 A102"            /* ÙÕ.a1+ t²¸..üù¡. */
+	$"6188 616D 74E6 8232 245D 9C8A 4FD8 E2FD"            /* aˆamtæ‚2$]œŠOØâý */
+	$"0C6C 8F2E 5C82 5724 C542 3AE5 BA0A EE0B"            /* .l�.\‚W$ÅB:åºÂî. */
+	$"2A14 BCDE 8005 4446 25B1 CF8A 6744 9F5C"            /* *.¼Þ€.DF%±ÏŠgDŸ\ */
+	$"9B09 6571 3003 9F52 A42A 7669 CCAA 7A75"            /* ›Æeq0.ŸR¤*vi̪zu */
+	$"F807 2530 7BA9 1474 F318 5A7B E64A 5DD7"            /* ø.%0{©.tó.Z{æJ]× */
+	$"A6F2 13B0 AFA5 7BF8 46DC CABF 4D80 CC26"            /* ¦ò.°¯¥{øFÜÊ¿M€Ì& */
+	$"5838 4016 3C05 4550 C62F 1504 5B79 0816"            /* X8@.<.EPÆ/..[y.. */
+	$"556C 8524 5DDA E914 92F1 3124 5C5B 3213"            /* Ul…$]Úé.’ñ1$\[2. */
+	$"7851 D9B8 EE79 46CF 3F06 1EAB 662A FD9E"            /* xQÙ¸îyFÏ?..«f*ýž */
+	$"E7D8 2E8C 938F 43FA B1B1 34B0 9207 34EC"            /* çØ.Œ“�Cú±±4°’.4ì */
+	$"7A09 46BF 201E 311F EEEE 88EF C6C1 C10D"            /* zÆF¿ .1.îîˆïÆÁÁ. */
+	$"E238 50C9 7F01 DFF0 2170 EDD1 7471 8C14"            /* â8PÉ..ßð!píÑtqŒ. */
+	$"FB17 6678 A8B9 6611 9713 D8BB 8840 427C"            /* û.fx¨¹f.—.Ø»ˆ@B| */
+	$"8E5E 1608 D5E6 79B6 0BD7 3592 5D97 3864"            /* Ž^..Õæy¶.×5’]—8d */
+	$"71DF 6137 C0E6 2EB0 F71D 466C CFFF 50EF"            /* qßa7Àæ.°÷.FlÏÿPï */
+	$"FE99 2E4D 0DBB 537F 32F1 DECB D5D4 39DF"            /* þ™.M.»S.2ñÞËÕÔ9ß */
+	$"4FCC 2FC2 C399 8EB9 FC8B 2806 3FB7 F227"            /* OÌ/ÂÙŽ¹ü‹(.?·ò' */
+	$"BA12 A288 9858 9159 B6ED 0DBF 3DCC 8FA1"            /* º.¢ˆ˜X‘Y¶í.¿=Ì�¡ */
+	$"9CF5 836D 499F B9E7 DB4E 497F D3A4 57BF"            /* œõƒmIŸ¹çÛNI.Ó¤W¿ */
+	$"9F0A EECE 8E29 127A 82FF 4222 75AC 32D4"            /* ŸÂîÎŽ).z‚ÿB"u¬2Ô */
+	$"6540 8040 4137 9EB4 EFFF 7FEC 9D37 60B4"            /* e@€@A7ž´ïÿ.ì�7`´ */
+	$"184A 9567 71E4 F5FE 1C55 BB95 9FD8 BE6D"            /* .J•gqäõþ.U»•ŸØ¾m */
+	$"037F 052C 035B 91D7 903B 6EEC 1642 3D18"            /* ...,.[‘×�;nì.B=. */
+	$"0B05 FEC5 4C0C 9ED3 BFA5 94AF CBB1 E725"            /* ..þÅL.žÓ¿¥”¯Ë±ç% */
+	$"DFC3 AF74 2485 D5A2 7F79 1275 C7DD ADE1"            /* ßït$…Õ¢.y.uÇÝ­á */
+	$"3BD5 AD19 74E6 EE9F 6846 7900 C09D 090B"            /* ;Õ­.tæîŸhFy.À�Æ. */
+	$"C17C FB0F 2C9F 4DEB B9FE 7152 A47E B1CB"            /* Á|û.,ŸMë¹þqR¤~±Ë */
+	$"FB0E 7108 21C7 EFAB 8FA3 8AF0 2FDC 17A9"            /* û.q.!Çï«�£Šð/Ü.© */
+	$"2565 5082 BEBF 4DDD 0699 3265 82AE D421"            /* %eP‚¾¿MÝ.™2e‚®Ô! */
+	$"3776 341F C56C ECDA B302 0306 AE5F 37FF"            /* 7v4.ÅlìÚ³...®_7ÿ */
+	$"7FB7 1192 8D68 5475 EE0B 4D80 6149 DEBB"            /* .·.’�hTuî.M€aIÞ» */
+	$"F9A7 D7E7 A35D 9515 8000 4F04 C4D6 670C"            /* ù§×ç£]•.€.O.ÄÖg. */
+	$"54B7 93BB D264 43E0 E8D4 2D4D D3E2 AEB0"            /* T·“»ÒdCàèÔ-MÓâ®° */
+	$"FBAE F5BD A155 A8F2 07B4 AAA6 CE0A 84CC"            /* û®õ½¡U¨ò.´ª¦ÎÂ„Ì */
+	$"907F D5C4 9900 8FE2 0E0D F385 55A0 CDFF"            /* �.ÕÄ™.�â..ó…U Íÿ */
+	$"7FFE D776 193F A5C4 0334 DD15 7A6A 0890"            /* .þ×v.?¥Ä.4Ý.zj.� */
+	$"DE98 5707 7799 9A5B D638 31B9 982B 5623"            /* Þ˜W.w™š[Ö81¹˜+V# */
+	$"3AFA A84A 20E7 417C F56E 7776 0C54 0765"            /* :ú¨J çA|õnwv.T.e */
+	$"91DE A19E 3DD2 4D8B F9F9 0D61 6343 0746"            /* ‘Þ¡ž=ÒM‹ùù.acC.F */
+	$"7D72 600B 4E15 FC8F 60FA A273 4348 A86E"            /* }r`.N.ü�`ú¢sCH¨n */
+	$"E11A CD6B 3FFF 7ED1 E486 AAAA A380 045A"            /* á.Ík?ÿ~Ñ䆪ª£€.Z */
+	$"70E5 3753 4FFF 7FC6 ADBE 8E71 66FF 8165"            /* på7SOÿ.Æ­¾Žqfÿ�e */
+	$"D782 24E8 7399 0C15 03BF 29B5 5685 FDA1"            /* ׂ$ès™...¿)µV…ý¡ */
+	$"5BAD 5751 6D53 799A A7C6 572E 6A37 B46A"            /* [­WQmSyš§ÆW.j7´j */
+	$"B9BF 05BF 3131 F7DB E3B8 8F11 EE2F 13D6"            /* ¹¿.¿11÷Ûã¸�.î/.Ö */
+	$"7DE9 D552 0B25 FEAF AEFE F0A7 FBE9 487F"            /* }éÕR.%þ¯®þð§ûéH. */
+	$"9085 0FFA 23FE A9DB 0494 B0E1 FEFD 1D50"            /* �….ú#þ©Û.”°áþý.P */
+	$"15B4 6548 AAA0 0182 C5FF 7D24 05C8 B15E"            /* .´eHª .‚Åÿ}$.ȱ^ */
+	$"E45F A508 3C68 CA73 3A57 A35E 462D 9213"            /* ä_¥.<hÊs:W£^F-’. */
+	$"9D19 A4FE F266 C323 64FF 7B71 19F7 0BC3"            /* �.¤þòfÃ#dÿ{q.÷.Ã */
+	$"062C 20C4 9745 F075 6FFF 31F0 A3AD 4C84"            /* ., Ä—Eðuoÿ1ð£­L„ */
+	$"00F3 104C 0064 3899 0DB9 8128 CB5F FF46"            /* .ó.L.d8™.¹�(Ë_ÿF */
+	$"7184 41CB 7E58 4C0B ADD5 CBB2 1A61 E3D6"            /* q„AË~XL.­Õ˲.aãÖ */
+	$"B45F 489E 7FE9 D915 2B77 0776 98BD B3A6"            /* ´_Hž.éÙ.+w.v˜½³¦ */
+	$"230E B817 1D5A D937 3251 2449 6B0A 5A13"            /* #.¸..ZÙ72Q$IkÂZ. */
+	$"C4E0 BB45 CB72 9758 9E56 158D B1E6 9590"            /* Äà»EËr—XžV.�±æ•� */
+	$"4FC4 0611 EDBC 426F 6D2B D932 D595 A74E"            /* OÄ..í¼Bom+Ù2Õ•§N */
+	$"8728 58CD BD02 9746 DBA2 7EAB 0F07 363C"            /* ‡(Xͽ.—FÛ¢~«..6< */
+	$"BAB3 1228 E02A BDB4 373F F3FB FF7D 8D0D"            /* º³.(à*½´7?óûÿ}�. */
+	$"2193 09F4 7603 A017 98B1 421E 7A47 D126"            /* !“Æôv. .˜±B.zGÑ& */
+	$"82FD 5449 B97F F864 5CD5 19F6 A8A4 F216"            /* ‚ýTI¹.ød\Õ.ö¨¤ò. */
+	$"A4B3 FF7F E820 4C58 DE4B 944B 6FD4 F4DA"            /* ¤³ÿ.è LXÞK”KoÔôÚ */
+	$"596E A688 456C 3F0D 7844 1596 2BED 0D5D"            /* Yn¦ˆEl?.xD.–+í.] */
+	$"FAFB 8D2E D7D0 ABCB B2BE 8D80 E74D 9EDC"            /* úû�.×Ы˲¾�€çMžÜ */
+	$"7FFF 7FC9 2FB9 3BDA F47A B9C2 E1B8 5CC8"            /* .ÿ.É/¹;Úôz¹Âá¸\È */
+	$"14AB D534 7208 32FE 73D2 EF23 862E 10F8"            /* .«Õ4r.2þsÒï#†..ø */
+	$"C16F 1FFF 6FBB FA97 5167 CDAD 4886 8FC2"            /* Áo.ÿo»ú—QgÍ­H†� */
+	$"BFFF 7FFE 2B73 126E 1EC8 C82A 3F6D 6CC3"            /* ¿ÿ.þ+s.n.ÈÈ*?mlà */
+	$"D98A D501 1DC2 82FD FF57 9731 B866 2A7D"            /* ÙŠÕ..‚ýÿW—1¸f*} */
+	$"C983 5F41 893F 2D09 F81C E373 42C2 5963"            /* Ƀ_A‰?-Æø.ãsBÂYc */
+	$"7E9F C269 2B8B C21A 8247 D433 0DF7 491E"            /* ~ŸÂi+‹Â.‚GÔ3.÷I. */
+	$"D1BF 3D9E F4BD 1B50 8034 4EE9 4A69 B155"            /* Ñ¿=žô½.P€4NéJi±U */
+	$"849A B0F7 8CEA 3FD0 E4A0 C339 2431 ED8B"            /* „š°÷Œê?Ðä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FD9F 7F36 9703 7BCA 1455 6A98 F02E"            /* #fýŸ.6—.{Ê.Uj˜ð. */
+	$"1EDC 4707 C9A6 B325 A6E4 637D 612B B3DD"            /* .ÜG.ɦ³%¦äc}a+³Ý */
+	$"1E5A 3660 EEB0 BEFA 2C50 307B 5887 6D39"            /* .Z6`î°¾ú,P0{X‡m9 */
+	$"0EC7 2D81 C32E 6B72 8546 30E4 133F 3D3B"            /* .Ç-�Ã.kr…F0ä.?=; */
+	$"0A76 21AA 4387 8F29 03C8 1C32 755C F553"            /* Âv!ªC‡�).È.2u\õS */
+	$"5CA1 C16A 02EC 4654 97C8 6F10 BA2A 16E0"            /* \¡Áj.ìFT—Èo.º*.à */
+	$"DB18 605E 8A18 8A6E 4F35 1EF7 8C57 F8B2"            /* Û.`^Š.ŠnO5.÷ŒWø² */
+	$"0020 4D0A 1739 2287 ADE2 B0C2 D816 17D2"            /* . MÂ.9"‡­â°ÂØ..Ò */
+	$"21F8 3104 FEA8 38E3 8644 6F0B D2C6 A599"            /* !ø1.þ¨8ã†Do.ÒÆ¥™ */
+	$"B793 1367 B548 23BD 8836 1143 D5DB 2720"            /* ·“.gµH#½ˆ6.CÕÛ'  */
+	$"73BB 1485 DEAF C96F 24E8 AA26 56B9 89D3"            /* s».…Þ¯Éo$èª&V¹‰Ó */
+	$"8F8D 2F3E 5EA5 466C BE3C 6879 6C0A 5891"            /* ��/>^¥Fl¾<hylÂX‘ */
+	$"974E 6F22 0E47 66D4 BD1F 6A7D 1885 42CC"            /* —No".GfÔ½.j}.…BÌ */
+	$"7E13 126E AC98 74B7 B093 BDFF 37DB E527"            /* ~..n¬˜t·°“½ÿ7Ûå' */
+	$"E6D0 CF2A D7E6 E7EB 1095 05AF 6407 BB9B"            /* æÐÏ*×æçë.•.¯d.»› */
+	$"0227 D5EB 260A C844 340F B249 E84F 58A7"            /* .'Õë&ÂÈD4.²IèOX§ */
+	$"FA14 9D34 7614 73A6 BE73 ED76 B2CD 4515"            /* ú.�4v.s¦¾sív²ÍE. */
+	$"F26C 3AD7 7C32 5480 5A3A C4DF 123A EA95"            /* òl:×|2T€Z:Äß.:ê• */
+	$"D2B4 A3D8 F88D E685 6505 A999 DD9E C8D1"            /* Ò´£Øø�æ…e.©™ÝžÈÑ */
+	$"A073 3702 5A8F 3598 F7DC A36F 0058 065E"            /*  s7.Z�5˜÷Ü£o.X.^ */
+	$"65E6 B5AC 2A85 0F1C 43BF 8A10 43A0 BB10"            /* e浬*…..C¿Š.C ». */
+	$"4C3A 8F4F 95AD 253D EEE9 FBE8 4023 4647"            /* L:�O•­%=îéûè@#FG */
+	$"7A75 8F1C 9245 3C51 3FF5 BD2B DFD3 57EF"            /* zu�.’E<Q?õ½+ßÓWï */
+	$"1FB4 900F 4546 6EFA A7AE 45EB EAE9 7B9D"            /* .´�.EFnú§®Eëêé{� */
+	$"6408 1DCB F7AC BE44 7D08 1482 2257 A9CF"            /* d..Ë÷¬¾D}..‚"W©Ï */
+	$"8B78 3610 9816 9518 A64C 215A 4569 6C5F"            /* ‹x6.˜.•.¦L!ZEil_ */
+	$"57E0 4F89 F77C 88D6 ADFC 8E42 9299 A2C9"            /* WàO‰÷|ˆÖ­üŽB’™¢É */
+	$"0F7C EA0A 7E98 B7AF 70ED 09A8 0759 B1A7"            /* .|êÂ~˜·¯píƨ.Y±§ */
+	$"C18E 2CC9 883F A788 A2F1 57B9 7A0E F384"            /* ÁŽ,Ɉ?§ˆ¢ñW¹z.ó„ */
+	$"F0CE 46F0 E10A ED6F CE17 2BE1 25D5 3A36"            /* ðÎFðáÂíoÎ.+á%Õ:6 */
+	$"5C6A F3AA F2D1 7225 6C5C 514F 8F1F 64A5"            /* \jóªòÑr%l\QO�.d¥ */
+	$"B08E D05D 3E2E B3E4 DE48 12A9 7DC6 6E03"            /* °ŽÐ]>.³äÞH.©}Æn. */
+	$"05B3 2AD0 EF87 EFB1 6D03 06E4 85AB 36C6"            /* .³*Ðï‡ï±m..ä…«6Æ */
+	$"9BF6 8382 74F2 F321 62DF 269C 8D95 8FBD"            /* ›öƒ‚tòó!bß&œ�•�½ */
+	$"C4CA 7278 FDBA C51B A4FC C224 BD43 5F76"            /* ÄÊrxýºÅ.¤üÂ$½C_v */
+	$"F9D9 0970 5EAA 5F05 FDCB 50DE 35E7 A82E"            /* ùÙÆp^ª_.ýËPÞ5ç¨. */
+	$"1E7E 584D 33D8 EF90 B221 622F 778E 460D"            /* .~XM3Øï�²!b/wŽF. */
+	$"6DC9 383F CF41 7B89 7414 97EF EFE2 CC75"            /* mÉ8?ÏA{‰t.—ïïâÌu */
+	$"8895 6AFD C6E8 610E 5E29 7AE1 FAAF 9FD5"            /* ˆ•jýÆèa.^)záú¯ŸÕ */
+	$"435F 3F61 6F9F AC78 7EAD 62BE 7DF7 7CFD"            /* C_?aoŸ¬x~­b¾}÷|ý */
+	$"D3FD 5BAF 83F5 5B37 CF6D BE7E 9DDF 3F4D"            /* Óý[¯ƒõ[7Ïm¾~�ß?M */
+	$"80E8 ABDE CCAF 0D6C 8AC6 9587 348A 7A5A"            /* €è«Þ̯.lŠÆ•‡4ŠzZ */
+	$"21F6 5D05 F6A4 1727 AC99 8E36 4607 A805"            /* !ö].ö¤.'¬™Ž6F.¨. */
+	$"1CA8 FB12 6979 4216 6FCF DF65 6135 AFF9"            /* .¨û.iyB.oÏßea5¯ù */
+	$"5A1E 01C1 15A0 4F38 E547 6F65 858D 0788"            /* Z..Á. O8åGoe…�.ˆ */
+	$"49E3 07A2 D476 B767 EC21 FF65 559D 3B3F"            /* Iã.¢Ôv·gì!ÿeU�;? */
+	$"B8A5 C1A8 6496 5183 24E6 93A6 DF2F 52F1"            /* ¸¥Á¨d–Qƒ$擦ß/Rñ */
+	$"19CA BFD7 1479 8040 2F9C 0DB9 00F0 49C5"            /* .Ê¿×.y€@/œ.¹.ðIÅ */
+	$"3D32 5B0C 9453 8D1F 452F D9E7 75FD CD61"            /* =2[.”S�.E/ÙçuýÍa */
+	$"44A9 62C3 F0C8 BAF0 6A66 A4D4 AA8B 73B0"            /* D©bÃðȺðjf¤Ôª‹s° */
+	$"C942 686A 4A1E E3A7 2343 A0ED D595 9AFC"            /* ÉBhjJ.ã§#C íÕ•šü */
+	$"5546 0ACB FD23 6F2E DCEE ABBD 70E7 FA93"            /* UFÂËý#o.Üpçú“ */
+	$"3FFF 7FC5 7D31 FA1C D910 1C70 6CDC 3362"            /* ?ÿ.Å}1ú.Ù..plÜ3b */
+	$"B0A1 C6F3 16D1 BE51 73D2 4697 37CA 8197"            /* °¡Æó.ѾQsÒF—7Ê�— */
+	$"A8C6 89C1 FF78 99EB 31B8 5F88 7B08 C557"            /* ¨Æ‰Áÿx™ë1¸_ˆ{.ÅW */
+	$"5483 A35C 0713 94D5 D2DF B84C 36CA D9EC"            /* Tƒ£\..”ÕÒ߸L6ÊÙì */
+	$"8FC7 A305 814F 8B04 07D2 E391 5E89 43FE"            /* �Ç£.�O‹..Òã‘^‰Cþ */
+	$"6C67 4343 91DB DD56 C1D2 FEA6 9F1F 346F"            /* lgCC‘ÛÝVÁÒþ¦Ÿ.4o */
+	$"714B 79E1 7AC7 53A1 9934 69F4 E886 5A9C"            /* qKyázÇS¡™4iôè†Zœ */
+	$"6F9A D26F DD48 5F60 A72A 7E20 77F8 1BE8"            /* ošÒoÝH_`§*~ wø.è */
+	$"91B9 9018 8124 7694 3664 4202 7B94 1007"            /* ‘¹�.�$v”6dB.{”.. */
+	$"4234 15FC 04A2 6DE0 DC6B 5EDE 4332 F592"            /* B4.ü.¢màÜk^ÞC2õ’ */
+	$"779A A3BD 8E84 5464 DE08 6BAE AE2F 6EEF"            /* wš£½Ž„TdÞ.k®®/nï */
+	$"CB75 5862 59D8 1362 5D60 79D2 137C 7606"            /* ËuXbYØ.b]`yÒ.|v. */
+	$"F2B1 06DE 8A2F B76A A7D9 84DB 8F52 1107"            /* ò±.ÞŠ/·j§Ù„Û�R.. */
+	$"A42C 9803 2476 0448 42C9 A9E5 D0F5 9110"            /* ¤,˜.$v.HBÉ©åÐõ‘. */
+	$"2FAB AAF4 0752 81C9 6064 B8F7 6CEB 438E"            /* /«ªô.R�É`d¸÷lëCŽ */
+	$"DC4B 916C 21F0 1C8F 2A6A 1919 9E26 2B36"            /* ÜK‘l!ð.�*j..ž&+6 */
+	$"3E51 F543 F7C5 2549 66D0 2F14 D18F 42F1"            /* >QõC÷Å%IfÐ/.Ñ�Bñ */
+	$"397B BA52 99ED 853C E07D 629B 92A1 2589"            /* 9{ºR™í…<à}b›’¡%‰ */
+	$"B3A9 B812 DC8D A368 3204 F8AA 7549 AF2B"            /* ³©¸.Ü�£h2.øªuI¯+ */
+	$"2DE7 529C 1ECB 9747 A4B8 F6EC 8DDC 0AC4"            /* -çRœ.Ë—G¤¸öì�ÜÂÄ */
+	$"2C31 F042 C407 3F18 FD32 9280 60E4 60D8"            /* ,1ðBÄ.?.ý2’€`ä`Ø */
+	$"77B5 C019 A5FF 6E0D 8E35 A78E C7AA E95B"            /* wµÀ.¥ÿn.Ž5§ŽÇªé[ */
+	$"D37C D883 5DD2 756B 385A 08BB 7708 AA5E"            /* Ó|؃]Òuk8Z.»w.ª^ */
+	$"5B89 0628 F831 7775 3555 A523 BF2F 721A"            /* [‰.(ø1wu5U¥#¿/r. */
+	$"099B E6B4 5128 9EA6 41E1 9B8B 18C1 928C"            /* Æ›æ´Q(ž¦Aᛋ.Á’Œ */
+	$"72A0 BD1E 84D6 836A C947 0982 284A 9238"            /* r ½.„ÖƒjÉGÆ‚(J’8 */
+	$"A06F E390 1BD5 BBFD 323F BA86 2091 BAD5"            /*  oã�.Õ»ý2?º† ‘ºÕ */
+	$"351D 16C5 1D44 E8C7 66C7 D469 047D 5548"            /* 5..Å.DèÇfÇÔi.}UH */
+	$"7049 7B42 B682 DF4C 68DE B5D2 2EDC C105"            /* pI{B¶‚ßLhÞµÒ.ÜÁ. */
+	$"4047 9A7E 0403 F48B 6215 C3ED 8DBA 12E9"            /* @Gš~..ô‹b.Ãí�º.é */
+	$"EEFB B61B 906E F6F6 DDFD D030 CD1C 47FD"            /* îû¶.�nööÝýÐ0Í.Gý */
+	$"7C37 E7C7 DC08 213E 3C33 08E6 74A0 F400"            /* |7çÇÜ.!><3.æt ô. */
+	$"7CFC 3B85 1A2E 5ACA 573F F24C 7D2C 0E3B"            /* |ü;…..ZÊW?òL},.; */
+	$"2A6D CEDC 6C9C 6E97 A572 915F A892 3833"            /* *mÎÜlœn—¥r‘_¨’83 */
+	$"A08F 0070 A602 FB49 0EA6 62FC 4237 C568"            /*  �.p¦.ûI.¦büB7Åh */
+	$"E937 1DC1 1FC2 C3F1 AA30 AC4D DDB8 E747"            /* é7.Á.ÂÃñª0¬MݸçG */
+	$"5EE4 FD73 8124 56EB ADBE 6DB3 F27B 80C0"            /* ^äýs�$Vë­¾m³ò{€À */
+	$"E536 971B 511B C76B AB20 8BA4 4DCD BFCB"            /* å6—.Q.Çk« ‹¤MÍ¿Ë */
+	$"4A0C 34DC 3DDC 9BEF 5122 89D0 99D1 9BE7"            /* J.4Ü=Ü›ïQ"‰Ð™Ñ›ç */
+	$"8840 002A A77A 25E2 9C2C F9BC 78F9 FB0E"            /* ˆ@.*§z%âœ,ù¼xùû. */
+	$"0DB7 4F14 B07A 12F6 65D3 ABE1 660D A84A"            /* .·O.°z.öeÓ«áf.¨J */
+	$"EFF9 A799 1852 8ED0 9582 B79A D812 1BE6"            /* ïù§™.RŽÐ•‚·šØ..æ */
+	$"F3D0 D5FA 9C76 5EBD DBFD 42A9 F7B3 885E"            /* óÐÕúœv^½ÛýB©÷³ˆ^ */
+	$"4A68 DBE7 9663 FB7F 1AC4 5004 197F 97F0"            /* JhÛç–cû..ÄP...—ð */
+	$"F57B 135D 19ED E0E0 1C84 139C BA3B 2493"            /* õ{.].íàà.„.œº;$“ */
+	$"D997 333D B6A7 9E83 619C FCE9 9875 134D"            /* Ù—3=¶§žƒaœüé˜u.M */
+	$"4B31 FCB3 5808 B917 C8BB 0B67 4564 488E"            /* K1ü³X.¹.È».gEdHŽ */
+	$"3554 8125 C3A4 DB4A 0BB2 E501 244C 1F49"            /* 5T�%äÛJ.²å.$L.I */
+	$"C6A7 51E4 6C51 A134 3DF4 CE21 2993 FF3B"            /* ƧQälQ¡4=ôÎ!)“ÿ; */
+	$"80F6 AE0B B9F8 D1D5 8853 4531 6806 4F3E"            /* €ö®.¹øÑÕˆSE1h.O> */
+	$"D2B6 5F62 796A 683C D3C9 A22B 6D56 C497"            /* Ò¶_byjh<ÓÉ¢+mVÄ— */
+	$"D854 2E14 C281 0F94 0220 BEE7 3754 D077"            /* ØT..Â�.”. ¾ç7TÐw */
+	$"EDB0 0F0E 95C1 A40B 55C9 B5AE 4DA8 A8A6"            /* í°..•Á¤.Uɵ®M¨¨¦ */
+	$"ADD6 4A11 DE81 B148 70D3 FA4F 795C 9171"            /* ­ÖJ.Þ�±HpÓúOy\‘q */
+	$"C72E 7EF2 454C 0336 BE4A EE68 960E 25BA"            /* Ç.~òEL.6¾Jîh–.%º */
+	$"E686 01F4 6FF5 3C7C 8B33 60D8 24D3 70A1"            /* æ†.ôoõ<|‹3`Ø$Óp¡ */
+	$"06C6 E616 29D4 63D6 3334 379F 743E 745D"            /* .Ææ.)ÔcÖ347Ÿt>t] */
+	$"4EF5 ECB5 072E 9F62 0750 F7BA 6FDE B6B0"            /* Nõìµ..Ÿb.P÷ºoÞ¶° */
+	$"0BD0 4FCC 8F59 9B13 0C77 0A30 9BAE DF36"            /* .ÐOÌ�Y›..wÂ0›®ß6 */
+	$"B13D D861 E92A 12C7 EC7A 0946 BF20 1E31"            /* ±=Øaé*.ÇìzÆF¿ .1 */
+	$"1FEE EE88 EFC6 C1C1 0DE2 3850 C97F 01DF"            /* .îîˆïÆÁÁ.â8PÉ..ß */
+	$"F021 605A D52A 570D 7089 0C1B B3FE 8B4D"            /* ð!`ZÕ*W.p‰..³þ‹M */
+	$"E441 70AC 5F71 3FCE 527F EBF4 048A A307"            /* äAp¬_q?ÎR.ëô.Š£. */
+	$"CEFD 4EB0 87ED BFE2 A36C 51B9 EAD3 37C6"            /* ÎýN°‡í¿â£lQ¹êÓ7Æ */
+	$"E8F0 9A3D 8F78 8747 81D4 33F0 9EEB 5EA0"            /* èðš=�x‡G�Ô3ðžë^  */
+	$"6FE0 A580 6B6B C126 1CE3 F1B2 DC9C CFCE"            /* oीkkÁ&.ãñ²ÜœÏÎ */
+	$"42EE 7E91 EF2F 0DDF CFDE 75EB 554D 6941"            /* Bî~‘ï/.ßÏÞuëUMiA */
+	$"07A5 21BE AD52 7CC1 49B5 FE74 AE40 F70F"            /* .¥!¾­R|ÁIµþt®@÷. */
+	$"AB3B 0C16 98F5 7742 3DCE 842D 0B2B 2FEB"            /* «;..˜õwB=΄-.+/ë */
+	$"5E90 DEBC 8BA9 81AC 40CC 0030 2853 FE9C"            /* ^�Þ¼‹©�¬@Ì.0(Sþœ */
+	$"6FC2 569B 2CD1 6200 2881 802D 7697 8442"            /* oÂV›,Ñb.(�€-v—„B */
+	$"92C8 666B BC90 3252 F4D3 9BD2 AD14 0027"            /* ’Èfk¼�2RôÓ›Ò­..' */
+	$"CE11 F5A4 437B 3F80 B250 AA4C 23B6 AD83"            /* Î.õ¤C{?€²PªL#¶­ƒ */
+	$"277E 5EF0 8132 6331 9325 D1A3 CFB6 6F73"            /* '~^ð�2c1“%ѣ϶os */
+	$"D37D 780F 91CC CD40 6234 2FE2 F097 1681"            /* Ó}x.‘ÌÍ@b4/âð—.� */
+	$"6097 88BD BFFF 18F5 2CBB FF67 FDBC 2F07"            /* `—ˆ½¿ÿ.õ,»ÿgý¼/. */
+	$"67FF 7FFF 1946 84C7 A551 03FF 7F52 A7C2"            /* gÿ.ÿ.F„Ç¥Q.ÿ.R§Â */
+	$"8AC8 1080 56FF 0C48 1804 A884 A5A2 08FF"            /* ŠÈ.€Vÿ.H..¨„¥¢.ÿ */
+	$"7FF5 3220 8043 9005 C25D DE15 02FB 7F2B"            /* .õ2 €C�.Â]Þ..û.+ */
+	$"8205 5CA8 40BE EFB1 78F0 2656 2AD4 14FF"            /* ‚.\¨@¾ï±xð&V*Ô.ÿ */
+	$"7505 20CD 8BE2 8B15 47BB 9E26 105E 15DD"            /* u. Í‹â‹.G»ž&.^.Ý */
+	$"21A7 82AE E19D FE27 5D8B DDAD E13B D5AD"            /* !§‚®á�þ']‹Ý­á;Õ­ */
+	$"1974 E6EE 9F68 4679 00C0 9D09 0BC1 7CFB"            /* .tæîŸhFy.À�Æ.Á|û */
+	$"0F2C 9F4E 082C 2CB4 569B A7B0 0009 E098"            /* .,ŸN.,,´V›§°.Æà˜ */
+	$"9AB0 9892 B1FF 6957 1D78 2613 4289 24C6"            /* š°˜’±ÿiW.x&.B‰$Æ */
+	$"12BC E2EF C9AE E6D9 784F C157 77AB 3470"            /* .¼âïÉ®æÙxOÁWw«4p */
+	$"D8C7 C746 1978 322D D4E9 FA24 B8B2 5054"            /* ØÇÇF.x2-Ôéú$¸²PT */
+	$"D643 8270 9090 D6D8 0C24 16E5 1146 421C"            /* ÖC‚p��ÖØ.$.å.FB. */
+	$"D6A2 40D9 1864 A800 0000 0000 0001 4554"            /* Ö¢@Ù.d¨.......ET */
+	$"031E 793B 33D3 FD4A CE0A 3D8A 9D46 37B0"            /* ..y;3ÓýJÎÂ=Š�F7° */
+	$"4D2C 6F04 2BFF 071C 023F E153 6688 1815"            /* M,o.+ÿ...?áSfˆ.. */
+	$"BA20 BF61 DDDF 2979 84E3 3348 50F6 E9B8"            /* º ¿aÝß)y„ã3HPöé¸ */
+	$"634A 8937 FF7F F1AE E84B C95A 771F 4C9C"            /* cJ‰7ÿ.ñ®èKÉZw.Lœ */
+	$"3FFE 0734 7D7F 6E35 4A2E 21E0 E52F FF7E"            /* ?þ.4}.n5J.!àå/ÿ~ */
+	$"8532 8513 7869 A6E6 495D 3E58 F349 1EF5"            /* …2….xi¦æI]>XóI.õ */
+	$"886C 6441 9091 82E8 0C24 1507 0E02 A105"            /* ˆldA�‘‚è.$....¡. */
+	$"95C5 1409 096C 9A37 F758 F13A 5ABF 149E"            /* •Å.ÆÆlš7÷Xñ:Z¿.ž */
+	$"DA31 52E9 0DA9 0BFF 45EB 20C7 1A1C E54C"            /* Ú1Ré.©.ÿEë Ç..åL */
+	$"29D1 6C8E D1EC 9D59 F945 4303 373F FF7F"            /* )ÑlŽÑì�YùEC.7?ÿ. */
+	$"CE95 B027 88F7 AB06 28B9 92E7 D540 BC2B"            /* Ε°'ˆ÷«.(¹’çÕ@¼+ */
+	$"7167 8C6C C87E 32B0 C904 7D7D 278E E519"            /* qgŒlÈ~2°É.}}'Žå. */
+	$"707D 2C42 1714 C425 F9D0 DC01 D910 23DB"            /* p},B..Ä%ùÐÜ.Ù.#Û */
+	$"E7F3 391C A4E6 FAE1 C850 5A1F 456A 6690"            /* çó9.¤æúáÈPZ.Ejf� */
+	$"3F37 F970 3841 73D3 1095 39CF 10A3 40F8"            /* ?7ùp8AsÓ.•9Ï.£@ø */
+	$"4CCC 4985 E3D5 127F 7CF4 92BC DCE9 2335"            /* LÌI…ãÕ..|ô’¼Üé#5 */
+	$"43FB 7460 8D5C C121 CFF2 1165 1CCE BBB2"            /* Cût`�\Á!Ïò.e.λ² */
+	$"5EA8 0279 2C97 E45B A43D 328C 7A6C 5EBC"            /* ^¨.y,—ä[¤=2Œzl^¼ */
+	$"61DD BB2C E34E 25E4 1725 3C6B EC12 BFEF"            /* aÝ»,ãN%ä.%<kì.¿ï */
+	$"3E5E 0ACF 766D 9D4E 8978 2AC5 F138 755A"            /* >^ÂÏvm�N‰x*Åñ8uZ */
+	$"CBDD 8421 F74E 9A07 A070 16ED 100C 769A"            /* ËÝ„!÷Nš. p.í..vš */
+	$"6571 1FA0 4D62 8ADC A3F1 0AAA 2253 1A39"            /* eq. MbŠÜ£ñª"S.9 */
+	$"0006 DF51 B09A 2267 BA13 3AD9 0120 8520"            /* ..ßQ°š"gº.:Ù. …  */
+	$"7375 BB11 0715 9FFF 7FFF 276F 9A44 4D02"            /* su»...Ÿÿ.ÿ'ošDM. */
+	$"9DF2 BE32 729A 8C71 FBC9 4C73 FA4B 1D24"            /* �ò¾2ršŒqûÉLsúK.$ */
+	$"4115 B69E 4FFF 7FFF 45B5 7091 9925 CEBD"            /* A.¶žOÿ.ÿEµp‘™%ν */
+	$"6A4E 1AA3 BFFF 7FFD AA3B 4043 EE5A 76B0"            /* jN.£¿ÿ.ýª;@CîZv° */
+	$"A073 CF17 7A58 3A06 649C B972 3CB8 897B"            /*  sÏ.zX:.dœ¹r<¸‰{ */
+	$"31E2 637A 05AC 83FA B94C 0F75 7113 FF7B"            /* 1âcz.¬ƒú¹L.uq.ÿ{ */
+	$"E690 225A FB16 A961 626A B7FE 22EF 864B"            /* æ�"Zû.©abj·þ"ï†K */
+	$"F464 1D62 4127 02B3 DB08 1C01 3ECE 1326"            /* ôd.bA'.³Û...>Î.& */
+	$"CF03 BF05 5771 4992 75FE 29FC 5FFF 60D5"            /* Ï.¿.WqI’uþ)ü_ÿ`Õ */
+	$"DCC3 1B1F 40FF 6990 DC69 3E47 D09A 6E6A"            /* ÜÃ..@ÿi�Üi>GКnj */
+	$"2866 9BA8 D74C BAAA 204E 05F9 DBFE E679"            /* (f›¨×Lºª N.ùÛþæy */
+	$"E76C 383D 9F92 BB32 1E14 2CA1 CBD5 E93C"            /* çl8=Ÿ’»2..,¡ËÕé< */
+	$"6C00 DFA2 B04F D650 3F14 60FF 7F73 29C3"            /* l.ߢ°OÖP?.`ÿ.s)à */
+	$"E20E 5672 C31B 6D72 FDCF 8097 B8B0 1482"            /* â.VrÃ.mrýÏ€—¸°.‚ */
+	$"C37E 4C4A 28FA 6E67 F061 E00C 371B 8655"            /* Ã~LJ(úngðaà.7.†U */
+	$"BDCB 2942 6AB1 0E31 38D3 6948 0D3F 6FEF"            /* ½Ë)Bj±.18ÓiH.?oï */
+	$"C2AB 669A E502 2490 C158 FC07 05F0 348A"            /* «fšå.$�ÁXü..ð4Š */
+	$"0505 F0B2 E7E3 F934 19DA 2DB9 9686 603E"            /* ..ð²çãù4.Ú-¹–†`> */
+	$"C2C3 4B2F EB95 FB4E 62D2 F085 4364 9DCA"            /* ÂÃK/ë•ûNbÒð…Cd�Ê */
+	$"A6E8 94F8 CC41 2603 5BFC 4E90 C05F 068D"            /* ¦è”øÌA&.[üN�À_.� */
+	$"414C 618C 8860 58B1 7059 0B4C 39E8 FB58"            /* ALaŒˆ`X±pY.L9èûX */
+	$"C413 43C6 BF39 CC12 6E5B F65C F671 DD29"            /* Ä.CÆ¿9Ì.n[ö\öqÝ) */
+	$"8A03 BC15 FF06 2028 49E4 BF04 E6FC D4FD"            /* Š.¼.ÿ. (Iä¿.æüÔý */
+	$"401A CB9C 5F7F EFE7 8F41 E707 7803 9F1A"            /* @.Ëœ_.ïç�Aç.x.Ÿ. */
+	$"715F 951E E63A 9B4C 1404 32AA B5B7 98B0"            /* q_•.æ:›L..2ªµ·˜° */
+	$"D5F4 CD69 DD15 9E81 D2FD 09F7 462D AF3E"            /* ÕôÍiÝ.ž�ÒýÆ÷F-¯> */
+	$"31DA 85C4 5053 8460 C06C 7018 908C 4821"            /* 1Ú…ÄPS„`Àlp.�ŒH! */
+	$"D8AB AC44 7666 44D1 EA04 8979 3A4A A0FE"            /* Ø«¬DvfDÑê.‰y:J þ */
+	$"27D7 B0C3 DBAA 5233 F376 3CA8 4968 DF8A"            /* '×°ÃÛªR3óv<¨Ihߊ */
+	$"874C 2117 6A15 4664 03FF 7FFF 7F7C 2D12"            /* ‡L!.j.Fd.ÿ.ÿ.|-. */
+	$"B28B 8A4C 6D72 1106 16E0 BF7F 9822 2424"            /* ²‹ŠLmr...à¿.˜"$$ */
+	$"3C1B CBC8 2F76 1AC7 FF7F FF7F EB42 22AA"            /* <.ËÈ/v.Çÿ.ÿ.ëB"ª */
+	$"F30A 0C9D 6086 E561 E1BC C1D9 4E7F FADF"            /* óÂ.�`†åaá¼ÁÙN.úß */
+	$"A85C B34C E2D4 FCF6 1A29 34F3 3B42 1DFC"            /* ¨\³LâÔüö.)4ó;B.ü */
+	$"C6BD 370B D203 B0C4 1C7D C348 1EE7 EAD9"            /* ƽ7.Ò.°Ä.}ÃH.çêÙ */
+	$"3145 E7FB 36CC 8E64 AB70 81DC 65E1 2C1D"            /* 1Eçû6ÌŽd«p�Üeá,. */
+	$"9CB5 18A0 1C95 7DE2 96DF C185 7A40 50C7"            /* œµ. .•}â–ßÁ…z@PÇ */
+	$"E32C FCC1 FF6B 14F5 05FE 0E1C 8757 8D82"            /* ã,üÁÿk.õ.þ..‡W�‚ */
+	$"3A41 284E 2906 8316 564F F479 4DCF FF7E"            /* :A(N).ƒ.VOôyMÏÿ~ */
+	$"5F11 3745 AC7F ED8D BC93 4205 7E12 E036"            /* _.7E¬.í�¼“B.~.à6 */
+	$"0BE4 4B4F F99C F369 6B38 263E 63EC 6311"            /* .äKOùœóik8&>cìc. */
+	$"D577 8B5D 7957 D24D 7D64 A2B5 1107 4625"            /* Õw‹]yWÒM}d¢µ..F% */
+	$"E1EB 2460 41A2 E878 5967 CEAE AE16 D8D5"            /* áë$`A¢èxYgή®.ØÕ */
+	$"F960 B484 0B49 7253 26F2 714E 6A13 03E4"            /* ù`´„.IrS&òqNj..ä */
+	$"A0C3 3924 31ED 8B79 3D63 5412 C097 F9C3"            /*  Ã9$1í‹y=cT.À—ùÃ */
+	$"79AD A97D EEE5 EF23 66FF 15BD C854 5DFB"            /* y­©}îåï#fÿ.½ÈT]û */
+	$"5921 E05C 6A39 B68E 6444 6D55 3B7D 6DDA"            /* Y!à\j9¶ŽdDmU;}mÚ */
+	$"9003 8F53 5C49 D978 31CD 41C5 DD62 7DE4"            /* �.�S\IÙx1ÍAÅÝb}ä */
+	$"2F24 5932 A14F 9C9C 97B6 2652 5988 7970"            /* /$Y2¡Oœœ—¶&RYˆyp */
+	$"F890 8A5C 9614 EBF4 DAC8 15D1 6F3C 07E4"            /* ø�Š\–.ëôÚÈ.Ño<.ä */
+	$"7B8B F763 6803 394F 2291 8D88 EB1B 3136"            /* {‹÷ch.9O"‘�ˆë.16 */
+	$"10C9 5077 060A 7DB0 A890 CB7B 947F AD8B"            /* .ÉPw.Â}°¨�Ë{”.­‹ */
+	$"0AAF 67FF 5D78 615A E459 013B 6923 5E0E"            /* ¯gÿ]xaZäY.;i#^. */
+	$"900D BA9C DFF2 37D0 0508 B5F3 EA48 FADE"            /* �.ºœßò7Ð..µóêHúÞ */
+	$"D348 3F2F 8E71 E6CD B6BE 8941 8773 0E17"            /* ÓH?/ŽqæͶ¾‰A‡s.. */
+	$"E97A B699 5A4F 21C1 0766 538B B29A B8CA"            /* éz¶™ZO!Á.fS‹²š¸Ê */
+	$"FBAE 21FA 76A0 B197 C613 E523 B127 1FE4"            /* û®!úv ±—Æ.å#±'.ä */
+	$"0AA8 798D 688E 8F27 E386 446F 0BD2 C6A5"            /* ¨y�hŽ�'ã†Do.ÒÆ¥ */
+	$"99B7 9313 67B5 4823 BD88 3611 E5A8 8054"            /* ™·“.gµH#½ˆ6.娀T */
+	$"3C15 C120 1B02 5B2A 2195 DD25 F90A 48A6"            /* <.Á ..[*!•Ý%ùÂH¦ */
+	$"BF92 56B9 4639 F2BD AC5F 3350 9699 14A7"            /* ¿’V¹F9ò½¬_3P–™.§ */
+	$"30A2 4B91 C33D 3175 F806 15AA 4B01 558F"            /* 0¢K‘Ã=1uø..ªK.U� */
+	$"400B 8148 DAF5 29FD 0561 1CA8 7239 51F4"            /* @.�HÚõ)ý.a.¨r9Qô */
+	$"A169 A92B EE2F 4F3D 2F96 029B 186B 7219"            /* ¡i©+î/O=/–.›.kr. */
+	$"C673 0E85 6FAC 9889 C64A 90AE DBAF E8E3"            /* Æs.…o¬˜‰ÆJ�®Û¯èã */
+	$"6607 DF2A C332 C690 840A 817A ABFF 3302"            /* f.ß*Ã2Æ�„Â�z«ÿ3. */
+	$"1464 A65F E1B3 04B0 90C6 51E5 6A2E 7EA2"            /* .d¦_á³.°�ÆQåj.~¢ */
+	$"9222 EABA 0632 2F13 B1A3 2337 85B4 E390"            /* ’"êº.2/.±£#7…´ã� */
+	$"766A 98DB BDDD 9813 F7BD 8AEA 1AB2 BEEC"            /* vj˜Û½Ý˜.÷½Šê.²¾ì */
+	$"BEE3 F4B7 EE35 6BB8 ADE1 E772 AEB0 7E66"            /* ¾ãô·î5k¸­áçr®°~f */
+	$"3F99 05C1 3339 69B2 C1D5 4CC7 DB0B 3C67"            /* ?™.Á39i²ÁÕLÇÛ.<g */
+	$"7F80 43C8 7B29 FA49 8C64 3FEB 6406 35FE"            /* .€CÈ{)úIŒd?ëd.5þ */
+	$"FAEB 4922 9410 5352 D4C0 00CB 72EA 56CE"            /* úëI"”.SRÔÀ.ËrêVÎ */
+	$"22F8 673A D3E8 AAFA E992 5B7F 827C A83D"            /* "øg:Óèªúé’[.‚|¨= */
+	$"586F 54B4 69F8 C6B7 FF14 CFD4 4069 C50F"            /* XoT´iøÆ·ÿ.ÏÔ@iÅ. */
+	$"9E23 797E DE78 5B86 FCAE BDE5 B920 9551"            /* ž#y~Þx[†ü®½å¹ •Q */
+	$"22EC 4155 0582 10F4 BF8C 144A 3251 97F3"            /* "ìAU.‚.ô¿Œ.J2Q—ó */
+	$"2E7D 1E04 969B 4C15 8BDB FAC1 9743 2B6C"            /* .}..–›L.‹ÛúÁ—C+l */
+	$"6EF5 C95E 47CB A380 A635 C17D AD97 42EA"            /* nõÉ^GË£€¦5Á}­—Bê */
+	$"88A1 A63E FC76 A19C AE08 C868 115F 098D"            /* ˆ¡¦>üv¡œ®.Èh._Æ� */
+	$"A1BE 16D4 3BF4 91C9 6CF1 DBE0 E0CA 0DAA"            /* ¡¾.Ô;ô‘ÉlñÛààÊ.ª */
+	$"EFCB 2A06 908B 7BAC CCF3 4CF8 179A 615E"            /* ïË*.�‹{¬ÌóLø.ša^ */
+	$"590D AB18 CB49 E032 B8ED 2A8E 584A ACDC"            /* Y.«.ËIà2¸í*ŽXJ¬Ü */
+	$"4797 F732 B8C9 24A4 0E5C 85A0 FED8 E30A"            /* G—÷2¸É$¤.\… þØã */
+	$"ECBF 08FB CDC1 E09D 9556 837A E086 95AC"            /* ì¿.ûÍÁà�•Vƒzà†•¬ */
+	$"BA2C E411 756E F132 9CE6 EDC4 6C90 B09E"            /* º,ä.unñ2œæíÄl�°ž */
+	$"3C59 DE78 44D0 E445 BCA0 3AE0 05D9 7440"            /* <YÞxDÐäE¼ :à.Ùt@ */
+	$"F09F 10EA E0BA 4596 84F5 81A2 550E 57A7"            /* ðŸ.êàºE–„õ�¢U.W§ */
+	$"F2A8 B2DD D612 A18F D74A 671D B70C 994A"            /* ò¨²ÝÖ.¡�×Jg.·.™J */
+	$"9441 8E10 12B8 80F0 6249 2075 CD39 3667"            /* ”AŽ..¸€ðbI uÍ96g */
+	$"6632 AFDD 5E48 6B22 15CC 179A C6FA 47AE"            /* f2¯Ý^Hk".Ì.šÆúG® */
+	$"66AF 7AFB 033D 03F1 B829 B852 F1BF 55DB"            /* f¯zû.=.ñ¸)¸Rñ¿UÛ */
+	$"17F6 E1EF A955 F266 ACFE 75F4 34FC 38B0"            /* .öáï©Uòf¬þuô4ü8° */
+	$"0068 7DD6 016E 98D4 57DB 6220 D269 4BE9"            /* .h}Ö.n˜ÔWÛb ÒiKé */
+	$"8007 22E8 9D82 8FCE EB41 317B D0FA 323B"            /* €."è�‚�ÎëA1{Ðú2; */
+	$"B2C0 06D3 99E3 ED9A 2423 78CD AE34 CF5B"            /* ²À.Ó™ãíš$#xÍ®4Ï[ */
+	$"58DA 8F69 9604 4804 8682 B58C C1DA 1E21"            /* XÚ�i–.H.†‚µŒÁÚ.! */
+	$"0E4E F709 83E1 B335 F208 6565 C882 70A0"            /* .N÷ƃá³5ò.eeÈ‚p  */
+	$"2F58 5379 3999 7F2E E63D 81E4 C2EB 58E3"            /* /XSy9™..æ=�äÂëXã */
+	$"4605 35E7 76D7 C7D0 AEDA 26C5 8BB6 0F99"            /* F.5çv×ÇЮÚ&Å‹¶.™ */
+	$"77C0 D3D6 9870 8279 4C2E 29C6 518F 13E6"            /* wÀÓÖ˜p‚yL.)ÆQ�.æ */
+	$"1373 FCB8 FD55 3D8F 8322 F8F4 CD80 3C09"            /* .sü¸ýU=�ƒ"øôÍ€<Æ */
+	$"1496 931A E1BF 0AE6 2842 6FF7 6986 6AEE"            /* .–“.á¿Âæ(Bo÷i†jî */
+	$"1AE9 FF0A 947D E3F6 D93F B59B F6D5 5FB6"            /* .éÿ”}ãöÙ?µ›öÕ_¶ */
+	$"AAC7 EDD1 1FDB 5A5F 5549 7D55 2E1F B6A4"            /* ªÇíÑ.ÛZ_UI}U..¶¤ */
+	$"FDAA F7D4 DF7D 4E80 F173 72EC 2AD6 46CC"            /* ýª÷Ôß}N€ñsrì*ÖFÌ */
+	$"6653 9F8A F548 8CD9 F7CC 0758 DFBD 1976"            /* fSŸŠõHŒÙ÷Ì.Xß½.v */
+	$"0832 03BE 1A6C 242F 4978 025D 37A6 D46A"            /* .2.¾.l$/Ix.]7¦Ôj */
+	$"B859 037D 5250 D0D6 8FC0 4C05 AAAB 7F38"            /* ¸Y.}RPÐÖ�ÀL.ª«.8 */
+	$"799B 43F9 E370 D367 B412 8CC2 F941 E270"            /* y›CùãpÓg´.ŒÂùAâp */
+	$"A967 1978 577B 7A22 541A 7DDD A593 75E5"            /* ©g.xW{z"T.}Ý¥“uå */
+	$"6B05 D950 D953 DA5E 7EBF D5D3 4314 5006"            /* k.ÙPÙSÚ^~¿ÕÓC.P. */
+	$"8EC3 8474 6B41 83B3 7B16 9C95 721B 5405"            /* ŽÃ„tkAƒ³{.œ•r.T. */
+	$"F4AE A41F 92D8 56DA F2C9 4BF8 5B0A EBC6"            /* ô®¤.’ØVÚòÉKø[ÂëÆ */
+	$"29D5 F4F3 36B9 A6D7 3BC4 75D7 972C 7465"            /* )Õôó6¹¦×;Äu×—,te */
+	$"CCBE 21FA 6EAF 6B26 465B 4676 356D E640"            /* ̾!ún¯k&F[Fv5mæ@ */
+	$"04C3 0E39 C431 FBA5 2B53 E001 8F9D 37F5"            /* .Ã.9Ä1û¥+Sà.��7õ */
+	$"F289 EC84 85B8 5FC3 F74A 734B E0B1 ED8C"            /* ò‰ì„…¸_Ã÷JsKà±íŒ */
+	$"5DF4 6678 22E4 887C A45B 1478 DFC3 A9E9"            /* ]ôfx"äˆ|¤[.xßéé */
+	$"F234 5723 01B3 2685 2754 8133 8699 21C8"            /* ò4W#.³&…'T�3†™!È */
+	$"180A 27F8 174C FED5 8F71 4082 C4E8 DB83"            /* .Â'ø.LþÕ�q@‚ÄèÛƒ */
+	$"BDA4 4506 3FA4 5286 5D63 00F7 905D A740"            /* ½¤E.?¤R†]c.÷�]§@ */
+	$"5251 07FA 22F8 1334 FBA6 5640 7199 FA41"            /* RQ.ú"ø.4û¦V@q™úA */
+	$"A3C7 3CC1 ECF5 7F43 A9AE FBD5 C1F0 18B3"            /* £Ç<Áìõ.C©®ûÕÁð.³ */
+	$"7072 4809 0A4C 8127 6E10 5F7C 335C CC28"            /* prHÆÂL�'n._|3\Ì( */
+	$"B723 3D12 724D 3DE5 37B3 1C2A 136D 2258"            /* ·#=.rM=å7³.*.m"X */
+	$"DCE6 BFA4 0DAD FB6E 72C1 70F7 6D71 785D"            /* Ü濤.­ûnrÁp÷mqx] */
+	$"BC75 69CE CE3B CF7A 170E 8343 CBA9 DE66"            /* ¼uiÎÎ;Ïz..ƒCË©Þf */
+	$"06ED 779C AA9F F28D 943D 5E3E DEDE 4769"            /* .íwœªŸò�”=^>ÞÞGi */
+	$"289C 5523 9792 EFAC 19A6 A945 B504 9446"            /* (œU#—’ï¬.¦©Eµ.”F */
+	$"A4DF BAA6 B5EB BAEF 7B92 3E08 6D17 870F"            /* ¤ßº¦µëºï{’>.m.‡. */
+	$"9E0A 487E 8A60 90B5 E555 CD4F D2F1 FE67"            /* žÂH~Š`�µåUÍOÒñþg */
+	$"88DE BB6A E653 A2B6 F9C7 B226 2544 A167"            /* ˆÞ»jæS¢¶ùDz&%D¡g */
+	$"5DF7 5F35 F38B DB99 30F8 C210 AF41 C7A4"            /* ]÷_5ó‹Û™0øÂ.¯AǤ */
+	$"167B 30B4 8B8D 0821 4ADB EFC6 5728 A86D"            /* .{0´‹�.!JÛïÆW(¨m */
+	$"99A8 2A1D 51E2 4CE5 AEA5 7ECC 23CB 628B"            /* ™¨*.QâL宥~Ì#Ëb‹ */
+	$"E438 F41A A280 CF2E 8E51 5004 A9BA 64AB"            /* ä8ô.¢€Ï.ŽQP.©ºd« */
+	$"B0AA 608C 8C19 38F7 567B 0C45 B7C5 0E2D"            /* °ª`ŒŒ.8÷V{.E·Å.- */
+	$"0F3D A192 B0F5 A567 4EE1 9FF5 F085 979A"            /* .=¡’°õ¥gNáŸõð…—š */
+	$"13DA 6FC3 89D0 0370 C986 5F44 AADD CAB9"            /* .ÚoÉÐ.pɆ_DªÝʹ */
+	$"FBD0 8CDE 18D9 8FED 715E 264F 0D69 2CEF"            /* ûÐŒÞ.Ù�íq^&O.i,ï */
+	$"63F0 7A64 D65B 094A 6976 E6D4 E3DC 1583"            /* cðzdÖ[ÆJivæÔãÜ.ƒ */
+	$"FE8C BD22 992E 3FDB AF18 03A7 0A74 8333"            /* þŒ½"™.?Û¯..§Âtƒ3 */
+	$"76E3 5195 C7FA A180 5123 7E0C 544B 9C8C"            /* vãQ•Çú¡€Q#~.TKœŒ */
+	$"928D 3DF6 F330 4D6E 8049 11AF 064E 4E3B"            /* ’�=öó0Mn€I.¯.NN; */
+	$"B937 EE03 A4D2 F530 4513 47F0 5E98 E060"            /* ¹7î.¤Òõ0E.Gð^˜à` */
+	$"72C6 46EC B761 FAB4 B0FA 9A80 FF78 5408"            /* rÆFì·aú´°úš€ÿxT. */
+	$"9152 452E 0111 2383 5E5F 6C4F FC53 0EDE"            /* ‘RE...#ƒ^_lOüS.Þ */
+	$"1092 66D3 5F38 1AC8 1412 561A 4017 9110"            /* .’fÓ_8.È..V.@.‘. */
+	$"CA19 3E6F 8803 0908 5F57 A2E2 4744 E3C4"            /* Ê.>oˆ.Æ._W¢âGDãÄ */
+	$"F1BF 49F6 836F E294 610B 4098 2761 1502"            /* ñ¿Iöƒoâ”a.@˜'a.. */
+	$"CCB2 0C11 81DD 05B4 ACD8 8F28 C5DD 1DD8"            /* ̲..�Ý.´¬Ø�(ÅÝ.Ø */
+	$"58E0 C1E1 70A8 42BF 456F FE20 1261 1F81"            /* XàÁáp¨B¿Eoþ .a.� */
+	$"08AC FEB1 F89C 3576 EF94 A20C 255F 3B3F"            /* .¬þ±øœ5v.%_;? */
+	$"5E6B B0C0 4B3F EADC 8536 55E9 8144 C946"            /* ^k°ÀK?êÜ…6Ué�DÉF */
+	$"7613 8662 DCB1 C761 2BDA 412D C7D6 2D5C"            /* v.†bܱÇa+ÚA-ÇÖ-\ */
+	$"BCC0 F84E 54E4 9B0B BDF7 4F45 FCA6 D6AE"            /* ¼ÀøNTä›.½÷OEü¦Ö® */
+	$"1754 31D1 E6CB 94F4 D163 2B1D 017D 4171"            /* .T1ÑæË”ôÑc+..}Aq */
+	$"ABE0 0285 395D 3D23 42D7 E641 348A 0C2E"            /* «à.…9]=#B×æA4Š.. */
+	$"9C16 42C9 8E99 B654 8046 C365 EA71 CE64"            /* œ.BÉŽ™¶T€FÃeêqÎd */
+	$"B762 0E4D 7C48 617B CDB9 6264 2C81 4A9F"            /* ·b.M|Ha{͹bd,�JŸ */
+	$"8600 50B2 B985 EB73 DB96 82EA FF7D 1E50"            /* †.P²¹…ësÛ–‚êÿ}.P */
+	$"6A49 AEA3 78E3 2DFD 0D59 3013 F257 AAA9"            /* jI®£xã-ý.Y0.òWª© */
+	$"0E5D 81DA E983 8D48 41BE DF0B FB34 AEA5"            /* .]�Úéƒ�HA¾ß.û4®¥ */
+	$"07B6 B0AA 1E53 1D9F B9C7 4CE5 8D46 6151"            /* .¶°ª.S.Ÿ¹ÇLå�FaQ */
+	$"8000 0C24 1D66 1946 1073 4456 2361 E486"            /* €..$.f.F.sDV#aä† */
+	$"120F 29F0 6121 2D6A AF51 0C82 F68C B571"            /* ..)ða!-j¯Q.‚öŒµq */
+	$"77AD BE59 9145 D105 DE8C 9500 0000 0000"            /* w­¾Y‘EÑ.ÞŒ•..... */
+	$"0000 0032 BC9A BD52 00B4 6C6F 3753 1A96"            /* ...2¼š½R.´lo7S.– */
+	$"9B00 FCD3 F055 A11A AFB1 FB95 1610 88D0"            /* ›.üÓðU¡.¯±û•..ˆÐ */
+	$"8D32 9653 FC10 55FD B965 C1A9 B6BD 2245"            /* �2–Sü.Uý¹eÁ©¶½"E */
+	$"D48B 8230 2EF5 56F1 6618 9F91 FEC4 4106"            /* Ô‹‚0.õVñf.Ÿ‘þÄA. */
+	$"F23B 7C8A 0320 79EA D7A0 D75F 09BD B985"            /* ò;|Š. yê× ×_ƽ¹… */
+	$"C22B E2F0 0508 64BA AA2F 2414 19D7 311D"            /* Â+âð..dºª/$..×1. */
+	$"F709 E05C 809B 9E62 83F8 FF13 2DE3 01D6"            /* ÷Æà\€›žbƒøÿ.-ã.Ö */
+	$"8ADC F118 5A80 77C8 DABC 2FB5 CEF6 FCFB"            /* ŠÜñ.Z€wÈÚ¼/µÎöüû */
+	$"7A94 2773 6CEC FAE2 7865 753C E612 E4AF"            /* z”'slìúâxeu<æ.ä¯ */
+	$"657C 5C67 8FB3 1E56 A319 1ED1 FE48 0D8D"            /* e|\g�³.V£..ÑþH.� */
+	$"2431 B10B 8E15 0A4B FF7F 7EB8 D068 5015"            /* $1±.Ž.ÂKÿ.~¸ÐhP. */
+	$"151E C37C 0390 F6CC 64A8 0000 0000 0000"            /* ..Ã|.�öÌd¨...... */
+	$"0000 0002 5991 79E8 2B17 082C ABCB DA90"            /* ....Y‘yè+..,«ËÚ� */
+	$"CE92 8CB0 E992 0710 2B8F CAAB D217 C4E9"            /* Î’Œ°é’..+�Ê«Ò.Äé */
+	$"E55E 11D2 6200 B530 5EF4 6932 1CBF EA6C"            /* å^.Òb.µ0^ôi2.¿êl */
+	$"E58D 2AA9 68C2 89FF 7903 A6ED D674 F1FC"            /* å�*©h‰ÿy.¦íÖtñü */
+	$"A256 3564 F7E0 4DDF CDA1 2729 F7FF 6EB2"            /* ¢V5d÷àMßÍ¡')÷ÿn² */
+	$"9D35 70A9 5447 924B B8E1 71D3 4A8A DECB"            /* �5p©TG’K¸áqÓJŠÞË */
+	$"93E1 8FA0 140E C9B7 6124 8020 D660 3D22"            /* “á� ..É·a$€ Ö`=" */
+	$"C708 222E 7289 B890 0002 00E1 2BC6 84B9"            /* Ç.".r‰¸�...á+Æ„¹ */
+	$"25DF 442F 97FF 7FEF 68EC 7325 B92C A150"            /* %ßD/—ÿ.ïhìs%¹,¡P */
+	$"EE19 48C3 2540 0000 0000 0000 0000 0749"            /* î.HÃ%@.........I */
+	$"DD4A 9891 375B B0E0 C176 A698 672E F295"            /* ÝJ˜‘7[°àÁv¦˜g.ò• */
+	$"0311 7B3E 2B87 B4B8 7FB3 5DF7 9C67 CBEA"            /* ..{>+‡´¸.³]÷œgËê */
+	$"6A19 4107 C9F4 2B19 6829 179A 3FFF 7E8C"            /* j.A.Éô+.h).š?ÿ~Œ */
+	$"44A2 15E8 8E37 B422 F825 1862 58FF 7FFE"            /* D¢.èŽ7´"ø%.bXÿ.þ */
+	$"8EA1 D38C 727A 3071 1FF0 541F 6AB4 EA83"            /* Ž¡ÓŒrz0q.ðT.j´êƒ */
+	$"44A0 086A BAD7 6966 FC5D 0E72 A66C C301"            /* D .jº×ifü].r¦lÃ. */
+	$"3E1F B82C 9192 20D5 0322 858F 224C 87F5"            /* >.¸,‘’ Õ."…�"L‡õ */
+	$"E940 85ED 7B36 EC96 D05C 21FF 7B10 59E1"            /* é@…í{6ì–Ð\!ÿ{.Yá */
+	$"E125 6C79 7852 2031 F3BA 34FB 6E57 BC3B"            /* á%lyxR 1óº4ûnW¼; */
+	$"69F0 C303 3A2A A573 D1E0 9836 C703 D02C"            /* iðÃ.:*¥sÑà˜6Ç.Ð, */
+	$"58CC 3DA7 FF0D 4301 F607 07C1 31FA 7F66"            /* XÌ=§ÿ.C.ö..Á1ú.f */
+	$"89BD A759 90CD 107A E5BD 6398 D7BE F7BB"            /* ‰½§Y�Í.zå½c˜×¾÷» */
+	$"E273 D09A F8EE D21B 1015 A513 18F5 5C7D"            /* âsКøîÒ...¥..õ\} */
+	$"FD20 E7C9 C6BE 3105 7A4B 831D 251B 4C36"            /* ý çÉƾ1.zKƒ.%.L6 */
+	$"2A49 3EAC 1A86 9F87 09CC 0B00 2CF4 643C"            /* *I>¬.†Ÿ‡ÆÌ..,ôd< */
+	$"7012 8574 D28F 952D E959 1093 FE7E F021"            /* p.…tÒ�•-éY.“þ~ð! */
+	$"028C 74ED 0E90 8DCD 5F06 B4BE EA1A 4C53"            /* .Œtí.��Í_.´¾ê.LS */
+	$"A47F 3706 93CB 8FAB 7864 D123 4A39 B6BA"            /* ¤.7.“Ë�«xdÑ#J9¶º */
+	$"CDCB 8AA9 2128 54FA CFB5 C4E1 F470 AD6E"            /* ÍËŠ©!(TúϵÄáôp­n */
+	$"6A05 07C9 72AA 562E F22F C922 BCF9 7DDF"            /* j..ÉrªV.ò/É"¼ù}ß */
+	$"3565 1AD4 F707 7DC0 1038 129E 4EA0 297E"            /* 5e.Ô÷.}À.8.žN )~ */
+	$"1037 3516 64BB FF75 539A 5C03 F7A3 C14D"            /* .75.d»ÿuSš\.÷£ÁM */
+	$"C617 50C8 14F1 7C95 0372 1443 C3F0 7ED4"            /* Æ.PÈ.ñ|•.r.CÃð~Ô */
+	$"EFDA FA88 BDD2 E947 7A43 A4A3 2339 CD58"            /* ïÚúˆ½ÒéGzC¤£#9ÍX */
+	$"526C 8407 8211 1949 6431 DB89 390B EB27"            /* Rl„.‚..Id1Û‰9.ë' */
+	$"9975 F04F D507 AC80 5D51 95B0 992A 1AC6"            /* ™uðOÕ.¬€]Q•°™*.Æ */
+	$"8699 86CC E64E 441C 2EFD 4F8C 70C1 DB2A"            /* †™†ÌæND..ýOŒpÁÛ* */
+	$"5395 8DF7 E279 AA65 BA32 2FD1 48C9 F400"            /* S•�÷âyªeº2/ÑHÉô. */
+	$"D0EA 663D 92FF 053E 130C A1A9 491B E583"            /* Ðêf=’ÿ.>..¡©I.åƒ */
+	$"6133 2EE1 AFBE 86B8 D218 B698 906D A5B9"            /* a3.᯾†¸Ò.¶˜�m¥¹ */
+	$"ACD3 9DC7 8720 C668 E134 1A1C 9C71 EA49"            /* ¬Ó�LJ Æhá4..œqêI */
+	$"7AE9 9276 56E9 78BB 5679 18E2 6044 2763"            /* zé’vVéx»Vy.â`D'c */
+	$"2342 64F4 3952 2712 F704 B2E8 C1D2 35CC"            /* #Bdô9R'.÷.²èÁÒ5Ì */
+	$"F0AB 5ABD 61A0 1CD5 5316 0E78 22E6 B807"            /* ð«Z½a .ÕS..x"æ¸. */
+	$"8774 CA36 91EF 0BFF D969 6330 3900 00D1"            /* ‡tÊ6‘ï.ÿÙic09..Ñ */
+	$"2300 0000 0C6A 5020 200D 0A87 0A00 0000"            /* #....jP  .‡Â... */
+	$"1466 7479 706A 7032 2000 0000 006A 7032"            /* .ftypjp2 ....jp2 */
+	$"2000 0000 4F6A 7032 6800 0000 1669 6864"            /*  ...Ojp2h....ihd */
+	$"7200 0002 0000 0002 0000 0407 0701 0000"            /* r............... */
+	$"0000 0F63 6F6C 7201 0000 0000 0010 0000"            /* ...colr......... */
+	$"0022 6364 6566 0004 0000 0000 0001 0003"            /* ."cdef.......... */
+	$"0001 0000 0001 0000 0002 0002 0000 0003"            /* ................ */
+	$"0000 0000 6A70 3263 FF4F FF51 0032 0000"            /* ....jp2cÿOÿQ.2.. */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0004 0701 0107 0101 0701 0107 0101 FF52"            /* ..............ÿR */
+	$"000C 0000 0001 0105 0404 0001 FF5C 0013"            /* ............ÿ\.. */
+	$"2050 5858 6058 5860 5858 6058 5858 5050"            /*  PXX`XX`XX`XXXPP */
+	$"58FF 6400 1100 014B 616B 6164 752D 7635"            /* Xÿd....Kakadu-v5 */
+	$"2E32 2E31 FF90 000A 0000 0000 D036 0001"            /* .2.1ÿ�.Â....Ð6.. */
+	$"FF93 CFC2 DC03 54F9 36EC A8DC 2A8C 3701"            /* ÿ“ÏÂÜ.Tù6ì¨Ü*Œ7. */
+	$"118B 95C3 F2B2 5A7A 0428 C30A 2C64 B704"            /* .‹•Ãò²Zz.(ÃÂ,d·. */
+	$"5C3C 6DED 8696 4890 6404 5638 430C 59C5"            /* \<m톖H�d.V8C.YŠ*/
+	$"D913 B06B 0B08 E00E 1802 6D82 7225 E695"            /* Ù.°k..à...m‚r%æ• */
+	$"9F1E E7B0 D1DF 323C 61DC 1F25 E3FF 83E2"            /* Ÿ.ç°Ñß2<aÜ.%ãÿƒâ */
+	$"A49A DED4 4495 A948 5B70 9E5A 01F1 2431"            /* ¤šÞÔD•©H[pžZ.ñ$1 */
+	$"8EE5 2B54 2863 9041 FAE9 9E9F 1B85 E206"            /* Žå+T(c�Aú鞟.…â. */
+	$"4104 106C 5027 632A 8716 C3A5 F047 B3D5"            /* A..lP'c*‡.Ã¥ðG³Õ */
+	$"EE2B 19CD 2B75 17D8 DFB6 E2BF 491E A41F"            /* î+.Í+u.Ø߶â¿I.¤. */
+	$"BC48 3493 DEFB 453D 64DE DEA0 68DB EF5B"            /* ¼H4“ÞûE=dÞÞ hÛï[ */
+	$"1E69 8F3F C55C 1FF6 1823 1543 F483 DF20"            /* .i�?Å\.ö.#.Côƒß  */
+	$"F5B4 08F4 5D20 4DF0 7D7D 2007 2ACA 5B5E"            /* õ´.ô] Mð}} .*Ê[^ */
+	$"159F EF4A 505D 811D A8A3 5476 5539 B45B"            /* .ŸïJP]�.¨£TvU9´[ */
+	$"3113 1AC7 00F3 F1A7 E9E3 9E88 5D91 6CD5"            /* 1..Ç.óñ§é㞈]‘lÕ */
+	$"2CC0 F92B 2063 FF29 4B0E 775A 06EE 75CC"            /* ,Àù+ cÿ)K.wZ.îuÌ */
+	$"DA54 AC2F B72D 1C25 1E46 A4F8 C3E1 7D8D"            /* ÚT¬/·-.%.F¤øÃá}� */
+	$"85AE BBE6 3DBE EC4A 35F7 3B36 1FBF BC38"            /* …®»æ=¾ìJ5÷;6.¿¼8 */
+	$"2DC1 785C D644 2BED AB51 1950 2643 8730"            /* -Áx\ÖD+í«Q.P&C‡0 */
+	$"2AE9 E4EB 1B8E 8F90 BA0C FF2F 6F65 5F28"            /* *éäë.Ž��º.ÿ/oe_( */
+	$"1A3F 9398 FF20 01A2 69A0 02C9 8D1B C3EA"            /* .?“˜ÿ .¢i .É�.Ãê */
+	$"A600 6417 3CA3 9E84 93EF 063D 59DC 702C"            /* ¦.d.<£ž„“ï.=YÜp, */
+	$"959D C3A6 B1ED DEF1 F321 5BA6 FCCD 7762"            /* •�æ±íÞñó![¦üÍwb */
+	$"6C23 7398 AA59 4BBA 0052 B8A7 0608 1AAC"            /* l#s˜ªYKº.R¸§...¬ */
+	$"5B2E AF60 17F4 278E 6433 6F75 7839 CED2"            /* [.¯`.ô'Žd3oux9ÎÒ */
+	$"F32E 5D7D 9D40 B145 4CFB A25C D8D7 4BCB"            /* ó.]}�@±ELû¢\Ø×KË */
+	$"956D 88DD 4B92 64BF 4CD4 AFD5 6E56 9859"            /* •mˆÝK’d¿LÔ¯ÕnV˜Y */
+	$"ABEF BB40 AD0E 6E1F 9B3B 16A3 D9D3 58DF"            /* «ï»@­.n.›;.£ÙÓXß */
+	$"584E C303 1DAD D18B 6082 9C29 88EB 5163"            /* XNÃ..­Ñ‹`‚œ)ˆëQc */
+	$"A42D 061A 1570 64A9 0F1C E00D 56D9 E0CB"            /* ¤-...pd©..à.VÙàË */
+	$"7C66 799C 8EB4 BFCA CF5C CFC2 B611 4F0C"            /* |fyœŽ´¿ÊÏ\϶.O. */
+	$"AFDE 008C 3580 A270 0C1A 3737 50A1 9A89"            /* ¯Þ.Œ5€¢p..77P¡š‰ */
+	$"2546 BB2C 62A0 57BE 59CB C00A 1EE9 0F1D"            /* %F»,b W¾YËÀÂ.é.. */
+	$"C528 40D4 EA69 D281 AED4 B078 F27A 0B42"            /* Å(@ÔêiÒ�®Ô°xòz.B */
+	$"7AD2 DADD 146B 7FFF 223D 6A74 2041 4FCF"            /* zÒÚÝ.k.ÿ"=jt AOÏ */
+	$"46E1 60C8 9ABE 841E E18D 1712 DB6D 902B"            /* Fá`Èš¾„.á�..Ûm�+ */
+	$"7BE6 56DA 7E4B 1704 A373 2802 B120 0184"            /* {æVÚ~K..£s(.± .„ */
+	$"0681 4499 2739 CE73 9CE8 99D8 C352 337C"            /* .�D™'9Îsœè™ØÃR3| */
+	$"06AB BB71 6257 16EF B535 4972 8C2F 2EE0"            /* .«»qbW.ïµ5IrŒ/.à */
+	$"85CC 8431 D867 47EE CC43 6E87 A485 2316"            /* …Ì„1ØgGîÌCn‡¤…#. */
+	$"4927 AE22 C12D 49CE 739C E61C 97D0 99CC"            /* I'®"Á-IÎsœæ.—Ð™Ì */
+	$"3DC5 F26B 1A31 E742 3E56 464B 2944 108E"            /* =Åòk.1çB>VFK)D.Ž */
+	$"CB0C F4C7 E144 47E1 47C1 F6BD 8089 21DB"            /* Ë.ôÇáDGáGÁö½€‰!Û */
+	$"8279 4533 01BF B9CC C444 AD53 5F75 D706"            /* ‚yE3.¿¹ÌÄD­S_u×. */
+	$"3FDD CA27 5D6C 9F54 1CCF F838 38E4 B2E4"            /* ?ÝÊ']lŸT.Ïø88ä²ä */
+	$"F9FF 429F 59FE D27B 4A5E A69F 2C21 38F6"            /* ùÿBŸYþÒ{J^¦Ÿ,!8ö */
+	$"5A74 D405 2FEE 50B8 E5F1 C489 2693 5B33"            /* ZtÔ./îP¸åñĉ&“[3 */
+	$"D2C2 9DEC 68ED F55C 1FAC 1401 8D66 795A"            /* ÒÂ�ìhíõ\.¬..�fyZ */
+	$"F5F3 27A3 5874 6681 9AC6 F41D A4E6 40DA"            /* õó'£Xtf�šÆô.¤æ@Ú */
+	$"3EE5 CCEE 340C AF72 87FD 6B2A EB94 88EC"            /* >åÌî4.¯r‡ýk*딈ì */
+	$"A61D A536 7AC2 C6B8 85D9 CEBD 146C 83B5"            /* ¦.¥6zÂƸ…Ùν.lƒµ */
+	$"F5E0 A3C7 B524 BC64 B6B5 91A6 BF91 C547"            /* õà£Çµ$¼d¶µ‘¦¿‘ÅG */
+	$"BD87 811F D58E 8E51 BB89 FA6C 5257 33D9"            /* ½‡�.ÕŽŽQ»‰úlRW3Ù */
+	$"A964 A4AB 3BB9 9608 BECC 0D9C D6B9 3D3A"            /* ©d¤«;¹–.¾Ì.œÖ¹=: */
+	$"CB64 28BE 3B07 6318 DF9D C134 9F16 567A"            /* Ëd(¾;.c.ß�Á4Ÿ.Vz */
+	$"8127 5FFD F396 BA0C B86F AA17 2301 022A"            /* �'_ýó–º.¸oª.#..* */
+	$"3742 CE95 B1AF F858 C503 8156 35E0 8F2C"            /* 7BΕ±¯øXÅ.�V5à�, */
+	$"67D7 2D41 1F0B 5284 1535 AF16 6540 FB65"            /* g×-A..R„.5¯.e@ûe */
+	$"65BC 5F6B 136D 73A5 1C5D 3D92 FF5F 8494"            /* e¼_k.ms¥.]=’ÿ_„” */
+	$"FDBF E0C5 821F 072A 0EEB B855 6B42 CEE8"            /* ý¿àÅ‚..*.ë¸UkBÎè */
+	$"ABEE 381E 894E DF1E 29DD 4B78 3F0A F5EB"            /* «î8.‰Nß.)ÝKx?Âõë */
+	$"B9F8 61B8 8266 3BD8 A2AC 5BC1 38F4 5098"            /* ¹øa¸‚f;Ø¢¬[Á8ôP˜ */
+	$"3951 2437 1798 7BF9 EA00 12BF CF3E 9166"            /* 9Q$7.˜{ùê..¿Ï>‘f */
+	$"8253 6FF0 B942 70D7 C729 0866 33F7 3484"            /* ‚Soð¹Bp×Ç).f3÷4„ */
+	$"ADF8 C3D2 4EF6 1DF4 0E6F 8E64 B470 1D5E"            /* ­øÃÒNö.ô.oŽd´p.^ */
+	$"F311 9BD1 EDE1 BA5D 7601 2053 D70A FDCD"            /* ó.›Ñíáº]v. S×ÂýÍ */
+	$"82C0 1BDA A35C FAD2 67AD E569 7851 10A7"            /* ‚À.Ú£\úÒg­åixQ.§ */
+	$"EF9A 3533 EC03 E813 08B6 D984 1A1D 3DC0"            /* ïš53ì.è..¶Ù„..=À */
+	$"7C8E E03E 4A44 03E4 7894 FF1F 080E 2BFD"            /* |Žà>JD.äx”ÿ...+ý */
+	$"EEB4 E64A C757 389B 5780 3AF8 248C 580D"            /* î´æJÇW8›W€:ø$ŒX. */
+	$"461B D417 66BA CEB2 2042 3C84 DAF9 C127"            /* F.Ô.fºÎ² B<„ÚùÁ' */
+	$"63E9 168C A9E3 D418 61E8 C46C CF01 F59B"            /* cé.Œ©ãÔ.aèÄlÏ.õ› */
+	$"4518 8833 3E62 5B14 BFD1 41A8 45D6 D311"            /* E.ˆ3>b[.¿ÑA¨EÖÓ. */
+	$"8431 80DB 1FD5 5839 DE81 BCD9 EAFB EE26"            /* „1€Û.ÕX9Þ�¼Ùêûî& */
+	$"33DD 9E73 0B6F F957 26EE E7BA E0DA FF22"            /* 3Ýžs.oùW&îçºàÚÿ" */
+	$"EA50 24BF A182 089D 749A 6AAF BFF2 224D"            /* êP$¿¡‚.�tšj¯¿ò"M */
+	$"30D4 11D0 E07A A012 587A 0633 92B4 CBFC"            /* 0Ô.Ðàz .Xz.3’´Ëü */
+	$"8E1B E5AC 9025 A74D 2819 3F9D 8132 B795"            /* Ž.å¬�%§M(.?��2·• */
+	$"458E 4651 1589 158D D24C A5B0 CBFA 359E"            /* EŽFQ.‰.�ÒL¥°Ëú5ž */
+	$"BDB0 E4FB BFE3 5854 3E88 A646 71B1 9CB2"            /* ½°äû¿ãXT>ˆ¦Fq±œ² */
+	$"BB4E BA8E E170 8CBF C1F5 3141 F537 C0FA"            /* »NºŽápŒ¿Áõ1Aõ7Àú */
+	$"9780 6448 BA3B 94D6 3E8B 7AF0 0B5A C7A2"            /* —€dHº;”Ö>‹zð.ZÇ¢ */
+	$"4D05 C6BB 7F47 7102 F66E E4E8 3681 1C97"            /* M.Æ».Gq.önäè6�.— */
+	$"0996 4491 F713 2A24 3756 2715 4B55 762F"            /* Æ–D‘÷.*$7V'.KUv/ */
+	$"78CB 2608 0563 73F7 5626 9F35 0C54 6822"            /* xË&..cs÷V&Ÿ5.Th" */
+	$"F061 792A 4AFC 163A 9F83 8F82 638B 524D"            /* ðay*Jü.:Ÿƒ�‚c‹RM */
+	$"C21C 3735 DB76 6F4B 01F2 3E7E 5755 5945"            /* Â.75ÛvoK.ò>~WUYE */
+	$"6149 AAEE 1A88 7748 DC47 79E4 0660 318C"            /* aIªî.ˆwHÜGyä.`1Œ */
+	$"AA94 E92D 9879 C9C1 AC17 C828 7BBB 997A"            /* ª”é-˜yÉÁ¬.È({»™z */
+	$"315E 858F F31D 3522 A6D2 B3BD E548 DBA2"            /* 1^…�ó.5"¦Ò³½åHÛ¢ */
+	$"3274 749B 11C1 9570 D715 0350 4CC4 6820"            /* 2tt›.Á•p×..PLÄh  */
+	$"560A 8542 A38D 913B 3863 FF5C 97F2 9BA5"            /* VÂ…B£�‘;8cÿ\—ò›¥ */
+	$"893F 6C9B 15A2 EE40 BCD6 2676 80A9 AC89"            /* ‰?l›.¢î@¼Ö&v€©¬‰ */
+	$"9054 849D 859C 8DCD 181B 64F4 6D7B 71B4"            /* �T„�…œ�Í..dôm{q´ */
+	$"FBD3 0C84 21D4 CC6C CF84 F40A A3CD C958"            /* ûÓ.„!ÔÌlÏ„ô£ÍÉX */
+	$"928E 97E5 346C 6497 2888 7903 5B0B 3277"            /* ’Ž—å4ld—(ˆy.[.2w */
+	$"B4D6 9AA4 86C3 C691 CA1A 3C92 FCFB 02DE"            /* ´Öš¤†ÃÆ‘Ê.<’üû.Þ */
+	$"A25E 5C5C C6A8 1CE2 F5B5 88AB 3673 F912"            /* ¢^\\ƨ.âõµˆ«6sù. */
+	$"96AF E6BC 67FF 40CC 068D C6E3 8435 48AF"            /* –¯æ¼gÿ@Ì.�Æã„5H¯ */
+	$"B929 F509 0F59 3410 A9A6 1087 8352 11EC"            /* ¹)õÆ.Y4.©¦.‡ƒR.ì */
+	$"23CF CD2E 3F05 487E 0740 9BE7 236F 56FB"            /* #ÏÍ.?.H~.@›ç#oVû */
+	$"D0F4 677F 9514 C6E9 50BB A61A 6135 73FB"            /* Ðôg.•.ÆéP»¦.a5sû */
+	$"37AA FA5C 0967 671C 8485 5326 6EB5 4955"            /* 7ªú\Ægg.„…S&nµIU */
+	$"1AAE 5FCE C271 D992 9E8C B0DF 7795 E0F2"            /* .®_ÎÂqÙ’žŒ°ßw•àò */
+	$"A17A B50F E53A FE12 756F D1A1 5CE1 7C9B"            /* ¡zµ.å:þ.uoÑ¡\á|› */
+	$"D185 2C1A 9224 BC62 5C98 FA35 1649 6EA7"            /* Ñ…,.’$¼b\˜ú5.In§ */
+	$"4C7C C191 DF92 9D7A 6FE9 71D9 9A11 5A19"            /* L|Á‘ß’�zoéqÙš.Z. */
+	$"214D F951 38FA C459 E39A 6DAE 1253 31DF"            /* !MùQ8úÄYãšm®.S1ß */
+	$"B335 3337 39D2 7591 BFC1 31E6 887A 8BAB"            /* ³5379Òu‘¿Á1æˆz‹« */
+	$"ECCD 7A58 8E4A AD65 A7E1 5FC6 8EB0 DA82"            /* ìÍzXŽJ­e§á_ÆŽ°Ú‚ */
+	$"0F81 6849 5CE5 AB32 B763 1227 3F4C 5691"            /* .�hI\å«2·c.'?LV‘ */
+	$"43C7 DD24 E8D9 C4F3 7BB0 4666 7A24 1C5B"            /* CÇÝ$èÙÄó{°Ffz$.[ */
+	$"F57D 719F 2BDB 3794 66BA BBB6 9D8D A662"            /* õ}qŸ+Û7”fº»¶��¦b */
+	$"CF99 4DDC E533 96D6 EEE0 3FC7 BFB8 B1B7"            /* Ï™MÜå3–Öîà?Ç¿¸±· */
+	$"9AE3 57C7 E1A8 B1F8 6C5C 3F0D 19C1 812D"            /* šãWÇᨱøl\?..Á�- */
+	$"8D31 C88B C396 B5E7 3CE0 4E2C AE73 7876"            /* �1ȋÖµç<àN,®sxv */
+	$"0436 A295 BEC6 BDF1 C604 C41C 94E6 E7C1"            /* .6¢•¾Æ½ñÆ.Ä.”æçÁ */
+	$"AC78 356A B92A DB37 3360 3372 6638 0C5C"            /* ¬x5j¹*Û73`3rf8.\ */
+	$"F388 7CDE 4045 060F E713 C4C3 321E E08B"            /* óˆ|Þ@E..ç.ÄÃ2.à‹ */
+	$"0810 71EE A6AB C032 2B85 C34C 2671 8143"            /* ..qÀ2+…ÃL&q�C */
+	$"AFDE 07D1 A40C D86A ADBE B961 EAA3 54BD"            /* ¯Þ.Ѥ.Øj­¾¹aê£T½ */
+	$"804D 6FA9 AA3F 7FBE BCD9 E785 A230 EA4E"            /* €Mo©ª?.¾¼Ùç…¢0êN */
+	$"1C08 1DF6 8373 7754 5039 7854 1192 1512"            /* ...öƒswTP9xT.’.. */
+	$"B956 E9A7 575E E3DB F5F9 4B02 F739 F2BB"            /* ¹Vé§W^ãÛõùK.÷9ò» */
+	$"91B2 73E1 3D19 EBB6 AD2F 291C 5BAC 5EEA"            /* ‘²sá=.붭/).[¬^ê */
+	$"EEDF 8DA7 5FCA 8E8C 952D 8FD0 441C 5BA4"            /* îß�§_ÊŽŒ•-�ÐD.[¤ */
+	$"8AF6 21BE 1FAF DAE3 DADD EA91 EF73 58A0"            /* Šö!¾.¯ÚãÚÝê‘ïsX  */
+	$"29E6 89B2 E279 B02A D092 DD08 6187 9095"            /* )扲ây°*Ð’Ý.a‡�• */
+	$"5C85 C903 0DD2 9ED3 538B D9BB E936 8ABB"            /* \…É..ÒžÓS‹Ù»é6Š» */
+	$"E203 DD03 2944 5317 7BC3 0297 2125 F198"            /* â.Ý.)DS.{Ã.—!%ñ˜ */
+	$"D117 8DDB E382 71F8 D0A7 14B1 6D7A A0EB"            /* Ñ.�Ûã‚qøЧ.±mz ë */
+	$"7C6F 7651 D2EC ECA7 F670 D09F 6CF6 30DB"            /* |ovQÒìì§öpПlö0Û */
+	$"0830 39B5 BC45 3915 4054 4490 A7BA 5CEC"            /* .09µ¼E9.@TD�§º\ì */
+	$"D37B FBC2 7890 B18F DEEA 4966 D46D 5FD2"            /* Ó{ûÂx�±�ÞêIfÔm_Ò */
+	$"7811 AAD0 8EBF FB40 0F30 D8A4 2B71 5A03"            /* x.ªÐŽ¿û@.0ؤ+qZ. */
+	$"636A C360 C889 891D D420 A828 E337 41CC"            /* cjÃ`ȉ‰.Ô ¨(ã7AÌ */
+	$"3314 5473 B91F 7B78 2B3B AC7A 1127 F2DE"            /* 3.Ts¹.{x+;¬z.'òÞ */
+	$"E997 2101 6008 26AE 43D5 7CE7 8532 B9CE"            /* é—!.`.&®CÕ|ç…2¹Î */
+	$"A81A 710E 5D87 49D7 3EF6 65A3 D533 977E"            /* ¨.q.]‡I×>öe£Õ3—~ */
+	$"7BE9 0CA7 8B28 9ADA AF4F 45A5 99BD E21D"            /* {é.§‹(šÚ¯OE¥™½â. */
+	$"D4B1 BB33 2508 C8D1 31E5 E9FB F917 A8E1"            /* Ô±»3%.ÈÑ1åéûù.¨á */
+	$"2955 9008 F531 9010 575A 3AFB 59F4 CD63"            /* )U�.õ1�.WZ:ûYôÍc */
+	$"3EEE 2409 BCD4 E5F1 1418 6155 B6D7 A94B"            /* >î$ƼÔåñ..aU¶×©K */
+	$"1D48 79A8 2F32 0770 476B CE28 023A DC86"            /* .Hy¨/2.pGkÎ(.:܆ */
+	$"E008 813B E64A 39F5 58CE 3E75 DAA6 BD7A"            /* à.�;æJ9õXÎ>uÚ¦½z */
+	$"1528 FF50 0738 C132 5569 3C99 C4BC A20F"            /* .(ÿP.8Á2Ui<™Ä¼¢. */
+	$"6DED 9310 6FE1 8BE4 BF4D D0B1 993E 0FD3"            /* mí“.oá‹ä¿Mб™>.Ó */
+	$"4938 1302 E4A8 FDA2 A7D2 4615 CD89 1E52"            /* I8..ä¨ý¢§ÒF.͉.R */
+	$"4160 51F8 BABB FEED 4281 0E0C 31CD 91D7"            /* A`Qøº»þíB�..1Í‘× */
+	$"C7CF E302 E155 4188 0F06 097F 6906 2EC9"            /* ÇÏã.áUAˆ..Æ.i..É */
+	$"BE00 A1FB 0D99 8FB1 3B3D E3D3 70B8 4296"            /* ¾.¡û.™�±;=ãÓp¸B– */
+	$"F199 E066 15B5 920C 38A2 695F F2E8 81E1"            /* ñ™àf.µ’.8¢i_òè�á */
+	$"E0EC 34E5 97B3 9580 459F A2D9 E267 B847"            /* àì4å—³•€EŸ¢Ùâg¸G */
+	$"E302 3AA0 8631 8C61 5F8E 88DE 2FBB 394B"            /* ã.: †1Œa_ŽˆÞ/»9K */
+	$"B9EC 234B 6515 BDF3 BA80 AA30 3D50 2F90"            /* ¹ì#Ke.½óº€ª0=P/� */
+	$"C26A D743 2198 707A 2DC1 9C64 1647 1FA3"            /* Âj×C!˜pz-Áœd.G.£ */
+	$"43A2 B1C7 C95D 1E19 9650 E616 F24B C118"            /* C¢±ÇÉ]..–Pæ.òKÁ. */
+	$"FB68 CE23 485E BF50 ACF8 F669 B5A3 92AA"            /* ûhÎ#H^¿P¬øöiµ£’ª */
+	$"5625 BF48 8584 A6E7 DAC0 E203 2AF0 89A0"            /* V%¿H…„¦çÚÀâ.*ð‰  */
+	$"DB92 4924 9249 1BF5 D855 0470 51D0 AAE2"            /* Û’I$’I.õØU.pQЪâ */
+	$"A1E5 FBC9 CB80 1798 2EB3 EB1E 9FD4 46E7"            /* ¡åûÉË€.˜.³ë.ŸÔFç */
+	$"63DB F02E 204B D35F 54DE 0FD3 2F81 FB63"            /* cÛð. KÓ_TÞ.Ó/�ûc */
+	$"9CEC 37F1 C9FF 5B63 B13D BFBD 1169 0415"            /* œì7ñÉÿ[c±=¿½.i.. */
+	$"0E97 DA89 25E3 92C7 01F5 50E6 2181 A536"            /* .—Ú‰%ã’Ç.õPæ!�¥6 */
+	$"4020 C49B 1977 1BF5 5226 FD7D 668A D76F"            /* @ Ä›.w.õR&ý}fŠ×o */
+	$"2954 58F1 F44F 2935 F136 18BD C844 05FD"            /* )TXñôO)5ñ6.½ÈD.ý */
+	$"E325 9012 9E92 6EC3 E822 D06F A958 C54C"            /* ã%�.ž’nÃè"Ðo©XÅL */
+	$"6A4D 0A98 093C 481D 1424 7964 E810 7A60"            /* jM˜Æ<H..$ydè.z` */
+	$"F2C0 8287 A7F4 B307 FBDF 2550 567E 01EA"            /* òÀ‚‡§ô³.ûß%PV~.ê */
+	$"2C45 4614 9A0A 04E8 397B 3DEC 6CDA CA95"            /* ,EF.šÂ.è9{=ìlÚÊ• */
+	$"B754 699A FF29 B46B D6E3 BB8C 153C AEC0"            /* ·Tišÿ)´kÖ㻌.<®À */
+	$"BEFF 46AD 744B B945 4C07 F7F7 178D 059E"            /* ¾ÿF­tK¹EL.÷÷.�.ž */
+	$"2E80 10C4 6DD6 F19E B649 73D6 8C57 7A6C"            /* .€.ÄmÖñž¶IsÖŒWzl */
+	$"45DE 3D43 22DE C54A DFCD 64EA 9D77 1AC6"            /* EÞ=C"ÞÅJßÍdê�w.Æ */
+	$"E15E A9A7 0D83 D53C 100B EC25 2B93 1D27"            /* á^©§.ƒÕ<..ì%+“.' */
+	$"367A 864E D9C4 F0B9 DF5C 538D B2C0 24EE"            /* 6z†NÙÄð¹ß\S�²À$î */
+	$"46E7 424C 2127 6BED B492 3354 86C9 D855"            /* FçBL!'kí´’3T†ÉØU */
+	$"317B 6BE2 8205 C07C 9A42 03E4 D6B0 0F93"            /* 1{kâ‚.À|šB.äÖ°.“ */
+	$"4400 AFF0 AE8C D6D6 6729 AEBE 9CDE 5C69"            /* D.¯ð®ŒÖÖg)®¾œÞ\i */
+	$"D95C 01A0 28AF 1E57 B12C CA6D F010 ED89"            /* Ù\. (¯.W±,Êmð.í‰ */
+	$"4C46 38AA BAFC D67E 9E98 C6CA 85E4 433E"            /* LF8ªºüÖ~ž˜ÆÊ…äC> */
+	$"C450 03B7 E8DE 17B3 9CE7 02E1 BE72 100B"            /* ÄP.·èÞ.³œç.á¾r.. */
+	$"2EF5 787D 0D12 FC3B 855A 3F97 1850 05EF"            /* .õx}..ü;…Z?—.P.ï */
+	$"A05D 7CC2 405B BA6D 9175 7C99 BE1C 2370"            /*  ]|Â@[ºm‘u|™¾.#p */
+	$"1F57 2085 13F8 B672 728D 1152 8232 1EE4"            /* .W ….ø¶rr�.R‚2.ä */
+	$"A666 BFD0 06A8 6CFF 3D73 D895 5968 A54A"            /* ¦f¿Ð.¨lÿ=sØ•Yh¥J */
+	$"3219 63AB D4CD 8E7D 52F3 D260 CE4D E329"            /* 2.c«ÔÍŽ}RóÒ`ÎMã) */
+	$"F554 C837 34CC 2866 FA1E 1F34 B209 B8C3"            /* õTÈ74Ì(fú..4²Æ¸Ã */
+	$"097B 8DBC 8788 F621 2A57 5468 5FD8 852B"            /* Æ{�¼‡ˆö!*WTh_Ø…+ */
+	$"08A9 45F3 71A8 A26B F63C 2DB1 750F A833"            /* .©Eóq¨¢kö<-±u.¨3 */
+	$"4767 6D8A B551 FF10 9E54 AD5D EE2E 2207"            /* GgmŠµQÿ.žT­]î.". */
+	$"44EA 0D21 75D4 779D E96D 49FF 47CE D775"            /* Dê.!uÔw�émIÿGÎ×u */
+	$"D7B0 2380 5F1C 4185 EF0B BECB 1A55 9696"            /* ×°#€_.A…ï.¾Ë.U–– */
+	$"81B8 94F2 4F5B 07D8 D5EC 9E2A 049D 5E87"            /* �¸”òO[.ØÕìž*.�^‡ */
+	$"2601 FB44 4AD5 C57B A7B0 8088 B723 134E"            /* &.ûDJÕÅ{§°€ˆ·#.N */
+	$"0B8A 375E B972 F34F F25A 2B68 3F15 4496"            /* .Š7^¹róOòZ+h?.D– */
+	$"5734 FE10 D742 67F9 9FFF 639C FAFD 23DB"            /* W4þ.×BgùŸÿcœúý#Û */
+	$"B90C F402 17F0 81C6 2656 EFD0 E011 C866"            /* ¹.ô..ð�Æ&VïÐà.Èf */
+	$"15C8 4927 3415 BEC1 7876 E693 74CB DBEA"            /* .ÈI'4.¾Áxvæ“tËÛê */
+	$"7206 2246 23EC DCCA 51CD 72C1 8C41 1B85"            /* r."F#ìÜÊQÍrÁŒA.… */
+	$"AE9B 6FA5 4286 03FB 7000 D94F 5A8B 8A85"            /* ®›o¥B†.ûp.ÙOZ‹Š… */
+	$"2F34 7575 E7AB 08FF 3CBD 328D D95D BDF5"            /* /4uuç«.ÿ<½2�Ù]½õ */
+	$"8070 0FAD B573 A91E 5F83 D32D 3337 A5B7"            /* €p.­µs©._ƒÓ-37¥· */
+	$"C6A7 3048 8D7C 3F01 F6BF 1BAB D684 0585"            /* Ƨ0H�|?.ö¿.«Ö„.… */
+	$"798A A28D 68A6 4993 22BC F35C E3A7 BABE"            /* yŠ¢�h¦I“"¼ó\㧺¾ */
+	$"0D5B 7E43 2B91 5DA6 6821 0495 4B22 33C0"            /* .[~C+‘]¦h!.•K"3À */
+	$"1217 1302 A7EB 1093 C8BD 3622 F0FD 14C3"            /* ....§ë.“Ƚ6"ðý.à */
+	$"EDBA 60FA B4C2 07D5 6D80 C177 9C23 24FE"            /* íº`ú´Â.Õm€Áwœ#$þ */
+	$"C9E7 77A7 1945 4C1A 8945 129A 2581 498D"            /* Éçw§.EL.‰E.š%�I� */
+	$"F2BD 5AD6 EF89 4D80 3EC2 DA29 E093 A726"            /* ò½ZÖï‰M€>ÂÚ)à“§& */
+	$"88F1 0796 E9F0 8F36 D342 7AD3 DEC2 2CCA"            /* ˆñ.–éð�6ÓBzÓÞÂ,Ê */
+	$"45B9 35A0 DE31 D18B 2954 C38C 4B3A EEA2"            /* E¹5 Þ1Ñ‹)TÃŒK:î¢ */
+	$"5CD5 333D 6C59 23C7 17B3 C98C 65EE 8117"            /* \Õ3=lY#Ç.³ÉŒeî�. */
+	$"22A2 574D D223 581B D09B 6473 3F85 6E2A"            /* "¢WMÒ#X.Лds?…n* */
+	$"81B5 F600 CAB6 1A02 3B24 D726 4344 536F"            /* �µö.ʶ..;$×&CDSo */
+	$"99AB 09C8 96EA B41B 01C9 7AC8 9478 B8AB"            /* ™«ÆÈ–ê´..ÉzÈ”x¸« */
+	$"69E3 1BF1 1100 AFF3 C59C 01FB 8EF9 047D"            /* iã.ñ..¯óÅœ.ûŽù.} */
+	$"21EF 11DE D2CA BEE2 8372 5DDB C39C DE6E"            /* !ï.ÞÒʾâƒr]ÛÃœÞn */
+	$"B652 35FE FDFB F1E8 2E91 778A 86C3 3117"            /* ¶R5þýûñè.‘wŠ†Ã1. */
+	$"87D8 A7D5 7862 68B7 30C1 3B32 D209 0256"            /* ‡Ø§Õxbh·0Á;2ÒÆ.V */
+	$"2BF7 DFEF 17C3 FC30 EF1D 9327 7041 FC3C"            /* +÷ßï.Ãü0ï.“'pAü< */
+	$"674F 3069 DAB2 0EA5 BB48 DC2C DC66 F660"            /* gO0iÚ².¥»HÜ,Üfö` */
+	$"9C9B C7C8 3734 C68B 7D5A 60A1 DF3D D3A8"            /* œ›ÇÈ74Æ‹}Z`¡ß=Ó¨ */
+	$"E60C D15A 11C7 FB3B F75A 358E A7F7 16CB"            /* æ.ÑZ.Çû;÷Z5Ž§÷.Ë */
+	$"67B5 097E E2A2 DE6C E40A FD52 8F75 43EF"            /* gµÆ~â¢ÞläÂýR�uCï */
+	$"F5DF 5A51 BBF5 A074 791F F54F 9724 23C3"            /* õßZQ»õ ty.õO—$#Ã */
+	$"F5E6 C4A3 E22C 1E06 3B71 A9A2 1C17 0109"            /* õæÄ£â,..;q©¢...Æ */
+	$"1B59 2742 AB03 0497 3E5A AD73 7FD3 DA51"            /* .Y'B«..—>Z­s.ÓÚQ */
+	$"9F17 A10E B9CF 7503 3395 8788 9D9D 4A58"            /* Ÿ.¡.¹Ïu.3•‡ˆ��JX */
+	$"F9B8 4A61 3DDA 7489 8086 9EAC 4D7D 62DD"            /* ù¸Ja=Út‰€†ž¬M}bÝ */
+	$"BF8B 9462 1CC0 6912 69BE 3BFE FED7 3174"            /* ¿‹”b.Ài.i¾;þþ×1t */
+	$"CAA6 A806 FF59 B963 ABEE 508B F428 D15C"            /* ʦ¨.ÿY¹c«îP‹ô(Ñ\ */
+	$"82FC BA30 6907 C572 F2BD C0DB E9A2 44AF"            /* ‚üº0i.Årò½ÀÛé¢D¯ */
+	$"EED6 81F7 C602 F802 0374 CD1D 0F41 5E2E"            /* îÖ�÷Æ.ø..tÍ..A^. */
+	$"F54F E7AB C492 54F8 C570 48A6 1603 35D3"            /* õOç«Ä’TøÅpH¦..5Ó */
+	$"EA1A 6A6D FD79 27E3 F928 4E16 3A2D 43FE"            /* ê.jmýy'ãù(N.:-Cþ */
+	$"6C3D AFC6 FA1C 578C 7BA9 7343 5B2C 7BB9"            /* l=¯Æú.WŒ{©sC[,{¹ */
+	$"0614 915A 24C4 CAC1 A2D3 0EAF EAE8 7257"            /* ..‘Z$ÄÊÁ¢Ó.¯êèrW */
+	$"EA2D 1ED2 3FFE 26A7 3E28 28D0 1AE1 D790"            /* ê-.Ò?þ&§>((Ð.á×� */
+	$"A25D 1C6C BA20 E196 1EEC 9720 92EE 6E62"            /* ¢].lº á–.ì— ’înb */
+	$"E218 5609 944E 9A2E 9228 117A 6065 93FF"            /* â.VÆ”Nš.’(.z`e“ÿ */
+	$"2B32 B2C1 7876 E657 E39E 8641 F202 62B4"            /* +2²ÁxvæW㞆Aò.b´ */
+	$"20C5 99D9 F9E5 7D83 D807 EDB7 9A34 475B"            /*  Å™Ùùå}ƒØ.í·š4G[ */
+	$"4F45 9AE8 ACD6 3098 A0C2 8D14 CBDB 9A2B"            /* OEšè¬Ö0˜ Â�.ËÛš+ */
+	$"0EF7 CB30 8B49 169F 1ECD 6F33 F063 65DA"            /* .÷Ë0‹I.Ÿ.Ío3ðceÚ */
+	$"2A2F F0B0 EE29 91F7 CA11 748C 5E4E A447"            /* *.ð°î)‘÷Ê.tŒ^N¤G */
+	$"0F7F 4B32 DB7A 366C 27C4 F178 33B7 5E9B"            /* ..K2Ûz6l'Äñx3·^› */
+	$"BAAF 29CD A3EF 39BB 5FAD AD2B 5DCA 09E8"            /* º¯)Í£ï9»_­­+]ÊÆè */
+	$"DB9A DD07 84DD 870E 2A4C 850B BD04 7F9A"            /* ÛšÝ.„݇.*L….½..š */
+	$"1354 1DAA 0819 F583 1F47 5905 6597 5F07"            /* .T.ª..õƒ.GY.e—_. */
+	$"7ED6 DFFA BA65 FA6C D01D F65F F833 D479"            /* ~ÖßúºeúlÐ.ö_ø3Ôy */
+	$"BFD3 F3D8 57BB 3718 EBC8 5A2D 732E 464E"            /* ¿ÓóØW»7.ëÈZ-s.FN */
+	$"6B46 9512 778B 8066 D5DA D21A 819D 5384"            /* kF•.w‹€fÕÚÒ.��S„ */
+	$"A84C AE56 92E2 2E9A 4D27 8A21 E02D 67FC"            /* ¨L®V’â.šM'Š!à-gü */
+	$"EAA4 B3D5 9306 1D06 CC9A 84C8 D6C4 C7E1"            /* ꤳՓ...Ìš„ÈÖÄÇá */
+	$"4F47 E168 43F0 6EB1 9276 ED11 2C29 F1CB"            /* OGáhCðn±’ví.,)ñË */
+	$"90AB 1975 3405 422B 78EC 7776 FA5C 0A2C"            /* �«.u4.B+xìwvú\Â, */
+	$"F4B1 4F40 32CE D338 8911 EAB4 4CFC 7765"            /* ô±O@2ÎÓ8‰.ê´Lüwe */
+	$"D9ED C10E 114B 0909 1122 6832 A41E 3365"            /* ÙíÁ..KÆÆ."h2¤.3e */
+	$"96EF FC81 A398 2FE8 0464 5D18 0C9F C1AF"            /* –ïü�£˜/è.d]..ŸÁ¯ */
+	$"8E6F 42CA BDC9 1DC4 770E 1C2E 01BD 62DB"            /* ŽoBʽÉ.Äw....½bÛ */
+	$"7798 4167 FC4F B27D D7E6 32CE 7F95 954F"            /* w˜AgüO²}×æ2Î.••O */
+	$"653C 833E B4F1 C6C2 307E 0796 686E 6F5C"            /* e<ƒ>´ñÆÂ0~.–hno\ */
+	$"6EE2 6260 4C0B 5329 36D8 839E 5F08 319C"            /* nâb`L.S)6؃ž_.1œ */
+	$"4CAE 85DE 6B64 F427 1358 C9FF 57B9 AF78"            /* L®…Þkdô'.XÉÿW¹¯x */
+	$"332B 82A6 0EBF 0F83 7A3C 8004 1402 6A12"            /* 3+‚¦.¿.ƒz<€...j. */
+	$"FEE8 1612 2D8A 47FE 5BDE 2714 B393 E32F"            /* þè..-ŠGþ[Þ'.³“ã/ */
+	$"013E BD7E 14FA 285D BF61 7CDA 3A92 734A"            /* .>½~.ú(]¿a|Ú:’sJ */
+	$"520E 978D 8736 6AA9 847B 05C9 F28B 3D9A"            /* R.—�‡6j©„{.Éò‹=š */
+	$"9B2E 721C 9082 3EC1 362C D516 D306 1EB9"            /* ›.r.�‚>Á6,Õ.Ó..¹ */
+	$"A95C EC63 3111 4ED2 054A EFF8 F26A 0E36"            /* ©\ìc1.NÒ.Jïøòj.6 */
+	$"7445 26A0 464F CEDC 924D B183 FAEF 28F7"            /* tE& FOÎÜ’M±ƒúï(÷ */
+	$"AF76 2DBA F15C 4F45 4BFD E003 CDC1 A878"            /* ¯v-ºñ\OEKýà.ÍÁ¨x */
+	$"6FB4 207C 2A45 1ED9 CE49 2495 F6A9 77E8"            /* o´ |*E.ÙÎI$•ö©wè */
+	$"E7FF 7FFF 7FFF 7FFF 70EC F373 E872 28BA"            /* çÿ.ÿ.ÿ.ÿpìósèr(º */
+	$"A0BB 38E4 AC79 94DA 6562 832A 9A7B EEA8"            /*  »8ä¬y”Úebƒ*š{î¨ */
+	$"6B09 FEA7 9249 2005 E7D1 D721 4761 B6DB"            /* kÆþ§’I .çÑ×!Ga¶Û */
+	$"6DB6 DB6D 98C5 C208 FD98 41AA F430 3EAE"            /* m¶Ûm˜ÅÂ.ý˜Aªô0>® */
+	$"7118 7229 50B1 07D8 C5CA 010D 4AB4 DE82"            /* q.r)P±.ØÅÊ..J´Þ‚ */
+	$"53D3 E184 6561 DE5F 7236 BBF5 550D 4A83"            /* SÓá„eaÞ_r6»õU.Jƒ */
+	$"555B 5C0F 9C0E F052 0080 F4AC 3912 DD30"            /* U[\.œ.ðR.€ô¬9.Ý0 */
+	$"47C9 B77E C632 15D7 8EB6 CD51 0454 A805"            /* GÉ·~Æ2.׎¶ÍQ.T¨. */
+	$"2DAD F687 6CB7 B37F 2289 759F F7D5 8839"            /* -­ö‡l·³."‰uŸ÷Õˆ9 */
+	$"B3E6 BCA5 AA89 9D9D 599A 5BDD 54B9 7F7D"            /* ³æ¼¥ª‰��Yš[ÝT¹.} */
+	$"2770 11ED 2217 C539 0204 16FF 728A C52A"            /* 'p.í".Å9...ÿrŠÅ* */
+	$"2D24 5FC7 E1D7 C47E 1DE8 C3F0 EA38 E730"            /* -$_Çá×Ä~.èÃðê8ç0 */
+	$"2D9D 0AC5 991A F5DD 38EC 007B A963 8B4D"            /* -�ÂÅ™.õÝ8ì.{©c‹M */
+	$"51BA A9FC AE25 908A 1B70 9145 EBA2 38C4"            /* Qº©ü®%�Š.p‘Eë¢8Ä */
+	$"168F 70BB 10A5 CAA5 A249 1974 03F3 AB57"            /* .�p».¥Ê¥¢I.t.ó«W */
+	$"3611 30C5 1F14 529F 040A A8EC EBDF F2FF"            /* 6.0Å..RŸ.¨ìëßòÿ */
+	$"232B 83FE C2D0 59D9 93C2 2A8A F86A 997F"            /* #+ƒþÂÐYÙ“Â*Šøj™. */
+	$"3207 03A7 C406 E96C C96F 23F1 1490 95DF"            /* 2..§Ä.élÉo#ñ.�•ß */
+	$"4024 67DC 3DE6 E1B1 EB60 1026 8786 531C"            /* @$gÜ=æá±ë`.&‡†S. */
+	$"9A51 378D EE86 881F 496C 8854 9459 7799"            /* šQ7�.IlˆT”Yw™ */
+	$"11EC 4196 0C22 0F05 3762 D8F4 C348 7299"            /* .ìA–."..7bØôÃHr™ */
+	$"793E 0718 14D3 D09C C192 80E1 9F7C 5CFA"            /* y>...ÓÐœÁ’€áŸ|\ú */
+	$"429C 7960 2F8B 9063 C7E1 1447 7F52 D850"            /* Bœy`/‹�cÇá.G.RØP */
+	$"B80A F1D8 BE98 DC3C 9C44 3AB7 3DA7 E08C"            /* ¸Âñؾ˜Ü<œD:·=§àŒ */
+	$"E7B6 07CE 2B69 C0E9 0C21 6133 1EC5 DAB5"            /* ç¶.Î+iÀé.!a3.ÅÚµ */
+	$"B079 413B FBA4 0259 78B8 DA3A E6D1 4AAC"            /* °yA;û¤.Yx¸Ú:æÑJ¬ */
+	$"2459 93C8 AD9A D69C AC40 5CF7 7385 1B18"            /* $Y“È­šÖœ¬@\÷s….. */
+	$"D67D 82BD 5E44 3DF8 5D2F E6D3 CE47 0191"            /* Ö}‚½^D=ø]/æÓÎG.‘ */
+	$"6E57 0F2F E8E8 9FF0 14BC 21F1 7720 6F34"            /* nW./èèŸð.¼!ñw o4 */
+	$"1EEE 5EF6 F8FD 5481 44E3 AB6B B06E 2556"            /* .î^öøýT�Dã«k°n%V */
+	$"6F07 AD65 FC95 7C32 7487 10A0 3C20 9CA7"            /* o.­eü•|2t‡. < œ§ */
+	$"B0EB F703 2D09 F0A6 D3FD 55F6 354B EDB0"            /* °ë÷.-Æð¦ÓýUö5Kí° */
+	$"179B B267 B9EB 8DA1 ED8E 7D0F 1AFF 4D50"            /* .›²g¹ë�¡íŽ}..ÿMP */
+	$"C1C7 A686 586C 6A26 3B0B 4292 60A0 A804"            /* ÁǦ†Xlj&;.B’` ¨. */
+	$"04F6 5FDB 0F76 E2BC D680 20B5 46AE 399D"            /* .ö_Û.vâ¼Ö€ µF®9� */
+	$"CC54 82A4 1DCA 08E7 E2B4 6710 ABD8 FC18"            /* ÌT‚¤.Ê.çâ´g.«Øü. */
+	$"949B 7076 11CD 598E 2A8B 99FC CC28 EC17"            /* ”›pv.ÍYŽ*‹™üÌ(ì. */
+	$"451C DE31 F7F4 C47E 3ABB AF03 FDC6 D875"            /* E.Þ1÷ôÄ~:»¯.ýÆØu */
+	$"BD0C AB3E B78F F942 A53E E5F8 CA09 414D"            /* ½.«>·�ùB¥>åøÊÆAM */
+	$"7544 D5B4 8367 3256 6D8C CB66 6DE7 E99C"            /* uDÕ´ƒg2VmŒËfmçéœ */
+	$"88E9 FCDC EB55 F67B 20E7 F44D 7616 6B29"            /* ˆéüÜëUö{ çôMv.k) */
+	$"124A C9AB 95C7 E9A8 209D EDA5 499F 2D2F"            /* .JÉ«•Çé¨ �í¥IŸ-/ */
+	$"20E5 DE8C 2EEE 92AF 4BD6 484B 7E18 2D81"            /*  åÞŒ.î’¯KÖHK~.-� */
+	$"0502 F439 C742 BA21 693B 43C5 60DF 8BA0"            /* ..ô9ÇBº!i;CÅ`ß‹  */
+	$"9EAC 0A98 DFE4 DB4B 0BE1 E526 9B74 5982"            /* ž¬Â˜ßäÛK.áå&›tY‚ */
+	$"1817 EA6B 067A D3E4 8786 883D 26DB D361"            /* ..êk.zÓ䇆ˆ=&ÛÓa */
+	$"C40F 89F4 B31F 2AF3 1369 FDA9 889A 5620"            /* Ä.‰ô³.*ó.iý©ˆšV  */
+	$"9AE7 4384 7184 9D7F 6C37 F79B 9422 ADF3"            /* šçC„q„�.l7÷›”"­ó */
+	$"2BEA A620 14CF 0267 110E AB20 594B F1DA"            /* +ê¦ .Ï.g..« YKñÚ */
+	$"9D7F DB53 3723 1A4E 0DEC DF68 3A10 078F"            /* �.ÛS7#.N.ìßh:..� */
+	$"8CA5 471B 4400 0975 92AA A351 8C66 5DDA"            /* Œ¥G.D.Æu’ª£QŒf]Ú */
+	$"0E4E C7B1 286F 2F7C E0EB 24CC 0A8B CAF8"            /* .NDZ(o/|àë$Ì‹Êø */
+	$"4F0F 75E5 CACF 26F5 0FFE 86A8 1E77 5F03"            /* O.uåÊÏ&õ.þ†¨.w_. */
+	$"A8B5 A544 F04B A521 B3FA 854A 64FA 70CD"            /* ¨µ¥DðK¥!³ú…JdúpÍ */
+	$"526F 97AE 807A 05FC 3F67 2471 61E5 2715"            /* Ro—®€z.ü?g$qaå'. */
+	$"5774 E452 7E4A CDDA 6E48 0DA2 04B3 3A29"            /* WtäR~JÍÚnH.¢.³:) */
+	$"DE10 8F75 3A3A 559D A881 B948 74F3 AB92"            /* Þ.�u::U�¨�¹Htó«’ */
+	$"B154 0F88 A11B A00B 25ED 9A59 B894 618E"            /* ±T.ˆ¡. .%íšY¸”aŽ */
+	$"AD45 3D59 9C08 49EA 076C CD63 8F49 B714"            /* ­E=Yœ.Iê.lÍc�I·. */
+	$"32B3 8743 2506 F55A C011 CBEF C94A 8606"            /* 2³‡C%.õZÀ.ËïÉJ†. */
+	$"EDE4 BE7D 2DC9 8830 6C23 91E0 0209 440C"            /* íä¾}-Ɉ0l#‘à.ÆD. */
+	$"9409 1457 6CA0 2201 8FF4 7573 54F8 CCEC"            /* ”Æ.Wl ".�ôusTøÌì */
+	$"D201 4A3A 66A6 B191 4E14 4CB1 08B4 2100"            /* Ò.J:f¦±‘N.L±.´!. */
+	$"BCF2 3A0D 696F 4582 F8B0 3A60 2D09 E9A7"            /* ¼ò:.ioE‚ø°:`-Æé§ */
+	$"8E83 CF44 A16A 6516 31C1 B51E 2DFE BDAC"            /* ŽƒÏD¡je.1Áµ.-þ½¬ */
+	$"356B F402 856C BEA0 109C A125 A759 E580"            /* 5kô.…l¾ .œ¡%§Yå€ */
+	$"3501 F500 F252 9533 F180 6E7D 30A8 FD62"            /* 5.õ.òR•3ñ€n}0¨ýb */
+	$"7FD6 B4EB 9120 8504 493A DD87 D79A 0CB1"            /* .Ö´ë‘ ….I:݇ך.± */
+	$"B674 7010 830D 8A38 5B44 B11D 3632 3FA5"            /* ¶tp.ƒ.Š8[D±.62?¥ */
+	$"CE31 CE9A 1670 AF20 16F6 BDA6 4980 002E"            /* Î1Κ.p¯ .ö½¦I€.. */
+	$"3E9E 8AB0 8B1F 63C5 28C3 7914 2833 137F"            /* >žŠ°‹.cÅ(Ãy.(3.. */
+	$"0915 DD39 7D38 49A3 6054 B5DC 2509 EE11"            /* Æ.Ý9}8I£`TµÜ%Æî. */
+	$"D68A 5C2A C75B 5B9F 7A9A FF3A D06F 3331"            /* ÖŠ\*Ç[[Ÿzšÿ:Ðo31 */
+	$"29E6 A9F4 8AD5 E0D9 7FB9 84B1 F403 8910"            /* )æ©ôŠÕàÙ.¹„±ô.‰. */
+	$"1168 1270 19E2 E385 0353 0FFF 697F 96BE"            /* .h.p.âã….S.ÿi.–¾ */
+	$"EF55 21CA 25A1 CE5E 0CD7 03A9 094F 51FE"            /* ïU!Ê%¡Î^.×.©ÆOQþ */
+	$"5314 E59F 90EB 907A E37A DD9D 182A E41C"            /* S.åŸ�ë�zãzÝ�.*ä. */
+	$"CFFB 7262 0D9E B904 8D95 2DE3 E02B F5CB"            /* Ïûrb.ž¹.�•-ãà+õË */
+	$"BF61 6012 924E 50D3 2D8D 6C25 FC60 8D19"            /* ¿a`.’NPÓ-�l%ü`�. */
+	$"9855 8BF2 5400 0000 04E3 7684 B40E 9EE7"            /* ˜U‹òT....ãv„´.žç */
+	$"21F8 CB76 250B 7CE0 2605 7C84 7E9F F226"            /* !øËv%.|à&.|„~Ÿò& */
+	$"6B94 0DB5 02AA 61E7 A9FF 5D9F A9F2 B546"            /* k”.µ.ªaç©ÿ]Ÿ©òµF */
+	$"2417 2E4D B238 ADDF 9233 5911 1D61 D35A"            /* $..M²8­ß’3Y..aÓZ */
+	$"8788 DF34 284A 9664 B91E 7A11 4568 B395"            /* ‡ˆß4(J–d¹.z.Eh³• */
+	$"7C74 C891 2A46 C056 EE92 0459 D81C A41F"            /* |tÈ‘*FÀVî’.YØ.¤. */
+	$"CA5E 4752 3ADE 89AB 995B 2BF2 D070 41B1"            /* Ê^GR:Þ‰«™[+òÐpA± */
+	$"EBFE 65BF FF61 55F5 5460 A4E0 33CF 7F1E"            /* ëþe¿ÿaUõT`¤à3Ï.. */
+	$"691A 0DA4 9372 4DCD 4A7C FF30 7DA5 4AD0"            /* i..¤“rMÍJ|ÿ0}¥JÐ */
+	$"1236 3C90 00C2 4517 FF78 771E DA05 952D"            /* .6<�.ÂE.ÿxw.Ú.•- */
+	$"1085 D433 FD50 1E6F D583 2585 CBD6 5CFC"            /* .…Ô3ýP.oÕƒ%…ËÖ\ü */
+	$"9EF2 539B BE7A CCA1 ABF6 5AED 484B FF78"            /* žòS›¾zÌ¡«öZíHKÿx */
+	$"D6BD 435E E56E 5510 3047 49DE C511 72CF"            /* Ö½C^ånU.0GIÞÅ.rÏ */
+	$"72A0 B2CE 5E4D E2DA 0AFA FEDE BDFD 3167"            /* r ²Î^MâÚÂúþÞ½ý1g */
+	$"02FE 3FBE A1B9 7A5F 205B 7D60 1BA3 C975"            /* .þ?¾¡¹z_ [}`.£Éu */
+	$"5949 A641 5A3E 5AF2 F237 53BE FCAC 71F1"            /* YI¦AZ>Zòò7S¾ü¬qñ */
+	$"E3E3 6AEB 35B9 41BD C4B6 3400 DBA0 4B7F"            /* ããjë5¹A½Ä¶4.Û K. */
+	$"FF79 17FD 23F9 918D E532 F6BD F949 B633"            /* ÿy.ý#ù‘�å2ö½ùI¶3 */
+	$"6A36 7600 17D8 C912 DB72 6F48 869C 0D66"            /* j6v..ØÉ.ÛroH†œ.f */
+	$"1410 074A 8F5B 629C 5B8B F293 6DB6 DB6D"            /* ...J�[bœ[‹ò“m¶Ûm */
+	$"B6DB 6740 B8F8 BF85 2938 ECDA 6390 6537"            /* ¶Ûg@¸ø¿…)8ìÚc�e7 */
+	$"5986 A2A6 B52C A20D F057 C41F 660A C203"            /* Y†¢¦µ,¢.ðWÄ.fÂÂ. */
+	$"E5C1 68B0 9D56 DAD8 F20C 665C 5D04 4BA2"            /* åÁh°�VÚØò.f\].K¢ */
+	$"46FF 7DB5 4880 6121 2EA3 5D2A 82F4 B18A"            /* Fÿ}µH€a!.£]*‚ô±Š */
+	$"50FC 2D12 DEFE 1F4D 01BF 3315 10D3 5D94"            /* Pü-.Þþ.M.¿3..Ó]” */
+	$"11B1 0221 28B8 56D9 4CED 012D D9C9 4005"            /* .±.!(¸VÙLí.-ÙÉ@. */
+	$"316F E887 29A8 3E83 9E25 FF1F A4C1 5D25"            /* 1oè‡)¨>ƒž%ÿ.¤Á]% */
+	$"8893 36E0 73BE DE25 456A 4678 B7C5 AD7A"            /* ˆ“6às¾Þ%EjFx·Å­z */
+	$"90C9 3950 942F 1459 C737 31EF 991F 241B"            /* �É9P”/.YÇ71ï™.$. */
+	$"C294 7CFB 9461 B43A 8D37 8A6D BBC8 D7F6"            /* ”|û”a´:�7Šm»È×ö */
+	$"A128 281D DF2B EAC5 A154 E6D9 FF53 984D"            /* ¡((.ß+êÅ¡TæÙÿS˜M */
+	$"550E 9C70 3F64 0E0E 0940 0AFC 5CC9 CF43"            /* U.œp?d..Æ@Âü\ÉÏC */
+	$"7184 3D0F 9FDE 08DF EC31 B86E 0D38 AF71"            /* q„=.ŸÞ.ßì1¸n.8¯q */
+	$"29F1 A21D 7847 7150 6DCA 9211 C778 F1A4"            /* )ñ¢.xGqPmÊ’.Çxñ¤ */
+	$"26AA B90D 1A39 DB92 4924 9249 2493 36D2"            /* &ª¹..9Û’I$’I$“6Ò */
+	$"4924 9249 2492 49FE 069C E7B9 CB0D 4E87"            /* I$’I$’Iþ.œç¹Ë.N‡ */
+	$"7D9E 9D29 FC64 8A6F 6185 2BD9 806F 760B"            /* }ž�)üdŠoa…+Ù€ov. */
+	$"464D 4732 BD90 0E7D CABF 2B6F 2A78 8608"            /* FMG2½�.}Ê¿+o*x†. */
+	$"DEF5 406F D401 3FD4 AE82 058D D6C8 B980"            /* Þõ@oÔ.?Ô®‚.�Öȹ€ */
+	$"FECA D9B9 E7B6 3982 9FD3 81EA 544B 30BD"            /* þÊÙ¹ç¶9‚ŸÓ�êTK0½ */
+	$"7E56 FD78 66FD 5A41 D0BD 7714 5FAF 2A1E"            /* ~VýxfýZAнw._¯*. */
+	$"8FDA B705 EAAE F6F2 D69C 9812 7194 A56E"            /* �Ú·.ê®öòÖœ˜.q”¥n */
+	$"DB55 BF75 C4E4 BDCD 9FC2 ACAD C428 829F"            /* ÛU¿uÄä½ÍŸÂ¬­Ä(‚Ÿ */
+	$"2409 3BB2 A894 8020 A8E7 FC16 F4FF 4E84"            /* $Æ;²¨”€ ¨çü.ôÿN„ */
+	$"C06E 889C 1C74 96AD 5420 F825 1A2B 015C"            /* Ànˆœ.t–­T ø%.+.\ */
+	$"6BC2 31EE 64AB 7A44 15E5 3458 8040 AEEF"            /* kÂ1îd«zD.å4X€@®ï */
+	$"F6BD 7D58 6478 8344 018F D3C6 2E33 69A4"            /* ö½}XdxƒD.�ÓÆ.3i¤ */
+	$"E5E8 721A 5B2F 777B C0D8 0A05 2CE7 EEC8"            /* åèr.[/w{ÀØÂ.,çîÈ */
+	$"69EF 417B A960 D320 842E 84DE D442 AB2F"            /* iïA{©`Ó „.„ÞÔB«/ */
+	$"3B31 84FE DCFC A608 2E09 AA42 60F6 DB2E"            /* ;1„þÜü¦..ƪB`öÛ. */
+	$"DA5B C95D D10A 77BE AD48 B5FF 0557 A5AC"            /* Ú[É]ÑÂw¾­Hµÿ.W¥¬ */
+	$"327B F763 FDA1 32BF 7308 3EFC 0C2B 2D22"            /* 2{÷cý¡2¿s.>ü.+-" */
+	$"584A F9CA BFB4 78FF 6E67 42CC B491 492B"            /* XJùÊ¿´xÿngBÌ´‘I+ */
+	$"17C3 C746 9966 5780 BA6C 2798 472E 1CFF"            /* .ÃÇF™fW€ºl'˜G..ÿ */
+	$"6A32 69A0 86E0 44C6 1679 08F9 9928 48D9"            /* j2i †àDÆ.y.ù™(HÙ */
+	$"3DA0 CBA0 1E5E 2618 7162 51C9 DEF0 56A0"            /* = Ë .^&.qbQÉÞðV  */
+	$"1924 F126 CAAD F248 A1A4 2816 13A7 FE76"            /* .$ñ&Ê­òH¡¤(..§þv */
+	$"594E 647C 36C4 C014 CDC7 5C89 DBAB 9854"            /* YNd|6ÄÀ.ÍÇ\‰Û«˜T */
+	$"9094 FC96 5FED 7476 AA3C DF0B B47B C123"            /* �”ü–_ítvª<ß.´{Á# */
+	$"BE6D CD5A BA07 CC19 94FC DC37 B85C 0FD2"            /* ¾mÍZº.Ì.”üÜ7¸\.Ò */
+	$"9FED 62E6 F910 2F49 529E CE10 9738 D296"            /* Ÿíbæù./IRžÎ.—8Ò– */
+	$"A81C 1A0D 0FBF 7CAE DB93 40C0 3BC9 5A0C"            /* ¨....¿|®Û“@À;ÉZ. */
+	$"B23D FBD4 3863 C520 03A0 D966 5327 A0A2"            /* ²=ûÔ8cÅ . ÙfS' ¢ */
+	$"DD06 B7A1 942B 0A75 CB23 8664 4159 8647"            /* Ý.·¡”+ÂuË#†dAY†G */
+	$"2725 DAF6 693A 58D7 7A7D B34A 393D FE7A"            /* '%Úöi:X×z}³J9=þz */
+	$"C105 C374 193C 123C 130E 062C 8AB2 32FD"            /* Á.Ãt.<.<...,Š²2ý */
+	$"80E0 72E3 6AEA 2078 5D7C D3E5 4E20 D927"            /* €àrãjê x]|ÓåN Ù' */
+	$"157E 9DC5 1A29 2F0F C326 AFE3 3ACF C361"            /* .~�Å.)/.Ã&¯ã:ÏÃa */
+	$"8C45 D79C EB27 7441 E4C7 8BFD 5832 DB93"            /* ŒEלë'tAäÇ‹ýX2Û“ */
+	$"78F5 B9DB BA4E 329E A262 C467 88DC C540"            /* xõ¹ÛºN2ž¢bÄgˆÜÅ@ */
+	$"78E0 4E55 34F3 806E 2DEA B371 E9B5 D8DF"            /* xàNU4ó€n-ê³qéµØß */
+	$"5EDA B5B9 1C48 5A11 ECAB E4F8 67B7 C76E"            /* ^Úµ¹.HZ.ì«äøg·Çn */
+	$"460F 8E6A C7BA B5F8 75F2 9105 1480 FD1A"            /* F.ŽjǺµøuò‘..€ý. */
+	$"80EB DB48 6115 AA6E 9AEA A07C 57B0 1A7F"            /* €ëÛHa.ªnšê |W°.. */
+	$"0CBF D5DE 47A7 89BE 4CAE 19FE 7B79 5839"            /* .¿ÕÞG§‰¾L®.þ{yX9 */
+	$"232D 495E 476C E267 D9D2 5257 F0E6 3EB5"            /* #-I^GlâgÙÒRWðæ>µ */
+	$"F140 AAAF 1E36 BA04 086A EEC5 3232 7958"            /* ñ@ª¯.6º..jîÅ22yX */
+	$"72E3 FCC3 9488 B44C 0C15 EF6B 811B CF97"            /* rãüÔˆ´L..ïk�.Ï— */
+	$"0532 2B88 663D 8675 6050 AB94 A435 C0FC"            /* .2+ˆf=†u`P«”¤5Àü */
+	$"9E08 9873 92AF 6859 F7F5 64B0 0BA5 FA68"            /* ž.˜s’¯hY÷õd°.¥úh */
+	$"3557 0898 9E0D 5795 BF67 2866 5FB6 63C6"            /* 5W.˜ž.W•¿g(f_¶cÆ */
+	$"4F82 42CE A682 DC8D CB18 D4FE 6252 95D1"            /* O‚BΦ‚Ü�Ë.ÔþbR•Ñ */
+	$"C85C 6B2C 0FC0 7C9D 5A80 F93B 8900 F93A"            /* È\k,.À|�Z€ù;‰.ù: */
+	$"8EE6 7513 4AFA 1609 3CEE D5EB B420 A1CE"            /* Žæu.Jú.Æ<îÕë´ ¡Î */
+	$"318D 6F67 720A 7F84 4127 C0F2 9193 35CE"            /* 1�ogrÂ.„A'Àò‘“5Î */
+	$"6D97 9682 5E5D B9FC 5A97 3B71 AB1F 64AA"            /* m—–‚^]¹üZ—;q«.dª */
+	$"3383 1F0E C0E9 26BE E6EB 24CD 499F F2BA"            /* 3ƒ..Àé&¾æë$ÍIŸòº */
+	$"997D E886 6FF8 C6B5 0607 1259 7715 7539"            /* ™}è†oøƵ...Yw.u9 */
+	$"4B57 F7A9 56A7 A04B 031F 0786 6C02 E7BC"            /* KW÷©V§ K...†l.ç¼ */
+	$"8256 7F27 A39A B66D 6B95 6C11 CDE4 C580"            /* ‚V.'£š¶mk•l.ÍäÅ€ */
+	$"54DE 7E26 129C EB67 ABC8 455E 6CC3 453E"            /* TÞ~&.œëg«ÈE^lÃE> */
+	$"F9A8 3ED5 9B43 4EB8 384E 0F7B 28E0 16FF"            /* ù¨>Õ›CN¸8N.{(à.ÿ */
+	$"1342 18B1 31B6 EAEF 4C40 36F7 0CFF 6AFF"            /* .B.±1¶êïL@6÷.ÿjÿ */
+	$"8059 5D1C 275B 4F7D B392 4DB0 5E5D 4304"            /* €Y].'[O}³’M°^]C. */
+	$"4848 2A3A C93F BAD6 638D 315A 8771 1150"            /* HH*:É?ºÖc�1Z‡q.P */
+	$"1D41 B6A7 C9B8 782E 19D8 F8E7 07EB ED20"            /* .A¶§É¸x..Øøç.ëí  */
+	$"7D4E AFFF 5FD2 4FA0 2B48 B549 6A50 AD81"            /* }N¯ÿ_ÒO +HµIjP­� */
+	$"F11D 357F 7CB2 4B8B F28B 6C97 2C23 58A3"            /* ñ.5.|²K‹ò‹l—,#X£ */
+	$"92E8 2BFB 77F2 1ECE 7A2A C437 47E3 A833"            /* ’è+ûwò.Îz*Ä7Gã¨3 */
+	$"D60C C3CA 168A 85B8 620C 109C 4134 35BF"            /* Ö.ÃÊ.Š…¸b..œA45¿ */
+	$"ECCB 3629 944F AD29 444A C4B6 F019 F19B"            /* ìË6)”O­)DJĶð.ñ› */
+	$"4189 B1D3 8F28 65B9 85D8 C715 2E1A 267D"            /* A‰±Ó�(e¹…ØÇ...&} */
+	$"A7DB 4C90 9829 BC86 E14C 9F44 757D 5436"            /* §ÛL�˜)¼†áLŸDu}T6 */
+	$"9C38 979D 3654 9A63 E572 7864 E513 A083"            /* œ8—�6Tšcårxdå. ƒ */
+	$"C943 97C5 A88B 23A2 4ECC E4F1 AEED F3EC"            /* ÉC—Ũ‹#¢NÌäñ®íóì */
+	$"C57D F254 B087 7E1F 81B3 59E6 E2A0 E5CB"            /* Å}òT°‡~.�³Yæâ åË */
+	$"B710 EF71 0598 01BF 1400 3814 0759 EDA8"            /* ·.ïq.˜.¿..8..Yí¨ */
+	$"386C 3DF0 F1C5 CA93 612F C58D 71BA 6ED6"            /* 8l=ðñÅÊ“a/Å�qºnÖ */
+	$"FE35 90B4 9C10 A938 33B6 6987 E407 AE7B"            /* þ5�´œ.©83¶i‡ä.®{ */
+	$"5B1A 8E0E BE53 1C94 D747 9303 2ED9 13FA"            /* [.Ž.¾S.”×G“..Ù.ú */
+	$"226C F38A 7134 3CF6 1923 B85F A254 0048"            /* "lóŠq4<ö.#¸_¢T.H */
+	$"A765 B678 FC9C 1E2C E183 FC80 CA83 9572"            /* §e¶xüœ.,áƒü€Êƒ•r */
+	$"E573 B224 9894 7316 C931 4A49 C28F 6E33"            /* ås²$˜”s.É1JIÂ�n3 */
+	$"B579 EE14 84BC 61CC 351B 41FB 7095 5F8C"            /* µyî.„¼aÌ5.Aûp•_Œ */
+	$"1B15 6DAF FF7F F8EA 5A11 5453 6ECA 1C02"            /* ..m¯ÿ.øêZ.TSnÊ.. */
+	$"C8A4 F40F AD00 7BC9 EDFD AC3A 28E4 546F"            /* Ȥô.­.{Éíý¬:(äTo */
+	$"1E36 BE45 897E F5D5 BE25 E84B 57C6 9080"            /* .6¾E‰~õÕ¾%èKWÆ�€ */
+	$"B6C4 79B8 153B 110F D90B 215D 401C 0453"            /* ¶Äy¸.;..Ù.!]@..S */
+	$"8243 BF4A CDAE 9270 0658 462F E0C7 82A8"            /* ‚C¿JÍ®’p.XF/àÇ‚¨ */
+	$"E155 C547 D144 EBAD 74EC EAFF 7799 6D50"            /* áUÅGÑDë­tìêÿw™mP */
+	$"D0F9 6BA4 D8B3 0FBB B75B BC48 D5BA 8EAB"            /* Ðùk¤Ø³.»·[¼HÕºŽ« */
+	$"FF7F 3A2A 820F D817 FB8B 7590 ED4A 3D7B"            /* ÿ.:*‚.Ø.û‹u�íJ={ */
+	$"DAF8 C05F BDCF 1B7C 8862 53A8 95D6 C0DF"            /* ÚøÀ_½Ï.|ˆbS¨•ÖÀß */
+	$"4069 36DA 0739 783C C432 1E0C 7DA6 2D70"            /* @i6Ú.9x<Ä2..}¦-p */
+	$"B33A C5AD 810A FBBD E9BB B776 6463 9FDC"            /* ³:Å­�Âû½é»·vdcŸÜ */
+	$"B401 211D 81BA A9FA 8761 ED36 A1EF 439D"            /* ´.!.�º©ú‡aí6¡ïC� */
+	$"9880 BE88 E045 3068 F59F 7AD7 EFFF 7FFC"            /* ˜€¾ˆàE0hõŸz×ïÿ.ü */
+	$"5562 1F00 0818 22D6 5002 F762 7A20 0DC0"            /* Ub...."ÖP.÷bz .À */
+	$"3ADD FF5D 1851 D391 F011 0000 0000 0000"            /* :Ýÿ].QÓ‘ð....... */
+	$"0000 0000 0138 5715 ED61 F2C5 2C28 30C0"            /* .....8W.íaòÅ,(0À */
+	$"F669 9389 6153 3A95 E010 CCA0 2FEF B36F"            /* öi“‰aS:•à.Ì /ï³o */
+	$"9576 F8C0 F17B 27F6 F6FA 412C 70C7 CF14"            /* •vøÀñ{'ööúA,pÇÏ. */
+	$"7625 6871 7FE2 16C9 B6E9 5BF1 1A16 E2F0"            /* v%hq.â.ɶé[ñ..âð */
+	$"945D E51E CCF9 0970 E586 517C 475F 8856"            /* ”]å.ÌùÆpå†Q|G_ˆV */
+	$"CA0C 1DD9 E001 D7BC 1876 745C 8077 672D"            /* Ê..Ùà.×¼.vt\€wg- */
+	$"CECA FF0B 01D1 76FA 32F5 C047 26FB 451F"            /* ÎÊÿ..Ñvú2õÀG&ûE. */
+	$"5261 79B6 5990 79C9 4DF7 5B69 D548 E894"            /* Ray¶Y�yÉM÷[iÕHè” */
+	$"F249 0C84 D3F0 9555 7B99 EA27 FA38 184E"            /* òI.„Óð•U{™ê'ú8.N */
+	$"F863 AFA1 CE80 AEBC CB89 DD99 B8E2 0BEC"            /* øc¯¡Î€®¼Ë‰Ý™¸â.ì */
+	$"2F74 E534 3FF4 B50A 4B04 02B1 C178 B189"            /* /tå4?ôµÂK..±Áx±‰ */
+	$"D30F 77DC 8A15 8C9E AF87 1DCD D545 AC6B"            /* Ó.wÜŠ.Œž¯‡.ÍÕE¬k */
+	$"CAFB 832B E240 6752 8EF2 9BDF 76E8 621D"            /* Êûƒ+â@gRŽò›ßvèb. */
+	$"892E 384C 7BF0 4DE8 F910 7689 C3F0 E7E9"            /* ‰.8L{ðMèù.v‰Ãðçé */
+	$"E401 C781 F341 A84F 6922 E97B FC22 E259"            /* ä.Ç�óA¨Oi"é{ü"âY */
+	$"6B26 9B03 14A7 DFA1 B7BD CBED 9539 5DE3"            /* k&›..§ß¡·½Ëí•9]ã */
+	$"2041 2F5F A37A 2F23 00FC 6424 D7F8 902E"            /*  A/_£z/#.üd$×ø�. */
+	$"7261 227B B4EC F4D1 9C18 22C3 8CA5 EFF8"            /* ra"{´ìôÑœ."ÃŒ¥ïø */
+	$"5701 6734 9110 8B4E D9E0 EE8F 7FEA 202F"            /* W.g4‘.‹NÙàî�.ê / */
+	$"CFF7 5CC7 6107 0B22 B0BE A87B 32EF 0FA8"            /* Ï÷\Ça.."°¾¨{2ï.¨ */
+	$"3D2D 794E 556E 6089 ACBA D46C 17EC A9DC"            /* =-yNUn`‰¬ºÔl.ì©Ü */
+	$"0F4E D57D B8C8 EED1 F9D4 F96A 7BEE 3794"            /* .NÕ}¸ÈîÑùÔùj{î7” */
+	$"49DE 3AA7 EE2E 0B25 A47C 966A D90D C792"            /* IÞ:§î..%¤|–jÙ.Ç’ */
+	$"6304 7C05 C6EB A26D 83B8 3E0C AAF5 AFFE"            /* c.|.Æë¢mƒ¸>.ªõ¯þ */
+	$"FDC3 F7C4 C0A3 C3ED E8D2 0FAB AC58 1F56"            /* ýÃ÷ÄÀ£ÃíèÒ.«¬X.V */
+	$"FF40 F44B 4289 C6D7 CC17 A019 AD4A C889"            /* ÿ@ôKB‰Æ×Ì. .­Jȉ */
+	$"67AD 0673 32A0 B6BA 087E 7279 19C2 025F"            /* g­.s2 ¶º.~ry.Â._ */
+	$"DB0E 0E97 02D9 2268 5BCA CDE6 B94E 8D9B"            /* Û..—.Ù"h[ÊÍæ¹N�› */
+	$"03EB D786 1698 2D8A 2ECD 432E D615 931F"            /* .ë׆.˜-Š.ÍC.Ö.“. */
+	$"452B 5D40 0950 5BBE A70F BD95 9F0E 8B95"            /* E+]@ÆP[¾§.½•Ÿ.‹• */
+	$"86B7 47DE 0757 BFE4 9775 3082 9D22 863A"            /* †·GÞ.W¿ä—u0‚�"†: */
+	$"E404 B84C 5E88 8424 31DD 689A D234 88E2"            /* ä.¸L^ˆ„$1ÝhšÒ4ˆâ */
+	$"971F 9E59 429C 6C7E 3670 8F7C 8F86 A80D"            /* —.žYBœl~6p�|�†¨. */
+	$"848E E78B 5331 058E E444 FEC2 269A 7E23"            /* „Žç‹S1.ŽäDþÂ&š~# */
+	$"608D 0502 E075 F7A4 DACF 515F AA08 31C1"            /* `�..àu÷¤ÚÏQ_ª.1Á */
+	$"1275 02C0 F37E F465 ADE9 1918 F1F0 0E4F"            /* .u.Àó~ôe­é..ñð.O */
+	$"E5A4 41A5 F655 22D9 946A 7FEC 0720 3D3A"            /* å¤A¥öU"Ù”j.ì. =: */
+	$"4961 05B2 F02D 51D2 1212 084B B3EA 5DC9"            /* Ia.²ð-QÒ...K³ê]É */
+	$"F986 5763 A2AC E2AC 1144 5DC3 E6A5 D092"            /* ù†Wc¢¬â¬.D]Ãæ¥Ð’ */
+	$"3654 3737 A598 21C2 34FF 097C B8B8 5934"            /* 6T77¥˜!Â4ÿÆ|¸¸Y4 */
+	$"C947 05C9 B4BA F52B 99FF 3AFE 6B15 2CAE"            /* ÉG.É´ºõ+™ÿ:þk.,® */
+	$"06CF D962 CCDE D937 D4AE B3D9 7E92 E2AF"            /* .ÏÙbÌÞÙ7Ô®³Ù~’⯠*/
+	$"8F4E 31CE 06E7 0AD8 71DB 4456 7101 E221"            /* �N1Î.çÂØqÛDVq.â! */
+	$"74AC 1159 9EDF 9841 CFA3 E04F DECF 6FD3"            /* t¬.Yžß˜AÏ£àOÞÏoÓ */
+	$"90CC C22F 63B0 45CC C98B 3125 33C0 CFBA"            /* �ÌÂ/c°EÌÉ‹1%3ÀϺ */
+	$"4CE7 3FAD F2E4 85E7 0C74 35A5 97E9 8672"            /* Lç?­òä…ç.t5¥—é†r */
+	$"9180 E059 EF0F C416 E25F 0E83 095A 36AA"            /* ‘€àYï.Ä.â_.ƒÆZ6ª */
+	$"8E74 F1F7 11A8 49DD C47E 5098 D576 DC41"            /* Žtñ÷.¨IÝÄ~P˜ÕvÜA */
+	$"D6FC 7C37 E307 A2DB 997E A046 C114 CF04"            /* Öü|7ã.¢Û™~ FÁ.Ï. */
+	$"FD8E 32D1 2AC6 3A81 C8B6 C680 6E60 7826"            /* ýŽ2Ñ*Æ:�ȶƀn`x& */
+	$"9A40 9C80 BA1B 4DE8 854B 09D9 33B3 95BE"            /* š@œ€º.Mè…KÆÙ3³•¾ */
+	$"7CE5 CCA3 C463 5D1C 1F2B A160 E208 AA0A"            /* |åÌ£Äc]..+¡`â.ªÂ */
+	$"D00F 1933 5FB5 2705 4E9C 3733 0FD0 2AA0"            /* Ð..3_µ'.Nœ73.Ð*  */
+	$"D116 F240 05EA 53BB 5A5A 0A4B 3D9E FCB7"            /* Ñ.ò@.êS»ZZÂK=žü· */
+	$"FE35 1D0B 1E56 C4AA 9B6C 8CE6 10CA DAA5"            /* þ5...VĪ›lŒæ.ÊÚ¥ */
+	$"6DF1 6F74 C332 BD93 556E 89F5 A94A 232D"            /* mñotÃ2½“Un‰õ©J#- */
+	$"E9EF C950 666C 7D3E D1BA C98F 4489 3C5D"            /* éïÉPfl}>ѺÉ�D‰<] */
+	$"F7FC 88D4 C90E EE9D 7691 C976 2CFE 6BA0"            /* ÷üˆÔÉ.î�v‘Év,þk  */
+	$"B53E 5C59 749E FEBC 4AB4 490C A3B6 5187"            /* µ>\Ytžþ¼J´I.£¶Q‡ */
+	$"4A10 1076 6348 AEC1 054B 0A98 9196 29C3"            /* J..vcH®Á.K˜‘–)à */
+	$"F995 50E4 E003 F099 9495 7ECC 1C78 C536"            /* ù•Päà.ð™”•~Ì.xÅ6 */
+	$"AA8D 7305 BE7F FF72 99F7 25ED 4C38 0896"            /* ª�s.¾.ÿr™÷%íL8.– */
+	$"A1BE F2D4 016E B744 CBB7 9CEE 1C88 5E3D"            /* ¡¾òÔ.n·DË·œî.ˆ^= */
+	$"1B9E E3CB 29D2 AAA7 C3F6 41F4 B6C0 5861"            /* .žãË)Òª§ÃöAô¶ÀXa */
+	$"93D3 4773 858E 3470 E670 4F94 E206 FBA3"            /* “ÓGs…Ž4pæpO”â.û£ */
+	$"7050 2A3D 6DC0 004E 32D7 6043 4E5E C44F"            /* pP*=mÀ.N2×`CN^ÄO */
+	$"284A 3214 97B7 19DE 41C4 6204 56CB 1695"            /* (J2.—·.ÞAÄb.VË.• */
+	$"BAD8 C308 0FFE BEB7 FE14 C6AC CEE8 5022"            /* ºØÃ..þ¾·þ.ƬÎèP" */
+	$"C27A 2CCA 4714 4C52 3975 615D A1C8 62BF"            /* Âz,ÊG.LR9ua]¡Èb¿ */
+	$"C477 FF7E 2637 3B89 8C43 6E09 285B 2D1A"            /* Äwÿ~&7;‰ŒCnÆ([-. */
+	$"8E9E 4110 CE7B E30A E21C A140 02C8 D0AD"            /* ŽžA.Î{ãÂâ.¡@.ÈЭ */
+	$"630B 5488 7CE7 B884 393A 6FDD 5A68 7FB9"            /* c.Tˆ|縄9:oÝZh.¹ */
+	$"60EC C73B 143E 3F61 3E31 1A3E 8438 7944"            /* `ìÇ;.>?a>1.>„8yD */
+	$"B652 14AE 63CA 803C 9B67 C6FE 2F5D 4CD0"            /* ¶R.®cÊ€<›gÆþ/]LÐ */
+	$"3A63 1328 8809 A4AB B4A1 8664 FE90 F03E"            /* :c.(ˆÆ¤«´¡†dþ�ð> */
+	$"18E2 7982 7DDC A444 1306 4546 61B2 A710"            /* .ây‚}ܤD..EFa²§. */
+	$"CCED 529C 92CB D547 22F5 0DB0 B10F 8450"            /* ÌíRœ’ËÕG"õ.°±.„P */
+	$"E5AC 253A 6937 BFBD D0C6 8AED 14C7 787E"            /* å¬%:i7¿½ÐÆŠí.Çx~ */
+	$"21E7 860D 8567 633D A9E6 0466 93A5 6789"            /* !ç†.…gc=©æ.f“¥g‰ */
+	$"D643 2EEE 7542 7B02 086A 83C4 AD3C 785C"            /* ÖC.îuB{..jƒÄ­<x\ */
+	$"E3B4 BFC0 C27C 3762 1D98 0A0C B43D 8107"            /* ã´¿ÀÂ|7b.˜Â.´=�. */
+	$"3003 FF74 C626 1BC1 44AA 08A0 7A68 0ADE"            /* 0.ÿtÆ&.ÁDª. zhÂÞ */
+	$"E9BD 94DB 3644 AA13 CFCA A9CB 0E8F 9061"            /* é½”Û6Dª.ÏÊ©Ë.��a */
+	$"73BC 6A23 359D C129 F184 4EBA BE0F A772"            /* s¼j#5�Á)ñ„Nº¾.§r */
+	$"9AB6 7DDC C179 81DB 9FDC EDA3 E6C5 21E2"            /* š¶}ÜÁy�ÛŸÜí£æÅ!â */
+	$"7049 87BC 00E3 34F5 8066 3FFE 7CA7 A588"            /* pI‡¼.ã4õ€f?þ|§¥ˆ */
+	$"6277 30DE 8FC1 950A A652 5B12 B0A4 B8BE"            /* bw0Þ�Á•Â¦R[.°¤¸¾ */
+	$"2297 4261 CB90 AEBB F3CB 2BEE 2FA8 149E"            /* "—BaË�®»óË+î/¨.ž */
+	$"11E6 487B 3EFA 45B9 E4A8 17DF DF8E D5FF"            /* .æH{>úE¹ä¨.ßߎÕÿ */
+	$"750C 2E52 4F3F 5960 B3B7 3DEB CFE3 4EC3"            /* u..RO?Y`³·=ëÏãNà */
+	$"676F D76A F8C3 67EB 383B 042A C000 1CF5"            /* go×jøÃgë8;.*À..õ */
+	$"FB57 51DF 4E0F 9709 4A58 F371 8A53 79CD"            /* ûWQßN.—ÆJXóqŠSyÍ */
+	$"B935 29C8 5953 BBFB B216 24F0 FF5C F1BE"            /* ¹5)ÈYS»û².$ðÿ\ñ¾ */
+	$"1649 C9BE 754A CC45 62C3 44A2 3E12 A872"            /* .IɾuJÌEbÃD¢>.¨r */
+	$"736B 05DD F77C C7C6 F33D 8224 147E D163"            /* sk.Ý÷|ÇÆó=‚$.~Ñc */
+	$"02B4 0BC6 297A FA75 03A7 BFDD 709A A878"            /* .´.Æ)zúu.§¿Ýpš¨x */
+	$"734A 7236 791A BFF6 9F21 CC67 268D 160D"            /* sJr6y.¿öŸ!Ìg&�.. */
+	$"A6D0 7988 72CF 6475 146C 81EB 8249 518A"            /* ¦ÐyˆrÏdu.l�ë‚IQŠ */
+	$"49B7 0389 FDB6 9CEB DCA2 41ED 085D 4E85"            /* I·.‰ý¶œëÜ¢Aí.]N… */
+	$"03E4 3F4E D8CF 25E1 658D 38F6 8F88 A499"            /* .ä?NØÏ%áe�8ö�ˆ¤™ */
+	$"B64A DD79 FDF2 39FB 5CEC F29B 714A 733B"            /* ¶JÝyýò9û\ìò›qJs; */
+	$"76E4 94E5 F567 3A71 28F0 13A6 7A74 CD91"            /* vä”åõg:q(ð.¦ztÍ‘ */
+	$"5804 065E D3C7 09B7 ED19 51E5 0913 4436"            /* X..^ÓÇÆ·í.QåÆ.D6 */
+	$"9791 BB58 10F3 7183 5DB6 4874 65D2 AAD2"            /* —‘»X.óqƒ]¶HteÒªÒ */
+	$"DBA2 C761 A70F 3EEE 9256 2EF0 945D E52D"            /* Û¢Ça§.>î’V.ð”]å- */
+	$"34CF 10DF B2AF 8E14 A5A4 E24F 0051 F63E"            /* 4Ï.ß²¯Ž.¥¤âO.Qö> */
+	$"F11C 5DAC 6D8D DEDD A585 96FC A2AB A5FF"            /* ñ.]¬m�ÞÝ¥…–ü¢«¥ÿ */
+	$"5298 6349 DB41 9276 C1C6 F1E2 9ABF 822B"            /* R˜cIÛA’vÁÆñâš¿‚+ */
+	$"346F 8679 726C 666A 9638 246A EABE 54A9"            /* 4o†yrlfj–8$jê¾T© */
+	$"49DD F22A BC62 5867 51F2 FDBD B33B 40E0"            /* IÝò*¼bXgQòý½³;@à */
+	$"220F 075D 031C EAAE 3CDE 67CF 2269 E26D"            /* "..]..ê®<ÞgÏ"iâm */
+	$"BEF3 1873 E610 D43E 8F03 A14F F04F 980B"            /* ¾ó.sæ.Ô>�.¡OðO˜. */
+	$"69FF 1E4A 1925 DDE6 B473 84B5 6F53 75DD"            /* iÿ.J.%Ýæ´s„µoSuÝ */
+	$"CF71 C4C0 72DC 5403 7E7B 1A9B 6F16 BA87"            /* ÏqÄÀrÜT.~{.›o.º‡ */
+	$"A44D D4A2 8029 E15A 8C17 BE55 A30B 87B3"            /* ¤MÔ¢€)áZŒ.¾U£.‡³ */
+	$"DC5B CED9 2E4C A8F3 939B 6F82 8885 9BD5"            /* Ü[ÎÙ.L¨ó“›o‚ˆ…›Õ */
+	$"905B 6EE2 E3C9 D45E DE91 DD46 7EDD 23BB"            /* �[nâãÉÔ^Þ‘ÝF~Ý#» */
+	$"6852 2BD3 3D31 2755 2D1B 7431 35EB 6CBD"            /* hR+Ó=1'U-.t15ël½ */
+	$"638C 9E5D F0EB 9AE0 49BC D327 7536 BCB3"            /* cŒž]ðëšàI¼Ó'u6¼³ */
+	$"65F1 992B E073 9D25 980D A244 7F9E 749F"            /* eñ™+às�%˜.¢D.žtŸ */
+	$"53BD D08A C5EF 64A2 D672 7A55 9146 5CAD"            /* S½ÐŠÅïd¢ÖrzU‘F\­ */
+	$"7839 E1B6 7543 4556 146E C347 33E3 2798"            /* x9á¶uCEV.nÃG3ã'˜ */
+	$"4752 6F78 AAA5 AE5E 7B02 CD92 D5F1 FD30"            /* GRoxª¥®^{.Í’Õñý0 */
+	$"F78A 7BFB 03AB CF34 58BF 3810 B8A7 CDAB"            /* ÷Š{û.«Ï4X¿8.¸§Í« */
+	$"A573 658E 260A 7C50 000F 00AC D13F 618E"            /* ¥seŽ&Â|P...¬Ñ?aŽ */
+	$"A241 9458 3945 9D59 3F9B 13C5 04CC 600E"            /* ¢A”X9E�Y?›.Å.Ì`. */
+	$"FC51 8C8D FBA0 4150 5832 4539 730B 4631"            /* üQŒ�û APX2E9s.F1 */
+	$"0598 EE14 817C B560 97C5 B953 64D4 980D"            /* .˜î.�|µ`—ŹSdÔ˜. */
+	$"C379 6FFF 3E63 6746 7BE8 D3AB 5215 B47F"            /* Ãyoÿ>cgF{èÓ«R.´. */
+	$"3CAE 42E4 D4BF B7BF 6580 3319 6A71 C2E9"            /* <®BäÔ¿·¿e€3.jqÂé */
+	$"48AA 2C5E 9D78 B9C3 F8DA B858 D5AB 99F4"            /* Hª,^�x¹ÃøÚ¸XÕ«™ô */
+	$"B04F EAAC D0DE 2302 F874 7E64 A69B 89CE"            /* °Oê¬ÐÞ#.øt~d¦›‰Î */
+	$"AEAB A73F F815 0D06 B24E 39EC D8E9 EFB7"            /* ®«§?ø...²N9ìØéï· */
+	$"ED32 55A0 8E21 B52A E55C 17AE E07B 42F4"            /* í2U Ž!µ*å\.®à{Bô */
+	$"D451 CB7C E941 1578 3EE3 9565 087E 9A05"            /* ÔQË|éA.x>ã•e.~š. */
+	$"B5FC 403A AAA2 25CE 5AC1 B658 1EE9 9A53"            /* µü@:ª¢%ÎZÁ¶X.éšS */
+	$"4000 51DF 95E8 C605 97AC C7E1 A8B1 F86C"            /* @.Qß•èÆ.—¬Çᨱøl */
+	$"7C3F 0BCC E410 8FA7 78C0 7964 BDD0 E341"            /* |?.Ìä.�§xÀyd½ÐãA */
+	$"5DC5 D977 EF99 460C FC48 A51A B5CD DE47"            /* ]ÅÙwï™F.üH¥.µÍÞG */
+	$"F9E2 194D 1F2D B2B6 556B 0F68 BD1B 5BEA"            /* ùâ.M.-²¶Uk.h½.[ê */
+	$"9FDD 1280 92A3 EF96 132C 22F6 CA8A 1C20"            /* ŸÝ.€’£ï–.,"öÊŠ.  */
+	$"54DA F163 6119 BC02 7AE6 10CA A16B 993A"            /* TÚñca.¼.zæ.Ê¡k™: */
+	$"E22B CC58 D181 40E6 EA99 0897 5166 4C1F"            /* â+ÌXÑ�@æê™.—QfL. */
+	$"6D58 D092 5119 1AF5 0C2B 1DC6 029D F0E8"            /* mXÐ’Q..õ.+.Æ.�ðè */
+	$"1F6F 9F5C 17D8 68A0 F600 5C68 5C16 4269"            /* .oŸ\.Øh ö.\h\.Bi */
+	$"F5A9 4D97 32DE 3A9C 6609 86C2 1D0F BA56"            /* õ©M—2Þ:œfƆÂ..ºV */
+	$"3C8C 1046 E0DC 2ECB 9BDB D61E 6955 CE38"            /* <Œ.FàÜ.Ë›ÛÖ.iUÎ8 */
+	$"DB97 859B 9E73 78BF FDEB ED74 0C4E 4203"            /* Û—…›žsx¿ýëít.NB. */
+	$"431D 69C4 635D D1EA 1A9A 6462 BE48 DDB9"            /* C.iÄc]Ñê.šdb¾Hݹ */
+	$"6E63 C4D8 8886 51CB 19E6 A7C9 5941 8443"            /* ncÄ؈†QË.æ§ÉYA„C */
+	$"57E5 8C3B B907 FF17 4B41 08DA 7AFC 1B8B"            /* WåŒ;¹.ÿ.KA.Úzü.‹ */
+	$"9B05 622E 1F81 91D8 2C60 9C6A 3B23 608B"            /* ›.b..�‘Ø,`œj;#`‹ */
+	$"F2EC E527 70F9 D963 D302 D7AC 18E2 2692"            /* òìå'pùÙcÓ.׬.â&’ */
+	$"AE0C D915 7E30 5B09 305C 8F5D 1346 3FF2"            /* ®.Ù.~0[Æ0\�].F?ò */
+	$"8635 ECEC 1CB7 962D 0846 3FA9 5920 C1B0"            /* †5ìì.·–-.F?©Y Á° */
+	$"5582 FF3A 24E0 FAAE 8FAE 3843 DFCF B74F"            /* U‚ÿ:$àú®�®8CßÏ·O */
+	$"CAEC 5602 D1C5 1760 5ECD 92C8 1DD1 4ABE"            /* ÊìV.ÑÅ.`^Í’È.ÑJ¾ */
+	$"2336 8A90 E444 6753 D3E0 0F02 8E99 7393"            /* #6Š�äDgSÓà..Ž™s“ */
+	$"8B26 6C9F BFB4 64DE 7867 73F7 10F0 477A"            /* ‹&lŸ¿´dÞxgs÷.ðGz */
+	$"8383 ADA5 49C3 722B 1FD7 0BB5 4118 4714"            /* ƒƒ­¥IÃr+.×.µA.G. */
+	$"D5F9 6C20 CDD0 8151 EAB4 457F FF4E 314C"            /* Õùl ÍÐ�Qê´E.ÿN1L */
+	$"6E7F 04DB DE0C 611B 62AC 2A4E 869C 06FB"            /* n..ÛÞ.a.b¬*N†œ.û */
+	$"DB81 F238 C4FC 149E 8176 3F0C 4B83 0DFF"            /* Û�ò8Äü.ž�v?.Kƒ.ÿ */
+	$"7FB4 A5F5 80C7 E4F0 47AD 8D3F 5426 B12A"            /* .´¥õ€ÇäðG­�?T&±* */
+	$"8678 11E1 A0EF 5439 31D8 E97E 3AE9 E4DD"            /* †x.á ïT91Øé~:éäÝ */
+	$"3DB7 4A94 7FFF 7135 0C02 ACE2 70F5 626B"            /* =·J”.ÿq5..¬âpõbk */
+	$"271A 4401 DF00 AE70 E43B D3F8 75AD 0DAB"            /* '.D.ß.®pä;Óøu­.« */
+	$"794A C0C7 928F 8621 BE61 DA60 A89F 8E95"            /* yJÀÇ’�†!¾aÚ`¨ŸŽ• */
+	$"64E1 4B82 9CA5 D1CB 26FA 3B49 2FDF 8007"            /* dáK‚œ¥ÑË&ú;I/߀. */
+	$"60B1 1C23 B192 973E 87DD 9323 E697 CA76"            /* `±.#±’—>‡Ý“#æ—Êv */
+	$"03D6 B09A 33FA 5CEC 856D 1D12 5249 2492"            /* .Ö°š3ú\ì…m..RI$’ */
+	$"4924 9249 2492 4924 9231 8B0A C6C2 C882"            /* I$’I$’I$’1‹ÂÆÂÈ‚ */
+	$"FC66 E59C E646 38B0 B26F A097 FEA2 30FE"            /* üfåœæF8°²o —þ¢0þ */
+	$"F5B9 90DC 3FEF 3116 73C4 7B20 6C09 EA40"            /* õ¹�Ü?ï1.sÄ{ lÆê@ */
+	$"AB90 6257 8BAD 951C 002E 138D 7274 121D"            /* «�bW‹­•....�rt.. */
+	$"B91E 66F5 6038 8257 FD9A 18C9 0155 522C"            /* ¹.fõ`8‚Wýš.É.UR, */
+	$"D6CC 0F6A 6A4A 09F3 0C4A B702 47FF 7FFC"            /* ÖÌ.jjJÆó.J·.Gÿ.ü */
+	$"B504 0034 6682 CE19 CA7C 50BE F8B0 9DCB"            /* µ..4f‚Î.Ê|P¾ø°�Ë */
+	$"0092 4924 9248 F298 B4D2 A612 6CEE 878F"            /* .’I$’Hò˜´Ò¦.lî‡� */
+	$"FF7F FF5F 8F59 B3E0 FE9F A74E 506D C924"            /* ÿ.ÿ_�Y³àþŸ§NPmÉ$ */
+	$"9249 2492 4924 9249 2492 4924 924D 57A2"            /* ’I$’I$’I$’I$’MW¢ */
+	$"2CC8 426C 393A 96E4 50FB 0ACE 8874 7A86"            /* ,ÈBl9:–äPûÂΈtz† */
+	$"2B20 84D4 0F34 1532 DFF0 D633 0231 0F65"            /* + „Ô.4.2ßðÖ3.1.e */
+	$"91D1 8E19 A917 CD2A 8D35 89BE F64E D1A8"            /* ‘ÑŽ.©.Í*�5‰¾öNѨ */
+	$"926C AE06 3A49 80F9 C1FE 0E81 52D8 5A8C"            /* ’l®.:I€ùÁþ.�RØZŒ */
+	$"7A00 5EF2 9F04 3659 74EC D695 94B6 5B90"            /* z.^òŸ.6YtìÖ•”¶[� */
+	$"89C0 E661 DFC4 5E69 965B 4D1D 4B76 7C0E"            /* ‰ÀæaßÄ^i–[M.Kv|. */
+	$"89D2 C1E8 B1EF CF9E 5E96 3977 AEA6 532B"            /* ‰ÒÁè±ïÏž^–9w®¦S+ */
+	$"68B1 BD73 2BE6 BB5B 766E FA91 5C36 628C"            /* h±½s+æ»[vnú‘\6bŒ */
+	$"F45F FEEA C7DF 49F0 278F F459 E9B6 BDAC"            /* ô_þêÇßIð'�ôY鶽¬ */
+	$"1A28 F485 45C5 2761 DC37 C72A 8A17 2D08"            /* .(ô…EÅ'aÜ7Ç*Š.-. */
+	$"5130 E9D5 E1BD 2D59 07B5 2290 00F9 F737"            /* Q0éÕá½-Y.µ"�.ù÷7 */
+	$"C1F4 5C78 1058 C4C6 13AB AE5C 45DE ACB4"            /* Áô\x.XÄÆ.«®\EÞ¬´ */
+	$"7DC9 03C4 0F82 7850 6F9E 5FD3 9223 36FE"            /* }É.Ä.‚xPož_Ó’#6þ */
+	$"8A1D 1D99 FBB3 646B 206B FC7E 668E 4730"            /* Š..™û³dk kü~fŽG0 */
+	$"7C8C 79D9 A37A 427B 1E91 E7A1 DED2 E57D"            /* |ŒyÙ£zB{.‘ç¡ÞÒå} */
+	$"E167 967A 8B9F A6C0 A36F 68E8 D03C 84C6"            /* ág–z‹Ÿ¦À£ohèÐ<„Æ */
+	$"E952 3CAF 039F 18CD 236C 4AE1 FB74 D7F6"            /* éR<¯.Ÿ.Í#lJáût×ö */
+	$"DFBF B7A4 AFDB D27E 2FB7 7BBF 86F0 DF6F"            /* ß¿·¤¯ÛÒ~/·{¿†ðßo */
+	$"4F9F C3A7 EC7F 0D0F BEDB 1EFB 77AA FB77"            /* OŸÃ§ì...¾Û.ûwªûw */
+	$"2CED 1CDE F39E A2F3 567D 91E9 4703 B8A2"            /* ,í.Þóž¢óV}‘éG.¸¢ */
+	$"5006 2494 6271 81F3 3B95 0B89 EDD5 7FE8"            /* P.$”bq�ó;•.‰íÕ.è */
+	$"B864 3D84 75CD 7478 A5D6 28C8 D483 39EF"            /* ¸d=„uÍtx¥Ö(ÈÔƒ9ï */
+	$"86CA 5763 87CA 97CF A9D4 AFA9 0450 6744"            /* †ÊWc‡Ê—Ï©Ô¯©.PgD */
+	$"16E3 8C0B 0015 88DA 5244 1AB2 9790 35B0"            /* .ãŒ...ˆÚRD.²—�5° */
+	$"0489 B911 D871 2BB4 6576 C185 22B7 1F86"            /* .‰¹.Øq+´evÁ…"·.† */
+	$"230A 3CD3 ECB5 20A6 23BA A068 A53E 8EAD"            /* #Â<Óìµ ¦#º h¥>Ž­ */
+	$"3793 46B5 BA07 96A8 DF28 6A66 CE05 73CE"            /* 7“Fµº.–¨ß(jfÎ.sÎ */
+	$"1938 F9A6 9CBC 0D7F F193 E0D5 09CC 3426"            /* .8ù¦œ¼..ñ“àÕÆÌ4& */
+	$"4BB1 52B9 F337 0537 FA01 B010 5471 B015"            /* K±R¹ó7.7ú.°.Tq°. */
+	$"754C A1A6 E071 800C 1A26 243D 172B 1497"            /* uL¡¦àq€..&$=.+.— */
+	$"E5DF 1EB1 6A6C 6761 3BA6 52C0 C0B4 69BD"            /* åß.±jlga;¦RÀÀ´i½ */
+	$"E6B4 275E EB6E 42BF D693 8928 15A4 9DB2"            /* æ´'^ënB¿Ö“‰(.¤�² */
+	$"D8FA E273 6C04 CBB5 06A9 8096 5E97 5D11"            /* Øúâsl.˵.©€–^—]. */
+	$"0B1B 8E93 BDCC 1AE8 4CBA 9413 A729 F6A7"            /* ..Ž“½Ì.èLº”.§)ö§ */
+	$"F24D 467F 0316 BF60 F777 C2E3 7FAA DC07"            /* òMF...¿`÷wÂã.ªÜ. */
+	$"148F 5C26 91C3 20B8 F3A0 9088 F893 6D47"            /* .�\&‘à ¸ó �ˆø“mG */
+	$"7AC1 A0D9 5483 8281 5B98 28AE 9EAB 94F0"            /* zÁ ÙTƒ‚�[˜(®ž«”ð */
+	$"9B68 08E3 E3DA 7E3A AA84 9EED F083 117F"            /* ›h.ããÚ~:ª„žíðƒ.. */
+	$"FE75 781E E394 EEEC F9AC 21D6 FF5E DD57"            /* þux.ã”îìù¬!Öÿ^ÝW */
+	$"96CF A7DF 3C0D 7E2F F9E7 F212 83EE E629"            /* –ϧß<.~/ùçò.ƒîæ) */
+	$"9543 AA61 C10A 4B12 1DD8 6835 405A D739"            /* •CªaÁÂK..Øh5@Z×9 */
+	$"DBD7 1628 2816 909D 1DEB 81F2 16AF 8953"            /* Û×.((.��.ë�ò.¯‰S */
+	$"9239 B79D A64A 3275 E506 BFD3 0198 776C"            /* ’9·�¦J2uå.¿Ó.˜wl */
+	$"F4C2 39CD 4CF8 2482 D781 526A 7D82 0B83"            /* ôÂ9ÍLø$‚×�Rj}‚.ƒ */
+	$"120C B2AB 1FC0 2DAA 4A72 ACD9 B4C7 926A"            /* ..²«.À-ªJr¬Ù´Ç’j */
+	$"CE69 46FA C67E 904D 12D4 D6EC 2F77 AC43"            /* ÎiFúÆ~�M.ÔÖì/w¬C */
+	$"0A82 A09A 8FAC 59F0 D192 4F8F E6D1 A8B3"            /* ‚ š�¬YðÑ’O�æѨ³ */
+	$"26FD EAD1 7727 E253 F826 580D 8786 8EAD"            /* &ýêÑw'âSø&X.‡†Ž­ */
+	$"4561 33FC 6C93 72E4 3F53 3E92 5E78 9597"            /* Ea3ül“rä?S>’^x•— */
+	$"895F 61B9 D382 514D 839E D4E8 A40B 6F99"            /* ‰_a¹Ó‚QMƒžÔè¤.o™ */
+	$"0BEC 889F F976 6F24 AEAC 2A18 479B 9CD0"            /* .숟ùvo$®¬*.G›œÐ */
+	$"A58D E4A8 4940 D7A9 26A7 8649 C387 22EB"            /* ¥�ä¨I@ש&§†IÇ"ë */
+	$"10F3 AB7F 805D 57F4 6918 508A 429D FC32"            /* .ó«.€]Wôi.PŠB�ü2 */
+	$"0E49 3480 E5A6 0267 54A6 D677 422D 1B62"            /* .I4€å¦.gT¦ÖwB-.b */
+	$"4DFB C3A4 2E01 8C0D 029D D238 87B0 230E"            /* Mûä..Œ..�Ò8‡°#. */
+	$"AB6E AEFD 64F3 F7AE 7BD7 DA13 2BCC DCFB"            /* «n®ýdó÷®{×Ú.+ÌÜû */
+	$"13EC E7EE A36F 86C6 A2D8 DD70 6174 04FA"            /* .ìçî£o†Æ¢ØÝpat.ú */
+	$"B7F7 A3BF 9C4C F99C C177 9B27 9148 3998"            /* ·÷£¿œLùœÁw›'‘H9˜ */
+	$"013A 4B0C E3A5 6905 6ADC 739C 3586 7009"            /* .:K.ã¥i.jÜsœ5†pÆ */
+	$"38DA 0496 C25E DFB2 F2AB 34C0 F138 4F81"            /* 8Ú.–Â^ß²ò«4Àñ8O� */
+	$"7240 2774 4588 B153 267B DBBE DFDE AEAD"            /* r@'tEˆ±S&{Û¾ßÞ®­ */
+	$"1D90 BA71 2B83 D108 1CDB 8B36 7837 8AAA"            /* .�ºq+ƒÑ..Û‹6x7Šª */
+	$"299C 2916 D66C CC2E 2FCF B0E3 228A 88C1"            /* )œ).ÖlÌ./Ï°ã"ŠˆÁ */
+	$"568F 12D8 D599 AB3F 29DE 1FA6 9336 132F"            /* V�.ØÕ™«?)Þ.¦“6./ */
+	$"521E 8EB9 9BD4 30E4 362E 349E 209A 6EB6"            /* R.Ž¹›Ô0ä6.4ž šn¶ */
+	$"D5CC 985B E51E 8A74 B9A0 1718 2753 A1E0"            /* Õ̘[å.Št¹ ..'S¡à */
+	$"BDCC 77CC 5697 641D B916 AB08 C12F 102F"            /* ½ÌwÌV—d.¹.«.Á/./ */
+	$"59A0 4283 27A8 9F9E 1980 381A 4785 E896"            /* Y Bƒ'¨Ÿž.€8.G…è– */
+	$"B9C8 A383 0C1E EBDE A8DC D1A0 00FB 61C2"            /* ¹È£ƒ..ëÞ¨ÜÑ .ûa */
+	$"70F1 84C8 8368 337E DA6C 7A1A 014F 77C3"            /* pñ„ȃh3~Úlz..Owà */
+	$"EFFF 0CCC F88E E539 B4FF 3187 54EA 4B2E"            /* ïÿ.ÌøŽå9´ÿ1‡TêK. */
+	$"27BF 1121 0DCD 456F 5AB4 E115 9E30 8B1C"            /* '¿.!.ÍEoZ´á.ž0‹. */
+	$"FCFB 8634 E35F E3F0 2A65 8EC0 775F C0EE"            /* üû†4ã_ãð*eŽÀw_Àî */
+	$"37B2 6C5A AA44 2B7C 889A 5854 FBB4 DC29"            /* 7²lZªD+|ˆšXTû´Ü) */
+	$"E875 94AB D4F4 19C2 5989 594D 6B55 CB5E"            /* èu”«Ôô.ÂY‰YMkUË^ */
+	$"012C A350 BF1C 322E 6DC6 6CFB 052A B48D"            /* .,£P¿.2.mÆlû.*´� */
+	$"2FFE D908 D443 2FB2 706F 13A8 B2BF 2E97"            /* /þÙ.ÔC/²po.¨²¿.— */
+	$"D7EF 6FE2 7D0B 4D6C 89E6 24BB D547 A266"            /* ×ïoâ}.Ml‰æ$»ÕG¢f */
+	$"3B92 FF58 BE83 0D95 D587 B51D B83A B360"            /* ;’ÿX¾ƒ.•Õ‡µ.¸:³` */
+	$"DF16 A55F 5D17 5ED7 C7D7 88FD D24B 89C4"            /* ß.¥_].^×Ç׈ýÒK‰Ä */
+	$"17FF 1CE0 2FC5 E332 79FF 6532 D599 2C36"            /* .ÿ.à/Åã2yÿe2Õ™,6 */
+	$"7360 56F2 6017 1165 F8CD AC09 6435 530F"            /* s`Vò`..eøͬÆd5S. */
+	$"8E48 0152 06AE 7F31 9D5A A12E EC4A 26BD"            /* ŽH.R.®.1�Z¡.ìJ&½ */
+	$"1D28 2D81 EBF2 625A 03C8 8240 FAB0 343C"            /* .(-�ëòbZ.È‚@ú°4< */
+	$"3460 4650 A369 CBAF D533 EC55 DB4D 46F7"            /* 4`FP£i˯Õ3ìUÛMF÷ */
+	$"45C4 1B75 581D CC26 9E29 8B0F C424 5512"            /* EÄ.uX.Ì&ž)‹.Ä$U. */
+	$"9417 F11C 77C1 F3FD 57B1 487F D8F8 A086"            /* ”.ñ.wÁóýW±H.Øø † */
+	$"E60E 2356 E9E1 F3EC 7F31 52E1 E3DB C75E"            /* æ.#Véáóì.1RáãÛÇ^ */
+	$"7A4B 2D19 8F06 AB86 5A88 F23D C312 C565"            /* zK-.�.«†Zˆò=Ã.Åe */
+	$"1AF0 4B35 F0D9 D100 6634 A377 90C1 A69A"            /* .ðK5ðÙÑ.f4£w�Á¦š */
+	$"1C64 495A BEF2 5A5C 1714 0504 2639 71A2"            /* .dIZ¾òZ\....&9q¢ */
+	$"5989 FF6E F887 5ADD 9843 A719 60CC 5185"            /* Y‰ÿnø‡ZݘC§.`ÌQ… */
+	$"B308 2551 F63A 7543 2A92 3949 FCC5 5023"            /* ³.%Qö:uC*’9IüÅP# */
+	$"5A92 FE32 A26E FF00 9CFC 0CFF 4A08 60C7"            /* Z’þ2¢nÿ.œü.ÿJ.`Ç */
+	$"F76C 480A E682 3C58 66B8 7045 CDBA 616C"            /* ÷lHÂæ‚<Xf¸pEͺal */
+	$"9995 BEC1 809B 0892 A7EC 43EC 7FE8 F49F"            /* ™•¾Á€›.’§ìCì.èôŸ */
+	$"9E4B AFD6 66BB 0B88 38ED B165 9C1D F096"            /* žK¯Öf».ˆ8í±eœ.ð– */
+	$"64EC FD43 9A7A BC84 8CEF 2E65 F99B 4B43"            /* dìýCšz¼„Œï.eù›KC */
+	$"7D47 3AE8 D0DB A066 308B 201D FF3F ABC1"            /* }G:èÐÛ f0‹ .ÿ?«Á */
+	$"CD0D B822 3734 A23E AF05 D1E1 F9F5 AF09"            /* Í.¸"74¢>¯.Ñáùõ¯Æ */
+	$"6428 F517 1201 C3F1 1B80 0DD2 DCD9 CA31"            /* d(õ...Ãñ.€.ÒÜÙÊ1 */
+	$"B022 DAFB D990 A8B1 6FF1 004E 4847 E5C8"            /* °"ÚûÙ�¨±oñ.NHGåÈ */
+	$"0580 DA86 704F E2FF 7E83 5167 5C3F ADB2"            /* .€Ú†pOâÿ~ƒQg\?­² */
+	$"4C44 A9D9 DB84 C360 68ED 1BF0 068E 04BF"            /* LD©ÙÛ„Ã`hí.ð.Ž.¿ */
+	$"D16E B55F 0701 3739 42FA E15C 0EA2 BF81"            /* Ñnµ_..79Búá\.¢¿� */
+	$"31C1 F1A3 A766 CAB8 C82E C96B 4868 D491"            /* 1Áñ£§fʸÈ.ÉkHhÔ‘ */
+	$"5ACB 6EED 4027 0C73 AACA 730C ECA6 DE42"            /* ZËní@'.sªÊs.ì¦ÞB */
+	$"38DA E07E CE64 BC49 7FDD FCCB 07B3 45BF"            /* 8Úà~Îd¼I.ÝüË.³E¿ */
+	$"B9DC FF13 039F D40E 43BB ACE4 B8F8 31F5"            /* ¹Üÿ..ŸÔ.C»¬ä¸ø1õ */
+	$"6743 9390 0B87 C9B1 194A 0200 FB53 29CD"            /* gC“�.‡É±.J..ûS)Í */
+	$"3141 15F5 3C38 9F70 2B7E 0E46 B5A7 5C94"            /* 1A.õ<8Ÿp+~.Fµ§\” */
+	$"AED4 E415 1639 7B49 20DA 1541 9742 A3A6"            /* ®Ôä..9{I Ú.A—B£¦ */
+	$"B873 4C7C 9112 1322 7D7F 5F6E 14AB 57FC"            /* ¸sL|‘.."}._n.«Wü */
+	$"A01D 94EC BC05 F45B C4C4 1FC3 D61B F5D3"            /*  .”ì¼.ô[ÄÄ.ÃÖ.õÓ */
+	$"0E62 9C2F CAE6 C609 B0D2 803B AF5F CC7F"            /* .bœ/ÊæÆÆ°Ò€;¯_Ì. */
+	$"4085 5B49 F81B 0AB3 DB0C 27C1 7A95 45D6"            /* @…[Iø.³Û.'Áz•EÖ */
+	$"CDDD 4F06 1A20 A7FE 22F6 EA13 EB6E C723"            /* ÍÝO.. §þ"öê.ënÇ# */
+	$"87B9 A058 CAF9 9F59 C9C9 6AAD 8358 5147"            /* ‡¹ XÊùŸYÉÉj­ƒXQG */
+	$"2B3E 2FD8 506F A48B 305C 97C7 5D25 5C75"            /* +>/ØPo¤‹0\—Ç]%\u */
+	$"C5B1 E7B4 CBC7 C76A 2FE5 1669 302C 2318"            /* űç´ËÇÇj/å.i0,#. */
+	$"CB1D BB38 5B47 3563 F041 0F00 C23A B1E9"            /* Ë.»8[G5cðA..Â:±é */
+	$"1972 D9C9 2F2F 4013 F8EF A6CA 7E8E 705C"            /* .rÙÉ//@.øï¦Ê~Žp\ */
+	$"0CB6 1301 5ED4 25E6 F7D9 999D AB8F 4CAC"            /* .¶..^Ô%æ÷Ù™�«�L¬ */
+	$"6FF2 04C8 8307 016C 6E46 645B 5488 79C0"            /* oò.ȃ..lnFd[TˆyÀ */
+	$"C0E5 8A2A 46EB DB4C 65A0 27FC 6230 781C"            /* ÀåŠ*FëÛLe 'üb0x. */
+	$"EDB8 4666 1604 1937 9603 A2AA D8C3 43A6"            /* í¸Ff...7–.¢ªØÃC¦ */
+	$"E254 D745 866F D24A DD91 397E C575 F187"            /* âT×E†oÒJÝ‘9~Åuñ‡ */
+	$"193B F5F5 819B 7D57 EC83 0871 ED1B 64F6"            /* .;õõ�›}Wìƒ.qí.dö */
+	$"E47A E1B0 65F9 67DF 5680 3642 52AA BB4B"            /* äzá°eùgßV€6BRª»K */
+	$"BA52 D8BA 8AF7 0A96 412A 92B2 045F 9739"            /* ºRغŠ÷–A*’²._—9 */
+	$"3A52 D961 6BC6 1D2E D90D 29A7 E9DE 2651"            /* :RÙakÆ..Ù.)§éÞ&Q */
+	$"CE3F 9921 03BC 7A7A CBFD 63E2 4C7C 9025"            /* Î?™!.¼zzËýcâL|�% */
+	$"BCC3 D509 745E 9AE4 1675 0242 26EE E4F6"            /* ¼ÃÕÆt^šä.u.B&îäö */
+	$"B04B CFB3 E37F EADB 2840 E47E 0209 C8C5"            /* °Kϳã.êÛ(@ä~.ÆÈÅ */
+	$"56FC 6228 BB57 F43A BE32 0753 73FB EAE2"            /* Vüb(»Wô:¾2.Ssûêâ */
+	$"55B4 D581 42C8 10B8 AEA9 67C4 F685 982C"            /* U´Õ�BÈ.¸®©gÄö…˜, */
+	$"3104 095F DCBD 3701 8749 9CBA A7A5 B714"            /* 1.Æ_ܽ7.‡Iœº§¥·. */
+	$"FDED FAA3 F034 54D8 728F 8640 4A61 560C"            /* ýíú£ð4TØr�†@JaV. */
+	$"50D4 B224 A5F1 6715 6C8B 7EC6 BF5C 120D"            /* PÔ²$¥ñg.l‹~Æ¿\.. */
+	$"8797 B25E B0E1 C57E 69AF 1FF2 99C3 44B5"            /* ‡—²^°áÅ~i¯.ò™ÃDµ */
+	$"0508 0061 1F44 795F 27C0 511E 0796 9740"            /* ...a.Dy_'ÀQ..–—@ */
+	$"14FF 4C51 5651 34F3 658D 4CA8 3FBF 43CC"            /* .ÿLQVQ4óe�L¨?¿CÌ */
+	$"8813 D372 1723 7DB5 6D44 4524 4E91 B644"            /* ˆ.Ór.#}µmDE$N‘¶D */
+	$"4B7D CDEC E0E0 8468 622D 87FE 80E3 E097"            /* K}Íìàà„hb-‡þ€ãà— */
+	$"303D 8894 1FFF 7FA6 9AAB C6E0 0B83 3EDD"            /* 0=ˆ”.ÿ.¦š«Æà.ƒ>Ý */
+	$"86A5 43D3 C650 0008 D364 A800 0000 0000"            /* †¥CÓÆP..Ód¨..... */
+	$"0000 07D7 8F92 61B9 E6E0 BCBF CD4A AB76"            /* ...×�’a¹æ༿ÍJ«v */
+	$"5B6E 246A 8DFB D274 41F9 3583 773D 5165"            /* [n$j�ûÒtAù5ƒw=Qe */
+	$"2139 B773 476E DF91 33F0 8CDA F420 613F"            /* !9·sGnß‘3ðŒÚô a? */
+	$"9B35 33C9 8298 A661 A5DB 2CEF 1A1C BC3E"            /* ›53É‚˜¦a¥Û,ï..¼> */
+	$"09B4 5415 8511 4FE5 3FF8 B88C 339D C169"            /* Æ´T.….Oå?ø¸Œ3�Ái */
+	$"9608 FF62 B2D6 285A 80A2 22C9 E4AA 5A99"            /* –.ÿb²Ö(Z€¢"ÉäªZ™ */
+	$"B3F5 E9D4 7FFF 7FF4 7D5C 4CC0 788F 0EB6"            /* ³õéÔ.ÿ.ô}\LÀx�.¶ */
+	$"8024 0000 0A1E 1F40 0000 0000 0000 0000"            /* €$..Â..@........ */
+	$"CA54 CF6A 897B B6D7 9C90 87E9 FF6A 22A0"            /* ÊTÏj‰{¶×œ�‡éÿj"  */
+	$"0765 4AE8 B827 B7A1 C412 4000 0000 0000"            /* .eJè¸'·¡Ä.@..... */
+	$"0000 2222 DAB7 AEED C4EB AFCB FF79 6610"            /* ..""Ú·®íÄë¯Ëÿyf. */
+	$"A362 D5F2 1401 DA9F 8978 3FC3 FF60 341C"            /* £bÕò..ÚŸ‰x?Ãÿ`4. */
+	$"524C CBF3 AF64 9BA4 637F F217 CA8C A4CE"            /* RLËó¯d›¤c.ò.ÊŒ¤Î */
+	$"A881 46DE C63F CB0B 4C86 F71C CDFF 6CDC"            /* ¨�FÞÆ?Ë.L†÷.ÍÿlÜ */
+	$"3C86 AFD6 02EF 25B3 E392 0238 14ED F9FF"            /* <†¯Ö.ï%³ã’.8.íùÿ */
+	$"71EA 1A7B 7848 281D C18D 83C1 F0D1 C115"            /* qê.{xH(.Á�ƒÁðÑÁ. */
+	$"C525 7E38 9E60 32A4 CED2 A5DE 8006 1212"            /* Å%~8ž`2¤ÎÒ¥Þ€... */
+	$"7136 14A1 74D1 9C7D F74C 708E 43DE 4154"            /* q6.¡tÑœ}÷LpŽCÞAT */
+	$"2939 179A 87BB 2AAF 7401 4404 CB30 458F"            /* )9.š‡»*¯t.D.Ë0E� */
+	$"F1B7 EE42 3E46 458F B220 6F30 EE24 7D86"            /* ñ·îB>FE�² o0î$}† */
+	$"2D28 3CA7 C184 60D3 4EBC 9C79 C402 02FC"            /* -(<§Á„`ÓN¼œyÄ..ü */
+	$"553C C62D DDC0 3D0C F12B C1FF 546D A4FF"            /* U<Æ-ÝÀ=.ñ+ÁÿTm¤ÿ */
+	$"5885 6B1B 9EF6 2206 8FB5 1CB0 2D3D B922"            /* X…k.žö".�µ.°-=¹" */
+	$"644F D104 0152 70F8 BF41 4D6E 4F05 B928"            /* dOÑ..Rpø¿AMnO.¹( */
+	$"396A 4A92 9B1B 24AB 4611 6D95 87D6 2D7C"            /* 9jJ’›.$«F.m•‡Ö-| */
+	$"7546 B839 A3B1 C612 0F2A 796E 7911 5FF9"            /* uF¸9£±Æ..*yny._ù */
+	$"03C4 D13E EF00 2DEF 9CFE FDDE 3A2C FF3E"            /* .ÄÑ>ï.-ïœþýÞ:,ÿ> */
+	$"4567 F432 3673 3F84 8787 B65C 7A4F 2007"            /* Egô26s?„‡‡¶\zO . */
+	$"FF7C D894 A762 3872 8FA4 9563 D178 5039"            /* ÿ|Ø”§b8r�¤•cÑxP9 */
+	$"C4BD 2EB4 0491 2A80 0000 0000 0000 0001"            /* Ľ.´.‘*€........ */
+	$"F172 6FA1 09F2 9F35 F3BC 2E0B 8E46 2557"            /* ñro¡ÆòŸ5ó¼..ŽF%W */
+	$"67C5 4F12 D1CF F08C BC61 0F89 E4A4 9249"            /* gÅO.ÑÏðŒ¼a.‰ä¤’I */
+	$"2492 4924 9249 221B 4708 65ED 84CA FDD2"            /* $’I$’I".G.eí„ÊýÒ */
+	$"D193 7C69 0CA3 95EF DDF2 33FF 556E D976"            /* Ñ“|i.£•ïÝò3ÿUnÙv */
+	$"2E4D FDCE E0FC 8669 83FF 768E 3CBB 179B"            /* .MýÎàü†iƒÿvŽ<».› */
+	$"DBB9 253D BFFF 79F1 5006 27BF 5548 40B9"            /* Û¹%=¿ÿyñP.'¿UH@¹ */
+	$"BADC F963 10BA 8BD9 367F E03A 6E29 5908"            /* ºÜùc.º‹Ù6.à:n)Y. */
+	$"0000 0000 0000 0000 0028 8080 0000 000A"            /* .........(€€... */
+	$"6370 D000 0142 83C0 0000 0011 CD3F D940"            /* cpÐ..BƒÀ....Í?Ù@ */
+	$"0022 C990 C912 501C 14FC 1926 5412 0E88"            /* ."É�É.P..ü.&T..ˆ */
+	$"C32F B2ED E7A4 9249 2492 4924 9249 247E"            /* Ã/²í礒I$’I$’I$~ */
+	$"FB2C 999E D2ED 6DFF 783B 4C3A 3DB7 14A5"            /* û,™žÒímÿx;L:=·.¥ */
+	$"872C 2B85 8FC2 72EA 3412 FCA8 32E0 7A2E"            /* ‡,+…�Ârê4.ü¨2àz. */
+	$"B109 F66C 3F99 7C32 2761 1522 7B9C 1851"            /* ±Æöl?™|2'a."{œ.Q */
+	$"B3CB 5373 0652 CE79 D8C5 B721 03D7 CD81"            /* ³ËSs.RÎyØÅ·!.×Í� */
+	$"A03A CD5F CECF B58A 4122 7ED2 9FFF 7FFF"            /*  :Í_ÎϵŠA"~ÒŸÿ.ÿ */
+	$"1575 DF0B 430B 0A6C 6108 B421 B33F E9FA"            /* .uß.C.Âla.´!³?éú */
+	$"AC06 391C EB01 17F4 3BF4 4CDA 87DA 516F"            /* ¬.9.ë..ô;ôLÚ‡ÚQo */
+	$"EFA3 E7F9 651A 6902 C269 AF79 2EA4 D861"            /* ï£çùe.i.Âi¯y.¤Øa */
+	$"CBC1 7F37 146D 4163 38BB B16B AAD4 9AC2"            /* ËÁ.7.mAc8»±kªÔšÂ */
+	$"424A B3CE 1368 78EF B4B0 FE68 2FBA 0CB2"            /* BJ³Î.hxï´°þh/º.² */
+	$"E672 A89D 999E 64CD 417A 98A3 8458 0603"            /* ær¨�™ždÍAz˜£„X.. */
+	$"C03D 9F9E B15E 8418 0FC6 F3E0 BA39 A3C1"            /* À=Ÿž±^„..Æóàº9£Á */
+	$"9929 0547 9C29 FC76 57CA B1E5 F887 AE73"            /* ™).Gœ)üvWʱåø‡®s */
+	$"78AA BA9F FF7F C07C 00F0 28E9 7533 0FC1"            /* xªºŸÿ.À|.ð(éu3.Á */
+	$"097C 4ABC F3CB 6604 EEC2 5194 A1F2 A201"            /* Æ|J¼óËf.îÂQ”¡ò¢. */
+	$"D6B0 C5F3 4AA3 8FD8 34DC A382 0CD4 134E"            /* Ö°ÅóJ£�Ø4Ü£‚.Ô.N */
+	$"8275 37F5 2388 74C6 1A6C F889 1037 A348"            /* ‚u7õ#ˆtÆ.lø‰.7£H */
+	$"ACB4 EFF5 B446 564C C6DC 75F7 8445 013F"            /* ¬´ïõ´FVLÆÜu÷„E.? */
+	$"79FF 407B 05EE 9C66 8A53 FF7A 367A 6D06"            /* yÿ@{.îœfŠSÿz6zm. */
+	$"9ADF CBDD 25B5 0629 78A0 A071 35BA EE49"            /* šßËÝ%µ.)x  q5ºîI */
+	$"64E9 3EA3 9A07 917A 66E3 090C B916 3BF5"            /* dé>£š.‘zfãÆ.¹.;õ */
+	$"10D7 77D5 7281 248E 3F09 0C0F 319E 7F71"            /* .×wÕr�$Ž?Æ..1ž.q */
+	$"98DA A34A C823 06A4 6BFD 8EA1 8C71 EB25"            /* ˜Ú£JÈ#.¤kýŽ¡Œqë% */
+	$"E5FC 0BA1 DB35 9514 A229 56F0 7E42 9FD0"            /* åü.¡Û5•.¢)Vð~BŸÐ */
+	$"5435 3CB7 AED9 0A4F 625B A493 D1B2 C654"            /* T5<·®ÙÂOb[¤“ѲÆT */
+	$"F691 87F9 F8E9 7459 1823 E06B 57D6 C638"            /* ö‘‡ùøétY.#àkWÖÆ8 */
+	$"7EE2 8CA0 1D79 4000 0000 0000 0000 0000"            /* ~⌠.y@......... */
+	$"0000 0000 442A 0D8C 8522 4E1A 3752 5040"            /* ....D*.Œ…"N.7RP@ */
+	$"E53D EE69 0B70 A6BF 9D0D D725 D66E 8D50"            /* å=îi.p¦¿�.×%Ön�P */
+	$"10DB 966B 649B 0CA3 958B 6457 90CC 214A"            /* .Û–kd›.£•‹dW�Ì!J */
+	$"C4C0 27A2 95F4 98AD 14C2 1892 EBE7 864B"            /* ÄÀ'¢•ô˜­.Â.’ëç†K */
+	$"18AA 55C7 50D2 4A15 7F4E 566A 9C13 9C52"            /* .ªUÇPÒJ..NVjœ.œR */
+	$"AC77 FE86 B3A2 5D92 D112 516C BA99 60EE"            /* ¬wþ†³¢]’Ñ.Qlº™`î */
+	$"221A F194 D9DF FF5F FF6B 77F9 4B01 4F8F"            /* ".ñ”Ùßÿ_ÿkwùK.O� */
+	$"F681 8614 2F3E 31E3 EABB 7C34 6025 A491"            /* ö�†./>1ãê»|4`%¤‘ */
+	$"9BC1 A348 628D 34AE 751A F8F7 7521 7F48"            /* ›Á£Hb�4®u.ø÷u!.H */
+	$"68A4 6B9C F66F 252D 6021 9C97 39AB B637"            /* h¤kœöo%-`!œ—9«¶7 */
+	$"3B5D E8FB 56EE 824A F65D C84D E23C 7BF2"            /* ;]èûVî‚Jö]ÈMâ<{ò */
+	$"5400 0000 0000 0000 0000 0000 0014 080D"            /* T............... */
+	$"B05B 4688 1F60 376D 2209 1DE1 7E75 CD30"            /* °[Fˆ.`7m"Æ.á~uÍ0 */
+	$"5D2F 627B A077 8D86 2001 62AF 1031 6853"            /* ]/b{ w�† .b¯.1hS */
+	$"2A8E 0308 16F6 C4EC E5B6 814A 1DF2 23EB"            /* *Ž...öÄìå¶�J.ò#ë */
+	$"8C16 64F9 A1ED 8A1F 346E 2E1C 5ACB 4376"            /* Œ.dù¡íŠ.4n..ZËCv */
+	$"5014 B885 5212 5294 8F4F DF56 7339 8A5D"            /* P.¸…R.R”�OßVs9Š] */
+	$"03C0 A05F D60B 5D58 2677 CD67 A4EE 3803"            /* .À _Ö.]X&wÍg¤î8. */
+	$"B2B1 9AD5 A41A C3EF 3281 3FFF 780A A5BD"            /* ²±šÕ¤.Ãï2�?ÿxÂ¥½ */
+	$"861B 62F7 456F 1021 93CD A115 BD61 7E4C"            /* †.b÷Eo.!“Í¡.½a~L */
+	$"2306 D6BF D5D9 18AF 12BB 22D9 E32E 6976"            /* #.Ö¿ÕÙ.¯.»"Ùã.iv */
+	$"9282 5E47 A842 7983 2C87 64C5 6215 A0D9"            /* ’‚^G¨Byƒ,‡dÅb. Ù */
+	$"E45A EFAE 74F3 E5E5 7679 A7C0 D366 649C"            /* äZï®tóååvy§ÀÓfdœ */
+	$"9EF3 D763 2D6C D0AD 48E5 7A2A 9454 8B34"            /* žó×c-lЭHåz*”T‹4 */
+	$"B7FF 7FCD F604 90E4 2716 1C40 DD8A 8B1A"            /* ·ÿ.Íö.�ä'..@ÝŠ‹. */
+	$"24C8 2F0C 06AC 999A 58B7 C15E E6B1 431B"            /* $È/..¬™šX·Á^æ±C. */
+	$"73D1 FEC5 5182 4A2D 33CB E920 AFBE 9F5A"            /* sÑþÅQ‚J-3Ëé ¯¾ŸZ */
+	$"0478 C2F3 80D7 241A 2E07 8BF3 FD3F 471A"            /* .xÂó€×$...‹óý?G. */
+	$"7C53 1C79 2F17 C32F D5C6 B977 E2F9 9D80"            /* |S.y/.Ã/Õƹwâù�€ */
+	$"558B 7336 75BC 5945 3986 BD1C CE95 EA07"            /* U‹s6u¼YE9†½.Εê. */
+	$"7152 C778 65AD 73E9 F1B7 24D4 BDB0 7F24"            /* qRÇxe­séñ·$Ô½°.$ */
+	$"BACD 3C51 D344 33D7 21C7 BE9A 915D 2808"            /* ºÍ<QÓD3×!Ǿš‘](. */
+	$"3E68 3F1B 43AE 8F30 CE7F FF67 1C78 8498"            /* >h?.C®�0Î.ÿg.x„˜ */
+	$"08D8 E1D9 3F1A E50B EB7C E564 6F4C 57F3"            /* .ØáÙ?.å.ë|ådoLWó */
+	$"9E60 5F9B 244E 83A9 33C9 668A 3951 7E33"            /* ž`_›$Nƒ©3ÉfŠ9Q~3 */
+	$"31D7 01E7 0342 6BC0 7FD1 7488 2BE1 9AD1"            /* 1×.ç.BkÀ.Ñtˆ+ášÑ */
+	$"1938 BBD8 7710 BAD3 BB92 2C80 A162 B2EF"            /* .8»Øw.ºÓ»’,€¡b²ï */
+	$"3FEA 6FC2 47D2 0D0E 28AB 03DA 4B34 4027"            /* ?êoÂGÒ..(«.ÚK4@' */
+	$"7FFD 87BC 9D96 E076 3C00 0000 0000 0000"            /* .ý‡¼�–àv<....... */
+	$"0000 0000 0000 136C 1721 95F0 1991 3F80"            /* .......l.!•ð.‘?€ */
+	$"65DC 1F3F AEA0 BE5C 71D2 94CE C7FF 7FFF"            /* eÜ.?® ¾\qÒ”ÎÇÿ.ÿ */
+	$"7917 BEAD D458 935A 563C CC9C 6C0D CFFF"            /* y.¾­ÔX“ZV<Ìœl.Ïÿ */
+	$"55DA 93C2 F199 3D1E C4C2 3C5F A7BC D48E"            /* UÚ“Âñ™=.ÄÂ<_§¼ÔŽ */
+	$"4980 037B 9FCC F7BC 6E1E 78CD 2838 DC58"            /* I€.{ŸÌ÷¼n.xÍ(8ÜX */
+	$"F156 C827 88EA BFF7 BD95 BBD6 FE11 C305"            /* ñVÈ'ˆê¿÷½•»Öþ.Ã. */
+	$"A1D2 FA2A EA0B E56B 285B 91FE 551E F5E2"            /* ¡Òú*ê.åk([‘þU.õâ */
+	$"687C 5A51 1A67 64D3 BD76 4937 F455 4C94"            /* h|ZQ.gdÓ½vI7ôUL” */
+	$"6A7E B888 CB40 7AA3 DDEE 8BD8 2D9F 1EB6"            /* j~¸ˆË@z£Ýî‹Ø-Ÿ.¶ */
+	$"48DF 9C66 6BF3 A26A 3CC4 2D4D E47A 6D9A"            /* Hßœfkó¢j<Ä-Mäzmš */
+	$"DAB1 1DA4 083A D994 4416 C0D2 2E63 539E"            /* Ú±.¤.:Ù”D.ÀÒ.cSž */
+	$"7274 3C04 85F4 D7B5 EDEF 507A B2B7 1832"            /* rt<.…ô×µíïPz²·.2 */
+	$"6615 A186 4A80 0000 0000 0000 0000 0000"            /* f.¡†J€.......... */
+	$"07CF BF6C 3626 7453 BF7D 8B57 26C9 F556"            /* .Ï¿l6&tS¿}‹W&ÉõV */
+	$"1F12 0BB9 5DC4 797D 3C69 7DB2 2FFF 7F33"            /* ...¹]Äy}<i}²/ÿ.3 */
+	$"81FC E4ED 4BF8 9180 3FD2 0142 3F2D 1DF0"            /* �üäíKø‘€?Ò.B?-.ð */
+	$"097B D61C 019A C409 B506 26FC D55D 7AE9"            /* Æ{Ö..šÄƵ.&üÕ]zé */
+	$"3464 6C57 13E7 565F 2553 70C3 3EC7 87AC"            /* 4dlW.çV_%SpÃ>LJ¬ */
+	$"3161 5289 3A6A FC0B E254 CAFA 6A32 2F8C"            /* 1aR‰:jü.âTÊúj2/Œ */
+	$"8B76 FA87 DADD 0333 2250 0058 F5C6 21CD"            /* ‹vú‡ÚÝ.3"P.XõÆ!Í */
+	$"D094 5CD5 10DD 2FA0 B74B 06FB AA9B 2B62"            /* Д\Õ.Ý/ ·K.ûª›+b */
+	$"E36D 708E B8F5 0739 3097 7F03 47BE 48F5"            /* ãmpŽ¸õ.90—..G¾Hõ */
+	$"D079 1641 CA5D DF28 C92B 0EFA B18F CE6F"            /* Ðy.AÊ]ß(É+.ú±�Îo */
+	$"6648 DB26 DE5C 1D17 2BD3 28AF DD89 801C"            /* fHÛ&Þ\..+Ó(¯Ý‰€. */
+	$"AB0D 40D1 9016 D542 63A0 8222 9D7A F0F5"            /* «.@Ñ�.ÕBc ‚"�zðõ */
+	$"A171 2D28 3D2C C22E 09AB 3AA9 C50B 7545"            /* ¡q-(=,Â.Æ«:©Å.uE */
+	$"4C64 18E8 8E67 3A7D DDBE 36CE 2F97 5AD0"            /* Ld.èŽg:}ݾ6Î/—ZÐ */
+	$"E4F0 8AFB 6071 6268 E5F6 09EA 245F 9F87"            /* äðŠû`qbhåöÆê$_Ÿ‡ */
+	$"E304 242C 234C 9FF7 1D0A 11C7 4FE7 20BC"            /* ã.$,#LŸ÷.Â.ÇOç ¼ */
+	$"EC58 1A4B 5A8E DE45 0E5F 4A03 4C8A 5051"            /* ìX.KZŽÞE._J.LŠPQ */
+	$"E410 4405 321B BD82 AC69 94F7 AA5E 5C65"            /* ä.D.2.½‚¬i”÷ª^\e */
+	$"436F 861A C95F 1AB0 2E2B 9689 AA43 B247"            /* Co†.É_.°.+–‰ªC²G */
+	$"6DE3 4E9E F205 F221 D175 86BB 4434 C0EE"            /* mãNžò.ò!Ñu†»D4Àî */
+	$"C472 EA2B 499D 63FA B4C8 FAB3 91F3 060D"            /* Ärê+I�cú´Èú³‘ó.. */
+	$"C203 A636 1D98 6B00 D678 0D3C BE92 309E"            /* Â.¦6.˜k.Öx.<¾’0ž */
+	$"759A 11D4 B514 24FB E4D2 7089 76DE 42DD"            /* uš.Ôµ.$ûäÒp‰vÞBÝ */
+	$"5338 4798 5943 4A6B 500A 472E 77BE AEBD"            /* S8G˜YCJkPÂG.w¾®½ */
+	$"93B0 117A 0E2D A8E4 DFED 5A76 1775 2BFF"            /* “°.z.-¨äßíZv.u+ÿ */
+	$"1A84 CBE1 B007 D3EA 11B0 9BB8 4B3F BB56"            /* .„Ëá°.Óê.°›¸K?»V */
+	$"33F6 B242 4C5C A63D 638F 1BA5 0AC5 698D"            /* 3ö²BL\¦=c�.¥ÂÅi� */
+	$"45B3 D343 D769 FEEE C45D 50B0 9AAA 4146"            /* E³ÓC×iþîÄ]P°šªAF */
+	$"0BFA F8CC 694B A42D FC1E C3F1 54F0 D3F9"            /* .úøÌiK¤-ü.ÃñTðÓù */
+	$"F051 5182 D373 5210 38AA F9B0 D3F3 6B07"            /* ðQQ‚ÓsR.8ªù°Óók. */
+	$"C944 7FCA 2126 D17A 01B1 7763 CDE8 D5FF"            /* ÉD.Ê!&Ñz.±wcÍèÕÿ */
+	$"00F4 08D7 4060 339C D8E2 7EA4 B00D 3171"            /* .ô.×@`3œØâ~¤°.1q */
+	$"ABB0 7F47 D146 13B9 398E 14B3 C55D 10AF"            /* «°.GÑF.¹9Ž.³Å].¯ */
+	$"8D0A 2444 26A0 EFEA 6CB2 51FD EA28 0FD7"            /* �Â$D& ïêl²Qýê(.× */
+	$"4E2F F54F 0066 62F2 66F3 334C 5D9D 77ED"            /* N/õO.fbòfó3L]�wí */
+	$"F3D0 12ED 7A95 89A1 B928 8429 DCFB 8C68"            /* óÐ.íz•‰¡¹(„)ÜûŒh */
+	$"C35C 3C77 5D7D 5180 A012 ADA3 AE60 AAE0"            /* Ã\<w]}Q€ .­£®`ªà */
+	$"0D88 09A4 4F7B FAC4 A2FD 327D E109 4F0B"            /* .ˆÆ¤O{úÄ¢ý2}áÆO. */
+	$"3343 C0ED D985 7402 93E2 7A2E 09B4 09A6"            /* 3CÀíÙ…t.“âz.ƴƦ */
+	$"5348 2E51 C037 BE62 C1A7 15C4 B9C8 7F4B"            /* SH.QÀ7¾bÁ§.ĹÈ.K */
+	$"FC22 3596 D989 C701 6701 5488 1001 22B2"            /* ü"5–Ù‰Ç.g.Tˆ.."² */
+	$"C06A A5D5 2C94 6BA9 D1C6 2B33 5910 8B1F"            /* Àj¥Õ,”k©ÑÆ+3Y.‹. */
+	$"0B0D 5531 BE0F 3E72 9C60 75A8 2669 220D"            /* ..U1¾.>rœ`u¨&i". */
+	$"E140 D538 7CD4 5763 D708 6D5E 45C0 AE61"            /* á@Õ8|ÔWc×.m^EÀ®a */
+	$"EC8B E180 1D9C 712C 4DB9 F177 6733 0F76"            /* ì‹á€.œq,M¹ñwg3.v */
+	$"9A72 7AD0 D18D 2BE6 9DCE 6294 4092 CE8E"            /* šrzÐÑ�+æ�Îb”@’ÎŽ */
+	$"ACED 8B00 B050 AE53 C09C 98D6 CFD1 4208"            /* ¬í‹.°P®SÀœ˜ÖÏÑB. */
+	$"DEB2 AF01 5ED7 E1F4 4EAA 0B09 2263 FE09"            /* Þ²¯.^×áôNª.Æ"cþÆ */
+	$"2771 6EB7 9181 1DFE A5DD 9A12 4592 02FD"            /* 'qn·‘�.þ¥Ýš.E’.ý */
+	$"5F2D D4D6 5C15 B454 B07C 9B6A B9F9 AEC2"            /* _-ÔÖ\.´T°|›j¹ù®Â */
+	$"D883 1F5F B9B1 8258 6732 C7E3 5C90 DB16"            /* ؃._¹±‚Xg2Çã\�Û. */
+	$"42EC D875 2B9D FEAF 1FED BD80 261D BAAE"            /* BìØu+�þ¯.í½€&.º® */
+	$"3799 FDC7 DBE5 E769 A11C 3304 5D3B 419C"            /* 7™ýÇÛåçi¡.3.];Aœ */
+	$"5844 E615 EE7A 5DCE 272E D055 121D 1F84"            /* XDæ.îz]Î'.ÐU...„ */
+	$"2EC6 E6B1 A7DA D03A D600 6D58 4FF0 9196"            /* .Æ汧ÚÐ:Ö.mXOð‘– */
+	$"FBCA CDDC 1B8D 9D1A BB7B 3782 0F3F 626C"            /* ûÊÍÜ.��.»{7‚.?bl */
+	$"26AA AF34 6A20 8210 1E96 ED21 5A26 EF04"            /* &ª¯4j ‚..–í!Z&ï. */
+	$"5F66 5C2D A8A4 F3BC 1871 AD1D FE4D 8C8B"            /* _f\-¨¤ó¼.q­.þMŒ‹ */
+	$"F1E5 A382 654B 08C7 EFC4 BFBA C29B 5C73"            /* ñ壂eK.ÇïÄ¿ºÂ›\s */
+	$"2420 9390 3B75 6DE6 0208 6F4F BB53 B2AA"            /* $ “�;umæ..oO»S²ª */
+	$"AD28 4360 1A8A 4301 088C 6F17 68CC 9180"            /* ­(C`.ŠC..Œo.hÌ‘€ */
+	$"D757 7012 3BE3 C4AB DF05 97B9 4B57 B6FC"            /* ×Wp.;ãÄ«ß.—¹KW¶ü */
+	$"7693 36DE 89E8 E2AB 4352 A782 4520 DA28"            /* v“6Þ‰èâ«CR§‚E Ú( */
+	$"F1F2 34D6 2EAE E401 ED61 1E2E 4E74 D4EB"            /* ñò4Ö.®ä.ía..NtÔë */
+	$"98A9 94AD F856 8EE1 E3D0 06FC AA37 31E5"            /* ˜©”­øVŽáãÐ.üª71å */
+	$"1047 113E C151 CE86 B6A4 0F82 E5D9 CE50"            /* .G.>ÁQΆ¶¤.‚åÙÎP */
+	$"57A8 8F86 AFAD 21D1 2C4C F181 8BD7 106C"            /* W¨�†¯­!Ñ,Lñ�‹×.l */
+	$"3C77 649E 038E 3C63 66F4 EE1A 2906 755C"            /* <wdž.Ž<cfôî.).u\ */
+	$"EDD8 6093 6868 531C 9FA3 C5C9 3F3C 7786"            /* íØ`“hhS.Ÿ£ÅÉ?<w† */
+	$"BCC4 440C 13F9 0BCB 76BA 9364 A3CC 344F"            /* ¼ÄD..ù.Ëvº“d£Ì4O */
+	$"128B D594 CB9D A2DC 6C03 CA48 2D9E 9706"            /* .‹Õ”Ë�¢Ül.ÊH-ž—. */
+	$"A281 5170 A91B 0033 4552 2A9A BF6F D4A9"            /* ¢�Qp©..3ER*š¿oÔ© */
+	$"61B6 F6C1 7959 FDD2 8F3F C94B 2B90 29BB"            /* a¶öÁyYýÒ�?ÉK+�)» */
+	$"9FAA A83B FEFF 80A3 1EC2 B2D9 77CF 963B"            /* Ÿª¨;þÿ€£.²ÙwÏ–; */
+	$"85FF 5728 5CDD 2F01 7556 8155 F8AA 7984"            /* …ÿW(\Ý/.uV�Uøªy„ */
+	$"7543 0C18 A1FC 0353 DF5F D368 41E9 E0EF"            /* uC..¡ü.Sß_ÓhAéàï */
+	$"C363 A78F 3FE9 41E9 5F77 19A4 A811 FF43"            /* Ãc§�?éAé_w.¤¨.ÿC */
+	$"8EE8 3FBA 00FA 54F6 15F5 CF3B 39A6 0984"            /* Žè?º.úTö.õÏ;9¦Æ„ */
+	$"CC99 7AE1 8E5B 71A9 1575 DB95 F166 D52F"            /* Ì™záŽ[q©.uÛ•ñfÕ/ */
+	$"A270 08D4 9515 3B89 2EA1 A097 12A3 B4E9"            /* ¢p.Ô•.;‰.¡ —.£´é */
+	$"5BFB AE47 8FD7 60F0 33DA E91B 234B 5D2F"            /* [û®G�×`ð3Úé.#K]/ */
+	$"7C4B 00C2 60F1 7260 B78A 1835 B440 611B"            /* |K.Â`ñr`·Š.5´@a. */
+	$"042D F768 F9C9 8785 50AD 8421 77D4 B97A"            /* .-÷hùɇ…P­„!wÔ¹z */
+	$"6B02 828C E758 8B31 1E92 DF7F BE67 3DAB"            /* k.‚ŒçX‹1.’ß.¾g=« */
+	$"E5F8 F1FB FD8C 34F4 4B2F 98BF 24A9 4DF2"            /* åøñûýŒ4ôK/˜¿$©Mò */
+	$"32A9 A661 B01E F960 12E1 9C18 F197 CEA7"            /* 2©¦a°.ù`.áœ.ñ—Χ */
+	$"E1C4 4AB4 7CEB 2CE2 33F3 C23C F3FD 2CF9"            /* áÄJ´|ë,â3óÂ<óý,ù */
+	$"F132 8395 3D39 FD9D 983D 4454 9758 856B"            /* ñ2ƒ•=9ý�˜=DT—X…k */
+	$"6556 B234 72B0 C2CA 71CA 9CEB 7AE4 FD7C"            /* eV²4r°ÂÊqÊœëzäý| */
+	$"0E3F 1930 6B17 7074 C216 3D9C 24BF 5B97"            /* .?.0k.ptÂ.=œ$¿[— */
+	$"A7EA 25F0 9DCC AFA5 BBEF 47E9 D7E6 7B0E"            /* §ê%ð�̯¥»ïGé×æ{. */
+	$"E02F 87A2 EF87 68FC 9BF7 F274 5F00 FC3D"            /* à/‡¢ï‡hü›÷òt_.ü= */
+	$"A5F8 7AC7 F0FA A5F8 7D42 C03F 0F42 FE1D"            /* ¥øzÇðú¥ø}BÀ?.Bþ. */
+	$"ABF0 F7CF E1EE 40ED 1CBC E67A C7C3 33E9"            /* «ð÷Ïáî@í.¼æzÇÃ3é */
+	$"75CE 6202 697A FF68 B299 C0A6 2F39 4F64"            /* uÎb.izÿh²™À¦/9Od */
+	$"6775 1459 6387 68C9 941E E328 B150 8D7C"            /* gu.Yc‡hÉ”.ã(±P�| */
+	$"24C4 D953 4443 9A50 E4CC 4E41 B3A9 F28A"            /* $ÄÙSDCšPäÌNA³©òŠ */
+	$"BB0E 943C 0DAB C98A 023C 332B AE2D AF60"            /* ».”<.«ÉŠ.<3+®-¯` */
+	$"4D30 BA77 9D1A 93DC CEBB 7560 EA33 084C"            /* M0ºw�.“Üλu`ê3.L */
+	$"BCFD 2F47 685E 4CC9 8A76 F1C8 04AB 126F"            /* ¼ý/Gh^LÉŠvñÈ.«.o */
+	$"B9FD 4A34 E181 4147 9F56 2AB4 EB2C 50EF"            /* ¹ýJ4á�AGŸV*´ë,Pï */
+	$"D652 4543 763B B857 210B 2B4A BB50 0EAE"            /* ÖRECv;¸W!.+J»P.® */
+	$"90BD EEEC F92B DD18 0881 9B3A C6DF A028"            /* �½îìù+Ý..�›:Æß ( */
+	$"45EB 36D7 50B4 D756 FB49 9F08 D74D 037B"            /* Eë6×P´×VûIŸ.×M.{ */
+	$"83A1 001C 0977 1DCC 81D0 B6B9 828A 6851"            /* ƒ¡..Æw.Ì�ж¹‚ŠhQ */
+	$"3CAC B3FF 572B 543A 4C73 3F35 0561 EC81"            /* <¬³ÿW+T:Ls?5.aì� */
+	$"A8D4 82BC 9148 5E30 FF3E 3164 C43E 5461"            /* ¨Ô‚¼‘H^0ÿ>1dÄ>Ta */
+	$"4BD0 139E 6390 0E05 4793 56B8 5080 CBF6"            /* KÐ.žc�..G“V¸P€Ëö */
+	$"9E70 BEA1 FB26 DD1E AEE1 E78D 0D32 FA02"            /* žp¾¡û&Ý.®áç�.2ú. */
+	$"43FC FBC6 7464 2C9A 14AD 2C7C 0969 995F"            /* CüûÆtd,š.­,|Æi™_ */
+	$"6363 3037 9C34 C5F8 42DF B339 D2B0 5C45"            /* cc07œ4ÅøBß³9Ò°\E */
+	$"6130 509D 28E7 D3A7 9308 74ED 9265 B7F9"            /* a0P�(çÓ§“.tí’e·ù */
+	$"0F54 D265 33D9 EB57 07C4 852B E3C8 771F"            /* .TÒe3ÙëW.Ä…+ãÈw. */
+	$"21F8 ADA3 D807 625C 513A E395 604B 0D6A"            /* !ø­£Ø.b\Q:ã•`K.j */
+	$"A9FC 297E 63AF 7622 23B6 63E1 EF25 F572"            /* ©ü)~c¯v"#¶cáï%õr */
+	$"01B0 400D 18C6 C9FA 6AF5 3E26 4199 6E68"            /* .°@..ÆÉújõ>&A™nh */
+	$"99B5 B3A9 F861 3419 C6C7 B65C D0F6 353B"            /* ™µ³©øa4.ÆǶ\Ðö5; */
+	$"6551 1B0A 9D82 1F07 4185 8C46 5867 DC22"            /* eQ.Â�‚..A…ŒFXgÜ" */
+	$"BD38 AFF7 27BA 1114 9266 5EF4 1EA9 89B4"            /* ½8¯÷'º..’f^ô.©‰´ */
+	$"A634 E917 65E5 502E 8028 D24E 725F 0C22"            /* ¦4é.eåP.€(ÒNr_." */
+	$"1513 7B38 5FEA 3150 520B 6D8A 03D8 F796"            /* ..{8_ê1PR.mŠ.Ø÷– */
+	$"D183 D8FA 82E2 C147 B662 593B 9FC8 A2A0"            /* уØú‚âÁG¶bY;ŸÈ¢  */
+	$"C63B D151 D905 072C 02E5 919B 0BE9 6D76"            /* Æ;ÑQÙ..,.å‘›.émv */
+	$"4BEF 7D51 FF67 C2F2 BB61 DDD2 7981 0B7E"            /* Kï}QÿgÂò»aÝÒy�.~ */
+	$"D406 3679 DFA4 FAE3 A33C 28AC 06C6 93C1"            /* Ô.6yߤúã£<(¬.Æ“Á */
+	$"B82F 53DB 1EB8 A6F3 5A24 A44A 1A76 9204"            /* ¸/SÛ.¸¦óZ$¤J.v’. */
+	$"6543 FC80 18DA 3C5D 395B 01DC D7E8 C21E"            /* eCü€.Ú<]9[.Ü×èÂ. */
+	$"A66C 9AE3 08D6 DBFC EE95 9E73 F71D 7CCA"            /* ¦lšã.ÖÛüî•žs÷.|Ê */
+	$"2A6A F6D2 11D9 AC28 BEDE 8E1B 65EF A995"            /* *jöÒ.Ù¬(¾ÞŽ.eï©• */
+	$"F7B5 B19D 5F63 F42B D0AD D69A BD47 1EED"            /* ÷µ±�_cô+Э֚½G.í */
+	$"2E5C 0276 3AEA F6D9 6E3F 314C 7F5F 52C3"            /* .\.v:êöÙn?1L._RÃ */
+	$"093D C8A9 23E4 C154 5587 294A 98A9 0643"            /* Æ=È©#äÁTU‡)J˜©.C */
+	$"AF18 0D20 51A4 6FE1 F326 11E7 5A91 2919"            /* ¯.. Q¤oáó&.çZ‘). */
+	$"DD53 B13B 2CB3 DE77 FAB9 420E BAFB 305B"            /* ÝS±;,³Þwú¹B.ºû0[ */
+	$"E9AB 7A2B 623B 78FE 346D 8BB6 BA40 AE40"            /* é«z+b;xþ4m‹¶º@®@ */
+	$"5B6D 6D53 81A1 076D 7058 E792 E410 3FA7"            /* [mmS�¡.mpXç’ä.?§ */
+	$"AD06 7E2E 5158 D129 9233 6E1D 6B7C C701"            /* ­.~.QXÑ)’3n.k|Ç. */
+	$"D61D 42D8 472F D5E2 2710 0B6C 828A 2352"            /* Ö.BØG/Õâ'..l‚Š#R */
+	$"D400 65FA E227 A938 1832 18CC 2BCE 19A8"            /* Ô.eúâ'©8.2.Ì+Î.¨ */
+	$"773C 3CB1 C6BD D722 8EE1 8AE2 4D4B 97D4"            /* w<<±Æ½×"ŽáŠâMK—Ô */
+	$"1763 37E4 2F93 8578 534E 0BA9 B493 3B80"            /* .c7ä/“…xSN.©´“;€ */
+	$"F018 28BE 2A52 15B2 8499 08A8 005F F028"            /* ð.(¾*R.²„™.¨._ð( */
+	$"ADFD ACEB 238F 922A 75E4 1C65 F2C3 F14B"            /* ­ý¬ë#�’*uä.eòÃñK */
+	$"213D 7263 4A9A 1C80 12BD 5895 0EC8 B955"            /* !=rcJš.€.½X•.ȹU */
+	$"8CD0 FB81 63CF FF7F B545 85DF E201 36A9"            /* ŒÐû�cÏÿ.µE…ßâ.6© */
+	$"E524 1BD6 EDDA 7C33 8CD2 E114 BA93 51E0"            /* å$.ÖíÚ|3ŒÒá.º“Qà */
+	$"A113 A12A FBEA 8570 B5FE E1B6 7963 5B31"            /* ¡.¡*ûê…pµþá¶yc[1 */
+	$"512A 99B1 3A59 E50E C584 DD7F FF7F FF7E"            /* Q*™±:Yå.Å„Ý.ÿ.ÿ~ */
+	$"D3C9 019B 1FBC DB70 2C2A 14A6 E7F1 0147"            /* ÓÉ.›.¼Ûp,*.¦çñ.G */
+	$"5F3A A36C 6F8A 9038 ABD8 EB8F FF7F FE79"            /* _:£loŠ�8«Øë�ÿ.þy */
+	$"6C12 2D6F FD6D F9A0 0392 0E82 0296 3C14"            /* l.-oýmù .’.‚.–<. */
+	$"FEFA 803C A3D4 1049 CF30 E22F 6542 7ABF"            /* þú€<£Ô.IÏ0â/eBz¿ */
+	$"378E 66B2 9091 D396 B953 DCF5 66D3 C5B5"            /* 7Žf²�‘Ó–¹SÜõfÓŵ */
+	$"7719 028C 5C0F F898 00A1 0C1D E181 F9C7"            /* w..Œ\.ø˜.¡..á�ùÇ */
+	$"2E46 06D4 D623 1256 EFAE 89E3 4FFF 7FDD"            /* .F.ÔÖ#.VﮉãOÿ.Ý */
+	$"F00D 4E11 65D5 B8F9 7C0B A045 AC4A 1E42"            /* ð.N.eÕ¸ù|. E¬J.B */
+	$"221C B512 5480 EF2D CB80 A089 3603 2CA1"            /* ".µ.T€ï-Ë€ ‰6.,¡ */
+	$"391C 7925 C817 92E3 8438 C438 08D1 0637"            /* 9.y%È.’ã„8Ä8.Ñ.7 */
+	$"9FCD F4C2 C04C 40BB A484 5043 0C1E 7C85"            /* ŸÍôÂÀL@»¤„PC..|… */
+	$"D7F6 1F6D BFC7 60AA 4D18 A399 9A13 CCD0"            /* ×ö.m¿Ç`ªM.£™š.ÌÐ */
+	$"26DA 3F97 24CB E902 0668 67F7 FE63 7A2E"            /* &Ú?—$Ëé..hg÷þcz. */
+	$"16D6 987F FF7F AFC1 5C35 E63D BA36 6227"            /* .Ö˜.ÿ.¯Á\5æ=º6b' */
+	$"FF7C FD39 8B8B 1A5F 6026 831B 0764 8805"            /* ÿ|ý9‹‹._`&ƒ..dˆ. */
+	$"E40B 0F19 7FFF 7FFC DEBC DD5B 9008 0000"            /* ä....ÿ.üÞ¼Ý[�... */
+	$"0C24 1D44 4641 3BC8 4248 E229 62D2 088D"            /* .$.DFA;ÈBHâ)bÒ.� */
+	$"117F DE8D 0B52 C3FD 1DD9 3823 F138 4C98"            /* ..Þ�.RÃý.Ù8#ñ8L˜ */
+	$"58A8 2683 519C F914 4961 5226 891F F863"            /* X¨&ƒQœù.IaR&‰.øc */
+	$"3FF2 B19F 113D BFEF 9D12 30C6 66BD E2A6"            /* ?ò±Ÿ.=¿ï�.0Æf½â¦ */
+	$"5D8C BE7E BE19 3D8F 03F2 5D26 FF7F FF7E"            /* ]Œ¾~¾.=�.ò]&ÿ.ÿ~ */
+	$"A82B 5E03 E7A8 E8F1 8C4D B6F1 F0E2 FC36"            /* ¨+^.ç¨èñŒM¶ñðâü6 */
+	$"DE7A 2F55 38B1 B436 2E50 7D25 E3F0 82C8"            /* Þz/U8±´6.P}%ãð‚È */
+	$"580F 0D19 C280 415C 2A7F FCD9 C720 E649"            /* X...€A\*.üÙÇ æI */
+	$"4064 2624 04AC 0B71 41FD 3937 8359 4137"            /* @d&$.¬.qAý97ƒYA7 */
+	$"8CA9 B642 C318 BD37 82D3 B786 8217 3252"            /* Œ©¶BÃ.½7‚Ó·†‚.2R */
+	$"44EA 4598 57D2 2F66 957F 39FE D712 F449"            /* DêE˜WÒ/f•.9þ×.ôI */
+	$"213A BEBB B6CC F551 FF7F EB0A AE45 8497"            /* !:¾»¶ÌõQÿ.ë®E„— */
+	$"0F4C FD34 4090 01FE CFC8 51AA C32A 7D95"            /* .Lý4@�.þÏÈQªÃ*}• */
+	$"D414 2609 E22F 1B7D E10E 97BB 05D1 9D04"            /* Ô.&Æâ/.}á.—».Ñ�. */
+	$"0592 9271 0D39 AB59 F165 0D09 549C B4E3"            /* .’’q.9«Yñe.ÆTœ´ã */
+	$"AEE5 555F 00A3 5E0A E4D3 BAFE 1EC6 2FCE"            /* ®åU_.£^ÂäÓºþ.Æ/Î */
+	$"FB04 C9BC 71D8 A42D 2F70 9FE1 EC17 C31D"            /* û.ɼqؤ-/pŸáì.Ã. */
+	$"ECB2 0A82 EFB1 914C F6D2 E54C 5316 B6C4"            /* ì²Â‚ﱑLöÒåLS.¶Ä */
+	$"4FFF 653B FD6E 27A6 9959 244B F458 B35C"            /* Oÿe;ýn'¦™Y$KôX³\ */
+	$"865C EB94 2CD7 7343 B74C C211 8A4D 2A99"            /* †\ë”,×sC·LÂ.ŠM*™ */
+	$"732E 3B43 CEAC C300 A520 924D 6F1F 8295"            /* s.;CάÃ.¥ ’Mo.‚• */
+	$"DF36 1FD4 E8F0 9221 6313 1B33 0C98 2721"            /* ß6.Ôèð’!c..3.˜'! */
+	$"8F55 5BA1 0E46 A755 1D7F A914 458D 9FFF"            /* �U[¡.F§U..©.E�Ÿÿ */
+	$"33CF 4CE3 AFC6 3383 BC4D A7E9 F546 FDCB"            /* 3ÏLã¯Æ3ƒ¼M§éõFýË */
+	$"8276 7778 2BBA EF7C 3677 6251 58C0 9EFF"            /* ‚vwx+ºï|6wbQXÀžÿ */
+	$"526C C883 6CFF 7FFF 7D4C 3F9F BD74 6BE9"            /* Rlȃlÿ.ÿ}L?Ÿ½tké */
+	$"B6EB 9003 823B 235D 6AD9 B382 FC45 F10C"            /* ¶ë�.‚;#]jÙ³‚üEñ. */
+	$"8282 90ED 9D47 E949 FADC 7B04 1C1C 9EF1"            /* ‚‚�í�GéIúÜ{...žñ */
+	$"1ABB 270D 07BE 1943 4E14 70E0 48FF 81EE"            /* .»'..¾.CN.pàHÿ�î */
+	$"CE8A 5AAD 3CE9 090D 3126 F96A AEBA 5853"            /* ΊZ­<éÆ.1&ùj®ºXS */
+	$"D02E ADE8 4614 E2B7 2E7E 3DB6 DE6A 77A8"            /* Ð.­èF.â·.~=¶Þjw¨ */
+	$"48D0 2DBB BAF4 E94C 735D 27D6 87FF 7F80"            /* HÐ-»ºôéLs]'Ö‡ÿ.€ */
+	$"5BCC 3CA6 1168 D9E0 38B4 22B2 2154 02AA"            /* [Ì<¦.hÙà8´"²!T.ª */
+	$"A1FF 6D87 EB2B F3EB 3814 9F74 DEF3 4D86"            /* ¡ÿm‡ë+óë8.ŸtÞóM† */
+	$"ED68 7E75 9E81 1FD9 170B E013 7E4D 97B3"            /* íh~už�.Ù..à.~M—³ */
+	$"51B0 6B2A 42AF EEB4 899B D2A2 6AC9 8EBF"            /* Q°k*B¯î´‰›Ò¢jÉŽ¿ */
+	$"2858 9FFC 5050 3364 8F2D 313E 94A9 5ED5"            /* (XŸüPP3d�-1>”©^Õ */
+	$"6213 E9DD 6FF6 5813 72DA FE40 0F70 06C4"            /* b.éÝoöX.rÚþ@.p.Ä */
+	$"FF7D 053C 3E69 C976 DDFF 02D9 4688 D8D7"            /* ÿ}.<>iÉvÝÿ.ÙFˆØ× */
+	$"8DEF 5187 FCA3 40EE 3167 B6DD 7EE6 42AB"            /* �ïQ‡ü£@î1g¶Ý~æB« */
+	$"B07A DB20 DC1D 7016 631F 8FB0 C83A 9CC2"            /* °zÛ Ü.p.c.�°È:œÂ */
+	$"66B9 304B 74F5 03F7 217C D3E3 6000 ECE6"            /* f¹0Ktõ.÷!|Óã`.ìæ */
+	$"A319 FD9E 4131 7E74 59C6 FB3F 1B51 FE89"            /* £.ýžA1~tYÆû?.Qþ‰ */
+	$"52D3 C845 1BF0 4BFE 3BAE 4940 9830 8E9C"            /* RÓÈE.ðKþ;®I@˜0Žœ */
+	$"F843 F6A2 218E B2E2 8092 8E0E 3889 8137"            /* øCö¢!Ž²â€’Ž.8‰�7 */
+	$"583C 394F CCE6 3D1B 37B8 C9A4 D805 B9E4"            /* X<9OÌæ=.7¸É¤Ø.¹ä */
+	$"A037 E45D 1167 9627 81E0 538C 1B6D EA0E"            /*  7ä].g–'�àSŒ.mê. */
+	$"18CD 8E3C EE0C 5E0C B048 8DD2 C804 CA38"            /* .ÍŽ<î.^.°H�ÒÈ.Ê8 */
+	$"8678 CAA9 5EE1 8B6C E7D9 FDE1 5C14 D52A"            /* †xÊ©^á‹lçÙýá\.Õ* */
+	$"67F3 8A12 F698 857A 5692 1FB3 FF27 FE1B"            /* góŠ.ö˜…zV’.³ÿ'þ. */
+	$"7E31 5D25 B4A2 3647 FF07 064A 4D7B F160"            /* ~1]%´¢6Gÿ..JM{ñ` */
+	$"62D7 81CE 0940 AE5F CAEB F1A6 10C4 CB0E"            /* b×�ÎÆ@®_Êëñ¦.ÄË. */
+	$"3D77 2C40 0146 8C72 B765 F6A9 3047 E748"            /* =w,@.FŒr·eö©0GçH */
+	$"0239 A725 8B4C 56F0 7E86 9A24 53D7 4832"            /* .9§%‹LVð~†š$S×H2 */
+	$"7924 73CB 4431 4977 0487 03FC F1B3 A21C"            /* y$sËD1Iw.‡.üñ³¢. */
+	$"2792 0B05 8183 8348 8EC0 2635 47D9 B51D"            /* '’..�ƒƒHŽÀ&5GÙµ. */
+	$"CE40 1FA4 20C5 93A8 BEB4 B8CD 93D8 A79E"            /* Î@.¤ Å“¨¾´¸Í“اž */
+	$"62C5 846C 964D 0404 BE21 3AA5 9EC3 4450"            /* bÅ„l–M..¾!:¥žÃDP */
+	$"FAEE 938A A428 E4D0 7F1B 46A8 7AEC 97FB"            /* úî“Š¤(äÐ..F¨zì—û */
+	$"1AFF 71DA F26D B5B1 E6F2 66B4 865E 1F12"            /* .ÿqÚòmµ±æòf´†^.. */
+	$"CE0F 3A8A EDF1 6321 BC5A 22D5 D3D6 BE19"            /* Î.:Šíñc!¼Z"ÕÓÖ¾. */
+	$"671A 38C3 11E8 FC9D 93AC 895A 1B84 7C9B"            /* g.8Ã.èü�“¬‰Z.„|› */
+	$"979F 5DC5 BBE6 19A8 5D03 BE83 6FA4 B8F2"            /* —Ÿ]Å»æ.¨].¾ƒo¤¸ò */
+	$"AFCD 8115 B21B C1D5 80B4 5E20 3B19 9E48"            /* ¯Í�.².ÁÕ€´^ ;.žH */
+	$"29C0 68DA F799 EC0D 56B3 7049 5EC1 11CB"            /* )ÀhÚ÷™ì.V³pI^Á.Ë */
+	$"CBAF FA0A 5AF1 22F1 3A4C 6F13 635A C681"            /* ˯úÂZñ"ñ:Lo.cZÆ� */
+	$"06DA 8B44 A35B CF31 9B6F 57E6 AEC2 8D59"            /* .Ú‹D£[Ï1›oWæ®Â�Y */
+	$"1556 A43E A289 74DC C398 B209 31B9 8CD0"            /* .V¤>¢‰tÜزÆ1¹ŒÐ */
+	$"07BE D253 76AB 7D79 4F26 D099 7AE8 E52C"            /* .¾ÒSv«}yO&Йzèå, */
+	$"EA35 D7BB E968 CAA0 5F61 EAE5 E9A1 E903"            /* ê5×»éhÊ _aêåé¡é. */
+	$"100E ED2C 5A66 21E2 1426 BE74 7A19 8C98"            /* ..í,Zf!â.&¾tz.Œ˜ */
+	$"3D67 A4D2 370F C95D 7131 2D31 0971 6022"            /* =g¤Ò7.É]q1-1Æq`" */
+	$"F4F2 359E 1FBD D23A CD94 4467 205E F7B1"            /* ôò5ž.½Ò:Í”Dg ^÷± */
+	$"5D18 EE91 9078 176B ADC2 65EB EECF D1A8"            /* ].î‘�x.k­ÂeëîÏѨ */
+	$"F1B3 B999 E7CC 3079 BD9C 82D8 DF6E 29E0"            /* ñ³¹™çÌ0y½œ‚Øßn)à */
+	$"9502 EC8D 5C13 629B 109E A7C0 F438 6674"            /* •.ì�\.b›.ž§Àô8ft */
+	$"C48B E75A 7CAC 28AE 3E9C 0ECF 9ADF F7BF"            /* Ä‹çZ|¬(®>œ.Ïšß÷¿ */
+	$"C51A E20D 64F1 B1DD C986 0C6F 6BFF 5102"            /* Å.â.dñ±ÝɆ.okÿQ. */
+	$"B233 B826 EBC9 35E2 9799 0A0F E81D 0816"            /* ²3¸&ëÉ5â—™Â.è... */
+	$"E01C B1A8 E4D9 1CCF 7F2E 4DB3 371B 83C0"            /* à.±¨äÙ.Ï..M³7.ƒÀ */
+	$"9DFD A603 83D6 4412 7DCF 2E2F 85D8 8259"            /* �ý¦.ƒÖD.}Ï./…Ø‚Y */
+	$"DC97 798F 2E8A 09F5 C1A7 1E56 55F3 BFD0"            /* Ü—y�.ŠÆõÁ§.VUó¿Ð */
+	$"34CE 311A 98BE C87C 8CCE 6EDF C85C A788"            /* 4Î1.˜¾È|ŒÎnßÈ\§ˆ */
+	$"AA7E 47D5 72AF 1842 5C5F 9D6A C586 CA4C"            /* ª~GÕr¯.B\_�jņÊL */
+	$"34D3 6315 D6CA 0D6D 5B75 6C85 551B E270"            /* 4Óc.ÖÊ.m[ul…U.âp */
+	$"E9DD 6127 C363 1F5A 0AA4 8F55 114F 9ED3"            /* éÝa'Ãc.Z¤�U.OžÓ */
+	$"034E A968 1BF1 513A 2F0D 3E61 612A 15E6"            /* .N©h.ñQ:/.>aa*.æ */
+	$"B89F 1877 F38E 8C96 20C3 1952 A559 62AE"            /* ¸Ÿ.w󎌖 Ã.R¥Yb® */
+	$"20E0 BE7D BF7C FAA3 F56C FF75 6D5E 07E7"            /*  à¾}¿|ú£õlÿum^.ç */
+	$"EB87 E7E9 BFE7 EE37 E7EE B60B E7DA F7CF"            /* ë‡çé¿çî7çî¶.çÚ÷Ï */
+	$"A6FF 2B5C 2F9F AC00 ED1C BCF0 084D B6D5"            /* ¦ÿ+\/Ÿ¬.í.¼ð.M¶Õ */
+	$"A3F8 3A1B 179B 5659 AE02 A536 8D65 B1A0"            /* £ø:..›VY®.¥6�e±  */
+	$"F806 81C6 9453 B9E5 1E84 EF36 3D8C 9922"            /* ø.�Æ”S¹å.„ï6=Œ™" */
+	$"A841 EBC7 584D 175D A8CF 5AE5 52F4 364A"            /* ¨AëÇXM.]¨ÏZåRô6J */
+	$"CACB F4FA 59D1 6C18 1FE0 5F96 0F70 465A"            /* ÊËôúYÑl..à_–.pFZ */
+	$"7CFD 0C37 59FF 6248 10C6 4872 8573 D54E"            /* |ý.7YÿbH.ÆHr…sÕN */
+	$"7839 337E D900 4336 CF58 B59C BCC4 602F"            /* x93~Ù.C6ÏXµœ¼Ä`/ */
+	$"EA1A 205F CD8D 635B AE0D 5750 3316 72C7"            /* ê. _Í�c[®.WP3.rÇ */
+	$"A765 C2F2 CF8C 52FB 1892 F55E B7A5 6D85"            /* §eÂòÏŒRû.’õ^·¥m… */
+	$"5782 FAB6 FBB5 CDF3 2DC2 0256 2927 4F4F"            /* W‚ú¶ûµÍó-Â.V)'OO */
+	$"1F92 5F99 B540 87DD 7A80 991B 0677 AB00"            /* .’_™µ@‡Ýz€™..w«. */
+	$"2D82 C5F6 11F7 F21B 2652 B798 75D5 42A6"            /* -‚Åö.÷ò.&R·˜uÕB¦ */
+	$"7757 E0E7 3C3F DBA5 6106 9F44 1800 E044"            /* wWàç<?Û¥a.ŸD..àD */
+	$"5844 8C9D 83C0 C5D3 6B95 CE2A 3EBC D7FD"            /* XDŒ�ƒÀÅÓk•Î*>¼×ý */
+	$"B79B E645 6FD3 A5EE ECE2 C9A7 53C7 B2E3"            /* ·›æEoÓ¥îìâɧSDzã */
+	$"C659 D5C5 0FBD 7C88 93C3 D3D9 D81F 0AEB"            /* ÆYÕÅ.½|ˆ“ÃÓÙØ.Âë */
+	$"5784 8BF9 DAD7 993D 0C8B 9873 08A4 254B"            /* W„‹ùÚ×™=.‹˜s.¤%K */
+	$"2452 F95D 29CA 8B3E D48D 18FB C813 4ECB"            /* $Rù])Ê‹>Ô�.ûÈ.NË */
+	$"D118 E3FA 926C 7A5F E5CC F774 D1DB B5C1"            /* Ñ.ãú’lz_åÌ÷tÑÛµÁ */
+	$"579A 2647 619A 67A0 423D 6C64 B3A6 9357"            /* Wš&Gašg B=ld³¦“W */
+	$"B8C6 8FBE A3AC E380 E548 5ED3 D83D 7DB9"            /* ¸Æ�¾£¬ã€åH^ÓØ=}¹ */
+	$"93E8 9071 F6E0 168F 6BEC F674 6D08 F4DA"            /* “è�qöà.�kìötm.ôÚ */
+	$"C1F7 11FD DEF8 2420 30DA 71E2 C605 81EB"            /* Á÷.ýÞø$ 0ÚqâÆ.�ë */
+	$"565B D461 AF6E 3127 34AC BA64 C660 14E1"            /* V[Ôa¯n1'4¬ºdÆ`.á */
+	$"F6AB DA92 386B 3E7B BD42 90E9 ABA2 6EE7"            /* ö«Ú’8k>{½B�é«¢nç */
+	$"8D0D 373C D280 46EC 6746 310C EA41 862B"            /* �.7<Ò€FìgF1.êA†+ */
+	$"6D1B 7BE9 93AF 17F6 1D3A E7AB CA55 8A4B"            /* m.{铯.ö.:ç«ÊUŠK */
+	$"E867 6EF3 29DF FF5F B839 75E1 FA04 DD81"            /* ègnó)ßÿ_¸9uáú.Ý� */
+	$"B6C9 DA44 D268 3B1A FF63 60F5 37A5 DDCB"            /* ¶ÉÚDÒh;.ÿc`õ7¥ÝË */
+	$"1AB3 5275 7692 7F15 F8E8 6A96 CEB4 D9E5"            /* .³Ruv’..øèj–δÙå */
+	$"3E5A 0E16 B1D0 B056 D0D2 0360 0900 5773"            /* >Z..±Ð°VÐÒ.`Æ.Ws */
+	$"BB3F C215 FD55 C9BF E3FC 48A1 CFAB BD39"            /* »?Â.ýUÉ¿ãüH¡Ï«½9 */
+	$"CD3D 906E 21CB C3DD E4D3 548C 4731 E777"            /* Í=�n!ËÃÝäÓTŒG1çw */
+	$"EE15 C0DE CEBC 0F2F 85A6 9822 F1FF 7B2F"            /* î.ÀÞμ./…¦˜"ñÿ{/ */
+	$"2530 48C7 0C39 3659 CD03 06C5 7C8E 3D49"            /* %0HÇ.96YÍ..Å|Ž=I */
+	$"FED5 7B72 4652 772C 39C7 8F1B 63E8 2DC1"            /* þÕ{rFRw,9Ç�.cè-Á */
+	$"1242 CA35 E396 6103 15DF D939 0597 B8D4"            /* .BÊ5ã–a..ßÙ9.—¸Ô */
+	$"8858 ACE3 3C32 6EE5 69A3 8512 3447 2B3B"            /* ˆX¬ã<2nåi£….4G+; */
+	$"0647 8C1F 2D31 4E57 0D03 BE26 5235 5275"            /* .GŒ.-1NW..¾&R5Ru */
+	$"74E8 B8F6 CF32 E077 8C51 41DB ED67 EE30"            /* tè¸öÏ2àwŒQAÛígî0 */
+	$"AD97 7956 D279 B0A8 768D 00E3 F604 A240"            /* ­—yVÒy°¨v�.ãö.¢@ */
+	$"9656 5BCD B309 D0CD 3ECE C477 31EC F88D"            /* –V[ͳÆÐÍ>ÎÄw1ìø� */
+	$"782F 8B9E 37FA A741 C636 7B55 D047 64A4"            /* x/‹ž7ú§AÆ6{UÐGd¤ */
+	$"E2EC C69D F609 F38F 821E 8D20 8709 87FF"            /* âìÆ�öÆó�‚.� ‡Æ‡ÿ */
+	$"3C3A B1ED C420 1F0B 52E3 8999 C684 30F3"            /* <:±íÄ ..R㉙Ƅ0ó */
+	$"C4ED 7FA9 3A2C D0E7 AE48 1AC2 7196 9347"            /* Äí.©:,Ðç®H.Âq–“G */
+	$"6BC9 BEE1 4112 4209 93CA 307A 7FF7 8B12"            /* kɾáA.BÆ“Ê0z.÷‹. */
+	$"EE76 8890 A529 33CC F435 A84F 9414 A719"            /* îvˆ�¥)3Ìô5¨O”.§. */
+	$"BFB2 6305 201F 372D 567F 30DF 2E47 D0B9"            /* ¿²c. .7-V.0ß.Gй */
+	$"C68F 5126 7EAA D95A 12D0 DA8A 8CF4 8A2A"            /* Æ�Q&~ªÙZ.ÐÚŠŒôŠ* */
+	$"CBAE 0509 B614 A9E1 2CA2 D0E0 F017 E395"            /* Ë®.ƶ.©á,¢Ðàð.ã• */
+	$"AF82 85B5 4509 E75C 8E4D 5465 7DF2 CF39"            /* ¯‚…µEÆç\ŽMTe}òÏ9 */
+	$"ACFB DD5B C683 62C0 0B1C B7B9 EAEC 049C"            /* ¬ûÝ[ƃbÀ..·¹êì.œ */
+	$"8045 0178 6757 E317 872D ABC2 B077 6EF6"            /* €E.xgWã.‡-«Â°wnö */
+	$"3612 4132 3DD7 D39B B49A 04A8 207D 6135"            /* 6.A2=×Ó›´š.¨ }a5 */
+	$"C64F 3A0F 5028 7B6B 953E 8F19 920A 718F"            /* ÆO:.P({k•>�.’Âq� */
+	$"08E9 A079 EC51 A08F 4A77 5130 C807 9BC2"            /* .é yìQ �JwQ0È.›Â */
+	$"B37B 4C7B 9BAA 40F3 4E94 BE51 C027 32B5"            /* ³{L{›ª@óN”¾QÀ'2µ */
+	$"751F 4793 7271 226E 82F3 CF14 8BC3 F927"            /* u.G“rq"n‚óÏ.‹Ãù' */
+	$"4C81 7F29 AB70 8B3B E948 86D6 569F FEC2"            /* L�.)«p‹;éH†ÖVŸþÂ */
+	$"BF6C 92F9 1011 3BE3 9E91 6458 1634 34A3"            /* ¿l’ù..;ãž‘dX.44£ */
+	$"3042 520F 5D64 6429 32CE 04FD 1B98 0698"            /* 0BR.]dd)2Î.ý.˜.˜ */
+	$"3A36 655C 86C7 C272 4B02 E259 0537 4DB8"            /* :6e\†ÇÂrK.âY.7M¸ */
+	$"C6C2 6980 ECFB 0FC1 C6D9 0A2C D00F 282A"            /* ÆÂi€ìû.ÁÆÙÂ,Ð.(* */
+	$"7A0B D91F 08CA 762C A629 048E 9BCC CFD2"            /* z.Ù..Êv,¦).Ž›ÌÏÒ */
+	$"1EBC 8F60 2F64 F24D F1FB 81C6 8AEC CFDB"            /* .¼�`/dòMñû�ÆŠìÏÛ */
+	$"623A 01A9 35D2 B5E1 B80A 2D32 084E 3857"            /* b:.©5Òµá¸Â-2.N8W */
+	$"C025 BCDA 4728 F3AD 35AD 9AAA E054 21B7"            /* À%¼ÚG(ó­5­šªàT!· */
+	$"A47E 62C5 9921 02C0 09E3 440D 063A 3789"            /* ¤~bÅ™!.ÀÆãD..:7‰ */
+	$"5072 E54A 4654 E148 AC2E 4A99 C6A5 3923"            /* PråJFTáH¬.J™Æ¥9# */
+	$"49B5 6906 6531 FD5E 7CCE 1C4B EEDE 7482"            /* Iµi.e1ý^|Î.KîÞt‚ */
+	$"9E3F 73AE C777 0214 C921 3131 C5CB 9F61"            /* ž?s®Çw..É!11ÅËŸa */
+	$"64A4 4E70 57C2 5C04 E25B 266E 6887 7477"            /* d¤NpWÂ\.â[&nh‡tw */
+	$"FCCB 1F0C 89F2 6CF6 713E 4D08 8AC8 9B0C"            /* üË..‰òlöq>M.ŠÈ›. */
+	$"00AC D9D7 A28A C219 B52B B46A D704 F919"            /* .¬Ù×¢ŠÂ.µ+´j×.ù. */
+	$"2050 6CCA 215A 299B 9129 9739 DA6F 3A67"            /*  PlÊ!Z)›‘)—9Úo:g */
+	$"FE12 2BF1 4F8B 26ED D21F F727 5B59 22F3"            /* þ.+ñO‹&íÒ.÷'[Y"ó */
+	$"2E05 F4A0 9754 F431 9AED 1B65 038C CD7F"            /* ..ô —Tô1ší.e.ŒÍ. */
+	$"8254 E3AE 035C 18D7 0E28 6300 0DF0 998D"            /* ‚Tã®.\.×.(c..ð™� */
+	$"0191 85AF C71B B3CF F0D6 3A8F B1AA 5E99"            /* .‘…¯Ç.³ÏðÖ:�±ª^™ */
+	$"BAB8 7C7F 0214 F864 4744 E747 7248 3C94"            /* º¸|...ødGDçGrH<” */
+	$"3AC8 CE04 1019 11ED 4BCC 76E9 FE4E 5728"            /* :ÈÎ....íKÌvéþNW( */
+	$"5BB0 986C D763 A3C7 AF8A 14E9 D24A AD17"            /* [°˜l×c£Ç¯Š.éÒJ­. */
+	$"FF66 611F B77C 0830 9093 A560 06FA E9CF"            /* ÿfa.·|.0�“¥`.úéÏ */
+	$"054B 5846 1681 5DBF 34F9 49A9 45E0 8F20"            /* .KXF.�]¿4ùI©Eà�  */
+	$"7FFD 6264 2193 031D A60F A111 B0B7 CFEE"            /* .ýbd!“..¦.¡.°·Ïî */
+	$"DE49 EC80 C0F1 D7F6 A495 900B 4126 40BE"            /* ÞIì€Àñ×ö¤•�.A&@¾ */
+	$"185B DFFE C7B0 12AC C143 AA85 70E5 81EF"            /* .[ßþÇ°.¬ÁCª…på�ï */
+	$"79CE 1662 08E4 203F 1706 40FB CC39 CA8F"            /* yÎ.b.ä ?..@ûÌ9Ê� */
+	$"8002 1CFA 3BCC 6B79 5C83 A4D2 7147 E38F"            /* €..ú;Ìky\ƒ¤ÒqGã� */
+	$"C93B F2E8 6A15 6D30 C314 E898 81E3 FF7B"            /* É;òèj.m0Ã.è˜�ãÿ{ */
+	$"5FC5 EE13 0449 1985 2CBC 73C7 C569 DCB1"            /* _Åî..I.…,¼sÇÅiܱ */
+	$"8024 F7CA CC7A FE3B CC15 4BCE 5B92 1BBB"            /* €$÷ÊÌzþ;Ì.KÎ[’.» */
+	$"0048 F291 579F FD20 F11A 1934 CC11 9C3F"            /* .Hò‘WŸý ñ..4Ì.œ? */
+	$"CE49 027A 9763 9E57 A2FF 7FFD 53E4 E50B"            /* ÎI.z—cžW¢ÿ.ýSäå. */
+	$"C747 02FF 7869 0537 1482 221E 0220 79D5"            /* ÇG.ÿxi.7.‚".. yÕ */
+	$"45B1 2E48 6A6C 8486 571F E1F1 BF39 0797"            /* E±.Hjl„†W.áñ¿9.— */
+	$"5D21 6964 EA9B 13F1 E6B7 C4B5 A2B7 E2BD"            /* ]!idê›.ñæ·Äµ¢·â½ */
+	$"09C2 B200 0000 0000 003E A392 6527 69B6"            /* Ʋ......>£’e'i¶ */
+	$"B189 8365 F55D 7A2B 0398 4196 BB60 D4F0"            /* ±‰ƒeõ]z+.˜A–»`Ôð */
+	$"06B6 100C 5B60 D76F 8FEE EFFB D525 0E2B"            /* .¶..[`×o�îïûÕ%.+ */
+	$"3535 B765 22E7 F77C CF5C 8907 7626 62C0"            /* 55·e"ç÷|Ï\‰.v&bÀ */
+	$"3B04 A170 EEA6 A399 F26B CD7E 92BC 9E13"            /* ;.¡p™òkÍ~’¼ž. */
+	$"9D2D 6907 B06F 6B9A 957D 3C57 DC9F 06E6"            /* �-i.°okš•}<WÜŸ.æ */
+	$"C3B6 16AD C91B E868 E000 1848 3BE4 5C3A"            /* ö.­É.èhà..H;ä\: */
+	$"1162 2272 401F 600B A973 281E 62B3 2654"            /* .b"r@.`.©s(.b³&T */
+	$"74B0 287C C53E A3DA 2A14 E38F 9FFE 3A8E"            /* t°(|Å>£Ú*.ã�Ÿþ:Ž */
+	$"0D69 7E9D 5B07 1396 ED52 69BC 3971 5630"            /* .i~�[..–íRi¼9qV0 */
+	$"7C63 8DA9 7A40 F364 CC6A FCAC DC7C 59DC"            /* |c�©z@ódÌjü¬Ü|YÜ */
+	$"278A 92E3 6FBF F936 7157 2583 232E E558"            /* 'Š’ão¿ù6qW%ƒ#.åX */
+	$"0000 C241 6B90 4DCB 6421 F85A B681 4812"            /* ..ÂAk�MËd!øZ¶�H. */
+	$"9165 5C06 0195 F213 DB9F 5E2F 4BDE A075"            /* ‘e\..•ò.ÛŸ^/KÞ u */
+	$"BD9A 741B 971B 3411 1F73 7FF8 D719 BA55"            /* ½št.—.4..s.ø×.ºU */
+	$"8048 404F FEEA FC74 AEB1 84FD 03F9 5D43"            /* €H@Oþêüt®±„ý.ù]C */
+	$"BE42 E61F FF7F F4CA BA56 9654 B757 FF60"            /* ¾Bæ.ÿ.ôʺV–T·Wÿ` */
+	$"CA39 3290 054C E785 0EA7 F04D AF3E B342"            /* Ê92�.Lç….§ðM¯>³B */
+	$"A80A 815D 3954 73F2 871A 51FF 7488 20CD"            /* ¨Â�]9Tsò‡.Qÿtˆ Í */
+	$"90F3 23B8 80FE C6BF 726C 5426 83F2 5400"            /* �ó#¸€þÆ¿rlT&ƒòT. */
+	$"0000 0000 0000 0000 BFA5 D802 777C F954"            /* ........¿¥Ø.w|ùT */
+	$"286B A586 76CF 26CE 72CA 6FE7 BD43 DB36"            /* (k¥†vÏ&ÎrÊoç½CÛ6 */
+	$"A826 870E 2EEF E2C4 2E22 E63C FF7F AF51"            /* ¨&‡..ïâÄ."æ<ÿ.¯Q */
+	$"40C1 B727 22F3 9ACC 894D 0C49 EC7A D998"            /* @Á·'"óšÌ‰M.IìzÙ˜ */
+	$"64A9 DD22 2545 B85C D621 0609 B73A 9D9F"            /* d©Ý"%E¸\Ö!.Æ·:�Ÿ */
+	$"FF7F FF7F C0F7 00E1 B069 1D76 3BA1 E98C"            /* ÿ.ÿ.À÷.á°i.v;¡éŒ */
+	$"5F1B 1E11 B6F6 EB6D 6316 9DBC D1B2 DC90"            /* _...¶öëmc.�¼Ñ²Ü� */
+	$"5E1D 5EE0 3C65 57D0 B69C 3782 D1BE 3A77"            /* ^.^à<eWжœ7‚Ѿ:w */
+	$"436E 462B 45B7 FF61 4FA4 A45B 8C34 39D8"            /* CnF+E·ÿaO¤¤[Œ49Ø */
+	$"1B35 B876 A5F1 F2AD 3F78 D289 1C2E E3B4"            /* .5¸v¥ñò­?xÒ‰..ã´ */
+	$"A28B 64FA 1E2C 0CCD 0B1C AD42 8866 DDD6"            /* ¢‹dú.,.Í..­BˆfÝÖ */
+	$"62F0 225B 8DF7 32B3 FC3C 79E9 000B 1CA9"            /* bð"[�÷2³ü<yé...© */
+	$"2C82 4874 34AB B158 47CD FA9F EBC8 0923"            /* ,‚Ht4«±XGÍúŸëÈÆ# */
+	$"B291 7229 8C3F E7FD 193C 330B A3B4 6969"            /* ²‘r)Œ?çý.<3.£´ii */
+	$"FCF6 E1BA 4C4A E64C B1BC 5BAF F402 C828"            /* üöáºLJæL±¼[¯ô.È( */
+	$"3A51 CC67 A851 E207 5A7C 3733 1031 FD5C"            /* :QÌg¨Qâ.Z|73.1ý\ */
+	$"E4D3 B69F FF67 2C6D 3FC7 D5B4 E63F 55B9"            /* äÓ¶Ÿÿg,m?ÇÕ´æ?U¹ */
+	$"FD5F 3DB1 4589 6ADF 54F0 F42A 498F 61C8"            /* ý_=±E‰jßTðô*I�aÈ */
+	$"4872 5CD7 F70D 9C80 8880 EB9A 1FE7 C715"            /* Hr\×÷.œ€ˆ€ëš.çÇ. */
+	$"E57A 280F 96CF 014C 0411 EF44 C4F2 C64F"            /* åz(.–Ï.L..ïDÄòÆO */
+	$"F91B A9D6 EB9E F615 096F E5C0 5B30 BB79"            /* ù.©Öëžö.ÆoåÀ[0»y */
+	$"D645 BF4F B70A 2C40 3D24 A4C4 5A01 F3DB"            /* ÖE¿O·Â,@=$¤ÄZ.óÛ */
+	$"8879 D458 F558 4C8E 3C87 E83C 9C30 F0C3"            /* ˆyÔXõXLŽ<‡è<œ0ðà */
+	$"F7EB BE6A 2B3B B9CB 4F2E 3B49 CA98 6025"            /* ÷ë¾j+;¹ËO.;Iʘ`% */
+	$"D6C7 6B39 ED18 A784 5410 F9CD 4FB5 9E32"            /* ÖÇk9í.§„T.ùÍOµž2 */
+	$"EABF F72F 6ECC 217F E295 4BDA F0C8 2678"            /* ê¿÷/nÌ!.â•KÚðÈ&x */
+	$"B0F7 3381 2299 1033 5300 BB1C E72F 1EE0"            /* °÷3�"™.3S.».ç/.à */
+	$"75D6 68D0 8C87 A574 580B 4AD8 7BC8 E1C4"            /* uÖhÐŒ‡¥tX.JØ{ÈáÄ */
+	$"64D3 76AA A080 1E28 FD04 890B B9A1 7E5C"            /* dÓvª €.(ý.‰.¹¡~\ */
+	$"79E2 31B9 1C3E DBAE 8BC6 DB23 53A4 0F06"            /* yâ1¹.>Û®‹ÆÛ#S¤.. */
+	$"74AA 7920 6233 E3BF B281 AFAA 957D FDFB"            /* tªy b3㿲�¯ª•}ýû */
+	$"216A 3ECE 3139 37DF 8885 620B 5D55 D0FD"            /* !j>Î197߈…b.]UÐý */
+	$"F796 6A70 CEFD 33D8 B369 178E 99C0 9FFF"            /* ÷–jpÎý3سi.Ž™ÀŸÿ */
+	$"7FD2 27D4 D615 4840 B836 A0B5 1D6F 2A5A"            /* .Ò'ÔÖ.H@¸6 µ.o*Z */
+	$"1338 2369 83A0 D409 0FA7 77EF 19B9 21E6"            /* .8#iƒ ÔÆ.§wï.¹!æ */
+	$"3E21 0CB0 D4D3 362A EA6F 6340 8D73 27FB"            /* >!.°ÔÓ6*êoc@�s'û */
+	$"C3EF 7823 33DF 7A8C 5C69 20C4 5816 72E4"            /* Ãïx#3ßzŒ\i ÄX.rä */
+	$"712C 3345 6755 76F3 FEAF 494B D0B4 3C8F"            /* q,3EgUvóþ¯IKд<� */
+	$"B83F A050 C3E9 4CA2 6A6E 7AD0 D7FF 5860"            /* ¸? PÃéL¢jnzÐ×ÿX` */
+	$"548E 54E7 C3B9 6DDF 462C 54BE 5EF9 1A41"            /* TŽTçùmßF,T¾^ù.A */
+	$"6A46 A4FB 1C36 1CA4 77EC 2899 F147 3422"            /* jF¤û.6.¤wì(™ñG4" */
+	$"843C 7FAE 123E 6894 9B7F 3125 EB0F 3129"            /* „<.®.>h”›.1%ë.1) */
+	$"9DC1 8469 CE90 BB6E 4F2C 385A 0FD1 9AC7"            /* �Á„iÎ�»nO,8Z.ÑšÇ */
+	$"3318 3BF0 B1AA A51A 9022 A143 29FF 7FC1"            /* 3.;𱪥.�"¡C)ÿ.Á */
+	$"0F0F 6570 67C4 7FA7 9906 DE4E 5439 A278"            /* ..epgÄ.§™.ÞNT9¢x */
+	$"34E1 3D57 BB0E 086E 4C71 4406 DA9D CA56"            /* 4á=W»..nLqD.Ú�ÊV */
+	$"3EFD D077 5DA5 CD7D C244 9128 F408 1F03"            /* >ýÐw]¥Í}ÂD‘(ô... */
+	$"0C8F FF4B 9274 2EC6 E208 13C5 EE1B 3CEA"            /* .�ÿK’t.Æâ..Åî.<ê */
+	$"C5C0 06F5 0FA1 11FF 7FE3 A446 32E6 F4DA"            /* ÅÀ.õ.¡.ÿ.ã¤F2æôÚ */
+	$"23EC 5108 3AE0 CD16 AFFF 3965 8196 56E2"            /* #ìQ.:àÍ.¯ÿ9e�–Vâ */
+	$"2881 4EB9 CA14 5C4A 8091 B176 8823 BF09"            /* (�N¹Ê.\J€‘±vˆ#¿Æ */
+	$"CED5 0D88 E6BB DD95 1B72 36E8 809C D432"            /* ÎÕ.ˆæ»Ý•.r6耜Ô2 */
+	$"872D C08C 7DCB B30E 548B AE16 0D85 6B49"            /* ‡-ÀŒ}˳.T‹®..…kI */
+	$"9B28 D491 ECD6 F598 691A 0891 135A 63A0"            /* ›(Ô‘ìÖõ˜i..‘.Zc  */
+	$"593C 1FFD 8A54 4FB9 F2AB 20FC 5CF3 1B88"            /* Y<.ýŠTO¹ò« ü\ó.ˆ */
+	$"EE7E 8355 45D6 87C8 28CE 7B33 92A2 D8D6"            /* î~ƒUEÖ‡È(Î{3’¢ØÖ */
+	$"E8DF EF94 500A 0D78 DE9F 8657 F7BD 7F40"            /* èßï”PÂ.xÞŸ†W÷½.@ */
+	$"5E07 0789 EDC7 F3A5 A0BF 3929 6B19 A460"            /* ^..‰íÇó¥ ¿9)k.¤` */
+	$"7A50 91FF 42EA 5F12 DFA5 E0A0 84CC E869"            /* zP‘ÿBê_.ߥࠄÌèi */
+	$"BB1F 6EDA 2238 5DB0 7F22 3521 F04B FF6B"            /* ».nÚ"8]°."5!ðKÿk */
+	$"6827 722A DD5F 3C9D D3F4 2BE3 614D 0A3F"            /* h'r*Ý_<�Óô+ãaMÂ? */
+	$"62C4 E6AC 95CA 5946 37E8 BC76 97FD 5167"            /* bÄ欕ÊYF7è¼v—ýQg */
+	$"C970 D4C7 0655 C470 5913 DBBD AA8C 87A4"            /* ÉpÔÇ.UÄpY.Û½ªŒ‡¤ */
+	$"3C63 0B7F 54CD 391E 574D F2D5 C728 20B7"            /* <c..TÍ9.WMòÕÇ( · */
+	$"9955 DAC8 72A5 DBBB F7ED 4C9F 6FFE 3A4E"            /* ™UÚÈr¥Û»÷íLŸoþ:N */
+	$"E165 1831 C0E5 8285 96C2 3959 1BE7 E884"            /* áe.1Àå‚…–Â9Y.çè„ */
+	$"E568 89C1 FD03 D443 F6D1 A7C9 4CFE F7B9"            /* åh‰Áý.ÔCöѧÉLþ÷¹ */
+	$"A0BA 5040 19D5 965F 0EB5 E503 4B32 E6C8"            /*  ºP@.Õ–_.µå.K2æÈ */
+	$"B9C1 DEBB B8B7 47DC A850 AF44 D3B7 F562"            /* ¹ÁÞ»¸·GܨP¯DÓ·õb */
+	$"4210 4DFF 42A0 3D9A 7C63 8124 22A9 B258"            /* B.MÿB =š|c�$"©²X */
+	$"2256 6243 3077 FF57 7389 3FB6 A096 0EAB"            /* "VbC0wÿWs‰?¶ –.« */
+	$"DD33 EF25 C4B0 7338 F6D7 8730 FF2E DD0A"            /* Ý3ï%Ä°s8öׇ0ÿ.Ý */
+	$"BBDA 7A6E EFE8 58EE D64B A09E 2B00 EC04"            /* »ÚznïèXîÖK ž+.ì. */
+	$"09C9 A9F4 82A0 3132 4829 65CA E93B B827"            /* ÆÉ©ô‚ 12H)eÊé;¸' */
+	$"E81F B387 132B 5D15 E526 6FEC 2CB1 407F"            /* è.³‡.+].å&oì,±@. */
+	$"8485 FF32 4933 D357 FC45 0E44 EE66 D960"            /* „…ÿ2I3ÓWüE.DîfÙ` */
+	$"5AA3 A13A FC0B D8E2 622E 0BEE 714F 2672"            /* Z£¡:ü.Øâb..îqO&r */
+	$"3850 26C4 E626 F9BA 418C BC8A 7481 C6BE"            /* 8P&Äæ&ùºAŒ¼Št�ƾ */
+	$"BFA6 0D72 0603 3452 46C0 9FDB BE63 34D9"            /* ¿¦.r..4RFÀŸÛ¾c4Ù */
+	$"9599 7519 804B F1CE 0FC8 7572 F58E EB32"            /* •™u.€KñÎ.ÈurõŽë2 */
+	$"3501 CBB0 C05B 5643 485A 0012 64C2 8022"            /* 5.Ë°À[VCHZ..d€" */
+	$"BD39 EB39 2B57 0AA3 3931 93D4 885E CDF2"            /* ½9ë9+W£91“Ôˆ^Íò */
+	$"818D 7734 36C2 BEE1 4F55 116C 47A9 DC40"            /* ��w46¾áOU.lG©Ü@ */
+	$"A8A8 4532 7C33 9D7E 070A BA9E 36F7 2445"            /* ¨¨E2|3�~.ºž6÷$E */
+	$"074C 181A 07B2 C470 FA15 8CCB C069 AD0F"            /* .L...²Äpú.ŒËÀi­. */
+	$"9DD2 8B21 6F22 7300 34B4 4378 25AB D9D2"            /* �Ò‹!o"s.4´Cx%«ÙÒ */
+	$"1D9B B7F7 2F9C C3B1 926F DE61 4463 90BD"            /* .›·÷/œÃ±’oÞaDc�½ */
+	$"BC76 27E7 A5B5 826F 908E 31BA 048F 97C1"            /* ¼v'祵‚o�Ž1º.�—Á */
+	$"1884 67A9 C4BA 4B2B 4A58 D0EE 0269 6832"            /* .„g©ÄºK+JXÐî.ih2 */
+	$"E8C6 03AA D2A2 D034 27AA D49E 9C01 069A"            /* èÆ.ªÒ¢Ð4'ªÔžœ..š */
+	$"1BDC C40B 3BA7 5F8D 0468 152D E505 7EC0"            /* .ÜÄ.;§_�.h.-å.~À */
+	$"6BBF C4F4 2F45 99CB 1872 C713 FA0D 055F"            /* k¿Äô/E™Ë.rÇ.ú.._ */
+	$"551D 6E4D 5794 CC71 BAB5 C560 4D20 9464"            /* U.nMW”ÌqºµÅ`M ”d */
+	$"9F8C 94BA 1C96 0987 1AB4 61BB BA86 751B"            /* ŸŒ”º.–Ƈ.´a»º†u. */
+	$"9B79 D06A 7A3D A663 FB31 8B86 E588 5D15"            /* ›yÐjz=¦cû1‹†åˆ]. */
+	$"4A09 8B2B 81FC AE85 0D5A 1D8C A5B7 6DD9"            /* JÆ‹+�ü®….Z.Œ¥·mÙ */
+	$"02F5 50CE 7017 1BDD 3D3D 86CB 250B 491B"            /* .õPÎp..Ý==†Ë%.I. */
+	$"AA1F 2D21 A416 E8E7 9A53 4299 8CDE CD59"            /* ª.-!¤.èçšSB™ŒÞÍY */
+	$"C678 B559 D85C C580 6795 AD5F F578 C9EE"            /* ÆxµYØ\Å€g•­_õxÉî */
+	$"73B2 8F4B 6EEA 6F07 F785 C1B3 374B E51F"            /* s²�Knêo.÷…Á³7Kå. */
+	$"46DC 728C 05A4 6932 792A DB50 4E9A FD82"            /* FÜrŒ.¤i2y*ÛPNšý‚ */
+	$"A8A2 5EB8 024D C558 D6BC 350C 97B0 B2E8"            /* ¨¢^¸.MÅXÖ¼5.—°²è */
+	$"8F42 92FD 604D 6FB7 74B6 6EBE 97F6 CE03"            /* �B’ý`Mo·t¶n¾—öÎ. */
+	$"0DFA C340 31C3 4C5E 0041 088B E097 383B"            /* .úÃ@1ÃL^.A.‹à—8; */
+	$"A236 97CC 8D2B 6F6D 0E58 4E56 1D49 32EC"            /* ¢6—Ì�+om.XNV.I2ì */
+	$"626C C303 42BB D30B B8DE 5868 3C2F E39B"            /* blÃ.B»Ó.¸ÞXh</ã› */
+	$"A07A 236D 0F21 C0DD 1A0A 933A 7710 6605"            /*  z#m.!ÀÝ.“:w.f. */
+	$"343E 8D1A 9384 4F16 C01E 5AF7 DF53 0B38"            /* 4>�.“„O.À.Z÷ßS.8 */
+	$"3615 80D7 428E 90F6 4620 02EA 4590 DF22"            /* 6.€×BŽ�öF .êE�ß" */
+	$"4B70 2FB2 CADA A529 F7FA E7C6 BC99 DFCD"            /* Kp/²ÊÚ¥)÷úçƼ™ßÍ */
+	$"5EE7 D677 B5BE F819 6A55 6070 E1A9 DF53"            /* ^çÖwµ¾ø.jU`pá©ßS */
+	$"3F82 0229 B6B7 D247 1967 8313 056F 9D27"            /* ?‚.)¶·ÒG.gƒ..o�' */
+	$"753E E4DD EB7F 1372 C0F7 D72E 349B 2F9B"            /* u>äÝë..rÀ÷×.4›/› */
+	$"686C C9AF 0896 0865 7A3A 5A9D 807F 292A"            /* hlɯ.–.ez:Z�€.)* */
+	$"8DDA A776 4B3C 0993 532D D682 A41B 9DC2"            /* �Ú§vK<Æ“S-Ö‚¤.� */
+	$"5113 9D60 934B 2055 D671 C6C4 1252 3CEF"            /* Q.�`“K UÖqÆÄ.R<ï */
+	$"C72F AC19 4BED 185D BC60 5957 F81B 8278"            /* Ç/¬.Kí.]¼`YWø.‚x */
+	$"20B5 9173 4A1B FDC9 295D 54B7 8AFE 6938"            /*  µ‘sJ.ýÉ)]T·Šþi8 */
+	$"FE49 BA78 3225 49A1 4243 823C 52B9 8489"            /* þIºx2%I¡BC‚<R¹„‰ */
+	$"9BDF 0AA1 9A6B 667D DCE2 FE18 C386 4EE9"            /* ›ß¡škf}Üâþ.ÆNé */
+	$"8AF7 92D0 4405 227C BD4C B9E4 34A7 2533"            /* Š÷’ÐD."|½L¹ä4§%3 */
+	$"D3C6 E915 D57B 681B B6DC FF03 D5D4 F1DD"            /* ÓÆé.Õ{h.¶Üÿ.ÕÔñÝ */
+	$"4FB5 BA54 262A 73C2 1CF4 4CD1 D842 E8C2"            /* OµºT&*sÂ.ôLÑØBè */
+	$"8169 3555 13EC 6A25 6DE0 3614 EC2E D1BB"            /* �i5U.ìj%mà6.ì.Ñ» */
+	$"E597 BFC6 2ACB 6879 11D1 870D E79E 8422"            /* å—¿Æ*Ëhy.ч.çž„" */
+	$"C01D 4032 8887 6DBA FBEC 3077 F220 49E3"            /* À.@2ˆ‡mºûì0wò Iã */
+	$"8693 0B00 9F45 0F57 0A39 DA8E EAA5 CD48"            /* †“..ŸE.WÂ9ÚŽê¥ÍH */
+	$"2C93 C3EC BDE0 71D5 5749 0952 441C E3F8"            /* ,“Ãì½àqÕWIÆRD.ãø */
+	$"597F C1E6 FB6B BBED AD71 FC34 CFF8 5877"            /* Y.Áæûk»í­qü4ÏøXw */
+	$"DB67 5F6D 798F E163 5F6B 1CFA A87B ED7C"            /* Ûg_my�ác_k.ú¨{í| */
+	$"F176 3065 72FF 443D BA6B 8FBD 9E85 806A"            /* ñv0erÿD=ºk�½ž…€j */
+	$"2A1B 368C 7A9E B1B1 93DE ABD8 263F 31B3"            /* *.6Œzž±±“Þ«Ø&?1³ */
+	$"1739 58F1 7233 FE7C 4EC4 32AA CDDB CF11"            /* .9Xñr3þ|NÄ2ªÍÛÏ. */
+	$"C519 9C61 B756 AF62 D55D 5D48 6AF7 4364"            /* Å.œa·V¯bÕ]]Hj÷Cd */
+	$"205E F14D AAD6 EFF5 2F0D CBE4 0F19 3159"            /*  ^ñMªÖïõ/.Ëä..1Y */
+	$"94F4 910E 4217 990B CABE EBF5 2B67 2EF6"            /* ”ô‘.B.™.ʾëõ+g.ö */
+	$"FE41 0C44 1C50 43EA 69F5 4E73 5569 82A1"            /* þA.D.PCêiõNsUi‚¡ */
+	$"C13C 4899 3AA9 5E13 5F76 BF98 2105 1842"            /* Á<H™:©^._v¿˜!..B */
+	$"AF34 9AFD CFC8 D1E7 3479 E1F3 C86F D06F"            /* ¯4šýÏÈÑç4yáóÈoÐo */
+	$"9ED9 9DD8 E2E0 4B44 19F4 03E6 9CC0 3474"            /* žÙ�ØâàKD.ô.æœÀ4t */
+	$"DFBD 078F D140 1C06 5F8C B6E2 665C 703A"            /* ß½.�Ñ@.._Œ¶âf\p: */
+	$"2841 642E F538 C531 697D 5064 11AD 9E8C"            /* (Ad.õ8Å1i}Pd.­žŒ */
+	$"5A53 3174 7302 762E 9708 BEF5 AD41 0C01"            /* ZS1ts.v.—.¾õ­A.. */
+	$"D744 85FC D963 416A 9A3A 6898 F067 5B1C"            /* ×D…üÙcAjš:h˜ðg[. */
+	$"873B 42B6 72C4 FF18 337A 8A24 EDCE 6B8B"            /* ‡;B¶rÄÿ.3zŠ$íÎk‹ */
+	$"BF06 0EA4 0227 A131 8620 B03C A2B9 729E"            /* ¿..¤.'¡1† °<¢¹rž */
+	$"1242 EC64 E340 5C5C 9BFF 120A BB1B 75E5"            /* .Bìdã@\\›ÿ.».uå */
+	$"385B 68AF C7B7 8BA5 1E7B 6FC1 DDB2 F642"            /* 8[h¯Ç·‹¥.{oÁݲöB */
+	$"FF56 4D21 66B3 EA8C 7095 8FBD 92CC 7315"            /* ÿVM!f³êŒp•�½’Ìs. */
+	$"665F B398 608C ADD4 11E0 DA38 734A C3DB"            /* f_³˜`Œ­Ô.àÚ8sJÃÛ */
+	$"9249 4640 27D6 D057 426E 651D BF14 F0DE"            /* ’IF@'ÖÐWBne.¿.ðÞ */
+	$"9130 2D17 8D66 9689 79BD 9A6D 5AF9 6C7C"            /* ‘0-.�f–‰y½šmZùl| */
+	$"94BF 8531 6507 5621 1C11 8D8F F3A5 83D9"            /* ”¿…1e.V!..��ó¥ƒÙ */
+	$"7EE3 1E6D 9B0A 8D44 F466 DE49 E606 E143"            /* ~ã.m›Â�DôfÞIæ.áC */
+	$"7E77 D417 D49D 9CF2 89AA B0FA 84A4 33A5"            /* ~wÔ.Ô�œò‰ª°ú„¤3¥ */
+	$"8279 A26A 82C5 27CF FB64 D227 994E C6A7"            /* ‚y¢j‚Å'ÏûdÒ'™NƧ */
+	$"531C 7B7D D333 20D4 F79E 7C21 CC1E 7ADA"            /* S.{}Ó3 Ô÷ž|!Ì.zÚ */
+	$"F978 DEBB 1FF2 7420 A72D DE6B AB74 8DC6"            /* ùxÞ».òt §-Þk«t�Æ */
+	$"DD0F 0386 BF57 5F23 4926 C874 D598 47A3"            /* Ý..†¿W_#I&ÈtÕ˜G£ */
+	$"FBC8 E9B0 38BB C695 B7F4 82A1 CC5F 1E22"            /* ûÈé°8»Æ•·ô‚¡Ì_." */
+	$"767C 20D5 E64D 44F1 B2D4 2298 C6A1 1842"            /* v| ÕæMDñ²Ô"˜Æ¡.B */
+	$"8139 0CC8 B9C5 284F 9FC8 945B 5342 94A8"            /* �9.ȹÅ(OŸÈ”[SB”¨ */
+	$"1A57 3351 E00E DB28 D5E3 9712 4346 6DBA"            /* .W3Qà.Û(Õã—.CFmº */
+	$"CC9B A1ED CD9B 778D 4523 1E9A AC69 8ED9"            /* Ì›¡íÍ›w�E#.š¬iŽÙ */
+	$"67C4 C16D A548 A029 0075 0185 8D06 B7F0"            /* gÄÁm¥H ).u.…�.·ð */
+	$"8258 D26A EB95 D437 F0D2 8E91 D536 F534"            /* ‚XÒjë•Ô7ðÒŽ‘Õ6õ4 */
+	$"30A1 6DE7 E4B8 48DF 246E 6A43 4FE6 AED0"            /* 0¡mçä¸Hß$njCOæ®Ð */
+	$"48A0 5E1E C339 6C40 BE36 CEB8 870B F9EB"            /* H ^.Ã9l@¾6θ‡.ùë */
+	$"5ED8 3CA2 B3FA 8CD9 2D26 FF79 6468 862D"            /* ^Ø<¢³úŒÙ-&ÿydh†- */
+	$"6B87 3072 15D5 5640 D5D4 B4BA EAD3 84F1"            /* k‡0r.ÕV@ÕÔ´ºêÓ„ñ */
+	$"6A43 F378 100E 8088 A3FE 989B E75B F67F"            /* jCóx..€ˆ£þ˜›ç[ö. */
+	$"5B25 3AE2 C08C 8CB0 08DD A37F 94DD 7F03"            /* [%:âÀŒŒ°.Ý£.”Ý.. */
+	$"35C9 DF27 9A9A B829 6326 A95D 91F7 0BA3"            /* 5Éß'šš¸)c&©]‘÷.£ */
+	$"7220 E220 F062 D8DE ADE2 2AD6 DDFD C9E4"            /* r â ðbØÞ­â*ÖÝýÉä */
+	$"FAAE 543D 3CCB 5230 74F7 3120 02FD 6B45"            /* ú®T=<ËR0t÷1 .ýkE */
+	$"A2AB 805B 13FB 1879 6060 5600 1847 98E5"            /* ¢«€[.û.y``V..G˜å */
+	$"BF65 2CD4 ACD7 15D0 B77E 5A0F 8095 95CA"            /* ¿e,Ô¬×.з~Z.€••Ê */
+	$"1847 D25F 7D32 1AE2 89EA 9D49 074D A3E5"            /* .GÒ_}2.â‰ê�I.M£å */
+	$"201E 8AC7 CB9C 43BC 0732 70E0 3C4F E625"            /*  .ŠÇËœC¼.2pà<Oæ% */
+	$"88E3 74DB 6FB7 7BE2 7006 F9E7 1F76 DBF3"            /* ˆãtÛo·{âp.ùç.vÛó */
+	$"C988 D665 F7AA 21E2 A5C1 E969 2917 3BA3"            /* ɈÖe÷ª!â¥Áéi).;£ */
+	$"17BF 925F F835 9827 813E DA4F EE9B 2DF3"            /* .¿’_ø5˜'�>ÚOî›-ó */
+	$"B640 95E8 70A5 B577 8C1D 99D5 797D D482"            /* ¶@•èp¥µwŒ.™Õy}Ô‚ */
+	$"E23A 56DD 644D 9623 FEE2 63D2 A3DB E146"            /* â:VÝdM–#þâcÒ£ÛáF */
+	$"FC39 35A7 6C28 63D8 5240 0C80 0000 0000"            /* ü95§l(cØR@.€.... */
+	$"0001 4095 99D3 7A7A 0A05 B673 69BC DA9C"            /* ..@•™ÓzzÂ.¶si¼Úœ */
+	$"A108 DDEA EE48 6385 0790 FEA1 1AFC 2CED"            /* ¡.ÝêîHc….�þ¡.ü,í */
+	$"2225 BE73 2ED7 00BB 2301 80FE 09DF E78E"            /* "%¾s.×.»#.€þÆßçŽ */
+	$"6FE6 4743 A0EE 0A03 4C9E F046 CDD8 E7F1"            /* oæGC îÂ.LžðFÍØçñ */
+	$"DB3F 1B67 F6E1 1F31 8096 90DF 5110 40B0"            /* Û?.göá.1€–�ßQ.@° */
+	$"0000 0000 0000 0000 C0B9 E0FC 41FB A11C"            /* ........À¹àüAû¡. */
+	$"4696 89A0 DE42 F8C7 27D0 3F03 AA51 70FD"            /* F–‰ ÞBøÇ'Ð?.ªQpý */
+	$"DC5F D7B9 AFD3 A0F3 7BAA A910 9E5C 259E"            /* Ü_×¹¯Ó ó{ª©.ž\%ž */
+	$"E4FB 8F8E 01C1 96E2 0768 FE5A 0A43 E2F8"            /* äû�Ž.Á–â.hþZÂCâø */
+	$"DA74 9500 C241 D1F6 3EFF 3F06 586F A511"            /* Út•.ÂAÑö>ÿ?.Xo¥. */
+	$"CCFE 8FE7 61E1 C392 D001 3F52 1CA8 CC23"            /* Ìþ�çaáÃ’Ð.?R.¨Ì# */
+	$"93F0 27DF 893F 4AC1 06C3 34DA 8953 BBC0"            /* “ð'߉?JÁ.Ã4Ú‰S»À */
+	$"84C0 4843 27E0 067E 5EBF FF7A 1540 4C0E"            /* „ÀHC'à.~^¿ÿz.@L. */
+	$"FA6C 44A1 A7BC DB24 6AD7 C367 EC93 33BF"            /* úlD¡§¼Û$j×Ãgì“3¿ */
+	$"FECB C1DF 83CC 5BF7 A7C0 DF62 2EFA 4283"            /* þËÁ߃Ì[÷§Àßb.úBƒ */
+	$"6E49 2492 4924 9249 2492 4924 9246 A4A5"            /* nI$’I$’I$’I$’F¤¥ */
+	$"7754 9685 B091 D8FF 1549 CF90 2079 3AFB"            /* wT–…°‘Øÿ.IÏ� y:û */
+	$"E925 85CC 62A2 E49B 476B 47B9 319B 630F"            /* é%…Ìb¢ä›GkG¹1›c. */
+	$"A6B8 182C E282 D1CD 920A 4EB3 21BF 943C"            /* ¦¸.,â‚ÑÍ’ÂN³!¿”< */
+	$"27BF CCDE BD6E 481A 188C F70B C257 8118"            /* '¿ÌÞ½nH..Œ÷.ÂW�. */
+	$"FBF7 FF78 F422 A3DB AE81 4980 0000 0000"            /* û÷ÿxô"£Û®�I€.... */
+	$"0000 0000 0000 1EE1 BFBB C300 0000 0000"            /* .......á¿»Ã..... */
+	$"0000 0000 0000 14FB 3FE1 1B7A D142 E13F"            /* .......û?á.zÑBá? */
+	$"5B6F 704A 61CF 957D 258E F744 FB26 8356"            /* [opJaÏ•}%Ž÷Dû&ƒV */
+	$"74AD 1DDB 02F2 CF85 7AEB 3A06 6F12 084E"            /* t­.Û.òÏ…zë:.o..N */
+	$"8E93 D6DA E4FE 9FBE 2D16 1C87 701F 55C3"            /* Ž“ÖÚäþŸ¾-..‡p.Uà */
+	$"9966 3E8F 36CB 6D9F F3F6 F8D3 B3B9 E2C1"            /* ™f>�6ËmŸóöøÓ³¹âÁ */
+	$"1019 C6E6 8FFF 7FDC 6948 D3AB C944 C64A"            /* ..Ææ�ÿ.ÜiHÓ«ÉDÆJ */
+	$"8000 0000 0000 0000 000A B0CB 3806 445C"            /* €........°Ë8.D\ */
+	$"7110 4CDE 3651 AC94 777C 8AB0 5382 04AF"            /* q.LÞ6Q¬”w|Š°S‚.¯ */
+	$"32E5 68C2 122F 8A5B 12A8 FF39 CF5E 72FB"            /* 2åhÂ./Š[.¨ÿ9Ï^rû */
+	$"EFD4 1669 47C6 525E 88EF 0AAC 1EE1 98B6"            /* ïÔ.iGÆR^ˆï¬.ᘶ */
+	$"0BFF 7FAF 8A4B 7158 F7D7 1707 DE93 841E"            /* .ÿ.¯ŠKqX÷×..Þ“„. */
+	$"3C82 3260 1FFF 1C8B 6A6E 8C66 0000 0000"            /* <‚2`.ÿ.‹jnŒf.... */
+	$"0000 0000 0000 0121 EF03 234C 3124 0000"            /* .......!ï.#L1$.. */
+	$"0000 0000 0000 0000 077C 5957 204B A2ED"            /* .........|YW K¢í */
+	$"59B8 F3C4 CC60 8A58 7E23 0B9F A0FD 1DC8"            /* Y¸óÄÌ`ŠX~#.Ÿ ý.È */
+	$"8E0F FE2B 5F9F 12D8 09B3 57BB 7818 3CF5"            /* Ž.þ+_Ÿ.ØƳW»x.<õ */
+	$"D579 D427 5198 BD86 E2FC 8775 915B 37A5"            /* ÕyÔ'Q˜½†âü‡u‘[7¥ */
+	$"B2E6 6BD8 8404 31D9 4C54 3621 6561 5C3E"            /* ²ækØ„.1ÙLT6!ea\> */
+	$"4A80 0000 0000 0000 0000 0014 D22D 6758"            /* J€..........Ò-gX */
+	$"336C 63A1 C13F 3E94 9877 8E90 4E5D 0C70"            /* 3lc¡Á?>”˜wŽ�N].p */
+	$"F80A 4262 C2CC C7E4 DAE8 526F 393F 4558"            /* øÂBbÂÌÇäÚèRo9?EX */
+	$"5CC9 5DDA B2FF 7ED5 F809 3A02 F1EE 2760"            /* \É]Ú²ÿ~ÕøÆ:.ñî'` */
+	$"FF7E 5037 F054 4A1B 9602 92EA 8D26 A198"            /* ÿ~P7ðTJ.–.’ê�&¡˜ */
+	$"9C4F 8238 A60E 7734 20F8 18FE 478F 5403"            /* œO‚8¦.w4 ø.þG�T. */
+	$"1658 618B A80F 879F 4A98 E809 DEB2 7CE9"            /* .Xa‹¨.‡ŸJ˜èÆÞ²|é */
+	$"9724 407B B8C8 A48D 4F33 9126 751B 9FC2"            /* —$@{¸È¤�O3‘&u.ŸÂ */
+	$"0283 44C3 5AFD 9546 FCE2 4212 4F5B 01D4"            /* .ƒDÃZý•FüâB.O[.Ô */
+	$"6E53 A032 DA91 40F4 4BDE 0C23 FF1E D5DE"            /* nS 2Ú‘@ôKÞ.#ÿ.ÕÞ */
+	$"B543 59DC C0DC 759A 6043 5883 A5FE C785"            /* µCYÜÀÜuš`CXƒ¥þÇ… */
+	$"BA68 9F46 C21A 4C50 20E3 0488 FB34 1043"            /* ºhŸFÂ.LP ã.ˆû4.C */
+	$"FC68 562B 635A EE8D E334 0C6F 25A9 E4C9"            /* ühV+cZî�ã4.o%©äÉ */
+	$"3484 2AC2 6188 7242 E3F6 AEAC 6F86 2DE2"            /* 4„*ÂaˆrBãö®¬o†-â */
+	$"C377 BD02 CB1C 9553 5485 6A5B E118 9BBD"            /* Ãw½.Ë.•ST…j[á.›½ */
+	$"DC6B 2C92 C6CC C866 6E7F FE63 AB01 FE7D"            /* Ük,’ÆÌÈfn.þc«.þ} */
+	$"FF7F BB81 EA94 87BE B101 F468 0E30 F111"            /* ÿ.»�ꔇ¾±.ôh.0ñ. */
+	$"7BC9 FA0D F87F BDD0 811B 8588 1AE7 8387"            /* {Éú.ø.½Ð�.…ˆ.烇 */
+	$"5C06 B3A9 E2ED 6E5B B524 35AA CBFF 50D6"            /* \.³©âín[µ$5ªËÿPÖ */
+	$"49D9 6918 3837 59BD E7CC 8796 B0AF 2729"            /* IÙi.87Y½ç̇–°¯') */
+	$"0512 5A97 66FF 1A85 E004 1882 0108 EA41"            /* ..Z—fÿ.…à..‚..êA */
+	$"BBCC 15E0 254C 59AF 877D 0722 15FB ADA1"            /* »Ì.à%LY¯‡}.".û­¡ */
+	$"84C2 9B83 DD5B C6B1 EE29 084C 08F7 06C8"            /* „›ƒÝ[Ʊî).L.÷.È */
+	$"4F07 9818 6BF2 66E2 582B 2F7D 29AD BAFA"            /* O.˜.kòfâX+/})­ºú */
+	$"8F9E 0AC8 60AE D10E 3E49 17BF E015 0C5E"            /* �žÂÈ`®Ñ.>I.¿à..^ */
+	$"5C51 5D5B 5BC1 6C83 C428 4505 E9BB 61CB"            /* \Q][[ÁlƒÄ(E.é»aË */
+	$"D7C2 F3C6 C102 73F5 409E D0CF B43E E497"            /* ×ÂóÆÁ.sõ@žÐÏ´>ä— */
+	$"C1E0 707B 3F6F EAA8 2F10 9285 7D9D 9F81"            /* Áàp{?oê¨/.’…}�Ÿ� */
+	$"303D 3A70 2B3F 4A45 558D 63F6 EEB9 CF21"            /* 0=:p+?JEU�cöî¹Ï! */
+	$"52C1 27C2 8439 0BE2 BE1F A553 A1C7 E44C"            /* RÁ'„9.â¾.¥S¡ÇäL */
+	$"5422 9BC0 356D 1B40 E53B 3064 AA69 F464"            /* T"›À5m.@å;0dªiôd */
+	$"7AA7 4E56 F7E2 7AE5 CB6E E538 8582 1927"            /* z§NV÷âzåËnå8…‚.' */
+	$"019D B4B0 E6D9 0F0E 9670 7723 62CF C422"            /* .�´°æÙ..–pw#bÏÄ" */
+	$"DD53 ED12 92AE 20B0 6B63 6CB3 C596 4F4E"            /* ÝSí.’® °kcl³Å–ON */
+	$"18B6 FD06 93B2 6F73 A740 770D C39F B873"            /* .¶ý.“²os§@w.߸s */
+	$"598F 3667 6F7A 29E9 9E6F 9D04 48DD A175"            /* Y�6goz)éžo�.HÝ¡u */
+	$"2AFC 61BD D706 2A8E 9789 F513 B8AF B8EA"            /* *üa½×.*Ž—‰õ.¸¯¸ê */
+	$"2426 7EDF 1EFA 1D19 7A50 D22F D15E 76FE"            /* $&~ß.ú..zPÒ/Ñ^vþ */
+	$"CD34 19AD 8126 775C A5FB B209 9658 F850"            /* Í4.­�&w\¥û²Æ–XøP */
+	$"F2FD A65F B487 9F50 7FF0 12FD BA8B FB6E"            /* òý¦_´‡ŸP.ð.ýº‹ûn */
+	$"49F5 50DF C349 B4F9 F4D7 EDEB 53BE DEB0"            /* IõPßÃI´ùô×íëS¾Þ° */
+	$"7F85 29FB 5DFF 36B9 BEDA 9BF8 3CF2 FDAE"            /* .…)û]ÿ6¹¾Ú›ø<òý® */
+	$"DFB5 ABBE D3DB ED2B FDBA CFFB 7606 FB74"            /* ßµ«¾ÓÛí+ýºÏûv.ût */
+	$"D3F8 6B96 83BA F7ED EB3F 7EDE AFE0 EECD"            /* Óøk–ƒº÷íë?~Þ¯àîÍ */
+	$"FB5E 7F6E 807E DB9B F6BD F0FE D32B EA21"            /* û^.n€~Û›ö½ðþÓ+ê! */
+	$"EFA8 1EFA 823F 6DCF FB6C 8BEA 6CFD B5AF"            /* ï¨.ú‚?mÏûl‹êlýµ¯ */
+	$"0774 CFDB D337 FB7A 3F83 BA5D F51F DF55"            /* .tÏÛÓ7ûz?ƒº]õ.ßU */
+	$"47FB 690F DA86 F791 DDD6 2CCB E6B8 C536"            /* Gûi.Ú†÷‘ÝÖ,Ëæ¸Å6 */
+	$"D512 AD5E 1B08 0B8A 8D03 2F75 60E5 6BF8"            /* Õ.­^...Š�./u`åkø */
+	$"447B C66A 7EC2 7912 B45F 8E48 277C D8E1"            /* D{Æj~Ây.´_ŽH'|Øá */
+	$"809C 5755 D718 BAAC F891 2AE5 F97C 3F5E"            /* €œWU×.º¬ø‘*åù|?^ */
+	$"0116 3A00 99F4 5896 E0EA B189 F5A5 7929"            /* ..:.™ôX–à걉õ¥y) */
+	$"C491 B57F 2232 B0C2 52F8 89B1 DB2F B284"            /* Ä‘µ."2°ÂRø‰±Û/²„ */
+	$"C1EE 0C43 EF76 FD94 F871 4077 7E19 EC36"            /* Áî.Cïvý”øq@w~.ì6 */
+	$"BBFA 6DFF 3C0B 5A98 89B4 84BB 56DB 5FC2"            /* »úmÿ<.Z˜‰´„»VÛ_ */
+	$"16C2 351A B46E AF45 AAC7 DD2E 97ED 970C"            /* .Â5.´n¯EªÇÝ.—í—. */
+	$"76D8 F8D0 42EB E639 28E8 BE33 A530 3B58"            /* vØøÐBëæ9(è¾3¥0;X */
+	$"2374 6B1C 97B0 1CD5 ACD5 615F FD30 62C6"            /* #tk.—°.Õ¬Õa_ý0bÆ */
+	$"899A 977D 4B74 CAB1 E9EE 6588 4E67 8733"            /* ‰š—}KtʱéîeˆNg‡3 */
+	$"B359 BCC7 DC7B 9884 E4A8 78CB 77E7 675D"            /* ³Y¼ÇÜ{˜„ä¨xËwçg] */
+	$"FF2D FCE4 7744 BDD1 A833 6BEC C481 2DA8"            /* ÿ-üäwD½Ñ¨3kìÄ�-¨ */
+	$"3D1C 5D57 7595 1DEB 2278 31AE 4188 B1F2"            /* =.]Wu•.ë"x1®Aˆ±ò */
+	$"54E1 113D DA75 96ED 71FF 1577 7820 4D22"            /* Tá.=Úu–íqÿ.wx M" */
+	$"2BD9 3841 A416 96A4 2549 1A9D 3A55 8E39"            /* +Ù8A¤.–¤%I.�:UŽ9 */
+	$"A929 4B4E E11F 0F88 8BB6 7E08 2210 9D21"            /* ©)KNá..ˆ‹¶~.".�! */
+	$"92BF 623B B974 D371 0208 1489 5713 0F66"            /* ’¿b;¹tÓq...‰W..f */
+	$"3C4C 8394 72A6 08A1 3D86 BA0C 198B CE8B"            /* <Lƒ”r¦.¡=†º..‹Î‹ */
+	$"FB71 18D8 E044 CE7C A642 F1E5 DC8B F8E6"            /* ûq.ØàDÎ|¦BñåÜ‹øæ */
+	$"2405 66E0 B6C5 6A4F B1AE 2231 3060 11D4"            /* $.fà¶ÅjO±®"10`.Ô */
+	$"9963 5EF4 BB3D 1F61 0807 0AE1 0DFC 4718"            /* ™c^ô»=.a..Âá.üG. */
+	$"6C97 80A7 D438 6A81 B76A 6E7E 7A64 87A1"            /* l—€§Ô8j�·jn~zd‡¡ */
+	$"1D7A 8744 3227 F565 4B4A E311 FA0F B477"            /* .z‡D2'õeKJã.ú.´w */
+	$"9DD6 0662 8844 7138 BDF8 CBCC 007F BDB6"            /* �Ö.bˆDq8½øËÌ..½¶ */
+	$"07C4 98CC 226B 9762 33D0 99EF 54D9 5800"            /* .ĘÌ"k—b3ЙïTÙX. */
+	$"509D C37B 39A7 E11B 8771 0999 AB8B AAA6"            /* P�Ã{9§á.‡qÆ™«‹ª¦ */
+	$"C463 6C38 7FB0 9121 2CA2 7634 BBEE 41FB"            /* Äcl8.°‘!,¢v4»îAû */
+	$"4F3B B050 3E38 15C4 98A6 216D 31C2 7057"            /* O;°P>8.ʦ!m1ÂpW */
+	$"0B3D 429A 6CFB 0819 EB4D B9D2 549F 6601"            /* .=Bšlû..ëM¹ÒTŸf. */
+	$"2436 5BEA 9DAC BBDA AB3A AB4F ABFF 768D"            /* $6[ê�¬»Ú«:«O«ÿv� */
+	$"E220 E451 7E45 49C5 21FD B2E6 DEFD 2505"            /* â äQ~EIÅ!ý²æÞý%. */
+	$"836B 3500 54D8 50B8 7538 C5BF B951 7FB2"            /* ƒk5.TØP¸u8Å¿¹Q.² */
+	$"F927 CBB1 7AA1 D0BD 51E2 D7F7 C440 5DA0"            /* ù'˱z¡Ð½Qâ×÷Ä@]  */
+	$"89EF FEEE BF2E A5E4 F98A B652 F25A D1DC"            /* ‰ïþî¿.¥äùŠ¶RòZÑÜ */
+	$"482A 40CB A288 250A 22CA BCB4 815D 077E"            /* H*@Ë¢ˆ%Â"ʼ´�].~ */
+	$"229E 59B2 8249 D336 A3C1 5D5B FAE5 483C"            /* "žY²‚IÓ6£Á][úåH< */
+	$"67F3 255E 1530 AFB1 D900 48FE 254B C54E"            /* gó%^.0¯±Ù.Hþ%KÅN */
+	$"42DC EE54 066B CE83 B1C9 F021 2031 8DF1"            /* BÜîT.k΃±Éð! 1�ñ */
+	$"FE58 9315 B761 79CA 409A 6CD6 337A 14A9"            /* þX“.·ayÊ@šlÖ3z.© */
+	$"8622 90BC 3474 727C 66CE 09C5 61B4 A386"            /* †"�¼4tr|fÎÆÅa´£† */
+	$"7509 819F 6EEB 5FCC C0A7 084A 7742 A6E3"            /* uÆ�Ÿnë_ÌÀ§.JwB¦ã */
+	$"F69A 90CA 24AD EB53 60AB 5FD0 FD6F 3DE6"            /* öš�Ê$­ëS`«_Ðýo=æ */
+	$"44CF 80FB A400 B71F 1DD4 C690 A3DB 54CF"            /* DÏ€û¤.·..ÔÆ�£ÛTÏ */
+	$"F492 7EC7 540C 048F 3D35 FD63 7593 751B"            /* ô’~ÇT..�=5ýcu“u. */
+	$"F88F 4B7D E355 6685 FD5F 2743 8DF3 D839"            /* ø�K}ãUf…ý_'C�óØ9 */
+	$"0894 99DB 1FAA 22B2 8800 8C9F D91F E60B"            /* .”™Û.ª"²ˆ.ŒŸÙ.æ. */
+	$"0EEE 2870 2932 2AE5 F401 11F0 8B2B 53DB"            /* .î(p)2*åô..ð‹+SÛ */
+	$"8028 E39D 744F E70B 11F3 A220 ABF4 FCD5"            /* €(ã�tOç..ó¢ «ôüÕ */
+	$"37C9 0AC8 8749 215E 1D89 4022 96D0 04FF"            /* 7ÉÂȇI!^.‰@"–Ð.ÿ */
+	$"0C57 AC3D 351A 8582 EBA4 EA2B B65B A14B"            /* .W¬=5.…‚ë¤ê+¶[¡K */
+	$"048B E031 DE15 251C 669F 8457 FF38 D131"            /* .‹à1Þ.%.fŸ„Wÿ8Ñ1 */
+	$"0027 BB20 9721 6636 A375 AFBA AF7B BDBA"            /* .'» —!f6£u¯º¯{½º */
+	$"05F3 3114 E55E DAA9 219F 9516 F3DF 12B4"            /* .ó1.å^Ú©!Ÿ•.óß.´ */
+	$"DA3F 83DF 13A0 9900 3FA6 17E9 B014 E404"            /* Ú?ƒß. ™.?¦.é°.ä. */
+	$"434D 02D4 4283 D73D F4D1 5D95 8B25 6A6A"            /* CM.ÔBƒ×=ôÑ]•‹%jj */
+	$"CD5E BA93 82DF 1A30 4B0D 0E21 65A1 0001"            /* Í^º“‚ß.0K..!e¡.. */
+	$"2869 F06A 8949 311F DB03 39EB E8E1 5BFB"            /* (iðj‰I1.Û.9ëèá[û */
+	$"F11C 05C6 2469 BAEA 4516 4CC4 DAF5 927A"            /* ñ..Æ$iºêE.LÄÚõ’z */
+	$"2CEB 3150 DB6F 4DE2 8EED 59C0 604F 9AE5"            /* ,ë1PÛoMâŽíYÀ`Ošå */
+	$"E136 83B0 F348 3D1A B44D 3A8E D77A B0DE"            /* á6ƒ°óH=.´M:Ž×z°Þ */
+	$"5267 1055 24F7 3C3D EB3E 08EF 97F9 4B29"            /* Rg.U$÷<=ë>.ï—ùK) */
+	$"454F 1B5D 4A6E 56E1 0F90 00A1 4467 7454"            /* EO.]JnVá.�.¡DgtT */
+	$"B556 362A 9A19 9E35 19E9 BFDF E2AD 91D6"            /* µV6*š.ž5.é¿ßâ­‘Ö */
+	$"7FB6 95B9 F19D 8D07 2FAF 3162 D880 0AA7"            /* .¶•¹ñ��./¯1b؀§ */
+	$"C9C4 94AD C49A 1231 2D9F 780F 6E3E 57D2"            /* ÉÄ”­Äš.1-Ÿx.n>WÒ */
+	$"8C1C 582C 179A 721C 7063 F056 F938 4EA1"            /* Œ.X,.šr.pcðVù8N¡ */
+	$"F3E4 E458 D254 280F 92CA ABDC 4ECF 3EB7"            /* óääXÒT(.’Ê«ÜNÏ>· */
+	$"95DF A3B8 45C0 1427 BA54 B2E2 D1BC B67D"            /* •ß£¸EÀ.'ºT²âѼ¶} */
+	$"5A0F EE12 37D4 BE1C 5785 A90D 2E62 B301"            /* Z.î.7Ô¾.W…©..b³. */
+	$"F66D A637 374B 17DA 7446 C318 3B11 4F50"            /* öm¦77K.ÚtFÃ.;.OP */
+	$"ED27 AEB2 D8F6 C3E4 AB48 5E7C 1D46 9463"            /* í'®²ØöÃä«H^|.F”c */
+	$"E7BA 9296 7BFA FDBB 39F2 7E86 1A5D 8FFA"            /* 纒–{úý»9ò~†.]�ú */
+	$"7E06 FC92 3472 7950 8B67 8329 FA9F 47AA"            /* ~.ü’4ryP‹gƒ)úŸGª */
+	$"51F3 01AD A6DA 224F E711 AF6F BA8F FA86"            /* Qó.­¦Ú"Oç.¯oº�ú† */
+	$"FF61 EBD1 5613 B076 3543 3515 FF1B 1E9C"            /* ÿaëÑV.°v5C5.ÿ..œ */
+	$"CE78 6A36 7CCF FD63 E9E3 00E6 EA60 1DBE"            /* Îxj6|Ïýcéã.æê`.¾ */
+	$"42FB 3E66 D69D 8BA6 A0E6 13E1 2087 20D7"            /* Bû>fÖ�‹¦ æ.á ‡ × */
+	$"7941 E3C4 C7C6 67FF 2C9C A486 253A C206"            /* yAãÄÇÆgÿ,œ¤†%:Â. */
+	$"F961 4A0E D9DD D32A 6D67 A012 B1A2 B549"            /* ùaJ.ÙÝÓ*mg .±¢µI */
+	$"3F58 8BA1 CA98 94EB 6099 570C D139 09AA"            /* ?X‹¡Ê˜”ë`™W.Ñ9ƪ */
+	$"8DEB C31A 0812 5DAD 2926 6846 D789 4430"            /* �ëÃ...]­)&hF׉D0 */
+	$"4931 16B5 0804 52F1 040D B0A7 DDD7 7052"            /* I1.µ..Rñ..°§Ý×pR */
+	$"4269 C765 98AA 3941 F9EE 987A 2EAD 46BE"            /* BiÇe˜ª9Aùî˜z.­F¾ */
+	$"AA2B DD79 D9F9 7AF7 9318 B633 97CC DB93"            /* ª+ÝyÙùz÷“.¶3—ÌÛ“ */
+	$"5AF7 23D4 08E5 1FD7 EA45 85E9 4C98 77B6"            /* Z÷#Ô.å.×êE…éL˜w¶ */
+	$"0038 8756 6C8F 1A76 8D36 D67C 0BBD 248F"            /* .8‡Vl�.v�6Ö|.½$� */
+	$"8465 4CC4 7B7A C1B7 6348 F763 66A7 F04E"            /* „eLÄ{zÁ·cH÷cf§ðN */
+	$"FF4E 1C72 1053 323F 9E55 F75D 4097 9C24"            /* ÿN.r.S2?žU÷]@—œ$ */
+	$"AD5D 3C1B 766A 50A8 7252 6563 2687 8251"            /* ­]<.vjP¨rRec&‡‚Q */
+	$"8AE2 2EAE 6AA9 6439 2831 281E 034D 7999"            /* Šâ.®j©d9(1(..My™ */
+	$"F46F 47C1 911D 553A D887 0E8F 6E83 1B48"            /* ôoGÁ‘.U:؇.�nƒ.H */
+	$"F0D9 C566 C0FF 0F02 5E68 EA76 7381 25B1"            /* ðÙÅfÀÿ..^hêvs�%± */
+	$"D388 A375 370B A655 625B B71A 191C CD9D"            /* Óˆ£u7.¦Ub[·...Í� */
+	$"F3CA 83B2 88D6 3712 B3E3 6CEA 19DC 3295"            /* óʃ²ˆÖ7.³ãlê.Ü2• */
+	$"3398 DF4F 1279 B346 1DD8 ED24 186F BEE1"            /* 3˜ßO.y³F.Øí$.o¾á */
+	$"8FD4 5FAD EAFF 6960 DE17 A0A4 B89E 7CF3"            /* �Ô_­êÿi`Þ. ¤¸ž|ó */
+	$"C360 9DA8 91BF 470F ECC0 C0AA E260 3430"            /* Ã`�¨‘¿G.ìÀÀªâ`40 */
+	$"EF4E CAD6 F964 05B0 8E27 C1F6 7516 4350"            /* ïNÊÖùd.°Ž'Áöu.CP */
+	$"B87D 7D16 703E 7972 1232 2E0F 6577 664C"            /* ¸}}.p>yr.2..ewfL */
+	$"8FA6 1414 7FB2 A33D A69E FD2F CF21 FC8F"            /* �¦...²£=¦žý/Ï!ü� */
+	$"23A5 6AED 3E28 34A0 F73F F7D6 7F7C 5B6B"            /* #¥jí>(4 ÷?÷Ö.|[k */
+	$"0596 8B6D BACA 52DF 8E72 CDBA E221 7092"            /* .–‹mºÊRߎrͺâ!p’ */
+	$"A3AB B99D 1EE3 3F21 1AD2 0F0B DC5A 8BE1"            /* £«¹�.ã?!.Ò..ÜZ‹á */
+	$"9E35 D891 9A60 EF28 5934 FA3B 8009 DC42"            /* ž5Ø‘š`ï(Y4ú;€ÆÜB */
+	$"11BE 487F D776 AF26 0EBD BF3E 8DCC B940"            /* .¾H.×v¯&.½¿>�̹@ */
+	$"2523 D6E1 447F EA8A 5F66 DE0B 0962 249E"            /* %#ÖáD.êŠ_fÞ.Æb$ž */
+	$"165D BB6D 1EBD 1237 021B F903 DEEF 78FE"            /* .]»m.½.7..ù.Þïxþ */
+	$"B3F3 76B7 429F 336D 0EFA FF47 5CBC E3DF"            /* ³óv·BŸ3m.úÿG\¼ãß */
+	$"FC44 41BA BC9D 67AE 0B43 D817 FBCE 4F36"            /* üDAº¼�g®.CØ.ûÎO6 */
+	$"8209 CCB5 38F6 712E 7DEA 4E9E 4B38 3B80"            /* ‚Æ̵8öq.}êNžK8;€ */
+	$"7B16 28E3 AB59 340E 93F0 4C65 C281 A4F1"            /* {.(ã«Y4.“ðLeÂ�¤ñ */
+	$"08E4 26A6 31AA B6A4 F784 BA8E C7FA 8919"            /* .ä&¦1ª¶¤÷„ºŽÇú‰. */
+	$"4B19 FA98 09C8 3C79 27DA CB39 881C 3B0E"            /* K.ú˜ÆÈ<y'ÚË9ˆ.;. */
+	$"9BEA 1EF3 D655 CFEB B4F7 0888 971D 69EF"            /* ›ê.óÖUÏë´÷.ˆ—.iï */
+	$"1105 0EF2 80B8 FF1E F0BE 107F 9AB0 6C52"            /* ...ò€¸ÿ.ð¾..š°lR */
+	$"FF78 3AA4 8FE0 3370 40DF C5E8 478A 2FCF"            /* ÿx:¤�à3p@ßÅèGŠ/Ï */
+	$"96C5 8D32 8E07 AA93 DA95 4D9B 60C6 2748"            /* –Å�2Ž.ª“Ú•M›`Æ'H */
+	$"C8F4 8347 D2D9 2E35 75E4 333A 6494 B177"            /* ÈôƒGÒÙ.5uä3:d”±w */
+	$"C836 6E4F AF08 CDB0 0FA5 D565 A0EC 946F"            /* È6nO¯.Í°.¥Õe ì”o */
+	$"ED5C 03F6 E5DB FA4F D29A BF8F BC7F 12D8"            /* í\.öåÛúOÒš¿�¼..Ø */
+	$"7730 8564 524D 4B31 F681 8C71 C5BC 1641"            /* w0…dRMK1ö�Œqż.A */
+	$"6988 F9CF 0385 B8EE 4C04 07DB 5AD2 531C"            /* iˆùÏ.…¸îL..ÛZÒS. */
+	$"48BA 3E6F E24E AF73 DB5E B729 A4BF 894A"            /* Hº>oâN¯sÛ^·)¤¿‰J */
+	$"782D E8F2 91C9 E628 322C F20C 2D0C 73DD"            /* x-èò‘Éæ(2,ò.-.sÝ */
+	$"F093 4ED7 63DF E121 E7B9 DB7E 530D E3BD"            /* ð“N×cßá!ç¹Û~S.ã½ */
+	$"3469 29CE 5768 BE0F 1E91 46B7 00A0 CC2E"            /* 4i)ÎWh¾..‘F·. Ì. */
+	$"183D 7D57 762C 062D 0707 EBA4 177D 73E8"            /* .=}Wv,.-..ë¤.}sè */
+	$"FA30 83A6 479B AA9A 702E B8FD 9B54 0FF3"            /* ú0ƒ¦G›ªšp.¸ý›T.ó */
+	$"8222 1EB0 4CDD 4CF7 F0AB 8972 B655 9426"            /* ‚".°LÝL÷ð«‰r¶U”& */
+	$"4EEE 3B88 A6D2 F8B9 6845 0467 D606 9DDD"            /* Nî;ˆ¦Òø¹hE.gÖ.�Ý */
+	$"C547 A61F 71E7 5A8E 6B83 51FD B2C1 A732"            /* ÅG¦.qçZŽkƒQý²Á§2 */
+	$"A6EA A0AA 6D13 E80B 0EC4 5DF4 348F FF6E"            /* ¦ê ªm.è..Ä]ô4�ÿn */
+	$"2289 CFB4 1AE2 18D1 340F B29B E1FF 16B1"            /* "‰Ï´.â.Ñ4.²›áÿ.± */
+	$"0F0F B5AD 260A 7FD9 B1F2 3D0C 404F 75A8"            /* ..µ­&Â.Ù±ò=.@Ou¨ */
+	$"E4DB 52EE 259B D762 E5E5 4FFD 22AC 4856"            /* äÛRî%›×bååOý"¬HV */
+	$"9C62 8DDB F5D8 58F8 4EC7 1110 30EC E0D8"            /* œb�ÛõØXøNÇ..0ìàØ */
+	$"7FED 0176 FEF2 53B3 75C6 34E1 A3A7 79DA"            /* .í.vþòS³uÆ4ᣧyÚ */
+	$"1FDC 42EC 83B2 F3EB 056C E41B 4E65 3699"            /* .ÜB샲óë.lä.Ne6™ */
+	$"4BD6 1AE3 85A9 DBF6 89D4 39B0 79F9 8877"            /* KÖ.ã…©Ûö‰Ô9°yùˆw */
+	$"161C 2CB5 3F3C 294B 8CA3 A6F6 556C 4CAD"            /* ..,µ?<)KŒ£¦öUlL­ */
+	$"A752 918D 7E61 BA54 02D2 CF5C AEBE 1A0B"            /* §R‘�~aºT.ÒÏ\®¾.. */
+	$"B75C A9CA 9876 AB0B 6028 4D8E D46C E479"            /* ·\©Ê˜v«.`(MŽÔläy */
+	$"A186 EA09 496E 0935 04E2 4C25 FA18 270B"            /* ¡†êÆInÆ5.âL%ú.'. */
+	$"A054 DE1C 1BD8 A089 9D95 1335 E93C 7C21"            /*  TÞ..Ø ‰�•.5é<|! */
+	$"435E A570 3C42 AA88 0075 BB20 20AF 90EC"            /* C^¥p<Bªˆ.u»  ¯�ì */
+	$"26F9 7E41 5CC7 2154 63A3 D965 075C 1A78"            /* &ù~A\Ç!Tc£Ùe.\.x */
+	$"2A13 753E DDD9 F846 467C EFC6 5308 2B46"            /* *.u>ÝÙøFF|ïÆS.+F */
+	$"5BD9 2BFF 5F26 72DB 523D D0FC CE49 47B0"            /* [Ù+ÿ_&rÛR=ÐüÎIG° */
+	$"D98B 4D36 1B60 7C3A 0707 F46A 8565 4CCB"            /* Ù‹M6.`|:..ôj…eLË */
+	$"5DC1 A50D C039 BF24 7418 78A7 6D4F DE55"            /* ]Á¥.À9¿$t.x§mOÞU */
+	$"1CB8 B787 158C 6C4D D840 920F 3130 7A92"            /* .¸·‡.ŒlMØ@’.10z’ */
+	$"1CF4 1B74 BC2B 8954 0A80 9636 BFC3 6330"            /* .ô.t¼+‰T€–6¿Ãc0 */
+	$"3E7F 7E4E A811 39F2 3D56 10D3 6A76 4E20"            /* >.~N¨.9ò=V.ÓjvN  */
+	$"F646 5CD3 9166 D2D6 046F E398 A934 2D04"            /* öF\Ó‘fÒÖ.o㘩4-. */
+	$"2E01 C602 1332 8274 6AE2 D5C9 6226 30B3"            /* ..Æ..2‚tjâÕÉb&0³ */
+	$"07DB FDF3 B3BB 6C31 B162 FF63 0639 8E6F"            /* .Ûýó³»l1±bÿc.9Žo */
+	$"3501 A54C 1AA6 42EB EDE7 885E EE2F A6D9"            /* 5.¥L.¦Bëíçˆ^î/¦Ù */
+	$"B74A AE20 8FFB 6FCF A537 642D F17F A45E"            /* ·J® �ûoÏ¥7d-ñ.¤^ */
+	$"EE37 DE05 7569 A81E F464 A35B 603B 4F40"            /* î7Þ.ui¨.ôd£[`;O@ */
+	$"D00F C3D2 D04A F943 AC3C 37E2 1B2B A1D3"            /* Ð.ÃÒÐJùC¬<7â.+¡Ó */
+	$"09D6 A92B F7CB B2FA 9FF7 97F2 83F9 BABC"            /* ÆÖ©+÷˲úŸ÷—òƒùº¼ */
+	$"E4BE F015 E804 97FC A16F 6E8B 9004 8424"            /* ä¾ð.è.—ü¡on‹�.„$ */
+	$"04F7 1295 0A15 3C1A AA5D 6A75 372A 0BB4"            /* .÷.•Â.<.ª]ju7*.´ */
+	$"4849 DD4A 012F D969 23A9 FBA7 C3EB D29F"            /* HIÝJ./Ùi#©û§ÃëÒŸ */
+	$"5CE0 BD6F 8436 26BB 1B52 3BCB DCAA 0791"            /* \à½o„6&».R;Ëܪ.‘ */
+	$"02B3 8EC7 5A89 D402 C9FF 058E E2C8 AD72"            /* .³ŽÇZ‰Ô.Éÿ.ŽâÈ­r */
+	$"01BF D9B3 FA52 B000 0000 3090 8B4E 8809"            /* .¿Ù³úR°...0�‹NˆÆ */
+	$"9E4F 59A7 8021 D030 169B 78E6 55B4 9FB8"            /* žOY§€!Ð0.›xæU´Ÿ¸ */
+	$"48A1 D2F4 BE8E A948 A89E 5E3E BE56 AE8C"            /* H¡Òô¾Ž©H¨ž^>¾V®Œ */
+	$"BF6C 6485 F435 4906 BE37 4D88 589A 85C0"            /* ¿ld…ô5I.¾7MˆXš…À */
+	$"5278 59EC 1FED 3652 3FE0 5229 0524 D686"            /* RxYì.í6R?àR).$Ö† */
+	$"1E5E 14D9 8C56 8742 9625 36BB 4674 0391"            /* .^.ÙŒV‡B–%6»Ft.‘ */
+	$"9647 FCC9 30C4 6D0D 5812 1271 E9C8 E89D"            /* –GüÉ0Äm.X..qéÈè� */
+	$"7F9B 3420 0269 5F58 4554 F964 BDDA E9F3"            /* .›4 .i_XETùd½Úéó */
+	$"973A 5B5F 4C59 107B 2D9E 87CB D896 1F13"            /* —:[_LY.{-ž‡ËØ–.. */
+	$"AC52 F00D 3600 9104 3FF2 399A 0158 5153"            /* ¬Rð.6.‘.?ò9š.XQS */
+	$"139A A5C2 51CC D2C7 D082 C2A0 E35B FE05"            /* .š¥ÂQÌÒÇЂ ã[þ. */
+	$"06C9 DBB4 7036 39DB 80AF 4642 9F53 170C"            /* .ÉÛ´p69Û€¯FBŸS.. */
+	$"2856 38D5 0FA7 B562 4ED8 3BB5 B48A B1C8"            /* (V8Õ.§µbNØ;µ´Š±È */
+	$"B20B 4B42 4499 C5C1 242B A1BA CB74 D8F1"            /* ².KBD™ÅÁ$+¡ºËtØñ */
+	$"1CF1 241E 7A2A B847 111D 13DC CD3C 05A3"            /* .ñ$.z*¸G...ÜÍ<.£ */
+	$"024F 25B5 41E2 0A15 E1C4 1A0E A5D8 0742"            /* .O%µAâÂ.áÄ..¥Ø.B */
+	$"A359 2372 FD88 7447 1DB7 F766 5B7F E63E"            /* £Y#rýˆtG.·÷f[.æ> */
+	$"26B8 BC6E 7B72 E331 2BE1 73BD 04A0 E941"            /* &¸¼n{rã1+ás½. éA */
+	$"45EC 9039 8769 8BFF 1624 8D43 CA24 9D0D"            /* Eì�9‡i‹ÿ.$�CÊ$�. */
+	$"A05B F467 7401 E777 0608 C4A6 A698 9A9B"            /*  [ôgt.çw..Ħ¦˜š› */
+	$"7066 11D3 606F 857E 18D8 D9D3 E226 38C0"            /* pf.Ó`o…~.ØÙÓâ&8À */
+	$"D89B 09D9 A2F1 0171 BAC9 D7BF AB2E BD58"            /* Ø›ÆÙ¢ñ.qºÉ׿«.½X */
+	$"7178 6CC2 608D 447D D92A 621C 1A82 B764"            /* qxlÂ`�D}Ù*b..‚·d */
+	$"2ABE CBE8 07C0 E2A6 9B83 46A8 1109 FC87"            /* *¾Ëè.À⦛ƒF¨.Æü‡ */
+	$"F083 9598 26AE 8847 7E22 278D 9311 59FC"            /* ðƒ•˜&®ˆG~"'�“.Yü */
+	$"2995 1D44 BA58 24BC 2A99 3946 0E00 9144"            /* )•.DºX$¼*™9F..‘D */
+	$"9113 0297 29E3 A7B5 B937 2D23 8405 86ED"            /* ‘..—)㧵¹7-#„.†í */
+	$"29F1 5254 6A8C 0FB8 4B13 F6C3 6028 2C14"            /* )ñRTjŒ.¸K.öÃ`(,. */
+	$"3B80 E317 225C 7A9B 405C 7E95 A2E4 311B"            /* ;€ã."\z›@\~•¢ä1. */
+	$"076A D7B8 A4B5 225A 1F29 FAA2 8239 D98F"            /* .j׸¤µ"Z.)ú¢‚9Ù� */
+	$"071A F302 DA24 AE80 2AC0 D108 035D EA76"            /* ..ó.Ú$®€*ÀÑ..]êv */
+	$"2F7E 850F 9E87 6B19 B2F1 F1E5 F5B3 A5AF"            /* /~….ž‡k.²ññåõ³¥¯ */
+	$"35BB D867 8257 8A48 5E4F 6983 E22E 6DAD"            /* 5»Øg‚WŠH^Oiƒâ.m­ */
+	$"D361 1505 ECF2 3F3C DB84 1861 E5AB 6793"            /* Óa..ìò?<Û„.aå«g“ */
+	$"910D 8F56 6BB5 FD17 29DB 242A 6946 8022"            /* ‘.�Vkµý.)Û$*iF€" */
+	$"7DAF 8120 02EB C840 3765 69EC BB8B F2FF"            /* }¯� .ëÈ@7ei컋òÿ */
+	$"6031 7BE4 EFC4 BECD 7BD7 CB0A 8B8C 75C2"            /* `1{äïľÍ{×Ë‹Œu */
+	$"E63A F4E4 B05B 1442 0CB1 BEBD E078 84F5"            /* æ:ôä°[.B.±¾½àx„õ */
+	$"3D95 24FA 952F 949B AD72 01B7 1CC7 4CA6"            /* =•$ú•/”›­r.·.ÇL¦ */
+	$"78C2 BA05 B757 517A 5CB1 A380 0C23 0680"            /* xº.·WQz\±£€.#.€ */
+	$"3113 0CBA 23B8 AA48 F832 B74F 997E 6E03"            /* 1..º#¸ªHø2·O™~n. */
+	$"D16C 577F 968F E9A4 73CA DA79 07B3 A5F1"            /* ÑlW.–�é¤sÊÚy.³¥ñ */
+	$"2D20 C13D F821 62F9 41A0 A7AA 472A 368A"            /* - Á=ø!bùA §ªG*6Š */
+	$"28EE 7686 F7B4 D5CF 225E 004E 709F C4E8"            /* (îv†÷´ÕÏ"^.NpŸÄè */
+	$"FCBC B778 C976 A1E0 1968 1EF9 E998 2DC2"            /* ü¼·xÉv¡à.h.ùé˜- */
+	$"1693 C645 A4F5 787A 5B10 45C0 F010 8596"            /* .“ÆE¤õxz[.EÀð.…– */
+	$"A0F6 E8AA 1BAC C958 C0F6 101E 0C4D 2E61"            /*  öèª.¬ÉXÀö...M.a */
+	$"B76E 4019 58DD 3058 000C 2375 6EBC 6599"            /* ·n@.XÝ0X..#un¼e™ */
+	$"BEA3 9ADC 0002 F98F 24B3 B036 EA0D F2FD"            /* ¾£šÜ..ù�$³°6ê.òý */
+	$"6823 E10A 59D7 5D0B F6C0 EFB2 7D9D A684"            /* h#áÂY×].öÀï²}�¦„ */
+	$"3084 4AD6 92F2 BFB2 57CA 7294 FF2D 53C8"            /* 0„JÖ’ò¿²WÊr”ÿ-SÈ */
+	$"8D05 254E 2360 582F CE0C E209 240D FAB4"            /* �.%N#`X/Î.âÆ$.ú´ */
+	$"C638 2103 7462 2AF1 5461 2036 09B4 294F"            /* Æ8!.tb*ñTa 6Æ´)O */
+	$"52A6 6553 F6B7 85F6 E77F A8B7 058C F201"            /* R¦eSö·…öç.¨·.Œò. */
+	$"19BA D75B 6612 0013 CFA6 F54F 8855 C000"            /* .º×[f...ϦõOˆUÀ. */
+	$"00BE 57DE C13B 77B0 AF81 F95D 8E88 7224"            /* .¾WÞÁ;w°¯�ù]Žˆr$ */
+	$"002F C7BE 1D06 F540 58EF 1909 1D8F 037F"            /* ./Ǿ..õ@Xï.Æ.�.. */
+	$"E973 290F 641E 8849 F996 EA66 D15C CA23"            /* és).d.ˆIù–êfÑ\Ê# */
+	$"C620 3090 94D8 F95F C58C 720B 7FFE 206C"            /* Æ 0�”Øù_ÅŒr..þ l */
+	$"A3E0 EE49 AE89 4586 6617 FE87 4D7B D300"            /* £àîI®‰E†f.þ‡M{Ó. */
+	$"4CF6 E77F A882 E041 362F 710E AC03 D573"            /* Löç.¨‚àA6/q.¬.Õs */
+	$"69FF 7480 0018 484B 0D10 C800 0000 0C24"            /* iÿt€..HK..È....$ */
+	$"183F ADBF D900 0184 8481 E82C C758 1848"            /* .?­¿Ù..„„�è,ÇX.H */
+	$"4840 6806 1212 B020 EA50 0818 484B F6E7"            /* H@h...° êP..HKöç */
+	$"7FA5 E774 6249 2F3D 5FF9 2FC0 0C24 1656"            /* .¥çtbI/=_ù/À.$.V */
+	$"1B91 8000 1846 D5F4 CA01 40C2 3F26 3D84"            /* .‘€..FÕôÊ.@Â?&=„ */
+	$"7B4A 811F 08D6 B47D 05C2 4402 D57B C1FC"            /* {J�..Ö´}.ÂD.Õ{Áü */
+	$"7D32 E6FE 8125 F24E 514B 2820 7323 F96F"            /* }2æþ�%òNQK( s#ùo */
+	$"B1F9 CDBD 94E4 C9BF 81D6 5A26 1C08 2131"            /* ±ùͽ”äÉ¿�ÖZ&..!1 */
+	$"FF58 608E A4BB BEFD 703F C3EA B596 2AEA"            /* ÿX`Ž¤»¾ýp?Ãêµ–*ê */
+	$"48B2 2319 2F7A B9BC A14D EAB4 49CF 89E9"            /* H²#./z¹¼¡Mê´Iωé */
+	$"D312 5979 1910 6519 C45E 4B88 F709 D65D"            /* Ó.Yy..e.Ä^Kˆ÷ÆÖ] */
+	$"BF0F 86DC C883 8469 9757 7FC7 FB91 A851"            /* ¿.†Üȃ„i—W.Çû‘¨Q */
+	$"7834 0232 03F5 F552 B022 E799 431E 3FE8"            /* x4.2.õõR°"ç™C.?è */
+	$"BE7C A37B AAE1 D04F 9795 EA98 CAB0 6816"            /* ¾|£{ªáÐO—•ê˜Ê°h. */
+	$"047F 244A 2BD3 E0CF B862 B172 B1B3 F027"            /* ..$J+Óàϸb±r±³ð' */
+	$"6505 A5AA 6AB2 5F8E B98F 85CB D487 2603"            /* e.¥ªj²_Ž¹�…ËÔ‡&. */
+	$"BDA4 4C6D 4B74 0A12 117F 6137 6A30 37CE"            /* ½¤LmKtÂ...a7j07Î */
+	$"0441 188C 63FC 46ED 5C9A B6A0 9012 6450"            /* .A.ŒcüFí\š¶ �.dP */
+	$"A042 C4D3 8E69 8930 0797 25B3 B70D 5C62"            /*  BÄÓŽi‰0.—%³·.\b */
+	$"6A83 3964 5EF1 4A28 508D FF7F E847 17D0"            /* jƒ9d^ñJ(P�ÿ.èG.Ð */
+	$"7C91 F4BC AA82 5462 99EF FF79 5A7A E45E"            /* |‘ô¼ª‚Tb™ïÿyZzä^ */
+	$"98FF 5B1E 90FE 7F80 9453 7AD1 4A63 8FFC"            /* ˜ÿ[.�þ.€”SzÑJc�ü */
+	$"1B61 796C 4B90 7FE9 1959 752B 8579 95F8"            /* .aylK�.é.Yu+…y•ø */
+	$"C5B9 7EC6 2D24 5185 1BCE 12D6 B418 B42C"            /* Ź~Æ-$Q….Î.Ö´.´, */
+	$"D40F 7AF7 657E 5184 9CAA 8834 B65C 4785"            /* Ô.z÷e~Q„œªˆ4¶\G… */
+	$"B934 7C3A 8000 0000 99F5 3F06 3790 6AF7"            /* ¹4|:€...™õ?.7�j÷ */
+	$"0769 9D8E F19F 4FF3 EDE6 D059 B97C A1F0"            /* .i�ŽñŸOóíæÐY¹|¡ð */
+	$"0CE2 4FAF B846 8CCE 52E4 E898 D2E0 00A3"            /* .âO¯¸FŒÎRäè˜Òà.£ */
+	$"CB3D F2B1 E7F7 0C30 FF13 DB29 474C C00D"            /* Ë=ò±ç÷.0ÿ.Û)GLÀ. */
+	$"C6B7 6A2D 2F89 8E2F BDE7 F2BA C3DD 591B"            /* Æ·j-/‰Ž/½çòºÃÝY. */
+	$"CEDE C7DD 35BA 492C BB53 2AF6 7315 AC30"            /* ÎÞÇÝ5ºI,»S*ös.¬0 */
+	$"17D7 1C05 3AE4 4AB3 8D31 0DC9 7A9F 0A76"            /* .×..:äJ³�1.ÉzŸÂv */
+	$"B4EE 95EE 6CB5 1C6A FE4F D27E 0966 CE51"            /* ´î•îlµ.jþOÒ~ÆfÎQ */
+	$"8607 E144 F4AD E999 5480 05FF 7FC2 C645"            /* †.áDô­é™T€.ÿ.ÂÆE */
+	$"D136 BB6E 89FA 9A2D F827 338F FEB9 B248"            /* Ñ6»n‰úš-ø'3�þ¹²H */
+	$"23A6 377D 0E53 BBF3 D290 3AD8 F58B CE4C"            /* #¦7}.S»óÒ�:Øõ‹ÎL */
+	$"24CA 8E49 76ED DA48 8856 904D C31F 305F"            /* $ÊŽIvíÚHˆV�MÃ.0_ */
+	$"C441 7DAA 86D8 3FE1 5EA7 E20A CDBC 5F2A"            /* ÄA}ª†Ø?á^§âÂͼ_* */
+	$"35DC 107F DDE2 D88C 7B38 D700 4C54 9C81"            /* 5Ü..ÝâØŒ{8×.LTœ� */
+	$"B8FD F39D 0F47 DE2B 6E17 7D4F E30F F60C"            /* ¸ýó�.GÞ+n.}Oã.ö. */
+	$"0895 5694 3006 1211 EFEC D7F8 F743 3D43"            /* .•V”0...ïì×ø÷C=C */
+	$"6BA5 7C06 9025 9188 E369 0FC8 94CB F38E"            /* k¥|.�%‘ˆãi.È”ËóŽ */
+	$"DF76 CA67 91C4 D786 F34F 1E56 332B 1404"            /* ßvÊg‘Ä׆óO.V3+.. */
+	$"B66B 2702 B13D 47B8 1FBD 38D7 A2DF 54EF"            /* ¶k'.±=G¸.½8×¢ßTï */
+	$"FD1C 00CC 5D05 5B28 3EBF 2FC7 7263 5880"            /* ý..Ì].[(>¿/ÇrcX€ */
+	$"0364 4A0B 982F 4A13 A55F 5D64 61D2 110C"            /* .dJ.˜/J.¥_]daÒ.. */
+	$"4319 318A 5BD6 94B7 DBA9 92F0 379B 0E87"            /* C.1Š[Ö”·Û©’ð7›.‡ */
+	$"4561 92A0 0000 0000 0000 12FE B897 0ABD"            /* Ea’ .......þ¸—½ */
+	$"B3C7 FEA8 AE43 B177 DA3F 2BA3 2D59 3358"            /* ³Çþ¨®C±wÚ?+£-Y3X */
+	$"9FAE 567F E53B 2877 9FFF 7FFF 7FFB 4B90"            /* Ÿ®V.å;(wŸÿ.ÿ.ûK� */
+	$"C00D FEA3 7DF6 39C4 C825 2952 2C65 8FFF"            /* À.þ£}ö9ÄÈ%)R,e�ÿ */
+	$"7E91 DB49 1333 7DEC 6471 1E2E 394E A080"            /* ~‘ÛI.3}ìdq..9N € */
+	$"C1C9 0DD4 62C4 4FC9 E332 BC0D F9DD FEAB"            /* ÁÉ.ÔbÄOÉã2¼.ùÝþ« */
+	$"9D33 8271 2A01 8484 B009 6058 624E 2736"            /* �3‚q*.„„°Æ`XbN'6 */
+	$"529C A0F4 BCBB 846D 32FD 407C FA84 2D52"            /* Rœ ô¼»„m2ý@|ú„-R */
+	$"21DC 1623 210B 0410 4061 212D 0386 04FF"            /* !Ü.#!...@a!-.†.ÿ */
+	$"7F72 1DFF 6F83 6A31 2B6E 0A6B D1F1 9A43"            /* .r.ÿoƒj1+nÂkÑñšC */
+	$"F340 2C47 D413 DFAC FF76 46AC 4BDD 55F0"            /* ó@,GÔ.߬ÿvF¬KÝUð */
+	$"2F9A 3BC6 613E 2F69 F45C 08F3 3FCB F83F"            /* /š;Æa>/iô\.ó?Ëø? */
+	$"F7D8 DC38 0F99 4764 0309 0948 41C6 1212"            /* ÷ØÜ8.™Gd.ÆÆHAÆ.. */
+	$"293B 5EA3 BE56 F760 BAEF 61FF 43D4 2891"            /* );^£¾V÷`ºïaÿCÔ(‘ */
+	$"A380 672E FF7E 4B98 FBFB 1ACD 90F6 4A7E"            /* £€g.ÿ~K˜ûû.Í�öJ~ */
+	$"3B14 E9F4 B1B4 4120 E600 AF42 0056 B131"            /* ;.éô±´A æ.¯B.V±1 */
+	$"0310 EF4F EA97 E030 9090 A298 F514 CEFA"            /* ..ïOê—à0��¢˜õ.Îú */
+	$"B200 0061 211A A495 FD76 5850 B8F7 1CF1"            /* ²..a!.¤•ývXP¸÷.ñ */
+	$"A979 F478 5BFF 7FFB E6D6 F6D8 03FF 7FFD"            /* ©yôx[ÿ.ûæÖöØ.ÿ.ý */
+	$"2A36 38D4 BA43 6280 D508 C4BD 735D 1C6F"            /* *68ÔºCb€Õ.Ľs].o */
+	$"2444 63E9 1C9A 969F 90A6 F34E D24D 94F2"            /* $Dcé.š–Ÿ�¦óNÒM”ò */
+	$"1A09 F86A 2762 886F FBA0 96EA 1DC7 0364"            /* .Æøj'bˆoû –ê.Ç.d */
+	$"6192 A000 0000 0000 0000 0000 0061 BE9F"            /* a’ ..........a¾Ÿ */
+	$"2C25 5C25 4958 1428 AA60 5ABF 5551 6084"            /* ,%\%IX.(ª`Z¿UQ`„ */
+	$"D319 B739 1DC3 F92F 03A7 CF66 39CC 13BE"            /* Ó.·9.Ãù/.§Ïf9Ì.¾ */
+	$"100A 204E 9A06 CBD9 A8ED 9E4D CEED AE53"            /* . Nš.ËÙ¨ížMÎí®S */
+	$"023D B3BF AC07 F70E F7DD 2601 E2B4 B214"            /* .=³¿¬.÷.÷Ý&.â´². */
+	$"3B1D 74CD 0F60 7063 EFC5 24B8 3B0F DF21"            /* ;.tÍ.`pcïÅ$¸;.ß! */
+	$"2929 3755 A800 7D09 63D9 1548 5D89 6D22"            /* ))7U¨.}ÆcÙ.H]‰m" */
+	$"FAEF 37DC EB96 FF52 0018 EBDF 464C 8B34"            /* úï7Üë–ÿR..ëßFL‹4 */
+	$"DF85 2990 1CF1 7C84 CEDC D384 5003 D5A1"            /* ß…)�.ñ|„ÎÜÓ„P.Õ¡ */
+	$"2797 DBDC FDFB 0E8C 3703 470D 1FD5 B974"            /* '—ÛÜýû.Œ7.G..Õ¹t */
+	$"5A32 CF32 3D2A 0213 FDC8 8A0C B595 4840"            /* Z2Ï2=*..ýÈŠ.µ•H@ */
+	$"C240 6E40 D585 AF4C 004A F98F FC90 E5BB"            /* Â@n@Õ…¯L.Jù�ü�å» */
+	$"D6AD 2A34 0A6E 1D4D 933D 2221 80B7 C8EF"            /* Ö­*4Ân.M“="!€·Èï */
+	$"7C61 2953 2991 F91A 61A3 B54E 56D2 77E1"            /* |a)S)‘ù.a£µNVÒwá */
+	$"1DB8 8B5F 5E9C 7D32 80A0 C23F BBE6 A2B2"            /* .¸‹_^œ}2€ Â?»æ¢² */
+	$"D49F C777 4BE6 FDA6 7B0F 2983 E19B 84FF"            /* ÔŸÇwKæý¦{.)ƒá›„ÿ */
+	$"4B7B 0DD6 A35E 60AD 632D D6D7 7030 0A9F"            /* K{.Ö£^`­c-Ö×p0Ÿ */
+	$"0FA2 0820 8451 9624 D0FF 1FB4 9B81 61CC"            /* .¢. „Q–$Ðÿ.´›�aÌ */
+	$"591F 6D98 E1AF 16E4 AF42 1FE0 B7C7 30DF"            /* Y.m˜á¯.ä¯B.à·Ç0ß */
+	$"CFFC EC14 15A1 B07A 4E11 ED5F BDB3 FD2A"            /* Ïüì..¡°zN.í_½³ý* */
+	$"84B1 6901 4333 27BB 2E8C 3329 2064 A800"            /* „±i.C3'».Œ3) d¨. */
+	$"0001 2FDE 803E 817B C369 A30F FCF0 FF1D"            /* ../Þ€>�{Ãi£.üðÿ. */
+	$"89A1 2FD7 FF71 B63D 19EC 98DE DFE2 D9B8"            /* ‰¡/×ÿq¶=.ì˜ÞßâÙ¸ */
+	$"9D39 1737 4722 2A89 D291 623B 279F BF0B"            /* �9.7G"*‰Ò‘b;'Ÿ¿. */
+	$"E8C0 8AF8 CBE4 0011 5D58 29AB 34B0 335C"            /* èÀŠøËä..]X)«4°3\ */
+	$"36B2 1383 D820 11B8 22DF 56E1 27EF 932D"            /* 6².ƒØ .¸"ßVá'ï“- */
+	$"30DE CC72 58E3 9BDD A88C 229A CBC8 A466"            /* 0ÞÌrXã›Ý¨Œ"šËȤf */
+	$"7C29 FDE8 E789 F28F 3258 A2DD 897B 1C6A"            /* |)ýèç‰ò�2X¢Ý‰{.j */
+	$"C048 306A EEA7 3DF0 F8D4 BECC CDBD 9E43"            /* ÀH0jî§=ðøÔ¾ÌͽžC */
+	$"A29D 8052 478B 6470 79B7 B38A 5743 CAE7"            /* ¢�€RG‹dpy·³ŠWCÊç */
+	$"0BD4 0F4A 23E1 4C85 39C9 DEB0 75AF 151E"            /* .Ô.J#áL…9ÉÞ°u¯.. */
+	$"45D5 1681 2BA4 74C9 13B5 746A E399 9467"            /* EÕ.�+¤tÉ.µtjã™”g */
+	$"E6B9 D503 7F7C D57D 4D5F 7FC8 DD43 7D9B"            /* æ¹Õ..|Õ}M_.ÈÝC}› */
+	$"3CDC F9AD 167C 162B 4E6C 2110 DB2C DF34"            /* <Üù­.|.+Nl!.Û,ß4 */
+	$"AEED CCE4 05AC 4057 9829 B161 9CA0 8159"            /* ®íÌä.¬@W˜)±aœ �Y */
+	$"A64F FD15 EC5A 4A51 CA6C FD10 9A25 4291"            /* ¦Oý.ìZJQÊlý.š%B‘ */
+	$"1E90 1FC2 3530 E0DB E4E6 232E CB64 AF95"            /* .�.Â50àÛäæ#.Ëd¯• */
+	$"9494 656D D395 3D62 9EDA 2EC1 DB02 1FAA"            /* ””emÓ•=bžÚ.ÁÛ..ª */
+	$"6778 0FC0 C4A2 CCA8 EDC0 4DA8 F889 162F"            /* gx.ÀĢ̨íÀM¨ø‰./ */
+	$"03F9 A9C1 C635 1DAD 2E22 580B 0B2B 83E3"            /* .ù©ÁÆ5.­."X..+ƒã */
+	$"EC02 5552 3AA8 91BA 45AF 5439 4265 71F6"            /* ì.UR:¨‘ºE¯T9Beqö */
+	$"3E7A 4412 5DE5 1863 50E6 C0ED C470 3ED9"            /* >zD.]å.cPæÀíÄp>Ù */
+	$"0E3F 48BA 54C5 915E 03F0 D836 6429 2A67"            /* .?HºTÅ‘^.ðØ6d)*g */
+	$"B7FA 6AF9 069E 8E67 2848 B570 C3AC 7746"            /* ·újù.žŽg(HµpìwF */
+	$"EB48 0A2F 4BE4 8EB3 3F8F 791F 0646 DEDF"            /* ëHÂ/K䎳?�y..FÞß */
+	$"316B EFDF 6FD8 C0B9 7319 CE94 8930 C6F6"            /* 1kïßoØÀ¹s.Δ‰0Æö */
+	$"6399 C4A9 79AD E967 4783 3F8D C538 3C15"            /* c™Ä©y­égGƒ?�Å8<. */
+	$"E5B7 CE98 22B7 5333 A938 B26F 0E1E EF2E"            /* å·Î˜"·S3©8²o..ï. */
+	$"74B9 72EF 9D8A 80B7 FDC1 8334 A5F9 DCFB"            /* t¹rï�Š€·ýÁƒ4¥ùÜû */
+	$"B891 BB38 373C 9BE8 59F4 6018 6E63 DA65"            /* ¸‘»87<›èYô`.ncÚe */
+	$"9B13 9DC8 28DB 3C15 0D2C 11FC 0E2D 7A0A"            /* ›.�È(Û<..,.ü.-z */
+	$"F8FF 671F C3FF 7F8E 1210 C212 EA5A 5F0B"            /* øÿg.Ãÿ.Ž..Â.êZ_. */
+	$"9727 F770 25A5 236D 9789 75C7 4089 11DD"            /* —'÷p%¥#m—‰uÇ@‰.Ý */
+	$"E472 3865 B217 B946 CF22 5225 27DE 566D"            /* är8e².¹FÏ"R%'ÞVm */
+	$"6799 4F82 0D46 59F5 E466 F9E7 71C3 FA80"            /* g™O‚.FYõäfùçqÃú€ */
+	$"7826 E598 FF48 E181 6CA8 5A7E C354 0CAA"            /* x&å˜ÿHá�l¨Z~ÃT.ª */
+	$"B01C 9EC4 181F 849B 6A13 FB8D C477 70BD"            /* °.žÄ..„›j.û�Äwp½ */
+	$"F46B 278C 4467 B0CF 3E21 805E EF97 9696"            /* ôk'ŒDg°Ï>!€^ï—–– */
+	$"CBB9 E3F6 B62E DC26 001A 408F D7E2 07C3"            /* ˹ãö¶.Ü&..@�×â.à */
+	$"C1A4 AD97 4235 8863 A088 1980 C505 6E1F"            /* Á¤­—B5ˆc ˆ.€Å.n. */
+	$"F392 0B24 B500 20DC 8295 5703 F9B9 FF70"            /* ó’.$µ. Ü‚•W.ù¹ÿp */
+	$"355C 9B8D BB49 898F 1AAB F65F 7D7E E28F"            /* 5\›�»I‰�.«ö_}~â� */
+	$"4300 BDCC FB20 4F67 CA07 0CAE 3BAD AA36"            /* C.½Ìû OgÊ..®;­ª6 */
+	$"A4D8 3358 4176 1AD6 01FA 0450 0000 0042"            /* ¤Ø3XAv.Ö.ú.P...B */
+	$"7B49 E0E8 A7D8 4EA9 E1A5 597B DB80 BA6D"            /* {Iàè§ØN©á¥Y{Û€ºm */
+	$"8010 25EA 0A26 833F DE77 DBF7 78B9 564B"            /* €.%êÂ&ƒ?ÞwÛ÷x¹VK */
+	$"57B2 AF8C BC92 97D7 46A1 23C1 B595 A2EE"            /* W²¯Œ¼’—×F¡#Áµ•¢î */
+	$"F8A9 29FA 42C2 3557 6345 80B1 FCFD F322"            /* ø©)úBÂ5WcE€±üýó" */
+	$"E992 9262 A83F E43D B059 CB12 D425 FEF2"            /* é’’b¨?ä=°YË.Ô%þò */
+	$"9932 1BD8 C65C ED82 D05E E15C 5E9C 76B7"            /* ™2.ØÆ\í‚Ð^á\^œv· */
+	$"7C64 FCDB A247 D388 3CCB 86B5 C486 2261"            /* |düÛ¢GÓˆ<ˆµÄ†"a */
+	$"BFD1 7213 39C3 0D69 6AF0 2476 B711 7E91"            /* ¿Ñr.9Ã.ijð$v·.~‘ */
+	$"6B53 6A04 4F3C 2781 A090 3118 6C3F 49BA"            /* kSj.O<'� �1.l?Iº */
+	$"B81A 3FEB D686 EFCE F487 8315 E33F 84DB"            /* ¸.?ëÖ†ïÎô‡ƒ.ã?„Û */
+	$"E2C9 F35F 28C5 10C4 FF7F FA4F E953 89FC"            /* âÉó_(Å.Äÿ.úOéS‰ü */
+	$"8B32 23C6 0D04 5E49 DADA F0FE BCA7 D2C9"            /* ‹2#Æ..^IÚÚðþ¼§ÒÉ */
+	$"5869 EAD4 F153 9BF5 A5EA 3298 CC8B 8721"            /* XiêÔñS›õ¥ê2˜Ì‹‡! */
+	$"F919 680B 3F8C 304A 2849 4970 41CF 0F60"            /* ù.h.?Œ0J(IIpAÏ.` */
+	$"76D9 5820 EF21 CD4A 205A 632F 7CC4 EFDF"            /* vÙX ï!ÍJ Zc/|Äïß */
+	$"33F3 CCA8 EDAF 405B 78E1 8F79 0F66 6573"            /* 3ǫ́í¯@[xá�y.fes */
+	$"35A2 AD75 1E18 6018 AF23 7C9D A008 1A01"            /* 5¢­u..`.¯#|� ... */
+	$"C5FE 69AA 2C8E D97E 244D D075 F213 0CC6"            /* Åþiª,ŽÙ~$MÐuò..Æ */
+	$"738F 4395 BBC0 5CB6 3ADC 3DA8 ACB8 E018"            /* s�C•»À\¶:Ü=¨¬¸à. */
+	$"BA5B 13DB 0F6A CB18 DEAC 9749 F5B5 361D"            /* º[.Û.jË.Þ¬—Iõµ6. */
+	$"CF3A C107 9606 179F F4C7 F3DE CB0B 1F53"            /* Ï:Á.–..ŸôÇóÞË..S */
+	$"F27E 5D3C 11AB 66B4 8037 0644 AE98 19BF"            /* ò~]<.«f´€7.D®˜.¿ */
+	$"D564 973A 0CF2 C96F 56D4 5CB8 666F C68C"            /* Õd—:.òÉoVÔ\¸foÆŒ */
+	$"1E73 E515 8B33 75D2 D3B4 B3A3 8CDE DE0C"            /* .så.‹3uÒÓ´³£ŒÞÞ. */
+	$"DA37 A3DF 44D2 B57E 2DB2 E891 D36F CC23"            /* Ú7£ßDÒµ~-²è‘ÓoÌ# */
+	$"ADE8 45BC BB30 78D7 77BD D4A8 087F C83F"            /* ­èE¼»0x×w½Ô¨..È? */
+	$"E49A 6873 FAC4 C12B 0056 5E18 C3CB C2E9"            /* äšhsúÄÁ+.V^.ÃËÂé */
+	$"DCAE F0E8 A75F 18DD B8DD 1DCD B0F5 3A1C"            /* Ü®ðè§_.ݸÝ.Í°õ:. */
+	$"3816 51A8 0D93 00D0 6FF6 8F07 E4BE EDF9"            /* 8.Q¨.“.Ðoö�.ä¾íù */
+	$"BF0E 6CAA 5384 5DF0 DF12 4CF4 E3B3 5D6C"            /* ¿.lªS„]ðß.Lôã³]l */
+	$"602A B6F1 C0E0 E520 B0D6 71FB 7996 4930"            /* `*¶ñÀàå °Öqûy–I0 */
+	$"23DD 3601 3653 C40D 1A64 DC2B D5C2 01C9"            /* #Ý6.6SÄ..dÜ+ÕÂ.É */
+	$"5002 6BBE 7338 81EE F87D 7687 0FE6 7CF9"            /* P.k¾s8�îø}v‡.æ|ù */
+	$"BAB6 5B35 1A25 421C 5BBA 4D82 4E1F B1D4"            /* º¶[5.%B.[ºM‚N.±Ô */
+	$"1907 FF78 F534 4A16 7BB6 B598 51F6 E4D3"            /* ..ÿxõ4J.{¶µ˜QöäÓ */
+	$"A04B 1198 B926 CFAE FC03 22E3 8360 E696"            /*  K.˜¹&Ï®ü."ãƒ`æ– */
+	$"F546 62F9 7178 F327 E245 4520 8D17 41C4"            /* õFbùqxó'âEE �.AÄ */
+	$"9EC6 EF8D 0924 9416 7901 CE87 5EBB 286D"            /* žÆï�Æ$”.y.·^»(m */
+	$"53BF 09FA 41F6 5FBA 8F4C 79A8 75BA 277A"            /* S¿ÆúAö_º�Ly¨uº'z */
+	$"7D42 642B 38EE 9A49 DEDB F1B3 80D0 E5D0"            /* }Bd+8îšIÞÛñ³€ÐåÐ */
+	$"2980 F797 E7D0 F90D 4B2F AFDD 4A69 3389"            /* )€÷—çÐù.K/¯ÝJi3‰ */
+	$"1418 EBD0 6DF0 E38D 6E2F D546 C1A8 C8DD"            /* ..ëÐmðã�n/ÕFÁ¨ÈÝ */
+	$"8977 E053 9C26 053A CF69 97F9 7FB4 9000"            /* ‰wàSœ&.:Ïi—ù.´�. */
+	$"0000 0115 0E67 B64C 0015 DD82 643D 6476"            /* .....g¶L..Ý‚d=dv */
+	$"ED28 6324 AD72 8124 1AF6 FB1B 21C9 0605"            /* í(c$­r�$.öû.!É.. */
+	$"FAE6 04A6 31BF 6D67 FF7B B889 831A 4FFD"            /* úæ.¦1¿mgÿ{¸‰ƒ.Oý */
+	$"6BF5 F098 23AB A490 39F7 6AFC 3832 E2E1"            /* kõð˜#«¤�9÷jü82âá */
+	$"11B2 ADB0 ECCA 83DE B4FF 3685 5106 75DE"            /* .²­°ìʃ޴ÿ6…Q.uÞ */
+	$"3047 28A0 EDBE AD29 17CD DA62 698B CE64"            /* 0G( í¾­).ÍÚbi‹Îd */
+	$"5999 2B8E BB7D C74F F009 A25D B2B5 BDD9"            /* Y™+Ž»}ÇOðÆ¢]²µ½Ù */
+	$"B852 BFFE 0B74 9C05 22D7 B0A3 2139 0979"            /* ¸R¿þ.tœ."×°£!9Æy */
+	$"5C29 BAE8 43DA F9E5 5383 AFD2 14EC 64AA"            /* \)ºèCÚùåSƒ¯Ò.ìdª */
+	$"442C CE71 74ED 5C27 4331 9374 AC77 47EE"            /* D,Îqtí\'C1“t¬wGî */
+	$"31AC 4C74 97BC 753C D5DC 3D8B F7D2 C612"            /* 1¬Lt—¼u<ÕÜ=‹÷ÒÆ. */
+	$"2399 F431 07A1 76CA DAE6 772B 309A C800"            /* #™ô1.¡vÊÚæw+0šÈ. */
+	$"9F2F D6DF A44C 48EB 853E 4140 A123 BCA3"            /* Ÿ/ÖߤLHë…>A@¡#¼£ */
+	$"D096 00DA 0822 DFB3 6887 B31F A18F 59BE"            /* Ж.Ú."ß³h‡³.¡�Y¾ */
+	$"6B25 B5CF CFA3 8806 85B7 ED84 B20B CDA2"            /* k%µÏÏ£ˆ.…·í„².Í¢ */
+	$"A0C8 404B 3FFF 7FF3 3816 5BF0 A16B 85D0"            /*  È@K?ÿ.ó8.[ð¡k…Ð */
+	$"B87F E4BB 21F9 A3BB 9103 2944 434A 5789"            /* ¸.ä»!ù£»‘.)DCJW‰ */
+	$"E3EC B1E3 6F3E 154A 37E4 ACA6 4B02 6C5B"            /* ãì±ão>.J7䬦K.l[ */
+	$"D23A D4D4 83CE F291 CD7F 114F 5935 8EE0"            /* Ò:ÔÔƒÎò‘Í..OY5Žà */
+	$"17EA F0B3 1D93 BC5F 2CF8 511C E99F 21D8"            /* .êð³.“¼_,øQ.éŸ!Ø */
+	$"E286 EB17 6FC2 C34B 1110 6398 03BF CB08"            /* â†ë.oÂÃK..c˜.¿Ë. */
+	$"0018 4848 E24D 90A5 63F9 B1F8 6E20 EF6E"            /* ..HHâM�¥cù±øn ïn */
+	$"25D5 858B 0AE4 2235 581B D4DA E01C B006"            /* %Õ…‹Âä"5X.ÔÚà.°. */
+	$"E5EB DE78 855B 19E7 4D80 DAC2 1E8F CB2B"            /* åëÞx…[.çM€ÚÂ.�Ë+ */
+	$"0EC8 3FFF 7759 B569 0861 20CC 1D71 2121"            /* .È?ÿwYµi.a Ì.q!! */
+	$"71A7 FA20 B34B EAB3 4260 A827 6E91 2B3C"            /* q§ú ³Kê³B`¨'n‘+< */
+	$"5479 449A 3161 D24E 8489 C00A 18A6 3FEC"            /* TyDš1aÒN„‰ÀÂ.¦?ì */
+	$"61F2 4C86 23C1 85DB 6ECA 221D BCC2 C25F"            /* aòL†#Á…ÛnÊ".¼ÂÂ_ */
+	$"EFFF 7891 F475 0E20 DC0A 8F85 8208 4541"            /* ïÿx‘ôu. ÜÂ�…‚.EA */
+	$"579B 5EE2 24C4 5C60 39B7 D9F1 ECFD 0F0C"            /* W›^â$Ä\`9·Ùñìý.. */
+	$"3719 72A8 A543 8BF5 94BF BF6C E6F7 E45A"            /* 7.r¨¥C‹õ”¿¿læ÷äZ */
+	$"C5CF 1FD7 32F5 2D70 041E 3641 2C46 E23D"            /* ÅÏ.×2õ-p..6A,Fâ= */
+	$"E072 6889 A892 A27F 44A8 564A 74A3 B421"            /* àrh‰¨’¢.D¨VJt£´! */
+	$"E1CC A0F3 50E2 2711 6919 76BE D84B D2FE"            /* áÌ óPâ'.i.v¾ØKÒþ */
+	$"AAED 2D64 7C8F 4C55 7FFF 7EFC 2CBF 05DE"            /* ªí-d|�LU.ÿ~ü,¿.Þ */
+	$"25B2 001C 00EC 6D17 ED17 E559 9DFA F731"            /* %²...ìm.í.åY�ú÷1 */
+	$"B21A 7394 8B35 5948 BA4F 5858 020F FF7C"            /* ².s”‹5YHºOXX..ÿ| */
+	$"C89D 1CFA F89B 9F9C 841F 19EF D626 E6DE"            /* È�.úø›Ÿœ„..ïÖ&æÞ */
+	$"DCC3 3148 38A0 C32F 898F BEC3 0AF3 318C"            /* ÜÃ1H8 Ã/‰�¾ÃÂó1Œ */
+	$"5E09 119B 43C8 9FE6 73B2 F4B9 9789 4BFC"            /* ^Æ.›CÈŸæs²ô¹—‰Kü */
+	$"99A2 FF7F FF7A 4FD0 8C64 F459 410C 013C"            /* ™¢ÿ.ÿzOÐŒdôYA..< */
+	$"1C6C 85B5 1C8F D078 995D 714E 1C60 3090"            /* .l…µ.�Ðx™]qN.`0� */
+	$"9058 77C4 BB80 5F57 1871 CA72 B2FD 0016"            /* �XwÄ»€_W.qÊr²ý.. */
+	$"BAA7 F84F F4E9 ACDF F766 8CB4 475D 2F0B"            /* º§øOôé¬ß÷fŒ´G]/. */
+	$"37BC 18C8 6162 79C2 BDD7 8753 204B A536"            /* 7¼.Èaby½ׇS K¥6 */
+	$"9CBE 4972 316A BCB1 9442 4238 B88F 2F48"            /* œ¾Ir1j¼±”BB8¸�/H */
+	$"7A45 5CD1 A306 3A23 5A78 354F CDB6 C0A5"            /* zE\Ñ£.:#Zx5OͶÀ¥ */
+	$"2A5C 19DA 0B0C CD84 8D85 D2B8 1DC9 059C"            /* *\.Ú..Í„�…Ò¸.É.œ */
+	$"A8C4 8118 4848 9372 9372 566C 21E5 2665"            /* ¨Ä�.HH“r“rVl!å&e */
+	$"D16C 6601 48A8 35CE 7FFF 7F19 B54E 7F04"            /* Ñlf.H¨5Î.ÿ..µN.. */
+	$"10EC 1AA3 13FF 4588 9722 A7AA B011 863C"            /* .ì.£.ÿEˆ—"§ª°.†< */
+	$"E4B1 717B 7C2D 21E6 267B 4B48 E790 FF76"            /* ä±q{|-!æ&{KHç�ÿv */
+	$"40CC F425 41CB 289F 809D 8170 A529 2EDA"            /* @Ìô%AË(Ÿ€��p¥).Ú */
+	$"A105 B3AF FB44 7951 B87A 0091 5B53 5979"            /* ¡.³¯ûDyQ¸z.‘[SYy */
+	$"CDC6 5976 6393 34F2 21FF 7FFF 7FFF 7D43"            /* ÍÆYvc“4ò!ÿ.ÿ.ÿ}C */
+	$"4F4B C77F 73C7 0454 BE9C BE9C 282E 440E"            /* OKÇ.sÇ.T¾œ¾œ(.D. */
+	$"0608 A380 6121 2103 DBD2 250B 5D57 9159"            /* ..£€a!!.ÛÒ%.]W‘Y */
+	$"B69A 28CF E66A 154F F84F F4E9 99ED 48C4"            /* ¶š(Ïæj.OøOôé™íHÄ */
+	$"CA7E BE76 FC67 A7CD DC26 1C00 0184 8463"            /* Ê~¾vüg§ÍÜ&...„„c */
+	$"69A8 C0A9 127C 5830 CC3A 380A C742 E4DE"            /* i¨À©.|X0Ì:8ÂÇBäÞ */
+	$"06F5 7999 556D FD9F 268B 895F FF4B 7BB9"            /* .õy™UmýŸ&‹‰_ÿK{¹ */
+	$"C201 52B7 B483 0906 65EC 1848 4750 6F27"            /* Â.R·´ƒÆ.eì.HGPo' */
+	$"C86C 1F27 9108 6253 0416 4CD3 30E4 7F77"            /* Èl.'‘.bS..LÓ0ä.w */
+	$"0705 8420 83B6 BCB6 29DE B71E 8DC5 851A"            /* ..„ ƒ¶¼¶)Þ·.�Å…. */
+	$"ABB0 83D8 F2E2 5113 55D2 AAF6 B3AB 7679"            /* «°ƒØòâQ.UÒªö³«vy */
+	$"49FE A1F8 6F30 0EC0 7D91 534C C78C DC5D"            /* Iþ¡øo0.À}‘SLÇŒÜ] */
+	$"5A42 CA06 37D8 E0ED 27FA 3E31 C849 D2BE"            /* ZBÊ.7Øàí'ú>1ÈIÒ¾ */
+	$"847C 0CCF 676F ACFE 91A3 0F62 B711 1897"            /* „|.Ïgo¬þ‘£.b·..— */
+	$"9DC3 8E37 3AF8 907E 0B69 1577 2856 AA36"            /* �ÃŽ7:ø�~.i.w(Vª6 */
+	$"FAC0 D56C 6686 0443 CA96 FDCD 051B 23A7"            /* úÀÕlf†.CÊ–ýÍ..#§ */
+	$"7DAC 8229 C5FC F840 103A 6407 49F7 6B32"            /* }¬‚)Åüø@.:d.I÷k2 */
+	$"254F 2B32 7FC1 F460 D5C0 5EE1 3046 612A"            /* %O+2.Áô`ÕÀ^á0Fa* */
+	$"1BC1 C143 7B76 B9EF ECCB 5EE9 8F0C 3F71"            /* .ÁÁC{v¹ïìË^é�.?q */
+	$"E805 8B9B 17B7 9ECE C237 AF5C 0062 E61E"            /* è.‹›.·žÎÂ7¯\.bæ. */
+	$"DF6C C1F7 904E 4379 2A9C 92FC 1B04 00A8"            /* ßlÁ÷�NCy*œ’ü...¨ */
+	$"F9D5 DB1B C4C6 9485 ABC2 1199 CCF2 0A47"            /* ùÕÛ.ÄÆ”…«Â.™ÌòÂG */
+	$"9693 C097 7AD0 449A FC53 DEC5 6EE8 6BF7"            /* –“À—zÐDšüSÞÅnèk÷ */
+	$"0D7D 4ED8 3426 DA7E ECF9 57ED 9252 9A6A"            /* .}NØ4&Ú~ìùWí’Ršj */
+	$"2B94 2614 1B6E A495 8261 4D5E DAEF 03FA"            /* +”&..n¤•‚aM^Úï.ú */
+	$"8A63 9496 E8AB A1A6 5B5C B03E E73E 2889"            /* Šc”–è«¡¦[\°>ç>(‰ */
+	$"D257 6C28 080A 68DC 226C 950F F55B E7CC"            /* ÒWl(.ÂhÜ"l•.õ[çÌ */
+	$"95AD FDA7 43EA 7489 A545 C0FC E9B0 2A25"            /* •­ý§Cêt‰¥EÀüé°*% */
+	$"719C EE06 9E5A 8FC0 D3B0 0C81 1EB0 C8C6"            /* qœî.žZ�ÀÓ°.�.°ÈÆ */
+	$"25BD B383 33BD B80D D9A9 48F3 7539 D7D5"            /* %½³ƒ3½¸.Ù©Hóu9×Õ */
+	$"8021 5EBA 94A7 83A3 69FE 8179 9106 BC56"            /* €!^º”§ƒ£iþ�y‘.¼V */
+	$"14A4 427B 8C09 BACB 2FC9 B8F3 CAFA E51C"            /* .¤B{ŒÆºË/ɸóÊúå. */
+	$"9C07 9A69 033C 6159 163E 6ED8 259D 7AAB"            /* œ.ši.<aY.>nØ%�z« */
+	$"D316 475C F6C7 BD0E 7972 4C59 DF3A D5B4"            /* Ó.G\öǽ.yrLYß:Õ´ */
+	$"44ED 7D01 B0FB 34D4 4C9C BC2D B8A6 5B65"            /* Dí}.°û4ÔLœ¼-¸¦[e */
+	$"134F 0C96 5CA1 21CC A249 F17D 4660 9835"            /* .O.–\¡!Ì¢Iñ}F`˜5 */
+	$"957C 7392 53A9 DE42 E650 604B 10E2 FF12"            /* •|s’S©ÞBæP`K.âÿ. */
+	$"B47A 044A 524A B8D3 60B5 A258 CEAB 55E8"            /* ´z.JRJ¸Ó`µ¢XΫUè */
+	$"5219 EC3E A9F6 0813 A2B4 930C EDE4 3BBE"            /* R.ì>©ö..¢´“.íä;¾ */
+	$"C0E3 7F93 1A3F 38EB 2DE3 492D A3BD FD00"            /* Àã.“.?8ë-ãI-£½ý. */
+	$"811C 530E 2FB8 9D68 2466 D288 EC29 9094"            /* �.S./¸�h$fÒˆì)�” */
+	$"A3C7 2D32 0A25 BA73 2023 08CA C360 2C72"            /* £Ç-2Â%ºs #.ÊÃ`,r */
+	$"8BA9 516A 7081 F2FF 1E84 E1C2 F841 77CE"            /* ‹©Qjp�òÿ.„áÂøAwÎ */
+	$"ABDF 6476 30A4 3018 F7F4 F3EE 1A5E 5DF0"            /* «ßdv0¤0.÷ôóî.^]ð */
+	$"CAAA AA77 C90D 52C4 6AA9 5755 33B9 1814"            /* ʪªwÉ.RÄj©WU3¹.. */
+	$"3528 E205 C379 648A E627 A23E D5DB 1CAE"            /* 5(â.ÃydŠæ'¢>ÕÛ.® */
+	$"4868 B7D4 F381 2534 1F48 2BCC 5211 3B0F"            /* Hh·Ôó�%4.H+ÌR.;. */
+	$"9692 B002 4CFB 1F83 3628 D1EB 5416 0648"            /* –’°.Lû.ƒ6(ÑëT..H */
+	$"F0F0 B0F8 C7C7 6E92 8C54 6859 791B 7890"            /* ðð°øÇÇn’ŒThYy.x� */
+	$"EBA3 BC74 5F3F C4AD 7C9D 6954 2D0C 15BF"            /* 룼t_?Ä­|�iT-..¿ */
+	$"F699 82A6 4170 D2F1 02A5 7EF3 6061 C9CF"            /* ö™‚¦ApÒñ.¥~ó`aÉÏ */
+	$"C370 E129 F805 8CC8 C670 CBDC 2D44 D349"            /* Ãpá)ø.ŒÈÆpËÜ-DÓI */
+	$"F3E5 C5F9 357E 3DF2 CDF3 DC8A 1F13 5B2D"            /* óåÅù5~=òÍóÜŠ..[- */
+	$"C544 448D 1038 8293 4EEA 75A4 0738 7D9F"            /* ÅDD�.8‚“Nêu¤.8}Ÿ */
+	$"C002 3D68 26D8 7B06 FB10 CCDF C4F3 5364"            /* À.=h&Ø{.û.ÌßÄóSd */
+	$"2342 154B F8FB 01ED 8893 9160 A3A0 B81D"            /* #B.Køû.툓‘`£ ¸. */
+	$"47A0 6C82 1CBA FAED 931D E025 BDFF 1535"            /* G l‚.ºúí“.à%½ÿ.5 */
+	$"CADF 68C5 41FD 3896 1AC9 F979 A885 F5AE"            /* ÊßhÅAý8–.Éùy¨…õ® */
+	$"EFBE C674 ED92 5FE9 E9AF FF52 D573 A6DD"            /* ï¾Ætí’_éé¯ÿRÕs¦Ý */
+	$"631B 27E4 62CB B76E 7020 EC65 75E2 DB6F"            /* c.'äbË·np ìeuâÛo */
+	$"0E10 980A 0EA3 2287 4CF8 D402 52B8 1491"            /* ..˜Â.£"‡LøÔ.R¸.‘ */
+	$"21C9 BC2B 48BC CBD4 464A C539 6CD5 28F1"            /* !ɼ+H¼ËÔFJÅ9lÕ(ñ */
+	$"CAE4 CA43 9CB8 B181 BF06 522B 4D19 8295"            /* ÊäÊCœ¸±�¿.R+M.‚• */
+	$"05C8 D7CD 8CFA D3E7 7BC9 630C DCDD 7C7E"            /* .È×ÍŒúÓç{Éc.ÜÝ|~ */
+	$"E4C6 D7DC 5E38 67CC 5934 9E8D 9552 B837"            /* äÆ×Ü^8gÌY4ž�•R¸7 */
+	$"53AE 6D39 FAB1 2EB6 886C 1855 26ED AD08"            /* S®m9ú±.¶ˆl.U&í­. */
+	$"1EBE 9570 EA2F DFFF 06F4 ABF3 4534 2831"            /* .¾•pê/ßÿ.ô«óE4(1 */
+	$"1AE2 0A99 2956 2A90 C2A4 58AC E49E F047"            /* .â™)V*�¤X¬äžðG */
+	$"A9BA C394 E8F4 6427 7966 A79C 4269 9ADD"            /* ©ºÃ”èôd'yf§œBišÝ */
+	$"AD1D 1A7E 375C D3FB 8C25 0B6B 0460 5EB9"            /* ­..~7\ÓûŒ%.k.`^¹ */
+	$"416C AE82 DFC3 09DA 1F69 8796 6897 8CD0"            /* Al®‚ßÃÆÚ.i‡–h—ŒÐ */
+	$"3E1B FF7D 9AE9 7F6D 4E84 967C 674F CA41"            /* >.ÿ}šé.mN„–|gOÊA */
+	$"44C1 0575 93A9 2599 66D0 AB7B 6260 D32C"            /* DÁ.u“©%™fЫ{b`Ó, */
+	$"94AF 7FC8 82FD F692 92FE B6ED A660 750F"            /* ”¯.È‚ýö’’þ¶í¦`u. */
+	$"80A2 A8AA E6F6 7B9F E894 ED71 D223 6F4B"            /* €¢¨ªæö{Ÿè”íqÒ#oK */
+	$"A203 F64C 7560 DBB1 6F9E EE9F 2945 C994"            /* ¢.öLu`Û±ožîŸ)EÉ” */
+	$"BA00 D3D1 6414 A300 4296 670B 2350 CDD1"            /* º.ÓÑd.£.B–g.#PÍÑ */
+	$"DF61 29E8 EC17 87B6 BC62 B6BD 5F31 13B2"            /* ßa)èì.‡¶¼b¶½_1.² */
+	$"48A2 F723 53C7 6955 969B ED83 6A9B 1B06"            /* H¢÷#SÇiU–›íƒj›.. */
+	$"C7D0 2584 430B 8C52 D00A 736B D6FB AEDB"            /* ÇÐ%„C.ŒRÐÂskÖû®Û */
+	$"2BA1 5095 759B 0AFF 5138 58EF 3DC2 B14D"            /* +¡P•u›ÂÿQ8Xï=±M */
+	$"3B7D 62D0 DE12 CFEF 17A3 32C4 C79A C2DA"            /* ;}bÐÞ.Ïï.£2ÄÇšÂÚ */
+	$"6BA1 6478 B1D3 2278 3787 6C30 08FD 6095"            /* k¡dx±Ó"x7‡l0.ý`• */
+	$"FF65 1DF4 7606 34C3 B4EE E609 A3BF 7085"            /* ÿe.ôv.4ôîæÆ£¿p… */
+	$"8B3B 2C80 D860 6043 10A4 24B1 2D80 880D"            /* ‹;,€Ø``C.¤$±-€ˆ. */
+	$"671A 9A76 E1D4 2304 B4E0 9E47 129D 6316"            /* g.šváÔ#.´àžG.�c. */
+	$"33DF C88C 3BB6 5232 475C D19D FA9B 3303"            /* 3ßÈŒ;¶R2G\Ñ�ú›3. */
+	$"2956 D8B1 08A5 2735 CD4D F130 C700 DA0D"            /* )Vر.¥'5ÍMñ0Ç.Ú. */
+	$"7BAE 21FA FB1B 35A5 957E 0211 955B 25D0"            /* {®!úû.5¥•~..•[%Ð */
+	$"A3DD B72F 5BCD 8792 418E BCB6 C727 DD0F"            /* £Ý·/[͇’AŽ¼¶Ç'Ý. */
+	$"2D42 F031 2A73 C1F9 7964 B937 1E77 A757"            /* -Bð1*sÁùyd¹7.w§W */
+	$"D158 CB02 80D3 C310 E1C5 709C 5C69 7F04"            /* ÑXË.€ÓÃ.áÅpœ\i.. */
+	$"4476 F017 3FF2 B891 0160 D681 AEBC F8C9"            /* Dvð.?ò¸‘.`Ö�®¼øÉ */
+	$"8F46 7922 4414 5CEE 0CA8 417B 33BB 5926"            /* �Fy"D.\î.¨A{3»Y& */
+	$"B7A6 7094 6363 C5F2 9AD7 1751 2456 3B83"            /* ·¦p”ccÅòš×.Q$V;ƒ */
+	$"9BB0 0ECD 1420 6141 A097 DBF4 802A 2377"            /* ›°.Í. aA —Ûô€*#w */
+	$"CDAC EFE9 4A16 4B3C 5058 A5DC 1C40 169E"            /* ͬïéJ.K<PX¥Ü.@.ž */
+	$"3999 F0C2 C418 2E8F 0951 664A 7082 F49F"            /* 9™ðÂÄ..�ÆQfJp‚ôŸ */
+	$"E576 B2B1 5918 E3EE 9B97 1686 6499 A572"            /* åv²±Y.ãî›—.†d™¥r */
+	$"B1F6 2F39 A798 6292 DE22 007B 60AD 1D94"            /* ±ö/9§˜b’Þ".{`­.” */
+	$"31BA 068D F15A 06DB 2654 6B52 F692 3C3A"            /* 1º.�ñZ.Û&TkRö’<: */
+	$"0DA8 A74B 30F6 3852 76F0 A897 9086 FBD5"            /* .¨§K0ö8Rvð¨—�†ûÕ */
+	$"1C78 047E 7BF2 08EE 7B45 85C5 6ED5 AA43"            /* .x.~{ò.î{E…ÅnÕªC */
+	$"F423 8A4E 4111 C68E 172E DD87 AF9E BF19"            /* ô#ŠNA.ÆŽ..݇¯ž¿. */
+	$"D4D2 020C 6FD5 EE3F F0E8 289E 4E6C 0871"            /* ÔÒ..oÕî?ðè(žNl.q */
+	$"1187 D3F1 E458 94F5 4519 BF3C D239 D86C"            /* .‡ÓñäX”õE.¿<Ò9Øl */
+	$"17F1 8916 4206 2346 ACD8 1F08 9A44 0AB3"            /* .ñ‰.B.#F¬Ø..šD³ */
+	$"CEE6 441D 78D5 2909 4CEA 46F7 D6C6 D21A"            /* ÎæD.xÕ)ÆLêF÷ÖÆÒ. */
+	$"6D41 BB64 ADFF 6252 5A80 3556 C459 2845"            /* mA»d­ÿbRZ€5VÄY(E */
+	$"C05D C2C5 1F69 4087 0380 C0FF 61AA D5D1"            /* À]ÂÅ.i@‡.€ÀÿaªÕÑ */
+	$"E5C2 5FC0 CEF4 2D59 B4A3 6BA8 343E 184B"            /* åÂ_ÀÎô-Y´£k¨4>.K */
+	$"89CE 81FD AC96 C691 FDE5 F993 B9CB 6302"            /* ‰Î�ý¬–Æ‘ýåù“¹Ëc. */
+	$"B8EE 86B4 A2F7 19EA DAFD D511 B59F BBD2"            /* ¸î†´¢÷.êÚýÕ.µŸ»Ò */
+	$"5D4E F6A3 BC58 51D5 273F 2E2E 2B6A 2755"            /* ]Nö£¼XQÕ'?..+j'U */
+	$"38A3 CA29 BFAB D31D CD53 B29C 7418 40DB"            /* 8£Ê)¿«Ó.ÍS²œt.@Û */
+	$"FD56 1BF6 9350 5411 CF5C 8D26 B1FA 754F"            /* ýV.ö“PT.Ï\�&±úuO */
+	$"E584 8277 6221 6866 257C 9FC9 65A5 6D93"            /* å„‚wb!hf%|ŸÉe¥m“ */
+	$"C524 B971 3F1D 34A0 BBF4 6B83 9722 CFAD"            /* Å$¹q?.4 »ôkƒ—"Ï­ */
+	$"8296 103F 53BB 1B22 8A84 2FAC 94DE 4994"            /* ‚–.?S»."Š„/¬”ÞI” */
+	$"2D31 56A5 DBCD B661 81D7 B360 4958 8FF5"            /* -1V¥ÛͶa�׳`IX�õ */
+	$"EB02 25A9 6386 8241 D936 A3CB AA88 9936"            /* ë.%©c†‚AÙ6£Ëªˆ™6 */
+	$"1698 4F59 765B 34EA 3741 D2D3 2DAC 854D"            /* .˜OYv[4ê7AÒÓ-¬…M */
+	$"366B C9A0 15F8 D2E6 7CCF 99EF A794 460C"            /* 6kÉ .øÒæ|ϙ倫F. */
+	$"934E C88B 2BF5 91F7 7BD1 3DC9 6ED3 91FE"            /* “NÈ‹+õ‘÷{Ñ=ÉnÓ‘þ */
+	$"E63B EDCC 3D4A CC1B AE5D 88D0 B241 20D1"            /* æ;íÌ=JÌ.®]ˆÐ²A Ñ */
+	$"AB6C 9FE2 E494 395E 8E3C 0EB0 1796 58CC"            /* «lŸâä”9^Ž<.°.–XÌ */
+	$"9791 D931 DB33 473E 003E 10CD B736 7295"            /* —‘Ù1Û3G>.>.Í·6r• */
+	$"DD81 B481 9A0A ED27 3C1E 6298 FD0D BDE0"            /* Ý�´�šÂí'<.b˜ý.½à */
+	$"11D6 8A21 79C1 DBB7 FEDC 6E48 8080 5ADB"            /* .ÖŠ!yÁÛ·þÜnH€€ZÛ */
+	$"E61D 9E0E E6A3 6D38 A028 4016 464D F534"            /* æ.ž.æ£m8 (@.FMõ4 */
+	$"D764 3AD7 55DF 3CAB 7B3D 12F5 9A8D DDCF"            /* ×d:×Uß<«{=.õš�ÝÏ */
+	$"6CCD 0387 C982 0FE9 D431 0FE3 E064 1700"            /* lÍ.‡É‚.éÔ1.ãàd.. */
+	$"1AAD F49E D6DE A939 8010 C91B 605B 4E0A"            /* .­ôžÖÞ©9€.É.`[NÂ */
+	$"FCBE ADE9 C17A EC1F 3990 9EB2 E6BF 92AA"            /* ü¾­éÁzì.9�ž²æ¿’ª */
+	$"951C D27F A984 10A9 22DC 996E FF6E 12AE"            /* •.Ò.©„.©"Ü™nÿn.® */
+	$"DC03 5AB3 2CA0 8291 4174 C69E AE28 DBA8"            /* Ü.Z³, ‚‘AtÆž®(Û¨ */
+	$"38A8 FF12 67D3 F8A3 00D6 2A2E A564 CEFA"            /* 8¨ÿ.gÓø£.Ö*.¥dÎú */
+	$"0F00 4B44 62A7 CA9F F072 2821 DD3C 6A34"            /* ..KDb§ÊŸðr(!Ý<j4 */
+	$"926C 8F3C 1548 D31A 021F 2604 252D A929"            /* ’l�<.HÓ...&.%-©) */
+	$"172B 8212 174F 2D2D CC7D DA15 F9A9 AD7E"            /* .+‚..O--Ì}Ú.ù©­~ */
+	$"59D3 7885 9215 C77B 6583 4D8F 3308 149C"            /* YÓx…’.Ç{eƒM�3..œ */
+	$"270A 4508 21C9 A05B CDE9 BEF1 C18A 4B74"            /* 'ÂE.!É [Íé¾ñÁŠKt */
+	$"F07B 0DFE 007B E5AF D9AA CED7 8661 34C7"            /* ð{.þ.{å¯ÙªÎ׆a4Ç */
+	$"AA26 21AC D09C 6BAA EABB A7C4 486E 40A5"            /* ª&!¬Ðœkªê»§ÄHn@¥ */
+	$"C791 976A 1EC3 534F 84EC E6E9 7363 FF08"            /* Ç‘—j.ÃSO„ìæéscÿ. */
+	$"5B20 0E29 000C 5E8F 3339 6210 65CC FD34"            /* [ .)..^�39b.eÌý4 */
+	$"76EB F1B2 76C6 5FDC C1A8 B0F5 53EE 103C"            /* vëñ²vÆ_ÜÁ¨°õSî.< */
+	$"50B0 650F 8459 9777 E890 E28A BB84 56B9"            /* P°e.„Y—wè�⊻„V¹ */
+	$"0522 90F9 5B81 C982 979E E507 A4BC 26C3"            /* ."�ù[�É‚—žå.¤¼&à */
+	$"E356 F2A9 C0D1 BFF3 F882 EC0E 6AA9 CA0D"            /* ãVò©ÀÑ¿óø‚ì.j©Ê. */
+	$"4419 16FB 9BEF 947E F848 19BF 5CB6 EA4E"            /* D..û›ï”~øH.¿\¶êN */
+	$"C290 F254 020B 51DB 8094 4D05 E9A5 21A0"            /* Â�òT..QÛ€”M.é¥!  */
+	$"D3E6 84EA 5A3E 4380 650C B24F 31DA 209F"            /* Óæ„êZ>C€e.²O1Ú Ÿ */
+	$"F51A 9108 7912 32B0 52A6 A901 CADB A758"            /* õ.‘.y.2°R¦©.ÊÛ§X */
+	$"C00A D516 E462 35B4 C071 131A 0F01 9A95"            /* ÀÂÕ.äb5´Àq....š• */
+	$"9739 F131 0E5F 7FBA D8AD 925F 992C 0187"            /* —9ñ1._.ºØ­’_™,.‡ */
+	$"D97C 832B 847E 1148 0402 0449 FB25 D0F1"            /* Ù|ƒ+„~.H...Iû%Ðñ */
+	$"C1F8 2B8E CE97 D5A4 BEFE 7F0D E420 E43E"            /* Áø+ŽÎ—Õ¤¾þ..ä ä> */
+	$"801A 448D 9D61 D23C 5956 3DEB A1A6 0858"            /* €.D��aÒ<YV=롦.X */
+	$"CD98 F32B 92E6 D960 C0E1 E542 294D 6FD3"            /* ͘ó+’æÙ`ÀáåB)MoÓ */
+	$"4234 37C9 3537 275F AC1E 936D 534A BF02"            /* B47É57'_¬.“mSJ¿. */
+	$"B742 8CAB BE88 E4FF 23DC D9EB 1FC4 9CF0"            /* ·BŒ«¾ˆäÿ#ÜÙë.Äœð */
+	$"C5D1 3F1D 5995 AD68 12E9 71B3 2100 AFB7"            /* ÅÑ?.Y•­h.éq³!.¯· */
+	$"CBF7 9ADB D5FF 48EE B1A2 AE4D E021 7C07"            /* Ë÷šÛÕÿHî±¢®Mà!|. */
+	$"5AD5 E94C A965 DFE8 B32A 23AB DE05 4FB1"            /* ZÕéL©eßè³*#«Þ.O± */
+	$"FDB7 ECC5 3611 73D9 B03C 399A D5F6 663D"            /* ý·ìÅ6.sÙ°<9šÕöf= */
+	$"0E78 0BEE 67D9 2F9D 0072 E938 509C 9779"            /* .x.îgÙ/�.ré8Pœ—y */
+	$"6C64 03A1 B8C9 C1C0 2256 29EA 112C FB1C"            /* ld.¡¸ÉÁÀ"V)ê.,û. */
+	$"766C DF51 83B1 388F 902E EE03 337E 689A"            /* vlßQƒ±8��.î.3~hš */
+	$"CA5A A9F0 09AF 3422 4115 D489 3FBD 22C1"            /* ÊZ©ðƯ4"A.Ô‰?½"Á */
+	$"4A4F 642A 0AC8 D01C 2950 18CA D441 780A"            /* JOd*ÂÈÐ.)P.ÊÔAx */
+	$"C929 A7FF 0AFA 956A A581 B590 9B7A 7D74"            /* É)§ÿÂú•j¥�µ�›z}t */
+	$"2084 3DC1 5D81 B12B DF9C 333D EFAD 0ADD"            /*  „=Á]�±+ßœ3=ï­ÂÝ */
+	$"3445 4F8C 132E F02F C2E7 E13F BE12 2F84"            /* 4EOŒ..ð/Âçá?¾./„ */
+	$"7FC3 D55F 876A BE1D 07F2 688D 774C FC3E"            /* .ÃÕ_‡j¾..òh�wLü> */
+	$"A177 C3EA 4FE4 AFFE 1BFF 61D3 2F87 4BFC"            /* ¡wÃêOä¯þ.ÿaÓ/‡Kü */
+	$"946E 03F8 6CFF 06A3 FC28 FE13 BF0F 6B7E"            /* ”n.ølÿ.£ü(þ.¿.k~ */
+	$"1EB8 FC3B 47E1 ECEE EEDF F87D 51FF 07D5"            /* .¸ü;Gáìîîßø}Qÿ.Õ */
+	$"0BBB 87E1 D3FF 0779 FC3B 6FE1 D378 0DF0"            /* .»‡áÓÿ.yü;oáÓx.ð */
+	$"BD7C 29EB A2DD 17F2 6ADB E1DB 7F0D 97E1"            /* ½|)ë¢Ý.òjÛáÛ..—á */
+	$"E84D 7750 FC3E 906F C3E8 35DD 42ED AFE1"            /* èMwPü>�oÃè5ÝBí¯á */
+	$"D33F 0E8D F86E 00F7 91DD 3D8B A94D D83C"            /* Ó?.�øn.÷‘Ý=‹©MØ< */
+	$"B51B 129C 103F 899D B929 4724 C188 2C29"            /* µ..œ.?‰�¹)G$Áˆ,) */
+	$"CE89 11F8 9065 1C37 E234 DFEF 60D7 3221"            /* Ή.ø�e.7â4ßï`×2! */
+	$"5343 F889 DCDB AFB3 6F20 F76A 31D9 986E"            /* SCø‰ÜÛ¯³o ÷j1Ù˜n */
+	$"A745 547E 6F18 076D A675 BA1A 1AAF 6558"            /* §ET~o..m¦uº..¯eX */
+	$"338A FF71 4707 0776 1B62 BCCC 89E5 4726"            /* 3ŠÿqG..v.b¼Ì‰åG& */
+	$"A7CB 8885 E07C DADC D741 3B1D D81F AB03"            /* §Ëˆ…à|ÚÜ×A;.Ø.«. */
+	$"2F84 F52D DFD5 7384 4649 7BA2 5AB1 14C8"            /* /„õ-ßÕs„FI{¢Z±.È */
+	$"3D8D B951 8183 C33A B08E 82CC EF1A F046"            /* =�¹Q�ƒÃ:°Ž‚Ìï.ðF */
+	$"5B62 C9E0 A926 F330 0A61 A30C 6194 7E1E"            /* [bÉà©&ó0Âa£.a”~. */
+	$"1EE9 3D0D 1ABE 5536 A026 8B32 830F C02F"            /* .é=..¾U6 &‹2ƒ.À/ */
+	$"3041 04B7 2C65 024D AC81 D2CC 03CA A08A"            /* 0A.·,e.M¬�ÒÌ.Ê Š */
+	$"B105 F3F1 C365 6BCE 9876 A867 7DBA 63AF"            /* ±.óñÃekΘv¨g}ºc¯ */
+	$"0973 495F DCC1 3552 54BA 5BDB 618D C6C0"            /* ÆsI_ÜÁ5RTº[Ûa�ÆÀ */
+	$"91B8 4489 141B A7D3 F188 8A97 DAB0 8942"            /* ‘¸D‰..§ÓñˆŠ—Ú°‰B */
+	$"EA67 F235 E18A 871B 4B0C DAC6 9050 BA9C"            /* êgò5ኇ.K.ÚÆ�Pºœ */
+	$"C432 95CE 13CA 93ED 4FD5 9495 377D C920"            /* Ä2•Î.Ê“íOÕ”•7}É  */
+	$"C8A2 F997 5348 8890 91D5 0A23 50BF 3C37"            /* È¢ù—SHˆ�‘ÕÂ#P¿<7 */
+	$"8372 7C96 32AA 1CD2 46BE 8220 C983 2A71"            /* ƒr|–2ª.ÒF¾‚ Ƀ*q */
+	$"7961 BF33 9590 C086 CCE9 578B 322E FB50"            /* ya¿3•�À†ÌéW‹2.ûP */
+	$"CB68 6459 C127 EB9B E974 EF02 59F4 FF4D"            /* ËhdYÁ'ë›étï.YôÿM */
+	$"4525 1874 6A9F 99EB DFCC C1B1 72EA 9FA0"            /* E%.tjŸ™ëßÌÁ±r꟠ */
+	$"DE00 BBB9 D95F 36B9 406E 3CE0 3BCF 32B6"            /* Þ.»¹Ù_6¹@n<à;Ï2¶ */
+	$"8DC0 55D6 C6DA 3622 8A6E 63F6 28AE 08AC"            /* �ÀUÖÆÚ6"Šncö(®.¬ */
+	$"03AC 288D 069A 750E CBBD 97D9 E42D BA93"            /* .¬(�.šu.˽—Ùä-º“ */
+	$"E82A 4EB3 C008 CC7C B6A7 6F70 F1BC FDAA"            /* è*N³À.Ì|¶§opñ¼ýª */
+	$"1DF4 D2E4 3ECB 9702 444E 278F 6B50 F00E"            /* .ôÒä>Ë—.DN'�kPð. */
+	$"C228 C132 E5E0 B4DE 93BF DBBD 2C85 ABF9"            /* Â(Á2åà´Þ“¿Û½,…«ù */
+	$"7FAD EC28 1D40 D390 5A2F 9B14 D348 8C76"            /* .­ì(.@Ó�Z/›.ÓHŒv */
+	$"C04B 1173 BF19 8F50 7E3D 8311 BB79 FDA8"            /* ÀK.s¿.�P~=ƒ.»yý¨ */
+	$"1FD4 24A9 5F59 8B76 709E 5C84 1902 8690"            /* .Ô$©_Y‹vpž\„..†� */
+	$"AD49 334F 5AE8 E376 288C BDE7 EE13 FBDE"            /* ­I3OZèãv(Œ½çî.ûÞ */
+	$"7606 0135 6DB2 DCD9 F5B3 E7E2 B2B8 8BE1"            /* v..5m²ÜÙõ³çⲸ‹á */
+	$"1985 85D2 0EC1 5CCD BC74 D88B 7206 5075"            /* .……Ò.Á\ͼtØ‹r.Pu */
+	$"FB92 BF92 C5CB B6E3 024D EB71 D909 AF79"            /* û’¿’Å˶ã.MëqÙƯy */
+	$"DD82 BBF2 37F1 1193 74D0 373D 4043 C292"            /* Ý‚»ò7ñ.“tÐ7=@CÂ’ */
+	$"0B1D 4E8F 04F4 A035 451A 7DCB 02DB D77E"            /* ..N�.ô 5E.}Ë.Û×~ */
+	$"DD1C 3667 1BA7 2584 C128 3835 4454 5C15"            /* Ý.6g.§%„Á(85DT\. */
+	$"5846 C7D1 4689 3D2A 1172 9BA8 9830 F037"            /* XFÇÑF‰=*.r›¨˜0ð7 */
+	$"0053 8FD6 4023 68C6 7122 CAC6 0325 5AF3"            /* .S�Ö@#hÆq"ÊÆ.%Zó */
+	$"E104 A423 C5AE F551 6DF6 7B11 D5EB FD34"            /* á.¤#Å®õQmö{.Õëý4 */
+	$"DF67 C50C 737D 74D5 D5EC 7027 A2D8 C79A"            /* ßgÅ.s}tÕÕìp'¢ØÇš */
+	$"200D A972 A30A 509A C3DE 483F 8B53 D69C"            /*  .©r£ÂPšÃÞH?‹SÖœ */
+	$"001F 47E9 BD2C 84EC DB83 B493 0326 DE6E"            /* ..Gé½,„ìÛƒ´“.&Þn */
+	$"336A 7C76 3225 8351 7B2D 37B5 D645 9866"            /* 3j|v2%ƒQ{-7µÖE˜f */
+	$"019E 6472 40C4 5853 3376 9D90 D3EA A727"            /* .ždr@ÄXS3v��Óê§' */
+	$"07A1 A4B8 A32F 475A 22A2 059C AB5B F13E"            /* .¡¤¸£/GZ"¢.œ«[ñ> */
+	$"E2DF 5B3E E6B5 B27F 28AF A15F 400C 7D9F"            /* âß[>æµ².(¯¡_@.}Ÿ */
+	$"43ED 33D4 9B4D CB64 E550 5FED FC2F E485"            /* Cí3Ô›MËdåP_íü/ä… */
+	$"271E 2DB1 6AE5 6793 EFE8 FCC5 A784 4C95"            /* '.-±jåg“ïèüŧ„L• */
+	$"E488 B5AC A528 BACB 10FF 4ABD D554 E56B"            /* 䈵¬¥(ºË.ÿJ½ÕTåk */
+	$"F72E 8ED7 5E48 60A4 82D0 381F A2D4 625C"            /* ÷.Ž×^H`¤‚Ð8.¢Ôb\ */
+	$"9F80 2A63 5FD3 DD0C EDA8 3DE3 281E A65C"            /* Ÿ€*c_ÓÝ.í¨=ã(.¦\ */
+	$"88EA 1A96 626D DC03 79BE C4ED EA60 4FC5"            /* ˆê.–bmÜ.y¾Äíê`OÅ */
+	$"BB10 D9D5 99AF 0534 65C2 05AE 8D23 82B0"            /* ».ÙÕ™¯.4eÂ.®�#‚° */
+	$"6FB7 881A 7BC5 0316 7A28 4B27 2763 A6C3"            /* o·ˆ.{Å..z(K''c¦Ã */
+	$"8FC7 073A 1391 81BB 707F 625D 355F B1DF"            /* �Ç.:.‘�»p.b]5_±ß */
+	$"A749 C3EE A157 EC1F 0F6C 70AB 1A36 5711"            /* §IÃî¡Wì..lp«.6W. */
+	$"C49B 1CA8 54A0 0FB9 6A2E 0F86 2E57 BC2F"            /* Ä›.¨T .¹j..†.W¼/ */
+	$"8CDD B76A F6DB 83F9 EEFF 4BF1 DE60 660E"            /* ŒÝ·jöÛƒùîÿKñÞ`f. */
+	$"BCBA 7D68 D5DE 8663 DF06 3F65 A981 38D7"            /* ¼º}hÕÞ†cß.?e©�8× */
+	$"CC20 EBAE 6143 C79E D2F3 DCF4 FA0F 433E"            /* Ì ë®aCÇžÒóÜôú.C> */
+	$"6DFE 4C5F 032A F6DD DD11 F85F 5003 22CD"            /* mþL_.*öÝÝ.ø_P."Í */
+	$"C07E F1CC 40B9 8D61 825D 77C7 91A6 BD49"            /* À~ñÌ@¹�a‚]wÇ‘¦½I */
+	$"2590 4BCD EB13 37A2 D5FA 2931 F311 9028"            /* %�KÍë.7¢Õú)1ó.�( */
+	$"6C02 96FC ACF5 1EA4 8E51 4BC9 FDE8 DFEF"            /* l.–ü¬õ.¤ŽQKÉýèßï */
+	$"C5A0 8082 7E0D C127 3A80 A65B 7989 CCEE"            /* Å €‚~.Á':€¦[y‰Ìî */
+	$"6F6A 8DDF FB5B 46A5 3757 7FC3 3EFD BC0A"            /* oj�ßû[F¥7W.Ã>ý¼Â */
+	$"8567 1CB0 3BE7 A153 D7CE 8F63 D2DC 8840"            /* …g.°;ç¡S×Î�cÒ܈@ */
+	$"D993 E028 0E86 AA99 3ADE CC55 A789 CFC8"            /* Ù“à(.†ª™:ÞÌU§‰ÏÈ */
+	$"D92B 9613 3850 B7B3 467A FA09 7D45 E174"            /* Ù+–.8P·³FzúÆ}Eát */
+	$"D351 3254 64A3 7FC5 0D8D 1EDB FEC9 3F05"            /* ÓQ2Td£.Å.�.ÛþÉ?. */
+	$"C3C2 264B ACB8 F3C3 1BFF 04A5 12CF C191"            /* ÃÂ&K¬¸óÃ.ÿ.¥.ÏÁ‘ */
+	$"8CA0 5985 E34C E583 A230 CD43 8602 BAAF"            /* Œ Y…ãL僢0ÍC†.º¯ */
+	$"1475 FCA7 B274 1314 051F AF06 089D 13B1"            /* .uü§²t....¯..�.± */
+	$"5C06 815E FAA5 6864 CECE D56A 127C 058B"            /* \.�^ú¥hdÎÎÕj.|.‹ */
+	$"1859 E9E8 7A98 4299 3CFF 70CE C2DD 8676"            /* .Yéèz˜B™<ÿpÎÂ݆v */
+	$"1798 5F8E 9960 922E 9226 3F9B 5657 890F"            /* .˜_Ž™`’.’&?›VW‰. */
+	$"75BC FECF 6919 6701 D086 0EA5 26BA 8B78"            /* u¼þÏi.g.І.¥&º‹x */
+	$"7381 41FC 19AD 7201 BFD9 B3D3 2F00 1A1C"            /* s�Aü.­r.¿Ù³Ó/... */
+	$"E689 F3BC 5FC7 0418 66A2 5AEE 0374 DE30"            /* æ‰ó¼_Ç..f¢Zî.tÞ0 */
+	$"DC4B 70F1 ACC6 2BC6 06E9 461F E71B CD5E"            /* ÜKpñ¬Æ+Æ.éF.ç.Í^ */
+	$"2766 D533 884B A37F 7820 5CCA 3D60 1C3A"            /* 'fÕ3ˆK£.x \Ê=`.: */
+	$"8865 509F C1F0 86B6 9A91 0A52 426E CF1D"            /* ˆePŸÁð†¶š‘ÂRBnÏ. */
+	$"4B52 7AFE 9519 ECDB 9DD3 BFA1 80F7 50BD"            /* KRzþ•.ìÛ�Ó¿¡€÷P½ */
+	$"D2DD 6FAB F00D 3600 9104 37AC 81AA F9C3"            /* ÒÝo«ð.6.‘.7¬�ªùà */
+	$"3933 A702 AC9C 42F1 4579 C5F2 CD99 165F"            /* 93§.¬œBñEyÅòÍ™._ */
+	$"2D84 FE8B D02C 055F F99C 1729 45C7 6B56"            /* -„þ‹Ð,._ùœ.)EÇkV */
+	$"EE73 818A 9940 BB46 1408 639B 9779 C805"            /* îs�Š™@»F..c›—yÈ. */
+	$"1B0B CC86 D42E E9BB 046D 0E93 7273 E00F"            /* ..̆Ô.é».m.“rsà. */
+	$"B7D5 D377 E0ED 2494 4623 5BDF C83C 54A5"            /* ·ÕÓwàí$”F#[ßÈ<T¥ */
+	$"6B6B D343 F20E AD4C B45C 2BF4 7C65 87A1"            /* kkÓCò.­L´\+ô|e‡¡ */
+	$"E2EA E2B7 FF17 F9A1 5606 D5A7 C113 F062"            /* âêâ·ÿ.ù¡V.Õ§Á.ðb */
+	$"D50E E647 922C 8746 7CBA 99C8 4400 979D"            /* Õ.æG’,‡F|º™ÈD.—� */
+	$"3D09 19E7 3A84 E245 ED1F 1C14 3967 45CE"            /* =Æ.ç:„âEí...9gEÎ */
+	$"2B06 C383 F2A6 2CEE 02E6 A2A7 1821 0F3F"            /* +.Ãò¦,î.梧.!.? */
+	$"4057 F9E9 B830 94C7 65AA C396 6F97 2721"            /* @Wùé¸0”ÇeªÃ–o—'! */
+	$"F1AC 6AF7 6C6C 3F02 D2F1 343D 8B42 0F6F"            /* ñ¬j÷ll?.Òñ4=‹B.o */
+	$"E2D4 A7D8 7158 F033 C573 AD72 01B7 1CC7"            /* âÔ§ØqXð3Ås­r.·.Ç */
+	$"4CA6 78C2 BABD BB30 5E03 BDEE DF19 8240"            /* L¦xº½»0^.½îß.‚@ */
+	$"9521 A43A B142 2F42 3590 AD8C B9FD A409"            /* •!¤:±B/B5�­Œ¹ý¤Æ */
+	$"9D77 38E7 B8F8 3BCD 4478 61C3 5768 0324"            /* �w8ç¸ø;ÍDxaÃWh.$ */
+	$"4E55 4240 1E87 1F93 D0BA 6929 C235 7E76"            /* NUB@.‡.“кi)Â5~v */
+	$"F6E8 AA1B AF13 15FD EB95 2609 BE7D BFE8"            /* öèª.¯..ýë•&ƾ}¿è */
+	$"3E51 8F2E 4780 4EE6 891E F83D FF7D D1C3"            /* >Q�.G€Næ‰.ø=ÿ}Ñà */
+	$"818F 28A2 2AC0 AD00 7F03 5781 2882 A44A"            /* ��(¢*À­...W�(‚¤J */
+	$"6728 D9F6 E77F A883 C794 71AC 55E9 8112"            /* g(Ùöç.¨ƒÇ”q¬Ué�. */
+	$"BF6F ECDA 9BD1 96B8 79AA A397 A6F2 C93F"            /* ¿oìڛі¸yª£—¦òÉ? */
+	$"3792 B8C4 8667 AAF4 659D 59F6 E77F A870"            /* 7’¸Ä†gªôe�Yöç.¨p */
+	$"24F1 5461 DB69 0F4C F8B3 F02A F6E7 7FA6"            /* $ñTaÛi.Lø³ð*öç.¦ */
+	$"26C9 5EDE 9BB6 A1C6 9467 854A 5327 BA38"            /* &É^Þ›¶¡Æ”g…JS'º8 */
+	$"F535 A01A B90A 9580 95A0 FE5C A623 DE0D"            /* õ5 .¹Â•€• þ\¦#Þ. */
+	$"6C3E BF23 66F2 9312 9490 EB88 1D63 7AF4"            /* l>¿#fò“.”�ëˆ.czô */
+	$"9F5B 7F45 9078 3A5F CC36 7702 EAD5 FA4D"            /* Ÿ[.E�x:_Ì6w.êÕúM */
+	$"5F9D 258B 14A8 A235 6490 6B7D 2B05 42C3"            /* _�%‹.¨¢5d�k}+.Bà */
+	$"2A5A 791E 92C3 B1E8 B323 FF74 81FC B063"            /* *Zy.’ñè³#ÿt�ü°c */
+	$"4A31 CBBC 91E2 A64A F935 FE79 4C07 1376"            /* J1˼‘â¦Jù5þyL..v */
+	$"002A 4795 5221 70B2 005C 41F9 D631 126F"            /* .*G•R!p².\AùÖ1.o */
+	$"FF7F DF03 06BD 7214 71AB 4EF3 8EEA 0261"            /* ÿ.ß..½r.q«NóŽê.a */
+	$"D054 C087 EA15 CBD2 4645 2F9F 3600 4144"            /* ÐTÀ‡ê.ËÒFE/Ÿ6.AD */
+	$"5671 C61E D3CB 8B84 A60D B58E FB69 C71F"            /* VqÆ.ÓË‹„¦.µŽûiÇ. */
+	$"B09A EDD9 AAC0 6FBA D7FE 8C4D 8262 6C73"            /* °šíÙªÀoº×þŒM‚bls */
+	$"9F69 0E81 7581 1D52 FB27 C979 1597 69EA"            /* Ÿi.�u�.Rû'Éy.—iê */
+	$"F1DF E906 0B77 2E21 D31A 5CCD 9474 95A2"            /* ñßé..w.!Ó.\Í”t•¢ */
+	$"CB48 AB27 5F53 B82F 1638 16A4 87CD ED1F"            /* ËH«'_S¸/.8.¤‡Íí. */
+	$"20BC 2894 5EE1 C84C 1AC1 1158 0293 024E"            /*  ¼(”^áÈL.Á.X.“.N */
+	$"1023 0E4F 9BD8 FA73 6E62 FF7F FD08 5797"            /* .#.O›Øúsnbÿ.ý.W— */
+	$"0788 A951 6DDA 2448 21D2 7FCA 20B4 E1BF"            /* .ˆ©QmÚ$H!Ò.Ê ´á¿ */
+	$"3262 89C7 5386 ACB1 8B89 6AC3 F907 1355"            /* 2b‰ÇS†¬±‹‰jÃù..U */
+	$"66D9 1E5A 5B54 19E9 2737 FF7C B8DF 1F5E"            /* fÙ.Z[T.é'7ÿ|¸ß.^ */
+	$"3592 B16D 6089 DE73 8F19 479D 626B 977D"            /* 5’±m`‰Þs�.G�bk—} */
+	$"185E F7A3 AF62 AD92 E5AC 2F74 B991 F96F"            /* .^÷£¯b­’å¬/t¹‘ùo */
+	$"211F 5AE0 4C27 344F A9E1 C731 DB20 A0FF"            /* !.ZàL'4O©áÇ1Û  ÿ */
+	$"7FFF 7F2E 356F CC55 C6B8 C2C9 2AEF 2D31"            /* .ÿ..5oÌUƸÂÉ*ï-1 */
+	$"EFEB D878 C16F B1B1 3D47 240C 489C 7153"            /* ïëØxÁo±±=G$.HœqS */
+	$"E5F8 A5C8 6E2C 7650 AED0 C4B7 43EA 67B6"            /* åø¥Èn,vP®ÐÄ·Cêg¶ */
+	$"94E4 7274 CFEB 4CF3 FD3E 8065 B9CC 35A5"            /* ”ärtÏëLóý>€e¹Ì5¥ */
+	$"21B1 3804 AD98 4F8A 6FFC 50DA 014C 442B"            /* !±8.­˜OŠoüPÚ.LD+ */
+	$"AA41 1455 BD94 B366 A37D CA82 7FFC DE57"            /* ªA.U½”³f£}Ê‚.üÞW */
+	$"2EA9 98C2 5510 E51E 24CC 0428 4C83 1BBE"            /* .©˜ÂU.å.$Ì.(Lƒ.¾ */
+	$"0A46 A6DD 6963 D4CB 24E8 748B ED10 7B6D"            /* ÂF¦ÝicÔË$èt‹í.{m */
+	$"E61C 86C3 C80E 3030 FCE9 2263 C956 95A1"            /* æ.†ÃÈ.00üé"cÉV•¡ */
+	$"AED0 C4B1 D07C F701 9DA0 ED2C C401 BC1A"            /* ®ÐıÐ|÷.� í,Ä.¼. */
+	$"9421 2D43 EF12 7494 8D46 CB82 3FE2 6439"            /* ”!-Cï.t”�FË‚?âd9 */
+	$"6BDE C8CE 23B7 9D2E B6F9 DF4B C1A9 A145"            /* kÞÈÎ#·�.¶ùßKÁ©¡E */
+	$"1512 85E6 30E6 98D1 AC22 EEBC 459C D841"            /* ..…æ0æ˜Ñ¬"î¼EœØA */
+	$"0A0F 1F31 2F75 7937 220F 7271 FE79 44A6"            /* Â..1/uy7".rqþyD¦ */
+	$"777E 1645 E0BA D980 0FFF 7D9F EC83 A930"            /* w~.EàºÙ€.ÿ}Ÿìƒ©0 */
+	$"D12B 216D 4D3F 4AD0 5EE9 DBC7 53D7 0A21"            /* Ñ+!mM?JÐ^éÛÇS×Â! */
+	$"2372 C608 6701 8AFA 8E33 4125 2B7E 38DA"            /* #rÆ.g.ŠúŽ3A%+~8Ú */
+	$"5990 99EE B1D0 B07C 9F9D 97DD D658 2C2A"            /* Y�™î±Ð°|Ÿ�—ÝÖX,* */
+	$"C7D6 4556 2AA7 297F ACBE 4802 B472 E76F"            /* ÇÖEV*§).¬¾H.´rço */
+	$"644F 2F11 17FF 7F9D CE1C 2989 7199 03B1"            /* dO/..ÿ.�Î.)‰q™.± */
+	$"E719 2B3B 1131 C4CC 808B BC7A 26A4 479F"            /* ç.+;.1ÄÌ€‹¼z&¤GŸ */
+	$"4824 6486 E338 DB65 A502 454C C415 B8D0"            /* H$d†ã8Ûe¥.ELÄ.¸Ð */
+	$"7C77 7323 E381 5958 F415 95B9 142E 85F8"            /* |ws#ã�YXô.•¹..…ø */
+	$"1742 E22F FF17 567B A195 DFF1 7EE0 8E40"            /* .Bâ/ÿ.V{¡•ßñ~àŽ@ */
+	$"431A B629 DDCE AED1 A925 9FCD 56B5 7945"            /* C.¶)Ýήѩ%ŸÍVµyE */
+	$"B8B9 77DF 732C CD1E 8137 2645 1135 9593"            /* ¸¹wßs,Í.�7&E.5•“ */
+	$"E31C 333B 30E2 518D E202 A1E0 FEA6 C40E"            /* ã.3;0âQ�â.¡àþ¦Ä. */
+	$"BB50 0174 C21D 0BFB 34C1 1A8D 8E5D FF77"            /* »P.tÂ..û4Á.�Ž]ÿw */
+	$"909A 8111 3123 8200 AFC2 0525 13A1 C383"            /* �š�.1#‚.¯Â.%.¡Ãƒ */
+	$"5472 BA45 8D58 8818 E5CD 6FEA D858 47C5"            /* TrºE�Xˆ.åÍoêØXGÅ */
+	$"F5A0 7773 3C86 1CE8 9A67 FAA7 5726 643B"            /* õ ws<†.èšgú§W&d; */
+	$"1BF8 C2C1 E7AD D3CE E89B 97C4 0210 1FAE"            /* .øÂÁç­ÓÎè›—Ä...® */
+	$"9319 1F1F 7F89 0B76 5918 7EF8 9947 CF44"            /* “....‰.vY.~ø™GÏD */
+	$"6B5C 4B5D 5067 58A7 F35E CF39 7D01 C555"            /* k\K]PgX§ó^Ï9}.ÅU */
+	$"FCD3 E0F6 C1A4 9C8A 0B34 2D33 A20D F664"            /* üÓàöÁ¤œŠ.4-3¢.öd */
+	$"C174 CCE8 CAA1 C45F 2974 101B 86E7 68FD"            /* ÁtÌèÊ¡Ä_)t..†çhý */
+	$"D6FE 8FE9 AC95 5D3D DE38 1829 E3B9 37FE"            /* Öþ�鬕]=Þ8.)ã¹7þ */
+	$"5008 F383 21C4 4D57 AE92 9F94 A9BB 3A76"            /* P.óƒ!ÄMW®’Ÿ”©»:v */
+	$"705F 8D2D 889C EB93 FD2B 05C5 89F2 500E"            /* p_�-ˆœë“ý+.ʼnòP. */
+	$"4220 A486 F348 D466 4D62 E368 540A 1D25"            /* B ¤†óHÔfMbãhTÂ.% */
+	$"AF7C A9EF 43CC E423 16FC 6EE5 C407 DDAE"            /* ¯|©ïCÌä#.ünåÄ.Ý® */
+	$"EB28 23D2 3FDE 40EF 2ED1 D53A B87B 9C40"            /* ë(#Ò?Þ@ï.ÑÕ:¸{œ@ */
+	$"80A2 77EF CC8F D34E C33F 7BB4 4748 E4A6"            /* €¢wïÌ�ÓNÃ?{´GHä¦ */
+	$"B177 05FF 085F CBF9 F1A0 8CA7 4200 32AC"            /* ±w.ÿ._Ëùñ Œ§B.2¬ */
+	$"7B87 A517 EA04 C96C F9A3 C6ED 5FFF 7FED"            /* {‡¥.ê.Élù£Æí_ÿ.í */
+	$"D5EB F835 3E15 6882 AED1 72BF B42C 87DE"            /* Õëø5>.h‚®Ñr¿´,‡Þ */
+	$"8111 0F7A 5DA6 CFEA 79A7 9174 89E8 E637"            /* �..z]¦Ïêy§‘t‰èæ7 */
+	$"7E56 B53E 9987 2013 8F1A 06A5 07A2 1856"            /* ~Vµ>™‡ .�..¥.¢.V */
+	$"FE30 E259 128A 968B 881F E88D 8566 98D7"            /* þ0âY.Š–‹ˆ.è�…f˜× */
+	$"C815 C397 64E8 9FAC 059A 5922 C863 F220"            /* È.×d蟬.šY"Ècò  */
+	$"EC2A 4AF8 5DB2 A77D FC6A 3AC1 357E D5CC"            /* ì*Jø]²§}üj:Á5~ÕÌ */
+	$"142B 85B0 FEE0 2579 D845 CDFD F507 4C58"            /* .+…°þà%yØEÍýõ.LX */
+	$"D86A F299 0BBC A0A8 39A4 03D9 2144 6B3E"            /* Øjò™.¼ ¨9¤.Ù!Dk> */
+	$"6D67 242B 0FEB B6F4 79CB 58ED 2338 DB9F"            /* mg$+.ë¶ôyËXí#8ÛŸ */
+	$"6EC7 1626 0FDD 0C77 1E00 2AE4 8B46 F39C"            /* nÇ.&.Ý.w..*ä‹Fóœ */
+	$"6268 EE5F FF49 B5C8 30E7 9859 E163 A9D4"            /* bhî_ÿIµÈ0ç˜Yác©Ô */
+	$"C50F BC0C 46BB BBC7 9FFF 7D54 E81B 8936"            /* Å.¼.F»»ÇŸÿ}Tè.‰6 */
+	$"A032 72E8 6576 5FEA 9A3F A5A9 9E58 B9C2"            /*  2rèev_êš?¥©žX¹Â */
+	$"A089 A039 5695 766F 3295 A1FF 7F5F FBDB"            /*  ‰ 9V•vo2•¡ÿ._ûÛ */
+	$"A3FD 1F1F 76AD 6787 B4D0 D1A5 E4EA 72F8"            /* £ý..v­g‡´ÐÑ¥äêrø */
+	$"0276 0C35 EC34 65A8 000A CA35 6AAE 1800"            /* .v.5ì4e¨.ÂÊ5j®.. */
+	$"99CA 1B65 F56D 6C3B DF33 AB08 94A3 15CF"            /* ™Ê.eõml;ß3«.”£.Ï */
+	$"C9B8 D32E 35D7 D32D 57E6 86D2 A5BE 2B3A"            /* ɸÓ.5×Ó-Wæ†Ò¥¾+: */
+	$"4535 2C10 41FE FDA9 E202 3927 BC4F 5F90"            /* E5,.Aþý©â.9'¼O_� */
+	$"E637 311C DB00 E394 09F3 005B 7DB3 0DFE"            /* æ71.Û.ã”Æó.[}³.þ */
+	$"9F1F CAA4 DD03 B381 8330 AB38 E13B 2F9C"            /* Ÿ.ʤÝ.³�ƒ0«8á;/œ */
+	$"3DB5 01C5 100A 5D16 5C8D 792C FA0E 1A85"            /* =µ.Å.Â].\�y,ú..… */
+	$"E3FF 467A 6333 E4F1 F27C 9E2B 161E 18F0"            /* ãÿFzc3äñò|ž+...ð */
+	$"3F30 9C2C 631D BE74 4B7F 6E21 3FBC 404E"            /* ?0œ,c.¾tK.n!?¼@N */
+	$"E063 4152 D02D 68E4 869C E7E9 E4E6 4E95"            /* àcARÐ-h䆜çéäæN• */
+	$"3A66 1FDA 1145 DFB4 0796 9F97 503C E2C9"            /* :f.Ú.Eß´.–Ÿ—P<âÉ */
+	$"7F49 D644 1290 98BD 8EA0 2FA1 CF00 E383"            /* .IÖD.�˜½Ž /¡Ï.ム*/
+	$"C003 7BFE D79B FF62 A38E 2C39 A64D 19FF"            /* À.{þ×›ÿb£Ž,9¦M.ÿ */
+	$"6A9D 976A 994B 6626 4F4D 7DC8 F0CA EDB7"            /* j�—j™Kf&OM}ÈðÊí· */
+	$"F99E 21E2 36B4 3AAB E787 C6A2 1783 F623"            /* ùž!â6´:«ç‡Æ¢.ƒö# */
+	$"8755 1F66 AFBC 2959 6E6E 2E61 AC85 2198"            /* ‡U.f¯¼)Ynn.a¬…!˜ */
+	$"9978 EDFD 334C F0D6 7F76 9AF2 47AF 5E4B"            /* ™xíý3LðÖ.všòG¯^K */
+	$"805C 54D3 5F2A 16C5 6675 C288 B44F F851"            /* €\TÓ_*.Åfuˆ´OøQ */
+	$"1CE9 9F21 BF10 92B9 2366 5D69 AE8E 9989"            /* .éŸ!¿.’¹#f]i®Ž™‰ */
+	$"36A6 F9E6 75A7 0D47 C8B5 8727 0138 2BFA"            /* 6¦ùæu§.Gȵ‡'.8+ú */
+	$"5C4A 649C 123C 225E 2CEC 2007 5016 3F11"            /* \Jdœ.<"^,ì .P.?. */
+	$"B8FF 60CB 7150 EBFD DFED 147E 0A98 E096"            /* ¸ÿ`ËqPëýßí.~Â˜à– */
+	$"6B76 3AF0 39A5 5BF2 880C E857 174C 8735"            /* kv:ð9¥[òˆ.èW.L‡5 */
+	$"ACF6 E4B7 3477 6293 FF7C 8515 A8DE 4E73"            /* ¬öä·4wb“ÿ|….¨ÞNs */
+	$"8E37 8A0C 4384 0CF3 FA01 15F5 9639 ED05"            /* Ž7Š.C„.óú..õ–9í. */
+	$"C86B 28A0 C331 14BC 2817 FE9B F96A D60D"            /* Èk( Ã1.¼(.þ›ùjÖ. */
+	$"EBCB 14DA FF7F FF47 8A61 A2C7 F01F 10B7"            /* ëË.Úÿ.ÿGŠa¢Çð..· */
+	$"3DAF B01C B484 F55D 457E E3EC CC41 95DE"            /* =¯°.´„õ]E~ãìÌA•Þ */
+	$"097E 8117 F77F FEFB A490 8B96 1300 2B37"            /* Æ~�.÷.þû¤�‹–..+7 */
+	$"19FA E04C 4188 E9F6 8950 0668 B082 8FD8"            /* .úàLAˆéö‰P.h°‚�Ø */
+	$"0B7D 6C32 4DBF F84F F4E9 ACAF 719A DC43"            /* .}l2M¿øOô鬯qšÜC */
+	$"9F8D A53E DF1A BDB0 AAA7 3267 9C2D 357A"            /* Ÿ�¥>ß.½°ª§2gœ-5z */
+	$"9CA7 1AE1 59C4 F467 83D3 308B 004A 42C2"            /* œ§.áYÄôgƒÓ0‹.JB */
+	$"909B F979 41CE AB25 C6D1 9FE9 46E1 E837"            /* �›ùyAΫ%ÆÑŸéFáè7 */
+	$"7ADF FF72 225E 4472 D323 F55C BE19 1E50"            /* zßÿr"^DrÓ#õ\¾..P */
+	$"BF94 6787 CADB F576 300A 054B 0A2D E9B2"            /* ¿”g‡ÊÛõv0Â.KÂ-é² */
+	$"5C15 DB84 E735 F76D 5477 D8A7 28AF FF7A"            /* \.Û„ç5÷mTwا(¯ÿz */
+	$"7EB8 06F8 4FF4 E999 ED48 02C4 F111 F61D"            /* ~¸.øOôé™íH.Äñ.ö. */
+	$"8A6C 1CC6 AE54 94E4 8C5D 7655 4ECC 205F"            /* Šl.Æ®T”äŒ]vUNÌ _ */
+	$"DBF9 1BA7 83CC 52E9 E9C9 52A4 1151 7DE4"            /* Ûù.§ƒÌRééÉR¤.Q}ä */
+	$"051B E140 3FC0 D60B 0C11 663F 98A9 8B53"            /* ..á@?ÀÖ...f?˜©‹S */
+	$"776E BD8D 7678 AD62 ACEE 033F D134 B61E"            /* wn½�vx­b¬î.?Ñ4¶. */
+	$"F86D 3384 AAE7 9074 F7CF 4509 F9B3 4F30"            /* øm3„ªç�t÷ÏEÆù³O0 */
+	$"F32D 840F 1DDA E6B1 BDD4 951F 2379 F890"            /* ó-„..Úæ±½Ô•.#yø� */
+	$"530A E915 A228 D3D8 B188 C692 2767 D628"            /* SÂé.¢(ÓرˆÆ’'gÖ( */
+	$"12F8 3FFA BA23 F76B 1D92 1FC1 EA73 30FC"            /* .ø?úº#÷k.’.Áês0ü */
+	$"CE72 0CA5 6695 6326 F93B B52F B9D4 F6F0"            /* Îr.¥f•c&ù;µ/¹Ôöð */
+	$"FF07 727B 80F9 EBFC 2176 788C 333F 4137"            /* ÿ.r{€ùëü!vxŒ3?A7 */
+	$"E82C D066 6088 A8EA 168F 40EA F1EE BDE8"            /* è,Ðf`ˆ¨ê.�@êñî½è */
+	$"C023 75BA 66F2 335A 98C0 31A8 2137 7A7B"            /* À#uºfò3Z˜À1¨!7z{ */
+	$"DA0F 3962 D4B3 3E6E A5A1 3A19 5EED 48A7"            /* Ú.9bÔ³>n¥¡:.^íH§ */
+	$"7617 DE46 D178 BC48 D85D 7821 DFEC B30D"            /* v.ÞFÑx¼HØ]x!ßì³. */
+	$"F84F B7CD 80ED 55C7 9E1A F58D 7085 F625"            /* øO·Í€íUÇž.õ�p…ö% */
+	$"F564 3BF5 A09E B353 4E45 2F0B FC02 ECFD"            /* õd;õ ž³SNE/.ü.ìý */
+	$"539F 529C A652 34F1 C0CC BC04 FCE0 2C7D"            /* SŸRœ¦R4ñÀ̼.üà,} */
+	$"A8A9 9E67 79E9 ADE4 ABEE BFF6 4793 1B91"            /* ¨©žgyé­ä«î¿öG“.‘ */
+	$"413A 4302 7FB5 190C CB09 0DC9 3B33 E18D"            /* A:C..µ..ËÆ.É;3á� */
+	$"DDAB 23C5 FABA 5DC1 554F C940 B964 7F6A"            /* Ý«#Åúº]ÁUOÉ@¹d.j */
+	$"A781 2032 BF9E 0262 7C99 CD96 9251 9FB6"            /* §� 2¿ž.b|™Í–’QŸ¶ */
+	$"1C69 9141 7A13 3022 DE48 DA68 C959 A0B5"            /* .i‘Az.0"ÞHÚhÉY µ */
+	$"0F3A F19A 9301 5051 5855 9D7B 5173 EE47"            /* .:ñš“.PQXU�{QsîG */
+	$"2B0D DB30 28CC 5E41 46F1 E79F 90B3 AB2A"            /* +.Û0(Ì^AFñçŸ�³«* */
+	$"CAEA 6128 10E1 2CC0 DDC2 EBF1 26F1 E1DC"            /* Êêa(.á,ÀÝÂëñ&ñáÜ */
+	$"EB87 87ED 55F3 827C A066 D932 FCF7 B134"            /* 뇇íUó‚| fÙ2ü÷±4 */
+	$"8BC9 CC70 B38C B019 8372 EA60 7C36 4D38"            /* ‹ÉÌp³Œ°.ƒrê`|6M8 */
+	$"F82F 16C2 2390 A91B 203A 8EBE D0EC E278"            /* ø/.Â#�©. :Ž¾Ðìâx */
+	$"7AC4 8493 A217 6AC3 B85A 470D D74A B91D"            /* zÄ„“¢.jøZG.×J¹. */
+	$"0180 7BAB 4088 5671 6268 5B4A 54FE C179"            /* .€{«@ˆVqbh[JTþÁy */
+	$"1600 7677 830B 0E81 EEB2 6124 33F8 DBBD"            /* ..vwƒ..�î²a$3øÛ½ */
+	$"1B35 D1F9 0568 3891 0ECB A836 5A86 9636"            /* .5Ñù.h8‘.˨6Z†–6 */
+	$"9F87 052F 0D66 8AA3 3362 1651 9B33 9057"            /* Ÿ‡./.fŠ£3b.Q›3�W */
+	$"5B98 05EB 23CE 099F 2358 444E 0D64 A9F9"            /* [˜.ë#ÎÆŸ#XDN.d©ù */
+	$"A569 7D56 A50D 6256 69AF BDD9 7847 D651"            /* ¥i}V¥.bVi¯½ÙxGÖQ */
+	$"73E2 F76E F277 58DC BFB9 7B8E 593C 0E97"            /* sâ÷nòwXÜ¿¹{ŽY<.— */
+	$"3C4E 507D FA6C 7984 FAC8 6C42 6882 78AC"            /* <NP}úly„úÈlBh‚x¬ */
+	$"E40D B7A2 4E43 998B 1C29 D7C6 B7BA 58C9"            /* ä.·¢NC™‹.)×Æ·ºXÉ */
+	$"3503 114B 86B8 CB5D B605 832D 98FE 0257"            /* 5..K†¸Ë]¶.ƒ-˜þ.W */
+	$"FB50 8CA0 43D4 71BE E330 1584 5983 668F"            /* ûPŒ CÔq¾ã0.„Yƒf� */
+	$"735C 2448 3B30 82E4 1932 5BF8 129F FE38"            /* s\$H;0‚ä.2[ø.Ÿþ8 */
+	$"749D 01ED DAFC 95B9 375D BBCB 60D9 FC58"            /* t�.íÚü•¹7]»Ë`ÙüX */
+	$"0796 AEFC 2337 F89E 01F5 48BD 0BAF A61F"            /* .–®ü#7øž.õH½.¯¦. */
+	$"3EC4 C092 DC6A 584C AAAF 1A9F A20F CEA4"            /* >ÄÀ’ÜjXLª¯.Ÿ¢.Τ */
+	$"884B 2DB6 09F4 F51B 546F CD71 F4D3 6452"            /* ˆK-¶Æôõ.ToÍqôÓdR */
+	$"B6E5 3EFF 66F8 0D60 D916 F755 1348 E250"            /* ¶å>ÿfø.`Ù.÷U.HâP */
+	$"D8E2 6858 B424 B84B D59A 6885 24D3 D845"            /* ØâhX´$¸KÕšh…$ÓØE */
+	$"692F 4313 B616 584F 7419 0661 0064 C281"            /* i/C.¶.XOt..a.dÂ� */
+	$"A873 131C 5296 042B 1FD5 3EED BFC2 659E"            /* ¨s..R–.+.Õ>í¿Âež */
+	$"C4C7 2720 8002 28DD 141A BBE7 99F8 028F"            /* ÄÇ' €.(Ý..»ç™ø.� */
+	$"8262 0577 5240 EB9A F866 2901 B75B 3FED"            /* ‚b.wR@ëšøf).·[?í */
+	$"9E78 9071 83FD 02BC FCDE 2135 42D1 F184"            /* žx�qƒý.¼üÞ!5BÑñ„ */
+	$"309D F47E DF10 F797 4268 120A D377 04A4"            /* 0�ô~ß.÷—Bh.ÂÓw.¤ */
+	$"2998 099E CA35 66AD FB20 8C14 1E0E 714E"            /* )˜ÆžÊ5f­û Œ...qN */
+	$"B9A7 70EE 5BA0 7A18 FC16 97EB 1A98 CB6C"            /* ¹§pî[ z.ü.—ë.˜Ël */
+	$"4B5D AC5B 3DC2 2062 E74A 18F2 0A76 6085"            /* K]¬[=Â bçJ.òÂv`… */
+	$"EF50 1C2F FE23 117A ED22 7BE8 0231 BC71"            /* ïP./þ#.zí"{è.1¼q */
+	$"707C 6736 BC3C 38AA 81C2 66B6 DCE5 13E9"            /* p|g6¼<8ª�Âf¶Üå.é */
+	$"3076 C7AD 8C4B A962 C37E 4605 CDC0 8247"            /* 0vÇ­ŒK©bÃ~F.ÍÀ‚G */
+	$"190C 41CD 6923 8D00 BC94 5B5F E2AB 443B"            /* ..AÍi#�.¼”[_â«D; */
+	$"3C5A 7FF6 213C 9E2D 9224 70B1 EA9B 7D36"            /* <Z.ö!<ž-’$p±ê›}6 */
+	$"E7EA 0D03 CB32 7413 AB26 CB30 1B56 CBDE"            /* çê..Ë2t.«&Ë0.VËÞ */
+	$"3C31 361D 24E2 F441 4D78 7825 1DA0 0C14"            /* <16.$âôAMxx%. .. */
+	$"5C84 B112 6FC1 77DB 42CA 7791 960B 9F09"            /* \„±.oÁwÛBÊw‘–.ŸÆ */
+	$"980A 5629 54C0 EC82 889A B0E3 38F4 E734"            /* ˜ÂV)TÀ삈š°ã8ôç4 */
+	$"FA91 D5CD 2C8F 43CD 5629 3DAD 81DA 5E0A"            /* ú‘ÕÍ,�CÍV)=­�Ú^Â */
+	$"C008 712F EAD3 2486 4CD2 C7BA 0FA9 BBD3"            /* À.q/êÓ$†LÒǺ.©»Ó */
+	$"6AC2 A912 7736 5A33 CC96 9EDC 9C5A 3084"            /* j©.w6Z3Ì–žÜœZ0„ */
+	$"C826 A3FB 0661 ED4B 9689 A921 22AB 2399"            /* È&£û.aíK–‰©!"«#™ */
+	$"6F2A 4A78 A5F8 A059 BE4B 7DFF 5D41 1A31"            /* o*Jx¥ø Y¾K}ÿ]A.1 */
+	$"E688 045C BD1E D1DB 7C5B 6B89 5C22 3CAF"            /* æˆ.\½.ÑÛ|[k‰\"<¯ */
+	$"F133 FF14 13A2 9A3F 6E42 54EB 5082 9F25"            /* ñ3ÿ..¢š?nBTëP‚Ÿ% */
+	$"7C07 6BA6 25EA A890 3560 E915 B058 CB68"            /* |.k¦%ê¨�5`é.°XËh */
+	$"3601 4B07 ACE7 EC8A 2897 F908 D405 455E"            /* 6.K.¬çìŠ(—ù.Ô.E^ */
+	$"5EDD 427E 791A EA3D 6ACE 3BC0 0D43 731A"            /* ^ÝB~y.ê=jÎ;À.Cs. */
+	$"C9C6 8C03 BD83 6F85 EF75 7246 2F8E 1CFB"            /* ÉÆŒ.½ƒo…ïurF/Ž.û */
+	$"8DC9 2726 593F 1D87 A822 399F 9770 324C"            /* �É'&Y?.‡¨"9Ÿ—p2L */
+	$"6ABF 38B9 E89E B2F5 D575 E7DB C449 63CF"            /* j¿8¹èž²õÕuçÛÄIcÏ */
+	$"EBE1 07BB 80A4 C099 6A15 9A47 96F3 8C8D"            /* ëá.»€¤À™j.šG–óŒ� */
+	$"49E1 1F78 2119 9460 CA7A F257 EDA1 104B"            /* Iá.x!.”`ÊzòWí¡.K */
+	$"5C68 0E57 188C 62B0 FBE3 CF4F 5251 6525"            /* \h.W.Œb°ûãÏORQe% */
+	$"CB59 5E3D C6F4 6B04 5B2D 1ED2 3BE1 02BB"            /* ËY^=Æôk.[-.Ò;á.» */
+	$"7207 12AA BFEC 50F4 83FE 2797 121B 3D14"            /* r..ª¿ìPôƒþ'—..=. */
+	$"DA23 BE41 D647 E5CA DD2D CD48 8C4D A094"            /* Ú#¾AÖGåÊÝ-ÍHŒM ” */
+	$"B1A9 4ED5 4735 8818 C4F1 597D 3211 5D12"            /* ±©NÕG5ˆ.ÄñY}2.]. */
+	$"D96B 5A38 AB9A 7E89 C503 13B0 8354 C887"            /* ÙkZ8«š~‰Å..°ƒTȇ */
+	$"F766 96F0 EDAE C6B6 17B4 E9A4 9230 C2F5"            /* ÷f–ðí®Æ¶.´é¤’0Âõ */
+	$"029D 3D72 A1CF 5BB9 E975 DBFF 06DC F5B2"            /* .�=r¡Ï[¹éuÛÿ.Üõ² */
+	$"686F 667B AD3E 1D8D 5BE4 0D6A 2CD7 DE66"            /* hof{­>.�[ä.j,×Þf */
+	$"BE8E C996 696D 58EC 6CFE 40AD 3C95 EAF1"            /* ¾ŽÉ–imXìlþ@­<•êñ */
+	$"4591 1D62 836E D2E3 4CD8 E4A6 F4F4 C456"            /* E‘.bƒnÒãLØä¦ôôÄV */
+	$"A70C B3BE AA22 A188 DAB5 D3F7 4B7B 865D"            /* §.³¾ª"¡ˆÚµÓ÷K{†] */
+	$"4D89 77E6 99A6 46C9 14BA 25E1 55C5 ADBD"            /* M‰w晦FÉ.º%áUÅ­½ */
+	$"4379 96AF 26DA A399 F009 AE75 248B 0285"            /* Cy–¯&Ú£™ðÆ®u$‹.… */
+	$"B370 5704 6429 C8AF 0BD3 A332 90B2 8351"            /* ³pW.d)ȯ.Ó£2�²ƒQ */
+	$"F715 32C9 347B EADE 2EBB 9D97 BF95 0C5A"            /* ÷.2É4{êÞ.»�—¿•.Z */
+	$"9203 1EC5 7A8E CF46 C28C 39A2 DE74 C656"            /* ’..ÅzŽÏFÂŒ9¢ÞtÆV */
+	$"F0BF 3ABF CE5F BE71 B7CE 2FF3 F41B F3EA"            /* ð¿:¿Î_¾q·Î/óô.óê */
+	$"8BE7 B07E AB17 4F87 74FC FDE8 EF9F BF3F"            /* ‹ç°~«.O‡tüýè? */
+	$"A9EB F3D5 3F3E 83BE 7BAF EA5F E0FE 7ADF"            /* ©ëóÕ?>ƒ¾{¯ê_àþzß */
+	$"E7A7 7F9D 3FE7 3BF9 FA77 F9FA 3FF9 F7C7"            /* ç§.�?ç;ùúwùú?ù÷Ç */
+	$"E7E9 871D E84F CFE8 83FC FE85 E3BB E7E7"            /* çé‡.èOÏèƒüþ…ã»çç */
+	$"AFFE 7D7F F9F5 57E7 AF70 6F9D 2DF3 9ED7"            /* ¯þ}.ùõWç¯po�-óž× */
+	$"C81E F903 FEAB 8EF9 F50D F254 3F3E A4D1"            /* È.ù.þ«Žùõ.òT?>¤Ñ */
+	$"DD53 F3F6 F37E 7EC9 4775 1BE4 77F9 EEBF"            /* ÝSóöó~~ÉGu.äwùî¿ */
+	$"9ED1 F9DC 00F7 91DD 3D8B A94D D83C 797F"            /* žÑùÜ.÷‘Ý=‹©MØ<y. */
+	$"4243 1F04 D29C 94E6 FA35 A9C7 9C1C 0762"            /* BC..Òœ”æú5©Çœ..b */
+	$"AA92 7DF8 65D6 B16D 30C6 E3F2 22D5 8971"            /* ª’}øeÖ±m0Æãò"Õ‰q */
+	$"F890 651C 37E3 1F4A 29A4 6637 D7AE 7CB9"            /* ø�e.7ã.J)¤f7×®|¹ */
+	$"14C7 D06B 2595 45F8 89DC DBAF B284 6ADA"            /* .ÇÐk%•Eø‰ÜÛ¯²„jÚ */
+	$"E4DB 9D25 F76C CDA3 EB7E 1B5A 4264 8145"            /* äÛ�%÷lÍ£ë~.ZBd�E */
+	$"547E 6F18 076D A675 BA1A 1AB1 0BF1 AEB6"            /* T~o..m¦uº..±.ñ®¶ */
+	$"C8C2 AAE0 489F 4E11 7F77 336A 41A4 C050"            /* ȪàHŸN..w3jA¤ÀP */
+	$"D19E AE10 BD35 C5EC DA71 BDEF A017 C32D"            /* Ñž®.½5ÅìÚq½ï .Ã- */
+	$"CB15 0C8E 0B75 C179 FB84 FDF2 DD5D C21F"            /* Ë..Ž.uÁyû„ýòÝ]Â. */
+	$"56A5 397D C437 A82F 65F9 2E68 A785 0AF3"            /* V¥9}Ä7¨/eù.h§…Âó */
+	$"B9F0 7781 E6B8 ACFA 09DC B57D 6317 B29B"            /* ¹ðw�測úÆܵ}c.²› */
+	$"C754 09FC 3635 9854 0DA1 A3BE D3EE CF40"            /* ÇTÆü65˜T.¡£¾ÓîÏ@ */
+	$"4BE4 A4D9 07C4 D65E 3887 C8A7 CD3A 83F5"            /* Kä¤Ù.ÄÖ^8‡È§Í:ƒõ */
+	$"DFA8 10A6 BB6D B811 852D 3877 8782 1E66"            /* ߨ.¦»m¸.…-8w‡‚.f */
+	$"AF11 43B8 CA3A 6146 3657 AFE0 B314 36CB"            /* ¯.C¸Ê:aF6W¯à³.6Ë */
+	$"8E1C 272D ED4B 634C AABA 0207 6A1A E2E3"            /* Ž.'-íKcLªº..j.âã */
+	$"C500 C0A4 894A BAD8 C9A1 0AE7 AC8D 750C"            /* Å.À¤‰JºØÉ¡Âç¬�u. */
+	$"7D84 FBCC DB2E EE05 B04A 002B B383 46DE"            /* }„ûÌÛ.î.°J.+³ƒFÞ */
+	$"C18D 5BBD B442 9E88 BBB2 89CC 0EBA CF5A"            /* Á�[½´Bžˆ»²‰Ì.ºÏZ */
+	$"5616 DDAB ED7B 4C2E 1C82 0C9D 4820 C0E8"            /* V.Ý«í{L..‚.�H Àè */
+	$"1C4E 39A5 9041 9E33 A20A A73D 821A 238A"            /* .N9¥�Až3¢Â§=‚.#Š */
+	$"3B24 14B9 D9A6 95AA F5B0 13C1 8CFD 790F"            /* ;$.¹Ù¦•ªõ°.ÁŒýy. */
+	$"33CB 82D3 FE12 0F27 F309 7453 05E0 DF8F"            /* 3Ë‚Óþ..'óÆtS.àß� */
+	$"AAE8 F77A 31BA 0118 43E1 7AE7 69DC 5D12"            /* ªè÷z1º..CázçiÜ]. */
+	$"BD53 9858 EA6D D8D3 174C FE4C F487 3CCF"            /* ½S˜XêmØÓ.LþLô‡<Ï */
+	$"9098 7872 8FC3 EBAC 4C76 F503 6915 A1B3"            /* �˜xr�Ãë¬Lvõ.i.¡³ */
+	$"5FF8 81CD E13D D511 AAB8 5C7B 1376 C87F"            /* _ø�Íá=Õ.ª¸\{.vÈ. */
+	$"2DA1 557D 2053 3341 CC15 418C 0911 5378"            /* -¡U} S3AÌ.AŒÆ.Sx */
+	$"5FFE 324E 1412 2046 B049 3A77 69B7 417F"            /* _þ2N.. F°I:wi·A. */
+	$"AC17 B8B0 7FDA 6D19 59F0 DD68 8A88 E55A"            /* ¬.¸°.Úm.YðÝhŠˆåZ */
+	$"8098 0888 3714 713A 1D17 BB8D F01C 6005"            /* €˜.ˆ7.q:..»�ð.`. */
+	$"8F2E 3D20 2753 1BB4 9BE3 DFD1 709F 99EB"            /* �.= 'S.´›ãßÑpŸ™ë */
+	$"DFCC C1B1 717B 7FA3 52BB C12D E6B7 24D2"            /* ßÌÁ±q{.£R»Á-æ·$Ò */
+	$"F448 F23D C196 1BAA D61B F422 41B4 D620"            /* ôHò=Á–.ªÖ.ô"A´Ö  */
+	$"466D 45F3 06F6 F631 3E88 5CDE F7F6 BC6F"            /* FmEó.öö1>ˆ\Þ÷ö¼o */
+	$"789C D06C 02CC 2E71 B6B0 03D2 297B BFCD"            /* xœÐl.Ì.q¶°.Ò){¿Í */
+	$"8C21 67AD CEE0 DB53 5749 A676 690C 11E3"            /* Œ!g­ÎàÛSWI¦vi..ã */
+	$"5AD2 905C 78E1 4AB0 E60E C920 4ECC 7CB6"            /* ZÒ�\xáJ°æ.É NÌ|¶ */
+	$"A76F 70F1 BCFD AA1D F4D2 E43F E203 D0C8"            /* §opñ¼ýª.ôÒä?â.ÐÈ */
+	$"E11E 61AF F1A7 5762 600E 65BB D870 818A"            /* á.a¯ñ§Wb`.e»Øp�Š */
+	$"CDF0 DFC4 8C9C 1926 678B 2732 C52F 98FD"            /* ÍðßÄŒœ.&g‹'2Å/˜ý */
+	$"33B3 EE23 138D 5E5F C9C3 FEF9 6111 E3E6"            /* 3³î#.�^_ÉÃþùa.ãæ */
+	$"AF79 A8A5 2949 D590 B463 EDF3 F72A 18FD"            /* ¯y¨¥)IÕ�´cíó÷*.ý */
+	$"BB23 233B 7924 2DD1 A335 B949 467E A30C"            /* »##;y$-Ñ£5¹IF~£. */
+	$"3185 5FE5 DB63 6748 B22D AB3F 8A8C 0926"            /* 1…_åÛcgH²-«?ŠŒÆ& */
+	$"5450 E925 A69D 1185 7300 D694 EA1F 4DF2"            /* TPé%¦�.…s.Ö”ê.Mò */
+	$"2413 F4ED 6D64 5B74 BBD5 0E65 26EF A8CD"            /* $.ôímd[t»Õ.e&ï¨Í */
+	$"5806 0C60 404F 90A0 06B6 AFD1 785F 9646"            /* X..`@O� .¶¯Ñx_–F */
+	$"B1AD 2A45 5777 33FA 49DB 8D3D AC2A BAEA"            /* ±­*EWw3úIÛ�=¬*ºê */
+	$"4527 B4DF 481A 6AB9 4485 05E6 7040 1B93"            /* E'´ßH.j¹D….æp@.“ */
+	$"D6E0 3BBF A334 E13B 68EC 934B C393 B621"            /* Öà;¿£4á;hì“KÓ¶! */
+	$"CFC8 69BE A6AC 672C 235E F1FC 4480 DE83"            /* ÏÈi¾¦¬g,#^ñüD€Þƒ */
+	$"32D7 D269 F78C F22D 5B9F F4DF DDDD D6DE"            /* 2×Òi÷Œò-[ŸôßÝÝÖÞ */
+	$"4C65 4D61 C1F0 26BF E4C3 D7C9 A034 163D"            /* LeMaÁð&¿äÃ×É 4.= */
+	$"FBAE 0167 4DF0 EBEF AA8B B742 2832 1F67"            /* û®.gMðë懲·B(2.g */
+	$"8CC0 80D0 4A6B 9843 DE59 2F7B F944 9DA4"            /* ŒÀ€ÐJk˜CÞY/{ùD�¤ */
+	$"343D 9AD9 9E0B C7B5 0B7D 2CA1 F638 8A3B"            /* 4=šÙž.ǵ.},¡ö8Š; */
+	$"BB38 A39B 025A 9BA9 34AC ACF0 063D 5483"            /* »8£›.Z›©4¬¬ð.=Tƒ */
+	$"FE57 22E4 EB2C C699 AEF3 8EFB 1C8C A23A"            /* þW"äë,Æ™®óŽû.Œ¢: */
+	$"2C15 D2EF AC9A 91C9 993A 4CB0 2DDC 0A32"            /* ,.Ò﬚‘É™:L°-ÜÂ2 */
+	$"14B9 50D2 8579 8F9D 5AF2 88DB E726 1B39"            /* .¹PÒ…y��ZòˆÛç&.9 */
+	$"3E06 69F9 F300 09E4 D3E8 BB4C A704 10E0"            /* >.iùó.ÆäÓè»L§..à */
+	$"F1D0 53DE 91D8 6723 A047 11C7 57B3 C46C"            /* ñÐSÞ‘Øg# G.ÇW³Äl */
+	$"84A7 C2E1 C7CC 185C 9F21 7E2B 0F2E 64B1"            /* „§ÂáÇÌ.\Ÿ!~+..d± */
+	$"D734 4142 C65E A2FB 9ABE B62D 076B 2B65"            /* ×4ABÆ^¢ûš¾¶-.k+e */
+	$"9D6E 63F1 4825 79A9 3936 C7A7 531F EF6A"            /* �ncñH%y©96ǧS.ïj */
+	$"F859 3084 0421 88A9 A648 8641 ACEB 95DE"            /* øY0„.!ˆ©¦H†A¬ë•Þ */
+	$"2E94 E3C9 442C 13AF CF63 0404 C5C6 5CE2"            /* .”ãÉD,.¯Ïc..ÅÆ\â */
+	$"CE90 F9CC A1B6 5713 031E C239 174F CC40"            /* Î�ùÌ¡¶W...Â9.OÌ@ */
+	$"BCA4 EA9A EB6A 1D24 7962 F735 AF5A B937"            /* ¼¤êšëj.$yb÷5¯Z¹7 */
+	$"AC3B A12E 10A8 D332 6FE3 8ED1 6F01 B198"            /* ¬;¡..¨Ó2oãŽÑo.±˜ */
+	$"1543 A6A1 367E E226 5D76 B860 E0E1 8963"            /* .C¦¡6~â&]v¸`àá‰c */
+	$"AA7A F9EE DABF DB52 28F6 69F9 273F 8729"            /* ªzùîÚ¿ÛR(öiù'?‡) */
+	$"1D00 C7D2 20B9 3483 2125 88FC 94C0 54A6"            /* ..ÇÒ ¹4ƒ!%ˆü”ÀT¦ */
+	$"42FE F4E5 DA50 F495 F88B 5986 21CB 22E8"            /* BþôåÚPô•ø‹Y†!Ë"è */
+	$"EE5E 0622 2CB0 BCC8 0C6B 2B2B 23EB 0506"            /* î^.",°¼È.k++#ë.. */
+	$"A40F 09C2 726F 0C1F B8D4 55D3 2FE4 D629"            /* ¤.ÆÂro..¸ÔUÓ/äÖ) */
+	$"94C2 C913 BB28 4394 A9D2 8684 9E47 0445"            /* ”ÂÉ.»(C”©Ò†„žG.E */
+	$"B6CF 3E21 7072 B435 310C D7A3 063D 942B"            /* ¶Ï>!pr´51.×£.=”+ */
+	$"6AE9 350C 9442 C76E 1E6B A8C1 18A3 4309"            /* jé5.”BÇn.k¨Á.£CÆ */
+	$"6D55 E62F FC4E C4E9 6CF8 241D FAC5 2CC9"            /* mUæ/üNÄélø$.úÅ,É */
+	$"E020 6B12 31A6 9B11 710B 8850 FABE 5D63"            /* à k.1¦›.q.ˆPú¾]c */
+	$"068A 4018 2A90 93A5 9715 531E 8E7B AD7A"            /* .Š@.*�“¥—.S.Ž{­z */
+	$"2921 115F 19CE 2B6A F643 DE89 2E76 890B"            /* )!._.Î+jöCÞ‰.v‰. */
+	$"5A69 1668 6A02 061F 4832 24EB FC82 6B4D"            /* Zi.hj...H2$ëü‚kM */
+	$"9B08 D22F CBBF D348 D18F 8B0C C684 6851"            /* ›.Ò/Ë¿ÓHÑ�‹.Æ„hQ */
+	$"6CA9 E2FA 43CE 8A9A 7A58 FB28 0208 A6E0"            /* l©âúCΊšzXû(..¦à */
+	$"1ACF CE23 C624 5A38 C640 72C0 26F1 2818"            /* .ÏÎ#Æ$Z8Æ@rÀ&ñ(. */
+	$"07FD 74D9 F3D6 ED38 CA01 6485 CE8C 41A3"            /* .ýtÙóÖí8Ê.d…ÎŒA£ */
+	$"02C6 18E5 E4D2 2043 FA62 8768 3E14 7E80"            /* .Æ.åäÒ Cúb‡h>.~€ */
+	$"F2EB 67AD F743 75A0 2DDF 8724 1468 F88D"            /* òëg­÷Cu -߇$.hø� */
+	$"9BF3 11EB 4D4C B372 D210 9B58 BAA0 646A"            /* ›ó.ëML³rÒ.›Xº dj */
+	$"222F 5E5A C781 1D86 5652 1B57 07AF C8FA"            /* "/^ZÇ�.†VR.W.¯Èú */
+	$"9E77 DD7B FCB9 1D4C 8573 7B03 95AC D2DA"            /* žwÝ{ü¹.L…s{.•¬ÒÚ */
+	$"3314 4FFC CAF4 39B5 EAF4 9617 2CC5 9258"            /* 3.OüÊô9µêô–.,Å’X */
+	$"8F99 8C44 8D44 DA10 F1A5 51F7 5533 F13B"            /* �™ŒD�DÚ.ñ¥Q÷U3ñ; */
+	$"CDDC B6D6 BE71 3C92 2628 3B69 DC32 C623"            /* Íܶ־q<’&(;iÜ2Æ# */
+	$"F497 3959 034A 67C3 10A8 26E2 572F B4B1"            /* ô—9Y.JgÃ.¨&âW/´± */
+	$"6C5C 3E47 FB9F AA7D D9A4 7A08 4BBA E854"            /* l\>GûŸª}Ù¤z.KºèT */
+	$"4370 CE77 C69A 11EB 1BD8 B9AF 8225 BC8E"            /* CpÎwÆš.ë.ع¯‚%¼Ž */
+	$"A261 1CAA A74D B531 A0B9 D462 35DF 9C21"            /* ¢a.ª§Mµ1 ¹Ôb5ßœ! */
+	$"73F1 EAC1 A13C E0BC AF6C 8111 03DF AF1F"            /* sñêÁ¡<༯l�..߯. */
+	$"4748 1866 322C 535A 7C5E D2BC 4304 3541"            /* GH.f2,SZ|^Ò¼C.5A */
+	$"F14E 8412 296B 2C37 B642 9B4A 6417 EABB"            /* ñN„.)k,7¶B›Jd.ê» */
+	$"9034 1260 1B81 AFCC F903 4FAA A3F2 339E"            /* �4.`.�¯Ìù.Oª£ò3ž */
+	$"F332 B080 8C32 31D7 4DEA B260 F190 43F1"            /* ó2°€Œ21×Mê²`ñ�Cñ */
+	$"CCD5 A584 5C1C 343F FB87 CEA5 F246 8EAC"            /* ÌÕ¥„\.4?û‡Î¥òFŽ¬ */
+	$"C407 302C FEE7 3F59 F4B8 74ED ED62 D373"            /* Ä.0,þç?Yô¸tííbÓs */
+	$"A4BA B53A 0554 5403 9C2C E745 1087 5546"            /* ¤ºµ:.TT.œ,çE.‡UF */
+	$"2671 7BA6 3A33 703E BEF5 CD28 10A5 462B"            /* &q{¦:3p>¾õÍ(.¥F+ */
+	$"D902 9493 B2FC 176F 34BA 5A2D D2BC 0CBB"            /* Ù.”“²ü.o4ºZ-Ò¼.» */
+	$"5AB7 B854 08D3 CD79 3C71 1A89 E643 2FBC"            /* Z·¸T.ÓÍy<q.‰æC/¼ */
+	$"5A24 FEA6 EC06 1F23 79D9 3886 F6F4 7FB9"            /* Z$þ¦ì..#yÙ8†öô.¹ */
+	$"F892 1A20 DC66 1EB1 D6FD 1C48 52DE 4267"            /* ø’. Üf.±Öý.HRÞBg */
+	$"77E2 620B 2DC0 6828 575C F7CA 74BC FE73"            /* wâb.-Àh(W\÷Êt¼þs */
+	$"FABD C9ED 4E8F 71A7 8CCD 8D80 8BD2 8AA3"            /* ú½ÉíN�q§ŒÍ�€‹ÒŠ£ */
+	$"45C0 EF2A 387D 038E 8B00 BA81 12CD F93F"            /* EÀï*8}.Ž‹.º�.Íù? */
+	$"E9BE 9134 2928 439B 69CF 3DB1 5DFC 3DAF"            /* 龑4)(C›iÏ=±]ü=¯ */
+	$"86CA 34A7 4574 C91C 3F99 3EA9 B6E9 F3AF"            /* †Ê4§EtÉ.?™>©¶éó¯ */
+	$"6757 09A3 C49E A9AD 7201 BFD9 B3FA 52B0"            /* gWƣĞ©­r.¿Ù³úR° */
+	$"0000 0030 908B 4E52 45F1 3CBE F04A D2E4"            /* ...0�‹NREñ<¾ðJÒä */
+	$"83AF 6AEA 78E9 A438 C877 BAAD 65CB C703"            /* ƒ¯jêxé¤8Èwº­eËÇ. */
+	$"70B2 B9DD E19B 6B8C 0CE9 E402 0C9F 94F0"            /* p²¹Ýá›kŒ.éä..Ÿ”ð */
+	$"21BC 4E05 C03C 012A 66EF D0BC 2B72 292E"            /* !¼N.À<.*fïм+r). */
+	$"3592 1FDB 2A5C 8D2D C2FF 5C5B 6AB8 F695"            /* 5’.Û*\�-Âÿ\[j¸ö• */
+	$"F279 2C54 0529 555A 6ACA 22A4 C28B D693"            /* òy,T.)UZjÊ"¤Â‹Ö“ */
+	$"1FC9 4492 43F3 A323 F990 0A31 9356 30D3"            /* .ÉD’Có£#ù�Â1“V0Ó */
+	$"D6F0 0D36 0091 043F F239 9D1E 114E 3693"            /* Öð.6.‘.?ò9�..N6“ */
+	$"DF1C 23DF A27A 5B11 A44D 9199 07D1 AF2C"            /* ß.#ߢz[.¤M‘™.ѯ, */
+	$"63EB 21C5 D29F 8644 8C6A 129A 9CB9 ED72"            /* cë!ÅÒŸ†DŒj.šœ¹ír */
+	$"9286 3E0E B604 539A F262 B727 9284 01F9"            /* ’†>.¶.Sšòb·'’„.ù */
+	$"5AE1 DA5A 8A02 140E 5275 5433 BCDF 8038"            /* ZáÚZŠ...RuT3¼ß€8 */
+	$"0050 856F A747 857B 8376 255A 9185 28CC"            /* .P…o§G…{ƒv%Z‘…(Ì */
+	$"301A EC7C B5D3 89CC A695 1C87 8266 7CA8"            /* 0.ì|µÓ‰Ì¦•.‡‚f|¨ */
+	$"A203 7467 426E 9507 3DB3 1F90 F66B DC9F"            /* ¢.tgBn•.=³.�ökÜŸ */
+	$"ACF6 CDB2 4FCC 5AE4 2F94 F555 CB9E D8AC"            /* ¬öͲOÌZä/”õU˞ج */
+	$"950B FF38 0FE4 5056 E5E8 F371 9A98 5697"            /* •.ÿ8.äPVåèóqš˜V— */
+	$"6319 5197 B545 E594 AADD B2F2 CA27 260D"            /* c.Q—µE唪ݲòÊ'&. */
+	$"9BAF 0E45 0846 5573 F96B 7AC1 CC89 E86E"            /* ›¯.E.FUsùkzÁ̉èn */
+	$"61E6 72E2 05E3 9F8D 26D8 F178 BCC0 0B18"            /* aærâ.ãŸ�&Øñx¼À.. */
+	$"967C EA80 F7C1 45AE 8FAE A41C 41B6 438E"            /* –|ê€÷ÁE®�®¤.A¶CŽ */
+	$"46EF 1094 D558 01A8 BBAD 7380 DA27 2772"            /* Fï.”ÕX.¨»­s€Ú''r */
+	$"9D67 1330 A48C 62EA 0643 14EC 3E22 A055"            /* �g.0¤Œbê.C.ì>" U */
+	$"4E39 4E23 853D C587 99C8 CFD2 AEBB 9843"            /* N9N#…=Ň™ÈÏÒ®»˜C */
+	$"ECC9 0241 3253 8CF1 E068 1936 3BB2 56D3"            /* ìÉ.A2SŒñàh.6;²VÓ */
+	$"46F7 6A71 98D1 A300 1337 B3B0 7ABB 5752"            /* F÷jq˜Ñ£..7³°z»WR */
+	$"DB7A 7F85 5CFE 59DE A852 6987 DC11 C6B5"            /* Ûz.…\þYÞ¨Ri‡Ü.Ƶ */
+	$"E45B 7DD1 1F3A D566 C16D 3FBF 7BAD 7201"            /* ä[}Ñ.:ÕfÁm?¿{­r. */
+	$"B71C C74C A678 C2BB 10FD 534A 5E5D 79C0"            /* ·.ÇL¦x».ýSJ^]yÀ */
+	$"000C 2336 9113 B9C5 5D4A 1756 1C8B 0CD6"            /* ..#6‘.¹Å]J.V.‹.Ö */
+	$"AA8B DFF5 6CE3 CDAB B9B4 D85C 93FF 76AA"            /* ª‹ßõlãÍ«¹´Ø\“ÿvª */
+	$"15CF CF39 A864 B236 A172 03A1 65A1 9F76"            /* .ÏÏ9¨d²6¡r.¡e¡Ÿv */
+	$"FF55 00DE C7D0 C767 2787 9EB3 7CE5 C5BC"            /* ÿU.ÞÇÐÇg'‡ž³|åż */
+	$"8E08 6085 37A2 229C 73D3 2CC5 F6E8 AA1B"            /* Ž.`…7¢"œsÓ,Åöèª. */
+	$"AF13 15FD EB95 2609 6006 23C6 7910 8FFE"            /* ¯..ýë•&Æ`.#Æy.�þ */
+	$"8C5E 60A6 A558 E899 0A05 0F37 EC94 8E51"            /* Œ^`¦¥Xè™Â..7씎Q */
+	$"7838 9A11 8483 88B0 E284 B88D CDEA 9D56"            /* x8š.„ƒˆ°â„¸�Íê�V */
+	$"5C7E CFA2 8001 847E ABC9 360E 17EA 2D34"            /* \~Ï¢€.„~«É6..ê-4 */
+	$"8314 96C0 3810 D88F A54E 6E7C 6030 76FA"            /* ƒ.–À8.Ø�¥Nn|`0vú */
+	$"18A4 A549 37FC 11F6 E77F A883 C794 71AC"            /* .¤¥I7ü.öç.¨ƒÇ”q¬ */
+	$"55F1 7F88 664A FEE4 01C4 5576 1BE6 9C41"            /* Uñ.ˆfJþä.ÄUv.æœA */
+	$"D800 6121 2FC0 E681 A16E 21AF D5FE 0E80"            /* Ø.a!/Àæ�¡n!¯Õþ.€ */
+	$"A800 0000 3090 8C40 9184 82DA 7187 51C6"            /* ¨...0�Œ@‘„‚Úq‡QÆ */
+	$"44DC C420 FF13 98AD D100 2C07 132C 8D6C"            /* DÜÄ ÿ.˜­Ñ.,..,�l */
+	$"5D16 A089 D8F6 E77F A870 24F1 5461 DB69"            /* ]. ‰Øöç.¨p$ñTaÛi */
+	$"0F41 5029 7A41 B55F 0000 0184 846A 850C"            /* .AP)zAµ_...„„j…. */
+	$"241E E628 EDA6 4000 3090 6AA2 F6E7 7FA6"            /* $.æ(í¦@.0�j¢öç.¦ */
+	$"26C9 5EDE 9BB6 A1B1 51E6 8D5D F800 0061"            /* &É^Þ›¶¡±Qæ�]ø..a */
+	$"19B3 E47D 6F6F DB03 0885 4A53 27BA 38F5"            /* .³ä}ooÛ..…JS'º8õ */
+	$"35A0 1AB9 0A95 8FAE 85E3 F528 5A8B E645"            /* 5 .¹Â•�®…ãõ(Z‹æE */
+	$"8419 0456 6A38 D0DA 4948 8987 2323 1216"            /* „..Vj8ÐÚIH‰‡##.. */
+	$"A4F8 FD1A C374 D30C BF43 CD86 B984 F23C"            /* ¤øý.ÃtÓ.¿C͆¹„ò< */
+	$"5487 B47F E217 F15A D8CF A66A 96A9 EAF3"            /* T‡´.â.ñZØϦj–©êó */
+	$"F966 0205 D320 1556 5C3C 073A 8E66 1E3F"            /* ùf..Ó .V\<.:Žf.? */
+	$"A74E FF2C BC45 E9DB 3B25 FF7F 46AD 13A9"            /* §Nÿ,¼EéÛ;%ÿ.F­.© */
+	$"5C21 458B 6AD4 829C 1DFB 54BA E5F2 3C76"            /* \!E‹jÔ‚œ.ûTºåò<v */
+	$"3898 11F6 D710 7470 00FC 0742 CA59 9E40"            /* 8˜.ö×.tp.ü.BÊYž@ */
+	$"757C 5952 61FF 4D28 0991 1673 9B01 06B9"            /* u|YRaÿM(Æ‘.s›..¹ */
+	$"3999 E9B5 06CD B1DA CB08 FF19 DE70 8D10"            /* 9™éµ.ͱÚË.ÿ.Þp�. */
+	$"E725 848E D27D 2B0B 54F0 B60B 26AB CD92"            /* ç%„ŽÒ}+.Tð¶.&«Í’ */
+	$"E4F8 C007 FF68 6933 E2FF 31D5 435B FF7F"            /* äøÀ.ÿhi3âÿ1ÕC[ÿ. */
+	$"9A8E 9845 007F FEDA 4C63 9892 513A ABD9"            /* šŽ˜E..þÚLc˜’Q:«Ù */
+	$"A98A C012 5C99 31C0 D48F E334 671D A695"            /* ©ŠÀ.\™1ÀÔ�ã4g.¦• */
+	$"C7EF 3AAA FF37 D381 4F42 983F FC4D AE82"            /* Çï:ªÿ7Ó�OB˜?üM®‚ */
+	$"FF43 6555 9E7F 10A3 7B95 415D 41FF 20B3"            /* ÿCeUž..£{•A]Aÿ ³ */
+	$"8CB1 7302 0000 0000 584E AB14 398C A865"            /* Œ±s.....XN«.9Œ¨e */
+	$"5A7B 1650 52EB 8BCE 3E92 461D 071B 8F21"            /* Z{.PRë‹Î>’F...�! */
+	$"2CFF 4F5F FD2E 999E B77D A47D 61B4 2C01"            /* ,ÿO_ý.™ž·}¤}a´,. */
+	$"D397 493D CB48 AB27 EB4A 13A7 8C89 7F64"            /* Ó—I=ËH«'ëJ.§Œ‰.d */
+	$"6C08 FF21 9696 98C7 6248 1615 541F EC81"            /* l.ÿ!––˜ÇbH..T.ì� */
+	$"8E18 FAED 5257 3D01 2CBB 74C1 DA64 81A0"            /* Ž.úíRW=.,»tÁÚd�  */
+	$"39BF B272 4068 15E8 A44A 007C 732C D9DC"            /* 9¿²r@h.è¤J.|s,ÙÜ */
+	$"1CF8 4612 8611 A36D 67BC 6E6A EA14 9D87"            /* .øF.†.£mg¼njê.�‡ */
+	$"2962 C4B4 5442 9564 BFAA D0FB 991F 4288"            /* )bÄ´TB•d¿ªÐû™.Bˆ */
+	$"7CB2 2A41 333E 7827 5070 F3A6 67FF 7FFF"            /* |²*A3>x'Ppó¦gÿ.ÿ */
+	$"7601 CFFE E44B 4413 809B 3877 B59D BC19"            /* v.ÏþäKD.€›8wµ�¼. */
+	$"548F 0A5B C1E9 A8D7 6B5D 8EC8 8A1A BB3D"            /* T�Â[Áé¨×k]ŽÈŠ.»= */
+	$"3CD1 3139 57CF 9E94 00E9 CF6E 3830 3561"            /* <Ñ19WÏž”.éÏn805a */
+	$"8DE4 A59F FD1B 45CF C608 D0FD 5D48 485E"            /* �䥟ý.EÏÆ.Ðý]HH^ */
+	$"D5A3 30A5 F9EE 5D55 B9C2 E552 3A9F B087"            /* Õ£0¥ùî]U¹ÂåR:Ÿ°‡ */
+	$"FE87 5DBC 5E73 0F16 9221 2B0D F399 AB6F"            /* þ‡]¼^s..’!+.ó™«o */
+	$"9950 0000 0000 0000 0008 2444 88CE 3BBD"            /* ™P........$DˆÎ;½ */
+	$"CC78 4932 9C47 DEFA 74E7 91BF 9827 FF7B"            /* ÌxI2œGÞútç‘¿˜'ÿ{ */
+	$"77EB 9B1B 9F7F FDAB 6552 35A1 0C22 E9C6"            /* wë›.Ÿ.ý«eR5¡."éÆ */
+	$"42E3 FF7F FF7F E9FD A23B 2F7D 3ADD FC90"            /* Bãÿ.ÿ.éý¢;/}:Ýü� */
+	$"E4A1 F8B9 0560 0F86 D7FE 3F46 C953 2A03"            /* ä¡ø¹.`.†×þ?FÉS*. */
+	$"F1C7 F5AE D0C4 B743 EA67 B694 E47D 45CD"            /* ñÇõ®ÐÄ·Cêg¶”ä}EÍ */
+	$"6F92 178A E383 8B71 800E D9AF A55A F149"            /* o’.Šãƒ‹q€.Ù¯¥ZñI */
+	$"A838 5671 4C9A 8915 447A CDA9 C6B7 DD68"            /* ¨8VqLš‰.DzÍ©Æ·Ýh */
+	$"A5FB F404 CF63 A62E CC5E 89D3 FDB2 C841"            /* ¥ûô.Ïc¦.Ì^‰Óý²ÈA */
+	$"7A37 5B5D 5958 4B46 20B1 D389 5188 F9FE"            /* z7[]YXKF ±Ó‰Qˆùþ */
+	$"8FF1 D718 6C8C 3254 0000 0000 0000 0000"            /* �ñ×.lŒ2T........ */
+	$"0000 00A1 EBEC C33A 8622 D0FF 7FFF 7FFF"            /* ...¡ëìÃ:†"Ðÿ.ÿ.ÿ */
+	$"705D C7FE 49E7 01B7 A65D D5BC 2041 80B0"            /* p]ÇþIç.·¦]Õ¼ A€° */
+	$"89ED F68A A000 F438 EBD0 C908 0B67 414F"            /* ‰íöŠ .ô8ëÐÉ..gAO */
+	$"C8F1 4312 2EC8 05E6 CA19 184F FF5B BA24"            /* ÈñC..È.æÊ..Oÿ[º$ */
+	$"57E8 A6B4 FBD3 FF79 4D8E FF44 BC50 6938"            /* W覴ûÓÿyMŽÿD¼Pi8 */
+	$"137F FF7D 6251 8D1A 9B33 CF7E 0BCB EAD7"            /* ..ÿ}bQ�.›3Ï~.Ëê× */
+	$"2E0D EAE0 0003 0906 AA2B 66A8 C950 0000"            /* ..êà..Æ.ª+f¨ÉP.. */
+	$"0000 0000 0000 0000 0001 1E1F F600 1848"            /* ............ö..H */
+	$"4BF6 7A7C F92D 3E7A 437E 2254 51EB 4AF5"            /* Köz|ù->zC~"TQëJõ */
+	$"C6BF 442A 12CD 51FF 7FFE B8AE D0C4 B1D0"            /* Æ¿D*.ÍQÿ.þ¸®ÐıР*/
+	$"7CF7 019D A0ED 2CC4 01BC 1A94 212D 43EF"            /* |÷.� í,Ä.¼.”!-Cï */
+	$"1274 9B67 94D5 062D 5FCC E23C 4816 416B"            /* .t›g”Õ.-_Ìâ<H.Ak */
+	$"1540 59C2 1D35 213D A11C EE70 8D15 5394"            /* .@YÂ.5!=¡.îp�.S” */
+	$"53C6 29CF 4E19 F4CF 5B94 7FFF 7F8B 2813"            /* SÆ)ÏN.ôÏ[”.ÿ.‹(. */
+	$"3E95 DE81 30D0 3188 2A75 4F35 CB11 DDD5"            /* >•Þ�0Ð1ˆ*uO5Ë.ÝÕ */
+	$"7FFD A983 95A9 71E7 A7A3 7D3F F944 0A7E"            /* .ý©ƒ•©q秣}?ùDÂ~ */
+	$"24D9 966F 6B6A 0FD0 23AC 7000 0000 0000"            /* $Ù–okj.Ð#¬p..... */
+	$"0009 D4AF 9196 E5A4 B8AC 407F F9EE C709"            /* .ÆÔ¯‘–夸¬@.ùîÇÆ */
+	$"F927 08C3 CA6C 3A3A D90F E306 BCC4 6D6C"            /* ù'.ÃÊl::Ù.ã.¼Äml */
+	$"C7A9 F042 6F4C FDC9 60AB A087 6338 8F12"            /* Ç©ðBoLýÉ`« ‡c8�. */
+	$"4D29 D00C C575 C7B5 9FA4 E96C 1FA0 AAFB"            /* M)Ð.ÅuǵŸ¤él. ªû */
+	$"09E9 8DF9 1BE0 C62D 3C1D F55B DD77 A0FD"            /* Æé�ù.àÆ-<.õ[Ýw ý */
+	$"5C16 D959 BA08 0000 0000 0000 0145 AE01"            /* \.ÙYº........E®. */
+	$"712A 0E06 1212 70CD 94A8 0A2C 18F5 1E3B"            /* q*....pÍ”¨Â,.õ.; */
+	$"52FA C8F6 56F3 F7E4 69E6 54A0 3FF6 2487"            /* RúÈöVó÷äiæT ?ö$‡ */
+	$"C65F 0EFF 7F4F 8D07 C817 FE78 727D 3C75"            /* Æ_.ÿ.O�.È.þxr}<u */
+	$"E4C6 1003 FECF 3E7E 6252 08C0 4A83 50D7"            /* äÆ..þÏ>~bR.ÀJƒP× */
+	$"DADA 8602 5949 900F D2B6 D10D 2661 3014"            /* ÚÚ†.YI�.Ò¶Ñ.&a0. */
+	$"4541 17FF 2106 00DF AC82 0046 09BB A5AF"            /* EA.ÿ!..߬‚.FÆ»¥¯ */
+	$"CE51 0EBF F9AD 787A 907F 9F9A 628F E16B"            /* ÎQ.¿ù­xz�.Ÿšb�ák */
+	$"C015 137E 9C68 FCFA A817 FF7F DD6B FDB6"            /* À..~œhüú¨.ÿ.Ýký¶ */
+	$"3DA3 7C9D 3309 0B8A B551 C370 4401 CD7F"            /* =£|�3Æ.ŠµQÃpD.Í. */
+	$"7503 8425 E297 1B3F FF49 4FF8 3583 685A"            /* u.„%â—.?ÿIOø5ƒhZ */
+	$"B273 A7F7 CEBF F27E D78C 3E35 5332 152B"            /* ²s§÷οò~׌>5S2.+ */
+	$"033C C7FF 7B97 1AF0 F2A4 3C88 CC7B B96E"            /* .<Çÿ{—.ðò¤<ˆÌ{¹n */
+	$"65B3 533C F2F8 5E4B 6DBF 7D78 A316 310F"            /* e³S<òø^Km¿}x£.1. */
+	$"6B09 FD62 88D7 77FF 7447 524E C235 00A3"            /* kÆýbˆ×wÿtGRNÂ5.£ */
+	$"8F5A 4BEE D240 6154 C17C 2CC2 68F0 A959"            /* �ZKîÒ@aTÁ|,Âhð©Y */
+	$"2F12 9B74 7E8E 423F BB1D BC9A C75B C618"            /* /.›t~ŽB?».¼šÇ[Æ. */
+	$"19D1 C6CB 0A15 BD77 99BD 96D3 CC07 F5AC"            /* .ÑÆËÂ.½w™½–ÓÌ.õ¬ */
+	$"D2ED DE5E F19D 5CFC B2B0 5407 0386 32C6"            /* ÒíÞ^ñ�\ü²°T..†2Æ */
+	$"5F49 7BAD 3270 BF81 CF97 C934 7E23 7237"            /* _I{­2p¿�Ï—É4~#r7 */
+	$"727B 0FA2 6DB0 D717 8C73 B109 E089 AAC5"            /* r{.¢m°×.Œs±Æà‰ªÅ */
+	$"7D98 9061 2956 EA75 0135 E870 3430 4E9B"            /* }˜�a)Vêu.5èp40N› */
+	$"C76C D3D6 7EEB 83DB 9EEB C9A0 983D 1327"            /* ÇlÓÖ~ëƒÛžëÉ ˜=.' */
+	$"62D8 FD62 CA51 7135 80B0 ABFF 431B 9843"            /* bØýbÊQq5€°«ÿC.˜C */
+	$"68B4 A929 44E4 1F3E E3A1 22AA 5E87 579C"            /* h´©)Dä.>ã¡"ª^‡Wœ */
+	$"745B 9CA4 438C BFC2 9A1B 17BE BA75 06E4"            /* t[œ¤CŒ¿Âš..¾ºu.ä */
+	$"0108 698C E4F2 341C 24CC 7913 6237 ED48"            /* ..iŒäò4.$Ìy.b7íH */
+	$"E797 4D7A 0D5A D1EA ACDF F974 4F9F 9139"            /* ç—Mz.ZÑê¬ßùtOŸ‘9 */
+	$"6A87 3972 A1C8 0A2B 1E8B 6DB7 B811 4AB0"            /* j‡9r¡ÈÂ+.‹m·¸.J° */
+	$"EEE8 BB23 959C 239D 4165 DBED ACE4 F133"            /* îè»#•œ#�AeÛí¬äñ3 */
+	$"8276 40BB C447 29FE 3EB6 5BA4 A6D0 2441"            /* ‚v@»ÄG)þ>¶[¤¦Ð$A */
+	$"1431 8B2D 8BFD 96B7 C8C2 9F9B DFB9 2B06"            /* .1‹-‹ý–·ÈŸ›ß¹+. */
+	$"E191 00FF 7E4B 8281 D609 D163 B8CB AF9A"            /* á‘.ÿ~K‚�ÖÆÑc¸Ë¯š */
+	$"0995 7385 27FC 3C6A 5310 024D BAD1 8013"            /* Æ•s…'ü<jS..MºÑ€. */
+	$"8995 3DF4 FA80 FE12 8F5F 40E5 09E6 E7E8"            /* ‰•=ôú€þ.�_@åÆæçè */
+	$"C5E7 1309 3E97 E278 0228 1693 F565 F83E"            /* Åç.Æ>—âx.(.“õeø> */
+	$"4161 0037 E0AA D0CC 3AED 4E56 04E8 4456"            /* Aa.7àªÐÌ:íNV.èDV */
+	$"6E50 4626 C7E0 0790 014E 329B 0DDB D87D"            /* nPF&Çà.�.N2›.ÛØ} */
+	$"4532 6482 3F51 D651 3F62 D6EB 3BCA 75EB"            /* E2d‚?QÖQ?bÖë;Êuë */
+	$"5444 A42F 3CFB 4146 19FB 5376 876F 6BC1"            /* TD¤/<ûAF.ûSv‡okÁ */
+	$"B80B 7787 71DF 4CAA D70A 98BC 98E1 15A1"            /* ¸.w‡qßLª×˜¼˜á.¡ */
+	$"7996 F17F FF7A 91CF 350C FA04 5753 7ECB"            /* y–ñ.ÿz‘Ï5.ú.WS~Ë */
+	$"29F1 A4AD F335 59DB A580 EAA3 98AD FEB0"            /* )ñ¤­ó5YÛ¥€ê£˜­þ° */
+	$"275E BABE 6679 9AD4 B246 75F2 ECAA B042"            /* '^º¾fyšÔ²Fuò쪰B */
+	$"92C9 745E 1C58 58FF 2570 9228 4EAF 6F65"            /* ’Ét^.XXÿ%p’(N¯oe */
+	$"56F3 1D0C 85AA 9468 8000 0000 0101 3082"            /* Vó..…ª”h€.....0‚ */
+	$"08FD E30F FF75 70BF FCCA 2225 E5FC 3464"            /* .ýã.ÿup¿üÊ"%åü4d */
+	$"00CA 6C43 E833 80DE 2895 5F84 4B08 CEFA"            /* .ÊlCè3€Þ(•_„K.Îú */
+	$"AA94 EE33 24E7 CA20 A668 4717 FD5F F7F2"            /* ª”î3$çÊ ¦hG.ý_÷ò */
+	$"59E7 D6C6 6D0D 8E0F 1AC3 BBFA 3890 8ACB"            /* YçÖÆm.Ž..ûú8�ŠË */
+	$"9250 6D82 E892 D4B9 1F14 D987 9818 877A"            /* ’Pm‚è’Ô¹..Ù‡˜.‡z */
+	$"66F0 905A B088 D761 B529 F02A 6964 6C65"            /* fð�Z°ˆ×aµ)ð*idle */
+	$"8FB8 9A87 7771 9A12 C8A6 7F9C 9905 D643"            /* �¸š‡wqš.Ȧ.œ™.ÖC */
+	$"E554 91F5 0C26 4299 30C6 BC87 B38C 86FB"            /* åT‘õ.&B™0Ƽ‡³Œ†û */
+	$"ED50 C019 3822 52A8 97C6 1F49 176D FB8C"            /* íPÀ.8"R¨—Æ.I.mûŒ */
+	$"87B7 E37C 196E 3695 357A E2B8 FDE5 736E"            /* ‡·ã|.n6•5zâ¸ýåsn */
+	$"DF11 6026 3CD9 51CF 2A50 6F8A 53B0 0F16"            /* ß.`&<ÙQÏ*PoŠS°.. */
+	$"938B 745A F84D 571C A582 9723 90B4 49D7"            /* “‹tZøMW.¥‚—#�´I× */
+	$"B11D 7BA6 45C1 2AFA D519 A471 60A3 17A9"            /* ±.{¦EÁ*úÕ.¤q`£.© */
+	$"2C13 6E04 D58E 3F37 0115 E4AE F51C 1BA8"            /* ,.n.ÕŽ?7..ä®õ..¨ */
+	$"EF7F 4C9F 7B47 8C5A D1D6 CAC7 D416 D6D4"            /* ï.LŸ{GŒZÑÖÊÇÔ.ÖÔ */
+	$"7F05 9504 5685 0D6D E0E8 6809 9307 7864"            /* ..•.V….màèhÆ“.xd */
+	$"1A86 1BA6 A321 D08C 1B0C 0981 9395 6DC0"            /* .†.¦£!ÐŒ..Æ�“•mÀ */
+	$"C74F ECF7 CA1B FF4B 1896 BDBE 4876 8A4B"            /* ÇOì÷Ê.ÿK.–½¾HvŠK */
+	$"519F CC3C 7813 BE21 C40C B001 30F4 4FC7"            /* QŸÌ<x.¾!Ä.°.0ôOÇ */
+	$"B76C B9FA 26F6 38C8 116D B8F0 0B9D 818F"            /* ·l¹ú&ö8È.m¸ð.��� */
+	$"56F9 F934 AE60 71FD E583 8D07 A4A4 DE41"            /* Vùù4®`qýåƒ�.¤¤ÞA */
+	$"FB75 B83F 384B 11C9 CC5E CD9D FF4C 05A8"            /* ûu¸?8K.ÉÌ^Í�ÿL.¨ */
+	$"D59F 1E59 4797 FF7F DFD8 391C E8BA 72E2"            /* ÕŸ.YG—ÿ.ßØ9.èºrâ */
+	$"C1F8 9F5C 5317 01E3 EC2D 4120 97D2 BAEC"            /* ÁøŸ\S..ãì-A —Òºì */
+	$"DBB0 FF30 FC56 2E43 3716 1B7B A8CD 19AE"            /* Û°ÿ0üV.C7..{¨Í.® */
+	$"7FFF 7FF4 468B FF45 749B 3C67 EE31 1651"            /* .ÿ.ôF‹ÿEt›<gî1.Q */
+	$"17B2 B21C A982 A185 E8A3 03BC 2DCB C09A"            /* .²².©‚¡…è£.¼-ËÀš */
+	$"8522 64CF BB21 6955 068D F002 871B 05F3"            /* …"dÏ»!iU.�ð.‡..ó */
+	$"9F44 7384 D624 E1FA A24D 67C7 BC5E F7BF"            /* ŸDs„Ö$áú¢MgǼ^÷¿ */
+	$"59BC DC3C BE4B 1456 0C6F F2C1 0841 038D"            /* Y¼Ü<¾K.V.oòÁ.A.� */
+	$"723C 14FA 4F19 0AD4 1F88 0A1B FF14 3D93"            /* r<.úO.ÂÔ.ˆÂ.ÿ.=“ */
+	$"27AA 6E0B 4AA7 6A11 E06D 5D82 C930 1B53"            /* 'ªn.J§j.àm]‚É0.S */
+	$"0227 A9AA 253A 41E6 31D5 8B87 DC08 819B"            /* .'©ª%:Aæ1Õ‹‡Ü.�› */
+	$"E5EE EA0F 6AA0 0000 0006 9BC0 594E 0004"            /* åîê.j ....›ÀYN.. */
+	$"D326 312C 0364 8835 C4D7 5040 3724 3CD9"            /* Ó&1,.dˆ5Ä×P@7$<Ù */
+	$"B889 2E14 12BC F0AD 9D2E 326B 1654 5952"            /* ¸‰...¼ð­�.2k.TYR */
+	$"2B5F 1A9D 5403 C9C5 A731 1B3C 3443 783C"            /* +_.�T.Éŧ1.<4Cx< */
+	$"A459 248B BBC7 DEDC 74AD E2A1 D647 5047"            /* ¤Y$‹»ÇÞÜt­â¡ÖGPG */
+	$"AD17 15AF FF5C 88C4 025F 4361 3F83 BFC9"            /* ­..¯ÿ\ˆÄ._Ca?ƒ¿É */
+	$"FF6D 7E58 128D 33D7 7076 E73A 9CF6 76D8"            /* ÿm~X.�3×pvç:œövØ */
+	$"A0FF 2C44 2029 0B59 B427 3BDC 915B 87CF"            /*  ÿ,D ).Y´';Ü‘[‡Ï */
+	$"75D6 EC52 7793 6DFA A4E2 9E2D 7D25 FBC2"            /* uÖìRw“mú¤âž-}%û */
+	$"2028 DE78 D868 BEC5 E9D2 BFFA 8B12 9265"            /*  (ÞxØh¾ÅéÒ¿ú‹.’e */
+	$"B01D 92F7 F71E 8782 F1CD 4E98 B46E 6DA5"            /* °.’÷÷.‡‚ñÍN˜´nm¥ */
+	$"8825 F851 1CE9 9F21 D8E2 86EB BAF4 126F"            /* ˆ%øQ.éŸ!Øâ†ëºô.o */
+	$"9CB3 0144 009A 6F38 0919 9C1F D0CE D23C"            /* œ³.D.šo8Æ.œ.ÐÎÒ< */
+	$"C9DD 9273 D8F6 6733 6E5A 2E7A 635C 8723"            /* ÉÝ’sØög3nZ.zc\‡# */
+	$"6E04 1283 1A43 02CA 74E4 8000 0309 08DB"            /* n..ƒ.C.Êtä€..Æ.Û */
+	$"EF05 DC00 D116 0D58 1A69 2055 1BA0 D8DE"            /* ï.Ü.Ñ..X.i U. ØÞ */
+	$"34B6 EA40 CC06 C673 559A 75F2 9B58 C474"            /* 4¶ê@Ì.ÆsUšuò›XÄt */
+	$"DD4C AB9A 9E6D 653B FCDF 4F33 3707 105E"            /* ÝL«šžme;üßO37..^ */
+	$"DBCE D327 45FB C663 E1AF 375B B106 B0B8"            /* ÛÎÓ'EûÆcá¯7[±.°¸ */
+	$"26EE AE4B 538A CF74 588E 928B 58C7 2D93"            /* &î®KSŠÏtXŽ’‹XÇ-“ */
+	$"371E BC81 0ED0 9F2C 1A18 8DD7 7E65 4FBF"            /* 7.¼�.П,..�×~eO¿ */
+	$"511B 63A1 8F26 2A08 A4D3 2BF3 96E6 FC32"            /* Q.c¡�&*.¤Ó+ó–æü2 */
+	$"D457 8287 D843 6D19 2458 0EA4 AC8F 0512"            /* ÔW‚‡ØCm.$X.¤¬�.. */
+	$"831D D4CA 9BFF 5A6E 951A 5897 451F 750C"            /* ƒ.ÔÊ›ÿZn•.X—E.u. */
+	$"CAD4 89C1 94A7 4BFA 4030 4828 1E37 C049"            /* ÊÔ‰Á”§Kú@0H(.7ÀI */
+	$"34C4 54B1 1054 2645 14E5 6DFF 7FFF 7328"            /* 4ÄT±.T&E.åmÿ.ÿs( */
+	$"F1A4 AAA2 4FD2 507D 86D5 FF7F FA43 F49A"            /* ñ¤ª¢OÒP}†Õÿ.úCôš */
+	$"5049 0839 5964 8186 EE46 1867 158E 9E2C"            /* PI.9Yd�†îF.g.Žž, */
+	$"D618 8FF5 D416 6838 6187 9CF7 21BC DE1F"            /* Ö.�õÔ.h8a‡œ÷!¼Þ. */
+	$"F84F F4E9 ACDB ECD8 6CA6 6725 85B4 4049"            /* øOôé¬ÛìØl¦g%…´@I */
+	$"AA9E 4935 7E1F 54E7 B0D5 A026 B073 899B"            /* ªžI5~.Tç°Õ &°s‰› */
+	$"51C4 8C2E 483C B3BF 38A0 4BCF 2042 EE90"            /* QÄŒ.H<³¿8 KÏ Bî� */
+	$"4E1B 8C94 420F 99A7 9EA1 7D96 12A3 8C8D"            /* N.Œ”B.™§ž¡}–.£Œ� */
+	$"819B C97D C518 51CB 0D8A A7A1 7159 EB10"            /* �›É}Å.QË.Š§¡qYë. */
+	$"4A27 5CD0 0ED7 2688 5F74 CE10 DF6A 5B4F"            /* J'\Ð.×&ˆ_tÎ.ßj[O */
+	$"E370 A282 105D 2F43 6E74 6B07 05EC 880E"            /* ãp¢‚.]/Cntk..ìˆ. */
+	$"15AF 5118 9D27 327D 2552 9996 020B 2D9A"            /* .¯Q.�'2}%R™–..-š */
+	$"9AFC 6849 6068 6491 42FA 889C 7949 285A"            /* šühI`hd‘BúˆœyI(Z */
+	$"7FFE 5B6D DAF2 7FFF 772D E08E B9E4 65A3"            /* .þ[mÚò.ÿw-àŽ¹äe£ */
+	$"B49A DDC8 FF52 8DA3 B318 F84F F4E9 99ED"            /* ´šÝÈÿR�£³.øOôé™í */
+	$"48C4 CA7E BE77 2634 6A22 1FAD 4752 8D9B"            /* HÄÊ~¾w&4j".­GR�› */
+	$"B935 0449 1A27 9EAB B000 C242 3BB7 72B7"            /* ¹5.I.'ž«°.ÂB;·r· */
+	$"3ACC B41F 0AC9 CFFD 58DA D99F 498A 21CF"            /* :Ì´.ÂÉÏýXÚÙŸIŠ!Ï */
+	$"50B8 A155 9BB3 B3DA 13FE 251F 14F2 3431"            /* P¸¡U›³³Ú.þ%..ò41 */
+	$"6DBF 2774 3EFC 55BB 9CB3 40A4 CA00 A112"            /* m¿'t>üU»œ³@¤Ê.¡. */
+	$"3E83 51D4 9D13 DE0D F86D 3384 AAE7 9074"            /* >ƒQÔ�.Þ.øm3„ªç�t */
+	$"F7CF 4509 F99A 70B2 2E74 43C3 1363 021F"            /* ÷ÏEÆùšp².tCÃ.c.. */
+	$"6482 E471 22FA 6265 2DF9 C302 43F8 9053"            /* d‚äq"úbe-ùÃ.Cø�S */
+	$"0AE9 15A2 28D4 FD7C 05AF C7B8 26D5 7C0F"            /* Âé.¢(Ôý|.¯Ç¸&Õ|. */
+	$"22E0 4735 518D BE4B 4E83 1EF8 3FFA BA23"            /* "àG5Q�¾KNƒ.ø?úº# */
+	$"3AE8 F76B 1D92 2038 64C1 EA73 30FC CE72"            /* :è÷k.’ 8dÁês0üÎr */
+	$"0CA5 6697 157E 55C4 8BAE E703 6FF5 F743"            /* .¥f—.~UÄ‹®ç.oõ÷C */
+	$"B456 C85F 3BFF 2629 95B7 02F4 F580 A49B"            /* ´VÈ_;ÿ&)•·.ôõ€¤› */
+	$"1587 2316 D131 66C1 C6DB F3DC C409 D801"            /* .‡#.Ñ1fÁÆÛóÜÄÆØ. */
+	$"E2DA 30B6 73FD 99EF AA26 25D7 DF07 FBEB"            /* âÚ0¶sý™ïª&%×ß.ûë */
+	$"094E 2E8E BD11 3C49 81BA E6BE 7666 ECBE"            /* ÆN.Ž½.<I�ºæ¾vfì¾ */
+	$"59D2 4ACC B4CE 3FAD 2173 25CB E42F 37B8"            /* YÒJÌ´Î?­!s%Ëä/7¸ */
+	$"F3CC 79EF 695C 10F4 0381 2D14 1B0F D632"            /* óÌyïi\.ô.�-...Ö2 */
+	$"8A1E 9C29 F617 6A4B 204E A147 C08D 1AA5"            /* Š.œ)ö.jK N¡GÀ�.¥ */
+	$"7418 DED9 DE83 A555 A75B AB00 C650 247F"            /* t.ÞÙÞƒ¥U§[«.ÆP$. */
+	$"0222 5558 731B 54DB 14F6 3A0E 1FAD A8D8"            /* ."UXs.TÛ.ö:..­¨Ø */
+	$"F327 DC8F AF3F 630B 3BA9 7933 8D30 458C"            /* ó'Ü�¯?c.;©y3�0EŒ */
+	$"4C2F 6E3A 0A64 DDC5 926A 71CB 2347 EE4D"            /* L/n:ÂdÝÅ’jqË#GîM */
+	$"647B D94D BE24 7F62 6A14 EBE2 696F 8735"            /* d{ÙM¾$.bj.ëâio‡5 */
+	$"A96F E268 6912 A4A9 3254 0293 CB09 0DC0"            /* ©oâhi.¤©2T.“ËÆ.À */
+	$"206B EB7B F6B9 0643 5E74 4F2C 555A AE2D"            /*  kë{ö¹.C^tO,UZ®- */
+	$"B16B 7FA3 8ADE 7EAC 764F 9A20 BC94 05F1"            /* ±k.£ŠÞ~¬vOš ¼”.ñ */
+	$"9AAC 0118 36B8 6B30 D696 6E84 EEC2 5342"            /* š¬..6¸k0Ö–n„îÂSB */
+	$"03A8 EFD3 CB37 D50D F676 35DB AD6C 280A"            /* .¨ïÓË7Õ.öv5Û­l( */
+	$"DB04 D23A 0922 A2E3 5F45 EBD1 5C49 F6AA"            /* Û.Ò:Æ"¢ã_EëÑ\Iöª */
+	$"4579 1BA2 D94E D3F0 7A7E C24E 79B0 5D24"            /* Ey.¢ÙNÓðz~ÂNy°]$ */
+	$"B98E 23E7 4C4F 54D9 A3CE 389F 63F6 2426"            /* ¹Ž#çLOTÙ£Î8Ÿcö$& */
+	$"7087 D921 86D6 709F 768D 5684 BB90 47B7"            /* p‡Ù!†ÖpŸv�V„»�G· */
+	$"AC32 98D7 E247 3668 E954 8105 EE44 AF58"            /* ¬2˜×âG6héT�.îD¯X */
+	$"13FF 573A 9F89 06C9 FB77 277E 08C9 09E9"            /* .ÿW:Ÿ‰.Éûw'~.ÉÆé */
+	$"B180 F96E C5AB 1E5D 3029 E229 CE1B B2AD"            /* ±€ùnÅ«.]0)â)Î.²­ */
+	$"BA11 DD98 0D9C 4C45 66DD 8553 3BA2 6F5B"            /* º.ݘ.œLEfÝ…S;¢o[ */
+	$"699B CEF3 48A7 6C31 63E6 E189 9C68 B9EC"            /* i›ÎóH§l1cæቜh¹ì */
+	$"A663 411F EBCB 41AB 8F7E 7EAD 87DA 5BF3"            /* ¦cA.ëËA«�~~­‡Ú[ó */
+	$"AAC9 975B AC1F 712B F7ED DEBD 04C3 B85A"            /* ªÉ—[¬.q+÷íÞ½.øZ */
+	$"470D D74A B91D 0180 7BAB 4088 5671 6268"            /* G.×J¹..€{«@ˆVqbh */
+	$"5B4A 54FE C179 1600 7677 830B 0E81 EEB4"            /* [JTþÁy..vwƒ..�î´ */
+	$"056E 79FF 8251 AB20 A6BC 15A5 E71F 7D4A"            /* .nyÿ‚Q« ¦¼.¥ç.}J */
+	$"2F6E 951A DE36 7A81 C704 9A4A F239 E1DC"            /* /n•.Þ6z�Ç.šJò9áÜ */
+	$"FF6C DE49 B4C8 F6C1 F764 8D19 4686 DFC2"            /* ÿlÞI´ÈöÁ÷d�.F†ß */
+	$"5C72 4A52 9784 F974 DCA4 A177 21DA 9869"            /* \rJR—„ùtܤ¡w!Ú˜i */
+	$"80A4 5BC6 FD54 A56B C7B1 4705 3A32 C896"            /* €¤[ÆýT¥kDZG.:2È– */
+	$"4539 25E5 90CC F228 B7F9 ADA5 CC2C 59CA"            /* E9%å�Ìò(·ù­¥Ì,YÊ */
+	$"D14D 4B86 9CC0 D367 7EF5 DB6D C2E1 06DB"            /* ÑMK†œÀÓg~õÛmÂá.Û */
+	$"58BC 0D97 DCFE 3CB1 EA45 C36F 1B60 83C9"            /* X¼.—Üþ<±êEÃo.`ƒÉ */
+	$"663F B883 83BA A69F 2653 0747 18C7 6D20"            /* f?¸ƒƒº¦Ÿ&S.G.Çm  */
+	$"F2C7 6E01 47DA AB9D 2D83 D5CE 1E9C 779A"            /* òÇn.GÚ«�-ƒÕÎ.œwš */
+	$"5FAE 6015 63DE 317A EFCA 7142 F3F8 A7E1"            /* _®`.cÞ1zïÊqBóø§á */
+	$"F739 60AB DF24 41BF EB6C AF15 7223 E56C"            /* ÷9`«ß$A¿ël¯.r#ål */
+	$"8D61 D9D1 C61F 8F8E 8435 6452 C45A 917B"            /* �aÙÑÆ.�Ž„5dRÄZ‘{ */
+	$"0856 B8BA 14E2 0A77 ABA0 E605 2E39 63EA"            /* .V¸º.âÂw« æ..9cê */
+	$"E7F5 4804 6535 7672 575F 37EA 9E69 1A1C"            /* çõH.e5vrW_7êži.. */
+	$"E380 CB7D C109 2D50 73EF 4119 54BE CBFE"            /* ã€Ë}ÁÆ-PsïA.T¾Ëþ */
+	$"4552 74A1 3E73 C457 1436 9DFF 3C25 8231"            /* ERt¡>sÄW.6�ÿ<%‚1 */
+	$"2C25 ACE4 F084 E842 60E8 355D 22BE 6FEE"            /* ,%¬äð„èB`è5]"¾oî */
+	$"93F9 DDE6 DAED 4E44 545A FE4E 5EA4 0487"            /* “ùÝæÚíNDTZþN^¤.‡ */
+	$"36F1 52AF 8683 2DE8 F30B 72DE E807 2068"            /* 6ñR¯†ƒ-èó.rÞè. h */
+	$"742B 7262 BF7E 516C D41F CA56 9DE1 E3B8"            /* t+rb¿~QlÔ.ÊV�á㸠*/
+	$"8D72 2993 C073 516D A343 DDE0 984D F06A"            /* �r)“ÀsQm£CÝà˜Mðj */
+	$"CD83 D22D C161 30D7 2E9A FED4 4E85 5D2E"            /* ̓Ò-Áa0×.šþÔN…]. */
+	$"CF72 2181 7F23 BC37 FF83 C30D 43E0 DBC7"            /* Ïr!�.#¼7ÿƒÃ.CàÛÇ */
+	$"A277 B4D9 4E68 1FB1 AF7B 6D8B 8F43 2A1B"            /* ¢w´ÙNh.±¯{m‹�C*. */
+	$"9FE4 6CCC E826 C4AA 96C9 98A9 4D3B 981F"            /* ŸälÌè&Ī–ɘ©M;˜. */
+	$"8786 8633 89B0 2B42 4266 BC27 0098 D2B3"            /* ‡††3‰°+BBf¼'.˜Ò³ */
+	$"E8E4 0D2C 6E14 D34D 3613 4568 4A1E 8E5E"            /* èä.,n.ÓM6.EhJ.Ž^ */
+	$"E328 D89C 85D3 D8C2 C15B 3533 989F F015"            /* ã(Øœ…ÓØÂÁ[53˜Ÿð. */
+	$"1B49 871D 031B 2DBE D49E 880D A557 0694"            /* .I‡...-¾Ôžˆ.¥W.” */
+	$"60C3 47A1 CD2A 961B F73C 94A3 6B17 4268"            /* `ÃG¡Í*–.÷<”£k.Bh */
+	$"F766 81DC 33BC 8C1D 5571 D2D7 FB1C 9378"            /* ÷f�Ü3¼Œ.UqÒ×û.“x */
+	$"01B7 BDCC 5DD0 9171 5FA1 50DA 7EBF 1586"            /* .·½Ì]Бq_¡PÚ~¿.† */
+	$"FA82 9E6F CBE4 0977 9C9C 2373 E789 5A3E"            /* ú‚žoËäÆwœœ#sç‰Z> */
+	$"8743 EB0E ED13 7955 DB28 2874 8065 2078"            /* ‡Cë.í.yUÛ((t€e x */
+	$"97A7 6C13 2283 729A CCF9 E449 A627 7652"            /* —§l."ƒršÌùäI¦'vR */
+	$"E821 2F1F 574E 6887 1830 6E01 5A8D 02FB"            /* è!/.WNh‡.0n.Z�.û */
+	$"DB61 8EEF 4E08 B607 26FA 2B4C FF47 38FE"            /* ÛaŽïN.¶.&ú+LÿG8þ */
+	$"9B7C A3E4 DB46 F898 CFE9 8F3C 8717 2975"            /* ›|£äÛFø˜Ïé�<‡.)u */
+	$"9BA2 582E 86D1 D882 C127 EFD7 E71A B5DD"            /* ›¢X.†ÑØ‚Á'ï×ç.µÝ */
+	$"7772 6391 2722 2884 AA0F 9C72 9A96 F4F8"            /* wrc‘'"(„ª.œrš–ôø */
+	$"BFF8 869A FD00 3B41 A8C7 DCD0 2834 270C"            /* ¿ø†šý.;A¨ÇÜÐ(4'. */
+	$"B93C 8702 5B16 8A32 0289 979B 0A35 3A7B"            /* ¹<‡.[.Š2.‰—›Â5:{ */
+	$"5870 6189 03C2 DD00 FAB2 B137 AB93 3EF5"            /* Xpa‰.ÂÝ.ú²±7«“>õ */
+	$"24E3 1FE1 A206 963E 1344 FE12 285A 5C52"            /* $ã.á¢.–>.Dþ.(Z\R */
+	$"692E D315 6C73 2CBE 7ADC 81BC EBC8 13EA"            /* i.Ó.ls,¾zÜ�¼ëÈ.ê */
+	$"796B 6056 E9E7 D971 6E09 7086 252C 6A19"            /* yk`VéçÙqnÆp†%,j. */
+	$"7351 153D F4C4 FE01 6235 917F B203 171A"            /* sQ.=ôÄþ.b5‘.²... */
+	$"1822 B42B 9226 D163 5572 7E7E C508 BEBA"            /* ."´+’&ÑcUr~~Å.¾º */
+	$"D0D2 1C24 8D62 565D C183 F78D 4726 0541"            /* ÐÒ.$�bV]Áƒ÷�G&.A */
+	$"F829 10C7 1B21 E59C C4E5 7688 6268 FABC"            /* ø).Ç.!åœÄåvˆbhú¼ */
+	$"C0B9 6C02 8820 3F44 54A7 8C83 F14F 61B8"            /* À¹l.ˆ ?DT§ŒƒñOa¸ */
+	$"707C AB32 9D59 F01E D18A 37FC 40F9 5C59"            /* p|«2�Yð.ÑŠ7ü@ù\Y */
+	$"EEA8 E442 FDC8 CA73 970F 6EE0 1348 AC8E"            /* î¨äBýÈÊs—.nà.H¬Ž */
+	$"9D65 4DA9 2820 AEDB A7F3 C1B4 8E3F 8780"            /* �eM©( ®Û§óÁ´Ž?‡€ */
+	$"8DA9 F7D9 F116 DD30 778E 4FB6 49D3 AFE8"            /* �©÷Ùñ.Ý0wŽO¶IÓ¯è */
+	$"74B1 EB63 92B8 4210 3B22 3613 6784 41A2"            /* t±ëc’¸B.;"6.g„A¢ */
+	$"5953 1EFF 16A9 1769 9852 73D0 B6C2 3523"            /* YS.ÿ.©.i˜RsжÂ5# */
+	$"854B 1247 531D 47C5 7AFC 1B6B F0C4 2E2F"            /* …K.GS.GÅzü.kðÄ./ */
+	$"6C60 82C9 9C4D 2FAD 25A5 BEC6 8590 7388"            /* l`‚ÉœM/­%¥¾Æ…�sˆ */
+	$"5D15 9A65 E013 D48B 7D9C 34B2 A617 75A8"            /* ].šeà.Ô‹}œ4²¦.u¨ */
+	$"8E8E 2D91 1AEC 26D5 8B9C D03C A02A A829"            /* ŽŽ-‘.ì&Õ‹œÐ< *¨) */
+	$"738D 9A4E 8F31 82A9 39B7 7CFE D412 810E"            /* s�šN�1‚©9·|þÔ.�. */
+	$"1372 6D79 8D49 BAC1 9FFB 5D52 56AD 488F"            /* .rmy�IºÁŸû]RV­H� */
+	$"4E1D A232 7348 1FE2 483F AB9F A23C 0997"            /* N.¢2sH.âH?«Ÿ¢<Æ— */
+	$"678D 1AB7 7F66 8927 7DED 2A66 E03B 05C9"            /* g�.·.f‰'}í*fà;.É */
+	$"0420 66A2 E0AE E1B9 259E 64C9 FF0E A7C7"            /* . f¢à®á¹%ždÉÿ.§Ç */
+	$"5E9D 69F4 DD50 394C 344E 9DA9 6BCA 3D9F"            /* ^�iôÝP9L4N�©kÊ=Ÿ */
+	$"8FA9 C156 3248 2310 8AB9 6131 B94F FF36"            /* �©ÁV2H#.Š¹a1¹Oÿ6 */
+	$"DF00 9E80 5713 E9AD 3B07 879E C876 E063"            /* ß.ž€W.é­;.‡žÈvàc */
+	$"38D8 2776 3081 5810 1760 927C D93C EE88"            /* 8Ø'v0�X..`’|Ù<îˆ */
+	$"518B 755A EBF1 B276 C65B 98DD 1421 8AA1"            /* Q‹uZëñ²vÆ[˜Ý.!Š¡ */
+	$"27D2 A8B2 5E3E B7B7 8F73 CDCB 9896 D80F"            /* 'Ò¨²^>··�s͢–Ø. */
+	$"1D50 2E28 4F54 26A9 E68F 822C 3031 0A5B"            /* .P.(OT&©æ�‚,01Â[ */
+	$"213A 8ED8 B1B8 C32C F5EF 6784 3641 A888"            /* !:ŽØ±¸Ã,õïg„6A¨ˆ */
+	$"1AF9 941B E9B2 42C0 D9BE AAD7 2727 9E13"            /* .ù”.é²BÀÙ¾ª×''ž. */
+	$"284F A530 1F62 679B 7860 E677 9E24 3663"            /* (O¥0.bg›x`æwž$6c */
+	$"E7D1 E4B5 D37B C274 9ECB CFA2 CC95 8A75"            /* çÑäµÓ{ÂtžËϢ̕Šu */
+	$"0C3A FB7D F074 1433 5EC7 1FC4 330E F221"            /* .:û}ðt.3^Ç.Ä3.ò! */
+	$"AE39 4A04 097F 4B21 27CD C193 39CB 3AB2"            /* ®9J.Æ.K!'ÍÁ“9Ë:² */
+	$"0B6E D8E0 54EA 0F75 15F9 D75D 0D82 624D"            /* .nØàTê.u.ù×].‚bM */
+	$"7D19 8E11 1AD0 764F CEA8 F0FE 2913 6841"            /* }.Ž..ÐvOΨðþ).hA */
+	$"89B8 CA62 C997 34B9 5950 4842 4F13 1ACD"            /* ‰¸ÊbÉ—4¹YPHBO..Í */
+	$"39AD 30CA 4ED2 A17D 0B09 206B 9426 EF50"            /* 9­0ÊNÒ¡}.Æ k”&ïP */
+	$"63C6 386E 74BB BDE0 420F 6154 5260 E1A2"            /* cÆ8nt»½àB.aTR`ᢠ*/
+	$"8546 3192 76D1 1F38 268E 7AC6 049F 321D"            /* …F1’vÑ.8&ŽzÆ.Ÿ2. */
+	$"CB51 35C7 067C 961B DA2F 4BCB E065 A8DB"            /* ËQ5Ç.|–.Ú/KËàe¨Û */
+	$"16C9 1F05 ABAF 93FF 333A F049 3161 6838"            /* .É..«¯“ÿ3:ðI1ah8 */
+	$"6E1A FEF2 564C 3F48 3800 BC9C F009 AF34"            /* n.þòVL?H8.¼œðƯ4 */
+	$"2241 15D4 764F 4764 CEDF 6D7D 2E9C 8141"            /* "A.ÔvOGdÎßm}.œ�A */
+	$"1E00 E109 D827 DDAA A47C 2854 9229 8998"            /* ..áÆØ'ݪ¤|(T’)‰˜ */
+	$"9175 1FFB 496B 36C7 3695 3631 390B 06E6"            /* ‘u.ûIk6Ç6•619..æ */
+	$"EB0D 3BA7 F1BE A2FF 6D3A 9FB6 FCFD ADEF"            /* ë.;§ñ¾¢ÿm:Ÿ¶üý­ï */
+	$"EDBA 3FDB 632F EDB1 BF6D BE7E DB9F 97ED"            /* íº?Ûc/í±¿m¾~ÛŸ—í */
+	$"45FD AB93 F6E8 7FED A7F7 DAC3 FC34 6F43"            /* Eý«“öè.í§÷ÚÃü4oC */
+	$"E1DB 5507 762F DB7E 5F51 DDF5 1DFE DD07"            /* áÛU.v/Û~_QÝõ.þÝ. */
+	$"E1FD A67F B4E6 7EDB 8BF6 AE3F B6BC D3E4"            /* áý¦.´æ~Û‹ö®?¶¼Óä */
+	$"D00B 0F87 A0FF 2AC3 3F6D 84F8 7475 99F2"            /* Ð..‡ ÿ*Ã?m„øtu™ò */
+	$"F382 BE95 100F 8FEE C1C8 D086 E345 E973"            /* 󂾕..�îÁÈІãEés */
+	$"0FE4 06B6 7813 7115 B8D0 D91B C698 D10D"            /* .ä.¶x.q.¸ÐÙ.ƘÑ. */
+	$"A370 844F 9330 E047 0201 F880 D146 6522"            /* £p„O“0àG..ø€ÑFe" */
+	$"8E52 12DE 3D1A 9231 5315 682E 4706 8685"            /* ŽR.Þ=.’1S.h.G.†… */
+	$"DA39 C538 9828 7ED0 714F 3E27 532A 3840"            /* Ú9Å8˜(~ÐqO>'S*8@ */
+	$"C912 3E46 8205 3243 7835 7284 12D6 CCF5"            /* É.>F‚.2Cx5r„.ÖÌõ */
+	$"36AF 0975 8A27 4F44 3857 B5A3 160D 1391"            /* 6¯ÆuŠ'OD8Wµ£...‘ */
+	$"8005 2453 86CB 51B3 E493 EA9C 707F 7047"            /* €.$S†ËQ³ä“êœp.pG */
+	$"1DA8 1386 91D1 6105 7D84 1563 FC52 D5D3"            /* .¨.†‘Ña.}„.cüRÕÓ */
+	$"EDA7 D4A0 4AC1 BB4E 49D6 62F4 CA92 CE8E"            /* í§Ô JÁ»NIÖbôÊ’ÎŽ */
+	$"8DE0 84DC 418D ACE2 71AD 9206 3C98 3281"            /* �à„ÜA�¬âq­’.<˜2� */
+	$"104E A1F2 8982 6ED6 223E B67B BE6A C51F"            /* .N¡ò‰‚nÖ">¶{¾jÅ. */
+	$"4BF8 6C35 B6A4 5EC8 87BB 4834 7CF3 16AC"            /* Køl5¶¤^ȇ»H4|ó.¬ */
+	$"2453 B3DA 3503 94D6 2E70 2B6F 975E 21DB"            /* $S³Ú5.”Ö.p+o—^!Û */
+	$"F409 0368 9A2E DFB2 7A4B 9A6F 4165 1173"            /* ôÆ.hš.ß²zKšoAe.s */
+	$"A53E 329A 7925 FB80 9664 2C09 A9E5 715C"            /* ¥>2šy%û€–d,Æ©åq\ */
+	$"E42F 8E14 EC68 05A8 D565 53C2 9C98 86A2"            /* ä/Ž.ìh.¨ÕeSÂœ˜†¢ */
+	$"2C2D 6443 A1D0 A619 2320 6CD3 FE48 8006"            /* ,-dC¡Ð¦.# lÓþH€. */
+	$"FC0F 3690 DF76 1FD8 2E16 0705 D91F EEBE"            /* ü.6�ßv.Ø....Ù.î¾ */
+	$"E961 32B9 E252 4F0E EE4A 6F73 AEBB 014A"            /* éa2¹âRO.îJos®».J */
+	$"8F45 1551 9123 7C3A 13F8 1B57 EB6A 0AFB"            /* �E.Q‘#|:.ø.WëjÂû */
+	$"9AE9 65F5 9FDE 5F1C 7C23 84F1 6DCD CC52"            /* šéeõŸÞ_.|#„ñmÍÌR */
+	$"97DD 03E6 C571 0C23 F06B 9F21 2E2C 79D5"            /* —Ý.æÅq.#ðkŸ!.,yÕ */
+	$"1827 1436 E6FB C5FB BA11 617B 9B32 3DCD"            /* .'.6æûÅûº.a{›2=Í */
+	$"B0AD AA8F 53D0 2F20 849C D667 9436 A677"            /* °­ª�SÐ/ „œÖg”6¦w */
+	$"38C9 1B5A 26E2 B4D4 29BB 2D9E 56D4 652D"            /* 8É.Z&â´Ô)»-žVÔe- */
+	$"9A12 FC7E FBD5 0075 3EC9 64FE D0CE 06A2"            /* š.ü~ûÕ.u>ÉdþÐÎ.¢ */
+	$"B63F 8731 DB8A 6917 26EA CCFC C1E6 10AA"            /* ¶?‡1ÛŠi.&êÌüÁæ.ª */
+	$"704E 20EA 7518 0416 6BBE 2867 9470 9FE6"            /* pN êu...k¾(g”pŸæ */
+	$"3D2A D178 6CD1 0B7D E518 4682 FC48 EA03"            /* =*ÑxlÑ.}å.F‚üHê. */
+	$"EFA0 ADEE B643 CDFD 796D C309 E13B 9DD3"            /* ï ­î¶CÍýymÃÆá;�Ó */
+	$"82CC 1237 8D6B 9CB9 0438 AF1A 6190 136E"            /* ‚Ì.7�kœ¹.8¯.a�.n */
+	$"A170 6109 4BA8 FD0B 4C10 DE61 71A9 A5FF"            /* ¡paÆK¨ý.L.Þaq©¥ÿ */
+	$"5AD1 3895 15D0 912A BC62 5344 A7FD 7B9B"            /* ZÑ8•.Б*¼bSD§ý{› */
+	$"0360 8C71 DD04 20C7 4685 E6B7 7941 7BD7"            /* .`ŒqÝ. ÇF…æ·yA{× */
+	$"DBBB 3F61 742B D692 AD3D B778 6442 3DD1"            /* Û»?at+Ö’­=·xdB=Ñ */
+	$"A97E 1312 9AF4 05C1 7B33 9FE2 B3F5 D16C"            /* ©~..šô.Á{3Ÿâ³õÑl */
+	$"875D 7109 13EC BB96 0664 DF60 1958 8DE5"            /* ‡]qÆ.ì»–.dß`.X�å */
+	$"5B3F 3E75 9D21 0415 CE9C 3172 87C7 FF05"            /* [?>u�!..Îœ1r‡Çÿ. */
+	$"F787 4F14 E63B 4DCE 247D B3A3 475C 5336"            /* ÷‡O.æ;MÎ$}³£G\S6 */
+	$"C794 AF23 6415 68C6 B893 1B16 8C81 3F43"            /* Ç”¯#d.hƸ“..Œ�?C */
+	$"C455 6EB8 8D5A 6919 4C3A D980 BFB1 3699"            /* ÄUn¸�Zi.L:Ù€¿±6™ */
+	$"C790 C7D1 7B05 12AA 803A 172B DEF2 00CC"            /* Ç�ÇÑ{..ª€:.+Þò.Ì */
+	$"FF38 62C8 1815 1D3A F60D 2B9B 87A0 05C5"            /* ÿ8bÈ...:ö.+›‡ .Å */
+	$"3587 0181 8754 06D7 2CFC 78B8 0C65 D5BC"            /* 5‡.�‡T.×,üx¸.eÕ¼ */
+	$"2903 C07C 0631 A0B9 E94E 192F DE4B 4924"            /* ).À|.1 ¹éN./ÞKI$ */
+	$"A4F0 BB9A 49C5 B751 38EB 7289 9806 FC5C"            /* ¤ð»šIÅ·Q8ër‰˜.ü\ */
+	$"D822 ED93 CA92 14B6 5056 017F 7826 CDE1"            /* Ø"í“Ê’.¶PV..x&Íá */
+	$"8401 9F6C A7F7 4AD5 E86F FDC3 05AF 6AE3"            /* „.Ÿl§÷JÕèoýÃ.¯jã */
+	$"5EED 07E3 E5ED 7EE7 FB97 0B99 E191 605B"            /* ^í.ãåí~çû—.™á‘`[ */
+	$"955A 6A3C 33C6 2BB8 9562 0E38 09C1 1ED9"            /* •Zj<3Æ+¸•b.8ÆÁ.Ù */
+	$"8914 73AF E9AA 7B2F 214E 7EEA 98E8 B976"            /* ‰.s¯éª{/!N~ê˜è¹v */
+	$"E058 E0B5 6DB4 5B1C F212 2C8E 0AE5 7100"            /* àXàµm´[.ò.,ŽÂåq. */
+	$"BC1E 84CD 0598 7CF9 EA4E 1E96 2B4A DE9E"            /* ¼.„Í.˜|ùêN.–+JÞž */
+	$"6CE9 E79B 0336 9059 E109 DF83 A2AE 9E74"            /* léç›.6�YáÆ߃¢®žt */
+	$"5BB1 0236 590C 66CD 0658 ECE5 50A2 EDDD"            /* [±.6Y.fÍ.XìåP¢íÝ */
+	$"D7BB DAF7 548B 7F21 2A40 7821 FDA2 62B6"            /* ×»Ú÷T‹.!*@x!ý¢b¶ */
+	$"C862 B0B2 96CF 27D5 EC9D F5C8 42D8 F42A"            /* Èb°²–Ï'Õì�õÈBØô* */
+	$"5962 F21A D191 6744 1AE2 64B4 6744 A1B2"            /* Ybò.Ñ‘gD.âd´gD¡² */
+	$"7625 FF0D F0CF A1F8 3273 C4B8 FCCE C2BC"            /* v%ÿ.ðÏ¡ø2sĸüμ */
+	$"EDD5 F0C6 765F 2446 5EF5 2195 04EE C94B"            /* íÕðÆv_$F^õ!•.îÉK */
+	$"C9C2 4F82 0D0F 6034 3560 64A8 C372 4E17"            /* ÉÂO‚..`45`d¨ÃrN. */
+	$"D4F6 B2DC 2162 A6DC 9B35 5F36 628E EA58"            /* Ôö²Ü!b¦Ü›5_6bŽêX */
+	$"B2EF D0B8 79FF 3F60 39DC 34C9 8DD1 C7DA"            /* ²ïиyÿ?`9Ü4É�ÑÇÚ */
+	$"BFFD 9220 B977 42CD 1F4E 00C7 1A7B F29F"            /* ¿ý’ ¹wBÍ.N.Ç.{òŸ */
+	$"9738 8D5E 3E5F BA1F D4BD 0592 2006 1216"            /* —8�^>_º.Ô½.’ ... */
+	$"D478 DE72 171A A49D 9C4A 0691 CD59 6FB3"            /* ÔxÞr..¤�œJ.‘ÍYo³ */
+	$"F3C5 B3CD DCC8 5794 133C 85B3 176A 0C6A"            /* óųÍÜÈW”.<…³.j.j */
+	$"323E C74F 7CE3 4042 38AB E9CA 5700 E39B"            /* 2>ÇO|ã@B8«éÊW.ã› */
+	$"26D3 62B7 59F8 966D A789 35AA C72D 9943"            /* &Ób·Yø–m§‰5ªÇ-™C */
+	$"C884 2E53 30B3 D351 EFCC 6BF8 9889 8AB6"            /* È„.S0³ÓQïÌkø˜‰Š¶ */
+	$"E284 F5A4 64BD F89F 98A4 8082 6292 48EB"            /* â„õ¤d½øŸ˜¤€‚b’Hë */
+	$"2039 4A80 D5D7 BEFC 2DC1 69A9 F484 9B4E"            /*  9J€Õ×¾ü-Ái©ô„›N */
+	$"94C9 6E87 31A6 6D4E 23DB 77A9 37D5 CEE9"            /* ”Én‡1¦mN#Ûw©7ÕÎé */
+	$"10B5 22DB 58B2 3DFB 973A E321 F02A 2985"            /* .µ"ÛX²=û—:ã!ð*)… */
+	$"AE7E F964 9A23 4B8D 90FD 75F4 9944 3CEB"            /* ®~ùdš#K��ýuô™D<ë */
+	$"C5C5 B0BA DA1C AA0A B59A EFCA 903A 972B"            /* ÅÅ°ºÚ.ªÂµšïÊ�:—+ */
+	$"10E9 2A66 2BAB 3E63 8312 E494 A82C AEE8"            /* .é*f+«>cƒ.䔨,®è */
+	$"DE3B 902F 4DE5 A934 7FA5 59D8 B355 75C7"            /* Þ;�/Må©4.¥YسUuÇ */
+	$"DC51 6208 6D60 DE89 F04A F698 FC35 5341"            /* ÜQb.m`Þ‰ðJö˜ü5SA */
+	$"A8C7 894B 5E8F 0638 0F21 36AB 23FF 37BF"            /* ¨Ç‰K^�.8.!6«#ÿ7¿ */
+	$"CA6E C0CE 1C93 9BB1 FEA7 49E8 9BA5 7F32"            /* ÊnÀÎ.“›±þ§I蛥.2 */
+	$"4C9D C8BA 821C 1E07 F277 BE63 241C D5F6"            /* L�Ⱥ‚...òw¾c$.Õö */
+	$"07CB 7A98 E51E B0FC B312 223C 21BF 5DEE"            /* .Ëz˜å.°ü³."<!¿]î */
+	$"0229 A0EE 8B90 5918 5910 F6A6 EEB6 503D"            /* .) î‹�Y.Y.ö¦î¶P= */
+	$"8E76 A3B6 E583 FEFF 5B3D F804 F6EE 956E"            /* Žv£¶åƒþÿ[=ø.öî•n */
+	$"FEE7 D95F 9D05 AE0B 4926 52B4 23C3 D17A"            /* þçÙ_�.®.I&R´#ÃÑz */
+	$"FC0F CC41 1264 0956 8CA2 6A30 C0D0 275F"            /* ü.ÌA.dÆVŒ¢j0ÀÐ'_ */
+	$"0CE8 C646 CC49 EF38 CC94 8B6C 1737 9636"            /* .èÆFÌIï8Ì”‹l.7–6 */
+	$"4EA7 0FE7 217B F3F1 A10D 7E49 242E 6F19"            /* N§.ç!{óñ¡.~I$.o. */
+	$"A8CF 369A 44DE 6C99 A9D4 24DA 6909 62C3"            /* ¨Ï6šDÞl™©Ô$ÚiÆbà */
+	$"0C4C D4CD D80E 72E6 FF6B A90E 7080 977B"            /* .LÔÍØ.ræÿk©.p€—{ */
+	$"4BEB 6A2A 72BB 0574 45FB 1E12 6408 C966"            /* Këj*r».tEû..d.Éf */
+	$"A632 9AC7 E67D 82C9 3FED 1E27 C1FA C47A"            /* ¦2šÇæ}‚É?í.'ÁúÄz */
+	$"AFCF 5719 3BCA 3975 BE3A 550B 6DC9 91CC"            /* ¯ÏW.;Ê9u¾:U.mÉ‘Ì */
+	$"F28E 751C 1B20 E7BB 58FF 0D92 2BF7 DE26"            /* òŽu.. ç»Xÿ.’+÷Þ& */
+	$"DFE3 B230 78F7 C64E ADF8 7741 F45A E3BC"            /* ßã²0x÷ÆN­øwAôZã¼ */
+	$"5185 1323 1C74 3288 F720 5DB7 B5C9 1EFD"            /* Q….#.t2ˆ÷ ]·µÉ.ý */
+	$"C844 7159 7047 A9BA 6CA1 403E CE2E 3522"            /* ÈDqYpG©ºl¡@>Î.5" */
+	$"1088 A628 490C 5F8D 64C4 7E17 CBD3 290D"            /* .ˆ¦(I._�dÄ~.ËÓ). */
+	$"91B1 B073 AD4A BF5B A1E9 6306 3E9A F87E"            /* ‘±°s­J¿[¡éc.>šø~ */
+	$"2DEC 7390 2CF5 3305 93C2 15DA 7FFF 7FC6"            /* -ìs�,õ3.“Â.Ú.ÿ.Æ */
+	$"0578 C93E BF93 5B69 25D4 E0F9 5726 0D7E"            /* .xÉ>¿“[i%ÔàùW&.~ */
+	$"9C06 C76B 1BF5 3206 F26C 4F57 6A13 7488"            /* œ.Çk.õ2.òlOWj.tˆ */
+	$"07F4 1787 316E 19B5 2CB4 D7B8 23EE BF15"            /* .ô.‡1n.µ,´×¸#î¿. */
+	$"84F7 C141 CE7E 358F F83B 081D 2680 C5CB"            /* „÷ÁAÎ~5�ø;..&€ÅË */
+	$"2002 0FFB D329 10E3 1880 E0F6 29FF 14F6"            /*  ..ûÓ).ã.€àö)ÿ.ö */
+	$"1447 24FF 4BDD 371B 00F3 0334 6FE5 D217"            /* .G$ÿKÝ7..ó.4oåÒ. */
+	$"8E7D 3CCB EC04 D019 0583 0792 D4F4 59E5"            /* Ž}<Ëì.Ð..ƒ.’ÔôYå */
+	$"0914 52FB CE7A 2EFD B899 ED16 38FB E1D4"            /* Æ.RûÎz.ý¸™í.8ûáÔ */
+	$"3312 BAAE 3EF3 45B7 2A77 62F3 4787 8900"            /* 3.º®>óE·*wbóG‡‰. */
+	$"050D 5A64 92D3 64E7 7950 4234 FCC0 0EC6"            /* ..Zd’ÓdçyPB4üÀ.Æ */
+	$"004C 8652 616B B5FF 87F6 72D0 400B 9574"            /* .L†Rakµÿ‡örÐ@.•t */
+	$"7ADD 2EE6 F979 EE70 393F 5E65 09EC 561B"            /* zÝ.æùyîp9?^eÆìV. */
+	$"2FF4 F6FA 9226 2AA7 C2D2 4517 2258 15C7"            /* /ôöú’&*§ÂÒE."X.Ç */
+	$"D27E DE80 0000 0009 BB69 0154 3C66 FD24"            /* Ò~Þ€...Æ»i.T<fý$ */
+	$"D6C1 DFFC 41CF 26FD 27E3 9482 7299 C4A3"            /* ÖÁßüAÏ&ý'㔂r™Ä£ */
+	$"A4B0 4F99 5ED7 6507 C196 C060 D7BD 7BA6"            /* ¤°O™^×e.Á–À`×½{¦ */
+	$"A0A2 C1E7 0ECE 98C4 36F0 B006 0526 5FC4"            /*  ¢Áç.ΘÄ6ð°..&_Ä */
+	$"CDEF A25D CE59 7B6F 507F C409 957F 43E6"            /* Íï¢]ÎY{oP.ÄÆ•.Cæ */
+	$"20AB C4BE 33C2 E794 46B7 5341 D8C9 5487"            /*  «Ä¾3Âç”F·SAØÉT‡ */
+	$"3000 A3E6 41BE 7D2A B553 6A8D C345 2E1E"            /* 0.£æA¾}*µSj�ÃE.. */
+	$"BF55 F536 52DD 101F D6C9 BB65 B7E4 0CFC"            /* ¿Uõ6RÝ..ÖÉ»e·ä.ü */
+	$"03D7 F641 F641 7A4F 8EE2 BA7A 352C ED91"            /* .×öAöAzOŽâºz5,í‘ */
+	$"9057 F893 C46F 62F7 A791 A8DE 8A25 BB17"            /* �Wø“Äob÷§‘¨ÞŠ%». */
+	$"F164 F2ED 43E5 A2E2 17E9 C95D DE1C 45F4"            /* ñdòíCå¢â.éÉ]Þ.Eô */
+	$"3019 8090 809D D124 EE5C B48E 6C92 2A74"            /* 0.€�€�Ñ$î\´Žl’*t */
+	$"ACA0 4F0A 1777 70CF EBEC 112A 9035 16AB"            /* ¬ OÂ.wpÏëì.*�5.« */
+	$"B36D 13D6 9F72 69CD E213 F146 6733 BAA3"            /* ³m.ÖŸriÍâ.ñFg3º£ */
+	$"0080 0000 0000 0000 0001 0151 0AD3 43F0"            /* .€.........QÂÓCð */
+	$"14A4 0000 61F0 20D9 9F3A 47FC 60A2 4780"            /* .¤..að ÙŸ:Gü`¢G€ */
+	$"F2D0 2A57 2C4C D349 5B9A 1BE3 0D39 80AD"            /* òÐ*W,LÓI[š.ã.9€­ */
+	$"72C4 873D 5028 F09E F0F5 700F B776 4B38"            /* rć=P(ðžðõp.·vK8 */
+	$"4FC6 7D26 AE5D 219E DDCE 4AA3 9AA9 FE19"            /* OÆ}&®]!žÝÎJ£š©þ. */
+	$"EC25 FEF0 0626 D259 8ECF 0364 6192 A000"            /* ì%þð.&ÒYŽÏ.da’ . */
+	$"0000 0000 0000 0000 0184 84B4 4FF0 1848"            /* .........„„´Oð.H */
+	$"4BC2 3700 0000 0000 0000 00B5 DA5E 3FF1"            /* KÂ7........µÚ^?ñ */
+	$"C9FC 9186 4A80 0000 0000 0000 0000 0000"            /* Éü‘†J€.......... */
+	$"0510 0FC3 251B 71C0 D918 64A8 0000 0000"            /* ...Ã%.qÀÙ.d¨.... */
+	$"0000 0000 0000 07E1 1EE1 F164 E11A 319D"            /* .......á.áñdá.1� */
+	$"3806 659F 8C35 7012 B17E 6096 52F0 8E96"            /* 8.eŸŒ5p.±~`–RðŽ– */
+	$"1438 1EBF 363A 49C9 51BD 3517 4ADA 7060"            /* .8.¿6:IÉQ½5.JÚp` */
+	$"0849 8F8B FCEC FD48 0000 54DF 4C0B E043"            /* .I�‹üìýH..TßL.àC */
+	$"F3B6 1CEB 518A F2B1 5A9C 9500 0000 0000"            /* ó¶.ëQŠò±Zœ•..... */
+	$"0196 C058 0636 AF4B 041F 37EC DE6F 4B4E"            /* .–ÀX.6¯K..7ìÞoKN */
+	$"291D A2A6 3CB8 9BAC 4B0C 5017 9031 0EF1"            /* ).¢¦<¸›¬K.P.�1.ñ */
+	$"3CF7 F63B 73A1 B4A6 9EA7 0513 C571 8EA8"            /* <÷ö;s¡´¦ž§..ÅqŽ¨ */
+	$"5D0A 28FC DCB6 D27A 0000 0000 0159 D076"            /* ]Â(üܶÒz.....YÐv */
+	$"3D1E 84A9 1C76 876E 7B6B 8519 1F9F 01C6"            /* =.„©.v‡n{k…..Ÿ.Æ */
+	$"1A11 B2A2 4841 4D47 5463 5D18 2AFE 54F5"            /* ..²¢HAMGTc].*þTõ */
+	$"591E 5FF1 39C7 C0CD 0D20 F366 59DE FE22"            /* Y._ñ9ÇÀÍ. ófYÞþ" */
+	$"B12C 4608 009D F105 49C8 16B5 417A 6079"            /* ±,F..�ñ.IÈ.µAz`y */
+	$"40B0 7E7A C4B3 83B8 485D 42B1 4000 0000"            /* @°~zijƒ¸H]B±@... */
+	$"0E9F 0340 5469 49BB 5767 B4BE 47AF 19B3"            /* .Ÿ.@TiI»Wg´¾G¯.³ */
+	$"4E69 B99F 25DF C3C0 1B9C 5455 41D2 F508"            /* Ni¹Ÿ%ßÃÀ.œTUAÒõ. */
+	$"9900 1F13 B43E C345 C4B3 C066 8A27 C3D3"            /* ™...´>ÃEijÀfŠ'ÃÓ */
+	$"7A8A 6368 2F2C 3F2F 5D43 59ED 5E40 9E4F"            /* zŠch/,?/]CYí^@žO */
+	$"59BB 6A03 B7F8 083A 021D F8F0 79AF 43B0"            /* Y»j.·ø.:..øðy¯C° */
+	$"2270 F775 B8D8 FB59 371A 8B22 9F0B 55FA"            /* "p÷u¸ØûY7.‹"Ÿ.Uú */
+	$"C9B1 5565 0914 AA67 2D9E 81B2 60FC 1333"            /* ɱUeÆ.ªg-ž�²`ü.3 */
+	$"318F 21E9 97E4 1400 F69E F709 7AE3 82A5"            /* 1�!é—ä..öž÷Æzã‚¥ */
+	$"C9DE 7D16 1DF8 EDF8 FC5E DB3E FC2A F822"            /* ÉÞ}..øíøü^Û>ü*ø" */
+	$"886E F247 9BC1 250E 905C 4AF7 4B22 3595"            /* ˆnòG›Á%.�\J÷K"5• */
+	$"0835 2567 EEC1 C4C8 B70D D782 6A22 C9DA"            /* .5%gîÁÄÈ·.ׂj"ÉÚ */
+	$"ADA3 0370 EED9 E428 E163 963A E6F0 5D4A"            /* ­£.pîÙä(ác–:æð]J */
+	$"F42A D11F B46D 7FBC 2D87 4274 4756 896E"            /* ô*Ñ.´m.¼-‡BtGV‰n */
+	$"C489 80C0 62F6 88A8 184A 79BE 3068 A9AF"            /* ĉ€Àböˆ¨.Jy¾0h©¯ */
+	$"D703 390B 1A76 3136 B799 726A AAA8 C23D"            /* ×.9..v16·™rjª¨Â= */
+	$"EEB0 E0F1 49E1 A6B7 204F 7BF3 6E44 F25E"            /* î°àñIᦷ O{ónDò^ */
+	$"7E0A 5125 CA89 B477 15CD 83CC CD21 C6BE"            /* ~ÂQ%ʉ´w.̓ÌÍ!ƾ */
+	$"F20B 99F3 C30C 5113 2E0A FF7E 1034 1BFF"            /* ò.™óÃ.Q..Âÿ~.4.ÿ */
+	$"0378 72CF B0EE D132 2A2D 14A9 E37F 6B10"            /* .xrÏ°îÑ2*-.©ã.k. */
+	$"B5CE 0500 0000 0000 0000 0160 A7E3 A715"            /* µÎ.........`§ã§. */
+	$"0C13 DE44 025B 9720 0000 0000 0000 0001"            /* ..ÞD.[— ........ */
+	$"E0F5 5A21 77FB C1F6 EAF0 244A EE78 B6FA"            /* àõZ!wûÁöêð$Jîx¶ú */
+	$"1769 3D98 AA28 2EB6 9826 A16B D6B8 BA89"            /* .i=˜ª(.¶˜&¡kÖ¸º‰ */
+	$"26C6 25C9 9E66 FD9C 6D2D FCDA FCB9 6AB2"            /* &Æ%Éžfýœm-üÚü¹j² */
+	$"B42A 7008 5069 CB61 D530 B47A FCFF 7F95"            /* ´*p.PiËaÕ0´züÿ.• */
+	$"FA58 2D11 111A 53BF FB17 59E1 63E7 0FAD"            /* úX-...S¿û.Yácç.­ */
+	$"B016 A862 3107 8DF0 7112 DD6A B6E3 2477"            /* °.¨b1.�ðq.Ýj¶ã$w */
+	$"3162 94F0 6826 75B0 D0B8 4C13 21C7 E4BC"            /* 1b”ðh&u°Ð¸L.!Çä¼ */
+	$"FB86 7A83 DF1C A4D9 C3B4 E3DE C334 1633"            /* û†zƒß.¤ÙôãÞÃ4.3 */
+	$"DC27 76B9 7ADF 50CA F95E C7C9 D5EB 402C"            /* Ü'v¹zßPÊù^ÇÉÕë@, */
+	$"276F A0B0 D88B CF4A 0FD2 380A E3E7 2BA5"            /* 'o °Ø‹ÏJ.Ò8Âãç+¥ */
+	$"DD24 A247 B631 75B1 6D3A 4C60 9BAB E4C5"            /* Ý$¢G¶1u±m:L`›«äÅ */
+	$"BBCB 2972 36B9 AC74 5FF5 B5DB 231B 95F3"            /* »Ë)r6¹¬t_õµÛ#.•ó */
+	$"7CFF 8E5F 86E9 1906 B3DF 75C7 0364 6192"            /* |ÿŽ_†é..³ßuÇ.da’ */
+	$"A000 0000 0000 0000 0000 003B B1A0 0000"            /*  ..........;± .. */
+	$"0000 0000 0000 0000 0000 0016 D51B CEEA"            /* ............Õ.Îê */
+	$"0406 C003 4E50 C0B8 8DB2 F37C FF8E 5F86"            /* ..À.NPÀ¸�²ó|ÿŽ_† */
+	$"E919 06B3 DF75 C703 6461 92A0 0000 0000"            /* é..³ßuÇ.da’ .... */
+	$"0000 0000 0000 3BB1 A000 0000 0000 0000"            /* ......;± ....... */
+	$"0000 0000 0000 16D5 1BCE EA04 06C0 034E"            /* .......Õ.Îê..À.N */
+	$"50C0 B88D B2F4 4BED 0C57 2F64 38E7 DFE6"            /* PÀ¸�²ôKí.W/d8çßæ */
+	$"95DB 93EF B9ED 1250 6A6A A6E3 4478 1E7E"            /* •Û“ï¹í.Pjj¦ãDx.~ */
+	$"F105 8E1B 961B 230C 9500 0000 0000 0C18"            /* ñ.Ž.–.#.•....... */
+	$"0EA3 5F13 6306 E1B5 4B22 3D26 79A1 06E4"            /* .£_.c.áµK"=&y¡.ä */
+	$"228F F320 0B74 8820 0000 0000 0000 0007"            /* "�ó .tˆ ........ */
+	$"9F62 443B 9A51 EAB0 7C1A A374 E7F1 52F3"            /* ŸbD;šQê°|.£tçñRó */
+	$"3BB8 C1E0 5919 6C04 A2E2 1032 6917 1394"            /* ;¸ÁàY.l.¢â.2i..” */
+	$"CCBE 472A 0652 C144 6D1E 755C ECF9 9725"            /* ̾G*.RÁDm.u\ìù—% */
+	$"A84A 55AE 7A0E 6730 FCA7 B6E0 FF31 08C0"            /* ¨JU®z.g0ü§¶àÿ1.À */
+	$"3E76 4DDC 9E24 A60B C4A7 4CDD C221 1941"            /* >vMÜž$¦.ħLÝÂ!.A */
+	$"0810 2DE3 206F C551 4910 77AA 762A 1FF2"            /* ..-ã oÅQI.wªv*.ò */
+	$"D39A 0ADC 1089 90F8 D098 1E77 BDD1 AF74"            /* ÓšÂÜ.‰�øИ.w½Ñ¯t */
+	$"4DEF D00D 0B2C CA2F 9EDC 27C4 35F9 F924"            /* MïÐ..,Ê/žÜ'Ä5ùù$ */
+	$"67FF 74E5 A746 B627 6267 F6D0 9B94 22D4"            /* gÿtå§F¶'bgöЛ”"Ô */
+	$"5FFE DF67 A7A9 E3CA 02A5 44D1 E926 DCA4"            /* _þßg§©ãÊ.¥DÑé&ܤ */
+	$"7490 4AB8 E094 7037 FF7C 8CF7 2A9B B784"            /* t�J¸à”p7ÿ|Œ÷*›·„ */
+	$"794E 9026 D48F FF7F F013 AABF F874 63DA"            /* yN�&Ô�ÿ.ð.ª¿øtcÚ */
+	$"0302 FBFA AA6A 31D5 E2DF 85F7 2ACD D98C"            /* ..ûúªj1Õâß…÷*ÍÙŒ */
+	$"175D 1243 F1C0 CEA2 344C B6FC ADCF C6AA"            /* .].CñÀ΢4L¶ü­Ïƪ */
+	$"5CAE FA82 783F 58DD 754D 5C63 A018 19F8"            /* \®ú‚x?XÝuM\c ..ø */
+	$"7EFE 8953 AE16 22B9 4ED7 43D2 8A0B FA52"            /* ~þ‰S®."¹N×CÒŠ.úR */
+	$"5703 08CA 555B E51E 307B 0565 E165 22F3"            /* W..ÊU[å.0{.eáe"ó */
+	$"7130 0CEC CA23 576D 8D58 BED1 FEB6 9A2F"            /* q0.ìÊ#Wm�X¾Ñþ¶š/ */
+	$"DCEA 3288 3EEC B12A D43C B191 2627 7723"            /* Üê2ˆ>ì±*Ô<±‘&'w# */
+	$"F40F 1B7A F1E3 9A7E 366D 7490 EE80 3570"            /* ô..zñãš~6mt�î€5p */
+	$"CB59 D05D F384 AA96 71FE 68E8 4D32 F9D2"            /* ËYÐ]󄪖qþhèM2ùÒ */
+	$"48BC 7B03 EA3B 879E 2E96 671F 8098 CE76"            /* H¼{.ê;‡ž.–g.€˜Îv */
+	$"87D8 0336 5C88 91F4 3C69 D76B 4DEF 29DA"            /* ‡Ø.6\ˆ‘ô<i×kMï)Ú */
+	$"F378 1035 720A CE61 C2E3 5776 CA53 F43B"            /* óx.5rÂÎaÂãWvÊSô; */
+	$"4FCB 79E4 5164 1270 A23E 6048 2089 7B12"            /* OËyäQd.p¢>`H ‰{. */
+	$"BCA8 E157 DFD5 E879 C14C 1B1A 3431 2856"            /* ¼¨áWßÕèyÁL..41(V */
+	$"0E74 D87F 7691 A923 632A 5EBC 6E95 6A46"            /* .tØ.v‘©#c*^¼n•jF */
+	$"8E68 7118 3704 6E41 37CB C9AC 7F84 1005"            /* Žhq.7.nA7Ëɬ.„.. */
+	$"C308 7C90 C6E0 B56C 8CF8 3C33 A97E C46C"            /* Ã.|�ÆàµlŒø<3©~Äl */
+	$"E373 91A9 4A3F 7331 481D 843F 0472 59DC"            /* ãs‘©J?s1H.„?.rYÜ */
+	$"0837 85BA 4867 C202 6BFC 7433 F093 530F"            /* .7…ºHgÂ.küt3ð“S. */
+	$"D721 8927 26CF AA6B B4E1 7981 FCE4 9F4E"            /* ×!‰'&Ϫk´áy�üäŸN */
+	$"1105 9E7B 7F68 1CE7 D811 E270 FCA3 9CDE"            /* ..ž{.h.çØ.âpü£œÞ */
+	$"BFE6 48BA AC07 B55E 4E7F 5946 115B B1DC"            /* ¿æHº¬.µ^N.YF.[±Ü */
+	$"F694 3A9B EADD 7971 E0F1 B6E1 C6FF 4337"            /* ö”:›êÝyqàñ¶áÆÿC7 */
+	$"F543 A074 FC74 AD1F 45BF 7867 C472 7605"            /* õC tüt­.E¿xgÄrv. */
+	$"1786 E496 2D22 22BE 5760 9ACE A5C9 22B9"            /* .†ä–-""¾W`šÎ¥É"¹ */
+	$"9A14 4136 93E4 3E4A 715C 6F69 8447 5764"            /* š.A6“ä>Jq\oi„GWd */
+	$"D761 77A8 2C3F E200 ACAD 8331 11D0 ABE6"            /* ×aw¨,?â.¬­ƒ1.Ыæ */
+	$"EA7B 5A22 58CF 097E 732F 894B E99C 6BAF"            /* ê{Z"XÏÆ~s/‰Kéœk¯ */
+	$"B36C 68AA 5668 EF92 66E9 DDF9 FF78 DB89"            /* ³lhªVhï’féÝùÿxÛ‰ */
+	$"FC78 2032 99D9 62F0 1380 3FE8 41DF F341"            /* üx 2™Ùbð.€?èAßóA */
+	$"F1FD 7F08 CE2E F09A 9335 6735 0FAD 8093"            /* ñý..Î.ðš“5g5.­€“ */
+	$"B6B1 53A2 964F EA7E 72A2 9A29 794D 98F0"            /* ¶±S¢–Oê~r¢š)yM˜ð */
+	$"DD57 AE65 C61E DDEC BDB4 35C2 D050 E063"            /* ÝW®eÆ.Ýì½´5ÂÐPàc */
+	$"5F54 BCA5 928D 786D CAE3 8F96 BFEB 027E"            /* _T¼¥’�xmÊã�–¿ë.~ */
+	$"6BBC 8795 7C88 1A2C 9908 36A1 6CAB 9268"            /* k¼‡•|ˆ.,™.6¡l«’h */
+	$"EB0D 816F F34D 55F5 B562 BCFF 4190 EE42"            /* ë.�oóMUõµb¼ÿA�îB */
+	$"F195 E7F3 E220 7E51 74A2 FA23 23F7 20F0"            /* ñ•çóâ ~Qt¢ú##÷ ð */
+	$"985F 011C 34B8 C988 C519 C623 81BC D026"            /* ˜_..4¸ÉˆÅ.Æ#�¼Ð& */
+	$"A8C5 B82C 7A7F 86F7 E60E 44F2 CD53 6FAB"            /* ¨Å¸,z.†÷æ.DòÍSo« */
+	$"2D69 1FD4 75B7 A011 80E7 09B3 B9CF 4503"            /* -i.Ôu· .€çƳ¹ÏE. */
+	$"F4A5 1DE3 AE8A 96F7 E245 0DF9 3859 24FA"            /* ô¥.㮊–÷âE.ù8Y$ú */
+	$"7B43 665F B15E D4D3 FB2A 666E FB6A 6CA8"            /* {Cf_±^ÔÓû*fnûjl¨ */
+	$"9CAF C052 D658 6DC3 BDD1 C752 21FA 6426"            /* œ¯ÀRÖXmýÑÇR!úd& */
+	$"857C D05D 41C2 0241 306C 6FD4 81E3 69F7"            /* …|Ð]AÂ.A0loÔ�ãi÷ */
+	$"A6F5 227F 39F9 780E 829A 17A9 C649 2BF5"            /* ¦õ".9ùx.‚š.©ÆI+õ */
+	$"01DD E500 A973 E599 890C A548 CE34 2877"            /* .Ýå.©s噉.¥HÎ4(w */
+	$"D160 A2EE 4B3B CC7A 0C87 6723 51FD C222"            /* Ñ`¢îK;Ìz.‡g#QýÂ" */
+	$"9BFB E72D 2769 6250 2054 22C9 ABB2 3125"            /* ›ûç-'ibP T"É«²1% */
+	$"7DA0 73A3 C083 1AAD 90F2 F0A8 C22D 9DF5"            /* } s£Àƒ.­�òð¨Â-�õ */
+	$"3FFB 6B56 18BE 61A6 B198 F1BC 1E4E 0CFE"            /* ?ûkV.¾a¦±˜ñ¼.N.þ */
+	$"B323 8275 A644 CAC4 D36B 9AF9 FCC8 5DEC"            /* ³#‚u¦DÊÄÓkšùüÈ]ì */
+	$"292B CC9B A0B6 9148 09DF E46D 1B2C 4EDF"            /* )+Ì› ¶‘HÆßäm.,Nß */
+	$"EDB9 2DB4 BAD5 C50B 2115 C476 E09A F407"            /* í¹-´ºÕÅ.!.Ävàšô. */
+	$"5EE8 2E9F 870F A319 32D4 EBEC CB7B FDE9"            /* ^è.Ÿ‡.£.2ÔëìË{ýé */
+	$"FB5C 0D41 61F3 BA97 0F9E 558F 6E39 C213"            /* û\.Aaóº—.žU�n9Â. */
+	$"3101 A5E8 ECEC 15E5 4F29 F69A 58CD D82D"            /* 1.¥èìì.åO)öšXÍØ- */
+	$"986E E8E0 6898 17CC 98C4 C851 AC75 9306"            /* ˜nèàh˜.̘ÄÈQ¬u“. */
+	$"5241 0350 E2EB 38CA 1682 6132 FF45 578A"            /* RA.Pâë8Ê.‚a2ÿEWŠ */
+	$"FA7F 7557 AC2C 9A18 3835 A62B 7D09 0992"            /* ú.uW¬,š.85¦+}ÆÆ’ */
+	$"EF78 BD49 5317 373A B07D 6420 DC30 5067"            /* ïx½IS.7:°}d Ü0Pg */
+	$"A659 F316 4436 8E8E 9786 1163 A6A5 B841"            /* ¦Yó.D6ŽŽ—†.c¦¥¸A */
+	$"99AA 4E1C 6163 309A 3C23 0208 FF4B 2967"            /* ™ªN.ac0š<#..ÿK)g */
+	$"B7F7 37E4 A337 D0DC C48A A742 FB2D C529"            /* ·÷7ä£7ÐÜÄŠ§Bû-Å) */
+	$"BC6C 5BBE BC5C 03B1 F87F D7EA F5AC B94B"            /* ¼l[¾¼\.±ø.×êõ¬¹K */
+	$"5A88 84AB E44E BE6A F337 96B0 7CB6 1140"            /* Zˆ„«äN¾jó7–°|¶.@ */
+	$"25CB 45D6 BE02 A9D4 7868 1EDD F660 7963"            /* %ËEÖ¾.©Ôxh.Ýö`yc */
+	$"B438 C030 3EA5 51FA F451 FA84 A6FF 2E5A"            /* ´8À0>¥QúôQú„¦ÿ.Z */
+	$"EA95 2300 C0F4 39AA 42BA 4120 4EEC AFDD"            /* ê•#.Àô9ªBºA Nì¯Ý */
+	$"20B4 6C42 0552 1177 6F1A AC6D FE8B 98E1"            /*  ´lB.R.wo.¬mþ‹˜á */
+	$"D3FB F52E BCE3 5BB1 7235 F597 3E0D 8C46"            /* Óûõ.¼ã[±r5õ—>.ŒF */
+	$"7361 1E2A C081 CA97 C8EA CD3F E91D 823F"            /* sa.*À�Ê—ÈêÍ?é.‚? */
+	$"73A7 5EA1 F641 9CBD 219D D7E4 EE0D 270E"            /* s§^¡öAœ½!�×äî.'. */
+	$"14DF F756 B4E5 062C 8251 4AD0 B090 A0AF"            /* .ß÷V´å.,‚QJа� ¯ */
+	$"CD2A 3C80 6068 C9CD C3D7 3D7F 258B 365A"            /* Í*<€`hÉÍÃ×=.%‹6Z */
+	$"5E1A 90DC D058 4ED9 DF50 6F40 07A9 2BDE"            /* ^.�ÜÐXNÙßPo@.©+Þ */
+	$"8486 5404 AB9C E323 0C4E D3DB 8352 0C0F"            /* „†T.«œã#.NÓÛƒR.. */
+	$"CD59 A5F5 56CC 0BB2 B603 85C3 C709 7D6E"            /* ÍY¥õVÌ.²¶.…ÃÇÆ}n */
+	$"A10E 33C2 AE0F D52F 5AD7 2279 E6EB 7E6C"            /* ¡.3®.Õ/Z×"yæë~l */
+	$"1757 589D C6DC B4FD 470C FFD9"                      /* .WX�ÆÜ´ýG.ÿÙ */
+};
+
diff --git a/linden/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store b/linden/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store
new file mode 100644
index 0000000..6a91b38
Binary files /dev/null and b/linden/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store differ
diff --git a/linden/indra/newview/installers/darwin/publicnightly-dmg/_VolumeIcon.icns b/linden/indra/newview/installers/darwin/publicnightly-dmg/_VolumeIcon.icns
new file mode 100644
index 0000000..da5307e
Binary files /dev/null and b/linden/indra/newview/installers/darwin/publicnightly-dmg/_VolumeIcon.icns differ
diff --git a/linden/indra/newview/installers/darwin/publicnightly-dmg/background.jpg b/linden/indra/newview/installers/darwin/publicnightly-dmg/background.jpg
new file mode 100644
index 0000000..55294dc
Binary files /dev/null and b/linden/indra/newview/installers/darwin/publicnightly-dmg/background.jpg differ
diff --git a/linden/indra/newview/installers/darwin/release-dmg/Applications-alias.r b/linden/indra/newview/installers/darwin/release-dmg/Applications-alias.r
new file mode 100644
index 0000000..aa3cfb8
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/release-dmg/Applications-alias.r
@@ -0,0 +1,6996 @@
+data 'alis' (0) {
+	$"0000 0000 0112 0002 0001 036D 6277 0000"            /* ...........mbw.. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 C135 A717 482B 0000 0000"            /* ......Á5§.H+.... */
+	$"0002 0C41 7070 6C69 6361 7469 6F6E 7300"            /* ...Applications. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 00E2 4F18 C2E8 9FB0 0000 0000 0000"            /* ...âO.Â蟰...... */
+	$"0000 FFFF FFFF 0000 0920 0000 0000 0000"            /* ..ÿÿÿÿ..Æ ...... */
+	$"0000 0000 0000 0000 0003 6D62 7700 0010"            /* ..........mbw... */
+	$"0008 0000 C136 0987 0000 0011 0008 0000"            /* ....Á6Ƈ........ */
+	$"C2E9 0220 0000 0001 0000 0002 0010 6D62"            /* Âé. ..........mb */
+	$"773A 4170 706C 6963 6174 696F 6E73 000E"            /* w:Applications.. */
+	$"001A 000C 0041 0070 0070 006C 0069 0063"            /* .....A.p.p.l.i.c */
+	$"0061 0074 0069 006F 006E 0073 000F 0008"            /* .a.t.i.o.n.s.... */
+	$"0003 006D 0062 0077 0012 000C 4170 706C"            /* ...m.b.w....Appl */
+	$"6963 6174 696F 6E73 0013 0001 2F00 FFFF"            /* ications..../.ÿÿ */
+	$"0000"                                               /* .. */
+};
+
+
+data 'icns' (-16455) {
+	$"6963 6E73 0001 B3AC 6973 3332 0000 0224"            /* icns..³¬is32...$ */
+	$"9F00 005F 8061 005D 8700 055D 9AA2 A0A4"            /* Ÿ.._€a.]‡..]š¢ ¤ */
+	$"8986 0008 557D B3B2 B1B3 A881 8081 8104"            /* ‰†..U}³²±³¨�€��. */
+	$"826F 577E AF82 A801 B3AE 82AD 03AF 7B7A"            /* ‚oW~¯‚¨.³®‚­.¯{z */
+	$"A781 A203 9EB7 C89D 81A2 03A6 776E 9A80"            /* §�¢.ž·È��¢.¦wnš€ */
+	$"9705 959F D3DC A295 8097 5899 6C67 8F8D"            /* —.•ŸÓÜ¢•€—X™lg�� */
+	$"8E89 85C9 BCA9 C883 898D 8D8E 6561 8585"            /* Ž‰…ɼ©Èƒ‰��Žea…… */
+	$"83A8 B7F3 BAB4 DFB6 AA84 8585 605E 7B7D"            /* ƒ¨·óº´ß¶ª„……`^{} */
+	$"79D0 F9E0 F0F2 DAE1 D87C 7D7B 5D5B 7476"            /* yÐùàðòÚáØ|}{][tv */
+	$"7099 D876 7373 76CA 8A72 7673 5B5A 6D70"            /* p™ØvssvÊŠrvs[Zmp */
+	$"6B9B 816C 6F6F 67B3 C567 706C 5A59 686B"            /* k›�loog³ÅgplZYhk */
+	$"6B67 686B 806A 056B 6F6A 6B67 5A88 5900"            /* kghk€j.kojkgZˆY. */
+	$"5882 598A 5801 0059 9F00 0482 8383 8480"            /* X‚YŠX..YŸ..‚ƒƒ„€ */
+	$"8700 057F B7BE BDC0 A786 0008 799E D0CE"            /* ‡...·¾½À§†..yžÐÎ */
+	$"CECF C5A1 A081 A105 A390 7AA0 D0CA 80C9"            /* ÎÏÅ¡ �¡.£�z ÐÊ€É */
+	$"01CA D183 CE03 D09C 9ECD 81C9 03C7 D4DE"            /* .ÊуÎ.ÐœžÍ�É.ÇÔÞ */
+	$"C681 C903 CD9A 94C5 80C2 05C1 C6E3 E9C8"            /* Æ�É.Íš”Å€Â.ÁÆãéÈ */
+	$"C180 C20D C491 8DBD BBBC B9B6 DDD7 CCDD"            /* Á€Â.Ä‘�½»¼¹¶Ý×ÌÝ */
+	$"B5B9 80BC 468B 87B4 B4B3 C8D1 F7D3 CFEA"            /* µ¹€¼F‹‡´´³ÈÑ÷ÓÏê */
+	$"D0C9 B4B4 B385 83AA ABA9 E0FB EAF5 F6E5"            /* ÐÉ´´³…ƒª«©àûêõöå */
+	$"EAE5 AAAB A981 80A0 A39E BAE4 A2A0 A1A2"            /* ê媫©�€ £žºä¢ ¡¢ */
+	$"DAAF 9FA3 9F7F 7E97 9B97 B8A6 979A 9A94"            /* Ú¯Ÿ£Ÿ.~—›—¸¦—šš” */
+	$"CAD6 949B 977D 7D90 9493 9091 8293 0496"            /* ÊÖ”›—}}�”“�‘‚“.– */
+	$"9294 907D 8E7C 8A7B 0100 7C9F 0000 7A80"            /* ’”�}Ž|Š{..|Ÿ..z€ */
+	$"7C00 7887 0005 77B1 B8B7 BBA0 8600 0871"            /* |.x‡..w±¸·» †..q */
+	$"97CB C9C8 CAC0 9B99 819A 049C 8972 99CA"            /* —ËÉÈÊÀ›™�š.œ‰r™Ê */
+	$"82C3 00CB 83C8 03CA 9596 C681 C203 BFCF"            /* ‚Ã.˃È.Ê•–Æ�Â.¿Ï */
+	$"DABF 81C2 03C6 938C BD80 BA05 B9BF E0E7"            /* Ú¿�Â.Æ“Œ½€º.¹¿àç */
+	$"C1B9 80BA 57BC 8985 B5B3 B3B0 ADD9 D2C6"            /* Á¹€ºW¼‰…µ³³°­ÙÒÆ */
+	$"D9AC B0B3 B3B4 827F ACAB AAC2 CCF6 CECA"            /* Ù¬°³³´‚.¬«ªÂÌöÎÊ */
+	$"E8CB C3AB ACAA 7D7B A1A3 A0DD FAE9 F4F5"            /* èË묪}{¡£ Ýúéôõ */
+	$"E3E8 E3A2 A3A0 7A78 989B 96B3 E29A 9898"            /* ãè㢣 zx˜›–³âš˜˜ */
+	$"9AD7 A897 9B97 7776 8F93 8FB2 9F8F 9292"            /* š×¨—›—wv�“�²Ÿ�’’ */
+	$"8BC5 D28C 938F 7575 888C 8B89 8982 8B04"            /* ‹ÅÒŒ“�uuˆŒ‹‰‰‚‹. */
+	$"8F8A 8C88 758E 748A 7301 0074 7338 6D6B"            /* �ŠŒˆuŽtŠs..ts8mk */
+	$"0000 0108 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 1E24 2424 1600 0000 0000"            /* .......$$$...... */
+	$"0000 0000 0011 BDC8 C8C8 9600 0000 0000"            /* ......½ÈÈÈ–..... */
+	$"0000 0000 048C FFFF FFFF F5A7 9C9E 9E9E"            /* .....Œÿÿÿÿõ§œžžž */
+	$"9E9E 6003 8AFF FCFC FCFC FEFF FFFF FFFF"            /* žž`.Šÿüüüüþÿÿÿÿÿ */
+	$"FFFF FF7A 89FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿz‰ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF7A 73FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿzsÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF64 62FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿdbÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF53 53FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿSSÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF45 48FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿEHÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF3C 41FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿ<Aÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FD35 3DFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿý5=ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FA30 3CFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿú0<ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FB2F 1247 4B4A 4A4A 4A4A 4A4A 4A4A"            /* ÿÿû/.GKJJJJJJJJJ */
+	$"4A4B 450F 0101 0201 0101 0101 0101 0101"            /* JKE............. */
+	$"0102 0001 696C 3332 0000 05AB FF00 BE00"            /* ....il32...«ÿ.¾. */
+	$"025A 7881 847F 0064 9200 0262 BBC4 83C2"            /* .Zx�„..d’..b»ÄƒÂ */
+	$"02C7 8451 9000 0255 86BF 84BC 03BF A064"            /* .Ç„Q�..U†¿„¼.¿ d */
+	$"6389 6400 6281 0003 5770 A2A2 85A1 01A3"            /* c‰d.b�..Wp¢¢…¡.£ */
+	$"9D89 9B07 9C97 6758 005B 95AC 88A7 02A8"            /* �‰›.œ—gX.[•¬ˆ§.¨ */
+	$"A4A7 89A8 05AB 925A 61A7 AE88 AC03 ABCA"            /* ¤§‰¨.«’Za§®ˆ¬.«Ê */
+	$"AEAB 88AC 05AE A15E 5B9A A788 A503 A0D7"            /* ®«ˆ¬.®¡^[š§ˆ¥. × */
+	$"D79F 88A5 05A8 9559 5990 A288 9F04 9BAB"            /* ןˆ¥.¨•YY�¢ˆŸ.›« */
+	$"FBAE 9C87 9F05 A28B 5857 879D 879A 0595"            /* û®œ‡Ÿ.¢‹XW‡�‡š.• */
+	$"BDD6 E6E3 9487 9A05 9D82 5656 7F97 8594"            /* ½Öæ㔇š.�‚VV.—…” */
+	$"0995 8FB3 F4CF B1FF AD90 9585 9405 977A"            /* Æ•�³ôϱÿ­�•…”.—z */
+	$"0000 7793 8690 078D CDF8 B886 E8E5 8B86"            /* ..w“†�.�Íø¸†è勆 */
+	$"9005 9372 0000 708F 828C 808B 0984 BBF7"            /* �.“r..p�‚Œ€‹Æ„»÷ */
+	$"C687 85AB FFA9 8580 8B82 8C05 8E6D 0000"            /* Ƈ…«ÿ©…€‹‚Œ.Žm.. */
+	$"6B8A 8287 0D88 8785 8FF3 FDA1 8186 84E5"            /* kŠ‚‡.ˆ‡…�óý¡�†„å */
+	$"E484 8684 8705 8868 0000 6685 8183 117E"            /* 䄆„‡.ˆh..f…�ƒ.~ */
+	$"B3E3 D0D2 FFDC D4DF DDDB D2FD D0DE E2B7"            /* ³ãÐÒÿÜÔßÝÛÒýÐÞâ· */
+	$"8082 8304 6400 0062 8081 7F06 76C5 FFDB"            /* €‚ƒ.d..b€�..vÅÿÛ */
+	$"F9F3 E381 FF06 F6D4 BFF4 FFD3 7882 7F03"            /* ùóã�ÿ.öÔ¿ôÿÓx‚.. */
+	$"6100 005F 827B 0675 B0D9 E1FF C8D8 82DF"            /* a.._‚{.u°ÙáÿÈØ‚ß */
+	$"05BF F3C9 DCB9 7681 7B04 7A5E 0000 5C82"            /* .¿óÉܹv�{.z^..\‚ */
+	$"7706 786F 96FF E879 7281 7306 7278 C8C2"            /* w.xo–ÿèyr�s.rxÈÂ */
+	$"7074 7880 7706 7875 5C00 005A 7382 7405"            /* ptx€w.xu\..Zs‚t. */
+	$"71C1 E19A 6D74 8173 0574 6BA2 FFAD 6C81"            /* qÁášmt�s.tk¢ÿ­l� */
+	$"7406 7571 5B00 005A 6F81 7104 6F77 F2AF"            /* t.uq[..Zo�q.owò¯ */
+	$"6984 7105 6E7E FAFB 836D 8071 0772 6D5A"            /* i„q.n~úûƒm€q.rmZ */
+	$"0000 586C 6F80 6E03 6C7B 9368 866E 0467"            /* ..Xlo€n.l{“h†n.g */
+	$"C3FA 8B69 806E 076F 6A59 0000 586A 6E81"            /* Ãú‹i€n.ojY..Xjn� */
+	$"6D01 6C68 876D 036B 717D 6B81 6D07 6E69"            /* m.lh‡m.kq}k�m.ni */
+	$"5900 0058 666A 8E69 0168 6682 6903 6A65"            /* Y..XfjŽi.hf‚i.je */
+	$"5900 BD59 0000 9B59 9E00 FF00 BE00 027D"            /* Y.½Y..›Yž.ÿ.¾..} */
+	$"98A0 829E 029F 9E85 9200 0284 D5DE 83DC"            /* ˜ ‚ž.Ÿž…’..„ÕÞƒÜ */
+	$"02E0 A275 9000 0279 A7DB 84D8 03DB BD87"            /* .à¢u�..y§Û„Ø.Û½‡ */
+	$"8689 8700 8581 0003 7A92 C0C0 85BF 01C0"            /* †‰‡.…�..z’ÀÀ…¿.À */
+	$"BB89 B907 BAB4 887B 007E B7CC 88C7 01C8"            /* »‰¹.º´ˆ{.~·ÌˆÇ.È */
+	$"C68A C805 CBB2 7C84 CAD1 89CF 02DE CFCE"            /* ÆŠÈ.˲|„ÊщÏ.ÞÏÎ */
+	$"88CF 05D2 C380 7FBF CC88 CA03 C7E8 E5C6"            /* ˆÏ.ÒÀ.¿ÌˆÊ.ÇèåÆ */
+	$"88CA 05CD B87C 7CB7 CA88 C704 C4CD FCCD"            /* ˆÊ.͸||·ÊˆÇ.ÄÍüÍ */
+	$"C587 C705 CAB0 7A7A AFC7 87C4 05C1 D4E3"            /* ŇÇ.Ê°zz¯Ç‡Ä.ÁÔã */
+	$"F0ED C087 C405 C8A8 7979 A7C4 85C0 09C1"            /* ðíÀ‡Ä.Ȩyy§Ä…ÀÆÁ */
+	$"BDD0 F7E1 D1FF CDBE C185 C005 C4A1 0000"            /* ½Ð÷áÑÿ;Á…À.Ä¡.. */
+	$"A0C1 86BD 07BA DEFB D5B7 F2EE B986 BD05"            /*  Á†½.ºÞûÕ·ò½. */
+	$"C09A 0000 9ABE 85BA 09B6 D4F9 DBB8 B6CD"            /* Àš..š¾…ºÆ¶ÔùÛ¸¶Í */
+	$"FFCA B785 BA05 BD94 0000 94B9 83B6 0EB4"            /* ÿÊ·…º.½”..”¹ƒ¶.´ */
+	$"B3B9 F7FE C4B0 B4B2 EFED B2B4 B4B5 82B6"            /* ³¹÷þÄ°´²ïí²´´µ‚¶ */
+	$"05B8 8F00 008E B481 B211 AFCD EBDF E0FF"            /* .¸�..Ž´�².¯Íëßàÿ */
+	$"E8E2 E9E8 E6E0 FEDF E8EA D0B0 81B2 05B3"            /* èâéèæàþßèêа�².³ */
+	$"8A00 0089 AF81 AD06 A8D9 FFE7 FBF7 EB81"            /* Š..‰¯�­.¨Ùÿçû÷ë� */
+	$"FF06 F9E1 D3F8 FFE3 A980 AD05 AEAD 8600"            /* ÿ.ùáÓøÿã©€­.®­†. */
+	$"0086 82A9 06A5 CBE5 EAFF DAE5 82EA 05D3"            /* .†‚©.¥ËåêÿÚå‚ê.Ó */
+	$"F7DA E8D1 A680 A906 AAA7 8300 0082 A382"            /* ÷ÚèѦ€©.ª§ƒ..‚£‚ */
+	$"A405 9FB7 FFF0 A5A1 81A2 05A1 A5D9 D39F"            /* ¤.Ÿ·ÿð¥¡�¢.¡¥ÙÓŸ */
+	$"A281 A406 A5A1 8000 0080 9F82 A004 9ED2"            /* ¢�¤.¥¡€..€Ÿ‚ .žÒ */
+	$"E9BA 9B83 A004 9ABF FFC5 9A81 A007 A19C"            /* 麛ƒ .š¿ÿÅš� .¡œ */
+	$"7F00 007E 999D 809B 059A 9FF6 C696 9C83"            /* ...~™�€›.šŸöÆ–œƒ */
+	$"9B05 99A4 FBFB A799 809B 079C 977D 0000"            /* ›.™¤ûû§™€›.œ—}.. */
+	$"7C95 9980 9803 97A1 B295 8698 0494 D5FC"            /* |•™€˜.—¡²•†˜.”Õü */
+	$"AC95 8098 0799 937C 0000 7C93 9782 9600"            /* ¬•€˜.™“|..|“—‚–. */
+	$"9387 9603 9599 A295 8196 0797 917C 0000"            /* “‡–.•™¢•�–.—‘|.. */
+	$"7B8E 928D 9102 9290 8F82 9103 928C 7B00"            /* {Ž’�‘.’��‚‘.’Œ{. */
+	$"BD7C 0000 9B7C 9E00 FF00 BE00 0275 9199"            /* ½|..›|ž.ÿ.¾..u‘™ */
+	$"8498 007E 9200 027D D0D9 83D7 02DB 9B6C"            /* „˜.~’..}ÐÙƒ×.Û›l */
+	$"9000 0271 A0D5 84D2 03D5 B67F 7E89 7F00"            /* �..q Õ„Ò.Õ¶.~‰.. */
+	$"7D81 0003 728B BBBB 85BA 02BB B6B3 88B4"            /* }�..r‹»»…º.»¶³ˆ´ */
+	$"08B5 AF81 7300 76B0 C6C2 87C1 01C2 C089"            /* .µ¯�s.v°Æ‡Á.ÂÀ‰ */
+	$"C206 C3C5 AB75 7CC3 CA89 C801 DBC9 89C8"            /* Â.ÃÅ«u|ÃʉÈ.ÛÉ‰È */
+	$"05CB BD78 77B9 C588 C304 C0E5 E2BF C487"            /* .˽xw¹ÅˆÃ.Àåâ¿Ä‡ */
+	$"C305 C6B2 7574 B0C3 87C0 05BF BCC7 FCC7"            /* Ã.Ʋut°Ã‡À.¿¼ÇüÇ */
+	$"BE87 C005 C3A9 7272 A7BF 87BC 05B9 D0E1"            /* ¾‡À.érr§¿‡¼.¹Ðá */
+	$"EEEB B887 BC05 C0A1 7171 A0BC 86B8 07B5"            /* î븇¼.À¡qq ¼†¸.µ */
+	$"CBF6 DDCB FFC7 B586 B805 BB99 0000 98B9"            /* ËöÝËÿǵ†¸.»™..˜¹ */
+	$"86B5 07B2 DBFA D0AE F0EC B186 B505 B892"            /* †µ.²ÛúЮð챆µ.¸’ */
+	$"0000 91B5 82B2 80B1 09AC D0F9 D7AF ADC7"            /* ..‘µ‚²€±Æ¬Ðùׯ­Ç */
+	$"FFC4 AD80 B182 B205 B48C 0000 8BB1 81AD"            /* ÿÄ­€±‚².´Œ..‹±�­ */
+	$"11AE ADAC ABB1 F6FD BDA8 ABAA EDEB A9AB"            /* .®­¬«±öý½¨«ªíë©« */
+	$"ACAC AE81 AD05 AF87 0000 86AB 81A9 11A6"            /* ¬¬®�­.¯‡..†«�©.¦ */
+	$"C8E9 DCDE FFE5 DFE7 E6E4 DDFE DCE6 E9CB"            /* ÈéÜÞÿåßçæäÝþÜæéË */
+	$"A781 A905 AA82 0000 81A6 81A5 069F D6FF"            /* §�©.ª‚..�¦�¥.ŸÖÿ */
+	$"E4FA F6EA 81FF 06F8 DFCF F7FF E0A0 80A5"            /* äúöê�ÿ.øßÏ÷ÿà €¥ */
+	$"05A6 A47E 0000 7D82 A006 9BC6 E3E8 FFD6"            /* .¦¤~..}‚ .›ÆãèÿÖ */
+	$"E282 E805 CFF6 D7E6 CC9C 80A0 06A1 9E7B"            /* â‚è.Ïö×æÌœ€ .¡ž{ */
+	$"0000 7A9B 829C 0496 B1FF EF9D 8399 049C"            /* ..z›‚œ.–±ÿï�ƒ™.œ */
+	$"D6D0 969A 819C 069D 9979 0000 7897 8198"            /* ÖЖš�œ.�™y..x—�˜ */
+	$"0597 95CF E7B4 9283 9704 91BA FFC0 9181"            /* .—•Ïç´’ƒ—.‘ºÿÀ‘� */
+	$"9807 9994 7700 0076 9295 8094 0493 98F5"            /* ˜.™”w..v’•€”.“˜õ */
+	$"C28E 8494 0592 9DFB FBA0 9180 9407 958F"            /* ÂŽ„”.’�ûû ‘€”.•� */
+	$"7500 0074 8E91 8090 038F 9AAC 8C86 9004"            /* u..tŽ‘€�.�š¬Œ†�. */
+	$"8BD1 FBA6 8C80 9007 918B 7400 0074 8B8F"            /* ‹Ñû¦Œ€�.‘‹t..t‹� */
+	$"808E 048F 8E8B 8E8F 848E 048F 8D91 9B8D"            /* €Ž.�Ž‹Ž�„Ž.��‘›� */
+	$"818E 078F 8974 0000 7487 8B8E 8A01 8987"            /* �Ž.�‰t..t‡‹ŽŠ.‰‡ */
+	$"828A 038B 8574 00BD 7400 009B 749E 006C"            /* ‚Š.‹…t.½t..›tž.l */
+	$"386D 6B00 0004 0800 0000 0000 0000 0000"            /* 8mk............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0B76 8889 8989"            /* ...........vˆ‰‰‰ */
+	$"8989 8988 3800 0000 0000 0000 0000 0000"            /* ‰‰‰ˆ8........... */
+	$"0000 0000 0000 0000 0000 36FF FFFF FFFF"            /* ..........6ÿÿÿÿÿ */
+	$"FFFF FFFF A301 0000 0000 0000 0000 0000"            /* ÿÿÿÿ£........... */
+	$"0000 0000 0000 0000 0006 A4FF FFFF FFFF"            /* ..........¤ÿÿÿÿÿ */
+	$"FFFF FFFF DE59 3F40 4040 4040 4040 4040"            /* ÿÿÿÿÞY?@@@@@@@@@ */
+	$"4040 4033 0000 0000 1384 F8F3 F3F3 F3F3"            /* @@@3.....„øóóóóó */
+	$"F3F3 F3F3 F7F9 F7F7 F7F7 F7F7 F7F7 F7F7"            /* óóóó÷ù÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F1 520D 001D E1FF FAFB FBFB FBFB"            /* ÷÷÷ñR...áÿúûûûûû */
+	$"FBFB FBFB FBFB FBFB FBFB FBFB FBFB FBFB"            /* ûûûûûûûûûûûûûûûû */
+	$"FBFB FBFB FFCD 0E39 FFFF FFFF FFFF FFFF"            /* ûûûûÿÍ.9ÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 1F26 F6FF FFFF FFFF FFFF"            /* ÿÿÿÿÿø.&öÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE5 1318 ECFF FFFF FFFF FFFF"            /* ÿÿÿÿÿå..ìÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD5 0A0F DDFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÕÂ.Ýÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC6 0206 D0FF FFFF FFFF FFFF"            /* ÿÿÿÿÿÆ..Ðÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB6 0000 C2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¶..Âÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 0000 B2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¥..²ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF95 0000 A4FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ•..¤ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF87 0000 96FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ‡..–ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF7A 0000 8AFF FFFF FFFF FFFF"            /* ÿÿÿÿÿz..Šÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6D 0000 7FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿm...ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF63 0000 77FF FFFF FFFF FFFF"            /* ÿÿÿÿÿc..wÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5A 0000 6FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿZ..oÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF54 0000 69FF FFFF FFFF FFFF"            /* ÿÿÿÿÿT..iÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4F 0000 65FF FFFF FFFF FFFF"            /* ÿÿÿÿÿO..eÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4C 0000 64FF FFFF FFFF FFFF"            /* ÿÿÿÿÿL..dÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4B 0000 61FF FFFF FFFF FFFF"            /* ÿÿÿÿÿK..aÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF48 0004 2C6D 7574 7474 7474"            /* ÿÿÿÿÿH..,muttttt */
+	$"7474 7474 7474 7474 7474 7474 7474 7474"            /* tttttttttttttttt */
+	$"7474 7475 6824 0202 0D18 1C1C 1C1C 1C1C"            /* tttuh$.......... */
+	$"1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C"            /* ................ */
+	$"1C1C 1C1C 170C 0100 0103 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0301 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0069 6833 3200 0009 DEFF"            /* .......ih32..ÆÞÿ */
+	$"00FF 00FF 00AD 0001 5E66 8865 0261 5859"            /* .ÿ.ÿ.­..^fˆe.aXY */
+	$"9C00 025E A6BA 87B7 04B9 AE67 5659 9B00"            /* œ..^¦º‡·.¹®gVY›. */
+	$"0266 BABF 87BE 04BF BC70 5459 9A00 0252"            /* .fº¿‡¾.¿¼pTYš..R */
+	$"81BD 89BA 03BC 8652 5491 5585 0003 5580"            /* �½‰º.¼†RT‘U…..U€ */
+	$"B7BA 89B9 02BA B497 918F 0191 7683 0003"            /* ·º‰¹.º´—‘�.‘vƒ.. */
+	$"5864 9399 8B97 0098 929B 039D 855F 5A80"            /* Xd“™‹—.˜’›.�…_Z€ */
+	$"0002 649D A990 A500 A490 A509 A6A9 9B65"            /* ..d�©�¥.¤�¥Æ¦©›e */
+	$"0000 85B4 AFAF 8EAE 03B0 AEAC AF8E AE07"            /* ..…´¯¯Ž®.°®¬¯Ž®. */
+	$"AFAF B280 0000 80AD 8FA9 04A8 B2E7 ACA8"            /* ¯¯²€..€­�©.¨²ç¬¨ */
+	$"90A9 05AB 7A00 0076 A98F A604 A5A4 F1E0"            /* �©.«z..v©�¦.¥¤ñà */
+	$"A08F A606 A7A6 7100 006D A390 A204 9DC8"            /*  �¦.§¦q..m£�¢.�È */
+	$"FFB9 9C8E A207 A3A0 6A00 0065 9D9F 8D9E"            /* ÿ¹œŽ¢.£ j..e�Ÿ�ž */
+	$"069F 9C96 A2FA EF9C 8E9E 079F 9A65 0000"            /* .Ÿœ–¢úž.Ÿše.. */
+	$"6097 9C8D 9B07 97A5 E2C6 D2FF C394 8D9B"            /* `—œ�›.—¥âÆÒÿÔ�› */
+	$"079C 9461 0000 5E90 988C 9709 959A D5CE"            /* .œ”a..^�˜Œ—Æ•šÕÎ */
+	$"E4B2 FCF4 9A95 8C97 0799 8D5E 0000 5A8B"            /* ä²üôš•Œ—.™�^..Z‹ */
+	$"968C 9409 8EC8 FFF6 C18D DDFF C78C 8C94"            /* –Œ”ÆŽÈÿöÁ�ÝÿÇŒŒ” */
+	$"0796 875B 0000 5885 938B 910B 8F8F E5FF"            /* .–‡[..X…“‹‘.��åÿ */
+	$"FFA9 87AA FFF7 988E 8B91 0793 8159 0000"            /* ÿ©‡ªÿ÷˜Ž‹‘.“�Y.. */
+	$"577F 908B 8E0B 87CF D4D0 CA89 8D8B E0FF"            /* W.�‹Ž.‡ÏÔÐʉ�‹àÿ */
+	$"C786 8B8E 0790 7B58 0000 5779 8C86 8A81"            /* dž‹Ž.�{X..WyŒ†Š� */
+	$"8B0D 84A5 FFFF E38B 898B 85A8 FFF8 9387"            /* ‹.„¥ÿÿ㋉‹…¨ÿø“‡ */
+	$"818B 868A 078C 7557 0000 5674 8A85 8800"            /* �‹†Š.ŒuW..VtŠ…ˆ. */
+	$"8680 820E 8385 E4FF FFB9 7C83 8381 7FDD"            /* †€‚.ƒ…äÿÿ¹|ƒƒ�.Ý */
+	$"FFC6 7E81 8200 8585 8807 8A71 5759 0056"            /* ÿÆ~�‚.……ˆ.ŠqWY.V */
+	$"6F87 8485 1983 929F A3A0 94B0 FFFF E39D"            /* o‡„….ƒ’Ÿ£ ”°ÿÿã� */
+	$"9F9E 9DA3 9AB0 FBF4 98A0 A09F A192 8484"            /* Ÿž�£š°ûô˜  Ÿ¡’„„ */
+	$"8507 876D 5759 0056 6984 8482 197C A7EB"            /* ….‡mWY.Vi„„‚.|§ë */
+	$"FBF1 C2EC FFFB C1ED F2F6 ECFB EDD9 DBFF"            /* ûñÂìÿûÁíòöìûíÙÛÿ */
+	$"D4EE F0F6 F6B7 7C84 8207 8369 5700 5956"            /* Ôîðöö·|„‚.ƒiW.YV */
+	$"6481 847F 0979 A3FF FFEB CCFF FFD5 E084"            /* d�„.Æy£ÿÿëÌÿÿÕà„ */
+	$"FF03 C8F1 BCC4 80FF 01C0 7785 7F06 6557"            /* ÿ.Èñ¼Ä€ÿ.Àw…..eW */
+	$"5959 5661 7E84 7D08 76A3 FFFF C3F4 FFF5"            /* YYVa~„}.v£ÿÿÃôÿõ */
+	$"CB85 FF08 EDA8 CCC0 F2FF FFC1 7485 7D06"            /* Ë…ÿ.í¨ÌÀòÿÿÁt…}. */
+	$"6358 5959 575E 7B84 7A09 7692 D0BE D6FF"            /* cXYYW^{„zÆv’оÖÿ */
+	$"FFC2 B9D0 84CF 08CD B9FF F1B1 CED0 A574"            /* ÿ¹ЄÏ.͹ÿñ±ÎÐ¥t */
+	$"847A 0679 6058 5959 585D 8678 0776 6A9C"            /* „z.y`XYYX]†x.vjœ */
+	$"FFFF F081 7086 7106 75D1 D89D 6A71 7484"            /* ÿÿð�p†q.uÑØ�jqt„ */
+	$"7808 7976 5E58 5959 585B 7486 7505 73B9"            /* x.yv^XYYX[t†u.s¹ */
+	$"F5FF AC6D 8775 0570 8CEB F889 6F85 7508"            /* õÿ¬m‡u.pŒëø‰o…u. */
+	$"7672 5C58 5959 5859 7285 7306 6F8A E1C6"            /* vr\XYYXYr…s.oŠáÆ */
+	$"C176 7287 7306 7179 EEFF E173 7184 7308"            /* Ávr‡s.qyîÿásq„s. */
+	$"7470 5B58 5959 5859 7085 7205 6B97 FFE7"            /* tp[XYYXYp…r.k—ÿç */
+	$"776E 8972 0569 C6FF FFB4 6A84 7202 736E"            /* wn‰r.iÆÿÿ´j„r.sn */
+	$"5A81 5901 586D 856F 0567 B9D9 786B 7089"            /* Z�Y.Xm…o.g¹Ùxkp‰ */
+	$"6F06 6993 FFFF F173 6D83 6F01 706B 8259"            /* o.i“ÿÿñsmƒo.pk‚Y */
+	$"0157 6B85 6E03 6C8C 7269 8B6E 066D 6BD3"            /* .Wk…n.lŒri‹n.mkÓ */
+	$"FFCB 6C6D 836E 026F 6958 8159 0256 6A6E"            /* ÿËlmƒn.oiX�Y.Vjn */
+	$"856D 0169 6B8D 6D04 6A73 8A6D 6B84 6D02"            /* …m.ik�m.jsŠmk„m. */
+	$"6E68 5881 5902 566A 6E98 6D02 6B67 6C85"            /* nhX�Y.Vjn˜m.kgl… */
+	$"6D02 6E68 5881 5902 5665 69A3 6802 6963"            /* m.nhX�Y.Vei£h.ic */
+	$"5881 5901 5858 A559 0058 B059 0000 AB59"            /* X�Y.XX¥Y.X°Y..«Y */
+	$"8000 A959 DF00 FF00 FF00 FF00 AD00 0081"            /* €.©Yß.ÿ.ÿ.ÿ.­..� */
+	$"8987 0283 7B7C 9C00 0280 C1D3 87D1 04D2"            /* ‰‡.ƒ{|œ..€ÁÓ‡Ñ.Ò */
+	$"C787 7A7C 9B00 0288 D4DA 87D9 04DA D68F"            /* LJz|›..ˆÔÚ‡Ù.ÚÖ� */
+	$"787C 9A00 0276 A2D8 89D6 02D7 A476 9278"            /* x|š..v¢Ø‰Ö.פv’x */
+	$"8500 0379 A2D3 D789 D503 D6D0 B5AD 90AE"            /* …..y¢Ó׉Õ.Öе­�® */
+	$"01B0 9683 0003 7C87 B1B7 8BB5 00B6 92B9"            /* .°–ƒ..|‡±·‹µ.¶’¹ */
+	$"03BA A282 7D80 0003 87BD C8C5 90C4 00C5"            /* .º¢‚}€..‡½ÈÅ�Ä.Å */
+	$"8FC4 08C5 C8B9 8700 00A7 D6D1 90D0 01CD"            /* �Ä.Åȹ‡..§ÖÑ�Ð.Í */
+	$"CF90 D006 D1D3 A000 00A3 D18F CD04 CCD1"            /* Ï�Ð.ÑÓ ..£Ñ�Í.ÌÑ */
+	$"EECC CC90 CD05 CF9B 0000 9ACE 90CB 03CA"            /* îÌÌ�Í.Ï›..šÎ�Ë.Ê */
+	$"F7E9 C68F CB07 CCCB 9300 0091 C9C9 8FC8"            /* ÷éÆ�Ë.ÌË“..‘ÉÉ�È */
+	$"04C6 DFFF D2C5 8EC8 07C9 C68D 0000 8BC5"            /* .ÆßÿÒÅŽÈ.ÉÆ�..‹Å */
+	$"C78D C606 C7C5 BFC7 FDF3 C38E C607 C7C0"            /* Ç�Æ.ÇÅ¿ÇýóÃŽÆ.ÇÀ */
+	$"8800 0086 C0C5 8DC4 07C2 C7EB DAE4 FFD9"            /* ˆ..†ÀÅ�Ä.ÂÇëÚäÿÙ */
+	$"C08D C407 C6BC 8400 0082 BBC4 8CC2 09C1"            /* À�Ä.Ƽ„..‚»ÄŒÂÆÁ */
+	$"C2E2 DEED D1FD F7C1 C18C C207 C4B6 8100"            /* ÂâÞíÑý÷ÁÁŒÂ.Ķ�. */
+	$"007F B5C2 8CC0 09BC DBFF F8D7 BBEA FFDB"            /* ..µÂŒÀƼÛÿø×»êÿÛ */
+	$"BA8C C007 C2B0 7E00 007C B0C0 8BBE 0BBD"            /* ºŒÀ.°~..|°À‹¾.½ */
+	$"BAED FFFF CCB8 CCFF F9BF BC8B BE07 C0AA"            /* ºíÿÿ̸Ìÿù¿¼‹¾.Àª */
+	$"7C00 007B ABBF 8BBC 0BB7 DEE1 DFDF B9BB"            /* |..{«¿‹¼.·Þáßß¹» */
+	$"BAED FFDA B78B BC07 BFA5 7B00 007A A5BC"            /* ºíÿÚ·‹¼.¿¥{..z¥¼ */
+	$"89B9 0EBA B6C6 FFFF ECB9 B9BA B6CB FFFA"            /* ‰¹.º¶Æÿÿì¹¹º¶Ëÿú */
+	$"BCB8 8AB9 07BC 9F7A 0000 799F B984 B601"            /* ¼¸Š¹.¼Ÿz..yŸ¹„¶. */
+	$"B7B5 82B3 0CEC FFFF D4AF B3B3 B2B1 EAFF"            /* ·µ‚³.ìÿÿÔ¯³³²±êÿ */
+	$"D9B0 81B3 01B5 B784 B607 B899 797C 0079"            /* Ù°�³.µ·„¶.¸™y|.y */
+	$"99B7 84B4 13B3 B9BE C1C0 B9CB FFFF EDBE"            /* ™·„´.³¹¾ÁÀ¹Ëÿÿí¾ */
+	$"BFBE BEC1 BCCB FCF7 BB80 BF02 C0B9 B384"            /* ¿¾¾Á¼Ëü÷»€¿.À¹³„ */
+	$"B407 B694 797C 0079 93B4 84B1 19AD C7F1"            /* ´.¶”y|.y“´„±.­Çñ */
+	$"FBF5 D6F1 FFFD D5F2 F5F8 F1FB F2E4 E7FF"            /* ûõÖñÿýÕòõøñûòäçÿ */
+	$"E2F3 F4F8 F8D0 AD84 B107 B290 7A00 7C79"            /* âóôøøЭ„±.²�z.|y */
+	$"8DB0 84AE 09AA C3FF FFF2 DCFF FFE2 E984"            /* �°„®ÆªÃÿÿòÜÿÿâé„ */
+	$"FF03 D9F6 D1D8 80FF 01D6 A985 AE06 8C7A"            /* ÿ.ÙöÑØ€ÿ.Ö©…®.Œz */
+	$"7C7C 7989 AD84 AB08 A7C3 FFFF D5F7 FFF8"            /* ||y‰­„«.§ÃÿÿÕ÷ÿø */
+	$"DA85 FF08 F2C2 DAD3 F6FF FFD7 A583 AB08"            /* Ú…ÿ.òÂÚÓöÿÿ×¥ƒ«. */
+	$"ACAA 897A 7C7C 7A86 A984 A809 A5B7 E0D3"            /* ¬ª‰z||z†©„¨Æ¥·àÓ */
+	$"E2FF FFD6 D0E0 84DF 08DD CFFF F5CB DFE0"            /* âÿÿÖÐà„ß.ÝÏÿõËßà */
+	$"C3A4 83A8 07A9 A686 7A7C 7C7A 8386 A506"            /* 䃨.©¦†z||zƒ†¥. */
+	$"A39B BAFF FFF5 AA87 A006 A3DF E2BA 9BA1"            /* £›ºÿÿõª‡ .£ß⺛¡ */
+	$"A284 A507 A6A2 837B 7C7C 7B82 87A2 059F"            /* ¢„¥.¦¢ƒ{||{‚‡¢.Ÿ */
+	$"CCF8 FFC7 9C87 A205 9EAF F0F9 AD9E 85A2"            /* ÌøÿÇœ‡¢.ž¯ðù­ž…¢ */
+	$"08A3 9F81 7B7C 7C7B 7F9D 859F 069C AEE8"            /* .£Ÿ�{||{.�…Ÿ.œ®è */
+	$"D4D3 A09E 879F 069D A3F4 FFE8 9D9E 849F"            /* ÔÓ ž‡Ÿ.�£ôÿè�ž„Ÿ */
+	$"09A0 9B7F 7B7C 7C7B 7E9A 9D84 9C05 98B5"            /* Æ ›.{||{~š�„œ.˜µ */
+	$"FFEE 9F99 899C 0596 D7FF FFC9 9684 9C09"            /* ÿ‰œ.–×ÿÿÉ–„œÆ */
+	$"9D97 7E7B 7C7C 7B7C 989B 849A 0494 CCE4"            /* �—~{||{|˜›„š.”Ìä */
+	$"A097 8A9A 0695 B3FF FFF4 9C99 839A 019B"            /*  —Šš.•³ÿÿôœ™ƒš.› */
+	$"9482 7C02 7B95 9984 9803 97AD 9B95 8B98"            /* ”‚|.{•™„˜.—­›•‹˜ */
+	$"0697 96E0 FFDA 9797 8398 0199 9282 7C02"            /* .—–àÿÚ——ƒ˜.™’‚|. */
+	$"7A93 9785 9601 9395 8D96 0494 9AAB 9695"            /* z“—…–.“•�–.”š«–• */
+	$"8496 0297 8F7B 817C 027A 9297 9896 0294"            /* „–.—�{�|.z’—˜–.” */
+	$"9295 8596 0297 8F7B 817C 027A 8C91 A390"            /* ’•…–.—�{�|.zŒ‘£� */
+	$"0291 897A 817C 017B 7BA5 7C00 7BB0 7C00"            /* .‘‰z�|.{{¥|.{°|. */
+	$"00AB 7C80 00A9 7CDF 00FF 00FF 00FF 00AD"            /* .«|€.©|ß.ÿ.ÿ.ÿ.­ */
+	$"0000 7A89 8002 7C73 749C 0002 79BC CE87"            /* ..z‰€.|stœ..y¼Î‡ */
+	$"CC04 CDC2 8172 749B 0002 80CF D587 D304"            /* Ì.ÍÂ�rt›..€ÏÕ‡Ó. */
+	$"D4D1 8870 749A 0002 6E9B D288 D003 D1D2"            /* Ôшptš..n›ÒˆÐ.ÑÒ */
+	$"9E6E 9270 8500 0371 9BCE D289 D002 D1CB"            /* žn’p…..q›ÎÒ‰Ð.ÑË */
+	$"AF91 A801 AA90 8300 0474 80AC B2AF 8AB0"            /* ¯‘¨.ª�ƒ..t€¬²¯Š° */
+	$"02B1 B3B4 90B3 03B5 9D7A 7580 0002 80B7"            /* .±³´�³.µ�zu€..€· */
+	$"C3A4 BF09 C0C3 B57F 0000 A0CF CACA 8DC9"            /* ä¿ÆÀõ... ÏÊÊ�É */
+	$"04CA CAC6 C8CA 8EC9 07CA CACD 9900 009C"            /* .ÊÊÆÈÊŽÉ.ÊÊÍ™..œ */
+	$"CA8F C604 C5CB EDC5 C58F C606 C7C8 9400"            /* Ê�Æ.ÅËíÅÅ�Æ.ÇÈ”. */
+	$"0093 C790 C403 C3F6 E7BF 8FC4 07C5 C48B"            /* .“Ç�Ä.Ãöç¿�Ä.ÅÄ‹ */
+	$"0000 8AC2 C28F C104 BEDA FFCE BE8E C107"            /* ..ŠÂÂ�Á.¾ÚÿξŽÁ. */
+	$"C2BF 8600 0083 BEC0 8DBF 06C0 BEB8 C1FC"            /* ¿†..ƒ¾À�¿.À¾¸Áü */
+	$"F3BC 8EBF 07C0 BA81 0000 7EB9 BE8D BD07"            /* 󼎿.Àº�..~¹¾�½. */
+	$"BAC0 E9D6 E1FF D5B8 8DBD 07BF B57C 0000"            /* ºÀéÖáÿÕ¸�½.¿µ|.. */
+	$"7AB3 BC8C BA09 B9BB DFDB EBCB FDF7 BAB9"            /* z³¼ŒºÆ¹»ßÛëËý÷º¹ */
+	$"8CBA 07BC AE79 0000 77AE B98C B709 B3D7"            /* Œº.¼®y..w®¹Œ·Æ³× */
+	$"FFF8 D3B2 E8FF D7B1 8CB7 07B9 A876 0000"            /* ÿøÓ²èÿ×±Œ·.¹¨v.. */
+	$"74A9 B78A B50C B6B5 B2EC FFFF C6AF C6FF"            /* t©·Šµ.¶µ²ìÿÿƯÆÿ */
+	$"F9B8 B48B B507 B7A3 7400 0073 A3B6 8BB3"            /* ù¸´‹µ.·£t..s£¶‹³ */
+	$"0BAE DBDE DDDB B0B3 B1EA FFD7 AE8B B307"            /* .®ÛÞÝÛ°³±êÿ×®‹³. */
+	$"B59D 7300 0072 9CB3 8AB0 04AD C0FF FFEA"            /* µ�s..rœ³Š°.­Àÿÿê */
+	$"80B0 05AD C4FF F9B4 AF8A B007 B397 7200"            /* €°.­Äÿù´¯Š°.³—r. */
+	$"0071 97B1 85AE 00AC 80AA 0EAB AAEA FFFF"            /* .q—±…®.¬€ª.«ªêÿÿ */
+	$"CFA6 AAAA A9A7 E7FF D5A7 81AA 00AC 85AE"            /* Ϧªª©§çÿÕ§�ª.¬…® */
+	$"07B0 9171 7400 7191 AE84 AB13 AAB2 B9BB"            /* .°‘qt.q‘®„«.ª²¹» */
+	$"BAB2 C6FF FFEB B7B9 B8B7 BBB6 C5FC F7B5"            /* º²Æÿÿë·¹¸·»¶Åü÷µ */
+	$"80B9 01BA B285 AB07 AD8C 7174 0070 8BAB"            /* €¹.º²…«.­Œqt.p‹« */
+	$"84A8 19A4 C1EF FBF4 D2F0 FFFC D1F1 F4F8"            /* „¨.¤ÁïûôÒðÿüÑñôø */
+	$"F0FB F1E2 E5FF DFF2 F3F8 F8CB A484 A807"            /* ðûñâåÿßòóøøˤ„¨. */
+	$"A988 7200 7471 85A7 84A5 09A1 BDFF FFF0"            /* ©ˆr.tq…§„¥Æ¡½ÿÿð */
+	$"D9FF FFE0 E784 FF03 D6F5 CDD4 80FF 01D2"            /* Ùÿÿàç„ÿ.ÖõÍÔ€ÿ.Ò */
+	$"9F85 A506 8472 7474 7181 A484 A208 9EBD"            /* Ÿ…¥.„rttq�¤„¢.ž½ */
+	$"FFFF D2F6 FFF7 D785 FF08 F1BD D8CF F6FF"            /* ÿÿÒöÿ÷×…ÿ.ñ½ØÏöÿ */
+	$"FFD3 9C83 A208 A3A2 8172 7474 727E A084"            /* ÿÓœƒ¢.£¢�rttr~ „ */
+	$"9F09 9CB0 DDCF DFFF FFD2 CCDD 84DC 08DA"            /* ŸÆœ°ÝÏßÿÿÒÌÝ„Ü.Ú */
+	$"CBFF F4C6 DCDD BE9B 839F 08A0 9E7E 7274"            /* ËÿôÆÜݾ›ƒŸ. ž~rt */
+	$"7472 7C9D 849C 089D 9B93 B5FF FFF4 A397"            /* tr|�„œ.�›“µÿÿô£— */
+	$"8598 0897 9BDD E0B4 9398 9A9D 839C 089D"            /* …˜.—›Ýà´“˜š�ƒœ.� */
+	$"9A7B 7374 7473 7998 8699 0597 C8F7 FFC1"            /* š{sttsy˜†™.—È÷ÿÁ */
+	$"9387 9905 96A9 EEF9 A695 8599 089A 9679"            /* “‡™.–©îù¦•…™.š–y */
+	$"7374 7473 7795 8596 0693 A7E6 D1D0 9895"            /* sttsw•…–.“§æÑИ• */
+	$"8796 0695 9BF3 FFE7 9595 8496 0897 9377"            /* ‡–.•›óÿç••„–.—“w */
+	$"7374 7473 7693 8595 058F B0FF ED98 9289"            /* sttsv“…•.�°ÿ혒‰ */
+	$"9505 8ED4 FFFF C58E 8495 0996 9076 7374"            /* •.ŽÔÿÿÅŽ„•Æ–�vst */
+	$"7473 7490 9384 9204 8BC8 E299 8F8A 9206"            /* tst�“„’.‹Èâ™�Š’. */
+	$"8DAD FFFF F494 9183 9202 938C 7581 7402"            /* �­ÿÿô”‘ƒ’.“Œu�t. */
+	$"738D 9184 9003 8EA7 938D 8B90 068F 8EDD"            /* s�‘„�.Ž§“�‹�.�ŽÝ */
+	$"FFD7 8E8F 8390 0191 8A82 7402 728B 8F85"            /* ÿ׎�ƒ�.‘Š‚t.r‹�… */
+	$"8E01 8B8D 8D8E 048C 93A4 8E8D 848E 028F"            /* Ž.‹��Ž.Œ“¤Ž�„Ž.� */
+	$"8773 8174 0272 8B8F 988E 028C 8A8D 858E"            /* ‡s�t.r‹�˜Ž.ŒŠ�…Ž */
+	$"028F 8773 8174 0272 8489 A388 0289 8173"            /* .�‡s�t.r„‰£ˆ.‰�s */
+	$"8174 0173 73A5 7400 73B0 7400 00AB 7480"            /* �t.ss¥t.s°t..«t€ */
+	$"00A9 74DF 0068 386D 6B00 0009 0800 0000"            /* .©tß.h8mk..Æ.... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 002E 4549 4A4A 4A4A 4A4A 4A4A 4A4A"            /* ....EIJJJJJJJJJJ */
+	$"3B0A 0400 0000 0000 0000 0000 0000 0000"            /* ;Â.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 2FF9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ../ùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FD52 0802 0000 0000 0000 0000 0000 0000"            /* ýR.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 4DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Mÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FF7E 1306 0000 0000 0000 0000 0000 0000"            /* ÿ~.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0002 ABFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..«ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFBB 2C11 0B0B 0B0B 0B0B 0B0B 0B0B 0B0B"            /* ÿ»,............. */
+	$"0B0B 0B0B 0B0B 0903 0000 0000 0000 0000"            /* ......Æ......... */
+	$"08B2 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .²ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF DFCC CCCC CCCC CCCC CCCC CCCC CCCC"            /* ÿÿßÌÌÌÌÌÌÌÌÌÌÌÌÌ */
+	$"CCCC CCCC CCCC CBC9 8000 0000 0000 0026"            /* ÌÌÌÌÌÌËÉ€......& */
+	$"71F2 EDEE EFEF EFEF EFEF EFEF EFEF EFEF"            /* qòíîïïïïïïïïïïïï */
+	$"EFEF F4F7 F7F7 F7F7 F7F7 F7F7 F7F7 F7F7"            /* ïïô÷÷÷÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F7 F7F7 F7F5 CE41 2000 0000 5EF7"            /* ÷÷÷÷÷÷÷õÎA ...^÷ */
+	$"FFF8 F8F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ÿøøùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F8 FAFF EE41 0000 C4FF"            /* ùùùùùùùøúÿîA..Äÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFA1 0000 B6FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ¡..¶ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF91 0000 A2FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ‘..¢ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF7A 0000 8FFF"            /* ÿÿÿÿÿÿÿÿÿÿÿz..�ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF68 0000 79FF"            /* ÿÿÿÿÿÿÿÿÿÿÿh..yÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF57 0000 5EFF"            /* ÿÿÿÿÿÿÿÿÿÿÿW..^ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF48 0000 4BFF"            /* ÿÿÿÿÿÿÿÿÿÿÿH..Kÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FD3B 0000 3FFE"            /* ÿÿÿÿÿÿÿÿÿÿý;..?þ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF F62F 0000 33F8"            /* ÿÿÿÿÿÿÿÿÿÿö/..3ø */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF ED23 0000 27F2"            /* ÿÿÿÿÿÿÿÿÿÿí#..'ò */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF DE1A 0000 1FE9"            /* ÿÿÿÿÿÿÿÿÿÿÞ....é */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF CE10 0000 1ADF"            /* ÿÿÿÿÿÿÿÿÿÿÎ....ß */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF C10B 0100 14D5"            /* ÿÿÿÿÿÿÿÿÿÿÁ....Õ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF B509 0100 0FCD"            /* ÿÿÿÿÿÿÿÿÿÿµÆ...Í */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF AA07 0001 0BC2"            /* ÿÿÿÿÿÿÿÿÿÿª.... */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF A005 0101 09B3"            /* ÿÿÿÿÿÿÿÿÿÿ ...Ƴ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 9504 0101 08A6"            /* ÿÿÿÿÿÿÿÿÿÿ•....¦ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8D04 0101 069A"            /* ÿÿÿÿÿÿÿÿÿÿ�....š */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8505 0101 0691"            /* ÿÿÿÿÿÿÿÿÿÿ…....‘ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7D05 0101 078B"            /* ÿÿÿÿÿÿÿÿÿÿ}....‹ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7606 0101 0885"            /* ÿÿÿÿÿÿÿÿÿÿv....… */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7106 0102 0881"            /* ÿÿÿÿÿÿÿÿÿÿq....� */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6D07 0102 0A7E"            /* ÿÿÿÿÿÿÿÿÿÿm...Â~ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6A08 0102 0B7B"            /* ÿÿÿÿÿÿÿÿÿÿj....{ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6709 0102 0C7C"            /* ÿÿÿÿÿÿÿÿÿÿgÆ...| */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 670A 0102 0C75"            /* ÿÿÿÿÿÿÿÿÿÿgÂ...u */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 600B 0102 113A"            /* ÿÿÿÿÿÿÿÿÿÿ`....: */
+	$"7B85 8585 8585 8585 8585 8585 8585 8585"            /* {……………………………………… */
+	$"8585 8585 8585 8585 8585 8585 8585 8585"            /* ………………………………………… */
+	$"8585 8585 8585 8585 8574 310F 0101 0B1E"            /* ………………………t1..... */
+	$"2B34 3535 3535 3535 3535 3535 3535 3535"            /* +455555555555555 */
+	$"3535 3535 3535 3535 3535 3535 3535 3535"            /* 5555555555555555 */
+	$"3535 3535 3535 3535 332A 1C0A 0100 040C"            /* 555555553*.Â.... */
+	$"1418 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1813 0B03 0000 0002"            /* ................ */
+	$"0304 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0402 0100 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0069 7433"            /* .............it3 */
+	$"3200 0025 F700 0000 00FF 00FF 00FF 00FF"            /* 2..%÷....ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 59D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.ŸY× */
+	$"00A6 59D3 0001 5959 8000 9D58 8459 D000"            /* .¦YÓ..YY€.�X„YÐ. */
+	$"0359 5900 569F 5901 5658 8359 D000 0257"            /* .YY.VŸY.VXƒYÐ..W */
+	$"6287 9D95 0494 917F 5E58 8359 CD00 0459"            /* b‡�•.”‘.^XƒYÍ..Y */
+	$"005C 9ABA 9EBC 03B9 AE85 5883 59CD 0004"            /* .\šºž¼.¹®…XƒYÍ.. */
+	$"5900 6EB3 BE9E BF04 BEB6 9D62 5782 59CD"            /* Y.n³¾ž¿.¾¶�bW‚YÍ */
+	$"0003 5900 74B6 A0BE 03B8 9F63 5782 59CC"            /* ..Y.t¶ ¾.¸ŸcW‚YÌ */
+	$"0004 5959 547A B8A0 BC03 B7A0 6357 8359"            /* ..YYTz¸ ¼.· cWƒY */
+	$"CB00 0459 5954 88B9 A0BB 03B7 A366 56B8"            /* Ë..YYTˆ¹ ».·£fV¸ */
+	$"5995 0005 5959 005B A0B9 A0BA 03B8 AA73"            /* Y•..YY.[ ¹ º.¸ªs */
+	$"55BA 5992 0006 5959 0053 7BB4 B9A0 BA04"            /* UºY’..YY.S{´¹ º. */
+	$"B9B2 905A 56BA 5990 0006 5959 0054 73AB"            /* ¹²�ZVºY�..YY.Ts« */
+	$"B8A2 B903 B5AB 865E B756 0300 5859 598E"            /* ¸¢¹.µ«†^·V..XYYŽ */
+	$"0007 5959 005A 83AD B6B7 A2B8 04B7 B4AD"            /* ..YY.Zƒ­¶·¢¸.·´­ */
+	$"9B87 B57D 047B 725D 0059 8D00 0759 5900"            /* ›‡µ}.{r].Y�..YY. */
+	$"5A8F B2B6 B6A4 B704 B6B5 B4B2 B1B4 B003"            /* Z�²¶¶¤·.¶µ´²±´°. */
+	$"ADA0 7600 8059 8900 8159 0355 77AC B0E2"            /* ­ v.€Y‰.�Y.Uw¬°â */
+	$"B103 AFA4 7D56 8259 8600 0159 5980 0003"            /* ±.¯¤}V‚Y†..YY€.. */
+	$"5279 9697 E298 0496 9073 5456 8000 0159"            /* Ry–—â˜.–�sTV€..Y */
+	$"5984 0008 5900 5457 6268 686D 7284 73A1"            /* Y„..Y.TWbhhmr„s¡ */
+	$"74B9 7309 706C 6868 6763 5900 5959 8200"            /* t¹sÆplhhgcY.YY‚. */
+	$"0759 0052 6E96 A4A7 A8E7 A980 A706 A6A0"            /* .Y.Rn–¤§¨ç©€§.¦  */
+	$"8E6A 5759 5982 0002 536F A782 B0E5 AF81"            /* ŽjWYY‚..So§‚°å¯� */
+	$"B006 AFAF AB99 6A00 5980 0004 5900 5A9B"            /* °.¯¯«™j.Y€..Y.Z› */
+	$"AEF0 AF0B AEA6 895B 0059 0000 5900 6CA7"            /* ®ð¯.®¦‰[.Y..Y.l§ */
+	$"B4AE 03AF ABAE AFB7 AE0A A996 6500 5900"            /* ´®.¯«®¯·®Â©–e.Y. */
+	$"0059 5470 A7B3 AD05 AEA8 A299 A8AE B6AD"            /* .YTp§³­.®¨¢™¨®¶­ */
+	$"0AA8 9666 0059 0059 5900 6CA3 B4AB 05A6"            /* ¨–f.Y.YY.l£´«.¦ */
+	$"EDE9 99A7 ACB5 AB0A A692 6200 5900 5959"            /* í陧¬µ«Â¦’b.Y.YY */
+	$"0063 9EB3 A905 A8A8 ECFF E195 B6A9 0BA3"            /* .cž³©.¨¨ìÿᕶ©.£ */
+	$"8D5F 5859 0059 5900 6099 A7B3 A806 A4DC"            /* �_XY.YY.`™§³¨.¤Ü */
+	$"FFFF CA96 AAB4 A80B A187 5B58 5900 5959"            /* ÿÿÊ–ª´¨.¡‡[XY.YY */
+	$"005C 94A6 B3A7 01A3 C580 FF02 AD9D A8B3"            /* .\”¦³§.£Å€ÿ.­�¨³ */
+	$"A70B 9F82 5A58 5900 5959 5857 8DA5 B3A6"            /* §.Ÿ‚ZXY.YYXW�¥³¦ */
+	$"07A4 AEF8 FFFF ED97 A4B2 A603 A59C 7C58"            /* .¤®øÿÿí—¤²¦.¥œ|X */
+	$"8359 0257 87A3 B4A4 01A1 E180 FF02 CB94"            /* ƒY.W‡£´¤.¡á€ÿ.Ë” */
+	$"A6B1 A403 A399 7657 8359 0254 80A1 B4A2"            /* ¦±¤.£™vWƒY.T€¡´¢ */
+	$"019D C180 FF03 FEA4 9BA3 B0A2 03A1 9672"            /* .�Á€ÿ.þ¤›£°¢.¡–r */
+	$"5783 5902 547A 9FB4 A202 A0A6 F380 FF02"            /* WƒY.TzŸ´¢. ¦ó€ÿ. */
+	$"E192 A3B0 A203 A094 6D56 8359 0255 759D"            /* á’£°¢. ”mVƒY.Uu� */
+	$"B5A0 019B D381 FF02 B495 A1AF A006 9D90"            /* µ .›Ó�ÿ.´•¡¯ .�� */
+	$"6957 5959 0080 5902 546D 9BB1 9E00 9F80"            /* iWYY.€Y.Tm›±ž.Ÿ€ */
+	$"A002 9CAF FD80 FF02 EF93 9DAF 9E06 9B8C"            /*  .œ¯ý€ÿ.ï“�¯ž.›Œ */
+	$"6657 5959 0080 5902 5568 97B0 9D07 9F95"            /* fWYY.€Y.Uh—°�.Ÿ• */
+	$"8A89 8B98 9CE2 81FF 02C3 8F9E AE9D 0699"            /* Š‰‹˜œâ�ÿ.Ã�ž®�.™ */
+	$"8861 5759 5900 8059 0256 6494 AF9C 089D"            /* ˆaWYY.€Y.Vd”¯œ.� */
+	$"8C9E D0DD C793 8CBC 81FF 02F7 9899 AE9C"            /* ŒžÐÝÇ“Œ¼�ÿ.÷˜™®œ */
+	$"0697 855F 5859 5900 8059 0257 5E91 AF9B"            /* .—…_XYY.€Y.W^‘¯› */
+	$"0195 B781 FF03 F69B 96ED 81FF 02CE 8B9C"            /* .•·�ÿ.ö›–í�ÿ.΋œ */
+	$"AD9B 0D95 815D 5859 5900 0059 5957 5B8C"            /* ­›.•�]XYY..YYW[Œ */
+	$"98AD 9903 9889 9AD8 81FF 02E0 89C4 81FF"            /* ˜­™.˜‰šØ�ÿ.à‰Ä�ÿ */
+	$"02FD 9E93 AD99 0D93 7C5A 5859 5900 0059"            /* .ýž“­™.“|ZXYY..Y */
+	$"5958 5987 96AC 970C 9889 D3CE 88A1 E8FF"            /* YXY‡–¬—.˜‰ÓΈ¡èÿ */
+	$"FFF9 9B9D F481 FF02 D788 98AC 9702 9079"            /* ÿù›�ô�ÿ.׈˜¬—.�y */
+	$"5A80 5901 0000 8059 0255 8395 AB96 0D97"            /* Z€Y...€Y.Uƒ•«–.— */
+	$"8DA4 FFFF F6B2 84B4 F6FB A28E CC82 FF02"            /* �¤ÿÿö²„´öû¢ŽÌ‚ÿ. */
+	$"A28F 97AB 9601 8E75 8159 0100 0080 5902"            /* ¢�—«–.Žu�Y...€Y. */
+	$"547F 94AB 9502 9688 E481 FF07 E99E 8CBC"            /* T.”«•.–ˆä�ÿ.鞌¼ */
+	$"9991 A2F8 81FF 02DD 8896 AA95 0394 8D71"            /* ™‘¢ø�ÿ.݈–ª•.”�q */
+	$"5880 5901 0000 8059 0255 7993 AA94 0295"            /* X€Y...€Y.Uy“ª”.• */
+	$"87B4 84FF 05D4 8C93 948F D182 FF02 A68C"            /* ‡´„ÿ.ÔŒ“”�Ñ‚ÿ.¦Œ */
+	$"95A9 9403 938A 6D57 8059 0700 0059 595A"            /* •©”.“ŠmW€Y...YYZ */
+	$"5374 91AA 9302 908C F284 FF06 DD92 9293"            /* St‘ª“.�Œò„ÿ.Ý’’“ */
+	$"8FA4 FB81 FF01 E086 AA93 0391 876A 5780"            /* �¤û�ÿ.à†ª“.‘‡jW€ */
+	$"5907 0000 5959 5A53 6F8F A991 0292 87CA"            /* Y...YYZSo�©‘.’‡Ê */
+	$"84FF 02F8 A18D 8091 018D D782 FF02 A788"            /* „ÿ.ø¡�€‘.�ׂÿ.§ˆ */
+	$"92A8 9103 8F84 6757 8059 0100 0080 5902"            /* ’¨‘.�„gW€Y...€Y. */
+	$"556B 8DA9 9002 8E85 DB84 FF01 C78A 8190"            /* Uk�©�.Ž…Û„ÿ.ÇŠ�� */
+	$"028B A8FE 81FF 01E2 84A9 9003 8E82 6357"            /* .‹¨þ�ÿ.â„©�.Ž‚cW */
+	$"8059 0100 0080 5902 5466 8CA8 9005 9186"            /* €Y...€Y.TfŒ¨�.‘† */
+	$"AB85 A6EE 81FF 02EE 958E 8190 028F 8CDC"            /* «…¦î�ÿ.î•Ž��.�ŒÜ */
+	$"82FF 02AA 8591 A790 038D 7F62 5880 5901"            /* ‚ÿ.ª…‘§�.�.bX€Y. */
+	$"0000 8059 0254 618A A78E 0C8F 84A5 FFF0"            /* ..€Y.TaŠ§Ž.�„¥ÿð */
+	$"A480 BBF9 FFFF B688 838E 0189 A982 FF01"            /* ¤€»ùÿÿ¶ˆƒŽ.‰©‚ÿ. */
+	$"E583 A88E 038B 7C5F 5880 5901 0000 8059"            /* 僨Ž.‹|_X€Y...€Y */
+	$"0256 5F87 A78D 028C 83E8 80FF 06DF 9087"            /* .V_‡§�.Œƒè€ÿ.ß�‡ */
+	$"D4E0 8C8C 838D 028C 8ADE 82FF 02AB 838E"            /* ÔàŒŒƒ�.ŒŠÞ‚ÿ.«ƒŽ */
+	$"A68D 038A 7A5D 5880 5901 0000 8059 0257"            /* ¦�.Šz]X€Y...€Y.W */
+	$"5C84 A68C 028D 7EB7 83FF 03C9 8B8E 8B85"            /* \„¦Œ.�~·ƒÿ.É‹Ž‹… */
+	$"8C01 87AA 82FF 01E6 82A7 8C03 8877 5C58"            /* Œ.‡ª‚ÿ.悧Œ.ˆw\X */
+	$"8059 0100 0080 5902 5757 81A6 8A02 878A"            /* €Y...€Y.WW�¦Š.‡Š */
+	$"F584 FF01 CB83 868A 0289 88E0 82FF 02A8"            /* õ„ÿ.˃†Š.‰ˆà‚ÿ.¨ */
+	$"808B A58A 0386 735B 5880 5901 0000 8059"            /* €‹¥Š.†s[X€Y...€Y */
+	$"0258 557F A58A 028B 7BC9 84FF 02F6 9987"            /* .XU.¥Š.‹{É„ÿ.ö™‡ */
+	$"878A 0184 AB82 FF01 E580 A68A 0285 715A"            /* ‡Š.„«‚ÿ.倦Š.…qZ */
+	$"8159 0100 0081 5902 577B 88A3 8902 8A81"            /* �Y...�Y.W{ˆ£‰.Š� */
+	$"9685 FF01 BF82 8889 0288 87E0 82FF 02A7"            /* –…ÿ.¿‚ˆ‰.ˆ‡à‚ÿ.§ */
+	$"7F8A A489 0183 6F82 5901 0000 8159 0254"            /* .Š¤‰.ƒo‚Y...�Y.T */
+	$"7787 A488 017A DC84 FF02 EA8C 8689 8801"            /* w‡¤ˆ.zÜ„ÿ.ꌆ‰ˆ. */
+	$"82A9 82FF 01E3 7EA4 8802 8781 6C82 5901"            /* ‚©‚ÿ.ã~¤ˆ.‡�l‚Y. */
+	$"0000 8159 0151 7497 860E 8784 8686 8486"            /* ..�Y.Qt—†.‡„††„† */
+	$"8684 8685 8486 877B A685 FF11 AD7D 8685"            /* †„†…„†‡{¦…ÿ.­}†… */
+	$"8486 8584 8784 8487 8485 8783 83DF 82FF"            /* „†…„‡„„‡„…‡ƒƒß‚ÿ */
+	$"0FA4 7D87 8584 8785 8487 8485 8784 8586"            /* .¤}‡…„‡…„‡„…‡„…† */
+	$"8596 8602 7F69 5881 5901 0000 8059 035A"            /* …–†..iX�Y...€Y.Z */
+	$"5170 8496 850E 8182 7F7F 827F 8082 7E81"            /* Qp„–….�‚..‚.€‚~� */
+	$"8280 837E EC84 FF12 DB7E 817F 8082 7E81"            /* ‚€ƒ~ì„ÿ.Û~�.€‚~� */
+	$"827E 8182 7E82 817E 827B A682 FF10 E07B"            /* ‚~�‚~‚�~‚{¦‚ÿ.à{ */
+	$"8380 827E 8181 7E82 817E 8280 7F81 8494"            /* ƒ€‚~��~‚�~‚€.�„” */
+	$"8503 847D 6758 8159 0100 0080 5903 5A53"            /* ….„}gX�Y...€Y.ZS */
+	$"6E84 9585 0E82 90FB BCAC FFA4 B9FF 9BD3"            /* n„•….‚�û¼¬ÿ¤¹ÿ›Ó */
+	$"FC97 7BB9 84FF 14FC 91AA FFA8 BFFF 92D1"            /* ü—{¹„ÿ.ü‘ªÿ¨¿ÿ’Ñ */
+	$"FB92 E5ED 87F4 DC95 FFCB 73DF 82FF 0FA0"            /* û’åí‡ôÜ•ÿËsß‚ÿ.  */
+	$"79DC F889 E5ED 90F6 D88F FFC7 AAC2 7D94"            /* yÜø‰åí�öØ�ÿǪÂ}” */
+	$"8503 847C 6558 8159 0100 0080 5903 5A52"            /* ….„|eX�Y...€Y.ZR */
+	$"6983 9584 0E81 92FF BCAA FFC4 D2FF 96D4"            /* iƒ•„.�’ÿ¼ªÿÄÒÿ–Ô */
+	$"FF9A 82F8 84FF 14C6 78CE FFA6 BFFF B6E4"            /* ÿš‚ø„ÿ.ÆxÎÿ¦¿ÿ¶ä */
+	$"FF8D E8F9 AFFE DE91 FFE3 899E 82FF 0FDB"            /* ÿ�èù¯þÞ‘ÿ㉞‚ÿ.Û */
+	$"74E2 FFB1 F3F0 8AFA E9B4 FFC8 A6C7 7C94"            /* tâÿ±óðŠúé´ÿȦÇ|” */
+	$"8403 8379 6258 8159 0100 0080 5903 5A51"            /* „.ƒybX�Y...€Y.ZQ */
+	$"6581 9582 047F 90FF D5C8 81FF 04BB E5F9"            /* e�•‚..�ÿÕÈ�ÿ.»åù */
+	$"86CA 84FF 06F2 82D6 FFFF C6D6 80FF 02FC"            /* †Ê„ÿ.ò‚ÖÿÿÆÖ€ÿ.ü */
+	$"B5EF 80FF 06E9 B8FF FFFA 8AD6 82FF 0196"            /* µï€ÿ.é¸ÿÿúŠÖ‚ÿ.– */
+	$"C680 FF02 F4B4 FA80 FF03 DCC9 C57A 9482"            /* Æ€ÿ.ô´ú€ÿ.ÜÉÅz”‚ */
+	$"0381 7761 5881 5901 0000 8059 035A 5262"            /* .�waX�Y...€Y.ZRb */
+	$"7F95 8102 7E8F FA85 FF01 B190 85FF 01AC"            /* .•�.~�ú…ÿ.±�…ÿ.¬ */
+	$"9A90 FF01 C494 82FF 02D5 8DF9 87FF 01BF"            /* š�ÿ.Ä”‚ÿ.Õ�ù‡ÿ.¿ */
+	$"7994 8103 8075 5F58 8159 0100 0081 5902"            /* y”�.€u_X�Y...�Y. */
+	$"5461 7D95 8002 7D8E FA84 FF02 E779 DD84"            /* Ta}•€.}Žú„ÿ.çyÝ„ */
+	$"FF02 E47C E690 FF02 FC8A D281 FF02 FC8C"            /* ÿ.ä|æ�ÿ.üŠÒ�ÿ.üŒ */
+	$"C787 FF01 BF77 9480 037E 725E 5881 5901"            /* LJÿ.¿w”€.~r^X�Y. */
+	$"0000 8159 0254 5D7C 957F 027C 8EFA 84FF"            /* ..�Y.T]|•..|Žú„ÿ */
+	$"019C A285 FF01 97AD 92FF 01C7 8F80 FF04"            /* .œ¢…ÿ.—­’ÿ.Ç�€ÿ. */
+	$"FBC0 748B F986 FF01 BE76 947F 037D 715C"            /* ûÀt‹ù†ÿ.¾v”..}q\ */
+	$"5881 5901 0000 8159 0254 597B 957F 027C"            /* X�Y...�Y.TY{•..| */
+	$"8EFA 83FF 02D7 7BEF 84FF 02D1 7EF4 92FF"            /* Žúƒÿ.×{ï„ÿ.Ñ~ô’ÿ */
+	$"09FE 8CC9 F8CB 8C64 9F83 C386 FF01 BE76"            /* ÆþŒÉøËŒdŸƒÃ†ÿ.¾v */
+	$"947F 037C 6F5B 5881 5901 0000 8159 0355"            /* ”..|o[X�Y...�Y.U */
+	$"5779 7E94 7D02 7A8C FA82 FF02 FD8A B884"            /* Wy~”}.zŒú‚ÿ.ýŠ¸„ */
+	$"FF02 FA86 C094 FF09 CF74 7C64 7FCB FFC0"            /* ÿ.ú†À”ÿÆÏt|d.ËÿÀ */
+	$"80F7 85FF 01BD 7494 7D02 7A6D 5B82 5901"            /* €÷…ÿ.½t”}.zm[‚Y. */
+	$"0000 8159 0256 5677 957C 0279 8BFA 82FF"            /* ..�Y.VVw•|.y‹ú‚ÿ */
+	$"02C3 82FB 84FF 02BB 86FE 95FF 088C 99D5"            /* .Âû„ÿ.»†þ•ÿ.Œ™Õ */
+	$"FCFF FFFA 7FBC 85FF 01BD 7394 7C02 796B"            /* üÿÿú.¼…ÿ.½s”|.yk */
+	$"5A82 5901 0000 8159 0257 5575 957B 0277"            /* Z‚Y...�Y.WUu•{.w */
+	$"8BFA 81FF 02F4 7DCE 84FF 02EE 7BD6 96FF"            /* ‹ú�ÿ.ô}΄ÿ.î{Ö–ÿ */
+	$"01D0 A782 FF02 C47B F484 FF01 BC72 947B"            /* .Ч‚ÿ.Ä{ô„ÿ.¼r”{ */
+	$"0178 6983 5901 0000 8159 0258 5272 957A"            /* .xiƒY...�Y.XRr•z */
+	$"0877 8AE8 EEEC ECF2 AA91 85FF 02A8 92F2"            /* .wŠèîììòª‘…ÿ.¨’ò */
+	$"95EC 03ED ED93 DC81 FF03 FD83 B2F2 82EC"            /* •ì.íí“Ü�ÿ.ýƒ²ò‚ì */
+	$"02F3 B573 947A 0176 6783 5901 0000 8159"            /* .óµs”z.vgƒY...�Y */
+	$"0258 5070 9679 007A 817F 027E 71E3 84FF"            /* .XPp–y.z�..~qã„ÿ */
+	$"03DF 797F 8096 7F02 8078 A382 FF02 C970"            /* .ßy.€–..€x£‚ÿ.Ép */
+	$"8083 7F00 7D95 7902 7565 5882 5901 0000"            /* €ƒ..}•y.ueX‚Y... */
+	$"8159 0258 4F6F 9779 8077 0278 69AB 85FF"            /* �Y.XOo—y€w.xi«…ÿ */
+	$"029B 7378 9977 0178 DF81 FF02 B468 7583"            /* .›sx™w.xß�ÿ.´huƒ */
+	$"7700 7895 7902 7464 5882 5901 0000 8259"            /* w.x•y.tdX‚Y...‚Y */
+	$"0150 6D9A 7802 747A F384 FF02 CD72 779A"            /* .Pmšx.tzó„ÿ.Írwš */
+	$"7808 71A0 FFFF D98C 8FC6 6D9C 7801 7363"            /* x.q ÿÿÙŒ�Æmœx.sc */
+	$"8359 0100 0082 5901 516B 9A77 016B C484"            /* ƒY...‚Y.Qkšw.kÄ„ */
+	$"FF02 F68A 729B 770A 7677 9B8A 80BD FDFF"            /* ÿ.öŠr›wÂvw›Š€½ýÿ */
+	$"9C6A 789A 7702 7261 5882 5901 0000 8159"            /* œjxšw.raX‚Y...�Y */
+	$"035A 4F68 7598 7602 737B F184 FF01 B96E"            /* .ZOhu˜v.s{ñ„ÿ.¹n */
+	$"9D76 0371 85D7 FB80 FF02 F076 719A 7602"            /* �v.q…×û€ÿ.ðvqšv. */
+	$"7060 5882 5901 0000 8159 035A 4E66 7498"            /* p`X‚Y...�Y.ZNft˜ */
+	$"7504 7380 77C3 FE81 FF02 E97B 729D 7502"            /* u.s€wÃþ�ÿ.é{r�u. */
+	$"727F EF82 FF01 CD66 9A75 026F 5E58 8259"            /* r.ï‚ÿ.Ífšu.o^X‚Y */
+	$"0100 0081 5903 5A4D 6473 9774 0672 76EE"            /* ...�Y.ZMds—t.rvî */
+	$"CC73 83DA 80FF 01A4 6C9F 7401 6CBE 83FF"            /* ÌsƒÚ€ÿ.¤lŸt.l¾ƒÿ */
+	$"02A5 6575 9874 026D 5C58 8259 0100 0081"            /* .¥eu˜t.m\X‚Y...� */
+	$"5902 5A4D 6298 730B 6F82 FAFF F9AD 6A97"            /* Y.ZMb˜s.o‚úÿù­j— */
+	$"F1DC 7172 9F73 016D 9283 FF03 F981 6B74"            /* ñÜqrŸs.m’ƒÿ.ù�kt */
+	$"9773 026C 5B58 8259 0100 0081 5902 5A4D"            /* —s.l[X‚Y...�Y.ZM */
+	$"6098 7301 6C94 81FF 04EC 957B 8470 A073"            /* `˜s.l”�ÿ.ì•{„p s */
+	$"0271 75E7 83FF 02DD 6972 9773 026B 5C58"            /* .quçƒÿ.Ýir—s.k\X */
+	$"8259 0100 0081 5902 5A50 5F98 7201 69A8"            /* ‚Y...�Y.ZP_˜r.i¨ */
+	$"83FF 019B 69A2 7201 6ABF 84FF 02AF 6473"            /* ƒÿ.›i¢r.j¿„ÿ.¯ds */
+	$"9672 026A 5B58 8259 0100 0081 5903 5A51"            /* –r.j[X‚Y...�Y.ZQ */
+	$"5D70 9771 0167 BD81 FF02 F6A1 6FA3 7101"            /* ]p—q.g½�ÿ.ö¡o£q. */
+	$"6B94 84FF 02F7 7B6D 9671 0169 5A83 5901"            /* k”„ÿ.÷{m–q.iZƒY. */
+	$"0000 8159 035A 505B 6F97 7101 69D5 80FF"            /* ..�Y.ZP[o—q.iÕ€ÿ */
+	$"03E8 8B68 70A3 7102 6F74 E984 FF02 BC65"            /* .è‹hp£q.oté„ÿ.¼e */
+	$"7294 7102 7067 5883 5901 0000 8159 035A"            /* r”q.pgXƒY...�Y.Z */
+	$"5059 6F96 7007 6F6F E7FF FFD4 7A69 A670"            /* PYo–p.ooçÿÿÔzi¦p */
+	$"0168 BD84 FF02 EC71 6E94 7002 6F67 5883"            /* .h½„ÿ.ìqn”p.ogXƒ */
+	$"5901 0000 8159 035A 5058 6E96 6F06 6C79"            /* Y...�Y.ZPXn–o.ly */
+	$"F7FF BD6E 6BA7 6F02 6A8B FD83 FF02 FC83"            /* ÷ÿ½nk§o.j‹ýƒÿ.üƒ */
+	$"6B94 6F02 6E66 5783 5901 0000 8159 035A"            /* k”o.nfWƒY...�Y.Z */
+	$"5056 6D96 6E05 688E FBA5 676C A86E 026D"            /* PVm–n.hŽû¥gl¨n.m */
+	$"6AD0 83FF 02F5 7D6B 946E 026D 6456 8359"            /* jЃÿ.õ}k”n.mdVƒY */
+	$"0100 0081 5903 5A4F 556C 966D 0468 9294"            /* ...�Y.ZOUl–m.h’” */
+	$"656C AA6D 0268 87F8 82FF 01BC 6995 6D02"            /* elªm.h‡ø‚ÿ.¼i•m. */
+	$"6C63 5683 5901 0000 8159 035A 5054 6C97"            /* lcVƒY...�Y.ZPTl— */
+	$"6D01 6C68 AD6D 0866 9EF7 FFFF F3B1 6C6B"            /* m.lh­m.fž÷ÿÿó±lk */
+	$"956D 026C 6256 8359 0100 0081 5903 5A50"            /* •m.lbVƒY...�Y.ZP */
+	$"546C CA6D 0667 81A6 9D7A 666C 966D 026C"            /* TlÊm.g�¦�zfl–m.l */
+	$"6256 8359 0100 0081 5903 5A51 536C CB6D"            /* bVƒY...�Y.ZQSlËm */
+	$"0369 6565 6998 6D02 6C62 5783 5901 0000"            /* .ieei˜m.lbWƒY... */
+	$"8159 035A 5152 6AEA 6C02 6B61 5783 5901"            /* �Y.ZQRjêl.kaWƒY. */
+	$"0000 8159 035A 5252 6AEA 6C02 6B61 5783"            /* ..�Y.ZRRjêl.kaWƒ */
+	$"5901 0000 8159 035A 5252 6AEA 6C02 6B61"            /* Y...�Y.ZRRjêl.ka */
+	$"5783 5901 0000 8159 035A 5352 6AEA 6C02"            /* WƒY...�Y.ZSRjêl. */
+	$"6B61 5783 5900 0082 5903 5A54 5168 EA6B"            /* kaWƒY..‚Y.ZTQhêk */
+	$"0269 5E56 8359 0000 8359 0257 4D5E EA63"            /* .i^VƒY..ƒY.WM^êc */
+	$"0260 5756 8359 0100 0082 5902 5A55 53EA"            /* .`WVƒY...‚Y.ZUSê */
+	$"5601 5556 8459 0100 00FB 5901 0000 FB59"            /* V.UV„Y...ûY...ûY */
+	$"0100 00FB 5901 0000 FB59 0100 00FA 5981"            /* ...ûY...ûY...úY� */
+	$"00F9 5982 00F7 5983 00F6 5986 00F3 59FF"            /* .ùY‚.÷Yƒ.öY†.óYÿ */
+	$"00FF 0000 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ...ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00DF 009F 7CD7 00A6 7CD3"            /* .ÿ.ÿ.ÿ.ß.Ÿ|×.¦|Ó */
+	$"0001 7C7C 8000 9D7B 847C D000 037C 7C00"            /* ..||€.�{„|Ð..||. */
+	$"7C9F 7F01 7B7B 837C D000 027B 88A5 9EB0"            /* |Ÿ..{{ƒ|Ð..{ˆ¥ž° */
+	$"03AC 9D81 7B83 7CCD 0004 7C00 81B3 D09E"            /* .¬��{ƒ|Í..|.�³Ðž */
+	$"D302 D0C3 A184 7CCD 0004 7C00 8FCA D79F"            /* Ó.Ðá„|Í..|.�Êן */
+	$"D803 CEB4 837A 827C CD00 037C 0095 CEA0"            /* Ø.δƒz‚|Í..|.•Î  */
+	$"D803 D1B7 847A 827C CC00 047C 7C78 9BD0"            /* Ø.Ñ·„z‚|Ì..||x›Ð */
+	$"A0D7 03D1 B884 7A83 7CCB 0004 7C7C 79A8"            /*  ×.Ѹ„zƒ|Ë..||y¨ */
+	$"D3A0 D703 D2BC 867A B87C 9500 057C 7C00"            /* Ó ×.Ò¼†z¸|•..||. */
+	$"81BD D5A0 D603 D3C3 9278 BA7C 9200 067C"            /* �½Õ Ö.ÓÃ’xº|’..| */
+	$"7C00 799D CED5 A0D6 04D4 CBAC 7D79 BA7C"            /* |.y�ÎÕ Ö.Ôˬ}yº| */
+	$"9000 067C 7C00 7B97 C5D3 A2D5 03D1 C4A3"            /* �..||.{—ÅÓ¢Õ.ÑÄ£ */
+	$"8280 7AB4 7B03 007B 7C7C 8E00 077C 7C00"            /* ‚€z´{..{||Ž..||. */
+	$"81A4 C8D2 D4A2 D505 D4D0 C8B7 A69F B19E"            /* �¤ÈÒÔ¢Õ.ÔÐÈ·¦Ÿ±ž */
+	$"079F 9F9E 9D94 8100 7C8D 0007 7C7C 0081"            /* .ŸŸž�”�.|�..||.� */
+	$"ADCD D3D3 A4D4 03D3 D2D0 CE80 CCB2 CB03"            /* ­ÍÓÓ¤Ô.ÓÒÐ΀̲Ë. */
+	$"C7B9 9500 807C 8900 817C 037A 98C6 CDE2"            /* ǹ•.€|‰.�|.z˜ÆÍâ */
+	$"CE03 CCBE 9B7A 827C 8600 017C 7C80 0002"            /* Î.̾›z‚|†..||€.. */
+	$"7697 B181 B403 B5B5 B4B4 9EB5 01B4 B4B6"            /* v—±�´.µµ´´žµ.´´¶ */
+	$"B506 B4B4 B3AA 9177 7980 0001 7C7C 8400"            /* µ.´´³ª‘wy€..||„. */
+	$"097C 0078 7D87 8B8B 8D94 95E2 960A 9592"            /* Æ|.x}‡‹‹�”•â–•’ */
+	$"8E8C 8B8B 867D 007C 7C82 0009 7C00 7892"            /* ŽŒ‹‹†}.||‚.Æ|.x’ */
+	$"B5C1 C4C5 C6C6 81C7 03C6 C6C7 C79E C601"            /* µÁÄÅÆÆ�Ç.ÆÆÇÇžÆ. */
+	$"C7C7 82C6 01C7 C7AC C683 C70A C6C6 C4C3"            /* ÇÇ‚Æ.ÇǬƃÇÂÆÆÄà */
+	$"C3BD AB8C 7A7C 7C82 0005 7893 C5CE CFD0"            /* ý«Œz||‚..x“ÅÎÏÐ */
+	$"E9CF 08D0 D0CF CEC9 B58B 007C 8000 047C"            /* éÏ.ÐÐÏÎɵ‹.|€..| */
+	$"0080 B9CE F0D0 0CCF C5A7 7E00 7C00 007C"            /* .€¹ÎðÐ.Ïŧ~.|..| */
+	$"008F C5CE B3CF 03D0 CDCF D0B7 CF0A C9B2"            /* .�ÅγÏ.ÐÍÏзÏÂɲ */
+	$"8600 7C00 007C 7894 C6B3 CF05 D0CB BEBA"            /* †.|..|x”ƳÏ.Ð˾º */
+	$"CCD0 B6CF 0ACA B487 007C 007C 7C00 8FC4"            /* ÌжÏÂÊ´‡.|.||.�Ä */
+	$"B4CE 05C9 F2ED B9CC CFB5 CE0B C8B1 8400"            /* ´Î.Éòí¹ÌϵÎ.ȱ„. */
+	$"7C00 7C7C 0089 C0CC B3CD 05CC F3FF E7B9"            /* |.||.‰À̳Í.Ìóÿç¹ */
+	$"CEB5 CD0B C5AC 817B 7C00 7C7C 0085 BCCB"            /* εÍ.Ŭ�{|.||.…¼Ë */
+	$"B3CC 06C9 EAFF FFD8 BDCE B4CC 0BC4 A77D"            /* ³Ì.ÉêÿÿؽδÌ.ħ} */
+	$"7B7C 007C 7C00 81B6 CAB3 CC01 C9DC 80FF"            /* {|.||.�¶Ê³Ì.ÉÜ€ÿ */
+	$"02C6 C4CD B2CC 0DCB C1A3 7D7B 7C00 7C7C"            /* .ÆÄͲÌ.ËÁ£}{|.|| */
+	$"7B7D B1C9 CBB2 CA07 C9CF FBFF FFF1 BACB"            /* {}±É˲Ê.ÉÏûÿÿñºË */
+	$"B2CA 03C9 BE9D 7B83 7C02 7BAB C8B4 CA01"            /* ²Ê.ɾ�{ƒ|.{«È´Ê. */
+	$"C8ED 80FF 02D9 BCCB B1CA 03C9 BC98 7A83"            /* Èí€ÿ.ټ˱Ê.ɼ˜zƒ */
+	$"7C02 7AA5 C6B4 C901 C6DA 80FF 03FD C1C4"            /* |.z¥Æ´É.ÆÚ€ÿ.ýÁÄ */
+	$"CAB0 C903 C7B9 957A 837C 0279 9FC4 B4C8"            /* Ê°É.ǹ•zƒ|.yŸÄ´È */
+	$"02C7 CAF7 80FF 02E8 B8C9 B0C8 03C5 B68F"            /* .ÇÊ÷€ÿ.è¸É°È.Ŷ� */
+	$"7A83 7C02 799A C2B5 C701 C4E4 81FF 02CA"            /* zƒ|.yšÂµÇ.Ää�ÿ.Ê */
+	$"BFC8 AFC7 06C4 B38B 7A7C 7C00 807C 0278"            /* ¿È¯Ç.ij‹z||.€|.x */
+	$"93C0 B1C6 00C7 80C8 02C4 CFFD 80FF 01F2"            /* “À±Æ.Ç€È.ÄÏý€ÿ.ò */
+	$"B8B0 C606 C2AF 897A 7C7C 0080 7C02 798F"            /* ¸°Æ.¯‰z||.€|.y� */
+	$"BEB0 C607 C8C0 B4B2 B6C3 C6ED 81FF 02D4"            /* ¾°Æ.ÈÀ´²¶ÃÆí�ÿ.Ô */
+	$"BBC7 AEC6 06C1 AC84 7A7C 7C00 807C 0279"            /* »Ç®Æ.Á¬„z||.€|.y */
+	$"8BBB AFC5 08C6 B6BA DCE5 D5B3 BAD8 81FF"            /* ‹»¯Å.ƶºÜåÕ³ºØ�ÿ */
+	$"02F9 BBC4 AEC5 06C0 A982 7B7C 7C00 807C"            /* .ù»Ä®Å.À©‚{||.€| */
+	$"027A 85B7 AEC4 02C5 C1CE 81FF 03F7 BAC1"            /* .z…·®Ä.ÅÁÎ�ÿ.÷ºÁ */
+	$"F481 FF02 DCB7 C6AD C40D BDA5 817B 7C7C"            /* ô�ÿ.Ü·Æ­Ä.½¥�{|| */
+	$"0000 7C7C 7A83 B4C3 ADC4 03C3 B3BE E981"            /* ..||zƒ´Ã­Ä.ó¾é� */
+	$"FF02 E8B6 DC81 FF02 FDBE C0AD C40D BCA1"            /* ÿ.è¶Ü�ÿ.ý¾À­Ä.¼¡ */
+	$"7E7B 7C7C 0000 7C7C 7B80 B0C2 ACC3 0CC4"            /* ~{||..||{€°Â¬Ã.Ä */
+	$"B5DD DAAE C4F2 FFFF FAC2 C5F8 81FF 02E2"            /* µÝÚ®ÄòÿÿúÂÅø�ÿ.â */
+	$"B5C4 ACC3 01B9 9D81 7C07 0000 7C7C 7B7C"            /* µÄ¬Ã.¹��|...||{| */
+	$"ABC0 ABC1 0DC2 BCC1 FFFF F7C7 ACD0 FBFC"            /* «À«Á.¼Áÿÿ÷ǬÐûü */
+	$"C7BC E082 FF02 C0BD C2AB C101 B79A 817C"            /* Ǽà‚ÿ.À½Â«Á.·š�| */
+	$"0100 0080 7C02 7BA7 BFAB C102 C2B2 EB81"            /* ...€|.{§¿«Á.²ë� */
+	$"FF07 EDB9 B3D7 C3BF C7FA 81FF 02E6 B3C2"            /* ÿ.í¹³×ÿÇú�ÿ.æ³Â */
+	$"AAC1 03C0 B595 7B80 7C01 0000 807C 027A"            /* ªÁ.Àµ•{€|...€|.z */
+	$"A3BE AAC0 02C1 B6CA 84FF 05DE B8C0 C0BD"            /* £¾ªÀ.Á¶Ê„ÿ.Þ¸ÀÀ½ */
+	$"E382 FF02 C2BA C1A9 C003 BFB2 927A 807C"            /* ã‚ÿ.ºÁ©À.¿²’z€| */
+	$"0100 0080 7C02 789D BCAA BF02 BEB3 F584"            /* ...€|.x�¼ª¿.¾³õ„ */
+	$"FF06 EBBF BEBF BDC9 FC81 FF02 E8B2 C0A9"            /* ÿ.뿾¿½Éü�ÿ.è²À© */
+	$"BF03 BEB0 8F7A 807C 0100 0080 7C02 7898"            /* ¿.¾°�z€|...€|.x˜ */
+	$"BAA9 BE02 BFB5 D984 FF02 FBC7 BC80 BE01"            /* º©¾.¿µÙ„ÿ.ûǼ€¾. */
+	$"BBE7 82FF 02C3 B7BF A8BE 03BC AD8B 7A80"            /* »ç‚ÿ.÷¿¨¾.¼­‹z€ */
+	$"7C01 0000 807C 0278 95B9 A9BD 02BC B3E9"            /* |...€|.x•¹©½.¼³é */
+	$"84FF 01DD B981 BD02 BACB FE81 FF02 EAB0"            /* „ÿ.ݹ�½.ºËþ�ÿ.ê° */
+	$"BEA8 BD03 BAAA 887A 807C 0100 0080 7C02"            /* ¾¨½.ºªˆz€|...€|. */
+	$"7890 B8A8 BD05 BEB2 C1AC C7F6 81FF 02F4"            /* x�¸¨½.¾²Á¬Çö�ÿ.ô */
+	$"C0BC 82BD 01BB EA82 FF02 C4B6 BEA7 BD03"            /* À¼‚½.»ê‚ÿ.Ķ¾§½. */
+	$"BAA8 867A 807C 0100 0080 7C02 788B B5A7"            /* º¨†z€|...€|.x‹µ§ */
+	$"BC0C BDB5 C1FF F2BD AAD5 FCFF FFD3 B983"            /* ¼.½µÁÿò½ªÕüÿÿÓ¹ƒ */
+	$"BC01 B9CC 82FF 02EB AFBD A7BC 03B8 A584"            /* ¼.¹Ì‚ÿ.믽§¼.¸¥„ */
+	$"7B80 7C01 0000 807C 0279 88B3 A8BC 01AE"            /* {€|...€|.yˆ³¨¼.® */
+	$"ED80 FF06 E5B1 B1E6 ECBB BB84 BC01 B9EB"            /* í€ÿ.å±±æì»»„¼.¹ë */
+	$"82FF 02C5 B4BD A6BC 03B7 A381 7B80 7C01"            /* ‚ÿ.Å´½¦¼.·£�{€|. */
+	$"0000 807C 027A 85B1 A6BB 02BC AFCC 82FF"            /* ..€|.z…±¦».¼¯Ì‚ÿ */
+	$"04FE D6AF BBBA 85BB 01B7 CC82 FF02 ECAE"            /* .þÖ¯»º…».·Ì‚ÿ.ì® */
+	$"BCA6 BB03 B5A0 807B 807C 0100 0080 7C03"            /* ¼¦».µ €{€|...€|. */
+	$"7A80 ADB9 A5BA 02B8 B0F7 84FF 01DE B486"            /* z€­¹¥º.¸°÷„ÿ.Þ´† */
+	$"BA02 B9B8 EB82 FF02 C3B2 BBA5 BA03 B39C"            /* º.¹¸ë‚ÿ.ò»¥º.³œ */
+	$"7F7B 807C 0100 0080 7C03 7B7E AAB7 A4B8"            /* .{€|...€|.{~ª·¤¸ */
+	$"02BA ABD8 84FF 02F9 C1B6 87B8 01B5 CC82"            /* .º«Ø„ÿ.ùÁ¶‡¸.µÌ‚ */
+	$"FF02 EBAC B9A5 B803 B199 7D7B 807C 0100"            /* ÿ.묹¥¸.±™}{€|.. */
+	$"0080 7C03 7B7D A7B6 A4B7 02B2 B7FE 84FF"            /* .€|.{}§¶¤·.²·þ„ÿ */
+	$"01D7 B388 B702 B6B6 EB82 FF02 C2B0 B8A4"            /* .׳ˆ·.¶¶ë‚ÿ.°¸¤ */
+	$"B701 AF96 827C 0100 0081 7C02 7BA3 B5A3"            /* ·.¯–‚|...�|.{£µ£ */
+	$"B602 B7A8 E584 FF02 F1B8 B589 B601 B3CA"            /* ¶.·¨å„ÿ.ñ¸µ‰¶.³Ê */
+	$"82FF 02EA AAB7 A4B6 01AD 9382 7C01 0000"            /* ‚ÿ.ꪷ¤¶.­“‚|... */
+	$"817C 0278 9FB4 97B5 0DB4 B5B6 B4B6 B5B4"            /* �|.xŸ´—µ.´µ¶´¶µ´ */
+	$"B6B5 B4B6 B6AD C085 FF11 CCB0 B6B5 B4B6"            /* ¶µ´¶¶­À…ÿ.Ì°¶µ´¶ */
+	$"B5B4 B6B5 B4B6 B4B5 B6B3 B4EB 82FF 0EC0"            /* µ´¶µ´¶´µ¶³´ë‚ÿ.À */
+	$"AFB6 B5B4 B6B4 B4B6 B4B5 B6B4 B5B6 97B5"            /* ¯¶µ´¶´´¶´µ¶´µ¶—µ */
+	$"01AB 9082 7C01 0000 817C 0278 9CB3 95B5"            /* .«�‚|...�|.xœ³•µ */
+	$"0FB6 AFA7 A9AA A7AA AAA7 ABA9 A7AC B1A9"            /* .¶¯§©ª§ªª§«©§¬±© */
+	$"F084 FF12 E9AA A6AA AAA7 ABA9 A7AB A8A8"            /* ð„ÿ.骦ªª§«©§«¨¨ */
+	$"ACA8 A8AB A7A5 C882 FF0F E8A8 B2A8 A8AB"            /* ¬¨¨«§¥È‚ÿ.訲¨¨« */
+	$"A8A8 ACA8 A9AC A7A9 AAAB 95B5 03B4 A98E"            /* ¨¨¬¨©¬§©ª«•µ.´©Ž */
+	$"7B81 7C01 0000 817C 0278 99B2 95B4 0EB3"            /* {�|...�|.x™²•´.³ */
+	$"B7F9 D2C7 FFC1 CEFF BCE1 FABB AACD 84FF"            /* ·ùÒÇÿÁÎÿ¼áú»ªÍ„ÿ */
+	$"14FD BAC6 FFC5 D3FF B7DF F9B7 EBF2 B0F6"            /* .ýºÆÿÅÓÿ·ßù·ëò°ö */
+	$"E6B9 FDDA A7EB 82FF 0FBD AAE6 F8B0 EBF1"            /* æ¹ýÚ§ë‚ÿ.½ªæø°ëñ */
+	$"B5F7 E3B4 FED9 C5D5 AF94 B403 B3A7 8B7B"            /* µ÷ã´þÙÅÕ¯”´.³§‹{ */
+	$"817C 0100 0081 7C02 7794 B195 B30E B1B9"            /* �|...�|.w”±•³.±¹ */
+	$"FFD2 C7FF D3DE FFBA E3FF BDAA F984 FF14"            /* ÿÒÇÿÓÞÿºãÿ½ªù„ÿ. */
+	$"DBA2 DAFF C4D4 FFCA EBFE B4EF FBC4 FEE9"            /* Û¢ÚÿÄÔÿÊëþ´ïûÄþé */
+	$"B6FF EAAB C082 FF0F E4A3 ECFF C5F6 F5B2"            /* ¶ÿê«À‚ÿ.ä£ìÿÅöõ² */
+	$"FBEF C8FF DAC4 DAAE 94B3 03B2 A589 7B81"            /* ûïÈÿÚÄÚ®”³.²¥‰{� */
+	$"7C01 0000 807C 037D 7690 AE95 B104 AFB7"            /* |...€|.}v�®•±.¯· */
+	$"FFE0 D681 FF04 CDEC FCAE D884 FF06 F7AC"            /* ÿàÖ�ÿ.Íìü®Ø„ÿ.÷¬ */
+	$"E0FF FFD4 E180 FF02 FDC9 F380 FF06 EFCA"            /* àÿÿÔá€ÿ.ýÉó€ÿ.ïÊ */
+	$"FFFF FAAE E582 FF01 B6DA 80FF 02F7 C7FB"            /* ÿÿú®å‚ÿ.¶Ú€ÿ.÷Çû */
+	$"80FF 03E5 D6D9 AC94 B103 B0A2 877B 817C"            /* €ÿ.åÖÙ¬”±.°¢‡{�| */
+	$"0100 0081 7C02 768D AC95 B002 AEB7 FB85"            /* ...�|.v�¬•°.®·û… */
+	$"FF01 CDB1 85FF 01C9 B890 FF01 D5B8 82FF"            /* ÿ.ͱ…ÿ.ɸ�ÿ.Õ¸‚ÿ */
+	$"02E0 B3FC 87FF 01D5 AA94 B003 AE9F 857B"            /* .à³ü‡ÿ.Õª”°.®Ÿ…{ */
+	$"817C 0100 0081 7C02 788A AB95 AF02 ADB6"            /* �|...�|.xŠ«•¯.­¶ */
+	$"FB84 FF02 F0A5 E584 FF02 EEA6 EC90 FF02"            /* û„ÿ.ð¥å„ÿ.î¦ì�ÿ. */
+	$"FCAE E281 FF02 FCB4 DB87 FF01 D5A9 94AF"            /* ü®â�ÿ.ü´Û‡ÿ.Õ©”¯ */
+	$"03AC 9D83 7B81 7C01 0000 817C 0278 86A9"            /* .¬�ƒ{�|...�|.x†© */
+	$"95AD 02AB B4FB 84FF 01BE BD85 FF01 BAC3"            /* •­.«´û„ÿ.¾½…ÿ.ºÃ */
+	$"92FF 01D6 B480 FF04 FCD8 A4B3 FB86 FF01"            /* ’ÿ.Ö´€ÿ.üؤ³û†ÿ. */
+	$"D4A7 94AD 03AB 9A81 7B81 7C01 0000 817C"            /* Ô§”­.«š�{�|...�| */
+	$"0278 83A7 95AC 02AA B3FB 83FF 02E5 A3F2"            /* .xƒ§•¬.ª³ûƒÿ.å£ò */
+	$"84FF 02E1 A5F6 92FF 09FD AEDC FBDE B595"            /* „ÿ.á¥ö’ÿÆý®ÜûÞµ• */
+	$"B6A9 D886 FF01 D3A6 94AC 03A9 9880 7B81"            /* ¶©Ø†ÿ.Ó¦”¬.©˜€{� */
+	$"7C01 0000 817C 0278 80A5 95AC 02AA B3FB"            /* |...�|.x€¥•¬.ª³û */
+	$"82FF 02FE B0CB 84FF 02FC ADD0 94FF 09DB"            /* ‚ÿ.þ°Ë„ÿ.ü­Ð”ÿÆÛ */
+	$"A1A8 95A2 D6FF D1AA FA85 FF01 D3A6 94AC"            /* ¡¨•¢ÖÿѪú…ÿ.Ó¦”¬ */
+	$"03A8 967F 7B81 7C01 0000 817C 0279 7FA3"            /* .¨–.{�|...�|.y.£ */
+	$"95AB 02A9 B2FB 82FF 02D7 A7FB 84FF 02D2"            /* •«.©²û‚ÿ.קû„ÿ.Ò */
+	$"AAFD 95FF 08AD B4DD FCFF FFFA A5D3 85FF"            /* ªý•ÿ.­´Ýüÿÿú¥Ó…ÿ */
+	$"01D3 A594 AB03 A694 7E7B 817C 0100 0081"            /* .Ó¥”«.¦”~{�|...� */
+	$"7C02 7A7D A095 A902 A7B1 FB81 FF02 F8A5"            /* |.z} •©.§±û�ÿ.ø¥ */
+	$"DA84 FF02 F4A4 E096 FF01 DCC2 82FF 02D3"            /* Ú„ÿ.ô¤à–ÿ.Ü‚ÿ.Ó */
+	$"A5F8 84FF 01D2 A394 A902 A491 7D82 7C01"            /* ¥ø„ÿ.Ò£”©.¤‘}‚|. */
+	$"0000 817C 027A 7A9E 95A8 08A6 B1EF F3F2"            /* ..�|.zzž•¨.¦±ïóò */
+	$"F2F6 C6B0 85FF 02C5 B4F5 95F2 03F3 F2B5"            /* òöÆ°…ÿ.Å´õ•ò.óòµ */
+	$"E881 FF03 FCA7 CCF6 82F2 02F7 CDA3 94A8"            /* è�ÿ.ü§Ìö‚ò.÷Í£”¨ */
+	$"01A3 8F83 7C01 0000 817C 027B 779C 96A7"            /* .£�ƒ|...�|.{wœ–§ */
+	$"00A8 82AB 019C E984 FF03 E9A6 AAAC 96AB"            /* .¨‚«.œé„ÿ.馪¬–« */
+	$"02AC A6C1 82FF 02D8 A0AC 83AB 00A9 95A7"            /* .¬¦Á‚ÿ.Ø ¬ƒ«.©•§ */
+	$"01A1 8D83 7C01 0000 817C 037B 7699 A595"            /* .¡�ƒ|...�|.{v™¥• */
+	$"A600 A580 A402 A599 C085 FF02 BCA1 A599"            /* ¦.¥€¤.¥™À…ÿ.¼¡¥™ */
+	$"A401 A5E9 81FF 02CB 96A3 83A4 00A5 95A6"            /* ¤.¥é�ÿ.Ë–£ƒ¤.¥•¦ */
+	$"029F 8A7B 827C 0100 0082 7C02 7596 A399"            /* .ŸŠ{‚|...‚|.u–£™ */
+	$"A402 A29F F584 FF01 DDA0 9BA4 09A0 BFFF"            /* ¤.¢Ÿõ„ÿ.Ý ›¤Æ ¿ÿ */
+	$"FFE6 ADAB D299 A59B A402 9D88 7B82 7C01"            /* ÿæ­«Ò™¥›¤.�ˆ{‚|. */
+	$"0000 827C 0276 94A2 98A3 02A4 98D1 84FF"            /* ..‚|.v”¢˜£.¤˜Ñ„ÿ */
+	$"02F9 AFA0 9CA3 09A4 B9A9 A0CB FCFF B599"            /* .ù¯ œ£Æ¤¹© Ëüÿµ™ */
+	$"A49A A302 9C87 7B82 7C01 0000 827C 0275"            /* ¤š£.œ‡{‚|...‚|.u */
+	$"92A2 98A3 02A1 A4F5 84FF 01CF 9E9D A303"            /* ’¢˜£.¡¤õ„ÿ.Ïž�£. */
+	$"A0A9 DEFB 80FF 02F3 9CA0 9AA3 029B 867B"            /*  ©Þû€ÿ.󜠚£.›†{ */
+	$"827C 0100 0081 7C03 7D74 8FA1 97A2 05A3"            /* ‚|...�|.}t�¡—¢.£ */
+	$"9FA0 9ED6 FE81 FF02 F0A6 A09D A202 A0A9"            /* Ÿ žÖþ�ÿ.ð¦ �¢. © */
+	$"F382 FF01 D893 9AA2 0299 837B 827C 0100"            /* ó‚ÿ.Ø“š¢.™ƒ{‚|.. */
+	$"0081 7C03 7D73 8D9F 97A0 069F 9FF1 D697"            /* .�|.}s�Ÿ— .ŸŸñÖ— */
+	$"A6E6 80FF 01C1 9B9F A001 9BD2 83FF 02BB"            /* ¦æ€ÿ.Á›Ÿ .›Òƒÿ.» */
+	$"94A1 98A0 0297 827B 827C 0100 0081 7C03"            /* ”¡˜ .—‚{‚|...�|. */
+	$"7D72 8A9E 979F 0B9D A6FB FFF9 BF91 B6F6"            /* }rŠž—Ÿ.�¦ûÿù¿‘¶ö */
+	$"E69E 9E9F 9F01 9BB4 83FF 03FA A199 A096"            /* æžžŸŸ.›´ƒÿ.ú¡™ – */
+	$"9F03 9E95 807B 827C 0100 0081 7C03 7D72"            /* Ÿ.ž•€{‚|...�|.}r */
+	$"889D 979E 0199 B281 FF04 EFAD 9EA9 9CA0"            /* ˆ�—ž.™²�ÿ.ï­ž©œ  */
+	$"9E02 9D9F EE83 FF01 E492 979E 039D 9480"            /* ž.�Ÿîƒÿ.ä’—ž.�”€ */
+	$"7B82 7C01 0000 817C 037D 7487 9B97 9D01"            /* {‚|...�|.}t‡›—�. */
+	$"96BF 82FF 02FE B697 A29D 0198 D184 FF02"            /* –¿‚ÿ.þ¶—¢�.˜Ñ„ÿ. */
+	$"C191 9E95 9D03 9C92 7F7B 827C 0100 0081"            /* Á‘ž•�.œ’.{‚|...� */
+	$"7C03 7D75 849A 979C 0194 CE81 FF02 F8BD"            /* |.}u„š—œ.”Î�ÿ.ø½ */
+	$"9BA3 9C01 98B4 84FF 02F8 9D99 959C 039B"            /* ›£œ.˜´„ÿ.ø�™•œ.› */
+	$"907E 7B82 7C01 0000 817C 037D 7482 9997"            /* �~{‚|...�|.}t‚™— */
+	$"9B01 94DF 80FF 03EE AD95 9AA3 9B02 9A9D"            /* ›.”߀ÿ.î­•š£›.š� */
+	$"EF84 FF02 CC91 9C94 9B03 9A8F 7C7B 827C"            /* ï„ÿ.Ì‘œ”›.š�|{‚| */
+	$"0100 0081 7C03 7D74 8098 979A 0697 ECFF"            /* ...�|.}t€˜—š.—ìÿ */
+	$"FFE0 A195 A69A 0195 D084 FF02 F098 9994"            /* ÿà¡•¦š.•Ð„ÿ.𘙔 */
+	$"9A02 998D 7B83 7C01 0000 817C 037D 737E"            /* š.™�{ƒ|...�|.}s~ */
+	$"9896 9A06 989F F9FF D099 97A7 9A02 96AD"            /* ˜–š.˜ŸùÿЙ—§š.–­ */
+	$"FD83 FF02 FCA6 9794 9A02 998D 7B83 7C01"            /* ýƒÿ.ü¦—”š.™�{ƒ|. */
+	$"0000 817C 037D 737D 9796 9905 95AD FCBE"            /* ..�|.}s}—–™.•­ü¾ */
+	$"9498 A999 0196 DD83 FF02 F7A3 9794 9902"            /* ”˜©™.–݃ÿ.÷£—”™. */
+	$"988C 7A83 7C01 0000 817C 037D 737B 9696"            /* ˜Œzƒ|...�|.}s{–– */
+	$"9803 95B0 B392 AB98 0294 AAF9 82FF 01CF"            /* ˜.•°³’«˜.”ªù‚ÿ.Ï */
+	$"9595 9802 978A 7A83 7C01 0000 817C 037D"            /* ••˜.—Šzƒ|...�|.} */
+	$"747B 9498 9700 94AD 9708 93B9 F9FF FFF6"            /* t{”˜—.”­—.“¹ùÿÿö */
+	$"C797 9695 9702 9688 7983 7C01 0000 817C"            /* Ç—–•—.–ˆyƒ|...�| */
+	$"037D 7479 93CA 9606 92A4 BEB8 9F91 9596"            /* .}ty“Ê–.’¤¾¸Ÿ‘•– */
+	$"9602 9588 7983 7C01 0000 817C 037D 7478"            /* –.•ˆyƒ|...�|.}tx */
+	$"93CB 9603 9390 9193 9896 0294 8779 837C"            /* “Ë–.“�‘“˜–.”‡yƒ| */
+	$"0100 0081 7C03 7D75 7892 EA95 0293 8679"            /* ...�|.}ux’ê•.“†y */
+	$"837C 0100 0081 7C03 7D75 7892 EA95 0293"            /* ƒ|...�|.}ux’ê•.“ */
+	$"8679 837C 0100 0081 7C03 7D76 7792 EA95"            /* †yƒ|...�|.}vw’ê• */
+	$"0293 8679 837C 0100 0081 7C03 7D76 7792"            /* .“†yƒ|...�|.}vw’ */
+	$"EA95 0293 8579 837C 0000 827C 037D 7776"            /* ê•.“…yƒ|..‚|.}wv */
+	$"8FEA 9402 9182 7883 7C00 0083 7C03 7A70"            /* �ê”.‘‚xƒ|..ƒ|.zp */
+	$"8288 E989 0285 7A79 837C 0100 0082 7C02"            /* ‚ˆé‰.…zyƒ|...‚|. */
+	$"7D78 76EA 7901 7779 847C 0100 00FB 7C01"            /* }xvêy.wy„|...û|. */
+	$"0000 FB7C 0100 00FB 7C01 0000 FB7C 0100"            /* ..û|...û|...û|.. */
+	$"00FA 7C81 00F9 7C82 00F7 7C83 00F6 7C86"            /* .ú|�.ù|‚.÷|ƒ.ö|† */
+	$"00F3 7CFF 00FF 0000 00FF 00FF 00FF 00FF"            /* .ó|ÿ.ÿ...ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 74D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.Ÿt× */
+	$"00A6 74D3 0001 7474 8000 9D73 8474 D000"            /* .¦tÓ..tt€.�s„tÐ. */
+	$"0374 7400 749E 7702 7673 7283 74D0 0003"            /* .tt.tžw.vsrƒtÐ.. */
+	$"7381 9FAB 9DAC 03A8 977A 7383 74CD 0004"            /* s�Ÿ«�¬.¨—zsƒtÍ.. */
+	$"7400 79AF CC9E CF03 CCBF 9B73 8374 CD00"            /* t.y¯ÌžÏ.Ì¿›sƒtÍ. */
+	$"0474 0088 C6D2 9FD3 03CA AF7C 7282 74CD"            /* .t.ˆÆÒŸÓ.ʯ|r‚tÍ */
+	$"0003 7400 8EC9 A0D3 03CC B27D 7282 74CC"            /* ..t.ŽÉ Ó.̲}r‚tÌ */
+	$"0004 7474 7094 CBA0 D203 CCB3 7C72 8374"            /* ..ttp”Ë Ò.̳|rƒt */
+	$"CB00 0474 7471 A1CE A0D1 03CC B67F 72B8"            /* Ë..ttq¡Î Ñ.̶.r¸ */
+	$"7495 0005 7474 0078 B7D0 A0D1 03CE BE8B"            /* t•..tt.x·Ð Ñ.ξ‹ */
+	$"70BA 7492 0006 7474 0070 96C9 CFA0 D004"            /* pºt’..tt.p–ÉÏ Ð. */
+	$"CFC6 A675 71BA 7490 0006 7474 0072 8FC0"            /* ÏƦuqºt�..tt.r�À */
+	$"CDA2 CF03 CBBF 9D7A B672 0473 0073 7474"            /* Í¢Ï.Ë¿�z¶r.s.stt */
+	$"8E00 0674 7400 799D C3CD A3CF 04CE CAC3"            /* Ž..tt.y�ÃÍ£Ï.ÎÊà */
+	$"B2A0 B598 0496 8D79 0074 8D00 0774 7400"            /* ² µ˜.–�y.t�..tt. */
+	$"79A8 C8CE CEA4 CF03 CECD CBC9 B5C7 03C3"            /* y¨ÈÎΤÏ.ÎÍËɵÇ.à */
+	$"B58F 0080 7489 0081 7403 7192 C1C8 E2C9"            /* µ�.€t‰.�t.q’ÁÈâÉ */
+	$"03C7 B995 7282 7486 0001 7474 8000 026E"            /* .ǹ•r‚t†..tt€..n */
+	$"91AC E3AF 04AE A58A 6F71 8000 0174 7484"            /* ‘¬ã¯.®¥Šoq€..tt„ */
+	$"0008 7400 7075 8085 8487 8E80 8FAA 9000"            /* ..t.pu€…„‡Ž€�ª�. */
+	$"8FB0 9080 8F09 8B87 8584 847F 7600 7474"            /* �°�€�Æ‹‡…„„.v.tt */
+	$"8200 0774 0070 8BAF BCBF C0E7 C109 C0BF"            /* ‚..t.p‹¯¼¿ÀçÁÆÀ¿ */
+	$"BEBE B8A6 8572 7474 8200 0370 8DC0 C9EE"            /* ¾¾¸¦…rtt‚..p�ÀÉî */
+	$"CA05 C9C4 B185 0074 8000 0474 0078 B4C8"            /* Ê.Éı….t€..t.x´È */
+	$"F0CA 0CC9 BFA1 7600 7400 0074 0088 BFC8"            /* ðÊ.É¿¡v.t..t.ˆ¿È */
+	$"B3C9 03CA C7C9 CAB7 C90A C3AD 7F00 7400"            /* ³É.ÊÇÉÊ·ÉÂí..t. */
+	$"0074 708C C0B3 C805 C9C3 B8B3 C4C9 B6C8"            /* .tpŒÀ³È.Éø³ÄÉ¶È */
+	$"0AC3 AE7F 0074 0074 7400 88BD B4C7 05C2"            /* Âî..t.tt.ˆ½´Ç. */
+	$"F1EC B2C4 C8B5 C70B C1AB 7C00 7400 7474"            /* ñì²ÄȵÇ.Á«|.t.tt */
+	$"0082 BAC6 B3C7 04C6 F2FF E6B3 B6C7 0BC0"            /* .‚ºÆ³Ç.Æòÿ泶Ç.À */
+	$"A67A 7374 0074 7400 7DB5 C5B3 C606 C3E7"            /* ¦zst.tt.}µÅ³Æ.Ãç */
+	$"FFFF D5B6 C8B4 C60B BDA1 7573 7400 7474"            /* ÿÿնȴÆ.½¡ust.tt */
+	$"0079 B0C4 B3C5 01C2 D880 FF02 C0BD C6B2"            /* .y°Ä³Å.ÂØ€ÿ.À½Æ² */
+	$"C50C C4BB 9D75 7374 0074 7473 75AA C2B3"            /* Å.Ä»�ust.ttsuªÂ³ */
+	$"C406 C3C9 FAFF FFF0 B3B3 C403 C3B8 9673"            /* Ä.ÃÉúÿÿð³³Ä.ø–s */
+	$"8474 01A5 C1B4 C301 C1EB 80FF 02D6 B4C5"            /* „t.¥Á´Ã.Áë€ÿ.Ö´Å */
+	$"B1C3 03C2 B591 7283 7402 719E BFB4 C201"            /* ±Ã.µ‘rƒt.qž¿´Â. */
+	$"BFD5 80FF 03FD BBBD C3B0 C203 C0B2 8E72"            /* ¿Õ€ÿ.ý»½Ã°Â.À²Žr */
+	$"8374 0270 99BD B4C1 02C0 C4F6 80FF 02E6"            /* ƒt.p™½´Á.ÀÄö€ÿ.æ */
+	$"B1C2 B0C1 03BE AF87 7283 7402 7193 BBB5"            /* ±Â°Á.¾¯‡rƒt.q“»µ */
+	$"C001 BCE1 81FF 02C6 B7C1 AFC0 06BD AC84"            /* À.¼á�ÿ.Æ·Á¯À.½¬„ */
+	$"7274 7400 8074 0270 8CB9 B1BF 00C0 80C1"            /* rtt.€t.pŒ¹±¿.À€Á */
+	$"02BD CAFD 80FF 01F1 B1B0 BF06 BBA9 8172"            /* .½Êý€ÿ.ñ±°¿.»©�r */
+	$"7474 0080 7402 7088 B7B0 BF07 C1B9 ACAB"            /* tt.€t.pˆ·°¿.Á¹¬« */
+	$"AEBC BEEB 81FF 02D1 B3C0 AEBF 06BA A67C"            /* ®¼¾ë�ÿ.ѳÀ®¿.º¦| */
+	$"7274 7400 8074 0271 83B4 AFBE 08BF AFB4"            /* rtt.€t.qƒ´¯¾.¿¯´ */
+	$"D9E3 D2AD B1D3 81FF 02F8 B4BC AEBE 06B8"            /* ÙãÒ­±Ó�ÿ.ø´¼®¾.¸ */
+	$"A27A 7374 7400 8074 0372 7DB1 BCAE BD01"            /* ¢zstt.€t.r}±¼®½. */
+	$"B9CA 81FF 03F6 B4B9 F381 FF02 D8AF BEAD"            /* ¹Ê�ÿ.ö´¹ó�ÿ.د¾­ */
+	$"BD0D B69F 7973 7474 0000 7474 727A ADBB"            /* ½.¶Ÿystt..ttrz­» */
+	$"ADBC 03BB ABB7 E681 FF02 E6AE D881 FF02"            /* ­¼.»«·æ�ÿ.æ®Ø�ÿ. */
+	$"FDB7 B8AD BC0D B49A 7673 7474 0000 7474"            /* ý·¸­¼.´švstt..tt */
+	$"7378 A9BA ACBB 0CBC ACDB D7A6 BDF0 FFFF"            /* sx©º¬».¼¬Ûצ½ðÿÿ */
+	$"FABA BEF7 81FF 02DF ACBC ACBB 01B2 9781"            /* úº¾÷�ÿ.߬¼¬».²—� */
+	$"7407 0000 7474 7374 A4B8 ABB9 0DBA B3BB"            /* t...ttst¤¸«¹.º³» */
+	$"FFFF F7C2 A4CB FAFC C0B4 DC82 FF02 BAB4"            /* ÿÿ÷¤ËúüÀ´Ü‚ÿ.º´ */
+	$"BAAB B901 B093 8174 0100 0080 7402 729F"            /* º«¹.°“�t...€t.rŸ */
+	$"B6AB B902 BAAA E981 FF07 ECB3 ABD1 BBB6"            /* ¶«¹.ºªé�ÿ.쳫ѻ¶ */
+	$"C0FA 81FF 02E4 AABA AAB9 03B8 AD8E 7380"            /* Àú�ÿ.䪺ª¹.¸­Žs€ */
+	$"7401 0000 8074 0272 9BB6 AAB8 02B9 ADC6"            /* t...€t.r›¶ª¸.¹­Æ */
+	$"84FF 05DC AFB7 B8B4 E082 FF02 BCB1 B9A9"            /* „ÿ.ܯ·¸´à‚ÿ.¼±¹© */
+	$"B803 B6AB 8A72 8074 0100 0080 7402 7095"            /* ¸.¶«Šr€t...€t.p• */
+	$"B4AA B602 B5AB F484 FF06 E9B6 B5B6 B4C2"            /* ´ª¶.µ«ô„ÿ.鶵¶´Â */
+	$"FC81 FF02 E6A9 B7A9 B603 B5A8 8872 8074"            /* ü�ÿ.æ©·©¶.µ¨ˆr€t */
+	$"0100 0080 7402 6F91 B3A9 B602 B7AD D684"            /* ...€t.o‘³©¶.·­Ö„ */
+	$"FF02 FAC0 B480 B601 B3E4 82FF 02BD AFB7"            /* ÿ.úÀ´€¶.³ä‚ÿ.½¯· */
+	$"A8B6 03B4 A584 7280 7401 0000 8074 0270"            /* ¨¶.´¥„r€t...€t.p */
+	$"8DB2 A9B6 02B4 ACE7 84FF 01D9 B181 B602"            /* �²©¶.´¬ç„ÿ.Ù±�¶. */
+	$"B3C5 FE81 FF02 E8A8 B7A8 B603 B3A3 8172"            /* ³Åþ�ÿ.訷¨¶.³£�r */
+	$"8074 0100 0080 7402 7087 B0A8 B505 B6AA"            /* €t...€t.p‡°¨µ.¶ª */
+	$"BDA4 C1F5 81FF 02F3 B8B4 82B5 01B2 E782"            /* ½¤Áõ�ÿ.ó¸´‚µ.²ç‚ */
+	$"FF02 BFAD B6A7 B503 B2A1 7F72 8074 0100"            /* ÿ.¿­¶§µ.²¡.r€t.. */
+	$"0080 7402 7083 ADA7 B40C B5AC BBFF F2B8"            /* .€t.pƒ­§´.µ¬»ÿò¸ */
+	$"A2D0 FBFF FFCE B083 B401 B1C5 82FF 02EA"            /* ¢Ðûÿÿΰƒ´.±Å‚ÿ.ê */
+	$"A7B5 A7B4 03B0 9E7C 7380 7401 0000 8074"            /* §µ§´.°ž|s€t...€t */
+	$"0271 80AB A8B3 01A5 EC80 FF06 E4AA A9E2"            /* .q€«¨³.¥ì€ÿ.䪩â */
+	$"EAB2 B284 B301 B1E8 82FF 02BF ABB4 A6B3"            /* ê²²„³.±è‚ÿ.¿«´¦³ */
+	$"03AE 9B79 7380 7401 0000 8074 0272 7DA8"            /* .®›ys€t...€t.r}¨ */
+	$"A6B2 02B3 A6C8 82FF 04FE D3A8 B2B1 85B2"            /* ¦².³¦È‚ÿ.þÓ¨²±…² */
+	$"01AE C582 FF02 EAA6 B3A6 B203 AC98 7873"            /* .®Å‚ÿ.꦳¦².¬˜xs */
+	$"8074 0100 0080 7403 7278 A5B0 A5B1 02AF"            /* €t...€t.rx¥°¥±.¯ */
+	$"A9F7 84FF 01DA AB86 B102 B0AF E982 FF02"            /* ©÷„ÿ.Ú«†±.°¯é‚ÿ. */
+	$"BEA9 B2A5 B103 AB95 7773 8074 0100 0080"            /* ¾©²¥±.«•ws€t...€ */
+	$"7403 7276 A2AF A4B0 02B1 A2D5 84FF 02F8"            /* t.rv¢¯¤°.±¢Õ„ÿ.ø */
+	$"BAAE 87B0 01AC C682 FF02 EAA4 B1A5 B003"            /* º®‡°.¬Æ‚ÿ.ꤱ¥°. */
+	$"A991 7573 8074 0100 0080 7402 7375 9FA4"            /* ©‘us€t...€t.suŸ¤ */
+	$"AE03 AFA9 B0FE 84FF 01D3 AA88 AE02 ADAD"            /* ®.¯©°þ„ÿ.Óªˆ®.­­ */
+	$"E982 FF02 BCA7 AFA4 AE01 A78E 8274 0100"            /* é‚ÿ.¼§¯¤®.§Ž‚t.. */
+	$"0081 7402 729B ADA3 AE02 AFA0 E384 FF02"            /* .�t.r›­£®.¯ ã„ÿ. */
+	$"F0B0 AD89 AE01 AAC4 82FF 02E9 A2AF A4AE"            /* ð°­‰®.ªÄ‚ÿ.颯¤® */
+	$"01A5 8C82 7401 0000 8174 0270 98AC 97AD"            /* .¥Œ‚t...�t.p˜¬—­ */
+	$"0DAC ADAE ACAE ADAC AEAD ACAE AEA4 BB85"            /* .¬­®¬®­¬®­¬®®¤»… */
+	$"FF11 C7A7 AEAD ACAE ADAC AEAC ACAE ACAD"            /* ÿ.ǧ®­¬®­¬®¬¬®¬­ */
+	$"AEAB ABE9 82FF 0EBB A6AE ADAC AEAC ACAE"            /* ®««é‚ÿ.»¦®­¬®¬¬® */
+	$"ACAD AEAC ADAE 97AD 01A3 8982 7401 0000"            /* ¬­®¬­®—­.£‰‚t... */
+	$"8174 0270 94AA 95AC 0FAD A79F A1A2 9FA2"            /* �t.p”ª•¬.­§Ÿ¡¢Ÿ¢ */
+	$"A29F A2A1 9FA4 A9A1 EF84 FF12 E6A2 9FA2"            /* ¢Ÿ¢¡Ÿ¤©¡ï„ÿ.梟¢ */
+	$"A1A0 A3A1 A0A2 A0A0 A3A0 A0A2 9F9D C282"            /* ¡ £¡ ¢  £  ¢Ÿ�‚ */
+	$"FF10 E6A0 A9A0 A0A2 A0A0 A2A0 A1A3 A0A1"            /* ÿ.æ ©  ¢  ¢ ¡£ ¡ */
+	$"A2A2 AB94 AC03 ABA1 8673 8174 0100 0081"            /* ¢¢«”¬.«¡†s�t...� */
+	$"7402 7091 A995 AB0E A9AF FACE C2FF BCCA"            /* t.p‘©•«.©¯úÎÂÿ¼Ê */
+	$"FFB6 DEFA B4A1 C884 FF14 FDB2 C0FF BFCF"            /* ÿ¶Þú´¡È„ÿ.ý²Àÿ¿Ï */
+	$"FFAF DCFA AFEA F1A8 F5E4 B2FE D79D E982"            /* ÿ¯Üú¯êñ¨õä²þ×�é‚ */
+	$"FF0F B8A1 E4F8 A9EA F0AE F7E0 ACFF D5C0"            /* ÿ.¸¡äø©êð®÷à¬ÿÕÀ */
+	$"D1A5 94AB 03AA 9F84 7381 7401 0000 8174"            /* Ñ¥”«.ªŸ„s�t...�t */
+	$"026F 8CA8 95A9 0EA7 B1FF CEC2 FFD0 DBFF"            /* .oŒ¨•©.§±ÿÎÂÿÐÛÿ */
+	$"B3E0 FFB6 A2F9 84FF 14D7 99D8 FFBE D0FF"            /* ³àÿ¶¢ù„ÿ.×™Øÿ¾Ðÿ */
+	$"C5E9 FFAC EEFA C0FE E7B0 FFE8 A3B9 82FF"            /* Åéÿ¬îúÀþç°ÿ裹‚ÿ */
+	$"0FE2 99EA FFC1 F5F4 ABFB EDC4 FFD7 BED6"            /* .â™êÿÁõô«ûíÄÿ×¾Ö */
+	$"A394 A903 A89C 8173 8174 0100 0080 7403"            /* £”©.¨œ�s�t...€t. */
+	$"756E 88A6 95A8 04A6 B0FF DDD3 81FF 04C9"            /* unˆ¦•¨.¦°ÿÝÓ�ÿ.É */
+	$"EBFB A6D5 84FF 06F6 A3DE FFFF D1DE 80FF"            /* ëû¦Õ„ÿ.ö£ÞÿÿÑÞ€ÿ */
+	$"02FD C4F2 80FF 06EE C6FF FFFA A7E2 82FF"            /* .ýÄò€ÿ.îÆÿÿú§â‚ÿ */
+	$"01B0 D780 FF02 F6C3 FB80 FF03 E3D3 D5A2"            /* .°×€ÿ.öÃû€ÿ.ãÓÕ¢ */
+	$"94A8 03A7 9A7F 7381 7401 0000 8074 0375"            /* ”¨.§š.s�t...€t.u */
+	$"6E85 A495 A702 A5AF FA85 FF01 C7AB 85FF"            /* n…¤•§.¥¯ú…ÿ.Ç«…ÿ */
+	$"01C4 B290 FF01 D1B1 82FF 02DD ACFB 87FF"            /* .IJ�ÿ.ѱ‚ÿ.ݬû‡ÿ */
+	$"01D1 A194 A703 A598 7D73 8174 0100 0081"            /* .Ñ¡”§.¥˜}s�t...� */
+	$"7402 7082 A295 A602 A4AE FB84 FF02 EF9C"            /* t.p‚¢•¦.¤®û„ÿ.ïœ */
+	$"E484 FF02 EC9E EB90 FF02 FCA7 DF81 FF02"            /* ä„ÿ.ìžë�ÿ.ü§ß�ÿ. */
+	$"FCAD D787 FF01 D0A0 94A6 03A3 957B 7381"            /* ü­×‡ÿ.Р”¦.£•{s� */
+	$"7401 0000 8174 0270 7EA1 95A6 02A4 AEFB"            /* t...�t.p~¡•¦.¤®û */
+	$"84FF 01B8 B885 FF01 B4BF 92FF 01D4 AD80"            /* „ÿ.¸¸…ÿ.´¿’ÿ.Ô­€ */
+	$"FF04 FCD4 9CAC FA86 FF01 D0A0 94A6 03A3"            /* ÿ.üÔœ¬ú†ÿ.Р”¦.£ */
+	$"937A 7381 7401 0000 8174 0270 7B9F 95A4"            /* “zs�t...�t.p{Ÿ•¤ */
+	$"02A2 ACFA 83FF 02E3 9BF1 84FF 02DE 9EF5"            /* .¢¬úƒÿ.ã›ñ„ÿ.Þžõ */
+	$"92FF 09FD A8D9 FADB AD8B B1A1 D486 FF01"            /* ’ÿÆý¨ÙúÛ­‹±¡Ô†ÿ. */
+	$"CF9E 94A4 03A1 9178 7381 7401 0000 8174"            /* Ïž”¤.¡‘xs�t...�t */
+	$"0270 779D 95A3 02A1 ACFA 82FF 02FD A9C7"            /* .pw�•£.¡¬ú‚ÿ.ý©Ç */
+	$"84FF 02FC A5CD 94FF 09D9 989F 8B9B D3FF"            /* „ÿ.ü¥Í”ÿÆÙ˜Ÿ‹›Óÿ */
+	$"CDA1 F985 FF01 CF9D 94A3 03A0 8E77 7381"            /* Í¡ù…ÿ.Ï�”£. Žws� */
+	$"7401 0000 8174 0271 779A 95A2 02A0 ABFA"            /* t...�t.qwš•¢. «ú */
+	$"82FF 02D4 A0FB 84FF 02CE A2FD 95FF 08A6"            /* ‚ÿ.Ô û„ÿ.΢ý•ÿ.¦ */
+	$"AEDB FCFF FFFA 9ECF 85FF 01CE 9C94 A203"            /* ®ÛüÿÿúžÏ…ÿ.Îœ”¢. */
+	$"9E8C 7673 8174 0100 0081 7402 7275 9895"            /* žŒvs�t...�t.ru˜• */
+	$"A102 9FAA FA81 FF02 F79D D784 FF02 F29C"            /* ¡.Ÿªú�ÿ.÷�ׄÿ.òœ */
+	$"DE96 FF01 DABD 82FF 02D0 9DF8 84FF 01CE"            /* Þ–ÿ.Ú½‚ÿ.Ð�ø„ÿ.Î */
+	$"9A94 A102 9C8A 7582 7401 0000 8174 0272"            /* š”¡.œŠu‚t...�t.r */
+	$"7196 959F 089D A9EE F2F1 F1F6 C0AA 85FF"            /* q–•Ÿ.�©îòññöÀª…ÿ */
+	$"02C0 ADF5 95F1 03F2 F1AE E681 FF03 FCA0"            /* .À­õ•ñ.òñ®æ�ÿ.ü  */
+	$"C7F5 82F1 02F6 C89A 949F 029A 8775 8274"            /* Çõ‚ñ.öÈš”Ÿ.š‡u‚t */
+	$"0100 0081 7402 736F 9396 9E00 9F82 A201"            /* ...�t.so“–ž.Ÿ‚¢. */
+	$"93E8 84FF 03E8 9EA2 A396 A202 A39D BB82"            /* “è„ÿ.螢£–¢.£�»‚ */
+	$"FF02 D597 A383 A200 A195 9E01 9985 8374"            /* ÿ.Õ—£ƒ¢.¡•ž.™…ƒt */
+	$"0100 0081 7403 736E 929D 959E 009D 809C"            /* ...�t.sn’�•ž.�€œ */
+	$"029D 91BC 84FF 03FE B599 9D99 9C01 9DE7"            /* .�‘¼„ÿ.þµ™�™œ.�ç */
+	$"81FF 02C7 8D9B 839C 009D 959E 0198 8383"            /* �ÿ.Ç�›ƒœ.�•ž.˜ƒƒ */
+	$"7401 0000 8274 016E 8F9A 9C02 9A98 F484"            /* t...‚t.n�šœ.š˜ô„ */
+	$"FF01 DA99 9B9C 0997 B9FF FFE4 A7A6 CF91"            /* ÿ.Ú™›œÆ—¹ÿÿ䧦ϑ */
+	$"9D9B 9C02 9681 7382 7401 0000 8274 026F"            /* �›œ.–�s‚t...‚t.o */
+	$"8C9A 989B 029C 90CF 84FF 02F8 A998 9D9B"            /* Œš˜›.œ�Ï„ÿ.ø©˜�› */
+	$"08B3 A39A C8FC FFB0 919C 9A9B 0294 8073"            /* .³£šÈüÿ°‘œš›.”€s */
+	$"8274 0100 0082 7402 6D8A 9998 9A02 989C"            /* ‚t...‚t.mŠ™˜š.˜œ */
+	$"F484 FF01 CB94 9D9A 0397 A2DD FB80 FF02"            /* ô„ÿ.Ë”�š.—¢Ýû€ÿ. */
+	$"F294 979A 9A02 927E 7382 7401 0000 8174"            /* ò”—šš.’~s‚t...�t */
+	$"0375 6B87 9898 9904 969A 96D2 FE81 FF02"            /* .uk‡˜˜™.–š–Òþ�ÿ. */
+	$"EF9E 979D 9902 97A1 F382 FF02 D68A 9A99"            /* ïž—�™.—¡ó‚ÿ.ÖŠš™ */
+	$"9902 917C 7382 7401 0000 8174 0375 6A85"            /* ™.‘|s‚t...�t.uj… */
+	$"9797 9806 9798 F1D3 8F9F E480 FF01 BB92"            /* ——˜.—˜ñÓ�Ÿä€ÿ.»’ */
+	$"9F98 0192 CF83 FF02 B68A 9998 9802 8F7B"            /* Ÿ˜.’σÿ.¶Š™˜˜.�{ */
+	$"7382 7401 0000 8174 0375 6A82 9597 960B"            /* s‚t...�t.uj‚•—–. */
+	$"939F FBFF F9BB 89B0 F5E4 9595 9F96 0192"            /* “Ÿûÿù»‰°õä••Ÿ–.’ */
+	$"AD83 FF03 FA9B 9097 9796 028D 7973 8274"            /* ­ƒÿ.ú›�——–.�ys‚t */
+	$"0100 0081 7403 756A 8195 9796 0191 AC81"            /* ...�t.uj�•—–.‘¬� */
+	$"FF04 EEA8 97A2 94A0 9602 9597 EC83 FF01"            /* ÿ.¢” –.•—ìƒÿ. */
+	$"E28A 9796 0395 8C78 7382 7401 0000 8174"            /* ⊗–.•Œxs‚t...�t */
+	$"0375 6C7F 9497 9501 8EBB 82FF 02FE B28E"            /* .ul.”—•.Ž»‚ÿ.þ²Ž */
+	$"A295 018F CE84 FF02 BD89 9695 9503 948B"            /* ¢•.�΄ÿ.½‰–••.”‹ */
+	$"7873 8274 0100 0081 7403 756D 7D92 9794"            /* xs‚t...�t.um}’—” */
+	$"018C CB81 FF02 F8B8 93A3 9401 90AE 84FF"            /* .ŒË�ÿ.ø¸“£”.�®„ÿ */
+	$"02F7 9691 9594 0393 8A77 7382 7401 0000"            /* .÷–‘•”.“Šws‚t... */
+	$"8174 0375 6C7B 9197 9301 8CDD 80FF 02ED"            /* �t.ul{‘—“.ŒÝ€ÿ.í */
+	$"A78D A493 0292 96EE 84FF 02C8 8894 9493"            /* §�¤“.’–î„ÿ.Ȉ””“ */
+	$"0392 8875 7382 7401 0000 8174 0375 6C79"            /* .’ˆus‚t...�t.uly */
+	$"9096 9207 9190 EBFF FFDE 9A8D A692 018C"            /* �–’.‘�ëÿÿÞš�¦’.Œ */
+	$"CC84 FF02 EF91 9194 9201 9186 8474 0100"            /* Ì„ÿ.ï‘‘”’.‘†„t.. */
+	$"0081 7403 756B 7790 9692 0690 97F8 FFCC"            /* .�t.ukw�–’.�—øÿÌ */
+	$"918E A792 028E A6FD 83FF 02FC 9F8F 9492"            /* ‘Ž§’.Ž¦ýƒÿ.üŸ�”’ */
+	$"0191 8584 7401 0000 8174 0375 6B75 8E96"            /* .‘…„t...�t.ukuŽ– */
+	$"9005 8BA7 FCBA 8B8E A990 018D DB83 FF02"            /* �.‹§üº‹Ž©�.�Ûƒÿ. */
+	$"F79B 8D94 9002 8F83 7383 7401 0000 8174"            /* ÷›�”�.�ƒsƒt...�t */
+	$"0375 6C74 8E96 9004 8CAA AD89 8FAA 9002"            /* .ultŽ–�.Œª­‰�ª�. */
+	$"8CA3 F982 FF01 CB8C 9590 028F 8373 8374"            /* Œ£ù‚ÿ.ËŒ•�.�ƒsƒt */
+	$"0100 0081 7403 756B 728D 988F 008B AD8F"            /* ...�t.ukr�˜�.‹­� */
+	$"088A B4F9 FFFF F6C3 8E8E 958F 028E 8172"            /* .Š´ùÿÿöÃŽŽ•�.Ž�r */
+	$"8374 0100 0081 7403 756C 718C CA8E 068A"            /* ƒt...�t.ulqŒÊŽ.Š */
+	$"9DBA B398 898D 968E 028D 8072 8374 0100"            /* �º³˜‰�–Ž.�€rƒt.. */
+	$"0081 7403 756C 718B CB8E 038B 8888 8B98"            /* .�t.ulq‹ËŽ.‹ˆˆ‹˜ */
+	$"8E02 8C80 7283 7401 0000 8174 0375 6D71"            /* Ž.Œ€rƒt...�t.umq */
+	$"8BEA 8E02 8C80 7283 7401 0000 8174 0375"            /* ‹êŽ.Œ€rƒt...�t.u */
+	$"6D70 8AEA 8D02 8B7F 7283 7401 0000 8174"            /* mpŠê�.‹.rƒt...�t */
+	$"0375 6E70 8AEA 8D02 8B7E 7283 7401 0000"            /* .unpŠê�.‹~rƒt... */
+	$"8174 0375 6E70 8AEA 8D02 8B7E 7283 7400"            /* �t.unpŠê�.‹~rƒt. */
+	$"0082 7403 756F 6E88 EA8C 0289 7B71 8374"            /* .‚t.uonˆêŒ.‰{qƒt */
+	$"0000 8374 0372 697B 81E9 8202 7E73 7283"            /* ..ƒt.ri{�é‚.~srƒ */
+	$"7401 0000 8274 0475 706E 7172 E671 0372"            /* t...‚t.upnqræq.r */
+	$"7270 7284 7401 0000 FB74 0100 00FB 7401"            /* rpr„t...ût...ût. */
+	$"0000 FB74 0100 00FB 7401 0000 FA74 8100"            /* ..ût...ût...út�. */
+	$"F974 8200 F774 8300 F674 8600 F374 FF00"            /* ùt‚.÷tƒ.öt†.ótÿ. */
+	$"FF00 0000 7438 6D6B 0000 4008 0000 0000"            /* ÿ...t8mk..@..... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0101 0101 0202 0202 0202 0202 0202 0202"            /* ................ */
+	$"0202 0202 0202 0202 0202 0202 0202 0101"            /* ................ */
+	$"0101 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0102 0202"            /* ................ */
+	$"0304 0505 0606 0606 0606 0606 0606 0606"            /* ................ */
+	$"0606 0606 0606 0606 0606 0606 0606 0505"            /* ................ */
+	$"0503 0302 0100 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0001 0100 0000"            /* ................ */
+	$"0204 0506 0707 0707 0707 0707 0707 0707"            /* ................ */
+	$"0707 0707 0707 0707 0707 0707 0707 0606"            /* ................ */
+	$"090A 0805 0302 0100 0000 0000 0000 0000"            /* ÆÂ.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0101 001C 2F31"            /* ............../1 */
+	$"3436 383A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A"            /* 468::::::::::::: */
+	$"3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A34"            /* :::::::::::::::4 */
+	$"120B 0F0B 0704 0201 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0004 8FF3 FAF9"            /* ............�óúù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 FAFA"            /* ùùùùùùùùùùùùùùúú */
+	$"C433 1112 0C07 0402 0100 0000 0000 0000"            /* Ä3.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 0067 FFFF FFFF"            /* ...........gÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFC3 201A 130C 0703 0100 0000 0000 0000"            /* ÿÃ ............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 00A9 FFFF FFFF"            /* ...........©ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFF8 4A20 1B11 0A05 0200 0000 0000 0000"            /* ÿøJ ..Â......... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0002 00B6 FFFF FFFF"            /* ...........¶ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFB 5928 2216 0D07 0200 0000 0000 0000"            /* ÿûY("........... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0103 07CC FFFF FFFF"            /* ...........Ìÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFD 6231 291B 1109 0401 0000 0000 0000"            /* ÿýb1)..Æ........ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0201 21F0 FFFF FFFF"            /* ..........!ðÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 7337 2F21 160D 0704 0303 0303 0303"            /* ÿÿs7/!.......... */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0302 0201 0100"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0001 0500 69FF FFFF FFFF"            /* ..........iÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 9A38 3628 1C14 0E0A 0909 0909 0909"            /* ÿÿš86(...ÂÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0807 0604 0302"            /* ÆÆÆÆÆÆÆÆÆÆ...... */
+	$"0100 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0203 0021 DFFF FFFF FFFF"            /* .........!ßÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF E653 312D 231B 1512 1011 1010 1010"            /* ÿÿæS1-#......... */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 0E0C 0A08 0504"            /* ............Â... */
+	$"0301 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0002 0200 34D3 FFFF FFFF FFFF"            /* ........4Óÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFD6 6E40 312A 2522 2121 2121 2121"            /* ÿÿÿÖn@1*%"!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2120 1E1B 1814 0D00"            /* !!!!!!!!! ...... */
+	$"0203 0100 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0102 006C F4FF FFFF FFFF FFFF"            /* .......lôÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FEE8 DAD9 D9D8 D8D8 D8D8 D8D8"            /* ÿÿÿÿþèÚÙÙØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D7D7 D6D5 D5A9"            /* ØØØØØØØØØØ××ÖÕÕ© */
+	$"1E00 0200 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0001 0300 71FF FFFF FFFF FFFF FFFF"            /* ......qÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"8500 0402 0100 0000 0000 0000 0000 0000"            /* …............... */
+	$"0001 0203 0317 E1FF FFFF FFFF FFFF FFFF"            /* ......áÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"9E03 0905 0302 0100 0000 0000 0000 0000"            /* ž.Æ............. */
+	$"0201 0000 002C E4E8 E8E9 EAEB ECEC EDED"            /* .....,äèèéêëììíí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED ECEC ECEC ECEC ECEC ECEC ECEC"            /* ííííìììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEB EAE9 E8F4"            /* ìììììììììììëêéèô */
+	$"8E02 0400 0000 0202 0000 0000 0000 0002"            /* Ž............... */
+	$"0012 6297 A3A9 BBBD C0C4 C7CA CCCD CECE"            /* ..b—£©»½ÀÄÇÊÌÍÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CDCD CCCC CCCC CBCB CBCB CBCB"            /* ÎÎÎÎÍÍÌÌÌÌËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBC9 C8C5 C2C0"            /* ËËËËËËËËËËËÉÈÅÂÀ */
+	$"B5A6 A5A1 8236 0002 0100 0000 0000 0100"            /* µ¦¥¡‚6.......... */
+	$"35DC FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 5Üÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFE 8901 0101 0000 0000 001B"            /* ÿÿÿÿÿþ‰......... */
+	$"DFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF73 0002 0000 0001 0082"            /* ÿÿÿÿÿÿÿs.......‚ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE4 1800 0100 0001 00C0"            /* ÿÿÿÿÿÿÿä.......À */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4500 0200 0002 02C6"            /* ÿÿÿÿÿÿÿÿE......Æ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4C00 0200 0103 00B3"            /* ÿÿÿÿÿÿÿÿL......³ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFE 3D00 0300 0104 009C"            /* ÿÿÿÿÿÿÿþ=......œ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFF4 2C04 0400 0105 0087"            /* ÿÿÿÿÿÿÿô,......‡ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE8 2007 0400 0105 0073"            /* ÿÿÿÿÿÿÿè ......s */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFD9 1808 0400 0105 015C"            /* ÿÿÿÿÿÿÿÙ.......\ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFC7 0E0A 0401 0105 034A"            /* ÿÿÿÿÿÿÿÇ.Â.....J */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFB5 0A0A 0402 0105 043C"            /* ÿÿÿÿÿÿÿµÂÂ.....< */
+	$"FBFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFA1 080A 0402 0105 062B"            /* ÿÿÿÿÿÿÿ¡.Â.....+ */
+	$"F2FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* òÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF8E 050A 0402 0104 0720"            /* ÿÿÿÿÿÿÿŽ.Â.....  */
+	$"E7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF7C 0609 0300 0104 0817"            /* ÿÿÿÿÿÿÿ|.Æ...... */
+	$"D8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF68 0709 0300 0104 0A0E"            /* ÿÿÿÿÿÿÿh.Æ....Â. */
+	$"C8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Èÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF55 0809 0300 0104 0A0A"            /* ÿÿÿÿÿÿÿU.Æ....ÂÂ */
+	$"B7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ·ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF47 0909 0300 0104 0A07"            /* ÿÿÿÿÿÿÿGÆÆ....Â. */
+	$"A4FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ¤ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF F638 0B08 0300 0004 0A05"            /* ÿÿÿÿÿÿö8......Â. */
+	$"91FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ‘ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF EE2B 0C08 0300 0004 0905"            /* ÿÿÿÿÿÿî+......Æ. */
+	$"81FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* �ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF E224 0D08 0300 0003 0906"            /* ÿÿÿÿÿÿâ$......Æ. */
+	$"71FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* qÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF D51C 0E08 0300 0003 0907"            /* ÿÿÿÿÿÿÕ.......Æ. */
+	$"5EFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ^ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF C714 0F07 0200 0003 0908"            /* ÿÿÿÿÿÿÇ.......Æ. */
+	$"4FFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF B811 0E07 0200 0003 090A"            /* ÿÿÿÿÿÿ¸.......ÆÂ */
+	$"43FD FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Cýÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF A70E 0F07 0200 0003 080B"            /* ÿÿÿÿÿÿ§......... */
+	$"34F5 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 4õÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 960C 0E06 0200 0002 080D"            /* ÿÿÿÿÿÿ–......... */
+	$"29EB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* )ëÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 850C 0E07 0200 0003 080E"            /* ÿÿÿÿÿÿ…......... */
+	$"22E0 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* "àÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 760D 0E06 0200 0003 080F"            /* ÿÿÿÿÿÿv......... */
+	$"1BD3 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Óÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 650E 0E06 0200 0002 080F"            /* ÿÿÿÿÿÿe......... */
+	$"14C7 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 580E 0D06 0200 0002 070F"            /* ÿÿÿÿÿÿX......... */
+	$"11B9 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .¹ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 4E10 0D06 0100 0002 070F"            /* ÿÿÿÿÿÿN......... */
+	$"10AB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .«ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 4211 0D06 0200 0002 070F"            /* ÿÿÿÿÿøB......... */
+	$"0D9B FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .›ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF1 3513 0D06 0200 0002 080F"            /* ÿÿÿÿÿñ5......... */
+	$"0C8D FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE9 2E13 0D05 0100 0002 070F"            /* ÿÿÿÿÿé.......... */
+	$"0D81 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFDF 2914 0D06 0100 0002 070F"            /* ÿÿÿÿÿß)......... */
+	$"0E73 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .sÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD4 2215 0C06 0100 0002 070F"            /* ÿÿÿÿÿÔ"......... */
+	$"0F64 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .dÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC9 1C16 0C05 0100 0002 070F"            /* ÿÿÿÿÿÉ.......... */
+	$"1058 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Xÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFBD 1A15 0C05 0100 0002 070F"            /* ÿÿÿÿÿ½.......... */
+	$"114F FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB2 1815 0C05 0100 0002 070E"            /* ÿÿÿÿÿ².......... */
+	$"1246 FAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Fúÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 1615 0C05 0100 0002 070E"            /* ÿÿÿÿÿ¥.......... */
+	$"133B F4FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .;ôÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF98 1515 0C05 0100 0002 060E"            /* ÿÿÿÿÿ˜.......... */
+	$"1533 EEFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .3îÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF8D 1515 0B05 0100 0002 070E"            /* ÿÿÿÿÿ�.......... */
+	$"152F E6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ./æÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF82 1615 0B05 0100 0002 070E"            /* ÿÿÿÿÿ‚.......... */
+	$"1629 DDFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .)Ýÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF77 1615 0B05 0100 0002 060E"            /* ÿÿÿÿÿw.......... */
+	$"1624 D5FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Õÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6B 1715 0B05 0100 0002 060E"            /* ÿÿÿÿÿk.......... */
+	$"1720 CCFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Ìÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF61 1815 0B05 0100 0002 060E"            /* ÿÿÿÿÿa.......... */
+	$"181D C3FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Ãÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5B 1914 0B05 0100 0002 060E"            /* ÿÿÿÿÿ[.......... */
+	$"181C BAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..ºÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FE54 1A14 0B05 0100 0002 070E"            /* ÿÿÿÿþT.......... */
+	$"181B B0FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..°ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F94C 1B15 0B04 0100 0002 060E"            /* ÿÿÿÿùL.......... */
+	$"181A A6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..¦ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F544 1C15 0B05 0100 0002 070E"            /* ÿÿÿÿõD.......... */
+	$"1819 9DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..�ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F13D 1D14 0B04 0100 0002 060E"            /* ÿÿÿÿñ=.......... */
+	$"1819 95FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..•ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF EB3A 1D14 0B05 0100 0002 070E"            /* ÿÿÿÿë:.......... */
+	$"1819 8EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Žÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF E537 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿå7.......... */
+	$"181A 86FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..†ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF DF34 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿß4.......... */
+	$"181B 7EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..~ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D930 1F15 0B05 0100 0002 070E"            /* ÿÿÿÿÙ0.......... */
+	$"181B 78FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..xÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D32D 1F15 0B05 0100 0002 070F"            /* ÿÿÿÿÓ-.......... */
+	$"191C 71FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..qÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF CE29 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÎ) ......... */
+	$"191D 6AFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..jÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C828 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÈ( ......... */
+	$"191D 65FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..eÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C328 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÃ( ......... */
+	$"191E 61FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..aÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF BE28 2115 0B05 0100 0002 070F"            /* ÿÿÿÿ¾(!......... */
+	$"191F 5DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..]ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B827 2115 0C05 0100 0002 070F"            /* ÿÿÿÿ¸'!......... */
+	$"1920 5AFE FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Zþÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B427 2115 0C05 0100 0003 0710"            /* ÿÿÿÿ´'!......... */
+	$"1A21 58FD FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Xýÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B026 2115 0C05 0100 0003 0810"            /* ÿÿÿÿ°&!......... */
+	$"1A21 55FB FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Uûÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF AC26 2116 0C05 0200 0003 0810"            /* ÿÿÿÿ¬&!......... */
+	$"1A22 52F9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ."Rùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A826 2215 0C05 0100 0003 0810"            /* ÿÿÿÿ¨&"......... */
+	$"1A23 4FF7 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .#O÷ÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A426 2316 0D06 0200 0003 0811"            /* ÿÿÿÿ¤&#......... */
+	$"1B24 4DF6 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Möÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A126 2316 0D06 0200 0003 0911"            /* ÿÿÿÿ¡&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9F26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿŸ&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9E26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿž&#.......Æ. */
+	$"1C26 4BF4 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Kôÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9D27 2317 0D06 0200 0004 0912"            /* ÿÿÿÿ�'#.......Æ. */
+	$"1C26 4AF3 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Jóÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9C27 2417 0D06 0200 0104 0912"            /* ÿÿÿÿœ'$.......Æ. */
+	$"1C26 47F2 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Gòÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9A27 2417 0D06 0200 0103 0911"            /* ÿÿÿÿš'$.......Æ. */
+	$"1B27 37D1 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .'7Ñÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 7329 2316 0D06 0200 0003 0810"            /* ÿÿÿÿs)#......... */
+	$"1A27 2F59 B7C6 C6C7 C7C7 C7C7 C7C7 C7C7"            /* .'/Y·ÆÆÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C5 C689 372D 2015 0C06 0200 0003 070E"            /* ÇÅƉ7- ......... */
+	$"1723 3037 3C46 4C4F 5050 5050 5050 5050"            /* .#07<FLOPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"4D49 4138 352A 1D13 0A05 0100 0003 060C"            /* MIA85*..Â....... */
+	$"141E 2934 3D44 494C 4D4E 4E4E 4E4E 4E4E"            /* ..)4=DILMNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4D"            /* NNNNNNNNNNNNNNNM */
+	$"4B46 4039 2F24 1910 0904 0100 0002 050A"            /* KF@9/$..Æ...... */
+	$"1018 212B 3339 3D40 4142 4242 4242 4242"            /* ..!+39=@ABBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4140"            /* BBBBBBBBBBBBBBA@ */
+	$"3F3B 352F 261D 140D 0703 0100 0002 0407"            /* ?;5/&........... */
+	$"0C12 1920 272C 2F32 3233 3333 3333 3333"            /* ... ',/223333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3332"            /* 3333333333333332 */
+	$"302D 2924 1D16 0F09 0502 0100 0001 0305"            /* 0-)$...Æ........ */
+	$"080D 1217 1C1F 2223 2425 2525 2525 2525"            /* ......"#$%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2524"            /* %%%%%%%%%%%%%%%$ */
+	$"2221 1E19 1510 0B07 0402 0000 0000 0103"            /* "!.............. */
+	$"0609 0C10 1315 1718 1919 1919 1919 1919"            /* .Æ.............. */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1918"            /* ................ */
+	$"1716 1411 0E0A 0704 0201 0000 0000 0002"            /* .....Â.......... */
+	$"0305 0709 0B0D 0E0F 0F0F 0F0F 0F0F 0F0F"            /* ...Æ............ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0D 0C0A 0806 0402 0100 0000 0000 0001"            /* ...Â............ */
+	$"0103 0304 0607 0708 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0707 0605 0403 0201 0000 0000 0000 0000"            /* ................ */
+	$"0001 0102 0202 0203 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0202 0202 0201 0100 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 6963 3038"            /* ............ic08 */
+	$"0000 5CBD 0000 000C 6A50 2020 0D0A 870A"            /* ..\½....jP  .‡ */
+	$"0000 0014 6674 7970 6A70 3220 0000 0000"            /* ....ftypjp2 .... */
+	$"6A70 3220 0000 004F 6A70 3268 0000 0016"            /* jp2 ...Ojp2h.... */
+	$"6968 6472 0000 0100 0000 0100 0004 0707"            /* ihdr............ */
+	$"0100 0000 000F 636F 6C72 0100 0000 0000"            /* ......colr...... */
+	$"1000 0000 2263 6465 6600 0400 0000 0000"            /* ...."cdef....... */
+	$"0100 0300 0100 0000 0100 0000 0200 0200"            /* ................ */
+	$"0000 0300 0000 006A 7032 63FF 4FFF 5100"            /* .......jp2cÿOÿQ. */
+	$"3200 0000 0001 0000 0001 0000 0000 0000"            /* 2............... */
+	$"0000 0000 0001 0000 0001 0000 0000 0000"            /* ................ */
+	$"0000 0000 0407 0101 0701 0107 0101 0701"            /* ................ */
+	$"01FF 5200 0C00 0000 0101 0504 0400 01FF"            /* .ÿR............ÿ */
+	$"5C00 1320 5058 5860 5858 6058 5860 5858"            /* \.. PXX`XX`XX`XX */
+	$"5850 5058 FF64 0011 0001 4B61 6B61 6475"            /* XPPXÿd....Kakadu */
+	$"2D76 352E 322E 31FF 9000 0A00 0000 005B"            /* -v5.2.1ÿ�.Â....[ */
+	$"D000 01FF 93CF C100 1507 F18D 1991 E793"            /* Ð..ÿ“ÏÁ...ñ�.‘ç“ */
+	$"D8B4 6B7C 459C 4F68 E4BF E0FF 0D3D C2DF"            /* Ø´k|EœOhä¿àÿ.=Âß */
+	$"FC16 8F7F 6C3A 7FEA ACD5 8632 D1AD 37A6"            /* ü.�.l:.ê¬Õ†2Ñ­7¦ */
+	$"22E3 4753 734F 3BFA 0372 1596 A8F1 7183"            /* "ãGSsO;ú.r.–¨ñqƒ */
+	$"2F17 0A65 C5C2 6A8E C0F9 1000 39CE 9180"            /* /.ÂeÅÂjŽÀù..9Α€ */
+	$"AE4A F551 B521 2839 FEE4 4D31 9F98 9F17"            /* ®JõQµ!(9þäM1Ÿ˜Ÿ. */
+	$"29F2 C91D 3B35 397E 15A1 8246 C3EA 3107"            /* )òÉ.;59~.¡‚FÃê1. */
+	$"5630 A744 5105 404A C843 0AE4 304B 4FE9"            /* V0§DQ.@JÈCÂä0KOé */
+	$"81E4 4C91 DF64 6885 8D23 6517 B254 DE23"            /* �äL‘ßdh…�#e.²TÞ# */
+	$"6101 3C94 9245 923D 4F4C 0F02 784C F319"            /* a.<”’E’=OL..xLó. */
+	$"CFC0 FC11 7EC2 D9C4 3907 5FDC 553A F1E1"            /* ÏÀü.~ÂÙÄ9._ÜU:ñá */
+	$"F2BC 6420 59D8 7D25 F42A 5BA5 8E8E 7166"            /* ò¼d YØ}%ô*[¥ŽŽqf */
+	$"AD5D 5C91 CC75 1452 ACDA 64CA 3249 CCE3"            /* ­]\‘Ìu.R¬ÚdÊ2IÌã */
+	$"6874 83E2 633E 64E7 8159 4AA2 FD3C 638D"            /* htƒâc>dç�YJ¢ý<c� */
+	$"F978 C3ED 328F C0F2 1F81 A80C BB81 9421"            /* ùxÃí2�Àò.�¨.»�”! */
+	$"980D F457 0EA7 7782 676F 2AB3 EE8F 99C2"            /* ˜.ôW.§w‚go*³î�™Â */
+	$"2221 9D95 8C80 C3A8 91F3 4C08 6A03 DE45"            /* "!�•Œ€Ã¨‘óL.j.ÞE */
+	$"A985 9B7B 9ED3 A9A4 D929 A97F A125 FE22"            /* ©…›{žÓ©¤Ù)©.¡%þ" */
+	$"A893 77F3 EF0F C15C 3969 A153 3A7C 3110"            /* ¨“wóï.Á\9i¡S:|1. */
+	$"7A9C 9227 D2F6 BCA8 1A04 0219 8F36 21B7"            /* zœ’'Òö¼¨....�6!· */
+	$"B37C 2AB6 678A 1675 BA9E 03B4 53BA 33B9"            /* ³|*¶gŠ.uºž.´Sº3¹ */
+	$"06AD 96D8 BDBC BFC8 5134 C040 7EBA B756"            /* .­–ؽ¼¿ÈQ4À@~º·V */
+	$"E619 DC67 BC83 BB39 AA42 65E1 5BBC 45B4"            /* æ.Üg¼ƒ»9ªBeá[¼E´ */
+	$"ECB6 E6ED D098 3C9F E17B 876D A039 553E"            /* ì¶æíИ<Ÿá{‡m 9U> */
+	$"5CF9 2D3F 6F47 4854 7085 62C1 C65D C07C"            /* \ù-?oGHTp…bÁÆ]À| */
+	$"86A0 3E43 500F 90D0 4787 8CE8 726C 5109"            /* † >CP.�ÐG‡ŒèrlQÆ */
+	$"FD68 8099 E8FE 2A66 2F02 78F5 C78B 6A34"            /* ýh€™èþ*f/.xõÇ‹j4 */
+	$"0A9E 25FE 0DE3 E3C8 BD7B 3530 98D5 CF03"            /* ž%þ.ããȽ{50˜ÕÏ. */
+	$"CE64 A57D 620C 87C5 65B4 7BE1 34BC 3058"            /* Îd¥}b.‡Åe´{á4¼0X */
+	$"572A 9EBF 5E0C 5A01 80A3 B334 DF5A E1B8"            /* W*ž¿^.Z.€£³4ßZḠ*/
+	$"08C3 5C30 2CC4 C1F5 1341 F516 40FA 8A00"            /* .Ã\0,ÄÁõ.Aõ.@úŠ. */
+	$"477D B516 AD2F 4DD3 BE8C 58F0 7C77 A236"            /* G}µ.­/MÓ¾ŒXð|w¢6 */
+	$"DD43 6611 D582 F050 DC31 59D0 194D A6FD"            /* ÝCf.Õ‚ðPÜ1YÐ.M¦ý */
+	$"652E FA16 4BA7 25FE 0DE3 E3D9 B950 06E2"            /* e.ú.K§%þ.ããÙ¹P.â */
+	$"3A8A DA86 827A 4C68 5798 55FC FD46 A583"            /* :ŠÚ†‚zLhW˜UüýF¥ƒ */
+	$"064D 8FB0 29D9 8DAD 53CC 5229 B675 ACAB"            /* .M�°)Ù�­SÌR)¶u¬« */
+	$"8EED 34BC 2F12 142E 446C 0DF7 0BC3 D6E7"            /* Ží4¼/...Dl.÷.ÃÖç */
+	$"A086 8D72 6AE7 9270 B97C D981 C7F1 C38A"            /*  †�rjç’p¹|Ù�ÇñÊ */
+	$"47EE E585 FC19 FCE3 668C C7E0 471F 813C"            /* Gîå…ü.üãfŒÇàG.�< */
+	$"3F02 0005 B422 0345 FC66 9A91 446D DDCA"            /* ?...´".Eüfš‘DmÝÊ */
+	$"449B CCDB 8E8F A0B8 3942 A8FC 6409 F7F3"            /* D›ÌÛŽ� ¸9B¨üdÆ÷ó */
+	$"ED01 353A 2B01 1B0C 2939 619B 9890 94E7"            /* í.5:+...)9a›˜�”ç */
+	$"5FDA 75F2 7323 BF3A 7AED 757E 42D6 C336"            /* _Úuòs#¿:zíu~BÖÃ6 */
+	$"E74E 6B5F 2D43 4780 CA1C C462 6507 4801"            /* çNk_-CG€Ê.Äbe.H. */
+	$"EDEF 5B2A 7297 8FC6 1E13 E7FA 56B5 4279"            /* íï[*r—�Æ..çúVµBy */
+	$"5BB4 B307 F4DE E273 4FC3 E9B1 72C3 EDA2"            /* [´³.ôÞâsOÃé±rÃí¢ */
+	$"A3F0 A9E0 FB5D C018 B35C 8B45 CD63 99FE"            /* £ð©àû]À.³\‹EÍc™þ */
+	$"11FB 8993 21D1 BA8B 69EB 5CB9 F258 468F"            /* .û‰“!Ѻ‹ië\¹òXF� */
+	$"73D4 6804 C6E6 045E AE54 954C D0E5 D836"            /* sÔh.Ææ.^®T•LÐåØ6 */
+	$"EA0D DB9A 2806 36FA B3E9 5973 789D 6591"            /* ê.Ûš(.6ú³éYsx�e‘ */
+	$"1EC2 F271 E9E2 5681 C542 A2FC F4EF 8111"            /* .ÂòqéâV�ÅB¢üôï�. */
+	$"59D5 FC91 9749 52A3 EA37 B239 4939 8625"            /* YÕü‘—IR£ê7²9I9†% */
+	$"F248 18D2 075A 80A1 8005 9ED2 437F C705"            /* òH.Ò.Z€¡€.žÒC.Ç. */
+	$"2BFD 308C F1F0 E1BC 8FDA F5D5 50D9 9770"            /* +ý0Œñðá¼�ÚõÕPÙ—p */
+	$"7EF5 213F 91F6 5B8B 189D EE67 70EF F40A"            /* ~õ!?‘ö[‹.�îgpïô */
+	$"2E24 C54B F37D 4941 FCD2 7779 5C8B 59CC"            /* .$ÅKó}IAüÒwy\‹YÌ */
+	$"F284 3377 A496 0399 6F17 47AC B5EA 3A84"            /* ò„3w¤–.™o.G¬µê:„ */
+	$"844E DC13 D058 BE9F 1BBE 8CE0 E615 D2E1"            /* „NÜ.ÐX¾Ÿ.¾Œàæ.Òá */
+	$"88A5 9DA6 9FB4 4EDE B804 ED14 A7EA 54E0"            /* ˆ¥�¦Ÿ´NÞ¸.í.§êTà */
+	$"5A87 311B 5E69 70F5 EDA3 2E78 8862 7603"            /* Z‡1.^ipõí£.xˆbv. */
+	$"7761 094D 4A69 5AB0 A9BB 3F4F 92BE 205B"            /* waÆMJiZ°©»?O’¾ [ */
+	$"A226 24D5 C8B2 CCF7 E064 31C7 E727 6E2C"            /* ¢&$ÕȲÌ÷àd1Çç'n, */
+	$"D6A1 347F 41CD 5F70 E1C0 1AFC 4FBC 81A9"            /* Ö¡4.AÍ_páÀ.üO¼�© */
+	$"A884 F03A CD84 B581 1F03 A523 838B 8038"            /* ¨„ð:Í„µ�..¥#ƒ‹€8 */
+	$"02F4 6DE8 98FC EDD6 B331 21F7 4AC5 A31E"            /* .ômè˜üíÖ³1!÷JÅ£. */
+	$"9EB4 E770 D465 386E 18A6 D1BE EF6D B008"            /* ž´çpÔe8n.¦Ñ¾ïm°. */
+	$"63E6 1066 1374 4D10 3270 8C7F F297 F91D"            /* cæ.f.tM.2pŒ.ò—ù. */
+	$"DA61 677B 29FD A878 B122 E33C 17E3 8ED1"            /* Úag{)ý¨x±"ã<.ãŽÑ */
+	$"FB8E 4407 8B82 32AD 1B50 09DF BDA8 C80E"            /* ûŽD.‹‚2­.PÆß½¨È. */
+	$"7E28 ED9D A005 4297 B9C1 8D66 CA77 C41D"            /* ~(í� .B—¹Á�fÊwÄ. */
+	$"41C5 E3B3 F94D 96E5 1308 7C59 1EB8 0871"            /* AÅã³ùM–å..|Y.¸.q */
+	$"C7A4 FED7 47F2 F800 6889 A21D 1FF4 9E93"            /* Ǥþ×Gòø.h‰¢..ôž“ */
+	$"1321 7377 D96E 86F5 A0CB EB17 C77A 81C0"            /* .!swÙn†õ Ëë.Çz�À */
+	$"7C8D A01F 0E91 00F9 1D00 94FD 4D32 E5DB"            /* |� ..‘.ù..”ýM2åÛ */
+	$"0482 DEB8 CF1C 792A EA3B DECA 4470 4898"            /* .‚Þ¸Ï.y*ê;ÞÊDpH˜ */
+	$"81C0 5457 FE66 63DD CAF3 0B98 08E1 DC3F"            /* �ÀTWþfcÝÊó.˜.áÜ? */
+	$"CF68 7F31 9BEE 73EF A3A5 8D57 8969 EEC3"            /* Ïh.1›îs�W‰iîà */
+	$"0F13 3ED9 390D FC4C B37F C4F7 01E4 B115"            /* ..>Ù9.üL³.Ä÷.ä±. */
+	$"E9F9 9526 00FA 10D0 0D64 4CC5 8481 D231"            /* éù•&.ú.Ð.dLÅ„�Ò1 */
+	$"DE6D 483E 8046 7F58 5BD3 1FFC CF82 297A"            /* ÞmH>€F.X[Ó.üÏ‚)z */
+	$"88A1 7E78 0668 3222 9E8B A287 30A3 DB10"            /* ˆ¡~x.h2"ž‹¢‡0£Û. */
+	$"A77F A842 87FC 164E 92B8 96DF 4920 EEC2"            /* §.¨B‡ü.N’¸–ßI î */
+	$"47B6 83F1 F68F 9309 63CE FAAC 3C8F 9FCF"            /* G¶ƒñö�“ÆcÎú¬<�ŸÏ */
+	$"A166 9621 ADC0 0ABB 7F1A 7E3C A4AD 3755"            /* ¡f–!­À»..~<¤­7U */
+	$"E2D8 E26D CAD1 6F24 F808 BC0D E94B EEBC"            /* âØâmÊÑo$ø.¼.éKî¼ */
+	$"D601 C1F5 30C1 F53B C0FA 97C0 90E6 901B"            /* Ö.Áõ0Áõ;Àú—À�æ�. */
+	$"71C2 1EAB 8A4C 52A4 4431 058C DFB9 4148"            /* qÂ.«ŠLR¤D1.Œß¹AH */
+	$"185C 1E93 01C6 82D3 C81B 6398 8173 189D"            /* .\.“.Æ‚ÓÈ.c˜�s.� */
+	$"F73C 4887 5155 0C95 0088 4C69 0A27 3F39"            /* ÷<H‡QU.•.ˆLiÂ'?9 */
+	$"8CCA 32D8 1FD7 A3F4 CDD8 6275 5E7E 3619"            /* ŒÊ2Ø.×£ôÍØbu^~6. */
+	$"8D18 68C9 D2C7 0FCB 18EA FB01 5A68 4A52"            /* �.hÉÒÇ.Ë.êû.ZhJR */
+	$"3C08 5313 5ED2 9B7D 31B5 953C 2F92 22F7"            /* <.S.^Ò›}1µ•</’"÷ */
+	$"3764 04E8 A9A6 C747 8DFD 9730 01DD 82E1"            /* 7d.試ÇG�ý—0.Ý‚á */
+	$"B08A FD72 7C33 A9BF AFEA 7188 AC4B 2B45"            /* °Šýr|3©¿¯êqˆ¬K+E */
+	$"BBB2 7826 6704 5864 9BAF 91FC 6BD3 E9D7"            /* »²x&g.Xd›¯‘ükÓé× */
+	$"0E30 E428 0FB2 4836 F94F 7CB9 3723 72A2"            /* .0ä(.²H6ùO|¹7#r¢ */
+	$"AB4C C0EB ED8F 823B B8D6 C4A6 E4B5 B41C"            /* «LÀëí�‚;¸ÖĦ䵴. */
+	$"B0FC 0171 880F E77C 1EF8 9645 A8B4 969A"            /* °ü.qˆ.ç|.ø–E¨´–š */
+	$"5420 86B9 71CE 0DE5 7A40 B41A DD85 6B30"            /* T †¹qÎ.åz@´.Ý…k0 */
+	$"F02A 3B61 92B4 7A95 269E BF9F DDB3 9FB7"            /* ð*;a’´z•&ž¿ŸÝ³Ÿ· */
+	$"746B 1514 C89D 391B F835 73B8 0F1C 2567"            /* tk..È�9.ø5s¸..%g */
+	$"A0C2 6B37 DFCE 5F4C 1DCD FD79 5CDA A8FF"            /*  Âk7ßÎ_L.Íýy\Ú¨ÿ */
+	$"0603 9014 308F AEB3 EDB7 D721 1709 3897"            /* ..�.0�®³í·×!.Æ8— */
+	$"D3AB 181E 53BE 4025 3492 41C2 5EC7 BFC0"            /* Ó«..S¾@%4’AÂ^Ç¿À */
+	$"EA12 19D0 6158 530B A57B 8A2B 8DFF 18AF"            /* ê..ÐaXS.¥{Š+�ÿ.¯ */
+	$"7651 65CF CD26 3F05 987E 0760 9C3C E3A6"            /* vQeÏÍ&?.˜~.`œ<㦠*/
+	$"86C0 DAB4 C6ED 7F19 8034 85FE DA7E 7963"            /* †ÀÚ´Æí..€4…þÚ~yc */
+	$"AFF2 9CBE 6AAA B6BB B2D3 6F41 BB45 B1EB"            /* ¯òœ¾jª¶»²ÓoA»E±ë */
+	$"9CC2 8803 907A 5CE1 F2D9 AF69 FF22 7DE8"            /* œÂˆ.�z\áòÙ¯iÿ"}è */
+	$"D328 C2A1 0F97 2EE2 9575 E0E6 A665 B85A"            /* Ó(¡.—.â•uàæ¦e¸Z */
+	$"C5D7 6FA0 FE24 BC68 9D74 6CEB C4F9 615C"            /* Å×o þ$¼h�tlëÄùa\ */
+	$"4F34 48B3 7A64 2540 B64F EFBE 8D0F E427"            /* O4H³zd%@¶Oï¾�.ä' */
+	$"4CCA 6DB3 83AC C5F6 EE52 7A43 8172 41E4"            /* LÊm³ƒ¬ÅöîRzC�rAä */
+	$"2CE3 DF2F 1496 97DE 6AD1 2FFF 7E52 D993"            /* ,ãß/.–—ÞjÑ/ÿ~RÙ“ */
+	$"8AF9 AAA3 B192 0991 BFAE 4829 001E 963B"            /* Šùª£±’Æ‘¿®H)..–; */
+	$"019C 8A5D 78E8 6A56 F78C B81A F4D0 6312"            /* .œŠ]xèjV÷Œ¸.ôÐc. */
+	$"C0C4 A9BF 7CA5 75D9 9C23 F3EA 4F39 B325"            /* ÀÄ©¿|¥uÙœ#óêO9³% */
+	$"F6DE 6EF4 7D48 A279 8EA9 5395 0FBC C63F"            /* öÞnô}H¢yŽ©S•.¼Æ? */
+	$"679F CE93 2206 ECA9 079C 2BB7 D094 6A7B"            /* gŸÎ“".ì©.œ+·Ð”j{ */
+	$"1077 277F 88A6 21AE 84C3 EDD4 38FC 36B2"            /* .w'.ˆ¦!®„ÃíÔ8ü6² */
+	$"1F86 8F00 8F56 8825 7713 9061 800A A4CD"            /* .†�.�Vˆ%w.�a€Â¤Í */
+	$"E3D3 0F3C B0AC 0C87 E368 8544 F251 5C39"            /* ãÓ.<°¬.‡ãh…DòQ\9 */
+	$"7D90 1BEF 7805 D624 7380 0A19 E093 3058"            /* }�.ïx.Ö$s€Â.à“0X */
+	$"1C90 467F 5C70 4932 3947 4A95 A450 36C8"            /* .�F.\pI29GJ•¤P6È */
+	$"D4D5 CA85 9922 FA12 D0D8 96CA 9A2F 40A2"            /* ÔÕÊ…™"ú.ÐØ–Êš/@¢ */
+	$"F105 054F 8C56 C164 85B5 C4E6 3EAB D76A"            /* ñ..OŒVÁd…µÄæ>«×j */
+	$"A227 4F09 072C 4682 9B0F 995C 7551 94E7"            /* ¢'OÆ.,F‚›.™\uQ”ç */
+	$"419A 0098 0283 19E8 0489 687B 4F66 B74C"            /* Aš.˜.ƒ.è.‰h{Of·L */
+	$"7F59 C07A A552 B04D 628F E401 E55C A4ED"            /* .YÀz¥R°Mb�ä.å\¤í */
+	$"390F C34D 81BB 9F88 0C50 F50F 9FBD A377"            /* 9.ÃM�»Ÿˆ.Põ.Ÿ½£w */
+	$"F538 3F9C E243 FF47 D346 87F2 444B C479"            /* õ8?œâCÿGÓF‡òDKÄy */
+	$"F6B3 1C76 5125 F487 0FAF 294A DA20 EC56"            /* ö³.vQ%ô‡.¯)JÚ ìV */
+	$"07AB DE07 14C2 1721 F3E0 D687 1F67 039D"            /* .«Þ..Â.!óàÖ‡.g.� */
+	$"461F 0D82 9CAA B2D4 DFC6 6AA5 D31E 4D01"            /* F..‚œª²ÔßÆj¥Ó.M. */
+	$"5AC2 B2BD FD97 7D6E 00D1 7ADF 377C 15A7"            /* Z²½ý—}n.Ñzß7|.§ */
+	$"9681 C7B2 8168 D706 425B 35EF 7298 C053"            /* –�Dz�h×.B[5ïr˜ÀS */
+	$"E198 B5E2 B835 712B 1AD8 BA77 CF86 83A3"            /* ᘵâ¸5q+.غwφƒ£ */
+	$"B0B9 C5E6 F37A A3DE D93B 8EC8 132F A52A"            /* °¹Åæóz£ÞÙ;ŽÈ./¥* */
+	$"AB20 E166 F719 7130 6482 5BE2 605B D78E"            /* « áf÷.q0d‚[â`[׎ */
+	$"672D 7AE6 3906 DA75 0E3D 1962 8A60 9294"            /* g-zæ9.Úu.=.bŠ`’” */
+	$"1FC8 C0F3 216D 815D 4DDE 5DDE D8AB 3F9C"            /* .ÈÀó!m�]MÞ]ÞØ«?œ */
+	$"7F9F 24B3 7BBF CCB9 2F80 19B6 70AE 1B3D"            /* .Ÿ$³{¿Ì¹/€.¶p®.= */
+	$"C71A 1F7C 81D2 639F 0D03 24EA D4B1 D351"            /* Ç..|�ÒcŸ..$êÔ±ÓQ */
+	$"DD10 FBD5 EA3F 4957 A7ED 04C6 384D C10F"            /* Ý.ûÕê?IW§í.Æ8MÁ. */
+	$"8A55 0C03 694F 0D18 70D8 0AC3 33C0 17D1"            /* ŠU..iO..pØÂÃ3À.Ñ */
+	$"73BB E85F 5204 090F FDFE 8AC5 9AD6 22D5"            /* s»è_R.Æ.ýþŠÅšÖ"Õ */
+	$"CA31 A6DE EF44 D910 B34A 0E59 7866 536F"            /* Ê1¦ÞïDÙ.³J.YxfSo */
+	$"9B0B A341 3AB8 C06C C64F 3F86 8160 DFB9"            /* ›.£A:¸ÀlÆO?†�`ß¹ */
+	$"A709 59D8 88C3 3316 9FFA F83F 5120 E40E"            /* §ÆY؈Ã3.Ÿúø?Q ä. */
+	$"4DEA C88F C418 37F6 4C0B 7606 9632 EEC5"            /* MêÈ�Ä.7öL.v.–2îÅ */
+	$"6380 FB25 A69F AAE2 0888 B722 008F 35CB"            /* c€û%¦Ÿªâ.ˆ·".�5Ë */
+	$"F6A7 90BF D0DB 6367 A14B 5A86 EE98 FD18"            /* ö§�¿ÐÛcg¡KZ†î˜ý. */
+	$"A629 1BAB 3BE2 920D E99D BEC2 88B4 F909"            /* ¦).«;â’.é�¾Âˆ´ùÆ */
+	$"66B1 535D 3940 AF78 8200 0C46 142A EA2A"            /* f±S]9@¯x‚..F.*ê* */
+	$"A991 95E8 FD2B D30B 0E4A 76E2 A97B FAA7"            /* ©‘•èý+Ó..Jvâ©{ú§ */
+	$"97E2 9B30 54FA 5E97 962A 7E83 5711 A707"            /* —â›0Tú^—–*~ƒW.§. */
+	$"2A21 3729 2046 9C41 8282 A161 E5F6 AB24"            /* *!7) FœA‚‚¡aåö«$ */
+	$"3324 74CF 1AF6 C935 D884 0008 DC18 663C"            /* 3$tÏ.öÉ5Ø„..Ü.f< */
+	$"3A00 25E4 92D7 8F23 4C07 3C63 DB6E 4924"            /* :.%ä’×�#L.<cÛnI$ */
+	$"7362 34C9 2F1D 105B 97E2 03BF 648F C21C"            /* sb4É/..[—â.¿d�Â. */
+	$"C6AC 3657 2C72 ADAA 2889 0623 6A5D ACEC"            /* Ƭ6W,r­ª(‰.#j]¬ì */
+	$"3210 738F 51F5 CC65 9EA9 7AD3 95CB B265"            /* 2.s�QõÌež©zӕ˲e */
+	$"D54E 6E1D E2A7 2673 E6C2 C247 2FFD C10E"            /* ÕNn.â§&sæÂÂG/ýÁ. */
+	$"5FC5 C1E1 2511 5C8F 6063 92AB E4B9 8212"            /* _ÅÁá%.\�`c’«ä¹‚. */
+	$"3643 6D53 2492 3E58 3E71 15E3 A3B7 AB2A"            /* 6CmS$’>X>q.㣷«* */
+	$"A998 FE5A 74DB 537A CE3D CD46 49B6 DB6D"            /* ©˜þZtÛSzÎ=ÍFI¶Ûm */
+	$"B6DB 6DB2 8EE9 1D6F 6480 8613 D8D2 7D8F"            /* ¶Ûm²Žé.od€†.ØÒ}� */
+	$"5615 3EAB B25B 722D ECB8 ED12 70F2 BA06"            /* V.>«²[r-ì¸í.pòº. */
+	$"E5A2 45C1 547C F861 A7D5 8E1C 08BC 346B"            /* å¢EÁT|øa§ÕŽ..¼4k */
+	$"2730 C670 2FD8 F159 6ABE 2092 ED98 AC34"            /* '0Æp/ØñYj¾ ’혬4 */
+	$"B4CA 8565 90CF 0034 6E68 F777 9672 F29D"            /* ´Ê…e�Ï.4nh÷w–rò� */
+	$"4621 6E73 9C90 5C3D A8DB F5B0 CACF A63E"            /* F!nsœ�\=¨Ûõ°ÊϦ> */
+	$"861E 8B9E F490 8E15 69BC A01D EF59 E898"            /* †.‹žô�Ž.i¼ .ïYè˜ */
+	$"7040 B817 5AA9 BFB1 09A0 FE74 D2F7 BEA8"            /* p@¸.Z©¿±Æ þtÒ÷¾¨ */
+	$"A4F3 FEAC 38A4 409E B504 9CC9 EAA3 533B"            /* ¤óþ¬8¤@žµ.œÉê£S; */
+	$"153D F710 FC9E 2055 A395 C374 2AF9 E7C5"            /* .=÷.üž U£•Ãt*ùçÅ */
+	$"E1E8 7F74 3CDB D568 B606 A9D5 B7AE E207"            /* áè.t<ÛÕh¶.©Õ·®â. */
+	$"947E 2E65 1C27 336D 927A 4F86 5422 0E04"            /* ”~.e.'3m’zO†T".. */
+	$"42C7 668A 9403 EAB7 21A3 C9F1 18BC 5380"            /* BÇfŠ”.ê·!£Éñ.¼S€ */
+	$"BED7 07B5 F9B1 B798 8727 D54A 7A6E E493"            /* ¾×.µù±·˜‡'ÕJznä“ */
+	$"5271 F27D 7C35 DCEE D0BC CB31 C1FB 879F"            /* Rqò}|5ÜîмË1Áû‡Ÿ */
+	$"E074 9EB9 D7BE C9ED D2C8 BD00 C7FC D05B"            /* àtž¹×¾ÉíÒȽ.ÇüÐ[ */
+	$"2B2C 9647 A924 9F22 A06D 62B4 A946 77B7"            /* +,–G©$Ÿ" mb´©Fw· */
+	$"AD6D 60EE C841 997D A7E8 7AD2 AFA8 EEC4"            /* ­m`îÈA™}§èzÒ¯¨îÄ */
+	$"D61F FC06 FD7A E761 AA33 0F74 A08F 8E5B"            /* Ö.ü.ýzçaª3.t �Ž[ */
+	$"B7C0 7C9A 1201 F0F5 6403 E4D0 60D8 92D9"            /* ·À|š..ðõd.äÐ`Ø’Ù */
+	$"84ED 064F 1B29 D7A7 1D77 F4B3 61D6 2651"            /* „í.O.)ק.wô³aÖ&Q */
+	$"329E 2CA5 53B4 956D 1061 3A3A A73B FC8E"            /* 2ž,¥S´•m.a::§;üŽ */
+	$"DD3C 60C9 F855 32FB 3C04 6287 50F7 6BB3"            /* Ý<`ÉøU2û<.b‡P÷k³ */
+	$"B84A 05A6 3145 A832 3BBC CA56 115B 9D7F"            /* ¸J.¦1E¨2;¼ÊV.[�. */
+	$"8ADB 5660 429D 1FF6 4E6D 4899 EFDA 592F"            /* ŠÛV`B�.öNmH™ïÚY/ */
+	$"19DC 9790 802A 1C17 2250 ADEC 0312 2C23"            /* .Ü—�€*.."P­ì..,# */
+	$"223B 1EC8 482C 6E26 DD67 528F 7CDC 1841"            /* ";.ÈH,n&ÝgR�|Ü.A */
+	$"DBCB CF9E 6D26 B564 4FD4 0AB5 DA0B ADE2"            /* ÛËÏžm&µdOÔµÚ.­â */
+	$"C129 D895 00FF 105B 0D0B F4DB 286A B347"            /* Á)Ø•.ÿ.[..ôÛ(j³G */
+	$"A261 30A9 0A9B 7A0D 585B 3991 3217 6FF7"            /* ¢a0©Â›z.X[9‘2.o÷ */
+	$"A368 D6A8 E862 161A 3584 613E 04D9 DBCB"            /* £hÖ¨èb..5„a>.ÙÛË */
+	$"4D96 66A3 B736 F802 D67A 309F 04E6 AFD8"            /* M–f£·6ø.Öz0Ÿ.æ¯Ø */
+	$"888E A8A5 4461 F1F0 1B6B 2DC4 0DFE C676"            /* ˆŽ¨¥Dañð.k-Ä.þÆv */
+	$"8D4E 3750 C3E6 C233 EFC5 368B 6113 5B53"            /* �N7PÃæÂ3ïÅ6‹a.[S */
+	$"08E0 C259 1B88 AA0C 74B0 862E 1024 BB3F"            /* .àÂY.ˆª.t°†..$»? */
+	$"2816 B320 715C 5DFA 9FF0 CBC3 6A85 777A"            /* (.³ q\]úŸðËÃj…wz */
+	$"23CB F89B D813 6706 313E 2CF5 A163 0848"            /* #Ëø›Ø.g.1>,õ¡c.H */
+	$"94C9 3288 B556 53DD 2A45 2302 F28E 7ED1"            /* ”É2ˆµVSÝ*E#.òŽ~Ñ */
+	$"B5A0 67C8 53BB 4CE4 45D9 317F 92AB B13B"            /* µ gÈS»LäEÙ1.’«±; */
+	$"7246 F6DE 5348 49C9 42A1 CA62 64B0 209E"            /* rFöÞSHIÉB¡Êbd° ž */
+	$"43F2 DF7C 9BBC 097F C94A EA52 8D01 ADEF"            /* Còß|›¼Æ.ÉJêR�.­ï */
+	$"5241 7C9B 2876 75F4 D748 AF9D 6FBB 3306"            /* RA|›(vuô×H¯�o»3. */
+	$"0AD1 3953 6C99 5BB7 F1F5 1C1F BCE7 CA83"            /* ÂÑ9Sl™[·ñõ..¼çʃ */
+	$"08C1 6811 FBC5 AE18 343C C6F5 E515 F9CF"            /* .Áh.ûÅ®.4<Æõå.ùÏ */
+	$"FE48 C6E9 956E 6712 DDCA D62C 7F37 6DFE"            /* þHÆé•ng.ÝÊÖ,.7mþ */
+	$"2465 A8EE 1BAF E106 CA62 101F 0144 31DC"            /* $e¨î.¯á.Êb...D1Ü */
+	$"029E ED0F 9E47 F22E 0C17 0D31 E60B 1662"            /* .ží.žGò....1æ..b */
+	$"C1F5 5C90 7D5A 6D03 EAB6 C0C8 1653 E821"            /* Áõ\�}Zm.ê¶ÀÈ.Sè! */
+	$"5860 ED0B C711 39E5 E5C8 268D 2246 E3FB"            /* X`í.Ç.9ååÈ&�"Fãû */
+	$"68A4 3B12 A487 350D FE94 3722 65AC 949B"            /* h¤;.¤‡5.þ”7"e¬”› */
+	$"2526 7CD5 0E28 E093 CFE8 314C BE18 5B60"            /* %&|Õ.(à“Ïè1L¾.[` */
+	$"827E 154B 9609 2536 F890 A361 BA29 8211"            /* ‚~.K–Æ%6ø�£aº)‚. */
+	$"AF42 BEC6 1BCB CE6D 2910 8083 C890 D7FF"            /* ¯B¾Æ.ËÎm).€ƒÈ�×ÿ */
+	$"6F04 CEF4 F47C 0D92 00BD D90F 4095 0A48"            /* o.Îôô|.’.½Ù.@•ÂH */
+	$"4DC6 210C 351D 34A5 5FDA E576 1E1B 1684"            /* MÆ!.5.4¥_Úåv...„ */
+	$"F2A0 B30A 589C 1DBC 4831 E906 0D67 0CDD"            /* ò ³ÂXœ.¼H1é..g.Ý */
+	$"876B 994F 6D66 47DD AF40 7158 4385 738E"            /* ‡k™OmfGݯ@qXC…sŽ */
+	$"82F8 E637 9B5C 7389 0AA5 2A04 D105 5E88"            /* ‚øæ7›\s‰Â¥*.Ñ.^ˆ */
+	$"C2A2 2943 E125 6C2F 0AD1 1E5C AF1F CFF6"            /* ¢)Cá%l/ÂÑ.\¯.Ïö */
+	$"B39B C799 0F39 6151 6625 BB66 C3C3 418B"            /* ³›Ç™.9aQf%»fÃÃA‹ */
+	$"90A4 F6F7 BD30 7A04 88E6 0F8A 3F0B FF2C"            /* �¤ö÷½0z.ˆæ.Š?.ÿ, */
+	$"D18B 1D88 1442 EB54 A6FC D226 251A 015D"            /* Ñ‹.ˆ.BëT¦üÒ&%..] */
+	$"4DA8 32CA 371B 86EB 4E89 1415 9A41 6AD2"            /* M¨2Ê7.†ëN‰..šAjÒ */
+	$"1F0F 7656 41E5 B874 72E7 5F88 ABDA 28D7"            /* ..vVAå¸trç_ˆ«Ú(× */
+	$"37D5 EE40 567F F751 2591 01A3 03B9 EFCD"            /* 7Õî@V.÷Q%‘.£.¹ïÍ */
+	$"E0A8 8CC8 8C8E 0945 3036 453A 1787 59C4"            /* ਌ȌŽÆE06E:.‡YÄ */
+	$"B99C 02D2 D5F6 1B5E E34C 551E 8C43 9A20"            /* ¹œ.ÒÕö.^ãLU.ŒCš  */
+	$"981D 0B44 C6D1 E6AA 2B92 5F33 8016 C4F1"            /* ˜..DÆÑæª+’_3€.Äñ */
+	$"7AA6 E605 4676 A533 1D38 6ADA 9BC6 2C13"            /* z¦æ.Fv¥3.8jÚ›Æ,. */
+	$"385A 3DCE 7E2E B9A1 81BB 27C6 AFF8 FF5D"            /* 8Z=Î~.¹¡�»'Ưøÿ] */
+	$"A511 4C25 DC70 082C B597 3EC4 004C D4B8"            /* ¥.L%Üp.,µ—>Ä.LÔ¸ */
+	$"BE6A B79D EF70 2610 B57B FEFE 6ACC 9EEE"            /* ¾j·�ïp&.µ{þþjÌžî */
+	$"B94A 73A8 4B30 C207 7391 789E C0FE 6992"            /* ¹Js¨K0Â.s‘xžÀþi’ */
+	$"AB13 E2AA FF53 4B22 A338 0EA3 B476 D732"            /* «.âªÿSK"£8.£´v×2 */
+	$"EDA3 2009 3422 B4AA 64DE 26C3 5894 D6DD"            /* í£ Æ4"´ªdÞ&ÃX”ÖÝ */
+	$"F7A9 5A3B 6F31 5D2C EC22 1FAC 928B 647F"            /* ÷©Z;o1],ì".¬’‹d. */
+	$"1600 A961 11C3 FD11 E594 81F9 E0AC 20D4"            /* ..©a.Ãý.å”�ùà¬ Ô */
+	$"0DCA 9CE0 FF14 3BE3 3010 00E1 9DFE F0C8"            /* .Êœàÿ.;ã0..á�þðÈ */
+	$"70E7 D3A5 A7F9 884E 6941 CBCB FEBE 0C27"            /* pçÓ¥§ùˆNiAËËþ¾.' */
+	$"B3F5 BAA4 3068 BFC1 DB20 1E5F 9E83 BF7D"            /* ³õº¤0h¿ÁÛ ._žƒ¿} */
+	$"8EA3 8FB0 F355 FF02 DED2 5CC8 2B4D 4DA5"            /* Ž£�°óUÿ.ÞÒ\È+MM¥ */
+	$"8122 C96A CDAB B130 2D35 B73E 2EE9 0AA9"            /* �"ÉjÍ«±0-5·>.é© */
+	$"7DB8 B81D 7B0A 776B DFF3 2B02 1F6A EF5B"            /* }¸¸.{Âwkßó+..jï[ */
+	$"E6A6 177F D8C0 1C3B A88C 2154 18F3 BFB3"            /* æ¦..ØÀ.;¨Œ!T.ó¿³ */
+	$"F7EF 1249 860B F87F 60D6 AE06 B5B2 7824"            /* ÷ï.I†.ø.`Ö®.µ²x$ */
+	$"E601 91D7 1436 80CF 054C 9691 1321 B299"            /* æ.‘×.6€Ï.L–‘.!²™ */
+	$"11F3 2BA3 51F6 447E 1BC0 28CB 666B 9BA0"            /* .ó+£QöD~.À(Ëfk›  */
+	$"425A E39B 066C 1B7C 340B 950A BDCC E05D"            /* BZã›.l.|4.•Â½Ìà] */
+	$"C8DC 568C BDC6 54E9 0AA2 2D89 6E22 37E4"            /* ÈÜVŒ½ÆTé¢-‰n"7ä */
+	$"3508 39CC EE8F 8EE6 F926 626B E33F 4A06"            /* 5.9Ìî�Žæù&bkã?J. */
+	$"4CD1 AE16 9063 3119 5554 58CA BB53 4A73"            /* LѮ.�c1.UTXʻSJs */
+	$"AA2B 2A71 B86B 3E95 BED6 D9D2 9D59 3E60"            /* ª+*q¸k>•¾ÖÙÒ�Y>` */
+	$"C5D1 FA4C E6A7 880F 30D8 A679 6467 697E"            /* ÅÑúL槈.0ئydgi~ */
+	$"F327 EAA4 E0D1 01F9 9B74 AAA1 6CDD 7DA7"            /* ó'ê¤àÑ.ù›tª¡lÝ}§ */
+	$"D2AB C9CB 63D6 D3DF C778 C6ED 71A5 0571"            /* Ò«ÉËcÖÓßÇxÆíq¥.q */
+	$"C7E1 4EC7 E16C 43F0 75B1 3C9E 91EA AAAC"            /* ÇáNÇálCðu±<ž‘ꪬ */
+	$"9A2E A47E 8DF0 873E 2275 3F71 F986 DF3D"            /* š.¤~�ð‡>"u?qù†ß= */
+	$"DBE5 1F4C 0D83 C3F5 F2D4 5A7C 0BFB E4FC"            /* Ûå.L.ƒÃõòÔZ|.ûäü */
+	$"C83E D8A4 FAF4 F589 09F2 4909 40AA 2AA8"            /* È>ؤúôõ‰ÆòIÆ@ª*¨ */
+	$"C190 BE4D D484 1408 6EAD 722F 6BA6 7502"            /* Á�¾MÔ„..n­r/k¦u. */
+	$"A53F 1B9A BE86 841A FC60 53F3 8AE9 2E4C"            /* ¥?.š¾†„.ü`SóŠé.L */
+	$"4B8E 1D09 F47C 3BAA CFB7 80DE 6A41 F007"            /* KŽ.Æô|;ªÏ·€ÞjAð. */
+	$"80A3 413A C568 5C02 6166 E8AF 9B6C EF86"            /* €£A:Åh\.af诛lï† */
+	$"F178 273B A803 89E9 520A ACFC 0E98 6198"            /* ñx';¨.‰éR¬ü.˜a˜ */
+	$"6ECE D094 76D1 8AF8 1035 D0C8 B9E5 ECC9"            /* nÎДvÑŠø.5ÐȹåìÉ */
+	$"08E6 748A F28B B0E0 F9AB 71B4 7971 9626"            /* .ætŠò‹°àù«q´yq–& */
+	$"5397 5D5A 31CB 5F9E 7C98 8300 72B1 2C67"            /* S—]Z1Ë_ž|˜ƒ.r±,g */
+	$"A38D 0C02 C603 C0C2 2000 E528 0CAA 9472"            /* £�..Æ.À .å(.ª”r */
+	$"3115 8C05 0EE6 3F33 3F6D B6DB 64C7 AAB2"            /* 1.Œ..æ?3?m¶ÛdǪ² */
+	$"94EA DD85 D3DF F14E FF3F D3A2 778B 3749"            /* ”êÝ…ÓßñNÿ?Ó¢w‹7I */
+	$"B31B 6DB6 C5B6 5311 C782 3FCF 2880 6695"            /* ³.m¶Å¶S.Ç‚?Ï(€f• */
+	$"085A 35C2 3938 420E 8705 50BD 51C3 BD21"            /* .Z5Â98B.‡.P½Qý! */
+	$"41B9 C3ED 3A76 367F 40F5 DA53 3618 DF7A"            /* A¹Ãí:v6.@õÚS6.ßz */
+	$"EE11 B2D6 D9AD 4351 7D8F BC5A 7217 9352"            /* î.²ÖÙ­CQ}�¼Zr.“R */
+	$"D43F 54B9 F618 3E0E 5FF8 1599 CD00 5489"            /* Ô?T¹ö.>._ø.™Í.T‰ */
+	$"459D 1B65 0538 7A92 D8EC 6AD5 E756 776E"            /* E�.e.8z’ØìjÕçVwn */
+	$"5B66 A07C 36D6 A4B0 2E00 21E0 ABFC 2AB8"            /* [f |6Ö¤°..!à«ü*¸ */
+	$"F387 5784 0DB9 1978 67FE DEFF 0CCC CCCC"            /* ó‡W„.¹.xgþÞÿ.ÌÌÌ */
+	$"CCCC CCCC CCCC CCD3 5F84 850A F245 C370"            /* ÌÌÌÌÌÌÌÓ_„…ÂòEÃp */
+	$"786E 76C5 56A5 8C9B FC7F 6869 3085 EB26"            /* xnvÅV¥Œ›ü.hi0…ë& */
+	$"6162 A234 8BF4 868D 0BA5 77FA 56D2 31FD"            /* ab¢4‹ô†�.¥wúVÒ1ý */
+	$"7436 0147 944C 2AAE C8C1 DE46 2A3A 2449"            /* t6.G”L*®ÈÁÞF*:$I */
+	$"EAD0 8E9E FF0B 129F 7F9C 1436 A6BC 10E6"            /* êÐŽžÿ..Ÿ.œ.6¦¼.æ */
+	$"3116 7A98 5FF6 97E9 FC84 7136 FEA5 C122"            /* 1.z˜_ö—éü„q6þ¥Á" */
+	$"E58F 44D6 D7A4 0AD3 E9B4 7C91 B833 1F91"            /* å�DÖפÂÓé´|‘¸3.‘ */
+	$"5F0F D8F7 8A80 6560 B332 081A C68D 0FF9"            /* _.Ø÷Š€e`³2..Æ�.ù */
+	$"899F 2CC7 E1D6 FC7E 1DEB C3ED EA04 F55D"            /* ‰Ÿ,ÇáÖü~.ëÃíê.õ] */
+	$"017D B775 48A1 A844 EAB2 8E3A 5FF2 20AF"            /* .}·uH¡¨D겎:_ò ¯ */
+	$"6231 D1B0 D4D9 D308 999B 09F2 95B1 7071"            /* b1Ñ°ÔÙÓ.™›Æò•±pq */
+	$"F57C 1F1E 7960 4639 6A62 5BC6 9E5A D45D"            /* õ|..y`F9jb[ÆžZÔ] */
+	$"F339 9597 BF1B 62EB D128 B3D8 9BD3 52BF"            /* ó9•—¿.bëÑ(³Ø›ÓR¿ */
+	$"0703 43F9 E1C7 940E EA41 F4B1 75E4 891F"            /* ..CùáÇ”.êAô±uä‰. */
+	$"09A4 D439 7DFF 6AB7 EB4F 1253 A9C0 8BBE"            /* ƤÔ9}ÿj·ëO.S©À‹¾ */
+	$"40A0 3CE6 965D F886 A9EF 7E69 712D 41C2"            /* @ <æ–]ø†©ï~iq-A */
+	$"0062 6917 5D06 6548 9FD6 1470 4A0C 8545"            /* .bi.].eHŸÖ.pJ.…E */
+	$"8417 6C73 0C2D DF44 0E4A D5F9 7443 D629"            /* „.ls.-ßD.JÕùtCÖ) */
+	$"E62D DE53 CCFA EAEA E08A F0E1 9D37 9616"            /* æ-ÞSÌúêêàŠðá�7–. */
+	$"C0DA 1FD4 6A42 6CE6 1D10 AB6A 911A 19D2"            /* ÀÚ.ÔjBlæ..«j‘..Ò */
+	$"47A0 4AC5 6A3C 12FF 0FE8 3AFB 7DFD 3D27"            /* G JÅj<.ÿ.è:û}ý=' */
+	$"42C6 E2BA 6DDE D1ED 21CE 1EA0 F444 055B"            /* BÆâºmÞÑí!Î. ôD.[ */
+	$"122A 41EE D8C1 144C B39C 0EEA 014E 7448"            /* .*AîØÁ.L³œ.ê.NtH */
+	$"0B72 7C2C 92B6 0CAC 3CB5 ADA7 8BF8 0C56"            /* .r|,’¶.¬<µ­§‹ø.V */
+	$"1DD5 B763 907F 6B60 8A85 ED4A F87D FBDC"            /* .Õ·c�.k`Š…íJø}ûÜ */
+	$"391D 822B CBF5 7266 0E6B B2D4 32DE 606C"            /* 9.‚+Ëõrf.k²Ô2Þ`l */
+	$"014E 64BF F969 E3A5 C8E4 09EC B205 6391"            /* .Nd¿ùiã¥ÈäÆì².c‘ */
+	$"3081 96F5 9A80 0599 50D2 38FF 635B 9C35"            /* 0�–õš€.™PÒ8ÿc[œ5 */
+	$"97CF A325 D94F B8E1 A794 EABC DA8A 7CC3"            /* —Ï£%ÙO¸á§”ê¼ÚŠ|à */
+	$"8713 2EBB 1EA6 69B0 9A72 A93D 874A 1F30"            /* ‡..».¦i°šr©=‡J.0 */
+	$"4C7B B341 B8CF F61E 7CEE 60CC E9B0 6D85"            /* L{³A¸Ïö.|î`Ìé°m… */
+	$"4F96 977D F85D F85A 08AF 46EF F259 FD70"            /* O–—}ø]øZ.¯FïòYýp */
+	$"E364 C54D 1F3D C951 B1DD 2CB4 8B94 9350"            /* ãdÅM.=ÉQ±Ý,´‹”“P */
+	$"8FFC CD4E D39E 2FF5 DC65 9DB7 2133 6E97"            /* �üÍNÓž/õÜe�·!3n— */
+	$"9705 2AA6 2625 534E B2A2 D775 FCFA 60E0"            /* —.*¦&%SN²¢×uüú`à */
+	$"4929 3681 2E72 5087 F3CD FB3A 6386 36A2"            /* I)6�.rP‡óÍû:c†6¢ */
+	$"5E62 8705 57E4 8441 1986 1487 E88F C834"            /* ^b‡.Wä„A.†.‡è�È4 */
+	$"C59D D57C CCA2 D56F 3889 44AC 0E4D 0E88"            /* Å�Õ|Ì¢Õo8‰D¬.M.ˆ */
+	$"2592 A50A F98D DF1D 17F2 78BD D4AB FDB4"            /* %’¥Âù�ß..òx½Ô«ý´ */
+	$"4249 FBDE 3E56 BE58 B587 88B4 8D75 299F"            /* BIûÞ>V¾Xµ‡ˆ´�u)Ÿ */
+	$"4C92 6D9A 6B17 6153 9A65 4770 E0EC BBEF"            /* L’mšk.aSšeGpàì»ï */
+	$"2F91 8C35 8FFA 04AF 880C D9B6 204A D65E"            /* /‘Œ5�ú.¯ˆ.Ù¶ JÖ^ */
+	$"68DD DBE7 63BC E1C5 CCDD E994 3796 10EF"            /* hÝÛçc¼áÅÌÝé”7–.ï */
+	$"354D C0E7 7A72 E57E EFAC 7C75 E4CE F47F"            /* 5MÀçzrå~ï¬|uäÎô. */
+	$"2E82 A8D0 6401 3CC4 1ACC 4513 1211 DCC9"            /* .‚¨Ðd.<Ä.ÌE...ÜÉ */
+	$"BD7A 47CA F093 83C7 38EB 866D 1ED5 AC6C"            /* ½zGÊð“ƒÇ8ë†m.Õ¬l */
+	$"FF01 C348 CFA1 2532 DAD5 2BDD 8CCC 71C1"            /* ÿ.ÃHÏ¡%2ÚÕ+ÝŒÌqÁ */
+	$"1208 75AA 308B 4796 A89E 0EAF AB67 422A"            /* ..uª0‹G–¨ž.¯«gB* */
+	$"AA43 8162 68BC 9878 8578 419C AB2E 9518"            /* ªC�bh¼˜x…xAœ«.•. */
+	$"A9E0 4298 DB46 36D7 ADD0 DE21 DC41 AEA7"            /* ©àB˜ÛF6×­ÐÞ!ÜA®§ */
+	$"A05D 795D AB14 E247 6750 3EA8 0A31 5A06"            /*  ]y]«.âGgP>¨Â1Z. */
+	$"FAEC AD07 ECF7 C636 A068 22AA E179 7613"            /* úì­.ì÷Æ6 h"ªáyv. */
+	$"30F9 831C 0AFA 38C0 E20B 96A9 464E B57A"            /* 0ùƒ.Âú8Àâ.–©FNµz */
+	$"5AF3 D612 DC70 2A8D 1D09 C7C9 967F 7F7B"            /* ZóÖ.Üp*�.ÆÇÉ–..{ */
+	$"F47F 4017 A722 9853 37C2 DE55 34CF 104E"            /* ô.@.§"˜S7ÂÞU4Ï.N */
+	$"9DD3 35DF DEE2 589C FAF1 07DE 1803 86B1"            /* �Ó5ßÞâXœúñ.Þ..†± */
+	$"2DE6 6B46 FC45 F24E 8718 3B6E D557 8008"            /* -ækFüEòN‡.;nÕW€. */
+	$"FF3B 8EC2 28BD 6146 3EF6 A0FB 0BCA 37C1"            /* ÿ;ŽÂ(½aF>ö û.Ê7Á */
+	$"749B 49F2 F419 9EC5 DC0A A6DE 0CFC 1BD2"            /* t›Iòô.žÅܦÞ.ü.Ò */
+	$"AAF5 4920 1AB3 842A 1813 606E 97CD 0EC2"            /* ªõI .³„*..`n—Í. */
+	$"50D4 84CD F427 569F 776D 940A A6F7 68D7"            /* PÔ„Íô'VŸwm”¦÷h× */
+	$"2A18 4C6D 2056 D254 1226 7F3C 1ED0 7AB8"            /* *.Lm VÒT.&.<.Ðz¸ */
+	$"BEFE 2050 50E6 C5FB 173C 1857 FF7F 86D9"            /* ¾þ PPæÅû.<.Wÿ.†Ù */
+	$"6CE3 E235 1AFA CBB4 D2BE 4E64 9713 B880"            /* lãâ5.úË´Ò¾Nd—.¸€ */
+	$"0C41 2E14 401B D14F 5BA4 AD20 7060 C05E"            /* .A..@.ÑO[¤­ p`À^ */
+	$"2011 000E C557 2951 009C A584 6178 50E8"            /*  ...ÅW)Q.œ¥„axPè */
+	$"6E0D 922F BFF7 EC41 A907 0D2B EF09 3CE0"            /* n.’/¿÷ìA©..+ïÆ<à */
+	$"6344 B3D6 742A 0448 042D 44C3 390B 089B"            /* cD³Öt*.H.-DÃ9..› */
+	$"B0FF 2877 1C62 BE1E AC48 09B0 4667 19BC"            /* °ÿ(w.b¾.¬HÆ°Fg.¼ */
+	$"319D 1FEA ABB5 1EE9 02D8 C845 A20C 2E3F"            /* 1�.ꫵ.é.ØÈE¢..? */
+	$"7010 FA38 E2A0 1F01 2933 0557 19BD 9DCD"            /* p.ú8â ..)3.W.½�Í */
+	$"5486 F044 5838 C953 CC32 2DF8 6A04 30ED"            /* T†ðDX8ÉSÌ2-øj.0í */
+	$"2C42 0A7D 1B38 7F94 4936 5908 39F1 424F"            /* ,BÂ}.8.”I6Y.9ñBO */
+	$"2BFF 7F46 F53E 11D3 DA1E 41B4 67AB 296E"            /* +ÿ.Fõ>.ÓÚ.A´g«)n */
+	$"0B59 6213 9E16 1568 8787 ED75 8822 A102"            /* .Yb.ž..h‡‡íuˆ"¡. */
+	$"DAAC D7D6 FA63 ED91 52D2 E98C 6EEB ABBB"            /* Ú¬×Öúcí‘RÒéŒnë«» */
+	$"5465 7C7C 0CEB 3016 0CC6 5793 D7FF 7FFB"            /* Te||.ë0..ÆW“×ÿ.û */
+	$"34E7 7BDE 794E 6D8C 392D 051A 478B 4AD7"            /* 4ç{ÞyNmŒ9-..G‹J× */
+	$"028C 3119 EDCA 833C 2F1B A23A 5C69 908F"            /* .Œ1.íʃ</.¢:\i�� */
+	$"6F17 C143 83FF 31A8 709D 7BFA B0E4 A884"            /* o.ÁCƒÿ1¨p�{ú°ä¨„ */
+	$"E3DC 88CC DF54 C132 6671 A0D0 B4C3 7721"            /* ã܈ÌßTÁ2fq Ð´Ãw! */
+	$"B5F0 84FF 0FDA 1588 5865 1B6B 94E3 9B46"            /* µð„ÿ.Ú.ˆXe.k”ã›F */
+	$"5CA1 7767 09F4 3448 2242 114C 2705 2C38"            /* \¡wgÆô4H"B.L'.,8 */
+	$"4565 F286 ABC2 AFF5 809D 0C5B BB5E 009C"            /* Eeò†«Â¯õ€�.[»^.œ */
+	$"FCBA BC4C 84FF 45EF F42B 3F8E DEE0 A531"            /* üº¼L„ÿEïô+?ŽÞà¥1 */
+	$"DBBB 2113 7C30 8BB7 76FF 7E55 E6BC 012B"            /* Û»!.|0‹·vÿ~Uæ¼.+ */
+	$"EBDE EF62 0981 DCE1 AC6E 5AD7 D8AD 0560"            /* ëÞïbÆ�Üá¬nZ×Ø­.` */
+	$"5B36 3A62 5B57 3E03 75AC 25FB B396 1086"            /* [6:b[W>.u¬%û³–.† */
+	$"5EF0 4C11 ACE0 90D2 6568 EB55 75AB FF24"            /* ^ðL.¬à�ÒehëUu«ÿ$ */
+	$"54B8 0E77 3110 5C67 3138 8369 5BEA 3458"            /* T¸.w1.\g18ƒi[ê4X */
+	$"7FFE 6000 9940 0044 18C6 1A34 14B6 9CD2"            /* .þ`.™@.D.Æ.4.¶œÒ */
+	$"C039 2A00 00CC 8F27 9EFE FF80 1CAA 8000"            /* À9*..Ì�'žþÿ€.ª€. */
+	$"0000 0000 D9B1 C1D0 BFE1 D01D 2DD4 E3DF"            /* ....Ù±ÁпáÐ.-Ôãß */
+	$"949B 6DB6 DB6D B83D 6B98 82BC 446D 0CB3"            /* ”›m¶Ûm¸=k˜‚¼Dm.³ */
+	$"55A5 C140 D9E5 5E98 37AF 0E38 4474 B8DC"            /* U¥Á@Ùå^˜7¯.8Dt¸Ü */
+	$"FCFA B14E BD14 730B DAA0 4B18 1B4D 81E7"            /* üú±N½.s.Ú K..M�ç */
+	$"B8A8 26E7 EFB0 8272 4619 2A00 0000 0000"            /* ¸¨&çï°‚rF.*..... */
+	$"0000 0000 0000 060D CD91 05BE 3A07 80DE"            /* ........Í‘.¾:.€Þ */
+	$"29D6 2680 7867 5359 9411 F430 48D9 A22D"            /* )Ö&€xgSY”.ô0HÙ¢- */
+	$"DF74 0855 C0C4 C5AA D3F4 FC40 5815 C5FC"            /* ßt.UÀÄŪÓôü@X.Åü */
+	$"B741 3001 FF7F FDC6 00B8 F1BA FEC9 B662"            /* ·A0.ÿ.ýÆ.¸ñºþɶb */
+	$"4973 2EE9 5029 E237 296D D4A4 04DE 4DB9"            /* Is.éP)â7)mÔ¤.ÞM¹ */
+	$"5305 FD42 9A82 6842 EF09 9DA2 201D C6EF"            /* S.ýBš‚hBïÆ�¢ .Æï */
+	$"4078 4FC3 038C B201 A1C0 0791 7B09 CF18"            /* @xOÃ.Œ².¡À.‘{ÆÏ. */
+	$"D61B DABD 0409 372B F69D 3CF8 E2E1 31A1"            /* Ö.Ú½.Æ7+ö�<øâá1¡ */
+	$"023B B0FD 60B3 3933 16F2 C716 9259 82F8"            /* .;°ý`³93.òÇ.’Y‚ø */
+	$"77BB 3A47 46D2 D998 7AA1 01E1 DF78 8000"            /* w»:GFÒÙ˜z¡.áßx€. */
+	$"0000 0001 D8FD 4FB2 C620 0000 005A CD78"            /* ....ØýO²Æ ...ZÍx */
+	$"B755 53CD E910 3B50 96A8 4000 0000 0003"            /* ·USÍé.;P–¨@..... */
+	$"FD6F 5DD1 31D8 A087 6BC5 09F3 E81E B49F"            /* ýo]Ñ1Ø ‡kÅÆóè.´Ÿ */
+	$"5A88 0DB9 2492 4924 9234 EE49 0E46 EE5B"            /* Zˆ.¹$’I$’4îI.Fî[ */
+	$"8D2A E866 7AD0 1F3C 936D 50EF 6EF5 FDE7"            /* �*èfzÐ.<“mPïnõýç */
+	$"BFFE 6EFF 82AD 0EDF 556D B01D C573 CA68"            /* ¿þnÿ‚­.ßUm°.ÅsÊh */
+	$"985A F307 82C5 D933 4C26 B9EE EEF7 D4C6"            /* ˜Zó.‚ÅÙ3L&¹îî÷ÔÆ */
+	$"BFB5 4130 F610 4AFE 602E 3723 0C95 0000"            /* ¿µA0ö.Jþ`.7#.•.. */
+	$"0000 0000 0000 0000 0002 7F7E DE44 DDEB"            /* ...........~ÞDÝë */
+	$"B8B1 0AB8 BA80 7F79 D59C 851A 0244 B8D1"            /* ¸±Â¸º€.yÕœ…..D¸Ñ */
+	$"6B92 AB1A 4997 5556 C0C7 5935 05AD B380"            /* k’«.I—UVÀÇY5.­³€ */
+	$"318D A387 1E5F 1523 0170 B5DB D9FA 0E80"            /* 1�£‡._.#.pµÛÙú.€ */
+	$"7342 6634 1E36 FB10 615A 1862 FF53 1545"            /* sBf4.6û.aZ.bÿS.E */
+	$"C795 B42C 8282 534C 3AFD D370 7621 820E"            /* Ç•´,‚‚SL:ýÓpv!‚. */
+	$"9EDA AF3A 476B 3537 E327 52DE 4A99 73D1"            /* žÚ¯:Gk57ã'RÞJ™sÑ */
+	$"0718 7C16 82D5 99A5 32DD 0E83 9C4F 60F8"            /* ..|.‚Õ™¥2Ý.ƒœO`ø */
+	$"0743 325D 2056 84FF 06BC C6BB 338C 64CF"            /* .C2] V„ÿ.¼Æ»3ŒdÏ */
+	$"B7B9 C4C7 9800 E4DA EE0A 6636 DEE8 B8F8"            /* ·¹Äǘ.äÚîÂf6Þè¸ø */
+	$"739E 1EBD 408C C620 9790 A337 E987 2E54"            /* sž.½@ŒÆ —�£7é‡.T */
+	$"DD4A E501 C0BF 44E6 E8EF ACCF 028F 253C"            /* ÝJå.À¿Dæèï¬Ï.�%< */
+	$"F466 FA92 BEE6 A066 F4B6 5B41 CA80 3567"            /* ôfú’¾æ fô¶[AÊ€5g */
+	$"A079 E31D CEE9 CD64 0AED 265D E591 B98C"            /*  yã.ÎéÍdÂí&]呹Œ */
+	$"DF22 C203 3C43 E1D8 5D64 CA99 E6C7 EF30"            /* ß"Â.<CáØ]dÊ™æÇï0 */
+	$"68AF F4C9 97D5 F961 48CF 954C 2832 33A3"            /* h¯ôÉ—ÕùaHÏ•L(23£ */
+	$"0088 1417 0D84 DDE1 23FA C81D 487D C9AB"            /* .ˆ...„Ýá#úÈ.H}É« */
+	$"F239 ABB4 24E0 6694 291C 885C 23CE F212"            /* ò9«´$àf”).ˆ\#Îò. */
+	$"29F4 5656 7DD1 182A 2C11 AAEF 7534 24EE"            /* )ôVV}Ñ.*,.ªïu4$î */
+	$"9886 347F 28AD 6952 0A82 E9A4 6AA9 9390"            /* ˜†4.(­iR‚é¤j©“� */
+	$"06A8 EF47 527A EDF2 894B 5234 A900 82B1"            /* .¨ïGRzíò‰KR4©.‚± */
+	$"724D 791B 676C BC97 B3A5 94F7 137E FE8D"            /* rMy.gl¼—³¥”÷.~þ� */
+	$"50F5 C1EE 0C5B 1F3D CEF4 DD64 709C 095B"            /* PõÁî.[.=ÎôÝdpœÆ[ */
+	$"A51A B239 3EC3 C9BA 39EC DBE2 FB9A 3C6F"            /* ¥.²9>Ãɺ9ìÛâûš<o */
+	$"BBC4 DE3E C5AF 0043 DC2D AE64 C0A7 2039"            /* »ÄÞ>ů.CÜ-®dÀ§ 9 */
+	$"A6C9 6079 72D6 0BC7 C501 A3A4 5EF4 A060"            /* ¦É`yrÖ.ÇÅ.£¤^ô ` */
+	$"C46E FCB9 1958 AD83 1176 0776 81C2 13C2"            /* Änü¹.X­ƒ.v.v�Â. */
+	$"DF08 4A76 137F DC5C 4867 0493 EE96 8373"            /* ß.Jv..Ü\Hg.“î–ƒs */
+	$"4644 13A4 F789 39FF 813B D226 575A 5A18"            /* FD.¤÷‰9ÿ�;Ò&WZZ. */
+	$"3AF5 4B88 2747 3D47 681F 9670 0069 DD02"            /* :õKˆ'G=Gh.–p.iÝ. */
+	$"4252 ADB0 D6FB F1F1 1432 C24B D920 7290"            /* BR­°Öûññ.2ÂKÙ r� */
+	$"3709 3D60 15D9 0C49 23EC 77F8 F791 F132"            /* 7Æ=`.Ù.I#ìwø÷‘ñ2 */
+	$"046E 0D05 9AFA 210A 9992 29D9 7AA6 F18E"            /* .n..šú!™’)Ùz¦ñŽ */
+	$"E245 75E0 018F BCEB 8D1B C2D0 083E 985F"            /* âEuà.�¼ë�.ÂÐ.>˜_ */
+	$"B791 554D F5F5 AD71 E064 75E6 1F3A D463"            /* ·‘UMõõ­qàduæ.:Ôc */
+	$"9A59 0A43 3457 BD7C 44A7 5C5E 9D19 C5D8"            /* šYÂC4W½|D§\^�.ÅØ */
+	$"5880 C2CC 5DF0 2964 C0FD ABA1 004B 008D"            /* X€ÂÌ]ð)dÀý«¡.K.� */
+	$"5205 7F2E 0843 E484 2D37 9C34 2425 7AFF"            /* R....Cä„-7œ4$%zÿ */
+	$"7021 D907 B6E1 F5E5 02C3 F3DD 44C8 2252"            /* p!Ù.¶áõå.ÃóÝDÈ"R */
+	$"0649 3C1A 1A80 449A 64D1 1720 76D6 4987"            /* .I<..€DšdÑ. vÖI‡ */
+	$"B4B1 E749 E899 BF69 5B35 F925 2EE6 6CE6"            /* ´±çI虿i[5ù%.ælæ */
+	$"B4FD CEB3 54C0 7C9D 4380 F93B 5701 F274"            /* ´ýγTÀ|�C€ù;W.òt */
+	$"C4F3 CC20 F972 1FD1 56B3 911D 2995 5FC9"            /* ÄóÌ ùr.ÑV³‘.)•_É */
+	$"1F35 BAE0 9AC7 3082 1372 C1D5 4B23 D79E"            /* .5ºàšÇ0‚.rÁÕK#מ */
+	$"EF63 A93F 8E74 26FB AC68 CDBE BD3E 9720"            /* ïc©?Žt&û¬h;½>—  */
+	$"DF71 956D 5D26 559E 2795 2F1B F798 7821"            /* ßq•m]&Už'•/.÷˜x! */
+	$"F3CB 1E6F 2351 11BD 0EFF 19B2 40A2 1C7F"            /* óË.o#Q.½.ÿ.²@¢.. */
+	$"267D D302 F6AE 5410 1E96 40DC 386E CB7B"            /* &}Ó.ö®T..–@Ü8nË{ */
+	$"7EA3 5CF7 46BA 8758 D0EE 12B3 34DF 46FE"            /* ~£\÷Fº‡XÐî.³4ßFþ */
+	$"517B E0F8 7E28 83A5 E93A C06D 7C3F 254B"            /* Q{àø~(ƒ¥é:Àm|?%K */
+	$"53DF 91ED F6AB FD0A 53A0 5257 F9B8 E8B7"            /* Sß‘íö«ýÂS RWù¸è· */
+	$"5A14 6036 C6DA E3FE C29D 799F 8B43 46D6"            /* Z.`6ÆÚãþÂ�yŸ‹CFÖ */
+	$"94DF 1954 073C 7C30 40F4 A00D 93D4 AADF"            /* ”ß.T.<|0@ô .“ﻧ */
+	$"4839 EF36 F92A 3758 97CE 955A 3521 3CB5"            /* H9ï6ù*7X—ΕZ5!<µ */
+	$"8269 30A7 2A93 6A40 07BE DCC3 50B6 C86B"            /* ‚i0§*“j@.¾ÜÃP¶Èk */
+	$"CE9A AF28 3B80 4FE6 873C DB8E A29C 15DC"            /* Κ¯(;€Oæ‡<ÛŽ¢œ.Ü */
+	$"81A8 F841 4F77 6237 7267 55C4 1289 2DA1"            /* �¨øAOwb7rgUÄ.‰-¡ */
+	$"8392 424A 398F 9FA7 8DBE 2CC6 44E9 A005"            /* ƒ’BJ9�Ÿ§�¾,ÆDé . */
+	$"0E57 6638 ADDD 9F15 D32E 13A9 F752 67BA"            /* .Wf8­ÝŸ.Ó..©÷Rgº */
+	$"9F1D 753C 0023 2BC1 2C48 19AF FF28 66E6"            /* Ÿ.u<.#+Á,H.¯ÿ(fæ */
+	$"0A05 1D62 536F C372 7DEC 5069 B44D AFD4"            /* Â..bSoÃr}ìPi´M¯Ô */
+	$"BE3C 9C16 161E 95B4 89E7 B034 4524 E373"            /* ¾<œ...•´‰ç°4E$ãs */
+	$"D4A2 2F82 F1BB 8F20 7861 0F95 7CDF C184"            /* Ô¢/‚ñ»� xa.•|ßÁ„ */
+	$"5B65 6015 001B F6BD 5D52 D4BC 3A42 FD56"            /* [e`...ö½]RÔ¼:BýV */
+	$"D48F 3358 7432 09BD FF19 625D 3A11 13DA"            /* Ô�3Xt2ƽÿ.b]:..Ú */
+	$"F222 12E8 5A1B 12BF 9B3B A234 A367 8FB6"            /* ò".èZ..¿›;¢4£g�¶ */
+	$"4BF2 EE99 DB11 5D13 7021 71B4 2280 A1BC"            /* Kòî™Û.].p!q´"€¡¼ */
+	$"2AEF ECB5 D7EC 047C 0860 9676 78B1 CA76"            /* *ïìµ×ì.|.`–vx±Êv */
+	$"9AFB C995 D4EB 900A AD98 6423 E572 B68C"            /* šûÉ•Ôë�­˜d#år¶Œ */
+	$"A271 A30B D157 8E95 8250 29BB 0323 E26C"            /* ¢q£.ÑWŽ•‚P)».#âl */
+	$"9223 91C7 0CD4 F0B0 442E 1BD3 1473 C699"            /* ’#‘Ç.Ôð°D..Ó.sÆ™ */
+	$"2D1C 8791 C699 920E 72C0 0D3E F6E9 9E2B"            /* -.‡‘Æ™’.rÀ.>öéž+ */
+	$"60B6 A87F 6CBE 146C 1224 90FC BF7B C6A9"            /* `¶¨.l¾.l.$�ü¿{Æ© */
+	$"090E 3EAD C89D 5065 414B 3A1C F271 9327"            /* Æ.>­È�PeAK:.òq“' */
+	$"D490 CD2B FBB3 BEFF 768D 4601 635B A746"            /* Ô�Í+û³¾ÿv�F.c[§F */
+	$"8A4B 0981 8B8F EA85 D255 2113 8792 CC76"            /* ŠKÆ�‹�ê…ÒU!.‡’Ìv */
+	$"DE84 B950 C5F4 A4C1 D4EF 7D52 CC74 CCEE"            /* Þ„¹PÅô¤ÁÔï}RÌtÌî */
+	$"B40E B94F 9467 15CA 1DE0 3557 BF09 D787"            /* ´.¹O”g.Ê.à5W¿Æׇ */
+	$"ED66 345A E153 B4DC EF7C 2952 3161 5A99"            /* íf4ZáS´Üï|)R1aZ™ */
+	$"A193 D5EB 40F5 1300 65FA 8DFD 621A AE94"            /* ¡“Õë@õ..eú�ýb.®” */
+	$"30CD 6D25 A0FC 942E 37AC 52C8 CEAD 2D1F"            /* 0Ím% ü”.7¬RÈέ-. */
+	$"87D5 D078 F173 F5AD 7A56 DD1B 10C3 F9BF"            /* ‡ÕÐxñsõ­zVÝ..Ãù¿ */
+	$"69C1 9E6B E021 A0C7 84BF D87A 8AA8 327C"            /* iÁžkà! Ç„¿ØzŠ¨2| */
+	$"7D48 0D97 E584 FF7F AE07 2001 BF6C 2691"            /* }H.—å„ÿ.®. .¿l&‘ */
+	$"3032 E118 8741 42AD 7709 3086 8488 F9D3"            /* 02á.‡AB­wÆ0†„ˆùÓ */
+	$"0353 D79E 2E21 8F21 46CC 005C DA8A 0229"            /* .Sמ.!�!FÌ.\ÚŠ.) */
+	$"A56B A72A C69E FCF7 7558 5D72 0050 2BDE"            /* ¥k§*Æžü÷uX]r.P+Þ */
+	$"0F36 E4F0 C744 89FC 37F0 7ECA F488 FE8C"            /* .6äðÇD‰ü7ð~ÊôˆþŒ */
+	$"1B6B 0158 B34D 1EA6 9B1F 154E FF79 01D4"            /* .k.X³M.¦›..Nÿy.Ô */
+	$"725F D9CF D9BF CCFF 439D 8F5C A92D D20D"            /* r_ÙÏÙ¿ÌÿC��\©-Ò. */
+	$"0613 88F8 5C1C B6BD 07B9 9078 151D 8353"            /* ..ˆø\.¶½.¹�x..ƒS */
+	$"0E68 8495 D521 92D8 E92D CF9B 10E6 ABDC"            /* .h„•Õ!’Øé-Ï›.æ«Ü */
+	$"53D9 DFB2 F2AF F964 14E3 74D6 3D64 01E2"            /* SÙß²ò¯ùd.ãtÖ=d.â */
+	$"FAFB 2D0B D303 DCF7 7718 E6CF 30DB 3FAE"            /* úû-.Ó.Ü÷w.æÏ0Û?® */
+	$"2873 3339 54A3 1E48 04D2 FDF2 E863 6201"            /* (s39T£.H.Òýòècb. */
+	$"01D1 182C 4C2A D85D AE26 DE15 9796 494C"            /* .Ñ.,L*Ø]®&Þ.—–IL */
+	$"82EA B4C0 2D3C 3D3E 1732 2ACA AC27 B7DB"            /* ‚ê´À-<=>.2*ʬ'·Û */
+	$"5CED 6F9D 3EDB FF04 5E83 BE60 1636 AE2C"            /* \ío�>Ûÿ.^ƒ¾`.6®, */
+	$"754D 2928 7128 ACFD 15E8 C1A0 30A5 1063"            /* uM)(q(¬ý.èÁ 0¥.c */
+	$"1E6F 10F7 A946 B9B4 D921 5DB3 113F 332E"            /* .o.÷©F¹´Ù!]³.?3. */
+	$"61B8 AB3D 2F87 E081 C9D9 32B7 1060 785A"            /* a¸«=/‡à�ÉÙ2·.`xZ */
+	$"EFDD F472 0283 E235 4D42 E903 A06B 51CB"            /* ïÝôr.ƒâ5MBé. kQË */
+	$"39DC A412 A492 918E 235E F57C E4CE 4E0F"            /* 9ܤ.¤’‘Ž#^õ|äÎN. */
+	$"6BE6 7036 FA8A 7B2C 21FE 60B1 6FCA 7654"            /* kæp6úŠ{,!þ`±oÊvT */
+	$"C9FD DCDF E497 B2A6 D6D5 87ED 9D3B 5B86"            /* ÉýÜßä—²¦ÖÕ‡í�;[† */
+	$"DA51 6B5B AE3E 520B 1DB3 5A6B 2B4D A777"            /* ÚQk[®>R..³Zk+M§w */
+	$"4F13 A04C 7D4F 819B 1FEB 086D 5F34 6643"            /* O. L}O�›.ë.m_4fC */
+	$"0208 693A D70C 55B2 7A07 BC27 3A41 B739"            /* ..i:×.U²z.¼':A·9 */
+	$"C1F5 7425 07D5 D74C 1F56 F680 F1C4 B0CB"            /* Áõt%.Õ×L.Vö€ñÄ°Ë */
+	$"F3E0 DE80 53FC 256D EFD0 6B64 028C EC70"            /* óàÞ€Sü%mïÐkd.Œìp */
+	$"4973 06D4 242C DAAA 8373 DFAC B0C9 14A1"            /* Is.Ô$,Úªƒs߬°É.¡ */
+	$"BFBC 0BB4 E250 919E 3D2B B388 3A89 FB02"            /* ¿¼.´âP‘ž=+³ˆ:‰û. */
+	$"9796 86E6 20F8 C26C 8120 349C 757A 6875"            /* —–†æ øÂl� 4œuzhu */
+	$"F63E AE68 84C3 03A3 6F64 F9EE F892 2CF8"            /* ö>®h„Ã.£odùîø’,ø */
+	$"61C1 B13A E941 0D67 DA36 4C05 9565 DC85"            /* aÁ±:éA.gÚ6L.•eÜ… */
+	$"D7F8 6EB9 D903 D428 F59A 3EBF C73E 5E95"            /* ×øn¹Ù.Ô(õš>¿Ç>^• */
+	$"764D 15FB 98F2 BECE 0FC8 EA3C 4E51 E1DD"            /* vM.û˜ò¾Î.Èê<NQáÝ */
+	$"5253 CE7A 2D16 8527 AF8E 9A17 757A A42F"            /* RSÎz-.…'¯Žš.uz¤/ */
+	$"6CA9 6BB3 7787 D84F 8E20 EA1F FB2D 15E3"            /* l©k³w‡ØOŽ ê.û-.ã */
+	$"0D2C 45A8 8C80 7DA1 89DB 5F46 F3FB 2871"            /* .,E¨Œ€}¡‰Û_Fóû(q */
+	$"539E 8CCA 5C03 EF20 B6B5 4956 EB82 172C"            /* SžŒÊ\.ï ¶µIVë‚., */
+	$"AB28 0D6D 4DF9 1F61 6F8D 61FE E962 778D"            /* «(.mMù.ao�aþébw� */
+	$"0C8E EC55 3BDC EC81 C9D1 E7D5 A811 C69A"            /* .ŽìU;Üì�ÉÑçÕ¨.Æš */
+	$"6186 BC2C 75B4 DD3D C207 1151 4C3B 4175"            /* a†¼,u´Ý=Â..QL;Au */
+	$"942E 2ACF D3C7 7122 9D89 31B3 0918 EDC0"            /* ”.*ÏÓÇq"�‰1³Æ.íÀ */
+	$"9D45 75D8 DE61 5036 6D9F 3373 4827 7ADE"            /* �EuØÞaP6mŸ3sH'zÞ */
+	$"1BD1 16E8 8905 37D4 D811 1077 B359 0FF6"            /* .Ñ.è‰.7ÔØ..w³Y.ö */
+	$"0460 F360 20A5 B532 3418 142A B432 C2E9"            /* .`ó` ¥µ24..*´2Âé */
+	$"A0D6 DB04 317D 28F3 C893 AAE3 19B1 5742"            /*  ÖÛ.1}(óÈ“ªã.±WB */
+	$"7BF6 615C 0EAC F35E 0CD4 B142 A289 5458"            /* {öa\.¬ó^.Ô±B¢‰TX */
+	$"D699 1584 46FF 7174 758F B1F8 F540 F427"            /* Ö™.„Fÿqtu�±øõ@ô' */
+	$"A496 8795 E66B 3DDC FB80 D0B8 9411 7240"            /* ¤–‡•æk=Üû€Ð¸”.r@ */
+	$"0374 54DC B2CA C982 BD5E FD06 4B02 5E8D"            /* .tTܲÊÉ‚½^ý.K.^� */
+	$"A958 79AA 5BE6 B5A2 76C3 7C23 0D45 6768"            /* ©Xyª[æµ¢vÃ|#.Egh */
+	$"D726 8259 FD2E E5CE 9B70 0600 22E7 82A3"            /* ×&‚Yý.åΛp.."ç‚£ */
+	$"8E14 9626 C4EC EED9 E7D8 13C9 623F 3DEB"            /* Ž.–&ÄìîÙçØ.Éb?=ë */
+	$"357B E617 A43A C9D4 328A C30A FF45 71BA"            /* 5{æ.¤:ÉÔ2ŠÃÂÿEqº */
+	$"1F8B 3945 8E06 0CF0 4749 0840 6F5A EDDB"            /* .‹9EŽ..ðGI.@oZíÛ */
+	$"29AC E877 27BD 6C8C A131 8A1C 9228 0FC5"            /* )¬èw'½lŒ¡1Š.’(.Å */
+	$"A029 D1A1 324D EFCE EB3F 2B92 150D FB8C"            /*  )Ñ¡2MïÎë?+’..ûŒ */
+	$"5399 1ABD D375 08BF 8F3F E788 684D 3064"            /* S™.½Óu.¿�?çˆhM0d */
+	$"70B4 A733 4AB6 239A DC03 724F C8B8 F1BB"            /* p´§3J¶#šÜ.rOȸñ» */
+	$"8F1F A795 FF18 8256 0050 FF74 EDF1 3D05"            /* �.§•ÿ.‚V.Pÿtíñ=. */
+	$"6CB0 E566 9272 E493 C085 3D06 3116 4ECE"            /* l°åf’rä“À…=.1.NÎ */
+	$"402D 329F 4BBB 2598 A7CF BEE1 333D 9019"            /* @-2ŸK»%˜§Ï¾á3=�. */
+	$"61BB 1A29 2616 E907 2CD6 F64C 456F 9881"            /* a».)&.é.,ÖöLEo˜� */
+	$"725B 5C38 A40D 60D3 6B4F FDF1 87D7 4786"            /* r[\8¤.`ÓkOýñ‡×G† */
+	$"29BF CAEB 223A 044D 0F61 FDE6 0A3E 7727"            /* )¿Êë":.M.aýæÂ>w' */
+	$"DDEE 0A95 231F 04AC B6EF D134 C09D 1540"            /* Ýî•#..¬¶ïÑ4À�.@ */
+	$"0E94 57E2 8418 C208 1F26 7396 96A0 D08F"            /* .”Wâ„.Â..&s–– Ð� */
+	$"0CC0 40C8 C596 39BA 0CAE A6ED F8E8 7D6B"            /* .À@ÈÅ–9º.®¦íøè}k */
+	$"A76C 391B 6113 555F 62E0 6E14 5D27 E7BC"            /* §l9.a.U_bàn.]'ç¼ */
+	$"EDB7 D038 DED2 7BEE FC9D 6211 241E 0795"            /* í·Ð8ÞÒ{îü�b.$..• */
+	$"9CDE 1607 B4C7 828E 24D2 4E9F FCA0 36EA"            /* œÞ..´Ç‚Ž$ÒNŸü 6ê */
+	$"004C C960 1680 01CE 7FF6 A201 EDAB 1ADF"            /* .LÉ`.€.Î.ö¢.í«.ß */
+	$"80D8 4524 390C 23DD EA8E 062C 5DDB 3C57"            /* €ØE$9.#ÝêŽ.,]Û<W */
+	$"BAEC 18E5 1ECE 91D7 A40E 08ED 23EA 55B6"            /* ºì.å.Αפ..í#êU¶ */
+	$"AA2C F48A 7B0E 8CAE 90DD 5840 41FF 7F4C"            /* ª,ôŠ{.Œ®�ÝX@Aÿ.L */
+	$"47AD E774 87C4 9AB1 9CAD E633 DECD 3E36"            /* G­çt‡Äš±œ­æ3ÞÍ>6 */
+	$"00C2 0E05 134F 4802 3846 3575 1902 676D"            /* .Â...OH.8F5u..gm */
+	$"1006 D8AE 0D5F 1934 78F6 0721 F3C4 1000"            /* ..Ø®._.4xö.!óÄ.. */
+	$"8991 FA85 45B5 37A9 5A0C 54EE 014B 297B"            /* ‰‘ú…Eµ7©Z.Tî.K){ */
+	$"52F2 5ADD 7422 C97B EAA9 D291 45A7 A44A"            /* RòZÝt"É{ê©Ò‘E§¤J */
+	$"40FE AE73 5086 C7D3 85FD D734 67F2 8909"            /* @þ®sP†ÇÓ…ý×4gò‰Æ */
+	$"506D 36D8 2361 990C 802F A59E B603 9C94"            /* Pm6Ø#a™.€/¥ž¶.œ” */
+	$"F7BD AED9 8518 8651 DFFE 3D0E E920 E874"            /* ÷½®Ù….†Qßþ=.é èt */
+	$"FEB0 EE3C 3242 C249 4704 EEA8 9EFA DC61"            /* þ°î<2BÂIG.úÜa */
+	$"49C6 929E 2A9D 51CD FE0A FF02 3DDB 01EC"            /* IÆ’ž*�QÍþÂÿ.=Û.ì */
+	$"80E8 630A B0C8 C9FC 7693 C60B 07E8 5D2F"            /* €èc°ÈÉüv“Æ..è]/ */
+	$"B97A 9F04 444E C836 DD68 FF12 EC9C 7E4F"            /* ¹zŸ.DNÈ6Ýhÿ.ìœ~O */
+	$"3CE9 83A8 191A 1E61 05F8 90FF 67E8 011A"            /* <部...a.ø�ÿgè.. */
+	$"71EA 3EE8 AFBD 6328 ED84 9807 788D F3BC"            /* qê>诽c(턘.x�ó¼ */
+	$"2FA0 A210 7FFF 1D02 2519 4EC7 2A80 7FD0"            /* / ¢..ÿ..%.NÇ*€.Ð */
+	$"2064 A8F4 CC78 5EC8 88AF F1AB 868B 9F8D"            /*  d¨ôÌx^Ȉ¯ñ«†‹Ÿ� */
+	$"883E 3FDA D188 FBB7 3AFC 0C72 E01A CEF3"            /* ˆ>?Úшû·:ü.rà.Îó */
+	$"21E1 1718 4FDB 9A43 3767 424A 639B DFFE"            /* !á..OÛšC7gBJc›ßþ */
+	$"CA5F 7BA9 8F82 3EA6 6D4E 6986 6945 80DE"            /* Ê_{©�‚>¦mNi†iE€Þ */
+	$"8274 4927 166A 6062 DF1D 0A72 F23B FA5A"            /* ‚tI'.j`bß.Ârò;úZ */
+	$"4DE4 5D19 54FC 488B 5237 FF5F 7B81 62C5"            /* Mä].TüH‹R7ÿ_{�bÅ */
+	$"F6B7 B580 3016 11B6 22CF 63B8 428A D39A"            /* ö·µ€0..¶"Ïc¸BŠÓš */
+	$"5AC3 80FF 7310 8386 FF54 F361 304F 3BB5"            /* ZÀÿs.ƒ†ÿTóa0O;µ */
+	$"A7EB 0419 7DFB 6E56 20A8 3670 9018 9CB3"            /* §ë..}ûnV ¨6p�.œ³ */
+	$"4B35 7082 32A7 E917 9CF8 FF7F FF80 0A6C"            /* K5p‚2§é.œøÿ.ÿ€Âl */
+	$"A48C 447E 3ECF 411D 89E4 F923 373B DCBE"            /* ¤ŒD~>ÏA.‰äù#7;ܾ */
+	$"2CE8 6580 0F87 1A23 1D93 62AE 48EF DEB8"            /* ,èe€.‡.#.“b®HïÞ¸ */
+	$"5DE8 DB68 1CA3 8D4B D3FE A476 7B3D ACAA"            /* ]èÛh.£�KÓþ¤v{=¬ª */
+	$"284F 83EB 428F A201 D122 CB1A CCB2 C1FE"            /* (OƒëB�¢.Ñ"Ë.̲Áþ */
+	$"367F 60D3 155D 8C00 22D8 ED33 D56B 1DE2"            /* 6.`Ó.]Œ."Øí3Õk.â */
+	$"98B0 A4A9 E041 2BF1 AA58 E78D 47E5 929F"            /* ˜°¤©àA+ñªXç�Gå’Ÿ */
+	$"85DA 699E C45A 0064 B931 CF2B 4169 44F0"            /* …ÚižÄZ.d¹1Ï+AiDð */
+	$"4B4F 083B 3D7C B2B2 D87B 785E 91A8 C614"            /* KO.;=|²²Ø{x^‘¨Æ. */
+	$"6EE6 A63C C8A7 B9E3 839D E245 4128 3BF9"            /* næ¦<ȧ¹ãƒ�âEA(;ù */
+	$"98CD 0C23 72EB E3A9 D21F 1BC2 4E13 274B"            /* ˜Í.#rëã©Ò..ÂN.'K */
+	$"19C8 CB39 5E7A D218 FBDB 0C42 51A1 1203"            /* .ÈË9^zÒ.ûÛ.BQ¡.. */
+	$"C0EB CDC2 9249 E461 1DE4 3DB6 FDFE 1334"            /* ÀëÍÂ’Iäa.ä=¶ýþ.4 */
+	$"1952 8231 CD71 A170 C55B 1FD0 6706 57F0"            /* .R‚1Íq¡pÅ[.Ðg.Wð */
+	$"282D 09A2 0893 A5BA 0314 43DD 32AF 3478"            /* (-Æ¢.“¥º..CÝ2¯4x */
+	$"EF6C 15F0 55C9 6A47 ECFE 3F3F 4DB4 5ED8"            /* ïl.ðUÉjGìþ??M´^Ø */
+	$"EFF8 8CA5 71F9 6669 078C 550C 943A 7046"            /* ïøŒ¥qùfi.ŒU.”:pF */
+	$"C031 6CE2 4681 4177 2913 CFE7 D857 C62A"            /* À1lâF�Aw).ÏçØWÆ* */
+	$"4652 88E2 8830 DF42 9C3D 2D76 E710 A8F1"            /* FRˆâˆ0ßBœ=-vç.¨ñ */
+	$"3626 45F2 55CC 008C EAB8 B891 A5F3 1AD2"            /* 6&EòUÌ.Œê¸¸‘¥ó.Ò */
+	$"AB11 6C48 3F18 40C0 51F0 DB88 0BD1 168C"            /* «.lH?.@ÀQðÛˆ.Ñ.Œ */
+	$"2E54 2DA6 CC60 BB05 4700 2C4E 179B 271B"            /* .T-¦Ì`».G.,N.›'. */
+	$"688C 1EE9 4D9A C781 8108 296B FE4F 028A"            /* hŒ.éMšÇ��.)kþO.Š */
+	$"63D6 6EDF 6FEB FC17 BDFE 7A70 B48E D94E"            /* cÖnßoëü.½þzp´ŽÙN */
+	$"D985 3384 1BD2 B4C9 5213 B0D1 041B 876C"            /* Ù…3„.Ò´ÉR.°Ñ..‡l */
+	$"131C 4A9C 947B A79C A466 9779 E7C9 D2E1"            /* ..Jœ”{§œ¤f—yçÉÒá */
+	$"4E9F 0509 30E0 1115 E5C7 CAED 197B 818A"            /* NŸ.Æ0à..åÇÊí.{�Š */
+	$"324D 8F8E ED44 BF44 5340 D647 1776 B983"            /* 2M�ŽíD¿DS@ÖG.v¹ƒ */
+	$"6D8C 88B1 6976 F7EB AFDB 6638 CAD3 F275"            /* mŒˆ±iv÷ë¯Ûf8ÊÓòu */
+	$"D93A 6CD3 9D6E C617 3969 D8E5 3059 947B"            /* Ù:lÓ�nÆ.9iØå0Y”{ */
+	$"6AFA 0E9B A19C 24C9 E1DC 089D 3545 89E4"            /* jú.›¡œ$ÉáÜ.�5E‰ä */
+	$"E860 FB54 068C B464 EE9B 66B7 F267 34CF"            /* è`ûT.Œ´dî›f·òg4Ï */
+	$"1276 C6B2 47E6 8284 300B D1A9 1409 0C93"            /* .vƲGæ‚„0.Ñ©.Æ.“ */
+	$"E36A 8095 409A 7352 FF7A 0F50 A5E2 E678"            /* ãj€•@šsRÿz.P¥âæx */
+	$"C195 0898 E51E EB15 8D7A E918 29A6 D5CE"            /* Á•.˜å.ë.�zé.)¦ÕÎ */
+	$"4DBC 978B 2CAA 9BA7 8727 EA1C 1C7A 6CC2"            /* M¼—‹,ª›§‡'ê..zl */
+	$"D172 DDF5 4BD4 9C69 607B 609F AEC8 FD84"            /* ÑrÝõKÔœi`{`Ÿ®Èý„ */
+	$"1DDA A076 C7E1 A7B1 F86C BC7E 1720 EB83"            /* .Ú vÇ᧱øl¼~. ëƒ */
+	$"095B F1C8 7239 10FD 6A26 D10E 534B E257"            /* Æ[ñÈr9.ýj&Ñ.SKâW */
+	$"B691 5D92 6949 E7D8 7470 AA8C 421F F945"            /* ¶‘]’iIçØtpªŒB.ùE */
+	$"99F6 9492 B806 E264 47B0 4EF5 6206 734E"            /* ™ö”’¸.âdG°Nõb.sN */
+	$"944B 102F A688 23A4 EAB0 CCEA 0017 0156"            /* ”K./¦ˆ#¤ê°Ìê...V */
+	$"A8C9 2A3F FF49 4137 E23A 09D0 97BB 0E5F"            /* ¨É*?ÿIA7â:ÆЗ»._ */
+	$"E2A2 2247 4980 6A20 B443 3E0B 0465 B9EF"            /* â¢"GI€j ´C>..e¹ï */
+	$"C490 B954 3AEA ABB7 3D53 111D 8897 551C"            /* Ä�¹T:ê«·=S..ˆ—U. */
+	$"B865 1EA2 33F2 AD50 D488 1D6D 9733 27F3"            /* ¸e.¢3ò­PÔˆ.m—3'ó */
+	$"78AC C946 FB3C 4D2F 6580 1B3A 3368 3D54"            /* x¬ÉFû<M/e€.:3h=T */
+	$"55DF 6B52 1A54 9010 C4D2 12C8 D497 9CDB"            /* UßkR.T�.ÄÒ.ÈÔ—œÛ */
+	$"173A 0609 66F1 C6C0 FD02 47A0 B2E2 D2E6"            /* .:.ÆfñÆÀý.G ²âÒæ */
+	$"096E F870 0776 4898 2F2B 84CF BA83 D656"            /* Ænøp.vH˜/+„ϺƒÖV */
+	$"7F77 79FF 0F1D 2A6E 03C6 4D0F E3EF D23B"            /* .wyÿ..*n.ÆM.ãïÒ; */
+	$"6F82 5F72 6701 98DF 5A63 DA7B 0ABC 75E2"            /* o‚_rg.˜ßZcÚ{¼uâ */
+	$"382D 0D93 3C8C 5308 19EA EF8D 7922 CD36"            /* 8-.“<ŒS..êï�y"Í6 */
+	$"ED21 EB4D 3D77 5A8A 1380 E238 22E5 84AA"            /* í!ëM=wZŠ.€â8"優 */
+	$"4488 7DCE 91A0 CB4B 67FA 74AF EA3D 1C8E"            /* Dˆ}Α ËKgút¯ê=.Ž */
+	$"9279 611D FD02 D08F D952 B05D 2C11 B545"            /* ’ya.ý.Ð�ÙR°],.µE */
+	$"5F17 FF5C 1E9C 6A77 DA2F A474 B20C F5A2"            /* _.ÿ\.œjwÚ/¤t².õ¢ */
+	$"B2D4 176F 97E4 CE9E B576 C3E0 0F3D ECB9"            /* ²Ô.o—äΞµvÃà.=ì¹ */
+	$"7B35 DEBB 5ABA 9738 36F8 524D 74D8 08FF"            /* {5Þ»Zº—86øRMtØ.ÿ */
+	$"29A7 9B08 5B43 7C17 FB53 234E 4806 B0C3"            /* )§›.[C|.ûS#NH.°Ã */
+	$"AF3A FF38 CCAF FEAA C60F D103 32AC 7D7F"            /* ¯:ÿ8̯þªÆ.Ñ.2¬}. */
+	$"D2B8 51C1 7B7D 56FD 7CFB D2B5 C55B 7C7D"            /* Ò¸QÁ{}Vý|ûÒµÅ[|} */
+	$"7D30 10C2 4181 3358 5DD6 4625 4FFC EA30"            /* }0.ÂA�3X]ÖF%Oüê0 */
+	$"3402 194F 6D0B 53D8 3C64 54AE E8DA 7874"            /* 4..Om.SØ<dT®èÚxt */
+	$"7FF1 DE25 3147 0AF0 D5B6 7BF7 88DD 5199"            /* .ñÞ%1GÂðÕ¶{÷ˆÝQ™ */
+	$"611E 526D B6DB 6DB6 DB69 9C6E 7A40 821D"            /* a.Rm¶Ûm¶Ûiœnz@‚. */
+	$"4416 6952 04BB 9C0A F19B 2C62 E698 A4F5"            /* D.iR.»œÂñ›,b昤õ */
+	$"9B83 3C59 8217 0000 0034 8080 DB92 4924"            /* ›ƒ<Y‚....4€€Û’I$ */
+	$"9249 247D 32D0 9B20 73FF 7E44 A49A 44BB"            /* ’I$}2Л sÿ~D¤šD» */
+	$"EB45 3E31 A4A0 C0CC BBC0 B29E 7771 4FDE"            /* ëE>1¤ ÀÌ»À²žwqOÞ */
+	$"1679 23F1 DE12 5574 68E3 60A1 9C00 CBEC"            /* .y#ñÞ.Uthã`¡œ.Ëì */
+	$"9C44 9009 0000 08DE 28C3 2776 AAA2 829A"            /* œD�Æ...Þ(Ã'vª¢‚š */
+	$"05E0 47E9 0001 48A9 672C 0775 EE58 F075"            /* .àGé..H©g,.uîXðu */
+	$"7458 B48A 5455 DB33 3524 BE73 1D7C E223"            /* tX´ŠTUÛ35$¾s.|â# */
+	$"4EC4 732C EC4B 128D 341C 790C 00A2 1309"            /* NÄs,ìK.�4.y..¢.Æ */
+	$"2D0B 5EA7 B07B C82C 976B 68C2 642A F095"            /* -.^§°{È,—khÂd*ð• */
+	$"A1C4 010E C94E D8A9 34BB FD3E 2B2F 92EC"            /* ¡Ä..ÉNØ©4»ý>+/’ì */
+	$"30E1 A7B3 040B C920 3FFF 7FA1 317B 90F7"            /* 0᧳..É ?ÿ.¡1{�÷ */
+	$"C744 40B8 8325 4036 82FB 0C6C D800 19C4"            /* ÇD@¸ƒ%@6‚û.lØ..Ä */
+	$"2631 C4B8 3160 8649 2492 4924 9248 A747"            /* &1ĸ1`†I$’I$’H§G */
+	$"3D41 A17D 23A6 9AC7 9000 0000 0000 0000"            /* =A¡}#¦šÇ�....... */
+	$"0000 0019 1A70 8823 BB21 7C62 4556 F257"            /* .....pˆ#»!|bEVòW */
+	$"62C0 CF0B 72EE F37E 64EC 43C2 AE04 9F58"            /* bÀÏ.rîó~dìC®.ŸX */
+	$"94DC E128 91EC BAA2 DADD 57A7 D5F7 1972"            /* ”Üá(‘캢ÚÝW§Õ÷.r */
+	$"7543 9A9A 0DB3 C3FD 42E0 19A3 8F45 7FDF"            /* uCšš.³ÃýBà.£�E.ß */
+	$"CEB1 A7E5 8A09 5B4A F9E6 294B C5DC 80C9"            /* α§åŠÆ[Jùæ)KÅÜ€É */
+	$"9AEE 0729 374F 04FD 79D6 7170 D940 14F0"            /* šî.)7O.ýyÖqpÙ@.ð */
+	$"830F 0B71 50E7 3C76 97AF 0F71 A32D DC5A"            /* ƒ..qPç<v—¯.q£-ÜZ */
+	$"28A9 FE90 6CC0 9484 30D1 FCCD 4991 0758"            /* (©þ�lÀ”„0ÑüÍI‘.X */
+	$"BE36 B1DE 3A2E B6F8 2756 C568 2A7F D038"            /* ¾6±Þ:.¶ø'VÅh*.Ð8 */
+	$"2397 6E8F 32E0 C1AC 3736 32A3 C18E 13C4"            /* #—n�2àÁ¬762£ÁŽ.Ä */
+	$"D298 8703 F9AF E24B A630 0627 6E63 ED70"            /* Ò˜‡.ù¯âK¦0.'ncíp */
+	$"0662 A833 6515 7225 C79D 8C1F 7410 45BF"            /* .b¨3e.r%Ç�Œ.t.E¿ */
+	$"5019 F088 7C6C 43FC AE88 B794 5847 505F"            /* P.ðˆ|lCü®ˆ·”XGP_ */
+	$"2B73 6E58 E20E 18A2 01B4 DF7F F5BD D4BC"            /* +snXâ..¢.´ß.õ½Ô¼ */
+	$"B259 706B 754E 9740 BBF2 54FC FCB8 B293"            /* ²YpkuN—@»òTüü¸²“ */
+	$"4CEA 3670 D04B 8C42 B7C2 314D 1F53 956B"            /* Lê6pÐKŒB·Â1M.S•k */
+	$"CB14 9D05 8288 E7F0 D4FF 70AE EFB7 A10B"            /* Ë.�.‚ˆçðÔÿp®ï·¡. */
+	$"EDDE 3CFE 1B9D 7DBA 7B7D BD13 DF6F 45B8"            /* íÞ<þ.�}º{}½.ßoE¸ */
+	$"FE1A 077D B444 FAB6 46FB 75FC E8AB DECC"            /* þ..}´Dú¶Fûuüè«ÞÌ */
+	$"AF0D 6C8A C695 8734 8A7A 5A21 F65D 05F6"            /* ¯.lŠÆ•‡4ŠzZ!ö].ö */
+	$"A417 27AC 998E 3646 07A8 0055 19DC B524"            /* ¤.'¬™Ž6F.¨.U.ܵ$ */
+	$"D2F2 842C DF9F BECA C26B C9C9 D0FD CA3B"            /* Òò„,ߟ¾ÊÂkÉÉÐýÊ; */
+	$"DB1B 3F81 F6A7 4465 001E 5552 4D0D 3BF3"            /* Û.?�ö§De..URM.;ó */
+	$"0140 A2E9 7D63 8456 F9C7 665D F7FC 2DBF"            /* .@¢é}c„VùÇf]÷ü-¿ */
+	$"1B41 0667 7939 1B16 4997 5584 3CFE 81B9"            /* .A.gy9..I—U„<þ�¹ */
+	$"C4A8 B346 EC6D E726 2560 5CB8 8B84 7699"            /* Ĩ³Fìmç&%`\¸‹„v™ */
+	$"3999 2CA0 91D9 A05A C96C 660C 267B 74A0"            /* 9™, ‘Ù ZÉlf.&{t  */
+	$"B935 73EB D464 D860 2694 7584 A4D4 DC52"            /* ¹5sëÔdØ`&”u„¤ÔÜR */
+	$"D136 D49A 1BEA 53F5 AE2F C19E 44E9 BA0A"            /* Ñ6Ôš.êSõ®/ÁžDéºÂ */
+	$"5D83 6587 7792 3DCB 449A B33E 4632 A395"            /* ]ƒe‡w’=ËDš³>F2£• */
+	$"57A3 0EC0 B3A3 969D 9DF0 6ACC 859F FF7F"            /* W£.À³£–��ðjÌ…Ÿÿ. */
+	$"FF27 DAA0 AF8E 216C E5D8 874A 530F 555E"            /* ÿ'Ú ¯Ž!lå؇JS.U^ */
+	$"AF3F E231 5BAF F7B6 8E73 5742 2717 4031"            /* ¯?â1[¯÷¶ŽsWB'.@1 */
+	$"175D 5FDA F402 B756 AEAE 7E7E BFEE CE68"            /* .]_Úô.·V®®~~¿îÎh */
+	$"7878 870D 01C2 C2A4 61D5 64E3 E195 B914"            /* xx‡..¤aÕdãᕹ. */
+	$"A45F FF52 DC14 F5E9 E037 65E3 5477 62A5"            /* ¤_ÿRÜ.õéà7eãTwb¥ */
+	$"3EEC CA32 6558 5965 8B6E 3F13 9DB2 1361"            /* >ìÊ2eXYe‹n?.�².a */
+	$"8426 9FD7 B329 4E75 FF1D 9B78 9735 4B1B"            /* „&Ÿ×³)Nuÿ.›x—5K. */
+	$"D80E 1781 192F 6777 8F94 F6A2 5016 726D"            /* Ø..�./gw�”ö¢P.rm */
+	$"1E0D D2CB 6F87 B3C6 09A2 1FE3 915E 8943"            /* ..ÒËo‡³ÆÆ¢.ã‘^‰C */
+	$"FE6C 6743 4733 D5BC A9DD 5338 C9E1 AF50"            /* þlgCG3Õ¼©ÝS8Éá¯P */
+	$"3634 C26C 0C1F 94E7 50B2 4310 DD62 4F09"            /* 64Âl..”çP²C.ÝbOÆ */
+	$"ABCD 7821 8B7B 7B87 2EEA 25A1 9D3C 55CC"            /* «Íx!‹{{‡.ê%¡�<UÌ */
+	$"0644 1B14 3456 2E32 C013 815C 66C7 0526"            /* .D..4V.2À.�\fÇ.& */
+	$"E24D CE15 B8FB 5D8B 0506 E30A 1D6A E2ED"            /* âMÎ.¸û]‹..ãÂ.jâí */
+	$"6145 D124 0EC9 1FAB 4E50 06C2 9DA5 8F6C"            /* aEÑ$.É.«NP.Â�¥�l */
+	$"C072 D11E BFEE DFE6 F6C7 12F4 E89C 35B7"            /* ÀrÑ.¿îßæöÇ.ôèœ5· */
+	$"097E 2E25 393F CEA3 03C6 D3C7 DED5 3882"            /* Æ~.%9?Σ.ÆÓÇÞÕ8‚ */
+	$"ED26 A3FD 9130 95B5 F3FA D31A 691F 8E09"            /* í&£ý‘0•µóúÓ.i.ŽÆ */
+	$"BFA8 7D7B 85BD B179 5C20 2855 1268 F9AF"            /* ¿¨}{…½±y\ (U.hù¯ */
+	$"553D 939E 6FC6 C67E 4611 F88C BBD4 773C"            /* U=“žoÆÆ~F.øŒ»Ôw< */
+	$"5F16 D598 D5C5 E649 B66E FD8D A2D7 9807"            /* _.Õ˜ÕÅæI¶ný�¢×˜. */
+	$"EDA2 4621 2CF5 DDE3 C078 6455 1C29 3A07"            /* í¢F!,õÝãÀxdU.):. */
+	$"E992 C5DE 8D33 041B 83C6 56F6 7C95 168E"            /* é’ÅÞ�3..ƒÆVö|•.Ž */
+	$"6127 40D2 DE11 CFF2 3379 DC22 20E3 5E1B"            /* a'@ÒÞ.Ïò3yÜ" ã^. */
+	$"DE83 DBB5 5B8A 8572 3DF2 2890 DC56 BE6E"            /* ÞƒÛµ[Š…r=ò(�ÜV¾n */
+	$"D15F 9396 ECD4 725F 2E18 7616 394A 64C3"            /* Ñ_“–ìÔr_..v.9Jdà */
+	$"FDAA E6F2 3D6D 46BC B270 5B8F ACB4 9CAE"            /* ýªæò=mF¼²p[�¬´œ® */
+	$"0D0D 3F29 6A02 1E92 347A E406 A52D 111A"            /* ..?)j..’4zä.¥-.. */
+	$"2E79 0340 1D82 C861 0C40 1963 3397 A4FD"            /* .y.@.‚Èa.@.c3—¤ý */
+	$"A998 0B63 E30A 7AA3 A5BC 8A8E 9CD0 4795"            /* ©˜.cãÂz£¥¼ŠŽœÐG• */
+	$"7538 7FB2 EC9A 952C CE29 C80F 369C 4E8D"            /* u8.²ìš•,Î)È.6œN� */
+	$"8000 1C55 D5F3 E2AD 812E 4FAA AC2C D9BB"            /* €..UÕóâ­�.Oª¬,Ù» */
+	$"F4CD 5568 5643 826F 3A38 91BD 6F70 92D3"            /* ôÍUhVC‚o:8‘½op’Ó */
+	$"23EC DB91 0FC4 C3BB 7542 023B 85F0 36C3"            /* #ìÛ‘.ÄûuB.;…ð6à */
+	$"8BF6 F6F8 4E77 EEE5 851F 219A CF99 7D9E"            /* ‹ööøNwîå….!šÏ™}ž */
+	$"856D A687 BC63 8E39 0407 B007 D184 10BD"            /* …m¦‡¼cŽ9..°.Ñ„.½ */
+	$"D9EF ACB1 B75A 46FA F95E 42DF 377B E2F7"            /* Ùבּ·ZFúù^Bß7{â÷ */
+	$"BEF2 357A 861C F486 B3F7 57E1 D39B 095B"            /* ¾ò5z†.ô†³÷WáÓ›Æ[ */
+	$"40C0 925C 0CA1 7885 CFEA 48B7 33E9 E8DE"            /* @À’\.¡x…ÏêH·3éèÞ */
+	$"D178 1E15 91D1 F6C5 BC87 CB7E CCC6 DEDE"            /* Ñx..‘Ñöż‡Ë~ÌÆÞÞ */
+	$"B017 A4C1 0B0F DD17 660E CB97 C098 C773"            /* °.¤Á..Ý.f.Ë—À˜Çs */
+	$"8A0A F4DB 59BD A218 055E 5348 05D8 B304"            /* ŠÂôÛY½¢..^SH.س. */
+	$"9F23 E1B1 0754 6DA2 FF33 34CB 2B12 7114"            /* Ÿ#á±.Tm¢ÿ34Ë+.q. */
+	$"62D2 4CA8 8091 CD34 8467 2752 B77A AA5B"            /* bÒL¨€‘Í4„g'R·zª[ */
+	$"15FC 2E56 7A29 9351 B6A4 AEE5 B56D 354D"            /* .ü.Vz)“Q¶¤®åµm5M */
+	$"3ED2 FA71 25E9 F887 B187 BADB B11B 2E01"            /* >Òúq%éø‡±‡ºÛ±... */
+	$"93B3 4206 45ED 7238 3F80 1441 50CA CCBA"            /* “³B.Eír8?€.APÊ̺ */
+	$"EF59 3BC5 4236 2ABF 9150 7335 49C5 0216"            /* ïY;ÅB6*¿‘Ps5IÅ.. */
+	$"F97B D5A5 1EF5 A69D 8B34 C25B 73E1 DA52"            /* ù{Õ¥.õ¦�‹4Â[sáÚR */
+	$"79E5 9EB1 9CB1 0952 B3F5 E221 D426 4759"            /* yåž±œ±ÆR³õâ!Ô&GY */
+	$"D5CF 2D18 CC2A 270A 859D F10C 8108 52FF"            /* ÕÏ-.Ì*'Â…�ñ.�.Rÿ */
+	$"2A7D D39E EFFD 568C 2DB3 7BD5 62D0 2403"            /* *}ÓžïýVŒ-³{ÕbÐ$. */
+	$"69D1 A4B6 2D24 E485 973D F6A5 E6DC 1DB5"            /* iѤ¶-$ä…—=ö¥æÜ.µ */
+	$"BF0B E185 5592 E3A0 6046 E050 5151 9546"            /* ¿.á…U’ã `FàPQQ•F */
+	$"17F7 0CF6 222F 17E0 40E5 3EF5 74EE BAB6"            /* .÷.ö"/.à@å>õt */
+	$"55BD 76C1 DD80 39C8 BAE0 37B8 398A B370"            /* U½vÁÝ€9Ⱥà7¸9Š³p */
+	$"D400 0C29 5DC9 94FF 069B 36E2 CD79 195F"            /* Ô..)]É”ÿ.›6âÍy._ */
+	$"5B9B 1237 1F18 C560 C901 F9A4 184B 7570"            /* [›.7..Å`É.ù¤.Kup */
+	$"433E 75BE 0297 C641 7D9B 7092 8D64 96F5"            /* C>u¾.—ÆA}›p’�d–õ */
+	$"D70C 9B66 71D3 09B1 F635 0FC3 0B49 7D6E"            /* ×.›fqÓƱö5.Ã.I}n */
+	$"660C 8E1D 0257 672B 97EE C2A5 7B84 729E"            /* f.Ž..Wg+—îÂ¥{„rž */
+	$"6516 585E 354F 2E22 88A7 A515 B945 3745"            /* e.X^5O."ˆ§¥.¹E7E */
+	$"F6A5 5CB2 E212 10AD AB6F 07F5 FDA3 09EB"            /* ö¥\²â..­«o.õý£Æë */
+	$"A053 313B 9A8E 757D E132 D483 DC78 0882"            /*  S1;šŽu}á2ÔƒÜx.‚ */
+	$"A63C 95E0 036C 4626 F66B 5F6C 39A1 9401"            /* ¦<•à.lF&ök_l9¡”. */
+	$"7276 4DCE 4487 7D8C 12A3 B713 9139 AC0A"            /* rvMÎD‡}Œ.£·.‘9¬Â */
+	$"18AD 4DFD 2A3D 69E7 E76E 593C 8DAB FD56"            /* .­Mý*=iççnY<�«ýV */
+	$"F959 BA6B FBA3 2853 D610 4DB0 7A30 3A09"            /* ùYºkû£(SÖ.M°z0:Æ */
+	$"916B DFF7 B3B4 F8D3 9619 0FD9 8FBC FC6B"            /* ‘kß÷³´øÓ–..Ù�¼ük */
+	$"D73D ABD2 4C41 6AD0 6584 AF19 3074 AF6E"            /* ×=«ÒLAjÐe„¯.0t¯n */
+	$"369C BEB1 76D5 D311 6172 F157 D522 DDED"            /* 6œ¾±vÕÓ.arñWÕ"Ýí */
+	$"D4ED 0230 0BB5 E881 0E6B 9C4F 111F 4F6E"            /* Ôí.0.µè�.kœO..On */
+	$"7CAD 4745 7BBF DA70 A9C4 051E FDEA 206C"            /* |­GE{¿Úp©Ä..ýê l */
+	$"9983 0E2D 4A4A A4DE 82E9 DAAF 5748 37AE"            /* ™ƒ.-JJ¤Þ‚éÚ¯WH7® */
+	$"4046 DCCB 0D1A 80DA 1804 20E2 F7CF AD69"            /* @FÜË..€Ú.. â÷Ï­i */
+	$"F9D8 5106 D02D 16E9 4437 9560 B618 1126"            /* ùØQ.Ð-.éD7•`¶..& */
+	$"95A2 4B23 89C4 78EE 898E D80C 8E49 5201"            /* •¢K#‰ÄxØ.ŽIR. */
+	$"2095 ABAF 9CA5 0F8E CB22 00D4 4289 59B3"            /*  •«¯œ¥.ŽË".ÔB‰Y³ */
+	$"1835 1395 8AE5 3A88 7185 E7DD 57F3 4CE4"            /* .5.•Šå:ˆq…çÝWóLä */
+	$"1465 C878 6B72 7146 2AF1 F053 5B31 7697"            /* .eÈxkrqF*ñðS[1v— */
+	$"7300 A777 3919 099E BD1C 79C3 24C4 A355"            /* s.§w9.Æž½.yÃ$Ä£U */
+	$"0C88 C727 1831 D498 E513 47A5 F25F DDBE"            /* .ˆÇ'.1Ô˜å.G¥ò_ݾ */
+	$"46E7 40B5 EBCC 080F 6915 3FDF EDB9 A9B1"            /* Fç@µëÌ..i.?ßí¹©± */
+	$"39ED D794 60E1 A5A2 0EEC 7A09 46BF 201E"            /* 9í×”`ᥢ.ìzÆF¿ . */
+	$"311F EEEE 88EF C6C1 C10D E238 50C9 7F01"            /* 1.îîˆïÆÁÁ.â8PÉ.. */
+	$"DFF1 17BA D8F4 0017 47E7 75F2 4D82 679E"            /* ßñ.ºØô..GçuòM‚gž */
+	$"6867 60A4 6222 77B9 319B 186D FCB3 168A"            /* hg`¤b"w¹1›.mü³.Š */
+	$"EAF3 C227 1082 D7ED 2C70 E619 8676 0186"            /* êóÂ'.‚×í,pæ.†v.† */
+	$"8C23 5DE5 D4A0 61CB CDE4 AED5 E008 6F3C"            /* Œ#]åÔ aËÍä®Õà.o< */
+	$"D894 AC14 6FEC 5D4C C2FF 3A6C 512F E475"            /* Ø”¬.oì]LÂÿ:lQ/äu */
+	$"FCB8 DFA4 EB46 2DF4 E133 5858 364B 54E1"            /* ü¸ß¤ëF-ôá3XX6KTá */
+	$"A6E1 5D0C 157E D987 DF95 B1FB 3723 4F2F"            /* ¦á]..~هߕ±û7#O/ */
+	$"C9BF C6D4 D979 412E D0EB B285 8DFF 7CAC"            /* É¿ÆÔÙyA.Ðë²…�ÿ|¬ */
+	$"F1BF 1825 8B89 9992 3848 C666 4184 4906"            /* ñ¿.%‹‰™’8HÆfA„I. */
+	$"0D61 6B58 9355 A5D9 C940 B6F2 6918 82E1"            /* .akX“U¥ÙÉ@¶òi.‚á */
+	$"FF7D 4F5F FE94 5208 650B B780 0D2B DD4F"            /* ÿ}O_þ”R.e.·€.+ÝO */
+	$"5874 3627 2353 6328 06B9 908C 6C95 D898"            /* Xt6'#Sc(.¹�Œl•Ø˜ */
+	$"8C24 1D0F 641B 7763 CFBE E88A BB05 8639"            /* Œ$..d.wcϾ芻.†9 */
+	$"D91C 4A38 3A3F 75C6 61BD BFED CA10 2A73"            /* Ù.J8:?uÆa½¿íÊ.*s */
+	$"E3C5 E85C BF5B 0346 2105 4286 300D D812"            /* ãÅè\¿[.F!.B†0.Ø. */
+	$"8BE4 DAE4 292B A765 338E 7E42 50F1 8046"            /* ‹äÚä)+§e3Ž~BPñ€F */
+	$"3FDC 1A85 4616 61E5 7321 18D9 5AB9 8903"            /* ?Ü.…F.aås!.ÙZ¹‰. */
+	$"90BD 6F89 E7D0 35D1 0AA3 BBAE 3CF8 A7B7"            /* �½o‰çÐ5Ñ£»®<ø§· */
+	$"73C8 8B94 B409 16EC 60A6 E819 BCA7 BA66"            /* sÈ‹”´Æ.ì`¦è.¼§ºf */
+	$"2245 524C 718C 635D E4F7 ACA0 02C3 E0A7"            /* "ERLqŒc]ä÷¬ .Ãৠ*/
+	$"B542 0FF5 7029 FF4D 1D88 E3B3 D657 802B"            /* µB.õp)ÿM.ˆã³ÖW€+ */
+	$"8068 9BD4 B17F 9A6B CC1C 4B53 246F 81E5"            /* €h›Ô±.škÌ.KS$o�å */
+	$"9168 48EC 4B44 3FFF 7B8B 5777 5677 134E"            /* ‘hHìKD?ÿ{‹WwVw.N */
+	$"1B8E 8C91 429F CE85 86EF 62B4 71AF EAE7"            /* .ŽŒ‘BŸÎ…†ïb´q¯êç */
+	$"E333 7BD3 2825 7230 C950 0000 1B8D 8BA6"            /* ã3{Ó(%r0ÉP...�‹¦ */
+	$"04C1 56DC 30F0 619E DD6C D196 C91E 1ED4"            /* .ÁVÜ0ðažÝlÑ–É..Ô */
+	$"1285 94A8 F775 05A9 3440 78FF 7E52 8833"            /* .…”¨÷u.©4@xÿ~Rˆ3 */
+	$"E8A1 A4E4 4580 38DD ADE1 3BD5 AD19 74E6"            /* 衤äE€8Ý­á;Õ­.tæ */
+	$"EEA1 B4B1 0B0B 9BE9 08EC DB78 E6AA 37E5"            /* î¡´±..›é.ìÛxæª7å */
+	$"AD06 72A6 51FC 0004 4737 BF1A 89FF 7E11"            /* ­.r¦Qü..G7¿.‰ÿ~. */
+	$"0A68 EAD7 BDA5 4D5B 2C8D 0C7A 952E 2190"            /* Âhê×½¥M[,�.z•.!� */
+	$"8451 1B38 CEFD 2835 5ADD BDA2 01C2 A3D6"            /* „Q.8Îý(5Zݽ¢.壅 */
+	$"6046 4BD8 41DF D8B6 D9B1 1F96 5FF8 CC56"            /* `FKØAßضٱ.–_øÌV */
+	$"A63B 6E14 5035 26D6 946D 1F59 4D17 5507"            /* ¦;n.P5&Ö”m.YM.U. */
+	$"85F7 2DAF A737 4E30 9097 2E2E DAF8 37D1"            /* …÷-¯§7N0�—..Úø7Ñ */
+	$"D987 4E59 ABFD CDF3 AAC3 30D1 8616 FAB3"            /* Ù‡NY«ýÍóªÃ0ц.ú³ */
+	$"2914 92AA 6913 C36F 66DA 4B0B 18FE DD55"            /* ).’ªi.ÃofÚK..þÝU */
+	$"1D2A 3F00 D80C 2423 D923 95C6 E11D 0069"            /* .*?.Ø.$#Ù#•Æá..i */
+	$"B5C9 0803 0907 B950 13DF 48EC F794 3D36"            /* µÉ..Æ.¹P.ßHì÷”=6 */
+	$"5249 2492 4924 9249 2489 9EF6 DC36 9A6B"            /* RI$’I$’I$‰žöÜ6šk */
+	$"1751 415E A37F 47EC A4EA 67AC A222 733C"            /* .QA^£.Gì¤êg¬¢"s< */
+	$"467D 1FFE C727 E6AA 6E99 C584 A87E DFFF"            /* F}.þÇ'æªn™Å„¨~ßÿ */
+	$"7FC3 7592 8204 71A2 6088 C38B 6E65 868E"            /* .Ãu’‚.q¢`ˆÃ‹ne†Ž */
+	$"5A3F FF7F F919 4069 CF10 A302 5125 525C"            /* Z?ÿ.ù.@iÏ.£.Q%R\ */
+	$"A443 88AF 4104 7807 1410 84BA E955 76E8"            /* ¤Cˆ¯A.x...„ºéUvè */
+	$"5F35 B612 A668 5694 9249 2492 4924 9249"            /* _5¶.¦hV”’I$’I$’I */
+	$"2492 4924 4C25 1941 A4EB 1996 7A28 19C1"            /* $’I$L%.A¤ë.–z(.Á */
+	$"A1B0 01D7 ACB2 3F83 42DC D154 27C9 F11F"            /* ¡°.׬²?ƒBÜÑT'Éñ. */
+	$"FC46 90B1 89C4 F78A 4C6F 5C2A 833D 8425"            /* üF�±‰Ä÷ŠLo\*ƒ=„% */
+	$"D837 CA14 E4C7 7F8A 9833 99B7 E589 1376"            /* Ø7Ê.äÇ.Š˜3™·å‰.v */
+	$"C867 FF1D 200A 4C9B 624E 68E3 11AE C8AF"            /* Ègÿ. ÂL›bNhã.®È¯ */
+	$"1723 C741 CEAC 16CE C548 72FF 15CD 3E67"            /* .#ÇAά.ÎÅHrÿ.Í>g */
+	$"AF2C 323F 0FD0 6752 4973 55BD CC10 05B4"            /* ¯,2?.ÐgRIsU½Ì..´ */
+	$"AB3F 9302 00C3 EE70 1BA4 B650 FAB2 5821"            /* «?“..Ãîp.¤¶Pú²X! */
+	$"3856 3872 1B02 7D70 F1F9 0B28 A9DC CAE7"            /* 8V8r..}pñù.(©ÜÊç */
+	$"D9E7 6252 A768 A7DE 0FB1 FCB1 F54B 98C4"            /* ÙçbR§h§Þ.±ü±õK˜Ä */
+	$"7B6E 5E24 BC53 F945 741F 66A0 A51E EE5A"            /* {n^$¼SùEt.f ¥.îZ */
+	$"2A0D B951 4EEE A88B 4F2F C326 F326 1D12"            /* *.¹QNO/Ã&ó&.. */
+	$"524A 9E48 CC53 44EF C54F 1737 8505 46CF"            /* RJžHÌSDïÅO.7….FÏ */
+	$"351E 4354 05C7 C832 2A7D 8899 D009 E617"            /* 5.CT.ÇÈ2*}ˆ™ÐÆæ. */
+	$"0334 305D 9497 D845 E6D3 2CD2 178F 1316"            /* .40]”—ØEæÓ,Ò.�.. */
+	$"65AD 239E 2ED5 ECCB 402A E728 09B5 E847"            /* e­#ž.ÕìË@*ç(ƵèG */
+	$"65BD 3F31 CAC5 F9D8 6606 B8AF 4F84 89FE"            /* e½?1ÊÅùØf.¸¯O„‰þ */
+	$"9004 4730 30BC E58F 5FB3 38CF 36B9 38FC"            /* �.G00¼å�_³8Ï6¹8ü */
+	$"FB9D 07EA D13F 9DB9 7185 0E88 0E3B 06E5"            /* û�.êÑ?�¹q….ˆ.;.å */
+	$"D476 CFCA 1587 3067 9257 B5DF 1E83 E7FF"            /* ÔvÏÊ.‡0g’Wµß.ƒçÿ */
+	$"7FFF 7FFF 0E68 E181 AC15 B980 2AFB 1D80"            /* .ÿ.ÿ.há�¬.¹€*û.€ */
+	$"C5BB A88D E36A 4DC5 94CF 6DB2 0694 F977"            /* Å»¨�ãjMÅ”Ïm².”ùw */
+	$"D708 02D1 F380 6773 016A CA84 3B1C 6A33"            /* ×..Ñó€gs.jÊ„;.j3 */
+	$"5AAC BA2D FEC5 7542 51FC 68D0 CDDD EA44"            /* Z¬º-þÅuBQühÐÍÝêD */
+	$"788E 2F96 D80C F159 FF45 3316 1494 A7F5"            /* xŽ/–Ø.ñYÿE3..”§õ */
+	$"98B4 FC39 0062 D59B 52A6 32CB F97C ABD6"            /* ˜´ü9.bÕ›R¦2Ëù|«Ö */
+	$"42AE AE46 6AA7 D986 0A4E DCDD 717E 8B7C"            /* B®®Fj§Ù†ÂNÜÝq~‹| */
+	$"8FB8 B396 65A6 83FF 6A4A A5C1 597F 70AF"            /* �¸³–e¦ƒÿjJ¥ÁY.p¯ */
+	$"DC96 E2EC 0C1D 7A00 3428 2C60 DE32 8DB8"            /* Ü–âì..z.4(,`Þ2�¸ */
+	$"1604 C249 5E82 1F5B 6C23 E562 B2D4 754E"            /* ..ÂI^‚.[l#åb²ÔuN */
+	$"7F73 442A 25D3 C42A 6A6D 5D09 0E8C 2E67"            /* .sD*%ÓÄ*jm]Æ.Œ.g */
+	$"95EC 08FE B505 8B5A A4A8 0000 0000 0000"            /* •ì.þµ.‹Z¤¨...... */
+	$"0000 0000 6121 26B3 27C3 AEC0 FF52 2FEE"            /* ....a!&³'îÀÿR/î */
+	$"D4F3 92BB 06E2 ABE4 35DC A278 9084 B2F0"            /* Ôó’».â«ä5Ü¢x�„²ð */
+	$"EE1A ADB2 F770 3D4E 120A FD01 B042 CD00"            /* î.­²÷p=N.Âý.°BÍ. */
+	$"B9C2 B661 40B0 E5FC DC59 59F0 61C5 53A7"            /* ¹Â¶a@°åüÜYYðaÅS§ */
+	$"7AC1 7EDC 77B7 1C84 0F9A E321 389C E693"            /* zÁ~Üw·.„.šã!8œæ“ */
+	$"AC98 5160 DDD0 C9A9 BE17 ED52 A10A 300C"            /* ¬˜Q`ÝÐÉ©¾.íR¡Â0. */
+	$"88ED BB5A 80DA C23B 1196 0C7C 6BA8 D4EA"            /* ˆí»Z€ÚÂ;.–.|k¨Ôê */
+	$"4FAB 08A9 EBE3 1CC9 6782 F6A9 85A4 1829"            /* O«.©ëã.Ég‚ö©…¤.) */
+	$"48BB D188 41E8 65BA 28BB 8AC1 8368 DC2F"            /* H»ÑˆAèeº(»ŠÁƒhÜ/ */
+	$"B2DE 61FE 95C0 BD88 C027 9CD9 3819 8A81"            /* ²Þaþ•À½ˆÀ'œÙ8.Š� */
+	$"20FF 616C DEAE C6EA 15A3 D12F 764A B4E2"            /*  ÿalÞ®Æê.£Ñ/vJ´â */
+	$"ECA3 AF32 36FF 29B0 E3CD 5046 527E 39B7"            /* 죯26ÿ)°ãÍPFR~9· */
+	$"921A ABF8 F0CB 7040 5FCD A182 4C57 986D"            /* ’.«øðËp@_Í¡‚LW˜m */
+	$"1115 DD94 687C 3663 7CFB 6C40 642D C8CA"            /* ..Ý”h|6c|ûl@d-ÈÊ */
+	$"1117 B5A9 8025 123D 9406 58F9 96B5 321E"            /* ..µ©€%.=”.Xù–µ2. */
+	$"7646 4BFD 48DE 0B9B DBEF B79F B6C7 031E"            /* vFKýHÞ.›Ûï·Ÿ¶Ç.. */
+	$"1D3B 1D18 B35D 2813 5601 3924 6AE1 FC21"            /* .;..³](.V.9$jáü! */
+	$"60B9 0B9F 6B4B AFB9 15D8 C57A 5345 7461"            /* `¹.ŸkK¯¹.ØÅzSEta */
+	$"0EF9 4B6B 88D1 7833 02DF 4FB8 DBEC 836A"            /* .ùKkˆÑx3.ßO¸Ûìƒj */
+	$"BEA7 3972 93C0 F973 37B5 C84F 1655 031C"            /* ¾§9r“Àùs7µÈO.U.. */
+	$"674D 741E 308E E3BA 6684 5BB0 4506 AB40"            /* gMt.0Žãºf„[°E.«@ */
+	$"14DE BFF2 9B38 4026 C5C2 3A44 FDFF 25CB"            /* .Þ¿ò›8@&ÅÂ:Dýÿ%Ë */
+	$"072E 1D99 62E3 22B8 DE8D 9CF1 79FA 1D38"            /* ...™bã"¸Þ�œñyú.8 */
+	$"8900 17CB A72B 8124 7EAF CF2F FC8D 34D6"            /* ‰..˧+�$~¯Ï/ü�4Ö */
+	$"E0AC 58ED 8BC1 0DAA 7964 FB91 BF08 EFA6"            /* à¬Xí‹Á.ªydû‘¿.ï¦ */
+	$"42FF 7FFF 7FE3 AF13 7C4B 1CF4 D643 3CD3"            /* Bÿ.ÿ.ã¯.|K.ôÖC<Ó */
+	$"5F1A 08BB 7C56 5CFB 6D27 04DE C66A 9AF1"            /* _..»|V\ûm'.ÞÆjšñ */
+	$"2053 D4B2 EE60 44FF 2A89 1FFC DFCC 57C1"            /*  SÔ²î`Dÿ*‰.üßÌWÁ */
+	$"3800 1290 7854 7902 FF7A 9A36 D71E F8D1"            /* 8..�xTy.ÿzš6×.øÑ */
+	$"D439 471B D02F 4A39 E5BC D25F FDF0 8B54"            /* Ô9G.Ð/J9å¼Ò_ýð‹T */
+	$"AE0A 3677 2625 B286 7DEC 8FF7 2457 2B25"            /* ®Â6w&%²†}ì�÷$W+% */
+	$"C066 2A4E A605 EE16 7244 CCFD D3D3 FDA1"            /* Àf*N¦.î.rDÌýÓÓý¡ */
+	$"F3B8 76C3 1C5F 491C 0165 8735 D71D 19AD"            /* ó¸vÃ._I..e‡5×..­ */
+	$"9BB1 A40D E5BA 9D1C E34B B71C 9CF0 EC7A"            /* ›±¤.åº�.ãK·.œðìz */
+	$"5E87 C4F0 A326 0913 9E2C 6517 50A3 E72B"            /* ^‡Äð£&Æ.ž,e.P£ç+ */
+	$"87FE D348 2E5D 0A00 0000 0000 0000 0000"            /* ‡þÓH.]Â......... */
+	$"0002 2C86 A73D 4030 2FE4 D32C 2B56 C74C"            /* ..,†§=@0/äÓ,+VÇL */
+	$"0869 A5C9 151A 69B9 9390 DA50 4411 8FFF"            /* .i¥É..i¹“�ÚPD.�ÿ */
+	$"4938 4E36 F9DD 09FB E4A0 C339 2431 ED8B"            /* I8N6ùÝÆûä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FF4F E2A2 F01A C90F 02E3 51CD B477"            /* #fÿOâ¢ð.É..ãQÍ´w */
+	$"2230 690A B47C E28B 463C 2E88 7579 7943"            /* "0i´|â‹F<.ˆuyyC */
+	$"5055 6D0A EEC5 F3BF 2404 37D8 EFE1 71AC"            /* PUmÂîÅó¿$.7Øïáq¬ */
+	$"6AFE A3E4 A7EB 28BF BFFE 4373 E5FF 7E4A"            /* jþ£ä§ë(¿¿þCsåÿ~J */
+	$"2D5D 1ED3 6D78 1657 9914 A061 7958 972C"            /* -].Ómx.W™. ayX—, */
+	$"56FB D5B0 1FFD A18B 7A29 0C81 295B DF7C"            /* VûÕ°.ý¡‹z).�)[ß| */
+	$"83E3 CD36 0E66 7E2B D8FA 3096 AA44 7F9B"            /* ƒãÍ6.f~+Øú0–ªD.› */
+	$"F0B9 EA48 8CC7 0FFF 7E1C F394 CC5B 6A25"            /* ð¹êHŒÇ.ÿ~.ó”Ì[j% */
+	$"FD4C CECC 630B 38B7 D621 F081 73EE 9D40"            /* ýLÎÌc.8·Ö!ð�sî�@ */
+	$"7FAD FADD 8111 6492 599E DD2C 3600 FF6C"            /* .­úÝ�.d’YžÝ,6.ÿl */
+	$"5A8D B0B8 2AE7 668D C5A0 826B FA0D C5B1"            /* Z�°¸*çf�Å ‚kú.ű */
+	$"6873 D749 B533 9627 C2F6 4922 63F7 8944"            /* hs×Iµ3–'ÂöI"c÷‰D */
+	$"15C5 A1F9 8539 A21A 1CEB 1C2D 7D1B 0516"            /* .Å¡ù…9¢..ë.-}... */
+	$"FD6C 5D4F 92A3 14D9 126F C5FC 4116 B499"            /* ýl]O’£.Ù.oÅüA.´™ */
+	$"D878 D889 9123 D3C8 4637 36E3 8644 6F0B"            /* Øx؉‘#ÓÈF76ã†Do. */
+	$"D2C6 A599 B793 1367 B548 23BD 8836 11E5"            /* ÒÆ¥™·“.gµH#½ˆ6.å */
+	$"C323 7AD5 0534 3D05 A4E6 70B3 0376 2B0C"            /* Ã#zÕ.4=.¤æp³.v+. */
+	$"A964 173B F0BC 2A52 7FE4 2A53 85C2 22B2"            /* ©d.;ð¼*R.ä*S…Â"² */
+	$"B83F 7185 FB4C 3769 5B3E 4A24 E7E1 D0FD"            /* ¸?q…ûL7i[>J$çáÐý */
+	$"9B17 8737 FE8B E4C7 9FC1 0E30 D904 D0C5"            /* ›.‡7þ‹äÇŸÁ.0Ù.ÐÅ */
+	$"D2F5 05E4 3CD6 5FA7 B9AF FB98 755E 0BAF"            /* Òõ.ä<Ö_§¹¯û˜u^.¯ */
+	$"E4EE 408D A8BE 5E58 07A6 059D 1B33 37F3"            /* äî@�¨¾^X.¦.�.37ó */
+	$"8D14 871A 7FC6 43ED 6A6F 8F41 9681 095E"            /* �.‡..ÆCíjo�A–�Æ^ */
+	$"EE46 5BA4 1E15 F5F2 3063 E524 A62A 7C7F"            /* îF[¤..õò0cå$¦*|. */
+	$"0E38 5D00 A378 8F6D 3861 2088 EDD7 AC24"            /* .8].£x�m8a ˆí׬$ */
+	$"D3B6 B052 DE10 357D B65A 1414 4596 8E3D"            /* Ó¶°RÞ.5}¶Z..E–Ž= */
+	$"97E3 D838 9ACC 3C84 AF82 EA8D 8BD3 0180"            /* —ãØ8šÌ<„¯‚ê�‹Ó.€ */
+	$"1582 0654 BB61 1047 ACA1 29D3 7CFA 00C8"            /* .‚.T»a.G¬¡)Ó|ú.È */
+	$"BABC 146B 250C 8D19 8A4E A8B3 50D6 B986"            /* º¼.k%.�.ŠN¨³PÖ¹† */
+	$"2AD6 CEFA 02D6 AE11 FF7C B0A2 E6E0 30E9"            /* *ÖÎú.Ö®.ÿ|°¢æà0é */
+	$"D904 4C03 3BC1 8B68 5892 30B8 7D69 C2D6"            /* Ù.L.;Á‹hX’0¸}iÂÖ */
+	$"A9F8 56A2 7417 1E31 186F 09A1 4C11 6DCA"            /* ©øV¢t..1.oÆ¡L.mÊ */
+	$"A62E 5FCC F59A CCE8 6A29 B0DF E2BC E8BF"            /* ¦._ÌõšÌèj)°ßâ¼è¿ */
+	$"92DF 70C1 8B09 21DF 1440 1684 4413 2A60"            /* ’ßpÁ‹Æ!ß.@.„D.*` */
+	$"E033 6D92 8573 E63C 2746 6F40 D8F0 D0C9"            /* à3m’…sæ<'Fo@ØðÐÉ */
+	$"10AF 85A2 CFBF 373B B250 85E4 C1D3 85D2"            /* .¯…¢Ï¿7;²P…äÁÓ…Ò */
+	$"E167 1222 DF4A 67D9 B3D6 55B4 B047 8675"            /* ág."ßJgÙ³ÖU´°G†u */
+	$"C803 6AE5 E5AE AF92 C4B7 591A A040 98AC"            /* È.jå宯’Ä·Y. @˜¬ */
+	$"4412 45F8 BBC8 6482 F7BD 81B2 98FE 9D0B"            /* D.Eø»Èd‚÷½�²˜þ�. */
+	$"DAB1 2959 952C 9115 3504 9A24 BBA4 A04C"            /* Ú±)Y•,‘.5.š$»¤ L */
+	$"4125 5810 54F5 C268 63C2 1DB9 11CF 85BB"            /* A%X.TõÂhcÂ.¹.Ï…» */
+	$"D941 F5A1 0239 DED3 856D BBE5 7CF3 49C3"            /* ÙAõ¡.9ÞÓ…m»å|óIà */
+	$"C9CF 1BD1 A953 F58A F9AF E704 E70E 43B7"            /* ÉÏ.Ñ©SõŠù¯ç.ç.C· */
+	$"2B51 BE14 4FF3 262C 914B 90AF F2A9 E060"            /* +Q¾.Oó&,‘K�¯ò©à` */
+	$"6A24 6553 B776 C48D 19AD ECD3 2DD3 8ECF"            /* j$eS·vÄ�.­ìÓ-ÓŽÏ */
+	$"9EC7 8A0D 97F4 3C69 6E56 0881 1136 C147"            /* žÇŠ.—ô<inV.�.6ÁG */
+	$"E7D3 6FE5 A0C6 D7DC BCB0 76AC C4F8 DD65"            /* çÓoå Æ×ܼ°v¬ÄøÝe */
+	$"A5F9 02BF 2BFD 9A2C 354D 24C2 E088 6B63"            /* ¥ù.¿+ýš,5M$Âàˆkc */
+	$"E514 C014 E8F4 F5C2 B529 74FB EC02 032B"            /* å.À.èôõµ)tûì..+ */
+	$"A54B 696E B602 7D58 4542 824D BD8C 40FA"            /* ¥Kin¶.}XEB‚M½Œ@ú */
+	$"F675 5CD4 71C9 058E 7062 0E1B 10CC 72A9"            /* öu\ÔqÉ.Žpb...Ìr© */
+	$"95B8 C5FD 7EAF 995C 62ED DDE4 6579 3181"            /* •¸Åý~¯™\bíÝäey1� */
+	$"8BA1 A02B 1559 F5BC E9C9 914D 8CEB D7D8"            /* ‹¡ +.Yõ¼éÉ‘MŒë×Ø */
+	$"7D81 20C0 A609 18D2 B679 7C08 FB00 E4C6"            /* }� À¦Æ.Ò¶y|.û.äÆ */
+	$"2797 518E 32CE 67CE 3C8E 6796 A832 F712"            /* '—QŽ2ÎgÎ<Žg–¨2÷. */
+	$"0037 059C 96CD 85A0 98E6 5D20 05F2 EC61"            /* .7.œ–Í… ˜æ] .òìa */
+	$"335D AFFF 14BC 3EF9 0779 7A53 BAA4 F47A"            /* 3]¯ÿ.¼>ù.yzSº¤ôz */
+	$"6926 DAD2 72F9 5D4B 1014 8BD5 A4FA 68EA"            /* i&ÚÒrù]K..‹Õ¤úhê */
+	$"D9F9 F684 BFD5 F2ED FB9E 4C18 91C3 FF17"            /* Ùùö„¿ÕòíûžL.‘Ãÿ. */
+	$"2D17 D99A DE29 FE6E 63A4 C901 8642 9357"            /* -.ÙšÞ)þnc¤É.†B“W */
+	$"3120 4386 1938 E7D2 572D 0C59 E3C9 7FED"            /* 1 C†.8çÒW-.YãÉ.í */
+	$"30FA E54A CEF8 A94C F92D AF19 76EA 3372"            /* 0úåJÎø©Lù-¯.vê3r */
+	$"B4E1 E7C5 8239 A4AC A247 4838 55E8 EB9B"            /* ´áçÅ‚9¤¬¢GH8Uèë› */
+	$"DE7D 94E9 DBD7 07FB D488 1672 E61D 9E4C"            /* Þ}”éÛ×.ûÔˆ.ræ.žL */
+	$"6DF2 97D5 4936 F89A 5CBC D37A 8C2C F7ED"            /* mò—ÕI6øš\¼ÓzŒ,÷í */
+	$"9755 19F2 0350 AB2E D851 F0B7 78B5 9770"            /* —U.ò.P«.ØQð·xµ—p */
+	$"4DF3 4212 9C9C CA3B 403A BA7B D497 9410"            /* MóB.œœÊ;@:º{Ô—”. */
+	$"04C6 288B 5058 5DC9 EB79 AB85 622C 9A55"            /* .Æ(‹PX]Éëy«…b,šU */
+	$"2DA7 C113 9315 7CAE D84E 6B50 4062 AE94"            /* -§Á.“.|®ØNkP@b®” */
+	$"8F5E 7969 4BA5 56B2 E881 8C02 ED3B 5259"            /* �^yiK¥V²è�Œ.í;RY */
+	$"24CE C98A 4348 12B1 314F E3E3 B6A3 4E61"            /* $ÎÉŠCH.±1Oã㶣Na */
+	$"A426 6350 E380 B0B5 DEFF 64CF 72D6 D4B9"            /* ¤&cP〰µÞÿdÏrÖÔ¹ */
+	$"907C 9BE0 7E4D 39F9 2BB7 C3DE D7C3 DCD8"            /* �|›à~M9ù+·ÃÞ×ÃÜØ */
+	$"1F93 775F 0F44 DF0F A717 C3E9 D603 F269"            /* .“w_.Dß.§.ÃéÖ.òi */
+	$"FBE1 D36F 87B3 6F87 B280 E8AB DECC AF0D"            /* ûáÓo‡³o‡²€è«Þ̯. */
+	$"6C8A C695 8734 87EB A75F 5130 05EC 9BA8"            /* lŠÆ•‡4‡ë§_Q0.웨 */
+	$"78DB 85A2 680C 75A0 EDD1 4AA2 7E1B BAFF"            /* xÛ…¢h.u íÑJ¢~.ºÿ */
+	$"5AFC FD6C 3E36 A6D9 923A 2DCE 24BC 35EF"            /* Züýl>6¦Ù’:-Î$¼5ï */
+	$"27F4 8813 7CC4 0141 3CD9 9568 BFE6 BBB3"            /* 'ôˆ.|Ä.A<Ù•h¿æ»³ */
+	$"219B 0442 5227 3796 635D 0DE7 499A A701"            /* !›.BR'7–c].çIš§. */
+	$"7F74 FB13 F9DF E737 08AB 0A91 3D9E B77D"            /* .tû.ùßç7.«Â‘=ž·} */
+	$"E616 57BB 8BAF 7A0D 1B28 42E6 D653 6BD3"            /* æ.W»‹¯z..(BæÖSkÓ */
+	$"D7A8 9A2B 0905 6198 8809 E5D0 D0A4 F589"            /* רš+Æ.a˜ˆÆåÐФõ‰ */
+	$"3D04 8161 C4CB 7BC9 96E2 9DA4 1C59 C982"            /* =.�aÄË{É–â�¤.YÉ‚ */
+	$"4705 B1BE 1E05 E391 5E89 43FE 6C67 4342"            /* G.±¾..ã‘^‰CþlgCB */
+	$"636F 80C5 6A98 16E6 6B80 27C8 D0D9 B28C"            /* co€Åj˜.æk€'ÈÐÙ²Œ */
+	$"6FD4 E109 61AB 8FCB D4CB 19ED 2BE7 B510"            /* oÔáÆa«�ËÔË.í+çµ. */
+	$"C0E8 5883 0642 92A1 6094 7E45 5D3F 819A"            /* ÀèXƒ.B’¡`”~E]?�š */
+	$"4B6F AE8E ED0B 4B30 ABB1 2789 5C58 EEFD"            /* Ko®Ží.K0«±'‰\Xîý */
+	$"06C9 EF2B 2A12 1731 7581 4428 C72D 2501"            /* .Éï+*..1u�D(Ç-%. */
+	$"2C14 0DA4 2C98 035F FEA8 51A2 0E61 4C50"            /* ,..¤,˜._þ¨Q¢.aLP */
+	$"4A65 60DE FA1C F36C 62D9 A3FA 93A6 4CAC"            /* Je`Þú.ólbÙ£ú“¦L¬ */
+	$"C1D0 079D 912F A133 724B 13CC AFF4 1382"            /* ÁÐ.�‘/¡3rK.̯ô.‚ */
+	$"D61F 8AF2 A48B CCA6 5D66 4F61 E6BE 657B"            /* Ö.Šò¤‹Ì¦]fOaæ¾e{ */
+	$"7F5B 6F20 397A BBC2 3F23 86DF 2355 4A18"            /* .[o 9z»Â?#†ß#UJ. */
+	$"15DB CB3E 201F FF7C 4AC9 C764 B098 CA46"            /* .ÛË> .ÿ|JÉÇd°˜ÊF */
+	$"C2CF 44C6 42E7 D30A FD05 380F 6BD3 24C1"            /* ÂÏDÆBçÓÂý.8.kÓ$Á */
+	$"3998 C5C1 E7D5 0E2C 8D50 7FBB 7A11 6CB7"            /* 9˜ÅÁçÕ.,�P.»z.l· */
+	$"B80F 5A84 44BE E746 C43C 6B5D F055 7A3B"            /* ¸.Z„D¾çFÄ<k]ðUz; */
+	$"77CB BFA9 2B73 06AF 9C8B AF37 F600 E568"            /* wË¿©+s.¯œ‹¯7ö.åh */
+	$"EE70 09D2 B0A7 C201 94D9 AC58 E9A2 9D53"            /* îpÆÒ°§Â.”Ù¬Xé¢�S */
+	$"94C0 D1C9 E379 E453 E4C7 27C5 C3F8 1161"            /* ”ÀÑÉãyäSäÇ'ÅÃø.a */
+	$"D631 3F3C 0CFE 13A3 F6EB 3048 F049 CF11"            /* Ö1?<.þ.£öë0HðIÏ. */
+	$"5962 65AE 5D8E F911 A2E2 7787 6C78 F63C"            /* Ybe®]Žù.¢âw‡lxö< */
+	$"E24C ED5B F634 B2B9 9DDF 51B0 94B9 1ABF"            /* âLí[ö4²¹�ßQ°”¹.¿ */
+	$"BE93 4236 35A6 613E 3D1B C8FD 0587 27C7"            /* ¾“B65¦a>=.Èý.‡'Ç */
+	$"F936 55E0 D0CE BF1A 50D8 51CE 6253 0293"            /* ù6UàÐο.PØQÎbS.“ */
+	$"1958 3FA2 BF6C 54A5 B158 4236 7F88 7DE4"            /* .X?¢¿lT¥±XB6.ˆ}ä */
+	$"C231 6D0B 62F1 2C6C 1A1D F8AA 0317 C52D"            /* Â1m.bñ,l..øª..Å- */
+	$"D9D5 0B61 312B A074 B2B8 1905 FCF9 A102"            /* ÙÕ.a1+ t²¸..üù¡. */
+	$"6188 616D 74E6 8232 245D 9C8A 4FD8 E2FD"            /* aˆamtæ‚2$]œŠOØâý */
+	$"0C6C 8F2E 5C82 5724 C542 3AE5 BA0A EE0B"            /* .l�.\‚W$ÅB:åºÂî. */
+	$"2A14 BCDE 8005 4446 25B1 CF8A 6744 9F5C"            /* *.¼Þ€.DF%±ÏŠgDŸ\ */
+	$"9B09 6571 3003 9F52 A42A 7669 CCAA 7A75"            /* ›Æeq0.ŸR¤*vi̪zu */
+	$"F807 2530 7BA9 1474 F318 5A7B E64A 5DD7"            /* ø.%0{©.tó.Z{æJ]× */
+	$"A6F2 13B0 AFA5 7BF8 46DC CABF 4D80 CC26"            /* ¦ò.°¯¥{øFÜÊ¿M€Ì& */
+	$"5838 4016 3C05 4550 C62F 1504 5B79 0816"            /* X8@.<.EPÆ/..[y.. */
+	$"556C 8524 5DDA E914 92F1 3124 5C5B 3213"            /* Ul…$]Úé.’ñ1$\[2. */
+	$"7851 D9B8 EE79 46CF 3F06 1EAB 662A FD9E"            /* xQÙ¸îyFÏ?..«f*ýž */
+	$"E7D8 2E8C 938F 43FA B1B1 34B0 9207 34EC"            /* çØ.Œ“�Cú±±4°’.4ì */
+	$"7A09 46BF 201E 311F EEEE 88EF C6C1 C10D"            /* zÆF¿ .1.îîˆïÆÁÁ. */
+	$"E238 50C9 7F01 DFF0 2170 EDD1 7471 8C14"            /* â8PÉ..ßð!píÑtqŒ. */
+	$"FB17 6678 A8B9 6611 9713 D8BB 8840 427C"            /* û.fx¨¹f.—.Ø»ˆ@B| */
+	$"8E5E 1608 D5E6 79B6 0BD7 3592 5D97 3864"            /* Ž^..Õæy¶.×5’]—8d */
+	$"71DF 6137 C0E6 2EB0 F71D 466C CFFF 50EF"            /* qßa7Àæ.°÷.FlÏÿPï */
+	$"FE99 2E4D 0DBB 537F 32F1 DECB D5D4 39DF"            /* þ™.M.»S.2ñÞËÕÔ9ß */
+	$"4FCC 2FC2 C399 8EB9 FC8B 2806 3FB7 F227"            /* OÌ/ÂÙŽ¹ü‹(.?·ò' */
+	$"BA12 A288 9858 9159 B6ED 0DBF 3DCC 8FA1"            /* º.¢ˆ˜X‘Y¶í.¿=Ì�¡ */
+	$"9CF5 836D 499F B9E7 DB4E 497F D3A4 57BF"            /* œõƒmIŸ¹çÛNI.Ó¤W¿ */
+	$"9F0A EECE 8E29 127A 82FF 4222 75AC 32D4"            /* ŸÂîÎŽ).z‚ÿB"u¬2Ô */
+	$"6540 8040 4137 9EB4 EFFF 7FEC 9D37 60B4"            /* e@€@A7ž´ïÿ.ì�7`´ */
+	$"184A 9567 71E4 F5FE 1C55 BB95 9FD8 BE6D"            /* .J•gqäõþ.U»•ŸØ¾m */
+	$"037F 052C 035B 91D7 903B 6EEC 1642 3D18"            /* ...,.[‘×�;nì.B=. */
+	$"0B05 FEC5 4C0C 9ED3 BFA5 94AF CBB1 E725"            /* ..þÅL.žÓ¿¥”¯Ë±ç% */
+	$"DFC3 AF74 2485 D5A2 7F79 1275 C7DD ADE1"            /* ßït$…Õ¢.y.uÇÝ­á */
+	$"3BD5 AD19 74E6 EE9F 6846 7900 C09D 090B"            /* ;Õ­.tæîŸhFy.À�Æ. */
+	$"C17C FB0F 2C9F 4DEB B9FE 7152 A47E B1CB"            /* Á|û.,ŸMë¹þqR¤~±Ë */
+	$"FB0E 7108 21C7 EFAB 8FA3 8AF0 2FDC 17A9"            /* û.q.!Çï«�£Šð/Ü.© */
+	$"2565 5082 BEBF 4DDD 0699 3265 82AE D421"            /* %eP‚¾¿MÝ.™2e‚®Ô! */
+	$"3776 341F C56C ECDA B302 0306 AE5F 37FF"            /* 7v4.ÅlìÚ³...®_7ÿ */
+	$"7FB7 1192 8D68 5475 EE0B 4D80 6149 DEBB"            /* .·.’�hTuî.M€aIÞ» */
+	$"F9A7 D7E7 A35D 9515 8000 4F04 C4D6 670C"            /* ù§×ç£]•.€.O.ÄÖg. */
+	$"54B7 93BB D264 43E0 E8D4 2D4D D3E2 AEB0"            /* T·“»ÒdCàèÔ-MÓâ®° */
+	$"FBAE F5BD A155 A8F2 07B4 AAA6 CE0A 84CC"            /* û®õ½¡U¨ò.´ª¦ÎÂ„Ì */
+	$"907F D5C4 9900 8FE2 0E0D F385 55A0 CDFF"            /* �.ÕÄ™.�â..ó…U Íÿ */
+	$"7FFE D776 193F A5C4 0334 DD15 7A6A 0890"            /* .þ×v.?¥Ä.4Ý.zj.� */
+	$"DE98 5707 7799 9A5B D638 31B9 982B 5623"            /* Þ˜W.w™š[Ö81¹˜+V# */
+	$"3AFA A84A 20E7 417C F56E 7776 0C54 0765"            /* :ú¨J çA|õnwv.T.e */
+	$"91DE A19E 3DD2 4D8B F9F9 0D61 6343 0746"            /* ‘Þ¡ž=ÒM‹ùù.acC.F */
+	$"7D72 600B 4E15 FC8F 60FA A273 4348 A86E"            /* }r`.N.ü�`ú¢sCH¨n */
+	$"E11A CD6B 3FFF 7ED1 E486 AAAA A380 045A"            /* á.Ík?ÿ~Ñ䆪ª£€.Z */
+	$"70E5 3753 4FFF 7FC6 ADBE 8E71 66FF 8165"            /* på7SOÿ.Æ­¾Žqfÿ�e */
+	$"D782 24E8 7399 0C15 03BF 29B5 5685 FDA1"            /* ׂ$ès™...¿)µV…ý¡ */
+	$"5BAD 5751 6D53 799A A7C6 572E 6A37 B46A"            /* [­WQmSyš§ÆW.j7´j */
+	$"B9BF 05BF 3131 F7DB E3B8 8F11 EE2F 13D6"            /* ¹¿.¿11÷Ûã¸�.î/.Ö */
+	$"7DE9 D552 0B25 FEAF AEFE F0A7 FBE9 487F"            /* }éÕR.%þ¯®þð§ûéH. */
+	$"9085 0FFA 23FE A9DB 0494 B0E1 FEFD 1D50"            /* �….ú#þ©Û.”°áþý.P */
+	$"15B4 6548 AAA0 0182 C5FF 7D24 05C8 B15E"            /* .´eHª .‚Åÿ}$.ȱ^ */
+	$"E45F A508 3C68 CA73 3A57 A35E 462D 9213"            /* ä_¥.<hÊs:W£^F-’. */
+	$"9D19 A4FE F266 C323 64FF 7B71 19F7 0BC3"            /* �.¤þòfÃ#dÿ{q.÷.Ã */
+	$"062C 20C4 9745 F075 6FFF 31F0 A3AD 4C84"            /* ., Ä—Eðuoÿ1ð£­L„ */
+	$"00F3 104C 0064 3899 0DB9 8128 CB5F FF46"            /* .ó.L.d8™.¹�(Ë_ÿF */
+	$"7184 41CB 7E58 4C0B ADD5 CBB2 1A61 E3D6"            /* q„AË~XL.­Õ˲.aãÖ */
+	$"B45F 489E 7FE9 D915 2B77 0776 98BD B3A6"            /* ´_Hž.éÙ.+w.v˜½³¦ */
+	$"230E B817 1D5A D937 3251 2449 6B0A 5A13"            /* #.¸..ZÙ72Q$IkÂZ. */
+	$"C4E0 BB45 CB72 9758 9E56 158D B1E6 9590"            /* Äà»EËr—XžV.�±æ•� */
+	$"4FC4 0611 EDBC 426F 6D2B D932 D595 A74E"            /* OÄ..í¼Bom+Ù2Õ•§N */
+	$"8728 58CD BD02 9746 DBA2 7EAB 0F07 363C"            /* ‡(Xͽ.—FÛ¢~«..6< */
+	$"BAB3 1228 E02A BDB4 373F F3FB FF7D 8D0D"            /* º³.(à*½´7?óûÿ}�. */
+	$"2193 09F4 7603 A017 98B1 421E 7A47 D126"            /* !“Æôv. .˜±B.zGÑ& */
+	$"82FD 5449 B97F F864 5CD5 19F6 A8A4 F216"            /* ‚ýTI¹.ød\Õ.ö¨¤ò. */
+	$"A4B3 FF7F E820 4C58 DE4B 944B 6FD4 F4DA"            /* ¤³ÿ.è LXÞK”KoÔôÚ */
+	$"596E A688 456C 3F0D 7844 1596 2BED 0D5D"            /* Yn¦ˆEl?.xD.–+í.] */
+	$"FAFB 8D2E D7D0 ABCB B2BE 8D80 E74D 9EDC"            /* úû�.×Ы˲¾�€çMžÜ */
+	$"7FFF 7FC9 2FB9 3BDA F47A B9C2 E1B8 5CC8"            /* .ÿ.É/¹;Úôz¹Âá¸\È */
+	$"14AB D534 7208 32FE 73D2 EF23 862E 10F8"            /* .«Õ4r.2þsÒï#†..ø */
+	$"C16F 1FFF 6FBB FA97 5167 CDAD 4886 8FC2"            /* Áo.ÿo»ú—QgÍ­H†� */
+	$"BFFF 7FFE 2B73 126E 1EC8 C82A 3F6D 6CC3"            /* ¿ÿ.þ+s.n.ÈÈ*?mlà */
+	$"D98A D501 1DC2 82FD FF57 9731 B866 2A7D"            /* ÙŠÕ..‚ýÿW—1¸f*} */
+	$"C983 5F41 893F 2D09 F81C E373 42C2 5963"            /* Ƀ_A‰?-Æø.ãsBÂYc */
+	$"7E9F C269 2B8B C21A 8247 D433 0DF7 491E"            /* ~ŸÂi+‹Â.‚GÔ3.÷I. */
+	$"D1BF 3D9E F4BD 1B50 8034 4EE9 4A69 B155"            /* Ñ¿=žô½.P€4NéJi±U */
+	$"849A B0F7 8CEA 3FD0 E4A0 C339 2431 ED8B"            /* „š°÷Œê?Ðä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FD9F 7F36 9703 7BCA 1455 6A98 F02E"            /* #fýŸ.6—.{Ê.Uj˜ð. */
+	$"1EDC 4707 C9A6 B325 A6E4 637D 612B B3DD"            /* .ÜG.ɦ³%¦äc}a+³Ý */
+	$"1E5A 3660 EEB0 BEFA 2C50 307B 5887 6D39"            /* .Z6`î°¾ú,P0{X‡m9 */
+	$"0EC7 2D81 C32E 6B72 8546 30E4 133F 3D3B"            /* .Ç-�Ã.kr…F0ä.?=; */
+	$"0A76 21AA 4387 8F29 03C8 1C32 755C F553"            /* Âv!ªC‡�).È.2u\õS */
+	$"5CA1 C16A 02EC 4654 97C8 6F10 BA2A 16E0"            /* \¡Áj.ìFT—Èo.º*.à */
+	$"DB18 605E 8A18 8A6E 4F35 1EF7 8C57 F8B2"            /* Û.`^Š.ŠnO5.÷ŒWø² */
+	$"0020 4D0A 1739 2287 ADE2 B0C2 D816 17D2"            /* . MÂ.9"‡­â°ÂØ..Ò */
+	$"21F8 3104 FEA8 38E3 8644 6F0B D2C6 A599"            /* !ø1.þ¨8ã†Do.ÒÆ¥™ */
+	$"B793 1367 B548 23BD 8836 1143 D5DB 2720"            /* ·“.gµH#½ˆ6.CÕÛ'  */
+	$"73BB 1485 DEAF C96F 24E8 AA26 56B9 89D3"            /* s».…Þ¯Éo$èª&V¹‰Ó */
+	$"8F8D 2F3E 5EA5 466C BE3C 6879 6C0A 5891"            /* ��/>^¥Fl¾<hylÂX‘ */
+	$"974E 6F22 0E47 66D4 BD1F 6A7D 1885 42CC"            /* —No".GfÔ½.j}.…BÌ */
+	$"7E13 126E AC98 74B7 B093 BDFF 37DB E527"            /* ~..n¬˜t·°“½ÿ7Ûå' */
+	$"E6D0 CF2A D7E6 E7EB 1095 05AF 6407 BB9B"            /* æÐÏ*×æçë.•.¯d.»› */
+	$"0227 D5EB 260A C844 340F B249 E84F 58A7"            /* .'Õë&ÂÈD4.²IèOX§ */
+	$"FA14 9D34 7614 73A6 BE73 ED76 B2CD 4515"            /* ú.�4v.s¦¾sív²ÍE. */
+	$"F26C 3AD7 7C32 5480 5A3A C4DF 123A EA95"            /* òl:×|2T€Z:Äß.:ê• */
+	$"D2B4 A3D8 F88D E685 6505 A999 DD9E C8D1"            /* Ò´£Øø�æ…e.©™ÝžÈÑ */
+	$"A073 3702 5A8F 3598 F7DC A36F 0058 065E"            /*  s7.Z�5˜÷Ü£o.X.^ */
+	$"65E6 B5AC 2A85 0F1C 43BF 8A10 43A0 BB10"            /* e浬*…..C¿Š.C ». */
+	$"4C3A 8F4F 95AD 253D EEE9 FBE8 4023 4647"            /* L:�O•­%=îéûè@#FG */
+	$"7A75 8F1C 9245 3C51 3FF5 BD2B DFD3 57EF"            /* zu�.’E<Q?õ½+ßÓWï */
+	$"1FB4 900F 4546 6EFA A7AE 45EB EAE9 7B9D"            /* .´�.EFnú§®Eëêé{� */
+	$"6408 1DCB F7AC BE44 7D08 1482 2257 A9CF"            /* d..Ë÷¬¾D}..‚"W©Ï */
+	$"8B78 3610 9816 9518 A64C 215A 4569 6C5F"            /* ‹x6.˜.•.¦L!ZEil_ */
+	$"57E0 4F89 F77C 88D6 ADFC 8E42 9299 A2C9"            /* WàO‰÷|ˆÖ­üŽB’™¢É */
+	$"0F7C EA0A 7E98 B7AF 70ED 09A8 0759 B1A7"            /* .|êÂ~˜·¯píƨ.Y±§ */
+	$"C18E 2CC9 883F A788 A2F1 57B9 7A0E F384"            /* ÁŽ,Ɉ?§ˆ¢ñW¹z.ó„ */
+	$"F0CE 46F0 E10A ED6F CE17 2BE1 25D5 3A36"            /* ðÎFðáÂíoÎ.+á%Õ:6 */
+	$"5C6A F3AA F2D1 7225 6C5C 514F 8F1F 64A5"            /* \jóªòÑr%l\QO�.d¥ */
+	$"B08E D05D 3E2E B3E4 DE48 12A9 7DC6 6E03"            /* °ŽÐ]>.³äÞH.©}Æn. */
+	$"05B3 2AD0 EF87 EFB1 6D03 06E4 85AB 36C6"            /* .³*Ðï‡ï±m..ä…«6Æ */
+	$"9BF6 8382 74F2 F321 62DF 269C 8D95 8FBD"            /* ›öƒ‚tòó!bß&œ�•�½ */
+	$"C4CA 7278 FDBA C51B A4FC C224 BD43 5F76"            /* ÄÊrxýºÅ.¤üÂ$½C_v */
+	$"F9D9 0970 5EAA 5F05 FDCB 50DE 35E7 A82E"            /* ùÙÆp^ª_.ýËPÞ5ç¨. */
+	$"1E7E 584D 33D8 EF90 B221 622F 778E 460D"            /* .~XM3Øï�²!b/wŽF. */
+	$"6DC9 383F CF41 7B89 7414 97EF EFE2 CC75"            /* mÉ8?ÏA{‰t.—ïïâÌu */
+	$"8895 6AFD C6E8 610E 5E29 7AE1 FAAF 9FD5"            /* ˆ•jýÆèa.^)záú¯ŸÕ */
+	$"435F 3F61 6F9F AC78 7EAD 62BE 7DF7 7CFD"            /* C_?aoŸ¬x~­b¾}÷|ý */
+	$"D3FD 5BAF 83F5 5B37 CF6D BE7E 9DDF 3F4D"            /* Óý[¯ƒõ[7Ïm¾~�ß?M */
+	$"80E8 ABDE CCAF 0D6C 8AC6 9587 348A 7A5A"            /* €è«Þ̯.lŠÆ•‡4ŠzZ */
+	$"21F6 5D05 F6A4 1727 AC99 8E36 4607 A805"            /* !ö].ö¤.'¬™Ž6F.¨. */
+	$"1CA8 FB12 6979 4216 6FCF DF65 6135 AFF9"            /* .¨û.iyB.oÏßea5¯ù */
+	$"5A1E 01C1 15A0 4F38 E547 6F65 858D 0788"            /* Z..Á. O8åGoe…�.ˆ */
+	$"49E3 07A2 D476 B767 EC21 FF65 559D 3B3F"            /* Iã.¢Ôv·gì!ÿeU�;? */
+	$"B8A5 C1A8 6496 5183 24E6 93A6 DF2F 52F1"            /* ¸¥Á¨d–Qƒ$擦ß/Rñ */
+	$"19CA BFD7 1479 8040 2F9C 0DB9 00F0 49C5"            /* .Ê¿×.y€@/œ.¹.ðIÅ */
+	$"3D32 5B0C 9453 8D1F 452F D9E7 75FD CD61"            /* =2[.”S�.E/ÙçuýÍa */
+	$"44A9 62C3 F0C8 BAF0 6A66 A4D4 AA8B 73B0"            /* D©bÃðȺðjf¤Ôª‹s° */
+	$"C942 686A 4A1E E3A7 2343 A0ED D595 9AFC"            /* ÉBhjJ.ã§#C íÕ•šü */
+	$"5546 0ACB FD23 6F2E DCEE ABBD 70E7 FA93"            /* UFÂËý#o.Üpçú“ */
+	$"3FFF 7FC5 7D31 FA1C D910 1C70 6CDC 3362"            /* ?ÿ.Å}1ú.Ù..plÜ3b */
+	$"B0A1 C6F3 16D1 BE51 73D2 4697 37CA 8197"            /* °¡Æó.ѾQsÒF—7Ê�— */
+	$"A8C6 89C1 FF78 99EB 31B8 5F88 7B08 C557"            /* ¨Æ‰Áÿx™ë1¸_ˆ{.ÅW */
+	$"5483 A35C 0713 94D5 D2DF B84C 36CA D9EC"            /* Tƒ£\..”ÕÒ߸L6ÊÙì */
+	$"8FC7 A305 814F 8B04 07D2 E391 5E89 43FE"            /* �Ç£.�O‹..Òã‘^‰Cþ */
+	$"6C67 4343 91DB DD56 C1D2 FEA6 9F1F 346F"            /* lgCC‘ÛÝVÁÒþ¦Ÿ.4o */
+	$"714B 79E1 7AC7 53A1 9934 69F4 E886 5A9C"            /* qKyázÇS¡™4iôè†Zœ */
+	$"6F9A D26F DD48 5F60 A72A 7E20 77F8 1BE8"            /* ošÒoÝH_`§*~ wø.è */
+	$"91B9 9018 8124 7694 3664 4202 7B94 1007"            /* ‘¹�.�$v”6dB.{”.. */
+	$"4234 15FC 04A2 6DE0 DC6B 5EDE 4332 F592"            /* B4.ü.¢màÜk^ÞC2õ’ */
+	$"779A A3BD 8E84 5464 DE08 6BAE AE2F 6EEF"            /* wš£½Ž„TdÞ.k®®/nï */
+	$"CB75 5862 59D8 1362 5D60 79D2 137C 7606"            /* ËuXbYØ.b]`yÒ.|v. */
+	$"F2B1 06DE 8A2F B76A A7D9 84DB 8F52 1107"            /* ò±.ÞŠ/·j§Ù„Û�R.. */
+	$"A42C 9803 2476 0448 42C9 A9E5 D0F5 9110"            /* ¤,˜.$v.HBÉ©åÐõ‘. */
+	$"2FAB AAF4 0752 81C9 6064 B8F7 6CEB 438E"            /* /«ªô.R�É`d¸÷lëCŽ */
+	$"DC4B 916C 21F0 1C8F 2A6A 1919 9E26 2B36"            /* ÜK‘l!ð.�*j..ž&+6 */
+	$"3E51 F543 F7C5 2549 66D0 2F14 D18F 42F1"            /* >QõC÷Å%IfÐ/.Ñ�Bñ */
+	$"397B BA52 99ED 853C E07D 629B 92A1 2589"            /* 9{ºR™í…<à}b›’¡%‰ */
+	$"B3A9 B812 DC8D A368 3204 F8AA 7549 AF2B"            /* ³©¸.Ü�£h2.øªuI¯+ */
+	$"2DE7 529C 1ECB 9747 A4B8 F6EC 8DDC 0AC4"            /* -çRœ.Ë—G¤¸öì�ÜÂÄ */
+	$"2C31 F042 C407 3F18 FD32 9280 60E4 60D8"            /* ,1ðBÄ.?.ý2’€`ä`Ø */
+	$"77B5 C019 A5FF 6E0D 8E35 A78E C7AA E95B"            /* wµÀ.¥ÿn.Ž5§ŽÇªé[ */
+	$"D37C D883 5DD2 756B 385A 08BB 7708 AA5E"            /* Ó|؃]Òuk8Z.»w.ª^ */
+	$"5B89 0628 F831 7775 3555 A523 BF2F 721A"            /* [‰.(ø1wu5U¥#¿/r. */
+	$"099B E6B4 5128 9EA6 41E1 9B8B 18C1 928C"            /* Æ›æ´Q(ž¦Aᛋ.Á’Œ */
+	$"72A0 BD1E 84D6 836A C947 0982 284A 9238"            /* r ½.„ÖƒjÉGÆ‚(J’8 */
+	$"A06F E390 1BD5 BBFD 323F BA86 2091 BAD5"            /*  oã�.Õ»ý2?º† ‘ºÕ */
+	$"351D 16C5 1D44 E8C7 66C7 D469 047D 5548"            /* 5..Å.DèÇfÇÔi.}UH */
+	$"7049 7B42 B682 DF4C 68DE B5D2 2EDC C105"            /* pI{B¶‚ßLhÞµÒ.ÜÁ. */
+	$"4047 9A7E 0403 F48B 6215 C3ED 8DBA 12E9"            /* @Gš~..ô‹b.Ãí�º.é */
+	$"EEFB B61B 906E F6F6 DDFD D030 CD1C 47FD"            /* îû¶.�nööÝýÐ0Í.Gý */
+	$"7C37 E7C7 DC08 213E 3C33 08E6 74A0 F400"            /* |7çÇÜ.!><3.æt ô. */
+	$"7CFC 3B85 1A2E 5ACA 573F F24C 7D2C 0E3B"            /* |ü;…..ZÊW?òL},.; */
+	$"2A6D CEDC 6C9C 6E97 A572 915F A892 3833"            /* *mÎÜlœn—¥r‘_¨’83 */
+	$"A08F 0070 A602 FB49 0EA6 62FC 4237 C568"            /*  �.p¦.ûI.¦büB7Åh */
+	$"E937 1DC1 1FC2 C3F1 AA30 AC4D DDB8 E747"            /* é7.Á.ÂÃñª0¬MݸçG */
+	$"5EE4 FD73 8124 56EB ADBE 6DB3 F27B 80C0"            /* ^äýs�$Vë­¾m³ò{€À */
+	$"E536 971B 511B C76B AB20 8BA4 4DCD BFCB"            /* å6—.Q.Çk« ‹¤MÍ¿Ë */
+	$"4A0C 34DC 3DDC 9BEF 5122 89D0 99D1 9BE7"            /* J.4Ü=Ü›ïQ"‰Ð™Ñ›ç */
+	$"8840 002A A77A 25E2 9C2C F9BC 78F9 FB0E"            /* ˆ@.*§z%âœ,ù¼xùû. */
+	$"0DB7 4F14 B07A 12F6 65D3 ABE1 660D A84A"            /* .·O.°z.öeÓ«áf.¨J */
+	$"EFF9 A799 1852 8ED0 9582 B79A D812 1BE6"            /* ïù§™.RŽÐ•‚·šØ..æ */
+	$"F3D0 D5FA 9C76 5EBD DBFD 42A9 F7B3 885E"            /* óÐÕúœv^½ÛýB©÷³ˆ^ */
+	$"4A68 DBE7 9663 FB7F 1AC4 5004 197F 97F0"            /* JhÛç–cû..ÄP...—ð */
+	$"F57B 135D 19ED E0E0 1C84 139C BA3B 2493"            /* õ{.].íàà.„.œº;$“ */
+	$"D997 333D B6A7 9E83 619C FCE9 9875 134D"            /* Ù—3=¶§žƒaœüé˜u.M */
+	$"4B31 FCB3 5808 B917 C8BB 0B67 4564 488E"            /* K1ü³X.¹.È».gEdHŽ */
+	$"3554 8125 C3A4 DB4A 0BB2 E501 244C 1F49"            /* 5T�%äÛJ.²å.$L.I */
+	$"C6A7 51E4 6C51 A134 3DF4 CE21 2993 FF3B"            /* ƧQälQ¡4=ôÎ!)“ÿ; */
+	$"80F6 AE0B B9F8 D1D5 8853 4531 6806 4F3E"            /* €ö®.¹øÑÕˆSE1h.O> */
+	$"D2B6 5F62 796A 683C D3C9 A22B 6D56 C497"            /* Ò¶_byjh<ÓÉ¢+mVÄ— */
+	$"D854 2E14 C281 0F94 0220 BEE7 3754 D077"            /* ØT..Â�.”. ¾ç7TÐw */
+	$"EDB0 0F0E 95C1 A40B 55C9 B5AE 4DA8 A8A6"            /* í°..•Á¤.Uɵ®M¨¨¦ */
+	$"ADD6 4A11 DE81 B148 70D3 FA4F 795C 9171"            /* ­ÖJ.Þ�±HpÓúOy\‘q */
+	$"C72E 7EF2 454C 0336 BE4A EE68 960E 25BA"            /* Ç.~òEL.6¾Jîh–.%º */
+	$"E686 01F4 6FF5 3C7C 8B33 60D8 24D3 70A1"            /* æ†.ôoõ<|‹3`Ø$Óp¡ */
+	$"06C6 E616 29D4 63D6 3334 379F 743E 745D"            /* .Ææ.)ÔcÖ347Ÿt>t] */
+	$"4EF5 ECB5 072E 9F62 0750 F7BA 6FDE B6B0"            /* Nõìµ..Ÿb.P÷ºoÞ¶° */
+	$"0BD0 4FCC 8F59 9B13 0C77 0A30 9BAE DF36"            /* .ÐOÌ�Y›..wÂ0›®ß6 */
+	$"B13D D861 E92A 12C7 EC7A 0946 BF20 1E31"            /* ±=Øaé*.ÇìzÆF¿ .1 */
+	$"1FEE EE88 EFC6 C1C1 0DE2 3850 C97F 01DF"            /* .îîˆïÆÁÁ.â8PÉ..ß */
+	$"F021 605A D52A 570D 7089 0C1B B3FE 8B4D"            /* ð!`ZÕ*W.p‰..³þ‹M */
+	$"E441 70AC 5F71 3FCE 527F EBF4 048A A307"            /* äAp¬_q?ÎR.ëô.Š£. */
+	$"CEFD 4EB0 87ED BFE2 A36C 51B9 EAD3 37C6"            /* ÎýN°‡í¿â£lQ¹êÓ7Æ */
+	$"E8F0 9A3D 8F78 8747 81D4 33F0 9EEB 5EA0"            /* èðš=�x‡G�Ô3ðžë^  */
+	$"6FE0 A580 6B6B C126 1CE3 F1B2 DC9C CFCE"            /* oीkkÁ&.ãñ²ÜœÏÎ */
+	$"42EE 7E91 EF2F 0DDF CFDE 75EB 554D 6941"            /* Bî~‘ï/.ßÏÞuëUMiA */
+	$"07A5 21BE AD52 7CC1 49B5 FE74 AE40 F70F"            /* .¥!¾­R|ÁIµþt®@÷. */
+	$"AB3B 0C16 98F5 7742 3DCE 842D 0B2B 2FEB"            /* «;..˜õwB=΄-.+/ë */
+	$"5E90 DEBC 8BA9 81AC 40CC 0030 2853 FE9C"            /* ^�Þ¼‹©�¬@Ì.0(Sþœ */
+	$"6FC2 569B 2CD1 6200 2881 802D 7697 8442"            /* oÂV›,Ñb.(�€-v—„B */
+	$"92C8 666B BC90 3252 F4D3 9BD2 AD14 0027"            /* ’Èfk¼�2RôÓ›Ò­..' */
+	$"CE11 F5A4 437B 3F80 B250 AA4C 23B6 AD83"            /* Î.õ¤C{?€²PªL#¶­ƒ */
+	$"277E 5EF0 8132 6331 9325 D1A3 CFB6 6F73"            /* '~^ð�2c1“%ѣ϶os */
+	$"D37D 780F 91CC CD40 6234 2FE2 F097 1681"            /* Ó}x.‘ÌÍ@b4/âð—.� */
+	$"6097 88BD BFFF 18F5 2CBB FF67 FDBC 2F07"            /* `—ˆ½¿ÿ.õ,»ÿgý¼/. */
+	$"67FF 7FFF 1946 84C7 A551 03FF 7F52 A7C2"            /* gÿ.ÿ.F„Ç¥Q.ÿ.R§Â */
+	$"8AC8 1080 56FF 0C48 1804 A884 A5A2 08FF"            /* ŠÈ.€Vÿ.H..¨„¥¢.ÿ */
+	$"7FF5 3220 8043 9005 C25D DE15 02FB 7F2B"            /* .õ2 €C�.Â]Þ..û.+ */
+	$"8205 5CA8 40BE EFB1 78F0 2656 2AD4 14FF"            /* ‚.\¨@¾ï±xð&V*Ô.ÿ */
+	$"7505 20CD 8BE2 8B15 47BB 9E26 105E 15DD"            /* u. Í‹â‹.G»ž&.^.Ý */
+	$"21A7 82AE E19D FE27 5D8B DDAD E13B D5AD"            /* !§‚®á�þ']‹Ý­á;Õ­ */
+	$"1974 E6EE 9F68 4679 00C0 9D09 0BC1 7CFB"            /* .tæîŸhFy.À�Æ.Á|û */
+	$"0F2C 9F4E 082C 2CB4 569B A7B0 0009 E098"            /* .,ŸN.,,´V›§°.Æà˜ */
+	$"9AB0 9892 B1FF 6957 1D78 2613 4289 24C6"            /* š°˜’±ÿiW.x&.B‰$Æ */
+	$"12BC E2EF C9AE E6D9 784F C157 77AB 3470"            /* .¼âïÉ®æÙxOÁWw«4p */
+	$"D8C7 C746 1978 322D D4E9 FA24 B8B2 5054"            /* ØÇÇF.x2-Ôéú$¸²PT */
+	$"D643 8270 9090 D6D8 0C24 16E5 1146 421C"            /* ÖC‚p��ÖØ.$.å.FB. */
+	$"D6A2 40D9 1864 A800 0000 0000 0001 4554"            /* Ö¢@Ù.d¨.......ET */
+	$"031E 793B 33D3 FD4A CE0A 3D8A 9D46 37B0"            /* ..y;3ÓýJÎÂ=Š�F7° */
+	$"4D2C 6F04 2BFF 071C 023F E153 6688 1815"            /* M,o.+ÿ...?áSfˆ.. */
+	$"BA20 BF61 DDDF 2979 84E3 3348 50F6 E9B8"            /* º ¿aÝß)y„ã3HPöé¸ */
+	$"634A 8937 FF7F F1AE E84B C95A 771F 4C9C"            /* cJ‰7ÿ.ñ®èKÉZw.Lœ */
+	$"3FFE 0734 7D7F 6E35 4A2E 21E0 E52F FF7E"            /* ?þ.4}.n5J.!àå/ÿ~ */
+	$"8532 8513 7869 A6E6 495D 3E58 F349 1EF5"            /* …2….xi¦æI]>XóI.õ */
+	$"886C 6441 9091 82E8 0C24 1507 0E02 A105"            /* ˆldA�‘‚è.$....¡. */
+	$"95C5 1409 096C 9A37 F758 F13A 5ABF 149E"            /* •Å.ÆÆlš7÷Xñ:Z¿.ž */
+	$"DA31 52E9 0DA9 0BFF 45EB 20C7 1A1C E54C"            /* Ú1Ré.©.ÿEë Ç..åL */
+	$"29D1 6C8E D1EC 9D59 F945 4303 373F FF7F"            /* )ÑlŽÑì�YùEC.7?ÿ. */
+	$"CE95 B027 88F7 AB06 28B9 92E7 D540 BC2B"            /* Ε°'ˆ÷«.(¹’çÕ@¼+ */
+	$"7167 8C6C C87E 32B0 C904 7D7D 278E E519"            /* qgŒlÈ~2°É.}}'Žå. */
+	$"707D 2C42 1714 C425 F9D0 DC01 D910 23DB"            /* p},B..Ä%ùÐÜ.Ù.#Û */
+	$"E7F3 391C A4E6 FAE1 C850 5A1F 456A 6690"            /* çó9.¤æúáÈPZ.Ejf� */
+	$"3F37 F970 3841 73D3 1095 39CF 10A3 40F8"            /* ?7ùp8AsÓ.•9Ï.£@ø */
+	$"4CCC 4985 E3D5 127F 7CF4 92BC DCE9 2335"            /* LÌI…ãÕ..|ô’¼Üé#5 */
+	$"43FB 7460 8D5C C121 CFF2 1165 1CCE BBB2"            /* Cût`�\Á!Ïò.e.λ² */
+	$"5EA8 0279 2C97 E45B A43D 328C 7A6C 5EBC"            /* ^¨.y,—ä[¤=2Œzl^¼ */
+	$"61DD BB2C E34E 25E4 1725 3C6B EC12 BFEF"            /* aÝ»,ãN%ä.%<kì.¿ï */
+	$"3E5E 0ACF 766D 9D4E 8978 2AC5 F138 755A"            /* >^ÂÏvm�N‰x*Åñ8uZ */
+	$"CBDD 8421 F74E 9A07 A070 16ED 100C 769A"            /* ËÝ„!÷Nš. p.í..vš */
+	$"6571 1FA0 4D62 8ADC A3F1 0AAA 2253 1A39"            /* eq. MbŠÜ£ñª"S.9 */
+	$"0006 DF51 B09A 2267 BA13 3AD9 0120 8520"            /* ..ßQ°š"gº.:Ù. …  */
+	$"7375 BB11 0715 9FFF 7FFF 276F 9A44 4D02"            /* su»...Ÿÿ.ÿ'ošDM. */
+	$"9DF2 BE32 729A 8C71 FBC9 4C73 FA4B 1D24"            /* �ò¾2ršŒqûÉLsúK.$ */
+	$"4115 B69E 4FFF 7FFF 45B5 7091 9925 CEBD"            /* A.¶žOÿ.ÿEµp‘™%ν */
+	$"6A4E 1AA3 BFFF 7FFD AA3B 4043 EE5A 76B0"            /* jN.£¿ÿ.ýª;@CîZv° */
+	$"A073 CF17 7A58 3A06 649C B972 3CB8 897B"            /*  sÏ.zX:.dœ¹r<¸‰{ */
+	$"31E2 637A 05AC 83FA B94C 0F75 7113 FF7B"            /* 1âcz.¬ƒú¹L.uq.ÿ{ */
+	$"E690 225A FB16 A961 626A B7FE 22EF 864B"            /* æ�"Zû.©abj·þ"ï†K */
+	$"F464 1D62 4127 02B3 DB08 1C01 3ECE 1326"            /* ôd.bA'.³Û...>Î.& */
+	$"CF03 BF05 5771 4992 75FE 29FC 5FFF 60D5"            /* Ï.¿.WqI’uþ)ü_ÿ`Õ */
+	$"DCC3 1B1F 40FF 6990 DC69 3E47 D09A 6E6A"            /* ÜÃ..@ÿi�Üi>GКnj */
+	$"2866 9BA8 D74C BAAA 204E 05F9 DBFE E679"            /* (f›¨×Lºª N.ùÛþæy */
+	$"E76C 383D 9F92 BB32 1E14 2CA1 CBD5 E93C"            /* çl8=Ÿ’»2..,¡ËÕé< */
+	$"6C00 DFA2 B04F D650 3F14 60FF 7F73 29C3"            /* l.ߢ°OÖP?.`ÿ.s)à */
+	$"E20E 5672 C31B 6D72 FDCF 8097 B8B0 1482"            /* â.VrÃ.mrýÏ€—¸°.‚ */
+	$"C37E 4C4A 28FA 6E67 F061 E00C 371B 8655"            /* Ã~LJ(úngðaà.7.†U */
+	$"BDCB 2942 6AB1 0E31 38D3 6948 0D3F 6FEF"            /* ½Ë)Bj±.18ÓiH.?oï */
+	$"C2AB 669A E502 2490 C158 FC07 05F0 348A"            /* «fšå.$�ÁXü..ð4Š */
+	$"0505 F0B2 E7E3 F934 19DA 2DB9 9686 603E"            /* ..ð²çãù4.Ú-¹–†`> */
+	$"C2C3 4B2F EB95 FB4E 62D2 F085 4364 9DCA"            /* ÂÃK/ë•ûNbÒð…Cd�Ê */
+	$"A6E8 94F8 CC41 2603 5BFC 4E90 C05F 068D"            /* ¦è”øÌA&.[üN�À_.� */
+	$"414C 618C 8860 58B1 7059 0B4C 39E8 FB58"            /* ALaŒˆ`X±pY.L9èûX */
+	$"C413 43C6 BF39 CC12 6E5B F65C F671 DD29"            /* Ä.CÆ¿9Ì.n[ö\öqÝ) */
+	$"8A03 BC15 FF06 2028 49E4 BF04 E6FC D4FD"            /* Š.¼.ÿ. (Iä¿.æüÔý */
+	$"401A CB9C 5F7F EFE7 8F41 E707 7803 9F1A"            /* @.Ëœ_.ïç�Aç.x.Ÿ. */
+	$"715F 951E E63A 9B4C 1404 32AA B5B7 98B0"            /* q_•.æ:›L..2ªµ·˜° */
+	$"D5F4 CD69 DD15 9E81 D2FD 09F7 462D AF3E"            /* ÕôÍiÝ.ž�ÒýÆ÷F-¯> */
+	$"31DA 85C4 5053 8460 C06C 7018 908C 4821"            /* 1Ú…ÄPS„`Àlp.�ŒH! */
+	$"D8AB AC44 7666 44D1 EA04 8979 3A4A A0FE"            /* Ø«¬DvfDÑê.‰y:J þ */
+	$"27D7 B0C3 DBAA 5233 F376 3CA8 4968 DF8A"            /* '×°ÃÛªR3óv<¨Ihߊ */
+	$"874C 2117 6A15 4664 03FF 7FFF 7F7C 2D12"            /* ‡L!.j.Fd.ÿ.ÿ.|-. */
+	$"B28B 8A4C 6D72 1106 16E0 BF7F 9822 2424"            /* ²‹ŠLmr...à¿.˜"$$ */
+	$"3C1B CBC8 2F76 1AC7 FF7F FF7F EB42 22AA"            /* <.ËÈ/v.Çÿ.ÿ.ëB"ª */
+	$"F30A 0C9D 6086 E561 E1BC C1D9 4E7F FADF"            /* óÂ.�`†åaá¼ÁÙN.úß */
+	$"A85C B34C E2D4 FCF6 1A29 34F3 3B42 1DFC"            /* ¨\³LâÔüö.)4ó;B.ü */
+	$"C6BD 370B D203 B0C4 1C7D C348 1EE7 EAD9"            /* ƽ7.Ò.°Ä.}ÃH.çêÙ */
+	$"3145 E7FB 36CC 8E64 AB70 81DC 65E1 2C1D"            /* 1Eçû6ÌŽd«p�Üeá,. */
+	$"9CB5 18A0 1C95 7DE2 96DF C185 7A40 50C7"            /* œµ. .•}â–ßÁ…z@PÇ */
+	$"E32C FCC1 FF6B 14F5 05FE 0E1C 8757 8D82"            /* ã,üÁÿk.õ.þ..‡W�‚ */
+	$"3A41 284E 2906 8316 564F F479 4DCF FF7E"            /* :A(N).ƒ.VOôyMÏÿ~ */
+	$"5F11 3745 AC7F ED8D BC93 4205 7E12 E036"            /* _.7E¬.í�¼“B.~.à6 */
+	$"0BE4 4B4F F99C F369 6B38 263E 63EC 6311"            /* .äKOùœóik8&>cìc. */
+	$"D577 8B5D 7957 D24D 7D64 A2B5 1107 4625"            /* Õw‹]yWÒM}d¢µ..F% */
+	$"E1EB 2460 41A2 E878 5967 CEAE AE16 D8D5"            /* áë$`A¢èxYgή®.ØÕ */
+	$"F960 B484 0B49 7253 26F2 714E 6A13 03E4"            /* ù`´„.IrS&òqNj..ä */
+	$"A0C3 3924 31ED 8B79 3D63 5412 C097 F9C3"            /*  Ã9$1í‹y=cT.À—ùÃ */
+	$"79AD A97D EEE5 EF23 66FF 15BD C854 5DFB"            /* y­©}îåï#fÿ.½ÈT]û */
+	$"5921 E05C 6A39 B68E 6444 6D55 3B7D 6DDA"            /* Y!à\j9¶ŽdDmU;}mÚ */
+	$"9003 8F53 5C49 D978 31CD 41C5 DD62 7DE4"            /* �.�S\IÙx1ÍAÅÝb}ä */
+	$"2F24 5932 A14F 9C9C 97B6 2652 5988 7970"            /* /$Y2¡Oœœ—¶&RYˆyp */
+	$"F890 8A5C 9614 EBF4 DAC8 15D1 6F3C 07E4"            /* ø�Š\–.ëôÚÈ.Ño<.ä */
+	$"7B8B F763 6803 394F 2291 8D88 EB1B 3136"            /* {‹÷ch.9O"‘�ˆë.16 */
+	$"10C9 5077 060A 7DB0 A890 CB7B 947F AD8B"            /* .ÉPw.Â}°¨�Ë{”.­‹ */
+	$"0AAF 67FF 5D78 615A E459 013B 6923 5E0E"            /* ¯gÿ]xaZäY.;i#^. */
+	$"900D BA9C DFF2 37D0 0508 B5F3 EA48 FADE"            /* �.ºœßò7Ð..µóêHúÞ */
+	$"D348 3F2F 8E71 E6CD B6BE 8941 8773 0E17"            /* ÓH?/ŽqæͶ¾‰A‡s.. */
+	$"E97A B699 5A4F 21C1 0766 538B B29A B8CA"            /* éz¶™ZO!Á.fS‹²š¸Ê */
+	$"FBAE 21FA 76A0 B197 C613 E523 B127 1FE4"            /* û®!úv ±—Æ.å#±'.ä */
+	$"0AA8 798D 688E 8F27 E386 446F 0BD2 C6A5"            /* ¨y�hŽ�'ã†Do.ÒÆ¥ */
+	$"99B7 9313 67B5 4823 BD88 3611 E5A8 8054"            /* ™·“.gµH#½ˆ6.娀T */
+	$"3C15 C120 1B02 5B2A 2195 DD25 F90A 48A6"            /* <.Á ..[*!•Ý%ùÂH¦ */
+	$"BF92 56B9 4639 F2BD AC5F 3350 9699 14A7"            /* ¿’V¹F9ò½¬_3P–™.§ */
+	$"30A2 4B91 C33D 3175 F806 15AA 4B01 558F"            /* 0¢K‘Ã=1uø..ªK.U� */
+	$"400B 8148 DAF5 29FD 0561 1CA8 7239 51F4"            /* @.�HÚõ)ý.a.¨r9Qô */
+	$"A169 A92B EE2F 4F3D 2F96 029B 186B 7219"            /* ¡i©+î/O=/–.›.kr. */
+	$"C673 0E85 6FAC 9889 C64A 90AE DBAF E8E3"            /* Æs.…o¬˜‰ÆJ�®Û¯èã */
+	$"6607 DF2A C332 C690 840A 817A ABFF 3302"            /* f.ß*Ã2Æ�„Â�z«ÿ3. */
+	$"1464 A65F E1B3 04B0 90C6 51E5 6A2E 7EA2"            /* .d¦_á³.°�ÆQåj.~¢ */
+	$"9222 EABA 0632 2F13 B1A3 2337 85B4 E390"            /* ’"êº.2/.±£#7…´ã� */
+	$"766A 98DB BDDD 9813 F7BD 8AEA 1AB2 BEEC"            /* vj˜Û½Ý˜.÷½Šê.²¾ì */
+	$"BEE3 F4B7 EE35 6BB8 ADE1 E772 AEB0 7E66"            /* ¾ãô·î5k¸­áçr®°~f */
+	$"3F99 05C1 3339 69B2 C1D5 4CC7 DB0B 3C67"            /* ?™.Á39i²ÁÕLÇÛ.<g */
+	$"7F80 43C8 7B29 FA49 8C64 3FEB 6406 35FE"            /* .€CÈ{)úIŒd?ëd.5þ */
+	$"FAEB 4922 9410 5352 D4C0 00CB 72EA 56CE"            /* úëI"”.SRÔÀ.ËrêVÎ */
+	$"22F8 673A D3E8 AAFA E992 5B7F 827C A83D"            /* "øg:Óèªúé’[.‚|¨= */
+	$"586F 54B4 69F8 C6B7 FF14 CFD4 4069 C50F"            /* XoT´iøÆ·ÿ.ÏÔ@iÅ. */
+	$"9E23 797E DE78 5B86 FCAE BDE5 B920 9551"            /* ž#y~Þx[†ü®½å¹ •Q */
+	$"22EC 4155 0582 10F4 BF8C 144A 3251 97F3"            /* "ìAU.‚.ô¿Œ.J2Q—ó */
+	$"2E7D 1E04 969B 4C15 8BDB FAC1 9743 2B6C"            /* .}..–›L.‹ÛúÁ—C+l */
+	$"6EF5 C95E 47CB A380 A635 C17D AD97 42EA"            /* nõÉ^GË£€¦5Á}­—Bê */
+	$"88A1 A63E FC76 A19C AE08 C868 115F 098D"            /* ˆ¡¦>üv¡œ®.Èh._Æ� */
+	$"A1BE 16D4 3BF4 91C9 6CF1 DBE0 E0CA 0DAA"            /* ¡¾.Ô;ô‘ÉlñÛààÊ.ª */
+	$"EFCB 2A06 908B 7BAC CCF3 4CF8 179A 615E"            /* ïË*.�‹{¬ÌóLø.ša^ */
+	$"590D AB18 CB49 E032 B8ED 2A8E 584A ACDC"            /* Y.«.ËIà2¸í*ŽXJ¬Ü */
+	$"4797 F732 B8C9 24A4 0E5C 85A0 FED8 E30A"            /* G—÷2¸É$¤.\… þØã */
+	$"ECBF 08FB CDC1 E09D 9556 837A E086 95AC"            /* ì¿.ûÍÁà�•Vƒzà†•¬ */
+	$"BA2C E411 756E F132 9CE6 EDC4 6C90 B09E"            /* º,ä.unñ2œæíÄl�°ž */
+	$"3C59 DE78 44D0 E445 BCA0 3AE0 05D9 7440"            /* <YÞxDÐäE¼ :à.Ùt@ */
+	$"F09F 10EA E0BA 4596 84F5 81A2 550E 57A7"            /* ðŸ.êàºE–„õ�¢U.W§ */
+	$"F2A8 B2DD D612 A18F D74A 671D B70C 994A"            /* ò¨²ÝÖ.¡�×Jg.·.™J */
+	$"9441 8E10 12B8 80F0 6249 2075 CD39 3667"            /* ”AŽ..¸€ðbI uÍ96g */
+	$"6632 AFDD 5E48 6B22 15CC 179A C6FA 47AE"            /* f2¯Ý^Hk".Ì.šÆúG® */
+	$"66AF 7AFB 033D 03F1 B829 B852 F1BF 55DB"            /* f¯zû.=.ñ¸)¸Rñ¿UÛ */
+	$"17F6 E1EF A955 F266 ACFE 75F4 34FC 38B0"            /* .öáï©Uòf¬þuô4ü8° */
+	$"0068 7DD6 016E 98D4 57DB 6220 D269 4BE9"            /* .h}Ö.n˜ÔWÛb ÒiKé */
+	$"8007 22E8 9D82 8FCE EB41 317B D0FA 323B"            /* €."è�‚�ÎëA1{Ðú2; */
+	$"B2C0 06D3 99E3 ED9A 2423 78CD AE34 CF5B"            /* ²À.Ó™ãíš$#xÍ®4Ï[ */
+	$"58DA 8F69 9604 4804 8682 B58C C1DA 1E21"            /* XÚ�i–.H.†‚µŒÁÚ.! */
+	$"0E4E F709 83E1 B335 F208 6565 C882 70A0"            /* .N÷ƃá³5ò.eeÈ‚p  */
+	$"2F58 5379 3999 7F2E E63D 81E4 C2EB 58E3"            /* /XSy9™..æ=�äÂëXã */
+	$"4605 35E7 76D7 C7D0 AEDA 26C5 8BB6 0F99"            /* F.5çv×ÇЮÚ&Å‹¶.™ */
+	$"77C0 D3D6 9870 8279 4C2E 29C6 518F 13E6"            /* wÀÓÖ˜p‚yL.)ÆQ�.æ */
+	$"1373 FCB8 FD55 3D8F 8322 F8F4 CD80 3C09"            /* .sü¸ýU=�ƒ"øôÍ€<Æ */
+	$"1496 931A E1BF 0AE6 2842 6FF7 6986 6AEE"            /* .–“.á¿Âæ(Bo÷i†jî */
+	$"1AE9 FF0A 947D E3F6 D93F B59B F6D5 5FB6"            /* .éÿ”}ãöÙ?µ›öÕ_¶ */
+	$"AAC7 EDD1 1FDB 5A5F 5549 7D55 2E1F B6A4"            /* ªÇíÑ.ÛZ_UI}U..¶¤ */
+	$"FDAA F7D4 DF7D 4E80 F173 72EC 2AD6 46CC"            /* ýª÷Ôß}N€ñsrì*ÖFÌ */
+	$"6653 9F8A F548 8CD9 F7CC 0758 DFBD 1976"            /* fSŸŠõHŒÙ÷Ì.Xß½.v */
+	$"0832 03BE 1A6C 242F 4978 025D 37A6 D46A"            /* .2.¾.l$/Ix.]7¦Ôj */
+	$"B859 037D 5250 D0D6 8FC0 4C05 AAAB 7F38"            /* ¸Y.}RPÐÖ�ÀL.ª«.8 */
+	$"799B 43F9 E370 D367 B412 8CC2 F941 E270"            /* y›CùãpÓg´.ŒÂùAâp */
+	$"A967 1978 577B 7A22 541A 7DDD A593 75E5"            /* ©g.xW{z"T.}Ý¥“uå */
+	$"6B05 D950 D953 DA5E 7EBF D5D3 4314 5006"            /* k.ÙPÙSÚ^~¿ÕÓC.P. */
+	$"8EC3 8474 6B41 83B3 7B16 9C95 721B 5405"            /* ŽÃ„tkAƒ³{.œ•r.T. */
+	$"F4AE A41F 92D8 56DA F2C9 4BF8 5B0A EBC6"            /* ô®¤.’ØVÚòÉKø[ÂëÆ */
+	$"29D5 F4F3 36B9 A6D7 3BC4 75D7 972C 7465"            /* )Õôó6¹¦×;Äu×—,te */
+	$"CCBE 21FA 6EAF 6B26 465B 4676 356D E640"            /* ̾!ún¯k&F[Fv5mæ@ */
+	$"04C3 0E39 C431 FBA5 2B53 E001 8F9D 37F5"            /* .Ã.9Ä1û¥+Sà.��7õ */
+	$"F289 EC84 85B8 5FC3 F74A 734B E0B1 ED8C"            /* ò‰ì„…¸_Ã÷JsKà±íŒ */
+	$"5DF4 6678 22E4 887C A45B 1478 DFC3 A9E9"            /* ]ôfx"äˆ|¤[.xßéé */
+	$"F234 5723 01B3 2685 2754 8133 8699 21C8"            /* ò4W#.³&…'T�3†™!È */
+	$"180A 27F8 174C FED5 8F71 4082 C4E8 DB83"            /* .Â'ø.LþÕ�q@‚ÄèÛƒ */
+	$"BDA4 4506 3FA4 5286 5D63 00F7 905D A740"            /* ½¤E.?¤R†]c.÷�]§@ */
+	$"5251 07FA 22F8 1334 FBA6 5640 7199 FA41"            /* RQ.ú"ø.4û¦V@q™úA */
+	$"A3C7 3CC1 ECF5 7F43 A9AE FBD5 C1F0 18B3"            /* £Ç<Áìõ.C©®ûÕÁð.³ */
+	$"7072 4809 0A4C 8127 6E10 5F7C 335C CC28"            /* prHÆÂL�'n._|3\Ì( */
+	$"B723 3D12 724D 3DE5 37B3 1C2A 136D 2258"            /* ·#=.rM=å7³.*.m"X */
+	$"DCE6 BFA4 0DAD FB6E 72C1 70F7 6D71 785D"            /* Ü濤.­ûnrÁp÷mqx] */
+	$"BC75 69CE CE3B CF7A 170E 8343 CBA9 DE66"            /* ¼uiÎÎ;Ïz..ƒCË©Þf */
+	$"06ED 779C AA9F F28D 943D 5E3E DEDE 4769"            /* .íwœªŸò�”=^>ÞÞGi */
+	$"289C 5523 9792 EFAC 19A6 A945 B504 9446"            /* (œU#—’ï¬.¦©Eµ.”F */
+	$"A4DF BAA6 B5EB BAEF 7B92 3E08 6D17 870F"            /* ¤ßº¦µëºï{’>.m.‡. */
+	$"9E0A 487E 8A60 90B5 E555 CD4F D2F1 FE67"            /* žÂH~Š`�µåUÍOÒñþg */
+	$"88DE BB6A E653 A2B6 F9C7 B226 2544 A167"            /* ˆÞ»jæS¢¶ùDz&%D¡g */
+	$"5DF7 5F35 F38B DB99 30F8 C210 AF41 C7A4"            /* ]÷_5ó‹Û™0øÂ.¯AǤ */
+	$"167B 30B4 8B8D 0821 4ADB EFC6 5728 A86D"            /* .{0´‹�.!JÛïÆW(¨m */
+	$"99A8 2A1D 51E2 4CE5 AEA5 7ECC 23CB 628B"            /* ™¨*.QâL宥~Ì#Ëb‹ */
+	$"E438 F41A A280 CF2E 8E51 5004 A9BA 64AB"            /* ä8ô.¢€Ï.ŽQP.©ºd« */
+	$"B0AA 608C 8C19 38F7 567B 0C45 B7C5 0E2D"            /* °ª`ŒŒ.8÷V{.E·Å.- */
+	$"0F3D A192 B0F5 A567 4EE1 9FF5 F085 979A"            /* .=¡’°õ¥gNáŸõð…—š */
+	$"13DA 6FC3 89D0 0370 C986 5F44 AADD CAB9"            /* .ÚoÉÐ.pɆ_DªÝʹ */
+	$"FBD0 8CDE 18D9 8FED 715E 264F 0D69 2CEF"            /* ûÐŒÞ.Ù�íq^&O.i,ï */
+	$"63F0 7A64 D65B 094A 6976 E6D4 E3DC 1583"            /* cðzdÖ[ÆJivæÔãÜ.ƒ */
+	$"FE8C BD22 992E 3FDB AF18 03A7 0A74 8333"            /* þŒ½"™.?Û¯..§Âtƒ3 */
+	$"76E3 5195 C7FA A180 5123 7E0C 544B 9C8C"            /* vãQ•Çú¡€Q#~.TKœŒ */
+	$"928D 3DF6 F330 4D6E 8049 11AF 064E 4E3B"            /* ’�=öó0Mn€I.¯.NN; */
+	$"B937 EE03 A4D2 F530 4513 47F0 5E98 E060"            /* ¹7î.¤Òõ0E.Gð^˜à` */
+	$"72C6 46EC B761 FAB4 B0FA 9A80 FF78 5408"            /* rÆFì·aú´°úš€ÿxT. */
+	$"9152 452E 0111 2383 5E5F 6C4F FC53 0EDE"            /* ‘RE...#ƒ^_lOüS.Þ */
+	$"1092 66D3 5F38 1AC8 1412 561A 4017 9110"            /* .’fÓ_8.È..V.@.‘. */
+	$"CA19 3E6F 8803 0908 5F57 A2E2 4744 E3C4"            /* Ê.>oˆ.Æ._W¢âGDãÄ */
+	$"F1BF 49F6 836F E294 610B 4098 2761 1502"            /* ñ¿Iöƒoâ”a.@˜'a.. */
+	$"CCB2 0C11 81DD 05B4 ACD8 8F28 C5DD 1DD8"            /* ̲..�Ý.´¬Ø�(ÅÝ.Ø */
+	$"58E0 C1E1 70A8 42BF 456F FE20 1261 1F81"            /* XàÁáp¨B¿Eoþ .a.� */
+	$"08AC FEB1 F89C 3576 EF94 A20C 255F 3B3F"            /* .¬þ±øœ5v.%_;? */
+	$"5E6B B0C0 4B3F EADC 8536 55E9 8144 C946"            /* ^k°ÀK?êÜ…6Ué�DÉF */
+	$"7613 8662 DCB1 C761 2BDA 412D C7D6 2D5C"            /* v.†bܱÇa+ÚA-ÇÖ-\ */
+	$"BCC0 F84E 54E4 9B0B BDF7 4F45 FCA6 D6AE"            /* ¼ÀøNTä›.½÷OEü¦Ö® */
+	$"1754 31D1 E6CB 94F4 D163 2B1D 017D 4171"            /* .T1ÑæË”ôÑc+..}Aq */
+	$"ABE0 0285 395D 3D23 42D7 E641 348A 0C2E"            /* «à.…9]=#B×æA4Š.. */
+	$"9C16 42C9 8E99 B654 8046 C365 EA71 CE64"            /* œ.BÉŽ™¶T€FÃeêqÎd */
+	$"B762 0E4D 7C48 617B CDB9 6264 2C81 4A9F"            /* ·b.M|Ha{͹bd,�JŸ */
+	$"8600 50B2 B985 EB73 DB96 82EA FF7D 1E50"            /* †.P²¹…ësÛ–‚êÿ}.P */
+	$"6A49 AEA3 78E3 2DFD 0D59 3013 F257 AAA9"            /* jI®£xã-ý.Y0.òWª© */
+	$"0E5D 81DA E983 8D48 41BE DF0B FB34 AEA5"            /* .]�Úéƒ�HA¾ß.û4®¥ */
+	$"07B6 B0AA 1E53 1D9F B9C7 4CE5 8D46 6151"            /* .¶°ª.S.Ÿ¹ÇLå�FaQ */
+	$"8000 0C24 1D66 1946 1073 4456 2361 E486"            /* €..$.f.F.sDV#aä† */
+	$"120F 29F0 6121 2D6A AF51 0C82 F68C B571"            /* ..)ða!-j¯Q.‚öŒµq */
+	$"77AD BE59 9145 D105 DE8C 9500 0000 0000"            /* w­¾Y‘EÑ.ÞŒ•..... */
+	$"0000 0032 BC9A BD52 00B4 6C6F 3753 1A96"            /* ...2¼š½R.´lo7S.– */
+	$"9B00 FCD3 F055 A11A AFB1 FB95 1610 88D0"            /* ›.üÓðU¡.¯±û•..ˆÐ */
+	$"8D32 9653 FC10 55FD B965 C1A9 B6BD 2245"            /* �2–Sü.Uý¹eÁ©¶½"E */
+	$"D48B 8230 2EF5 56F1 6618 9F91 FEC4 4106"            /* Ô‹‚0.õVñf.Ÿ‘þÄA. */
+	$"F23B 7C8A 0320 79EA D7A0 D75F 09BD B985"            /* ò;|Š. yê× ×_ƽ¹… */
+	$"C22B E2F0 0508 64BA AA2F 2414 19D7 311D"            /* Â+âð..dºª/$..×1. */
+	$"F709 E05C 809B 9E62 83F8 FF13 2DE3 01D6"            /* ÷Æà\€›žbƒøÿ.-ã.Ö */
+	$"8ADC F118 5A80 77C8 DABC 2FB5 CEF6 FCFB"            /* ŠÜñ.Z€wÈÚ¼/µÎöüû */
+	$"7A94 2773 6CEC FAE2 7865 753C E612 E4AF"            /* z”'slìúâxeu<æ.ä¯ */
+	$"657C 5C67 8FB3 1E56 A319 1ED1 FE48 0D8D"            /* e|\g�³.V£..ÑþH.� */
+	$"2431 B10B 8E15 0A4B FF7F 7EB8 D068 5015"            /* $1±.Ž.ÂKÿ.~¸ÐhP. */
+	$"151E C37C 0390 F6CC 64A8 0000 0000 0000"            /* ..Ã|.�öÌd¨...... */
+	$"0000 0002 5991 79E8 2B17 082C ABCB DA90"            /* ....Y‘yè+..,«ËÚ� */
+	$"CE92 8CB0 E992 0710 2B8F CAAB D217 C4E9"            /* Î’Œ°é’..+�Ê«Ò.Äé */
+	$"E55E 11D2 6200 B530 5EF4 6932 1CBF EA6C"            /* å^.Òb.µ0^ôi2.¿êl */
+	$"E58D 2AA9 68C2 89FF 7903 A6ED D674 F1FC"            /* å�*©h‰ÿy.¦íÖtñü */
+	$"A256 3564 F7E0 4DDF CDA1 2729 F7FF 6EB2"            /* ¢V5d÷àMßÍ¡')÷ÿn² */
+	$"9D35 70A9 5447 924B B8E1 71D3 4A8A DECB"            /* �5p©TG’K¸áqÓJŠÞË */
+	$"93E1 8FA0 140E C9B7 6124 8020 D660 3D22"            /* “á� ..É·a$€ Ö`=" */
+	$"C708 222E 7289 B890 0002 00E1 2BC6 84B9"            /* Ç.".r‰¸�...á+Æ„¹ */
+	$"25DF 442F 97FF 7FEF 68EC 7325 B92C A150"            /* %ßD/—ÿ.ïhìs%¹,¡P */
+	$"EE19 48C3 2540 0000 0000 0000 0000 0749"            /* î.HÃ%@.........I */
+	$"DD4A 9891 375B B0E0 C176 A698 672E F295"            /* ÝJ˜‘7[°àÁv¦˜g.ò• */
+	$"0311 7B3E 2B87 B4B8 7FB3 5DF7 9C67 CBEA"            /* ..{>+‡´¸.³]÷œgËê */
+	$"6A19 4107 C9F4 2B19 6829 179A 3FFF 7E8C"            /* j.A.Éô+.h).š?ÿ~Œ */
+	$"44A2 15E8 8E37 B422 F825 1862 58FF 7FFE"            /* D¢.èŽ7´"ø%.bXÿ.þ */
+	$"8EA1 D38C 727A 3071 1FF0 541F 6AB4 EA83"            /* Ž¡ÓŒrz0q.ðT.j´êƒ */
+	$"44A0 086A BAD7 6966 FC5D 0E72 A66C C301"            /* D .jº×ifü].r¦lÃ. */
+	$"3E1F B82C 9192 20D5 0322 858F 224C 87F5"            /* >.¸,‘’ Õ."…�"L‡õ */
+	$"E940 85ED 7B36 EC96 D05C 21FF 7B10 59E1"            /* é@…í{6ì–Ð\!ÿ{.Yá */
+	$"E125 6C79 7852 2031 F3BA 34FB 6E57 BC3B"            /* á%lyxR 1óº4ûnW¼; */
+	$"69F0 C303 3A2A A573 D1E0 9836 C703 D02C"            /* iðÃ.:*¥sÑà˜6Ç.Ð, */
+	$"58CC 3DA7 FF0D 4301 F607 07C1 31FA 7F66"            /* XÌ=§ÿ.C.ö..Á1ú.f */
+	$"89BD A759 90CD 107A E5BD 6398 D7BE F7BB"            /* ‰½§Y�Í.zå½c˜×¾÷» */
+	$"E273 D09A F8EE D21B 1015 A513 18F5 5C7D"            /* âsКøîÒ...¥..õ\} */
+	$"FD20 E7C9 C6BE 3105 7A4B 831D 251B 4C36"            /* ý çÉƾ1.zKƒ.%.L6 */
+	$"2A49 3EAC 1A86 9F87 09CC 0B00 2CF4 643C"            /* *I>¬.†Ÿ‡ÆÌ..,ôd< */
+	$"7012 8574 D28F 952D E959 1093 FE7E F021"            /* p.…tÒ�•-éY.“þ~ð! */
+	$"028C 74ED 0E90 8DCD 5F06 B4BE EA1A 4C53"            /* .Œtí.��Í_.´¾ê.LS */
+	$"A47F 3706 93CB 8FAB 7864 D123 4A39 B6BA"            /* ¤.7.“Ë�«xdÑ#J9¶º */
+	$"CDCB 8AA9 2128 54FA CFB5 C4E1 F470 AD6E"            /* ÍËŠ©!(TúϵÄáôp­n */
+	$"6A05 07C9 72AA 562E F22F C922 BCF9 7DDF"            /* j..ÉrªV.ò/É"¼ù}ß */
+	$"3565 1AD4 F707 7DC0 1038 129E 4EA0 297E"            /* 5e.Ô÷.}À.8.žN )~ */
+	$"1037 3516 64BB FF75 539A 5C03 F7A3 C14D"            /* .75.d»ÿuSš\.÷£ÁM */
+	$"C617 50C8 14F1 7C95 0372 1443 C3F0 7ED4"            /* Æ.PÈ.ñ|•.r.CÃð~Ô */
+	$"EFDA FA88 BDD2 E947 7A43 A4A3 2339 CD58"            /* ïÚúˆ½ÒéGzC¤£#9ÍX */
+	$"526C 8407 8211 1949 6431 DB89 390B EB27"            /* Rl„.‚..Id1Û‰9.ë' */
+	$"9975 F04F D507 AC80 5D51 95B0 992A 1AC6"            /* ™uðOÕ.¬€]Q•°™*.Æ */
+	$"8699 86CC E64E 441C 2EFD 4F8C 70C1 DB2A"            /* †™†ÌæND..ýOŒpÁÛ* */
+	$"5395 8DF7 E279 AA65 BA32 2FD1 48C9 F400"            /* S•�÷âyªeº2/ÑHÉô. */
+	$"D0EA 663D 92FF 053E 130C A1A9 491B E583"            /* Ðêf=’ÿ.>..¡©I.åƒ */
+	$"6133 2EE1 AFBE 86B8 D218 B698 906D A5B9"            /* a3.᯾†¸Ò.¶˜�m¥¹ */
+	$"ACD3 9DC7 8720 C668 E134 1A1C 9C71 EA49"            /* ¬Ó�LJ Æhá4..œqêI */
+	$"7AE9 9276 56E9 78BB 5679 18E2 6044 2763"            /* zé’vVéx»Vy.â`D'c */
+	$"2342 64F4 3952 2712 F704 B2E8 C1D2 35CC"            /* #Bdô9R'.÷.²èÁÒ5Ì */
+	$"F0AB 5ABD 61A0 1CD5 5316 0E78 22E6 B807"            /* ð«Z½a .ÕS..x"æ¸. */
+	$"8774 CA36 91EF 0BFF D969 6330 3900 00D1"            /* ‡tÊ6‘ï.ÿÙic09..Ñ */
+	$"2300 0000 0C6A 5020 200D 0A87 0A00 0000"            /* #....jP  .‡Â... */
+	$"1466 7479 706A 7032 2000 0000 006A 7032"            /* .ftypjp2 ....jp2 */
+	$"2000 0000 4F6A 7032 6800 0000 1669 6864"            /*  ...Ojp2h....ihd */
+	$"7200 0002 0000 0002 0000 0407 0701 0000"            /* r............... */
+	$"0000 0F63 6F6C 7201 0000 0000 0010 0000"            /* ...colr......... */
+	$"0022 6364 6566 0004 0000 0000 0001 0003"            /* ."cdef.......... */
+	$"0001 0000 0001 0000 0002 0002 0000 0003"            /* ................ */
+	$"0000 0000 6A70 3263 FF4F FF51 0032 0000"            /* ....jp2cÿOÿQ.2.. */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0004 0701 0107 0101 0701 0107 0101 FF52"            /* ..............ÿR */
+	$"000C 0000 0001 0105 0404 0001 FF5C 0013"            /* ............ÿ\.. */
+	$"2050 5858 6058 5860 5858 6058 5858 5050"            /*  PXX`XX`XX`XXXPP */
+	$"58FF 6400 1100 014B 616B 6164 752D 7635"            /* Xÿd....Kakadu-v5 */
+	$"2E32 2E31 FF90 000A 0000 0000 D036 0001"            /* .2.1ÿ�.Â....Ð6.. */
+	$"FF93 CFC2 DC03 54F9 36EC A8DC 2A8C 3701"            /* ÿ“ÏÂÜ.Tù6ì¨Ü*Œ7. */
+	$"118B 95C3 F2B2 5A7A 0428 C30A 2C64 B704"            /* .‹•Ãò²Zz.(ÃÂ,d·. */
+	$"5C3C 6DED 8696 4890 6404 5638 430C 59C5"            /* \<m톖H�d.V8C.YŠ*/
+	$"D913 B06B 0B08 E00E 1802 6D82 7225 E695"            /* Ù.°k..à...m‚r%æ• */
+	$"9F1E E7B0 D1DF 323C 61DC 1F25 E3FF 83E2"            /* Ÿ.ç°Ñß2<aÜ.%ãÿƒâ */
+	$"A49A DED4 4495 A948 5B70 9E5A 01F1 2431"            /* ¤šÞÔD•©H[pžZ.ñ$1 */
+	$"8EE5 2B54 2863 9041 FAE9 9E9F 1B85 E206"            /* Žå+T(c�Aú鞟.…â. */
+	$"4104 106C 5027 632A 8716 C3A5 F047 B3D5"            /* A..lP'c*‡.Ã¥ðG³Õ */
+	$"EE2B 19CD 2B75 17D8 DFB6 E2BF 491E A41F"            /* î+.Í+u.Ø߶â¿I.¤. */
+	$"BC48 3493 DEFB 453D 64DE DEA0 68DB EF5B"            /* ¼H4“ÞûE=dÞÞ hÛï[ */
+	$"1E69 8F3F C55C 1FF6 1823 1543 F483 DF20"            /* .i�?Å\.ö.#.Côƒß  */
+	$"F5B4 08F4 5D20 4DF0 7D7D 2007 2ACA 5B5E"            /* õ´.ô] Mð}} .*Ê[^ */
+	$"159F EF4A 505D 811D A8A3 5476 5539 B45B"            /* .ŸïJP]�.¨£TvU9´[ */
+	$"3113 1AC7 00F3 F1A7 E9E3 9E88 5D91 6CD5"            /* 1..Ç.óñ§é㞈]‘lÕ */
+	$"2CC0 F92B 2063 FF29 4B0E 775A 06EE 75CC"            /* ,Àù+ cÿ)K.wZ.îuÌ */
+	$"DA54 AC2F B72D 1C25 1E46 A4F8 C3E1 7D8D"            /* ÚT¬/·-.%.F¤øÃá}� */
+	$"85AE BBE6 3DBE EC4A 35F7 3B36 1FBF BC38"            /* …®»æ=¾ìJ5÷;6.¿¼8 */
+	$"2DC1 785C D644 2BED AB51 1950 2643 8730"            /* -Áx\ÖD+í«Q.P&C‡0 */
+	$"2AE9 E4EB 1B8E 8F90 BA0C FF2F 6F65 5F28"            /* *éäë.Ž��º.ÿ/oe_( */
+	$"1A3F 9398 FF20 01A2 69A0 02C9 8D1B C3EA"            /* .?“˜ÿ .¢i .É�.Ãê */
+	$"A600 6417 3CA3 9E84 93EF 063D 59DC 702C"            /* ¦.d.<£ž„“ï.=YÜp, */
+	$"959D C3A6 B1ED DEF1 F321 5BA6 FCCD 7762"            /* •�æ±íÞñó![¦üÍwb */
+	$"6C23 7398 AA59 4BBA 0052 B8A7 0608 1AAC"            /* l#s˜ªYKº.R¸§...¬ */
+	$"5B2E AF60 17F4 278E 6433 6F75 7839 CED2"            /* [.¯`.ô'Žd3oux9ÎÒ */
+	$"F32E 5D7D 9D40 B145 4CFB A25C D8D7 4BCB"            /* ó.]}�@±ELû¢\Ø×KË */
+	$"956D 88DD 4B92 64BF 4CD4 AFD5 6E56 9859"            /* •mˆÝK’d¿LÔ¯ÕnV˜Y */
+	$"ABEF BB40 AD0E 6E1F 9B3B 16A3 D9D3 58DF"            /* «ï»@­.n.›;.£ÙÓXß */
+	$"584E C303 1DAD D18B 6082 9C29 88EB 5163"            /* XNÃ..­Ñ‹`‚œ)ˆëQc */
+	$"A42D 061A 1570 64A9 0F1C E00D 56D9 E0CB"            /* ¤-...pd©..à.VÙàË */
+	$"7C66 799C 8EB4 BFCA CF5C CFC2 B611 4F0C"            /* |fyœŽ´¿ÊÏ\϶.O. */
+	$"AFDE 008C 3580 A270 0C1A 3737 50A1 9A89"            /* ¯Þ.Œ5€¢p..77P¡š‰ */
+	$"2546 BB2C 62A0 57BE 59CB C00A 1EE9 0F1D"            /* %F»,b W¾YËÀÂ.é.. */
+	$"C528 40D4 EA69 D281 AED4 B078 F27A 0B42"            /* Å(@ÔêiÒ�®Ô°xòz.B */
+	$"7AD2 DADD 146B 7FFF 223D 6A74 2041 4FCF"            /* zÒÚÝ.k.ÿ"=jt AOÏ */
+	$"46E1 60C8 9ABE 841E E18D 1712 DB6D 902B"            /* Fá`Èš¾„.á�..Ûm�+ */
+	$"7BE6 56DA 7E4B 1704 A373 2802 B120 0184"            /* {æVÚ~K..£s(.± .„ */
+	$"0681 4499 2739 CE73 9CE8 99D8 C352 337C"            /* .�D™'9Îsœè™ØÃR3| */
+	$"06AB BB71 6257 16EF B535 4972 8C2F 2EE0"            /* .«»qbW.ïµ5IrŒ/.à */
+	$"85CC 8431 D867 47EE CC43 6E87 A485 2316"            /* …Ì„1ØgGîÌCn‡¤…#. */
+	$"4927 AE22 C12D 49CE 739C E61C 97D0 99CC"            /* I'®"Á-IÎsœæ.—Ð™Ì */
+	$"3DC5 F26B 1A31 E742 3E56 464B 2944 108E"            /* =Åòk.1çB>VFK)D.Ž */
+	$"CB0C F4C7 E144 47E1 47C1 F6BD 8089 21DB"            /* Ë.ôÇáDGáGÁö½€‰!Û */
+	$"8279 4533 01BF B9CC C444 AD53 5F75 D706"            /* ‚yE3.¿¹ÌÄD­S_u×. */
+	$"3FDD CA27 5D6C 9F54 1CCF F838 38E4 B2E4"            /* ?ÝÊ']lŸT.Ïø88ä²ä */
+	$"F9FF 429F 59FE D27B 4A5E A69F 2C21 38F6"            /* ùÿBŸYþÒ{J^¦Ÿ,!8ö */
+	$"5A74 D405 2FEE 50B8 E5F1 C489 2693 5B33"            /* ZtÔ./îP¸åñĉ&“[3 */
+	$"D2C2 9DEC 68ED F55C 1FAC 1401 8D66 795A"            /* ÒÂ�ìhíõ\.¬..�fyZ */
+	$"F5F3 27A3 5874 6681 9AC6 F41D A4E6 40DA"            /* õó'£Xtf�šÆô.¤æ@Ú */
+	$"3EE5 CCEE 340C AF72 87FD 6B2A EB94 88EC"            /* >åÌî4.¯r‡ýk*딈ì */
+	$"A61D A536 7AC2 C6B8 85D9 CEBD 146C 83B5"            /* ¦.¥6zÂƸ…Ùν.lƒµ */
+	$"F5E0 A3C7 B524 BC64 B6B5 91A6 BF91 C547"            /* õà£Çµ$¼d¶µ‘¦¿‘ÅG */
+	$"BD87 811F D58E 8E51 BB89 FA6C 5257 33D9"            /* ½‡�.ÕŽŽQ»‰úlRW3Ù */
+	$"A964 A4AB 3BB9 9608 BECC 0D9C D6B9 3D3A"            /* ©d¤«;¹–.¾Ì.œÖ¹=: */
+	$"CB64 28BE 3B07 6318 DF9D C134 9F16 567A"            /* Ëd(¾;.c.ß�Á4Ÿ.Vz */
+	$"8127 5FFD F396 BA0C B86F AA17 2301 022A"            /* �'_ýó–º.¸oª.#..* */
+	$"3742 CE95 B1AF F858 C503 8156 35E0 8F2C"            /* 7BΕ±¯øXÅ.�V5à�, */
+	$"67D7 2D41 1F0B 5284 1535 AF16 6540 FB65"            /* g×-A..R„.5¯.e@ûe */
+	$"65BC 5F6B 136D 73A5 1C5D 3D92 FF5F 8494"            /* e¼_k.ms¥.]=’ÿ_„” */
+	$"FDBF E0C5 821F 072A 0EEB B855 6B42 CEE8"            /* ý¿àÅ‚..*.ë¸UkBÎè */
+	$"ABEE 381E 894E DF1E 29DD 4B78 3F0A F5EB"            /* «î8.‰Nß.)ÝKx?Âõë */
+	$"B9F8 61B8 8266 3BD8 A2AC 5BC1 38F4 5098"            /* ¹øa¸‚f;Ø¢¬[Á8ôP˜ */
+	$"3951 2437 1798 7BF9 EA00 12BF CF3E 9166"            /* 9Q$7.˜{ùê..¿Ï>‘f */
+	$"8253 6FF0 B942 70D7 C729 0866 33F7 3484"            /* ‚Soð¹Bp×Ç).f3÷4„ */
+	$"ADF8 C3D2 4EF6 1DF4 0E6F 8E64 B470 1D5E"            /* ­øÃÒNö.ô.oŽd´p.^ */
+	$"F311 9BD1 EDE1 BA5D 7601 2053 D70A FDCD"            /* ó.›Ñíáº]v. S×ÂýÍ */
+	$"82C0 1BDA A35C FAD2 67AD E569 7851 10A7"            /* ‚À.Ú£\úÒg­åixQ.§ */
+	$"EF9A 3533 EC03 E813 08B6 D984 1A1D 3DC0"            /* ïš53ì.è..¶Ù„..=À */
+	$"7C8E E03E 4A44 03E4 7894 FF1F 080E 2BFD"            /* |Žà>JD.äx”ÿ...+ý */
+	$"EEB4 E64A C757 389B 5780 3AF8 248C 580D"            /* î´æJÇW8›W€:ø$ŒX. */
+	$"461B D417 66BA CEB2 2042 3C84 DAF9 C127"            /* F.Ô.fºÎ² B<„ÚùÁ' */
+	$"63E9 168C A9E3 D418 61E8 C46C CF01 F59B"            /* cé.Œ©ãÔ.aèÄlÏ.õ› */
+	$"4518 8833 3E62 5B14 BFD1 41A8 45D6 D311"            /* E.ˆ3>b[.¿ÑA¨EÖÓ. */
+	$"8431 80DB 1FD5 5839 DE81 BCD9 EAFB EE26"            /* „1€Û.ÕX9Þ�¼Ùêûî& */
+	$"33DD 9E73 0B6F F957 26EE E7BA E0DA FF22"            /* 3Ýžs.oùW&îçºàÚÿ" */
+	$"EA50 24BF A182 089D 749A 6AAF BFF2 224D"            /* êP$¿¡‚.�tšj¯¿ò"M */
+	$"30D4 11D0 E07A A012 587A 0633 92B4 CBFC"            /* 0Ô.Ðàz .Xz.3’´Ëü */
+	$"8E1B E5AC 9025 A74D 2819 3F9D 8132 B795"            /* Ž.å¬�%§M(.?��2·• */
+	$"458E 4651 1589 158D D24C A5B0 CBFA 359E"            /* EŽFQ.‰.�ÒL¥°Ëú5ž */
+	$"BDB0 E4FB BFE3 5854 3E88 A646 71B1 9CB2"            /* ½°äû¿ãXT>ˆ¦Fq±œ² */
+	$"BB4E BA8E E170 8CBF C1F5 3141 F537 C0FA"            /* »NºŽápŒ¿Áõ1Aõ7Àú */
+	$"9780 6448 BA3B 94D6 3E8B 7AF0 0B5A C7A2"            /* —€dHº;”Ö>‹zð.ZÇ¢ */
+	$"4D05 C6BB 7F47 7102 F66E E4E8 3681 1C97"            /* M.Æ».Gq.önäè6�.— */
+	$"0996 4491 F713 2A24 3756 2715 4B55 762F"            /* Æ–D‘÷.*$7V'.KUv/ */
+	$"78CB 2608 0563 73F7 5626 9F35 0C54 6822"            /* xË&..cs÷V&Ÿ5.Th" */
+	$"F061 792A 4AFC 163A 9F83 8F82 638B 524D"            /* ðay*Jü.:Ÿƒ�‚c‹RM */
+	$"C21C 3735 DB76 6F4B 01F2 3E7E 5755 5945"            /* Â.75ÛvoK.ò>~WUYE */
+	$"6149 AAEE 1A88 7748 DC47 79E4 0660 318C"            /* aIªî.ˆwHÜGyä.`1Œ */
+	$"AA94 E92D 9879 C9C1 AC17 C828 7BBB 997A"            /* ª”é-˜yÉÁ¬.È({»™z */
+	$"315E 858F F31D 3522 A6D2 B3BD E548 DBA2"            /* 1^…�ó.5"¦Ò³½åHÛ¢ */
+	$"3274 749B 11C1 9570 D715 0350 4CC4 6820"            /* 2tt›.Á•p×..PLÄh  */
+	$"560A 8542 A38D 913B 3863 FF5C 97F2 9BA5"            /* VÂ…B£�‘;8cÿ\—ò›¥ */
+	$"893F 6C9B 15A2 EE40 BCD6 2676 80A9 AC89"            /* ‰?l›.¢î@¼Ö&v€©¬‰ */
+	$"9054 849D 859C 8DCD 181B 64F4 6D7B 71B4"            /* �T„�…œ�Í..dôm{q´ */
+	$"FBD3 0C84 21D4 CC6C CF84 F40A A3CD C958"            /* ûÓ.„!ÔÌlÏ„ô£ÍÉX */
+	$"928E 97E5 346C 6497 2888 7903 5B0B 3277"            /* ’Ž—å4ld—(ˆy.[.2w */
+	$"B4D6 9AA4 86C3 C691 CA1A 3C92 FCFB 02DE"            /* ´Öš¤†ÃÆ‘Ê.<’üû.Þ */
+	$"A25E 5C5C C6A8 1CE2 F5B5 88AB 3673 F912"            /* ¢^\\ƨ.âõµˆ«6sù. */
+	$"96AF E6BC 67FF 40CC 068D C6E3 8435 48AF"            /* –¯æ¼gÿ@Ì.�Æã„5H¯ */
+	$"B929 F509 0F59 3410 A9A6 1087 8352 11EC"            /* ¹)õÆ.Y4.©¦.‡ƒR.ì */
+	$"23CF CD2E 3F05 487E 0740 9BE7 236F 56FB"            /* #ÏÍ.?.H~.@›ç#oVû */
+	$"D0F4 677F 9514 C6E9 50BB A61A 6135 73FB"            /* Ðôg.•.ÆéP»¦.a5sû */
+	$"37AA FA5C 0967 671C 8485 5326 6EB5 4955"            /* 7ªú\Ægg.„…S&nµIU */
+	$"1AAE 5FCE C271 D992 9E8C B0DF 7795 E0F2"            /* .®_ÎÂqÙ’žŒ°ßw•àò */
+	$"A17A B50F E53A FE12 756F D1A1 5CE1 7C9B"            /* ¡zµ.å:þ.uoÑ¡\á|› */
+	$"D185 2C1A 9224 BC62 5C98 FA35 1649 6EA7"            /* Ñ…,.’$¼b\˜ú5.In§ */
+	$"4C7C C191 DF92 9D7A 6FE9 71D9 9A11 5A19"            /* L|Á‘ß’�zoéqÙš.Z. */
+	$"214D F951 38FA C459 E39A 6DAE 1253 31DF"            /* !MùQ8úÄYãšm®.S1ß */
+	$"B335 3337 39D2 7591 BFC1 31E6 887A 8BAB"            /* ³5379Òu‘¿Á1æˆz‹« */
+	$"ECCD 7A58 8E4A AD65 A7E1 5FC6 8EB0 DA82"            /* ìÍzXŽJ­e§á_ÆŽ°Ú‚ */
+	$"0F81 6849 5CE5 AB32 B763 1227 3F4C 5691"            /* .�hI\å«2·c.'?LV‘ */
+	$"43C7 DD24 E8D9 C4F3 7BB0 4666 7A24 1C5B"            /* CÇÝ$èÙÄó{°Ffz$.[ */
+	$"F57D 719F 2BDB 3794 66BA BBB6 9D8D A662"            /* õ}qŸ+Û7”fº»¶��¦b */
+	$"CF99 4DDC E533 96D6 EEE0 3FC7 BFB8 B1B7"            /* Ï™MÜå3–Öîà?Ç¿¸±· */
+	$"9AE3 57C7 E1A8 B1F8 6C5C 3F0D 19C1 812D"            /* šãWÇᨱøl\?..Á�- */
+	$"8D31 C88B C396 B5E7 3CE0 4E2C AE73 7876"            /* �1ȋÖµç<àN,®sxv */
+	$"0436 A295 BEC6 BDF1 C604 C41C 94E6 E7C1"            /* .6¢•¾Æ½ñÆ.Ä.”æçÁ */
+	$"AC78 356A B92A DB37 3360 3372 6638 0C5C"            /* ¬x5j¹*Û73`3rf8.\ */
+	$"F388 7CDE 4045 060F E713 C4C3 321E E08B"            /* óˆ|Þ@E..ç.ÄÃ2.à‹ */
+	$"0810 71EE A6AB C032 2B85 C34C 2671 8143"            /* ..qÀ2+…ÃL&q�C */
+	$"AFDE 07D1 A40C D86A ADBE B961 EAA3 54BD"            /* ¯Þ.Ѥ.Øj­¾¹aê£T½ */
+	$"804D 6FA9 AA3F 7FBE BCD9 E785 A230 EA4E"            /* €Mo©ª?.¾¼Ùç…¢0êN */
+	$"1C08 1DF6 8373 7754 5039 7854 1192 1512"            /* ...öƒswTP9xT.’.. */
+	$"B956 E9A7 575E E3DB F5F9 4B02 F739 F2BB"            /* ¹Vé§W^ãÛõùK.÷9ò» */
+	$"91B2 73E1 3D19 EBB6 AD2F 291C 5BAC 5EEA"            /* ‘²sá=.붭/).[¬^ê */
+	$"EEDF 8DA7 5FCA 8E8C 952D 8FD0 441C 5BA4"            /* îß�§_ÊŽŒ•-�ÐD.[¤ */
+	$"8AF6 21BE 1FAF DAE3 DADD EA91 EF73 58A0"            /* Šö!¾.¯ÚãÚÝê‘ïsX  */
+	$"29E6 89B2 E279 B02A D092 DD08 6187 9095"            /* )扲ây°*Ð’Ý.a‡�• */
+	$"5C85 C903 0DD2 9ED3 538B D9BB E936 8ABB"            /* \…É..ÒžÓS‹Ù»é6Š» */
+	$"E203 DD03 2944 5317 7BC3 0297 2125 F198"            /* â.Ý.)DS.{Ã.—!%ñ˜ */
+	$"D117 8DDB E382 71F8 D0A7 14B1 6D7A A0EB"            /* Ñ.�Ûã‚qøЧ.±mz ë */
+	$"7C6F 7651 D2EC ECA7 F670 D09F 6CF6 30DB"            /* |ovQÒìì§öpПlö0Û */
+	$"0830 39B5 BC45 3915 4054 4490 A7BA 5CEC"            /* .09µ¼E9.@TD�§º\ì */
+	$"D37B FBC2 7890 B18F DEEA 4966 D46D 5FD2"            /* Ó{ûÂx�±�ÞêIfÔm_Ò */
+	$"7811 AAD0 8EBF FB40 0F30 D8A4 2B71 5A03"            /* x.ªÐŽ¿û@.0ؤ+qZ. */
+	$"636A C360 C889 891D D420 A828 E337 41CC"            /* cjÃ`ȉ‰.Ô ¨(ã7AÌ */
+	$"3314 5473 B91F 7B78 2B3B AC7A 1127 F2DE"            /* 3.Ts¹.{x+;¬z.'òÞ */
+	$"E997 2101 6008 26AE 43D5 7CE7 8532 B9CE"            /* é—!.`.&®CÕ|ç…2¹Î */
+	$"A81A 710E 5D87 49D7 3EF6 65A3 D533 977E"            /* ¨.q.]‡I×>öe£Õ3—~ */
+	$"7BE9 0CA7 8B28 9ADA AF4F 45A5 99BD E21D"            /* {é.§‹(šÚ¯OE¥™½â. */
+	$"D4B1 BB33 2508 C8D1 31E5 E9FB F917 A8E1"            /* Ô±»3%.ÈÑ1åéûù.¨á */
+	$"2955 9008 F531 9010 575A 3AFB 59F4 CD63"            /* )U�.õ1�.WZ:ûYôÍc */
+	$"3EEE 2409 BCD4 E5F1 1418 6155 B6D7 A94B"            /* >î$ƼÔåñ..aU¶×©K */
+	$"1D48 79A8 2F32 0770 476B CE28 023A DC86"            /* .Hy¨/2.pGkÎ(.:܆ */
+	$"E008 813B E64A 39F5 58CE 3E75 DAA6 BD7A"            /* à.�;æJ9õXÎ>uÚ¦½z */
+	$"1528 FF50 0738 C132 5569 3C99 C4BC A20F"            /* .(ÿP.8Á2Ui<™Ä¼¢. */
+	$"6DED 9310 6FE1 8BE4 BF4D D0B1 993E 0FD3"            /* mí“.oá‹ä¿Mб™>.Ó */
+	$"4938 1302 E4A8 FDA2 A7D2 4615 CD89 1E52"            /* I8..ä¨ý¢§ÒF.͉.R */
+	$"4160 51F8 BABB FEED 4281 0E0C 31CD 91D7"            /* A`Qøº»þíB�..1Í‘× */
+	$"C7CF E302 E155 4188 0F06 097F 6906 2EC9"            /* ÇÏã.áUAˆ..Æ.i..É */
+	$"BE00 A1FB 0D99 8FB1 3B3D E3D3 70B8 4296"            /* ¾.¡û.™�±;=ãÓp¸B– */
+	$"F199 E066 15B5 920C 38A2 695F F2E8 81E1"            /* ñ™àf.µ’.8¢i_òè�á */
+	$"E0EC 34E5 97B3 9580 459F A2D9 E267 B847"            /* àì4å—³•€EŸ¢Ùâg¸G */
+	$"E302 3AA0 8631 8C61 5F8E 88DE 2FBB 394B"            /* ã.: †1Œa_ŽˆÞ/»9K */
+	$"B9EC 234B 6515 BDF3 BA80 AA30 3D50 2F90"            /* ¹ì#Ke.½óº€ª0=P/� */
+	$"C26A D743 2198 707A 2DC1 9C64 1647 1FA3"            /* Âj×C!˜pz-Áœd.G.£ */
+	$"43A2 B1C7 C95D 1E19 9650 E616 F24B C118"            /* C¢±ÇÉ]..–Pæ.òKÁ. */
+	$"FB68 CE23 485E BF50 ACF8 F669 B5A3 92AA"            /* ûhÎ#H^¿P¬øöiµ£’ª */
+	$"5625 BF48 8584 A6E7 DAC0 E203 2AF0 89A0"            /* V%¿H…„¦çÚÀâ.*ð‰  */
+	$"DB92 4924 9249 1BF5 D855 0470 51D0 AAE2"            /* Û’I$’I.õØU.pQЪâ */
+	$"A1E5 FBC9 CB80 1798 2EB3 EB1E 9FD4 46E7"            /* ¡åûÉË€.˜.³ë.ŸÔFç */
+	$"63DB F02E 204B D35F 54DE 0FD3 2F81 FB63"            /* cÛð. KÓ_TÞ.Ó/�ûc */
+	$"9CEC 37F1 C9FF 5B63 B13D BFBD 1169 0415"            /* œì7ñÉÿ[c±=¿½.i.. */
+	$"0E97 DA89 25E3 92C7 01F5 50E6 2181 A536"            /* .—Ú‰%ã’Ç.õPæ!�¥6 */
+	$"4020 C49B 1977 1BF5 5226 FD7D 668A D76F"            /* @ Ä›.w.õR&ý}fŠ×o */
+	$"2954 58F1 F44F 2935 F136 18BD C844 05FD"            /* )TXñôO)5ñ6.½ÈD.ý */
+	$"E325 9012 9E92 6EC3 E822 D06F A958 C54C"            /* ã%�.ž’nÃè"Ðo©XÅL */
+	$"6A4D 0A98 093C 481D 1424 7964 E810 7A60"            /* jM˜Æ<H..$ydè.z` */
+	$"F2C0 8287 A7F4 B307 FBDF 2550 567E 01EA"            /* òÀ‚‡§ô³.ûß%PV~.ê */
+	$"2C45 4614 9A0A 04E8 397B 3DEC 6CDA CA95"            /* ,EF.šÂ.è9{=ìlÚÊ• */
+	$"B754 699A FF29 B46B D6E3 BB8C 153C AEC0"            /* ·Tišÿ)´kÖ㻌.<®À */
+	$"BEFF 46AD 744B B945 4C07 F7F7 178D 059E"            /* ¾ÿF­tK¹EL.÷÷.�.ž */
+	$"2E80 10C4 6DD6 F19E B649 73D6 8C57 7A6C"            /* .€.ÄmÖñž¶IsÖŒWzl */
+	$"45DE 3D43 22DE C54A DFCD 64EA 9D77 1AC6"            /* EÞ=C"ÞÅJßÍdê�w.Æ */
+	$"E15E A9A7 0D83 D53C 100B EC25 2B93 1D27"            /* á^©§.ƒÕ<..ì%+“.' */
+	$"367A 864E D9C4 F0B9 DF5C 538D B2C0 24EE"            /* 6z†NÙÄð¹ß\S�²À$î */
+	$"46E7 424C 2127 6BED B492 3354 86C9 D855"            /* FçBL!'kí´’3T†ÉØU */
+	$"317B 6BE2 8205 C07C 9A42 03E4 D6B0 0F93"            /* 1{kâ‚.À|šB.äÖ°.“ */
+	$"4400 AFF0 AE8C D6D6 6729 AEBE 9CDE 5C69"            /* D.¯ð®ŒÖÖg)®¾œÞ\i */
+	$"D95C 01A0 28AF 1E57 B12C CA6D F010 ED89"            /* Ù\. (¯.W±,Êmð.í‰ */
+	$"4C46 38AA BAFC D67E 9E98 C6CA 85E4 433E"            /* LF8ªºüÖ~ž˜ÆÊ…äC> */
+	$"C450 03B7 E8DE 17B3 9CE7 02E1 BE72 100B"            /* ÄP.·èÞ.³œç.á¾r.. */
+	$"2EF5 787D 0D12 FC3B 855A 3F97 1850 05EF"            /* .õx}..ü;…Z?—.P.ï */
+	$"A05D 7CC2 405B BA6D 9175 7C99 BE1C 2370"            /*  ]|Â@[ºm‘u|™¾.#p */
+	$"1F57 2085 13F8 B672 728D 1152 8232 1EE4"            /* .W ….ø¶rr�.R‚2.ä */
+	$"A666 BFD0 06A8 6CFF 3D73 D895 5968 A54A"            /* ¦f¿Ð.¨lÿ=sØ•Yh¥J */
+	$"3219 63AB D4CD 8E7D 52F3 D260 CE4D E329"            /* 2.c«ÔÍŽ}RóÒ`ÎMã) */
+	$"F554 C837 34CC 2866 FA1E 1F34 B209 B8C3"            /* õTÈ74Ì(fú..4²Æ¸Ã */
+	$"097B 8DBC 8788 F621 2A57 5468 5FD8 852B"            /* Æ{�¼‡ˆö!*WTh_Ø…+ */
+	$"08A9 45F3 71A8 A26B F63C 2DB1 750F A833"            /* .©Eóq¨¢kö<-±u.¨3 */
+	$"4767 6D8A B551 FF10 9E54 AD5D EE2E 2207"            /* GgmŠµQÿ.žT­]î.". */
+	$"44EA 0D21 75D4 779D E96D 49FF 47CE D775"            /* Dê.!uÔw�émIÿGÎ×u */
+	$"D7B0 2380 5F1C 4185 EF0B BECB 1A55 9696"            /* ×°#€_.A…ï.¾Ë.U–– */
+	$"81B8 94F2 4F5B 07D8 D5EC 9E2A 049D 5E87"            /* �¸”òO[.ØÕìž*.�^‡ */
+	$"2601 FB44 4AD5 C57B A7B0 8088 B723 134E"            /* &.ûDJÕÅ{§°€ˆ·#.N */
+	$"0B8A 375E B972 F34F F25A 2B68 3F15 4496"            /* .Š7^¹róOòZ+h?.D– */
+	$"5734 FE10 D742 67F9 9FFF 639C FAFD 23DB"            /* W4þ.×BgùŸÿcœúý#Û */
+	$"B90C F402 17F0 81C6 2656 EFD0 E011 C866"            /* ¹.ô..ð�Æ&VïÐà.Èf */
+	$"15C8 4927 3415 BEC1 7876 E693 74CB DBEA"            /* .ÈI'4.¾Áxvæ“tËÛê */
+	$"7206 2246 23EC DCCA 51CD 72C1 8C41 1B85"            /* r."F#ìÜÊQÍrÁŒA.… */
+	$"AE9B 6FA5 4286 03FB 7000 D94F 5A8B 8A85"            /* ®›o¥B†.ûp.ÙOZ‹Š… */
+	$"2F34 7575 E7AB 08FF 3CBD 328D D95D BDF5"            /* /4uuç«.ÿ<½2�Ù]½õ */
+	$"8070 0FAD B573 A91E 5F83 D32D 3337 A5B7"            /* €p.­µs©._ƒÓ-37¥· */
+	$"C6A7 3048 8D7C 3F01 F6BF 1BAB D684 0585"            /* Ƨ0H�|?.ö¿.«Ö„.… */
+	$"798A A28D 68A6 4993 22BC F35C E3A7 BABE"            /* yŠ¢�h¦I“"¼ó\㧺¾ */
+	$"0D5B 7E43 2B91 5DA6 6821 0495 4B22 33C0"            /* .[~C+‘]¦h!.•K"3À */
+	$"1217 1302 A7EB 1093 C8BD 3622 F0FD 14C3"            /* ....§ë.“Ƚ6"ðý.à */
+	$"EDBA 60FA B4C2 07D5 6D80 C177 9C23 24FE"            /* íº`ú´Â.Õm€Áwœ#$þ */
+	$"C9E7 77A7 1945 4C1A 8945 129A 2581 498D"            /* Éçw§.EL.‰E.š%�I� */
+	$"F2BD 5AD6 EF89 4D80 3EC2 DA29 E093 A726"            /* ò½ZÖï‰M€>ÂÚ)à“§& */
+	$"88F1 0796 E9F0 8F36 D342 7AD3 DEC2 2CCA"            /* ˆñ.–éð�6ÓBzÓÞÂ,Ê */
+	$"45B9 35A0 DE31 D18B 2954 C38C 4B3A EEA2"            /* E¹5 Þ1Ñ‹)TÃŒK:î¢ */
+	$"5CD5 333D 6C59 23C7 17B3 C98C 65EE 8117"            /* \Õ3=lY#Ç.³ÉŒeî�. */
+	$"22A2 574D D223 581B D09B 6473 3F85 6E2A"            /* "¢WMÒ#X.Лds?…n* */
+	$"81B5 F600 CAB6 1A02 3B24 D726 4344 536F"            /* �µö.ʶ..;$×&CDSo */
+	$"99AB 09C8 96EA B41B 01C9 7AC8 9478 B8AB"            /* ™«ÆÈ–ê´..ÉzÈ”x¸« */
+	$"69E3 1BF1 1100 AFF3 C59C 01FB 8EF9 047D"            /* iã.ñ..¯óÅœ.ûŽù.} */
+	$"21EF 11DE D2CA BEE2 8372 5DDB C39C DE6E"            /* !ï.ÞÒʾâƒr]ÛÃœÞn */
+	$"B652 35FE FDFB F1E8 2E91 778A 86C3 3117"            /* ¶R5þýûñè.‘wŠ†Ã1. */
+	$"87D8 A7D5 7862 68B7 30C1 3B32 D209 0256"            /* ‡Ø§Õxbh·0Á;2ÒÆ.V */
+	$"2BF7 DFEF 17C3 FC30 EF1D 9327 7041 FC3C"            /* +÷ßï.Ãü0ï.“'pAü< */
+	$"674F 3069 DAB2 0EA5 BB48 DC2C DC66 F660"            /* gO0iÚ².¥»HÜ,Üfö` */
+	$"9C9B C7C8 3734 C68B 7D5A 60A1 DF3D D3A8"            /* œ›ÇÈ74Æ‹}Z`¡ß=Ó¨ */
+	$"E60C D15A 11C7 FB3B F75A 358E A7F7 16CB"            /* æ.ÑZ.Çû;÷Z5Ž§÷.Ë */
+	$"67B5 097E E2A2 DE6C E40A FD52 8F75 43EF"            /* gµÆ~â¢ÞläÂýR�uCï */
+	$"F5DF 5A51 BBF5 A074 791F F54F 9724 23C3"            /* õßZQ»õ ty.õO—$#Ã */
+	$"F5E6 C4A3 E22C 1E06 3B71 A9A2 1C17 0109"            /* õæÄ£â,..;q©¢...Æ */
+	$"1B59 2742 AB03 0497 3E5A AD73 7FD3 DA51"            /* .Y'B«..—>Z­s.ÓÚQ */
+	$"9F17 A10E B9CF 7503 3395 8788 9D9D 4A58"            /* Ÿ.¡.¹Ïu.3•‡ˆ��JX */
+	$"F9B8 4A61 3DDA 7489 8086 9EAC 4D7D 62DD"            /* ù¸Ja=Út‰€†ž¬M}bÝ */
+	$"BF8B 9462 1CC0 6912 69BE 3BFE FED7 3174"            /* ¿‹”b.Ài.i¾;þþ×1t */
+	$"CAA6 A806 FF59 B963 ABEE 508B F428 D15C"            /* ʦ¨.ÿY¹c«îP‹ô(Ñ\ */
+	$"82FC BA30 6907 C572 F2BD C0DB E9A2 44AF"            /* ‚üº0i.Årò½ÀÛé¢D¯ */
+	$"EED6 81F7 C602 F802 0374 CD1D 0F41 5E2E"            /* îÖ�÷Æ.ø..tÍ..A^. */
+	$"F54F E7AB C492 54F8 C570 48A6 1603 35D3"            /* õOç«Ä’TøÅpH¦..5Ó */
+	$"EA1A 6A6D FD79 27E3 F928 4E16 3A2D 43FE"            /* ê.jmýy'ãù(N.:-Cþ */
+	$"6C3D AFC6 FA1C 578C 7BA9 7343 5B2C 7BB9"            /* l=¯Æú.WŒ{©sC[,{¹ */
+	$"0614 915A 24C4 CAC1 A2D3 0EAF EAE8 7257"            /* ..‘Z$ÄÊÁ¢Ó.¯êèrW */
+	$"EA2D 1ED2 3FFE 26A7 3E28 28D0 1AE1 D790"            /* ê-.Ò?þ&§>((Ð.á×� */
+	$"A25D 1C6C BA20 E196 1EEC 9720 92EE 6E62"            /* ¢].lº á–.ì— ’înb */
+	$"E218 5609 944E 9A2E 9228 117A 6065 93FF"            /* â.VÆ”Nš.’(.z`e“ÿ */
+	$"2B32 B2C1 7876 E657 E39E 8641 F202 62B4"            /* +2²ÁxvæW㞆Aò.b´ */
+	$"20C5 99D9 F9E5 7D83 D807 EDB7 9A34 475B"            /*  Å™Ùùå}ƒØ.í·š4G[ */
+	$"4F45 9AE8 ACD6 3098 A0C2 8D14 CBDB 9A2B"            /* OEšè¬Ö0˜ Â�.ËÛš+ */
+	$"0EF7 CB30 8B49 169F 1ECD 6F33 F063 65DA"            /* .÷Ë0‹I.Ÿ.Ío3ðceÚ */
+	$"2A2F F0B0 EE29 91F7 CA11 748C 5E4E A447"            /* *.ð°î)‘÷Ê.tŒ^N¤G */
+	$"0F7F 4B32 DB7A 366C 27C4 F178 33B7 5E9B"            /* ..K2Ûz6l'Äñx3·^› */
+	$"BAAF 29CD A3EF 39BB 5FAD AD2B 5DCA 09E8"            /* º¯)Í£ï9»_­­+]ÊÆè */
+	$"DB9A DD07 84DD 870E 2A4C 850B BD04 7F9A"            /* ÛšÝ.„݇.*L….½..š */
+	$"1354 1DAA 0819 F583 1F47 5905 6597 5F07"            /* .T.ª..õƒ.GY.e—_. */
+	$"7ED6 DFFA BA65 FA6C D01D F65F F833 D479"            /* ~ÖßúºeúlÐ.ö_ø3Ôy */
+	$"BFD3 F3D8 57BB 3718 EBC8 5A2D 732E 464E"            /* ¿ÓóØW»7.ëÈZ-s.FN */
+	$"6B46 9512 778B 8066 D5DA D21A 819D 5384"            /* kF•.w‹€fÕÚÒ.��S„ */
+	$"A84C AE56 92E2 2E9A 4D27 8A21 E02D 67FC"            /* ¨L®V’â.šM'Š!à-gü */
+	$"EAA4 B3D5 9306 1D06 CC9A 84C8 D6C4 C7E1"            /* ꤳՓ...Ìš„ÈÖÄÇá */
+	$"4F47 E168 43F0 6EB1 9276 ED11 2C29 F1CB"            /* OGáhCðn±’ví.,)ñË */
+	$"90AB 1975 3405 422B 78EC 7776 FA5C 0A2C"            /* �«.u4.B+xìwvú\Â, */
+	$"F4B1 4F40 32CE D338 8911 EAB4 4CFC 7765"            /* ô±O@2ÎÓ8‰.ê´Lüwe */
+	$"D9ED C10E 114B 0909 1122 6832 A41E 3365"            /* ÙíÁ..KÆÆ."h2¤.3e */
+	$"96EF FC81 A398 2FE8 0464 5D18 0C9F C1AF"            /* –ïü�£˜/è.d]..ŸÁ¯ */
+	$"8E6F 42CA BDC9 1DC4 770E 1C2E 01BD 62DB"            /* ŽoBʽÉ.Äw....½bÛ */
+	$"7798 4167 FC4F B27D D7E6 32CE 7F95 954F"            /* w˜AgüO²}×æ2Î.••O */
+	$"653C 833E B4F1 C6C2 307E 0796 686E 6F5C"            /* e<ƒ>´ñÆÂ0~.–hno\ */
+	$"6EE2 6260 4C0B 5329 36D8 839E 5F08 319C"            /* nâb`L.S)6؃ž_.1œ */
+	$"4CAE 85DE 6B64 F427 1358 C9FF 57B9 AF78"            /* L®…Þkdô'.XÉÿW¹¯x */
+	$"332B 82A6 0EBF 0F83 7A3C 8004 1402 6A12"            /* 3+‚¦.¿.ƒz<€...j. */
+	$"FEE8 1612 2D8A 47FE 5BDE 2714 B393 E32F"            /* þè..-ŠGþ[Þ'.³“ã/ */
+	$"013E BD7E 14FA 285D BF61 7CDA 3A92 734A"            /* .>½~.ú(]¿a|Ú:’sJ */
+	$"520E 978D 8736 6AA9 847B 05C9 F28B 3D9A"            /* R.—�‡6j©„{.Éò‹=š */
+	$"9B2E 721C 9082 3EC1 362C D516 D306 1EB9"            /* ›.r.�‚>Á6,Õ.Ó..¹ */
+	$"A95C EC63 3111 4ED2 054A EFF8 F26A 0E36"            /* ©\ìc1.NÒ.Jïøòj.6 */
+	$"7445 26A0 464F CEDC 924D B183 FAEF 28F7"            /* tE& FOÎÜ’M±ƒúï(÷ */
+	$"AF76 2DBA F15C 4F45 4BFD E003 CDC1 A878"            /* ¯v-ºñ\OEKýà.ÍÁ¨x */
+	$"6FB4 207C 2A45 1ED9 CE49 2495 F6A9 77E8"            /* o´ |*E.ÙÎI$•ö©wè */
+	$"E7FF 7FFF 7FFF 7FFF 70EC F373 E872 28BA"            /* çÿ.ÿ.ÿ.ÿpìósèr(º */
+	$"A0BB 38E4 AC79 94DA 6562 832A 9A7B EEA8"            /*  »8ä¬y”Úebƒ*š{î¨ */
+	$"6B09 FEA7 9249 2005 E7D1 D721 4761 B6DB"            /* kÆþ§’I .çÑ×!Ga¶Û */
+	$"6DB6 DB6D 98C5 C208 FD98 41AA F430 3EAE"            /* m¶Ûm˜ÅÂ.ý˜Aªô0>® */
+	$"7118 7229 50B1 07D8 C5CA 010D 4AB4 DE82"            /* q.r)P±.ØÅÊ..J´Þ‚ */
+	$"53D3 E184 6561 DE5F 7236 BBF5 550D 4A83"            /* SÓá„eaÞ_r6»õU.Jƒ */
+	$"555B 5C0F 9C0E F052 0080 F4AC 3912 DD30"            /* U[\.œ.ðR.€ô¬9.Ý0 */
+	$"47C9 B77E C632 15D7 8EB6 CD51 0454 A805"            /* GÉ·~Æ2.׎¶ÍQ.T¨. */
+	$"2DAD F687 6CB7 B37F 2289 759F F7D5 8839"            /* -­ö‡l·³."‰uŸ÷Õˆ9 */
+	$"B3E6 BCA5 AA89 9D9D 599A 5BDD 54B9 7F7D"            /* ³æ¼¥ª‰��Yš[ÝT¹.} */
+	$"2770 11ED 2217 C539 0204 16FF 728A C52A"            /* 'p.í".Å9...ÿrŠÅ* */
+	$"2D24 5FC7 E1D7 C47E 1DE8 C3F0 EA38 E730"            /* -$_Çá×Ä~.èÃðê8ç0 */
+	$"2D9D 0AC5 991A F5DD 38EC 007B A963 8B4D"            /* -�ÂÅ™.õÝ8ì.{©c‹M */
+	$"51BA A9FC AE25 908A 1B70 9145 EBA2 38C4"            /* Qº©ü®%�Š.p‘Eë¢8Ä */
+	$"168F 70BB 10A5 CAA5 A249 1974 03F3 AB57"            /* .�p».¥Ê¥¢I.t.ó«W */
+	$"3611 30C5 1F14 529F 040A A8EC EBDF F2FF"            /* 6.0Å..RŸ.¨ìëßòÿ */
+	$"232B 83FE C2D0 59D9 93C2 2A8A F86A 997F"            /* #+ƒþÂÐYÙ“Â*Šøj™. */
+	$"3207 03A7 C406 E96C C96F 23F1 1490 95DF"            /* 2..§Ä.élÉo#ñ.�•ß */
+	$"4024 67DC 3DE6 E1B1 EB60 1026 8786 531C"            /* @$gÜ=æá±ë`.&‡†S. */
+	$"9A51 378D EE86 881F 496C 8854 9459 7799"            /* šQ7�.IlˆT”Yw™ */
+	$"11EC 4196 0C22 0F05 3762 D8F4 C348 7299"            /* .ìA–."..7bØôÃHr™ */
+	$"793E 0718 14D3 D09C C192 80E1 9F7C 5CFA"            /* y>...ÓÐœÁ’€áŸ|\ú */
+	$"429C 7960 2F8B 9063 C7E1 1447 7F52 D850"            /* Bœy`/‹�cÇá.G.RØP */
+	$"B80A F1D8 BE98 DC3C 9C44 3AB7 3DA7 E08C"            /* ¸Âñؾ˜Ü<œD:·=§àŒ */
+	$"E7B6 07CE 2B69 C0E9 0C21 6133 1EC5 DAB5"            /* ç¶.Î+iÀé.!a3.ÅÚµ */
+	$"B079 413B FBA4 0259 78B8 DA3A E6D1 4AAC"            /* °yA;û¤.Yx¸Ú:æÑJ¬ */
+	$"2459 93C8 AD9A D69C AC40 5CF7 7385 1B18"            /* $Y“È­šÖœ¬@\÷s….. */
+	$"D67D 82BD 5E44 3DF8 5D2F E6D3 CE47 0191"            /* Ö}‚½^D=ø]/æÓÎG.‘ */
+	$"6E57 0F2F E8E8 9FF0 14BC 21F1 7720 6F34"            /* nW./èèŸð.¼!ñw o4 */
+	$"1EEE 5EF6 F8FD 5481 44E3 AB6B B06E 2556"            /* .î^öøýT�Dã«k°n%V */
+	$"6F07 AD65 FC95 7C32 7487 10A0 3C20 9CA7"            /* o.­eü•|2t‡. < œ§ */
+	$"B0EB F703 2D09 F0A6 D3FD 55F6 354B EDB0"            /* °ë÷.-Æð¦ÓýUö5Kí° */
+	$"179B B267 B9EB 8DA1 ED8E 7D0F 1AFF 4D50"            /* .›²g¹ë�¡íŽ}..ÿMP */
+	$"C1C7 A686 586C 6A26 3B0B 4292 60A0 A804"            /* ÁǦ†Xlj&;.B’` ¨. */
+	$"04F6 5FDB 0F76 E2BC D680 20B5 46AE 399D"            /* .ö_Û.vâ¼Ö€ µF®9� */
+	$"CC54 82A4 1DCA 08E7 E2B4 6710 ABD8 FC18"            /* ÌT‚¤.Ê.çâ´g.«Øü. */
+	$"949B 7076 11CD 598E 2A8B 99FC CC28 EC17"            /* ”›pv.ÍYŽ*‹™üÌ(ì. */
+	$"451C DE31 F7F4 C47E 3ABB AF03 FDC6 D875"            /* E.Þ1÷ôÄ~:»¯.ýÆØu */
+	$"BD0C AB3E B78F F942 A53E E5F8 CA09 414D"            /* ½.«>·�ùB¥>åøÊÆAM */
+	$"7544 D5B4 8367 3256 6D8C CB66 6DE7 E99C"            /* uDÕ´ƒg2VmŒËfmçéœ */
+	$"88E9 FCDC EB55 F67B 20E7 F44D 7616 6B29"            /* ˆéüÜëUö{ çôMv.k) */
+	$"124A C9AB 95C7 E9A8 209D EDA5 499F 2D2F"            /* .JÉ«•Çé¨ �í¥IŸ-/ */
+	$"20E5 DE8C 2EEE 92AF 4BD6 484B 7E18 2D81"            /*  åÞŒ.î’¯KÖHK~.-� */
+	$"0502 F439 C742 BA21 693B 43C5 60DF 8BA0"            /* ..ô9ÇBº!i;CÅ`ß‹  */
+	$"9EAC 0A98 DFE4 DB4B 0BE1 E526 9B74 5982"            /* ž¬Â˜ßäÛK.áå&›tY‚ */
+	$"1817 EA6B 067A D3E4 8786 883D 26DB D361"            /* ..êk.zÓ䇆ˆ=&ÛÓa */
+	$"C40F 89F4 B31F 2AF3 1369 FDA9 889A 5620"            /* Ä.‰ô³.*ó.iý©ˆšV  */
+	$"9AE7 4384 7184 9D7F 6C37 F79B 9422 ADF3"            /* šçC„q„�.l7÷›”"­ó */
+	$"2BEA A620 14CF 0267 110E AB20 594B F1DA"            /* +ê¦ .Ï.g..« YKñÚ */
+	$"9D7F DB53 3723 1A4E 0DEC DF68 3A10 078F"            /* �.ÛS7#.N.ìßh:..� */
+	$"8CA5 471B 4400 0975 92AA A351 8C66 5DDA"            /* Œ¥G.D.Æu’ª£QŒf]Ú */
+	$"0E4E C7B1 286F 2F7C E0EB 24CC 0A8B CAF8"            /* .NDZ(o/|àë$Ì‹Êø */
+	$"4F0F 75E5 CACF 26F5 0FFE 86A8 1E77 5F03"            /* O.uåÊÏ&õ.þ†¨.w_. */
+	$"A8B5 A544 F04B A521 B3FA 854A 64FA 70CD"            /* ¨µ¥DðK¥!³ú…JdúpÍ */
+	$"526F 97AE 807A 05FC 3F67 2471 61E5 2715"            /* Ro—®€z.ü?g$qaå'. */
+	$"5774 E452 7E4A CDDA 6E48 0DA2 04B3 3A29"            /* WtäR~JÍÚnH.¢.³:) */
+	$"DE10 8F75 3A3A 559D A881 B948 74F3 AB92"            /* Þ.�u::U�¨�¹Htó«’ */
+	$"B154 0F88 A11B A00B 25ED 9A59 B894 618E"            /* ±T.ˆ¡. .%íšY¸”aŽ */
+	$"AD45 3D59 9C08 49EA 076C CD63 8F49 B714"            /* ­E=Yœ.Iê.lÍc�I·. */
+	$"32B3 8743 2506 F55A C011 CBEF C94A 8606"            /* 2³‡C%.õZÀ.ËïÉJ†. */
+	$"EDE4 BE7D 2DC9 8830 6C23 91E0 0209 440C"            /* íä¾}-Ɉ0l#‘à.ÆD. */
+	$"9409 1457 6CA0 2201 8FF4 7573 54F8 CCEC"            /* ”Æ.Wl ".�ôusTøÌì */
+	$"D201 4A3A 66A6 B191 4E14 4CB1 08B4 2100"            /* Ò.J:f¦±‘N.L±.´!. */
+	$"BCF2 3A0D 696F 4582 F8B0 3A60 2D09 E9A7"            /* ¼ò:.ioE‚ø°:`-Æé§ */
+	$"8E83 CF44 A16A 6516 31C1 B51E 2DFE BDAC"            /* ŽƒÏD¡je.1Áµ.-þ½¬ */
+	$"356B F402 856C BEA0 109C A125 A759 E580"            /* 5kô.…l¾ .œ¡%§Yå€ */
+	$"3501 F500 F252 9533 F180 6E7D 30A8 FD62"            /* 5.õ.òR•3ñ€n}0¨ýb */
+	$"7FD6 B4EB 9120 8504 493A DD87 D79A 0CB1"            /* .Ö´ë‘ ….I:݇ך.± */
+	$"B674 7010 830D 8A38 5B44 B11D 3632 3FA5"            /* ¶tp.ƒ.Š8[D±.62?¥ */
+	$"CE31 CE9A 1670 AF20 16F6 BDA6 4980 002E"            /* Î1Κ.p¯ .ö½¦I€.. */
+	$"3E9E 8AB0 8B1F 63C5 28C3 7914 2833 137F"            /* >žŠ°‹.cÅ(Ãy.(3.. */
+	$"0915 DD39 7D38 49A3 6054 B5DC 2509 EE11"            /* Æ.Ý9}8I£`TµÜ%Æî. */
+	$"D68A 5C2A C75B 5B9F 7A9A FF3A D06F 3331"            /* ÖŠ\*Ç[[Ÿzšÿ:Ðo31 */
+	$"29E6 A9F4 8AD5 E0D9 7FB9 84B1 F403 8910"            /* )æ©ôŠÕàÙ.¹„±ô.‰. */
+	$"1168 1270 19E2 E385 0353 0FFF 697F 96BE"            /* .h.p.âã….S.ÿi.–¾ */
+	$"EF55 21CA 25A1 CE5E 0CD7 03A9 094F 51FE"            /* ïU!Ê%¡Î^.×.©ÆOQþ */
+	$"5314 E59F 90EB 907A E37A DD9D 182A E41C"            /* S.åŸ�ë�zãzÝ�.*ä. */
+	$"CFFB 7262 0D9E B904 8D95 2DE3 E02B F5CB"            /* Ïûrb.ž¹.�•-ãà+õË */
+	$"BF61 6012 924E 50D3 2D8D 6C25 FC60 8D19"            /* ¿a`.’NPÓ-�l%ü`�. */
+	$"9855 8BF2 5400 0000 04E3 7684 B40E 9EE7"            /* ˜U‹òT....ãv„´.žç */
+	$"21F8 CB76 250B 7CE0 2605 7C84 7E9F F226"            /* !øËv%.|à&.|„~Ÿò& */
+	$"6B94 0DB5 02AA 61E7 A9FF 5D9F A9F2 B546"            /* k”.µ.ªaç©ÿ]Ÿ©òµF */
+	$"2417 2E4D B238 ADDF 9233 5911 1D61 D35A"            /* $..M²8­ß’3Y..aÓZ */
+	$"8788 DF34 284A 9664 B91E 7A11 4568 B395"            /* ‡ˆß4(J–d¹.z.Eh³• */
+	$"7C74 C891 2A46 C056 EE92 0459 D81C A41F"            /* |tÈ‘*FÀVî’.YØ.¤. */
+	$"CA5E 4752 3ADE 89AB 995B 2BF2 D070 41B1"            /* Ê^GR:Þ‰«™[+òÐpA± */
+	$"EBFE 65BF FF61 55F5 5460 A4E0 33CF 7F1E"            /* ëþe¿ÿaUõT`¤à3Ï.. */
+	$"691A 0DA4 9372 4DCD 4A7C FF30 7DA5 4AD0"            /* i..¤“rMÍJ|ÿ0}¥JÐ */
+	$"1236 3C90 00C2 4517 FF78 771E DA05 952D"            /* .6<�.ÂE.ÿxw.Ú.•- */
+	$"1085 D433 FD50 1E6F D583 2585 CBD6 5CFC"            /* .…Ô3ýP.oÕƒ%…ËÖ\ü */
+	$"9EF2 539B BE7A CCA1 ABF6 5AED 484B FF78"            /* žòS›¾zÌ¡«öZíHKÿx */
+	$"D6BD 435E E56E 5510 3047 49DE C511 72CF"            /* Ö½C^ånU.0GIÞÅ.rÏ */
+	$"72A0 B2CE 5E4D E2DA 0AFA FEDE BDFD 3167"            /* r ²Î^MâÚÂúþÞ½ý1g */
+	$"02FE 3FBE A1B9 7A5F 205B 7D60 1BA3 C975"            /* .þ?¾¡¹z_ [}`.£Éu */
+	$"5949 A641 5A3E 5AF2 F237 53BE FCAC 71F1"            /* YI¦AZ>Zòò7S¾ü¬qñ */
+	$"E3E3 6AEB 35B9 41BD C4B6 3400 DBA0 4B7F"            /* ããjë5¹A½Ä¶4.Û K. */
+	$"FF79 17FD 23F9 918D E532 F6BD F949 B633"            /* ÿy.ý#ù‘�å2ö½ùI¶3 */
+	$"6A36 7600 17D8 C912 DB72 6F48 869C 0D66"            /* j6v..ØÉ.ÛroH†œ.f */
+	$"1410 074A 8F5B 629C 5B8B F293 6DB6 DB6D"            /* ...J�[bœ[‹ò“m¶Ûm */
+	$"B6DB 6740 B8F8 BF85 2938 ECDA 6390 6537"            /* ¶Ûg@¸ø¿…)8ìÚc�e7 */
+	$"5986 A2A6 B52C A20D F057 C41F 660A C203"            /* Y†¢¦µ,¢.ðWÄ.fÂÂ. */
+	$"E5C1 68B0 9D56 DAD8 F20C 665C 5D04 4BA2"            /* åÁh°�VÚØò.f\].K¢ */
+	$"46FF 7DB5 4880 6121 2EA3 5D2A 82F4 B18A"            /* Fÿ}µH€a!.£]*‚ô±Š */
+	$"50FC 2D12 DEFE 1F4D 01BF 3315 10D3 5D94"            /* Pü-.Þþ.M.¿3..Ó]” */
+	$"11B1 0221 28B8 56D9 4CED 012D D9C9 4005"            /* .±.!(¸VÙLí.-ÙÉ@. */
+	$"316F E887 29A8 3E83 9E25 FF1F A4C1 5D25"            /* 1oè‡)¨>ƒž%ÿ.¤Á]% */
+	$"8893 36E0 73BE DE25 456A 4678 B7C5 AD7A"            /* ˆ“6às¾Þ%EjFx·Å­z */
+	$"90C9 3950 942F 1459 C737 31EF 991F 241B"            /* �É9P”/.YÇ71ï™.$. */
+	$"C294 7CFB 9461 B43A 8D37 8A6D BBC8 D7F6"            /* ”|û”a´:�7Šm»È×ö */
+	$"A128 281D DF2B EAC5 A154 E6D9 FF53 984D"            /* ¡((.ß+êÅ¡TæÙÿS˜M */
+	$"550E 9C70 3F64 0E0E 0940 0AFC 5CC9 CF43"            /* U.œp?d..Æ@Âü\ÉÏC */
+	$"7184 3D0F 9FDE 08DF EC31 B86E 0D38 AF71"            /* q„=.ŸÞ.ßì1¸n.8¯q */
+	$"29F1 A21D 7847 7150 6DCA 9211 C778 F1A4"            /* )ñ¢.xGqPmÊ’.Çxñ¤ */
+	$"26AA B90D 1A39 DB92 4924 9249 2493 36D2"            /* &ª¹..9Û’I$’I$“6Ò */
+	$"4924 9249 2492 49FE 069C E7B9 CB0D 4E87"            /* I$’I$’Iþ.œç¹Ë.N‡ */
+	$"7D9E 9D29 FC64 8A6F 6185 2BD9 806F 760B"            /* }ž�)üdŠoa…+Ù€ov. */
+	$"464D 4732 BD90 0E7D CABF 2B6F 2A78 8608"            /* FMG2½�.}Ê¿+o*x†. */
+	$"DEF5 406F D401 3FD4 AE82 058D D6C8 B980"            /* Þõ@oÔ.?Ô®‚.�Öȹ€ */
+	$"FECA D9B9 E7B6 3982 9FD3 81EA 544B 30BD"            /* þÊÙ¹ç¶9‚ŸÓ�êTK0½ */
+	$"7E56 FD78 66FD 5A41 D0BD 7714 5FAF 2A1E"            /* ~VýxfýZAнw._¯*. */
+	$"8FDA B705 EAAE F6F2 D69C 9812 7194 A56E"            /* �Ú·.ê®öòÖœ˜.q”¥n */
+	$"DB55 BF75 C4E4 BDCD 9FC2 ACAD C428 829F"            /* ÛU¿uÄä½ÍŸÂ¬­Ä(‚Ÿ */
+	$"2409 3BB2 A894 8020 A8E7 FC16 F4FF 4E84"            /* $Æ;²¨”€ ¨çü.ôÿN„ */
+	$"C06E 889C 1C74 96AD 5420 F825 1A2B 015C"            /* Ànˆœ.t–­T ø%.+.\ */
+	$"6BC2 31EE 64AB 7A44 15E5 3458 8040 AEEF"            /* kÂ1îd«zD.å4X€@®ï */
+	$"F6BD 7D58 6478 8344 018F D3C6 2E33 69A4"            /* ö½}XdxƒD.�ÓÆ.3i¤ */
+	$"E5E8 721A 5B2F 777B C0D8 0A05 2CE7 EEC8"            /* åèr.[/w{ÀØÂ.,çîÈ */
+	$"69EF 417B A960 D320 842E 84DE D442 AB2F"            /* iïA{©`Ó „.„ÞÔB«/ */
+	$"3B31 84FE DCFC A608 2E09 AA42 60F6 DB2E"            /* ;1„þÜü¦..ƪB`öÛ. */
+	$"DA5B C95D D10A 77BE AD48 B5FF 0557 A5AC"            /* Ú[É]ÑÂw¾­Hµÿ.W¥¬ */
+	$"327B F763 FDA1 32BF 7308 3EFC 0C2B 2D22"            /* 2{÷cý¡2¿s.>ü.+-" */
+	$"584A F9CA BFB4 78FF 6E67 42CC B491 492B"            /* XJùÊ¿´xÿngBÌ´‘I+ */
+	$"17C3 C746 9966 5780 BA6C 2798 472E 1CFF"            /* .ÃÇF™fW€ºl'˜G..ÿ */
+	$"6A32 69A0 86E0 44C6 1679 08F9 9928 48D9"            /* j2i †àDÆ.y.ù™(HÙ */
+	$"3DA0 CBA0 1E5E 2618 7162 51C9 DEF0 56A0"            /* = Ë .^&.qbQÉÞðV  */
+	$"1924 F126 CAAD F248 A1A4 2816 13A7 FE76"            /* .$ñ&Ê­òH¡¤(..§þv */
+	$"594E 647C 36C4 C014 CDC7 5C89 DBAB 9854"            /* YNd|6ÄÀ.ÍÇ\‰Û«˜T */
+	$"9094 FC96 5FED 7476 AA3C DF0B B47B C123"            /* �”ü–_ítvª<ß.´{Á# */
+	$"BE6D CD5A BA07 CC19 94FC DC37 B85C 0FD2"            /* ¾mÍZº.Ì.”üÜ7¸\.Ò */
+	$"9FED 62E6 F910 2F49 529E CE10 9738 D296"            /* Ÿíbæù./IRžÎ.—8Ò– */
+	$"A81C 1A0D 0FBF 7CAE DB93 40C0 3BC9 5A0C"            /* ¨....¿|®Û“@À;ÉZ. */
+	$"B23D FBD4 3863 C520 03A0 D966 5327 A0A2"            /* ²=ûÔ8cÅ . ÙfS' ¢ */
+	$"DD06 B7A1 942B 0A75 CB23 8664 4159 8647"            /* Ý.·¡”+ÂuË#†dAY†G */
+	$"2725 DAF6 693A 58D7 7A7D B34A 393D FE7A"            /* '%Úöi:X×z}³J9=þz */
+	$"C105 C374 193C 123C 130E 062C 8AB2 32FD"            /* Á.Ãt.<.<...,Š²2ý */
+	$"80E0 72E3 6AEA 2078 5D7C D3E5 4E20 D927"            /* €àrãjê x]|ÓåN Ù' */
+	$"157E 9DC5 1A29 2F0F C326 AFE3 3ACF C361"            /* .~�Å.)/.Ã&¯ã:ÏÃa */
+	$"8C45 D79C EB27 7441 E4C7 8BFD 5832 DB93"            /* ŒEלë'tAäÇ‹ýX2Û“ */
+	$"78F5 B9DB BA4E 329E A262 C467 88DC C540"            /* xõ¹ÛºN2ž¢bÄgˆÜÅ@ */
+	$"78E0 4E55 34F3 806E 2DEA B371 E9B5 D8DF"            /* xàNU4ó€n-ê³qéµØß */
+	$"5EDA B5B9 1C48 5A11 ECAB E4F8 67B7 C76E"            /* ^Úµ¹.HZ.ì«äøg·Çn */
+	$"460F 8E6A C7BA B5F8 75F2 9105 1480 FD1A"            /* F.ŽjǺµøuò‘..€ý. */
+	$"80EB DB48 6115 AA6E 9AEA A07C 57B0 1A7F"            /* €ëÛHa.ªnšê |W°.. */
+	$"0CBF D5DE 47A7 89BE 4CAE 19FE 7B79 5839"            /* .¿ÕÞG§‰¾L®.þ{yX9 */
+	$"232D 495E 476C E267 D9D2 5257 F0E6 3EB5"            /* #-I^GlâgÙÒRWðæ>µ */
+	$"F140 AAAF 1E36 BA04 086A EEC5 3232 7958"            /* ñ@ª¯.6º..jîÅ22yX */
+	$"72E3 FCC3 9488 B44C 0C15 EF6B 811B CF97"            /* rãüÔˆ´L..ïk�.Ï— */
+	$"0532 2B88 663D 8675 6050 AB94 A435 C0FC"            /* .2+ˆf=†u`P«”¤5Àü */
+	$"9E08 9873 92AF 6859 F7F5 64B0 0BA5 FA68"            /* ž.˜s’¯hY÷õd°.¥úh */
+	$"3557 0898 9E0D 5795 BF67 2866 5FB6 63C6"            /* 5W.˜ž.W•¿g(f_¶cÆ */
+	$"4F82 42CE A682 DC8D CB18 D4FE 6252 95D1"            /* O‚BΦ‚Ü�Ë.ÔþbR•Ñ */
+	$"C85C 6B2C 0FC0 7C9D 5A80 F93B 8900 F93A"            /* È\k,.À|�Z€ù;‰.ù: */
+	$"8EE6 7513 4AFA 1609 3CEE D5EB B420 A1CE"            /* Žæu.Jú.Æ<îÕë´ ¡Î */
+	$"318D 6F67 720A 7F84 4127 C0F2 9193 35CE"            /* 1�ogrÂ.„A'Àò‘“5Î */
+	$"6D97 9682 5E5D B9FC 5A97 3B71 AB1F 64AA"            /* m—–‚^]¹üZ—;q«.dª */
+	$"3383 1F0E C0E9 26BE E6EB 24CD 499F F2BA"            /* 3ƒ..Àé&¾æë$ÍIŸòº */
+	$"997D E886 6FF8 C6B5 0607 1259 7715 7539"            /* ™}è†oøƵ...Yw.u9 */
+	$"4B57 F7A9 56A7 A04B 031F 0786 6C02 E7BC"            /* KW÷©V§ K...†l.ç¼ */
+	$"8256 7F27 A39A B66D 6B95 6C11 CDE4 C580"            /* ‚V.'£š¶mk•l.ÍäÅ€ */
+	$"54DE 7E26 129C EB67 ABC8 455E 6CC3 453E"            /* TÞ~&.œëg«ÈE^lÃE> */
+	$"F9A8 3ED5 9B43 4EB8 384E 0F7B 28E0 16FF"            /* ù¨>Õ›CN¸8N.{(à.ÿ */
+	$"1342 18B1 31B6 EAEF 4C40 36F7 0CFF 6AFF"            /* .B.±1¶êïL@6÷.ÿjÿ */
+	$"8059 5D1C 275B 4F7D B392 4DB0 5E5D 4304"            /* €Y].'[O}³’M°^]C. */
+	$"4848 2A3A C93F BAD6 638D 315A 8771 1150"            /* HH*:É?ºÖc�1Z‡q.P */
+	$"1D41 B6A7 C9B8 782E 19D8 F8E7 07EB ED20"            /* .A¶§É¸x..Øøç.ëí  */
+	$"7D4E AFFF 5FD2 4FA0 2B48 B549 6A50 AD81"            /* }N¯ÿ_ÒO +HµIjP­� */
+	$"F11D 357F 7CB2 4B8B F28B 6C97 2C23 58A3"            /* ñ.5.|²K‹ò‹l—,#X£ */
+	$"92E8 2BFB 77F2 1ECE 7A2A C437 47E3 A833"            /* ’è+ûwò.Îz*Ä7Gã¨3 */
+	$"D60C C3CA 168A 85B8 620C 109C 4134 35BF"            /* Ö.ÃÊ.Š…¸b..œA45¿ */
+	$"ECCB 3629 944F AD29 444A C4B6 F019 F19B"            /* ìË6)”O­)DJĶð.ñ› */
+	$"4189 B1D3 8F28 65B9 85D8 C715 2E1A 267D"            /* A‰±Ó�(e¹…ØÇ...&} */
+	$"A7DB 4C90 9829 BC86 E14C 9F44 757D 5436"            /* §ÛL�˜)¼†áLŸDu}T6 */
+	$"9C38 979D 3654 9A63 E572 7864 E513 A083"            /* œ8—�6Tšcårxdå. ƒ */
+	$"C943 97C5 A88B 23A2 4ECC E4F1 AEED F3EC"            /* ÉC—Ũ‹#¢NÌäñ®íóì */
+	$"C57D F254 B087 7E1F 81B3 59E6 E2A0 E5CB"            /* Å}òT°‡~.�³Yæâ åË */
+	$"B710 EF71 0598 01BF 1400 3814 0759 EDA8"            /* ·.ïq.˜.¿..8..Yí¨ */
+	$"386C 3DF0 F1C5 CA93 612F C58D 71BA 6ED6"            /* 8l=ðñÅÊ“a/Å�qºnÖ */
+	$"FE35 90B4 9C10 A938 33B6 6987 E407 AE7B"            /* þ5�´œ.©83¶i‡ä.®{ */
+	$"5B1A 8E0E BE53 1C94 D747 9303 2ED9 13FA"            /* [.Ž.¾S.”×G“..Ù.ú */
+	$"226C F38A 7134 3CF6 1923 B85F A254 0048"            /* "lóŠq4<ö.#¸_¢T.H */
+	$"A765 B678 FC9C 1E2C E183 FC80 CA83 9572"            /* §e¶xüœ.,áƒü€Êƒ•r */
+	$"E573 B224 9894 7316 C931 4A49 C28F 6E33"            /* ås²$˜”s.É1JIÂ�n3 */
+	$"B579 EE14 84BC 61CC 351B 41FB 7095 5F8C"            /* µyî.„¼aÌ5.Aûp•_Œ */
+	$"1B15 6DAF FF7F F8EA 5A11 5453 6ECA 1C02"            /* ..m¯ÿ.øêZ.TSnÊ.. */
+	$"C8A4 F40F AD00 7BC9 EDFD AC3A 28E4 546F"            /* Ȥô.­.{Éíý¬:(äTo */
+	$"1E36 BE45 897E F5D5 BE25 E84B 57C6 9080"            /* .6¾E‰~õÕ¾%èKWÆ�€ */
+	$"B6C4 79B8 153B 110F D90B 215D 401C 0453"            /* ¶Äy¸.;..Ù.!]@..S */
+	$"8243 BF4A CDAE 9270 0658 462F E0C7 82A8"            /* ‚C¿JÍ®’p.XF/àÇ‚¨ */
+	$"E155 C547 D144 EBAD 74EC EAFF 7799 6D50"            /* áUÅGÑDë­tìêÿw™mP */
+	$"D0F9 6BA4 D8B3 0FBB B75B BC48 D5BA 8EAB"            /* Ðùk¤Ø³.»·[¼HÕºŽ« */
+	$"FF7F 3A2A 820F D817 FB8B 7590 ED4A 3D7B"            /* ÿ.:*‚.Ø.û‹u�íJ={ */
+	$"DAF8 C05F BDCF 1B7C 8862 53A8 95D6 C0DF"            /* ÚøÀ_½Ï.|ˆbS¨•ÖÀß */
+	$"4069 36DA 0739 783C C432 1E0C 7DA6 2D70"            /* @i6Ú.9x<Ä2..}¦-p */
+	$"B33A C5AD 810A FBBD E9BB B776 6463 9FDC"            /* ³:Å­�Âû½é»·vdcŸÜ */
+	$"B401 211D 81BA A9FA 8761 ED36 A1EF 439D"            /* ´.!.�º©ú‡aí6¡ïC� */
+	$"9880 BE88 E045 3068 F59F 7AD7 EFFF 7FFC"            /* ˜€¾ˆàE0hõŸz×ïÿ.ü */
+	$"5562 1F00 0818 22D6 5002 F762 7A20 0DC0"            /* Ub...."ÖP.÷bz .À */
+	$"3ADD FF5D 1851 D391 F011 0000 0000 0000"            /* :Ýÿ].QÓ‘ð....... */
+	$"0000 0000 0138 5715 ED61 F2C5 2C28 30C0"            /* .....8W.íaòÅ,(0À */
+	$"F669 9389 6153 3A95 E010 CCA0 2FEF B36F"            /* öi“‰aS:•à.Ì /ï³o */
+	$"9576 F8C0 F17B 27F6 F6FA 412C 70C7 CF14"            /* •vøÀñ{'ööúA,pÇÏ. */
+	$"7625 6871 7FE2 16C9 B6E9 5BF1 1A16 E2F0"            /* v%hq.â.ɶé[ñ..âð */
+	$"945D E51E CCF9 0970 E586 517C 475F 8856"            /* ”]å.ÌùÆpå†Q|G_ˆV */
+	$"CA0C 1DD9 E001 D7BC 1876 745C 8077 672D"            /* Ê..Ùà.×¼.vt\€wg- */
+	$"CECA FF0B 01D1 76FA 32F5 C047 26FB 451F"            /* ÎÊÿ..Ñvú2õÀG&ûE. */
+	$"5261 79B6 5990 79C9 4DF7 5B69 D548 E894"            /* Ray¶Y�yÉM÷[iÕHè” */
+	$"F249 0C84 D3F0 9555 7B99 EA27 FA38 184E"            /* òI.„Óð•U{™ê'ú8.N */
+	$"F863 AFA1 CE80 AEBC CB89 DD99 B8E2 0BEC"            /* øc¯¡Î€®¼Ë‰Ý™¸â.ì */
+	$"2F74 E534 3FF4 B50A 4B04 02B1 C178 B189"            /* /tå4?ôµÂK..±Áx±‰ */
+	$"D30F 77DC 8A15 8C9E AF87 1DCD D545 AC6B"            /* Ó.wÜŠ.Œž¯‡.ÍÕE¬k */
+	$"CAFB 832B E240 6752 8EF2 9BDF 76E8 621D"            /* Êûƒ+â@gRŽò›ßvèb. */
+	$"892E 384C 7BF0 4DE8 F910 7689 C3F0 E7E9"            /* ‰.8L{ðMèù.v‰Ãðçé */
+	$"E401 C781 F341 A84F 6922 E97B FC22 E259"            /* ä.Ç�óA¨Oi"é{ü"âY */
+	$"6B26 9B03 14A7 DFA1 B7BD CBED 9539 5DE3"            /* k&›..§ß¡·½Ëí•9]ã */
+	$"2041 2F5F A37A 2F23 00FC 6424 D7F8 902E"            /*  A/_£z/#.üd$×ø�. */
+	$"7261 227B B4EC F4D1 9C18 22C3 8CA5 EFF8"            /* ra"{´ìôÑœ."ÃŒ¥ïø */
+	$"5701 6734 9110 8B4E D9E0 EE8F 7FEA 202F"            /* W.g4‘.‹NÙàî�.ê / */
+	$"CFF7 5CC7 6107 0B22 B0BE A87B 32EF 0FA8"            /* Ï÷\Ça.."°¾¨{2ï.¨ */
+	$"3D2D 794E 556E 6089 ACBA D46C 17EC A9DC"            /* =-yNUn`‰¬ºÔl.ì©Ü */
+	$"0F4E D57D B8C8 EED1 F9D4 F96A 7BEE 3794"            /* .NÕ}¸ÈîÑùÔùj{î7” */
+	$"49DE 3AA7 EE2E 0B25 A47C 966A D90D C792"            /* IÞ:§î..%¤|–jÙ.Ç’ */
+	$"6304 7C05 C6EB A26D 83B8 3E0C AAF5 AFFE"            /* c.|.Æë¢mƒ¸>.ªõ¯þ */
+	$"FDC3 F7C4 C0A3 C3ED E8D2 0FAB AC58 1F56"            /* ýÃ÷ÄÀ£ÃíèÒ.«¬X.V */
+	$"FF40 F44B 4289 C6D7 CC17 A019 AD4A C889"            /* ÿ@ôKB‰Æ×Ì. .­Jȉ */
+	$"67AD 0673 32A0 B6BA 087E 7279 19C2 025F"            /* g­.s2 ¶º.~ry.Â._ */
+	$"DB0E 0E97 02D9 2268 5BCA CDE6 B94E 8D9B"            /* Û..—.Ù"h[ÊÍæ¹N�› */
+	$"03EB D786 1698 2D8A 2ECD 432E D615 931F"            /* .ë׆.˜-Š.ÍC.Ö.“. */
+	$"452B 5D40 0950 5BBE A70F BD95 9F0E 8B95"            /* E+]@ÆP[¾§.½•Ÿ.‹• */
+	$"86B7 47DE 0757 BFE4 9775 3082 9D22 863A"            /* †·GÞ.W¿ä—u0‚�"†: */
+	$"E404 B84C 5E88 8424 31DD 689A D234 88E2"            /* ä.¸L^ˆ„$1ÝhšÒ4ˆâ */
+	$"971F 9E59 429C 6C7E 3670 8F7C 8F86 A80D"            /* —.žYBœl~6p�|�†¨. */
+	$"848E E78B 5331 058E E444 FEC2 269A 7E23"            /* „Žç‹S1.ŽäDþÂ&š~# */
+	$"608D 0502 E075 F7A4 DACF 515F AA08 31C1"            /* `�..àu÷¤ÚÏQ_ª.1Á */
+	$"1275 02C0 F37E F465 ADE9 1918 F1F0 0E4F"            /* .u.Àó~ôe­é..ñð.O */
+	$"E5A4 41A5 F655 22D9 946A 7FEC 0720 3D3A"            /* å¤A¥öU"Ù”j.ì. =: */
+	$"4961 05B2 F02D 51D2 1212 084B B3EA 5DC9"            /* Ia.²ð-QÒ...K³ê]É */
+	$"F986 5763 A2AC E2AC 1144 5DC3 E6A5 D092"            /* ù†Wc¢¬â¬.D]Ãæ¥Ð’ */
+	$"3654 3737 A598 21C2 34FF 097C B8B8 5934"            /* 6T77¥˜!Â4ÿÆ|¸¸Y4 */
+	$"C947 05C9 B4BA F52B 99FF 3AFE 6B15 2CAE"            /* ÉG.É´ºõ+™ÿ:þk.,® */
+	$"06CF D962 CCDE D937 D4AE B3D9 7E92 E2AF"            /* .ÏÙbÌÞÙ7Ô®³Ù~’⯠*/
+	$"8F4E 31CE 06E7 0AD8 71DB 4456 7101 E221"            /* �N1Î.çÂØqÛDVq.â! */
+	$"74AC 1159 9EDF 9841 CFA3 E04F DECF 6FD3"            /* t¬.Yžß˜AÏ£àOÞÏoÓ */
+	$"90CC C22F 63B0 45CC C98B 3125 33C0 CFBA"            /* �ÌÂ/c°EÌÉ‹1%3ÀϺ */
+	$"4CE7 3FAD F2E4 85E7 0C74 35A5 97E9 8672"            /* Lç?­òä…ç.t5¥—é†r */
+	$"9180 E059 EF0F C416 E25F 0E83 095A 36AA"            /* ‘€àYï.Ä.â_.ƒÆZ6ª */
+	$"8E74 F1F7 11A8 49DD C47E 5098 D576 DC41"            /* Žtñ÷.¨IÝÄ~P˜ÕvÜA */
+	$"D6FC 7C37 E307 A2DB 997E A046 C114 CF04"            /* Öü|7ã.¢Û™~ FÁ.Ï. */
+	$"FD8E 32D1 2AC6 3A81 C8B6 C680 6E60 7826"            /* ýŽ2Ñ*Æ:�ȶƀn`x& */
+	$"9A40 9C80 BA1B 4DE8 854B 09D9 33B3 95BE"            /* š@œ€º.Mè…KÆÙ3³•¾ */
+	$"7CE5 CCA3 C463 5D1C 1F2B A160 E208 AA0A"            /* |åÌ£Äc]..+¡`â.ªÂ */
+	$"D00F 1933 5FB5 2705 4E9C 3733 0FD0 2AA0"            /* Ð..3_µ'.Nœ73.Ð*  */
+	$"D116 F240 05EA 53BB 5A5A 0A4B 3D9E FCB7"            /* Ñ.ò@.êS»ZZÂK=žü· */
+	$"FE35 1D0B 1E56 C4AA 9B6C 8CE6 10CA DAA5"            /* þ5...VĪ›lŒæ.ÊÚ¥ */
+	$"6DF1 6F74 C332 BD93 556E 89F5 A94A 232D"            /* mñotÃ2½“Un‰õ©J#- */
+	$"E9EF C950 666C 7D3E D1BA C98F 4489 3C5D"            /* éïÉPfl}>ѺÉ�D‰<] */
+	$"F7FC 88D4 C90E EE9D 7691 C976 2CFE 6BA0"            /* ÷üˆÔÉ.î�v‘Év,þk  */
+	$"B53E 5C59 749E FEBC 4AB4 490C A3B6 5187"            /* µ>\Ytžþ¼J´I.£¶Q‡ */
+	$"4A10 1076 6348 AEC1 054B 0A98 9196 29C3"            /* J..vcH®Á.K˜‘–)à */
+	$"F995 50E4 E003 F099 9495 7ECC 1C78 C536"            /* ù•Päà.ð™”•~Ì.xÅ6 */
+	$"AA8D 7305 BE7F FF72 99F7 25ED 4C38 0896"            /* ª�s.¾.ÿr™÷%íL8.– */
+	$"A1BE F2D4 016E B744 CBB7 9CEE 1C88 5E3D"            /* ¡¾òÔ.n·DË·œî.ˆ^= */
+	$"1B9E E3CB 29D2 AAA7 C3F6 41F4 B6C0 5861"            /* .žãË)Òª§ÃöAô¶ÀXa */
+	$"93D3 4773 858E 3470 E670 4F94 E206 FBA3"            /* “ÓGs…Ž4pæpO”â.û£ */
+	$"7050 2A3D 6DC0 004E 32D7 6043 4E5E C44F"            /* pP*=mÀ.N2×`CN^ÄO */
+	$"284A 3214 97B7 19DE 41C4 6204 56CB 1695"            /* (J2.—·.ÞAÄb.VË.• */
+	$"BAD8 C308 0FFE BEB7 FE14 C6AC CEE8 5022"            /* ºØÃ..þ¾·þ.ƬÎèP" */
+	$"C27A 2CCA 4714 4C52 3975 615D A1C8 62BF"            /* Âz,ÊG.LR9ua]¡Èb¿ */
+	$"C477 FF7E 2637 3B89 8C43 6E09 285B 2D1A"            /* Äwÿ~&7;‰ŒCnÆ([-. */
+	$"8E9E 4110 CE7B E30A E21C A140 02C8 D0AD"            /* ŽžA.Î{ãÂâ.¡@.ÈЭ */
+	$"630B 5488 7CE7 B884 393A 6FDD 5A68 7FB9"            /* c.Tˆ|縄9:oÝZh.¹ */
+	$"60EC C73B 143E 3F61 3E31 1A3E 8438 7944"            /* `ìÇ;.>?a>1.>„8yD */
+	$"B652 14AE 63CA 803C 9B67 C6FE 2F5D 4CD0"            /* ¶R.®cÊ€<›gÆþ/]LÐ */
+	$"3A63 1328 8809 A4AB B4A1 8664 FE90 F03E"            /* :c.(ˆÆ¤«´¡†dþ�ð> */
+	$"18E2 7982 7DDC A444 1306 4546 61B2 A710"            /* .ây‚}ܤD..EFa²§. */
+	$"CCED 529C 92CB D547 22F5 0DB0 B10F 8450"            /* ÌíRœ’ËÕG"õ.°±.„P */
+	$"E5AC 253A 6937 BFBD D0C6 8AED 14C7 787E"            /* å¬%:i7¿½ÐÆŠí.Çx~ */
+	$"21E7 860D 8567 633D A9E6 0466 93A5 6789"            /* !ç†.…gc=©æ.f“¥g‰ */
+	$"D643 2EEE 7542 7B02 086A 83C4 AD3C 785C"            /* ÖC.îuB{..jƒÄ­<x\ */
+	$"E3B4 BFC0 C27C 3762 1D98 0A0C B43D 8107"            /* ã´¿ÀÂ|7b.˜Â.´=�. */
+	$"3003 FF74 C626 1BC1 44AA 08A0 7A68 0ADE"            /* 0.ÿtÆ&.ÁDª. zhÂÞ */
+	$"E9BD 94DB 3644 AA13 CFCA A9CB 0E8F 9061"            /* é½”Û6Dª.ÏÊ©Ë.��a */
+	$"73BC 6A23 359D C129 F184 4EBA BE0F A772"            /* s¼j#5�Á)ñ„Nº¾.§r */
+	$"9AB6 7DDC C179 81DB 9FDC EDA3 E6C5 21E2"            /* š¶}ÜÁy�ÛŸÜí£æÅ!â */
+	$"7049 87BC 00E3 34F5 8066 3FFE 7CA7 A588"            /* pI‡¼.ã4õ€f?þ|§¥ˆ */
+	$"6277 30DE 8FC1 950A A652 5B12 B0A4 B8BE"            /* bw0Þ�Á•Â¦R[.°¤¸¾ */
+	$"2297 4261 CB90 AEBB F3CB 2BEE 2FA8 149E"            /* "—BaË�®»óË+î/¨.ž */
+	$"11E6 487B 3EFA 45B9 E4A8 17DF DF8E D5FF"            /* .æH{>úE¹ä¨.ßߎÕÿ */
+	$"750C 2E52 4F3F 5960 B3B7 3DEB CFE3 4EC3"            /* u..RO?Y`³·=ëÏãNà */
+	$"676F D76A F8C3 67EB 383B 042A C000 1CF5"            /* go×jøÃgë8;.*À..õ */
+	$"FB57 51DF 4E0F 9709 4A58 F371 8A53 79CD"            /* ûWQßN.—ÆJXóqŠSyÍ */
+	$"B935 29C8 5953 BBFB B216 24F0 FF5C F1BE"            /* ¹5)ÈYS»û².$ðÿ\ñ¾ */
+	$"1649 C9BE 754A CC45 62C3 44A2 3E12 A872"            /* .IɾuJÌEbÃD¢>.¨r */
+	$"736B 05DD F77C C7C6 F33D 8224 147E D163"            /* sk.Ý÷|ÇÆó=‚$.~Ñc */
+	$"02B4 0BC6 297A FA75 03A7 BFDD 709A A878"            /* .´.Æ)zúu.§¿Ýpš¨x */
+	$"734A 7236 791A BFF6 9F21 CC67 268D 160D"            /* sJr6y.¿öŸ!Ìg&�.. */
+	$"A6D0 7988 72CF 6475 146C 81EB 8249 518A"            /* ¦ÐyˆrÏdu.l�ë‚IQŠ */
+	$"49B7 0389 FDB6 9CEB DCA2 41ED 085D 4E85"            /* I·.‰ý¶œëÜ¢Aí.]N… */
+	$"03E4 3F4E D8CF 25E1 658D 38F6 8F88 A499"            /* .ä?NØÏ%áe�8ö�ˆ¤™ */
+	$"B64A DD79 FDF2 39FB 5CEC F29B 714A 733B"            /* ¶JÝyýò9û\ìò›qJs; */
+	$"76E4 94E5 F567 3A71 28F0 13A6 7A74 CD91"            /* vä”åõg:q(ð.¦ztÍ‘ */
+	$"5804 065E D3C7 09B7 ED19 51E5 0913 4436"            /* X..^ÓÇÆ·í.QåÆ.D6 */
+	$"9791 BB58 10F3 7183 5DB6 4874 65D2 AAD2"            /* —‘»X.óqƒ]¶HteÒªÒ */
+	$"DBA2 C761 A70F 3EEE 9256 2EF0 945D E52D"            /* Û¢Ça§.>î’V.ð”]å- */
+	$"34CF 10DF B2AF 8E14 A5A4 E24F 0051 F63E"            /* 4Ï.ß²¯Ž.¥¤âO.Qö> */
+	$"F11C 5DAC 6D8D DEDD A585 96FC A2AB A5FF"            /* ñ.]¬m�ÞÝ¥…–ü¢«¥ÿ */
+	$"5298 6349 DB41 9276 C1C6 F1E2 9ABF 822B"            /* R˜cIÛA’vÁÆñâš¿‚+ */
+	$"346F 8679 726C 666A 9638 246A EABE 54A9"            /* 4o†yrlfj–8$jê¾T© */
+	$"49DD F22A BC62 5867 51F2 FDBD B33B 40E0"            /* IÝò*¼bXgQòý½³;@à */
+	$"220F 075D 031C EAAE 3CDE 67CF 2269 E26D"            /* "..]..ê®<ÞgÏ"iâm */
+	$"BEF3 1873 E610 D43E 8F03 A14F F04F 980B"            /* ¾ó.sæ.Ô>�.¡OðO˜. */
+	$"69FF 1E4A 1925 DDE6 B473 84B5 6F53 75DD"            /* iÿ.J.%Ýæ´s„µoSuÝ */
+	$"CF71 C4C0 72DC 5403 7E7B 1A9B 6F16 BA87"            /* ÏqÄÀrÜT.~{.›o.º‡ */
+	$"A44D D4A2 8029 E15A 8C17 BE55 A30B 87B3"            /* ¤MÔ¢€)áZŒ.¾U£.‡³ */
+	$"DC5B CED9 2E4C A8F3 939B 6F82 8885 9BD5"            /* Ü[ÎÙ.L¨ó“›o‚ˆ…›Õ */
+	$"905B 6EE2 E3C9 D45E DE91 DD46 7EDD 23BB"            /* �[nâãÉÔ^Þ‘ÝF~Ý#» */
+	$"6852 2BD3 3D31 2755 2D1B 7431 35EB 6CBD"            /* hR+Ó=1'U-.t15ël½ */
+	$"638C 9E5D F0EB 9AE0 49BC D327 7536 BCB3"            /* cŒž]ðëšàI¼Ó'u6¼³ */
+	$"65F1 992B E073 9D25 980D A244 7F9E 749F"            /* eñ™+às�%˜.¢D.žtŸ */
+	$"53BD D08A C5EF 64A2 D672 7A55 9146 5CAD"            /* S½ÐŠÅïd¢ÖrzU‘F\­ */
+	$"7839 E1B6 7543 4556 146E C347 33E3 2798"            /* x9á¶uCEV.nÃG3ã'˜ */
+	$"4752 6F78 AAA5 AE5E 7B02 CD92 D5F1 FD30"            /* GRoxª¥®^{.Í’Õñý0 */
+	$"F78A 7BFB 03AB CF34 58BF 3810 B8A7 CDAB"            /* ÷Š{û.«Ï4X¿8.¸§Í« */
+	$"A573 658E 260A 7C50 000F 00AC D13F 618E"            /* ¥seŽ&Â|P...¬Ñ?aŽ */
+	$"A241 9458 3945 9D59 3F9B 13C5 04CC 600E"            /* ¢A”X9E�Y?›.Å.Ì`. */
+	$"FC51 8C8D FBA0 4150 5832 4539 730B 4631"            /* üQŒ�û APX2E9s.F1 */
+	$"0598 EE14 817C B560 97C5 B953 64D4 980D"            /* .˜î.�|µ`—ŹSdÔ˜. */
+	$"C379 6FFF 3E63 6746 7BE8 D3AB 5215 B47F"            /* Ãyoÿ>cgF{èÓ«R.´. */
+	$"3CAE 42E4 D4BF B7BF 6580 3319 6A71 C2E9"            /* <®BäÔ¿·¿e€3.jqÂé */
+	$"48AA 2C5E 9D78 B9C3 F8DA B858 D5AB 99F4"            /* Hª,^�x¹ÃøÚ¸XÕ«™ô */
+	$"B04F EAAC D0DE 2302 F874 7E64 A69B 89CE"            /* °Oê¬ÐÞ#.øt~d¦›‰Î */
+	$"AEAB A73F F815 0D06 B24E 39EC D8E9 EFB7"            /* ®«§?ø...²N9ìØéï· */
+	$"ED32 55A0 8E21 B52A E55C 17AE E07B 42F4"            /* í2U Ž!µ*å\.®à{Bô */
+	$"D451 CB7C E941 1578 3EE3 9565 087E 9A05"            /* ÔQË|éA.x>ã•e.~š. */
+	$"B5FC 403A AAA2 25CE 5AC1 B658 1EE9 9A53"            /* µü@:ª¢%ÎZÁ¶X.éšS */
+	$"4000 51DF 95E8 C605 97AC C7E1 A8B1 F86C"            /* @.Qß•èÆ.—¬Çᨱøl */
+	$"7C3F 0BCC E410 8FA7 78C0 7964 BDD0 E341"            /* |?.Ìä.�§xÀyd½ÐãA */
+	$"5DC5 D977 EF99 460C FC48 A51A B5CD DE47"            /* ]ÅÙwï™F.üH¥.µÍÞG */
+	$"F9E2 194D 1F2D B2B6 556B 0F68 BD1B 5BEA"            /* ùâ.M.-²¶Uk.h½.[ê */
+	$"9FDD 1280 92A3 EF96 132C 22F6 CA8A 1C20"            /* ŸÝ.€’£ï–.,"öÊŠ.  */
+	$"54DA F163 6119 BC02 7AE6 10CA A16B 993A"            /* TÚñca.¼.zæ.Ê¡k™: */
+	$"E22B CC58 D181 40E6 EA99 0897 5166 4C1F"            /* â+ÌXÑ�@æê™.—QfL. */
+	$"6D58 D092 5119 1AF5 0C2B 1DC6 029D F0E8"            /* mXÐ’Q..õ.+.Æ.�ðè */
+	$"1F6F 9F5C 17D8 68A0 F600 5C68 5C16 4269"            /* .oŸ\.Øh ö.\h\.Bi */
+	$"F5A9 4D97 32DE 3A9C 6609 86C2 1D0F BA56"            /* õ©M—2Þ:œfƆÂ..ºV */
+	$"3C8C 1046 E0DC 2ECB 9BDB D61E 6955 CE38"            /* <Œ.FàÜ.Ë›ÛÖ.iUÎ8 */
+	$"DB97 859B 9E73 78BF FDEB ED74 0C4E 4203"            /* Û—…›žsx¿ýëít.NB. */
+	$"431D 69C4 635D D1EA 1A9A 6462 BE48 DDB9"            /* C.iÄc]Ñê.šdb¾Hݹ */
+	$"6E63 C4D8 8886 51CB 19E6 A7C9 5941 8443"            /* ncÄ؈†QË.æ§ÉYA„C */
+	$"57E5 8C3B B907 FF17 4B41 08DA 7AFC 1B8B"            /* WåŒ;¹.ÿ.KA.Úzü.‹ */
+	$"9B05 622E 1F81 91D8 2C60 9C6A 3B23 608B"            /* ›.b..�‘Ø,`œj;#`‹ */
+	$"F2EC E527 70F9 D963 D302 D7AC 18E2 2692"            /* òìå'pùÙcÓ.׬.â&’ */
+	$"AE0C D915 7E30 5B09 305C 8F5D 1346 3FF2"            /* ®.Ù.~0[Æ0\�].F?ò */
+	$"8635 ECEC 1CB7 962D 0846 3FA9 5920 C1B0"            /* †5ìì.·–-.F?©Y Á° */
+	$"5582 FF3A 24E0 FAAE 8FAE 3843 DFCF B74F"            /* U‚ÿ:$àú®�®8CßÏ·O */
+	$"CAEC 5602 D1C5 1760 5ECD 92C8 1DD1 4ABE"            /* ÊìV.ÑÅ.`^Í’È.ÑJ¾ */
+	$"2336 8A90 E444 6753 D3E0 0F02 8E99 7393"            /* #6Š�äDgSÓà..Ž™s“ */
+	$"8B26 6C9F BFB4 64DE 7867 73F7 10F0 477A"            /* ‹&lŸ¿´dÞxgs÷.ðGz */
+	$"8383 ADA5 49C3 722B 1FD7 0BB5 4118 4714"            /* ƒƒ­¥IÃr+.×.µA.G. */
+	$"D5F9 6C20 CDD0 8151 EAB4 457F FF4E 314C"            /* Õùl ÍÐ�Qê´E.ÿN1L */
+	$"6E7F 04DB DE0C 611B 62AC 2A4E 869C 06FB"            /* n..ÛÞ.a.b¬*N†œ.û */
+	$"DB81 F238 C4FC 149E 8176 3F0C 4B83 0DFF"            /* Û�ò8Äü.ž�v?.Kƒ.ÿ */
+	$"7FB4 A5F5 80C7 E4F0 47AD 8D3F 5426 B12A"            /* .´¥õ€ÇäðG­�?T&±* */
+	$"8678 11E1 A0EF 5439 31D8 E97E 3AE9 E4DD"            /* †x.á ïT91Øé~:éäÝ */
+	$"3DB7 4A94 7FFF 7135 0C02 ACE2 70F5 626B"            /* =·J”.ÿq5..¬âpõbk */
+	$"271A 4401 DF00 AE70 E43B D3F8 75AD 0DAB"            /* '.D.ß.®pä;Óøu­.« */
+	$"794A C0C7 928F 8621 BE61 DA60 A89F 8E95"            /* yJÀÇ’�†!¾aÚ`¨ŸŽ• */
+	$"64E1 4B82 9CA5 D1CB 26FA 3B49 2FDF 8007"            /* dáK‚œ¥ÑË&ú;I/߀. */
+	$"60B1 1C23 B192 973E 87DD 9323 E697 CA76"            /* `±.#±’—>‡Ý“#æ—Êv */
+	$"03D6 B09A 33FA 5CEC 856D 1D12 5249 2492"            /* .Ö°š3ú\ì…m..RI$’ */
+	$"4924 9249 2492 4924 9231 8B0A C6C2 C882"            /* I$’I$’I$’1‹ÂÆÂÈ‚ */
+	$"FC66 E59C E646 38B0 B26F A097 FEA2 30FE"            /* üfåœæF8°²o —þ¢0þ */
+	$"F5B9 90DC 3FEF 3116 73C4 7B20 6C09 EA40"            /* õ¹�Ü?ï1.sÄ{ lÆê@ */
+	$"AB90 6257 8BAD 951C 002E 138D 7274 121D"            /* «�bW‹­•....�rt.. */
+	$"B91E 66F5 6038 8257 FD9A 18C9 0155 522C"            /* ¹.fõ`8‚Wýš.É.UR, */
+	$"D6CC 0F6A 6A4A 09F3 0C4A B702 47FF 7FFC"            /* ÖÌ.jjJÆó.J·.Gÿ.ü */
+	$"B504 0034 6682 CE19 CA7C 50BE F8B0 9DCB"            /* µ..4f‚Î.Ê|P¾ø°�Ë */
+	$"0092 4924 9248 F298 B4D2 A612 6CEE 878F"            /* .’I$’Hò˜´Ò¦.lî‡� */
+	$"FF7F FF5F 8F59 B3E0 FE9F A74E 506D C924"            /* ÿ.ÿ_�Y³àþŸ§NPmÉ$ */
+	$"9249 2492 4924 9249 2492 4924 924D 57A2"            /* ’I$’I$’I$’I$’MW¢ */
+	$"2CC8 426C 393A 96E4 50FB 0ACE 8874 7A86"            /* ,ÈBl9:–äPûÂΈtz† */
+	$"2B20 84D4 0F34 1532 DFF0 D633 0231 0F65"            /* + „Ô.4.2ßðÖ3.1.e */
+	$"91D1 8E19 A917 CD2A 8D35 89BE F64E D1A8"            /* ‘ÑŽ.©.Í*�5‰¾öNѨ */
+	$"926C AE06 3A49 80F9 C1FE 0E81 52D8 5A8C"            /* ’l®.:I€ùÁþ.�RØZŒ */
+	$"7A00 5EF2 9F04 3659 74EC D695 94B6 5B90"            /* z.^òŸ.6YtìÖ•”¶[� */
+	$"89C0 E661 DFC4 5E69 965B 4D1D 4B76 7C0E"            /* ‰ÀæaßÄ^i–[M.Kv|. */
+	$"89D2 C1E8 B1EF CF9E 5E96 3977 AEA6 532B"            /* ‰ÒÁè±ïÏž^–9w®¦S+ */
+	$"68B1 BD73 2BE6 BB5B 766E FA91 5C36 628C"            /* h±½s+æ»[vnú‘\6bŒ */
+	$"F45F FEEA C7DF 49F0 278F F459 E9B6 BDAC"            /* ô_þêÇßIð'�ôY鶽¬ */
+	$"1A28 F485 45C5 2761 DC37 C72A 8A17 2D08"            /* .(ô…EÅ'aÜ7Ç*Š.-. */
+	$"5130 E9D5 E1BD 2D59 07B5 2290 00F9 F737"            /* Q0éÕá½-Y.µ"�.ù÷7 */
+	$"C1F4 5C78 1058 C4C6 13AB AE5C 45DE ACB4"            /* Áô\x.XÄÆ.«®\EÞ¬´ */
+	$"7DC9 03C4 0F82 7850 6F9E 5FD3 9223 36FE"            /* }É.Ä.‚xPož_Ó’#6þ */
+	$"8A1D 1D99 FBB3 646B 206B FC7E 668E 4730"            /* Š..™û³dk kü~fŽG0 */
+	$"7C8C 79D9 A37A 427B 1E91 E7A1 DED2 E57D"            /* |ŒyÙ£zB{.‘ç¡ÞÒå} */
+	$"E167 967A 8B9F A6C0 A36F 68E8 D03C 84C6"            /* ág–z‹Ÿ¦À£ohèÐ<„Æ */
+	$"E952 3CAF 039F 18CD 236C 4AE1 FB74 D7F6"            /* éR<¯.Ÿ.Í#lJáût×ö */
+	$"DFBF B7A4 AFDB D27E 2FB7 7BBF 86F0 DF6F"            /* ß¿·¤¯ÛÒ~/·{¿†ðßo */
+	$"4F9F C3A7 EC7F 0D0F BEDB 1EFB 77AA FB77"            /* OŸÃ§ì...¾Û.ûwªûw */
+	$"2CED 1CDE F39E A2F3 567D 91E9 4703 B8A2"            /* ,í.Þóž¢óV}‘éG.¸¢ */
+	$"5006 2494 6271 81F3 3B95 0B89 EDD5 7FE8"            /* P.$”bq�ó;•.‰íÕ.è */
+	$"B864 3D84 75CD 7478 A5D6 28C8 D483 39EF"            /* ¸d=„uÍtx¥Ö(ÈÔƒ9ï */
+	$"86CA 5763 87CA 97CF A9D4 AFA9 0450 6744"            /* †ÊWc‡Ê—Ï©Ô¯©.PgD */
+	$"16E3 8C0B 0015 88DA 5244 1AB2 9790 35B0"            /* .ãŒ...ˆÚRD.²—�5° */
+	$"0489 B911 D871 2BB4 6576 C185 22B7 1F86"            /* .‰¹.Øq+´evÁ…"·.† */
+	$"230A 3CD3 ECB5 20A6 23BA A068 A53E 8EAD"            /* #Â<Óìµ ¦#º h¥>Ž­ */
+	$"3793 46B5 BA07 96A8 DF28 6A66 CE05 73CE"            /* 7“Fµº.–¨ß(jfÎ.sÎ */
+	$"1938 F9A6 9CBC 0D7F F193 E0D5 09CC 3426"            /* .8ù¦œ¼..ñ“àÕÆÌ4& */
+	$"4BB1 52B9 F337 0537 FA01 B010 5471 B015"            /* K±R¹ó7.7ú.°.Tq°. */
+	$"754C A1A6 E071 800C 1A26 243D 172B 1497"            /* uL¡¦àq€..&$=.+.— */
+	$"E5DF 1EB1 6A6C 6761 3BA6 52C0 C0B4 69BD"            /* åß.±jlga;¦RÀÀ´i½ */
+	$"E6B4 275E EB6E 42BF D693 8928 15A4 9DB2"            /* æ´'^ënB¿Ö“‰(.¤�² */
+	$"D8FA E273 6C04 CBB5 06A9 8096 5E97 5D11"            /* Øúâsl.˵.©€–^—]. */
+	$"0B1B 8E93 BDCC 1AE8 4CBA 9413 A729 F6A7"            /* ..Ž“½Ì.èLº”.§)ö§ */
+	$"F24D 467F 0316 BF60 F777 C2E3 7FAA DC07"            /* òMF...¿`÷wÂã.ªÜ. */
+	$"148F 5C26 91C3 20B8 F3A0 9088 F893 6D47"            /* .�\&‘à ¸ó �ˆø“mG */
+	$"7AC1 A0D9 5483 8281 5B98 28AE 9EAB 94F0"            /* zÁ ÙTƒ‚�[˜(®ž«”ð */
+	$"9B68 08E3 E3DA 7E3A AA84 9EED F083 117F"            /* ›h.ããÚ~:ª„žíðƒ.. */
+	$"FE75 781E E394 EEEC F9AC 21D6 FF5E DD57"            /* þux.ã”îìù¬!Öÿ^ÝW */
+	$"96CF A7DF 3C0D 7E2F F9E7 F212 83EE E629"            /* –ϧß<.~/ùçò.ƒîæ) */
+	$"9543 AA61 C10A 4B12 1DD8 6835 405A D739"            /* •CªaÁÂK..Øh5@Z×9 */
+	$"DBD7 1628 2816 909D 1DEB 81F2 16AF 8953"            /* Û×.((.��.ë�ò.¯‰S */
+	$"9239 B79D A64A 3275 E506 BFD3 0198 776C"            /* ’9·�¦J2uå.¿Ó.˜wl */
+	$"F4C2 39CD 4CF8 2482 D781 526A 7D82 0B83"            /* ôÂ9ÍLø$‚×�Rj}‚.ƒ */
+	$"120C B2AB 1FC0 2DAA 4A72 ACD9 B4C7 926A"            /* ..²«.À-ªJr¬Ù´Ç’j */
+	$"CE69 46FA C67E 904D 12D4 D6EC 2F77 AC43"            /* ÎiFúÆ~�M.ÔÖì/w¬C */
+	$"0A82 A09A 8FAC 59F0 D192 4F8F E6D1 A8B3"            /* ‚ š�¬YðÑ’O�æѨ³ */
+	$"26FD EAD1 7727 E253 F826 580D 8786 8EAD"            /* &ýêÑw'âSø&X.‡†Ž­ */
+	$"4561 33FC 6C93 72E4 3F53 3E92 5E78 9597"            /* Ea3ül“rä?S>’^x•— */
+	$"895F 61B9 D382 514D 839E D4E8 A40B 6F99"            /* ‰_a¹Ó‚QMƒžÔè¤.o™ */
+	$"0BEC 889F F976 6F24 AEAC 2A18 479B 9CD0"            /* .숟ùvo$®¬*.G›œÐ */
+	$"A58D E4A8 4940 D7A9 26A7 8649 C387 22EB"            /* ¥�ä¨I@ש&§†IÇ"ë */
+	$"10F3 AB7F 805D 57F4 6918 508A 429D FC32"            /* .ó«.€]Wôi.PŠB�ü2 */
+	$"0E49 3480 E5A6 0267 54A6 D677 422D 1B62"            /* .I4€å¦.gT¦ÖwB-.b */
+	$"4DFB C3A4 2E01 8C0D 029D D238 87B0 230E"            /* Mûä..Œ..�Ò8‡°#. */
+	$"AB6E AEFD 64F3 F7AE 7BD7 DA13 2BCC DCFB"            /* «n®ýdó÷®{×Ú.+ÌÜû */
+	$"13EC E7EE A36F 86C6 A2D8 DD70 6174 04FA"            /* .ìçî£o†Æ¢ØÝpat.ú */
+	$"B7F7 A3BF 9C4C F99C C177 9B27 9148 3998"            /* ·÷£¿œLùœÁw›'‘H9˜ */
+	$"013A 4B0C E3A5 6905 6ADC 739C 3586 7009"            /* .:K.ã¥i.jÜsœ5†pÆ */
+	$"38DA 0496 C25E DFB2 F2AB 34C0 F138 4F81"            /* 8Ú.–Â^ß²ò«4Àñ8O� */
+	$"7240 2774 4588 B153 267B DBBE DFDE AEAD"            /* r@'tEˆ±S&{Û¾ßÞ®­ */
+	$"1D90 BA71 2B83 D108 1CDB 8B36 7837 8AAA"            /* .�ºq+ƒÑ..Û‹6x7Šª */
+	$"299C 2916 D66C CC2E 2FCF B0E3 228A 88C1"            /* )œ).ÖlÌ./Ï°ã"ŠˆÁ */
+	$"568F 12D8 D599 AB3F 29DE 1FA6 9336 132F"            /* V�.ØÕ™«?)Þ.¦“6./ */
+	$"521E 8EB9 9BD4 30E4 362E 349E 209A 6EB6"            /* R.Ž¹›Ô0ä6.4ž šn¶ */
+	$"D5CC 985B E51E 8A74 B9A0 1718 2753 A1E0"            /* Õ̘[å.Št¹ ..'S¡à */
+	$"BDCC 77CC 5697 641D B916 AB08 C12F 102F"            /* ½ÌwÌV—d.¹.«.Á/./ */
+	$"59A0 4283 27A8 9F9E 1980 381A 4785 E896"            /* Y Bƒ'¨Ÿž.€8.G…è– */
+	$"B9C8 A383 0C1E EBDE A8DC D1A0 00FB 61C2"            /* ¹È£ƒ..ëÞ¨ÜÑ .ûa */
+	$"70F1 84C8 8368 337E DA6C 7A1A 014F 77C3"            /* pñ„ȃh3~Úlz..Owà */
+	$"EFFF 0CCC F88E E539 B4FF 3187 54EA 4B2E"            /* ïÿ.ÌøŽå9´ÿ1‡TêK. */
+	$"27BF 1121 0DCD 456F 5AB4 E115 9E30 8B1C"            /* '¿.!.ÍEoZ´á.ž0‹. */
+	$"FCFB 8634 E35F E3F0 2A65 8EC0 775F C0EE"            /* üû†4ã_ãð*eŽÀw_Àî */
+	$"37B2 6C5A AA44 2B7C 889A 5854 FBB4 DC29"            /* 7²lZªD+|ˆšXTû´Ü) */
+	$"E875 94AB D4F4 19C2 5989 594D 6B55 CB5E"            /* èu”«Ôô.ÂY‰YMkUË^ */
+	$"012C A350 BF1C 322E 6DC6 6CFB 052A B48D"            /* .,£P¿.2.mÆlû.*´� */
+	$"2FFE D908 D443 2FB2 706F 13A8 B2BF 2E97"            /* /þÙ.ÔC/²po.¨²¿.— */
+	$"D7EF 6FE2 7D0B 4D6C 89E6 24BB D547 A266"            /* ×ïoâ}.Ml‰æ$»ÕG¢f */
+	$"3B92 FF58 BE83 0D95 D587 B51D B83A B360"            /* ;’ÿX¾ƒ.•Õ‡µ.¸:³` */
+	$"DF16 A55F 5D17 5ED7 C7D7 88FD D24B 89C4"            /* ß.¥_].^×Ç׈ýÒK‰Ä */
+	$"17FF 1CE0 2FC5 E332 79FF 6532 D599 2C36"            /* .ÿ.à/Åã2yÿe2Õ™,6 */
+	$"7360 56F2 6017 1165 F8CD AC09 6435 530F"            /* s`Vò`..eøͬÆd5S. */
+	$"8E48 0152 06AE 7F31 9D5A A12E EC4A 26BD"            /* ŽH.R.®.1�Z¡.ìJ&½ */
+	$"1D28 2D81 EBF2 625A 03C8 8240 FAB0 343C"            /* .(-�ëòbZ.È‚@ú°4< */
+	$"3460 4650 A369 CBAF D533 EC55 DB4D 46F7"            /* 4`FP£i˯Õ3ìUÛMF÷ */
+	$"45C4 1B75 581D CC26 9E29 8B0F C424 5512"            /* EÄ.uX.Ì&ž)‹.Ä$U. */
+	$"9417 F11C 77C1 F3FD 57B1 487F D8F8 A086"            /* ”.ñ.wÁóýW±H.Øø † */
+	$"E60E 2356 E9E1 F3EC 7F31 52E1 E3DB C75E"            /* æ.#Véáóì.1RáãÛÇ^ */
+	$"7A4B 2D19 8F06 AB86 5A88 F23D C312 C565"            /* zK-.�.«†Zˆò=Ã.Åe */
+	$"1AF0 4B35 F0D9 D100 6634 A377 90C1 A69A"            /* .ðK5ðÙÑ.f4£w�Á¦š */
+	$"1C64 495A BEF2 5A5C 1714 0504 2639 71A2"            /* .dIZ¾òZ\....&9q¢ */
+	$"5989 FF6E F887 5ADD 9843 A719 60CC 5185"            /* Y‰ÿnø‡ZݘC§.`ÌQ… */
+	$"B308 2551 F63A 7543 2A92 3949 FCC5 5023"            /* ³.%Qö:uC*’9IüÅP# */
+	$"5A92 FE32 A26E FF00 9CFC 0CFF 4A08 60C7"            /* Z’þ2¢nÿ.œü.ÿJ.`Ç */
+	$"F76C 480A E682 3C58 66B8 7045 CDBA 616C"            /* ÷lHÂæ‚<Xf¸pEͺal */
+	$"9995 BEC1 809B 0892 A7EC 43EC 7FE8 F49F"            /* ™•¾Á€›.’§ìCì.èôŸ */
+	$"9E4B AFD6 66BB 0B88 38ED B165 9C1D F096"            /* žK¯Öf».ˆ8í±eœ.ð– */
+	$"64EC FD43 9A7A BC84 8CEF 2E65 F99B 4B43"            /* dìýCšz¼„Œï.eù›KC */
+	$"7D47 3AE8 D0DB A066 308B 201D FF3F ABC1"            /* }G:èÐÛ f0‹ .ÿ?«Á */
+	$"CD0D B822 3734 A23E AF05 D1E1 F9F5 AF09"            /* Í.¸"74¢>¯.Ñáùõ¯Æ */
+	$"6428 F517 1201 C3F1 1B80 0DD2 DCD9 CA31"            /* d(õ...Ãñ.€.ÒÜÙÊ1 */
+	$"B022 DAFB D990 A8B1 6FF1 004E 4847 E5C8"            /* °"ÚûÙ�¨±oñ.NHGåÈ */
+	$"0580 DA86 704F E2FF 7E83 5167 5C3F ADB2"            /* .€Ú†pOâÿ~ƒQg\?­² */
+	$"4C44 A9D9 DB84 C360 68ED 1BF0 068E 04BF"            /* LD©ÙÛ„Ã`hí.ð.Ž.¿ */
+	$"D16E B55F 0701 3739 42FA E15C 0EA2 BF81"            /* Ñnµ_..79Búá\.¢¿� */
+	$"31C1 F1A3 A766 CAB8 C82E C96B 4868 D491"            /* 1Áñ£§fʸÈ.ÉkHhÔ‘ */
+	$"5ACB 6EED 4027 0C73 AACA 730C ECA6 DE42"            /* ZËní@'.sªÊs.ì¦ÞB */
+	$"38DA E07E CE64 BC49 7FDD FCCB 07B3 45BF"            /* 8Úà~Îd¼I.ÝüË.³E¿ */
+	$"B9DC FF13 039F D40E 43BB ACE4 B8F8 31F5"            /* ¹Üÿ..ŸÔ.C»¬ä¸ø1õ */
+	$"6743 9390 0B87 C9B1 194A 0200 FB53 29CD"            /* gC“�.‡É±.J..ûS)Í */
+	$"3141 15F5 3C38 9F70 2B7E 0E46 B5A7 5C94"            /* 1A.õ<8Ÿp+~.Fµ§\” */
+	$"AED4 E415 1639 7B49 20DA 1541 9742 A3A6"            /* ®Ôä..9{I Ú.A—B£¦ */
+	$"B873 4C7C 9112 1322 7D7F 5F6E 14AB 57FC"            /* ¸sL|‘.."}._n.«Wü */
+	$"A01D 94EC BC05 F45B C4C4 1FC3 D61B F5D3"            /*  .”ì¼.ô[ÄÄ.ÃÖ.õÓ */
+	$"0E62 9C2F CAE6 C609 B0D2 803B AF5F CC7F"            /* .bœ/ÊæÆÆ°Ò€;¯_Ì. */
+	$"4085 5B49 F81B 0AB3 DB0C 27C1 7A95 45D6"            /* @…[Iø.³Û.'Áz•EÖ */
+	$"CDDD 4F06 1A20 A7FE 22F6 EA13 EB6E C723"            /* ÍÝO.. §þ"öê.ënÇ# */
+	$"87B9 A058 CAF9 9F59 C9C9 6AAD 8358 5147"            /* ‡¹ XÊùŸYÉÉj­ƒXQG */
+	$"2B3E 2FD8 506F A48B 305C 97C7 5D25 5C75"            /* +>/ØPo¤‹0\—Ç]%\u */
+	$"C5B1 E7B4 CBC7 C76A 2FE5 1669 302C 2318"            /* űç´ËÇÇj/å.i0,#. */
+	$"CB1D BB38 5B47 3563 F041 0F00 C23A B1E9"            /* Ë.»8[G5cðA..Â:±é */
+	$"1972 D9C9 2F2F 4013 F8EF A6CA 7E8E 705C"            /* .rÙÉ//@.øï¦Ê~Žp\ */
+	$"0CB6 1301 5ED4 25E6 F7D9 999D AB8F 4CAC"            /* .¶..^Ô%æ÷Ù™�«�L¬ */
+	$"6FF2 04C8 8307 016C 6E46 645B 5488 79C0"            /* oò.ȃ..lnFd[TˆyÀ */
+	$"C0E5 8A2A 46EB DB4C 65A0 27FC 6230 781C"            /* ÀåŠ*FëÛLe 'üb0x. */
+	$"EDB8 4666 1604 1937 9603 A2AA D8C3 43A6"            /* í¸Ff...7–.¢ªØÃC¦ */
+	$"E254 D745 866F D24A DD91 397E C575 F187"            /* âT×E†oÒJÝ‘9~Åuñ‡ */
+	$"193B F5F5 819B 7D57 EC83 0871 ED1B 64F6"            /* .;õõ�›}Wìƒ.qí.dö */
+	$"E47A E1B0 65F9 67DF 5680 3642 52AA BB4B"            /* äzá°eùgßV€6BRª»K */
+	$"BA52 D8BA 8AF7 0A96 412A 92B2 045F 9739"            /* ºRغŠ÷–A*’²._—9 */
+	$"3A52 D961 6BC6 1D2E D90D 29A7 E9DE 2651"            /* :RÙakÆ..Ù.)§éÞ&Q */
+	$"CE3F 9921 03BC 7A7A CBFD 63E2 4C7C 9025"            /* Î?™!.¼zzËýcâL|�% */
+	$"BCC3 D509 745E 9AE4 1675 0242 26EE E4F6"            /* ¼ÃÕÆt^šä.u.B&îäö */
+	$"B04B CFB3 E37F EADB 2840 E47E 0209 C8C5"            /* °Kϳã.êÛ(@ä~.ÆÈÅ */
+	$"56FC 6228 BB57 F43A BE32 0753 73FB EAE2"            /* Vüb(»Wô:¾2.Ssûêâ */
+	$"55B4 D581 42C8 10B8 AEA9 67C4 F685 982C"            /* U´Õ�BÈ.¸®©gÄö…˜, */
+	$"3104 095F DCBD 3701 8749 9CBA A7A5 B714"            /* 1.Æ_ܽ7.‡Iœº§¥·. */
+	$"FDED FAA3 F034 54D8 728F 8640 4A61 560C"            /* ýíú£ð4TØr�†@JaV. */
+	$"50D4 B224 A5F1 6715 6C8B 7EC6 BF5C 120D"            /* PÔ²$¥ñg.l‹~Æ¿\.. */
+	$"8797 B25E B0E1 C57E 69AF 1FF2 99C3 44B5"            /* ‡—²^°áÅ~i¯.ò™ÃDµ */
+	$"0508 0061 1F44 795F 27C0 511E 0796 9740"            /* ...a.Dy_'ÀQ..–—@ */
+	$"14FF 4C51 5651 34F3 658D 4CA8 3FBF 43CC"            /* .ÿLQVQ4óe�L¨?¿CÌ */
+	$"8813 D372 1723 7DB5 6D44 4524 4E91 B644"            /* ˆ.Ór.#}µmDE$N‘¶D */
+	$"4B7D CDEC E0E0 8468 622D 87FE 80E3 E097"            /* K}Íìàà„hb-‡þ€ãà— */
+	$"303D 8894 1FFF 7FA6 9AAB C6E0 0B83 3EDD"            /* 0=ˆ”.ÿ.¦š«Æà.ƒ>Ý */
+	$"86A5 43D3 C650 0008 D364 A800 0000 0000"            /* †¥CÓÆP..Ód¨..... */
+	$"0000 07D7 8F92 61B9 E6E0 BCBF CD4A AB76"            /* ...×�’a¹æ༿ÍJ«v */
+	$"5B6E 246A 8DFB D274 41F9 3583 773D 5165"            /* [n$j�ûÒtAù5ƒw=Qe */
+	$"2139 B773 476E DF91 33F0 8CDA F420 613F"            /* !9·sGnß‘3ðŒÚô a? */
+	$"9B35 33C9 8298 A661 A5DB 2CEF 1A1C BC3E"            /* ›53É‚˜¦a¥Û,ï..¼> */
+	$"09B4 5415 8511 4FE5 3FF8 B88C 339D C169"            /* Æ´T.….Oå?ø¸Œ3�Ái */
+	$"9608 FF62 B2D6 285A 80A2 22C9 E4AA 5A99"            /* –.ÿb²Ö(Z€¢"ÉäªZ™ */
+	$"B3F5 E9D4 7FFF 7FF4 7D5C 4CC0 788F 0EB6"            /* ³õéÔ.ÿ.ô}\LÀx�.¶ */
+	$"8024 0000 0A1E 1F40 0000 0000 0000 0000"            /* €$..Â..@........ */
+	$"CA54 CF6A 897B B6D7 9C90 87E9 FF6A 22A0"            /* ÊTÏj‰{¶×œ�‡éÿj"  */
+	$"0765 4AE8 B827 B7A1 C412 4000 0000 0000"            /* .eJè¸'·¡Ä.@..... */
+	$"0000 2222 DAB7 AEED C4EB AFCB FF79 6610"            /* ..""Ú·®íÄë¯Ëÿyf. */
+	$"A362 D5F2 1401 DA9F 8978 3FC3 FF60 341C"            /* £bÕò..ÚŸ‰x?Ãÿ`4. */
+	$"524C CBF3 AF64 9BA4 637F F217 CA8C A4CE"            /* RLËó¯d›¤c.ò.ÊŒ¤Î */
+	$"A881 46DE C63F CB0B 4C86 F71C CDFF 6CDC"            /* ¨�FÞÆ?Ë.L†÷.ÍÿlÜ */
+	$"3C86 AFD6 02EF 25B3 E392 0238 14ED F9FF"            /* <†¯Ö.ï%³ã’.8.íùÿ */
+	$"71EA 1A7B 7848 281D C18D 83C1 F0D1 C115"            /* qê.{xH(.Á�ƒÁðÑÁ. */
+	$"C525 7E38 9E60 32A4 CED2 A5DE 8006 1212"            /* Å%~8ž`2¤ÎÒ¥Þ€... */
+	$"7136 14A1 74D1 9C7D F74C 708E 43DE 4154"            /* q6.¡tÑœ}÷LpŽCÞAT */
+	$"2939 179A 87BB 2AAF 7401 4404 CB30 458F"            /* )9.š‡»*¯t.D.Ë0E� */
+	$"F1B7 EE42 3E46 458F B220 6F30 EE24 7D86"            /* ñ·îB>FE�² o0î$}† */
+	$"2D28 3CA7 C184 60D3 4EBC 9C79 C402 02FC"            /* -(<§Á„`ÓN¼œyÄ..ü */
+	$"553C C62D DDC0 3D0C F12B C1FF 546D A4FF"            /* U<Æ-ÝÀ=.ñ+ÁÿTm¤ÿ */
+	$"5885 6B1B 9EF6 2206 8FB5 1CB0 2D3D B922"            /* X…k.žö".�µ.°-=¹" */
+	$"644F D104 0152 70F8 BF41 4D6E 4F05 B928"            /* dOÑ..Rpø¿AMnO.¹( */
+	$"396A 4A92 9B1B 24AB 4611 6D95 87D6 2D7C"            /* 9jJ’›.$«F.m•‡Ö-| */
+	$"7546 B839 A3B1 C612 0F2A 796E 7911 5FF9"            /* uF¸9£±Æ..*yny._ù */
+	$"03C4 D13E EF00 2DEF 9CFE FDDE 3A2C FF3E"            /* .ÄÑ>ï.-ïœþýÞ:,ÿ> */
+	$"4567 F432 3673 3F84 8787 B65C 7A4F 2007"            /* Egô26s?„‡‡¶\zO . */
+	$"FF7C D894 A762 3872 8FA4 9563 D178 5039"            /* ÿ|Ø”§b8r�¤•cÑxP9 */
+	$"C4BD 2EB4 0491 2A80 0000 0000 0000 0001"            /* Ľ.´.‘*€........ */
+	$"F172 6FA1 09F2 9F35 F3BC 2E0B 8E46 2557"            /* ñro¡ÆòŸ5ó¼..ŽF%W */
+	$"67C5 4F12 D1CF F08C BC61 0F89 E4A4 9249"            /* gÅO.ÑÏðŒ¼a.‰ä¤’I */
+	$"2492 4924 9249 221B 4708 65ED 84CA FDD2"            /* $’I$’I".G.eí„ÊýÒ */
+	$"D193 7C69 0CA3 95EF DDF2 33FF 556E D976"            /* Ñ“|i.£•ïÝò3ÿUnÙv */
+	$"2E4D FDCE E0FC 8669 83FF 768E 3CBB 179B"            /* .MýÎàü†iƒÿvŽ<».› */
+	$"DBB9 253D BFFF 79F1 5006 27BF 5548 40B9"            /* Û¹%=¿ÿyñP.'¿UH@¹ */
+	$"BADC F963 10BA 8BD9 367F E03A 6E29 5908"            /* ºÜùc.º‹Ù6.à:n)Y. */
+	$"0000 0000 0000 0000 0028 8080 0000 000A"            /* .........(€€... */
+	$"6370 D000 0142 83C0 0000 0011 CD3F D940"            /* cpÐ..BƒÀ....Í?Ù@ */
+	$"0022 C990 C912 501C 14FC 1926 5412 0E88"            /* ."É�É.P..ü.&T..ˆ */
+	$"C32F B2ED E7A4 9249 2492 4924 9249 247E"            /* Ã/²í礒I$’I$’I$~ */
+	$"FB2C 999E D2ED 6DFF 783B 4C3A 3DB7 14A5"            /* û,™žÒímÿx;L:=·.¥ */
+	$"872C 2B85 8FC2 72EA 3412 FCA8 32E0 7A2E"            /* ‡,+…�Ârê4.ü¨2àz. */
+	$"B109 F66C 3F99 7C32 2761 1522 7B9C 1851"            /* ±Æöl?™|2'a."{œ.Q */
+	$"B3CB 5373 0652 CE79 D8C5 B721 03D7 CD81"            /* ³ËSs.RÎyØÅ·!.×Í� */
+	$"A03A CD5F CECF B58A 4122 7ED2 9FFF 7FFF"            /*  :Í_ÎϵŠA"~ÒŸÿ.ÿ */
+	$"1575 DF0B 430B 0A6C 6108 B421 B33F E9FA"            /* .uß.C.Âla.´!³?éú */
+	$"AC06 391C EB01 17F4 3BF4 4CDA 87DA 516F"            /* ¬.9.ë..ô;ôLÚ‡ÚQo */
+	$"EFA3 E7F9 651A 6902 C269 AF79 2EA4 D861"            /* ï£çùe.i.Âi¯y.¤Øa */
+	$"CBC1 7F37 146D 4163 38BB B16B AAD4 9AC2"            /* ËÁ.7.mAc8»±kªÔšÂ */
+	$"424A B3CE 1368 78EF B4B0 FE68 2FBA 0CB2"            /* BJ³Î.hxï´°þh/º.² */
+	$"E672 A89D 999E 64CD 417A 98A3 8458 0603"            /* ær¨�™ždÍAz˜£„X.. */
+	$"C03D 9F9E B15E 8418 0FC6 F3E0 BA39 A3C1"            /* À=Ÿž±^„..Æóàº9£Á */
+	$"9929 0547 9C29 FC76 57CA B1E5 F887 AE73"            /* ™).Gœ)üvWʱåø‡®s */
+	$"78AA BA9F FF7F C07C 00F0 28E9 7533 0FC1"            /* xªºŸÿ.À|.ð(éu3.Á */
+	$"097C 4ABC F3CB 6604 EEC2 5194 A1F2 A201"            /* Æ|J¼óËf.îÂQ”¡ò¢. */
+	$"D6B0 C5F3 4AA3 8FD8 34DC A382 0CD4 134E"            /* Ö°ÅóJ£�Ø4Ü£‚.Ô.N */
+	$"8275 37F5 2388 74C6 1A6C F889 1037 A348"            /* ‚u7õ#ˆtÆ.lø‰.7£H */
+	$"ACB4 EFF5 B446 564C C6DC 75F7 8445 013F"            /* ¬´ïõ´FVLÆÜu÷„E.? */
+	$"79FF 407B 05EE 9C66 8A53 FF7A 367A 6D06"            /* yÿ@{.îœfŠSÿz6zm. */
+	$"9ADF CBDD 25B5 0629 78A0 A071 35BA EE49"            /* šßËÝ%µ.)x  q5ºîI */
+	$"64E9 3EA3 9A07 917A 66E3 090C B916 3BF5"            /* dé>£š.‘zfãÆ.¹.;õ */
+	$"10D7 77D5 7281 248E 3F09 0C0F 319E 7F71"            /* .×wÕr�$Ž?Æ..1ž.q */
+	$"98DA A34A C823 06A4 6BFD 8EA1 8C71 EB25"            /* ˜Ú£JÈ#.¤kýŽ¡Œqë% */
+	$"E5FC 0BA1 DB35 9514 A229 56F0 7E42 9FD0"            /* åü.¡Û5•.¢)Vð~BŸÐ */
+	$"5435 3CB7 AED9 0A4F 625B A493 D1B2 C654"            /* T5<·®ÙÂOb[¤“ѲÆT */
+	$"F691 87F9 F8E9 7459 1823 E06B 57D6 C638"            /* ö‘‡ùøétY.#àkWÖÆ8 */
+	$"7EE2 8CA0 1D79 4000 0000 0000 0000 0000"            /* ~⌠.y@......... */
+	$"0000 0000 442A 0D8C 8522 4E1A 3752 5040"            /* ....D*.Œ…"N.7RP@ */
+	$"E53D EE69 0B70 A6BF 9D0D D725 D66E 8D50"            /* å=îi.p¦¿�.×%Ön�P */
+	$"10DB 966B 649B 0CA3 958B 6457 90CC 214A"            /* .Û–kd›.£•‹dW�Ì!J */
+	$"C4C0 27A2 95F4 98AD 14C2 1892 EBE7 864B"            /* ÄÀ'¢•ô˜­.Â.’ëç†K */
+	$"18AA 55C7 50D2 4A15 7F4E 566A 9C13 9C52"            /* .ªUÇPÒJ..NVjœ.œR */
+	$"AC77 FE86 B3A2 5D92 D112 516C BA99 60EE"            /* ¬wþ†³¢]’Ñ.Qlº™`î */
+	$"221A F194 D9DF FF5F FF6B 77F9 4B01 4F8F"            /* ".ñ”Ùßÿ_ÿkwùK.O� */
+	$"F681 8614 2F3E 31E3 EABB 7C34 6025 A491"            /* ö�†./>1ãê»|4`%¤‘ */
+	$"9BC1 A348 628D 34AE 751A F8F7 7521 7F48"            /* ›Á£Hb�4®u.ø÷u!.H */
+	$"68A4 6B9C F66F 252D 6021 9C97 39AB B637"            /* h¤kœöo%-`!œ—9«¶7 */
+	$"3B5D E8FB 56EE 824A F65D C84D E23C 7BF2"            /* ;]èûVî‚Jö]ÈMâ<{ò */
+	$"5400 0000 0000 0000 0000 0000 0014 080D"            /* T............... */
+	$"B05B 4688 1F60 376D 2209 1DE1 7E75 CD30"            /* °[Fˆ.`7m"Æ.á~uÍ0 */
+	$"5D2F 627B A077 8D86 2001 62AF 1031 6853"            /* ]/b{ w�† .b¯.1hS */
+	$"2A8E 0308 16F6 C4EC E5B6 814A 1DF2 23EB"            /* *Ž...öÄìå¶�J.ò#ë */
+	$"8C16 64F9 A1ED 8A1F 346E 2E1C 5ACB 4376"            /* Œ.dù¡íŠ.4n..ZËCv */
+	$"5014 B885 5212 5294 8F4F DF56 7339 8A5D"            /* P.¸…R.R”�OßVs9Š] */
+	$"03C0 A05F D60B 5D58 2677 CD67 A4EE 3803"            /* .À _Ö.]X&wÍg¤î8. */
+	$"B2B1 9AD5 A41A C3EF 3281 3FFF 780A A5BD"            /* ²±šÕ¤.Ãï2�?ÿxÂ¥½ */
+	$"861B 62F7 456F 1021 93CD A115 BD61 7E4C"            /* †.b÷Eo.!“Í¡.½a~L */
+	$"2306 D6BF D5D9 18AF 12BB 22D9 E32E 6976"            /* #.Ö¿ÕÙ.¯.»"Ùã.iv */
+	$"9282 5E47 A842 7983 2C87 64C5 6215 A0D9"            /* ’‚^G¨Byƒ,‡dÅb. Ù */
+	$"E45A EFAE 74F3 E5E5 7679 A7C0 D366 649C"            /* äZï®tóååvy§ÀÓfdœ */
+	$"9EF3 D763 2D6C D0AD 48E5 7A2A 9454 8B34"            /* žó×c-lЭHåz*”T‹4 */
+	$"B7FF 7FCD F604 90E4 2716 1C40 DD8A 8B1A"            /* ·ÿ.Íö.�ä'..@ÝŠ‹. */
+	$"24C8 2F0C 06AC 999A 58B7 C15E E6B1 431B"            /* $È/..¬™šX·Á^æ±C. */
+	$"73D1 FEC5 5182 4A2D 33CB E920 AFBE 9F5A"            /* sÑþÅQ‚J-3Ëé ¯¾ŸZ */
+	$"0478 C2F3 80D7 241A 2E07 8BF3 FD3F 471A"            /* .xÂó€×$...‹óý?G. */
+	$"7C53 1C79 2F17 C32F D5C6 B977 E2F9 9D80"            /* |S.y/.Ã/Õƹwâù�€ */
+	$"558B 7336 75BC 5945 3986 BD1C CE95 EA07"            /* U‹s6u¼YE9†½.Εê. */
+	$"7152 C778 65AD 73E9 F1B7 24D4 BDB0 7F24"            /* qRÇxe­séñ·$Ô½°.$ */
+	$"BACD 3C51 D344 33D7 21C7 BE9A 915D 2808"            /* ºÍ<QÓD3×!Ǿš‘](. */
+	$"3E68 3F1B 43AE 8F30 CE7F FF67 1C78 8498"            /* >h?.C®�0Î.ÿg.x„˜ */
+	$"08D8 E1D9 3F1A E50B EB7C E564 6F4C 57F3"            /* .ØáÙ?.å.ë|ådoLWó */
+	$"9E60 5F9B 244E 83A9 33C9 668A 3951 7E33"            /* ž`_›$Nƒ©3ÉfŠ9Q~3 */
+	$"31D7 01E7 0342 6BC0 7FD1 7488 2BE1 9AD1"            /* 1×.ç.BkÀ.Ñtˆ+ášÑ */
+	$"1938 BBD8 7710 BAD3 BB92 2C80 A162 B2EF"            /* .8»Øw.ºÓ»’,€¡b²ï */
+	$"3FEA 6FC2 47D2 0D0E 28AB 03DA 4B34 4027"            /* ?êoÂGÒ..(«.ÚK4@' */
+	$"7FFD 87BC 9D96 E076 3C00 0000 0000 0000"            /* .ý‡¼�–àv<....... */
+	$"0000 0000 0000 136C 1721 95F0 1991 3F80"            /* .......l.!•ð.‘?€ */
+	$"65DC 1F3F AEA0 BE5C 71D2 94CE C7FF 7FFF"            /* eÜ.?® ¾\qÒ”ÎÇÿ.ÿ */
+	$"7917 BEAD D458 935A 563C CC9C 6C0D CFFF"            /* y.¾­ÔX“ZV<Ìœl.Ïÿ */
+	$"55DA 93C2 F199 3D1E C4C2 3C5F A7BC D48E"            /* UÚ“Âñ™=.ÄÂ<_§¼ÔŽ */
+	$"4980 037B 9FCC F7BC 6E1E 78CD 2838 DC58"            /* I€.{ŸÌ÷¼n.xÍ(8ÜX */
+	$"F156 C827 88EA BFF7 BD95 BBD6 FE11 C305"            /* ñVÈ'ˆê¿÷½•»Öþ.Ã. */
+	$"A1D2 FA2A EA0B E56B 285B 91FE 551E F5E2"            /* ¡Òú*ê.åk([‘þU.õâ */
+	$"687C 5A51 1A67 64D3 BD76 4937 F455 4C94"            /* h|ZQ.gdÓ½vI7ôUL” */
+	$"6A7E B888 CB40 7AA3 DDEE 8BD8 2D9F 1EB6"            /* j~¸ˆË@z£Ýî‹Ø-Ÿ.¶ */
+	$"48DF 9C66 6BF3 A26A 3CC4 2D4D E47A 6D9A"            /* Hßœfkó¢j<Ä-Mäzmš */
+	$"DAB1 1DA4 083A D994 4416 C0D2 2E63 539E"            /* Ú±.¤.:Ù”D.ÀÒ.cSž */
+	$"7274 3C04 85F4 D7B5 EDEF 507A B2B7 1832"            /* rt<.…ô×µíïPz²·.2 */
+	$"6615 A186 4A80 0000 0000 0000 0000 0000"            /* f.¡†J€.......... */
+	$"07CF BF6C 3626 7453 BF7D 8B57 26C9 F556"            /* .Ï¿l6&tS¿}‹W&ÉõV */
+	$"1F12 0BB9 5DC4 797D 3C69 7DB2 2FFF 7F33"            /* ...¹]Äy}<i}²/ÿ.3 */
+	$"81FC E4ED 4BF8 9180 3FD2 0142 3F2D 1DF0"            /* �üäíKø‘€?Ò.B?-.ð */
+	$"097B D61C 019A C409 B506 26FC D55D 7AE9"            /* Æ{Ö..šÄƵ.&üÕ]zé */
+	$"3464 6C57 13E7 565F 2553 70C3 3EC7 87AC"            /* 4dlW.çV_%SpÃ>LJ¬ */
+	$"3161 5289 3A6A FC0B E254 CAFA 6A32 2F8C"            /* 1aR‰:jü.âTÊúj2/Œ */
+	$"8B76 FA87 DADD 0333 2250 0058 F5C6 21CD"            /* ‹vú‡ÚÝ.3"P.XõÆ!Í */
+	$"D094 5CD5 10DD 2FA0 B74B 06FB AA9B 2B62"            /* Д\Õ.Ý/ ·K.ûª›+b */
+	$"E36D 708E B8F5 0739 3097 7F03 47BE 48F5"            /* ãmpŽ¸õ.90—..G¾Hõ */
+	$"D079 1641 CA5D DF28 C92B 0EFA B18F CE6F"            /* Ðy.AÊ]ß(É+.ú±�Îo */
+	$"6648 DB26 DE5C 1D17 2BD3 28AF DD89 801C"            /* fHÛ&Þ\..+Ó(¯Ý‰€. */
+	$"AB0D 40D1 9016 D542 63A0 8222 9D7A F0F5"            /* «.@Ñ�.ÕBc ‚"�zðõ */
+	$"A171 2D28 3D2C C22E 09AB 3AA9 C50B 7545"            /* ¡q-(=,Â.Æ«:©Å.uE */
+	$"4C64 18E8 8E67 3A7D DDBE 36CE 2F97 5AD0"            /* Ld.èŽg:}ݾ6Î/—ZÐ */
+	$"E4F0 8AFB 6071 6268 E5F6 09EA 245F 9F87"            /* äðŠû`qbhåöÆê$_Ÿ‡ */
+	$"E304 242C 234C 9FF7 1D0A 11C7 4FE7 20BC"            /* ã.$,#LŸ÷.Â.ÇOç ¼ */
+	$"EC58 1A4B 5A8E DE45 0E5F 4A03 4C8A 5051"            /* ìX.KZŽÞE._J.LŠPQ */
+	$"E410 4405 321B BD82 AC69 94F7 AA5E 5C65"            /* ä.D.2.½‚¬i”÷ª^\e */
+	$"436F 861A C95F 1AB0 2E2B 9689 AA43 B247"            /* Co†.É_.°.+–‰ªC²G */
+	$"6DE3 4E9E F205 F221 D175 86BB 4434 C0EE"            /* mãNžò.ò!Ñu†»D4Àî */
+	$"C472 EA2B 499D 63FA B4C8 FAB3 91F3 060D"            /* Ärê+I�cú´Èú³‘ó.. */
+	$"C203 A636 1D98 6B00 D678 0D3C BE92 309E"            /* Â.¦6.˜k.Öx.<¾’0ž */
+	$"759A 11D4 B514 24FB E4D2 7089 76DE 42DD"            /* uš.Ôµ.$ûäÒp‰vÞBÝ */
+	$"5338 4798 5943 4A6B 500A 472E 77BE AEBD"            /* S8G˜YCJkPÂG.w¾®½ */
+	$"93B0 117A 0E2D A8E4 DFED 5A76 1775 2BFF"            /* “°.z.-¨äßíZv.u+ÿ */
+	$"1A84 CBE1 B007 D3EA 11B0 9BB8 4B3F BB56"            /* .„Ëá°.Óê.°›¸K?»V */
+	$"33F6 B242 4C5C A63D 638F 1BA5 0AC5 698D"            /* 3ö²BL\¦=c�.¥ÂÅi� */
+	$"45B3 D343 D769 FEEE C45D 50B0 9AAA 4146"            /* E³ÓC×iþîÄ]P°šªAF */
+	$"0BFA F8CC 694B A42D FC1E C3F1 54F0 D3F9"            /* .úøÌiK¤-ü.ÃñTðÓù */
+	$"F051 5182 D373 5210 38AA F9B0 D3F3 6B07"            /* ðQQ‚ÓsR.8ªù°Óók. */
+	$"C944 7FCA 2126 D17A 01B1 7763 CDE8 D5FF"            /* ÉD.Ê!&Ñz.±wcÍèÕÿ */
+	$"00F4 08D7 4060 339C D8E2 7EA4 B00D 3171"            /* .ô.×@`3œØâ~¤°.1q */
+	$"ABB0 7F47 D146 13B9 398E 14B3 C55D 10AF"            /* «°.GÑF.¹9Ž.³Å].¯ */
+	$"8D0A 2444 26A0 EFEA 6CB2 51FD EA28 0FD7"            /* �Â$D& ïêl²Qýê(.× */
+	$"4E2F F54F 0066 62F2 66F3 334C 5D9D 77ED"            /* N/õO.fbòfó3L]�wí */
+	$"F3D0 12ED 7A95 89A1 B928 8429 DCFB 8C68"            /* óÐ.íz•‰¡¹(„)ÜûŒh */
+	$"C35C 3C77 5D7D 5180 A012 ADA3 AE60 AAE0"            /* Ã\<w]}Q€ .­£®`ªà */
+	$"0D88 09A4 4F7B FAC4 A2FD 327D E109 4F0B"            /* .ˆÆ¤O{úÄ¢ý2}áÆO. */
+	$"3343 C0ED D985 7402 93E2 7A2E 09B4 09A6"            /* 3CÀíÙ…t.“âz.ƴƦ */
+	$"5348 2E51 C037 BE62 C1A7 15C4 B9C8 7F4B"            /* SH.QÀ7¾bÁ§.ĹÈ.K */
+	$"FC22 3596 D989 C701 6701 5488 1001 22B2"            /* ü"5–Ù‰Ç.g.Tˆ.."² */
+	$"C06A A5D5 2C94 6BA9 D1C6 2B33 5910 8B1F"            /* Àj¥Õ,”k©ÑÆ+3Y.‹. */
+	$"0B0D 5531 BE0F 3E72 9C60 75A8 2669 220D"            /* ..U1¾.>rœ`u¨&i". */
+	$"E140 D538 7CD4 5763 D708 6D5E 45C0 AE61"            /* á@Õ8|ÔWc×.m^EÀ®a */
+	$"EC8B E180 1D9C 712C 4DB9 F177 6733 0F76"            /* ì‹á€.œq,M¹ñwg3.v */
+	$"9A72 7AD0 D18D 2BE6 9DCE 6294 4092 CE8E"            /* šrzÐÑ�+æ�Îb”@’ÎŽ */
+	$"ACED 8B00 B050 AE53 C09C 98D6 CFD1 4208"            /* ¬í‹.°P®SÀœ˜ÖÏÑB. */
+	$"DEB2 AF01 5ED7 E1F4 4EAA 0B09 2263 FE09"            /* Þ²¯.^×áôNª.Æ"cþÆ */
+	$"2771 6EB7 9181 1DFE A5DD 9A12 4592 02FD"            /* 'qn·‘�.þ¥Ýš.E’.ý */
+	$"5F2D D4D6 5C15 B454 B07C 9B6A B9F9 AEC2"            /* _-ÔÖ\.´T°|›j¹ù®Â */
+	$"D883 1F5F B9B1 8258 6732 C7E3 5C90 DB16"            /* ؃._¹±‚Xg2Çã\�Û. */
+	$"42EC D875 2B9D FEAF 1FED BD80 261D BAAE"            /* BìØu+�þ¯.í½€&.º® */
+	$"3799 FDC7 DBE5 E769 A11C 3304 5D3B 419C"            /* 7™ýÇÛåçi¡.3.];Aœ */
+	$"5844 E615 EE7A 5DCE 272E D055 121D 1F84"            /* XDæ.îz]Î'.ÐU...„ */
+	$"2EC6 E6B1 A7DA D03A D600 6D58 4FF0 9196"            /* .Æ汧ÚÐ:Ö.mXOð‘– */
+	$"FBCA CDDC 1B8D 9D1A BB7B 3782 0F3F 626C"            /* ûÊÍÜ.��.»{7‚.?bl */
+	$"26AA AF34 6A20 8210 1E96 ED21 5A26 EF04"            /* &ª¯4j ‚..–í!Z&ï. */
+	$"5F66 5C2D A8A4 F3BC 1871 AD1D FE4D 8C8B"            /* _f\-¨¤ó¼.q­.þMŒ‹ */
+	$"F1E5 A382 654B 08C7 EFC4 BFBA C29B 5C73"            /* ñ壂eK.ÇïÄ¿ºÂ›\s */
+	$"2420 9390 3B75 6DE6 0208 6F4F BB53 B2AA"            /* $ “�;umæ..oO»S²ª */
+	$"AD28 4360 1A8A 4301 088C 6F17 68CC 9180"            /* ­(C`.ŠC..Œo.hÌ‘€ */
+	$"D757 7012 3BE3 C4AB DF05 97B9 4B57 B6FC"            /* ×Wp.;ãÄ«ß.—¹KW¶ü */
+	$"7693 36DE 89E8 E2AB 4352 A782 4520 DA28"            /* v“6Þ‰èâ«CR§‚E Ú( */
+	$"F1F2 34D6 2EAE E401 ED61 1E2E 4E74 D4EB"            /* ñò4Ö.®ä.ía..NtÔë */
+	$"98A9 94AD F856 8EE1 E3D0 06FC AA37 31E5"            /* ˜©”­øVŽáãÐ.üª71å */
+	$"1047 113E C151 CE86 B6A4 0F82 E5D9 CE50"            /* .G.>ÁQΆ¶¤.‚åÙÎP */
+	$"57A8 8F86 AFAD 21D1 2C4C F181 8BD7 106C"            /* W¨�†¯­!Ñ,Lñ�‹×.l */
+	$"3C77 649E 038E 3C63 66F4 EE1A 2906 755C"            /* <wdž.Ž<cfôî.).u\ */
+	$"EDD8 6093 6868 531C 9FA3 C5C9 3F3C 7786"            /* íØ`“hhS.Ÿ£ÅÉ?<w† */
+	$"BCC4 440C 13F9 0BCB 76BA 9364 A3CC 344F"            /* ¼ÄD..ù.Ëvº“d£Ì4O */
+	$"128B D594 CB9D A2DC 6C03 CA48 2D9E 9706"            /* .‹Õ”Ë�¢Ül.ÊH-ž—. */
+	$"A281 5170 A91B 0033 4552 2A9A BF6F D4A9"            /* ¢�Qp©..3ER*š¿oÔ© */
+	$"61B6 F6C1 7959 FDD2 8F3F C94B 2B90 29BB"            /* a¶öÁyYýÒ�?ÉK+�)» */
+	$"9FAA A83B FEFF 80A3 1EC2 B2D9 77CF 963B"            /* Ÿª¨;þÿ€£.²ÙwÏ–; */
+	$"85FF 5728 5CDD 2F01 7556 8155 F8AA 7984"            /* …ÿW(\Ý/.uV�Uøªy„ */
+	$"7543 0C18 A1FC 0353 DF5F D368 41E9 E0EF"            /* uC..¡ü.Sß_ÓhAéàï */
+	$"C363 A78F 3FE9 41E9 5F77 19A4 A811 FF43"            /* Ãc§�?éAé_w.¤¨.ÿC */
+	$"8EE8 3FBA 00FA 54F6 15F5 CF3B 39A6 0984"            /* Žè?º.úTö.õÏ;9¦Æ„ */
+	$"CC99 7AE1 8E5B 71A9 1575 DB95 F166 D52F"            /* Ì™záŽ[q©.uÛ•ñfÕ/ */
+	$"A270 08D4 9515 3B89 2EA1 A097 12A3 B4E9"            /* ¢p.Ô•.;‰.¡ —.£´é */
+	$"5BFB AE47 8FD7 60F0 33DA E91B 234B 5D2F"            /* [û®G�×`ð3Úé.#K]/ */
+	$"7C4B 00C2 60F1 7260 B78A 1835 B440 611B"            /* |K.Â`ñr`·Š.5´@a. */
+	$"042D F768 F9C9 8785 50AD 8421 77D4 B97A"            /* .-÷hùɇ…P­„!wÔ¹z */
+	$"6B02 828C E758 8B31 1E92 DF7F BE67 3DAB"            /* k.‚ŒçX‹1.’ß.¾g=« */
+	$"E5F8 F1FB FD8C 34F4 4B2F 98BF 24A9 4DF2"            /* åøñûýŒ4ôK/˜¿$©Mò */
+	$"32A9 A661 B01E F960 12E1 9C18 F197 CEA7"            /* 2©¦a°.ù`.áœ.ñ—Χ */
+	$"E1C4 4AB4 7CEB 2CE2 33F3 C23C F3FD 2CF9"            /* áÄJ´|ë,â3óÂ<óý,ù */
+	$"F132 8395 3D39 FD9D 983D 4454 9758 856B"            /* ñ2ƒ•=9ý�˜=DT—X…k */
+	$"6556 B234 72B0 C2CA 71CA 9CEB 7AE4 FD7C"            /* eV²4r°ÂÊqÊœëzäý| */
+	$"0E3F 1930 6B17 7074 C216 3D9C 24BF 5B97"            /* .?.0k.ptÂ.=œ$¿[— */
+	$"A7EA 25F0 9DCC AFA5 BBEF 47E9 D7E6 7B0E"            /* §ê%ð�̯¥»ïGé×æ{. */
+	$"E02F 87A2 EF87 68FC 9BF7 F274 5F00 FC3D"            /* à/‡¢ï‡hü›÷òt_.ü= */
+	$"A5F8 7AC7 F0FA A5F8 7D42 C03F 0F42 FE1D"            /* ¥øzÇðú¥ø}BÀ?.Bþ. */
+	$"ABF0 F7CF E1EE 40ED 1CBC E67A C7C3 33E9"            /* «ð÷Ïáî@í.¼æzÇÃ3é */
+	$"75CE 6202 697A FF68 B299 C0A6 2F39 4F64"            /* uÎb.izÿh²™À¦/9Od */
+	$"6775 1459 6387 68C9 941E E328 B150 8D7C"            /* gu.Yc‡hÉ”.ã(±P�| */
+	$"24C4 D953 4443 9A50 E4CC 4E41 B3A9 F28A"            /* $ÄÙSDCšPäÌNA³©òŠ */
+	$"BB0E 943C 0DAB C98A 023C 332B AE2D AF60"            /* ».”<.«ÉŠ.<3+®-¯` */
+	$"4D30 BA77 9D1A 93DC CEBB 7560 EA33 084C"            /* M0ºw�.“Üλu`ê3.L */
+	$"BCFD 2F47 685E 4CC9 8A76 F1C8 04AB 126F"            /* ¼ý/Gh^LÉŠvñÈ.«.o */
+	$"B9FD 4A34 E181 4147 9F56 2AB4 EB2C 50EF"            /* ¹ýJ4á�AGŸV*´ë,Pï */
+	$"D652 4543 763B B857 210B 2B4A BB50 0EAE"            /* ÖRECv;¸W!.+J»P.® */
+	$"90BD EEEC F92B DD18 0881 9B3A C6DF A028"            /* �½îìù+Ý..�›:Æß ( */
+	$"45EB 36D7 50B4 D756 FB49 9F08 D74D 037B"            /* Eë6×P´×VûIŸ.×M.{ */
+	$"83A1 001C 0977 1DCC 81D0 B6B9 828A 6851"            /* ƒ¡..Æw.Ì�ж¹‚ŠhQ */
+	$"3CAC B3FF 572B 543A 4C73 3F35 0561 EC81"            /* <¬³ÿW+T:Ls?5.aì� */
+	$"A8D4 82BC 9148 5E30 FF3E 3164 C43E 5461"            /* ¨Ô‚¼‘H^0ÿ>1dÄ>Ta */
+	$"4BD0 139E 6390 0E05 4793 56B8 5080 CBF6"            /* KÐ.žc�..G“V¸P€Ëö */
+	$"9E70 BEA1 FB26 DD1E AEE1 E78D 0D32 FA02"            /* žp¾¡û&Ý.®áç�.2ú. */
+	$"43FC FBC6 7464 2C9A 14AD 2C7C 0969 995F"            /* CüûÆtd,š.­,|Æi™_ */
+	$"6363 3037 9C34 C5F8 42DF B339 D2B0 5C45"            /* cc07œ4ÅøBß³9Ò°\E */
+	$"6130 509D 28E7 D3A7 9308 74ED 9265 B7F9"            /* a0P�(çÓ§“.tí’e·ù */
+	$"0F54 D265 33D9 EB57 07C4 852B E3C8 771F"            /* .TÒe3ÙëW.Ä…+ãÈw. */
+	$"21F8 ADA3 D807 625C 513A E395 604B 0D6A"            /* !ø­£Ø.b\Q:ã•`K.j */
+	$"A9FC 297E 63AF 7622 23B6 63E1 EF25 F572"            /* ©ü)~c¯v"#¶cáï%õr */
+	$"01B0 400D 18C6 C9FA 6AF5 3E26 4199 6E68"            /* .°@..ÆÉújõ>&A™nh */
+	$"99B5 B3A9 F861 3419 C6C7 B65C D0F6 353B"            /* ™µ³©øa4.ÆǶ\Ðö5; */
+	$"6551 1B0A 9D82 1F07 4185 8C46 5867 DC22"            /* eQ.Â�‚..A…ŒFXgÜ" */
+	$"BD38 AFF7 27BA 1114 9266 5EF4 1EA9 89B4"            /* ½8¯÷'º..’f^ô.©‰´ */
+	$"A634 E917 65E5 502E 8028 D24E 725F 0C22"            /* ¦4é.eåP.€(ÒNr_." */
+	$"1513 7B38 5FEA 3150 520B 6D8A 03D8 F796"            /* ..{8_ê1PR.mŠ.Ø÷– */
+	$"D183 D8FA 82E2 C147 B662 593B 9FC8 A2A0"            /* уØú‚âÁG¶bY;ŸÈ¢  */
+	$"C63B D151 D905 072C 02E5 919B 0BE9 6D76"            /* Æ;ÑQÙ..,.å‘›.émv */
+	$"4BEF 7D51 FF67 C2F2 BB61 DDD2 7981 0B7E"            /* Kï}QÿgÂò»aÝÒy�.~ */
+	$"D406 3679 DFA4 FAE3 A33C 28AC 06C6 93C1"            /* Ô.6yߤúã£<(¬.Æ“Á */
+	$"B82F 53DB 1EB8 A6F3 5A24 A44A 1A76 9204"            /* ¸/SÛ.¸¦óZ$¤J.v’. */
+	$"6543 FC80 18DA 3C5D 395B 01DC D7E8 C21E"            /* eCü€.Ú<]9[.Ü×èÂ. */
+	$"A66C 9AE3 08D6 DBFC EE95 9E73 F71D 7CCA"            /* ¦lšã.ÖÛüî•žs÷.|Ê */
+	$"2A6A F6D2 11D9 AC28 BEDE 8E1B 65EF A995"            /* *jöÒ.Ù¬(¾ÞŽ.eï©• */
+	$"F7B5 B19D 5F63 F42B D0AD D69A BD47 1EED"            /* ÷µ±�_cô+Э֚½G.í */
+	$"2E5C 0276 3AEA F6D9 6E3F 314C 7F5F 52C3"            /* .\.v:êöÙn?1L._RÃ */
+	$"093D C8A9 23E4 C154 5587 294A 98A9 0643"            /* Æ=È©#äÁTU‡)J˜©.C */
+	$"AF18 0D20 51A4 6FE1 F326 11E7 5A91 2919"            /* ¯.. Q¤oáó&.çZ‘). */
+	$"DD53 B13B 2CB3 DE77 FAB9 420E BAFB 305B"            /* ÝS±;,³Þwú¹B.ºû0[ */
+	$"E9AB 7A2B 623B 78FE 346D 8BB6 BA40 AE40"            /* é«z+b;xþ4m‹¶º@®@ */
+	$"5B6D 6D53 81A1 076D 7058 E792 E410 3FA7"            /* [mmS�¡.mpXç’ä.?§ */
+	$"AD06 7E2E 5158 D129 9233 6E1D 6B7C C701"            /* ­.~.QXÑ)’3n.k|Ç. */
+	$"D61D 42D8 472F D5E2 2710 0B6C 828A 2352"            /* Ö.BØG/Õâ'..l‚Š#R */
+	$"D400 65FA E227 A938 1832 18CC 2BCE 19A8"            /* Ô.eúâ'©8.2.Ì+Î.¨ */
+	$"773C 3CB1 C6BD D722 8EE1 8AE2 4D4B 97D4"            /* w<<±Æ½×"ŽáŠâMK—Ô */
+	$"1763 37E4 2F93 8578 534E 0BA9 B493 3B80"            /* .c7ä/“…xSN.©´“;€ */
+	$"F018 28BE 2A52 15B2 8499 08A8 005F F028"            /* ð.(¾*R.²„™.¨._ð( */
+	$"ADFD ACEB 238F 922A 75E4 1C65 F2C3 F14B"            /* ­ý¬ë#�’*uä.eòÃñK */
+	$"213D 7263 4A9A 1C80 12BD 5895 0EC8 B955"            /* !=rcJš.€.½X•.ȹU */
+	$"8CD0 FB81 63CF FF7F B545 85DF E201 36A9"            /* ŒÐû�cÏÿ.µE…ßâ.6© */
+	$"E524 1BD6 EDDA 7C33 8CD2 E114 BA93 51E0"            /* å$.ÖíÚ|3ŒÒá.º“Qà */
+	$"A113 A12A FBEA 8570 B5FE E1B6 7963 5B31"            /* ¡.¡*ûê…pµþá¶yc[1 */
+	$"512A 99B1 3A59 E50E C584 DD7F FF7F FF7E"            /* Q*™±:Yå.Å„Ý.ÿ.ÿ~ */
+	$"D3C9 019B 1FBC DB70 2C2A 14A6 E7F1 0147"            /* ÓÉ.›.¼Ûp,*.¦çñ.G */
+	$"5F3A A36C 6F8A 9038 ABD8 EB8F FF7F FE79"            /* _:£loŠ�8«Øë�ÿ.þy */
+	$"6C12 2D6F FD6D F9A0 0392 0E82 0296 3C14"            /* l.-oýmù .’.‚.–<. */
+	$"FEFA 803C A3D4 1049 CF30 E22F 6542 7ABF"            /* þú€<£Ô.IÏ0â/eBz¿ */
+	$"378E 66B2 9091 D396 B953 DCF5 66D3 C5B5"            /* 7Žf²�‘Ó–¹SÜõfÓŵ */
+	$"7719 028C 5C0F F898 00A1 0C1D E181 F9C7"            /* w..Œ\.ø˜.¡..á�ùÇ */
+	$"2E46 06D4 D623 1256 EFAE 89E3 4FFF 7FDD"            /* .F.ÔÖ#.VﮉãOÿ.Ý */
+	$"F00D 4E11 65D5 B8F9 7C0B A045 AC4A 1E42"            /* ð.N.eÕ¸ù|. E¬J.B */
+	$"221C B512 5480 EF2D CB80 A089 3603 2CA1"            /* ".µ.T€ï-Ë€ ‰6.,¡ */
+	$"391C 7925 C817 92E3 8438 C438 08D1 0637"            /* 9.y%È.’ã„8Ä8.Ñ.7 */
+	$"9FCD F4C2 C04C 40BB A484 5043 0C1E 7C85"            /* ŸÍôÂÀL@»¤„PC..|… */
+	$"D7F6 1F6D BFC7 60AA 4D18 A399 9A13 CCD0"            /* ×ö.m¿Ç`ªM.£™š.ÌÐ */
+	$"26DA 3F97 24CB E902 0668 67F7 FE63 7A2E"            /* &Ú?—$Ëé..hg÷þcz. */
+	$"16D6 987F FF7F AFC1 5C35 E63D BA36 6227"            /* .Ö˜.ÿ.¯Á\5æ=º6b' */
+	$"FF7C FD39 8B8B 1A5F 6026 831B 0764 8805"            /* ÿ|ý9‹‹._`&ƒ..dˆ. */
+	$"E40B 0F19 7FFF 7FFC DEBC DD5B 9008 0000"            /* ä....ÿ.üÞ¼Ý[�... */
+	$"0C24 1D44 4641 3BC8 4248 E229 62D2 088D"            /* .$.DFA;ÈBHâ)bÒ.� */
+	$"117F DE8D 0B52 C3FD 1DD9 3823 F138 4C98"            /* ..Þ�.RÃý.Ù8#ñ8L˜ */
+	$"58A8 2683 519C F914 4961 5226 891F F863"            /* X¨&ƒQœù.IaR&‰.øc */
+	$"3FF2 B19F 113D BFEF 9D12 30C6 66BD E2A6"            /* ?ò±Ÿ.=¿ï�.0Æf½â¦ */
+	$"5D8C BE7E BE19 3D8F 03F2 5D26 FF7F FF7E"            /* ]Œ¾~¾.=�.ò]&ÿ.ÿ~ */
+	$"A82B 5E03 E7A8 E8F1 8C4D B6F1 F0E2 FC36"            /* ¨+^.ç¨èñŒM¶ñðâü6 */
+	$"DE7A 2F55 38B1 B436 2E50 7D25 E3F0 82C8"            /* Þz/U8±´6.P}%ãð‚È */
+	$"580F 0D19 C280 415C 2A7F FCD9 C720 E649"            /* X...€A\*.üÙÇ æI */
+	$"4064 2624 04AC 0B71 41FD 3937 8359 4137"            /* @d&$.¬.qAý97ƒYA7 */
+	$"8CA9 B642 C318 BD37 82D3 B786 8217 3252"            /* Œ©¶BÃ.½7‚Ó·†‚.2R */
+	$"44EA 4598 57D2 2F66 957F 39FE D712 F449"            /* DêE˜WÒ/f•.9þ×.ôI */
+	$"213A BEBB B6CC F551 FF7F EB0A AE45 8497"            /* !:¾»¶ÌõQÿ.ë®E„— */
+	$"0F4C FD34 4090 01FE CFC8 51AA C32A 7D95"            /* .Lý4@�.þÏÈQªÃ*}• */
+	$"D414 2609 E22F 1B7D E10E 97BB 05D1 9D04"            /* Ô.&Æâ/.}á.—».Ñ�. */
+	$"0592 9271 0D39 AB59 F165 0D09 549C B4E3"            /* .’’q.9«Yñe.ÆTœ´ã */
+	$"AEE5 555F 00A3 5E0A E4D3 BAFE 1EC6 2FCE"            /* ®åU_.£^ÂäÓºþ.Æ/Î */
+	$"FB04 C9BC 71D8 A42D 2F70 9FE1 EC17 C31D"            /* û.ɼqؤ-/pŸáì.Ã. */
+	$"ECB2 0A82 EFB1 914C F6D2 E54C 5316 B6C4"            /* ì²Â‚ﱑLöÒåLS.¶Ä */
+	$"4FFF 653B FD6E 27A6 9959 244B F458 B35C"            /* Oÿe;ýn'¦™Y$KôX³\ */
+	$"865C EB94 2CD7 7343 B74C C211 8A4D 2A99"            /* †\ë”,×sC·LÂ.ŠM*™ */
+	$"732E 3B43 CEAC C300 A520 924D 6F1F 8295"            /* s.;CάÃ.¥ ’Mo.‚• */
+	$"DF36 1FD4 E8F0 9221 6313 1B33 0C98 2721"            /* ß6.Ôèð’!c..3.˜'! */
+	$"8F55 5BA1 0E46 A755 1D7F A914 458D 9FFF"            /* �U[¡.F§U..©.E�Ÿÿ */
+	$"33CF 4CE3 AFC6 3383 BC4D A7E9 F546 FDCB"            /* 3ÏLã¯Æ3ƒ¼M§éõFýË */
+	$"8276 7778 2BBA EF7C 3677 6251 58C0 9EFF"            /* ‚vwx+ºï|6wbQXÀžÿ */
+	$"526C C883 6CFF 7FFF 7D4C 3F9F BD74 6BE9"            /* Rlȃlÿ.ÿ}L?Ÿ½tké */
+	$"B6EB 9003 823B 235D 6AD9 B382 FC45 F10C"            /* ¶ë�.‚;#]jÙ³‚üEñ. */
+	$"8282 90ED 9D47 E949 FADC 7B04 1C1C 9EF1"            /* ‚‚�í�GéIúÜ{...žñ */
+	$"1ABB 270D 07BE 1943 4E14 70E0 48FF 81EE"            /* .»'..¾.CN.pàHÿ�î */
+	$"CE8A 5AAD 3CE9 090D 3126 F96A AEBA 5853"            /* ΊZ­<éÆ.1&ùj®ºXS */
+	$"D02E ADE8 4614 E2B7 2E7E 3DB6 DE6A 77A8"            /* Ð.­èF.â·.~=¶Þjw¨ */
+	$"48D0 2DBB BAF4 E94C 735D 27D6 87FF 7F80"            /* HÐ-»ºôéLs]'Ö‡ÿ.€ */
+	$"5BCC 3CA6 1168 D9E0 38B4 22B2 2154 02AA"            /* [Ì<¦.hÙà8´"²!T.ª */
+	$"A1FF 6D87 EB2B F3EB 3814 9F74 DEF3 4D86"            /* ¡ÿm‡ë+óë8.ŸtÞóM† */
+	$"ED68 7E75 9E81 1FD9 170B E013 7E4D 97B3"            /* íh~už�.Ù..à.~M—³ */
+	$"51B0 6B2A 42AF EEB4 899B D2A2 6AC9 8EBF"            /* Q°k*B¯î´‰›Ò¢jÉŽ¿ */
+	$"2858 9FFC 5050 3364 8F2D 313E 94A9 5ED5"            /* (XŸüPP3d�-1>”©^Õ */
+	$"6213 E9DD 6FF6 5813 72DA FE40 0F70 06C4"            /* b.éÝoöX.rÚþ@.p.Ä */
+	$"FF7D 053C 3E69 C976 DDFF 02D9 4688 D8D7"            /* ÿ}.<>iÉvÝÿ.ÙFˆØ× */
+	$"8DEF 5187 FCA3 40EE 3167 B6DD 7EE6 42AB"            /* �ïQ‡ü£@î1g¶Ý~æB« */
+	$"B07A DB20 DC1D 7016 631F 8FB0 C83A 9CC2"            /* °zÛ Ü.p.c.�°È:œÂ */
+	$"66B9 304B 74F5 03F7 217C D3E3 6000 ECE6"            /* f¹0Ktõ.÷!|Óã`.ìæ */
+	$"A319 FD9E 4131 7E74 59C6 FB3F 1B51 FE89"            /* £.ýžA1~tYÆû?.Qþ‰ */
+	$"52D3 C845 1BF0 4BFE 3BAE 4940 9830 8E9C"            /* RÓÈE.ðKþ;®I@˜0Žœ */
+	$"F843 F6A2 218E B2E2 8092 8E0E 3889 8137"            /* øCö¢!Ž²â€’Ž.8‰�7 */
+	$"583C 394F CCE6 3D1B 37B8 C9A4 D805 B9E4"            /* X<9OÌæ=.7¸É¤Ø.¹ä */
+	$"A037 E45D 1167 9627 81E0 538C 1B6D EA0E"            /*  7ä].g–'�àSŒ.mê. */
+	$"18CD 8E3C EE0C 5E0C B048 8DD2 C804 CA38"            /* .ÍŽ<î.^.°H�ÒÈ.Ê8 */
+	$"8678 CAA9 5EE1 8B6C E7D9 FDE1 5C14 D52A"            /* †xÊ©^á‹lçÙýá\.Õ* */
+	$"67F3 8A12 F698 857A 5692 1FB3 FF27 FE1B"            /* góŠ.ö˜…zV’.³ÿ'þ. */
+	$"7E31 5D25 B4A2 3647 FF07 064A 4D7B F160"            /* ~1]%´¢6Gÿ..JM{ñ` */
+	$"62D7 81CE 0940 AE5F CAEB F1A6 10C4 CB0E"            /* b×�ÎÆ@®_Êëñ¦.ÄË. */
+	$"3D77 2C40 0146 8C72 B765 F6A9 3047 E748"            /* =w,@.FŒr·eö©0GçH */
+	$"0239 A725 8B4C 56F0 7E86 9A24 53D7 4832"            /* .9§%‹LVð~†š$S×H2 */
+	$"7924 73CB 4431 4977 0487 03FC F1B3 A21C"            /* y$sËD1Iw.‡.üñ³¢. */
+	$"2792 0B05 8183 8348 8EC0 2635 47D9 B51D"            /* '’..�ƒƒHŽÀ&5GÙµ. */
+	$"CE40 1FA4 20C5 93A8 BEB4 B8CD 93D8 A79E"            /* Î@.¤ Å“¨¾´¸Í“اž */
+	$"62C5 846C 964D 0404 BE21 3AA5 9EC3 4450"            /* bÅ„l–M..¾!:¥žÃDP */
+	$"FAEE 938A A428 E4D0 7F1B 46A8 7AEC 97FB"            /* úî“Š¤(äÐ..F¨zì—û */
+	$"1AFF 71DA F26D B5B1 E6F2 66B4 865E 1F12"            /* .ÿqÚòmµ±æòf´†^.. */
+	$"CE0F 3A8A EDF1 6321 BC5A 22D5 D3D6 BE19"            /* Î.:Šíñc!¼Z"ÕÓÖ¾. */
+	$"671A 38C3 11E8 FC9D 93AC 895A 1B84 7C9B"            /* g.8Ã.èü�“¬‰Z.„|› */
+	$"979F 5DC5 BBE6 19A8 5D03 BE83 6FA4 B8F2"            /* —Ÿ]Å»æ.¨].¾ƒo¤¸ò */
+	$"AFCD 8115 B21B C1D5 80B4 5E20 3B19 9E48"            /* ¯Í�.².ÁÕ€´^ ;.žH */
+	$"29C0 68DA F799 EC0D 56B3 7049 5EC1 11CB"            /* )ÀhÚ÷™ì.V³pI^Á.Ë */
+	$"CBAF FA0A 5AF1 22F1 3A4C 6F13 635A C681"            /* ˯úÂZñ"ñ:Lo.cZÆ� */
+	$"06DA 8B44 A35B CF31 9B6F 57E6 AEC2 8D59"            /* .Ú‹D£[Ï1›oWæ®Â�Y */
+	$"1556 A43E A289 74DC C398 B209 31B9 8CD0"            /* .V¤>¢‰tÜزÆ1¹ŒÐ */
+	$"07BE D253 76AB 7D79 4F26 D099 7AE8 E52C"            /* .¾ÒSv«}yO&Йzèå, */
+	$"EA35 D7BB E968 CAA0 5F61 EAE5 E9A1 E903"            /* ê5×»éhÊ _aêåé¡é. */
+	$"100E ED2C 5A66 21E2 1426 BE74 7A19 8C98"            /* ..í,Zf!â.&¾tz.Œ˜ */
+	$"3D67 A4D2 370F C95D 7131 2D31 0971 6022"            /* =g¤Ò7.É]q1-1Æq`" */
+	$"F4F2 359E 1FBD D23A CD94 4467 205E F7B1"            /* ôò5ž.½Ò:Í”Dg ^÷± */
+	$"5D18 EE91 9078 176B ADC2 65EB EECF D1A8"            /* ].î‘�x.k­ÂeëîÏѨ */
+	$"F1B3 B999 E7CC 3079 BD9C 82D8 DF6E 29E0"            /* ñ³¹™çÌ0y½œ‚Øßn)à */
+	$"9502 EC8D 5C13 629B 109E A7C0 F438 6674"            /* •.ì�\.b›.ž§Àô8ft */
+	$"C48B E75A 7CAC 28AE 3E9C 0ECF 9ADF F7BF"            /* Ä‹çZ|¬(®>œ.Ïšß÷¿ */
+	$"C51A E20D 64F1 B1DD C986 0C6F 6BFF 5102"            /* Å.â.dñ±ÝɆ.okÿQ. */
+	$"B233 B826 EBC9 35E2 9799 0A0F E81D 0816"            /* ²3¸&ëÉ5â—™Â.è... */
+	$"E01C B1A8 E4D9 1CCF 7F2E 4DB3 371B 83C0"            /* à.±¨äÙ.Ï..M³7.ƒÀ */
+	$"9DFD A603 83D6 4412 7DCF 2E2F 85D8 8259"            /* �ý¦.ƒÖD.}Ï./…Ø‚Y */
+	$"DC97 798F 2E8A 09F5 C1A7 1E56 55F3 BFD0"            /* Ü—y�.ŠÆõÁ§.VUó¿Ð */
+	$"34CE 311A 98BE C87C 8CCE 6EDF C85C A788"            /* 4Î1.˜¾È|ŒÎnßÈ\§ˆ */
+	$"AA7E 47D5 72AF 1842 5C5F 9D6A C586 CA4C"            /* ª~GÕr¯.B\_�jņÊL */
+	$"34D3 6315 D6CA 0D6D 5B75 6C85 551B E270"            /* 4Óc.ÖÊ.m[ul…U.âp */
+	$"E9DD 6127 C363 1F5A 0AA4 8F55 114F 9ED3"            /* éÝa'Ãc.Z¤�U.OžÓ */
+	$"034E A968 1BF1 513A 2F0D 3E61 612A 15E6"            /* .N©h.ñQ:/.>aa*.æ */
+	$"B89F 1877 F38E 8C96 20C3 1952 A559 62AE"            /* ¸Ÿ.w󎌖 Ã.R¥Yb® */
+	$"20E0 BE7D BF7C FAA3 F56C FF75 6D5E 07E7"            /*  à¾}¿|ú£õlÿum^.ç */
+	$"EB87 E7E9 BFE7 EE37 E7EE B60B E7DA F7CF"            /* ë‡çé¿çî7çî¶.çÚ÷Ï */
+	$"A6FF 2B5C 2F9F AC00 ED1C BCF0 084D B6D5"            /* ¦ÿ+\/Ÿ¬.í.¼ð.M¶Õ */
+	$"A3F8 3A1B 179B 5659 AE02 A536 8D65 B1A0"            /* £ø:..›VY®.¥6�e±  */
+	$"F806 81C6 9453 B9E5 1E84 EF36 3D8C 9922"            /* ø.�Æ”S¹å.„ï6=Œ™" */
+	$"A841 EBC7 584D 175D A8CF 5AE5 52F4 364A"            /* ¨AëÇXM.]¨ÏZåRô6J */
+	$"CACB F4FA 59D1 6C18 1FE0 5F96 0F70 465A"            /* ÊËôúYÑl..à_–.pFZ */
+	$"7CFD 0C37 59FF 6248 10C6 4872 8573 D54E"            /* |ý.7YÿbH.ÆHr…sÕN */
+	$"7839 337E D900 4336 CF58 B59C BCC4 602F"            /* x93~Ù.C6ÏXµœ¼Ä`/ */
+	$"EA1A 205F CD8D 635B AE0D 5750 3316 72C7"            /* ê. _Í�c[®.WP3.rÇ */
+	$"A765 C2F2 CF8C 52FB 1892 F55E B7A5 6D85"            /* §eÂòÏŒRû.’õ^·¥m… */
+	$"5782 FAB6 FBB5 CDF3 2DC2 0256 2927 4F4F"            /* W‚ú¶ûµÍó-Â.V)'OO */
+	$"1F92 5F99 B540 87DD 7A80 991B 0677 AB00"            /* .’_™µ@‡Ýz€™..w«. */
+	$"2D82 C5F6 11F7 F21B 2652 B798 75D5 42A6"            /* -‚Åö.÷ò.&R·˜uÕB¦ */
+	$"7757 E0E7 3C3F DBA5 6106 9F44 1800 E044"            /* wWàç<?Û¥a.ŸD..àD */
+	$"5844 8C9D 83C0 C5D3 6B95 CE2A 3EBC D7FD"            /* XDŒ�ƒÀÅÓk•Î*>¼×ý */
+	$"B79B E645 6FD3 A5EE ECE2 C9A7 53C7 B2E3"            /* ·›æEoÓ¥îìâɧSDzã */
+	$"C659 D5C5 0FBD 7C88 93C3 D3D9 D81F 0AEB"            /* ÆYÕÅ.½|ˆ“ÃÓÙØ.Âë */
+	$"5784 8BF9 DAD7 993D 0C8B 9873 08A4 254B"            /* W„‹ùÚ×™=.‹˜s.¤%K */
+	$"2452 F95D 29CA 8B3E D48D 18FB C813 4ECB"            /* $Rù])Ê‹>Ô�.ûÈ.NË */
+	$"D118 E3FA 926C 7A5F E5CC F774 D1DB B5C1"            /* Ñ.ãú’lz_åÌ÷tÑÛµÁ */
+	$"579A 2647 619A 67A0 423D 6C64 B3A6 9357"            /* Wš&Gašg B=ld³¦“W */
+	$"B8C6 8FBE A3AC E380 E548 5ED3 D83D 7DB9"            /* ¸Æ�¾£¬ã€åH^ÓØ=}¹ */
+	$"93E8 9071 F6E0 168F 6BEC F674 6D08 F4DA"            /* “è�qöà.�kìötm.ôÚ */
+	$"C1F7 11FD DEF8 2420 30DA 71E2 C605 81EB"            /* Á÷.ýÞø$ 0ÚqâÆ.�ë */
+	$"565B D461 AF6E 3127 34AC BA64 C660 14E1"            /* V[Ôa¯n1'4¬ºdÆ`.á */
+	$"F6AB DA92 386B 3E7B BD42 90E9 ABA2 6EE7"            /* ö«Ú’8k>{½B�é«¢nç */
+	$"8D0D 373C D280 46EC 6746 310C EA41 862B"            /* �.7<Ò€FìgF1.êA†+ */
+	$"6D1B 7BE9 93AF 17F6 1D3A E7AB CA55 8A4B"            /* m.{铯.ö.:ç«ÊUŠK */
+	$"E867 6EF3 29DF FF5F B839 75E1 FA04 DD81"            /* ègnó)ßÿ_¸9uáú.Ý� */
+	$"B6C9 DA44 D268 3B1A FF63 60F5 37A5 DDCB"            /* ¶ÉÚDÒh;.ÿc`õ7¥ÝË */
+	$"1AB3 5275 7692 7F15 F8E8 6A96 CEB4 D9E5"            /* .³Ruv’..øèj–δÙå */
+	$"3E5A 0E16 B1D0 B056 D0D2 0360 0900 5773"            /* >Z..±Ð°VÐÒ.`Æ.Ws */
+	$"BB3F C215 FD55 C9BF E3FC 48A1 CFAB BD39"            /* »?Â.ýUÉ¿ãüH¡Ï«½9 */
+	$"CD3D 906E 21CB C3DD E4D3 548C 4731 E777"            /* Í=�n!ËÃÝäÓTŒG1çw */
+	$"EE15 C0DE CEBC 0F2F 85A6 9822 F1FF 7B2F"            /* î.ÀÞμ./…¦˜"ñÿ{/ */
+	$"2530 48C7 0C39 3659 CD03 06C5 7C8E 3D49"            /* %0HÇ.96YÍ..Å|Ž=I */
+	$"FED5 7B72 4652 772C 39C7 8F1B 63E8 2DC1"            /* þÕ{rFRw,9Ç�.cè-Á */
+	$"1242 CA35 E396 6103 15DF D939 0597 B8D4"            /* .BÊ5ã–a..ßÙ9.—¸Ô */
+	$"8858 ACE3 3C32 6EE5 69A3 8512 3447 2B3B"            /* ˆX¬ã<2nåi£….4G+; */
+	$"0647 8C1F 2D31 4E57 0D03 BE26 5235 5275"            /* .GŒ.-1NW..¾&R5Ru */
+	$"74E8 B8F6 CF32 E077 8C51 41DB ED67 EE30"            /* tè¸öÏ2àwŒQAÛígî0 */
+	$"AD97 7956 D279 B0A8 768D 00E3 F604 A240"            /* ­—yVÒy°¨v�.ãö.¢@ */
+	$"9656 5BCD B309 D0CD 3ECE C477 31EC F88D"            /* –V[ͳÆÐÍ>ÎÄw1ìø� */
+	$"782F 8B9E 37FA A741 C636 7B55 D047 64A4"            /* x/‹ž7ú§AÆ6{UÐGd¤ */
+	$"E2EC C69D F609 F38F 821E 8D20 8709 87FF"            /* âìÆ�öÆó�‚.� ‡Æ‡ÿ */
+	$"3C3A B1ED C420 1F0B 52E3 8999 C684 30F3"            /* <:±íÄ ..R㉙Ƅ0ó */
+	$"C4ED 7FA9 3A2C D0E7 AE48 1AC2 7196 9347"            /* Äí.©:,Ðç®H.Âq–“G */
+	$"6BC9 BEE1 4112 4209 93CA 307A 7FF7 8B12"            /* kɾáA.BÆ“Ê0z.÷‹. */
+	$"EE76 8890 A529 33CC F435 A84F 9414 A719"            /* îvˆ�¥)3Ìô5¨O”.§. */
+	$"BFB2 6305 201F 372D 567F 30DF 2E47 D0B9"            /* ¿²c. .7-V.0ß.Gй */
+	$"C68F 5126 7EAA D95A 12D0 DA8A 8CF4 8A2A"            /* Æ�Q&~ªÙZ.ÐÚŠŒôŠ* */
+	$"CBAE 0509 B614 A9E1 2CA2 D0E0 F017 E395"            /* Ë®.ƶ.©á,¢Ðàð.ã• */
+	$"AF82 85B5 4509 E75C 8E4D 5465 7DF2 CF39"            /* ¯‚…µEÆç\ŽMTe}òÏ9 */
+	$"ACFB DD5B C683 62C0 0B1C B7B9 EAEC 049C"            /* ¬ûÝ[ƃbÀ..·¹êì.œ */
+	$"8045 0178 6757 E317 872D ABC2 B077 6EF6"            /* €E.xgWã.‡-«Â°wnö */
+	$"3612 4132 3DD7 D39B B49A 04A8 207D 6135"            /* 6.A2=×Ó›´š.¨ }a5 */
+	$"C64F 3A0F 5028 7B6B 953E 8F19 920A 718F"            /* ÆO:.P({k•>�.’Âq� */
+	$"08E9 A079 EC51 A08F 4A77 5130 C807 9BC2"            /* .é yìQ �JwQ0È.›Â */
+	$"B37B 4C7B 9BAA 40F3 4E94 BE51 C027 32B5"            /* ³{L{›ª@óN”¾QÀ'2µ */
+	$"751F 4793 7271 226E 82F3 CF14 8BC3 F927"            /* u.G“rq"n‚óÏ.‹Ãù' */
+	$"4C81 7F29 AB70 8B3B E948 86D6 569F FEC2"            /* L�.)«p‹;éH†ÖVŸþÂ */
+	$"BF6C 92F9 1011 3BE3 9E91 6458 1634 34A3"            /* ¿l’ù..;ãž‘dX.44£ */
+	$"3042 520F 5D64 6429 32CE 04FD 1B98 0698"            /* 0BR.]dd)2Î.ý.˜.˜ */
+	$"3A36 655C 86C7 C272 4B02 E259 0537 4DB8"            /* :6e\†ÇÂrK.âY.7M¸ */
+	$"C6C2 6980 ECFB 0FC1 C6D9 0A2C D00F 282A"            /* ÆÂi€ìû.ÁÆÙÂ,Ð.(* */
+	$"7A0B D91F 08CA 762C A629 048E 9BCC CFD2"            /* z.Ù..Êv,¦).Ž›ÌÏÒ */
+	$"1EBC 8F60 2F64 F24D F1FB 81C6 8AEC CFDB"            /* .¼�`/dòMñû�ÆŠìÏÛ */
+	$"623A 01A9 35D2 B5E1 B80A 2D32 084E 3857"            /* b:.©5Òµá¸Â-2.N8W */
+	$"C025 BCDA 4728 F3AD 35AD 9AAA E054 21B7"            /* À%¼ÚG(ó­5­šªàT!· */
+	$"A47E 62C5 9921 02C0 09E3 440D 063A 3789"            /* ¤~bÅ™!.ÀÆãD..:7‰ */
+	$"5072 E54A 4654 E148 AC2E 4A99 C6A5 3923"            /* PråJFTáH¬.J™Æ¥9# */
+	$"49B5 6906 6531 FD5E 7CCE 1C4B EEDE 7482"            /* Iµi.e1ý^|Î.KîÞt‚ */
+	$"9E3F 73AE C777 0214 C921 3131 C5CB 9F61"            /* ž?s®Çw..É!11ÅËŸa */
+	$"64A4 4E70 57C2 5C04 E25B 266E 6887 7477"            /* d¤NpWÂ\.â[&nh‡tw */
+	$"FCCB 1F0C 89F2 6CF6 713E 4D08 8AC8 9B0C"            /* üË..‰òlöq>M.ŠÈ›. */
+	$"00AC D9D7 A28A C219 B52B B46A D704 F919"            /* .¬Ù×¢ŠÂ.µ+´j×.ù. */
+	$"2050 6CCA 215A 299B 9129 9739 DA6F 3A67"            /*  PlÊ!Z)›‘)—9Úo:g */
+	$"FE12 2BF1 4F8B 26ED D21F F727 5B59 22F3"            /* þ.+ñO‹&íÒ.÷'[Y"ó */
+	$"2E05 F4A0 9754 F431 9AED 1B65 038C CD7F"            /* ..ô —Tô1ší.e.ŒÍ. */
+	$"8254 E3AE 035C 18D7 0E28 6300 0DF0 998D"            /* ‚Tã®.\.×.(c..ð™� */
+	$"0191 85AF C71B B3CF F0D6 3A8F B1AA 5E99"            /* .‘…¯Ç.³ÏðÖ:�±ª^™ */
+	$"BAB8 7C7F 0214 F864 4744 E747 7248 3C94"            /* º¸|...ødGDçGrH<” */
+	$"3AC8 CE04 1019 11ED 4BCC 76E9 FE4E 5728"            /* :ÈÎ....íKÌvéþNW( */
+	$"5BB0 986C D763 A3C7 AF8A 14E9 D24A AD17"            /* [°˜l×c£Ç¯Š.éÒJ­. */
+	$"FF66 611F B77C 0830 9093 A560 06FA E9CF"            /* ÿfa.·|.0�“¥`.úéÏ */
+	$"054B 5846 1681 5DBF 34F9 49A9 45E0 8F20"            /* .KXF.�]¿4ùI©Eà�  */
+	$"7FFD 6264 2193 031D A60F A111 B0B7 CFEE"            /* .ýbd!“..¦.¡.°·Ïî */
+	$"DE49 EC80 C0F1 D7F6 A495 900B 4126 40BE"            /* ÞIì€Àñ×ö¤•�.A&@¾ */
+	$"185B DFFE C7B0 12AC C143 AA85 70E5 81EF"            /* .[ßþÇ°.¬ÁCª…på�ï */
+	$"79CE 1662 08E4 203F 1706 40FB CC39 CA8F"            /* yÎ.b.ä ?..@ûÌ9Ê� */
+	$"8002 1CFA 3BCC 6B79 5C83 A4D2 7147 E38F"            /* €..ú;Ìky\ƒ¤ÒqGã� */
+	$"C93B F2E8 6A15 6D30 C314 E898 81E3 FF7B"            /* É;òèj.m0Ã.è˜�ãÿ{ */
+	$"5FC5 EE13 0449 1985 2CBC 73C7 C569 DCB1"            /* _Åî..I.…,¼sÇÅiܱ */
+	$"8024 F7CA CC7A FE3B CC15 4BCE 5B92 1BBB"            /* €$÷ÊÌzþ;Ì.KÎ[’.» */
+	$"0048 F291 579F FD20 F11A 1934 CC11 9C3F"            /* .Hò‘WŸý ñ..4Ì.œ? */
+	$"CE49 027A 9763 9E57 A2FF 7FFD 53E4 E50B"            /* ÎI.z—cžW¢ÿ.ýSäå. */
+	$"C747 02FF 7869 0537 1482 221E 0220 79D5"            /* ÇG.ÿxi.7.‚".. yÕ */
+	$"45B1 2E48 6A6C 8486 571F E1F1 BF39 0797"            /* E±.Hjl„†W.áñ¿9.— */
+	$"5D21 6964 EA9B 13F1 E6B7 C4B5 A2B7 E2BD"            /* ]!idê›.ñæ·Äµ¢·â½ */
+	$"09C2 B200 0000 0000 003E A392 6527 69B6"            /* Ʋ......>£’e'i¶ */
+	$"B189 8365 F55D 7A2B 0398 4196 BB60 D4F0"            /* ±‰ƒeõ]z+.˜A–»`Ôð */
+	$"06B6 100C 5B60 D76F 8FEE EFFB D525 0E2B"            /* .¶..[`×o�îïûÕ%.+ */
+	$"3535 B765 22E7 F77C CF5C 8907 7626 62C0"            /* 55·e"ç÷|Ï\‰.v&bÀ */
+	$"3B04 A170 EEA6 A399 F26B CD7E 92BC 9E13"            /* ;.¡p™òkÍ~’¼ž. */
+	$"9D2D 6907 B06F 6B9A 957D 3C57 DC9F 06E6"            /* �-i.°okš•}<WÜŸ.æ */
+	$"C3B6 16AD C91B E868 E000 1848 3BE4 5C3A"            /* ö.­É.èhà..H;ä\: */
+	$"1162 2272 401F 600B A973 281E 62B3 2654"            /* .b"r@.`.©s(.b³&T */
+	$"74B0 287C C53E A3DA 2A14 E38F 9FFE 3A8E"            /* t°(|Å>£Ú*.ã�Ÿþ:Ž */
+	$"0D69 7E9D 5B07 1396 ED52 69BC 3971 5630"            /* .i~�[..–íRi¼9qV0 */
+	$"7C63 8DA9 7A40 F364 CC6A FCAC DC7C 59DC"            /* |c�©z@ódÌjü¬Ü|YÜ */
+	$"278A 92E3 6FBF F936 7157 2583 232E E558"            /* 'Š’ão¿ù6qW%ƒ#.åX */
+	$"0000 C241 6B90 4DCB 6421 F85A B681 4812"            /* ..ÂAk�MËd!øZ¶�H. */
+	$"9165 5C06 0195 F213 DB9F 5E2F 4BDE A075"            /* ‘e\..•ò.ÛŸ^/KÞ u */
+	$"BD9A 741B 971B 3411 1F73 7FF8 D719 BA55"            /* ½št.—.4..s.ø×.ºU */
+	$"8048 404F FEEA FC74 AEB1 84FD 03F9 5D43"            /* €H@Oþêüt®±„ý.ù]C */
+	$"BE42 E61F FF7F F4CA BA56 9654 B757 FF60"            /* ¾Bæ.ÿ.ôʺV–T·Wÿ` */
+	$"CA39 3290 054C E785 0EA7 F04D AF3E B342"            /* Ê92�.Lç….§ðM¯>³B */
+	$"A80A 815D 3954 73F2 871A 51FF 7488 20CD"            /* ¨Â�]9Tsò‡.Qÿtˆ Í */
+	$"90F3 23B8 80FE C6BF 726C 5426 83F2 5400"            /* �ó#¸€þÆ¿rlT&ƒòT. */
+	$"0000 0000 0000 0000 BFA5 D802 777C F954"            /* ........¿¥Ø.w|ùT */
+	$"286B A586 76CF 26CE 72CA 6FE7 BD43 DB36"            /* (k¥†vÏ&ÎrÊoç½CÛ6 */
+	$"A826 870E 2EEF E2C4 2E22 E63C FF7F AF51"            /* ¨&‡..ïâÄ."æ<ÿ.¯Q */
+	$"40C1 B727 22F3 9ACC 894D 0C49 EC7A D998"            /* @Á·'"óšÌ‰M.IìzÙ˜ */
+	$"64A9 DD22 2545 B85C D621 0609 B73A 9D9F"            /* d©Ý"%E¸\Ö!.Æ·:�Ÿ */
+	$"FF7F FF7F C0F7 00E1 B069 1D76 3BA1 E98C"            /* ÿ.ÿ.À÷.á°i.v;¡éŒ */
+	$"5F1B 1E11 B6F6 EB6D 6316 9DBC D1B2 DC90"            /* _...¶öëmc.�¼Ñ²Ü� */
+	$"5E1D 5EE0 3C65 57D0 B69C 3782 D1BE 3A77"            /* ^.^à<eWжœ7‚Ѿ:w */
+	$"436E 462B 45B7 FF61 4FA4 A45B 8C34 39D8"            /* CnF+E·ÿaO¤¤[Œ49Ø */
+	$"1B35 B876 A5F1 F2AD 3F78 D289 1C2E E3B4"            /* .5¸v¥ñò­?xÒ‰..ã´ */
+	$"A28B 64FA 1E2C 0CCD 0B1C AD42 8866 DDD6"            /* ¢‹dú.,.Í..­BˆfÝÖ */
+	$"62F0 225B 8DF7 32B3 FC3C 79E9 000B 1CA9"            /* bð"[�÷2³ü<yé...© */
+	$"2C82 4874 34AB B158 47CD FA9F EBC8 0923"            /* ,‚Ht4«±XGÍúŸëÈÆ# */
+	$"B291 7229 8C3F E7FD 193C 330B A3B4 6969"            /* ²‘r)Œ?çý.<3.£´ii */
+	$"FCF6 E1BA 4C4A E64C B1BC 5BAF F402 C828"            /* üöáºLJæL±¼[¯ô.È( */
+	$"3A51 CC67 A851 E207 5A7C 3733 1031 FD5C"            /* :QÌg¨Qâ.Z|73.1ý\ */
+	$"E4D3 B69F FF67 2C6D 3FC7 D5B4 E63F 55B9"            /* äÓ¶Ÿÿg,m?ÇÕ´æ?U¹ */
+	$"FD5F 3DB1 4589 6ADF 54F0 F42A 498F 61C8"            /* ý_=±E‰jßTðô*I�aÈ */
+	$"4872 5CD7 F70D 9C80 8880 EB9A 1FE7 C715"            /* Hr\×÷.œ€ˆ€ëš.çÇ. */
+	$"E57A 280F 96CF 014C 0411 EF44 C4F2 C64F"            /* åz(.–Ï.L..ïDÄòÆO */
+	$"F91B A9D6 EB9E F615 096F E5C0 5B30 BB79"            /* ù.©Öëžö.ÆoåÀ[0»y */
+	$"D645 BF4F B70A 2C40 3D24 A4C4 5A01 F3DB"            /* ÖE¿O·Â,@=$¤ÄZ.óÛ */
+	$"8879 D458 F558 4C8E 3C87 E83C 9C30 F0C3"            /* ˆyÔXõXLŽ<‡è<œ0ðà */
+	$"F7EB BE6A 2B3B B9CB 4F2E 3B49 CA98 6025"            /* ÷ë¾j+;¹ËO.;Iʘ`% */
+	$"D6C7 6B39 ED18 A784 5410 F9CD 4FB5 9E32"            /* ÖÇk9í.§„T.ùÍOµž2 */
+	$"EABF F72F 6ECC 217F E295 4BDA F0C8 2678"            /* ê¿÷/nÌ!.â•KÚðÈ&x */
+	$"B0F7 3381 2299 1033 5300 BB1C E72F 1EE0"            /* °÷3�"™.3S.».ç/.à */
+	$"75D6 68D0 8C87 A574 580B 4AD8 7BC8 E1C4"            /* uÖhÐŒ‡¥tX.JØ{ÈáÄ */
+	$"64D3 76AA A080 1E28 FD04 890B B9A1 7E5C"            /* dÓvª €.(ý.‰.¹¡~\ */
+	$"79E2 31B9 1C3E DBAE 8BC6 DB23 53A4 0F06"            /* yâ1¹.>Û®‹ÆÛ#S¤.. */
+	$"74AA 7920 6233 E3BF B281 AFAA 957D FDFB"            /* tªy b3㿲�¯ª•}ýû */
+	$"216A 3ECE 3139 37DF 8885 620B 5D55 D0FD"            /* !j>Î197߈…b.]UÐý */
+	$"F796 6A70 CEFD 33D8 B369 178E 99C0 9FFF"            /* ÷–jpÎý3سi.Ž™ÀŸÿ */
+	$"7FD2 27D4 D615 4840 B836 A0B5 1D6F 2A5A"            /* .Ò'ÔÖ.H@¸6 µ.o*Z */
+	$"1338 2369 83A0 D409 0FA7 77EF 19B9 21E6"            /* .8#iƒ ÔÆ.§wï.¹!æ */
+	$"3E21 0CB0 D4D3 362A EA6F 6340 8D73 27FB"            /* >!.°ÔÓ6*êoc@�s'û */
+	$"C3EF 7823 33DF 7A8C 5C69 20C4 5816 72E4"            /* Ãïx#3ßzŒ\i ÄX.rä */
+	$"712C 3345 6755 76F3 FEAF 494B D0B4 3C8F"            /* q,3EgUvóþ¯IKд<� */
+	$"B83F A050 C3E9 4CA2 6A6E 7AD0 D7FF 5860"            /* ¸? PÃéL¢jnzÐ×ÿX` */
+	$"548E 54E7 C3B9 6DDF 462C 54BE 5EF9 1A41"            /* TŽTçùmßF,T¾^ù.A */
+	$"6A46 A4FB 1C36 1CA4 77EC 2899 F147 3422"            /* jF¤û.6.¤wì(™ñG4" */
+	$"843C 7FAE 123E 6894 9B7F 3125 EB0F 3129"            /* „<.®.>h”›.1%ë.1) */
+	$"9DC1 8469 CE90 BB6E 4F2C 385A 0FD1 9AC7"            /* �Á„iÎ�»nO,8Z.ÑšÇ */
+	$"3318 3BF0 B1AA A51A 9022 A143 29FF 7FC1"            /* 3.;𱪥.�"¡C)ÿ.Á */
+	$"0F0F 6570 67C4 7FA7 9906 DE4E 5439 A278"            /* ..epgÄ.§™.ÞNT9¢x */
+	$"34E1 3D57 BB0E 086E 4C71 4406 DA9D CA56"            /* 4á=W»..nLqD.Ú�ÊV */
+	$"3EFD D077 5DA5 CD7D C244 9128 F408 1F03"            /* >ýÐw]¥Í}ÂD‘(ô... */
+	$"0C8F FF4B 9274 2EC6 E208 13C5 EE1B 3CEA"            /* .�ÿK’t.Æâ..Åî.<ê */
+	$"C5C0 06F5 0FA1 11FF 7FE3 A446 32E6 F4DA"            /* ÅÀ.õ.¡.ÿ.ã¤F2æôÚ */
+	$"23EC 5108 3AE0 CD16 AFFF 3965 8196 56E2"            /* #ìQ.:àÍ.¯ÿ9e�–Vâ */
+	$"2881 4EB9 CA14 5C4A 8091 B176 8823 BF09"            /* (�N¹Ê.\J€‘±vˆ#¿Æ */
+	$"CED5 0D88 E6BB DD95 1B72 36E8 809C D432"            /* ÎÕ.ˆæ»Ý•.r6耜Ô2 */
+	$"872D C08C 7DCB B30E 548B AE16 0D85 6B49"            /* ‡-ÀŒ}˳.T‹®..…kI */
+	$"9B28 D491 ECD6 F598 691A 0891 135A 63A0"            /* ›(Ô‘ìÖõ˜i..‘.Zc  */
+	$"593C 1FFD 8A54 4FB9 F2AB 20FC 5CF3 1B88"            /* Y<.ýŠTO¹ò« ü\ó.ˆ */
+	$"EE7E 8355 45D6 87C8 28CE 7B33 92A2 D8D6"            /* î~ƒUEÖ‡È(Î{3’¢ØÖ */
+	$"E8DF EF94 500A 0D78 DE9F 8657 F7BD 7F40"            /* èßï”PÂ.xÞŸ†W÷½.@ */
+	$"5E07 0789 EDC7 F3A5 A0BF 3929 6B19 A460"            /* ^..‰íÇó¥ ¿9)k.¤` */
+	$"7A50 91FF 42EA 5F12 DFA5 E0A0 84CC E869"            /* zP‘ÿBê_.ߥࠄÌèi */
+	$"BB1F 6EDA 2238 5DB0 7F22 3521 F04B FF6B"            /* ».nÚ"8]°."5!ðKÿk */
+	$"6827 722A DD5F 3C9D D3F4 2BE3 614D 0A3F"            /* h'r*Ý_<�Óô+ãaMÂ? */
+	$"62C4 E6AC 95CA 5946 37E8 BC76 97FD 5167"            /* bÄ欕ÊYF7è¼v—ýQg */
+	$"C970 D4C7 0655 C470 5913 DBBD AA8C 87A4"            /* ÉpÔÇ.UÄpY.Û½ªŒ‡¤ */
+	$"3C63 0B7F 54CD 391E 574D F2D5 C728 20B7"            /* <c..TÍ9.WMòÕÇ( · */
+	$"9955 DAC8 72A5 DBBB F7ED 4C9F 6FFE 3A4E"            /* ™UÚÈr¥Û»÷íLŸoþ:N */
+	$"E165 1831 C0E5 8285 96C2 3959 1BE7 E884"            /* áe.1Àå‚…–Â9Y.çè„ */
+	$"E568 89C1 FD03 D443 F6D1 A7C9 4CFE F7B9"            /* åh‰Áý.ÔCöѧÉLþ÷¹ */
+	$"A0BA 5040 19D5 965F 0EB5 E503 4B32 E6C8"            /*  ºP@.Õ–_.µå.K2æÈ */
+	$"B9C1 DEBB B8B7 47DC A850 AF44 D3B7 F562"            /* ¹ÁÞ»¸·GܨP¯DÓ·õb */
+	$"4210 4DFF 42A0 3D9A 7C63 8124 22A9 B258"            /* B.MÿB =š|c�$"©²X */
+	$"2256 6243 3077 FF57 7389 3FB6 A096 0EAB"            /* "VbC0wÿWs‰?¶ –.« */
+	$"DD33 EF25 C4B0 7338 F6D7 8730 FF2E DD0A"            /* Ý3ï%Ä°s8öׇ0ÿ.Ý */
+	$"BBDA 7A6E EFE8 58EE D64B A09E 2B00 EC04"            /* »ÚznïèXîÖK ž+.ì. */
+	$"09C9 A9F4 82A0 3132 4829 65CA E93B B827"            /* ÆÉ©ô‚ 12H)eÊé;¸' */
+	$"E81F B387 132B 5D15 E526 6FEC 2CB1 407F"            /* è.³‡.+].å&oì,±@. */
+	$"8485 FF32 4933 D357 FC45 0E44 EE66 D960"            /* „…ÿ2I3ÓWüE.DîfÙ` */
+	$"5AA3 A13A FC0B D8E2 622E 0BEE 714F 2672"            /* Z£¡:ü.Øâb..îqO&r */
+	$"3850 26C4 E626 F9BA 418C BC8A 7481 C6BE"            /* 8P&Äæ&ùºAŒ¼Št�ƾ */
+	$"BFA6 0D72 0603 3452 46C0 9FDB BE63 34D9"            /* ¿¦.r..4RFÀŸÛ¾c4Ù */
+	$"9599 7519 804B F1CE 0FC8 7572 F58E EB32"            /* •™u.€KñÎ.ÈurõŽë2 */
+	$"3501 CBB0 C05B 5643 485A 0012 64C2 8022"            /* 5.Ë°À[VCHZ..d€" */
+	$"BD39 EB39 2B57 0AA3 3931 93D4 885E CDF2"            /* ½9ë9+W£91“Ôˆ^Íò */
+	$"818D 7734 36C2 BEE1 4F55 116C 47A9 DC40"            /* ��w46¾áOU.lG©Ü@ */
+	$"A8A8 4532 7C33 9D7E 070A BA9E 36F7 2445"            /* ¨¨E2|3�~.ºž6÷$E */
+	$"074C 181A 07B2 C470 FA15 8CCB C069 AD0F"            /* .L...²Äpú.ŒËÀi­. */
+	$"9DD2 8B21 6F22 7300 34B4 4378 25AB D9D2"            /* �Ò‹!o"s.4´Cx%«ÙÒ */
+	$"1D9B B7F7 2F9C C3B1 926F DE61 4463 90BD"            /* .›·÷/œÃ±’oÞaDc�½ */
+	$"BC76 27E7 A5B5 826F 908E 31BA 048F 97C1"            /* ¼v'祵‚o�Ž1º.�—Á */
+	$"1884 67A9 C4BA 4B2B 4A58 D0EE 0269 6832"            /* .„g©ÄºK+JXÐî.ih2 */
+	$"E8C6 03AA D2A2 D034 27AA D49E 9C01 069A"            /* èÆ.ªÒ¢Ð4'ªÔžœ..š */
+	$"1BDC C40B 3BA7 5F8D 0468 152D E505 7EC0"            /* .ÜÄ.;§_�.h.-å.~À */
+	$"6BBF C4F4 2F45 99CB 1872 C713 FA0D 055F"            /* k¿Äô/E™Ë.rÇ.ú.._ */
+	$"551D 6E4D 5794 CC71 BAB5 C560 4D20 9464"            /* U.nMW”ÌqºµÅ`M ”d */
+	$"9F8C 94BA 1C96 0987 1AB4 61BB BA86 751B"            /* ŸŒ”º.–Ƈ.´a»º†u. */
+	$"9B79 D06A 7A3D A663 FB31 8B86 E588 5D15"            /* ›yÐjz=¦cû1‹†åˆ]. */
+	$"4A09 8B2B 81FC AE85 0D5A 1D8C A5B7 6DD9"            /* JÆ‹+�ü®….Z.Œ¥·mÙ */
+	$"02F5 50CE 7017 1BDD 3D3D 86CB 250B 491B"            /* .õPÎp..Ý==†Ë%.I. */
+	$"AA1F 2D21 A416 E8E7 9A53 4299 8CDE CD59"            /* ª.-!¤.èçšSB™ŒÞÍY */
+	$"C678 B559 D85C C580 6795 AD5F F578 C9EE"            /* ÆxµYØ\Å€g•­_õxÉî */
+	$"73B2 8F4B 6EEA 6F07 F785 C1B3 374B E51F"            /* s²�Knêo.÷…Á³7Kå. */
+	$"46DC 728C 05A4 6932 792A DB50 4E9A FD82"            /* FÜrŒ.¤i2y*ÛPNšý‚ */
+	$"A8A2 5EB8 024D C558 D6BC 350C 97B0 B2E8"            /* ¨¢^¸.MÅXÖ¼5.—°²è */
+	$"8F42 92FD 604D 6FB7 74B6 6EBE 97F6 CE03"            /* �B’ý`Mo·t¶n¾—öÎ. */
+	$"0DFA C340 31C3 4C5E 0041 088B E097 383B"            /* .úÃ@1ÃL^.A.‹à—8; */
+	$"A236 97CC 8D2B 6F6D 0E58 4E56 1D49 32EC"            /* ¢6—Ì�+om.XNV.I2ì */
+	$"626C C303 42BB D30B B8DE 5868 3C2F E39B"            /* blÃ.B»Ó.¸ÞXh</ã› */
+	$"A07A 236D 0F21 C0DD 1A0A 933A 7710 6605"            /*  z#m.!ÀÝ.“:w.f. */
+	$"343E 8D1A 9384 4F16 C01E 5AF7 DF53 0B38"            /* 4>�.“„O.À.Z÷ßS.8 */
+	$"3615 80D7 428E 90F6 4620 02EA 4590 DF22"            /* 6.€×BŽ�öF .êE�ß" */
+	$"4B70 2FB2 CADA A529 F7FA E7C6 BC99 DFCD"            /* Kp/²ÊÚ¥)÷úçƼ™ßÍ */
+	$"5EE7 D677 B5BE F819 6A55 6070 E1A9 DF53"            /* ^çÖwµ¾ø.jU`pá©ßS */
+	$"3F82 0229 B6B7 D247 1967 8313 056F 9D27"            /* ?‚.)¶·ÒG.gƒ..o�' */
+	$"753E E4DD EB7F 1372 C0F7 D72E 349B 2F9B"            /* u>äÝë..rÀ÷×.4›/› */
+	$"686C C9AF 0896 0865 7A3A 5A9D 807F 292A"            /* hlɯ.–.ez:Z�€.)* */
+	$"8DDA A776 4B3C 0993 532D D682 A41B 9DC2"            /* �Ú§vK<Æ“S-Ö‚¤.� */
+	$"5113 9D60 934B 2055 D671 C6C4 1252 3CEF"            /* Q.�`“K UÖqÆÄ.R<ï */
+	$"C72F AC19 4BED 185D BC60 5957 F81B 8278"            /* Ç/¬.Kí.]¼`YWø.‚x */
+	$"20B5 9173 4A1B FDC9 295D 54B7 8AFE 6938"            /*  µ‘sJ.ýÉ)]T·Šþi8 */
+	$"FE49 BA78 3225 49A1 4243 823C 52B9 8489"            /* þIºx2%I¡BC‚<R¹„‰ */
+	$"9BDF 0AA1 9A6B 667D DCE2 FE18 C386 4EE9"            /* ›ß¡škf}Üâþ.ÆNé */
+	$"8AF7 92D0 4405 227C BD4C B9E4 34A7 2533"            /* Š÷’ÐD."|½L¹ä4§%3 */
+	$"D3C6 E915 D57B 681B B6DC FF03 D5D4 F1DD"            /* ÓÆé.Õ{h.¶Üÿ.ÕÔñÝ */
+	$"4FB5 BA54 262A 73C2 1CF4 4CD1 D842 E8C2"            /* OµºT&*sÂ.ôLÑØBè */
+	$"8169 3555 13EC 6A25 6DE0 3614 EC2E D1BB"            /* �i5U.ìj%mà6.ì.Ñ» */
+	$"E597 BFC6 2ACB 6879 11D1 870D E79E 8422"            /* å—¿Æ*Ëhy.ч.çž„" */
+	$"C01D 4032 8887 6DBA FBEC 3077 F220 49E3"            /* À.@2ˆ‡mºûì0wò Iã */
+	$"8693 0B00 9F45 0F57 0A39 DA8E EAA5 CD48"            /* †“..ŸE.WÂ9ÚŽê¥ÍH */
+	$"2C93 C3EC BDE0 71D5 5749 0952 441C E3F8"            /* ,“Ãì½àqÕWIÆRD.ãø */
+	$"597F C1E6 FB6B BBED AD71 FC34 CFF8 5877"            /* Y.Áæûk»í­qü4ÏøXw */
+	$"DB67 5F6D 798F E163 5F6B 1CFA A87B ED7C"            /* Ûg_my�ác_k.ú¨{í| */
+	$"F176 3065 72FF 443D BA6B 8FBD 9E85 806A"            /* ñv0erÿD=ºk�½ž…€j */
+	$"2A1B 368C 7A9E B1B1 93DE ABD8 263F 31B3"            /* *.6Œzž±±“Þ«Ø&?1³ */
+	$"1739 58F1 7233 FE7C 4EC4 32AA CDDB CF11"            /* .9Xñr3þ|NÄ2ªÍÛÏ. */
+	$"C519 9C61 B756 AF62 D55D 5D48 6AF7 4364"            /* Å.œa·V¯bÕ]]Hj÷Cd */
+	$"205E F14D AAD6 EFF5 2F0D CBE4 0F19 3159"            /*  ^ñMªÖïõ/.Ëä..1Y */
+	$"94F4 910E 4217 990B CABE EBF5 2B67 2EF6"            /* ”ô‘.B.™.ʾëõ+g.ö */
+	$"FE41 0C44 1C50 43EA 69F5 4E73 5569 82A1"            /* þA.D.PCêiõNsUi‚¡ */
+	$"C13C 4899 3AA9 5E13 5F76 BF98 2105 1842"            /* Á<H™:©^._v¿˜!..B */
+	$"AF34 9AFD CFC8 D1E7 3479 E1F3 C86F D06F"            /* ¯4šýÏÈÑç4yáóÈoÐo */
+	$"9ED9 9DD8 E2E0 4B44 19F4 03E6 9CC0 3474"            /* žÙ�ØâàKD.ô.æœÀ4t */
+	$"DFBD 078F D140 1C06 5F8C B6E2 665C 703A"            /* ß½.�Ñ@.._Œ¶âf\p: */
+	$"2841 642E F538 C531 697D 5064 11AD 9E8C"            /* (Ad.õ8Å1i}Pd.­žŒ */
+	$"5A53 3174 7302 762E 9708 BEF5 AD41 0C01"            /* ZS1ts.v.—.¾õ­A.. */
+	$"D744 85FC D963 416A 9A3A 6898 F067 5B1C"            /* ×D…üÙcAjš:h˜ðg[. */
+	$"873B 42B6 72C4 FF18 337A 8A24 EDCE 6B8B"            /* ‡;B¶rÄÿ.3zŠ$íÎk‹ */
+	$"BF06 0EA4 0227 A131 8620 B03C A2B9 729E"            /* ¿..¤.'¡1† °<¢¹rž */
+	$"1242 EC64 E340 5C5C 9BFF 120A BB1B 75E5"            /* .Bìdã@\\›ÿ.».uå */
+	$"385B 68AF C7B7 8BA5 1E7B 6FC1 DDB2 F642"            /* 8[h¯Ç·‹¥.{oÁݲöB */
+	$"FF56 4D21 66B3 EA8C 7095 8FBD 92CC 7315"            /* ÿVM!f³êŒp•�½’Ìs. */
+	$"665F B398 608C ADD4 11E0 DA38 734A C3DB"            /* f_³˜`Œ­Ô.àÚ8sJÃÛ */
+	$"9249 4640 27D6 D057 426E 651D BF14 F0DE"            /* ’IF@'ÖÐWBne.¿.ðÞ */
+	$"9130 2D17 8D66 9689 79BD 9A6D 5AF9 6C7C"            /* ‘0-.�f–‰y½šmZùl| */
+	$"94BF 8531 6507 5621 1C11 8D8F F3A5 83D9"            /* ”¿…1e.V!..��ó¥ƒÙ */
+	$"7EE3 1E6D 9B0A 8D44 F466 DE49 E606 E143"            /* ~ã.m›Â�DôfÞIæ.áC */
+	$"7E77 D417 D49D 9CF2 89AA B0FA 84A4 33A5"            /* ~wÔ.Ô�œò‰ª°ú„¤3¥ */
+	$"8279 A26A 82C5 27CF FB64 D227 994E C6A7"            /* ‚y¢j‚Å'ÏûdÒ'™NƧ */
+	$"531C 7B7D D333 20D4 F79E 7C21 CC1E 7ADA"            /* S.{}Ó3 Ô÷ž|!Ì.zÚ */
+	$"F978 DEBB 1FF2 7420 A72D DE6B AB74 8DC6"            /* ùxÞ».òt §-Þk«t�Æ */
+	$"DD0F 0386 BF57 5F23 4926 C874 D598 47A3"            /* Ý..†¿W_#I&ÈtÕ˜G£ */
+	$"FBC8 E9B0 38BB C695 B7F4 82A1 CC5F 1E22"            /* ûÈé°8»Æ•·ô‚¡Ì_." */
+	$"767C 20D5 E64D 44F1 B2D4 2298 C6A1 1842"            /* v| ÕæMDñ²Ô"˜Æ¡.B */
+	$"8139 0CC8 B9C5 284F 9FC8 945B 5342 94A8"            /* �9.ȹÅ(OŸÈ”[SB”¨ */
+	$"1A57 3351 E00E DB28 D5E3 9712 4346 6DBA"            /* .W3Qà.Û(Õã—.CFmº */
+	$"CC9B A1ED CD9B 778D 4523 1E9A AC69 8ED9"            /* Ì›¡íÍ›w�E#.š¬iŽÙ */
+	$"67C4 C16D A548 A029 0075 0185 8D06 B7F0"            /* gÄÁm¥H ).u.…�.·ð */
+	$"8258 D26A EB95 D437 F0D2 8E91 D536 F534"            /* ‚XÒjë•Ô7ðÒŽ‘Õ6õ4 */
+	$"30A1 6DE7 E4B8 48DF 246E 6A43 4FE6 AED0"            /* 0¡mçä¸Hß$njCOæ®Ð */
+	$"48A0 5E1E C339 6C40 BE36 CEB8 870B F9EB"            /* H ^.Ã9l@¾6θ‡.ùë */
+	$"5ED8 3CA2 B3FA 8CD9 2D26 FF79 6468 862D"            /* ^Ø<¢³úŒÙ-&ÿydh†- */
+	$"6B87 3072 15D5 5640 D5D4 B4BA EAD3 84F1"            /* k‡0r.ÕV@ÕÔ´ºêÓ„ñ */
+	$"6A43 F378 100E 8088 A3FE 989B E75B F67F"            /* jCóx..€ˆ£þ˜›ç[ö. */
+	$"5B25 3AE2 C08C 8CB0 08DD A37F 94DD 7F03"            /* [%:âÀŒŒ°.Ý£.”Ý.. */
+	$"35C9 DF27 9A9A B829 6326 A95D 91F7 0BA3"            /* 5Éß'šš¸)c&©]‘÷.£ */
+	$"7220 E220 F062 D8DE ADE2 2AD6 DDFD C9E4"            /* r â ðbØÞ­â*ÖÝýÉä */
+	$"FAAE 543D 3CCB 5230 74F7 3120 02FD 6B45"            /* ú®T=<ËR0t÷1 .ýkE */
+	$"A2AB 805B 13FB 1879 6060 5600 1847 98E5"            /* ¢«€[.û.y``V..G˜å */
+	$"BF65 2CD4 ACD7 15D0 B77E 5A0F 8095 95CA"            /* ¿e,Ô¬×.з~Z.€••Ê */
+	$"1847 D25F 7D32 1AE2 89EA 9D49 074D A3E5"            /* .GÒ_}2.â‰ê�I.M£å */
+	$"201E 8AC7 CB9C 43BC 0732 70E0 3C4F E625"            /*  .ŠÇËœC¼.2pà<Oæ% */
+	$"88E3 74DB 6FB7 7BE2 7006 F9E7 1F76 DBF3"            /* ˆãtÛo·{âp.ùç.vÛó */
+	$"C988 D665 F7AA 21E2 A5C1 E969 2917 3BA3"            /* ɈÖe÷ª!â¥Áéi).;£ */
+	$"17BF 925F F835 9827 813E DA4F EE9B 2DF3"            /* .¿’_ø5˜'�>ÚOî›-ó */
+	$"B640 95E8 70A5 B577 8C1D 99D5 797D D482"            /* ¶@•èp¥µwŒ.™Õy}Ô‚ */
+	$"E23A 56DD 644D 9623 FEE2 63D2 A3DB E146"            /* â:VÝdM–#þâcÒ£ÛáF */
+	$"FC39 35A7 6C28 63D8 5240 0C80 0000 0000"            /* ü95§l(cØR@.€.... */
+	$"0001 4095 99D3 7A7A 0A05 B673 69BC DA9C"            /* ..@•™ÓzzÂ.¶si¼Úœ */
+	$"A108 DDEA EE48 6385 0790 FEA1 1AFC 2CED"            /* ¡.ÝêîHc….�þ¡.ü,í */
+	$"2225 BE73 2ED7 00BB 2301 80FE 09DF E78E"            /* "%¾s.×.»#.€þÆßçŽ */
+	$"6FE6 4743 A0EE 0A03 4C9E F046 CDD8 E7F1"            /* oæGC îÂ.LžðFÍØçñ */
+	$"DB3F 1B67 F6E1 1F31 8096 90DF 5110 40B0"            /* Û?.göá.1€–�ßQ.@° */
+	$"0000 0000 0000 0000 C0B9 E0FC 41FB A11C"            /* ........À¹àüAû¡. */
+	$"4696 89A0 DE42 F8C7 27D0 3F03 AA51 70FD"            /* F–‰ ÞBøÇ'Ð?.ªQpý */
+	$"DC5F D7B9 AFD3 A0F3 7BAA A910 9E5C 259E"            /* Ü_×¹¯Ó ó{ª©.ž\%ž */
+	$"E4FB 8F8E 01C1 96E2 0768 FE5A 0A43 E2F8"            /* äû�Ž.Á–â.hþZÂCâø */
+	$"DA74 9500 C241 D1F6 3EFF 3F06 586F A511"            /* Út•.ÂAÑö>ÿ?.Xo¥. */
+	$"CCFE 8FE7 61E1 C392 D001 3F52 1CA8 CC23"            /* Ìþ�çaáÃ’Ð.?R.¨Ì# */
+	$"93F0 27DF 893F 4AC1 06C3 34DA 8953 BBC0"            /* “ð'߉?JÁ.Ã4Ú‰S»À */
+	$"84C0 4843 27E0 067E 5EBF FF7A 1540 4C0E"            /* „ÀHC'à.~^¿ÿz.@L. */
+	$"FA6C 44A1 A7BC DB24 6AD7 C367 EC93 33BF"            /* úlD¡§¼Û$j×Ãgì“3¿ */
+	$"FECB C1DF 83CC 5BF7 A7C0 DF62 2EFA 4283"            /* þËÁ߃Ì[÷§Àßb.úBƒ */
+	$"6E49 2492 4924 9249 2492 4924 9246 A4A5"            /* nI$’I$’I$’I$’F¤¥ */
+	$"7754 9685 B091 D8FF 1549 CF90 2079 3AFB"            /* wT–…°‘Øÿ.IÏ� y:û */
+	$"E925 85CC 62A2 E49B 476B 47B9 319B 630F"            /* é%…Ìb¢ä›GkG¹1›c. */
+	$"A6B8 182C E282 D1CD 920A 4EB3 21BF 943C"            /* ¦¸.,â‚ÑÍ’ÂN³!¿”< */
+	$"27BF CCDE BD6E 481A 188C F70B C257 8118"            /* '¿ÌÞ½nH..Œ÷.ÂW�. */
+	$"FBF7 FF78 F422 A3DB AE81 4980 0000 0000"            /* û÷ÿxô"£Û®�I€.... */
+	$"0000 0000 0000 1EE1 BFBB C300 0000 0000"            /* .......á¿»Ã..... */
+	$"0000 0000 0000 14FB 3FE1 1B7A D142 E13F"            /* .......û?á.zÑBá? */
+	$"5B6F 704A 61CF 957D 258E F744 FB26 8356"            /* [opJaÏ•}%Ž÷Dû&ƒV */
+	$"74AD 1DDB 02F2 CF85 7AEB 3A06 6F12 084E"            /* t­.Û.òÏ…zë:.o..N */
+	$"8E93 D6DA E4FE 9FBE 2D16 1C87 701F 55C3"            /* Ž“ÖÚäþŸ¾-..‡p.Uà */
+	$"9966 3E8F 36CB 6D9F F3F6 F8D3 B3B9 E2C1"            /* ™f>�6ËmŸóöøÓ³¹âÁ */
+	$"1019 C6E6 8FFF 7FDC 6948 D3AB C944 C64A"            /* ..Ææ�ÿ.ÜiHÓ«ÉDÆJ */
+	$"8000 0000 0000 0000 000A B0CB 3806 445C"            /* €........°Ë8.D\ */
+	$"7110 4CDE 3651 AC94 777C 8AB0 5382 04AF"            /* q.LÞ6Q¬”w|Š°S‚.¯ */
+	$"32E5 68C2 122F 8A5B 12A8 FF39 CF5E 72FB"            /* 2åhÂ./Š[.¨ÿ9Ï^rû */
+	$"EFD4 1669 47C6 525E 88EF 0AAC 1EE1 98B6"            /* ïÔ.iGÆR^ˆï¬.ᘶ */
+	$"0BFF 7FAF 8A4B 7158 F7D7 1707 DE93 841E"            /* .ÿ.¯ŠKqX÷×..Þ“„. */
+	$"3C82 3260 1FFF 1C8B 6A6E 8C66 0000 0000"            /* <‚2`.ÿ.‹jnŒf.... */
+	$"0000 0000 0000 0121 EF03 234C 3124 0000"            /* .......!ï.#L1$.. */
+	$"0000 0000 0000 0000 077C 5957 204B A2ED"            /* .........|YW K¢í */
+	$"59B8 F3C4 CC60 8A58 7E23 0B9F A0FD 1DC8"            /* Y¸óÄÌ`ŠX~#.Ÿ ý.È */
+	$"8E0F FE2B 5F9F 12D8 09B3 57BB 7818 3CF5"            /* Ž.þ+_Ÿ.ØƳW»x.<õ */
+	$"D579 D427 5198 BD86 E2FC 8775 915B 37A5"            /* ÕyÔ'Q˜½†âü‡u‘[7¥ */
+	$"B2E6 6BD8 8404 31D9 4C54 3621 6561 5C3E"            /* ²ækØ„.1ÙLT6!ea\> */
+	$"4A80 0000 0000 0000 0000 0014 D22D 6758"            /* J€..........Ò-gX */
+	$"336C 63A1 C13F 3E94 9877 8E90 4E5D 0C70"            /* 3lc¡Á?>”˜wŽ�N].p */
+	$"F80A 4262 C2CC C7E4 DAE8 526F 393F 4558"            /* øÂBbÂÌÇäÚèRo9?EX */
+	$"5CC9 5DDA B2FF 7ED5 F809 3A02 F1EE 2760"            /* \É]Ú²ÿ~ÕøÆ:.ñî'` */
+	$"FF7E 5037 F054 4A1B 9602 92EA 8D26 A198"            /* ÿ~P7ðTJ.–.’ê�&¡˜ */
+	$"9C4F 8238 A60E 7734 20F8 18FE 478F 5403"            /* œO‚8¦.w4 ø.þG�T. */
+	$"1658 618B A80F 879F 4A98 E809 DEB2 7CE9"            /* .Xa‹¨.‡ŸJ˜èÆÞ²|é */
+	$"9724 407B B8C8 A48D 4F33 9126 751B 9FC2"            /* —$@{¸È¤�O3‘&u.ŸÂ */
+	$"0283 44C3 5AFD 9546 FCE2 4212 4F5B 01D4"            /* .ƒDÃZý•FüâB.O[.Ô */
+	$"6E53 A032 DA91 40F4 4BDE 0C23 FF1E D5DE"            /* nS 2Ú‘@ôKÞ.#ÿ.ÕÞ */
+	$"B543 59DC C0DC 759A 6043 5883 A5FE C785"            /* µCYÜÀÜuš`CXƒ¥þÇ… */
+	$"BA68 9F46 C21A 4C50 20E3 0488 FB34 1043"            /* ºhŸFÂ.LP ã.ˆû4.C */
+	$"FC68 562B 635A EE8D E334 0C6F 25A9 E4C9"            /* ühV+cZî�ã4.o%©äÉ */
+	$"3484 2AC2 6188 7242 E3F6 AEAC 6F86 2DE2"            /* 4„*ÂaˆrBãö®¬o†-â */
+	$"C377 BD02 CB1C 9553 5485 6A5B E118 9BBD"            /* Ãw½.Ë.•ST…j[á.›½ */
+	$"DC6B 2C92 C6CC C866 6E7F FE63 AB01 FE7D"            /* Ük,’ÆÌÈfn.þc«.þ} */
+	$"FF7F BB81 EA94 87BE B101 F468 0E30 F111"            /* ÿ.»�ꔇ¾±.ôh.0ñ. */
+	$"7BC9 FA0D F87F BDD0 811B 8588 1AE7 8387"            /* {Éú.ø.½Ð�.…ˆ.烇 */
+	$"5C06 B3A9 E2ED 6E5B B524 35AA CBFF 50D6"            /* \.³©âín[µ$5ªËÿPÖ */
+	$"49D9 6918 3837 59BD E7CC 8796 B0AF 2729"            /* IÙi.87Y½ç̇–°¯') */
+	$"0512 5A97 66FF 1A85 E004 1882 0108 EA41"            /* ..Z—fÿ.…à..‚..êA */
+	$"BBCC 15E0 254C 59AF 877D 0722 15FB ADA1"            /* »Ì.à%LY¯‡}.".û­¡ */
+	$"84C2 9B83 DD5B C6B1 EE29 084C 08F7 06C8"            /* „›ƒÝ[Ʊî).L.÷.È */
+	$"4F07 9818 6BF2 66E2 582B 2F7D 29AD BAFA"            /* O.˜.kòfâX+/})­ºú */
+	$"8F9E 0AC8 60AE D10E 3E49 17BF E015 0C5E"            /* �žÂÈ`®Ñ.>I.¿à..^ */
+	$"5C51 5D5B 5BC1 6C83 C428 4505 E9BB 61CB"            /* \Q][[ÁlƒÄ(E.é»aË */
+	$"D7C2 F3C6 C102 73F5 409E D0CF B43E E497"            /* ×ÂóÆÁ.sõ@žÐÏ´>ä— */
+	$"C1E0 707B 3F6F EAA8 2F10 9285 7D9D 9F81"            /* Áàp{?oê¨/.’…}�Ÿ� */
+	$"303D 3A70 2B3F 4A45 558D 63F6 EEB9 CF21"            /* 0=:p+?JEU�cöî¹Ï! */
+	$"52C1 27C2 8439 0BE2 BE1F A553 A1C7 E44C"            /* RÁ'„9.â¾.¥S¡ÇäL */
+	$"5422 9BC0 356D 1B40 E53B 3064 AA69 F464"            /* T"›À5m.@å;0dªiôd */
+	$"7AA7 4E56 F7E2 7AE5 CB6E E538 8582 1927"            /* z§NV÷âzåËnå8…‚.' */
+	$"019D B4B0 E6D9 0F0E 9670 7723 62CF C422"            /* .�´°æÙ..–pw#bÏÄ" */
+	$"DD53 ED12 92AE 20B0 6B63 6CB3 C596 4F4E"            /* ÝSí.’® °kcl³Å–ON */
+	$"18B6 FD06 93B2 6F73 A740 770D C39F B873"            /* .¶ý.“²os§@w.߸s */
+	$"598F 3667 6F7A 29E9 9E6F 9D04 48DD A175"            /* Y�6goz)éžo�.HÝ¡u */
+	$"2AFC 61BD D706 2A8E 9789 F513 B8AF B8EA"            /* *üa½×.*Ž—‰õ.¸¯¸ê */
+	$"2426 7EDF 1EFA 1D19 7A50 D22F D15E 76FE"            /* $&~ß.ú..zPÒ/Ñ^vþ */
+	$"CD34 19AD 8126 775C A5FB B209 9658 F850"            /* Í4.­�&w\¥û²Æ–XøP */
+	$"F2FD A65F B487 9F50 7FF0 12FD BA8B FB6E"            /* òý¦_´‡ŸP.ð.ýº‹ûn */
+	$"49F5 50DF C349 B4F9 F4D7 EDEB 53BE DEB0"            /* IõPßÃI´ùô×íëS¾Þ° */
+	$"7F85 29FB 5DFF 36B9 BEDA 9BF8 3CF2 FDAE"            /* .…)û]ÿ6¹¾Ú›ø<òý® */
+	$"DFB5 ABBE D3DB ED2B FDBA CFFB 7606 FB74"            /* ßµ«¾ÓÛí+ýºÏûv.ût */
+	$"D3F8 6B96 83BA F7ED EB3F 7EDE AFE0 EECD"            /* Óøk–ƒº÷íë?~Þ¯àîÍ */
+	$"FB5E 7F6E 807E DB9B F6BD F0FE D32B EA21"            /* û^.n€~Û›ö½ðþÓ+ê! */
+	$"EFA8 1EFA 823F 6DCF FB6C 8BEA 6CFD B5AF"            /* ï¨.ú‚?mÏûl‹êlýµ¯ */
+	$"0774 CFDB D337 FB7A 3F83 BA5D F51F DF55"            /* .tÏÛÓ7ûz?ƒº]õ.ßU */
+	$"47FB 690F DA86 F791 DDD6 2CCB E6B8 C536"            /* Gûi.Ú†÷‘ÝÖ,Ëæ¸Å6 */
+	$"D512 AD5E 1B08 0B8A 8D03 2F75 60E5 6BF8"            /* Õ.­^...Š�./u`åkø */
+	$"447B C66A 7EC2 7912 B45F 8E48 277C D8E1"            /* D{Æj~Ây.´_ŽH'|Øá */
+	$"809C 5755 D718 BAAC F891 2AE5 F97C 3F5E"            /* €œWU×.º¬ø‘*åù|?^ */
+	$"0116 3A00 99F4 5896 E0EA B189 F5A5 7929"            /* ..:.™ôX–à걉õ¥y) */
+	$"C491 B57F 2232 B0C2 52F8 89B1 DB2F B284"            /* Ä‘µ."2°ÂRø‰±Û/²„ */
+	$"C1EE 0C43 EF76 FD94 F871 4077 7E19 EC36"            /* Áî.Cïvý”øq@w~.ì6 */
+	$"BBFA 6DFF 3C0B 5A98 89B4 84BB 56DB 5FC2"            /* »úmÿ<.Z˜‰´„»VÛ_ */
+	$"16C2 351A B46E AF45 AAC7 DD2E 97ED 970C"            /* .Â5.´n¯EªÇÝ.—í—. */
+	$"76D8 F8D0 42EB E639 28E8 BE33 A530 3B58"            /* vØøÐBëæ9(è¾3¥0;X */
+	$"2374 6B1C 97B0 1CD5 ACD5 615F FD30 62C6"            /* #tk.—°.Õ¬Õa_ý0bÆ */
+	$"899A 977D 4B74 CAB1 E9EE 6588 4E67 8733"            /* ‰š—}KtʱéîeˆNg‡3 */
+	$"B359 BCC7 DC7B 9884 E4A8 78CB 77E7 675D"            /* ³Y¼ÇÜ{˜„ä¨xËwçg] */
+	$"FF2D FCE4 7744 BDD1 A833 6BEC C481 2DA8"            /* ÿ-üäwD½Ñ¨3kìÄ�-¨ */
+	$"3D1C 5D57 7595 1DEB 2278 31AE 4188 B1F2"            /* =.]Wu•.ë"x1®Aˆ±ò */
+	$"54E1 113D DA75 96ED 71FF 1577 7820 4D22"            /* Tá.=Úu–íqÿ.wx M" */
+	$"2BD9 3841 A416 96A4 2549 1A9D 3A55 8E39"            /* +Ù8A¤.–¤%I.�:UŽ9 */
+	$"A929 4B4E E11F 0F88 8BB6 7E08 2210 9D21"            /* ©)KNá..ˆ‹¶~.".�! */
+	$"92BF 623B B974 D371 0208 1489 5713 0F66"            /* ’¿b;¹tÓq...‰W..f */
+	$"3C4C 8394 72A6 08A1 3D86 BA0C 198B CE8B"            /* <Lƒ”r¦.¡=†º..‹Î‹ */
+	$"FB71 18D8 E044 CE7C A642 F1E5 DC8B F8E6"            /* ûq.ØàDÎ|¦BñåÜ‹øæ */
+	$"2405 66E0 B6C5 6A4F B1AE 2231 3060 11D4"            /* $.fà¶ÅjO±®"10`.Ô */
+	$"9963 5EF4 BB3D 1F61 0807 0AE1 0DFC 4718"            /* ™c^ô»=.a..Âá.üG. */
+	$"6C97 80A7 D438 6A81 B76A 6E7E 7A64 87A1"            /* l—€§Ô8j�·jn~zd‡¡ */
+	$"1D7A 8744 3227 F565 4B4A E311 FA0F B477"            /* .z‡D2'õeKJã.ú.´w */
+	$"9DD6 0662 8844 7138 BDF8 CBCC 007F BDB6"            /* �Ö.bˆDq8½øËÌ..½¶ */
+	$"07C4 98CC 226B 9762 33D0 99EF 54D9 5800"            /* .ĘÌ"k—b3ЙïTÙX. */
+	$"509D C37B 39A7 E11B 8771 0999 AB8B AAA6"            /* P�Ã{9§á.‡qÆ™«‹ª¦ */
+	$"C463 6C38 7FB0 9121 2CA2 7634 BBEE 41FB"            /* Äcl8.°‘!,¢v4»îAû */
+	$"4F3B B050 3E38 15C4 98A6 216D 31C2 7057"            /* O;°P>8.ʦ!m1ÂpW */
+	$"0B3D 429A 6CFB 0819 EB4D B9D2 549F 6601"            /* .=Bšlû..ëM¹ÒTŸf. */
+	$"2436 5BEA 9DAC BBDA AB3A AB4F ABFF 768D"            /* $6[ê�¬»Ú«:«O«ÿv� */
+	$"E220 E451 7E45 49C5 21FD B2E6 DEFD 2505"            /* â äQ~EIÅ!ý²æÞý%. */
+	$"836B 3500 54D8 50B8 7538 C5BF B951 7FB2"            /* ƒk5.TØP¸u8Å¿¹Q.² */
+	$"F927 CBB1 7AA1 D0BD 51E2 D7F7 C440 5DA0"            /* ù'˱z¡Ð½Qâ×÷Ä@]  */
+	$"89EF FEEE BF2E A5E4 F98A B652 F25A D1DC"            /* ‰ïþî¿.¥äùŠ¶RòZÑÜ */
+	$"482A 40CB A288 250A 22CA BCB4 815D 077E"            /* H*@Ë¢ˆ%Â"ʼ´�].~ */
+	$"229E 59B2 8249 D336 A3C1 5D5B FAE5 483C"            /* "žY²‚IÓ6£Á][úåH< */
+	$"67F3 255E 1530 AFB1 D900 48FE 254B C54E"            /* gó%^.0¯±Ù.Hþ%KÅN */
+	$"42DC EE54 066B CE83 B1C9 F021 2031 8DF1"            /* BÜîT.k΃±Éð! 1�ñ */
+	$"FE58 9315 B761 79CA 409A 6CD6 337A 14A9"            /* þX“.·ayÊ@šlÖ3z.© */
+	$"8622 90BC 3474 727C 66CE 09C5 61B4 A386"            /* †"�¼4tr|fÎÆÅa´£† */
+	$"7509 819F 6EEB 5FCC C0A7 084A 7742 A6E3"            /* uÆ�Ÿnë_ÌÀ§.JwB¦ã */
+	$"F69A 90CA 24AD EB53 60AB 5FD0 FD6F 3DE6"            /* öš�Ê$­ëS`«_Ðýo=æ */
+	$"44CF 80FB A400 B71F 1DD4 C690 A3DB 54CF"            /* DÏ€û¤.·..ÔÆ�£ÛTÏ */
+	$"F492 7EC7 540C 048F 3D35 FD63 7593 751B"            /* ô’~ÇT..�=5ýcu“u. */
+	$"F88F 4B7D E355 6685 FD5F 2743 8DF3 D839"            /* ø�K}ãUf…ý_'C�óØ9 */
+	$"0894 99DB 1FAA 22B2 8800 8C9F D91F E60B"            /* .”™Û.ª"²ˆ.ŒŸÙ.æ. */
+	$"0EEE 2870 2932 2AE5 F401 11F0 8B2B 53DB"            /* .î(p)2*åô..ð‹+SÛ */
+	$"8028 E39D 744F E70B 11F3 A220 ABF4 FCD5"            /* €(ã�tOç..ó¢ «ôüÕ */
+	$"37C9 0AC8 8749 215E 1D89 4022 96D0 04FF"            /* 7ÉÂȇI!^.‰@"–Ð.ÿ */
+	$"0C57 AC3D 351A 8582 EBA4 EA2B B65B A14B"            /* .W¬=5.…‚ë¤ê+¶[¡K */
+	$"048B E031 DE15 251C 669F 8457 FF38 D131"            /* .‹à1Þ.%.fŸ„Wÿ8Ñ1 */
+	$"0027 BB20 9721 6636 A375 AFBA AF7B BDBA"            /* .'» —!f6£u¯º¯{½º */
+	$"05F3 3114 E55E DAA9 219F 9516 F3DF 12B4"            /* .ó1.å^Ú©!Ÿ•.óß.´ */
+	$"DA3F 83DF 13A0 9900 3FA6 17E9 B014 E404"            /* Ú?ƒß. ™.?¦.é°.ä. */
+	$"434D 02D4 4283 D73D F4D1 5D95 8B25 6A6A"            /* CM.ÔBƒ×=ôÑ]•‹%jj */
+	$"CD5E BA93 82DF 1A30 4B0D 0E21 65A1 0001"            /* Í^º“‚ß.0K..!e¡.. */
+	$"2869 F06A 8949 311F DB03 39EB E8E1 5BFB"            /* (iðj‰I1.Û.9ëèá[û */
+	$"F11C 05C6 2469 BAEA 4516 4CC4 DAF5 927A"            /* ñ..Æ$iºêE.LÄÚõ’z */
+	$"2CEB 3150 DB6F 4DE2 8EED 59C0 604F 9AE5"            /* ,ë1PÛoMâŽíYÀ`Ošå */
+	$"E136 83B0 F348 3D1A B44D 3A8E D77A B0DE"            /* á6ƒ°óH=.´M:Ž×z°Þ */
+	$"5267 1055 24F7 3C3D EB3E 08EF 97F9 4B29"            /* Rg.U$÷<=ë>.ï—ùK) */
+	$"454F 1B5D 4A6E 56E1 0F90 00A1 4467 7454"            /* EO.]JnVá.�.¡DgtT */
+	$"B556 362A 9A19 9E35 19E9 BFDF E2AD 91D6"            /* µV6*š.ž5.é¿ßâ­‘Ö */
+	$"7FB6 95B9 F19D 8D07 2FAF 3162 D880 0AA7"            /* .¶•¹ñ��./¯1b؀§ */
+	$"C9C4 94AD C49A 1231 2D9F 780F 6E3E 57D2"            /* ÉÄ”­Äš.1-Ÿx.n>WÒ */
+	$"8C1C 582C 179A 721C 7063 F056 F938 4EA1"            /* Œ.X,.šr.pcðVù8N¡ */
+	$"F3E4 E458 D254 280F 92CA ABDC 4ECF 3EB7"            /* óääXÒT(.’Ê«ÜNÏ>· */
+	$"95DF A3B8 45C0 1427 BA54 B2E2 D1BC B67D"            /* •ß£¸EÀ.'ºT²âѼ¶} */
+	$"5A0F EE12 37D4 BE1C 5785 A90D 2E62 B301"            /* Z.î.7Ô¾.W…©..b³. */
+	$"F66D A637 374B 17DA 7446 C318 3B11 4F50"            /* öm¦77K.ÚtFÃ.;.OP */
+	$"ED27 AEB2 D8F6 C3E4 AB48 5E7C 1D46 9463"            /* í'®²ØöÃä«H^|.F”c */
+	$"E7BA 9296 7BFA FDBB 39F2 7E86 1A5D 8FFA"            /* 纒–{úý»9ò~†.]�ú */
+	$"7E06 FC92 3472 7950 8B67 8329 FA9F 47AA"            /* ~.ü’4ryP‹gƒ)úŸGª */
+	$"51F3 01AD A6DA 224F E711 AF6F BA8F FA86"            /* Qó.­¦Ú"Oç.¯oº�ú† */
+	$"FF61 EBD1 5613 B076 3543 3515 FF1B 1E9C"            /* ÿaëÑV.°v5C5.ÿ..œ */
+	$"CE78 6A36 7CCF FD63 E9E3 00E6 EA60 1DBE"            /* Îxj6|Ïýcéã.æê`.¾ */
+	$"42FB 3E66 D69D 8BA6 A0E6 13E1 2087 20D7"            /* Bû>fÖ�‹¦ æ.á ‡ × */
+	$"7941 E3C4 C7C6 67FF 2C9C A486 253A C206"            /* yAãÄÇÆgÿ,œ¤†%:Â. */
+	$"F961 4A0E D9DD D32A 6D67 A012 B1A2 B549"            /* ùaJ.ÙÝÓ*mg .±¢µI */
+	$"3F58 8BA1 CA98 94EB 6099 570C D139 09AA"            /* ?X‹¡Ê˜”ë`™W.Ñ9ƪ */
+	$"8DEB C31A 0812 5DAD 2926 6846 D789 4430"            /* �ëÃ...]­)&hF׉D0 */
+	$"4931 16B5 0804 52F1 040D B0A7 DDD7 7052"            /* I1.µ..Rñ..°§Ý×pR */
+	$"4269 C765 98AA 3941 F9EE 987A 2EAD 46BE"            /* BiÇe˜ª9Aùî˜z.­F¾ */
+	$"AA2B DD79 D9F9 7AF7 9318 B633 97CC DB93"            /* ª+ÝyÙùz÷“.¶3—ÌÛ“ */
+	$"5AF7 23D4 08E5 1FD7 EA45 85E9 4C98 77B6"            /* Z÷#Ô.å.×êE…éL˜w¶ */
+	$"0038 8756 6C8F 1A76 8D36 D67C 0BBD 248F"            /* .8‡Vl�.v�6Ö|.½$� */
+	$"8465 4CC4 7B7A C1B7 6348 F763 66A7 F04E"            /* „eLÄ{zÁ·cH÷cf§ðN */
+	$"FF4E 1C72 1053 323F 9E55 F75D 4097 9C24"            /* ÿN.r.S2?žU÷]@—œ$ */
+	$"AD5D 3C1B 766A 50A8 7252 6563 2687 8251"            /* ­]<.vjP¨rRec&‡‚Q */
+	$"8AE2 2EAE 6AA9 6439 2831 281E 034D 7999"            /* Šâ.®j©d9(1(..My™ */
+	$"F46F 47C1 911D 553A D887 0E8F 6E83 1B48"            /* ôoGÁ‘.U:؇.�nƒ.H */
+	$"F0D9 C566 C0FF 0F02 5E68 EA76 7381 25B1"            /* ðÙÅfÀÿ..^hêvs�%± */
+	$"D388 A375 370B A655 625B B71A 191C CD9D"            /* Óˆ£u7.¦Ub[·...Í� */
+	$"F3CA 83B2 88D6 3712 B3E3 6CEA 19DC 3295"            /* óʃ²ˆÖ7.³ãlê.Ü2• */
+	$"3398 DF4F 1279 B346 1DD8 ED24 186F BEE1"            /* 3˜ßO.y³F.Øí$.o¾á */
+	$"8FD4 5FAD EAFF 6960 DE17 A0A4 B89E 7CF3"            /* �Ô_­êÿi`Þ. ¤¸ž|ó */
+	$"C360 9DA8 91BF 470F ECC0 C0AA E260 3430"            /* Ã`�¨‘¿G.ìÀÀªâ`40 */
+	$"EF4E CAD6 F964 05B0 8E27 C1F6 7516 4350"            /* ïNÊÖùd.°Ž'Áöu.CP */
+	$"B87D 7D16 703E 7972 1232 2E0F 6577 664C"            /* ¸}}.p>yr.2..ewfL */
+	$"8FA6 1414 7FB2 A33D A69E FD2F CF21 FC8F"            /* �¦...²£=¦žý/Ï!ü� */
+	$"23A5 6AED 3E28 34A0 F73F F7D6 7F7C 5B6B"            /* #¥jí>(4 ÷?÷Ö.|[k */
+	$"0596 8B6D BACA 52DF 8E72 CDBA E221 7092"            /* .–‹mºÊRߎrͺâ!p’ */
+	$"A3AB B99D 1EE3 3F21 1AD2 0F0B DC5A 8BE1"            /* £«¹�.ã?!.Ò..ÜZ‹á */
+	$"9E35 D891 9A60 EF28 5934 FA3B 8009 DC42"            /* ž5Ø‘š`ï(Y4ú;€ÆÜB */
+	$"11BE 487F D776 AF26 0EBD BF3E 8DCC B940"            /* .¾H.×v¯&.½¿>�̹@ */
+	$"2523 D6E1 447F EA8A 5F66 DE0B 0962 249E"            /* %#ÖáD.êŠ_fÞ.Æb$ž */
+	$"165D BB6D 1EBD 1237 021B F903 DEEF 78FE"            /* .]»m.½.7..ù.Þïxþ */
+	$"B3F3 76B7 429F 336D 0EFA FF47 5CBC E3DF"            /* ³óv·BŸ3m.úÿG\¼ãß */
+	$"FC44 41BA BC9D 67AE 0B43 D817 FBCE 4F36"            /* üDAº¼�g®.CØ.ûÎO6 */
+	$"8209 CCB5 38F6 712E 7DEA 4E9E 4B38 3B80"            /* ‚Æ̵8öq.}êNžK8;€ */
+	$"7B16 28E3 AB59 340E 93F0 4C65 C281 A4F1"            /* {.(ã«Y4.“ðLeÂ�¤ñ */
+	$"08E4 26A6 31AA B6A4 F784 BA8E C7FA 8919"            /* .ä&¦1ª¶¤÷„ºŽÇú‰. */
+	$"4B19 FA98 09C8 3C79 27DA CB39 881C 3B0E"            /* K.ú˜ÆÈ<y'ÚË9ˆ.;. */
+	$"9BEA 1EF3 D655 CFEB B4F7 0888 971D 69EF"            /* ›ê.óÖUÏë´÷.ˆ—.iï */
+	$"1105 0EF2 80B8 FF1E F0BE 107F 9AB0 6C52"            /* ...ò€¸ÿ.ð¾..š°lR */
+	$"FF78 3AA4 8FE0 3370 40DF C5E8 478A 2FCF"            /* ÿx:¤�à3p@ßÅèGŠ/Ï */
+	$"96C5 8D32 8E07 AA93 DA95 4D9B 60C6 2748"            /* –Å�2Ž.ª“Ú•M›`Æ'H */
+	$"C8F4 8347 D2D9 2E35 75E4 333A 6494 B177"            /* ÈôƒGÒÙ.5uä3:d”±w */
+	$"C836 6E4F AF08 CDB0 0FA5 D565 A0EC 946F"            /* È6nO¯.Í°.¥Õe ì”o */
+	$"ED5C 03F6 E5DB FA4F D29A BF8F BC7F 12D8"            /* í\.öåÛúOÒš¿�¼..Ø */
+	$"7730 8564 524D 4B31 F681 8C71 C5BC 1641"            /* w0…dRMK1ö�Œqż.A */
+	$"6988 F9CF 0385 B8EE 4C04 07DB 5AD2 531C"            /* iˆùÏ.…¸îL..ÛZÒS. */
+	$"48BA 3E6F E24E AF73 DB5E B729 A4BF 894A"            /* Hº>oâN¯sÛ^·)¤¿‰J */
+	$"782D E8F2 91C9 E628 322C F20C 2D0C 73DD"            /* x-èò‘Éæ(2,ò.-.sÝ */
+	$"F093 4ED7 63DF E121 E7B9 DB7E 530D E3BD"            /* ð“N×cßá!ç¹Û~S.ã½ */
+	$"3469 29CE 5768 BE0F 1E91 46B7 00A0 CC2E"            /* 4i)ÎWh¾..‘F·. Ì. */
+	$"183D 7D57 762C 062D 0707 EBA4 177D 73E8"            /* .=}Wv,.-..ë¤.}sè */
+	$"FA30 83A6 479B AA9A 702E B8FD 9B54 0FF3"            /* ú0ƒ¦G›ªšp.¸ý›T.ó */
+	$"8222 1EB0 4CDD 4CF7 F0AB 8972 B655 9426"            /* ‚".°LÝL÷ð«‰r¶U”& */
+	$"4EEE 3B88 A6D2 F8B9 6845 0467 D606 9DDD"            /* Nî;ˆ¦Òø¹hE.gÖ.�Ý */
+	$"C547 A61F 71E7 5A8E 6B83 51FD B2C1 A732"            /* ÅG¦.qçZŽkƒQý²Á§2 */
+	$"A6EA A0AA 6D13 E80B 0EC4 5DF4 348F FF6E"            /* ¦ê ªm.è..Ä]ô4�ÿn */
+	$"2289 CFB4 1AE2 18D1 340F B29B E1FF 16B1"            /* "‰Ï´.â.Ñ4.²›áÿ.± */
+	$"0F0F B5AD 260A 7FD9 B1F2 3D0C 404F 75A8"            /* ..µ­&Â.Ù±ò=.@Ou¨ */
+	$"E4DB 52EE 259B D762 E5E5 4FFD 22AC 4856"            /* äÛRî%›×bååOý"¬HV */
+	$"9C62 8DDB F5D8 58F8 4EC7 1110 30EC E0D8"            /* œb�ÛõØXøNÇ..0ìàØ */
+	$"7FED 0176 FEF2 53B3 75C6 34E1 A3A7 79DA"            /* .í.vþòS³uÆ4ᣧyÚ */
+	$"1FDC 42EC 83B2 F3EB 056C E41B 4E65 3699"            /* .ÜB샲óë.lä.Ne6™ */
+	$"4BD6 1AE3 85A9 DBF6 89D4 39B0 79F9 8877"            /* KÖ.ã…©Ûö‰Ô9°yùˆw */
+	$"161C 2CB5 3F3C 294B 8CA3 A6F6 556C 4CAD"            /* ..,µ?<)KŒ£¦öUlL­ */
+	$"A752 918D 7E61 BA54 02D2 CF5C AEBE 1A0B"            /* §R‘�~aºT.ÒÏ\®¾.. */
+	$"B75C A9CA 9876 AB0B 6028 4D8E D46C E479"            /* ·\©Ê˜v«.`(MŽÔläy */
+	$"A186 EA09 496E 0935 04E2 4C25 FA18 270B"            /* ¡†êÆInÆ5.âL%ú.'. */
+	$"A054 DE1C 1BD8 A089 9D95 1335 E93C 7C21"            /*  TÞ..Ø ‰�•.5é<|! */
+	$"435E A570 3C42 AA88 0075 BB20 20AF 90EC"            /* C^¥p<Bªˆ.u»  ¯�ì */
+	$"26F9 7E41 5CC7 2154 63A3 D965 075C 1A78"            /* &ù~A\Ç!Tc£Ùe.\.x */
+	$"2A13 753E DDD9 F846 467C EFC6 5308 2B46"            /* *.u>ÝÙøFF|ïÆS.+F */
+	$"5BD9 2BFF 5F26 72DB 523D D0FC CE49 47B0"            /* [Ù+ÿ_&rÛR=ÐüÎIG° */
+	$"D98B 4D36 1B60 7C3A 0707 F46A 8565 4CCB"            /* Ù‹M6.`|:..ôj…eLË */
+	$"5DC1 A50D C039 BF24 7418 78A7 6D4F DE55"            /* ]Á¥.À9¿$t.x§mOÞU */
+	$"1CB8 B787 158C 6C4D D840 920F 3130 7A92"            /* .¸·‡.ŒlMØ@’.10z’ */
+	$"1CF4 1B74 BC2B 8954 0A80 9636 BFC3 6330"            /* .ô.t¼+‰T€–6¿Ãc0 */
+	$"3E7F 7E4E A811 39F2 3D56 10D3 6A76 4E20"            /* >.~N¨.9ò=V.ÓjvN  */
+	$"F646 5CD3 9166 D2D6 046F E398 A934 2D04"            /* öF\Ó‘fÒÖ.o㘩4-. */
+	$"2E01 C602 1332 8274 6AE2 D5C9 6226 30B3"            /* ..Æ..2‚tjâÕÉb&0³ */
+	$"07DB FDF3 B3BB 6C31 B162 FF63 0639 8E6F"            /* .Ûýó³»l1±bÿc.9Žo */
+	$"3501 A54C 1AA6 42EB EDE7 885E EE2F A6D9"            /* 5.¥L.¦Bëíçˆ^î/¦Ù */
+	$"B74A AE20 8FFB 6FCF A537 642D F17F A45E"            /* ·J® �ûoÏ¥7d-ñ.¤^ */
+	$"EE37 DE05 7569 A81E F464 A35B 603B 4F40"            /* î7Þ.ui¨.ôd£[`;O@ */
+	$"D00F C3D2 D04A F943 AC3C 37E2 1B2B A1D3"            /* Ð.ÃÒÐJùC¬<7â.+¡Ó */
+	$"09D6 A92B F7CB B2FA 9FF7 97F2 83F9 BABC"            /* ÆÖ©+÷˲úŸ÷—òƒùº¼ */
+	$"E4BE F015 E804 97FC A16F 6E8B 9004 8424"            /* ä¾ð.è.—ü¡on‹�.„$ */
+	$"04F7 1295 0A15 3C1A AA5D 6A75 372A 0BB4"            /* .÷.•Â.<.ª]ju7*.´ */
+	$"4849 DD4A 012F D969 23A9 FBA7 C3EB D29F"            /* HIÝJ./Ùi#©û§ÃëÒŸ */
+	$"5CE0 BD6F 8436 26BB 1B52 3BCB DCAA 0791"            /* \à½o„6&».R;Ëܪ.‘ */
+	$"02B3 8EC7 5A89 D402 C9FF 058E E2C8 AD72"            /* .³ŽÇZ‰Ô.Éÿ.ŽâÈ­r */
+	$"01BF D9B3 FA52 B000 0000 3090 8B4E 8809"            /* .¿Ù³úR°...0�‹NˆÆ */
+	$"9E4F 59A7 8021 D030 169B 78E6 55B4 9FB8"            /* žOY§€!Ð0.›xæU´Ÿ¸ */
+	$"48A1 D2F4 BE8E A948 A89E 5E3E BE56 AE8C"            /* H¡Òô¾Ž©H¨ž^>¾V®Œ */
+	$"BF6C 6485 F435 4906 BE37 4D88 589A 85C0"            /* ¿ld…ô5I.¾7MˆXš…À */
+	$"5278 59EC 1FED 3652 3FE0 5229 0524 D686"            /* RxYì.í6R?àR).$Ö† */
+	$"1E5E 14D9 8C56 8742 9625 36BB 4674 0391"            /* .^.ÙŒV‡B–%6»Ft.‘ */
+	$"9647 FCC9 30C4 6D0D 5812 1271 E9C8 E89D"            /* –GüÉ0Äm.X..qéÈè� */
+	$"7F9B 3420 0269 5F58 4554 F964 BDDA E9F3"            /* .›4 .i_XETùd½Úéó */
+	$"973A 5B5F 4C59 107B 2D9E 87CB D896 1F13"            /* —:[_LY.{-ž‡ËØ–.. */
+	$"AC52 F00D 3600 9104 3FF2 399A 0158 5153"            /* ¬Rð.6.‘.?ò9š.XQS */
+	$"139A A5C2 51CC D2C7 D082 C2A0 E35B FE05"            /* .š¥ÂQÌÒÇЂ ã[þ. */
+	$"06C9 DBB4 7036 39DB 80AF 4642 9F53 170C"            /* .ÉÛ´p69Û€¯FBŸS.. */
+	$"2856 38D5 0FA7 B562 4ED8 3BB5 B48A B1C8"            /* (V8Õ.§µbNØ;µ´Š±È */
+	$"B20B 4B42 4499 C5C1 242B A1BA CB74 D8F1"            /* ².KBD™ÅÁ$+¡ºËtØñ */
+	$"1CF1 241E 7A2A B847 111D 13DC CD3C 05A3"            /* .ñ$.z*¸G...ÜÍ<.£ */
+	$"024F 25B5 41E2 0A15 E1C4 1A0E A5D8 0742"            /* .O%µAâÂ.áÄ..¥Ø.B */
+	$"A359 2372 FD88 7447 1DB7 F766 5B7F E63E"            /* £Y#rýˆtG.·÷f[.æ> */
+	$"26B8 BC6E 7B72 E331 2BE1 73BD 04A0 E941"            /* &¸¼n{rã1+ás½. éA */
+	$"45EC 9039 8769 8BFF 1624 8D43 CA24 9D0D"            /* Eì�9‡i‹ÿ.$�CÊ$�. */
+	$"A05B F467 7401 E777 0608 C4A6 A698 9A9B"            /*  [ôgt.çw..Ħ¦˜š› */
+	$"7066 11D3 606F 857E 18D8 D9D3 E226 38C0"            /* pf.Ó`o…~.ØÙÓâ&8À */
+	$"D89B 09D9 A2F1 0171 BAC9 D7BF AB2E BD58"            /* Ø›ÆÙ¢ñ.qºÉ׿«.½X */
+	$"7178 6CC2 608D 447D D92A 621C 1A82 B764"            /* qxlÂ`�D}Ù*b..‚·d */
+	$"2ABE CBE8 07C0 E2A6 9B83 46A8 1109 FC87"            /* *¾Ëè.À⦛ƒF¨.Æü‡ */
+	$"F083 9598 26AE 8847 7E22 278D 9311 59FC"            /* ðƒ•˜&®ˆG~"'�“.Yü */
+	$"2995 1D44 BA58 24BC 2A99 3946 0E00 9144"            /* )•.DºX$¼*™9F..‘D */
+	$"9113 0297 29E3 A7B5 B937 2D23 8405 86ED"            /* ‘..—)㧵¹7-#„.†í */
+	$"29F1 5254 6A8C 0FB8 4B13 F6C3 6028 2C14"            /* )ñRTjŒ.¸K.öÃ`(,. */
+	$"3B80 E317 225C 7A9B 405C 7E95 A2E4 311B"            /* ;€ã."\z›@\~•¢ä1. */
+	$"076A D7B8 A4B5 225A 1F29 FAA2 8239 D98F"            /* .j׸¤µ"Z.)ú¢‚9Ù� */
+	$"071A F302 DA24 AE80 2AC0 D108 035D EA76"            /* ..ó.Ú$®€*ÀÑ..]êv */
+	$"2F7E 850F 9E87 6B19 B2F1 F1E5 F5B3 A5AF"            /* /~….ž‡k.²ññåõ³¥¯ */
+	$"35BB D867 8257 8A48 5E4F 6983 E22E 6DAD"            /* 5»Øg‚WŠH^Oiƒâ.m­ */
+	$"D361 1505 ECF2 3F3C DB84 1861 E5AB 6793"            /* Óa..ìò?<Û„.aå«g“ */
+	$"910D 8F56 6BB5 FD17 29DB 242A 6946 8022"            /* ‘.�Vkµý.)Û$*iF€" */
+	$"7DAF 8120 02EB C840 3765 69EC BB8B F2FF"            /* }¯� .ëÈ@7ei컋òÿ */
+	$"6031 7BE4 EFC4 BECD 7BD7 CB0A 8B8C 75C2"            /* `1{äïľÍ{×Ë‹Œu */
+	$"E63A F4E4 B05B 1442 0CB1 BEBD E078 84F5"            /* æ:ôä°[.B.±¾½àx„õ */
+	$"3D95 24FA 952F 949B AD72 01B7 1CC7 4CA6"            /* =•$ú•/”›­r.·.ÇL¦ */
+	$"78C2 BA05 B757 517A 5CB1 A380 0C23 0680"            /* xº.·WQz\±£€.#.€ */
+	$"3113 0CBA 23B8 AA48 F832 B74F 997E 6E03"            /* 1..º#¸ªHø2·O™~n. */
+	$"D16C 577F 968F E9A4 73CA DA79 07B3 A5F1"            /* ÑlW.–�é¤sÊÚy.³¥ñ */
+	$"2D20 C13D F821 62F9 41A0 A7AA 472A 368A"            /* - Á=ø!bùA §ªG*6Š */
+	$"28EE 7686 F7B4 D5CF 225E 004E 709F C4E8"            /* (îv†÷´ÕÏ"^.NpŸÄè */
+	$"FCBC B778 C976 A1E0 1968 1EF9 E998 2DC2"            /* ü¼·xÉv¡à.h.ùé˜- */
+	$"1693 C645 A4F5 787A 5B10 45C0 F010 8596"            /* .“ÆE¤õxz[.EÀð.…– */
+	$"A0F6 E8AA 1BAC C958 C0F6 101E 0C4D 2E61"            /*  öèª.¬ÉXÀö...M.a */
+	$"B76E 4019 58DD 3058 000C 2375 6EBC 6599"            /* ·n@.XÝ0X..#un¼e™ */
+	$"BEA3 9ADC 0002 F98F 24B3 B036 EA0D F2FD"            /* ¾£šÜ..ù�$³°6ê.òý */
+	$"6823 E10A 59D7 5D0B F6C0 EFB2 7D9D A684"            /* h#áÂY×].öÀï²}�¦„ */
+	$"3084 4AD6 92F2 BFB2 57CA 7294 FF2D 53C8"            /* 0„JÖ’ò¿²WÊr”ÿ-SÈ */
+	$"8D05 254E 2360 582F CE0C E209 240D FAB4"            /* �.%N#`X/Î.âÆ$.ú´ */
+	$"C638 2103 7462 2AF1 5461 2036 09B4 294F"            /* Æ8!.tb*ñTa 6Æ´)O */
+	$"52A6 6553 F6B7 85F6 E77F A8B7 058C F201"            /* R¦eSö·…öç.¨·.Œò. */
+	$"19BA D75B 6612 0013 CFA6 F54F 8855 C000"            /* .º×[f...ϦõOˆUÀ. */
+	$"00BE 57DE C13B 77B0 AF81 F95D 8E88 7224"            /* .¾WÞÁ;w°¯�ù]Žˆr$ */
+	$"002F C7BE 1D06 F540 58EF 1909 1D8F 037F"            /* ./Ǿ..õ@Xï.Æ.�.. */
+	$"E973 290F 641E 8849 F996 EA66 D15C CA23"            /* és).d.ˆIù–êfÑ\Ê# */
+	$"C620 3090 94D8 F95F C58C 720B 7FFE 206C"            /* Æ 0�”Øù_ÅŒr..þ l */
+	$"A3E0 EE49 AE89 4586 6617 FE87 4D7B D300"            /* £àîI®‰E†f.þ‡M{Ó. */
+	$"4CF6 E77F A882 E041 362F 710E AC03 D573"            /* Löç.¨‚àA6/q.¬.Õs */
+	$"69FF 7480 0018 484B 0D10 C800 0000 0C24"            /* iÿt€..HK..È....$ */
+	$"183F ADBF D900 0184 8481 E82C C758 1848"            /* .?­¿Ù..„„�è,ÇX.H */
+	$"4840 6806 1212 B020 EA50 0818 484B F6E7"            /* H@h...° êP..HKöç */
+	$"7FA5 E774 6249 2F3D 5FF9 2FC0 0C24 1656"            /* .¥çtbI/=_ù/À.$.V */
+	$"1B91 8000 1846 D5F4 CA01 40C2 3F26 3D84"            /* .‘€..FÕôÊ.@Â?&=„ */
+	$"7B4A 811F 08D6 B47D 05C2 4402 D57B C1FC"            /* {J�..Ö´}.ÂD.Õ{Áü */
+	$"7D32 E6FE 8125 F24E 514B 2820 7323 F96F"            /* }2æþ�%òNQK( s#ùo */
+	$"B1F9 CDBD 94E4 C9BF 81D6 5A26 1C08 2131"            /* ±ùͽ”äÉ¿�ÖZ&..!1 */
+	$"FF58 608E A4BB BEFD 703F C3EA B596 2AEA"            /* ÿX`Ž¤»¾ýp?Ãêµ–*ê */
+	$"48B2 2319 2F7A B9BC A14D EAB4 49CF 89E9"            /* H²#./z¹¼¡Mê´Iωé */
+	$"D312 5979 1910 6519 C45E 4B88 F709 D65D"            /* Ó.Yy..e.Ä^Kˆ÷ÆÖ] */
+	$"BF0F 86DC C883 8469 9757 7FC7 FB91 A851"            /* ¿.†Üȃ„i—W.Çû‘¨Q */
+	$"7834 0232 03F5 F552 B022 E799 431E 3FE8"            /* x4.2.õõR°"ç™C.?è */
+	$"BE7C A37B AAE1 D04F 9795 EA98 CAB0 6816"            /* ¾|£{ªáÐO—•ê˜Ê°h. */
+	$"047F 244A 2BD3 E0CF B862 B172 B1B3 F027"            /* ..$J+Óàϸb±r±³ð' */
+	$"6505 A5AA 6AB2 5F8E B98F 85CB D487 2603"            /* e.¥ªj²_Ž¹�…ËÔ‡&. */
+	$"BDA4 4C6D 4B74 0A12 117F 6137 6A30 37CE"            /* ½¤LmKtÂ...a7j07Î */
+	$"0441 188C 63FC 46ED 5C9A B6A0 9012 6450"            /* .A.ŒcüFí\š¶ �.dP */
+	$"A042 C4D3 8E69 8930 0797 25B3 B70D 5C62"            /*  BÄÓŽi‰0.—%³·.\b */
+	$"6A83 3964 5EF1 4A28 508D FF7F E847 17D0"            /* jƒ9d^ñJ(P�ÿ.èG.Ð */
+	$"7C91 F4BC AA82 5462 99EF FF79 5A7A E45E"            /* |‘ô¼ª‚Tb™ïÿyZzä^ */
+	$"98FF 5B1E 90FE 7F80 9453 7AD1 4A63 8FFC"            /* ˜ÿ[.�þ.€”SzÑJc�ü */
+	$"1B61 796C 4B90 7FE9 1959 752B 8579 95F8"            /* .aylK�.é.Yu+…y•ø */
+	$"C5B9 7EC6 2D24 5185 1BCE 12D6 B418 B42C"            /* Ź~Æ-$Q….Î.Ö´.´, */
+	$"D40F 7AF7 657E 5184 9CAA 8834 B65C 4785"            /* Ô.z÷e~Q„œªˆ4¶\G… */
+	$"B934 7C3A 8000 0000 99F5 3F06 3790 6AF7"            /* ¹4|:€...™õ?.7�j÷ */
+	$"0769 9D8E F19F 4FF3 EDE6 D059 B97C A1F0"            /* .i�ŽñŸOóíæÐY¹|¡ð */
+	$"0CE2 4FAF B846 8CCE 52E4 E898 D2E0 00A3"            /* .âO¯¸FŒÎRäè˜Òà.£ */
+	$"CB3D F2B1 E7F7 0C30 FF13 DB29 474C C00D"            /* Ë=ò±ç÷.0ÿ.Û)GLÀ. */
+	$"C6B7 6A2D 2F89 8E2F BDE7 F2BA C3DD 591B"            /* Æ·j-/‰Ž/½çòºÃÝY. */
+	$"CEDE C7DD 35BA 492C BB53 2AF6 7315 AC30"            /* ÎÞÇÝ5ºI,»S*ös.¬0 */
+	$"17D7 1C05 3AE4 4AB3 8D31 0DC9 7A9F 0A76"            /* .×..:äJ³�1.ÉzŸÂv */
+	$"B4EE 95EE 6CB5 1C6A FE4F D27E 0966 CE51"            /* ´î•îlµ.jþOÒ~ÆfÎQ */
+	$"8607 E144 F4AD E999 5480 05FF 7FC2 C645"            /* †.áDô­é™T€.ÿ.ÂÆE */
+	$"D136 BB6E 89FA 9A2D F827 338F FEB9 B248"            /* Ñ6»n‰úš-ø'3�þ¹²H */
+	$"23A6 377D 0E53 BBF3 D290 3AD8 F58B CE4C"            /* #¦7}.S»óÒ�:Øõ‹ÎL */
+	$"24CA 8E49 76ED DA48 8856 904D C31F 305F"            /* $ÊŽIvíÚHˆV�MÃ.0_ */
+	$"C441 7DAA 86D8 3FE1 5EA7 E20A CDBC 5F2A"            /* ÄA}ª†Ø?á^§âÂͼ_* */
+	$"35DC 107F DDE2 D88C 7B38 D700 4C54 9C81"            /* 5Ü..ÝâØŒ{8×.LTœ� */
+	$"B8FD F39D 0F47 DE2B 6E17 7D4F E30F F60C"            /* ¸ýó�.GÞ+n.}Oã.ö. */
+	$"0895 5694 3006 1211 EFEC D7F8 F743 3D43"            /* .•V”0...ïì×ø÷C=C */
+	$"6BA5 7C06 9025 9188 E369 0FC8 94CB F38E"            /* k¥|.�%‘ˆãi.È”ËóŽ */
+	$"DF76 CA67 91C4 D786 F34F 1E56 332B 1404"            /* ßvÊg‘Ä׆óO.V3+.. */
+	$"B66B 2702 B13D 47B8 1FBD 38D7 A2DF 54EF"            /* ¶k'.±=G¸.½8×¢ßTï */
+	$"FD1C 00CC 5D05 5B28 3EBF 2FC7 7263 5880"            /* ý..Ì].[(>¿/ÇrcX€ */
+	$"0364 4A0B 982F 4A13 A55F 5D64 61D2 110C"            /* .dJ.˜/J.¥_]daÒ.. */
+	$"4319 318A 5BD6 94B7 DBA9 92F0 379B 0E87"            /* C.1Š[Ö”·Û©’ð7›.‡ */
+	$"4561 92A0 0000 0000 0000 12FE B897 0ABD"            /* Ea’ .......þ¸—½ */
+	$"B3C7 FEA8 AE43 B177 DA3F 2BA3 2D59 3358"            /* ³Çþ¨®C±wÚ?+£-Y3X */
+	$"9FAE 567F E53B 2877 9FFF 7FFF 7FFB 4B90"            /* Ÿ®V.å;(wŸÿ.ÿ.ûK� */
+	$"C00D FEA3 7DF6 39C4 C825 2952 2C65 8FFF"            /* À.þ£}ö9ÄÈ%)R,e�ÿ */
+	$"7E91 DB49 1333 7DEC 6471 1E2E 394E A080"            /* ~‘ÛI.3}ìdq..9N € */
+	$"C1C9 0DD4 62C4 4FC9 E332 BC0D F9DD FEAB"            /* ÁÉ.ÔbÄOÉã2¼.ùÝþ« */
+	$"9D33 8271 2A01 8484 B009 6058 624E 2736"            /* �3‚q*.„„°Æ`XbN'6 */
+	$"529C A0F4 BCBB 846D 32FD 407C FA84 2D52"            /* Rœ ô¼»„m2ý@|ú„-R */
+	$"21DC 1623 210B 0410 4061 212D 0386 04FF"            /* !Ü.#!...@a!-.†.ÿ */
+	$"7F72 1DFF 6F83 6A31 2B6E 0A6B D1F1 9A43"            /* .r.ÿoƒj1+nÂkÑñšC */
+	$"F340 2C47 D413 DFAC FF76 46AC 4BDD 55F0"            /* ó@,GÔ.߬ÿvF¬KÝUð */
+	$"2F9A 3BC6 613E 2F69 F45C 08F3 3FCB F83F"            /* /š;Æa>/iô\.ó?Ëø? */
+	$"F7D8 DC38 0F99 4764 0309 0948 41C6 1212"            /* ÷ØÜ8.™Gd.ÆÆHAÆ.. */
+	$"293B 5EA3 BE56 F760 BAEF 61FF 43D4 2891"            /* );^£¾V÷`ºïaÿCÔ(‘ */
+	$"A380 672E FF7E 4B98 FBFB 1ACD 90F6 4A7E"            /* £€g.ÿ~K˜ûû.Í�öJ~ */
+	$"3B14 E9F4 B1B4 4120 E600 AF42 0056 B131"            /* ;.éô±´A æ.¯B.V±1 */
+	$"0310 EF4F EA97 E030 9090 A298 F514 CEFA"            /* ..ïOê—à0��¢˜õ.Îú */
+	$"B200 0061 211A A495 FD76 5850 B8F7 1CF1"            /* ²..a!.¤•ývXP¸÷.ñ */
+	$"A979 F478 5BFF 7FFB E6D6 F6D8 03FF 7FFD"            /* ©yôx[ÿ.ûæÖöØ.ÿ.ý */
+	$"2A36 38D4 BA43 6280 D508 C4BD 735D 1C6F"            /* *68ÔºCb€Õ.Ľs].o */
+	$"2444 63E9 1C9A 969F 90A6 F34E D24D 94F2"            /* $Dcé.š–Ÿ�¦óNÒM”ò */
+	$"1A09 F86A 2762 886F FBA0 96EA 1DC7 0364"            /* .Æøj'bˆoû –ê.Ç.d */
+	$"6192 A000 0000 0000 0000 0000 0061 BE9F"            /* a’ ..........a¾Ÿ */
+	$"2C25 5C25 4958 1428 AA60 5ABF 5551 6084"            /* ,%\%IX.(ª`Z¿UQ`„ */
+	$"D319 B739 1DC3 F92F 03A7 CF66 39CC 13BE"            /* Ó.·9.Ãù/.§Ïf9Ì.¾ */
+	$"100A 204E 9A06 CBD9 A8ED 9E4D CEED AE53"            /* . Nš.ËÙ¨ížMÎí®S */
+	$"023D B3BF AC07 F70E F7DD 2601 E2B4 B214"            /* .=³¿¬.÷.÷Ý&.â´². */
+	$"3B1D 74CD 0F60 7063 EFC5 24B8 3B0F DF21"            /* ;.tÍ.`pcïÅ$¸;.ß! */
+	$"2929 3755 A800 7D09 63D9 1548 5D89 6D22"            /* ))7U¨.}ÆcÙ.H]‰m" */
+	$"FAEF 37DC EB96 FF52 0018 EBDF 464C 8B34"            /* úï7Üë–ÿR..ëßFL‹4 */
+	$"DF85 2990 1CF1 7C84 CEDC D384 5003 D5A1"            /* ß…)�.ñ|„ÎÜÓ„P.Õ¡ */
+	$"2797 DBDC FDFB 0E8C 3703 470D 1FD5 B974"            /* '—ÛÜýû.Œ7.G..Õ¹t */
+	$"5A32 CF32 3D2A 0213 FDC8 8A0C B595 4840"            /* Z2Ï2=*..ýÈŠ.µ•H@ */
+	$"C240 6E40 D585 AF4C 004A F98F FC90 E5BB"            /* Â@n@Õ…¯L.Jù�ü�å» */
+	$"D6AD 2A34 0A6E 1D4D 933D 2221 80B7 C8EF"            /* Ö­*4Ân.M“="!€·Èï */
+	$"7C61 2953 2991 F91A 61A3 B54E 56D2 77E1"            /* |a)S)‘ù.a£µNVÒwá */
+	$"1DB8 8B5F 5E9C 7D32 80A0 C23F BBE6 A2B2"            /* .¸‹_^œ}2€ Â?»æ¢² */
+	$"D49F C777 4BE6 FDA6 7B0F 2983 E19B 84FF"            /* ÔŸÇwKæý¦{.)ƒá›„ÿ */
+	$"4B7B 0DD6 A35E 60AD 632D D6D7 7030 0A9F"            /* K{.Ö£^`­c-Ö×p0Ÿ */
+	$"0FA2 0820 8451 9624 D0FF 1FB4 9B81 61CC"            /* .¢. „Q–$Ðÿ.´›�aÌ */
+	$"591F 6D98 E1AF 16E4 AF42 1FE0 B7C7 30DF"            /* Y.m˜á¯.ä¯B.à·Ç0ß */
+	$"CFFC EC14 15A1 B07A 4E11 ED5F BDB3 FD2A"            /* Ïüì..¡°zN.í_½³ý* */
+	$"84B1 6901 4333 27BB 2E8C 3329 2064 A800"            /* „±i.C3'».Œ3) d¨. */
+	$"0001 2FDE 803E 817B C369 A30F FCF0 FF1D"            /* ../Þ€>�{Ãi£.üðÿ. */
+	$"89A1 2FD7 FF71 B63D 19EC 98DE DFE2 D9B8"            /* ‰¡/×ÿq¶=.ì˜ÞßâÙ¸ */
+	$"9D39 1737 4722 2A89 D291 623B 279F BF0B"            /* �9.7G"*‰Ò‘b;'Ÿ¿. */
+	$"E8C0 8AF8 CBE4 0011 5D58 29AB 34B0 335C"            /* èÀŠøËä..]X)«4°3\ */
+	$"36B2 1383 D820 11B8 22DF 56E1 27EF 932D"            /* 6².ƒØ .¸"ßVá'ï“- */
+	$"30DE CC72 58E3 9BDD A88C 229A CBC8 A466"            /* 0ÞÌrXã›Ý¨Œ"šËȤf */
+	$"7C29 FDE8 E789 F28F 3258 A2DD 897B 1C6A"            /* |)ýèç‰ò�2X¢Ý‰{.j */
+	$"C048 306A EEA7 3DF0 F8D4 BECC CDBD 9E43"            /* ÀH0jî§=ðøÔ¾ÌͽžC */
+	$"A29D 8052 478B 6470 79B7 B38A 5743 CAE7"            /* ¢�€RG‹dpy·³ŠWCÊç */
+	$"0BD4 0F4A 23E1 4C85 39C9 DEB0 75AF 151E"            /* .Ô.J#áL…9ÉÞ°u¯.. */
+	$"45D5 1681 2BA4 74C9 13B5 746A E399 9467"            /* EÕ.�+¤tÉ.µtjã™”g */
+	$"E6B9 D503 7F7C D57D 4D5F 7FC8 DD43 7D9B"            /* æ¹Õ..|Õ}M_.ÈÝC}› */
+	$"3CDC F9AD 167C 162B 4E6C 2110 DB2C DF34"            /* <Üù­.|.+Nl!.Û,ß4 */
+	$"AEED CCE4 05AC 4057 9829 B161 9CA0 8159"            /* ®íÌä.¬@W˜)±aœ �Y */
+	$"A64F FD15 EC5A 4A51 CA6C FD10 9A25 4291"            /* ¦Oý.ìZJQÊlý.š%B‘ */
+	$"1E90 1FC2 3530 E0DB E4E6 232E CB64 AF95"            /* .�.Â50àÛäæ#.Ëd¯• */
+	$"9494 656D D395 3D62 9EDA 2EC1 DB02 1FAA"            /* ””emÓ•=bžÚ.ÁÛ..ª */
+	$"6778 0FC0 C4A2 CCA8 EDC0 4DA8 F889 162F"            /* gx.ÀĢ̨íÀM¨ø‰./ */
+	$"03F9 A9C1 C635 1DAD 2E22 580B 0B2B 83E3"            /* .ù©ÁÆ5.­."X..+ƒã */
+	$"EC02 5552 3AA8 91BA 45AF 5439 4265 71F6"            /* ì.UR:¨‘ºE¯T9Beqö */
+	$"3E7A 4412 5DE5 1863 50E6 C0ED C470 3ED9"            /* >zD.]å.cPæÀíÄp>Ù */
+	$"0E3F 48BA 54C5 915E 03F0 D836 6429 2A67"            /* .?HºTÅ‘^.ðØ6d)*g */
+	$"B7FA 6AF9 069E 8E67 2848 B570 C3AC 7746"            /* ·újù.žŽg(HµpìwF */
+	$"EB48 0A2F 4BE4 8EB3 3F8F 791F 0646 DEDF"            /* ëHÂ/K䎳?�y..FÞß */
+	$"316B EFDF 6FD8 C0B9 7319 CE94 8930 C6F6"            /* 1kïßoØÀ¹s.Δ‰0Æö */
+	$"6399 C4A9 79AD E967 4783 3F8D C538 3C15"            /* c™Ä©y­égGƒ?�Å8<. */
+	$"E5B7 CE98 22B7 5333 A938 B26F 0E1E EF2E"            /* å·Î˜"·S3©8²o..ï. */
+	$"74B9 72EF 9D8A 80B7 FDC1 8334 A5F9 DCFB"            /* t¹rï�Š€·ýÁƒ4¥ùÜû */
+	$"B891 BB38 373C 9BE8 59F4 6018 6E63 DA65"            /* ¸‘»87<›èYô`.ncÚe */
+	$"9B13 9DC8 28DB 3C15 0D2C 11FC 0E2D 7A0A"            /* ›.�È(Û<..,.ü.-z */
+	$"F8FF 671F C3FF 7F8E 1210 C212 EA5A 5F0B"            /* øÿg.Ãÿ.Ž..Â.êZ_. */
+	$"9727 F770 25A5 236D 9789 75C7 4089 11DD"            /* —'÷p%¥#m—‰uÇ@‰.Ý */
+	$"E472 3865 B217 B946 CF22 5225 27DE 566D"            /* är8e².¹FÏ"R%'ÞVm */
+	$"6799 4F82 0D46 59F5 E466 F9E7 71C3 FA80"            /* g™O‚.FYõäfùçqÃú€ */
+	$"7826 E598 FF48 E181 6CA8 5A7E C354 0CAA"            /* x&å˜ÿHá�l¨Z~ÃT.ª */
+	$"B01C 9EC4 181F 849B 6A13 FB8D C477 70BD"            /* °.žÄ..„›j.û�Äwp½ */
+	$"F46B 278C 4467 B0CF 3E21 805E EF97 9696"            /* ôk'ŒDg°Ï>!€^ï—–– */
+	$"CBB9 E3F6 B62E DC26 001A 408F D7E2 07C3"            /* ˹ãö¶.Ü&..@�×â.à */
+	$"C1A4 AD97 4235 8863 A088 1980 C505 6E1F"            /* Á¤­—B5ˆc ˆ.€Å.n. */
+	$"F392 0B24 B500 20DC 8295 5703 F9B9 FF70"            /* ó’.$µ. Ü‚•W.ù¹ÿp */
+	$"355C 9B8D BB49 898F 1AAB F65F 7D7E E28F"            /* 5\›�»I‰�.«ö_}~â� */
+	$"4300 BDCC FB20 4F67 CA07 0CAE 3BAD AA36"            /* C.½Ìû OgÊ..®;­ª6 */
+	$"A4D8 3358 4176 1AD6 01FA 0450 0000 0042"            /* ¤Ø3XAv.Ö.ú.P...B */
+	$"7B49 E0E8 A7D8 4EA9 E1A5 597B DB80 BA6D"            /* {Iàè§ØN©á¥Y{Û€ºm */
+	$"8010 25EA 0A26 833F DE77 DBF7 78B9 564B"            /* €.%êÂ&ƒ?ÞwÛ÷x¹VK */
+	$"57B2 AF8C BC92 97D7 46A1 23C1 B595 A2EE"            /* W²¯Œ¼’—×F¡#Áµ•¢î */
+	$"F8A9 29FA 42C2 3557 6345 80B1 FCFD F322"            /* ø©)úBÂ5WcE€±üýó" */
+	$"E992 9262 A83F E43D B059 CB12 D425 FEF2"            /* é’’b¨?ä=°YË.Ô%þò */
+	$"9932 1BD8 C65C ED82 D05E E15C 5E9C 76B7"            /* ™2.ØÆ\í‚Ð^á\^œv· */
+	$"7C64 FCDB A247 D388 3CCB 86B5 C486 2261"            /* |düÛ¢GÓˆ<ˆµÄ†"a */
+	$"BFD1 7213 39C3 0D69 6AF0 2476 B711 7E91"            /* ¿Ñr.9Ã.ijð$v·.~‘ */
+	$"6B53 6A04 4F3C 2781 A090 3118 6C3F 49BA"            /* kSj.O<'� �1.l?Iº */
+	$"B81A 3FEB D686 EFCE F487 8315 E33F 84DB"            /* ¸.?ëÖ†ïÎô‡ƒ.ã?„Û */
+	$"E2C9 F35F 28C5 10C4 FF7F FA4F E953 89FC"            /* âÉó_(Å.Äÿ.úOéS‰ü */
+	$"8B32 23C6 0D04 5E49 DADA F0FE BCA7 D2C9"            /* ‹2#Æ..^IÚÚðþ¼§ÒÉ */
+	$"5869 EAD4 F153 9BF5 A5EA 3298 CC8B 8721"            /* XiêÔñS›õ¥ê2˜Ì‹‡! */
+	$"F919 680B 3F8C 304A 2849 4970 41CF 0F60"            /* ù.h.?Œ0J(IIpAÏ.` */
+	$"76D9 5820 EF21 CD4A 205A 632F 7CC4 EFDF"            /* vÙX ï!ÍJ Zc/|Äïß */
+	$"33F3 CCA8 EDAF 405B 78E1 8F79 0F66 6573"            /* 3ǫ́í¯@[xá�y.fes */
+	$"35A2 AD75 1E18 6018 AF23 7C9D A008 1A01"            /* 5¢­u..`.¯#|� ... */
+	$"C5FE 69AA 2C8E D97E 244D D075 F213 0CC6"            /* Åþiª,ŽÙ~$MÐuò..Æ */
+	$"738F 4395 BBC0 5CB6 3ADC 3DA8 ACB8 E018"            /* s�C•»À\¶:Ü=¨¬¸à. */
+	$"BA5B 13DB 0F6A CB18 DEAC 9749 F5B5 361D"            /* º[.Û.jË.Þ¬—Iõµ6. */
+	$"CF3A C107 9606 179F F4C7 F3DE CB0B 1F53"            /* Ï:Á.–..ŸôÇóÞË..S */
+	$"F27E 5D3C 11AB 66B4 8037 0644 AE98 19BF"            /* ò~]<.«f´€7.D®˜.¿ */
+	$"D564 973A 0CF2 C96F 56D4 5CB8 666F C68C"            /* Õd—:.òÉoVÔ\¸foÆŒ */
+	$"1E73 E515 8B33 75D2 D3B4 B3A3 8CDE DE0C"            /* .så.‹3uÒÓ´³£ŒÞÞ. */
+	$"DA37 A3DF 44D2 B57E 2DB2 E891 D36F CC23"            /* Ú7£ßDÒµ~-²è‘ÓoÌ# */
+	$"ADE8 45BC BB30 78D7 77BD D4A8 087F C83F"            /* ­èE¼»0x×w½Ô¨..È? */
+	$"E49A 6873 FAC4 C12B 0056 5E18 C3CB C2E9"            /* äšhsúÄÁ+.V^.ÃËÂé */
+	$"DCAE F0E8 A75F 18DD B8DD 1DCD B0F5 3A1C"            /* Ü®ðè§_.ݸÝ.Í°õ:. */
+	$"3816 51A8 0D93 00D0 6FF6 8F07 E4BE EDF9"            /* 8.Q¨.“.Ðoö�.ä¾íù */
+	$"BF0E 6CAA 5384 5DF0 DF12 4CF4 E3B3 5D6C"            /* ¿.lªS„]ðß.Lôã³]l */
+	$"602A B6F1 C0E0 E520 B0D6 71FB 7996 4930"            /* `*¶ñÀàå °Öqûy–I0 */
+	$"23DD 3601 3653 C40D 1A64 DC2B D5C2 01C9"            /* #Ý6.6SÄ..dÜ+ÕÂ.É */
+	$"5002 6BBE 7338 81EE F87D 7687 0FE6 7CF9"            /* P.k¾s8�îø}v‡.æ|ù */
+	$"BAB6 5B35 1A25 421C 5BBA 4D82 4E1F B1D4"            /* º¶[5.%B.[ºM‚N.±Ô */
+	$"1907 FF78 F534 4A16 7BB6 B598 51F6 E4D3"            /* ..ÿxõ4J.{¶µ˜QöäÓ */
+	$"A04B 1198 B926 CFAE FC03 22E3 8360 E696"            /*  K.˜¹&Ï®ü."ãƒ`æ– */
+	$"F546 62F9 7178 F327 E245 4520 8D17 41C4"            /* õFbùqxó'âEE �.AÄ */
+	$"9EC6 EF8D 0924 9416 7901 CE87 5EBB 286D"            /* žÆï�Æ$”.y.·^»(m */
+	$"53BF 09FA 41F6 5FBA 8F4C 79A8 75BA 277A"            /* S¿ÆúAö_º�Ly¨uº'z */
+	$"7D42 642B 38EE 9A49 DEDB F1B3 80D0 E5D0"            /* }Bd+8îšIÞÛñ³€ÐåÐ */
+	$"2980 F797 E7D0 F90D 4B2F AFDD 4A69 3389"            /* )€÷—çÐù.K/¯ÝJi3‰ */
+	$"1418 EBD0 6DF0 E38D 6E2F D546 C1A8 C8DD"            /* ..ëÐmðã�n/ÕFÁ¨ÈÝ */
+	$"8977 E053 9C26 053A CF69 97F9 7FB4 9000"            /* ‰wàSœ&.:Ïi—ù.´�. */
+	$"0000 0115 0E67 B64C 0015 DD82 643D 6476"            /* .....g¶L..Ý‚d=dv */
+	$"ED28 6324 AD72 8124 1AF6 FB1B 21C9 0605"            /* í(c$­r�$.öû.!É.. */
+	$"FAE6 04A6 31BF 6D67 FF7B B889 831A 4FFD"            /* úæ.¦1¿mgÿ{¸‰ƒ.Oý */
+	$"6BF5 F098 23AB A490 39F7 6AFC 3832 E2E1"            /* kõð˜#«¤�9÷jü82âá */
+	$"11B2 ADB0 ECCA 83DE B4FF 3685 5106 75DE"            /* .²­°ìʃ޴ÿ6…Q.uÞ */
+	$"3047 28A0 EDBE AD29 17CD DA62 698B CE64"            /* 0G( í¾­).ÍÚbi‹Îd */
+	$"5999 2B8E BB7D C74F F009 A25D B2B5 BDD9"            /* Y™+Ž»}ÇOðÆ¢]²µ½Ù */
+	$"B852 BFFE 0B74 9C05 22D7 B0A3 2139 0979"            /* ¸R¿þ.tœ."×°£!9Æy */
+	$"5C29 BAE8 43DA F9E5 5383 AFD2 14EC 64AA"            /* \)ºèCÚùåSƒ¯Ò.ìdª */
+	$"442C CE71 74ED 5C27 4331 9374 AC77 47EE"            /* D,Îqtí\'C1“t¬wGî */
+	$"31AC 4C74 97BC 753C D5DC 3D8B F7D2 C612"            /* 1¬Lt—¼u<ÕÜ=‹÷ÒÆ. */
+	$"2399 F431 07A1 76CA DAE6 772B 309A C800"            /* #™ô1.¡vÊÚæw+0šÈ. */
+	$"9F2F D6DF A44C 48EB 853E 4140 A123 BCA3"            /* Ÿ/ÖߤLHë…>A@¡#¼£ */
+	$"D096 00DA 0822 DFB3 6887 B31F A18F 59BE"            /* Ж.Ú."ß³h‡³.¡�Y¾ */
+	$"6B25 B5CF CFA3 8806 85B7 ED84 B20B CDA2"            /* k%µÏÏ£ˆ.…·í„².Í¢ */
+	$"A0C8 404B 3FFF 7FF3 3816 5BF0 A16B 85D0"            /*  È@K?ÿ.ó8.[ð¡k…Ð */
+	$"B87F E4BB 21F9 A3BB 9103 2944 434A 5789"            /* ¸.ä»!ù£»‘.)DCJW‰ */
+	$"E3EC B1E3 6F3E 154A 37E4 ACA6 4B02 6C5B"            /* ãì±ão>.J7䬦K.l[ */
+	$"D23A D4D4 83CE F291 CD7F 114F 5935 8EE0"            /* Ò:ÔÔƒÎò‘Í..OY5Žà */
+	$"17EA F0B3 1D93 BC5F 2CF8 511C E99F 21D8"            /* .êð³.“¼_,øQ.éŸ!Ø */
+	$"E286 EB17 6FC2 C34B 1110 6398 03BF CB08"            /* â†ë.oÂÃK..c˜.¿Ë. */
+	$"0018 4848 E24D 90A5 63F9 B1F8 6E20 EF6E"            /* ..HHâM�¥cù±øn ïn */
+	$"25D5 858B 0AE4 2235 581B D4DA E01C B006"            /* %Õ…‹Âä"5X.ÔÚà.°. */
+	$"E5EB DE78 855B 19E7 4D80 DAC2 1E8F CB2B"            /* åëÞx…[.çM€ÚÂ.�Ë+ */
+	$"0EC8 3FFF 7759 B569 0861 20CC 1D71 2121"            /* .È?ÿwYµi.a Ì.q!! */
+	$"71A7 FA20 B34B EAB3 4260 A827 6E91 2B3C"            /* q§ú ³Kê³B`¨'n‘+< */
+	$"5479 449A 3161 D24E 8489 C00A 18A6 3FEC"            /* TyDš1aÒN„‰ÀÂ.¦?ì */
+	$"61F2 4C86 23C1 85DB 6ECA 221D BCC2 C25F"            /* aòL†#Á…ÛnÊ".¼ÂÂ_ */
+	$"EFFF 7891 F475 0E20 DC0A 8F85 8208 4541"            /* ïÿx‘ôu. ÜÂ�…‚.EA */
+	$"579B 5EE2 24C4 5C60 39B7 D9F1 ECFD 0F0C"            /* W›^â$Ä\`9·Ùñìý.. */
+	$"3719 72A8 A543 8BF5 94BF BF6C E6F7 E45A"            /* 7.r¨¥C‹õ”¿¿læ÷äZ */
+	$"C5CF 1FD7 32F5 2D70 041E 3641 2C46 E23D"            /* ÅÏ.×2õ-p..6A,Fâ= */
+	$"E072 6889 A892 A27F 44A8 564A 74A3 B421"            /* àrh‰¨’¢.D¨VJt£´! */
+	$"E1CC A0F3 50E2 2711 6919 76BE D84B D2FE"            /* áÌ óPâ'.i.v¾ØKÒþ */
+	$"AAED 2D64 7C8F 4C55 7FFF 7EFC 2CBF 05DE"            /* ªí-d|�LU.ÿ~ü,¿.Þ */
+	$"25B2 001C 00EC 6D17 ED17 E559 9DFA F731"            /* %²...ìm.í.åY�ú÷1 */
+	$"B21A 7394 8B35 5948 BA4F 5858 020F FF7C"            /* ².s”‹5YHºOXX..ÿ| */
+	$"C89D 1CFA F89B 9F9C 841F 19EF D626 E6DE"            /* È�.úø›Ÿœ„..ïÖ&æÞ */
+	$"DCC3 3148 38A0 C32F 898F BEC3 0AF3 318C"            /* ÜÃ1H8 Ã/‰�¾ÃÂó1Œ */
+	$"5E09 119B 43C8 9FE6 73B2 F4B9 9789 4BFC"            /* ^Æ.›CÈŸæs²ô¹—‰Kü */
+	$"99A2 FF7F FF7A 4FD0 8C64 F459 410C 013C"            /* ™¢ÿ.ÿzOÐŒdôYA..< */
+	$"1C6C 85B5 1C8F D078 995D 714E 1C60 3090"            /* .l…µ.�Ðx™]qN.`0� */
+	$"9058 77C4 BB80 5F57 1871 CA72 B2FD 0016"            /* �XwÄ»€_W.qÊr²ý.. */
+	$"BAA7 F84F F4E9 ACDF F766 8CB4 475D 2F0B"            /* º§øOôé¬ß÷fŒ´G]/. */
+	$"37BC 18C8 6162 79C2 BDD7 8753 204B A536"            /* 7¼.Èaby½ׇS K¥6 */
+	$"9CBE 4972 316A BCB1 9442 4238 B88F 2F48"            /* œ¾Ir1j¼±”BB8¸�/H */
+	$"7A45 5CD1 A306 3A23 5A78 354F CDB6 C0A5"            /* zE\Ñ£.:#Zx5OͶÀ¥ */
+	$"2A5C 19DA 0B0C CD84 8D85 D2B8 1DC9 059C"            /* *\.Ú..Í„�…Ò¸.É.œ */
+	$"A8C4 8118 4848 9372 9372 566C 21E5 2665"            /* ¨Ä�.HH“r“rVl!å&e */
+	$"D16C 6601 48A8 35CE 7FFF 7F19 B54E 7F04"            /* Ñlf.H¨5Î.ÿ..µN.. */
+	$"10EC 1AA3 13FF 4588 9722 A7AA B011 863C"            /* .ì.£.ÿEˆ—"§ª°.†< */
+	$"E4B1 717B 7C2D 21E6 267B 4B48 E790 FF76"            /* ä±q{|-!æ&{KHç�ÿv */
+	$"40CC F425 41CB 289F 809D 8170 A529 2EDA"            /* @Ìô%AË(Ÿ€��p¥).Ú */
+	$"A105 B3AF FB44 7951 B87A 0091 5B53 5979"            /* ¡.³¯ûDyQ¸z.‘[SYy */
+	$"CDC6 5976 6393 34F2 21FF 7FFF 7FFF 7D43"            /* ÍÆYvc“4ò!ÿ.ÿ.ÿ}C */
+	$"4F4B C77F 73C7 0454 BE9C BE9C 282E 440E"            /* OKÇ.sÇ.T¾œ¾œ(.D. */
+	$"0608 A380 6121 2103 DBD2 250B 5D57 9159"            /* ..£€a!!.ÛÒ%.]W‘Y */
+	$"B69A 28CF E66A 154F F84F F4E9 99ED 48C4"            /* ¶š(Ïæj.OøOôé™íHÄ */
+	$"CA7E BE76 FC67 A7CD DC26 1C00 0184 8463"            /* Ê~¾vüg§ÍÜ&...„„c */
+	$"69A8 C0A9 127C 5830 CC3A 380A C742 E4DE"            /* i¨À©.|X0Ì:8ÂÇBäÞ */
+	$"06F5 7999 556D FD9F 268B 895F FF4B 7BB9"            /* .õy™UmýŸ&‹‰_ÿK{¹ */
+	$"C201 52B7 B483 0906 65EC 1848 4750 6F27"            /* Â.R·´ƒÆ.eì.HGPo' */
+	$"C86C 1F27 9108 6253 0416 4CD3 30E4 7F77"            /* Èl.'‘.bS..LÓ0ä.w */
+	$"0705 8420 83B6 BCB6 29DE B71E 8DC5 851A"            /* ..„ ƒ¶¼¶)Þ·.�Å…. */
+	$"ABB0 83D8 F2E2 5113 55D2 AAF6 B3AB 7679"            /* «°ƒØòâQ.UÒªö³«vy */
+	$"49FE A1F8 6F30 0EC0 7D91 534C C78C DC5D"            /* Iþ¡øo0.À}‘SLÇŒÜ] */
+	$"5A42 CA06 37D8 E0ED 27FA 3E31 C849 D2BE"            /* ZBÊ.7Øàí'ú>1ÈIÒ¾ */
+	$"847C 0CCF 676F ACFE 91A3 0F62 B711 1897"            /* „|.Ïgo¬þ‘£.b·..— */
+	$"9DC3 8E37 3AF8 907E 0B69 1577 2856 AA36"            /* �ÃŽ7:ø�~.i.w(Vª6 */
+	$"FAC0 D56C 6686 0443 CA96 FDCD 051B 23A7"            /* úÀÕlf†.CÊ–ýÍ..#§ */
+	$"7DAC 8229 C5FC F840 103A 6407 49F7 6B32"            /* }¬‚)Åüø@.:d.I÷k2 */
+	$"254F 2B32 7FC1 F460 D5C0 5EE1 3046 612A"            /* %O+2.Áô`ÕÀ^á0Fa* */
+	$"1BC1 C143 7B76 B9EF ECCB 5EE9 8F0C 3F71"            /* .ÁÁC{v¹ïìË^é�.?q */
+	$"E805 8B9B 17B7 9ECE C237 AF5C 0062 E61E"            /* è.‹›.·žÎÂ7¯\.bæ. */
+	$"DF6C C1F7 904E 4379 2A9C 92FC 1B04 00A8"            /* ßlÁ÷�NCy*œ’ü...¨ */
+	$"F9D5 DB1B C4C6 9485 ABC2 1199 CCF2 0A47"            /* ùÕÛ.ÄÆ”…«Â.™ÌòÂG */
+	$"9693 C097 7AD0 449A FC53 DEC5 6EE8 6BF7"            /* –“À—zÐDšüSÞÅnèk÷ */
+	$"0D7D 4ED8 3426 DA7E ECF9 57ED 9252 9A6A"            /* .}NØ4&Ú~ìùWí’Ršj */
+	$"2B94 2614 1B6E A495 8261 4D5E DAEF 03FA"            /* +”&..n¤•‚aM^Úï.ú */
+	$"8A63 9496 E8AB A1A6 5B5C B03E E73E 2889"            /* Šc”–è«¡¦[\°>ç>(‰ */
+	$"D257 6C28 080A 68DC 226C 950F F55B E7CC"            /* ÒWl(.ÂhÜ"l•.õ[çÌ */
+	$"95AD FDA7 43EA 7489 A545 C0FC E9B0 2A25"            /* •­ý§Cêt‰¥EÀüé°*% */
+	$"719C EE06 9E5A 8FC0 D3B0 0C81 1EB0 C8C6"            /* qœî.žZ�ÀÓ°.�.°ÈÆ */
+	$"25BD B383 33BD B80D D9A9 48F3 7539 D7D5"            /* %½³ƒ3½¸.Ù©Hóu9×Õ */
+	$"8021 5EBA 94A7 83A3 69FE 8179 9106 BC56"            /* €!^º”§ƒ£iþ�y‘.¼V */
+	$"14A4 427B 8C09 BACB 2FC9 B8F3 CAFA E51C"            /* .¤B{ŒÆºË/ɸóÊúå. */
+	$"9C07 9A69 033C 6159 163E 6ED8 259D 7AAB"            /* œ.ši.<aY.>nØ%�z« */
+	$"D316 475C F6C7 BD0E 7972 4C59 DF3A D5B4"            /* Ó.G\öǽ.yrLYß:Õ´ */
+	$"44ED 7D01 B0FB 34D4 4C9C BC2D B8A6 5B65"            /* Dí}.°û4ÔLœ¼-¸¦[e */
+	$"134F 0C96 5CA1 21CC A249 F17D 4660 9835"            /* .O.–\¡!Ì¢Iñ}F`˜5 */
+	$"957C 7392 53A9 DE42 E650 604B 10E2 FF12"            /* •|s’S©ÞBæP`K.âÿ. */
+	$"B47A 044A 524A B8D3 60B5 A258 CEAB 55E8"            /* ´z.JRJ¸Ó`µ¢XΫUè */
+	$"5219 EC3E A9F6 0813 A2B4 930C EDE4 3BBE"            /* R.ì>©ö..¢´“.íä;¾ */
+	$"C0E3 7F93 1A3F 38EB 2DE3 492D A3BD FD00"            /* Àã.“.?8ë-ãI-£½ý. */
+	$"811C 530E 2FB8 9D68 2466 D288 EC29 9094"            /* �.S./¸�h$fÒˆì)�” */
+	$"A3C7 2D32 0A25 BA73 2023 08CA C360 2C72"            /* £Ç-2Â%ºs #.ÊÃ`,r */
+	$"8BA9 516A 7081 F2FF 1E84 E1C2 F841 77CE"            /* ‹©Qjp�òÿ.„áÂøAwÎ */
+	$"ABDF 6476 30A4 3018 F7F4 F3EE 1A5E 5DF0"            /* «ßdv0¤0.÷ôóî.^]ð */
+	$"CAAA AA77 C90D 52C4 6AA9 5755 33B9 1814"            /* ʪªwÉ.RÄj©WU3¹.. */
+	$"3528 E205 C379 648A E627 A23E D5DB 1CAE"            /* 5(â.ÃydŠæ'¢>ÕÛ.® */
+	$"4868 B7D4 F381 2534 1F48 2BCC 5211 3B0F"            /* Hh·Ôó�%4.H+ÌR.;. */
+	$"9692 B002 4CFB 1F83 3628 D1EB 5416 0648"            /* –’°.Lû.ƒ6(ÑëT..H */
+	$"F0F0 B0F8 C7C7 6E92 8C54 6859 791B 7890"            /* ðð°øÇÇn’ŒThYy.x� */
+	$"EBA3 BC74 5F3F C4AD 7C9D 6954 2D0C 15BF"            /* 룼t_?Ä­|�iT-..¿ */
+	$"F699 82A6 4170 D2F1 02A5 7EF3 6061 C9CF"            /* ö™‚¦ApÒñ.¥~ó`aÉÏ */
+	$"C370 E129 F805 8CC8 C670 CBDC 2D44 D349"            /* Ãpá)ø.ŒÈÆpËÜ-DÓI */
+	$"F3E5 C5F9 357E 3DF2 CDF3 DC8A 1F13 5B2D"            /* óåÅù5~=òÍóÜŠ..[- */
+	$"C544 448D 1038 8293 4EEA 75A4 0738 7D9F"            /* ÅDD�.8‚“Nêu¤.8}Ÿ */
+	$"C002 3D68 26D8 7B06 FB10 CCDF C4F3 5364"            /* À.=h&Ø{.û.ÌßÄóSd */
+	$"2342 154B F8FB 01ED 8893 9160 A3A0 B81D"            /* #B.Køû.툓‘`£ ¸. */
+	$"47A0 6C82 1CBA FAED 931D E025 BDFF 1535"            /* G l‚.ºúí“.à%½ÿ.5 */
+	$"CADF 68C5 41FD 3896 1AC9 F979 A885 F5AE"            /* ÊßhÅAý8–.Éùy¨…õ® */
+	$"EFBE C674 ED92 5FE9 E9AF FF52 D573 A6DD"            /* ï¾Ætí’_éé¯ÿRÕs¦Ý */
+	$"631B 27E4 62CB B76E 7020 EC65 75E2 DB6F"            /* c.'äbË·np ìeuâÛo */
+	$"0E10 980A 0EA3 2287 4CF8 D402 52B8 1491"            /* ..˜Â.£"‡LøÔ.R¸.‘ */
+	$"21C9 BC2B 48BC CBD4 464A C539 6CD5 28F1"            /* !ɼ+H¼ËÔFJÅ9lÕ(ñ */
+	$"CAE4 CA43 9CB8 B181 BF06 522B 4D19 8295"            /* ÊäÊCœ¸±�¿.R+M.‚• */
+	$"05C8 D7CD 8CFA D3E7 7BC9 630C DCDD 7C7E"            /* .È×ÍŒúÓç{Éc.ÜÝ|~ */
+	$"E4C6 D7DC 5E38 67CC 5934 9E8D 9552 B837"            /* äÆ×Ü^8gÌY4ž�•R¸7 */
+	$"53AE 6D39 FAB1 2EB6 886C 1855 26ED AD08"            /* S®m9ú±.¶ˆl.U&í­. */
+	$"1EBE 9570 EA2F DFFF 06F4 ABF3 4534 2831"            /* .¾•pê/ßÿ.ô«óE4(1 */
+	$"1AE2 0A99 2956 2A90 C2A4 58AC E49E F047"            /* .â™)V*�¤X¬äžðG */
+	$"A9BA C394 E8F4 6427 7966 A79C 4269 9ADD"            /* ©ºÃ”èôd'yf§œBišÝ */
+	$"AD1D 1A7E 375C D3FB 8C25 0B6B 0460 5EB9"            /* ­..~7\ÓûŒ%.k.`^¹ */
+	$"416C AE82 DFC3 09DA 1F69 8796 6897 8CD0"            /* Al®‚ßÃÆÚ.i‡–h—ŒÐ */
+	$"3E1B FF7D 9AE9 7F6D 4E84 967C 674F CA41"            /* >.ÿ}šé.mN„–|gOÊA */
+	$"44C1 0575 93A9 2599 66D0 AB7B 6260 D32C"            /* DÁ.u“©%™fЫ{b`Ó, */
+	$"94AF 7FC8 82FD F692 92FE B6ED A660 750F"            /* ”¯.È‚ýö’’þ¶í¦`u. */
+	$"80A2 A8AA E6F6 7B9F E894 ED71 D223 6F4B"            /* €¢¨ªæö{Ÿè”íqÒ#oK */
+	$"A203 F64C 7560 DBB1 6F9E EE9F 2945 C994"            /* ¢.öLu`Û±ožîŸ)EÉ” */
+	$"BA00 D3D1 6414 A300 4296 670B 2350 CDD1"            /* º.ÓÑd.£.B–g.#PÍÑ */
+	$"DF61 29E8 EC17 87B6 BC62 B6BD 5F31 13B2"            /* ßa)èì.‡¶¼b¶½_1.² */
+	$"48A2 F723 53C7 6955 969B ED83 6A9B 1B06"            /* H¢÷#SÇiU–›íƒj›.. */
+	$"C7D0 2584 430B 8C52 D00A 736B D6FB AEDB"            /* ÇÐ%„C.ŒRÐÂskÖû®Û */
+	$"2BA1 5095 759B 0AFF 5138 58EF 3DC2 B14D"            /* +¡P•u›ÂÿQ8Xï=±M */
+	$"3B7D 62D0 DE12 CFEF 17A3 32C4 C79A C2DA"            /* ;}bÐÞ.Ïï.£2ÄÇšÂÚ */
+	$"6BA1 6478 B1D3 2278 3787 6C30 08FD 6095"            /* k¡dx±Ó"x7‡l0.ý`• */
+	$"FF65 1DF4 7606 34C3 B4EE E609 A3BF 7085"            /* ÿe.ôv.4ôîæÆ£¿p… */
+	$"8B3B 2C80 D860 6043 10A4 24B1 2D80 880D"            /* ‹;,€Ø``C.¤$±-€ˆ. */
+	$"671A 9A76 E1D4 2304 B4E0 9E47 129D 6316"            /* g.šváÔ#.´àžG.�c. */
+	$"33DF C88C 3BB6 5232 475C D19D FA9B 3303"            /* 3ßÈŒ;¶R2G\Ñ�ú›3. */
+	$"2956 D8B1 08A5 2735 CD4D F130 C700 DA0D"            /* )Vر.¥'5ÍMñ0Ç.Ú. */
+	$"7BAE 21FA FB1B 35A5 957E 0211 955B 25D0"            /* {®!úû.5¥•~..•[%Ð */
+	$"A3DD B72F 5BCD 8792 418E BCB6 C727 DD0F"            /* £Ý·/[͇’AŽ¼¶Ç'Ý. */
+	$"2D42 F031 2A73 C1F9 7964 B937 1E77 A757"            /* -Bð1*sÁùyd¹7.w§W */
+	$"D158 CB02 80D3 C310 E1C5 709C 5C69 7F04"            /* ÑXË.€ÓÃ.áÅpœ\i.. */
+	$"4476 F017 3FF2 B891 0160 D681 AEBC F8C9"            /* Dvð.?ò¸‘.`Ö�®¼øÉ */
+	$"8F46 7922 4414 5CEE 0CA8 417B 33BB 5926"            /* �Fy"D.\î.¨A{3»Y& */
+	$"B7A6 7094 6363 C5F2 9AD7 1751 2456 3B83"            /* ·¦p”ccÅòš×.Q$V;ƒ */
+	$"9BB0 0ECD 1420 6141 A097 DBF4 802A 2377"            /* ›°.Í. aA —Ûô€*#w */
+	$"CDAC EFE9 4A16 4B3C 5058 A5DC 1C40 169E"            /* ͬïéJ.K<PX¥Ü.@.ž */
+	$"3999 F0C2 C418 2E8F 0951 664A 7082 F49F"            /* 9™ðÂÄ..�ÆQfJp‚ôŸ */
+	$"E576 B2B1 5918 E3EE 9B97 1686 6499 A572"            /* åv²±Y.ãî›—.†d™¥r */
+	$"B1F6 2F39 A798 6292 DE22 007B 60AD 1D94"            /* ±ö/9§˜b’Þ".{`­.” */
+	$"31BA 068D F15A 06DB 2654 6B52 F692 3C3A"            /* 1º.�ñZ.Û&TkRö’<: */
+	$"0DA8 A74B 30F6 3852 76F0 A897 9086 FBD5"            /* .¨§K0ö8Rvð¨—�†ûÕ */
+	$"1C78 047E 7BF2 08EE 7B45 85C5 6ED5 AA43"            /* .x.~{ò.î{E…ÅnÕªC */
+	$"F423 8A4E 4111 C68E 172E DD87 AF9E BF19"            /* ô#ŠNA.ÆŽ..݇¯ž¿. */
+	$"D4D2 020C 6FD5 EE3F F0E8 289E 4E6C 0871"            /* ÔÒ..oÕî?ðè(žNl.q */
+	$"1187 D3F1 E458 94F5 4519 BF3C D239 D86C"            /* .‡ÓñäX”õE.¿<Ò9Øl */
+	$"17F1 8916 4206 2346 ACD8 1F08 9A44 0AB3"            /* .ñ‰.B.#F¬Ø..šD³ */
+	$"CEE6 441D 78D5 2909 4CEA 46F7 D6C6 D21A"            /* ÎæD.xÕ)ÆLêF÷ÖÆÒ. */
+	$"6D41 BB64 ADFF 6252 5A80 3556 C459 2845"            /* mA»d­ÿbRZ€5VÄY(E */
+	$"C05D C2C5 1F69 4087 0380 C0FF 61AA D5D1"            /* À]ÂÅ.i@‡.€ÀÿaªÕÑ */
+	$"E5C2 5FC0 CEF4 2D59 B4A3 6BA8 343E 184B"            /* åÂ_ÀÎô-Y´£k¨4>.K */
+	$"89CE 81FD AC96 C691 FDE5 F993 B9CB 6302"            /* ‰Î�ý¬–Æ‘ýåù“¹Ëc. */
+	$"B8EE 86B4 A2F7 19EA DAFD D511 B59F BBD2"            /* ¸î†´¢÷.êÚýÕ.µŸ»Ò */
+	$"5D4E F6A3 BC58 51D5 273F 2E2E 2B6A 2755"            /* ]Nö£¼XQÕ'?..+j'U */
+	$"38A3 CA29 BFAB D31D CD53 B29C 7418 40DB"            /* 8£Ê)¿«Ó.ÍS²œt.@Û */
+	$"FD56 1BF6 9350 5411 CF5C 8D26 B1FA 754F"            /* ýV.ö“PT.Ï\�&±úuO */
+	$"E584 8277 6221 6866 257C 9FC9 65A5 6D93"            /* å„‚wb!hf%|ŸÉe¥m“ */
+	$"C524 B971 3F1D 34A0 BBF4 6B83 9722 CFAD"            /* Å$¹q?.4 »ôkƒ—"Ï­ */
+	$"8296 103F 53BB 1B22 8A84 2FAC 94DE 4994"            /* ‚–.?S»."Š„/¬”ÞI” */
+	$"2D31 56A5 DBCD B661 81D7 B360 4958 8FF5"            /* -1V¥ÛͶa�׳`IX�õ */
+	$"EB02 25A9 6386 8241 D936 A3CB AA88 9936"            /* ë.%©c†‚AÙ6£Ëªˆ™6 */
+	$"1698 4F59 765B 34EA 3741 D2D3 2DAC 854D"            /* .˜OYv[4ê7AÒÓ-¬…M */
+	$"366B C9A0 15F8 D2E6 7CCF 99EF A794 460C"            /* 6kÉ .øÒæ|ϙ倫F. */
+	$"934E C88B 2BF5 91F7 7BD1 3DC9 6ED3 91FE"            /* “NÈ‹+õ‘÷{Ñ=ÉnÓ‘þ */
+	$"E63B EDCC 3D4A CC1B AE5D 88D0 B241 20D1"            /* æ;íÌ=JÌ.®]ˆÐ²A Ñ */
+	$"AB6C 9FE2 E494 395E 8E3C 0EB0 1796 58CC"            /* «lŸâä”9^Ž<.°.–XÌ */
+	$"9791 D931 DB33 473E 003E 10CD B736 7295"            /* —‘Ù1Û3G>.>.Í·6r• */
+	$"DD81 B481 9A0A ED27 3C1E 6298 FD0D BDE0"            /* Ý�´�šÂí'<.b˜ý.½à */
+	$"11D6 8A21 79C1 DBB7 FEDC 6E48 8080 5ADB"            /* .ÖŠ!yÁÛ·þÜnH€€ZÛ */
+	$"E61D 9E0E E6A3 6D38 A028 4016 464D F534"            /* æ.ž.æ£m8 (@.FMõ4 */
+	$"D764 3AD7 55DF 3CAB 7B3D 12F5 9A8D DDCF"            /* ×d:×Uß<«{=.õš�ÝÏ */
+	$"6CCD 0387 C982 0FE9 D431 0FE3 E064 1700"            /* lÍ.‡É‚.éÔ1.ãàd.. */
+	$"1AAD F49E D6DE A939 8010 C91B 605B 4E0A"            /* .­ôžÖÞ©9€.É.`[NÂ */
+	$"FCBE ADE9 C17A EC1F 3990 9EB2 E6BF 92AA"            /* ü¾­éÁzì.9�ž²æ¿’ª */
+	$"951C D27F A984 10A9 22DC 996E FF6E 12AE"            /* •.Ò.©„.©"Ü™nÿn.® */
+	$"DC03 5AB3 2CA0 8291 4174 C69E AE28 DBA8"            /* Ü.Z³, ‚‘AtÆž®(Û¨ */
+	$"38A8 FF12 67D3 F8A3 00D6 2A2E A564 CEFA"            /* 8¨ÿ.gÓø£.Ö*.¥dÎú */
+	$"0F00 4B44 62A7 CA9F F072 2821 DD3C 6A34"            /* ..KDb§ÊŸðr(!Ý<j4 */
+	$"926C 8F3C 1548 D31A 021F 2604 252D A929"            /* ’l�<.HÓ...&.%-©) */
+	$"172B 8212 174F 2D2D CC7D DA15 F9A9 AD7E"            /* .+‚..O--Ì}Ú.ù©­~ */
+	$"59D3 7885 9215 C77B 6583 4D8F 3308 149C"            /* YÓx…’.Ç{eƒM�3..œ */
+	$"270A 4508 21C9 A05B CDE9 BEF1 C18A 4B74"            /* 'ÂE.!É [Íé¾ñÁŠKt */
+	$"F07B 0DFE 007B E5AF D9AA CED7 8661 34C7"            /* ð{.þ.{å¯ÙªÎ׆a4Ç */
+	$"AA26 21AC D09C 6BAA EABB A7C4 486E 40A5"            /* ª&!¬Ðœkªê»§ÄHn@¥ */
+	$"C791 976A 1EC3 534F 84EC E6E9 7363 FF08"            /* Ç‘—j.ÃSO„ìæéscÿ. */
+	$"5B20 0E29 000C 5E8F 3339 6210 65CC FD34"            /* [ .)..^�39b.eÌý4 */
+	$"76EB F1B2 76C6 5FDC C1A8 B0F5 53EE 103C"            /* vëñ²vÆ_ÜÁ¨°õSî.< */
+	$"50B0 650F 8459 9777 E890 E28A BB84 56B9"            /* P°e.„Y—wè�⊻„V¹ */
+	$"0522 90F9 5B81 C982 979E E507 A4BC 26C3"            /* ."�ù[�É‚—žå.¤¼&à */
+	$"E356 F2A9 C0D1 BFF3 F882 EC0E 6AA9 CA0D"            /* ãVò©ÀÑ¿óø‚ì.j©Ê. */
+	$"4419 16FB 9BEF 947E F848 19BF 5CB6 EA4E"            /* D..û›ï”~øH.¿\¶êN */
+	$"C290 F254 020B 51DB 8094 4D05 E9A5 21A0"            /* Â�òT..QÛ€”M.é¥!  */
+	$"D3E6 84EA 5A3E 4380 650C B24F 31DA 209F"            /* Óæ„êZ>C€e.²O1Ú Ÿ */
+	$"F51A 9108 7912 32B0 52A6 A901 CADB A758"            /* õ.‘.y.2°R¦©.ÊÛ§X */
+	$"C00A D516 E462 35B4 C071 131A 0F01 9A95"            /* ÀÂÕ.äb5´Àq....š• */
+	$"9739 F131 0E5F 7FBA D8AD 925F 992C 0187"            /* —9ñ1._.ºØ­’_™,.‡ */
+	$"D97C 832B 847E 1148 0402 0449 FB25 D0F1"            /* Ù|ƒ+„~.H...Iû%Ðñ */
+	$"C1F8 2B8E CE97 D5A4 BEFE 7F0D E420 E43E"            /* Áø+ŽÎ—Õ¤¾þ..ä ä> */
+	$"801A 448D 9D61 D23C 5956 3DEB A1A6 0858"            /* €.D��aÒ<YV=롦.X */
+	$"CD98 F32B 92E6 D960 C0E1 E542 294D 6FD3"            /* ͘ó+’æÙ`ÀáåB)MoÓ */
+	$"4234 37C9 3537 275F AC1E 936D 534A BF02"            /* B47É57'_¬.“mSJ¿. */
+	$"B742 8CAB BE88 E4FF 23DC D9EB 1FC4 9CF0"            /* ·BŒ«¾ˆäÿ#ÜÙë.Äœð */
+	$"C5D1 3F1D 5995 AD68 12E9 71B3 2100 AFB7"            /* ÅÑ?.Y•­h.éq³!.¯· */
+	$"CBF7 9ADB D5FF 48EE B1A2 AE4D E021 7C07"            /* Ë÷šÛÕÿHî±¢®Mà!|. */
+	$"5AD5 E94C A965 DFE8 B32A 23AB DE05 4FB1"            /* ZÕéL©eßè³*#«Þ.O± */
+	$"FDB7 ECC5 3611 73D9 B03C 399A D5F6 663D"            /* ý·ìÅ6.sÙ°<9šÕöf= */
+	$"0E78 0BEE 67D9 2F9D 0072 E938 509C 9779"            /* .x.îgÙ/�.ré8Pœ—y */
+	$"6C64 03A1 B8C9 C1C0 2256 29EA 112C FB1C"            /* ld.¡¸ÉÁÀ"V)ê.,û. */
+	$"766C DF51 83B1 388F 902E EE03 337E 689A"            /* vlßQƒ±8��.î.3~hš */
+	$"CA5A A9F0 09AF 3422 4115 D489 3FBD 22C1"            /* ÊZ©ðƯ4"A.Ô‰?½"Á */
+	$"4A4F 642A 0AC8 D01C 2950 18CA D441 780A"            /* JOd*ÂÈÐ.)P.ÊÔAx */
+	$"C929 A7FF 0AFA 956A A581 B590 9B7A 7D74"            /* É)§ÿÂú•j¥�µ�›z}t */
+	$"2084 3DC1 5D81 B12B DF9C 333D EFAD 0ADD"            /*  „=Á]�±+ßœ3=ï­ÂÝ */
+	$"3445 4F8C 132E F02F C2E7 E13F BE12 2F84"            /* 4EOŒ..ð/Âçá?¾./„ */
+	$"7FC3 D55F 876A BE1D 07F2 688D 774C FC3E"            /* .ÃÕ_‡j¾..òh�wLü> */
+	$"A177 C3EA 4FE4 AFFE 1BFF 61D3 2F87 4BFC"            /* ¡wÃêOä¯þ.ÿaÓ/‡Kü */
+	$"946E 03F8 6CFF 06A3 FC28 FE13 BF0F 6B7E"            /* ”n.ølÿ.£ü(þ.¿.k~ */
+	$"1EB8 FC3B 47E1 ECEE EEDF F87D 51FF 07D5"            /* .¸ü;Gáìîîßø}Qÿ.Õ */
+	$"0BBB 87E1 D3FF 0779 FC3B 6FE1 D378 0DF0"            /* .»‡áÓÿ.yü;oáÓx.ð */
+	$"BD7C 29EB A2DD 17F2 6ADB E1DB 7F0D 97E1"            /* ½|)ë¢Ý.òjÛáÛ..—á */
+	$"E84D 7750 FC3E 906F C3E8 35DD 42ED AFE1"            /* èMwPü>�oÃè5ÝBí¯á */
+	$"D33F 0E8D F86E 00F7 91DD 3D8B A94D D83C"            /* Ó?.�øn.÷‘Ý=‹©MØ< */
+	$"B51B 129C 103F 899D B929 4724 C188 2C29"            /* µ..œ.?‰�¹)G$Áˆ,) */
+	$"CE89 11F8 9065 1C37 E234 DFEF 60D7 3221"            /* Ή.ø�e.7â4ßï`×2! */
+	$"5343 F889 DCDB AFB3 6F20 F76A 31D9 986E"            /* SCø‰ÜÛ¯³o ÷j1Ù˜n */
+	$"A745 547E 6F18 076D A675 BA1A 1AAF 6558"            /* §ET~o..m¦uº..¯eX */
+	$"338A FF71 4707 0776 1B62 BCCC 89E5 4726"            /* 3ŠÿqG..v.b¼Ì‰åG& */
+	$"A7CB 8885 E07C DADC D741 3B1D D81F AB03"            /* §Ëˆ…à|ÚÜ×A;.Ø.«. */
+	$"2F84 F52D DFD5 7384 4649 7BA2 5AB1 14C8"            /* /„õ-ßÕs„FI{¢Z±.È */
+	$"3D8D B951 8183 C33A B08E 82CC EF1A F046"            /* =�¹Q�ƒÃ:°Ž‚Ìï.ðF */
+	$"5B62 C9E0 A926 F330 0A61 A30C 6194 7E1E"            /* [bÉà©&ó0Âa£.a”~. */
+	$"1EE9 3D0D 1ABE 5536 A026 8B32 830F C02F"            /* .é=..¾U6 &‹2ƒ.À/ */
+	$"3041 04B7 2C65 024D AC81 D2CC 03CA A08A"            /* 0A.·,e.M¬�ÒÌ.Ê Š */
+	$"B105 F3F1 C365 6BCE 9876 A867 7DBA 63AF"            /* ±.óñÃekΘv¨g}ºc¯ */
+	$"0973 495F DCC1 3552 54BA 5BDB 618D C6C0"            /* ÆsI_ÜÁ5RTº[Ûa�ÆÀ */
+	$"91B8 4489 141B A7D3 F188 8A97 DAB0 8942"            /* ‘¸D‰..§ÓñˆŠ—Ú°‰B */
+	$"EA67 F235 E18A 871B 4B0C DAC6 9050 BA9C"            /* êgò5ኇ.K.ÚÆ�Pºœ */
+	$"C432 95CE 13CA 93ED 4FD5 9495 377D C920"            /* Ä2•Î.Ê“íOÕ”•7}É  */
+	$"C8A2 F997 5348 8890 91D5 0A23 50BF 3C37"            /* È¢ù—SHˆ�‘ÕÂ#P¿<7 */
+	$"8372 7C96 32AA 1CD2 46BE 8220 C983 2A71"            /* ƒr|–2ª.ÒF¾‚ Ƀ*q */
+	$"7961 BF33 9590 C086 CCE9 578B 322E FB50"            /* ya¿3•�À†ÌéW‹2.ûP */
+	$"CB68 6459 C127 EB9B E974 EF02 59F4 FF4D"            /* ËhdYÁ'ë›étï.YôÿM */
+	$"4525 1874 6A9F 99EB DFCC C1B1 72EA 9FA0"            /* E%.tjŸ™ëßÌÁ±r꟠ */
+	$"DE00 BBB9 D95F 36B9 406E 3CE0 3BCF 32B6"            /* Þ.»¹Ù_6¹@n<à;Ï2¶ */
+	$"8DC0 55D6 C6DA 3622 8A6E 63F6 28AE 08AC"            /* �ÀUÖÆÚ6"Šncö(®.¬ */
+	$"03AC 288D 069A 750E CBBD 97D9 E42D BA93"            /* .¬(�.šu.˽—Ùä-º“ */
+	$"E82A 4EB3 C008 CC7C B6A7 6F70 F1BC FDAA"            /* è*N³À.Ì|¶§opñ¼ýª */
+	$"1DF4 D2E4 3ECB 9702 444E 278F 6B50 F00E"            /* .ôÒä>Ë—.DN'�kPð. */
+	$"C228 C132 E5E0 B4DE 93BF DBBD 2C85 ABF9"            /* Â(Á2åà´Þ“¿Û½,…«ù */
+	$"7FAD EC28 1D40 D390 5A2F 9B14 D348 8C76"            /* .­ì(.@Ó�Z/›.ÓHŒv */
+	$"C04B 1173 BF19 8F50 7E3D 8311 BB79 FDA8"            /* ÀK.s¿.�P~=ƒ.»yý¨ */
+	$"1FD4 24A9 5F59 8B76 709E 5C84 1902 8690"            /* .Ô$©_Y‹vpž\„..†� */
+	$"AD49 334F 5AE8 E376 288C BDE7 EE13 FBDE"            /* ­I3OZèãv(Œ½çî.ûÞ */
+	$"7606 0135 6DB2 DCD9 F5B3 E7E2 B2B8 8BE1"            /* v..5m²ÜÙõ³çⲸ‹á */
+	$"1985 85D2 0EC1 5CCD BC74 D88B 7206 5075"            /* .……Ò.Á\ͼtØ‹r.Pu */
+	$"FB92 BF92 C5CB B6E3 024D EB71 D909 AF79"            /* û’¿’Å˶ã.MëqÙƯy */
+	$"DD82 BBF2 37F1 1193 74D0 373D 4043 C292"            /* Ý‚»ò7ñ.“tÐ7=@CÂ’ */
+	$"0B1D 4E8F 04F4 A035 451A 7DCB 02DB D77E"            /* ..N�.ô 5E.}Ë.Û×~ */
+	$"DD1C 3667 1BA7 2584 C128 3835 4454 5C15"            /* Ý.6g.§%„Á(85DT\. */
+	$"5846 C7D1 4689 3D2A 1172 9BA8 9830 F037"            /* XFÇÑF‰=*.r›¨˜0ð7 */
+	$"0053 8FD6 4023 68C6 7122 CAC6 0325 5AF3"            /* .S�Ö@#hÆq"ÊÆ.%Zó */
+	$"E104 A423 C5AE F551 6DF6 7B11 D5EB FD34"            /* á.¤#Å®õQmö{.Õëý4 */
+	$"DF67 C50C 737D 74D5 D5EC 7027 A2D8 C79A"            /* ßgÅ.s}tÕÕìp'¢ØÇš */
+	$"200D A972 A30A 509A C3DE 483F 8B53 D69C"            /*  .©r£ÂPšÃÞH?‹SÖœ */
+	$"001F 47E9 BD2C 84EC DB83 B493 0326 DE6E"            /* ..Gé½,„ìÛƒ´“.&Þn */
+	$"336A 7C76 3225 8351 7B2D 37B5 D645 9866"            /* 3j|v2%ƒQ{-7µÖE˜f */
+	$"019E 6472 40C4 5853 3376 9D90 D3EA A727"            /* .ždr@ÄXS3v��Óê§' */
+	$"07A1 A4B8 A32F 475A 22A2 059C AB5B F13E"            /* .¡¤¸£/GZ"¢.œ«[ñ> */
+	$"E2DF 5B3E E6B5 B27F 28AF A15F 400C 7D9F"            /* âß[>æµ².(¯¡_@.}Ÿ */
+	$"43ED 33D4 9B4D CB64 E550 5FED FC2F E485"            /* Cí3Ô›MËdåP_íü/ä… */
+	$"271E 2DB1 6AE5 6793 EFE8 FCC5 A784 4C95"            /* '.-±jåg“ïèüŧ„L• */
+	$"E488 B5AC A528 BACB 10FF 4ABD D554 E56B"            /* 䈵¬¥(ºË.ÿJ½ÕTåk */
+	$"F72E 8ED7 5E48 60A4 82D0 381F A2D4 625C"            /* ÷.Ž×^H`¤‚Ð8.¢Ôb\ */
+	$"9F80 2A63 5FD3 DD0C EDA8 3DE3 281E A65C"            /* Ÿ€*c_ÓÝ.í¨=ã(.¦\ */
+	$"88EA 1A96 626D DC03 79BE C4ED EA60 4FC5"            /* ˆê.–bmÜ.y¾Äíê`OÅ */
+	$"BB10 D9D5 99AF 0534 65C2 05AE 8D23 82B0"            /* ».ÙÕ™¯.4eÂ.®�#‚° */
+	$"6FB7 881A 7BC5 0316 7A28 4B27 2763 A6C3"            /* o·ˆ.{Å..z(K''c¦Ã */
+	$"8FC7 073A 1391 81BB 707F 625D 355F B1DF"            /* �Ç.:.‘�»p.b]5_±ß */
+	$"A749 C3EE A157 EC1F 0F6C 70AB 1A36 5711"            /* §IÃî¡Wì..lp«.6W. */
+	$"C49B 1CA8 54A0 0FB9 6A2E 0F86 2E57 BC2F"            /* Ä›.¨T .¹j..†.W¼/ */
+	$"8CDD B76A F6DB 83F9 EEFF 4BF1 DE60 660E"            /* ŒÝ·jöÛƒùîÿKñÞ`f. */
+	$"BCBA 7D68 D5DE 8663 DF06 3F65 A981 38D7"            /* ¼º}hÕÞ†cß.?e©�8× */
+	$"CC20 EBAE 6143 C79E D2F3 DCF4 FA0F 433E"            /* Ì ë®aCÇžÒóÜôú.C> */
+	$"6DFE 4C5F 032A F6DD DD11 F85F 5003 22CD"            /* mþL_.*öÝÝ.ø_P."Í */
+	$"C07E F1CC 40B9 8D61 825D 77C7 91A6 BD49"            /* À~ñÌ@¹�a‚]wÇ‘¦½I */
+	$"2590 4BCD EB13 37A2 D5FA 2931 F311 9028"            /* %�KÍë.7¢Õú)1ó.�( */
+	$"6C02 96FC ACF5 1EA4 8E51 4BC9 FDE8 DFEF"            /* l.–ü¬õ.¤ŽQKÉýèßï */
+	$"C5A0 8082 7E0D C127 3A80 A65B 7989 CCEE"            /* Å €‚~.Á':€¦[y‰Ìî */
+	$"6F6A 8DDF FB5B 46A5 3757 7FC3 3EFD BC0A"            /* oj�ßû[F¥7W.Ã>ý¼Â */
+	$"8567 1CB0 3BE7 A153 D7CE 8F63 D2DC 8840"            /* …g.°;ç¡S×Î�cÒ܈@ */
+	$"D993 E028 0E86 AA99 3ADE CC55 A789 CFC8"            /* Ù“à(.†ª™:ÞÌU§‰ÏÈ */
+	$"D92B 9613 3850 B7B3 467A FA09 7D45 E174"            /* Ù+–.8P·³FzúÆ}Eát */
+	$"D351 3254 64A3 7FC5 0D8D 1EDB FEC9 3F05"            /* ÓQ2Td£.Å.�.ÛþÉ?. */
+	$"C3C2 264B ACB8 F3C3 1BFF 04A5 12CF C191"            /* ÃÂ&K¬¸óÃ.ÿ.¥.ÏÁ‘ */
+	$"8CA0 5985 E34C E583 A230 CD43 8602 BAAF"            /* Œ Y…ãL僢0ÍC†.º¯ */
+	$"1475 FCA7 B274 1314 051F AF06 089D 13B1"            /* .uü§²t....¯..�.± */
+	$"5C06 815E FAA5 6864 CECE D56A 127C 058B"            /* \.�^ú¥hdÎÎÕj.|.‹ */
+	$"1859 E9E8 7A98 4299 3CFF 70CE C2DD 8676"            /* .Yéèz˜B™<ÿpÎÂ݆v */
+	$"1798 5F8E 9960 922E 9226 3F9B 5657 890F"            /* .˜_Ž™`’.’&?›VW‰. */
+	$"75BC FECF 6919 6701 D086 0EA5 26BA 8B78"            /* u¼þÏi.g.І.¥&º‹x */
+	$"7381 41FC 19AD 7201 BFD9 B3D3 2F00 1A1C"            /* s�Aü.­r.¿Ù³Ó/... */
+	$"E689 F3BC 5FC7 0418 66A2 5AEE 0374 DE30"            /* æ‰ó¼_Ç..f¢Zî.tÞ0 */
+	$"DC4B 70F1 ACC6 2BC6 06E9 461F E71B CD5E"            /* ÜKpñ¬Æ+Æ.éF.ç.Í^ */
+	$"2766 D533 884B A37F 7820 5CCA 3D60 1C3A"            /* 'fÕ3ˆK£.x \Ê=`.: */
+	$"8865 509F C1F0 86B6 9A91 0A52 426E CF1D"            /* ˆePŸÁð†¶š‘ÂRBnÏ. */
+	$"4B52 7AFE 9519 ECDB 9DD3 BFA1 80F7 50BD"            /* KRzþ•.ìÛ�Ó¿¡€÷P½ */
+	$"D2DD 6FAB F00D 3600 9104 37AC 81AA F9C3"            /* ÒÝo«ð.6.‘.7¬�ªùà */
+	$"3933 A702 AC9C 42F1 4579 C5F2 CD99 165F"            /* 93§.¬œBñEyÅòÍ™._ */
+	$"2D84 FE8B D02C 055F F99C 1729 45C7 6B56"            /* -„þ‹Ð,._ùœ.)EÇkV */
+	$"EE73 818A 9940 BB46 1408 639B 9779 C805"            /* îs�Š™@»F..c›—yÈ. */
+	$"1B0B CC86 D42E E9BB 046D 0E93 7273 E00F"            /* ..̆Ô.é».m.“rsà. */
+	$"B7D5 D377 E0ED 2494 4623 5BDF C83C 54A5"            /* ·ÕÓwàí$”F#[ßÈ<T¥ */
+	$"6B6B D343 F20E AD4C B45C 2BF4 7C65 87A1"            /* kkÓCò.­L´\+ô|e‡¡ */
+	$"E2EA E2B7 FF17 F9A1 5606 D5A7 C113 F062"            /* âêâ·ÿ.ù¡V.Õ§Á.ðb */
+	$"D50E E647 922C 8746 7CBA 99C8 4400 979D"            /* Õ.æG’,‡F|º™ÈD.—� */
+	$"3D09 19E7 3A84 E245 ED1F 1C14 3967 45CE"            /* =Æ.ç:„âEí...9gEÎ */
+	$"2B06 C383 F2A6 2CEE 02E6 A2A7 1821 0F3F"            /* +.Ãò¦,î.梧.!.? */
+	$"4057 F9E9 B830 94C7 65AA C396 6F97 2721"            /* @Wùé¸0”ÇeªÃ–o—'! */
+	$"F1AC 6AF7 6C6C 3F02 D2F1 343D 8B42 0F6F"            /* ñ¬j÷ll?.Òñ4=‹B.o */
+	$"E2D4 A7D8 7158 F033 C573 AD72 01B7 1CC7"            /* âÔ§ØqXð3Ås­r.·.Ç */
+	$"4CA6 78C2 BABD BB30 5E03 BDEE DF19 8240"            /* L¦xº½»0^.½îß.‚@ */
+	$"9521 A43A B142 2F42 3590 AD8C B9FD A409"            /* •!¤:±B/B5�­Œ¹ý¤Æ */
+	$"9D77 38E7 B8F8 3BCD 4478 61C3 5768 0324"            /* �w8ç¸ø;ÍDxaÃWh.$ */
+	$"4E55 4240 1E87 1F93 D0BA 6929 C235 7E76"            /* NUB@.‡.“кi)Â5~v */
+	$"F6E8 AA1B AF13 15FD EB95 2609 BE7D BFE8"            /* öèª.¯..ýë•&ƾ}¿è */
+	$"3E51 8F2E 4780 4EE6 891E F83D FF7D D1C3"            /* >Q�.G€Næ‰.ø=ÿ}Ñà */
+	$"818F 28A2 2AC0 AD00 7F03 5781 2882 A44A"            /* ��(¢*À­...W�(‚¤J */
+	$"6728 D9F6 E77F A883 C794 71AC 55E9 8112"            /* g(Ùöç.¨ƒÇ”q¬Ué�. */
+	$"BF6F ECDA 9BD1 96B8 79AA A397 A6F2 C93F"            /* ¿oìڛі¸yª£—¦òÉ? */
+	$"3792 B8C4 8667 AAF4 659D 59F6 E77F A870"            /* 7’¸Ä†gªôe�Yöç.¨p */
+	$"24F1 5461 DB69 0F4C F8B3 F02A F6E7 7FA6"            /* $ñTaÛi.Lø³ð*öç.¦ */
+	$"26C9 5EDE 9BB6 A1C6 9467 854A 5327 BA38"            /* &É^Þ›¶¡Æ”g…JS'º8 */
+	$"F535 A01A B90A 9580 95A0 FE5C A623 DE0D"            /* õ5 .¹Â•€• þ\¦#Þ. */
+	$"6C3E BF23 66F2 9312 9490 EB88 1D63 7AF4"            /* l>¿#fò“.”�ëˆ.czô */
+	$"9F5B 7F45 9078 3A5F CC36 7702 EAD5 FA4D"            /* Ÿ[.E�x:_Ì6w.êÕúM */
+	$"5F9D 258B 14A8 A235 6490 6B7D 2B05 42C3"            /* _�%‹.¨¢5d�k}+.Bà */
+	$"2A5A 791E 92C3 B1E8 B323 FF74 81FC B063"            /* *Zy.’ñè³#ÿt�ü°c */
+	$"4A31 CBBC 91E2 A64A F935 FE79 4C07 1376"            /* J1˼‘â¦Jù5þyL..v */
+	$"002A 4795 5221 70B2 005C 41F9 D631 126F"            /* .*G•R!p².\AùÖ1.o */
+	$"FF7F DF03 06BD 7214 71AB 4EF3 8EEA 0261"            /* ÿ.ß..½r.q«NóŽê.a */
+	$"D054 C087 EA15 CBD2 4645 2F9F 3600 4144"            /* ÐTÀ‡ê.ËÒFE/Ÿ6.AD */
+	$"5671 C61E D3CB 8B84 A60D B58E FB69 C71F"            /* VqÆ.ÓË‹„¦.µŽûiÇ. */
+	$"B09A EDD9 AAC0 6FBA D7FE 8C4D 8262 6C73"            /* °šíÙªÀoº×þŒM‚bls */
+	$"9F69 0E81 7581 1D52 FB27 C979 1597 69EA"            /* Ÿi.�u�.Rû'Éy.—iê */
+	$"F1DF E906 0B77 2E21 D31A 5CCD 9474 95A2"            /* ñßé..w.!Ó.\Í”t•¢ */
+	$"CB48 AB27 5F53 B82F 1638 16A4 87CD ED1F"            /* ËH«'_S¸/.8.¤‡Íí. */
+	$"20BC 2894 5EE1 C84C 1AC1 1158 0293 024E"            /*  ¼(”^áÈL.Á.X.“.N */
+	$"1023 0E4F 9BD8 FA73 6E62 FF7F FD08 5797"            /* .#.O›Øúsnbÿ.ý.W— */
+	$"0788 A951 6DDA 2448 21D2 7FCA 20B4 E1BF"            /* .ˆ©QmÚ$H!Ò.Ê ´á¿ */
+	$"3262 89C7 5386 ACB1 8B89 6AC3 F907 1355"            /* 2b‰ÇS†¬±‹‰jÃù..U */
+	$"66D9 1E5A 5B54 19E9 2737 FF7C B8DF 1F5E"            /* fÙ.Z[T.é'7ÿ|¸ß.^ */
+	$"3592 B16D 6089 DE73 8F19 479D 626B 977D"            /* 5’±m`‰Þs�.G�bk—} */
+	$"185E F7A3 AF62 AD92 E5AC 2F74 B991 F96F"            /* .^÷£¯b­’å¬/t¹‘ùo */
+	$"211F 5AE0 4C27 344F A9E1 C731 DB20 A0FF"            /* !.ZàL'4O©áÇ1Û  ÿ */
+	$"7FFF 7F2E 356F CC55 C6B8 C2C9 2AEF 2D31"            /* .ÿ..5oÌUƸÂÉ*ï-1 */
+	$"EFEB D878 C16F B1B1 3D47 240C 489C 7153"            /* ïëØxÁo±±=G$.HœqS */
+	$"E5F8 A5C8 6E2C 7650 AED0 C4B7 43EA 67B6"            /* åø¥Èn,vP®ÐÄ·Cêg¶ */
+	$"94E4 7274 CFEB 4CF3 FD3E 8065 B9CC 35A5"            /* ”ärtÏëLóý>€e¹Ì5¥ */
+	$"21B1 3804 AD98 4F8A 6FFC 50DA 014C 442B"            /* !±8.­˜OŠoüPÚ.LD+ */
+	$"AA41 1455 BD94 B366 A37D CA82 7FFC DE57"            /* ªA.U½”³f£}Ê‚.üÞW */
+	$"2EA9 98C2 5510 E51E 24CC 0428 4C83 1BBE"            /* .©˜ÂU.å.$Ì.(Lƒ.¾ */
+	$"0A46 A6DD 6963 D4CB 24E8 748B ED10 7B6D"            /* ÂF¦ÝicÔË$èt‹í.{m */
+	$"E61C 86C3 C80E 3030 FCE9 2263 C956 95A1"            /* æ.†ÃÈ.00üé"cÉV•¡ */
+	$"AED0 C4B1 D07C F701 9DA0 ED2C C401 BC1A"            /* ®ÐıÐ|÷.� í,Ä.¼. */
+	$"9421 2D43 EF12 7494 8D46 CB82 3FE2 6439"            /* ”!-Cï.t”�FË‚?âd9 */
+	$"6BDE C8CE 23B7 9D2E B6F9 DF4B C1A9 A145"            /* kÞÈÎ#·�.¶ùßKÁ©¡E */
+	$"1512 85E6 30E6 98D1 AC22 EEBC 459C D841"            /* ..…æ0æ˜Ñ¬"î¼EœØA */
+	$"0A0F 1F31 2F75 7937 220F 7271 FE79 44A6"            /* Â..1/uy7".rqþyD¦ */
+	$"777E 1645 E0BA D980 0FFF 7D9F EC83 A930"            /* w~.EàºÙ€.ÿ}Ÿìƒ©0 */
+	$"D12B 216D 4D3F 4AD0 5EE9 DBC7 53D7 0A21"            /* Ñ+!mM?JÐ^éÛÇS×Â! */
+	$"2372 C608 6701 8AFA 8E33 4125 2B7E 38DA"            /* #rÆ.g.ŠúŽ3A%+~8Ú */
+	$"5990 99EE B1D0 B07C 9F9D 97DD D658 2C2A"            /* Y�™î±Ð°|Ÿ�—ÝÖX,* */
+	$"C7D6 4556 2AA7 297F ACBE 4802 B472 E76F"            /* ÇÖEV*§).¬¾H.´rço */
+	$"644F 2F11 17FF 7F9D CE1C 2989 7199 03B1"            /* dO/..ÿ.�Î.)‰q™.± */
+	$"E719 2B3B 1131 C4CC 808B BC7A 26A4 479F"            /* ç.+;.1ÄÌ€‹¼z&¤GŸ */
+	$"4824 6486 E338 DB65 A502 454C C415 B8D0"            /* H$d†ã8Ûe¥.ELÄ.¸Ð */
+	$"7C77 7323 E381 5958 F415 95B9 142E 85F8"            /* |ws#ã�YXô.•¹..…ø */
+	$"1742 E22F FF17 567B A195 DFF1 7EE0 8E40"            /* .Bâ/ÿ.V{¡•ßñ~àŽ@ */
+	$"431A B629 DDCE AED1 A925 9FCD 56B5 7945"            /* C.¶)Ýήѩ%ŸÍVµyE */
+	$"B8B9 77DF 732C CD1E 8137 2645 1135 9593"            /* ¸¹wßs,Í.�7&E.5•“ */
+	$"E31C 333B 30E2 518D E202 A1E0 FEA6 C40E"            /* ã.3;0âQ�â.¡àþ¦Ä. */
+	$"BB50 0174 C21D 0BFB 34C1 1A8D 8E5D FF77"            /* »P.tÂ..û4Á.�Ž]ÿw */
+	$"909A 8111 3123 8200 AFC2 0525 13A1 C383"            /* �š�.1#‚.¯Â.%.¡Ãƒ */
+	$"5472 BA45 8D58 8818 E5CD 6FEA D858 47C5"            /* TrºE�Xˆ.åÍoêØXGÅ */
+	$"F5A0 7773 3C86 1CE8 9A67 FAA7 5726 643B"            /* õ ws<†.èšgú§W&d; */
+	$"1BF8 C2C1 E7AD D3CE E89B 97C4 0210 1FAE"            /* .øÂÁç­ÓÎè›—Ä...® */
+	$"9319 1F1F 7F89 0B76 5918 7EF8 9947 CF44"            /* “....‰.vY.~ø™GÏD */
+	$"6B5C 4B5D 5067 58A7 F35E CF39 7D01 C555"            /* k\K]PgX§ó^Ï9}.ÅU */
+	$"FCD3 E0F6 C1A4 9C8A 0B34 2D33 A20D F664"            /* üÓàöÁ¤œŠ.4-3¢.öd */
+	$"C174 CCE8 CAA1 C45F 2974 101B 86E7 68FD"            /* ÁtÌèÊ¡Ä_)t..†çhý */
+	$"D6FE 8FE9 AC95 5D3D DE38 1829 E3B9 37FE"            /* Öþ�鬕]=Þ8.)ã¹7þ */
+	$"5008 F383 21C4 4D57 AE92 9F94 A9BB 3A76"            /* P.óƒ!ÄMW®’Ÿ”©»:v */
+	$"705F 8D2D 889C EB93 FD2B 05C5 89F2 500E"            /* p_�-ˆœë“ý+.ʼnòP. */
+	$"4220 A486 F348 D466 4D62 E368 540A 1D25"            /* B ¤†óHÔfMbãhTÂ.% */
+	$"AF7C A9EF 43CC E423 16FC 6EE5 C407 DDAE"            /* ¯|©ïCÌä#.ünåÄ.Ý® */
+	$"EB28 23D2 3FDE 40EF 2ED1 D53A B87B 9C40"            /* ë(#Ò?Þ@ï.ÑÕ:¸{œ@ */
+	$"80A2 77EF CC8F D34E C33F 7BB4 4748 E4A6"            /* €¢wïÌ�ÓNÃ?{´GHä¦ */
+	$"B177 05FF 085F CBF9 F1A0 8CA7 4200 32AC"            /* ±w.ÿ._Ëùñ Œ§B.2¬ */
+	$"7B87 A517 EA04 C96C F9A3 C6ED 5FFF 7FED"            /* {‡¥.ê.Élù£Æí_ÿ.í */
+	$"D5EB F835 3E15 6882 AED1 72BF B42C 87DE"            /* Õëø5>.h‚®Ñr¿´,‡Þ */
+	$"8111 0F7A 5DA6 CFEA 79A7 9174 89E8 E637"            /* �..z]¦Ïêy§‘t‰èæ7 */
+	$"7E56 B53E 9987 2013 8F1A 06A5 07A2 1856"            /* ~Vµ>™‡ .�..¥.¢.V */
+	$"FE30 E259 128A 968B 881F E88D 8566 98D7"            /* þ0âY.Š–‹ˆ.è�…f˜× */
+	$"C815 C397 64E8 9FAC 059A 5922 C863 F220"            /* È.×d蟬.šY"Ècò  */
+	$"EC2A 4AF8 5DB2 A77D FC6A 3AC1 357E D5CC"            /* ì*Jø]²§}üj:Á5~ÕÌ */
+	$"142B 85B0 FEE0 2579 D845 CDFD F507 4C58"            /* .+…°þà%yØEÍýõ.LX */
+	$"D86A F299 0BBC A0A8 39A4 03D9 2144 6B3E"            /* Øjò™.¼ ¨9¤.Ù!Dk> */
+	$"6D67 242B 0FEB B6F4 79CB 58ED 2338 DB9F"            /* mg$+.ë¶ôyËXí#8ÛŸ */
+	$"6EC7 1626 0FDD 0C77 1E00 2AE4 8B46 F39C"            /* nÇ.&.Ý.w..*ä‹Fóœ */
+	$"6268 EE5F FF49 B5C8 30E7 9859 E163 A9D4"            /* bhî_ÿIµÈ0ç˜Yác©Ô */
+	$"C50F BC0C 46BB BBC7 9FFF 7D54 E81B 8936"            /* Å.¼.F»»ÇŸÿ}Tè.‰6 */
+	$"A032 72E8 6576 5FEA 9A3F A5A9 9E58 B9C2"            /*  2rèev_êš?¥©žX¹Â */
+	$"A089 A039 5695 766F 3295 A1FF 7F5F FBDB"            /*  ‰ 9V•vo2•¡ÿ._ûÛ */
+	$"A3FD 1F1F 76AD 6787 B4D0 D1A5 E4EA 72F8"            /* £ý..v­g‡´ÐÑ¥äêrø */
+	$"0276 0C35 EC34 65A8 000A CA35 6AAE 1800"            /* .v.5ì4e¨.ÂÊ5j®.. */
+	$"99CA 1B65 F56D 6C3B DF33 AB08 94A3 15CF"            /* ™Ê.eõml;ß3«.”£.Ï */
+	$"C9B8 D32E 35D7 D32D 57E6 86D2 A5BE 2B3A"            /* ɸÓ.5×Ó-Wæ†Ò¥¾+: */
+	$"4535 2C10 41FE FDA9 E202 3927 BC4F 5F90"            /* E5,.Aþý©â.9'¼O_� */
+	$"E637 311C DB00 E394 09F3 005B 7DB3 0DFE"            /* æ71.Û.ã”Æó.[}³.þ */
+	$"9F1F CAA4 DD03 B381 8330 AB38 E13B 2F9C"            /* Ÿ.ʤÝ.³�ƒ0«8á;/œ */
+	$"3DB5 01C5 100A 5D16 5C8D 792C FA0E 1A85"            /* =µ.Å.Â].\�y,ú..… */
+	$"E3FF 467A 6333 E4F1 F27C 9E2B 161E 18F0"            /* ãÿFzc3äñò|ž+...ð */
+	$"3F30 9C2C 631D BE74 4B7F 6E21 3FBC 404E"            /* ?0œ,c.¾tK.n!?¼@N */
+	$"E063 4152 D02D 68E4 869C E7E9 E4E6 4E95"            /* àcARÐ-h䆜çéäæN• */
+	$"3A66 1FDA 1145 DFB4 0796 9F97 503C E2C9"            /* :f.Ú.Eß´.–Ÿ—P<âÉ */
+	$"7F49 D644 1290 98BD 8EA0 2FA1 CF00 E383"            /* .IÖD.�˜½Ž /¡Ï.ム*/
+	$"C003 7BFE D79B FF62 A38E 2C39 A64D 19FF"            /* À.{þ×›ÿb£Ž,9¦M.ÿ */
+	$"6A9D 976A 994B 6626 4F4D 7DC8 F0CA EDB7"            /* j�—j™Kf&OM}ÈðÊí· */
+	$"F99E 21E2 36B4 3AAB E787 C6A2 1783 F623"            /* ùž!â6´:«ç‡Æ¢.ƒö# */
+	$"8755 1F66 AFBC 2959 6E6E 2E61 AC85 2198"            /* ‡U.f¯¼)Ynn.a¬…!˜ */
+	$"9978 EDFD 334C F0D6 7F76 9AF2 47AF 5E4B"            /* ™xíý3LðÖ.všòG¯^K */
+	$"805C 54D3 5F2A 16C5 6675 C288 B44F F851"            /* €\TÓ_*.Åfuˆ´OøQ */
+	$"1CE9 9F21 BF10 92B9 2366 5D69 AE8E 9989"            /* .éŸ!¿.’¹#f]i®Ž™‰ */
+	$"36A6 F9E6 75A7 0D47 C8B5 8727 0138 2BFA"            /* 6¦ùæu§.Gȵ‡'.8+ú */
+	$"5C4A 649C 123C 225E 2CEC 2007 5016 3F11"            /* \Jdœ.<"^,ì .P.?. */
+	$"B8FF 60CB 7150 EBFD DFED 147E 0A98 E096"            /* ¸ÿ`ËqPëýßí.~Â˜à– */
+	$"6B76 3AF0 39A5 5BF2 880C E857 174C 8735"            /* kv:ð9¥[òˆ.èW.L‡5 */
+	$"ACF6 E4B7 3477 6293 FF7C 8515 A8DE 4E73"            /* ¬öä·4wb“ÿ|….¨ÞNs */
+	$"8E37 8A0C 4384 0CF3 FA01 15F5 9639 ED05"            /* Ž7Š.C„.óú..õ–9í. */
+	$"C86B 28A0 C331 14BC 2817 FE9B F96A D60D"            /* Èk( Ã1.¼(.þ›ùjÖ. */
+	$"EBCB 14DA FF7F FF47 8A61 A2C7 F01F 10B7"            /* ëË.Úÿ.ÿGŠa¢Çð..· */
+	$"3DAF B01C B484 F55D 457E E3EC CC41 95DE"            /* =¯°.´„õ]E~ãìÌA•Þ */
+	$"097E 8117 F77F FEFB A490 8B96 1300 2B37"            /* Æ~�.÷.þû¤�‹–..+7 */
+	$"19FA E04C 4188 E9F6 8950 0668 B082 8FD8"            /* .úàLAˆéö‰P.h°‚�Ø */
+	$"0B7D 6C32 4DBF F84F F4E9 ACAF 719A DC43"            /* .}l2M¿øOô鬯qšÜC */
+	$"9F8D A53E DF1A BDB0 AAA7 3267 9C2D 357A"            /* Ÿ�¥>ß.½°ª§2gœ-5z */
+	$"9CA7 1AE1 59C4 F467 83D3 308B 004A 42C2"            /* œ§.áYÄôgƒÓ0‹.JB */
+	$"909B F979 41CE AB25 C6D1 9FE9 46E1 E837"            /* �›ùyAΫ%ÆÑŸéFáè7 */
+	$"7ADF FF72 225E 4472 D323 F55C BE19 1E50"            /* zßÿr"^DrÓ#õ\¾..P */
+	$"BF94 6787 CADB F576 300A 054B 0A2D E9B2"            /* ¿”g‡ÊÛõv0Â.KÂ-é² */
+	$"5C15 DB84 E735 F76D 5477 D8A7 28AF FF7A"            /* \.Û„ç5÷mTwا(¯ÿz */
+	$"7EB8 06F8 4FF4 E999 ED48 02C4 F111 F61D"            /* ~¸.øOôé™íH.Äñ.ö. */
+	$"8A6C 1CC6 AE54 94E4 8C5D 7655 4ECC 205F"            /* Šl.Æ®T”äŒ]vUNÌ _ */
+	$"DBF9 1BA7 83CC 52E9 E9C9 52A4 1151 7DE4"            /* Ûù.§ƒÌRééÉR¤.Q}ä */
+	$"051B E140 3FC0 D60B 0C11 663F 98A9 8B53"            /* ..á@?ÀÖ...f?˜©‹S */
+	$"776E BD8D 7678 AD62 ACEE 033F D134 B61E"            /* wn½�vx­b¬î.?Ñ4¶. */
+	$"F86D 3384 AAE7 9074 F7CF 4509 F9B3 4F30"            /* øm3„ªç�t÷ÏEÆù³O0 */
+	$"F32D 840F 1DDA E6B1 BDD4 951F 2379 F890"            /* ó-„..Úæ±½Ô•.#yø� */
+	$"530A E915 A228 D3D8 B188 C692 2767 D628"            /* SÂé.¢(ÓرˆÆ’'gÖ( */
+	$"12F8 3FFA BA23 F76B 1D92 1FC1 EA73 30FC"            /* .ø?úº#÷k.’.Áês0ü */
+	$"CE72 0CA5 6695 6326 F93B B52F B9D4 F6F0"            /* Îr.¥f•c&ù;µ/¹Ôöð */
+	$"FF07 727B 80F9 EBFC 2176 788C 333F 4137"            /* ÿ.r{€ùëü!vxŒ3?A7 */
+	$"E82C D066 6088 A8EA 168F 40EA F1EE BDE8"            /* è,Ðf`ˆ¨ê.�@êñî½è */
+	$"C023 75BA 66F2 335A 98C0 31A8 2137 7A7B"            /* À#uºfò3Z˜À1¨!7z{ */
+	$"DA0F 3962 D4B3 3E6E A5A1 3A19 5EED 48A7"            /* Ú.9bÔ³>n¥¡:.^íH§ */
+	$"7617 DE46 D178 BC48 D85D 7821 DFEC B30D"            /* v.ÞFÑx¼HØ]x!ßì³. */
+	$"F84F B7CD 80ED 55C7 9E1A F58D 7085 F625"            /* øO·Í€íUÇž.õ�p…ö% */
+	$"F564 3BF5 A09E B353 4E45 2F0B FC02 ECFD"            /* õd;õ ž³SNE/.ü.ìý */
+	$"539F 529C A652 34F1 C0CC BC04 FCE0 2C7D"            /* SŸRœ¦R4ñÀ̼.üà,} */
+	$"A8A9 9E67 79E9 ADE4 ABEE BFF6 4793 1B91"            /* ¨©žgyé­ä«î¿öG“.‘ */
+	$"413A 4302 7FB5 190C CB09 0DC9 3B33 E18D"            /* A:C..µ..ËÆ.É;3á� */
+	$"DDAB 23C5 FABA 5DC1 554F C940 B964 7F6A"            /* Ý«#Åúº]ÁUOÉ@¹d.j */
+	$"A781 2032 BF9E 0262 7C99 CD96 9251 9FB6"            /* §� 2¿ž.b|™Í–’QŸ¶ */
+	$"1C69 9141 7A13 3022 DE48 DA68 C959 A0B5"            /* .i‘Az.0"ÞHÚhÉY µ */
+	$"0F3A F19A 9301 5051 5855 9D7B 5173 EE47"            /* .:ñš“.PQXU�{QsîG */
+	$"2B0D DB30 28CC 5E41 46F1 E79F 90B3 AB2A"            /* +.Û0(Ì^AFñçŸ�³«* */
+	$"CAEA 6128 10E1 2CC0 DDC2 EBF1 26F1 E1DC"            /* Êêa(.á,ÀÝÂëñ&ñáÜ */
+	$"EB87 87ED 55F3 827C A066 D932 FCF7 B134"            /* 뇇íUó‚| fÙ2ü÷±4 */
+	$"8BC9 CC70 B38C B019 8372 EA60 7C36 4D38"            /* ‹ÉÌp³Œ°.ƒrê`|6M8 */
+	$"F82F 16C2 2390 A91B 203A 8EBE D0EC E278"            /* ø/.Â#�©. :Ž¾Ðìâx */
+	$"7AC4 8493 A217 6AC3 B85A 470D D74A B91D"            /* zÄ„“¢.jøZG.×J¹. */
+	$"0180 7BAB 4088 5671 6268 5B4A 54FE C179"            /* .€{«@ˆVqbh[JTþÁy */
+	$"1600 7677 830B 0E81 EEB2 6124 33F8 DBBD"            /* ..vwƒ..�î²a$3øÛ½ */
+	$"1B35 D1F9 0568 3891 0ECB A836 5A86 9636"            /* .5Ñù.h8‘.˨6Z†–6 */
+	$"9F87 052F 0D66 8AA3 3362 1651 9B33 9057"            /* Ÿ‡./.fŠ£3b.Q›3�W */
+	$"5B98 05EB 23CE 099F 2358 444E 0D64 A9F9"            /* [˜.ë#ÎÆŸ#XDN.d©ù */
+	$"A569 7D56 A50D 6256 69AF BDD9 7847 D651"            /* ¥i}V¥.bVi¯½ÙxGÖQ */
+	$"73E2 F76E F277 58DC BFB9 7B8E 593C 0E97"            /* sâ÷nòwXÜ¿¹{ŽY<.— */
+	$"3C4E 507D FA6C 7984 FAC8 6C42 6882 78AC"            /* <NP}úly„úÈlBh‚x¬ */
+	$"E40D B7A2 4E43 998B 1C29 D7C6 B7BA 58C9"            /* ä.·¢NC™‹.)×Æ·ºXÉ */
+	$"3503 114B 86B8 CB5D B605 832D 98FE 0257"            /* 5..K†¸Ë]¶.ƒ-˜þ.W */
+	$"FB50 8CA0 43D4 71BE E330 1584 5983 668F"            /* ûPŒ CÔq¾ã0.„Yƒf� */
+	$"735C 2448 3B30 82E4 1932 5BF8 129F FE38"            /* s\$H;0‚ä.2[ø.Ÿþ8 */
+	$"749D 01ED DAFC 95B9 375D BBCB 60D9 FC58"            /* t�.íÚü•¹7]»Ë`ÙüX */
+	$"0796 AEFC 2337 F89E 01F5 48BD 0BAF A61F"            /* .–®ü#7øž.õH½.¯¦. */
+	$"3EC4 C092 DC6A 584C AAAF 1A9F A20F CEA4"            /* >ÄÀ’ÜjXLª¯.Ÿ¢.Τ */
+	$"884B 2DB6 09F4 F51B 546F CD71 F4D3 6452"            /* ˆK-¶Æôõ.ToÍqôÓdR */
+	$"B6E5 3EFF 66F8 0D60 D916 F755 1348 E250"            /* ¶å>ÿfø.`Ù.÷U.HâP */
+	$"D8E2 6858 B424 B84B D59A 6885 24D3 D845"            /* ØâhX´$¸KÕšh…$ÓØE */
+	$"692F 4313 B616 584F 7419 0661 0064 C281"            /* i/C.¶.XOt..a.dÂ� */
+	$"A873 131C 5296 042B 1FD5 3EED BFC2 659E"            /* ¨s..R–.+.Õ>í¿Âež */
+	$"C4C7 2720 8002 28DD 141A BBE7 99F8 028F"            /* ÄÇ' €.(Ý..»ç™ø.� */
+	$"8262 0577 5240 EB9A F866 2901 B75B 3FED"            /* ‚b.wR@ëšøf).·[?í */
+	$"9E78 9071 83FD 02BC FCDE 2135 42D1 F184"            /* žx�qƒý.¼üÞ!5BÑñ„ */
+	$"309D F47E DF10 F797 4268 120A D377 04A4"            /* 0�ô~ß.÷—Bh.ÂÓw.¤ */
+	$"2998 099E CA35 66AD FB20 8C14 1E0E 714E"            /* )˜ÆžÊ5f­û Œ...qN */
+	$"B9A7 70EE 5BA0 7A18 FC16 97EB 1A98 CB6C"            /* ¹§pî[ z.ü.—ë.˜Ël */
+	$"4B5D AC5B 3DC2 2062 E74A 18F2 0A76 6085"            /* K]¬[=Â bçJ.òÂv`… */
+	$"EF50 1C2F FE23 117A ED22 7BE8 0231 BC71"            /* ïP./þ#.zí"{è.1¼q */
+	$"707C 6736 BC3C 38AA 81C2 66B6 DCE5 13E9"            /* p|g6¼<8ª�Âf¶Üå.é */
+	$"3076 C7AD 8C4B A962 C37E 4605 CDC0 8247"            /* 0vÇ­ŒK©bÃ~F.ÍÀ‚G */
+	$"190C 41CD 6923 8D00 BC94 5B5F E2AB 443B"            /* ..AÍi#�.¼”[_â«D; */
+	$"3C5A 7FF6 213C 9E2D 9224 70B1 EA9B 7D36"            /* <Z.ö!<ž-’$p±ê›}6 */
+	$"E7EA 0D03 CB32 7413 AB26 CB30 1B56 CBDE"            /* çê..Ë2t.«&Ë0.VËÞ */
+	$"3C31 361D 24E2 F441 4D78 7825 1DA0 0C14"            /* <16.$âôAMxx%. .. */
+	$"5C84 B112 6FC1 77DB 42CA 7791 960B 9F09"            /* \„±.oÁwÛBÊw‘–.ŸÆ */
+	$"980A 5629 54C0 EC82 889A B0E3 38F4 E734"            /* ˜ÂV)TÀ삈š°ã8ôç4 */
+	$"FA91 D5CD 2C8F 43CD 5629 3DAD 81DA 5E0A"            /* ú‘ÕÍ,�CÍV)=­�Ú^Â */
+	$"C008 712F EAD3 2486 4CD2 C7BA 0FA9 BBD3"            /* À.q/êÓ$†LÒǺ.©»Ó */
+	$"6AC2 A912 7736 5A33 CC96 9EDC 9C5A 3084"            /* j©.w6Z3Ì–žÜœZ0„ */
+	$"C826 A3FB 0661 ED4B 9689 A921 22AB 2399"            /* È&£û.aíK–‰©!"«#™ */
+	$"6F2A 4A78 A5F8 A059 BE4B 7DFF 5D41 1A31"            /* o*Jx¥ø Y¾K}ÿ]A.1 */
+	$"E688 045C BD1E D1DB 7C5B 6B89 5C22 3CAF"            /* æˆ.\½.ÑÛ|[k‰\"<¯ */
+	$"F133 FF14 13A2 9A3F 6E42 54EB 5082 9F25"            /* ñ3ÿ..¢š?nBTëP‚Ÿ% */
+	$"7C07 6BA6 25EA A890 3560 E915 B058 CB68"            /* |.k¦%ê¨�5`é.°XËh */
+	$"3601 4B07 ACE7 EC8A 2897 F908 D405 455E"            /* 6.K.¬çìŠ(—ù.Ô.E^ */
+	$"5EDD 427E 791A EA3D 6ACE 3BC0 0D43 731A"            /* ^ÝB~y.ê=jÎ;À.Cs. */
+	$"C9C6 8C03 BD83 6F85 EF75 7246 2F8E 1CFB"            /* ÉÆŒ.½ƒo…ïurF/Ž.û */
+	$"8DC9 2726 593F 1D87 A822 399F 9770 324C"            /* �É'&Y?.‡¨"9Ÿ—p2L */
+	$"6ABF 38B9 E89E B2F5 D575 E7DB C449 63CF"            /* j¿8¹èž²õÕuçÛÄIcÏ */
+	$"EBE1 07BB 80A4 C099 6A15 9A47 96F3 8C8D"            /* ëá.»€¤À™j.šG–óŒ� */
+	$"49E1 1F78 2119 9460 CA7A F257 EDA1 104B"            /* Iá.x!.”`ÊzòWí¡.K */
+	$"5C68 0E57 188C 62B0 FBE3 CF4F 5251 6525"            /* \h.W.Œb°ûãÏORQe% */
+	$"CB59 5E3D C6F4 6B04 5B2D 1ED2 3BE1 02BB"            /* ËY^=Æôk.[-.Ò;á.» */
+	$"7207 12AA BFEC 50F4 83FE 2797 121B 3D14"            /* r..ª¿ìPôƒþ'—..=. */
+	$"DA23 BE41 D647 E5CA DD2D CD48 8C4D A094"            /* Ú#¾AÖGåÊÝ-ÍHŒM ” */
+	$"B1A9 4ED5 4735 8818 C4F1 597D 3211 5D12"            /* ±©NÕG5ˆ.ÄñY}2.]. */
+	$"D96B 5A38 AB9A 7E89 C503 13B0 8354 C887"            /* ÙkZ8«š~‰Å..°ƒTȇ */
+	$"F766 96F0 EDAE C6B6 17B4 E9A4 9230 C2F5"            /* ÷f–ðí®Æ¶.´é¤’0Âõ */
+	$"029D 3D72 A1CF 5BB9 E975 DBFF 06DC F5B2"            /* .�=r¡Ï[¹éuÛÿ.Üõ² */
+	$"686F 667B AD3E 1D8D 5BE4 0D6A 2CD7 DE66"            /* hof{­>.�[ä.j,×Þf */
+	$"BE8E C996 696D 58EC 6CFE 40AD 3C95 EAF1"            /* ¾ŽÉ–imXìlþ@­<•êñ */
+	$"4591 1D62 836E D2E3 4CD8 E4A6 F4F4 C456"            /* E‘.bƒnÒãLØä¦ôôÄV */
+	$"A70C B3BE AA22 A188 DAB5 D3F7 4B7B 865D"            /* §.³¾ª"¡ˆÚµÓ÷K{†] */
+	$"4D89 77E6 99A6 46C9 14BA 25E1 55C5 ADBD"            /* M‰w晦FÉ.º%áUÅ­½ */
+	$"4379 96AF 26DA A399 F009 AE75 248B 0285"            /* Cy–¯&Ú£™ðÆ®u$‹.… */
+	$"B370 5704 6429 C8AF 0BD3 A332 90B2 8351"            /* ³pW.d)ȯ.Ó£2�²ƒQ */
+	$"F715 32C9 347B EADE 2EBB 9D97 BF95 0C5A"            /* ÷.2É4{êÞ.»�—¿•.Z */
+	$"9203 1EC5 7A8E CF46 C28C 39A2 DE74 C656"            /* ’..ÅzŽÏFÂŒ9¢ÞtÆV */
+	$"F0BF 3ABF CE5F BE71 B7CE 2FF3 F41B F3EA"            /* ð¿:¿Î_¾q·Î/óô.óê */
+	$"8BE7 B07E AB17 4F87 74FC FDE8 EF9F BF3F"            /* ‹ç°~«.O‡tüýè? */
+	$"A9EB F3D5 3F3E 83BE 7BAF EA5F E0FE 7ADF"            /* ©ëóÕ?>ƒ¾{¯ê_àþzß */
+	$"E7A7 7F9D 3FE7 3BF9 FA77 F9FA 3FF9 F7C7"            /* ç§.�?ç;ùúwùú?ù÷Ç */
+	$"E7E9 871D E84F CFE8 83FC FE85 E3BB E7E7"            /* çé‡.èOÏèƒüþ…ã»çç */
+	$"AFFE 7D7F F9F5 57E7 AF70 6F9D 2DF3 9ED7"            /* ¯þ}.ùõWç¯po�-óž× */
+	$"C81E F903 FEAB 8EF9 F50D F254 3F3E A4D1"            /* È.ù.þ«Žùõ.òT?>¤Ñ */
+	$"DD53 F3F6 F37E 7EC9 4775 1BE4 77F9 EEBF"            /* ÝSóöó~~ÉGu.äwùî¿ */
+	$"9ED1 F9DC 00F7 91DD 3D8B A94D D83C 797F"            /* žÑùÜ.÷‘Ý=‹©MØ<y. */
+	$"4243 1F04 D29C 94E6 FA35 A9C7 9C1C 0762"            /* BC..Òœ”æú5©Çœ..b */
+	$"AA92 7DF8 65D6 B16D 30C6 E3F2 22D5 8971"            /* ª’}øeÖ±m0Æãò"Õ‰q */
+	$"F890 651C 37E3 1F4A 29A4 6637 D7AE 7CB9"            /* ø�e.7ã.J)¤f7×®|¹ */
+	$"14C7 D06B 2595 45F8 89DC DBAF B284 6ADA"            /* .ÇÐk%•Eø‰ÜÛ¯²„jÚ */
+	$"E4DB 9D25 F76C CDA3 EB7E 1B5A 4264 8145"            /* äÛ�%÷lÍ£ë~.ZBd�E */
+	$"547E 6F18 076D A675 BA1A 1AB1 0BF1 AEB6"            /* T~o..m¦uº..±.ñ®¶ */
+	$"C8C2 AAE0 489F 4E11 7F77 336A 41A4 C050"            /* ȪàHŸN..w3jA¤ÀP */
+	$"D19E AE10 BD35 C5EC DA71 BDEF A017 C32D"            /* Ñž®.½5ÅìÚq½ï .Ã- */
+	$"CB15 0C8E 0B75 C179 FB84 FDF2 DD5D C21F"            /* Ë..Ž.uÁyû„ýòÝ]Â. */
+	$"56A5 397D C437 A82F 65F9 2E68 A785 0AF3"            /* V¥9}Ä7¨/eù.h§…Âó */
+	$"B9F0 7781 E6B8 ACFA 09DC B57D 6317 B29B"            /* ¹ðw�測úÆܵ}c.²› */
+	$"C754 09FC 3635 9854 0DA1 A3BE D3EE CF40"            /* ÇTÆü65˜T.¡£¾ÓîÏ@ */
+	$"4BE4 A4D9 07C4 D65E 3887 C8A7 CD3A 83F5"            /* Kä¤Ù.ÄÖ^8‡È§Í:ƒõ */
+	$"DFA8 10A6 BB6D B811 852D 3877 8782 1E66"            /* ߨ.¦»m¸.…-8w‡‚.f */
+	$"AF11 43B8 CA3A 6146 3657 AFE0 B314 36CB"            /* ¯.C¸Ê:aF6W¯à³.6Ë */
+	$"8E1C 272D ED4B 634C AABA 0207 6A1A E2E3"            /* Ž.'-íKcLªº..j.âã */
+	$"C500 C0A4 894A BAD8 C9A1 0AE7 AC8D 750C"            /* Å.À¤‰JºØÉ¡Âç¬�u. */
+	$"7D84 FBCC DB2E EE05 B04A 002B B383 46DE"            /* }„ûÌÛ.î.°J.+³ƒFÞ */
+	$"C18D 5BBD B442 9E88 BBB2 89CC 0EBA CF5A"            /* Á�[½´Bžˆ»²‰Ì.ºÏZ */
+	$"5616 DDAB ED7B 4C2E 1C82 0C9D 4820 C0E8"            /* V.Ý«í{L..‚.�H Àè */
+	$"1C4E 39A5 9041 9E33 A20A A73D 821A 238A"            /* .N9¥�Až3¢Â§=‚.#Š */
+	$"3B24 14B9 D9A6 95AA F5B0 13C1 8CFD 790F"            /* ;$.¹Ù¦•ªõ°.ÁŒýy. */
+	$"33CB 82D3 FE12 0F27 F309 7453 05E0 DF8F"            /* 3Ë‚Óþ..'óÆtS.àß� */
+	$"AAE8 F77A 31BA 0118 43E1 7AE7 69DC 5D12"            /* ªè÷z1º..CázçiÜ]. */
+	$"BD53 9858 EA6D D8D3 174C FE4C F487 3CCF"            /* ½S˜XêmØÓ.LþLô‡<Ï */
+	$"9098 7872 8FC3 EBAC 4C76 F503 6915 A1B3"            /* �˜xr�Ãë¬Lvõ.i.¡³ */
+	$"5FF8 81CD E13D D511 AAB8 5C7B 1376 C87F"            /* _ø�Íá=Õ.ª¸\{.vÈ. */
+	$"2DA1 557D 2053 3341 CC15 418C 0911 5378"            /* -¡U} S3AÌ.AŒÆ.Sx */
+	$"5FFE 324E 1412 2046 B049 3A77 69B7 417F"            /* _þ2N.. F°I:wi·A. */
+	$"AC17 B8B0 7FDA 6D19 59F0 DD68 8A88 E55A"            /* ¬.¸°.Úm.YðÝhŠˆåZ */
+	$"8098 0888 3714 713A 1D17 BB8D F01C 6005"            /* €˜.ˆ7.q:..»�ð.`. */
+	$"8F2E 3D20 2753 1BB4 9BE3 DFD1 709F 99EB"            /* �.= 'S.´›ãßÑpŸ™ë */
+	$"DFCC C1B1 717B 7FA3 52BB C12D E6B7 24D2"            /* ßÌÁ±q{.£R»Á-æ·$Ò */
+	$"F448 F23D C196 1BAA D61B F422 41B4 D620"            /* ôHò=Á–.ªÖ.ô"A´Ö  */
+	$"466D 45F3 06F6 F631 3E88 5CDE F7F6 BC6F"            /* FmEó.öö1>ˆ\Þ÷ö¼o */
+	$"789C D06C 02CC 2E71 B6B0 03D2 297B BFCD"            /* xœÐl.Ì.q¶°.Ò){¿Í */
+	$"8C21 67AD CEE0 DB53 5749 A676 690C 11E3"            /* Œ!g­ÎàÛSWI¦vi..ã */
+	$"5AD2 905C 78E1 4AB0 E60E C920 4ECC 7CB6"            /* ZÒ�\xáJ°æ.É NÌ|¶ */
+	$"A76F 70F1 BCFD AA1D F4D2 E43F E203 D0C8"            /* §opñ¼ýª.ôÒä?â.ÐÈ */
+	$"E11E 61AF F1A7 5762 600E 65BB D870 818A"            /* á.a¯ñ§Wb`.e»Øp�Š */
+	$"CDF0 DFC4 8C9C 1926 678B 2732 C52F 98FD"            /* ÍðßÄŒœ.&g‹'2Å/˜ý */
+	$"33B3 EE23 138D 5E5F C9C3 FEF9 6111 E3E6"            /* 3³î#.�^_ÉÃþùa.ãæ */
+	$"AF79 A8A5 2949 D590 B463 EDF3 F72A 18FD"            /* ¯y¨¥)IÕ�´cíó÷*.ý */
+	$"BB23 233B 7924 2DD1 A335 B949 467E A30C"            /* »##;y$-Ñ£5¹IF~£. */
+	$"3185 5FE5 DB63 6748 B22D AB3F 8A8C 0926"            /* 1…_åÛcgH²-«?ŠŒÆ& */
+	$"5450 E925 A69D 1185 7300 D694 EA1F 4DF2"            /* TPé%¦�.…s.Ö”ê.Mò */
+	$"2413 F4ED 6D64 5B74 BBD5 0E65 26EF A8CD"            /* $.ôímd[t»Õ.e&ï¨Í */
+	$"5806 0C60 404F 90A0 06B6 AFD1 785F 9646"            /* X..`@O� .¶¯Ñx_–F */
+	$"B1AD 2A45 5777 33FA 49DB 8D3D AC2A BAEA"            /* ±­*EWw3úIÛ�=¬*ºê */
+	$"4527 B4DF 481A 6AB9 4485 05E6 7040 1B93"            /* E'´ßH.j¹D….æp@.“ */
+	$"D6E0 3BBF A334 E13B 68EC 934B C393 B621"            /* Öà;¿£4á;hì“KÓ¶! */
+	$"CFC8 69BE A6AC 672C 235E F1FC 4480 DE83"            /* ÏÈi¾¦¬g,#^ñüD€Þƒ */
+	$"32D7 D269 F78C F22D 5B9F F4DF DDDD D6DE"            /* 2×Òi÷Œò-[ŸôßÝÝÖÞ */
+	$"4C65 4D61 C1F0 26BF E4C3 D7C9 A034 163D"            /* LeMaÁð&¿äÃ×É 4.= */
+	$"FBAE 0167 4DF0 EBEF AA8B B742 2832 1F67"            /* û®.gMðë懲·B(2.g */
+	$"8CC0 80D0 4A6B 9843 DE59 2F7B F944 9DA4"            /* ŒÀ€ÐJk˜CÞY/{ùD�¤ */
+	$"343D 9AD9 9E0B C7B5 0B7D 2CA1 F638 8A3B"            /* 4=šÙž.ǵ.},¡ö8Š; */
+	$"BB38 A39B 025A 9BA9 34AC ACF0 063D 5483"            /* »8£›.Z›©4¬¬ð.=Tƒ */
+	$"FE57 22E4 EB2C C699 AEF3 8EFB 1C8C A23A"            /* þW"äë,Æ™®óŽû.Œ¢: */
+	$"2C15 D2EF AC9A 91C9 993A 4CB0 2DDC 0A32"            /* ,.Ò﬚‘É™:L°-ÜÂ2 */
+	$"14B9 50D2 8579 8F9D 5AF2 88DB E726 1B39"            /* .¹PÒ…y��ZòˆÛç&.9 */
+	$"3E06 69F9 F300 09E4 D3E8 BB4C A704 10E0"            /* >.iùó.ÆäÓè»L§..à */
+	$"F1D0 53DE 91D8 6723 A047 11C7 57B3 C46C"            /* ñÐSÞ‘Øg# G.ÇW³Äl */
+	$"84A7 C2E1 C7CC 185C 9F21 7E2B 0F2E 64B1"            /* „§ÂáÇÌ.\Ÿ!~+..d± */
+	$"D734 4142 C65E A2FB 9ABE B62D 076B 2B65"            /* ×4ABÆ^¢ûš¾¶-.k+e */
+	$"9D6E 63F1 4825 79A9 3936 C7A7 531F EF6A"            /* �ncñH%y©96ǧS.ïj */
+	$"F859 3084 0421 88A9 A648 8641 ACEB 95DE"            /* øY0„.!ˆ©¦H†A¬ë•Þ */
+	$"2E94 E3C9 442C 13AF CF63 0404 C5C6 5CE2"            /* .”ãÉD,.¯Ïc..ÅÆ\â */
+	$"CE90 F9CC A1B6 5713 031E C239 174F CC40"            /* Î�ùÌ¡¶W...Â9.OÌ@ */
+	$"BCA4 EA9A EB6A 1D24 7962 F735 AF5A B937"            /* ¼¤êšëj.$yb÷5¯Z¹7 */
+	$"AC3B A12E 10A8 D332 6FE3 8ED1 6F01 B198"            /* ¬;¡..¨Ó2oãŽÑo.±˜ */
+	$"1543 A6A1 367E E226 5D76 B860 E0E1 8963"            /* .C¦¡6~â&]v¸`àá‰c */
+	$"AA7A F9EE DABF DB52 28F6 69F9 273F 8729"            /* ªzùîÚ¿ÛR(öiù'?‡) */
+	$"1D00 C7D2 20B9 3483 2125 88FC 94C0 54A6"            /* ..ÇÒ ¹4ƒ!%ˆü”ÀT¦ */
+	$"42FE F4E5 DA50 F495 F88B 5986 21CB 22E8"            /* BþôåÚPô•ø‹Y†!Ë"è */
+	$"EE5E 0622 2CB0 BCC8 0C6B 2B2B 23EB 0506"            /* î^.",°¼È.k++#ë.. */
+	$"A40F 09C2 726F 0C1F B8D4 55D3 2FE4 D629"            /* ¤.ÆÂro..¸ÔUÓ/äÖ) */
+	$"94C2 C913 BB28 4394 A9D2 8684 9E47 0445"            /* ”ÂÉ.»(C”©Ò†„žG.E */
+	$"B6CF 3E21 7072 B435 310C D7A3 063D 942B"            /* ¶Ï>!pr´51.×£.=”+ */
+	$"6AE9 350C 9442 C76E 1E6B A8C1 18A3 4309"            /* jé5.”BÇn.k¨Á.£CÆ */
+	$"6D55 E62F FC4E C4E9 6CF8 241D FAC5 2CC9"            /* mUæ/üNÄélø$.úÅ,É */
+	$"E020 6B12 31A6 9B11 710B 8850 FABE 5D63"            /* à k.1¦›.q.ˆPú¾]c */
+	$"068A 4018 2A90 93A5 9715 531E 8E7B AD7A"            /* .Š@.*�“¥—.S.Ž{­z */
+	$"2921 115F 19CE 2B6A F643 DE89 2E76 890B"            /* )!._.Î+jöCÞ‰.v‰. */
+	$"5A69 1668 6A02 061F 4832 24EB FC82 6B4D"            /* Zi.hj...H2$ëü‚kM */
+	$"9B08 D22F CBBF D348 D18F 8B0C C684 6851"            /* ›.Ò/Ë¿ÓHÑ�‹.Æ„hQ */
+	$"6CA9 E2FA 43CE 8A9A 7A58 FB28 0208 A6E0"            /* l©âúCΊšzXû(..¦à */
+	$"1ACF CE23 C624 5A38 C640 72C0 26F1 2818"            /* .ÏÎ#Æ$Z8Æ@rÀ&ñ(. */
+	$"07FD 74D9 F3D6 ED38 CA01 6485 CE8C 41A3"            /* .ýtÙóÖí8Ê.d…ÎŒA£ */
+	$"02C6 18E5 E4D2 2043 FA62 8768 3E14 7E80"            /* .Æ.åäÒ Cúb‡h>.~€ */
+	$"F2EB 67AD F743 75A0 2DDF 8724 1468 F88D"            /* òëg­÷Cu -߇$.hø� */
+	$"9BF3 11EB 4D4C B372 D210 9B58 BAA0 646A"            /* ›ó.ëML³rÒ.›Xº dj */
+	$"222F 5E5A C781 1D86 5652 1B57 07AF C8FA"            /* "/^ZÇ�.†VR.W.¯Èú */
+	$"9E77 DD7B FCB9 1D4C 8573 7B03 95AC D2DA"            /* žwÝ{ü¹.L…s{.•¬ÒÚ */
+	$"3314 4FFC CAF4 39B5 EAF4 9617 2CC5 9258"            /* 3.OüÊô9µêô–.,Å’X */
+	$"8F99 8C44 8D44 DA10 F1A5 51F7 5533 F13B"            /* �™ŒD�DÚ.ñ¥Q÷U3ñ; */
+	$"CDDC B6D6 BE71 3C92 2628 3B69 DC32 C623"            /* Íܶ־q<’&(;iÜ2Æ# */
+	$"F497 3959 034A 67C3 10A8 26E2 572F B4B1"            /* ô—9Y.JgÃ.¨&âW/´± */
+	$"6C5C 3E47 FB9F AA7D D9A4 7A08 4BBA E854"            /* l\>GûŸª}Ù¤z.KºèT */
+	$"4370 CE77 C69A 11EB 1BD8 B9AF 8225 BC8E"            /* CpÎwÆš.ë.ع¯‚%¼Ž */
+	$"A261 1CAA A74D B531 A0B9 D462 35DF 9C21"            /* ¢a.ª§Mµ1 ¹Ôb5ßœ! */
+	$"73F1 EAC1 A13C E0BC AF6C 8111 03DF AF1F"            /* sñêÁ¡<༯l�..߯. */
+	$"4748 1866 322C 535A 7C5E D2BC 4304 3541"            /* GH.f2,SZ|^Ò¼C.5A */
+	$"F14E 8412 296B 2C37 B642 9B4A 6417 EABB"            /* ñN„.)k,7¶B›Jd.ê» */
+	$"9034 1260 1B81 AFCC F903 4FAA A3F2 339E"            /* �4.`.�¯Ìù.Oª£ò3ž */
+	$"F332 B080 8C32 31D7 4DEA B260 F190 43F1"            /* ó2°€Œ21×Mê²`ñ�Cñ */
+	$"CCD5 A584 5C1C 343F FB87 CEA5 F246 8EAC"            /* ÌÕ¥„\.4?û‡Î¥òFŽ¬ */
+	$"C407 302C FEE7 3F59 F4B8 74ED ED62 D373"            /* Ä.0,þç?Yô¸tííbÓs */
+	$"A4BA B53A 0554 5403 9C2C E745 1087 5546"            /* ¤ºµ:.TT.œ,çE.‡UF */
+	$"2671 7BA6 3A33 703E BEF5 CD28 10A5 462B"            /* &q{¦:3p>¾õÍ(.¥F+ */
+	$"D902 9493 B2FC 176F 34BA 5A2D D2BC 0CBB"            /* Ù.”“²ü.o4ºZ-Ò¼.» */
+	$"5AB7 B854 08D3 CD79 3C71 1A89 E643 2FBC"            /* Z·¸T.ÓÍy<q.‰æC/¼ */
+	$"5A24 FEA6 EC06 1F23 79D9 3886 F6F4 7FB9"            /* Z$þ¦ì..#yÙ8†öô.¹ */
+	$"F892 1A20 DC66 1EB1 D6FD 1C48 52DE 4267"            /* ø’. Üf.±Öý.HRÞBg */
+	$"77E2 620B 2DC0 6828 575C F7CA 74BC FE73"            /* wâb.-Àh(W\÷Êt¼þs */
+	$"FABD C9ED 4E8F 71A7 8CCD 8D80 8BD2 8AA3"            /* ú½ÉíN�q§ŒÍ�€‹ÒŠ£ */
+	$"45C0 EF2A 387D 038E 8B00 BA81 12CD F93F"            /* EÀï*8}.Ž‹.º�.Íù? */
+	$"E9BE 9134 2928 439B 69CF 3DB1 5DFC 3DAF"            /* 龑4)(C›iÏ=±]ü=¯ */
+	$"86CA 34A7 4574 C91C 3F99 3EA9 B6E9 F3AF"            /* †Ê4§EtÉ.?™>©¶éó¯ */
+	$"6757 09A3 C49E A9AD 7201 BFD9 B3FA 52B0"            /* gWƣĞ©­r.¿Ù³úR° */
+	$"0000 0030 908B 4E52 45F1 3CBE F04A D2E4"            /* ...0�‹NREñ<¾ðJÒä */
+	$"83AF 6AEA 78E9 A438 C877 BAAD 65CB C703"            /* ƒ¯jêxé¤8Èwº­eËÇ. */
+	$"70B2 B9DD E19B 6B8C 0CE9 E402 0C9F 94F0"            /* p²¹Ýá›kŒ.éä..Ÿ”ð */
+	$"21BC 4E05 C03C 012A 66EF D0BC 2B72 292E"            /* !¼N.À<.*fïм+r). */
+	$"3592 1FDB 2A5C 8D2D C2FF 5C5B 6AB8 F695"            /* 5’.Û*\�-Âÿ\[j¸ö• */
+	$"F279 2C54 0529 555A 6ACA 22A4 C28B D693"            /* òy,T.)UZjÊ"¤Â‹Ö“ */
+	$"1FC9 4492 43F3 A323 F990 0A31 9356 30D3"            /* .ÉD’Có£#ù�Â1“V0Ó */
+	$"D6F0 0D36 0091 043F F239 9D1E 114E 3693"            /* Öð.6.‘.?ò9�..N6“ */
+	$"DF1C 23DF A27A 5B11 A44D 9199 07D1 AF2C"            /* ß.#ߢz[.¤M‘™.ѯ, */
+	$"63EB 21C5 D29F 8644 8C6A 129A 9CB9 ED72"            /* cë!ÅÒŸ†DŒj.šœ¹ír */
+	$"9286 3E0E B604 539A F262 B727 9284 01F9"            /* ’†>.¶.Sšòb·'’„.ù */
+	$"5AE1 DA5A 8A02 140E 5275 5433 BCDF 8038"            /* ZáÚZŠ...RuT3¼ß€8 */
+	$"0050 856F A747 857B 8376 255A 9185 28CC"            /* .P…o§G…{ƒv%Z‘…(Ì */
+	$"301A EC7C B5D3 89CC A695 1C87 8266 7CA8"            /* 0.ì|µÓ‰Ì¦•.‡‚f|¨ */
+	$"A203 7467 426E 9507 3DB3 1F90 F66B DC9F"            /* ¢.tgBn•.=³.�ökÜŸ */
+	$"ACF6 CDB2 4FCC 5AE4 2F94 F555 CB9E D8AC"            /* ¬öͲOÌZä/”õU˞ج */
+	$"950B FF38 0FE4 5056 E5E8 F371 9A98 5697"            /* •.ÿ8.äPVåèóqš˜V— */
+	$"6319 5197 B545 E594 AADD B2F2 CA27 260D"            /* c.Q—µE唪ݲòÊ'&. */
+	$"9BAF 0E45 0846 5573 F96B 7AC1 CC89 E86E"            /* ›¯.E.FUsùkzÁ̉èn */
+	$"61E6 72E2 05E3 9F8D 26D8 F178 BCC0 0B18"            /* aærâ.ãŸ�&Øñx¼À.. */
+	$"967C EA80 F7C1 45AE 8FAE A41C 41B6 438E"            /* –|ê€÷ÁE®�®¤.A¶CŽ */
+	$"46EF 1094 D558 01A8 BBAD 7380 DA27 2772"            /* Fï.”ÕX.¨»­s€Ú''r */
+	$"9D67 1330 A48C 62EA 0643 14EC 3E22 A055"            /* �g.0¤Œbê.C.ì>" U */
+	$"4E39 4E23 853D C587 99C8 CFD2 AEBB 9843"            /* N9N#…=Ň™ÈÏÒ®»˜C */
+	$"ECC9 0241 3253 8CF1 E068 1936 3BB2 56D3"            /* ìÉ.A2SŒñàh.6;²VÓ */
+	$"46F7 6A71 98D1 A300 1337 B3B0 7ABB 5752"            /* F÷jq˜Ñ£..7³°z»WR */
+	$"DB7A 7F85 5CFE 59DE A852 6987 DC11 C6B5"            /* Ûz.…\þYÞ¨Ri‡Ü.Ƶ */
+	$"E45B 7DD1 1F3A D566 C16D 3FBF 7BAD 7201"            /* ä[}Ñ.:ÕfÁm?¿{­r. */
+	$"B71C C74C A678 C2BB 10FD 534A 5E5D 79C0"            /* ·.ÇL¦x».ýSJ^]yÀ */
+	$"000C 2336 9113 B9C5 5D4A 1756 1C8B 0CD6"            /* ..#6‘.¹Å]J.V.‹.Ö */
+	$"AA8B DFF5 6CE3 CDAB B9B4 D85C 93FF 76AA"            /* ª‹ßõlãÍ«¹´Ø\“ÿvª */
+	$"15CF CF39 A864 B236 A172 03A1 65A1 9F76"            /* .ÏÏ9¨d²6¡r.¡e¡Ÿv */
+	$"FF55 00DE C7D0 C767 2787 9EB3 7CE5 C5BC"            /* ÿU.ÞÇÐÇg'‡ž³|åż */
+	$"8E08 6085 37A2 229C 73D3 2CC5 F6E8 AA1B"            /* Ž.`…7¢"œsÓ,Åöèª. */
+	$"AF13 15FD EB95 2609 6006 23C6 7910 8FFE"            /* ¯..ýë•&Æ`.#Æy.�þ */
+	$"8C5E 60A6 A558 E899 0A05 0F37 EC94 8E51"            /* Œ^`¦¥Xè™Â..7씎Q */
+	$"7838 9A11 8483 88B0 E284 B88D CDEA 9D56"            /* x8š.„ƒˆ°â„¸�Íê�V */
+	$"5C7E CFA2 8001 847E ABC9 360E 17EA 2D34"            /* \~Ï¢€.„~«É6..ê-4 */
+	$"8314 96C0 3810 D88F A54E 6E7C 6030 76FA"            /* ƒ.–À8.Ø�¥Nn|`0vú */
+	$"18A4 A549 37FC 11F6 E77F A883 C794 71AC"            /* .¤¥I7ü.öç.¨ƒÇ”q¬ */
+	$"55F1 7F88 664A FEE4 01C4 5576 1BE6 9C41"            /* Uñ.ˆfJþä.ÄUv.æœA */
+	$"D800 6121 2FC0 E681 A16E 21AF D5FE 0E80"            /* Ø.a!/Àæ�¡n!¯Õþ.€ */
+	$"A800 0000 3090 8C40 9184 82DA 7187 51C6"            /* ¨...0�Œ@‘„‚Úq‡QÆ */
+	$"44DC C420 FF13 98AD D100 2C07 132C 8D6C"            /* DÜÄ ÿ.˜­Ñ.,..,�l */
+	$"5D16 A089 D8F6 E77F A870 24F1 5461 DB69"            /* ]. ‰Øöç.¨p$ñTaÛi */
+	$"0F41 5029 7A41 B55F 0000 0184 846A 850C"            /* .AP)zAµ_...„„j…. */
+	$"241E E628 EDA6 4000 3090 6AA2 F6E7 7FA6"            /* $.æ(í¦@.0�j¢öç.¦ */
+	$"26C9 5EDE 9BB6 A1B1 51E6 8D5D F800 0061"            /* &É^Þ›¶¡±Qæ�]ø..a */
+	$"19B3 E47D 6F6F DB03 0885 4A53 27BA 38F5"            /* .³ä}ooÛ..…JS'º8õ */
+	$"35A0 1AB9 0A95 8FAE 85E3 F528 5A8B E645"            /* 5 .¹Â•�®…ãõ(Z‹æE */
+	$"8419 0456 6A38 D0DA 4948 8987 2323 1216"            /* „..Vj8ÐÚIH‰‡##.. */
+	$"A4F8 FD1A C374 D30C BF43 CD86 B984 F23C"            /* ¤øý.ÃtÓ.¿C͆¹„ò< */
+	$"5487 B47F E217 F15A D8CF A66A 96A9 EAF3"            /* T‡´.â.ñZØϦj–©êó */
+	$"F966 0205 D320 1556 5C3C 073A 8E66 1E3F"            /* ùf..Ó .V\<.:Žf.? */
+	$"A74E FF2C BC45 E9DB 3B25 FF7F 46AD 13A9"            /* §Nÿ,¼EéÛ;%ÿ.F­.© */
+	$"5C21 458B 6AD4 829C 1DFB 54BA E5F2 3C76"            /* \!E‹jÔ‚œ.ûTºåò<v */
+	$"3898 11F6 D710 7470 00FC 0742 CA59 9E40"            /* 8˜.ö×.tp.ü.BÊYž@ */
+	$"757C 5952 61FF 4D28 0991 1673 9B01 06B9"            /* u|YRaÿM(Æ‘.s›..¹ */
+	$"3999 E9B5 06CD B1DA CB08 FF19 DE70 8D10"            /* 9™éµ.ͱÚË.ÿ.Þp�. */
+	$"E725 848E D27D 2B0B 54F0 B60B 26AB CD92"            /* ç%„ŽÒ}+.Tð¶.&«Í’ */
+	$"E4F8 C007 FF68 6933 E2FF 31D5 435B FF7F"            /* äøÀ.ÿhi3âÿ1ÕC[ÿ. */
+	$"9A8E 9845 007F FEDA 4C63 9892 513A ABD9"            /* šŽ˜E..þÚLc˜’Q:«Ù */
+	$"A98A C012 5C99 31C0 D48F E334 671D A695"            /* ©ŠÀ.\™1ÀÔ�ã4g.¦• */
+	$"C7EF 3AAA FF37 D381 4F42 983F FC4D AE82"            /* Çï:ªÿ7Ó�OB˜?üM®‚ */
+	$"FF43 6555 9E7F 10A3 7B95 415D 41FF 20B3"            /* ÿCeUž..£{•A]Aÿ ³ */
+	$"8CB1 7302 0000 0000 584E AB14 398C A865"            /* Œ±s.....XN«.9Œ¨e */
+	$"5A7B 1650 52EB 8BCE 3E92 461D 071B 8F21"            /* Z{.PRë‹Î>’F...�! */
+	$"2CFF 4F5F FD2E 999E B77D A47D 61B4 2C01"            /* ,ÿO_ý.™ž·}¤}a´,. */
+	$"D397 493D CB48 AB27 EB4A 13A7 8C89 7F64"            /* Ó—I=ËH«'ëJ.§Œ‰.d */
+	$"6C08 FF21 9696 98C7 6248 1615 541F EC81"            /* l.ÿ!––˜ÇbH..T.ì� */
+	$"8E18 FAED 5257 3D01 2CBB 74C1 DA64 81A0"            /* Ž.úíRW=.,»tÁÚd�  */
+	$"39BF B272 4068 15E8 A44A 007C 732C D9DC"            /* 9¿²r@h.è¤J.|s,ÙÜ */
+	$"1CF8 4612 8611 A36D 67BC 6E6A EA14 9D87"            /* .øF.†.£mg¼njê.�‡ */
+	$"2962 C4B4 5442 9564 BFAA D0FB 991F 4288"            /* )bÄ´TB•d¿ªÐû™.Bˆ */
+	$"7CB2 2A41 333E 7827 5070 F3A6 67FF 7FFF"            /* |²*A3>x'Ppó¦gÿ.ÿ */
+	$"7601 CFFE E44B 4413 809B 3877 B59D BC19"            /* v.ÏþäKD.€›8wµ�¼. */
+	$"548F 0A5B C1E9 A8D7 6B5D 8EC8 8A1A BB3D"            /* T�Â[Áé¨×k]ŽÈŠ.»= */
+	$"3CD1 3139 57CF 9E94 00E9 CF6E 3830 3561"            /* <Ñ19WÏž”.éÏn805a */
+	$"8DE4 A59F FD1B 45CF C608 D0FD 5D48 485E"            /* �䥟ý.EÏÆ.Ðý]HH^ */
+	$"D5A3 30A5 F9EE 5D55 B9C2 E552 3A9F B087"            /* Õ£0¥ùî]U¹ÂåR:Ÿ°‡ */
+	$"FE87 5DBC 5E73 0F16 9221 2B0D F399 AB6F"            /* þ‡]¼^s..’!+.ó™«o */
+	$"9950 0000 0000 0000 0008 2444 88CE 3BBD"            /* ™P........$DˆÎ;½ */
+	$"CC78 4932 9C47 DEFA 74E7 91BF 9827 FF7B"            /* ÌxI2œGÞútç‘¿˜'ÿ{ */
+	$"77EB 9B1B 9F7F FDAB 6552 35A1 0C22 E9C6"            /* wë›.Ÿ.ý«eR5¡."éÆ */
+	$"42E3 FF7F FF7F E9FD A23B 2F7D 3ADD FC90"            /* Bãÿ.ÿ.éý¢;/}:Ýü� */
+	$"E4A1 F8B9 0560 0F86 D7FE 3F46 C953 2A03"            /* ä¡ø¹.`.†×þ?FÉS*. */
+	$"F1C7 F5AE D0C4 B743 EA67 B694 E47D 45CD"            /* ñÇõ®ÐÄ·Cêg¶”ä}EÍ */
+	$"6F92 178A E383 8B71 800E D9AF A55A F149"            /* o’.Šãƒ‹q€.Ù¯¥ZñI */
+	$"A838 5671 4C9A 8915 447A CDA9 C6B7 DD68"            /* ¨8VqLš‰.DzÍ©Æ·Ýh */
+	$"A5FB F404 CF63 A62E CC5E 89D3 FDB2 C841"            /* ¥ûô.Ïc¦.Ì^‰Óý²ÈA */
+	$"7A37 5B5D 5958 4B46 20B1 D389 5188 F9FE"            /* z7[]YXKF ±Ó‰Qˆùþ */
+	$"8FF1 D718 6C8C 3254 0000 0000 0000 0000"            /* �ñ×.lŒ2T........ */
+	$"0000 00A1 EBEC C33A 8622 D0FF 7FFF 7FFF"            /* ...¡ëìÃ:†"Ðÿ.ÿ.ÿ */
+	$"705D C7FE 49E7 01B7 A65D D5BC 2041 80B0"            /* p]ÇþIç.·¦]Õ¼ A€° */
+	$"89ED F68A A000 F438 EBD0 C908 0B67 414F"            /* ‰íöŠ .ô8ëÐÉ..gAO */
+	$"C8F1 4312 2EC8 05E6 CA19 184F FF5B BA24"            /* ÈñC..È.æÊ..Oÿ[º$ */
+	$"57E8 A6B4 FBD3 FF79 4D8E FF44 BC50 6938"            /* W覴ûÓÿyMŽÿD¼Pi8 */
+	$"137F FF7D 6251 8D1A 9B33 CF7E 0BCB EAD7"            /* ..ÿ}bQ�.›3Ï~.Ëê× */
+	$"2E0D EAE0 0003 0906 AA2B 66A8 C950 0000"            /* ..êà..Æ.ª+f¨ÉP.. */
+	$"0000 0000 0000 0000 0001 1E1F F600 1848"            /* ............ö..H */
+	$"4BF6 7A7C F92D 3E7A 437E 2254 51EB 4AF5"            /* Köz|ù->zC~"TQëJõ */
+	$"C6BF 442A 12CD 51FF 7FFE B8AE D0C4 B1D0"            /* Æ¿D*.ÍQÿ.þ¸®ÐıР*/
+	$"7CF7 019D A0ED 2CC4 01BC 1A94 212D 43EF"            /* |÷.� í,Ä.¼.”!-Cï */
+	$"1274 9B67 94D5 062D 5FCC E23C 4816 416B"            /* .t›g”Õ.-_Ìâ<H.Ak */
+	$"1540 59C2 1D35 213D A11C EE70 8D15 5394"            /* .@YÂ.5!=¡.îp�.S” */
+	$"53C6 29CF 4E19 F4CF 5B94 7FFF 7F8B 2813"            /* SÆ)ÏN.ôÏ[”.ÿ.‹(. */
+	$"3E95 DE81 30D0 3188 2A75 4F35 CB11 DDD5"            /* >•Þ�0Ð1ˆ*uO5Ë.ÝÕ */
+	$"7FFD A983 95A9 71E7 A7A3 7D3F F944 0A7E"            /* .ý©ƒ•©q秣}?ùDÂ~ */
+	$"24D9 966F 6B6A 0FD0 23AC 7000 0000 0000"            /* $Ù–okj.Ð#¬p..... */
+	$"0009 D4AF 9196 E5A4 B8AC 407F F9EE C709"            /* .ÆÔ¯‘–夸¬@.ùîÇÆ */
+	$"F927 08C3 CA6C 3A3A D90F E306 BCC4 6D6C"            /* ù'.ÃÊl::Ù.ã.¼Äml */
+	$"C7A9 F042 6F4C FDC9 60AB A087 6338 8F12"            /* Ç©ðBoLýÉ`« ‡c8�. */
+	$"4D29 D00C C575 C7B5 9FA4 E96C 1FA0 AAFB"            /* M)Ð.ÅuǵŸ¤él. ªû */
+	$"09E9 8DF9 1BE0 C62D 3C1D F55B DD77 A0FD"            /* Æé�ù.àÆ-<.õ[Ýw ý */
+	$"5C16 D959 BA08 0000 0000 0000 0145 AE01"            /* \.ÙYº........E®. */
+	$"712A 0E06 1212 70CD 94A8 0A2C 18F5 1E3B"            /* q*....pÍ”¨Â,.õ.; */
+	$"52FA C8F6 56F3 F7E4 69E6 54A0 3FF6 2487"            /* RúÈöVó÷äiæT ?ö$‡ */
+	$"C65F 0EFF 7F4F 8D07 C817 FE78 727D 3C75"            /* Æ_.ÿ.O�.È.þxr}<u */
+	$"E4C6 1003 FECF 3E7E 6252 08C0 4A83 50D7"            /* äÆ..þÏ>~bR.ÀJƒP× */
+	$"DADA 8602 5949 900F D2B6 D10D 2661 3014"            /* ÚÚ†.YI�.Ò¶Ñ.&a0. */
+	$"4541 17FF 2106 00DF AC82 0046 09BB A5AF"            /* EA.ÿ!..߬‚.FÆ»¥¯ */
+	$"CE51 0EBF F9AD 787A 907F 9F9A 628F E16B"            /* ÎQ.¿ù­xz�.Ÿšb�ák */
+	$"C015 137E 9C68 FCFA A817 FF7F DD6B FDB6"            /* À..~œhüú¨.ÿ.Ýký¶ */
+	$"3DA3 7C9D 3309 0B8A B551 C370 4401 CD7F"            /* =£|�3Æ.ŠµQÃpD.Í. */
+	$"7503 8425 E297 1B3F FF49 4FF8 3583 685A"            /* u.„%â—.?ÿIOø5ƒhZ */
+	$"B273 A7F7 CEBF F27E D78C 3E35 5332 152B"            /* ²s§÷οò~׌>5S2.+ */
+	$"033C C7FF 7B97 1AF0 F2A4 3C88 CC7B B96E"            /* .<Çÿ{—.ðò¤<ˆÌ{¹n */
+	$"65B3 533C F2F8 5E4B 6DBF 7D78 A316 310F"            /* e³S<òø^Km¿}x£.1. */
+	$"6B09 FD62 88D7 77FF 7447 524E C235 00A3"            /* kÆýbˆ×wÿtGRNÂ5.£ */
+	$"8F5A 4BEE D240 6154 C17C 2CC2 68F0 A959"            /* �ZKîÒ@aTÁ|,Âhð©Y */
+	$"2F12 9B74 7E8E 423F BB1D BC9A C75B C618"            /* /.›t~ŽB?».¼šÇ[Æ. */
+	$"19D1 C6CB 0A15 BD77 99BD 96D3 CC07 F5AC"            /* .ÑÆËÂ.½w™½–ÓÌ.õ¬ */
+	$"D2ED DE5E F19D 5CFC B2B0 5407 0386 32C6"            /* ÒíÞ^ñ�\ü²°T..†2Æ */
+	$"5F49 7BAD 3270 BF81 CF97 C934 7E23 7237"            /* _I{­2p¿�Ï—É4~#r7 */
+	$"727B 0FA2 6DB0 D717 8C73 B109 E089 AAC5"            /* r{.¢m°×.Œs±Æà‰ªÅ */
+	$"7D98 9061 2956 EA75 0135 E870 3430 4E9B"            /* }˜�a)Vêu.5èp40N› */
+	$"C76C D3D6 7EEB 83DB 9EEB C9A0 983D 1327"            /* ÇlÓÖ~ëƒÛžëÉ ˜=.' */
+	$"62D8 FD62 CA51 7135 80B0 ABFF 431B 9843"            /* bØýbÊQq5€°«ÿC.˜C */
+	$"68B4 A929 44E4 1F3E E3A1 22AA 5E87 579C"            /* h´©)Dä.>ã¡"ª^‡Wœ */
+	$"745B 9CA4 438C BFC2 9A1B 17BE BA75 06E4"            /* t[œ¤CŒ¿Âš..¾ºu.ä */
+	$"0108 698C E4F2 341C 24CC 7913 6237 ED48"            /* ..iŒäò4.$Ìy.b7íH */
+	$"E797 4D7A 0D5A D1EA ACDF F974 4F9F 9139"            /* ç—Mz.ZÑê¬ßùtOŸ‘9 */
+	$"6A87 3972 A1C8 0A2B 1E8B 6DB7 B811 4AB0"            /* j‡9r¡ÈÂ+.‹m·¸.J° */
+	$"EEE8 BB23 959C 239D 4165 DBED ACE4 F133"            /* îè»#•œ#�AeÛí¬äñ3 */
+	$"8276 40BB C447 29FE 3EB6 5BA4 A6D0 2441"            /* ‚v@»ÄG)þ>¶[¤¦Ð$A */
+	$"1431 8B2D 8BFD 96B7 C8C2 9F9B DFB9 2B06"            /* .1‹-‹ý–·ÈŸ›ß¹+. */
+	$"E191 00FF 7E4B 8281 D609 D163 B8CB AF9A"            /* á‘.ÿ~K‚�ÖÆÑc¸Ë¯š */
+	$"0995 7385 27FC 3C6A 5310 024D BAD1 8013"            /* Æ•s…'ü<jS..MºÑ€. */
+	$"8995 3DF4 FA80 FE12 8F5F 40E5 09E6 E7E8"            /* ‰•=ôú€þ.�_@åÆæçè */
+	$"C5E7 1309 3E97 E278 0228 1693 F565 F83E"            /* Åç.Æ>—âx.(.“õeø> */
+	$"4161 0037 E0AA D0CC 3AED 4E56 04E8 4456"            /* Aa.7àªÐÌ:íNV.èDV */
+	$"6E50 4626 C7E0 0790 014E 329B 0DDB D87D"            /* nPF&Çà.�.N2›.ÛØ} */
+	$"4532 6482 3F51 D651 3F62 D6EB 3BCA 75EB"            /* E2d‚?QÖQ?bÖë;Êuë */
+	$"5444 A42F 3CFB 4146 19FB 5376 876F 6BC1"            /* TD¤/<ûAF.ûSv‡okÁ */
+	$"B80B 7787 71DF 4CAA D70A 98BC 98E1 15A1"            /* ¸.w‡qßLª×˜¼˜á.¡ */
+	$"7996 F17F FF7A 91CF 350C FA04 5753 7ECB"            /* y–ñ.ÿz‘Ï5.ú.WS~Ë */
+	$"29F1 A4AD F335 59DB A580 EAA3 98AD FEB0"            /* )ñ¤­ó5YÛ¥€ê£˜­þ° */
+	$"275E BABE 6679 9AD4 B246 75F2 ECAA B042"            /* '^º¾fyšÔ²Fuò쪰B */
+	$"92C9 745E 1C58 58FF 2570 9228 4EAF 6F65"            /* ’Ét^.XXÿ%p’(N¯oe */
+	$"56F3 1D0C 85AA 9468 8000 0000 0101 3082"            /* Vó..…ª”h€.....0‚ */
+	$"08FD E30F FF75 70BF FCCA 2225 E5FC 3464"            /* .ýã.ÿup¿üÊ"%åü4d */
+	$"00CA 6C43 E833 80DE 2895 5F84 4B08 CEFA"            /* .ÊlCè3€Þ(•_„K.Îú */
+	$"AA94 EE33 24E7 CA20 A668 4717 FD5F F7F2"            /* ª”î3$çÊ ¦hG.ý_÷ò */
+	$"59E7 D6C6 6D0D 8E0F 1AC3 BBFA 3890 8ACB"            /* YçÖÆm.Ž..ûú8�ŠË */
+	$"9250 6D82 E892 D4B9 1F14 D987 9818 877A"            /* ’Pm‚è’Ô¹..Ù‡˜.‡z */
+	$"66F0 905A B088 D761 B529 F02A 6964 6C65"            /* fð�Z°ˆ×aµ)ð*idle */
+	$"8FB8 9A87 7771 9A12 C8A6 7F9C 9905 D643"            /* �¸š‡wqš.Ȧ.œ™.ÖC */
+	$"E554 91F5 0C26 4299 30C6 BC87 B38C 86FB"            /* åT‘õ.&B™0Ƽ‡³Œ†û */
+	$"ED50 C019 3822 52A8 97C6 1F49 176D FB8C"            /* íPÀ.8"R¨—Æ.I.mûŒ */
+	$"87B7 E37C 196E 3695 357A E2B8 FDE5 736E"            /* ‡·ã|.n6•5zâ¸ýåsn */
+	$"DF11 6026 3CD9 51CF 2A50 6F8A 53B0 0F16"            /* ß.`&<ÙQÏ*PoŠS°.. */
+	$"938B 745A F84D 571C A582 9723 90B4 49D7"            /* “‹tZøMW.¥‚—#�´I× */
+	$"B11D 7BA6 45C1 2AFA D519 A471 60A3 17A9"            /* ±.{¦EÁ*úÕ.¤q`£.© */
+	$"2C13 6E04 D58E 3F37 0115 E4AE F51C 1BA8"            /* ,.n.ÕŽ?7..ä®õ..¨ */
+	$"EF7F 4C9F 7B47 8C5A D1D6 CAC7 D416 D6D4"            /* ï.LŸ{GŒZÑÖÊÇÔ.ÖÔ */
+	$"7F05 9504 5685 0D6D E0E8 6809 9307 7864"            /* ..•.V….màèhÆ“.xd */
+	$"1A86 1BA6 A321 D08C 1B0C 0981 9395 6DC0"            /* .†.¦£!ÐŒ..Æ�“•mÀ */
+	$"C74F ECF7 CA1B FF4B 1896 BDBE 4876 8A4B"            /* ÇOì÷Ê.ÿK.–½¾HvŠK */
+	$"519F CC3C 7813 BE21 C40C B001 30F4 4FC7"            /* QŸÌ<x.¾!Ä.°.0ôOÇ */
+	$"B76C B9FA 26F6 38C8 116D B8F0 0B9D 818F"            /* ·l¹ú&ö8È.m¸ð.��� */
+	$"56F9 F934 AE60 71FD E583 8D07 A4A4 DE41"            /* Vùù4®`qýåƒ�.¤¤ÞA */
+	$"FB75 B83F 384B 11C9 CC5E CD9D FF4C 05A8"            /* ûu¸?8K.ÉÌ^Í�ÿL.¨ */
+	$"D59F 1E59 4797 FF7F DFD8 391C E8BA 72E2"            /* ÕŸ.YG—ÿ.ßØ9.èºrâ */
+	$"C1F8 9F5C 5317 01E3 EC2D 4120 97D2 BAEC"            /* ÁøŸ\S..ãì-A —Òºì */
+	$"DBB0 FF30 FC56 2E43 3716 1B7B A8CD 19AE"            /* Û°ÿ0üV.C7..{¨Í.® */
+	$"7FFF 7FF4 468B FF45 749B 3C67 EE31 1651"            /* .ÿ.ôF‹ÿEt›<gî1.Q */
+	$"17B2 B21C A982 A185 E8A3 03BC 2DCB C09A"            /* .²².©‚¡…è£.¼-ËÀš */
+	$"8522 64CF BB21 6955 068D F002 871B 05F3"            /* …"dÏ»!iU.�ð.‡..ó */
+	$"9F44 7384 D624 E1FA A24D 67C7 BC5E F7BF"            /* ŸDs„Ö$áú¢MgǼ^÷¿ */
+	$"59BC DC3C BE4B 1456 0C6F F2C1 0841 038D"            /* Y¼Ü<¾K.V.oòÁ.A.� */
+	$"723C 14FA 4F19 0AD4 1F88 0A1B FF14 3D93"            /* r<.úO.ÂÔ.ˆÂ.ÿ.=“ */
+	$"27AA 6E0B 4AA7 6A11 E06D 5D82 C930 1B53"            /* 'ªn.J§j.àm]‚É0.S */
+	$"0227 A9AA 253A 41E6 31D5 8B87 DC08 819B"            /* .'©ª%:Aæ1Õ‹‡Ü.�› */
+	$"E5EE EA0F 6AA0 0000 0006 9BC0 594E 0004"            /* åîê.j ....›ÀYN.. */
+	$"D326 312C 0364 8835 C4D7 5040 3724 3CD9"            /* Ó&1,.dˆ5Ä×P@7$<Ù */
+	$"B889 2E14 12BC F0AD 9D2E 326B 1654 5952"            /* ¸‰...¼ð­�.2k.TYR */
+	$"2B5F 1A9D 5403 C9C5 A731 1B3C 3443 783C"            /* +_.�T.Éŧ1.<4Cx< */
+	$"A459 248B BBC7 DEDC 74AD E2A1 D647 5047"            /* ¤Y$‹»ÇÞÜt­â¡ÖGPG */
+	$"AD17 15AF FF5C 88C4 025F 4361 3F83 BFC9"            /* ­..¯ÿ\ˆÄ._Ca?ƒ¿É */
+	$"FF6D 7E58 128D 33D7 7076 E73A 9CF6 76D8"            /* ÿm~X.�3×pvç:œövØ */
+	$"A0FF 2C44 2029 0B59 B427 3BDC 915B 87CF"            /*  ÿ,D ).Y´';Ü‘[‡Ï */
+	$"75D6 EC52 7793 6DFA A4E2 9E2D 7D25 FBC2"            /* uÖìRw“mú¤âž-}%û */
+	$"2028 DE78 D868 BEC5 E9D2 BFFA 8B12 9265"            /*  (ÞxØh¾ÅéÒ¿ú‹.’e */
+	$"B01D 92F7 F71E 8782 F1CD 4E98 B46E 6DA5"            /* °.’÷÷.‡‚ñÍN˜´nm¥ */
+	$"8825 F851 1CE9 9F21 D8E2 86EB BAF4 126F"            /* ˆ%øQ.éŸ!Øâ†ëºô.o */
+	$"9CB3 0144 009A 6F38 0919 9C1F D0CE D23C"            /* œ³.D.šo8Æ.œ.ÐÎÒ< */
+	$"C9DD 9273 D8F6 6733 6E5A 2E7A 635C 8723"            /* ÉÝ’sØög3nZ.zc\‡# */
+	$"6E04 1283 1A43 02CA 74E4 8000 0309 08DB"            /* n..ƒ.C.Êtä€..Æ.Û */
+	$"EF05 DC00 D116 0D58 1A69 2055 1BA0 D8DE"            /* ï.Ü.Ñ..X.i U. ØÞ */
+	$"34B6 EA40 CC06 C673 559A 75F2 9B58 C474"            /* 4¶ê@Ì.ÆsUšuò›XÄt */
+	$"DD4C AB9A 9E6D 653B FCDF 4F33 3707 105E"            /* ÝL«šžme;üßO37..^ */
+	$"DBCE D327 45FB C663 E1AF 375B B106 B0B8"            /* ÛÎÓ'EûÆcá¯7[±.°¸ */
+	$"26EE AE4B 538A CF74 588E 928B 58C7 2D93"            /* &î®KSŠÏtXŽ’‹XÇ-“ */
+	$"371E BC81 0ED0 9F2C 1A18 8DD7 7E65 4FBF"            /* 7.¼�.П,..�×~eO¿ */
+	$"511B 63A1 8F26 2A08 A4D3 2BF3 96E6 FC32"            /* Q.c¡�&*.¤Ó+ó–æü2 */
+	$"D457 8287 D843 6D19 2458 0EA4 AC8F 0512"            /* ÔW‚‡ØCm.$X.¤¬�.. */
+	$"831D D4CA 9BFF 5A6E 951A 5897 451F 750C"            /* ƒ.ÔÊ›ÿZn•.X—E.u. */
+	$"CAD4 89C1 94A7 4BFA 4030 4828 1E37 C049"            /* ÊÔ‰Á”§Kú@0H(.7ÀI */
+	$"34C4 54B1 1054 2645 14E5 6DFF 7FFF 7328"            /* 4ÄT±.T&E.åmÿ.ÿs( */
+	$"F1A4 AAA2 4FD2 507D 86D5 FF7F FA43 F49A"            /* ñ¤ª¢OÒP}†Õÿ.úCôš */
+	$"5049 0839 5964 8186 EE46 1867 158E 9E2C"            /* PI.9Yd�†îF.g.Žž, */
+	$"D618 8FF5 D416 6838 6187 9CF7 21BC DE1F"            /* Ö.�õÔ.h8a‡œ÷!¼Þ. */
+	$"F84F F4E9 ACDB ECD8 6CA6 6725 85B4 4049"            /* øOôé¬ÛìØl¦g%…´@I */
+	$"AA9E 4935 7E1F 54E7 B0D5 A026 B073 899B"            /* ªžI5~.Tç°Õ &°s‰› */
+	$"51C4 8C2E 483C B3BF 38A0 4BCF 2042 EE90"            /* QÄŒ.H<³¿8 KÏ Bî� */
+	$"4E1B 8C94 420F 99A7 9EA1 7D96 12A3 8C8D"            /* N.Œ”B.™§ž¡}–.£Œ� */
+	$"819B C97D C518 51CB 0D8A A7A1 7159 EB10"            /* �›É}Å.QË.Š§¡qYë. */
+	$"4A27 5CD0 0ED7 2688 5F74 CE10 DF6A 5B4F"            /* J'\Ð.×&ˆ_tÎ.ßj[O */
+	$"E370 A282 105D 2F43 6E74 6B07 05EC 880E"            /* ãp¢‚.]/Cntk..ìˆ. */
+	$"15AF 5118 9D27 327D 2552 9996 020B 2D9A"            /* .¯Q.�'2}%R™–..-š */
+	$"9AFC 6849 6068 6491 42FA 889C 7949 285A"            /* šühI`hd‘BúˆœyI(Z */
+	$"7FFE 5B6D DAF2 7FFF 772D E08E B9E4 65A3"            /* .þ[mÚò.ÿw-àŽ¹äe£ */
+	$"B49A DDC8 FF52 8DA3 B318 F84F F4E9 99ED"            /* ´šÝÈÿR�£³.øOôé™í */
+	$"48C4 CA7E BE77 2634 6A22 1FAD 4752 8D9B"            /* HÄÊ~¾w&4j".­GR�› */
+	$"B935 0449 1A27 9EAB B000 C242 3BB7 72B7"            /* ¹5.I.'ž«°.ÂB;·r· */
+	$"3ACC B41F 0AC9 CFFD 58DA D99F 498A 21CF"            /* :Ì´.ÂÉÏýXÚÙŸIŠ!Ï */
+	$"50B8 A155 9BB3 B3DA 13FE 251F 14F2 3431"            /* P¸¡U›³³Ú.þ%..ò41 */
+	$"6DBF 2774 3EFC 55BB 9CB3 40A4 CA00 A112"            /* m¿'t>üU»œ³@¤Ê.¡. */
+	$"3E83 51D4 9D13 DE0D F86D 3384 AAE7 9074"            /* >ƒQÔ�.Þ.øm3„ªç�t */
+	$"F7CF 4509 F99A 70B2 2E74 43C3 1363 021F"            /* ÷ÏEÆùšp².tCÃ.c.. */
+	$"6482 E471 22FA 6265 2DF9 C302 43F8 9053"            /* d‚äq"úbe-ùÃ.Cø�S */
+	$"0AE9 15A2 28D4 FD7C 05AF C7B8 26D5 7C0F"            /* Âé.¢(Ôý|.¯Ç¸&Õ|. */
+	$"22E0 4735 518D BE4B 4E83 1EF8 3FFA BA23"            /* "àG5Q�¾KNƒ.ø?úº# */
+	$"3AE8 F76B 1D92 2038 64C1 EA73 30FC CE72"            /* :è÷k.’ 8dÁês0üÎr */
+	$"0CA5 6697 157E 55C4 8BAE E703 6FF5 F743"            /* .¥f—.~UÄ‹®ç.oõ÷C */
+	$"B456 C85F 3BFF 2629 95B7 02F4 F580 A49B"            /* ´VÈ_;ÿ&)•·.ôõ€¤› */
+	$"1587 2316 D131 66C1 C6DB F3DC C409 D801"            /* .‡#.Ñ1fÁÆÛóÜÄÆØ. */
+	$"E2DA 30B6 73FD 99EF AA26 25D7 DF07 FBEB"            /* âÚ0¶sý™ïª&%×ß.ûë */
+	$"094E 2E8E BD11 3C49 81BA E6BE 7666 ECBE"            /* ÆN.Ž½.<I�ºæ¾vfì¾ */
+	$"59D2 4ACC B4CE 3FAD 2173 25CB E42F 37B8"            /* YÒJÌ´Î?­!s%Ëä/7¸ */
+	$"F3CC 79EF 695C 10F4 0381 2D14 1B0F D632"            /* óÌyïi\.ô.�-...Ö2 */
+	$"8A1E 9C29 F617 6A4B 204E A147 C08D 1AA5"            /* Š.œ)ö.jK N¡GÀ�.¥ */
+	$"7418 DED9 DE83 A555 A75B AB00 C650 247F"            /* t.ÞÙÞƒ¥U§[«.ÆP$. */
+	$"0222 5558 731B 54DB 14F6 3A0E 1FAD A8D8"            /* ."UXs.TÛ.ö:..­¨Ø */
+	$"F327 DC8F AF3F 630B 3BA9 7933 8D30 458C"            /* ó'Ü�¯?c.;©y3�0EŒ */
+	$"4C2F 6E3A 0A64 DDC5 926A 71CB 2347 EE4D"            /* L/n:ÂdÝÅ’jqË#GîM */
+	$"647B D94D BE24 7F62 6A14 EBE2 696F 8735"            /* d{ÙM¾$.bj.ëâio‡5 */
+	$"A96F E268 6912 A4A9 3254 0293 CB09 0DC0"            /* ©oâhi.¤©2T.“ËÆ.À */
+	$"206B EB7B F6B9 0643 5E74 4F2C 555A AE2D"            /*  kë{ö¹.C^tO,UZ®- */
+	$"B16B 7FA3 8ADE 7EAC 764F 9A20 BC94 05F1"            /* ±k.£ŠÞ~¬vOš ¼”.ñ */
+	$"9AAC 0118 36B8 6B30 D696 6E84 EEC2 5342"            /* š¬..6¸k0Ö–n„îÂSB */
+	$"03A8 EFD3 CB37 D50D F676 35DB AD6C 280A"            /* .¨ïÓË7Õ.öv5Û­l( */
+	$"DB04 D23A 0922 A2E3 5F45 EBD1 5C49 F6AA"            /* Û.Ò:Æ"¢ã_EëÑ\Iöª */
+	$"4579 1BA2 D94E D3F0 7A7E C24E 79B0 5D24"            /* Ey.¢ÙNÓðz~ÂNy°]$ */
+	$"B98E 23E7 4C4F 54D9 A3CE 389F 63F6 2426"            /* ¹Ž#çLOTÙ£Î8Ÿcö$& */
+	$"7087 D921 86D6 709F 768D 5684 BB90 47B7"            /* p‡Ù!†ÖpŸv�V„»�G· */
+	$"AC32 98D7 E247 3668 E954 8105 EE44 AF58"            /* ¬2˜×âG6héT�.îD¯X */
+	$"13FF 573A 9F89 06C9 FB77 277E 08C9 09E9"            /* .ÿW:Ÿ‰.Éûw'~.ÉÆé */
+	$"B180 F96E C5AB 1E5D 3029 E229 CE1B B2AD"            /* ±€ùnÅ«.]0)â)Î.²­ */
+	$"BA11 DD98 0D9C 4C45 66DD 8553 3BA2 6F5B"            /* º.ݘ.œLEfÝ…S;¢o[ */
+	$"699B CEF3 48A7 6C31 63E6 E189 9C68 B9EC"            /* i›ÎóH§l1cæቜh¹ì */
+	$"A663 411F EBCB 41AB 8F7E 7EAD 87DA 5BF3"            /* ¦cA.ëËA«�~~­‡Ú[ó */
+	$"AAC9 975B AC1F 712B F7ED DEBD 04C3 B85A"            /* ªÉ—[¬.q+÷íÞ½.øZ */
+	$"470D D74A B91D 0180 7BAB 4088 5671 6268"            /* G.×J¹..€{«@ˆVqbh */
+	$"5B4A 54FE C179 1600 7677 830B 0E81 EEB4"            /* [JTþÁy..vwƒ..�î´ */
+	$"056E 79FF 8251 AB20 A6BC 15A5 E71F 7D4A"            /* .nyÿ‚Q« ¦¼.¥ç.}J */
+	$"2F6E 951A DE36 7A81 C704 9A4A F239 E1DC"            /* /n•.Þ6z�Ç.šJò9áÜ */
+	$"FF6C DE49 B4C8 F6C1 F764 8D19 4686 DFC2"            /* ÿlÞI´ÈöÁ÷d�.F†ß */
+	$"5C72 4A52 9784 F974 DCA4 A177 21DA 9869"            /* \rJR—„ùtܤ¡w!Ú˜i */
+	$"80A4 5BC6 FD54 A56B C7B1 4705 3A32 C896"            /* €¤[ÆýT¥kDZG.:2È– */
+	$"4539 25E5 90CC F228 B7F9 ADA5 CC2C 59CA"            /* E9%å�Ìò(·ù­¥Ì,YÊ */
+	$"D14D 4B86 9CC0 D367 7EF5 DB6D C2E1 06DB"            /* ÑMK†œÀÓg~õÛmÂá.Û */
+	$"58BC 0D97 DCFE 3CB1 EA45 C36F 1B60 83C9"            /* X¼.—Üþ<±êEÃo.`ƒÉ */
+	$"663F B883 83BA A69F 2653 0747 18C7 6D20"            /* f?¸ƒƒº¦Ÿ&S.G.Çm  */
+	$"F2C7 6E01 47DA AB9D 2D83 D5CE 1E9C 779A"            /* òÇn.GÚ«�-ƒÕÎ.œwš */
+	$"5FAE 6015 63DE 317A EFCA 7142 F3F8 A7E1"            /* _®`.cÞ1zïÊqBóø§á */
+	$"F739 60AB DF24 41BF EB6C AF15 7223 E56C"            /* ÷9`«ß$A¿ël¯.r#ål */
+	$"8D61 D9D1 C61F 8F8E 8435 6452 C45A 917B"            /* �aÙÑÆ.�Ž„5dRÄZ‘{ */
+	$"0856 B8BA 14E2 0A77 ABA0 E605 2E39 63EA"            /* .V¸º.âÂw« æ..9cê */
+	$"E7F5 4804 6535 7672 575F 37EA 9E69 1A1C"            /* çõH.e5vrW_7êži.. */
+	$"E380 CB7D C109 2D50 73EF 4119 54BE CBFE"            /* ã€Ë}ÁÆ-PsïA.T¾Ëþ */
+	$"4552 74A1 3E73 C457 1436 9DFF 3C25 8231"            /* ERt¡>sÄW.6�ÿ<%‚1 */
+	$"2C25 ACE4 F084 E842 60E8 355D 22BE 6FEE"            /* ,%¬äð„èB`è5]"¾oî */
+	$"93F9 DDE6 DAED 4E44 545A FE4E 5EA4 0487"            /* “ùÝæÚíNDTZþN^¤.‡ */
+	$"36F1 52AF 8683 2DE8 F30B 72DE E807 2068"            /* 6ñR¯†ƒ-èó.rÞè. h */
+	$"742B 7262 BF7E 516C D41F CA56 9DE1 E3B8"            /* t+rb¿~QlÔ.ÊV�á㸠*/
+	$"8D72 2993 C073 516D A343 DDE0 984D F06A"            /* �r)“ÀsQm£CÝà˜Mðj */
+	$"CD83 D22D C161 30D7 2E9A FED4 4E85 5D2E"            /* ̓Ò-Áa0×.šþÔN…]. */
+	$"CF72 2181 7F23 BC37 FF83 C30D 43E0 DBC7"            /* Ïr!�.#¼7ÿƒÃ.CàÛÇ */
+	$"A277 B4D9 4E68 1FB1 AF7B 6D8B 8F43 2A1B"            /* ¢w´ÙNh.±¯{m‹�C*. */
+	$"9FE4 6CCC E826 C4AA 96C9 98A9 4D3B 981F"            /* ŸälÌè&Ī–ɘ©M;˜. */
+	$"8786 8633 89B0 2B42 4266 BC27 0098 D2B3"            /* ‡††3‰°+BBf¼'.˜Ò³ */
+	$"E8E4 0D2C 6E14 D34D 3613 4568 4A1E 8E5E"            /* èä.,n.ÓM6.EhJ.Ž^ */
+	$"E328 D89C 85D3 D8C2 C15B 3533 989F F015"            /* ã(Øœ…ÓØÂÁ[53˜Ÿð. */
+	$"1B49 871D 031B 2DBE D49E 880D A557 0694"            /* .I‡...-¾Ôžˆ.¥W.” */
+	$"60C3 47A1 CD2A 961B F73C 94A3 6B17 4268"            /* `ÃG¡Í*–.÷<”£k.Bh */
+	$"F766 81DC 33BC 8C1D 5571 D2D7 FB1C 9378"            /* ÷f�Ü3¼Œ.UqÒ×û.“x */
+	$"01B7 BDCC 5DD0 9171 5FA1 50DA 7EBF 1586"            /* .·½Ì]Бq_¡PÚ~¿.† */
+	$"FA82 9E6F CBE4 0977 9C9C 2373 E789 5A3E"            /* ú‚žoËäÆwœœ#sç‰Z> */
+	$"8743 EB0E ED13 7955 DB28 2874 8065 2078"            /* ‡Cë.í.yUÛ((t€e x */
+	$"97A7 6C13 2283 729A CCF9 E449 A627 7652"            /* —§l."ƒršÌùäI¦'vR */
+	$"E821 2F1F 574E 6887 1830 6E01 5A8D 02FB"            /* è!/.WNh‡.0n.Z�.û */
+	$"DB61 8EEF 4E08 B607 26FA 2B4C FF47 38FE"            /* ÛaŽïN.¶.&ú+LÿG8þ */
+	$"9B7C A3E4 DB46 F898 CFE9 8F3C 8717 2975"            /* ›|£äÛFø˜Ïé�<‡.)u */
+	$"9BA2 582E 86D1 D882 C127 EFD7 E71A B5DD"            /* ›¢X.†ÑØ‚Á'ï×ç.µÝ */
+	$"7772 6391 2722 2884 AA0F 9C72 9A96 F4F8"            /* wrc‘'"(„ª.œrš–ôø */
+	$"BFF8 869A FD00 3B41 A8C7 DCD0 2834 270C"            /* ¿ø†šý.;A¨ÇÜÐ(4'. */
+	$"B93C 8702 5B16 8A32 0289 979B 0A35 3A7B"            /* ¹<‡.[.Š2.‰—›Â5:{ */
+	$"5870 6189 03C2 DD00 FAB2 B137 AB93 3EF5"            /* Xpa‰.ÂÝ.ú²±7«“>õ */
+	$"24E3 1FE1 A206 963E 1344 FE12 285A 5C52"            /* $ã.á¢.–>.Dþ.(Z\R */
+	$"692E D315 6C73 2CBE 7ADC 81BC EBC8 13EA"            /* i.Ó.ls,¾zÜ�¼ëÈ.ê */
+	$"796B 6056 E9E7 D971 6E09 7086 252C 6A19"            /* yk`VéçÙqnÆp†%,j. */
+	$"7351 153D F4C4 FE01 6235 917F B203 171A"            /* sQ.=ôÄþ.b5‘.²... */
+	$"1822 B42B 9226 D163 5572 7E7E C508 BEBA"            /* ."´+’&ÑcUr~~Å.¾º */
+	$"D0D2 1C24 8D62 565D C183 F78D 4726 0541"            /* ÐÒ.$�bV]Áƒ÷�G&.A */
+	$"F829 10C7 1B21 E59C C4E5 7688 6268 FABC"            /* ø).Ç.!åœÄåvˆbhú¼ */
+	$"C0B9 6C02 8820 3F44 54A7 8C83 F14F 61B8"            /* À¹l.ˆ ?DT§ŒƒñOa¸ */
+	$"707C AB32 9D59 F01E D18A 37FC 40F9 5C59"            /* p|«2�Yð.ÑŠ7ü@ù\Y */
+	$"EEA8 E442 FDC8 CA73 970F 6EE0 1348 AC8E"            /* î¨äBýÈÊs—.nà.H¬Ž */
+	$"9D65 4DA9 2820 AEDB A7F3 C1B4 8E3F 8780"            /* �eM©( ®Û§óÁ´Ž?‡€ */
+	$"8DA9 F7D9 F116 DD30 778E 4FB6 49D3 AFE8"            /* �©÷Ùñ.Ý0wŽO¶IÓ¯è */
+	$"74B1 EB63 92B8 4210 3B22 3613 6784 41A2"            /* t±ëc’¸B.;"6.g„A¢ */
+	$"5953 1EFF 16A9 1769 9852 73D0 B6C2 3523"            /* YS.ÿ.©.i˜RsжÂ5# */
+	$"854B 1247 531D 47C5 7AFC 1B6B F0C4 2E2F"            /* …K.GS.GÅzü.kðÄ./ */
+	$"6C60 82C9 9C4D 2FAD 25A5 BEC6 8590 7388"            /* l`‚ÉœM/­%¥¾Æ…�sˆ */
+	$"5D15 9A65 E013 D48B 7D9C 34B2 A617 75A8"            /* ].šeà.Ô‹}œ4²¦.u¨ */
+	$"8E8E 2D91 1AEC 26D5 8B9C D03C A02A A829"            /* ŽŽ-‘.ì&Õ‹œÐ< *¨) */
+	$"738D 9A4E 8F31 82A9 39B7 7CFE D412 810E"            /* s�šN�1‚©9·|þÔ.�. */
+	$"1372 6D79 8D49 BAC1 9FFB 5D52 56AD 488F"            /* .rmy�IºÁŸû]RV­H� */
+	$"4E1D A232 7348 1FE2 483F AB9F A23C 0997"            /* N.¢2sH.âH?«Ÿ¢<Æ— */
+	$"678D 1AB7 7F66 8927 7DED 2A66 E03B 05C9"            /* g�.·.f‰'}í*fà;.É */
+	$"0420 66A2 E0AE E1B9 259E 64C9 FF0E A7C7"            /* . f¢à®á¹%ždÉÿ.§Ç */
+	$"5E9D 69F4 DD50 394C 344E 9DA9 6BCA 3D9F"            /* ^�iôÝP9L4N�©kÊ=Ÿ */
+	$"8FA9 C156 3248 2310 8AB9 6131 B94F FF36"            /* �©ÁV2H#.Š¹a1¹Oÿ6 */
+	$"DF00 9E80 5713 E9AD 3B07 879E C876 E063"            /* ß.ž€W.é­;.‡žÈvàc */
+	$"38D8 2776 3081 5810 1760 927C D93C EE88"            /* 8Ø'v0�X..`’|Ù<îˆ */
+	$"518B 755A EBF1 B276 C65B 98DD 1421 8AA1"            /* Q‹uZëñ²vÆ[˜Ý.!Š¡ */
+	$"27D2 A8B2 5E3E B7B7 8F73 CDCB 9896 D80F"            /* 'Ò¨²^>··�s͢–Ø. */
+	$"1D50 2E28 4F54 26A9 E68F 822C 3031 0A5B"            /* .P.(OT&©æ�‚,01Â[ */
+	$"213A 8ED8 B1B8 C32C F5EF 6784 3641 A888"            /* !:ŽØ±¸Ã,õïg„6A¨ˆ */
+	$"1AF9 941B E9B2 42C0 D9BE AAD7 2727 9E13"            /* .ù”.é²BÀÙ¾ª×''ž. */
+	$"284F A530 1F62 679B 7860 E677 9E24 3663"            /* (O¥0.bg›x`æwž$6c */
+	$"E7D1 E4B5 D37B C274 9ECB CFA2 CC95 8A75"            /* çÑäµÓ{ÂtžËϢ̕Šu */
+	$"0C3A FB7D F074 1433 5EC7 1FC4 330E F221"            /* .:û}ðt.3^Ç.Ä3.ò! */
+	$"AE39 4A04 097F 4B21 27CD C193 39CB 3AB2"            /* ®9J.Æ.K!'ÍÁ“9Ë:² */
+	$"0B6E D8E0 54EA 0F75 15F9 D75D 0D82 624D"            /* .nØàTê.u.ù×].‚bM */
+	$"7D19 8E11 1AD0 764F CEA8 F0FE 2913 6841"            /* }.Ž..ÐvOΨðþ).hA */
+	$"89B8 CA62 C997 34B9 5950 4842 4F13 1ACD"            /* ‰¸ÊbÉ—4¹YPHBO..Í */
+	$"39AD 30CA 4ED2 A17D 0B09 206B 9426 EF50"            /* 9­0ÊNÒ¡}.Æ k”&ïP */
+	$"63C6 386E 74BB BDE0 420F 6154 5260 E1A2"            /* cÆ8nt»½àB.aTR`ᢠ*/
+	$"8546 3192 76D1 1F38 268E 7AC6 049F 321D"            /* …F1’vÑ.8&ŽzÆ.Ÿ2. */
+	$"CB51 35C7 067C 961B DA2F 4BCB E065 A8DB"            /* ËQ5Ç.|–.Ú/KËàe¨Û */
+	$"16C9 1F05 ABAF 93FF 333A F049 3161 6838"            /* .É..«¯“ÿ3:ðI1ah8 */
+	$"6E1A FEF2 564C 3F48 3800 BC9C F009 AF34"            /* n.þòVL?H8.¼œðƯ4 */
+	$"2241 15D4 764F 4764 CEDF 6D7D 2E9C 8141"            /* "A.ÔvOGdÎßm}.œ�A */
+	$"1E00 E109 D827 DDAA A47C 2854 9229 8998"            /* ..áÆØ'ݪ¤|(T’)‰˜ */
+	$"9175 1FFB 496B 36C7 3695 3631 390B 06E6"            /* ‘u.ûIk6Ç6•619..æ */
+	$"EB0D 3BA7 F1BE A2FF 6D3A 9FB6 FCFD ADEF"            /* ë.;§ñ¾¢ÿm:Ÿ¶üý­ï */
+	$"EDBA 3FDB 632F EDB1 BF6D BE7E DB9F 97ED"            /* íº?Ûc/í±¿m¾~ÛŸ—í */
+	$"45FD AB93 F6E8 7FED A7F7 DAC3 FC34 6F43"            /* Eý«“öè.í§÷ÚÃü4oC */
+	$"E1DB 5507 762F DB7E 5F51 DDF5 1DFE DD07"            /* áÛU.v/Û~_QÝõ.þÝ. */
+	$"E1FD A67F B4E6 7EDB 8BF6 AE3F B6BC D3E4"            /* áý¦.´æ~Û‹ö®?¶¼Óä */
+	$"D00B 0F87 A0FF 2AC3 3F6D 84F8 7475 99F2"            /* Ð..‡ ÿ*Ã?m„øtu™ò */
+	$"F382 BE95 100F 8FEE C1C8 D086 E345 E973"            /* 󂾕..�îÁÈІãEés */
+	$"0FE4 06B6 7813 7115 B8D0 D91B C698 D10D"            /* .ä.¶x.q.¸ÐÙ.ƘÑ. */
+	$"A370 844F 9330 E047 0201 F880 D146 6522"            /* £p„O“0àG..ø€ÑFe" */
+	$"8E52 12DE 3D1A 9231 5315 682E 4706 8685"            /* ŽR.Þ=.’1S.h.G.†… */
+	$"DA39 C538 9828 7ED0 714F 3E27 532A 3840"            /* Ú9Å8˜(~ÐqO>'S*8@ */
+	$"C912 3E46 8205 3243 7835 7284 12D6 CCF5"            /* É.>F‚.2Cx5r„.ÖÌõ */
+	$"36AF 0975 8A27 4F44 3857 B5A3 160D 1391"            /* 6¯ÆuŠ'OD8Wµ£...‘ */
+	$"8005 2453 86CB 51B3 E493 EA9C 707F 7047"            /* €.$S†ËQ³ä“êœp.pG */
+	$"1DA8 1386 91D1 6105 7D84 1563 FC52 D5D3"            /* .¨.†‘Ña.}„.cüRÕÓ */
+	$"EDA7 D4A0 4AC1 BB4E 49D6 62F4 CA92 CE8E"            /* í§Ô JÁ»NIÖbôÊ’ÎŽ */
+	$"8DE0 84DC 418D ACE2 71AD 9206 3C98 3281"            /* �à„ÜA�¬âq­’.<˜2� */
+	$"104E A1F2 8982 6ED6 223E B67B BE6A C51F"            /* .N¡ò‰‚nÖ">¶{¾jÅ. */
+	$"4BF8 6C35 B6A4 5EC8 87BB 4834 7CF3 16AC"            /* Køl5¶¤^ȇ»H4|ó.¬ */
+	$"2453 B3DA 3503 94D6 2E70 2B6F 975E 21DB"            /* $S³Ú5.”Ö.p+o—^!Û */
+	$"F409 0368 9A2E DFB2 7A4B 9A6F 4165 1173"            /* ôÆ.hš.ß²zKšoAe.s */
+	$"A53E 329A 7925 FB80 9664 2C09 A9E5 715C"            /* ¥>2šy%û€–d,Æ©åq\ */
+	$"E42F 8E14 EC68 05A8 D565 53C2 9C98 86A2"            /* ä/Ž.ìh.¨ÕeSÂœ˜†¢ */
+	$"2C2D 6443 A1D0 A619 2320 6CD3 FE48 8006"            /* ,-dC¡Ð¦.# lÓþH€. */
+	$"FC0F 3690 DF76 1FD8 2E16 0705 D91F EEBE"            /* ü.6�ßv.Ø....Ù.î¾ */
+	$"E961 32B9 E252 4F0E EE4A 6F73 AEBB 014A"            /* éa2¹âRO.îJos®».J */
+	$"8F45 1551 9123 7C3A 13F8 1B57 EB6A 0AFB"            /* �E.Q‘#|:.ø.WëjÂû */
+	$"9AE9 65F5 9FDE 5F1C 7C23 84F1 6DCD CC52"            /* šéeõŸÞ_.|#„ñmÍÌR */
+	$"97DD 03E6 C571 0C23 F06B 9F21 2E2C 79D5"            /* —Ý.æÅq.#ðkŸ!.,yÕ */
+	$"1827 1436 E6FB C5FB BA11 617B 9B32 3DCD"            /* .'.6æûÅûº.a{›2=Í */
+	$"B0AD AA8F 53D0 2F20 849C D667 9436 A677"            /* °­ª�SÐ/ „œÖg”6¦w */
+	$"38C9 1B5A 26E2 B4D4 29BB 2D9E 56D4 652D"            /* 8É.Z&â´Ô)»-žVÔe- */
+	$"9A12 FC7E FBD5 0075 3EC9 64FE D0CE 06A2"            /* š.ü~ûÕ.u>ÉdþÐÎ.¢ */
+	$"B63F 8731 DB8A 6917 26EA CCFC C1E6 10AA"            /* ¶?‡1ÛŠi.&êÌüÁæ.ª */
+	$"704E 20EA 7518 0416 6BBE 2867 9470 9FE6"            /* pN êu...k¾(g”pŸæ */
+	$"3D2A D178 6CD1 0B7D E518 4682 FC48 EA03"            /* =*ÑxlÑ.}å.F‚üHê. */
+	$"EFA0 ADEE B643 CDFD 796D C309 E13B 9DD3"            /* ï ­î¶CÍýymÃÆá;�Ó */
+	$"82CC 1237 8D6B 9CB9 0438 AF1A 6190 136E"            /* ‚Ì.7�kœ¹.8¯.a�.n */
+	$"A170 6109 4BA8 FD0B 4C10 DE61 71A9 A5FF"            /* ¡paÆK¨ý.L.Þaq©¥ÿ */
+	$"5AD1 3895 15D0 912A BC62 5344 A7FD 7B9B"            /* ZÑ8•.Б*¼bSD§ý{› */
+	$"0360 8C71 DD04 20C7 4685 E6B7 7941 7BD7"            /* .`ŒqÝ. ÇF…æ·yA{× */
+	$"DBBB 3F61 742B D692 AD3D B778 6442 3DD1"            /* Û»?at+Ö’­=·xdB=Ñ */
+	$"A97E 1312 9AF4 05C1 7B33 9FE2 B3F5 D16C"            /* ©~..šô.Á{3Ÿâ³õÑl */
+	$"875D 7109 13EC BB96 0664 DF60 1958 8DE5"            /* ‡]qÆ.ì»–.dß`.X�å */
+	$"5B3F 3E75 9D21 0415 CE9C 3172 87C7 FF05"            /* [?>u�!..Îœ1r‡Çÿ. */
+	$"F787 4F14 E63B 4DCE 247D B3A3 475C 5336"            /* ÷‡O.æ;MÎ$}³£G\S6 */
+	$"C794 AF23 6415 68C6 B893 1B16 8C81 3F43"            /* Ç”¯#d.hƸ“..Œ�?C */
+	$"C455 6EB8 8D5A 6919 4C3A D980 BFB1 3699"            /* ÄUn¸�Zi.L:Ù€¿±6™ */
+	$"C790 C7D1 7B05 12AA 803A 172B DEF2 00CC"            /* Ç�ÇÑ{..ª€:.+Þò.Ì */
+	$"FF38 62C8 1815 1D3A F60D 2B9B 87A0 05C5"            /* ÿ8bÈ...:ö.+›‡ .Å */
+	$"3587 0181 8754 06D7 2CFC 78B8 0C65 D5BC"            /* 5‡.�‡T.×,üx¸.eÕ¼ */
+	$"2903 C07C 0631 A0B9 E94E 192F DE4B 4924"            /* ).À|.1 ¹éN./ÞKI$ */
+	$"A4F0 BB9A 49C5 B751 38EB 7289 9806 FC5C"            /* ¤ð»šIÅ·Q8ër‰˜.ü\ */
+	$"D822 ED93 CA92 14B6 5056 017F 7826 CDE1"            /* Ø"í“Ê’.¶PV..x&Íá */
+	$"8401 9F6C A7F7 4AD5 E86F FDC3 05AF 6AE3"            /* „.Ÿl§÷JÕèoýÃ.¯jã */
+	$"5EED 07E3 E5ED 7EE7 FB97 0B99 E191 605B"            /* ^í.ãåí~çû—.™á‘`[ */
+	$"955A 6A3C 33C6 2BB8 9562 0E38 09C1 1ED9"            /* •Zj<3Æ+¸•b.8ÆÁ.Ù */
+	$"8914 73AF E9AA 7B2F 214E 7EEA 98E8 B976"            /* ‰.s¯éª{/!N~ê˜è¹v */
+	$"E058 E0B5 6DB4 5B1C F212 2C8E 0AE5 7100"            /* àXàµm´[.ò.,ŽÂåq. */
+	$"BC1E 84CD 0598 7CF9 EA4E 1E96 2B4A DE9E"            /* ¼.„Í.˜|ùêN.–+JÞž */
+	$"6CE9 E79B 0336 9059 E109 DF83 A2AE 9E74"            /* léç›.6�YáÆ߃¢®žt */
+	$"5BB1 0236 590C 66CD 0658 ECE5 50A2 EDDD"            /* [±.6Y.fÍ.XìåP¢íÝ */
+	$"D7BB DAF7 548B 7F21 2A40 7821 FDA2 62B6"            /* ×»Ú÷T‹.!*@x!ý¢b¶ */
+	$"C862 B0B2 96CF 27D5 EC9D F5C8 42D8 F42A"            /* Èb°²–Ï'Õì�õÈBØô* */
+	$"5962 F21A D191 6744 1AE2 64B4 6744 A1B2"            /* Ybò.Ñ‘gD.âd´gD¡² */
+	$"7625 FF0D F0CF A1F8 3273 C4B8 FCCE C2BC"            /* v%ÿ.ðÏ¡ø2sĸüμ */
+	$"EDD5 F0C6 765F 2446 5EF5 2195 04EE C94B"            /* íÕðÆv_$F^õ!•.îÉK */
+	$"C9C2 4F82 0D0F 6034 3560 64A8 C372 4E17"            /* ÉÂO‚..`45`d¨ÃrN. */
+	$"D4F6 B2DC 2162 A6DC 9B35 5F36 628E EA58"            /* Ôö²Ü!b¦Ü›5_6bŽêX */
+	$"B2EF D0B8 79FF 3F60 39DC 34C9 8DD1 C7DA"            /* ²ïиyÿ?`9Ü4É�ÑÇÚ */
+	$"BFFD 9220 B977 42CD 1F4E 00C7 1A7B F29F"            /* ¿ý’ ¹wBÍ.N.Ç.{òŸ */
+	$"9738 8D5E 3E5F BA1F D4BD 0592 2006 1216"            /* —8�^>_º.Ô½.’ ... */
+	$"D478 DE72 171A A49D 9C4A 0691 CD59 6FB3"            /* ÔxÞr..¤�œJ.‘ÍYo³ */
+	$"F3C5 B3CD DCC8 5794 133C 85B3 176A 0C6A"            /* óųÍÜÈW”.<…³.j.j */
+	$"323E C74F 7CE3 4042 38AB E9CA 5700 E39B"            /* 2>ÇO|ã@B8«éÊW.ã› */
+	$"26D3 62B7 59F8 966D A789 35AA C72D 9943"            /* &Ób·Yø–m§‰5ªÇ-™C */
+	$"C884 2E53 30B3 D351 EFCC 6BF8 9889 8AB6"            /* È„.S0³ÓQïÌkø˜‰Š¶ */
+	$"E284 F5A4 64BD F89F 98A4 8082 6292 48EB"            /* â„õ¤d½øŸ˜¤€‚b’Hë */
+	$"2039 4A80 D5D7 BEFC 2DC1 69A9 F484 9B4E"            /*  9J€Õ×¾ü-Ái©ô„›N */
+	$"94C9 6E87 31A6 6D4E 23DB 77A9 37D5 CEE9"            /* ”Én‡1¦mN#Ûw©7ÕÎé */
+	$"10B5 22DB 58B2 3DFB 973A E321 F02A 2985"            /* .µ"ÛX²=û—:ã!ð*)… */
+	$"AE7E F964 9A23 4B8D 90FD 75F4 9944 3CEB"            /* ®~ùdš#K��ýuô™D<ë */
+	$"C5C5 B0BA DA1C AA0A B59A EFCA 903A 972B"            /* ÅÅ°ºÚ.ªÂµšïÊ�:—+ */
+	$"10E9 2A66 2BAB 3E63 8312 E494 A82C AEE8"            /* .é*f+«>cƒ.䔨,®è */
+	$"DE3B 902F 4DE5 A934 7FA5 59D8 B355 75C7"            /* Þ;�/Må©4.¥YسUuÇ */
+	$"DC51 6208 6D60 DE89 F04A F698 FC35 5341"            /* ÜQb.m`Þ‰ðJö˜ü5SA */
+	$"A8C7 894B 5E8F 0638 0F21 36AB 23FF 37BF"            /* ¨Ç‰K^�.8.!6«#ÿ7¿ */
+	$"CA6E C0CE 1C93 9BB1 FEA7 49E8 9BA5 7F32"            /* ÊnÀÎ.“›±þ§I蛥.2 */
+	$"4C9D C8BA 821C 1E07 F277 BE63 241C D5F6"            /* L�Ⱥ‚...òw¾c$.Õö */
+	$"07CB 7A98 E51E B0FC B312 223C 21BF 5DEE"            /* .Ëz˜å.°ü³."<!¿]î */
+	$"0229 A0EE 8B90 5918 5910 F6A6 EEB6 503D"            /* .) î‹�Y.Y.ö¦î¶P= */
+	$"8E76 A3B6 E583 FEFF 5B3D F804 F6EE 956E"            /* Žv£¶åƒþÿ[=ø.öî•n */
+	$"FEE7 D95F 9D05 AE0B 4926 52B4 23C3 D17A"            /* þçÙ_�.®.I&R´#ÃÑz */
+	$"FC0F CC41 1264 0956 8CA2 6A30 C0D0 275F"            /* ü.ÌA.dÆVŒ¢j0ÀÐ'_ */
+	$"0CE8 C646 CC49 EF38 CC94 8B6C 1737 9636"            /* .èÆFÌIï8Ì”‹l.7–6 */
+	$"4EA7 0FE7 217B F3F1 A10D 7E49 242E 6F19"            /* N§.ç!{óñ¡.~I$.o. */
+	$"A8CF 369A 44DE 6C99 A9D4 24DA 6909 62C3"            /* ¨Ï6šDÞl™©Ô$ÚiÆbà */
+	$"0C4C D4CD D80E 72E6 FF6B A90E 7080 977B"            /* .LÔÍØ.ræÿk©.p€—{ */
+	$"4BEB 6A2A 72BB 0574 45FB 1E12 6408 C966"            /* Këj*r».tEû..d.Éf */
+	$"A632 9AC7 E67D 82C9 3FED 1E27 C1FA C47A"            /* ¦2šÇæ}‚É?í.'ÁúÄz */
+	$"AFCF 5719 3BCA 3975 BE3A 550B 6DC9 91CC"            /* ¯ÏW.;Ê9u¾:U.mÉ‘Ì */
+	$"F28E 751C 1B20 E7BB 58FF 0D92 2BF7 DE26"            /* òŽu.. ç»Xÿ.’+÷Þ& */
+	$"DFE3 B230 78F7 C64E ADF8 7741 F45A E3BC"            /* ßã²0x÷ÆN­øwAôZã¼ */
+	$"5185 1323 1C74 3288 F720 5DB7 B5C9 1EFD"            /* Q….#.t2ˆ÷ ]·µÉ.ý */
+	$"C844 7159 7047 A9BA 6CA1 403E CE2E 3522"            /* ÈDqYpG©ºl¡@>Î.5" */
+	$"1088 A628 490C 5F8D 64C4 7E17 CBD3 290D"            /* .ˆ¦(I._�dÄ~.ËÓ). */
+	$"91B1 B073 AD4A BF5B A1E9 6306 3E9A F87E"            /* ‘±°s­J¿[¡éc.>šø~ */
+	$"2DEC 7390 2CF5 3305 93C2 15DA 7FFF 7FC6"            /* -ìs�,õ3.“Â.Ú.ÿ.Æ */
+	$"0578 C93E BF93 5B69 25D4 E0F9 5726 0D7E"            /* .xÉ>¿“[i%ÔàùW&.~ */
+	$"9C06 C76B 1BF5 3206 F26C 4F57 6A13 7488"            /* œ.Çk.õ2.òlOWj.tˆ */
+	$"07F4 1787 316E 19B5 2CB4 D7B8 23EE BF15"            /* .ô.‡1n.µ,´×¸#î¿. */
+	$"84F7 C141 CE7E 358F F83B 081D 2680 C5CB"            /* „÷ÁAÎ~5�ø;..&€ÅË */
+	$"2002 0FFB D329 10E3 1880 E0F6 29FF 14F6"            /*  ..ûÓ).ã.€àö)ÿ.ö */
+	$"1447 24FF 4BDD 371B 00F3 0334 6FE5 D217"            /* .G$ÿKÝ7..ó.4oåÒ. */
+	$"8E7D 3CCB EC04 D019 0583 0792 D4F4 59E5"            /* Ž}<Ëì.Ð..ƒ.’ÔôYå */
+	$"0914 52FB CE7A 2EFD B899 ED16 38FB E1D4"            /* Æ.RûÎz.ý¸™í.8ûáÔ */
+	$"3312 BAAE 3EF3 45B7 2A77 62F3 4787 8900"            /* 3.º®>óE·*wbóG‡‰. */
+	$"050D 5A64 92D3 64E7 7950 4234 FCC0 0EC6"            /* ..Zd’ÓdçyPB4üÀ.Æ */
+	$"004C 8652 616B B5FF 87F6 72D0 400B 9574"            /* .L†Rakµÿ‡örÐ@.•t */
+	$"7ADD 2EE6 F979 EE70 393F 5E65 09EC 561B"            /* zÝ.æùyîp9?^eÆìV. */
+	$"2FF4 F6FA 9226 2AA7 C2D2 4517 2258 15C7"            /* /ôöú’&*§ÂÒE."X.Ç */
+	$"D27E DE80 0000 0009 BB69 0154 3C66 FD24"            /* Ò~Þ€...Æ»i.T<fý$ */
+	$"D6C1 DFFC 41CF 26FD 27E3 9482 7299 C4A3"            /* ÖÁßüAÏ&ý'㔂r™Ä£ */
+	$"A4B0 4F99 5ED7 6507 C196 C060 D7BD 7BA6"            /* ¤°O™^×e.Á–À`×½{¦ */
+	$"A0A2 C1E7 0ECE 98C4 36F0 B006 0526 5FC4"            /*  ¢Áç.ΘÄ6ð°..&_Ä */
+	$"CDEF A25D CE59 7B6F 507F C409 957F 43E6"            /* Íï¢]ÎY{oP.ÄÆ•.Cæ */
+	$"20AB C4BE 33C2 E794 46B7 5341 D8C9 5487"            /*  «Ä¾3Âç”F·SAØÉT‡ */
+	$"3000 A3E6 41BE 7D2A B553 6A8D C345 2E1E"            /* 0.£æA¾}*µSj�ÃE.. */
+	$"BF55 F536 52DD 101F D6C9 BB65 B7E4 0CFC"            /* ¿Uõ6RÝ..ÖÉ»e·ä.ü */
+	$"03D7 F641 F641 7A4F 8EE2 BA7A 352C ED91"            /* .×öAöAzOŽâºz5,í‘ */
+	$"9057 F893 C46F 62F7 A791 A8DE 8A25 BB17"            /* �Wø“Äob÷§‘¨ÞŠ%». */
+	$"F164 F2ED 43E5 A2E2 17E9 C95D DE1C 45F4"            /* ñdòíCå¢â.éÉ]Þ.Eô */
+	$"3019 8090 809D D124 EE5C B48E 6C92 2A74"            /* 0.€�€�Ñ$î\´Žl’*t */
+	$"ACA0 4F0A 1777 70CF EBEC 112A 9035 16AB"            /* ¬ OÂ.wpÏëì.*�5.« */
+	$"B36D 13D6 9F72 69CD E213 F146 6733 BAA3"            /* ³m.ÖŸriÍâ.ñFg3º£ */
+	$"0080 0000 0000 0000 0001 0151 0AD3 43F0"            /* .€.........QÂÓCð */
+	$"14A4 0000 61F0 20D9 9F3A 47FC 60A2 4780"            /* .¤..að ÙŸ:Gü`¢G€ */
+	$"F2D0 2A57 2C4C D349 5B9A 1BE3 0D39 80AD"            /* òÐ*W,LÓI[š.ã.9€­ */
+	$"72C4 873D 5028 F09E F0F5 700F B776 4B38"            /* rć=P(ðžðõp.·vK8 */
+	$"4FC6 7D26 AE5D 219E DDCE 4AA3 9AA9 FE19"            /* OÆ}&®]!žÝÎJ£š©þ. */
+	$"EC25 FEF0 0626 D259 8ECF 0364 6192 A000"            /* ì%þð.&ÒYŽÏ.da’ . */
+	$"0000 0000 0000 0000 0184 84B4 4FF0 1848"            /* .........„„´Oð.H */
+	$"4BC2 3700 0000 0000 0000 00B5 DA5E 3FF1"            /* KÂ7........µÚ^?ñ */
+	$"C9FC 9186 4A80 0000 0000 0000 0000 0000"            /* Éü‘†J€.......... */
+	$"0510 0FC3 251B 71C0 D918 64A8 0000 0000"            /* ...Ã%.qÀÙ.d¨.... */
+	$"0000 0000 0000 07E1 1EE1 F164 E11A 319D"            /* .......á.áñdá.1� */
+	$"3806 659F 8C35 7012 B17E 6096 52F0 8E96"            /* 8.eŸŒ5p.±~`–RðŽ– */
+	$"1438 1EBF 363A 49C9 51BD 3517 4ADA 7060"            /* .8.¿6:IÉQ½5.JÚp` */
+	$"0849 8F8B FCEC FD48 0000 54DF 4C0B E043"            /* .I�‹üìýH..TßL.àC */
+	$"F3B6 1CEB 518A F2B1 5A9C 9500 0000 0000"            /* ó¶.ëQŠò±Zœ•..... */
+	$"0196 C058 0636 AF4B 041F 37EC DE6F 4B4E"            /* .–ÀX.6¯K..7ìÞoKN */
+	$"291D A2A6 3CB8 9BAC 4B0C 5017 9031 0EF1"            /* ).¢¦<¸›¬K.P.�1.ñ */
+	$"3CF7 F63B 73A1 B4A6 9EA7 0513 C571 8EA8"            /* <÷ö;s¡´¦ž§..ÅqŽ¨ */
+	$"5D0A 28FC DCB6 D27A 0000 0000 0159 D076"            /* ]Â(üܶÒz.....YÐv */
+	$"3D1E 84A9 1C76 876E 7B6B 8519 1F9F 01C6"            /* =.„©.v‡n{k…..Ÿ.Æ */
+	$"1A11 B2A2 4841 4D47 5463 5D18 2AFE 54F5"            /* ..²¢HAMGTc].*þTõ */
+	$"591E 5FF1 39C7 C0CD 0D20 F366 59DE FE22"            /* Y._ñ9ÇÀÍ. ófYÞþ" */
+	$"B12C 4608 009D F105 49C8 16B5 417A 6079"            /* ±,F..�ñ.IÈ.µAz`y */
+	$"40B0 7E7A C4B3 83B8 485D 42B1 4000 0000"            /* @°~zijƒ¸H]B±@... */
+	$"0E9F 0340 5469 49BB 5767 B4BE 47AF 19B3"            /* .Ÿ.@TiI»Wg´¾G¯.³ */
+	$"4E69 B99F 25DF C3C0 1B9C 5455 41D2 F508"            /* Ni¹Ÿ%ßÃÀ.œTUAÒõ. */
+	$"9900 1F13 B43E C345 C4B3 C066 8A27 C3D3"            /* ™...´>ÃEijÀfŠ'ÃÓ */
+	$"7A8A 6368 2F2C 3F2F 5D43 59ED 5E40 9E4F"            /* zŠch/,?/]CYí^@žO */
+	$"59BB 6A03 B7F8 083A 021D F8F0 79AF 43B0"            /* Y»j.·ø.:..øðy¯C° */
+	$"2270 F775 B8D8 FB59 371A 8B22 9F0B 55FA"            /* "p÷u¸ØûY7.‹"Ÿ.Uú */
+	$"C9B1 5565 0914 AA67 2D9E 81B2 60FC 1333"            /* ɱUeÆ.ªg-ž�²`ü.3 */
+	$"318F 21E9 97E4 1400 F69E F709 7AE3 82A5"            /* 1�!é—ä..öž÷Æzã‚¥ */
+	$"C9DE 7D16 1DF8 EDF8 FC5E DB3E FC2A F822"            /* ÉÞ}..øíøü^Û>ü*ø" */
+	$"886E F247 9BC1 250E 905C 4AF7 4B22 3595"            /* ˆnòG›Á%.�\J÷K"5• */
+	$"0835 2567 EEC1 C4C8 B70D D782 6A22 C9DA"            /* .5%gîÁÄÈ·.ׂj"ÉÚ */
+	$"ADA3 0370 EED9 E428 E163 963A E6F0 5D4A"            /* ­£.pîÙä(ác–:æð]J */
+	$"F42A D11F B46D 7FBC 2D87 4274 4756 896E"            /* ô*Ñ.´m.¼-‡BtGV‰n */
+	$"C489 80C0 62F6 88A8 184A 79BE 3068 A9AF"            /* ĉ€Àböˆ¨.Jy¾0h©¯ */
+	$"D703 390B 1A76 3136 B799 726A AAA8 C23D"            /* ×.9..v16·™rjª¨Â= */
+	$"EEB0 E0F1 49E1 A6B7 204F 7BF3 6E44 F25E"            /* î°àñIᦷ O{ónDò^ */
+	$"7E0A 5125 CA89 B477 15CD 83CC CD21 C6BE"            /* ~ÂQ%ʉ´w.̓ÌÍ!ƾ */
+	$"F20B 99F3 C30C 5113 2E0A FF7E 1034 1BFF"            /* ò.™óÃ.Q..Âÿ~.4.ÿ */
+	$"0378 72CF B0EE D132 2A2D 14A9 E37F 6B10"            /* .xrÏ°îÑ2*-.©ã.k. */
+	$"B5CE 0500 0000 0000 0000 0160 A7E3 A715"            /* µÎ.........`§ã§. */
+	$"0C13 DE44 025B 9720 0000 0000 0000 0001"            /* ..ÞD.[— ........ */
+	$"E0F5 5A21 77FB C1F6 EAF0 244A EE78 B6FA"            /* àõZ!wûÁöêð$Jîx¶ú */
+	$"1769 3D98 AA28 2EB6 9826 A16B D6B8 BA89"            /* .i=˜ª(.¶˜&¡kÖ¸º‰ */
+	$"26C6 25C9 9E66 FD9C 6D2D FCDA FCB9 6AB2"            /* &Æ%Éžfýœm-üÚü¹j² */
+	$"B42A 7008 5069 CB61 D530 B47A FCFF 7F95"            /* ´*p.PiËaÕ0´züÿ.• */
+	$"FA58 2D11 111A 53BF FB17 59E1 63E7 0FAD"            /* úX-...S¿û.Yácç.­ */
+	$"B016 A862 3107 8DF0 7112 DD6A B6E3 2477"            /* °.¨b1.�ðq.Ýj¶ã$w */
+	$"3162 94F0 6826 75B0 D0B8 4C13 21C7 E4BC"            /* 1b”ðh&u°Ð¸L.!Çä¼ */
+	$"FB86 7A83 DF1C A4D9 C3B4 E3DE C334 1633"            /* û†zƒß.¤ÙôãÞÃ4.3 */
+	$"DC27 76B9 7ADF 50CA F95E C7C9 D5EB 402C"            /* Ü'v¹zßPÊù^ÇÉÕë@, */
+	$"276F A0B0 D88B CF4A 0FD2 380A E3E7 2BA5"            /* 'o °Ø‹ÏJ.Ò8Âãç+¥ */
+	$"DD24 A247 B631 75B1 6D3A 4C60 9BAB E4C5"            /* Ý$¢G¶1u±m:L`›«äÅ */
+	$"BBCB 2972 36B9 AC74 5FF5 B5DB 231B 95F3"            /* »Ë)r6¹¬t_õµÛ#.•ó */
+	$"7CFF 8E5F 86E9 1906 B3DF 75C7 0364 6192"            /* |ÿŽ_†é..³ßuÇ.da’ */
+	$"A000 0000 0000 0000 0000 003B B1A0 0000"            /*  ..........;± .. */
+	$"0000 0000 0000 0000 0000 0016 D51B CEEA"            /* ............Õ.Îê */
+	$"0406 C003 4E50 C0B8 8DB2 F37C FF8E 5F86"            /* ..À.NPÀ¸�²ó|ÿŽ_† */
+	$"E919 06B3 DF75 C703 6461 92A0 0000 0000"            /* é..³ßuÇ.da’ .... */
+	$"0000 0000 0000 3BB1 A000 0000 0000 0000"            /* ......;± ....... */
+	$"0000 0000 0000 16D5 1BCE EA04 06C0 034E"            /* .......Õ.Îê..À.N */
+	$"50C0 B88D B2F4 4BED 0C57 2F64 38E7 DFE6"            /* PÀ¸�²ôKí.W/d8çßæ */
+	$"95DB 93EF B9ED 1250 6A6A A6E3 4478 1E7E"            /* •Û“ï¹í.Pjj¦ãDx.~ */
+	$"F105 8E1B 961B 230C 9500 0000 0000 0C18"            /* ñ.Ž.–.#.•....... */
+	$"0EA3 5F13 6306 E1B5 4B22 3D26 79A1 06E4"            /* .£_.c.áµK"=&y¡.ä */
+	$"228F F320 0B74 8820 0000 0000 0000 0007"            /* "�ó .tˆ ........ */
+	$"9F62 443B 9A51 EAB0 7C1A A374 E7F1 52F3"            /* ŸbD;šQê°|.£tçñRó */
+	$"3BB8 C1E0 5919 6C04 A2E2 1032 6917 1394"            /* ;¸ÁàY.l.¢â.2i..” */
+	$"CCBE 472A 0652 C144 6D1E 755C ECF9 9725"            /* ̾G*.RÁDm.u\ìù—% */
+	$"A84A 55AE 7A0E 6730 FCA7 B6E0 FF31 08C0"            /* ¨JU®z.g0ü§¶àÿ1.À */
+	$"3E76 4DDC 9E24 A60B C4A7 4CDD C221 1941"            /* >vMÜž$¦.ħLÝÂ!.A */
+	$"0810 2DE3 206F C551 4910 77AA 762A 1FF2"            /* ..-ã oÅQI.wªv*.ò */
+	$"D39A 0ADC 1089 90F8 D098 1E77 BDD1 AF74"            /* ÓšÂÜ.‰�øИ.w½Ñ¯t */
+	$"4DEF D00D 0B2C CA2F 9EDC 27C4 35F9 F924"            /* MïÐ..,Ê/žÜ'Ä5ùù$ */
+	$"67FF 74E5 A746 B627 6267 F6D0 9B94 22D4"            /* gÿtå§F¶'bgöЛ”"Ô */
+	$"5FFE DF67 A7A9 E3CA 02A5 44D1 E926 DCA4"            /* _þßg§©ãÊ.¥DÑé&ܤ */
+	$"7490 4AB8 E094 7037 FF7C 8CF7 2A9B B784"            /* t�J¸à”p7ÿ|Œ÷*›·„ */
+	$"794E 9026 D48F FF7F F013 AABF F874 63DA"            /* yN�&Ô�ÿ.ð.ª¿øtcÚ */
+	$"0302 FBFA AA6A 31D5 E2DF 85F7 2ACD D98C"            /* ..ûúªj1Õâß…÷*ÍÙŒ */
+	$"175D 1243 F1C0 CEA2 344C B6FC ADCF C6AA"            /* .].CñÀ΢4L¶ü­Ïƪ */
+	$"5CAE FA82 783F 58DD 754D 5C63 A018 19F8"            /* \®ú‚x?XÝuM\c ..ø */
+	$"7EFE 8953 AE16 22B9 4ED7 43D2 8A0B FA52"            /* ~þ‰S®."¹N×CÒŠ.úR */
+	$"5703 08CA 555B E51E 307B 0565 E165 22F3"            /* W..ÊU[å.0{.eáe"ó */
+	$"7130 0CEC CA23 576D 8D58 BED1 FEB6 9A2F"            /* q0.ìÊ#Wm�X¾Ñþ¶š/ */
+	$"DCEA 3288 3EEC B12A D43C B191 2627 7723"            /* Üê2ˆ>ì±*Ô<±‘&'w# */
+	$"F40F 1B7A F1E3 9A7E 366D 7490 EE80 3570"            /* ô..zñãš~6mt�î€5p */
+	$"CB59 D05D F384 AA96 71FE 68E8 4D32 F9D2"            /* ËYÐ]󄪖qþhèM2ùÒ */
+	$"48BC 7B03 EA3B 879E 2E96 671F 8098 CE76"            /* H¼{.ê;‡ž.–g.€˜Îv */
+	$"87D8 0336 5C88 91F4 3C69 D76B 4DEF 29DA"            /* ‡Ø.6\ˆ‘ô<i×kMï)Ú */
+	$"F378 1035 720A CE61 C2E3 5776 CA53 F43B"            /* óx.5rÂÎaÂãWvÊSô; */
+	$"4FCB 79E4 5164 1270 A23E 6048 2089 7B12"            /* OËyäQd.p¢>`H ‰{. */
+	$"BCA8 E157 DFD5 E879 C14C 1B1A 3431 2856"            /* ¼¨áWßÕèyÁL..41(V */
+	$"0E74 D87F 7691 A923 632A 5EBC 6E95 6A46"            /* .tØ.v‘©#c*^¼n•jF */
+	$"8E68 7118 3704 6E41 37CB C9AC 7F84 1005"            /* Žhq.7.nA7Ëɬ.„.. */
+	$"C308 7C90 C6E0 B56C 8CF8 3C33 A97E C46C"            /* Ã.|�ÆàµlŒø<3©~Äl */
+	$"E373 91A9 4A3F 7331 481D 843F 0472 59DC"            /* ãs‘©J?s1H.„?.rYÜ */
+	$"0837 85BA 4867 C202 6BFC 7433 F093 530F"            /* .7…ºHgÂ.küt3ð“S. */
+	$"D721 8927 26CF AA6B B4E1 7981 FCE4 9F4E"            /* ×!‰'&Ϫk´áy�üäŸN */
+	$"1105 9E7B 7F68 1CE7 D811 E270 FCA3 9CDE"            /* ..ž{.h.çØ.âpü£œÞ */
+	$"BFE6 48BA AC07 B55E 4E7F 5946 115B B1DC"            /* ¿æHº¬.µ^N.YF.[±Ü */
+	$"F694 3A9B EADD 7971 E0F1 B6E1 C6FF 4337"            /* ö”:›êÝyqàñ¶áÆÿC7 */
+	$"F543 A074 FC74 AD1F 45BF 7867 C472 7605"            /* õC tüt­.E¿xgÄrv. */
+	$"1786 E496 2D22 22BE 5760 9ACE A5C9 22B9"            /* .†ä–-""¾W`šÎ¥É"¹ */
+	$"9A14 4136 93E4 3E4A 715C 6F69 8447 5764"            /* š.A6“ä>Jq\oi„GWd */
+	$"D761 77A8 2C3F E200 ACAD 8331 11D0 ABE6"            /* ×aw¨,?â.¬­ƒ1.Ыæ */
+	$"EA7B 5A22 58CF 097E 732F 894B E99C 6BAF"            /* ê{Z"XÏÆ~s/‰Kéœk¯ */
+	$"B36C 68AA 5668 EF92 66E9 DDF9 FF78 DB89"            /* ³lhªVhï’féÝùÿxÛ‰ */
+	$"FC78 2032 99D9 62F0 1380 3FE8 41DF F341"            /* üx 2™Ùbð.€?èAßóA */
+	$"F1FD 7F08 CE2E F09A 9335 6735 0FAD 8093"            /* ñý..Î.ðš“5g5.­€“ */
+	$"B6B1 53A2 964F EA7E 72A2 9A29 794D 98F0"            /* ¶±S¢–Oê~r¢š)yM˜ð */
+	$"DD57 AE65 C61E DDEC BDB4 35C2 D050 E063"            /* ÝW®eÆ.Ýì½´5ÂÐPàc */
+	$"5F54 BCA5 928D 786D CAE3 8F96 BFEB 027E"            /* _T¼¥’�xmÊã�–¿ë.~ */
+	$"6BBC 8795 7C88 1A2C 9908 36A1 6CAB 9268"            /* k¼‡•|ˆ.,™.6¡l«’h */
+	$"EB0D 816F F34D 55F5 B562 BCFF 4190 EE42"            /* ë.�oóMUõµb¼ÿA�îB */
+	$"F195 E7F3 E220 7E51 74A2 FA23 23F7 20F0"            /* ñ•çóâ ~Qt¢ú##÷ ð */
+	$"985F 011C 34B8 C988 C519 C623 81BC D026"            /* ˜_..4¸ÉˆÅ.Æ#�¼Ð& */
+	$"A8C5 B82C 7A7F 86F7 E60E 44F2 CD53 6FAB"            /* ¨Å¸,z.†÷æ.DòÍSo« */
+	$"2D69 1FD4 75B7 A011 80E7 09B3 B9CF 4503"            /* -i.Ôu· .€çƳ¹ÏE. */
+	$"F4A5 1DE3 AE8A 96F7 E245 0DF9 3859 24FA"            /* ô¥.㮊–÷âE.ù8Y$ú */
+	$"7B43 665F B15E D4D3 FB2A 666E FB6A 6CA8"            /* {Cf_±^ÔÓû*fnûjl¨ */
+	$"9CAF C052 D658 6DC3 BDD1 C752 21FA 6426"            /* œ¯ÀRÖXmýÑÇR!úd& */
+	$"857C D05D 41C2 0241 306C 6FD4 81E3 69F7"            /* …|Ð]AÂ.A0loÔ�ãi÷ */
+	$"A6F5 227F 39F9 780E 829A 17A9 C649 2BF5"            /* ¦õ".9ùx.‚š.©ÆI+õ */
+	$"01DD E500 A973 E599 890C A548 CE34 2877"            /* .Ýå.©s噉.¥HÎ4(w */
+	$"D160 A2EE 4B3B CC7A 0C87 6723 51FD C222"            /* Ñ`¢îK;Ìz.‡g#QýÂ" */
+	$"9BFB E72D 2769 6250 2054 22C9 ABB2 3125"            /* ›ûç-'ibP T"É«²1% */
+	$"7DA0 73A3 C083 1AAD 90F2 F0A8 C22D 9DF5"            /* } s£Àƒ.­�òð¨Â-�õ */
+	$"3FFB 6B56 18BE 61A6 B198 F1BC 1E4E 0CFE"            /* ?ûkV.¾a¦±˜ñ¼.N.þ */
+	$"B323 8275 A644 CAC4 D36B 9AF9 FCC8 5DEC"            /* ³#‚u¦DÊÄÓkšùüÈ]ì */
+	$"292B CC9B A0B6 9148 09DF E46D 1B2C 4EDF"            /* )+Ì› ¶‘HÆßäm.,Nß */
+	$"EDB9 2DB4 BAD5 C50B 2115 C476 E09A F407"            /* í¹-´ºÕÅ.!.Ävàšô. */
+	$"5EE8 2E9F 870F A319 32D4 EBEC CB7B FDE9"            /* ^è.Ÿ‡.£.2ÔëìË{ýé */
+	$"FB5C 0D41 61F3 BA97 0F9E 558F 6E39 C213"            /* û\.Aaóº—.žU�n9Â. */
+	$"3101 A5E8 ECEC 15E5 4F29 F69A 58CD D82D"            /* 1.¥èìì.åO)öšXÍØ- */
+	$"986E E8E0 6898 17CC 98C4 C851 AC75 9306"            /* ˜nèàh˜.̘ÄÈQ¬u“. */
+	$"5241 0350 E2EB 38CA 1682 6132 FF45 578A"            /* RA.Pâë8Ê.‚a2ÿEWŠ */
+	$"FA7F 7557 AC2C 9A18 3835 A62B 7D09 0992"            /* ú.uW¬,š.85¦+}ÆÆ’ */
+	$"EF78 BD49 5317 373A B07D 6420 DC30 5067"            /* ïx½IS.7:°}d Ü0Pg */
+	$"A659 F316 4436 8E8E 9786 1163 A6A5 B841"            /* ¦Yó.D6ŽŽ—†.c¦¥¸A */
+	$"99AA 4E1C 6163 309A 3C23 0208 FF4B 2967"            /* ™ªN.ac0š<#..ÿK)g */
+	$"B7F7 37E4 A337 D0DC C48A A742 FB2D C529"            /* ·÷7ä£7ÐÜÄŠ§Bû-Å) */
+	$"BC6C 5BBE BC5C 03B1 F87F D7EA F5AC B94B"            /* ¼l[¾¼\.±ø.×êõ¬¹K */
+	$"5A88 84AB E44E BE6A F337 96B0 7CB6 1140"            /* Zˆ„«äN¾jó7–°|¶.@ */
+	$"25CB 45D6 BE02 A9D4 7868 1EDD F660 7963"            /* %ËEÖ¾.©Ôxh.Ýö`yc */
+	$"B438 C030 3EA5 51FA F451 FA84 A6FF 2E5A"            /* ´8À0>¥QúôQú„¦ÿ.Z */
+	$"EA95 2300 C0F4 39AA 42BA 4120 4EEC AFDD"            /* ê•#.Àô9ªBºA Nì¯Ý */
+	$"20B4 6C42 0552 1177 6F1A AC6D FE8B 98E1"            /*  ´lB.R.wo.¬mþ‹˜á */
+	$"D3FB F52E BCE3 5BB1 7235 F597 3E0D 8C46"            /* Óûõ.¼ã[±r5õ—>.ŒF */
+	$"7361 1E2A C081 CA97 C8EA CD3F E91D 823F"            /* sa.*À�Ê—ÈêÍ?é.‚? */
+	$"73A7 5EA1 F641 9CBD 219D D7E4 EE0D 270E"            /* s§^¡öAœ½!�×äî.'. */
+	$"14DF F756 B4E5 062C 8251 4AD0 B090 A0AF"            /* .ß÷V´å.,‚QJа� ¯ */
+	$"CD2A 3C80 6068 C9CD C3D7 3D7F 258B 365A"            /* Í*<€`hÉÍÃ×=.%‹6Z */
+	$"5E1A 90DC D058 4ED9 DF50 6F40 07A9 2BDE"            /* ^.�ÜÐXNÙßPo@.©+Þ */
+	$"8486 5404 AB9C E323 0C4E D3DB 8352 0C0F"            /* „†T.«œã#.NÓÛƒR.. */
+	$"CD59 A5F5 56CC 0BB2 B603 85C3 C709 7D6E"            /* ÍY¥õVÌ.²¶.…ÃÇÆ}n */
+	$"A10E 33C2 AE0F D52F 5AD7 2279 E6EB 7E6C"            /* ¡.3®.Õ/Z×"yæë~l */
+	$"1757 589D C6DC B4FD 470C FFD9"                      /* .WX�ÆÜ´ýG.ÿÙ */
+};
+
diff --git a/linden/indra/newview/installers/darwin/release-dmg/_DS_Store b/linden/indra/newview/installers/darwin/release-dmg/_DS_Store
new file mode 100644
index 0000000..2c179b1
Binary files /dev/null and b/linden/indra/newview/installers/darwin/release-dmg/_DS_Store differ
diff --git a/linden/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns b/linden/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
new file mode 100644
index 0000000..da5307e
Binary files /dev/null and b/linden/indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns differ
diff --git a/linden/indra/newview/installers/darwin/release-dmg/background.jpg b/linden/indra/newview/installers/darwin/release-dmg/background.jpg
new file mode 100644
index 0000000..55294dc
Binary files /dev/null and b/linden/indra/newview/installers/darwin/release-dmg/background.jpg differ
diff --git a/linden/indra/newview/installers/darwin/releasecandidate-dmg/Applications-alias.r b/linden/indra/newview/installers/darwin/releasecandidate-dmg/Applications-alias.r
new file mode 100644
index 0000000..aa3cfb8
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/releasecandidate-dmg/Applications-alias.r
@@ -0,0 +1,6996 @@
+data 'alis' (0) {
+	$"0000 0000 0112 0002 0001 036D 6277 0000"            /* ...........mbw.. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 C135 A717 482B 0000 0000"            /* ......Á5§.H+.... */
+	$"0002 0C41 7070 6C69 6361 7469 6F6E 7300"            /* ...Applications. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 00E2 4F18 C2E8 9FB0 0000 0000 0000"            /* ...âO.Â蟰...... */
+	$"0000 FFFF FFFF 0000 0920 0000 0000 0000"            /* ..ÿÿÿÿ..Æ ...... */
+	$"0000 0000 0000 0000 0003 6D62 7700 0010"            /* ..........mbw... */
+	$"0008 0000 C136 0987 0000 0011 0008 0000"            /* ....Á6Ƈ........ */
+	$"C2E9 0220 0000 0001 0000 0002 0010 6D62"            /* Âé. ..........mb */
+	$"773A 4170 706C 6963 6174 696F 6E73 000E"            /* w:Applications.. */
+	$"001A 000C 0041 0070 0070 006C 0069 0063"            /* .....A.p.p.l.i.c */
+	$"0061 0074 0069 006F 006E 0073 000F 0008"            /* .a.t.i.o.n.s.... */
+	$"0003 006D 0062 0077 0012 000C 4170 706C"            /* ...m.b.w....Appl */
+	$"6963 6174 696F 6E73 0013 0001 2F00 FFFF"            /* ications..../.ÿÿ */
+	$"0000"                                               /* .. */
+};
+
+
+data 'icns' (-16455) {
+	$"6963 6E73 0001 B3AC 6973 3332 0000 0224"            /* icns..³¬is32...$ */
+	$"9F00 005F 8061 005D 8700 055D 9AA2 A0A4"            /* Ÿ.._€a.]‡..]š¢ ¤ */
+	$"8986 0008 557D B3B2 B1B3 A881 8081 8104"            /* ‰†..U}³²±³¨�€��. */
+	$"826F 577E AF82 A801 B3AE 82AD 03AF 7B7A"            /* ‚oW~¯‚¨.³®‚­.¯{z */
+	$"A781 A203 9EB7 C89D 81A2 03A6 776E 9A80"            /* §�¢.ž·È��¢.¦wnš€ */
+	$"9705 959F D3DC A295 8097 5899 6C67 8F8D"            /* —.•ŸÓÜ¢•€—X™lg�� */
+	$"8E89 85C9 BCA9 C883 898D 8D8E 6561 8585"            /* Ž‰…ɼ©Èƒ‰��Žea…… */
+	$"83A8 B7F3 BAB4 DFB6 AA84 8585 605E 7B7D"            /* ƒ¨·óº´ß¶ª„……`^{} */
+	$"79D0 F9E0 F0F2 DAE1 D87C 7D7B 5D5B 7476"            /* yÐùàðòÚáØ|}{][tv */
+	$"7099 D876 7373 76CA 8A72 7673 5B5A 6D70"            /* p™ØvssvÊŠrvs[Zmp */
+	$"6B9B 816C 6F6F 67B3 C567 706C 5A59 686B"            /* k›�loog³ÅgplZYhk */
+	$"6B67 686B 806A 056B 6F6A 6B67 5A88 5900"            /* kghk€j.kojkgZˆY. */
+	$"5882 598A 5801 0059 9F00 0482 8383 8480"            /* X‚YŠX..YŸ..‚ƒƒ„€ */
+	$"8700 057F B7BE BDC0 A786 0008 799E D0CE"            /* ‡...·¾½À§†..yžÐÎ */
+	$"CECF C5A1 A081 A105 A390 7AA0 D0CA 80C9"            /* ÎÏÅ¡ �¡.£�z ÐÊ€É */
+	$"01CA D183 CE03 D09C 9ECD 81C9 03C7 D4DE"            /* .ÊуÎ.ÐœžÍ�É.ÇÔÞ */
+	$"C681 C903 CD9A 94C5 80C2 05C1 C6E3 E9C8"            /* Æ�É.Íš”Å€Â.ÁÆãéÈ */
+	$"C180 C20D C491 8DBD BBBC B9B6 DDD7 CCDD"            /* Á€Â.Ä‘�½»¼¹¶Ý×ÌÝ */
+	$"B5B9 80BC 468B 87B4 B4B3 C8D1 F7D3 CFEA"            /* µ¹€¼F‹‡´´³ÈÑ÷ÓÏê */
+	$"D0C9 B4B4 B385 83AA ABA9 E0FB EAF5 F6E5"            /* ÐÉ´´³…ƒª«©àûêõöå */
+	$"EAE5 AAAB A981 80A0 A39E BAE4 A2A0 A1A2"            /* ê媫©�€ £žºä¢ ¡¢ */
+	$"DAAF 9FA3 9F7F 7E97 9B97 B8A6 979A 9A94"            /* Ú¯Ÿ£Ÿ.~—›—¸¦—šš” */
+	$"CAD6 949B 977D 7D90 9493 9091 8293 0496"            /* ÊÖ”›—}}�”“�‘‚“.– */
+	$"9294 907D 8E7C 8A7B 0100 7C9F 0000 7A80"            /* ’”�}Ž|Š{..|Ÿ..z€ */
+	$"7C00 7887 0005 77B1 B8B7 BBA0 8600 0871"            /* |.x‡..w±¸·» †..q */
+	$"97CB C9C8 CAC0 9B99 819A 049C 8972 99CA"            /* —ËÉÈÊÀ›™�š.œ‰r™Ê */
+	$"82C3 00CB 83C8 03CA 9596 C681 C203 BFCF"            /* ‚Ã.˃È.Ê•–Æ�Â.¿Ï */
+	$"DABF 81C2 03C6 938C BD80 BA05 B9BF E0E7"            /* Ú¿�Â.Æ“Œ½€º.¹¿àç */
+	$"C1B9 80BA 57BC 8985 B5B3 B3B0 ADD9 D2C6"            /* Á¹€ºW¼‰…µ³³°­ÙÒÆ */
+	$"D9AC B0B3 B3B4 827F ACAB AAC2 CCF6 CECA"            /* Ù¬°³³´‚.¬«ªÂÌöÎÊ */
+	$"E8CB C3AB ACAA 7D7B A1A3 A0DD FAE9 F4F5"            /* èË묪}{¡£ Ýúéôõ */
+	$"E3E8 E3A2 A3A0 7A78 989B 96B3 E29A 9898"            /* ãè㢣 zx˜›–³âš˜˜ */
+	$"9AD7 A897 9B97 7776 8F93 8FB2 9F8F 9292"            /* š×¨—›—wv�“�²Ÿ�’’ */
+	$"8BC5 D28C 938F 7575 888C 8B89 8982 8B04"            /* ‹ÅÒŒ“�uuˆŒ‹‰‰‚‹. */
+	$"8F8A 8C88 758E 748A 7301 0074 7338 6D6B"            /* �ŠŒˆuŽtŠs..ts8mk */
+	$"0000 0108 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 1E24 2424 1600 0000 0000"            /* .......$$$...... */
+	$"0000 0000 0011 BDC8 C8C8 9600 0000 0000"            /* ......½ÈÈÈ–..... */
+	$"0000 0000 048C FFFF FFFF F5A7 9C9E 9E9E"            /* .....Œÿÿÿÿõ§œžžž */
+	$"9E9E 6003 8AFF FCFC FCFC FEFF FFFF FFFF"            /* žž`.Šÿüüüüþÿÿÿÿÿ */
+	$"FFFF FF7A 89FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿz‰ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF7A 73FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿzsÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF64 62FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿdbÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF53 53FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿSSÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF45 48FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿEHÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FF3C 41FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿ<Aÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FD35 3DFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿý5=ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FA30 3CFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿú0<ÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FB2F 1247 4B4A 4A4A 4A4A 4A4A 4A4A"            /* ÿÿû/.GKJJJJJJJJJ */
+	$"4A4B 450F 0101 0201 0101 0101 0101 0101"            /* JKE............. */
+	$"0102 0001 696C 3332 0000 05AB FF00 BE00"            /* ....il32...«ÿ.¾. */
+	$"025A 7881 847F 0064 9200 0262 BBC4 83C2"            /* .Zx�„..d’..b»ÄƒÂ */
+	$"02C7 8451 9000 0255 86BF 84BC 03BF A064"            /* .Ç„Q�..U†¿„¼.¿ d */
+	$"6389 6400 6281 0003 5770 A2A2 85A1 01A3"            /* c‰d.b�..Wp¢¢…¡.£ */
+	$"9D89 9B07 9C97 6758 005B 95AC 88A7 02A8"            /* �‰›.œ—gX.[•¬ˆ§.¨ */
+	$"A4A7 89A8 05AB 925A 61A7 AE88 AC03 ABCA"            /* ¤§‰¨.«’Za§®ˆ¬.«Ê */
+	$"AEAB 88AC 05AE A15E 5B9A A788 A503 A0D7"            /* ®«ˆ¬.®¡^[š§ˆ¥. × */
+	$"D79F 88A5 05A8 9559 5990 A288 9F04 9BAB"            /* ןˆ¥.¨•YY�¢ˆŸ.›« */
+	$"FBAE 9C87 9F05 A28B 5857 879D 879A 0595"            /* û®œ‡Ÿ.¢‹XW‡�‡š.• */
+	$"BDD6 E6E3 9487 9A05 9D82 5656 7F97 8594"            /* ½Öæ㔇š.�‚VV.—…” */
+	$"0995 8FB3 F4CF B1FF AD90 9585 9405 977A"            /* Æ•�³ôϱÿ­�•…”.—z */
+	$"0000 7793 8690 078D CDF8 B886 E8E5 8B86"            /* ..w“†�.�Íø¸†è勆 */
+	$"9005 9372 0000 708F 828C 808B 0984 BBF7"            /* �.“r..p�‚Œ€‹Æ„»÷ */
+	$"C687 85AB FFA9 8580 8B82 8C05 8E6D 0000"            /* Ƈ…«ÿ©…€‹‚Œ.Žm.. */
+	$"6B8A 8287 0D88 8785 8FF3 FDA1 8186 84E5"            /* kŠ‚‡.ˆ‡…�óý¡�†„å */
+	$"E484 8684 8705 8868 0000 6685 8183 117E"            /* 䄆„‡.ˆh..f…�ƒ.~ */
+	$"B3E3 D0D2 FFDC D4DF DDDB D2FD D0DE E2B7"            /* ³ãÐÒÿÜÔßÝÛÒýÐÞâ· */
+	$"8082 8304 6400 0062 8081 7F06 76C5 FFDB"            /* €‚ƒ.d..b€�..vÅÿÛ */
+	$"F9F3 E381 FF06 F6D4 BFF4 FFD3 7882 7F03"            /* ùóã�ÿ.öÔ¿ôÿÓx‚.. */
+	$"6100 005F 827B 0675 B0D9 E1FF C8D8 82DF"            /* a.._‚{.u°ÙáÿÈØ‚ß */
+	$"05BF F3C9 DCB9 7681 7B04 7A5E 0000 5C82"            /* .¿óÉܹv�{.z^..\‚ */
+	$"7706 786F 96FF E879 7281 7306 7278 C8C2"            /* w.xo–ÿèyr�s.rxÈÂ */
+	$"7074 7880 7706 7875 5C00 005A 7382 7405"            /* ptx€w.xu\..Zs‚t. */
+	$"71C1 E19A 6D74 8173 0574 6BA2 FFAD 6C81"            /* qÁášmt�s.tk¢ÿ­l� */
+	$"7406 7571 5B00 005A 6F81 7104 6F77 F2AF"            /* t.uq[..Zo�q.owò¯ */
+	$"6984 7105 6E7E FAFB 836D 8071 0772 6D5A"            /* i„q.n~úûƒm€q.rmZ */
+	$"0000 586C 6F80 6E03 6C7B 9368 866E 0467"            /* ..Xlo€n.l{“h†n.g */
+	$"C3FA 8B69 806E 076F 6A59 0000 586A 6E81"            /* Ãú‹i€n.ojY..Xjn� */
+	$"6D01 6C68 876D 036B 717D 6B81 6D07 6E69"            /* m.lh‡m.kq}k�m.ni */
+	$"5900 0058 666A 8E69 0168 6682 6903 6A65"            /* Y..XfjŽi.hf‚i.je */
+	$"5900 BD59 0000 9B59 9E00 FF00 BE00 027D"            /* Y.½Y..›Yž.ÿ.¾..} */
+	$"98A0 829E 029F 9E85 9200 0284 D5DE 83DC"            /* ˜ ‚ž.Ÿž…’..„ÕÞƒÜ */
+	$"02E0 A275 9000 0279 A7DB 84D8 03DB BD87"            /* .à¢u�..y§Û„Ø.Û½‡ */
+	$"8689 8700 8581 0003 7A92 C0C0 85BF 01C0"            /* †‰‡.…�..z’ÀÀ…¿.À */
+	$"BB89 B907 BAB4 887B 007E B7CC 88C7 01C8"            /* »‰¹.º´ˆ{.~·ÌˆÇ.È */
+	$"C68A C805 CBB2 7C84 CAD1 89CF 02DE CFCE"            /* ÆŠÈ.˲|„ÊщÏ.ÞÏÎ */
+	$"88CF 05D2 C380 7FBF CC88 CA03 C7E8 E5C6"            /* ˆÏ.ÒÀ.¿ÌˆÊ.ÇèåÆ */
+	$"88CA 05CD B87C 7CB7 CA88 C704 C4CD FCCD"            /* ˆÊ.͸||·ÊˆÇ.ÄÍüÍ */
+	$"C587 C705 CAB0 7A7A AFC7 87C4 05C1 D4E3"            /* ŇÇ.Ê°zz¯Ç‡Ä.ÁÔã */
+	$"F0ED C087 C405 C8A8 7979 A7C4 85C0 09C1"            /* ðíÀ‡Ä.Ȩyy§Ä…ÀÆÁ */
+	$"BDD0 F7E1 D1FF CDBE C185 C005 C4A1 0000"            /* ½Ð÷áÑÿ;Á…À.Ä¡.. */
+	$"A0C1 86BD 07BA DEFB D5B7 F2EE B986 BD05"            /*  Á†½.ºÞûÕ·ò½. */
+	$"C09A 0000 9ABE 85BA 09B6 D4F9 DBB8 B6CD"            /* Àš..š¾…ºÆ¶ÔùÛ¸¶Í */
+	$"FFCA B785 BA05 BD94 0000 94B9 83B6 0EB4"            /* ÿÊ·…º.½”..”¹ƒ¶.´ */
+	$"B3B9 F7FE C4B0 B4B2 EFED B2B4 B4B5 82B6"            /* ³¹÷þÄ°´²ïí²´´µ‚¶ */
+	$"05B8 8F00 008E B481 B211 AFCD EBDF E0FF"            /* .¸�..Ž´�².¯Íëßàÿ */
+	$"E8E2 E9E8 E6E0 FEDF E8EA D0B0 81B2 05B3"            /* èâéèæàþßèêа�².³ */
+	$"8A00 0089 AF81 AD06 A8D9 FFE7 FBF7 EB81"            /* Š..‰¯�­.¨Ùÿçû÷ë� */
+	$"FF06 F9E1 D3F8 FFE3 A980 AD05 AEAD 8600"            /* ÿ.ùáÓøÿã©€­.®­†. */
+	$"0086 82A9 06A5 CBE5 EAFF DAE5 82EA 05D3"            /* .†‚©.¥ËåêÿÚå‚ê.Ó */
+	$"F7DA E8D1 A680 A906 AAA7 8300 0082 A382"            /* ÷ÚèѦ€©.ª§ƒ..‚£‚ */
+	$"A405 9FB7 FFF0 A5A1 81A2 05A1 A5D9 D39F"            /* ¤.Ÿ·ÿð¥¡�¢.¡¥ÙÓŸ */
+	$"A281 A406 A5A1 8000 0080 9F82 A004 9ED2"            /* ¢�¤.¥¡€..€Ÿ‚ .žÒ */
+	$"E9BA 9B83 A004 9ABF FFC5 9A81 A007 A19C"            /* 麛ƒ .š¿ÿÅš� .¡œ */
+	$"7F00 007E 999D 809B 059A 9FF6 C696 9C83"            /* ...~™�€›.šŸöÆ–œƒ */
+	$"9B05 99A4 FBFB A799 809B 079C 977D 0000"            /* ›.™¤ûû§™€›.œ—}.. */
+	$"7C95 9980 9803 97A1 B295 8698 0494 D5FC"            /* |•™€˜.—¡²•†˜.”Õü */
+	$"AC95 8098 0799 937C 0000 7C93 9782 9600"            /* ¬•€˜.™“|..|“—‚–. */
+	$"9387 9603 9599 A295 8196 0797 917C 0000"            /* “‡–.•™¢•�–.—‘|.. */
+	$"7B8E 928D 9102 9290 8F82 9103 928C 7B00"            /* {Ž’�‘.’��‚‘.’Œ{. */
+	$"BD7C 0000 9B7C 9E00 FF00 BE00 0275 9199"            /* ½|..›|ž.ÿ.¾..u‘™ */
+	$"8498 007E 9200 027D D0D9 83D7 02DB 9B6C"            /* „˜.~’..}ÐÙƒ×.Û›l */
+	$"9000 0271 A0D5 84D2 03D5 B67F 7E89 7F00"            /* �..q Õ„Ò.Õ¶.~‰.. */
+	$"7D81 0003 728B BBBB 85BA 02BB B6B3 88B4"            /* }�..r‹»»…º.»¶³ˆ´ */
+	$"08B5 AF81 7300 76B0 C6C2 87C1 01C2 C089"            /* .µ¯�s.v°Æ‡Á.ÂÀ‰ */
+	$"C206 C3C5 AB75 7CC3 CA89 C801 DBC9 89C8"            /* Â.ÃÅ«u|ÃʉÈ.ÛÉ‰È */
+	$"05CB BD78 77B9 C588 C304 C0E5 E2BF C487"            /* .˽xw¹ÅˆÃ.Àåâ¿Ä‡ */
+	$"C305 C6B2 7574 B0C3 87C0 05BF BCC7 FCC7"            /* Ã.Ʋut°Ã‡À.¿¼ÇüÇ */
+	$"BE87 C005 C3A9 7272 A7BF 87BC 05B9 D0E1"            /* ¾‡À.érr§¿‡¼.¹Ðá */
+	$"EEEB B887 BC05 C0A1 7171 A0BC 86B8 07B5"            /* î븇¼.À¡qq ¼†¸.µ */
+	$"CBF6 DDCB FFC7 B586 B805 BB99 0000 98B9"            /* ËöÝËÿǵ†¸.»™..˜¹ */
+	$"86B5 07B2 DBFA D0AE F0EC B186 B505 B892"            /* †µ.²ÛúЮð챆µ.¸’ */
+	$"0000 91B5 82B2 80B1 09AC D0F9 D7AF ADC7"            /* ..‘µ‚²€±Æ¬Ðùׯ­Ç */
+	$"FFC4 AD80 B182 B205 B48C 0000 8BB1 81AD"            /* ÿÄ­€±‚².´Œ..‹±�­ */
+	$"11AE ADAC ABB1 F6FD BDA8 ABAA EDEB A9AB"            /* .®­¬«±öý½¨«ªíë©« */
+	$"ACAC AE81 AD05 AF87 0000 86AB 81A9 11A6"            /* ¬¬®�­.¯‡..†«�©.¦ */
+	$"C8E9 DCDE FFE5 DFE7 E6E4 DDFE DCE6 E9CB"            /* ÈéÜÞÿåßçæäÝþÜæéË */
+	$"A781 A905 AA82 0000 81A6 81A5 069F D6FF"            /* §�©.ª‚..�¦�¥.ŸÖÿ */
+	$"E4FA F6EA 81FF 06F8 DFCF F7FF E0A0 80A5"            /* äúöê�ÿ.øßÏ÷ÿà €¥ */
+	$"05A6 A47E 0000 7D82 A006 9BC6 E3E8 FFD6"            /* .¦¤~..}‚ .›ÆãèÿÖ */
+	$"E282 E805 CFF6 D7E6 CC9C 80A0 06A1 9E7B"            /* â‚è.Ïö×æÌœ€ .¡ž{ */
+	$"0000 7A9B 829C 0496 B1FF EF9D 8399 049C"            /* ..z›‚œ.–±ÿï�ƒ™.œ */
+	$"D6D0 969A 819C 069D 9979 0000 7897 8198"            /* ÖЖš�œ.�™y..x—�˜ */
+	$"0597 95CF E7B4 9283 9704 91BA FFC0 9181"            /* .—•Ïç´’ƒ—.‘ºÿÀ‘� */
+	$"9807 9994 7700 0076 9295 8094 0493 98F5"            /* ˜.™”w..v’•€”.“˜õ */
+	$"C28E 8494 0592 9DFB FBA0 9180 9407 958F"            /* ÂŽ„”.’�ûû ‘€”.•� */
+	$"7500 0074 8E91 8090 038F 9AAC 8C86 9004"            /* u..tŽ‘€�.�š¬Œ†�. */
+	$"8BD1 FBA6 8C80 9007 918B 7400 0074 8B8F"            /* ‹Ñû¦Œ€�.‘‹t..t‹� */
+	$"808E 048F 8E8B 8E8F 848E 048F 8D91 9B8D"            /* €Ž.�Ž‹Ž�„Ž.��‘›� */
+	$"818E 078F 8974 0000 7487 8B8E 8A01 8987"            /* �Ž.�‰t..t‡‹ŽŠ.‰‡ */
+	$"828A 038B 8574 00BD 7400 009B 749E 006C"            /* ‚Š.‹…t.½t..›tž.l */
+	$"386D 6B00 0004 0800 0000 0000 0000 0000"            /* 8mk............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0B76 8889 8989"            /* ...........vˆ‰‰‰ */
+	$"8989 8988 3800 0000 0000 0000 0000 0000"            /* ‰‰‰ˆ8........... */
+	$"0000 0000 0000 0000 0000 36FF FFFF FFFF"            /* ..........6ÿÿÿÿÿ */
+	$"FFFF FFFF A301 0000 0000 0000 0000 0000"            /* ÿÿÿÿ£........... */
+	$"0000 0000 0000 0000 0006 A4FF FFFF FFFF"            /* ..........¤ÿÿÿÿÿ */
+	$"FFFF FFFF DE59 3F40 4040 4040 4040 4040"            /* ÿÿÿÿÞY?@@@@@@@@@ */
+	$"4040 4033 0000 0000 1384 F8F3 F3F3 F3F3"            /* @@@3.....„øóóóóó */
+	$"F3F3 F3F3 F7F9 F7F7 F7F7 F7F7 F7F7 F7F7"            /* óóóó÷ù÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F1 520D 001D E1FF FAFB FBFB FBFB"            /* ÷÷÷ñR...áÿúûûûûû */
+	$"FBFB FBFB FBFB FBFB FBFB FBFB FBFB FBFB"            /* ûûûûûûûûûûûûûûûû */
+	$"FBFB FBFB FFCD 0E39 FFFF FFFF FFFF FFFF"            /* ûûûûÿÍ.9ÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 1F26 F6FF FFFF FFFF FFFF"            /* ÿÿÿÿÿø.&öÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE5 1318 ECFF FFFF FFFF FFFF"            /* ÿÿÿÿÿå..ìÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD5 0A0F DDFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÕÂ.Ýÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC6 0206 D0FF FFFF FFFF FFFF"            /* ÿÿÿÿÿÆ..Ðÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB6 0000 C2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¶..Âÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 0000 B2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¥..²ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF95 0000 A4FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ•..¤ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF87 0000 96FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ‡..–ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF7A 0000 8AFF FFFF FFFF FFFF"            /* ÿÿÿÿÿz..Šÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6D 0000 7FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿm...ÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF63 0000 77FF FFFF FFFF FFFF"            /* ÿÿÿÿÿc..wÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5A 0000 6FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿZ..oÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF54 0000 69FF FFFF FFFF FFFF"            /* ÿÿÿÿÿT..iÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4F 0000 65FF FFFF FFFF FFFF"            /* ÿÿÿÿÿO..eÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4C 0000 64FF FFFF FFFF FFFF"            /* ÿÿÿÿÿL..dÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF4B 0000 61FF FFFF FFFF FFFF"            /* ÿÿÿÿÿK..aÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF48 0004 2C6D 7574 7474 7474"            /* ÿÿÿÿÿH..,muttttt */
+	$"7474 7474 7474 7474 7474 7474 7474 7474"            /* tttttttttttttttt */
+	$"7474 7475 6824 0202 0D18 1C1C 1C1C 1C1C"            /* tttuh$.......... */
+	$"1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C"            /* ................ */
+	$"1C1C 1C1C 170C 0100 0103 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0301 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0069 6833 3200 0009 DEFF"            /* .......ih32..ÆÞÿ */
+	$"00FF 00FF 00AD 0001 5E66 8865 0261 5859"            /* .ÿ.ÿ.­..^fˆe.aXY */
+	$"9C00 025E A6BA 87B7 04B9 AE67 5659 9B00"            /* œ..^¦º‡·.¹®gVY›. */
+	$"0266 BABF 87BE 04BF BC70 5459 9A00 0252"            /* .fº¿‡¾.¿¼pTYš..R */
+	$"81BD 89BA 03BC 8652 5491 5585 0003 5580"            /* �½‰º.¼†RT‘U…..U€ */
+	$"B7BA 89B9 02BA B497 918F 0191 7683 0003"            /* ·º‰¹.º´—‘�.‘vƒ.. */
+	$"5864 9399 8B97 0098 929B 039D 855F 5A80"            /* Xd“™‹—.˜’›.�…_Z€ */
+	$"0002 649D A990 A500 A490 A509 A6A9 9B65"            /* ..d�©�¥.¤�¥Æ¦©›e */
+	$"0000 85B4 AFAF 8EAE 03B0 AEAC AF8E AE07"            /* ..…´¯¯Ž®.°®¬¯Ž®. */
+	$"AFAF B280 0000 80AD 8FA9 04A8 B2E7 ACA8"            /* ¯¯²€..€­�©.¨²ç¬¨ */
+	$"90A9 05AB 7A00 0076 A98F A604 A5A4 F1E0"            /* �©.«z..v©�¦.¥¤ñà */
+	$"A08F A606 A7A6 7100 006D A390 A204 9DC8"            /*  �¦.§¦q..m£�¢.�È */
+	$"FFB9 9C8E A207 A3A0 6A00 0065 9D9F 8D9E"            /* ÿ¹œŽ¢.£ j..e�Ÿ�ž */
+	$"069F 9C96 A2FA EF9C 8E9E 079F 9A65 0000"            /* .Ÿœ–¢úž.Ÿše.. */
+	$"6097 9C8D 9B07 97A5 E2C6 D2FF C394 8D9B"            /* `—œ�›.—¥âÆÒÿÔ�› */
+	$"079C 9461 0000 5E90 988C 9709 959A D5CE"            /* .œ”a..^�˜Œ—Æ•šÕÎ */
+	$"E4B2 FCF4 9A95 8C97 0799 8D5E 0000 5A8B"            /* ä²üôš•Œ—.™�^..Z‹ */
+	$"968C 9409 8EC8 FFF6 C18D DDFF C78C 8C94"            /* –Œ”ÆŽÈÿöÁ�ÝÿÇŒŒ” */
+	$"0796 875B 0000 5885 938B 910B 8F8F E5FF"            /* .–‡[..X…“‹‘.��åÿ */
+	$"FFA9 87AA FFF7 988E 8B91 0793 8159 0000"            /* ÿ©‡ªÿ÷˜Ž‹‘.“�Y.. */
+	$"577F 908B 8E0B 87CF D4D0 CA89 8D8B E0FF"            /* W.�‹Ž.‡ÏÔÐʉ�‹àÿ */
+	$"C786 8B8E 0790 7B58 0000 5779 8C86 8A81"            /* dž‹Ž.�{X..WyŒ†Š� */
+	$"8B0D 84A5 FFFF E38B 898B 85A8 FFF8 9387"            /* ‹.„¥ÿÿ㋉‹…¨ÿø“‡ */
+	$"818B 868A 078C 7557 0000 5674 8A85 8800"            /* �‹†Š.ŒuW..VtŠ…ˆ. */
+	$"8680 820E 8385 E4FF FFB9 7C83 8381 7FDD"            /* †€‚.ƒ…äÿÿ¹|ƒƒ�.Ý */
+	$"FFC6 7E81 8200 8585 8807 8A71 5759 0056"            /* ÿÆ~�‚.……ˆ.ŠqWY.V */
+	$"6F87 8485 1983 929F A3A0 94B0 FFFF E39D"            /* o‡„….ƒ’Ÿ£ ”°ÿÿã� */
+	$"9F9E 9DA3 9AB0 FBF4 98A0 A09F A192 8484"            /* Ÿž�£š°ûô˜  Ÿ¡’„„ */
+	$"8507 876D 5759 0056 6984 8482 197C A7EB"            /* ….‡mWY.Vi„„‚.|§ë */
+	$"FBF1 C2EC FFFB C1ED F2F6 ECFB EDD9 DBFF"            /* ûñÂìÿûÁíòöìûíÙÛÿ */
+	$"D4EE F0F6 F6B7 7C84 8207 8369 5700 5956"            /* Ôîðöö·|„‚.ƒiW.YV */
+	$"6481 847F 0979 A3FF FFEB CCFF FFD5 E084"            /* d�„.Æy£ÿÿëÌÿÿÕà„ */
+	$"FF03 C8F1 BCC4 80FF 01C0 7785 7F06 6557"            /* ÿ.Èñ¼Ä€ÿ.Àw…..eW */
+	$"5959 5661 7E84 7D08 76A3 FFFF C3F4 FFF5"            /* YYVa~„}.v£ÿÿÃôÿõ */
+	$"CB85 FF08 EDA8 CCC0 F2FF FFC1 7485 7D06"            /* Ë…ÿ.í¨ÌÀòÿÿÁt…}. */
+	$"6358 5959 575E 7B84 7A09 7692 D0BE D6FF"            /* cXYYW^{„zÆv’оÖÿ */
+	$"FFC2 B9D0 84CF 08CD B9FF F1B1 CED0 A574"            /* ÿ¹ЄÏ.͹ÿñ±ÎÐ¥t */
+	$"847A 0679 6058 5959 585D 8678 0776 6A9C"            /* „z.y`XYYX]†x.vjœ */
+	$"FFFF F081 7086 7106 75D1 D89D 6A71 7484"            /* ÿÿð�p†q.uÑØ�jqt„ */
+	$"7808 7976 5E58 5959 585B 7486 7505 73B9"            /* x.yv^XYYX[t†u.s¹ */
+	$"F5FF AC6D 8775 0570 8CEB F889 6F85 7508"            /* õÿ¬m‡u.pŒëø‰o…u. */
+	$"7672 5C58 5959 5859 7285 7306 6F8A E1C6"            /* vr\XYYXYr…s.oŠáÆ */
+	$"C176 7287 7306 7179 EEFF E173 7184 7308"            /* Ávr‡s.qyîÿásq„s. */
+	$"7470 5B58 5959 5859 7085 7205 6B97 FFE7"            /* tp[XYYXYp…r.k—ÿç */
+	$"776E 8972 0569 C6FF FFB4 6A84 7202 736E"            /* wn‰r.iÆÿÿ´j„r.sn */
+	$"5A81 5901 586D 856F 0567 B9D9 786B 7089"            /* Z�Y.Xm…o.g¹Ùxkp‰ */
+	$"6F06 6993 FFFF F173 6D83 6F01 706B 8259"            /* o.i“ÿÿñsmƒo.pk‚Y */
+	$"0157 6B85 6E03 6C8C 7269 8B6E 066D 6BD3"            /* .Wk…n.lŒri‹n.mkÓ */
+	$"FFCB 6C6D 836E 026F 6958 8159 0256 6A6E"            /* ÿËlmƒn.oiX�Y.Vjn */
+	$"856D 0169 6B8D 6D04 6A73 8A6D 6B84 6D02"            /* …m.ik�m.jsŠmk„m. */
+	$"6E68 5881 5902 566A 6E98 6D02 6B67 6C85"            /* nhX�Y.Vjn˜m.kgl… */
+	$"6D02 6E68 5881 5902 5665 69A3 6802 6963"            /* m.nhX�Y.Vei£h.ic */
+	$"5881 5901 5858 A559 0058 B059 0000 AB59"            /* X�Y.XX¥Y.X°Y..«Y */
+	$"8000 A959 DF00 FF00 FF00 FF00 AD00 0081"            /* €.©Yß.ÿ.ÿ.ÿ.­..� */
+	$"8987 0283 7B7C 9C00 0280 C1D3 87D1 04D2"            /* ‰‡.ƒ{|œ..€ÁÓ‡Ñ.Ò */
+	$"C787 7A7C 9B00 0288 D4DA 87D9 04DA D68F"            /* LJz|›..ˆÔÚ‡Ù.ÚÖ� */
+	$"787C 9A00 0276 A2D8 89D6 02D7 A476 9278"            /* x|š..v¢Ø‰Ö.פv’x */
+	$"8500 0379 A2D3 D789 D503 D6D0 B5AD 90AE"            /* …..y¢Ó׉Õ.Öе­�® */
+	$"01B0 9683 0003 7C87 B1B7 8BB5 00B6 92B9"            /* .°–ƒ..|‡±·‹µ.¶’¹ */
+	$"03BA A282 7D80 0003 87BD C8C5 90C4 00C5"            /* .º¢‚}€..‡½ÈÅ�Ä.Å */
+	$"8FC4 08C5 C8B9 8700 00A7 D6D1 90D0 01CD"            /* �Ä.Åȹ‡..§ÖÑ�Ð.Í */
+	$"CF90 D006 D1D3 A000 00A3 D18F CD04 CCD1"            /* Ï�Ð.ÑÓ ..£Ñ�Í.ÌÑ */
+	$"EECC CC90 CD05 CF9B 0000 9ACE 90CB 03CA"            /* îÌÌ�Í.Ï›..šÎ�Ë.Ê */
+	$"F7E9 C68F CB07 CCCB 9300 0091 C9C9 8FC8"            /* ÷éÆ�Ë.ÌË“..‘ÉÉ�È */
+	$"04C6 DFFF D2C5 8EC8 07C9 C68D 0000 8BC5"            /* .ÆßÿÒÅŽÈ.ÉÆ�..‹Å */
+	$"C78D C606 C7C5 BFC7 FDF3 C38E C607 C7C0"            /* Ç�Æ.ÇÅ¿ÇýóÃŽÆ.ÇÀ */
+	$"8800 0086 C0C5 8DC4 07C2 C7EB DAE4 FFD9"            /* ˆ..†ÀÅ�Ä.ÂÇëÚäÿÙ */
+	$"C08D C407 C6BC 8400 0082 BBC4 8CC2 09C1"            /* À�Ä.Ƽ„..‚»ÄŒÂÆÁ */
+	$"C2E2 DEED D1FD F7C1 C18C C207 C4B6 8100"            /* ÂâÞíÑý÷ÁÁŒÂ.Ķ�. */
+	$"007F B5C2 8CC0 09BC DBFF F8D7 BBEA FFDB"            /* ..µÂŒÀƼÛÿø×»êÿÛ */
+	$"BA8C C007 C2B0 7E00 007C B0C0 8BBE 0BBD"            /* ºŒÀ.°~..|°À‹¾.½ */
+	$"BAED FFFF CCB8 CCFF F9BF BC8B BE07 C0AA"            /* ºíÿÿ̸Ìÿù¿¼‹¾.Àª */
+	$"7C00 007B ABBF 8BBC 0BB7 DEE1 DFDF B9BB"            /* |..{«¿‹¼.·Þáßß¹» */
+	$"BAED FFDA B78B BC07 BFA5 7B00 007A A5BC"            /* ºíÿÚ·‹¼.¿¥{..z¥¼ */
+	$"89B9 0EBA B6C6 FFFF ECB9 B9BA B6CB FFFA"            /* ‰¹.º¶Æÿÿì¹¹º¶Ëÿú */
+	$"BCB8 8AB9 07BC 9F7A 0000 799F B984 B601"            /* ¼¸Š¹.¼Ÿz..yŸ¹„¶. */
+	$"B7B5 82B3 0CEC FFFF D4AF B3B3 B2B1 EAFF"            /* ·µ‚³.ìÿÿÔ¯³³²±êÿ */
+	$"D9B0 81B3 01B5 B784 B607 B899 797C 0079"            /* Ù°�³.µ·„¶.¸™y|.y */
+	$"99B7 84B4 13B3 B9BE C1C0 B9CB FFFF EDBE"            /* ™·„´.³¹¾ÁÀ¹Ëÿÿí¾ */
+	$"BFBE BEC1 BCCB FCF7 BB80 BF02 C0B9 B384"            /* ¿¾¾Á¼Ëü÷»€¿.À¹³„ */
+	$"B407 B694 797C 0079 93B4 84B1 19AD C7F1"            /* ´.¶”y|.y“´„±.­Çñ */
+	$"FBF5 D6F1 FFFD D5F2 F5F8 F1FB F2E4 E7FF"            /* ûõÖñÿýÕòõøñûòäçÿ */
+	$"E2F3 F4F8 F8D0 AD84 B107 B290 7A00 7C79"            /* âóôøøЭ„±.²�z.|y */
+	$"8DB0 84AE 09AA C3FF FFF2 DCFF FFE2 E984"            /* �°„®ÆªÃÿÿòÜÿÿâé„ */
+	$"FF03 D9F6 D1D8 80FF 01D6 A985 AE06 8C7A"            /* ÿ.ÙöÑØ€ÿ.Ö©…®.Œz */
+	$"7C7C 7989 AD84 AB08 A7C3 FFFF D5F7 FFF8"            /* ||y‰­„«.§ÃÿÿÕ÷ÿø */
+	$"DA85 FF08 F2C2 DAD3 F6FF FFD7 A583 AB08"            /* Ú…ÿ.òÂÚÓöÿÿ×¥ƒ«. */
+	$"ACAA 897A 7C7C 7A86 A984 A809 A5B7 E0D3"            /* ¬ª‰z||z†©„¨Æ¥·àÓ */
+	$"E2FF FFD6 D0E0 84DF 08DD CFFF F5CB DFE0"            /* âÿÿÖÐà„ß.ÝÏÿõËßà */
+	$"C3A4 83A8 07A9 A686 7A7C 7C7A 8386 A506"            /* 䃨.©¦†z||zƒ†¥. */
+	$"A39B BAFF FFF5 AA87 A006 A3DF E2BA 9BA1"            /* £›ºÿÿõª‡ .£ß⺛¡ */
+	$"A284 A507 A6A2 837B 7C7C 7B82 87A2 059F"            /* ¢„¥.¦¢ƒ{||{‚‡¢.Ÿ */
+	$"CCF8 FFC7 9C87 A205 9EAF F0F9 AD9E 85A2"            /* ÌøÿÇœ‡¢.ž¯ðù­ž…¢ */
+	$"08A3 9F81 7B7C 7C7B 7F9D 859F 069C AEE8"            /* .£Ÿ�{||{.�…Ÿ.œ®è */
+	$"D4D3 A09E 879F 069D A3F4 FFE8 9D9E 849F"            /* ÔÓ ž‡Ÿ.�£ôÿè�ž„Ÿ */
+	$"09A0 9B7F 7B7C 7C7B 7E9A 9D84 9C05 98B5"            /* Æ ›.{||{~š�„œ.˜µ */
+	$"FFEE 9F99 899C 0596 D7FF FFC9 9684 9C09"            /* ÿ‰œ.–×ÿÿÉ–„œÆ */
+	$"9D97 7E7B 7C7C 7B7C 989B 849A 0494 CCE4"            /* �—~{||{|˜›„š.”Ìä */
+	$"A097 8A9A 0695 B3FF FFF4 9C99 839A 019B"            /*  —Šš.•³ÿÿôœ™ƒš.› */
+	$"9482 7C02 7B95 9984 9803 97AD 9B95 8B98"            /* ”‚|.{•™„˜.—­›•‹˜ */
+	$"0697 96E0 FFDA 9797 8398 0199 9282 7C02"            /* .—–àÿÚ——ƒ˜.™’‚|. */
+	$"7A93 9785 9601 9395 8D96 0494 9AAB 9695"            /* z“—…–.“•�–.”š«–• */
+	$"8496 0297 8F7B 817C 027A 9297 9896 0294"            /* „–.—�{�|.z’—˜–.” */
+	$"9295 8596 0297 8F7B 817C 027A 8C91 A390"            /* ’•…–.—�{�|.zŒ‘£� */
+	$"0291 897A 817C 017B 7BA5 7C00 7BB0 7C00"            /* .‘‰z�|.{{¥|.{°|. */
+	$"00AB 7C80 00A9 7CDF 00FF 00FF 00FF 00AD"            /* .«|€.©|ß.ÿ.ÿ.ÿ.­ */
+	$"0000 7A89 8002 7C73 749C 0002 79BC CE87"            /* ..z‰€.|stœ..y¼Î‡ */
+	$"CC04 CDC2 8172 749B 0002 80CF D587 D304"            /* Ì.ÍÂ�rt›..€ÏÕ‡Ó. */
+	$"D4D1 8870 749A 0002 6E9B D288 D003 D1D2"            /* Ôшptš..n›ÒˆÐ.ÑÒ */
+	$"9E6E 9270 8500 0371 9BCE D289 D002 D1CB"            /* žn’p…..q›ÎÒ‰Ð.ÑË */
+	$"AF91 A801 AA90 8300 0474 80AC B2AF 8AB0"            /* ¯‘¨.ª�ƒ..t€¬²¯Š° */
+	$"02B1 B3B4 90B3 03B5 9D7A 7580 0002 80B7"            /* .±³´�³.µ�zu€..€· */
+	$"C3A4 BF09 C0C3 B57F 0000 A0CF CACA 8DC9"            /* ä¿ÆÀõ... ÏÊÊ�É */
+	$"04CA CAC6 C8CA 8EC9 07CA CACD 9900 009C"            /* .ÊÊÆÈÊŽÉ.ÊÊÍ™..œ */
+	$"CA8F C604 C5CB EDC5 C58F C606 C7C8 9400"            /* Ê�Æ.ÅËíÅÅ�Æ.ÇÈ”. */
+	$"0093 C790 C403 C3F6 E7BF 8FC4 07C5 C48B"            /* .“Ç�Ä.Ãöç¿�Ä.ÅÄ‹ */
+	$"0000 8AC2 C28F C104 BEDA FFCE BE8E C107"            /* ..ŠÂÂ�Á.¾ÚÿξŽÁ. */
+	$"C2BF 8600 0083 BEC0 8DBF 06C0 BEB8 C1FC"            /* ¿†..ƒ¾À�¿.À¾¸Áü */
+	$"F3BC 8EBF 07C0 BA81 0000 7EB9 BE8D BD07"            /* 󼎿.Àº�..~¹¾�½. */
+	$"BAC0 E9D6 E1FF D5B8 8DBD 07BF B57C 0000"            /* ºÀéÖáÿÕ¸�½.¿µ|.. */
+	$"7AB3 BC8C BA09 B9BB DFDB EBCB FDF7 BAB9"            /* z³¼ŒºÆ¹»ßÛëËý÷º¹ */
+	$"8CBA 07BC AE79 0000 77AE B98C B709 B3D7"            /* Œº.¼®y..w®¹Œ·Æ³× */
+	$"FFF8 D3B2 E8FF D7B1 8CB7 07B9 A876 0000"            /* ÿøÓ²èÿ×±Œ·.¹¨v.. */
+	$"74A9 B78A B50C B6B5 B2EC FFFF C6AF C6FF"            /* t©·Šµ.¶µ²ìÿÿƯÆÿ */
+	$"F9B8 B48B B507 B7A3 7400 0073 A3B6 8BB3"            /* ù¸´‹µ.·£t..s£¶‹³ */
+	$"0BAE DBDE DDDB B0B3 B1EA FFD7 AE8B B307"            /* .®ÛÞÝÛ°³±êÿ×®‹³. */
+	$"B59D 7300 0072 9CB3 8AB0 04AD C0FF FFEA"            /* µ�s..rœ³Š°.­Àÿÿê */
+	$"80B0 05AD C4FF F9B4 AF8A B007 B397 7200"            /* €°.­Äÿù´¯Š°.³—r. */
+	$"0071 97B1 85AE 00AC 80AA 0EAB AAEA FFFF"            /* .q—±…®.¬€ª.«ªêÿÿ */
+	$"CFA6 AAAA A9A7 E7FF D5A7 81AA 00AC 85AE"            /* Ϧªª©§çÿÕ§�ª.¬…® */
+	$"07B0 9171 7400 7191 AE84 AB13 AAB2 B9BB"            /* .°‘qt.q‘®„«.ª²¹» */
+	$"BAB2 C6FF FFEB B7B9 B8B7 BBB6 C5FC F7B5"            /* º²Æÿÿë·¹¸·»¶Åü÷µ */
+	$"80B9 01BA B285 AB07 AD8C 7174 0070 8BAB"            /* €¹.º²…«.­Œqt.p‹« */
+	$"84A8 19A4 C1EF FBF4 D2F0 FFFC D1F1 F4F8"            /* „¨.¤ÁïûôÒðÿüÑñôø */
+	$"F0FB F1E2 E5FF DFF2 F3F8 F8CB A484 A807"            /* ðûñâåÿßòóøøˤ„¨. */
+	$"A988 7200 7471 85A7 84A5 09A1 BDFF FFF0"            /* ©ˆr.tq…§„¥Æ¡½ÿÿð */
+	$"D9FF FFE0 E784 FF03 D6F5 CDD4 80FF 01D2"            /* Ùÿÿàç„ÿ.ÖõÍÔ€ÿ.Ò */
+	$"9F85 A506 8472 7474 7181 A484 A208 9EBD"            /* Ÿ…¥.„rttq�¤„¢.ž½ */
+	$"FFFF D2F6 FFF7 D785 FF08 F1BD D8CF F6FF"            /* ÿÿÒöÿ÷×…ÿ.ñ½ØÏöÿ */
+	$"FFD3 9C83 A208 A3A2 8172 7474 727E A084"            /* ÿÓœƒ¢.£¢�rttr~ „ */
+	$"9F09 9CB0 DDCF DFFF FFD2 CCDD 84DC 08DA"            /* ŸÆœ°ÝÏßÿÿÒÌÝ„Ü.Ú */
+	$"CBFF F4C6 DCDD BE9B 839F 08A0 9E7E 7274"            /* ËÿôÆÜݾ›ƒŸ. ž~rt */
+	$"7472 7C9D 849C 089D 9B93 B5FF FFF4 A397"            /* tr|�„œ.�›“µÿÿô£— */
+	$"8598 0897 9BDD E0B4 9398 9A9D 839C 089D"            /* …˜.—›Ýà´“˜š�ƒœ.� */
+	$"9A7B 7374 7473 7998 8699 0597 C8F7 FFC1"            /* š{sttsy˜†™.—È÷ÿÁ */
+	$"9387 9905 96A9 EEF9 A695 8599 089A 9679"            /* “‡™.–©îù¦•…™.š–y */
+	$"7374 7473 7795 8596 0693 A7E6 D1D0 9895"            /* sttsw•…–.“§æÑИ• */
+	$"8796 0695 9BF3 FFE7 9595 8496 0897 9377"            /* ‡–.•›óÿç••„–.—“w */
+	$"7374 7473 7693 8595 058F B0FF ED98 9289"            /* sttsv“…•.�°ÿ혒‰ */
+	$"9505 8ED4 FFFF C58E 8495 0996 9076 7374"            /* •.ŽÔÿÿÅŽ„•Æ–�vst */
+	$"7473 7490 9384 9204 8BC8 E299 8F8A 9206"            /* tst�“„’.‹Èâ™�Š’. */
+	$"8DAD FFFF F494 9183 9202 938C 7581 7402"            /* �­ÿÿô”‘ƒ’.“Œu�t. */
+	$"738D 9184 9003 8EA7 938D 8B90 068F 8EDD"            /* s�‘„�.Ž§“�‹�.�ŽÝ */
+	$"FFD7 8E8F 8390 0191 8A82 7402 728B 8F85"            /* ÿ׎�ƒ�.‘Š‚t.r‹�… */
+	$"8E01 8B8D 8D8E 048C 93A4 8E8D 848E 028F"            /* Ž.‹��Ž.Œ“¤Ž�„Ž.� */
+	$"8773 8174 0272 8B8F 988E 028C 8A8D 858E"            /* ‡s�t.r‹�˜Ž.ŒŠ�…Ž */
+	$"028F 8773 8174 0272 8489 A388 0289 8173"            /* .�‡s�t.r„‰£ˆ.‰�s */
+	$"8174 0173 73A5 7400 73B0 7400 00AB 7480"            /* �t.ss¥t.s°t..«t€ */
+	$"00A9 74DF 0068 386D 6B00 0009 0800 0000"            /* .©tß.h8mk..Æ.... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 002E 4549 4A4A 4A4A 4A4A 4A4A 4A4A"            /* ....EIJJJJJJJJJJ */
+	$"3B0A 0400 0000 0000 0000 0000 0000 0000"            /* ;Â.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 2FF9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ../ùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FD52 0802 0000 0000 0000 0000 0000 0000"            /* ýR.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 4DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Mÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FF7E 1306 0000 0000 0000 0000 0000 0000"            /* ÿ~.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0002 ABFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..«ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFBB 2C11 0B0B 0B0B 0B0B 0B0B 0B0B 0B0B"            /* ÿ»,............. */
+	$"0B0B 0B0B 0B0B 0903 0000 0000 0000 0000"            /* ......Æ......... */
+	$"08B2 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .²ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF DFCC CCCC CCCC CCCC CCCC CCCC CCCC"            /* ÿÿßÌÌÌÌÌÌÌÌÌÌÌÌÌ */
+	$"CCCC CCCC CCCC CBC9 8000 0000 0000 0026"            /* ÌÌÌÌÌÌËÉ€......& */
+	$"71F2 EDEE EFEF EFEF EFEF EFEF EFEF EFEF"            /* qòíîïïïïïïïïïïïï */
+	$"EFEF F4F7 F7F7 F7F7 F7F7 F7F7 F7F7 F7F7"            /* ïïô÷÷÷÷÷÷÷÷÷÷÷÷÷ */
+	$"F7F7 F7F7 F7F7 F7F5 CE41 2000 0000 5EF7"            /* ÷÷÷÷÷÷÷õÎA ...^÷ */
+	$"FFF8 F8F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ÿøøùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F8 FAFF EE41 0000 C4FF"            /* ùùùùùùùøúÿîA..Äÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFA1 0000 B6FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ¡..¶ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF91 0000 A2FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ‘..¢ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF7A 0000 8FFF"            /* ÿÿÿÿÿÿÿÿÿÿÿz..�ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF68 0000 79FF"            /* ÿÿÿÿÿÿÿÿÿÿÿh..yÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF57 0000 5EFF"            /* ÿÿÿÿÿÿÿÿÿÿÿW..^ÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FF48 0000 4BFF"            /* ÿÿÿÿÿÿÿÿÿÿÿH..Kÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FD3B 0000 3FFE"            /* ÿÿÿÿÿÿÿÿÿÿý;..?þ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF F62F 0000 33F8"            /* ÿÿÿÿÿÿÿÿÿÿö/..3ø */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF ED23 0000 27F2"            /* ÿÿÿÿÿÿÿÿÿÿí#..'ò */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF DE1A 0000 1FE9"            /* ÿÿÿÿÿÿÿÿÿÿÞ....é */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF CE10 0000 1ADF"            /* ÿÿÿÿÿÿÿÿÿÿÎ....ß */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF C10B 0100 14D5"            /* ÿÿÿÿÿÿÿÿÿÿÁ....Õ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF B509 0100 0FCD"            /* ÿÿÿÿÿÿÿÿÿÿµÆ...Í */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF AA07 0001 0BC2"            /* ÿÿÿÿÿÿÿÿÿÿª.... */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF A005 0101 09B3"            /* ÿÿÿÿÿÿÿÿÿÿ ...Ƴ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 9504 0101 08A6"            /* ÿÿÿÿÿÿÿÿÿÿ•....¦ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8D04 0101 069A"            /* ÿÿÿÿÿÿÿÿÿÿ�....š */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 8505 0101 0691"            /* ÿÿÿÿÿÿÿÿÿÿ…....‘ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7D05 0101 078B"            /* ÿÿÿÿÿÿÿÿÿÿ}....‹ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7606 0101 0885"            /* ÿÿÿÿÿÿÿÿÿÿv....… */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 7106 0102 0881"            /* ÿÿÿÿÿÿÿÿÿÿq....� */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6D07 0102 0A7E"            /* ÿÿÿÿÿÿÿÿÿÿm...Â~ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6A08 0102 0B7B"            /* ÿÿÿÿÿÿÿÿÿÿj....{ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 6709 0102 0C7C"            /* ÿÿÿÿÿÿÿÿÿÿgÆ...| */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 670A 0102 0C75"            /* ÿÿÿÿÿÿÿÿÿÿgÂ...u */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF 600B 0102 113A"            /* ÿÿÿÿÿÿÿÿÿÿ`....: */
+	$"7B85 8585 8585 8585 8585 8585 8585 8585"            /* {……………………………………… */
+	$"8585 8585 8585 8585 8585 8585 8585 8585"            /* ………………………………………… */
+	$"8585 8585 8585 8585 8574 310F 0101 0B1E"            /* ………………………t1..... */
+	$"2B34 3535 3535 3535 3535 3535 3535 3535"            /* +455555555555555 */
+	$"3535 3535 3535 3535 3535 3535 3535 3535"            /* 5555555555555555 */
+	$"3535 3535 3535 3535 332A 1C0A 0100 040C"            /* 555555553*.Â.... */
+	$"1418 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+	$"1818 1818 1818 1818 1813 0B03 0000 0002"            /* ................ */
+	$"0304 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0402 0100 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0069 7433"            /* .............it3 */
+	$"3200 0025 F700 0000 00FF 00FF 00FF 00FF"            /* 2..%÷....ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 59D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.ŸY× */
+	$"00A6 59D3 0001 5959 8000 9D58 8459 D000"            /* .¦YÓ..YY€.�X„YÐ. */
+	$"0359 5900 569F 5901 5658 8359 D000 0257"            /* .YY.VŸY.VXƒYÐ..W */
+	$"6287 9D95 0494 917F 5E58 8359 CD00 0459"            /* b‡�•.”‘.^XƒYÍ..Y */
+	$"005C 9ABA 9EBC 03B9 AE85 5883 59CD 0004"            /* .\šºž¼.¹®…XƒYÍ.. */
+	$"5900 6EB3 BE9E BF04 BEB6 9D62 5782 59CD"            /* Y.n³¾ž¿.¾¶�bW‚YÍ */
+	$"0003 5900 74B6 A0BE 03B8 9F63 5782 59CC"            /* ..Y.t¶ ¾.¸ŸcW‚YÌ */
+	$"0004 5959 547A B8A0 BC03 B7A0 6357 8359"            /* ..YYTz¸ ¼.· cWƒY */
+	$"CB00 0459 5954 88B9 A0BB 03B7 A366 56B8"            /* Ë..YYTˆ¹ ».·£fV¸ */
+	$"5995 0005 5959 005B A0B9 A0BA 03B8 AA73"            /* Y•..YY.[ ¹ º.¸ªs */
+	$"55BA 5992 0006 5959 0053 7BB4 B9A0 BA04"            /* UºY’..YY.S{´¹ º. */
+	$"B9B2 905A 56BA 5990 0006 5959 0054 73AB"            /* ¹²�ZVºY�..YY.Ts« */
+	$"B8A2 B903 B5AB 865E B756 0300 5859 598E"            /* ¸¢¹.µ«†^·V..XYYŽ */
+	$"0007 5959 005A 83AD B6B7 A2B8 04B7 B4AD"            /* ..YY.Zƒ­¶·¢¸.·´­ */
+	$"9B87 B57D 047B 725D 0059 8D00 0759 5900"            /* ›‡µ}.{r].Y�..YY. */
+	$"5A8F B2B6 B6A4 B704 B6B5 B4B2 B1B4 B003"            /* Z�²¶¶¤·.¶µ´²±´°. */
+	$"ADA0 7600 8059 8900 8159 0355 77AC B0E2"            /* ­ v.€Y‰.�Y.Uw¬°â */
+	$"B103 AFA4 7D56 8259 8600 0159 5980 0003"            /* ±.¯¤}V‚Y†..YY€.. */
+	$"5279 9697 E298 0496 9073 5456 8000 0159"            /* Ry–—â˜.–�sTV€..Y */
+	$"5984 0008 5900 5457 6268 686D 7284 73A1"            /* Y„..Y.TWbhhmr„s¡ */
+	$"74B9 7309 706C 6868 6763 5900 5959 8200"            /* t¹sÆplhhgcY.YY‚. */
+	$"0759 0052 6E96 A4A7 A8E7 A980 A706 A6A0"            /* .Y.Rn–¤§¨ç©€§.¦  */
+	$"8E6A 5759 5982 0002 536F A782 B0E5 AF81"            /* ŽjWYY‚..So§‚°å¯� */
+	$"B006 AFAF AB99 6A00 5980 0004 5900 5A9B"            /* °.¯¯«™j.Y€..Y.Z› */
+	$"AEF0 AF0B AEA6 895B 0059 0000 5900 6CA7"            /* ®ð¯.®¦‰[.Y..Y.l§ */
+	$"B4AE 03AF ABAE AFB7 AE0A A996 6500 5900"            /* ´®.¯«®¯·®Â©–e.Y. */
+	$"0059 5470 A7B3 AD05 AEA8 A299 A8AE B6AD"            /* .YTp§³­.®¨¢™¨®¶­ */
+	$"0AA8 9666 0059 0059 5900 6CA3 B4AB 05A6"            /* ¨–f.Y.YY.l£´«.¦ */
+	$"EDE9 99A7 ACB5 AB0A A692 6200 5900 5959"            /* í陧¬µ«Â¦’b.Y.YY */
+	$"0063 9EB3 A905 A8A8 ECFF E195 B6A9 0BA3"            /* .cž³©.¨¨ìÿᕶ©.£ */
+	$"8D5F 5859 0059 5900 6099 A7B3 A806 A4DC"            /* �_XY.YY.`™§³¨.¤Ü */
+	$"FFFF CA96 AAB4 A80B A187 5B58 5900 5959"            /* ÿÿÊ–ª´¨.¡‡[XY.YY */
+	$"005C 94A6 B3A7 01A3 C580 FF02 AD9D A8B3"            /* .\”¦³§.£Å€ÿ.­�¨³ */
+	$"A70B 9F82 5A58 5900 5959 5857 8DA5 B3A6"            /* §.Ÿ‚ZXY.YYXW�¥³¦ */
+	$"07A4 AEF8 FFFF ED97 A4B2 A603 A59C 7C58"            /* .¤®øÿÿí—¤²¦.¥œ|X */
+	$"8359 0257 87A3 B4A4 01A1 E180 FF02 CB94"            /* ƒY.W‡£´¤.¡á€ÿ.Ë” */
+	$"A6B1 A403 A399 7657 8359 0254 80A1 B4A2"            /* ¦±¤.£™vWƒY.T€¡´¢ */
+	$"019D C180 FF03 FEA4 9BA3 B0A2 03A1 9672"            /* .�Á€ÿ.þ¤›£°¢.¡–r */
+	$"5783 5902 547A 9FB4 A202 A0A6 F380 FF02"            /* WƒY.TzŸ´¢. ¦ó€ÿ. */
+	$"E192 A3B0 A203 A094 6D56 8359 0255 759D"            /* á’£°¢. ”mVƒY.Uu� */
+	$"B5A0 019B D381 FF02 B495 A1AF A006 9D90"            /* µ .›Ó�ÿ.´•¡¯ .�� */
+	$"6957 5959 0080 5902 546D 9BB1 9E00 9F80"            /* iWYY.€Y.Tm›±ž.Ÿ€ */
+	$"A002 9CAF FD80 FF02 EF93 9DAF 9E06 9B8C"            /*  .œ¯ý€ÿ.ï“�¯ž.›Œ */
+	$"6657 5959 0080 5902 5568 97B0 9D07 9F95"            /* fWYY.€Y.Uh—°�.Ÿ• */
+	$"8A89 8B98 9CE2 81FF 02C3 8F9E AE9D 0699"            /* Š‰‹˜œâ�ÿ.Ã�ž®�.™ */
+	$"8861 5759 5900 8059 0256 6494 AF9C 089D"            /* ˆaWYY.€Y.Vd”¯œ.� */
+	$"8C9E D0DD C793 8CBC 81FF 02F7 9899 AE9C"            /* ŒžÐÝÇ“Œ¼�ÿ.÷˜™®œ */
+	$"0697 855F 5859 5900 8059 0257 5E91 AF9B"            /* .—…_XYY.€Y.W^‘¯› */
+	$"0195 B781 FF03 F69B 96ED 81FF 02CE 8B9C"            /* .•·�ÿ.ö›–í�ÿ.΋œ */
+	$"AD9B 0D95 815D 5859 5900 0059 5957 5B8C"            /* ­›.•�]XYY..YYW[Œ */
+	$"98AD 9903 9889 9AD8 81FF 02E0 89C4 81FF"            /* ˜­™.˜‰šØ�ÿ.à‰Ä�ÿ */
+	$"02FD 9E93 AD99 0D93 7C5A 5859 5900 0059"            /* .ýž“­™.“|ZXYY..Y */
+	$"5958 5987 96AC 970C 9889 D3CE 88A1 E8FF"            /* YXY‡–¬—.˜‰ÓΈ¡èÿ */
+	$"FFF9 9B9D F481 FF02 D788 98AC 9702 9079"            /* ÿù›�ô�ÿ.׈˜¬—.�y */
+	$"5A80 5901 0000 8059 0255 8395 AB96 0D97"            /* Z€Y...€Y.Uƒ•«–.— */
+	$"8DA4 FFFF F6B2 84B4 F6FB A28E CC82 FF02"            /* �¤ÿÿö²„´öû¢ŽÌ‚ÿ. */
+	$"A28F 97AB 9601 8E75 8159 0100 0080 5902"            /* ¢�—«–.Žu�Y...€Y. */
+	$"547F 94AB 9502 9688 E481 FF07 E99E 8CBC"            /* T.”«•.–ˆä�ÿ.鞌¼ */
+	$"9991 A2F8 81FF 02DD 8896 AA95 0394 8D71"            /* ™‘¢ø�ÿ.݈–ª•.”�q */
+	$"5880 5901 0000 8059 0255 7993 AA94 0295"            /* X€Y...€Y.Uy“ª”.• */
+	$"87B4 84FF 05D4 8C93 948F D182 FF02 A68C"            /* ‡´„ÿ.ÔŒ“”�Ñ‚ÿ.¦Œ */
+	$"95A9 9403 938A 6D57 8059 0700 0059 595A"            /* •©”.“ŠmW€Y...YYZ */
+	$"5374 91AA 9302 908C F284 FF06 DD92 9293"            /* St‘ª“.�Œò„ÿ.Ý’’“ */
+	$"8FA4 FB81 FF01 E086 AA93 0391 876A 5780"            /* �¤û�ÿ.à†ª“.‘‡jW€ */
+	$"5907 0000 5959 5A53 6F8F A991 0292 87CA"            /* Y...YYZSo�©‘.’‡Ê */
+	$"84FF 02F8 A18D 8091 018D D782 FF02 A788"            /* „ÿ.ø¡�€‘.�ׂÿ.§ˆ */
+	$"92A8 9103 8F84 6757 8059 0100 0080 5902"            /* ’¨‘.�„gW€Y...€Y. */
+	$"556B 8DA9 9002 8E85 DB84 FF01 C78A 8190"            /* Uk�©�.Ž…Û„ÿ.ÇŠ�� */
+	$"028B A8FE 81FF 01E2 84A9 9003 8E82 6357"            /* .‹¨þ�ÿ.â„©�.Ž‚cW */
+	$"8059 0100 0080 5902 5466 8CA8 9005 9186"            /* €Y...€Y.TfŒ¨�.‘† */
+	$"AB85 A6EE 81FF 02EE 958E 8190 028F 8CDC"            /* «…¦î�ÿ.î•Ž��.�ŒÜ */
+	$"82FF 02AA 8591 A790 038D 7F62 5880 5901"            /* ‚ÿ.ª…‘§�.�.bX€Y. */
+	$"0000 8059 0254 618A A78E 0C8F 84A5 FFF0"            /* ..€Y.TaŠ§Ž.�„¥ÿð */
+	$"A480 BBF9 FFFF B688 838E 0189 A982 FF01"            /* ¤€»ùÿÿ¶ˆƒŽ.‰©‚ÿ. */
+	$"E583 A88E 038B 7C5F 5880 5901 0000 8059"            /* 僨Ž.‹|_X€Y...€Y */
+	$"0256 5F87 A78D 028C 83E8 80FF 06DF 9087"            /* .V_‡§�.Œƒè€ÿ.ß�‡ */
+	$"D4E0 8C8C 838D 028C 8ADE 82FF 02AB 838E"            /* ÔàŒŒƒ�.ŒŠÞ‚ÿ.«ƒŽ */
+	$"A68D 038A 7A5D 5880 5901 0000 8059 0257"            /* ¦�.Šz]X€Y...€Y.W */
+	$"5C84 A68C 028D 7EB7 83FF 03C9 8B8E 8B85"            /* \„¦Œ.�~·ƒÿ.É‹Ž‹… */
+	$"8C01 87AA 82FF 01E6 82A7 8C03 8877 5C58"            /* Œ.‡ª‚ÿ.悧Œ.ˆw\X */
+	$"8059 0100 0080 5902 5757 81A6 8A02 878A"            /* €Y...€Y.WW�¦Š.‡Š */
+	$"F584 FF01 CB83 868A 0289 88E0 82FF 02A8"            /* õ„ÿ.˃†Š.‰ˆà‚ÿ.¨ */
+	$"808B A58A 0386 735B 5880 5901 0000 8059"            /* €‹¥Š.†s[X€Y...€Y */
+	$"0258 557F A58A 028B 7BC9 84FF 02F6 9987"            /* .XU.¥Š.‹{É„ÿ.ö™‡ */
+	$"878A 0184 AB82 FF01 E580 A68A 0285 715A"            /* ‡Š.„«‚ÿ.倦Š.…qZ */
+	$"8159 0100 0081 5902 577B 88A3 8902 8A81"            /* �Y...�Y.W{ˆ£‰.Š� */
+	$"9685 FF01 BF82 8889 0288 87E0 82FF 02A7"            /* –…ÿ.¿‚ˆ‰.ˆ‡à‚ÿ.§ */
+	$"7F8A A489 0183 6F82 5901 0000 8159 0254"            /* .Š¤‰.ƒo‚Y...�Y.T */
+	$"7787 A488 017A DC84 FF02 EA8C 8689 8801"            /* w‡¤ˆ.zÜ„ÿ.ꌆ‰ˆ. */
+	$"82A9 82FF 01E3 7EA4 8802 8781 6C82 5901"            /* ‚©‚ÿ.ã~¤ˆ.‡�l‚Y. */
+	$"0000 8159 0151 7497 860E 8784 8686 8486"            /* ..�Y.Qt—†.‡„††„† */
+	$"8684 8685 8486 877B A685 FF11 AD7D 8685"            /* †„†…„†‡{¦…ÿ.­}†… */
+	$"8486 8584 8784 8487 8485 8783 83DF 82FF"            /* „†…„‡„„‡„…‡ƒƒß‚ÿ */
+	$"0FA4 7D87 8584 8785 8487 8485 8784 8586"            /* .¤}‡…„‡…„‡„…‡„…† */
+	$"8596 8602 7F69 5881 5901 0000 8059 035A"            /* …–†..iX�Y...€Y.Z */
+	$"5170 8496 850E 8182 7F7F 827F 8082 7E81"            /* Qp„–….�‚..‚.€‚~� */
+	$"8280 837E EC84 FF12 DB7E 817F 8082 7E81"            /* ‚€ƒ~ì„ÿ.Û~�.€‚~� */
+	$"827E 8182 7E82 817E 827B A682 FF10 E07B"            /* ‚~�‚~‚�~‚{¦‚ÿ.à{ */
+	$"8380 827E 8181 7E82 817E 8280 7F81 8494"            /* ƒ€‚~��~‚�~‚€.�„” */
+	$"8503 847D 6758 8159 0100 0080 5903 5A53"            /* ….„}gX�Y...€Y.ZS */
+	$"6E84 9585 0E82 90FB BCAC FFA4 B9FF 9BD3"            /* n„•….‚�û¼¬ÿ¤¹ÿ›Ó */
+	$"FC97 7BB9 84FF 14FC 91AA FFA8 BFFF 92D1"            /* ü—{¹„ÿ.ü‘ªÿ¨¿ÿ’Ñ */
+	$"FB92 E5ED 87F4 DC95 FFCB 73DF 82FF 0FA0"            /* û’åí‡ôÜ•ÿËsß‚ÿ.  */
+	$"79DC F889 E5ED 90F6 D88F FFC7 AAC2 7D94"            /* yÜø‰åí�öØ�ÿǪÂ}” */
+	$"8503 847C 6558 8159 0100 0080 5903 5A52"            /* ….„|eX�Y...€Y.ZR */
+	$"6983 9584 0E81 92FF BCAA FFC4 D2FF 96D4"            /* iƒ•„.�’ÿ¼ªÿÄÒÿ–Ô */
+	$"FF9A 82F8 84FF 14C6 78CE FFA6 BFFF B6E4"            /* ÿš‚ø„ÿ.ÆxÎÿ¦¿ÿ¶ä */
+	$"FF8D E8F9 AFFE DE91 FFE3 899E 82FF 0FDB"            /* ÿ�èù¯þÞ‘ÿ㉞‚ÿ.Û */
+	$"74E2 FFB1 F3F0 8AFA E9B4 FFC8 A6C7 7C94"            /* tâÿ±óðŠúé´ÿȦÇ|” */
+	$"8403 8379 6258 8159 0100 0080 5903 5A51"            /* „.ƒybX�Y...€Y.ZQ */
+	$"6581 9582 047F 90FF D5C8 81FF 04BB E5F9"            /* e�•‚..�ÿÕÈ�ÿ.»åù */
+	$"86CA 84FF 06F2 82D6 FFFF C6D6 80FF 02FC"            /* †Ê„ÿ.ò‚ÖÿÿÆÖ€ÿ.ü */
+	$"B5EF 80FF 06E9 B8FF FFFA 8AD6 82FF 0196"            /* µï€ÿ.é¸ÿÿúŠÖ‚ÿ.– */
+	$"C680 FF02 F4B4 FA80 FF03 DCC9 C57A 9482"            /* Æ€ÿ.ô´ú€ÿ.ÜÉÅz”‚ */
+	$"0381 7761 5881 5901 0000 8059 035A 5262"            /* .�waX�Y...€Y.ZRb */
+	$"7F95 8102 7E8F FA85 FF01 B190 85FF 01AC"            /* .•�.~�ú…ÿ.±�…ÿ.¬ */
+	$"9A90 FF01 C494 82FF 02D5 8DF9 87FF 01BF"            /* š�ÿ.Ä”‚ÿ.Õ�ù‡ÿ.¿ */
+	$"7994 8103 8075 5F58 8159 0100 0081 5902"            /* y”�.€u_X�Y...�Y. */
+	$"5461 7D95 8002 7D8E FA84 FF02 E779 DD84"            /* Ta}•€.}Žú„ÿ.çyÝ„ */
+	$"FF02 E47C E690 FF02 FC8A D281 FF02 FC8C"            /* ÿ.ä|æ�ÿ.üŠÒ�ÿ.üŒ */
+	$"C787 FF01 BF77 9480 037E 725E 5881 5901"            /* LJÿ.¿w”€.~r^X�Y. */
+	$"0000 8159 0254 5D7C 957F 027C 8EFA 84FF"            /* ..�Y.T]|•..|Žú„ÿ */
+	$"019C A285 FF01 97AD 92FF 01C7 8F80 FF04"            /* .œ¢…ÿ.—­’ÿ.Ç�€ÿ. */
+	$"FBC0 748B F986 FF01 BE76 947F 037D 715C"            /* ûÀt‹ù†ÿ.¾v”..}q\ */
+	$"5881 5901 0000 8159 0254 597B 957F 027C"            /* X�Y...�Y.TY{•..| */
+	$"8EFA 83FF 02D7 7BEF 84FF 02D1 7EF4 92FF"            /* Žúƒÿ.×{ï„ÿ.Ñ~ô’ÿ */
+	$"09FE 8CC9 F8CB 8C64 9F83 C386 FF01 BE76"            /* ÆþŒÉøËŒdŸƒÃ†ÿ.¾v */
+	$"947F 037C 6F5B 5881 5901 0000 8159 0355"            /* ”..|o[X�Y...�Y.U */
+	$"5779 7E94 7D02 7A8C FA82 FF02 FD8A B884"            /* Wy~”}.zŒú‚ÿ.ýŠ¸„ */
+	$"FF02 FA86 C094 FF09 CF74 7C64 7FCB FFC0"            /* ÿ.ú†À”ÿÆÏt|d.ËÿÀ */
+	$"80F7 85FF 01BD 7494 7D02 7A6D 5B82 5901"            /* €÷…ÿ.½t”}.zm[‚Y. */
+	$"0000 8159 0256 5677 957C 0279 8BFA 82FF"            /* ..�Y.VVw•|.y‹ú‚ÿ */
+	$"02C3 82FB 84FF 02BB 86FE 95FF 088C 99D5"            /* .Âû„ÿ.»†þ•ÿ.Œ™Õ */
+	$"FCFF FFFA 7FBC 85FF 01BD 7394 7C02 796B"            /* üÿÿú.¼…ÿ.½s”|.yk */
+	$"5A82 5901 0000 8159 0257 5575 957B 0277"            /* Z‚Y...�Y.WUu•{.w */
+	$"8BFA 81FF 02F4 7DCE 84FF 02EE 7BD6 96FF"            /* ‹ú�ÿ.ô}΄ÿ.î{Ö–ÿ */
+	$"01D0 A782 FF02 C47B F484 FF01 BC72 947B"            /* .Ч‚ÿ.Ä{ô„ÿ.¼r”{ */
+	$"0178 6983 5901 0000 8159 0258 5272 957A"            /* .xiƒY...�Y.XRr•z */
+	$"0877 8AE8 EEEC ECF2 AA91 85FF 02A8 92F2"            /* .wŠèîììòª‘…ÿ.¨’ò */
+	$"95EC 03ED ED93 DC81 FF03 FD83 B2F2 82EC"            /* •ì.íí“Ü�ÿ.ýƒ²ò‚ì */
+	$"02F3 B573 947A 0176 6783 5901 0000 8159"            /* .óµs”z.vgƒY...�Y */
+	$"0258 5070 9679 007A 817F 027E 71E3 84FF"            /* .XPp–y.z�..~qã„ÿ */
+	$"03DF 797F 8096 7F02 8078 A382 FF02 C970"            /* .ßy.€–..€x£‚ÿ.Ép */
+	$"8083 7F00 7D95 7902 7565 5882 5901 0000"            /* €ƒ..}•y.ueX‚Y... */
+	$"8159 0258 4F6F 9779 8077 0278 69AB 85FF"            /* �Y.XOo—y€w.xi«…ÿ */
+	$"029B 7378 9977 0178 DF81 FF02 B468 7583"            /* .›sx™w.xß�ÿ.´huƒ */
+	$"7700 7895 7902 7464 5882 5901 0000 8259"            /* w.x•y.tdX‚Y...‚Y */
+	$"0150 6D9A 7802 747A F384 FF02 CD72 779A"            /* .Pmšx.tzó„ÿ.Írwš */
+	$"7808 71A0 FFFF D98C 8FC6 6D9C 7801 7363"            /* x.q ÿÿÙŒ�Æmœx.sc */
+	$"8359 0100 0082 5901 516B 9A77 016B C484"            /* ƒY...‚Y.Qkšw.kÄ„ */
+	$"FF02 F68A 729B 770A 7677 9B8A 80BD FDFF"            /* ÿ.öŠr›wÂvw›Š€½ýÿ */
+	$"9C6A 789A 7702 7261 5882 5901 0000 8159"            /* œjxšw.raX‚Y...�Y */
+	$"035A 4F68 7598 7602 737B F184 FF01 B96E"            /* .ZOhu˜v.s{ñ„ÿ.¹n */
+	$"9D76 0371 85D7 FB80 FF02 F076 719A 7602"            /* �v.q…×û€ÿ.ðvqšv. */
+	$"7060 5882 5901 0000 8159 035A 4E66 7498"            /* p`X‚Y...�Y.ZNft˜ */
+	$"7504 7380 77C3 FE81 FF02 E97B 729D 7502"            /* u.s€wÃþ�ÿ.é{r�u. */
+	$"727F EF82 FF01 CD66 9A75 026F 5E58 8259"            /* r.ï‚ÿ.Ífšu.o^X‚Y */
+	$"0100 0081 5903 5A4D 6473 9774 0672 76EE"            /* ...�Y.ZMds—t.rvî */
+	$"CC73 83DA 80FF 01A4 6C9F 7401 6CBE 83FF"            /* ÌsƒÚ€ÿ.¤lŸt.l¾ƒÿ */
+	$"02A5 6575 9874 026D 5C58 8259 0100 0081"            /* .¥eu˜t.m\X‚Y...� */
+	$"5902 5A4D 6298 730B 6F82 FAFF F9AD 6A97"            /* Y.ZMb˜s.o‚úÿù­j— */
+	$"F1DC 7172 9F73 016D 9283 FF03 F981 6B74"            /* ñÜqrŸs.m’ƒÿ.ù�kt */
+	$"9773 026C 5B58 8259 0100 0081 5902 5A4D"            /* —s.l[X‚Y...�Y.ZM */
+	$"6098 7301 6C94 81FF 04EC 957B 8470 A073"            /* `˜s.l”�ÿ.ì•{„p s */
+	$"0271 75E7 83FF 02DD 6972 9773 026B 5C58"            /* .quçƒÿ.Ýir—s.k\X */
+	$"8259 0100 0081 5902 5A50 5F98 7201 69A8"            /* ‚Y...�Y.ZP_˜r.i¨ */
+	$"83FF 019B 69A2 7201 6ABF 84FF 02AF 6473"            /* ƒÿ.›i¢r.j¿„ÿ.¯ds */
+	$"9672 026A 5B58 8259 0100 0081 5903 5A51"            /* –r.j[X‚Y...�Y.ZQ */
+	$"5D70 9771 0167 BD81 FF02 F6A1 6FA3 7101"            /* ]p—q.g½�ÿ.ö¡o£q. */
+	$"6B94 84FF 02F7 7B6D 9671 0169 5A83 5901"            /* k”„ÿ.÷{m–q.iZƒY. */
+	$"0000 8159 035A 505B 6F97 7101 69D5 80FF"            /* ..�Y.ZP[o—q.iÕ€ÿ */
+	$"03E8 8B68 70A3 7102 6F74 E984 FF02 BC65"            /* .è‹hp£q.oté„ÿ.¼e */
+	$"7294 7102 7067 5883 5901 0000 8159 035A"            /* r”q.pgXƒY...�Y.Z */
+	$"5059 6F96 7007 6F6F E7FF FFD4 7A69 A670"            /* PYo–p.ooçÿÿÔzi¦p */
+	$"0168 BD84 FF02 EC71 6E94 7002 6F67 5883"            /* .h½„ÿ.ìqn”p.ogXƒ */
+	$"5901 0000 8159 035A 5058 6E96 6F06 6C79"            /* Y...�Y.ZPXn–o.ly */
+	$"F7FF BD6E 6BA7 6F02 6A8B FD83 FF02 FC83"            /* ÷ÿ½nk§o.j‹ýƒÿ.üƒ */
+	$"6B94 6F02 6E66 5783 5901 0000 8159 035A"            /* k”o.nfWƒY...�Y.Z */
+	$"5056 6D96 6E05 688E FBA5 676C A86E 026D"            /* PVm–n.hŽû¥gl¨n.m */
+	$"6AD0 83FF 02F5 7D6B 946E 026D 6456 8359"            /* jЃÿ.õ}k”n.mdVƒY */
+	$"0100 0081 5903 5A4F 556C 966D 0468 9294"            /* ...�Y.ZOUl–m.h’” */
+	$"656C AA6D 0268 87F8 82FF 01BC 6995 6D02"            /* elªm.h‡ø‚ÿ.¼i•m. */
+	$"6C63 5683 5901 0000 8159 035A 5054 6C97"            /* lcVƒY...�Y.ZPTl— */
+	$"6D01 6C68 AD6D 0866 9EF7 FFFF F3B1 6C6B"            /* m.lh­m.fž÷ÿÿó±lk */
+	$"956D 026C 6256 8359 0100 0081 5903 5A50"            /* •m.lbVƒY...�Y.ZP */
+	$"546C CA6D 0667 81A6 9D7A 666C 966D 026C"            /* TlÊm.g�¦�zfl–m.l */
+	$"6256 8359 0100 0081 5903 5A51 536C CB6D"            /* bVƒY...�Y.ZQSlËm */
+	$"0369 6565 6998 6D02 6C62 5783 5901 0000"            /* .ieei˜m.lbWƒY... */
+	$"8159 035A 5152 6AEA 6C02 6B61 5783 5901"            /* �Y.ZQRjêl.kaWƒY. */
+	$"0000 8159 035A 5252 6AEA 6C02 6B61 5783"            /* ..�Y.ZRRjêl.kaWƒ */
+	$"5901 0000 8159 035A 5252 6AEA 6C02 6B61"            /* Y...�Y.ZRRjêl.ka */
+	$"5783 5901 0000 8159 035A 5352 6AEA 6C02"            /* WƒY...�Y.ZSRjêl. */
+	$"6B61 5783 5900 0082 5903 5A54 5168 EA6B"            /* kaWƒY..‚Y.ZTQhêk */
+	$"0269 5E56 8359 0000 8359 0257 4D5E EA63"            /* .i^VƒY..ƒY.WM^êc */
+	$"0260 5756 8359 0100 0082 5902 5A55 53EA"            /* .`WVƒY...‚Y.ZUSê */
+	$"5601 5556 8459 0100 00FB 5901 0000 FB59"            /* V.UV„Y...ûY...ûY */
+	$"0100 00FB 5901 0000 FB59 0100 00FA 5981"            /* ...ûY...ûY...úY� */
+	$"00F9 5982 00F7 5983 00F6 5986 00F3 59FF"            /* .ùY‚.÷Yƒ.öY†.óYÿ */
+	$"00FF 0000 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ...ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00DF 009F 7CD7 00A6 7CD3"            /* .ÿ.ÿ.ÿ.ß.Ÿ|×.¦|Ó */
+	$"0001 7C7C 8000 9D7B 847C D000 037C 7C00"            /* ..||€.�{„|Ð..||. */
+	$"7C9F 7F01 7B7B 837C D000 027B 88A5 9EB0"            /* |Ÿ..{{ƒ|Ð..{ˆ¥ž° */
+	$"03AC 9D81 7B83 7CCD 0004 7C00 81B3 D09E"            /* .¬��{ƒ|Í..|.�³Ðž */
+	$"D302 D0C3 A184 7CCD 0004 7C00 8FCA D79F"            /* Ó.Ðá„|Í..|.�Êן */
+	$"D803 CEB4 837A 827C CD00 037C 0095 CEA0"            /* Ø.δƒz‚|Í..|.•Î  */
+	$"D803 D1B7 847A 827C CC00 047C 7C78 9BD0"            /* Ø.Ñ·„z‚|Ì..||x›Ð */
+	$"A0D7 03D1 B884 7A83 7CCB 0004 7C7C 79A8"            /*  ×.Ѹ„zƒ|Ë..||y¨ */
+	$"D3A0 D703 D2BC 867A B87C 9500 057C 7C00"            /* Ó ×.Ò¼†z¸|•..||. */
+	$"81BD D5A0 D603 D3C3 9278 BA7C 9200 067C"            /* �½Õ Ö.ÓÃ’xº|’..| */
+	$"7C00 799D CED5 A0D6 04D4 CBAC 7D79 BA7C"            /* |.y�ÎÕ Ö.Ôˬ}yº| */
+	$"9000 067C 7C00 7B97 C5D3 A2D5 03D1 C4A3"            /* �..||.{—ÅÓ¢Õ.ÑÄ£ */
+	$"8280 7AB4 7B03 007B 7C7C 8E00 077C 7C00"            /* ‚€z´{..{||Ž..||. */
+	$"81A4 C8D2 D4A2 D505 D4D0 C8B7 A69F B19E"            /* �¤ÈÒÔ¢Õ.ÔÐÈ·¦Ÿ±ž */
+	$"079F 9F9E 9D94 8100 7C8D 0007 7C7C 0081"            /* .ŸŸž�”�.|�..||.� */
+	$"ADCD D3D3 A4D4 03D3 D2D0 CE80 CCB2 CB03"            /* ­ÍÓÓ¤Ô.ÓÒÐ΀̲Ë. */
+	$"C7B9 9500 807C 8900 817C 037A 98C6 CDE2"            /* ǹ•.€|‰.�|.z˜ÆÍâ */
+	$"CE03 CCBE 9B7A 827C 8600 017C 7C80 0002"            /* Î.̾›z‚|†..||€.. */
+	$"7697 B181 B403 B5B5 B4B4 9EB5 01B4 B4B6"            /* v—±�´.µµ´´žµ.´´¶ */
+	$"B506 B4B4 B3AA 9177 7980 0001 7C7C 8400"            /* µ.´´³ª‘wy€..||„. */
+	$"097C 0078 7D87 8B8B 8D94 95E2 960A 9592"            /* Æ|.x}‡‹‹�”•â–•’ */
+	$"8E8C 8B8B 867D 007C 7C82 0009 7C00 7892"            /* ŽŒ‹‹†}.||‚.Æ|.x’ */
+	$"B5C1 C4C5 C6C6 81C7 03C6 C6C7 C79E C601"            /* µÁÄÅÆÆ�Ç.ÆÆÇÇžÆ. */
+	$"C7C7 82C6 01C7 C7AC C683 C70A C6C6 C4C3"            /* ÇÇ‚Æ.ÇǬƃÇÂÆÆÄà */
+	$"C3BD AB8C 7A7C 7C82 0005 7893 C5CE CFD0"            /* ý«Œz||‚..x“ÅÎÏÐ */
+	$"E9CF 08D0 D0CF CEC9 B58B 007C 8000 047C"            /* éÏ.ÐÐÏÎɵ‹.|€..| */
+	$"0080 B9CE F0D0 0CCF C5A7 7E00 7C00 007C"            /* .€¹ÎðÐ.Ïŧ~.|..| */
+	$"008F C5CE B3CF 03D0 CDCF D0B7 CF0A C9B2"            /* .�ÅγÏ.ÐÍÏзÏÂɲ */
+	$"8600 7C00 007C 7894 C6B3 CF05 D0CB BEBA"            /* †.|..|x”ƳÏ.Ð˾º */
+	$"CCD0 B6CF 0ACA B487 007C 007C 7C00 8FC4"            /* ÌжÏÂÊ´‡.|.||.�Ä */
+	$"B4CE 05C9 F2ED B9CC CFB5 CE0B C8B1 8400"            /* ´Î.Éòí¹ÌϵÎ.ȱ„. */
+	$"7C00 7C7C 0089 C0CC B3CD 05CC F3FF E7B9"            /* |.||.‰À̳Í.Ìóÿç¹ */
+	$"CEB5 CD0B C5AC 817B 7C00 7C7C 0085 BCCB"            /* εÍ.Ŭ�{|.||.…¼Ë */
+	$"B3CC 06C9 EAFF FFD8 BDCE B4CC 0BC4 A77D"            /* ³Ì.ÉêÿÿؽδÌ.ħ} */
+	$"7B7C 007C 7C00 81B6 CAB3 CC01 C9DC 80FF"            /* {|.||.�¶Ê³Ì.ÉÜ€ÿ */
+	$"02C6 C4CD B2CC 0DCB C1A3 7D7B 7C00 7C7C"            /* .ÆÄͲÌ.ËÁ£}{|.|| */
+	$"7B7D B1C9 CBB2 CA07 C9CF FBFF FFF1 BACB"            /* {}±É˲Ê.ÉÏûÿÿñºË */
+	$"B2CA 03C9 BE9D 7B83 7C02 7BAB C8B4 CA01"            /* ²Ê.ɾ�{ƒ|.{«È´Ê. */
+	$"C8ED 80FF 02D9 BCCB B1CA 03C9 BC98 7A83"            /* Èí€ÿ.ټ˱Ê.ɼ˜zƒ */
+	$"7C02 7AA5 C6B4 C901 C6DA 80FF 03FD C1C4"            /* |.z¥Æ´É.ÆÚ€ÿ.ýÁÄ */
+	$"CAB0 C903 C7B9 957A 837C 0279 9FC4 B4C8"            /* Ê°É.ǹ•zƒ|.yŸÄ´È */
+	$"02C7 CAF7 80FF 02E8 B8C9 B0C8 03C5 B68F"            /* .ÇÊ÷€ÿ.è¸É°È.Ŷ� */
+	$"7A83 7C02 799A C2B5 C701 C4E4 81FF 02CA"            /* zƒ|.yšÂµÇ.Ää�ÿ.Ê */
+	$"BFC8 AFC7 06C4 B38B 7A7C 7C00 807C 0278"            /* ¿È¯Ç.ij‹z||.€|.x */
+	$"93C0 B1C6 00C7 80C8 02C4 CFFD 80FF 01F2"            /* “À±Æ.Ç€È.ÄÏý€ÿ.ò */
+	$"B8B0 C606 C2AF 897A 7C7C 0080 7C02 798F"            /* ¸°Æ.¯‰z||.€|.y� */
+	$"BEB0 C607 C8C0 B4B2 B6C3 C6ED 81FF 02D4"            /* ¾°Æ.ÈÀ´²¶ÃÆí�ÿ.Ô */
+	$"BBC7 AEC6 06C1 AC84 7A7C 7C00 807C 0279"            /* »Ç®Æ.Á¬„z||.€|.y */
+	$"8BBB AFC5 08C6 B6BA DCE5 D5B3 BAD8 81FF"            /* ‹»¯Å.ƶºÜåÕ³ºØ�ÿ */
+	$"02F9 BBC4 AEC5 06C0 A982 7B7C 7C00 807C"            /* .ù»Ä®Å.À©‚{||.€| */
+	$"027A 85B7 AEC4 02C5 C1CE 81FF 03F7 BAC1"            /* .z…·®Ä.ÅÁÎ�ÿ.÷ºÁ */
+	$"F481 FF02 DCB7 C6AD C40D BDA5 817B 7C7C"            /* ô�ÿ.Ü·Æ­Ä.½¥�{|| */
+	$"0000 7C7C 7A83 B4C3 ADC4 03C3 B3BE E981"            /* ..||zƒ´Ã­Ä.ó¾é� */
+	$"FF02 E8B6 DC81 FF02 FDBE C0AD C40D BCA1"            /* ÿ.è¶Ü�ÿ.ý¾À­Ä.¼¡ */
+	$"7E7B 7C7C 0000 7C7C 7B80 B0C2 ACC3 0CC4"            /* ~{||..||{€°Â¬Ã.Ä */
+	$"B5DD DAAE C4F2 FFFF FAC2 C5F8 81FF 02E2"            /* µÝÚ®ÄòÿÿúÂÅø�ÿ.â */
+	$"B5C4 ACC3 01B9 9D81 7C07 0000 7C7C 7B7C"            /* µÄ¬Ã.¹��|...||{| */
+	$"ABC0 ABC1 0DC2 BCC1 FFFF F7C7 ACD0 FBFC"            /* «À«Á.¼Áÿÿ÷ǬÐûü */
+	$"C7BC E082 FF02 C0BD C2AB C101 B79A 817C"            /* Ǽà‚ÿ.À½Â«Á.·š�| */
+	$"0100 0080 7C02 7BA7 BFAB C102 C2B2 EB81"            /* ...€|.{§¿«Á.²ë� */
+	$"FF07 EDB9 B3D7 C3BF C7FA 81FF 02E6 B3C2"            /* ÿ.í¹³×ÿÇú�ÿ.æ³Â */
+	$"AAC1 03C0 B595 7B80 7C01 0000 807C 027A"            /* ªÁ.Àµ•{€|...€|.z */
+	$"A3BE AAC0 02C1 B6CA 84FF 05DE B8C0 C0BD"            /* £¾ªÀ.Á¶Ê„ÿ.Þ¸ÀÀ½ */
+	$"E382 FF02 C2BA C1A9 C003 BFB2 927A 807C"            /* ã‚ÿ.ºÁ©À.¿²’z€| */
+	$"0100 0080 7C02 789D BCAA BF02 BEB3 F584"            /* ...€|.x�¼ª¿.¾³õ„ */
+	$"FF06 EBBF BEBF BDC9 FC81 FF02 E8B2 C0A9"            /* ÿ.뿾¿½Éü�ÿ.è²À© */
+	$"BF03 BEB0 8F7A 807C 0100 0080 7C02 7898"            /* ¿.¾°�z€|...€|.x˜ */
+	$"BAA9 BE02 BFB5 D984 FF02 FBC7 BC80 BE01"            /* º©¾.¿µÙ„ÿ.ûǼ€¾. */
+	$"BBE7 82FF 02C3 B7BF A8BE 03BC AD8B 7A80"            /* »ç‚ÿ.÷¿¨¾.¼­‹z€ */
+	$"7C01 0000 807C 0278 95B9 A9BD 02BC B3E9"            /* |...€|.x•¹©½.¼³é */
+	$"84FF 01DD B981 BD02 BACB FE81 FF02 EAB0"            /* „ÿ.ݹ�½.ºËþ�ÿ.ê° */
+	$"BEA8 BD03 BAAA 887A 807C 0100 0080 7C02"            /* ¾¨½.ºªˆz€|...€|. */
+	$"7890 B8A8 BD05 BEB2 C1AC C7F6 81FF 02F4"            /* x�¸¨½.¾²Á¬Çö�ÿ.ô */
+	$"C0BC 82BD 01BB EA82 FF02 C4B6 BEA7 BD03"            /* À¼‚½.»ê‚ÿ.Ķ¾§½. */
+	$"BAA8 867A 807C 0100 0080 7C02 788B B5A7"            /* º¨†z€|...€|.x‹µ§ */
+	$"BC0C BDB5 C1FF F2BD AAD5 FCFF FFD3 B983"            /* ¼.½µÁÿò½ªÕüÿÿÓ¹ƒ */
+	$"BC01 B9CC 82FF 02EB AFBD A7BC 03B8 A584"            /* ¼.¹Ì‚ÿ.믽§¼.¸¥„ */
+	$"7B80 7C01 0000 807C 0279 88B3 A8BC 01AE"            /* {€|...€|.yˆ³¨¼.® */
+	$"ED80 FF06 E5B1 B1E6 ECBB BB84 BC01 B9EB"            /* í€ÿ.å±±æì»»„¼.¹ë */
+	$"82FF 02C5 B4BD A6BC 03B7 A381 7B80 7C01"            /* ‚ÿ.Å´½¦¼.·£�{€|. */
+	$"0000 807C 027A 85B1 A6BB 02BC AFCC 82FF"            /* ..€|.z…±¦».¼¯Ì‚ÿ */
+	$"04FE D6AF BBBA 85BB 01B7 CC82 FF02 ECAE"            /* .þÖ¯»º…».·Ì‚ÿ.ì® */
+	$"BCA6 BB03 B5A0 807B 807C 0100 0080 7C03"            /* ¼¦».µ €{€|...€|. */
+	$"7A80 ADB9 A5BA 02B8 B0F7 84FF 01DE B486"            /* z€­¹¥º.¸°÷„ÿ.Þ´† */
+	$"BA02 B9B8 EB82 FF02 C3B2 BBA5 BA03 B39C"            /* º.¹¸ë‚ÿ.ò»¥º.³œ */
+	$"7F7B 807C 0100 0080 7C03 7B7E AAB7 A4B8"            /* .{€|...€|.{~ª·¤¸ */
+	$"02BA ABD8 84FF 02F9 C1B6 87B8 01B5 CC82"            /* .º«Ø„ÿ.ùÁ¶‡¸.µÌ‚ */
+	$"FF02 EBAC B9A5 B803 B199 7D7B 807C 0100"            /* ÿ.묹¥¸.±™}{€|.. */
+	$"0080 7C03 7B7D A7B6 A4B7 02B2 B7FE 84FF"            /* .€|.{}§¶¤·.²·þ„ÿ */
+	$"01D7 B388 B702 B6B6 EB82 FF02 C2B0 B8A4"            /* .׳ˆ·.¶¶ë‚ÿ.°¸¤ */
+	$"B701 AF96 827C 0100 0081 7C02 7BA3 B5A3"            /* ·.¯–‚|...�|.{£µ£ */
+	$"B602 B7A8 E584 FF02 F1B8 B589 B601 B3CA"            /* ¶.·¨å„ÿ.ñ¸µ‰¶.³Ê */
+	$"82FF 02EA AAB7 A4B6 01AD 9382 7C01 0000"            /* ‚ÿ.ꪷ¤¶.­“‚|... */
+	$"817C 0278 9FB4 97B5 0DB4 B5B6 B4B6 B5B4"            /* �|.xŸ´—µ.´µ¶´¶µ´ */
+	$"B6B5 B4B6 B6AD C085 FF11 CCB0 B6B5 B4B6"            /* ¶µ´¶¶­À…ÿ.Ì°¶µ´¶ */
+	$"B5B4 B6B5 B4B6 B4B5 B6B3 B4EB 82FF 0EC0"            /* µ´¶µ´¶´µ¶³´ë‚ÿ.À */
+	$"AFB6 B5B4 B6B4 B4B6 B4B5 B6B4 B5B6 97B5"            /* ¯¶µ´¶´´¶´µ¶´µ¶—µ */
+	$"01AB 9082 7C01 0000 817C 0278 9CB3 95B5"            /* .«�‚|...�|.xœ³•µ */
+	$"0FB6 AFA7 A9AA A7AA AAA7 ABA9 A7AC B1A9"            /* .¶¯§©ª§ªª§«©§¬±© */
+	$"F084 FF12 E9AA A6AA AAA7 ABA9 A7AB A8A8"            /* ð„ÿ.骦ªª§«©§«¨¨ */
+	$"ACA8 A8AB A7A5 C882 FF0F E8A8 B2A8 A8AB"            /* ¬¨¨«§¥È‚ÿ.訲¨¨« */
+	$"A8A8 ACA8 A9AC A7A9 AAAB 95B5 03B4 A98E"            /* ¨¨¬¨©¬§©ª«•µ.´©Ž */
+	$"7B81 7C01 0000 817C 0278 99B2 95B4 0EB3"            /* {�|...�|.x™²•´.³ */
+	$"B7F9 D2C7 FFC1 CEFF BCE1 FABB AACD 84FF"            /* ·ùÒÇÿÁÎÿ¼áú»ªÍ„ÿ */
+	$"14FD BAC6 FFC5 D3FF B7DF F9B7 EBF2 B0F6"            /* .ýºÆÿÅÓÿ·ßù·ëò°ö */
+	$"E6B9 FDDA A7EB 82FF 0FBD AAE6 F8B0 EBF1"            /* æ¹ýÚ§ë‚ÿ.½ªæø°ëñ */
+	$"B5F7 E3B4 FED9 C5D5 AF94 B403 B3A7 8B7B"            /* µ÷ã´þÙÅÕ¯”´.³§‹{ */
+	$"817C 0100 0081 7C02 7794 B195 B30E B1B9"            /* �|...�|.w”±•³.±¹ */
+	$"FFD2 C7FF D3DE FFBA E3FF BDAA F984 FF14"            /* ÿÒÇÿÓÞÿºãÿ½ªù„ÿ. */
+	$"DBA2 DAFF C4D4 FFCA EBFE B4EF FBC4 FEE9"            /* Û¢ÚÿÄÔÿÊëþ´ïûÄþé */
+	$"B6FF EAAB C082 FF0F E4A3 ECFF C5F6 F5B2"            /* ¶ÿê«À‚ÿ.ä£ìÿÅöõ² */
+	$"FBEF C8FF DAC4 DAAE 94B3 03B2 A589 7B81"            /* ûïÈÿÚÄÚ®”³.²¥‰{� */
+	$"7C01 0000 807C 037D 7690 AE95 B104 AFB7"            /* |...€|.}v�®•±.¯· */
+	$"FFE0 D681 FF04 CDEC FCAE D884 FF06 F7AC"            /* ÿàÖ�ÿ.Íìü®Ø„ÿ.÷¬ */
+	$"E0FF FFD4 E180 FF02 FDC9 F380 FF06 EFCA"            /* àÿÿÔá€ÿ.ýÉó€ÿ.ïÊ */
+	$"FFFF FAAE E582 FF01 B6DA 80FF 02F7 C7FB"            /* ÿÿú®å‚ÿ.¶Ú€ÿ.÷Çû */
+	$"80FF 03E5 D6D9 AC94 B103 B0A2 877B 817C"            /* €ÿ.åÖÙ¬”±.°¢‡{�| */
+	$"0100 0081 7C02 768D AC95 B002 AEB7 FB85"            /* ...�|.v�¬•°.®·û… */
+	$"FF01 CDB1 85FF 01C9 B890 FF01 D5B8 82FF"            /* ÿ.ͱ…ÿ.ɸ�ÿ.Õ¸‚ÿ */
+	$"02E0 B3FC 87FF 01D5 AA94 B003 AE9F 857B"            /* .à³ü‡ÿ.Õª”°.®Ÿ…{ */
+	$"817C 0100 0081 7C02 788A AB95 AF02 ADB6"            /* �|...�|.xŠ«•¯.­¶ */
+	$"FB84 FF02 F0A5 E584 FF02 EEA6 EC90 FF02"            /* û„ÿ.ð¥å„ÿ.î¦ì�ÿ. */
+	$"FCAE E281 FF02 FCB4 DB87 FF01 D5A9 94AF"            /* ü®â�ÿ.ü´Û‡ÿ.Õ©”¯ */
+	$"03AC 9D83 7B81 7C01 0000 817C 0278 86A9"            /* .¬�ƒ{�|...�|.x†© */
+	$"95AD 02AB B4FB 84FF 01BE BD85 FF01 BAC3"            /* •­.«´û„ÿ.¾½…ÿ.ºÃ */
+	$"92FF 01D6 B480 FF04 FCD8 A4B3 FB86 FF01"            /* ’ÿ.Ö´€ÿ.üؤ³û†ÿ. */
+	$"D4A7 94AD 03AB 9A81 7B81 7C01 0000 817C"            /* Ô§”­.«š�{�|...�| */
+	$"0278 83A7 95AC 02AA B3FB 83FF 02E5 A3F2"            /* .xƒ§•¬.ª³ûƒÿ.å£ò */
+	$"84FF 02E1 A5F6 92FF 09FD AEDC FBDE B595"            /* „ÿ.á¥ö’ÿÆý®ÜûÞµ• */
+	$"B6A9 D886 FF01 D3A6 94AC 03A9 9880 7B81"            /* ¶©Ø†ÿ.Ó¦”¬.©˜€{� */
+	$"7C01 0000 817C 0278 80A5 95AC 02AA B3FB"            /* |...�|.x€¥•¬.ª³û */
+	$"82FF 02FE B0CB 84FF 02FC ADD0 94FF 09DB"            /* ‚ÿ.þ°Ë„ÿ.ü­Ð”ÿÆÛ */
+	$"A1A8 95A2 D6FF D1AA FA85 FF01 D3A6 94AC"            /* ¡¨•¢ÖÿѪú…ÿ.Ó¦”¬ */
+	$"03A8 967F 7B81 7C01 0000 817C 0279 7FA3"            /* .¨–.{�|...�|.y.£ */
+	$"95AB 02A9 B2FB 82FF 02D7 A7FB 84FF 02D2"            /* •«.©²û‚ÿ.קû„ÿ.Ò */
+	$"AAFD 95FF 08AD B4DD FCFF FFFA A5D3 85FF"            /* ªý•ÿ.­´Ýüÿÿú¥Ó…ÿ */
+	$"01D3 A594 AB03 A694 7E7B 817C 0100 0081"            /* .Ó¥”«.¦”~{�|...� */
+	$"7C02 7A7D A095 A902 A7B1 FB81 FF02 F8A5"            /* |.z} •©.§±û�ÿ.ø¥ */
+	$"DA84 FF02 F4A4 E096 FF01 DCC2 82FF 02D3"            /* Ú„ÿ.ô¤à–ÿ.Ü‚ÿ.Ó */
+	$"A5F8 84FF 01D2 A394 A902 A491 7D82 7C01"            /* ¥ø„ÿ.Ò£”©.¤‘}‚|. */
+	$"0000 817C 027A 7A9E 95A8 08A6 B1EF F3F2"            /* ..�|.zzž•¨.¦±ïóò */
+	$"F2F6 C6B0 85FF 02C5 B4F5 95F2 03F3 F2B5"            /* òöÆ°…ÿ.Å´õ•ò.óòµ */
+	$"E881 FF03 FCA7 CCF6 82F2 02F7 CDA3 94A8"            /* è�ÿ.ü§Ìö‚ò.÷Í£”¨ */
+	$"01A3 8F83 7C01 0000 817C 027B 779C 96A7"            /* .£�ƒ|...�|.{wœ–§ */
+	$"00A8 82AB 019C E984 FF03 E9A6 AAAC 96AB"            /* .¨‚«.œé„ÿ.馪¬–« */
+	$"02AC A6C1 82FF 02D8 A0AC 83AB 00A9 95A7"            /* .¬¦Á‚ÿ.Ø ¬ƒ«.©•§ */
+	$"01A1 8D83 7C01 0000 817C 037B 7699 A595"            /* .¡�ƒ|...�|.{v™¥• */
+	$"A600 A580 A402 A599 C085 FF02 BCA1 A599"            /* ¦.¥€¤.¥™À…ÿ.¼¡¥™ */
+	$"A401 A5E9 81FF 02CB 96A3 83A4 00A5 95A6"            /* ¤.¥é�ÿ.Ë–£ƒ¤.¥•¦ */
+	$"029F 8A7B 827C 0100 0082 7C02 7596 A399"            /* .ŸŠ{‚|...‚|.u–£™ */
+	$"A402 A29F F584 FF01 DDA0 9BA4 09A0 BFFF"            /* ¤.¢Ÿõ„ÿ.Ý ›¤Æ ¿ÿ */
+	$"FFE6 ADAB D299 A59B A402 9D88 7B82 7C01"            /* ÿæ­«Ò™¥›¤.�ˆ{‚|. */
+	$"0000 827C 0276 94A2 98A3 02A4 98D1 84FF"            /* ..‚|.v”¢˜£.¤˜Ñ„ÿ */
+	$"02F9 AFA0 9CA3 09A4 B9A9 A0CB FCFF B599"            /* .ù¯ œ£Æ¤¹© Ëüÿµ™ */
+	$"A49A A302 9C87 7B82 7C01 0000 827C 0275"            /* ¤š£.œ‡{‚|...‚|.u */
+	$"92A2 98A3 02A1 A4F5 84FF 01CF 9E9D A303"            /* ’¢˜£.¡¤õ„ÿ.Ïž�£. */
+	$"A0A9 DEFB 80FF 02F3 9CA0 9AA3 029B 867B"            /*  ©Þû€ÿ.󜠚£.›†{ */
+	$"827C 0100 0081 7C03 7D74 8FA1 97A2 05A3"            /* ‚|...�|.}t�¡—¢.£ */
+	$"9FA0 9ED6 FE81 FF02 F0A6 A09D A202 A0A9"            /* Ÿ žÖþ�ÿ.ð¦ �¢. © */
+	$"F382 FF01 D893 9AA2 0299 837B 827C 0100"            /* ó‚ÿ.Ø“š¢.™ƒ{‚|.. */
+	$"0081 7C03 7D73 8D9F 97A0 069F 9FF1 D697"            /* .�|.}s�Ÿ— .ŸŸñÖ— */
+	$"A6E6 80FF 01C1 9B9F A001 9BD2 83FF 02BB"            /* ¦æ€ÿ.Á›Ÿ .›Òƒÿ.» */
+	$"94A1 98A0 0297 827B 827C 0100 0081 7C03"            /* ”¡˜ .—‚{‚|...�|. */
+	$"7D72 8A9E 979F 0B9D A6FB FFF9 BF91 B6F6"            /* }rŠž—Ÿ.�¦ûÿù¿‘¶ö */
+	$"E69E 9E9F 9F01 9BB4 83FF 03FA A199 A096"            /* æžžŸŸ.›´ƒÿ.ú¡™ – */
+	$"9F03 9E95 807B 827C 0100 0081 7C03 7D72"            /* Ÿ.ž•€{‚|...�|.}r */
+	$"889D 979E 0199 B281 FF04 EFAD 9EA9 9CA0"            /* ˆ�—ž.™²�ÿ.ï­ž©œ  */
+	$"9E02 9D9F EE83 FF01 E492 979E 039D 9480"            /* ž.�Ÿîƒÿ.ä’—ž.�”€ */
+	$"7B82 7C01 0000 817C 037D 7487 9B97 9D01"            /* {‚|...�|.}t‡›—�. */
+	$"96BF 82FF 02FE B697 A29D 0198 D184 FF02"            /* –¿‚ÿ.þ¶—¢�.˜Ñ„ÿ. */
+	$"C191 9E95 9D03 9C92 7F7B 827C 0100 0081"            /* Á‘ž•�.œ’.{‚|...� */
+	$"7C03 7D75 849A 979C 0194 CE81 FF02 F8BD"            /* |.}u„š—œ.”Î�ÿ.ø½ */
+	$"9BA3 9C01 98B4 84FF 02F8 9D99 959C 039B"            /* ›£œ.˜´„ÿ.ø�™•œ.› */
+	$"907E 7B82 7C01 0000 817C 037D 7482 9997"            /* �~{‚|...�|.}t‚™— */
+	$"9B01 94DF 80FF 03EE AD95 9AA3 9B02 9A9D"            /* ›.”߀ÿ.î­•š£›.š� */
+	$"EF84 FF02 CC91 9C94 9B03 9A8F 7C7B 827C"            /* ï„ÿ.Ì‘œ”›.š�|{‚| */
+	$"0100 0081 7C03 7D74 8098 979A 0697 ECFF"            /* ...�|.}t€˜—š.—ìÿ */
+	$"FFE0 A195 A69A 0195 D084 FF02 F098 9994"            /* ÿà¡•¦š.•Ð„ÿ.𘙔 */
+	$"9A02 998D 7B83 7C01 0000 817C 037D 737E"            /* š.™�{ƒ|...�|.}s~ */
+	$"9896 9A06 989F F9FF D099 97A7 9A02 96AD"            /* ˜–š.˜ŸùÿЙ—§š.–­ */
+	$"FD83 FF02 FCA6 9794 9A02 998D 7B83 7C01"            /* ýƒÿ.ü¦—”š.™�{ƒ|. */
+	$"0000 817C 037D 737D 9796 9905 95AD FCBE"            /* ..�|.}s}—–™.•­ü¾ */
+	$"9498 A999 0196 DD83 FF02 F7A3 9794 9902"            /* ”˜©™.–݃ÿ.÷£—”™. */
+	$"988C 7A83 7C01 0000 817C 037D 737B 9696"            /* ˜Œzƒ|...�|.}s{–– */
+	$"9803 95B0 B392 AB98 0294 AAF9 82FF 01CF"            /* ˜.•°³’«˜.”ªù‚ÿ.Ï */
+	$"9595 9802 978A 7A83 7C01 0000 817C 037D"            /* ••˜.—Šzƒ|...�|.} */
+	$"747B 9498 9700 94AD 9708 93B9 F9FF FFF6"            /* t{”˜—.”­—.“¹ùÿÿö */
+	$"C797 9695 9702 9688 7983 7C01 0000 817C"            /* Ç—–•—.–ˆyƒ|...�| */
+	$"037D 7479 93CA 9606 92A4 BEB8 9F91 9596"            /* .}ty“Ê–.’¤¾¸Ÿ‘•– */
+	$"9602 9588 7983 7C01 0000 817C 037D 7478"            /* –.•ˆyƒ|...�|.}tx */
+	$"93CB 9603 9390 9193 9896 0294 8779 837C"            /* “Ë–.“�‘“˜–.”‡yƒ| */
+	$"0100 0081 7C03 7D75 7892 EA95 0293 8679"            /* ...�|.}ux’ê•.“†y */
+	$"837C 0100 0081 7C03 7D75 7892 EA95 0293"            /* ƒ|...�|.}ux’ê•.“ */
+	$"8679 837C 0100 0081 7C03 7D76 7792 EA95"            /* †yƒ|...�|.}vw’ê• */
+	$"0293 8679 837C 0100 0081 7C03 7D76 7792"            /* .“†yƒ|...�|.}vw’ */
+	$"EA95 0293 8579 837C 0000 827C 037D 7776"            /* ê•.“…yƒ|..‚|.}wv */
+	$"8FEA 9402 9182 7883 7C00 0083 7C03 7A70"            /* �ê”.‘‚xƒ|..ƒ|.zp */
+	$"8288 E989 0285 7A79 837C 0100 0082 7C02"            /* ‚ˆé‰.…zyƒ|...‚|. */
+	$"7D78 76EA 7901 7779 847C 0100 00FB 7C01"            /* }xvêy.wy„|...û|. */
+	$"0000 FB7C 0100 00FB 7C01 0000 FB7C 0100"            /* ..û|...û|...û|.. */
+	$"00FA 7C81 00F9 7C82 00F7 7C83 00F6 7C86"            /* .ú|�.ù|‚.÷|ƒ.ö|† */
+	$"00F3 7CFF 00FF 0000 00FF 00FF 00FF 00FF"            /* .ó|ÿ.ÿ...ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+	$"00FF 00FF 00FF 00FF 00FF 00DF 009F 74D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.Ÿt× */
+	$"00A6 74D3 0001 7474 8000 9D73 8474 D000"            /* .¦tÓ..tt€.�s„tÐ. */
+	$"0374 7400 749E 7702 7673 7283 74D0 0003"            /* .tt.tžw.vsrƒtÐ.. */
+	$"7381 9FAB 9DAC 03A8 977A 7383 74CD 0004"            /* s�Ÿ«�¬.¨—zsƒtÍ.. */
+	$"7400 79AF CC9E CF03 CCBF 9B73 8374 CD00"            /* t.y¯ÌžÏ.Ì¿›sƒtÍ. */
+	$"0474 0088 C6D2 9FD3 03CA AF7C 7282 74CD"            /* .t.ˆÆÒŸÓ.ʯ|r‚tÍ */
+	$"0003 7400 8EC9 A0D3 03CC B27D 7282 74CC"            /* ..t.ŽÉ Ó.̲}r‚tÌ */
+	$"0004 7474 7094 CBA0 D203 CCB3 7C72 8374"            /* ..ttp”Ë Ò.̳|rƒt */
+	$"CB00 0474 7471 A1CE A0D1 03CC B67F 72B8"            /* Ë..ttq¡Î Ñ.̶.r¸ */
+	$"7495 0005 7474 0078 B7D0 A0D1 03CE BE8B"            /* t•..tt.x·Ð Ñ.ξ‹ */
+	$"70BA 7492 0006 7474 0070 96C9 CFA0 D004"            /* pºt’..tt.p–ÉÏ Ð. */
+	$"CFC6 A675 71BA 7490 0006 7474 0072 8FC0"            /* ÏƦuqºt�..tt.r�À */
+	$"CDA2 CF03 CBBF 9D7A B672 0473 0073 7474"            /* Í¢Ï.Ë¿�z¶r.s.stt */
+	$"8E00 0674 7400 799D C3CD A3CF 04CE CAC3"            /* Ž..tt.y�ÃÍ£Ï.ÎÊà */
+	$"B2A0 B598 0496 8D79 0074 8D00 0774 7400"            /* ² µ˜.–�y.t�..tt. */
+	$"79A8 C8CE CEA4 CF03 CECD CBC9 B5C7 03C3"            /* y¨ÈÎΤÏ.ÎÍËɵÇ.à */
+	$"B58F 0080 7489 0081 7403 7192 C1C8 E2C9"            /* µ�.€t‰.�t.q’ÁÈâÉ */
+	$"03C7 B995 7282 7486 0001 7474 8000 026E"            /* .ǹ•r‚t†..tt€..n */
+	$"91AC E3AF 04AE A58A 6F71 8000 0174 7484"            /* ‘¬ã¯.®¥Šoq€..tt„ */
+	$"0008 7400 7075 8085 8487 8E80 8FAA 9000"            /* ..t.pu€…„‡Ž€�ª�. */
+	$"8FB0 9080 8F09 8B87 8584 847F 7600 7474"            /* �°�€�Æ‹‡…„„.v.tt */
+	$"8200 0774 0070 8BAF BCBF C0E7 C109 C0BF"            /* ‚..t.p‹¯¼¿ÀçÁÆÀ¿ */
+	$"BEBE B8A6 8572 7474 8200 0370 8DC0 C9EE"            /* ¾¾¸¦…rtt‚..p�ÀÉî */
+	$"CA05 C9C4 B185 0074 8000 0474 0078 B4C8"            /* Ê.Éı….t€..t.x´È */
+	$"F0CA 0CC9 BFA1 7600 7400 0074 0088 BFC8"            /* ðÊ.É¿¡v.t..t.ˆ¿È */
+	$"B3C9 03CA C7C9 CAB7 C90A C3AD 7F00 7400"            /* ³É.ÊÇÉÊ·ÉÂí..t. */
+	$"0074 708C C0B3 C805 C9C3 B8B3 C4C9 B6C8"            /* .tpŒÀ³È.Éø³ÄÉ¶È */
+	$"0AC3 AE7F 0074 0074 7400 88BD B4C7 05C2"            /* Âî..t.tt.ˆ½´Ç. */
+	$"F1EC B2C4 C8B5 C70B C1AB 7C00 7400 7474"            /* ñì²ÄȵÇ.Á«|.t.tt */
+	$"0082 BAC6 B3C7 04C6 F2FF E6B3 B6C7 0BC0"            /* .‚ºÆ³Ç.Æòÿ泶Ç.À */
+	$"A67A 7374 0074 7400 7DB5 C5B3 C606 C3E7"            /* ¦zst.tt.}µÅ³Æ.Ãç */
+	$"FFFF D5B6 C8B4 C60B BDA1 7573 7400 7474"            /* ÿÿնȴÆ.½¡ust.tt */
+	$"0079 B0C4 B3C5 01C2 D880 FF02 C0BD C6B2"            /* .y°Ä³Å.ÂØ€ÿ.À½Æ² */
+	$"C50C C4BB 9D75 7374 0074 7473 75AA C2B3"            /* Å.Ä»�ust.ttsuªÂ³ */
+	$"C406 C3C9 FAFF FFF0 B3B3 C403 C3B8 9673"            /* Ä.ÃÉúÿÿð³³Ä.ø–s */
+	$"8474 01A5 C1B4 C301 C1EB 80FF 02D6 B4C5"            /* „t.¥Á´Ã.Áë€ÿ.Ö´Å */
+	$"B1C3 03C2 B591 7283 7402 719E BFB4 C201"            /* ±Ã.µ‘rƒt.qž¿´Â. */
+	$"BFD5 80FF 03FD BBBD C3B0 C203 C0B2 8E72"            /* ¿Õ€ÿ.ý»½Ã°Â.À²Žr */
+	$"8374 0270 99BD B4C1 02C0 C4F6 80FF 02E6"            /* ƒt.p™½´Á.ÀÄö€ÿ.æ */
+	$"B1C2 B0C1 03BE AF87 7283 7402 7193 BBB5"            /* ±Â°Á.¾¯‡rƒt.q“»µ */
+	$"C001 BCE1 81FF 02C6 B7C1 AFC0 06BD AC84"            /* À.¼á�ÿ.Æ·Á¯À.½¬„ */
+	$"7274 7400 8074 0270 8CB9 B1BF 00C0 80C1"            /* rtt.€t.pŒ¹±¿.À€Á */
+	$"02BD CAFD 80FF 01F1 B1B0 BF06 BBA9 8172"            /* .½Êý€ÿ.ñ±°¿.»©�r */
+	$"7474 0080 7402 7088 B7B0 BF07 C1B9 ACAB"            /* tt.€t.pˆ·°¿.Á¹¬« */
+	$"AEBC BEEB 81FF 02D1 B3C0 AEBF 06BA A67C"            /* ®¼¾ë�ÿ.ѳÀ®¿.º¦| */
+	$"7274 7400 8074 0271 83B4 AFBE 08BF AFB4"            /* rtt.€t.qƒ´¯¾.¿¯´ */
+	$"D9E3 D2AD B1D3 81FF 02F8 B4BC AEBE 06B8"            /* ÙãÒ­±Ó�ÿ.ø´¼®¾.¸ */
+	$"A27A 7374 7400 8074 0372 7DB1 BCAE BD01"            /* ¢zstt.€t.r}±¼®½. */
+	$"B9CA 81FF 03F6 B4B9 F381 FF02 D8AF BEAD"            /* ¹Ê�ÿ.ö´¹ó�ÿ.د¾­ */
+	$"BD0D B69F 7973 7474 0000 7474 727A ADBB"            /* ½.¶Ÿystt..ttrz­» */
+	$"ADBC 03BB ABB7 E681 FF02 E6AE D881 FF02"            /* ­¼.»«·æ�ÿ.æ®Ø�ÿ. */
+	$"FDB7 B8AD BC0D B49A 7673 7474 0000 7474"            /* ý·¸­¼.´švstt..tt */
+	$"7378 A9BA ACBB 0CBC ACDB D7A6 BDF0 FFFF"            /* sx©º¬».¼¬Ûצ½ðÿÿ */
+	$"FABA BEF7 81FF 02DF ACBC ACBB 01B2 9781"            /* úº¾÷�ÿ.߬¼¬».²—� */
+	$"7407 0000 7474 7374 A4B8 ABB9 0DBA B3BB"            /* t...ttst¤¸«¹.º³» */
+	$"FFFF F7C2 A4CB FAFC C0B4 DC82 FF02 BAB4"            /* ÿÿ÷¤ËúüÀ´Ü‚ÿ.º´ */
+	$"BAAB B901 B093 8174 0100 0080 7402 729F"            /* º«¹.°“�t...€t.rŸ */
+	$"B6AB B902 BAAA E981 FF07 ECB3 ABD1 BBB6"            /* ¶«¹.ºªé�ÿ.쳫ѻ¶ */
+	$"C0FA 81FF 02E4 AABA AAB9 03B8 AD8E 7380"            /* Àú�ÿ.䪺ª¹.¸­Žs€ */
+	$"7401 0000 8074 0272 9BB6 AAB8 02B9 ADC6"            /* t...€t.r›¶ª¸.¹­Æ */
+	$"84FF 05DC AFB7 B8B4 E082 FF02 BCB1 B9A9"            /* „ÿ.ܯ·¸´à‚ÿ.¼±¹© */
+	$"B803 B6AB 8A72 8074 0100 0080 7402 7095"            /* ¸.¶«Šr€t...€t.p• */
+	$"B4AA B602 B5AB F484 FF06 E9B6 B5B6 B4C2"            /* ´ª¶.µ«ô„ÿ.鶵¶´Â */
+	$"FC81 FF02 E6A9 B7A9 B603 B5A8 8872 8074"            /* ü�ÿ.æ©·©¶.µ¨ˆr€t */
+	$"0100 0080 7402 6F91 B3A9 B602 B7AD D684"            /* ...€t.o‘³©¶.·­Ö„ */
+	$"FF02 FAC0 B480 B601 B3E4 82FF 02BD AFB7"            /* ÿ.úÀ´€¶.³ä‚ÿ.½¯· */
+	$"A8B6 03B4 A584 7280 7401 0000 8074 0270"            /* ¨¶.´¥„r€t...€t.p */
+	$"8DB2 A9B6 02B4 ACE7 84FF 01D9 B181 B602"            /* �²©¶.´¬ç„ÿ.Ù±�¶. */
+	$"B3C5 FE81 FF02 E8A8 B7A8 B603 B3A3 8172"            /* ³Åþ�ÿ.訷¨¶.³£�r */
+	$"8074 0100 0080 7402 7087 B0A8 B505 B6AA"            /* €t...€t.p‡°¨µ.¶ª */
+	$"BDA4 C1F5 81FF 02F3 B8B4 82B5 01B2 E782"            /* ½¤Áõ�ÿ.ó¸´‚µ.²ç‚ */
+	$"FF02 BFAD B6A7 B503 B2A1 7F72 8074 0100"            /* ÿ.¿­¶§µ.²¡.r€t.. */
+	$"0080 7402 7083 ADA7 B40C B5AC BBFF F2B8"            /* .€t.pƒ­§´.µ¬»ÿò¸ */
+	$"A2D0 FBFF FFCE B083 B401 B1C5 82FF 02EA"            /* ¢Ðûÿÿΰƒ´.±Å‚ÿ.ê */
+	$"A7B5 A7B4 03B0 9E7C 7380 7401 0000 8074"            /* §µ§´.°ž|s€t...€t */
+	$"0271 80AB A8B3 01A5 EC80 FF06 E4AA A9E2"            /* .q€«¨³.¥ì€ÿ.䪩â */
+	$"EAB2 B284 B301 B1E8 82FF 02BF ABB4 A6B3"            /* ê²²„³.±è‚ÿ.¿«´¦³ */
+	$"03AE 9B79 7380 7401 0000 8074 0272 7DA8"            /* .®›ys€t...€t.r}¨ */
+	$"A6B2 02B3 A6C8 82FF 04FE D3A8 B2B1 85B2"            /* ¦².³¦È‚ÿ.þÓ¨²±…² */
+	$"01AE C582 FF02 EAA6 B3A6 B203 AC98 7873"            /* .®Å‚ÿ.꦳¦².¬˜xs */
+	$"8074 0100 0080 7403 7278 A5B0 A5B1 02AF"            /* €t...€t.rx¥°¥±.¯ */
+	$"A9F7 84FF 01DA AB86 B102 B0AF E982 FF02"            /* ©÷„ÿ.Ú«†±.°¯é‚ÿ. */
+	$"BEA9 B2A5 B103 AB95 7773 8074 0100 0080"            /* ¾©²¥±.«•ws€t...€ */
+	$"7403 7276 A2AF A4B0 02B1 A2D5 84FF 02F8"            /* t.rv¢¯¤°.±¢Õ„ÿ.ø */
+	$"BAAE 87B0 01AC C682 FF02 EAA4 B1A5 B003"            /* º®‡°.¬Æ‚ÿ.ꤱ¥°. */
+	$"A991 7573 8074 0100 0080 7402 7375 9FA4"            /* ©‘us€t...€t.suŸ¤ */
+	$"AE03 AFA9 B0FE 84FF 01D3 AA88 AE02 ADAD"            /* ®.¯©°þ„ÿ.Óªˆ®.­­ */
+	$"E982 FF02 BCA7 AFA4 AE01 A78E 8274 0100"            /* é‚ÿ.¼§¯¤®.§Ž‚t.. */
+	$"0081 7402 729B ADA3 AE02 AFA0 E384 FF02"            /* .�t.r›­£®.¯ ã„ÿ. */
+	$"F0B0 AD89 AE01 AAC4 82FF 02E9 A2AF A4AE"            /* ð°­‰®.ªÄ‚ÿ.颯¤® */
+	$"01A5 8C82 7401 0000 8174 0270 98AC 97AD"            /* .¥Œ‚t...�t.p˜¬—­ */
+	$"0DAC ADAE ACAE ADAC AEAD ACAE AEA4 BB85"            /* .¬­®¬®­¬®­¬®®¤»… */
+	$"FF11 C7A7 AEAD ACAE ADAC AEAC ACAE ACAD"            /* ÿ.ǧ®­¬®­¬®¬¬®¬­ */
+	$"AEAB ABE9 82FF 0EBB A6AE ADAC AEAC ACAE"            /* ®««é‚ÿ.»¦®­¬®¬¬® */
+	$"ACAD AEAC ADAE 97AD 01A3 8982 7401 0000"            /* ¬­®¬­®—­.£‰‚t... */
+	$"8174 0270 94AA 95AC 0FAD A79F A1A2 9FA2"            /* �t.p”ª•¬.­§Ÿ¡¢Ÿ¢ */
+	$"A29F A2A1 9FA4 A9A1 EF84 FF12 E6A2 9FA2"            /* ¢Ÿ¢¡Ÿ¤©¡ï„ÿ.梟¢ */
+	$"A1A0 A3A1 A0A2 A0A0 A3A0 A0A2 9F9D C282"            /* ¡ £¡ ¢  £  ¢Ÿ�‚ */
+	$"FF10 E6A0 A9A0 A0A2 A0A0 A2A0 A1A3 A0A1"            /* ÿ.æ ©  ¢  ¢ ¡£ ¡ */
+	$"A2A2 AB94 AC03 ABA1 8673 8174 0100 0081"            /* ¢¢«”¬.«¡†s�t...� */
+	$"7402 7091 A995 AB0E A9AF FACE C2FF BCCA"            /* t.p‘©•«.©¯úÎÂÿ¼Ê */
+	$"FFB6 DEFA B4A1 C884 FF14 FDB2 C0FF BFCF"            /* ÿ¶Þú´¡È„ÿ.ý²Àÿ¿Ï */
+	$"FFAF DCFA AFEA F1A8 F5E4 B2FE D79D E982"            /* ÿ¯Üú¯êñ¨õä²þ×�é‚ */
+	$"FF0F B8A1 E4F8 A9EA F0AE F7E0 ACFF D5C0"            /* ÿ.¸¡äø©êð®÷à¬ÿÕÀ */
+	$"D1A5 94AB 03AA 9F84 7381 7401 0000 8174"            /* Ñ¥”«.ªŸ„s�t...�t */
+	$"026F 8CA8 95A9 0EA7 B1FF CEC2 FFD0 DBFF"            /* .oŒ¨•©.§±ÿÎÂÿÐÛÿ */
+	$"B3E0 FFB6 A2F9 84FF 14D7 99D8 FFBE D0FF"            /* ³àÿ¶¢ù„ÿ.×™Øÿ¾Ðÿ */
+	$"C5E9 FFAC EEFA C0FE E7B0 FFE8 A3B9 82FF"            /* Åéÿ¬îúÀþç°ÿ裹‚ÿ */
+	$"0FE2 99EA FFC1 F5F4 ABFB EDC4 FFD7 BED6"            /* .â™êÿÁõô«ûíÄÿ×¾Ö */
+	$"A394 A903 A89C 8173 8174 0100 0080 7403"            /* £”©.¨œ�s�t...€t. */
+	$"756E 88A6 95A8 04A6 B0FF DDD3 81FF 04C9"            /* unˆ¦•¨.¦°ÿÝÓ�ÿ.É */
+	$"EBFB A6D5 84FF 06F6 A3DE FFFF D1DE 80FF"            /* ëû¦Õ„ÿ.ö£ÞÿÿÑÞ€ÿ */
+	$"02FD C4F2 80FF 06EE C6FF FFFA A7E2 82FF"            /* .ýÄò€ÿ.îÆÿÿú§â‚ÿ */
+	$"01B0 D780 FF02 F6C3 FB80 FF03 E3D3 D5A2"            /* .°×€ÿ.öÃû€ÿ.ãÓÕ¢ */
+	$"94A8 03A7 9A7F 7381 7401 0000 8074 0375"            /* ”¨.§š.s�t...€t.u */
+	$"6E85 A495 A702 A5AF FA85 FF01 C7AB 85FF"            /* n…¤•§.¥¯ú…ÿ.Ç«…ÿ */
+	$"01C4 B290 FF01 D1B1 82FF 02DD ACFB 87FF"            /* .IJ�ÿ.ѱ‚ÿ.ݬû‡ÿ */
+	$"01D1 A194 A703 A598 7D73 8174 0100 0081"            /* .Ñ¡”§.¥˜}s�t...� */
+	$"7402 7082 A295 A602 A4AE FB84 FF02 EF9C"            /* t.p‚¢•¦.¤®û„ÿ.ïœ */
+	$"E484 FF02 EC9E EB90 FF02 FCA7 DF81 FF02"            /* ä„ÿ.ìžë�ÿ.ü§ß�ÿ. */
+	$"FCAD D787 FF01 D0A0 94A6 03A3 957B 7381"            /* ü­×‡ÿ.Р”¦.£•{s� */
+	$"7401 0000 8174 0270 7EA1 95A6 02A4 AEFB"            /* t...�t.p~¡•¦.¤®û */
+	$"84FF 01B8 B885 FF01 B4BF 92FF 01D4 AD80"            /* „ÿ.¸¸…ÿ.´¿’ÿ.Ô­€ */
+	$"FF04 FCD4 9CAC FA86 FF01 D0A0 94A6 03A3"            /* ÿ.üÔœ¬ú†ÿ.Р”¦.£ */
+	$"937A 7381 7401 0000 8174 0270 7B9F 95A4"            /* “zs�t...�t.p{Ÿ•¤ */
+	$"02A2 ACFA 83FF 02E3 9BF1 84FF 02DE 9EF5"            /* .¢¬úƒÿ.ã›ñ„ÿ.Þžõ */
+	$"92FF 09FD A8D9 FADB AD8B B1A1 D486 FF01"            /* ’ÿÆý¨ÙúÛ­‹±¡Ô†ÿ. */
+	$"CF9E 94A4 03A1 9178 7381 7401 0000 8174"            /* Ïž”¤.¡‘xs�t...�t */
+	$"0270 779D 95A3 02A1 ACFA 82FF 02FD A9C7"            /* .pw�•£.¡¬ú‚ÿ.ý©Ç */
+	$"84FF 02FC A5CD 94FF 09D9 989F 8B9B D3FF"            /* „ÿ.ü¥Í”ÿÆÙ˜Ÿ‹›Óÿ */
+	$"CDA1 F985 FF01 CF9D 94A3 03A0 8E77 7381"            /* Í¡ù…ÿ.Ï�”£. Žws� */
+	$"7401 0000 8174 0271 779A 95A2 02A0 ABFA"            /* t...�t.qwš•¢. «ú */
+	$"82FF 02D4 A0FB 84FF 02CE A2FD 95FF 08A6"            /* ‚ÿ.Ô û„ÿ.΢ý•ÿ.¦ */
+	$"AEDB FCFF FFFA 9ECF 85FF 01CE 9C94 A203"            /* ®ÛüÿÿúžÏ…ÿ.Îœ”¢. */
+	$"9E8C 7673 8174 0100 0081 7402 7275 9895"            /* žŒvs�t...�t.ru˜• */
+	$"A102 9FAA FA81 FF02 F79D D784 FF02 F29C"            /* ¡.Ÿªú�ÿ.÷�ׄÿ.òœ */
+	$"DE96 FF01 DABD 82FF 02D0 9DF8 84FF 01CE"            /* Þ–ÿ.Ú½‚ÿ.Ð�ø„ÿ.Î */
+	$"9A94 A102 9C8A 7582 7401 0000 8174 0272"            /* š”¡.œŠu‚t...�t.r */
+	$"7196 959F 089D A9EE F2F1 F1F6 C0AA 85FF"            /* q–•Ÿ.�©îòññöÀª…ÿ */
+	$"02C0 ADF5 95F1 03F2 F1AE E681 FF03 FCA0"            /* .À­õ•ñ.òñ®æ�ÿ.ü  */
+	$"C7F5 82F1 02F6 C89A 949F 029A 8775 8274"            /* Çõ‚ñ.öÈš”Ÿ.š‡u‚t */
+	$"0100 0081 7402 736F 9396 9E00 9F82 A201"            /* ...�t.so“–ž.Ÿ‚¢. */
+	$"93E8 84FF 03E8 9EA2 A396 A202 A39D BB82"            /* “è„ÿ.螢£–¢.£�»‚ */
+	$"FF02 D597 A383 A200 A195 9E01 9985 8374"            /* ÿ.Õ—£ƒ¢.¡•ž.™…ƒt */
+	$"0100 0081 7403 736E 929D 959E 009D 809C"            /* ...�t.sn’�•ž.�€œ */
+	$"029D 91BC 84FF 03FE B599 9D99 9C01 9DE7"            /* .�‘¼„ÿ.þµ™�™œ.�ç */
+	$"81FF 02C7 8D9B 839C 009D 959E 0198 8383"            /* �ÿ.Ç�›ƒœ.�•ž.˜ƒƒ */
+	$"7401 0000 8274 016E 8F9A 9C02 9A98 F484"            /* t...‚t.n�šœ.š˜ô„ */
+	$"FF01 DA99 9B9C 0997 B9FF FFE4 A7A6 CF91"            /* ÿ.Ú™›œÆ—¹ÿÿ䧦ϑ */
+	$"9D9B 9C02 9681 7382 7401 0000 8274 026F"            /* �›œ.–�s‚t...‚t.o */
+	$"8C9A 989B 029C 90CF 84FF 02F8 A998 9D9B"            /* Œš˜›.œ�Ï„ÿ.ø©˜�› */
+	$"08B3 A39A C8FC FFB0 919C 9A9B 0294 8073"            /* .³£šÈüÿ°‘œš›.”€s */
+	$"8274 0100 0082 7402 6D8A 9998 9A02 989C"            /* ‚t...‚t.mŠ™˜š.˜œ */
+	$"F484 FF01 CB94 9D9A 0397 A2DD FB80 FF02"            /* ô„ÿ.Ë”�š.—¢Ýû€ÿ. */
+	$"F294 979A 9A02 927E 7382 7401 0000 8174"            /* ò”—šš.’~s‚t...�t */
+	$"0375 6B87 9898 9904 969A 96D2 FE81 FF02"            /* .uk‡˜˜™.–š–Òþ�ÿ. */
+	$"EF9E 979D 9902 97A1 F382 FF02 D68A 9A99"            /* ïž—�™.—¡ó‚ÿ.ÖŠš™ */
+	$"9902 917C 7382 7401 0000 8174 0375 6A85"            /* ™.‘|s‚t...�t.uj… */
+	$"9797 9806 9798 F1D3 8F9F E480 FF01 BB92"            /* ——˜.—˜ñÓ�Ÿä€ÿ.»’ */
+	$"9F98 0192 CF83 FF02 B68A 9998 9802 8F7B"            /* Ÿ˜.’σÿ.¶Š™˜˜.�{ */
+	$"7382 7401 0000 8174 0375 6A82 9597 960B"            /* s‚t...�t.uj‚•—–. */
+	$"939F FBFF F9BB 89B0 F5E4 9595 9F96 0192"            /* “Ÿûÿù»‰°õä••Ÿ–.’ */
+	$"AD83 FF03 FA9B 9097 9796 028D 7973 8274"            /* ­ƒÿ.ú›�——–.�ys‚t */
+	$"0100 0081 7403 756A 8195 9796 0191 AC81"            /* ...�t.uj�•—–.‘¬� */
+	$"FF04 EEA8 97A2 94A0 9602 9597 EC83 FF01"            /* ÿ.¢” –.•—ìƒÿ. */
+	$"E28A 9796 0395 8C78 7382 7401 0000 8174"            /* ⊗–.•Œxs‚t...�t */
+	$"0375 6C7F 9497 9501 8EBB 82FF 02FE B28E"            /* .ul.”—•.Ž»‚ÿ.þ²Ž */
+	$"A295 018F CE84 FF02 BD89 9695 9503 948B"            /* ¢•.�΄ÿ.½‰–••.”‹ */
+	$"7873 8274 0100 0081 7403 756D 7D92 9794"            /* xs‚t...�t.um}’—” */
+	$"018C CB81 FF02 F8B8 93A3 9401 90AE 84FF"            /* .ŒË�ÿ.ø¸“£”.�®„ÿ */
+	$"02F7 9691 9594 0393 8A77 7382 7401 0000"            /* .÷–‘•”.“Šws‚t... */
+	$"8174 0375 6C7B 9197 9301 8CDD 80FF 02ED"            /* �t.ul{‘—“.ŒÝ€ÿ.í */
+	$"A78D A493 0292 96EE 84FF 02C8 8894 9493"            /* §�¤“.’–î„ÿ.Ȉ””“ */
+	$"0392 8875 7382 7401 0000 8174 0375 6C79"            /* .’ˆus‚t...�t.uly */
+	$"9096 9207 9190 EBFF FFDE 9A8D A692 018C"            /* �–’.‘�ëÿÿÞš�¦’.Œ */
+	$"CC84 FF02 EF91 9194 9201 9186 8474 0100"            /* Ì„ÿ.ï‘‘”’.‘†„t.. */
+	$"0081 7403 756B 7790 9692 0690 97F8 FFCC"            /* .�t.ukw�–’.�—øÿÌ */
+	$"918E A792 028E A6FD 83FF 02FC 9F8F 9492"            /* ‘Ž§’.Ž¦ýƒÿ.üŸ�”’ */
+	$"0191 8584 7401 0000 8174 0375 6B75 8E96"            /* .‘…„t...�t.ukuŽ– */
+	$"9005 8BA7 FCBA 8B8E A990 018D DB83 FF02"            /* �.‹§üº‹Ž©�.�Ûƒÿ. */
+	$"F79B 8D94 9002 8F83 7383 7401 0000 8174"            /* ÷›�”�.�ƒsƒt...�t */
+	$"0375 6C74 8E96 9004 8CAA AD89 8FAA 9002"            /* .ultŽ–�.Œª­‰�ª�. */
+	$"8CA3 F982 FF01 CB8C 9590 028F 8373 8374"            /* Œ£ù‚ÿ.ËŒ•�.�ƒsƒt */
+	$"0100 0081 7403 756B 728D 988F 008B AD8F"            /* ...�t.ukr�˜�.‹­� */
+	$"088A B4F9 FFFF F6C3 8E8E 958F 028E 8172"            /* .Š´ùÿÿöÃŽŽ•�.Ž�r */
+	$"8374 0100 0081 7403 756C 718C CA8E 068A"            /* ƒt...�t.ulqŒÊŽ.Š */
+	$"9DBA B398 898D 968E 028D 8072 8374 0100"            /* �º³˜‰�–Ž.�€rƒt.. */
+	$"0081 7403 756C 718B CB8E 038B 8888 8B98"            /* .�t.ulq‹ËŽ.‹ˆˆ‹˜ */
+	$"8E02 8C80 7283 7401 0000 8174 0375 6D71"            /* Ž.Œ€rƒt...�t.umq */
+	$"8BEA 8E02 8C80 7283 7401 0000 8174 0375"            /* ‹êŽ.Œ€rƒt...�t.u */
+	$"6D70 8AEA 8D02 8B7F 7283 7401 0000 8174"            /* mpŠê�.‹.rƒt...�t */
+	$"0375 6E70 8AEA 8D02 8B7E 7283 7401 0000"            /* .unpŠê�.‹~rƒt... */
+	$"8174 0375 6E70 8AEA 8D02 8B7E 7283 7400"            /* �t.unpŠê�.‹~rƒt. */
+	$"0082 7403 756F 6E88 EA8C 0289 7B71 8374"            /* .‚t.uonˆêŒ.‰{qƒt */
+	$"0000 8374 0372 697B 81E9 8202 7E73 7283"            /* ..ƒt.ri{�é‚.~srƒ */
+	$"7401 0000 8274 0475 706E 7172 E671 0372"            /* t...‚t.upnqræq.r */
+	$"7270 7284 7401 0000 FB74 0100 00FB 7401"            /* rpr„t...ût...ût. */
+	$"0000 FB74 0100 00FB 7401 0000 FA74 8100"            /* ..ût...ût...út�. */
+	$"F974 8200 F774 8300 F674 8600 F374 FF00"            /* ùt‚.÷tƒ.öt†.ótÿ. */
+	$"FF00 0000 7438 6D6B 0000 4008 0000 0000"            /* ÿ...t8mk..@..... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0101 0101 0202 0202 0202 0202 0202 0202"            /* ................ */
+	$"0202 0202 0202 0202 0202 0202 0202 0101"            /* ................ */
+	$"0101 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0102 0202"            /* ................ */
+	$"0304 0505 0606 0606 0606 0606 0606 0606"            /* ................ */
+	$"0606 0606 0606 0606 0606 0606 0606 0505"            /* ................ */
+	$"0503 0302 0100 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0001 0100 0000"            /* ................ */
+	$"0204 0506 0707 0707 0707 0707 0707 0707"            /* ................ */
+	$"0707 0707 0707 0707 0707 0707 0707 0606"            /* ................ */
+	$"090A 0805 0302 0100 0000 0000 0000 0000"            /* ÆÂ.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0101 001C 2F31"            /* ............../1 */
+	$"3436 383A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A"            /* 468::::::::::::: */
+	$"3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A34"            /* :::::::::::::::4 */
+	$"120B 0F0B 0704 0201 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0004 8FF3 FAF9"            /* ............�óúù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+	$"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 FAFA"            /* ùùùùùùùùùùùùùùúú */
+	$"C433 1112 0C07 0402 0100 0000 0000 0000"            /* Ä3.............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 0067 FFFF FFFF"            /* ...........gÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFC3 201A 130C 0703 0100 0000 0000 0000"            /* ÿÃ ............. */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0001 00A9 FFFF FFFF"            /* ...........©ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFF8 4A20 1B11 0A05 0200 0000 0000 0000"            /* ÿøJ ..Â......... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0002 00B6 FFFF FFFF"            /* ...........¶ÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFB 5928 2216 0D07 0200 0000 0000 0000"            /* ÿûY("........... */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0103 07CC FFFF FFFF"            /* ...........Ìÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFD 6231 291B 1109 0401 0000 0000 0000"            /* ÿýb1)..Æ........ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0201 21F0 FFFF FFFF"            /* ..........!ðÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 7337 2F21 160D 0704 0303 0303 0303"            /* ÿÿs7/!.......... */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0302 0201 0100"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0001 0500 69FF FFFF FFFF"            /* ..........iÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF 9A38 3628 1C14 0E0A 0909 0909 0909"            /* ÿÿš86(...ÂÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+	$"0909 0909 0909 0909 0909 0807 0604 0302"            /* ÆÆÆÆÆÆÆÆÆÆ...... */
+	$"0100 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0203 0021 DFFF FFFF FFFF"            /* .........!ßÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF E653 312D 231B 1512 1011 1010 1010"            /* ÿÿæS1-#......... */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+	$"1010 1010 1010 1010 1010 0E0C 0A08 0504"            /* ............Â... */
+	$"0301 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0002 0200 34D3 FFFF FFFF FFFF"            /* ........4Óÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFD6 6E40 312A 2522 2121 2121 2121"            /* ÿÿÿÖn@1*%"!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+	$"2121 2121 2121 2121 2120 1E1B 1814 0D00"            /* !!!!!!!!! ...... */
+	$"0203 0100 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0102 006C F4FF FFFF FFFF FFFF"            /* .......lôÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FEE8 DAD9 D9D8 D8D8 D8D8 D8D8"            /* ÿÿÿÿþèÚÙÙØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+	$"D8D8 D8D8 D8D8 D8D8 D8D8 D7D7 D6D5 D5A9"            /* ØØØØØØØØØØ××ÖÕÕ© */
+	$"1E00 0200 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0001 0300 71FF FFFF FFFF FFFF FFFF"            /* ......qÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"8500 0402 0100 0000 0000 0000 0000 0000"            /* …............... */
+	$"0001 0203 0317 E1FF FFFF FFFF FFFF FFFF"            /* ......áÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"9E03 0905 0302 0100 0000 0000 0000 0000"            /* ž.Æ............. */
+	$"0201 0000 002C E4E8 E8E9 EAEB ECEC EDED"            /* .....,äèèéêëììíí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+	$"EDED EDED ECEC ECEC ECEC ECEC ECEC ECEC"            /* ííííìììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+	$"ECEC ECEC ECEC ECEC ECEC ECEB EAE9 E8F4"            /* ìììììììììììëêéèô */
+	$"8E02 0400 0000 0202 0000 0000 0000 0002"            /* Ž............... */
+	$"0012 6297 A3A9 BBBD C0C4 C7CA CCCD CECE"            /* ..b—£©»½ÀÄÇÊÌÍÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+	$"CECE CECE CDCD CCCC CCCC CBCB CBCB CBCB"            /* ÎÎÎÎÍÍÌÌÌÌËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+	$"CBCB CBCB CBCB CBCB CBCB CBC9 C8C5 C2C0"            /* ËËËËËËËËËËËÉÈÅÂÀ */
+	$"B5A6 A5A1 8236 0002 0100 0000 0000 0100"            /* µ¦¥¡‚6.......... */
+	$"35DC FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 5Üÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFE 8901 0101 0000 0000 001B"            /* ÿÿÿÿÿþ‰......... */
+	$"DFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF73 0002 0000 0001 0082"            /* ÿÿÿÿÿÿÿs.......‚ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE4 1800 0100 0001 00C0"            /* ÿÿÿÿÿÿÿä.......À */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4500 0200 0002 02C6"            /* ÿÿÿÿÿÿÿÿE......Æ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF 4C00 0200 0103 00B3"            /* ÿÿÿÿÿÿÿÿL......³ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFE 3D00 0300 0104 009C"            /* ÿÿÿÿÿÿÿþ=......œ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFF4 2C04 0400 0105 0087"            /* ÿÿÿÿÿÿÿô,......‡ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFE8 2007 0400 0105 0073"            /* ÿÿÿÿÿÿÿè ......s */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFD9 1808 0400 0105 015C"            /* ÿÿÿÿÿÿÿÙ.......\ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFC7 0E0A 0401 0105 034A"            /* ÿÿÿÿÿÿÿÇ.Â.....J */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFB5 0A0A 0402 0105 043C"            /* ÿÿÿÿÿÿÿµÂÂ.....< */
+	$"FBFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFA1 080A 0402 0105 062B"            /* ÿÿÿÿÿÿÿ¡.Â.....+ */
+	$"F2FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* òÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF8E 050A 0402 0104 0720"            /* ÿÿÿÿÿÿÿŽ.Â.....  */
+	$"E7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF7C 0609 0300 0104 0817"            /* ÿÿÿÿÿÿÿ|.Æ...... */
+	$"D8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF68 0709 0300 0104 0A0E"            /* ÿÿÿÿÿÿÿh.Æ....Â. */
+	$"C8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Èÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF55 0809 0300 0104 0A0A"            /* ÿÿÿÿÿÿÿU.Æ....ÂÂ */
+	$"B7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ·ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FF47 0909 0300 0104 0A07"            /* ÿÿÿÿÿÿÿGÆÆ....Â. */
+	$"A4FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ¤ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF F638 0B08 0300 0004 0A05"            /* ÿÿÿÿÿÿö8......Â. */
+	$"91FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ‘ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF EE2B 0C08 0300 0004 0905"            /* ÿÿÿÿÿÿî+......Æ. */
+	$"81FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* �ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF E224 0D08 0300 0003 0906"            /* ÿÿÿÿÿÿâ$......Æ. */
+	$"71FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* qÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF D51C 0E08 0300 0003 0907"            /* ÿÿÿÿÿÿÕ.......Æ. */
+	$"5EFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ^ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF C714 0F07 0200 0003 0908"            /* ÿÿÿÿÿÿÇ.......Æ. */
+	$"4FFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF B811 0E07 0200 0003 090A"            /* ÿÿÿÿÿÿ¸.......ÆÂ */
+	$"43FD FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Cýÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF A70E 0F07 0200 0003 080B"            /* ÿÿÿÿÿÿ§......... */
+	$"34F5 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 4õÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 960C 0E06 0200 0002 080D"            /* ÿÿÿÿÿÿ–......... */
+	$"29EB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* )ëÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 850C 0E07 0200 0003 080E"            /* ÿÿÿÿÿÿ…......... */
+	$"22E0 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* "àÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 760D 0E06 0200 0003 080F"            /* ÿÿÿÿÿÿv......... */
+	$"1BD3 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Óÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 650E 0E06 0200 0002 080F"            /* ÿÿÿÿÿÿe......... */
+	$"14C7 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 580E 0D06 0200 0002 070F"            /* ÿÿÿÿÿÿX......... */
+	$"11B9 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .¹ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF 4E10 0D06 0100 0002 070F"            /* ÿÿÿÿÿÿN......... */
+	$"10AB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .«ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF8 4211 0D06 0200 0002 070F"            /* ÿÿÿÿÿøB......... */
+	$"0D9B FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .›ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFF1 3513 0D06 0200 0002 080F"            /* ÿÿÿÿÿñ5......... */
+	$"0C8D FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFE9 2E13 0D05 0100 0002 070F"            /* ÿÿÿÿÿé.......... */
+	$"0D81 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFDF 2914 0D06 0100 0002 070F"            /* ÿÿÿÿÿß)......... */
+	$"0E73 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .sÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFD4 2215 0C06 0100 0002 070F"            /* ÿÿÿÿÿÔ"......... */
+	$"0F64 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .dÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFC9 1C16 0C05 0100 0002 070F"            /* ÿÿÿÿÿÉ.......... */
+	$"1058 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Xÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFBD 1A15 0C05 0100 0002 070F"            /* ÿÿÿÿÿ½.......... */
+	$"114F FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFB2 1815 0C05 0100 0002 070E"            /* ÿÿÿÿÿ².......... */
+	$"1246 FAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Fúÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFA5 1615 0C05 0100 0002 070E"            /* ÿÿÿÿÿ¥.......... */
+	$"133B F4FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .;ôÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF98 1515 0C05 0100 0002 060E"            /* ÿÿÿÿÿ˜.......... */
+	$"1533 EEFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .3îÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF8D 1515 0B05 0100 0002 070E"            /* ÿÿÿÿÿ�.......... */
+	$"152F E6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ./æÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF82 1615 0B05 0100 0002 070E"            /* ÿÿÿÿÿ‚.......... */
+	$"1629 DDFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .)Ýÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF77 1615 0B05 0100 0002 060E"            /* ÿÿÿÿÿw.......... */
+	$"1624 D5FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Õÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF6B 1715 0B05 0100 0002 060E"            /* ÿÿÿÿÿk.......... */
+	$"1720 CCFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Ìÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF61 1815 0B05 0100 0002 060E"            /* ÿÿÿÿÿa.......... */
+	$"181D C3FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Ãÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FF5B 1914 0B05 0100 0002 060E"            /* ÿÿÿÿÿ[.......... */
+	$"181C BAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..ºÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FE54 1A14 0B05 0100 0002 070E"            /* ÿÿÿÿþT.......... */
+	$"181B B0FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..°ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F94C 1B15 0B04 0100 0002 060E"            /* ÿÿÿÿùL.......... */
+	$"181A A6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..¦ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F544 1C15 0B05 0100 0002 070E"            /* ÿÿÿÿõD.......... */
+	$"1819 9DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..�ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF F13D 1D14 0B04 0100 0002 060E"            /* ÿÿÿÿñ=.......... */
+	$"1819 95FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..•ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF EB3A 1D14 0B05 0100 0002 070E"            /* ÿÿÿÿë:.......... */
+	$"1819 8EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Žÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF E537 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿå7.......... */
+	$"181A 86FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..†ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF DF34 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿß4.......... */
+	$"181B 7EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..~ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D930 1F15 0B05 0100 0002 070E"            /* ÿÿÿÿÙ0.......... */
+	$"181B 78FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..xÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF D32D 1F15 0B05 0100 0002 070F"            /* ÿÿÿÿÓ-.......... */
+	$"191C 71FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..qÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF CE29 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÎ) ......... */
+	$"191D 6AFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..jÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C828 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÈ( ......... */
+	$"191D 65FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..eÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF C328 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÃ( ......... */
+	$"191E 61FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..aÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF BE28 2115 0B05 0100 0002 070F"            /* ÿÿÿÿ¾(!......... */
+	$"191F 5DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..]ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B827 2115 0C05 0100 0002 070F"            /* ÿÿÿÿ¸'!......... */
+	$"1920 5AFE FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Zþÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B427 2115 0C05 0100 0003 0710"            /* ÿÿÿÿ´'!......... */
+	$"1A21 58FD FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Xýÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF B026 2115 0C05 0100 0003 0810"            /* ÿÿÿÿ°&!......... */
+	$"1A21 55FB FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Uûÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF AC26 2116 0C05 0200 0003 0810"            /* ÿÿÿÿ¬&!......... */
+	$"1A22 52F9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ."Rùÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A826 2215 0C05 0100 0003 0810"            /* ÿÿÿÿ¨&"......... */
+	$"1A23 4FF7 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .#O÷ÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A426 2316 0D06 0200 0003 0811"            /* ÿÿÿÿ¤&#......... */
+	$"1B24 4DF6 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Möÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF A126 2316 0D06 0200 0003 0911"            /* ÿÿÿÿ¡&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9F26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿŸ&#.......Æ. */
+	$"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9E26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿž&#.......Æ. */
+	$"1C26 4BF4 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Kôÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9D27 2317 0D06 0200 0004 0912"            /* ÿÿÿÿ�'#.......Æ. */
+	$"1C26 4AF3 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Jóÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9C27 2417 0D06 0200 0104 0912"            /* ÿÿÿÿœ'$.......Æ. */
+	$"1C26 47F2 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Gòÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 9A27 2417 0D06 0200 0103 0911"            /* ÿÿÿÿš'$.......Æ. */
+	$"1B27 37D1 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .'7Ñÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+	$"FFFF FFFF 7329 2316 0D06 0200 0003 0810"            /* ÿÿÿÿs)#......... */
+	$"1A27 2F59 B7C6 C6C7 C7C7 C7C7 C7C7 C7C7"            /* .'/Y·ÆÆÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+	$"C7C5 C689 372D 2015 0C06 0200 0003 070E"            /* ÇÅƉ7- ......... */
+	$"1723 3037 3C46 4C4F 5050 5050 5050 5050"            /* .#07<FLOPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+	$"4D49 4138 352A 1D13 0A05 0100 0003 060C"            /* MIA85*..Â....... */
+	$"141E 2934 3D44 494C 4D4E 4E4E 4E4E 4E4E"            /* ..)4=DILMNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+	$"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4D"            /* NNNNNNNNNNNNNNNM */
+	$"4B46 4039 2F24 1910 0904 0100 0002 050A"            /* KF@9/$..Æ...... */
+	$"1018 212B 3339 3D40 4142 4242 4242 4242"            /* ..!+39=@ABBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+	$"4242 4242 4242 4242 4242 4242 4242 4140"            /* BBBBBBBBBBBBBBA@ */
+	$"3F3B 352F 261D 140D 0703 0100 0002 0407"            /* ?;5/&........... */
+	$"0C12 1920 272C 2F32 3233 3333 3333 3333"            /* ... ',/223333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+	$"3333 3333 3333 3333 3333 3333 3333 3332"            /* 3333333333333332 */
+	$"302D 2924 1D16 0F09 0502 0100 0001 0305"            /* 0-)$...Æ........ */
+	$"080D 1217 1C1F 2223 2425 2525 2525 2525"            /* ......"#$%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+	$"2525 2525 2525 2525 2525 2525 2525 2524"            /* %%%%%%%%%%%%%%%$ */
+	$"2221 1E19 1510 0B07 0402 0000 0000 0103"            /* "!.............. */
+	$"0609 0C10 1315 1718 1919 1919 1919 1919"            /* .Æ.............. */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+	$"1919 1919 1919 1919 1919 1919 1919 1918"            /* ................ */
+	$"1716 1411 0E0A 0704 0201 0000 0000 0002"            /* .....Â.......... */
+	$"0305 0709 0B0D 0E0F 0F0F 0F0F 0F0F 0F0F"            /* ...Æ............ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+	$"0F0D 0C0A 0806 0402 0100 0000 0000 0001"            /* ...Â............ */
+	$"0103 0304 0607 0708 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+	$"0707 0605 0403 0201 0000 0000 0000 0000"            /* ................ */
+	$"0001 0102 0202 0203 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+	$"0202 0202 0201 0100 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+	$"0000 0000 0000 0000 0000 0000 6963 3038"            /* ............ic08 */
+	$"0000 5CBD 0000 000C 6A50 2020 0D0A 870A"            /* ..\½....jP  .‡ */
+	$"0000 0014 6674 7970 6A70 3220 0000 0000"            /* ....ftypjp2 .... */
+	$"6A70 3220 0000 004F 6A70 3268 0000 0016"            /* jp2 ...Ojp2h.... */
+	$"6968 6472 0000 0100 0000 0100 0004 0707"            /* ihdr............ */
+	$"0100 0000 000F 636F 6C72 0100 0000 0000"            /* ......colr...... */
+	$"1000 0000 2263 6465 6600 0400 0000 0000"            /* ...."cdef....... */
+	$"0100 0300 0100 0000 0100 0000 0200 0200"            /* ................ */
+	$"0000 0300 0000 006A 7032 63FF 4FFF 5100"            /* .......jp2cÿOÿQ. */
+	$"3200 0000 0001 0000 0001 0000 0000 0000"            /* 2............... */
+	$"0000 0000 0001 0000 0001 0000 0000 0000"            /* ................ */
+	$"0000 0000 0407 0101 0701 0107 0101 0701"            /* ................ */
+	$"01FF 5200 0C00 0000 0101 0504 0400 01FF"            /* .ÿR............ÿ */
+	$"5C00 1320 5058 5860 5858 6058 5860 5858"            /* \.. PXX`XX`XX`XX */
+	$"5850 5058 FF64 0011 0001 4B61 6B61 6475"            /* XPPXÿd....Kakadu */
+	$"2D76 352E 322E 31FF 9000 0A00 0000 005B"            /* -v5.2.1ÿ�.Â....[ */
+	$"D000 01FF 93CF C100 1507 F18D 1991 E793"            /* Ð..ÿ“ÏÁ...ñ�.‘ç“ */
+	$"D8B4 6B7C 459C 4F68 E4BF E0FF 0D3D C2DF"            /* Ø´k|EœOhä¿àÿ.=Âß */
+	$"FC16 8F7F 6C3A 7FEA ACD5 8632 D1AD 37A6"            /* ü.�.l:.ê¬Õ†2Ñ­7¦ */
+	$"22E3 4753 734F 3BFA 0372 1596 A8F1 7183"            /* "ãGSsO;ú.r.–¨ñqƒ */
+	$"2F17 0A65 C5C2 6A8E C0F9 1000 39CE 9180"            /* /.ÂeÅÂjŽÀù..9Α€ */
+	$"AE4A F551 B521 2839 FEE4 4D31 9F98 9F17"            /* ®JõQµ!(9þäM1Ÿ˜Ÿ. */
+	$"29F2 C91D 3B35 397E 15A1 8246 C3EA 3107"            /* )òÉ.;59~.¡‚FÃê1. */
+	$"5630 A744 5105 404A C843 0AE4 304B 4FE9"            /* V0§DQ.@JÈCÂä0KOé */
+	$"81E4 4C91 DF64 6885 8D23 6517 B254 DE23"            /* �äL‘ßdh…�#e.²TÞ# */
+	$"6101 3C94 9245 923D 4F4C 0F02 784C F319"            /* a.<”’E’=OL..xLó. */
+	$"CFC0 FC11 7EC2 D9C4 3907 5FDC 553A F1E1"            /* ÏÀü.~ÂÙÄ9._ÜU:ñá */
+	$"F2BC 6420 59D8 7D25 F42A 5BA5 8E8E 7166"            /* ò¼d YØ}%ô*[¥ŽŽqf */
+	$"AD5D 5C91 CC75 1452 ACDA 64CA 3249 CCE3"            /* ­]\‘Ìu.R¬ÚdÊ2IÌã */
+	$"6874 83E2 633E 64E7 8159 4AA2 FD3C 638D"            /* htƒâc>dç�YJ¢ý<c� */
+	$"F978 C3ED 328F C0F2 1F81 A80C BB81 9421"            /* ùxÃí2�Àò.�¨.»�”! */
+	$"980D F457 0EA7 7782 676F 2AB3 EE8F 99C2"            /* ˜.ôW.§w‚go*³î�™Â */
+	$"2221 9D95 8C80 C3A8 91F3 4C08 6A03 DE45"            /* "!�•Œ€Ã¨‘óL.j.ÞE */
+	$"A985 9B7B 9ED3 A9A4 D929 A97F A125 FE22"            /* ©…›{žÓ©¤Ù)©.¡%þ" */
+	$"A893 77F3 EF0F C15C 3969 A153 3A7C 3110"            /* ¨“wóï.Á\9i¡S:|1. */
+	$"7A9C 9227 D2F6 BCA8 1A04 0219 8F36 21B7"            /* zœ’'Òö¼¨....�6!· */
+	$"B37C 2AB6 678A 1675 BA9E 03B4 53BA 33B9"            /* ³|*¶gŠ.uºž.´Sº3¹ */
+	$"06AD 96D8 BDBC BFC8 5134 C040 7EBA B756"            /* .­–ؽ¼¿ÈQ4À@~º·V */
+	$"E619 DC67 BC83 BB39 AA42 65E1 5BBC 45B4"            /* æ.Üg¼ƒ»9ªBeá[¼E´ */
+	$"ECB6 E6ED D098 3C9F E17B 876D A039 553E"            /* ì¶æíИ<Ÿá{‡m 9U> */
+	$"5CF9 2D3F 6F47 4854 7085 62C1 C65D C07C"            /* \ù-?oGHTp…bÁÆ]À| */
+	$"86A0 3E43 500F 90D0 4787 8CE8 726C 5109"            /* † >CP.�ÐG‡ŒèrlQÆ */
+	$"FD68 8099 E8FE 2A66 2F02 78F5 C78B 6A34"            /* ýh€™èþ*f/.xõÇ‹j4 */
+	$"0A9E 25FE 0DE3 E3C8 BD7B 3530 98D5 CF03"            /* ž%þ.ããȽ{50˜ÕÏ. */
+	$"CE64 A57D 620C 87C5 65B4 7BE1 34BC 3058"            /* Îd¥}b.‡Åe´{á4¼0X */
+	$"572A 9EBF 5E0C 5A01 80A3 B334 DF5A E1B8"            /* W*ž¿^.Z.€£³4ßZḠ*/
+	$"08C3 5C30 2CC4 C1F5 1341 F516 40FA 8A00"            /* .Ã\0,ÄÁõ.Aõ.@úŠ. */
+	$"477D B516 AD2F 4DD3 BE8C 58F0 7C77 A236"            /* G}µ.­/MÓ¾ŒXð|w¢6 */
+	$"DD43 6611 D582 F050 DC31 59D0 194D A6FD"            /* ÝCf.Õ‚ðPÜ1YÐ.M¦ý */
+	$"652E FA16 4BA7 25FE 0DE3 E3D9 B950 06E2"            /* e.ú.K§%þ.ããÙ¹P.â */
+	$"3A8A DA86 827A 4C68 5798 55FC FD46 A583"            /* :ŠÚ†‚zLhW˜UüýF¥ƒ */
+	$"064D 8FB0 29D9 8DAD 53CC 5229 B675 ACAB"            /* .M�°)Ù�­SÌR)¶u¬« */
+	$"8EED 34BC 2F12 142E 446C 0DF7 0BC3 D6E7"            /* Ží4¼/...Dl.÷.ÃÖç */
+	$"A086 8D72 6AE7 9270 B97C D981 C7F1 C38A"            /*  †�rjç’p¹|Ù�ÇñÊ */
+	$"47EE E585 FC19 FCE3 668C C7E0 471F 813C"            /* Gîå…ü.üãfŒÇàG.�< */
+	$"3F02 0005 B422 0345 FC66 9A91 446D DDCA"            /* ?...´".Eüfš‘DmÝÊ */
+	$"449B CCDB 8E8F A0B8 3942 A8FC 6409 F7F3"            /* D›ÌÛŽ� ¸9B¨üdÆ÷ó */
+	$"ED01 353A 2B01 1B0C 2939 619B 9890 94E7"            /* í.5:+...)9a›˜�”ç */
+	$"5FDA 75F2 7323 BF3A 7AED 757E 42D6 C336"            /* _Úuòs#¿:zíu~BÖÃ6 */
+	$"E74E 6B5F 2D43 4780 CA1C C462 6507 4801"            /* çNk_-CG€Ê.Äbe.H. */
+	$"EDEF 5B2A 7297 8FC6 1E13 E7FA 56B5 4279"            /* íï[*r—�Æ..çúVµBy */
+	$"5BB4 B307 F4DE E273 4FC3 E9B1 72C3 EDA2"            /* [´³.ôÞâsOÃé±rÃí¢ */
+	$"A3F0 A9E0 FB5D C018 B35C 8B45 CD63 99FE"            /* £ð©àû]À.³\‹EÍc™þ */
+	$"11FB 8993 21D1 BA8B 69EB 5CB9 F258 468F"            /* .û‰“!Ѻ‹ië\¹òXF� */
+	$"73D4 6804 C6E6 045E AE54 954C D0E5 D836"            /* sÔh.Ææ.^®T•LÐåØ6 */
+	$"EA0D DB9A 2806 36FA B3E9 5973 789D 6591"            /* ê.Ûš(.6ú³éYsx�e‘ */
+	$"1EC2 F271 E9E2 5681 C542 A2FC F4EF 8111"            /* .ÂòqéâV�ÅB¢üôï�. */
+	$"59D5 FC91 9749 52A3 EA37 B239 4939 8625"            /* YÕü‘—IR£ê7²9I9†% */
+	$"F248 18D2 075A 80A1 8005 9ED2 437F C705"            /* òH.Ò.Z€¡€.žÒC.Ç. */
+	$"2BFD 308C F1F0 E1BC 8FDA F5D5 50D9 9770"            /* +ý0Œñðá¼�ÚõÕPÙ—p */
+	$"7EF5 213F 91F6 5B8B 189D EE67 70EF F40A"            /* ~õ!?‘ö[‹.�îgpïô */
+	$"2E24 C54B F37D 4941 FCD2 7779 5C8B 59CC"            /* .$ÅKó}IAüÒwy\‹YÌ */
+	$"F284 3377 A496 0399 6F17 47AC B5EA 3A84"            /* ò„3w¤–.™o.G¬µê:„ */
+	$"844E DC13 D058 BE9F 1BBE 8CE0 E615 D2E1"            /* „NÜ.ÐX¾Ÿ.¾Œàæ.Òá */
+	$"88A5 9DA6 9FB4 4EDE B804 ED14 A7EA 54E0"            /* ˆ¥�¦Ÿ´NÞ¸.í.§êTà */
+	$"5A87 311B 5E69 70F5 EDA3 2E78 8862 7603"            /* Z‡1.^ipõí£.xˆbv. */
+	$"7761 094D 4A69 5AB0 A9BB 3F4F 92BE 205B"            /* waÆMJiZ°©»?O’¾ [ */
+	$"A226 24D5 C8B2 CCF7 E064 31C7 E727 6E2C"            /* ¢&$ÕȲÌ÷àd1Çç'n, */
+	$"D6A1 347F 41CD 5F70 E1C0 1AFC 4FBC 81A9"            /* Ö¡4.AÍ_páÀ.üO¼�© */
+	$"A884 F03A CD84 B581 1F03 A523 838B 8038"            /* ¨„ð:Í„µ�..¥#ƒ‹€8 */
+	$"02F4 6DE8 98FC EDD6 B331 21F7 4AC5 A31E"            /* .ômè˜üíÖ³1!÷JÅ£. */
+	$"9EB4 E770 D465 386E 18A6 D1BE EF6D B008"            /* ž´çpÔe8n.¦Ñ¾ïm°. */
+	$"63E6 1066 1374 4D10 3270 8C7F F297 F91D"            /* cæ.f.tM.2pŒ.ò—ù. */
+	$"DA61 677B 29FD A878 B122 E33C 17E3 8ED1"            /* Úag{)ý¨x±"ã<.ãŽÑ */
+	$"FB8E 4407 8B82 32AD 1B50 09DF BDA8 C80E"            /* ûŽD.‹‚2­.PÆß½¨È. */
+	$"7E28 ED9D A005 4297 B9C1 8D66 CA77 C41D"            /* ~(í� .B—¹Á�fÊwÄ. */
+	$"41C5 E3B3 F94D 96E5 1308 7C59 1EB8 0871"            /* AÅã³ùM–å..|Y.¸.q */
+	$"C7A4 FED7 47F2 F800 6889 A21D 1FF4 9E93"            /* Ǥþ×Gòø.h‰¢..ôž“ */
+	$"1321 7377 D96E 86F5 A0CB EB17 C77A 81C0"            /* .!swÙn†õ Ëë.Çz�À */
+	$"7C8D A01F 0E91 00F9 1D00 94FD 4D32 E5DB"            /* |� ..‘.ù..”ýM2åÛ */
+	$"0482 DEB8 CF1C 792A EA3B DECA 4470 4898"            /* .‚Þ¸Ï.y*ê;ÞÊDpH˜ */
+	$"81C0 5457 FE66 63DD CAF3 0B98 08E1 DC3F"            /* �ÀTWþfcÝÊó.˜.áÜ? */
+	$"CF68 7F31 9BEE 73EF A3A5 8D57 8969 EEC3"            /* Ïh.1›îs�W‰iîà */
+	$"0F13 3ED9 390D FC4C B37F C4F7 01E4 B115"            /* ..>Ù9.üL³.Ä÷.ä±. */
+	$"E9F9 9526 00FA 10D0 0D64 4CC5 8481 D231"            /* éù•&.ú.Ð.dLÅ„�Ò1 */
+	$"DE6D 483E 8046 7F58 5BD3 1FFC CF82 297A"            /* ÞmH>€F.X[Ó.üÏ‚)z */
+	$"88A1 7E78 0668 3222 9E8B A287 30A3 DB10"            /* ˆ¡~x.h2"ž‹¢‡0£Û. */
+	$"A77F A842 87FC 164E 92B8 96DF 4920 EEC2"            /* §.¨B‡ü.N’¸–ßI î */
+	$"47B6 83F1 F68F 9309 63CE FAAC 3C8F 9FCF"            /* G¶ƒñö�“ÆcÎú¬<�ŸÏ */
+	$"A166 9621 ADC0 0ABB 7F1A 7E3C A4AD 3755"            /* ¡f–!­À»..~<¤­7U */
+	$"E2D8 E26D CAD1 6F24 F808 BC0D E94B EEBC"            /* âØâmÊÑo$ø.¼.éKî¼ */
+	$"D601 C1F5 30C1 F53B C0FA 97C0 90E6 901B"            /* Ö.Áõ0Áõ;Àú—À�æ�. */
+	$"71C2 1EAB 8A4C 52A4 4431 058C DFB9 4148"            /* qÂ.«ŠLR¤D1.Œß¹AH */
+	$"185C 1E93 01C6 82D3 C81B 6398 8173 189D"            /* .\.“.Æ‚ÓÈ.c˜�s.� */
+	$"F73C 4887 5155 0C95 0088 4C69 0A27 3F39"            /* ÷<H‡QU.•.ˆLiÂ'?9 */
+	$"8CCA 32D8 1FD7 A3F4 CDD8 6275 5E7E 3619"            /* ŒÊ2Ø.×£ôÍØbu^~6. */
+	$"8D18 68C9 D2C7 0FCB 18EA FB01 5A68 4A52"            /* �.hÉÒÇ.Ë.êû.ZhJR */
+	$"3C08 5313 5ED2 9B7D 31B5 953C 2F92 22F7"            /* <.S.^Ò›}1µ•</’"÷ */
+	$"3764 04E8 A9A6 C747 8DFD 9730 01DD 82E1"            /* 7d.試ÇG�ý—0.Ý‚á */
+	$"B08A FD72 7C33 A9BF AFEA 7188 AC4B 2B45"            /* °Šýr|3©¿¯êqˆ¬K+E */
+	$"BBB2 7826 6704 5864 9BAF 91FC 6BD3 E9D7"            /* »²x&g.Xd›¯‘ükÓé× */
+	$"0E30 E428 0FB2 4836 F94F 7CB9 3723 72A2"            /* .0ä(.²H6ùO|¹7#r¢ */
+	$"AB4C C0EB ED8F 823B B8D6 C4A6 E4B5 B41C"            /* «LÀëí�‚;¸ÖĦ䵴. */
+	$"B0FC 0171 880F E77C 1EF8 9645 A8B4 969A"            /* °ü.qˆ.ç|.ø–E¨´–š */
+	$"5420 86B9 71CE 0DE5 7A40 B41A DD85 6B30"            /* T †¹qÎ.åz@´.Ý…k0 */
+	$"F02A 3B61 92B4 7A95 269E BF9F DDB3 9FB7"            /* ð*;a’´z•&ž¿ŸÝ³Ÿ· */
+	$"746B 1514 C89D 391B F835 73B8 0F1C 2567"            /* tk..È�9.ø5s¸..%g */
+	$"A0C2 6B37 DFCE 5F4C 1DCD FD79 5CDA A8FF"            /*  Âk7ßÎ_L.Íýy\Ú¨ÿ */
+	$"0603 9014 308F AEB3 EDB7 D721 1709 3897"            /* ..�.0�®³í·×!.Æ8— */
+	$"D3AB 181E 53BE 4025 3492 41C2 5EC7 BFC0"            /* Ó«..S¾@%4’AÂ^Ç¿À */
+	$"EA12 19D0 6158 530B A57B 8A2B 8DFF 18AF"            /* ê..ÐaXS.¥{Š+�ÿ.¯ */
+	$"7651 65CF CD26 3F05 987E 0760 9C3C E3A6"            /* vQeÏÍ&?.˜~.`œ<㦠*/
+	$"86C0 DAB4 C6ED 7F19 8034 85FE DA7E 7963"            /* †ÀÚ´Æí..€4…þÚ~yc */
+	$"AFF2 9CBE 6AAA B6BB B2D3 6F41 BB45 B1EB"            /* ¯òœ¾jª¶»²ÓoA»E±ë */
+	$"9CC2 8803 907A 5CE1 F2D9 AF69 FF22 7DE8"            /* œÂˆ.�z\áòÙ¯iÿ"}è */
+	$"D328 C2A1 0F97 2EE2 9575 E0E6 A665 B85A"            /* Ó(¡.—.â•uàæ¦e¸Z */
+	$"C5D7 6FA0 FE24 BC68 9D74 6CEB C4F9 615C"            /* Å×o þ$¼h�tlëÄùa\ */
+	$"4F34 48B3 7A64 2540 B64F EFBE 8D0F E427"            /* O4H³zd%@¶Oï¾�.ä' */
+	$"4CCA 6DB3 83AC C5F6 EE52 7A43 8172 41E4"            /* LÊm³ƒ¬ÅöîRzC�rAä */
+	$"2CE3 DF2F 1496 97DE 6AD1 2FFF 7E52 D993"            /* ,ãß/.–—ÞjÑ/ÿ~RÙ“ */
+	$"8AF9 AAA3 B192 0991 BFAE 4829 001E 963B"            /* Šùª£±’Æ‘¿®H)..–; */
+	$"019C 8A5D 78E8 6A56 F78C B81A F4D0 6312"            /* .œŠ]xèjV÷Œ¸.ôÐc. */
+	$"C0C4 A9BF 7CA5 75D9 9C23 F3EA 4F39 B325"            /* ÀÄ©¿|¥uÙœ#óêO9³% */
+	$"F6DE 6EF4 7D48 A279 8EA9 5395 0FBC C63F"            /* öÞnô}H¢yŽ©S•.¼Æ? */
+	$"679F CE93 2206 ECA9 079C 2BB7 D094 6A7B"            /* gŸÎ“".ì©.œ+·Ð”j{ */
+	$"1077 277F 88A6 21AE 84C3 EDD4 38FC 36B2"            /* .w'.ˆ¦!®„ÃíÔ8ü6² */
+	$"1F86 8F00 8F56 8825 7713 9061 800A A4CD"            /* .†�.�Vˆ%w.�a€Â¤Í */
+	$"E3D3 0F3C B0AC 0C87 E368 8544 F251 5C39"            /* ãÓ.<°¬.‡ãh…DòQ\9 */
+	$"7D90 1BEF 7805 D624 7380 0A19 E093 3058"            /* }�.ïx.Ö$s€Â.à“0X */
+	$"1C90 467F 5C70 4932 3947 4A95 A450 36C8"            /* .�F.\pI29GJ•¤P6È */
+	$"D4D5 CA85 9922 FA12 D0D8 96CA 9A2F 40A2"            /* ÔÕÊ…™"ú.ÐØ–Êš/@¢ */
+	$"F105 054F 8C56 C164 85B5 C4E6 3EAB D76A"            /* ñ..OŒVÁd…µÄæ>«×j */
+	$"A227 4F09 072C 4682 9B0F 995C 7551 94E7"            /* ¢'OÆ.,F‚›.™\uQ”ç */
+	$"419A 0098 0283 19E8 0489 687B 4F66 B74C"            /* Aš.˜.ƒ.è.‰h{Of·L */
+	$"7F59 C07A A552 B04D 628F E401 E55C A4ED"            /* .YÀz¥R°Mb�ä.å\¤í */
+	$"390F C34D 81BB 9F88 0C50 F50F 9FBD A377"            /* 9.ÃM�»Ÿˆ.Põ.Ÿ½£w */
+	$"F538 3F9C E243 FF47 D346 87F2 444B C479"            /* õ8?œâCÿGÓF‡òDKÄy */
+	$"F6B3 1C76 5125 F487 0FAF 294A DA20 EC56"            /* ö³.vQ%ô‡.¯)JÚ ìV */
+	$"07AB DE07 14C2 1721 F3E0 D687 1F67 039D"            /* .«Þ..Â.!óàÖ‡.g.� */
+	$"461F 0D82 9CAA B2D4 DFC6 6AA5 D31E 4D01"            /* F..‚œª²ÔßÆj¥Ó.M. */
+	$"5AC2 B2BD FD97 7D6E 00D1 7ADF 377C 15A7"            /* Z²½ý—}n.Ñzß7|.§ */
+	$"9681 C7B2 8168 D706 425B 35EF 7298 C053"            /* –�Dz�h×.B[5ïr˜ÀS */
+	$"E198 B5E2 B835 712B 1AD8 BA77 CF86 83A3"            /* ᘵâ¸5q+.غwφƒ£ */
+	$"B0B9 C5E6 F37A A3DE D93B 8EC8 132F A52A"            /* °¹Åæóz£ÞÙ;ŽÈ./¥* */
+	$"AB20 E166 F719 7130 6482 5BE2 605B D78E"            /* « áf÷.q0d‚[â`[׎ */
+	$"672D 7AE6 3906 DA75 0E3D 1962 8A60 9294"            /* g-zæ9.Úu.=.bŠ`’” */
+	$"1FC8 C0F3 216D 815D 4DDE 5DDE D8AB 3F9C"            /* .ÈÀó!m�]MÞ]ÞØ«?œ */
+	$"7F9F 24B3 7BBF CCB9 2F80 19B6 70AE 1B3D"            /* .Ÿ$³{¿Ì¹/€.¶p®.= */
+	$"C71A 1F7C 81D2 639F 0D03 24EA D4B1 D351"            /* Ç..|�ÒcŸ..$êÔ±ÓQ */
+	$"DD10 FBD5 EA3F 4957 A7ED 04C6 384D C10F"            /* Ý.ûÕê?IW§í.Æ8MÁ. */
+	$"8A55 0C03 694F 0D18 70D8 0AC3 33C0 17D1"            /* ŠU..iO..pØÂÃ3À.Ñ */
+	$"73BB E85F 5204 090F FDFE 8AC5 9AD6 22D5"            /* s»è_R.Æ.ýþŠÅšÖ"Õ */
+	$"CA31 A6DE EF44 D910 B34A 0E59 7866 536F"            /* Ê1¦ÞïDÙ.³J.YxfSo */
+	$"9B0B A341 3AB8 C06C C64F 3F86 8160 DFB9"            /* ›.£A:¸ÀlÆO?†�`ß¹ */
+	$"A709 59D8 88C3 3316 9FFA F83F 5120 E40E"            /* §ÆY؈Ã3.Ÿúø?Q ä. */
+	$"4DEA C88F C418 37F6 4C0B 7606 9632 EEC5"            /* MêÈ�Ä.7öL.v.–2îÅ */
+	$"6380 FB25 A69F AAE2 0888 B722 008F 35CB"            /* c€û%¦Ÿªâ.ˆ·".�5Ë */
+	$"F6A7 90BF D0DB 6367 A14B 5A86 EE98 FD18"            /* ö§�¿ÐÛcg¡KZ†î˜ý. */
+	$"A629 1BAB 3BE2 920D E99D BEC2 88B4 F909"            /* ¦).«;â’.é�¾Âˆ´ùÆ */
+	$"66B1 535D 3940 AF78 8200 0C46 142A EA2A"            /* f±S]9@¯x‚..F.*ê* */
+	$"A991 95E8 FD2B D30B 0E4A 76E2 A97B FAA7"            /* ©‘•èý+Ó..Jvâ©{ú§ */
+	$"97E2 9B30 54FA 5E97 962A 7E83 5711 A707"            /* —â›0Tú^—–*~ƒW.§. */
+	$"2A21 3729 2046 9C41 8282 A161 E5F6 AB24"            /* *!7) FœA‚‚¡aåö«$ */
+	$"3324 74CF 1AF6 C935 D884 0008 DC18 663C"            /* 3$tÏ.öÉ5Ø„..Ü.f< */
+	$"3A00 25E4 92D7 8F23 4C07 3C63 DB6E 4924"            /* :.%ä’×�#L.<cÛnI$ */
+	$"7362 34C9 2F1D 105B 97E2 03BF 648F C21C"            /* sb4É/..[—â.¿d�Â. */
+	$"C6AC 3657 2C72 ADAA 2889 0623 6A5D ACEC"            /* Ƭ6W,r­ª(‰.#j]¬ì */
+	$"3210 738F 51F5 CC65 9EA9 7AD3 95CB B265"            /* 2.s�QõÌež©zӕ˲e */
+	$"D54E 6E1D E2A7 2673 E6C2 C247 2FFD C10E"            /* ÕNn.â§&sæÂÂG/ýÁ. */
+	$"5FC5 C1E1 2511 5C8F 6063 92AB E4B9 8212"            /* _ÅÁá%.\�`c’«ä¹‚. */
+	$"3643 6D53 2492 3E58 3E71 15E3 A3B7 AB2A"            /* 6CmS$’>X>q.㣷«* */
+	$"A998 FE5A 74DB 537A CE3D CD46 49B6 DB6D"            /* ©˜þZtÛSzÎ=ÍFI¶Ûm */
+	$"B6DB 6DB2 8EE9 1D6F 6480 8613 D8D2 7D8F"            /* ¶Ûm²Žé.od€†.ØÒ}� */
+	$"5615 3EAB B25B 722D ECB8 ED12 70F2 BA06"            /* V.>«²[r-ì¸í.pòº. */
+	$"E5A2 45C1 547C F861 A7D5 8E1C 08BC 346B"            /* å¢EÁT|øa§ÕŽ..¼4k */
+	$"2730 C670 2FD8 F159 6ABE 2092 ED98 AC34"            /* '0Æp/ØñYj¾ ’혬4 */
+	$"B4CA 8565 90CF 0034 6E68 F777 9672 F29D"            /* ´Ê…e�Ï.4nh÷w–rò� */
+	$"4621 6E73 9C90 5C3D A8DB F5B0 CACF A63E"            /* F!nsœ�\=¨Ûõ°ÊϦ> */
+	$"861E 8B9E F490 8E15 69BC A01D EF59 E898"            /* †.‹žô�Ž.i¼ .ïYè˜ */
+	$"7040 B817 5AA9 BFB1 09A0 FE74 D2F7 BEA8"            /* p@¸.Z©¿±Æ þtÒ÷¾¨ */
+	$"A4F3 FEAC 38A4 409E B504 9CC9 EAA3 533B"            /* ¤óþ¬8¤@žµ.œÉê£S; */
+	$"153D F710 FC9E 2055 A395 C374 2AF9 E7C5"            /* .=÷.üž U£•Ãt*ùçÅ */
+	$"E1E8 7F74 3CDB D568 B606 A9D5 B7AE E207"            /* áè.t<ÛÕh¶.©Õ·®â. */
+	$"947E 2E65 1C27 336D 927A 4F86 5422 0E04"            /* ”~.e.'3m’zO†T".. */
+	$"42C7 668A 9403 EAB7 21A3 C9F1 18BC 5380"            /* BÇfŠ”.ê·!£Éñ.¼S€ */
+	$"BED7 07B5 F9B1 B798 8727 D54A 7A6E E493"            /* ¾×.µù±·˜‡'ÕJznä“ */
+	$"5271 F27D 7C35 DCEE D0BC CB31 C1FB 879F"            /* Rqò}|5ÜîмË1Áû‡Ÿ */
+	$"E074 9EB9 D7BE C9ED D2C8 BD00 C7FC D05B"            /* àtž¹×¾ÉíÒȽ.ÇüÐ[ */
+	$"2B2C 9647 A924 9F22 A06D 62B4 A946 77B7"            /* +,–G©$Ÿ" mb´©Fw· */
+	$"AD6D 60EE C841 997D A7E8 7AD2 AFA8 EEC4"            /* ­m`îÈA™}§èzÒ¯¨îÄ */
+	$"D61F FC06 FD7A E761 AA33 0F74 A08F 8E5B"            /* Ö.ü.ýzçaª3.t �Ž[ */
+	$"B7C0 7C9A 1201 F0F5 6403 E4D0 60D8 92D9"            /* ·À|š..ðõd.äÐ`Ø’Ù */
+	$"84ED 064F 1B29 D7A7 1D77 F4B3 61D6 2651"            /* „í.O.)ק.wô³aÖ&Q */
+	$"329E 2CA5 53B4 956D 1061 3A3A A73B FC8E"            /* 2ž,¥S´•m.a::§;üŽ */
+	$"DD3C 60C9 F855 32FB 3C04 6287 50F7 6BB3"            /* Ý<`ÉøU2û<.b‡P÷k³ */
+	$"B84A 05A6 3145 A832 3BBC CA56 115B 9D7F"            /* ¸J.¦1E¨2;¼ÊV.[�. */
+	$"8ADB 5660 429D 1FF6 4E6D 4899 EFDA 592F"            /* ŠÛV`B�.öNmH™ïÚY/ */
+	$"19DC 9790 802A 1C17 2250 ADEC 0312 2C23"            /* .Ü—�€*.."P­ì..,# */
+	$"223B 1EC8 482C 6E26 DD67 528F 7CDC 1841"            /* ";.ÈH,n&ÝgR�|Ü.A */
+	$"DBCB CF9E 6D26 B564 4FD4 0AB5 DA0B ADE2"            /* ÛËÏžm&µdOÔµÚ.­â */
+	$"C129 D895 00FF 105B 0D0B F4DB 286A B347"            /* Á)Ø•.ÿ.[..ôÛ(j³G */
+	$"A261 30A9 0A9B 7A0D 585B 3991 3217 6FF7"            /* ¢a0©Â›z.X[9‘2.o÷ */
+	$"A368 D6A8 E862 161A 3584 613E 04D9 DBCB"            /* £hÖ¨èb..5„a>.ÙÛË */
+	$"4D96 66A3 B736 F802 D67A 309F 04E6 AFD8"            /* M–f£·6ø.Öz0Ÿ.æ¯Ø */
+	$"888E A8A5 4461 F1F0 1B6B 2DC4 0DFE C676"            /* ˆŽ¨¥Dañð.k-Ä.þÆv */
+	$"8D4E 3750 C3E6 C233 EFC5 368B 6113 5B53"            /* �N7PÃæÂ3ïÅ6‹a.[S */
+	$"08E0 C259 1B88 AA0C 74B0 862E 1024 BB3F"            /* .àÂY.ˆª.t°†..$»? */
+	$"2816 B320 715C 5DFA 9FF0 CBC3 6A85 777A"            /* (.³ q\]úŸðËÃj…wz */
+	$"23CB F89B D813 6706 313E 2CF5 A163 0848"            /* #Ëø›Ø.g.1>,õ¡c.H */
+	$"94C9 3288 B556 53DD 2A45 2302 F28E 7ED1"            /* ”É2ˆµVSÝ*E#.òŽ~Ñ */
+	$"B5A0 67C8 53BB 4CE4 45D9 317F 92AB B13B"            /* µ gÈS»LäEÙ1.’«±; */
+	$"7246 F6DE 5348 49C9 42A1 CA62 64B0 209E"            /* rFöÞSHIÉB¡Êbd° ž */
+	$"43F2 DF7C 9BBC 097F C94A EA52 8D01 ADEF"            /* Còß|›¼Æ.ÉJêR�.­ï */
+	$"5241 7C9B 2876 75F4 D748 AF9D 6FBB 3306"            /* RA|›(vuô×H¯�o»3. */
+	$"0AD1 3953 6C99 5BB7 F1F5 1C1F BCE7 CA83"            /* ÂÑ9Sl™[·ñõ..¼çʃ */
+	$"08C1 6811 FBC5 AE18 343C C6F5 E515 F9CF"            /* .Áh.ûÅ®.4<Æõå.ùÏ */
+	$"FE48 C6E9 956E 6712 DDCA D62C 7F37 6DFE"            /* þHÆé•ng.ÝÊÖ,.7mþ */
+	$"2465 A8EE 1BAF E106 CA62 101F 0144 31DC"            /* $e¨î.¯á.Êb...D1Ü */
+	$"029E ED0F 9E47 F22E 0C17 0D31 E60B 1662"            /* .ží.žGò....1æ..b */
+	$"C1F5 5C90 7D5A 6D03 EAB6 C0C8 1653 E821"            /* Áõ\�}Zm.ê¶ÀÈ.Sè! */
+	$"5860 ED0B C711 39E5 E5C8 268D 2246 E3FB"            /* X`í.Ç.9ååÈ&�"Fãû */
+	$"68A4 3B12 A487 350D FE94 3722 65AC 949B"            /* h¤;.¤‡5.þ”7"e¬”› */
+	$"2526 7CD5 0E28 E093 CFE8 314C BE18 5B60"            /* %&|Õ.(à“Ïè1L¾.[` */
+	$"827E 154B 9609 2536 F890 A361 BA29 8211"            /* ‚~.K–Æ%6ø�£aº)‚. */
+	$"AF42 BEC6 1BCB CE6D 2910 8083 C890 D7FF"            /* ¯B¾Æ.ËÎm).€ƒÈ�×ÿ */
+	$"6F04 CEF4 F47C 0D92 00BD D90F 4095 0A48"            /* o.Îôô|.’.½Ù.@•ÂH */
+	$"4DC6 210C 351D 34A5 5FDA E576 1E1B 1684"            /* MÆ!.5.4¥_Úåv...„ */
+	$"F2A0 B30A 589C 1DBC 4831 E906 0D67 0CDD"            /* ò ³ÂXœ.¼H1é..g.Ý */
+	$"876B 994F 6D66 47DD AF40 7158 4385 738E"            /* ‡k™OmfGݯ@qXC…sŽ */
+	$"82F8 E637 9B5C 7389 0AA5 2A04 D105 5E88"            /* ‚øæ7›\s‰Â¥*.Ñ.^ˆ */
+	$"C2A2 2943 E125 6C2F 0AD1 1E5C AF1F CFF6"            /* ¢)Cá%l/ÂÑ.\¯.Ïö */
+	$"B39B C799 0F39 6151 6625 BB66 C3C3 418B"            /* ³›Ç™.9aQf%»fÃÃA‹ */
+	$"90A4 F6F7 BD30 7A04 88E6 0F8A 3F0B FF2C"            /* �¤ö÷½0z.ˆæ.Š?.ÿ, */
+	$"D18B 1D88 1442 EB54 A6FC D226 251A 015D"            /* Ñ‹.ˆ.BëT¦üÒ&%..] */
+	$"4DA8 32CA 371B 86EB 4E89 1415 9A41 6AD2"            /* M¨2Ê7.†ëN‰..šAjÒ */
+	$"1F0F 7656 41E5 B874 72E7 5F88 ABDA 28D7"            /* ..vVAå¸trç_ˆ«Ú(× */
+	$"37D5 EE40 567F F751 2591 01A3 03B9 EFCD"            /* 7Õî@V.÷Q%‘.£.¹ïÍ */
+	$"E0A8 8CC8 8C8E 0945 3036 453A 1787 59C4"            /* ਌ȌŽÆE06E:.‡YÄ */
+	$"B99C 02D2 D5F6 1B5E E34C 551E 8C43 9A20"            /* ¹œ.ÒÕö.^ãLU.ŒCš  */
+	$"981D 0B44 C6D1 E6AA 2B92 5F33 8016 C4F1"            /* ˜..DÆÑæª+’_3€.Äñ */
+	$"7AA6 E605 4676 A533 1D38 6ADA 9BC6 2C13"            /* z¦æ.Fv¥3.8jÚ›Æ,. */
+	$"385A 3DCE 7E2E B9A1 81BB 27C6 AFF8 FF5D"            /* 8Z=Î~.¹¡�»'Ưøÿ] */
+	$"A511 4C25 DC70 082C B597 3EC4 004C D4B8"            /* ¥.L%Üp.,µ—>Ä.LÔ¸ */
+	$"BE6A B79D EF70 2610 B57B FEFE 6ACC 9EEE"            /* ¾j·�ïp&.µ{þþjÌžî */
+	$"B94A 73A8 4B30 C207 7391 789E C0FE 6992"            /* ¹Js¨K0Â.s‘xžÀþi’ */
+	$"AB13 E2AA FF53 4B22 A338 0EA3 B476 D732"            /* «.âªÿSK"£8.£´v×2 */
+	$"EDA3 2009 3422 B4AA 64DE 26C3 5894 D6DD"            /* í£ Æ4"´ªdÞ&ÃX”ÖÝ */
+	$"F7A9 5A3B 6F31 5D2C EC22 1FAC 928B 647F"            /* ÷©Z;o1],ì".¬’‹d. */
+	$"1600 A961 11C3 FD11 E594 81F9 E0AC 20D4"            /* ..©a.Ãý.å”�ùà¬ Ô */
+	$"0DCA 9CE0 FF14 3BE3 3010 00E1 9DFE F0C8"            /* .Êœàÿ.;ã0..á�þðÈ */
+	$"70E7 D3A5 A7F9 884E 6941 CBCB FEBE 0C27"            /* pçÓ¥§ùˆNiAËËþ¾.' */
+	$"B3F5 BAA4 3068 BFC1 DB20 1E5F 9E83 BF7D"            /* ³õº¤0h¿ÁÛ ._žƒ¿} */
+	$"8EA3 8FB0 F355 FF02 DED2 5CC8 2B4D 4DA5"            /* Ž£�°óUÿ.ÞÒ\È+MM¥ */
+	$"8122 C96A CDAB B130 2D35 B73E 2EE9 0AA9"            /* �"ÉjÍ«±0-5·>.é© */
+	$"7DB8 B81D 7B0A 776B DFF3 2B02 1F6A EF5B"            /* }¸¸.{Âwkßó+..jï[ */
+	$"E6A6 177F D8C0 1C3B A88C 2154 18F3 BFB3"            /* æ¦..ØÀ.;¨Œ!T.ó¿³ */
+	$"F7EF 1249 860B F87F 60D6 AE06 B5B2 7824"            /* ÷ï.I†.ø.`Ö®.µ²x$ */
+	$"E601 91D7 1436 80CF 054C 9691 1321 B299"            /* æ.‘×.6€Ï.L–‘.!²™ */
+	$"11F3 2BA3 51F6 447E 1BC0 28CB 666B 9BA0"            /* .ó+£QöD~.À(Ëfk›  */
+	$"425A E39B 066C 1B7C 340B 950A BDCC E05D"            /* BZã›.l.|4.•Â½Ìà] */
+	$"C8DC 568C BDC6 54E9 0AA2 2D89 6E22 37E4"            /* ÈÜVŒ½ÆTé¢-‰n"7ä */
+	$"3508 39CC EE8F 8EE6 F926 626B E33F 4A06"            /* 5.9Ìî�Žæù&bkã?J. */
+	$"4CD1 AE16 9063 3119 5554 58CA BB53 4A73"            /* LѮ.�c1.UTXʻSJs */
+	$"AA2B 2A71 B86B 3E95 BED6 D9D2 9D59 3E60"            /* ª+*q¸k>•¾ÖÙÒ�Y>` */
+	$"C5D1 FA4C E6A7 880F 30D8 A679 6467 697E"            /* ÅÑúL槈.0ئydgi~ */
+	$"F327 EAA4 E0D1 01F9 9B74 AAA1 6CDD 7DA7"            /* ó'ê¤àÑ.ù›tª¡lÝ}§ */
+	$"D2AB C9CB 63D6 D3DF C778 C6ED 71A5 0571"            /* Ò«ÉËcÖÓßÇxÆíq¥.q */
+	$"C7E1 4EC7 E16C 43F0 75B1 3C9E 91EA AAAC"            /* ÇáNÇálCðu±<ž‘ꪬ */
+	$"9A2E A47E 8DF0 873E 2275 3F71 F986 DF3D"            /* š.¤~�ð‡>"u?qù†ß= */
+	$"DBE5 1F4C 0D83 C3F5 F2D4 5A7C 0BFB E4FC"            /* Ûå.L.ƒÃõòÔZ|.ûäü */
+	$"C83E D8A4 FAF4 F589 09F2 4909 40AA 2AA8"            /* È>ؤúôõ‰ÆòIÆ@ª*¨ */
+	$"C190 BE4D D484 1408 6EAD 722F 6BA6 7502"            /* Á�¾MÔ„..n­r/k¦u. */
+	$"A53F 1B9A BE86 841A FC60 53F3 8AE9 2E4C"            /* ¥?.š¾†„.ü`SóŠé.L */
+	$"4B8E 1D09 F47C 3BAA CFB7 80DE 6A41 F007"            /* KŽ.Æô|;ªÏ·€ÞjAð. */
+	$"80A3 413A C568 5C02 6166 E8AF 9B6C EF86"            /* €£A:Åh\.af诛lï† */
+	$"F178 273B A803 89E9 520A ACFC 0E98 6198"            /* ñx';¨.‰éR¬ü.˜a˜ */
+	$"6ECE D094 76D1 8AF8 1035 D0C8 B9E5 ECC9"            /* nÎДvÑŠø.5ÐȹåìÉ */
+	$"08E6 748A F28B B0E0 F9AB 71B4 7971 9626"            /* .ætŠò‹°àù«q´yq–& */
+	$"5397 5D5A 31CB 5F9E 7C98 8300 72B1 2C67"            /* S—]Z1Ë_ž|˜ƒ.r±,g */
+	$"A38D 0C02 C603 C0C2 2000 E528 0CAA 9472"            /* £�..Æ.À .å(.ª”r */
+	$"3115 8C05 0EE6 3F33 3F6D B6DB 64C7 AAB2"            /* 1.Œ..æ?3?m¶ÛdǪ² */
+	$"94EA DD85 D3DF F14E FF3F D3A2 778B 3749"            /* ”êÝ…ÓßñNÿ?Ó¢w‹7I */
+	$"B31B 6DB6 C5B6 5311 C782 3FCF 2880 6695"            /* ³.m¶Å¶S.Ç‚?Ï(€f• */
+	$"085A 35C2 3938 420E 8705 50BD 51C3 BD21"            /* .Z5Â98B.‡.P½Qý! */
+	$"41B9 C3ED 3A76 367F 40F5 DA53 3618 DF7A"            /* A¹Ãí:v6.@õÚS6.ßz */
+	$"EE11 B2D6 D9AD 4351 7D8F BC5A 7217 9352"            /* î.²ÖÙ­CQ}�¼Zr.“R */
+	$"D43F 54B9 F618 3E0E 5FF8 1599 CD00 5489"            /* Ô?T¹ö.>._ø.™Í.T‰ */
+	$"459D 1B65 0538 7A92 D8EC 6AD5 E756 776E"            /* E�.e.8z’ØìjÕçVwn */
+	$"5B66 A07C 36D6 A4B0 2E00 21E0 ABFC 2AB8"            /* [f |6Ö¤°..!à«ü*¸ */
+	$"F387 5784 0DB9 1978 67FE DEFF 0CCC CCCC"            /* ó‡W„.¹.xgþÞÿ.ÌÌÌ */
+	$"CCCC CCCC CCCC CCD3 5F84 850A F245 C370"            /* ÌÌÌÌÌÌÌÓ_„…ÂòEÃp */
+	$"786E 76C5 56A5 8C9B FC7F 6869 3085 EB26"            /* xnvÅV¥Œ›ü.hi0…ë& */
+	$"6162 A234 8BF4 868D 0BA5 77FA 56D2 31FD"            /* ab¢4‹ô†�.¥wúVÒ1ý */
+	$"7436 0147 944C 2AAE C8C1 DE46 2A3A 2449"            /* t6.G”L*®ÈÁÞF*:$I */
+	$"EAD0 8E9E FF0B 129F 7F9C 1436 A6BC 10E6"            /* êÐŽžÿ..Ÿ.œ.6¦¼.æ */
+	$"3116 7A98 5FF6 97E9 FC84 7136 FEA5 C122"            /* 1.z˜_ö—éü„q6þ¥Á" */
+	$"E58F 44D6 D7A4 0AD3 E9B4 7C91 B833 1F91"            /* å�DÖפÂÓé´|‘¸3.‘ */
+	$"5F0F D8F7 8A80 6560 B332 081A C68D 0FF9"            /* _.Ø÷Š€e`³2..Æ�.ù */
+	$"899F 2CC7 E1D6 FC7E 1DEB C3ED EA04 F55D"            /* ‰Ÿ,ÇáÖü~.ëÃíê.õ] */
+	$"017D B775 48A1 A844 EAB2 8E3A 5FF2 20AF"            /* .}·uH¡¨D겎:_ò ¯ */
+	$"6231 D1B0 D4D9 D308 999B 09F2 95B1 7071"            /* b1Ñ°ÔÙÓ.™›Æò•±pq */
+	$"F57C 1F1E 7960 4639 6A62 5BC6 9E5A D45D"            /* õ|..y`F9jb[ÆžZÔ] */
+	$"F339 9597 BF1B 62EB D128 B3D8 9BD3 52BF"            /* ó9•—¿.bëÑ(³Ø›ÓR¿ */
+	$"0703 43F9 E1C7 940E EA41 F4B1 75E4 891F"            /* ..CùáÇ”.êAô±uä‰. */
+	$"09A4 D439 7DFF 6AB7 EB4F 1253 A9C0 8BBE"            /* ƤÔ9}ÿj·ëO.S©À‹¾ */
+	$"40A0 3CE6 965D F886 A9EF 7E69 712D 41C2"            /* @ <æ–]ø†©ï~iq-A */
+	$"0062 6917 5D06 6548 9FD6 1470 4A0C 8545"            /* .bi.].eHŸÖ.pJ.…E */
+	$"8417 6C73 0C2D DF44 0E4A D5F9 7443 D629"            /* „.ls.-ßD.JÕùtCÖ) */
+	$"E62D DE53 CCFA EAEA E08A F0E1 9D37 9616"            /* æ-ÞSÌúêêàŠðá�7–. */
+	$"C0DA 1FD4 6A42 6CE6 1D10 AB6A 911A 19D2"            /* ÀÚ.ÔjBlæ..«j‘..Ò */
+	$"47A0 4AC5 6A3C 12FF 0FE8 3AFB 7DFD 3D27"            /* G JÅj<.ÿ.è:û}ý=' */
+	$"42C6 E2BA 6DDE D1ED 21CE 1EA0 F444 055B"            /* BÆâºmÞÑí!Î. ôD.[ */
+	$"122A 41EE D8C1 144C B39C 0EEA 014E 7448"            /* .*AîØÁ.L³œ.ê.NtH */
+	$"0B72 7C2C 92B6 0CAC 3CB5 ADA7 8BF8 0C56"            /* .r|,’¶.¬<µ­§‹ø.V */
+	$"1DD5 B763 907F 6B60 8A85 ED4A F87D FBDC"            /* .Õ·c�.k`Š…íJø}ûÜ */
+	$"391D 822B CBF5 7266 0E6B B2D4 32DE 606C"            /* 9.‚+Ëõrf.k²Ô2Þ`l */
+	$"014E 64BF F969 E3A5 C8E4 09EC B205 6391"            /* .Nd¿ùiã¥ÈäÆì².c‘ */
+	$"3081 96F5 9A80 0599 50D2 38FF 635B 9C35"            /* 0�–õš€.™PÒ8ÿc[œ5 */
+	$"97CF A325 D94F B8E1 A794 EABC DA8A 7CC3"            /* —Ï£%ÙO¸á§”ê¼ÚŠ|à */
+	$"8713 2EBB 1EA6 69B0 9A72 A93D 874A 1F30"            /* ‡..».¦i°šr©=‡J.0 */
+	$"4C7B B341 B8CF F61E 7CEE 60CC E9B0 6D85"            /* L{³A¸Ïö.|î`Ìé°m… */
+	$"4F96 977D F85D F85A 08AF 46EF F259 FD70"            /* O–—}ø]øZ.¯FïòYýp */
+	$"E364 C54D 1F3D C951 B1DD 2CB4 8B94 9350"            /* ãdÅM.=ÉQ±Ý,´‹”“P */
+	$"8FFC CD4E D39E 2FF5 DC65 9DB7 2133 6E97"            /* �üÍNÓž/õÜe�·!3n— */
+	$"9705 2AA6 2625 534E B2A2 D775 FCFA 60E0"            /* —.*¦&%SN²¢×uüú`à */
+	$"4929 3681 2E72 5087 F3CD FB3A 6386 36A2"            /* I)6�.rP‡óÍû:c†6¢ */
+	$"5E62 8705 57E4 8441 1986 1487 E88F C834"            /* ^b‡.Wä„A.†.‡è�È4 */
+	$"C59D D57C CCA2 D56F 3889 44AC 0E4D 0E88"            /* Å�Õ|Ì¢Õo8‰D¬.M.ˆ */
+	$"2592 A50A F98D DF1D 17F2 78BD D4AB FDB4"            /* %’¥Âù�ß..òx½Ô«ý´ */
+	$"4249 FBDE 3E56 BE58 B587 88B4 8D75 299F"            /* BIûÞ>V¾Xµ‡ˆ´�u)Ÿ */
+	$"4C92 6D9A 6B17 6153 9A65 4770 E0EC BBEF"            /* L’mšk.aSšeGpàì»ï */
+	$"2F91 8C35 8FFA 04AF 880C D9B6 204A D65E"            /* /‘Œ5�ú.¯ˆ.Ù¶ JÖ^ */
+	$"68DD DBE7 63BC E1C5 CCDD E994 3796 10EF"            /* hÝÛçc¼áÅÌÝé”7–.ï */
+	$"354D C0E7 7A72 E57E EFAC 7C75 E4CE F47F"            /* 5MÀçzrå~ï¬|uäÎô. */
+	$"2E82 A8D0 6401 3CC4 1ACC 4513 1211 DCC9"            /* .‚¨Ðd.<Ä.ÌE...ÜÉ */
+	$"BD7A 47CA F093 83C7 38EB 866D 1ED5 AC6C"            /* ½zGÊð“ƒÇ8ë†m.Õ¬l */
+	$"FF01 C348 CFA1 2532 DAD5 2BDD 8CCC 71C1"            /* ÿ.ÃHÏ¡%2ÚÕ+ÝŒÌqÁ */
+	$"1208 75AA 308B 4796 A89E 0EAF AB67 422A"            /* ..uª0‹G–¨ž.¯«gB* */
+	$"AA43 8162 68BC 9878 8578 419C AB2E 9518"            /* ªC�bh¼˜x…xAœ«.•. */
+	$"A9E0 4298 DB46 36D7 ADD0 DE21 DC41 AEA7"            /* ©àB˜ÛF6×­ÐÞ!ÜA®§ */
+	$"A05D 795D AB14 E247 6750 3EA8 0A31 5A06"            /*  ]y]«.âGgP>¨Â1Z. */
+	$"FAEC AD07 ECF7 C636 A068 22AA E179 7613"            /* úì­.ì÷Æ6 h"ªáyv. */
+	$"30F9 831C 0AFA 38C0 E20B 96A9 464E B57A"            /* 0ùƒ.Âú8Àâ.–©FNµz */
+	$"5AF3 D612 DC70 2A8D 1D09 C7C9 967F 7F7B"            /* ZóÖ.Üp*�.ÆÇÉ–..{ */
+	$"F47F 4017 A722 9853 37C2 DE55 34CF 104E"            /* ô.@.§"˜S7ÂÞU4Ï.N */
+	$"9DD3 35DF DEE2 589C FAF1 07DE 1803 86B1"            /* �Ó5ßÞâXœúñ.Þ..†± */
+	$"2DE6 6B46 FC45 F24E 8718 3B6E D557 8008"            /* -ækFüEòN‡.;nÕW€. */
+	$"FF3B 8EC2 28BD 6146 3EF6 A0FB 0BCA 37C1"            /* ÿ;ŽÂ(½aF>ö û.Ê7Á */
+	$"749B 49F2 F419 9EC5 DC0A A6DE 0CFC 1BD2"            /* t›Iòô.žÅܦÞ.ü.Ò */
+	$"AAF5 4920 1AB3 842A 1813 606E 97CD 0EC2"            /* ªõI .³„*..`n—Í. */
+	$"50D4 84CD F427 569F 776D 940A A6F7 68D7"            /* PÔ„Íô'VŸwm”¦÷h× */
+	$"2A18 4C6D 2056 D254 1226 7F3C 1ED0 7AB8"            /* *.Lm VÒT.&.<.Ðz¸ */
+	$"BEFE 2050 50E6 C5FB 173C 1857 FF7F 86D9"            /* ¾þ PPæÅû.<.Wÿ.†Ù */
+	$"6CE3 E235 1AFA CBB4 D2BE 4E64 9713 B880"            /* lãâ5.úË´Ò¾Nd—.¸€ */
+	$"0C41 2E14 401B D14F 5BA4 AD20 7060 C05E"            /* .A..@.ÑO[¤­ p`À^ */
+	$"2011 000E C557 2951 009C A584 6178 50E8"            /*  ...ÅW)Q.œ¥„axPè */
+	$"6E0D 922F BFF7 EC41 A907 0D2B EF09 3CE0"            /* n.’/¿÷ìA©..+ïÆ<à */
+	$"6344 B3D6 742A 0448 042D 44C3 390B 089B"            /* cD³Öt*.H.-DÃ9..› */
+	$"B0FF 2877 1C62 BE1E AC48 09B0 4667 19BC"            /* °ÿ(w.b¾.¬HÆ°Fg.¼ */
+	$"319D 1FEA ABB5 1EE9 02D8 C845 A20C 2E3F"            /* 1�.ꫵ.é.ØÈE¢..? */
+	$"7010 FA38 E2A0 1F01 2933 0557 19BD 9DCD"            /* p.ú8â ..)3.W.½�Í */
+	$"5486 F044 5838 C953 CC32 2DF8 6A04 30ED"            /* T†ðDX8ÉSÌ2-øj.0í */
+	$"2C42 0A7D 1B38 7F94 4936 5908 39F1 424F"            /* ,BÂ}.8.”I6Y.9ñBO */
+	$"2BFF 7F46 F53E 11D3 DA1E 41B4 67AB 296E"            /* +ÿ.Fõ>.ÓÚ.A´g«)n */
+	$"0B59 6213 9E16 1568 8787 ED75 8822 A102"            /* .Yb.ž..h‡‡íuˆ"¡. */
+	$"DAAC D7D6 FA63 ED91 52D2 E98C 6EEB ABBB"            /* Ú¬×Öúcí‘RÒéŒnë«» */
+	$"5465 7C7C 0CEB 3016 0CC6 5793 D7FF 7FFB"            /* Te||.ë0..ÆW“×ÿ.û */
+	$"34E7 7BDE 794E 6D8C 392D 051A 478B 4AD7"            /* 4ç{ÞyNmŒ9-..G‹J× */
+	$"028C 3119 EDCA 833C 2F1B A23A 5C69 908F"            /* .Œ1.íʃ</.¢:\i�� */
+	$"6F17 C143 83FF 31A8 709D 7BFA B0E4 A884"            /* o.ÁCƒÿ1¨p�{ú°ä¨„ */
+	$"E3DC 88CC DF54 C132 6671 A0D0 B4C3 7721"            /* ã܈ÌßTÁ2fq Ð´Ãw! */
+	$"B5F0 84FF 0FDA 1588 5865 1B6B 94E3 9B46"            /* µð„ÿ.Ú.ˆXe.k”ã›F */
+	$"5CA1 7767 09F4 3448 2242 114C 2705 2C38"            /* \¡wgÆô4H"B.L'.,8 */
+	$"4565 F286 ABC2 AFF5 809D 0C5B BB5E 009C"            /* Eeò†«Â¯õ€�.[»^.œ */
+	$"FCBA BC4C 84FF 45EF F42B 3F8E DEE0 A531"            /* üº¼L„ÿEïô+?ŽÞà¥1 */
+	$"DBBB 2113 7C30 8BB7 76FF 7E55 E6BC 012B"            /* Û»!.|0‹·vÿ~Uæ¼.+ */
+	$"EBDE EF62 0981 DCE1 AC6E 5AD7 D8AD 0560"            /* ëÞïbÆ�Üá¬nZ×Ø­.` */
+	$"5B36 3A62 5B57 3E03 75AC 25FB B396 1086"            /* [6:b[W>.u¬%û³–.† */
+	$"5EF0 4C11 ACE0 90D2 6568 EB55 75AB FF24"            /* ^ðL.¬à�ÒehëUu«ÿ$ */
+	$"54B8 0E77 3110 5C67 3138 8369 5BEA 3458"            /* T¸.w1.\g18ƒi[ê4X */
+	$"7FFE 6000 9940 0044 18C6 1A34 14B6 9CD2"            /* .þ`.™@.D.Æ.4.¶œÒ */
+	$"C039 2A00 00CC 8F27 9EFE FF80 1CAA 8000"            /* À9*..Ì�'žþÿ€.ª€. */
+	$"0000 0000 D9B1 C1D0 BFE1 D01D 2DD4 E3DF"            /* ....Ù±ÁпáÐ.-Ôãß */
+	$"949B 6DB6 DB6D B83D 6B98 82BC 446D 0CB3"            /* ”›m¶Ûm¸=k˜‚¼Dm.³ */
+	$"55A5 C140 D9E5 5E98 37AF 0E38 4474 B8DC"            /* U¥Á@Ùå^˜7¯.8Dt¸Ü */
+	$"FCFA B14E BD14 730B DAA0 4B18 1B4D 81E7"            /* üú±N½.s.Ú K..M�ç */
+	$"B8A8 26E7 EFB0 8272 4619 2A00 0000 0000"            /* ¸¨&çï°‚rF.*..... */
+	$"0000 0000 0000 060D CD91 05BE 3A07 80DE"            /* ........Í‘.¾:.€Þ */
+	$"29D6 2680 7867 5359 9411 F430 48D9 A22D"            /* )Ö&€xgSY”.ô0HÙ¢- */
+	$"DF74 0855 C0C4 C5AA D3F4 FC40 5815 C5FC"            /* ßt.UÀÄŪÓôü@X.Åü */
+	$"B741 3001 FF7F FDC6 00B8 F1BA FEC9 B662"            /* ·A0.ÿ.ýÆ.¸ñºþɶb */
+	$"4973 2EE9 5029 E237 296D D4A4 04DE 4DB9"            /* Is.éP)â7)mÔ¤.ÞM¹ */
+	$"5305 FD42 9A82 6842 EF09 9DA2 201D C6EF"            /* S.ýBš‚hBïÆ�¢ .Æï */
+	$"4078 4FC3 038C B201 A1C0 0791 7B09 CF18"            /* @xOÃ.Œ².¡À.‘{ÆÏ. */
+	$"D61B DABD 0409 372B F69D 3CF8 E2E1 31A1"            /* Ö.Ú½.Æ7+ö�<øâá1¡ */
+	$"023B B0FD 60B3 3933 16F2 C716 9259 82F8"            /* .;°ý`³93.òÇ.’Y‚ø */
+	$"77BB 3A47 46D2 D998 7AA1 01E1 DF78 8000"            /* w»:GFÒÙ˜z¡.áßx€. */
+	$"0000 0001 D8FD 4FB2 C620 0000 005A CD78"            /* ....ØýO²Æ ...ZÍx */
+	$"B755 53CD E910 3B50 96A8 4000 0000 0003"            /* ·USÍé.;P–¨@..... */
+	$"FD6F 5DD1 31D8 A087 6BC5 09F3 E81E B49F"            /* ýo]Ñ1Ø ‡kÅÆóè.´Ÿ */
+	$"5A88 0DB9 2492 4924 9234 EE49 0E46 EE5B"            /* Zˆ.¹$’I$’4îI.Fî[ */
+	$"8D2A E866 7AD0 1F3C 936D 50EF 6EF5 FDE7"            /* �*èfzÐ.<“mPïnõýç */
+	$"BFFE 6EFF 82AD 0EDF 556D B01D C573 CA68"            /* ¿þnÿ‚­.ßUm°.ÅsÊh */
+	$"985A F307 82C5 D933 4C26 B9EE EEF7 D4C6"            /* ˜Zó.‚ÅÙ3L&¹îî÷ÔÆ */
+	$"BFB5 4130 F610 4AFE 602E 3723 0C95 0000"            /* ¿µA0ö.Jþ`.7#.•.. */
+	$"0000 0000 0000 0000 0002 7F7E DE44 DDEB"            /* ...........~ÞDÝë */
+	$"B8B1 0AB8 BA80 7F79 D59C 851A 0244 B8D1"            /* ¸±Â¸º€.yÕœ…..D¸Ñ */
+	$"6B92 AB1A 4997 5556 C0C7 5935 05AD B380"            /* k’«.I—UVÀÇY5.­³€ */
+	$"318D A387 1E5F 1523 0170 B5DB D9FA 0E80"            /* 1�£‡._.#.pµÛÙú.€ */
+	$"7342 6634 1E36 FB10 615A 1862 FF53 1545"            /* sBf4.6û.aZ.bÿS.E */
+	$"C795 B42C 8282 534C 3AFD D370 7621 820E"            /* Ç•´,‚‚SL:ýÓpv!‚. */
+	$"9EDA AF3A 476B 3537 E327 52DE 4A99 73D1"            /* žÚ¯:Gk57ã'RÞJ™sÑ */
+	$"0718 7C16 82D5 99A5 32DD 0E83 9C4F 60F8"            /* ..|.‚Õ™¥2Ý.ƒœO`ø */
+	$"0743 325D 2056 84FF 06BC C6BB 338C 64CF"            /* .C2] V„ÿ.¼Æ»3ŒdÏ */
+	$"B7B9 C4C7 9800 E4DA EE0A 6636 DEE8 B8F8"            /* ·¹Äǘ.äÚîÂf6Þè¸ø */
+	$"739E 1EBD 408C C620 9790 A337 E987 2E54"            /* sž.½@ŒÆ —�£7é‡.T */
+	$"DD4A E501 C0BF 44E6 E8EF ACCF 028F 253C"            /* ÝJå.À¿Dæèï¬Ï.�%< */
+	$"F466 FA92 BEE6 A066 F4B6 5B41 CA80 3567"            /* ôfú’¾æ fô¶[AÊ€5g */
+	$"A079 E31D CEE9 CD64 0AED 265D E591 B98C"            /*  yã.ÎéÍdÂí&]呹Œ */
+	$"DF22 C203 3C43 E1D8 5D64 CA99 E6C7 EF30"            /* ß"Â.<CáØ]dÊ™æÇï0 */
+	$"68AF F4C9 97D5 F961 48CF 954C 2832 33A3"            /* h¯ôÉ—ÕùaHÏ•L(23£ */
+	$"0088 1417 0D84 DDE1 23FA C81D 487D C9AB"            /* .ˆ...„Ýá#úÈ.H}É« */
+	$"F239 ABB4 24E0 6694 291C 885C 23CE F212"            /* ò9«´$àf”).ˆ\#Îò. */
+	$"29F4 5656 7DD1 182A 2C11 AAEF 7534 24EE"            /* )ôVV}Ñ.*,.ªïu4$î */
+	$"9886 347F 28AD 6952 0A82 E9A4 6AA9 9390"            /* ˜†4.(­iR‚é¤j©“� */
+	$"06A8 EF47 527A EDF2 894B 5234 A900 82B1"            /* .¨ïGRzíò‰KR4©.‚± */
+	$"724D 791B 676C BC97 B3A5 94F7 137E FE8D"            /* rMy.gl¼—³¥”÷.~þ� */
+	$"50F5 C1EE 0C5B 1F3D CEF4 DD64 709C 095B"            /* PõÁî.[.=ÎôÝdpœÆ[ */
+	$"A51A B239 3EC3 C9BA 39EC DBE2 FB9A 3C6F"            /* ¥.²9>Ãɺ9ìÛâûš<o */
+	$"BBC4 DE3E C5AF 0043 DC2D AE64 C0A7 2039"            /* »ÄÞ>ů.CÜ-®dÀ§ 9 */
+	$"A6C9 6079 72D6 0BC7 C501 A3A4 5EF4 A060"            /* ¦É`yrÖ.ÇÅ.£¤^ô ` */
+	$"C46E FCB9 1958 AD83 1176 0776 81C2 13C2"            /* Änü¹.X­ƒ.v.v�Â. */
+	$"DF08 4A76 137F DC5C 4867 0493 EE96 8373"            /* ß.Jv..Ü\Hg.“î–ƒs */
+	$"4644 13A4 F789 39FF 813B D226 575A 5A18"            /* FD.¤÷‰9ÿ�;Ò&WZZ. */
+	$"3AF5 4B88 2747 3D47 681F 9670 0069 DD02"            /* :õKˆ'G=Gh.–p.iÝ. */
+	$"4252 ADB0 D6FB F1F1 1432 C24B D920 7290"            /* BR­°Öûññ.2ÂKÙ r� */
+	$"3709 3D60 15D9 0C49 23EC 77F8 F791 F132"            /* 7Æ=`.Ù.I#ìwø÷‘ñ2 */
+	$"046E 0D05 9AFA 210A 9992 29D9 7AA6 F18E"            /* .n..šú!™’)Ùz¦ñŽ */
+	$"E245 75E0 018F BCEB 8D1B C2D0 083E 985F"            /* âEuà.�¼ë�.ÂÐ.>˜_ */
+	$"B791 554D F5F5 AD71 E064 75E6 1F3A D463"            /* ·‘UMõõ­qàduæ.:Ôc */
+	$"9A59 0A43 3457 BD7C 44A7 5C5E 9D19 C5D8"            /* šYÂC4W½|D§\^�.ÅØ */
+	$"5880 C2CC 5DF0 2964 C0FD ABA1 004B 008D"            /* X€ÂÌ]ð)dÀý«¡.K.� */
+	$"5205 7F2E 0843 E484 2D37 9C34 2425 7AFF"            /* R....Cä„-7œ4$%zÿ */
+	$"7021 D907 B6E1 F5E5 02C3 F3DD 44C8 2252"            /* p!Ù.¶áõå.ÃóÝDÈ"R */
+	$"0649 3C1A 1A80 449A 64D1 1720 76D6 4987"            /* .I<..€DšdÑ. vÖI‡ */
+	$"B4B1 E749 E899 BF69 5B35 F925 2EE6 6CE6"            /* ´±çI虿i[5ù%.ælæ */
+	$"B4FD CEB3 54C0 7C9D 4380 F93B 5701 F274"            /* ´ýγTÀ|�C€ù;W.òt */
+	$"C4F3 CC20 F972 1FD1 56B3 911D 2995 5FC9"            /* ÄóÌ ùr.ÑV³‘.)•_É */
+	$"1F35 BAE0 9AC7 3082 1372 C1D5 4B23 D79E"            /* .5ºàšÇ0‚.rÁÕK#מ */
+	$"EF63 A93F 8E74 26FB AC68 CDBE BD3E 9720"            /* ïc©?Žt&û¬h;½>—  */
+	$"DF71 956D 5D26 559E 2795 2F1B F798 7821"            /* ßq•m]&Už'•/.÷˜x! */
+	$"F3CB 1E6F 2351 11BD 0EFF 19B2 40A2 1C7F"            /* óË.o#Q.½.ÿ.²@¢.. */
+	$"267D D302 F6AE 5410 1E96 40DC 386E CB7B"            /* &}Ó.ö®T..–@Ü8nË{ */
+	$"7EA3 5CF7 46BA 8758 D0EE 12B3 34DF 46FE"            /* ~£\÷Fº‡XÐî.³4ßFþ */
+	$"517B E0F8 7E28 83A5 E93A C06D 7C3F 254B"            /* Q{àø~(ƒ¥é:Àm|?%K */
+	$"53DF 91ED F6AB FD0A 53A0 5257 F9B8 E8B7"            /* Sß‘íö«ýÂS RWù¸è· */
+	$"5A14 6036 C6DA E3FE C29D 799F 8B43 46D6"            /* Z.`6ÆÚãþÂ�yŸ‹CFÖ */
+	$"94DF 1954 073C 7C30 40F4 A00D 93D4 AADF"            /* ”ß.T.<|0@ô .“ﻧ */
+	$"4839 EF36 F92A 3758 97CE 955A 3521 3CB5"            /* H9ï6ù*7X—ΕZ5!<µ */
+	$"8269 30A7 2A93 6A40 07BE DCC3 50B6 C86B"            /* ‚i0§*“j@.¾ÜÃP¶Èk */
+	$"CE9A AF28 3B80 4FE6 873C DB8E A29C 15DC"            /* Κ¯(;€Oæ‡<ÛŽ¢œ.Ü */
+	$"81A8 F841 4F77 6237 7267 55C4 1289 2DA1"            /* �¨øAOwb7rgUÄ.‰-¡ */
+	$"8392 424A 398F 9FA7 8DBE 2CC6 44E9 A005"            /* ƒ’BJ9�Ÿ§�¾,ÆDé . */
+	$"0E57 6638 ADDD 9F15 D32E 13A9 F752 67BA"            /* .Wf8­ÝŸ.Ó..©÷Rgº */
+	$"9F1D 753C 0023 2BC1 2C48 19AF FF28 66E6"            /* Ÿ.u<.#+Á,H.¯ÿ(fæ */
+	$"0A05 1D62 536F C372 7DEC 5069 B44D AFD4"            /* Â..bSoÃr}ìPi´M¯Ô */
+	$"BE3C 9C16 161E 95B4 89E7 B034 4524 E373"            /* ¾<œ...•´‰ç°4E$ãs */
+	$"D4A2 2F82 F1BB 8F20 7861 0F95 7CDF C184"            /* Ô¢/‚ñ»� xa.•|ßÁ„ */
+	$"5B65 6015 001B F6BD 5D52 D4BC 3A42 FD56"            /* [e`...ö½]RÔ¼:BýV */
+	$"D48F 3358 7432 09BD FF19 625D 3A11 13DA"            /* Ô�3Xt2ƽÿ.b]:..Ú */
+	$"F222 12E8 5A1B 12BF 9B3B A234 A367 8FB6"            /* ò".èZ..¿›;¢4£g�¶ */
+	$"4BF2 EE99 DB11 5D13 7021 71B4 2280 A1BC"            /* Kòî™Û.].p!q´"€¡¼ */
+	$"2AEF ECB5 D7EC 047C 0860 9676 78B1 CA76"            /* *ïìµ×ì.|.`–vx±Êv */
+	$"9AFB C995 D4EB 900A AD98 6423 E572 B68C"            /* šûÉ•Ôë�­˜d#år¶Œ */
+	$"A271 A30B D157 8E95 8250 29BB 0323 E26C"            /* ¢q£.ÑWŽ•‚P)».#âl */
+	$"9223 91C7 0CD4 F0B0 442E 1BD3 1473 C699"            /* ’#‘Ç.Ôð°D..Ó.sÆ™ */
+	$"2D1C 8791 C699 920E 72C0 0D3E F6E9 9E2B"            /* -.‡‘Æ™’.rÀ.>öéž+ */
+	$"60B6 A87F 6CBE 146C 1224 90FC BF7B C6A9"            /* `¶¨.l¾.l.$�ü¿{Æ© */
+	$"090E 3EAD C89D 5065 414B 3A1C F271 9327"            /* Æ.>­È�PeAK:.òq“' */
+	$"D490 CD2B FBB3 BEFF 768D 4601 635B A746"            /* Ô�Í+û³¾ÿv�F.c[§F */
+	$"8A4B 0981 8B8F EA85 D255 2113 8792 CC76"            /* ŠKÆ�‹�ê…ÒU!.‡’Ìv */
+	$"DE84 B950 C5F4 A4C1 D4EF 7D52 CC74 CCEE"            /* Þ„¹PÅô¤ÁÔï}RÌtÌî */
+	$"B40E B94F 9467 15CA 1DE0 3557 BF09 D787"            /* ´.¹O”g.Ê.à5W¿Æׇ */
+	$"ED66 345A E153 B4DC EF7C 2952 3161 5A99"            /* íf4ZáS´Üï|)R1aZ™ */
+	$"A193 D5EB 40F5 1300 65FA 8DFD 621A AE94"            /* ¡“Õë@õ..eú�ýb.®” */
+	$"30CD 6D25 A0FC 942E 37AC 52C8 CEAD 2D1F"            /* 0Ím% ü”.7¬RÈέ-. */
+	$"87D5 D078 F173 F5AD 7A56 DD1B 10C3 F9BF"            /* ‡ÕÐxñsõ­zVÝ..Ãù¿ */
+	$"69C1 9E6B E021 A0C7 84BF D87A 8AA8 327C"            /* iÁžkà! Ç„¿ØzŠ¨2| */
+	$"7D48 0D97 E584 FF7F AE07 2001 BF6C 2691"            /* }H.—å„ÿ.®. .¿l&‘ */
+	$"3032 E118 8741 42AD 7709 3086 8488 F9D3"            /* 02á.‡AB­wÆ0†„ˆùÓ */
+	$"0353 D79E 2E21 8F21 46CC 005C DA8A 0229"            /* .Sמ.!�!FÌ.\ÚŠ.) */
+	$"A56B A72A C69E FCF7 7558 5D72 0050 2BDE"            /* ¥k§*Æžü÷uX]r.P+Þ */
+	$"0F36 E4F0 C744 89FC 37F0 7ECA F488 FE8C"            /* .6äðÇD‰ü7ð~ÊôˆþŒ */
+	$"1B6B 0158 B34D 1EA6 9B1F 154E FF79 01D4"            /* .k.X³M.¦›..Nÿy.Ô */
+	$"725F D9CF D9BF CCFF 439D 8F5C A92D D20D"            /* r_ÙÏÙ¿ÌÿC��\©-Ò. */
+	$"0613 88F8 5C1C B6BD 07B9 9078 151D 8353"            /* ..ˆø\.¶½.¹�x..ƒS */
+	$"0E68 8495 D521 92D8 E92D CF9B 10E6 ABDC"            /* .h„•Õ!’Øé-Ï›.æ«Ü */
+	$"53D9 DFB2 F2AF F964 14E3 74D6 3D64 01E2"            /* SÙß²ò¯ùd.ãtÖ=d.â */
+	$"FAFB 2D0B D303 DCF7 7718 E6CF 30DB 3FAE"            /* úû-.Ó.Ü÷w.æÏ0Û?® */
+	$"2873 3339 54A3 1E48 04D2 FDF2 E863 6201"            /* (s39T£.H.Òýòècb. */
+	$"01D1 182C 4C2A D85D AE26 DE15 9796 494C"            /* .Ñ.,L*Ø]®&Þ.—–IL */
+	$"82EA B4C0 2D3C 3D3E 1732 2ACA AC27 B7DB"            /* ‚ê´À-<=>.2*ʬ'·Û */
+	$"5CED 6F9D 3EDB FF04 5E83 BE60 1636 AE2C"            /* \ío�>Ûÿ.^ƒ¾`.6®, */
+	$"754D 2928 7128 ACFD 15E8 C1A0 30A5 1063"            /* uM)(q(¬ý.èÁ 0¥.c */
+	$"1E6F 10F7 A946 B9B4 D921 5DB3 113F 332E"            /* .o.÷©F¹´Ù!]³.?3. */
+	$"61B8 AB3D 2F87 E081 C9D9 32B7 1060 785A"            /* a¸«=/‡à�ÉÙ2·.`xZ */
+	$"EFDD F472 0283 E235 4D42 E903 A06B 51CB"            /* ïÝôr.ƒâ5MBé. kQË */
+	$"39DC A412 A492 918E 235E F57C E4CE 4E0F"            /* 9ܤ.¤’‘Ž#^õ|äÎN. */
+	$"6BE6 7036 FA8A 7B2C 21FE 60B1 6FCA 7654"            /* kæp6úŠ{,!þ`±oÊvT */
+	$"C9FD DCDF E497 B2A6 D6D5 87ED 9D3B 5B86"            /* ÉýÜßä—²¦ÖÕ‡í�;[† */
+	$"DA51 6B5B AE3E 520B 1DB3 5A6B 2B4D A777"            /* ÚQk[®>R..³Zk+M§w */
+	$"4F13 A04C 7D4F 819B 1FEB 086D 5F34 6643"            /* O. L}O�›.ë.m_4fC */
+	$"0208 693A D70C 55B2 7A07 BC27 3A41 B739"            /* ..i:×.U²z.¼':A·9 */
+	$"C1F5 7425 07D5 D74C 1F56 F680 F1C4 B0CB"            /* Áõt%.Õ×L.Vö€ñÄ°Ë */
+	$"F3E0 DE80 53FC 256D EFD0 6B64 028C EC70"            /* óàÞ€Sü%mïÐkd.Œìp */
+	$"4973 06D4 242C DAAA 8373 DFAC B0C9 14A1"            /* Is.Ô$,Úªƒs߬°É.¡ */
+	$"BFBC 0BB4 E250 919E 3D2B B388 3A89 FB02"            /* ¿¼.´âP‘ž=+³ˆ:‰û. */
+	$"9796 86E6 20F8 C26C 8120 349C 757A 6875"            /* —–†æ øÂl� 4œuzhu */
+	$"F63E AE68 84C3 03A3 6F64 F9EE F892 2CF8"            /* ö>®h„Ã.£odùîø’,ø */
+	$"61C1 B13A E941 0D67 DA36 4C05 9565 DC85"            /* aÁ±:éA.gÚ6L.•eÜ… */
+	$"D7F8 6EB9 D903 D428 F59A 3EBF C73E 5E95"            /* ×øn¹Ù.Ô(õš>¿Ç>^• */
+	$"764D 15FB 98F2 BECE 0FC8 EA3C 4E51 E1DD"            /* vM.û˜ò¾Î.Èê<NQáÝ */
+	$"5253 CE7A 2D16 8527 AF8E 9A17 757A A42F"            /* RSÎz-.…'¯Žš.uz¤/ */
+	$"6CA9 6BB3 7787 D84F 8E20 EA1F FB2D 15E3"            /* l©k³w‡ØOŽ ê.û-.ã */
+	$"0D2C 45A8 8C80 7DA1 89DB 5F46 F3FB 2871"            /* .,E¨Œ€}¡‰Û_Fóû(q */
+	$"539E 8CCA 5C03 EF20 B6B5 4956 EB82 172C"            /* SžŒÊ\.ï ¶µIVë‚., */
+	$"AB28 0D6D 4DF9 1F61 6F8D 61FE E962 778D"            /* «(.mMù.ao�aþébw� */
+	$"0C8E EC55 3BDC EC81 C9D1 E7D5 A811 C69A"            /* .ŽìU;Üì�ÉÑçÕ¨.Æš */
+	$"6186 BC2C 75B4 DD3D C207 1151 4C3B 4175"            /* a†¼,u´Ý=Â..QL;Au */
+	$"942E 2ACF D3C7 7122 9D89 31B3 0918 EDC0"            /* ”.*ÏÓÇq"�‰1³Æ.íÀ */
+	$"9D45 75D8 DE61 5036 6D9F 3373 4827 7ADE"            /* �EuØÞaP6mŸ3sH'zÞ */
+	$"1BD1 16E8 8905 37D4 D811 1077 B359 0FF6"            /* .Ñ.è‰.7ÔØ..w³Y.ö */
+	$"0460 F360 20A5 B532 3418 142A B432 C2E9"            /* .`ó` ¥µ24..*´2Âé */
+	$"A0D6 DB04 317D 28F3 C893 AAE3 19B1 5742"            /*  ÖÛ.1}(óÈ“ªã.±WB */
+	$"7BF6 615C 0EAC F35E 0CD4 B142 A289 5458"            /* {öa\.¬ó^.Ô±B¢‰TX */
+	$"D699 1584 46FF 7174 758F B1F8 F540 F427"            /* Ö™.„Fÿqtu�±øõ@ô' */
+	$"A496 8795 E66B 3DDC FB80 D0B8 9411 7240"            /* ¤–‡•æk=Üû€Ð¸”.r@ */
+	$"0374 54DC B2CA C982 BD5E FD06 4B02 5E8D"            /* .tTܲÊÉ‚½^ý.K.^� */
+	$"A958 79AA 5BE6 B5A2 76C3 7C23 0D45 6768"            /* ©Xyª[æµ¢vÃ|#.Egh */
+	$"D726 8259 FD2E E5CE 9B70 0600 22E7 82A3"            /* ×&‚Yý.åΛp.."ç‚£ */
+	$"8E14 9626 C4EC EED9 E7D8 13C9 623F 3DEB"            /* Ž.–&ÄìîÙçØ.Éb?=ë */
+	$"357B E617 A43A C9D4 328A C30A FF45 71BA"            /* 5{æ.¤:ÉÔ2ŠÃÂÿEqº */
+	$"1F8B 3945 8E06 0CF0 4749 0840 6F5A EDDB"            /* .‹9EŽ..ðGI.@oZíÛ */
+	$"29AC E877 27BD 6C8C A131 8A1C 9228 0FC5"            /* )¬èw'½lŒ¡1Š.’(.Å */
+	$"A029 D1A1 324D EFCE EB3F 2B92 150D FB8C"            /*  )Ñ¡2MïÎë?+’..ûŒ */
+	$"5399 1ABD D375 08BF 8F3F E788 684D 3064"            /* S™.½Óu.¿�?çˆhM0d */
+	$"70B4 A733 4AB6 239A DC03 724F C8B8 F1BB"            /* p´§3J¶#šÜ.rOȸñ» */
+	$"8F1F A795 FF18 8256 0050 FF74 EDF1 3D05"            /* �.§•ÿ.‚V.Pÿtíñ=. */
+	$"6CB0 E566 9272 E493 C085 3D06 3116 4ECE"            /* l°åf’rä“À…=.1.NÎ */
+	$"402D 329F 4BBB 2598 A7CF BEE1 333D 9019"            /* @-2ŸK»%˜§Ï¾á3=�. */
+	$"61BB 1A29 2616 E907 2CD6 F64C 456F 9881"            /* a».)&.é.,ÖöLEo˜� */
+	$"725B 5C38 A40D 60D3 6B4F FDF1 87D7 4786"            /* r[\8¤.`ÓkOýñ‡×G† */
+	$"29BF CAEB 223A 044D 0F61 FDE6 0A3E 7727"            /* )¿Êë":.M.aýæÂ>w' */
+	$"DDEE 0A95 231F 04AC B6EF D134 C09D 1540"            /* Ýî•#..¬¶ïÑ4À�.@ */
+	$"0E94 57E2 8418 C208 1F26 7396 96A0 D08F"            /* .”Wâ„.Â..&s–– Ð� */
+	$"0CC0 40C8 C596 39BA 0CAE A6ED F8E8 7D6B"            /* .À@ÈÅ–9º.®¦íøè}k */
+	$"A76C 391B 6113 555F 62E0 6E14 5D27 E7BC"            /* §l9.a.U_bàn.]'ç¼ */
+	$"EDB7 D038 DED2 7BEE FC9D 6211 241E 0795"            /* í·Ð8ÞÒ{îü�b.$..• */
+	$"9CDE 1607 B4C7 828E 24D2 4E9F FCA0 36EA"            /* œÞ..´Ç‚Ž$ÒNŸü 6ê */
+	$"004C C960 1680 01CE 7FF6 A201 EDAB 1ADF"            /* .LÉ`.€.Î.ö¢.í«.ß */
+	$"80D8 4524 390C 23DD EA8E 062C 5DDB 3C57"            /* €ØE$9.#ÝêŽ.,]Û<W */
+	$"BAEC 18E5 1ECE 91D7 A40E 08ED 23EA 55B6"            /* ºì.å.Αפ..í#êU¶ */
+	$"AA2C F48A 7B0E 8CAE 90DD 5840 41FF 7F4C"            /* ª,ôŠ{.Œ®�ÝX@Aÿ.L */
+	$"47AD E774 87C4 9AB1 9CAD E633 DECD 3E36"            /* G­çt‡Äš±œ­æ3ÞÍ>6 */
+	$"00C2 0E05 134F 4802 3846 3575 1902 676D"            /* .Â...OH.8F5u..gm */
+	$"1006 D8AE 0D5F 1934 78F6 0721 F3C4 1000"            /* ..Ø®._.4xö.!óÄ.. */
+	$"8991 FA85 45B5 37A9 5A0C 54EE 014B 297B"            /* ‰‘ú…Eµ7©Z.Tî.K){ */
+	$"52F2 5ADD 7422 C97B EAA9 D291 45A7 A44A"            /* RòZÝt"É{ê©Ò‘E§¤J */
+	$"40FE AE73 5086 C7D3 85FD D734 67F2 8909"            /* @þ®sP†ÇÓ…ý×4gò‰Æ */
+	$"506D 36D8 2361 990C 802F A59E B603 9C94"            /* Pm6Ø#a™.€/¥ž¶.œ” */
+	$"F7BD AED9 8518 8651 DFFE 3D0E E920 E874"            /* ÷½®Ù….†Qßþ=.é èt */
+	$"FEB0 EE3C 3242 C249 4704 EEA8 9EFA DC61"            /* þ°î<2BÂIG.úÜa */
+	$"49C6 929E 2A9D 51CD FE0A FF02 3DDB 01EC"            /* IÆ’ž*�QÍþÂÿ.=Û.ì */
+	$"80E8 630A B0C8 C9FC 7693 C60B 07E8 5D2F"            /* €èc°ÈÉüv“Æ..è]/ */
+	$"B97A 9F04 444E C836 DD68 FF12 EC9C 7E4F"            /* ¹zŸ.DNÈ6Ýhÿ.ìœ~O */
+	$"3CE9 83A8 191A 1E61 05F8 90FF 67E8 011A"            /* <部...a.ø�ÿgè.. */
+	$"71EA 3EE8 AFBD 6328 ED84 9807 788D F3BC"            /* qê>诽c(턘.x�ó¼ */
+	$"2FA0 A210 7FFF 1D02 2519 4EC7 2A80 7FD0"            /* / ¢..ÿ..%.NÇ*€.Ð */
+	$"2064 A8F4 CC78 5EC8 88AF F1AB 868B 9F8D"            /*  d¨ôÌx^Ȉ¯ñ«†‹Ÿ� */
+	$"883E 3FDA D188 FBB7 3AFC 0C72 E01A CEF3"            /* ˆ>?Úшû·:ü.rà.Îó */
+	$"21E1 1718 4FDB 9A43 3767 424A 639B DFFE"            /* !á..OÛšC7gBJc›ßþ */
+	$"CA5F 7BA9 8F82 3EA6 6D4E 6986 6945 80DE"            /* Ê_{©�‚>¦mNi†iE€Þ */
+	$"8274 4927 166A 6062 DF1D 0A72 F23B FA5A"            /* ‚tI'.j`bß.Ârò;úZ */
+	$"4DE4 5D19 54FC 488B 5237 FF5F 7B81 62C5"            /* Mä].TüH‹R7ÿ_{�bÅ */
+	$"F6B7 B580 3016 11B6 22CF 63B8 428A D39A"            /* ö·µ€0..¶"Ïc¸BŠÓš */
+	$"5AC3 80FF 7310 8386 FF54 F361 304F 3BB5"            /* ZÀÿs.ƒ†ÿTóa0O;µ */
+	$"A7EB 0419 7DFB 6E56 20A8 3670 9018 9CB3"            /* §ë..}ûnV ¨6p�.œ³ */
+	$"4B35 7082 32A7 E917 9CF8 FF7F FF80 0A6C"            /* K5p‚2§é.œøÿ.ÿ€Âl */
+	$"A48C 447E 3ECF 411D 89E4 F923 373B DCBE"            /* ¤ŒD~>ÏA.‰äù#7;ܾ */
+	$"2CE8 6580 0F87 1A23 1D93 62AE 48EF DEB8"            /* ,èe€.‡.#.“b®HïÞ¸ */
+	$"5DE8 DB68 1CA3 8D4B D3FE A476 7B3D ACAA"            /* ]èÛh.£�KÓþ¤v{=¬ª */
+	$"284F 83EB 428F A201 D122 CB1A CCB2 C1FE"            /* (OƒëB�¢.Ñ"Ë.̲Áþ */
+	$"367F 60D3 155D 8C00 22D8 ED33 D56B 1DE2"            /* 6.`Ó.]Œ."Øí3Õk.â */
+	$"98B0 A4A9 E041 2BF1 AA58 E78D 47E5 929F"            /* ˜°¤©àA+ñªXç�Gå’Ÿ */
+	$"85DA 699E C45A 0064 B931 CF2B 4169 44F0"            /* …ÚižÄZ.d¹1Ï+AiDð */
+	$"4B4F 083B 3D7C B2B2 D87B 785E 91A8 C614"            /* KO.;=|²²Ø{x^‘¨Æ. */
+	$"6EE6 A63C C8A7 B9E3 839D E245 4128 3BF9"            /* næ¦<ȧ¹ãƒ�âEA(;ù */
+	$"98CD 0C23 72EB E3A9 D21F 1BC2 4E13 274B"            /* ˜Í.#rëã©Ò..ÂN.'K */
+	$"19C8 CB39 5E7A D218 FBDB 0C42 51A1 1203"            /* .ÈË9^zÒ.ûÛ.BQ¡.. */
+	$"C0EB CDC2 9249 E461 1DE4 3DB6 FDFE 1334"            /* ÀëÍÂ’Iäa.ä=¶ýþ.4 */
+	$"1952 8231 CD71 A170 C55B 1FD0 6706 57F0"            /* .R‚1Íq¡pÅ[.Ðg.Wð */
+	$"282D 09A2 0893 A5BA 0314 43DD 32AF 3478"            /* (-Æ¢.“¥º..CÝ2¯4x */
+	$"EF6C 15F0 55C9 6A47 ECFE 3F3F 4DB4 5ED8"            /* ïl.ðUÉjGìþ??M´^Ø */
+	$"EFF8 8CA5 71F9 6669 078C 550C 943A 7046"            /* ïøŒ¥qùfi.ŒU.”:pF */
+	$"C031 6CE2 4681 4177 2913 CFE7 D857 C62A"            /* À1lâF�Aw).ÏçØWÆ* */
+	$"4652 88E2 8830 DF42 9C3D 2D76 E710 A8F1"            /* FRˆâˆ0ßBœ=-vç.¨ñ */
+	$"3626 45F2 55CC 008C EAB8 B891 A5F3 1AD2"            /* 6&EòUÌ.Œê¸¸‘¥ó.Ò */
+	$"AB11 6C48 3F18 40C0 51F0 DB88 0BD1 168C"            /* «.lH?.@ÀQðÛˆ.Ñ.Œ */
+	$"2E54 2DA6 CC60 BB05 4700 2C4E 179B 271B"            /* .T-¦Ì`».G.,N.›'. */
+	$"688C 1EE9 4D9A C781 8108 296B FE4F 028A"            /* hŒ.éMšÇ��.)kþO.Š */
+	$"63D6 6EDF 6FEB FC17 BDFE 7A70 B48E D94E"            /* cÖnßoëü.½þzp´ŽÙN */
+	$"D985 3384 1BD2 B4C9 5213 B0D1 041B 876C"            /* Ù…3„.Ò´ÉR.°Ñ..‡l */
+	$"131C 4A9C 947B A79C A466 9779 E7C9 D2E1"            /* ..Jœ”{§œ¤f—yçÉÒá */
+	$"4E9F 0509 30E0 1115 E5C7 CAED 197B 818A"            /* NŸ.Æ0à..åÇÊí.{�Š */
+	$"324D 8F8E ED44 BF44 5340 D647 1776 B983"            /* 2M�ŽíD¿DS@ÖG.v¹ƒ */
+	$"6D8C 88B1 6976 F7EB AFDB 6638 CAD3 F275"            /* mŒˆ±iv÷ë¯Ûf8ÊÓòu */
+	$"D93A 6CD3 9D6E C617 3969 D8E5 3059 947B"            /* Ù:lÓ�nÆ.9iØå0Y”{ */
+	$"6AFA 0E9B A19C 24C9 E1DC 089D 3545 89E4"            /* jú.›¡œ$ÉáÜ.�5E‰ä */
+	$"E860 FB54 068C B464 EE9B 66B7 F267 34CF"            /* è`ûT.Œ´dî›f·òg4Ï */
+	$"1276 C6B2 47E6 8284 300B D1A9 1409 0C93"            /* .vƲGæ‚„0.Ñ©.Æ.“ */
+	$"E36A 8095 409A 7352 FF7A 0F50 A5E2 E678"            /* ãj€•@šsRÿz.P¥âæx */
+	$"C195 0898 E51E EB15 8D7A E918 29A6 D5CE"            /* Á•.˜å.ë.�zé.)¦ÕÎ */
+	$"4DBC 978B 2CAA 9BA7 8727 EA1C 1C7A 6CC2"            /* M¼—‹,ª›§‡'ê..zl */
+	$"D172 DDF5 4BD4 9C69 607B 609F AEC8 FD84"            /* ÑrÝõKÔœi`{`Ÿ®Èý„ */
+	$"1DDA A076 C7E1 A7B1 F86C BC7E 1720 EB83"            /* .Ú vÇ᧱øl¼~. ëƒ */
+	$"095B F1C8 7239 10FD 6A26 D10E 534B E257"            /* Æ[ñÈr9.ýj&Ñ.SKâW */
+	$"B691 5D92 6949 E7D8 7470 AA8C 421F F945"            /* ¶‘]’iIçØtpªŒB.ùE */
+	$"99F6 9492 B806 E264 47B0 4EF5 6206 734E"            /* ™ö”’¸.âdG°Nõb.sN */
+	$"944B 102F A688 23A4 EAB0 CCEA 0017 0156"            /* ”K./¦ˆ#¤ê°Ìê...V */
+	$"A8C9 2A3F FF49 4137 E23A 09D0 97BB 0E5F"            /* ¨É*?ÿIA7â:ÆЗ»._ */
+	$"E2A2 2247 4980 6A20 B443 3E0B 0465 B9EF"            /* â¢"GI€j ´C>..e¹ï */
+	$"C490 B954 3AEA ABB7 3D53 111D 8897 551C"            /* Ä�¹T:ê«·=S..ˆ—U. */
+	$"B865 1EA2 33F2 AD50 D488 1D6D 9733 27F3"            /* ¸e.¢3ò­PÔˆ.m—3'ó */
+	$"78AC C946 FB3C 4D2F 6580 1B3A 3368 3D54"            /* x¬ÉFû<M/e€.:3h=T */
+	$"55DF 6B52 1A54 9010 C4D2 12C8 D497 9CDB"            /* UßkR.T�.ÄÒ.ÈÔ—œÛ */
+	$"173A 0609 66F1 C6C0 FD02 47A0 B2E2 D2E6"            /* .:.ÆfñÆÀý.G ²âÒæ */
+	$"096E F870 0776 4898 2F2B 84CF BA83 D656"            /* Ænøp.vH˜/+„ϺƒÖV */
+	$"7F77 79FF 0F1D 2A6E 03C6 4D0F E3EF D23B"            /* .wyÿ..*n.ÆM.ãïÒ; */
+	$"6F82 5F72 6701 98DF 5A63 DA7B 0ABC 75E2"            /* o‚_rg.˜ßZcÚ{¼uâ */
+	$"382D 0D93 3C8C 5308 19EA EF8D 7922 CD36"            /* 8-.“<ŒS..êï�y"Í6 */
+	$"ED21 EB4D 3D77 5A8A 1380 E238 22E5 84AA"            /* í!ëM=wZŠ.€â8"優 */
+	$"4488 7DCE 91A0 CB4B 67FA 74AF EA3D 1C8E"            /* Dˆ}Α ËKgút¯ê=.Ž */
+	$"9279 611D FD02 D08F D952 B05D 2C11 B545"            /* ’ya.ý.Ð�ÙR°],.µE */
+	$"5F17 FF5C 1E9C 6A77 DA2F A474 B20C F5A2"            /* _.ÿ\.œjwÚ/¤t².õ¢ */
+	$"B2D4 176F 97E4 CE9E B576 C3E0 0F3D ECB9"            /* ²Ô.o—äΞµvÃà.=ì¹ */
+	$"7B35 DEBB 5ABA 9738 36F8 524D 74D8 08FF"            /* {5Þ»Zº—86øRMtØ.ÿ */
+	$"29A7 9B08 5B43 7C17 FB53 234E 4806 B0C3"            /* )§›.[C|.ûS#NH.°Ã */
+	$"AF3A FF38 CCAF FEAA C60F D103 32AC 7D7F"            /* ¯:ÿ8̯þªÆ.Ñ.2¬}. */
+	$"D2B8 51C1 7B7D 56FD 7CFB D2B5 C55B 7C7D"            /* Ò¸QÁ{}Vý|ûÒµÅ[|} */
+	$"7D30 10C2 4181 3358 5DD6 4625 4FFC EA30"            /* }0.ÂA�3X]ÖF%Oüê0 */
+	$"3402 194F 6D0B 53D8 3C64 54AE E8DA 7874"            /* 4..Om.SØ<dT®èÚxt */
+	$"7FF1 DE25 3147 0AF0 D5B6 7BF7 88DD 5199"            /* .ñÞ%1GÂðÕ¶{÷ˆÝQ™ */
+	$"611E 526D B6DB 6DB6 DB69 9C6E 7A40 821D"            /* a.Rm¶Ûm¶Ûiœnz@‚. */
+	$"4416 6952 04BB 9C0A F19B 2C62 E698 A4F5"            /* D.iR.»œÂñ›,b昤õ */
+	$"9B83 3C59 8217 0000 0034 8080 DB92 4924"            /* ›ƒ<Y‚....4€€Û’I$ */
+	$"9249 247D 32D0 9B20 73FF 7E44 A49A 44BB"            /* ’I$}2Л sÿ~D¤šD» */
+	$"EB45 3E31 A4A0 C0CC BBC0 B29E 7771 4FDE"            /* ëE>1¤ ÀÌ»À²žwqOÞ */
+	$"1679 23F1 DE12 5574 68E3 60A1 9C00 CBEC"            /* .y#ñÞ.Uthã`¡œ.Ëì */
+	$"9C44 9009 0000 08DE 28C3 2776 AAA2 829A"            /* œD�Æ...Þ(Ã'vª¢‚š */
+	$"05E0 47E9 0001 48A9 672C 0775 EE58 F075"            /* .àGé..H©g,.uîXðu */
+	$"7458 B48A 5455 DB33 3524 BE73 1D7C E223"            /* tX´ŠTUÛ35$¾s.|â# */
+	$"4EC4 732C EC4B 128D 341C 790C 00A2 1309"            /* NÄs,ìK.�4.y..¢.Æ */
+	$"2D0B 5EA7 B07B C82C 976B 68C2 642A F095"            /* -.^§°{È,—khÂd*ð• */
+	$"A1C4 010E C94E D8A9 34BB FD3E 2B2F 92EC"            /* ¡Ä..ÉNØ©4»ý>+/’ì */
+	$"30E1 A7B3 040B C920 3FFF 7FA1 317B 90F7"            /* 0᧳..É ?ÿ.¡1{�÷ */
+	$"C744 40B8 8325 4036 82FB 0C6C D800 19C4"            /* ÇD@¸ƒ%@6‚û.lØ..Ä */
+	$"2631 C4B8 3160 8649 2492 4924 9248 A747"            /* &1ĸ1`†I$’I$’H§G */
+	$"3D41 A17D 23A6 9AC7 9000 0000 0000 0000"            /* =A¡}#¦šÇ�....... */
+	$"0000 0019 1A70 8823 BB21 7C62 4556 F257"            /* .....pˆ#»!|bEVòW */
+	$"62C0 CF0B 72EE F37E 64EC 43C2 AE04 9F58"            /* bÀÏ.rîó~dìC®.ŸX */
+	$"94DC E128 91EC BAA2 DADD 57A7 D5F7 1972"            /* ”Üá(‘캢ÚÝW§Õ÷.r */
+	$"7543 9A9A 0DB3 C3FD 42E0 19A3 8F45 7FDF"            /* uCšš.³ÃýBà.£�E.ß */
+	$"CEB1 A7E5 8A09 5B4A F9E6 294B C5DC 80C9"            /* α§åŠÆ[Jùæ)KÅÜ€É */
+	$"9AEE 0729 374F 04FD 79D6 7170 D940 14F0"            /* šî.)7O.ýyÖqpÙ@.ð */
+	$"830F 0B71 50E7 3C76 97AF 0F71 A32D DC5A"            /* ƒ..qPç<v—¯.q£-ÜZ */
+	$"28A9 FE90 6CC0 9484 30D1 FCCD 4991 0758"            /* (©þ�lÀ”„0ÑüÍI‘.X */
+	$"BE36 B1DE 3A2E B6F8 2756 C568 2A7F D038"            /* ¾6±Þ:.¶ø'VÅh*.Ð8 */
+	$"2397 6E8F 32E0 C1AC 3736 32A3 C18E 13C4"            /* #—n�2àÁ¬762£ÁŽ.Ä */
+	$"D298 8703 F9AF E24B A630 0627 6E63 ED70"            /* Ò˜‡.ù¯âK¦0.'ncíp */
+	$"0662 A833 6515 7225 C79D 8C1F 7410 45BF"            /* .b¨3e.r%Ç�Œ.t.E¿ */
+	$"5019 F088 7C6C 43FC AE88 B794 5847 505F"            /* P.ðˆ|lCü®ˆ·”XGP_ */
+	$"2B73 6E58 E20E 18A2 01B4 DF7F F5BD D4BC"            /* +snXâ..¢.´ß.õ½Ô¼ */
+	$"B259 706B 754E 9740 BBF2 54FC FCB8 B293"            /* ²YpkuN—@»òTüü¸²“ */
+	$"4CEA 3670 D04B 8C42 B7C2 314D 1F53 956B"            /* Lê6pÐKŒB·Â1M.S•k */
+	$"CB14 9D05 8288 E7F0 D4FF 70AE EFB7 A10B"            /* Ë.�.‚ˆçðÔÿp®ï·¡. */
+	$"EDDE 3CFE 1B9D 7DBA 7B7D BD13 DF6F 45B8"            /* íÞ<þ.�}º{}½.ßoE¸ */
+	$"FE1A 077D B444 FAB6 46FB 75FC E8AB DECC"            /* þ..}´Dú¶Fûuüè«ÞÌ */
+	$"AF0D 6C8A C695 8734 8A7A 5A21 F65D 05F6"            /* ¯.lŠÆ•‡4ŠzZ!ö].ö */
+	$"A417 27AC 998E 3646 07A8 0055 19DC B524"            /* ¤.'¬™Ž6F.¨.U.ܵ$ */
+	$"D2F2 842C DF9F BECA C26B C9C9 D0FD CA3B"            /* Òò„,ߟ¾ÊÂkÉÉÐýÊ; */
+	$"DB1B 3F81 F6A7 4465 001E 5552 4D0D 3BF3"            /* Û.?�ö§De..URM.;ó */
+	$"0140 A2E9 7D63 8456 F9C7 665D F7FC 2DBF"            /* .@¢é}c„VùÇf]÷ü-¿ */
+	$"1B41 0667 7939 1B16 4997 5584 3CFE 81B9"            /* .A.gy9..I—U„<þ�¹ */
+	$"C4A8 B346 EC6D E726 2560 5CB8 8B84 7699"            /* Ĩ³Fìmç&%`\¸‹„v™ */
+	$"3999 2CA0 91D9 A05A C96C 660C 267B 74A0"            /* 9™, ‘Ù ZÉlf.&{t  */
+	$"B935 73EB D464 D860 2694 7584 A4D4 DC52"            /* ¹5sëÔdØ`&”u„¤ÔÜR */
+	$"D136 D49A 1BEA 53F5 AE2F C19E 44E9 BA0A"            /* Ñ6Ôš.êSõ®/ÁžDéºÂ */
+	$"5D83 6587 7792 3DCB 449A B33E 4632 A395"            /* ]ƒe‡w’=ËDš³>F2£• */
+	$"57A3 0EC0 B3A3 969D 9DF0 6ACC 859F FF7F"            /* W£.À³£–��ðjÌ…Ÿÿ. */
+	$"FF27 DAA0 AF8E 216C E5D8 874A 530F 555E"            /* ÿ'Ú ¯Ž!lå؇JS.U^ */
+	$"AF3F E231 5BAF F7B6 8E73 5742 2717 4031"            /* ¯?â1[¯÷¶ŽsWB'.@1 */
+	$"175D 5FDA F402 B756 AEAE 7E7E BFEE CE68"            /* .]_Úô.·V®®~~¿îÎh */
+	$"7878 870D 01C2 C2A4 61D5 64E3 E195 B914"            /* xx‡..¤aÕdãᕹ. */
+	$"A45F FF52 DC14 F5E9 E037 65E3 5477 62A5"            /* ¤_ÿRÜ.õéà7eãTwb¥ */
+	$"3EEC CA32 6558 5965 8B6E 3F13 9DB2 1361"            /* >ìÊ2eXYe‹n?.�².a */
+	$"8426 9FD7 B329 4E75 FF1D 9B78 9735 4B1B"            /* „&Ÿ×³)Nuÿ.›x—5K. */
+	$"D80E 1781 192F 6777 8F94 F6A2 5016 726D"            /* Ø..�./gw�”ö¢P.rm */
+	$"1E0D D2CB 6F87 B3C6 09A2 1FE3 915E 8943"            /* ..ÒËo‡³ÆÆ¢.ã‘^‰C */
+	$"FE6C 6743 4733 D5BC A9DD 5338 C9E1 AF50"            /* þlgCG3Õ¼©ÝS8Éá¯P */
+	$"3634 C26C 0C1F 94E7 50B2 4310 DD62 4F09"            /* 64Âl..”çP²C.ÝbOÆ */
+	$"ABCD 7821 8B7B 7B87 2EEA 25A1 9D3C 55CC"            /* «Íx!‹{{‡.ê%¡�<UÌ */
+	$"0644 1B14 3456 2E32 C013 815C 66C7 0526"            /* .D..4V.2À.�\fÇ.& */
+	$"E24D CE15 B8FB 5D8B 0506 E30A 1D6A E2ED"            /* âMÎ.¸û]‹..ãÂ.jâí */
+	$"6145 D124 0EC9 1FAB 4E50 06C2 9DA5 8F6C"            /* aEÑ$.É.«NP.Â�¥�l */
+	$"C072 D11E BFEE DFE6 F6C7 12F4 E89C 35B7"            /* ÀrÑ.¿îßæöÇ.ôèœ5· */
+	$"097E 2E25 393F CEA3 03C6 D3C7 DED5 3882"            /* Æ~.%9?Σ.ÆÓÇÞÕ8‚ */
+	$"ED26 A3FD 9130 95B5 F3FA D31A 691F 8E09"            /* í&£ý‘0•µóúÓ.i.ŽÆ */
+	$"BFA8 7D7B 85BD B179 5C20 2855 1268 F9AF"            /* ¿¨}{…½±y\ (U.hù¯ */
+	$"553D 939E 6FC6 C67E 4611 F88C BBD4 773C"            /* U=“žoÆÆ~F.øŒ»Ôw< */
+	$"5F16 D598 D5C5 E649 B66E FD8D A2D7 9807"            /* _.Õ˜ÕÅæI¶ný�¢×˜. */
+	$"EDA2 4621 2CF5 DDE3 C078 6455 1C29 3A07"            /* í¢F!,õÝãÀxdU.):. */
+	$"E992 C5DE 8D33 041B 83C6 56F6 7C95 168E"            /* é’ÅÞ�3..ƒÆVö|•.Ž */
+	$"6127 40D2 DE11 CFF2 3379 DC22 20E3 5E1B"            /* a'@ÒÞ.Ïò3yÜ" ã^. */
+	$"DE83 DBB5 5B8A 8572 3DF2 2890 DC56 BE6E"            /* ÞƒÛµ[Š…r=ò(�ÜV¾n */
+	$"D15F 9396 ECD4 725F 2E18 7616 394A 64C3"            /* Ñ_“–ìÔr_..v.9Jdà */
+	$"FDAA E6F2 3D6D 46BC B270 5B8F ACB4 9CAE"            /* ýªæò=mF¼²p[�¬´œ® */
+	$"0D0D 3F29 6A02 1E92 347A E406 A52D 111A"            /* ..?)j..’4zä.¥-.. */
+	$"2E79 0340 1D82 C861 0C40 1963 3397 A4FD"            /* .y.@.‚Èa.@.c3—¤ý */
+	$"A998 0B63 E30A 7AA3 A5BC 8A8E 9CD0 4795"            /* ©˜.cãÂz£¥¼ŠŽœÐG• */
+	$"7538 7FB2 EC9A 952C CE29 C80F 369C 4E8D"            /* u8.²ìš•,Î)È.6œN� */
+	$"8000 1C55 D5F3 E2AD 812E 4FAA AC2C D9BB"            /* €..UÕóâ­�.Oª¬,Ù» */
+	$"F4CD 5568 5643 826F 3A38 91BD 6F70 92D3"            /* ôÍUhVC‚o:8‘½op’Ó */
+	$"23EC DB91 0FC4 C3BB 7542 023B 85F0 36C3"            /* #ìÛ‘.ÄûuB.;…ð6à */
+	$"8BF6 F6F8 4E77 EEE5 851F 219A CF99 7D9E"            /* ‹ööøNwîå….!šÏ™}ž */
+	$"856D A687 BC63 8E39 0407 B007 D184 10BD"            /* …m¦‡¼cŽ9..°.Ñ„.½ */
+	$"D9EF ACB1 B75A 46FA F95E 42DF 377B E2F7"            /* Ùבּ·ZFúù^Bß7{â÷ */
+	$"BEF2 357A 861C F486 B3F7 57E1 D39B 095B"            /* ¾ò5z†.ô†³÷WáÓ›Æ[ */
+	$"40C0 925C 0CA1 7885 CFEA 48B7 33E9 E8DE"            /* @À’\.¡x…ÏêH·3éèÞ */
+	$"D178 1E15 91D1 F6C5 BC87 CB7E CCC6 DEDE"            /* Ñx..‘Ñöż‡Ë~ÌÆÞÞ */
+	$"B017 A4C1 0B0F DD17 660E CB97 C098 C773"            /* °.¤Á..Ý.f.Ë—À˜Çs */
+	$"8A0A F4DB 59BD A218 055E 5348 05D8 B304"            /* ŠÂôÛY½¢..^SH.س. */
+	$"9F23 E1B1 0754 6DA2 FF33 34CB 2B12 7114"            /* Ÿ#á±.Tm¢ÿ34Ë+.q. */
+	$"62D2 4CA8 8091 CD34 8467 2752 B77A AA5B"            /* bÒL¨€‘Í4„g'R·zª[ */
+	$"15FC 2E56 7A29 9351 B6A4 AEE5 B56D 354D"            /* .ü.Vz)“Q¶¤®åµm5M */
+	$"3ED2 FA71 25E9 F887 B187 BADB B11B 2E01"            /* >Òúq%éø‡±‡ºÛ±... */
+	$"93B3 4206 45ED 7238 3F80 1441 50CA CCBA"            /* “³B.Eír8?€.APÊ̺ */
+	$"EF59 3BC5 4236 2ABF 9150 7335 49C5 0216"            /* ïY;ÅB6*¿‘Ps5IÅ.. */
+	$"F97B D5A5 1EF5 A69D 8B34 C25B 73E1 DA52"            /* ù{Õ¥.õ¦�‹4Â[sáÚR */
+	$"79E5 9EB1 9CB1 0952 B3F5 E221 D426 4759"            /* yåž±œ±ÆR³õâ!Ô&GY */
+	$"D5CF 2D18 CC2A 270A 859D F10C 8108 52FF"            /* ÕÏ-.Ì*'Â…�ñ.�.Rÿ */
+	$"2A7D D39E EFFD 568C 2DB3 7BD5 62D0 2403"            /* *}ÓžïýVŒ-³{ÕbÐ$. */
+	$"69D1 A4B6 2D24 E485 973D F6A5 E6DC 1DB5"            /* iѤ¶-$ä…—=ö¥æÜ.µ */
+	$"BF0B E185 5592 E3A0 6046 E050 5151 9546"            /* ¿.á…U’ã `FàPQQ•F */
+	$"17F7 0CF6 222F 17E0 40E5 3EF5 74EE BAB6"            /* .÷.ö"/.à@å>õt */
+	$"55BD 76C1 DD80 39C8 BAE0 37B8 398A B370"            /* U½vÁÝ€9Ⱥà7¸9Š³p */
+	$"D400 0C29 5DC9 94FF 069B 36E2 CD79 195F"            /* Ô..)]É”ÿ.›6âÍy._ */
+	$"5B9B 1237 1F18 C560 C901 F9A4 184B 7570"            /* [›.7..Å`É.ù¤.Kup */
+	$"433E 75BE 0297 C641 7D9B 7092 8D64 96F5"            /* C>u¾.—ÆA}›p’�d–õ */
+	$"D70C 9B66 71D3 09B1 F635 0FC3 0B49 7D6E"            /* ×.›fqÓƱö5.Ã.I}n */
+	$"660C 8E1D 0257 672B 97EE C2A5 7B84 729E"            /* f.Ž..Wg+—îÂ¥{„rž */
+	$"6516 585E 354F 2E22 88A7 A515 B945 3745"            /* e.X^5O."ˆ§¥.¹E7E */
+	$"F6A5 5CB2 E212 10AD AB6F 07F5 FDA3 09EB"            /* ö¥\²â..­«o.õý£Æë */
+	$"A053 313B 9A8E 757D E132 D483 DC78 0882"            /*  S1;šŽu}á2ÔƒÜx.‚ */
+	$"A63C 95E0 036C 4626 F66B 5F6C 39A1 9401"            /* ¦<•à.lF&ök_l9¡”. */
+	$"7276 4DCE 4487 7D8C 12A3 B713 9139 AC0A"            /* rvMÎD‡}Œ.£·.‘9¬Â */
+	$"18AD 4DFD 2A3D 69E7 E76E 593C 8DAB FD56"            /* .­Mý*=iççnY<�«ýV */
+	$"F959 BA6B FBA3 2853 D610 4DB0 7A30 3A09"            /* ùYºkû£(SÖ.M°z0:Æ */
+	$"916B DFF7 B3B4 F8D3 9619 0FD9 8FBC FC6B"            /* ‘kß÷³´øÓ–..Ù�¼ük */
+	$"D73D ABD2 4C41 6AD0 6584 AF19 3074 AF6E"            /* ×=«ÒLAjÐe„¯.0t¯n */
+	$"369C BEB1 76D5 D311 6172 F157 D522 DDED"            /* 6œ¾±vÕÓ.arñWÕ"Ýí */
+	$"D4ED 0230 0BB5 E881 0E6B 9C4F 111F 4F6E"            /* Ôí.0.µè�.kœO..On */
+	$"7CAD 4745 7BBF DA70 A9C4 051E FDEA 206C"            /* |­GE{¿Úp©Ä..ýê l */
+	$"9983 0E2D 4A4A A4DE 82E9 DAAF 5748 37AE"            /* ™ƒ.-JJ¤Þ‚éÚ¯WH7® */
+	$"4046 DCCB 0D1A 80DA 1804 20E2 F7CF AD69"            /* @FÜË..€Ú.. â÷Ï­i */
+	$"F9D8 5106 D02D 16E9 4437 9560 B618 1126"            /* ùØQ.Ð-.éD7•`¶..& */
+	$"95A2 4B23 89C4 78EE 898E D80C 8E49 5201"            /* •¢K#‰ÄxØ.ŽIR. */
+	$"2095 ABAF 9CA5 0F8E CB22 00D4 4289 59B3"            /*  •«¯œ¥.ŽË".ÔB‰Y³ */
+	$"1835 1395 8AE5 3A88 7185 E7DD 57F3 4CE4"            /* .5.•Šå:ˆq…çÝWóLä */
+	$"1465 C878 6B72 7146 2AF1 F053 5B31 7697"            /* .eÈxkrqF*ñðS[1v— */
+	$"7300 A777 3919 099E BD1C 79C3 24C4 A355"            /* s.§w9.Æž½.yÃ$Ä£U */
+	$"0C88 C727 1831 D498 E513 47A5 F25F DDBE"            /* .ˆÇ'.1Ô˜å.G¥ò_ݾ */
+	$"46E7 40B5 EBCC 080F 6915 3FDF EDB9 A9B1"            /* Fç@µëÌ..i.?ßí¹©± */
+	$"39ED D794 60E1 A5A2 0EEC 7A09 46BF 201E"            /* 9í×”`ᥢ.ìzÆF¿ . */
+	$"311F EEEE 88EF C6C1 C10D E238 50C9 7F01"            /* 1.îîˆïÆÁÁ.â8PÉ.. */
+	$"DFF1 17BA D8F4 0017 47E7 75F2 4D82 679E"            /* ßñ.ºØô..GçuòM‚gž */
+	$"6867 60A4 6222 77B9 319B 186D FCB3 168A"            /* hg`¤b"w¹1›.mü³.Š */
+	$"EAF3 C227 1082 D7ED 2C70 E619 8676 0186"            /* êóÂ'.‚×í,pæ.†v.† */
+	$"8C23 5DE5 D4A0 61CB CDE4 AED5 E008 6F3C"            /* Œ#]åÔ aËÍä®Õà.o< */
+	$"D894 AC14 6FEC 5D4C C2FF 3A6C 512F E475"            /* Ø”¬.oì]LÂÿ:lQ/äu */
+	$"FCB8 DFA4 EB46 2DF4 E133 5858 364B 54E1"            /* ü¸ß¤ëF-ôá3XX6KTá */
+	$"A6E1 5D0C 157E D987 DF95 B1FB 3723 4F2F"            /* ¦á]..~هߕ±û7#O/ */
+	$"C9BF C6D4 D979 412E D0EB B285 8DFF 7CAC"            /* É¿ÆÔÙyA.Ðë²…�ÿ|¬ */
+	$"F1BF 1825 8B89 9992 3848 C666 4184 4906"            /* ñ¿.%‹‰™’8HÆfA„I. */
+	$"0D61 6B58 9355 A5D9 C940 B6F2 6918 82E1"            /* .akX“U¥ÙÉ@¶òi.‚á */
+	$"FF7D 4F5F FE94 5208 650B B780 0D2B DD4F"            /* ÿ}O_þ”R.e.·€.+ÝO */
+	$"5874 3627 2353 6328 06B9 908C 6C95 D898"            /* Xt6'#Sc(.¹�Œl•Ø˜ */
+	$"8C24 1D0F 641B 7763 CFBE E88A BB05 8639"            /* Œ$..d.wcϾ芻.†9 */
+	$"D91C 4A38 3A3F 75C6 61BD BFED CA10 2A73"            /* Ù.J8:?uÆa½¿íÊ.*s */
+	$"E3C5 E85C BF5B 0346 2105 4286 300D D812"            /* ãÅè\¿[.F!.B†0.Ø. */
+	$"8BE4 DAE4 292B A765 338E 7E42 50F1 8046"            /* ‹äÚä)+§e3Ž~BPñ€F */
+	$"3FDC 1A85 4616 61E5 7321 18D9 5AB9 8903"            /* ?Ü.…F.aås!.ÙZ¹‰. */
+	$"90BD 6F89 E7D0 35D1 0AA3 BBAE 3CF8 A7B7"            /* �½o‰çÐ5Ñ£»®<ø§· */
+	$"73C8 8B94 B409 16EC 60A6 E819 BCA7 BA66"            /* sÈ‹”´Æ.ì`¦è.¼§ºf */
+	$"2245 524C 718C 635D E4F7 ACA0 02C3 E0A7"            /* "ERLqŒc]ä÷¬ .Ãৠ*/
+	$"B542 0FF5 7029 FF4D 1D88 E3B3 D657 802B"            /* µB.õp)ÿM.ˆã³ÖW€+ */
+	$"8068 9BD4 B17F 9A6B CC1C 4B53 246F 81E5"            /* €h›Ô±.škÌ.KS$o�å */
+	$"9168 48EC 4B44 3FFF 7B8B 5777 5677 134E"            /* ‘hHìKD?ÿ{‹WwVw.N */
+	$"1B8E 8C91 429F CE85 86EF 62B4 71AF EAE7"            /* .ŽŒ‘BŸÎ…†ïb´q¯êç */
+	$"E333 7BD3 2825 7230 C950 0000 1B8D 8BA6"            /* ã3{Ó(%r0ÉP...�‹¦ */
+	$"04C1 56DC 30F0 619E DD6C D196 C91E 1ED4"            /* .ÁVÜ0ðažÝlÑ–É..Ô */
+	$"1285 94A8 F775 05A9 3440 78FF 7E52 8833"            /* .…”¨÷u.©4@xÿ~Rˆ3 */
+	$"E8A1 A4E4 4580 38DD ADE1 3BD5 AD19 74E6"            /* 衤äE€8Ý­á;Õ­.tæ */
+	$"EEA1 B4B1 0B0B 9BE9 08EC DB78 E6AA 37E5"            /* î¡´±..›é.ìÛxæª7å */
+	$"AD06 72A6 51FC 0004 4737 BF1A 89FF 7E11"            /* ­.r¦Qü..G7¿.‰ÿ~. */
+	$"0A68 EAD7 BDA5 4D5B 2C8D 0C7A 952E 2190"            /* Âhê×½¥M[,�.z•.!� */
+	$"8451 1B38 CEFD 2835 5ADD BDA2 01C2 A3D6"            /* „Q.8Îý(5Zݽ¢.壅 */
+	$"6046 4BD8 41DF D8B6 D9B1 1F96 5FF8 CC56"            /* `FKØAßضٱ.–_øÌV */
+	$"A63B 6E14 5035 26D6 946D 1F59 4D17 5507"            /* ¦;n.P5&Ö”m.YM.U. */
+	$"85F7 2DAF A737 4E30 9097 2E2E DAF8 37D1"            /* …÷-¯§7N0�—..Úø7Ñ */
+	$"D987 4E59 ABFD CDF3 AAC3 30D1 8616 FAB3"            /* Ù‡NY«ýÍóªÃ0ц.ú³ */
+	$"2914 92AA 6913 C36F 66DA 4B0B 18FE DD55"            /* ).’ªi.ÃofÚK..þÝU */
+	$"1D2A 3F00 D80C 2423 D923 95C6 E11D 0069"            /* .*?.Ø.$#Ù#•Æá..i */
+	$"B5C9 0803 0907 B950 13DF 48EC F794 3D36"            /* µÉ..Æ.¹P.ßHì÷”=6 */
+	$"5249 2492 4924 9249 2489 9EF6 DC36 9A6B"            /* RI$’I$’I$‰žöÜ6šk */
+	$"1751 415E A37F 47EC A4EA 67AC A222 733C"            /* .QA^£.Gì¤êg¬¢"s< */
+	$"467D 1FFE C727 E6AA 6E99 C584 A87E DFFF"            /* F}.þÇ'æªn™Å„¨~ßÿ */
+	$"7FC3 7592 8204 71A2 6088 C38B 6E65 868E"            /* .Ãu’‚.q¢`ˆÃ‹ne†Ž */
+	$"5A3F FF7F F919 4069 CF10 A302 5125 525C"            /* Z?ÿ.ù.@iÏ.£.Q%R\ */
+	$"A443 88AF 4104 7807 1410 84BA E955 76E8"            /* ¤Cˆ¯A.x...„ºéUvè */
+	$"5F35 B612 A668 5694 9249 2492 4924 9249"            /* _5¶.¦hV”’I$’I$’I */
+	$"2492 4924 4C25 1941 A4EB 1996 7A28 19C1"            /* $’I$L%.A¤ë.–z(.Á */
+	$"A1B0 01D7 ACB2 3F83 42DC D154 27C9 F11F"            /* ¡°.׬²?ƒBÜÑT'Éñ. */
+	$"FC46 90B1 89C4 F78A 4C6F 5C2A 833D 8425"            /* üF�±‰Ä÷ŠLo\*ƒ=„% */
+	$"D837 CA14 E4C7 7F8A 9833 99B7 E589 1376"            /* Ø7Ê.äÇ.Š˜3™·å‰.v */
+	$"C867 FF1D 200A 4C9B 624E 68E3 11AE C8AF"            /* Ègÿ. ÂL›bNhã.®È¯ */
+	$"1723 C741 CEAC 16CE C548 72FF 15CD 3E67"            /* .#ÇAά.ÎÅHrÿ.Í>g */
+	$"AF2C 323F 0FD0 6752 4973 55BD CC10 05B4"            /* ¯,2?.ÐgRIsU½Ì..´ */
+	$"AB3F 9302 00C3 EE70 1BA4 B650 FAB2 5821"            /* «?“..Ãîp.¤¶Pú²X! */
+	$"3856 3872 1B02 7D70 F1F9 0B28 A9DC CAE7"            /* 8V8r..}pñù.(©ÜÊç */
+	$"D9E7 6252 A768 A7DE 0FB1 FCB1 F54B 98C4"            /* ÙçbR§h§Þ.±ü±õK˜Ä */
+	$"7B6E 5E24 BC53 F945 741F 66A0 A51E EE5A"            /* {n^$¼SùEt.f ¥.îZ */
+	$"2A0D B951 4EEE A88B 4F2F C326 F326 1D12"            /* *.¹QNO/Ã&ó&.. */
+	$"524A 9E48 CC53 44EF C54F 1737 8505 46CF"            /* RJžHÌSDïÅO.7….FÏ */
+	$"351E 4354 05C7 C832 2A7D 8899 D009 E617"            /* 5.CT.ÇÈ2*}ˆ™ÐÆæ. */
+	$"0334 305D 9497 D845 E6D3 2CD2 178F 1316"            /* .40]”—ØEæÓ,Ò.�.. */
+	$"65AD 239E 2ED5 ECCB 402A E728 09B5 E847"            /* e­#ž.ÕìË@*ç(ƵèG */
+	$"65BD 3F31 CAC5 F9D8 6606 B8AF 4F84 89FE"            /* e½?1ÊÅùØf.¸¯O„‰þ */
+	$"9004 4730 30BC E58F 5FB3 38CF 36B9 38FC"            /* �.G00¼å�_³8Ï6¹8ü */
+	$"FB9D 07EA D13F 9DB9 7185 0E88 0E3B 06E5"            /* û�.êÑ?�¹q….ˆ.;.å */
+	$"D476 CFCA 1587 3067 9257 B5DF 1E83 E7FF"            /* ÔvÏÊ.‡0g’Wµß.ƒçÿ */
+	$"7FFF 7FFF 0E68 E181 AC15 B980 2AFB 1D80"            /* .ÿ.ÿ.há�¬.¹€*û.€ */
+	$"C5BB A88D E36A 4DC5 94CF 6DB2 0694 F977"            /* Å»¨�ãjMÅ”Ïm².”ùw */
+	$"D708 02D1 F380 6773 016A CA84 3B1C 6A33"            /* ×..Ñó€gs.jÊ„;.j3 */
+	$"5AAC BA2D FEC5 7542 51FC 68D0 CDDD EA44"            /* Z¬º-þÅuBQühÐÍÝêD */
+	$"788E 2F96 D80C F159 FF45 3316 1494 A7F5"            /* xŽ/–Ø.ñYÿE3..”§õ */
+	$"98B4 FC39 0062 D59B 52A6 32CB F97C ABD6"            /* ˜´ü9.bÕ›R¦2Ëù|«Ö */
+	$"42AE AE46 6AA7 D986 0A4E DCDD 717E 8B7C"            /* B®®Fj§Ù†ÂNÜÝq~‹| */
+	$"8FB8 B396 65A6 83FF 6A4A A5C1 597F 70AF"            /* �¸³–e¦ƒÿjJ¥ÁY.p¯ */
+	$"DC96 E2EC 0C1D 7A00 3428 2C60 DE32 8DB8"            /* Ü–âì..z.4(,`Þ2�¸ */
+	$"1604 C249 5E82 1F5B 6C23 E562 B2D4 754E"            /* ..ÂI^‚.[l#åb²ÔuN */
+	$"7F73 442A 25D3 C42A 6A6D 5D09 0E8C 2E67"            /* .sD*%ÓÄ*jm]Æ.Œ.g */
+	$"95EC 08FE B505 8B5A A4A8 0000 0000 0000"            /* •ì.þµ.‹Z¤¨...... */
+	$"0000 0000 6121 26B3 27C3 AEC0 FF52 2FEE"            /* ....a!&³'îÀÿR/î */
+	$"D4F3 92BB 06E2 ABE4 35DC A278 9084 B2F0"            /* Ôó’».â«ä5Ü¢x�„²ð */
+	$"EE1A ADB2 F770 3D4E 120A FD01 B042 CD00"            /* î.­²÷p=N.Âý.°BÍ. */
+	$"B9C2 B661 40B0 E5FC DC59 59F0 61C5 53A7"            /* ¹Â¶a@°åüÜYYðaÅS§ */
+	$"7AC1 7EDC 77B7 1C84 0F9A E321 389C E693"            /* zÁ~Üw·.„.šã!8œæ“ */
+	$"AC98 5160 DDD0 C9A9 BE17 ED52 A10A 300C"            /* ¬˜Q`ÝÐÉ©¾.íR¡Â0. */
+	$"88ED BB5A 80DA C23B 1196 0C7C 6BA8 D4EA"            /* ˆí»Z€ÚÂ;.–.|k¨Ôê */
+	$"4FAB 08A9 EBE3 1CC9 6782 F6A9 85A4 1829"            /* O«.©ëã.Ég‚ö©…¤.) */
+	$"48BB D188 41E8 65BA 28BB 8AC1 8368 DC2F"            /* H»ÑˆAèeº(»ŠÁƒhÜ/ */
+	$"B2DE 61FE 95C0 BD88 C027 9CD9 3819 8A81"            /* ²Þaþ•À½ˆÀ'œÙ8.Š� */
+	$"20FF 616C DEAE C6EA 15A3 D12F 764A B4E2"            /*  ÿalÞ®Æê.£Ñ/vJ´â */
+	$"ECA3 AF32 36FF 29B0 E3CD 5046 527E 39B7"            /* 죯26ÿ)°ãÍPFR~9· */
+	$"921A ABF8 F0CB 7040 5FCD A182 4C57 986D"            /* ’.«øðËp@_Í¡‚LW˜m */
+	$"1115 DD94 687C 3663 7CFB 6C40 642D C8CA"            /* ..Ý”h|6c|ûl@d-ÈÊ */
+	$"1117 B5A9 8025 123D 9406 58F9 96B5 321E"            /* ..µ©€%.=”.Xù–µ2. */
+	$"7646 4BFD 48DE 0B9B DBEF B79F B6C7 031E"            /* vFKýHÞ.›Ûï·Ÿ¶Ç.. */
+	$"1D3B 1D18 B35D 2813 5601 3924 6AE1 FC21"            /* .;..³](.V.9$jáü! */
+	$"60B9 0B9F 6B4B AFB9 15D8 C57A 5345 7461"            /* `¹.ŸkK¯¹.ØÅzSEta */
+	$"0EF9 4B6B 88D1 7833 02DF 4FB8 DBEC 836A"            /* .ùKkˆÑx3.ßO¸Ûìƒj */
+	$"BEA7 3972 93C0 F973 37B5 C84F 1655 031C"            /* ¾§9r“Àùs7µÈO.U.. */
+	$"674D 741E 308E E3BA 6684 5BB0 4506 AB40"            /* gMt.0Žãºf„[°E.«@ */
+	$"14DE BFF2 9B38 4026 C5C2 3A44 FDFF 25CB"            /* .Þ¿ò›8@&ÅÂ:Dýÿ%Ë */
+	$"072E 1D99 62E3 22B8 DE8D 9CF1 79FA 1D38"            /* ...™bã"¸Þ�œñyú.8 */
+	$"8900 17CB A72B 8124 7EAF CF2F FC8D 34D6"            /* ‰..˧+�$~¯Ï/ü�4Ö */
+	$"E0AC 58ED 8BC1 0DAA 7964 FB91 BF08 EFA6"            /* à¬Xí‹Á.ªydû‘¿.ï¦ */
+	$"42FF 7FFF 7FE3 AF13 7C4B 1CF4 D643 3CD3"            /* Bÿ.ÿ.ã¯.|K.ôÖC<Ó */
+	$"5F1A 08BB 7C56 5CFB 6D27 04DE C66A 9AF1"            /* _..»|V\ûm'.ÞÆjšñ */
+	$"2053 D4B2 EE60 44FF 2A89 1FFC DFCC 57C1"            /*  SÔ²î`Dÿ*‰.üßÌWÁ */
+	$"3800 1290 7854 7902 FF7A 9A36 D71E F8D1"            /* 8..�xTy.ÿzš6×.øÑ */
+	$"D439 471B D02F 4A39 E5BC D25F FDF0 8B54"            /* Ô9G.Ð/J9å¼Ò_ýð‹T */
+	$"AE0A 3677 2625 B286 7DEC 8FF7 2457 2B25"            /* ®Â6w&%²†}ì�÷$W+% */
+	$"C066 2A4E A605 EE16 7244 CCFD D3D3 FDA1"            /* Àf*N¦.î.rDÌýÓÓý¡ */
+	$"F3B8 76C3 1C5F 491C 0165 8735 D71D 19AD"            /* ó¸vÃ._I..e‡5×..­ */
+	$"9BB1 A40D E5BA 9D1C E34B B71C 9CF0 EC7A"            /* ›±¤.åº�.ãK·.œðìz */
+	$"5E87 C4F0 A326 0913 9E2C 6517 50A3 E72B"            /* ^‡Äð£&Æ.ž,e.P£ç+ */
+	$"87FE D348 2E5D 0A00 0000 0000 0000 0000"            /* ‡þÓH.]Â......... */
+	$"0002 2C86 A73D 4030 2FE4 D32C 2B56 C74C"            /* ..,†§=@0/äÓ,+VÇL */
+	$"0869 A5C9 151A 69B9 9390 DA50 4411 8FFF"            /* .i¥É..i¹“�ÚPD.�ÿ */
+	$"4938 4E36 F9DD 09FB E4A0 C339 2431 ED8B"            /* I8N6ùÝÆûä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FF4F E2A2 F01A C90F 02E3 51CD B477"            /* #fÿOâ¢ð.É..ãQÍ´w */
+	$"2230 690A B47C E28B 463C 2E88 7579 7943"            /* "0i´|â‹F<.ˆuyyC */
+	$"5055 6D0A EEC5 F3BF 2404 37D8 EFE1 71AC"            /* PUmÂîÅó¿$.7Øïáq¬ */
+	$"6AFE A3E4 A7EB 28BF BFFE 4373 E5FF 7E4A"            /* jþ£ä§ë(¿¿þCsåÿ~J */
+	$"2D5D 1ED3 6D78 1657 9914 A061 7958 972C"            /* -].Ómx.W™. ayX—, */
+	$"56FB D5B0 1FFD A18B 7A29 0C81 295B DF7C"            /* VûÕ°.ý¡‹z).�)[ß| */
+	$"83E3 CD36 0E66 7E2B D8FA 3096 AA44 7F9B"            /* ƒãÍ6.f~+Øú0–ªD.› */
+	$"F0B9 EA48 8CC7 0FFF 7E1C F394 CC5B 6A25"            /* ð¹êHŒÇ.ÿ~.ó”Ì[j% */
+	$"FD4C CECC 630B 38B7 D621 F081 73EE 9D40"            /* ýLÎÌc.8·Ö!ð�sî�@ */
+	$"7FAD FADD 8111 6492 599E DD2C 3600 FF6C"            /* .­úÝ�.d’YžÝ,6.ÿl */
+	$"5A8D B0B8 2AE7 668D C5A0 826B FA0D C5B1"            /* Z�°¸*çf�Å ‚kú.ű */
+	$"6873 D749 B533 9627 C2F6 4922 63F7 8944"            /* hs×Iµ3–'ÂöI"c÷‰D */
+	$"15C5 A1F9 8539 A21A 1CEB 1C2D 7D1B 0516"            /* .Å¡ù…9¢..ë.-}... */
+	$"FD6C 5D4F 92A3 14D9 126F C5FC 4116 B499"            /* ýl]O’£.Ù.oÅüA.´™ */
+	$"D878 D889 9123 D3C8 4637 36E3 8644 6F0B"            /* Øx؉‘#ÓÈF76ã†Do. */
+	$"D2C6 A599 B793 1367 B548 23BD 8836 11E5"            /* ÒÆ¥™·“.gµH#½ˆ6.å */
+	$"C323 7AD5 0534 3D05 A4E6 70B3 0376 2B0C"            /* Ã#zÕ.4=.¤æp³.v+. */
+	$"A964 173B F0BC 2A52 7FE4 2A53 85C2 22B2"            /* ©d.;ð¼*R.ä*S…Â"² */
+	$"B83F 7185 FB4C 3769 5B3E 4A24 E7E1 D0FD"            /* ¸?q…ûL7i[>J$çáÐý */
+	$"9B17 8737 FE8B E4C7 9FC1 0E30 D904 D0C5"            /* ›.‡7þ‹äÇŸÁ.0Ù.ÐÅ */
+	$"D2F5 05E4 3CD6 5FA7 B9AF FB98 755E 0BAF"            /* Òõ.ä<Ö_§¹¯û˜u^.¯ */
+	$"E4EE 408D A8BE 5E58 07A6 059D 1B33 37F3"            /* äî@�¨¾^X.¦.�.37ó */
+	$"8D14 871A 7FC6 43ED 6A6F 8F41 9681 095E"            /* �.‡..ÆCíjo�A–�Æ^ */
+	$"EE46 5BA4 1E15 F5F2 3063 E524 A62A 7C7F"            /* îF[¤..õò0cå$¦*|. */
+	$"0E38 5D00 A378 8F6D 3861 2088 EDD7 AC24"            /* .8].£x�m8a ˆí׬$ */
+	$"D3B6 B052 DE10 357D B65A 1414 4596 8E3D"            /* Ó¶°RÞ.5}¶Z..E–Ž= */
+	$"97E3 D838 9ACC 3C84 AF82 EA8D 8BD3 0180"            /* —ãØ8šÌ<„¯‚ê�‹Ó.€ */
+	$"1582 0654 BB61 1047 ACA1 29D3 7CFA 00C8"            /* .‚.T»a.G¬¡)Ó|ú.È */
+	$"BABC 146B 250C 8D19 8A4E A8B3 50D6 B986"            /* º¼.k%.�.ŠN¨³PÖ¹† */
+	$"2AD6 CEFA 02D6 AE11 FF7C B0A2 E6E0 30E9"            /* *ÖÎú.Ö®.ÿ|°¢æà0é */
+	$"D904 4C03 3BC1 8B68 5892 30B8 7D69 C2D6"            /* Ù.L.;Á‹hX’0¸}iÂÖ */
+	$"A9F8 56A2 7417 1E31 186F 09A1 4C11 6DCA"            /* ©øV¢t..1.oÆ¡L.mÊ */
+	$"A62E 5FCC F59A CCE8 6A29 B0DF E2BC E8BF"            /* ¦._ÌõšÌèj)°ßâ¼è¿ */
+	$"92DF 70C1 8B09 21DF 1440 1684 4413 2A60"            /* ’ßpÁ‹Æ!ß.@.„D.*` */
+	$"E033 6D92 8573 E63C 2746 6F40 D8F0 D0C9"            /* à3m’…sæ<'Fo@ØðÐÉ */
+	$"10AF 85A2 CFBF 373B B250 85E4 C1D3 85D2"            /* .¯…¢Ï¿7;²P…äÁÓ…Ò */
+	$"E167 1222 DF4A 67D9 B3D6 55B4 B047 8675"            /* ág."ßJgÙ³ÖU´°G†u */
+	$"C803 6AE5 E5AE AF92 C4B7 591A A040 98AC"            /* È.jå宯’Ä·Y. @˜¬ */
+	$"4412 45F8 BBC8 6482 F7BD 81B2 98FE 9D0B"            /* D.Eø»Èd‚÷½�²˜þ�. */
+	$"DAB1 2959 952C 9115 3504 9A24 BBA4 A04C"            /* Ú±)Y•,‘.5.š$»¤ L */
+	$"4125 5810 54F5 C268 63C2 1DB9 11CF 85BB"            /* A%X.TõÂhcÂ.¹.Ï…» */
+	$"D941 F5A1 0239 DED3 856D BBE5 7CF3 49C3"            /* ÙAõ¡.9ÞÓ…m»å|óIà */
+	$"C9CF 1BD1 A953 F58A F9AF E704 E70E 43B7"            /* ÉÏ.Ñ©SõŠù¯ç.ç.C· */
+	$"2B51 BE14 4FF3 262C 914B 90AF F2A9 E060"            /* +Q¾.Oó&,‘K�¯ò©à` */
+	$"6A24 6553 B776 C48D 19AD ECD3 2DD3 8ECF"            /* j$eS·vÄ�.­ìÓ-ÓŽÏ */
+	$"9EC7 8A0D 97F4 3C69 6E56 0881 1136 C147"            /* žÇŠ.—ô<inV.�.6ÁG */
+	$"E7D3 6FE5 A0C6 D7DC BCB0 76AC C4F8 DD65"            /* çÓoå Æ×ܼ°v¬ÄøÝe */
+	$"A5F9 02BF 2BFD 9A2C 354D 24C2 E088 6B63"            /* ¥ù.¿+ýš,5M$Âàˆkc */
+	$"E514 C014 E8F4 F5C2 B529 74FB EC02 032B"            /* å.À.èôõµ)tûì..+ */
+	$"A54B 696E B602 7D58 4542 824D BD8C 40FA"            /* ¥Kin¶.}XEB‚M½Œ@ú */
+	$"F675 5CD4 71C9 058E 7062 0E1B 10CC 72A9"            /* öu\ÔqÉ.Žpb...Ìr© */
+	$"95B8 C5FD 7EAF 995C 62ED DDE4 6579 3181"            /* •¸Åý~¯™\bíÝäey1� */
+	$"8BA1 A02B 1559 F5BC E9C9 914D 8CEB D7D8"            /* ‹¡ +.Yõ¼éÉ‘MŒë×Ø */
+	$"7D81 20C0 A609 18D2 B679 7C08 FB00 E4C6"            /* }� À¦Æ.Ò¶y|.û.äÆ */
+	$"2797 518E 32CE 67CE 3C8E 6796 A832 F712"            /* '—QŽ2ÎgÎ<Žg–¨2÷. */
+	$"0037 059C 96CD 85A0 98E6 5D20 05F2 EC61"            /* .7.œ–Í… ˜æ] .òìa */
+	$"335D AFFF 14BC 3EF9 0779 7A53 BAA4 F47A"            /* 3]¯ÿ.¼>ù.yzSº¤ôz */
+	$"6926 DAD2 72F9 5D4B 1014 8BD5 A4FA 68EA"            /* i&ÚÒrù]K..‹Õ¤úhê */
+	$"D9F9 F684 BFD5 F2ED FB9E 4C18 91C3 FF17"            /* Ùùö„¿ÕòíûžL.‘Ãÿ. */
+	$"2D17 D99A DE29 FE6E 63A4 C901 8642 9357"            /* -.ÙšÞ)þnc¤É.†B“W */
+	$"3120 4386 1938 E7D2 572D 0C59 E3C9 7FED"            /* 1 C†.8çÒW-.YãÉ.í */
+	$"30FA E54A CEF8 A94C F92D AF19 76EA 3372"            /* 0úåJÎø©Lù-¯.vê3r */
+	$"B4E1 E7C5 8239 A4AC A247 4838 55E8 EB9B"            /* ´áçÅ‚9¤¬¢GH8Uèë› */
+	$"DE7D 94E9 DBD7 07FB D488 1672 E61D 9E4C"            /* Þ}”éÛ×.ûÔˆ.ræ.žL */
+	$"6DF2 97D5 4936 F89A 5CBC D37A 8C2C F7ED"            /* mò—ÕI6øš\¼ÓzŒ,÷í */
+	$"9755 19F2 0350 AB2E D851 F0B7 78B5 9770"            /* —U.ò.P«.ØQð·xµ—p */
+	$"4DF3 4212 9C9C CA3B 403A BA7B D497 9410"            /* MóB.œœÊ;@:º{Ô—”. */
+	$"04C6 288B 5058 5DC9 EB79 AB85 622C 9A55"            /* .Æ(‹PX]Éëy«…b,šU */
+	$"2DA7 C113 9315 7CAE D84E 6B50 4062 AE94"            /* -§Á.“.|®ØNkP@b®” */
+	$"8F5E 7969 4BA5 56B2 E881 8C02 ED3B 5259"            /* �^yiK¥V²è�Œ.í;RY */
+	$"24CE C98A 4348 12B1 314F E3E3 B6A3 4E61"            /* $ÎÉŠCH.±1Oã㶣Na */
+	$"A426 6350 E380 B0B5 DEFF 64CF 72D6 D4B9"            /* ¤&cP〰µÞÿdÏrÖÔ¹ */
+	$"907C 9BE0 7E4D 39F9 2BB7 C3DE D7C3 DCD8"            /* �|›à~M9ù+·ÃÞ×ÃÜØ */
+	$"1F93 775F 0F44 DF0F A717 C3E9 D603 F269"            /* .“w_.Dß.§.ÃéÖ.òi */
+	$"FBE1 D36F 87B3 6F87 B280 E8AB DECC AF0D"            /* ûáÓo‡³o‡²€è«Þ̯. */
+	$"6C8A C695 8734 87EB A75F 5130 05EC 9BA8"            /* lŠÆ•‡4‡ë§_Q0.웨 */
+	$"78DB 85A2 680C 75A0 EDD1 4AA2 7E1B BAFF"            /* xÛ…¢h.u íÑJ¢~.ºÿ */
+	$"5AFC FD6C 3E36 A6D9 923A 2DCE 24BC 35EF"            /* Züýl>6¦Ù’:-Î$¼5ï */
+	$"27F4 8813 7CC4 0141 3CD9 9568 BFE6 BBB3"            /* 'ôˆ.|Ä.A<Ù•h¿æ»³ */
+	$"219B 0442 5227 3796 635D 0DE7 499A A701"            /* !›.BR'7–c].çIš§. */
+	$"7F74 FB13 F9DF E737 08AB 0A91 3D9E B77D"            /* .tû.ùßç7.«Â‘=ž·} */
+	$"E616 57BB 8BAF 7A0D 1B28 42E6 D653 6BD3"            /* æ.W»‹¯z..(BæÖSkÓ */
+	$"D7A8 9A2B 0905 6198 8809 E5D0 D0A4 F589"            /* רš+Æ.a˜ˆÆåÐФõ‰ */
+	$"3D04 8161 C4CB 7BC9 96E2 9DA4 1C59 C982"            /* =.�aÄË{É–â�¤.YÉ‚ */
+	$"4705 B1BE 1E05 E391 5E89 43FE 6C67 4342"            /* G.±¾..ã‘^‰CþlgCB */
+	$"636F 80C5 6A98 16E6 6B80 27C8 D0D9 B28C"            /* co€Åj˜.æk€'ÈÐÙ²Œ */
+	$"6FD4 E109 61AB 8FCB D4CB 19ED 2BE7 B510"            /* oÔáÆa«�ËÔË.í+çµ. */
+	$"C0E8 5883 0642 92A1 6094 7E45 5D3F 819A"            /* ÀèXƒ.B’¡`”~E]?�š */
+	$"4B6F AE8E ED0B 4B30 ABB1 2789 5C58 EEFD"            /* Ko®Ží.K0«±'‰\Xîý */
+	$"06C9 EF2B 2A12 1731 7581 4428 C72D 2501"            /* .Éï+*..1u�D(Ç-%. */
+	$"2C14 0DA4 2C98 035F FEA8 51A2 0E61 4C50"            /* ,..¤,˜._þ¨Q¢.aLP */
+	$"4A65 60DE FA1C F36C 62D9 A3FA 93A6 4CAC"            /* Je`Þú.ólbÙ£ú“¦L¬ */
+	$"C1D0 079D 912F A133 724B 13CC AFF4 1382"            /* ÁÐ.�‘/¡3rK.̯ô.‚ */
+	$"D61F 8AF2 A48B CCA6 5D66 4F61 E6BE 657B"            /* Ö.Šò¤‹Ì¦]fOaæ¾e{ */
+	$"7F5B 6F20 397A BBC2 3F23 86DF 2355 4A18"            /* .[o 9z»Â?#†ß#UJ. */
+	$"15DB CB3E 201F FF7C 4AC9 C764 B098 CA46"            /* .ÛË> .ÿ|JÉÇd°˜ÊF */
+	$"C2CF 44C6 42E7 D30A FD05 380F 6BD3 24C1"            /* ÂÏDÆBçÓÂý.8.kÓ$Á */
+	$"3998 C5C1 E7D5 0E2C 8D50 7FBB 7A11 6CB7"            /* 9˜ÅÁçÕ.,�P.»z.l· */
+	$"B80F 5A84 44BE E746 C43C 6B5D F055 7A3B"            /* ¸.Z„D¾çFÄ<k]ðUz; */
+	$"77CB BFA9 2B73 06AF 9C8B AF37 F600 E568"            /* wË¿©+s.¯œ‹¯7ö.åh */
+	$"EE70 09D2 B0A7 C201 94D9 AC58 E9A2 9D53"            /* îpÆÒ°§Â.”Ù¬Xé¢�S */
+	$"94C0 D1C9 E379 E453 E4C7 27C5 C3F8 1161"            /* ”ÀÑÉãyäSäÇ'ÅÃø.a */
+	$"D631 3F3C 0CFE 13A3 F6EB 3048 F049 CF11"            /* Ö1?<.þ.£öë0HðIÏ. */
+	$"5962 65AE 5D8E F911 A2E2 7787 6C78 F63C"            /* Ybe®]Žù.¢âw‡lxö< */
+	$"E24C ED5B F634 B2B9 9DDF 51B0 94B9 1ABF"            /* âLí[ö4²¹�ßQ°”¹.¿ */
+	$"BE93 4236 35A6 613E 3D1B C8FD 0587 27C7"            /* ¾“B65¦a>=.Èý.‡'Ç */
+	$"F936 55E0 D0CE BF1A 50D8 51CE 6253 0293"            /* ù6UàÐο.PØQÎbS.“ */
+	$"1958 3FA2 BF6C 54A5 B158 4236 7F88 7DE4"            /* .X?¢¿lT¥±XB6.ˆ}ä */
+	$"C231 6D0B 62F1 2C6C 1A1D F8AA 0317 C52D"            /* Â1m.bñ,l..øª..Å- */
+	$"D9D5 0B61 312B A074 B2B8 1905 FCF9 A102"            /* ÙÕ.a1+ t²¸..üù¡. */
+	$"6188 616D 74E6 8232 245D 9C8A 4FD8 E2FD"            /* aˆamtæ‚2$]œŠOØâý */
+	$"0C6C 8F2E 5C82 5724 C542 3AE5 BA0A EE0B"            /* .l�.\‚W$ÅB:åºÂî. */
+	$"2A14 BCDE 8005 4446 25B1 CF8A 6744 9F5C"            /* *.¼Þ€.DF%±ÏŠgDŸ\ */
+	$"9B09 6571 3003 9F52 A42A 7669 CCAA 7A75"            /* ›Æeq0.ŸR¤*vi̪zu */
+	$"F807 2530 7BA9 1474 F318 5A7B E64A 5DD7"            /* ø.%0{©.tó.Z{æJ]× */
+	$"A6F2 13B0 AFA5 7BF8 46DC CABF 4D80 CC26"            /* ¦ò.°¯¥{øFÜÊ¿M€Ì& */
+	$"5838 4016 3C05 4550 C62F 1504 5B79 0816"            /* X8@.<.EPÆ/..[y.. */
+	$"556C 8524 5DDA E914 92F1 3124 5C5B 3213"            /* Ul…$]Úé.’ñ1$\[2. */
+	$"7851 D9B8 EE79 46CF 3F06 1EAB 662A FD9E"            /* xQÙ¸îyFÏ?..«f*ýž */
+	$"E7D8 2E8C 938F 43FA B1B1 34B0 9207 34EC"            /* çØ.Œ“�Cú±±4°’.4ì */
+	$"7A09 46BF 201E 311F EEEE 88EF C6C1 C10D"            /* zÆF¿ .1.îîˆïÆÁÁ. */
+	$"E238 50C9 7F01 DFF0 2170 EDD1 7471 8C14"            /* â8PÉ..ßð!píÑtqŒ. */
+	$"FB17 6678 A8B9 6611 9713 D8BB 8840 427C"            /* û.fx¨¹f.—.Ø»ˆ@B| */
+	$"8E5E 1608 D5E6 79B6 0BD7 3592 5D97 3864"            /* Ž^..Õæy¶.×5’]—8d */
+	$"71DF 6137 C0E6 2EB0 F71D 466C CFFF 50EF"            /* qßa7Àæ.°÷.FlÏÿPï */
+	$"FE99 2E4D 0DBB 537F 32F1 DECB D5D4 39DF"            /* þ™.M.»S.2ñÞËÕÔ9ß */
+	$"4FCC 2FC2 C399 8EB9 FC8B 2806 3FB7 F227"            /* OÌ/ÂÙŽ¹ü‹(.?·ò' */
+	$"BA12 A288 9858 9159 B6ED 0DBF 3DCC 8FA1"            /* º.¢ˆ˜X‘Y¶í.¿=Ì�¡ */
+	$"9CF5 836D 499F B9E7 DB4E 497F D3A4 57BF"            /* œõƒmIŸ¹çÛNI.Ó¤W¿ */
+	$"9F0A EECE 8E29 127A 82FF 4222 75AC 32D4"            /* ŸÂîÎŽ).z‚ÿB"u¬2Ô */
+	$"6540 8040 4137 9EB4 EFFF 7FEC 9D37 60B4"            /* e@€@A7ž´ïÿ.ì�7`´ */
+	$"184A 9567 71E4 F5FE 1C55 BB95 9FD8 BE6D"            /* .J•gqäõþ.U»•ŸØ¾m */
+	$"037F 052C 035B 91D7 903B 6EEC 1642 3D18"            /* ...,.[‘×�;nì.B=. */
+	$"0B05 FEC5 4C0C 9ED3 BFA5 94AF CBB1 E725"            /* ..þÅL.žÓ¿¥”¯Ë±ç% */
+	$"DFC3 AF74 2485 D5A2 7F79 1275 C7DD ADE1"            /* ßït$…Õ¢.y.uÇÝ­á */
+	$"3BD5 AD19 74E6 EE9F 6846 7900 C09D 090B"            /* ;Õ­.tæîŸhFy.À�Æ. */
+	$"C17C FB0F 2C9F 4DEB B9FE 7152 A47E B1CB"            /* Á|û.,ŸMë¹þqR¤~±Ë */
+	$"FB0E 7108 21C7 EFAB 8FA3 8AF0 2FDC 17A9"            /* û.q.!Çï«�£Šð/Ü.© */
+	$"2565 5082 BEBF 4DDD 0699 3265 82AE D421"            /* %eP‚¾¿MÝ.™2e‚®Ô! */
+	$"3776 341F C56C ECDA B302 0306 AE5F 37FF"            /* 7v4.ÅlìÚ³...®_7ÿ */
+	$"7FB7 1192 8D68 5475 EE0B 4D80 6149 DEBB"            /* .·.’�hTuî.M€aIÞ» */
+	$"F9A7 D7E7 A35D 9515 8000 4F04 C4D6 670C"            /* ù§×ç£]•.€.O.ÄÖg. */
+	$"54B7 93BB D264 43E0 E8D4 2D4D D3E2 AEB0"            /* T·“»ÒdCàèÔ-MÓâ®° */
+	$"FBAE F5BD A155 A8F2 07B4 AAA6 CE0A 84CC"            /* û®õ½¡U¨ò.´ª¦ÎÂ„Ì */
+	$"907F D5C4 9900 8FE2 0E0D F385 55A0 CDFF"            /* �.ÕÄ™.�â..ó…U Íÿ */
+	$"7FFE D776 193F A5C4 0334 DD15 7A6A 0890"            /* .þ×v.?¥Ä.4Ý.zj.� */
+	$"DE98 5707 7799 9A5B D638 31B9 982B 5623"            /* Þ˜W.w™š[Ö81¹˜+V# */
+	$"3AFA A84A 20E7 417C F56E 7776 0C54 0765"            /* :ú¨J çA|õnwv.T.e */
+	$"91DE A19E 3DD2 4D8B F9F9 0D61 6343 0746"            /* ‘Þ¡ž=ÒM‹ùù.acC.F */
+	$"7D72 600B 4E15 FC8F 60FA A273 4348 A86E"            /* }r`.N.ü�`ú¢sCH¨n */
+	$"E11A CD6B 3FFF 7ED1 E486 AAAA A380 045A"            /* á.Ík?ÿ~Ñ䆪ª£€.Z */
+	$"70E5 3753 4FFF 7FC6 ADBE 8E71 66FF 8165"            /* på7SOÿ.Æ­¾Žqfÿ�e */
+	$"D782 24E8 7399 0C15 03BF 29B5 5685 FDA1"            /* ׂ$ès™...¿)µV…ý¡ */
+	$"5BAD 5751 6D53 799A A7C6 572E 6A37 B46A"            /* [­WQmSyš§ÆW.j7´j */
+	$"B9BF 05BF 3131 F7DB E3B8 8F11 EE2F 13D6"            /* ¹¿.¿11÷Ûã¸�.î/.Ö */
+	$"7DE9 D552 0B25 FEAF AEFE F0A7 FBE9 487F"            /* }éÕR.%þ¯®þð§ûéH. */
+	$"9085 0FFA 23FE A9DB 0494 B0E1 FEFD 1D50"            /* �….ú#þ©Û.”°áþý.P */
+	$"15B4 6548 AAA0 0182 C5FF 7D24 05C8 B15E"            /* .´eHª .‚Åÿ}$.ȱ^ */
+	$"E45F A508 3C68 CA73 3A57 A35E 462D 9213"            /* ä_¥.<hÊs:W£^F-’. */
+	$"9D19 A4FE F266 C323 64FF 7B71 19F7 0BC3"            /* �.¤þòfÃ#dÿ{q.÷.Ã */
+	$"062C 20C4 9745 F075 6FFF 31F0 A3AD 4C84"            /* ., Ä—Eðuoÿ1ð£­L„ */
+	$"00F3 104C 0064 3899 0DB9 8128 CB5F FF46"            /* .ó.L.d8™.¹�(Ë_ÿF */
+	$"7184 41CB 7E58 4C0B ADD5 CBB2 1A61 E3D6"            /* q„AË~XL.­Õ˲.aãÖ */
+	$"B45F 489E 7FE9 D915 2B77 0776 98BD B3A6"            /* ´_Hž.éÙ.+w.v˜½³¦ */
+	$"230E B817 1D5A D937 3251 2449 6B0A 5A13"            /* #.¸..ZÙ72Q$IkÂZ. */
+	$"C4E0 BB45 CB72 9758 9E56 158D B1E6 9590"            /* Äà»EËr—XžV.�±æ•� */
+	$"4FC4 0611 EDBC 426F 6D2B D932 D595 A74E"            /* OÄ..í¼Bom+Ù2Õ•§N */
+	$"8728 58CD BD02 9746 DBA2 7EAB 0F07 363C"            /* ‡(Xͽ.—FÛ¢~«..6< */
+	$"BAB3 1228 E02A BDB4 373F F3FB FF7D 8D0D"            /* º³.(à*½´7?óûÿ}�. */
+	$"2193 09F4 7603 A017 98B1 421E 7A47 D126"            /* !“Æôv. .˜±B.zGÑ& */
+	$"82FD 5449 B97F F864 5CD5 19F6 A8A4 F216"            /* ‚ýTI¹.ød\Õ.ö¨¤ò. */
+	$"A4B3 FF7F E820 4C58 DE4B 944B 6FD4 F4DA"            /* ¤³ÿ.è LXÞK”KoÔôÚ */
+	$"596E A688 456C 3F0D 7844 1596 2BED 0D5D"            /* Yn¦ˆEl?.xD.–+í.] */
+	$"FAFB 8D2E D7D0 ABCB B2BE 8D80 E74D 9EDC"            /* úû�.×Ы˲¾�€çMžÜ */
+	$"7FFF 7FC9 2FB9 3BDA F47A B9C2 E1B8 5CC8"            /* .ÿ.É/¹;Úôz¹Âá¸\È */
+	$"14AB D534 7208 32FE 73D2 EF23 862E 10F8"            /* .«Õ4r.2þsÒï#†..ø */
+	$"C16F 1FFF 6FBB FA97 5167 CDAD 4886 8FC2"            /* Áo.ÿo»ú—QgÍ­H†� */
+	$"BFFF 7FFE 2B73 126E 1EC8 C82A 3F6D 6CC3"            /* ¿ÿ.þ+s.n.ÈÈ*?mlà */
+	$"D98A D501 1DC2 82FD FF57 9731 B866 2A7D"            /* ÙŠÕ..‚ýÿW—1¸f*} */
+	$"C983 5F41 893F 2D09 F81C E373 42C2 5963"            /* Ƀ_A‰?-Æø.ãsBÂYc */
+	$"7E9F C269 2B8B C21A 8247 D433 0DF7 491E"            /* ~ŸÂi+‹Â.‚GÔ3.÷I. */
+	$"D1BF 3D9E F4BD 1B50 8034 4EE9 4A69 B155"            /* Ñ¿=žô½.P€4NéJi±U */
+	$"849A B0F7 8CEA 3FD0 E4A0 C339 2431 ED8B"            /* „š°÷Œê?Ðä Ã9$1í‹ */
+	$"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+	$"2366 FD9F 7F36 9703 7BCA 1455 6A98 F02E"            /* #fýŸ.6—.{Ê.Uj˜ð. */
+	$"1EDC 4707 C9A6 B325 A6E4 637D 612B B3DD"            /* .ÜG.ɦ³%¦äc}a+³Ý */
+	$"1E5A 3660 EEB0 BEFA 2C50 307B 5887 6D39"            /* .Z6`î°¾ú,P0{X‡m9 */
+	$"0EC7 2D81 C32E 6B72 8546 30E4 133F 3D3B"            /* .Ç-�Ã.kr…F0ä.?=; */
+	$"0A76 21AA 4387 8F29 03C8 1C32 755C F553"            /* Âv!ªC‡�).È.2u\õS */
+	$"5CA1 C16A 02EC 4654 97C8 6F10 BA2A 16E0"            /* \¡Áj.ìFT—Èo.º*.à */
+	$"DB18 605E 8A18 8A6E 4F35 1EF7 8C57 F8B2"            /* Û.`^Š.ŠnO5.÷ŒWø² */
+	$"0020 4D0A 1739 2287 ADE2 B0C2 D816 17D2"            /* . MÂ.9"‡­â°ÂØ..Ò */
+	$"21F8 3104 FEA8 38E3 8644 6F0B D2C6 A599"            /* !ø1.þ¨8ã†Do.ÒÆ¥™ */
+	$"B793 1367 B548 23BD 8836 1143 D5DB 2720"            /* ·“.gµH#½ˆ6.CÕÛ'  */
+	$"73BB 1485 DEAF C96F 24E8 AA26 56B9 89D3"            /* s».…Þ¯Éo$èª&V¹‰Ó */
+	$"8F8D 2F3E 5EA5 466C BE3C 6879 6C0A 5891"            /* ��/>^¥Fl¾<hylÂX‘ */
+	$"974E 6F22 0E47 66D4 BD1F 6A7D 1885 42CC"            /* —No".GfÔ½.j}.…BÌ */
+	$"7E13 126E AC98 74B7 B093 BDFF 37DB E527"            /* ~..n¬˜t·°“½ÿ7Ûå' */
+	$"E6D0 CF2A D7E6 E7EB 1095 05AF 6407 BB9B"            /* æÐÏ*×æçë.•.¯d.»› */
+	$"0227 D5EB 260A C844 340F B249 E84F 58A7"            /* .'Õë&ÂÈD4.²IèOX§ */
+	$"FA14 9D34 7614 73A6 BE73 ED76 B2CD 4515"            /* ú.�4v.s¦¾sív²ÍE. */
+	$"F26C 3AD7 7C32 5480 5A3A C4DF 123A EA95"            /* òl:×|2T€Z:Äß.:ê• */
+	$"D2B4 A3D8 F88D E685 6505 A999 DD9E C8D1"            /* Ò´£Øø�æ…e.©™ÝžÈÑ */
+	$"A073 3702 5A8F 3598 F7DC A36F 0058 065E"            /*  s7.Z�5˜÷Ü£o.X.^ */
+	$"65E6 B5AC 2A85 0F1C 43BF 8A10 43A0 BB10"            /* e浬*…..C¿Š.C ». */
+	$"4C3A 8F4F 95AD 253D EEE9 FBE8 4023 4647"            /* L:�O•­%=îéûè@#FG */
+	$"7A75 8F1C 9245 3C51 3FF5 BD2B DFD3 57EF"            /* zu�.’E<Q?õ½+ßÓWï */
+	$"1FB4 900F 4546 6EFA A7AE 45EB EAE9 7B9D"            /* .´�.EFnú§®Eëêé{� */
+	$"6408 1DCB F7AC BE44 7D08 1482 2257 A9CF"            /* d..Ë÷¬¾D}..‚"W©Ï */
+	$"8B78 3610 9816 9518 A64C 215A 4569 6C5F"            /* ‹x6.˜.•.¦L!ZEil_ */
+	$"57E0 4F89 F77C 88D6 ADFC 8E42 9299 A2C9"            /* WàO‰÷|ˆÖ­üŽB’™¢É */
+	$"0F7C EA0A 7E98 B7AF 70ED 09A8 0759 B1A7"            /* .|êÂ~˜·¯píƨ.Y±§ */
+	$"C18E 2CC9 883F A788 A2F1 57B9 7A0E F384"            /* ÁŽ,Ɉ?§ˆ¢ñW¹z.ó„ */
+	$"F0CE 46F0 E10A ED6F CE17 2BE1 25D5 3A36"            /* ðÎFðáÂíoÎ.+á%Õ:6 */
+	$"5C6A F3AA F2D1 7225 6C5C 514F 8F1F 64A5"            /* \jóªòÑr%l\QO�.d¥ */
+	$"B08E D05D 3E2E B3E4 DE48 12A9 7DC6 6E03"            /* °ŽÐ]>.³äÞH.©}Æn. */
+	$"05B3 2AD0 EF87 EFB1 6D03 06E4 85AB 36C6"            /* .³*Ðï‡ï±m..ä…«6Æ */
+	$"9BF6 8382 74F2 F321 62DF 269C 8D95 8FBD"            /* ›öƒ‚tòó!bß&œ�•�½ */
+	$"C4CA 7278 FDBA C51B A4FC C224 BD43 5F76"            /* ÄÊrxýºÅ.¤üÂ$½C_v */
+	$"F9D9 0970 5EAA 5F05 FDCB 50DE 35E7 A82E"            /* ùÙÆp^ª_.ýËPÞ5ç¨. */
+	$"1E7E 584D 33D8 EF90 B221 622F 778E 460D"            /* .~XM3Øï�²!b/wŽF. */
+	$"6DC9 383F CF41 7B89 7414 97EF EFE2 CC75"            /* mÉ8?ÏA{‰t.—ïïâÌu */
+	$"8895 6AFD C6E8 610E 5E29 7AE1 FAAF 9FD5"            /* ˆ•jýÆèa.^)záú¯ŸÕ */
+	$"435F 3F61 6F9F AC78 7EAD 62BE 7DF7 7CFD"            /* C_?aoŸ¬x~­b¾}÷|ý */
+	$"D3FD 5BAF 83F5 5B37 CF6D BE7E 9DDF 3F4D"            /* Óý[¯ƒõ[7Ïm¾~�ß?M */
+	$"80E8 ABDE CCAF 0D6C 8AC6 9587 348A 7A5A"            /* €è«Þ̯.lŠÆ•‡4ŠzZ */
+	$"21F6 5D05 F6A4 1727 AC99 8E36 4607 A805"            /* !ö].ö¤.'¬™Ž6F.¨. */
+	$"1CA8 FB12 6979 4216 6FCF DF65 6135 AFF9"            /* .¨û.iyB.oÏßea5¯ù */
+	$"5A1E 01C1 15A0 4F38 E547 6F65 858D 0788"            /* Z..Á. O8åGoe…�.ˆ */
+	$"49E3 07A2 D476 B767 EC21 FF65 559D 3B3F"            /* Iã.¢Ôv·gì!ÿeU�;? */
+	$"B8A5 C1A8 6496 5183 24E6 93A6 DF2F 52F1"            /* ¸¥Á¨d–Qƒ$擦ß/Rñ */
+	$"19CA BFD7 1479 8040 2F9C 0DB9 00F0 49C5"            /* .Ê¿×.y€@/œ.¹.ðIÅ */
+	$"3D32 5B0C 9453 8D1F 452F D9E7 75FD CD61"            /* =2[.”S�.E/ÙçuýÍa */
+	$"44A9 62C3 F0C8 BAF0 6A66 A4D4 AA8B 73B0"            /* D©bÃðȺðjf¤Ôª‹s° */
+	$"C942 686A 4A1E E3A7 2343 A0ED D595 9AFC"            /* ÉBhjJ.ã§#C íÕ•šü */
+	$"5546 0ACB FD23 6F2E DCEE ABBD 70E7 FA93"            /* UFÂËý#o.Üpçú“ */
+	$"3FFF 7FC5 7D31 FA1C D910 1C70 6CDC 3362"            /* ?ÿ.Å}1ú.Ù..plÜ3b */
+	$"B0A1 C6F3 16D1 BE51 73D2 4697 37CA 8197"            /* °¡Æó.ѾQsÒF—7Ê�— */
+	$"A8C6 89C1 FF78 99EB 31B8 5F88 7B08 C557"            /* ¨Æ‰Áÿx™ë1¸_ˆ{.ÅW */
+	$"5483 A35C 0713 94D5 D2DF B84C 36CA D9EC"            /* Tƒ£\..”ÕÒ߸L6ÊÙì */
+	$"8FC7 A305 814F 8B04 07D2 E391 5E89 43FE"            /* �Ç£.�O‹..Òã‘^‰Cþ */
+	$"6C67 4343 91DB DD56 C1D2 FEA6 9F1F 346F"            /* lgCC‘ÛÝVÁÒþ¦Ÿ.4o */
+	$"714B 79E1 7AC7 53A1 9934 69F4 E886 5A9C"            /* qKyázÇS¡™4iôè†Zœ */
+	$"6F9A D26F DD48 5F60 A72A 7E20 77F8 1BE8"            /* ošÒoÝH_`§*~ wø.è */
+	$"91B9 9018 8124 7694 3664 4202 7B94 1007"            /* ‘¹�.�$v”6dB.{”.. */
+	$"4234 15FC 04A2 6DE0 DC6B 5EDE 4332 F592"            /* B4.ü.¢màÜk^ÞC2õ’ */
+	$"779A A3BD 8E84 5464 DE08 6BAE AE2F 6EEF"            /* wš£½Ž„TdÞ.k®®/nï */
+	$"CB75 5862 59D8 1362 5D60 79D2 137C 7606"            /* ËuXbYØ.b]`yÒ.|v. */
+	$"F2B1 06DE 8A2F B76A A7D9 84DB 8F52 1107"            /* ò±.ÞŠ/·j§Ù„Û�R.. */
+	$"A42C 9803 2476 0448 42C9 A9E5 D0F5 9110"            /* ¤,˜.$v.HBÉ©åÐõ‘. */
+	$"2FAB AAF4 0752 81C9 6064 B8F7 6CEB 438E"            /* /«ªô.R�É`d¸÷lëCŽ */
+	$"DC4B 916C 21F0 1C8F 2A6A 1919 9E26 2B36"            /* ÜK‘l!ð.�*j..ž&+6 */
+	$"3E51 F543 F7C5 2549 66D0 2F14 D18F 42F1"            /* >QõC÷Å%IfÐ/.Ñ�Bñ */
+	$"397B BA52 99ED 853C E07D 629B 92A1 2589"            /* 9{ºR™í…<à}b›’¡%‰ */
+	$"B3A9 B812 DC8D A368 3204 F8AA 7549 AF2B"            /* ³©¸.Ü�£h2.øªuI¯+ */
+	$"2DE7 529C 1ECB 9747 A4B8 F6EC 8DDC 0AC4"            /* -çRœ.Ë—G¤¸öì�ÜÂÄ */
+	$"2C31 F042 C407 3F18 FD32 9280 60E4 60D8"            /* ,1ðBÄ.?.ý2’€`ä`Ø */
+	$"77B5 C019 A5FF 6E0D 8E35 A78E C7AA E95B"            /* wµÀ.¥ÿn.Ž5§ŽÇªé[ */
+	$"D37C D883 5DD2 756B 385A 08BB 7708 AA5E"            /* Ó|؃]Òuk8Z.»w.ª^ */
+	$"5B89 0628 F831 7775 3555 A523 BF2F 721A"            /* [‰.(ø1wu5U¥#¿/r. */
+	$"099B E6B4 5128 9EA6 41E1 9B8B 18C1 928C"            /* Æ›æ´Q(ž¦Aᛋ.Á’Œ */
+	$"72A0 BD1E 84D6 836A C947 0982 284A 9238"            /* r ½.„ÖƒjÉGÆ‚(J’8 */
+	$"A06F E390 1BD5 BBFD 323F BA86 2091 BAD5"            /*  oã�.Õ»ý2?º† ‘ºÕ */
+	$"351D 16C5 1D44 E8C7 66C7 D469 047D 5548"            /* 5..Å.DèÇfÇÔi.}UH */
+	$"7049 7B42 B682 DF4C 68DE B5D2 2EDC C105"            /* pI{B¶‚ßLhÞµÒ.ÜÁ. */
+	$"4047 9A7E 0403 F48B 6215 C3ED 8DBA 12E9"            /* @Gš~..ô‹b.Ãí�º.é */
+	$"EEFB B61B 906E F6F6 DDFD D030 CD1C 47FD"            /* îû¶.�nööÝýÐ0Í.Gý */
+	$"7C37 E7C7 DC08 213E 3C33 08E6 74A0 F400"            /* |7çÇÜ.!><3.æt ô. */
+	$"7CFC 3B85 1A2E 5ACA 573F F24C 7D2C 0E3B"            /* |ü;…..ZÊW?òL},.; */
+	$"2A6D CEDC 6C9C 6E97 A572 915F A892 3833"            /* *mÎÜlœn—¥r‘_¨’83 */
+	$"A08F 0070 A602 FB49 0EA6 62FC 4237 C568"            /*  �.p¦.ûI.¦büB7Åh */
+	$"E937 1DC1 1FC2 C3F1 AA30 AC4D DDB8 E747"            /* é7.Á.ÂÃñª0¬MݸçG */
+	$"5EE4 FD73 8124 56EB ADBE 6DB3 F27B 80C0"            /* ^äýs�$Vë­¾m³ò{€À */
+	$"E536 971B 511B C76B AB20 8BA4 4DCD BFCB"            /* å6—.Q.Çk« ‹¤MÍ¿Ë */
+	$"4A0C 34DC 3DDC 9BEF 5122 89D0 99D1 9BE7"            /* J.4Ü=Ü›ïQ"‰Ð™Ñ›ç */
+	$"8840 002A A77A 25E2 9C2C F9BC 78F9 FB0E"            /* ˆ@.*§z%âœ,ù¼xùû. */
+	$"0DB7 4F14 B07A 12F6 65D3 ABE1 660D A84A"            /* .·O.°z.öeÓ«áf.¨J */
+	$"EFF9 A799 1852 8ED0 9582 B79A D812 1BE6"            /* ïù§™.RŽÐ•‚·šØ..æ */
+	$"F3D0 D5FA 9C76 5EBD DBFD 42A9 F7B3 885E"            /* óÐÕúœv^½ÛýB©÷³ˆ^ */
+	$"4A68 DBE7 9663 FB7F 1AC4 5004 197F 97F0"            /* JhÛç–cû..ÄP...—ð */
+	$"F57B 135D 19ED E0E0 1C84 139C BA3B 2493"            /* õ{.].íàà.„.œº;$“ */
+	$"D997 333D B6A7 9E83 619C FCE9 9875 134D"            /* Ù—3=¶§žƒaœüé˜u.M */
+	$"4B31 FCB3 5808 B917 C8BB 0B67 4564 488E"            /* K1ü³X.¹.È».gEdHŽ */
+	$"3554 8125 C3A4 DB4A 0BB2 E501 244C 1F49"            /* 5T�%äÛJ.²å.$L.I */
+	$"C6A7 51E4 6C51 A134 3DF4 CE21 2993 FF3B"            /* ƧQälQ¡4=ôÎ!)“ÿ; */
+	$"80F6 AE0B B9F8 D1D5 8853 4531 6806 4F3E"            /* €ö®.¹øÑÕˆSE1h.O> */
+	$"D2B6 5F62 796A 683C D3C9 A22B 6D56 C497"            /* Ò¶_byjh<ÓÉ¢+mVÄ— */
+	$"D854 2E14 C281 0F94 0220 BEE7 3754 D077"            /* ØT..Â�.”. ¾ç7TÐw */
+	$"EDB0 0F0E 95C1 A40B 55C9 B5AE 4DA8 A8A6"            /* í°..•Á¤.Uɵ®M¨¨¦ */
+	$"ADD6 4A11 DE81 B148 70D3 FA4F 795C 9171"            /* ­ÖJ.Þ�±HpÓúOy\‘q */
+	$"C72E 7EF2 454C 0336 BE4A EE68 960E 25BA"            /* Ç.~òEL.6¾Jîh–.%º */
+	$"E686 01F4 6FF5 3C7C 8B33 60D8 24D3 70A1"            /* æ†.ôoõ<|‹3`Ø$Óp¡ */
+	$"06C6 E616 29D4 63D6 3334 379F 743E 745D"            /* .Ææ.)ÔcÖ347Ÿt>t] */
+	$"4EF5 ECB5 072E 9F62 0750 F7BA 6FDE B6B0"            /* Nõìµ..Ÿb.P÷ºoÞ¶° */
+	$"0BD0 4FCC 8F59 9B13 0C77 0A30 9BAE DF36"            /* .ÐOÌ�Y›..wÂ0›®ß6 */
+	$"B13D D861 E92A 12C7 EC7A 0946 BF20 1E31"            /* ±=Øaé*.ÇìzÆF¿ .1 */
+	$"1FEE EE88 EFC6 C1C1 0DE2 3850 C97F 01DF"            /* .îîˆïÆÁÁ.â8PÉ..ß */
+	$"F021 605A D52A 570D 7089 0C1B B3FE 8B4D"            /* ð!`ZÕ*W.p‰..³þ‹M */
+	$"E441 70AC 5F71 3FCE 527F EBF4 048A A307"            /* äAp¬_q?ÎR.ëô.Š£. */
+	$"CEFD 4EB0 87ED BFE2 A36C 51B9 EAD3 37C6"            /* ÎýN°‡í¿â£lQ¹êÓ7Æ */
+	$"E8F0 9A3D 8F78 8747 81D4 33F0 9EEB 5EA0"            /* èðš=�x‡G�Ô3ðžë^  */
+	$"6FE0 A580 6B6B C126 1CE3 F1B2 DC9C CFCE"            /* oीkkÁ&.ãñ²ÜœÏÎ */
+	$"42EE 7E91 EF2F 0DDF CFDE 75EB 554D 6941"            /* Bî~‘ï/.ßÏÞuëUMiA */
+	$"07A5 21BE AD52 7CC1 49B5 FE74 AE40 F70F"            /* .¥!¾­R|ÁIµþt®@÷. */
+	$"AB3B 0C16 98F5 7742 3DCE 842D 0B2B 2FEB"            /* «;..˜õwB=΄-.+/ë */
+	$"5E90 DEBC 8BA9 81AC 40CC 0030 2853 FE9C"            /* ^�Þ¼‹©�¬@Ì.0(Sþœ */
+	$"6FC2 569B 2CD1 6200 2881 802D 7697 8442"            /* oÂV›,Ñb.(�€-v—„B */
+	$"92C8 666B BC90 3252 F4D3 9BD2 AD14 0027"            /* ’Èfk¼�2RôÓ›Ò­..' */
+	$"CE11 F5A4 437B 3F80 B250 AA4C 23B6 AD83"            /* Î.õ¤C{?€²PªL#¶­ƒ */
+	$"277E 5EF0 8132 6331 9325 D1A3 CFB6 6F73"            /* '~^ð�2c1“%ѣ϶os */
+	$"D37D 780F 91CC CD40 6234 2FE2 F097 1681"            /* Ó}x.‘ÌÍ@b4/âð—.� */
+	$"6097 88BD BFFF 18F5 2CBB FF67 FDBC 2F07"            /* `—ˆ½¿ÿ.õ,»ÿgý¼/. */
+	$"67FF 7FFF 1946 84C7 A551 03FF 7F52 A7C2"            /* gÿ.ÿ.F„Ç¥Q.ÿ.R§Â */
+	$"8AC8 1080 56FF 0C48 1804 A884 A5A2 08FF"            /* ŠÈ.€Vÿ.H..¨„¥¢.ÿ */
+	$"7FF5 3220 8043 9005 C25D DE15 02FB 7F2B"            /* .õ2 €C�.Â]Þ..û.+ */
+	$"8205 5CA8 40BE EFB1 78F0 2656 2AD4 14FF"            /* ‚.\¨@¾ï±xð&V*Ô.ÿ */
+	$"7505 20CD 8BE2 8B15 47BB 9E26 105E 15DD"            /* u. Í‹â‹.G»ž&.^.Ý */
+	$"21A7 82AE E19D FE27 5D8B DDAD E13B D5AD"            /* !§‚®á�þ']‹Ý­á;Õ­ */
+	$"1974 E6EE 9F68 4679 00C0 9D09 0BC1 7CFB"            /* .tæîŸhFy.À�Æ.Á|û */
+	$"0F2C 9F4E 082C 2CB4 569B A7B0 0009 E098"            /* .,ŸN.,,´V›§°.Æà˜ */
+	$"9AB0 9892 B1FF 6957 1D78 2613 4289 24C6"            /* š°˜’±ÿiW.x&.B‰$Æ */
+	$"12BC E2EF C9AE E6D9 784F C157 77AB 3470"            /* .¼âïÉ®æÙxOÁWw«4p */
+	$"D8C7 C746 1978 322D D4E9 FA24 B8B2 5054"            /* ØÇÇF.x2-Ôéú$¸²PT */
+	$"D643 8270 9090 D6D8 0C24 16E5 1146 421C"            /* ÖC‚p��ÖØ.$.å.FB. */
+	$"D6A2 40D9 1864 A800 0000 0000 0001 4554"            /* Ö¢@Ù.d¨.......ET */
+	$"031E 793B 33D3 FD4A CE0A 3D8A 9D46 37B0"            /* ..y;3ÓýJÎÂ=Š�F7° */
+	$"4D2C 6F04 2BFF 071C 023F E153 6688 1815"            /* M,o.+ÿ...?áSfˆ.. */
+	$"BA20 BF61 DDDF 2979 84E3 3348 50F6 E9B8"            /* º ¿aÝß)y„ã3HPöé¸ */
+	$"634A 8937 FF7F F1AE E84B C95A 771F 4C9C"            /* cJ‰7ÿ.ñ®èKÉZw.Lœ */
+	$"3FFE 0734 7D7F 6E35 4A2E 21E0 E52F FF7E"            /* ?þ.4}.n5J.!àå/ÿ~ */
+	$"8532 8513 7869 A6E6 495D 3E58 F349 1EF5"            /* …2….xi¦æI]>XóI.õ */
+	$"886C 6441 9091 82E8 0C24 1507 0E02 A105"            /* ˆldA�‘‚è.$....¡. */
+	$"95C5 1409 096C 9A37 F758 F13A 5ABF 149E"            /* •Å.ÆÆlš7÷Xñ:Z¿.ž */
+	$"DA31 52E9 0DA9 0BFF 45EB 20C7 1A1C E54C"            /* Ú1Ré.©.ÿEë Ç..åL */
+	$"29D1 6C8E D1EC 9D59 F945 4303 373F FF7F"            /* )ÑlŽÑì�YùEC.7?ÿ. */
+	$"CE95 B027 88F7 AB06 28B9 92E7 D540 BC2B"            /* Ε°'ˆ÷«.(¹’çÕ@¼+ */
+	$"7167 8C6C C87E 32B0 C904 7D7D 278E E519"            /* qgŒlÈ~2°É.}}'Žå. */
+	$"707D 2C42 1714 C425 F9D0 DC01 D910 23DB"            /* p},B..Ä%ùÐÜ.Ù.#Û */
+	$"E7F3 391C A4E6 FAE1 C850 5A1F 456A 6690"            /* çó9.¤æúáÈPZ.Ejf� */
+	$"3F37 F970 3841 73D3 1095 39CF 10A3 40F8"            /* ?7ùp8AsÓ.•9Ï.£@ø */
+	$"4CCC 4985 E3D5 127F 7CF4 92BC DCE9 2335"            /* LÌI…ãÕ..|ô’¼Üé#5 */
+	$"43FB 7460 8D5C C121 CFF2 1165 1CCE BBB2"            /* Cût`�\Á!Ïò.e.λ² */
+	$"5EA8 0279 2C97 E45B A43D 328C 7A6C 5EBC"            /* ^¨.y,—ä[¤=2Œzl^¼ */
+	$"61DD BB2C E34E 25E4 1725 3C6B EC12 BFEF"            /* aÝ»,ãN%ä.%<kì.¿ï */
+	$"3E5E 0ACF 766D 9D4E 8978 2AC5 F138 755A"            /* >^ÂÏvm�N‰x*Åñ8uZ */
+	$"CBDD 8421 F74E 9A07 A070 16ED 100C 769A"            /* ËÝ„!÷Nš. p.í..vš */
+	$"6571 1FA0 4D62 8ADC A3F1 0AAA 2253 1A39"            /* eq. MbŠÜ£ñª"S.9 */
+	$"0006 DF51 B09A 2267 BA13 3AD9 0120 8520"            /* ..ßQ°š"gº.:Ù. …  */
+	$"7375 BB11 0715 9FFF 7FFF 276F 9A44 4D02"            /* su»...Ÿÿ.ÿ'ošDM. */
+	$"9DF2 BE32 729A 8C71 FBC9 4C73 FA4B 1D24"            /* �ò¾2ršŒqûÉLsúK.$ */
+	$"4115 B69E 4FFF 7FFF 45B5 7091 9925 CEBD"            /* A.¶žOÿ.ÿEµp‘™%ν */
+	$"6A4E 1AA3 BFFF 7FFD AA3B 4043 EE5A 76B0"            /* jN.£¿ÿ.ýª;@CîZv° */
+	$"A073 CF17 7A58 3A06 649C B972 3CB8 897B"            /*  sÏ.zX:.dœ¹r<¸‰{ */
+	$"31E2 637A 05AC 83FA B94C 0F75 7113 FF7B"            /* 1âcz.¬ƒú¹L.uq.ÿ{ */
+	$"E690 225A FB16 A961 626A B7FE 22EF 864B"            /* æ�"Zû.©abj·þ"ï†K */
+	$"F464 1D62 4127 02B3 DB08 1C01 3ECE 1326"            /* ôd.bA'.³Û...>Î.& */
+	$"CF03 BF05 5771 4992 75FE 29FC 5FFF 60D5"            /* Ï.¿.WqI’uþ)ü_ÿ`Õ */
+	$"DCC3 1B1F 40FF 6990 DC69 3E47 D09A 6E6A"            /* ÜÃ..@ÿi�Üi>GКnj */
+	$"2866 9BA8 D74C BAAA 204E 05F9 DBFE E679"            /* (f›¨×Lºª N.ùÛþæy */
+	$"E76C 383D 9F92 BB32 1E14 2CA1 CBD5 E93C"            /* çl8=Ÿ’»2..,¡ËÕé< */
+	$"6C00 DFA2 B04F D650 3F14 60FF 7F73 29C3"            /* l.ߢ°OÖP?.`ÿ.s)à */
+	$"E20E 5672 C31B 6D72 FDCF 8097 B8B0 1482"            /* â.VrÃ.mrýÏ€—¸°.‚ */
+	$"C37E 4C4A 28FA 6E67 F061 E00C 371B 8655"            /* Ã~LJ(úngðaà.7.†U */
+	$"BDCB 2942 6AB1 0E31 38D3 6948 0D3F 6FEF"            /* ½Ë)Bj±.18ÓiH.?oï */
+	$"C2AB 669A E502 2490 C158 FC07 05F0 348A"            /* «fšå.$�ÁXü..ð4Š */
+	$"0505 F0B2 E7E3 F934 19DA 2DB9 9686 603E"            /* ..ð²çãù4.Ú-¹–†`> */
+	$"C2C3 4B2F EB95 FB4E 62D2 F085 4364 9DCA"            /* ÂÃK/ë•ûNbÒð…Cd�Ê */
+	$"A6E8 94F8 CC41 2603 5BFC 4E90 C05F 068D"            /* ¦è”øÌA&.[üN�À_.� */
+	$"414C 618C 8860 58B1 7059 0B4C 39E8 FB58"            /* ALaŒˆ`X±pY.L9èûX */
+	$"C413 43C6 BF39 CC12 6E5B F65C F671 DD29"            /* Ä.CÆ¿9Ì.n[ö\öqÝ) */
+	$"8A03 BC15 FF06 2028 49E4 BF04 E6FC D4FD"            /* Š.¼.ÿ. (Iä¿.æüÔý */
+	$"401A CB9C 5F7F EFE7 8F41 E707 7803 9F1A"            /* @.Ëœ_.ïç�Aç.x.Ÿ. */
+	$"715F 951E E63A 9B4C 1404 32AA B5B7 98B0"            /* q_•.æ:›L..2ªµ·˜° */
+	$"D5F4 CD69 DD15 9E81 D2FD 09F7 462D AF3E"            /* ÕôÍiÝ.ž�ÒýÆ÷F-¯> */
+	$"31DA 85C4 5053 8460 C06C 7018 908C 4821"            /* 1Ú…ÄPS„`Àlp.�ŒH! */
+	$"D8AB AC44 7666 44D1 EA04 8979 3A4A A0FE"            /* Ø«¬DvfDÑê.‰y:J þ */
+	$"27D7 B0C3 DBAA 5233 F376 3CA8 4968 DF8A"            /* '×°ÃÛªR3óv<¨Ihߊ */
+	$"874C 2117 6A15 4664 03FF 7FFF 7F7C 2D12"            /* ‡L!.j.Fd.ÿ.ÿ.|-. */
+	$"B28B 8A4C 6D72 1106 16E0 BF7F 9822 2424"            /* ²‹ŠLmr...à¿.˜"$$ */
+	$"3C1B CBC8 2F76 1AC7 FF7F FF7F EB42 22AA"            /* <.ËÈ/v.Çÿ.ÿ.ëB"ª */
+	$"F30A 0C9D 6086 E561 E1BC C1D9 4E7F FADF"            /* óÂ.�`†åaá¼ÁÙN.úß */
+	$"A85C B34C E2D4 FCF6 1A29 34F3 3B42 1DFC"            /* ¨\³LâÔüö.)4ó;B.ü */
+	$"C6BD 370B D203 B0C4 1C7D C348 1EE7 EAD9"            /* ƽ7.Ò.°Ä.}ÃH.çêÙ */
+	$"3145 E7FB 36CC 8E64 AB70 81DC 65E1 2C1D"            /* 1Eçû6ÌŽd«p�Üeá,. */
+	$"9CB5 18A0 1C95 7DE2 96DF C185 7A40 50C7"            /* œµ. .•}â–ßÁ…z@PÇ */
+	$"E32C FCC1 FF6B 14F5 05FE 0E1C 8757 8D82"            /* ã,üÁÿk.õ.þ..‡W�‚ */
+	$"3A41 284E 2906 8316 564F F479 4DCF FF7E"            /* :A(N).ƒ.VOôyMÏÿ~ */
+	$"5F11 3745 AC7F ED8D BC93 4205 7E12 E036"            /* _.7E¬.í�¼“B.~.à6 */
+	$"0BE4 4B4F F99C F369 6B38 263E 63EC 6311"            /* .äKOùœóik8&>cìc. */
+	$"D577 8B5D 7957 D24D 7D64 A2B5 1107 4625"            /* Õw‹]yWÒM}d¢µ..F% */
+	$"E1EB 2460 41A2 E878 5967 CEAE AE16 D8D5"            /* áë$`A¢èxYgή®.ØÕ */
+	$"F960 B484 0B49 7253 26F2 714E 6A13 03E4"            /* ù`´„.IrS&òqNj..ä */
+	$"A0C3 3924 31ED 8B79 3D63 5412 C097 F9C3"            /*  Ã9$1í‹y=cT.À—ùÃ */
+	$"79AD A97D EEE5 EF23 66FF 15BD C854 5DFB"            /* y­©}îåï#fÿ.½ÈT]û */
+	$"5921 E05C 6A39 B68E 6444 6D55 3B7D 6DDA"            /* Y!à\j9¶ŽdDmU;}mÚ */
+	$"9003 8F53 5C49 D978 31CD 41C5 DD62 7DE4"            /* �.�S\IÙx1ÍAÅÝb}ä */
+	$"2F24 5932 A14F 9C9C 97B6 2652 5988 7970"            /* /$Y2¡Oœœ—¶&RYˆyp */
+	$"F890 8A5C 9614 EBF4 DAC8 15D1 6F3C 07E4"            /* ø�Š\–.ëôÚÈ.Ño<.ä */
+	$"7B8B F763 6803 394F 2291 8D88 EB1B 3136"            /* {‹÷ch.9O"‘�ˆë.16 */
+	$"10C9 5077 060A 7DB0 A890 CB7B 947F AD8B"            /* .ÉPw.Â}°¨�Ë{”.­‹ */
+	$"0AAF 67FF 5D78 615A E459 013B 6923 5E0E"            /* ¯gÿ]xaZäY.;i#^. */
+	$"900D BA9C DFF2 37D0 0508 B5F3 EA48 FADE"            /* �.ºœßò7Ð..µóêHúÞ */
+	$"D348 3F2F 8E71 E6CD B6BE 8941 8773 0E17"            /* ÓH?/ŽqæͶ¾‰A‡s.. */
+	$"E97A B699 5A4F 21C1 0766 538B B29A B8CA"            /* éz¶™ZO!Á.fS‹²š¸Ê */
+	$"FBAE 21FA 76A0 B197 C613 E523 B127 1FE4"            /* û®!úv ±—Æ.å#±'.ä */
+	$"0AA8 798D 688E 8F27 E386 446F 0BD2 C6A5"            /* ¨y�hŽ�'ã†Do.ÒÆ¥ */
+	$"99B7 9313 67B5 4823 BD88 3611 E5A8 8054"            /* ™·“.gµH#½ˆ6.娀T */
+	$"3C15 C120 1B02 5B2A 2195 DD25 F90A 48A6"            /* <.Á ..[*!•Ý%ùÂH¦ */
+	$"BF92 56B9 4639 F2BD AC5F 3350 9699 14A7"            /* ¿’V¹F9ò½¬_3P–™.§ */
+	$"30A2 4B91 C33D 3175 F806 15AA 4B01 558F"            /* 0¢K‘Ã=1uø..ªK.U� */
+	$"400B 8148 DAF5 29FD 0561 1CA8 7239 51F4"            /* @.�HÚõ)ý.a.¨r9Qô */
+	$"A169 A92B EE2F 4F3D 2F96 029B 186B 7219"            /* ¡i©+î/O=/–.›.kr. */
+	$"C673 0E85 6FAC 9889 C64A 90AE DBAF E8E3"            /* Æs.…o¬˜‰ÆJ�®Û¯èã */
+	$"6607 DF2A C332 C690 840A 817A ABFF 3302"            /* f.ß*Ã2Æ�„Â�z«ÿ3. */
+	$"1464 A65F E1B3 04B0 90C6 51E5 6A2E 7EA2"            /* .d¦_á³.°�ÆQåj.~¢ */
+	$"9222 EABA 0632 2F13 B1A3 2337 85B4 E390"            /* ’"êº.2/.±£#7…´ã� */
+	$"766A 98DB BDDD 9813 F7BD 8AEA 1AB2 BEEC"            /* vj˜Û½Ý˜.÷½Šê.²¾ì */
+	$"BEE3 F4B7 EE35 6BB8 ADE1 E772 AEB0 7E66"            /* ¾ãô·î5k¸­áçr®°~f */
+	$"3F99 05C1 3339 69B2 C1D5 4CC7 DB0B 3C67"            /* ?™.Á39i²ÁÕLÇÛ.<g */
+	$"7F80 43C8 7B29 FA49 8C64 3FEB 6406 35FE"            /* .€CÈ{)úIŒd?ëd.5þ */
+	$"FAEB 4922 9410 5352 D4C0 00CB 72EA 56CE"            /* úëI"”.SRÔÀ.ËrêVÎ */
+	$"22F8 673A D3E8 AAFA E992 5B7F 827C A83D"            /* "øg:Óèªúé’[.‚|¨= */
+	$"586F 54B4 69F8 C6B7 FF14 CFD4 4069 C50F"            /* XoT´iøÆ·ÿ.ÏÔ@iÅ. */
+	$"9E23 797E DE78 5B86 FCAE BDE5 B920 9551"            /* ž#y~Þx[†ü®½å¹ •Q */
+	$"22EC 4155 0582 10F4 BF8C 144A 3251 97F3"            /* "ìAU.‚.ô¿Œ.J2Q—ó */
+	$"2E7D 1E04 969B 4C15 8BDB FAC1 9743 2B6C"            /* .}..–›L.‹ÛúÁ—C+l */
+	$"6EF5 C95E 47CB A380 A635 C17D AD97 42EA"            /* nõÉ^GË£€¦5Á}­—Bê */
+	$"88A1 A63E FC76 A19C AE08 C868 115F 098D"            /* ˆ¡¦>üv¡œ®.Èh._Æ� */
+	$"A1BE 16D4 3BF4 91C9 6CF1 DBE0 E0CA 0DAA"            /* ¡¾.Ô;ô‘ÉlñÛààÊ.ª */
+	$"EFCB 2A06 908B 7BAC CCF3 4CF8 179A 615E"            /* ïË*.�‹{¬ÌóLø.ša^ */
+	$"590D AB18 CB49 E032 B8ED 2A8E 584A ACDC"            /* Y.«.ËIà2¸í*ŽXJ¬Ü */
+	$"4797 F732 B8C9 24A4 0E5C 85A0 FED8 E30A"            /* G—÷2¸É$¤.\… þØã */
+	$"ECBF 08FB CDC1 E09D 9556 837A E086 95AC"            /* ì¿.ûÍÁà�•Vƒzà†•¬ */
+	$"BA2C E411 756E F132 9CE6 EDC4 6C90 B09E"            /* º,ä.unñ2œæíÄl�°ž */
+	$"3C59 DE78 44D0 E445 BCA0 3AE0 05D9 7440"            /* <YÞxDÐäE¼ :à.Ùt@ */
+	$"F09F 10EA E0BA 4596 84F5 81A2 550E 57A7"            /* ðŸ.êàºE–„õ�¢U.W§ */
+	$"F2A8 B2DD D612 A18F D74A 671D B70C 994A"            /* ò¨²ÝÖ.¡�×Jg.·.™J */
+	$"9441 8E10 12B8 80F0 6249 2075 CD39 3667"            /* ”AŽ..¸€ðbI uÍ96g */
+	$"6632 AFDD 5E48 6B22 15CC 179A C6FA 47AE"            /* f2¯Ý^Hk".Ì.šÆúG® */
+	$"66AF 7AFB 033D 03F1 B829 B852 F1BF 55DB"            /* f¯zû.=.ñ¸)¸Rñ¿UÛ */
+	$"17F6 E1EF A955 F266 ACFE 75F4 34FC 38B0"            /* .öáï©Uòf¬þuô4ü8° */
+	$"0068 7DD6 016E 98D4 57DB 6220 D269 4BE9"            /* .h}Ö.n˜ÔWÛb ÒiKé */
+	$"8007 22E8 9D82 8FCE EB41 317B D0FA 323B"            /* €."è�‚�ÎëA1{Ðú2; */
+	$"B2C0 06D3 99E3 ED9A 2423 78CD AE34 CF5B"            /* ²À.Ó™ãíš$#xÍ®4Ï[ */
+	$"58DA 8F69 9604 4804 8682 B58C C1DA 1E21"            /* XÚ�i–.H.†‚µŒÁÚ.! */
+	$"0E4E F709 83E1 B335 F208 6565 C882 70A0"            /* .N÷ƃá³5ò.eeÈ‚p  */
+	$"2F58 5379 3999 7F2E E63D 81E4 C2EB 58E3"            /* /XSy9™..æ=�äÂëXã */
+	$"4605 35E7 76D7 C7D0 AEDA 26C5 8BB6 0F99"            /* F.5çv×ÇЮÚ&Å‹¶.™ */
+	$"77C0 D3D6 9870 8279 4C2E 29C6 518F 13E6"            /* wÀÓÖ˜p‚yL.)ÆQ�.æ */
+	$"1373 FCB8 FD55 3D8F 8322 F8F4 CD80 3C09"            /* .sü¸ýU=�ƒ"øôÍ€<Æ */
+	$"1496 931A E1BF 0AE6 2842 6FF7 6986 6AEE"            /* .–“.á¿Âæ(Bo÷i†jî */
+	$"1AE9 FF0A 947D E3F6 D93F B59B F6D5 5FB6"            /* .éÿ”}ãöÙ?µ›öÕ_¶ */
+	$"AAC7 EDD1 1FDB 5A5F 5549 7D55 2E1F B6A4"            /* ªÇíÑ.ÛZ_UI}U..¶¤ */
+	$"FDAA F7D4 DF7D 4E80 F173 72EC 2AD6 46CC"            /* ýª÷Ôß}N€ñsrì*ÖFÌ */
+	$"6653 9F8A F548 8CD9 F7CC 0758 DFBD 1976"            /* fSŸŠõHŒÙ÷Ì.Xß½.v */
+	$"0832 03BE 1A6C 242F 4978 025D 37A6 D46A"            /* .2.¾.l$/Ix.]7¦Ôj */
+	$"B859 037D 5250 D0D6 8FC0 4C05 AAAB 7F38"            /* ¸Y.}RPÐÖ�ÀL.ª«.8 */
+	$"799B 43F9 E370 D367 B412 8CC2 F941 E270"            /* y›CùãpÓg´.ŒÂùAâp */
+	$"A967 1978 577B 7A22 541A 7DDD A593 75E5"            /* ©g.xW{z"T.}Ý¥“uå */
+	$"6B05 D950 D953 DA5E 7EBF D5D3 4314 5006"            /* k.ÙPÙSÚ^~¿ÕÓC.P. */
+	$"8EC3 8474 6B41 83B3 7B16 9C95 721B 5405"            /* ŽÃ„tkAƒ³{.œ•r.T. */
+	$"F4AE A41F 92D8 56DA F2C9 4BF8 5B0A EBC6"            /* ô®¤.’ØVÚòÉKø[ÂëÆ */
+	$"29D5 F4F3 36B9 A6D7 3BC4 75D7 972C 7465"            /* )Õôó6¹¦×;Äu×—,te */
+	$"CCBE 21FA 6EAF 6B26 465B 4676 356D E640"            /* ̾!ún¯k&F[Fv5mæ@ */
+	$"04C3 0E39 C431 FBA5 2B53 E001 8F9D 37F5"            /* .Ã.9Ä1û¥+Sà.��7õ */
+	$"F289 EC84 85B8 5FC3 F74A 734B E0B1 ED8C"            /* ò‰ì„…¸_Ã÷JsKà±íŒ */
+	$"5DF4 6678 22E4 887C A45B 1478 DFC3 A9E9"            /* ]ôfx"äˆ|¤[.xßéé */
+	$"F234 5723 01B3 2685 2754 8133 8699 21C8"            /* ò4W#.³&…'T�3†™!È */
+	$"180A 27F8 174C FED5 8F71 4082 C4E8 DB83"            /* .Â'ø.LþÕ�q@‚ÄèÛƒ */
+	$"BDA4 4506 3FA4 5286 5D63 00F7 905D A740"            /* ½¤E.?¤R†]c.÷�]§@ */
+	$"5251 07FA 22F8 1334 FBA6 5640 7199 FA41"            /* RQ.ú"ø.4û¦V@q™úA */
+	$"A3C7 3CC1 ECF5 7F43 A9AE FBD5 C1F0 18B3"            /* £Ç<Áìõ.C©®ûÕÁð.³ */
+	$"7072 4809 0A4C 8127 6E10 5F7C 335C CC28"            /* prHÆÂL�'n._|3\Ì( */
+	$"B723 3D12 724D 3DE5 37B3 1C2A 136D 2258"            /* ·#=.rM=å7³.*.m"X */
+	$"DCE6 BFA4 0DAD FB6E 72C1 70F7 6D71 785D"            /* Ü濤.­ûnrÁp÷mqx] */
+	$"BC75 69CE CE3B CF7A 170E 8343 CBA9 DE66"            /* ¼uiÎÎ;Ïz..ƒCË©Þf */
+	$"06ED 779C AA9F F28D 943D 5E3E DEDE 4769"            /* .íwœªŸò�”=^>ÞÞGi */
+	$"289C 5523 9792 EFAC 19A6 A945 B504 9446"            /* (œU#—’ï¬.¦©Eµ.”F */
+	$"A4DF BAA6 B5EB BAEF 7B92 3E08 6D17 870F"            /* ¤ßº¦µëºï{’>.m.‡. */
+	$"9E0A 487E 8A60 90B5 E555 CD4F D2F1 FE67"            /* žÂH~Š`�µåUÍOÒñþg */
+	$"88DE BB6A E653 A2B6 F9C7 B226 2544 A167"            /* ˆÞ»jæS¢¶ùDz&%D¡g */
+	$"5DF7 5F35 F38B DB99 30F8 C210 AF41 C7A4"            /* ]÷_5ó‹Û™0øÂ.¯AǤ */
+	$"167B 30B4 8B8D 0821 4ADB EFC6 5728 A86D"            /* .{0´‹�.!JÛïÆW(¨m */
+	$"99A8 2A1D 51E2 4CE5 AEA5 7ECC 23CB 628B"            /* ™¨*.QâL宥~Ì#Ëb‹ */
+	$"E438 F41A A280 CF2E 8E51 5004 A9BA 64AB"            /* ä8ô.¢€Ï.ŽQP.©ºd« */
+	$"B0AA 608C 8C19 38F7 567B 0C45 B7C5 0E2D"            /* °ª`ŒŒ.8÷V{.E·Å.- */
+	$"0F3D A192 B0F5 A567 4EE1 9FF5 F085 979A"            /* .=¡’°õ¥gNáŸõð…—š */
+	$"13DA 6FC3 89D0 0370 C986 5F44 AADD CAB9"            /* .ÚoÉÐ.pɆ_DªÝʹ */
+	$"FBD0 8CDE 18D9 8FED 715E 264F 0D69 2CEF"            /* ûÐŒÞ.Ù�íq^&O.i,ï */
+	$"63F0 7A64 D65B 094A 6976 E6D4 E3DC 1583"            /* cðzdÖ[ÆJivæÔãÜ.ƒ */
+	$"FE8C BD22 992E 3FDB AF18 03A7 0A74 8333"            /* þŒ½"™.?Û¯..§Âtƒ3 */
+	$"76E3 5195 C7FA A180 5123 7E0C 544B 9C8C"            /* vãQ•Çú¡€Q#~.TKœŒ */
+	$"928D 3DF6 F330 4D6E 8049 11AF 064E 4E3B"            /* ’�=öó0Mn€I.¯.NN; */
+	$"B937 EE03 A4D2 F530 4513 47F0 5E98 E060"            /* ¹7î.¤Òõ0E.Gð^˜à` */
+	$"72C6 46EC B761 FAB4 B0FA 9A80 FF78 5408"            /* rÆFì·aú´°úš€ÿxT. */
+	$"9152 452E 0111 2383 5E5F 6C4F FC53 0EDE"            /* ‘RE...#ƒ^_lOüS.Þ */
+	$"1092 66D3 5F38 1AC8 1412 561A 4017 9110"            /* .’fÓ_8.È..V.@.‘. */
+	$"CA19 3E6F 8803 0908 5F57 A2E2 4744 E3C4"            /* Ê.>oˆ.Æ._W¢âGDãÄ */
+	$"F1BF 49F6 836F E294 610B 4098 2761 1502"            /* ñ¿Iöƒoâ”a.@˜'a.. */
+	$"CCB2 0C11 81DD 05B4 ACD8 8F28 C5DD 1DD8"            /* ̲..�Ý.´¬Ø�(ÅÝ.Ø */
+	$"58E0 C1E1 70A8 42BF 456F FE20 1261 1F81"            /* XàÁáp¨B¿Eoþ .a.� */
+	$"08AC FEB1 F89C 3576 EF94 A20C 255F 3B3F"            /* .¬þ±øœ5v.%_;? */
+	$"5E6B B0C0 4B3F EADC 8536 55E9 8144 C946"            /* ^k°ÀK?êÜ…6Ué�DÉF */
+	$"7613 8662 DCB1 C761 2BDA 412D C7D6 2D5C"            /* v.†bܱÇa+ÚA-ÇÖ-\ */
+	$"BCC0 F84E 54E4 9B0B BDF7 4F45 FCA6 D6AE"            /* ¼ÀøNTä›.½÷OEü¦Ö® */
+	$"1754 31D1 E6CB 94F4 D163 2B1D 017D 4171"            /* .T1ÑæË”ôÑc+..}Aq */
+	$"ABE0 0285 395D 3D23 42D7 E641 348A 0C2E"            /* «à.…9]=#B×æA4Š.. */
+	$"9C16 42C9 8E99 B654 8046 C365 EA71 CE64"            /* œ.BÉŽ™¶T€FÃeêqÎd */
+	$"B762 0E4D 7C48 617B CDB9 6264 2C81 4A9F"            /* ·b.M|Ha{͹bd,�JŸ */
+	$"8600 50B2 B985 EB73 DB96 82EA FF7D 1E50"            /* †.P²¹…ësÛ–‚êÿ}.P */
+	$"6A49 AEA3 78E3 2DFD 0D59 3013 F257 AAA9"            /* jI®£xã-ý.Y0.òWª© */
+	$"0E5D 81DA E983 8D48 41BE DF0B FB34 AEA5"            /* .]�Úéƒ�HA¾ß.û4®¥ */
+	$"07B6 B0AA 1E53 1D9F B9C7 4CE5 8D46 6151"            /* .¶°ª.S.Ÿ¹ÇLå�FaQ */
+	$"8000 0C24 1D66 1946 1073 4456 2361 E486"            /* €..$.f.F.sDV#aä† */
+	$"120F 29F0 6121 2D6A AF51 0C82 F68C B571"            /* ..)ða!-j¯Q.‚öŒµq */
+	$"77AD BE59 9145 D105 DE8C 9500 0000 0000"            /* w­¾Y‘EÑ.ÞŒ•..... */
+	$"0000 0032 BC9A BD52 00B4 6C6F 3753 1A96"            /* ...2¼š½R.´lo7S.– */
+	$"9B00 FCD3 F055 A11A AFB1 FB95 1610 88D0"            /* ›.üÓðU¡.¯±û•..ˆÐ */
+	$"8D32 9653 FC10 55FD B965 C1A9 B6BD 2245"            /* �2–Sü.Uý¹eÁ©¶½"E */
+	$"D48B 8230 2EF5 56F1 6618 9F91 FEC4 4106"            /* Ô‹‚0.õVñf.Ÿ‘þÄA. */
+	$"F23B 7C8A 0320 79EA D7A0 D75F 09BD B985"            /* ò;|Š. yê× ×_ƽ¹… */
+	$"C22B E2F0 0508 64BA AA2F 2414 19D7 311D"            /* Â+âð..dºª/$..×1. */
+	$"F709 E05C 809B 9E62 83F8 FF13 2DE3 01D6"            /* ÷Æà\€›žbƒøÿ.-ã.Ö */
+	$"8ADC F118 5A80 77C8 DABC 2FB5 CEF6 FCFB"            /* ŠÜñ.Z€wÈÚ¼/µÎöüû */
+	$"7A94 2773 6CEC FAE2 7865 753C E612 E4AF"            /* z”'slìúâxeu<æ.ä¯ */
+	$"657C 5C67 8FB3 1E56 A319 1ED1 FE48 0D8D"            /* e|\g�³.V£..ÑþH.� */
+	$"2431 B10B 8E15 0A4B FF7F 7EB8 D068 5015"            /* $1±.Ž.ÂKÿ.~¸ÐhP. */
+	$"151E C37C 0390 F6CC 64A8 0000 0000 0000"            /* ..Ã|.�öÌd¨...... */
+	$"0000 0002 5991 79E8 2B17 082C ABCB DA90"            /* ....Y‘yè+..,«ËÚ� */
+	$"CE92 8CB0 E992 0710 2B8F CAAB D217 C4E9"            /* Î’Œ°é’..+�Ê«Ò.Äé */
+	$"E55E 11D2 6200 B530 5EF4 6932 1CBF EA6C"            /* å^.Òb.µ0^ôi2.¿êl */
+	$"E58D 2AA9 68C2 89FF 7903 A6ED D674 F1FC"            /* å�*©h‰ÿy.¦íÖtñü */
+	$"A256 3564 F7E0 4DDF CDA1 2729 F7FF 6EB2"            /* ¢V5d÷àMßÍ¡')÷ÿn² */
+	$"9D35 70A9 5447 924B B8E1 71D3 4A8A DECB"            /* �5p©TG’K¸áqÓJŠÞË */
+	$"93E1 8FA0 140E C9B7 6124 8020 D660 3D22"            /* “á� ..É·a$€ Ö`=" */
+	$"C708 222E 7289 B890 0002 00E1 2BC6 84B9"            /* Ç.".r‰¸�...á+Æ„¹ */
+	$"25DF 442F 97FF 7FEF 68EC 7325 B92C A150"            /* %ßD/—ÿ.ïhìs%¹,¡P */
+	$"EE19 48C3 2540 0000 0000 0000 0000 0749"            /* î.HÃ%@.........I */
+	$"DD4A 9891 375B B0E0 C176 A698 672E F295"            /* ÝJ˜‘7[°àÁv¦˜g.ò• */
+	$"0311 7B3E 2B87 B4B8 7FB3 5DF7 9C67 CBEA"            /* ..{>+‡´¸.³]÷œgËê */
+	$"6A19 4107 C9F4 2B19 6829 179A 3FFF 7E8C"            /* j.A.Éô+.h).š?ÿ~Œ */
+	$"44A2 15E8 8E37 B422 F825 1862 58FF 7FFE"            /* D¢.èŽ7´"ø%.bXÿ.þ */
+	$"8EA1 D38C 727A 3071 1FF0 541F 6AB4 EA83"            /* Ž¡ÓŒrz0q.ðT.j´êƒ */
+	$"44A0 086A BAD7 6966 FC5D 0E72 A66C C301"            /* D .jº×ifü].r¦lÃ. */
+	$"3E1F B82C 9192 20D5 0322 858F 224C 87F5"            /* >.¸,‘’ Õ."…�"L‡õ */
+	$"E940 85ED 7B36 EC96 D05C 21FF 7B10 59E1"            /* é@…í{6ì–Ð\!ÿ{.Yá */
+	$"E125 6C79 7852 2031 F3BA 34FB 6E57 BC3B"            /* á%lyxR 1óº4ûnW¼; */
+	$"69F0 C303 3A2A A573 D1E0 9836 C703 D02C"            /* iðÃ.:*¥sÑà˜6Ç.Ð, */
+	$"58CC 3DA7 FF0D 4301 F607 07C1 31FA 7F66"            /* XÌ=§ÿ.C.ö..Á1ú.f */
+	$"89BD A759 90CD 107A E5BD 6398 D7BE F7BB"            /* ‰½§Y�Í.zå½c˜×¾÷» */
+	$"E273 D09A F8EE D21B 1015 A513 18F5 5C7D"            /* âsКøîÒ...¥..õ\} */
+	$"FD20 E7C9 C6BE 3105 7A4B 831D 251B 4C36"            /* ý çÉƾ1.zKƒ.%.L6 */
+	$"2A49 3EAC 1A86 9F87 09CC 0B00 2CF4 643C"            /* *I>¬.†Ÿ‡ÆÌ..,ôd< */
+	$"7012 8574 D28F 952D E959 1093 FE7E F021"            /* p.…tÒ�•-éY.“þ~ð! */
+	$"028C 74ED 0E90 8DCD 5F06 B4BE EA1A 4C53"            /* .Œtí.��Í_.´¾ê.LS */
+	$"A47F 3706 93CB 8FAB 7864 D123 4A39 B6BA"            /* ¤.7.“Ë�«xdÑ#J9¶º */
+	$"CDCB 8AA9 2128 54FA CFB5 C4E1 F470 AD6E"            /* ÍËŠ©!(TúϵÄáôp­n */
+	$"6A05 07C9 72AA 562E F22F C922 BCF9 7DDF"            /* j..ÉrªV.ò/É"¼ù}ß */
+	$"3565 1AD4 F707 7DC0 1038 129E 4EA0 297E"            /* 5e.Ô÷.}À.8.žN )~ */
+	$"1037 3516 64BB FF75 539A 5C03 F7A3 C14D"            /* .75.d»ÿuSš\.÷£ÁM */
+	$"C617 50C8 14F1 7C95 0372 1443 C3F0 7ED4"            /* Æ.PÈ.ñ|•.r.CÃð~Ô */
+	$"EFDA FA88 BDD2 E947 7A43 A4A3 2339 CD58"            /* ïÚúˆ½ÒéGzC¤£#9ÍX */
+	$"526C 8407 8211 1949 6431 DB89 390B EB27"            /* Rl„.‚..Id1Û‰9.ë' */
+	$"9975 F04F D507 AC80 5D51 95B0 992A 1AC6"            /* ™uðOÕ.¬€]Q•°™*.Æ */
+	$"8699 86CC E64E 441C 2EFD 4F8C 70C1 DB2A"            /* †™†ÌæND..ýOŒpÁÛ* */
+	$"5395 8DF7 E279 AA65 BA32 2FD1 48C9 F400"            /* S•�÷âyªeº2/ÑHÉô. */
+	$"D0EA 663D 92FF 053E 130C A1A9 491B E583"            /* Ðêf=’ÿ.>..¡©I.åƒ */
+	$"6133 2EE1 AFBE 86B8 D218 B698 906D A5B9"            /* a3.᯾†¸Ò.¶˜�m¥¹ */
+	$"ACD3 9DC7 8720 C668 E134 1A1C 9C71 EA49"            /* ¬Ó�LJ Æhá4..œqêI */
+	$"7AE9 9276 56E9 78BB 5679 18E2 6044 2763"            /* zé’vVéx»Vy.â`D'c */
+	$"2342 64F4 3952 2712 F704 B2E8 C1D2 35CC"            /* #Bdô9R'.÷.²èÁÒ5Ì */
+	$"F0AB 5ABD 61A0 1CD5 5316 0E78 22E6 B807"            /* ð«Z½a .ÕS..x"æ¸. */
+	$"8774 CA36 91EF 0BFF D969 6330 3900 00D1"            /* ‡tÊ6‘ï.ÿÙic09..Ñ */
+	$"2300 0000 0C6A 5020 200D 0A87 0A00 0000"            /* #....jP  .‡Â... */
+	$"1466 7479 706A 7032 2000 0000 006A 7032"            /* .ftypjp2 ....jp2 */
+	$"2000 0000 4F6A 7032 6800 0000 1669 6864"            /*  ...Ojp2h....ihd */
+	$"7200 0002 0000 0002 0000 0407 0701 0000"            /* r............... */
+	$"0000 0F63 6F6C 7201 0000 0000 0010 0000"            /* ...colr......... */
+	$"0022 6364 6566 0004 0000 0000 0001 0003"            /* ."cdef.......... */
+	$"0001 0000 0001 0000 0002 0002 0000 0003"            /* ................ */
+	$"0000 0000 6A70 3263 FF4F FF51 0032 0000"            /* ....jp2cÿOÿQ.2.. */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+	$"0004 0701 0107 0101 0701 0107 0101 FF52"            /* ..............ÿR */
+	$"000C 0000 0001 0105 0404 0001 FF5C 0013"            /* ............ÿ\.. */
+	$"2050 5858 6058 5860 5858 6058 5858 5050"            /*  PXX`XX`XX`XXXPP */
+	$"58FF 6400 1100 014B 616B 6164 752D 7635"            /* Xÿd....Kakadu-v5 */
+	$"2E32 2E31 FF90 000A 0000 0000 D036 0001"            /* .2.1ÿ�.Â....Ð6.. */
+	$"FF93 CFC2 DC03 54F9 36EC A8DC 2A8C 3701"            /* ÿ“ÏÂÜ.Tù6ì¨Ü*Œ7. */
+	$"118B 95C3 F2B2 5A7A 0428 C30A 2C64 B704"            /* .‹•Ãò²Zz.(ÃÂ,d·. */
+	$"5C3C 6DED 8696 4890 6404 5638 430C 59C5"            /* \<m톖H�d.V8C.YŠ*/
+	$"D913 B06B 0B08 E00E 1802 6D82 7225 E695"            /* Ù.°k..à...m‚r%æ• */
+	$"9F1E E7B0 D1DF 323C 61DC 1F25 E3FF 83E2"            /* Ÿ.ç°Ñß2<aÜ.%ãÿƒâ */
+	$"A49A DED4 4495 A948 5B70 9E5A 01F1 2431"            /* ¤šÞÔD•©H[pžZ.ñ$1 */
+	$"8EE5 2B54 2863 9041 FAE9 9E9F 1B85 E206"            /* Žå+T(c�Aú鞟.…â. */
+	$"4104 106C 5027 632A 8716 C3A5 F047 B3D5"            /* A..lP'c*‡.Ã¥ðG³Õ */
+	$"EE2B 19CD 2B75 17D8 DFB6 E2BF 491E A41F"            /* î+.Í+u.Ø߶â¿I.¤. */
+	$"BC48 3493 DEFB 453D 64DE DEA0 68DB EF5B"            /* ¼H4“ÞûE=dÞÞ hÛï[ */
+	$"1E69 8F3F C55C 1FF6 1823 1543 F483 DF20"            /* .i�?Å\.ö.#.Côƒß  */
+	$"F5B4 08F4 5D20 4DF0 7D7D 2007 2ACA 5B5E"            /* õ´.ô] Mð}} .*Ê[^ */
+	$"159F EF4A 505D 811D A8A3 5476 5539 B45B"            /* .ŸïJP]�.¨£TvU9´[ */
+	$"3113 1AC7 00F3 F1A7 E9E3 9E88 5D91 6CD5"            /* 1..Ç.óñ§é㞈]‘lÕ */
+	$"2CC0 F92B 2063 FF29 4B0E 775A 06EE 75CC"            /* ,Àù+ cÿ)K.wZ.îuÌ */
+	$"DA54 AC2F B72D 1C25 1E46 A4F8 C3E1 7D8D"            /* ÚT¬/·-.%.F¤øÃá}� */
+	$"85AE BBE6 3DBE EC4A 35F7 3B36 1FBF BC38"            /* …®»æ=¾ìJ5÷;6.¿¼8 */
+	$"2DC1 785C D644 2BED AB51 1950 2643 8730"            /* -Áx\ÖD+í«Q.P&C‡0 */
+	$"2AE9 E4EB 1B8E 8F90 BA0C FF2F 6F65 5F28"            /* *éäë.Ž��º.ÿ/oe_( */
+	$"1A3F 9398 FF20 01A2 69A0 02C9 8D1B C3EA"            /* .?“˜ÿ .¢i .É�.Ãê */
+	$"A600 6417 3CA3 9E84 93EF 063D 59DC 702C"            /* ¦.d.<£ž„“ï.=YÜp, */
+	$"959D C3A6 B1ED DEF1 F321 5BA6 FCCD 7762"            /* •�æ±íÞñó![¦üÍwb */
+	$"6C23 7398 AA59 4BBA 0052 B8A7 0608 1AAC"            /* l#s˜ªYKº.R¸§...¬ */
+	$"5B2E AF60 17F4 278E 6433 6F75 7839 CED2"            /* [.¯`.ô'Žd3oux9ÎÒ */
+	$"F32E 5D7D 9D40 B145 4CFB A25C D8D7 4BCB"            /* ó.]}�@±ELû¢\Ø×KË */
+	$"956D 88DD 4B92 64BF 4CD4 AFD5 6E56 9859"            /* •mˆÝK’d¿LÔ¯ÕnV˜Y */
+	$"ABEF BB40 AD0E 6E1F 9B3B 16A3 D9D3 58DF"            /* «ï»@­.n.›;.£ÙÓXß */
+	$"584E C303 1DAD D18B 6082 9C29 88EB 5163"            /* XNÃ..­Ñ‹`‚œ)ˆëQc */
+	$"A42D 061A 1570 64A9 0F1C E00D 56D9 E0CB"            /* ¤-...pd©..à.VÙàË */
+	$"7C66 799C 8EB4 BFCA CF5C CFC2 B611 4F0C"            /* |fyœŽ´¿ÊÏ\϶.O. */
+	$"AFDE 008C 3580 A270 0C1A 3737 50A1 9A89"            /* ¯Þ.Œ5€¢p..77P¡š‰ */
+	$"2546 BB2C 62A0 57BE 59CB C00A 1EE9 0F1D"            /* %F»,b W¾YËÀÂ.é.. */
+	$"C528 40D4 EA69 D281 AED4 B078 F27A 0B42"            /* Å(@ÔêiÒ�®Ô°xòz.B */
+	$"7AD2 DADD 146B 7FFF 223D 6A74 2041 4FCF"            /* zÒÚÝ.k.ÿ"=jt AOÏ */
+	$"46E1 60C8 9ABE 841E E18D 1712 DB6D 902B"            /* Fá`Èš¾„.á�..Ûm�+ */
+	$"7BE6 56DA 7E4B 1704 A373 2802 B120 0184"            /* {æVÚ~K..£s(.± .„ */
+	$"0681 4499 2739 CE73 9CE8 99D8 C352 337C"            /* .�D™'9Îsœè™ØÃR3| */
+	$"06AB BB71 6257 16EF B535 4972 8C2F 2EE0"            /* .«»qbW.ïµ5IrŒ/.à */
+	$"85CC 8431 D867 47EE CC43 6E87 A485 2316"            /* …Ì„1ØgGîÌCn‡¤…#. */
+	$"4927 AE22 C12D 49CE 739C E61C 97D0 99CC"            /* I'®"Á-IÎsœæ.—Ð™Ì */
+	$"3DC5 F26B 1A31 E742 3E56 464B 2944 108E"            /* =Åòk.1çB>VFK)D.Ž */
+	$"CB0C F4C7 E144 47E1 47C1 F6BD 8089 21DB"            /* Ë.ôÇáDGáGÁö½€‰!Û */
+	$"8279 4533 01BF B9CC C444 AD53 5F75 D706"            /* ‚yE3.¿¹ÌÄD­S_u×. */
+	$"3FDD CA27 5D6C 9F54 1CCF F838 38E4 B2E4"            /* ?ÝÊ']lŸT.Ïø88ä²ä */
+	$"F9FF 429F 59FE D27B 4A5E A69F 2C21 38F6"            /* ùÿBŸYþÒ{J^¦Ÿ,!8ö */
+	$"5A74 D405 2FEE 50B8 E5F1 C489 2693 5B33"            /* ZtÔ./îP¸åñĉ&“[3 */
+	$"D2C2 9DEC 68ED F55C 1FAC 1401 8D66 795A"            /* ÒÂ�ìhíõ\.¬..�fyZ */
+	$"F5F3 27A3 5874 6681 9AC6 F41D A4E6 40DA"            /* õó'£Xtf�šÆô.¤æ@Ú */
+	$"3EE5 CCEE 340C AF72 87FD 6B2A EB94 88EC"            /* >åÌî4.¯r‡ýk*딈ì */
+	$"A61D A536 7AC2 C6B8 85D9 CEBD 146C 83B5"            /* ¦.¥6zÂƸ…Ùν.lƒµ */
+	$"F5E0 A3C7 B524 BC64 B6B5 91A6 BF91 C547"            /* õà£Çµ$¼d¶µ‘¦¿‘ÅG */
+	$"BD87 811F D58E 8E51 BB89 FA6C 5257 33D9"            /* ½‡�.ÕŽŽQ»‰úlRW3Ù */
+	$"A964 A4AB 3BB9 9608 BECC 0D9C D6B9 3D3A"            /* ©d¤«;¹–.¾Ì.œÖ¹=: */
+	$"CB64 28BE 3B07 6318 DF9D C134 9F16 567A"            /* Ëd(¾;.c.ß�Á4Ÿ.Vz */
+	$"8127 5FFD F396 BA0C B86F AA17 2301 022A"            /* �'_ýó–º.¸oª.#..* */
+	$"3742 CE95 B1AF F858 C503 8156 35E0 8F2C"            /* 7BΕ±¯øXÅ.�V5à�, */
+	$"67D7 2D41 1F0B 5284 1535 AF16 6540 FB65"            /* g×-A..R„.5¯.e@ûe */
+	$"65BC 5F6B 136D 73A5 1C5D 3D92 FF5F 8494"            /* e¼_k.ms¥.]=’ÿ_„” */
+	$"FDBF E0C5 821F 072A 0EEB B855 6B42 CEE8"            /* ý¿àÅ‚..*.ë¸UkBÎè */
+	$"ABEE 381E 894E DF1E 29DD 4B78 3F0A F5EB"            /* «î8.‰Nß.)ÝKx?Âõë */
+	$"B9F8 61B8 8266 3BD8 A2AC 5BC1 38F4 5098"            /* ¹øa¸‚f;Ø¢¬[Á8ôP˜ */
+	$"3951 2437 1798 7BF9 EA00 12BF CF3E 9166"            /* 9Q$7.˜{ùê..¿Ï>‘f */
+	$"8253 6FF0 B942 70D7 C729 0866 33F7 3484"            /* ‚Soð¹Bp×Ç).f3÷4„ */
+	$"ADF8 C3D2 4EF6 1DF4 0E6F 8E64 B470 1D5E"            /* ­øÃÒNö.ô.oŽd´p.^ */
+	$"F311 9BD1 EDE1 BA5D 7601 2053 D70A FDCD"            /* ó.›Ñíáº]v. S×ÂýÍ */
+	$"82C0 1BDA A35C FAD2 67AD E569 7851 10A7"            /* ‚À.Ú£\úÒg­åixQ.§ */
+	$"EF9A 3533 EC03 E813 08B6 D984 1A1D 3DC0"            /* ïš53ì.è..¶Ù„..=À */
+	$"7C8E E03E 4A44 03E4 7894 FF1F 080E 2BFD"            /* |Žà>JD.äx”ÿ...+ý */
+	$"EEB4 E64A C757 389B 5780 3AF8 248C 580D"            /* î´æJÇW8›W€:ø$ŒX. */
+	$"461B D417 66BA CEB2 2042 3C84 DAF9 C127"            /* F.Ô.fºÎ² B<„ÚùÁ' */
+	$"63E9 168C A9E3 D418 61E8 C46C CF01 F59B"            /* cé.Œ©ãÔ.aèÄlÏ.õ› */
+	$"4518 8833 3E62 5B14 BFD1 41A8 45D6 D311"            /* E.ˆ3>b[.¿ÑA¨EÖÓ. */
+	$"8431 80DB 1FD5 5839 DE81 BCD9 EAFB EE26"            /* „1€Û.ÕX9Þ�¼Ùêûî& */
+	$"33DD 9E73 0B6F F957 26EE E7BA E0DA FF22"            /* 3Ýžs.oùW&îçºàÚÿ" */
+	$"EA50 24BF A182 089D 749A 6AAF BFF2 224D"            /* êP$¿¡‚.�tšj¯¿ò"M */
+	$"30D4 11D0 E07A A012 587A 0633 92B4 CBFC"            /* 0Ô.Ðàz .Xz.3’´Ëü */
+	$"8E1B E5AC 9025 A74D 2819 3F9D 8132 B795"            /* Ž.å¬�%§M(.?��2·• */
+	$"458E 4651 1589 158D D24C A5B0 CBFA 359E"            /* EŽFQ.‰.�ÒL¥°Ëú5ž */
+	$"BDB0 E4FB BFE3 5854 3E88 A646 71B1 9CB2"            /* ½°äû¿ãXT>ˆ¦Fq±œ² */
+	$"BB4E BA8E E170 8CBF C1F5 3141 F537 C0FA"            /* »NºŽápŒ¿Áõ1Aõ7Àú */
+	$"9780 6448 BA3B 94D6 3E8B 7AF0 0B5A C7A2"            /* —€dHº;”Ö>‹zð.ZÇ¢ */
+	$"4D05 C6BB 7F47 7102 F66E E4E8 3681 1C97"            /* M.Æ».Gq.önäè6�.— */
+	$"0996 4491 F713 2A24 3756 2715 4B55 762F"            /* Æ–D‘÷.*$7V'.KUv/ */
+	$"78CB 2608 0563 73F7 5626 9F35 0C54 6822"            /* xË&..cs÷V&Ÿ5.Th" */
+	$"F061 792A 4AFC 163A 9F83 8F82 638B 524D"            /* ðay*Jü.:Ÿƒ�‚c‹RM */
+	$"C21C 3735 DB76 6F4B 01F2 3E7E 5755 5945"            /* Â.75ÛvoK.ò>~WUYE */
+	$"6149 AAEE 1A88 7748 DC47 79E4 0660 318C"            /* aIªî.ˆwHÜGyä.`1Œ */
+	$"AA94 E92D 9879 C9C1 AC17 C828 7BBB 997A"            /* ª”é-˜yÉÁ¬.È({»™z */
+	$"315E 858F F31D 3522 A6D2 B3BD E548 DBA2"            /* 1^…�ó.5"¦Ò³½åHÛ¢ */
+	$"3274 749B 11C1 9570 D715 0350 4CC4 6820"            /* 2tt›.Á•p×..PLÄh  */
+	$"560A 8542 A38D 913B 3863 FF5C 97F2 9BA5"            /* VÂ…B£�‘;8cÿ\—ò›¥ */
+	$"893F 6C9B 15A2 EE40 BCD6 2676 80A9 AC89"            /* ‰?l›.¢î@¼Ö&v€©¬‰ */
+	$"9054 849D 859C 8DCD 181B 64F4 6D7B 71B4"            /* �T„�…œ�Í..dôm{q´ */
+	$"FBD3 0C84 21D4 CC6C CF84 F40A A3CD C958"            /* ûÓ.„!ÔÌlÏ„ô£ÍÉX */
+	$"928E 97E5 346C 6497 2888 7903 5B0B 3277"            /* ’Ž—å4ld—(ˆy.[.2w */
+	$"B4D6 9AA4 86C3 C691 CA1A 3C92 FCFB 02DE"            /* ´Öš¤†ÃÆ‘Ê.<’üû.Þ */
+	$"A25E 5C5C C6A8 1CE2 F5B5 88AB 3673 F912"            /* ¢^\\ƨ.âõµˆ«6sù. */
+	$"96AF E6BC 67FF 40CC 068D C6E3 8435 48AF"            /* –¯æ¼gÿ@Ì.�Æã„5H¯ */
+	$"B929 F509 0F59 3410 A9A6 1087 8352 11EC"            /* ¹)õÆ.Y4.©¦.‡ƒR.ì */
+	$"23CF CD2E 3F05 487E 0740 9BE7 236F 56FB"            /* #ÏÍ.?.H~.@›ç#oVû */
+	$"D0F4 677F 9514 C6E9 50BB A61A 6135 73FB"            /* Ðôg.•.ÆéP»¦.a5sû */
+	$"37AA FA5C 0967 671C 8485 5326 6EB5 4955"            /* 7ªú\Ægg.„…S&nµIU */
+	$"1AAE 5FCE C271 D992 9E8C B0DF 7795 E0F2"            /* .®_ÎÂqÙ’žŒ°ßw•àò */
+	$"A17A B50F E53A FE12 756F D1A1 5CE1 7C9B"            /* ¡zµ.å:þ.uoÑ¡\á|› */
+	$"D185 2C1A 9224 BC62 5C98 FA35 1649 6EA7"            /* Ñ…,.’$¼b\˜ú5.In§ */
+	$"4C7C C191 DF92 9D7A 6FE9 71D9 9A11 5A19"            /* L|Á‘ß’�zoéqÙš.Z. */
+	$"214D F951 38FA C459 E39A 6DAE 1253 31DF"            /* !MùQ8úÄYãšm®.S1ß */
+	$"B335 3337 39D2 7591 BFC1 31E6 887A 8BAB"            /* ³5379Òu‘¿Á1æˆz‹« */
+	$"ECCD 7A58 8E4A AD65 A7E1 5FC6 8EB0 DA82"            /* ìÍzXŽJ­e§á_ÆŽ°Ú‚ */
+	$"0F81 6849 5CE5 AB32 B763 1227 3F4C 5691"            /* .�hI\å«2·c.'?LV‘ */
+	$"43C7 DD24 E8D9 C4F3 7BB0 4666 7A24 1C5B"            /* CÇÝ$èÙÄó{°Ffz$.[ */
+	$"F57D 719F 2BDB 3794 66BA BBB6 9D8D A662"            /* õ}qŸ+Û7”fº»¶��¦b */
+	$"CF99 4DDC E533 96D6 EEE0 3FC7 BFB8 B1B7"            /* Ï™MÜå3–Öîà?Ç¿¸±· */
+	$"9AE3 57C7 E1A8 B1F8 6C5C 3F0D 19C1 812D"            /* šãWÇᨱøl\?..Á�- */
+	$"8D31 C88B C396 B5E7 3CE0 4E2C AE73 7876"            /* �1ȋÖµç<àN,®sxv */
+	$"0436 A295 BEC6 BDF1 C604 C41C 94E6 E7C1"            /* .6¢•¾Æ½ñÆ.Ä.”æçÁ */
+	$"AC78 356A B92A DB37 3360 3372 6638 0C5C"            /* ¬x5j¹*Û73`3rf8.\ */
+	$"F388 7CDE 4045 060F E713 C4C3 321E E08B"            /* óˆ|Þ@E..ç.ÄÃ2.à‹ */
+	$"0810 71EE A6AB C032 2B85 C34C 2671 8143"            /* ..qÀ2+…ÃL&q�C */
+	$"AFDE 07D1 A40C D86A ADBE B961 EAA3 54BD"            /* ¯Þ.Ѥ.Øj­¾¹aê£T½ */
+	$"804D 6FA9 AA3F 7FBE BCD9 E785 A230 EA4E"            /* €Mo©ª?.¾¼Ùç…¢0êN */
+	$"1C08 1DF6 8373 7754 5039 7854 1192 1512"            /* ...öƒswTP9xT.’.. */
+	$"B956 E9A7 575E E3DB F5F9 4B02 F739 F2BB"            /* ¹Vé§W^ãÛõùK.÷9ò» */
+	$"91B2 73E1 3D19 EBB6 AD2F 291C 5BAC 5EEA"            /* ‘²sá=.붭/).[¬^ê */
+	$"EEDF 8DA7 5FCA 8E8C 952D 8FD0 441C 5BA4"            /* îß�§_ÊŽŒ•-�ÐD.[¤ */
+	$"8AF6 21BE 1FAF DAE3 DADD EA91 EF73 58A0"            /* Šö!¾.¯ÚãÚÝê‘ïsX  */
+	$"29E6 89B2 E279 B02A D092 DD08 6187 9095"            /* )扲ây°*Ð’Ý.a‡�• */
+	$"5C85 C903 0DD2 9ED3 538B D9BB E936 8ABB"            /* \…É..ÒžÓS‹Ù»é6Š» */
+	$"E203 DD03 2944 5317 7BC3 0297 2125 F198"            /* â.Ý.)DS.{Ã.—!%ñ˜ */
+	$"D117 8DDB E382 71F8 D0A7 14B1 6D7A A0EB"            /* Ñ.�Ûã‚qøЧ.±mz ë */
+	$"7C6F 7651 D2EC ECA7 F670 D09F 6CF6 30DB"            /* |ovQÒìì§öpПlö0Û */
+	$"0830 39B5 BC45 3915 4054 4490 A7BA 5CEC"            /* .09µ¼E9.@TD�§º\ì */
+	$"D37B FBC2 7890 B18F DEEA 4966 D46D 5FD2"            /* Ó{ûÂx�±�ÞêIfÔm_Ò */
+	$"7811 AAD0 8EBF FB40 0F30 D8A4 2B71 5A03"            /* x.ªÐŽ¿û@.0ؤ+qZ. */
+	$"636A C360 C889 891D D420 A828 E337 41CC"            /* cjÃ`ȉ‰.Ô ¨(ã7AÌ */
+	$"3314 5473 B91F 7B78 2B3B AC7A 1127 F2DE"            /* 3.Ts¹.{x+;¬z.'òÞ */
+	$"E997 2101 6008 26AE 43D5 7CE7 8532 B9CE"            /* é—!.`.&®CÕ|ç…2¹Î */
+	$"A81A 710E 5D87 49D7 3EF6 65A3 D533 977E"            /* ¨.q.]‡I×>öe£Õ3—~ */
+	$"7BE9 0CA7 8B28 9ADA AF4F 45A5 99BD E21D"            /* {é.§‹(šÚ¯OE¥™½â. */
+	$"D4B1 BB33 2508 C8D1 31E5 E9FB F917 A8E1"            /* Ô±»3%.ÈÑ1åéûù.¨á */
+	$"2955 9008 F531 9010 575A 3AFB 59F4 CD63"            /* )U�.õ1�.WZ:ûYôÍc */
+	$"3EEE 2409 BCD4 E5F1 1418 6155 B6D7 A94B"            /* >î$ƼÔåñ..aU¶×©K */
+	$"1D48 79A8 2F32 0770 476B CE28 023A DC86"            /* .Hy¨/2.pGkÎ(.:܆ */
+	$"E008 813B E64A 39F5 58CE 3E75 DAA6 BD7A"            /* à.�;æJ9õXÎ>uÚ¦½z */
+	$"1528 FF50 0738 C132 5569 3C99 C4BC A20F"            /* .(ÿP.8Á2Ui<™Ä¼¢. */
+	$"6DED 9310 6FE1 8BE4 BF4D D0B1 993E 0FD3"            /* mí“.oá‹ä¿Mб™>.Ó */
+	$"4938 1302 E4A8 FDA2 A7D2 4615 CD89 1E52"            /* I8..ä¨ý¢§ÒF.͉.R */
+	$"4160 51F8 BABB FEED 4281 0E0C 31CD 91D7"            /* A`Qøº»þíB�..1Í‘× */
+	$"C7CF E302 E155 4188 0F06 097F 6906 2EC9"            /* ÇÏã.áUAˆ..Æ.i..É */
+	$"BE00 A1FB 0D99 8FB1 3B3D E3D3 70B8 4296"            /* ¾.¡û.™�±;=ãÓp¸B– */
+	$"F199 E066 15B5 920C 38A2 695F F2E8 81E1"            /* ñ™àf.µ’.8¢i_òè�á */
+	$"E0EC 34E5 97B3 9580 459F A2D9 E267 B847"            /* àì4å—³•€EŸ¢Ùâg¸G */
+	$"E302 3AA0 8631 8C61 5F8E 88DE 2FBB 394B"            /* ã.: †1Œa_ŽˆÞ/»9K */
+	$"B9EC 234B 6515 BDF3 BA80 AA30 3D50 2F90"            /* ¹ì#Ke.½óº€ª0=P/� */
+	$"C26A D743 2198 707A 2DC1 9C64 1647 1FA3"            /* Âj×C!˜pz-Áœd.G.£ */
+	$"43A2 B1C7 C95D 1E19 9650 E616 F24B C118"            /* C¢±ÇÉ]..–Pæ.òKÁ. */
+	$"FB68 CE23 485E BF50 ACF8 F669 B5A3 92AA"            /* ûhÎ#H^¿P¬øöiµ£’ª */
+	$"5625 BF48 8584 A6E7 DAC0 E203 2AF0 89A0"            /* V%¿H…„¦çÚÀâ.*ð‰  */
+	$"DB92 4924 9249 1BF5 D855 0470 51D0 AAE2"            /* Û’I$’I.õØU.pQЪâ */
+	$"A1E5 FBC9 CB80 1798 2EB3 EB1E 9FD4 46E7"            /* ¡åûÉË€.˜.³ë.ŸÔFç */
+	$"63DB F02E 204B D35F 54DE 0FD3 2F81 FB63"            /* cÛð. KÓ_TÞ.Ó/�ûc */
+	$"9CEC 37F1 C9FF 5B63 B13D BFBD 1169 0415"            /* œì7ñÉÿ[c±=¿½.i.. */
+	$"0E97 DA89 25E3 92C7 01F5 50E6 2181 A536"            /* .—Ú‰%ã’Ç.õPæ!�¥6 */
+	$"4020 C49B 1977 1BF5 5226 FD7D 668A D76F"            /* @ Ä›.w.õR&ý}fŠ×o */
+	$"2954 58F1 F44F 2935 F136 18BD C844 05FD"            /* )TXñôO)5ñ6.½ÈD.ý */
+	$"E325 9012 9E92 6EC3 E822 D06F A958 C54C"            /* ã%�.ž’nÃè"Ðo©XÅL */
+	$"6A4D 0A98 093C 481D 1424 7964 E810 7A60"            /* jM˜Æ<H..$ydè.z` */
+	$"F2C0 8287 A7F4 B307 FBDF 2550 567E 01EA"            /* òÀ‚‡§ô³.ûß%PV~.ê */
+	$"2C45 4614 9A0A 04E8 397B 3DEC 6CDA CA95"            /* ,EF.šÂ.è9{=ìlÚÊ• */
+	$"B754 699A FF29 B46B D6E3 BB8C 153C AEC0"            /* ·Tišÿ)´kÖ㻌.<®À */
+	$"BEFF 46AD 744B B945 4C07 F7F7 178D 059E"            /* ¾ÿF­tK¹EL.÷÷.�.ž */
+	$"2E80 10C4 6DD6 F19E B649 73D6 8C57 7A6C"            /* .€.ÄmÖñž¶IsÖŒWzl */
+	$"45DE 3D43 22DE C54A DFCD 64EA 9D77 1AC6"            /* EÞ=C"ÞÅJßÍdê�w.Æ */
+	$"E15E A9A7 0D83 D53C 100B EC25 2B93 1D27"            /* á^©§.ƒÕ<..ì%+“.' */
+	$"367A 864E D9C4 F0B9 DF5C 538D B2C0 24EE"            /* 6z†NÙÄð¹ß\S�²À$î */
+	$"46E7 424C 2127 6BED B492 3354 86C9 D855"            /* FçBL!'kí´’3T†ÉØU */
+	$"317B 6BE2 8205 C07C 9A42 03E4 D6B0 0F93"            /* 1{kâ‚.À|šB.äÖ°.“ */
+	$"4400 AFF0 AE8C D6D6 6729 AEBE 9CDE 5C69"            /* D.¯ð®ŒÖÖg)®¾œÞ\i */
+	$"D95C 01A0 28AF 1E57 B12C CA6D F010 ED89"            /* Ù\. (¯.W±,Êmð.í‰ */
+	$"4C46 38AA BAFC D67E 9E98 C6CA 85E4 433E"            /* LF8ªºüÖ~ž˜ÆÊ…äC> */
+	$"C450 03B7 E8DE 17B3 9CE7 02E1 BE72 100B"            /* ÄP.·èÞ.³œç.á¾r.. */
+	$"2EF5 787D 0D12 FC3B 855A 3F97 1850 05EF"            /* .õx}..ü;…Z?—.P.ï */
+	$"A05D 7CC2 405B BA6D 9175 7C99 BE1C 2370"            /*  ]|Â@[ºm‘u|™¾.#p */
+	$"1F57 2085 13F8 B672 728D 1152 8232 1EE4"            /* .W ….ø¶rr�.R‚2.ä */
+	$"A666 BFD0 06A8 6CFF 3D73 D895 5968 A54A"            /* ¦f¿Ð.¨lÿ=sØ•Yh¥J */
+	$"3219 63AB D4CD 8E7D 52F3 D260 CE4D E329"            /* 2.c«ÔÍŽ}RóÒ`ÎMã) */
+	$"F554 C837 34CC 2866 FA1E 1F34 B209 B8C3"            /* õTÈ74Ì(fú..4²Æ¸Ã */
+	$"097B 8DBC 8788 F621 2A57 5468 5FD8 852B"            /* Æ{�¼‡ˆö!*WTh_Ø…+ */
+	$"08A9 45F3 71A8 A26B F63C 2DB1 750F A833"            /* .©Eóq¨¢kö<-±u.¨3 */
+	$"4767 6D8A B551 FF10 9E54 AD5D EE2E 2207"            /* GgmŠµQÿ.žT­]î.". */
+	$"44EA 0D21 75D4 779D E96D 49FF 47CE D775"            /* Dê.!uÔw�émIÿGÎ×u */
+	$"D7B0 2380 5F1C 4185 EF0B BECB 1A55 9696"            /* ×°#€_.A…ï.¾Ë.U–– */
+	$"81B8 94F2 4F5B 07D8 D5EC 9E2A 049D 5E87"            /* �¸”òO[.ØÕìž*.�^‡ */
+	$"2601 FB44 4AD5 C57B A7B0 8088 B723 134E"            /* &.ûDJÕÅ{§°€ˆ·#.N */
+	$"0B8A 375E B972 F34F F25A 2B68 3F15 4496"            /* .Š7^¹róOòZ+h?.D– */
+	$"5734 FE10 D742 67F9 9FFF 639C FAFD 23DB"            /* W4þ.×BgùŸÿcœúý#Û */
+	$"B90C F402 17F0 81C6 2656 EFD0 E011 C866"            /* ¹.ô..ð�Æ&VïÐà.Èf */
+	$"15C8 4927 3415 BEC1 7876 E693 74CB DBEA"            /* .ÈI'4.¾Áxvæ“tËÛê */
+	$"7206 2246 23EC DCCA 51CD 72C1 8C41 1B85"            /* r."F#ìÜÊQÍrÁŒA.… */
+	$"AE9B 6FA5 4286 03FB 7000 D94F 5A8B 8A85"            /* ®›o¥B†.ûp.ÙOZ‹Š… */
+	$"2F34 7575 E7AB 08FF 3CBD 328D D95D BDF5"            /* /4uuç«.ÿ<½2�Ù]½õ */
+	$"8070 0FAD B573 A91E 5F83 D32D 3337 A5B7"            /* €p.­µs©._ƒÓ-37¥· */
+	$"C6A7 3048 8D7C 3F01 F6BF 1BAB D684 0585"            /* Ƨ0H�|?.ö¿.«Ö„.… */
+	$"798A A28D 68A6 4993 22BC F35C E3A7 BABE"            /* yŠ¢�h¦I“"¼ó\㧺¾ */
+	$"0D5B 7E43 2B91 5DA6 6821 0495 4B22 33C0"            /* .[~C+‘]¦h!.•K"3À */
+	$"1217 1302 A7EB 1093 C8BD 3622 F0FD 14C3"            /* ....§ë.“Ƚ6"ðý.à */
+	$"EDBA 60FA B4C2 07D5 6D80 C177 9C23 24FE"            /* íº`ú´Â.Õm€Áwœ#$þ */
+	$"C9E7 77A7 1945 4C1A 8945 129A 2581 498D"            /* Éçw§.EL.‰E.š%�I� */
+	$"F2BD 5AD6 EF89 4D80 3EC2 DA29 E093 A726"            /* ò½ZÖï‰M€>ÂÚ)à“§& */
+	$"88F1 0796 E9F0 8F36 D342 7AD3 DEC2 2CCA"            /* ˆñ.–éð�6ÓBzÓÞÂ,Ê */
+	$"45B9 35A0 DE31 D18B 2954 C38C 4B3A EEA2"            /* E¹5 Þ1Ñ‹)TÃŒK:î¢ */
+	$"5CD5 333D 6C59 23C7 17B3 C98C 65EE 8117"            /* \Õ3=lY#Ç.³ÉŒeî�. */
+	$"22A2 574D D223 581B D09B 6473 3F85 6E2A"            /* "¢WMÒ#X.Лds?…n* */
+	$"81B5 F600 CAB6 1A02 3B24 D726 4344 536F"            /* �µö.ʶ..;$×&CDSo */
+	$"99AB 09C8 96EA B41B 01C9 7AC8 9478 B8AB"            /* ™«ÆÈ–ê´..ÉzÈ”x¸« */
+	$"69E3 1BF1 1100 AFF3 C59C 01FB 8EF9 047D"            /* iã.ñ..¯óÅœ.ûŽù.} */
+	$"21EF 11DE D2CA BEE2 8372 5DDB C39C DE6E"            /* !ï.ÞÒʾâƒr]ÛÃœÞn */
+	$"B652 35FE FDFB F1E8 2E91 778A 86C3 3117"            /* ¶R5þýûñè.‘wŠ†Ã1. */
+	$"87D8 A7D5 7862 68B7 30C1 3B32 D209 0256"            /* ‡Ø§Õxbh·0Á;2ÒÆ.V */
+	$"2BF7 DFEF 17C3 FC30 EF1D 9327 7041 FC3C"            /* +÷ßï.Ãü0ï.“'pAü< */
+	$"674F 3069 DAB2 0EA5 BB48 DC2C DC66 F660"            /* gO0iÚ².¥»HÜ,Üfö` */
+	$"9C9B C7C8 3734 C68B 7D5A 60A1 DF3D D3A8"            /* œ›ÇÈ74Æ‹}Z`¡ß=Ó¨ */
+	$"E60C D15A 11C7 FB3B F75A 358E A7F7 16CB"            /* æ.ÑZ.Çû;÷Z5Ž§÷.Ë */
+	$"67B5 097E E2A2 DE6C E40A FD52 8F75 43EF"            /* gµÆ~â¢ÞläÂýR�uCï */
+	$"F5DF 5A51 BBF5 A074 791F F54F 9724 23C3"            /* õßZQ»õ ty.õO—$#Ã */
+	$"F5E6 C4A3 E22C 1E06 3B71 A9A2 1C17 0109"            /* õæÄ£â,..;q©¢...Æ */
+	$"1B59 2742 AB03 0497 3E5A AD73 7FD3 DA51"            /* .Y'B«..—>Z­s.ÓÚQ */
+	$"9F17 A10E B9CF 7503 3395 8788 9D9D 4A58"            /* Ÿ.¡.¹Ïu.3•‡ˆ��JX */
+	$"F9B8 4A61 3DDA 7489 8086 9EAC 4D7D 62DD"            /* ù¸Ja=Út‰€†ž¬M}bÝ */
+	$"BF8B 9462 1CC0 6912 69BE 3BFE FED7 3174"            /* ¿‹”b.Ài.i¾;þþ×1t */
+	$"CAA6 A806 FF59 B963 ABEE 508B F428 D15C"            /* ʦ¨.ÿY¹c«îP‹ô(Ñ\ */
+	$"82FC BA30 6907 C572 F2BD C0DB E9A2 44AF"            /* ‚üº0i.Årò½ÀÛé¢D¯ */
+	$"EED6 81F7 C602 F802 0374 CD1D 0F41 5E2E"            /* îÖ�÷Æ.ø..tÍ..A^. */
+	$"F54F E7AB C492 54F8 C570 48A6 1603 35D3"            /* õOç«Ä’TøÅpH¦..5Ó */
+	$"EA1A 6A6D FD79 27E3 F928 4E16 3A2D 43FE"            /* ê.jmýy'ãù(N.:-Cþ */
+	$"6C3D AFC6 FA1C 578C 7BA9 7343 5B2C 7BB9"            /* l=¯Æú.WŒ{©sC[,{¹ */
+	$"0614 915A 24C4 CAC1 A2D3 0EAF EAE8 7257"            /* ..‘Z$ÄÊÁ¢Ó.¯êèrW */
+	$"EA2D 1ED2 3FFE 26A7 3E28 28D0 1AE1 D790"            /* ê-.Ò?þ&§>((Ð.á×� */
+	$"A25D 1C6C BA20 E196 1EEC 9720 92EE 6E62"            /* ¢].lº á–.ì— ’înb */
+	$"E218 5609 944E 9A2E 9228 117A 6065 93FF"            /* â.VÆ”Nš.’(.z`e“ÿ */
+	$"2B32 B2C1 7876 E657 E39E 8641 F202 62B4"            /* +2²ÁxvæW㞆Aò.b´ */
+	$"20C5 99D9 F9E5 7D83 D807 EDB7 9A34 475B"            /*  Å™Ùùå}ƒØ.í·š4G[ */
+	$"4F45 9AE8 ACD6 3098 A0C2 8D14 CBDB 9A2B"            /* OEšè¬Ö0˜ Â�.ËÛš+ */
+	$"0EF7 CB30 8B49 169F 1ECD 6F33 F063 65DA"            /* .÷Ë0‹I.Ÿ.Ío3ðceÚ */
+	$"2A2F F0B0 EE29 91F7 CA11 748C 5E4E A447"            /* *.ð°î)‘÷Ê.tŒ^N¤G */
+	$"0F7F 4B32 DB7A 366C 27C4 F178 33B7 5E9B"            /* ..K2Ûz6l'Äñx3·^› */
+	$"BAAF 29CD A3EF 39BB 5FAD AD2B 5DCA 09E8"            /* º¯)Í£ï9»_­­+]ÊÆè */
+	$"DB9A DD07 84DD 870E 2A4C 850B BD04 7F9A"            /* ÛšÝ.„݇.*L….½..š */
+	$"1354 1DAA 0819 F583 1F47 5905 6597 5F07"            /* .T.ª..õƒ.GY.e—_. */
+	$"7ED6 DFFA BA65 FA6C D01D F65F F833 D479"            /* ~ÖßúºeúlÐ.ö_ø3Ôy */
+	$"BFD3 F3D8 57BB 3718 EBC8 5A2D 732E 464E"            /* ¿ÓóØW»7.ëÈZ-s.FN */
+	$"6B46 9512 778B 8066 D5DA D21A 819D 5384"            /* kF•.w‹€fÕÚÒ.��S„ */
+	$"A84C AE56 92E2 2E9A 4D27 8A21 E02D 67FC"            /* ¨L®V’â.šM'Š!à-gü */
+	$"EAA4 B3D5 9306 1D06 CC9A 84C8 D6C4 C7E1"            /* ꤳՓ...Ìš„ÈÖÄÇá */
+	$"4F47 E168 43F0 6EB1 9276 ED11 2C29 F1CB"            /* OGáhCðn±’ví.,)ñË */
+	$"90AB 1975 3405 422B 78EC 7776 FA5C 0A2C"            /* �«.u4.B+xìwvú\Â, */
+	$"F4B1 4F40 32CE D338 8911 EAB4 4CFC 7765"            /* ô±O@2ÎÓ8‰.ê´Lüwe */
+	$"D9ED C10E 114B 0909 1122 6832 A41E 3365"            /* ÙíÁ..KÆÆ."h2¤.3e */
+	$"96EF FC81 A398 2FE8 0464 5D18 0C9F C1AF"            /* –ïü�£˜/è.d]..ŸÁ¯ */
+	$"8E6F 42CA BDC9 1DC4 770E 1C2E 01BD 62DB"            /* ŽoBʽÉ.Äw....½bÛ */
+	$"7798 4167 FC4F B27D D7E6 32CE 7F95 954F"            /* w˜AgüO²}×æ2Î.••O */
+	$"653C 833E B4F1 C6C2 307E 0796 686E 6F5C"            /* e<ƒ>´ñÆÂ0~.–hno\ */
+	$"6EE2 6260 4C0B 5329 36D8 839E 5F08 319C"            /* nâb`L.S)6؃ž_.1œ */
+	$"4CAE 85DE 6B64 F427 1358 C9FF 57B9 AF78"            /* L®…Þkdô'.XÉÿW¹¯x */
+	$"332B 82A6 0EBF 0F83 7A3C 8004 1402 6A12"            /* 3+‚¦.¿.ƒz<€...j. */
+	$"FEE8 1612 2D8A 47FE 5BDE 2714 B393 E32F"            /* þè..-ŠGþ[Þ'.³“ã/ */
+	$"013E BD7E 14FA 285D BF61 7CDA 3A92 734A"            /* .>½~.ú(]¿a|Ú:’sJ */
+	$"520E 978D 8736 6AA9 847B 05C9 F28B 3D9A"            /* R.—�‡6j©„{.Éò‹=š */
+	$"9B2E 721C 9082 3EC1 362C D516 D306 1EB9"            /* ›.r.�‚>Á6,Õ.Ó..¹ */
+	$"A95C EC63 3111 4ED2 054A EFF8 F26A 0E36"            /* ©\ìc1.NÒ.Jïøòj.6 */
+	$"7445 26A0 464F CEDC 924D B183 FAEF 28F7"            /* tE& FOÎÜ’M±ƒúï(÷ */
+	$"AF76 2DBA F15C 4F45 4BFD E003 CDC1 A878"            /* ¯v-ºñ\OEKýà.ÍÁ¨x */
+	$"6FB4 207C 2A45 1ED9 CE49 2495 F6A9 77E8"            /* o´ |*E.ÙÎI$•ö©wè */
+	$"E7FF 7FFF 7FFF 7FFF 70EC F373 E872 28BA"            /* çÿ.ÿ.ÿ.ÿpìósèr(º */
+	$"A0BB 38E4 AC79 94DA 6562 832A 9A7B EEA8"            /*  »8ä¬y”Úebƒ*š{î¨ */
+	$"6B09 FEA7 9249 2005 E7D1 D721 4761 B6DB"            /* kÆþ§’I .çÑ×!Ga¶Û */
+	$"6DB6 DB6D 98C5 C208 FD98 41AA F430 3EAE"            /* m¶Ûm˜ÅÂ.ý˜Aªô0>® */
+	$"7118 7229 50B1 07D8 C5CA 010D 4AB4 DE82"            /* q.r)P±.ØÅÊ..J´Þ‚ */
+	$"53D3 E184 6561 DE5F 7236 BBF5 550D 4A83"            /* SÓá„eaÞ_r6»õU.Jƒ */
+	$"555B 5C0F 9C0E F052 0080 F4AC 3912 DD30"            /* U[\.œ.ðR.€ô¬9.Ý0 */
+	$"47C9 B77E C632 15D7 8EB6 CD51 0454 A805"            /* GÉ·~Æ2.׎¶ÍQ.T¨. */
+	$"2DAD F687 6CB7 B37F 2289 759F F7D5 8839"            /* -­ö‡l·³."‰uŸ÷Õˆ9 */
+	$"B3E6 BCA5 AA89 9D9D 599A 5BDD 54B9 7F7D"            /* ³æ¼¥ª‰��Yš[ÝT¹.} */
+	$"2770 11ED 2217 C539 0204 16FF 728A C52A"            /* 'p.í".Å9...ÿrŠÅ* */
+	$"2D24 5FC7 E1D7 C47E 1DE8 C3F0 EA38 E730"            /* -$_Çá×Ä~.èÃðê8ç0 */
+	$"2D9D 0AC5 991A F5DD 38EC 007B A963 8B4D"            /* -�ÂÅ™.õÝ8ì.{©c‹M */
+	$"51BA A9FC AE25 908A 1B70 9145 EBA2 38C4"            /* Qº©ü®%�Š.p‘Eë¢8Ä */
+	$"168F 70BB 10A5 CAA5 A249 1974 03F3 AB57"            /* .�p».¥Ê¥¢I.t.ó«W */
+	$"3611 30C5 1F14 529F 040A A8EC EBDF F2FF"            /* 6.0Å..RŸ.¨ìëßòÿ */
+	$"232B 83FE C2D0 59D9 93C2 2A8A F86A 997F"            /* #+ƒþÂÐYÙ“Â*Šøj™. */
+	$"3207 03A7 C406 E96C C96F 23F1 1490 95DF"            /* 2..§Ä.élÉo#ñ.�•ß */
+	$"4024 67DC 3DE6 E1B1 EB60 1026 8786 531C"            /* @$gÜ=æá±ë`.&‡†S. */
+	$"9A51 378D EE86 881F 496C 8854 9459 7799"            /* šQ7�.IlˆT”Yw™ */
+	$"11EC 4196 0C22 0F05 3762 D8F4 C348 7299"            /* .ìA–."..7bØôÃHr™ */
+	$"793E 0718 14D3 D09C C192 80E1 9F7C 5CFA"            /* y>...ÓÐœÁ’€áŸ|\ú */
+	$"429C 7960 2F8B 9063 C7E1 1447 7F52 D850"            /* Bœy`/‹�cÇá.G.RØP */
+	$"B80A F1D8 BE98 DC3C 9C44 3AB7 3DA7 E08C"            /* ¸Âñؾ˜Ü<œD:·=§àŒ */
+	$"E7B6 07CE 2B69 C0E9 0C21 6133 1EC5 DAB5"            /* ç¶.Î+iÀé.!a3.ÅÚµ */
+	$"B079 413B FBA4 0259 78B8 DA3A E6D1 4AAC"            /* °yA;û¤.Yx¸Ú:æÑJ¬ */
+	$"2459 93C8 AD9A D69C AC40 5CF7 7385 1B18"            /* $Y“È­šÖœ¬@\÷s….. */
+	$"D67D 82BD 5E44 3DF8 5D2F E6D3 CE47 0191"            /* Ö}‚½^D=ø]/æÓÎG.‘ */
+	$"6E57 0F2F E8E8 9FF0 14BC 21F1 7720 6F34"            /* nW./èèŸð.¼!ñw o4 */
+	$"1EEE 5EF6 F8FD 5481 44E3 AB6B B06E 2556"            /* .î^öøýT�Dã«k°n%V */
+	$"6F07 AD65 FC95 7C32 7487 10A0 3C20 9CA7"            /* o.­eü•|2t‡. < œ§ */
+	$"B0EB F703 2D09 F0A6 D3FD 55F6 354B EDB0"            /* °ë÷.-Æð¦ÓýUö5Kí° */
+	$"179B B267 B9EB 8DA1 ED8E 7D0F 1AFF 4D50"            /* .›²g¹ë�¡íŽ}..ÿMP */
+	$"C1C7 A686 586C 6A26 3B0B 4292 60A0 A804"            /* ÁǦ†Xlj&;.B’` ¨. */
+	$"04F6 5FDB 0F76 E2BC D680 20B5 46AE 399D"            /* .ö_Û.vâ¼Ö€ µF®9� */
+	$"CC54 82A4 1DCA 08E7 E2B4 6710 ABD8 FC18"            /* ÌT‚¤.Ê.çâ´g.«Øü. */
+	$"949B 7076 11CD 598E 2A8B 99FC CC28 EC17"            /* ”›pv.ÍYŽ*‹™üÌ(ì. */
+	$"451C DE31 F7F4 C47E 3ABB AF03 FDC6 D875"            /* E.Þ1÷ôÄ~:»¯.ýÆØu */
+	$"BD0C AB3E B78F F942 A53E E5F8 CA09 414D"            /* ½.«>·�ùB¥>åøÊÆAM */
+	$"7544 D5B4 8367 3256 6D8C CB66 6DE7 E99C"            /* uDÕ´ƒg2VmŒËfmçéœ */
+	$"88E9 FCDC EB55 F67B 20E7 F44D 7616 6B29"            /* ˆéüÜëUö{ çôMv.k) */
+	$"124A C9AB 95C7 E9A8 209D EDA5 499F 2D2F"            /* .JÉ«•Çé¨ �í¥IŸ-/ */
+	$"20E5 DE8C 2EEE 92AF 4BD6 484B 7E18 2D81"            /*  åÞŒ.î’¯KÖHK~.-� */
+	$"0502 F439 C742 BA21 693B 43C5 60DF 8BA0"            /* ..ô9ÇBº!i;CÅ`ß‹  */
+	$"9EAC 0A98 DFE4 DB4B 0BE1 E526 9B74 5982"            /* ž¬Â˜ßäÛK.áå&›tY‚ */
+	$"1817 EA6B 067A D3E4 8786 883D 26DB D361"            /* ..êk.zÓ䇆ˆ=&ÛÓa */
+	$"C40F 89F4 B31F 2AF3 1369 FDA9 889A 5620"            /* Ä.‰ô³.*ó.iý©ˆšV  */
+	$"9AE7 4384 7184 9D7F 6C37 F79B 9422 ADF3"            /* šçC„q„�.l7÷›”"­ó */
+	$"2BEA A620 14CF 0267 110E AB20 594B F1DA"            /* +ê¦ .Ï.g..« YKñÚ */
+	$"9D7F DB53 3723 1A4E 0DEC DF68 3A10 078F"            /* �.ÛS7#.N.ìßh:..� */
+	$"8CA5 471B 4400 0975 92AA A351 8C66 5DDA"            /* Œ¥G.D.Æu’ª£QŒf]Ú */
+	$"0E4E C7B1 286F 2F7C E0EB 24CC 0A8B CAF8"            /* .NDZ(o/|àë$Ì‹Êø */
+	$"4F0F 75E5 CACF 26F5 0FFE 86A8 1E77 5F03"            /* O.uåÊÏ&õ.þ†¨.w_. */
+	$"A8B5 A544 F04B A521 B3FA 854A 64FA 70CD"            /* ¨µ¥DðK¥!³ú…JdúpÍ */
+	$"526F 97AE 807A 05FC 3F67 2471 61E5 2715"            /* Ro—®€z.ü?g$qaå'. */
+	$"5774 E452 7E4A CDDA 6E48 0DA2 04B3 3A29"            /* WtäR~JÍÚnH.¢.³:) */
+	$"DE10 8F75 3A3A 559D A881 B948 74F3 AB92"            /* Þ.�u::U�¨�¹Htó«’ */
+	$"B154 0F88 A11B A00B 25ED 9A59 B894 618E"            /* ±T.ˆ¡. .%íšY¸”aŽ */
+	$"AD45 3D59 9C08 49EA 076C CD63 8F49 B714"            /* ­E=Yœ.Iê.lÍc�I·. */
+	$"32B3 8743 2506 F55A C011 CBEF C94A 8606"            /* 2³‡C%.õZÀ.ËïÉJ†. */
+	$"EDE4 BE7D 2DC9 8830 6C23 91E0 0209 440C"            /* íä¾}-Ɉ0l#‘à.ÆD. */
+	$"9409 1457 6CA0 2201 8FF4 7573 54F8 CCEC"            /* ”Æ.Wl ".�ôusTøÌì */
+	$"D201 4A3A 66A6 B191 4E14 4CB1 08B4 2100"            /* Ò.J:f¦±‘N.L±.´!. */
+	$"BCF2 3A0D 696F 4582 F8B0 3A60 2D09 E9A7"            /* ¼ò:.ioE‚ø°:`-Æé§ */
+	$"8E83 CF44 A16A 6516 31C1 B51E 2DFE BDAC"            /* ŽƒÏD¡je.1Áµ.-þ½¬ */
+	$"356B F402 856C BEA0 109C A125 A759 E580"            /* 5kô.…l¾ .œ¡%§Yå€ */
+	$"3501 F500 F252 9533 F180 6E7D 30A8 FD62"            /* 5.õ.òR•3ñ€n}0¨ýb */
+	$"7FD6 B4EB 9120 8504 493A DD87 D79A 0CB1"            /* .Ö´ë‘ ….I:݇ך.± */
+	$"B674 7010 830D 8A38 5B44 B11D 3632 3FA5"            /* ¶tp.ƒ.Š8[D±.62?¥ */
+	$"CE31 CE9A 1670 AF20 16F6 BDA6 4980 002E"            /* Î1Κ.p¯ .ö½¦I€.. */
+	$"3E9E 8AB0 8B1F 63C5 28C3 7914 2833 137F"            /* >žŠ°‹.cÅ(Ãy.(3.. */
+	$"0915 DD39 7D38 49A3 6054 B5DC 2509 EE11"            /* Æ.Ý9}8I£`TµÜ%Æî. */
+	$"D68A 5C2A C75B 5B9F 7A9A FF3A D06F 3331"            /* ÖŠ\*Ç[[Ÿzšÿ:Ðo31 */
+	$"29E6 A9F4 8AD5 E0D9 7FB9 84B1 F403 8910"            /* )æ©ôŠÕàÙ.¹„±ô.‰. */
+	$"1168 1270 19E2 E385 0353 0FFF 697F 96BE"            /* .h.p.âã….S.ÿi.–¾ */
+	$"EF55 21CA 25A1 CE5E 0CD7 03A9 094F 51FE"            /* ïU!Ê%¡Î^.×.©ÆOQþ */
+	$"5314 E59F 90EB 907A E37A DD9D 182A E41C"            /* S.åŸ�ë�zãzÝ�.*ä. */
+	$"CFFB 7262 0D9E B904 8D95 2DE3 E02B F5CB"            /* Ïûrb.ž¹.�•-ãà+õË */
+	$"BF61 6012 924E 50D3 2D8D 6C25 FC60 8D19"            /* ¿a`.’NPÓ-�l%ü`�. */
+	$"9855 8BF2 5400 0000 04E3 7684 B40E 9EE7"            /* ˜U‹òT....ãv„´.žç */
+	$"21F8 CB76 250B 7CE0 2605 7C84 7E9F F226"            /* !øËv%.|à&.|„~Ÿò& */
+	$"6B94 0DB5 02AA 61E7 A9FF 5D9F A9F2 B546"            /* k”.µ.ªaç©ÿ]Ÿ©òµF */
+	$"2417 2E4D B238 ADDF 9233 5911 1D61 D35A"            /* $..M²8­ß’3Y..aÓZ */
+	$"8788 DF34 284A 9664 B91E 7A11 4568 B395"            /* ‡ˆß4(J–d¹.z.Eh³• */
+	$"7C74 C891 2A46 C056 EE92 0459 D81C A41F"            /* |tÈ‘*FÀVî’.YØ.¤. */
+	$"CA5E 4752 3ADE 89AB 995B 2BF2 D070 41B1"            /* Ê^GR:Þ‰«™[+òÐpA± */
+	$"EBFE 65BF FF61 55F5 5460 A4E0 33CF 7F1E"            /* ëþe¿ÿaUõT`¤à3Ï.. */
+	$"691A 0DA4 9372 4DCD 4A7C FF30 7DA5 4AD0"            /* i..¤“rMÍJ|ÿ0}¥JÐ */
+	$"1236 3C90 00C2 4517 FF78 771E DA05 952D"            /* .6<�.ÂE.ÿxw.Ú.•- */
+	$"1085 D433 FD50 1E6F D583 2585 CBD6 5CFC"            /* .…Ô3ýP.oÕƒ%…ËÖ\ü */
+	$"9EF2 539B BE7A CCA1 ABF6 5AED 484B FF78"            /* žòS›¾zÌ¡«öZíHKÿx */
+	$"D6BD 435E E56E 5510 3047 49DE C511 72CF"            /* Ö½C^ånU.0GIÞÅ.rÏ */
+	$"72A0 B2CE 5E4D E2DA 0AFA FEDE BDFD 3167"            /* r ²Î^MâÚÂúþÞ½ý1g */
+	$"02FE 3FBE A1B9 7A5F 205B 7D60 1BA3 C975"            /* .þ?¾¡¹z_ [}`.£Éu */
+	$"5949 A641 5A3E 5AF2 F237 53BE FCAC 71F1"            /* YI¦AZ>Zòò7S¾ü¬qñ */
+	$"E3E3 6AEB 35B9 41BD C4B6 3400 DBA0 4B7F"            /* ããjë5¹A½Ä¶4.Û K. */
+	$"FF79 17FD 23F9 918D E532 F6BD F949 B633"            /* ÿy.ý#ù‘�å2ö½ùI¶3 */
+	$"6A36 7600 17D8 C912 DB72 6F48 869C 0D66"            /* j6v..ØÉ.ÛroH†œ.f */
+	$"1410 074A 8F5B 629C 5B8B F293 6DB6 DB6D"            /* ...J�[bœ[‹ò“m¶Ûm */
+	$"B6DB 6740 B8F8 BF85 2938 ECDA 6390 6537"            /* ¶Ûg@¸ø¿…)8ìÚc�e7 */
+	$"5986 A2A6 B52C A20D F057 C41F 660A C203"            /* Y†¢¦µ,¢.ðWÄ.fÂÂ. */
+	$"E5C1 68B0 9D56 DAD8 F20C 665C 5D04 4BA2"            /* åÁh°�VÚØò.f\].K¢ */
+	$"46FF 7DB5 4880 6121 2EA3 5D2A 82F4 B18A"            /* Fÿ}µH€a!.£]*‚ô±Š */
+	$"50FC 2D12 DEFE 1F4D 01BF 3315 10D3 5D94"            /* Pü-.Þþ.M.¿3..Ó]” */
+	$"11B1 0221 28B8 56D9 4CED 012D D9C9 4005"            /* .±.!(¸VÙLí.-ÙÉ@. */
+	$"316F E887 29A8 3E83 9E25 FF1F A4C1 5D25"            /* 1oè‡)¨>ƒž%ÿ.¤Á]% */
+	$"8893 36E0 73BE DE25 456A 4678 B7C5 AD7A"            /* ˆ“6às¾Þ%EjFx·Å­z */
+	$"90C9 3950 942F 1459 C737 31EF 991F 241B"            /* �É9P”/.YÇ71ï™.$. */
+	$"C294 7CFB 9461 B43A 8D37 8A6D BBC8 D7F6"            /* ”|û”a´:�7Šm»È×ö */
+	$"A128 281D DF2B EAC5 A154 E6D9 FF53 984D"            /* ¡((.ß+êÅ¡TæÙÿS˜M */
+	$"550E 9C70 3F64 0E0E 0940 0AFC 5CC9 CF43"            /* U.œp?d..Æ@Âü\ÉÏC */
+	$"7184 3D0F 9FDE 08DF EC31 B86E 0D38 AF71"            /* q„=.ŸÞ.ßì1¸n.8¯q */
+	$"29F1 A21D 7847 7150 6DCA 9211 C778 F1A4"            /* )ñ¢.xGqPmÊ’.Çxñ¤ */
+	$"26AA B90D 1A39 DB92 4924 9249 2493 36D2"            /* &ª¹..9Û’I$’I$“6Ò */
+	$"4924 9249 2492 49FE 069C E7B9 CB0D 4E87"            /* I$’I$’Iþ.œç¹Ë.N‡ */
+	$"7D9E 9D29 FC64 8A6F 6185 2BD9 806F 760B"            /* }ž�)üdŠoa…+Ù€ov. */
+	$"464D 4732 BD90 0E7D CABF 2B6F 2A78 8608"            /* FMG2½�.}Ê¿+o*x†. */
+	$"DEF5 406F D401 3FD4 AE82 058D D6C8 B980"            /* Þõ@oÔ.?Ô®‚.�Öȹ€ */
+	$"FECA D9B9 E7B6 3982 9FD3 81EA 544B 30BD"            /* þÊÙ¹ç¶9‚ŸÓ�êTK0½ */
+	$"7E56 FD78 66FD 5A41 D0BD 7714 5FAF 2A1E"            /* ~VýxfýZAнw._¯*. */
+	$"8FDA B705 EAAE F6F2 D69C 9812 7194 A56E"            /* �Ú·.ê®öòÖœ˜.q”¥n */
+	$"DB55 BF75 C4E4 BDCD 9FC2 ACAD C428 829F"            /* ÛU¿uÄä½ÍŸÂ¬­Ä(‚Ÿ */
+	$"2409 3BB2 A894 8020 A8E7 FC16 F4FF 4E84"            /* $Æ;²¨”€ ¨çü.ôÿN„ */
+	$"C06E 889C 1C74 96AD 5420 F825 1A2B 015C"            /* Ànˆœ.t–­T ø%.+.\ */
+	$"6BC2 31EE 64AB 7A44 15E5 3458 8040 AEEF"            /* kÂ1îd«zD.å4X€@®ï */
+	$"F6BD 7D58 6478 8344 018F D3C6 2E33 69A4"            /* ö½}XdxƒD.�ÓÆ.3i¤ */
+	$"E5E8 721A 5B2F 777B C0D8 0A05 2CE7 EEC8"            /* åèr.[/w{ÀØÂ.,çîÈ */
+	$"69EF 417B A960 D320 842E 84DE D442 AB2F"            /* iïA{©`Ó „.„ÞÔB«/ */
+	$"3B31 84FE DCFC A608 2E09 AA42 60F6 DB2E"            /* ;1„þÜü¦..ƪB`öÛ. */
+	$"DA5B C95D D10A 77BE AD48 B5FF 0557 A5AC"            /* Ú[É]ÑÂw¾­Hµÿ.W¥¬ */
+	$"327B F763 FDA1 32BF 7308 3EFC 0C2B 2D22"            /* 2{÷cý¡2¿s.>ü.+-" */
+	$"584A F9CA BFB4 78FF 6E67 42CC B491 492B"            /* XJùÊ¿´xÿngBÌ´‘I+ */
+	$"17C3 C746 9966 5780 BA6C 2798 472E 1CFF"            /* .ÃÇF™fW€ºl'˜G..ÿ */
+	$"6A32 69A0 86E0 44C6 1679 08F9 9928 48D9"            /* j2i †àDÆ.y.ù™(HÙ */
+	$"3DA0 CBA0 1E5E 2618 7162 51C9 DEF0 56A0"            /* = Ë .^&.qbQÉÞðV  */
+	$"1924 F126 CAAD F248 A1A4 2816 13A7 FE76"            /* .$ñ&Ê­òH¡¤(..§þv */
+	$"594E 647C 36C4 C014 CDC7 5C89 DBAB 9854"            /* YNd|6ÄÀ.ÍÇ\‰Û«˜T */
+	$"9094 FC96 5FED 7476 AA3C DF0B B47B C123"            /* �”ü–_ítvª<ß.´{Á# */
+	$"BE6D CD5A BA07 CC19 94FC DC37 B85C 0FD2"            /* ¾mÍZº.Ì.”üÜ7¸\.Ò */
+	$"9FED 62E6 F910 2F49 529E CE10 9738 D296"            /* Ÿíbæù./IRžÎ.—8Ò– */
+	$"A81C 1A0D 0FBF 7CAE DB93 40C0 3BC9 5A0C"            /* ¨....¿|®Û“@À;ÉZ. */
+	$"B23D FBD4 3863 C520 03A0 D966 5327 A0A2"            /* ²=ûÔ8cÅ . ÙfS' ¢ */
+	$"DD06 B7A1 942B 0A75 CB23 8664 4159 8647"            /* Ý.·¡”+ÂuË#†dAY†G */
+	$"2725 DAF6 693A 58D7 7A7D B34A 393D FE7A"            /* '%Úöi:X×z}³J9=þz */
+	$"C105 C374 193C 123C 130E 062C 8AB2 32FD"            /* Á.Ãt.<.<...,Š²2ý */
+	$"80E0 72E3 6AEA 2078 5D7C D3E5 4E20 D927"            /* €àrãjê x]|ÓåN Ù' */
+	$"157E 9DC5 1A29 2F0F C326 AFE3 3ACF C361"            /* .~�Å.)/.Ã&¯ã:ÏÃa */
+	$"8C45 D79C EB27 7441 E4C7 8BFD 5832 DB93"            /* ŒEלë'tAäÇ‹ýX2Û“ */
+	$"78F5 B9DB BA4E 329E A262 C467 88DC C540"            /* xõ¹ÛºN2ž¢bÄgˆÜÅ@ */
+	$"78E0 4E55 34F3 806E 2DEA B371 E9B5 D8DF"            /* xàNU4ó€n-ê³qéµØß */
+	$"5EDA B5B9 1C48 5A11 ECAB E4F8 67B7 C76E"            /* ^Úµ¹.HZ.ì«äøg·Çn */
+	$"460F 8E6A C7BA B5F8 75F2 9105 1480 FD1A"            /* F.ŽjǺµøuò‘..€ý. */
+	$"80EB DB48 6115 AA6E 9AEA A07C 57B0 1A7F"            /* €ëÛHa.ªnšê |W°.. */
+	$"0CBF D5DE 47A7 89BE 4CAE 19FE 7B79 5839"            /* .¿ÕÞG§‰¾L®.þ{yX9 */
+	$"232D 495E 476C E267 D9D2 5257 F0E6 3EB5"            /* #-I^GlâgÙÒRWðæ>µ */
+	$"F140 AAAF 1E36 BA04 086A EEC5 3232 7958"            /* ñ@ª¯.6º..jîÅ22yX */
+	$"72E3 FCC3 9488 B44C 0C15 EF6B 811B CF97"            /* rãüÔˆ´L..ïk�.Ï— */
+	$"0532 2B88 663D 8675 6050 AB94 A435 C0FC"            /* .2+ˆf=†u`P«”¤5Àü */
+	$"9E08 9873 92AF 6859 F7F5 64B0 0BA5 FA68"            /* ž.˜s’¯hY÷õd°.¥úh */
+	$"3557 0898 9E0D 5795 BF67 2866 5FB6 63C6"            /* 5W.˜ž.W•¿g(f_¶cÆ */
+	$"4F82 42CE A682 DC8D CB18 D4FE 6252 95D1"            /* O‚BΦ‚Ü�Ë.ÔþbR•Ñ */
+	$"C85C 6B2C 0FC0 7C9D 5A80 F93B 8900 F93A"            /* È\k,.À|�Z€ù;‰.ù: */
+	$"8EE6 7513 4AFA 1609 3CEE D5EB B420 A1CE"            /* Žæu.Jú.Æ<îÕë´ ¡Î */
+	$"318D 6F67 720A 7F84 4127 C0F2 9193 35CE"            /* 1�ogrÂ.„A'Àò‘“5Î */
+	$"6D97 9682 5E5D B9FC 5A97 3B71 AB1F 64AA"            /* m—–‚^]¹üZ—;q«.dª */
+	$"3383 1F0E C0E9 26BE E6EB 24CD 499F F2BA"            /* 3ƒ..Àé&¾æë$ÍIŸòº */
+	$"997D E886 6FF8 C6B5 0607 1259 7715 7539"            /* ™}è†oøƵ...Yw.u9 */
+	$"4B57 F7A9 56A7 A04B 031F 0786 6C02 E7BC"            /* KW÷©V§ K...†l.ç¼ */
+	$"8256 7F27 A39A B66D 6B95 6C11 CDE4 C580"            /* ‚V.'£š¶mk•l.ÍäÅ€ */
+	$"54DE 7E26 129C EB67 ABC8 455E 6CC3 453E"            /* TÞ~&.œëg«ÈE^lÃE> */
+	$"F9A8 3ED5 9B43 4EB8 384E 0F7B 28E0 16FF"            /* ù¨>Õ›CN¸8N.{(à.ÿ */
+	$"1342 18B1 31B6 EAEF 4C40 36F7 0CFF 6AFF"            /* .B.±1¶êïL@6÷.ÿjÿ */
+	$"8059 5D1C 275B 4F7D B392 4DB0 5E5D 4304"            /* €Y].'[O}³’M°^]C. */
+	$"4848 2A3A C93F BAD6 638D 315A 8771 1150"            /* HH*:É?ºÖc�1Z‡q.P */
+	$"1D41 B6A7 C9B8 782E 19D8 F8E7 07EB ED20"            /* .A¶§É¸x..Øøç.ëí  */
+	$"7D4E AFFF 5FD2 4FA0 2B48 B549 6A50 AD81"            /* }N¯ÿ_ÒO +HµIjP­� */
+	$"F11D 357F 7CB2 4B8B F28B 6C97 2C23 58A3"            /* ñ.5.|²K‹ò‹l—,#X£ */
+	$"92E8 2BFB 77F2 1ECE 7A2A C437 47E3 A833"            /* ’è+ûwò.Îz*Ä7Gã¨3 */
+	$"D60C C3CA 168A 85B8 620C 109C 4134 35BF"            /* Ö.ÃÊ.Š…¸b..œA45¿ */
+	$"ECCB 3629 944F AD29 444A C4B6 F019 F19B"            /* ìË6)”O­)DJĶð.ñ› */
+	$"4189 B1D3 8F28 65B9 85D8 C715 2E1A 267D"            /* A‰±Ó�(e¹…ØÇ...&} */
+	$"A7DB 4C90 9829 BC86 E14C 9F44 757D 5436"            /* §ÛL�˜)¼†áLŸDu}T6 */
+	$"9C38 979D 3654 9A63 E572 7864 E513 A083"            /* œ8—�6Tšcårxdå. ƒ */
+	$"C943 97C5 A88B 23A2 4ECC E4F1 AEED F3EC"            /* ÉC—Ũ‹#¢NÌäñ®íóì */
+	$"C57D F254 B087 7E1F 81B3 59E6 E2A0 E5CB"            /* Å}òT°‡~.�³Yæâ åË */
+	$"B710 EF71 0598 01BF 1400 3814 0759 EDA8"            /* ·.ïq.˜.¿..8..Yí¨ */
+	$"386C 3DF0 F1C5 CA93 612F C58D 71BA 6ED6"            /* 8l=ðñÅÊ“a/Å�qºnÖ */
+	$"FE35 90B4 9C10 A938 33B6 6987 E407 AE7B"            /* þ5�´œ.©83¶i‡ä.®{ */
+	$"5B1A 8E0E BE53 1C94 D747 9303 2ED9 13FA"            /* [.Ž.¾S.”×G“..Ù.ú */
+	$"226C F38A 7134 3CF6 1923 B85F A254 0048"            /* "lóŠq4<ö.#¸_¢T.H */
+	$"A765 B678 FC9C 1E2C E183 FC80 CA83 9572"            /* §e¶xüœ.,áƒü€Êƒ•r */
+	$"E573 B224 9894 7316 C931 4A49 C28F 6E33"            /* ås²$˜”s.É1JIÂ�n3 */
+	$"B579 EE14 84BC 61CC 351B 41FB 7095 5F8C"            /* µyî.„¼aÌ5.Aûp•_Œ */
+	$"1B15 6DAF FF7F F8EA 5A11 5453 6ECA 1C02"            /* ..m¯ÿ.øêZ.TSnÊ.. */
+	$"C8A4 F40F AD00 7BC9 EDFD AC3A 28E4 546F"            /* Ȥô.­.{Éíý¬:(äTo */
+	$"1E36 BE45 897E F5D5 BE25 E84B 57C6 9080"            /* .6¾E‰~õÕ¾%èKWÆ�€ */
+	$"B6C4 79B8 153B 110F D90B 215D 401C 0453"            /* ¶Äy¸.;..Ù.!]@..S */
+	$"8243 BF4A CDAE 9270 0658 462F E0C7 82A8"            /* ‚C¿JÍ®’p.XF/àÇ‚¨ */
+	$"E155 C547 D144 EBAD 74EC EAFF 7799 6D50"            /* áUÅGÑDë­tìêÿw™mP */
+	$"D0F9 6BA4 D8B3 0FBB B75B BC48 D5BA 8EAB"            /* Ðùk¤Ø³.»·[¼HÕºŽ« */
+	$"FF7F 3A2A 820F D817 FB8B 7590 ED4A 3D7B"            /* ÿ.:*‚.Ø.û‹u�íJ={ */
+	$"DAF8 C05F BDCF 1B7C 8862 53A8 95D6 C0DF"            /* ÚøÀ_½Ï.|ˆbS¨•ÖÀß */
+	$"4069 36DA 0739 783C C432 1E0C 7DA6 2D70"            /* @i6Ú.9x<Ä2..}¦-p */
+	$"B33A C5AD 810A FBBD E9BB B776 6463 9FDC"            /* ³:Å­�Âû½é»·vdcŸÜ */
+	$"B401 211D 81BA A9FA 8761 ED36 A1EF 439D"            /* ´.!.�º©ú‡aí6¡ïC� */
+	$"9880 BE88 E045 3068 F59F 7AD7 EFFF 7FFC"            /* ˜€¾ˆàE0hõŸz×ïÿ.ü */
+	$"5562 1F00 0818 22D6 5002 F762 7A20 0DC0"            /* Ub...."ÖP.÷bz .À */
+	$"3ADD FF5D 1851 D391 F011 0000 0000 0000"            /* :Ýÿ].QÓ‘ð....... */
+	$"0000 0000 0138 5715 ED61 F2C5 2C28 30C0"            /* .....8W.íaòÅ,(0À */
+	$"F669 9389 6153 3A95 E010 CCA0 2FEF B36F"            /* öi“‰aS:•à.Ì /ï³o */
+	$"9576 F8C0 F17B 27F6 F6FA 412C 70C7 CF14"            /* •vøÀñ{'ööúA,pÇÏ. */
+	$"7625 6871 7FE2 16C9 B6E9 5BF1 1A16 E2F0"            /* v%hq.â.ɶé[ñ..âð */
+	$"945D E51E CCF9 0970 E586 517C 475F 8856"            /* ”]å.ÌùÆpå†Q|G_ˆV */
+	$"CA0C 1DD9 E001 D7BC 1876 745C 8077 672D"            /* Ê..Ùà.×¼.vt\€wg- */
+	$"CECA FF0B 01D1 76FA 32F5 C047 26FB 451F"            /* ÎÊÿ..Ñvú2õÀG&ûE. */
+	$"5261 79B6 5990 79C9 4DF7 5B69 D548 E894"            /* Ray¶Y�yÉM÷[iÕHè” */
+	$"F249 0C84 D3F0 9555 7B99 EA27 FA38 184E"            /* òI.„Óð•U{™ê'ú8.N */
+	$"F863 AFA1 CE80 AEBC CB89 DD99 B8E2 0BEC"            /* øc¯¡Î€®¼Ë‰Ý™¸â.ì */
+	$"2F74 E534 3FF4 B50A 4B04 02B1 C178 B189"            /* /tå4?ôµÂK..±Áx±‰ */
+	$"D30F 77DC 8A15 8C9E AF87 1DCD D545 AC6B"            /* Ó.wÜŠ.Œž¯‡.ÍÕE¬k */
+	$"CAFB 832B E240 6752 8EF2 9BDF 76E8 621D"            /* Êûƒ+â@gRŽò›ßvèb. */
+	$"892E 384C 7BF0 4DE8 F910 7689 C3F0 E7E9"            /* ‰.8L{ðMèù.v‰Ãðçé */
+	$"E401 C781 F341 A84F 6922 E97B FC22 E259"            /* ä.Ç�óA¨Oi"é{ü"âY */
+	$"6B26 9B03 14A7 DFA1 B7BD CBED 9539 5DE3"            /* k&›..§ß¡·½Ëí•9]ã */
+	$"2041 2F5F A37A 2F23 00FC 6424 D7F8 902E"            /*  A/_£z/#.üd$×ø�. */
+	$"7261 227B B4EC F4D1 9C18 22C3 8CA5 EFF8"            /* ra"{´ìôÑœ."ÃŒ¥ïø */
+	$"5701 6734 9110 8B4E D9E0 EE8F 7FEA 202F"            /* W.g4‘.‹NÙàî�.ê / */
+	$"CFF7 5CC7 6107 0B22 B0BE A87B 32EF 0FA8"            /* Ï÷\Ça.."°¾¨{2ï.¨ */
+	$"3D2D 794E 556E 6089 ACBA D46C 17EC A9DC"            /* =-yNUn`‰¬ºÔl.ì©Ü */
+	$"0F4E D57D B8C8 EED1 F9D4 F96A 7BEE 3794"            /* .NÕ}¸ÈîÑùÔùj{î7” */
+	$"49DE 3AA7 EE2E 0B25 A47C 966A D90D C792"            /* IÞ:§î..%¤|–jÙ.Ç’ */
+	$"6304 7C05 C6EB A26D 83B8 3E0C AAF5 AFFE"            /* c.|.Æë¢mƒ¸>.ªõ¯þ */
+	$"FDC3 F7C4 C0A3 C3ED E8D2 0FAB AC58 1F56"            /* ýÃ÷ÄÀ£ÃíèÒ.«¬X.V */
+	$"FF40 F44B 4289 C6D7 CC17 A019 AD4A C889"            /* ÿ@ôKB‰Æ×Ì. .­Jȉ */
+	$"67AD 0673 32A0 B6BA 087E 7279 19C2 025F"            /* g­.s2 ¶º.~ry.Â._ */
+	$"DB0E 0E97 02D9 2268 5BCA CDE6 B94E 8D9B"            /* Û..—.Ù"h[ÊÍæ¹N�› */
+	$"03EB D786 1698 2D8A 2ECD 432E D615 931F"            /* .ë׆.˜-Š.ÍC.Ö.“. */
+	$"452B 5D40 0950 5BBE A70F BD95 9F0E 8B95"            /* E+]@ÆP[¾§.½•Ÿ.‹• */
+	$"86B7 47DE 0757 BFE4 9775 3082 9D22 863A"            /* †·GÞ.W¿ä—u0‚�"†: */
+	$"E404 B84C 5E88 8424 31DD 689A D234 88E2"            /* ä.¸L^ˆ„$1ÝhšÒ4ˆâ */
+	$"971F 9E59 429C 6C7E 3670 8F7C 8F86 A80D"            /* —.žYBœl~6p�|�†¨. */
+	$"848E E78B 5331 058E E444 FEC2 269A 7E23"            /* „Žç‹S1.ŽäDþÂ&š~# */
+	$"608D 0502 E075 F7A4 DACF 515F AA08 31C1"            /* `�..àu÷¤ÚÏQ_ª.1Á */
+	$"1275 02C0 F37E F465 ADE9 1918 F1F0 0E4F"            /* .u.Àó~ôe­é..ñð.O */
+	$"E5A4 41A5 F655 22D9 946A 7FEC 0720 3D3A"            /* å¤A¥öU"Ù”j.ì. =: */
+	$"4961 05B2 F02D 51D2 1212 084B B3EA 5DC9"            /* Ia.²ð-QÒ...K³ê]É */
+	$"F986 5763 A2AC E2AC 1144 5DC3 E6A5 D092"            /* ù†Wc¢¬â¬.D]Ãæ¥Ð’ */
+	$"3654 3737 A598 21C2 34FF 097C B8B8 5934"            /* 6T77¥˜!Â4ÿÆ|¸¸Y4 */
+	$"C947 05C9 B4BA F52B 99FF 3AFE 6B15 2CAE"            /* ÉG.É´ºõ+™ÿ:þk.,® */
+	$"06CF D962 CCDE D937 D4AE B3D9 7E92 E2AF"            /* .ÏÙbÌÞÙ7Ô®³Ù~’⯠*/
+	$"8F4E 31CE 06E7 0AD8 71DB 4456 7101 E221"            /* �N1Î.çÂØqÛDVq.â! */
+	$"74AC 1159 9EDF 9841 CFA3 E04F DECF 6FD3"            /* t¬.Yžß˜AÏ£àOÞÏoÓ */
+	$"90CC C22F 63B0 45CC C98B 3125 33C0 CFBA"            /* �ÌÂ/c°EÌÉ‹1%3ÀϺ */
+	$"4CE7 3FAD F2E4 85E7 0C74 35A5 97E9 8672"            /* Lç?­òä…ç.t5¥—é†r */
+	$"9180 E059 EF0F C416 E25F 0E83 095A 36AA"            /* ‘€àYï.Ä.â_.ƒÆZ6ª */
+	$"8E74 F1F7 11A8 49DD C47E 5098 D576 DC41"            /* Žtñ÷.¨IÝÄ~P˜ÕvÜA */
+	$"D6FC 7C37 E307 A2DB 997E A046 C114 CF04"            /* Öü|7ã.¢Û™~ FÁ.Ï. */
+	$"FD8E 32D1 2AC6 3A81 C8B6 C680 6E60 7826"            /* ýŽ2Ñ*Æ:�ȶƀn`x& */
+	$"9A40 9C80 BA1B 4DE8 854B 09D9 33B3 95BE"            /* š@œ€º.Mè…KÆÙ3³•¾ */
+	$"7CE5 CCA3 C463 5D1C 1F2B A160 E208 AA0A"            /* |åÌ£Äc]..+¡`â.ªÂ */
+	$"D00F 1933 5FB5 2705 4E9C 3733 0FD0 2AA0"            /* Ð..3_µ'.Nœ73.Ð*  */
+	$"D116 F240 05EA 53BB 5A5A 0A4B 3D9E FCB7"            /* Ñ.ò@.êS»ZZÂK=žü· */
+	$"FE35 1D0B 1E56 C4AA 9B6C 8CE6 10CA DAA5"            /* þ5...VĪ›lŒæ.ÊÚ¥ */
+	$"6DF1 6F74 C332 BD93 556E 89F5 A94A 232D"            /* mñotÃ2½“Un‰õ©J#- */
+	$"E9EF C950 666C 7D3E D1BA C98F 4489 3C5D"            /* éïÉPfl}>ѺÉ�D‰<] */
+	$"F7FC 88D4 C90E EE9D 7691 C976 2CFE 6BA0"            /* ÷üˆÔÉ.î�v‘Év,þk  */
+	$"B53E 5C59 749E FEBC 4AB4 490C A3B6 5187"            /* µ>\Ytžþ¼J´I.£¶Q‡ */
+	$"4A10 1076 6348 AEC1 054B 0A98 9196 29C3"            /* J..vcH®Á.K˜‘–)à */
+	$"F995 50E4 E003 F099 9495 7ECC 1C78 C536"            /* ù•Päà.ð™”•~Ì.xÅ6 */
+	$"AA8D 7305 BE7F FF72 99F7 25ED 4C38 0896"            /* ª�s.¾.ÿr™÷%íL8.– */
+	$"A1BE F2D4 016E B744 CBB7 9CEE 1C88 5E3D"            /* ¡¾òÔ.n·DË·œî.ˆ^= */
+	$"1B9E E3CB 29D2 AAA7 C3F6 41F4 B6C0 5861"            /* .žãË)Òª§ÃöAô¶ÀXa */
+	$"93D3 4773 858E 3470 E670 4F94 E206 FBA3"            /* “ÓGs…Ž4pæpO”â.û£ */
+	$"7050 2A3D 6DC0 004E 32D7 6043 4E5E C44F"            /* pP*=mÀ.N2×`CN^ÄO */
+	$"284A 3214 97B7 19DE 41C4 6204 56CB 1695"            /* (J2.—·.ÞAÄb.VË.• */
+	$"BAD8 C308 0FFE BEB7 FE14 C6AC CEE8 5022"            /* ºØÃ..þ¾·þ.ƬÎèP" */
+	$"C27A 2CCA 4714 4C52 3975 615D A1C8 62BF"            /* Âz,ÊG.LR9ua]¡Èb¿ */
+	$"C477 FF7E 2637 3B89 8C43 6E09 285B 2D1A"            /* Äwÿ~&7;‰ŒCnÆ([-. */
+	$"8E9E 4110 CE7B E30A E21C A140 02C8 D0AD"            /* ŽžA.Î{ãÂâ.¡@.ÈЭ */
+	$"630B 5488 7CE7 B884 393A 6FDD 5A68 7FB9"            /* c.Tˆ|縄9:oÝZh.¹ */
+	$"60EC C73B 143E 3F61 3E31 1A3E 8438 7944"            /* `ìÇ;.>?a>1.>„8yD */
+	$"B652 14AE 63CA 803C 9B67 C6FE 2F5D 4CD0"            /* ¶R.®cÊ€<›gÆþ/]LÐ */
+	$"3A63 1328 8809 A4AB B4A1 8664 FE90 F03E"            /* :c.(ˆÆ¤«´¡†dþ�ð> */
+	$"18E2 7982 7DDC A444 1306 4546 61B2 A710"            /* .ây‚}ܤD..EFa²§. */
+	$"CCED 529C 92CB D547 22F5 0DB0 B10F 8450"            /* ÌíRœ’ËÕG"õ.°±.„P */
+	$"E5AC 253A 6937 BFBD D0C6 8AED 14C7 787E"            /* å¬%:i7¿½ÐÆŠí.Çx~ */
+	$"21E7 860D 8567 633D A9E6 0466 93A5 6789"            /* !ç†.…gc=©æ.f“¥g‰ */
+	$"D643 2EEE 7542 7B02 086A 83C4 AD3C 785C"            /* ÖC.îuB{..jƒÄ­<x\ */
+	$"E3B4 BFC0 C27C 3762 1D98 0A0C B43D 8107"            /* ã´¿ÀÂ|7b.˜Â.´=�. */
+	$"3003 FF74 C626 1BC1 44AA 08A0 7A68 0ADE"            /* 0.ÿtÆ&.ÁDª. zhÂÞ */
+	$"E9BD 94DB 3644 AA13 CFCA A9CB 0E8F 9061"            /* é½”Û6Dª.ÏÊ©Ë.��a */
+	$"73BC 6A23 359D C129 F184 4EBA BE0F A772"            /* s¼j#5�Á)ñ„Nº¾.§r */
+	$"9AB6 7DDC C179 81DB 9FDC EDA3 E6C5 21E2"            /* š¶}ÜÁy�ÛŸÜí£æÅ!â */
+	$"7049 87BC 00E3 34F5 8066 3FFE 7CA7 A588"            /* pI‡¼.ã4õ€f?þ|§¥ˆ */
+	$"6277 30DE 8FC1 950A A652 5B12 B0A4 B8BE"            /* bw0Þ�Á•Â¦R[.°¤¸¾ */
+	$"2297 4261 CB90 AEBB F3CB 2BEE 2FA8 149E"            /* "—BaË�®»óË+î/¨.ž */
+	$"11E6 487B 3EFA 45B9 E4A8 17DF DF8E D5FF"            /* .æH{>úE¹ä¨.ßߎÕÿ */
+	$"750C 2E52 4F3F 5960 B3B7 3DEB CFE3 4EC3"            /* u..RO?Y`³·=ëÏãNà */
+	$"676F D76A F8C3 67EB 383B 042A C000 1CF5"            /* go×jøÃgë8;.*À..õ */
+	$"FB57 51DF 4E0F 9709 4A58 F371 8A53 79CD"            /* ûWQßN.—ÆJXóqŠSyÍ */
+	$"B935 29C8 5953 BBFB B216 24F0 FF5C F1BE"            /* ¹5)ÈYS»û².$ðÿ\ñ¾ */
+	$"1649 C9BE 754A CC45 62C3 44A2 3E12 A872"            /* .IɾuJÌEbÃD¢>.¨r */
+	$"736B 05DD F77C C7C6 F33D 8224 147E D163"            /* sk.Ý÷|ÇÆó=‚$.~Ñc */
+	$"02B4 0BC6 297A FA75 03A7 BFDD 709A A878"            /* .´.Æ)zúu.§¿Ýpš¨x */
+	$"734A 7236 791A BFF6 9F21 CC67 268D 160D"            /* sJr6y.¿öŸ!Ìg&�.. */
+	$"A6D0 7988 72CF 6475 146C 81EB 8249 518A"            /* ¦ÐyˆrÏdu.l�ë‚IQŠ */
+	$"49B7 0389 FDB6 9CEB DCA2 41ED 085D 4E85"            /* I·.‰ý¶œëÜ¢Aí.]N… */
+	$"03E4 3F4E D8CF 25E1 658D 38F6 8F88 A499"            /* .ä?NØÏ%áe�8ö�ˆ¤™ */
+	$"B64A DD79 FDF2 39FB 5CEC F29B 714A 733B"            /* ¶JÝyýò9û\ìò›qJs; */
+	$"76E4 94E5 F567 3A71 28F0 13A6 7A74 CD91"            /* vä”åõg:q(ð.¦ztÍ‘ */
+	$"5804 065E D3C7 09B7 ED19 51E5 0913 4436"            /* X..^ÓÇÆ·í.QåÆ.D6 */
+	$"9791 BB58 10F3 7183 5DB6 4874 65D2 AAD2"            /* —‘»X.óqƒ]¶HteÒªÒ */
+	$"DBA2 C761 A70F 3EEE 9256 2EF0 945D E52D"            /* Û¢Ça§.>î’V.ð”]å- */
+	$"34CF 10DF B2AF 8E14 A5A4 E24F 0051 F63E"            /* 4Ï.ß²¯Ž.¥¤âO.Qö> */
+	$"F11C 5DAC 6D8D DEDD A585 96FC A2AB A5FF"            /* ñ.]¬m�ÞÝ¥…–ü¢«¥ÿ */
+	$"5298 6349 DB41 9276 C1C6 F1E2 9ABF 822B"            /* R˜cIÛA’vÁÆñâš¿‚+ */
+	$"346F 8679 726C 666A 9638 246A EABE 54A9"            /* 4o†yrlfj–8$jê¾T© */
+	$"49DD F22A BC62 5867 51F2 FDBD B33B 40E0"            /* IÝò*¼bXgQòý½³;@à */
+	$"220F 075D 031C EAAE 3CDE 67CF 2269 E26D"            /* "..]..ê®<ÞgÏ"iâm */
+	$"BEF3 1873 E610 D43E 8F03 A14F F04F 980B"            /* ¾ó.sæ.Ô>�.¡OðO˜. */
+	$"69FF 1E4A 1925 DDE6 B473 84B5 6F53 75DD"            /* iÿ.J.%Ýæ´s„µoSuÝ */
+	$"CF71 C4C0 72DC 5403 7E7B 1A9B 6F16 BA87"            /* ÏqÄÀrÜT.~{.›o.º‡ */
+	$"A44D D4A2 8029 E15A 8C17 BE55 A30B 87B3"            /* ¤MÔ¢€)áZŒ.¾U£.‡³ */
+	$"DC5B CED9 2E4C A8F3 939B 6F82 8885 9BD5"            /* Ü[ÎÙ.L¨ó“›o‚ˆ…›Õ */
+	$"905B 6EE2 E3C9 D45E DE91 DD46 7EDD 23BB"            /* �[nâãÉÔ^Þ‘ÝF~Ý#» */
+	$"6852 2BD3 3D31 2755 2D1B 7431 35EB 6CBD"            /* hR+Ó=1'U-.t15ël½ */
+	$"638C 9E5D F0EB 9AE0 49BC D327 7536 BCB3"            /* cŒž]ðëšàI¼Ó'u6¼³ */
+	$"65F1 992B E073 9D25 980D A244 7F9E 749F"            /* eñ™+às�%˜.¢D.žtŸ */
+	$"53BD D08A C5EF 64A2 D672 7A55 9146 5CAD"            /* S½ÐŠÅïd¢ÖrzU‘F\­ */
+	$"7839 E1B6 7543 4556 146E C347 33E3 2798"            /* x9á¶uCEV.nÃG3ã'˜ */
+	$"4752 6F78 AAA5 AE5E 7B02 CD92 D5F1 FD30"            /* GRoxª¥®^{.Í’Õñý0 */
+	$"F78A 7BFB 03AB CF34 58BF 3810 B8A7 CDAB"            /* ÷Š{û.«Ï4X¿8.¸§Í« */
+	$"A573 658E 260A 7C50 000F 00AC D13F 618E"            /* ¥seŽ&Â|P...¬Ñ?aŽ */
+	$"A241 9458 3945 9D59 3F9B 13C5 04CC 600E"            /* ¢A”X9E�Y?›.Å.Ì`. */
+	$"FC51 8C8D FBA0 4150 5832 4539 730B 4631"            /* üQŒ�û APX2E9s.F1 */
+	$"0598 EE14 817C B560 97C5 B953 64D4 980D"            /* .˜î.�|µ`—ŹSdÔ˜. */
+	$"C379 6FFF 3E63 6746 7BE8 D3AB 5215 B47F"            /* Ãyoÿ>cgF{èÓ«R.´. */
+	$"3CAE 42E4 D4BF B7BF 6580 3319 6A71 C2E9"            /* <®BäÔ¿·¿e€3.jqÂé */
+	$"48AA 2C5E 9D78 B9C3 F8DA B858 D5AB 99F4"            /* Hª,^�x¹ÃøÚ¸XÕ«™ô */
+	$"B04F EAAC D0DE 2302 F874 7E64 A69B 89CE"            /* °Oê¬ÐÞ#.øt~d¦›‰Î */
+	$"AEAB A73F F815 0D06 B24E 39EC D8E9 EFB7"            /* ®«§?ø...²N9ìØéï· */
+	$"ED32 55A0 8E21 B52A E55C 17AE E07B 42F4"            /* í2U Ž!µ*å\.®à{Bô */
+	$"D451 CB7C E941 1578 3EE3 9565 087E 9A05"            /* ÔQË|éA.x>ã•e.~š. */
+	$"B5FC 403A AAA2 25CE 5AC1 B658 1EE9 9A53"            /* µü@:ª¢%ÎZÁ¶X.éšS */
+	$"4000 51DF 95E8 C605 97AC C7E1 A8B1 F86C"            /* @.Qß•èÆ.—¬Çᨱøl */
+	$"7C3F 0BCC E410 8FA7 78C0 7964 BDD0 E341"            /* |?.Ìä.�§xÀyd½ÐãA */
+	$"5DC5 D977 EF99 460C FC48 A51A B5CD DE47"            /* ]ÅÙwï™F.üH¥.µÍÞG */
+	$"F9E2 194D 1F2D B2B6 556B 0F68 BD1B 5BEA"            /* ùâ.M.-²¶Uk.h½.[ê */
+	$"9FDD 1280 92A3 EF96 132C 22F6 CA8A 1C20"            /* ŸÝ.€’£ï–.,"öÊŠ.  */
+	$"54DA F163 6119 BC02 7AE6 10CA A16B 993A"            /* TÚñca.¼.zæ.Ê¡k™: */
+	$"E22B CC58 D181 40E6 EA99 0897 5166 4C1F"            /* â+ÌXÑ�@æê™.—QfL. */
+	$"6D58 D092 5119 1AF5 0C2B 1DC6 029D F0E8"            /* mXÐ’Q..õ.+.Æ.�ðè */
+	$"1F6F 9F5C 17D8 68A0 F600 5C68 5C16 4269"            /* .oŸ\.Øh ö.\h\.Bi */
+	$"F5A9 4D97 32DE 3A9C 6609 86C2 1D0F BA56"            /* õ©M—2Þ:œfƆÂ..ºV */
+	$"3C8C 1046 E0DC 2ECB 9BDB D61E 6955 CE38"            /* <Œ.FàÜ.Ë›ÛÖ.iUÎ8 */
+	$"DB97 859B 9E73 78BF FDEB ED74 0C4E 4203"            /* Û—…›žsx¿ýëít.NB. */
+	$"431D 69C4 635D D1EA 1A9A 6462 BE48 DDB9"            /* C.iÄc]Ñê.šdb¾Hݹ */
+	$"6E63 C4D8 8886 51CB 19E6 A7C9 5941 8443"            /* ncÄ؈†QË.æ§ÉYA„C */
+	$"57E5 8C3B B907 FF17 4B41 08DA 7AFC 1B8B"            /* WåŒ;¹.ÿ.KA.Úzü.‹ */
+	$"9B05 622E 1F81 91D8 2C60 9C6A 3B23 608B"            /* ›.b..�‘Ø,`œj;#`‹ */
+	$"F2EC E527 70F9 D963 D302 D7AC 18E2 2692"            /* òìå'pùÙcÓ.׬.â&’ */
+	$"AE0C D915 7E30 5B09 305C 8F5D 1346 3FF2"            /* ®.Ù.~0[Æ0\�].F?ò */
+	$"8635 ECEC 1CB7 962D 0846 3FA9 5920 C1B0"            /* †5ìì.·–-.F?©Y Á° */
+	$"5582 FF3A 24E0 FAAE 8FAE 3843 DFCF B74F"            /* U‚ÿ:$àú®�®8CßÏ·O */
+	$"CAEC 5602 D1C5 1760 5ECD 92C8 1DD1 4ABE"            /* ÊìV.ÑÅ.`^Í’È.ÑJ¾ */
+	$"2336 8A90 E444 6753 D3E0 0F02 8E99 7393"            /* #6Š�äDgSÓà..Ž™s“ */
+	$"8B26 6C9F BFB4 64DE 7867 73F7 10F0 477A"            /* ‹&lŸ¿´dÞxgs÷.ðGz */
+	$"8383 ADA5 49C3 722B 1FD7 0BB5 4118 4714"            /* ƒƒ­¥IÃr+.×.µA.G. */
+	$"D5F9 6C20 CDD0 8151 EAB4 457F FF4E 314C"            /* Õùl ÍÐ�Qê´E.ÿN1L */
+	$"6E7F 04DB DE0C 611B 62AC 2A4E 869C 06FB"            /* n..ÛÞ.a.b¬*N†œ.û */
+	$"DB81 F238 C4FC 149E 8176 3F0C 4B83 0DFF"            /* Û�ò8Äü.ž�v?.Kƒ.ÿ */
+	$"7FB4 A5F5 80C7 E4F0 47AD 8D3F 5426 B12A"            /* .´¥õ€ÇäðG­�?T&±* */
+	$"8678 11E1 A0EF 5439 31D8 E97E 3AE9 E4DD"            /* †x.á ïT91Øé~:éäÝ */
+	$"3DB7 4A94 7FFF 7135 0C02 ACE2 70F5 626B"            /* =·J”.ÿq5..¬âpõbk */
+	$"271A 4401 DF00 AE70 E43B D3F8 75AD 0DAB"            /* '.D.ß.®pä;Óøu­.« */
+	$"794A C0C7 928F 8621 BE61 DA60 A89F 8E95"            /* yJÀÇ’�†!¾aÚ`¨ŸŽ• */
+	$"64E1 4B82 9CA5 D1CB 26FA 3B49 2FDF 8007"            /* dáK‚œ¥ÑË&ú;I/߀. */
+	$"60B1 1C23 B192 973E 87DD 9323 E697 CA76"            /* `±.#±’—>‡Ý“#æ—Êv */
+	$"03D6 B09A 33FA 5CEC 856D 1D12 5249 2492"            /* .Ö°š3ú\ì…m..RI$’ */
+	$"4924 9249 2492 4924 9231 8B0A C6C2 C882"            /* I$’I$’I$’1‹ÂÆÂÈ‚ */
+	$"FC66 E59C E646 38B0 B26F A097 FEA2 30FE"            /* üfåœæF8°²o —þ¢0þ */
+	$"F5B9 90DC 3FEF 3116 73C4 7B20 6C09 EA40"            /* õ¹�Ü?ï1.sÄ{ lÆê@ */
+	$"AB90 6257 8BAD 951C 002E 138D 7274 121D"            /* «�bW‹­•....�rt.. */
+	$"B91E 66F5 6038 8257 FD9A 18C9 0155 522C"            /* ¹.fõ`8‚Wýš.É.UR, */
+	$"D6CC 0F6A 6A4A 09F3 0C4A B702 47FF 7FFC"            /* ÖÌ.jjJÆó.J·.Gÿ.ü */
+	$"B504 0034 6682 CE19 CA7C 50BE F8B0 9DCB"            /* µ..4f‚Î.Ê|P¾ø°�Ë */
+	$"0092 4924 9248 F298 B4D2 A612 6CEE 878F"            /* .’I$’Hò˜´Ò¦.lî‡� */
+	$"FF7F FF5F 8F59 B3E0 FE9F A74E 506D C924"            /* ÿ.ÿ_�Y³àþŸ§NPmÉ$ */
+	$"9249 2492 4924 9249 2492 4924 924D 57A2"            /* ’I$’I$’I$’I$’MW¢ */
+	$"2CC8 426C 393A 96E4 50FB 0ACE 8874 7A86"            /* ,ÈBl9:–äPûÂΈtz† */
+	$"2B20 84D4 0F34 1532 DFF0 D633 0231 0F65"            /* + „Ô.4.2ßðÖ3.1.e */
+	$"91D1 8E19 A917 CD2A 8D35 89BE F64E D1A8"            /* ‘ÑŽ.©.Í*�5‰¾öNѨ */
+	$"926C AE06 3A49 80F9 C1FE 0E81 52D8 5A8C"            /* ’l®.:I€ùÁþ.�RØZŒ */
+	$"7A00 5EF2 9F04 3659 74EC D695 94B6 5B90"            /* z.^òŸ.6YtìÖ•”¶[� */
+	$"89C0 E661 DFC4 5E69 965B 4D1D 4B76 7C0E"            /* ‰ÀæaßÄ^i–[M.Kv|. */
+	$"89D2 C1E8 B1EF CF9E 5E96 3977 AEA6 532B"            /* ‰ÒÁè±ïÏž^–9w®¦S+ */
+	$"68B1 BD73 2BE6 BB5B 766E FA91 5C36 628C"            /* h±½s+æ»[vnú‘\6bŒ */
+	$"F45F FEEA C7DF 49F0 278F F459 E9B6 BDAC"            /* ô_þêÇßIð'�ôY鶽¬ */
+	$"1A28 F485 45C5 2761 DC37 C72A 8A17 2D08"            /* .(ô…EÅ'aÜ7Ç*Š.-. */
+	$"5130 E9D5 E1BD 2D59 07B5 2290 00F9 F737"            /* Q0éÕá½-Y.µ"�.ù÷7 */
+	$"C1F4 5C78 1058 C4C6 13AB AE5C 45DE ACB4"            /* Áô\x.XÄÆ.«®\EÞ¬´ */
+	$"7DC9 03C4 0F82 7850 6F9E 5FD3 9223 36FE"            /* }É.Ä.‚xPož_Ó’#6þ */
+	$"8A1D 1D99 FBB3 646B 206B FC7E 668E 4730"            /* Š..™û³dk kü~fŽG0 */
+	$"7C8C 79D9 A37A 427B 1E91 E7A1 DED2 E57D"            /* |ŒyÙ£zB{.‘ç¡ÞÒå} */
+	$"E167 967A 8B9F A6C0 A36F 68E8 D03C 84C6"            /* ág–z‹Ÿ¦À£ohèÐ<„Æ */
+	$"E952 3CAF 039F 18CD 236C 4AE1 FB74 D7F6"            /* éR<¯.Ÿ.Í#lJáût×ö */
+	$"DFBF B7A4 AFDB D27E 2FB7 7BBF 86F0 DF6F"            /* ß¿·¤¯ÛÒ~/·{¿†ðßo */
+	$"4F9F C3A7 EC7F 0D0F BEDB 1EFB 77AA FB77"            /* OŸÃ§ì...¾Û.ûwªûw */
+	$"2CED 1CDE F39E A2F3 567D 91E9 4703 B8A2"            /* ,í.Þóž¢óV}‘éG.¸¢ */
+	$"5006 2494 6271 81F3 3B95 0B89 EDD5 7FE8"            /* P.$”bq�ó;•.‰íÕ.è */
+	$"B864 3D84 75CD 7478 A5D6 28C8 D483 39EF"            /* ¸d=„uÍtx¥Ö(ÈÔƒ9ï */
+	$"86CA 5763 87CA 97CF A9D4 AFA9 0450 6744"            /* †ÊWc‡Ê—Ï©Ô¯©.PgD */
+	$"16E3 8C0B 0015 88DA 5244 1AB2 9790 35B0"            /* .ãŒ...ˆÚRD.²—�5° */
+	$"0489 B911 D871 2BB4 6576 C185 22B7 1F86"            /* .‰¹.Øq+´evÁ…"·.† */
+	$"230A 3CD3 ECB5 20A6 23BA A068 A53E 8EAD"            /* #Â<Óìµ ¦#º h¥>Ž­ */
+	$"3793 46B5 BA07 96A8 DF28 6A66 CE05 73CE"            /* 7“Fµº.–¨ß(jfÎ.sÎ */
+	$"1938 F9A6 9CBC 0D7F F193 E0D5 09CC 3426"            /* .8ù¦œ¼..ñ“àÕÆÌ4& */
+	$"4BB1 52B9 F337 0537 FA01 B010 5471 B015"            /* K±R¹ó7.7ú.°.Tq°. */
+	$"754C A1A6 E071 800C 1A26 243D 172B 1497"            /* uL¡¦àq€..&$=.+.— */
+	$"E5DF 1EB1 6A6C 6761 3BA6 52C0 C0B4 69BD"            /* åß.±jlga;¦RÀÀ´i½ */
+	$"E6B4 275E EB6E 42BF D693 8928 15A4 9DB2"            /* æ´'^ënB¿Ö“‰(.¤�² */
+	$"D8FA E273 6C04 CBB5 06A9 8096 5E97 5D11"            /* Øúâsl.˵.©€–^—]. */
+	$"0B1B 8E93 BDCC 1AE8 4CBA 9413 A729 F6A7"            /* ..Ž“½Ì.èLº”.§)ö§ */
+	$"F24D 467F 0316 BF60 F777 C2E3 7FAA DC07"            /* òMF...¿`÷wÂã.ªÜ. */
+	$"148F 5C26 91C3 20B8 F3A0 9088 F893 6D47"            /* .�\&‘à ¸ó �ˆø“mG */
+	$"7AC1 A0D9 5483 8281 5B98 28AE 9EAB 94F0"            /* zÁ ÙTƒ‚�[˜(®ž«”ð */
+	$"9B68 08E3 E3DA 7E3A AA84 9EED F083 117F"            /* ›h.ããÚ~:ª„žíðƒ.. */
+	$"FE75 781E E394 EEEC F9AC 21D6 FF5E DD57"            /* þux.ã”îìù¬!Öÿ^ÝW */
+	$"96CF A7DF 3C0D 7E2F F9E7 F212 83EE E629"            /* –ϧß<.~/ùçò.ƒîæ) */
+	$"9543 AA61 C10A 4B12 1DD8 6835 405A D739"            /* •CªaÁÂK..Øh5@Z×9 */
+	$"DBD7 1628 2816 909D 1DEB 81F2 16AF 8953"            /* Û×.((.��.ë�ò.¯‰S */
+	$"9239 B79D A64A 3275 E506 BFD3 0198 776C"            /* ’9·�¦J2uå.¿Ó.˜wl */
+	$"F4C2 39CD 4CF8 2482 D781 526A 7D82 0B83"            /* ôÂ9ÍLø$‚×�Rj}‚.ƒ */
+	$"120C B2AB 1FC0 2DAA 4A72 ACD9 B4C7 926A"            /* ..²«.À-ªJr¬Ù´Ç’j */
+	$"CE69 46FA C67E 904D 12D4 D6EC 2F77 AC43"            /* ÎiFúÆ~�M.ÔÖì/w¬C */
+	$"0A82 A09A 8FAC 59F0 D192 4F8F E6D1 A8B3"            /* ‚ š�¬YðÑ’O�æѨ³ */
+	$"26FD EAD1 7727 E253 F826 580D 8786 8EAD"            /* &ýêÑw'âSø&X.‡†Ž­ */
+	$"4561 33FC 6C93 72E4 3F53 3E92 5E78 9597"            /* Ea3ül“rä?S>’^x•— */
+	$"895F 61B9 D382 514D 839E D4E8 A40B 6F99"            /* ‰_a¹Ó‚QMƒžÔè¤.o™ */
+	$"0BEC 889F F976 6F24 AEAC 2A18 479B 9CD0"            /* .숟ùvo$®¬*.G›œÐ */
+	$"A58D E4A8 4940 D7A9 26A7 8649 C387 22EB"            /* ¥�ä¨I@ש&§†IÇ"ë */
+	$"10F3 AB7F 805D 57F4 6918 508A 429D FC32"            /* .ó«.€]Wôi.PŠB�ü2 */
+	$"0E49 3480 E5A6 0267 54A6 D677 422D 1B62"            /* .I4€å¦.gT¦ÖwB-.b */
+	$"4DFB C3A4 2E01 8C0D 029D D238 87B0 230E"            /* Mûä..Œ..�Ò8‡°#. */
+	$"AB6E AEFD 64F3 F7AE 7BD7 DA13 2BCC DCFB"            /* «n®ýdó÷®{×Ú.+ÌÜû */
+	$"13EC E7EE A36F 86C6 A2D8 DD70 6174 04FA"            /* .ìçî£o†Æ¢ØÝpat.ú */
+	$"B7F7 A3BF 9C4C F99C C177 9B27 9148 3998"            /* ·÷£¿œLùœÁw›'‘H9˜ */
+	$"013A 4B0C E3A5 6905 6ADC 739C 3586 7009"            /* .:K.ã¥i.jÜsœ5†pÆ */
+	$"38DA 0496 C25E DFB2 F2AB 34C0 F138 4F81"            /* 8Ú.–Â^ß²ò«4Àñ8O� */
+	$"7240 2774 4588 B153 267B DBBE DFDE AEAD"            /* r@'tEˆ±S&{Û¾ßÞ®­ */
+	$"1D90 BA71 2B83 D108 1CDB 8B36 7837 8AAA"            /* .�ºq+ƒÑ..Û‹6x7Šª */
+	$"299C 2916 D66C CC2E 2FCF B0E3 228A 88C1"            /* )œ).ÖlÌ./Ï°ã"ŠˆÁ */
+	$"568F 12D8 D599 AB3F 29DE 1FA6 9336 132F"            /* V�.ØÕ™«?)Þ.¦“6./ */
+	$"521E 8EB9 9BD4 30E4 362E 349E 209A 6EB6"            /* R.Ž¹›Ô0ä6.4ž šn¶ */
+	$"D5CC 985B E51E 8A74 B9A0 1718 2753 A1E0"            /* Õ̘[å.Št¹ ..'S¡à */
+	$"BDCC 77CC 5697 641D B916 AB08 C12F 102F"            /* ½ÌwÌV—d.¹.«.Á/./ */
+	$"59A0 4283 27A8 9F9E 1980 381A 4785 E896"            /* Y Bƒ'¨Ÿž.€8.G…è– */
+	$"B9C8 A383 0C1E EBDE A8DC D1A0 00FB 61C2"            /* ¹È£ƒ..ëÞ¨ÜÑ .ûa */
+	$"70F1 84C8 8368 337E DA6C 7A1A 014F 77C3"            /* pñ„ȃh3~Úlz..Owà */
+	$"EFFF 0CCC F88E E539 B4FF 3187 54EA 4B2E"            /* ïÿ.ÌøŽå9´ÿ1‡TêK. */
+	$"27BF 1121 0DCD 456F 5AB4 E115 9E30 8B1C"            /* '¿.!.ÍEoZ´á.ž0‹. */
+	$"FCFB 8634 E35F E3F0 2A65 8EC0 775F C0EE"            /* üû†4ã_ãð*eŽÀw_Àî */
+	$"37B2 6C5A AA44 2B7C 889A 5854 FBB4 DC29"            /* 7²lZªD+|ˆšXTû´Ü) */
+	$"E875 94AB D4F4 19C2 5989 594D 6B55 CB5E"            /* èu”«Ôô.ÂY‰YMkUË^ */
+	$"012C A350 BF1C 322E 6DC6 6CFB 052A B48D"            /* .,£P¿.2.mÆlû.*´� */
+	$"2FFE D908 D443 2FB2 706F 13A8 B2BF 2E97"            /* /þÙ.ÔC/²po.¨²¿.— */
+	$"D7EF 6FE2 7D0B 4D6C 89E6 24BB D547 A266"            /* ×ïoâ}.Ml‰æ$»ÕG¢f */
+	$"3B92 FF58 BE83 0D95 D587 B51D B83A B360"            /* ;’ÿX¾ƒ.•Õ‡µ.¸:³` */
+	$"DF16 A55F 5D17 5ED7 C7D7 88FD D24B 89C4"            /* ß.¥_].^×Ç׈ýÒK‰Ä */
+	$"17FF 1CE0 2FC5 E332 79FF 6532 D599 2C36"            /* .ÿ.à/Åã2yÿe2Õ™,6 */
+	$"7360 56F2 6017 1165 F8CD AC09 6435 530F"            /* s`Vò`..eøͬÆd5S. */
+	$"8E48 0152 06AE 7F31 9D5A A12E EC4A 26BD"            /* ŽH.R.®.1�Z¡.ìJ&½ */
+	$"1D28 2D81 EBF2 625A 03C8 8240 FAB0 343C"            /* .(-�ëòbZ.È‚@ú°4< */
+	$"3460 4650 A369 CBAF D533 EC55 DB4D 46F7"            /* 4`FP£i˯Õ3ìUÛMF÷ */
+	$"45C4 1B75 581D CC26 9E29 8B0F C424 5512"            /* EÄ.uX.Ì&ž)‹.Ä$U. */
+	$"9417 F11C 77C1 F3FD 57B1 487F D8F8 A086"            /* ”.ñ.wÁóýW±H.Øø † */
+	$"E60E 2356 E9E1 F3EC 7F31 52E1 E3DB C75E"            /* æ.#Véáóì.1RáãÛÇ^ */
+	$"7A4B 2D19 8F06 AB86 5A88 F23D C312 C565"            /* zK-.�.«†Zˆò=Ã.Åe */
+	$"1AF0 4B35 F0D9 D100 6634 A377 90C1 A69A"            /* .ðK5ðÙÑ.f4£w�Á¦š */
+	$"1C64 495A BEF2 5A5C 1714 0504 2639 71A2"            /* .dIZ¾òZ\....&9q¢ */
+	$"5989 FF6E F887 5ADD 9843 A719 60CC 5185"            /* Y‰ÿnø‡ZݘC§.`ÌQ… */
+	$"B308 2551 F63A 7543 2A92 3949 FCC5 5023"            /* ³.%Qö:uC*’9IüÅP# */
+	$"5A92 FE32 A26E FF00 9CFC 0CFF 4A08 60C7"            /* Z’þ2¢nÿ.œü.ÿJ.`Ç */
+	$"F76C 480A E682 3C58 66B8 7045 CDBA 616C"            /* ÷lHÂæ‚<Xf¸pEͺal */
+	$"9995 BEC1 809B 0892 A7EC 43EC 7FE8 F49F"            /* ™•¾Á€›.’§ìCì.èôŸ */
+	$"9E4B AFD6 66BB 0B88 38ED B165 9C1D F096"            /* žK¯Öf».ˆ8í±eœ.ð– */
+	$"64EC FD43 9A7A BC84 8CEF 2E65 F99B 4B43"            /* dìýCšz¼„Œï.eù›KC */
+	$"7D47 3AE8 D0DB A066 308B 201D FF3F ABC1"            /* }G:èÐÛ f0‹ .ÿ?«Á */
+	$"CD0D B822 3734 A23E AF05 D1E1 F9F5 AF09"            /* Í.¸"74¢>¯.Ñáùõ¯Æ */
+	$"6428 F517 1201 C3F1 1B80 0DD2 DCD9 CA31"            /* d(õ...Ãñ.€.ÒÜÙÊ1 */
+	$"B022 DAFB D990 A8B1 6FF1 004E 4847 E5C8"            /* °"ÚûÙ�¨±oñ.NHGåÈ */
+	$"0580 DA86 704F E2FF 7E83 5167 5C3F ADB2"            /* .€Ú†pOâÿ~ƒQg\?­² */
+	$"4C44 A9D9 DB84 C360 68ED 1BF0 068E 04BF"            /* LD©ÙÛ„Ã`hí.ð.Ž.¿ */
+	$"D16E B55F 0701 3739 42FA E15C 0EA2 BF81"            /* Ñnµ_..79Búá\.¢¿� */
+	$"31C1 F1A3 A766 CAB8 C82E C96B 4868 D491"            /* 1Áñ£§fʸÈ.ÉkHhÔ‘ */
+	$"5ACB 6EED 4027 0C73 AACA 730C ECA6 DE42"            /* ZËní@'.sªÊs.ì¦ÞB */
+	$"38DA E07E CE64 BC49 7FDD FCCB 07B3 45BF"            /* 8Úà~Îd¼I.ÝüË.³E¿ */
+	$"B9DC FF13 039F D40E 43BB ACE4 B8F8 31F5"            /* ¹Üÿ..ŸÔ.C»¬ä¸ø1õ */
+	$"6743 9390 0B87 C9B1 194A 0200 FB53 29CD"            /* gC“�.‡É±.J..ûS)Í */
+	$"3141 15F5 3C38 9F70 2B7E 0E46 B5A7 5C94"            /* 1A.õ<8Ÿp+~.Fµ§\” */
+	$"AED4 E415 1639 7B49 20DA 1541 9742 A3A6"            /* ®Ôä..9{I Ú.A—B£¦ */
+	$"B873 4C7C 9112 1322 7D7F 5F6E 14AB 57FC"            /* ¸sL|‘.."}._n.«Wü */
+	$"A01D 94EC BC05 F45B C4C4 1FC3 D61B F5D3"            /*  .”ì¼.ô[ÄÄ.ÃÖ.õÓ */
+	$"0E62 9C2F CAE6 C609 B0D2 803B AF5F CC7F"            /* .bœ/ÊæÆÆ°Ò€;¯_Ì. */
+	$"4085 5B49 F81B 0AB3 DB0C 27C1 7A95 45D6"            /* @…[Iø.³Û.'Áz•EÖ */
+	$"CDDD 4F06 1A20 A7FE 22F6 EA13 EB6E C723"            /* ÍÝO.. §þ"öê.ënÇ# */
+	$"87B9 A058 CAF9 9F59 C9C9 6AAD 8358 5147"            /* ‡¹ XÊùŸYÉÉj­ƒXQG */
+	$"2B3E 2FD8 506F A48B 305C 97C7 5D25 5C75"            /* +>/ØPo¤‹0\—Ç]%\u */
+	$"C5B1 E7B4 CBC7 C76A 2FE5 1669 302C 2318"            /* űç´ËÇÇj/å.i0,#. */
+	$"CB1D BB38 5B47 3563 F041 0F00 C23A B1E9"            /* Ë.»8[G5cðA..Â:±é */
+	$"1972 D9C9 2F2F 4013 F8EF A6CA 7E8E 705C"            /* .rÙÉ//@.øï¦Ê~Žp\ */
+	$"0CB6 1301 5ED4 25E6 F7D9 999D AB8F 4CAC"            /* .¶..^Ô%æ÷Ù™�«�L¬ */
+	$"6FF2 04C8 8307 016C 6E46 645B 5488 79C0"            /* oò.ȃ..lnFd[TˆyÀ */
+	$"C0E5 8A2A 46EB DB4C 65A0 27FC 6230 781C"            /* ÀåŠ*FëÛLe 'üb0x. */
+	$"EDB8 4666 1604 1937 9603 A2AA D8C3 43A6"            /* í¸Ff...7–.¢ªØÃC¦ */
+	$"E254 D745 866F D24A DD91 397E C575 F187"            /* âT×E†oÒJÝ‘9~Åuñ‡ */
+	$"193B F5F5 819B 7D57 EC83 0871 ED1B 64F6"            /* .;õõ�›}Wìƒ.qí.dö */
+	$"E47A E1B0 65F9 67DF 5680 3642 52AA BB4B"            /* äzá°eùgßV€6BRª»K */
+	$"BA52 D8BA 8AF7 0A96 412A 92B2 045F 9739"            /* ºRغŠ÷–A*’²._—9 */
+	$"3A52 D961 6BC6 1D2E D90D 29A7 E9DE 2651"            /* :RÙakÆ..Ù.)§éÞ&Q */
+	$"CE3F 9921 03BC 7A7A CBFD 63E2 4C7C 9025"            /* Î?™!.¼zzËýcâL|�% */
+	$"BCC3 D509 745E 9AE4 1675 0242 26EE E4F6"            /* ¼ÃÕÆt^šä.u.B&îäö */
+	$"B04B CFB3 E37F EADB 2840 E47E 0209 C8C5"            /* °Kϳã.êÛ(@ä~.ÆÈÅ */
+	$"56FC 6228 BB57 F43A BE32 0753 73FB EAE2"            /* Vüb(»Wô:¾2.Ssûêâ */
+	$"55B4 D581 42C8 10B8 AEA9 67C4 F685 982C"            /* U´Õ�BÈ.¸®©gÄö…˜, */
+	$"3104 095F DCBD 3701 8749 9CBA A7A5 B714"            /* 1.Æ_ܽ7.‡Iœº§¥·. */
+	$"FDED FAA3 F034 54D8 728F 8640 4A61 560C"            /* ýíú£ð4TØr�†@JaV. */
+	$"50D4 B224 A5F1 6715 6C8B 7EC6 BF5C 120D"            /* PÔ²$¥ñg.l‹~Æ¿\.. */
+	$"8797 B25E B0E1 C57E 69AF 1FF2 99C3 44B5"            /* ‡—²^°áÅ~i¯.ò™ÃDµ */
+	$"0508 0061 1F44 795F 27C0 511E 0796 9740"            /* ...a.Dy_'ÀQ..–—@ */
+	$"14FF 4C51 5651 34F3 658D 4CA8 3FBF 43CC"            /* .ÿLQVQ4óe�L¨?¿CÌ */
+	$"8813 D372 1723 7DB5 6D44 4524 4E91 B644"            /* ˆ.Ór.#}µmDE$N‘¶D */
+	$"4B7D CDEC E0E0 8468 622D 87FE 80E3 E097"            /* K}Íìàà„hb-‡þ€ãà— */
+	$"303D 8894 1FFF 7FA6 9AAB C6E0 0B83 3EDD"            /* 0=ˆ”.ÿ.¦š«Æà.ƒ>Ý */
+	$"86A5 43D3 C650 0008 D364 A800 0000 0000"            /* †¥CÓÆP..Ód¨..... */
+	$"0000 07D7 8F92 61B9 E6E0 BCBF CD4A AB76"            /* ...×�’a¹æ༿ÍJ«v */
+	$"5B6E 246A 8DFB D274 41F9 3583 773D 5165"            /* [n$j�ûÒtAù5ƒw=Qe */
+	$"2139 B773 476E DF91 33F0 8CDA F420 613F"            /* !9·sGnß‘3ðŒÚô a? */
+	$"9B35 33C9 8298 A661 A5DB 2CEF 1A1C BC3E"            /* ›53É‚˜¦a¥Û,ï..¼> */
+	$"09B4 5415 8511 4FE5 3FF8 B88C 339D C169"            /* Æ´T.….Oå?ø¸Œ3�Ái */
+	$"9608 FF62 B2D6 285A 80A2 22C9 E4AA 5A99"            /* –.ÿb²Ö(Z€¢"ÉäªZ™ */
+	$"B3F5 E9D4 7FFF 7FF4 7D5C 4CC0 788F 0EB6"            /* ³õéÔ.ÿ.ô}\LÀx�.¶ */
+	$"8024 0000 0A1E 1F40 0000 0000 0000 0000"            /* €$..Â..@........ */
+	$"CA54 CF6A 897B B6D7 9C90 87E9 FF6A 22A0"            /* ÊTÏj‰{¶×œ�‡éÿj"  */
+	$"0765 4AE8 B827 B7A1 C412 4000 0000 0000"            /* .eJè¸'·¡Ä.@..... */
+	$"0000 2222 DAB7 AEED C4EB AFCB FF79 6610"            /* ..""Ú·®íÄë¯Ëÿyf. */
+	$"A362 D5F2 1401 DA9F 8978 3FC3 FF60 341C"            /* £bÕò..ÚŸ‰x?Ãÿ`4. */
+	$"524C CBF3 AF64 9BA4 637F F217 CA8C A4CE"            /* RLËó¯d›¤c.ò.ÊŒ¤Î */
+	$"A881 46DE C63F CB0B 4C86 F71C CDFF 6CDC"            /* ¨�FÞÆ?Ë.L†÷.ÍÿlÜ */
+	$"3C86 AFD6 02EF 25B3 E392 0238 14ED F9FF"            /* <†¯Ö.ï%³ã’.8.íùÿ */
+	$"71EA 1A7B 7848 281D C18D 83C1 F0D1 C115"            /* qê.{xH(.Á�ƒÁðÑÁ. */
+	$"C525 7E38 9E60 32A4 CED2 A5DE 8006 1212"            /* Å%~8ž`2¤ÎÒ¥Þ€... */
+	$"7136 14A1 74D1 9C7D F74C 708E 43DE 4154"            /* q6.¡tÑœ}÷LpŽCÞAT */
+	$"2939 179A 87BB 2AAF 7401 4404 CB30 458F"            /* )9.š‡»*¯t.D.Ë0E� */
+	$"F1B7 EE42 3E46 458F B220 6F30 EE24 7D86"            /* ñ·îB>FE�² o0î$}† */
+	$"2D28 3CA7 C184 60D3 4EBC 9C79 C402 02FC"            /* -(<§Á„`ÓN¼œyÄ..ü */
+	$"553C C62D DDC0 3D0C F12B C1FF 546D A4FF"            /* U<Æ-ÝÀ=.ñ+ÁÿTm¤ÿ */
+	$"5885 6B1B 9EF6 2206 8FB5 1CB0 2D3D B922"            /* X…k.žö".�µ.°-=¹" */
+	$"644F D104 0152 70F8 BF41 4D6E 4F05 B928"            /* dOÑ..Rpø¿AMnO.¹( */
+	$"396A 4A92 9B1B 24AB 4611 6D95 87D6 2D7C"            /* 9jJ’›.$«F.m•‡Ö-| */
+	$"7546 B839 A3B1 C612 0F2A 796E 7911 5FF9"            /* uF¸9£±Æ..*yny._ù */
+	$"03C4 D13E EF00 2DEF 9CFE FDDE 3A2C FF3E"            /* .ÄÑ>ï.-ïœþýÞ:,ÿ> */
+	$"4567 F432 3673 3F84 8787 B65C 7A4F 2007"            /* Egô26s?„‡‡¶\zO . */
+	$"FF7C D894 A762 3872 8FA4 9563 D178 5039"            /* ÿ|Ø”§b8r�¤•cÑxP9 */
+	$"C4BD 2EB4 0491 2A80 0000 0000 0000 0001"            /* Ľ.´.‘*€........ */
+	$"F172 6FA1 09F2 9F35 F3BC 2E0B 8E46 2557"            /* ñro¡ÆòŸ5ó¼..ŽF%W */
+	$"67C5 4F12 D1CF F08C BC61 0F89 E4A4 9249"            /* gÅO.ÑÏðŒ¼a.‰ä¤’I */
+	$"2492 4924 9249 221B 4708 65ED 84CA FDD2"            /* $’I$’I".G.eí„ÊýÒ */
+	$"D193 7C69 0CA3 95EF DDF2 33FF 556E D976"            /* Ñ“|i.£•ïÝò3ÿUnÙv */
+	$"2E4D FDCE E0FC 8669 83FF 768E 3CBB 179B"            /* .MýÎàü†iƒÿvŽ<».› */
+	$"DBB9 253D BFFF 79F1 5006 27BF 5548 40B9"            /* Û¹%=¿ÿyñP.'¿UH@¹ */
+	$"BADC F963 10BA 8BD9 367F E03A 6E29 5908"            /* ºÜùc.º‹Ù6.à:n)Y. */
+	$"0000 0000 0000 0000 0028 8080 0000 000A"            /* .........(€€... */
+	$"6370 D000 0142 83C0 0000 0011 CD3F D940"            /* cpÐ..BƒÀ....Í?Ù@ */
+	$"0022 C990 C912 501C 14FC 1926 5412 0E88"            /* ."É�É.P..ü.&T..ˆ */
+	$"C32F B2ED E7A4 9249 2492 4924 9249 247E"            /* Ã/²í礒I$’I$’I$~ */
+	$"FB2C 999E D2ED 6DFF 783B 4C3A 3DB7 14A5"            /* û,™žÒímÿx;L:=·.¥ */
+	$"872C 2B85 8FC2 72EA 3412 FCA8 32E0 7A2E"            /* ‡,+…�Ârê4.ü¨2àz. */
+	$"B109 F66C 3F99 7C32 2761 1522 7B9C 1851"            /* ±Æöl?™|2'a."{œ.Q */
+	$"B3CB 5373 0652 CE79 D8C5 B721 03D7 CD81"            /* ³ËSs.RÎyØÅ·!.×Í� */
+	$"A03A CD5F CECF B58A 4122 7ED2 9FFF 7FFF"            /*  :Í_ÎϵŠA"~ÒŸÿ.ÿ */
+	$"1575 DF0B 430B 0A6C 6108 B421 B33F E9FA"            /* .uß.C.Âla.´!³?éú */
+	$"AC06 391C EB01 17F4 3BF4 4CDA 87DA 516F"            /* ¬.9.ë..ô;ôLÚ‡ÚQo */
+	$"EFA3 E7F9 651A 6902 C269 AF79 2EA4 D861"            /* ï£çùe.i.Âi¯y.¤Øa */
+	$"CBC1 7F37 146D 4163 38BB B16B AAD4 9AC2"            /* ËÁ.7.mAc8»±kªÔšÂ */
+	$"424A B3CE 1368 78EF B4B0 FE68 2FBA 0CB2"            /* BJ³Î.hxï´°þh/º.² */
+	$"E672 A89D 999E 64CD 417A 98A3 8458 0603"            /* ær¨�™ždÍAz˜£„X.. */
+	$"C03D 9F9E B15E 8418 0FC6 F3E0 BA39 A3C1"            /* À=Ÿž±^„..Æóàº9£Á */
+	$"9929 0547 9C29 FC76 57CA B1E5 F887 AE73"            /* ™).Gœ)üvWʱåø‡®s */
+	$"78AA BA9F FF7F C07C 00F0 28E9 7533 0FC1"            /* xªºŸÿ.À|.ð(éu3.Á */
+	$"097C 4ABC F3CB 6604 EEC2 5194 A1F2 A201"            /* Æ|J¼óËf.îÂQ”¡ò¢. */
+	$"D6B0 C5F3 4AA3 8FD8 34DC A382 0CD4 134E"            /* Ö°ÅóJ£�Ø4Ü£‚.Ô.N */
+	$"8275 37F5 2388 74C6 1A6C F889 1037 A348"            /* ‚u7õ#ˆtÆ.lø‰.7£H */
+	$"ACB4 EFF5 B446 564C C6DC 75F7 8445 013F"            /* ¬´ïõ´FVLÆÜu÷„E.? */
+	$"79FF 407B 05EE 9C66 8A53 FF7A 367A 6D06"            /* yÿ@{.îœfŠSÿz6zm. */
+	$"9ADF CBDD 25B5 0629 78A0 A071 35BA EE49"            /* šßËÝ%µ.)x  q5ºîI */
+	$"64E9 3EA3 9A07 917A 66E3 090C B916 3BF5"            /* dé>£š.‘zfãÆ.¹.;õ */
+	$"10D7 77D5 7281 248E 3F09 0C0F 319E 7F71"            /* .×wÕr�$Ž?Æ..1ž.q */
+	$"98DA A34A C823 06A4 6BFD 8EA1 8C71 EB25"            /* ˜Ú£JÈ#.¤kýŽ¡Œqë% */
+	$"E5FC 0BA1 DB35 9514 A229 56F0 7E42 9FD0"            /* åü.¡Û5•.¢)Vð~BŸÐ */
+	$"5435 3CB7 AED9 0A4F 625B A493 D1B2 C654"            /* T5<·®ÙÂOb[¤“ѲÆT */
+	$"F691 87F9 F8E9 7459 1823 E06B 57D6 C638"            /* ö‘‡ùøétY.#àkWÖÆ8 */
+	$"7EE2 8CA0 1D79 4000 0000 0000 0000 0000"            /* ~⌠.y@......... */
+	$"0000 0000 442A 0D8C 8522 4E1A 3752 5040"            /* ....D*.Œ…"N.7RP@ */
+	$"E53D EE69 0B70 A6BF 9D0D D725 D66E 8D50"            /* å=îi.p¦¿�.×%Ön�P */
+	$"10DB 966B 649B 0CA3 958B 6457 90CC 214A"            /* .Û–kd›.£•‹dW�Ì!J */
+	$"C4C0 27A2 95F4 98AD 14C2 1892 EBE7 864B"            /* ÄÀ'¢•ô˜­.Â.’ëç†K */
+	$"18AA 55C7 50D2 4A15 7F4E 566A 9C13 9C52"            /* .ªUÇPÒJ..NVjœ.œR */
+	$"AC77 FE86 B3A2 5D92 D112 516C BA99 60EE"            /* ¬wþ†³¢]’Ñ.Qlº™`î */
+	$"221A F194 D9DF FF5F FF6B 77F9 4B01 4F8F"            /* ".ñ”Ùßÿ_ÿkwùK.O� */
+	$"F681 8614 2F3E 31E3 EABB 7C34 6025 A491"            /* ö�†./>1ãê»|4`%¤‘ */
+	$"9BC1 A348 628D 34AE 751A F8F7 7521 7F48"            /* ›Á£Hb�4®u.ø÷u!.H */
+	$"68A4 6B9C F66F 252D 6021 9C97 39AB B637"            /* h¤kœöo%-`!œ—9«¶7 */
+	$"3B5D E8FB 56EE 824A F65D C84D E23C 7BF2"            /* ;]èûVî‚Jö]ÈMâ<{ò */
+	$"5400 0000 0000 0000 0000 0000 0014 080D"            /* T............... */
+	$"B05B 4688 1F60 376D 2209 1DE1 7E75 CD30"            /* °[Fˆ.`7m"Æ.á~uÍ0 */
+	$"5D2F 627B A077 8D86 2001 62AF 1031 6853"            /* ]/b{ w�† .b¯.1hS */
+	$"2A8E 0308 16F6 C4EC E5B6 814A 1DF2 23EB"            /* *Ž...öÄìå¶�J.ò#ë */
+	$"8C16 64F9 A1ED 8A1F 346E 2E1C 5ACB 4376"            /* Œ.dù¡íŠ.4n..ZËCv */
+	$"5014 B885 5212 5294 8F4F DF56 7339 8A5D"            /* P.¸…R.R”�OßVs9Š] */
+	$"03C0 A05F D60B 5D58 2677 CD67 A4EE 3803"            /* .À _Ö.]X&wÍg¤î8. */
+	$"B2B1 9AD5 A41A C3EF 3281 3FFF 780A A5BD"            /* ²±šÕ¤.Ãï2�?ÿxÂ¥½ */
+	$"861B 62F7 456F 1021 93CD A115 BD61 7E4C"            /* †.b÷Eo.!“Í¡.½a~L */
+	$"2306 D6BF D5D9 18AF 12BB 22D9 E32E 6976"            /* #.Ö¿ÕÙ.¯.»"Ùã.iv */
+	$"9282 5E47 A842 7983 2C87 64C5 6215 A0D9"            /* ’‚^G¨Byƒ,‡dÅb. Ù */
+	$"E45A EFAE 74F3 E5E5 7679 A7C0 D366 649C"            /* äZï®tóååvy§ÀÓfdœ */
+	$"9EF3 D763 2D6C D0AD 48E5 7A2A 9454 8B34"            /* žó×c-lЭHåz*”T‹4 */
+	$"B7FF 7FCD F604 90E4 2716 1C40 DD8A 8B1A"            /* ·ÿ.Íö.�ä'..@ÝŠ‹. */
+	$"24C8 2F0C 06AC 999A 58B7 C15E E6B1 431B"            /* $È/..¬™šX·Á^æ±C. */
+	$"73D1 FEC5 5182 4A2D 33CB E920 AFBE 9F5A"            /* sÑþÅQ‚J-3Ëé ¯¾ŸZ */
+	$"0478 C2F3 80D7 241A 2E07 8BF3 FD3F 471A"            /* .xÂó€×$...‹óý?G. */
+	$"7C53 1C79 2F17 C32F D5C6 B977 E2F9 9D80"            /* |S.y/.Ã/Õƹwâù�€ */
+	$"558B 7336 75BC 5945 3986 BD1C CE95 EA07"            /* U‹s6u¼YE9†½.Εê. */
+	$"7152 C778 65AD 73E9 F1B7 24D4 BDB0 7F24"            /* qRÇxe­séñ·$Ô½°.$ */
+	$"BACD 3C51 D344 33D7 21C7 BE9A 915D 2808"            /* ºÍ<QÓD3×!Ǿš‘](. */
+	$"3E68 3F1B 43AE 8F30 CE7F FF67 1C78 8498"            /* >h?.C®�0Î.ÿg.x„˜ */
+	$"08D8 E1D9 3F1A E50B EB7C E564 6F4C 57F3"            /* .ØáÙ?.å.ë|ådoLWó */
+	$"9E60 5F9B 244E 83A9 33C9 668A 3951 7E33"            /* ž`_›$Nƒ©3ÉfŠ9Q~3 */
+	$"31D7 01E7 0342 6BC0 7FD1 7488 2BE1 9AD1"            /* 1×.ç.BkÀ.Ñtˆ+ášÑ */
+	$"1938 BBD8 7710 BAD3 BB92 2C80 A162 B2EF"            /* .8»Øw.ºÓ»’,€¡b²ï */
+	$"3FEA 6FC2 47D2 0D0E 28AB 03DA 4B34 4027"            /* ?êoÂGÒ..(«.ÚK4@' */
+	$"7FFD 87BC 9D96 E076 3C00 0000 0000 0000"            /* .ý‡¼�–àv<....... */
+	$"0000 0000 0000 136C 1721 95F0 1991 3F80"            /* .......l.!•ð.‘?€ */
+	$"65DC 1F3F AEA0 BE5C 71D2 94CE C7FF 7FFF"            /* eÜ.?® ¾\qÒ”ÎÇÿ.ÿ */
+	$"7917 BEAD D458 935A 563C CC9C 6C0D CFFF"            /* y.¾­ÔX“ZV<Ìœl.Ïÿ */
+	$"55DA 93C2 F199 3D1E C4C2 3C5F A7BC D48E"            /* UÚ“Âñ™=.ÄÂ<_§¼ÔŽ */
+	$"4980 037B 9FCC F7BC 6E1E 78CD 2838 DC58"            /* I€.{ŸÌ÷¼n.xÍ(8ÜX */
+	$"F156 C827 88EA BFF7 BD95 BBD6 FE11 C305"            /* ñVÈ'ˆê¿÷½•»Öþ.Ã. */
+	$"A1D2 FA2A EA0B E56B 285B 91FE 551E F5E2"            /* ¡Òú*ê.åk([‘þU.õâ */
+	$"687C 5A51 1A67 64D3 BD76 4937 F455 4C94"            /* h|ZQ.gdÓ½vI7ôUL” */
+	$"6A7E B888 CB40 7AA3 DDEE 8BD8 2D9F 1EB6"            /* j~¸ˆË@z£Ýî‹Ø-Ÿ.¶ */
+	$"48DF 9C66 6BF3 A26A 3CC4 2D4D E47A 6D9A"            /* Hßœfkó¢j<Ä-Mäzmš */
+	$"DAB1 1DA4 083A D994 4416 C0D2 2E63 539E"            /* Ú±.¤.:Ù”D.ÀÒ.cSž */
+	$"7274 3C04 85F4 D7B5 EDEF 507A B2B7 1832"            /* rt<.…ô×µíïPz²·.2 */
+	$"6615 A186 4A80 0000 0000 0000 0000 0000"            /* f.¡†J€.......... */
+	$"07CF BF6C 3626 7453 BF7D 8B57 26C9 F556"            /* .Ï¿l6&tS¿}‹W&ÉõV */
+	$"1F12 0BB9 5DC4 797D 3C69 7DB2 2FFF 7F33"            /* ...¹]Äy}<i}²/ÿ.3 */
+	$"81FC E4ED 4BF8 9180 3FD2 0142 3F2D 1DF0"            /* �üäíKø‘€?Ò.B?-.ð */
+	$"097B D61C 019A C409 B506 26FC D55D 7AE9"            /* Æ{Ö..šÄƵ.&üÕ]zé */
+	$"3464 6C57 13E7 565F 2553 70C3 3EC7 87AC"            /* 4dlW.çV_%SpÃ>LJ¬ */
+	$"3161 5289 3A6A FC0B E254 CAFA 6A32 2F8C"            /* 1aR‰:jü.âTÊúj2/Œ */
+	$"8B76 FA87 DADD 0333 2250 0058 F5C6 21CD"            /* ‹vú‡ÚÝ.3"P.XõÆ!Í */
+	$"D094 5CD5 10DD 2FA0 B74B 06FB AA9B 2B62"            /* Д\Õ.Ý/ ·K.ûª›+b */
+	$"E36D 708E B8F5 0739 3097 7F03 47BE 48F5"            /* ãmpŽ¸õ.90—..G¾Hõ */
+	$"D079 1641 CA5D DF28 C92B 0EFA B18F CE6F"            /* Ðy.AÊ]ß(É+.ú±�Îo */
+	$"6648 DB26 DE5C 1D17 2BD3 28AF DD89 801C"            /* fHÛ&Þ\..+Ó(¯Ý‰€. */
+	$"AB0D 40D1 9016 D542 63A0 8222 9D7A F0F5"            /* «.@Ñ�.ÕBc ‚"�zðõ */
+	$"A171 2D28 3D2C C22E 09AB 3AA9 C50B 7545"            /* ¡q-(=,Â.Æ«:©Å.uE */
+	$"4C64 18E8 8E67 3A7D DDBE 36CE 2F97 5AD0"            /* Ld.èŽg:}ݾ6Î/—ZÐ */
+	$"E4F0 8AFB 6071 6268 E5F6 09EA 245F 9F87"            /* äðŠû`qbhåöÆê$_Ÿ‡ */
+	$"E304 242C 234C 9FF7 1D0A 11C7 4FE7 20BC"            /* ã.$,#LŸ÷.Â.ÇOç ¼ */
+	$"EC58 1A4B 5A8E DE45 0E5F 4A03 4C8A 5051"            /* ìX.KZŽÞE._J.LŠPQ */
+	$"E410 4405 321B BD82 AC69 94F7 AA5E 5C65"            /* ä.D.2.½‚¬i”÷ª^\e */
+	$"436F 861A C95F 1AB0 2E2B 9689 AA43 B247"            /* Co†.É_.°.+–‰ªC²G */
+	$"6DE3 4E9E F205 F221 D175 86BB 4434 C0EE"            /* mãNžò.ò!Ñu†»D4Àî */
+	$"C472 EA2B 499D 63FA B4C8 FAB3 91F3 060D"            /* Ärê+I�cú´Èú³‘ó.. */
+	$"C203 A636 1D98 6B00 D678 0D3C BE92 309E"            /* Â.¦6.˜k.Öx.<¾’0ž */
+	$"759A 11D4 B514 24FB E4D2 7089 76DE 42DD"            /* uš.Ôµ.$ûäÒp‰vÞBÝ */
+	$"5338 4798 5943 4A6B 500A 472E 77BE AEBD"            /* S8G˜YCJkPÂG.w¾®½ */
+	$"93B0 117A 0E2D A8E4 DFED 5A76 1775 2BFF"            /* “°.z.-¨äßíZv.u+ÿ */
+	$"1A84 CBE1 B007 D3EA 11B0 9BB8 4B3F BB56"            /* .„Ëá°.Óê.°›¸K?»V */
+	$"33F6 B242 4C5C A63D 638F 1BA5 0AC5 698D"            /* 3ö²BL\¦=c�.¥ÂÅi� */
+	$"45B3 D343 D769 FEEE C45D 50B0 9AAA 4146"            /* E³ÓC×iþîÄ]P°šªAF */
+	$"0BFA F8CC 694B A42D FC1E C3F1 54F0 D3F9"            /* .úøÌiK¤-ü.ÃñTðÓù */
+	$"F051 5182 D373 5210 38AA F9B0 D3F3 6B07"            /* ðQQ‚ÓsR.8ªù°Óók. */
+	$"C944 7FCA 2126 D17A 01B1 7763 CDE8 D5FF"            /* ÉD.Ê!&Ñz.±wcÍèÕÿ */
+	$"00F4 08D7 4060 339C D8E2 7EA4 B00D 3171"            /* .ô.×@`3œØâ~¤°.1q */
+	$"ABB0 7F47 D146 13B9 398E 14B3 C55D 10AF"            /* «°.GÑF.¹9Ž.³Å].¯ */
+	$"8D0A 2444 26A0 EFEA 6CB2 51FD EA28 0FD7"            /* �Â$D& ïêl²Qýê(.× */
+	$"4E2F F54F 0066 62F2 66F3 334C 5D9D 77ED"            /* N/õO.fbòfó3L]�wí */
+	$"F3D0 12ED 7A95 89A1 B928 8429 DCFB 8C68"            /* óÐ.íz•‰¡¹(„)ÜûŒh */
+	$"C35C 3C77 5D7D 5180 A012 ADA3 AE60 AAE0"            /* Ã\<w]}Q€ .­£®`ªà */
+	$"0D88 09A4 4F7B FAC4 A2FD 327D E109 4F0B"            /* .ˆÆ¤O{úÄ¢ý2}áÆO. */
+	$"3343 C0ED D985 7402 93E2 7A2E 09B4 09A6"            /* 3CÀíÙ…t.“âz.ƴƦ */
+	$"5348 2E51 C037 BE62 C1A7 15C4 B9C8 7F4B"            /* SH.QÀ7¾bÁ§.ĹÈ.K */
+	$"FC22 3596 D989 C701 6701 5488 1001 22B2"            /* ü"5–Ù‰Ç.g.Tˆ.."² */
+	$"C06A A5D5 2C94 6BA9 D1C6 2B33 5910 8B1F"            /* Àj¥Õ,”k©ÑÆ+3Y.‹. */
+	$"0B0D 5531 BE0F 3E72 9C60 75A8 2669 220D"            /* ..U1¾.>rœ`u¨&i". */
+	$"E140 D538 7CD4 5763 D708 6D5E 45C0 AE61"            /* á@Õ8|ÔWc×.m^EÀ®a */
+	$"EC8B E180 1D9C 712C 4DB9 F177 6733 0F76"            /* ì‹á€.œq,M¹ñwg3.v */
+	$"9A72 7AD0 D18D 2BE6 9DCE 6294 4092 CE8E"            /* šrzÐÑ�+æ�Îb”@’ÎŽ */
+	$"ACED 8B00 B050 AE53 C09C 98D6 CFD1 4208"            /* ¬í‹.°P®SÀœ˜ÖÏÑB. */
+	$"DEB2 AF01 5ED7 E1F4 4EAA 0B09 2263 FE09"            /* Þ²¯.^×áôNª.Æ"cþÆ */
+	$"2771 6EB7 9181 1DFE A5DD 9A12 4592 02FD"            /* 'qn·‘�.þ¥Ýš.E’.ý */
+	$"5F2D D4D6 5C15 B454 B07C 9B6A B9F9 AEC2"            /* _-ÔÖ\.´T°|›j¹ù®Â */
+	$"D883 1F5F B9B1 8258 6732 C7E3 5C90 DB16"            /* ؃._¹±‚Xg2Çã\�Û. */
+	$"42EC D875 2B9D FEAF 1FED BD80 261D BAAE"            /* BìØu+�þ¯.í½€&.º® */
+	$"3799 FDC7 DBE5 E769 A11C 3304 5D3B 419C"            /* 7™ýÇÛåçi¡.3.];Aœ */
+	$"5844 E615 EE7A 5DCE 272E D055 121D 1F84"            /* XDæ.îz]Î'.ÐU...„ */
+	$"2EC6 E6B1 A7DA D03A D600 6D58 4FF0 9196"            /* .Æ汧ÚÐ:Ö.mXOð‘– */
+	$"FBCA CDDC 1B8D 9D1A BB7B 3782 0F3F 626C"            /* ûÊÍÜ.��.»{7‚.?bl */
+	$"26AA AF34 6A20 8210 1E96 ED21 5A26 EF04"            /* &ª¯4j ‚..–í!Z&ï. */
+	$"5F66 5C2D A8A4 F3BC 1871 AD1D FE4D 8C8B"            /* _f\-¨¤ó¼.q­.þMŒ‹ */
+	$"F1E5 A382 654B 08C7 EFC4 BFBA C29B 5C73"            /* ñ壂eK.ÇïÄ¿ºÂ›\s */
+	$"2420 9390 3B75 6DE6 0208 6F4F BB53 B2AA"            /* $ “�;umæ..oO»S²ª */
+	$"AD28 4360 1A8A 4301 088C 6F17 68CC 9180"            /* ­(C`.ŠC..Œo.hÌ‘€ */
+	$"D757 7012 3BE3 C4AB DF05 97B9 4B57 B6FC"            /* ×Wp.;ãÄ«ß.—¹KW¶ü */
+	$"7693 36DE 89E8 E2AB 4352 A782 4520 DA28"            /* v“6Þ‰èâ«CR§‚E Ú( */
+	$"F1F2 34D6 2EAE E401 ED61 1E2E 4E74 D4EB"            /* ñò4Ö.®ä.ía..NtÔë */
+	$"98A9 94AD F856 8EE1 E3D0 06FC AA37 31E5"            /* ˜©”­øVŽáãÐ.üª71å */
+	$"1047 113E C151 CE86 B6A4 0F82 E5D9 CE50"            /* .G.>ÁQΆ¶¤.‚åÙÎP */
+	$"57A8 8F86 AFAD 21D1 2C4C F181 8BD7 106C"            /* W¨�†¯­!Ñ,Lñ�‹×.l */
+	$"3C77 649E 038E 3C63 66F4 EE1A 2906 755C"            /* <wdž.Ž<cfôî.).u\ */
+	$"EDD8 6093 6868 531C 9FA3 C5C9 3F3C 7786"            /* íØ`“hhS.Ÿ£ÅÉ?<w† */
+	$"BCC4 440C 13F9 0BCB 76BA 9364 A3CC 344F"            /* ¼ÄD..ù.Ëvº“d£Ì4O */
+	$"128B D594 CB9D A2DC 6C03 CA48 2D9E 9706"            /* .‹Õ”Ë�¢Ül.ÊH-ž—. */
+	$"A281 5170 A91B 0033 4552 2A9A BF6F D4A9"            /* ¢�Qp©..3ER*š¿oÔ© */
+	$"61B6 F6C1 7959 FDD2 8F3F C94B 2B90 29BB"            /* a¶öÁyYýÒ�?ÉK+�)» */
+	$"9FAA A83B FEFF 80A3 1EC2 B2D9 77CF 963B"            /* Ÿª¨;þÿ€£.²ÙwÏ–; */
+	$"85FF 5728 5CDD 2F01 7556 8155 F8AA 7984"            /* …ÿW(\Ý/.uV�Uøªy„ */
+	$"7543 0C18 A1FC 0353 DF5F D368 41E9 E0EF"            /* uC..¡ü.Sß_ÓhAéàï */
+	$"C363 A78F 3FE9 41E9 5F77 19A4 A811 FF43"            /* Ãc§�?éAé_w.¤¨.ÿC */
+	$"8EE8 3FBA 00FA 54F6 15F5 CF3B 39A6 0984"            /* Žè?º.úTö.õÏ;9¦Æ„ */
+	$"CC99 7AE1 8E5B 71A9 1575 DB95 F166 D52F"            /* Ì™záŽ[q©.uÛ•ñfÕ/ */
+	$"A270 08D4 9515 3B89 2EA1 A097 12A3 B4E9"            /* ¢p.Ô•.;‰.¡ —.£´é */
+	$"5BFB AE47 8FD7 60F0 33DA E91B 234B 5D2F"            /* [û®G�×`ð3Úé.#K]/ */
+	$"7C4B 00C2 60F1 7260 B78A 1835 B440 611B"            /* |K.Â`ñr`·Š.5´@a. */
+	$"042D F768 F9C9 8785 50AD 8421 77D4 B97A"            /* .-÷hùɇ…P­„!wÔ¹z */
+	$"6B02 828C E758 8B31 1E92 DF7F BE67 3DAB"            /* k.‚ŒçX‹1.’ß.¾g=« */
+	$"E5F8 F1FB FD8C 34F4 4B2F 98BF 24A9 4DF2"            /* åøñûýŒ4ôK/˜¿$©Mò */
+	$"32A9 A661 B01E F960 12E1 9C18 F197 CEA7"            /* 2©¦a°.ù`.áœ.ñ—Χ */
+	$"E1C4 4AB4 7CEB 2CE2 33F3 C23C F3FD 2CF9"            /* áÄJ´|ë,â3óÂ<óý,ù */
+	$"F132 8395 3D39 FD9D 983D 4454 9758 856B"            /* ñ2ƒ•=9ý�˜=DT—X…k */
+	$"6556 B234 72B0 C2CA 71CA 9CEB 7AE4 FD7C"            /* eV²4r°ÂÊqÊœëzäý| */
+	$"0E3F 1930 6B17 7074 C216 3D9C 24BF 5B97"            /* .?.0k.ptÂ.=œ$¿[— */
+	$"A7EA 25F0 9DCC AFA5 BBEF 47E9 D7E6 7B0E"            /* §ê%ð�̯¥»ïGé×æ{. */
+	$"E02F 87A2 EF87 68FC 9BF7 F274 5F00 FC3D"            /* à/‡¢ï‡hü›÷òt_.ü= */
+	$"A5F8 7AC7 F0FA A5F8 7D42 C03F 0F42 FE1D"            /* ¥øzÇðú¥ø}BÀ?.Bþ. */
+	$"ABF0 F7CF E1EE 40ED 1CBC E67A C7C3 33E9"            /* «ð÷Ïáî@í.¼æzÇÃ3é */
+	$"75CE 6202 697A FF68 B299 C0A6 2F39 4F64"            /* uÎb.izÿh²™À¦/9Od */
+	$"6775 1459 6387 68C9 941E E328 B150 8D7C"            /* gu.Yc‡hÉ”.ã(±P�| */
+	$"24C4 D953 4443 9A50 E4CC 4E41 B3A9 F28A"            /* $ÄÙSDCšPäÌNA³©òŠ */
+	$"BB0E 943C 0DAB C98A 023C 332B AE2D AF60"            /* ».”<.«ÉŠ.<3+®-¯` */
+	$"4D30 BA77 9D1A 93DC CEBB 7560 EA33 084C"            /* M0ºw�.“Üλu`ê3.L */
+	$"BCFD 2F47 685E 4CC9 8A76 F1C8 04AB 126F"            /* ¼ý/Gh^LÉŠvñÈ.«.o */
+	$"B9FD 4A34 E181 4147 9F56 2AB4 EB2C 50EF"            /* ¹ýJ4á�AGŸV*´ë,Pï */
+	$"D652 4543 763B B857 210B 2B4A BB50 0EAE"            /* ÖRECv;¸W!.+J»P.® */
+	$"90BD EEEC F92B DD18 0881 9B3A C6DF A028"            /* �½îìù+Ý..�›:Æß ( */
+	$"45EB 36D7 50B4 D756 FB49 9F08 D74D 037B"            /* Eë6×P´×VûIŸ.×M.{ */
+	$"83A1 001C 0977 1DCC 81D0 B6B9 828A 6851"            /* ƒ¡..Æw.Ì�ж¹‚ŠhQ */
+	$"3CAC B3FF 572B 543A 4C73 3F35 0561 EC81"            /* <¬³ÿW+T:Ls?5.aì� */
+	$"A8D4 82BC 9148 5E30 FF3E 3164 C43E 5461"            /* ¨Ô‚¼‘H^0ÿ>1dÄ>Ta */
+	$"4BD0 139E 6390 0E05 4793 56B8 5080 CBF6"            /* KÐ.žc�..G“V¸P€Ëö */
+	$"9E70 BEA1 FB26 DD1E AEE1 E78D 0D32 FA02"            /* žp¾¡û&Ý.®áç�.2ú. */
+	$"43FC FBC6 7464 2C9A 14AD 2C7C 0969 995F"            /* CüûÆtd,š.­,|Æi™_ */
+	$"6363 3037 9C34 C5F8 42DF B339 D2B0 5C45"            /* cc07œ4ÅøBß³9Ò°\E */
+	$"6130 509D 28E7 D3A7 9308 74ED 9265 B7F9"            /* a0P�(çÓ§“.tí’e·ù */
+	$"0F54 D265 33D9 EB57 07C4 852B E3C8 771F"            /* .TÒe3ÙëW.Ä…+ãÈw. */
+	$"21F8 ADA3 D807 625C 513A E395 604B 0D6A"            /* !ø­£Ø.b\Q:ã•`K.j */
+	$"A9FC 297E 63AF 7622 23B6 63E1 EF25 F572"            /* ©ü)~c¯v"#¶cáï%õr */
+	$"01B0 400D 18C6 C9FA 6AF5 3E26 4199 6E68"            /* .°@..ÆÉújõ>&A™nh */
+	$"99B5 B3A9 F861 3419 C6C7 B65C D0F6 353B"            /* ™µ³©øa4.ÆǶ\Ðö5; */
+	$"6551 1B0A 9D82 1F07 4185 8C46 5867 DC22"            /* eQ.Â�‚..A…ŒFXgÜ" */
+	$"BD38 AFF7 27BA 1114 9266 5EF4 1EA9 89B4"            /* ½8¯÷'º..’f^ô.©‰´ */
+	$"A634 E917 65E5 502E 8028 D24E 725F 0C22"            /* ¦4é.eåP.€(ÒNr_." */
+	$"1513 7B38 5FEA 3150 520B 6D8A 03D8 F796"            /* ..{8_ê1PR.mŠ.Ø÷– */
+	$"D183 D8FA 82E2 C147 B662 593B 9FC8 A2A0"            /* уØú‚âÁG¶bY;ŸÈ¢  */
+	$"C63B D151 D905 072C 02E5 919B 0BE9 6D76"            /* Æ;ÑQÙ..,.å‘›.émv */
+	$"4BEF 7D51 FF67 C2F2 BB61 DDD2 7981 0B7E"            /* Kï}QÿgÂò»aÝÒy�.~ */
+	$"D406 3679 DFA4 FAE3 A33C 28AC 06C6 93C1"            /* Ô.6yߤúã£<(¬.Æ“Á */
+	$"B82F 53DB 1EB8 A6F3 5A24 A44A 1A76 9204"            /* ¸/SÛ.¸¦óZ$¤J.v’. */
+	$"6543 FC80 18DA 3C5D 395B 01DC D7E8 C21E"            /* eCü€.Ú<]9[.Ü×èÂ. */
+	$"A66C 9AE3 08D6 DBFC EE95 9E73 F71D 7CCA"            /* ¦lšã.ÖÛüî•žs÷.|Ê */
+	$"2A6A F6D2 11D9 AC28 BEDE 8E1B 65EF A995"            /* *jöÒ.Ù¬(¾ÞŽ.eï©• */
+	$"F7B5 B19D 5F63 F42B D0AD D69A BD47 1EED"            /* ÷µ±�_cô+Э֚½G.í */
+	$"2E5C 0276 3AEA F6D9 6E3F 314C 7F5F 52C3"            /* .\.v:êöÙn?1L._RÃ */
+	$"093D C8A9 23E4 C154 5587 294A 98A9 0643"            /* Æ=È©#äÁTU‡)J˜©.C */
+	$"AF18 0D20 51A4 6FE1 F326 11E7 5A91 2919"            /* ¯.. Q¤oáó&.çZ‘). */
+	$"DD53 B13B 2CB3 DE77 FAB9 420E BAFB 305B"            /* ÝS±;,³Þwú¹B.ºû0[ */
+	$"E9AB 7A2B 623B 78FE 346D 8BB6 BA40 AE40"            /* é«z+b;xþ4m‹¶º@®@ */
+	$"5B6D 6D53 81A1 076D 7058 E792 E410 3FA7"            /* [mmS�¡.mpXç’ä.?§ */
+	$"AD06 7E2E 5158 D129 9233 6E1D 6B7C C701"            /* ­.~.QXÑ)’3n.k|Ç. */
+	$"D61D 42D8 472F D5E2 2710 0B6C 828A 2352"            /* Ö.BØG/Õâ'..l‚Š#R */
+	$"D400 65FA E227 A938 1832 18CC 2BCE 19A8"            /* Ô.eúâ'©8.2.Ì+Î.¨ */
+	$"773C 3CB1 C6BD D722 8EE1 8AE2 4D4B 97D4"            /* w<<±Æ½×"ŽáŠâMK—Ô */
+	$"1763 37E4 2F93 8578 534E 0BA9 B493 3B80"            /* .c7ä/“…xSN.©´“;€ */
+	$"F018 28BE 2A52 15B2 8499 08A8 005F F028"            /* ð.(¾*R.²„™.¨._ð( */
+	$"ADFD ACEB 238F 922A 75E4 1C65 F2C3 F14B"            /* ­ý¬ë#�’*uä.eòÃñK */
+	$"213D 7263 4A9A 1C80 12BD 5895 0EC8 B955"            /* !=rcJš.€.½X•.ȹU */
+	$"8CD0 FB81 63CF FF7F B545 85DF E201 36A9"            /* ŒÐû�cÏÿ.µE…ßâ.6© */
+	$"E524 1BD6 EDDA 7C33 8CD2 E114 BA93 51E0"            /* å$.ÖíÚ|3ŒÒá.º“Qà */
+	$"A113 A12A FBEA 8570 B5FE E1B6 7963 5B31"            /* ¡.¡*ûê…pµþá¶yc[1 */
+	$"512A 99B1 3A59 E50E C584 DD7F FF7F FF7E"            /* Q*™±:Yå.Å„Ý.ÿ.ÿ~ */
+	$"D3C9 019B 1FBC DB70 2C2A 14A6 E7F1 0147"            /* ÓÉ.›.¼Ûp,*.¦çñ.G */
+	$"5F3A A36C 6F8A 9038 ABD8 EB8F FF7F FE79"            /* _:£loŠ�8«Øë�ÿ.þy */
+	$"6C12 2D6F FD6D F9A0 0392 0E82 0296 3C14"            /* l.-oýmù .’.‚.–<. */
+	$"FEFA 803C A3D4 1049 CF30 E22F 6542 7ABF"            /* þú€<£Ô.IÏ0â/eBz¿ */
+	$"378E 66B2 9091 D396 B953 DCF5 66D3 C5B5"            /* 7Žf²�‘Ó–¹SÜõfÓŵ */
+	$"7719 028C 5C0F F898 00A1 0C1D E181 F9C7"            /* w..Œ\.ø˜.¡..á�ùÇ */
+	$"2E46 06D4 D623 1256 EFAE 89E3 4FFF 7FDD"            /* .F.ÔÖ#.VﮉãOÿ.Ý */
+	$"F00D 4E11 65D5 B8F9 7C0B A045 AC4A 1E42"            /* ð.N.eÕ¸ù|. E¬J.B */
+	$"221C B512 5480 EF2D CB80 A089 3603 2CA1"            /* ".µ.T€ï-Ë€ ‰6.,¡ */
+	$"391C 7925 C817 92E3 8438 C438 08D1 0637"            /* 9.y%È.’ã„8Ä8.Ñ.7 */
+	$"9FCD F4C2 C04C 40BB A484 5043 0C1E 7C85"            /* ŸÍôÂÀL@»¤„PC..|… */
+	$"D7F6 1F6D BFC7 60AA 4D18 A399 9A13 CCD0"            /* ×ö.m¿Ç`ªM.£™š.ÌÐ */
+	$"26DA 3F97 24CB E902 0668 67F7 FE63 7A2E"            /* &Ú?—$Ëé..hg÷þcz. */
+	$"16D6 987F FF7F AFC1 5C35 E63D BA36 6227"            /* .Ö˜.ÿ.¯Á\5æ=º6b' */
+	$"FF7C FD39 8B8B 1A5F 6026 831B 0764 8805"            /* ÿ|ý9‹‹._`&ƒ..dˆ. */
+	$"E40B 0F19 7FFF 7FFC DEBC DD5B 9008 0000"            /* ä....ÿ.üÞ¼Ý[�... */
+	$"0C24 1D44 4641 3BC8 4248 E229 62D2 088D"            /* .$.DFA;ÈBHâ)bÒ.� */
+	$"117F DE8D 0B52 C3FD 1DD9 3823 F138 4C98"            /* ..Þ�.RÃý.Ù8#ñ8L˜ */
+	$"58A8 2683 519C F914 4961 5226 891F F863"            /* X¨&ƒQœù.IaR&‰.øc */
+	$"3FF2 B19F 113D BFEF 9D12 30C6 66BD E2A6"            /* ?ò±Ÿ.=¿ï�.0Æf½â¦ */
+	$"5D8C BE7E BE19 3D8F 03F2 5D26 FF7F FF7E"            /* ]Œ¾~¾.=�.ò]&ÿ.ÿ~ */
+	$"A82B 5E03 E7A8 E8F1 8C4D B6F1 F0E2 FC36"            /* ¨+^.ç¨èñŒM¶ñðâü6 */
+	$"DE7A 2F55 38B1 B436 2E50 7D25 E3F0 82C8"            /* Þz/U8±´6.P}%ãð‚È */
+	$"580F 0D19 C280 415C 2A7F FCD9 C720 E649"            /* X...€A\*.üÙÇ æI */
+	$"4064 2624 04AC 0B71 41FD 3937 8359 4137"            /* @d&$.¬.qAý97ƒYA7 */
+	$"8CA9 B642 C318 BD37 82D3 B786 8217 3252"            /* Œ©¶BÃ.½7‚Ó·†‚.2R */
+	$"44EA 4598 57D2 2F66 957F 39FE D712 F449"            /* DêE˜WÒ/f•.9þ×.ôI */
+	$"213A BEBB B6CC F551 FF7F EB0A AE45 8497"            /* !:¾»¶ÌõQÿ.ë®E„— */
+	$"0F4C FD34 4090 01FE CFC8 51AA C32A 7D95"            /* .Lý4@�.þÏÈQªÃ*}• */
+	$"D414 2609 E22F 1B7D E10E 97BB 05D1 9D04"            /* Ô.&Æâ/.}á.—».Ñ�. */
+	$"0592 9271 0D39 AB59 F165 0D09 549C B4E3"            /* .’’q.9«Yñe.ÆTœ´ã */
+	$"AEE5 555F 00A3 5E0A E4D3 BAFE 1EC6 2FCE"            /* ®åU_.£^ÂäÓºþ.Æ/Î */
+	$"FB04 C9BC 71D8 A42D 2F70 9FE1 EC17 C31D"            /* û.ɼqؤ-/pŸáì.Ã. */
+	$"ECB2 0A82 EFB1 914C F6D2 E54C 5316 B6C4"            /* ì²Â‚ﱑLöÒåLS.¶Ä */
+	$"4FFF 653B FD6E 27A6 9959 244B F458 B35C"            /* Oÿe;ýn'¦™Y$KôX³\ */
+	$"865C EB94 2CD7 7343 B74C C211 8A4D 2A99"            /* †\ë”,×sC·LÂ.ŠM*™ */
+	$"732E 3B43 CEAC C300 A520 924D 6F1F 8295"            /* s.;CάÃ.¥ ’Mo.‚• */
+	$"DF36 1FD4 E8F0 9221 6313 1B33 0C98 2721"            /* ß6.Ôèð’!c..3.˜'! */
+	$"8F55 5BA1 0E46 A755 1D7F A914 458D 9FFF"            /* �U[¡.F§U..©.E�Ÿÿ */
+	$"33CF 4CE3 AFC6 3383 BC4D A7E9 F546 FDCB"            /* 3ÏLã¯Æ3ƒ¼M§éõFýË */
+	$"8276 7778 2BBA EF7C 3677 6251 58C0 9EFF"            /* ‚vwx+ºï|6wbQXÀžÿ */
+	$"526C C883 6CFF 7FFF 7D4C 3F9F BD74 6BE9"            /* Rlȃlÿ.ÿ}L?Ÿ½tké */
+	$"B6EB 9003 823B 235D 6AD9 B382 FC45 F10C"            /* ¶ë�.‚;#]jÙ³‚üEñ. */
+	$"8282 90ED 9D47 E949 FADC 7B04 1C1C 9EF1"            /* ‚‚�í�GéIúÜ{...žñ */
+	$"1ABB 270D 07BE 1943 4E14 70E0 48FF 81EE"            /* .»'..¾.CN.pàHÿ�î */
+	$"CE8A 5AAD 3CE9 090D 3126 F96A AEBA 5853"            /* ΊZ­<éÆ.1&ùj®ºXS */
+	$"D02E ADE8 4614 E2B7 2E7E 3DB6 DE6A 77A8"            /* Ð.­èF.â·.~=¶Þjw¨ */
+	$"48D0 2DBB BAF4 E94C 735D 27D6 87FF 7F80"            /* HÐ-»ºôéLs]'Ö‡ÿ.€ */
+	$"5BCC 3CA6 1168 D9E0 38B4 22B2 2154 02AA"            /* [Ì<¦.hÙà8´"²!T.ª */
+	$"A1FF 6D87 EB2B F3EB 3814 9F74 DEF3 4D86"            /* ¡ÿm‡ë+óë8.ŸtÞóM† */
+	$"ED68 7E75 9E81 1FD9 170B E013 7E4D 97B3"            /* íh~už�.Ù..à.~M—³ */
+	$"51B0 6B2A 42AF EEB4 899B D2A2 6AC9 8EBF"            /* Q°k*B¯î´‰›Ò¢jÉŽ¿ */
+	$"2858 9FFC 5050 3364 8F2D 313E 94A9 5ED5"            /* (XŸüPP3d�-1>”©^Õ */
+	$"6213 E9DD 6FF6 5813 72DA FE40 0F70 06C4"            /* b.éÝoöX.rÚþ@.p.Ä */
+	$"FF7D 053C 3E69 C976 DDFF 02D9 4688 D8D7"            /* ÿ}.<>iÉvÝÿ.ÙFˆØ× */
+	$"8DEF 5187 FCA3 40EE 3167 B6DD 7EE6 42AB"            /* �ïQ‡ü£@î1g¶Ý~æB« */
+	$"B07A DB20 DC1D 7016 631F 8FB0 C83A 9CC2"            /* °zÛ Ü.p.c.�°È:œÂ */
+	$"66B9 304B 74F5 03F7 217C D3E3 6000 ECE6"            /* f¹0Ktõ.÷!|Óã`.ìæ */
+	$"A319 FD9E 4131 7E74 59C6 FB3F 1B51 FE89"            /* £.ýžA1~tYÆû?.Qþ‰ */
+	$"52D3 C845 1BF0 4BFE 3BAE 4940 9830 8E9C"            /* RÓÈE.ðKþ;®I@˜0Žœ */
+	$"F843 F6A2 218E B2E2 8092 8E0E 3889 8137"            /* øCö¢!Ž²â€’Ž.8‰�7 */
+	$"583C 394F CCE6 3D1B 37B8 C9A4 D805 B9E4"            /* X<9OÌæ=.7¸É¤Ø.¹ä */
+	$"A037 E45D 1167 9627 81E0 538C 1B6D EA0E"            /*  7ä].g–'�àSŒ.mê. */
+	$"18CD 8E3C EE0C 5E0C B048 8DD2 C804 CA38"            /* .ÍŽ<î.^.°H�ÒÈ.Ê8 */
+	$"8678 CAA9 5EE1 8B6C E7D9 FDE1 5C14 D52A"            /* †xÊ©^á‹lçÙýá\.Õ* */
+	$"67F3 8A12 F698 857A 5692 1FB3 FF27 FE1B"            /* góŠ.ö˜…zV’.³ÿ'þ. */
+	$"7E31 5D25 B4A2 3647 FF07 064A 4D7B F160"            /* ~1]%´¢6Gÿ..JM{ñ` */
+	$"62D7 81CE 0940 AE5F CAEB F1A6 10C4 CB0E"            /* b×�ÎÆ@®_Êëñ¦.ÄË. */
+	$"3D77 2C40 0146 8C72 B765 F6A9 3047 E748"            /* =w,@.FŒr·eö©0GçH */
+	$"0239 A725 8B4C 56F0 7E86 9A24 53D7 4832"            /* .9§%‹LVð~†š$S×H2 */
+	$"7924 73CB 4431 4977 0487 03FC F1B3 A21C"            /* y$sËD1Iw.‡.üñ³¢. */
+	$"2792 0B05 8183 8348 8EC0 2635 47D9 B51D"            /* '’..�ƒƒHŽÀ&5GÙµ. */
+	$"CE40 1FA4 20C5 93A8 BEB4 B8CD 93D8 A79E"            /* Î@.¤ Å“¨¾´¸Í“اž */
+	$"62C5 846C 964D 0404 BE21 3AA5 9EC3 4450"            /* bÅ„l–M..¾!:¥žÃDP */
+	$"FAEE 938A A428 E4D0 7F1B 46A8 7AEC 97FB"            /* úî“Š¤(äÐ..F¨zì—û */
+	$"1AFF 71DA F26D B5B1 E6F2 66B4 865E 1F12"            /* .ÿqÚòmµ±æòf´†^.. */
+	$"CE0F 3A8A EDF1 6321 BC5A 22D5 D3D6 BE19"            /* Î.:Šíñc!¼Z"ÕÓÖ¾. */
+	$"671A 38C3 11E8 FC9D 93AC 895A 1B84 7C9B"            /* g.8Ã.èü�“¬‰Z.„|› */
+	$"979F 5DC5 BBE6 19A8 5D03 BE83 6FA4 B8F2"            /* —Ÿ]Å»æ.¨].¾ƒo¤¸ò */
+	$"AFCD 8115 B21B C1D5 80B4 5E20 3B19 9E48"            /* ¯Í�.².ÁÕ€´^ ;.žH */
+	$"29C0 68DA F799 EC0D 56B3 7049 5EC1 11CB"            /* )ÀhÚ÷™ì.V³pI^Á.Ë */
+	$"CBAF FA0A 5AF1 22F1 3A4C 6F13 635A C681"            /* ˯úÂZñ"ñ:Lo.cZÆ� */
+	$"06DA 8B44 A35B CF31 9B6F 57E6 AEC2 8D59"            /* .Ú‹D£[Ï1›oWæ®Â�Y */
+	$"1556 A43E A289 74DC C398 B209 31B9 8CD0"            /* .V¤>¢‰tÜزÆ1¹ŒÐ */
+	$"07BE D253 76AB 7D79 4F26 D099 7AE8 E52C"            /* .¾ÒSv«}yO&Йzèå, */
+	$"EA35 D7BB E968 CAA0 5F61 EAE5 E9A1 E903"            /* ê5×»éhÊ _aêåé¡é. */
+	$"100E ED2C 5A66 21E2 1426 BE74 7A19 8C98"            /* ..í,Zf!â.&¾tz.Œ˜ */
+	$"3D67 A4D2 370F C95D 7131 2D31 0971 6022"            /* =g¤Ò7.É]q1-1Æq`" */
+	$"F4F2 359E 1FBD D23A CD94 4467 205E F7B1"            /* ôò5ž.½Ò:Í”Dg ^÷± */
+	$"5D18 EE91 9078 176B ADC2 65EB EECF D1A8"            /* ].î‘�x.k­ÂeëîÏѨ */
+	$"F1B3 B999 E7CC 3079 BD9C 82D8 DF6E 29E0"            /* ñ³¹™çÌ0y½œ‚Øßn)à */
+	$"9502 EC8D 5C13 629B 109E A7C0 F438 6674"            /* •.ì�\.b›.ž§Àô8ft */
+	$"C48B E75A 7CAC 28AE 3E9C 0ECF 9ADF F7BF"            /* Ä‹çZ|¬(®>œ.Ïšß÷¿ */
+	$"C51A E20D 64F1 B1DD C986 0C6F 6BFF 5102"            /* Å.â.dñ±ÝɆ.okÿQ. */
+	$"B233 B826 EBC9 35E2 9799 0A0F E81D 0816"            /* ²3¸&ëÉ5â—™Â.è... */
+	$"E01C B1A8 E4D9 1CCF 7F2E 4DB3 371B 83C0"            /* à.±¨äÙ.Ï..M³7.ƒÀ */
+	$"9DFD A603 83D6 4412 7DCF 2E2F 85D8 8259"            /* �ý¦.ƒÖD.}Ï./…Ø‚Y */
+	$"DC97 798F 2E8A 09F5 C1A7 1E56 55F3 BFD0"            /* Ü—y�.ŠÆõÁ§.VUó¿Ð */
+	$"34CE 311A 98BE C87C 8CCE 6EDF C85C A788"            /* 4Î1.˜¾È|ŒÎnßÈ\§ˆ */
+	$"AA7E 47D5 72AF 1842 5C5F 9D6A C586 CA4C"            /* ª~GÕr¯.B\_�jņÊL */
+	$"34D3 6315 D6CA 0D6D 5B75 6C85 551B E270"            /* 4Óc.ÖÊ.m[ul…U.âp */
+	$"E9DD 6127 C363 1F5A 0AA4 8F55 114F 9ED3"            /* éÝa'Ãc.Z¤�U.OžÓ */
+	$"034E A968 1BF1 513A 2F0D 3E61 612A 15E6"            /* .N©h.ñQ:/.>aa*.æ */
+	$"B89F 1877 F38E 8C96 20C3 1952 A559 62AE"            /* ¸Ÿ.w󎌖 Ã.R¥Yb® */
+	$"20E0 BE7D BF7C FAA3 F56C FF75 6D5E 07E7"            /*  à¾}¿|ú£õlÿum^.ç */
+	$"EB87 E7E9 BFE7 EE37 E7EE B60B E7DA F7CF"            /* ë‡çé¿çî7çî¶.çÚ÷Ï */
+	$"A6FF 2B5C 2F9F AC00 ED1C BCF0 084D B6D5"            /* ¦ÿ+\/Ÿ¬.í.¼ð.M¶Õ */
+	$"A3F8 3A1B 179B 5659 AE02 A536 8D65 B1A0"            /* £ø:..›VY®.¥6�e±  */
+	$"F806 81C6 9453 B9E5 1E84 EF36 3D8C 9922"            /* ø.�Æ”S¹å.„ï6=Œ™" */
+	$"A841 EBC7 584D 175D A8CF 5AE5 52F4 364A"            /* ¨AëÇXM.]¨ÏZåRô6J */
+	$"CACB F4FA 59D1 6C18 1FE0 5F96 0F70 465A"            /* ÊËôúYÑl..à_–.pFZ */
+	$"7CFD 0C37 59FF 6248 10C6 4872 8573 D54E"            /* |ý.7YÿbH.ÆHr…sÕN */
+	$"7839 337E D900 4336 CF58 B59C BCC4 602F"            /* x93~Ù.C6ÏXµœ¼Ä`/ */
+	$"EA1A 205F CD8D 635B AE0D 5750 3316 72C7"            /* ê. _Í�c[®.WP3.rÇ */
+	$"A765 C2F2 CF8C 52FB 1892 F55E B7A5 6D85"            /* §eÂòÏŒRû.’õ^·¥m… */
+	$"5782 FAB6 FBB5 CDF3 2DC2 0256 2927 4F4F"            /* W‚ú¶ûµÍó-Â.V)'OO */
+	$"1F92 5F99 B540 87DD 7A80 991B 0677 AB00"            /* .’_™µ@‡Ýz€™..w«. */
+	$"2D82 C5F6 11F7 F21B 2652 B798 75D5 42A6"            /* -‚Åö.÷ò.&R·˜uÕB¦ */
+	$"7757 E0E7 3C3F DBA5 6106 9F44 1800 E044"            /* wWàç<?Û¥a.ŸD..àD */
+	$"5844 8C9D 83C0 C5D3 6B95 CE2A 3EBC D7FD"            /* XDŒ�ƒÀÅÓk•Î*>¼×ý */
+	$"B79B E645 6FD3 A5EE ECE2 C9A7 53C7 B2E3"            /* ·›æEoÓ¥îìâɧSDzã */
+	$"C659 D5C5 0FBD 7C88 93C3 D3D9 D81F 0AEB"            /* ÆYÕÅ.½|ˆ“ÃÓÙØ.Âë */
+	$"5784 8BF9 DAD7 993D 0C8B 9873 08A4 254B"            /* W„‹ùÚ×™=.‹˜s.¤%K */
+	$"2452 F95D 29CA 8B3E D48D 18FB C813 4ECB"            /* $Rù])Ê‹>Ô�.ûÈ.NË */
+	$"D118 E3FA 926C 7A5F E5CC F774 D1DB B5C1"            /* Ñ.ãú’lz_åÌ÷tÑÛµÁ */
+	$"579A 2647 619A 67A0 423D 6C64 B3A6 9357"            /* Wš&Gašg B=ld³¦“W */
+	$"B8C6 8FBE A3AC E380 E548 5ED3 D83D 7DB9"            /* ¸Æ�¾£¬ã€åH^ÓØ=}¹ */
+	$"93E8 9071 F6E0 168F 6BEC F674 6D08 F4DA"            /* “è�qöà.�kìötm.ôÚ */
+	$"C1F7 11FD DEF8 2420 30DA 71E2 C605 81EB"            /* Á÷.ýÞø$ 0ÚqâÆ.�ë */
+	$"565B D461 AF6E 3127 34AC BA64 C660 14E1"            /* V[Ôa¯n1'4¬ºdÆ`.á */
+	$"F6AB DA92 386B 3E7B BD42 90E9 ABA2 6EE7"            /* ö«Ú’8k>{½B�é«¢nç */
+	$"8D0D 373C D280 46EC 6746 310C EA41 862B"            /* �.7<Ò€FìgF1.êA†+ */
+	$"6D1B 7BE9 93AF 17F6 1D3A E7AB CA55 8A4B"            /* m.{铯.ö.:ç«ÊUŠK */
+	$"E867 6EF3 29DF FF5F B839 75E1 FA04 DD81"            /* ègnó)ßÿ_¸9uáú.Ý� */
+	$"B6C9 DA44 D268 3B1A FF63 60F5 37A5 DDCB"            /* ¶ÉÚDÒh;.ÿc`õ7¥ÝË */
+	$"1AB3 5275 7692 7F15 F8E8 6A96 CEB4 D9E5"            /* .³Ruv’..øèj–δÙå */
+	$"3E5A 0E16 B1D0 B056 D0D2 0360 0900 5773"            /* >Z..±Ð°VÐÒ.`Æ.Ws */
+	$"BB3F C215 FD55 C9BF E3FC 48A1 CFAB BD39"            /* »?Â.ýUÉ¿ãüH¡Ï«½9 */
+	$"CD3D 906E 21CB C3DD E4D3 548C 4731 E777"            /* Í=�n!ËÃÝäÓTŒG1çw */
+	$"EE15 C0DE CEBC 0F2F 85A6 9822 F1FF 7B2F"            /* î.ÀÞμ./…¦˜"ñÿ{/ */
+	$"2530 48C7 0C39 3659 CD03 06C5 7C8E 3D49"            /* %0HÇ.96YÍ..Å|Ž=I */
+	$"FED5 7B72 4652 772C 39C7 8F1B 63E8 2DC1"            /* þÕ{rFRw,9Ç�.cè-Á */
+	$"1242 CA35 E396 6103 15DF D939 0597 B8D4"            /* .BÊ5ã–a..ßÙ9.—¸Ô */
+	$"8858 ACE3 3C32 6EE5 69A3 8512 3447 2B3B"            /* ˆX¬ã<2nåi£….4G+; */
+	$"0647 8C1F 2D31 4E57 0D03 BE26 5235 5275"            /* .GŒ.-1NW..¾&R5Ru */
+	$"74E8 B8F6 CF32 E077 8C51 41DB ED67 EE30"            /* tè¸öÏ2àwŒQAÛígî0 */
+	$"AD97 7956 D279 B0A8 768D 00E3 F604 A240"            /* ­—yVÒy°¨v�.ãö.¢@ */
+	$"9656 5BCD B309 D0CD 3ECE C477 31EC F88D"            /* –V[ͳÆÐÍ>ÎÄw1ìø� */
+	$"782F 8B9E 37FA A741 C636 7B55 D047 64A4"            /* x/‹ž7ú§AÆ6{UÐGd¤ */
+	$"E2EC C69D F609 F38F 821E 8D20 8709 87FF"            /* âìÆ�öÆó�‚.� ‡Æ‡ÿ */
+	$"3C3A B1ED C420 1F0B 52E3 8999 C684 30F3"            /* <:±íÄ ..R㉙Ƅ0ó */
+	$"C4ED 7FA9 3A2C D0E7 AE48 1AC2 7196 9347"            /* Äí.©:,Ðç®H.Âq–“G */
+	$"6BC9 BEE1 4112 4209 93CA 307A 7FF7 8B12"            /* kɾáA.BÆ“Ê0z.÷‹. */
+	$"EE76 8890 A529 33CC F435 A84F 9414 A719"            /* îvˆ�¥)3Ìô5¨O”.§. */
+	$"BFB2 6305 201F 372D 567F 30DF 2E47 D0B9"            /* ¿²c. .7-V.0ß.Gй */
+	$"C68F 5126 7EAA D95A 12D0 DA8A 8CF4 8A2A"            /* Æ�Q&~ªÙZ.ÐÚŠŒôŠ* */
+	$"CBAE 0509 B614 A9E1 2CA2 D0E0 F017 E395"            /* Ë®.ƶ.©á,¢Ðàð.ã• */
+	$"AF82 85B5 4509 E75C 8E4D 5465 7DF2 CF39"            /* ¯‚…µEÆç\ŽMTe}òÏ9 */
+	$"ACFB DD5B C683 62C0 0B1C B7B9 EAEC 049C"            /* ¬ûÝ[ƃbÀ..·¹êì.œ */
+	$"8045 0178 6757 E317 872D ABC2 B077 6EF6"            /* €E.xgWã.‡-«Â°wnö */
+	$"3612 4132 3DD7 D39B B49A 04A8 207D 6135"            /* 6.A2=×Ó›´š.¨ }a5 */
+	$"C64F 3A0F 5028 7B6B 953E 8F19 920A 718F"            /* ÆO:.P({k•>�.’Âq� */
+	$"08E9 A079 EC51 A08F 4A77 5130 C807 9BC2"            /* .é yìQ �JwQ0È.›Â */
+	$"B37B 4C7B 9BAA 40F3 4E94 BE51 C027 32B5"            /* ³{L{›ª@óN”¾QÀ'2µ */
+	$"751F 4793 7271 226E 82F3 CF14 8BC3 F927"            /* u.G“rq"n‚óÏ.‹Ãù' */
+	$"4C81 7F29 AB70 8B3B E948 86D6 569F FEC2"            /* L�.)«p‹;éH†ÖVŸþÂ */
+	$"BF6C 92F9 1011 3BE3 9E91 6458 1634 34A3"            /* ¿l’ù..;ãž‘dX.44£ */
+	$"3042 520F 5D64 6429 32CE 04FD 1B98 0698"            /* 0BR.]dd)2Î.ý.˜.˜ */
+	$"3A36 655C 86C7 C272 4B02 E259 0537 4DB8"            /* :6e\†ÇÂrK.âY.7M¸ */
+	$"C6C2 6980 ECFB 0FC1 C6D9 0A2C D00F 282A"            /* ÆÂi€ìû.ÁÆÙÂ,Ð.(* */
+	$"7A0B D91F 08CA 762C A629 048E 9BCC CFD2"            /* z.Ù..Êv,¦).Ž›ÌÏÒ */
+	$"1EBC 8F60 2F64 F24D F1FB 81C6 8AEC CFDB"            /* .¼�`/dòMñû�ÆŠìÏÛ */
+	$"623A 01A9 35D2 B5E1 B80A 2D32 084E 3857"            /* b:.©5Òµá¸Â-2.N8W */
+	$"C025 BCDA 4728 F3AD 35AD 9AAA E054 21B7"            /* À%¼ÚG(ó­5­šªàT!· */
+	$"A47E 62C5 9921 02C0 09E3 440D 063A 3789"            /* ¤~bÅ™!.ÀÆãD..:7‰ */
+	$"5072 E54A 4654 E148 AC2E 4A99 C6A5 3923"            /* PråJFTáH¬.J™Æ¥9# */
+	$"49B5 6906 6531 FD5E 7CCE 1C4B EEDE 7482"            /* Iµi.e1ý^|Î.KîÞt‚ */
+	$"9E3F 73AE C777 0214 C921 3131 C5CB 9F61"            /* ž?s®Çw..É!11ÅËŸa */
+	$"64A4 4E70 57C2 5C04 E25B 266E 6887 7477"            /* d¤NpWÂ\.â[&nh‡tw */
+	$"FCCB 1F0C 89F2 6CF6 713E 4D08 8AC8 9B0C"            /* üË..‰òlöq>M.ŠÈ›. */
+	$"00AC D9D7 A28A C219 B52B B46A D704 F919"            /* .¬Ù×¢ŠÂ.µ+´j×.ù. */
+	$"2050 6CCA 215A 299B 9129 9739 DA6F 3A67"            /*  PlÊ!Z)›‘)—9Úo:g */
+	$"FE12 2BF1 4F8B 26ED D21F F727 5B59 22F3"            /* þ.+ñO‹&íÒ.÷'[Y"ó */
+	$"2E05 F4A0 9754 F431 9AED 1B65 038C CD7F"            /* ..ô —Tô1ší.e.ŒÍ. */
+	$"8254 E3AE 035C 18D7 0E28 6300 0DF0 998D"            /* ‚Tã®.\.×.(c..ð™� */
+	$"0191 85AF C71B B3CF F0D6 3A8F B1AA 5E99"            /* .‘…¯Ç.³ÏðÖ:�±ª^™ */
+	$"BAB8 7C7F 0214 F864 4744 E747 7248 3C94"            /* º¸|...ødGDçGrH<” */
+	$"3AC8 CE04 1019 11ED 4BCC 76E9 FE4E 5728"            /* :ÈÎ....íKÌvéþNW( */
+	$"5BB0 986C D763 A3C7 AF8A 14E9 D24A AD17"            /* [°˜l×c£Ç¯Š.éÒJ­. */
+	$"FF66 611F B77C 0830 9093 A560 06FA E9CF"            /* ÿfa.·|.0�“¥`.úéÏ */
+	$"054B 5846 1681 5DBF 34F9 49A9 45E0 8F20"            /* .KXF.�]¿4ùI©Eà�  */
+	$"7FFD 6264 2193 031D A60F A111 B0B7 CFEE"            /* .ýbd!“..¦.¡.°·Ïî */
+	$"DE49 EC80 C0F1 D7F6 A495 900B 4126 40BE"            /* ÞIì€Àñ×ö¤•�.A&@¾ */
+	$"185B DFFE C7B0 12AC C143 AA85 70E5 81EF"            /* .[ßþÇ°.¬ÁCª…på�ï */
+	$"79CE 1662 08E4 203F 1706 40FB CC39 CA8F"            /* yÎ.b.ä ?..@ûÌ9Ê� */
+	$"8002 1CFA 3BCC 6B79 5C83 A4D2 7147 E38F"            /* €..ú;Ìky\ƒ¤ÒqGã� */
+	$"C93B F2E8 6A15 6D30 C314 E898 81E3 FF7B"            /* É;òèj.m0Ã.è˜�ãÿ{ */
+	$"5FC5 EE13 0449 1985 2CBC 73C7 C569 DCB1"            /* _Åî..I.…,¼sÇÅiܱ */
+	$"8024 F7CA CC7A FE3B CC15 4BCE 5B92 1BBB"            /* €$÷ÊÌzþ;Ì.KÎ[’.» */
+	$"0048 F291 579F FD20 F11A 1934 CC11 9C3F"            /* .Hò‘WŸý ñ..4Ì.œ? */
+	$"CE49 027A 9763 9E57 A2FF 7FFD 53E4 E50B"            /* ÎI.z—cžW¢ÿ.ýSäå. */
+	$"C747 02FF 7869 0537 1482 221E 0220 79D5"            /* ÇG.ÿxi.7.‚".. yÕ */
+	$"45B1 2E48 6A6C 8486 571F E1F1 BF39 0797"            /* E±.Hjl„†W.áñ¿9.— */
+	$"5D21 6964 EA9B 13F1 E6B7 C4B5 A2B7 E2BD"            /* ]!idê›.ñæ·Äµ¢·â½ */
+	$"09C2 B200 0000 0000 003E A392 6527 69B6"            /* Ʋ......>£’e'i¶ */
+	$"B189 8365 F55D 7A2B 0398 4196 BB60 D4F0"            /* ±‰ƒeõ]z+.˜A–»`Ôð */
+	$"06B6 100C 5B60 D76F 8FEE EFFB D525 0E2B"            /* .¶..[`×o�îïûÕ%.+ */
+	$"3535 B765 22E7 F77C CF5C 8907 7626 62C0"            /* 55·e"ç÷|Ï\‰.v&bÀ */
+	$"3B04 A170 EEA6 A399 F26B CD7E 92BC 9E13"            /* ;.¡p™òkÍ~’¼ž. */
+	$"9D2D 6907 B06F 6B9A 957D 3C57 DC9F 06E6"            /* �-i.°okš•}<WÜŸ.æ */
+	$"C3B6 16AD C91B E868 E000 1848 3BE4 5C3A"            /* ö.­É.èhà..H;ä\: */
+	$"1162 2272 401F 600B A973 281E 62B3 2654"            /* .b"r@.`.©s(.b³&T */
+	$"74B0 287C C53E A3DA 2A14 E38F 9FFE 3A8E"            /* t°(|Å>£Ú*.ã�Ÿþ:Ž */
+	$"0D69 7E9D 5B07 1396 ED52 69BC 3971 5630"            /* .i~�[..–íRi¼9qV0 */
+	$"7C63 8DA9 7A40 F364 CC6A FCAC DC7C 59DC"            /* |c�©z@ódÌjü¬Ü|YÜ */
+	$"278A 92E3 6FBF F936 7157 2583 232E E558"            /* 'Š’ão¿ù6qW%ƒ#.åX */
+	$"0000 C241 6B90 4DCB 6421 F85A B681 4812"            /* ..ÂAk�MËd!øZ¶�H. */
+	$"9165 5C06 0195 F213 DB9F 5E2F 4BDE A075"            /* ‘e\..•ò.ÛŸ^/KÞ u */
+	$"BD9A 741B 971B 3411 1F73 7FF8 D719 BA55"            /* ½št.—.4..s.ø×.ºU */
+	$"8048 404F FEEA FC74 AEB1 84FD 03F9 5D43"            /* €H@Oþêüt®±„ý.ù]C */
+	$"BE42 E61F FF7F F4CA BA56 9654 B757 FF60"            /* ¾Bæ.ÿ.ôʺV–T·Wÿ` */
+	$"CA39 3290 054C E785 0EA7 F04D AF3E B342"            /* Ê92�.Lç….§ðM¯>³B */
+	$"A80A 815D 3954 73F2 871A 51FF 7488 20CD"            /* ¨Â�]9Tsò‡.Qÿtˆ Í */
+	$"90F3 23B8 80FE C6BF 726C 5426 83F2 5400"            /* �ó#¸€þÆ¿rlT&ƒòT. */
+	$"0000 0000 0000 0000 BFA5 D802 777C F954"            /* ........¿¥Ø.w|ùT */
+	$"286B A586 76CF 26CE 72CA 6FE7 BD43 DB36"            /* (k¥†vÏ&ÎrÊoç½CÛ6 */
+	$"A826 870E 2EEF E2C4 2E22 E63C FF7F AF51"            /* ¨&‡..ïâÄ."æ<ÿ.¯Q */
+	$"40C1 B727 22F3 9ACC 894D 0C49 EC7A D998"            /* @Á·'"óšÌ‰M.IìzÙ˜ */
+	$"64A9 DD22 2545 B85C D621 0609 B73A 9D9F"            /* d©Ý"%E¸\Ö!.Æ·:�Ÿ */
+	$"FF7F FF7F C0F7 00E1 B069 1D76 3BA1 E98C"            /* ÿ.ÿ.À÷.á°i.v;¡éŒ */
+	$"5F1B 1E11 B6F6 EB6D 6316 9DBC D1B2 DC90"            /* _...¶öëmc.�¼Ñ²Ü� */
+	$"5E1D 5EE0 3C65 57D0 B69C 3782 D1BE 3A77"            /* ^.^à<eWжœ7‚Ѿ:w */
+	$"436E 462B 45B7 FF61 4FA4 A45B 8C34 39D8"            /* CnF+E·ÿaO¤¤[Œ49Ø */
+	$"1B35 B876 A5F1 F2AD 3F78 D289 1C2E E3B4"            /* .5¸v¥ñò­?xÒ‰..ã´ */
+	$"A28B 64FA 1E2C 0CCD 0B1C AD42 8866 DDD6"            /* ¢‹dú.,.Í..­BˆfÝÖ */
+	$"62F0 225B 8DF7 32B3 FC3C 79E9 000B 1CA9"            /* bð"[�÷2³ü<yé...© */
+	$"2C82 4874 34AB B158 47CD FA9F EBC8 0923"            /* ,‚Ht4«±XGÍúŸëÈÆ# */
+	$"B291 7229 8C3F E7FD 193C 330B A3B4 6969"            /* ²‘r)Œ?çý.<3.£´ii */
+	$"FCF6 E1BA 4C4A E64C B1BC 5BAF F402 C828"            /* üöáºLJæL±¼[¯ô.È( */
+	$"3A51 CC67 A851 E207 5A7C 3733 1031 FD5C"            /* :QÌg¨Qâ.Z|73.1ý\ */
+	$"E4D3 B69F FF67 2C6D 3FC7 D5B4 E63F 55B9"            /* äÓ¶Ÿÿg,m?ÇÕ´æ?U¹ */
+	$"FD5F 3DB1 4589 6ADF 54F0 F42A 498F 61C8"            /* ý_=±E‰jßTðô*I�aÈ */
+	$"4872 5CD7 F70D 9C80 8880 EB9A 1FE7 C715"            /* Hr\×÷.œ€ˆ€ëš.çÇ. */
+	$"E57A 280F 96CF 014C 0411 EF44 C4F2 C64F"            /* åz(.–Ï.L..ïDÄòÆO */
+	$"F91B A9D6 EB9E F615 096F E5C0 5B30 BB79"            /* ù.©Öëžö.ÆoåÀ[0»y */
+	$"D645 BF4F B70A 2C40 3D24 A4C4 5A01 F3DB"            /* ÖE¿O·Â,@=$¤ÄZ.óÛ */
+	$"8879 D458 F558 4C8E 3C87 E83C 9C30 F0C3"            /* ˆyÔXõXLŽ<‡è<œ0ðà */
+	$"F7EB BE6A 2B3B B9CB 4F2E 3B49 CA98 6025"            /* ÷ë¾j+;¹ËO.;Iʘ`% */
+	$"D6C7 6B39 ED18 A784 5410 F9CD 4FB5 9E32"            /* ÖÇk9í.§„T.ùÍOµž2 */
+	$"EABF F72F 6ECC 217F E295 4BDA F0C8 2678"            /* ê¿÷/nÌ!.â•KÚðÈ&x */
+	$"B0F7 3381 2299 1033 5300 BB1C E72F 1EE0"            /* °÷3�"™.3S.».ç/.à */
+	$"75D6 68D0 8C87 A574 580B 4AD8 7BC8 E1C4"            /* uÖhÐŒ‡¥tX.JØ{ÈáÄ */
+	$"64D3 76AA A080 1E28 FD04 890B B9A1 7E5C"            /* dÓvª €.(ý.‰.¹¡~\ */
+	$"79E2 31B9 1C3E DBAE 8BC6 DB23 53A4 0F06"            /* yâ1¹.>Û®‹ÆÛ#S¤.. */
+	$"74AA 7920 6233 E3BF B281 AFAA 957D FDFB"            /* tªy b3㿲�¯ª•}ýû */
+	$"216A 3ECE 3139 37DF 8885 620B 5D55 D0FD"            /* !j>Î197߈…b.]UÐý */
+	$"F796 6A70 CEFD 33D8 B369 178E 99C0 9FFF"            /* ÷–jpÎý3سi.Ž™ÀŸÿ */
+	$"7FD2 27D4 D615 4840 B836 A0B5 1D6F 2A5A"            /* .Ò'ÔÖ.H@¸6 µ.o*Z */
+	$"1338 2369 83A0 D409 0FA7 77EF 19B9 21E6"            /* .8#iƒ ÔÆ.§wï.¹!æ */
+	$"3E21 0CB0 D4D3 362A EA6F 6340 8D73 27FB"            /* >!.°ÔÓ6*êoc@�s'û */
+	$"C3EF 7823 33DF 7A8C 5C69 20C4 5816 72E4"            /* Ãïx#3ßzŒ\i ÄX.rä */
+	$"712C 3345 6755 76F3 FEAF 494B D0B4 3C8F"            /* q,3EgUvóþ¯IKд<� */
+	$"B83F A050 C3E9 4CA2 6A6E 7AD0 D7FF 5860"            /* ¸? PÃéL¢jnzÐ×ÿX` */
+	$"548E 54E7 C3B9 6DDF 462C 54BE 5EF9 1A41"            /* TŽTçùmßF,T¾^ù.A */
+	$"6A46 A4FB 1C36 1CA4 77EC 2899 F147 3422"            /* jF¤û.6.¤wì(™ñG4" */
+	$"843C 7FAE 123E 6894 9B7F 3125 EB0F 3129"            /* „<.®.>h”›.1%ë.1) */
+	$"9DC1 8469 CE90 BB6E 4F2C 385A 0FD1 9AC7"            /* �Á„iÎ�»nO,8Z.ÑšÇ */
+	$"3318 3BF0 B1AA A51A 9022 A143 29FF 7FC1"            /* 3.;𱪥.�"¡C)ÿ.Á */
+	$"0F0F 6570 67C4 7FA7 9906 DE4E 5439 A278"            /* ..epgÄ.§™.ÞNT9¢x */
+	$"34E1 3D57 BB0E 086E 4C71 4406 DA9D CA56"            /* 4á=W»..nLqD.Ú�ÊV */
+	$"3EFD D077 5DA5 CD7D C244 9128 F408 1F03"            /* >ýÐw]¥Í}ÂD‘(ô... */
+	$"0C8F FF4B 9274 2EC6 E208 13C5 EE1B 3CEA"            /* .�ÿK’t.Æâ..Åî.<ê */
+	$"C5C0 06F5 0FA1 11FF 7FE3 A446 32E6 F4DA"            /* ÅÀ.õ.¡.ÿ.ã¤F2æôÚ */
+	$"23EC 5108 3AE0 CD16 AFFF 3965 8196 56E2"            /* #ìQ.:àÍ.¯ÿ9e�–Vâ */
+	$"2881 4EB9 CA14 5C4A 8091 B176 8823 BF09"            /* (�N¹Ê.\J€‘±vˆ#¿Æ */
+	$"CED5 0D88 E6BB DD95 1B72 36E8 809C D432"            /* ÎÕ.ˆæ»Ý•.r6耜Ô2 */
+	$"872D C08C 7DCB B30E 548B AE16 0D85 6B49"            /* ‡-ÀŒ}˳.T‹®..…kI */
+	$"9B28 D491 ECD6 F598 691A 0891 135A 63A0"            /* ›(Ô‘ìÖõ˜i..‘.Zc  */
+	$"593C 1FFD 8A54 4FB9 F2AB 20FC 5CF3 1B88"            /* Y<.ýŠTO¹ò« ü\ó.ˆ */
+	$"EE7E 8355 45D6 87C8 28CE 7B33 92A2 D8D6"            /* î~ƒUEÖ‡È(Î{3’¢ØÖ */
+	$"E8DF EF94 500A 0D78 DE9F 8657 F7BD 7F40"            /* èßï”PÂ.xÞŸ†W÷½.@ */
+	$"5E07 0789 EDC7 F3A5 A0BF 3929 6B19 A460"            /* ^..‰íÇó¥ ¿9)k.¤` */
+	$"7A50 91FF 42EA 5F12 DFA5 E0A0 84CC E869"            /* zP‘ÿBê_.ߥࠄÌèi */
+	$"BB1F 6EDA 2238 5DB0 7F22 3521 F04B FF6B"            /* ».nÚ"8]°."5!ðKÿk */
+	$"6827 722A DD5F 3C9D D3F4 2BE3 614D 0A3F"            /* h'r*Ý_<�Óô+ãaMÂ? */
+	$"62C4 E6AC 95CA 5946 37E8 BC76 97FD 5167"            /* bÄ欕ÊYF7è¼v—ýQg */
+	$"C970 D4C7 0655 C470 5913 DBBD AA8C 87A4"            /* ÉpÔÇ.UÄpY.Û½ªŒ‡¤ */
+	$"3C63 0B7F 54CD 391E 574D F2D5 C728 20B7"            /* <c..TÍ9.WMòÕÇ( · */
+	$"9955 DAC8 72A5 DBBB F7ED 4C9F 6FFE 3A4E"            /* ™UÚÈr¥Û»÷íLŸoþ:N */
+	$"E165 1831 C0E5 8285 96C2 3959 1BE7 E884"            /* áe.1Àå‚…–Â9Y.çè„ */
+	$"E568 89C1 FD03 D443 F6D1 A7C9 4CFE F7B9"            /* åh‰Áý.ÔCöѧÉLþ÷¹ */
+	$"A0BA 5040 19D5 965F 0EB5 E503 4B32 E6C8"            /*  ºP@.Õ–_.µå.K2æÈ */
+	$"B9C1 DEBB B8B7 47DC A850 AF44 D3B7 F562"            /* ¹ÁÞ»¸·GܨP¯DÓ·õb */
+	$"4210 4DFF 42A0 3D9A 7C63 8124 22A9 B258"            /* B.MÿB =š|c�$"©²X */
+	$"2256 6243 3077 FF57 7389 3FB6 A096 0EAB"            /* "VbC0wÿWs‰?¶ –.« */
+	$"DD33 EF25 C4B0 7338 F6D7 8730 FF2E DD0A"            /* Ý3ï%Ä°s8öׇ0ÿ.Ý */
+	$"BBDA 7A6E EFE8 58EE D64B A09E 2B00 EC04"            /* »ÚznïèXîÖK ž+.ì. */
+	$"09C9 A9F4 82A0 3132 4829 65CA E93B B827"            /* ÆÉ©ô‚ 12H)eÊé;¸' */
+	$"E81F B387 132B 5D15 E526 6FEC 2CB1 407F"            /* è.³‡.+].å&oì,±@. */
+	$"8485 FF32 4933 D357 FC45 0E44 EE66 D960"            /* „…ÿ2I3ÓWüE.DîfÙ` */
+	$"5AA3 A13A FC0B D8E2 622E 0BEE 714F 2672"            /* Z£¡:ü.Øâb..îqO&r */
+	$"3850 26C4 E626 F9BA 418C BC8A 7481 C6BE"            /* 8P&Äæ&ùºAŒ¼Št�ƾ */
+	$"BFA6 0D72 0603 3452 46C0 9FDB BE63 34D9"            /* ¿¦.r..4RFÀŸÛ¾c4Ù */
+	$"9599 7519 804B F1CE 0FC8 7572 F58E EB32"            /* •™u.€KñÎ.ÈurõŽë2 */
+	$"3501 CBB0 C05B 5643 485A 0012 64C2 8022"            /* 5.Ë°À[VCHZ..d€" */
+	$"BD39 EB39 2B57 0AA3 3931 93D4 885E CDF2"            /* ½9ë9+W£91“Ôˆ^Íò */
+	$"818D 7734 36C2 BEE1 4F55 116C 47A9 DC40"            /* ��w46¾áOU.lG©Ü@ */
+	$"A8A8 4532 7C33 9D7E 070A BA9E 36F7 2445"            /* ¨¨E2|3�~.ºž6÷$E */
+	$"074C 181A 07B2 C470 FA15 8CCB C069 AD0F"            /* .L...²Äpú.ŒËÀi­. */
+	$"9DD2 8B21 6F22 7300 34B4 4378 25AB D9D2"            /* �Ò‹!o"s.4´Cx%«ÙÒ */
+	$"1D9B B7F7 2F9C C3B1 926F DE61 4463 90BD"            /* .›·÷/œÃ±’oÞaDc�½ */
+	$"BC76 27E7 A5B5 826F 908E 31BA 048F 97C1"            /* ¼v'祵‚o�Ž1º.�—Á */
+	$"1884 67A9 C4BA 4B2B 4A58 D0EE 0269 6832"            /* .„g©ÄºK+JXÐî.ih2 */
+	$"E8C6 03AA D2A2 D034 27AA D49E 9C01 069A"            /* èÆ.ªÒ¢Ð4'ªÔžœ..š */
+	$"1BDC C40B 3BA7 5F8D 0468 152D E505 7EC0"            /* .ÜÄ.;§_�.h.-å.~À */
+	$"6BBF C4F4 2F45 99CB 1872 C713 FA0D 055F"            /* k¿Äô/E™Ë.rÇ.ú.._ */
+	$"551D 6E4D 5794 CC71 BAB5 C560 4D20 9464"            /* U.nMW”ÌqºµÅ`M ”d */
+	$"9F8C 94BA 1C96 0987 1AB4 61BB BA86 751B"            /* ŸŒ”º.–Ƈ.´a»º†u. */
+	$"9B79 D06A 7A3D A663 FB31 8B86 E588 5D15"            /* ›yÐjz=¦cû1‹†åˆ]. */
+	$"4A09 8B2B 81FC AE85 0D5A 1D8C A5B7 6DD9"            /* JÆ‹+�ü®….Z.Œ¥·mÙ */
+	$"02F5 50CE 7017 1BDD 3D3D 86CB 250B 491B"            /* .õPÎp..Ý==†Ë%.I. */
+	$"AA1F 2D21 A416 E8E7 9A53 4299 8CDE CD59"            /* ª.-!¤.èçšSB™ŒÞÍY */
+	$"C678 B559 D85C C580 6795 AD5F F578 C9EE"            /* ÆxµYØ\Å€g•­_õxÉî */
+	$"73B2 8F4B 6EEA 6F07 F785 C1B3 374B E51F"            /* s²�Knêo.÷…Á³7Kå. */
+	$"46DC 728C 05A4 6932 792A DB50 4E9A FD82"            /* FÜrŒ.¤i2y*ÛPNšý‚ */
+	$"A8A2 5EB8 024D C558 D6BC 350C 97B0 B2E8"            /* ¨¢^¸.MÅXÖ¼5.—°²è */
+	$"8F42 92FD 604D 6FB7 74B6 6EBE 97F6 CE03"            /* �B’ý`Mo·t¶n¾—öÎ. */
+	$"0DFA C340 31C3 4C5E 0041 088B E097 383B"            /* .úÃ@1ÃL^.A.‹à—8; */
+	$"A236 97CC 8D2B 6F6D 0E58 4E56 1D49 32EC"            /* ¢6—Ì�+om.XNV.I2ì */
+	$"626C C303 42BB D30B B8DE 5868 3C2F E39B"            /* blÃ.B»Ó.¸ÞXh</ã› */
+	$"A07A 236D 0F21 C0DD 1A0A 933A 7710 6605"            /*  z#m.!ÀÝ.“:w.f. */
+	$"343E 8D1A 9384 4F16 C01E 5AF7 DF53 0B38"            /* 4>�.“„O.À.Z÷ßS.8 */
+	$"3615 80D7 428E 90F6 4620 02EA 4590 DF22"            /* 6.€×BŽ�öF .êE�ß" */
+	$"4B70 2FB2 CADA A529 F7FA E7C6 BC99 DFCD"            /* Kp/²ÊÚ¥)÷úçƼ™ßÍ */
+	$"5EE7 D677 B5BE F819 6A55 6070 E1A9 DF53"            /* ^çÖwµ¾ø.jU`pá©ßS */
+	$"3F82 0229 B6B7 D247 1967 8313 056F 9D27"            /* ?‚.)¶·ÒG.gƒ..o�' */
+	$"753E E4DD EB7F 1372 C0F7 D72E 349B 2F9B"            /* u>äÝë..rÀ÷×.4›/› */
+	$"686C C9AF 0896 0865 7A3A 5A9D 807F 292A"            /* hlɯ.–.ez:Z�€.)* */
+	$"8DDA A776 4B3C 0993 532D D682 A41B 9DC2"            /* �Ú§vK<Æ“S-Ö‚¤.� */
+	$"5113 9D60 934B 2055 D671 C6C4 1252 3CEF"            /* Q.�`“K UÖqÆÄ.R<ï */
+	$"C72F AC19 4BED 185D BC60 5957 F81B 8278"            /* Ç/¬.Kí.]¼`YWø.‚x */
+	$"20B5 9173 4A1B FDC9 295D 54B7 8AFE 6938"            /*  µ‘sJ.ýÉ)]T·Šþi8 */
+	$"FE49 BA78 3225 49A1 4243 823C 52B9 8489"            /* þIºx2%I¡BC‚<R¹„‰ */
+	$"9BDF 0AA1 9A6B 667D DCE2 FE18 C386 4EE9"            /* ›ß¡škf}Üâþ.ÆNé */
+	$"8AF7 92D0 4405 227C BD4C B9E4 34A7 2533"            /* Š÷’ÐD."|½L¹ä4§%3 */
+	$"D3C6 E915 D57B 681B B6DC FF03 D5D4 F1DD"            /* ÓÆé.Õ{h.¶Üÿ.ÕÔñÝ */
+	$"4FB5 BA54 262A 73C2 1CF4 4CD1 D842 E8C2"            /* OµºT&*sÂ.ôLÑØBè */
+	$"8169 3555 13EC 6A25 6DE0 3614 EC2E D1BB"            /* �i5U.ìj%mà6.ì.Ñ» */
+	$"E597 BFC6 2ACB 6879 11D1 870D E79E 8422"            /* å—¿Æ*Ëhy.ч.çž„" */
+	$"C01D 4032 8887 6DBA FBEC 3077 F220 49E3"            /* À.@2ˆ‡mºûì0wò Iã */
+	$"8693 0B00 9F45 0F57 0A39 DA8E EAA5 CD48"            /* †“..ŸE.WÂ9ÚŽê¥ÍH */
+	$"2C93 C3EC BDE0 71D5 5749 0952 441C E3F8"            /* ,“Ãì½àqÕWIÆRD.ãø */
+	$"597F C1E6 FB6B BBED AD71 FC34 CFF8 5877"            /* Y.Áæûk»í­qü4ÏøXw */
+	$"DB67 5F6D 798F E163 5F6B 1CFA A87B ED7C"            /* Ûg_my�ác_k.ú¨{í| */
+	$"F176 3065 72FF 443D BA6B 8FBD 9E85 806A"            /* ñv0erÿD=ºk�½ž…€j */
+	$"2A1B 368C 7A9E B1B1 93DE ABD8 263F 31B3"            /* *.6Œzž±±“Þ«Ø&?1³ */
+	$"1739 58F1 7233 FE7C 4EC4 32AA CDDB CF11"            /* .9Xñr3þ|NÄ2ªÍÛÏ. */
+	$"C519 9C61 B756 AF62 D55D 5D48 6AF7 4364"            /* Å.œa·V¯bÕ]]Hj÷Cd */
+	$"205E F14D AAD6 EFF5 2F0D CBE4 0F19 3159"            /*  ^ñMªÖïõ/.Ëä..1Y */
+	$"94F4 910E 4217 990B CABE EBF5 2B67 2EF6"            /* ”ô‘.B.™.ʾëõ+g.ö */
+	$"FE41 0C44 1C50 43EA 69F5 4E73 5569 82A1"            /* þA.D.PCêiõNsUi‚¡ */
+	$"C13C 4899 3AA9 5E13 5F76 BF98 2105 1842"            /* Á<H™:©^._v¿˜!..B */
+	$"AF34 9AFD CFC8 D1E7 3479 E1F3 C86F D06F"            /* ¯4šýÏÈÑç4yáóÈoÐo */
+	$"9ED9 9DD8 E2E0 4B44 19F4 03E6 9CC0 3474"            /* žÙ�ØâàKD.ô.æœÀ4t */
+	$"DFBD 078F D140 1C06 5F8C B6E2 665C 703A"            /* ß½.�Ñ@.._Œ¶âf\p: */
+	$"2841 642E F538 C531 697D 5064 11AD 9E8C"            /* (Ad.õ8Å1i}Pd.­žŒ */
+	$"5A53 3174 7302 762E 9708 BEF5 AD41 0C01"            /* ZS1ts.v.—.¾õ­A.. */
+	$"D744 85FC D963 416A 9A3A 6898 F067 5B1C"            /* ×D…üÙcAjš:h˜ðg[. */
+	$"873B 42B6 72C4 FF18 337A 8A24 EDCE 6B8B"            /* ‡;B¶rÄÿ.3zŠ$íÎk‹ */
+	$"BF06 0EA4 0227 A131 8620 B03C A2B9 729E"            /* ¿..¤.'¡1† °<¢¹rž */
+	$"1242 EC64 E340 5C5C 9BFF 120A BB1B 75E5"            /* .Bìdã@\\›ÿ.».uå */
+	$"385B 68AF C7B7 8BA5 1E7B 6FC1 DDB2 F642"            /* 8[h¯Ç·‹¥.{oÁݲöB */
+	$"FF56 4D21 66B3 EA8C 7095 8FBD 92CC 7315"            /* ÿVM!f³êŒp•�½’Ìs. */
+	$"665F B398 608C ADD4 11E0 DA38 734A C3DB"            /* f_³˜`Œ­Ô.àÚ8sJÃÛ */
+	$"9249 4640 27D6 D057 426E 651D BF14 F0DE"            /* ’IF@'ÖÐWBne.¿.ðÞ */
+	$"9130 2D17 8D66 9689 79BD 9A6D 5AF9 6C7C"            /* ‘0-.�f–‰y½šmZùl| */
+	$"94BF 8531 6507 5621 1C11 8D8F F3A5 83D9"            /* ”¿…1e.V!..��ó¥ƒÙ */
+	$"7EE3 1E6D 9B0A 8D44 F466 DE49 E606 E143"            /* ~ã.m›Â�DôfÞIæ.áC */
+	$"7E77 D417 D49D 9CF2 89AA B0FA 84A4 33A5"            /* ~wÔ.Ô�œò‰ª°ú„¤3¥ */
+	$"8279 A26A 82C5 27CF FB64 D227 994E C6A7"            /* ‚y¢j‚Å'ÏûdÒ'™NƧ */
+	$"531C 7B7D D333 20D4 F79E 7C21 CC1E 7ADA"            /* S.{}Ó3 Ô÷ž|!Ì.zÚ */
+	$"F978 DEBB 1FF2 7420 A72D DE6B AB74 8DC6"            /* ùxÞ».òt §-Þk«t�Æ */
+	$"DD0F 0386 BF57 5F23 4926 C874 D598 47A3"            /* Ý..†¿W_#I&ÈtÕ˜G£ */
+	$"FBC8 E9B0 38BB C695 B7F4 82A1 CC5F 1E22"            /* ûÈé°8»Æ•·ô‚¡Ì_." */
+	$"767C 20D5 E64D 44F1 B2D4 2298 C6A1 1842"            /* v| ÕæMDñ²Ô"˜Æ¡.B */
+	$"8139 0CC8 B9C5 284F 9FC8 945B 5342 94A8"            /* �9.ȹÅ(OŸÈ”[SB”¨ */
+	$"1A57 3351 E00E DB28 D5E3 9712 4346 6DBA"            /* .W3Qà.Û(Õã—.CFmº */
+	$"CC9B A1ED CD9B 778D 4523 1E9A AC69 8ED9"            /* Ì›¡íÍ›w�E#.š¬iŽÙ */
+	$"67C4 C16D A548 A029 0075 0185 8D06 B7F0"            /* gÄÁm¥H ).u.…�.·ð */
+	$"8258 D26A EB95 D437 F0D2 8E91 D536 F534"            /* ‚XÒjë•Ô7ðÒŽ‘Õ6õ4 */
+	$"30A1 6DE7 E4B8 48DF 246E 6A43 4FE6 AED0"            /* 0¡mçä¸Hß$njCOæ®Ð */
+	$"48A0 5E1E C339 6C40 BE36 CEB8 870B F9EB"            /* H ^.Ã9l@¾6θ‡.ùë */
+	$"5ED8 3CA2 B3FA 8CD9 2D26 FF79 6468 862D"            /* ^Ø<¢³úŒÙ-&ÿydh†- */
+	$"6B87 3072 15D5 5640 D5D4 B4BA EAD3 84F1"            /* k‡0r.ÕV@ÕÔ´ºêÓ„ñ */
+	$"6A43 F378 100E 8088 A3FE 989B E75B F67F"            /* jCóx..€ˆ£þ˜›ç[ö. */
+	$"5B25 3AE2 C08C 8CB0 08DD A37F 94DD 7F03"            /* [%:âÀŒŒ°.Ý£.”Ý.. */
+	$"35C9 DF27 9A9A B829 6326 A95D 91F7 0BA3"            /* 5Éß'šš¸)c&©]‘÷.£ */
+	$"7220 E220 F062 D8DE ADE2 2AD6 DDFD C9E4"            /* r â ðbØÞ­â*ÖÝýÉä */
+	$"FAAE 543D 3CCB 5230 74F7 3120 02FD 6B45"            /* ú®T=<ËR0t÷1 .ýkE */
+	$"A2AB 805B 13FB 1879 6060 5600 1847 98E5"            /* ¢«€[.û.y``V..G˜å */
+	$"BF65 2CD4 ACD7 15D0 B77E 5A0F 8095 95CA"            /* ¿e,Ô¬×.з~Z.€••Ê */
+	$"1847 D25F 7D32 1AE2 89EA 9D49 074D A3E5"            /* .GÒ_}2.â‰ê�I.M£å */
+	$"201E 8AC7 CB9C 43BC 0732 70E0 3C4F E625"            /*  .ŠÇËœC¼.2pà<Oæ% */
+	$"88E3 74DB 6FB7 7BE2 7006 F9E7 1F76 DBF3"            /* ˆãtÛo·{âp.ùç.vÛó */
+	$"C988 D665 F7AA 21E2 A5C1 E969 2917 3BA3"            /* ɈÖe÷ª!â¥Áéi).;£ */
+	$"17BF 925F F835 9827 813E DA4F EE9B 2DF3"            /* .¿’_ø5˜'�>ÚOî›-ó */
+	$"B640 95E8 70A5 B577 8C1D 99D5 797D D482"            /* ¶@•èp¥µwŒ.™Õy}Ô‚ */
+	$"E23A 56DD 644D 9623 FEE2 63D2 A3DB E146"            /* â:VÝdM–#þâcÒ£ÛáF */
+	$"FC39 35A7 6C28 63D8 5240 0C80 0000 0000"            /* ü95§l(cØR@.€.... */
+	$"0001 4095 99D3 7A7A 0A05 B673 69BC DA9C"            /* ..@•™ÓzzÂ.¶si¼Úœ */
+	$"A108 DDEA EE48 6385 0790 FEA1 1AFC 2CED"            /* ¡.ÝêîHc….�þ¡.ü,í */
+	$"2225 BE73 2ED7 00BB 2301 80FE 09DF E78E"            /* "%¾s.×.»#.€þÆßçŽ */
+	$"6FE6 4743 A0EE 0A03 4C9E F046 CDD8 E7F1"            /* oæGC îÂ.LžðFÍØçñ */
+	$"DB3F 1B67 F6E1 1F31 8096 90DF 5110 40B0"            /* Û?.göá.1€–�ßQ.@° */
+	$"0000 0000 0000 0000 C0B9 E0FC 41FB A11C"            /* ........À¹àüAû¡. */
+	$"4696 89A0 DE42 F8C7 27D0 3F03 AA51 70FD"            /* F–‰ ÞBøÇ'Ð?.ªQpý */
+	$"DC5F D7B9 AFD3 A0F3 7BAA A910 9E5C 259E"            /* Ü_×¹¯Ó ó{ª©.ž\%ž */
+	$"E4FB 8F8E 01C1 96E2 0768 FE5A 0A43 E2F8"            /* äû�Ž.Á–â.hþZÂCâø */
+	$"DA74 9500 C241 D1F6 3EFF 3F06 586F A511"            /* Út•.ÂAÑö>ÿ?.Xo¥. */
+	$"CCFE 8FE7 61E1 C392 D001 3F52 1CA8 CC23"            /* Ìþ�çaáÃ’Ð.?R.¨Ì# */
+	$"93F0 27DF 893F 4AC1 06C3 34DA 8953 BBC0"            /* “ð'߉?JÁ.Ã4Ú‰S»À */
+	$"84C0 4843 27E0 067E 5EBF FF7A 1540 4C0E"            /* „ÀHC'à.~^¿ÿz.@L. */
+	$"FA6C 44A1 A7BC DB24 6AD7 C367 EC93 33BF"            /* úlD¡§¼Û$j×Ãgì“3¿ */
+	$"FECB C1DF 83CC 5BF7 A7C0 DF62 2EFA 4283"            /* þËÁ߃Ì[÷§Àßb.úBƒ */
+	$"6E49 2492 4924 9249 2492 4924 9246 A4A5"            /* nI$’I$’I$’I$’F¤¥ */
+	$"7754 9685 B091 D8FF 1549 CF90 2079 3AFB"            /* wT–…°‘Øÿ.IÏ� y:û */
+	$"E925 85CC 62A2 E49B 476B 47B9 319B 630F"            /* é%…Ìb¢ä›GkG¹1›c. */
+	$"A6B8 182C E282 D1CD 920A 4EB3 21BF 943C"            /* ¦¸.,â‚ÑÍ’ÂN³!¿”< */
+	$"27BF CCDE BD6E 481A 188C F70B C257 8118"            /* '¿ÌÞ½nH..Œ÷.ÂW�. */
+	$"FBF7 FF78 F422 A3DB AE81 4980 0000 0000"            /* û÷ÿxô"£Û®�I€.... */
+	$"0000 0000 0000 1EE1 BFBB C300 0000 0000"            /* .......á¿»Ã..... */
+	$"0000 0000 0000 14FB 3FE1 1B7A D142 E13F"            /* .......û?á.zÑBá? */
+	$"5B6F 704A 61CF 957D 258E F744 FB26 8356"            /* [opJaÏ•}%Ž÷Dû&ƒV */
+	$"74AD 1DDB 02F2 CF85 7AEB 3A06 6F12 084E"            /* t­.Û.òÏ…zë:.o..N */
+	$"8E93 D6DA E4FE 9FBE 2D16 1C87 701F 55C3"            /* Ž“ÖÚäþŸ¾-..‡p.Uà */
+	$"9966 3E8F 36CB 6D9F F3F6 F8D3 B3B9 E2C1"            /* ™f>�6ËmŸóöøÓ³¹âÁ */
+	$"1019 C6E6 8FFF 7FDC 6948 D3AB C944 C64A"            /* ..Ææ�ÿ.ÜiHÓ«ÉDÆJ */
+	$"8000 0000 0000 0000 000A B0CB 3806 445C"            /* €........°Ë8.D\ */
+	$"7110 4CDE 3651 AC94 777C 8AB0 5382 04AF"            /* q.LÞ6Q¬”w|Š°S‚.¯ */
+	$"32E5 68C2 122F 8A5B 12A8 FF39 CF5E 72FB"            /* 2åhÂ./Š[.¨ÿ9Ï^rû */
+	$"EFD4 1669 47C6 525E 88EF 0AAC 1EE1 98B6"            /* ïÔ.iGÆR^ˆï¬.ᘶ */
+	$"0BFF 7FAF 8A4B 7158 F7D7 1707 DE93 841E"            /* .ÿ.¯ŠKqX÷×..Þ“„. */
+	$"3C82 3260 1FFF 1C8B 6A6E 8C66 0000 0000"            /* <‚2`.ÿ.‹jnŒf.... */
+	$"0000 0000 0000 0121 EF03 234C 3124 0000"            /* .......!ï.#L1$.. */
+	$"0000 0000 0000 0000 077C 5957 204B A2ED"            /* .........|YW K¢í */
+	$"59B8 F3C4 CC60 8A58 7E23 0B9F A0FD 1DC8"            /* Y¸óÄÌ`ŠX~#.Ÿ ý.È */
+	$"8E0F FE2B 5F9F 12D8 09B3 57BB 7818 3CF5"            /* Ž.þ+_Ÿ.ØƳW»x.<õ */
+	$"D579 D427 5198 BD86 E2FC 8775 915B 37A5"            /* ÕyÔ'Q˜½†âü‡u‘[7¥ */
+	$"B2E6 6BD8 8404 31D9 4C54 3621 6561 5C3E"            /* ²ækØ„.1ÙLT6!ea\> */
+	$"4A80 0000 0000 0000 0000 0014 D22D 6758"            /* J€..........Ò-gX */
+	$"336C 63A1 C13F 3E94 9877 8E90 4E5D 0C70"            /* 3lc¡Á?>”˜wŽ�N].p */
+	$"F80A 4262 C2CC C7E4 DAE8 526F 393F 4558"            /* øÂBbÂÌÇäÚèRo9?EX */
+	$"5CC9 5DDA B2FF 7ED5 F809 3A02 F1EE 2760"            /* \É]Ú²ÿ~ÕøÆ:.ñî'` */
+	$"FF7E 5037 F054 4A1B 9602 92EA 8D26 A198"            /* ÿ~P7ðTJ.–.’ê�&¡˜ */
+	$"9C4F 8238 A60E 7734 20F8 18FE 478F 5403"            /* œO‚8¦.w4 ø.þG�T. */
+	$"1658 618B A80F 879F 4A98 E809 DEB2 7CE9"            /* .Xa‹¨.‡ŸJ˜èÆÞ²|é */
+	$"9724 407B B8C8 A48D 4F33 9126 751B 9FC2"            /* —$@{¸È¤�O3‘&u.ŸÂ */
+	$"0283 44C3 5AFD 9546 FCE2 4212 4F5B 01D4"            /* .ƒDÃZý•FüâB.O[.Ô */
+	$"6E53 A032 DA91 40F4 4BDE 0C23 FF1E D5DE"            /* nS 2Ú‘@ôKÞ.#ÿ.ÕÞ */
+	$"B543 59DC C0DC 759A 6043 5883 A5FE C785"            /* µCYÜÀÜuš`CXƒ¥þÇ… */
+	$"BA68 9F46 C21A 4C50 20E3 0488 FB34 1043"            /* ºhŸFÂ.LP ã.ˆû4.C */
+	$"FC68 562B 635A EE8D E334 0C6F 25A9 E4C9"            /* ühV+cZî�ã4.o%©äÉ */
+	$"3484 2AC2 6188 7242 E3F6 AEAC 6F86 2DE2"            /* 4„*ÂaˆrBãö®¬o†-â */
+	$"C377 BD02 CB1C 9553 5485 6A5B E118 9BBD"            /* Ãw½.Ë.•ST…j[á.›½ */
+	$"DC6B 2C92 C6CC C866 6E7F FE63 AB01 FE7D"            /* Ük,’ÆÌÈfn.þc«.þ} */
+	$"FF7F BB81 EA94 87BE B101 F468 0E30 F111"            /* ÿ.»�ꔇ¾±.ôh.0ñ. */
+	$"7BC9 FA0D F87F BDD0 811B 8588 1AE7 8387"            /* {Éú.ø.½Ð�.…ˆ.烇 */
+	$"5C06 B3A9 E2ED 6E5B B524 35AA CBFF 50D6"            /* \.³©âín[µ$5ªËÿPÖ */
+	$"49D9 6918 3837 59BD E7CC 8796 B0AF 2729"            /* IÙi.87Y½ç̇–°¯') */
+	$"0512 5A97 66FF 1A85 E004 1882 0108 EA41"            /* ..Z—fÿ.…à..‚..êA */
+	$"BBCC 15E0 254C 59AF 877D 0722 15FB ADA1"            /* »Ì.à%LY¯‡}.".û­¡ */
+	$"84C2 9B83 DD5B C6B1 EE29 084C 08F7 06C8"            /* „›ƒÝ[Ʊî).L.÷.È */
+	$"4F07 9818 6BF2 66E2 582B 2F7D 29AD BAFA"            /* O.˜.kòfâX+/})­ºú */
+	$"8F9E 0AC8 60AE D10E 3E49 17BF E015 0C5E"            /* �žÂÈ`®Ñ.>I.¿à..^ */
+	$"5C51 5D5B 5BC1 6C83 C428 4505 E9BB 61CB"            /* \Q][[ÁlƒÄ(E.é»aË */
+	$"D7C2 F3C6 C102 73F5 409E D0CF B43E E497"            /* ×ÂóÆÁ.sõ@žÐÏ´>ä— */
+	$"C1E0 707B 3F6F EAA8 2F10 9285 7D9D 9F81"            /* Áàp{?oê¨/.’…}�Ÿ� */
+	$"303D 3A70 2B3F 4A45 558D 63F6 EEB9 CF21"            /* 0=:p+?JEU�cöî¹Ï! */
+	$"52C1 27C2 8439 0BE2 BE1F A553 A1C7 E44C"            /* RÁ'„9.â¾.¥S¡ÇäL */
+	$"5422 9BC0 356D 1B40 E53B 3064 AA69 F464"            /* T"›À5m.@å;0dªiôd */
+	$"7AA7 4E56 F7E2 7AE5 CB6E E538 8582 1927"            /* z§NV÷âzåËnå8…‚.' */
+	$"019D B4B0 E6D9 0F0E 9670 7723 62CF C422"            /* .�´°æÙ..–pw#bÏÄ" */
+	$"DD53 ED12 92AE 20B0 6B63 6CB3 C596 4F4E"            /* ÝSí.’® °kcl³Å–ON */
+	$"18B6 FD06 93B2 6F73 A740 770D C39F B873"            /* .¶ý.“²os§@w.߸s */
+	$"598F 3667 6F7A 29E9 9E6F 9D04 48DD A175"            /* Y�6goz)éžo�.HÝ¡u */
+	$"2AFC 61BD D706 2A8E 9789 F513 B8AF B8EA"            /* *üa½×.*Ž—‰õ.¸¯¸ê */
+	$"2426 7EDF 1EFA 1D19 7A50 D22F D15E 76FE"            /* $&~ß.ú..zPÒ/Ñ^vþ */
+	$"CD34 19AD 8126 775C A5FB B209 9658 F850"            /* Í4.­�&w\¥û²Æ–XøP */
+	$"F2FD A65F B487 9F50 7FF0 12FD BA8B FB6E"            /* òý¦_´‡ŸP.ð.ýº‹ûn */
+	$"49F5 50DF C349 B4F9 F4D7 EDEB 53BE DEB0"            /* IõPßÃI´ùô×íëS¾Þ° */
+	$"7F85 29FB 5DFF 36B9 BEDA 9BF8 3CF2 FDAE"            /* .…)û]ÿ6¹¾Ú›ø<òý® */
+	$"DFB5 ABBE D3DB ED2B FDBA CFFB 7606 FB74"            /* ßµ«¾ÓÛí+ýºÏûv.ût */
+	$"D3F8 6B96 83BA F7ED EB3F 7EDE AFE0 EECD"            /* Óøk–ƒº÷íë?~Þ¯àîÍ */
+	$"FB5E 7F6E 807E DB9B F6BD F0FE D32B EA21"            /* û^.n€~Û›ö½ðþÓ+ê! */
+	$"EFA8 1EFA 823F 6DCF FB6C 8BEA 6CFD B5AF"            /* ï¨.ú‚?mÏûl‹êlýµ¯ */
+	$"0774 CFDB D337 FB7A 3F83 BA5D F51F DF55"            /* .tÏÛÓ7ûz?ƒº]õ.ßU */
+	$"47FB 690F DA86 F791 DDD6 2CCB E6B8 C536"            /* Gûi.Ú†÷‘ÝÖ,Ëæ¸Å6 */
+	$"D512 AD5E 1B08 0B8A 8D03 2F75 60E5 6BF8"            /* Õ.­^...Š�./u`åkø */
+	$"447B C66A 7EC2 7912 B45F 8E48 277C D8E1"            /* D{Æj~Ây.´_ŽH'|Øá */
+	$"809C 5755 D718 BAAC F891 2AE5 F97C 3F5E"            /* €œWU×.º¬ø‘*åù|?^ */
+	$"0116 3A00 99F4 5896 E0EA B189 F5A5 7929"            /* ..:.™ôX–à걉õ¥y) */
+	$"C491 B57F 2232 B0C2 52F8 89B1 DB2F B284"            /* Ä‘µ."2°ÂRø‰±Û/²„ */
+	$"C1EE 0C43 EF76 FD94 F871 4077 7E19 EC36"            /* Áî.Cïvý”øq@w~.ì6 */
+	$"BBFA 6DFF 3C0B 5A98 89B4 84BB 56DB 5FC2"            /* »úmÿ<.Z˜‰´„»VÛ_ */
+	$"16C2 351A B46E AF45 AAC7 DD2E 97ED 970C"            /* .Â5.´n¯EªÇÝ.—í—. */
+	$"76D8 F8D0 42EB E639 28E8 BE33 A530 3B58"            /* vØøÐBëæ9(è¾3¥0;X */
+	$"2374 6B1C 97B0 1CD5 ACD5 615F FD30 62C6"            /* #tk.—°.Õ¬Õa_ý0bÆ */
+	$"899A 977D 4B74 CAB1 E9EE 6588 4E67 8733"            /* ‰š—}KtʱéîeˆNg‡3 */
+	$"B359 BCC7 DC7B 9884 E4A8 78CB 77E7 675D"            /* ³Y¼ÇÜ{˜„ä¨xËwçg] */
+	$"FF2D FCE4 7744 BDD1 A833 6BEC C481 2DA8"            /* ÿ-üäwD½Ñ¨3kìÄ�-¨ */
+	$"3D1C 5D57 7595 1DEB 2278 31AE 4188 B1F2"            /* =.]Wu•.ë"x1®Aˆ±ò */
+	$"54E1 113D DA75 96ED 71FF 1577 7820 4D22"            /* Tá.=Úu–íqÿ.wx M" */
+	$"2BD9 3841 A416 96A4 2549 1A9D 3A55 8E39"            /* +Ù8A¤.–¤%I.�:UŽ9 */
+	$"A929 4B4E E11F 0F88 8BB6 7E08 2210 9D21"            /* ©)KNá..ˆ‹¶~.".�! */
+	$"92BF 623B B974 D371 0208 1489 5713 0F66"            /* ’¿b;¹tÓq...‰W..f */
+	$"3C4C 8394 72A6 08A1 3D86 BA0C 198B CE8B"            /* <Lƒ”r¦.¡=†º..‹Î‹ */
+	$"FB71 18D8 E044 CE7C A642 F1E5 DC8B F8E6"            /* ûq.ØàDÎ|¦BñåÜ‹øæ */
+	$"2405 66E0 B6C5 6A4F B1AE 2231 3060 11D4"            /* $.fà¶ÅjO±®"10`.Ô */
+	$"9963 5EF4 BB3D 1F61 0807 0AE1 0DFC 4718"            /* ™c^ô»=.a..Âá.üG. */
+	$"6C97 80A7 D438 6A81 B76A 6E7E 7A64 87A1"            /* l—€§Ô8j�·jn~zd‡¡ */
+	$"1D7A 8744 3227 F565 4B4A E311 FA0F B477"            /* .z‡D2'õeKJã.ú.´w */
+	$"9DD6 0662 8844 7138 BDF8 CBCC 007F BDB6"            /* �Ö.bˆDq8½øËÌ..½¶ */
+	$"07C4 98CC 226B 9762 33D0 99EF 54D9 5800"            /* .ĘÌ"k—b3ЙïTÙX. */
+	$"509D C37B 39A7 E11B 8771 0999 AB8B AAA6"            /* P�Ã{9§á.‡qÆ™«‹ª¦ */
+	$"C463 6C38 7FB0 9121 2CA2 7634 BBEE 41FB"            /* Äcl8.°‘!,¢v4»îAû */
+	$"4F3B B050 3E38 15C4 98A6 216D 31C2 7057"            /* O;°P>8.ʦ!m1ÂpW */
+	$"0B3D 429A 6CFB 0819 EB4D B9D2 549F 6601"            /* .=Bšlû..ëM¹ÒTŸf. */
+	$"2436 5BEA 9DAC BBDA AB3A AB4F ABFF 768D"            /* $6[ê�¬»Ú«:«O«ÿv� */
+	$"E220 E451 7E45 49C5 21FD B2E6 DEFD 2505"            /* â äQ~EIÅ!ý²æÞý%. */
+	$"836B 3500 54D8 50B8 7538 C5BF B951 7FB2"            /* ƒk5.TØP¸u8Å¿¹Q.² */
+	$"F927 CBB1 7AA1 D0BD 51E2 D7F7 C440 5DA0"            /* ù'˱z¡Ð½Qâ×÷Ä@]  */
+	$"89EF FEEE BF2E A5E4 F98A B652 F25A D1DC"            /* ‰ïþî¿.¥äùŠ¶RòZÑÜ */
+	$"482A 40CB A288 250A 22CA BCB4 815D 077E"            /* H*@Ë¢ˆ%Â"ʼ´�].~ */
+	$"229E 59B2 8249 D336 A3C1 5D5B FAE5 483C"            /* "žY²‚IÓ6£Á][úåH< */
+	$"67F3 255E 1530 AFB1 D900 48FE 254B C54E"            /* gó%^.0¯±Ù.Hþ%KÅN */
+	$"42DC EE54 066B CE83 B1C9 F021 2031 8DF1"            /* BÜîT.k΃±Éð! 1�ñ */
+	$"FE58 9315 B761 79CA 409A 6CD6 337A 14A9"            /* þX“.·ayÊ@šlÖ3z.© */
+	$"8622 90BC 3474 727C 66CE 09C5 61B4 A386"            /* †"�¼4tr|fÎÆÅa´£† */
+	$"7509 819F 6EEB 5FCC C0A7 084A 7742 A6E3"            /* uÆ�Ÿnë_ÌÀ§.JwB¦ã */
+	$"F69A 90CA 24AD EB53 60AB 5FD0 FD6F 3DE6"            /* öš�Ê$­ëS`«_Ðýo=æ */
+	$"44CF 80FB A400 B71F 1DD4 C690 A3DB 54CF"            /* DÏ€û¤.·..ÔÆ�£ÛTÏ */
+	$"F492 7EC7 540C 048F 3D35 FD63 7593 751B"            /* ô’~ÇT..�=5ýcu“u. */
+	$"F88F 4B7D E355 6685 FD5F 2743 8DF3 D839"            /* ø�K}ãUf…ý_'C�óØ9 */
+	$"0894 99DB 1FAA 22B2 8800 8C9F D91F E60B"            /* .”™Û.ª"²ˆ.ŒŸÙ.æ. */
+	$"0EEE 2870 2932 2AE5 F401 11F0 8B2B 53DB"            /* .î(p)2*åô..ð‹+SÛ */
+	$"8028 E39D 744F E70B 11F3 A220 ABF4 FCD5"            /* €(ã�tOç..ó¢ «ôüÕ */
+	$"37C9 0AC8 8749 215E 1D89 4022 96D0 04FF"            /* 7ÉÂȇI!^.‰@"–Ð.ÿ */
+	$"0C57 AC3D 351A 8582 EBA4 EA2B B65B A14B"            /* .W¬=5.…‚ë¤ê+¶[¡K */
+	$"048B E031 DE15 251C 669F 8457 FF38 D131"            /* .‹à1Þ.%.fŸ„Wÿ8Ñ1 */
+	$"0027 BB20 9721 6636 A375 AFBA AF7B BDBA"            /* .'» —!f6£u¯º¯{½º */
+	$"05F3 3114 E55E DAA9 219F 9516 F3DF 12B4"            /* .ó1.å^Ú©!Ÿ•.óß.´ */
+	$"DA3F 83DF 13A0 9900 3FA6 17E9 B014 E404"            /* Ú?ƒß. ™.?¦.é°.ä. */
+	$"434D 02D4 4283 D73D F4D1 5D95 8B25 6A6A"            /* CM.ÔBƒ×=ôÑ]•‹%jj */
+	$"CD5E BA93 82DF 1A30 4B0D 0E21 65A1 0001"            /* Í^º“‚ß.0K..!e¡.. */
+	$"2869 F06A 8949 311F DB03 39EB E8E1 5BFB"            /* (iðj‰I1.Û.9ëèá[û */
+	$"F11C 05C6 2469 BAEA 4516 4CC4 DAF5 927A"            /* ñ..Æ$iºêE.LÄÚõ’z */
+	$"2CEB 3150 DB6F 4DE2 8EED 59C0 604F 9AE5"            /* ,ë1PÛoMâŽíYÀ`Ošå */
+	$"E136 83B0 F348 3D1A B44D 3A8E D77A B0DE"            /* á6ƒ°óH=.´M:Ž×z°Þ */
+	$"5267 1055 24F7 3C3D EB3E 08EF 97F9 4B29"            /* Rg.U$÷<=ë>.ï—ùK) */
+	$"454F 1B5D 4A6E 56E1 0F90 00A1 4467 7454"            /* EO.]JnVá.�.¡DgtT */
+	$"B556 362A 9A19 9E35 19E9 BFDF E2AD 91D6"            /* µV6*š.ž5.é¿ßâ­‘Ö */
+	$"7FB6 95B9 F19D 8D07 2FAF 3162 D880 0AA7"            /* .¶•¹ñ��./¯1b؀§ */
+	$"C9C4 94AD C49A 1231 2D9F 780F 6E3E 57D2"            /* ÉÄ”­Äš.1-Ÿx.n>WÒ */
+	$"8C1C 582C 179A 721C 7063 F056 F938 4EA1"            /* Œ.X,.šr.pcðVù8N¡ */
+	$"F3E4 E458 D254 280F 92CA ABDC 4ECF 3EB7"            /* óääXÒT(.’Ê«ÜNÏ>· */
+	$"95DF A3B8 45C0 1427 BA54 B2E2 D1BC B67D"            /* •ß£¸EÀ.'ºT²âѼ¶} */
+	$"5A0F EE12 37D4 BE1C 5785 A90D 2E62 B301"            /* Z.î.7Ô¾.W…©..b³. */
+	$"F66D A637 374B 17DA 7446 C318 3B11 4F50"            /* öm¦77K.ÚtFÃ.;.OP */
+	$"ED27 AEB2 D8F6 C3E4 AB48 5E7C 1D46 9463"            /* í'®²ØöÃä«H^|.F”c */
+	$"E7BA 9296 7BFA FDBB 39F2 7E86 1A5D 8FFA"            /* 纒–{úý»9ò~†.]�ú */
+	$"7E06 FC92 3472 7950 8B67 8329 FA9F 47AA"            /* ~.ü’4ryP‹gƒ)úŸGª */
+	$"51F3 01AD A6DA 224F E711 AF6F BA8F FA86"            /* Qó.­¦Ú"Oç.¯oº�ú† */
+	$"FF61 EBD1 5613 B076 3543 3515 FF1B 1E9C"            /* ÿaëÑV.°v5C5.ÿ..œ */
+	$"CE78 6A36 7CCF FD63 E9E3 00E6 EA60 1DBE"            /* Îxj6|Ïýcéã.æê`.¾ */
+	$"42FB 3E66 D69D 8BA6 A0E6 13E1 2087 20D7"            /* Bû>fÖ�‹¦ æ.á ‡ × */
+	$"7941 E3C4 C7C6 67FF 2C9C A486 253A C206"            /* yAãÄÇÆgÿ,œ¤†%:Â. */
+	$"F961 4A0E D9DD D32A 6D67 A012 B1A2 B549"            /* ùaJ.ÙÝÓ*mg .±¢µI */
+	$"3F58 8BA1 CA98 94EB 6099 570C D139 09AA"            /* ?X‹¡Ê˜”ë`™W.Ñ9ƪ */
+	$"8DEB C31A 0812 5DAD 2926 6846 D789 4430"            /* �ëÃ...]­)&hF׉D0 */
+	$"4931 16B5 0804 52F1 040D B0A7 DDD7 7052"            /* I1.µ..Rñ..°§Ý×pR */
+	$"4269 C765 98AA 3941 F9EE 987A 2EAD 46BE"            /* BiÇe˜ª9Aùî˜z.­F¾ */
+	$"AA2B DD79 D9F9 7AF7 9318 B633 97CC DB93"            /* ª+ÝyÙùz÷“.¶3—ÌÛ“ */
+	$"5AF7 23D4 08E5 1FD7 EA45 85E9 4C98 77B6"            /* Z÷#Ô.å.×êE…éL˜w¶ */
+	$"0038 8756 6C8F 1A76 8D36 D67C 0BBD 248F"            /* .8‡Vl�.v�6Ö|.½$� */
+	$"8465 4CC4 7B7A C1B7 6348 F763 66A7 F04E"            /* „eLÄ{zÁ·cH÷cf§ðN */
+	$"FF4E 1C72 1053 323F 9E55 F75D 4097 9C24"            /* ÿN.r.S2?žU÷]@—œ$ */
+	$"AD5D 3C1B 766A 50A8 7252 6563 2687 8251"            /* ­]<.vjP¨rRec&‡‚Q */
+	$"8AE2 2EAE 6AA9 6439 2831 281E 034D 7999"            /* Šâ.®j©d9(1(..My™ */
+	$"F46F 47C1 911D 553A D887 0E8F 6E83 1B48"            /* ôoGÁ‘.U:؇.�nƒ.H */
+	$"F0D9 C566 C0FF 0F02 5E68 EA76 7381 25B1"            /* ðÙÅfÀÿ..^hêvs�%± */
+	$"D388 A375 370B A655 625B B71A 191C CD9D"            /* Óˆ£u7.¦Ub[·...Í� */
+	$"F3CA 83B2 88D6 3712 B3E3 6CEA 19DC 3295"            /* óʃ²ˆÖ7.³ãlê.Ü2• */
+	$"3398 DF4F 1279 B346 1DD8 ED24 186F BEE1"            /* 3˜ßO.y³F.Øí$.o¾á */
+	$"8FD4 5FAD EAFF 6960 DE17 A0A4 B89E 7CF3"            /* �Ô_­êÿi`Þ. ¤¸ž|ó */
+	$"C360 9DA8 91BF 470F ECC0 C0AA E260 3430"            /* Ã`�¨‘¿G.ìÀÀªâ`40 */
+	$"EF4E CAD6 F964 05B0 8E27 C1F6 7516 4350"            /* ïNÊÖùd.°Ž'Áöu.CP */
+	$"B87D 7D16 703E 7972 1232 2E0F 6577 664C"            /* ¸}}.p>yr.2..ewfL */
+	$"8FA6 1414 7FB2 A33D A69E FD2F CF21 FC8F"            /* �¦...²£=¦žý/Ï!ü� */
+	$"23A5 6AED 3E28 34A0 F73F F7D6 7F7C 5B6B"            /* #¥jí>(4 ÷?÷Ö.|[k */
+	$"0596 8B6D BACA 52DF 8E72 CDBA E221 7092"            /* .–‹mºÊRߎrͺâ!p’ */
+	$"A3AB B99D 1EE3 3F21 1AD2 0F0B DC5A 8BE1"            /* £«¹�.ã?!.Ò..ÜZ‹á */
+	$"9E35 D891 9A60 EF28 5934 FA3B 8009 DC42"            /* ž5Ø‘š`ï(Y4ú;€ÆÜB */
+	$"11BE 487F D776 AF26 0EBD BF3E 8DCC B940"            /* .¾H.×v¯&.½¿>�̹@ */
+	$"2523 D6E1 447F EA8A 5F66 DE0B 0962 249E"            /* %#ÖáD.êŠ_fÞ.Æb$ž */
+	$"165D BB6D 1EBD 1237 021B F903 DEEF 78FE"            /* .]»m.½.7..ù.Þïxþ */
+	$"B3F3 76B7 429F 336D 0EFA FF47 5CBC E3DF"            /* ³óv·BŸ3m.úÿG\¼ãß */
+	$"FC44 41BA BC9D 67AE 0B43 D817 FBCE 4F36"            /* üDAº¼�g®.CØ.ûÎO6 */
+	$"8209 CCB5 38F6 712E 7DEA 4E9E 4B38 3B80"            /* ‚Æ̵8öq.}êNžK8;€ */
+	$"7B16 28E3 AB59 340E 93F0 4C65 C281 A4F1"            /* {.(ã«Y4.“ðLeÂ�¤ñ */
+	$"08E4 26A6 31AA B6A4 F784 BA8E C7FA 8919"            /* .ä&¦1ª¶¤÷„ºŽÇú‰. */
+	$"4B19 FA98 09C8 3C79 27DA CB39 881C 3B0E"            /* K.ú˜ÆÈ<y'ÚË9ˆ.;. */
+	$"9BEA 1EF3 D655 CFEB B4F7 0888 971D 69EF"            /* ›ê.óÖUÏë´÷.ˆ—.iï */
+	$"1105 0EF2 80B8 FF1E F0BE 107F 9AB0 6C52"            /* ...ò€¸ÿ.ð¾..š°lR */
+	$"FF78 3AA4 8FE0 3370 40DF C5E8 478A 2FCF"            /* ÿx:¤�à3p@ßÅèGŠ/Ï */
+	$"96C5 8D32 8E07 AA93 DA95 4D9B 60C6 2748"            /* –Å�2Ž.ª“Ú•M›`Æ'H */
+	$"C8F4 8347 D2D9 2E35 75E4 333A 6494 B177"            /* ÈôƒGÒÙ.5uä3:d”±w */
+	$"C836 6E4F AF08 CDB0 0FA5 D565 A0EC 946F"            /* È6nO¯.Í°.¥Õe ì”o */
+	$"ED5C 03F6 E5DB FA4F D29A BF8F BC7F 12D8"            /* í\.öåÛúOÒš¿�¼..Ø */
+	$"7730 8564 524D 4B31 F681 8C71 C5BC 1641"            /* w0…dRMK1ö�Œqż.A */
+	$"6988 F9CF 0385 B8EE 4C04 07DB 5AD2 531C"            /* iˆùÏ.…¸îL..ÛZÒS. */
+	$"48BA 3E6F E24E AF73 DB5E B729 A4BF 894A"            /* Hº>oâN¯sÛ^·)¤¿‰J */
+	$"782D E8F2 91C9 E628 322C F20C 2D0C 73DD"            /* x-èò‘Éæ(2,ò.-.sÝ */
+	$"F093 4ED7 63DF E121 E7B9 DB7E 530D E3BD"            /* ð“N×cßá!ç¹Û~S.ã½ */
+	$"3469 29CE 5768 BE0F 1E91 46B7 00A0 CC2E"            /* 4i)ÎWh¾..‘F·. Ì. */
+	$"183D 7D57 762C 062D 0707 EBA4 177D 73E8"            /* .=}Wv,.-..ë¤.}sè */
+	$"FA30 83A6 479B AA9A 702E B8FD 9B54 0FF3"            /* ú0ƒ¦G›ªšp.¸ý›T.ó */
+	$"8222 1EB0 4CDD 4CF7 F0AB 8972 B655 9426"            /* ‚".°LÝL÷ð«‰r¶U”& */
+	$"4EEE 3B88 A6D2 F8B9 6845 0467 D606 9DDD"            /* Nî;ˆ¦Òø¹hE.gÖ.�Ý */
+	$"C547 A61F 71E7 5A8E 6B83 51FD B2C1 A732"            /* ÅG¦.qçZŽkƒQý²Á§2 */
+	$"A6EA A0AA 6D13 E80B 0EC4 5DF4 348F FF6E"            /* ¦ê ªm.è..Ä]ô4�ÿn */
+	$"2289 CFB4 1AE2 18D1 340F B29B E1FF 16B1"            /* "‰Ï´.â.Ñ4.²›áÿ.± */
+	$"0F0F B5AD 260A 7FD9 B1F2 3D0C 404F 75A8"            /* ..µ­&Â.Ù±ò=.@Ou¨ */
+	$"E4DB 52EE 259B D762 E5E5 4FFD 22AC 4856"            /* äÛRî%›×bååOý"¬HV */
+	$"9C62 8DDB F5D8 58F8 4EC7 1110 30EC E0D8"            /* œb�ÛõØXøNÇ..0ìàØ */
+	$"7FED 0176 FEF2 53B3 75C6 34E1 A3A7 79DA"            /* .í.vþòS³uÆ4ᣧyÚ */
+	$"1FDC 42EC 83B2 F3EB 056C E41B 4E65 3699"            /* .ÜB샲óë.lä.Ne6™ */
+	$"4BD6 1AE3 85A9 DBF6 89D4 39B0 79F9 8877"            /* KÖ.ã…©Ûö‰Ô9°yùˆw */
+	$"161C 2CB5 3F3C 294B 8CA3 A6F6 556C 4CAD"            /* ..,µ?<)KŒ£¦öUlL­ */
+	$"A752 918D 7E61 BA54 02D2 CF5C AEBE 1A0B"            /* §R‘�~aºT.ÒÏ\®¾.. */
+	$"B75C A9CA 9876 AB0B 6028 4D8E D46C E479"            /* ·\©Ê˜v«.`(MŽÔläy */
+	$"A186 EA09 496E 0935 04E2 4C25 FA18 270B"            /* ¡†êÆInÆ5.âL%ú.'. */
+	$"A054 DE1C 1BD8 A089 9D95 1335 E93C 7C21"            /*  TÞ..Ø ‰�•.5é<|! */
+	$"435E A570 3C42 AA88 0075 BB20 20AF 90EC"            /* C^¥p<Bªˆ.u»  ¯�ì */
+	$"26F9 7E41 5CC7 2154 63A3 D965 075C 1A78"            /* &ù~A\Ç!Tc£Ùe.\.x */
+	$"2A13 753E DDD9 F846 467C EFC6 5308 2B46"            /* *.u>ÝÙøFF|ïÆS.+F */
+	$"5BD9 2BFF 5F26 72DB 523D D0FC CE49 47B0"            /* [Ù+ÿ_&rÛR=ÐüÎIG° */
+	$"D98B 4D36 1B60 7C3A 0707 F46A 8565 4CCB"            /* Ù‹M6.`|:..ôj…eLË */
+	$"5DC1 A50D C039 BF24 7418 78A7 6D4F DE55"            /* ]Á¥.À9¿$t.x§mOÞU */
+	$"1CB8 B787 158C 6C4D D840 920F 3130 7A92"            /* .¸·‡.ŒlMØ@’.10z’ */
+	$"1CF4 1B74 BC2B 8954 0A80 9636 BFC3 6330"            /* .ô.t¼+‰T€–6¿Ãc0 */
+	$"3E7F 7E4E A811 39F2 3D56 10D3 6A76 4E20"            /* >.~N¨.9ò=V.ÓjvN  */
+	$"F646 5CD3 9166 D2D6 046F E398 A934 2D04"            /* öF\Ó‘fÒÖ.o㘩4-. */
+	$"2E01 C602 1332 8274 6AE2 D5C9 6226 30B3"            /* ..Æ..2‚tjâÕÉb&0³ */
+	$"07DB FDF3 B3BB 6C31 B162 FF63 0639 8E6F"            /* .Ûýó³»l1±bÿc.9Žo */
+	$"3501 A54C 1AA6 42EB EDE7 885E EE2F A6D9"            /* 5.¥L.¦Bëíçˆ^î/¦Ù */
+	$"B74A AE20 8FFB 6FCF A537 642D F17F A45E"            /* ·J® �ûoÏ¥7d-ñ.¤^ */
+	$"EE37 DE05 7569 A81E F464 A35B 603B 4F40"            /* î7Þ.ui¨.ôd£[`;O@ */
+	$"D00F C3D2 D04A F943 AC3C 37E2 1B2B A1D3"            /* Ð.ÃÒÐJùC¬<7â.+¡Ó */
+	$"09D6 A92B F7CB B2FA 9FF7 97F2 83F9 BABC"            /* ÆÖ©+÷˲úŸ÷—òƒùº¼ */
+	$"E4BE F015 E804 97FC A16F 6E8B 9004 8424"            /* ä¾ð.è.—ü¡on‹�.„$ */
+	$"04F7 1295 0A15 3C1A AA5D 6A75 372A 0BB4"            /* .÷.•Â.<.ª]ju7*.´ */
+	$"4849 DD4A 012F D969 23A9 FBA7 C3EB D29F"            /* HIÝJ./Ùi#©û§ÃëÒŸ */
+	$"5CE0 BD6F 8436 26BB 1B52 3BCB DCAA 0791"            /* \à½o„6&».R;Ëܪ.‘ */
+	$"02B3 8EC7 5A89 D402 C9FF 058E E2C8 AD72"            /* .³ŽÇZ‰Ô.Éÿ.ŽâÈ­r */
+	$"01BF D9B3 FA52 B000 0000 3090 8B4E 8809"            /* .¿Ù³úR°...0�‹NˆÆ */
+	$"9E4F 59A7 8021 D030 169B 78E6 55B4 9FB8"            /* žOY§€!Ð0.›xæU´Ÿ¸ */
+	$"48A1 D2F4 BE8E A948 A89E 5E3E BE56 AE8C"            /* H¡Òô¾Ž©H¨ž^>¾V®Œ */
+	$"BF6C 6485 F435 4906 BE37 4D88 589A 85C0"            /* ¿ld…ô5I.¾7MˆXš…À */
+	$"5278 59EC 1FED 3652 3FE0 5229 0524 D686"            /* RxYì.í6R?àR).$Ö† */
+	$"1E5E 14D9 8C56 8742 9625 36BB 4674 0391"            /* .^.ÙŒV‡B–%6»Ft.‘ */
+	$"9647 FCC9 30C4 6D0D 5812 1271 E9C8 E89D"            /* –GüÉ0Äm.X..qéÈè� */
+	$"7F9B 3420 0269 5F58 4554 F964 BDDA E9F3"            /* .›4 .i_XETùd½Úéó */
+	$"973A 5B5F 4C59 107B 2D9E 87CB D896 1F13"            /* —:[_LY.{-ž‡ËØ–.. */
+	$"AC52 F00D 3600 9104 3FF2 399A 0158 5153"            /* ¬Rð.6.‘.?ò9š.XQS */
+	$"139A A5C2 51CC D2C7 D082 C2A0 E35B FE05"            /* .š¥ÂQÌÒÇЂ ã[þ. */
+	$"06C9 DBB4 7036 39DB 80AF 4642 9F53 170C"            /* .ÉÛ´p69Û€¯FBŸS.. */
+	$"2856 38D5 0FA7 B562 4ED8 3BB5 B48A B1C8"            /* (V8Õ.§µbNØ;µ´Š±È */
+	$"B20B 4B42 4499 C5C1 242B A1BA CB74 D8F1"            /* ².KBD™ÅÁ$+¡ºËtØñ */
+	$"1CF1 241E 7A2A B847 111D 13DC CD3C 05A3"            /* .ñ$.z*¸G...ÜÍ<.£ */
+	$"024F 25B5 41E2 0A15 E1C4 1A0E A5D8 0742"            /* .O%µAâÂ.áÄ..¥Ø.B */
+	$"A359 2372 FD88 7447 1DB7 F766 5B7F E63E"            /* £Y#rýˆtG.·÷f[.æ> */
+	$"26B8 BC6E 7B72 E331 2BE1 73BD 04A0 E941"            /* &¸¼n{rã1+ás½. éA */
+	$"45EC 9039 8769 8BFF 1624 8D43 CA24 9D0D"            /* Eì�9‡i‹ÿ.$�CÊ$�. */
+	$"A05B F467 7401 E777 0608 C4A6 A698 9A9B"            /*  [ôgt.çw..Ħ¦˜š› */
+	$"7066 11D3 606F 857E 18D8 D9D3 E226 38C0"            /* pf.Ó`o…~.ØÙÓâ&8À */
+	$"D89B 09D9 A2F1 0171 BAC9 D7BF AB2E BD58"            /* Ø›ÆÙ¢ñ.qºÉ׿«.½X */
+	$"7178 6CC2 608D 447D D92A 621C 1A82 B764"            /* qxlÂ`�D}Ù*b..‚·d */
+	$"2ABE CBE8 07C0 E2A6 9B83 46A8 1109 FC87"            /* *¾Ëè.À⦛ƒF¨.Æü‡ */
+	$"F083 9598 26AE 8847 7E22 278D 9311 59FC"            /* ðƒ•˜&®ˆG~"'�“.Yü */
+	$"2995 1D44 BA58 24BC 2A99 3946 0E00 9144"            /* )•.DºX$¼*™9F..‘D */
+	$"9113 0297 29E3 A7B5 B937 2D23 8405 86ED"            /* ‘..—)㧵¹7-#„.†í */
+	$"29F1 5254 6A8C 0FB8 4B13 F6C3 6028 2C14"            /* )ñRTjŒ.¸K.öÃ`(,. */
+	$"3B80 E317 225C 7A9B 405C 7E95 A2E4 311B"            /* ;€ã."\z›@\~•¢ä1. */
+	$"076A D7B8 A4B5 225A 1F29 FAA2 8239 D98F"            /* .j׸¤µ"Z.)ú¢‚9Ù� */
+	$"071A F302 DA24 AE80 2AC0 D108 035D EA76"            /* ..ó.Ú$®€*ÀÑ..]êv */
+	$"2F7E 850F 9E87 6B19 B2F1 F1E5 F5B3 A5AF"            /* /~….ž‡k.²ññåõ³¥¯ */
+	$"35BB D867 8257 8A48 5E4F 6983 E22E 6DAD"            /* 5»Øg‚WŠH^Oiƒâ.m­ */
+	$"D361 1505 ECF2 3F3C DB84 1861 E5AB 6793"            /* Óa..ìò?<Û„.aå«g“ */
+	$"910D 8F56 6BB5 FD17 29DB 242A 6946 8022"            /* ‘.�Vkµý.)Û$*iF€" */
+	$"7DAF 8120 02EB C840 3765 69EC BB8B F2FF"            /* }¯� .ëÈ@7ei컋òÿ */
+	$"6031 7BE4 EFC4 BECD 7BD7 CB0A 8B8C 75C2"            /* `1{äïľÍ{×Ë‹Œu */
+	$"E63A F4E4 B05B 1442 0CB1 BEBD E078 84F5"            /* æ:ôä°[.B.±¾½àx„õ */
+	$"3D95 24FA 952F 949B AD72 01B7 1CC7 4CA6"            /* =•$ú•/”›­r.·.ÇL¦ */
+	$"78C2 BA05 B757 517A 5CB1 A380 0C23 0680"            /* xº.·WQz\±£€.#.€ */
+	$"3113 0CBA 23B8 AA48 F832 B74F 997E 6E03"            /* 1..º#¸ªHø2·O™~n. */
+	$"D16C 577F 968F E9A4 73CA DA79 07B3 A5F1"            /* ÑlW.–�é¤sÊÚy.³¥ñ */
+	$"2D20 C13D F821 62F9 41A0 A7AA 472A 368A"            /* - Á=ø!bùA §ªG*6Š */
+	$"28EE 7686 F7B4 D5CF 225E 004E 709F C4E8"            /* (îv†÷´ÕÏ"^.NpŸÄè */
+	$"FCBC B778 C976 A1E0 1968 1EF9 E998 2DC2"            /* ü¼·xÉv¡à.h.ùé˜- */
+	$"1693 C645 A4F5 787A 5B10 45C0 F010 8596"            /* .“ÆE¤õxz[.EÀð.…– */
+	$"A0F6 E8AA 1BAC C958 C0F6 101E 0C4D 2E61"            /*  öèª.¬ÉXÀö...M.a */
+	$"B76E 4019 58DD 3058 000C 2375 6EBC 6599"            /* ·n@.XÝ0X..#un¼e™ */
+	$"BEA3 9ADC 0002 F98F 24B3 B036 EA0D F2FD"            /* ¾£šÜ..ù�$³°6ê.òý */
+	$"6823 E10A 59D7 5D0B F6C0 EFB2 7D9D A684"            /* h#áÂY×].öÀï²}�¦„ */
+	$"3084 4AD6 92F2 BFB2 57CA 7294 FF2D 53C8"            /* 0„JÖ’ò¿²WÊr”ÿ-SÈ */
+	$"8D05 254E 2360 582F CE0C E209 240D FAB4"            /* �.%N#`X/Î.âÆ$.ú´ */
+	$"C638 2103 7462 2AF1 5461 2036 09B4 294F"            /* Æ8!.tb*ñTa 6Æ´)O */
+	$"52A6 6553 F6B7 85F6 E77F A8B7 058C F201"            /* R¦eSö·…öç.¨·.Œò. */
+	$"19BA D75B 6612 0013 CFA6 F54F 8855 C000"            /* .º×[f...ϦõOˆUÀ. */
+	$"00BE 57DE C13B 77B0 AF81 F95D 8E88 7224"            /* .¾WÞÁ;w°¯�ù]Žˆr$ */
+	$"002F C7BE 1D06 F540 58EF 1909 1D8F 037F"            /* ./Ǿ..õ@Xï.Æ.�.. */
+	$"E973 290F 641E 8849 F996 EA66 D15C CA23"            /* és).d.ˆIù–êfÑ\Ê# */
+	$"C620 3090 94D8 F95F C58C 720B 7FFE 206C"            /* Æ 0�”Øù_ÅŒr..þ l */
+	$"A3E0 EE49 AE89 4586 6617 FE87 4D7B D300"            /* £àîI®‰E†f.þ‡M{Ó. */
+	$"4CF6 E77F A882 E041 362F 710E AC03 D573"            /* Löç.¨‚àA6/q.¬.Õs */
+	$"69FF 7480 0018 484B 0D10 C800 0000 0C24"            /* iÿt€..HK..È....$ */
+	$"183F ADBF D900 0184 8481 E82C C758 1848"            /* .?­¿Ù..„„�è,ÇX.H */
+	$"4840 6806 1212 B020 EA50 0818 484B F6E7"            /* H@h...° êP..HKöç */
+	$"7FA5 E774 6249 2F3D 5FF9 2FC0 0C24 1656"            /* .¥çtbI/=_ù/À.$.V */
+	$"1B91 8000 1846 D5F4 CA01 40C2 3F26 3D84"            /* .‘€..FÕôÊ.@Â?&=„ */
+	$"7B4A 811F 08D6 B47D 05C2 4402 D57B C1FC"            /* {J�..Ö´}.ÂD.Õ{Áü */
+	$"7D32 E6FE 8125 F24E 514B 2820 7323 F96F"            /* }2æþ�%òNQK( s#ùo */
+	$"B1F9 CDBD 94E4 C9BF 81D6 5A26 1C08 2131"            /* ±ùͽ”äÉ¿�ÖZ&..!1 */
+	$"FF58 608E A4BB BEFD 703F C3EA B596 2AEA"            /* ÿX`Ž¤»¾ýp?Ãêµ–*ê */
+	$"48B2 2319 2F7A B9BC A14D EAB4 49CF 89E9"            /* H²#./z¹¼¡Mê´Iωé */
+	$"D312 5979 1910 6519 C45E 4B88 F709 D65D"            /* Ó.Yy..e.Ä^Kˆ÷ÆÖ] */
+	$"BF0F 86DC C883 8469 9757 7FC7 FB91 A851"            /* ¿.†Üȃ„i—W.Çû‘¨Q */
+	$"7834 0232 03F5 F552 B022 E799 431E 3FE8"            /* x4.2.õõR°"ç™C.?è */
+	$"BE7C A37B AAE1 D04F 9795 EA98 CAB0 6816"            /* ¾|£{ªáÐO—•ê˜Ê°h. */
+	$"047F 244A 2BD3 E0CF B862 B172 B1B3 F027"            /* ..$J+Óàϸb±r±³ð' */
+	$"6505 A5AA 6AB2 5F8E B98F 85CB D487 2603"            /* e.¥ªj²_Ž¹�…ËÔ‡&. */
+	$"BDA4 4C6D 4B74 0A12 117F 6137 6A30 37CE"            /* ½¤LmKtÂ...a7j07Î */
+	$"0441 188C 63FC 46ED 5C9A B6A0 9012 6450"            /* .A.ŒcüFí\š¶ �.dP */
+	$"A042 C4D3 8E69 8930 0797 25B3 B70D 5C62"            /*  BÄÓŽi‰0.—%³·.\b */
+	$"6A83 3964 5EF1 4A28 508D FF7F E847 17D0"            /* jƒ9d^ñJ(P�ÿ.èG.Ð */
+	$"7C91 F4BC AA82 5462 99EF FF79 5A7A E45E"            /* |‘ô¼ª‚Tb™ïÿyZzä^ */
+	$"98FF 5B1E 90FE 7F80 9453 7AD1 4A63 8FFC"            /* ˜ÿ[.�þ.€”SzÑJc�ü */
+	$"1B61 796C 4B90 7FE9 1959 752B 8579 95F8"            /* .aylK�.é.Yu+…y•ø */
+	$"C5B9 7EC6 2D24 5185 1BCE 12D6 B418 B42C"            /* Ź~Æ-$Q….Î.Ö´.´, */
+	$"D40F 7AF7 657E 5184 9CAA 8834 B65C 4785"            /* Ô.z÷e~Q„œªˆ4¶\G… */
+	$"B934 7C3A 8000 0000 99F5 3F06 3790 6AF7"            /* ¹4|:€...™õ?.7�j÷ */
+	$"0769 9D8E F19F 4FF3 EDE6 D059 B97C A1F0"            /* .i�ŽñŸOóíæÐY¹|¡ð */
+	$"0CE2 4FAF B846 8CCE 52E4 E898 D2E0 00A3"            /* .âO¯¸FŒÎRäè˜Òà.£ */
+	$"CB3D F2B1 E7F7 0C30 FF13 DB29 474C C00D"            /* Ë=ò±ç÷.0ÿ.Û)GLÀ. */
+	$"C6B7 6A2D 2F89 8E2F BDE7 F2BA C3DD 591B"            /* Æ·j-/‰Ž/½çòºÃÝY. */
+	$"CEDE C7DD 35BA 492C BB53 2AF6 7315 AC30"            /* ÎÞÇÝ5ºI,»S*ös.¬0 */
+	$"17D7 1C05 3AE4 4AB3 8D31 0DC9 7A9F 0A76"            /* .×..:äJ³�1.ÉzŸÂv */
+	$"B4EE 95EE 6CB5 1C6A FE4F D27E 0966 CE51"            /* ´î•îlµ.jþOÒ~ÆfÎQ */
+	$"8607 E144 F4AD E999 5480 05FF 7FC2 C645"            /* †.áDô­é™T€.ÿ.ÂÆE */
+	$"D136 BB6E 89FA 9A2D F827 338F FEB9 B248"            /* Ñ6»n‰úš-ø'3�þ¹²H */
+	$"23A6 377D 0E53 BBF3 D290 3AD8 F58B CE4C"            /* #¦7}.S»óÒ�:Øõ‹ÎL */
+	$"24CA 8E49 76ED DA48 8856 904D C31F 305F"            /* $ÊŽIvíÚHˆV�MÃ.0_ */
+	$"C441 7DAA 86D8 3FE1 5EA7 E20A CDBC 5F2A"            /* ÄA}ª†Ø?á^§âÂͼ_* */
+	$"35DC 107F DDE2 D88C 7B38 D700 4C54 9C81"            /* 5Ü..ÝâØŒ{8×.LTœ� */
+	$"B8FD F39D 0F47 DE2B 6E17 7D4F E30F F60C"            /* ¸ýó�.GÞ+n.}Oã.ö. */
+	$"0895 5694 3006 1211 EFEC D7F8 F743 3D43"            /* .•V”0...ïì×ø÷C=C */
+	$"6BA5 7C06 9025 9188 E369 0FC8 94CB F38E"            /* k¥|.�%‘ˆãi.È”ËóŽ */
+	$"DF76 CA67 91C4 D786 F34F 1E56 332B 1404"            /* ßvÊg‘Ä׆óO.V3+.. */
+	$"B66B 2702 B13D 47B8 1FBD 38D7 A2DF 54EF"            /* ¶k'.±=G¸.½8×¢ßTï */
+	$"FD1C 00CC 5D05 5B28 3EBF 2FC7 7263 5880"            /* ý..Ì].[(>¿/ÇrcX€ */
+	$"0364 4A0B 982F 4A13 A55F 5D64 61D2 110C"            /* .dJ.˜/J.¥_]daÒ.. */
+	$"4319 318A 5BD6 94B7 DBA9 92F0 379B 0E87"            /* C.1Š[Ö”·Û©’ð7›.‡ */
+	$"4561 92A0 0000 0000 0000 12FE B897 0ABD"            /* Ea’ .......þ¸—½ */
+	$"B3C7 FEA8 AE43 B177 DA3F 2BA3 2D59 3358"            /* ³Çþ¨®C±wÚ?+£-Y3X */
+	$"9FAE 567F E53B 2877 9FFF 7FFF 7FFB 4B90"            /* Ÿ®V.å;(wŸÿ.ÿ.ûK� */
+	$"C00D FEA3 7DF6 39C4 C825 2952 2C65 8FFF"            /* À.þ£}ö9ÄÈ%)R,e�ÿ */
+	$"7E91 DB49 1333 7DEC 6471 1E2E 394E A080"            /* ~‘ÛI.3}ìdq..9N € */
+	$"C1C9 0DD4 62C4 4FC9 E332 BC0D F9DD FEAB"            /* ÁÉ.ÔbÄOÉã2¼.ùÝþ« */
+	$"9D33 8271 2A01 8484 B009 6058 624E 2736"            /* �3‚q*.„„°Æ`XbN'6 */
+	$"529C A0F4 BCBB 846D 32FD 407C FA84 2D52"            /* Rœ ô¼»„m2ý@|ú„-R */
+	$"21DC 1623 210B 0410 4061 212D 0386 04FF"            /* !Ü.#!...@a!-.†.ÿ */
+	$"7F72 1DFF 6F83 6A31 2B6E 0A6B D1F1 9A43"            /* .r.ÿoƒj1+nÂkÑñšC */
+	$"F340 2C47 D413 DFAC FF76 46AC 4BDD 55F0"            /* ó@,GÔ.߬ÿvF¬KÝUð */
+	$"2F9A 3BC6 613E 2F69 F45C 08F3 3FCB F83F"            /* /š;Æa>/iô\.ó?Ëø? */
+	$"F7D8 DC38 0F99 4764 0309 0948 41C6 1212"            /* ÷ØÜ8.™Gd.ÆÆHAÆ.. */
+	$"293B 5EA3 BE56 F760 BAEF 61FF 43D4 2891"            /* );^£¾V÷`ºïaÿCÔ(‘ */
+	$"A380 672E FF7E 4B98 FBFB 1ACD 90F6 4A7E"            /* £€g.ÿ~K˜ûû.Í�öJ~ */
+	$"3B14 E9F4 B1B4 4120 E600 AF42 0056 B131"            /* ;.éô±´A æ.¯B.V±1 */
+	$"0310 EF4F EA97 E030 9090 A298 F514 CEFA"            /* ..ïOê—à0��¢˜õ.Îú */
+	$"B200 0061 211A A495 FD76 5850 B8F7 1CF1"            /* ²..a!.¤•ývXP¸÷.ñ */
+	$"A979 F478 5BFF 7FFB E6D6 F6D8 03FF 7FFD"            /* ©yôx[ÿ.ûæÖöØ.ÿ.ý */
+	$"2A36 38D4 BA43 6280 D508 C4BD 735D 1C6F"            /* *68ÔºCb€Õ.Ľs].o */
+	$"2444 63E9 1C9A 969F 90A6 F34E D24D 94F2"            /* $Dcé.š–Ÿ�¦óNÒM”ò */
+	$"1A09 F86A 2762 886F FBA0 96EA 1DC7 0364"            /* .Æøj'bˆoû –ê.Ç.d */
+	$"6192 A000 0000 0000 0000 0000 0061 BE9F"            /* a’ ..........a¾Ÿ */
+	$"2C25 5C25 4958 1428 AA60 5ABF 5551 6084"            /* ,%\%IX.(ª`Z¿UQ`„ */
+	$"D319 B739 1DC3 F92F 03A7 CF66 39CC 13BE"            /* Ó.·9.Ãù/.§Ïf9Ì.¾ */
+	$"100A 204E 9A06 CBD9 A8ED 9E4D CEED AE53"            /* . Nš.ËÙ¨ížMÎí®S */
+	$"023D B3BF AC07 F70E F7DD 2601 E2B4 B214"            /* .=³¿¬.÷.÷Ý&.â´². */
+	$"3B1D 74CD 0F60 7063 EFC5 24B8 3B0F DF21"            /* ;.tÍ.`pcïÅ$¸;.ß! */
+	$"2929 3755 A800 7D09 63D9 1548 5D89 6D22"            /* ))7U¨.}ÆcÙ.H]‰m" */
+	$"FAEF 37DC EB96 FF52 0018 EBDF 464C 8B34"            /* úï7Üë–ÿR..ëßFL‹4 */
+	$"DF85 2990 1CF1 7C84 CEDC D384 5003 D5A1"            /* ß…)�.ñ|„ÎÜÓ„P.Õ¡ */
+	$"2797 DBDC FDFB 0E8C 3703 470D 1FD5 B974"            /* '—ÛÜýû.Œ7.G..Õ¹t */
+	$"5A32 CF32 3D2A 0213 FDC8 8A0C B595 4840"            /* Z2Ï2=*..ýÈŠ.µ•H@ */
+	$"C240 6E40 D585 AF4C 004A F98F FC90 E5BB"            /* Â@n@Õ…¯L.Jù�ü�å» */
+	$"D6AD 2A34 0A6E 1D4D 933D 2221 80B7 C8EF"            /* Ö­*4Ân.M“="!€·Èï */
+	$"7C61 2953 2991 F91A 61A3 B54E 56D2 77E1"            /* |a)S)‘ù.a£µNVÒwá */
+	$"1DB8 8B5F 5E9C 7D32 80A0 C23F BBE6 A2B2"            /* .¸‹_^œ}2€ Â?»æ¢² */
+	$"D49F C777 4BE6 FDA6 7B0F 2983 E19B 84FF"            /* ÔŸÇwKæý¦{.)ƒá›„ÿ */
+	$"4B7B 0DD6 A35E 60AD 632D D6D7 7030 0A9F"            /* K{.Ö£^`­c-Ö×p0Ÿ */
+	$"0FA2 0820 8451 9624 D0FF 1FB4 9B81 61CC"            /* .¢. „Q–$Ðÿ.´›�aÌ */
+	$"591F 6D98 E1AF 16E4 AF42 1FE0 B7C7 30DF"            /* Y.m˜á¯.ä¯B.à·Ç0ß */
+	$"CFFC EC14 15A1 B07A 4E11 ED5F BDB3 FD2A"            /* Ïüì..¡°zN.í_½³ý* */
+	$"84B1 6901 4333 27BB 2E8C 3329 2064 A800"            /* „±i.C3'».Œ3) d¨. */
+	$"0001 2FDE 803E 817B C369 A30F FCF0 FF1D"            /* ../Þ€>�{Ãi£.üðÿ. */
+	$"89A1 2FD7 FF71 B63D 19EC 98DE DFE2 D9B8"            /* ‰¡/×ÿq¶=.ì˜ÞßâÙ¸ */
+	$"9D39 1737 4722 2A89 D291 623B 279F BF0B"            /* �9.7G"*‰Ò‘b;'Ÿ¿. */
+	$"E8C0 8AF8 CBE4 0011 5D58 29AB 34B0 335C"            /* èÀŠøËä..]X)«4°3\ */
+	$"36B2 1383 D820 11B8 22DF 56E1 27EF 932D"            /* 6².ƒØ .¸"ßVá'ï“- */
+	$"30DE CC72 58E3 9BDD A88C 229A CBC8 A466"            /* 0ÞÌrXã›Ý¨Œ"šËȤf */
+	$"7C29 FDE8 E789 F28F 3258 A2DD 897B 1C6A"            /* |)ýèç‰ò�2X¢Ý‰{.j */
+	$"C048 306A EEA7 3DF0 F8D4 BECC CDBD 9E43"            /* ÀH0jî§=ðøÔ¾ÌͽžC */
+	$"A29D 8052 478B 6470 79B7 B38A 5743 CAE7"            /* ¢�€RG‹dpy·³ŠWCÊç */
+	$"0BD4 0F4A 23E1 4C85 39C9 DEB0 75AF 151E"            /* .Ô.J#áL…9ÉÞ°u¯.. */
+	$"45D5 1681 2BA4 74C9 13B5 746A E399 9467"            /* EÕ.�+¤tÉ.µtjã™”g */
+	$"E6B9 D503 7F7C D57D 4D5F 7FC8 DD43 7D9B"            /* æ¹Õ..|Õ}M_.ÈÝC}› */
+	$"3CDC F9AD 167C 162B 4E6C 2110 DB2C DF34"            /* <Üù­.|.+Nl!.Û,ß4 */
+	$"AEED CCE4 05AC 4057 9829 B161 9CA0 8159"            /* ®íÌä.¬@W˜)±aœ �Y */
+	$"A64F FD15 EC5A 4A51 CA6C FD10 9A25 4291"            /* ¦Oý.ìZJQÊlý.š%B‘ */
+	$"1E90 1FC2 3530 E0DB E4E6 232E CB64 AF95"            /* .�.Â50àÛäæ#.Ëd¯• */
+	$"9494 656D D395 3D62 9EDA 2EC1 DB02 1FAA"            /* ””emÓ•=bžÚ.ÁÛ..ª */
+	$"6778 0FC0 C4A2 CCA8 EDC0 4DA8 F889 162F"            /* gx.ÀĢ̨íÀM¨ø‰./ */
+	$"03F9 A9C1 C635 1DAD 2E22 580B 0B2B 83E3"            /* .ù©ÁÆ5.­."X..+ƒã */
+	$"EC02 5552 3AA8 91BA 45AF 5439 4265 71F6"            /* ì.UR:¨‘ºE¯T9Beqö */
+	$"3E7A 4412 5DE5 1863 50E6 C0ED C470 3ED9"            /* >zD.]å.cPæÀíÄp>Ù */
+	$"0E3F 48BA 54C5 915E 03F0 D836 6429 2A67"            /* .?HºTÅ‘^.ðØ6d)*g */
+	$"B7FA 6AF9 069E 8E67 2848 B570 C3AC 7746"            /* ·újù.žŽg(HµpìwF */
+	$"EB48 0A2F 4BE4 8EB3 3F8F 791F 0646 DEDF"            /* ëHÂ/K䎳?�y..FÞß */
+	$"316B EFDF 6FD8 C0B9 7319 CE94 8930 C6F6"            /* 1kïßoØÀ¹s.Δ‰0Æö */
+	$"6399 C4A9 79AD E967 4783 3F8D C538 3C15"            /* c™Ä©y­égGƒ?�Å8<. */
+	$"E5B7 CE98 22B7 5333 A938 B26F 0E1E EF2E"            /* å·Î˜"·S3©8²o..ï. */
+	$"74B9 72EF 9D8A 80B7 FDC1 8334 A5F9 DCFB"            /* t¹rï�Š€·ýÁƒ4¥ùÜû */
+	$"B891 BB38 373C 9BE8 59F4 6018 6E63 DA65"            /* ¸‘»87<›èYô`.ncÚe */
+	$"9B13 9DC8 28DB 3C15 0D2C 11FC 0E2D 7A0A"            /* ›.�È(Û<..,.ü.-z */
+	$"F8FF 671F C3FF 7F8E 1210 C212 EA5A 5F0B"            /* øÿg.Ãÿ.Ž..Â.êZ_. */
+	$"9727 F770 25A5 236D 9789 75C7 4089 11DD"            /* —'÷p%¥#m—‰uÇ@‰.Ý */
+	$"E472 3865 B217 B946 CF22 5225 27DE 566D"            /* är8e².¹FÏ"R%'ÞVm */
+	$"6799 4F82 0D46 59F5 E466 F9E7 71C3 FA80"            /* g™O‚.FYõäfùçqÃú€ */
+	$"7826 E598 FF48 E181 6CA8 5A7E C354 0CAA"            /* x&å˜ÿHá�l¨Z~ÃT.ª */
+	$"B01C 9EC4 181F 849B 6A13 FB8D C477 70BD"            /* °.žÄ..„›j.û�Äwp½ */
+	$"F46B 278C 4467 B0CF 3E21 805E EF97 9696"            /* ôk'ŒDg°Ï>!€^ï—–– */
+	$"CBB9 E3F6 B62E DC26 001A 408F D7E2 07C3"            /* ˹ãö¶.Ü&..@�×â.à */
+	$"C1A4 AD97 4235 8863 A088 1980 C505 6E1F"            /* Á¤­—B5ˆc ˆ.€Å.n. */
+	$"F392 0B24 B500 20DC 8295 5703 F9B9 FF70"            /* ó’.$µ. Ü‚•W.ù¹ÿp */
+	$"355C 9B8D BB49 898F 1AAB F65F 7D7E E28F"            /* 5\›�»I‰�.«ö_}~â� */
+	$"4300 BDCC FB20 4F67 CA07 0CAE 3BAD AA36"            /* C.½Ìû OgÊ..®;­ª6 */
+	$"A4D8 3358 4176 1AD6 01FA 0450 0000 0042"            /* ¤Ø3XAv.Ö.ú.P...B */
+	$"7B49 E0E8 A7D8 4EA9 E1A5 597B DB80 BA6D"            /* {Iàè§ØN©á¥Y{Û€ºm */
+	$"8010 25EA 0A26 833F DE77 DBF7 78B9 564B"            /* €.%êÂ&ƒ?ÞwÛ÷x¹VK */
+	$"57B2 AF8C BC92 97D7 46A1 23C1 B595 A2EE"            /* W²¯Œ¼’—×F¡#Áµ•¢î */
+	$"F8A9 29FA 42C2 3557 6345 80B1 FCFD F322"            /* ø©)úBÂ5WcE€±üýó" */
+	$"E992 9262 A83F E43D B059 CB12 D425 FEF2"            /* é’’b¨?ä=°YË.Ô%þò */
+	$"9932 1BD8 C65C ED82 D05E E15C 5E9C 76B7"            /* ™2.ØÆ\í‚Ð^á\^œv· */
+	$"7C64 FCDB A247 D388 3CCB 86B5 C486 2261"            /* |düÛ¢GÓˆ<ˆµÄ†"a */
+	$"BFD1 7213 39C3 0D69 6AF0 2476 B711 7E91"            /* ¿Ñr.9Ã.ijð$v·.~‘ */
+	$"6B53 6A04 4F3C 2781 A090 3118 6C3F 49BA"            /* kSj.O<'� �1.l?Iº */
+	$"B81A 3FEB D686 EFCE F487 8315 E33F 84DB"            /* ¸.?ëÖ†ïÎô‡ƒ.ã?„Û */
+	$"E2C9 F35F 28C5 10C4 FF7F FA4F E953 89FC"            /* âÉó_(Å.Äÿ.úOéS‰ü */
+	$"8B32 23C6 0D04 5E49 DADA F0FE BCA7 D2C9"            /* ‹2#Æ..^IÚÚðþ¼§ÒÉ */
+	$"5869 EAD4 F153 9BF5 A5EA 3298 CC8B 8721"            /* XiêÔñS›õ¥ê2˜Ì‹‡! */
+	$"F919 680B 3F8C 304A 2849 4970 41CF 0F60"            /* ù.h.?Œ0J(IIpAÏ.` */
+	$"76D9 5820 EF21 CD4A 205A 632F 7CC4 EFDF"            /* vÙX ï!ÍJ Zc/|Äïß */
+	$"33F3 CCA8 EDAF 405B 78E1 8F79 0F66 6573"            /* 3ǫ́í¯@[xá�y.fes */
+	$"35A2 AD75 1E18 6018 AF23 7C9D A008 1A01"            /* 5¢­u..`.¯#|� ... */
+	$"C5FE 69AA 2C8E D97E 244D D075 F213 0CC6"            /* Åþiª,ŽÙ~$MÐuò..Æ */
+	$"738F 4395 BBC0 5CB6 3ADC 3DA8 ACB8 E018"            /* s�C•»À\¶:Ü=¨¬¸à. */
+	$"BA5B 13DB 0F6A CB18 DEAC 9749 F5B5 361D"            /* º[.Û.jË.Þ¬—Iõµ6. */
+	$"CF3A C107 9606 179F F4C7 F3DE CB0B 1F53"            /* Ï:Á.–..ŸôÇóÞË..S */
+	$"F27E 5D3C 11AB 66B4 8037 0644 AE98 19BF"            /* ò~]<.«f´€7.D®˜.¿ */
+	$"D564 973A 0CF2 C96F 56D4 5CB8 666F C68C"            /* Õd—:.òÉoVÔ\¸foÆŒ */
+	$"1E73 E515 8B33 75D2 D3B4 B3A3 8CDE DE0C"            /* .så.‹3uÒÓ´³£ŒÞÞ. */
+	$"DA37 A3DF 44D2 B57E 2DB2 E891 D36F CC23"            /* Ú7£ßDÒµ~-²è‘ÓoÌ# */
+	$"ADE8 45BC BB30 78D7 77BD D4A8 087F C83F"            /* ­èE¼»0x×w½Ô¨..È? */
+	$"E49A 6873 FAC4 C12B 0056 5E18 C3CB C2E9"            /* äšhsúÄÁ+.V^.ÃËÂé */
+	$"DCAE F0E8 A75F 18DD B8DD 1DCD B0F5 3A1C"            /* Ü®ðè§_.ݸÝ.Í°õ:. */
+	$"3816 51A8 0D93 00D0 6FF6 8F07 E4BE EDF9"            /* 8.Q¨.“.Ðoö�.ä¾íù */
+	$"BF0E 6CAA 5384 5DF0 DF12 4CF4 E3B3 5D6C"            /* ¿.lªS„]ðß.Lôã³]l */
+	$"602A B6F1 C0E0 E520 B0D6 71FB 7996 4930"            /* `*¶ñÀàå °Öqûy–I0 */
+	$"23DD 3601 3653 C40D 1A64 DC2B D5C2 01C9"            /* #Ý6.6SÄ..dÜ+ÕÂ.É */
+	$"5002 6BBE 7338 81EE F87D 7687 0FE6 7CF9"            /* P.k¾s8�îø}v‡.æ|ù */
+	$"BAB6 5B35 1A25 421C 5BBA 4D82 4E1F B1D4"            /* º¶[5.%B.[ºM‚N.±Ô */
+	$"1907 FF78 F534 4A16 7BB6 B598 51F6 E4D3"            /* ..ÿxõ4J.{¶µ˜QöäÓ */
+	$"A04B 1198 B926 CFAE FC03 22E3 8360 E696"            /*  K.˜¹&Ï®ü."ãƒ`æ– */
+	$"F546 62F9 7178 F327 E245 4520 8D17 41C4"            /* õFbùqxó'âEE �.AÄ */
+	$"9EC6 EF8D 0924 9416 7901 CE87 5EBB 286D"            /* žÆï�Æ$”.y.·^»(m */
+	$"53BF 09FA 41F6 5FBA 8F4C 79A8 75BA 277A"            /* S¿ÆúAö_º�Ly¨uº'z */
+	$"7D42 642B 38EE 9A49 DEDB F1B3 80D0 E5D0"            /* }Bd+8îšIÞÛñ³€ÐåÐ */
+	$"2980 F797 E7D0 F90D 4B2F AFDD 4A69 3389"            /* )€÷—çÐù.K/¯ÝJi3‰ */
+	$"1418 EBD0 6DF0 E38D 6E2F D546 C1A8 C8DD"            /* ..ëÐmðã�n/ÕFÁ¨ÈÝ */
+	$"8977 E053 9C26 053A CF69 97F9 7FB4 9000"            /* ‰wàSœ&.:Ïi—ù.´�. */
+	$"0000 0115 0E67 B64C 0015 DD82 643D 6476"            /* .....g¶L..Ý‚d=dv */
+	$"ED28 6324 AD72 8124 1AF6 FB1B 21C9 0605"            /* í(c$­r�$.öû.!É.. */
+	$"FAE6 04A6 31BF 6D67 FF7B B889 831A 4FFD"            /* úæ.¦1¿mgÿ{¸‰ƒ.Oý */
+	$"6BF5 F098 23AB A490 39F7 6AFC 3832 E2E1"            /* kõð˜#«¤�9÷jü82âá */
+	$"11B2 ADB0 ECCA 83DE B4FF 3685 5106 75DE"            /* .²­°ìʃ޴ÿ6…Q.uÞ */
+	$"3047 28A0 EDBE AD29 17CD DA62 698B CE64"            /* 0G( í¾­).ÍÚbi‹Îd */
+	$"5999 2B8E BB7D C74F F009 A25D B2B5 BDD9"            /* Y™+Ž»}ÇOðÆ¢]²µ½Ù */
+	$"B852 BFFE 0B74 9C05 22D7 B0A3 2139 0979"            /* ¸R¿þ.tœ."×°£!9Æy */
+	$"5C29 BAE8 43DA F9E5 5383 AFD2 14EC 64AA"            /* \)ºèCÚùåSƒ¯Ò.ìdª */
+	$"442C CE71 74ED 5C27 4331 9374 AC77 47EE"            /* D,Îqtí\'C1“t¬wGî */
+	$"31AC 4C74 97BC 753C D5DC 3D8B F7D2 C612"            /* 1¬Lt—¼u<ÕÜ=‹÷ÒÆ. */
+	$"2399 F431 07A1 76CA DAE6 772B 309A C800"            /* #™ô1.¡vÊÚæw+0šÈ. */
+	$"9F2F D6DF A44C 48EB 853E 4140 A123 BCA3"            /* Ÿ/ÖߤLHë…>A@¡#¼£ */
+	$"D096 00DA 0822 DFB3 6887 B31F A18F 59BE"            /* Ж.Ú."ß³h‡³.¡�Y¾ */
+	$"6B25 B5CF CFA3 8806 85B7 ED84 B20B CDA2"            /* k%µÏÏ£ˆ.…·í„².Í¢ */
+	$"A0C8 404B 3FFF 7FF3 3816 5BF0 A16B 85D0"            /*  È@K?ÿ.ó8.[ð¡k…Ð */
+	$"B87F E4BB 21F9 A3BB 9103 2944 434A 5789"            /* ¸.ä»!ù£»‘.)DCJW‰ */
+	$"E3EC B1E3 6F3E 154A 37E4 ACA6 4B02 6C5B"            /* ãì±ão>.J7䬦K.l[ */
+	$"D23A D4D4 83CE F291 CD7F 114F 5935 8EE0"            /* Ò:ÔÔƒÎò‘Í..OY5Žà */
+	$"17EA F0B3 1D93 BC5F 2CF8 511C E99F 21D8"            /* .êð³.“¼_,øQ.éŸ!Ø */
+	$"E286 EB17 6FC2 C34B 1110 6398 03BF CB08"            /* â†ë.oÂÃK..c˜.¿Ë. */
+	$"0018 4848 E24D 90A5 63F9 B1F8 6E20 EF6E"            /* ..HHâM�¥cù±øn ïn */
+	$"25D5 858B 0AE4 2235 581B D4DA E01C B006"            /* %Õ…‹Âä"5X.ÔÚà.°. */
+	$"E5EB DE78 855B 19E7 4D80 DAC2 1E8F CB2B"            /* åëÞx…[.çM€ÚÂ.�Ë+ */
+	$"0EC8 3FFF 7759 B569 0861 20CC 1D71 2121"            /* .È?ÿwYµi.a Ì.q!! */
+	$"71A7 FA20 B34B EAB3 4260 A827 6E91 2B3C"            /* q§ú ³Kê³B`¨'n‘+< */
+	$"5479 449A 3161 D24E 8489 C00A 18A6 3FEC"            /* TyDš1aÒN„‰ÀÂ.¦?ì */
+	$"61F2 4C86 23C1 85DB 6ECA 221D BCC2 C25F"            /* aòL†#Á…ÛnÊ".¼ÂÂ_ */
+	$"EFFF 7891 F475 0E20 DC0A 8F85 8208 4541"            /* ïÿx‘ôu. ÜÂ�…‚.EA */
+	$"579B 5EE2 24C4 5C60 39B7 D9F1 ECFD 0F0C"            /* W›^â$Ä\`9·Ùñìý.. */
+	$"3719 72A8 A543 8BF5 94BF BF6C E6F7 E45A"            /* 7.r¨¥C‹õ”¿¿læ÷äZ */
+	$"C5CF 1FD7 32F5 2D70 041E 3641 2C46 E23D"            /* ÅÏ.×2õ-p..6A,Fâ= */
+	$"E072 6889 A892 A27F 44A8 564A 74A3 B421"            /* àrh‰¨’¢.D¨VJt£´! */
+	$"E1CC A0F3 50E2 2711 6919 76BE D84B D2FE"            /* áÌ óPâ'.i.v¾ØKÒþ */
+	$"AAED 2D64 7C8F 4C55 7FFF 7EFC 2CBF 05DE"            /* ªí-d|�LU.ÿ~ü,¿.Þ */
+	$"25B2 001C 00EC 6D17 ED17 E559 9DFA F731"            /* %²...ìm.í.åY�ú÷1 */
+	$"B21A 7394 8B35 5948 BA4F 5858 020F FF7C"            /* ².s”‹5YHºOXX..ÿ| */
+	$"C89D 1CFA F89B 9F9C 841F 19EF D626 E6DE"            /* È�.úø›Ÿœ„..ïÖ&æÞ */
+	$"DCC3 3148 38A0 C32F 898F BEC3 0AF3 318C"            /* ÜÃ1H8 Ã/‰�¾ÃÂó1Œ */
+	$"5E09 119B 43C8 9FE6 73B2 F4B9 9789 4BFC"            /* ^Æ.›CÈŸæs²ô¹—‰Kü */
+	$"99A2 FF7F FF7A 4FD0 8C64 F459 410C 013C"            /* ™¢ÿ.ÿzOÐŒdôYA..< */
+	$"1C6C 85B5 1C8F D078 995D 714E 1C60 3090"            /* .l…µ.�Ðx™]qN.`0� */
+	$"9058 77C4 BB80 5F57 1871 CA72 B2FD 0016"            /* �XwÄ»€_W.qÊr²ý.. */
+	$"BAA7 F84F F4E9 ACDF F766 8CB4 475D 2F0B"            /* º§øOôé¬ß÷fŒ´G]/. */
+	$"37BC 18C8 6162 79C2 BDD7 8753 204B A536"            /* 7¼.Èaby½ׇS K¥6 */
+	$"9CBE 4972 316A BCB1 9442 4238 B88F 2F48"            /* œ¾Ir1j¼±”BB8¸�/H */
+	$"7A45 5CD1 A306 3A23 5A78 354F CDB6 C0A5"            /* zE\Ñ£.:#Zx5OͶÀ¥ */
+	$"2A5C 19DA 0B0C CD84 8D85 D2B8 1DC9 059C"            /* *\.Ú..Í„�…Ò¸.É.œ */
+	$"A8C4 8118 4848 9372 9372 566C 21E5 2665"            /* ¨Ä�.HH“r“rVl!å&e */
+	$"D16C 6601 48A8 35CE 7FFF 7F19 B54E 7F04"            /* Ñlf.H¨5Î.ÿ..µN.. */
+	$"10EC 1AA3 13FF 4588 9722 A7AA B011 863C"            /* .ì.£.ÿEˆ—"§ª°.†< */
+	$"E4B1 717B 7C2D 21E6 267B 4B48 E790 FF76"            /* ä±q{|-!æ&{KHç�ÿv */
+	$"40CC F425 41CB 289F 809D 8170 A529 2EDA"            /* @Ìô%AË(Ÿ€��p¥).Ú */
+	$"A105 B3AF FB44 7951 B87A 0091 5B53 5979"            /* ¡.³¯ûDyQ¸z.‘[SYy */
+	$"CDC6 5976 6393 34F2 21FF 7FFF 7FFF 7D43"            /* ÍÆYvc“4ò!ÿ.ÿ.ÿ}C */
+	$"4F4B C77F 73C7 0454 BE9C BE9C 282E 440E"            /* OKÇ.sÇ.T¾œ¾œ(.D. */
+	$"0608 A380 6121 2103 DBD2 250B 5D57 9159"            /* ..£€a!!.ÛÒ%.]W‘Y */
+	$"B69A 28CF E66A 154F F84F F4E9 99ED 48C4"            /* ¶š(Ïæj.OøOôé™íHÄ */
+	$"CA7E BE76 FC67 A7CD DC26 1C00 0184 8463"            /* Ê~¾vüg§ÍÜ&...„„c */
+	$"69A8 C0A9 127C 5830 CC3A 380A C742 E4DE"            /* i¨À©.|X0Ì:8ÂÇBäÞ */
+	$"06F5 7999 556D FD9F 268B 895F FF4B 7BB9"            /* .õy™UmýŸ&‹‰_ÿK{¹ */
+	$"C201 52B7 B483 0906 65EC 1848 4750 6F27"            /* Â.R·´ƒÆ.eì.HGPo' */
+	$"C86C 1F27 9108 6253 0416 4CD3 30E4 7F77"            /* Èl.'‘.bS..LÓ0ä.w */
+	$"0705 8420 83B6 BCB6 29DE B71E 8DC5 851A"            /* ..„ ƒ¶¼¶)Þ·.�Å…. */
+	$"ABB0 83D8 F2E2 5113 55D2 AAF6 B3AB 7679"            /* «°ƒØòâQ.UÒªö³«vy */
+	$"49FE A1F8 6F30 0EC0 7D91 534C C78C DC5D"            /* Iþ¡øo0.À}‘SLÇŒÜ] */
+	$"5A42 CA06 37D8 E0ED 27FA 3E31 C849 D2BE"            /* ZBÊ.7Øàí'ú>1ÈIÒ¾ */
+	$"847C 0CCF 676F ACFE 91A3 0F62 B711 1897"            /* „|.Ïgo¬þ‘£.b·..— */
+	$"9DC3 8E37 3AF8 907E 0B69 1577 2856 AA36"            /* �ÃŽ7:ø�~.i.w(Vª6 */
+	$"FAC0 D56C 6686 0443 CA96 FDCD 051B 23A7"            /* úÀÕlf†.CÊ–ýÍ..#§ */
+	$"7DAC 8229 C5FC F840 103A 6407 49F7 6B32"            /* }¬‚)Åüø@.:d.I÷k2 */
+	$"254F 2B32 7FC1 F460 D5C0 5EE1 3046 612A"            /* %O+2.Áô`ÕÀ^á0Fa* */
+	$"1BC1 C143 7B76 B9EF ECCB 5EE9 8F0C 3F71"            /* .ÁÁC{v¹ïìË^é�.?q */
+	$"E805 8B9B 17B7 9ECE C237 AF5C 0062 E61E"            /* è.‹›.·žÎÂ7¯\.bæ. */
+	$"DF6C C1F7 904E 4379 2A9C 92FC 1B04 00A8"            /* ßlÁ÷�NCy*œ’ü...¨ */
+	$"F9D5 DB1B C4C6 9485 ABC2 1199 CCF2 0A47"            /* ùÕÛ.ÄÆ”…«Â.™ÌòÂG */
+	$"9693 C097 7AD0 449A FC53 DEC5 6EE8 6BF7"            /* –“À—zÐDšüSÞÅnèk÷ */
+	$"0D7D 4ED8 3426 DA7E ECF9 57ED 9252 9A6A"            /* .}NØ4&Ú~ìùWí’Ršj */
+	$"2B94 2614 1B6E A495 8261 4D5E DAEF 03FA"            /* +”&..n¤•‚aM^Úï.ú */
+	$"8A63 9496 E8AB A1A6 5B5C B03E E73E 2889"            /* Šc”–è«¡¦[\°>ç>(‰ */
+	$"D257 6C28 080A 68DC 226C 950F F55B E7CC"            /* ÒWl(.ÂhÜ"l•.õ[çÌ */
+	$"95AD FDA7 43EA 7489 A545 C0FC E9B0 2A25"            /* •­ý§Cêt‰¥EÀüé°*% */
+	$"719C EE06 9E5A 8FC0 D3B0 0C81 1EB0 C8C6"            /* qœî.žZ�ÀÓ°.�.°ÈÆ */
+	$"25BD B383 33BD B80D D9A9 48F3 7539 D7D5"            /* %½³ƒ3½¸.Ù©Hóu9×Õ */
+	$"8021 5EBA 94A7 83A3 69FE 8179 9106 BC56"            /* €!^º”§ƒ£iþ�y‘.¼V */
+	$"14A4 427B 8C09 BACB 2FC9 B8F3 CAFA E51C"            /* .¤B{ŒÆºË/ɸóÊúå. */
+	$"9C07 9A69 033C 6159 163E 6ED8 259D 7AAB"            /* œ.ši.<aY.>nØ%�z« */
+	$"D316 475C F6C7 BD0E 7972 4C59 DF3A D5B4"            /* Ó.G\öǽ.yrLYß:Õ´ */
+	$"44ED 7D01 B0FB 34D4 4C9C BC2D B8A6 5B65"            /* Dí}.°û4ÔLœ¼-¸¦[e */
+	$"134F 0C96 5CA1 21CC A249 F17D 4660 9835"            /* .O.–\¡!Ì¢Iñ}F`˜5 */
+	$"957C 7392 53A9 DE42 E650 604B 10E2 FF12"            /* •|s’S©ÞBæP`K.âÿ. */
+	$"B47A 044A 524A B8D3 60B5 A258 CEAB 55E8"            /* ´z.JRJ¸Ó`µ¢XΫUè */
+	$"5219 EC3E A9F6 0813 A2B4 930C EDE4 3BBE"            /* R.ì>©ö..¢´“.íä;¾ */
+	$"C0E3 7F93 1A3F 38EB 2DE3 492D A3BD FD00"            /* Àã.“.?8ë-ãI-£½ý. */
+	$"811C 530E 2FB8 9D68 2466 D288 EC29 9094"            /* �.S./¸�h$fÒˆì)�” */
+	$"A3C7 2D32 0A25 BA73 2023 08CA C360 2C72"            /* £Ç-2Â%ºs #.ÊÃ`,r */
+	$"8BA9 516A 7081 F2FF 1E84 E1C2 F841 77CE"            /* ‹©Qjp�òÿ.„áÂøAwÎ */
+	$"ABDF 6476 30A4 3018 F7F4 F3EE 1A5E 5DF0"            /* «ßdv0¤0.÷ôóî.^]ð */
+	$"CAAA AA77 C90D 52C4 6AA9 5755 33B9 1814"            /* ʪªwÉ.RÄj©WU3¹.. */
+	$"3528 E205 C379 648A E627 A23E D5DB 1CAE"            /* 5(â.ÃydŠæ'¢>ÕÛ.® */
+	$"4868 B7D4 F381 2534 1F48 2BCC 5211 3B0F"            /* Hh·Ôó�%4.H+ÌR.;. */
+	$"9692 B002 4CFB 1F83 3628 D1EB 5416 0648"            /* –’°.Lû.ƒ6(ÑëT..H */
+	$"F0F0 B0F8 C7C7 6E92 8C54 6859 791B 7890"            /* ðð°øÇÇn’ŒThYy.x� */
+	$"EBA3 BC74 5F3F C4AD 7C9D 6954 2D0C 15BF"            /* 룼t_?Ä­|�iT-..¿ */
+	$"F699 82A6 4170 D2F1 02A5 7EF3 6061 C9CF"            /* ö™‚¦ApÒñ.¥~ó`aÉÏ */
+	$"C370 E129 F805 8CC8 C670 CBDC 2D44 D349"            /* Ãpá)ø.ŒÈÆpËÜ-DÓI */
+	$"F3E5 C5F9 357E 3DF2 CDF3 DC8A 1F13 5B2D"            /* óåÅù5~=òÍóÜŠ..[- */
+	$"C544 448D 1038 8293 4EEA 75A4 0738 7D9F"            /* ÅDD�.8‚“Nêu¤.8}Ÿ */
+	$"C002 3D68 26D8 7B06 FB10 CCDF C4F3 5364"            /* À.=h&Ø{.û.ÌßÄóSd */
+	$"2342 154B F8FB 01ED 8893 9160 A3A0 B81D"            /* #B.Køû.툓‘`£ ¸. */
+	$"47A0 6C82 1CBA FAED 931D E025 BDFF 1535"            /* G l‚.ºúí“.à%½ÿ.5 */
+	$"CADF 68C5 41FD 3896 1AC9 F979 A885 F5AE"            /* ÊßhÅAý8–.Éùy¨…õ® */
+	$"EFBE C674 ED92 5FE9 E9AF FF52 D573 A6DD"            /* ï¾Ætí’_éé¯ÿRÕs¦Ý */
+	$"631B 27E4 62CB B76E 7020 EC65 75E2 DB6F"            /* c.'äbË·np ìeuâÛo */
+	$"0E10 980A 0EA3 2287 4CF8 D402 52B8 1491"            /* ..˜Â.£"‡LøÔ.R¸.‘ */
+	$"21C9 BC2B 48BC CBD4 464A C539 6CD5 28F1"            /* !ɼ+H¼ËÔFJÅ9lÕ(ñ */
+	$"CAE4 CA43 9CB8 B181 BF06 522B 4D19 8295"            /* ÊäÊCœ¸±�¿.R+M.‚• */
+	$"05C8 D7CD 8CFA D3E7 7BC9 630C DCDD 7C7E"            /* .È×ÍŒúÓç{Éc.ÜÝ|~ */
+	$"E4C6 D7DC 5E38 67CC 5934 9E8D 9552 B837"            /* äÆ×Ü^8gÌY4ž�•R¸7 */
+	$"53AE 6D39 FAB1 2EB6 886C 1855 26ED AD08"            /* S®m9ú±.¶ˆl.U&í­. */
+	$"1EBE 9570 EA2F DFFF 06F4 ABF3 4534 2831"            /* .¾•pê/ßÿ.ô«óE4(1 */
+	$"1AE2 0A99 2956 2A90 C2A4 58AC E49E F047"            /* .â™)V*�¤X¬äžðG */
+	$"A9BA C394 E8F4 6427 7966 A79C 4269 9ADD"            /* ©ºÃ”èôd'yf§œBišÝ */
+	$"AD1D 1A7E 375C D3FB 8C25 0B6B 0460 5EB9"            /* ­..~7\ÓûŒ%.k.`^¹ */
+	$"416C AE82 DFC3 09DA 1F69 8796 6897 8CD0"            /* Al®‚ßÃÆÚ.i‡–h—ŒÐ */
+	$"3E1B FF7D 9AE9 7F6D 4E84 967C 674F CA41"            /* >.ÿ}šé.mN„–|gOÊA */
+	$"44C1 0575 93A9 2599 66D0 AB7B 6260 D32C"            /* DÁ.u“©%™fЫ{b`Ó, */
+	$"94AF 7FC8 82FD F692 92FE B6ED A660 750F"            /* ”¯.È‚ýö’’þ¶í¦`u. */
+	$"80A2 A8AA E6F6 7B9F E894 ED71 D223 6F4B"            /* €¢¨ªæö{Ÿè”íqÒ#oK */
+	$"A203 F64C 7560 DBB1 6F9E EE9F 2945 C994"            /* ¢.öLu`Û±ožîŸ)EÉ” */
+	$"BA00 D3D1 6414 A300 4296 670B 2350 CDD1"            /* º.ÓÑd.£.B–g.#PÍÑ */
+	$"DF61 29E8 EC17 87B6 BC62 B6BD 5F31 13B2"            /* ßa)èì.‡¶¼b¶½_1.² */
+	$"48A2 F723 53C7 6955 969B ED83 6A9B 1B06"            /* H¢÷#SÇiU–›íƒj›.. */
+	$"C7D0 2584 430B 8C52 D00A 736B D6FB AEDB"            /* ÇÐ%„C.ŒRÐÂskÖû®Û */
+	$"2BA1 5095 759B 0AFF 5138 58EF 3DC2 B14D"            /* +¡P•u›ÂÿQ8Xï=±M */
+	$"3B7D 62D0 DE12 CFEF 17A3 32C4 C79A C2DA"            /* ;}bÐÞ.Ïï.£2ÄÇšÂÚ */
+	$"6BA1 6478 B1D3 2278 3787 6C30 08FD 6095"            /* k¡dx±Ó"x7‡l0.ý`• */
+	$"FF65 1DF4 7606 34C3 B4EE E609 A3BF 7085"            /* ÿe.ôv.4ôîæÆ£¿p… */
+	$"8B3B 2C80 D860 6043 10A4 24B1 2D80 880D"            /* ‹;,€Ø``C.¤$±-€ˆ. */
+	$"671A 9A76 E1D4 2304 B4E0 9E47 129D 6316"            /* g.šváÔ#.´àžG.�c. */
+	$"33DF C88C 3BB6 5232 475C D19D FA9B 3303"            /* 3ßÈŒ;¶R2G\Ñ�ú›3. */
+	$"2956 D8B1 08A5 2735 CD4D F130 C700 DA0D"            /* )Vر.¥'5ÍMñ0Ç.Ú. */
+	$"7BAE 21FA FB1B 35A5 957E 0211 955B 25D0"            /* {®!úû.5¥•~..•[%Ð */
+	$"A3DD B72F 5BCD 8792 418E BCB6 C727 DD0F"            /* £Ý·/[͇’AŽ¼¶Ç'Ý. */
+	$"2D42 F031 2A73 C1F9 7964 B937 1E77 A757"            /* -Bð1*sÁùyd¹7.w§W */
+	$"D158 CB02 80D3 C310 E1C5 709C 5C69 7F04"            /* ÑXË.€ÓÃ.áÅpœ\i.. */
+	$"4476 F017 3FF2 B891 0160 D681 AEBC F8C9"            /* Dvð.?ò¸‘.`Ö�®¼øÉ */
+	$"8F46 7922 4414 5CEE 0CA8 417B 33BB 5926"            /* �Fy"D.\î.¨A{3»Y& */
+	$"B7A6 7094 6363 C5F2 9AD7 1751 2456 3B83"            /* ·¦p”ccÅòš×.Q$V;ƒ */
+	$"9BB0 0ECD 1420 6141 A097 DBF4 802A 2377"            /* ›°.Í. aA —Ûô€*#w */
+	$"CDAC EFE9 4A16 4B3C 5058 A5DC 1C40 169E"            /* ͬïéJ.K<PX¥Ü.@.ž */
+	$"3999 F0C2 C418 2E8F 0951 664A 7082 F49F"            /* 9™ðÂÄ..�ÆQfJp‚ôŸ */
+	$"E576 B2B1 5918 E3EE 9B97 1686 6499 A572"            /* åv²±Y.ãî›—.†d™¥r */
+	$"B1F6 2F39 A798 6292 DE22 007B 60AD 1D94"            /* ±ö/9§˜b’Þ".{`­.” */
+	$"31BA 068D F15A 06DB 2654 6B52 F692 3C3A"            /* 1º.�ñZ.Û&TkRö’<: */
+	$"0DA8 A74B 30F6 3852 76F0 A897 9086 FBD5"            /* .¨§K0ö8Rvð¨—�†ûÕ */
+	$"1C78 047E 7BF2 08EE 7B45 85C5 6ED5 AA43"            /* .x.~{ò.î{E…ÅnÕªC */
+	$"F423 8A4E 4111 C68E 172E DD87 AF9E BF19"            /* ô#ŠNA.ÆŽ..݇¯ž¿. */
+	$"D4D2 020C 6FD5 EE3F F0E8 289E 4E6C 0871"            /* ÔÒ..oÕî?ðè(žNl.q */
+	$"1187 D3F1 E458 94F5 4519 BF3C D239 D86C"            /* .‡ÓñäX”õE.¿<Ò9Øl */
+	$"17F1 8916 4206 2346 ACD8 1F08 9A44 0AB3"            /* .ñ‰.B.#F¬Ø..šD³ */
+	$"CEE6 441D 78D5 2909 4CEA 46F7 D6C6 D21A"            /* ÎæD.xÕ)ÆLêF÷ÖÆÒ. */
+	$"6D41 BB64 ADFF 6252 5A80 3556 C459 2845"            /* mA»d­ÿbRZ€5VÄY(E */
+	$"C05D C2C5 1F69 4087 0380 C0FF 61AA D5D1"            /* À]ÂÅ.i@‡.€ÀÿaªÕÑ */
+	$"E5C2 5FC0 CEF4 2D59 B4A3 6BA8 343E 184B"            /* åÂ_ÀÎô-Y´£k¨4>.K */
+	$"89CE 81FD AC96 C691 FDE5 F993 B9CB 6302"            /* ‰Î�ý¬–Æ‘ýåù“¹Ëc. */
+	$"B8EE 86B4 A2F7 19EA DAFD D511 B59F BBD2"            /* ¸î†´¢÷.êÚýÕ.µŸ»Ò */
+	$"5D4E F6A3 BC58 51D5 273F 2E2E 2B6A 2755"            /* ]Nö£¼XQÕ'?..+j'U */
+	$"38A3 CA29 BFAB D31D CD53 B29C 7418 40DB"            /* 8£Ê)¿«Ó.ÍS²œt.@Û */
+	$"FD56 1BF6 9350 5411 CF5C 8D26 B1FA 754F"            /* ýV.ö“PT.Ï\�&±úuO */
+	$"E584 8277 6221 6866 257C 9FC9 65A5 6D93"            /* å„‚wb!hf%|ŸÉe¥m“ */
+	$"C524 B971 3F1D 34A0 BBF4 6B83 9722 CFAD"            /* Å$¹q?.4 »ôkƒ—"Ï­ */
+	$"8296 103F 53BB 1B22 8A84 2FAC 94DE 4994"            /* ‚–.?S»."Š„/¬”ÞI” */
+	$"2D31 56A5 DBCD B661 81D7 B360 4958 8FF5"            /* -1V¥ÛͶa�׳`IX�õ */
+	$"EB02 25A9 6386 8241 D936 A3CB AA88 9936"            /* ë.%©c†‚AÙ6£Ëªˆ™6 */
+	$"1698 4F59 765B 34EA 3741 D2D3 2DAC 854D"            /* .˜OYv[4ê7AÒÓ-¬…M */
+	$"366B C9A0 15F8 D2E6 7CCF 99EF A794 460C"            /* 6kÉ .øÒæ|ϙ倫F. */
+	$"934E C88B 2BF5 91F7 7BD1 3DC9 6ED3 91FE"            /* “NÈ‹+õ‘÷{Ñ=ÉnÓ‘þ */
+	$"E63B EDCC 3D4A CC1B AE5D 88D0 B241 20D1"            /* æ;íÌ=JÌ.®]ˆÐ²A Ñ */
+	$"AB6C 9FE2 E494 395E 8E3C 0EB0 1796 58CC"            /* «lŸâä”9^Ž<.°.–XÌ */
+	$"9791 D931 DB33 473E 003E 10CD B736 7295"            /* —‘Ù1Û3G>.>.Í·6r• */
+	$"DD81 B481 9A0A ED27 3C1E 6298 FD0D BDE0"            /* Ý�´�šÂí'<.b˜ý.½à */
+	$"11D6 8A21 79C1 DBB7 FEDC 6E48 8080 5ADB"            /* .ÖŠ!yÁÛ·þÜnH€€ZÛ */
+	$"E61D 9E0E E6A3 6D38 A028 4016 464D F534"            /* æ.ž.æ£m8 (@.FMõ4 */
+	$"D764 3AD7 55DF 3CAB 7B3D 12F5 9A8D DDCF"            /* ×d:×Uß<«{=.õš�ÝÏ */
+	$"6CCD 0387 C982 0FE9 D431 0FE3 E064 1700"            /* lÍ.‡É‚.éÔ1.ãàd.. */
+	$"1AAD F49E D6DE A939 8010 C91B 605B 4E0A"            /* .­ôžÖÞ©9€.É.`[NÂ */
+	$"FCBE ADE9 C17A EC1F 3990 9EB2 E6BF 92AA"            /* ü¾­éÁzì.9�ž²æ¿’ª */
+	$"951C D27F A984 10A9 22DC 996E FF6E 12AE"            /* •.Ò.©„.©"Ü™nÿn.® */
+	$"DC03 5AB3 2CA0 8291 4174 C69E AE28 DBA8"            /* Ü.Z³, ‚‘AtÆž®(Û¨ */
+	$"38A8 FF12 67D3 F8A3 00D6 2A2E A564 CEFA"            /* 8¨ÿ.gÓø£.Ö*.¥dÎú */
+	$"0F00 4B44 62A7 CA9F F072 2821 DD3C 6A34"            /* ..KDb§ÊŸðr(!Ý<j4 */
+	$"926C 8F3C 1548 D31A 021F 2604 252D A929"            /* ’l�<.HÓ...&.%-©) */
+	$"172B 8212 174F 2D2D CC7D DA15 F9A9 AD7E"            /* .+‚..O--Ì}Ú.ù©­~ */
+	$"59D3 7885 9215 C77B 6583 4D8F 3308 149C"            /* YÓx…’.Ç{eƒM�3..œ */
+	$"270A 4508 21C9 A05B CDE9 BEF1 C18A 4B74"            /* 'ÂE.!É [Íé¾ñÁŠKt */
+	$"F07B 0DFE 007B E5AF D9AA CED7 8661 34C7"            /* ð{.þ.{å¯ÙªÎ׆a4Ç */
+	$"AA26 21AC D09C 6BAA EABB A7C4 486E 40A5"            /* ª&!¬Ðœkªê»§ÄHn@¥ */
+	$"C791 976A 1EC3 534F 84EC E6E9 7363 FF08"            /* Ç‘—j.ÃSO„ìæéscÿ. */
+	$"5B20 0E29 000C 5E8F 3339 6210 65CC FD34"            /* [ .)..^�39b.eÌý4 */
+	$"76EB F1B2 76C6 5FDC C1A8 B0F5 53EE 103C"            /* vëñ²vÆ_ÜÁ¨°õSî.< */
+	$"50B0 650F 8459 9777 E890 E28A BB84 56B9"            /* P°e.„Y—wè�⊻„V¹ */
+	$"0522 90F9 5B81 C982 979E E507 A4BC 26C3"            /* ."�ù[�É‚—žå.¤¼&à */
+	$"E356 F2A9 C0D1 BFF3 F882 EC0E 6AA9 CA0D"            /* ãVò©ÀÑ¿óø‚ì.j©Ê. */
+	$"4419 16FB 9BEF 947E F848 19BF 5CB6 EA4E"            /* D..û›ï”~øH.¿\¶êN */
+	$"C290 F254 020B 51DB 8094 4D05 E9A5 21A0"            /* Â�òT..QÛ€”M.é¥!  */
+	$"D3E6 84EA 5A3E 4380 650C B24F 31DA 209F"            /* Óæ„êZ>C€e.²O1Ú Ÿ */
+	$"F51A 9108 7912 32B0 52A6 A901 CADB A758"            /* õ.‘.y.2°R¦©.ÊÛ§X */
+	$"C00A D516 E462 35B4 C071 131A 0F01 9A95"            /* ÀÂÕ.äb5´Àq....š• */
+	$"9739 F131 0E5F 7FBA D8AD 925F 992C 0187"            /* —9ñ1._.ºØ­’_™,.‡ */
+	$"D97C 832B 847E 1148 0402 0449 FB25 D0F1"            /* Ù|ƒ+„~.H...Iû%Ðñ */
+	$"C1F8 2B8E CE97 D5A4 BEFE 7F0D E420 E43E"            /* Áø+ŽÎ—Õ¤¾þ..ä ä> */
+	$"801A 448D 9D61 D23C 5956 3DEB A1A6 0858"            /* €.D��aÒ<YV=롦.X */
+	$"CD98 F32B 92E6 D960 C0E1 E542 294D 6FD3"            /* ͘ó+’æÙ`ÀáåB)MoÓ */
+	$"4234 37C9 3537 275F AC1E 936D 534A BF02"            /* B47É57'_¬.“mSJ¿. */
+	$"B742 8CAB BE88 E4FF 23DC D9EB 1FC4 9CF0"            /* ·BŒ«¾ˆäÿ#ÜÙë.Äœð */
+	$"C5D1 3F1D 5995 AD68 12E9 71B3 2100 AFB7"            /* ÅÑ?.Y•­h.éq³!.¯· */
+	$"CBF7 9ADB D5FF 48EE B1A2 AE4D E021 7C07"            /* Ë÷šÛÕÿHî±¢®Mà!|. */
+	$"5AD5 E94C A965 DFE8 B32A 23AB DE05 4FB1"            /* ZÕéL©eßè³*#«Þ.O± */
+	$"FDB7 ECC5 3611 73D9 B03C 399A D5F6 663D"            /* ý·ìÅ6.sÙ°<9šÕöf= */
+	$"0E78 0BEE 67D9 2F9D 0072 E938 509C 9779"            /* .x.îgÙ/�.ré8Pœ—y */
+	$"6C64 03A1 B8C9 C1C0 2256 29EA 112C FB1C"            /* ld.¡¸ÉÁÀ"V)ê.,û. */
+	$"766C DF51 83B1 388F 902E EE03 337E 689A"            /* vlßQƒ±8��.î.3~hš */
+	$"CA5A A9F0 09AF 3422 4115 D489 3FBD 22C1"            /* ÊZ©ðƯ4"A.Ô‰?½"Á */
+	$"4A4F 642A 0AC8 D01C 2950 18CA D441 780A"            /* JOd*ÂÈÐ.)P.ÊÔAx */
+	$"C929 A7FF 0AFA 956A A581 B590 9B7A 7D74"            /* É)§ÿÂú•j¥�µ�›z}t */
+	$"2084 3DC1 5D81 B12B DF9C 333D EFAD 0ADD"            /*  „=Á]�±+ßœ3=ï­ÂÝ */
+	$"3445 4F8C 132E F02F C2E7 E13F BE12 2F84"            /* 4EOŒ..ð/Âçá?¾./„ */
+	$"7FC3 D55F 876A BE1D 07F2 688D 774C FC3E"            /* .ÃÕ_‡j¾..òh�wLü> */
+	$"A177 C3EA 4FE4 AFFE 1BFF 61D3 2F87 4BFC"            /* ¡wÃêOä¯þ.ÿaÓ/‡Kü */
+	$"946E 03F8 6CFF 06A3 FC28 FE13 BF0F 6B7E"            /* ”n.ølÿ.£ü(þ.¿.k~ */
+	$"1EB8 FC3B 47E1 ECEE EEDF F87D 51FF 07D5"            /* .¸ü;Gáìîîßø}Qÿ.Õ */
+	$"0BBB 87E1 D3FF 0779 FC3B 6FE1 D378 0DF0"            /* .»‡áÓÿ.yü;oáÓx.ð */
+	$"BD7C 29EB A2DD 17F2 6ADB E1DB 7F0D 97E1"            /* ½|)ë¢Ý.òjÛáÛ..—á */
+	$"E84D 7750 FC3E 906F C3E8 35DD 42ED AFE1"            /* èMwPü>�oÃè5ÝBí¯á */
+	$"D33F 0E8D F86E 00F7 91DD 3D8B A94D D83C"            /* Ó?.�øn.÷‘Ý=‹©MØ< */
+	$"B51B 129C 103F 899D B929 4724 C188 2C29"            /* µ..œ.?‰�¹)G$Áˆ,) */
+	$"CE89 11F8 9065 1C37 E234 DFEF 60D7 3221"            /* Ή.ø�e.7â4ßï`×2! */
+	$"5343 F889 DCDB AFB3 6F20 F76A 31D9 986E"            /* SCø‰ÜÛ¯³o ÷j1Ù˜n */
+	$"A745 547E 6F18 076D A675 BA1A 1AAF 6558"            /* §ET~o..m¦uº..¯eX */
+	$"338A FF71 4707 0776 1B62 BCCC 89E5 4726"            /* 3ŠÿqG..v.b¼Ì‰åG& */
+	$"A7CB 8885 E07C DADC D741 3B1D D81F AB03"            /* §Ëˆ…à|ÚÜ×A;.Ø.«. */
+	$"2F84 F52D DFD5 7384 4649 7BA2 5AB1 14C8"            /* /„õ-ßÕs„FI{¢Z±.È */
+	$"3D8D B951 8183 C33A B08E 82CC EF1A F046"            /* =�¹Q�ƒÃ:°Ž‚Ìï.ðF */
+	$"5B62 C9E0 A926 F330 0A61 A30C 6194 7E1E"            /* [bÉà©&ó0Âa£.a”~. */
+	$"1EE9 3D0D 1ABE 5536 A026 8B32 830F C02F"            /* .é=..¾U6 &‹2ƒ.À/ */
+	$"3041 04B7 2C65 024D AC81 D2CC 03CA A08A"            /* 0A.·,e.M¬�ÒÌ.Ê Š */
+	$"B105 F3F1 C365 6BCE 9876 A867 7DBA 63AF"            /* ±.óñÃekΘv¨g}ºc¯ */
+	$"0973 495F DCC1 3552 54BA 5BDB 618D C6C0"            /* ÆsI_ÜÁ5RTº[Ûa�ÆÀ */
+	$"91B8 4489 141B A7D3 F188 8A97 DAB0 8942"            /* ‘¸D‰..§ÓñˆŠ—Ú°‰B */
+	$"EA67 F235 E18A 871B 4B0C DAC6 9050 BA9C"            /* êgò5ኇ.K.ÚÆ�Pºœ */
+	$"C432 95CE 13CA 93ED 4FD5 9495 377D C920"            /* Ä2•Î.Ê“íOÕ”•7}É  */
+	$"C8A2 F997 5348 8890 91D5 0A23 50BF 3C37"            /* È¢ù—SHˆ�‘ÕÂ#P¿<7 */
+	$"8372 7C96 32AA 1CD2 46BE 8220 C983 2A71"            /* ƒr|–2ª.ÒF¾‚ Ƀ*q */
+	$"7961 BF33 9590 C086 CCE9 578B 322E FB50"            /* ya¿3•�À†ÌéW‹2.ûP */
+	$"CB68 6459 C127 EB9B E974 EF02 59F4 FF4D"            /* ËhdYÁ'ë›étï.YôÿM */
+	$"4525 1874 6A9F 99EB DFCC C1B1 72EA 9FA0"            /* E%.tjŸ™ëßÌÁ±r꟠ */
+	$"DE00 BBB9 D95F 36B9 406E 3CE0 3BCF 32B6"            /* Þ.»¹Ù_6¹@n<à;Ï2¶ */
+	$"8DC0 55D6 C6DA 3622 8A6E 63F6 28AE 08AC"            /* �ÀUÖÆÚ6"Šncö(®.¬ */
+	$"03AC 288D 069A 750E CBBD 97D9 E42D BA93"            /* .¬(�.šu.˽—Ùä-º“ */
+	$"E82A 4EB3 C008 CC7C B6A7 6F70 F1BC FDAA"            /* è*N³À.Ì|¶§opñ¼ýª */
+	$"1DF4 D2E4 3ECB 9702 444E 278F 6B50 F00E"            /* .ôÒä>Ë—.DN'�kPð. */
+	$"C228 C132 E5E0 B4DE 93BF DBBD 2C85 ABF9"            /* Â(Á2åà´Þ“¿Û½,…«ù */
+	$"7FAD EC28 1D40 D390 5A2F 9B14 D348 8C76"            /* .­ì(.@Ó�Z/›.ÓHŒv */
+	$"C04B 1173 BF19 8F50 7E3D 8311 BB79 FDA8"            /* ÀK.s¿.�P~=ƒ.»yý¨ */
+	$"1FD4 24A9 5F59 8B76 709E 5C84 1902 8690"            /* .Ô$©_Y‹vpž\„..†� */
+	$"AD49 334F 5AE8 E376 288C BDE7 EE13 FBDE"            /* ­I3OZèãv(Œ½çî.ûÞ */
+	$"7606 0135 6DB2 DCD9 F5B3 E7E2 B2B8 8BE1"            /* v..5m²ÜÙõ³çⲸ‹á */
+	$"1985 85D2 0EC1 5CCD BC74 D88B 7206 5075"            /* .……Ò.Á\ͼtØ‹r.Pu */
+	$"FB92 BF92 C5CB B6E3 024D EB71 D909 AF79"            /* û’¿’Å˶ã.MëqÙƯy */
+	$"DD82 BBF2 37F1 1193 74D0 373D 4043 C292"            /* Ý‚»ò7ñ.“tÐ7=@CÂ’ */
+	$"0B1D 4E8F 04F4 A035 451A 7DCB 02DB D77E"            /* ..N�.ô 5E.}Ë.Û×~ */
+	$"DD1C 3667 1BA7 2584 C128 3835 4454 5C15"            /* Ý.6g.§%„Á(85DT\. */
+	$"5846 C7D1 4689 3D2A 1172 9BA8 9830 F037"            /* XFÇÑF‰=*.r›¨˜0ð7 */
+	$"0053 8FD6 4023 68C6 7122 CAC6 0325 5AF3"            /* .S�Ö@#hÆq"ÊÆ.%Zó */
+	$"E104 A423 C5AE F551 6DF6 7B11 D5EB FD34"            /* á.¤#Å®õQmö{.Õëý4 */
+	$"DF67 C50C 737D 74D5 D5EC 7027 A2D8 C79A"            /* ßgÅ.s}tÕÕìp'¢ØÇš */
+	$"200D A972 A30A 509A C3DE 483F 8B53 D69C"            /*  .©r£ÂPšÃÞH?‹SÖœ */
+	$"001F 47E9 BD2C 84EC DB83 B493 0326 DE6E"            /* ..Gé½,„ìÛƒ´“.&Þn */
+	$"336A 7C76 3225 8351 7B2D 37B5 D645 9866"            /* 3j|v2%ƒQ{-7µÖE˜f */
+	$"019E 6472 40C4 5853 3376 9D90 D3EA A727"            /* .ždr@ÄXS3v��Óê§' */
+	$"07A1 A4B8 A32F 475A 22A2 059C AB5B F13E"            /* .¡¤¸£/GZ"¢.œ«[ñ> */
+	$"E2DF 5B3E E6B5 B27F 28AF A15F 400C 7D9F"            /* âß[>æµ².(¯¡_@.}Ÿ */
+	$"43ED 33D4 9B4D CB64 E550 5FED FC2F E485"            /* Cí3Ô›MËdåP_íü/ä… */
+	$"271E 2DB1 6AE5 6793 EFE8 FCC5 A784 4C95"            /* '.-±jåg“ïèüŧ„L• */
+	$"E488 B5AC A528 BACB 10FF 4ABD D554 E56B"            /* 䈵¬¥(ºË.ÿJ½ÕTåk */
+	$"F72E 8ED7 5E48 60A4 82D0 381F A2D4 625C"            /* ÷.Ž×^H`¤‚Ð8.¢Ôb\ */
+	$"9F80 2A63 5FD3 DD0C EDA8 3DE3 281E A65C"            /* Ÿ€*c_ÓÝ.í¨=ã(.¦\ */
+	$"88EA 1A96 626D DC03 79BE C4ED EA60 4FC5"            /* ˆê.–bmÜ.y¾Äíê`OÅ */
+	$"BB10 D9D5 99AF 0534 65C2 05AE 8D23 82B0"            /* ».ÙÕ™¯.4eÂ.®�#‚° */
+	$"6FB7 881A 7BC5 0316 7A28 4B27 2763 A6C3"            /* o·ˆ.{Å..z(K''c¦Ã */
+	$"8FC7 073A 1391 81BB 707F 625D 355F B1DF"            /* �Ç.:.‘�»p.b]5_±ß */
+	$"A749 C3EE A157 EC1F 0F6C 70AB 1A36 5711"            /* §IÃî¡Wì..lp«.6W. */
+	$"C49B 1CA8 54A0 0FB9 6A2E 0F86 2E57 BC2F"            /* Ä›.¨T .¹j..†.W¼/ */
+	$"8CDD B76A F6DB 83F9 EEFF 4BF1 DE60 660E"            /* ŒÝ·jöÛƒùîÿKñÞ`f. */
+	$"BCBA 7D68 D5DE 8663 DF06 3F65 A981 38D7"            /* ¼º}hÕÞ†cß.?e©�8× */
+	$"CC20 EBAE 6143 C79E D2F3 DCF4 FA0F 433E"            /* Ì ë®aCÇžÒóÜôú.C> */
+	$"6DFE 4C5F 032A F6DD DD11 F85F 5003 22CD"            /* mþL_.*öÝÝ.ø_P."Í */
+	$"C07E F1CC 40B9 8D61 825D 77C7 91A6 BD49"            /* À~ñÌ@¹�a‚]wÇ‘¦½I */
+	$"2590 4BCD EB13 37A2 D5FA 2931 F311 9028"            /* %�KÍë.7¢Õú)1ó.�( */
+	$"6C02 96FC ACF5 1EA4 8E51 4BC9 FDE8 DFEF"            /* l.–ü¬õ.¤ŽQKÉýèßï */
+	$"C5A0 8082 7E0D C127 3A80 A65B 7989 CCEE"            /* Å €‚~.Á':€¦[y‰Ìî */
+	$"6F6A 8DDF FB5B 46A5 3757 7FC3 3EFD BC0A"            /* oj�ßû[F¥7W.Ã>ý¼Â */
+	$"8567 1CB0 3BE7 A153 D7CE 8F63 D2DC 8840"            /* …g.°;ç¡S×Î�cÒ܈@ */
+	$"D993 E028 0E86 AA99 3ADE CC55 A789 CFC8"            /* Ù“à(.†ª™:ÞÌU§‰ÏÈ */
+	$"D92B 9613 3850 B7B3 467A FA09 7D45 E174"            /* Ù+–.8P·³FzúÆ}Eát */
+	$"D351 3254 64A3 7FC5 0D8D 1EDB FEC9 3F05"            /* ÓQ2Td£.Å.�.ÛþÉ?. */
+	$"C3C2 264B ACB8 F3C3 1BFF 04A5 12CF C191"            /* ÃÂ&K¬¸óÃ.ÿ.¥.ÏÁ‘ */
+	$"8CA0 5985 E34C E583 A230 CD43 8602 BAAF"            /* Œ Y…ãL僢0ÍC†.º¯ */
+	$"1475 FCA7 B274 1314 051F AF06 089D 13B1"            /* .uü§²t....¯..�.± */
+	$"5C06 815E FAA5 6864 CECE D56A 127C 058B"            /* \.�^ú¥hdÎÎÕj.|.‹ */
+	$"1859 E9E8 7A98 4299 3CFF 70CE C2DD 8676"            /* .Yéèz˜B™<ÿpÎÂ݆v */
+	$"1798 5F8E 9960 922E 9226 3F9B 5657 890F"            /* .˜_Ž™`’.’&?›VW‰. */
+	$"75BC FECF 6919 6701 D086 0EA5 26BA 8B78"            /* u¼þÏi.g.І.¥&º‹x */
+	$"7381 41FC 19AD 7201 BFD9 B3D3 2F00 1A1C"            /* s�Aü.­r.¿Ù³Ó/... */
+	$"E689 F3BC 5FC7 0418 66A2 5AEE 0374 DE30"            /* æ‰ó¼_Ç..f¢Zî.tÞ0 */
+	$"DC4B 70F1 ACC6 2BC6 06E9 461F E71B CD5E"            /* ÜKpñ¬Æ+Æ.éF.ç.Í^ */
+	$"2766 D533 884B A37F 7820 5CCA 3D60 1C3A"            /* 'fÕ3ˆK£.x \Ê=`.: */
+	$"8865 509F C1F0 86B6 9A91 0A52 426E CF1D"            /* ˆePŸÁð†¶š‘ÂRBnÏ. */
+	$"4B52 7AFE 9519 ECDB 9DD3 BFA1 80F7 50BD"            /* KRzþ•.ìÛ�Ó¿¡€÷P½ */
+	$"D2DD 6FAB F00D 3600 9104 37AC 81AA F9C3"            /* ÒÝo«ð.6.‘.7¬�ªùà */
+	$"3933 A702 AC9C 42F1 4579 C5F2 CD99 165F"            /* 93§.¬œBñEyÅòÍ™._ */
+	$"2D84 FE8B D02C 055F F99C 1729 45C7 6B56"            /* -„þ‹Ð,._ùœ.)EÇkV */
+	$"EE73 818A 9940 BB46 1408 639B 9779 C805"            /* îs�Š™@»F..c›—yÈ. */
+	$"1B0B CC86 D42E E9BB 046D 0E93 7273 E00F"            /* ..̆Ô.é».m.“rsà. */
+	$"B7D5 D377 E0ED 2494 4623 5BDF C83C 54A5"            /* ·ÕÓwàí$”F#[ßÈ<T¥ */
+	$"6B6B D343 F20E AD4C B45C 2BF4 7C65 87A1"            /* kkÓCò.­L´\+ô|e‡¡ */
+	$"E2EA E2B7 FF17 F9A1 5606 D5A7 C113 F062"            /* âêâ·ÿ.ù¡V.Õ§Á.ðb */
+	$"D50E E647 922C 8746 7CBA 99C8 4400 979D"            /* Õ.æG’,‡F|º™ÈD.—� */
+	$"3D09 19E7 3A84 E245 ED1F 1C14 3967 45CE"            /* =Æ.ç:„âEí...9gEÎ */
+	$"2B06 C383 F2A6 2CEE 02E6 A2A7 1821 0F3F"            /* +.Ãò¦,î.梧.!.? */
+	$"4057 F9E9 B830 94C7 65AA C396 6F97 2721"            /* @Wùé¸0”ÇeªÃ–o—'! */
+	$"F1AC 6AF7 6C6C 3F02 D2F1 343D 8B42 0F6F"            /* ñ¬j÷ll?.Òñ4=‹B.o */
+	$"E2D4 A7D8 7158 F033 C573 AD72 01B7 1CC7"            /* âÔ§ØqXð3Ås­r.·.Ç */
+	$"4CA6 78C2 BABD BB30 5E03 BDEE DF19 8240"            /* L¦xº½»0^.½îß.‚@ */
+	$"9521 A43A B142 2F42 3590 AD8C B9FD A409"            /* •!¤:±B/B5�­Œ¹ý¤Æ */
+	$"9D77 38E7 B8F8 3BCD 4478 61C3 5768 0324"            /* �w8ç¸ø;ÍDxaÃWh.$ */
+	$"4E55 4240 1E87 1F93 D0BA 6929 C235 7E76"            /* NUB@.‡.“кi)Â5~v */
+	$"F6E8 AA1B AF13 15FD EB95 2609 BE7D BFE8"            /* öèª.¯..ýë•&ƾ}¿è */
+	$"3E51 8F2E 4780 4EE6 891E F83D FF7D D1C3"            /* >Q�.G€Næ‰.ø=ÿ}Ñà */
+	$"818F 28A2 2AC0 AD00 7F03 5781 2882 A44A"            /* ��(¢*À­...W�(‚¤J */
+	$"6728 D9F6 E77F A883 C794 71AC 55E9 8112"            /* g(Ùöç.¨ƒÇ”q¬Ué�. */
+	$"BF6F ECDA 9BD1 96B8 79AA A397 A6F2 C93F"            /* ¿oìڛі¸yª£—¦òÉ? */
+	$"3792 B8C4 8667 AAF4 659D 59F6 E77F A870"            /* 7’¸Ä†gªôe�Yöç.¨p */
+	$"24F1 5461 DB69 0F4C F8B3 F02A F6E7 7FA6"            /* $ñTaÛi.Lø³ð*öç.¦ */
+	$"26C9 5EDE 9BB6 A1C6 9467 854A 5327 BA38"            /* &É^Þ›¶¡Æ”g…JS'º8 */
+	$"F535 A01A B90A 9580 95A0 FE5C A623 DE0D"            /* õ5 .¹Â•€• þ\¦#Þ. */
+	$"6C3E BF23 66F2 9312 9490 EB88 1D63 7AF4"            /* l>¿#fò“.”�ëˆ.czô */
+	$"9F5B 7F45 9078 3A5F CC36 7702 EAD5 FA4D"            /* Ÿ[.E�x:_Ì6w.êÕúM */
+	$"5F9D 258B 14A8 A235 6490 6B7D 2B05 42C3"            /* _�%‹.¨¢5d�k}+.Bà */
+	$"2A5A 791E 92C3 B1E8 B323 FF74 81FC B063"            /* *Zy.’ñè³#ÿt�ü°c */
+	$"4A31 CBBC 91E2 A64A F935 FE79 4C07 1376"            /* J1˼‘â¦Jù5þyL..v */
+	$"002A 4795 5221 70B2 005C 41F9 D631 126F"            /* .*G•R!p².\AùÖ1.o */
+	$"FF7F DF03 06BD 7214 71AB 4EF3 8EEA 0261"            /* ÿ.ß..½r.q«NóŽê.a */
+	$"D054 C087 EA15 CBD2 4645 2F9F 3600 4144"            /* ÐTÀ‡ê.ËÒFE/Ÿ6.AD */
+	$"5671 C61E D3CB 8B84 A60D B58E FB69 C71F"            /* VqÆ.ÓË‹„¦.µŽûiÇ. */
+	$"B09A EDD9 AAC0 6FBA D7FE 8C4D 8262 6C73"            /* °šíÙªÀoº×þŒM‚bls */
+	$"9F69 0E81 7581 1D52 FB27 C979 1597 69EA"            /* Ÿi.�u�.Rû'Éy.—iê */
+	$"F1DF E906 0B77 2E21 D31A 5CCD 9474 95A2"            /* ñßé..w.!Ó.\Í”t•¢ */
+	$"CB48 AB27 5F53 B82F 1638 16A4 87CD ED1F"            /* ËH«'_S¸/.8.¤‡Íí. */
+	$"20BC 2894 5EE1 C84C 1AC1 1158 0293 024E"            /*  ¼(”^áÈL.Á.X.“.N */
+	$"1023 0E4F 9BD8 FA73 6E62 FF7F FD08 5797"            /* .#.O›Øúsnbÿ.ý.W— */
+	$"0788 A951 6DDA 2448 21D2 7FCA 20B4 E1BF"            /* .ˆ©QmÚ$H!Ò.Ê ´á¿ */
+	$"3262 89C7 5386 ACB1 8B89 6AC3 F907 1355"            /* 2b‰ÇS†¬±‹‰jÃù..U */
+	$"66D9 1E5A 5B54 19E9 2737 FF7C B8DF 1F5E"            /* fÙ.Z[T.é'7ÿ|¸ß.^ */
+	$"3592 B16D 6089 DE73 8F19 479D 626B 977D"            /* 5’±m`‰Þs�.G�bk—} */
+	$"185E F7A3 AF62 AD92 E5AC 2F74 B991 F96F"            /* .^÷£¯b­’å¬/t¹‘ùo */
+	$"211F 5AE0 4C27 344F A9E1 C731 DB20 A0FF"            /* !.ZàL'4O©áÇ1Û  ÿ */
+	$"7FFF 7F2E 356F CC55 C6B8 C2C9 2AEF 2D31"            /* .ÿ..5oÌUƸÂÉ*ï-1 */
+	$"EFEB D878 C16F B1B1 3D47 240C 489C 7153"            /* ïëØxÁo±±=G$.HœqS */
+	$"E5F8 A5C8 6E2C 7650 AED0 C4B7 43EA 67B6"            /* åø¥Èn,vP®ÐÄ·Cêg¶ */
+	$"94E4 7274 CFEB 4CF3 FD3E 8065 B9CC 35A5"            /* ”ärtÏëLóý>€e¹Ì5¥ */
+	$"21B1 3804 AD98 4F8A 6FFC 50DA 014C 442B"            /* !±8.­˜OŠoüPÚ.LD+ */
+	$"AA41 1455 BD94 B366 A37D CA82 7FFC DE57"            /* ªA.U½”³f£}Ê‚.üÞW */
+	$"2EA9 98C2 5510 E51E 24CC 0428 4C83 1BBE"            /* .©˜ÂU.å.$Ì.(Lƒ.¾ */
+	$"0A46 A6DD 6963 D4CB 24E8 748B ED10 7B6D"            /* ÂF¦ÝicÔË$èt‹í.{m */
+	$"E61C 86C3 C80E 3030 FCE9 2263 C956 95A1"            /* æ.†ÃÈ.00üé"cÉV•¡ */
+	$"AED0 C4B1 D07C F701 9DA0 ED2C C401 BC1A"            /* ®ÐıÐ|÷.� í,Ä.¼. */
+	$"9421 2D43 EF12 7494 8D46 CB82 3FE2 6439"            /* ”!-Cï.t”�FË‚?âd9 */
+	$"6BDE C8CE 23B7 9D2E B6F9 DF4B C1A9 A145"            /* kÞÈÎ#·�.¶ùßKÁ©¡E */
+	$"1512 85E6 30E6 98D1 AC22 EEBC 459C D841"            /* ..…æ0æ˜Ñ¬"î¼EœØA */
+	$"0A0F 1F31 2F75 7937 220F 7271 FE79 44A6"            /* Â..1/uy7".rqþyD¦ */
+	$"777E 1645 E0BA D980 0FFF 7D9F EC83 A930"            /* w~.EàºÙ€.ÿ}Ÿìƒ©0 */
+	$"D12B 216D 4D3F 4AD0 5EE9 DBC7 53D7 0A21"            /* Ñ+!mM?JÐ^éÛÇS×Â! */
+	$"2372 C608 6701 8AFA 8E33 4125 2B7E 38DA"            /* #rÆ.g.ŠúŽ3A%+~8Ú */
+	$"5990 99EE B1D0 B07C 9F9D 97DD D658 2C2A"            /* Y�™î±Ð°|Ÿ�—ÝÖX,* */
+	$"C7D6 4556 2AA7 297F ACBE 4802 B472 E76F"            /* ÇÖEV*§).¬¾H.´rço */
+	$"644F 2F11 17FF 7F9D CE1C 2989 7199 03B1"            /* dO/..ÿ.�Î.)‰q™.± */
+	$"E719 2B3B 1131 C4CC 808B BC7A 26A4 479F"            /* ç.+;.1ÄÌ€‹¼z&¤GŸ */
+	$"4824 6486 E338 DB65 A502 454C C415 B8D0"            /* H$d†ã8Ûe¥.ELÄ.¸Ð */
+	$"7C77 7323 E381 5958 F415 95B9 142E 85F8"            /* |ws#ã�YXô.•¹..…ø */
+	$"1742 E22F FF17 567B A195 DFF1 7EE0 8E40"            /* .Bâ/ÿ.V{¡•ßñ~àŽ@ */
+	$"431A B629 DDCE AED1 A925 9FCD 56B5 7945"            /* C.¶)Ýήѩ%ŸÍVµyE */
+	$"B8B9 77DF 732C CD1E 8137 2645 1135 9593"            /* ¸¹wßs,Í.�7&E.5•“ */
+	$"E31C 333B 30E2 518D E202 A1E0 FEA6 C40E"            /* ã.3;0âQ�â.¡àþ¦Ä. */
+	$"BB50 0174 C21D 0BFB 34C1 1A8D 8E5D FF77"            /* »P.tÂ..û4Á.�Ž]ÿw */
+	$"909A 8111 3123 8200 AFC2 0525 13A1 C383"            /* �š�.1#‚.¯Â.%.¡Ãƒ */
+	$"5472 BA45 8D58 8818 E5CD 6FEA D858 47C5"            /* TrºE�Xˆ.åÍoêØXGÅ */
+	$"F5A0 7773 3C86 1CE8 9A67 FAA7 5726 643B"            /* õ ws<†.èšgú§W&d; */
+	$"1BF8 C2C1 E7AD D3CE E89B 97C4 0210 1FAE"            /* .øÂÁç­ÓÎè›—Ä...® */
+	$"9319 1F1F 7F89 0B76 5918 7EF8 9947 CF44"            /* “....‰.vY.~ø™GÏD */
+	$"6B5C 4B5D 5067 58A7 F35E CF39 7D01 C555"            /* k\K]PgX§ó^Ï9}.ÅU */
+	$"FCD3 E0F6 C1A4 9C8A 0B34 2D33 A20D F664"            /* üÓàöÁ¤œŠ.4-3¢.öd */
+	$"C174 CCE8 CAA1 C45F 2974 101B 86E7 68FD"            /* ÁtÌèÊ¡Ä_)t..†çhý */
+	$"D6FE 8FE9 AC95 5D3D DE38 1829 E3B9 37FE"            /* Öþ�鬕]=Þ8.)ã¹7þ */
+	$"5008 F383 21C4 4D57 AE92 9F94 A9BB 3A76"            /* P.óƒ!ÄMW®’Ÿ”©»:v */
+	$"705F 8D2D 889C EB93 FD2B 05C5 89F2 500E"            /* p_�-ˆœë“ý+.ʼnòP. */
+	$"4220 A486 F348 D466 4D62 E368 540A 1D25"            /* B ¤†óHÔfMbãhTÂ.% */
+	$"AF7C A9EF 43CC E423 16FC 6EE5 C407 DDAE"            /* ¯|©ïCÌä#.ünåÄ.Ý® */
+	$"EB28 23D2 3FDE 40EF 2ED1 D53A B87B 9C40"            /* ë(#Ò?Þ@ï.ÑÕ:¸{œ@ */
+	$"80A2 77EF CC8F D34E C33F 7BB4 4748 E4A6"            /* €¢wïÌ�ÓNÃ?{´GHä¦ */
+	$"B177 05FF 085F CBF9 F1A0 8CA7 4200 32AC"            /* ±w.ÿ._Ëùñ Œ§B.2¬ */
+	$"7B87 A517 EA04 C96C F9A3 C6ED 5FFF 7FED"            /* {‡¥.ê.Élù£Æí_ÿ.í */
+	$"D5EB F835 3E15 6882 AED1 72BF B42C 87DE"            /* Õëø5>.h‚®Ñr¿´,‡Þ */
+	$"8111 0F7A 5DA6 CFEA 79A7 9174 89E8 E637"            /* �..z]¦Ïêy§‘t‰èæ7 */
+	$"7E56 B53E 9987 2013 8F1A 06A5 07A2 1856"            /* ~Vµ>™‡ .�..¥.¢.V */
+	$"FE30 E259 128A 968B 881F E88D 8566 98D7"            /* þ0âY.Š–‹ˆ.è�…f˜× */
+	$"C815 C397 64E8 9FAC 059A 5922 C863 F220"            /* È.×d蟬.šY"Ècò  */
+	$"EC2A 4AF8 5DB2 A77D FC6A 3AC1 357E D5CC"            /* ì*Jø]²§}üj:Á5~ÕÌ */
+	$"142B 85B0 FEE0 2579 D845 CDFD F507 4C58"            /* .+…°þà%yØEÍýõ.LX */
+	$"D86A F299 0BBC A0A8 39A4 03D9 2144 6B3E"            /* Øjò™.¼ ¨9¤.Ù!Dk> */
+	$"6D67 242B 0FEB B6F4 79CB 58ED 2338 DB9F"            /* mg$+.ë¶ôyËXí#8ÛŸ */
+	$"6EC7 1626 0FDD 0C77 1E00 2AE4 8B46 F39C"            /* nÇ.&.Ý.w..*ä‹Fóœ */
+	$"6268 EE5F FF49 B5C8 30E7 9859 E163 A9D4"            /* bhî_ÿIµÈ0ç˜Yác©Ô */
+	$"C50F BC0C 46BB BBC7 9FFF 7D54 E81B 8936"            /* Å.¼.F»»ÇŸÿ}Tè.‰6 */
+	$"A032 72E8 6576 5FEA 9A3F A5A9 9E58 B9C2"            /*  2rèev_êš?¥©žX¹Â */
+	$"A089 A039 5695 766F 3295 A1FF 7F5F FBDB"            /*  ‰ 9V•vo2•¡ÿ._ûÛ */
+	$"A3FD 1F1F 76AD 6787 B4D0 D1A5 E4EA 72F8"            /* £ý..v­g‡´ÐÑ¥äêrø */
+	$"0276 0C35 EC34 65A8 000A CA35 6AAE 1800"            /* .v.5ì4e¨.ÂÊ5j®.. */
+	$"99CA 1B65 F56D 6C3B DF33 AB08 94A3 15CF"            /* ™Ê.eõml;ß3«.”£.Ï */
+	$"C9B8 D32E 35D7 D32D 57E6 86D2 A5BE 2B3A"            /* ɸÓ.5×Ó-Wæ†Ò¥¾+: */
+	$"4535 2C10 41FE FDA9 E202 3927 BC4F 5F90"            /* E5,.Aþý©â.9'¼O_� */
+	$"E637 311C DB00 E394 09F3 005B 7DB3 0DFE"            /* æ71.Û.ã”Æó.[}³.þ */
+	$"9F1F CAA4 DD03 B381 8330 AB38 E13B 2F9C"            /* Ÿ.ʤÝ.³�ƒ0«8á;/œ */
+	$"3DB5 01C5 100A 5D16 5C8D 792C FA0E 1A85"            /* =µ.Å.Â].\�y,ú..… */
+	$"E3FF 467A 6333 E4F1 F27C 9E2B 161E 18F0"            /* ãÿFzc3äñò|ž+...ð */
+	$"3F30 9C2C 631D BE74 4B7F 6E21 3FBC 404E"            /* ?0œ,c.¾tK.n!?¼@N */
+	$"E063 4152 D02D 68E4 869C E7E9 E4E6 4E95"            /* àcARÐ-h䆜çéäæN• */
+	$"3A66 1FDA 1145 DFB4 0796 9F97 503C E2C9"            /* :f.Ú.Eß´.–Ÿ—P<âÉ */
+	$"7F49 D644 1290 98BD 8EA0 2FA1 CF00 E383"            /* .IÖD.�˜½Ž /¡Ï.ム*/
+	$"C003 7BFE D79B FF62 A38E 2C39 A64D 19FF"            /* À.{þ×›ÿb£Ž,9¦M.ÿ */
+	$"6A9D 976A 994B 6626 4F4D 7DC8 F0CA EDB7"            /* j�—j™Kf&OM}ÈðÊí· */
+	$"F99E 21E2 36B4 3AAB E787 C6A2 1783 F623"            /* ùž!â6´:«ç‡Æ¢.ƒö# */
+	$"8755 1F66 AFBC 2959 6E6E 2E61 AC85 2198"            /* ‡U.f¯¼)Ynn.a¬…!˜ */
+	$"9978 EDFD 334C F0D6 7F76 9AF2 47AF 5E4B"            /* ™xíý3LðÖ.všòG¯^K */
+	$"805C 54D3 5F2A 16C5 6675 C288 B44F F851"            /* €\TÓ_*.Åfuˆ´OøQ */
+	$"1CE9 9F21 BF10 92B9 2366 5D69 AE8E 9989"            /* .éŸ!¿.’¹#f]i®Ž™‰ */
+	$"36A6 F9E6 75A7 0D47 C8B5 8727 0138 2BFA"            /* 6¦ùæu§.Gȵ‡'.8+ú */
+	$"5C4A 649C 123C 225E 2CEC 2007 5016 3F11"            /* \Jdœ.<"^,ì .P.?. */
+	$"B8FF 60CB 7150 EBFD DFED 147E 0A98 E096"            /* ¸ÿ`ËqPëýßí.~Â˜à– */
+	$"6B76 3AF0 39A5 5BF2 880C E857 174C 8735"            /* kv:ð9¥[òˆ.èW.L‡5 */
+	$"ACF6 E4B7 3477 6293 FF7C 8515 A8DE 4E73"            /* ¬öä·4wb“ÿ|….¨ÞNs */
+	$"8E37 8A0C 4384 0CF3 FA01 15F5 9639 ED05"            /* Ž7Š.C„.óú..õ–9í. */
+	$"C86B 28A0 C331 14BC 2817 FE9B F96A D60D"            /* Èk( Ã1.¼(.þ›ùjÖ. */
+	$"EBCB 14DA FF7F FF47 8A61 A2C7 F01F 10B7"            /* ëË.Úÿ.ÿGŠa¢Çð..· */
+	$"3DAF B01C B484 F55D 457E E3EC CC41 95DE"            /* =¯°.´„õ]E~ãìÌA•Þ */
+	$"097E 8117 F77F FEFB A490 8B96 1300 2B37"            /* Æ~�.÷.þû¤�‹–..+7 */
+	$"19FA E04C 4188 E9F6 8950 0668 B082 8FD8"            /* .úàLAˆéö‰P.h°‚�Ø */
+	$"0B7D 6C32 4DBF F84F F4E9 ACAF 719A DC43"            /* .}l2M¿øOô鬯qšÜC */
+	$"9F8D A53E DF1A BDB0 AAA7 3267 9C2D 357A"            /* Ÿ�¥>ß.½°ª§2gœ-5z */
+	$"9CA7 1AE1 59C4 F467 83D3 308B 004A 42C2"            /* œ§.áYÄôgƒÓ0‹.JB */
+	$"909B F979 41CE AB25 C6D1 9FE9 46E1 E837"            /* �›ùyAΫ%ÆÑŸéFáè7 */
+	$"7ADF FF72 225E 4472 D323 F55C BE19 1E50"            /* zßÿr"^DrÓ#õ\¾..P */
+	$"BF94 6787 CADB F576 300A 054B 0A2D E9B2"            /* ¿”g‡ÊÛõv0Â.KÂ-é² */
+	$"5C15 DB84 E735 F76D 5477 D8A7 28AF FF7A"            /* \.Û„ç5÷mTwا(¯ÿz */
+	$"7EB8 06F8 4FF4 E999 ED48 02C4 F111 F61D"            /* ~¸.øOôé™íH.Äñ.ö. */
+	$"8A6C 1CC6 AE54 94E4 8C5D 7655 4ECC 205F"            /* Šl.Æ®T”äŒ]vUNÌ _ */
+	$"DBF9 1BA7 83CC 52E9 E9C9 52A4 1151 7DE4"            /* Ûù.§ƒÌRééÉR¤.Q}ä */
+	$"051B E140 3FC0 D60B 0C11 663F 98A9 8B53"            /* ..á@?ÀÖ...f?˜©‹S */
+	$"776E BD8D 7678 AD62 ACEE 033F D134 B61E"            /* wn½�vx­b¬î.?Ñ4¶. */
+	$"F86D 3384 AAE7 9074 F7CF 4509 F9B3 4F30"            /* øm3„ªç�t÷ÏEÆù³O0 */
+	$"F32D 840F 1DDA E6B1 BDD4 951F 2379 F890"            /* ó-„..Úæ±½Ô•.#yø� */
+	$"530A E915 A228 D3D8 B188 C692 2767 D628"            /* SÂé.¢(ÓرˆÆ’'gÖ( */
+	$"12F8 3FFA BA23 F76B 1D92 1FC1 EA73 30FC"            /* .ø?úº#÷k.’.Áês0ü */
+	$"CE72 0CA5 6695 6326 F93B B52F B9D4 F6F0"            /* Îr.¥f•c&ù;µ/¹Ôöð */
+	$"FF07 727B 80F9 EBFC 2176 788C 333F 4137"            /* ÿ.r{€ùëü!vxŒ3?A7 */
+	$"E82C D066 6088 A8EA 168F 40EA F1EE BDE8"            /* è,Ðf`ˆ¨ê.�@êñî½è */
+	$"C023 75BA 66F2 335A 98C0 31A8 2137 7A7B"            /* À#uºfò3Z˜À1¨!7z{ */
+	$"DA0F 3962 D4B3 3E6E A5A1 3A19 5EED 48A7"            /* Ú.9bÔ³>n¥¡:.^íH§ */
+	$"7617 DE46 D178 BC48 D85D 7821 DFEC B30D"            /* v.ÞFÑx¼HØ]x!ßì³. */
+	$"F84F B7CD 80ED 55C7 9E1A F58D 7085 F625"            /* øO·Í€íUÇž.õ�p…ö% */
+	$"F564 3BF5 A09E B353 4E45 2F0B FC02 ECFD"            /* õd;õ ž³SNE/.ü.ìý */
+	$"539F 529C A652 34F1 C0CC BC04 FCE0 2C7D"            /* SŸRœ¦R4ñÀ̼.üà,} */
+	$"A8A9 9E67 79E9 ADE4 ABEE BFF6 4793 1B91"            /* ¨©žgyé­ä«î¿öG“.‘ */
+	$"413A 4302 7FB5 190C CB09 0DC9 3B33 E18D"            /* A:C..µ..ËÆ.É;3á� */
+	$"DDAB 23C5 FABA 5DC1 554F C940 B964 7F6A"            /* Ý«#Åúº]ÁUOÉ@¹d.j */
+	$"A781 2032 BF9E 0262 7C99 CD96 9251 9FB6"            /* §� 2¿ž.b|™Í–’QŸ¶ */
+	$"1C69 9141 7A13 3022 DE48 DA68 C959 A0B5"            /* .i‘Az.0"ÞHÚhÉY µ */
+	$"0F3A F19A 9301 5051 5855 9D7B 5173 EE47"            /* .:ñš“.PQXU�{QsîG */
+	$"2B0D DB30 28CC 5E41 46F1 E79F 90B3 AB2A"            /* +.Û0(Ì^AFñçŸ�³«* */
+	$"CAEA 6128 10E1 2CC0 DDC2 EBF1 26F1 E1DC"            /* Êêa(.á,ÀÝÂëñ&ñáÜ */
+	$"EB87 87ED 55F3 827C A066 D932 FCF7 B134"            /* 뇇íUó‚| fÙ2ü÷±4 */
+	$"8BC9 CC70 B38C B019 8372 EA60 7C36 4D38"            /* ‹ÉÌp³Œ°.ƒrê`|6M8 */
+	$"F82F 16C2 2390 A91B 203A 8EBE D0EC E278"            /* ø/.Â#�©. :Ž¾Ðìâx */
+	$"7AC4 8493 A217 6AC3 B85A 470D D74A B91D"            /* zÄ„“¢.jøZG.×J¹. */
+	$"0180 7BAB 4088 5671 6268 5B4A 54FE C179"            /* .€{«@ˆVqbh[JTþÁy */
+	$"1600 7677 830B 0E81 EEB2 6124 33F8 DBBD"            /* ..vwƒ..�î²a$3øÛ½ */
+	$"1B35 D1F9 0568 3891 0ECB A836 5A86 9636"            /* .5Ñù.h8‘.˨6Z†–6 */
+	$"9F87 052F 0D66 8AA3 3362 1651 9B33 9057"            /* Ÿ‡./.fŠ£3b.Q›3�W */
+	$"5B98 05EB 23CE 099F 2358 444E 0D64 A9F9"            /* [˜.ë#ÎÆŸ#XDN.d©ù */
+	$"A569 7D56 A50D 6256 69AF BDD9 7847 D651"            /* ¥i}V¥.bVi¯½ÙxGÖQ */
+	$"73E2 F76E F277 58DC BFB9 7B8E 593C 0E97"            /* sâ÷nòwXÜ¿¹{ŽY<.— */
+	$"3C4E 507D FA6C 7984 FAC8 6C42 6882 78AC"            /* <NP}úly„úÈlBh‚x¬ */
+	$"E40D B7A2 4E43 998B 1C29 D7C6 B7BA 58C9"            /* ä.·¢NC™‹.)×Æ·ºXÉ */
+	$"3503 114B 86B8 CB5D B605 832D 98FE 0257"            /* 5..K†¸Ë]¶.ƒ-˜þ.W */
+	$"FB50 8CA0 43D4 71BE E330 1584 5983 668F"            /* ûPŒ CÔq¾ã0.„Yƒf� */
+	$"735C 2448 3B30 82E4 1932 5BF8 129F FE38"            /* s\$H;0‚ä.2[ø.Ÿþ8 */
+	$"749D 01ED DAFC 95B9 375D BBCB 60D9 FC58"            /* t�.íÚü•¹7]»Ë`ÙüX */
+	$"0796 AEFC 2337 F89E 01F5 48BD 0BAF A61F"            /* .–®ü#7øž.õH½.¯¦. */
+	$"3EC4 C092 DC6A 584C AAAF 1A9F A20F CEA4"            /* >ÄÀ’ÜjXLª¯.Ÿ¢.Τ */
+	$"884B 2DB6 09F4 F51B 546F CD71 F4D3 6452"            /* ˆK-¶Æôõ.ToÍqôÓdR */
+	$"B6E5 3EFF 66F8 0D60 D916 F755 1348 E250"            /* ¶å>ÿfø.`Ù.÷U.HâP */
+	$"D8E2 6858 B424 B84B D59A 6885 24D3 D845"            /* ØâhX´$¸KÕšh…$ÓØE */
+	$"692F 4313 B616 584F 7419 0661 0064 C281"            /* i/C.¶.XOt..a.dÂ� */
+	$"A873 131C 5296 042B 1FD5 3EED BFC2 659E"            /* ¨s..R–.+.Õ>í¿Âež */
+	$"C4C7 2720 8002 28DD 141A BBE7 99F8 028F"            /* ÄÇ' €.(Ý..»ç™ø.� */
+	$"8262 0577 5240 EB9A F866 2901 B75B 3FED"            /* ‚b.wR@ëšøf).·[?í */
+	$"9E78 9071 83FD 02BC FCDE 2135 42D1 F184"            /* žx�qƒý.¼üÞ!5BÑñ„ */
+	$"309D F47E DF10 F797 4268 120A D377 04A4"            /* 0�ô~ß.÷—Bh.ÂÓw.¤ */
+	$"2998 099E CA35 66AD FB20 8C14 1E0E 714E"            /* )˜ÆžÊ5f­û Œ...qN */
+	$"B9A7 70EE 5BA0 7A18 FC16 97EB 1A98 CB6C"            /* ¹§pî[ z.ü.—ë.˜Ël */
+	$"4B5D AC5B 3DC2 2062 E74A 18F2 0A76 6085"            /* K]¬[=Â bçJ.òÂv`… */
+	$"EF50 1C2F FE23 117A ED22 7BE8 0231 BC71"            /* ïP./þ#.zí"{è.1¼q */
+	$"707C 6736 BC3C 38AA 81C2 66B6 DCE5 13E9"            /* p|g6¼<8ª�Âf¶Üå.é */
+	$"3076 C7AD 8C4B A962 C37E 4605 CDC0 8247"            /* 0vÇ­ŒK©bÃ~F.ÍÀ‚G */
+	$"190C 41CD 6923 8D00 BC94 5B5F E2AB 443B"            /* ..AÍi#�.¼”[_â«D; */
+	$"3C5A 7FF6 213C 9E2D 9224 70B1 EA9B 7D36"            /* <Z.ö!<ž-’$p±ê›}6 */
+	$"E7EA 0D03 CB32 7413 AB26 CB30 1B56 CBDE"            /* çê..Ë2t.«&Ë0.VËÞ */
+	$"3C31 361D 24E2 F441 4D78 7825 1DA0 0C14"            /* <16.$âôAMxx%. .. */
+	$"5C84 B112 6FC1 77DB 42CA 7791 960B 9F09"            /* \„±.oÁwÛBÊw‘–.ŸÆ */
+	$"980A 5629 54C0 EC82 889A B0E3 38F4 E734"            /* ˜ÂV)TÀ삈š°ã8ôç4 */
+	$"FA91 D5CD 2C8F 43CD 5629 3DAD 81DA 5E0A"            /* ú‘ÕÍ,�CÍV)=­�Ú^Â */
+	$"C008 712F EAD3 2486 4CD2 C7BA 0FA9 BBD3"            /* À.q/êÓ$†LÒǺ.©»Ó */
+	$"6AC2 A912 7736 5A33 CC96 9EDC 9C5A 3084"            /* j©.w6Z3Ì–žÜœZ0„ */
+	$"C826 A3FB 0661 ED4B 9689 A921 22AB 2399"            /* È&£û.aíK–‰©!"«#™ */
+	$"6F2A 4A78 A5F8 A059 BE4B 7DFF 5D41 1A31"            /* o*Jx¥ø Y¾K}ÿ]A.1 */
+	$"E688 045C BD1E D1DB 7C5B 6B89 5C22 3CAF"            /* æˆ.\½.ÑÛ|[k‰\"<¯ */
+	$"F133 FF14 13A2 9A3F 6E42 54EB 5082 9F25"            /* ñ3ÿ..¢š?nBTëP‚Ÿ% */
+	$"7C07 6BA6 25EA A890 3560 E915 B058 CB68"            /* |.k¦%ê¨�5`é.°XËh */
+	$"3601 4B07 ACE7 EC8A 2897 F908 D405 455E"            /* 6.K.¬çìŠ(—ù.Ô.E^ */
+	$"5EDD 427E 791A EA3D 6ACE 3BC0 0D43 731A"            /* ^ÝB~y.ê=jÎ;À.Cs. */
+	$"C9C6 8C03 BD83 6F85 EF75 7246 2F8E 1CFB"            /* ÉÆŒ.½ƒo…ïurF/Ž.û */
+	$"8DC9 2726 593F 1D87 A822 399F 9770 324C"            /* �É'&Y?.‡¨"9Ÿ—p2L */
+	$"6ABF 38B9 E89E B2F5 D575 E7DB C449 63CF"            /* j¿8¹èž²õÕuçÛÄIcÏ */
+	$"EBE1 07BB 80A4 C099 6A15 9A47 96F3 8C8D"            /* ëá.»€¤À™j.šG–óŒ� */
+	$"49E1 1F78 2119 9460 CA7A F257 EDA1 104B"            /* Iá.x!.”`ÊzòWí¡.K */
+	$"5C68 0E57 188C 62B0 FBE3 CF4F 5251 6525"            /* \h.W.Œb°ûãÏORQe% */
+	$"CB59 5E3D C6F4 6B04 5B2D 1ED2 3BE1 02BB"            /* ËY^=Æôk.[-.Ò;á.» */
+	$"7207 12AA BFEC 50F4 83FE 2797 121B 3D14"            /* r..ª¿ìPôƒþ'—..=. */
+	$"DA23 BE41 D647 E5CA DD2D CD48 8C4D A094"            /* Ú#¾AÖGåÊÝ-ÍHŒM ” */
+	$"B1A9 4ED5 4735 8818 C4F1 597D 3211 5D12"            /* ±©NÕG5ˆ.ÄñY}2.]. */
+	$"D96B 5A38 AB9A 7E89 C503 13B0 8354 C887"            /* ÙkZ8«š~‰Å..°ƒTȇ */
+	$"F766 96F0 EDAE C6B6 17B4 E9A4 9230 C2F5"            /* ÷f–ðí®Æ¶.´é¤’0Âõ */
+	$"029D 3D72 A1CF 5BB9 E975 DBFF 06DC F5B2"            /* .�=r¡Ï[¹éuÛÿ.Üõ² */
+	$"686F 667B AD3E 1D8D 5BE4 0D6A 2CD7 DE66"            /* hof{­>.�[ä.j,×Þf */
+	$"BE8E C996 696D 58EC 6CFE 40AD 3C95 EAF1"            /* ¾ŽÉ–imXìlþ@­<•êñ */
+	$"4591 1D62 836E D2E3 4CD8 E4A6 F4F4 C456"            /* E‘.bƒnÒãLØä¦ôôÄV */
+	$"A70C B3BE AA22 A188 DAB5 D3F7 4B7B 865D"            /* §.³¾ª"¡ˆÚµÓ÷K{†] */
+	$"4D89 77E6 99A6 46C9 14BA 25E1 55C5 ADBD"            /* M‰w晦FÉ.º%áUÅ­½ */
+	$"4379 96AF 26DA A399 F009 AE75 248B 0285"            /* Cy–¯&Ú£™ðÆ®u$‹.… */
+	$"B370 5704 6429 C8AF 0BD3 A332 90B2 8351"            /* ³pW.d)ȯ.Ó£2�²ƒQ */
+	$"F715 32C9 347B EADE 2EBB 9D97 BF95 0C5A"            /* ÷.2É4{êÞ.»�—¿•.Z */
+	$"9203 1EC5 7A8E CF46 C28C 39A2 DE74 C656"            /* ’..ÅzŽÏFÂŒ9¢ÞtÆV */
+	$"F0BF 3ABF CE5F BE71 B7CE 2FF3 F41B F3EA"            /* ð¿:¿Î_¾q·Î/óô.óê */
+	$"8BE7 B07E AB17 4F87 74FC FDE8 EF9F BF3F"            /* ‹ç°~«.O‡tüýè? */
+	$"A9EB F3D5 3F3E 83BE 7BAF EA5F E0FE 7ADF"            /* ©ëóÕ?>ƒ¾{¯ê_àþzß */
+	$"E7A7 7F9D 3FE7 3BF9 FA77 F9FA 3FF9 F7C7"            /* ç§.�?ç;ùúwùú?ù÷Ç */
+	$"E7E9 871D E84F CFE8 83FC FE85 E3BB E7E7"            /* çé‡.èOÏèƒüþ…ã»çç */
+	$"AFFE 7D7F F9F5 57E7 AF70 6F9D 2DF3 9ED7"            /* ¯þ}.ùõWç¯po�-óž× */
+	$"C81E F903 FEAB 8EF9 F50D F254 3F3E A4D1"            /* È.ù.þ«Žùõ.òT?>¤Ñ */
+	$"DD53 F3F6 F37E 7EC9 4775 1BE4 77F9 EEBF"            /* ÝSóöó~~ÉGu.äwùî¿ */
+	$"9ED1 F9DC 00F7 91DD 3D8B A94D D83C 797F"            /* žÑùÜ.÷‘Ý=‹©MØ<y. */
+	$"4243 1F04 D29C 94E6 FA35 A9C7 9C1C 0762"            /* BC..Òœ”æú5©Çœ..b */
+	$"AA92 7DF8 65D6 B16D 30C6 E3F2 22D5 8971"            /* ª’}øeÖ±m0Æãò"Õ‰q */
+	$"F890 651C 37E3 1F4A 29A4 6637 D7AE 7CB9"            /* ø�e.7ã.J)¤f7×®|¹ */
+	$"14C7 D06B 2595 45F8 89DC DBAF B284 6ADA"            /* .ÇÐk%•Eø‰ÜÛ¯²„jÚ */
+	$"E4DB 9D25 F76C CDA3 EB7E 1B5A 4264 8145"            /* äÛ�%÷lÍ£ë~.ZBd�E */
+	$"547E 6F18 076D A675 BA1A 1AB1 0BF1 AEB6"            /* T~o..m¦uº..±.ñ®¶ */
+	$"C8C2 AAE0 489F 4E11 7F77 336A 41A4 C050"            /* ȪàHŸN..w3jA¤ÀP */
+	$"D19E AE10 BD35 C5EC DA71 BDEF A017 C32D"            /* Ñž®.½5ÅìÚq½ï .Ã- */
+	$"CB15 0C8E 0B75 C179 FB84 FDF2 DD5D C21F"            /* Ë..Ž.uÁyû„ýòÝ]Â. */
+	$"56A5 397D C437 A82F 65F9 2E68 A785 0AF3"            /* V¥9}Ä7¨/eù.h§…Âó */
+	$"B9F0 7781 E6B8 ACFA 09DC B57D 6317 B29B"            /* ¹ðw�測úÆܵ}c.²› */
+	$"C754 09FC 3635 9854 0DA1 A3BE D3EE CF40"            /* ÇTÆü65˜T.¡£¾ÓîÏ@ */
+	$"4BE4 A4D9 07C4 D65E 3887 C8A7 CD3A 83F5"            /* Kä¤Ù.ÄÖ^8‡È§Í:ƒõ */
+	$"DFA8 10A6 BB6D B811 852D 3877 8782 1E66"            /* ߨ.¦»m¸.…-8w‡‚.f */
+	$"AF11 43B8 CA3A 6146 3657 AFE0 B314 36CB"            /* ¯.C¸Ê:aF6W¯à³.6Ë */
+	$"8E1C 272D ED4B 634C AABA 0207 6A1A E2E3"            /* Ž.'-íKcLªº..j.âã */
+	$"C500 C0A4 894A BAD8 C9A1 0AE7 AC8D 750C"            /* Å.À¤‰JºØÉ¡Âç¬�u. */
+	$"7D84 FBCC DB2E EE05 B04A 002B B383 46DE"            /* }„ûÌÛ.î.°J.+³ƒFÞ */
+	$"C18D 5BBD B442 9E88 BBB2 89CC 0EBA CF5A"            /* Á�[½´Bžˆ»²‰Ì.ºÏZ */
+	$"5616 DDAB ED7B 4C2E 1C82 0C9D 4820 C0E8"            /* V.Ý«í{L..‚.�H Àè */
+	$"1C4E 39A5 9041 9E33 A20A A73D 821A 238A"            /* .N9¥�Až3¢Â§=‚.#Š */
+	$"3B24 14B9 D9A6 95AA F5B0 13C1 8CFD 790F"            /* ;$.¹Ù¦•ªõ°.ÁŒýy. */
+	$"33CB 82D3 FE12 0F27 F309 7453 05E0 DF8F"            /* 3Ë‚Óþ..'óÆtS.àß� */
+	$"AAE8 F77A 31BA 0118 43E1 7AE7 69DC 5D12"            /* ªè÷z1º..CázçiÜ]. */
+	$"BD53 9858 EA6D D8D3 174C FE4C F487 3CCF"            /* ½S˜XêmØÓ.LþLô‡<Ï */
+	$"9098 7872 8FC3 EBAC 4C76 F503 6915 A1B3"            /* �˜xr�Ãë¬Lvõ.i.¡³ */
+	$"5FF8 81CD E13D D511 AAB8 5C7B 1376 C87F"            /* _ø�Íá=Õ.ª¸\{.vÈ. */
+	$"2DA1 557D 2053 3341 CC15 418C 0911 5378"            /* -¡U} S3AÌ.AŒÆ.Sx */
+	$"5FFE 324E 1412 2046 B049 3A77 69B7 417F"            /* _þ2N.. F°I:wi·A. */
+	$"AC17 B8B0 7FDA 6D19 59F0 DD68 8A88 E55A"            /* ¬.¸°.Úm.YðÝhŠˆåZ */
+	$"8098 0888 3714 713A 1D17 BB8D F01C 6005"            /* €˜.ˆ7.q:..»�ð.`. */
+	$"8F2E 3D20 2753 1BB4 9BE3 DFD1 709F 99EB"            /* �.= 'S.´›ãßÑpŸ™ë */
+	$"DFCC C1B1 717B 7FA3 52BB C12D E6B7 24D2"            /* ßÌÁ±q{.£R»Á-æ·$Ò */
+	$"F448 F23D C196 1BAA D61B F422 41B4 D620"            /* ôHò=Á–.ªÖ.ô"A´Ö  */
+	$"466D 45F3 06F6 F631 3E88 5CDE F7F6 BC6F"            /* FmEó.öö1>ˆ\Þ÷ö¼o */
+	$"789C D06C 02CC 2E71 B6B0 03D2 297B BFCD"            /* xœÐl.Ì.q¶°.Ò){¿Í */
+	$"8C21 67AD CEE0 DB53 5749 A676 690C 11E3"            /* Œ!g­ÎàÛSWI¦vi..ã */
+	$"5AD2 905C 78E1 4AB0 E60E C920 4ECC 7CB6"            /* ZÒ�\xáJ°æ.É NÌ|¶ */
+	$"A76F 70F1 BCFD AA1D F4D2 E43F E203 D0C8"            /* §opñ¼ýª.ôÒä?â.ÐÈ */
+	$"E11E 61AF F1A7 5762 600E 65BB D870 818A"            /* á.a¯ñ§Wb`.e»Øp�Š */
+	$"CDF0 DFC4 8C9C 1926 678B 2732 C52F 98FD"            /* ÍðßÄŒœ.&g‹'2Å/˜ý */
+	$"33B3 EE23 138D 5E5F C9C3 FEF9 6111 E3E6"            /* 3³î#.�^_ÉÃþùa.ãæ */
+	$"AF79 A8A5 2949 D590 B463 EDF3 F72A 18FD"            /* ¯y¨¥)IÕ�´cíó÷*.ý */
+	$"BB23 233B 7924 2DD1 A335 B949 467E A30C"            /* »##;y$-Ñ£5¹IF~£. */
+	$"3185 5FE5 DB63 6748 B22D AB3F 8A8C 0926"            /* 1…_åÛcgH²-«?ŠŒÆ& */
+	$"5450 E925 A69D 1185 7300 D694 EA1F 4DF2"            /* TPé%¦�.…s.Ö”ê.Mò */
+	$"2413 F4ED 6D64 5B74 BBD5 0E65 26EF A8CD"            /* $.ôímd[t»Õ.e&ï¨Í */
+	$"5806 0C60 404F 90A0 06B6 AFD1 785F 9646"            /* X..`@O� .¶¯Ñx_–F */
+	$"B1AD 2A45 5777 33FA 49DB 8D3D AC2A BAEA"            /* ±­*EWw3úIÛ�=¬*ºê */
+	$"4527 B4DF 481A 6AB9 4485 05E6 7040 1B93"            /* E'´ßH.j¹D….æp@.“ */
+	$"D6E0 3BBF A334 E13B 68EC 934B C393 B621"            /* Öà;¿£4á;hì“KÓ¶! */
+	$"CFC8 69BE A6AC 672C 235E F1FC 4480 DE83"            /* ÏÈi¾¦¬g,#^ñüD€Þƒ */
+	$"32D7 D269 F78C F22D 5B9F F4DF DDDD D6DE"            /* 2×Òi÷Œò-[ŸôßÝÝÖÞ */
+	$"4C65 4D61 C1F0 26BF E4C3 D7C9 A034 163D"            /* LeMaÁð&¿äÃ×É 4.= */
+	$"FBAE 0167 4DF0 EBEF AA8B B742 2832 1F67"            /* û®.gMðë懲·B(2.g */
+	$"8CC0 80D0 4A6B 9843 DE59 2F7B F944 9DA4"            /* ŒÀ€ÐJk˜CÞY/{ùD�¤ */
+	$"343D 9AD9 9E0B C7B5 0B7D 2CA1 F638 8A3B"            /* 4=šÙž.ǵ.},¡ö8Š; */
+	$"BB38 A39B 025A 9BA9 34AC ACF0 063D 5483"            /* »8£›.Z›©4¬¬ð.=Tƒ */
+	$"FE57 22E4 EB2C C699 AEF3 8EFB 1C8C A23A"            /* þW"äë,Æ™®óŽû.Œ¢: */
+	$"2C15 D2EF AC9A 91C9 993A 4CB0 2DDC 0A32"            /* ,.Ò﬚‘É™:L°-ÜÂ2 */
+	$"14B9 50D2 8579 8F9D 5AF2 88DB E726 1B39"            /* .¹PÒ…y��ZòˆÛç&.9 */
+	$"3E06 69F9 F300 09E4 D3E8 BB4C A704 10E0"            /* >.iùó.ÆäÓè»L§..à */
+	$"F1D0 53DE 91D8 6723 A047 11C7 57B3 C46C"            /* ñÐSÞ‘Øg# G.ÇW³Äl */
+	$"84A7 C2E1 C7CC 185C 9F21 7E2B 0F2E 64B1"            /* „§ÂáÇÌ.\Ÿ!~+..d± */
+	$"D734 4142 C65E A2FB 9ABE B62D 076B 2B65"            /* ×4ABÆ^¢ûš¾¶-.k+e */
+	$"9D6E 63F1 4825 79A9 3936 C7A7 531F EF6A"            /* �ncñH%y©96ǧS.ïj */
+	$"F859 3084 0421 88A9 A648 8641 ACEB 95DE"            /* øY0„.!ˆ©¦H†A¬ë•Þ */
+	$"2E94 E3C9 442C 13AF CF63 0404 C5C6 5CE2"            /* .”ãÉD,.¯Ïc..ÅÆ\â */
+	$"CE90 F9CC A1B6 5713 031E C239 174F CC40"            /* Î�ùÌ¡¶W...Â9.OÌ@ */
+	$"BCA4 EA9A EB6A 1D24 7962 F735 AF5A B937"            /* ¼¤êšëj.$yb÷5¯Z¹7 */
+	$"AC3B A12E 10A8 D332 6FE3 8ED1 6F01 B198"            /* ¬;¡..¨Ó2oãŽÑo.±˜ */
+	$"1543 A6A1 367E E226 5D76 B860 E0E1 8963"            /* .C¦¡6~â&]v¸`àá‰c */
+	$"AA7A F9EE DABF DB52 28F6 69F9 273F 8729"            /* ªzùîÚ¿ÛR(öiù'?‡) */
+	$"1D00 C7D2 20B9 3483 2125 88FC 94C0 54A6"            /* ..ÇÒ ¹4ƒ!%ˆü”ÀT¦ */
+	$"42FE F4E5 DA50 F495 F88B 5986 21CB 22E8"            /* BþôåÚPô•ø‹Y†!Ë"è */
+	$"EE5E 0622 2CB0 BCC8 0C6B 2B2B 23EB 0506"            /* î^.",°¼È.k++#ë.. */
+	$"A40F 09C2 726F 0C1F B8D4 55D3 2FE4 D629"            /* ¤.ÆÂro..¸ÔUÓ/äÖ) */
+	$"94C2 C913 BB28 4394 A9D2 8684 9E47 0445"            /* ”ÂÉ.»(C”©Ò†„žG.E */
+	$"B6CF 3E21 7072 B435 310C D7A3 063D 942B"            /* ¶Ï>!pr´51.×£.=”+ */
+	$"6AE9 350C 9442 C76E 1E6B A8C1 18A3 4309"            /* jé5.”BÇn.k¨Á.£CÆ */
+	$"6D55 E62F FC4E C4E9 6CF8 241D FAC5 2CC9"            /* mUæ/üNÄélø$.úÅ,É */
+	$"E020 6B12 31A6 9B11 710B 8850 FABE 5D63"            /* à k.1¦›.q.ˆPú¾]c */
+	$"068A 4018 2A90 93A5 9715 531E 8E7B AD7A"            /* .Š@.*�“¥—.S.Ž{­z */
+	$"2921 115F 19CE 2B6A F643 DE89 2E76 890B"            /* )!._.Î+jöCÞ‰.v‰. */
+	$"5A69 1668 6A02 061F 4832 24EB FC82 6B4D"            /* Zi.hj...H2$ëü‚kM */
+	$"9B08 D22F CBBF D348 D18F 8B0C C684 6851"            /* ›.Ò/Ë¿ÓHÑ�‹.Æ„hQ */
+	$"6CA9 E2FA 43CE 8A9A 7A58 FB28 0208 A6E0"            /* l©âúCΊšzXû(..¦à */
+	$"1ACF CE23 C624 5A38 C640 72C0 26F1 2818"            /* .ÏÎ#Æ$Z8Æ@rÀ&ñ(. */
+	$"07FD 74D9 F3D6 ED38 CA01 6485 CE8C 41A3"            /* .ýtÙóÖí8Ê.d…ÎŒA£ */
+	$"02C6 18E5 E4D2 2043 FA62 8768 3E14 7E80"            /* .Æ.åäÒ Cúb‡h>.~€ */
+	$"F2EB 67AD F743 75A0 2DDF 8724 1468 F88D"            /* òëg­÷Cu -߇$.hø� */
+	$"9BF3 11EB 4D4C B372 D210 9B58 BAA0 646A"            /* ›ó.ëML³rÒ.›Xº dj */
+	$"222F 5E5A C781 1D86 5652 1B57 07AF C8FA"            /* "/^ZÇ�.†VR.W.¯Èú */
+	$"9E77 DD7B FCB9 1D4C 8573 7B03 95AC D2DA"            /* žwÝ{ü¹.L…s{.•¬ÒÚ */
+	$"3314 4FFC CAF4 39B5 EAF4 9617 2CC5 9258"            /* 3.OüÊô9µêô–.,Å’X */
+	$"8F99 8C44 8D44 DA10 F1A5 51F7 5533 F13B"            /* �™ŒD�DÚ.ñ¥Q÷U3ñ; */
+	$"CDDC B6D6 BE71 3C92 2628 3B69 DC32 C623"            /* Íܶ־q<’&(;iÜ2Æ# */
+	$"F497 3959 034A 67C3 10A8 26E2 572F B4B1"            /* ô—9Y.JgÃ.¨&âW/´± */
+	$"6C5C 3E47 FB9F AA7D D9A4 7A08 4BBA E854"            /* l\>GûŸª}Ù¤z.KºèT */
+	$"4370 CE77 C69A 11EB 1BD8 B9AF 8225 BC8E"            /* CpÎwÆš.ë.ع¯‚%¼Ž */
+	$"A261 1CAA A74D B531 A0B9 D462 35DF 9C21"            /* ¢a.ª§Mµ1 ¹Ôb5ßœ! */
+	$"73F1 EAC1 A13C E0BC AF6C 8111 03DF AF1F"            /* sñêÁ¡<༯l�..߯. */
+	$"4748 1866 322C 535A 7C5E D2BC 4304 3541"            /* GH.f2,SZ|^Ò¼C.5A */
+	$"F14E 8412 296B 2C37 B642 9B4A 6417 EABB"            /* ñN„.)k,7¶B›Jd.ê» */
+	$"9034 1260 1B81 AFCC F903 4FAA A3F2 339E"            /* �4.`.�¯Ìù.Oª£ò3ž */
+	$"F332 B080 8C32 31D7 4DEA B260 F190 43F1"            /* ó2°€Œ21×Mê²`ñ�Cñ */
+	$"CCD5 A584 5C1C 343F FB87 CEA5 F246 8EAC"            /* ÌÕ¥„\.4?û‡Î¥òFŽ¬ */
+	$"C407 302C FEE7 3F59 F4B8 74ED ED62 D373"            /* Ä.0,þç?Yô¸tííbÓs */
+	$"A4BA B53A 0554 5403 9C2C E745 1087 5546"            /* ¤ºµ:.TT.œ,çE.‡UF */
+	$"2671 7BA6 3A33 703E BEF5 CD28 10A5 462B"            /* &q{¦:3p>¾õÍ(.¥F+ */
+	$"D902 9493 B2FC 176F 34BA 5A2D D2BC 0CBB"            /* Ù.”“²ü.o4ºZ-Ò¼.» */
+	$"5AB7 B854 08D3 CD79 3C71 1A89 E643 2FBC"            /* Z·¸T.ÓÍy<q.‰æC/¼ */
+	$"5A24 FEA6 EC06 1F23 79D9 3886 F6F4 7FB9"            /* Z$þ¦ì..#yÙ8†öô.¹ */
+	$"F892 1A20 DC66 1EB1 D6FD 1C48 52DE 4267"            /* ø’. Üf.±Öý.HRÞBg */
+	$"77E2 620B 2DC0 6828 575C F7CA 74BC FE73"            /* wâb.-Àh(W\÷Êt¼þs */
+	$"FABD C9ED 4E8F 71A7 8CCD 8D80 8BD2 8AA3"            /* ú½ÉíN�q§ŒÍ�€‹ÒŠ£ */
+	$"45C0 EF2A 387D 038E 8B00 BA81 12CD F93F"            /* EÀï*8}.Ž‹.º�.Íù? */
+	$"E9BE 9134 2928 439B 69CF 3DB1 5DFC 3DAF"            /* 龑4)(C›iÏ=±]ü=¯ */
+	$"86CA 34A7 4574 C91C 3F99 3EA9 B6E9 F3AF"            /* †Ê4§EtÉ.?™>©¶éó¯ */
+	$"6757 09A3 C49E A9AD 7201 BFD9 B3FA 52B0"            /* gWƣĞ©­r.¿Ù³úR° */
+	$"0000 0030 908B 4E52 45F1 3CBE F04A D2E4"            /* ...0�‹NREñ<¾ðJÒä */
+	$"83AF 6AEA 78E9 A438 C877 BAAD 65CB C703"            /* ƒ¯jêxé¤8Èwº­eËÇ. */
+	$"70B2 B9DD E19B 6B8C 0CE9 E402 0C9F 94F0"            /* p²¹Ýá›kŒ.éä..Ÿ”ð */
+	$"21BC 4E05 C03C 012A 66EF D0BC 2B72 292E"            /* !¼N.À<.*fïм+r). */
+	$"3592 1FDB 2A5C 8D2D C2FF 5C5B 6AB8 F695"            /* 5’.Û*\�-Âÿ\[j¸ö• */
+	$"F279 2C54 0529 555A 6ACA 22A4 C28B D693"            /* òy,T.)UZjÊ"¤Â‹Ö“ */
+	$"1FC9 4492 43F3 A323 F990 0A31 9356 30D3"            /* .ÉD’Có£#ù�Â1“V0Ó */
+	$"D6F0 0D36 0091 043F F239 9D1E 114E 3693"            /* Öð.6.‘.?ò9�..N6“ */
+	$"DF1C 23DF A27A 5B11 A44D 9199 07D1 AF2C"            /* ß.#ߢz[.¤M‘™.ѯ, */
+	$"63EB 21C5 D29F 8644 8C6A 129A 9CB9 ED72"            /* cë!ÅÒŸ†DŒj.šœ¹ír */
+	$"9286 3E0E B604 539A F262 B727 9284 01F9"            /* ’†>.¶.Sšòb·'’„.ù */
+	$"5AE1 DA5A 8A02 140E 5275 5433 BCDF 8038"            /* ZáÚZŠ...RuT3¼ß€8 */
+	$"0050 856F A747 857B 8376 255A 9185 28CC"            /* .P…o§G…{ƒv%Z‘…(Ì */
+	$"301A EC7C B5D3 89CC A695 1C87 8266 7CA8"            /* 0.ì|µÓ‰Ì¦•.‡‚f|¨ */
+	$"A203 7467 426E 9507 3DB3 1F90 F66B DC9F"            /* ¢.tgBn•.=³.�ökÜŸ */
+	$"ACF6 CDB2 4FCC 5AE4 2F94 F555 CB9E D8AC"            /* ¬öͲOÌZä/”õU˞ج */
+	$"950B FF38 0FE4 5056 E5E8 F371 9A98 5697"            /* •.ÿ8.äPVåèóqš˜V— */
+	$"6319 5197 B545 E594 AADD B2F2 CA27 260D"            /* c.Q—µE唪ݲòÊ'&. */
+	$"9BAF 0E45 0846 5573 F96B 7AC1 CC89 E86E"            /* ›¯.E.FUsùkzÁ̉èn */
+	$"61E6 72E2 05E3 9F8D 26D8 F178 BCC0 0B18"            /* aærâ.ãŸ�&Øñx¼À.. */
+	$"967C EA80 F7C1 45AE 8FAE A41C 41B6 438E"            /* –|ê€÷ÁE®�®¤.A¶CŽ */
+	$"46EF 1094 D558 01A8 BBAD 7380 DA27 2772"            /* Fï.”ÕX.¨»­s€Ú''r */
+	$"9D67 1330 A48C 62EA 0643 14EC 3E22 A055"            /* �g.0¤Œbê.C.ì>" U */
+	$"4E39 4E23 853D C587 99C8 CFD2 AEBB 9843"            /* N9N#…=Ň™ÈÏÒ®»˜C */
+	$"ECC9 0241 3253 8CF1 E068 1936 3BB2 56D3"            /* ìÉ.A2SŒñàh.6;²VÓ */
+	$"46F7 6A71 98D1 A300 1337 B3B0 7ABB 5752"            /* F÷jq˜Ñ£..7³°z»WR */
+	$"DB7A 7F85 5CFE 59DE A852 6987 DC11 C6B5"            /* Ûz.…\þYÞ¨Ri‡Ü.Ƶ */
+	$"E45B 7DD1 1F3A D566 C16D 3FBF 7BAD 7201"            /* ä[}Ñ.:ÕfÁm?¿{­r. */
+	$"B71C C74C A678 C2BB 10FD 534A 5E5D 79C0"            /* ·.ÇL¦x».ýSJ^]yÀ */
+	$"000C 2336 9113 B9C5 5D4A 1756 1C8B 0CD6"            /* ..#6‘.¹Å]J.V.‹.Ö */
+	$"AA8B DFF5 6CE3 CDAB B9B4 D85C 93FF 76AA"            /* ª‹ßõlãÍ«¹´Ø\“ÿvª */
+	$"15CF CF39 A864 B236 A172 03A1 65A1 9F76"            /* .ÏÏ9¨d²6¡r.¡e¡Ÿv */
+	$"FF55 00DE C7D0 C767 2787 9EB3 7CE5 C5BC"            /* ÿU.ÞÇÐÇg'‡ž³|åż */
+	$"8E08 6085 37A2 229C 73D3 2CC5 F6E8 AA1B"            /* Ž.`…7¢"œsÓ,Åöèª. */
+	$"AF13 15FD EB95 2609 6006 23C6 7910 8FFE"            /* ¯..ýë•&Æ`.#Æy.�þ */
+	$"8C5E 60A6 A558 E899 0A05 0F37 EC94 8E51"            /* Œ^`¦¥Xè™Â..7씎Q */
+	$"7838 9A11 8483 88B0 E284 B88D CDEA 9D56"            /* x8š.„ƒˆ°â„¸�Íê�V */
+	$"5C7E CFA2 8001 847E ABC9 360E 17EA 2D34"            /* \~Ï¢€.„~«É6..ê-4 */
+	$"8314 96C0 3810 D88F A54E 6E7C 6030 76FA"            /* ƒ.–À8.Ø�¥Nn|`0vú */
+	$"18A4 A549 37FC 11F6 E77F A883 C794 71AC"            /* .¤¥I7ü.öç.¨ƒÇ”q¬ */
+	$"55F1 7F88 664A FEE4 01C4 5576 1BE6 9C41"            /* Uñ.ˆfJþä.ÄUv.æœA */
+	$"D800 6121 2FC0 E681 A16E 21AF D5FE 0E80"            /* Ø.a!/Àæ�¡n!¯Õþ.€ */
+	$"A800 0000 3090 8C40 9184 82DA 7187 51C6"            /* ¨...0�Œ@‘„‚Úq‡QÆ */
+	$"44DC C420 FF13 98AD D100 2C07 132C 8D6C"            /* DÜÄ ÿ.˜­Ñ.,..,�l */
+	$"5D16 A089 D8F6 E77F A870 24F1 5461 DB69"            /* ]. ‰Øöç.¨p$ñTaÛi */
+	$"0F41 5029 7A41 B55F 0000 0184 846A 850C"            /* .AP)zAµ_...„„j…. */
+	$"241E E628 EDA6 4000 3090 6AA2 F6E7 7FA6"            /* $.æ(í¦@.0�j¢öç.¦ */
+	$"26C9 5EDE 9BB6 A1B1 51E6 8D5D F800 0061"            /* &É^Þ›¶¡±Qæ�]ø..a */
+	$"19B3 E47D 6F6F DB03 0885 4A53 27BA 38F5"            /* .³ä}ooÛ..…JS'º8õ */
+	$"35A0 1AB9 0A95 8FAE 85E3 F528 5A8B E645"            /* 5 .¹Â•�®…ãõ(Z‹æE */
+	$"8419 0456 6A38 D0DA 4948 8987 2323 1216"            /* „..Vj8ÐÚIH‰‡##.. */
+	$"A4F8 FD1A C374 D30C BF43 CD86 B984 F23C"            /* ¤øý.ÃtÓ.¿C͆¹„ò< */
+	$"5487 B47F E217 F15A D8CF A66A 96A9 EAF3"            /* T‡´.â.ñZØϦj–©êó */
+	$"F966 0205 D320 1556 5C3C 073A 8E66 1E3F"            /* ùf..Ó .V\<.:Žf.? */
+	$"A74E FF2C BC45 E9DB 3B25 FF7F 46AD 13A9"            /* §Nÿ,¼EéÛ;%ÿ.F­.© */
+	$"5C21 458B 6AD4 829C 1DFB 54BA E5F2 3C76"            /* \!E‹jÔ‚œ.ûTºåò<v */
+	$"3898 11F6 D710 7470 00FC 0742 CA59 9E40"            /* 8˜.ö×.tp.ü.BÊYž@ */
+	$"757C 5952 61FF 4D28 0991 1673 9B01 06B9"            /* u|YRaÿM(Æ‘.s›..¹ */
+	$"3999 E9B5 06CD B1DA CB08 FF19 DE70 8D10"            /* 9™éµ.ͱÚË.ÿ.Þp�. */
+	$"E725 848E D27D 2B0B 54F0 B60B 26AB CD92"            /* ç%„ŽÒ}+.Tð¶.&«Í’ */
+	$"E4F8 C007 FF68 6933 E2FF 31D5 435B FF7F"            /* äøÀ.ÿhi3âÿ1ÕC[ÿ. */
+	$"9A8E 9845 007F FEDA 4C63 9892 513A ABD9"            /* šŽ˜E..þÚLc˜’Q:«Ù */
+	$"A98A C012 5C99 31C0 D48F E334 671D A695"            /* ©ŠÀ.\™1ÀÔ�ã4g.¦• */
+	$"C7EF 3AAA FF37 D381 4F42 983F FC4D AE82"            /* Çï:ªÿ7Ó�OB˜?üM®‚ */
+	$"FF43 6555 9E7F 10A3 7B95 415D 41FF 20B3"            /* ÿCeUž..£{•A]Aÿ ³ */
+	$"8CB1 7302 0000 0000 584E AB14 398C A865"            /* Œ±s.....XN«.9Œ¨e */
+	$"5A7B 1650 52EB 8BCE 3E92 461D 071B 8F21"            /* Z{.PRë‹Î>’F...�! */
+	$"2CFF 4F5F FD2E 999E B77D A47D 61B4 2C01"            /* ,ÿO_ý.™ž·}¤}a´,. */
+	$"D397 493D CB48 AB27 EB4A 13A7 8C89 7F64"            /* Ó—I=ËH«'ëJ.§Œ‰.d */
+	$"6C08 FF21 9696 98C7 6248 1615 541F EC81"            /* l.ÿ!––˜ÇbH..T.ì� */
+	$"8E18 FAED 5257 3D01 2CBB 74C1 DA64 81A0"            /* Ž.úíRW=.,»tÁÚd�  */
+	$"39BF B272 4068 15E8 A44A 007C 732C D9DC"            /* 9¿²r@h.è¤J.|s,ÙÜ */
+	$"1CF8 4612 8611 A36D 67BC 6E6A EA14 9D87"            /* .øF.†.£mg¼njê.�‡ */
+	$"2962 C4B4 5442 9564 BFAA D0FB 991F 4288"            /* )bÄ´TB•d¿ªÐû™.Bˆ */
+	$"7CB2 2A41 333E 7827 5070 F3A6 67FF 7FFF"            /* |²*A3>x'Ppó¦gÿ.ÿ */
+	$"7601 CFFE E44B 4413 809B 3877 B59D BC19"            /* v.ÏþäKD.€›8wµ�¼. */
+	$"548F 0A5B C1E9 A8D7 6B5D 8EC8 8A1A BB3D"            /* T�Â[Áé¨×k]ŽÈŠ.»= */
+	$"3CD1 3139 57CF 9E94 00E9 CF6E 3830 3561"            /* <Ñ19WÏž”.éÏn805a */
+	$"8DE4 A59F FD1B 45CF C608 D0FD 5D48 485E"            /* �䥟ý.EÏÆ.Ðý]HH^ */
+	$"D5A3 30A5 F9EE 5D55 B9C2 E552 3A9F B087"            /* Õ£0¥ùî]U¹ÂåR:Ÿ°‡ */
+	$"FE87 5DBC 5E73 0F16 9221 2B0D F399 AB6F"            /* þ‡]¼^s..’!+.ó™«o */
+	$"9950 0000 0000 0000 0008 2444 88CE 3BBD"            /* ™P........$DˆÎ;½ */
+	$"CC78 4932 9C47 DEFA 74E7 91BF 9827 FF7B"            /* ÌxI2œGÞútç‘¿˜'ÿ{ */
+	$"77EB 9B1B 9F7F FDAB 6552 35A1 0C22 E9C6"            /* wë›.Ÿ.ý«eR5¡."éÆ */
+	$"42E3 FF7F FF7F E9FD A23B 2F7D 3ADD FC90"            /* Bãÿ.ÿ.éý¢;/}:Ýü� */
+	$"E4A1 F8B9 0560 0F86 D7FE 3F46 C953 2A03"            /* ä¡ø¹.`.†×þ?FÉS*. */
+	$"F1C7 F5AE D0C4 B743 EA67 B694 E47D 45CD"            /* ñÇõ®ÐÄ·Cêg¶”ä}EÍ */
+	$"6F92 178A E383 8B71 800E D9AF A55A F149"            /* o’.Šãƒ‹q€.Ù¯¥ZñI */
+	$"A838 5671 4C9A 8915 447A CDA9 C6B7 DD68"            /* ¨8VqLš‰.DzÍ©Æ·Ýh */
+	$"A5FB F404 CF63 A62E CC5E 89D3 FDB2 C841"            /* ¥ûô.Ïc¦.Ì^‰Óý²ÈA */
+	$"7A37 5B5D 5958 4B46 20B1 D389 5188 F9FE"            /* z7[]YXKF ±Ó‰Qˆùþ */
+	$"8FF1 D718 6C8C 3254 0000 0000 0000 0000"            /* �ñ×.lŒ2T........ */
+	$"0000 00A1 EBEC C33A 8622 D0FF 7FFF 7FFF"            /* ...¡ëìÃ:†"Ðÿ.ÿ.ÿ */
+	$"705D C7FE 49E7 01B7 A65D D5BC 2041 80B0"            /* p]ÇþIç.·¦]Õ¼ A€° */
+	$"89ED F68A A000 F438 EBD0 C908 0B67 414F"            /* ‰íöŠ .ô8ëÐÉ..gAO */
+	$"C8F1 4312 2EC8 05E6 CA19 184F FF5B BA24"            /* ÈñC..È.æÊ..Oÿ[º$ */
+	$"57E8 A6B4 FBD3 FF79 4D8E FF44 BC50 6938"            /* W覴ûÓÿyMŽÿD¼Pi8 */
+	$"137F FF7D 6251 8D1A 9B33 CF7E 0BCB EAD7"            /* ..ÿ}bQ�.›3Ï~.Ëê× */
+	$"2E0D EAE0 0003 0906 AA2B 66A8 C950 0000"            /* ..êà..Æ.ª+f¨ÉP.. */
+	$"0000 0000 0000 0000 0001 1E1F F600 1848"            /* ............ö..H */
+	$"4BF6 7A7C F92D 3E7A 437E 2254 51EB 4AF5"            /* Köz|ù->zC~"TQëJõ */
+	$"C6BF 442A 12CD 51FF 7FFE B8AE D0C4 B1D0"            /* Æ¿D*.ÍQÿ.þ¸®ÐıР*/
+	$"7CF7 019D A0ED 2CC4 01BC 1A94 212D 43EF"            /* |÷.� í,Ä.¼.”!-Cï */
+	$"1274 9B67 94D5 062D 5FCC E23C 4816 416B"            /* .t›g”Õ.-_Ìâ<H.Ak */
+	$"1540 59C2 1D35 213D A11C EE70 8D15 5394"            /* .@YÂ.5!=¡.îp�.S” */
+	$"53C6 29CF 4E19 F4CF 5B94 7FFF 7F8B 2813"            /* SÆ)ÏN.ôÏ[”.ÿ.‹(. */
+	$"3E95 DE81 30D0 3188 2A75 4F35 CB11 DDD5"            /* >•Þ�0Ð1ˆ*uO5Ë.ÝÕ */
+	$"7FFD A983 95A9 71E7 A7A3 7D3F F944 0A7E"            /* .ý©ƒ•©q秣}?ùDÂ~ */
+	$"24D9 966F 6B6A 0FD0 23AC 7000 0000 0000"            /* $Ù–okj.Ð#¬p..... */
+	$"0009 D4AF 9196 E5A4 B8AC 407F F9EE C709"            /* .ÆÔ¯‘–夸¬@.ùîÇÆ */
+	$"F927 08C3 CA6C 3A3A D90F E306 BCC4 6D6C"            /* ù'.ÃÊl::Ù.ã.¼Äml */
+	$"C7A9 F042 6F4C FDC9 60AB A087 6338 8F12"            /* Ç©ðBoLýÉ`« ‡c8�. */
+	$"4D29 D00C C575 C7B5 9FA4 E96C 1FA0 AAFB"            /* M)Ð.ÅuǵŸ¤él. ªû */
+	$"09E9 8DF9 1BE0 C62D 3C1D F55B DD77 A0FD"            /* Æé�ù.àÆ-<.õ[Ýw ý */
+	$"5C16 D959 BA08 0000 0000 0000 0145 AE01"            /* \.ÙYº........E®. */
+	$"712A 0E06 1212 70CD 94A8 0A2C 18F5 1E3B"            /* q*....pÍ”¨Â,.õ.; */
+	$"52FA C8F6 56F3 F7E4 69E6 54A0 3FF6 2487"            /* RúÈöVó÷äiæT ?ö$‡ */
+	$"C65F 0EFF 7F4F 8D07 C817 FE78 727D 3C75"            /* Æ_.ÿ.O�.È.þxr}<u */
+	$"E4C6 1003 FECF 3E7E 6252 08C0 4A83 50D7"            /* äÆ..þÏ>~bR.ÀJƒP× */
+	$"DADA 8602 5949 900F D2B6 D10D 2661 3014"            /* ÚÚ†.YI�.Ò¶Ñ.&a0. */
+	$"4541 17FF 2106 00DF AC82 0046 09BB A5AF"            /* EA.ÿ!..߬‚.FÆ»¥¯ */
+	$"CE51 0EBF F9AD 787A 907F 9F9A 628F E16B"            /* ÎQ.¿ù­xz�.Ÿšb�ák */
+	$"C015 137E 9C68 FCFA A817 FF7F DD6B FDB6"            /* À..~œhüú¨.ÿ.Ýký¶ */
+	$"3DA3 7C9D 3309 0B8A B551 C370 4401 CD7F"            /* =£|�3Æ.ŠµQÃpD.Í. */
+	$"7503 8425 E297 1B3F FF49 4FF8 3583 685A"            /* u.„%â—.?ÿIOø5ƒhZ */
+	$"B273 A7F7 CEBF F27E D78C 3E35 5332 152B"            /* ²s§÷οò~׌>5S2.+ */
+	$"033C C7FF 7B97 1AF0 F2A4 3C88 CC7B B96E"            /* .<Çÿ{—.ðò¤<ˆÌ{¹n */
+	$"65B3 533C F2F8 5E4B 6DBF 7D78 A316 310F"            /* e³S<òø^Km¿}x£.1. */
+	$"6B09 FD62 88D7 77FF 7447 524E C235 00A3"            /* kÆýbˆ×wÿtGRNÂ5.£ */
+	$"8F5A 4BEE D240 6154 C17C 2CC2 68F0 A959"            /* �ZKîÒ@aTÁ|,Âhð©Y */
+	$"2F12 9B74 7E8E 423F BB1D BC9A C75B C618"            /* /.›t~ŽB?».¼šÇ[Æ. */
+	$"19D1 C6CB 0A15 BD77 99BD 96D3 CC07 F5AC"            /* .ÑÆËÂ.½w™½–ÓÌ.õ¬ */
+	$"D2ED DE5E F19D 5CFC B2B0 5407 0386 32C6"            /* ÒíÞ^ñ�\ü²°T..†2Æ */
+	$"5F49 7BAD 3270 BF81 CF97 C934 7E23 7237"            /* _I{­2p¿�Ï—É4~#r7 */
+	$"727B 0FA2 6DB0 D717 8C73 B109 E089 AAC5"            /* r{.¢m°×.Œs±Æà‰ªÅ */
+	$"7D98 9061 2956 EA75 0135 E870 3430 4E9B"            /* }˜�a)Vêu.5èp40N› */
+	$"C76C D3D6 7EEB 83DB 9EEB C9A0 983D 1327"            /* ÇlÓÖ~ëƒÛžëÉ ˜=.' */
+	$"62D8 FD62 CA51 7135 80B0 ABFF 431B 9843"            /* bØýbÊQq5€°«ÿC.˜C */
+	$"68B4 A929 44E4 1F3E E3A1 22AA 5E87 579C"            /* h´©)Dä.>ã¡"ª^‡Wœ */
+	$"745B 9CA4 438C BFC2 9A1B 17BE BA75 06E4"            /* t[œ¤CŒ¿Âš..¾ºu.ä */
+	$"0108 698C E4F2 341C 24CC 7913 6237 ED48"            /* ..iŒäò4.$Ìy.b7íH */
+	$"E797 4D7A 0D5A D1EA ACDF F974 4F9F 9139"            /* ç—Mz.ZÑê¬ßùtOŸ‘9 */
+	$"6A87 3972 A1C8 0A2B 1E8B 6DB7 B811 4AB0"            /* j‡9r¡ÈÂ+.‹m·¸.J° */
+	$"EEE8 BB23 959C 239D 4165 DBED ACE4 F133"            /* îè»#•œ#�AeÛí¬äñ3 */
+	$"8276 40BB C447 29FE 3EB6 5BA4 A6D0 2441"            /* ‚v@»ÄG)þ>¶[¤¦Ð$A */
+	$"1431 8B2D 8BFD 96B7 C8C2 9F9B DFB9 2B06"            /* .1‹-‹ý–·ÈŸ›ß¹+. */
+	$"E191 00FF 7E4B 8281 D609 D163 B8CB AF9A"            /* á‘.ÿ~K‚�ÖÆÑc¸Ë¯š */
+	$"0995 7385 27FC 3C6A 5310 024D BAD1 8013"            /* Æ•s…'ü<jS..MºÑ€. */
+	$"8995 3DF4 FA80 FE12 8F5F 40E5 09E6 E7E8"            /* ‰•=ôú€þ.�_@åÆæçè */
+	$"C5E7 1309 3E97 E278 0228 1693 F565 F83E"            /* Åç.Æ>—âx.(.“õeø> */
+	$"4161 0037 E0AA D0CC 3AED 4E56 04E8 4456"            /* Aa.7àªÐÌ:íNV.èDV */
+	$"6E50 4626 C7E0 0790 014E 329B 0DDB D87D"            /* nPF&Çà.�.N2›.ÛØ} */
+	$"4532 6482 3F51 D651 3F62 D6EB 3BCA 75EB"            /* E2d‚?QÖQ?bÖë;Êuë */
+	$"5444 A42F 3CFB 4146 19FB 5376 876F 6BC1"            /* TD¤/<ûAF.ûSv‡okÁ */
+	$"B80B 7787 71DF 4CAA D70A 98BC 98E1 15A1"            /* ¸.w‡qßLª×˜¼˜á.¡ */
+	$"7996 F17F FF7A 91CF 350C FA04 5753 7ECB"            /* y–ñ.ÿz‘Ï5.ú.WS~Ë */
+	$"29F1 A4AD F335 59DB A580 EAA3 98AD FEB0"            /* )ñ¤­ó5YÛ¥€ê£˜­þ° */
+	$"275E BABE 6679 9AD4 B246 75F2 ECAA B042"            /* '^º¾fyšÔ²Fuò쪰B */
+	$"92C9 745E 1C58 58FF 2570 9228 4EAF 6F65"            /* ’Ét^.XXÿ%p’(N¯oe */
+	$"56F3 1D0C 85AA 9468 8000 0000 0101 3082"            /* Vó..…ª”h€.....0‚ */
+	$"08FD E30F FF75 70BF FCCA 2225 E5FC 3464"            /* .ýã.ÿup¿üÊ"%åü4d */
+	$"00CA 6C43 E833 80DE 2895 5F84 4B08 CEFA"            /* .ÊlCè3€Þ(•_„K.Îú */
+	$"AA94 EE33 24E7 CA20 A668 4717 FD5F F7F2"            /* ª”î3$çÊ ¦hG.ý_÷ò */
+	$"59E7 D6C6 6D0D 8E0F 1AC3 BBFA 3890 8ACB"            /* YçÖÆm.Ž..ûú8�ŠË */
+	$"9250 6D82 E892 D4B9 1F14 D987 9818 877A"            /* ’Pm‚è’Ô¹..Ù‡˜.‡z */
+	$"66F0 905A B088 D761 B529 F02A 6964 6C65"            /* fð�Z°ˆ×aµ)ð*idle */
+	$"8FB8 9A87 7771 9A12 C8A6 7F9C 9905 D643"            /* �¸š‡wqš.Ȧ.œ™.ÖC */
+	$"E554 91F5 0C26 4299 30C6 BC87 B38C 86FB"            /* åT‘õ.&B™0Ƽ‡³Œ†û */
+	$"ED50 C019 3822 52A8 97C6 1F49 176D FB8C"            /* íPÀ.8"R¨—Æ.I.mûŒ */
+	$"87B7 E37C 196E 3695 357A E2B8 FDE5 736E"            /* ‡·ã|.n6•5zâ¸ýåsn */
+	$"DF11 6026 3CD9 51CF 2A50 6F8A 53B0 0F16"            /* ß.`&<ÙQÏ*PoŠS°.. */
+	$"938B 745A F84D 571C A582 9723 90B4 49D7"            /* “‹tZøMW.¥‚—#�´I× */
+	$"B11D 7BA6 45C1 2AFA D519 A471 60A3 17A9"            /* ±.{¦EÁ*úÕ.¤q`£.© */
+	$"2C13 6E04 D58E 3F37 0115 E4AE F51C 1BA8"            /* ,.n.ÕŽ?7..ä®õ..¨ */
+	$"EF7F 4C9F 7B47 8C5A D1D6 CAC7 D416 D6D4"            /* ï.LŸ{GŒZÑÖÊÇÔ.ÖÔ */
+	$"7F05 9504 5685 0D6D E0E8 6809 9307 7864"            /* ..•.V….màèhÆ“.xd */
+	$"1A86 1BA6 A321 D08C 1B0C 0981 9395 6DC0"            /* .†.¦£!ÐŒ..Æ�“•mÀ */
+	$"C74F ECF7 CA1B FF4B 1896 BDBE 4876 8A4B"            /* ÇOì÷Ê.ÿK.–½¾HvŠK */
+	$"519F CC3C 7813 BE21 C40C B001 30F4 4FC7"            /* QŸÌ<x.¾!Ä.°.0ôOÇ */
+	$"B76C B9FA 26F6 38C8 116D B8F0 0B9D 818F"            /* ·l¹ú&ö8È.m¸ð.��� */
+	$"56F9 F934 AE60 71FD E583 8D07 A4A4 DE41"            /* Vùù4®`qýåƒ�.¤¤ÞA */
+	$"FB75 B83F 384B 11C9 CC5E CD9D FF4C 05A8"            /* ûu¸?8K.ÉÌ^Í�ÿL.¨ */
+	$"D59F 1E59 4797 FF7F DFD8 391C E8BA 72E2"            /* ÕŸ.YG—ÿ.ßØ9.èºrâ */
+	$"C1F8 9F5C 5317 01E3 EC2D 4120 97D2 BAEC"            /* ÁøŸ\S..ãì-A —Òºì */
+	$"DBB0 FF30 FC56 2E43 3716 1B7B A8CD 19AE"            /* Û°ÿ0üV.C7..{¨Í.® */
+	$"7FFF 7FF4 468B FF45 749B 3C67 EE31 1651"            /* .ÿ.ôF‹ÿEt›<gî1.Q */
+	$"17B2 B21C A982 A185 E8A3 03BC 2DCB C09A"            /* .²².©‚¡…è£.¼-ËÀš */
+	$"8522 64CF BB21 6955 068D F002 871B 05F3"            /* …"dÏ»!iU.�ð.‡..ó */
+	$"9F44 7384 D624 E1FA A24D 67C7 BC5E F7BF"            /* ŸDs„Ö$áú¢MgǼ^÷¿ */
+	$"59BC DC3C BE4B 1456 0C6F F2C1 0841 038D"            /* Y¼Ü<¾K.V.oòÁ.A.� */
+	$"723C 14FA 4F19 0AD4 1F88 0A1B FF14 3D93"            /* r<.úO.ÂÔ.ˆÂ.ÿ.=“ */
+	$"27AA 6E0B 4AA7 6A11 E06D 5D82 C930 1B53"            /* 'ªn.J§j.àm]‚É0.S */
+	$"0227 A9AA 253A 41E6 31D5 8B87 DC08 819B"            /* .'©ª%:Aæ1Õ‹‡Ü.�› */
+	$"E5EE EA0F 6AA0 0000 0006 9BC0 594E 0004"            /* åîê.j ....›ÀYN.. */
+	$"D326 312C 0364 8835 C4D7 5040 3724 3CD9"            /* Ó&1,.dˆ5Ä×P@7$<Ù */
+	$"B889 2E14 12BC F0AD 9D2E 326B 1654 5952"            /* ¸‰...¼ð­�.2k.TYR */
+	$"2B5F 1A9D 5403 C9C5 A731 1B3C 3443 783C"            /* +_.�T.Éŧ1.<4Cx< */
+	$"A459 248B BBC7 DEDC 74AD E2A1 D647 5047"            /* ¤Y$‹»ÇÞÜt­â¡ÖGPG */
+	$"AD17 15AF FF5C 88C4 025F 4361 3F83 BFC9"            /* ­..¯ÿ\ˆÄ._Ca?ƒ¿É */
+	$"FF6D 7E58 128D 33D7 7076 E73A 9CF6 76D8"            /* ÿm~X.�3×pvç:œövØ */
+	$"A0FF 2C44 2029 0B59 B427 3BDC 915B 87CF"            /*  ÿ,D ).Y´';Ü‘[‡Ï */
+	$"75D6 EC52 7793 6DFA A4E2 9E2D 7D25 FBC2"            /* uÖìRw“mú¤âž-}%û */
+	$"2028 DE78 D868 BEC5 E9D2 BFFA 8B12 9265"            /*  (ÞxØh¾ÅéÒ¿ú‹.’e */
+	$"B01D 92F7 F71E 8782 F1CD 4E98 B46E 6DA5"            /* °.’÷÷.‡‚ñÍN˜´nm¥ */
+	$"8825 F851 1CE9 9F21 D8E2 86EB BAF4 126F"            /* ˆ%øQ.éŸ!Øâ†ëºô.o */
+	$"9CB3 0144 009A 6F38 0919 9C1F D0CE D23C"            /* œ³.D.šo8Æ.œ.ÐÎÒ< */
+	$"C9DD 9273 D8F6 6733 6E5A 2E7A 635C 8723"            /* ÉÝ’sØög3nZ.zc\‡# */
+	$"6E04 1283 1A43 02CA 74E4 8000 0309 08DB"            /* n..ƒ.C.Êtä€..Æ.Û */
+	$"EF05 DC00 D116 0D58 1A69 2055 1BA0 D8DE"            /* ï.Ü.Ñ..X.i U. ØÞ */
+	$"34B6 EA40 CC06 C673 559A 75F2 9B58 C474"            /* 4¶ê@Ì.ÆsUšuò›XÄt */
+	$"DD4C AB9A 9E6D 653B FCDF 4F33 3707 105E"            /* ÝL«šžme;üßO37..^ */
+	$"DBCE D327 45FB C663 E1AF 375B B106 B0B8"            /* ÛÎÓ'EûÆcá¯7[±.°¸ */
+	$"26EE AE4B 538A CF74 588E 928B 58C7 2D93"            /* &î®KSŠÏtXŽ’‹XÇ-“ */
+	$"371E BC81 0ED0 9F2C 1A18 8DD7 7E65 4FBF"            /* 7.¼�.П,..�×~eO¿ */
+	$"511B 63A1 8F26 2A08 A4D3 2BF3 96E6 FC32"            /* Q.c¡�&*.¤Ó+ó–æü2 */
+	$"D457 8287 D843 6D19 2458 0EA4 AC8F 0512"            /* ÔW‚‡ØCm.$X.¤¬�.. */
+	$"831D D4CA 9BFF 5A6E 951A 5897 451F 750C"            /* ƒ.ÔÊ›ÿZn•.X—E.u. */
+	$"CAD4 89C1 94A7 4BFA 4030 4828 1E37 C049"            /* ÊÔ‰Á”§Kú@0H(.7ÀI */
+	$"34C4 54B1 1054 2645 14E5 6DFF 7FFF 7328"            /* 4ÄT±.T&E.åmÿ.ÿs( */
+	$"F1A4 AAA2 4FD2 507D 86D5 FF7F FA43 F49A"            /* ñ¤ª¢OÒP}†Õÿ.úCôš */
+	$"5049 0839 5964 8186 EE46 1867 158E 9E2C"            /* PI.9Yd�†îF.g.Žž, */
+	$"D618 8FF5 D416 6838 6187 9CF7 21BC DE1F"            /* Ö.�õÔ.h8a‡œ÷!¼Þ. */
+	$"F84F F4E9 ACDB ECD8 6CA6 6725 85B4 4049"            /* øOôé¬ÛìØl¦g%…´@I */
+	$"AA9E 4935 7E1F 54E7 B0D5 A026 B073 899B"            /* ªžI5~.Tç°Õ &°s‰› */
+	$"51C4 8C2E 483C B3BF 38A0 4BCF 2042 EE90"            /* QÄŒ.H<³¿8 KÏ Bî� */
+	$"4E1B 8C94 420F 99A7 9EA1 7D96 12A3 8C8D"            /* N.Œ”B.™§ž¡}–.£Œ� */
+	$"819B C97D C518 51CB 0D8A A7A1 7159 EB10"            /* �›É}Å.QË.Š§¡qYë. */
+	$"4A27 5CD0 0ED7 2688 5F74 CE10 DF6A 5B4F"            /* J'\Ð.×&ˆ_tÎ.ßj[O */
+	$"E370 A282 105D 2F43 6E74 6B07 05EC 880E"            /* ãp¢‚.]/Cntk..ìˆ. */
+	$"15AF 5118 9D27 327D 2552 9996 020B 2D9A"            /* .¯Q.�'2}%R™–..-š */
+	$"9AFC 6849 6068 6491 42FA 889C 7949 285A"            /* šühI`hd‘BúˆœyI(Z */
+	$"7FFE 5B6D DAF2 7FFF 772D E08E B9E4 65A3"            /* .þ[mÚò.ÿw-àŽ¹äe£ */
+	$"B49A DDC8 FF52 8DA3 B318 F84F F4E9 99ED"            /* ´šÝÈÿR�£³.øOôé™í */
+	$"48C4 CA7E BE77 2634 6A22 1FAD 4752 8D9B"            /* HÄÊ~¾w&4j".­GR�› */
+	$"B935 0449 1A27 9EAB B000 C242 3BB7 72B7"            /* ¹5.I.'ž«°.ÂB;·r· */
+	$"3ACC B41F 0AC9 CFFD 58DA D99F 498A 21CF"            /* :Ì´.ÂÉÏýXÚÙŸIŠ!Ï */
+	$"50B8 A155 9BB3 B3DA 13FE 251F 14F2 3431"            /* P¸¡U›³³Ú.þ%..ò41 */
+	$"6DBF 2774 3EFC 55BB 9CB3 40A4 CA00 A112"            /* m¿'t>üU»œ³@¤Ê.¡. */
+	$"3E83 51D4 9D13 DE0D F86D 3384 AAE7 9074"            /* >ƒQÔ�.Þ.øm3„ªç�t */
+	$"F7CF 4509 F99A 70B2 2E74 43C3 1363 021F"            /* ÷ÏEÆùšp².tCÃ.c.. */
+	$"6482 E471 22FA 6265 2DF9 C302 43F8 9053"            /* d‚äq"úbe-ùÃ.Cø�S */
+	$"0AE9 15A2 28D4 FD7C 05AF C7B8 26D5 7C0F"            /* Âé.¢(Ôý|.¯Ç¸&Õ|. */
+	$"22E0 4735 518D BE4B 4E83 1EF8 3FFA BA23"            /* "àG5Q�¾KNƒ.ø?úº# */
+	$"3AE8 F76B 1D92 2038 64C1 EA73 30FC CE72"            /* :è÷k.’ 8dÁês0üÎr */
+	$"0CA5 6697 157E 55C4 8BAE E703 6FF5 F743"            /* .¥f—.~UÄ‹®ç.oõ÷C */
+	$"B456 C85F 3BFF 2629 95B7 02F4 F580 A49B"            /* ´VÈ_;ÿ&)•·.ôõ€¤› */
+	$"1587 2316 D131 66C1 C6DB F3DC C409 D801"            /* .‡#.Ñ1fÁÆÛóÜÄÆØ. */
+	$"E2DA 30B6 73FD 99EF AA26 25D7 DF07 FBEB"            /* âÚ0¶sý™ïª&%×ß.ûë */
+	$"094E 2E8E BD11 3C49 81BA E6BE 7666 ECBE"            /* ÆN.Ž½.<I�ºæ¾vfì¾ */
+	$"59D2 4ACC B4CE 3FAD 2173 25CB E42F 37B8"            /* YÒJÌ´Î?­!s%Ëä/7¸ */
+	$"F3CC 79EF 695C 10F4 0381 2D14 1B0F D632"            /* óÌyïi\.ô.�-...Ö2 */
+	$"8A1E 9C29 F617 6A4B 204E A147 C08D 1AA5"            /* Š.œ)ö.jK N¡GÀ�.¥ */
+	$"7418 DED9 DE83 A555 A75B AB00 C650 247F"            /* t.ÞÙÞƒ¥U§[«.ÆP$. */
+	$"0222 5558 731B 54DB 14F6 3A0E 1FAD A8D8"            /* ."UXs.TÛ.ö:..­¨Ø */
+	$"F327 DC8F AF3F 630B 3BA9 7933 8D30 458C"            /* ó'Ü�¯?c.;©y3�0EŒ */
+	$"4C2F 6E3A 0A64 DDC5 926A 71CB 2347 EE4D"            /* L/n:ÂdÝÅ’jqË#GîM */
+	$"647B D94D BE24 7F62 6A14 EBE2 696F 8735"            /* d{ÙM¾$.bj.ëâio‡5 */
+	$"A96F E268 6912 A4A9 3254 0293 CB09 0DC0"            /* ©oâhi.¤©2T.“ËÆ.À */
+	$"206B EB7B F6B9 0643 5E74 4F2C 555A AE2D"            /*  kë{ö¹.C^tO,UZ®- */
+	$"B16B 7FA3 8ADE 7EAC 764F 9A20 BC94 05F1"            /* ±k.£ŠÞ~¬vOš ¼”.ñ */
+	$"9AAC 0118 36B8 6B30 D696 6E84 EEC2 5342"            /* š¬..6¸k0Ö–n„îÂSB */
+	$"03A8 EFD3 CB37 D50D F676 35DB AD6C 280A"            /* .¨ïÓË7Õ.öv5Û­l( */
+	$"DB04 D23A 0922 A2E3 5F45 EBD1 5C49 F6AA"            /* Û.Ò:Æ"¢ã_EëÑ\Iöª */
+	$"4579 1BA2 D94E D3F0 7A7E C24E 79B0 5D24"            /* Ey.¢ÙNÓðz~ÂNy°]$ */
+	$"B98E 23E7 4C4F 54D9 A3CE 389F 63F6 2426"            /* ¹Ž#çLOTÙ£Î8Ÿcö$& */
+	$"7087 D921 86D6 709F 768D 5684 BB90 47B7"            /* p‡Ù!†ÖpŸv�V„»�G· */
+	$"AC32 98D7 E247 3668 E954 8105 EE44 AF58"            /* ¬2˜×âG6héT�.îD¯X */
+	$"13FF 573A 9F89 06C9 FB77 277E 08C9 09E9"            /* .ÿW:Ÿ‰.Éûw'~.ÉÆé */
+	$"B180 F96E C5AB 1E5D 3029 E229 CE1B B2AD"            /* ±€ùnÅ«.]0)â)Î.²­ */
+	$"BA11 DD98 0D9C 4C45 66DD 8553 3BA2 6F5B"            /* º.ݘ.œLEfÝ…S;¢o[ */
+	$"699B CEF3 48A7 6C31 63E6 E189 9C68 B9EC"            /* i›ÎóH§l1cæቜh¹ì */
+	$"A663 411F EBCB 41AB 8F7E 7EAD 87DA 5BF3"            /* ¦cA.ëËA«�~~­‡Ú[ó */
+	$"AAC9 975B AC1F 712B F7ED DEBD 04C3 B85A"            /* ªÉ—[¬.q+÷íÞ½.øZ */
+	$"470D D74A B91D 0180 7BAB 4088 5671 6268"            /* G.×J¹..€{«@ˆVqbh */
+	$"5B4A 54FE C179 1600 7677 830B 0E81 EEB4"            /* [JTþÁy..vwƒ..�î´ */
+	$"056E 79FF 8251 AB20 A6BC 15A5 E71F 7D4A"            /* .nyÿ‚Q« ¦¼.¥ç.}J */
+	$"2F6E 951A DE36 7A81 C704 9A4A F239 E1DC"            /* /n•.Þ6z�Ç.šJò9áÜ */
+	$"FF6C DE49 B4C8 F6C1 F764 8D19 4686 DFC2"            /* ÿlÞI´ÈöÁ÷d�.F†ß */
+	$"5C72 4A52 9784 F974 DCA4 A177 21DA 9869"            /* \rJR—„ùtܤ¡w!Ú˜i */
+	$"80A4 5BC6 FD54 A56B C7B1 4705 3A32 C896"            /* €¤[ÆýT¥kDZG.:2È– */
+	$"4539 25E5 90CC F228 B7F9 ADA5 CC2C 59CA"            /* E9%å�Ìò(·ù­¥Ì,YÊ */
+	$"D14D 4B86 9CC0 D367 7EF5 DB6D C2E1 06DB"            /* ÑMK†œÀÓg~õÛmÂá.Û */
+	$"58BC 0D97 DCFE 3CB1 EA45 C36F 1B60 83C9"            /* X¼.—Üþ<±êEÃo.`ƒÉ */
+	$"663F B883 83BA A69F 2653 0747 18C7 6D20"            /* f?¸ƒƒº¦Ÿ&S.G.Çm  */
+	$"F2C7 6E01 47DA AB9D 2D83 D5CE 1E9C 779A"            /* òÇn.GÚ«�-ƒÕÎ.œwš */
+	$"5FAE 6015 63DE 317A EFCA 7142 F3F8 A7E1"            /* _®`.cÞ1zïÊqBóø§á */
+	$"F739 60AB DF24 41BF EB6C AF15 7223 E56C"            /* ÷9`«ß$A¿ël¯.r#ål */
+	$"8D61 D9D1 C61F 8F8E 8435 6452 C45A 917B"            /* �aÙÑÆ.�Ž„5dRÄZ‘{ */
+	$"0856 B8BA 14E2 0A77 ABA0 E605 2E39 63EA"            /* .V¸º.âÂw« æ..9cê */
+	$"E7F5 4804 6535 7672 575F 37EA 9E69 1A1C"            /* çõH.e5vrW_7êži.. */
+	$"E380 CB7D C109 2D50 73EF 4119 54BE CBFE"            /* ã€Ë}ÁÆ-PsïA.T¾Ëþ */
+	$"4552 74A1 3E73 C457 1436 9DFF 3C25 8231"            /* ERt¡>sÄW.6�ÿ<%‚1 */
+	$"2C25 ACE4 F084 E842 60E8 355D 22BE 6FEE"            /* ,%¬äð„èB`è5]"¾oî */
+	$"93F9 DDE6 DAED 4E44 545A FE4E 5EA4 0487"            /* “ùÝæÚíNDTZþN^¤.‡ */
+	$"36F1 52AF 8683 2DE8 F30B 72DE E807 2068"            /* 6ñR¯†ƒ-èó.rÞè. h */
+	$"742B 7262 BF7E 516C D41F CA56 9DE1 E3B8"            /* t+rb¿~QlÔ.ÊV�á㸠*/
+	$"8D72 2993 C073 516D A343 DDE0 984D F06A"            /* �r)“ÀsQm£CÝà˜Mðj */
+	$"CD83 D22D C161 30D7 2E9A FED4 4E85 5D2E"            /* ̓Ò-Áa0×.šþÔN…]. */
+	$"CF72 2181 7F23 BC37 FF83 C30D 43E0 DBC7"            /* Ïr!�.#¼7ÿƒÃ.CàÛÇ */
+	$"A277 B4D9 4E68 1FB1 AF7B 6D8B 8F43 2A1B"            /* ¢w´ÙNh.±¯{m‹�C*. */
+	$"9FE4 6CCC E826 C4AA 96C9 98A9 4D3B 981F"            /* ŸälÌè&Ī–ɘ©M;˜. */
+	$"8786 8633 89B0 2B42 4266 BC27 0098 D2B3"            /* ‡††3‰°+BBf¼'.˜Ò³ */
+	$"E8E4 0D2C 6E14 D34D 3613 4568 4A1E 8E5E"            /* èä.,n.ÓM6.EhJ.Ž^ */
+	$"E328 D89C 85D3 D8C2 C15B 3533 989F F015"            /* ã(Øœ…ÓØÂÁ[53˜Ÿð. */
+	$"1B49 871D 031B 2DBE D49E 880D A557 0694"            /* .I‡...-¾Ôžˆ.¥W.” */
+	$"60C3 47A1 CD2A 961B F73C 94A3 6B17 4268"            /* `ÃG¡Í*–.÷<”£k.Bh */
+	$"F766 81DC 33BC 8C1D 5571 D2D7 FB1C 9378"            /* ÷f�Ü3¼Œ.UqÒ×û.“x */
+	$"01B7 BDCC 5DD0 9171 5FA1 50DA 7EBF 1586"            /* .·½Ì]Бq_¡PÚ~¿.† */
+	$"FA82 9E6F CBE4 0977 9C9C 2373 E789 5A3E"            /* ú‚žoËäÆwœœ#sç‰Z> */
+	$"8743 EB0E ED13 7955 DB28 2874 8065 2078"            /* ‡Cë.í.yUÛ((t€e x */
+	$"97A7 6C13 2283 729A CCF9 E449 A627 7652"            /* —§l."ƒršÌùäI¦'vR */
+	$"E821 2F1F 574E 6887 1830 6E01 5A8D 02FB"            /* è!/.WNh‡.0n.Z�.û */
+	$"DB61 8EEF 4E08 B607 26FA 2B4C FF47 38FE"            /* ÛaŽïN.¶.&ú+LÿG8þ */
+	$"9B7C A3E4 DB46 F898 CFE9 8F3C 8717 2975"            /* ›|£äÛFø˜Ïé�<‡.)u */
+	$"9BA2 582E 86D1 D882 C127 EFD7 E71A B5DD"            /* ›¢X.†ÑØ‚Á'ï×ç.µÝ */
+	$"7772 6391 2722 2884 AA0F 9C72 9A96 F4F8"            /* wrc‘'"(„ª.œrš–ôø */
+	$"BFF8 869A FD00 3B41 A8C7 DCD0 2834 270C"            /* ¿ø†šý.;A¨ÇÜÐ(4'. */
+	$"B93C 8702 5B16 8A32 0289 979B 0A35 3A7B"            /* ¹<‡.[.Š2.‰—›Â5:{ */
+	$"5870 6189 03C2 DD00 FAB2 B137 AB93 3EF5"            /* Xpa‰.ÂÝ.ú²±7«“>õ */
+	$"24E3 1FE1 A206 963E 1344 FE12 285A 5C52"            /* $ã.á¢.–>.Dþ.(Z\R */
+	$"692E D315 6C73 2CBE 7ADC 81BC EBC8 13EA"            /* i.Ó.ls,¾zÜ�¼ëÈ.ê */
+	$"796B 6056 E9E7 D971 6E09 7086 252C 6A19"            /* yk`VéçÙqnÆp†%,j. */
+	$"7351 153D F4C4 FE01 6235 917F B203 171A"            /* sQ.=ôÄþ.b5‘.²... */
+	$"1822 B42B 9226 D163 5572 7E7E C508 BEBA"            /* ."´+’&ÑcUr~~Å.¾º */
+	$"D0D2 1C24 8D62 565D C183 F78D 4726 0541"            /* ÐÒ.$�bV]Áƒ÷�G&.A */
+	$"F829 10C7 1B21 E59C C4E5 7688 6268 FABC"            /* ø).Ç.!åœÄåvˆbhú¼ */
+	$"C0B9 6C02 8820 3F44 54A7 8C83 F14F 61B8"            /* À¹l.ˆ ?DT§ŒƒñOa¸ */
+	$"707C AB32 9D59 F01E D18A 37FC 40F9 5C59"            /* p|«2�Yð.ÑŠ7ü@ù\Y */
+	$"EEA8 E442 FDC8 CA73 970F 6EE0 1348 AC8E"            /* î¨äBýÈÊs—.nà.H¬Ž */
+	$"9D65 4DA9 2820 AEDB A7F3 C1B4 8E3F 8780"            /* �eM©( ®Û§óÁ´Ž?‡€ */
+	$"8DA9 F7D9 F116 DD30 778E 4FB6 49D3 AFE8"            /* �©÷Ùñ.Ý0wŽO¶IÓ¯è */
+	$"74B1 EB63 92B8 4210 3B22 3613 6784 41A2"            /* t±ëc’¸B.;"6.g„A¢ */
+	$"5953 1EFF 16A9 1769 9852 73D0 B6C2 3523"            /* YS.ÿ.©.i˜RsжÂ5# */
+	$"854B 1247 531D 47C5 7AFC 1B6B F0C4 2E2F"            /* …K.GS.GÅzü.kðÄ./ */
+	$"6C60 82C9 9C4D 2FAD 25A5 BEC6 8590 7388"            /* l`‚ÉœM/­%¥¾Æ…�sˆ */
+	$"5D15 9A65 E013 D48B 7D9C 34B2 A617 75A8"            /* ].šeà.Ô‹}œ4²¦.u¨ */
+	$"8E8E 2D91 1AEC 26D5 8B9C D03C A02A A829"            /* ŽŽ-‘.ì&Õ‹œÐ< *¨) */
+	$"738D 9A4E 8F31 82A9 39B7 7CFE D412 810E"            /* s�šN�1‚©9·|þÔ.�. */
+	$"1372 6D79 8D49 BAC1 9FFB 5D52 56AD 488F"            /* .rmy�IºÁŸû]RV­H� */
+	$"4E1D A232 7348 1FE2 483F AB9F A23C 0997"            /* N.¢2sH.âH?«Ÿ¢<Æ— */
+	$"678D 1AB7 7F66 8927 7DED 2A66 E03B 05C9"            /* g�.·.f‰'}í*fà;.É */
+	$"0420 66A2 E0AE E1B9 259E 64C9 FF0E A7C7"            /* . f¢à®á¹%ždÉÿ.§Ç */
+	$"5E9D 69F4 DD50 394C 344E 9DA9 6BCA 3D9F"            /* ^�iôÝP9L4N�©kÊ=Ÿ */
+	$"8FA9 C156 3248 2310 8AB9 6131 B94F FF36"            /* �©ÁV2H#.Š¹a1¹Oÿ6 */
+	$"DF00 9E80 5713 E9AD 3B07 879E C876 E063"            /* ß.ž€W.é­;.‡žÈvàc */
+	$"38D8 2776 3081 5810 1760 927C D93C EE88"            /* 8Ø'v0�X..`’|Ù<îˆ */
+	$"518B 755A EBF1 B276 C65B 98DD 1421 8AA1"            /* Q‹uZëñ²vÆ[˜Ý.!Š¡ */
+	$"27D2 A8B2 5E3E B7B7 8F73 CDCB 9896 D80F"            /* 'Ò¨²^>··�s͢–Ø. */
+	$"1D50 2E28 4F54 26A9 E68F 822C 3031 0A5B"            /* .P.(OT&©æ�‚,01Â[ */
+	$"213A 8ED8 B1B8 C32C F5EF 6784 3641 A888"            /* !:ŽØ±¸Ã,õïg„6A¨ˆ */
+	$"1AF9 941B E9B2 42C0 D9BE AAD7 2727 9E13"            /* .ù”.é²BÀÙ¾ª×''ž. */
+	$"284F A530 1F62 679B 7860 E677 9E24 3663"            /* (O¥0.bg›x`æwž$6c */
+	$"E7D1 E4B5 D37B C274 9ECB CFA2 CC95 8A75"            /* çÑäµÓ{ÂtžËϢ̕Šu */
+	$"0C3A FB7D F074 1433 5EC7 1FC4 330E F221"            /* .:û}ðt.3^Ç.Ä3.ò! */
+	$"AE39 4A04 097F 4B21 27CD C193 39CB 3AB2"            /* ®9J.Æ.K!'ÍÁ“9Ë:² */
+	$"0B6E D8E0 54EA 0F75 15F9 D75D 0D82 624D"            /* .nØàTê.u.ù×].‚bM */
+	$"7D19 8E11 1AD0 764F CEA8 F0FE 2913 6841"            /* }.Ž..ÐvOΨðþ).hA */
+	$"89B8 CA62 C997 34B9 5950 4842 4F13 1ACD"            /* ‰¸ÊbÉ—4¹YPHBO..Í */
+	$"39AD 30CA 4ED2 A17D 0B09 206B 9426 EF50"            /* 9­0ÊNÒ¡}.Æ k”&ïP */
+	$"63C6 386E 74BB BDE0 420F 6154 5260 E1A2"            /* cÆ8nt»½àB.aTR`ᢠ*/
+	$"8546 3192 76D1 1F38 268E 7AC6 049F 321D"            /* …F1’vÑ.8&ŽzÆ.Ÿ2. */
+	$"CB51 35C7 067C 961B DA2F 4BCB E065 A8DB"            /* ËQ5Ç.|–.Ú/KËàe¨Û */
+	$"16C9 1F05 ABAF 93FF 333A F049 3161 6838"            /* .É..«¯“ÿ3:ðI1ah8 */
+	$"6E1A FEF2 564C 3F48 3800 BC9C F009 AF34"            /* n.þòVL?H8.¼œðƯ4 */
+	$"2241 15D4 764F 4764 CEDF 6D7D 2E9C 8141"            /* "A.ÔvOGdÎßm}.œ�A */
+	$"1E00 E109 D827 DDAA A47C 2854 9229 8998"            /* ..áÆØ'ݪ¤|(T’)‰˜ */
+	$"9175 1FFB 496B 36C7 3695 3631 390B 06E6"            /* ‘u.ûIk6Ç6•619..æ */
+	$"EB0D 3BA7 F1BE A2FF 6D3A 9FB6 FCFD ADEF"            /* ë.;§ñ¾¢ÿm:Ÿ¶üý­ï */
+	$"EDBA 3FDB 632F EDB1 BF6D BE7E DB9F 97ED"            /* íº?Ûc/í±¿m¾~ÛŸ—í */
+	$"45FD AB93 F6E8 7FED A7F7 DAC3 FC34 6F43"            /* Eý«“öè.í§÷ÚÃü4oC */
+	$"E1DB 5507 762F DB7E 5F51 DDF5 1DFE DD07"            /* áÛU.v/Û~_QÝõ.þÝ. */
+	$"E1FD A67F B4E6 7EDB 8BF6 AE3F B6BC D3E4"            /* áý¦.´æ~Û‹ö®?¶¼Óä */
+	$"D00B 0F87 A0FF 2AC3 3F6D 84F8 7475 99F2"            /* Ð..‡ ÿ*Ã?m„øtu™ò */
+	$"F382 BE95 100F 8FEE C1C8 D086 E345 E973"            /* 󂾕..�îÁÈІãEés */
+	$"0FE4 06B6 7813 7115 B8D0 D91B C698 D10D"            /* .ä.¶x.q.¸ÐÙ.ƘÑ. */
+	$"A370 844F 9330 E047 0201 F880 D146 6522"            /* £p„O“0àG..ø€ÑFe" */
+	$"8E52 12DE 3D1A 9231 5315 682E 4706 8685"            /* ŽR.Þ=.’1S.h.G.†… */
+	$"DA39 C538 9828 7ED0 714F 3E27 532A 3840"            /* Ú9Å8˜(~ÐqO>'S*8@ */
+	$"C912 3E46 8205 3243 7835 7284 12D6 CCF5"            /* É.>F‚.2Cx5r„.ÖÌõ */
+	$"36AF 0975 8A27 4F44 3857 B5A3 160D 1391"            /* 6¯ÆuŠ'OD8Wµ£...‘ */
+	$"8005 2453 86CB 51B3 E493 EA9C 707F 7047"            /* €.$S†ËQ³ä“êœp.pG */
+	$"1DA8 1386 91D1 6105 7D84 1563 FC52 D5D3"            /* .¨.†‘Ña.}„.cüRÕÓ */
+	$"EDA7 D4A0 4AC1 BB4E 49D6 62F4 CA92 CE8E"            /* í§Ô JÁ»NIÖbôÊ’ÎŽ */
+	$"8DE0 84DC 418D ACE2 71AD 9206 3C98 3281"            /* �à„ÜA�¬âq­’.<˜2� */
+	$"104E A1F2 8982 6ED6 223E B67B BE6A C51F"            /* .N¡ò‰‚nÖ">¶{¾jÅ. */
+	$"4BF8 6C35 B6A4 5EC8 87BB 4834 7CF3 16AC"            /* Køl5¶¤^ȇ»H4|ó.¬ */
+	$"2453 B3DA 3503 94D6 2E70 2B6F 975E 21DB"            /* $S³Ú5.”Ö.p+o—^!Û */
+	$"F409 0368 9A2E DFB2 7A4B 9A6F 4165 1173"            /* ôÆ.hš.ß²zKšoAe.s */
+	$"A53E 329A 7925 FB80 9664 2C09 A9E5 715C"            /* ¥>2šy%û€–d,Æ©åq\ */
+	$"E42F 8E14 EC68 05A8 D565 53C2 9C98 86A2"            /* ä/Ž.ìh.¨ÕeSÂœ˜†¢ */
+	$"2C2D 6443 A1D0 A619 2320 6CD3 FE48 8006"            /* ,-dC¡Ð¦.# lÓþH€. */
+	$"FC0F 3690 DF76 1FD8 2E16 0705 D91F EEBE"            /* ü.6�ßv.Ø....Ù.î¾ */
+	$"E961 32B9 E252 4F0E EE4A 6F73 AEBB 014A"            /* éa2¹âRO.îJos®».J */
+	$"8F45 1551 9123 7C3A 13F8 1B57 EB6A 0AFB"            /* �E.Q‘#|:.ø.WëjÂû */
+	$"9AE9 65F5 9FDE 5F1C 7C23 84F1 6DCD CC52"            /* šéeõŸÞ_.|#„ñmÍÌR */
+	$"97DD 03E6 C571 0C23 F06B 9F21 2E2C 79D5"            /* —Ý.æÅq.#ðkŸ!.,yÕ */
+	$"1827 1436 E6FB C5FB BA11 617B 9B32 3DCD"            /* .'.6æûÅûº.a{›2=Í */
+	$"B0AD AA8F 53D0 2F20 849C D667 9436 A677"            /* °­ª�SÐ/ „œÖg”6¦w */
+	$"38C9 1B5A 26E2 B4D4 29BB 2D9E 56D4 652D"            /* 8É.Z&â´Ô)»-žVÔe- */
+	$"9A12 FC7E FBD5 0075 3EC9 64FE D0CE 06A2"            /* š.ü~ûÕ.u>ÉdþÐÎ.¢ */
+	$"B63F 8731 DB8A 6917 26EA CCFC C1E6 10AA"            /* ¶?‡1ÛŠi.&êÌüÁæ.ª */
+	$"704E 20EA 7518 0416 6BBE 2867 9470 9FE6"            /* pN êu...k¾(g”pŸæ */
+	$"3D2A D178 6CD1 0B7D E518 4682 FC48 EA03"            /* =*ÑxlÑ.}å.F‚üHê. */
+	$"EFA0 ADEE B643 CDFD 796D C309 E13B 9DD3"            /* ï ­î¶CÍýymÃÆá;�Ó */
+	$"82CC 1237 8D6B 9CB9 0438 AF1A 6190 136E"            /* ‚Ì.7�kœ¹.8¯.a�.n */
+	$"A170 6109 4BA8 FD0B 4C10 DE61 71A9 A5FF"            /* ¡paÆK¨ý.L.Þaq©¥ÿ */
+	$"5AD1 3895 15D0 912A BC62 5344 A7FD 7B9B"            /* ZÑ8•.Б*¼bSD§ý{› */
+	$"0360 8C71 DD04 20C7 4685 E6B7 7941 7BD7"            /* .`ŒqÝ. ÇF…æ·yA{× */
+	$"DBBB 3F61 742B D692 AD3D B778 6442 3DD1"            /* Û»?at+Ö’­=·xdB=Ñ */
+	$"A97E 1312 9AF4 05C1 7B33 9FE2 B3F5 D16C"            /* ©~..šô.Á{3Ÿâ³õÑl */
+	$"875D 7109 13EC BB96 0664 DF60 1958 8DE5"            /* ‡]qÆ.ì»–.dß`.X�å */
+	$"5B3F 3E75 9D21 0415 CE9C 3172 87C7 FF05"            /* [?>u�!..Îœ1r‡Çÿ. */
+	$"F787 4F14 E63B 4DCE 247D B3A3 475C 5336"            /* ÷‡O.æ;MÎ$}³£G\S6 */
+	$"C794 AF23 6415 68C6 B893 1B16 8C81 3F43"            /* Ç”¯#d.hƸ“..Œ�?C */
+	$"C455 6EB8 8D5A 6919 4C3A D980 BFB1 3699"            /* ÄUn¸�Zi.L:Ù€¿±6™ */
+	$"C790 C7D1 7B05 12AA 803A 172B DEF2 00CC"            /* Ç�ÇÑ{..ª€:.+Þò.Ì */
+	$"FF38 62C8 1815 1D3A F60D 2B9B 87A0 05C5"            /* ÿ8bÈ...:ö.+›‡ .Å */
+	$"3587 0181 8754 06D7 2CFC 78B8 0C65 D5BC"            /* 5‡.�‡T.×,üx¸.eÕ¼ */
+	$"2903 C07C 0631 A0B9 E94E 192F DE4B 4924"            /* ).À|.1 ¹éN./ÞKI$ */
+	$"A4F0 BB9A 49C5 B751 38EB 7289 9806 FC5C"            /* ¤ð»šIÅ·Q8ër‰˜.ü\ */
+	$"D822 ED93 CA92 14B6 5056 017F 7826 CDE1"            /* Ø"í“Ê’.¶PV..x&Íá */
+	$"8401 9F6C A7F7 4AD5 E86F FDC3 05AF 6AE3"            /* „.Ÿl§÷JÕèoýÃ.¯jã */
+	$"5EED 07E3 E5ED 7EE7 FB97 0B99 E191 605B"            /* ^í.ãåí~çû—.™á‘`[ */
+	$"955A 6A3C 33C6 2BB8 9562 0E38 09C1 1ED9"            /* •Zj<3Æ+¸•b.8ÆÁ.Ù */
+	$"8914 73AF E9AA 7B2F 214E 7EEA 98E8 B976"            /* ‰.s¯éª{/!N~ê˜è¹v */
+	$"E058 E0B5 6DB4 5B1C F212 2C8E 0AE5 7100"            /* àXàµm´[.ò.,ŽÂåq. */
+	$"BC1E 84CD 0598 7CF9 EA4E 1E96 2B4A DE9E"            /* ¼.„Í.˜|ùêN.–+JÞž */
+	$"6CE9 E79B 0336 9059 E109 DF83 A2AE 9E74"            /* léç›.6�YáÆ߃¢®žt */
+	$"5BB1 0236 590C 66CD 0658 ECE5 50A2 EDDD"            /* [±.6Y.fÍ.XìåP¢íÝ */
+	$"D7BB DAF7 548B 7F21 2A40 7821 FDA2 62B6"            /* ×»Ú÷T‹.!*@x!ý¢b¶ */
+	$"C862 B0B2 96CF 27D5 EC9D F5C8 42D8 F42A"            /* Èb°²–Ï'Õì�õÈBØô* */
+	$"5962 F21A D191 6744 1AE2 64B4 6744 A1B2"            /* Ybò.Ñ‘gD.âd´gD¡² */
+	$"7625 FF0D F0CF A1F8 3273 C4B8 FCCE C2BC"            /* v%ÿ.ðÏ¡ø2sĸüμ */
+	$"EDD5 F0C6 765F 2446 5EF5 2195 04EE C94B"            /* íÕðÆv_$F^õ!•.îÉK */
+	$"C9C2 4F82 0D0F 6034 3560 64A8 C372 4E17"            /* ÉÂO‚..`45`d¨ÃrN. */
+	$"D4F6 B2DC 2162 A6DC 9B35 5F36 628E EA58"            /* Ôö²Ü!b¦Ü›5_6bŽêX */
+	$"B2EF D0B8 79FF 3F60 39DC 34C9 8DD1 C7DA"            /* ²ïиyÿ?`9Ü4É�ÑÇÚ */
+	$"BFFD 9220 B977 42CD 1F4E 00C7 1A7B F29F"            /* ¿ý’ ¹wBÍ.N.Ç.{òŸ */
+	$"9738 8D5E 3E5F BA1F D4BD 0592 2006 1216"            /* —8�^>_º.Ô½.’ ... */
+	$"D478 DE72 171A A49D 9C4A 0691 CD59 6FB3"            /* ÔxÞr..¤�œJ.‘ÍYo³ */
+	$"F3C5 B3CD DCC8 5794 133C 85B3 176A 0C6A"            /* óųÍÜÈW”.<…³.j.j */
+	$"323E C74F 7CE3 4042 38AB E9CA 5700 E39B"            /* 2>ÇO|ã@B8«éÊW.ã› */
+	$"26D3 62B7 59F8 966D A789 35AA C72D 9943"            /* &Ób·Yø–m§‰5ªÇ-™C */
+	$"C884 2E53 30B3 D351 EFCC 6BF8 9889 8AB6"            /* È„.S0³ÓQïÌkø˜‰Š¶ */
+	$"E284 F5A4 64BD F89F 98A4 8082 6292 48EB"            /* â„õ¤d½øŸ˜¤€‚b’Hë */
+	$"2039 4A80 D5D7 BEFC 2DC1 69A9 F484 9B4E"            /*  9J€Õ×¾ü-Ái©ô„›N */
+	$"94C9 6E87 31A6 6D4E 23DB 77A9 37D5 CEE9"            /* ”Én‡1¦mN#Ûw©7ÕÎé */
+	$"10B5 22DB 58B2 3DFB 973A E321 F02A 2985"            /* .µ"ÛX²=û—:ã!ð*)… */
+	$"AE7E F964 9A23 4B8D 90FD 75F4 9944 3CEB"            /* ®~ùdš#K��ýuô™D<ë */
+	$"C5C5 B0BA DA1C AA0A B59A EFCA 903A 972B"            /* ÅÅ°ºÚ.ªÂµšïÊ�:—+ */
+	$"10E9 2A66 2BAB 3E63 8312 E494 A82C AEE8"            /* .é*f+«>cƒ.䔨,®è */
+	$"DE3B 902F 4DE5 A934 7FA5 59D8 B355 75C7"            /* Þ;�/Må©4.¥YسUuÇ */
+	$"DC51 6208 6D60 DE89 F04A F698 FC35 5341"            /* ÜQb.m`Þ‰ðJö˜ü5SA */
+	$"A8C7 894B 5E8F 0638 0F21 36AB 23FF 37BF"            /* ¨Ç‰K^�.8.!6«#ÿ7¿ */
+	$"CA6E C0CE 1C93 9BB1 FEA7 49E8 9BA5 7F32"            /* ÊnÀÎ.“›±þ§I蛥.2 */
+	$"4C9D C8BA 821C 1E07 F277 BE63 241C D5F6"            /* L�Ⱥ‚...òw¾c$.Õö */
+	$"07CB 7A98 E51E B0FC B312 223C 21BF 5DEE"            /* .Ëz˜å.°ü³."<!¿]î */
+	$"0229 A0EE 8B90 5918 5910 F6A6 EEB6 503D"            /* .) î‹�Y.Y.ö¦î¶P= */
+	$"8E76 A3B6 E583 FEFF 5B3D F804 F6EE 956E"            /* Žv£¶åƒþÿ[=ø.öî•n */
+	$"FEE7 D95F 9D05 AE0B 4926 52B4 23C3 D17A"            /* þçÙ_�.®.I&R´#ÃÑz */
+	$"FC0F CC41 1264 0956 8CA2 6A30 C0D0 275F"            /* ü.ÌA.dÆVŒ¢j0ÀÐ'_ */
+	$"0CE8 C646 CC49 EF38 CC94 8B6C 1737 9636"            /* .èÆFÌIï8Ì”‹l.7–6 */
+	$"4EA7 0FE7 217B F3F1 A10D 7E49 242E 6F19"            /* N§.ç!{óñ¡.~I$.o. */
+	$"A8CF 369A 44DE 6C99 A9D4 24DA 6909 62C3"            /* ¨Ï6šDÞl™©Ô$ÚiÆbà */
+	$"0C4C D4CD D80E 72E6 FF6B A90E 7080 977B"            /* .LÔÍØ.ræÿk©.p€—{ */
+	$"4BEB 6A2A 72BB 0574 45FB 1E12 6408 C966"            /* Këj*r».tEû..d.Éf */
+	$"A632 9AC7 E67D 82C9 3FED 1E27 C1FA C47A"            /* ¦2šÇæ}‚É?í.'ÁúÄz */
+	$"AFCF 5719 3BCA 3975 BE3A 550B 6DC9 91CC"            /* ¯ÏW.;Ê9u¾:U.mÉ‘Ì */
+	$"F28E 751C 1B20 E7BB 58FF 0D92 2BF7 DE26"            /* òŽu.. ç»Xÿ.’+÷Þ& */
+	$"DFE3 B230 78F7 C64E ADF8 7741 F45A E3BC"            /* ßã²0x÷ÆN­øwAôZã¼ */
+	$"5185 1323 1C74 3288 F720 5DB7 B5C9 1EFD"            /* Q….#.t2ˆ÷ ]·µÉ.ý */
+	$"C844 7159 7047 A9BA 6CA1 403E CE2E 3522"            /* ÈDqYpG©ºl¡@>Î.5" */
+	$"1088 A628 490C 5F8D 64C4 7E17 CBD3 290D"            /* .ˆ¦(I._�dÄ~.ËÓ). */
+	$"91B1 B073 AD4A BF5B A1E9 6306 3E9A F87E"            /* ‘±°s­J¿[¡éc.>šø~ */
+	$"2DEC 7390 2CF5 3305 93C2 15DA 7FFF 7FC6"            /* -ìs�,õ3.“Â.Ú.ÿ.Æ */
+	$"0578 C93E BF93 5B69 25D4 E0F9 5726 0D7E"            /* .xÉ>¿“[i%ÔàùW&.~ */
+	$"9C06 C76B 1BF5 3206 F26C 4F57 6A13 7488"            /* œ.Çk.õ2.òlOWj.tˆ */
+	$"07F4 1787 316E 19B5 2CB4 D7B8 23EE BF15"            /* .ô.‡1n.µ,´×¸#î¿. */
+	$"84F7 C141 CE7E 358F F83B 081D 2680 C5CB"            /* „÷ÁAÎ~5�ø;..&€ÅË */
+	$"2002 0FFB D329 10E3 1880 E0F6 29FF 14F6"            /*  ..ûÓ).ã.€àö)ÿ.ö */
+	$"1447 24FF 4BDD 371B 00F3 0334 6FE5 D217"            /* .G$ÿKÝ7..ó.4oåÒ. */
+	$"8E7D 3CCB EC04 D019 0583 0792 D4F4 59E5"            /* Ž}<Ëì.Ð..ƒ.’ÔôYå */
+	$"0914 52FB CE7A 2EFD B899 ED16 38FB E1D4"            /* Æ.RûÎz.ý¸™í.8ûáÔ */
+	$"3312 BAAE 3EF3 45B7 2A77 62F3 4787 8900"            /* 3.º®>óE·*wbóG‡‰. */
+	$"050D 5A64 92D3 64E7 7950 4234 FCC0 0EC6"            /* ..Zd’ÓdçyPB4üÀ.Æ */
+	$"004C 8652 616B B5FF 87F6 72D0 400B 9574"            /* .L†Rakµÿ‡örÐ@.•t */
+	$"7ADD 2EE6 F979 EE70 393F 5E65 09EC 561B"            /* zÝ.æùyîp9?^eÆìV. */
+	$"2FF4 F6FA 9226 2AA7 C2D2 4517 2258 15C7"            /* /ôöú’&*§ÂÒE."X.Ç */
+	$"D27E DE80 0000 0009 BB69 0154 3C66 FD24"            /* Ò~Þ€...Æ»i.T<fý$ */
+	$"D6C1 DFFC 41CF 26FD 27E3 9482 7299 C4A3"            /* ÖÁßüAÏ&ý'㔂r™Ä£ */
+	$"A4B0 4F99 5ED7 6507 C196 C060 D7BD 7BA6"            /* ¤°O™^×e.Á–À`×½{¦ */
+	$"A0A2 C1E7 0ECE 98C4 36F0 B006 0526 5FC4"            /*  ¢Áç.ΘÄ6ð°..&_Ä */
+	$"CDEF A25D CE59 7B6F 507F C409 957F 43E6"            /* Íï¢]ÎY{oP.ÄÆ•.Cæ */
+	$"20AB C4BE 33C2 E794 46B7 5341 D8C9 5487"            /*  «Ä¾3Âç”F·SAØÉT‡ */
+	$"3000 A3E6 41BE 7D2A B553 6A8D C345 2E1E"            /* 0.£æA¾}*µSj�ÃE.. */
+	$"BF55 F536 52DD 101F D6C9 BB65 B7E4 0CFC"            /* ¿Uõ6RÝ..ÖÉ»e·ä.ü */
+	$"03D7 F641 F641 7A4F 8EE2 BA7A 352C ED91"            /* .×öAöAzOŽâºz5,í‘ */
+	$"9057 F893 C46F 62F7 A791 A8DE 8A25 BB17"            /* �Wø“Äob÷§‘¨ÞŠ%». */
+	$"F164 F2ED 43E5 A2E2 17E9 C95D DE1C 45F4"            /* ñdòíCå¢â.éÉ]Þ.Eô */
+	$"3019 8090 809D D124 EE5C B48E 6C92 2A74"            /* 0.€�€�Ñ$î\´Žl’*t */
+	$"ACA0 4F0A 1777 70CF EBEC 112A 9035 16AB"            /* ¬ OÂ.wpÏëì.*�5.« */
+	$"B36D 13D6 9F72 69CD E213 F146 6733 BAA3"            /* ³m.ÖŸriÍâ.ñFg3º£ */
+	$"0080 0000 0000 0000 0001 0151 0AD3 43F0"            /* .€.........QÂÓCð */
+	$"14A4 0000 61F0 20D9 9F3A 47FC 60A2 4780"            /* .¤..að ÙŸ:Gü`¢G€ */
+	$"F2D0 2A57 2C4C D349 5B9A 1BE3 0D39 80AD"            /* òÐ*W,LÓI[š.ã.9€­ */
+	$"72C4 873D 5028 F09E F0F5 700F B776 4B38"            /* rć=P(ðžðõp.·vK8 */
+	$"4FC6 7D26 AE5D 219E DDCE 4AA3 9AA9 FE19"            /* OÆ}&®]!žÝÎJ£š©þ. */
+	$"EC25 FEF0 0626 D259 8ECF 0364 6192 A000"            /* ì%þð.&ÒYŽÏ.da’ . */
+	$"0000 0000 0000 0000 0184 84B4 4FF0 1848"            /* .........„„´Oð.H */
+	$"4BC2 3700 0000 0000 0000 00B5 DA5E 3FF1"            /* KÂ7........µÚ^?ñ */
+	$"C9FC 9186 4A80 0000 0000 0000 0000 0000"            /* Éü‘†J€.......... */
+	$"0510 0FC3 251B 71C0 D918 64A8 0000 0000"            /* ...Ã%.qÀÙ.d¨.... */
+	$"0000 0000 0000 07E1 1EE1 F164 E11A 319D"            /* .......á.áñdá.1� */
+	$"3806 659F 8C35 7012 B17E 6096 52F0 8E96"            /* 8.eŸŒ5p.±~`–RðŽ– */
+	$"1438 1EBF 363A 49C9 51BD 3517 4ADA 7060"            /* .8.¿6:IÉQ½5.JÚp` */
+	$"0849 8F8B FCEC FD48 0000 54DF 4C0B E043"            /* .I�‹üìýH..TßL.àC */
+	$"F3B6 1CEB 518A F2B1 5A9C 9500 0000 0000"            /* ó¶.ëQŠò±Zœ•..... */
+	$"0196 C058 0636 AF4B 041F 37EC DE6F 4B4E"            /* .–ÀX.6¯K..7ìÞoKN */
+	$"291D A2A6 3CB8 9BAC 4B0C 5017 9031 0EF1"            /* ).¢¦<¸›¬K.P.�1.ñ */
+	$"3CF7 F63B 73A1 B4A6 9EA7 0513 C571 8EA8"            /* <÷ö;s¡´¦ž§..ÅqŽ¨ */
+	$"5D0A 28FC DCB6 D27A 0000 0000 0159 D076"            /* ]Â(üܶÒz.....YÐv */
+	$"3D1E 84A9 1C76 876E 7B6B 8519 1F9F 01C6"            /* =.„©.v‡n{k…..Ÿ.Æ */
+	$"1A11 B2A2 4841 4D47 5463 5D18 2AFE 54F5"            /* ..²¢HAMGTc].*þTõ */
+	$"591E 5FF1 39C7 C0CD 0D20 F366 59DE FE22"            /* Y._ñ9ÇÀÍ. ófYÞþ" */
+	$"B12C 4608 009D F105 49C8 16B5 417A 6079"            /* ±,F..�ñ.IÈ.µAz`y */
+	$"40B0 7E7A C4B3 83B8 485D 42B1 4000 0000"            /* @°~zijƒ¸H]B±@... */
+	$"0E9F 0340 5469 49BB 5767 B4BE 47AF 19B3"            /* .Ÿ.@TiI»Wg´¾G¯.³ */
+	$"4E69 B99F 25DF C3C0 1B9C 5455 41D2 F508"            /* Ni¹Ÿ%ßÃÀ.œTUAÒõ. */
+	$"9900 1F13 B43E C345 C4B3 C066 8A27 C3D3"            /* ™...´>ÃEijÀfŠ'ÃÓ */
+	$"7A8A 6368 2F2C 3F2F 5D43 59ED 5E40 9E4F"            /* zŠch/,?/]CYí^@žO */
+	$"59BB 6A03 B7F8 083A 021D F8F0 79AF 43B0"            /* Y»j.·ø.:..øðy¯C° */
+	$"2270 F775 B8D8 FB59 371A 8B22 9F0B 55FA"            /* "p÷u¸ØûY7.‹"Ÿ.Uú */
+	$"C9B1 5565 0914 AA67 2D9E 81B2 60FC 1333"            /* ɱUeÆ.ªg-ž�²`ü.3 */
+	$"318F 21E9 97E4 1400 F69E F709 7AE3 82A5"            /* 1�!é—ä..öž÷Æzã‚¥ */
+	$"C9DE 7D16 1DF8 EDF8 FC5E DB3E FC2A F822"            /* ÉÞ}..øíøü^Û>ü*ø" */
+	$"886E F247 9BC1 250E 905C 4AF7 4B22 3595"            /* ˆnòG›Á%.�\J÷K"5• */
+	$"0835 2567 EEC1 C4C8 B70D D782 6A22 C9DA"            /* .5%gîÁÄÈ·.ׂj"ÉÚ */
+	$"ADA3 0370 EED9 E428 E163 963A E6F0 5D4A"            /* ­£.pîÙä(ác–:æð]J */
+	$"F42A D11F B46D 7FBC 2D87 4274 4756 896E"            /* ô*Ñ.´m.¼-‡BtGV‰n */
+	$"C489 80C0 62F6 88A8 184A 79BE 3068 A9AF"            /* ĉ€Àböˆ¨.Jy¾0h©¯ */
+	$"D703 390B 1A76 3136 B799 726A AAA8 C23D"            /* ×.9..v16·™rjª¨Â= */
+	$"EEB0 E0F1 49E1 A6B7 204F 7BF3 6E44 F25E"            /* î°àñIᦷ O{ónDò^ */
+	$"7E0A 5125 CA89 B477 15CD 83CC CD21 C6BE"            /* ~ÂQ%ʉ´w.̓ÌÍ!ƾ */
+	$"F20B 99F3 C30C 5113 2E0A FF7E 1034 1BFF"            /* ò.™óÃ.Q..Âÿ~.4.ÿ */
+	$"0378 72CF B0EE D132 2A2D 14A9 E37F 6B10"            /* .xrÏ°îÑ2*-.©ã.k. */
+	$"B5CE 0500 0000 0000 0000 0160 A7E3 A715"            /* µÎ.........`§ã§. */
+	$"0C13 DE44 025B 9720 0000 0000 0000 0001"            /* ..ÞD.[— ........ */
+	$"E0F5 5A21 77FB C1F6 EAF0 244A EE78 B6FA"            /* àõZ!wûÁöêð$Jîx¶ú */
+	$"1769 3D98 AA28 2EB6 9826 A16B D6B8 BA89"            /* .i=˜ª(.¶˜&¡kÖ¸º‰ */
+	$"26C6 25C9 9E66 FD9C 6D2D FCDA FCB9 6AB2"            /* &Æ%Éžfýœm-üÚü¹j² */
+	$"B42A 7008 5069 CB61 D530 B47A FCFF 7F95"            /* ´*p.PiËaÕ0´züÿ.• */
+	$"FA58 2D11 111A 53BF FB17 59E1 63E7 0FAD"            /* úX-...S¿û.Yácç.­ */
+	$"B016 A862 3107 8DF0 7112 DD6A B6E3 2477"            /* °.¨b1.�ðq.Ýj¶ã$w */
+	$"3162 94F0 6826 75B0 D0B8 4C13 21C7 E4BC"            /* 1b”ðh&u°Ð¸L.!Çä¼ */
+	$"FB86 7A83 DF1C A4D9 C3B4 E3DE C334 1633"            /* û†zƒß.¤ÙôãÞÃ4.3 */
+	$"DC27 76B9 7ADF 50CA F95E C7C9 D5EB 402C"            /* Ü'v¹zßPÊù^ÇÉÕë@, */
+	$"276F A0B0 D88B CF4A 0FD2 380A E3E7 2BA5"            /* 'o °Ø‹ÏJ.Ò8Âãç+¥ */
+	$"DD24 A247 B631 75B1 6D3A 4C60 9BAB E4C5"            /* Ý$¢G¶1u±m:L`›«äÅ */
+	$"BBCB 2972 36B9 AC74 5FF5 B5DB 231B 95F3"            /* »Ë)r6¹¬t_õµÛ#.•ó */
+	$"7CFF 8E5F 86E9 1906 B3DF 75C7 0364 6192"            /* |ÿŽ_†é..³ßuÇ.da’ */
+	$"A000 0000 0000 0000 0000 003B B1A0 0000"            /*  ..........;± .. */
+	$"0000 0000 0000 0000 0000 0016 D51B CEEA"            /* ............Õ.Îê */
+	$"0406 C003 4E50 C0B8 8DB2 F37C FF8E 5F86"            /* ..À.NPÀ¸�²ó|ÿŽ_† */
+	$"E919 06B3 DF75 C703 6461 92A0 0000 0000"            /* é..³ßuÇ.da’ .... */
+	$"0000 0000 0000 3BB1 A000 0000 0000 0000"            /* ......;± ....... */
+	$"0000 0000 0000 16D5 1BCE EA04 06C0 034E"            /* .......Õ.Îê..À.N */
+	$"50C0 B88D B2F4 4BED 0C57 2F64 38E7 DFE6"            /* PÀ¸�²ôKí.W/d8çßæ */
+	$"95DB 93EF B9ED 1250 6A6A A6E3 4478 1E7E"            /* •Û“ï¹í.Pjj¦ãDx.~ */
+	$"F105 8E1B 961B 230C 9500 0000 0000 0C18"            /* ñ.Ž.–.#.•....... */
+	$"0EA3 5F13 6306 E1B5 4B22 3D26 79A1 06E4"            /* .£_.c.áµK"=&y¡.ä */
+	$"228F F320 0B74 8820 0000 0000 0000 0007"            /* "�ó .tˆ ........ */
+	$"9F62 443B 9A51 EAB0 7C1A A374 E7F1 52F3"            /* ŸbD;šQê°|.£tçñRó */
+	$"3BB8 C1E0 5919 6C04 A2E2 1032 6917 1394"            /* ;¸ÁàY.l.¢â.2i..” */
+	$"CCBE 472A 0652 C144 6D1E 755C ECF9 9725"            /* ̾G*.RÁDm.u\ìù—% */
+	$"A84A 55AE 7A0E 6730 FCA7 B6E0 FF31 08C0"            /* ¨JU®z.g0ü§¶àÿ1.À */
+	$"3E76 4DDC 9E24 A60B C4A7 4CDD C221 1941"            /* >vMÜž$¦.ħLÝÂ!.A */
+	$"0810 2DE3 206F C551 4910 77AA 762A 1FF2"            /* ..-ã oÅQI.wªv*.ò */
+	$"D39A 0ADC 1089 90F8 D098 1E77 BDD1 AF74"            /* ÓšÂÜ.‰�øИ.w½Ñ¯t */
+	$"4DEF D00D 0B2C CA2F 9EDC 27C4 35F9 F924"            /* MïÐ..,Ê/žÜ'Ä5ùù$ */
+	$"67FF 74E5 A746 B627 6267 F6D0 9B94 22D4"            /* gÿtå§F¶'bgöЛ”"Ô */
+	$"5FFE DF67 A7A9 E3CA 02A5 44D1 E926 DCA4"            /* _þßg§©ãÊ.¥DÑé&ܤ */
+	$"7490 4AB8 E094 7037 FF7C 8CF7 2A9B B784"            /* t�J¸à”p7ÿ|Œ÷*›·„ */
+	$"794E 9026 D48F FF7F F013 AABF F874 63DA"            /* yN�&Ô�ÿ.ð.ª¿øtcÚ */
+	$"0302 FBFA AA6A 31D5 E2DF 85F7 2ACD D98C"            /* ..ûúªj1Õâß…÷*ÍÙŒ */
+	$"175D 1243 F1C0 CEA2 344C B6FC ADCF C6AA"            /* .].CñÀ΢4L¶ü­Ïƪ */
+	$"5CAE FA82 783F 58DD 754D 5C63 A018 19F8"            /* \®ú‚x?XÝuM\c ..ø */
+	$"7EFE 8953 AE16 22B9 4ED7 43D2 8A0B FA52"            /* ~þ‰S®."¹N×CÒŠ.úR */
+	$"5703 08CA 555B E51E 307B 0565 E165 22F3"            /* W..ÊU[å.0{.eáe"ó */
+	$"7130 0CEC CA23 576D 8D58 BED1 FEB6 9A2F"            /* q0.ìÊ#Wm�X¾Ñþ¶š/ */
+	$"DCEA 3288 3EEC B12A D43C B191 2627 7723"            /* Üê2ˆ>ì±*Ô<±‘&'w# */
+	$"F40F 1B7A F1E3 9A7E 366D 7490 EE80 3570"            /* ô..zñãš~6mt�î€5p */
+	$"CB59 D05D F384 AA96 71FE 68E8 4D32 F9D2"            /* ËYÐ]󄪖qþhèM2ùÒ */
+	$"48BC 7B03 EA3B 879E 2E96 671F 8098 CE76"            /* H¼{.ê;‡ž.–g.€˜Îv */
+	$"87D8 0336 5C88 91F4 3C69 D76B 4DEF 29DA"            /* ‡Ø.6\ˆ‘ô<i×kMï)Ú */
+	$"F378 1035 720A CE61 C2E3 5776 CA53 F43B"            /* óx.5rÂÎaÂãWvÊSô; */
+	$"4FCB 79E4 5164 1270 A23E 6048 2089 7B12"            /* OËyäQd.p¢>`H ‰{. */
+	$"BCA8 E157 DFD5 E879 C14C 1B1A 3431 2856"            /* ¼¨áWßÕèyÁL..41(V */
+	$"0E74 D87F 7691 A923 632A 5EBC 6E95 6A46"            /* .tØ.v‘©#c*^¼n•jF */
+	$"8E68 7118 3704 6E41 37CB C9AC 7F84 1005"            /* Žhq.7.nA7Ëɬ.„.. */
+	$"C308 7C90 C6E0 B56C 8CF8 3C33 A97E C46C"            /* Ã.|�ÆàµlŒø<3©~Äl */
+	$"E373 91A9 4A3F 7331 481D 843F 0472 59DC"            /* ãs‘©J?s1H.„?.rYÜ */
+	$"0837 85BA 4867 C202 6BFC 7433 F093 530F"            /* .7…ºHgÂ.küt3ð“S. */
+	$"D721 8927 26CF AA6B B4E1 7981 FCE4 9F4E"            /* ×!‰'&Ϫk´áy�üäŸN */
+	$"1105 9E7B 7F68 1CE7 D811 E270 FCA3 9CDE"            /* ..ž{.h.çØ.âpü£œÞ */
+	$"BFE6 48BA AC07 B55E 4E7F 5946 115B B1DC"            /* ¿æHº¬.µ^N.YF.[±Ü */
+	$"F694 3A9B EADD 7971 E0F1 B6E1 C6FF 4337"            /* ö”:›êÝyqàñ¶áÆÿC7 */
+	$"F543 A074 FC74 AD1F 45BF 7867 C472 7605"            /* õC tüt­.E¿xgÄrv. */
+	$"1786 E496 2D22 22BE 5760 9ACE A5C9 22B9"            /* .†ä–-""¾W`šÎ¥É"¹ */
+	$"9A14 4136 93E4 3E4A 715C 6F69 8447 5764"            /* š.A6“ä>Jq\oi„GWd */
+	$"D761 77A8 2C3F E200 ACAD 8331 11D0 ABE6"            /* ×aw¨,?â.¬­ƒ1.Ыæ */
+	$"EA7B 5A22 58CF 097E 732F 894B E99C 6BAF"            /* ê{Z"XÏÆ~s/‰Kéœk¯ */
+	$"B36C 68AA 5668 EF92 66E9 DDF9 FF78 DB89"            /* ³lhªVhï’féÝùÿxÛ‰ */
+	$"FC78 2032 99D9 62F0 1380 3FE8 41DF F341"            /* üx 2™Ùbð.€?èAßóA */
+	$"F1FD 7F08 CE2E F09A 9335 6735 0FAD 8093"            /* ñý..Î.ðš“5g5.­€“ */
+	$"B6B1 53A2 964F EA7E 72A2 9A29 794D 98F0"            /* ¶±S¢–Oê~r¢š)yM˜ð */
+	$"DD57 AE65 C61E DDEC BDB4 35C2 D050 E063"            /* ÝW®eÆ.Ýì½´5ÂÐPàc */
+	$"5F54 BCA5 928D 786D CAE3 8F96 BFEB 027E"            /* _T¼¥’�xmÊã�–¿ë.~ */
+	$"6BBC 8795 7C88 1A2C 9908 36A1 6CAB 9268"            /* k¼‡•|ˆ.,™.6¡l«’h */
+	$"EB0D 816F F34D 55F5 B562 BCFF 4190 EE42"            /* ë.�oóMUõµb¼ÿA�îB */
+	$"F195 E7F3 E220 7E51 74A2 FA23 23F7 20F0"            /* ñ•çóâ ~Qt¢ú##÷ ð */
+	$"985F 011C 34B8 C988 C519 C623 81BC D026"            /* ˜_..4¸ÉˆÅ.Æ#�¼Ð& */
+	$"A8C5 B82C 7A7F 86F7 E60E 44F2 CD53 6FAB"            /* ¨Å¸,z.†÷æ.DòÍSo« */
+	$"2D69 1FD4 75B7 A011 80E7 09B3 B9CF 4503"            /* -i.Ôu· .€çƳ¹ÏE. */
+	$"F4A5 1DE3 AE8A 96F7 E245 0DF9 3859 24FA"            /* ô¥.㮊–÷âE.ù8Y$ú */
+	$"7B43 665F B15E D4D3 FB2A 666E FB6A 6CA8"            /* {Cf_±^ÔÓû*fnûjl¨ */
+	$"9CAF C052 D658 6DC3 BDD1 C752 21FA 6426"            /* œ¯ÀRÖXmýÑÇR!úd& */
+	$"857C D05D 41C2 0241 306C 6FD4 81E3 69F7"            /* …|Ð]AÂ.A0loÔ�ãi÷ */
+	$"A6F5 227F 39F9 780E 829A 17A9 C649 2BF5"            /* ¦õ".9ùx.‚š.©ÆI+õ */
+	$"01DD E500 A973 E599 890C A548 CE34 2877"            /* .Ýå.©s噉.¥HÎ4(w */
+	$"D160 A2EE 4B3B CC7A 0C87 6723 51FD C222"            /* Ñ`¢îK;Ìz.‡g#QýÂ" */
+	$"9BFB E72D 2769 6250 2054 22C9 ABB2 3125"            /* ›ûç-'ibP T"É«²1% */
+	$"7DA0 73A3 C083 1AAD 90F2 F0A8 C22D 9DF5"            /* } s£Àƒ.­�òð¨Â-�õ */
+	$"3FFB 6B56 18BE 61A6 B198 F1BC 1E4E 0CFE"            /* ?ûkV.¾a¦±˜ñ¼.N.þ */
+	$"B323 8275 A644 CAC4 D36B 9AF9 FCC8 5DEC"            /* ³#‚u¦DÊÄÓkšùüÈ]ì */
+	$"292B CC9B A0B6 9148 09DF E46D 1B2C 4EDF"            /* )+Ì› ¶‘HÆßäm.,Nß */
+	$"EDB9 2DB4 BAD5 C50B 2115 C476 E09A F407"            /* í¹-´ºÕÅ.!.Ävàšô. */
+	$"5EE8 2E9F 870F A319 32D4 EBEC CB7B FDE9"            /* ^è.Ÿ‡.£.2ÔëìË{ýé */
+	$"FB5C 0D41 61F3 BA97 0F9E 558F 6E39 C213"            /* û\.Aaóº—.žU�n9Â. */
+	$"3101 A5E8 ECEC 15E5 4F29 F69A 58CD D82D"            /* 1.¥èìì.åO)öšXÍØ- */
+	$"986E E8E0 6898 17CC 98C4 C851 AC75 9306"            /* ˜nèàh˜.̘ÄÈQ¬u“. */
+	$"5241 0350 E2EB 38CA 1682 6132 FF45 578A"            /* RA.Pâë8Ê.‚a2ÿEWŠ */
+	$"FA7F 7557 AC2C 9A18 3835 A62B 7D09 0992"            /* ú.uW¬,š.85¦+}ÆÆ’ */
+	$"EF78 BD49 5317 373A B07D 6420 DC30 5067"            /* ïx½IS.7:°}d Ü0Pg */
+	$"A659 F316 4436 8E8E 9786 1163 A6A5 B841"            /* ¦Yó.D6ŽŽ—†.c¦¥¸A */
+	$"99AA 4E1C 6163 309A 3C23 0208 FF4B 2967"            /* ™ªN.ac0š<#..ÿK)g */
+	$"B7F7 37E4 A337 D0DC C48A A742 FB2D C529"            /* ·÷7ä£7ÐÜÄŠ§Bû-Å) */
+	$"BC6C 5BBE BC5C 03B1 F87F D7EA F5AC B94B"            /* ¼l[¾¼\.±ø.×êõ¬¹K */
+	$"5A88 84AB E44E BE6A F337 96B0 7CB6 1140"            /* Zˆ„«äN¾jó7–°|¶.@ */
+	$"25CB 45D6 BE02 A9D4 7868 1EDD F660 7963"            /* %ËEÖ¾.©Ôxh.Ýö`yc */
+	$"B438 C030 3EA5 51FA F451 FA84 A6FF 2E5A"            /* ´8À0>¥QúôQú„¦ÿ.Z */
+	$"EA95 2300 C0F4 39AA 42BA 4120 4EEC AFDD"            /* ê•#.Àô9ªBºA Nì¯Ý */
+	$"20B4 6C42 0552 1177 6F1A AC6D FE8B 98E1"            /*  ´lB.R.wo.¬mþ‹˜á */
+	$"D3FB F52E BCE3 5BB1 7235 F597 3E0D 8C46"            /* Óûõ.¼ã[±r5õ—>.ŒF */
+	$"7361 1E2A C081 CA97 C8EA CD3F E91D 823F"            /* sa.*À�Ê—ÈêÍ?é.‚? */
+	$"73A7 5EA1 F641 9CBD 219D D7E4 EE0D 270E"            /* s§^¡öAœ½!�×äî.'. */
+	$"14DF F756 B4E5 062C 8251 4AD0 B090 A0AF"            /* .ß÷V´å.,‚QJа� ¯ */
+	$"CD2A 3C80 6068 C9CD C3D7 3D7F 258B 365A"            /* Í*<€`hÉÍÃ×=.%‹6Z */
+	$"5E1A 90DC D058 4ED9 DF50 6F40 07A9 2BDE"            /* ^.�ÜÐXNÙßPo@.©+Þ */
+	$"8486 5404 AB9C E323 0C4E D3DB 8352 0C0F"            /* „†T.«œã#.NÓÛƒR.. */
+	$"CD59 A5F5 56CC 0BB2 B603 85C3 C709 7D6E"            /* ÍY¥õVÌ.²¶.…ÃÇÆ}n */
+	$"A10E 33C2 AE0F D52F 5AD7 2279 E6EB 7E6C"            /* ¡.3®.Õ/Z×"yæë~l */
+	$"1757 589D C6DC B4FD 470C FFD9"                      /* .WX�ÆÜ´ýG.ÿÙ */
+};
+
diff --git a/linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store b/linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store
new file mode 100644
index 0000000..a8b7573
Binary files /dev/null and b/linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store differ
diff --git a/linden/indra/newview/installers/darwin/releasecandidate-dmg/_VolumeIcon.icns b/linden/indra/newview/installers/darwin/releasecandidate-dmg/_VolumeIcon.icns
new file mode 100644
index 0000000..da5307e
Binary files /dev/null and b/linden/indra/newview/installers/darwin/releasecandidate-dmg/_VolumeIcon.icns differ
diff --git a/linden/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg b/linden/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg
new file mode 100644
index 0000000..55294dc
Binary files /dev/null and b/linden/indra/newview/installers/darwin/releasecandidate-dmg/background.jpg differ
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index d1c8d0c..ec4fd85 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -37,10 +37,10 @@ XPStyle on                  ; add an XP manifest to the installer
 ;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 
 ;; application directory so we have to add a path to these include files)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-!include "installers\windows\lang_de.nsi"
-!include "installers\windows\lang_en-us.nsi"
-!include "installers\windows\lang_ja.nsi"
-!include "installers\windows\lang_ko.nsi"
+!include "%%SOURCE%%\installers\windows\lang_de.nsi"
+!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"
+!include "%%SOURCE%%\installers\windows\lang_ja.nsi"
+!include "%%SOURCE%%\installers\windows\lang_ko.nsi"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)
@@ -51,8 +51,8 @@ Name ${INSTNAME}
 SubCaption 0 $(LicenseSubTitleSetup)	; override "license agreement" text
 
 BrandingText " "						; bottom of window text
-Icon res\install_icon.ico				; our custom icon
-UninstallIcon res\uninstall_icon.ico    ; our custom icon
+Icon %%SOURCE%%\res\install_icon.ico	; our custom icon
+UninstallIcon %%SOURCE%%\res\uninstall_icon.ico    ; our custom icon
 WindowIcon on							; show our icon in left corner
 BGGradient off							; no big background window
 CRCCheck on								; make sure CRC is OK
@@ -115,6 +115,10 @@ Call RemoveOldShaders
 Call RemoveOldXUI
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Clear out old releasenotes.txt files. These are now on the public wiki.
+Call RemoveOldReleaseNotes
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
@@ -146,8 +150,6 @@ WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \
 WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \
 				"InternetShortcut" "URL" \
 				"http://www.secondlife.com/account/"
-CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk" \
-				"$INSTDIR\releasenotes.txt"
 CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \
 				"$INSTDIR\lsl_guide.html"
 CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
@@ -509,6 +511,22 @@ Delete "$INSTDIR\skins\*.txt"
 FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Remove any releasenotes files.
+;;; We are no longer including release notes with the viewer. This will delete
+;;; any that were left behind by an older installer. Delete will not fail if
+;;; the files do not exist
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function RemoveOldReleaseNotes
+
+;; remove releasenotes.txt file from application directory, and the shortcut
+;; from the start menu.
+Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
+Delete "$INSTDIR\releasenotes.txt"
+
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Delete files in Documents and Settings\<user>\SecondLife
 ; Delete files in Documents and Settings\All Users\SecondLife
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/linden/indra/newview/linux_tools/exposed-symbols.txt b/linden/indra/newview/linux_tools/exposed-symbols.txt
deleted file mode 100644
index f12fbfa..0000000
--- a/linden/indra/newview/linux_tools/exposed-symbols.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-initllpython
-createLLImageJ2CKDU
-destroyLLImageJ2CKDU
-engineInfoLLImageJ2CKDU
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index eaa2f61..9d2e06b 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -33,6 +33,11 @@
 ##   LL_GL_BLACKLIST which solves your problems.
 #export LL_GL_BLACKLIST=abcdefghijklmno
 
+## - Some ATI/Radeon users report random X server crashes when the mouse
+##   cursor changes shape.  If you suspect that you are a victim of this
+##   driver bug, try enabling this option and report whether it helps:
+#export LL_ATI_MOUSE_CURSOR_BUG=x
+
 
 ## Everything below this line is just for advanced troubleshooters.
 ##-------------------------------------------------------------------
@@ -56,6 +61,12 @@ if [ "$GTK_IM_MODULE" = "scim" ]; then
     export GTK_IM_MODULE=xim
 fi
 
+## - Automatically work around the ATI mouse cursor crash bug:
+## (this workaround is disabled as most fglrx users do not see the bug)
+#if lsmod | grep fglrx &>/dev/null ; then
+#	export LL_ATI_MOUSE_CURSOR_BUG=x
+#fi
+
 
 ## Nothing worth editing below this line.
 ##-------------------------------------------------------------------
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index b65a1f6..d268397 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -94,6 +94,7 @@
 #include "llsky.h"
 #include "llrendersphere.h"
 #include "llstatusbar.h"
+#include "llstartup.h"
 #include "llimview.h"
 #include "lltool.h"
 #include "lltoolfocus.h"
@@ -125,14 +126,10 @@
 #include "roles_constants.h"
 #include "llviewercontrol.h"
 #include "llappviewer.h"
-#include "llvoiceclient.h"
-
-// Ventrella
+#include "llviewerjoystick.h"
 #include "llfollowcam.h"
-// end Ventrella
 
 extern LLMenuBarGL* gMenuBarView;
-extern U8 gLastPickAlpha;
 
 //drone wandering constants
 const F32 MAX_WANDER_TIME = 20.f;						// seconds
@@ -176,7 +173,7 @@ const F32 AVATAR_ZOOM_MIN_Z_FACTOR = 1.15f;
 
 const F32 MAX_CAMERA_DISTANCE_FROM_AGENT = 50.f;
 
-const F32 MAX_CAMERA_SMOOTH_DISTANCE = 20.0f;
+const F32 MAX_CAMERA_SMOOTH_DISTANCE = 50.0f;
 
 const F32 HEAD_BUFFER_SIZE = 0.3f;
 const F32 CUSTOMIZE_AVATAR_CAMERA_ANIM_SLOP = 0.2f;
@@ -236,8 +233,8 @@ BOOL LLAgent::sDebugDisplayTarget = FALSE;
 
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
 
-std::map<LLString, LLString> LLAgent::sTeleportErrorMessages;
-std::map<LLString, LLString> LLAgent::sTeleportProgressMessages;
+std::map<std::string, std::string> LLAgent::sTeleportErrorMessages;
+std::map<std::string, std::string> LLAgent::sTeleportProgressMessages;
 
 class LLAgentFriendObserver : public LLFriendObserver
 {
@@ -329,6 +326,8 @@ LLAgent::LLAgent()
 	mCameraZoomFraction(1.f),			// deprecated
 	mThirdPersonHeadOffset(0.f, 0.f, 1.f),
 	mSitCameraEnabled(FALSE),
+	mHUDTargetZoom(1.f),
+	mHUDCurZoom(1.f),
 	mFocusOnAvatar(TRUE),
 	mFocusGlobal(),
 	mFocusTargetGlobal(),
@@ -338,6 +337,7 @@ LLAgent::LLAgent()
 	mTrackFocusObject(TRUE),
 	mCameraSmoothingLastPositionGlobal(),
 	mCameraSmoothingLastPositionAgent(),
+	mCameraSmoothingStop(FALSE),
 
 	mFrameAgent(),
 
@@ -529,10 +529,7 @@ void LLAgent::resetView(BOOL reset_camera)
 		setFocusOnAvatar(TRUE, ANIMATE);
 	}
 
-	if (mAvatarObject.notNull())
-	{
-		mAvatarObject->mHUDTargetZoom = 1.f;
-	}
+	mHUDTargetZoom = 1.f;
 }
 
 // Handle any actions that need to be performed when the main app gains focus
@@ -819,13 +816,10 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
 	llassert(regionp);
 	if (mRegionp != regionp)
 	{
-		// JC - Avoid this, causes out-of-bounds array write deep within
-		// Windows.
-		// char host_name[MAX_STRING];
-		// regionp->getHost().getHostName(host_name, MAX_STRING);
+		// std::string host_name;
+		// host_name = regionp->getHost().getHostName();
 
-		char ip[MAX_STRING];		/*Flawfinder: ignore*/
-		regionp->getHost().getString(ip, MAX_STRING);
+		std::string ip = regionp->getHost().getString();
 		llinfos << "Moving agent into region: " << regionp->getName()
 				<< " located at " << ip << llendl;
 		if (mRegionp)
@@ -1300,7 +1294,7 @@ LLQuaternion LLAgent::getQuat() const
 //-----------------------------------------------------------------------------
 // calcFocusOffset()
 //-----------------------------------------------------------------------------
-LLVector3d LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
+LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
 {
 	// calculate offset based on view direction
 	BOOL is_avatar = object->isAvatar();
@@ -1459,10 +1453,10 @@ LLVector3d LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
 		
 		obj_rel = lerp(focus_delta, obj_rel, bias);
 		
-		return LLVector3d(obj_rel);
+		return LLVector3(obj_rel);
 	}
 
-	return LLVector3d(focus_delta.mV[VX], focus_delta.mV[VY], focus_delta.mV[VZ]);
+	return LLVector3(focus_delta.mV[VX], focus_delta.mV[VY], focus_delta.mV[VZ]);
 }
 
 //-----------------------------------------------------------------------------
@@ -1652,7 +1646,7 @@ F32 LLAgent::getCameraZoomFraction()
 	if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
 	{
 		// already [0,1]
-		return mAvatarObject->mHUDTargetZoom;
+		return mHUDTargetZoom;
 	}
 	else if (mFocusOnAvatar && cameraThirdPerson())
 	{
@@ -1700,7 +1694,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
 
 	if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		mAvatarObject->mHUDTargetZoom = fraction;
+		mHUDTargetZoom = fraction;
 	}
 	else if (mFocusOnAvatar && cameraThirdPerson())
 	{
@@ -1810,7 +1804,7 @@ void LLAgent::cameraZoomIn(const F32 fraction)
 	if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
 	{
 		// just update hud zoom level
-		mAvatarObject->mHUDTargetZoom /= fraction;
+		mHUDTargetZoom /= fraction;
 		return;
 	}
 
@@ -1956,6 +1950,10 @@ void LLAgent::cameraPanLeft(F32 meters)
 
 	mFocusTargetGlobal += meters * left_axis;
 	mFocusGlobal = mFocusTargetGlobal;
+
+	// disable smoothing for camera pan, which causes some residents unhappiness
+	mCameraSmoothingStop = TRUE;
+	
 	cameraZoomIn(1.f);
 	updateFocusOffset();
 }
@@ -1970,6 +1968,10 @@ void LLAgent::cameraPanUp(F32 meters)
 
 	mFocusTargetGlobal += meters * up_axis;
 	mFocusGlobal = mFocusTargetGlobal;
+
+	// disable smoothing for camera pan, which causes some residents unhappiness
+	mCameraSmoothingStop = TRUE;
+
 	cameraZoomIn(1.f);
 	updateFocusOffset();
 }
@@ -2092,7 +2094,7 @@ void LLAgent::setAFK()
 		if (gAFKMenu)
 		{
 			//*TODO:Translate
-			gAFKMenu->setLabel(LLString("Set Not Away"));
+			gAFKMenu->setLabel(std::string("Set Not Away"));
 		}
 	}
 }
@@ -2116,7 +2118,7 @@ void LLAgent::clearAFK()
 		if (gAFKMenu)
 		{
 			//*TODO:Translate
-			gAFKMenu->setLabel(LLString("Set Away"));
+			gAFKMenu->setLabel(std::string("Set Away"));
 		}
 	}
 }
@@ -2139,7 +2141,7 @@ void LLAgent::setBusy()
 	if (gBusyMenu)
 	{
 		//*TODO:Translate
-		gBusyMenu->setLabel(LLString("Set Not Busy"));
+		gBusyMenu->setLabel(std::string("Set Not Busy"));
 	}
 	LLFloaterMute::getInstance()->updateButtons();
 }
@@ -2154,7 +2156,7 @@ void LLAgent::clearBusy()
 	if (gBusyMenu)
 	{
 		//*TODO:Translate
-		gBusyMenu->setLabel(LLString("Set Busy"));
+		gBusyMenu->setLabel(std::string("Set Busy"));
 	}
 	LLFloaterMute::getInstance()->updateButtons();
 }
@@ -3228,11 +3230,11 @@ void LLAgent::updateCamera()
 		LLVector3d agent_pos = getPositionGlobal();
 		LLVector3d camera_pos_agent = camera_pos_global - agent_pos;
 		
-		if (cameraThirdPerson()) // only smooth in third person mode
+		if (cameraThirdPerson() && !mCameraSmoothingStop) // only smooth in third person mode
 		{
-			F32 smoothing = llclampf(1.f - pow(2.f, -4.f * gSavedSettings.getF32("CameraPositionSmoothing") / gFPSClamped));
-			// we use average FPS instead of LLCriticalDamp b/c exact frame time is jittery
-
+			const F32 SMOOTHING_HALF_LIFE = 0.02f;
+			
+			F32 smoothing = LLCriticalDamp::getInterpolant(gSavedSettings.getF32("CameraPositionSmoothing") * SMOOTHING_HALF_LIFE, FALSE);
 					
 			if (!mFocusObject)  // we differentiate on avatar mode 
 			{
@@ -3242,7 +3244,7 @@ void LLAgent::updateCamera()
 				LLVector3d delta = camera_pos_agent - mCameraSmoothingLastPositionAgent;
 				if (delta.magVec() < MAX_CAMERA_SMOOTH_DISTANCE)  // only smooth over short distances please
 				{
-					camera_pos_agent = lerp(camera_pos_agent, mCameraSmoothingLastPositionAgent, smoothing);
+					camera_pos_agent = lerp(mCameraSmoothingLastPositionAgent, camera_pos_agent, smoothing);
 					camera_pos_global = camera_pos_agent + agent_pos;
 				}
 			}
@@ -3251,13 +3253,14 @@ void LLAgent::updateCamera()
 				LLVector3d delta = camera_pos_global - mCameraSmoothingLastPositionGlobal;
 				if (delta.magVec() < MAX_CAMERA_SMOOTH_DISTANCE) // only smooth over short distances please
 				{
-					camera_pos_global = lerp(camera_pos_global, mCameraSmoothingLastPositionGlobal, smoothing);
+					camera_pos_global = lerp(mCameraSmoothingLastPositionGlobal, camera_pos_global, smoothing);
 				}
 			}
 		}
 								 
 		mCameraSmoothingLastPositionGlobal = camera_pos_global;
 		mCameraSmoothingLastPositionAgent = camera_pos_agent;
+		mCameraSmoothingStop = FALSE;
 	}
 
 	
@@ -3295,19 +3298,6 @@ void LLAgent::updateCamera()
 		setLookAt(LOOKAT_TARGET_FOCUS, NULL, mCameraPositionAgent);
 	}
 
-	// Send the camera position to the spatialized voice system.
-	if(gVoiceClient && getRegion())
-	{
-		LLMatrix3 rot;
-		rot.setRows(LLViewerCamera::getInstance()->getAtAxis(), LLViewerCamera::getInstance()->getLeftAxis (),  LLViewerCamera::getInstance()->getUpAxis());		
-
-		// MBW -- XXX -- Setting velocity to 0 for now.  May figure it out later...
-		gVoiceClient->setCameraPosition(
-				getRegion()->getPosGlobalFromRegion(LLViewerCamera::getInstance()->getOrigin()),// position
-				LLVector3::zero, 			// velocity
-				rot);						// rotation matrix
-	}
-
 	// update the travel distance stat
 	// this isn't directly related to the camera
 	// but this seemed like the best place to do this
@@ -3510,20 +3500,24 @@ LLVector3d LLAgent::calcFocusPositionTargetGlobal()
 	}
 	else
 	{
-		// ...offset from avatar
-		LLVector3d focus_offset;
-		focus_offset.setVec(gSavedSettings.getVector3("FocusOffsetDefault"));
-
-		LLQuaternion agent_rot = mFrameAgent.getQuaternion();
-		if (!mAvatarObject.isNull() && mAvatarObject->getParent())
-		{
-			agent_rot *= ((LLViewerObject*)(mAvatarObject->getParent()))->getRenderRotation();
-		}
+		return getPositionGlobal() + calcThirdPersonFocusOffset();
+	}
+}
 
-		focus_offset = focus_offset * agent_rot;
+LLVector3d LLAgent::calcThirdPersonFocusOffset()
+{
+	// ...offset from avatar
+	LLVector3d focus_offset;
+	focus_offset.setVec(gSavedSettings.getVector3("FocusOffsetDefault"));
 
-		return getPositionGlobal() + focus_offset;
+	LLQuaternion agent_rot = mFrameAgent.getQuaternion();
+	if (!mAvatarObject.isNull() && mAvatarObject->getParent())
+	{
+		agent_rot *= ((LLViewerObject*)(mAvatarObject->getParent()))->getRenderRotation();
 	}
+
+	focus_offset = focus_offset * agent_rot;
+	return focus_offset;
 }
 
 void LLAgent::setupSitCamera()
@@ -3759,7 +3753,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 
 					lag_interp *= u;
 
-					if (gViewerWindow->getLeftMouseDown() && gLastHitObjectID == mAvatarObject->getID())
+					if (gViewerWindow->getLeftMouseDown() && gViewerWindow->getLastPick().mObjectID == mAvatarObject->getID())
 					{
 						// disable camera lag when using mouse-directed steering
 						target_lag.clearVec();
@@ -3951,6 +3945,11 @@ void LLAgent::resetCamera()
 //-----------------------------------------------------------------------------
 void LLAgent::changeCameraToMouselook(BOOL animate)
 {
+	if (LLViewerJoystick::getInstance()->getOverrideCamera())
+	{
+		return;
+	}
+
 	// visibility changes at end of animation
 	gViewerWindow->getWindow()->resetBusyCount();
 
@@ -3977,7 +3976,7 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
 
 	if( mCameraMode != CAMERA_MODE_MOUSELOOK )
 	{
-		gViewerWindow->setKeyboardFocus( NULL );
+		gFocusMgr.setKeyboardFocus( NULL );
 		
 		mLastCameraMode = mCameraMode;
 		mCameraMode = CAMERA_MODE_MOUSELOOK;
@@ -4006,6 +4005,11 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
 //-----------------------------------------------------------------------------
 void LLAgent::changeCameraToDefault()
 {
+	if (LLViewerJoystick::getInstance()->getOverrideCamera())
+	{
+		return;
+	}
+
 	if (LLFollowCamMgr::getActiveFollowCamParams())
 	{
 		changeCameraToFollow();
@@ -4023,6 +4027,11 @@ void LLAgent::changeCameraToDefault()
 //-----------------------------------------------------------------------------
 void LLAgent::changeCameraToFollow(BOOL animate)
 {
+	if (LLViewerJoystick::getInstance()->getOverrideCamera())
+	{
+		return;
+	}
+
 	if( mCameraMode != CAMERA_MODE_FOLLOW )
 	{
 		if (mCameraMode == CAMERA_MODE_MOUSELOOK)
@@ -4081,7 +4090,10 @@ void LLAgent::changeCameraToFollow(BOOL animate)
 //-----------------------------------------------------------------------------
 void LLAgent::changeCameraToThirdPerson(BOOL animate)
 {
-//printf( "changeCameraToThirdPerson\n" );
+	if (LLViewerJoystick::getInstance()->getOverrideCamera())
+	{
+		return;
+	}
 
 	gViewerWindow->getWindow()->resetBusyCount();
 
@@ -4163,6 +4175,11 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
 //-----------------------------------------------------------------------------
 void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_animate)
 {
+	if (LLViewerJoystick::getInstance()->getOverrideCamera())
+	{
+		return;
+	}
+
 	setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
 	gViewerWindow->getWindow()->resetBusyCount();
 
@@ -4198,8 +4215,8 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
 			mbFlagsDirty = TRUE;
 		}
 
-		gViewerWindow->setKeyboardFocus( NULL );
-		gViewerWindow->setMouseCapture( NULL );
+		gFocusMgr.setKeyboardFocus( NULL );
+		gFocusMgr.setMouseCapture( NULL );
 
 		LLVOAvatar::onCustomizeStart();
 	}
@@ -4287,6 +4304,12 @@ void LLAgent::setFocusObject(LLViewerObject* object)
 //-----------------------------------------------------------------------------
 // setFocusGlobal()
 //-----------------------------------------------------------------------------
+void LLAgent::setFocusGlobal(const LLPickInfo& pick)
+{
+	setFocusGlobal(pick.mPosGlobal, pick.mObjectID);
+}
+
+
 void LLAgent::setFocusGlobal(const LLVector3d& focus, const LLUUID &object_id)
 {
 	setFocusObject(gObjectList.findObject(object_id));
@@ -4473,7 +4496,7 @@ void LLAgent::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate)
 	//RN: when focused on the avatar, we're not "looking" at it
 	// looking implies intent while focusing on avatar means
 	// you're just walking around with a camera on you...eesh.
-	if (focus_on_avatar && !mFocusOnAvatar)
+	if (!mFocusOnAvatar && focus_on_avatar)
 	{
 		setFocusGlobal(LLVector3d::zero);
 		mCameraFOVZoomFactor = 0.f;
@@ -4497,6 +4520,12 @@ void LLAgent::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate)
 			}
 		}
 	}
+	// unlocking camera from avatar
+	else if (mFocusOnAvatar && !focus_on_avatar)
+	{
+		// keep camera focus point consistent, even though it is now unlocked
+		setFocusGlobal(getPositionGlobal() + calcThirdPersonFocusOffset(), gAgent.getID());
+	}
 	
 	mFocusOnAvatar = focus_on_avatar;
 }
@@ -4770,6 +4799,9 @@ void LLAgent::buildFullnameAndTitle(std::string& name) const
 
 BOOL LLAgent::isInGroup(const LLUUID& group_id) const
 {
+	if (isGodlike())
+		return true;
+
 	S32 count = mGroups.count();
 	for(S32 i = 0; i < count; ++i)
 	{
@@ -4784,6 +4816,9 @@ BOOL LLAgent::isInGroup(const LLUUID& group_id) const
 // This implementation should mirror LLAgentInfo::hasPowerInGroup
 BOOL LLAgent::hasPowerInGroup(const LLUUID& group_id, U64 power) const
 {
+	if (isGodlike())
+		return true;
+
 	// GP_NO_POWERS can also mean no power is enough to grant an ability.
 	if (GP_NO_POWERS == power) return FALSE;
 
@@ -4805,6 +4840,9 @@ BOOL LLAgent::hasPowerInActiveGroup(U64 power) const
 
 U64 LLAgent::getPowerInGroup(const LLUUID& group_id) const
 {
+	if (isGodlike())
+		return GP_ALL_POWERS;
+	
 	S32 count = mGroups.count();
 	for(S32 i = 0; i < count; ++i)
 	{
@@ -5104,9 +5142,8 @@ BOOL LLAgent::allowOperation(PermissionBit op,
 }
 
 
-void LLAgent::getName(LLString& name)
+void LLAgent::getName(std::string& name)
 {
-	// Note: assumes that name points to a buffer of at least DB_FULL_NAME_BUF_SIZE bytes.
 	name.clear();
 
 	if (mAvatarObject)
@@ -5189,8 +5226,8 @@ void LLAgent::processAgentDropGroup(LLMessageSystem *msg, void **)
 		{
 			gAgent.mGroupID.setNull();
 			gAgent.mGroupPowers = 0;
-			gAgent.mGroupName[0] = '\0';
-			gAgent.mGroupTitle[0] = '\0';
+			gAgent.mGroupName.clear();
+			gAgent.mGroupTitle.clear();
 		}
 		
 		// refresh all group information
@@ -5268,8 +5305,8 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
 				{
 					gAgent.mGroupID.setNull();
 					gAgent.mGroupPowers = 0;
-					gAgent.mGroupName[0] = '\0';
-					gAgent.mGroupTitle[0] = '\0';
+					gAgent.mGroupName.clear();
+					gAgent.mGroupTitle.clear();
 				}
 		
 				// refresh all group information
@@ -5321,7 +5358,6 @@ void LLAgent::processAgentGroupDataUpdate(LLMessageSystem *msg, void **)
 	LLGroupData group;
 	S32 index = -1;
 	bool need_floater_update = false;
-	char group_name[DB_GROUP_NAME_BUF_SIZE];		/*Flawfinder: ignore*/
 	for(S32 i = 0; i < count; ++i)
 	{
 		msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group.mID, i);
@@ -5329,8 +5365,7 @@ void LLAgent::processAgentGroupDataUpdate(LLMessageSystem *msg, void **)
 		msg->getU64(_PREHASH_GroupData, "GroupPowers", group.mPowers, i);
 		msg->getBOOL(_PREHASH_GroupData, "AcceptNotices", group.mAcceptNotices, i);
 		msg->getS32(_PREHASH_GroupData, "Contribution", group.mContribution, i);
-		msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupName, DB_GROUP_NAME_BUF_SIZE, group_name, i);
-		group.mName.assign(group_name);
+		msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupName, group.mName, i);
 		
 		if(group.mID.notNull())
 		{
@@ -5428,7 +5463,7 @@ void LLAgent::processAgentDataUpdate(LLMessageSystem *msg, void **)
 		return;
 	}
 
-	msg->getStringFast(_PREHASH_AgentData, _PREHASH_GroupTitle, DB_GROUP_TITLE_BUF_SIZE, gAgent.mGroupTitle);
+	msg->getStringFast(_PREHASH_AgentData, _PREHASH_GroupTitle, gAgent.mGroupTitle);
 	LLUUID active_id;
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_ActiveGroupID, active_id);
 
@@ -5437,13 +5472,13 @@ void LLAgent::processAgentDataUpdate(LLMessageSystem *msg, void **)
 	{
 		gAgent.mGroupID = active_id;
 		msg->getU64(_PREHASH_AgentData, "GroupPowers", gAgent.mGroupPowers);
-		msg->getString(_PREHASH_AgentData, _PREHASH_GroupName, DB_GROUP_NAME_BUF_SIZE, gAgent.mGroupName);
+		msg->getString(_PREHASH_AgentData, _PREHASH_GroupName, gAgent.mGroupName);
 	}
 	else
 	{
 		gAgent.mGroupID.setNull();
 		gAgent.mGroupPowers = 0;
-		gAgent.mGroupName[0] = '\0';
+		gAgent.mGroupName.clear();
 	}		
 
 	update_group_floaters(active_id);
@@ -6208,7 +6243,7 @@ void LLAgent::saveWearableAs(
 		return;
 	}
 	std::string trunc_name(new_name);
-	LLString::truncate(trunc_name, DB_INV_ITEM_NAME_STR_LEN);
+	LLStringUtil::truncate(trunc_name, DB_INV_ITEM_NAME_STR_LEN);
 	LLWearable* new_wearable = gWearableList.createCopyFromAvatar(
 		old_wearable,
 		trunc_name);
@@ -6242,7 +6277,7 @@ void LLAgent::saveWearableAs(
 	LLWearable* old_wearable = getWearable( type );
 	if( old_wearable )
 	{
-		LLString old_name = old_wearable->getName();
+		std::string old_name = old_wearable->getName();
 		old_wearable->setName( new_name );
 		LLWearable* new_wearable = gWearableList.createCopyFromAvatar( old_wearable );
 		old_wearable->setName( old_name );
@@ -6321,7 +6356,7 @@ void LLAgent::setWearableName( const LLUUID& item_id, const std::string& new_nam
 			LLWearable* old_wearable = mWearableEntry[i].mWearable;
 			llassert( old_wearable );
 
-			LLString old_name = old_wearable->getName();
+			std::string old_name = old_wearable->getName();
 			old_wearable->setName( new_name );
 			LLWearable* new_wearable = gWearableList.createCopy( old_wearable );
 			LLInventoryItem* item = gInventory.getItem(item_id);
@@ -6429,27 +6464,14 @@ BOOL LLAgent::isWearingItem( const LLUUID& item_id )
 	return (getWearableFromWearableItem( item_id ) != NULL);
 }
 
-extern LLString gInitialOutfit;
-
 // static
 void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void** user_data )
 {
 	// We should only receive this message a single time.  Ignore subsequent AgentWearablesUpdates
 	// that may result from AgentWearablesRequest having been sent more than once. 
-	static BOOL first = TRUE;
-	if( first )
-	{
-		first = FALSE;
-	}
-	else
-	{
-		return;
-	}
-	
-	if (gNoRender)
-	{
-		return;
-	}
+	static bool first = true;
+	if (!first) return;
+	first = false;
 
 	LLUUID agent_id;
 	gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
@@ -6465,16 +6487,6 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
 			// Transitional state.  Avatars should always have at least their body parts (hair, eyes, shape and skin).
 			// The fact that they don't have any here (only a dummy is sent) implies that this account existed
 			// before we had wearables, or that the database has gotten messed up.
-			// Deal with this by creating new body parts.
-			//avatar->createStandardWearables();
-
-			// no, deal with it by noting that we need to choose a
-			// gender, but only if an initial outfit load isn't happening.
-			// This whole check (num_wearables < 4) can probably be deleted. JC
-			if (gInitialOutfit.empty())
-			{
-				gAgent.setGenderChosen(FALSE);
-			}
 			return;
 		}
 
@@ -6523,7 +6535,7 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
 			{
 				gWearableList.getAsset( 
 					asset_id_array[i],
-					LLString::null,
+					LLStringUtil::null,
 					LLWearable::typeToAssetType( (EWearableType) i ), 
 					LLAgent::onInitialWearableAssetArrived, (void*)(intptr_t)i );
 			}
@@ -6765,7 +6777,7 @@ void LLAgent::makeNewOutfit(
 					new_name = new_folder_name;
 					new_name.append(" ");
 					new_name.append(old_wearable->getTypeLabel());
-					LLString::truncate(new_name, DB_INV_ITEM_NAME_STR_LEN);
+					LLStringUtil::truncate(new_name, DB_INV_ITEM_NAME_STR_LEN);
 					new_wearable->setName(new_name);
 				}
 
@@ -7466,7 +7478,7 @@ void LLAgent::observeFriends()
 	}
 }
 
-void LLAgent::parseTeleportMessages(const LLString& xml_filename)
+void LLAgent::parseTeleportMessages(const std::string& xml_filename)
 {
 	LLXMLNodePtr root;
 	BOOL success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
@@ -7484,8 +7496,8 @@ void LLAgent::parseTeleportMessages(const LLString& xml_filename)
 	{
 		if ( !message_set->hasName("message_set") ) continue;
 
-		std::map<LLString, LLString> *teleport_msg_map = NULL;
-		LLString message_set_name;
+		std::map<std::string, std::string> *teleport_msg_map = NULL;
+		std::string message_set_name;
 
 		if ( message_set->getAttributeString("name", message_set_name) )
 		{
@@ -7503,7 +7515,7 @@ void LLAgent::parseTeleportMessages(const LLString& xml_filename)
 
 		if ( !teleport_msg_map ) continue;
 
-		LLString message_name;
+		std::string message_name;
 		for (LLXMLNode* message_node = message_set->getFirstChild();
 			 message_node != NULL;
 			 message_node = message_node->getNextSibling())
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 01462f1..97f9aed 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -95,6 +95,7 @@ class LLMessageSystem;
 class LLPermissions;
 class LLHost;
 class LLFriendObserver;
+class LLPickInfo;
 
 struct LLGroupData
 {
@@ -150,7 +151,9 @@ public:
 	void			sendReliableMessage();
 
 	LLVector3d		calcCameraPositionTargetGlobal(BOOL *hit_limit = NULL); // Calculate the camera position target
-	LLVector3d		calcFocusPositionTargetGlobal();			// target for this mode
+	LLVector3d		calcFocusPositionTargetGlobal();
+	LLVector3d		calcThirdPersonFocusOffset();
+			// target for this mode
 	LLVector3d		getCameraPositionGlobal() const;
 	const LLVector3 &getCameraPositionAgent() const;
 	F32				calcCameraFOVZoomFactor();
@@ -191,6 +194,7 @@ public:
 	void			changeCameraToFollow(BOOL animate = TRUE);
 	//end Ventrella
 
+	void			setFocusGlobal(const LLPickInfo& pick);
 	void			setFocusGlobal(const LLVector3d &focus, const LLUUID &object_id = LLUUID::null);
 	void			setFocusOnAvatar(BOOL focus, BOOL animate);
 	void			setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
@@ -331,7 +335,7 @@ public:
 																	// of the agent in the absolute frame
 //	BOOL				getLookingAtAvatar() const;
 
-	void				getName(LLString& name);
+	void				getName(std::string& name);
 
 	const LLColor4		&getEffectColor();
 	void				setEffectColor(const LLColor4 &color);
@@ -374,7 +378,7 @@ public:
 	void			sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request);
 	void			sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request);
 
-	LLVector3d		calcFocusOffset(LLViewerObject *object, S32 x, S32 y);
+	LLVector3		calcFocusOffset(LLViewerObject *object, S32 x, S32 y);
 	BOOL			calcCameraMinDistance(F32 &obj_min_distance);
 
 	void			startCameraAnimation();
@@ -525,7 +529,7 @@ public:
 
 	BOOL			sitCameraEnabled() { return mSitCameraEnabled; }
 
-	F32				getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.magVec(); }
+	F32				getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.length(); }
 
 	// look at behavior
 	BOOL			setLookAt(ELookAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero);
@@ -563,8 +567,8 @@ public:
 
 	ETeleportState	getTeleportState() const			{ return mTeleportState; }
 	void			setTeleportState( ETeleportState state );
-	const LLString& getTeleportMessage() const { return mTeleportMessage; }
-	void setTeleportMessage(const LLString& message)
+	const std::string& getTeleportMessage() const { return mTeleportMessage; }
+	void setTeleportMessage(const std::string& message)
 	{
 		mTeleportMessage = message;
 	}
@@ -694,8 +698,8 @@ public:
 
 	U64				mGroupPowers;
 	BOOL			mHideGroupTitle;
-	char			mGroupTitle[DB_GROUP_TITLE_BUF_SIZE];	/*Flawfinder: ignore*/	// honorific, like "Sir"
-	char			mGroupName[DB_GROUP_NAME_BUF_SIZE];	/*Flawfinder: ignore*/
+	std::string		mGroupTitle; // honorific, like "Sir"
+	std::string		mGroupName;
 	LLUUID			mGroupID;
 	//LLUUID			mGroupInsigniaID;
 	LLUUID			mInventoryRootID;
@@ -711,6 +715,9 @@ public:
 
 	LLDynamicArray<LLGroupData> mGroups;
 
+	F32				mHUDTargetZoom;	// target zoom level for HUD objects (used when editing)
+	F32				mHUDCurZoom;	// current animated zoom level for HUD objects
+
 	BOOL			mInitialized;
 
 	static BOOL		sDebugDisplayTarget;
@@ -719,12 +726,12 @@ public:
 
 	BOOL			mForceMouselook;
 
-	static void parseTeleportMessages(const LLString& xml_filename);
+	static void parseTeleportMessages(const std::string& xml_filename);
 	//we should really define ERROR and PROGRESS enums here
 	//but I don't really feel like doing that, so I am just going
 	//to expose the mappings....yup
-	static std::map<LLString, LLString> sTeleportErrorMessages;
-	static std::map<LLString, LLString> sTeleportProgressMessages;
+	static std::map<std::string, std::string> sTeleportErrorMessages;
+	static std::map<std::string, std::string> sTeleportProgressMessages;
 
 	LLFrameTimer mDoubleTapRunTimer;
 	EDoubleTapRunMode mDoubleTapRunMode;
@@ -736,7 +743,7 @@ private:
 	// Access or "maturity" level
 	U8				mAccess;	// SIM_ACCESS_MATURE or SIM_ACCESS_PG
 	ETeleportState	mTeleportState;
-	LLString		mTeleportMessage;
+	std::string		mTeleportMessage;
 
 	S32				mControlsTakenCount[TOTAL_CONTROLS];
 	S32				mControlsTakenPassedOnCount[TOTAL_CONTROLS];
@@ -785,7 +792,9 @@ private:
 	LLVector3		mSitCameraPos;					// root relative camera pos when sitting
 	LLVector3		mSitCameraFocus;				// root relative camera target when sitting
 	LLVector3d      mCameraSmoothingLastPositionGlobal;    
-	LLVector3d      mCameraSmoothingLastPositionAgent;    
+	LLVector3d      mCameraSmoothingLastPositionAgent;
+	BOOL            mCameraSmoothingStop;
+
 	
 	//Ventrella
 	LLVector3		mCameraUpVector;				// camera's up direction in world coordinates (determines the 'roll' of the view)
diff --git a/linden/indra/newview/llagentlanguage.cpp b/linden/indra/newview/llagentlanguage.cpp
new file mode 100644
index 0000000..5656f76
--- /dev/null
+++ b/linden/indra/newview/llagentlanguage.cpp
@@ -0,0 +1,65 @@
+/**
+ * @file llagentlanguage.cpp
+ * @brief Transmit language information to server
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
+ * Copyright (c) 2006-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llagentlanguage.h"
+#include "llagent.h"
+#include "llviewercontrol.h"
+#include "llviewerregion.h"
+
+LLAgentLanguage::LLAgentLanguage()
+{
+	gSavedSettings.getControl("Language")->getSignal()->connect(boost::bind(&update));
+	gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&update));
+	gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update));
+}
+
+
+// send language settings to the sim
+// static
+bool LLAgentLanguage::update()
+{
+	LLSD body;
+	std::string url = gAgent.getRegion()->getCapability("UpdateAgentLanguage");
+	if (!url.empty())
+	{
+		std::string language = gSavedSettings.getString("Language");
+		if (language == "default")
+			language = gSavedSettings.getString("SystemLanguage");
+		
+		body["language"] = language;
+		body["language_is_public"] = gSavedSettings.getBOOL("LanguageIsPublic");
+		
+		LLHTTPClient::post(url, body, new LLHTTPClient::Responder);
+	}
+    return true;
+}
+
diff --git a/linden/indra/newview/llagentlanguage.h b/linden/indra/newview/llagentlanguage.h
new file mode 100644
index 0000000..d86a8f1
--- /dev/null
+++ b/linden/indra/newview/llagentlanguage.h
@@ -0,0 +1,45 @@
+/**
+ * @file llagentlanguage.h
+ * @brief Transmit language information to server
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
+ * Copyright (c) 2006-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLAGENTLANGUAGE_H
+#define LL_LLAGENTLANGUAGE_H
+
+#include "llmemory.h"
+#include "llevent.h"
+
+class LLAgentLanguage: public LLSingleton<LLAgentLanguage>, public LLSimpleListener
+{
+ public:
+	LLAgentLanguage();
+	static bool update();
+};
+
+#endif // LL_LLAGENTLANGUAGE_H
diff --git a/linden/indra/newview/llagentpilot.cpp b/linden/indra/newview/llagentpilot.cpp
index b4a1d86..f2a1903 100644
--- a/linden/indra/newview/llagentpilot.cpp
+++ b/linden/indra/newview/llagentpilot.cpp
@@ -45,22 +45,28 @@ LLAgentPilot gAgentPilot;
 
 BOOL LLAgentPilot::sLoop = TRUE;
 
-LLAgentPilot::LLAgentPilot()
+LLAgentPilot::LLAgentPilot() :
+	mNumRuns(-1),
+	mQuitAfterRuns(FALSE),
+	mRecording(FALSE),
+	mLastRecordTime(0.f),
+	mStarted(FALSE),
+	mPlaying(FALSE),
+	mCurrentAction(0)
 {
-	mRecording = FALSE;
-	mPlaying = FALSE;
-	mStarted = FALSE;
-	mNumRuns = -1;
 }
 
 LLAgentPilot::~LLAgentPilot()
 {
 }
 
-void LLAgentPilot::load(const char *filename)
+void LLAgentPilot::load(const std::string& filename)
 {
-	if(!filename) return;
-
+	if(filename.empty())
+	{
+		return;
+	}
+	
 	llifstream file(filename);
 
 	if (!file)
@@ -78,8 +84,7 @@ void LLAgentPilot::load(const char *filename)
 
 	file >> num_actions;
 
-	S32 i;
-	for (i = 0; i < num_actions; i++)
+	for (S32 i = 0; i < num_actions; i++)
 	{
 		S32 action_type;
 		Action new_action;
@@ -92,10 +97,10 @@ void LLAgentPilot::load(const char *filename)
 	file.close();
 }
 
-void LLAgentPilot::save(const char *filename)
+void LLAgentPilot::save(const std::string& filename)
 {
 	llofstream file;
-	file.open(filename);			/*Flawfinder: ignore*/
+	file.open(filename);
 
 	if (!file)
 	{
@@ -125,7 +130,7 @@ void LLAgentPilot::startRecord()
 void LLAgentPilot::stopRecord()
 {
 	gAgentPilot.addAction(STRAIGHT);
-	gAgentPilot.save(gSavedSettings.getString("StatsPilotFile").c_str());
+	gAgentPilot.save(gSavedSettings.getString("StatsPilotFile"));
 	mRecording = FALSE;
 }
 
diff --git a/linden/indra/newview/llagentpilot.h b/linden/indra/newview/llagentpilot.h
index 97656b4..a1da4c2 100644
--- a/linden/indra/newview/llagentpilot.h
+++ b/linden/indra/newview/llagentpilot.h
@@ -51,8 +51,8 @@ public:
 	LLAgentPilot();
 	virtual ~LLAgentPilot();
 
-	void load(const char *filename);
-	void save(const char *filename);
+	void load(const std::string& filename);
+	void save(const std::string& filename);
 
 	void startRecord();
 	void stopRecord();
diff --git a/linden/indra/newview/llanimstatelabels.cpp b/linden/indra/newview/llanimstatelabels.cpp
index c51740f..3e78c33 100644
--- a/linden/indra/newview/llanimstatelabels.cpp
+++ b/linden/indra/newview/llanimstatelabels.cpp
@@ -33,7 +33,7 @@
 #include "llanimstatelabels.h"
 #include "lltrans.h"
 
-std::string LLAnimStateLabels::getStateLabel( const char *animName )
+std::string LLAnimStateLabels::getStateLabel( const char* animName )
 {
-	return LLTrans::getString("anim_" + LLString(animName) );
+	return LLTrans::getString(std::string("anim_") + std::string(animName) );
 }
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 6e8528c..6a53300 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -37,6 +37,7 @@
 #include "llversionviewer.h"
 #include "llfeaturemanager.h"
 #include "lluictrlfactory.h"
+#include "lltexteditor.h"
 #include "llalertdialog.h"
 #include "llerrorcontrol.h"
 #include "llviewerimagelist.h"
@@ -115,6 +116,7 @@
 #include "llcontainerview.h"
 #include "llfloaterstats.h"
 #include "llhoverview.h"
+#include "llfloatermemleak.h"
 
 #include "llsdserialize.h"
 
@@ -198,7 +200,6 @@ extern void init_apple_menu(const char* product);
 extern OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
 extern OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
 extern OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata);
-extern OSStatus DisplayReleaseNotes(void);
 #include <boost/tokenizer.hpp>
 #endif // LL_DARWIN
 
@@ -216,13 +217,13 @@ const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user fl
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
 F32 gSimFrames;
 
-LLString gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle_startup
+std::string gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle_startup
 
 BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
 
-BOOL				gAllowIdleAFK = TRUE;
-BOOL				gAllowTapTapHoldRun = TRUE;
-BOOL				gShowObjectUpdates = FALSE;
+BOOL gAllowIdleAFK = TRUE;
+BOOL gAllowTapTapHoldRun = TRUE;
+BOOL gShowObjectUpdates = FALSE;
 BOOL gUseQuickTime = TRUE;
 
 BOOL gAcceptTOS = FALSE;
@@ -234,22 +235,24 @@ LLSD gDebugInfo;
 
 U32	gFrameCount = 0;
 U32 gForegroundFrameCount = 0; // number of frames that app window was in foreground
-LLPumpIO*			gServicePump = NULL;
+LLPumpIO* gServicePump = NULL;
 
 BOOL gPacificDaylightTime = FALSE;
 
 U64 gFrameTime = 0;
 F32 gFrameTimeSeconds = 0.f;
 F32 gFrameIntervalSeconds = 0.f;
-F32		gFPSClamped = 10.f;						// Pretend we start at target rate.
-F32		gFrameDTClamped = 0.f;					// Time between adjacent checks to network for packets
+F32 gFPSClamped = 10.f;						// Pretend we start at target rate.
+F32 gFrameDTClamped = 0.f;					// Time between adjacent checks to network for packets
 U64	gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds
+U32 gFrameStalls = 0;
+const F64 FRAME_STALL_THRESHOLD = 5.0;
 
 LLTimer gRenderStartTime;
 LLFrameTimer gForegroundTime;
-LLTimer				gLogoutTimer;
-static const F32			LOGOUT_REQUEST_TIME = 6.f;  // this will be cut short by the LogoutReply msg.
-F32					gLogoutMaxTime = LOGOUT_REQUEST_TIME;
+LLTimer gLogoutTimer;
+static const F32 LOGOUT_REQUEST_TIME = 6.f;  // this will be cut short by the LogoutReply msg.
+F32 gLogoutMaxTime = LOGOUT_REQUEST_TIME;
 
 LLUUID gInventoryLibraryOwner;
 LLUUID gInventoryLibraryRoot;
@@ -271,7 +274,7 @@ LLVFS* gStaticVFS = NULL;
 LLMemoryInfo gSysMemory;
 U64 gMemoryAllocated = 0; // updated in display_stats() in llviewerdisplay.cpp
 
-LLString gLastVersionChannel;
+std::string gLastVersionChannel;
 
 LLVector3			gWindVec(3.0, 3.0, 0.0);
 LLVector3			gRelativeWindVec(0.0, 0.0, 0.0);
@@ -289,22 +292,22 @@ BOOL gLogoutInProgress = FALSE;
 
 ////////////////////////////////////////////////////////////
 // Internal globals... that should be removed.
-static LLString gArgs;
+static std::string gArgs;
 
-const char* MARKER_FILE_NAME = "SecondLife.exec_marker";
-const char* ERROR_MARKER_FILE_NAME = "SecondLife.error_marker";
-const char* LLERROR_MARKER_FILE_NAME = "SecondLife.llerror_marker";
-const char* LOGOUT_MARKER_FILE_NAME = "SecondLife.logout_marker";
+const std::string MARKER_FILE_NAME("SecondLife.exec_marker");
+const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker");
+const std::string LLERROR_MARKER_FILE_NAME("SecondLife.llerror_marker");
+const std::string LOGOUT_MARKER_FILE_NAME("SecondLife.logout_marker");
 static BOOL gDoDisconnect = FALSE;
-static LLString gLaunchFileOnQuit;
+static std::string gLaunchFileOnQuit;
 
 //----------------------------------------------------------------------------
 // File scope definitons
 const char *VFS_DATA_FILE_BASE = "data.db2.x.";
 const char *VFS_INDEX_FILE_BASE = "index.db2.x.";
 
-static LLString gSecondLife;
-static LLString gWindowTitle;
+static std::string gSecondLife;
+static std::string gWindowTitle;
 #ifdef LL_WINDOWS
 	static char sWindowClass[] = "Second Life";
 #endif
@@ -322,48 +325,6 @@ void idle_afk_check()
 	}
 }
 
-//this function checks if the system can allocate (num_chunk)MB memory successfully.
-//if this check fails, the allocated memory is NOT freed.
-void idle_mem_check(S32 num_chunk)
-{
-	//this flag signals if memory allocation check is necessary
-	static BOOL check = TRUE ;
-
-	if(!check) //if memory check fails before, do not repeat it.
-	{
-		return ;
-	}
-	check = FALSE ; //before memory check for this frame, turn off check signal for the next frame. 
-
-	S32 i = 0 ;
-	char**p = new char*[num_chunk] ;
-	if(!p)
-	{
-		return ;
-	}
-	for(i = 0 ; i < num_chunk ; i++)
-	{
-		//1MB per chunk
-		//if the allocation fails, the system should catch it.
-		p[i] = new char[1024 * 1024] ;
-
-		if(!p[i]) //in case that system try-catch is turned off
-		{
-			return ;
-		}
-	}
-
-	//release memory if the allocation check does not fail.
-	for(i = 0 ; i < num_chunk ; i++)
-	{
-		delete[] p[i] ;	
-	}
-	delete[] p ;
-
-	//memory check for this frame succeeds, turn on next frame check.
-	check = TRUE ;
-}
-
 // A callback set in LLAppViewer::init()
 static void ui_audio_callback(const LLUUID& uuid)
 {
@@ -408,7 +369,7 @@ bool handleCrashSubmitBehaviorChanged(const LLSD& newvalue)
 	else if(gSavedSettings.getBOOL("WatchdogEnabled") == TRUE)
 	{
 		// Don't re-enable the watchdog when we change the setting; this may get called before it's started
-// 		LLWatchdog::getInstance()->init();		
+// 		LLWatchdog::getInstance()->init();
 	}
 	return true;
 }
@@ -459,6 +420,8 @@ static void settings_to_globals()
 	gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
 	gHandleKeysAsync = gSavedSettings.getBOOL("AsyncKeyboard");
 	LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
+
+	LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
 }
 
 static void settings_modify()
@@ -527,7 +490,7 @@ void LLAppViewer::initGridChoice()
 		server = llclamp(server, 0,	(S32)GRID_INFO_COUNT - 1);
 		if(server == GRID_INFO_OTHER)
 		{
-			LLString custom_server = gSavedSettings.getString("CustomServer");
+			std::string custom_server = gSavedSettings.getString("CustomServer");
 			LLViewerLogin::getInstance()->setGridChoice(custom_server);
 		}
 		else if(server != (S32)GRID_INFO_NONE)
@@ -590,7 +553,8 @@ LLAppViewer::LLAppViewer() :
 	mQuitRequested(false),
 	mLogoutRequestSent(false),
 	mYieldTime(-1),
-	mMainloopTimeout(NULL)
+	mMainloopTimeout(NULL),
+	mAgentRegionLastAlive(false)
 {
 	if(NULL != sInstance)
 	{
@@ -656,13 +620,15 @@ bool LLAppViewer::init()
 	// *FIX: The following code isn't grouped into functions yet.
 
 	//
-	// Various introspection concerning the libs we're using.
+	// Various introspection concerning the libs we're using - particularly
+        // the libs involved in getting to a full login screen.
 	//
-	LL_DEBUGS("InitInfo") << "J2C Engine is: " << LLImageJ2C::getEngineInfo() << LL_ENDL;
+	LL_INFOS("InitInfo") << "J2C Engine is: " << LLImageJ2C::getEngineInfo() << LL_ENDL;
+	LL_INFOS("InitInfo") << "libcurl version is: " << LLCurl::getVersionString() << LL_ENDL;
 
 	// Get the single value from the crash settings file, if it exists
 	std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
-	gCrashSettings.loadFromFile(crash_settings_filename.c_str());
+	gCrashSettings.loadFromFile(crash_settings_filename);
 
 	/////////////////////////////////////////////////
 	// OS-specific login dialogs
@@ -702,14 +668,14 @@ bool LLAppViewer::init()
 	}
 	
 	// Load art UUID information, don't require these strings to be declared in code.
-	LLString colors_base_filename = gDirUtilp->findSkinnedFilename("colors_base.xml");
+	std::string colors_base_filename = gDirUtilp->findSkinnedFilename("colors_base.xml");
 	LL_DEBUGS("InitInfo") << "Loading base colors from " << colors_base_filename << LL_ENDL;
-	gColors.loadFromFileLegacy(colors_base_filename.c_str(), FALSE, TYPE_COL4U);
+	gColors.loadFromFileLegacy(colors_base_filename, FALSE, TYPE_COL4U);
 
 	// Load overrides from user colors file
-	LLString user_colors_filename = gDirUtilp->findSkinnedFilename("colors.xml");
+	std::string user_colors_filename = gDirUtilp->findSkinnedFilename("colors.xml");
 	LL_DEBUGS("InitInfo") << "Loading user colors from " << user_colors_filename << LL_ENDL;
-	if (gColors.loadFromFileLegacy(user_colors_filename.c_str(), FALSE, TYPE_COL4U) == 0)
+	if (gColors.loadFromFileLegacy(user_colors_filename, FALSE, TYPE_COL4U) == 0)
 	{
 		LL_DEBUGS("InitInfo") << "Cannot load user colors from " << user_colors_filename << LL_ENDL;
 	}
@@ -722,6 +688,10 @@ bool LLAppViewer::init()
 					&LLUI::sGLScaleFactor);
 
 	LLWeb::initClass();			  // do this after LLUI
+	LLTextEditor::setURLCallbacks(&LLWeb::loadURL,
+				&LLURLDispatcher::dispatchFromTextEditor,
+				&LLURLDispatcher::dispatchFromTextEditor);
+
 	LLUICtrlFactory::getInstance()->setupPaths(); // update paths with correct language set
 	
 	/////////////////////////////////////////////////
@@ -736,7 +706,7 @@ bool LLAppViewer::init()
 	LLViewerJointMesh::updateVectorize();
 
 	// load MIME type -> media impl mappings
-	LLMIMETypes::parseMIMETypes( "mime_types.xml" ); 
+	LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
 
 
 	// Copy settings to globals. *TODO: Remove or move to appropriage class initializers
@@ -783,8 +753,8 @@ bool LLAppViewer::init()
 			"If it continues to persist, you may need to completely uninstall " <<
 			gSecondLife << " and reinstall it.";
 		OSMessageBox(
-			msg.str().c_str(),
-			NULL,
+			msg.str(),
+			LLStringUtil::null,
 			OSMB_OK);
 		return 1;
 	}
@@ -794,12 +764,12 @@ bool LLAppViewer::init()
 	//
 	initWindow();
 
-	#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 		// start up an LCD window on a logitech keyboard, if there is one
 		HINSTANCE hInstance = GetModuleHandle(NULL);
 		gLcdScreen = new LLLCD(hInstance);
 		CreateLCDDebugWindows();
-	#endif
+#endif
 
 	gGLManager.getGLInfo(gDebugInfo);
 	gGLManager.printGLInfoString();
@@ -808,12 +778,12 @@ bool LLAppViewer::init()
 	bind_keyboard_functions();
 
 	// Load Default bindings
-	if (!gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keys.ini").c_str()))
+	if (!gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keys.ini")))
 	{
 		LL_ERRS("InitInfo") << "Unable to open keys.ini" << LL_ENDL;
 	}
 	// Load Custom bindings (override defaults)
-	gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"custom_keys.ini").c_str());
+	gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"custom_keys.ini"));
 
 	// If we don't have the right GL requirements, exit.
 	if (!gGLManager.mHasRequirements && !gNoRender)
@@ -821,16 +791,16 @@ bool LLAppViewer::init()
 		// can't use an alert here since we're existing and
 		// all hell breaks lose.
 		OSMessageBox(
-			LLAlertDialog::getTemplateMessage("UnsupportedGLRequirements").c_str(),
-			NULL,
+			LLAlertDialog::getTemplateMessage("UnsupportedGLRequirements"),
+			LLStringUtil::null,
 			OSMB_OK);
 		return 0;
 	}
 
 
 	bool unsupported = false;
-	LLString::format_map_t args;
-	LLString minSpecs;
+	LLStringUtil::format_map_t args;
+	std::string minSpecs;
 		
 	// get cpu data from xml
 	std::stringstream minCPUString(LLAlertDialog::getTemplateMessage("UnsupportedCPUAmount"));
@@ -891,6 +861,9 @@ bool LLAppViewer::init()
 
 bool LLAppViewer::mainLoop()
 {
+	mMainloopTimeout = new LLWatchdogTimeout();
+	// *FIX:Mani - Make this a setting, once new settings exist in this branch.
+	
 	//-------------------------------------------
 	// Run main loop until time to quit
 	//-------------------------------------------
@@ -939,10 +912,13 @@ bool LLAppViewer::mainLoop()
 			{
 				debugTime.reset();
 			}
+			
 #endif
-
-			//at the beginning of every frame, check if the system can successfully allocate 10 * 1 MB memory.
-			idle_mem_check(10) ;
+			//memory leaking simulation
+			if(LLFloaterMemLeak::getInstance())
+			{
+				LLFloaterMemLeak::getInstance()->idle() ;				
+			}			
 
 			if (!LLApp::isExiting())
 			{
@@ -962,20 +938,23 @@ bool LLAppViewer::mainLoop()
 					gKeyboard->scanKeyboard();
 				}
 
-				pingMainloopTimeout("Main:Messages");
-				
 				// Update state based on messages, user input, object idle.
 				{
+					pauseMainloopTimeout(); // *TODO: Remove. Messages shouldn't be stalling for 20+ seconds!
+					
 					LLFastTimer t3(LLFastTimer::FTM_IDLE);
 					idle();
 
 					{
+						pingMainloopTimeout("Main:ServicePump");				
 						LLFastTimer t4(LLFastTimer::FTM_PUMP);
 						gAres->process();
 						// this pump is necessary to make the login screen show up
 						gServicePump->pump();
 						gServicePump->callback();
 					}
+					
+					resumeMainloopTimeout();
 				}
 
 				if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED))
@@ -995,7 +974,7 @@ bool LLAppViewer::mainLoop()
 					pingMainloopTimeout("Main:Snapshot");
 					LLFloaterSnapshot::update(); // take snapshots
 					
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 					// update LCD Screen
 					pingMainloopTimeout("Main:LCD");
 					gLcdScreen->UpdateDisplay();
@@ -1077,6 +1056,11 @@ bool LLAppViewer::mainLoop()
 						break;
 					}
 				}
+				if ((LLStartUp::getStartupState() >= STATE_CLEANUP) &&
+					(frameTimer.getElapsedTimeF64() > FRAME_STALL_THRESHOLD))
+				{
+					gFrameStalls++;
+				}
 				frameTimer.reset();
 
 				 // Prevent the worker threads from running while rendering.
@@ -1099,6 +1083,12 @@ bool LLAppViewer::mainLoop()
 		catch(std::bad_alloc)
 		{
 			llwarns << "Bad memory allocation in LLAppViewer::mainLoop()!" << llendl ;
+
+			//stop memory leaking simulation
+			if(LLFloaterMemLeak::getInstance())
+			{
+				LLFloaterMemLeak::getInstance()->stop() ;				
+			}	
 		}
 	}
 
@@ -1112,6 +1102,12 @@ bool LLAppViewer::mainLoop()
 		catch(std::bad_alloc)
 		{
 			llwarns << "Bad memory allocation when saveFinalSnapshot() is called!" << llendl ;
+
+			//stop memory leaking simulation
+			if(LLFloaterMemLeak::getInstance())
+			{
+				LLFloaterMemLeak::getInstance()->stop() ;				
+			}	
 		}
 	}
 	
@@ -1227,8 +1223,18 @@ bool LLAppViewer::cleanup()
 		ms_sleep(100);
 	}
 	llinfos << "Shutting down." << llendflush;
+
+	// Destroy the UI
+	gViewerWindow->shutdownViews();
+
+	// Clean up selection managers after UI is destroyed, as UI may be observing them.
+	// Clean up before GL is shut down because we might be holding on to objects with texture references
+	LLSelectMgr::cleanupGlobals();
+
+	// Shut down OpenGL
+	gViewerWindow->shutdownGL();
 	
-	// Destroy Windows(R) window, and make sure we're not fullscreen
+	// Destroy window, and make sure we're not fullscreen
 	// This may generate window reshape and activation events.
 	// Therefore must do this before destroying the message system.
 	delete gViewerWindow;
@@ -1239,10 +1245,6 @@ bool LLAppViewer::cleanup()
 	delete gKeyboard;
 	gKeyboard = NULL;
 
-	// Clean up selection managers after UI is destroyed, as UI
-	// may be observing them.
-	LLSelectMgr::cleanupGlobals();
-
 	LLViewerObject::cleanupVOClasses();
 
 	LLWaterParamManager::cleanupClass();
@@ -1258,7 +1260,7 @@ bool LLAppViewer::cleanup()
 	//	gDXHardware.cleanup();
 	//#endif // LL_WINDOWS
 
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 	// shut down the LCD window on a logitech keyboard, if there is one
 	delete gLcdScreen;
 	gLcdScreen = NULL;
@@ -1287,6 +1289,7 @@ bool LLAppViewer::cleanup()
 	// Shut down the VFS's AFTER the decode manager cleans up (since it cleans up vfiles).
 	// Also after viewerwindow is deleted, since it may have image pointers (which have vfiles)
 	// Also after shutting down the messaging system since it has VFS dependencies
+
 	//
 	LLVFile::cleanupClass();
 	llinfos << "VFS cleaned up" << llendflush;
@@ -1305,7 +1308,7 @@ bool LLAppViewer::cleanup()
 
 	std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
 	// save all settings, even if equals defaults
-	gCrashSettings.saveToFile(crash_settings_filename.c_str(), FALSE);
+	gCrashSettings.saveToFile(crash_settings_filename, FALSE);
 
 	gSavedSettings.cleanup();
 	gColors.cleanup();
@@ -1320,9 +1323,8 @@ bool LLAppViewer::cleanup()
 	if (mPurgeOnExit)
 	{
 		llinfos << "Purging all cache files on exit" << llendflush;
-		char mask[LL_MAX_PATH];		/* Flawfinder: ignore */
-		snprintf(mask, LL_MAX_PATH, "%s*.*", gDirUtilp->getDirDelimiter().c_str());		/* Flawfinder: ignore */
-		gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(),mask);
+		std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
+		gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""),mask);
 	}
 
 	removeMarkerFile(); // Any crashes from here on we'll just have to ignore
@@ -1443,7 +1445,7 @@ bool LLAppViewer::initThreads()
 void errorCallback(const std::string &error_string)
 {
 #ifndef LL_RELEASE_FOR_DOWNLOAD
-	OSMessageBox(error_string.c_str(), "Fatal Error", OSMB_OK);
+	OSMessageBox(error_string, "Fatal Error", OSMB_OK);
 #endif
 
 	//Set the ErrorActivated global so we know to create a marker file
@@ -1464,12 +1466,12 @@ bool LLAppViewer::initLogging()
 	// Remove the last ".old" log file.
 	std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
 							     "SecondLife.old");
-	LLFile::remove(old_log_file.c_str());
+	LLFile::remove(old_log_file);
 
 	// Rename current log file to ".old"
 	std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
 							     "SecondLife.log");
-	LLFile::rename(log_file.c_str(), old_log_file.c_str());
+	LLFile::rename(log_file, old_log_file);
 
 	// Set the log file to SecondLife.log
 
@@ -1483,10 +1485,10 @@ void LLAppViewer::loadSettingsFromDirectory(ELLPath path_index, bool set_default
 {	
 	for(LLSD::map_iterator itr = mSettingsFileList.beginMap(); itr != mSettingsFileList.endMap(); ++itr)
 	{
-		LLString settings_name = (*itr).first;
-		LLString settings_file = mSettingsFileList[settings_name].asString();
+		std::string settings_name = (*itr).first;
+		std::string settings_file = mSettingsFileList[settings_name].asString();
 
-		LLString full_settings_path = gDirUtilp->getExpandedFilename(path_index, settings_file);
+		std::string full_settings_path = gDirUtilp->getExpandedFilename(path_index, settings_file);
 
 		if(settings_name == sGlobalSettingsName 
 			&& path_index == LL_PATH_USER_SETTINGS)
@@ -1658,8 +1660,8 @@ bool LLAppViewer::initConfiguration()
 			<< "Error: " << clp.getErrorMessage();
 
 		OSMessageBox(
-			msg.str().c_str(),
-			NULL,
+			msg.str(),
+			LLStringUtil::null,
 			OSMB_OK);
 
 		return false;
@@ -1827,7 +1829,7 @@ bool LLAppViewer::initConfiguration()
     }
 
     const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent");
-    if(skinfolder && LLString::null != skinfolder->getValue().asString())
+    if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
     {   
         gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
     }
@@ -1878,8 +1880,8 @@ bool LLAppViewer::initConfiguration()
 		std::ostringstream msg;
 		msg << gSecondLife << " requires a processor with AltiVec (G4 or later).";
 		OSMessageBox(
-			msg.str().c_str(),
-			NULL,
+			msg.str(),
+			LLStringUtil::null,
 			OSMB_OK);
 		removeMarkerFile();
 		return false;
@@ -1893,14 +1895,14 @@ bool LLAppViewer::initConfiguration()
 	std::ostringstream splash_msg;
 	splash_msg << "Loading " << gSecondLife << "...";
 	LLSplashScreen::show();
-	LLSplashScreen::update(splash_msg.str().c_str());
+	LLSplashScreen::update(splash_msg.str());
 
 	//LLVolumeMgr::initClass();
 	LLVolumeMgr* volume_manager = new LLVolumeMgr();
 	volume_manager->useMutex();	// LLApp and LLMutex magic must be manually enabled
 	LLPrimitive::setVolumeManager(volume_manager);
 
-	// Note: this is where we used to initialize LLFeatureManager::getInstance()->.
+	// Note: this is where we used to initialize gFeatureManagerp.
 
 	gStartTime = totalTime();
 
@@ -1910,11 +1912,11 @@ bool LLAppViewer::initConfiguration()
 #if LL_RELEASE_FOR_DOWNLOAD
 	gWindowTitle = gSecondLife;
 #elif LL_DEBUG
-	gWindowTitle = gSecondLife + LLString(" [DEBUG] ") + gArgs;
+	gWindowTitle = gSecondLife + std::string(" [DEBUG] ") + gArgs;
 #else
-	gWindowTitle = gSecondLife + LLString(" ") + gArgs;
+	gWindowTitle = gSecondLife + std::string(" ") + gArgs;
 #endif
-	LLString::truncate(gWindowTitle, 255);
+	LLStringUtil::truncate(gWindowTitle, 255);
 
 	//RN: if we received a URL, hand it off to the existing instance
 	// don't call anotherInstanceRunning() when doing URL handoff, as
@@ -1955,8 +1957,8 @@ bool LLAppViewer::initConfiguration()
 				"Check your task bar for a minimized copy of the program.\n"
 				"If this message persists, restart your computer.",
 			OSMessageBox(
-				msg.str().c_str(),
-				NULL,
+				msg.str(),
+				LLStringUtil::null,
 				OSMB_OK);
 			return false;
 		}
@@ -1977,9 +1979,9 @@ bool LLAppViewer::initConfiguration()
 			std::string alert;
 			alert = gSecondLife;
 			alert += " Alert";
-			S32 choice = OSMessageBox(msg.str().c_str(),
-				alert.c_str(),
-				OSMB_YESNO);
+			S32 choice = OSMessageBox(msg.str(),
+									  alert,
+									  OSMB_YESNO);
 			if (OSBTN_YES == choice)
 			{
 				llinfos << "Sending crash report." << llendl;
@@ -1995,7 +1997,7 @@ bool LLAppViewer::initConfiguration()
 				_spawnl(_P_WAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
 #elif LL_DARWIN
 				std::string command_str;
-				command_str = "crashreporter.app/Contents/MacOS/crashreporter ";
+				command_str = "mac-crash-logger.app/Contents/MacOS/mac-crash-logger ";
 				command_str += "-previous";
 				// XXX -- We need to exit fullscreen mode for this to work.
 				// XXX -- system() also doesn't wait for completion.  Hmm...
@@ -2007,11 +2009,12 @@ bool LLAppViewer::initConfiguration()
 				cmd += "linux-crash-logger.bin";
 #else // LL_SOLARIS
 				cmd += "bin/solaris-crash-logger";
-#endif
+#endif // LL_LINUX
 				char* const cmdargv[] =
 					{(char*)cmd.c_str(),
 					 (char*)"-previous",
 					 NULL};
+				fflush(NULL); // flush all buffers before the child inherits them
 				pid_t pid = fork();
 				if (pid == 0)
 				{ // child
@@ -2057,10 +2060,10 @@ bool LLAppViewer::initConfiguration()
 	}
 
    	// need to do this here - need to have initialized global settings first
-	LLString nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
+	std::string nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
 	if ( nextLoginLocation.length() )
 	{
-		LLURLSimString::setString( nextLoginLocation.c_str() );
+		LLURLSimString::setString( nextLoginLocation );
 	};
 
 	gLastRunVersion = gSavedSettings.getString("LastRunVersion");
@@ -2078,14 +2081,9 @@ bool LLAppViewer::initWindow()
 	// Hide the splash screen
 	LLSplashScreen::hide();
 
-	// HACK: Need a non-const char * for stupid window name (propagated deep down)
-	char window_title_str[256];		/* Flawfinder: ignore */
-	strncpy(window_title_str, gWindowTitle.c_str(), sizeof(window_title_str) - 1);		/* Flawfinder: ignore */
-	window_title_str[sizeof(window_title_str) - 1] = '\0';
-
 	// always start windowed
 	BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
-	gViewerWindow = new LLViewerWindow(window_title_str, "Second Life",
+	gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life",
 		gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
 		gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
 		FALSE, ignorePixelDepth);
@@ -2149,7 +2147,7 @@ void LLAppViewer::writeDebugInfo()
 {
 	std::string debug_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"debug_info.log");
 	llinfos << "Opening debug file " << debug_filename << llendl;
-	std::ofstream out_file(debug_filename.c_str());
+	llofstream out_file(debug_filename);
 	LLSDSerialize::toPrettyXML(gDebugInfo, out_file);
 	out_file.close();
 }
@@ -2208,11 +2206,10 @@ void LLAppViewer::cleanupSavedSettings()
 	}
 }
 
-void LLAppViewer::removeCacheFiles(const char* file_mask)
+void LLAppViewer::removeCacheFiles(const std::string& file_mask)
 {
-	char mask[LL_MAX_PATH];		/* Flawfinder: ignore */
-	snprintf(mask, LL_MAX_PATH, "%s%s", gDirUtilp->getDirDelimiter().c_str(), file_mask);		/* Flawfinder: ignore */
-	gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "").c_str(), mask);
+	std::string mask = gDirUtilp->getDirDelimiter() + file_mask;
+	gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), mask);
 }
 
 void LLAppViewer::writeSystemInfo()
@@ -2237,7 +2234,7 @@ void LLAppViewer::writeSystemInfo()
 	gDebugInfo["RAMInfo"]["Physical"] = (LLSD::Integer)(gSysMemory.getPhysicalMemoryKB());
 	gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer)(gMemoryAllocated>>10); // MB -> KB
 	gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple();
-
+		
 	// The user is not logged on yet, but record the current grid choice login url
 	// which may have been the intended grid. This can b
 	gDebugInfo["GridName"] = LLViewerLogin::getInstance()->getGridLabel();
@@ -2320,8 +2317,8 @@ void LLAppViewer::handleViewerCrash()
 	
 	gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
 	gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
-	gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName().c_str();
-	gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath().c_str();
+	gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
+	gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
 	if(gLogoutInProgress)
 	{
 		gDebugInfo["LastExecEvent"] = LAST_EXEC_LOGOUT_CRASH;
@@ -2348,7 +2345,7 @@ void LLAppViewer::handleViewerCrash()
 	//we're already in a crash situation	
 	if (gDirUtilp)
 	{
-		LLString crash_file_name;
+		std::string crash_file_name;
 		if(gLLErrorActivated) crash_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,LLERROR_MARKER_FILE_NAME);
 		else crash_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,ERROR_MARKER_FILE_NAME);
 		llinfos << "Creating crash marker file " << crash_file_name << llendl;
@@ -2368,7 +2365,7 @@ void LLAppViewer::handleViewerCrash()
 	{
 		std::string filename;
 		filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "stats.log");
-		llofstream file(filename.c_str(), llofstream::binary);
+		llofstream file(filename, llofstream::binary);
 		if(file.good())
 		{
 			llinfos << "Handle viewer crash generating stats log." << llendl;
@@ -2457,9 +2454,9 @@ void LLAppViewer::initMarkerFile()
 	// These checks should also remove these files for the last 2 cases if they currently exist
 
 	//LLError/Error checks. Only one of these should ever happen at a time.
-	LLString logout_marker_file =  gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LOGOUT_MARKER_FILE_NAME);
-	LLString llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME);
-	LLString error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
+	std::string logout_marker_file =  gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LOGOUT_MARKER_FILE_NAME);
+	std::string llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME);
+	std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
 
 	apr_file_t* fMarker = ll_apr_file_open(logout_marker_file, LL_APR_RB);
 	if(fMarker != NULL)
@@ -2594,11 +2591,11 @@ static void finish_early_exit(S32 option, void* userdata)
 	LLAppViewer::instance()->forceQuit();
 }
 
-void LLAppViewer::earlyExit(const LLString& msg)
+void LLAppViewer::earlyExit(const std::string& msg)
 {
    	llwarns << "app_early_exit: " << msg << llendl;
 	gDoDisconnect = TRUE;
-// 	LLStringBase<char>::format_map_t args;
+// 	LLStringUtil::format_map_t args;
 // 	args["[MESSAGE]"] = mesg;
 // 	gViewerWindow->alertXml("AppEarlyExit", args, finish_early_exit);
 	LLAlertDialog::showCritical(msg, finish_early_exit, NULL);
@@ -2639,9 +2636,41 @@ bool LLAppViewer::initCache()
 		}
 	}
 	
+	// Delete old cache directory
+#ifdef LL_DARWIN
+	if (LL_VERSION_MAJOR >= 1 && LL_VERSION_MINOR >= 21)
+	{
+		if (gLastRunVersion != gCurrentVersion)
+		{
+			// NOTE: (Nyx) as of 1.21, cache for mac is moving to /library/caches/SecondLife from
+			// /library/application support/SecondLife/cache This should clear/delete the old dir.
+			std::string cache_dir = gDirUtilp->getOSUserAppDir();
+			std::string new_cache_dir = gDirUtilp->getOSCacheDir();
+			cache_dir = cache_dir + "/cache";
+			new_cache_dir = new_cache_dir + "/" + gSecondLife;
+			if (gDirUtilp->fileExists(cache_dir))
+			{
+				gDirUtilp->setCacheDir(cache_dir);
+				purgeCache();
+				gDirUtilp->setCacheDir(new_cache_dir);
+
+				std::string ds_store = cache_dir + "/.DS_Store";
+				if (gDirUtilp->fileExists(ds_store.c_str()))
+				{
+					LLFile::remove(ds_store.c_str());
+				}
+				if (LLFile::remove(cache_dir.c_str()) != 0)
+				{
+					llwarns << "could not delete old cache directory" << llendl;
+				}
+			}
+		}
+	}
+#endif
+
 	// Setup and verify the cache location
-	LLString cache_location = gSavedSettings.getString("CacheLocation");
-	LLString new_cache_location = gSavedSettings.getString("NewCacheLocation");
+	std::string cache_location = gSavedSettings.getString("CacheLocation");
+	std::string new_cache_location = gSavedSettings.getString("NewCacheLocation");
 	if (new_cache_location != cache_location)
 	{
 		gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
@@ -2695,12 +2724,12 @@ bool LLAppViewer::initCache()
 	srand(time(NULL));		// Flawfinder: ignore
 	U32 old_salt = gSavedSettings.getU32("VFSSalt");
 	U32 new_salt;
-	char old_vfs_data_file[LL_MAX_PATH];		// Flawfinder: ignore
-	char old_vfs_index_file[LL_MAX_PATH];	// Flawfinder: ignore		
-	char new_vfs_data_file[LL_MAX_PATH];		// Flawfinder: ignore
-	char new_vfs_index_file[LL_MAX_PATH];	// Flawfinder: ignore
-	char static_vfs_index_file[LL_MAX_PATH];	// Flawfinder: ignore
-	char static_vfs_data_file[LL_MAX_PATH];	// Flawfinder: ignore
+	std::string old_vfs_data_file;
+	std::string old_vfs_index_file;
+	std::string new_vfs_data_file;
+	std::string new_vfs_index_file;
+	std::string static_vfs_index_file;
+	std::string static_vfs_data_file;
 
 	if (gSavedSettings.getBOOL("AllowMultipleViewers"))
 	{
@@ -2715,9 +2744,7 @@ bool LLAppViewer::initCache()
 		} while( new_salt == old_salt );
 	}
 
-	snprintf(old_vfs_data_file,  LL_MAX_PATH, "%s%u",		// Flawfinder: ignore
-		gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_DATA_FILE_BASE).c_str(),
-		old_salt);
+	old_vfs_data_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_DATA_FILE_BASE) + llformat("%u",old_salt);
 
 	// make sure this file exists
 	llstat s;
@@ -2736,29 +2763,18 @@ bool LLAppViewer::initCache()
 		std::string found_file;
 		if (gDirUtilp->getNextFileInDir(dir, mask, found_file, false))
 		{
-			snprintf(old_vfs_data_file, LL_MAX_PATH, "%s%s%s", dir.c_str(), gDirUtilp->getDirDelimiter().c_str(), found_file.c_str());		// Flawfinder: ignore
+			old_vfs_data_file = dir + gDirUtilp->getDirDelimiter() + found_file;
 
-			S32 start_pos;
-			S32 length = strlen(found_file.c_str());		/* Flawfinder: ignore*/
-			for (start_pos = length - 1; start_pos >= 0; start_pos--)
-			{
-				if (found_file[start_pos] == '.')
-				{
-					start_pos++;
-					break;
-				}
-			}
+			S32 start_pos = found_file.find_last_of('.');
 			if (start_pos > 0)
 			{
-				sscanf(found_file.c_str() + start_pos, "%d", &old_salt);
+				sscanf(found_file.substr(start_pos+1).c_str(), "%d", &old_salt);
 			}
 			LL_DEBUGS("AppCache") << "Default vfs data file not present, found: " << old_vfs_data_file << " Old salt: " << old_salt << llendl;
 		}
 	}
 
-	snprintf(old_vfs_index_file, LL_MAX_PATH, "%s%u",		// Flawfinder: ignore
-			gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_INDEX_FILE_BASE).c_str(),
-			old_salt);
+	old_vfs_index_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_INDEX_FILE_BASE) + llformat("%u",old_salt);
 
 	stat_result = LLFile::stat(old_vfs_index_file, &s);
 	if (stat_result)
@@ -2787,18 +2803,11 @@ bool LLAppViewer::initCache()
 		gDirUtilp->deleteFilesInDir(dir, mask);
 	}
 
-	snprintf(new_vfs_data_file, LL_MAX_PATH, "%s%u",		// Flawfinder: ignore
-		gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_DATA_FILE_BASE).c_str(),
-		new_salt);
+	new_vfs_data_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_DATA_FILE_BASE) + llformat("%u",new_salt);
+	new_vfs_index_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_INDEX_FILE_BASE) + llformat("%u",new_salt);
 
-	snprintf(new_vfs_index_file, LL_MAX_PATH, "%s%u", gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_INDEX_FILE_BASE).c_str(),		// Flawfinder: ignore
-		new_salt);
-
-
-	strncpy(static_vfs_data_file, gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_data.db2").c_str(), LL_MAX_PATH -1);		// Flawfinder: ignore
-	static_vfs_data_file[LL_MAX_PATH -1] = '\0';
-	strncpy(static_vfs_index_file, gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_index.db2").c_str(), LL_MAX_PATH -1);		// Flawfinder: ignore
-	static_vfs_index_file[LL_MAX_PATH -1] = '\0';
+	static_vfs_data_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_data.db2");
+	static_vfs_index_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_index.db2");
 
 	if (resize_vfs)
 	{
@@ -2849,15 +2858,15 @@ void LLAppViewer::purgeCache()
 	LL_INFOS("AppCache") << "Purging Cache and Texture Cache..." << llendl;
 	LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
 	std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
-	gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(),mask);
+	gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""),mask);
 }
 
-const LLString& LLAppViewer::getSecondLifeTitle() const
+const std::string& LLAppViewer::getSecondLifeTitle() const
 {
 	return gSecondLife;
 }
 
-const LLString& LLAppViewer::getWindowTitle() const 
+const std::string& LLAppViewer::getWindowTitle() const 
 {
 	return gWindowTitle;
 }
@@ -2878,7 +2887,7 @@ void finish_forced_disconnect(S32 /* option */, void* /* userdata */)
 }
 
 
-void LLAppViewer::forceDisconnect(const LLString& mesg)
+void LLAppViewer::forceDisconnect(const std::string& mesg)
 {
 	if (gDoDisconnect)
     {
@@ -2888,13 +2897,13 @@ void LLAppViewer::forceDisconnect(const LLString& mesg)
     }
 	
 	// Translate the message if possible
-	LLString big_reason = LLAgent::sTeleportErrorMessages[mesg];
+	std::string big_reason = LLAgent::sTeleportErrorMessages[mesg];
 	if ( big_reason.size() == 0 )
 	{
 		big_reason = mesg;
 	}
 
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	gDoDisconnect = TRUE;
 
 	if (LLStartUp::getStartupState() < STATE_STARTED)
@@ -2955,7 +2964,7 @@ void LLAppViewer::saveFinalSnapshot()
 		gSavedSettings.setBOOL("ShowParcelOwners", FALSE);
 		idle();
 
-		LLString snap_filename = gDirUtilp->getLindenUserDir();
+		std::string snap_filename = gDirUtilp->getLindenUserDir();
 		snap_filename += gDirUtilp->getDirDelimiter();
 		snap_filename += SCREEN_LAST_FILENAME;
 		// use full pixel dimensions of viewer window (not post-scale dimensions)
@@ -2970,7 +2979,7 @@ void LLAppViewer::loadNameCache()
 
 	std::string name_cache;
 	name_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "name.cache");
-	llifstream cache_file(name_cache.c_str());
+	llifstream cache_file(name_cache);
 	if(cache_file.is_open())
 	{
 		if(gCacheName->importFile(cache_file)) return;
@@ -2978,7 +2987,7 @@ void LLAppViewer::loadNameCache()
 
 	// Try to load from the legacy format. This should go away after a
 	// while. Phoenix 2008-01-30
-	LLFILE* name_cache_fp = LLFile::fopen(name_cache.c_str(), "r");		// Flawfinder: ignore
+	LLFILE* name_cache_fp = LLFile::fopen(name_cache, "r");		// Flawfinder: ignore
 	if (name_cache_fp)
 	{
 		gCacheName->importFile(name_cache_fp);
@@ -2992,7 +3001,7 @@ void LLAppViewer::saveNameCache()
 
 	std::string name_cache;
 	name_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "name.cache");
-	llofstream cache_file(name_cache.c_str());
+	llofstream cache_file(name_cache);
 	if(cache_file.is_open())
 	{
 		gCacheName->exportFile(cache_file);
@@ -3023,10 +3032,13 @@ public:
 ///////////////////////////////////////////////////////
 void LLAppViewer::idle()
 {
+	pingMainloopTimeout("Main:Idle");
+	
 	// Update frame timers
 	static LLTimer idle_timer;
 
 	LLFrameTimer::updateFrameTime();
+	LLFrameTimer::updateFrameCount();
 	LLEventTimer::updateClass();
 	LLCriticalDamp::updateInterpolants();
 	LLMortician::updateClass();
@@ -3434,9 +3446,7 @@ void LLAppViewer::idleShutdown()
 		S32 finished_uploads = total_uploads - pending_uploads;
 		F32 percent = 100.f * finished_uploads / total_uploads;
 		gViewerWindow->setProgressPercent(percent);
-		char buffer[MAX_STRING];		// Flawfinder: ignore
-		snprintf(buffer, MAX_STRING, "Saving final data...");		// Flawfinder: ignore
-		gViewerWindow->setProgressString(buffer);
+		gViewerWindow->setProgressString("Saving final data...");
 		return;
 	}
 
@@ -3598,6 +3608,23 @@ void LLAppViewer::idleNetwork()
 	gAssetStorage->checkForTimeouts();
 
 	gViewerThrottle.updateDynamicThrottle();
+
+
+	// Check that the circuit between the viewer and the agent's current
+	// region is still alive
+	LLViewerRegion *agent_region = gAgent.getRegion();
+	if (agent_region)
+	{
+		LLUUID this_region_id = agent_region->getRegionID();
+		bool this_region_alive = agent_region->isAlive();
+		if ((mAgentRegionLastAlive && !this_region_alive) // newly dead
+		    && (mAgentRegionLastID == this_region_id)) // same region
+		{
+			forceDisconnect(LLTrans::getString("AgentLostConnection"));
+		}
+		mAgentRegionLastID = this_region_id;
+		mAgentRegionLastAlive = this_region_alive;
+	}
 }
 
 void LLAppViewer::disconnectViewer()
@@ -3748,4 +3775,3 @@ void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
 	}
 }
 
-
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index f00211f..68bdb24 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -63,7 +63,7 @@ public:
 	void forceQuit(); // Puts the viewer into 'shutting down without error' mode.
 	void requestQuit(); // Request a quit. A kinder, gentler quit.
 	void userQuit(); // The users asks to quit. Confirm, then requestQuit()
-    void earlyExit(const LLString& msg); // Display an error dialog and forcibly quit.
+    void earlyExit(const std::string& msg); // Display an error dialog and forcibly quit.
     void forceExit(S32 arg); // exit() immediately (after some cleanup).
     void abortQuit();  // Called to abort a quit request.
 
@@ -91,10 +91,10 @@ public:
 	
 	bool getPurgeCache() const { return mPurgeCache; }
 	
-	const LLString& getSecondLifeTitle() const; // The Second Life title.
-	const LLString& getWindowTitle() const; // The window display name.
+	const std::string& getSecondLifeTitle() const; // The Second Life title.
+	const std::string& getWindowTitle() const; // The window display name.
 
-    void forceDisconnect(const LLString& msg); // Force disconnection, with a message to the user.
+    void forceDisconnect(const std::string& msg); // Force disconnection, with a message to the user.
     void badNetworkHandler(); // Cause a crash state due to bad network packet.
 
 	bool hasSavedFinalSnapshot() { return mSavedFinalSnapshot; }
@@ -157,7 +157,7 @@ private:
 	void purgeCache(); // Clear the local cache. 
 
 	void cleanupSavedSettings(); // Sets some config data to current or default values during cleanup.
-	void removeCacheFiles(const char *filemask); // Deletes cached files the match the given wildcard.
+	void removeCacheFiles(const std::string& filemask); // Deletes cached files the match the given wildcard.
 
 	void writeSystemInfo(); // Write system info to "debug_info.log"
 
@@ -177,10 +177,10 @@ private:
 
     bool mSecondInstance; // Is this a second instance of the app?
 
-	LLString mMarkerFileName;
+	std::string mMarkerFileName;
 	apr_file_t* mMarkerFile; // A file created to indicate the app is running.
 
-	LLString mLogoutMarkerFileName;
+	std::string mLogoutMarkerFileName;
 	apr_file_t* mLogoutMarkerFile; // A file created to indicate the app is running.
 
 	
@@ -206,6 +206,10 @@ private:
 	LLSD mSettingsFileList;
 
 	LLWatchdogTimeout* mMainloopTimeout;
+
+	// for tracking viewer<->region circuit death
+	bool mAgentRegionLastAlive;
+	LLUUID mAgentRegionLastID;
 };
 
 // consts from viewer.h
@@ -217,7 +221,7 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 // "// llstartup" indicates that llstartup is the only client for this global.
 
 extern BOOL gHandleKeysAsync; // gSavedSettings used by llviewerdisplay.cpp & llviewermenu.cpp
-extern LLString gDisabledMessage; // llstartup
+extern std::string gDisabledMessage; // llstartup
 extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
 extern LLSD gDebugInfo;
 
@@ -253,9 +257,10 @@ extern BOOL gPacificDaylightTime;
 extern U64      gFrameTime;					// The timestamp of the most-recently-processed frame
 extern F32		gFrameTimeSeconds;			// Loses msec precision after ~4.5 hours...
 extern F32		gFrameIntervalSeconds;		// Elapsed time between current and previous gFrameTimeSeconds
-extern F32		gFPSClamped;						// Frames per second, smoothed, weighted toward last frame
+extern F32		gFPSClamped;				// Frames per second, smoothed, weighted toward last frame
 extern F32		gFrameDTClamped;
 extern U64		gStartTime;
+extern U32 		gFrameStalls;
 
 extern LLTimer gRenderStartTime;
 extern LLFrameTimer gForegroundTime;
@@ -287,7 +292,7 @@ extern LLVFS	*gStaticVFS;
 extern LLMemoryInfo gSysMemory;
 extern U64 gMemoryAllocated;
 
-extern LLString gLastVersionChannel;
+extern std::string gLastVersionChannel;
 
 extern LLVector3 gWindVec;
 extern LLVector3 gRelativeWindVec;
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index 5537687..0a4a9cf 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -45,14 +45,7 @@
 
 #if LL_LINUX
 # include <dlfcn.h>		// RTLD_LAZY
-# include <execinfo.h>            // backtrace - glibc only
-# ifndef LL_ELFBIN
-#  define LL_ELFBIN 1
-# endif // LL_ELFBIN
-# if LL_ELFBIN
-#  include <cxxabi.h>         // for symbol demangling
-#  include "ELFIO.h"          // for better backtraces
-# endif // LL_ELFBIN
+# include <execinfo.h>  // backtrace - glibc only
 #elif LL_SOLARIS
 # include <sys/types.h>
 # include <unistd.h>
@@ -60,6 +53,13 @@
 # include <ucontext.h>
 #endif
 
+#ifdef LL_ELFBIN
+# ifdef __GNUC__
+#  include <cxxabi.h>			// for symbol demangling
+# endif
+# include "ELFIO/ELFIO.h"		// for better backtraces
+#endif
+
 namespace
 {
 	int gArgC = 0;
@@ -131,7 +131,7 @@ static inline BOOL do_basic_glibc_backtrace()
 
 	std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
 	llinfos << "Opening stack trace file " << strace_filename << llendl;
-	LLFILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w");
+	LLFILE* StraceFile = LLFile::fopen(strace_filename, "w");
 	if (!StraceFile)
 	{
 		llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
@@ -162,7 +162,7 @@ static inline BOOL do_basic_glibc_backtrace()
 
 	std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
 	llinfos << "Opening stack trace file " << strace_filename << llendl;
-	LLFILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w");		// Flawfinder: ignore
+	LLFILE* StraceFile = LLFile::fopen(strace_filename, "w");		// Flawfinder: ignore
         if (!StraceFile)
 	{
 		llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
@@ -200,7 +200,7 @@ static inline BOOL do_elfio_glibc_backtrace()
 
 	std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
 	llinfos << "Opening stack trace file " << strace_filename << llendl;
-	LLFILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w");		// Flawfinder: ignore
+	LLFILE* StraceFile = LLFile::fopen(strace_filename, "w");		// Flawfinder: ignore
         if (!StraceFile)
 	{
 		llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
@@ -340,25 +340,25 @@ void LLAppViewerLinux::handleCrashReporting()
 	if (CRASH_BEHAVIOR_NEVER_SEND != cb)
 	{	
 		// launch the actual crash logger
-		char* ask_dialog = "-dialog";
+		const char* ask_dialog = "-dialog";
 		if (CRASH_BEHAVIOR_ASK != cb)
 			ask_dialog = ""; // omit '-dialog' option
 		std::string cmd =gDirUtilp->getAppRODataDir();
 		cmd += gDirUtilp->getDirDelimiter();
 		cmd += "linux-crash-logger.bin";
-		char* const cmdargv[] =
-			{(char*)cmd.c_str(),
+		const char * cmdargv[] =
+			{cmd.c_str(),
 			 ask_dialog,
-			 (char*)"-user",
+			 "-user",
 			 (char*)LLViewerLogin::getInstance()->getGridLabel().c_str(),
-			 (char*)"-name",
-			 (char*)LLAppViewer::instance()->getSecondLifeTitle().c_str(),
+			 "-name",
+			 LLAppViewer::instance()->getSecondLifeTitle().c_str(),
 			 NULL};
 		fflush(NULL);
 		pid_t pid = fork();
 		if (pid == 0)
 		{ // child
-			execv(cmd.c_str(), cmdargv);		/* Flawfinder: ignore */
+			execv(cmd.c_str(), (char* const*) cmdargv);		/* Flawfinder: ignore */
 			llwarns << "execv failure when trying to start " << cmd << llendl;
 			_exit(1); // avoid atexit()
 		} 
@@ -429,7 +429,7 @@ bool LLAppViewerLinux::initLogging()
 	// Remove the last stack trace, if any
 	std::string old_stack_file =
 		gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
-	LLFile::remove(old_stack_file.c_str());
+	LLFile::remove(old_stack_file);
 
 	return LLAppViewer::initLogging();
 }
@@ -448,14 +448,18 @@ bool LLAppViewerLinux::initParseCommandLine(LLCommandLineParser& clp)
 	{
 		if (success >= 2 && locale->lang) // confident!
 		{
+			LL_INFOS("AppInit") << "Language " << ll_safe_string(locale->lang) << LL_ENDL;
+			LL_INFOS("AppInit") << "Location " << ll_safe_string(locale->country) << LL_ENDL;
+			LL_INFOS("AppInit") << "Variant " << ll_safe_string(locale->variant) << LL_ENDL;
+
 			LLControlVariable* c = gSavedSettings.getControl("SystemLanguage");
 			if(c)
 			{
 				c->setValue(std::string(locale->lang), false);
 			}
 		}
-		FL_FreeLocale(&locale);
 	}
+	FL_FreeLocale(&locale);
 
 	return true;
 }
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index 96b6b24..68c3a16 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -65,7 +65,12 @@ int main( int argc, char **argv )
 #endif
 
 	// Set the working dir to <bundle>/Contents/Resources
-	(void) chdir(gDirUtilp->getAppRODataDir().c_str());
+	if (chdir(gDirUtilp->getAppRODataDir().c_str()) == -1)
+	{
+		llwarns << "Could not change directory to "
+				<< gDirUtilp->getAppRODataDir() << ": " << strerror(errno)
+				<< llendl;
+	}
 
 	LLAppViewerMacOSX* viewer_app_ptr = new LLAppViewerMacOSX();
 
@@ -173,7 +178,7 @@ bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp)
 	char path[MAX_PATH];
 	if(CFURLGetFileSystemRepresentation(url, false, (UInt8 *)path, sizeof(path)))
 	{
-		LLString lang;
+		std::string lang;
 		if(_read_file_into_string(lang, path))		/* Flawfinder: ignore*/
 		{
             LLControlVariable* c = gSavedSettings.getControl("SystemLanguage");
@@ -196,8 +201,8 @@ void LLAppViewerMacOSX::handleSyncCrashTrace()
 void LLAppViewerMacOSX::handleCrashReporting()
 {
 	// Macintosh
-	LLString command_str;
-	command_str += "open crashreporter.app";	
+	std::string command_str;
+	command_str += "open mac-crash-logger.app";	
 	
 	clear_signals();
 	llinfos << "Launching crash reporter using: '" << command_str << "'" << llendl;
@@ -304,121 +309,6 @@ OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *
 	return(result);
 }
 
-OSStatus DisplayReleaseNotes(void)
-{
-	OSStatus err;
-	IBNibRef nib = NULL;
-	WindowRef window = NULL;
-	
-	err = CreateNibReference(CFSTR("SecondLife"), &nib);
-	
-	if(err == noErr)
-	{
-		CreateWindowFromNib(nib, CFSTR("Release Notes"), &window);
-	}
-		
-	if(err == noErr)
-	{
-		// Get the text view control
-		HIViewRef textView;
-		ControlID id;
-
-		id.signature = 'text';
-		id.id = 0;
-
-		LLString releaseNotesText;
-		
-		_read_file_into_string(releaseNotesText, "releasenotes.txt");		// Flawfinder: ignore
-
-		err = HIViewFindByID(HIViewGetRoot(window), id, &textView);
-		
-		if(err == noErr)
-		{
-			// Convert from the encoding used in the release notes.
-			CFStringRef str = CFStringCreateWithBytes(
-				NULL, 
-				(const UInt8*)releaseNotesText.c_str(), 
-				releaseNotesText.size(), 
-				kCFStringEncodingWindowsLatin1, 		// This matches the way the Windows version displays the release notes.
-				FALSE);
-			
-			if(str != NULL)
-			{
-				int size = CFStringGetLength(str);
-
-				if(size > 0)
-				{
-					UniChar *chars = new UniChar[size + 1];
-					CFStringGetCharacters(str, CFRangeMake(0, size), chars);
-				
-					err = TXNSetData(HITextViewGetTXNObject(textView), kTXNUnicodeTextData, chars, size * sizeof(UniChar), kTXNStartOffset, kTXNStartOffset);
-					
-					delete[] chars;
-				}
-				
-				CFRelease(str);
-			}
-			else
-			{
-				// Creating the string failed.  Probably an encoding problem.  Display SOMETHING...
-				err = TXNSetData(HITextViewGetTXNObject(textView), kTXNTextData, releaseNotesText.c_str(), releaseNotesText.size(), kTXNStartOffset, kTXNStartOffset);
-			}
-		}
-		
-		// Set the selection to the beginning of the text and scroll it into view.
-		if(err == noErr)
-		{
-			err = TXNSetSelection(HITextViewGetTXNObject(textView), kTXNStartOffset, kTXNStartOffset);
-		}
-		
-		if(err == noErr)
-		{
-			// This function returns void.
-			TXNShowSelection(HITextViewGetTXNObject(textView), false);
-		}
-	}
-
-	if(err == noErr)
-	{
-		ShowWindow(window);
-	}
-
-	if(err == noErr)
-	{
-		// Set up an event handler for the window.
-		EventHandlerRef handler = NULL;
-		EventTypeSpec handlerEvents[] = 
-		{
-			{ kEventClassCommand, kEventCommandProcess }
-		};
-
-		InstallWindowEventHandler(
-				window, 
-				NewEventHandlerUPP(simpleDialogHandler), 
-				GetEventTypeCount (handlerEvents), 
-				handlerEvents, 
-				(void*)window, 
-				&handler);
-	}
-			
-	if(err == noErr)
-	{
-		RunAppModalLoopForWindow(window);
-	}
-			
-	if(window != NULL)
-	{
-		DisposeWindow(window);
-	}
-	
-	if(nib != NULL)
-	{
-		DisposeNibReference(nib);
-	}
-
-	return(err);
-}
-
 void init_apple_menu(const char* product)
 {
 	// Load up a proper menu bar.
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index e90887e..aab6289 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -61,14 +61,14 @@
 //*FIX:Mani - This hack is to fix a linker issue with libndofdev.lib
 // The lib was compiled under VS2005 - in VS2003 we need to remap assert
 #ifdef LL_DEBUG
-	#if (_MSC_VER < 1400)
-	extern "C" {
-	void _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line) 
-	{
-		llerrs << _Message << llendl;
-	}
-	}
-	#endif
+#ifdef LL_MSVC7 
+extern "C" {
+    void _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line)
+    {
+        llerrs << _Message << llendl;
+    }
+}
+#endif
 #endif
 
 LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop)
@@ -298,7 +298,7 @@ void LLAppViewerWin32::initConsole()
 
 void write_debug_dx(const char* str)
 {
-	LLString value = gDebugInfo["DXInfo"].asString();
+	std::string value = gDebugInfo["DXInfo"].asString();
 	value += str;
 	gDebugInfo["DXInfo"] = value;
 }
@@ -347,7 +347,7 @@ bool LLAppViewerWin32::initHardwareTest()
 				"\n"
 				"Do you wish to continue?\n";
 			S32 button = OSMessageBox(
-				msg.str().c_str(),
+				msg.str(),
 				"Warning",
 				OSMB_YESNO);
 			if (OSBTN_NO== button)
@@ -367,7 +367,7 @@ bool LLAppViewerWin32::initHardwareTest()
 		std::ostringstream splash_msg;
 		splash_msg << "Loading " << LLAppViewer::instance()->getSecondLifeTitle() << "...";
 
-		LLSplashScreen::update(splash_msg.str().c_str());
+		LLSplashScreen::update(splash_msg.str());
 	}
 
 	if (!LLWinDebug::checkExceptionHandler())
@@ -395,14 +395,17 @@ bool LLAppViewerWin32::initParseCommandLine(LLCommandLineParser& clp)
 	{
 		if (success >= 2 && locale->lang) // confident!
 		{
+			LL_INFOS("AppInit") << "Language: " << ll_safe_string(locale->lang) << LL_ENDL;
+			LL_INFOS("AppInit") << "Location: " << ll_safe_string(locale->country) << LL_ENDL;
+			LL_INFOS("AppInit") << "Variant: " << ll_safe_string(locale->variant) << LL_ENDL;
 			LLControlVariable* c = gSavedSettings.getControl("SystemLanguage");
 			if(c)
 			{
 				c->setValue(std::string(locale->lang), false);
 			}
 		}
-		FL_FreeLocale(&locale);
 	}
+	FL_FreeLocale(&locale);
 
 	return true;
 }
diff --git a/linden/indra/newview/llassetuploadqueue.cpp b/linden/indra/newview/llassetuploadqueue.cpp
new file mode 100644
index 0000000..f645828
--- /dev/null
+++ b/linden/indra/newview/llassetuploadqueue.cpp
@@ -0,0 +1,216 @@
+/** 
+ * @file llassetupload.cpp
+ * @brief Serializes asset upload request
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llassetuploadqueue.h"
+#include "llviewerregion.h"
+#include "llviewerobjectlist.h"
+
+#include "llassetuploadresponders.h"
+#include "llsd.h"
+#include <iostream>
+
+class LLAssetUploadChainResponder : public LLUpdateTaskInventoryResponder
+{
+public:
+	
+	LLAssetUploadChainResponder(const LLSD& post_data,
+								const std::string& file_name,
+								const LLUUID& queue_id,
+								U8* data, 
+								U32 data_size,
+								std::string script_name,
+								LLAssetUploadQueueSupplier *supplier) :
+		LLUpdateTaskInventoryResponder(post_data, file_name, queue_id, LLAssetType::AT_LSL_TEXT),
+		mSupplier(supplier),
+		mData(data),
+		mDataSize(data_size),
+		mScriptName(script_name)
+	{
+ 	}
+
+	virtual ~LLAssetUploadChainResponder() 
+   	{
+   		if(mSupplier)
+   		{
+   			LLAssetUploadQueue *queue = mSupplier->get();
+   			if (queue)
+   			{
+   				// Give ownership of supplier back to queue.
+   				queue->mSupplier = mSupplier;
+   				mSupplier = NULL;
+   			}
+   		}
+   		delete mSupplier;
+		delete mData;
+   	}
+	
+	virtual void error(U32 statusNum, const std::string& reason)
+   	{
+		llwarns << "Error: " << reason << llendl;
+		LLUpdateTaskInventoryResponder::error(statusNum, reason);
+   		LLAssetUploadQueue *queue = mSupplier->get();
+   		if (queue)
+		{
+   			queue->request(&mSupplier);
+   		}
+   	}
+
+	virtual void result(const LLSD& content)
+   	{
+		LLUpdateTaskInventoryResponder::result(content);
+   		LLAssetUploadQueue *queue = mSupplier->get();
+   		if (queue)
+   		{
+   			// Responder is reused across 2 phase upload,
+   			// so only start next upload after 2nd phase complete.
+   			std::string state = content["state"];
+   			if(state == "complete")
+   			{
+   				queue->request(&mSupplier);
+   			}
+   		}	
+   	}
+	
+	virtual void uploadUpload(const LLSD& content)
+	{
+		std::string uploader = content["uploader"];
+
+		mSupplier->log(std::string("Compiling " + mScriptName).c_str());
+		llinfos << "Compiling " << llendl;
+
+		// postRaw takes ownership of mData and will delete it.
+		LLHTTPClient::postRaw(uploader, mData, mDataSize, this);
+		mData = NULL;
+		mDataSize = 0;
+	}
+
+	virtual void uploadComplete(const LLSD& content)
+	{
+		// Bytecode save completed
+		if (content["compiled"])
+		{
+			mSupplier->log("Compilation succeeded");
+			llinfos << "Compiled!" << llendl;
+		}
+		else
+		{
+			LLSD compile_errors = content["errors"];
+			for(LLSD::array_const_iterator line	= compile_errors.beginArray();
+				line < compile_errors.endArray(); line++)
+			{
+				mSupplier->log(line->asString());
+				llinfos << content["errors"] << llendl;
+			}
+		}
+		LLUpdateTaskInventoryResponder::uploadComplete(content);
+	}
+
+	LLAssetUploadQueueSupplier *mSupplier;
+	U8* mData;
+	U32 mDataSize;
+	std::string mScriptName;
+};
+
+
+LLAssetUploadQueue::LLAssetUploadQueue(LLAssetUploadQueueSupplier *supplier) :
+	mSupplier(supplier)
+{
+}
+
+//virtual 
+LLAssetUploadQueue::~LLAssetUploadQueue()
+{
+	delete mSupplier;
+}
+
+// Takes ownership of supplier.
+void LLAssetUploadQueue::request(LLAssetUploadQueueSupplier** supplier)
+{
+	if (mQueue.empty())
+		return;
+
+	UploadData data = mQueue.front();
+	mQueue.pop_front();
+	
+	LLSD body;
+	body["task_id"] = data.mTaskId;
+	body["item_id"] = data.mItemId;
+	body["is_script_running"] = data.mIsRunning;
+	body["target"] = data.mIsTargetMono? "mono" : "lsl2";
+
+	std::string url = "";
+	LLViewerObject* object = gObjectList.findObject(data.mTaskId);
+	if (object)
+	{
+		url = object->getRegion()->getCapability("UpdateScriptTask");
+		LLHTTPClient::post(url, body,
+							new LLAssetUploadChainResponder(
+								body, data.mFilename, data.mQueueId, 
+								data.mData, data.mDataSize, data.mScriptName, *supplier));
+	}
+
+	*supplier = NULL;
+}
+
+void LLAssetUploadQueue::queue(const std::string& filename,
+							   const LLUUID& task_id,
+							   const LLUUID& item_id,
+							   BOOL is_running, 
+							   BOOL is_target_mono, 
+							   const LLUUID& queue_id,
+							   U8* script_data,
+							   U32 data_size,
+							   std::string script_name)
+{
+	UploadData data;
+	data.mTaskId = task_id;
+	data.mItemId = item_id;
+	data.mIsRunning = is_running;
+	data.mIsTargetMono = is_target_mono;
+	data.mQueueId = queue_id;
+	data.mFilename = filename;
+	data.mData = script_data;
+	data.mDataSize = data_size;
+	data.mScriptName = script_name;
+			
+	mQueue.push_back(data);
+
+	if(mSupplier)
+	{
+		request(&mSupplier);
+	}	
+}
+
+LLAssetUploadQueueSupplier::~LLAssetUploadQueueSupplier()
+{
+}
diff --git a/linden/indra/newview/llassetuploadqueue.h b/linden/indra/newview/llassetuploadqueue.h
new file mode 100644
index 0000000..7c98a99
--- /dev/null
+++ b/linden/indra/newview/llassetuploadqueue.h
@@ -0,0 +1,96 @@
+/** 
+ * @file llassetuploadqueue.h
+ * @brief Serializes asset upload request
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLASSETUPLOADQUEUE_H
+#define LL_LLASSETUPLOADQUEUE_H
+
+#include "lluuid.h"
+
+#include <string>
+#include <deque>
+
+class LLAssetUploadQueueSupplier;
+
+class LLAssetUploadQueue
+{
+public:
+
+	// Takes ownership of supplier.
+	LLAssetUploadQueue(LLAssetUploadQueueSupplier* supplier);
+	virtual ~LLAssetUploadQueue();
+
+	void queue(const std::string& filename,
+			   const LLUUID& task_id,
+			   const LLUUID& item_id,
+			   BOOL is_running, 
+			   BOOL is_target_mono, 
+			   const LLUUID& queue_id,
+			   U8* data,
+			   U32 data_size,
+			   std::string script_name);
+
+	bool isEmpty() const {return mQueue.empty();}
+
+private:
+
+	friend class LLAssetUploadChainResponder;
+
+	struct UploadData
+	{
+		std::string mFilename;
+		LLUUID mTaskId;
+		LLUUID mItemId;
+		BOOL mIsRunning;
+		BOOL mIsTargetMono;
+		LLUUID mQueueId;
+		U8* mData;
+		U32 mDataSize;
+		std::string mScriptName;
+	};
+
+	// Ownership of mSupplier passed to currently waiting responder
+	// and returned to queue when no requests in progress.
+	LLAssetUploadQueueSupplier* mSupplier;
+	std::deque<UploadData> mQueue;
+
+	// Passes on ownership of mSupplier if request is made.
+	void request(LLAssetUploadQueueSupplier** supplier);
+};
+
+class LLAssetUploadQueueSupplier
+{
+public:
+	virtual ~LLAssetUploadQueueSupplier();
+	virtual LLAssetUploadQueue* get() const = 0;
+	virtual void log(std::string message) const = 0;
+};
+
+#endif // LL_LLASSETUPLOADQUEUE_H
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 2691f71..2d40e94 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -34,6 +34,7 @@
 #include "llassetuploadresponders.h"
 
 #include "llagent.h"
+#include "llcompilequeue.h"
 #include "llfloaterbuycurrency.h"
 #include "lleconomy.h"
 #include "llfilepicker.h"
@@ -73,10 +74,12 @@ LLAssetUploadResponder::LLAssetUploadResponder(const LLSD &post_data,
 }
 
 LLAssetUploadResponder::LLAssetUploadResponder(const LLSD &post_data,
-											   const std::string& file_name)
+											   const std::string& file_name, 
+											   LLAssetType::EType asset_type)
 	: LLHTTPClient::Responder(),
 	  mPostData(post_data),
-	  mFileName(file_name)
+	  mFileName(file_name),
+	  mAssetType(asset_type)
 {
 }
 
@@ -85,7 +88,7 @@ LLAssetUploadResponder::~LLAssetUploadResponder()
 	if (!mFileName.empty())
 	{
 		// Delete temp file
-		LLFile::remove(mFileName.c_str());
+		LLFile::remove(mFileName);
 	}
 }
 
@@ -94,7 +97,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 {
 	llinfos << "LLAssetUploadResponder::error " << statusNum 
 			<< " reason: " << reason << llendl;
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	switch(statusNum)
 	{
 		case 400:
@@ -163,7 +166,7 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content)
 	}
 	else
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[FILE]"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
 		args["[REASON]"] = content["message"].asString();
 		gViewerWindow->alertXml("CannotUploadReason", args);
@@ -181,8 +184,8 @@ LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data
 {
 }
 
-LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name)
-: LLAssetUploadResponder(post_data, file_name)
+LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name, LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type)
 {
 }
 
@@ -191,8 +194,8 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 {
 	lldebugs << "LLNewAgentInventoryResponder::result from capabilities" << llendl;
 
-	LLAssetType::EType asset_type = LLAssetType::lookup(mPostData["asset_type"].asString().c_str());
-	LLInventoryType::EType inventory_type = LLInventoryType::lookup(mPostData["inventory_type"].asString().c_str());
+	LLAssetType::EType asset_type = LLAssetType::lookup(mPostData["asset_type"].asString());
+	LLInventoryType::EType inventory_type = LLInventoryType::lookup(mPostData["inventory_type"].asString());
 
 	// Update L$ and ownership credit information
 	// since it probably changed on the server
@@ -208,7 +211,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 		gMessageSystem->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
 		gAgent.sendReliableMessage();
 
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[AMOUNT]"] = llformat("%d",LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
 		LLNotifyBox::showXml("UploadPayment", args);
 	}
@@ -275,27 +278,16 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 	// *FIX: This is a pretty big hack. What this does is check the
 	// file picker if there are any more pending uploads. If so,
 	// upload that file.
-	const char* next_file = LLFilePicker::instance().getNextFile();
-	if(next_file)
+	std::string next_file = LLFilePicker::instance().getNextFile();
+	if(!next_file.empty())
 	{
-		const char* name = LLFilePicker::instance().getDirname();
-
-		LLString asset_name = name;
-		LLString::replaceNonstandardASCII( asset_name, '?' );
-		LLString::replaceChar(asset_name, '|', '?');
-		LLString::stripNonprintable(asset_name);
-		LLString::trim(asset_name);
+		std::string name = gDirUtilp->getBaseFileName(next_file, true);
 
-		char* asset_name_str = (char*)asset_name.c_str();
-		char* end_p = strrchr(asset_name_str, '.');		 // strip extension if exists
-		if( !end_p )
-		{
-			 end_p = asset_name_str + strlen( asset_name_str );			/*Flawfinder: ignore*/
-		}
-			
-		S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
-
-		asset_name = asset_name.substr( 0, len );
+		std::string asset_name = name;
+		LLStringUtil::replaceNonstandardASCII( asset_name, '?' );
+		LLStringUtil::replaceChar(asset_name, '|', '?');
+		LLStringUtil::stripNonprintable(asset_name);
+		LLStringUtil::trim(asset_name);
 
 		upload_new_resource(next_file, asset_name, asset_name,
 							0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE);
@@ -311,8 +303,9 @@ LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& pos
 }
 
 LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& post_data,
-																 const std::string& file_name)
-: LLAssetUploadResponder(post_data, file_name)
+																 const std::string& file_name,
+																 LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type)
 {
 }
 
@@ -420,8 +413,17 @@ LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_
 }
 
 LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
-															   const std::string& file_name)
-: LLAssetUploadResponder(post_data, file_name)
+															   const std::string& file_name, 
+															   LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+															   const std::string& file_name,
+															   const LLUUID& queue_id, 
+															   LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, file_name, asset_type), mQueueId(queue_id)
 {
 }
 
@@ -432,35 +434,16 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
 	LLUUID item_id = mPostData["item_id"];
 	LLUUID task_id = mPostData["task_id"];
 
-	LLViewerObject* object = gObjectList.findObject(task_id);
-	if (!object)
-	{
-		llwarns << "LLUpdateTaskInventoryResponder::uploadComplete task " << task_id
-			<< " no longer exist." << llendl;
-		return;
-	}
-	LLViewerInventoryItem* item = (LLViewerInventoryItem*)object->getInventoryObject(item_id);
-	if (!item)
-	{
-		llwarns << "LLUpdateTaskInventoryResponder::uploadComplete item "
-			<< item_id << " is no longer in task " << task_id
-			<< "'s inventory." << llendl;
-		return;
-	}
-	LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-	// Update Viewer inventory
-	object->updateViewerInventoryAsset(new_item, content["new_asset"]);
 	dialog_refresh_all();
 	
-	LLInventoryType::EType inventory_type = new_item->getInventoryType();
-	switch(inventory_type)
+	switch(mAssetType)
 	{
-		case LLInventoryType::IT_NOTECARD:
+		case LLAssetType::AT_NOTECARD:
 			{
 
 				// Update the UI with the new asset.
 				LLPreviewNotecard* nc;
-				nc = (LLPreviewNotecard*)LLPreview::find(new_item->getUUID());
+				nc = (LLPreviewNotecard*)LLPreview::find(item_id);
 				if(nc)
 				{
 					// *HACK: we have to delete the asset in the VFS so
@@ -480,28 +463,39 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
 				}
 			}
 			break;
-		case LLInventoryType::IT_LSL:
+		case LLAssetType::AT_LSL_TEXT:
 			{
-				LLLiveLSLEditor* preview = LLLiveLSLEditor::find(item_id, task_id);
-				if (preview)
+				if(mQueueId.notNull())
 				{
-					// Bytecode save completed
-					if (content["compiled"])
+					LLFloaterCompileQueue* queue = 
+						(LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
+					if(NULL != queue)
 					{
-						preview->callbackLSLCompileSucceeded(
-							task_id,
-							item_id,
-							mPostData["is_script_running"]);
+						queue->removeItemByItemID(item_id);
 					}
-					else
+				}
+				else
+				{
+					LLLiveLSLEditor* preview = LLLiveLSLEditor::find(item_id, task_id);
+					if (preview)
 					{
-						preview->callbackLSLCompileFailed(content["errors"]);
+						// Bytecode save completed
+						if (content["compiled"])
+						{
+							preview->callbackLSLCompileSucceeded(
+								task_id,
+								item_id,
+								mPostData["is_script_running"]);
+						}
+						else
+						{
+							preview->callbackLSLCompileFailed(content["errors"]);
+						}
 					}
 				}
 			}
 			break;
-		case LLInventoryType::IT_WEARABLE:
-		default:
-			break;
+	default:
+		break;
 	}
 }
diff --git a/linden/indra/newview/llassetuploadresponders.h b/linden/indra/newview/llassetuploadresponders.h
index 6f026a1..dd74c13 100644
--- a/linden/indra/newview/llassetuploadresponders.h
+++ b/linden/indra/newview/llassetuploadresponders.h
@@ -42,7 +42,9 @@ public:
 	LLAssetUploadResponder(const LLSD& post_data,
 							const LLUUID& vfile_id,
 							LLAssetType::EType asset_type);
-	LLAssetUploadResponder(const LLSD& post_data, const std::string& file_name);
+	LLAssetUploadResponder(const LLSD& post_data, 
+							const std::string& file_name,
+							LLAssetType::EType asset_type);
 	~LLAssetUploadResponder();
     virtual void error(U32 statusNum, const std::string& reason);
 	virtual void result(const LLSD& content);
@@ -52,8 +54,8 @@ public:
 
 protected:
 	LLSD mPostData;
-	LLUUID mVFileID;
 	LLAssetType::EType mAssetType;
+	LLUUID mVFileID;
 	std::string mFileName;
 };
 
@@ -63,7 +65,8 @@ public:
 	LLNewAgentInventoryResponder(const LLSD& post_data,
 								const LLUUID& vfile_id,
 								LLAssetType::EType asset_type);
-	LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name);
+	LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name,
+											   LLAssetType::EType asset_type);
 	virtual void uploadComplete(const LLSD& content);
 };
 
@@ -74,7 +77,8 @@ public:
 								const LLUUID& vfile_id,
 								LLAssetType::EType asset_type);
 	LLUpdateAgentInventoryResponder(const LLSD& post_data,
-								const std::string& file_name);
+								const std::string& file_name,
+											   LLAssetType::EType asset_type);
 	virtual void uploadComplete(const LLSD& content);
 };
 
@@ -85,8 +89,17 @@ public:
 								const LLUUID& vfile_id,
 								LLAssetType::EType asset_type);
 	LLUpdateTaskInventoryResponder(const LLSD& post_data,
-								const std::string& file_name);
+								const std::string& file_name,
+								LLAssetType::EType asset_type);
+	LLUpdateTaskInventoryResponder(const LLSD& post_data,
+								const std::string& file_name,
+								const LLUUID& queue_id,
+								LLAssetType::EType asset_type);
+
 	virtual void uploadComplete(const LLSD& content);
+	
+private:
+	LLUUID mQueueId;
 };
 
 #endif // LL_LLASSETUPLOADRESPONDER_H
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 3a50cea..3252b30 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -78,7 +78,7 @@ public:
 	
 public:
 	LLUUID mAvatarID;
-	LLString mName;
+	std::string mName;
 	LLVector3d mGlobalPositionEstimate;
 	bool mHaveInfo;
 	bool mHaveCoarseInfo;
@@ -240,7 +240,7 @@ void LLAvatarTracker::getDegreesAndDist(F32& rot,
 	rot = F32(RAD_TO_DEG * atan2(to_vec.mdV[VY], to_vec.mdV[VX]));
 }
 
-const LLString& LLAvatarTracker::getName()
+const std::string& LLAvatarTracker::getName()
 {
 	if(mTrackingData)
 	{
@@ -248,7 +248,7 @@ const LLString& LLAvatarTracker::getName()
 	}
 	else
 	{
-		return LLString::null;
+		return LLStringUtil::null;
 	}
 }
 
@@ -592,7 +592,7 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
 				if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^  new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
 				{
 					std::string first, last;
-					LLStringBase<char>::format_map_t args;
+					LLStringUtil::format_map_t args;
 					if(gCacheName->getName(agent_id, first, last))
 					{
 						args["[FIRST_NAME]"] = first;
@@ -638,7 +638,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 			tracking_id = mTrackingData->mAvatarID;
 		}
 		BOOL notify = FALSE;
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		for(S32 i = 0; i < count; ++i)
 		{
 			msg->getUUIDFast(_PREHASH_AgentBlock, _PREHASH_AgentID, agent_id, i);
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index aca5099..13709cd 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -101,7 +101,7 @@ public:
 	LLVector3d getGlobalPos();
 
 	// Get the name passed in, returns null string if uninitialized.
-	const LLString& getName();
+	const std::string& getName();
 
 	// Get the avatar being tracked, returns LLUUID::null if uninitialized
 	const LLUUID& getAvatarID();
diff --git a/linden/indra/newview/llcaphttpsender.cpp b/linden/indra/newview/llcaphttpsender.cpp
index c60a342..a227931 100644
--- a/linden/indra/newview/llcaphttpsender.cpp
+++ b/linden/indra/newview/llcaphttpsender.cpp
@@ -40,7 +40,7 @@ LLCapHTTPSender::LLCapHTTPSender(const std::string& cap) :
 }
 
 //virtual 
-void LLCapHTTPSender::send(const LLHost& host, const char* message, 
+void LLCapHTTPSender::send(const LLHost& host, const std::string& message, 
 								  const LLSD& body, 
 								  LLHTTPClient::ResponderPtr response) const
 {
diff --git a/linden/indra/newview/llcaphttpsender.h b/linden/indra/newview/llcaphttpsender.h
index d396673..d4b4747 100644
--- a/linden/indra/newview/llcaphttpsender.h
+++ b/linden/indra/newview/llcaphttpsender.h
@@ -43,7 +43,7 @@ public:
 	/** @brief Send message via UntrustedMessage capability with body,
 		call response when done */ 
 	virtual void send(const LLHost& host, 
-					  const char* message, const LLSD& body, 
+					  const std::string& message, const LLSD& body, 
 					  LLHTTPClient::ResponderPtr response) const;
 
 private:
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index f5aba70..3a6c8cf 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -96,7 +96,7 @@ private:
 //
 
 LLChatBar::LLChatBar() 
-:	LLPanel("", LLRect(), BORDER_NO),
+:	LLPanel(LLStringUtil::null, LLRect(), BORDER_NO),
 	mInputEditor(NULL),
 	mGestureLabelTimer(),
 	mLastSpecialChatChannel(0),
@@ -220,9 +220,9 @@ void LLChatBar::refreshGestures()
 	if (mGestureCombo && gestures)
 	{
 		//store current selection so we can maintain it
-		LLString cur_gesture = mGestureCombo->getValue().asString();
+		std::string cur_gesture = mGestureCombo->getValue().asString();
 		gestures->selectFirstItem();
-		LLString label = mGestureCombo->getValue().asString();;
+		std::string label = mGestureCombo->getValue().asString();;
 		// clear
 		gestures->clearRows();
 
@@ -241,14 +241,14 @@ void LLChatBar::refreshGestures()
 			}
 		}
 
-		// ad unique gestures
+		// add unique gestures
 		std::map <std::string, BOOL>::iterator it2;
 		for (it2 = unique.begin(); it2 != unique.end(); ++it2)
 		{
 			gestures->addSimpleElement((*it2).first);
 		}
 		
-		gestures->sortByColumn(0, TRUE);
+		gestures->sortByColumn(LLStringUtil::null, TRUE);
 		// Insert label after sorting
 		gestures->addSimpleElement(label, ADD_TOP);
 		
@@ -299,9 +299,9 @@ BOOL LLChatBar::inputEditorHasFocus()
 	return mInputEditor && mInputEditor->hasFocus();
 }
 
-LLString LLChatBar::getCurrentChat()
+std::string LLChatBar::getCurrentChat()
 {
-	return mInputEditor ? mInputEditor->getText() : LLString::null;
+	return mInputEditor ? mInputEditor->getText() : LLStringUtil::null;
 }
 
 void LLChatBar::setGestureCombo(LLComboBox* combo)
@@ -344,12 +344,12 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
 		S32 pos = 0;
 
 		// Copy the channel number into a string
-		llwchar channel_string[64];
+		LLWString channel_string;
 		llwchar c;
 		do
 		{
 			c = mesg[pos+1];
-			channel_string[pos] = c;
+			channel_string.push_back(c);
 			pos++;
 		}
 		while(c && pos < 64 && LLStringOps::isDigit(c));
@@ -362,7 +362,6 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
 			c = mesg[pos+1];
 			pos++;
 		}
-
 		
 		mLastSpecialChatChannel = strtol(wstring_to_utf8str(channel_string).c_str(), NULL, 10);
 		*channel = mLastSpecialChatChannel;
@@ -379,41 +378,41 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
 
 void LLChatBar::sendChat( EChatType type )
 {
-	LLWString text;
-	if (mInputEditor) text = mInputEditor->getWText();
-	LLWString::trim(text);
-	LLWString::replaceChar(text,182,'\n'); // Convert paragraph symbols back into newlines.
-
-	if (!text.empty())
+	if (mInputEditor)
 	{
-		// store sent line in history, duplicates will get filtered
-		if (mInputEditor) mInputEditor->updateHistory();
-		// Check if this is destined for another channel
-		S32 channel = 0;
-		stripChannelNumber(text, &channel);
-
-		std::string utf8text = wstring_to_utf8str(text);
-		// Try to trigger a gesture, if not chat to a script.
-		std::string utf8_revised_text;
-		if (0 == channel)
-		{
-			// discard returned "found" boolean
-			gGestureManager.triggerAndReviseString(utf8text, &utf8_revised_text);
-		}
-		else
+		LLWString text = mInputEditor->getConvertedText();
+		if (!text.empty())
 		{
-			utf8_revised_text = utf8text;
-		}
+			// store sent line in history, duplicates will get filtered
+			if (mInputEditor) mInputEditor->updateHistory();
+			// Check if this is destined for another channel
+			S32 channel = 0;
+			stripChannelNumber(text, &channel);
+			
+			std::string utf8text = wstring_to_utf8str(text);
+			// Try to trigger a gesture, if not chat to a script.
+			std::string utf8_revised_text;
+			if (0 == channel)
+			{
+				// discard returned "found" boolean
+				gGestureManager.triggerAndReviseString(utf8text, &utf8_revised_text);
+			}
+			else
+			{
+				utf8_revised_text = utf8text;
+			}
 
-		utf8_revised_text = utf8str_trim(utf8_revised_text);
+			utf8_revised_text = utf8str_trim(utf8_revised_text);
 
-		if (!utf8_revised_text.empty())
-		{
-			// Chat with animation
-			sendChatFromViewer(utf8_revised_text, type, TRUE);
+			if (!utf8_revised_text.empty())
+			{
+				// Chat with animation
+				sendChatFromViewer(utf8_revised_text, type, TRUE);
+			}
 		}
 	}
-	childSetValue("Chat Editor", LLString::null);
+
+	childSetValue("Chat Editor", LLStringUtil::null);
 
 	gAgent.stopTyping();
 
@@ -478,7 +477,7 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
 
 	// Can't trim the end, because that will cause autocompletion
 	// to eat trailing spaces that might be part of a gesture.
-	LLWString::trimHead(raw_text);
+	LLWStringUtil::trimHead(raw_text);
 
 	S32 length = raw_text.length();
 
@@ -499,7 +498,7 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
 	{
 		// the selection will already be deleted, but we need to trim
 		// off the character before
-		LLString new_text = raw_text.substr(0, length-1);
+		std::string new_text = raw_text.substr(0, length-1);
 		self->mInputEditor->setText( new_text );
 		self->mInputEditor->setCursorToEnd();
 		length = length - 1;
diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index cfb5015..93aaaa4 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -65,7 +65,7 @@ public:
 	void		setIgnoreArrowKeys(BOOL b);
 
 	BOOL		inputEditorHasFocus();
-	LLString	getCurrentChat();
+	std::string	getCurrentChat();
 
 	// since chat bar logic is reused for chat history
 	// gesture combo box might not be a direct child
diff --git a/linden/indra/newview/llcolorswatch.cpp b/linden/indra/newview/llcolorswatch.cpp
index 64db86c..d2a0aba 100644
--- a/linden/indra/newview/llcolorswatch.cpp
+++ b/linden/indra/newview/llcolorswatch.cpp
@@ -73,7 +73,7 @@ LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect
 	// Scalable UI made this off-by-one, I don't know why. JC
 	LLRect border_rect(0, getRect().getHeight()-1, getRect().getWidth()-1, 0);
 	border_rect.mBottom += BTN_HEIGHT_SMALL;
-	mBorder = new LLViewBorder("border", border_rect, LLViewBorder::BEVEL_IN);
+	mBorder = new LLViewBorder(std::string("border"), border_rect, LLViewBorder::BEVEL_IN);
 	addChild(mBorder);
 
 	mAlphaGradientImage = LLUI::getUIImage("color_swatch_alpha.tga");
@@ -100,7 +100,7 @@ LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect
 	// Scalable UI made this off-by-one, I don't know why. JC
 	LLRect border_rect(0, getRect().getHeight()-1, getRect().getWidth()-1, 0);
 	border_rect.mBottom += BTN_HEIGHT_SMALL;
-	mBorder = new LLViewBorder("border", border_rect, LLViewBorder::BEVEL_IN);
+	mBorder = new LLViewBorder(std::string("border"), border_rect, LLViewBorder::BEVEL_IN);
 	addChild(mBorder);
 
 	mAlphaGradientImage = LLUI::getUIImage("color_swatch_alpha.tga");
@@ -172,7 +172,7 @@ BOOL LLColorSwatchCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	// Route future Mouse messages here preemptively.  (Release on mouse up.)
 	// No handler is needed for capture lost since this object has no state that depends on it.
-	gViewerWindow->setMouseCapture( this );
+	gFocusMgr.setMouseCapture( this );
 
 	return TRUE;
 }
@@ -184,7 +184,7 @@ BOOL LLColorSwatchCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
 	if( hasMouseCapture() )
 	{
 		// Release the mouse
-		gViewerWindow->setMouseCapture( NULL );
+		gFocusMgr.setMouseCapture( NULL );
 
 		// If mouseup in the widget, it's been clicked
 		if ( pointInView(x, y) )
@@ -351,10 +351,10 @@ LLXMLNodePtr LLColorSwatchCtrl::getXML(bool save_children) const
 
 LLView* LLColorSwatchCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("colorswatch");
+	std::string name("colorswatch");
 	node->getAttributeString("name", name);
 
-	LLString label;
+	std::string label;
 	node->getAttributeString("label", label);
 
 	LLColor4 color(1.f, 1.f, 1.f, 1.f);
diff --git a/linden/indra/newview/llcommandlineparser.cpp b/linden/indra/newview/llcommandlineparser.cpp
index 45f33dc..dc6a1e2 100644
--- a/linden/indra/newview/llcommandlineparser.cpp
+++ b/linden/indra/newview/llcommandlineparser.cpp
@@ -218,20 +218,20 @@ protected:
 //----------------------------------------------------------------------------
 // LLCommandLineParser defintions
 //----------------------------------------------------------------------------
-void LLCommandLineParser::addOptionDesc(const LLString& option_name, 
+void LLCommandLineParser::addOptionDesc(const std::string& option_name, 
                                         boost::function1<void, const token_vector_t&> notify_callback,
                                         unsigned int token_count,
-                                        const LLString& description,
-                                        const LLString& short_name,
+                                        const std::string& description,
+                                        const std::string& short_name,
                                         bool composing,
                                         bool positional,
                                         bool last_option)
 {
     // Compose the name for boost::po. 
     // It takes the format "long_name, short name"
-    const LLString comma(",");
-    LLString boost_option_name = option_name;
-    if(short_name != LLString::null)
+    const std::string comma(",");
+    std::string boost_option_name = option_name;
+    if(short_name != LLStringUtil::null)
     {
         boost_option_name += comma;
         boost_option_name += short_name;
@@ -413,7 +413,7 @@ const LLCommandLineParser::token_vector_t& LLCommandLineParser::getOption(const
 // LLControlGroupCLP defintions
 //----------------------------------------------------------------------------
 void setControlValueCB(const LLCommandLineParser::token_vector_t& value, 
-                       const LLString& opt_name, 
+                       const std::string& opt_name, 
                        LLControlGroup* ctrlGroup)
 {
     if(value.size() > 1)
@@ -442,7 +442,7 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
             {
                 // There's a token. check the string for true/false/1/0 etc.
                 BOOL result = false;
-                BOOL gotSet = LLString::convertToBOOL(value[0], result);
+                BOOL gotSet = LLStringUtil::convertToBOOL(value[0], result);
                 if(gotSet)
                 {
                     ctrl->setValue(LLSD(result), false);
@@ -489,14 +489,14 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
     }
 }
 
-void LLControlGroupCLP::configure(const LLString& config_filename, LLControlGroup* controlGroup)
+void LLControlGroupCLP::configure(const std::string& config_filename, LLControlGroup* controlGroup)
 {
     // This method reads the llsd based config file, and uses it to set 
     // members of a control group.
     LLSD clpConfigLLSD;
     
     llifstream input_stream;
-    input_stream.open(config_filename.c_str(), std::ios::in | std::ios::binary);
+    input_stream.open(config_filename, std::ios::in | std::ios::binary);
 
     if(input_stream.is_open())
     {
@@ -508,13 +508,13 @@ void LLControlGroupCLP::configure(const LLString& config_filename, LLControlGrou
             LLSD::String long_name = option_itr->first;
             LLSD option_params = option_itr->second;
             
-            LLString desc("n/a");
+            std::string desc("n/a");
             if(option_params.has("desc"))
             {
                 desc = option_params["desc"].asString();
             }
             
-            LLString short_name = LLString::null;
+            std::string short_name = LLStringUtil::null;
             if(option_params.has("short"))
             {
                 short_name = option_params["short"].asString();
@@ -547,7 +547,7 @@ void LLControlGroupCLP::configure(const LLString& config_filename, LLControlGrou
             boost::function1<void, const token_vector_t&> callback;
             if(option_params.has("map-to") && (NULL != controlGroup))
             {
-                LLString controlName = option_params["map-to"].asString();
+                std::string controlName = option_params["map-to"].asString();
                 callback = boost::bind(setControlValueCB, _1, 
                                        controlName, controlGroup);
             }
diff --git a/linden/indra/newview/llcommandlineparser.h b/linden/indra/newview/llcommandlineparser.h
index e281871..601a255 100644
--- a/linden/indra/newview/llcommandlineparser.h
+++ b/linden/indra/newview/llcommandlineparser.h
@@ -62,11 +62,11 @@ public:
 	 * @param description The text description of the option usage.
 	 */
 	void addOptionDesc(
-					   const LLString& option_name, 
+					   const std::string& option_name, 
 					   boost::function1<void, const token_vector_t&> notify_callback = 0,
 					   unsigned int num_tokens = 0,
-					   const LLString& description = LLString::null,
-					   const LLString& short_name = LLString::null,
+					   const std::string& description = LLStringUtil::null,
+					   const std::string& short_name = LLStringUtil::null,
 					   bool composing = false,
 					   bool positional = false,
 					   bool last_option = false);
@@ -159,7 +159,7 @@ public:
 	 *
 	 * *FIX:Mani Specify config file format.
 	 */
-	void configure(const LLString& config_filename, 
+	void configure(const std::string& config_filename, 
 				   LLControlGroup* controlGroup);
 };
 
diff --git a/linden/indra/newview/llcompass.h b/linden/indra/newview/llcompass.h
index fa16095..4f1498f 100644
--- a/linden/indra/newview/llcompass.h
+++ b/linden/indra/newview/llcompass.h
@@ -39,10 +39,6 @@
 #include "v4color.h"
 #endif
 
-//const char TAB = '\t';
-//const char DIVIDER[] = " / ";
-
-
 class LLCompass : public LLView
 {
 protected:
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index 45d8e1c..fc2742f 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -42,6 +42,8 @@
 #include "llcompilequeue.h"
 
 #include "llagent.h"
+#include "llassetuploadqueue.h"
+#include "llassetuploadresponders.h"
 #include "llchat.h"
 #include "llviewerwindow.h"
 #include "llviewerobject.h"
@@ -63,29 +65,24 @@
 ///----------------------------------------------------------------------------
 
 // *TODO:Translate
-const char* COMPILE_QUEUE_TITLE = "Recompilation Progress";
-const char* COMPILE_START_STRING = "recompile";
-const char* RESET_QUEUE_TITLE = "Reset Progress";
-const char* RESET_START_STRING = "reset";
-const char* RUN_QUEUE_TITLE = "Set Running Progress";
-const char* RUN_START_STRING = "set running";
-const char* NOT_RUN_QUEUE_TITLE = "Set Not Running Progress";
-const char* NOT_RUN_START_STRING = "set not running";
-
-struct LLCompileQueueData
-{
-	LLUUID mQueueID;
-	LLUUID mOldAssetID;
-	LLCompileQueueData(const LLUUID& q_id, const LLUUID& old_asset_id) :
-		mQueueID(q_id), mOldAssetID(old_asset_id) {}
-};
+const std::string COMPILE_QUEUE_TITLE("Recompilation Progress");
+const std::string COMPILE_START_STRING("recompile");
+const std::string RESET_QUEUE_TITLE("Reset Progress");
+const std::string RESET_START_STRING("reset");
+const std::string RUN_QUEUE_TITLE("Set Running Progress");
+const std::string RUN_START_STRING("set running");
+const std::string NOT_RUN_QUEUE_TITLE("Set Not Running Progress");
+const std::string NOT_RUN_START_STRING("set not running");
 
 struct LLScriptQueueData
 {
 	LLUUID mQueueID;
-	LLString mScriptName;
-	LLScriptQueueData(const LLUUID& q_id, const char* name) :
-		mQueueID(q_id), mScriptName(name) {}
+	std::string mScriptName;
+	LLUUID mTaskId;
+	LLUUID mItemId;
+	LLScriptQueueData(const LLUUID& q_id, const std::string& name, const LLUUID& task_id, const LLUUID& item_id) :
+		mQueueID(q_id), mScriptName(name), mTaskId(task_id), mItemId(item_id) {}
+
 };
 
 ///----------------------------------------------------------------------------
@@ -98,14 +95,15 @@ LLMap<LLUUID, LLFloaterScriptQueue*> LLFloaterScriptQueue::sInstances;
 
 // Default constructor
 LLFloaterScriptQueue::LLFloaterScriptQueue(const std::string& name,
-											 const LLRect& rect,
-											 const char* title,
-											 const char* start_string) :
+										   const LLRect& rect,
+										   const std::string& title,
+										   const std::string& start_string) :
 	LLFloater(name, rect, title,
 			  RESIZE_YES, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT,
 			  DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
 {
-
+	mID.generate();
+	
 	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_queue.xml");
 
 	childSetAction("close",onCloseBtn,this);
@@ -113,11 +111,8 @@ LLFloaterScriptQueue::LLFloaterScriptQueue(const std::string& name,
 
 	setTitle(title);
 	
-	if (!getHost())
-	{
-		LLRect curRect = getRect();
-		translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
-	}
+	LLRect curRect = getRect();
+	translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
 	
 	mStartString = start_string;
 	mDone = FALSE;
@@ -198,8 +193,8 @@ void LLFloaterScriptQueue::addObject(const LLUUID& id)
 BOOL LLFloaterScriptQueue::start()
 {
 	//llinfos << "LLFloaterCompileQueue::start()" << llendl;
-	char buffer[MAX_STRING]; 				/*Flawfinder: ignore*/
-	snprintf(buffer, sizeof(buffer), "Starting %s of %d items.", mStartString, mObjectIDs.count()); 		/* Flawfinder: ignore */
+	std::string buffer;
+	buffer = llformat("Starting %s of %d items.", mStartString.c_str(), mObjectIDs.count()); // *TODO: Translate
 	
 	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 	list->addCommentText(buffer);
@@ -238,8 +233,7 @@ BOOL LLFloaterScriptQueue::nextObject()
 		LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 
 		mDone = TRUE;
-		char buffer[MAX_STRING];		/*Flawfinder: ignore*/
-		snprintf(buffer, sizeof(buffer), "Done.");				/* Flawfinder: ignore */
+		std::string buffer = "Done."; // *TODO: Translate
 		list->addCommentText(buffer);
 		childSetEnabled("close",TRUE);
 	}
@@ -280,15 +274,57 @@ BOOL LLFloaterScriptQueue::popNext()
 ///----------------------------------------------------------------------------
 
 // static
-LLFloaterCompileQueue* LLFloaterCompileQueue::create()
+LLFloaterCompileQueue* LLFloaterCompileQueue::create(BOOL mono)
 {
 	S32 left, top;
 	gFloaterView->getNewFloaterPosition(&left, &top);
 	LLRect rect = gSavedSettings.getRect("CompileOutputRect");
 	rect.translate(left - rect.mLeft, top - rect.mTop);
-	LLFloaterCompileQueue* new_queue = new LLFloaterCompileQueue("queue",
-																 rect);
-	new_queue->open(); 	 	/*Flawfinder: ignore*/ 
+	LLFloaterCompileQueue* new_queue = new LLFloaterCompileQueue("queue", rect);
+	
+	class LLCompileFloaterUploadQueueSupplier : public LLAssetUploadQueueSupplier
+	{
+	public:
+	
+		LLCompileFloaterUploadQueueSupplier(const LLUUID& queue_id) :
+			mQueueId(queue_id)
+		{
+		}
+		
+		virtual LLAssetUploadQueue* get() const 
+		{
+			LLFloaterCompileQueue* queue = 
+				(LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
+			
+			if(NULL == queue)
+			{
+				return NULL;
+			}
+			
+			return queue->mUploadQueue;
+		}
+
+		virtual void log(std::string message) const
+		{
+			LLFloaterCompileQueue* queue = 
+				(LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
+
+			if(NULL == queue)
+			{
+				return;
+			}
+
+			LLScrollListCtrl* list = queue->getChild<LLScrollListCtrl>("queue output");
+			list->addCommentText(message.c_str());
+		}
+		
+	private:
+		LLUUID mQueueId;
+	};
+																 															 
+	new_queue->mUploadQueue = new LLAssetUploadQueue(new LLCompileFloaterUploadQueueSupplier(new_queue->getID()));															 
+	new_queue->mMono = mono;
+	new_queue->open();
 	return new_queue;
 }
 
@@ -306,7 +342,7 @@ void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
 	// find all of the lsl, leaving off duplicates. We'll remove
 	// all matching asset uuids on compilation success.
 
-	typedef std::map<LLUUID, LLPointer<LLInventoryItem> > uuid_item_map;
+	typedef std::multimap<LLUUID, LLPointer<LLInventoryItem> > uuid_item_map;
 	uuid_item_map asset_item_map;
 
 	InventoryObjectList::const_iterator it = inv->begin();
@@ -317,17 +353,12 @@ void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
 		{
 			LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
 			// Check permissions before allowing the user to retrieve data.
-			if (item->getPermissions().allowModifyBy(gAgent.getID())  &&
-				item->getPermissions().allowCopyBy(gAgent.getID()) )
+			if (item->getPermissions().allowModifyBy(gAgent.getID(), gAgent.getGroupID())  &&
+				item->getPermissions().allowCopyBy(gAgent.getID(), gAgent.getGroupID()) )
 			{
 				LLPointer<LLViewerInventoryItem> script = new LLViewerInventoryItem(item);
 				mCurrentScripts.put(script);
-
-				if (!asset_item_map.count(item->getAssetUUID()))
-				{
-					// No entry, put in an entry for this supposedly permissive script
-					asset_item_map[item->getAssetUUID()] = item;
-				}
+				asset_item_map.insert(std::make_pair(item->getAssetUUID(), item));
 			}
 		}
 	}
@@ -344,7 +375,10 @@ void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
 		for(iter = asset_item_map.begin(); iter != asset_item_map.end(); iter++)
 		{
 			LLInventoryItem *itemp = iter->second;
-			LLScriptQueueData* datap = new LLScriptQueueData(getID(), itemp->getName().c_str());
+			LLScriptQueueData* datap = new LLScriptQueueData(getID(),
+												 itemp->getName(),
+												 viewer_object->getID(),
+												 itemp->getUUID());
 
 			//llinfos << "ITEM NAME 2: " << names.get(i) << llendl;
 			gAssetStorage->getInvItemAsset(viewer_object->getRegion()->getHost(),
@@ -361,7 +395,6 @@ void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
 	}
 }
 
-
 // This is the callback for when each script arrives
 // static
 void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
@@ -373,42 +406,69 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 	if(!data) return;
 	LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*> 
 				(LLFloaterScriptQueue::findInstance(data->mQueueID));
-	char buffer[MAX_STRING];		/*Flawfinder: ignore*/	
-	buffer[0] = '\0';
+	std::string buffer;
 	if(queue && (0 == status))
 	{
 		//llinfos << "ITEM NAME 3: " << data->mScriptName << llendl;
 
 		// Dump this into a file on the local disk so we can compile it.
-		char filename[LL_MAX_PATH] = "";		/*Flawfinder: ignore*/
+		std::string filename;
 		LLVFile file(vfs, asset_id, type);
-		char uuid_str[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
+		std::string uuid_str;
 		asset_id.toString(uuid_str);
-		snprintf(filename, sizeof(filename), "%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type)); 	/* Flawfinder: ignore */
-
-		LLFILE *fp = LLFile::fopen(filename, "wb");	 /*Flawfinder: ignore*/
-		if (fp)
+		filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str) + llformat(".%s",LLAssetType::lookup(type));
+		
+		const bool is_running = true;
+		LLViewerObject* object = gObjectList.findObject(data->mTaskId);
+		if (object)
 		{
-			const S32 buf_size = 65536;
-			U8 copy_buf[buf_size];
-			while (file.read(copy_buf, buf_size)) 	 /*Flawfinder: ignore*/
+			std::string url = object->getRegion()->getCapability("UpdateScriptTask");
+			if(!url.empty())
+			{
+				// Read script source in to buffer.
+				U32 script_size = file.getSize();
+				U8* script_data = new U8[script_size];
+				file.read(script_data, script_size);
+
+				queue->mUploadQueue->queue(filename, data->mTaskId, 
+				data->mItemId, is_running, queue->mMono, queue->getID(),
+				script_data, script_size, data->mScriptName);
+			}
+			else
 			{
-				if (fwrite(copy_buf, file.getLastBytesRead(), 1, fp) < 1)
+				// It's now in the file, now compile it.
+				buffer = std::string("Downloaded, now compiling: ") + data->mScriptName; // *TODO: Translate
+
+				// Write script to local file for compilation.
+				LLFILE *fp = LLFile::fopen(filename, "wb");	 /*Flawfinder: ignore*/
+				if (fp)
 				{
-					// return a bad file error if we can't write the whole thing
-					status = LL_ERR_CANNOT_OPEN_FILE;
+					const S32 buf_size = 65536;
+					U8 copy_buf[buf_size];
+					
+					while (file.read(copy_buf, buf_size)) 	 /*Flawfinder: ignore*/
+					{
+						if (fwrite(copy_buf, file.getLastBytesRead(), 1, fp) < 1)
+						{
+							// return a bad file error if we can't write the whole thing
+							status = LL_ERR_CANNOT_OPEN_FILE;
+						}
+					}
+
+					fclose(fp);
+				}
+				else
+				{
+					llerrs << "Unable to find object to compile" << llendl;
 				}
-			}
 
-			fclose(fp);
+				// TODO: babbage: No compile if no cap.
+				queue->compile(filename, data->mItemId);
+					
+				// Delete it after we're done compiling?
+				LLFile::remove(filename);
+			}
 		}
-
-		// It's now in the file, now compile it.
-		snprintf(buffer, sizeof(buffer), "Downloaded, now compiling '%s'.", data->mScriptName.c_str());  	/* Flawfinder: ignore */
-		queue->compile(filename, asset_id);
-
-		// Delete it after we're done compiling?
-		LLFile::remove(filename);
 	}
 	else
 	{
@@ -416,28 +476,25 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 
 		if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status )
 		{
-			LLChat chat("Script not found on server.");
+			LLChat chat(std::string("Script not found on server.")); // *TODO: Translate
 			LLFloaterChat::addChat(chat);
-			snprintf(buffer, sizeof(buffer), "Problem downloading %s.", 	/* Flawfinder: ignore */
-				data->mScriptName.c_str());
+			buffer = std::string("Problem downloading: ") + data->mScriptName; // *TODO: Translate
 		}
 		else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
 		{
-			LLChat chat("Insufficient permissions to download a script.");
+			LLChat chat(std::string("Insufficient permissions to download a script.")); // *TODO: Translate
 			LLFloaterChat::addChat(chat);
-			snprintf(buffer, sizeof(buffer), "Insufficient permissions for '%s'.", 	/* Flawfinder: ignore */
-				data->mScriptName.c_str());
+			buffer = std::string("Insufficient permissions for: ") + data->mScriptName; // *TODO: Translate
 		}
 		else
 		{
-			snprintf(buffer, sizeof(buffer), "Unknown failure to download %s.", 	/* Flawfinder: ignore */
-				data->mScriptName.c_str());
+			buffer = std::string("Unknown failure to download ") + data->mScriptName; // *TODO: Translate
 		}
 
 		llwarns << "Problem downloading script asset." << llendl;
-		if(queue) queue->removeItemByAssetID(asset_id);
+		if(queue) queue->removeItemByItemID(data->mItemId);
 	}
-	if(queue) 
+	if(queue && (buffer.size() > 0)) 
 	{
 		LLScrollListCtrl* list = queue->getChild<LLScrollListCtrl>("queue output");
 		list->addCommentText(buffer);
@@ -452,7 +509,7 @@ void LLFloaterCompileQueue::onSaveTextComplete(const LLUUID& asset_id, void* use
 	if (status)
 	{
 		llwarns << "Unable to save text for script." << llendl;
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("CompileQueueSaveText", args);
 	}
@@ -467,14 +524,13 @@ void LLFloaterCompileQueue::onSaveBytecodeComplete(const LLUUID& asset_id, void*
 				(LLFloaterScriptQueue::findInstance(data->mQueueID));
 	if(queue && (0 == status) && data)
 	{
-		queue->updateAssetID(data->mOldAssetID, asset_id);
-		queue->saveItemByAssetID(asset_id);
-		queue->removeItemByAssetID(asset_id);
+		queue->saveItemByItemID(data->mItemId);
+		queue->removeItemByItemID(data->mItemId);
 	}
 	else
 	{
 		llwarns << "Unable to save bytecode for script." << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("CompileQueueSaveBytecode", args);
 	}
@@ -483,47 +539,52 @@ void LLFloaterCompileQueue::onSaveBytecodeComplete(const LLUUID& asset_id, void*
 }
 
 // compile the file given and save it out.
-void LLFloaterCompileQueue::compile(const char* filename,
-									const LLUUID& asset_id)
+void LLFloaterCompileQueue::compile(const std::string& filename,
+									const LLUUID& item_id)
 {
 	LLUUID new_asset_id;
 	LLTransactionID tid;
 	tid.generate();
 	new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
 	
-	char uuid_string[UUID_STR_LENGTH];  /*Flawfinder: ignore*/
+	std::string uuid_string;
 	new_asset_id.toString(uuid_string);
-	char dst_filename[LL_MAX_PATH];	 /*Flawfinder: ignore*/
-	snprintf(dst_filename, sizeof(dst_filename), "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());	 	/* Flawfinder: ignore */
-	char err_filename[LL_MAX_PATH];	 /*Flawfinder: ignore*/
-	snprintf(err_filename, sizeof(err_filename), "%s.out", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());	 	/* Flawfinder: ignore */
+	std::string dst_filename;
+	dst_filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string) + ".lso";
+	std::string err_filename;
+	err_filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string) + ".out";
 
 	gAssetStorage->storeAssetData(filename, tid,
 								  LLAssetType::AT_LSL_TEXT,
 								  &onSaveTextComplete, NULL, FALSE);
-	if(!lscript_compile(filename, dst_filename, err_filename, gAgent.isGodlike()))
+
+	const BOOL compile_to_mono = FALSE;
+	if(!lscript_compile(filename.c_str(), dst_filename.c_str(),
+						err_filename.c_str(), compile_to_mono,
+						uuid_string.c_str(), gAgent.isGodlike()))
 	{
 		llwarns << "compile failed" << llendl;
-		removeItemByAssetID(asset_id);
+		removeItemByItemID(item_id);
 	}
 	else
 	{
 		llinfos << "compile successful." << llendl;
-		// Save the bytecode
-		LLCompileQueueData* data = new LLCompileQueueData(mID, asset_id);
-		gAssetStorage->storeAssetData(dst_filename, tid,
-									  LLAssetType::AT_LSL_BYTECODE,
-									  &onSaveBytecodeComplete,
-									  (void*)data, FALSE);
+		
+		// Save LSL bytecode
+		LLCompileQueueData* data = new LLCompileQueueData(mID, item_id);
+		gAssetStorage->storeAssetData(dst_filename, new_asset_id,
+									LLAssetType::AT_LSL_BYTECODE,
+									&LLFloaterCompileQueue::onSaveBytecodeComplete,
+									(void*)data, FALSE);
 	}
 }
 
-void LLFloaterCompileQueue::removeItemByAssetID(const LLUUID& asset_id)
+void LLFloaterCompileQueue::removeItemByItemID(const LLUUID& asset_id)
 {
 	llinfos << "LLFloaterCompileQueue::removeItemByAssetID()" << llendl;
 	for(S32 i = 0; i < mCurrentScripts.count(); )
 	{
-		if(asset_id == mCurrentScripts.get(i)->getAssetUUID())
+		if(asset_id == mCurrentScripts.get(i)->getUUID())
 		{
 			mCurrentScripts.remove(i);
 		}
@@ -538,7 +599,21 @@ void LLFloaterCompileQueue::removeItemByAssetID(const LLUUID& asset_id)
 	}
 }
 
-void LLFloaterCompileQueue::saveItemByAssetID(const LLUUID& asset_id)
+const LLInventoryItem* LLFloaterCompileQueue::findItemByItemID(const LLUUID& asset_id) const
+{
+	LLInventoryItem* result = NULL;
+	S32 count = mCurrentScripts.count();
+	for(S32 i = 0; i < count; ++i)
+	{
+		if(asset_id == mCurrentScripts.get(i)->getUUID())
+		{
+			result = mCurrentScripts.get(i);
+		}
+	}
+	return result;
+}
+
+void LLFloaterCompileQueue::saveItemByItemID(const LLUUID& asset_id)
 {
 	llinfos << "LLFloaterCompileQueue::saveItemByAssetID()" << llendl;
 	LLViewerObject* viewer_object = gObjectList.findObject(mCurrentObjectID);
@@ -547,7 +622,7 @@ void LLFloaterCompileQueue::saveItemByAssetID(const LLUUID& asset_id)
 		S32 count = mCurrentScripts.count();
 		for(S32 i = 0; i < count; ++i)
 		{
-			if(asset_id == mCurrentScripts.get(i)->getAssetUUID())
+			if(asset_id == mCurrentScripts.get(i)->getUUID())
 			{
 				// *FIX: this auto-resets active to TRUE. That might
 				// be a bad idea.
@@ -561,20 +636,6 @@ void LLFloaterCompileQueue::saveItemByAssetID(const LLUUID& asset_id)
 	}
 }
 
-// find old_asst_id, and set the asset id to new_asset_id
-void LLFloaterCompileQueue::updateAssetID(const LLUUID& old_asset_id,
-										  const LLUUID& new_asset_id)
-{
-	S32 count = mCurrentScripts.count();
-	for(S32 i = 0; i < count; ++i)
-	{
-		if(old_asset_id == mCurrentScripts.get(i)->getAssetUUID())
-		{
-			mCurrentScripts.get(i)->setAssetUUID(new_asset_id);
-		}
-	}
-}
-
 ///----------------------------------------------------------------------------
 /// Class LLFloaterResetQueue
 ///----------------------------------------------------------------------------
@@ -586,9 +647,9 @@ LLFloaterResetQueue* LLFloaterResetQueue::create()
 	gFloaterView->getNewFloaterPosition(&left, &top);
 	LLRect rect = gSavedSettings.getRect("CompileOutputRect");
 	rect.translate(left - rect.mLeft, top - rect.mTop);
-	LLFloaterResetQueue* new_queue = new LLFloaterResetQueue("queue",
-																 rect);
-	new_queue->open();	 /*Flawfinder: ignore*/
+	LLFloaterResetQueue* new_queue = new LLFloaterResetQueue("queue", rect);
+	gFloaterView->addChild(new_queue);
+	new_queue->open();
 	return new_queue;
 }
 
@@ -619,8 +680,8 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
 			{
 				LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-				char buffer[MAX_STRING];		 /*Flawfinder: ignore*/
-				snprintf(buffer, sizeof(buffer), "Resetting '%s'.", item->getName().c_str());		 	/* Flawfinder: ignore */
+				std::string buffer;
+				buffer = std::string("Resetting: ") + item->getName(); // *TODO: Translate
 				list->addCommentText(buffer);
 				LLMessageSystem* msg = gMessageSystem;
 				msg->newMessageFast(_PREHASH_ScriptReset);
@@ -649,8 +710,7 @@ LLFloaterRunQueue* LLFloaterRunQueue::create()
 	gFloaterView->getNewFloaterPosition(&left, &top);
 	LLRect rect = gSavedSettings.getRect("CompileOutputRect");
 	rect.translate(left - rect.mLeft, top - rect.mTop);
-	LLFloaterRunQueue* new_queue = new LLFloaterRunQueue("queue",
-																 rect);
+	LLFloaterRunQueue* new_queue = new LLFloaterRunQueue("queue", rect);
 	new_queue->open();		 /*Flawfinder: ignore*/
 	return new_queue;
 }
@@ -682,8 +742,8 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
 			{
 				LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-				char buffer[MAX_STRING];  	/*Flawfinder: ignore*/
-				snprintf(buffer, sizeof(buffer), "Running '%s'.", item->getName().c_str());		 	/* Flawfinder: ignore */
+				std::string buffer;
+				buffer = std::string("Running: ") + item->getName(); // *TODO: Translate
 				list->addCommentText(buffer);
 
 				LLMessageSystem* msg = gMessageSystem;
@@ -714,8 +774,7 @@ LLFloaterNotRunQueue* LLFloaterNotRunQueue::create()
 	gFloaterView->getNewFloaterPosition(&left, &top);
 	LLRect rect = gSavedSettings.getRect("CompileOutputRect");
 	rect.translate(left - rect.mLeft, top - rect.mTop);
-	LLFloaterNotRunQueue* new_queue = new LLFloaterNotRunQueue("queue",
-																 rect);
+	LLFloaterNotRunQueue* new_queue = new LLFloaterNotRunQueue("queue", rect);
 	new_queue->open();	 /*Flawfinder: ignore*/
 	return new_queue;
 }
@@ -747,8 +806,8 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
 			{
 				LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-				char buffer[MAX_STRING];		 /*Flawfinder: ignore*/
-				snprintf(buffer, sizeof(buffer), "Not running '%s'.", item->getName().c_str());	 	/* Flawfinder: ignore */
+				std::string buffer;
+				buffer = std::string("Not running: ") +item->getName(); // *TODO: Translate
 				list->addCommentText(buffer);
 	
 				LLMessageSystem* msg = gMessageSystem;
diff --git a/linden/indra/newview/llcompilequeue.h b/linden/indra/newview/llcompilequeue.h
index 9f83f27..6a3a10a 100644
--- a/linden/indra/newview/llcompilequeue.h
+++ b/linden/indra/newview/llcompilequeue.h
@@ -64,9 +64,12 @@ public:
 	// start() returns TRUE if the queue has started, otherwise FALSE.
 	BOOL start();
 
+	// find an instance by ID. Return NULL if it does not exist.
+	static LLFloaterScriptQueue* findInstance(const LLUUID& id);
+
 protected:
 	LLFloaterScriptQueue(const std::string& name, const LLRect& rect,
-						 const char* title, const char* start_string);
+						 const std::string& title, const std::string& start_string);
 	virtual ~LLFloaterScriptQueue();
 
 	// This is the callback method for the viewer object currently
@@ -92,9 +95,6 @@ protected:
 
 	// Get this instances ID.
 	const LLUUID& getID() const { return mID; } 
-
-	// find an instance by ID. Return NULL if it does not exist.
-	static LLFloaterScriptQueue* findInstance(const LLUUID& id);
 	
 protected:
 	// UI
@@ -109,7 +109,7 @@ protected:
 	LLUUID mID;
 	static LLMap<LLUUID, LLFloaterScriptQueue*> sInstances;
 
-	const char* mStartString;
+	std::string mStartString;
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -118,12 +118,29 @@ protected:
 // This script queue will recompile each script.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+struct LLCompileQueueData
+{
+	LLUUID mQueueID;
+	LLUUID mItemId;
+	LLCompileQueueData(const LLUUID& q_id, const LLUUID& item_id) :
+		mQueueID(q_id), mItemId(item_id) {}
+};
+
+class LLAssetUploadQueue;
+
 class LLFloaterCompileQueue : public LLFloaterScriptQueue
 {
 public:
 	// Use this method to create a compile queue. Once created, it
 	// will be responsible for it's own destruction.
-	static LLFloaterCompileQueue* create();
+	static LLFloaterCompileQueue* create(BOOL mono);
+
+	static void onSaveBytecodeComplete(const LLUUID& asset_id,
+									void* user_data,
+									S32 status);
+									
+	// remove any object in mScriptScripts with the matching uuid.
+	void removeItemByItemID(const LLUUID& item_id);
 
 protected:
 	LLFloaterCompileQueue(const std::string& name, const LLRect& rect);
@@ -139,24 +156,29 @@ protected:
 								void* user_data, S32 status, LLExtStat ext_status);
 
 	static void onSaveTextComplete(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status);
+
 	static void onSaveBytecodeComplete(const LLUUID& asset_id,
 									   void* user_data,
 									   S32 status, LLExtStat ext_status);
 
 	// compile the file given and save it out.
-	void compile(const char* filename, const LLUUID& asset_id);
+	void compile(const std::string& filename, const LLUUID& asset_id);
 	
 	// remove any object in mScriptScripts with the matching uuid.
 	void removeItemByAssetID(const LLUUID& asset_id);
 
-	// save the items indicatd by the asset id.
-	void saveItemByAssetID(const LLUUID& asset_id);
+	// save the items indicated by the item id.
+	void saveItemByItemID(const LLUUID& item_id);
 
-	// find old_asst_id, and set the asset id to new_asset_id
-	void updateAssetID(const LLUUID& old_asset_id, const LLUUID& new_asset_id);
+	// find InventoryItem given item id.
+	const LLInventoryItem* findItemByItemID(const LLUUID& item_id) const;
 
 protected:
 	LLViewerInventoryItem::item_array_t mCurrentScripts;
+
+private:
+	BOOL mMono; // Compile to mono.
+	LLAssetUploadQueue* mUploadQueue;
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/linden/indra/newview/llconfirmationmanager.cpp b/linden/indra/newview/llconfirmationmanager.cpp
index 01b0a23..0e56452 100644
--- a/linden/indra/newview/llconfirmationmanager.cpp
+++ b/linden/indra/newview/llconfirmationmanager.cpp
@@ -59,7 +59,7 @@ static void onConfirmAlert(S32 option, void* data)
 }
 
 static void onConfirmAlertPassword(
-	S32 option, const LLString& text, void* data)
+	S32 option, const std::string& text, void* data)
 {
 	LLConfirmationManager::ListenerBase* listener
 		= (LLConfirmationManager::ListenerBase*)data;
@@ -77,7 +77,7 @@ void LLConfirmationManager::confirm(Type type,
 	const std::string& action,
 	ListenerBase* listener)
 {
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[ACTION]"] = action;
 
 	switch (type)
@@ -91,7 +91,7 @@ void LLConfirmationManager::confirm(Type type,
 		  gViewerWindow->alertXmlEditText("ConfirmPurchasePassword", args,
 										  NULL, NULL,
 										  onConfirmAlertPassword, listener,
-										  LLString::format_map_t(),
+										  LLStringUtil::format_map_t(),
 										  TRUE);
 		  break;
 		case TYPE_NONE:
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 08ef124..c2aaa01 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -43,6 +43,7 @@
 #include "llviewerimage.h"
 #include "llviewerimagelist.h"
 #include "llviewerwindow.h"
+#include "llsd.h"
 #include "llfontgl.h"
 #include "llmath.h"
 
@@ -60,9 +61,7 @@ LLConsole::LLConsole(const std::string& name, const U32 max_lines, const LLRect
 					 S32 font_size_index, F32 persist_time ) 
 	: 
 	LLFixedBuffer(max_lines),
-	LLView(name, rect, FALSE),
-	mLastBoxHeight(0),
-	mLastBoxWidth(0)
+	LLView(name, rect, FALSE)
 {
 	mLinePersistTime = persist_time;		// seconds
 	mFadeTime = persist_time - FADE_DURATION;
@@ -71,11 +70,6 @@ LLConsole::LLConsole(const std::string& name, const U32 max_lines, const LLRect
 	setMaxLines(gSavedSettings.getS32("ConsoleMaxLines"));
 }
 
-LLConsole::~LLConsole()
-{
-	mColors.clear();
-}
-
 void LLConsole::setLinePersistTime(F32 seconds)
 {
 	mLinePersistTime = seconds;
@@ -87,7 +81,21 @@ void LLConsole::reshape(S32 width, S32 height, BOOL called_from_parent)
 	S32 new_width = llmax(50, llmin(getRect().getWidth(), gViewerWindow->getWindowWidth()));
 	S32 new_height = llmax(llfloor(mFont->getLineHeight()) + 15, llmin(getRect().getHeight(), gViewerWindow->getWindowHeight()));
 
+	if (   mConsoleWidth == new_width
+		&& mConsoleHeight == new_height )
+	{
+		return;
+	}
+	
+	mConsoleWidth = new_width;
+	mConsoleHeight= new_height;
+	
 	LLView::reshape(new_width, new_height, called_from_parent);
+	
+	for(paragraph_t::iterator paragraph_it = mParagraphs.begin(); paragraph_it != mParagraphs.end(); paragraph_it++)
+	{
+		(*paragraph_it).updateLines((F32)getRect().getWidth(), mFont, true);
+	}
 }
 
 void LLConsole::setFontSize(S32 size_index)
@@ -108,91 +116,104 @@ void LLConsole::setFontSize(S32 size_index)
 	{
 		mFont = LLFontGL::sSansSerifHuge;
 	}
+	
+	for(paragraph_t::iterator paragraph_it = mParagraphs.begin(); paragraph_it != mParagraphs.end(); paragraph_it++)
+	{
+		(*paragraph_it).updateLines((F32)getRect().getWidth(), mFont, true);
+	}
 }
 
 void LLConsole::draw()
 {
 	LLGLSUIDefault gls_ui;
 
-	addQueuedLines();
-
 	// skip lines added more than mLinePersistTime ago
 	F32 cur_time = mTimer.getElapsedTimeF32();
 	
-	if( LLStartUp::getStartupState() != STATE_STARTED )
-	{
-		S32 count = mLines.size();
-		S32 i = 0;
-		while( count-- )
-		{
-			mAddTimes[i] = cur_time;
-			i = (i+1) % mMaxLines;
-		}
-	}
-
 	F32 skip_time = cur_time - mLinePersistTime;
 	F32 fade_time = cur_time - mFadeTime;
 
-	// draw remaining lines
-	F32 x_pos = 0.f;
-	F32 y_pos = 0.f;
+	if (mParagraphs.empty()) 	//No text to draw.
+	{
+		return;
+	}
 
-	S32 line_count = mLines.size();
+	U32 num_lines=0;
 
-	// remove stale lines
-	for (S32 line_num = 0; line_num < line_count; line_num++)
+	paragraph_t::reverse_iterator paragraph_it;
+	paragraph_it = mParagraphs.rbegin();
+	U32 paragraph_num=mParagraphs.size();
+	
+	while (!mParagraphs.empty() && paragraph_it != mParagraphs.rend())
 	{
-		if((mLinePersistTime > 0.f) && (mAddTimes[0] - skip_time)/(mLinePersistTime - mFadeTime) <= 0.f)
-		{
-			mLines.pop_front();
-			mAddTimes.pop_front();
-			mLineLengths.pop_front();
-			mColors.pop_front();
+		num_lines += (*paragraph_it).mLines.size();
+		if(num_lines > mMaxLines 
+			|| ( (mLinePersistTime > (F32)0.f) && ((*paragraph_it).mAddTime - skip_time)/(mLinePersistTime - mFadeTime) <= (F32)0.f)) 
+		{							//All lines above here are done.  Lose them.
+			for (U32 i=0;i<paragraph_num;i++)
+			{
+				if (!mParagraphs.empty())
+					mParagraphs.pop_front();
+			}
+			break;
 		}
+		paragraph_num--;
+		paragraph_it++;
 	}
 
-	line_count = mLines.size();
-
-	S32 i;
-	if (line_count == 0)
+	if (mParagraphs.empty())
 	{
-		mLastBoxHeight = 0;
-		mLastBoxWidth = 0;
 		return;
 	}
-	else
-	{
-		LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
+	
+	// draw remaining lines
+	F32 y_pos = 0.f;
 
-		F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
-		LLColor4 color = gColors.getColor("ConsoleBackground");
-		color.mV[VALPHA] *= console_opacity;
+	LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
 
-		S32 max_width = 0;
-		for (i = 0; i < line_count; i++)
-		{
-			max_width = llmax(max_width, mFont->getWidth(mLines[i].c_str()) + 30);
-		}
-		max_width = llmin(max_width, gViewerWindow->getWindowWidth());
-
-		F32 u = 1.f;//LLCriticalDamp::getInterpolant(0.1f);
-		S32 target_height = llfloor(line_count * mFont->getLineHeight() + 15);
-		S32 target_width = max_width;
-		mLastBoxHeight = llmax(target_height, (S32)lerp((F32)mLastBoxHeight, (F32)target_height, u));
-		mLastBoxWidth = llmax(MIN_CONSOLE_WIDTH, llmax(target_width, (S32)lerp((F32)mLastBoxWidth, (F32)target_width, u)));
-		imagep->drawSolid(-15, -10, mLastBoxWidth + 15, mLastBoxHeight, color);
-	}
+	F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
+	LLColor4 color = gColors.getColor("ConsoleBackground");
+	color.mV[VALPHA] *= console_opacity;
 
-	y_pos += (line_count-1) * mFont->getLineHeight();
+	F32 line_height = mFont->getLineHeight();
 
+	S32 message_spacing=4;
+	
+//080813 Spatters:  This section makes a single huge black box behind all the text.
+	S32 bkg_height=4;
+	S32 bkg_width=0;
+	for(paragraph_it = mParagraphs.rbegin(); paragraph_it != mParagraphs.rend(); paragraph_it++)
+	{
+		S32 target_height = llfloor( (*paragraph_it).mLines.size() * line_height + message_spacing);
+		S32 target_width =  llfloor( (*paragraph_it).mMaxWidth +15);
+		
+		bkg_height+= target_height;
+		if (target_width > bkg_width) bkg_width=target_width;
+
+		y_pos += ((*paragraph_it).mLines.size()) * line_height;
+		y_pos  += message_spacing;  //Extra spacing between messages.
+	}
+	imagep->drawSolid(-14, (S32)(y_pos + line_height - bkg_height - message_spacing), bkg_width, bkg_height, color);
+	y_pos = 0.f;
+//End screen-eating black void
 
-	for (i = 0; i < line_count; i++)
+	for(paragraph_it = mParagraphs.rbegin(); paragraph_it != mParagraphs.rend(); paragraph_it++)
 	{
+//080813 Spatters:  Dainty per-message block boxes
+//		S32 target_height = llfloor( (*paragraph_it).mLines.size() * line_height + 8);
+		S32 target_width =  llfloor( (*paragraph_it).mMaxWidth +15);
+
+		y_pos += ((*paragraph_it).mLines.size()) * line_height;
+//080813 Spatters:  Dainty per-message block boxes
+//		imagep->drawSolid(-14, (S32)(y_pos + line_height - target_height), target_width, target_height, color);
+
+		F32 y_off=0;
+
 		F32 alpha;
 
-		if ((mLinePersistTime > 0.f) && (mAddTimes[i] < fade_time))
+		if ((mLinePersistTime > 0.f) && ((*paragraph_it).mAddTime < fade_time))
 		{
-			alpha = (mAddTimes[i] - skip_time)/(mLinePersistTime - mFadeTime);
+			alpha = ((*paragraph_it).mAddTime - skip_time)/(mLinePersistTime - mFadeTime);
 		}
 		else
 		{
@@ -201,26 +222,35 @@ void LLConsole::draw()
 
 		if( alpha > 0.f )
 		{
-			// text line itself
-			mFont->render(mLines[i], 0, x_pos, y_pos,
-				LLColor4(
-					mColors[i].mV[VRED], 
-					mColors[i].mV[VGREEN], 
-					mColors[i].mV[VBLUE], 
-					mColors[i].mV[VALPHA]*alpha),
-				LLFontGL::LEFT, 
-				LLFontGL::BASELINE,
-				LLFontGL::DROP_SHADOW,
-				S32_MAX,
-				mLastBoxWidth
-				);
+			for (lines_t::iterator line_it=(*paragraph_it).mLines.begin(); 
+					line_it != (*paragraph_it).mLines.end();
+					line_it ++)
+			{
+				for (line_color_segments_t::iterator seg_it = (*line_it).mLineColorSegments.begin();
+						seg_it != (*line_it).mLineColorSegments.end();
+						seg_it++)
+				{
+					mFont->render((*seg_it).mText, 0, (*seg_it).mXPosition - 8, y_pos -  y_off,
+						LLColor4(
+							(*seg_it).mColor.mV[VRED], 
+							(*seg_it).mColor.mV[VGREEN], 
+							(*seg_it).mColor.mV[VBLUE], 
+							(*seg_it).mColor.mV[VALPHA]*alpha),
+						LLFontGL::LEFT, 
+						LLFontGL::BASELINE,
+						LLFontGL::DROP_SHADOW,
+						S32_MAX,
+						target_width
+						);
+				}
+				y_off += line_height;
+			}
 		}
-
-		y_pos -= mFont->getLineHeight();
+		y_pos  += message_spacing;  //Extra spacing between messages.
 	}
 }
 
-void LLConsole::addLine(const LLString& utf8line)
+void LLConsole::addLine(const std::string& utf8line)
 {
 	LLWString wline = utf8str_to_wstring(utf8line);
 	addLine(wline, 0.f, LLColor4(1.f, 1.f, 1.f, 1.f));
@@ -231,80 +261,148 @@ void LLConsole::addLine(const LLWString& wline)
 	addLine(wline, 0.f, LLColor4(1.f, 1.f, 1.f, 1.f));
 }
 
-void LLConsole::addLine(const LLString& utf8line, F32 size, const LLColor4 &color)
+void LLConsole::addLine(const std::string& utf8line, F32 size, const LLColor4 &color)
 {
 	LLWString wline = utf8str_to_wstring(utf8line);
 	addLine(wline, size, color);
 }
 
-void LLConsole::addLine(const LLWString& wline, F32 size, const LLColor4 &color)
+//Generate highlight color segments for this paragraph.  Pass in default color of paragraph.
+void LLConsole::Paragraph::makeParagraphColorSegments (const LLColor4 &color) 
 {
-	while (mLineQueue.size() >= mMaxLines)
-	{
-		mLineQueue.pop_front();
+	LLSD paragraph_color_segments;
+	LLColor4 lcolor=color;
+	
+	paragraph_color_segments[0]["text"] =wstring_to_utf8str(mParagraphText);
+	LLSD color_sd = color.getValue();
+	paragraph_color_segments[0]["color"]=color_sd;
+
+	for(LLSD::array_const_iterator color_segment_it = paragraph_color_segments.beginArray();
+		color_segment_it != paragraph_color_segments.endArray();
+		++color_segment_it)
+	{			
+		LLSD color_llsd = (*color_segment_it)["color"];
+		std::string color_str  = (*color_segment_it)["text"].asString();
+
+		ParagraphColorSegment color_segment;
+		
+		color_segment.mColor.setValue(color_llsd);
+		color_segment.mNumChars = color_str.length();
+		
+		mParagraphColorSegments.push_back(color_segment);
 	}
-	mLineQueue.push_back(LineInfo(wline, size, color, mTimer.getElapsedTimeF32()));
-#if LL_WINDOWS && LL_LCD_COMPILE
-	// add to LCD screen
-	AddNewDebugConsoleToLCD(wline);
-#endif	
 }
 
-void LLConsole::addQueuedLines()
+//Called when a paragraph is added to the console or window is resized.
+void LLConsole::Paragraph::updateLines(F32 screen_width, LLFontGL* font, bool force_resize)
 {
-	for (line_queue_t::iterator iter = mLineQueue.begin();
-		 iter != mLineQueue.end(); ++iter)
+	if ( !force_resize )
+	{
+		if ( mMaxWidth >= 0.0f 
+		 &&  mMaxWidth < screen_width )
+		{
+			return;					//No resize required.
+		}
+	}
+	
+	screen_width = screen_width - 30;	//Margin for small windows.
+	
+	if (	mParagraphText.empty() 
+		|| mParagraphColorSegments.empty()
+		|| font == NULL)
+	{
+		return;					//Not enough info to complete.
+	}
+	
+	mLines.clear();				//Chuck everything.
+	mMaxWidth = 0.0f;
+	
+	paragraph_color_segments_t::iterator current_color = mParagraphColorSegments.begin();
+	U32 current_color_length = (*current_color).mNumChars;	
+	
+	S32 paragraph_offset = 0;			//Offset into the paragraph text.
+
+	// Wrap lines that are longer than the view is wide.
+	while( paragraph_offset < (S32)mParagraphText.length() )
 	{
-		LineInfo& line_info = *iter;
-		LLWString wline = line_info.wline;
-		//F32 size = line_info.size;
-		LLColor4 color = line_info.color;
-		if (!wline.empty() && mFont != NULL)
+		S32 skip_chars; // skip '\n'
+		// Figure out if a word-wrapped line fits here.
+		LLWString::size_type line_end = mParagraphText.find_first_of(llwchar('\n'), paragraph_offset);
+		if (line_end != LLWString::npos)
+		{
+			skip_chars = 1; // skip '\n'
+		}
+		else
 		{
-			// Wrap lines that are longer than the view is wide.
-			S32 line_start_offset = 0;
-			while( line_start_offset < (S32)wline.length() )
+			line_end = mParagraphText.size();
+			skip_chars = 0;
+		}
+
+		U32 drawable = font->maxDrawableChars(mParagraphText.c_str()+paragraph_offset, screen_width, line_end - paragraph_offset, TRUE);
+
+		if (drawable != 0)
+		{
+			F32 x_position = 0;						//Screen X position of text.
+			
+			mMaxWidth = llmax( mMaxWidth, (F32)font->getWidth( mParagraphText.substr( paragraph_offset, drawable ).c_str() ) );
+			Line line;
+			
+			U32 left_to_draw = drawable;
+			U32 drawn = 0;
+			
+			while (left_to_draw >= current_color_length 
+				&& current_color != mParagraphColorSegments.end() )
 			{
-				// Find the next '\n', if any
-				LLWString::size_type line_end = wline.find_first_of(llwchar('\n'), line_start_offset);
-				if (LLWString::npos == line_end)
-				{
-					// no more '\n's, try to use the whole line
-					line_end = wline.size();
-				}
-				// Find how many characters will reasonably fit in the allowed width
-				U32 drawable = mFont->maxDrawableChars(wline.c_str()+line_start_offset, (F32)getRect().getWidth(), line_end-line_start_offset, TRUE);
-				if (drawable != 0)
+				LLWString color_text = mParagraphText.substr( paragraph_offset + drawn, current_color_length );
+				line.mLineColorSegments.push_back( LineColorSegment( color_text,			//Append segment to line.
+												(*current_color).mColor, 
+												x_position ) );
+												
+				x_position += font->getWidth( color_text.c_str() );	//Set up next screen position.
+				
+				drawn += current_color_length;
+				left_to_draw -= current_color_length;
+				
+				current_color++;							//Goto next paragraph color record.
+				
+				if (current_color != mParagraphColorSegments.end())
 				{
-					LLFixedBuffer::addLine(wline.substr(line_start_offset, drawable));
-					mAddTimes[mAddTimes.size()-1] = line_info.add_time;
-					
-					// move the line_start_offset by the number of characters we were able to draw, up to an implicit or explicit line-break.
-					line_start_offset += drawable;
-				}
-				else
-				{
-					// no drawable characters - force a blank line and try the next character.
-					LLFixedBuffer::addLine(" ");
-					line_start_offset++;
-				}
-				mColors.push_back(color);
-				// if this was an *explicit* line-break or the end of the text, then increment the offset for the start of the next line (if any).
-				if (line_start_offset == line_end)
-				{
-					line_start_offset++;
+					current_color_length = (*current_color).mNumChars;
 				}
 			}
+			
+			if (left_to_draw > 0 && current_color != mParagraphColorSegments.end() )
+			{
+				LLWString color_text = mParagraphText.substr( paragraph_offset + drawn, left_to_draw );
+				
+				line.mLineColorSegments.push_back( LineColorSegment( color_text,		//Append segment to line.
+												(*current_color).mColor, 
+												x_position ) );
+																	
+				current_color_length -= left_to_draw;
+			}
+			mLines.push_back(line);								//Append line to paragraph line list.
 		}
+		paragraph_offset += (drawable + skip_chars);
 	}
-	mLineQueue.clear();
 }
 
-void LLConsole::removeExtraLines()
+//Pass in the string and the default color for this block of text.
+LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_time, LLFontGL* font, F32 screen_width) 
+						: mParagraphText(str), mAddTime(add_time), mMaxWidth(-1)
 {
-	while((S32)mColors.size() > llmax(0, (S32)(mMaxLines - 1)))
-	{
-		mColors.pop_front();
-	}
-	LLFixedBuffer::removeExtraLines();
+	makeParagraphColorSegments(color);
+	updateLines( screen_width, font );
+}
+	
+void LLConsole::addLine(const LLWString& wline, F32 size, const LLColor4 &color)
+{	
+	Paragraph paragraph(wline, color, mTimer.getElapsedTimeF32(), mFont,  (F32)getRect().getWidth() );
+	
+	mParagraphs.push_back ( paragraph );
+	
+#if LL_WINDOWS && LL_LCD_COMPILE
+	// add to LCD screen
+	AddNewDebugConsoleToLCD(wline);
+#endif	
 }
diff --git a/linden/indra/newview/llconsole.h b/linden/indra/newview/llconsole.h
index 04d8600..ec5cd31 100644
--- a/linden/indra/newview/llconsole.h
+++ b/linden/indra/newview/llconsole.h
@@ -38,39 +38,86 @@
 #include <deque>
 
 class LLFontGL;
+class LLSD;
 
 class LLConsole : public LLFixedBuffer, public LLView
 {
 private:
 	F32			mLinePersistTime; // Age at which to stop drawing.
 	F32			mFadeTime; // Age at which to start fading
-	std::deque<LLColor4>	mColors;
 	LLFontGL*	mFont;
 	S32			mLastBoxHeight;
 	S32			mLastBoxWidth;
+	S32			mConsoleWidth;
+	S32			mConsoleHeight;
 
-	struct LineInfo
+public:
+	//A paragraph color segment defines the color of text in a line 
+	//of text that was received for console display.  It has no 
+	//notion of line wraps, screen position, or the text it contains.
+	//It is only the number of characters that are a color and the
+	//color.
+	struct ParagraphColorSegment
 	{
-		LineInfo(const LLWString &wln, F32 sz, const LLColor4& clr, F32 time)
-			: wline(wln), size(sz), color(clr), add_time(time)
-		{
-			
-		}
-		LLWString wline;
-		F32 size;
-		LLColor4 color;
-		F32 add_time;
+		S32		mNumChars;
+		LLColor4 mColor;
 	};
-	typedef std::list<LineInfo> line_queue_t;
-	line_queue_t mLineQueue;
 	
-public:
+	//A line color segment is a chunk of text, the color associated
+	//with it, and the X Position it was calculated to begin at 
+	//on the screen.  X Positions are re-calculated if the 
+	//screen changes size.
+	class LineColorSegment
+	{
+		public:
+			LineColorSegment(LLWString text, LLColor4 color, F32 xpos) : mText(text), mColor(color), mXPosition(xpos) {}
+		public:
+			LLWString mText;
+			LLColor4  mColor;
+			F32		  mXPosition;
+	};
+	 	
+	typedef std::list<LineColorSegment> line_color_segments_t;
+	
+	//A line is composed of one or more color segments.
+	class Line
+	{
+		public:
+			line_color_segments_t mLineColorSegments;
+	};
+	
+	typedef std::list<Line> lines_t;
+	typedef std::list<ParagraphColorSegment> paragraph_color_segments_t;
+	
+	//A paragraph is a processed element containing the entire text of the
+	//message (used for recalculating positions on screen resize)
+	//The time this message was added to the console output
+	//The visual screen width of the longest line in this block
+	//And a list of one or more lines which are used to display this message.
+	class Paragraph
+	{
+		public:
+			Paragraph (LLWString str, const LLColor4 &color, F32 add_time, LLFontGL* font, F32 screen_width);
+			void makeParagraphColorSegments ( const LLColor4 &color);
+			void updateLines ( F32 screen_width,  LLFontGL* font, bool force_resize=false );
+		public:
+			LLWString mParagraphText;	//The entire text of the paragraph
+			paragraph_color_segments_t	mParagraphColorSegments;
+			F32 mAddTime;				//Time this paragraph was added to the display.
+			F32 mMaxWidth;				//Width of the widest line of text in this paragraph.
+			lines_t	mLines;
+			
+	};
+		
+	//The console contains a deque of paragraphs which represent the individual messages.
+	typedef std::deque<Paragraph> paragraph_t;
+	paragraph_t mParagraphs;
+
 	// Font size:
 	// -1 = monospace, 0 means small, font size = 1 means big
 	LLConsole(const std::string& name, const U32 max_lines, const LLRect &rect, 
 		S32 font_size_index, F32 persist_time );
-	virtual ~LLConsole();
-
+	~LLConsole(){};
 
 	// each line lasts this long after being added
 	void			setLinePersistTime(F32 seconds);
@@ -80,15 +127,13 @@ public:
 	// -1 = monospace, 0 means small, font size = 1 means big
 	void			setFontSize(S32 size_index);
 
-	void			addLine(const LLString& utf8line, F32 size, const LLColor4 &color);
+	void			addLine(const std::string& utf8line, F32 size, const LLColor4 &color);
 	void			addLine(const LLWString& wline, F32 size, const LLColor4 &color);
-	void			addQueuedLines();
 	
 	// Overrides
 	/*virtual*/ void	draw();
-	/*virtual*/ void	addLine(const LLString& utf8line);
+	/*virtual*/ void	addLine(const std::string& utf8line);
 	/*virtual*/ void	addLine(const LLWString& line);
-	/*virtual*/ void	removeExtraLines();
 };
 
 extern LLConsole* gConsole;
diff --git a/linden/indra/newview/llcontainerview.cpp b/linden/indra/newview/llcontainerview.cpp
index 730da17..dbec409 100644
--- a/linden/indra/newview/llcontainerview.cpp
+++ b/linden/indra/newview/llcontainerview.cpp
@@ -262,7 +262,7 @@ LLRect LLContainerView::getRequiredRect()
 	return req_rect;
 }
 
-void LLContainerView::setLabel(const LLString& label)
+void LLContainerView::setLabel(const std::string& label)
 {
 	mLabel = label;
 }
diff --git a/linden/indra/newview/llcontainerview.h b/linden/indra/newview/llcontainerview.h
index 62222b5..a65f7a7 100644
--- a/linden/indra/newview/llcontainerview.h
+++ b/linden/indra/newview/llcontainerview.h
@@ -42,7 +42,7 @@ class LLContainerView : public LLView
 {
 protected:
 	BOOL mDisplayChildren;
-	LLString mLabel;
+	std::string mLabel;
 public:
 	BOOL mCollapsible;
 public:
@@ -56,7 +56,7 @@ public:
 	virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	virtual LLRect getRequiredRect();	// Return the height of this object, given the set options.
 
-	void setLabel(const LLString& label);
+	void setLabel(const std::string& label);
 	void showLabel(BOOL show) { mShowLabel = show; }
 	void setDisplayChildren(const BOOL displayChildren);
 	BOOL getDisplayChildren() { return mDisplayChildren; }
diff --git a/linden/indra/newview/llcubemap.cpp b/linden/indra/newview/llcubemap.cpp
deleted file mode 100644
index f79fd0f..0000000
--- a/linden/indra/newview/llcubemap.cpp
+++ /dev/null
@@ -1,539 +0,0 @@
-/** 
- * @file llcubemap.cpp
- * @brief LLCubeMap class implementation
- *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llfeaturemanager.h"
-#include "llworkerthread.h"
-
-#include "llcubemap.h"
-
-#include "v4coloru.h"
-#include "v3math.h"
-
-#include "llrender.h"
-
-#include "llviewercamera.h"
-#include "llviewerimage.h"
-#include "llviewerimagelist.h"
-
-#include "llglheaders.h"
-
-const F32 epsilon = 1e-7f;
-const U16 RESOLUTION = 64;
-
-#if LL_DARWIN
-// mipmap generation on cubemap textures seems to be broken on the Mac for at least some cards.
-// Since the cubemap is small (64x64 per face) and doesn't have any fine detail, turning off mipmaps is a usable workaround.
-const BOOL use_cube_mipmaps = FALSE;
-#else
-const BOOL use_cube_mipmaps = FALSE;  //current build works best without cube mipmaps
-#endif
-
-LLCubeMap::LLCubeMap()
-	: mTextureStage(0),
-	  mTextureCoordStage(0),
-	  mMatrixStage(0)
-{
-}
-
-LLCubeMap::~LLCubeMap()
-{
-}
-
-void LLCubeMap::initGL()
-{
-	llassert(gGLManager.mInited);
-
-	if (gGLManager.mHasCubeMap
-	    && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
-	{
-		mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
-		mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
-		mTargets[2] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB;
-		mTargets[3] = GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB;
-		mTargets[4] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB;
-		mTargets[5] = GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB;
-		
-		// Not initialized, do stuff.
-		if (mImages[0].isNull())
-		{
-			GLuint texname = 0;
-			
-			glGenTextures(1, &texname);
-
-			for (int i = 0; i < 6; i++)
-			{
-				mImages[i] = new LLImageGL(64, 64, 4, (use_cube_mipmaps? TRUE : FALSE));
-				mImages[i]->setTarget(mTargets[i], GL_TEXTURE_CUBE_MAP_ARB);
-				mRawImages[i] = new LLImageRaw(64, 64, 4);
-				mImages[i]->createGLTexture(0, mRawImages[i], texname);
-				
-				glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, texname);
-				mImages[i]->setClampCubemap (TRUE, TRUE, TRUE);
-				stop_glerror();
-			}
-		}
-		disable();
-	}
-	else
-	{
-		llwarns << "Using cube map without extension!" << llendl
-	}
-}
-
-void LLCubeMap::initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages)
-{
-	bool flip_x[6] =	{ false, true,  false, false, true,  false };
-	bool flip_y[6] = 	{ true,  true,  true,  false, true,  true  };
-	bool transpose[6] = { false, false, false, false, true,  true  };
-	
-	// Yes, I know that this is inefficient! - djs 08/08/02
-	for (int i = 0; i < 6; i++)
-	{
-		const U8 *sd = rawimages[i]->getData();
-		U8 *td = mRawImages[i]->getData();
-
-		S32 offset = 0;
-		S32 sx, sy, so;
-		for (int y = 0; y < 64; y++)
-		{
-			for (int x = 0; x < 64; x++)
-			{
-				sx = x;
-				sy = y;
-				if (flip_y[i])
-				{
-					sy = 63 - y;
-				}
-				if (flip_x[i])
-				{
-					sx = 63 - x;
-				}
-				if (transpose[i])
-				{
-					S32 temp = sx;
-					sx = sy;
-					sy = temp;
-				}
-
-				so = 64*sy + sx;
-				so *= 4;
-				*(td + offset++) = *(sd + so++);
-				*(td + offset++) = *(sd + so++);
-				*(td + offset++) = *(sd + so++);
-				*(td + offset++) = *(sd + so++);
-			}
-		}
-	}
-}
-
-void LLCubeMap::initGLData()
-{
-	for (int i = 0; i < 6; i++)
-	{
-		mImages[i]->setSubImage(mRawImages[i], 0, 0, 64, 64);
-	}
-}
-
-void LLCubeMap::init(const std::vector<LLPointer<LLImageRaw> >& rawimages)
-{
-	if (!gGLManager.mIsDisabled)
-	{
-		initGL();
-		initRawData(rawimages);
-		initGLData();
-	}
-}
-
-GLuint LLCubeMap::getGLName()
-{
-	return mImages[0]->getTexName();
-}
-
-void LLCubeMap::bind()
-{
-	if (gGLManager.mHasCubeMap
-	    //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
-	    )
-	{
-		// We assume that if they have cube mapping, they have multitexturing.
-		if (mTextureStage > 0)
-		{
-			gGL.getTexUnit(mTextureStage)->activate();
-		}
-		glEnable(GL_TEXTURE_CUBE_MAP_ARB);
-		glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, mImages[0]->getTexName());
-
-		mImages[0]->setMipFilterNearest (FALSE, FALSE);
-		if (mTextureStage > 0)
-		{
-			gGL.getTexUnit(0)->activate();
-		}
-	}
-	else
-	{
-		llwarns << "Using cube map without extension!" << llendl
-	}
-}
-
-void LLCubeMap::enable(S32 stage)
-{
-	enableTexture(stage);
-	enableTextureCoords(stage);
-}
-
-void LLCubeMap::enableTexture(S32 stage)
-{
-	mTextureStage = stage;
-	if (gGLManager.mHasCubeMap &&
-	    stage >= 0
-	    //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
-	    )
-	{
-		if (stage > 0)
-		{
-			gGL.getTexUnit(stage)->activate();
-		}
-		
-		glEnable(GL_TEXTURE_CUBE_MAP_ARB);
-		
-		if (stage > 0)
-		{
-			gGL.getTexUnit(0)->activate();
-		}
-	}
-}
-
-void LLCubeMap::enableTextureCoords(S32 stage)
-{
-	mTextureCoordStage = stage;
-	if (gGLManager.mHasCubeMap && stage >= 0)
-	{
-		if (stage > 0)
-		{
-			gGL.getTexUnit(stage)->activate();
-		}
-		
-		glEnable(GL_TEXTURE_GEN_R);
-		glEnable(GL_TEXTURE_GEN_S);
-		glEnable(GL_TEXTURE_GEN_T);
-
-		glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP);
-		glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP);
-		glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP);
-		
-		if (stage > 0)
-		{
-			gGL.getTexUnit(0)->activate();
-		}
-	}
-}
-
-void LLCubeMap::disable(void)
-{
-	disableTexture();
-	disableTextureCoords();
-}
-
-void LLCubeMap::disableTexture(void)
-{
-	if (gGLManager.mHasCubeMap && mTextureStage >= 0
-	    //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
-	    )
-	{
-		if (mTextureStage > 0)
-		{
-			gGL.getTexUnit(mTextureStage)->activate();
-		}
-		glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
-		glDisable(GL_TEXTURE_CUBE_MAP_ARB);
-		if (mTextureStage > 0)
-		{
-			gGL.getTexUnit(0)->activate();
-		}
-	}
-}
-
-void LLCubeMap::disableTextureCoords(void)
-{
-	if (gGLManager.mHasCubeMap && mTextureCoordStage >= 0)
-	{
-		if (mTextureCoordStage > 0)
-		{
-			gGL.getTexUnit(mTextureCoordStage)->activate();
-		}
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
-		glDisable(GL_TEXTURE_GEN_R);
-		if (mTextureCoordStage > 0)
-		{
-			gGL.getTexUnit(0)->activate();
-		}
-	}
-}
-
-void LLCubeMap::setMatrix(S32 stage)
-{
-	mMatrixStage = stage;
-	
-	if (stage > 0)
-	{
-		gGL.getTexUnit(stage)->activate();
-	}
-
-	LLVector3 x(LLVector3d(gGLModelView+0));
-	LLVector3 y(LLVector3d(gGLModelView+4));
-	LLVector3 z(LLVector3d(gGLModelView+8));
-
-	LLMatrix3 mat3;
-	mat3.setRows(x,y,z);
-	LLMatrix4 trans(mat3);
-	trans.transpose();
-
-	glMatrixMode(GL_TEXTURE);
-	glPushMatrix();
-	glLoadMatrixf((F32 *)trans.mMatrix);
-	glMatrixMode(GL_MODELVIEW);
-	
-	if (stage > 0)
-	{
-		gGL.getTexUnit(0)->activate();
-	}
-}
-
-void LLCubeMap::restoreMatrix()
-{
-	if (mMatrixStage > 0)
-	{
-		gGL.getTexUnit(mMatrixStage)->activate();
-	}
-	glMatrixMode(GL_TEXTURE);
-	glPopMatrix();
-	glMatrixMode(GL_MODELVIEW);
-	
-	if (mMatrixStage > 0)
-	{
-		gGL.getTexUnit(0)->activate();
-	}
-}
-
-void LLCubeMap::setReflection (void)
-{
-	glBindTexture (GL_TEXTURE_CUBE_MAP_ARB, getGLName());
-	mImages[0]->setMipFilterNearest (FALSE, FALSE);
-	mImages[0]->setClampCubemap (TRUE, TRUE);
-}
-
-LLVector3 LLCubeMap::map(U8 side, U16 v_val, U16 h_val) const
-{
-	LLVector3 dir;
-
-	const U8 curr_coef = side >> 1; // 0/1 = X axis, 2/3 = Y, 4/5 = Z
-	const S8 side_dir = (((side & 1) << 1) - 1);  // even = -1, odd = 1
-	const U8 i_coef = (curr_coef + 1) % 3;
-	const U8 j_coef = (i_coef + 1) % 3;
-
-	dir.mV[curr_coef] = side_dir;
-
-	switch (side)
-	{
-	case 0: // negative X
-		dir.mV[i_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
-		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
-		break;
-	case 1: // positive X
-		dir.mV[i_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
-		dir.mV[j_coef] = -F32((h_val<<1) + 1) / RESOLUTION + 1;
-		break;
-	case 2:	// negative Y
-		dir.mV[i_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
-		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
-		break;
-	case 3:	// positive Y
-		dir.mV[i_coef] = F32((v_val<<1) + 1) / RESOLUTION - 1;
-		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
-		break;
-	case 4:	// negative Z
-		dir.mV[i_coef] = -F32((h_val<<1) + 1) / RESOLUTION + 1;
-		dir.mV[j_coef] = -F32((v_val<<1) + 1) / RESOLUTION + 1;
-		break;
-	case 5: // positive Z
-		dir.mV[i_coef] = -F32((h_val<<1) + 1) / RESOLUTION + 1;
-		dir.mV[j_coef] = F32((v_val<<1) + 1) / RESOLUTION - 1;
-		break;
-	default:
-		dir.mV[i_coef] = F32((v_val<<1) + 1) / RESOLUTION - 1;
-		dir.mV[j_coef] = F32((h_val<<1) + 1) / RESOLUTION - 1;
-	}
-
-	dir.normVec();
-	return dir;
-}
-
-
-BOOL LLCubeMap::project(F32& v_val, F32& h_val, BOOL& outside,
-						U8 side, const LLVector3& dir) const
-{
-	const U8 curr_coef = side >> 1; // 0/1 = X axis, 2/3 = Y, 4/5 = Z
-	const S8 side_dir = (((side & 1) << 1) - 1);  // even = -1, odd = 1
-	const U8 i_coef = (curr_coef + 1) % 3;
-	const U8 j_coef = (i_coef + 1) % 3;
-
-	outside = TRUE;
-	if (side_dir * dir.mV[curr_coef] < 0)
-		return FALSE;
-
-	LLVector3 ray;
-
-	F32 norm_val = fabs(dir.mV[curr_coef]);
-
-	if (norm_val < epsilon)
-		norm_val = 1e-5f;
-
-	ray.mV[curr_coef] = side_dir;
-	ray.mV[i_coef] = dir.mV[i_coef] / norm_val;
-	ray.mV[j_coef] = dir.mV[j_coef] / norm_val;
-
-
-	const F32 i_val = (ray.mV[i_coef] + 1) * 0.5f * RESOLUTION;
-	const F32 j_val = (ray.mV[j_coef] + 1) * 0.5f * RESOLUTION;
-
-	switch (side)
-	{
-	case 0: // negative X
-		v_val = RESOLUTION - i_val;
-		h_val = j_val;
-		break;
-	case 1: // positive X
-		v_val = RESOLUTION - i_val;
-		h_val = RESOLUTION - j_val;
-		break;
-	case 2:	// negative Y
-		v_val = RESOLUTION - i_val;
-		h_val = j_val;
-		break;
-	case 3:	// positive Y
-		v_val = i_val;
-		h_val = j_val;
-		break;
-	case 4:	// negative Z
-		v_val = RESOLUTION - j_val;
-		h_val = RESOLUTION - i_val;
-		break;
-	case 5: // positive Z
-		v_val = RESOLUTION - j_val;
-		h_val = i_val;
-		break;
-	default:
-		v_val = i_val;
-		h_val = j_val;
-	}
-
-	outside =  ((v_val < 0) || (v_val > RESOLUTION) ||
-		(h_val < 0) || (h_val > RESOLUTION));
-
-	return TRUE;
-}
-
-BOOL LLCubeMap::project(F32& v_min, F32& v_max, F32& h_min, F32& h_max, 
-						U8 side, LLVector3 dir[4]) const
-{
-	v_min = h_min = RESOLUTION;
-	v_max = h_max = 0;
-
-	BOOL fully_outside = TRUE;
-	for (U8 vtx = 0; vtx < 4; ++vtx)
-	{
-		F32 v_val, h_val;
-		BOOL outside;
-		BOOL consider = project(v_val, h_val, outside, side, dir[vtx]);
-		if (!outside)
-			fully_outside = FALSE;
-		if (consider)
-		{
-			if (v_val < v_min) v_min = v_val;
-			if (v_val > v_max) v_max = v_val;
-			if (h_val < h_min) h_min = h_val;
-			if (h_val > h_max) h_max = h_val;
-		}
-	}
-
-	v_min = llmax(0.0f, v_min);
-	v_max = llmin(RESOLUTION - epsilon, v_max);
-	h_min = llmax(0.0f, h_min);
-	h_max = llmin(RESOLUTION - epsilon, h_max);
-
-	return !fully_outside;
-}
-
-
-void LLCubeMap::paintIn(LLVector3 dir[4], const LLColor4U& col)
-{
-	F32 v_min, v_max, h_min, h_max;
-	LLVector3 center = dir[0] + dir[1] + dir[2] + dir[3];
-	center.normVec();
-
-	for (U8 side = 0; side < 6; ++side)
-	{
-		if (!project(v_min, v_max, h_min, h_max, side, dir))
-			continue;
-
-		U8 *td = mRawImages[side]->getData();
-		
-		U16 v_minu = (U16) v_min;
-		U16 v_maxu = (U16) (ceil(v_max) + 0.5);
-		U16 h_minu = (U16) h_min;
-		U16 h_maxu = (U16) (ceil(h_max) + 0.5);
-
-		for (U16 v = v_minu; v < v_maxu; ++v)
-			for (U16 h = h_minu; h < h_maxu; ++h)
-		//for (U16 v = 0; v < RESOLUTION; ++v)
-		//	for (U16 h = 0; h < RESOLUTION; ++h)
-			{
-				const LLVector3 ray = map(side, v, h);
-				if (ray * center > 0.999)
-				{
-					const U32 offset = (RESOLUTION * v + h) * 4;
-					for (U8 cc = 0; cc < 3; ++cc)
-						td[offset + cc] = U8((td[offset + cc] + col.mV[cc]) * 0.5);
-				}
-			}
-		mImages[side]->setSubImage(mRawImages[side], 0, 0, 64, 64);
-	}
-}
-
-void LLCubeMap::destroyGL()
-{
-	for (S32 i = 0; i < 6; i++)
-	{
-		mImages[i] = NULL;
-	}
-}
diff --git a/linden/indra/newview/llcubemap.h b/linden/indra/newview/llcubemap.h
deleted file mode 100644
index 0b8cf29..0000000
--- a/linden/indra/newview/llcubemap.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/** 
- * @file llcubemap.h
- * @brief LLCubeMap class definition
- *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLCUBEMAP_H
-#define LL_LLCUBEMAP_H
-
-#include "llgl.h"
-#include "llviewerimage.h"
-
-#include <vector>
-
-class LLVector3;
-
-// Environment map hack!
-class LLCubeMap : public LLRefCount
-{
-public:
-	LLCubeMap();
-	void init(const std::vector<LLPointer<LLImageRaw> >& rawimages);
-	void initGL();
-	void initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages);
-	void initGLData();
-
-	void bind();
-	void enable(S32 stage);
-	
-	void enableTexture(S32 stage);
-	void enableTextureCoords(S32 stage);
-	
-	void disable(void);
-	void disableTexture(void);
-	void disableTextureCoords(void);
-	void setMatrix(S32 stage);
-	void restoreMatrix();
-	void setReflection (void);
-
-	void finishPaint();
-
-	GLuint getGLName();
-
-	LLVector3 map(U8 side, U16 v_val, U16 h_val) const;
-	BOOL project(F32& v_val, F32& h_val, BOOL& outside,
-						U8 side, const LLVector3& dir) const;
-	BOOL project(F32& v_min, F32& v_max, F32& h_min, F32& h_max, 
-						U8 side, LLVector3 dir[4]) const;
-	void paintIn(LLVector3 dir[4], const LLColor4U& col);
-	void destroyGL();
-
-protected:
-	~LLCubeMap();
-	LLGLenum mTargets[6];
-	LLPointer<LLImageGL> mImages[6];
-	LLPointer<LLImageRaw> mRawImages[6];
-	S32 mTextureStage;
-	S32 mTextureCoordStage;
-	S32 mMatrixStage;
-};
-
-#endif
diff --git a/linden/indra/newview/llcurrencyuimanager.cpp b/linden/indra/newview/llcurrencyuimanager.cpp
index 74f6c71..ddacd3b 100644
--- a/linden/indra/newview/llcurrencyuimanager.cpp
+++ b/linden/indra/newview/llcurrencyuimanager.cpp
@@ -122,6 +122,7 @@ LLCurrencyUIManager::Impl::Impl(LLPanel& dialog)
 	mError(false),
 	mUserCurrencyBuy(1000), mUserEnteredCurrencyBuy(false),
 	mSiteCurrencyEstimated(false),
+	  mSiteCurrencyEstimatedCost(0),
 	mBought(false),
 	mTransactionType(TransactionNone), mTransaction(0),
 	mCurrencyChanged(false)
@@ -380,7 +381,7 @@ void LLCurrencyUIManager::Impl::updateUI()
 		{
 			if (!mZeroMessage.empty() && mUserCurrencyBuy == 0)
 			{
-				lindenAmount->setText(LLString::null);
+				lindenAmount->setText(LLStringUtil::null);
 			}
 			else
 			{
@@ -466,7 +467,7 @@ bool LLCurrencyUIManager::process()
 	return changed;
 }
 
-void LLCurrencyUIManager::buy(const LLString& buy_msg)
+void LLCurrencyUIManager::buy(const std::string& buy_msg)
 {
 	if (!canBuy())
 	{
diff --git a/linden/indra/newview/llcurrencyuimanager.h b/linden/indra/newview/llcurrencyuimanager.h
index a9fafe1..858cc5c 100644
--- a/linden/indra/newview/llcurrencyuimanager.h
+++ b/linden/indra/newview/llcurrencyuimanager.h
@@ -71,7 +71,7 @@ public:
 		// call periodically, for example, from draw()
 		// returns true if the UI needs to be updated
 	
-	void buy(const LLString& buy_msg);
+	void buy(const std::string& buy_msg);
 		// call to initiate the purchase
 	
 	bool inProcess();	// is a transaction in process
diff --git a/linden/indra/newview/lldebugmessagebox.cpp b/linden/indra/newview/lldebugmessagebox.cpp
index 8d516d8..c8596f0 100644
--- a/linden/indra/newview/lldebugmessagebox.cpp
+++ b/linden/indra/newview/lldebugmessagebox.cpp
@@ -46,34 +46,34 @@
 /// Class LLDebugVarMessageBox
 ///----------------------------------------------------------------------------
 
-std::map<LLString, LLDebugVarMessageBox*> LLDebugVarMessageBox::sInstances;
+std::map<std::string, LLDebugVarMessageBox*> LLDebugVarMessageBox::sInstances;
 
 LLDebugVarMessageBox::LLDebugVarMessageBox(const std::string& title, EDebugVarType var_type, void *var) : 
-	LLFloater("msg box", LLRect(10,160,400,10), title),
+	LLFloater(std::string("msg box"), LLRect(10,160,400,10), title),
 	mVarType(var_type), mVarData(var), mAnimate(FALSE)
 {
 	switch(var_type)
 	{
 	case VAR_TYPE_F32:
-	  mSlider1 = new LLSliderCtrl("slider 1", LLRect(20,130,190,110), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, *((F32*)var), -100.f, 100.f, 0.1f, NULL);
+	  mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, *((F32*)var), -100.f, 100.f, 0.1f, LLStringUtil::null);
 		mSlider1->setPrecision(3);
 		addChild(mSlider1);
 		mSlider2 = NULL;
 		mSlider3 = NULL;
 		break;
 	case VAR_TYPE_S32:
-		mSlider1 = new LLSliderCtrl("slider 1", LLRect(20,100,190,80), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, (F32)*((S32*)var), -255.f, 255.f, 1.f, NULL);
+		mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,100,190,80), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, (F32)*((S32*)var), -255.f, 255.f, 1.f, LLStringUtil::null);
 		mSlider1->setPrecision(0);
 		addChild(mSlider1);
 		mSlider2 = NULL;
 		mSlider3 = NULL;
 		break;
 	case VAR_TYPE_VEC3:
-		mSlider1 = new LLSliderCtrl("slider 1", LLRect(20,130,190,110), "x: ", NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VX], -100.f, 100.f, 0.1f, NULL);
+		mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), std::string("x: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VX], -100.f, 100.f, 0.1f, LLStringUtil::null);
 		mSlider1->setPrecision(3);
-		mSlider2 = new LLSliderCtrl("slider 2", LLRect(20,100,190,80), "y: ", NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VY], -100.f, 100.f, 0.1f, NULL);
+		mSlider2 = new LLSliderCtrl(std::string("slider 2"), LLRect(20,100,190,80), std::string("y: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VY], -100.f, 100.f, 0.1f, LLStringUtil::null);
 		mSlider2->setPrecision(3);
-		mSlider3 = new LLSliderCtrl("slider 3", LLRect(20,70,190,50), "z: ", NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VZ], -100.f, 100.f, 0.1f, NULL);
+		mSlider3 = new LLSliderCtrl(std::string("slider 3"), LLRect(20,70,190,50), std::string("z: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VZ], -100.f, 100.f, 0.1f, LLStringUtil::null);
 		mSlider3->setPrecision(3);
 		addChild(mSlider1);
 		addChild(mSlider2);
@@ -84,10 +84,10 @@ LLDebugVarMessageBox::LLDebugVarMessageBox(const std::string& title, EDebugVarTy
 		break;
 	}
 
-	mAnimateButton = new LLButton("Animate", LLRect(20, 45, 180, 25), "", onAnimateClicked, this);
+	mAnimateButton = new LLButton(std::string("Animate"), LLRect(20, 45, 180, 25), LLStringUtil::null, onAnimateClicked, this);
 	addChild(mAnimateButton);
 
-	mText = new LLTextBox("value", LLRect(20,20,190,0));
+	mText = new LLTextBox(std::string("value"), LLRect(20,20,190,0));
 	addChild(mText);
 
 	//disable hitting enter closes dialog
@@ -160,7 +160,7 @@ void LLDebugVarMessageBox::show(const std::string& title, LLVector3 *var, LLVect
 
 LLDebugVarMessageBox* LLDebugVarMessageBox::show(const std::string& title, EDebugVarType var_type, void *var)
 {
-	LLString title_string(title);
+	std::string title_string(title);
 
 	LLDebugVarMessageBox *box = sInstances[title_string];
 	if (!box)
@@ -217,7 +217,7 @@ void LLDebugVarMessageBox::onClose(bool app_quitting)
 
 void LLDebugVarMessageBox::draw()
 {
-	LLString text;
+	std::string text;
 	switch(mVarType)
 	{
 	  case VAR_TYPE_F32:
diff --git a/linden/indra/newview/lldebugmessagebox.h b/linden/indra/newview/lldebugmessagebox.h
index ae0b56e..6e333b5 100644
--- a/linden/indra/newview/lldebugmessagebox.h
+++ b/linden/indra/newview/lldebugmessagebox.h
@@ -86,10 +86,10 @@ protected:
 	LLSliderCtrl*	mSlider3;
 	LLButton*		mAnimateButton;
 	LLTextBox*		mText;
-	LLString		mTitle;
+	std::string		mTitle;
 	BOOL			mAnimate;
 
-	static std::map<LLString, LLDebugVarMessageBox*> sInstances;
+	static std::map<std::string, LLDebugVarMessageBox*> sInstances;
 };
 
 #endif // LL_LLMESSAGEBOX_H
diff --git a/linden/indra/newview/lldebugview.cpp b/linden/indra/newview/lldebugview.cpp
index 9e64a60..69d724e 100644
--- a/linden/indra/newview/lldebugview.cpp
+++ b/linden/indra/newview/lldebugview.cpp
@@ -60,7 +60,7 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect)
 {
 	LLRect r;
 
-	r.set(0, rect.getHeight() - 100, rect.getWidth()/2, 100);
+	r.set(10, rect.getHeight() - 100, rect.getWidth()/2, 100);
 	mDebugConsolep = new LLConsole("debug console", 20, r, -1, 0.f );
 	mDebugConsolep->setFollowsBottom();
 	mDebugConsolep->setFollowsLeft();
diff --git a/linden/indra/newview/lldelayedgestureerror.cpp b/linden/indra/newview/lldelayedgestureerror.cpp
index 0a1c9df..6c7f967 100644
--- a/linden/indra/newview/lldelayedgestureerror.cpp
+++ b/linden/indra/newview/lldelayedgestureerror.cpp
@@ -98,7 +98,7 @@ void LLDelayedGestureError::onIdle(void *userdata)
 //static 
 bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok)
 {
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	LLInventoryItem *item = gInventory.getItem( ent.mItemID );
 
 	if ( item )
@@ -109,7 +109,7 @@ bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok)
 	{
 		if ( uuid_ok || ent.mTimer.getElapsedTimeF32() > MAX_NAME_WAIT_TIME )
 		{
-			args["[NAME]"] = LLString( ent.mItemID.asString() );
+			args["[NAME]"] = std::string( ent.mItemID.asString() );
 		}
 		else
 		{
diff --git a/linden/indra/newview/lldelayedgestureerror.h b/linden/indra/newview/lldelayedgestureerror.h
index 9f8e9e0..e7e059f 100644
--- a/linden/indra/newview/lldelayedgestureerror.h
+++ b/linden/indra/newview/lldelayedgestureerror.h
@@ -61,10 +61,10 @@ private:
 
 	struct LLErrorEntry
 	{
-		LLErrorEntry(const LLString& notify, const LLUUID &item) : mTimer(), mNotifyName(notify), mItemID(item) {}
+		LLErrorEntry(const std::string& notify, const LLUUID &item) : mTimer(), mNotifyName(notify), mItemID(item) {}
 
 		LLTimer mTimer;
-		LLString mNotifyName;
+		std::string mNotifyName;
 		LLUUID mItemID;
 	};
 
diff --git a/linden/indra/newview/lldirpicker.cpp b/linden/indra/newview/lldirpicker.cpp
index 532e375..b0868b5 100644
--- a/linden/indra/newview/lldirpicker.cpp
+++ b/linden/indra/newview/lldirpicker.cpp
@@ -67,7 +67,7 @@ LLDirPicker::~LLDirPicker()
 	// nothing
 }
 
-BOOL LLDirPicker::getDir(LLString* filename)
+BOOL LLDirPicker::getDir(std::string* filename)
 {
 	if( mLocked )
 	{
@@ -114,7 +114,7 @@ BOOL LLDirPicker::getDir(LLString* filename)
 	return success;
 }
 
-LLString LLDirPicker::getDirName()
+std::string LLDirPicker::getDirName()
 {
 	return mDir;
 }
@@ -225,7 +225,7 @@ OSStatus	LLDirPicker::doNavChooseDialog()
 	return error;
 }
 
-BOOL LLDirPicker::getDir(LLString* filename)
+BOOL LLDirPicker::getDir(std::string* filename)
 {
 	if( mLocked ) return FALSE;
 	BOOL success = FALSE;
@@ -252,7 +252,7 @@ BOOL LLDirPicker::getDir(LLString* filename)
 	return success;
 }
 
-LLString LLDirPicker::getDirName()
+std::string LLDirPicker::getDirName()
 {
 	return mDir;
 }
@@ -260,7 +260,7 @@ LLString LLDirPicker::getDirName()
 void LLDirPicker::reset()
 {
 	mLocked = FALSE;
-	mDir    = NULL;
+	mDir.clear();
 }
 
 #elif LL_LINUX
@@ -283,7 +283,7 @@ void LLDirPicker::reset()
 		mFilePicker->reset();
 }
 
-BOOL LLDirPicker::getDir(LLString* filename)
+BOOL LLDirPicker::getDir(std::string* filename)
 {
 	reset();
 	if (mFilePicker)
@@ -296,19 +296,17 @@ BOOL LLDirPicker::getDir(LLString* filename)
 		   gtk_window_set_title(GTK_WINDOW(picker), "Choose Directory");
 		   gtk_widget_show_all(GTK_WIDGET(picker));
 		   gtk_main();
-		   return (NULL != mFilePicker->getFirstFile());
+		   return (!mFilePicker->getFirstFile().empty());
 		}
 	}
 	return FALSE;
 }
 
-LLString LLDirPicker::getDirName()
+std::string LLDirPicker::getDirName()
 {
 	if (mFilePicker)
 	{
-		const char* name = mFilePicker->getFirstFile();
-		if (name)
-			return name;
+		return mFilePicker->getFirstFile();
 	}
 	return "";
 }
@@ -329,12 +327,12 @@ void LLDirPicker::reset()
 {
 }
 
-BOOL LLDirPicker::getDir(LLString* filename)
+BOOL LLDirPicker::getDir(std::string* filename)
 {
 	return FALSE;
 }
 
-LLString LLDirPicker::getDirName()
+std::string LLDirPicker::getDirName()
 {
 	return "";
 }
diff --git a/linden/indra/newview/lldirpicker.h b/linden/indra/newview/lldirpicker.h
index ac03644..e9b2d0e 100644
--- a/linden/indra/newview/lldirpicker.h
+++ b/linden/indra/newview/lldirpicker.h
@@ -64,8 +64,8 @@ public:
 	// calling this before main() is undefined
 	static LLDirPicker& instance( void ) { return sInstance; }
 
-	BOOL getDir(LLString* filename);
-	LLString getDirName();
+	BOOL getDir(std::string* filename);
+	std::string getDirName();
 
 	// clear any lists of buffers or whatever, and make sure the dir
 	// picker isn't locked.
@@ -94,9 +94,8 @@ private:
 	LLFilePicker *mFilePicker;
 #endif
 
-	char mDirs[DIRNAME_BUFFER_SIZE]; /*Flawfinder: ignore*/
-	LLString* mFileName;
-	LLString  mDir;
+	std::string* mFileName;
+	std::string  mDir;
 	BOOL mLocked;
 
 	static LLDirPicker sInstance;
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 71c9ebb..0f89585 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -384,9 +384,14 @@ void LLDrawable::makeActive()
 		gPipeline.setActive(this, TRUE);
 
 		//all child objects must also be active
-		for (U32 i = 0; i < getChildCount(); i++)
+		llassert_always(mVObjp);
+		
+		LLViewerObject::const_child_list_t& child_list = mVObjp->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+			 iter != child_list.end(); iter++)
 		{
-			LLDrawable* drawable = getChild(i);
+			LLViewerObject* child = *iter;
+			LLDrawable* drawable = child->mDrawable;
 			if (drawable)
 			{
 				drawable->makeActive();
@@ -430,11 +435,13 @@ void LLDrawable::makeStatic(BOOL warning_enabled)
 		{
 			LL_WARNS_ONCE("Drawable") << "Drawable becomes static with active parent!" << LL_ENDL;
 		}
-		
-		S32 child_count = mVObjp->mChildList.size();
-		for (S32 child_num = 0; child_num < child_count; child_num++)
+
+		LLViewerObject::const_child_list_t& child_list = mVObjp->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+			 iter != child_list.end(); iter++)
 		{
-			LLDrawable* child_drawable = mVObjp->mChildList[child_num]->mDrawable;
+			LLViewerObject* child = *iter;
+			LLDrawable* child_drawable = child->mDrawable;
 			if (child_drawable)
 			{
 				if (child_drawable->getParent() != this)
@@ -1179,11 +1186,23 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
 			av = objparent->mDrawable;
 			LLSpatialGroup* group = av->getSpatialGroup();
 
-			BOOL impostor = objparent->isAvatar() && ((LLVOAvatar*) objparent)->isImpostor();
-			BOOL loaded   = objparent->isAvatar() && ((LLVOAvatar*) objparent)->isFullyLoaded();
-			
+			BOOL impostor = FALSE;
+			BOOL loaded = FALSE;
+			if (objparent->isAvatar())
+			{
+				LLVOAvatar* avatarp = (LLVOAvatar*) objparent;
+				if (avatarp->isVisible())
+				{
+					impostor = objparent->isAvatar() && ((LLVOAvatar*) objparent)->isImpostor();
+					loaded   = objparent->isAvatar() && ((LLVOAvatar*) objparent)->isFullyLoaded();
+				}
+				else
+				{
+					return;
+				}
+			}
+
 			if (!group ||
-				av->getSpatialGroup()->mDistance > LLVOAvatar::sRenderDistance ||
 				LLDrawable::getCurrentFrame() - av->mVisible > 1 ||
 				impostor ||
 				!loaded)
@@ -1214,9 +1233,16 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
 		if (for_select)
 		{
 			results->push_back(mDrawable);
-			for (U32 i = 0; i < mDrawable->getChildCount(); i++)
+			if (mDrawable->getVObj())
 			{
-				results->push_back(mDrawable->getChild(i));
+				LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
+				for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+					 iter != child_list.end(); iter++)
+				{
+					LLViewerObject* child = *iter;
+					LLDrawable* drawable = child->mDrawable;					
+					results->push_back(drawable);
+				}
 			}
 		}
 		else 
@@ -1240,18 +1266,24 @@ void LLSpatialBridge::updateDistance(LLCamera& camera_in)
 	
 	mDrawable->updateDistance(camera);
 	
-	for (U32 i = 0; i < mDrawable->getChildCount(); ++i)
+	if (mDrawable->getVObj())
 	{
-		LLDrawable* child = mDrawable->getChild(i);
-		if (!child)
+		LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+			 iter != child_list.end(); iter++)
 		{
-			llwarns << "Corrupt drawable found while updating spatial bridge distance." << llendl;
-			continue;
-		}
+			LLViewerObject* child = *iter;
+			LLDrawable* drawable = child->mDrawable;					
+			if (!drawable)
+			{
+				llwarns << "Corrupt drawable found while updating spatial bridge distance." << llendl;
+				continue;
+			}
 
-		if (!child->isAvatar())
-		{
-			child->updateDistance(camera);
+			if (!drawable->isAvatar())
+			{
+				drawable->updateDistance(camera);
+			}
 		}
 	}
 }
@@ -1287,12 +1319,18 @@ void LLSpatialBridge::cleanupReferences()
 	if (mDrawable)
 	{
 		mDrawable->setSpatialGroup(NULL);
-		for (U32 i = 0; i < mDrawable->getChildCount(); i++)
+		if (mDrawable->getVObj())
 		{
-			LLDrawable* drawable = mDrawable->getChild(i);
-			if (drawable)
+			LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
+			for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+				 iter != child_list.end(); iter++)
 			{
-				drawable->setSpatialGroup(NULL);
+				LLViewerObject* child = *iter;
+				LLDrawable* drawable = child->mDrawable;					
+				if (drawable)
+				{
+					drawable->setSpatialGroup(NULL);
+				}
 			}
 		}
 
diff --git a/linden/indra/newview/lldrawable.h b/linden/indra/newview/lldrawable.h
index 97b97f4..76ba3f5 100644
--- a/linden/indra/newview/lldrawable.h
+++ b/linden/indra/newview/lldrawable.h
@@ -116,8 +116,6 @@ public:
 	virtual BOOL		isSpatialBridge() const		{ return FALSE; }
 	virtual LLSpatialPartition* asPartition()		{ return NULL; }
 	LLDrawable*			getParent() const			{ return mParent; }
-	LLDrawable*			getChild(U32 index)			{ return mVObjp->mChildList[index]->mDrawable; }
-	U32					getChildCount()				{ return mVObjp ? mVObjp->mChildList.size() : 0; }
 	
 	// must set parent through LLViewerObject::		()
 	//BOOL                setParent(LLDrawable *parent);
diff --git a/linden/indra/newview/lldrawpoolalpha.cpp b/linden/indra/newview/lldrawpoolalpha.cpp
index ca8f3b4..28263b2 100644
--- a/linden/indra/newview/lldrawpoolalpha.cpp
+++ b/linden/indra/newview/lldrawpoolalpha.cpp
@@ -49,7 +49,7 @@
 #include "llviewerobjectlist.h" // For debugging
 #include "llviewerwindow.h"
 #include "pipeline.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llviewerregion.h"
 #include "lldrawpoolwater.h"
 #include "llspatialpartition.h"
@@ -72,7 +72,7 @@ LLDrawPoolAlpha::~LLDrawPoolAlpha()
 
 void LLDrawPoolAlpha::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT);
 }
 
 void LLDrawPoolAlpha::beginRenderPass(S32 pass)
diff --git a/linden/indra/newview/lldrawpoolavatar.cpp b/linden/indra/newview/lldrawpoolavatar.cpp
index 4e1e390..946c439 100644
--- a/linden/indra/newview/lldrawpoolavatar.cpp
+++ b/linden/indra/newview/lldrawpoolavatar.cpp
@@ -45,7 +45,7 @@
 #include "llviewerregion.h"
 #include "noise.h"
 #include "pipeline.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llappviewer.h"
 
 static U32 sDataMask = LLDrawPoolAvatar::VERTEX_DATA_MASK;
@@ -53,8 +53,6 @@ static U32 sBufferUsage = GL_STREAM_DRAW_ARB;
 static U32 sShaderLevel = 0;
 static LLGLSLShader* sVertexProgram = NULL;
 
-extern BOOL gUseGLPick;
-
 F32 CLOTHING_GRAVITY_EFFECT = 0.7f;
 F32 CLOTHING_ACCEL_FORCE_FACTOR = 0.2f;
 const S32 NUM_TEST_AVATARS = 30;
@@ -106,13 +104,12 @@ BOOL gRenderAvatar = TRUE;
 
 S32 LLDrawPoolAvatar::getVertexShaderLevel() const
 {
-	return sShaderLevel;
-	//return (S32) LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR);
+	return (S32) LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR);
 }
 
 void LLDrawPoolAvatar::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR);
 	sShaderLevel = mVertexShaderLevel;
 	
 	if (sShaderLevel > 0)
@@ -289,16 +286,16 @@ void LLDrawPoolAvatar::beginSkinned()
 		sVertexProgram->bind();
 		if (sShaderLevel >= SHADER_LEVEL_CLOTH)
 		{
-			enable_cloth_weights(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_CLOTHING]);
+			enable_cloth_weights(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_CLOTHING]);
 		}
-		enable_vertex_weighting(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_WEIGHT]);
+		enable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]);
 
 		if (sShaderLevel >= SHADER_LEVEL_BUMP)
 		{
-			enable_binormals(sVertexProgram->mAttribute[LLShaderMgr::BINORMAL]);
+			enable_binormals(sVertexProgram->mAttribute[LLViewerShaderMgr::BINORMAL]);
 		}
 		
-		sVertexProgram->enableTexture(LLShaderMgr::BUMP_MAP);
+		sVertexProgram->enableTexture(LLViewerShaderMgr::BUMP_MAP);
 		gGL.getTexUnit(0)->activate();
 	}
 	else
@@ -318,16 +315,16 @@ void LLDrawPoolAvatar::endSkinned()
 	if (sShaderLevel > 0)
 	{
 		sRenderingSkinned = FALSE;
-		sVertexProgram->disableTexture(LLShaderMgr::BUMP_MAP);
+		sVertexProgram->disableTexture(LLViewerShaderMgr::BUMP_MAP);
 		gGL.getTexUnit(0)->activate();
-		disable_vertex_weighting(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_WEIGHT]);
+		disable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]);
 		if (sShaderLevel >= SHADER_LEVEL_BUMP)
 		{
-			disable_binormals(sVertexProgram->mAttribute[LLShaderMgr::BINORMAL]);
+			disable_binormals(sVertexProgram->mAttribute[LLViewerShaderMgr::BINORMAL]);
 		}
 		if ((sShaderLevel >= SHADER_LEVEL_CLOTH))
 		{
-			disable_cloth_weights(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_CLOTHING]);
+			disable_cloth_weights(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_CLOTHING]);
 		}
 
 		sVertexProgram->unbind();
@@ -466,7 +463,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 	
 	if (sShaderLevel > 0)
 	{
-		gAvatarMatrixParam = sVertexProgram->mUniform[LLShaderMgr::AVATAR_MATRIX];
+		gAvatarMatrixParam = sVertexProgram->mUniform[LLViewerShaderMgr::AVATAR_MATRIX];
 	}
     
 	if ((sShaderLevel >= SHADER_LEVEL_CLOTH))
@@ -482,16 +479,16 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 		wind = wind * rot_mat;
 		wind.mV[VW] = avatarp->mWindVec.mV[VW];
 
-		sVertexProgram->vertexAttrib4fv(LLShaderMgr::AVATAR_WIND, wind.mV);
+		sVertexProgram->vertexAttrib4fv(LLViewerShaderMgr::AVATAR_WIND, wind.mV);
 		F32 phase = -1.f * (avatarp->mRipplePhase);
 
 		F32 freq = 7.f + (noise1(avatarp->mRipplePhase) * 2.f);
 		LLVector4 sin_params(freq, freq, freq, phase);
-		sVertexProgram->vertexAttrib4fv(LLShaderMgr::AVATAR_SINWAVE, sin_params.mV);
+		sVertexProgram->vertexAttrib4fv(LLViewerShaderMgr::AVATAR_SINWAVE, sin_params.mV);
 
 		LLVector4 gravity(0.f, 0.f, -CLOTHING_GRAVITY_EFFECT, 0.f);
 		gravity = gravity * rot_mat;
-		sVertexProgram->vertexAttrib4fv(LLShaderMgr::AVATAR_GRAVITY, gravity.mV);
+		sVertexProgram->vertexAttrib4fv(LLViewerShaderMgr::AVATAR_GRAVITY, gravity.mV);
 	}
 
 	if( !single_avatar || (avatarp == single_avatar) )
@@ -566,11 +563,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 //-----------------------------------------------------------------------------
 void LLDrawPoolAvatar::renderForSelect()
 {
-	if (gUseGLPick)
-	{
-		return;
-	}
-	
 	if (!gRenderAvatar)
 	{
 		return;
@@ -593,6 +585,7 @@ void LLDrawPoolAvatar::renderForSelect()
 		return;
 	}
 
+	S32 curr_shader_level = getVertexShaderLevel();
 	S32 name = avatarp->mDrawable->getVObj()->mGLName;
 	LLColor4U color((U8)(name >> 16), (U8)(name >> 8), (U8)name);
 
@@ -609,30 +602,30 @@ void LLDrawPoolAvatar::renderForSelect()
 	}
 
 	sVertexProgram = &gAvatarPickProgram;
-	if (sShaderLevel > 0)
+	if (curr_shader_level > 0)
 	{
-		gAvatarMatrixParam = sVertexProgram->mUniform[LLShaderMgr::AVATAR_MATRIX];
+		gAvatarMatrixParam = sVertexProgram->mUniform[LLViewerShaderMgr::AVATAR_MATRIX];
 	}
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER_EQUAL, 0.2f);
 	gGL.setSceneBlendType(LLRender::BT_REPLACE);
 
 	glColor4ubv(color.mV);
 
-	if ((sShaderLevel > 0) && !gUseGLPick)  // for hardware blending
+	if (curr_shader_level > 0)  // for hardware blending
 	{
 		sRenderingSkinned = TRUE;
 		sVertexProgram->bind();
-		enable_vertex_weighting(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_WEIGHT]);
+		enable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]);
 	}
 	
 	avatarp->renderSkinned(AVATAR_RENDER_PASS_SINGLE);
 
 	// if we're in software-blending, remember to set the fence _after_ we draw so we wait till this rendering is done
-	if ((sShaderLevel > 0) && !gUseGLPick)
+	if (curr_shader_level > 0)
 	{
 		sRenderingSkinned = FALSE;
 		sVertexProgram->unbind();
-		disable_vertex_weighting(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_WEIGHT]);
+		disable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]);
 	}
 
 	gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
@@ -670,7 +663,7 @@ LLColor3 LLDrawPoolAvatar::getDebugColor() const
 
 LLVertexBufferAvatar::LLVertexBufferAvatar()
 : LLVertexBuffer(sDataMask, 
-	LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR) > 0 ?	
+	LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) > 0 ?	
 	GL_STATIC_DRAW_ARB : 
 	GL_STREAM_DRAW_ARB)
 {
@@ -692,16 +685,16 @@ void LLVertexBufferAvatar::setupVertexBuffer(U32 data_mask) const
 		glClientActiveTextureARB(GL_TEXTURE0_ARB);
 		glTexCoordPointer(2,GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_TEXCOORD]));
 		
-		set_vertex_weights(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_WEIGHT], mStride, (F32*)(base + mOffsets[TYPE_WEIGHT]));
+		set_vertex_weights(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT], mStride, (F32*)(base + mOffsets[TYPE_WEIGHT]));
 
 		if (sShaderLevel >= LLDrawPoolAvatar::SHADER_LEVEL_BUMP)
 		{
-			set_binormals(sVertexProgram->mAttribute[LLShaderMgr::BINORMAL], mStride, (LLVector3*)(base + mOffsets[TYPE_BINORMAL]));
+			set_binormals(sVertexProgram->mAttribute[LLViewerShaderMgr::BINORMAL], mStride, (LLVector3*)(base + mOffsets[TYPE_BINORMAL]));
 		}
 	
 		if (sShaderLevel >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH)
 		{
-			set_vertex_clothing_weights(sVertexProgram->mAttribute[LLShaderMgr::AVATAR_CLOTHING], mStride, (LLVector4*)(base + mOffsets[TYPE_CLOTHWEIGHT]));
+			set_vertex_clothing_weights(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_CLOTHING], mStride, (LLVector4*)(base + mOffsets[TYPE_CLOTHWEIGHT]));
 		}
 	}
 	else
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 68fa934..0dd11d6 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -53,7 +53,7 @@
 #include "llviewerimagelist.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 
 //#include "llimagebmp.h"
 //#include "../tools/imdebug/imdebug.h"
@@ -100,7 +100,7 @@ void LLStandardBumpmap::restoreGL()
 	gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount++] = LLStandardBumpmap("Darkness");	// BE_DARKNESS
 
 	std::string file_name = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "std_bump.ini" );
-	LLFILE* file = LLFile::fopen( file_name.c_str(), "rt" );	 /*Flawfinder: ignore*/
+	LLFILE* file = LLFile::fopen( file_name, "rt" );	 /*Flawfinder: ignore*/
 	if( !file )
 	{
 		llwarns << "Could not open std_bump <" << file_name << ">" << llendl;
@@ -177,7 +177,7 @@ LLDrawPoolBump::LLDrawPoolBump()
 
 void LLDrawPoolBump::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT);
 }
 
 // static
@@ -333,7 +333,7 @@ void LLDrawPoolBump::beginShiny(bool invisible)
 	LLCubeMap* cube_map = gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL;
 	if( cube_map )
 	{
-		if (!invisible && LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT) > 0 )
+		if (!invisible && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0 )
 		{
 			LLMatrix4 mat;
 			mat.initRows(LLVector4(gGLModelView+0),
@@ -343,23 +343,23 @@ void LLDrawPoolBump::beginShiny(bool invisible)
 			shader->bind();
 			LLVector3 vec = LLVector3(gShinyOrigin) * mat;
 			LLVector4 vec4(vec, gShinyOrigin.mV[3]);
-			shader->uniform4fv(LLShaderMgr::SHINY_ORIGIN, 1, vec4.mV);			
+			shader->uniform4fv(LLViewerShaderMgr::SHINY_ORIGIN, 1, vec4.mV);			
 			if (mVertexShaderLevel > 1)
 			{
 				cube_map->setMatrix(1);
 				// Make sure that texture coord generation happens for tex unit 1, as that's the one we use for 
 				// the cube map in the one pass shiny shaders
-				cube_channel = shader->enableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+				cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
 				cube_map->enableTexture(cube_channel);
 				cube_map->enableTextureCoords(1);
-				diffuse_channel = shader->enableTexture(LLShaderMgr::DIFFUSE_MAP);
+				diffuse_channel = shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 			}
 			else
 			{
 				cube_channel = 0;
 				diffuse_channel = -1;
 				cube_map->setMatrix(0);
-				cube_map->enable(shader->enableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB));
+				cube_map->enable(shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB));
 			}			
 			cube_map->bind();
 		}
@@ -423,13 +423,13 @@ void LLDrawPoolBump::endShiny(bool invisible)
 
 		if (!invisible && mVertexShaderLevel > 1)
 		{
-			shader->disableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+			shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
 					
-			if (LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT) > 0)
+			if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0)
 			{
 				if (diffuse_channel != 0)
 				{
-					shader->disableTexture(LLShaderMgr::DIFFUSE_MAP);
+					shader->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 				}
 			}
 
@@ -443,6 +443,7 @@ void LLDrawPoolBump::endShiny(bool invisible)
 		}
 	}
 	
+	gGL.getTexUnit(0)->activate();
 	LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
 	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
 	
@@ -483,15 +484,15 @@ void LLDrawPoolBump::beginFullbrightShiny()
 		shader->bind();
 		LLVector3 vec = LLVector3(gShinyOrigin) * mat;
 		LLVector4 vec4(vec, gShinyOrigin.mV[3]);
-		shader->uniform4fv(LLShaderMgr::SHINY_ORIGIN, 1, vec4.mV);			
+		shader->uniform4fv(LLViewerShaderMgr::SHINY_ORIGIN, 1, vec4.mV);			
 
 		cube_map->setMatrix(1);
 		// Make sure that texture coord generation happens for tex unit 1, as that's the one we use for 
 		// the cube map in the one pass shiny shaders
-		cube_channel = shader->enableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+		cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
 		cube_map->enableTexture(cube_channel);
 		cube_map->enableTextureCoords(1);
-		diffuse_channel = shader->enableTexture(LLShaderMgr::DIFFUSE_MAP);
+		diffuse_channel = shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 
 		cube_map->bind();
 	}
@@ -531,7 +532,7 @@ void LLDrawPoolBump::endFullbrightShiny()
 
 		if (diffuse_channel != 0)
 		{
-			shader->disableTexture(LLShaderMgr::DIFFUSE_MAP);
+			shader->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 		}
 		gGL.getTexUnit(0)->activate();
 		glEnable(GL_TEXTURE_2D);
@@ -556,7 +557,7 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL
 	for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
 	{
 		LLDrawInfo& params = **k;
-			
+		
 		applyModelMatrix(params);
 
 		params.mVertexBuffer->setBuffer(mask);
@@ -851,7 +852,7 @@ LLImageGL* LLBumpImageList::getBrightnessDarknessImage(LLViewerImage* src_image,
 			bump->setExplicitFormat(GL_ALPHA8, GL_ALPHA);			
 
 			// Note: this may create an LLImageGL immediately
-			src_image->setLoadedCallback( callback_func, 0, TRUE, new LLUUID(src_image->getID()) );
+			src_image->setLoadedCallback( callback_func, 0, TRUE, FALSE, new LLUUID(src_image->getID()) );
 			bump = (*entries_list)[src_image->getID()]; // In case callback was called immediately and replaced the image
 
 //			bump_total++;
diff --git a/linden/indra/newview/lldrawpoolbump.h b/linden/indra/newview/lldrawpoolbump.h
index 246f5f3..fd6e22c 100644
--- a/linden/indra/newview/lldrawpoolbump.h
+++ b/linden/indra/newview/lldrawpoolbump.h
@@ -96,9 +96,9 @@ class LLStandardBumpmap
 {
 public: 
 	LLStandardBumpmap() : mLabel() {} 
-	LLStandardBumpmap( const char* label ) : mLabel(label) {}
+	LLStandardBumpmap( const std::string& label ) : mLabel(label) {}
 	
-	LLString	mLabel;
+	std::string	mLabel;
 	LLPointer<LLViewerImage> mImage;
 
 	static	U32 sStandardBumpmapCount;  // Number of valid values in gStandardBumpmapList[]
diff --git a/linden/indra/newview/lldrawpoolground.cpp b/linden/indra/newview/lldrawpoolground.cpp
index 03b8a0c..5698027 100644
--- a/linden/indra/newview/lldrawpoolground.cpp
+++ b/linden/indra/newview/lldrawpoolground.cpp
@@ -44,7 +44,7 @@
 #include "pipeline.h"
 #include "llagent.h"
 #include "llviewerregion.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 
 LLDrawPoolGround::LLDrawPoolGround() :
 	LLFacePool(POOL_GROUND)
@@ -58,7 +58,7 @@ LLDrawPool *LLDrawPoolGround::instancePool()
 
 void LLDrawPoolGround::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT);
 }
 
 void LLDrawPoolGround::render(S32 pass)
diff --git a/linden/indra/newview/lldrawpoolsimple.cpp b/linden/indra/newview/lldrawpoolsimple.cpp
index d580e97..97efb80 100644
--- a/linden/indra/newview/lldrawpoolsimple.cpp
+++ b/linden/indra/newview/lldrawpoolsimple.cpp
@@ -40,7 +40,7 @@
 #include "llsky.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llrender.h"
 
 
@@ -54,7 +54,7 @@ void LLDrawPoolGlow::render(S32 pass)
 	LLGLDisable test(GL_ALPHA_TEST);
 	gGL.setSceneBlendType(LLRender::BT_ADD);
 	
-	U32 shader_level = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT);
+	U32 shader_level = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT);
 
 	if (shader_level > 0 && fullbright_shader)
 	{
@@ -92,7 +92,7 @@ LLDrawPoolSimple::LLDrawPoolSimple() :
 
 void LLDrawPoolSimple::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT);
 }
 
 void LLDrawPoolSimple::beginRenderPass(S32 pass)
@@ -113,7 +113,7 @@ void LLDrawPoolSimple::beginRenderPass(S32 pass)
 	if (mVertexShaderLevel > 0)
 	{
 		simple_shader->bind();
-		simple_shader->uniform1f(LLShaderMgr::FULLBRIGHT, 0.f);
+		simple_shader->uniform1f(LLViewerShaderMgr::FULLBRIGHT, 0.f);
 	}
 	else 
 	{
@@ -161,7 +161,7 @@ void LLDrawPoolSimple::render(S32 pass)
 		if (mVertexShaderLevel > 0)
 		{
 			fullbright_shader->bind();
-			fullbright_shader->uniform1f(LLShaderMgr::FULLBRIGHT, 1.f);
+			fullbright_shader->uniform1f(LLViewerShaderMgr::FULLBRIGHT, 1.f);
 		}
 		else
 		{
diff --git a/linden/indra/newview/lldrawpoolsky.cpp b/linden/indra/newview/lldrawpoolsky.cpp
index 8c63b83..e1dbf95 100644
--- a/linden/indra/newview/lldrawpoolsky.cpp
+++ b/linden/indra/newview/lldrawpoolsky.cpp
@@ -46,7 +46,7 @@
 #include "llvosky.h"
 #include "llworld.h" // To get water height
 #include "pipeline.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 
 LLDrawPoolSky::LLDrawPoolSky() :
 	LLFacePool(POOL_SKY), mShader(NULL)
@@ -60,7 +60,7 @@ LLDrawPool *LLDrawPoolSky::instancePool()
 
 void LLDrawPoolSky::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT);
 	gSky.mVOSkyp->updateGeometry(gSky.mVOSkyp->mDrawable);
 }
 
diff --git a/linden/indra/newview/lldrawpoolterrain.cpp b/linden/indra/newview/lldrawpoolterrain.cpp
index 2cd2fdb..ccfbd2d 100644
--- a/linden/indra/newview/lldrawpoolterrain.cpp
+++ b/linden/indra/newview/lldrawpoolterrain.cpp
@@ -51,7 +51,7 @@
 #include "llviewerimagelist.h" // To get alpha gradients
 #include "llworld.h"
 #include "pipeline.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llrender.h"
 
 const F32 DETAIL_SCALE = 1.f/16.f;
@@ -101,7 +101,7 @@ LLDrawPool *LLDrawPoolTerrain::instancePool()
 
 void LLDrawPoolTerrain::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT);
 	if (mVertexShaderLevel > 0)
 	{
 		sDetailMode = 1;
@@ -239,7 +239,7 @@ void LLDrawPoolTerrain::renderFullShader()
 	//
 	// detail texture 0
 	//
-	S32 detail0 = sShader->enableTexture(LLShaderMgr::TERRAIN_DETAIL0);
+	S32 detail0 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL0);
 	LLViewerImage::bindTexture(detail_texture0p,detail0);
 	gGL.getTexUnit(0)->activate();
 
@@ -257,7 +257,7 @@ void LLDrawPoolTerrain::renderFullShader()
 	//
 	// detail texture 1
 	//
-	S32 detail1 = sShader->enableTexture(LLShaderMgr::TERRAIN_DETAIL1); 
+	S32 detail1 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL1); 
 	LLViewerImage::bindTexture(detail_texture1p,detail1);
 	
 	/// ALPHA TEXTURE COORDS 0:
@@ -268,7 +268,7 @@ void LLDrawPoolTerrain::renderFullShader()
 	
 	// detail texture 2
 	//
-	S32 detail2 = sShader->enableTexture(LLShaderMgr::TERRAIN_DETAIL2);
+	S32 detail2 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL2);
 	LLViewerImage::bindTexture(detail_texture2p,detail2);
 	glEnable(GL_TEXTURE_2D);
 	
@@ -282,7 +282,7 @@ void LLDrawPoolTerrain::renderFullShader()
 	//
 	// detail texture 3
 	//
-	S32 detail3 = sShader->enableTexture(LLShaderMgr::TERRAIN_DETAIL3);
+	S32 detail3 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL3);
 	LLViewerImage::bindTexture(detail_texture3p,detail3);
 	
 	/// ALPHA TEXTURE COORDS 2:
@@ -295,18 +295,18 @@ void LLDrawPoolTerrain::renderFullShader()
 	//
 	// Alpha Ramp 
 	//
-	S32 alpha_ramp = sShader->enableTexture(LLShaderMgr::TERRAIN_ALPHARAMP);
+	S32 alpha_ramp = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_ALPHARAMP);
 	LLViewerImage::bindTexture(m2DAlphaRampImagep,alpha_ramp);
 		
 	// GL_BLEND disabled by default
 	drawLoop();
 
 	// Disable multitexture
-	sShader->disableTexture(LLShaderMgr::TERRAIN_ALPHARAMP);
-	sShader->disableTexture(LLShaderMgr::TERRAIN_DETAIL0);
-	sShader->disableTexture(LLShaderMgr::TERRAIN_DETAIL1);
-	sShader->disableTexture(LLShaderMgr::TERRAIN_DETAIL2);
-	sShader->disableTexture(LLShaderMgr::TERRAIN_DETAIL3);
+	sShader->disableTexture(LLViewerShaderMgr::TERRAIN_ALPHARAMP);
+	sShader->disableTexture(LLViewerShaderMgr::TERRAIN_DETAIL0);
+	sShader->disableTexture(LLViewerShaderMgr::TERRAIN_DETAIL1);
+	sShader->disableTexture(LLViewerShaderMgr::TERRAIN_DETAIL2);
+	sShader->disableTexture(LLViewerShaderMgr::TERRAIN_DETAIL3);
 
 	LLImageGL::unbindTexture(alpha_ramp, GL_TEXTURE_2D);
 	gGL.getTexUnit(4)->activate();
diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp
index 285b313..fd178dc 100644
--- a/linden/indra/newview/lldrawpooltree.cpp
+++ b/linden/indra/newview/lldrawpooltree.cpp
@@ -40,7 +40,7 @@
 #include "llvotree.h"
 #include "pipeline.h"
 #include "llviewercamera.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llrender.h"
 
 S32 LLDrawPoolTree::sDiffTex = 0;
@@ -61,7 +61,7 @@ LLDrawPool *LLDrawPoolTree::instancePool()
 
 void LLDrawPoolTree::prerender()
 {
-	mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT);
+	mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT);
 }
 
 void LLDrawPoolTree::beginRenderPass(S32 pass)
diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp
index 3a98235..d8303bd 100644
--- a/linden/indra/newview/lldrawpoolwater.cpp
+++ b/linden/indra/newview/lldrawpoolwater.cpp
@@ -51,7 +51,7 @@
 #include "llvowater.h"
 #include "llworld.h"
 #include "pipeline.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llwaterparammanager.h"
 
 const LLUUID WATER_TEST("2bfd3884-7e27-69b9-ba3a-3e673f680004");
@@ -100,8 +100,8 @@ LLDrawPool *LLDrawPoolWater::instancePool()
 
 void LLDrawPoolWater::prerender()
 {
-	mVertexShaderLevel = (gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")) ?
-		LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_WATER) : 0;
+	mVertexShaderLevel = (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps) ?
+		LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WATER) : 0;
 
 	// got rid of modulation by light color since it got a little too
 	// green at sunset and sl-57047 (underwater turns black at 8:00)
@@ -385,7 +385,7 @@ void LLDrawPoolWater::shade()
 
 	sTime = (F32)LLFrameTimer::getElapsedSeconds()*0.5f;
 	
-	S32 reftex = shader->enableTexture(LLShaderMgr::WATER_REFTEX);
+	S32 reftex = shader->enableTexture(LLViewerShaderMgr::WATER_REFTEX);
 		
 	if (reftex > -1)
 	{
@@ -395,7 +395,7 @@ void LLDrawPoolWater::shade()
 	}	
 
 	//bind normal map
-	S32 bumpTex = shader->enableTexture(LLShaderMgr::BUMP_MAP);
+	S32 bumpTex = shader->enableTexture(LLViewerShaderMgr::BUMP_MAP);
 
 	LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
 
@@ -410,15 +410,15 @@ void LLDrawPoolWater::shade()
 	mWaterNormp->setMipFilterNearest (mWaterNormp->getMipFilterNearest(),
 									  !gSavedSettings.getBOOL("RenderWaterMipNormal"));
 	
-	S32 screentex = shader->enableTexture(LLShaderMgr::WATER_SCREENTEX);	
+	S32 screentex = shader->enableTexture(LLViewerShaderMgr::WATER_SCREENTEX);	
 	stop_glerror();
 	
 	shader->bind();
 
 	if (screentex > -1)
 	{
-		shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, sWaterFogColor.mV);
-		shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, 
+		shader->uniform4fv(LLViewerShaderMgr::WATER_FOGCOLOR, 1, sWaterFogColor.mV);
+		shader->uniform1f(LLViewerShaderMgr::WATER_FOGDENSITY, 
 			param_mgr->getFogDensity());
 	}
 	
@@ -427,7 +427,7 @@ void LLDrawPoolWater::shade()
 	if (mVertexShaderLevel == 1)
 	{
 		sWaterFogColor.mV[3] = param_mgr->mDensitySliderValue;
-		shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, 1, sWaterFogColor.mV);
+		shader->uniform4fv(LLViewerShaderMgr::WATER_FOGCOLOR, 1, sWaterFogColor.mV);
 	}
 
 	F32 screenRes[] = 
@@ -438,7 +438,7 @@ void LLDrawPoolWater::shade()
 	shader->uniform2fv("screenRes", 1, screenRes);
 	stop_glerror();
 	
-	S32 diffTex = shader->enableTexture(LLShaderMgr::DIFFUSE_MAP);
+	S32 diffTex = shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 	stop_glerror();
 	
 	light_dir.normVec();
@@ -447,14 +447,14 @@ void LLDrawPoolWater::shade()
 	light_diffuse *= 6.f;
 
 	//shader->uniformMatrix4fv("inverse_ref", 1, GL_FALSE, (GLfloat*) gGLObliqueProjectionInverse.mMatrix);
-	shader->uniform1f(LLShaderMgr::WATER_WATERHEIGHT, eyedepth);
-	shader->uniform1f(LLShaderMgr::WATER_TIME, sTime);
-	shader->uniform3fv(LLShaderMgr::WATER_EYEVEC, 1, LLViewerCamera::getInstance()->getOrigin().mV);
-	shader->uniform3fv(LLShaderMgr::WATER_SPECULAR, 1, light_diffuse.mV);
-	shader->uniform1f(LLShaderMgr::WATER_SPECULAR_EXP, light_exp);
-	shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, param_mgr->getWave1Dir().mV);
-	shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, param_mgr->getWave2Dir().mV);
-	shader->uniform3fv(LLShaderMgr::WATER_LIGHT_DIR, 1, light_dir.mV);
+	shader->uniform1f(LLViewerShaderMgr::WATER_WATERHEIGHT, eyedepth);
+	shader->uniform1f(LLViewerShaderMgr::WATER_TIME, sTime);
+	shader->uniform3fv(LLViewerShaderMgr::WATER_EYEVEC, 1, LLViewerCamera::getInstance()->getOrigin().mV);
+	shader->uniform3fv(LLViewerShaderMgr::WATER_SPECULAR, 1, light_diffuse.mV);
+	shader->uniform1f(LLViewerShaderMgr::WATER_SPECULAR_EXP, light_exp);
+	shader->uniform2fv(LLViewerShaderMgr::WATER_WAVE_DIR1, 1, param_mgr->getWave1Dir().mV);
+	shader->uniform2fv(LLViewerShaderMgr::WATER_WAVE_DIR2, 1, param_mgr->getWave2Dir().mV);
+	shader->uniform3fv(LLViewerShaderMgr::WATER_LIGHT_DIR, 1, light_dir.mV);
 
 	shader->uniform3fv("normScale", 1, param_mgr->getNormalScale().mV);
 	shader->uniform1f("fresnelScale", param_mgr->getFresnelScale());
@@ -474,12 +474,12 @@ void LLDrawPoolWater::shade()
 	if (LLViewerCamera::getInstance()->cameraUnderWater())
 	{
 		water_color.setVec(1.f, 1.f, 1.f, 0.4f);
-		shader->uniform1f(LLShaderMgr::WATER_REFSCALE, param_mgr->getScaleBelow());
+		shader->uniform1f(LLViewerShaderMgr::WATER_REFSCALE, param_mgr->getScaleBelow());
 	}
 	else
 	{
 		water_color.setVec(1.f, 1.f, 1.f, 0.5f*(1.f + up_dot));
-		shader->uniform1f(LLShaderMgr::WATER_REFSCALE, param_mgr->getScaleAbove());
+		shader->uniform1f(LLViewerShaderMgr::WATER_REFSCALE, param_mgr->getScaleAbove());
 	}
 
 	if (water_color.mV[3] > 0.9f)
@@ -527,12 +527,12 @@ void LLDrawPoolWater::shade()
 		}
 	}
 	
-	shader->disableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-	shader->disableTexture(LLShaderMgr::WATER_SCREENTEX);	
-	shader->disableTexture(LLShaderMgr::BUMP_MAP);
-	shader->disableTexture(LLShaderMgr::DIFFUSE_MAP);
-	shader->disableTexture(LLShaderMgr::WATER_REFTEX);
-	shader->disableTexture(LLShaderMgr::WATER_SCREENDEPTH);
+	shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+	shader->disableTexture(LLViewerShaderMgr::WATER_SCREENTEX);	
+	shader->disableTexture(LLViewerShaderMgr::BUMP_MAP);
+	shader->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
+	shader->disableTexture(LLViewerShaderMgr::WATER_REFTEX);
+	shader->disableTexture(LLViewerShaderMgr::WATER_SCREENDEPTH);
 	shader->unbind();
 
 	gGL.getTexUnit(0)->activate();
diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp
index 01e1af0..8802c1f 100644
--- a/linden/indra/newview/lldrawpoolwlsky.cpp
+++ b/linden/indra/newview/lldrawpoolwlsky.cpp
@@ -55,7 +55,7 @@ LLPointer<LLImageRaw> LLDrawPoolWLSky::sCloudNoiseRawImage = NULL;
 LLDrawPoolWLSky::LLDrawPoolWLSky(void) :
 	LLDrawPool(POOL_WL_SKY)
 {
-	const LLString cloudNoiseFilename(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", "clouds2.tga"));
+	const std::string cloudNoiseFilename(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", "clouds2.tga"));
 	llinfos << "loading WindLight cloud noise from " << cloudNoiseFilename << llendl;
 
 	LLPointer<LLImageFormatted> cloudNoiseFile(LLImageFormatted::createFromExtension(cloudNoiseFilename));
@@ -78,7 +78,8 @@ LLDrawPoolWLSky::LLDrawPoolWLSky(void) :
 LLDrawPoolWLSky::~LLDrawPoolWLSky()
 {
 	//llinfos << "destructing wlsky draw pool." << llendl;
-	sCloudNoiseTexture = 0;
+	sCloudNoiseTexture = NULL;
+	sCloudNoiseRawImage = NULL;
 }
 
 LLViewerImage *LLDrawPoolWLSky::getDebugTexture()
diff --git a/linden/indra/newview/llemote.h b/linden/indra/newview/llemote.h
index 9bc5128..553c0c8 100644
--- a/linden/indra/newview/llemote.h
+++ b/linden/indra/newview/llemote.h
@@ -113,8 +113,6 @@ public:
 
 	virtual BOOL canDeprecate() { return FALSE; }
 
-	static BOOL	 getIndexFromName( const char* name, U32* index );
-
 protected:
 
 	LLCharacter*		mCharacter;
diff --git a/linden/indra/newview/lleventinfo.cpp b/linden/indra/newview/lleventinfo.cpp
index 2a7dcde..5a416ea 100644
--- a/linden/indra/newview/lleventinfo.cpp
+++ b/linden/indra/newview/lleventinfo.cpp
@@ -38,65 +38,30 @@
 
 LLEventInfo::cat_map LLEventInfo::sCategories;
 
-LLEventInfo::LLEventInfo(F32 global_x, F32 global_y, 
-						 const char* name, 
-						 U32 id,
-						 S32 unix_time,
-						 U32 event_flags)
-:	mName( name ),
-	mID( id ),
-	mPosGlobal( global_x, global_y, 40.0 ),
-	mUnixTime( unix_time ),
-	mEventFlags(event_flags),
-	mSelected( FALSE )
-{
-	struct tm* timep;
-	// Convert to Pacific, based on server's opinion of whether
-	// it's daylight savings time there.
-	timep = utc_to_pacific_time(unix_time, gPacificDaylightTime);
-
-	S32 display_hour = timep->tm_hour % 12;
-	if (display_hour == 0) display_hour = 12;
-
-	mTimeStr = llformat("% 2d/% 2d % 2d:%02d %s",
-						timep->tm_mon+1,
-						timep->tm_year-100,
-						display_hour,
-						timep->tm_min,
-						(timep->tm_hour < 12 ? "AM" : "PM") );
-}
-
-
 void LLEventInfo::unpack(LLMessageSystem *msg)
 {
-	const U32 MAX_DESC_LENGTH = 1024;
-
 	U32 event_id;
 	msg->getU32("EventData", "EventID", event_id);
 	mID = event_id;
 
-	char buffer[MAX_DESC_LENGTH]; /*Flawfinder: ignore*/
-	msg->getString("EventData", "Name", MAX_DESC_LENGTH, buffer);
-	mName = buffer;
+	msg->getString("EventData", "Name", mName);
 
-	msg->getString("EventData", "Category", MAX_DESC_LENGTH, buffer);
-	mCategoryStr = buffer;
+	msg->getString("EventData", "Category", mCategoryStr);
 
-	msg->getString("EventData", "Date", MAX_DESC_LENGTH, buffer);
-	// *FIX: evil hack to let users know that we don't localize
-	// time information.  Hack!  This is WRONG.
-	mTimeStr = buffer;
+	msg->getString("EventData", "Date", mTimeStr);
 
 	U32 duration;
 	msg->getU32("EventData","Duration",duration);
 	mDuration = duration;
 
-	msg->getU32("EventData", "DateUTC", mUnixTime);
+	U32 date;
+	msg->getU32("EventData", "DateUTC", date);
+	mUnixTime = date;
 
-	msg->getString("EventData", "Desc", MAX_DESC_LENGTH, buffer);
-	mDesc = buffer;
+	msg->getString("EventData", "Desc", mDesc);
 
-	msg->getString("EventData", "Creator", MAX_DESC_LENGTH, buffer);
+	std::string buffer;
+	msg->getString("EventData", "Creator", buffer);
 	mRunByID = LLUUID(buffer);
 
 	U32 foo;
@@ -110,9 +75,7 @@ void LLEventInfo::unpack(LLMessageSystem *msg)
 		mCover = cover;
 	}
 
-	char sim_name[256]; /*Flawfinder: ignore*/
-	msg->getString("EventData", "SimName", 256, sim_name);
-	mSimName.assign(sim_name);
+	msg->getString("EventData", "SimName", mSimName);
 
 	msg->getVector3d("EventData", "GlobalPos", mPosGlobal);
 
diff --git a/linden/indra/newview/lleventinfo.h b/linden/indra/newview/lleventinfo.h
index 5741478..ef2bd33 100644
--- a/linden/indra/newview/lleventinfo.h
+++ b/linden/indra/newview/lleventinfo.h
@@ -44,7 +44,6 @@ class LLEventInfo
 {
 public:
 	LLEventInfo() {}
-	LLEventInfo(F32 global_x, F32 global_y, const char* name, U32 id, S32 unix_time, U32 event_flags);
 
 	void unpack(LLMessageSystem *msg);
 
@@ -58,9 +57,9 @@ public:
 	U32			mDuration;
 	std::string	mTimeStr;
 	LLUUID		mRunByID;
-	LLString	mSimName;
+	std::string	mSimName;
 	LLVector3d	mPosGlobal;
-	U32			mUnixTime; // seconds from 1970
+	time_t		mUnixTime; // seconds from 1970
 	BOOL		mHasCover;
 	U32			mCover;
 	U32			mEventFlags;
diff --git a/linden/indra/newview/lleventnotifier.cpp b/linden/indra/newview/lleventnotifier.cpp
index 9451667..e289a2b 100644
--- a/linden/indra/newview/lleventnotifier.cpp
+++ b/linden/indra/newview/lleventnotifier.cpp
@@ -68,7 +68,7 @@ void LLEventNotifier::update()
 		// Check our notifications again and send out updates
 		// if they happen.
 
-		U32 alert_time = time_corrected() + 5 * 60;
+		time_t alert_time = time_corrected() + 5 * 60;
 		en_map::iterator iter;
 		for (iter = mEventNotifications.begin();
 			 iter != mEventNotifications.end();)
@@ -77,7 +77,7 @@ void LLEventNotifier::update()
 
 			if (np->getEventDate() < (alert_time))
 			{
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[NAME]"] = np->getEventName();
 				args["[DATE]"] = np->getEventDateStr();
 				LLNotifyBox::showXml("EventNotification", args, 
@@ -203,7 +203,8 @@ void LLEventNotifier::notifyCallback(S32 option, void *user_data)
 
 LLEventNotification::LLEventNotification() :
 	mEventID(0),
-	mEventName("")
+	mEventName(""),
+	mEventDate(0)
 {
 }
 
diff --git a/linden/indra/newview/lleventnotifier.h b/linden/indra/newview/lleventnotifier.h
index 773779c..f9b7309 100644
--- a/linden/indra/newview/lleventnotifier.h
+++ b/linden/indra/newview/lleventnotifier.h
@@ -75,14 +75,14 @@ public:
 	//void setEventName(std::string &event_name);
 	U32					getEventID() const				{ return mEventID; }
 	const std::string	&getEventName() const			{ return mEventName; }
-	U32					getEventDate() const			{ return mEventDate; }
+	time_t				getEventDate() const			{ return mEventDate; }
 	const std::string	&getEventDateStr() const		{ return mEventDateStr; }
 	LLVector3d			getEventPosGlobal() const		{ return mEventPosGlobal; }
 protected:
 	U32			mEventID;			// EventID for this event
 	std::string	mEventName;
 	std::string mEventDateStr;
-	U32			mEventDate;
+	time_t		mEventDate;
 	LLVector3d	mEventPosGlobal;
 };
 
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index 3e0c5b2..9a74446 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -54,8 +54,6 @@
 
 #define LL_MAX_INDICES_COUNT 1000000
 
-extern BOOL gPickFaces;
-
 BOOL LLFace::sSafeRenderSelect = TRUE; // FALSE
 
 #define DOTVEC(a,b) (a.mV[0]*b.mV[0] + a.mV[1]*b.mV[1] + a.mV[2]*b.mV[2])
@@ -73,14 +71,15 @@ The resulting texture coordinate <u,v> is:
 	u = 2(B dot P)
 	v = 2(T dot P)
 */
-void planarProjection(LLVector2 &tc, const LLVolumeFace::VertexData &vd, const LLVector3 &mCenter, const LLVector3& vec)
+void planarProjection(LLVector2 &tc, const LLVector3& normal,
+					  const LLVector3 &mCenter, const LLVector3& vec)
 {	//DONE!
 	LLVector3 binormal;
-	float d = vd.mNormal * LLVector3(1,0,0);
+	float d = normal * LLVector3(1,0,0);
 	if (d >= 0.5f || d <= -0.5f)
 	{
 		binormal = LLVector3(0,1,0);
-		if (vd.mNormal.mV[0] < 0)
+		if (normal.mV[0] < 0)
 		{
 			binormal = -binormal;
 		}
@@ -88,18 +87,19 @@ void planarProjection(LLVector2 &tc, const LLVolumeFace::VertexData &vd, const L
 	else
 	{
         binormal = LLVector3(1,0,0);
-		if (vd.mNormal.mV[1] > 0)
+		if (normal.mV[1] > 0)
 		{
 			binormal = -binormal;
 		}
 	}
-	LLVector3 tangent = binormal % vd.mNormal;
+	LLVector3 tangent = binormal % normal;
 
 	tc.mV[1] = -((tangent*vec)*2 - 0.5f);
 	tc.mV[0] = 1.0f+((binormal*vec)*2 - 0.5f);
 }
 
-void sphericalProjection(LLVector2 &tc, const LLVolumeFace::VertexData &vd, const LLVector3 &mCenter, const LLVector3& vec)
+void sphericalProjection(LLVector2 &tc, const LLVector3& normal,
+						 const LLVector3 &mCenter, const LLVector3& vec)
 {	//BROKEN
 	/*tc.mV[0] = acosf(vd.mNormal * LLVector3(1,0,0))/3.14159f;
 	
@@ -110,7 +110,7 @@ void sphericalProjection(LLVector2 &tc, const LLVolumeFace::VertexData &vd, cons
 	}*/
 }
 
-void cylindricalProjection(LLVector2 &tc, const LLVolumeFace::VertexData &vd, const LLVector3 &mCenter, const LLVector3& vec)
+void cylindricalProjection(LLVector2 &tc, const LLVector3& normal, const LLVector3 &mCenter, const LLVector3& vec)
 {	//BROKEN
 	/*LLVector3 binormal;
 	float d = vd.mNormal * LLVector3(1,0,0);
@@ -372,9 +372,9 @@ void LLFace::renderForSelect(U32 data_mask)
 
 		mVertexBuffer->setBuffer(data_mask);
 #if !LL_RELEASE_FOR_DOWNLOAD
-		LLGLState::checkClientArrays(data_mask);
+		LLGLState::checkClientArrays("", data_mask);
 #endif
-		if (gPickFaces && mTEOffset != -1)
+		if (mTEOffset != -1)
 		{
 			// mask off high 4 bits (16 total possible faces)
 			color.mV[0] &= 0x0f;
@@ -419,12 +419,11 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color)
 
 	if (mGeomCount > 0 && mIndicesCount > 0)
 	{
-		LLGLSPipelineAlpha gls_pipeline_alpha;
-		glColor4fv(color.mV);
+		gGL.color4fv(color.mV);
 
 		LLViewerImage::bindTexture(imagep);
 	
-		glPushMatrix();
+		gGL.pushMatrix();
 		if (mDrawablep->isActive())
 		{
 			glMultMatrixf((GLfloat*)mDrawablep->getRenderMatrix().mMatrix);
@@ -434,137 +433,49 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color)
 			glMultMatrixf((GLfloat*)mDrawablep->getRegion()->mRenderMatrix.mMatrix);
 		}
 
-		mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD);
+		mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
 #if !LL_RELEASE_FOR_DOWNLOAD
-		LLGLState::checkClientArrays(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD);
+		LLGLState::checkClientArrays("", LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
 #endif
 		mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex);
 				
-		glPopMatrix();
+		gGL.popMatrix();
 	}
 }
 
-void LLFace::renderSelectedUV(const S32 offset, const S32 count)
+
+/* removed in lieu of raycast uv detection
+void LLFace::renderSelectedUV()
 {
-#if 0
 	LLViewerImage* red_blue_imagep = gImageList.getImageFromFile("uv_test1.j2c", TRUE, TRUE);
 	LLViewerImage* green_imagep = gImageList.getImageFromFile("uv_test2.tga", TRUE, TRUE);
 
-	LLGLSObjectSelect object_select;
-	LLGLEnable blend(GL_BLEND);
-	
-	if (!mDrawPoolp || !getIndicesCount() || getIndicesStart() < 0)
-	{
-		return;
-	}
-	for (S32 pass = 0; pass < 2; pass++)
-	{
-		static F32 bias = 0.f;
-		static F32 factor = -10.f;
-		if (mGeomCount > 0)
-		{
-			gGL.color4fv(LLColor4::white.mV);
-
-			if (pass == 0)
-			{
-				LLViewerImage::bindTexture(red_blue_imagep);
-				red_blue_imagep->setMipFilterNearest (TRUE, TRUE);
-			}
-			else // pass == 1
-			{
-				gGL.blendFunc(GL_ONE, GL_ONE);
-				LLViewerImage::bindTexture(green_imagep);
-				glMatrixMode(GL_TEXTURE);
-				glPushMatrix();
-				glScalef(256.f, 256.f, 1.f);
-				green_imagep->setMipFilterNearest (TRUE, TRUE);
-			}
-
+	LLGLSUVSelect object_select;
 
-			if (!isState(GLOBAL))
-			{
-				// Apply the proper transform for non-global objects.
-				glMatrixMode(GL_MODELVIEW);
-				glPushMatrix();
-				glMultMatrixf((float*)getRenderMatrix().mMatrix);
-			}
-
-			glEnable(GL_POLYGON_OFFSET_FILL);
-			glPolygonOffset(factor, bias);
-			if (sSafeRenderSelect)
-			{
-				gGL.begin(LLVertexBuffer::TRIANGLES);
-				if (count)
-				{
-					for (S32 i = offset; i < offset + count; i++)
-					{
-						LLVector2 tc = mDrawPoolp->getTexCoord(mDrawPoolp->getIndex(getIndicesStart() + i), 0);
-						gGL.texCoord2fv(tc.mV);
-						LLVector3 vertex = mDrawPoolp->getVertex(mDrawPoolp->getIndex(getIndicesStart() + i));
-						gGL.vertex3fv(vertex.mV);
-					}
-				}
-				else
-				{
-					for (U32 i = 0; i < getIndicesCount(); i++)
-					{
-						LLVector2 tc = mDrawPoolp->getTexCoord(mDrawPoolp->getIndex(getIndicesStart() + i), 0);
-						gGL.texCoord2fv(tc.mV);
-						LLVector3 vertex = mDrawPoolp->getVertex(mDrawPoolp->getIndex(getIndicesStart() + i));
-						gGL.vertex3fv(vertex.mV);
-					}
-				}
-				gGL.end();
-			}
-			else
-			{
-				llassert(mGeomIndex >= 0);
-				if (count)
-				{
-					if (mIndicesCount > 0)
-					{
-						glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, getRawIndices() + offset); 
-					}
-					else
-					{
-						llerrs << "Rendering non-indexed volume face!" << llendl;
-						glDrawArrays(mPrimType, mGeomIndex, mGeomCount); 
-					}
-				}
-				else
-				{
-					if (mIndicesCount > 0)
-					{
-						glDrawElements(GL_TRIANGLES, mIndicesCount, GL_UNSIGNED_SHORT, getRawIndices()); 
-					}
-					else
-					{
-						glDrawArrays(GL_TRIANGLES, mGeomIndex, mGeomCount); 
-					}
-				}
-			}
-
-			glDisable(GL_POLYGON_OFFSET_FILL);
-			if (!isState(GLOBAL))
-			{
-				// Restore the tranform for non-global objects
-				glPopMatrix();
-			}
-			if (pass == 1)
-			{
-				glMatrixMode(GL_TEXTURE);
-				glPopMatrix();
-				glMatrixMode(GL_MODELVIEW);
-				gGL.blendFunc(GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA);
-			}
-		}
-	}
+	// use red/blue gradient to get coarse UV coordinates
+	renderSelected(red_blue_imagep, LLColor4::white);
 	
-	//restore blend func
-	gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-#endif
+	static F32 bias = 0.f;
+	static F32 factor = -10.f;
+	glPolygonOffset(factor, bias);
+
+	// add green dither pattern on top of red/blue gradient
+	gGL.blendFunc(LLRender::BF_ONE, LLRender::BF_ONE);
+	glMatrixMode(GL_TEXTURE);
+	glPushMatrix();
+	// make green pattern repeat once per texel in red/blue texture
+	glScalef(256.f, 256.f, 1.f);
+	glMatrixMode(GL_MODELVIEW);
+
+	renderSelected(green_imagep, LLColor4::white);
+
+	glMatrixMode(GL_TEXTURE);
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+	gGL.blendFunc(LLRender::BF_SOURCE_ALPHA, LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
 }
 
+*/
 
 void LLFace::printDebugInfo() const
 {
@@ -760,6 +671,72 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
 	return TRUE;
 }
 
+
+
+// convert surface coordinates to texture coordinates, based on
+// the values in the texture entry.  probably should be
+// integrated with getGeometryVolume() for its texture coordinate
+// generation - but i'll leave that to someone more familiar
+// with the implications.
+LLVector2 LLFace::surfaceToTexture(LLVector2 surface_coord, LLVector3 position, LLVector3 normal)
+{
+	LLVector2 tc = surface_coord;
+	
+	const LLTextureEntry *tep = getTextureEntry();
+
+	if (tep == NULL)
+	{
+		// can't do much without the texture entry
+		return surface_coord;
+	}
+
+	// see if we have a non-default mapping
+    U8 texgen = getTextureEntry()->getTexGen();
+	if (texgen != LLTextureEntry::TEX_GEN_DEFAULT)
+	{
+		LLVector3 center = mDrawablep->getVOVolume()->getVolume()->getVolumeFace(mTEOffset).mCenter;
+		
+		LLVector3 scale  = (mDrawablep->getVOVolume()->isVolumeGlobal()) ? LLVector3(1,1,1) : mVObjp->getScale();
+		LLVector3 volume_position = mDrawablep->getVOVolume()->agentPositionToVolume(position);
+		volume_position.scaleVec(scale);
+		
+		LLVector3 volume_normal   = mDrawablep->getVOVolume()->agentDirectionToVolume(normal);
+		volume_normal.normalize();
+		
+		switch (texgen)
+		{
+		case LLTextureEntry::TEX_GEN_PLANAR:
+			planarProjection(tc, volume_normal, center, volume_position);
+			break;
+		case LLTextureEntry::TEX_GEN_SPHERICAL:
+			sphericalProjection(tc, volume_normal, center, volume_position);
+			break;
+		case LLTextureEntry::TEX_GEN_CYLINDRICAL:
+			cylindricalProjection(tc, volume_normal, center, volume_position);
+			break;
+		default:
+			break;
+		}		
+	}
+
+	if (mTextureMatrix)	// if we have a texture matrix, use it
+	{
+		LLVector3 tc3(tc);
+		tc3 = tc3 * *mTextureMatrix;
+		tc = LLVector2(tc3);
+	}
+	
+	else // otherwise use the texture entry parameters
+	{
+		xform(tc, cos(tep->getRotation()), sin(tep->getRotation()),
+			  tep->mOffsetS, tep->mOffsetT, tep->mScaleS, tep->mScaleT);
+	}
+
+	
+	return tc;
+}
+
+
 BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 							   const S32 &f,
 								const LLMatrix4& mat_vert, const LLMatrix3& mat_normal,
@@ -1039,13 +1016,13 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 				switch (texgen)
 				{
 					case LLTextureEntry::TEX_GEN_PLANAR:
-						planarProjection(tc, vf.mVertices[i], vf.mCenter, vec);
+						planarProjection(tc, vf.mVertices[i].mNormal, vf.mCenter, vec);
 						break;
 					case LLTextureEntry::TEX_GEN_SPHERICAL:
-						sphericalProjection(tc, vf.mVertices[i], vf.mCenter, vec);
+						sphericalProjection(tc, vf.mVertices[i].mNormal, vf.mCenter, vec);
 						break;
 					case LLTextureEntry::TEX_GEN_CYLINDRICAL:
-						cylindricalProjection(tc, vf.mVertices[i], vf.mCenter, vec);
+						cylindricalProjection(tc, vf.mVertices[i].mNormal, vf.mCenter, vec);
 						break;
 					default:
 						break;
diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h
index 533851c..0501dcc 100644
--- a/linden/indra/newview/llface.h
+++ b/linden/indra/newview/llface.h
@@ -91,6 +91,7 @@ public:
 	LLXformMatrix*	getXform()			const	{ return mXform; }
 	BOOL			hasGeometry()		const	{ return mGeomCount > 0; }
 	LLVector3		getPositionAgent()	const;
+	LLVector2       surfaceToTexture(LLVector2 surface_coord, LLVector3 position, LLVector3 normal);
 	
 	U32				getState()			const	{ return mState; }
 	void			setState(U32 state)			{ mState |= state; }
@@ -165,7 +166,7 @@ public:
 	void		update();
 
 	void		updateCenterAgent(); // Update center when xform has changed.
-	void		renderSelectedUV(const S32 offset = 0, const S32 count = 0);
+	void		renderSelectedUV();
 
 	void		renderForSelect(U32 data_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
 	void		renderSelected(LLImageGL *image, const LLColor4 &color);
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index d594dc5..f1ca99f 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -208,7 +208,7 @@ static const int FTV_DISPLAY_NUM  = (sizeof(ft_display_table)/sizeof(ft_display_
 S32 ft_display_idx[FTV_DISPLAY_NUM]; // line of table entry for display purposes (for collapse)
 
 LLFastTimerView::LLFastTimerView(const std::string& name, const LLRect& rect)
-	:	LLFloater(name, rect, "Fast Timers")
+	:	LLFloater(name, rect, std::string("Fast Timers"))
 {
 	setVisible(FALSE);
 	mDisplayMode = 0;
@@ -499,7 +499,7 @@ void LLFastTimerView::draw()
 		LLFontGL::sMonospace->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP);
 		y -= (texth + 2);
 
-		LLFontGL::sMonospace->renderUTF8("[Right-Click log selected] [ALT-Click toggle counts] [ALT-SHIFT-Click sub hidden]",
+		LLFontGL::sMonospace->renderUTF8(std::string("[Right-Click log selected] [ALT-Click toggle counts] [ALT-SHIFT-Click sub hidden]"),
 										 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP);
 		y -= (texth + 2);
 	}
@@ -632,7 +632,7 @@ void LLFastTimerView::draw()
 		}
 		y -= (texth + 2);
 
-		textw = dx + LLFontGL::sMonospace->getWidth(ft_display_table[i].desc) + 40;
+		textw = dx + LLFontGL::sMonospace->getWidth(std::string(ft_display_table[i].desc)) + 40;
 		if (textw > legendwidth)
 			legendwidth = textw;
 	}
@@ -946,11 +946,13 @@ void LLFastTimerView::draw()
 			F32 ms = (F32)((F64)max_ticks * iclock_freq);
 			
 			//display y-axis range
-			LLString tdesc = mDisplayCalls ? 
-							llformat("%d calls", max_ticks) :
-							mDisplayHz ?
-							llformat("%d Hz", max_ticks) :
-							llformat("%4.2f ms", ms);
+			std::string tdesc;
+			 if (mDisplayCalls)
+				tdesc = llformat("%d calls", (int)max_ticks);
+			else if (mDisplayHz)
+				tdesc = llformat("%d Hz", (int)max_ticks);
+			else
+				tdesc = llformat("%4.2f ms", ms);
 							
 			x = graph_rect.mRight - LLFontGL::sMonospace->getWidth(tdesc)-5;
 			y = graph_rect.mTop - ((S32)LLFontGL::sMonospace->getLineHeight());
@@ -1063,7 +1065,7 @@ void LLFastTimerView::draw()
 				x = (graph_rect.mRight + graph_rect.mLeft)/2;
 				y = graph_rect.mBottom + 8;
 
-				LLFontGL::sMonospace->renderUTF8(ft_display_table[mHoverIndex].desc, 0, x, y, LLColor4::white,
+				LLFontGL::sMonospace->renderUTF8(std::string(ft_display_table[mHoverIndex].desc), 0, x, y, LLColor4::white,
 					LLFontGL::LEFT, LLFontGL::BOTTOM);
 			}					
 		}
@@ -1072,7 +1074,7 @@ void LLFastTimerView::draw()
 	// Output stats for clicked bar to log
 	if (mPrintStats >= 0)
 	{
-		LLString legend_stat;
+		std::string legend_stat;
 		S32 stat_num;
 		S32 first = 1;
 		for (stat_num = 0; stat_num < FTV_DISPLAY_NUM; stat_num++)
@@ -1086,7 +1088,7 @@ void LLFastTimerView::draw()
 		}
 		llinfos << legend_stat << llendl;
 
-		LLString timer_stat;
+		std::string timer_stat;
 		first = 1;
 		for (stat_num = 0; stat_num < FTV_DISPLAY_NUM; stat_num++)
 		{
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 69e7bcc..a3da4f5 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -75,23 +75,21 @@ const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
 
 const char GPU_TABLE_FILENAME[] = "gpu_table.txt";
 
-LLFeatureInfo::LLFeatureInfo(const char *name, const BOOL available, const F32 level) : mValid(TRUE)
+LLFeatureInfo::LLFeatureInfo(const std::string& name, const BOOL available, const F32 level)
+	: mValid(TRUE), mName(name), mAvailable(available), mRecommendedLevel(level)
 {
-	mName = name;
-	mAvailable = available;
-	mRecommendedLevel = level;
 }
 
-LLFeatureList::LLFeatureList(const char *name)
+LLFeatureList::LLFeatureList(const std::string& name)
+	: mName(name)
 {
-	mName = name;
 }
 
 LLFeatureList::~LLFeatureList()
 {
 }
 
-void LLFeatureList::addFeature(const char *name, const BOOL available, const F32 level)
+void LLFeatureList::addFeature(const std::string& name, const BOOL available, const F32 level)
 {
 	if (mFeatures.count(name))
 	{
@@ -102,7 +100,7 @@ void LLFeatureList::addFeature(const char *name, const BOOL available, const F32
 	mFeatures[name] = fi;
 }
 
-BOOL LLFeatureList::isFeatureAvailable(const char *name)
+BOOL LLFeatureList::isFeatureAvailable(const std::string& name)
 {
 	if (mFeatures.count(name))
 	{
@@ -116,7 +114,7 @@ BOOL LLFeatureList::isFeatureAvailable(const char *name)
 	return TRUE;
 }
 
-F32 LLFeatureList::getRecommendedValue(const char *name)
+F32 LLFeatureList::getRecommendedValue(const std::string& name)
 {
 	if (mFeatures.count(name) && isFeatureAvailable(name))
 	{
@@ -188,7 +186,7 @@ void LLFeatureList::dump()
 	LL_DEBUGS("RenderInit") << LL_ENDL;
 }
 
-LLFeatureList *LLFeatureManager::findMask(const char *name)
+LLFeatureList *LLFeatureManager::findMask(const std::string& name)
 {
 	if (mMaskList.count(name))
 	{
@@ -198,7 +196,7 @@ LLFeatureList *LLFeatureManager::findMask(const char *name)
 	return NULL;
 }
 
-BOOL LLFeatureManager::maskFeatures(const char *name)
+BOOL LLFeatureManager::maskFeatures(const std::string& name)
 {
 	LLFeatureList *maskp = findMask(name);
 	if (!maskp)
@@ -225,14 +223,13 @@ BOOL LLFeatureManager::loadFeatureTables()
 	data_path += gDirUtilp->getDirDelimiter();
 
 	data_path += FEATURE_TABLE_FILENAME;
-
-
-	char	name[MAX_STRING+1];	 /*Flawfinder: ignore*/
+	lldebugs << "Looking for feature table in " << data_path << llendl;
 
 	llifstream file;
+	std::string name;
 	U32		version;
 	
-	file.open(data_path.c_str()); 	 /*Flawfinder: ignore*/
+	file.open(data_path); 	 /*Flawfinder: ignore*/
 
 	if (!file)
 	{
@@ -243,7 +240,7 @@ BOOL LLFeatureManager::loadFeatureTables()
 	// Check file version
 	file >> name;
 	file >> version;
-	if (strcmp(name, "version"))
+	if (name != "version")
 	{
 		LL_WARNS("RenderInit") << data_path << " does not appear to be a valid feature table!" << LL_ENDL;
 		return FALSE;
@@ -252,30 +249,27 @@ BOOL LLFeatureManager::loadFeatureTables()
 	mTableVersion = version;
 
 	LLFeatureList *flp = NULL;
-	while (!file.eof())
+	while (!file.eof() && file.good())
 	{
 		char buffer[MAX_STRING];		 /*Flawfinder: ignore*/
-		name[0] = 0;
 
 		file >> name;
 		
-		if (strlen(name) >= 2 && 	 /*Flawfinder: ignore*/
-			name[0] == '/' && 
-			name[1] == '/')
+		if (name.substr(0,2) == "//")
 		{
 			// This is a comment.
 			file.getline(buffer, MAX_STRING);
 			continue;
 		}
 
-		if (strlen(name) == 0)		 /*Flawfinder: ignore*/
+		if (name.empty())
 		{
 			// This is a blank line
 			file.getline(buffer, MAX_STRING);
 			continue;
 		}
 
-		if (!strcmp(name, "list"))
+		if (name == "list")
 		{
 			if (flp)
 			{
@@ -323,7 +317,7 @@ void LLFeatureManager::loadGPUClass()
 
 	llifstream file;
 		
-	file.open(data_path.c_str()); 		 /*Flawfinder: ignore*/
+	file.open(data_path); 		 /*Flawfinder: ignore*/
 
 	if (!file)
 	{
@@ -491,19 +485,19 @@ void LLFeatureManager::applyFeatures(bool skipFeatures)
 		// handle all the different types
 		if(ctrl->isType(TYPE_BOOLEAN))
 		{
-			gSavedSettings.setBOOL(mIt->first, (BOOL)getRecommendedValue(mIt->first.c_str()));
+			gSavedSettings.setBOOL(mIt->first, (BOOL)getRecommendedValue(mIt->first));
 		}
 		else if (ctrl->isType(TYPE_S32))
 		{
-			gSavedSettings.setS32(mIt->first, (S32)getRecommendedValue(mIt->first.c_str()));
+			gSavedSettings.setS32(mIt->first, (S32)getRecommendedValue(mIt->first));
 		}
 		else if (ctrl->isType(TYPE_U32))
 		{
-			gSavedSettings.setU32(mIt->first, (U32)getRecommendedValue(mIt->first.c_str()));
+			gSavedSettings.setU32(mIt->first, (U32)getRecommendedValue(mIt->first));
 		}
 		else if (ctrl->isType(TYPE_F32))
 		{
-			gSavedSettings.setF32(mIt->first, (F32)getRecommendedValue(mIt->first.c_str()));
+			gSavedSettings.setF32(mIt->first, (F32)getRecommendedValue(mIt->first));
 		}
 		else
 		{
@@ -593,6 +587,10 @@ void LLFeatureManager::applyBaseMasks()
 	{
 		maskFeatures("ATI");
 	}
+	if (gGLManager.mATIOldDriver)
+	{
+		maskFeatures("ATIOldDriver");
+	}
 	if (gGLManager.mIsGFFX)
 	{
 		maskFeatures("GeForceFX");
@@ -618,7 +616,7 @@ void LLFeatureManager::applyBaseMasks()
 	}
 
 	//llinfos << "Masking features from gpu table match: " << gpustr << llendl;
-	maskFeatures(gpustr.c_str());
+	maskFeatures(gpustr);
 
 	// now mask cpu type ones
 	if (gSysMemory.getPhysicalMemoryClamped() <= 256*1024*1024)
diff --git a/linden/indra/newview/llfeaturemanager.h b/linden/indra/newview/llfeaturemanager.h
index 79ea958..1eeddfa 100644
--- a/linden/indra/newview/llfeaturemanager.h
+++ b/linden/indra/newview/llfeaturemanager.h
@@ -50,13 +50,13 @@ class LLFeatureInfo
 {
 public:
 	LLFeatureInfo() : mValid(FALSE), mAvailable(FALSE), mRecommendedLevel(-1) {}
-	LLFeatureInfo(const char *name, const BOOL available, const F32 level);
+	LLFeatureInfo(const std::string& name, const BOOL available, const F32 level);
 
 	BOOL isValid() const	{ return mValid; };
 
 public:
 	BOOL		mValid;
-	LLString	mName;
+	std::string	mName;
 	BOOL		mAvailable;
 	F32			mRecommendedLevel;
 };
@@ -65,22 +65,22 @@ public:
 class LLFeatureList
 {
 public:
-	typedef std::map<LLString, LLFeatureInfo> feature_map_t;
+	typedef std::map<std::string, LLFeatureInfo> feature_map_t;
 
-	LLFeatureList(const char *name = "default");
+	LLFeatureList(const std::string& name);
 	virtual ~LLFeatureList();
 
-	BOOL isFeatureAvailable(const char *name);
-	F32 getRecommendedValue(const char *name);
+	BOOL isFeatureAvailable(const std::string& name);
+	F32 getRecommendedValue(const std::string& name);
 
-	void setFeatureAvailable(const char *name, const BOOL available);
-	void setRecommendedLevel(const char *name, const F32 level);
+	void setFeatureAvailable(const std::string& name, const BOOL available);
+	void setRecommendedLevel(const std::string& name, const F32 level);
 
 	BOOL loadFeatureList(LLFILE *fp);
 
 	BOOL maskList(LLFeatureList &mask);
 
-	void addFeature(const char *name, const BOOL available, const F32 level);
+	void addFeature(const std::string& name, const BOOL available, const F32 level);
 
 	feature_map_t& getFeatures()
 	{
@@ -89,7 +89,7 @@ public:
 
 	void dump();
 protected:
-	LLString	mName;
+	std::string	mName;
 	feature_map_t	mFeatures;
 };
 
@@ -97,13 +97,16 @@ protected:
 class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManager>
 {
 public:
-	LLFeatureManager() : mInited(FALSE), mTableVersion(0), mSafe(FALSE), mGPUClass(GPU_CLASS_UNKNOWN) {}
+	LLFeatureManager() :
+		LLFeatureList("default"), mInited(FALSE), mTableVersion(0), mSafe(FALSE), mGPUClass(GPU_CLASS_UNKNOWN)
+	{
+	}
 	~LLFeatureManager() {cleanupFeatureTables();}
 
 	// initialize this by loading feature table and gpu table
 	void init();
 
-	void maskCurrentList(const char *name); // Mask the current feature list with the named list
+	void maskCurrentList(const std::string& name); // Mask the current feature list with the named list
 
 	BOOL loadFeatureTables();
 
@@ -117,8 +120,8 @@ public:
 	void setSafe(const BOOL safe)		{ mSafe = safe; }
 	BOOL isSafe() const					{ return mSafe; }
 
-	LLFeatureList *findMask(const char *name);
-	BOOL maskFeatures(const char *name);
+	LLFeatureList *findMask(const std::string& name);
+	BOOL maskFeatures(const std::string& name);
 
 	// set the graphics to low, medium, high, or ultra.
 	// skipFeatures forces skipping of mostly hardware settings
@@ -138,8 +141,8 @@ protected:
 	void initBaseMask();
 
 
-	std::map<LLString, LLFeatureList *> mMaskList;
-	std::set<LLString> mSkippedFeatures;
+	std::map<std::string, LLFeatureList *> mMaskList;
+	std::set<std::string> mSkippedFeatures;
 	BOOL		mInited;
 	S32			mTableVersion;
 	BOOL		mSafe;					// Reinitialize everything to the "safe" mask
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 1be1199..bbcfba6 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -63,12 +63,14 @@ LLFilePicker LLFilePicker::sInstance;
 //
 // Implementation
 //
-#if LL_WINDOWS
+LLFilePicker::LLFilePicker()
+	: mCurrentFile(0),
+	  mLocked(FALSE)
 
-LLFilePicker::LLFilePicker() 
 {
 	reset();
 
+#if LL_WINDOWS
 	mOFN.lStructSize = sizeof(OPENFILENAMEW);
 	mOFN.hwndOwner = NULL;  // Set later
 	mOFN.hInstance = NULL;
@@ -87,6 +89,16 @@ LLFilePicker::LLFilePicker()
 	mOFN.lCustData = 0L;
 	mOFN.lpfnHook = NULL;
 	mOFN.lpTemplateName = NULL;
+#endif
+
+#if LL_DARWIN
+	memset(&mNavOptions, 0, sizeof(mNavOptions));
+	OSStatus	error = NavGetDefaultDialogCreationOptions(&mNavOptions);
+	if (error == noErr)
+	{
+		mNavOptions.modality = kWindowModalityAppModal;
+	}
+#endif
 }
 
 LLFilePicker::~LLFilePicker()
@@ -94,6 +106,48 @@ LLFilePicker::~LLFilePicker()
 	// nothing
 }
 
+
+const std::string LLFilePicker::getFirstFile()
+{
+	mCurrentFile = 0;
+	return getNextFile();
+}
+
+const std::string LLFilePicker::getNextFile()
+{
+	if (mCurrentFile >= (S32)mFiles.size())
+	{
+		mLocked = FALSE;
+		return std::string();
+	}
+	else
+	{
+		return mFiles[mCurrentFile++];
+	}
+}
+
+const std::string LLFilePicker::getCurFile()
+{
+	if (mCurrentFile >= (S32)mFiles.size())
+	{
+		mLocked = FALSE;
+		return std::string();
+	}
+	else
+	{
+		return mFiles[mCurrentFile];
+	}
+}
+
+void LLFilePicker::reset()
+{
+	mLocked = FALSE;
+	mFiles.clear();
+	mCurrentFile = 0;
+}
+
+#if LL_WINDOWS
+
 BOOL LLFilePicker::setupFilter(ELoadFilter filter)
 {
 	BOOL res = TRUE;
@@ -150,7 +204,6 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
 		return FALSE;
 	}
 	BOOL success = FALSE;
-	mMultiFile = FALSE;
 
 	// don't provide default file selection
 	mFilesW[0] = '\0';
@@ -165,13 +218,15 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
 	
 	// Modal, so pause agent
 	send_agent_pause();
+
+	reset();
+	
 	// NOTA BENE: hitting the file dialog triggers a window focus event, destroying the selection manager!!
 	success = GetOpenFileName(&mOFN);
 	if (success)
 	{
-		LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-		memcpy(mFiles, tstr.c_str(), tstr.size()+1); /*Flawfinder: ignore*/
-		mCurrentFile = mFiles;
+		std::string filename = utf16str_to_utf8str(llutf16string(mFilesW));
+		mFiles.push_back(filename);
 	}
 	send_agent_resume();
 
@@ -187,7 +242,6 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 		return FALSE;
 	}
 	BOOL success = FALSE;
-	mMultiFile = FALSE;
 
 	// don't provide default file selection
 	mFilesW[0] = '\0';
@@ -200,6 +254,8 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 		OFN_EXPLORER | OFN_ALLOWMULTISELECT;
 
 	setupFilter(filter);
+
+	reset();
 	
 	// Modal, so pause agent
 	send_agent_pause();
@@ -212,31 +268,26 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 		// lengths.
 		if( wcslen(mOFN.lpstrFile) > mOFN.nFileOffset )	/*Flawfinder: ignore*/
 		{
-			mMultiFile = FALSE;
-			mCurrentFile = mFiles;
-			LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-			memcpy(mFiles, tstr.c_str(), tstr.size()+1); /*Flawfinder: ignore*/
-
-			mCurrentFile = &mFiles[mOFN.nFileOffset];
+			std::string filename = utf16str_to_utf8str(llutf16string(mFilesW));
+			mFiles.push_back(filename);
 		}
 		else
 		{
-			mMultiFile = TRUE;
-			mCurrentFile = 0;
 			mLocked = TRUE;
 			WCHAR* tptrw = mFilesW;
-			char* tptr = mFiles;
-			memset( mFiles, 0, FILENAME_BUFFER_SIZE );
+			std::string dirname;
 			while(1)
 			{
 				if (*tptrw == 0 && *(tptrw+1) == 0) // double '\0'
 					break;
-				if (*tptrw == 0 && !mCurrentFile)
-					mCurrentFile = tptr+1;
-				S32 tlen16,tlen8;
-				tlen16 = utf16chars_to_utf8chars(tptrw, tptr, &tlen8);
-				tptrw += tlen16;
-				tptr += tlen8;
+				if (*tptrw == 0)
+					tptrw++; // shouldn't happen?
+				std::string filename = utf16str_to_utf8str(llutf16string(tptrw));
+				if (dirname.empty())
+					dirname = filename + "\\";
+				else
+					mFiles.push_back(dirname + filename);
+				tptrw += filename.size();
 			}
 		}
 	}
@@ -247,17 +298,16 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 	return success;
 }
 
-BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
+BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
 {
 	if( mLocked )
 	{
 		return FALSE;
 	}
 	BOOL success = FALSE;
-	mMultiFile = FALSE;
 
 	mOFN.lpstrFile = mFilesW;
-	if (filename)
+	if (!filename.empty())
 	{
 		llutf16string tstring = utf8str_to_utf16str(filename);
 		wcsncpy(mFilesW, tstring.c_str(), FILENAME_BUFFER_SIZE);	}	/*Flawfinder: ignore*/
@@ -278,7 +328,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 			L"\0";
 		break;
 	case FFSAVE_WAV:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.wav", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -288,7 +338,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 			L"\0";
 		break;
 	case FFSAVE_TGA:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.tga", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -298,7 +348,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 			L"\0";
 		break;
 	case FFSAVE_BMP:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.bmp", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -307,8 +357,28 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 			L"Bitmap Images (*.bmp)\0*.bmp\0" \
 			L"\0";
 		break;
+	case FFSAVE_PNG:
+		if (filename.empty())
+		{
+			wcsncpy( mFilesW,L"untitled.png", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
+		}
+		mOFN.lpstrDefExt = L"png";
+		mOFN.lpstrFilter =
+			L"PNG Images (*.png)\0*.png\0" \
+			L"\0";
+		break;
+	case FFSAVE_JPEG:
+		if (filename.empty())
+		{
+			wcsncpy( mFilesW,L"untitled.jpeg", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
+		}
+		mOFN.lpstrDefExt = L"jpeg";
+		mOFN.lpstrFilter =
+			L"JPEG Images (*.jpeg)\0*.jpeg\0" \
+			L"\0";
+		break;
 	case FFSAVE_AVI:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.avi", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -318,7 +388,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 			L"\0";
 		break;
 	case FFSAVE_ANIM:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.xaf", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -329,7 +399,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 		break;
 #ifdef _CORY_TESTING
 	case FFSAVE_GEOMETRY:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.slg", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -340,7 +410,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 		break;
 #endif
 	case FFSAVE_XML:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.xml", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -351,7 +421,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 			L"\0";
 		break;
 	case FFSAVE_COLLADA:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.collada", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -361,7 +431,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 			L"\0";
 		break;
 	case FFSAVE_RAW:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.raw", FILENAME_BUFFER_SIZE);	/*Flawfinder: ignore*/
 		}
@@ -370,7 +440,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 							L"\0";
 		break;
 	case FFSAVE_J2C:
-		if (!filename)
+		if (filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.j2c", FILENAME_BUFFER_SIZE);
 		}
@@ -387,6 +457,8 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 	mOFN.nMaxFile = SINGLE_FILENAME_BUFFER_SIZE;
 	mOFN.Flags = OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST;
 
+	reset();
+
 	// Modal, so pause agent
 	send_agent_pause();
 	{
@@ -394,9 +466,8 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 		success = GetSaveFileName(&mOFN);
 		if (success)
 		{
-			LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-			memcpy(mFiles, tstr.c_str(), tstr.size()+1);  /*Flawfinder: ignore*/
-			mCurrentFile = mFiles;
+			std::string filename = utf16str_to_utf8str(llutf16string(mFilesW));
+			mFiles.push_back(filename);
 		}
 		gKeyboard->resetKeys();
 	}
@@ -407,84 +478,8 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 	return success;
 }
 
-const char* LLFilePicker::getFirstFile()
-{
-	if(mMultiFile)
-	{
-		buildFilename();
-		return mFilename;
-	}
-	return mFiles;
-}
-
-const char* LLFilePicker::getNextFile()
-{
-	if(mMultiFile)
-	{
-		mCurrentFile += strlen(mCurrentFile) + 1;	/*Flawfinder: ignore*/
-		if( '\0' != mCurrentFile[0] )
-		{
-			buildFilename();
-			return mFilename;
-		}
-		else
-		{
-			mLocked = FALSE;
-		}
-	}
-	return NULL;
-}
-
-const char* LLFilePicker::getDirname()
-{
-	if( '\0' != mCurrentFile[0] )
-	{
-		return mCurrentFile;
-	}
-	return NULL;
-}
-
-void LLFilePicker::reset()
-{
-	mLocked = FALSE;
-	memset( mFiles, 0, FILENAME_BUFFER_SIZE );
-	memset( mFilename, 0, LL_MAX_PATH );
-	mCurrentFile = mFiles;
-}
-
-void LLFilePicker::buildFilename( void )
-{
-	strncpy( mFilename, mFiles, LL_MAX_PATH );
-	mFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy
-	S32 len = strlen( mFilename );
-
-	strncat(mFilename,gDirUtilp->getDirDelimiter().c_str(), sizeof(mFilename)-len+1);		/*Flawfinder: ignore*/
-	len += strlen(gDirUtilp->getDirDelimiter().c_str());	/*Flawfinder: ignore*/
-
-//	mFilename[len++] = '\\';
-	LLString::copy( mFilename + len, mCurrentFile, LL_MAX_PATH - len );
-}
-
 #elif LL_DARWIN
 
-LLFilePicker::LLFilePicker() 
-{
-	reset();
-
-	memset(&mNavOptions, 0, sizeof(mNavOptions));
-	OSStatus	error = NavGetDefaultDialogCreationOptions(&mNavOptions);
-	if (error == noErr)
-	{
-		mNavOptions.modality = kWindowModalityAppModal;
-	}
-	mFileIndex = 0;
-}
-
-LLFilePicker::~LLFilePicker()
-{
-	// nothing
-}
-
 Boolean LLFilePicker::navOpenFilterProc(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode)
 {
 	Boolean		result = true;
@@ -589,8 +584,6 @@ OSStatus	LLFilePicker::doNavChooseDialog(ELoadFilter filter)
 	NavReplyRecord	navReply;
 
 	memset(&navReply, 0, sizeof(navReply));
-	mFiles[0] = '\0';
-	mFileVector.clear();
 	
 	// NOTE: we are passing the address of a local variable here.  
 	//   This is fine, because the object this call creates will exist for less than the lifetime of this function.
@@ -632,22 +625,20 @@ OSStatus	LLFilePicker::doNavChooseDialog(ELoadFilter filter)
 				error = FSRefMakePath(&fsRef, (UInt8*) path, sizeof(path));
 			
 			if (error == noErr)
-				mFileVector.push_back(LLString(path));
+				mFiles.push_back(std::string(path));
 		}
 	}
 	
 	return error;
 }
 
-OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
+OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const std::string& filename)
 {
 	OSStatus		error = noErr;
 	NavDialogRef	navRef = NULL;
 	NavReplyRecord	navReply;
 	
 	memset(&navReply, 0, sizeof(navReply));
-	mFiles[0] = '\0';
-	mFileVector.clear();
 	
 	// Setup the type, creator, and extension
 	OSType		type, creator;
@@ -671,7 +662,16 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
 			creator = 'prvw';
 			extension = CFSTR(".bmp");
 			break;
-		
+		case FFSAVE_JPEG:
+			type = 'JPEG';
+			creator = 'prvw';
+			extension = CFSTR(".jpeg");
+			break;
+		case FFSAVE_PNG:
+			type = 'PNG ';
+			creator = 'prvw';
+			extension = CFSTR(".png");
+			break;
 		case FFSAVE_AVI:
 			type = '\?\?\?\?';
 			creator = '\?\?\?\?';
@@ -719,8 +719,8 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
 		bool		hasExtension = true;
 		
 		// Create a CFString of the initial file name
-		if (filename)
-			nameString = CFStringCreateWithCString(NULL, filename, kCFStringEncodingUTF8);
+		if (!filename.empty())
+			nameString = CFStringCreateWithCString(NULL, filename.c_str(), kCFStringEncodingUTF8);
 		else
 			nameString = CFSTR("Untitled");
 			
@@ -786,7 +786,7 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
 				{
 					if (CFStringGetCString(navReply.saveFileName, newFileName, sizeof(newFileName), kCFStringEncodingUTF8))
 					{
-						mFileVector.push_back(LLString(path) + LLString("/") +  LLString(newFileName));
+						mFiles.push_back(std::string(path) + "/" +  std::string(newFileName));
 					}
 					else
 					{
@@ -806,13 +806,15 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
 
 BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
 {
-	if( mLocked ) return FALSE;
-	mMultiFile = FALSE;
+	if( mLocked )
+		return FALSE;
+
 	BOOL success = FALSE;
 
 	OSStatus	error = noErr;
 	
-	mFileVector.clear();
+	reset();
+	
 	mNavOptions.optionFlags &= ~kNavAllowMultipleFiles;
 	// Modal, so pause agent
 	send_agent_pause();
@@ -822,7 +824,7 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
 	send_agent_resume();
 	if (error == noErr)
 	{
-		if (mFileVector.size())
+		if (mFiles.size())
 			success = true;
 	}
 
@@ -833,13 +835,15 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
 
 BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 {
-	if( mLocked ) return FALSE;
-	mMultiFile = TRUE;
+	if( mLocked )
+		return FALSE;
+
 	BOOL success = FALSE;
 
 	OSStatus	error = noErr;
+
+	reset();
 	
-	mFileVector.clear();
 	mNavOptions.optionFlags |= kNavAllowMultipleFiles;
 	// Modal, so pause agent
 	send_agent_pause();
@@ -849,9 +853,9 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 	send_agent_resume();
 	if (error == noErr)
 	{
-		if (mFileVector.size())
+		if (mFiles.size())
 			success = true;
-		if (mFileVector.size() > 1)
+		if (mFiles.size() > 1)
 			mLocked = TRUE;
 	}
 
@@ -860,38 +864,15 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
 	return success;
 }
 
-void LLFilePicker::getFilePath(SInt32 index)
-{
-	mFiles[0] = 0;
-	if (mFileVector.size())
-	{
-		strncpy(mFiles, mFileVector[index].c_str(), sizeof(mFiles));
-		mFiles[sizeof(mFiles)-1] = '\0'; // stupid strncpy
-	}
-}
-
-void LLFilePicker::getFileName(SInt32 index)
-{
-	mFilename[0] = 0;
-	if (mFileVector.size())
-	{
-		char	*start = strrchr(mFileVector[index].c_str(), '/');
-		if (start && ((start + 1 - mFileVector[index].c_str()) < (mFileVector[index].size())))
-		{
-			strncpy(mFilename, start + 1, sizeof(mFilename));
-			mFilename[sizeof(mFilename)-1] = '\0';// stupid strncpy
-		}
-	}
-}
-
-BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
+BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
 {
-	if( mLocked ) return FALSE;
+	if( mLocked )
+		return FALSE;
 	BOOL success = FALSE;
 	OSStatus	error = noErr;
 
-	mFileVector.clear();
-	mMultiFile = FALSE;
+	reset();
+	
 	mNavOptions.optionFlags &= ~kNavAllowMultipleFiles;
 
 	// Modal, so pause agent
@@ -902,7 +883,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 	send_agent_resume();
 	if (error == noErr)
 	{
-		if (mFileVector.size())
+		if (mFiles.size())
 			success = true;
 	}
 
@@ -911,98 +892,38 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
 	return success;
 }
 
-const char* LLFilePicker::getFirstFile()
-{
-	mFileIndex = 0;
-	getFilePath(mFileIndex);
-	return mFiles;
-}
-
-const char* LLFilePicker::getNextFile()
-{
-	if(mMultiFile)
-	{
-		mFileIndex++;
-		if (mFileIndex < mFileVector.size())
-		{
-			getFilePath(mFileIndex);
-			return mFiles;
-		}
-		else
-		{
-			mLocked = FALSE;
-		}
-	}
-	return NULL;
-}
-
-const char* LLFilePicker::getDirname()
-{
-	if (mFileIndex < mFileVector.size())
-	{
-		getFileName(mFileIndex);
-		return mFilename;
-	}
-	return NULL;
-}
-
-void LLFilePicker::reset()
-{
-	mLocked = FALSE;
-	memset( mFiles, 0, FILENAME_BUFFER_SIZE );
-	memset( mFilename, 0, LL_MAX_PATH );
-	mCurrentFile = mFiles;
-
-	mFileIndex = 0;
-	mFileVector.clear();
-}
-
 #elif LL_LINUX
 
 # if LL_GTK
-// This caches the previously-accessed path for a given context of the file
-// chooser, for user convenience.
-std::map <std::string, std::string> LLFilePicker::sContextToPathMap;
-
-LLFilePicker::LLFilePicker() 
-{
-	reset();
-}
-
-LLFilePicker::~LLFilePicker()
-{
-}
-
 
-static void add_to_sfs(gpointer data, gpointer user_data)
+// static
+void LLFilePicker::add_to_selectedfiles(gpointer data, gpointer user_data)
 {
-	StoreFilenamesStruct *sfs = (StoreFilenamesStruct*) user_data;
+	LLFilePicker* picker = (LLFilePicker*) user_data;
 	gchar* filename_utf8 = g_filename_to_utf8((gchar*)data,
-						  -1, NULL,
-						  NULL,
-						  NULL);
-	sfs->fileVector.push_back(LLString(filename_utf8));
+						  -1, NULL, NULL, NULL);
+	picker->mFiles.push_back(std::string(filename_utf8));
+	lldebugs << "ADDED FILE " << filename_utf8 << llendl;
 	g_free(filename_utf8);
 }
 
-
-void chooser_responder(GtkWidget *widget,
-		       gint       response,
-		       gpointer user_data) {
-	StoreFilenamesStruct *sfs = (StoreFilenamesStruct*) user_data;
+// static
+void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer user_data)
+{
+	LLFilePicker* picker = (LLFilePicker*)user_data;
 
 	lldebugs << "GTK DIALOG RESPONSE " << response << llendl;
 
 	if (response == GTK_RESPONSE_ACCEPT)
 	{
 		GSList *file_list = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(widget));
-		g_slist_foreach(file_list, (GFunc)add_to_sfs, sfs);
+		g_slist_foreach(file_list, (GFunc)add_to_selectedfiles, user_data);
 		g_slist_foreach(file_list, (GFunc)g_free, NULL);
 		g_slist_free (file_list);
 	}
 
 	// set the default path for this usage context.
-	LLFilePicker::sContextToPathMap[sfs->contextName] =
+	picker->mContextToPathMap[picker->mCurContextName] =
 		gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
 
 	gtk_widget_destroy(widget);
@@ -1010,8 +931,7 @@ void chooser_responder(GtkWidget *widget,
 }
 
 
-GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder,
-					 std::string context)
+GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::string context)
 {
 	if (ll_try_gtk_init() &&
 	    ! gViewerWindow->getWindow()->getFullscreen())
@@ -1037,14 +957,13 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder,
 						   GTK_STOCK_OPEN),
 						   GTK_RESPONSE_ACCEPT,
 						  (gchar *)NULL);
-		mStoreFilenames.win = win;
-		mStoreFilenames.contextName = context;
+		mCurContextName = context;
 
 		// get the default path for this usage context if it's been
 		// seen before.
 		std::map<std::string,std::string>::iterator
-			this_path = sContextToPathMap.find(context);
-		if (this_path != sContextToPathMap.end())
+			this_path = mContextToPathMap.find(context);
+		if (this_path != mContextToPathMap.end())
 		{
 			gtk_file_chooser_set_current_folder
 				(GTK_FILE_CHOOSER(win),
@@ -1071,8 +990,8 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder,
 
 		g_signal_connect (GTK_FILE_CHOOSER(win),
 				  "response",
-				  G_CALLBACK(chooser_responder),
-				  &mStoreFilenames);
+				  G_CALLBACK(LLFilePicker::chooser_responder),
+				  this);
 
 		gtk_window_set_modal(GTK_WINDOW(win), TRUE);
 
@@ -1147,13 +1066,14 @@ static std::string add_imageload_filter_to_gtkchooser(GtkWindow *picker)
 }
 
 
-BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename )
+BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename )
 {
 	BOOL rtn = FALSE;
 
 	gViewerWindow->mWindow->beforeDialog();
 
 	reset();
+	
 	GtkWindow* picker = buildFilePicker(true, false, "savefile");
 
 	if (picker)
@@ -1210,7 +1130,7 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename )
 		
 		gtk_window_set_title(GTK_WINDOW(picker), caption.c_str());
 
-		if (!filename)
+		if (filename.empty())
 		{
 			suggest_name += suggest_ext;
 
@@ -1221,13 +1141,13 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename )
 		else
 		{
 			gtk_file_chooser_set_current_name
-				(GTK_FILE_CHOOSER(picker), filename);
+				(GTK_FILE_CHOOSER(picker), filename.c_str());
 		}
 
 		gtk_widget_show_all(GTK_WIDGET(picker));
 		gtk_main();
 
-		rtn = (mStoreFilenames.fileVector.size() == 1);
+		rtn = (mFiles.size() == 1);
 	}
 
 	gViewerWindow->mWindow->afterDialog();
@@ -1242,6 +1162,7 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter )
 	gViewerWindow->mWindow->beforeDialog();
 
 	reset();
+	
 	GtkWindow* picker = buildFilePicker(false, false, "openfile");
 
 	if (picker)
@@ -1270,7 +1191,7 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter )
 		gtk_widget_show_all(GTK_WIDGET(picker));
 		gtk_main();
 
-		rtn = (mStoreFilenames.fileVector.size() == 1);
+		rtn = (mFiles.size() == 1);
 	}
 
 	gViewerWindow->mWindow->afterDialog();
@@ -1285,6 +1206,7 @@ BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter )
 	gViewerWindow->mWindow->beforeDialog();
 
 	reset();
+	
 	GtkWindow* picker = buildFilePicker(false, false, "openfile");
 
 	if (picker)
@@ -1296,7 +1218,7 @@ BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter )
 
 		gtk_widget_show_all(GTK_WIDGET(picker));
 		gtk_main();
-		rtn = !mStoreFilenames.fileVector.empty();
+		rtn = !mFiles.empty();
 	}
 
 	gViewerWindow->mWindow->afterDialog();
@@ -1304,178 +1226,69 @@ BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter )
 	return rtn;
 }
 
-const char* LLFilePicker::getFirstFile()
-{
-	mNextFileIndex = 0;
-	return getNextFile();
-}
-
-const char* LLFilePicker::getNextFile()
-{
-	if (mStoreFilenames.fileVector.size() > mNextFileIndex)
-		return mStoreFilenames.fileVector[mNextFileIndex++].c_str();
-	else
-		return NULL;
-}
-
-const char* LLFilePicker::getDirname()
-{
-	// getDirname is badly named... it really means getBasename.
-	S32 index = mNextFileIndex - 1; // want index before the 'next' cursor
-	if (index >= 0 && index < (S32)mStoreFilenames.fileVector.size())
-	{
-		// we do this using C strings so we don't have to
-		// convert a LLString/std::string character offset into a
-		// byte-offset for the return (which is a C string anyway).
-		const char* dirsep = gDirUtilp->getDirDelimiter().c_str();
-		const char* fullpath = mStoreFilenames.fileVector[index].c_str();
-		const char* finalpart = NULL;
-		const char* thispart = fullpath;
-		// (Hmm, is the strstr of dirsep UTF-8-correct?  Yes, reckon.)
-		// Walk through the string looking for the final dirsep, i.e. /
-		do
-		{
-			thispart = strstr(thispart, dirsep);
-			if (NULL != thispart)
-				finalpart = thispart = &thispart[1];
-		}
-		while (NULL != thispart);
-		return finalpart;
-	}
-	else
-		return NULL;
-}
-
-void LLFilePicker::reset()
-{
-	mNextFileIndex = 0;
-	mStoreFilenames.win = NULL;
-	mStoreFilenames.fileVector.clear();
-}
-
 # else // LL_GTK
 
 // Hacky stubs designed to facilitate fake getSaveFile and getOpenFile with
 // static results, when we don't have a real filepicker.
 
-static LLString hackyfilename;
-
-LLFilePicker::LLFilePicker() 
+BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename )
 {
 	reset();
-}
-
-LLFilePicker::~LLFilePicker()
-{
-}
-
-BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename )
-{
+	
 	llinfos << "getSaveFile suggested filename is [" << filename
 		<< "]" << llendl;
-	if (filename && filename[0])
+	if (!filename.empty())
 	{
-		hackyfilename.assign(gDirUtilp->getLindenUserDir());
-		hackyfilename += gDirUtilp->getDirDelimiter();
-		hackyfilename += filename;
+		mFiles.push_back(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + filename);
 		return TRUE;
 	}
-	hackyfilename.clear();
 	return FALSE;
 }
 
 BOOL LLFilePicker::getOpenFile( ELoadFilter filter )
 {
+	reset();
+	
 	// HACK: Static filenames for 'open' until we implement filepicker
-	hackyfilename.assign(gDirUtilp->getLindenUserDir());
-	hackyfilename += gDirUtilp->getDirDelimiter();
-	hackyfilename += "upload";
+	std::string filename = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + "upload";
 	switch (filter)
 	{
-	case FFLOAD_WAV: hackyfilename += ".wav"; break;
-	case FFLOAD_IMAGE: hackyfilename += ".tga"; break;
-	case FFLOAD_ANIM: hackyfilename += ".bvh"; break;
+	case FFLOAD_WAV: filename += ".wav"; break;
+	case FFLOAD_IMAGE: filename += ".tga"; break;
+	case FFLOAD_ANIM: filename += ".bvh"; break;
 	default: break;
 	}
-	llinfos << "getOpenFile: Will try to open file: " << hackyfilename
-		<< llendl;
+	mFiles.push_back(filename);
+	llinfos << "getOpenFile: Will try to open file: " << hackyfilename << llendl;
 	return TRUE;
 }
 
 BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter )
 {
-	hackyfilename.clear();
+	reset();
 	return FALSE;
 }
 
-const char* LLFilePicker::getFirstFile()
-{
-	if (!hackyfilename.empty())
-	{
-		return hackyfilename.c_str();
-	}
-	return NULL;
-}
-
-const char* LLFilePicker::getNextFile()
-{
-	hackyfilename.clear();
-	return NULL;
-}
-
-const char* LLFilePicker::getDirname()
-{
-	return NULL;
-}
-
-void LLFilePicker::reset()
-{
-}
 #endif // LL_GTK
 
 #else // not implemented
 
-LLFilePicker::LLFilePicker() 
-{
-	reset();
-}
-
-LLFilePicker::~LLFilePicker()
-{
-}
-
-BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename )
+BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename )
 {
+	reset();	
 	return FALSE;
 }
 
 BOOL LLFilePicker::getOpenFile( ELoadFilter filter )
 {
+	reset();
 	return FALSE;
 }
 
 BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter )
 {
+	reset();
 	return FALSE;
 }
 
-const char* LLFilePicker::getFirstFile()
-{
-	return NULL;
-}
-
-const char* LLFilePicker::getNextFile()
-{
-	return NULL;
-}
-
-const char* LLFilePicker::getDirname()
-{
-	return NULL;
-}
-
-void LLFilePicker::reset()
-{
-}
-
 #endif
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index c6a11a4..1f7239e 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -68,15 +68,6 @@
 #include "SDL/SDL_syswm.h"
 #endif
 
-#if LL_GTK
-// we use an aggregate structure so we can pass its pointer through a C callback
-typedef struct {
-	GtkWidget *win;
-	std::vector<LLString> fileVector;
-	std::string contextName;
-} StoreFilenamesStruct;
-#endif // LL_GTK
-
 class LLFilePicker
 {
 #ifdef LL_GTK
@@ -116,28 +107,31 @@ public:
 		FFSAVE_COLLADA = 10,
 		FFSAVE_RAW = 11,
 		FFSAVE_J2C = 12,
+		FFSAVE_PNG = 13,
+		FFSAVE_JPEG = 14,
 	};
 
 	// open the dialog. This is a modal operation
-	BOOL getSaveFile( ESaveFilter filter = FFSAVE_ALL, const char* filename = NULL );
+	BOOL getSaveFile( ESaveFilter filter = FFSAVE_ALL, const std::string& filename = LLStringUtil::null );
 	BOOL getOpenFile( ELoadFilter filter = FFLOAD_ALL );
 	BOOL getMultipleOpenFiles( ELoadFilter filter = FFLOAD_ALL );
 
 	// Get the filename(s) found. getFirstFile() sets the pointer to
 	// the start of the structure and allows the start of iteration.
-	const char* getFirstFile();
+	const std::string getFirstFile();
 
 	// getNextFile() increments the internal representation and
 	// returns the next file specified by the user. Returns NULL when
 	// no more files are left. Further calls to getNextFile() are
 	// undefined.
-	const char* getNextFile();
+	const std::string getNextFile();
 
-	// This utility function extracts the directory name but doesn't
-	// do any incrementing. This is currently only supported when
-	// you're opening multiple files.
-	const char* getDirname();
+	// This utility function extracts the current file name without
+	// doing any incrementing.
+	const std::string getCurFile();
 
+	// See llvfs/lldir.h : getBaseFileName and getDirName to extract base or directory names
+	
 	// clear any lists of buffers or whatever, and make sure the file
 	// picker isn't locked.
 	void reset();
@@ -150,11 +144,8 @@ private:
 		FILENAME_BUFFER_SIZE = 65000
 	};
 	
-	void buildFilename( void );
-
 #if LL_WINDOWS
 	OPENFILENAMEW mOFN;				// for open and save dialogs
-	char *mOpenFilter;
 	WCHAR mFilesW[FILENAME_BUFFER_SIZE];
 
 	BOOL setupFilter(ELoadFilter filter);
@@ -162,26 +153,26 @@ private:
 
 #if LL_DARWIN
 	NavDialogCreationOptions mNavOptions;
-	std::vector<LLString> mFileVector;
+	std::vector<std::string> mFileVector;
 	UInt32 mFileIndex;
 	
 	OSStatus doNavChooseDialog(ELoadFilter filter);
-	OSStatus doNavSaveDialog(ESaveFilter filter, const char* filename);
+	OSStatus doNavSaveDialog(ESaveFilter filter, const std::string& filename);
 	void getFilePath(SInt32 index);
 	void getFileName(SInt32 index);
 	static Boolean navOpenFilterProc(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode);
 #endif
 
 #if LL_GTK
-	StoreFilenamesStruct mStoreFilenames;
-	U32 mNextFileIndex;
+	static void add_to_selectedfiles(gpointer data, gpointer user_data);
+	static void chooser_responder(GtkWidget *widget, gint response, gpointer user_data);
 	// we remember the last path that was accessed for a particular usage
-	static std::map <std::string, std::string> sContextToPathMap;
+	std::map <std::string, std::string> mContextToPathMap;
+	std::string mCurContextName;
 #endif
 
-	char mFiles[FILENAME_BUFFER_SIZE];	/*Flawfinder: ignore*/
-	char mFilename[LL_MAX_PATH];	/*Flawfinder: ignore*/
-	char* mCurrentFile;
+	std::vector<std::string> mFiles;
+	S32 mCurrentFile;
 	BOOL mLocked;
 	BOOL mMultiFile;
 
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index b3d383d..fc469f1 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -42,12 +42,13 @@
 #include "llviewercontrol.h"
 #include "llui.h"
 #include "llappviewer.h"
+#include "lltracker.h"
 
 // static
-std::set<LLString> LLFirstUse::sConfigVariables;
+std::set<std::string> LLFirstUse::sConfigVariables;
 
 // static
-void LLFirstUse::addConfigVariable(const LLString& var)
+void LLFirstUse::addConfigVariable(const std::string& var)
 {
 	//Don't add the warning, now that we're storing the default in the settings_default.xml file
 	//gSavedSettings.addWarning(var);
@@ -58,7 +59,7 @@ void LLFirstUse::addConfigVariable(const LLString& var)
 void LLFirstUse::disableFirstUse()
 {
 	// Set all first-use warnings to disabled
-	for (std::set<LLString>::iterator iter = sConfigVariables.begin();
+	for (std::set<std::string>::iterator iter = sConfigVariables.begin();
 		 iter != sConfigVariables.end(); ++iter)
 	{
 		gSavedSettings.setWarning(*iter, FALSE);
@@ -69,7 +70,7 @@ void LLFirstUse::disableFirstUse()
 void LLFirstUse::resetFirstUse()
 {
 	// Set all first-use warnings to disabled
-	for (std::set<LLString>::iterator iter = sConfigVariables.begin();
+	for (std::set<std::string>::iterator iter = sConfigVariables.begin();
 		 iter != sConfigVariables.end(); ++iter)
 	{
 		gSavedSettings.setWarning(*iter, TRUE);
@@ -84,7 +85,7 @@ void LLFirstUse::useBalanceIncrease(S32 delta)
 	{
 		gSavedSettings.setWarning("FirstBalanceIncrease", FALSE);
 
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[AMOUNT]"] = llformat("%d",delta);
 		LLNotifyBox::showXml("FirstBalanceIncrease", args);
 	}
@@ -98,7 +99,7 @@ void LLFirstUse::useBalanceDecrease(S32 delta)
 	{
 		gSavedSettings.setWarning("FirstBalanceDecrease", FALSE);
 
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[AMOUNT]"] = llformat("%d",-delta);
 		LLNotifyBox::showXml("FirstBalanceDecrease", args);
 	}
@@ -162,9 +163,13 @@ void LLFirstUse::useTeleport()
 {
 	if (gSavedSettings.getWarning("FirstTeleport"))
 	{
-		gSavedSettings.setWarning("FirstTeleport", FALSE);
+		LLVector3d teleportDestination = LLTracker::getTrackedPositionGlobal();
+		if(teleportDestination != LLVector3d::zero)
+		{
+			gSavedSettings.setWarning("FirstTeleport", FALSE);
 
-		LLNotifyBox::showXml("FirstTeleport");
+			LLNotifyBox::showXml("FirstTeleport");
+		}
 	}
 }
 
@@ -220,7 +225,7 @@ void LLFirstUse::useSandbox()
 	{
 		gSavedSettings.setWarning("FirstSandbox", FALSE);
 
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[HOURS]"] = llformat("%d",SANDBOX_CLEAN_FREQ);
 		args["[TIME]"] = llformat("%d",SANDBOX_FIRST_CLEAN_HOUR);
 		LLNotifyBox::showXml("FirstSandbox", args);
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index 176ca2d..cde6b59 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -79,7 +79,7 @@ class LLFirstUse
 {
 public:
 	// Add a config variable to be reset on resetFirstUse()
-	static void addConfigVariable(const LLString& var);
+	static void addConfigVariable(const std::string& var);
 	
 	// Sets all controls back to show the dialogs.
 	static void disableFirstUse();
@@ -107,7 +107,7 @@ public:
 	static void useMedia();
 	
 protected:
-	static std::set<LLString> sConfigVariables;
+	static std::set<std::string> sConfigVariables;
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 8e55cf8..a90edb4 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -39,6 +39,9 @@
 #include "llui.h"	// for tr()
 #include "v3dmath.h"
 
+#include "llcurl.h"
+#include "llimagej2c.h"
+
 #include "llviewertexteditor.h"
 #include "llviewercontrol.h"
 #include "llagent.h"
@@ -47,6 +50,10 @@
 #include "llversionviewer.h"
 #include "llviewerbuild.h"
 #include "lluictrlfactory.h"
+#include "lluri.h"
+#include "llweb.h"
+#include "llsecondlifeurls.h"
+#include "lltrans.h"
 #include "llappviewer.h" 
 #include "llglheaders.h"
 #include "llmediamanager.h"
@@ -62,58 +69,94 @@ extern U32 gPacketsIn;
 
 LLFloaterAbout* LLFloaterAbout::sInstance = NULL;
 
+static std::string get_viewer_release_notes_url();
+
 ///----------------------------------------------------------------------------
 /// Class LLFloaterAbout
 ///----------------------------------------------------------------------------
 
 // Default constructor
 LLFloaterAbout::LLFloaterAbout() 
-:	LLFloater("floater_about", "FloaterAboutRect", "")
+:	LLFloater(std::string("floater_about"), std::string("FloaterAboutRect"), LLStringUtil::null)
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about.xml");
 
 	// Support for changing product name.
-	LLString title("About ");
+	std::string title("About ");
 	title += LLAppViewer::instance()->getSecondLifeTitle();
 	setTitle(title);
 
-	LLString support;
+	LLViewerTextEditor *support_widget = 
+		getChild<LLViewerTextEditor>("support_editor", true);
+
+	LLViewerTextEditor *credits_widget = 
+		getChild<LLViewerTextEditor>("credits_editor", true);
+
+
+	if (!support_widget || !credits_widget)
+	{
+		return;
+	}
+
+	// For some reason, adding style doesn't work unless this is true.
+	support_widget->setParseHTML(TRUE);
+
+	// Text styles for release notes hyperlinks
+	LLStyleSP viewer_link_style(new LLStyle);
+	viewer_link_style->setVisible(true);
+	viewer_link_style->setFontName(LLStringUtil::null);
+	viewer_link_style->setLinkHREF(get_viewer_release_notes_url());
+	viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
 
 	// Version string
-	LLString version = LLAppViewer::instance()->getSecondLifeTitle()
-		+ llformat(" %d.%d.%d (%d) %s %s (%s)",
+	std::string version = LLAppViewer::instance()->getSecondLifeTitle()
+		+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
 				   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
 				   __DATE__, __TIME__,
 				   gSavedSettings.getString("VersionChannelName").c_str());
-	support.append(version);
+	support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style);
+
+	std::string support;
 	support.append("\n\n");
 
 	// Position
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region)
 	{
+		LLStyleSP server_link_style(new LLStyle);
+		server_link_style->setVisible(true);
+		server_link_style->setFontName(LLStringUtil::null);
+		server_link_style->setLinkHREF(region->getCapability("ServerReleaseNotes"));
+		server_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+
 		const LLVector3d &pos = gAgent.getPositionGlobal();
 		LLUIString pos_text = getUIString("you_are_at");
 		pos_text.setArg("[POSITION]",
 						llformat("%.1f, %.1f, %.1f ", pos.mdV[VX], pos.mdV[VY], pos.mdV[VZ]));
 		support.append(pos_text);
 
-		LLString region_text = llformat("in %s located at ",
-				gAgent.getRegion()->getName().c_str());
+		std::string region_text = llformat("in %s located at ",
+										gAgent.getRegion()->getName().c_str());
 		support.append(region_text);
 
-		char buffer[MAX_STRING];		/*Flawfinder: ignore*/
-		gAgent.getRegion()->getHost().getHostName(buffer, MAX_STRING);
+		std::string buffer;
+		buffer = gAgent.getRegion()->getHost().getHostName();
 		support.append(buffer);
 		support.append(" (");
-		gAgent.getRegion()->getHost().getString(buffer, MAX_STRING);
+		buffer = gAgent.getRegion()->getHost().getString();
 		support.append(buffer);
 		support.append(")\n");
 		support.append(gLastVersionChannel);
-		support.append("\n\n");
+		support.append("\n");
+
+		support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+		support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &server_link_style);
+
+		support = "\n\n";
 	}
 
-	//*NOTE: Do not translate text like GPU, Graphics Card, etc -
+	// *NOTE: Do not translate text like GPU, Graphics Card, etc -
 	//  Most PC users that know what these mean will be used to the english versions,
 	//  and this info sometimes gets sent to support
 	
@@ -125,11 +168,11 @@ LLFloaterAbout::LLFloaterAbout()
 	U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024;
 	// Moved hack adjustment to Windows memory size into llsys.cpp
 
-	LLString mem_text = llformat("Memory: %u MB\n", memory );
+	std::string mem_text = llformat("Memory: %u MB\n", memory );
 	support.append(mem_text);
 
 	support.append("OS Version: ");
-	support.append( LLAppViewer::instance()->getOSInfo().getOSString().c_str() );
+	support.append( LLAppViewer::instance()->getOSInfo().getOSString() );
 	support.append("\n");
 
 	support.append("Graphics Card Vendor: ");
@@ -144,6 +187,16 @@ LLFloaterAbout::LLFloaterAbout()
 	support.append( (const char*) glGetString(GL_VERSION) );
 	support.append("\n");
 
+	support.append("\n");
+
+	support.append("libcurl Version: ");
+	support.append( LLCurl::getVersionString() );
+	support.append("\n");
+
+	support.append("J2C Decoder Version: ");
+	support.append( LLImageJ2C::getEngineInfo() );
+	support.append("\n");
+
 	LLMediaManager *mgr = LLMediaManager::getInstance();
 	if (mgr)
 	{
@@ -151,7 +204,7 @@ LLFloaterAbout::LLFloaterAbout()
 		if (media_source)
 		{
 			support.append("LLMozLib Version: ");
-			support.append((const char*) media_source->getVersion().c_str());
+			support.append(media_source->getVersion());
 			support.append("\n");
 			mgr->destroySource(media_source);
 		}
@@ -159,7 +212,7 @@ LLFloaterAbout::LLFloaterAbout()
 
 	if (gPacketsIn > 0)
 	{
-		LLString packet_loss = llformat("Packets Lost: %.0f/%.0f (%.1f%%)", 
+		std::string packet_loss = llformat("Packets Lost: %.0f/%.0f (%.1f%%)", 
 			LLViewerStats::getInstance()->mPacketsLostStat.getCurrent(),
 			F32(gPacketsIn),
 			100.f*LLViewerStats::getInstance()->mPacketsLostStat.getCurrent() / F32(gPacketsIn) );
@@ -167,17 +220,18 @@ LLFloaterAbout::LLFloaterAbout()
 		support.append("\n");
 	}
 
+	support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+
 	// Fix views
-	childDisable("credits_editor");
+	support_widget->setCursorPos(0);
+	support_widget->setEnabled(FALSE);
+	support_widget->setTakesFocus(TRUE);
+	support_widget->setHandleEditKeysDirectly(TRUE);
 
-	LLTextEditor * support_widget = getChild<LLTextEditor>("support_editor", true);
-	if (support_widget)
-	{
-		support_widget->setEnabled( FALSE );
-		support_widget->setTakesFocus( TRUE );
-		support_widget->setText( support );
-		support_widget->setHandleEditKeysDirectly( TRUE );
-	}
+	credits_widget->setCursorPos(0);
+	credits_widget->setEnabled(FALSE);
+	credits_widget->setTakesFocus(TRUE);
+	credits_widget->setHandleEditKeysDirectly(TRUE);
 
 	center();
 
@@ -200,3 +254,22 @@ void LLFloaterAbout::show(void*)
 
 	sInstance->open();	 /*Flawfinder: ignore*/
 }
+
+
+static std::string get_viewer_release_notes_url()
+{
+	std::ostringstream version;
+	version << LL_VERSION_MAJOR << "."
+		<< LL_VERSION_MINOR << "."
+		<< LL_VERSION_PATCH << "."
+		<< LL_VERSION_BUILD;
+
+	LLSD query;
+	query["channel"] = gSavedSettings.getString("VersionChannelName");
+	query["version"] = version.str();
+
+	std::ostringstream url;
+	url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+
+	return url.str();
+}
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index ed2f9f8..2352be3 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -46,13 +46,15 @@
 #include "llimpanel.h" // LLVoiceChannel
 #include "llsdutil.h"
 #include "llimview.h"
+#include "llviewerwindow.h"
 
 const F32 SPEAKER_TIMEOUT = 10.f; // seconds of not being on voice channel before removed from list of active speakers
+const F32 RESORT_TIMEOUT = 5.f; // seconds of mouse inactivity before it's ok to sort regardless of mouse-in-view.
 const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f);
 const LLColor4 ACTIVE_COLOR(0.5f, 0.5f, 0.5f, 1.f);
 const F32 TYPING_ANIMATION_FPS = 2.5f;
 
-LLSpeaker::LLSpeaker(const LLUUID& id, const LLString& name, const ESpeakerType type) : 
+LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerType type) : 
 	mStatus(LLSpeaker::STATUS_TEXT_ONLY),
 	mLastSpokeTime(0.f), 
 	mSpeechVolume(0.f), 
@@ -87,14 +89,14 @@ void LLSpeaker::lookupName()
 }
 
 //static 
-void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* user_data)
+void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data)
 {
 	LLSpeaker* speaker_ptr = ((LLHandle<LLSpeaker>*)user_data)->get();
 	delete (LLHandle<LLSpeaker>*)user_data;
 
 	if (speaker_ptr)
 	{
-		speaker_ptr->mDisplayName = llformat("%s %s", first, last);
+		speaker_ptr->mDisplayName = first + " " + last;
 	}
 }
 
@@ -105,7 +107,7 @@ LLSpeakerTextModerationEvent::LLSpeakerTextModerationEvent(LLSpeaker* source)
 
 LLSD LLSpeakerTextModerationEvent::getValue()
 {
-	return LLString("text");
+	return std::string("text");
 }
 
 
@@ -116,7 +118,7 @@ LLSpeakerVoiceModerationEvent::LLSpeakerVoiceModerationEvent(LLSpeaker* source)
 
 LLSD LLSpeakerVoiceModerationEvent::getValue()
 {
-	return LLString("voice");
+	return std::string("voice");
 }
 
 LLSpeakerListChangeEvent::LLSpeakerListChangeEvent(LLSpeakerMgr* source, const LLUUID& speaker_id)
@@ -287,8 +289,8 @@ LLPanelActiveSpeakers::LLPanelActiveSpeakers(LLSpeakerMgr* data_source, BOOL sho
 
 BOOL LLPanelActiveSpeakers::postBuild()
 {
-	std::string sort_column = gSavedSettings.getString(LLString("FloaterActiveSpeakersSortColumn"));
-	BOOL sort_ascending     = gSavedSettings.getBOOL(  LLString("FloaterActiveSpeakersSortAscending"));
+	std::string sort_column = gSavedSettings.getString(std::string("FloaterActiveSpeakersSortColumn"));
+	BOOL sort_ascending     = gSavedSettings.getBOOL(  std::string("FloaterActiveSpeakersSortAscending"));
 
 	mSpeakerList = getChild<LLScrollListCtrl>("speakers_list");
 	mSpeakerList->sortByColumn(sort_column, sort_ascending);
@@ -334,7 +336,7 @@ void LLPanelActiveSpeakers::addSpeaker(const LLUUID& speaker_id)
 	if (speakerp)
 	{
 		// since we are forced to sort by text, encode sort order as string
-		LLString speaking_order_sort_string = llformat("%010d", speakerp->mSortIndex);
+		std::string speaking_order_sort_string = llformat("%010d", speakerp->mSortIndex);
 
 		LLSD row;
 		row["id"] = speaker_id;
@@ -345,7 +347,7 @@ void LLPanelActiveSpeakers::addSpeaker(const LLUUID& speaker_id)
 		columns[0]["type"] = "icon";
 		columns[0]["value"] = "icn_active-speakers-dot-lvl0.tga";
 
-		LLString speaker_name;
+		std::string speaker_name;
 		if (speakerp->mDisplayName.empty())
 		{
 			speaker_name = LLCacheName::getDefaultName();
@@ -397,15 +399,25 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 	LLUUID selected_id = mSpeakerList->getSelectedValue().asUUID();
 	S32 scroll_pos = mSpeakerList->getScrollInterface()->getScrollPos();
 
-	mSpeakerMgr->update();
-
-	const LLString icon_image_0 = "icn_active-speakers-dot-lvl0.tga";
-	const LLString icon_image_1 = "icn_active-speakers-dot-lvl1.tga";
-	const LLString icon_image_2 = "icn_active-speakers-dot-lvl2.tga";
+	// decide whether it's ok to resort the list then update the speaker manager appropriately.
+	// rapid resorting by activity makes it hard to interact with speakers in the list
+	// so we freeze the sorting while the user appears to be interacting with the control.
+	// we assume this is the case whenever the mouse pointer is within the active speaker
+	// panel and hasn't been motionless for more than a few seconds. see DEV-6655 -MG
+	LLRect screen_rect;
+	localRectToScreen(getLocalRect(), &screen_rect);
+	BOOL mouse_in_view = screen_rect.pointInRect(gViewerWindow->getCurrentMouseX(), gViewerWindow->getCurrentMouseY());
+	F32 mouses_last_movement = gMouseIdleTimer.getElapsedTimeF32();
+	BOOL sort_ok = ! (mouse_in_view && mouses_last_movement<RESORT_TIMEOUT);
+	mSpeakerMgr->update(sort_ok);
+
+	const std::string icon_image_0 = "icn_active-speakers-dot-lvl0.tga";
+	const std::string icon_image_1 = "icn_active-speakers-dot-lvl1.tga";
+	const std::string icon_image_2 = "icn_active-speakers-dot-lvl2.tga";
 
 	std::vector<LLScrollListItem*> items = mSpeakerList->getAllData();
 
-	LLString mute_icon_image = "mute_icon.tga";
+	std::string mute_icon_image = "mute_icon.tga";
 
 	LLSpeakerMgr::speaker_list_t speaker_list;
 	mSpeakerMgr->getSpeakerList(&speaker_list, mShowTextChatters);
@@ -423,13 +435,13 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 		}
 
 		// since we are forced to sort by text, encode sort order as string
-		LLString speaking_order_sort_string = llformat("%010d", speakerp->mSortIndex);
+		std::string speaking_order_sort_string = llformat("%010d", speakerp->mSortIndex);
 
 		LLScrollListCell* icon_cell = itemp->getColumn(0);
 		if (icon_cell)
 		{
 
-			LLString icon_image_id;
+			std::string icon_image_id;
 
 			S32 icon_image_idx = llmin(2, llfloor((speakerp->mSpeechVolume / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 3.f));
 			switch(icon_image_idx)
@@ -494,7 +506,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 				name_cell->setColor(LLColor4::black);
 			}
 
-			LLString speaker_name;
+			std::string speaker_name;
 			if (speakerp->mDisplayName.empty())
 			{
 				speaker_name = LLCacheName::getDefaultName();
@@ -506,7 +518,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 
 			if (speakerp->mIsModerator)
 			{
-				speaker_name += LLString(" ") + getString("moderator_label");
+				speaker_name += std::string(" ") + getString("moderator_label");
 			}
 			
 			name_cell->setValue(speaker_name);
@@ -579,7 +591,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 		}
 		else
 		{
-			mNameText->setValue(LLString::null);
+			mNameText->setValue(LLStringUtil::null);
 		}
 	}
 
@@ -595,7 +607,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 	mSpeakerList->getScrollInterface()->setScrollPos(scroll_pos);
 }
 
-void LLPanelActiveSpeakers::setSpeaker(const LLUUID& id, const LLString& name, LLSpeaker::ESpeakerStatus status, LLSpeaker::ESpeakerType type)
+void LLPanelActiveSpeakers::setSpeaker(const LLUUID& id, const std::string& name, LLSpeaker::ESpeakerStatus status, LLSpeaker::ESpeakerType type)
 {
 	mSpeakerMgr->setSpeaker(id, name, status, type);
 }
@@ -729,8 +741,8 @@ void LLPanelActiveSpeakers::onSortChanged(void* user_data)
 	LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
 	std::string sort_column = panelp->mSpeakerList->getSortColumnName();
 	BOOL sort_ascending = panelp->mSpeakerList->getSortAscending();
-	gSavedSettings.setString(LLString("FloaterActiveSpeakersSortColumn"), sort_column);
-	gSavedSettings.setBOOL(  LLString("FloaterActiveSpeakersSortAscending"), sort_ascending);
+	gSavedSettings.setString(std::string("FloaterActiveSpeakersSortColumn"), sort_column);
+	gSavedSettings.setBOOL(  std::string("FloaterActiveSpeakersSortAscending"), sort_ascending);
 }
 
 
@@ -747,9 +759,9 @@ void LLPanelActiveSpeakers::onModeratorMuteVoice(LLUICtrl* ctrl, void* user_data
 	data["session-id"] = self->mSpeakerMgr->getSessionID();
 	data["params"] = LLSD::emptyMap();
 	data["params"]["agent_id"] = speakers_list->getValue();
-	data["params"]["mutes"] = LLSD::emptyMap();
+	data["params"]["mute_info"] = LLSD::emptyMap();
 	// ctrl value represents ability to type, so invert
-	data["params"]["mutes"]["voice"] = !ctrl->getValue();
+	data["params"]["mute_info"]["voice"] = !ctrl->getValue();
 
 	class MuteVoiceResponder : public LLHTTPClient::Responder
 	{
@@ -812,9 +824,9 @@ void LLPanelActiveSpeakers::onModeratorMuteText(LLUICtrl* ctrl, void* user_data)
 	data["session-id"] = self->mSpeakerMgr->getSessionID();
 	data["params"] = LLSD::emptyMap();
 	data["params"]["agent_id"] = speakers_list->getValue();
-	data["params"]["mutes"] = LLSD::emptyMap();
+	data["params"]["mute_info"] = LLSD::emptyMap();
 	// ctrl value represents ability to type, so invert
-	data["params"]["mutes"]["text"] = !ctrl->getValue();
+	data["params"]["mute_info"]["text"] = !ctrl->getValue();
 
 	class MuteTextResponder : public LLHTTPClient::Responder
 	{
@@ -875,14 +887,17 @@ void LLPanelActiveSpeakers::onChangeModerationMode(LLUICtrl* ctrl, void* user_da
 	data["method"] = "session update";
 	data["session-id"] = self->mSpeakerMgr->getSessionID();
 	data["params"] = LLSD::emptyMap();
-	data["params"]["moderated_mode"] = LLSD::emptyMap();
+
+	data["params"]["update_info"] = LLSD::emptyMap();
+
+	data["params"]["update_info"]["moderated_mode"] = LLSD::emptyMap();
 	if (ctrl->getValue().asString() == "unmoderated")
 	{
-		data["params"]["moderated_mode"]["voice"] = false;
+		data["params"]["update_info"]["moderated_mode"]["voice"] = false;
 	}
 	else if (ctrl->getValue().asString() == "moderated")
 	{
-		data["params"]["moderated_mode"]["voice"] = true;
+		data["params"]["update_info"]["moderated_mode"]["voice"] = true;
 	}
 
 	struct ModerationModeResponder : public LLHTTPClient::Responder
@@ -909,7 +924,7 @@ LLSpeakerMgr::~LLSpeakerMgr()
 {
 }
 
-LLPointer<LLSpeaker> LLSpeakerMgr::setSpeaker(const LLUUID& id, const LLString& name, LLSpeaker::ESpeakerStatus status, LLSpeaker::ESpeakerType type)
+LLPointer<LLSpeaker> LLSpeakerMgr::setSpeaker(const LLUUID& id, const std::string& name, LLSpeaker::ESpeakerStatus status, LLSpeaker::ESpeakerType type)
 {
 	if (id.isNull()) return NULL;
 
@@ -944,7 +959,7 @@ LLPointer<LLSpeaker> LLSpeakerMgr::setSpeaker(const LLUUID& id, const LLString&
 	return speakerp;
 }
 
-void LLSpeakerMgr::update()
+void LLSpeakerMgr::update(BOOL resort_ok)
 {
 	if (!gVoiceClient)
 	{
@@ -954,7 +969,10 @@ void LLSpeakerMgr::update()
 	LLColor4 speaking_color = gSavedSettings.getColor4("SpeakingColor");
 	LLColor4 overdriven_color = gSavedSettings.getColor4("OverdrivenColor");
 
-	updateSpeakerList();
+	if(resort_ok) // only allow list changes when user is not interacting with it
+	{
+		updateSpeakerList();
+	}
 
 	// update status of all current speakers
 	BOOL voice_channel_active = (!mVoiceChannel && gVoiceClient->inProximalChannel()) || (mVoiceChannel && mVoiceChannel->isActive());
@@ -1021,8 +1039,11 @@ void LLSpeakerMgr::update()
 		}
 	}
 
-	// sort by status then time last spoken
-	std::sort(mSpeakersSorted.begin(), mSpeakersSorted.end(), LLSortRecentSpeakers());
+	if(resort_ok)  // only allow list changes when user is not interacting with it
+	{
+		// sort by status then time last spoken
+		std::sort(mSpeakersSorted.begin(), mSpeakersSorted.end(), LLSortRecentSpeakers());
+	}
 
 	// for recent speakers who are not currently speaking, show "recent" color dot for most recent
 	// fading to "active" color
@@ -1072,7 +1093,7 @@ void LLSpeakerMgr::updateSpeakerList()
 		for (participant_it = participants->begin(); participant_it != participants->end(); ++participant_it)
 		{
 			LLVoiceClient::participantState* participantp = participant_it->second;
-			setSpeaker(participantp->mAvatarID, "", LLSpeaker::STATUS_VOICE_ACTIVE);
+			setSpeaker(participantp->mAvatarID, LLStringUtil::null, LLSpeaker::STATUS_VOICE_ACTIVE);
 		}
 	}
 }
@@ -1163,7 +1184,7 @@ void LLIMSpeakerMgr::setSpeakers(const LLSD& speakers)
 
 			LLPointer<LLSpeaker> speakerp = setSpeaker(
 				agent_id,
-				"",
+				LLStringUtil::null,
 				LLSpeaker::STATUS_TEXT_ONLY);
 
 			if ( speaker_it->second.isMap() )
@@ -1187,7 +1208,7 @@ void LLIMSpeakerMgr::setSpeakers(const LLSD& speakers)
 
 			LLPointer<LLSpeaker> speakerp = setSpeaker(
 				agent_id,
-				"",
+				LLStringUtil::null,
 				LLSpeaker::STATUS_TEXT_ONLY);
 		}
 	}
diff --git a/linden/indra/newview/llfloateractivespeakers.h b/linden/indra/newview/llfloateractivespeakers.h
index 0aa4de9..550b48c 100644
--- a/linden/indra/newview/llfloateractivespeakers.h
+++ b/linden/indra/newview/llfloateractivespeakers.h
@@ -67,16 +67,16 @@ public:
 	} ESpeakerStatus;
 
 
-	LLSpeaker(const LLUUID& id, const LLString& name = LLString::null, const ESpeakerType type = SPEAKER_AGENT);
+	LLSpeaker(const LLUUID& id, const std::string& name = LLStringUtil::null, const ESpeakerType type = SPEAKER_AGENT);
 	~LLSpeaker() {};
 	void lookupName();
 
-	static void onAvatarNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* user_data);
+	static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
 
 	ESpeakerStatus	mStatus;			// current activity status in speech group
 	F32				mLastSpokeTime;		// timestamp when this speaker last spoke
 	F32				mSpeechVolume;		// current speech amplitude (timea average rms amplitude?)
-	LLString		mDisplayName;		// cache user name for this speaker
+	std::string		mDisplayName;		// cache user name for this speaker
 	LLFrameTimer	mActivityTimer;	// time out speakers when they are not part of current voice channel
 	BOOL			mHasSpoken;			// has this speaker said anything this session?
 	LLColor4		mDotColor;
@@ -120,11 +120,11 @@ public:
 	virtual ~LLSpeakerMgr();
 
 	const LLPointer<LLSpeaker> findSpeaker(const LLUUID& avatar_id);
-	void update();
+	void update(BOOL resort_ok);
 	void setSpeakerTyping(const LLUUID& speaker_id, BOOL typing);
 	void speakerChatted(const LLUUID& speaker_id);
 	LLPointer<LLSpeaker> setSpeaker(const LLUUID& id, 
-					const LLString& name = LLString::null, 
+					const std::string& name = LLStringUtil::null, 
 					LLSpeaker::ESpeakerStatus status = LLSpeaker::STATUS_TEXT_ONLY, 
 					LLSpeaker::ESpeakerType = LLSpeaker::SPEAKER_AGENT);
 
@@ -211,7 +211,7 @@ public:
 	void refreshSpeakers();
 	
 	void setSpeaker(const LLUUID& id, 
-					const LLString& name = LLString::null, 
+					const std::string& name = LLStringUtil::null, 
 					LLSpeaker::ESpeakerStatus status = LLSpeaker::STATUS_TEXT_ONLY, 
 					LLSpeaker::ESpeakerType = LLSpeaker::SPEAKER_AGENT);
 
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 41a1a35..66b7a56 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -38,6 +38,7 @@
 #include "lldir.h"
 #include "llvfile.h"
 #include "llapr.h"
+#include "llstring.h"
 
 #include "llagent.h"
 #include "llbbox.h"
@@ -48,6 +49,7 @@
 #include "lldrawpoolavatar.h"
 #include "llrender.h"
 #include "llface.h"
+#include "llfocusmgr.h"
 #include "llkeyframemotion.h"
 #include "lllineeditor.h"
 #include "llsliderctrl.h"
@@ -81,7 +83,7 @@ const F32 BASE_ANIM_TIME_OFFSET = 5.f;
 //-----------------------------------------------------------------------------
 // LLFloaterAnimPreview()
 //-----------------------------------------------------------------------------
-LLFloaterAnimPreview::LLFloaterAnimPreview(const char* filename) : 
+LLFloaterAnimPreview::LLFloaterAnimPreview(const std::string& filename) : 
 	LLFloaterNameDesc(filename)
 {
 	mLastMouseX = 0;
@@ -175,28 +177,28 @@ BOOL LLFloaterAnimPreview::postBuild()
 	mPlayButton = getChild<LLButton>( "play_btn");
 	if (!mPlayButton)
 	{
-		mPlayButton = new LLButton("play_btn", LLRect(0,0,0,0));
+		mPlayButton = new LLButton(std::string("play_btn"), LLRect(0,0,0,0));
 	}
 	mPlayButton->setClickedCallback(onBtnPlay);
 	mPlayButton->setCallbackUserData(this);
 
-	mPlayButton->setImages("button_anim_play.tga",
-						   "button_anim_play_selected.tga");
-	mPlayButton->setDisabledImages("","");
+	mPlayButton->setImages(std::string("button_anim_play.tga"),
+						   std::string("button_anim_play_selected.tga"));
+	mPlayButton->setDisabledImages(LLStringUtil::null,LLStringUtil::null);
 
 	mPlayButton->setScaleImage(TRUE);
 
 	mStopButton = getChild<LLButton>( "stop_btn");
 	if (!mStopButton)
 	{
-		mStopButton = new LLButton("stop_btn", LLRect(0,0,0,0));
+		mStopButton = new LLButton(std::string("stop_btn"), LLRect(0,0,0,0));
 	}
 	mStopButton->setClickedCallback(onBtnStop);
 	mStopButton->setCallbackUserData(this);
 
-	mStopButton->setImages("button_anim_stop.tga",
-						   "button_anim_stop_selected.tga");
-	mStopButton->setDisabledImages("","");
+	mStopButton->setImages(std::string("button_anim_stop.tga"),
+						   std::string("button_anim_stop_selected.tga"));
+	mStopButton->setDisabledImages(LLStringUtil::null,LLStringUtil::null);
 
 	mStopButton->setScaleImage(TRUE);
 
@@ -225,7 +227,8 @@ BOOL LLFloaterAnimPreview::postBuild()
 	//childSetCommitCallback("ease_out_time", onCommitEaseOut, this);
 	//childSetValidate("ease_out_time", validateEaseOut);
 
-	if (!stricmp(strrchr(mFilename.c_str(), '.'), ".bvh"))
+	std::string exten = gDirUtilp->getExtension(mFilename);
+	if (exten == "bvh")
 	{
 		// loading a bvh file
 
@@ -313,10 +316,10 @@ BOOL LLFloaterAnimPreview::postBuild()
 			childSetValue("ease_in_time", LLSD(motionp->getEaseInDuration()));
 			childSetValue("ease_out_time", LLSD(motionp->getEaseOutDuration()));
 			setEnabled(TRUE);
-			char seconds_string[128];		/*Flawfinder: ignore*/
-			snprintf(seconds_string, sizeof(seconds_string), " - %.2f seconds", motionp->getDuration());	/* Flawfinder: ignore */
+			std::string seconds_string;
+			seconds_string = llformat(" - %.2f seconds", motionp->getDuration());
 
-			setTitle(mFilename + LLString(seconds_string));
+			setTitle(mFilename + std::string(seconds_string));
 		}
 		else
 		{
@@ -450,7 +453,7 @@ BOOL LLFloaterAnimPreview::handleMouseDown(S32 x, S32 y, MASK mask)
 	if (mPreviewRect.pointInRect(x, y))
 	{
 		bringToFront( x, y );
-		gViewerWindow->setMouseCapture(this);
+		gFocusMgr.setMouseCapture(this);
 		gViewerWindow->hideCursor();
 		mLastMouseX = x;
 		mLastMouseY = y;
@@ -465,7 +468,7 @@ BOOL LLFloaterAnimPreview::handleMouseDown(S32 x, S32 y, MASK mask)
 //-----------------------------------------------------------------------------
 BOOL LLFloaterAnimPreview::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-	gViewerWindow->setMouseCapture(FALSE);
+	gFocusMgr.setMouseCapture(FALSE);
 	gViewerWindow->showCursor();
 	return LLFloater::handleMouseUp(x, y, mask);
 }
@@ -928,8 +931,8 @@ void LLFloaterAnimPreview::refresh()
 			if (avatarp->areAnimationsPaused())
 			{
 
-				mPlayButton->setImages("button_anim_play.tga",
-									   "button_anim_play_selected.tga");
+				mPlayButton->setImages(std::string("button_anim_play.tga"),
+									   std::string("button_anim_play_selected.tga"));
 
 			}
 			else
@@ -939,16 +942,16 @@ void LLFloaterAnimPreview::refresh()
 					F32 fraction_complete = motionp->getLastUpdateTime() / motionp->getDuration();
 					childSetValue("playback_slider", fraction_complete);
 				}
-				mPlayButton->setImages("button_anim_pause.tga",
-									   "button_anim_pause_selected.tga");
+				mPlayButton->setImages(std::string("button_anim_pause.tga"),
+									   std::string("button_anim_pause_selected.tga"));
 
 			}
 		}
 		else
 		{
 			mPauseRequest = avatarp->requestPause();
-			mPlayButton->setImages("button_anim_play.tga",
-								   "button_anim_play_selected.tga");
+			mPlayButton->setImages(std::string("button_anim_play.tga"),
+								   std::string("button_anim_play_selected.tga"));
 
 			mStopButton->setEnabled(TRUE); // stop also resets, leave enabled.
 		}
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index 99b66d7..b7bb521 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -70,7 +70,7 @@ protected:
 class LLFloaterAnimPreview : public LLFloaterNameDesc
 {
 public:
-	LLFloaterAnimPreview(const char* filename);
+	LLFloaterAnimPreview(const std::string& filename);
 	virtual ~LLFloaterAnimPreview();
 	
 	BOOL postBuild();
@@ -125,7 +125,7 @@ protected:
 	BOOL				mEnabled;
 	LLAnimPauseRequest	mPauseRequest;
 
-	std::map<LLString, LLUUID>	mIDList;
+	std::map<std::string, LLUUID>	mIDList;
 
 	static S32 sUploadAmount;
 };
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index 4a40abb..80c43ab 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -72,7 +72,7 @@ LLFloaterAuction* LLFloaterAuction::sInstance = NULL;
 
 // Default constructor
 LLFloaterAuction::LLFloaterAuction() :
-	LLFloater("floater_auction"),
+	LLFloater(std::string("floater_auction")),
 	mParcelID(-1)
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml");
@@ -128,7 +128,7 @@ void LLFloaterAuction::initialize()
 		}
 		else
 		{
-			childSetText("parcel_text", LLString::null);
+			childSetText("parcel_text", LLStringUtil::null);
 		}
 		mParcelID = -1;
 		childSetEnabled("snapshot_btn", false);
@@ -224,14 +224,14 @@ void LLFloaterAuction::onClickOK(void* data)
 		LLSD parcel_name = self->childGetValue("parcel_text");
 
 	// create the asset
-		LLString* name = new LLString(parcel_name.asString());
+		std::string* name = new std::string(parcel_name.asString());
 		gAssetStorage->storeAssetData(self->mTransactionID, LLAssetType::AT_IMAGE_TGA,
 									&auction_tga_upload_done,
 									(void*)name,
 									FALSE);
 		self->getWindow()->incBusyCount();
 
-		LLString* j2c_name = new LLString(parcel_name.asString());
+		std::string* j2c_name = new std::string(parcel_name.asString());
 		gAssetStorage->storeAssetData(self->mTransactionID, LLAssetType::AT_TEXTURE,
 								   &auction_j2c_upload_done,
 								   (void*)j2c_name,
@@ -268,7 +268,7 @@ void LLFloaterAuction::onClickOK(void* data)
 
 void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
-	LLString* name = (LLString*)(user_data);
+	std::string* name = (std::string*)(user_data);
 	llinfos << "Upload of asset '" << *name << "' " << asset_id
 			<< " returned " << status << llendl;
 	delete name;
@@ -281,7 +281,7 @@ void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status
 	}
 	else
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("UploadAuctionSnapshotFail", args);
 	}
@@ -289,7 +289,7 @@ void auction_tga_upload_done(const LLUUID& asset_id, void* user_data, S32 status
 
 void auction_j2c_upload_done(const LLUUID& asset_id, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
-	LLString* name = (LLString*)(user_data);
+	std::string* name = (std::string*)(user_data);
 	llinfos << "Upload of asset '" << *name << "' " << asset_id
 			<< " returned " << status << llendl;
 	delete name;
@@ -302,7 +302,7 @@ void auction_j2c_upload_done(const LLUUID& asset_id, void* user_data, S32 status
 	}
 	else
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("UploadAuctionSnapshotFail", args);
 	}
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index b740a46..4abf493 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -114,13 +114,13 @@ LLFloaterAvatarInfo::LLFloaterAvatarInfo(const std::string& name, const LLRect &
 	
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_profile.xml", &factory_map);
 
-
 	if(mPanelAvatarp)
 	{
 		mPanelAvatarp->selectTab(0);
 	}
 
-	gAvatarInfoInstances.addData(avatar_id, this);
+	gAvatarInfoInstances.addData(avatar_id, this); // must be done before callback below is called.
+	gCacheName->get(avatar_id, FALSE, callbackLoadAvatarName);
 }
 
 // virtual
@@ -175,7 +175,7 @@ void LLFloaterAvatarInfo::showFromObject(
 	LLFloaterAvatarInfo *floater = show(avatar_id);
 	if (floater)
 	{
-		floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
+		floater->mPanelAvatarp->setAvatarID(avatar_id, LLStringUtil::null, ONLINE_STATUS_NO);
 		floater->mPanelAvatarp->selectTabByName(tab_name);
 	}
 }
@@ -186,7 +186,7 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id)
 	LLFloaterAvatarInfo *floater = show(avatar_id);
 	if (floater)
 	{
-		floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
+		floater->mPanelAvatarp->setAvatarID(avatar_id, LLStringUtil::null, ONLINE_STATUS_NO);
 	}
 }
 
@@ -222,7 +222,7 @@ void LLFloaterAvatarInfo::showFromProfile(const LLUUID &avatar_id, LLRect rect)
 										   avatar_id);
 		floater->translate(rect.mLeft - floater->getRect().mLeft + 16,
 						   rect.mTop - floater->getRect().mTop - 16);
-		floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
+		floater->mPanelAvatarp->setAvatarID(avatar_id, LLStringUtil::null, ONLINE_STATUS_NO);
 	}
 	if (floater)
 	{
@@ -238,6 +238,23 @@ void LLFloaterAvatarInfo::showProfileCallback(S32 option, void *userdata)
 	}
 }
 
+// static
+void LLFloaterAvatarInfo::callbackLoadAvatarName(const LLUUID& id,
+												 const std::string& first,
+												 const std::string& last,
+												 BOOL is_group,
+												 void* data)
+{
+	LLFloaterAvatarInfo *floater = gAvatarInfoInstances.getIfThere(id);
+
+	if (floater)
+	{
+		// Build a new title including the avatar name.
+		std::ostringstream title;
+		title << first << " " << last << " - " << floater->getTitle();
+		floater->setTitle(title.str());
+	}
+}
 
 //// virtual
 void LLFloaterAvatarInfo::draw()
@@ -260,7 +277,7 @@ LLFloaterAvatarInfo* LLFloaterAvatarInfo::getInstance(const LLUUID &id)
 void LLFloaterAvatarInfo::loadAsset()
 {
 	if (mPanelAvatarp) {
-		mPanelAvatarp->setAvatarID(mAvatarID, "", mSuggestedOnlineStatus);
+		mPanelAvatarp->setAvatarID(mAvatarID, LLStringUtil::null, mSuggestedOnlineStatus);
 		mAssetStatus = PREVIEW_ASSET_LOADING;
 	}
 }
diff --git a/linden/indra/newview/llfloateravatarinfo.h b/linden/indra/newview/llfloateravatarinfo.h
index 67cdb7a..9ee92e9 100644
--- a/linden/indra/newview/llfloateravatarinfo.h
+++ b/linden/indra/newview/llfloateravatarinfo.h
@@ -90,6 +90,8 @@ public:
 
 	static LLFloaterAvatarInfo* getInstance(const LLUUID &id);
 	static void showProfileCallback(S32 option, void *userdata);
+	static void callbackLoadAvatarName(const LLUUID& id,
+		const std::string& first, const std::string& last, BOOL is_group, void* data);
 	void resetGroupList();
 
 private:
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index f31626e..da1b9b7 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -47,7 +47,7 @@
 const S32 MIN_WIDTH = 200;
 const S32 MIN_HEIGHT = 340;
 const LLRect FLOATER_RECT(0, 380, 240, 0);
-const char FLOATER_TITLE[] = "Choose Resident";
+const std::string FLOATER_TITLE = "Choose Resident";
 
 // static
 LLFloaterAvatarPicker* LLFloaterAvatarPicker::sInstance = NULL;
@@ -83,7 +83,7 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(callback_t callback,
 
 // Default constructor
 LLFloaterAvatarPicker::LLFloaterAvatarPicker() :
-	LLFloater("avatarpicker", FLOATER_RECT, FLOATER_TITLE, TRUE, MIN_WIDTH, MIN_HEIGHT),
+	LLFloater(std::string("avatarpicker"), FLOATER_RECT, FLOATER_TITLE, TRUE, MIN_WIDTH, MIN_HEIGHT),
 	mResultsReturned(FALSE),
 	mCallback(NULL),
 	mCallbackUserdata(NULL)
@@ -112,7 +112,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
 
 	if (mListNames)
 	{
-		mListNames->addCommentText("No results");
+		mListNames->addCommentText(std::string("No results")); // *TODO: Translate
 	}
 
 	mInventoryPanel = getChild<LLInventoryPanel>("Inventory Panel");
@@ -260,7 +260,7 @@ void LLFloaterAvatarPicker::doSelectionChange(const std::deque<LLFolderViewItem*
 
 void LLFloaterAvatarPicker::find()
 {
-	const LLString& text = childGetValue("Edit").asString();
+	const std::string& text = childGetValue("Edit").asString();
 
 	mQueryID.generate();
 
@@ -279,7 +279,7 @@ void LLFloaterAvatarPicker::find()
 	if (mListNames)
 	{
 		mListNames->deleteAllItems();	
-		mListNames->addCommentText("Searching...");
+		mListNames->addCommentText(std::string("Searching..."));  // *TODO: Translate
 	}
 	
 	childSetEnabled("Select", FALSE);
@@ -305,8 +305,8 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 	LLUUID	agent_id;
 	LLUUID	query_id;
 	LLUUID	avatar_id;
-	char	first_name[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
-	char	last_name[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+	std::string first_name;
+	std::string last_name;
 
 	msg->getUUID("AgentData", "AgentID", agent_id);
 	msg->getUUID("AgentData", "QueryID", query_id);
@@ -341,20 +341,20 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 		for (S32 i = 0; i < num_new_rows; i++)
 		{			
 			msg->getUUIDFast(  _PREHASH_Data,_PREHASH_AvatarID,	avatar_id, i);
-			msg->getStringFast(_PREHASH_Data,_PREHASH_FirstName, DB_FIRST_NAME_BUF_SIZE, first_name, i);
-			msg->getStringFast(_PREHASH_Data,_PREHASH_LastName,	DB_LAST_NAME_BUF_SIZE, last_name, i);
+			msg->getStringFast(_PREHASH_Data,_PREHASH_FirstName, first_name, i);
+			msg->getStringFast(_PREHASH_Data,_PREHASH_LastName,	last_name, i);
 		
-			LLString avatar_name;
+			std::string avatar_name;
 			if (avatar_id.isNull())
 			{
-				LLString::format_map_t map;
+				LLStringUtil::format_map_t map;
 				map["[TEXT]"] = self->childGetText("Edit");
 				avatar_name = self->getString("NotFound", map);
 				self->mListNames->setEnabled(FALSE);
 			}
 			else
 			{
-				avatar_name = LLString(first_name) + " " + last_name;
+				avatar_name = first_name + " " + last_name;
 				self->mListNames->setEnabled(TRUE);
 				found_one = TRUE;
 			}
diff --git a/linden/indra/newview/llfloateravatartextures.cpp b/linden/indra/newview/llfloateravatartextures.cpp
index 0b529b7..a5df51b 100644
--- a/linden/indra/newview/llfloateravatartextures.cpp
+++ b/linden/indra/newview/llfloateravatartextures.cpp
@@ -40,7 +40,7 @@
 #include "llvoavatar.h"
 
 LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id) : 
-	LLFloater("avatar_texture_debug"),
+	LLFloater(std::string("avatar_texture_debug")),
 	mID(id)
 {
 }
@@ -110,7 +110,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp,
 	if (id == IMG_DEFAULT_AVATAR)
 	{
 		ctrl->setImageAssetID(LLUUID::null);
-		ctrl->setToolTip(LLString("IMG_DEFAULT_AVATAR"));
+		ctrl->setToolTip(std::string("IMG_DEFAULT_AVATAR"));
 	}
 	else
 	{
diff --git a/linden/indra/newview/llfloateravatartextures.h b/linden/indra/newview/llfloateravatartextures.h
index a4c67c3..3bddf9b 100644
--- a/linden/indra/newview/llfloateravatartextures.h
+++ b/linden/indra/newview/llfloateravatartextures.h
@@ -56,7 +56,7 @@ private:
 
 private:
 	LLUUID	mID;
-	LLString mTitle;
+	std::string mTitle;
 	LLTextureCtrl* mBakedHead;
 	LLTextureCtrl* mBakedEyes;
 	LLTextureCtrl* mBakedUpper;
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 377dd75..9080acb 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -58,7 +58,7 @@ LLFloaterBuildOptions	*LLFloaterBuildOptions::sInstance = NULL;
 // Methods
 //
 LLFloaterBuildOptions::LLFloaterBuildOptions( )
-: LLFloater("build options floater")
+: LLFloater(std::string("build options floater"))
 {
 	sInstance = this;
 }
diff --git a/linden/indra/newview/llfloaterbump.cpp b/linden/indra/newview/llfloaterbump.cpp
index 61d1b81..616f746 100644
--- a/linden/indra/newview/llfloaterbump.cpp
+++ b/linden/indra/newview/llfloaterbump.cpp
@@ -84,7 +84,7 @@ void LLFloaterBump::show(void *contents)
 
 	if (gMeanCollisionList.empty())
 	{
-		LLString none_detected = sInstance->getString("none_detected");
+		std::string none_detected = sInstance->getString("none_detected");
 		LLSD row;
 		row["columns"][0]["value"] = none_detected;
 		row["columns"][0]["font"] = "SansSerifBold";
@@ -110,8 +110,7 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
 		new LLFloaterBump();
 	}
 	
-	if (!mcd->mFirstName[0]
-	||  list->getItemCount() >= 20)
+	if (mcd->mFirstName.empty() || list->getItemCount() >= 20)
 	{
 		return;
 	}
@@ -123,9 +122,9 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
 	// it's daylight savings time there.
 	timep = utc_to_pacific_time(mcd->mTime, gPacificDaylightTime);
 	
-	LLString time = llformat("[%d:%02d]", timep->tm_hour, timep->tm_min);
+	std::string time = llformat("[%d:%02d]", timep->tm_hour, timep->tm_min);
 
-	LLString action;
+	std::string action;
 	switch(mcd->mType)
 	{
 	case MEAN_BUMP:
diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index 18d2913..5d815fa 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -52,7 +52,7 @@
 LLFloaterBuy* LLFloaterBuy::sInstance = NULL;
 
 LLFloaterBuy::LLFloaterBuy()
-:	LLFloater("floater_buy_object", "FloaterBuyRect", "")
+:	LLFloater(std::string("floater_buy_object"), std::string("FloaterBuyRect"), LLStringUtil::null)
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_object.xml");
 
@@ -132,7 +132,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 	sInstance->setTitle(title);
 
 	LLUUID owner_id;
-	LLString owner_name;
+	std::string owner_name;
 	BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 	if (!owners_identical)
 	{
@@ -151,7 +151,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 	LLSD row;
 
 	// Compute icon for this item
-	LLString icon_name = get_item_icon_name(LLAssetType::AT_OBJECT, 
+	std::string icon_name = get_item_icon_name(LLAssetType::AT_OBJECT, 
 									 LLInventoryType::IT_OBJECT,
 									 0x0, FALSE);
 
@@ -162,7 +162,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 	// Append the permissions that you will acquire (not the current
 	// permissions).
 	U32 next_owner_mask = node->mPermissions->getMaskNextOwner();
-	LLString text = node->mName;
+	std::string text = node->mName;
 	if (!(next_owner_mask & PERM_COPY))
 	{
 		text.append(sInstance->getString("no_copy_text"));
@@ -194,7 +194,6 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 	sInstance->requestVOInventory();
 }
 
-
 void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
 								 InventoryObjectList* inv,
 								 S32 serial_num,
@@ -256,7 +255,7 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
 			item_is_multi = TRUE;
 		}
 
-		LLString icon_name = get_item_icon_name(inv_item->getType(), 
+		std::string icon_name = get_item_icon_name(inv_item->getType(), 
 							 inv_item->getInventoryType(),
 							 inv_item->getFlags(),
 							 item_is_multi);
@@ -267,7 +266,7 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
 		// Append the permissions that you will acquire (not the current
 		// permissions).
 		U32 next_owner_mask = inv_item->getPermissions().getMaskNextOwner();
-		LLString text = obj->getName();
+		std::string text = obj->getName();
 		if (!(next_owner_mask & PERM_COPY))
 		{
 			text.append(" (no copy)");
@@ -290,6 +289,11 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
 	removeVOInventoryListener();
 }
 
+void LLFloaterBuy::close(bool app_quitting)
+{
+	LLSelectMgr::getInstance()->deselectAll();
+	LLFloater::close(app_quitting);
+}
 
 // static
 void LLFloaterBuy::onClickBuy(void*)
diff --git a/linden/indra/newview/llfloaterbuy.h b/linden/indra/newview/llfloaterbuy.h
index ae3428c..0eef41b 100644
--- a/linden/indra/newview/llfloaterbuy.h
+++ b/linden/indra/newview/llfloaterbuy.h
@@ -65,6 +65,8 @@ protected:
 								 S32 serial_num,
 								 void* data);
 
+	/*virtual*/ void close(bool app_quitting = false);
+
 	static void onClickBuy(void*);
 	static void onClickCancel(void*);
 
diff --git a/linden/indra/newview/llfloaterbuycontents.cpp b/linden/indra/newview/llfloaterbuycontents.cpp
index 8b2a031..e3b6b9f 100644
--- a/linden/indra/newview/llfloaterbuycontents.cpp
+++ b/linden/indra/newview/llfloaterbuycontents.cpp
@@ -56,7 +56,7 @@
 LLFloaterBuyContents* LLFloaterBuyContents::sInstance = NULL;
 
 LLFloaterBuyContents::LLFloaterBuyContents()
-:	LLFloater("floater_buy_contents", "FloaterBuyContentsRect", "")
+:	LLFloater(std::string("floater_buy_contents"), std::string("FloaterBuyContentsRect"), LLStringUtil::null)
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_contents.xml");
 
@@ -109,7 +109,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
 	sInstance->center();
 
 	LLUUID owner_id;
-	LLString owner_name;
+	std::string owner_name;
 	BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 	if (!owners_identical)
 	{
@@ -223,7 +223,7 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj,
 			item_is_multi = TRUE;
 		}
 
-		LLString icon_name = get_item_icon_name(inv_item->getType(), 
+		std::string icon_name = get_item_icon_name(inv_item->getType(), 
 								 inv_item->getInventoryType(),
 								 inv_item->getFlags(),
 								 item_is_multi);
@@ -234,7 +234,7 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj,
 		// Append the permissions that you will acquire (not the current
 		// permissions).
 		U32 next_owner_mask = inv_item->getPermissions().getMaskNextOwner();
-		LLString text = (*it)->getName();
+		std::string text = (*it)->getName();
 
 		if (!(next_owner_mask & PERM_COPY))
 		{
diff --git a/linden/indra/newview/llfloaterbuycurrency.cpp b/linden/indra/newview/llfloaterbuycurrency.cpp
index e957ba9..cbd41f4 100644
--- a/linden/indra/newview/llfloaterbuycurrency.cpp
+++ b/linden/indra/newview/llfloaterbuycurrency.cpp
@@ -113,7 +113,7 @@ LLFloaterBuyCurrencyUI* LLFloaterBuyCurrencyUI::soleInstance(bool createIfNeeded
 #pragma warning(disable : 4355)
 #endif 
 LLFloaterBuyCurrencyUI::LLFloaterBuyCurrencyUI()
-:	LLFloater("Buy Currency"),
+:	LLFloater(std::string("Buy Currency")),
 	mChildren(*this),
 	mManager(*this)
 {
@@ -219,7 +219,7 @@ void LLFloaterBuyCurrencyUI::updateUI()
 	// error section
 	if (hasError)
 	{
-		mChildren.setBadge("step_error", LLViewChildren::BADGE_ERROR);
+		mChildren.setBadge(std::string("step_error"), LLViewChildren::BADGE_ERROR);
 		
 		LLTextBox* message = getChild<LLTextBox>("error_message");
 		if (message)
@@ -249,7 +249,7 @@ void LLFloaterBuyCurrencyUI::updateUI()
 	
 	if (!hasError)
 	{
-		mChildren.setBadge("step_1", LLViewChildren::BADGE_NOTE);
+		mChildren.setBadge(std::string("step_1"), LLViewChildren::BADGE_NOTE);
 
 		if (mManager.buying())
 		{
@@ -373,8 +373,8 @@ void LLFloaterBuyCurrency::buyCurrency(const std::string& name, S32 price)
 {
 	if (gHideLinks)
 	{
-		LLStringBase<char>::format_map_t args;
-		args["[NAME]"] = name.c_str();
+		LLStringUtil::format_map_t args;
+		args["[NAME]"] = name;
 		args["[PRICE]"] = llformat("%d", price);
 		gViewerWindow->alertXml("NotEnoughCurrency", args);
 		return;
diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp
index b596339..de14129 100644
--- a/linden/indra/newview/llfloaterbuyland.cpp
+++ b/linden/indra/newview/llfloaterbuyland.cpp
@@ -198,7 +198,7 @@ private:
 };
 
 static void cacheNameUpdateRefreshesBuyLand(const LLUUID&,
-	const char*, const char*, BOOL, void* data)
+	const std::string&, const std::string&, BOOL, void* data)
 {
 	LLFloaterBuyLandUI* ui = LLFloaterBuyLandUI::soleInstance(false);
 	if (ui)
@@ -321,7 +321,7 @@ LLFloaterBuyLandUI* LLFloaterBuyLandUI::soleInstance(bool createIfNeeded)
 #pragma warning(disable : 4355)
 #endif 
 LLFloaterBuyLandUI::LLFloaterBuyLandUI()
-:	LLFloater("Buy Land"),
+:	LLFloater(std::string("Buy Land")),
 	mParcel(0),
 	mBought(false),
 	mParcelValid(false), mSiteValid(false),
@@ -455,7 +455,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 	bool haveEnoughCash = mParcelPrice <= mAgentCashBalance;
 	S32 cashBuy = haveEnoughCash ? 0 : (mParcelPrice - mAgentCashBalance);
 	mCurrency.setAmount(cashBuy, true);
-	mCurrency.setZeroMessage(haveEnoughCash ? getString("none_needed") : "");
+	mCurrency.setZeroMessage(haveEnoughCash ? getString("none_needed") : LLStringUtil::null);
 
 	// checks that we can buy the land
 
@@ -810,7 +810,7 @@ void LLFloaterBuyLandUI::updateNames()
 
 	if (!parcelp)
 	{
-		mParcelSellerName = "";
+		mParcelSellerName = LLStringUtil::null;
 		return;
 	}
 	
@@ -1014,7 +1014,7 @@ void LLFloaterBuyLandUI::refreshUI()
 		{
 			childSetText("info_parcel", mParcelLocation);
 
-			LLString::format_map_t string_args;
+			LLStringUtil::format_map_t string_args;
 			string_args["[AMOUNT]"] = llformat("%d", mParcelActualArea);
 			string_args["[AMOUNT2]"] = llformat("%d", mParcelSupportedObjects);
 		
@@ -1033,8 +1033,8 @@ void LLFloaterBuyLandUI::refreshUI()
 		else
 		{
 			childSetText("info_parcel", getString("no_parcel_selected"));
-			childSetText("info_size", LLString::null);
-			childSetText("info_price", LLString::null);
+			childSetText("info_size", LLStringUtil::null);
+			childSetText("info_price", LLStringUtil::null);
 		}
 		
 		childSetText("info_action",
@@ -1056,7 +1056,7 @@ void LLFloaterBuyLandUI::refreshUI()
 	// error section
 	if (showingError)
 	{
-		mChildren.setBadge("step_error",
+		mChildren.setBadge(std::string("step_error"),
 			mCannotBuyIsError
 				? LLViewChildren::BADGE_ERROR
 				: LLViewChildren::BADGE_WARN);
@@ -1084,7 +1084,7 @@ void LLFloaterBuyLandUI::refreshUI()
 	// section one: account
 	if (!showingError)
 	{
-		mChildren.setBadge("step_1",
+		mChildren.setBadge(std::string("step_1"),
 			mSiteMembershipUpgrade
 				? LLViewChildren::BADGE_NOTE
 				: LLViewChildren::BADGE_OK);
@@ -1127,7 +1127,7 @@ void LLFloaterBuyLandUI::refreshUI()
 	// section two: land use fees
 	if (!showingError)
 	{
-		mChildren.setBadge("step_2",
+		mChildren.setBadge(std::string("step_2"),
 			mSiteLandUseUpgrade
 				? LLViewChildren::BADGE_NOTE
 				: LLViewChildren::BADGE_OK);
@@ -1137,15 +1137,15 @@ void LLFloaterBuyLandUI::refreshUI()
 		
 		if (mIsForGroup)
 		{
-			LLString::format_map_t string_args;
-			string_args["[GROUP]"] = LLString(gAgent.mGroupName);
+			LLStringUtil::format_map_t string_args;
+			string_args["[GROUP]"] = std::string(gAgent.mGroupName);
 
 			message += getString("insufficient_land_credits", string_args);
 				
 		}
 		else
 		{
-			LLString::format_map_t string_args;
+			LLStringUtil::format_map_t string_args;
 			string_args["[BUYER]"] = llformat("%d", mAgentCommittedTier);
 			message += getString("land_holdings", string_args);
 		}
@@ -1156,7 +1156,7 @@ void LLFloaterBuyLandUI::refreshUI()
 		}
 		else if (mParcelBillableArea == mParcelActualArea)
 		{
-			LLString::format_map_t string_args;
+			LLStringUtil::format_map_t string_args;
 			string_args["[AMOUNT]"] = llformat("%d", mParcelActualArea);
 			message += getString("parcel_meters", string_args);
 		}
@@ -1165,13 +1165,13 @@ void LLFloaterBuyLandUI::refreshUI()
 
 			if (mParcelBillableArea > mParcelActualArea)
 			{	
-				LLString::format_map_t string_args;
+				LLStringUtil::format_map_t string_args;
 				string_args["[AMOUNT]"] = llformat("%d", mParcelBillableArea);
 				message += getString("premium_land", string_args);
 			}
 			else
 			{
-				LLString::format_map_t string_args;
+				LLStringUtil::format_map_t string_args;
 				string_args["[AMOUNT]"] = llformat("%d", mParcelBillableArea);
 				message += getString("discounted_land", string_args);
 			}
@@ -1201,7 +1201,7 @@ void LLFloaterBuyLandUI::refreshUI()
 
 	if (!showingError)
 	{
-		mChildren.setBadge("step_3",
+		mChildren.setBadge(std::string("step_3"),
 			!willHaveEnough
 				? LLViewChildren::BADGE_WARN
 				: mCurrency.getAmount() > 0
@@ -1220,14 +1220,14 @@ void LLFloaterBuyLandUI::refreshUI()
 
 		if (haveEnough)
 		{
-			LLString::format_map_t string_args;
+			LLStringUtil::format_map_t string_args;
 			string_args["[AMOUNT]"] = llformat("%d", mAgentCashBalance);
 
 			childSetText("currency_reason", getString("have_enough_lindens", string_args));
 		}
 		else
 		{
-			LLString::format_map_t string_args;
+			LLStringUtil::format_map_t string_args;
 			string_args["[AMOUNT]"] = llformat("%d", mAgentCashBalance);
 			string_args["[AMOUNT2]"] = llformat("%d", mParcelPrice - mAgentCashBalance);
 			
@@ -1238,7 +1238,7 @@ void LLFloaterBuyLandUI::refreshUI()
 		
 		if (willHaveEnough)
 		{
-			LLString::format_map_t string_args;
+			LLStringUtil::format_map_t string_args;
 			string_args["[AMOUNT]"] = llformat("%d", finalBalance);
 
 			childSetText("currency_balance", getString("balance_left", string_args));
@@ -1246,7 +1246,7 @@ void LLFloaterBuyLandUI::refreshUI()
 		}
 		else
 		{
-			LLString::format_map_t string_args;
+			LLStringUtil::format_map_t string_args;
 			string_args["[AMOUNT]"] = llformat("%d", mParcelPrice - mAgentCashBalance);
 	
 			childSetText("currency_balance", getString("balance_needed", string_args));
@@ -1311,14 +1311,14 @@ void LLFloaterBuyLandUI::startBuyPreConfirm()
 	}
 	if (mCurrency.getAmount() > 0)
 	{
-		LLString::format_map_t string_args;
+		LLStringUtil::format_map_t string_args;
 		string_args["[AMOUNT]"] = llformat("%d", mCurrency.getAmount());
 		string_args["[AMOUNT2]"] = llformat("%#.2f", mCurrency.getEstimate() / 100.0);
 		
 		action += getString("buy_for_US", string_args);
 	}
 
-	LLString::format_map_t string_args;
+	LLStringUtil::format_map_t string_args;
 	string_args["[AMOUNT]"] = llformat("%d", mParcelPrice);
 	string_args["[SELLER]"] = mParcelSellerName;
 	action += getString("pay_to_for_land", string_args);
diff --git a/linden/indra/newview/llfloatercamera.cpp b/linden/indra/newview/llfloatercamera.cpp
index b77b556..ca8ab6c 100644
--- a/linden/indra/newview/llfloatercamera.cpp
+++ b/linden/indra/newview/llfloatercamera.cpp
@@ -52,6 +52,7 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 {
 	setIsChrome(TRUE);
 	
+	// For now, only used for size and tooltip strings
 	const BOOL DONT_OPEN = FALSE;
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", NULL, DONT_OPEN);
 	
@@ -60,10 +61,10 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 	S32 left = 16;
 	
 	const S32 ROTATE_WIDTH = 64;
-	mRotate = new LLJoystickCameraRotate("cam rotate stick", 
+	mRotate = new LLJoystickCameraRotate(std::string("cam rotate stick"), 
 										 LLRect( left, top, left + ROTATE_WIDTH, bottom ),
-										 "cam_rotate_out.tga",
-										 "cam_rotate_in.tga" );
+										 std::string("cam_rotate_out.tga"),
+										 std::string("cam_rotate_in.tga") );
 	mRotate->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
 	mRotate->setHeldDownDelay(CAMERA_BUTTON_DELAY);
 	mRotate->setToolTip( getString("rotate_tooltip") );
@@ -74,11 +75,11 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 	
 	const S32 ZOOM_WIDTH = 16;
 	mZoom = new LLJoystickCameraZoom( 
-									 "zoom",
+									 std::string("zoom"),
 									 LLRect( left, top, left + ZOOM_WIDTH, bottom ),
-									 "cam_zoom_out.tga",
-									 "cam_zoom_plus_in.tga",
-									 "cam_zoom_minus_in.tga");
+									 std::string("cam_zoom_out.tga"),
+									 std::string("cam_zoom_plus_in.tga"),
+									 std::string("cam_zoom_minus_in.tga"));
 	mZoom->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
 	mZoom->setHeldDownDelay(CAMERA_BUTTON_DELAY);
 	mZoom->setToolTip( getString("zoom_tooltip") );
@@ -88,10 +89,10 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 	left += ZOOM_WIDTH;
 	
 	const S32 TRACK_WIDTH = 64;
-	mTrack = new LLJoystickCameraTrack("cam track stick", 
+	mTrack = new LLJoystickCameraTrack(std::string("cam track stick"), 
 									   LLRect( left, top, left + TRACK_WIDTH, bottom ),
-									   "cam_tracking_out.tga",
-									   "cam_tracking_in.tga");
+									   std::string("cam_tracking_out.tga"),
+									   std::string("cam_tracking_in.tga"));
 	mTrack->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
 	mTrack->setHeldDownDelay(CAMERA_BUTTON_DELAY);
 	mTrack->setToolTip( getString("move_tooltip") );
@@ -116,4 +117,4 @@ void LLFloaterCamera::onClose(bool app_quitting)
 	{
 		gSavedSettings.setBOOL("ShowCameraControls", FALSE);
 	}
-}
\ No newline at end of file
+}
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 383a33e..1f0c6ad 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -75,8 +75,8 @@
 #include "llstylemap.h"
 
 // Used for LCD display
-extern void AddNewIMToLCD(const LLString &newLine);
-extern void AddNewChatToLCD(const LLString &newLine);
+extern void AddNewIMToLCD(const std::string &newLine);
+extern void AddNewChatToLCD(const std::string &newLine);
 //
 // Constants
 //
@@ -94,7 +94,7 @@ LLColor4 get_text_color(const LLChat& chat);
 // Member Functions
 //
 LLFloaterChat::LLFloaterChat(const LLSD& seed)
-:	LLFloater("chat floater", "FloaterChatRect", "", 
+:	LLFloater(std::string("chat floater"), std::string("FloaterChatRect"), LLStringUtil::null, 
 			  RESIZE_YES, 440, 100, DRAG_ON_TOP, MINIMIZE_NO, CLOSE_YES),
 	mPanel(NULL)
 {
@@ -191,7 +191,7 @@ void LLFloaterChat::updateConsoleVisibility()
 
 void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LLColor4& color)
 {
-	LLString line = chat.mText;
+	std::string line = chat.mText;
 	bool prepend_newline = true;
 	if (gSavedSettings.getBOOL("ChatShowTimestamps"))
 	{
@@ -205,9 +205,10 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL
 		chat.mFromID != LLUUID::null &&
 		(line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
 	{
-		line = line.substr(chat.mFromName.length());
+		std::string start_line = line.substr(0, chat.mFromName.length() + 1);
+		line = line.substr(chat.mFromName.length() + 1);
 		const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID);
-		edit->appendStyledText(chat.mFromName, false, prepend_newline, &sourceStyle);
+		edit->appendStyledText(start_line, false, prepend_newline, &sourceStyle);
 		prepend_newline = false;
 	}
 	edit->appendColoredText(line, false, prepend_newline, color);
@@ -215,13 +216,13 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL
 
 void log_chat_text(const LLChat& chat)
 {
-		LLString histstr;
+		std::string histstr;
 		if (gSavedPerAccountSettings.getBOOL("LogChatTimestamp"))
 			histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + chat.mText;
 		else
 			histstr = chat.mText;
 
-		LLLogChat::saveHistory("chat",histstr);
+		LLLogChat::saveHistory(std::string("chat"),histstr);
 }
 // static
 void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
@@ -304,7 +305,7 @@ void LLFloaterChat::onClickMute(void *data)
 
 	LLComboBox*	chatter_combo = self->getChild<LLComboBox>("chatter combobox");
 
-	const LLString& name = chatter_combo->getSimple();
+	const std::string& name = chatter_combo->getSimple();
 	LLUUID id = chatter_combo->getCurrentID();
 
 	if (name.empty()) return;
@@ -356,7 +357,7 @@ void LLFloaterChat::addChat(const LLChat& chat,
 			chat.mChatType == CHAT_TYPE_DEBUG_MSG
 			&& !gSavedSettings.getBOOL("ScriptErrorsAsChat");
 
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 	// add into LCD displays
 	if (!invisible_script_debug_chat)
 	{
@@ -420,7 +421,14 @@ LLColor4 get_text_color(const LLChat& chat)
 			}
 			else
 			{
-				text_color = gSavedSettings.getColor4("AgentChatColor");
+				if(gAgent.getID() == chat.mFromID)
+				{
+					text_color = gSavedSettings.getColor4("UserChatColor");
+				}
+				else
+				{
+					text_color = gSavedSettings.getColor4("AgentChatColor");
+				}
 			}
 			break;
 		case CHAT_SOURCE_OBJECT:
@@ -459,11 +467,11 @@ LLColor4 get_text_color(const LLChat& chat)
 //static
 void LLFloaterChat::loadHistory()
 {
-	LLLogChat::loadHistory("chat", &chatFromLogFile, (void *)LLFloaterChat::getInstance(LLSD())); 
+	LLLogChat::loadHistory(std::string("chat"), &chatFromLogFile, (void *)LLFloaterChat::getInstance(LLSD())); 
 }
 
 //static
-void LLFloaterChat::chatFromLogFile(LLLogChat::ELogLineType type , LLString line, void* userdata)
+void LLFloaterChat::chatFromLogFile(LLLogChat::ELogLineType type , std::string line, void* userdata)
 {
 	switch (type)
 	{
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index 72147b8..44c706e 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -77,7 +77,7 @@ public:
 	static void onClickMute(void *data);
 	static void onClickToggleShowMute(LLUICtrl* caller, void *data);
 	static void onClickToggleActiveSpeakers(void* userdata);
-	static void chatFromLogFile(LLLogChat::ELogLineType type,LLString line, void* userdata);
+	static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata);
 	static void loadHistory();
 	static void* createSpeakersPanel(void* data);
 	static void* createChatPanel(void* data);
diff --git a/linden/indra/newview/llfloaterclothing.cpp b/linden/indra/newview/llfloaterclothing.cpp
index fd54fcf..9d4ac6f 100644
--- a/linden/indra/newview/llfloaterclothing.cpp
+++ b/linden/indra/newview/llfloaterclothing.cpp
@@ -48,7 +48,7 @@
 #include "llvoavatar.h"
 #include "llviewercontrol.h"
 
-const LLString LOADING_STRING("Loading...");
+const std::string LOADING_STRING("Loading...");
 
 // static
 LLFloaterClothing* LLFloaterClothing::sInstance = NULL;
@@ -70,7 +70,7 @@ public:
 // LLFloaterClothing
 //---------------------------------------------------------------------------
 LLFloaterClothing::LLFloaterClothing()
-:	LLFloater("floater_clothing", "FloaterClothingRect", ""),
+:	LLFloater(std::string("floater_clothing"), std::string("FloaterClothingRect"), LLStringUtil::null),
 	mSelectedID(),
 	mAllowSelection(FALSE)
 {
@@ -272,15 +272,15 @@ void LLFloaterClothing::buildClothingList()
 			item_is_multi = TRUE;
 		}
 
-		LLString icon_name = get_item_icon_name(item->getType(),
+		std::string icon_name = get_item_icon_name(item->getType(),
 											 item->getInventoryType(),
 											 item->getFlags(), item_is_multi);		// flags = wearable type
 		row["columns"][0]["column"] = "icon";
 		row["columns"][0]["type"] = "icon";
 		row["columns"][0]["value"] = icon_name;
 
-		LLString text = item->getName();
-		LLString style = "NORMAL";
+		std::string text = item->getName();
+		std::string style = "NORMAL";
 		if( gAgent.isWearingItem( item->getUUID() ) )
 		{
 			text.append(" (worn)");
@@ -294,7 +294,7 @@ void LLFloaterClothing::buildClothingList()
 		// hidden column for sorting
 		U32 flags = item->getFlags();	// flags = wearable type
 		enum EWearableType wearable_type = (enum EWearableType)flags;
-		const char* wearable_label = LLWearable::typeToTypeLabel(wearable_type);
+		const std::string& wearable_label = LLWearable::typeToTypeLabel(wearable_type);
 		//line->addColumn(wearable_label, FONT, -1);	// invisible
 		row["columns"][2]["column"] = "sort";
 		row["columns"][2]["value"] = wearable_label;
@@ -315,7 +315,7 @@ void LLFloaterClothing::buildClothingList()
 	else
 	{
 		// Weird case, we're done loading but have no clothing
-		list->addCommentText("No clothing found.");
+		list->addCommentText(std::string("No clothing found.")); // *TODO: Translate
 		mAllowSelection = FALSE;
 	}
 }
diff --git a/linden/indra/newview/llfloatercolorpicker.cpp b/linden/indra/newview/llfloatercolorpicker.cpp
index 7bf9da3..1ffbeb3 100644
--- a/linden/indra/newview/llfloatercolorpicker.cpp
+++ b/linden/indra/newview/llfloatercolorpicker.cpp
@@ -78,7 +78,7 @@ const F32 CONTEXT_FADE_TIME = 0.08f;
 // default ctor
 LLFloaterColorPicker::
 LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show_apply_immediate )
-	: LLFloater ("Color Picker Floater"),
+	: LLFloater (std::string("Color Picker Floater")),
 	  mComponents			( 3 ),
 	  mMouseDownInLumRegion	( FALSE ),
 	  mMouseDownInHueRegion	( FALSE ),
@@ -232,7 +232,7 @@ postBuild()
 
 	mPipetteBtn = getChild<LLButton>("color_pipette" );
 
-	mPipetteBtn->setImages("eye_button_inactive.tga", "eye_button_active.tga");
+	mPipetteBtn->setImages(std::string("eye_button_inactive.tga"), std::string("eye_button_active.tga"));
 
 	mPipetteBtn->setClickedCallback( onClickPipette );
 	mPipetteBtn->setCallbackUserData ( this );
@@ -794,7 +794,7 @@ LLFloaterColorPicker::
 onTextEntryChanged ( LLUICtrl* ctrl )
 {
 	// value in RGB boxes changed
-	LLString name = ctrl->getName();
+	std::string name = ctrl->getName();
 	if ( ( name == "rspin" ) || ( name == "gspin" ) || ( name == "bspin" ) )
 	{
 		// get current RGB
@@ -913,7 +913,7 @@ handleMouseDown ( S32 x, S32 y, MASK mask )
 
 	if ( rgbAreaRect.pointInRect ( x, y ) )
 	{
-		gViewerWindow->setMouseCapture(this);
+		gFocusMgr.setMouseCapture(this);
 		// mouse button down
 		setMouseDownInHueRegion ( TRUE );
 
@@ -932,7 +932,7 @@ handleMouseDown ( S32 x, S32 y, MASK mask )
 
 	if ( lumAreaRect.pointInRect ( x, y ) )
 	{
-		gViewerWindow->setMouseCapture(this);
+		gFocusMgr.setMouseCapture(this);
 		// mouse button down
 		setMouseDownInLumRegion ( TRUE );
 
@@ -1148,7 +1148,7 @@ handleMouseUp ( S32 x, S32 y, MASK mask )
 
 	if (hasMouseCapture())
 	{
-		gViewerWindow->setMouseCapture(NULL);
+		gFocusMgr.setMouseCapture(NULL);
 	}
 
 	// dispatch to base class for the rest of things
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index 535ef52..7db075a 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -131,13 +131,13 @@ protected:
 class LLWearableSaveAsDialog : public LLModalDialog
 {
 private:
-	LLString	mItemName;
+	std::string	mItemName;
 	void		(*mCommitCallback)(LLWearableSaveAsDialog*,void*);
 	void*		mCallbackUserData;
 
 public:
-	LLWearableSaveAsDialog( const LLString& desc, void(*commit_cb)(LLWearableSaveAsDialog*,void*), void* userdata )
-		: LLModalDialog( "", 240, 100 ),
+	LLWearableSaveAsDialog( const std::string& desc, void(*commit_cb)(LLWearableSaveAsDialog*,void*), void* userdata )
+		: LLModalDialog( LLStringUtil::null, 240, 100 ),
 		  mCommitCallback( commit_cb ),
 		  mCallbackUserData( userdata )
 	{
@@ -157,13 +157,13 @@ public:
 		edit->selectAll();
 	}
 
-	const LLString& getItemName() { return mItemName; }
+	const std::string& getItemName() { return mItemName; }
 
 	static void onSave( void* userdata )
 	{
 		LLWearableSaveAsDialog* self = (LLWearableSaveAsDialog*) userdata;
 		self->mItemName = self->childGetValue("name ed").asString();
-		LLString::trim(self->mItemName);
+		LLStringUtil::trim(self->mItemName);
 		if( !self->mItemName.empty() )
 		{
 			if( self->mCommitCallback )
@@ -198,14 +198,14 @@ BOOL edit_wearable_for_teens(EWearableType type)
 class LLMakeOutfitDialog : public LLModalDialog
 {
 private:
-	LLString	mFolderName;
+	std::string	mFolderName;
 	void		(*mCommitCallback)(LLMakeOutfitDialog*,void*);
 	void*		mCallbackUserData;
 	std::vector<std::pair<std::string,S32> > mCheckBoxList;
 	
 public:
 	LLMakeOutfitDialog( void(*commit_cb)(LLMakeOutfitDialog*,void*), void* userdata )
-		: LLModalDialog("",515, 510, TRUE ),
+		: LLModalDialog(LLStringUtil::null,515, 510, TRUE ),
 		  mCommitCallback( commit_cb ),
 		  mCallbackUserData( userdata )
 	{
@@ -214,14 +214,14 @@ public:
 		// Build list of check boxes
 		for( S32 i = 0; i < WT_COUNT; i++ )
 		{
-			LLString name = LLString("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)i );
+			std::string name = std::string("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)i );
 			mCheckBoxList.push_back(std::make_pair(name,i));
 			// Hide teen items
 			if (gAgent.isTeen() &&
 				!edit_wearable_for_teens((EWearableType)i))
 			{
 				// hide wearable checkboxes that don't apply to this account
-				LLString name = LLString("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)i );
+				std::string name = std::string("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)i );
 				childSetVisible(name, FALSE);
 			}
 		}
@@ -237,7 +237,7 @@ public:
 				LLViewerJointAttachment* attachment = curiter->second;
 				S32	attachment_pt = curiter->first;	
 				BOOL object_attached = ( attachment->getNumObjects() > 0 );
-				LLString name = LLString("checkbox_") + attachment->getName();
+				std::string name = std::string("checkbox_") + attachment->getName();
 				mCheckBoxList.push_back(std::make_pair(name,attachment_pt));
 				childSetEnabled(name, object_attached);
 			}
@@ -269,13 +269,13 @@ public:
 		LLModalDialog::draw();
 	}
 
-	const LLString& getFolderName() { return mFolderName; }
+	const std::string& getFolderName() { return mFolderName; }
 
 	void setWearableToInclude( S32 wearable, S32 enabled, S32 selected )
 	{
 		if( (0 <= wearable) && (wearable < WT_COUNT) )
 		{
-			LLString name = LLString("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)wearable );
+			std::string name = std::string("checkbox_") + LLWearable::typeToTypeLabel( (EWearableType)wearable );
 			childSetEnabled(name, enabled);
 			childSetValue(name, selected);
 		}
@@ -285,7 +285,7 @@ public:
 	{
 		for( S32 i = 0; i < (S32)mCheckBoxList.size(); i++)
 		{
-			LLString name = mCheckBoxList[i].first;
+			std::string name = mCheckBoxList[i].first;
 			BOOL checked = childGetValue(name).asBoolean();
 			if (i < WT_COUNT )
 			{
@@ -309,7 +309,7 @@ public:
 	{
 		LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
 		self->mFolderName = self->childGetValue("name ed").asString();
-		LLString::trim(self->mFolderName);
+		LLStringUtil::trim(self->mFolderName);
 		if( !self->mFolderName.empty() )
 		{
 			if( self->mCommitCallback )
@@ -365,9 +365,9 @@ struct LLSubpart
 {
 	LLSubpart() : mSex( SEX_BOTH ) {}
 
-	LLString			mButtonName;
-	LLString			mTargetJoint;
-	LLString			mEditGroup;
+	std::string			mButtonName;
+	std::string			mTargetJoint;
+	std::string			mEditGroup;
 	LLVector3d			mTargetOffset;
 	LLVector3d			mCameraOffset;
 	ESex				mSex;
@@ -385,11 +385,11 @@ public:
 	virtual void		draw();
 	virtual BOOL		isDirty() const;	// LLUICtrl
 	
-	void				addSubpart(const LLString& name, ESubpart id, LLSubpart* part );
-	void				addTextureDropTarget( LLVOAvatar::ETextureIndex te, const LLString& name, const LLUUID& default_image_id, BOOL allow_no_texture );
-	void				addColorSwatch( LLVOAvatar::ETextureIndex te, const LLString& name );
+	void				addSubpart(const std::string& name, ESubpart id, LLSubpart* part );
+	void				addTextureDropTarget( LLVOAvatar::ETextureIndex te, const std::string& name, const LLUUID& default_image_id, BOOL allow_no_texture );
+	void				addColorSwatch( LLVOAvatar::ETextureIndex te, const std::string& name );
 
-	const char*			getLabel()	{ return LLWearable::typeToTypeLabel( mType ); }
+	const std::string&	getLabel()	{ return LLWearable::typeToTypeLabel( mType ); }
 	EWearableType		getType()	{ return mType; }
 
 	LLSubpart*			getCurrentSubpart() { return mSubpartList[mCurrentSubpart]; }
@@ -433,8 +433,8 @@ public:
 private:
 	EWearableType		mType;
 	BOOL				mCanTakeOff;
-	std::map<LLString, S32> mTextureList;
-	std::map<LLString, S32> mColorList;
+	std::map<std::string, S32> mTextureList;
+	std::map<std::string, S32> mColorList;
 	std::map<ESubpart, LLSubpart*> mSubpartList;
 	ESubpart			mCurrentSubpart;
 	LLUndoBuffer*		mUndoBuffer;
@@ -453,7 +453,7 @@ LLPanelEditWearable::LLPanelEditWearable( EWearableType type )
 BOOL LLPanelEditWearable::postBuild()
 {
 	LLAssetType::EType asset_type = LLWearable::typeToAssetType( mType );
-	LLString icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
+	std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
 										 "inv_item_clothing.tga" :
 										 "inv_item_skin.tga" );
 	childSetValue("icon", icon_name);
@@ -489,7 +489,7 @@ LLPanelEditWearable::~LLPanelEditWearable()
 	}
 }
 
-void LLPanelEditWearable::addSubpart( const LLString& name, ESubpart id, LLSubpart* part )
+void LLPanelEditWearable::addSubpart( const std::string& name, ESubpart id, LLSubpart* part )
 {
 	if (!name.empty())
 	{
@@ -694,7 +694,7 @@ void LLPanelEditWearable::onSelectAutoWearOption(S32 option, void* data)
 			wearable->getPermissions().getMaskNextOwner(), cb);
 	}
 }
-void LLPanelEditWearable::addColorSwatch( LLVOAvatar::ETextureIndex te, const LLString& name )
+void LLPanelEditWearable::addColorSwatch( LLVOAvatar::ETextureIndex te, const std::string& name )
 {
 	childSetCommitCallback(name, LLPanelEditWearable::onColorCommit, this);
 	mColorList[name] = te;
@@ -729,7 +729,7 @@ void LLPanelEditWearable::onColorCommit( LLUICtrl* ctrl, void* userdata )
 }
 
 
-void LLPanelEditWearable::addTextureDropTarget( LLVOAvatar::ETextureIndex te, const LLString& name,
+void LLPanelEditWearable::addTextureDropTarget( LLVOAvatar::ETextureIndex te, const std::string& name,
 												const LLUUID& default_image_id, BOOL allow_no_texture )
 {
 	childSetCommitCallback(name, LLPanelEditWearable::onTextureCommit, this);
@@ -870,14 +870,14 @@ void LLPanelEditWearable::draw()
 	{
 		// *TODO:Translate
 		childSetVisible("title_no_modify", TRUE);
-		childSetTextArg("title_no_modify", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
+		childSetTextArg("title_no_modify", "[DESC]", std::string(LLWearable::typeToTypeLabel( mType )));
 		
-		for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+		for( std::map<std::string, S32>::iterator iter = mTextureList.begin();
 			 iter != mTextureList.end(); ++iter )
 		{
 			childSetVisible(iter->first, FALSE );
 		}
-		for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+		for( std::map<std::string, S32>::iterator iter = mColorList.begin();
 			 iter != mColorList.end(); ++iter )
 		{
 			childSetVisible(iter->first, FALSE );
@@ -887,20 +887,20 @@ void LLPanelEditWearable::draw()
 	{
 		// *TODO:Translate
 		childSetVisible("title_loading", TRUE);
-		childSetTextArg("title_loading", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
+		childSetTextArg("title_loading", "[DESC]", std::string(LLWearable::typeToTypeLabel( mType )));
 			
-		LLString path;
+		std::string path;
 		const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() );
 		gInventory.appendPath(item_id, path);
 		childSetVisible("path", TRUE);
 		childSetTextArg("path", "[PATH]", path);
 
-		for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+		for( std::map<std::string, S32>::iterator iter = mTextureList.begin();
 			 iter != mTextureList.end(); ++iter )
 		{
 			childSetVisible(iter->first, FALSE );
 		}
-		for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+		for( std::map<std::string, S32>::iterator iter = mColorList.begin();
 			 iter != mColorList.end(); ++iter )
 		{
 			childSetVisible(iter->first, FALSE );
@@ -911,16 +911,16 @@ void LLPanelEditWearable::draw()
 		childSetVisible("title", TRUE);
 		childSetTextArg("title", "[DESC]", wearable->getName() );
 
-		LLString path;
+		std::string path;
 		const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() );
 		gInventory.appendPath(item_id, path);
 		childSetVisible("path", TRUE);
 		childSetTextArg("path", "[PATH]", path);
 
-		for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+		for( std::map<std::string, S32>::iterator iter = mTextureList.begin();
 			 iter != mTextureList.end(); ++iter )
 		{
-			LLString name = iter->first;
+			std::string name = iter->first;
 			LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(name);
 			S32 te_index = iter->second;
 			childSetVisible(name, is_copyable && is_modifiable && is_complete );
@@ -938,10 +938,10 @@ void LLPanelEditWearable::draw()
 			}
 		}
 
-		for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+		for( std::map<std::string, S32>::iterator iter = mColorList.begin();
 			 iter != mColorList.end(); ++iter )
 		{
-			LLString name = iter->first;
+			std::string name = iter->first;
 			S32 te_index = iter->second;
 			childSetVisible(name, is_modifiable && is_complete );
 			childSetEnabled(name, is_modifiable && is_complete );
@@ -956,14 +956,14 @@ void LLPanelEditWearable::draw()
 	{
 		// *TODO:Translate
 		childSetVisible("title_not_worn", TRUE);
-		childSetTextArg("title_not_worn", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
+		childSetTextArg("title_not_worn", "[DESC]", std::string(LLWearable::typeToTypeLabel( mType )));
 
-		for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+		for( std::map<std::string, S32>::iterator iter = mTextureList.begin();
 			 iter != mTextureList.end(); ++iter )
 		{
 			childSetVisible(iter->first, FALSE );
 		}
-		for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+		for( std::map<std::string, S32>::iterator iter = mColorList.begin();
 			 iter != mColorList.end(); ++iter )
 		{
 			childSetVisible(iter->first, FALSE );
@@ -1006,7 +1006,7 @@ void LLPanelEditWearable::setVisible(BOOL visible)
 			gEditMenuHandler = NULL;
 		}
 
-		for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+		for( std::map<std::string, S32>::iterator iter = mColorList.begin();
 			 iter != mColorList.end(); ++iter )
 		{
 			// this forces any open color pickers to cancel their selection
@@ -1079,12 +1079,12 @@ void LLPanelEditWearable::setUIPermissions(U32 perm_mask, BOOL is_complete)
 	childSetEnabled("Save As", is_copyable && is_complete);
 	childSetEnabled("Randomize", is_modifiable && is_complete);
 	childSetEnabled("sex radio", is_modifiable && is_complete);
-	for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+	for( std::map<std::string, S32>::iterator iter = mTextureList.begin();
 		 iter != mTextureList.end(); ++iter )
 	{
 		childSetVisible(iter->first, is_copyable && is_modifiable && is_complete );
 	}
-	for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+	for( std::map<std::string, S32>::iterator iter = mColorList.begin();
 		 iter != mColorList.end(); ++iter )
 	{
 		childSetVisible(iter->first, is_modifiable && is_complete );
@@ -1097,7 +1097,7 @@ void LLPanelEditWearable::setUIPermissions(U32 perm_mask, BOOL is_complete)
 class LLScrollingPanelParam : public LLScrollingPanel
 {
 public:
-	LLScrollingPanelParam( const LLString& name, LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify );
+	LLScrollingPanelParam( const std::string& name, LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify );
 	virtual ~LLScrollingPanelParam();
 
 	virtual void		draw();
@@ -1144,7 +1144,7 @@ const S32 PARAM_HINT_LABEL_HEIGHT = 16;
 const S32 PARAM_PANEL_WIDTH = 2 * (3* BTN_BORDER + PARAM_HINT_WIDTH +  LLPANEL_BORDER_WIDTH);
 const S32 PARAM_PANEL_HEIGHT = 2 * BTN_BORDER + PARAM_HINT_HEIGHT + PARAM_HINT_LABEL_HEIGHT + 4 * LLPANEL_BORDER_WIDTH; 
 
-LLScrollingPanelParam::LLScrollingPanelParam( const LLString& name,
+LLScrollingPanelParam::LLScrollingPanelParam( const std::string& name,
 											  LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify )
 	: LLScrollingPanel( name, LLRect( 0, PARAM_PANEL_HEIGHT, PARAM_PANEL_WIDTH, 0 ) ),
 	  mParam(param),
@@ -1169,8 +1169,8 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLString& name,
 	childSetCommitCallback("param slider", LLScrollingPanelParam::onSliderMoved, this);
 
 	// *TODO::translate
-	LLString min_name = param->getMinDisplayName();
-	LLString max_name = param->getMaxDisplayName();
+	std::string min_name = param->getMinDisplayName();
+	std::string max_name = param->getMaxDisplayName();
 	childSetValue("min param text", min_name);
 	childSetValue("max param text", max_name);
 
@@ -1502,7 +1502,7 @@ F32 LLScrollingPanelParam::percentToWeight( F32 percent )
 	return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
 }
 
-const LLString& LLFloaterCustomize::getEditGroup()
+const std::string& LLFloaterCustomize::getEditGroup()
 {
 	return getCurrentWearablePanel()->getCurrentSubpart()->mEditGroup;
 }
@@ -1523,7 +1523,7 @@ struct WearablePanelData
 };
 
 LLFloaterCustomize::LLFloaterCustomize()
-:	LLFloater("customize"),
+:	LLFloater(std::string("customize")),
 	mScrollingPanelList( NULL ),
 	mGenePool( NULL ),
 	mInventoryObserver(NULL),
@@ -1616,7 +1616,7 @@ void LLFloaterCustomize::setCurrentWearableType( EWearableType type )
 		if( gFloaterCustomize
 			&& gFloaterCustomize->mWearablePanelList[type_int])
 		{
-			LLString panelname = gFloaterCustomize->mWearablePanelList[type_int]->getName();
+			std::string panelname = gFloaterCustomize->mWearablePanelList[type_int]->getName();
 			gFloaterCustomize->childShowTab("customize tab container", panelname);
 			gFloaterCustomize->switchToDefaultSubpart();
 		}
@@ -1650,7 +1650,7 @@ void LLFloaterCustomize::onBtnSnapshot( void* userdata )
 	success = jpeg_image->encode(raw, 0.0f);
 	if(!success) return;
 
-	LLString filepath("C:\\snapshot");
+	std::string filepath("C:\\snapshot");
 	filepath += ".jpg";
 
 	success = jpeg_image->save(filepath);
@@ -1885,7 +1885,7 @@ void LLFloaterCustomize::initWearablePanels()
 	part->mEditGroup = "eyes";
 	part->mTargetOffset.setVec(0.f, 0.f, 0.05f);
 	part->mCameraOffset.setVec(-0.5f, 0.05f, 0.07f);
-	panel->addSubpart( "", SUBPART_EYES, part );
+	panel->addSubpart( LLStringUtil::null, SUBPART_EYES, part );
 
 	panel->addTextureDropTarget(LLVOAvatar::TEX_EYES_IRIS, "Iris",
 								LLUUID( gSavedSettings.getString( "UIImgDefaultEyesUUID" ) ),
@@ -1902,7 +1902,7 @@ void LLFloaterCustomize::initWearablePanels()
 	part->mEditGroup = "shirt";
 	part->mTargetOffset.setVec(0.f, 0.f, 0.3f);
 	part->mCameraOffset.setVec(-1.f, 0.15f, 0.3f);
-	panel->addSubpart( "", SUBPART_SHIRT, part );
+	panel->addSubpart( LLStringUtil::null, SUBPART_SHIRT, part );
 
 	panel->addTextureDropTarget( LLVOAvatar::TEX_UPPER_SHIRT, "Fabric",
 								 LLUUID( gSavedSettings.getString( "UIImgDefaultShirtUUID" ) ),
@@ -1920,7 +1920,7 @@ void LLFloaterCustomize::initWearablePanels()
 	part->mEditGroup = "pants";
 	part->mTargetOffset.setVec(0.f, 0.f, -0.5f);
 	part->mCameraOffset.setVec(-1.6f, 0.15f, -0.5f);
-	panel->addSubpart( "", SUBPART_PANTS, part );
+	panel->addSubpart( LLStringUtil::null, SUBPART_PANTS, part );
 
 	panel->addTextureDropTarget(LLVOAvatar::TEX_LOWER_PANTS, "Fabric",
 								LLUUID( gSavedSettings.getString( "UIImgDefaultPantsUUID" ) ),
@@ -1940,7 +1940,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mEditGroup = "shoes";
 		part->mTargetOffset.setVec(0.f, 0.f, -0.5f);
 		part->mCameraOffset.setVec(-1.6f, 0.15f, -0.5f);
-		panel->addSubpart( "", SUBPART_SHOES, part );
+		panel->addSubpart( LLStringUtil::null, SUBPART_SHOES, part );
 
 		panel->addTextureDropTarget( LLVOAvatar::TEX_LOWER_SHOES, "Fabric",
 									 LLUUID( gSavedSettings.getString( "UIImgDefaultShoesUUID" ) ),
@@ -1961,7 +1961,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mEditGroup = "socks";
 		part->mTargetOffset.setVec(0.f, 0.f, -0.5f);
 		part->mCameraOffset.setVec(-1.6f, 0.15f, -0.5f);
-		panel->addSubpart( "", SUBPART_SOCKS, part );
+		panel->addSubpart( LLStringUtil::null, SUBPART_SOCKS, part );
 
 		panel->addTextureDropTarget( LLVOAvatar::TEX_LOWER_SOCKS, "Fabric",
 									 LLUUID( gSavedSettings.getString( "UIImgDefaultSocksUUID" ) ),
@@ -1981,7 +1981,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mEditGroup = "jacket";
 		part->mTargetOffset.setVec(0.f, 0.f, 0.f);
 		part->mCameraOffset.setVec(-2.f, 0.1f, 0.3f);
-		panel->addSubpart( "", SUBPART_JACKET, part );
+		panel->addSubpart( LLStringUtil::null, SUBPART_JACKET, part );
 
 		panel->addTextureDropTarget( LLVOAvatar::TEX_UPPER_JACKET, "Upper Fabric",
 									 LLUUID( gSavedSettings.getString( "UIImgDefaultJacketUUID" ) ),
@@ -2004,7 +2004,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mEditGroup = "skirt";
 		part->mTargetOffset.setVec(0.f, 0.f, -0.5f);
 		part->mCameraOffset.setVec(-1.6f, 0.15f, -0.5f);
-		panel->addSubpart( "", SUBPART_SKIRT, part );
+		panel->addSubpart( LLStringUtil::null, SUBPART_SKIRT, part );
 
 		panel->addTextureDropTarget( LLVOAvatar::TEX_SKIRT,  "Fabric",
 									 LLUUID( gSavedSettings.getString( "UIImgDefaultSkirtUUID" ) ),
@@ -2025,7 +2025,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mEditGroup = "gloves";
 		part->mTargetOffset.setVec(0.f, 0.f, 0.f);
 		part->mCameraOffset.setVec(-1.f, 0.15f, 0.f);
-		panel->addSubpart( "", SUBPART_GLOVES, part );
+		panel->addSubpart( LLStringUtil::null, SUBPART_GLOVES, part );
 
 		panel->addTextureDropTarget( LLVOAvatar::TEX_UPPER_GLOVES,  "Fabric",
 									 LLUUID( gSavedSettings.getString( "UIImgDefaultGlovesUUID" ) ),
@@ -2046,7 +2046,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mEditGroup = "undershirt";
 		part->mTargetOffset.setVec(0.f, 0.f, 0.3f);
 		part->mCameraOffset.setVec(-1.f, 0.15f, 0.3f);
-		panel->addSubpart( "", SUBPART_UNDERSHIRT, part );
+		panel->addSubpart( LLStringUtil::null, SUBPART_UNDERSHIRT, part );
 
 		panel->addTextureDropTarget( LLVOAvatar::TEX_UPPER_UNDERSHIRT,  "Fabric",
 									 LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ),
@@ -2066,7 +2066,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mEditGroup = "underpants";
 		part->mTargetOffset.setVec(0.f, 0.f, -0.5f);
 		part->mCameraOffset.setVec(-1.6f, 0.15f, -0.5f);
-		panel->addSubpart( "", SUBPART_UNDERPANTS, part );
+		panel->addSubpart( LLStringUtil::null, SUBPART_UNDERPANTS, part );
 
 		panel->addTextureDropTarget( LLVOAvatar::TEX_LOWER_UNDERPANTS, "Fabric",
 									 LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ),
@@ -2173,7 +2173,7 @@ void LLFloaterCustomize::initScrollingPanelList()
 		getChild<LLScrollableContainerView>("panel_container");
 	// LLScrollingPanelList's do not import correctly 
 // 	mScrollingPanelList = LLUICtrlFactory::getScrollingPanelList(this, "panel_list");
-	mScrollingPanelList = new LLScrollingPanelList("panel_list", LLRect());
+	mScrollingPanelList = new LLScrollingPanelList(std::string("panel_list"), LLRect());
 	if (scroll_container)
 	{
 		scroll_container->setScrolledView(mScrollingPanelList);
diff --git a/linden/indra/newview/llfloatercustomize.h b/linden/indra/newview/llfloatercustomize.h
index 9ca22d0..60fdd4b 100644
--- a/linden/indra/newview/llfloatercustomize.h
+++ b/linden/indra/newview/llfloatercustomize.h
@@ -87,13 +87,12 @@ public:
 	void			generateVisualParamHints(LLViewerJointMesh* joint_mesh,
 											 param_map& params);
 
-	const LLString& getEditGroup();
+	const std::string& getEditGroup();
 	void			addVisualParamToUndoBuffer( LLViewerVisualParam* param, F32 current_weight );
 
 	void 			updateScrollingPanelList(BOOL allow_modify);
 
 	void			setWearable(EWearableType type, LLWearable* wearable, U32 perm_mask, BOOL is_complete);
-	//const char*		getWearableDescription( EWearableType type );
 	LLPanelEditWearable* getCurrentWearablePanel() { return mWearablePanelList[ sCurrentWearableType ]; }
 
 	virtual BOOL	isDirty() const;
diff --git a/linden/indra/newview/llfloaterdaycycle.cpp b/linden/indra/newview/llfloaterdaycycle.cpp
index f517439..c0f8a48 100644
--- a/linden/indra/newview/llfloaterdaycycle.cpp
+++ b/linden/indra/newview/llfloaterdaycycle.cpp
@@ -59,10 +59,10 @@
 
 
 LLFloaterDayCycle* LLFloaterDayCycle::sDayCycle = NULL;
-std::map<LLString, LLWLSkyKey> LLFloaterDayCycle::sSliderToKey;
+std::map<std::string, LLWLSkyKey> LLFloaterDayCycle::sSliderToKey;
 const F32 LLFloaterDayCycle::sHoursPerDay = 24.0f;
 
-LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater("Day Cycle Floater")
+LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater(std::string("Day Cycle Floater"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_day_cycle_options.xml");
 	
@@ -75,7 +75,7 @@ LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater("Day Cycle Floater")
 			LLWLParamManager::instance()->mParamList.begin();
 		for(; mIt != LLWLParamManager::instance()->mParamList.end(); mIt++) 
 		{
-			keyCombo->add(LLString(mIt->first));
+			keyCombo->add(std::string(mIt->first));
 		}
 
 		// set defaults on combo boxes
@@ -97,11 +97,10 @@ LLFloaterDayCycle::~LLFloaterDayCycle()
 
 void LLFloaterDayCycle::onClickHelp(void* data)
 {
-
 	LLFloaterDayCycle* self = LLFloaterDayCycle::instance();
+	const std::string* xml_alert = (std::string*)data;
 
-	const char* xml_alert = (const char*) data;
-	LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
+	LLAlertDialog* dialogp = gViewerWindow->alertXml(*xml_alert);
 	if (dialogp)
 	{
 		LLFloater* root_floater = gFloaterView->getParentFloater(self);
@@ -110,11 +109,12 @@ void LLFloaterDayCycle::onClickHelp(void* data)
 			root_floater->addDependentFloater(dialogp);
 		}
 	}
+	delete xml_alert;
 }
 
-void LLFloaterDayCycle::initHelpBtn(const char* name, const char* xml_alert)
+void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert)
 {
-	childSetAction(name, onClickHelp, (void*)xml_alert);
+	childSetAction(name, onClickHelp, new std::string(xml_alert));
 }
 
 void LLFloaterDayCycle::initCallbacks(void) 
@@ -193,7 +193,7 @@ void LLFloaterDayCycle::syncSliderTrack()
 		LLWLParamManager::instance()->mDay.mTimeMap.begin();
 	for(; mIt != LLWLParamManager::instance()->mDay.mTimeMap.end(); mIt++) 
 	{
-		addSliderKey(mIt->first * sHoursPerDay, mIt->second.c_str());
+		addSliderKey(mIt->first * sHoursPerDay, mIt->second);
 	}
 }
 
@@ -218,7 +218,7 @@ void LLFloaterDayCycle::syncTrack()
 	LLWLParamManager::instance()->mDay.clearKeys();
 	
 	// add the keys one by one
-	std::map<LLString, LLWLSkyKey>::iterator mIt = sSliderToKey.begin();
+	std::map<std::string, LLWLSkyKey>::iterator mIt = sSliderToKey.begin();
 	for(; mIt != sSliderToKey.end(); mIt++) 
 	{
 		LLWLParamManager::instance()->mDay.addKey(mIt->second.time / sHoursPerDay, 
@@ -379,7 +379,7 @@ void LLFloaterDayCycle::onKeyTimeMoved(LLUICtrl* ctrl, void* userData)
 	}
 
 	// make sure we have a slider
-	const LLString& curSldr = sldr->getCurSlider();
+	const std::string& curSldr = sldr->getCurSlider();
 	if(curSldr == "") {
 		return;
 	}
@@ -387,7 +387,7 @@ void LLFloaterDayCycle::onKeyTimeMoved(LLUICtrl* ctrl, void* userData)
 	F32 time = sldr->getCurSliderValue();
 
 	// check to see if a key exists
-	LLString presetName = sSliderToKey[curSldr].presetName;
+	std::string presetName = sSliderToKey[curSldr].presetName;
 	sSliderToKey[curSldr].time = time;
 
 	// if it exists, turn on check box
@@ -428,12 +428,12 @@ void LLFloaterDayCycle::onKeyTimeChanged(LLUICtrl* ctrl, void* userData)
 	F32 min = minSpin->get();
 	F32 val = hour + min / 60.0f;
 
-	const LLString& curSldr = sldr->getCurSlider();
+	const std::string& curSldr = sldr->getCurSlider();
 	sldr->setCurSliderValue(val, TRUE);
 	F32 time = sldr->getCurSliderValue() / sHoursPerDay;
 
 	// now set the key's time in the sliderToKey map
-	LLString presetName = sSliderToKey[curSldr].presetName;
+	std::string presetName = sSliderToKey[curSldr].presetName;
 	sSliderToKey[curSldr].time = time;
 
 	syncTrack();
@@ -453,8 +453,8 @@ void LLFloaterDayCycle::onKeyPresetChanged(LLUICtrl* ctrl, void* userData)
 	}
 
 	// change the map
-	LLString newPreset(comboBox->getSelectedValue().asString());
-	const LLString& curSldr = sldr->getCurSlider();
+	std::string newPreset(comboBox->getSelectedValue().asString());
+	const std::string& curSldr = sldr->getCurSlider();
 
 	// if null, don't use
 	if(curSldr == "") {
@@ -506,7 +506,7 @@ void LLFloaterDayCycle::onAddKey(void* userData)
 	llassert_always(sSliderToKey.size() == kSldr->getValue().size());
 
 	// get the values
-	LLString newPreset(comboBox->getSelectedValue().asString());
+	std::string newPreset(comboBox->getSelectedValue().asString());
 
 	// add the slider key
 	addSliderKey(tSldr->getCurSliderValue(), newPreset);
@@ -514,13 +514,13 @@ void LLFloaterDayCycle::onAddKey(void* userData)
 	syncTrack();
 }
 
-void LLFloaterDayCycle::addSliderKey(F32 time, const LLString & presetName)
+void LLFloaterDayCycle::addSliderKey(F32 time, const std::string & presetName)
 {
 	LLMultiSliderCtrl* kSldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
 		"WLDayCycleKeys");
 
 	// make a slider
-	const LLString& sldrName = kSldr->addSlider(time);
+	const std::string& sldrName = kSldr->addSlider(time);
 	if(sldrName == "") {
 		return;
 	}
@@ -530,21 +530,21 @@ void LLFloaterDayCycle::addSliderKey(F32 time, const LLString & presetName)
 	newKey.presetName = presetName;
 	newKey.time = kSldr->getCurSliderValue();
 
-	llassert_always(sldrName != LLString::null);
+	llassert_always(sldrName != LLStringUtil::null);
 
 	// add to map
-	sSliderToKey.insert(std::pair<LLString, LLWLSkyKey>(sldrName, newKey));
+	sSliderToKey.insert(std::pair<std::string, LLWLSkyKey>(sldrName, newKey));
 
 	llassert_always(sSliderToKey.size() == kSldr->getValue().size());
 
 }
 
-void LLFloaterDayCycle::deletePreset(LLString& presetName)
+void LLFloaterDayCycle::deletePreset(std::string& presetName)
 {
 	LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
 
 	/// delete any reference
-	std::map<LLString, LLWLSkyKey>::iterator curr_preset, next_preset;
+	std::map<std::string, LLWLSkyKey>::iterator curr_preset, next_preset;
 	for(curr_preset = sSliderToKey.begin(); curr_preset != sSliderToKey.end(); curr_preset = next_preset)
 	{
 		next_preset = curr_preset;
@@ -568,8 +568,8 @@ void LLFloaterDayCycle::onDeleteKey(void* userData)
 	LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
 
 	// delete from map
-	const LLString& sldrName = sldr->getCurSlider();
-	std::map<LLString, LLWLSkyKey>::iterator mIt = sSliderToKey.find(sldrName);
+	const std::string& sldrName = sldr->getCurSlider();
+	std::map<std::string, LLWLSkyKey>::iterator mIt = sSliderToKey.find(sldrName);
 	sSliderToKey.erase(mIt);
 
 	sldr->deleteCurSlider();
@@ -578,7 +578,7 @@ void LLFloaterDayCycle::onDeleteKey(void* userData)
 		return;
 	}
 
-	const LLString& name = sldr->getCurSlider();
+	const std::string& name = sldr->getCurSlider();
 	comboBox->selectByValue(sSliderToKey[name].presetName);
 	F32 time = sSliderToKey[name].time;
 
diff --git a/linden/indra/newview/llfloaterdaycycle.h b/linden/indra/newview/llfloaterdaycycle.h
index edddbb5..4c6abab 100644
--- a/linden/indra/newview/llfloaterdaycycle.h
+++ b/linden/indra/newview/llfloaterdaycycle.h
@@ -45,7 +45,7 @@ struct WLFloatControl;
 struct LLWLSkyKey
 {
 public:
-	LLString presetName;
+	std::string presetName;
 	F32 time;
 };
 
@@ -60,7 +60,7 @@ public:
 
 	/// help button stuff
 	static void onClickHelp(void* data);
-	void initHelpBtn(const char* name, const char* xml_alert);
+	void initHelpBtn(const std::string& name, const std::string& xml_alert);
 
 	/// initialize all
 	void initCallbacks(void);
@@ -93,7 +93,7 @@ public:
 	static void onAddKey(void* userData);
 
 	/// delete any and all reference to a preset
-	void deletePreset(LLString& presetName);
+	void deletePreset(std::string& presetName);
 
 	/// delete a key frame
 	static void onDeleteKey(void* userData);
@@ -129,7 +129,7 @@ public:
 	static void syncTrack();
 
 	/// add a slider to the track
-	static void addSliderKey(F32 time, const LLString& presetName);
+	static void addSliderKey(F32 time, const std::string& presetName);
 
 private:
 
@@ -137,7 +137,7 @@ private:
 	static LLFloaterDayCycle* sDayCycle;
 
 	// map of sliders to parameters
-	static std::map<LLString, LLWLSkyKey> sSliderToKey;
+	static std::map<std::string, LLWLSkyKey> sSliderToKey;
 
 	static const F32 sHoursPerDay;
 };
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index f1ee946..305a029 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -71,7 +71,7 @@ S32 LLFloaterDirectory::sNewSearchCount = 0; // debug
 
 
 LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
-:	LLFloater(name, "FloaterFindRect2", ""),
+:	LLFloater(name, std::string("FloaterFindRect2"), LLStringUtil::null),
 	mMinimizing(false)
 {
 	sInstance = this;
@@ -249,7 +249,7 @@ void* LLFloaterDirectory::createGroupDetail(void* userdata)
 	self->mPanelGroupp = new LLPanelGroup("panel_group.xml",
 										  "PanelGroup",
 										  gAgent.getGroupID());
-	self->mPanelGroupp->setAllowEdit(FALSE);
+	self->mPanelGroupp->setAllowEdit(FALSE || gAgent.isGodlike()); // Gods can always edit panels
 	self->mPanelGroupp->setVisible(FALSE);
 	return self->mPanelGroupp;
 }
@@ -258,7 +258,7 @@ void* LLFloaterDirectory::createGroupDetail(void* userdata)
 void* LLFloaterDirectory::createGroupDetailHolder(void* userdata)
 {
 	LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
-	self->mPanelGroupHolderp = new LLPanel("PanelGroupHolder");
+	self->mPanelGroupHolderp = new LLPanel(std::string("PanelGroupHolder"));
 	self->mPanelGroupHolderp->setVisible(FALSE);
 	return self->mPanelGroupHolderp;
 }
@@ -389,7 +389,7 @@ void LLFloaterDirectory::toggleFind(void*)
 #endif
 	if (!sInstance)
 	{
-		LLString panel = gSavedSettings.getString("LastFindPanel");
+		std::string panel = gSavedSettings.getString("LastFindPanel");
 		showPanel(panel);
 
 		// HACK: force query for today's events
diff --git a/linden/indra/newview/llfloatereditui.cpp b/linden/indra/newview/llfloatereditui.cpp
index dfb0571..a95126c 100644
--- a/linden/indra/newview/llfloatereditui.cpp
+++ b/linden/indra/newview/llfloatereditui.cpp
@@ -110,7 +110,7 @@ void	LLFloaterEditUI::navigateHierarchyButtonPressed(void*	data)
 }
 	
 LLFloaterEditUI::LLFloaterEditUI()
-:	LLFloater("floater_ui_editor", LLRect(0, 200, 200, 0), "Edit User Interface"),
+:	LLFloater(std::string("floater_ui_editor"), LLRect(0, 200, 200, 0), std::string("Edit User Interface")),
 	mLastView(NULL),
 	mLabelLine(NULL),
 	mWidthSpin(NULL),
@@ -129,16 +129,16 @@ LLFloaterEditUI::LLFloaterEditUI()
 	LLButton*	button = NULL;
 
 
-	text = new LLTextBox("Selected UI Widget:", LLRect(x, y+16, x+100, y));
+	text = new LLTextBox(std::string("Selected UI Widget:"), LLRect(x, y+16, x+100, y));
 	addChild(text);
 	y -= VPAD + 16;
 
-	text = new LLTextBox("Label:", LLRect(x, y+16, x+40, y));
+	text = new LLTextBox(std::string("Label:"), LLRect(x, y+16, x+40, y));
 	addChild(text);
 	x = R1;
 
-	line = new LLLineEditor("label_line", LLRect(x, y+20, x+100, y),
-		"",
+	line = new LLLineEditor(std::string("label_line"), LLRect(x, y+20, x+100, y),
+		LLStringUtil::null,
 		NULL,
 		254,
 		onCommitLabel,
@@ -151,8 +151,8 @@ LLFloaterEditUI::LLFloaterEditUI()
 	x = HPAD;
 	y -= VPAD + 20;
 
-	spin = new LLSpinCtrl("height_spin", LLRect(x, y+20, x+100, y),
-		"Height:", LLFontGL::sSansSerifSmall,
+	spin = new LLSpinCtrl(std::string("height_spin"), LLRect(x, y+20, x+100, y),
+		std::string("Height:"), LLFontGL::sSansSerifSmall,
 		onCommitHeight,
 		this,
 		0.f,
@@ -165,8 +165,8 @@ LLFloaterEditUI::LLFloaterEditUI()
 
 	y -= VPAD + 20;
 
-	spin = new LLSpinCtrl("width_spin", LLRect(x, y+20, x+100, y),
-		"Width:", LLFontGL::sSansSerifSmall,
+	spin = new LLSpinCtrl(std::string("width_spin"), LLRect(x, y+20, x+100, y),
+		std::string("Width:"), LLFontGL::sSansSerifSmall,
 		onCommitWidth,
 		this,
 		0.f,
@@ -179,31 +179,31 @@ LLFloaterEditUI::LLFloaterEditUI()
 
 	y -= VPAD + 20;
 
-	text = new LLTextBox("XML Name:", LLRect(x, y+16, x+60, y));
+	text = new LLTextBox(std::string("XML Name:"), LLRect(x, y+16, x+60, y));
 	addChild(text);
 	x+=60;
-	text = new LLTextBox("xml_name", LLRect(x, y+16, x+100, y));
+	text = new LLTextBox(std::string("xml_name"), LLRect(x, y+16, x+100, y));
 	addChild(text);
 	x-=50;
 
 	y -= VPAD + 20;
 
 	x += 40;
-	button = new LLButton("up",LLRect(x, y+16, x+32, y));
+	button = new LLButton(std::string("up"),LLRect(x, y+16, x+32, y));
 	addChild(button);
 	x -= 40;
 	y -= VPAD + 20;
-	button = new LLButton("<<",LLRect(x, y+16, x+32, y));
+	button = new LLButton(std::string("<<"),LLRect(x, y+16, x+32, y));
 	addChild(button);
 	x += 40;
-	button = new LLButton("rfrsh",LLRect(x, y+16, x+32, y));
+	button = new LLButton(std::string("rfrsh"),LLRect(x, y+16, x+32, y));
 	addChild(button);
 	x += 40;
-	button = new LLButton(">>",LLRect(x, y+16, x+32, y));
+	button = new LLButton(std::string(">>"),LLRect(x, y+16, x+32, y));
 	addChild(button);
 	x -= 40;
 	y -= VPAD + 20;
-	button = new LLButton("dn",LLRect(x, y+16, x+32, y));
+	button = new LLButton(std::string("dn"),LLRect(x, y+16, x+32, y));
 	addChild(button);
 
 	childSetAction("up",navigateHierarchyButtonPressed,(void*)0);
@@ -240,7 +240,7 @@ void LLFloaterEditUI::refresh()
 	if (!view) 
 	{
 		mLastView = NULL;
-		mLabelLine->setText(LLString::null);
+		mLabelLine->setText(LLStringUtil::null);
 		mLabelLine->setEnabled(FALSE);
 		mWidthSpin->set(0.f);
 		mWidthSpin->setEnabled(FALSE);
@@ -291,14 +291,14 @@ void LLFloaterEditUI::refreshCore()
 void LLFloaterEditUI::refreshView(LLView* view)
 {
 	mLabelLine->setEnabled(FALSE);
-	mLabelLine->setText(LLString::null);
+	mLabelLine->setText(LLStringUtil::null);
 	childSetText("xml_name",view->getName());
 }
 
 void LLFloaterEditUI::refreshButton(LLView* view)
 {
 	LLButton* btn = (LLButton*)view;
-	LLString label = btn->getLabelUnselected();
+	std::string label = btn->getLabelUnselected();
 	mLabelLine->setEnabled(TRUE);
 	mLabelLine->setText(label);
 	childSetText("xml_name",view->getName());
@@ -385,7 +385,7 @@ void LLFloaterEditUI::onCommitLabel(LLUICtrl* ctrl, void* data)
 	if (!view) return;
 
 	LLLineEditor* line = (LLLineEditor*)ctrl;
-	const LLString& text = line->getText();
+	const std::string& text = line->getText();
 	LLButton* btn = dynamic_cast<LLButton*>(view);
 	if (btn)
 	{
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index b16b48d..d7f2ed0 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.cpp
@@ -53,7 +53,7 @@
 
 LLFloaterEnvSettings* LLFloaterEnvSettings::sEnvSettings = NULL;
 
-LLFloaterEnvSettings::LLFloaterEnvSettings() : LLFloater("Environment Settings Floater")
+LLFloaterEnvSettings::LLFloaterEnvSettings() : LLFloater(std::string("Environment Settings Floater"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_env_settings.xml");
 	
@@ -110,7 +110,7 @@ void LLFloaterEnvSettings::syncMenu()
 
 	// sync the clock
 	F32 val = (F32)LLWLParamManager::instance()->mAnimator.getDayTime();
-	LLString timeStr = timeToString(val);
+	std::string timeStr = timeToString(val);
 
 	LLTextBox* textBox;
 	textBox = sEnvSettings->getChild<LLTextBox>("EnvTimeText");
@@ -308,7 +308,7 @@ void LLFloaterEnvSettings::onUseEstateTime(void* userData)
 	LLWLParamManager::instance()->mAnimator.mUseLindenTime = true;
 }
 
-LLString LLFloaterEnvSettings::timeToString(F32 curTime)
+std::string LLFloaterEnvSettings::timeToString(F32 curTime)
 {
 	S32 hours;
 	S32 min;
diff --git a/linden/indra/newview/llfloaterenvsettings.h b/linden/indra/newview/llfloaterenvsettings.h
index 63f6a98..8f70993 100644
--- a/linden/indra/newview/llfloaterenvsettings.h
+++ b/linden/indra/newview/llfloaterenvsettings.h
@@ -95,7 +95,7 @@ public:
 	void syncMenu();
 
 	/// convert the present time to a digital clock time
-	LLString timeToString(F32 curTime);
+	std::string timeToString(F32 curTime);
 
 private:
 	// one instance on the inside
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 97b7131..7f6bf01 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -44,7 +44,6 @@
 #include "llfloateravatarpicker.h"
 #include "llviewerwindow.h"
 #include "llbutton.h"
-#include "llcallingcard.h"
 #include "llfloateravatarinfo.h"
 #include "llinventorymodel.h"
 #include "llnamelistctrl.h"
@@ -143,7 +142,7 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
 	LLDynamicArray<LLUUID> selected_friends = getSelectedIDs();
 	if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE))
 	{
-		refreshNames();
+		refreshNames(changed_mask);
 	}
 	else if(changed_mask & LLFriendObserver::POWERS)
 	{
@@ -185,7 +184,8 @@ BOOL LLPanelFriends::postBuild()
 	childSetCommitCallback("friend_list", onSelectName, this);
 	childSetDoubleClickCallback("friend_list", onClickIM);
 
-	refreshNames();
+	U32 changed_mask = LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE;
+	refreshNames(changed_mask);
 
 	childSetAction("im_btn", onClickIM, this);
 	childSetAction("profile_btn", onClickProfile, this);
@@ -200,13 +200,12 @@ BOOL LLPanelFriends::postBuild()
 	refreshUI();
 
 	// primary sort = online status, secondary sort = name
-	mFriendsList->sortByColumn("friend_name", TRUE);
-	mFriendsList->sortByColumn("icon_online_status", FALSE);
+	mFriendsList->sortByColumn(std::string("friend_name"), TRUE);
+	mFriendsList->sortByColumn(std::string("icon_online_status"), FALSE);
 
 	return TRUE;
 }
 
-
 BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
 {
 	LLAvatarTracker& at = LLAvatarTracker::instance();
@@ -264,7 +263,8 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
 	return have_name;
 }
 
-// propagate actual relationship to UI
+// propagate actual relationship to UI.
+// Does not resort the UI list because it can be called frequently. JC
 BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationship* info)
 {
 	if (!info) return FALSE;
@@ -274,7 +274,7 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
 	std::string fullname;
 	BOOL have_name = gCacheName->getFullName(agent_id, fullname);
 
-	itemp->getColumn(LIST_ONLINE_STATUS)->setValue(info->isOnline() ? "icon_avatar_online.tga" : LLString::null);
+	itemp->getColumn(LIST_ONLINE_STATUS)->setValue(info->isOnline() ? std::string("icon_avatar_online.tga") : LLStringUtil::null);
 	itemp->getColumn(LIST_FRIEND_NAME)->setValue(fullname);
 	// render name of online friends in bold text
 	((LLScrollListText*)itemp->getColumn(LIST_FRIEND_NAME))->setFontStyle(info->isOnline() ? LLFontGL::BOLD : LLFontGL::NORMAL);	
@@ -287,9 +287,7 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
 	// enable this item, in case it was disabled after user input
 	itemp->setEnabled(TRUE);
 
-	// changed item in place, need to request sort
-	mFriendsList->sortItems();
-
+	// Do not resort, this function can be called frequently.
 	return have_name;
 }
 
@@ -359,7 +357,7 @@ struct SortFriendsByID
 	}
 };
 
-void LLPanelFriends::refreshNames()
+void LLPanelFriends::refreshNames(U32 changed_mask)
 {
 	LLDynamicArray<LLUUID> selected_ids = getSelectedIDs();	
 	S32 pos = mFriendsList->getScrollPos();	
@@ -367,27 +365,67 @@ void LLPanelFriends::refreshNames()
 	// get all buddies we know about
 	LLAvatarTracker::buddy_map_t all_buddies;
 	LLAvatarTracker::instance().copyBuddyList(all_buddies);
-	
-	// get all friends in list and sort by UUID
+
+	BOOL have_names = TRUE;
+
+	if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE))
+	{
+		have_names &= refreshNamesSync(all_buddies);
+	}
+
+	if(changed_mask & LLFriendObserver::ONLINE)
+	{
+		have_names &= refreshNamesPresence(all_buddies);
+	}
+
+	if (!have_names)
+	{
+		mEventTimer.start();
+	}
+	// Changed item in place, need to request sort and update columns
+	// because we might have changed data in a column on which the user
+	// has already sorted. JC
+	mFriendsList->sortItems();
+
+	// re-select items
+	mFriendsList->selectMultiple(selected_ids);
+	mFriendsList->setScrollPos(pos);
+}
+
+BOOL LLPanelFriends::refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies)
+{
+	mFriendsList->deleteAllItems();
+
+	BOOL have_names = TRUE;
+	LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin();
+
+	for(; buddy_it != all_buddies.end(); ++buddy_it)
+	{
+		have_names &= addFriend(buddy_it->first);
+	}
+
+	return have_names;
+}
+
+BOOL LLPanelFriends::refreshNamesPresence(const LLAvatarTracker::buddy_map_t & all_buddies)
+{
 	std::vector<LLScrollListItem*> items = mFriendsList->getAllData();
 	std::sort(items.begin(), items.end(), SortFriendsByID());
 
-	std::vector<LLScrollListItem*>::iterator item_it = items.begin();
-	std::vector<LLScrollListItem*>::iterator item_end = items.end();
-
+	LLAvatarTracker::buddy_map_t::const_iterator buddy_it  = all_buddies.begin();
+	std::vector<LLScrollListItem*>::const_iterator item_it = items.begin();
 	BOOL have_names = TRUE;
-	LLAvatarTracker::buddy_map_t::iterator buddy_it;
-	for (buddy_it = all_buddies.begin() ; buddy_it != all_buddies.end(); ++buddy_it)
+
+	while(true)
 	{
-		// erase any items that reflect residents who are no longer buddies
-		while(item_it != item_end && buddy_it->first > (*item_it)->getValue().asUUID())
+		if(item_it == items.end() || buddy_it == all_buddies.end())
 		{
-			mFriendsList->deleteItems((*item_it)->getValue());
-			++item_it;
+			break;
 		}
 
-		// update existing friends with new info
-		if (item_it != item_end && buddy_it->first == (*item_it)->getValue().asUUID())
+		const LLUUID & buddy_uuid = buddy_it->first;
+		const LLUUID & item_uuid  = (*item_it)->getValue().asUUID();
+		if(item_uuid == buddy_uuid)
 		{
 			const LLRelationship* info = buddy_it->second;
 			if (!info) 
@@ -402,27 +440,23 @@ void LLPanelFriends::refreshNames()
 				// update existing item in UI
 				have_names &= updateFriendItem(buddy_it->first, info);
 			}
+
+			++buddy_it;
 			++item_it;
 		}
-		// add new friend to list
-		else 
+		else if(item_uuid < buddy_uuid)
 		{
-			have_names &= addFriend(buddy_it->first);
+			++item_it;
+		}
+		else //if(item_uuid > buddy_uuid)
+		{
+			++buddy_it;
 		}
 	}
-	if (!have_names)
-	{
-		mEventTimer.start();
-	}
-	// changed item in place, need to request sort and update columns
-	mFriendsList->sortItems();
 
-	// re-select items
-	mFriendsList->selectMultiple(selected_ids);
-	mFriendsList->setScrollPos(pos);
+	return have_names;
 }
 
-
 void LLPanelFriends::refreshUI()
 {	
 	BOOL single_selected = FALSE;
@@ -443,7 +477,7 @@ void LLPanelFriends::refreshUI()
 	}
 	else
 	{
-		childSetText("friend_name_label", LLString::null);
+		childSetText("friend_name_label", LLStringUtil::null);
 	}
 
 
@@ -488,7 +522,7 @@ void LLPanelFriends::onSelectName(LLUICtrl* ctrl, void* user_data)
 //static
 void LLPanelFriends::onMaximumSelect(void* user_data)
 {
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[MAX_SELECT]"] = llformat("%d", MAX_FRIEND_SELECT);
 	LLNotifyBox::showXml("MaxListSelectMessage", args);
 };
@@ -539,16 +573,15 @@ void LLPanelFriends::onClickIM(void* user_data)
 }
 
 // static
-void LLPanelFriends::requestFriendship(const LLUUID& target_id, const LLString& target_name)
+void LLPanelFriends::requestFriendship(const LLUUID& target_id, const std::string& target_name, const std::string& message)
 {
-	// HACK: folder id stored as "message"
 	LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-	std::string message = calling_card_folder_id.asString();
 	send_improved_im(target_id,
-					 target_name.c_str(),
-					 message.c_str(),
+					 target_name,
+					 message,
 					 IM_ONLINE,
-					 IM_FRIENDSHIP_OFFERED);
+					 IM_FRIENDSHIP_OFFERED,
+					 calling_card_folder_id);
 }
 
 struct LLAddFriendData
@@ -558,12 +591,12 @@ struct LLAddFriendData
 };
 
 // static
-void LLPanelFriends::callbackAddFriend(S32 option, void* data)
+void LLPanelFriends::callbackAddFriend(S32 option, const std::string& text, void* data)
 {
 	LLAddFriendData* add = (LLAddFriendData*)data;
 	if (option == 0)
 	{
-		requestFriendship(add->mID, add->mName);
+		requestFriendship(add->mID, add->mName, text);
 	}
 	delete add;
 }
@@ -593,9 +626,9 @@ void LLPanelFriends::requestFriendshipDialog(const LLUUID& id,
 	data->mName = name;
 	
 	// TODO: accept a line of text with this dialog
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[NAME]"] = name;
-	gViewerWindow->alertXml("AddFriend", args, callbackAddFriend, data);
+	gViewerWindow->alertXmlEditText("AddFriend", args, NULL, NULL, callbackAddFriend, data);
 }
 
 // static
@@ -617,10 +650,10 @@ void LLPanelFriends::onClickRemove(void* user_data)
 
 	//llinfos << "LLPanelFriends::onClickRemove()" << llendl;
 	LLDynamicArray<LLUUID> ids = panelp->getSelectedIDs();
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	if(ids.size() > 0)
 	{
-		LLString msgType = "RemoveFromFriends";
+		std::string msgType = "RemoveFromFriends";
 		if(ids.size() == 1)
 		{
 			LLUUID agent_id = ids[0];
@@ -670,7 +703,7 @@ void LLPanelFriends::confirmModifyRights(rights_map_t& ids, EGrantRevoke command
 {
 	if (ids.empty()) return;
 	
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	if(ids.size() > 0)
 	{
 		// copy map of ids onto heap
@@ -732,6 +765,8 @@ void LLPanelFriends::modifyRightsConfirmation(S32 option, void* user_data)
 			{
 				const LLRelationship* info = LLAvatarTracker::instance().getBuddyInfo(rights_it->first);
 				panelp->updateFriendItem(rights_it->first, info);
+				// Might have changed the column the user is sorted on.
+				panelp->mFriendsList->sortItems();
 			}
 		}
 		panelp->refreshUI();
diff --git a/linden/indra/newview/llfloaterfriends.h b/linden/indra/newview/llfloaterfriends.h
index 6ce57f6..7444d93 100644
--- a/linden/indra/newview/llfloaterfriends.h
+++ b/linden/indra/newview/llfloaterfriends.h
@@ -38,6 +38,7 @@
 #include "llstring.h"
 #include "lluuid.h"
 #include "lltimer.h"
+#include "llcallingcard.h"
 
 class LLFriendObserver;
 class LLRelationship;
@@ -79,7 +80,7 @@ public:
 
 	// Just request friendship, no dialog.
 	static void requestFriendship(const LLUUID& target_id,
-								  const LLString& target_name);
+								  const std::string& target_name, const std::string& message);
 
 private:
 
@@ -96,8 +97,9 @@ private:
 
 	// protected members
 	typedef std::map<LLUUID, S32> rights_map_t;
-	void reloadNames();
-	void refreshNames();
+	void refreshNames(U32 changed_mask);
+	BOOL refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies);
+	BOOL refreshNamesPresence(const LLAvatarTracker::buddy_map_t & all_buddies);
 	void refreshUI();
 	void refreshRightsChangeList();
 	void applyRightsToFriends();
@@ -117,7 +119,7 @@ private:
 
 	// callback methods
 	static void onSelectName(LLUICtrl* ctrl, void* user_data);
-	static void callbackAddFriend(S32 option, void* user_data);
+	static void callbackAddFriend(S32 option, const std::string& text, void* user_data);
 	static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data);
 	static void onMaximumSelect(void* user_data);
 
@@ -138,7 +140,7 @@ private:
 	// member data
 	LLFriendObserver* mObserver;
 	LLUUID mAddFriendID;
-	LLString mAddFriendName;
+	std::string mAddFriendName;
 	LLScrollListCtrl* mFriendsList;
 	BOOL mShowMaxSelectWarning;
 	BOOL mAllowRightsChange;
diff --git a/linden/indra/newview/llfloatergesture.cpp b/linden/indra/newview/llfloatergesture.cpp
index e62a589..5383813 100644
--- a/linden/indra/newview/llfloatergesture.cpp
+++ b/linden/indra/newview/llfloatergesture.cpp
@@ -65,7 +65,7 @@ LLFloaterGestureObserver* LLFloaterGesture::sObserver = NULL;
 
 BOOL item_name_precedes( LLInventoryItem* a, LLInventoryItem* b )
 {
-	return LLString::precedesDict( a->getName(), b->getName() );
+	return LLStringUtil::precedesDict( a->getName(), b->getName() );
 }
 
 class LLFloaterGestureObserver : public LLGestureManagerObserver
@@ -80,7 +80,7 @@ public:
 // LLFloaterGesture
 //---------------------------------------------------------------------------
 LLFloaterGesture::LLFloaterGesture()
-:	LLFloater("Gesture Floater")
+:	LLFloater(std::string("Gesture Floater"))
 {
 	sInstance = this;
 
@@ -105,7 +105,7 @@ LLFloaterGesture::~LLFloaterGesture()
 // virtual
 BOOL LLFloaterGesture::postBuild()
 {
-	LLString label;
+	std::string label;
 
 	// Translate title
 	label = getTitle();
@@ -159,7 +159,7 @@ void LLFloaterGesture::show()
 	if (list)
 	{
 		const BOOL ascending = TRUE;
-		list->sortByColumn("name", ascending);
+		list->sortByColumn(std::string("name"), ascending);
 		list->selectFirstItem();
 	}
 	
@@ -236,7 +236,7 @@ void LLFloaterGesture::buildGestureList()
 			item_name = item->getName();
 		}
 
-		LLString font_style = "NORMAL";
+		std::string font_style = "NORMAL";
 		// If gesture is playing, bold it
 
 		LLSD element;
@@ -254,8 +254,8 @@ void LLFloaterGesture::buildGestureList()
 			element["columns"][0]["font"] = "SANSSERIF";
 			element["columns"][0]["font-style"] = font_style;
 
-			LLString key_string = LLKeyboard::stringFromKey(gesture->mKey);
-			LLString buffer;
+			std::string key_string = LLKeyboard::stringFromKey(gesture->mKey);
+			std::string buffer;
 
 			{
 				if (gesture->mKey == KEY_NONE)
@@ -356,22 +356,22 @@ void LLFloaterGesture::onClickPlay(void* data)
 class GestureShowCallback : public LLInventoryCallback
 {
 public:
-	GestureShowCallback(LLString &title)
+	GestureShowCallback(std::string &title)
 	{
 		mTitle = title;
 	}
 	void fire(const LLUUID &inv_item)
 	{
-		LLPreviewGesture::show(mTitle.c_str(), inv_item, LLUUID::null);
+		LLPreviewGesture::show(mTitle, inv_item, LLUUID::null);
 	}
 private:
-	LLString mTitle;
+	std::string mTitle;
 };
 
 // static
 void LLFloaterGesture::onClickNew(void* data)
 {
-	LLString title("Gesture: ");
+	std::string title("Gesture: ");
 	title.append("New Gesture");
 	LLPointer<LLInventoryCallback> cb = new GestureShowCallback(title);
 	create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
@@ -392,7 +392,7 @@ void LLFloaterGesture::onClickEdit(void* data)
 	LLInventoryItem* item = gInventory.getItem(item_id);
 	if (!item) return;
 
-	LLString title("Gesture: ");
+	std::string title("Gesture: ");
 	title.append(item->getName());
 
 	LLPreviewGesture* previewp = LLPreviewGesture::show(title, item_id, LLUUID::null);
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index 3965c8b..9a78fff 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -115,7 +115,7 @@ void LLFloaterGodTools::refreshAll()
 
 
 LLFloaterGodTools::LLFloaterGodTools()
-:	LLFloater("godtools floater"),
+:	LLFloater(std::string("godtools floater")),
 	mCurrentHost(LLHost::invalid),
 	mUpdateTimer()
 {
@@ -224,7 +224,7 @@ void LLFloaterGodTools::show(void *)
 	}
 }
 
-void LLFloaterGodTools::showPanel(const LLString& panel_name)
+void LLFloaterGodTools::showPanel(const std::string& panel_name)
 {
 	childShowTab("GodTools Tabs", panel_name);
 	open();	/*Flawfinder: ignore*/
@@ -258,7 +258,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
 	U32 region_flags;
 	U8 sim_access;
 	U8 agent_limit;
-	char sim_name[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string sim_name;
 	U32 estate_id;
 	U32 parent_estate_id;
 	F32 water_height;
@@ -271,7 +271,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
 	S32 redirect_grid_y;
 	LLUUID cache_id;
 
-	msg->getStringFast(_PREHASH_RegionInfo, _PREHASH_SimName, MAX_STRING, sim_name);
+	msg->getStringFast(_PREHASH_RegionInfo, _PREHASH_SimName, sim_name);
 	msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_EstateID, estate_id);
 	msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_ParentEstateID, parent_estate_id);
 	msg->getU32Fast(_PREHASH_RegionInfo, _PREHASH_RegionFlags, region_flags);
@@ -375,7 +375,7 @@ void LLFloaterGodTools::sendGodUpdateRegionInfo()
 		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
 		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 		msg->nextBlockFast(_PREHASH_RegionInfo);
-		msg->addStringFast(_PREHASH_SimName, rtool->getSimName().c_str());
+		msg->addStringFast(_PREHASH_SimName, rtool->getSimName());
 		msg->addU32Fast(_PREHASH_EstateID, rtool->getEstateID());
 		msg->addU32Fast(_PREHASH_ParentEstateID, rtool->getParentEstateID());
 		msg->addU32Fast(_PREHASH_RegionFlags, computeRegionFlags());
@@ -707,7 +707,7 @@ S32 LLPanelRegionTools::getPricePerMeter() const
 	return childGetValue("land cost");
 }
 
-void LLPanelRegionTools::setSimName(char *name)
+void LLPanelRegionTools::setSimName(const std::string& name)
 {
 	childSetValue("region name", name);
 }
@@ -924,13 +924,13 @@ void LLPanelGridTools::onClickKickAll(void* userdata)
 	gFloaterView->getNewFloaterPosition(&left, &top);
 	LLRect rect(left, top, left+400, top-300);
 
-	gViewerWindow->alertXmlEditText("KickAllUsers", LLString::format_map_t(),
+	gViewerWindow->alertXmlEditText("KickAllUsers", LLStringUtil::format_map_t(),
 									NULL, NULL,
 									LLPanelGridTools::confirmKick, self);
 }
 
 
-void LLPanelGridTools::confirmKick(S32 option, const LLString& text, void* userdata)
+void LLPanelGridTools::confirmKick(S32 option, const std::string& text, void* userdata)
 {
 	LLPanelGridTools* self = (LLPanelGridTools*) userdata;
 
@@ -957,7 +957,7 @@ void LLPanelGridTools::finishKick(S32 option, void* userdata)
 		msg->addUUIDFast(_PREHASH_GodSessionID, gAgent.getSessionID());
 		msg->addUUIDFast(_PREHASH_AgentID,   LL_UUID_ALL_AGENTS );
 		msg->addU32("KickFlags", KICK_FLAGS_DEFAULT );
-		msg->addStringFast(_PREHASH_Reason,    self->mKickMessage.c_str() );
+		msg->addStringFast(_PREHASH_Reason,    self->mKickMessage );
 		gAgent.sendReliableMessage();
 	}
 }
@@ -1182,7 +1182,7 @@ void LLPanelObjectTools::onClickDeletePublicOwnedBy(void* userdata)
 		panelp->mSimWideDeletesFlags = 
 			SWD_SCRIPTED_ONLY | SWD_OTHERS_LAND_ONLY;
 
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[AVATAR_NAME]"] = panelp->childGetValue("target_avatar_name").asString();
 
 		gViewerWindow->alertXml( "GodDeleteAllScriptedPublicObjectsByUser",
@@ -1201,7 +1201,7 @@ void LLPanelObjectTools::onClickDeleteAllScriptedOwnedBy(void* userdata)
 	{
 		panelp->mSimWideDeletesFlags = SWD_SCRIPTED_ONLY;
 
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[AVATAR_NAME]"] = panelp->childGetValue("target_avatar_name").asString();
 
 		gViewerWindow->alertXml( "GodDeleteAllScriptedObjectsByUser",
@@ -1220,7 +1220,7 @@ void LLPanelObjectTools::onClickDeleteAllOwnedBy(void* userdata)
 	{
 		panelp->mSimWideDeletesFlags = 0;
 
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[AVATAR_NAME]"] = panelp->childGetValue("target_avatar_name").asString();
 
 		gViewerWindow->alertXml( "GodDeleteAllObjectsByUser",
@@ -1260,12 +1260,12 @@ void LLPanelObjectTools::onClickSetBySelection(void* data)
 	LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, non_root_ok);
 	if (!node) return;
 
-	LLString owner_name;
+	std::string owner_name;
 	LLUUID owner_id;
 	LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
 	panelp->mTargetAvatar = owner_id;
-	LLString name = "Object " + node->mName + " owned by " + owner_name;
+	std::string name = "Object " + node->mName + " owned by " + owner_name;
 	panelp->childSetValue("target_avatar_name", name);
 }
 
@@ -1314,8 +1314,8 @@ void LLPanelObjectTools::onApplyChanges(void* userdata)
 // LLPanelRequestTools
 // --------------------
 
-const char SELECTION[] = "Selection";
-const char AGENT_REGION[] = "Agent Region";
+const std::string SELECTION = "Selection";
+const std::string AGENT_REGION = "Agent Region";
 
 LLPanelRequestTools::LLPanelRequestTools(const std::string& name):
 	LLPanel(name)
@@ -1348,7 +1348,7 @@ void LLPanelRequestTools::refresh()
 		 iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
 	{
 		LLViewerRegion* regionp = *iter;
-		LLString name = regionp->getName();
+		std::string name = regionp->getName();
 		if (!name.empty())
 		{
 			list->addSimpleElement(name);
@@ -1366,8 +1366,8 @@ void LLPanelRequestTools::refresh()
 
 
 // static
-void LLPanelRequestTools::sendRequest(const char *request, 
-									  const char *parameter, 
+void LLPanelRequestTools::sendRequest(const std::string& request, 
+									  const std::string& parameter, 
 									  const LLHost& host)
 {
 	llinfos << "Sending request '" << request << "', '"
@@ -1437,7 +1437,7 @@ void LLPanelRequestTools::sendRequest(const LLHost& host)
 	std::string req = childGetValue("request");
 	if (req == "terrain download")
 	{
-		gXferManager->requestFile("terrain.raw", "terrain.raw", LL_PATH_NONE,
+		gXferManager->requestFile(std::string("terrain.raw"), std::string("terrain.raw"), LL_PATH_NONE,
 								  host,
 								  FALSE,
 								  terrain_download_done,
@@ -1446,7 +1446,7 @@ void LLPanelRequestTools::sendRequest(const LLHost& host)
 	else
 	{
 		req = req.substr(0, req.find_first_of(" "));
-		sendRequest(req.c_str(), childGetValue("parameter").asString().c_str(), host);
+		sendRequest(req, childGetValue("parameter").asString(), host);
 	}
 }
 
diff --git a/linden/indra/newview/llfloatergodtools.h b/linden/indra/newview/llfloatergodtools.h
index 301c8ec..4fd9fc1 100644
--- a/linden/indra/newview/llfloatergodtools.h
+++ b/linden/indra/newview/llfloatergodtools.h
@@ -81,7 +81,7 @@ public:
 
 	static void refreshAll();
 
-	void showPanel(const LLString& panel_name);
+	void showPanel(const std::string& panel_name);
 
 	virtual void onClose(bool app_quitting);
 
@@ -164,7 +164,7 @@ public:
 	S32 getRedirectGridY() const;
 
 	// set internal checkboxes/spinners/combos 
-	void setSimName(char *name);
+	void setSimName(const std::string& name);
 	void setEstateID(U32 id);
 	void setParentEstateID(U32 id);
 	void setCheckFlags(U32 flags);
@@ -201,14 +201,14 @@ public:
 	void refresh();
 
 	static void onClickKickAll(void *data);
-	static void confirmKick(S32 option, const LLString& text, void* userdata);
+	static void confirmKick(S32 option, const std::string& text, void* userdata);
 	static void finishKick(S32 option, void* userdata);
 	static void onDragSunPhase(LLUICtrl *ctrl, void *userdata);
 	static void onClickFlushMapVisibilityCaches(void* data);
 	static void flushMapVisibilityCachesConfirm(S32 option, void* data);
 
 protected:
-	LLString        mKickMessage; // Message to send on kick
+	std::string        mKickMessage; // Message to send on kick
 };
 
 
@@ -268,8 +268,8 @@ public:
 
 	void refresh();
 
-	static void sendRequest(const char* request, 
-							const char* parameter, 
+	static void sendRequest(const std::string& request, 
+							const std::string& parameter, 
 							const LLHost& host);
 
 protected:
diff --git a/linden/indra/newview/llfloatergroupinfo.cpp b/linden/indra/newview/llfloatergroupinfo.cpp
index c657988..a095a64 100644
--- a/linden/indra/newview/llfloatergroupinfo.cpp
+++ b/linden/indra/newview/llfloatergroupinfo.cpp
@@ -185,7 +185,7 @@ void LLFloaterGroupInfo::refreshGroup(const LLUUID& group_id)
 }
 
 // static
-void LLFloaterGroupInfo::callbackLoadGroupName(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* data)
+void LLFloaterGroupInfo::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
 {
 	LLFloaterGroupInfo *fgi = get_if_there(sInstances, id, (LLFloaterGroupInfo*)NULL);
 
@@ -230,12 +230,12 @@ void LLFloaterGroupInfo::showFromUUID(const LLUUID& group_id,
 }
 
 // static 
-void LLFloaterGroupInfo::showNotice(const char* subject,
-							const char* message,
-							const LLUUID& group_id,
-							const bool& has_inventory,
-							const char* inventory_name,
-							LLOfferInfo* inventory_offer)
+void LLFloaterGroupInfo::showNotice(const std::string& subject,
+									const std::string& message,
+									const LLUUID& group_id,
+									const bool& has_inventory,
+									const std::string& inventory_name,
+									LLOfferInfo* inventory_offer)
 {
 	llinfos << "LLFloaterGroupInfo::showNotice : " << subject << llendl;
 
diff --git a/linden/indra/newview/llfloatergroupinfo.h b/linden/indra/newview/llfloatergroupinfo.h
index 28ff628..2ce7102 100644
--- a/linden/indra/newview/llfloatergroupinfo.h
+++ b/linden/indra/newview/llfloatergroupinfo.h
@@ -57,12 +57,12 @@ public:
 	static void closeGroup(const LLUUID& group_id);
 	static void refreshGroup(const LLUUID& group_id);
 
-	static void showNotice(const char* subject,
-							 const char* message,
-							 const LLUUID& group_id,
-							 const bool& has_inventory,
-							 const char* inventory_name,
-							 LLOfferInfo* inventory_offer);
+	static void showNotice(const std::string& subject,
+						   const std::string& message,
+						   const LLUUID& group_id,
+						   const bool& has_inventory,
+						   const std::string& inventory_name,
+						   LLOfferInfo* inventory_offer);
 
 	LLUUID		getGroupID() { return mGroupID;}
 
@@ -75,7 +75,7 @@ protected:
 	LLFloaterGroupInfo(const std::string& name, const LLRect &rect, const std::string& title, const LLUUID& group_id = LLUUID::null, const std::string& tab_name = std::string());
 
 private:
-	static void callbackLoadGroupName(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* data);
+	static void callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data);
 	static std::map<LLUUID, LLFloaterGroupInfo*> sInstances;
 
 	LLUUID			mGroupID;
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index ba8e650..643abf7 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -57,9 +57,10 @@ public:
 //
 std::map<LLUUID, LLFloaterGroupInvite*> LLFloaterGroupInvite::impl::sInstances;
 
-LLFloaterGroupInvite::impl::impl(const LLUUID& group_id)
+LLFloaterGroupInvite::impl::impl(const LLUUID& group_id) :
+	mGroupID(group_id),
+	mInvitePanelp(NULL)
 {
-	mGroupID = group_id;
 }
 
 LLFloaterGroupInvite::impl::~impl()
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index f6e226d..c0ea9df 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -389,7 +389,7 @@ void LLPanelGroups::leave()
 		if(i < count)
 		{
 			LLUUID* cb_data = new LLUUID((const LLUUID&)group_id);
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[GROUP]"] = gAgent.mGroups.get(i).mName;
 			gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callbackLeaveGroup, (void*)cb_data);
 		}
@@ -440,7 +440,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
 		LLGroupData* group_datap = &gAgent.mGroups.get(i);
 		if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0))
 		{
-			LLString style = "NORMAL";
+			std::string style = "NORMAL";
 			if(highlight_id == id)
 			{
 				style = "BOLD";
@@ -459,7 +459,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
 
 	// add "none" to list at top
 	{
-		LLString style = "NORMAL";
+		std::string style = "NORMAL";
 		if (highlight_id.isNull())
 		{
 			style = "BOLD";
diff --git a/linden/indra/newview/llfloaterhardwaresettings.cpp b/linden/indra/newview/llfloaterhardwaresettings.cpp
index 1f0a68f..ec29469 100644
--- a/linden/indra/newview/llfloaterhardwaresettings.cpp
+++ b/linden/indra/newview/llfloaterhardwaresettings.cpp
@@ -47,7 +47,7 @@
 
 LLFloaterHardwareSettings* LLFloaterHardwareSettings::sHardwareSettings = NULL;
 
-LLFloaterHardwareSettings::LLFloaterHardwareSettings() : LLFloater("Hardware Settings Floater")
+LLFloaterHardwareSettings::LLFloaterHardwareSettings() : LLFloater(std::string("Hardware Settings Floater"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hardware_settings.xml");
 	
diff --git a/linden/indra/newview/llfloaterhtml.cpp b/linden/indra/newview/llfloaterhtml.cpp
index 2ad9307..eb09754 100644
--- a/linden/indra/newview/llfloaterhtml.cpp
+++ b/linden/indra/newview/llfloaterhtml.cpp
@@ -57,7 +57,7 @@ LLFloaterHtml* LLFloaterHtml::getInstance()
 ////////////////////////////////////////////////////////////////////////////////
 //
 LLFloaterHtml::LLFloaterHtml()
-:	LLFloater( "HTML Floater" )
+:	LLFloater( std::string("HTML Floater") )
 
         ,
 	mWebBrowser( 0 )
@@ -113,11 +113,11 @@ void LLFloaterHtml::draw()
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLFloaterHtml::show( LLString content_id, bool open_link_external, bool open_app_slurls )
+void LLFloaterHtml::show( std::string content_id, bool open_link_external, bool open_app_slurls )
 {
 	// calculate the XML labels we'll need (if only XML folders worked)
-	LLString title_str = content_id + "_title";
-	LLString url_str = content_id + "_url";
+	std::string title_str = content_id + "_title";
+	std::string url_str = content_id + "_url";
 
 	std::string title = getString( title_str );
 	std::string url = getString( url_str );
@@ -146,6 +146,13 @@ void LLFloaterHtml::show( std::string start_url, std::string title, bool open_li
 
 ////////////////////////////////////////////////////////////////////////////////
 //
+std::string LLFloaterHtml::getSupportUrl()
+{
+	return getString("support_page_url");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
 void LLFloaterHtml::onClose( bool app_quitting )
 {
 	setVisible( false );
diff --git a/linden/indra/newview/llfloaterhtml.h b/linden/indra/newview/llfloaterhtml.h
index 9826988..e236ffe 100644
--- a/linden/indra/newview/llfloaterhtml.h
+++ b/linden/indra/newview/llfloaterhtml.h
@@ -49,12 +49,14 @@ class LLFloaterHtml :
 		virtual void onClose( bool app_quitting );
 		
 		// Pass string like "in-world_help" or "additional help"
-		void show( LLString content_id, bool open_link_external, bool open_app_slurls );
+		void show( std::string content_id, bool open_link_external, bool open_app_slurls );
 
 		// Pass raw URL and window title
 		// Can be set to handle secondlife:///app/ URLs, but this should
 		// usually be false.
 		void show( std::string start_url, std::string title, bool open_link_external, bool open_app_slurls );
+
+		std::string getSupportUrl(); 
 		
 		static void onClickClose( void* data );
 		static void onClickBack( void* data );
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 0968734..d6d249e 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -32,6 +32,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfloaterhtmlhelp.h"
+#include "llfloaterhtml.h"
 
 #include "llparcel.h"
 #include "lluictrlfactory.h"
@@ -122,7 +123,7 @@ void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
 	// hitting the refresh button will navigate to same URL, so don't add to address history
 	mCurrentURL = eventIn.getStringValue();
 	std::string::size_type string_start = mCurrentURL.find("://");
-	LLString truncated_url;
+	std::string truncated_url;
 	if ((string_start == std::string::npos) || (1)) // NOTE: this conditional is forced true to disable truncation DEV-9834
 	{
 		truncated_url = mCurrentURL;
@@ -224,10 +225,10 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
 		return;
 	}
 	std::string media_url = self->mAddressCombo->getValue().asString();
-	LLString::trim(media_url);
+	LLStringUtil::trim(media_url);
 
-	parcel->setMediaURL(media_url.c_str());
-	parcel->setMediaType("text/html");
+	parcel->setMediaURL(media_url);
+	parcel->setMediaType(std::string("text/html"));
 
 	// Send current parcel data upstream to server 
 	LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel, true );
@@ -278,8 +279,9 @@ protected:
 	LLButton* mForwardButton;
 	LLButton* mCloseButton;
 	LLTextBox* mStatusText;
-	LLString mStatusTextContents;
-	LLString mCurrentUrl;
+	std::string mStatusTextContents;
+	std::string mCurrentUrl;
+	std::string mSupportUrl;
 };
 
 LLFloaterHtmlHelp* LLFloaterHtmlHelp::sInstance = 0;
@@ -289,10 +291,10 @@ BOOL LLFloaterHtmlHelp::sFloaterOpened = FALSE;
 ////////////////////////////////////////////////////////////////////////////////
 //
 LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
-:	LLFloater( "HTML Help" ),
+:	LLFloater( std::string("HTML Help") ),
 	mWebBrowser( 0 ),
-	mStatusTextContents( "" ),
-	mCurrentUrl( "" )
+	mStatusTextContents( LLStringUtil::null ),
+	mCurrentUrl( LLStringUtil::null )
 {
 	sInstance = this;
 		
@@ -302,7 +304,7 @@ LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
 	childSetAction("back_btn", onClickBack, this);
 	childSetAction("home_btn", onClickHome, this);
 	childSetAction("forward_btn", onClickForward, this);
-	
+
 	if (!title.empty())
 	{
 		setTitle(title);
@@ -323,7 +325,7 @@ LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
 			// if the last page we were at before the client was closed is valid, go there and
 			// override what is in the XML file
 			// (not when the window was closed - it's only ever hidden - not closed)
-			LLString lastPageUrl = gSavedSettings.getString( "HtmlHelpLastPage" );
+			std::string lastPageUrl = gSavedSettings.getString( "HtmlHelpLastPage" );
 			if ( lastPageUrl != "" )
 			{
 				mWebBrowser->navigateTo( lastPageUrl );
@@ -372,67 +374,28 @@ void LLFloaterHtmlHelp::draw()
 //
 void LLFloaterHtmlHelp::show(std::string url, std::string title)
 {
-    gViewerWindow->alertXml("ClickOpenF1Help", onClickF1HelpLoadURL, (void*) NULL);
+	LLFloaterHtml* floater_html = LLFloaterHtml::getInstance();
+	floater_html->setVisible(FALSE);
 
-	// switching this out for the moment - will come back later
-	// want it still to be compiled so not using comments of #if 0
-	if ( false )
+	if(url.empty())
 	{
-		sFloaterOpened = true;
-
-		if ( sInstance )
-		{
-			if (sInstance->mWebBrowser)
-			{
-				sInstance->mWebBrowser->navigateTo(url);
-			}
-			sInstance->setVisibleAndFrontmost();
-			return;
-		}
+		url = floater_html->getSupportUrl();
+	}
+	std::string* url_copy = new std::string(url);
 
-		LLFloaterHtmlHelp* self = new LLFloaterHtmlHelp(url, title);
+    gViewerWindow->alertXml("ClickOpenF1Help", onClickF1HelpLoadURL, url_copy);
 
-		// reposition floater from saved settings
-		LLRect rect = gSavedSettings.getRect( "HtmlHelpRect" );
-		self->reshape( rect.getWidth(), rect.getHeight(), FALSE );
-		self->setRect( rect );
-	};
 }
 
 // static 
 void LLFloaterHtmlHelp::onClickF1HelpLoadURL(S32 option, void* userdata)
 {
-	if (option == 0)
+	std::string* urlp = (std::string*)userdata;
+	if (0 == option)
 	{
-		// choose HELP url based on selected language - default to english language support page
-		LLString lang = LLUI::sConfigGroup->getString("Language");
-
-		// this sucks but there isn't a way to grab an arbitrary string from an XML file
-		// (using llcontroldef strings causes problems if string don't exist)
-		LLString help_url( "http://secondlife.com/support" );
-		if ( lang == "ja" )
-			help_url = "http://help.secondlife.com/jp";
-		else
-		if ( lang == "ko" )
-			help_url = "http://help.secondlife.com/kr";
-		else
-		if ( lang == "pt" )
-			help_url = "http://help.secondlife.com/pt";
-		else
-		if ( lang == "de" )
-			help_url = "http://de.secondlife.com/support";
-		else
-		if ( lang == "es" )
-			help_url = "http://secondlife.com/app/support/index_es.html";
-		else
-		if ( lang == "fr" )
-			help_url = "http://secondlife.com/app/support/index_fr.html";
-		else
-		if ( lang == "zh" )
-			help_url = "http://secondlife.com/app/support/index_zh.html";		
-
-		LLWeb::loadURL( help_url );
-	};
+		LLWeb::loadURL(urlp->c_str());
+	}
+	delete urlp;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -499,7 +462,7 @@ void LLFloaterHtmlHelp::onClickForward( void* data )
 //
 void LLFloaterHtmlHelp::onStatusTextChange( const EventType& eventIn )
 {
-	mStatusTextContents = LLString( eventIn.getStringValue() );
+	mStatusTextContents = std::string( eventIn.getStringValue() );
 
 	childSetText("status_text", mStatusTextContents);
 }
@@ -509,7 +472,7 @@ void LLFloaterHtmlHelp::onStatusTextChange( const EventType& eventIn )
 void LLFloaterHtmlHelp::onLocationChange( const EventType& eventIn )
 {
 	llinfos << "MOZ> Location changed to " << eventIn.getStringValue() << llendl;
-	mCurrentUrl = LLString( eventIn.getStringValue() );
+	mCurrentUrl = std::string( eventIn.getStringValue() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp
index 3ec08e3..cfdaba5 100644
--- a/linden/indra/newview/llfloaterhud.cpp
+++ b/linden/indra/newview/llfloaterhud.cpp
@@ -32,11 +32,15 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfloaterhud.h"
+
+// Viewer libs
 #include "llviewercontrol.h"
-#include "lluictrlfactory.h"
 #include "llwebbrowserctrl.h"
 #include "llalertdialog.h"
 
+// Linden libs
+#include "lluictrlfactory.h"
+
 // statics 
 LLFloaterHUD* LLFloaterHUD::sInstance = 0; 
 
@@ -47,7 +51,7 @@ LLFloaterHUD* LLFloaterHUD::sInstance = 0;
 
 // Default constructor
 LLFloaterHUD::LLFloaterHUD()
-:	LLFloater("floater_hud"),
+:	LLFloater(std::string("floater_hud")),
 	mWebBrowser(0)
 {
 	// Create floater from its XML definition
@@ -80,7 +84,7 @@ LLFloaterHUD::LLFloaterHUD()
 		// arrow keys during tutorial).
 		mWebBrowser->setTakeFocusOnClick(false);
 
-		LLString language(gSavedSettings.getString("Language"));
+		std::string language(gSavedSettings.getString("Language"));
 		if(language == "default")
 		{
 			language = gSavedSettings.getString("SystemLanguage");
@@ -120,7 +124,7 @@ LLFloaterHUD::~LLFloaterHUD()
 }
 
 // Show the HUD
-void LLFloaterHUD::show()
+void LLFloaterHUD::showHUD()
 {
 	// do not build the floater if there the url is empty
 	if (gSavedSettings.getString("TutorialURL") == "")
@@ -135,7 +139,12 @@ void LLFloaterHUD::show()
 	hud->setFrontmost(FALSE);
 }
 
-void LLFloaterHUD::close()
+// Save our visibility state on close in case the user accidentally
+// quit the application while the tutorial was visible.
+// virtual
+void LLFloaterHUD::onClose(bool app_quitting)
 {
-	if (sInstance) sInstance->close();
+	bool stay_visible = app_quitting;
+	gSavedSettings.setBOOL("ShowTutorial", stay_visible);
+	destroy();
 }
diff --git a/linden/indra/newview/llfloaterhud.h b/linden/indra/newview/llfloaterhud.h
index a0b1d9f..35221ef 100644
--- a/linden/indra/newview/llfloaterhud.h
+++ b/linden/indra/newview/llfloaterhud.h
@@ -1,6 +1,6 @@
 /** 
  * @file llfloaterhud.h
- * @brief The HUD floater
+ * @brief A floater showing the HUD tutorial
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
  * 
@@ -36,28 +36,23 @@
 
 class LLWebBrowserCtrl;
 
-//=============================================================================
-//
-//	CLASS		LLFloaterHUD
-
 class LLFloaterHUD : public LLFloater
-
-/*!	@brief		A floater showing the HUD tutorial
-*/
 {
 public:
 	static LLFloaterHUD* getInstance(); ///< get instance creating if necessary
-	virtual ~LLFloaterHUD(); ///< virtual destructor
 
-	static void show(); ///< show the HUD
-	static void close(); ///< close the HUD (destroys floater)
+	static void showHUD(); ///< show the HUD
 
-protected:
-	LLWebBrowserCtrl* mWebBrowser; ///< the actual web browser control
+	// Save our visibility state during close
+	/*virtual*/ void onClose(bool app_quitting);
 
-	LLFloaterHUD(); ///< default constructor
+private:
+	// Handles its own construction and destruction, so private.
+	LLFloaterHUD();
+	/*virtual*/ ~LLFloaterHUD();
 
 private:
+	LLWebBrowserCtrl* mWebBrowser; ///< the actual web browser control
 	static LLFloaterHUD* sInstance;
 };
 
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index ccd7737..92e8ad1 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -45,6 +45,7 @@
 #include "lldrawpoolavatar.h"
 #include "llrender.h"
 #include "llface.h"
+#include "llfocusmgr.h"
 #include "lltextbox.h"
 #include "lltoolmgr.h"
 #include "llui.h"
@@ -54,6 +55,7 @@
 #include "pipeline.h"
 #include "lluictrlfactory.h"
 #include "llviewerimagelist.h"
+#include "llstring.h"
 
 //static
 S32 LLFloaterImagePreview::sUploadAmount = 10;
@@ -68,13 +70,13 @@ const S32 PREVIEW_TEXTURE_HEIGHT = 300;
 //-----------------------------------------------------------------------------
 // LLFloaterImagePreview()
 //-----------------------------------------------------------------------------
-LLFloaterImagePreview::LLFloaterImagePreview(const char* filename) : 
+LLFloaterImagePreview::LLFloaterImagePreview(const std::string& filename) : 
 	LLFloaterNameDesc(filename)
 {
 	mLastMouseX = 0;
 	mLastMouseY = 0;
 	mGLName = 0;
-	loadImage(mFilenameAndPath.c_str());
+	loadImage(mFilenameAndPath);
 }
 
 //-----------------------------------------------------------------------------
@@ -314,28 +316,25 @@ void LLFloaterImagePreview::draw()
 //-----------------------------------------------------------------------------
 // loadImage()
 //-----------------------------------------------------------------------------
-bool LLFloaterImagePreview::loadImage(const char *src_filename)
+bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
 {
-	// U32 length = strlen(src_filename);
-	const char* ext = strrchr(src_filename, '.');
-	char error_message[MAX_STRING];
-	error_message[0] = '\0';
-
+	std::string exten = gDirUtilp->getExtension(src_filename);
+	
 	U32 codec = IMG_CODEC_INVALID;
-	LLString temp_str;
-	if( 0 == strnicmp(ext, ".bmp", 4) )
+	std::string temp_str;
+	if( exten == "bmp")
 	{
 		codec = IMG_CODEC_BMP;
 	}
-	else if( 0 == strnicmp(ext, ".tga", 4) )
+	else if( exten == "tga")
 	{
 		codec = IMG_CODEC_TGA;
 	}
-	else if( 0 == strnicmp(ext, ".jpg", 4) || 0 == strnicmp(ext, ".jpeg", 5))
+	else if( exten == "jpg" || exten == "jpeg")
 	{
 		codec = IMG_CODEC_JPEG;
 	}
-	else if( 0 == strnicmp(ext, ".png", 4) )
+	else if( exten == "png" )
 	{
 		codec = IMG_CODEC_PNG;
 	}
@@ -429,7 +428,7 @@ BOOL LLFloaterImagePreview::handleMouseDown(S32 x, S32 y, MASK mask)
 	if (mPreviewRect.pointInRect(x, y))
 	{
 		bringToFront( x, y );
-		gViewerWindow->setMouseCapture(this);
+		gFocusMgr.setMouseCapture(this);
 		gViewerWindow->hideCursor();
 		mLastMouseX = x;
 		mLastMouseY = y;
@@ -444,7 +443,7 @@ BOOL LLFloaterImagePreview::handleMouseDown(S32 x, S32 y, MASK mask)
 //-----------------------------------------------------------------------------
 BOOL LLFloaterImagePreview::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-	gViewerWindow->setMouseCapture(FALSE);
+	gFocusMgr.setMouseCapture(FALSE);
 	gViewerWindow->showCursor();
 	return LLFloater::handleMouseUp(x, y, mask);
 }
@@ -629,7 +628,7 @@ LLImagePreviewAvatar::~LLImagePreviewAvatar()
 }
 
 
-void LLImagePreviewAvatar::setPreviewTarget(const char* joint_name, const char* mesh_name, LLImageRaw* imagep, F32 distance, BOOL male) 
+void LLImagePreviewAvatar::setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, BOOL male) 
 { 
 	mTargetJoint = mDummyAvatar->mRoot.findJoint(joint_name);
 	// clear out existing test mesh
diff --git a/linden/indra/newview/llfloaterimagepreview.h b/linden/indra/newview/llfloaterimagepreview.h
index 8cf9b85..9d80f09 100644
--- a/linden/indra/newview/llfloaterimagepreview.h
+++ b/linden/indra/newview/llfloaterimagepreview.h
@@ -76,7 +76,7 @@ public:
 	LLImagePreviewAvatar(S32 width, S32 height);
 	virtual ~LLImagePreviewAvatar();
 
-	void setPreviewTarget(const char* joint_name, const char *mesh_name, LLImageRaw* imagep, F32 distance, BOOL male);
+	void setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, BOOL male);
 	void setTexture(U32 name) { mTextureName = name; }
 
 	BOOL	render();
@@ -102,7 +102,7 @@ protected:
 class LLFloaterImagePreview : public LLFloaterNameDesc
 {
 public:
-	LLFloaterImagePreview(const char* filename);
+	LLFloaterImagePreview(const std::string& filename);
 	virtual ~LLFloaterImagePreview();
 
 	virtual BOOL postBuild();
@@ -118,7 +118,7 @@ public:
 protected:
 	static void		onPreviewTypeCommit(LLUICtrl*,void*);
 	void			draw();
-	bool			loadImage(const char* filename);
+	bool			loadImage(const std::string& filename);
 
 	LLPointer<LLImageRaw> mRawImagep;
 	LLImagePreviewAvatar* mAvatarPreview;
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index ff0a2ee..d308210 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -45,7 +45,7 @@
 LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
 
 LLFloaterInspect::LLFloaterInspect(void) :
-	LLFloater("Inspect Object"),
+	LLFloater(std::string("Inspect Object")),
 	mDirty(FALSE)
 {
 	sInstance = this;
@@ -188,7 +188,7 @@ LLUUID LLFloaterInspect::getSelectedUUID()
 void LLFloaterInspect::refresh()
 {
 	LLUUID creator_id;
-	LLString creator_name;
+	std::string creator_name;
 	S32 pos = mObjectList->getScrollPos();
 	childSetEnabled("button owner", false);
 	childSetEnabled("button creator", false);
@@ -214,7 +214,7 @@ void LLFloaterInspect::refresh()
 		char time[MAX_STRING];
 		std::string owner_name, creator_name;
 		time_t timestamp = (time_t) (obj->mCreationDate/1000000);
-		LLString::copy(time, ctime(&timestamp), MAX_STRING);
+		LLStringUtil::copy(time, ctime(&timestamp), MAX_STRING);
 		time[24] = '\0';
 		gCacheName->getFullName(obj->mPermissions->getOwner(), owner_name);
 		gCacheName->getFullName(obj->mPermissions->getCreator(), creator_name);
@@ -225,7 +225,7 @@ void LLFloaterInspect::refresh()
 		// or top of the editable chain, for attachments
 		if(!(obj->getObject()->isRoot() || obj->getObject()->isRootEdit()))
 		{
-			row["columns"][0]["value"] = LLString("   ") + obj->mName;
+			row["columns"][0]["value"] = std::string("   ") + obj->mName;
 		}
 		else
 		{
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index 5323b35..e646eb5 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -46,7 +46,7 @@
 #include "llviewerjoystick.h"
 
 LLFloaterJoystick::LLFloaterJoystick(const LLSD& data)
-	: LLFloater("floater_joystick")
+	: LLFloater(std::string("floater_joystick"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_joystick.xml");
 	center();
diff --git a/linden/indra/newview/llfloaterlagmeter.cpp b/linden/indra/newview/llfloaterlagmeter.cpp
index f43427c..35e679d 100644
--- a/linden/indra/newview/llfloaterlagmeter.cpp
+++ b/linden/indra/newview/llfloaterlagmeter.cpp
@@ -45,12 +45,12 @@
 #include "llfocusmgr.h"
 #include "lltextbox.h"
 
-const LLString LAG_CRITICAL_IMAGE_NAME = "lag_status_critical.tga";
-const LLString LAG_WARNING_IMAGE_NAME  = "lag_status_warning.tga";
-const LLString LAG_GOOD_IMAGE_NAME     = "lag_status_good.tga";
+const std::string LAG_CRITICAL_IMAGE_NAME = "lag_status_critical.tga";
+const std::string LAG_WARNING_IMAGE_NAME  = "lag_status_warning.tga";
+const std::string LAG_GOOD_IMAGE_NAME     = "lag_status_good.tga";
 
 LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
-	:	LLFloater("floater_lagmeter")
+	:	LLFloater(std::string("floater_lagmeter"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_lagmeter.xml");
 
@@ -70,7 +70,7 @@ LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
 	mServerText = getChild<LLTextBox>("server_text");
 	mServerCause = getChild<LLTextBox>("server_lag_cause");
 
-	LLString config_string = getString("client_frame_rate_critical_fps", mStringArgs);
+	std::string config_string = getString("client_frame_rate_critical_fps", mStringArgs);
 	mClientFrameTimeCritical = 1.0f / (float)atof( config_string.c_str() );
 	config_string = getString("client_frame_rate_warning_fps", mStringArgs);
 	mClientFrameTimeWarning = 1.0f / (float)atof( config_string.c_str() );
@@ -152,7 +152,7 @@ void LLFloaterLagMeter::determineClient()
 	{
 		mClientButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
 		mClientText->setText( getString("client_frame_time_window_bg_msg", mStringArgs) );
-		mClientCause->setText( LLString::null );
+		mClientCause->setText( LLStringUtil::null );
 	}
 	else if(client_frame_time >= mClientFrameTimeCritical)
 	{
@@ -170,7 +170,7 @@ void LLFloaterLagMeter::determineClient()
 	{
 		mClientButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
 		mClientText->setText( getString("client_frame_time_normal_msg", mStringArgs) );
-		mClientCause->setText( LLString::null );
+		mClientCause->setText( LLStringUtil::null );
 	}	
 
 	if(find_cause)
@@ -241,7 +241,7 @@ void LLFloaterLagMeter::determineNetwork()
 	}
 	else
 	{
-		mNetworkCause->setText( LLString::null );
+		mNetworkCause->setText( LLStringUtil::null );
 	}
 }
 
@@ -266,7 +266,7 @@ void LLFloaterLagMeter::determineServer()
 	{
 		mServerButton->setImageUnselected(LAG_GOOD_IMAGE_NAME);
 		mServerText->setText( getString("server_frame_time_normal_msg", mStringArgs) );
-		mServerCause->setText( LLString::null );
+		mServerCause->setText( LLStringUtil::null );
 	}	
 
 	if(find_cause)
diff --git a/linden/indra/newview/llfloaterlagmeter.h b/linden/indra/newview/llfloaterlagmeter.h
index fe22bff..ae6c19f 100644
--- a/linden/indra/newview/llfloaterlagmeter.h
+++ b/linden/indra/newview/llfloaterlagmeter.h
@@ -75,7 +75,7 @@ private:
 	LLTextBox * mServerText;
 	LLTextBox * mServerCause;
 
-	LLString::format_map_t mStringArgs;
+	LLStringUtil::format_map_t mStringArgs;
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 0150f44..c5beb5c 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -31,6 +31,9 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include <sstream>
+#include <time.h>
+
 #include "llfloaterland.h"
 
 #include "llcachename.h"
@@ -70,39 +73,9 @@
 #include "llviewercontrol.h"
 #include "roles_constants.h"
 
-#include <sstream>
-#include <time.h>
-
-static const S32 EDIT_HEIGHT = 16;
-static const S32 LEFT = HPAD;
-static const S32 BOTTOM = VPAD;
-static const S32 RULER0  = LEFT;
-static const S32 RULER05 = RULER0 + 24;
-static const S32 RULER1  = RULER05 + 16;
-static const S32 RULER15 = RULER1 + 20;
-static const S32 RULER2  = RULER1 + 32;
-static const S32 RULER205= RULER2 + 32;
-static const S32 RULER20 = RULER2 + 64;
-static const S32 RULER21 = RULER20 + 16;
-static const S32 RULER22 = RULER21 + 32;
-static const S32 RULER225 = RULER20 + 64;
-static const S32 RULER23 = RULER22 + 64;
-static const S32 RULER24 = RULER23 + 26;
-static const S32 RULER3  = RULER2 + 102;
-static const S32 RULER4  = RULER3 + 8;
-static const S32 RULER5  = RULER4 + 50;
-static const S32 RULER6  = RULER5 + 52;
-static const S32 RULER7  = RULER6 + 24;
-static const S32 RIGHT  = LEFT + 278;
-static const S32 FAR_RIGHT  = LEFT + 324 + 40;
-
-static const char PRICE[] = "Price:";
-static const char NO_PRICE[] = "";
-static const char AREA[] = "Area:";
-
-static const char OWNER_ONLINE[] 	= "0";
-static const char OWNER_OFFLINE[]	= "1";
-static const char OWNER_GROUP[] 	= "2";
+static std::string OWNER_ONLINE 	= "0";
+static std::string OWNER_OFFLINE	= "1";
+static std::string OWNER_GROUP 		= "2";
 
 // constants used in callbacks below - syntactic sugar.
 static const BOOL BUY_GROUP_LAND = TRUE;
@@ -219,11 +192,11 @@ void LLFloaterLand::onClose(bool app_quitting)
 
 
 LLFloaterLand::LLFloaterLand(const LLSD& seed)
-:	LLFloater("floaterland", "FloaterLandRect5", "About Land")
+:	LLFloater(std::string("floaterland"), std::string("FloaterLandRect5"), std::string("About Land"))
 {
 
 
-	std::map<LLString, LLCallbackMap> factory_map;
+	LLCallbackMap::map_t factory_map;
 	factory_map["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this);
 
 	
@@ -325,7 +298,7 @@ void* LLFloaterLand::createPanelLandAccess(void* data)
 
 
 LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel)
-:	LLPanel("land_general_panel"),
+:	LLPanel(std::string("land_general_panel")),
 	mUncheckedSell(FALSE),
 	mParcel(parcel)
 {
@@ -458,12 +431,12 @@ void LLPanelLandGeneral::refresh()
 	{
 		// nothing selected, disable panel
 		mEditName->setEnabled(FALSE);
-		mEditName->setText(LLString::null);
+		mEditName->setText(LLStringUtil::null);
 
 		mEditDesc->setEnabled(FALSE);
-		mEditDesc->setText(LLString::null);
+		mEditDesc->setText(getString("no_selection_text"));
 
-		mTextSalePending->setText(LLString::null);
+		mTextSalePending->setText(LLStringUtil::null);
 		mTextSalePending->setEnabled(FALSE);
 
 		mBtnDeedToGroup->setEnabled(FALSE);
@@ -475,13 +448,13 @@ void LLPanelLandGeneral::refresh()
 		mCheckContributeWithDeed->set(FALSE);
 		mCheckContributeWithDeed->setEnabled(FALSE);
 
-		mTextOwner->setText(LLString::null);
+		mTextOwner->setText(LLStringUtil::null);
 		mBtnProfile->setLabel(getString("profile_text"));
 		mBtnProfile->setEnabled(FALSE);
 
-		mTextClaimDate->setText(LLString::null);
-		mTextGroup->setText(LLString::null);
-		mTextPrice->setText(LLString::null);
+		mTextClaimDate->setText(LLStringUtil::null);
+		mTextGroup->setText(LLStringUtil::null);
+		mTextPrice->setText(LLStringUtil::null);
 
 		mSaleInfoForSale1->setVisible(FALSE);
 		mSaleInfoForSale2->setVisible(FALSE);
@@ -491,8 +464,8 @@ void LLPanelLandGeneral::refresh()
 		mBtnSellLand->setVisible(FALSE);
 		mBtnStopSellLand->setVisible(FALSE);
 
-		mTextPriceLabel->setText(LLString::null);
-		mTextDwell->setText(LLString::null);
+		mTextPriceLabel->setText(LLStringUtil::null);
+		mTextDwell->setText(LLStringUtil::null);
 
 		mBtnBuyLand->setEnabled(FALSE);
 		mBtnBuyGroupLand->setEnabled(FALSE);
@@ -528,12 +501,12 @@ void LLPanelLandGeneral::refresh()
 		// Is it owned?
 		if (is_public)
 		{
-			mTextSalePending->setText(LLString::null);
+			mTextSalePending->setText(LLStringUtil::null);
 			mTextSalePending->setEnabled(FALSE);
 			mTextOwner->setText(getString("public_text"));
 			mTextOwner->setEnabled(FALSE);
 			mBtnProfile->setEnabled(FALSE);
-			mTextClaimDate->setText(LLString::null);
+			mTextClaimDate->setText(LLStringUtil::null);
 			mTextClaimDate->setEnabled(FALSE);
 			mTextGroup->setText(getString("none_text"));
 			mTextGroup->setEnabled(FALSE);
@@ -555,7 +528,7 @@ void LLPanelLandGeneral::refresh()
 			else
 			{
 				// not the owner, or it is leased
-				mTextSalePending->setText(LLString::null);
+				mTextSalePending->setText(LLStringUtil::null);
 				mTextSalePending->setEnabled(FALSE);
 			}
 			//refreshNames();
@@ -584,8 +557,7 @@ void LLPanelLandGeneral::refresh()
 			// Display claim date
 			// *TODO:Localize (Time format may need Translating)
 			time_t claim_date = parcel->getClaimDate();
-			char time_buf[TIME_STR_LENGTH];		/*Flawfinder: ignore*/
-			mTextClaimDate->setText(LLString(formatted_time(claim_date, time_buf)));
+			mTextClaimDate->setText(formatted_time(claim_date));
 			mTextClaimDate->setEnabled(is_leased);
 
 			BOOL enable_auction = (gAgent.getGodLevel() >= GOD_LIAISON)
@@ -718,11 +690,11 @@ void LLPanelLandGeneral::refreshNames()
 	LLParcel *parcel = mParcel->getParcel();
 	if (!parcel)
 	{
-		mTextOwner->setText(LLString::null);
+		mTextOwner->setText(LLStringUtil::null);
 		return;
 	}
 
-	LLString owner;
+	std::string owner;
 	if (parcel->getIsGroupOwned())
 	{
 		owner = getString("group_owned_text");
@@ -739,7 +711,7 @@ void LLPanelLandGeneral::refreshNames()
 	}
 	mTextOwner->setText(owner);
 
-	LLString group;
+	std::string group;
 	if(!parcel->getGroupID().isNull())
 	{
 		gCacheName->getGroupName(parcel->getGroupID(), group);
@@ -749,7 +721,7 @@ void LLPanelLandGeneral::refreshNames()
 	const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID();
 	if(auth_buyer_id.notNull())
 	{
-		LLString name;
+		std::string name;
 		gCacheName->getFullName(auth_buyer_id, name);
 		mSaleInfoForSale2->setTextArg("[BUYER]", name);
 	}
@@ -885,14 +857,14 @@ void LLPanelLandGeneral::onClickBuyPass(void* data)
 	if (!parcel) return;
 
 	S32 pass_price = parcel->getPassPrice();
-	LLString parcel_name = parcel->getName();
+	std::string parcel_name = parcel->getName();
 	F32 pass_hours = parcel->getPassHours();
 
-	char cost[256], time[256];		/*Flawfinder: ignore*/
-	snprintf(cost, sizeof(cost), "%d", pass_price);		/* Flawfinder: ignore */
-	snprintf(time, sizeof(time), "%.2f", pass_hours);			/* Flawfinder: ignore */
+	std::string cost, time;
+	cost = llformat("%d", pass_price);
+	time = llformat("%.2f", pass_hours);
 
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[COST]"] = cost;
 	args["[PARCEL_NAME]"] = parcel_name;
 	args["[TIME]"] = time;
@@ -952,8 +924,8 @@ void LLPanelLandGeneral::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	// Valid data from UI
 
 	// Stuff data into selected parcel
-	parcel->setName(name.c_str());
-	parcel->setDesc(desc.c_str());
+	parcel->setName(name);
+	parcel->setDesc(desc);
 
 	BOOL allow_deed_to_group= panelp->mCheckDeedToGroup->get();
 	BOOL contribute_with_deed = panelp->mCheckContributeWithDeed->get();
@@ -991,7 +963,7 @@ void LLPanelLandGeneral::onClickStopSellLand(void* data)
 // LLPanelLandObjects
 //---------------------------------------------------------------------------
 LLPanelLandObjects::LLPanelLandObjects(LLParcelSelectionHandle& parcel)
-:	LLPanel("land_objects_panel"), mParcel(parcel)
+:	LLPanel(std::string("land_objects_panel")), mParcel(parcel)
 {
 }
 
@@ -1047,7 +1019,7 @@ BOOL LLPanelLandObjects::postBuild()
 	mIconGroup = LLUIImageList::getInstance()->getUIImage("icon_group.tga");
 
 	mOwnerList = getChild<LLNameListCtrl>("owner list");
-	mOwnerList->sortByColumn(3, FALSE);
+	mOwnerList->sortByColumnIndex(3, FALSE);
 	childSetCommitCallback("owner list", onCommitList, this);
 	mOwnerList->setDoubleClickCallback(onDoubleClickOwner);
 
@@ -1279,7 +1251,7 @@ void LLPanelLandObjects::callbackReturnOwnerObjects(S32 option, void* userdata)
 		if (parcel)
 		{
 			LLUUID owner_id = parcel->getOwnerID();	
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			if (owner_id == gAgentID)
 			{
 				LLNotifyBox::showXml("OwnedObjectsReturned");
@@ -1312,7 +1284,7 @@ void LLPanelLandObjects::callbackReturnGroupObjects(S32 option, void* userdata)
 		{
 			std::string group_name;
 			gCacheName->getGroupName(parcel->getGroupID(), group_name);
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[GROUPNAME]"] = group_name;
 			LLNotifyBox::showXml("GroupObjectsReturned", args);
 			send_return_objects_message(parcel->getLocalID(), RT_GROUP);
@@ -1354,7 +1326,7 @@ void LLPanelLandObjects::callbackReturnOwnerList(S32 option, void* userdata)
 			uuid_list_t::iterator selected = self->mSelectedOwners.begin();
 			if (selected != self->mSelectedOwners.end())
 			{
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				if (self->mSelectedIsGroup)
 				{
 					args["[GROUPNAME]"] = self->mSelectedName;
@@ -1394,7 +1366,7 @@ void LLPanelLandObjects::onClickReturnOwnerList(void* userdata)
 
 	send_parcel_select_objects(parcelp->getLocalID(), RT_LIST, &(self->mSelectedOwners));
 
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[NAME]"] = self->mSelectedName;
 	args["[N]"] = llformat("%d",self->mSelectedCount);
 	if (self->mSelectedIsGroup)
@@ -1423,7 +1395,7 @@ void LLPanelLandObjects::onClickRefresh(void* userdata)
 
 	// ready the list for results
 	self->mOwnerList->deleteAllItems();
-	self->mOwnerList->addCommentText("Searching...");
+	self->mOwnerList->addCommentText(std::string("Searching...")); // *TODO: Translate
 	self->mOwnerList->setEnabled(FALSE);
 	self->mFirstReply = TRUE;
 
@@ -1458,8 +1430,9 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 	LLUUID	owner_id;
 	BOOL	is_group_owned;
 	S32		object_count;
+	U32		most_recent_time = 0;
 	BOOL	is_online;
-	char object_count_str[MAX_STRING];	/*Flawfinder: ignore*/
+	std::string object_count_str;
 	//BOOL b_need_refresh = FALSE;
 
 	// If we were waiting for the first reply, clear the "Searching..." text.
@@ -1475,7 +1448,10 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 		msg->getBOOLFast(_PREHASH_Data, _PREHASH_IsGroupOwned,	is_group_owned,	i);
 		msg->getS32Fast (_PREHASH_Data, _PREHASH_Count,			object_count,	i);
 		msg->getBOOLFast(_PREHASH_Data, _PREHASH_OnlineStatus,	is_online,		i);
-
+		if(msg->getNumberOfBlocks("DataExtended"))
+		{
+			msg->getU32("DataExtended", "TimeStamp", most_recent_time, i);
+		}
 		if (owner_id.isNull())
 		{
 			continue;
@@ -1498,10 +1474,13 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 			row->addColumn(OWNER_OFFLINE, FONT);
 		}
 		// Placeholder for name.
-		row->addColumn(LLString::null, FONT);
+		row->addColumn(LLStringUtil::null, FONT);
 
-		snprintf(object_count_str, sizeof(object_count_str), "%d", object_count); 		/* Flawfinder: ignore */
+		object_count_str = llformat("%d", object_count);
 		row->addColumn(object_count_str, FONT);
+		
+		row->addColumn(formatted_time((time_t)most_recent_time), FONT);
+
 
 		if (is_group_owned)
 		{
@@ -1518,7 +1497,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 	// check for no results
 	if (0 == self->mOwnerList->getItemCount())
 	{
-		self->mOwnerList->addCommentText("None found.");
+		self->mOwnerList->addCommentText(std::string("None found.")); // *TODO: Translate
 	}
 	else
 	{
@@ -1604,7 +1583,7 @@ void LLPanelLandObjects::onClickReturnOwnerObjects(void* userdata)
 
 	LLUUID owner_id = parcel->getOwnerID();
 	
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[N]"] = llformat("%d",owned);
 
 	if (owner_id == gAgent.getID())
@@ -1632,7 +1611,7 @@ void LLPanelLandObjects::onClickReturnGroupObjects(void* userdata)
 	std::string group_name;
 	gCacheName->getGroupName(parcel->getGroupID(), group_name);
 	
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[NAME]"] = group_name;
 	args["[N]"] = llformat("%d", parcel->getGroupPrimCount());
 
@@ -1653,7 +1632,7 @@ void LLPanelLandObjects::onClickReturnOtherObjects(void* userdata)
 
 	send_parcel_select_objects(parcel->getLocalID(), RT_OTHER);
 
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[N]"] = llformat("%d", other);
 	
 	if (parcel->getIsGroupOwned())
@@ -1709,7 +1688,7 @@ void LLPanelLandObjects::onCommitClean(LLUICtrl *caller, void* user_data)
 //---------------------------------------------------------------------------
 
 LLPanelLandOptions::LLPanelLandOptions(LLParcelSelectionHandle& parcel)
-:	LLPanel("land_options_panel"),
+:	LLPanel(std::string("land_options_panel")),
 	mCheckEditObjects(NULL),
 	mCheckEditGroupObjects(NULL),
 	mCheckAllObjectEntry(NULL),
@@ -1903,8 +1882,8 @@ void LLPanelLandOptions::refresh()
 		mPushRestrictionCtrl->setEnabled(FALSE);
 
 		// *TODO:Translate
-		const char* none_string = LLParcel::getCategoryUIString(LLParcel::C_NONE);
-		mCategoryCombo->setSimple(LLString(none_string));
+		const std::string& none_string = LLParcel::getCategoryUIString(LLParcel::C_NONE);
+		mCategoryCombo->setSimple(none_string);
 		mCategoryCombo->setEnabled(FALSE);
 
 		mLandingTypeCombo->setCurrentByIndex(0);
@@ -1975,8 +1954,8 @@ void LLPanelLandOptions::refresh()
 		// Set by string in case the order in UI doesn't match the order by index.
 		// *TODO:Translate
 		LLParcel::ECategory cat = parcel->getCategory();
-		const char* category_string = LLParcel::getCategoryUIString(cat);
-		mCategoryCombo->setSimple(LLString(category_string));
+		const std::string& category_string = LLParcel::getCategoryUIString(cat);
+		mCategoryCombo->setSimple(category_string);
 		mCategoryCombo->setEnabled( can_change_identity );
 
 		BOOL can_change_landing_point = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, 
@@ -2188,12 +2167,11 @@ void LLPanelLandOptions::onClickPublishHelp(void*)
 //---------------------------------------------------------------------------
 
 LLPanelLandAccess::LLPanelLandAccess(LLParcelSelectionHandle& parcel)
-:	LLPanel("land_access_panel"), mParcel(parcel)
+:	LLPanel(std::string("land_access_panel")), mParcel(parcel)
 {
 }
 
 
-
 BOOL LLPanelLandAccess::postBuild()
 {
 	childSetCommitCallback("public_access", onCommitPublicAccess, this);
@@ -2212,11 +2190,11 @@ BOOL LLPanelLandAccess::postBuild()
 	
 	mListAccess = getChild<LLNameListCtrl>("AccessList");
 	if (mListAccess)
-		mListAccess->sortByColumn(0, TRUE); // ascending
+		mListAccess->sortByColumnIndex(0, TRUE); // ascending
 
 	mListBanned = getChild<LLNameListCtrl>("BannedList");
 	if (mListBanned)
-		mListBanned->sortByColumn(0, TRUE); // ascending
+		mListBanned->sortByColumnIndex(0, TRUE); // ascending
 
 	return TRUE;
 }
@@ -2260,7 +2238,7 @@ void LLPanelLandAccess::refresh()
 				 cit != parcel->mAccessList.end(); ++cit)
 			{
 				const LLAccessEntry& entry = (*cit).second;
-				LLString suffix;
+				std::string suffix;
 				if (entry.mTime != 0)
 				{
 					S32 now = time(NULL);
@@ -2299,7 +2277,7 @@ void LLPanelLandAccess::refresh()
 				 cit != parcel->mBanList.end(); ++cit)
 			{
 				const LLAccessEntry& entry = (*cit).second;
-				LLString suffix;
+				std::string suffix;
 				if (entry.mTime != 0)
 				{
 					S32 now = time(NULL);
@@ -2366,7 +2344,7 @@ void LLPanelLandAccess::refresh()
 		childSetValue("limit_payment", FALSE);
 		childSetValue("limit_age_verified", FALSE);
 		childSetValue("GroupCheck", FALSE);
-		childSetLabelArg("GroupCheck", "[GROUP]", LLString::null );
+		childSetLabelArg("GroupCheck", "[GROUP]", LLStringUtil::null );
 		childSetValue("PassCheck", FALSE);
 		childSetValue("PriceSpin", (F32)PARCEL_PASS_PRICE_DEFAULT);
 		childSetValue( "HoursSpin", PARCEL_PASS_HOURS_DEFAULT );
@@ -2425,7 +2403,7 @@ void LLPanelLandAccess::refresh_ui()
 			}
 			else
 			{
-				childSetToolTip("Only Allow", LLString());
+				childSetToolTip("Only Allow", std::string());
 			}
 			childSetEnabled("GroupCheck", FALSE);
 			childSetEnabled("PassCheck", FALSE);
@@ -2436,7 +2414,8 @@ void LLPanelLandAccess::refresh_ui()
 		{
 			childSetEnabled("limit_payment", FALSE);
 			childSetEnabled("limit_age_verified", FALSE);
-			char group_name[MAX_STRING];	/*Flawfinder: ignore*/
+
+			std::string group_name;
 			if (gCacheName->getGroupName(parcel->getGroupID(), group_name))
 			{			
 				childSetEnabled("GroupCheck", can_manage_allowed);
@@ -2454,12 +2433,14 @@ void LLPanelLandAccess::refresh_ui()
 		childSetEnabled("AccessList", can_manage_allowed);
 		S32 allowed_list_count = parcel->mAccessList.size();
 		childSetEnabled("add_allowed", can_manage_allowed && allowed_list_count < PARCEL_MAX_ACCESS_LIST);
-		childSetEnabled("remove_allowed", can_manage_allowed && allowed_list_count > 0);
+		BOOL has_selected = mListAccess->getSelectionInterface()->getFirstSelectedIndex() >= 0;
+		childSetEnabled("remove_allowed", can_manage_allowed && has_selected);
 		
 		childSetEnabled("BannedList", can_manage_banned);
 		S32 banned_list_count = parcel->mBanList.size();
 		childSetEnabled("add_banned", can_manage_banned && banned_list_count < PARCEL_MAX_ACCESS_LIST);
-		childSetEnabled("remove_banned", can_manage_banned && banned_list_count > 0);
+		has_selected = mListBanned->getSelectionInterface()->getFirstSelectedIndex() >= 0;
+		childSetEnabled("remove_banned", can_manage_banned && has_selected);
 	}
 }
 		
@@ -2499,7 +2480,7 @@ void LLPanelLandAccess::onCommitPublicAccess(LLUICtrl *ctrl, void *userdata)
 	BOOL public_access = self->childGetValue("public_access").asBoolean();
 	if (public_access == FALSE)
 	{
-		char group_name[MAX_STRING];	/*Flawfinder: ignore*/
+		std::string group_name;
 		if (gCacheName->getGroupName(parcel->getGroupID(), group_name))
 		{
 			self->childSetValue("GroupCheck", public_access ? FALSE : TRUE);
@@ -2682,7 +2663,7 @@ void LLPanelLandAccess::onClickRemoveBanned(void* data)
 // LLPanelLandCovenant
 //---------------------------------------------------------------------------
 LLPanelLandCovenant::LLPanelLandCovenant(LLParcelSelectionHandle& parcel)
-:	LLPanel("land_covenant_panel"), mParcel(parcel)
+:	LLPanel(std::string("land_covenant_panel")), mParcel(parcel)
 {	
 }
 
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index b0dcd04..79f2f2c 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -288,7 +288,7 @@ protected:
 	BOOL			mFirstReply;
 
 	uuid_list_t		mSelectedOwners;
-	LLString		mSelectedName;
+	std::string		mSelectedName;
 	S32				mSelectedCount;
 	BOOL			mSelectedIsGroup;
 
diff --git a/linden/indra/newview/llfloaterlandholdings.cpp b/linden/indra/newview/llfloaterlandholdings.cpp
index 01bad70..6411a97 100644
--- a/linden/indra/newview/llfloaterlandholdings.cpp
+++ b/linden/indra/newview/llfloaterlandholdings.cpp
@@ -82,7 +82,7 @@ void LLFloaterLandHoldings::show(void*)
 
 // protected
 LLFloaterLandHoldings::LLFloaterLandHoldings()
-:	LLFloater("land holdings floater"),
+:	LLFloater(std::string("land holdings floater")),
 	mActualArea(0),
 	mBillableArea(0),
 	mFirstPacketReceived(FALSE),
@@ -183,28 +183,28 @@ void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**)
 	}
 
 	LLUUID	owner_id;
-	char	name[MAX_STRING];		/* Flawfinder: ignore */
-	char	desc[MAX_STRING];		/* Flawfinder: ignore */
+	std::string	name;
+	std::string	desc;
 	S32		actual_area;
 	S32		billable_area;
 	U8		flags;
 	F32		global_x;
 	F32		global_y;
-	char	sim_name[MAX_STRING];		/* Flawfinder: ignore */
+	std::string	sim_name;
 
 	S32 i;
 	S32 count = msg->getNumberOfBlocks("QueryData");
 	for (i = 0; i < count; i++)
 	{
 		msg->getUUID("QueryData", "OwnerID", owner_id, i);
-		msg->getString("QueryData", "Name", MAX_STRING, name, i);
-		msg->getString("QueryData", "Desc", MAX_STRING, desc, i);
+		msg->getString("QueryData", "Name", name, i);
+		msg->getString("QueryData", "Desc", desc, i);
 		msg->getS32("QueryData", "ActualArea", actual_area, i);
 		msg->getS32("QueryData", "BillableArea", billable_area, i);
 		msg->getU8("QueryData", "Flags", flags, i);
 		msg->getF32("QueryData", "GlobalX", global_x, i);
 		msg->getF32("QueryData", "GlobalY", global_y, i);
-		msg->getString("QueryData", "SimName", MAX_STRING, sim_name, i);
+		msg->getString("QueryData", "SimName", sim_name, i);
 		
 		self->mActualArea += actual_area;
 		self->mBillableArea += billable_area;
@@ -212,21 +212,21 @@ void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**)
 		S32 region_x = llround(global_x) % REGION_WIDTH_UNITS;
 		S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
 
-		char location[MAX_STRING];		/* Flawfinder: ignore */
-		snprintf(location, MAX_STRING, "%s (%d, %d)", sim_name, region_x, region_y);			/* Flawfinder: ignore */
+		std::string location;
+		location = llformat("%s (%d, %d)", sim_name.c_str(), region_x, region_y);
 
-		char area[MAX_STRING];		/* Flawfinder: ignore */
+		std::string area;
 		if(billable_area == actual_area)
 		{
-			snprintf(area, MAX_STRING, "%d", billable_area);			/* Flawfinder: ignore */
+			area = llformat("%d", billable_area);
 		}
 		else
 		{
-			snprintf(area, MAX_STRING, "%d / %d", billable_area, actual_area);			/* Flawfinder: ignore */
+			area = llformat("%d / %d", billable_area, actual_area);
 		}
 
-		char hidden[MAX_STRING];		/* Flawfinder: ignore */
-		snprintf(hidden, MAX_STRING, "%f %f", global_x, global_y);			/* Flawfinder: ignore */
+		std::string hidden;
+		hidden = llformat("%f %f", global_x, global_y);
 
 		LLSD element;
 		element["columns"][0]["column"] = "name";
@@ -256,7 +256,7 @@ void LLFloaterLandHoldings::buttonCore(S32 which)
 	S32 index = list->getFirstSelectedIndex();
 	if (index < 0) return;
 
-	LLString location = list->getSelectedItemLabel(3);
+	std::string location = list->getSelectedItemLabel(3);
 
 	F32 global_x = 0.f;
 	F32 global_y = 0.f;
diff --git a/linden/indra/newview/llfloaterlandholdings.h b/linden/indra/newview/llfloaterlandholdings.h
index eb0b2ca..6922739 100644
--- a/linden/indra/newview/llfloaterlandholdings.h
+++ b/linden/indra/newview/llfloaterlandholdings.h
@@ -78,7 +78,7 @@ protected:
 	// Used to clear out the mParcelList's "Loading..." indicator
 	BOOL mFirstPacketReceived;
 
-	LLString mSortColumn;
+	std::string mSortColumn;
 	BOOL mSortAscending;
 };
 
diff --git a/linden/indra/newview/llfloaterlandmark.cpp b/linden/indra/newview/llfloaterlandmark.cpp
index e10dec9..71e35e8 100644
--- a/linden/indra/newview/llfloaterlandmark.cpp
+++ b/linden/indra/newview/llfloaterlandmark.cpp
@@ -180,7 +180,7 @@ BOOL LLFloaterLandmark::handleDragAndDrop(
 		BOOL drop,
 		EDragAndDropType cargo_type, void *cargo_data, 
 		EAcceptance *accept,
-		LLString& tooltip_msg)
+		std::string& tooltip_msg)
 {
 	BOOL handled = FALSE;
 
@@ -442,12 +442,12 @@ void LLFloaterLandmark::onShowFolders(LLUICtrl* ctrl, void *user_data)
 	}
 }
 
-void LLFloaterLandmark::onSearchEdit(const LLString& search_string, void* user_data )
+void LLFloaterLandmark::onSearchEdit(const std::string& search_string, void* user_data )
 {
 	LLFloaterLandmark* picker = (LLFloaterLandmark*)user_data;
 
 	std::string upper_case_search_string = search_string;
-	LLString::toUpper(upper_case_search_string);
+	LLStringUtil::toUpper(upper_case_search_string);
 
 	if (upper_case_search_string.empty())
 	{
diff --git a/linden/indra/newview/llfloaterlandmark.h b/linden/indra/newview/llfloaterlandmark.h
index 7b5dc80..cf71138 100644
--- a/linden/indra/newview/llfloaterlandmark.h
+++ b/linden/indra/newview/llfloaterlandmark.h
@@ -66,7 +66,7 @@ public:
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask,
 		BOOL drop, EDragAndDropType cargo_type, void *cargo_data, 
 		EAcceptance *accept,
-		LLString& tooltip_msg);
+		std::string& tooltip_msg);
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
 
 	// LLFloater overrides
@@ -87,7 +87,7 @@ public:
 	static void		onBtnRename( void* userdata );
 	static void		onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
 	static void		onShowFolders(LLUICtrl* ctrl, void* userdata);
-	static void		onSearchEdit(const LLString& search_string, void* user_data );
+	static void		onSearchEdit(const std::string& search_string, void* user_data );
 
 protected:
 	LLPointer<LLViewerImage> mLandmarkp;
@@ -101,7 +101,7 @@ protected:
 	LLTextBox*			mTentativeLabel;
 	LLTextBox*			mResolutionLabel;
 
-	LLString			mPendingName;
+	std::string			mPendingName;
 	BOOL				mIsDirty;
 	BOOL				mActive;
 
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 36a9ab0..b333ff2 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -86,8 +86,6 @@ const S32 MAP_SCALE_MIN = 35;	// in pixels per sim
 const S32 MAP_SCALE_MAX = 180;	// in pixels per sim
 const S32 MAP_SCALE_INCREMENT = 5;
 
-const char MAP_TITLE[] = "";
-
 const S32 NETMAP_MIN_WIDTH = 128;
 const S32 NETMAP_MIN_HEIGHT = 128;
 
@@ -118,8 +116,8 @@ LLFloaterMap *gFloaterMap = NULL;
 LLFloaterMap::LLFloaterMap(const std::string& name)
 	:
 	LLFloater(name, 
-				"FloaterMiniMapRect", 
-				MAP_TITLE, 
+				std::string("FloaterMiniMapRect"), 
+			    LLStringUtil::null, 
 				TRUE, 
 				FLOATERMAP_MIN_WIDTH, 
 				FLOATERMAP_MIN_HEIGHT_LARGE, 
diff --git a/linden/indra/newview/llfloatermemleak.cpp b/linden/indra/newview/llfloatermemleak.cpp
new file mode 100644
index 0000000..16be9df
--- /dev/null
+++ b/linden/indra/newview/llfloatermemleak.cpp
@@ -0,0 +1,265 @@
+/** 
+ * @file llfloatermemleak.cpp
+ * @brief LLFloatermemleak class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatermemleak.h"
+
+#include "lluictrlfactory.h"
+#include "llbutton.h"
+#include "llspinctrl.h"
+#include "llresmgr.h"
+
+#include "llmath.h"
+#include "llviewerwindow.h"
+
+LLFloaterMemLeak* LLFloaterMemLeak::sInstance = NULL;
+U32 LLFloaterMemLeak::sMemLeakingSpeed = 0 ; //bytes leaked per frame
+U32 LLFloaterMemLeak::sMaxLeakedMem = 0 ; //maximum allowed leaked memory
+U32 LLFloaterMemLeak::sTotalLeaked = 0 ;
+S32 LLFloaterMemLeak::sStatus = LLFloaterMemLeak::STOP ;
+BOOL LLFloaterMemLeak::sbAllocationFailed = FALSE ;
+
+LLFloaterMemLeak::LLFloaterMemLeak() : LLFloater("Memory Leaking Simulation Floater")
+{
+}
+
+LLFloaterMemLeak::~LLFloaterMemLeak()
+{
+	release() ;
+		
+	sMemLeakingSpeed = 0 ; //bytes leaked per frame
+	sMaxLeakedMem = 0 ; //maximum allowed leaked memory	
+	sInstance = NULL ;
+}
+
+void LLFloaterMemLeak::release()
+{
+	for(S32 i = 0 ; i < (S32)mLeakedMem.size() ; i++)
+	{
+		delete[] mLeakedMem[i] ;
+	}
+	mLeakedMem.clear() ;
+
+	sStatus = STOP ;
+	sTotalLeaked = 0 ;
+	sbAllocationFailed = FALSE ;
+}
+
+void LLFloaterMemLeak::stop()
+{
+	sStatus = STOP ;
+	sbAllocationFailed = TRUE ;
+}
+
+void LLFloaterMemLeak::idle()
+{
+	if(STOP == sStatus)
+	{
+		return ;
+	}
+
+	sbAllocationFailed = FALSE ;
+	
+	if(RELEASE == sStatus)
+	{
+		release() ;
+		return ;
+	}
+
+	char* p = NULL ;
+	if(sMemLeakingSpeed > 0 && sTotalLeaked < sMaxLeakedMem)
+	{
+		p = new char[sMemLeakingSpeed] ;
+
+		if(p)
+		{
+			mLeakedMem.push_back(p) ;
+			sTotalLeaked += sMemLeakingSpeed ;
+		}
+	}
+	if(!p)
+	{
+		sStatus = STOP ;
+		sbAllocationFailed = TRUE ;
+	}
+}
+
+//----------------------
+void LLFloaterMemLeak::onChangeLeakingSpeed(LLUICtrl* ctrl, void* userData)
+{
+	LLFloaterMemLeak *mem_leak = (LLFloaterMemLeak *)userData;		
+	if (mem_leak)
+	{
+		F32 tmp ;
+		tmp = mem_leak->childGetValue("leak_speed").asReal();
+
+		if(tmp > (F32)0xFFFFFFFF)
+		{
+			sMemLeakingSpeed = 0xFFFFFFFF ;
+		}
+		else
+		{
+			sMemLeakingSpeed = (U32)tmp ;
+		}
+	}
+}
+
+void LLFloaterMemLeak::onChangeMaxMemLeaking(LLUICtrl* ctrl, void* userData)
+{
+	LLFloaterMemLeak *mem_leak = (LLFloaterMemLeak *)userData;		
+	if (mem_leak)
+	{
+		F32 tmp ;
+		tmp = mem_leak->childGetValue("max_leak").asReal();
+		if(tmp > (F32)0xFFF)
+		{
+			sMaxLeakedMem = 0xFFFFFFFF ;
+		}
+		else
+		{
+			sMaxLeakedMem = ((U32)tmp) << 20 ;
+		}
+	}
+}
+
+void LLFloaterMemLeak::onClickStart(void* userData)
+{
+	sStatus = START ;
+}
+
+void LLFloaterMemLeak::onClickStop(void* userData)
+{
+	sStatus = STOP ;
+}
+
+void LLFloaterMemLeak::onClickRelease(void* userData)
+{
+	sStatus = RELEASE ;
+}
+
+void LLFloaterMemLeak::onClickClose(void* userData)
+{
+	if (sInstance)
+	{
+		sInstance->setVisible(FALSE);
+	}
+}
+
+//----------------------------------------------
+
+BOOL LLFloaterMemLeak::postBuild(void) 
+{
+	childSetCommitCallback("leak_speed", onChangeLeakingSpeed, this);
+	childSetCommitCallback("max_leak", onChangeMaxMemLeaking, this);
+
+	childSetAction("start_btn", onClickStart, this);
+	childSetAction("stop_btn", onClickStop, this);
+	childSetAction("release_btn", onClickRelease, this);
+	childSetAction("close_btn", onClickClose, this);
+
+	return TRUE ;
+}
+
+void LLFloaterMemLeak::draw()
+{
+	//show total memory leaked
+	if(sTotalLeaked > 0)
+	{
+		std::string bytes_string;
+		LLResMgr::getInstance()->getIntegerString(bytes_string, sTotalLeaked >> 10 );
+		childSetTextArg("total_leaked_label", "[SIZE]", bytes_string);
+	}
+	else
+	{
+		childSetTextArg("total_leaked_label", "[SIZE]", LLStringExplicit("0"));
+	}
+
+	if(sbAllocationFailed)
+	{
+		childSetTextArg("note_label_1", "[NOTE1]", LLStringExplicit("Memory leaking simulation stops. Reduce leaking speed or"));
+		childSetTextArg("note_label_2", "[NOTE2]", LLStringExplicit("increase max leaked memory, then press Start to continue."));
+	}
+	else
+	{
+		childSetTextArg("note_label_1", "[NOTE1]", LLStringExplicit(""));
+		childSetTextArg("note_label_2", "[NOTE2]", LLStringExplicit(""));
+	}
+
+	LLFloater::draw();
+}
+
+// static instance of it
+LLFloaterMemLeak* LLFloaterMemLeak::instance()
+{
+	if (!sInstance)
+	{
+		sInstance = new LLFloaterMemLeak();
+		LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_mem_leaking.xml", NULL, FALSE);
+
+		if(sInstance)
+		{
+			F32 a, b ;
+			a = sInstance->childGetValue("leak_speed").asReal();
+			if(a > (F32)(0xFFFFFFFF))
+			{
+				sMemLeakingSpeed = 0xFFFFFFFF ;
+			}
+			else
+			{
+				sMemLeakingSpeed = (U32)a ;
+			}
+			b = sInstance->childGetValue("max_leak").asReal();
+			if(b > (F32)0xFFF)
+			{
+				sMaxLeakedMem = 0xFFFFFFFF ;
+			}
+			else
+			{
+				sMaxLeakedMem = ((U32)b) << 20 ;
+			}
+
+			sbAllocationFailed = FALSE ;
+		}
+	}
+	return sInstance ;
+}
+
+void LLFloaterMemLeak::show(void*)
+{
+	instance()->open();
+}
+
+LLFloaterMemLeak* LLFloaterMemLeak::getInstance()
+{
+	return sInstance ;
+}
+
diff --git a/linden/indra/newview/llfloatermemleak.h b/linden/indra/newview/llfloatermemleak.h
new file mode 100644
index 0000000..6a7b157
--- /dev/null
+++ b/linden/indra/newview/llfloatermemleak.h
@@ -0,0 +1,89 @@
+/** 
+ * @file llfloatermemleak.h
+ * @brief memory leaking simulation window, debug use only
+ *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERMEMLEAK_H
+#define LL_LLFLOATERMEMLEAK_H
+
+#include "llfloater.h"
+
+class LLFloaterMemLeak : public LLFloater
+{
+public:
+    LLFloaterMemLeak();
+	virtual ~LLFloaterMemLeak();
+
+	/// initialize all the callbacks for the menu
+	//void initCallbacks(void);
+	virtual BOOL postBuild() ;
+	virtual void draw() ;
+
+	/// one and one instance only
+	static LLFloaterMemLeak* instance();
+	
+	static void onChangeLeakingSpeed(LLUICtrl* ctrl, void* userData);
+	static void onChangeMaxMemLeaking(LLUICtrl* ctrl, void* userData);
+	static void onClickStart(void* userData);
+	static void onClickStop(void* userData);
+	static void onClickRelease(void* userData);
+	static void onClickClose(void* userData);
+		
+	/// show off our menu
+	static void show(void*);
+
+public:
+	static LLFloaterMemLeak* getInstance() ;
+	void idle() ;
+	void stop() ;
+
+private:
+	void release() ;
+
+private:
+	enum 
+	{
+		RELEASE = -1 ,
+		STOP,
+		START
+	} ;
+
+	// one instance on the inside
+	static LLFloaterMemLeak* sInstance;
+
+	static U32 sMemLeakingSpeed ; //bytes leaked per frame
+	static U32 sMaxLeakedMem ; //maximum allowed leaked memory
+	static U32 sTotalLeaked ;
+	static S32 sStatus ; //0: stop ; >0: start ; <0: release
+	static BOOL sbAllocationFailed ;
+
+	std::vector<char*> mLeakedMem ;	
+};
+
+#endif // LL_LLFLOATERMEMLEAK_H
diff --git a/linden/indra/newview/llfloatermute.cpp b/linden/indra/newview/llfloatermute.cpp
index d519791..f77b8c2 100644
--- a/linden/indra/newview/llfloatermute.cpp
+++ b/linden/indra/newview/llfloatermute.cpp
@@ -56,7 +56,7 @@
 //
 // Constants
 //
-const char FLOATER_TITLE[] = "Muted Residents & Objects";
+const std::string FLOATER_TITLE = "Muted Residents & Objects";
 const F32 INSTANT_MSG_SIZE = 8.0f;
 const LLColor4 INSTANT_MSG_COLOR(1, 1, 1, 1);
 const LLColor4 MUTED_MSG_COLOR(0.5f, 0.5f, 0.5f, 1.f);
@@ -73,7 +73,7 @@ const S32 HPAD = 4;
 class LLFloaterMuteObjectUI : public LLFloater
 {
 public:
-	typedef void(*callback_t)(const LLString&, void*);
+	typedef void(*callback_t)(const std::string&, void*);
 
 	static LLFloaterMuteObjectUI* show(callback_t callback,
 					   void* userdata);
@@ -89,7 +89,7 @@ private:
 	static void onBtnOk(void *data);
 	static void onBtnCancel(void *data);
 
-	void (*mCallback)(const LLString& objectName, 
+	void (*mCallback)(const std::string& objectName, 
 			  void* userdata);
 	void* mCallbackUserData;
 
@@ -99,7 +99,7 @@ private:
 LLFloaterMuteObjectUI* LLFloaterMuteObjectUI::sInstance = NULL;
 
 LLFloaterMuteObjectUI::LLFloaterMuteObjectUI()
-	: LLFloater("Mute object by name"),
+	: LLFloater(std::string("Mute object by name")),
 	  mCallback(NULL),
 	  mCallbackUserData(NULL)
 {
@@ -148,7 +148,7 @@ void LLFloaterMuteObjectUI::onBtnOk(void* userdata)
 
 	if (self->mCallback)
 	{
-		const LLString& text = self->childGetValue("object_name").asString();
+		const std::string& text = self->childGetValue("object_name").asString();
 		self->mCallback(text,self->mCallbackUserData);
 	}
 	self->close();
@@ -186,7 +186,7 @@ BOOL LLFloaterMuteObjectUI::handleKeyHere(KEY key, MASK mask)
 // LLFloaterMute()
 //-----------------------------------------------------------------------------
 LLFloaterMute::LLFloaterMute(const LLSD& seed)
-:	LLFloater("mute floater", "FloaterMuteRect3", FLOATER_TITLE, 
+:	LLFloater(std::string("mute floater"), std::string("FloaterMuteRect3"), FLOATER_TITLE, 
 			  RESIZE_YES, 220, 140, DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
 {
 
@@ -234,7 +234,7 @@ void LLFloaterMute::refreshMuteList()
 	std::vector<LLMute>::iterator it;
 	for (it = mutes.begin(); it != mutes.end(); ++it)
 	{
-		LLString display_name = it->getDisplayName();
+		std::string display_name = it->getDisplayName();
 		mMuteList->addStringUUIDItem(display_name, it->mID);
 	}
 
@@ -279,7 +279,7 @@ void LLFloaterMute::onClickRemove(void *data)
 {
 	LLFloaterMute* floater = (LLFloaterMute *)data;
 
-	LLString name = floater->mMuteList->getSelectedItemLabel();
+	std::string name = floater->mMuteList->getSelectedItemLabel();
 	LLUUID id = floater->mMuteList->getStringUUIDSelectedItem();
 	LLMute mute(id);
 	mute.setFromDisplayName(name);
@@ -340,7 +340,7 @@ void LLFloaterMute::onClickMuteByName(void* data)
 	floaterp->addDependentFloater(picker);
 }
 
-void LLFloaterMute::callbackMuteByName(const LLString& text, void* data)
+void LLFloaterMute::callbackMuteByName(const std::string& text, void* data)
 {
 	if (text.empty()) return;
 
diff --git a/linden/indra/newview/llfloatermute.h b/linden/indra/newview/llfloatermute.h
index 9c7a6f8..0228251 100644
--- a/linden/indra/newview/llfloatermute.h
+++ b/linden/indra/newview/llfloatermute.h
@@ -69,7 +69,7 @@ private:
 	static void onSelectName(LLUICtrl* caller, void *data);
 	static void onPickUser(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data);
 	static void onClickMuteByName(void*);
-	static void callbackMuteByName(const LLString& text, void*);
+	static void callbackMuteByName(const std::string& text, void*);
 
 private:
 	LLScrollListCtrl*			mMuteList;
diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index eddb4b3..3cafdd1 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -46,6 +46,7 @@
 #include "llviewercontrol.h"
 #include "llviewermenufile.h"	// upload_new_resource()
 #include "lluictrlfactory.h"
+#include "llstring.h"
 
 // linden includes
 #include "llassetstorage.h"
@@ -65,13 +66,12 @@ const S32 PREF_BUTTON_HEIGHT = 16;
 // LLFloaterNameDesc()
 //-----------------------------------------------------------------------------
 LLFloaterNameDesc::LLFloaterNameDesc(const std::string& filename )
-	:
-	LLFloater("Name/Description Floater")
+	: LLFloater(std::string("Name/Description Floater"))
 {
 	mFilenameAndPath = filename;
-	mFilename.assign(strrchr( filename.c_str(), gDirUtilp->getDirDelimiter()[0]) + 1);
+	mFilename = gDirUtilp->getBaseFileName(filename, false);
 	// SL-5521 Maintain capitalization of filename when making the inventory item. JC
-	//LLString::toLower(mFilename);
+	//LLStringUtil::toLower(mFilename);
 	mIsAudio = FALSE;
 }
 
@@ -82,27 +82,18 @@ BOOL LLFloaterNameDesc::postBuild()
 {
 	LLRect r;
 
-	LLString asset_name = mFilename;
-	LLString::replaceNonstandardASCII( asset_name, '?' );
-	LLString::replaceChar(asset_name, '|', '?');
-	LLString::stripNonprintable(asset_name);
-	LLString::trim(asset_name);
+	std::string asset_name = mFilename;
+	LLStringUtil::replaceNonstandardASCII( asset_name, '?' );
+	LLStringUtil::replaceChar(asset_name, '|', '?');
+	LLStringUtil::stripNonprintable(asset_name);
+	LLStringUtil::trim(asset_name);
 
-	char* asset_name_str = (char*)asset_name.c_str();
-	char* end_p = strrchr(asset_name_str, '.');		 // strip extension if exists
-	if( !end_p )
-	{
-		end_p = asset_name_str + strlen( asset_name_str );		/* Flawfinder: ignore */
-	}
-	else
-	if( !stricmp( end_p, ".wav") )
+	std::string exten = gDirUtilp->getExtension(asset_name);
+	if (exten == "wav")
 	{
 		mIsAudio = TRUE;
 	}
-		
-	S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
-
-	asset_name = asset_name.substr( 0, len );
+	asset_name = gDirUtilp->getBaseFileName(asset_name, true); // no extsntion
 
 	setTitle(mFilename);
 
diff --git a/linden/indra/newview/llfloaternamedesc.h b/linden/indra/newview/llfloaternamedesc.h
index ac9c894..9cb0488 100644
--- a/linden/indra/newview/llfloaternamedesc.h
+++ b/linden/indra/newview/llfloaternamedesc.h
@@ -54,8 +54,8 @@ protected:
 protected:
 	BOOL        mIsAudio;
 
-	LLString		mFilenameAndPath;
-	LLString		mFilename;
+	std::string		mFilenameAndPath;
+	std::string		mFilename;
 
 	static void		onBtnOK(void*);
 	static void		onBtnCancel(void*);
diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index dc9fabf..eda9660 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -39,8 +39,8 @@
 
 S32 COL_1_WIDTH = 200;
 
-static LLString sOnlineDescriptor = "*";
-static LLString sNameFormat = "[FIRST] [LAST]";
+static std::string sOnlineDescriptor = "*";
+static std::string sNameFormat = "[FIRST] [LAST]";
 
 LLFloaterNewIM::LLFloaterNewIM()
 {
@@ -181,7 +181,7 @@ void LLFloaterNewIM::onStart(void* userdata)
 	if(item)
 	{
 		const LLScrollListCell* cell = item->getColumn(0);
-		LLString name(cell->getValue());
+		std::string name(cell->getValue());
 
 		// *NOTE: Do a live detrmination of what type of session it
 		// should be. If we restrict the new im panel to online users,
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index 13230a9..753c254 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -57,7 +57,7 @@
 LLFloaterOpenObject* LLFloaterOpenObject::sInstance = NULL;
 
 LLFloaterOpenObject::LLFloaterOpenObject()
-:	LLFloater("object_contents"),
+:	LLFloater(std::string("object_contents")),
 	mPanelInventory(NULL),
 	mDirty(TRUE)
 {
@@ -67,7 +67,7 @@ LLFloaterOpenObject::LLFloaterOpenObject()
 
 	childSetAction("copy_to_inventory_button", onClickMoveToInventory, this);
 	childSetAction("copy_and_wear_button", onClickMoveAndWear, this);
-	childSetTextArg("object_name", "[DESC]", LLString("Object") ); // *Note: probably do not want to translate this
+	childSetTextArg("object_name", "[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
 }
 
 LLFloaterOpenObject::~LLFloaterOpenObject()
@@ -215,6 +215,6 @@ void LLFloaterOpenObject::onClickMoveAndWear(void* data)
 void* LLFloaterOpenObject::createPanelInventory(void* data)
 {
 	LLFloaterOpenObject* floater = (LLFloaterOpenObject*)data;
-	floater->mPanelInventory = new LLPanelInventory("Object Contents", LLRect());
+	floater->mPanelInventory = new LLPanelInventory(std::string("Object Contents"), LLRect());
 	return floater->mPanelInventory;
 }
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.cpp b/linden/indra/newview/llfloaterpermissionsmgr.cpp
index cd9a1de..14ec7cd 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.cpp
+++ b/linden/indra/newview/llfloaterpermissionsmgr.cpp
@@ -72,15 +72,16 @@ void LLFloaterPermissionsMgr::processPermissionsList(LLMessageSystem* msg, void*
 {
 }
 
-LLFloaterPermissionsMgr::LLFloaterPermissionsMgr() : LLFloater("floater_perm_mgr", "PermissionsManagerRect", "Permissions Manager", TRUE, MIN_PERM_MGR_WIDTH,
-															MIN_PERM_MGR_HEIGHT)
+LLFloaterPermissionsMgr::LLFloaterPermissionsMgr() :
+	LLFloater(std::string("floater_perm_mgr"), std::string("PermissionsManagerRect"), std::string("Permissions Manager"),
+			  TRUE, MIN_PERM_MGR_WIDTH, MIN_PERM_MGR_HEIGHT)
 {
 	S32 y = getRect().getHeight() - VPAD - LINE;
 	LLRect scrollable_container_rect(0, y, getRect().getWidth(), 0);
 	LLRect permissions_rect(0, 0, getRect().getWidth() - HPAD - HPAD, 0);
 	mPermissions = new LLPermissionsView(permissions_rect);
 	mScroller = new LLScrollableContainerView(
-				"permissions container",
+				std::string("permissions container"),
 				scrollable_container_rect,
 				mPermissions
 				);
@@ -98,7 +99,7 @@ LLFloaterPermissionsMgr::~LLFloaterPermissionsMgr()
 // LLPermissionsView
 //
 
-LLPermissionsView::LLPermissionsView(const LLRect &rect) : LLView("permissions_view", rect, TRUE, FOLLOWS_NONE)
+LLPermissionsView::LLPermissionsView(const LLRect &rect) : LLView(std::string("permissions_view"), rect, TRUE, FOLLOWS_NONE)
 {
 }
 
@@ -109,7 +110,7 @@ void LLPermissionsView::clearPermissionsData()
 	mPermData.clear();
 }
 
-void LLPermissionsView::addPermissionsData(const LLString& object_name, const LLUUID& object_id, U32 permissions_flags) 
+void LLPermissionsView::addPermissionsData(const std::string& object_name, const LLUUID& object_id, U32 permissions_flags) 
 {
 	// grow to make room for new element
 	LLPermissionsData* perm_datap = new LLPermissionsData(object_id, permissions_flags);
@@ -117,19 +118,19 @@ void LLPermissionsView::addPermissionsData(const LLString& object_name, const LL
 	reshape(getRect().getWidth(), getRect().getHeight() + LINE + VPAD + BTN_HEIGHT + VPAD);
 	S32 y = getRect().getHeight() - LINE - VPAD;
 	LLRect label_rect(HPAD, y + LINE, getRect().getWidth(), y);
-	LLTextBox* text = new LLTextBox("perm_label", label_rect, object_name.c_str());
+	LLTextBox* text = new LLTextBox(std::string("perm_label"), label_rect, object_name);
 	text->setFollows(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
 	addChild(text);
 
 	y -= LINE + VPAD;
 
 	LLRect btn_rect(HPAD, y + BTN_HEIGHT, 120, y);
-	LLButton* button = new LLButton("Revoke permissions", btn_rect, "", revokePermissions, (void*)perm_datap);
+	LLButton* button = new LLButton(std::string("Revoke permissions"), btn_rect, LLStringUtil::null, revokePermissions, (void*)perm_datap);
 	button->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
 	addChild(button);
 
 	btn_rect.set(HPAD + 120 + HPAD, y + BTN_HEIGHT, HPAD + 120 + HPAD + 120, y);
-	button = new LLButton("Find in world", btn_rect, "", findObject, (void*)perm_datap);
+	button = new LLButton(std::string("Find in world"), btn_rect, LLStringUtil::null, findObject, (void*)perm_datap);
 	button->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
 	addChild(button);
 
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.h b/linden/indra/newview/llfloaterpermissionsmgr.h
index 01e1ecc..cc89f97 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.h
+++ b/linden/indra/newview/llfloaterpermissionsmgr.h
@@ -80,7 +80,7 @@ public:
 
 public:
 	void clearPermissionsData();
-	void addPermissionsData(const LLString& object_name, const LLUUID& object_id, U32 permissions_flags);
+	void addPermissionsData(const std::string& object_name, const LLUUID& object_id, U32 permissions_flags);
 
 	static void revokePermissions(void *userdata);
 	static void findObject(void *userdata);
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp
index fbd8e72..b4bcdb7 100644
--- a/linden/indra/newview/llfloaterpostcard.cpp
+++ b/linden/indra/newview/llfloaterpostcard.cpp
@@ -75,7 +75,7 @@ LLFloaterPostcard::instance_list_t LLFloaterPostcard::sInstances;
 ///----------------------------------------------------------------------------
 
 LLFloaterPostcard::LLFloaterPostcard(LLImageJPEG* jpeg, LLImageGL *img, const LLVector2& img_scale, const LLVector3d& pos_taken_global)
-:	LLFloater("Postcard Floater"),
+:	LLFloater(std::string("Postcard Floater")),
 	mJPEGImage(jpeg),
 	mViewerImage(img),
 	mImageScale(img_scale),
@@ -282,7 +282,7 @@ void LLFloaterPostcard::uploadCallback(const LLUUID& asset_id, void *user_data,
 	
 	if (result)
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(result));
 		gViewerWindow->alertXml("ErrorUploadingPostcard", args);
 	}
@@ -312,13 +312,13 @@ void LLFloaterPostcard::uploadCallback(const LLUUID& asset_id, void *user_data,
 }
 
 // static
-void LLFloaterPostcard::updateUserInfo(const char *email)
+void LLFloaterPostcard::updateUserInfo(const std::string& email)
 {
 	for (instance_list_t::iterator iter = sInstances.begin();
 		 iter != sInstances.end(); ++iter)
 	{
 		LLFloaterPostcard *instance = *iter;
-		const LLString& text = instance->childGetValue("from_form").asString();
+		const std::string& text = instance->childGetValue("from_form").asString();
 		if (text.empty())
 		{
 			// there's no text in this field yet, pre-populate
@@ -336,7 +336,7 @@ void LLFloaterPostcard::onMsgFormFocusRecieved(LLFocusableElement* receiver, voi
 		if(msgForm && msgForm == receiver && msgForm->hasFocus() && !(self->mHasFirstMsgFocus))
 		{
 			self->mHasFirstMsgFocus = true;
-			msgForm->setText(LLString::null);
+			msgForm->setText(LLStringUtil::null);
 		}
 	}
 }
@@ -392,10 +392,10 @@ void LLFloaterPostcard::sendPostcard()
 	{
 		gAssetStorage->storeAssetData(mTransactionID, LLAssetType::AT_IMAGE_JPEG, &uploadCallback, (void *)this, FALSE);
 	}
-
+	
 	// give user feedback of the event
 	gViewerWindow->playSnapshotAnimAndSound();
-	LLUploadDialog::modalUploadDialog("Uploading...\n\nPostcard");
+	LLUploadDialog::modalUploadDialog(getString("upload_message"));
 
 	// don't destroy the window until the upload is done
 	// this way we keep the information in the form
diff --git a/linden/indra/newview/llfloaterpostcard.h b/linden/indra/newview/llfloaterpostcard.h
index be7c2b2..94e40aa 100644
--- a/linden/indra/newview/llfloaterpostcard.h
+++ b/linden/indra/newview/llfloaterpostcard.h
@@ -62,7 +62,7 @@ public:
 							   void *user_data,
 							   S32 result, LLExtStat ext_status);
 
-	static void updateUserInfo(const char *email);
+	static void updateUserInfo(const std::string& email);
 
 	static void onMsgFormFocusRecieved(LLFocusableElement* receiver, void* data);
 	static void missingSubjMsgAlertCallback(S32 option, void* data);
diff --git a/linden/indra/newview/llfloaterpostprocess.cpp b/linden/indra/newview/llfloaterpostprocess.cpp
index 40589fb..a804a84 100644
--- a/linden/indra/newview/llfloaterpostprocess.cpp
+++ b/linden/indra/newview/llfloaterpostprocess.cpp
@@ -46,7 +46,7 @@
 LLFloaterPostProcess* LLFloaterPostProcess::sPostProcess = NULL;
 
 
-LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater("Post-Process Floater")
+LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater(std::string("Post-Process Floater"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_post_process.xml");
 
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index b466952..82d8cc9 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -76,14 +76,6 @@
 #include "llscrollcontainer.h"
 #include "llfloaterhardwaresettings.h"
 
-#if LL_WINDOWS
-// for Logitech LCD keyboards / speakers
-#ifndef LL_LOGITECH_LCD_H
-#include "lllogitechlcd.h"
-#endif
-extern LLLCD	*gLcdScreen; 
-#endif
-
 const S32 PREF_BORDER = 4;
 const S32 PREF_PAD = 5;
 const S32 PREF_BUTTON_WIDTH = 70;
@@ -176,7 +168,7 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
 	mPrefsIM->getPanel()->setDefaultBtn(default_btn);
 
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 
 	// only add this option if we actually have a logitech keyboard / speaker set
 	if (gLcdScreen->Enabled())
@@ -277,7 +269,7 @@ void LLPreferenceCore::apply()
 	LLFloaterHardwareSettings::instance()->apply();
 
 	mWebPanel->apply();
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 	// only add this option if we actually have a logitech keyboard / speaker set
 	if (gLcdScreen->Enabled())
 	{
@@ -305,7 +297,7 @@ void LLPreferenceCore::cancel()
 	LLFloaterHardwareSettings::instance()->cancel();
 
 	mWebPanel->cancel();
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 	// only add this option if we actually have a logitech keyboard / speaker set
 	if (gLcdScreen->Enabled())
 	{
@@ -324,10 +316,7 @@ void LLPreferenceCore::onTabChanged(void* user_data, bool from_click)
 }
 
 
-void LLPreferenceCore::setPersonalInfo(
-	const char* visibility,
-	BOOL im_via_email,
-	const char* email)
+void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
 	mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
 }
@@ -457,7 +446,7 @@ void LLFloaterPreference::onBtnOK( void* userdata )
 		
 		std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
 		// save all settings, even if equals defaults
-		gCrashSettings.saveToFile(crash_settings_filename.c_str(), FALSE);
+		gCrashSettings.saveToFile(crash_settings_filename, FALSE);
 	}
 	else
 	{
@@ -510,15 +499,11 @@ void LLFloaterPreference::onBtnCancel( void* userdata )
 
 
 // static
-void LLFloaterPreference::updateUserInfo(
-	const char* visibility,
-	BOOL im_via_email,
-	const char* email)
+void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
 	if(sInstance && sInstance->mPreferenceCore)
 	{
-		sInstance->mPreferenceCore->setPersonalInfo(
-			visibility, im_via_email, email);
+		sInstance->mPreferenceCore->setPersonalInfo(visibility, im_via_email, email);
 	}
 }
 
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 939a4a4..2a19f26 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -69,10 +69,7 @@ public:
 
 	LLTabContainer* getTabContainer() { return mTabContainer; }
 
-	void setPersonalInfo(
-		const char* visibility,
-		BOOL im_via_email,
-		const char* email);
+	void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string&  email);
 
 	static void onTabChanged(void* user_data, bool from_click);
 	
@@ -109,10 +106,7 @@ public:
 	static void show(void*);
 
 	// static data update, called from message handler
-	static void updateUserInfo(
-		const char* visibility,
-		BOOL im_via_email,
-		const char* email);
+	static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email);
 
 	// refresh all the graphics preferences menus
 	static void refreshEnabledGraphics();
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 48232cb..e15d4db 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -346,7 +346,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 	////////////////
 	if(perm.isOwned())
 	{
-		LLString name;
+		std::string name;
 		if (perm.isGroupOwned())
 		{
 			gCacheName->getGroupName(perm.getGroup(), name);
@@ -373,14 +373,14 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 	//////////////////
 
 	// *TODO: Localize / translate this
-	time_t time_utc = (time_t)item->getCreationDate();
+	time_t time_utc = item->getCreationDate();
 	if (0 == time_utc)
 	{
 		childSetText("LabelAcquiredDate",getString("unknown"));
 	}
 	else
 	{
-		childSetText("LabelAcquiredDate", LLString(ctime(&time_utc)) );
+		childSetText("LabelAcquiredDate", std::string(ctime(&time_utc)) );
 	}
 
 	///////////////////////
@@ -942,7 +942,7 @@ void LLFloaterProperties::closeByID(const LLUUID& item_id, const LLUUID &object_
 /// LLMultiProperties
 ///----------------------------------------------------------------------------
 
-LLMultiProperties::LLMultiProperties(const LLRect &rect) : LLMultiFloater("Properties", rect)
+LLMultiProperties::LLMultiProperties(const LLRect &rect) : LLMultiFloater(std::string("Properties"), rect)
 {
 }
 
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 90d8af9..ffd7d48 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -47,6 +47,7 @@
 
 #include "llagent.h"
 #include "llalertdialog.h"
+#include "llappviewer.h"
 #include "llfloateravatarpicker.h"
 #include "llbutton.h" 
 #include "llcheckboxctrl.h"
@@ -77,12 +78,11 @@
 #include "llviewerwindow.h"
 #include "llvlcomposition.h"
 
+#define ELAR_ENABLED 0 // Enable when server support is implemented
+
 const S32 TERRAIN_TEXTURE_COUNT = 4;
 const S32 CORNER_COUNT = 4;
 
-extern LLString gLastVersionChannel;
-
-
 ///----------------------------------------------------------------------------
 /// Local class declaration
 ///----------------------------------------------------------------------------
@@ -263,7 +263,7 @@ void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
 	LLDispatcher::unpackMessage(msg, request, invoice, strings);
 	if(invoice != getLastInvoice())
 	{
-		llwarns << "Mismatched Estate message: " << request.c_str() << llendl;
+		llwarns << "Mismatched Estate message: " << request << llendl;
 		return;
 	}
 
@@ -271,9 +271,7 @@ void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
 	dispatch.dispatch(request, invoice, strings);
 
 	LLViewerRegion* region = gAgent.getRegion();
-	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-	panel->setCtrlsEnabled(allow_modify);
-
+	panel->updateControls(region);
 }
 
 
@@ -294,7 +292,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
 
 	// extract message
-	char sim_name[MAX_STRING];		/* Flawfinder: ignore*/
+	std::string sim_name;
 	U32 region_flags;
 	U8 agent_limit;
 	F32 object_bonus_factor;
@@ -304,7 +302,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
 	F32 terrain_lower_limit;
 	BOOL use_estate_sun;
 	F32 sun_hour;
-	msg->getString("RegionInfo", "SimName", MAX_STRING, sim_name);
+	msg->getString("RegionInfo", "SimName", sim_name);
 	msg->getU32("RegionInfo", "RegionFlags", region_flags);
 	msg->getU8("RegionInfo", "MaxAgents", agent_limit);
 	msg->getF32("RegionInfo", "ObjectBonusFactor", object_bonus_factor);
@@ -488,7 +486,7 @@ bool LLPanelRegionInfo::refreshFromRegion(LLViewerRegion* region)
 
 void LLPanelRegionInfo::sendEstateOwnerMessage(
 	LLMessageSystem* msg,
-	const char* request,
+	const std::string& request,
 	const LLUUID& invoice,
 	const strings_t& strings)
 {
@@ -513,43 +511,38 @@ void LLPanelRegionInfo::sendEstateOwnerMessage(
 		for(; it != end; ++it)
 		{
 			msg->nextBlock("ParamList");
-			msg->addString("Parameter", (*it).c_str());
+			msg->addString("Parameter", *it);
 		}
 	}
 	msg->sendReliable(mHost);
 }
 
-void LLPanelRegionInfo::enableButton(const char* btn_name, BOOL enable)
+void LLPanelRegionInfo::enableButton(const std::string& btn_name, BOOL enable)
 {
 	childSetEnabled(btn_name, enable);
 }
 
-void LLPanelRegionInfo::disableButton(const char* btn_name)
+void LLPanelRegionInfo::disableButton(const std::string& btn_name)
 {
 	childDisable(btn_name);
 }
 
-void LLPanelRegionInfo::initCtrl(const char* name)
+void LLPanelRegionInfo::initCtrl(const std::string& name)
 {
 	childSetCommitCallback(name, onChangeAnything, this);
 }
 
-void LLPanelRegionInfo::initTextCtrl(const char* name)
+void LLPanelRegionInfo::initHelpBtn(const std::string& name, const std::string& xml_alert)
 {
-	childSetCommitCallback(name, onChangeAnything, this);
-	childSetKeystrokeCallback("abuse_email_address", onChangeText, this);
-}
-
-void LLPanelRegionInfo::initHelpBtn(const char* name, const char* xml_alert)
-{
-	childSetAction(name, onClickHelp, (void*)xml_alert);
+	childSetAction(name, onClickHelp, new std::string(xml_alert));
 }
 
 // static
 void LLPanelRegionInfo::onClickHelp(void* data)
 {
-	const char* xml_alert = (const char*)data;
-	gViewerWindow->alertXml(xml_alert);
+	const std::string* xml_alert = (std::string*)data;
+	gViewerWindow->alertXml(*xml_alert);
+	delete xml_alert;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -630,7 +623,7 @@ void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& name
 		strings_t strings;
 		// [0] = our agent id
 		// [1] = target agent id
-		char buffer[MAX_STRING];		/* Flawfinder: ignore*/
+		std::string buffer;
 		gAgent.getID().toString(buffer);
 		strings.push_back(buffer);
 
@@ -658,7 +651,7 @@ void LLPanelRegionGeneralInfo::onKickAllCommit(S32 option, void* userdata)
 		if(!self) return;
 		strings_t strings;
 		// [0] = our agent id
-		char buffer[MAX_STRING];		/* Flawfinder: ignore*/
+		std::string buffer;
 		gAgent.getID().toString(buffer);
 		strings.push_back(buffer);
 
@@ -672,13 +665,13 @@ void LLPanelRegionGeneralInfo::onKickAllCommit(S32 option, void* userdata)
 void LLPanelRegionGeneralInfo::onClickMessage(void* userdata)
 {
 	llinfos << "LLPanelRegionGeneralInfo::onClickMessage" << llendl;
-	gViewerWindow->alertXmlEditText("MessageRegion", LLString::format_map_t(),
+	gViewerWindow->alertXmlEditText("MessageRegion", LLStringUtil::format_map_t(),
 									NULL, NULL,
 									onMessageCommit, userdata);
 }
 
 // static
-void LLPanelRegionGeneralInfo::onMessageCommit(S32 option, const LLString& text, void* userdata)
+void LLPanelRegionGeneralInfo::onMessageCommit(S32 option, const std::string& text, void* userdata)
 {
 	if(option != 0) return;
 	if(text.empty()) return;
@@ -693,7 +686,7 @@ void LLPanelRegionGeneralInfo::onMessageCommit(S32 option, const LLString& text,
 	// [4] message
 	strings.push_back("-1");
 	strings.push_back("-1");
-	char buffer[MAX_STRING];		/* Flawfinder: ignore*/
+	std::string buffer;
 	gAgent.getID().toString(buffer);
 	strings.push_back(buffer);
 	std::string name;
@@ -740,7 +733,7 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
 		body["prim_bonus"] = childGetValue("object_bonus_spin");
 		// the combo box stores strings "Mature" and "PG", but we have to convert back to a number, 
 		// because the sim doesn't know from strings for this stuff
-		body["sim_access"] = LLViewerRegion::stringToAccess(childGetValue("access_combo").asString().c_str());
+		body["sim_access"] = LLViewerRegion::stringToAccess(childGetValue("access_combo").asString());
 		body["restrict_pushobject"] = childGetValue("restrict_pushobject");
 		body["allow_parcel_changes"] = childGetValue("allow_parcel_changes_check");
 		body["block_parcel_search"] = childGetValue("block_parcel_search_check");
@@ -750,44 +743,43 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
 	else
 	{
 		strings_t strings;
-		char buffer[MAX_STRING];		/* Flawfinder: ignore*/
+		std::string buffer;
 
-		snprintf(buffer, MAX_STRING, "%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+		buffer = llformat("%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));
 		strings.push_back(strings_t::value_type(buffer));
 
-		snprintf(buffer, MAX_STRING, "%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+		buffer = llformat("%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));
 		strings.push_back(strings_t::value_type(buffer));
 
-		snprintf(buffer, MAX_STRING, "%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+		buffer = llformat("%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));
 		strings.push_back(strings_t::value_type(buffer));
 
-		snprintf(buffer, MAX_STRING, "%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+		buffer = llformat("%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));
 		strings.push_back(strings_t::value_type(buffer));
 
 		F32 value = (F32)childGetValue("agent_limit_spin").asReal();
-		snprintf(buffer, MAX_STRING, "%f", value);			/* Flawfinder: ignore */
+		buffer = llformat("%f", value);
 		strings.push_back(strings_t::value_type(buffer));
 
 		value = (F32)childGetValue("object_bonus_spin").asReal();
-		snprintf(buffer, MAX_STRING, "%f", value);			/* Flawfinder: ignore */
+		buffer = llformat("%f", value);
 		strings.push_back(strings_t::value_type(buffer));
 
-		U8 access = LLViewerRegion::stringToAccess(childGetValue("access_combo").asString().c_str());
-		snprintf(buffer, MAX_STRING, "%d", (S32)access);			/* Flawfinder: ignore */
+		U8 access = LLViewerRegion::stringToAccess(childGetValue("access_combo").asString());
+		buffer = llformat("%d", (S32)access);
 		strings.push_back(strings_t::value_type(buffer));
 
-		snprintf(buffer, MAX_STRING, "%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+		buffer = llformat("%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));
 		strings.push_back(strings_t::value_type(buffer));
 
-		snprintf(buffer, MAX_STRING, "%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+		buffer = llformat("%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));
 		strings.push_back(strings_t::value_type(buffer));
 
 		LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
 		sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
 
 		LLViewerRegion* region = gAgent.getRegion();
-		if (region
-			&& access != region->getSimAccess() )		/* Flawfinder: ignore */
+		if (region && access != region->getSimAccess() )
 		{
 			gViewerWindow->alertXml("RegionMaturityChange");
 		}
@@ -818,8 +810,7 @@ BOOL LLPanelRegionDebugInfo::postBuild()
 	initHelpBtn("restart_help",				"HelpRegionRestart");
 
 	childSetAction("choose_avatar_btn", onClickChooseAvatar, this);
-	childSetAction("return_scripted_other_land_btn", onClickReturnScriptedOtherLand, this);
-	childSetAction("return_scripted_all_btn", onClickReturnScriptedAll, this);
+	childSetAction("return_btn", onClickReturn, this);
 	childSetAction("top_colliders_btn", onClickTopColliders, this);
 	childSetAction("top_scripts_btn", onClickTopScripts, this);
 	childSetAction("restart_btn", onClickRestart, this);
@@ -834,10 +825,13 @@ bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region)
 	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
 	setCtrlsEnabled(allow_modify);
 	childDisable("apply_btn");
-
+	childDisable("target_avatar_name");
+	
 	childSetEnabled("choose_avatar_btn", allow_modify);
-	childSetEnabled("return_scripted_other_land_btn", allow_modify && !mTargetAvatar.isNull());
-	childSetEnabled("return_scripted_all_btn", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("return_scripts", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("return_other_land", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("return_estate_wide", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("return_btn", allow_modify && !mTargetAvatar.isNull());
 	childSetEnabled("top_colliders_btn", allow_modify);
 	childSetEnabled("top_scripts_btn", allow_modify);
 	childSetEnabled("restart_btn", allow_modify);
@@ -851,15 +845,15 @@ BOOL LLPanelRegionDebugInfo::sendUpdate()
 {
 	llinfos << "LLPanelRegionDebugInfo::sendUpdate" << llendl;
 	strings_t strings;
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
+	std::string buffer;
 
-	snprintf(buffer, MAX_STRING, "%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+	buffer = llformat("%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));
 	strings.push_back(buffer);
 
-	snprintf(buffer, MAX_STRING, "%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+	buffer = llformat("%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));
 	strings.push_back(buffer);
 
-	snprintf(buffer, MAX_STRING, "%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+	buffer = llformat("%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));
 	strings.push_back(buffer);
 
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
@@ -883,61 +877,56 @@ void LLPanelRegionDebugInfo::callbackAvatarID(const std::vector<std::string>& na
 }
 
 // static
-void LLPanelRegionDebugInfo::onClickReturnScriptedOtherLand(void* data)
+void LLPanelRegionDebugInfo::onClickReturn(void* data)
 {
 	LLPanelRegionDebugInfo* panelp = (LLPanelRegionDebugInfo*) data;
 	if (panelp->mTargetAvatar.isNull()) return;
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[USER_NAME]"] = panelp->childGetValue("target_avatar_name").asString();
-	gViewerWindow->alertXml("ReturnScriptedOnOthersLand", args, callbackReturnScriptedOtherLand, data);
+	gViewerWindow->alertXml("EstateObjectReturn", args, callbackReturn, data);
 }
 
 // static
-void LLPanelRegionDebugInfo::callbackReturnScriptedOtherLand( S32 option, void* userdata )
+void LLPanelRegionDebugInfo::callbackReturn( S32 option, void* userdata )
 {
 	if (option != 0) return;
 
 	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*) userdata;
 	if (!self->mTargetAvatar.isNull())
 	{
-		U32 flags = 0;
-		flags = flags | SWD_OTHERS_LAND_ONLY;
-		flags = flags | SWD_ALWAYS_RETURN_OBJECTS;
-		flags |= SWD_SCRIPTED_ONLY;
-
-		send_sim_wide_deletes(self->mTargetAvatar, flags);
-	}
-}
+		U32 flags = SWD_ALWAYS_RETURN_OBJECTS;
 
-// static
-void LLPanelRegionDebugInfo::onClickReturnScriptedAll(void* data)
-{
-	LLPanelRegionDebugInfo* panelp = (LLPanelRegionDebugInfo*) data;
-	if (panelp->mTargetAvatar.isNull()) return;
-	
-	
-	LLString::format_map_t args;
-	args["[USER_NAME]"] = panelp->childGetValue("target_avatar_name").asString();
-	gViewerWindow->alertXml("ReturnScriptedOnAllLand", args, callbackReturnScriptedAll, data);
-}
-
-// static
-void LLPanelRegionDebugInfo::callbackReturnScriptedAll( S32 option, void* userdata )
-{
-	if (option != 0) return;
+		if (self->childGetValue("return_scripts").asBoolean())
+		{
+			flags |= SWD_SCRIPTED_ONLY;
+		}
+		
+		if (self->childGetValue("return_other_land").asBoolean())
+		{
+			flags |= SWD_OTHERS_LAND_ONLY;
+		}
 
-	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*) userdata;
-	if (!self->mTargetAvatar.isNull())
-	{
-		U32 flags = 0;
-		flags |= SWD_ALWAYS_RETURN_OBJECTS;
-		flags |= SWD_SCRIPTED_ONLY;
+		if (self->childGetValue("return_estate_wide").asBoolean())
+		{
+			// send as estate message - routed by spaceserver to all regions in estate
+			strings_t strings;
+			strings.push_back(llformat("%d", flags));
+			strings.push_back(self->mTargetAvatar.asString());
 
-		send_sim_wide_deletes(self->mTargetAvatar, flags);
+			LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+		
+			self->sendEstateOwnerMessage(gMessageSystem, "estateobjectreturn", invoice, strings);
+		}
+		else
+		{
+			// send to this simulator only
+			send_sim_wide_deletes(self->mTargetAvatar, flags);
+		}
 	}
 }
 
+
 // static
 void LLPanelRegionDebugInfo::onClickTopColliders(void* data)
 {
@@ -1018,10 +1007,10 @@ bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
 
 	LLVLComposition* compp = region->getComposition();
 	LLTextureCtrl* texture_ctrl;
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
+	std::string buffer;
 	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
 	{
-		snprintf(buffer, MAX_STRING, "texture_detail_%d", i);			/* Flawfinder: ignore */
+		buffer = llformat("texture_detail_%d", i);
 		texture_ctrl = getChild<LLTextureCtrl>(buffer);
 		if(texture_ctrl)
 		{
@@ -1034,9 +1023,9 @@ bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
 
 	for(S32 i = 0; i < CORNER_COUNT; ++i)
     {
-		snprintf(buffer, MAX_STRING, "height_start_spin_%d", i);			/* Flawfinder: ignore */
+		buffer = llformat("height_start_spin_%d", i);
 		childSetValue(buffer, LLSD(compp->getStartHeight(i)));
-		snprintf(buffer, MAX_STRING, "height_range_spin_%d", i);		/* Flawfinder: ignore */
+		buffer = llformat("height_range_spin_%d", i);
 		childSetValue(buffer, LLSD(compp->getHeightRange(i)));
 	}
 
@@ -1048,18 +1037,18 @@ bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
 BOOL LLPanelRegionTextureInfo::postBuild()
 {
 	LLPanelRegionInfo::postBuild();
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
+	std::string buffer;
 	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
 	{
-		snprintf(buffer, MAX_STRING, "texture_detail_%d", i);			/* Flawfinder: ignore */
+		buffer = llformat("texture_detail_%d", i);
 		initCtrl(buffer);
 	}
 
 	for(S32 i = 0; i < CORNER_COUNT; ++i)
 	{
-		snprintf(buffer, MAX_STRING, "height_start_spin_%d", i);			/* Flawfinder: ignore */
+		buffer = llformat("height_start_spin_%d", i);
 		initCtrl(buffer);
-		snprintf(buffer, MAX_STRING, "height_range_spin_%d", i);			/* Flawfinder: ignore */
+		buffer = llformat("height_range_spin_%d", i);
 		initCtrl(buffer);
 	}
 
@@ -1081,9 +1070,8 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
 	}
 
 	LLTextureCtrl* texture_ctrl;
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-	char buffer2[MAX_STRING];		/* Flawfinder: ignore */
-	char id_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
+	std::string buffer;
+	std::string id_str;
 	LLMessageSystem* msg = gMessageSystem;
 	strings_t strings;
 
@@ -1091,24 +1079,24 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
 	
 	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
 	{
-		snprintf(buffer, MAX_STRING, "texture_detail_%d", i);			/* Flawfinder: ignore */
+		buffer = llformat("texture_detail_%d", i);
 		texture_ctrl = getChild<LLTextureCtrl>(buffer);
 		if(texture_ctrl)
 		{
 			LLUUID tmp_id(texture_ctrl->getImageAssetID());
 			tmp_id.toString(id_str);
-			snprintf(buffer, MAX_STRING, "%d %s", i, id_str);			/* Flawfinder: ignore */
-			strings.push_back(strings_t::value_type(buffer));
+			buffer = llformat("%d %s", i, id_str.c_str());
+			strings.push_back(buffer);
 		}
 	}
 	sendEstateOwnerMessage(msg, "texturedetail", invoice, strings);
 	strings.clear();
 	for(S32 i = 0; i < CORNER_COUNT; ++i)
 	{
-		snprintf(buffer, MAX_STRING, "height_start_spin_%d", i);			/* Flawfinder: ignore */
-		snprintf(buffer2, MAX_STRING, "height_range_spin_%d", i);			/* Flawfinder: ignore */
-		snprintf(buffer, MAX_STRING, "%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());			/* Flawfinder: ignore */
-		strings.push_back(strings_t::value_type(buffer));
+		buffer = llformat("height_start_spin_%d", i);
+		std::string buffer2 = llformat("height_range_spin_%d", i);
+		std::string buffer3 = llformat("%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());
+		strings.push_back(buffer3);
 	}
 	sendEstateOwnerMessage(msg, "textureheights", invoice, strings);
 	strings.clear();
@@ -1120,8 +1108,8 @@ BOOL LLPanelRegionTextureInfo::validateTextureSizes()
 {
 	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
 	{
-		char buffer[MAX_STRING];		/* Flawfinder: ignore */
-		snprintf(buffer, MAX_STRING, "texture_detail_%d", i);			/* Flawfinder: ignore */
+		std::string buffer;
+		buffer = llformat("texture_detail_%d", i);
 		LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(buffer);
 		if (!texture_ctrl) continue;
 
@@ -1136,7 +1124,7 @@ BOOL LLPanelRegionTextureInfo::validateTextureSizes()
 
 		if (components != 3)
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[TEXTURE_NUM]"] = llformat("%d",i+1);
 			args["[TEXTURE_BIT_DEPTH]"] = llformat("%d",components * 8);
 			gViewerWindow->alertXml("InvalidTerrainBitDepth", args);
@@ -1146,7 +1134,7 @@ BOOL LLPanelRegionTextureInfo::validateTextureSizes()
 		if (width > 512 || height > 512)
 		{
 
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[TEXTURE_NUM]"] = llformat("%d",i+1);
 			args["[TEXTURE_SIZE_X]"] = llformat("%d",width);
 			args["[TEXTURE_SIZE_Y]"] = llformat("%d",height);
@@ -1222,21 +1210,21 @@ bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
 BOOL LLPanelRegionTerrainInfo::sendUpdate()
 {
 	llinfos << "LLPanelRegionTerrainInfo::sendUpdate" << llendl;
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
+	std::string buffer;
 	strings_t strings;
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
 
-	snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("water_height_spin").asReal());			/* Flawfinder: ignore */
+	buffer = llformat("%f", (F32)childGetValue("water_height_spin").asReal());
 	strings.push_back(buffer);
-	snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("terrain_raise_spin").asReal());			/* Flawfinder: ignore */
+	buffer = llformat("%f", (F32)childGetValue("terrain_raise_spin").asReal());
 	strings.push_back(buffer);
-	snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("terrain_lower_spin").asReal());			/* Flawfinder: ignore */
+	buffer = llformat("%f", (F32)childGetValue("terrain_lower_spin").asReal());
 	strings.push_back(buffer);
-	snprintf(buffer, MAX_STRING, "%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+	buffer = llformat("%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));
 	strings.push_back(buffer);
-	snprintf(buffer, MAX_STRING, "%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));			/* Flawfinder: ignore */
+	buffer = llformat("%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));
 	strings.push_back(buffer);
-	snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("sun_hour_slider").asReal() );			/* Flawfinder: ignore */
+	buffer = llformat("%f", (F32)childGetValue("sun_hour_slider").asReal() );
 	strings.push_back(buffer);
 
 	// Grab estate information in case the user decided to set the
@@ -1262,11 +1250,11 @@ BOOL LLPanelRegionTerrainInfo::sendUpdate()
 		estate_sun_hour = panel->getSunHour();
 	}
 
-	snprintf(buffer, MAX_STRING, "%s", (estate_global_time ? "Y" : "N") );			/* Flawfinder: ignore */
+	buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
 	strings.push_back(buffer);
-	snprintf(buffer, MAX_STRING, "%s", (estate_fixed_sun ? "Y" : "N") );			/* Flawfinder: ignore */
+	buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );
 	strings.push_back(buffer);
-	snprintf(buffer, MAX_STRING, "%f", estate_sun_hour);			/* Flawfinder: ignore */
+	buffer = llformat("%f", estate_sun_hour);
 	strings.push_back(buffer);
 
 	sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);
@@ -1317,7 +1305,7 @@ void LLPanelRegionTerrainInfo::onClickDownloadRaw(void* data)
 		llwarns << "No file" << llendl;
 		return;
 	}
-	LLString filepath = picker.getFirstFile();
+	std::string filepath = picker.getFirstFile();
 
 	LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
 	strings_t strings;
@@ -1336,7 +1324,7 @@ void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)
 		llwarns << "No file" << llendl;
 		return;
 	}
-	LLString filepath = picker.getFirstFile();
+	std::string filepath = picker.getFirstFile();
 
 	LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
 	strings_t strings;
@@ -1451,7 +1439,7 @@ void LLPanelEstateInfo::onClickAddAllowedAgent(void* user_data)
 	{
 		//args
 
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MAX_AGENTS]"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
 		gViewerWindow->alertXml("MaxAllowedAgentOnRegion", args);
 		return;
@@ -1473,7 +1461,7 @@ void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)
 	if (!list) return;
 	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MAX_GROUPS]"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
 		gViewerWindow->alertXml("MaxAllowedGroupsOnRegion", args);
 		return;
@@ -1525,7 +1513,7 @@ void LLPanelEstateInfo::onClickAddBannedAgent(void* user_data)
 	if (!list) return;
 	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MAX_BANNED]"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
 		gViewerWindow->alertXml("MaxBannedAgentsOnRegion", args);
 		return;
@@ -1547,7 +1535,7 @@ void LLPanelEstateInfo::onClickAddEstateManager(void* user_data)
 	if (!list) return;
 	if (list->getItemCount() >= ESTATE_MAX_MANAGERS)
 	{	// Tell user they can't add more managers
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MAX_MANAGER]"] = llformat("%d",ESTATE_MAX_MANAGERS);
 		gViewerWindow->alertXml("MaxManagersOnRegion", args);
 	}
@@ -1569,7 +1557,7 @@ void LLPanelEstateInfo::onClickRemoveEstateManager(void* user_data)
 struct LLKickFromEstateInfo
 {
 	LLPanelEstateInfo *mEstatePanelp;
-	LLString    mDialogName;
+	std::string    mDialogName;
 	LLUUID      mAgentID;
 };
 
@@ -1605,7 +1593,7 @@ void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names,
 	kick_info->mAgentID     = ids[0];
 
 	//Bring up a confirmation dialog
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[EVIL_USER]"] = names[0];
 	gViewerWindow->alertXml(kick_info->mDialogName, args, LLPanelEstateInfo::kickUserConfirm, (void*)kick_info);
 
@@ -1619,14 +1607,14 @@ void LLPanelEstateInfo::kickUserConfirm(S32 option, void* userdata)
 
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
 	strings_t strings;
-	char buffer[MAX_STRING];		/* Flawfinder: ignore*/
+	std::string buffer;
 
 	switch(option)
 	{
 	case 0:
 		//Kick User
 		kick_info->mAgentID.toString(buffer);
-		strings.push_back(strings_t::value_type(buffer));
+		strings.push_back(buffer);
 
 		kick_info->mEstatePanelp->sendEstateOwnerMessage(gMessageSystem, "kickestate", invoice, strings);
 		break;
@@ -1681,7 +1669,7 @@ typedef std::vector<LLUUID> AgentOrGroupIDsVector;
 struct LLEstateAccessChangeInfo
 {
 	U32 mOperationFlag;	// ESTATE_ACCESS_BANNED_AGENT_ADD, _REMOVE, etc.
-	LLString mDialogName;
+	std::string mDialogName;
 	AgentOrGroupIDsVector mAgentOrGroupIDs; // List of agent IDs to apply to this change
 };
 
@@ -1700,14 +1688,14 @@ void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)
 	}
 	else
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[ALL_ESTATES]"] = all_estates_text();
 		gViewerWindow->alertXml(change_info->mDialogName, args, accessCoreConfirm, (void*)change_info);
 	}
 }
 
 // static
-void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const char* dialog_name)
+void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const std::string& dialog_name)
 {
 	LLEstateAccessChangeInfo* change_info = new LLEstateAccessChangeInfo;
 	change_info->mOperationFlag = operation_flag;
@@ -1767,7 +1755,7 @@ void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, co
 		int currentCount = (list ? list->getItemCount() : 0);
 		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[NUM_ADDED]"] = llformat("%d",ids.size());
 			args["[MAX_AGENTS]"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
 			args["[LIST_TYPE]"] = "Allowed Residents";
@@ -1783,7 +1771,7 @@ void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, co
 		int currentCount = (list ? list->getItemCount() : 0);
 		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[NUM_ADDED]"] = llformat("%d",ids.size());
 			args["[MAX_AGENTS]"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
 			args["[LIST_TYPE]"] = "Banned Residents";
@@ -1802,14 +1790,14 @@ void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, co
 	else
 	{
 		// ask if this estate or all estates with this owner
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[ALL_ESTATES]"] = all_estates_text();
 		gViewerWindow->alertXml(change_info->mDialogName, args, accessCoreConfirm, (void*)change_info);
 	}
 }
 
 // static
-void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const char* dialog_name, const char* list_ctrl_name)
+void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const std::string& dialog_name, const std::string& list_ctrl_name)
 {
 	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
 	if (!panel) return;
@@ -1866,7 +1854,7 @@ void LLPanelEstateInfo::accessRemoveCore2(S32 option, void* data)
 	}
 	else
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[ALL_ESTATES]"] = all_estates_text();
 		gViewerWindow->alertXml(change_info->mDialogName, 
 					args, 
@@ -1953,12 +1941,12 @@ void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_
 	msg->addString("Method", "estateaccessdelta");
 	msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
 
-	char buf[MAX_STRING];		/* Flawfinder: ignore*/
+	std::string buf;
 	gAgent.getID().toString(buf);
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", buf);
 
-	snprintf(buf, MAX_STRING, "%u", flags);			/* Flawfinder: ignore */
+	buf = llformat("%u", flags);
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", buf);
 
@@ -1979,8 +1967,7 @@ void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_
 	gAgent.sendReliableMessage();
 }
 
-
-bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
+void LLPanelEstateInfo::updateControls(LLViewerRegion* region)
 {
 	BOOL god = gAgent.isGodlike();
 	BOOL owner = (region && (region->getOwner() == gAgent.getID()));
@@ -1996,13 +1983,22 @@ bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
 	childSetEnabled("remove_banned_avatar_btn",		god || owner || manager);
 	childSetEnabled("message_estate_btn",			god || owner || manager);
 	childSetEnabled("kick_user_from_estate_btn",	god || owner || manager);
+#if ELAR_ENABLED
 	childSetEnabled("abuse_email_address", 			god || owner || manager);
+#else
+	childSetEnabled("abuse_email_address", 			false);
+#endif
 
 	// estate managers can't add estate managers
 	childSetEnabled("add_estate_manager_btn",		god || owner);
 	childSetEnabled("remove_estate_manager_btn",	god || owner);
 	childSetEnabled("estate_manager_name_list",		god || owner);
+}
 
+bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	updateControls(region);
+	
 	// let the parent class handle the general data collection. 
 	bool rv = LLPanelRegionInfo::refreshFromRegion(region);
 
@@ -2057,7 +2053,8 @@ BOOL LLPanelEstateInfo::postBuild()
 	initCtrl("limit_payment");
 	initCtrl("limit_age_verified");
 	initCtrl("voice_chat_check");
-	initTextCtrl("abuse_email_address");
+	childSetCommitCallback("abuse_email_address", onChangeAnything, this);
+	childSetKeystrokeCallback("abuse_email_address", onChangeText, this);
 
 	initHelpBtn("estate_manager_help",			"HelpEstateEstateManager");
 	initHelpBtn("use_global_time_help",			"HelpEstateUseGlobalTime");
@@ -2305,10 +2302,10 @@ void LLPanelEstateInfo::commitEstateInfoDataserver()
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", getEstateName());
 
-	char buf[MAX_STRING];		/* Flawfinder: ignore*/
-	snprintf(buf, MAX_STRING, "%u", computeEstateFlags());			/* Flawfinder: ignore */
+	std::string buffer;
+	buffer = llformat("%u", computeEstateFlags());
 	msg->nextBlock("ParamList");
-	msg->addString("Parameter", buf);
+	msg->addString("Parameter", buffer);
 
 	F32 sun_hour = getSunHour();
 	if (childGetValue("use_global_time_check").asBoolean())
@@ -2316,9 +2313,9 @@ void LLPanelEstateInfo::commitEstateInfoDataserver()
 		sun_hour = 0.f;	// 0 = global time
 	}
 
-	snprintf(buf, MAX_STRING, "%d", (S32)(sun_hour*1024.0f));	/* Flawfinder: ignore */
+	buffer = llformat("%d", (S32)(sun_hour*1024.0f));
 	msg->nextBlock("ParamList");
-	msg->addString("Parameter", buf);
+	msg->addString("Parameter", buffer);
 
 	gAgent.sendMessage();
 }
@@ -2489,8 +2486,8 @@ void LLPanelEstateInfo::setAccessAllowedEnabled(bool enable_agent,
 // static
 void LLPanelEstateInfo::callbackCacheName(
 	const LLUUID& id,
-	const char* first,
-	const char* last,
+	const std::string& first,
+	const std::string& last,
 	BOOL is_group,
 	void*)
 {
@@ -2505,9 +2502,7 @@ void LLPanelEstateInfo::callbackCacheName(
 	}
 	else
 	{
-		name = first;
-		name += " ";
-		name += last;
+		name = first + " " + last;
 	}
 
 	self->setOwnerName(name);
@@ -2556,7 +2551,7 @@ BOOL LLPanelEstateInfo::checkRemovalButton(std::string name)
 
 	// enable the remove button if something is selected
 	LLNameListCtrl* name_list = getChild<LLNameListCtrl>(name);
-	childSetEnabled(btn_name.c_str(), name_list && name_list->getFirstSelected() ? TRUE : FALSE);
+	childSetEnabled(btn_name, name_list && name_list->getFirstSelected() ? TRUE : FALSE);
 
 	return (btn_name != "");
 }
@@ -2576,13 +2571,13 @@ BOOL LLPanelEstateInfo::checkSunHourSlider(LLUICtrl* child_ctrl)
 void LLPanelEstateInfo::onClickMessageEstate(void* userdata)
 {
 	llinfos << "LLPanelEstateInfo::onClickMessageEstate" << llendl;
-	gViewerWindow->alertXmlEditText("MessageEstate", LLString::format_map_t(),
+	gViewerWindow->alertXmlEditText("MessageEstate", LLStringUtil::format_map_t(),
 									NULL, NULL,
 									onMessageCommit, userdata);
 }
 
 // static
-void LLPanelEstateInfo::onMessageCommit(S32 option, const LLString& text, void* userdata)
+void LLPanelEstateInfo::onMessageCommit(S32 option, const std::string& text, void* userdata)
 {
 	if(option != 0) return;
 	if(text.empty()) return;
@@ -2683,7 +2678,7 @@ BOOL LLPanelEstateCovenant::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop
 								  EDragAndDropType cargo_type,
 								  void* cargo_data,
 								  EAcceptance* accept,
-								  LLString& tooltip_msg)
+								  std::string& tooltip_msg)
 {
 	LLInventoryItem* item = (LLInventoryItem*)cargo_data;
 
@@ -2809,7 +2804,7 @@ void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
 
 			if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
 			{
-				if( !panelp->mEditor->importBuffer( buffer ) )
+				if( !panelp->mEditor->importBuffer( buffer, file_length+1 ) )
 				{
 					llwarns << "Problem importing estate covenant." << llendl;
 					gViewerWindow->alertXml("ProblemImportingEstateCovenant");
@@ -2972,22 +2967,24 @@ bool LLDispatchEstateUpdateInfo::operator()(
 	// NOTE: LLDispatcher extracts strings with an extra \0 at the
 	// end.  If we pass the std::string direct to the UI/renderer
 	// it draws with a weird character at the end of the string.
-	std::string estate_name = strings[0].c_str();
+	std::string estate_name = strings[0].c_str(); // preserve c_str() call!
 	panel->setEstateName(estate_name);
-
+	
+#if ELAR_ENABLED
 	if (strings.size() > 9)
 	{
-		std::string abuse_email = strings[9].c_str();
+		std::string abuse_email = strings[9].c_str(); // preserve c_str() call!
 		panel->setAbuseEmailAddress(abuse_email);
 	}
 	else
+#endif
 	{
-		panel->setAbuseEmailAddress("@ Old Server @");
+		panel->setAbuseEmailAddress(panel->getString("email_unsupported"));
 	}
 
 	LLViewerRegion* regionp = gAgent.getRegion();
 
-	LLUUID owner_id(strings[1].c_str());
+	LLUUID owner_id(strings[1]);
 	regionp->setOwner(owner_id);
 	// Update estate owner name in UI
 	const BOOL is_group = FALSE;
@@ -3105,7 +3102,7 @@ bool LLDispatchSetEstateAccess::operator()(
 				allowed_agent_name_list->addNameItem(id);
 			}
 			panel->childSetEnabled("remove_allowed_avatar_btn", allowed_agent_name_list->getFirstSelected() ? TRUE : FALSE);
-			allowed_agent_name_list->sortByColumn(0, TRUE);
+			allowed_agent_name_list->sortByColumnIndex(0, TRUE);
 		}
 	}
 
@@ -3129,7 +3126,7 @@ bool LLDispatchSetEstateAccess::operator()(
 				allowed_group_name_list->addGroupNameItem(id);
 			}
 			panel->childSetEnabled("remove_allowed_group_btn", allowed_group_name_list->getFirstSelected() ? TRUE : FALSE);
-			allowed_group_name_list->sortByColumn(0, TRUE);
+			allowed_group_name_list->sortByColumnIndex(0, TRUE);
 		}
 	}
 
@@ -3161,7 +3158,7 @@ bool LLDispatchSetEstateAccess::operator()(
 				banned_agent_name_list->addNameItem(id);
 			}
 			panel->childSetEnabled("remove_banned_avatar_btn", banned_agent_name_list->getFirstSelected() ? TRUE : FALSE);
-			banned_agent_name_list->sortByColumn(0, TRUE);
+			banned_agent_name_list->sortByColumnIndex(0, TRUE);
 		}
 	}
 
@@ -3188,7 +3185,7 @@ bool LLDispatchSetEstateAccess::operator()(
 				estate_manager_name_list->addNameItem(id);
 			}
 			panel->childSetEnabled("remove_estate_manager_btn", estate_manager_name_list->getFirstSelected() ? TRUE : FALSE);
-			estate_manager_name_list->sortByColumn(0, TRUE);
+			estate_manager_name_list->sortByColumnIndex(0, TRUE);
 		}
 	}
 
diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index 5e8ca1e..7002b2c 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -102,7 +102,7 @@ protected:
 class LLPanelRegionInfo : public LLPanel
 {
 public:
-	LLPanelRegionInfo() : LLPanel("Region Info Panel") {}
+	LLPanelRegionInfo() : LLPanel(std::string("Region Info Panel")) {}
 	static void onBtnSet(void* user_data);
 	static void onChangeChildCtrl(LLUICtrl* ctrl, void* user_data);
 	static void onChangeAnything(LLUICtrl* ctrl, void* user_data);
@@ -114,13 +114,12 @@ public:
 	virtual BOOL postBuild();
 	virtual void updateChild(LLUICtrl* child_ctrl);
 	
-	void enableButton(const char* btn_name, BOOL enable = TRUE);
-	void disableButton(const char* btn_name);
+	void enableButton(const std::string& btn_name, BOOL enable = TRUE);
+	void disableButton(const std::string& btn_name);
 	
 protected:
-	void initCtrl(const char* name);
-	void initTextCtrl(const char* name);
-	void initHelpBtn(const char* name, const char* xml_alert);
+	void initCtrl(const std::string& name);
+	void initHelpBtn(const std::string& name, const std::string& xml_alert);
 
 	// Callback for all help buttons, data is name of XML alert to show.
 	static void onClickHelp(void* data);
@@ -133,7 +132,7 @@ protected:
 	//typedef std::vector<U32> integers_t;
 	void sendEstateOwnerMessage(
 					 LLMessageSystem* msg,
-					 const char* request,
+					 const std::string& request,
 					 const LLUUID& invoice,
 					 const strings_t& strings);
 	
@@ -164,7 +163,7 @@ protected:
 	static void onClickKickAll(void* userdata);
 	static void onKickAllCommit(S32 option, void* userdata);
 	static void onClickMessage(void* userdata);
-	static void onMessageCommit(S32 option, const LLString& text, void* userdata);
+	static void onMessageCommit(S32 option, const std::string& text, void* userdata);
 	static void onClickManageTelehub(void* data);
 };
 
@@ -186,10 +185,8 @@ protected:
 
 	static void onClickChooseAvatar(void*);
 	static void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data);
-	static void onClickReturnScriptedOtherLand(void*);
-	static void callbackReturnScriptedOtherLand(S32 option, void*);
-	static void onClickReturnScriptedAll(void*);
-	static void callbackReturnScriptedAll(S32 option, void*);
+	static void onClickReturn(void *);
+	static void callbackReturn(S32 option, void*);
 	static void onClickTopColliders(void*);
 	static void onClickTopScripts(void*);
 	static void onClickRestart(void* data);
@@ -276,11 +273,11 @@ public:
 	static void addAllowedGroup2(LLUUID id, void* data);
 
 	// Core methods for all above add/remove button clicks
-	static void accessAddCore(U32 operation_flag, const char* dialog_name);
+	static void accessAddCore(U32 operation_flag, const std::string& dialog_name);
 	static void accessAddCore2(S32 option, void* data);
 	static void accessAddCore3(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data);
 
-	static void accessRemoveCore(U32 operation_flag, const char* dialog_name, const char* list_ctrl_name);
+	static void accessRemoveCore(U32 operation_flag, const std::string& dialog_name, const std::string& list_ctrl_name);
 	static void accessRemoveCore2(S32 option, void* data);
 
 	// used for both add and remove operations
@@ -292,11 +289,13 @@ public:
 
 	static void onKickUserCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata);
 	static void onClickMessageEstate(void* data);
-	static void onMessageCommit(S32 option, const LLString& text, void* data);
+	static void onMessageCommit(S32 option, const std::string& text, void* data);
 	
 	LLPanelEstateInfo();
 	~LLPanelEstateInfo() {}
 	
+	void updateControls(LLViewerRegion* region);
+	
 	virtual bool refreshFromRegion(LLViewerRegion* region);
 	virtual bool estateUpdate(LLMessageSystem* msg);
 	
@@ -337,8 +336,8 @@ public:
 	// llmessage/llcachename.h:LLCacheNameCallback
 	static void callbackCacheName(
 		const LLUUID& id,
-		const char* first,
-		const char* last,
+		const std::string& first,
+		const std::string& last,
 		BOOL is_group,
 		void*);
 
@@ -377,7 +376,7 @@ public:
 	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
 						   BOOL drop, EDragAndDropType cargo_type,
 						   void *cargo_data, EAcceptance *accept,
-						   LLString& tooltip_msg);
+						   std::string& tooltip_msg);
 	static void confirmChangeCovenantCallback(S32 option, void* userdata);
 	static void resetCovenantID(void* userdata);
 	static void confirmResetCovenantCallback(S32 option, void* userdata);
diff --git a/linden/indra/newview/llfloaterreleasemsg.cpp b/linden/indra/newview/llfloaterreleasemsg.cpp
deleted file mode 100644
index fc35e5c..0000000
--- a/linden/indra/newview/llfloaterreleasemsg.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/** 
- * @file llfloaterreleasemsg.cpp
- * @brief In-world HTML dialog
- *
- * $LicenseInfo:firstyear=2005&license=viewergpl$
- * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
-#include "llviewercontrol.h"
-#include "llfloaterreleasemsg.h"
-#include "llagent.h"
-#include "llviewerregion.h"
-#include "llappviewer.h"
-
-extern LLAgent gAgent;
-
-
-LLFloaterReleaseMsg* LLFloaterReleaseMsg::sInstance = 0;
-bool LLFloaterReleaseMsg::sDisplayMessage = false;
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterReleaseMsg* LLFloaterReleaseMsg::getInstance()
-{
-    if ( ! sInstance )
-        sInstance = new LLFloaterReleaseMsg;
-
-	return sInstance;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterReleaseMsg::LLFloaterReleaseMsg()
-:	LLFloater( "Release Message Floater" )
-
-        ,
-	mWebBrowser( 0 )
-{
-	// create floater from its XML definition
-	LLUICtrlFactory::getInstance()->buildFloater( this, "floater_sim_release_message.xml" );
-
-	mTitleBase = getTitle();
-
-	// reposition floater from saved settings
-	LLRect rect = gSavedSettings.getRect( "HtmlReleaseMessage" );
-	reshape( rect.getWidth(), rect.getHeight(), FALSE );
-	setRect( rect );
-
-	mWebBrowser = getChild<LLWebBrowserCtrl>("release_message_floater_browser" );
-	if ( mWebBrowser )
-	{
-		// observe browser events
-		mWebBrowser->addObserver( this );
-
-		// make links open in external browser
-		mWebBrowser->setOpenInExternalBrowser( true );
-
-		// don't automatically open secondlife links since we want to catch
-		// special ones that do other stuff (like open F1 Help)
-		//mWebBrowser->setOpenSecondLifeLinksInMap( false );
-	}
-			
-	childSetAction("close_btn", onClickClose, this);
-	setDefaultBtn("close_btn");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterReleaseMsg::~LLFloaterReleaseMsg()
-{
-	// stop observing browser events
-	if ( mWebBrowser )
-		mWebBrowser->remObserver( this );
-
-	// save position of floater
-	gSavedSettings.setRect( "HtmlReleaseMessage", getRect() );
-
-	sInstance = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterReleaseMsg::show()
-{
-
-	std::string url = gAgent.getRegion()->getCapability("ServerReleaseNotes");
-
-	if (url.empty()) return;
-
-	llinfos << "Release message url: " << url << llendl;
-
-	if (!sInstance)
-	{
-		sInstance = new LLFloaterReleaseMsg();
-		sInstance->center();
-	}
-
-	sInstance->setTitle(sInstance->mTitleBase + " " + gLastVersionChannel);
-	sInstance->open();
-
-	// navigate to the URL
-	if ( sInstance->mWebBrowser )
-		sInstance->mWebBrowser->navigateTo( url );
-
-	// make floater appear
-	sInstance->setVisibleAndFrontmost();
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterReleaseMsg::onClickClose( void* data )
-{
-	LLFloaterReleaseMsg* self = ( LLFloaterReleaseMsg* )data;
-
-	self->setVisible( false );
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-//
-
-// return true if it's a new version and we should display a notification
-bool LLFloaterReleaseMsg::checkVersion(const LLString& version_channel)
-{
-	bool res = false;
-	if (gLastVersionChannel != version_channel)
-	{
-		res = !gLastVersionChannel.empty(); // don't show message on initial login
-		gLastVersionChannel = version_channel;
-	}
-	return res;
-}
-
-void LLFloaterReleaseMsg::displayMessage(const LLString& version_channel)
-{
-	//if we have the capability already, display the url, otherwise wait on it
-	if (gAgent.getRegion()->getCapability("ServerReleaseNotes").empty())
-	{
-		sDisplayMessage = true;
-	}
-	else
-	{
-		sDisplayMessage = false;
-		show();
-	}
-}
diff --git a/linden/indra/newview/llfloaterreleasemsg.h b/linden/indra/newview/llfloaterreleasemsg.h
deleted file mode 100644
index 917a6ee..0000000
--- a/linden/indra/newview/llfloaterreleasemsg.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/** 
- * @file LLFloaterReleaseMsg.h
- *
- * $LicenseInfo:firstyear=2005&license=viewergpl$
- * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERRELMSG_H
-#define LL_LLFLOATERRELMSG_H
-
-#include "llwebbrowserctrl.h"
-#include "llfloater.h"
-
-class LLFloaterReleaseMsg :
-	public LLFloater,
-	public LLWebBrowserCtrlObserver
-{
-	public:
-		static LLFloaterReleaseMsg* getInstance();
-		virtual ~LLFloaterReleaseMsg();
-				
-		static void show();
-		static void onClickClose( void* data );
-		static bool checkVersion(const LLString& version_channel);
-		static void displayMessage(const LLString& version_channel);
-
-		static bool sDisplayMessage;
-		static LLFloaterReleaseMsg* sInstance;
-		LLString mTitleBase;
-	private:
-		LLFloaterReleaseMsg();
-		LLWebBrowserCtrl* mWebBrowser;
-		LLButton* mCloseButton;
-};
-
-#endif
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 49c6e83..3a9829d 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -137,8 +137,8 @@ LLFloaterReporter::LLFloaterReporter(
 	if (pick_btn)
 	{
 		// XUI: Why aren't these in viewerart.ini?
-		pick_btn->setImages( "UIImgFaceUUID",
-							"UIImgFaceSelectedUUID" );
+		pick_btn->setImages( std::string("UIImgFaceUUID"),
+							std::string("UIImgFaceSelectedUUID") );
 		childSetAction("pick_btn", onClickObjPicker, this);
 	}
 
@@ -173,8 +173,8 @@ LLFloaterReporter::LLFloaterReporter(
 	setVisible(TRUE);
 
 	// Default text to be blank
-	childSetText("object_name", LLString::null);
-	childSetText("owner_name", LLString::null);
+	childSetText("object_name", LLStringUtil::null);
+	childSetText("owner_name", LLStringUtil::null);
 
 	childSetFocus("summary_edit");
 
@@ -308,7 +308,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
 			if (objectp->isAvatar())
 			{
 				// we have the information we need
-				LLString object_owner;
+				std::string object_owner;
 
 				LLNameValue* firstname = objectp->getNVPair("FirstName");
 				LLNameValue* lastname =  objectp->getNVPair("LastName");
@@ -391,10 +391,10 @@ void LLFloaterReporter::onClickSend(void *userdata)
 		{
 			if ( ! self->mCopyrightWarningSeen )
 			{
-				LLString details_lc = self->childGetText("details_edit");
-				LLString::toLower( details_lc );
-				LLString summary_lc = self->childGetText("summary_edit");
-				LLString::toLower( summary_lc );
+				std::string details_lc = self->childGetText("details_edit");
+				LLStringUtil::toLower( details_lc );
+				std::string summary_lc = self->childGetText("summary_edit");
+				LLStringUtil::toLower( summary_lc );
 				if ( details_lc.find( "copyright" ) != std::string::npos ||
 					summary_lc.find( "copyright" ) != std::string::npos )
 				{
@@ -457,8 +457,8 @@ void LLFloaterReporter::onClickObjPicker(void *userdata)
 	LLToolObjPicker::getInstance()->setExitCallback(LLFloaterReporter::closePickTool, self);
 	LLToolMgr::getInstance()->setTransientTool(LLToolObjPicker::getInstance());
 	self->mPicking = TRUE;
-	self->childSetText("object_name", LLString::null);
-	self->childSetText("owner_name", LLString::null);
+	self->childSetText("object_name", LLStringUtil::null);
+	self->childSetText("owner_name", LLStringUtil::null);
 	LLButton* pick_btn = self->getChild<LLButton>("pick_btn");
 	if (pick_btn) pick_btn->setToggleState(TRUE);
 }
@@ -517,7 +517,7 @@ void LLFloaterReporter::showFromMenu(EReportType report_type)
 		}
 
 		// grab the user's name
-		LLString fullname;
+		std::string fullname;
 		gAgent.buildFullname(fullname);
 		f->childSetText("reporter_field", fullname);
 	}
@@ -532,7 +532,7 @@ void LLFloaterReporter::showFromObject(const LLUUID& object_id)
 	f->setFocus(TRUE);
 
 	// grab the user's name
-	LLString fullname;
+	std::string fullname;
 	gAgent.buildFullname(fullname);
 	f->childSetText("reporter_field", fullname);
 
@@ -577,7 +577,7 @@ LLFloaterReporter* LLFloaterReporter::createNewBugReporter()
 	
 
 
-void LLFloaterReporter::setPickedObjectProperties(const LLString& object_name, const LLString& owner_name, const LLUUID owner_id)
+void LLFloaterReporter::setPickedObjectProperties(const std::string& object_name, const std::string& owner_name, const LLUUID owner_id)
 {
 	childSetText("object_name", object_name);
 	childSetText("owner_name", owner_name);
@@ -661,7 +661,7 @@ LLSD LLFloaterReporter::gatherReport()
 		summary << "Preview ";
 	}
 
-	LLString category_name;
+	std::string category_name;
 	LLComboBox* combo = getChild<LLComboBox>( "category_combo");
 	if (combo)
 	{
@@ -711,8 +711,8 @@ LLSD LLFloaterReporter::gatherReport()
 			<< LL_VERSION_PATCH << "."
 			<< LL_VIEWER_BUILD << std::endl << std::endl;
 	}
-	LLString object_name = childGetText("object_name");
-	LLString owner_name = childGetText("owner_name");
+	std::string object_name = childGetText("object_name");
+	std::string owner_name = childGetText("owner_name");
 	if (!object_name.empty() && !owner_name.empty())
 	{
 		details << "Object: " << object_name << "\n";
@@ -727,9 +727,8 @@ LLSD LLFloaterReporter::gatherReport()
 
 	details << childGetValue("details_edit").asString();
 
-	char version_string[MAX_STRING];		/* Flawfinder: ignore */
-	snprintf(version_string,				/* Flawfinder: ignore */
-			MAX_STRING,
+	std::string version_string;
+	version_string = llformat(
 			"%d.%d.%d %s %s %s %s",
 			LL_VERSION_MAJOR,
 			LL_VERSION_MINOR,
@@ -794,7 +793,7 @@ void LLFloaterReporter::sendReportViaLegacy(const LLSD & report)
 	msg->addString("AbuseRegionName", report["abuse-region-name"].asString());
 	msg->addUUID("AbuseRegionID", report["abuse-region-id"].asUUID());
 
-	msg->addStringFast(_PREHASH_Summary, report["summary"].asString().c_str());
+	msg->addStringFast(_PREHASH_Summary, report["summary"].asString());
 	msg->addString("VersionString", report["version-string"]);
 	msg->addStringFast(_PREHASH_Details, report["details"] );
 	
@@ -908,7 +907,7 @@ void LLFloaterReporter::takeScreenshot()
 	{
 		texture->setImageAssetID(mResourceDatap->mAssetInfo.mUuid);
 		texture->setDefaultImageAssetID(mResourceDatap->mAssetInfo.mUuid);
-		texture->setCaption("Screenshot");
+		texture->setCaption(std::string("Screenshot"));
 	}
 
 }
@@ -937,7 +936,7 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data,
 
 	if(result < 0)
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(result));
 		gViewerWindow->alertXml("ErrorUploadingReportScreenshot", args);
 
@@ -975,14 +974,14 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data,
 void LLFloaterReporter::setPosBox(const LLVector3d &pos)
 {
 	mPosition.setVec(pos);
-	LLString pos_string = llformat("{%.1f, %.1f, %.1f}",
+	std::string pos_string = llformat("{%.1f, %.1f, %.1f}",
 		mPosition.mV[VX],
 		mPosition.mV[VY],
 		mPosition.mV[VZ]);
 	childSetText("pos_field", pos_string);
 }
 
-void LLFloaterReporter::setDescription(const LLString& description, LLMeanCollisionData *mcd)
+void LLFloaterReporter::setDescription(const std::string& description, LLMeanCollisionData *mcd)
 {
 	LLFloaterReporter *self = gReporterInstances[COMPLAINT_REPORT];
 	if (self)
@@ -998,7 +997,7 @@ void LLFloaterReporter::setDescription(const LLString& description, LLMeanCollis
 	}
 }
 
-void LLFloaterReporter::addDescription(const LLString& description, LLMeanCollisionData *mcd)
+void LLFloaterReporter::addDescription(const std::string& description, LLMeanCollisionData *mcd)
 {
 	LLFloaterReporter *self = gReporterInstances[COMPLAINT_REPORT];
 	if (self)
diff --git a/linden/indra/newview/llfloaterreporter.h b/linden/indra/newview/llfloaterreporter.h
index 5e8f735..921f9a1 100644
--- a/linden/indra/newview/llfloaterreporter.h
+++ b/linden/indra/newview/llfloaterreporter.h
@@ -100,8 +100,8 @@ public:
 	static void onClickSelectAbuser (void *userdata);
 	static void closePickTool	(void *userdata);
 	static void uploadDoneCallback(const LLUUID &uuid, void* user_data, S32 result, LLExtStat ext_status);
-	static void addDescription(const LLString& description, LLMeanCollisionData *mcd = NULL);
-	static void setDescription(const LLString& description, LLMeanCollisionData *mcd = NULL);
+	static void addDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
+	static void setDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
 	
 	// returns a pointer to reporter of report_type
 	static LLFloaterReporter* getReporter(EReportType report_type);
@@ -111,7 +111,7 @@ public:
 	// static
 	static void processRegionInfo(LLMessageSystem* msg);
 	
-	void setPickedObjectProperties(const LLString& object_name, const LLString& owner_name, const LLUUID owner_id);
+	void setPickedObjectProperties(const std::string& object_name, const std::string& owner_name, const LLUUID owner_id);
 
 private:
 	void takeScreenshot();
@@ -137,7 +137,7 @@ private:
 	LLVector3		mPosition;
 	BOOL			mCopyrightWarningSeen;
 	std::list<LLMeanCollisionData*> mMCDList;
-	LLString		mDefaultSummary;
+	std::string		mDefaultSummary;
 	LLResourceData* mResourceDatap;
 };
 
diff --git a/linden/indra/newview/llfloaterscriptdebug.cpp b/linden/indra/newview/llfloaterscriptdebug.cpp
index 3115b69..b83463c 100644
--- a/linden/indra/newview/llfloaterscriptdebug.cpp
+++ b/linden/indra/newview/llfloaterscriptdebug.cpp
@@ -124,7 +124,7 @@ LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
 void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color, const LLUUID& source_id)
 {
 	LLViewerObject* objectp = gObjectList.findObject(source_id);
-	LLString floater_label;
+	std::string floater_label;
 
 	if (objectp)
 	{
@@ -161,7 +161,7 @@ LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput()
 }
 
 LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLUUID& object_id)
-: LLFloater("script instance floater", LLRect(0, 200, 200, 0), "Script", TRUE), mObjectID(object_id)
+: LLFloater(std::string("script instance floater"), LLRect(0, 200, 200, 0), std::string("Script"), TRUE), mObjectID(object_id)
 {
 	S32 y = getRect().getHeight() - LLFLOATER_HEADER_SIZE - LLFLOATER_VPAD;
 	S32 x = LLFLOATER_HPAD;
@@ -172,8 +172,8 @@ LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLUUID& object_id)
 		y,
 		getRect().getWidth() - LLFLOATER_HPAD,
 				LLFLOATER_VPAD );
-	mHistoryEditor = new LLViewerTextEditor( "Chat History Editor", 
-										history_editor_rect, S32_MAX, "", LLFontGL::sSansSerif);
+	mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"), 
+										history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::sSansSerif);
 	mHistoryEditor->setWordWrap( TRUE );
 	mHistoryEditor->setFollowsAll();
 	mHistoryEditor->setEnabled( FALSE );
@@ -181,7 +181,7 @@ LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLUUID& object_id)
 	addChild(mHistoryEditor);
 }
 
-void LLFloaterScriptDebugOutput::initFloater(const LLString& title, BOOL resizable, 
+void LLFloaterScriptDebugOutput::initFloater(const std::string& title, BOOL resizable, 
 						S32 min_width, S32 min_height, BOOL drag_on_left,
 						BOOL minimizable, BOOL close_btn)
 {
@@ -195,8 +195,8 @@ void LLFloaterScriptDebugOutput::initFloater(const LLString& title, BOOL resizab
 		y,
 		getRect().getWidth() - LLFLOATER_HPAD,
 				LLFLOATER_VPAD );
-	mHistoryEditor = new LLViewerTextEditor( "Chat History Editor", 
-										history_editor_rect, S32_MAX, "", LLFontGL::sSansSerif);
+	mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"), 
+										history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::sSansSerif);
 	mHistoryEditor->setWordWrap( TRUE );
 	mHistoryEditor->setFollowsAll();
 	mHistoryEditor->setEnabled( FALSE );
diff --git a/linden/indra/newview/llfloaterscriptdebug.h b/linden/indra/newview/llfloaterscriptdebug.h
index 42c3e7f..c9951c9 100644
--- a/linden/indra/newview/llfloaterscriptdebug.h
+++ b/linden/indra/newview/llfloaterscriptdebug.h
@@ -62,7 +62,7 @@ public:
 	LLFloaterScriptDebugOutput(const LLUUID& object_id);
 	~LLFloaterScriptDebugOutput();
 
-	virtual void		initFloater(const LLString& title, BOOL resizable, 
+	virtual void		initFloater(const std::string& title, BOOL resizable, 
 						S32 min_width, S32 min_height, BOOL drag_on_left,
 						BOOL minimizable, BOOL close_btn);
 
diff --git a/linden/indra/newview/llfloatersellland.cpp b/linden/indra/newview/llfloatersellland.cpp
index 90e4dd3..c24818e 100644
--- a/linden/indra/newview/llfloatersellland.cpp
+++ b/linden/indra/newview/llfloatersellland.cpp
@@ -138,7 +138,7 @@ LLFloaterSellLandUI* LLFloaterSellLandUI::soleInstance(bool createIfNeeded)
 }
 
 LLFloaterSellLandUI::LLFloaterSellLandUI()
-:	LLFloater("Sell Land"),
+:	LLFloater(std::string("Sell Land")),
 	mRegion(0)
 {
 }
@@ -243,7 +243,7 @@ void LLFloaterSellLandUI::updateParcelInfo()
 
 	if(mSellToBuyer)
 	{
-		LLString name;
+		std::string name;
 		gCacheName->getFullName(mAuthorizedBuyer, name);
 		childSetText("sell_to_agent", name);
 	}
@@ -251,12 +251,12 @@ void LLFloaterSellLandUI::updateParcelInfo()
 
 void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
 {
-	static LLString badgeOK("badge_ok.j2c");
-	static LLString badgeNote("badge_note.j2c");
-	static LLString badgeWarn("badge_warn.j2c");
-	static LLString badgeError("badge_error.j2c");
+	static std::string badgeOK("badge_ok.j2c");
+	static std::string badgeNote("badge_note.j2c");
+	static std::string badgeWarn("badge_warn.j2c");
+	static std::string badgeError("badge_error.j2c");
 	
-	LLString badgeName;
+	std::string badgeName;
 	switch (badge)
 	{
 		default:
@@ -283,7 +283,7 @@ void LLFloaterSellLandUI::refreshUI()
 	childSetText("info_parcel", parcelp->getName());
 	childSetTextArg("info_size", "[AREA]", llformat("%d", mParcelActualArea));
 
-	LLString price_str = childGetValue("price").asString();
+	std::string price_str = childGetValue("price").asString();
 	bool valid_price = false;
 	valid_price = (price_str != "") && LLLineEditor::prevalidateNonNegativeS32(utf8str_to_wstring(price_str));
 
@@ -331,7 +331,7 @@ void LLFloaterSellLandUI::refreshUI()
 	}
 
 	// Must select Sell To: Anybody, or User (with a specified username)
-	LLString sell_to = childGetValue("sell_to").asString();
+	std::string sell_to = childGetValue("sell_to").asString();
 	bool valid_sell_to = "select" != sell_to &&
 		("user" != sell_to || mAuthorizedBuyer.notNull());
 
@@ -370,7 +370,7 @@ void LLFloaterSellLandUI::onChangeValue(LLUICtrl *ctrl, void *userdata)
 {
 	LLFloaterSellLandUI *self = (LLFloaterSellLandUI *)userdata;
 
-	LLString sell_to = self->childGetValue("sell_to").asString();
+	std::string sell_to = self->childGetValue("sell_to").asString();
 
 	if (sell_to == "user")
 	{
@@ -481,7 +481,7 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
 			return;
 		}
 
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[LAND_SIZE]"] = llformat("%d",area);
 		args["[SALE_PRICE]"] = llformat("%d",sale_price);
 		args["[NAME]"] = authorizedBuyerName;
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
index 2e14aac..cb22875 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -41,7 +41,7 @@
 
 LLFloaterSettingsDebug* LLFloaterSettingsDebug::sInstance = NULL;
 
-LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater("Configuration Editor")
+LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater(std::string("Configuration Editor"))
 {
 }
 
@@ -58,7 +58,7 @@ BOOL LLFloaterSettingsDebug::postBuild()
 	{
 		LLComboBox* combo;
 		f(LLComboBox* c) : combo(c) {}
-		virtual void apply(const LLString& name, LLControlVariable* control)
+		virtual void apply(const std::string& name, LLControlVariable* control)
 		{
 			combo->add(name, (void*)control);
 		}
@@ -235,7 +235,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 	spinner4->setVisible(FALSE);
 	color_swatch->setVisible(FALSE);
 	childSetVisible("val_text", FALSE);
-	mComment->setText(LLString::null);
+	mComment->setText(LLStringUtil::null);
 
 	if (controlp)
 	{
@@ -276,7 +276,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 		{
 		  case TYPE_U32:
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel(LLString("value")); // Debug, don't translate
+			spinner1->setLabel(std::string("value")); // Debug, don't translate
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setValue(sd);
@@ -288,7 +288,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			break;
 		  case TYPE_S32:
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel(LLString("value")); // Debug, don't translate
+			spinner1->setLabel(std::string("value")); // Debug, don't translate
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setValue(sd);
@@ -300,7 +300,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			break;
 		  case TYPE_F32:
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel(LLString("value")); // Debug, don't translate
+			spinner1->setLabel(std::string("value")); // Debug, don't translate
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(3);
@@ -332,11 +332,11 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			LLVector3 v;
 			v.setValue(sd);
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel(LLString("X"));
+			spinner1->setLabel(std::string("X"));
 			spinner2->setVisible(TRUE);
-			spinner2->setLabel(LLString("Y"));
+			spinner2->setLabel(std::string("Y"));
 			spinner3->setVisible(TRUE);
-			spinner3->setLabel(LLString("Z"));
+			spinner3->setLabel(std::string("Z"));
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(3);
@@ -359,11 +359,11 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			LLVector3d v;
 			v.setValue(sd);
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel(LLString("X"));
+			spinner1->setLabel(std::string("X"));
 			spinner2->setVisible(TRUE);
-			spinner2->setLabel(LLString("Y"));
+			spinner2->setLabel(std::string("Y"));
 			spinner3->setVisible(TRUE);
-			spinner3->setLabel(LLString("Z"));
+			spinner3->setLabel(std::string("Z"));
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(3);
@@ -386,13 +386,13 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			LLRect r;
 			r.setValue(sd);
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel(LLString("Left"));
+			spinner1->setLabel(std::string("Left"));
 			spinner2->setVisible(TRUE);
-			spinner2->setLabel(LLString("Right"));
+			spinner2->setLabel(std::string("Right"));
 			spinner3->setVisible(TRUE);
-			spinner3->setLabel(LLString("Bottom"));
+			spinner3->setLabel(std::string("Bottom"));
 			spinner4->setVisible(TRUE);
-			spinner4->setLabel(LLString("Top"));
+			spinner4->setLabel(std::string("Top"));
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(0);
@@ -442,7 +442,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 				color_swatch->set(LLColor4(sd), TRUE, FALSE);
 			}
 			spinner4->setVisible(TRUE);
-			spinner4->setLabel(LLString("Alpha"));
+			spinner4->setLabel(std::string("Alpha"));
 			if (!spinner4->hasFocus())
 			{
 				spinner4->setPrecision(3);
@@ -470,7 +470,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 				color_swatch->set(LLColor4(clr), TRUE, FALSE);
 			}
 			spinner4->setVisible(TRUE);
-			spinner4->setLabel(LLString("Alpha"));
+			spinner4->setLabel(std::string("Alpha"));
 			if(!spinner4->hasFocus())
 			{
 				spinner4->setPrecision(0);
@@ -484,7 +484,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 			break;
 		  }
 		  default:
-			mComment->setText(LLString("unknown"));
+			mComment->setText(std::string("unknown"));
 			break;
 		}
 	}
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 291c437..954bf9f 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -68,6 +68,8 @@
 #include "llgl.h"
 #include "llglheaders.h"
 #include "llimagejpeg.h"
+#include "llimagepng.h"
+#include "llimagebmp.h"
 #include "llimagej2c.h"
 #include "llvfile.h"
 #include "llvfs.h"
@@ -83,7 +85,7 @@ LLSnapshotFloaterView* gSnapshotFloaterView = NULL;
 
 LLFloaterSnapshot* LLFloaterSnapshot::sInstance = NULL;
 
-const F32 SNAPSHOT_TIME_DELAY = 1.f;
+const F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
 
 F32 SHINE_TIME = 0.5f;
 F32 SHINE_WIDTH = 0.6f;
@@ -93,6 +95,7 @@ S32 BORDER_WIDTH = 6;
 
 const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
 const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
+
 ///----------------------------------------------------------------------------
 /// Class LLSnapshotLivePreview 
 ///----------------------------------------------------------------------------
@@ -103,9 +106,10 @@ public:
 	{
 		SNAPSHOT_POSTCARD,
 		SNAPSHOT_TEXTURE,
-		SNAPSHOT_BITMAP
+		SNAPSHOT_LOCAL
 	};
 
+
 	LLSnapshotLivePreview(const LLRect& rect);
 	~LLSnapshotLivePreview();
 
@@ -119,6 +123,7 @@ public:
 	S32  getMaxImageSize() {return mMaxImageSize ;}
 	
 	ESnapshotType getSnapshotType() const { return mSnapshotType; }
+	LLFloaterSnapshot::ESnapshotFormat getSnapshotFormat() const { return mSnapshotFormat; }
 	BOOL getSnapshotUpToDate() const { return mSnapshotUpToDate; }
 	BOOL isSnapshotActive() { return mSnapshotActive; }
 	LLImageGL* getThumbnailImage() const { return mThumbnailImage ; }
@@ -133,9 +138,10 @@ public:
 	BOOL isImageScaled();
 	
 	void setSnapshotType(ESnapshotType type) { mSnapshotType = type; }
+	void setSnapshotFormat(LLFloaterSnapshot::ESnapshotFormat type) { mSnapshotFormat = type; }
 	void setSnapshotQuality(S32 quality);
 	void setSnapshotBufferType(LLViewerWindow::ESnapshotType type) { mSnapshotBufferType = type; }
-	void updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail = FALSE);
+	void updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail = FALSE, F32 delay = 0.f);
 	LLFloaterPostcard* savePostcard();
 	void saveTexture();
 	BOOL saveLocal();
@@ -147,7 +153,7 @@ public:
 
 	static void onIdle( void* snapshot_preview );
 
-protected:
+private:
 	LLColor4					mColor;
 	LLPointer<LLImageGL>		mViewerImage[2]; //used to represent the scene when the frame is frozen.
 	LLRect						mImageRect[2];
@@ -165,9 +171,9 @@ protected:
 	BOOL                        mThumbnailUpToDate ;
 
 	S32							mCurImageIndex;
-	LLPointer<LLImageRaw>		mRawImage;
-	LLPointer<LLImageRaw>		mRawImageEncoded;
-	LLPointer<LLImageJPEG>		mJPEGImage;
+	LLPointer<LLImageRaw>		mPreviewImage;
+	LLPointer<LLImageRaw>		mPreviewImageEncoded;
+	LLPointer<LLImageFormatted>	mFormattedImage;
 	LLFrameTimer				mSnapshotDelayTimer;
 	S32							mShineCountdown;
 	LLFrameTimer				mShineAnimTimer;
@@ -177,6 +183,7 @@ protected:
 	S32							mSnapshotQuality;
 	S32							mDataSize;
 	ESnapshotType				mSnapshotType;
+	LLFloaterSnapshot::ESnapshotFormat	mSnapshotFormat;
 	BOOL						mSnapshotUpToDate;
 	LLFrameTimer				mFallAnimTimer;
 	LLVector3					mCameraPos;
@@ -191,25 +198,27 @@ public:
 
 std::set<LLSnapshotLivePreview*> LLSnapshotLivePreview::sList;
 LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) : 
-	LLView("snapshot_live_preview", rect, FALSE), 
+	LLView(std::string("snapshot_live_preview"), rect, FALSE), 
 	mColor(1.f, 0.f, 0.f, 0.5f), 
 	mCurImageIndex(0),
-	mRawImage(NULL),
+	mPreviewImage(NULL),
 	mThumbnailImage(NULL) ,
-	mRawImageEncoded(NULL),
-	mJPEGImage(NULL),
+	mPreviewImageEncoded(NULL),
+	mFormattedImage(NULL),
 	mShineCountdown(0),
 	mFlashAlpha(0.f),
 	mNeedsFlash(TRUE),
 	mSnapshotQuality(gSavedSettings.getS32("SnapshotQuality")),
 	mDataSize(0),
 	mSnapshotType(SNAPSHOT_POSTCARD),
+	mSnapshotFormat(LLFloaterSnapshot::ESnapshotFormat(gSavedSettings.getS32("SnapshotFormat"))),
 	mSnapshotUpToDate(FALSE),
 	mCameraPos(LLViewerCamera::getInstance()->getOrigin()),
 	mCameraRot(LLViewerCamera::getInstance()->getQuaternion()),
 	mSnapshotActive(FALSE),
 	mSnapshotBufferType(LLViewerWindow::SNAPSHOT_TYPE_COLOR)
 {
+	setSnapshotQuality(gSavedSettings.getS32("SnapshotQuality"));
 	mSnapshotDelayTimer.setTimerExpirySec(0.0f);
 	mSnapshotDelayTimer.start();
 // 	gIdleCallbacks.addFunction( &LLSnapshotLivePreview::onIdle, (void*)this );
@@ -231,9 +240,9 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
 LLSnapshotLivePreview::~LLSnapshotLivePreview()
 {
 	// delete images
-	mRawImage = NULL;
-	mRawImageEncoded = NULL;
-	mJPEGImage = NULL;
+	mPreviewImage = NULL;
+	mPreviewImageEncoded = NULL;
+	mFormattedImage = NULL;
 
 // 	gIdleCallbacks.deleteFunction( &LLSnapshotLivePreview::onIdle, (void*)this );
 	sList.erase(this);
@@ -291,7 +300,7 @@ BOOL LLSnapshotLivePreview::isImageScaled()
 	return mImageScaled[mCurImageIndex];
 }
 
-void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail) 
+void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail, F32 delay) 
 { 
 	if (mSnapshotUpToDate)
 	{
@@ -331,7 +340,7 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail
 	if (new_snapshot)
 	{
 		mSnapshotDelayTimer.start();
-		mSnapshotDelayTimer.setTimerExpirySec(SNAPSHOT_TIME_DELAY);
+		mSnapshotDelayTimer.setTimerExpirySec(delay);
 	}
 	else if(new_thumbnail)
 	{
@@ -345,6 +354,7 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail
 
 void LLSnapshotLivePreview::setSnapshotQuality(S32 quality)
 {
+	llclamp(quality, 0, 100);
 	if (quality != mSnapshotQuality)
 	{
 		mSnapshotQuality = quality;
@@ -395,7 +405,7 @@ void LLSnapshotLivePreview::drawPreviewRect(S32 offset_x, S32 offset_y)
 void LLSnapshotLivePreview::draw()
 {
 	if (mViewerImage[mCurImageIndex].notNull() &&
-	    mRawImageEncoded.notNull() &&
+	    mPreviewImageEncoded.notNull() &&
 	    mSnapshotUpToDate)
 	{
 		LLColor4 bg_color(0.f, 0.f, 0.3f, 0.4f);
@@ -684,8 +694,8 @@ void LLSnapshotLivePreview::generateThumbnailImage(BOOL force_update)
 
 	LLPointer<LLImageRaw> raw = NULL ;
 	S32 w , h ;
-	w = get_nearest_power_two(mThumbnailWidth, 512) * 2 ;
-	h = get_nearest_power_two(mThumbnailHeight, 512) * 2 ;
+	w = get_lower_power_two(mThumbnailWidth, 512) * 2 ;
+	h = get_lower_power_two(mThumbnailHeight, 512) * 2 ;
 
 	{
 		raw = new LLImageRaw ;
@@ -722,124 +732,145 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
 		previewp->mCameraPos = new_camera_pos;
 		previewp->mCameraRot = new_camera_rot;
 		// request a new snapshot whenever the camera moves, with a time delay
- 		previewp->updateSnapshot(gSavedSettings.getBOOL("AutoSnapshot"));
+		BOOL autosnap = gSavedSettings.getBOOL("AutoSnapshot");
+		previewp->updateSnapshot(autosnap, FALSE, autosnap ? AUTO_SNAPSHOT_TIME_DELAY : 0.f);
+	}
+
+	// see if it's time yet to snap the shot and bomb out otherwise.
+	previewp->mSnapshotActive = 
+		(previewp->mSnapshotDelayTimer.getStarted() &&	previewp->mSnapshotDelayTimer.hasExpired())
+		&& !LLToolCamera::getInstance()->hasMouseCapture(); // don't take snapshots while ALT-zoom active
+	if ( ! previewp->mSnapshotActive)
+	{
+		return;
 	}
 
-	previewp->mSnapshotActive = (previewp->mSnapshotDelayTimer.getStarted() &&	
-								 previewp->mSnapshotDelayTimer.hasExpired());
+	// time to produce a snapshot
 
-	// don't take snapshots while ALT-zoom active
-	if (LLToolCamera::getInstance()->hasMouseCapture())
+	if (!previewp->mPreviewImage)
 	{
-		previewp->mSnapshotActive = FALSE;
+		previewp->mPreviewImage = new LLImageRaw;
 	}
 
-	if (previewp->mSnapshotActive)
+	if (!previewp->mPreviewImageEncoded)
 	{
-		if (!previewp->mRawImage)
-		{
-			previewp->mRawImage = new LLImageRaw;
-		}
+		previewp->mPreviewImageEncoded = new LLImageRaw;
+	}
 
-		if (!previewp->mRawImageEncoded)
+	previewp->setVisible(FALSE);
+	previewp->setEnabled(FALSE);
+	
+	previewp->getWindow()->incBusyCount();
+	previewp->mImageScaled[previewp->mCurImageIndex] = FALSE;
+
+	// grab the raw image and encode it into desired format
+	if(gViewerWindow->rawSnapshot(
+							previewp->mPreviewImage,
+							previewp->mWidth[previewp->mCurImageIndex],
+							previewp->mHeight[previewp->mCurImageIndex],
+							previewp->mKeepAspectRatio,//gSavedSettings.getBOOL("KeepAspectForSnapshot"),
+							previewp->getSnapshotType() == LLSnapshotLivePreview::SNAPSHOT_TEXTURE,
+							gSavedSettings.getBOOL("RenderUIInSnapshot"),
+							FALSE,
+							previewp->mSnapshotBufferType,
+							previewp->getMaxImageSize()))
+	{
+		previewp->mPreviewImageEncoded->resize(
+			previewp->mPreviewImage->getWidth(), 
+			previewp->mPreviewImage->getHeight(), 
+			previewp->mPreviewImage->getComponents());
+
+		if(previewp->getSnapshotType() == SNAPSHOT_TEXTURE)
 		{
-			previewp->mRawImageEncoded = new LLImageRaw;
-		}
-
-		previewp->setVisible(FALSE);
-		previewp->setEnabled(FALSE);
+			LLPointer<LLImageJ2C> formatted = new LLImageJ2C;
+			LLPointer<LLImageRaw> scaled = new LLImageRaw(
+				previewp->mPreviewImage->getData(),
+				previewp->mPreviewImage->getWidth(),
+				previewp->mPreviewImage->getHeight(),
+				previewp->mPreviewImage->getComponents());
 		
-		previewp->getWindow()->incBusyCount();
-		previewp->mImageScaled[previewp->mCurImageIndex] = FALSE;
-
-		// do update
-		if(gViewerWindow->rawSnapshot(previewp->mRawImage,
-								previewp->mWidth[previewp->mCurImageIndex],
-								previewp->mHeight[previewp->mCurImageIndex],
-								previewp->mKeepAspectRatio,//gSavedSettings.getBOOL("KeepAspectForSnapshot"),
-								previewp->getSnapshotType() == LLSnapshotLivePreview::SNAPSHOT_TEXTURE,
-								gSavedSettings.getBOOL("RenderUIInSnapshot"),
-								FALSE,
-								previewp->mSnapshotBufferType,
-								previewp->getMaxImageSize()))
+			scaled->biasedScaleToPowerOfTwo(512);
+			previewp->mImageScaled[previewp->mCurImageIndex] = TRUE;
+			if (formatted->encode(scaled, 0.f))
+			{
+				previewp->mDataSize = formatted->getDataSize();
+				formatted->decode(previewp->mPreviewImageEncoded, 0);
+			}
+		}
+		else
 		{
-			previewp->mRawImageEncoded->resize(previewp->mRawImage->getWidth(), previewp->mRawImage->getHeight(), previewp->mRawImage->getComponents());
-
-			if (previewp->getSnapshotType() == SNAPSHOT_POSTCARD)
+			// delete any existing image
+			previewp->mFormattedImage = NULL;
+			// now create the new one of the appropriate format.
+			// note: postcards hardcoded to use jpeg always.
+			LLFloaterSnapshot::ESnapshotFormat format = previewp->getSnapshotType() == SNAPSHOT_POSTCARD
+				? LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG : previewp->getSnapshotFormat();
+			switch(format)
 			{
-				// *FIX: just resize and reuse existing jpeg?
-				previewp->mJPEGImage = NULL; // deletes image
-				previewp->mJPEGImage = new LLImageJPEG();
-				previewp->mJPEGImage->setEncodeQuality(llclamp(previewp->mSnapshotQuality, 0, 100));
-				if (previewp->mJPEGImage->encode(previewp->mRawImage, 0.0f))
+			case LLFloaterSnapshot::SNAPSHOT_FORMAT_PNG:
+				previewp->mFormattedImage = new LLImagePNG(); 
+				break;
+			case LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG:
+				previewp->mFormattedImage = new LLImageJPEG(previewp->mSnapshotQuality); 
+				break;
+			case LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP:
+				previewp->mFormattedImage = new LLImageBMP(); 
+				break;
+			}
+			if (previewp->mFormattedImage->encode(previewp->mPreviewImage, 0))
+			{
+				// special case BMP to copy instead of decode otherwise decode will crash.
+				if(format == LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP)
+				{
+					previewp->mPreviewImageEncoded->copy(previewp->mPreviewImage);
+				}
+				else
 				{
-					previewp->mDataSize = previewp->mJPEGImage->getDataSize();
-					previewp->mJPEGImage->decode(previewp->mRawImageEncoded, 0.0f);
+					previewp->mDataSize = previewp->mFormattedImage->getDataSize();
+					previewp->mFormattedImage->decode(previewp->mPreviewImageEncoded, 0);
 				}
 			}
-			else if (previewp->getSnapshotType() == SNAPSHOT_TEXTURE)
+		}
+
+		LLPointer<LLImageRaw> scaled = new LLImageRaw(
+			previewp->mPreviewImageEncoded->getData(),
+			previewp->mPreviewImageEncoded->getWidth(),
+			previewp->mPreviewImageEncoded->getHeight(),
+			previewp->mPreviewImageEncoded->getComponents());
+		
+		if(!scaled->isBufferInvalid())
+		{
+			// leave original image dimensions, just scale up texture buffer
+			if (previewp->mPreviewImageEncoded->getWidth() > 1024 || previewp->mPreviewImageEncoded->getHeight() > 1024)
 			{
-				LLPointer<LLImageJ2C> formatted = new LLImageJ2C;
-				LLPointer<LLImageRaw> scaled = new LLImageRaw(previewp->mRawImage->getData(),
-															  previewp->mRawImage->getWidth(),
-															  previewp->mRawImage->getHeight(),
-															  previewp->mRawImage->getComponents());
-			
-				scaled->biasedScaleToPowerOfTwo(512);
+				// go ahead and shrink image to appropriate power of 2 for display
+				scaled->biasedScaleToPowerOfTwo(1024);
 				previewp->mImageScaled[previewp->mCurImageIndex] = TRUE;
-				if (formatted->encode(scaled, 0.0f))
-				{
-					previewp->mDataSize = formatted->getDataSize();
-					formatted->decode(previewp->mRawImageEncoded, 0.0f);
-				}
 			}
 			else
 			{
-				previewp->mRawImageEncoded->copy(previewp->mRawImage);
-				previewp->mDataSize = previewp->mRawImage->getDataSize();
+				// expand image but keep original image data intact
+				scaled->expandToPowerOfTwo(1024, FALSE);
 			}
 
-			//
-			//the mViewerImage is used to represent the scene when the frame is frozen.
-			//
-			LLPointer<LLImageRaw> scaled = new LLImageRaw(previewp->mRawImageEncoded->getData(),
-														  previewp->mRawImageEncoded->getWidth(),
-														  previewp->mRawImageEncoded->getHeight(),
-														  previewp->mRawImageEncoded->getComponents());
-			
-			if(!scaled->isBufferInvalid())
-			{
-				// leave original image dimensions, just scale up texture buffer
-				if (previewp->mRawImageEncoded->getWidth() > 1024 || previewp->mRawImageEncoded->getHeight() > 1024)
-				{
-					// go ahead and shrink image to appropriate power of 2 for display
-					scaled->biasedScaleToPowerOfTwo(1024);
-					previewp->mImageScaled[previewp->mCurImageIndex] = TRUE;
-				}
-				else
-				{
-					// expand image but keep original image data intact
-					scaled->expandToPowerOfTwo(1024, FALSE);
-				}
-
-				previewp->mViewerImage[previewp->mCurImageIndex] = new LLImageGL(scaled, FALSE);
-				previewp->mViewerImage[previewp->mCurImageIndex]->setMipFilterNearest(previewp->getSnapshotType() != SNAPSHOT_TEXTURE);
-				LLViewerImage::bindTexture(previewp->mViewerImage[previewp->mCurImageIndex]);
-				previewp->mViewerImage[previewp->mCurImageIndex]->setClamp(TRUE, TRUE);
+			previewp->mViewerImage[previewp->mCurImageIndex] = new LLImageGL(scaled, FALSE);
+			previewp->mViewerImage[previewp->mCurImageIndex]->setMipFilterNearest(previewp->getSnapshotType() != SNAPSHOT_TEXTURE);
+			LLViewerImage::bindTexture(previewp->mViewerImage[previewp->mCurImageIndex]);
+			previewp->mViewerImage[previewp->mCurImageIndex]->setClamp(TRUE, TRUE);
 
-				previewp->mSnapshotUpToDate = TRUE;
-				previewp->generateThumbnailImage(TRUE) ;
+			previewp->mSnapshotUpToDate = TRUE;
+			previewp->generateThumbnailImage(TRUE) ;
 
-				previewp->mPosTakenGlobal = gAgent.getCameraPositionGlobal();
-				previewp->mShineCountdown = 4; // wait a few frames to avoid animation glitch due to readback this frame
-			}
+			previewp->mPosTakenGlobal = gAgent.getCameraPositionGlobal();
+			previewp->mShineCountdown = 4; // wait a few frames to avoid animation glitch due to readback this frame
 		}
-		previewp->getWindow()->decBusyCount();
-		// only show fullscreen preview when in freeze frame mode
-		previewp->setVisible(gSavedSettings.getBOOL("UseFreezeFrame"));
-		previewp->mSnapshotDelayTimer.stop();
-		previewp->mSnapshotActive = FALSE;
 	}
+	previewp->getWindow()->decBusyCount();
+	// only show fullscreen preview when in freeze frame mode
+	previewp->setVisible(gSavedSettings.getBOOL("UseFreezeFrame"));
+	previewp->mSnapshotDelayTimer.stop();
+	previewp->mSnapshotActive = FALSE;
+
 	if(!previewp->getThumbnailUpToDate())
 	{
 		previewp->generateThumbnailImage() ;
@@ -868,11 +899,16 @@ LLFloaterPostcard* LLSnapshotLivePreview::savePostcard()
 		image_scale.setVec(llmin(1.f, (F32)mWidth[mCurImageIndex] / (F32)getCurrentImage()->getWidth()), llmin(1.f, (F32)mHeight[mCurImageIndex] / (F32)getCurrentImage()->getHeight()));
 	}
 
-
-	LLFloaterPostcard* floater = LLFloaterPostcard::showFromSnapshot(mJPEGImage, mViewerImage[mCurImageIndex], image_scale, mPosTakenGlobal);
+	LLImageJPEG* jpg = dynamic_cast<LLImageJPEG*>(mFormattedImage.get());
+	if(!jpg)
+	{
+		llwarns << "Formatted image not a JPEG" << llendl;
+		return NULL;
+	}
+	LLFloaterPostcard* floater = LLFloaterPostcard::showFromSnapshot(jpg, mViewerImage[mCurImageIndex], image_scale, mPosTakenGlobal);
 	// relinquish lifetime of viewerimage and jpeg image to postcard floater
 	mViewerImage[mCurImageIndex] = NULL;
-	mJPEGImage = NULL;
+	mFormattedImage = NULL;
 
 	return floater;
 }
@@ -885,10 +921,10 @@ void LLSnapshotLivePreview::saveTexture()
 	LLAssetID new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
 		
 	LLPointer<LLImageJ2C> formatted = new LLImageJ2C;
-	LLPointer<LLImageRaw> scaled = new LLImageRaw(mRawImage->getData(),
-												  mRawImage->getWidth(),
-												  mRawImage->getHeight(),
-												  mRawImage->getComponents());
+	LLPointer<LLImageRaw> scaled = new LLImageRaw(mPreviewImage->getData(),
+												  mPreviewImage->getWidth(),
+												  mPreviewImage->getHeight(),
+												  mPreviewImage->getComponents());
 	
 	scaled->biasedScaleToPowerOfTwo(512);
 			
@@ -921,7 +957,7 @@ void LLSnapshotLivePreview::saveTexture()
 
 BOOL LLSnapshotLivePreview::saveLocal()
 {
-	BOOL success = gViewerWindow->saveImageNumbered(mRawImage);
+	BOOL success = gViewerWindow->saveImageNumbered(mFormattedImage);
 	if(success)
 	{
 		gViewerWindow->playSnapshotAnimAndSound();
@@ -949,6 +985,7 @@ public:
 	}
 	static void onClickDiscard(void* data);
 	static void onClickKeep(void* data);
+	static void onCommitSave(LLUICtrl* ctrl, void* data);
 	static void onClickNewSnapshot(void* data);
 	static void onClickAutoSnap(LLUICtrl *ctrl, void* data);
 	//static void onClickAdvanceSnap(LLUICtrl *ctrl, void* data);
@@ -963,6 +1000,7 @@ public:
 	static void onCommitFreezeFrame(LLUICtrl* ctrl, void* data);
 	static void onCommitLayerTypes(LLUICtrl* ctrl, void*data);
 	static void onCommitSnapshotType(LLUICtrl* ctrl, void* data);
+	static void onCommitSnapshotFormat(LLUICtrl* ctrl, void* data);
 	static void onCommitCustomResolution(LLUICtrl *ctrl, void* data);
 	static void resetSnapshotSizeOnUI(LLFloaterSnapshot *view, S32 width, S32 height) ;
 	static BOOL checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL isWidthChanged, S32 max_value);
@@ -971,12 +1009,14 @@ public:
 	static void setResolution(LLFloaterSnapshot* floater, const std::string& comboname);
 	static void updateControls(LLFloaterSnapshot* floater);
 	static void updateLayout(LLFloaterSnapshot* floater);
+	static void updateResolutionTextEntry(LLFloaterSnapshot* floater);
 
 	static LLHandle<LLView> sPreviewHandle;
 	static BOOL         sAspectRatioCheckOff ;
 	
 private:
 	static LLSnapshotLivePreview::ESnapshotType getTypeIndex(LLFloaterSnapshot* floater);
+	static ESnapshotFormat getFormatIndex(LLFloaterSnapshot* floater);
 	static LLViewerWindow::ESnapshotType getLayerType(LLFloaterSnapshot* floater);
 	static void comboSetCustom(LLFloaterSnapshot *floater, const std::string& comboname);
 	static void checkAutoSnapshot(LLSnapshotLivePreview* floater, BOOL update_thumbnail = FALSE);
@@ -993,6 +1033,7 @@ LLHandle<LLView> LLFloaterSnapshot::Impl::sPreviewHandle;
 
 //static 
 BOOL LLFloaterSnapshot::Impl::sAspectRatioCheckOff = FALSE ;
+
 // static
 LLSnapshotLivePreview* LLFloaterSnapshot::Impl::getPreviewView(LLFloaterSnapshot *floater)
 {
@@ -1011,10 +1052,28 @@ LLSnapshotLivePreview::ESnapshotType LLFloaterSnapshot::Impl::getTypeIndex(LLFlo
 	else if (id == "texture")
 		index = LLSnapshotLivePreview::SNAPSHOT_TEXTURE;
 	else if (id == "local")
-		index = LLSnapshotLivePreview::SNAPSHOT_BITMAP;
+		index = LLSnapshotLivePreview::SNAPSHOT_LOCAL;
+	return index;
+}
+
+
+// static
+LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFloaterSnapshot* floater)
+{
+	ESnapshotFormat index = SNAPSHOT_FORMAT_PNG;
+	LLSD value = floater->childGetValue("local_format_combo");
+	const std::string id = value.asString();
+	if (id == "PNG")
+		index = SNAPSHOT_FORMAT_PNG;
+	else if (id == "JPEG")
+		index = SNAPSHOT_FORMAT_JPEG;
+	else if (id == "BMP")
+		index = SNAPSHOT_FORMAT_BMP;
 	return index;
 }
 
+
+
 // static
 LLViewerWindow::ESnapshotType LLFloaterSnapshot::Impl::getLayerType(LLFloaterSnapshot* floater)
 {
@@ -1132,10 +1191,10 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 // static
 void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 {
-	BOOL is_advance = gSavedSettings.getBOOL("AdvanceSnapshot") ;
 	LLRadioGroup* snapshot_type_radio = floater->getChild<LLRadioGroup>("snapshot_type_radio");
 	snapshot_type_radio->setSelectedIndex(gSavedSettings.getS32("LastSnapshotType"));
 	LLSnapshotLivePreview::ESnapshotType shot_type = getTypeIndex(floater);
+	ESnapshotFormat shot_format = (ESnapshotFormat)gSavedSettings.getS32("SnapshotFormat"); //getFormatIndex(floater);	LLViewerWindow::ESnapshotType layer_type = getLayerType(floater);
 	LLViewerWindow::ESnapshotType layer_type = getLayerType(floater);
 
 	floater->childSetVisible("postcard_size_combo", FALSE);
@@ -1149,114 +1208,102 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 	if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotTextureLastResolution"));
 	combo = floater->getChild<LLComboBox>("local_size_combo");
 	if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution"));
-
-	floater->childSetVisible("upload_btn", FALSE);
-	floater->childSetVisible("send_btn", FALSE);
-	floater->childSetVisible("save_btn", FALSE);
-	floater->childSetEnabled("keep_aspect_check", FALSE) ;
+	combo = floater->getChild<LLComboBox>("local_format_combo");
+	if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotFormat"));
+
+	floater->childSetVisible("upload_btn",			shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE);
+	floater->childSetVisible("send_btn",			shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD);
+	floater->childSetVisible("save_btn",			shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL);
+	floater->childSetEnabled("keep_aspect_check",	shot_type != LLSnapshotLivePreview::SNAPSHOT_TEXTURE && !sAspectRatioCheckOff);
+	floater->childSetEnabled("layer_types",			shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL);
+
+	BOOL is_advance = gSavedSettings.getBOOL("AdvanceSnapshot");
+	BOOL is_local = shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL;
+	BOOL show_slider = 
+		shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD
+		|| (is_local && shot_format == LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG);
+
+	floater->childSetVisible("more_btn", !is_advance); // the only item hidden in advanced mode
+	floater->childSetVisible("less_btn",				is_advance);
+	floater->childSetVisible("type_label2",				is_advance);
+	floater->childSetVisible("format_label",			is_advance && is_local);
+	floater->childSetVisible("local_format_combo",		is_advance && is_local);
+	floater->childSetVisible("layer_types",				is_advance);
+	floater->childSetVisible("layer_type_label",		is_advance);
+	floater->childSetVisible("snapshot_width",			is_advance);
+	floater->childSetVisible("snapshot_height",			is_advance);
+	floater->childSetVisible("keep_aspect_check",		is_advance);
+	floater->childSetVisible("ui_check",				is_advance);
+	floater->childSetVisible("hud_check",				is_advance);
+	floater->childSetVisible("keep_open_check",			is_advance);
+	floater->childSetVisible("freeze_frame_check",		is_advance);
+	floater->childSetVisible("auto_snapshot_check",		is_advance);
+	floater->childSetVisible("image_quality_slider",	is_advance && show_slider);
 
 	switch(shot_type)
 	{
 	  case LLSnapshotLivePreview::SNAPSHOT_POSTCARD:
 		layer_type = LLViewerWindow::SNAPSHOT_TYPE_COLOR;
 		floater->childSetValue("layer_types", "colors");
-		floater->childSetEnabled("layer_types", FALSE);
-		
 		if(is_advance)
 		{			
-			floater->childSetEnabled("image_quality_slider", TRUE);
 			setResolution(floater, "postcard_size_combo");
-
-			if(!sAspectRatioCheckOff)
-			{
-				floater->childSetEnabled("keep_aspect_check", TRUE) ;
-			}
 		}
-
-		floater->childSetVisible("send_btn", TRUE);
 		break;
 	  case LLSnapshotLivePreview::SNAPSHOT_TEXTURE:
 		layer_type = LLViewerWindow::SNAPSHOT_TYPE_COLOR;
 		floater->childSetValue("layer_types", "colors");
-		floater->childSetEnabled("layer_types", FALSE);
-		floater->childSetEnabled("image_quality_slider", FALSE);
-
 		if(is_advance)
 		{
 			setResolution(floater, "texture_size_combo");			
 		}
-
-		floater->childSetVisible("upload_btn", TRUE);
 		break;
-	  case LLSnapshotLivePreview::SNAPSHOT_BITMAP:
-		floater->childSetEnabled("layer_types", TRUE);
-		floater->childSetEnabled("image_quality_slider", FALSE);
-		
+	  case  LLSnapshotLivePreview::SNAPSHOT_LOCAL:
 		if(is_advance)
 		{
 			setResolution(floater, "local_size_combo");
-
-			if(!sAspectRatioCheckOff)
-			{
-				floater->childSetEnabled("keep_aspect_check", TRUE) ;
-			}
 		}
-
-		floater->childSetVisible("save_btn", TRUE);
 		break;
 	  default:
 		break;
 	}
 
-	if(is_advance)
-	{
-		floater->childSetVisible("type_label2", TRUE) ;
-		floater->childSetVisible("layer_types", TRUE) ;
-		floater->childSetVisible("layer_type_label", TRUE) ;
-		floater->childSetVisible("snapshot_width", TRUE) ;
-		floater->childSetVisible("snapshot_height", TRUE) ;
-		floater->childSetVisible("keep_aspect_check", TRUE) ;
-		floater->childSetVisible("ui_check", TRUE) ;
-		floater->childSetVisible("hud_check", TRUE) ;
-		floater->childSetVisible("keep_open_check", TRUE) ;
-		floater->childSetVisible("freeze_frame_check", TRUE) ;
-		floater->childSetVisible("auto_snapshot_check", TRUE) ;
-		floater->childSetVisible("image_quality_slider", TRUE);
-		floater->childSetVisible("more_btn", FALSE);
-		floater->childSetVisible("less_btn", TRUE);
-	}
-	else
-	{
-		floater->childSetVisible("type_label2", FALSE) ;
-		floater->childSetVisible("layer_types", FALSE) ;
-		floater->childSetVisible("layer_type_label", FALSE) ;
-		floater->childSetVisible("snapshot_width", FALSE) ;
-		floater->childSetVisible("snapshot_height", FALSE) ;
-		floater->childSetVisible("keep_aspect_check", FALSE) ;
-		floater->childSetVisible("ui_check", FALSE) ;
-		floater->childSetVisible("hud_check", FALSE) ;
-		floater->childSetVisible("keep_open_check", FALSE) ;
-		floater->childSetVisible("freeze_frame_check", FALSE) ;
-		floater->childSetVisible("auto_snapshot_check", FALSE) ;
-		floater->childSetVisible("image_quality_slider", FALSE);
-		floater->childSetVisible("more_btn", TRUE);
-		floater->childSetVisible("less_btn", FALSE);
-	}
+	updateResolutionTextEntry(floater);
 
 	LLSnapshotLivePreview* previewp = getPreviewView(floater);
 	if (previewp)
 	{
 		previewp->setSnapshotType(shot_type);
+		previewp->setSnapshotFormat(shot_format);
 		previewp->setSnapshotBufferType(layer_type);
 	}
 }
 
 // static
+void LLFloaterSnapshot::Impl::updateResolutionTextEntry(LLFloaterSnapshot* floater)
+{
+	LLSpinCtrl* width_spinner = floater->getChild<LLSpinCtrl>("snapshot_width");
+	LLSpinCtrl* height_spinner = floater->getChild<LLSpinCtrl>("snapshot_height");
+
+	if(getTypeIndex(floater) == LLSnapshotLivePreview::SNAPSHOT_TEXTURE)
+	{
+		width_spinner->setAllowEdit(FALSE);
+		height_spinner->setAllowEdit(FALSE);
+	}
+	else
+	{
+		width_spinner->setAllowEdit(TRUE);
+		height_spinner->setAllowEdit(TRUE);
+	}
+}
+
+// static
 void LLFloaterSnapshot::Impl::checkAutoSnapshot(LLSnapshotLivePreview* previewp, BOOL update_thumbnail)
 {
 	if (previewp)
-	{		
-		previewp->updateSnapshot(gSavedSettings.getBOOL("AutoSnapshot"), update_thumbnail);
+	{
+		BOOL autosnap = gSavedSettings.getBOOL("AutoSnapshot");
+		previewp->updateSnapshot(autosnap, update_thumbnail, autosnap ? AUTO_SNAPSHOT_TIME_DELAY : 0.f);
 	}
 }
 
@@ -1270,6 +1317,17 @@ void LLFloaterSnapshot::Impl::onClickDiscard(void* data)
 	}
 }
 
+
+// static
+void LLFloaterSnapshot::Impl::onCommitSave(LLUICtrl* ctrl, void* data)
+{
+	if (ctrl->getValue().asString() == "save as")
+	{
+		gViewerWindow->resetSnapshotLoc();
+	}
+	onClickKeep(data);
+}
+
 // static
 void LLFloaterSnapshot::Impl::onClickKeep(void* data)
 {
@@ -1283,7 +1341,7 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
 			LLFloaterPostcard* floater = previewp->savePostcard();
 			// if still in snapshot mode, put postcard floater in snapshot floaterview
 			// and link it to snapshot floater
-			if (!gSavedSettings.getBOOL("CloseSnapshotOnKeep"))
+			if (floater && !gSavedSettings.getBOOL("CloseSnapshotOnKeep"))
 			{
 				gFloaterView->removeChild(floater);
 				gSnapshotFloaterView->addChild(floater);
@@ -1463,13 +1521,16 @@ void LLFloaterSnapshot::Impl::onCommitFreezeFrame(LLUICtrl* ctrl, void* data)
 void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 index)
 {
 	LLSnapshotLivePreview *previewp = getPreviewView(view) ;
-	
-	//if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == getTypeIndex(view))
-	//{
-	//	previewp->mKeepAspectRatio = FALSE ;
-	//	return ;
-	//}
 
+	// Don't round texture sizes; textures are commonly stretched in world, profiles, etc and need to be "squashed" during upload, not cropped here
+#if 0
+	if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == getTypeIndex(view))
+	{
+		previewp->mKeepAspectRatio = FALSE ;
+		return ;
+	}
+#endif
+	
 	if(!index) //current window size
 	{
 		sAspectRatioCheckOff = TRUE ;
@@ -1599,6 +1660,22 @@ void LLFloaterSnapshot::Impl::onCommitSnapshotType(LLUICtrl* ctrl, void* data)
 	}
 }
 
+
+//static 
+void LLFloaterSnapshot::Impl::onCommitSnapshotFormat(LLUICtrl* ctrl, void* data)
+{
+	LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;		
+	if (view)
+	{
+		gSavedSettings.setS32("SnapshotFormat", getFormatIndex(view));
+		getPreviewView(view)->updateSnapshot(TRUE);
+		updateControls(view);
+	}
+}
+
+
+
+
 // static
 void LLFloaterSnapshot::Impl::comboSetCustom(LLFloaterSnapshot* floater, const std::string& comboname)
 {
@@ -1620,22 +1697,36 @@ BOOL LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S3
 	S32 h = height ;
 
 	//if texture, ignore aspect ratio setting, round image size to power of 2.
-	//if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType"))
-	//{
-	//	if(width > max_value)
-	//	{
-	//		width = max_value ;
-	//	}
-	//	if(height > max_value)
-	//	{
-	//		height = max_value ;
-	//	}
-
-	//	//round to nearest power of 2
-	//	width = get_nearest_power_two(width, MAX_TEXTURE_SIZE) ;
-	//	height = get_nearest_power_two(height, MAX_TEXTURE_SIZE) ;
-	//}
-	//else 
+#if 0 // Don't round texture sizes; textures are commonly stretched in world, profiles, etc and need to be "squashed" during upload, not cropped here
+	if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType"))
+	{
+		if(width > max_value)
+		{
+			width = max_value ;
+		}
+		if(height > max_value)
+		{
+			height = max_value ;
+		}
+
+		//round to nearest power of 2 based on the direction of movement
+		// i.e. higher power of two if increasing texture resolution
+		if(gSavedSettings.getS32("LastSnapshotWidth") < width ||
+			gSavedSettings.getS32("LastSnapshotHeight") < height)
+		{
+			// Up arrow pressed
+			width = get_next_power_two(width, MAX_TEXTURE_SIZE) ;
+			height = get_next_power_two(height, MAX_TEXTURE_SIZE) ;
+		}
+		else
+		{
+			// Down or no change
+			width = get_lower_power_two(width, MAX_TEXTURE_SIZE) ;
+			height = get_lower_power_two(height, MAX_TEXTURE_SIZE) ;
+		}
+	}
+	else
+#endif
 	if(previewp && previewp->mKeepAspectRatio)
 	{
 		if(gViewerWindow->getWindowDisplayWidth() < 1 || gViewerWindow->getWindowDisplayHeight() < 1)
@@ -1706,9 +1797,6 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
 		S32 w = llfloor((F32)view->childGetValue("snapshot_width").asReal());
 		S32 h = llfloor((F32)view->childGetValue("snapshot_height").asReal());
 
-		gSavedSettings.setS32("LastSnapshotWidth", w);
-		gSavedSettings.setS32("LastSnapshotHeight", h);
-
 		LLSnapshotLivePreview* previewp = getPreviewView(view);
 		if (previewp)
 		{
@@ -1719,28 +1807,32 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
 			{
 				BOOL update_ = FALSE ;
 				//if to upload a snapshot, process spinner input in a special way.
-				//if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType"))
-				//{
-				//	S32 spinner_increment = (S32)((LLSpinCtrl*)ctrl)->getIncrement() ;
-				//	S32 dw = w - curw ;
-				//	S32 dh = h - curh ;
-				//	dw = (dw == spinner_increment) ? 1 : ((dw == -spinner_increment) ? -1 : 0) ;
-				//	dh = (dh == spinner_increment) ? 1 : ((dh == -spinner_increment) ? -1 : 0) ;
-
-				//	if(dw)
-				//	{
-				//		w = (dw > 0) ? curw << dw : curw >> -dw ;
-				//		update_ = TRUE ;
-				//	}
-				//	if(dh)
-				//	{
-				//		h = (dh > 0) ? curh << dh : curh >> -dh ;
-				//		update_ = TRUE ;
-				//	}
-				//}
-
+#if 0  // Don't round texture sizes; textures are commonly stretched in world, profiles, etc and need to be "squashed" during upload, not cropped here
+				if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType"))
+				{
+					S32 spinner_increment = (S32)((LLSpinCtrl*)ctrl)->getIncrement() ;
+					S32 dw = w - curw ;
+					S32 dh = h - curh ;
+					dw = (dw == spinner_increment) ? 1 : ((dw == -spinner_increment) ? -1 : 0) ;
+					dh = (dh == spinner_increment) ? 1 : ((dh == -spinner_increment) ? -1 : 0) ;
+
+					if(dw)
+					{
+						w = (dw > 0) ? curw << dw : curw >> -dw ;
+						update_ = TRUE ;
+					}
+					if(dh)
+					{
+						h = (dh > 0) ? curh << dh : curh >> -dh ;
+						update_ = TRUE ;
+					}
+				}
+#endif
 				previewp->setMaxImageSize((S32)((LLSpinCtrl *)ctrl)->getMaxValue()) ;
-				if(checkImageSize(previewp, w, h, w != curw, previewp->getMaxImageSize()) || update_)
+				
+				// Check image size changes the value of height and width
+				if(checkImageSize(previewp, w, h, w != curw, previewp->getMaxImageSize())
+					|| update_)
 				{
 					resetSnapshotSizeOnUI(view, w, h) ;
 				}
@@ -1752,6 +1844,10 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
 				comboSetCustom(view, "local_size_combo");
 			}
 		}
+
+		gSavedSettings.setS32("LastSnapshotWidth", w);
+		gSavedSettings.setS32("LastSnapshotHeight", h);
+
 	}
 }
 
@@ -1761,7 +1857,7 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
 
 // Default constructor
 LLFloaterSnapshot::LLFloaterSnapshot()
-	: LLFloater("Snapshot Floater"),
+	: LLFloater(std::string("Snapshot Floater")),
 	  impl (*(new Impl))
 {
 }
@@ -1790,6 +1886,7 @@ LLFloaterSnapshot::~LLFloaterSnapshot()
 BOOL LLFloaterSnapshot::postBuild()
 {
 	childSetCommitCallback("snapshot_type_radio", Impl::onCommitSnapshotType, this);
+	childSetCommitCallback("local_format_combo", Impl::onCommitSnapshotFormat, this);
 	
 	childSetAction("new_snapshot_btn", Impl::onClickNewSnapshot, this);
 
@@ -1803,7 +1900,7 @@ BOOL LLFloaterSnapshot::postBuild()
 
 	childSetAction("upload_btn", Impl::onClickKeep, this);
 	childSetAction("send_btn", Impl::onClickKeep, this);
-	childSetAction("save_btn", Impl::onClickKeep, this);
+	childSetCommitCallback("save_btn", Impl::onCommitSave, this);
 	childSetAction("discard_btn", Impl::onClickDiscard, this);
 
 	childSetCommitCallback("image_quality_slider", Impl::onCommitQuality, this);
@@ -1850,7 +1947,7 @@ BOOL LLFloaterSnapshot::postBuild()
 
 	impl.updateControls(this);
 	
-    return TRUE;
+	return TRUE;
 }
 
 void LLFloaterSnapshot::draw()
@@ -1869,7 +1966,7 @@ void LLFloaterSnapshot::draw()
 		{
 			LLLocale locale(LLLocale::USER_LOCALE);
 
-			LLString bytes_string;
+			std::string bytes_string;
 			if (previewp->getSnapshotType() == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && 
 				previewp->getDataSize() > MAX_POSTCARD_DATASIZE)
 			{
@@ -1884,7 +1981,7 @@ void LLFloaterSnapshot::draw()
 			
 			if (previewp->getSnapshotUpToDate())
 			{
-				LLString bytes_string;
+				std::string bytes_string;
 				LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
 				childSetTextArg("file_size_label", "[SIZE]", bytes_string);
 			}
@@ -1899,7 +1996,7 @@ void LLFloaterSnapshot::draw()
 		}
 		else
 		{
-			childSetTextArg("file_size_label", "[SIZE]", LLString("???"));
+			childSetTextArg("file_size_label", "[SIZE]", std::string("???"));
 			childSetEnabled("upload_btn", FALSE);
 			childSetEnabled("send_btn", FALSE);
 			childSetEnabled("save_btn", FALSE);
@@ -1907,50 +2004,11 @@ void LLFloaterSnapshot::draw()
 
 		BOOL ui_in_snapshot = gSavedSettings.getBOOL("RenderUIInSnapshot");
 		childSetValue("ui_check", ui_in_snapshot);
-		childSetToolTip("ui_check", "If selected shows the UI in the snapshot");
+		childSetToolTip("ui_check", std::string("If selected shows the UI in the snapshot"));
 	}
 
 	LLFloater::draw();
 
-	// draw snapshot thumbnail if not in fullscreen preview mode
-	/*if (previewp && previewp->getCurrentImage() && previewp->getSnapshotUpToDate())
-	{
-		F32 aspect = previewp->getImageAspect();
-		// UI size for thumbnail
-		S32 max_width = getRect().getWidth() - 20;
-		S32 max_height = 90;
-
-		S32 img_render_width = 0;
-		S32 img_render_height = 0;
-		if (aspect > max_width / max_height)
-		{
-			// image too wide, shrink to width
-			img_render_width = max_width;
-			img_render_height = llround((F32)max_width / aspect);
-		}
-		else
-		{
-			// image too tall, shrink to height
-			img_render_height = max_height;
-			img_render_width = llround((F32)max_height * aspect);
-		}
-		S32 image_width, image_height;
-		previewp->getSize(image_width, image_height);
-		glMatrixMode(GL_TEXTURE);
-		glPushMatrix();
-		{
-			// handle case where image is only a portion of image buffer
-			if (!previewp->isImageScaled())
-			{
-				glScalef(llmin(1.f, (F32)image_width / (F32)previewp->getCurrentImage()->getWidth()), llmin(1.f, (F32)image_height / (F32)previewp->getCurrentImage()->getHeight()), 1.f);
-			}
-			glMatrixMode(GL_MODELVIEW);
-			gl_draw_scaled_image((getRect().getWidth() - img_render_width) / 2, getRect().getHeight() - 205 + (max_height - img_render_height) / 2, img_render_width, img_render_height, previewp->getCurrentImage(), LLColor4::white);
-		}
-		glMatrixMode(GL_TEXTURE);
-		glPopMatrix();
-		glMatrixMode(GL_MODELVIEW);
-	}*/
 	if (previewp)
 	{		
 		if(previewp->getThumbnailImage())
@@ -1980,7 +2038,6 @@ void LLFloaterSnapshot::show(void*)
 	if (!sInstance)
 	{
 		sInstance = new LLFloaterSnapshot();
-
 		LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_snapshot.xml", NULL, FALSE);
 		//move snapshot floater to special purpose snapshotfloaterview
 		gFloaterView->removeChild(sInstance);
@@ -1988,6 +2045,14 @@ void LLFloaterSnapshot::show(void*)
 
 		sInstance->impl.updateLayout(sInstance);
 	}
+	else // just refresh the snapshot in the existing floater instance (DEV-12255)
+	{
+		LLSnapshotLivePreview* preview = LLFloaterSnapshot::Impl::getPreviewView(sInstance);
+		if(preview)
+		{
+			preview->updateSnapshot(TRUE);
+		}
+	}
 	
 	sInstance->open();		/* Flawfinder: ignore */
 	sInstance->focusFirstItem(FALSE);
@@ -2013,9 +2078,12 @@ void LLFloaterSnapshot::update()
 	}
 }
 
-//============================================================================
 
-LLSnapshotFloaterView::LLSnapshotFloaterView( const LLString& name, const LLRect& rect ) : LLFloaterView(name, rect)
+///----------------------------------------------------------------------------
+/// Class LLSnapshotFloaterView
+///----------------------------------------------------------------------------
+
+LLSnapshotFloaterView::LLSnapshotFloaterView( const std::string& name, const LLRect& rect ) : LLFloaterView(name, rect)
 {
 	setMouseOpaque(TRUE);
 	setEnabled(FALSE);
diff --git a/linden/indra/newview/llfloatersnapshot.h b/linden/indra/newview/llfloatersnapshot.h
index 3948a0f..c97923b 100644
--- a/linden/indra/newview/llfloatersnapshot.h
+++ b/linden/indra/newview/llfloatersnapshot.h
@@ -38,15 +38,23 @@
 #include "llimagegl.h"
 #include "llcharacter.h"
 
+
 class LLFloaterSnapshot : public LLFloater
 {
 public:
-    LLFloaterSnapshot();
+	typedef enum e_snapshot_format
+	{
+		SNAPSHOT_FORMAT_PNG,
+		SNAPSHOT_FORMAT_JPEG,
+		SNAPSHOT_FORMAT_BMP
+	} ESnapshotFormat;
+
+	LLFloaterSnapshot();
 	virtual ~LLFloaterSnapshot();
 
-	virtual BOOL postBuild();
-	virtual void draw();
-	virtual void onClose(bool app_quitting);
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void draw();
+	/*virtual*/ void onClose(bool app_quitting);
 
 	static void show(void*);
 	static void hide(void*);
@@ -69,7 +77,7 @@ private:
 class LLSnapshotFloaterView : public LLFloaterView
 {
 public:
-	LLSnapshotFloaterView( const LLString& name, const LLRect& rect );
+	LLSnapshotFloaterView( const std::string& name, const LLRect& rect );
 	virtual ~LLSnapshotFloaterView();
 
 	/*virtual*/	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
@@ -79,4 +87,5 @@ public:
 };
 
 extern LLSnapshotFloaterView* gSnapshotFloaterView;
+
 #endif // LL_LLFLOATERSNAPSHOT_H
diff --git a/linden/indra/newview/llfloaterstats.cpp b/linden/indra/newview/llfloaterstats.cpp
index 7b2acd4..745cb27 100644
--- a/linden/indra/newview/llfloaterstats.cpp
+++ b/linden/indra/newview/llfloaterstats.cpp
@@ -42,7 +42,7 @@
 const S32 LL_SCROLL_BORDER = 1;
 
 LLFloaterStats::LLFloaterStats(const LLRect& rect)
-	:   LLFloater("floater_stats", rect, "Statistics", TRUE, rect.getWidth())
+	:   LLFloater(std::string("floater_stats"), rect, std::string("Statistics"), TRUE, rect.getWidth())
 
 {
 	LLRect stats_rect(0, rect.getHeight() - LLFLOATER_HEADER_SIZE,
@@ -52,7 +52,7 @@ LLFloaterStats::LLFloaterStats(const LLRect& rect)
 
 	LLRect scroll_rect(LL_SCROLL_BORDER, rect.getHeight() - LLFLOATER_HEADER_SIZE - LL_SCROLL_BORDER,
 					   rect.getWidth() - LL_SCROLL_BORDER, LL_SCROLL_BORDER);
-		mScrollContainer = new LLScrollableContainerView("statistics_scroll", scroll_rect, mStatsContainer);
+		mScrollContainer = new LLScrollableContainerView(std::string("statistics_scroll"), scroll_rect, mStatsContainer);
 	mScrollContainer->setFollowsAll();
 	mScrollContainer->setReserveScrollCorner(TRUE);
 
@@ -66,13 +66,13 @@ LLFloaterStats::~LLFloaterStats()
 {
 }
 
-void LLFloaterStats::reshape(S32 width, S32 height)
+void LLFloaterStats::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	LLRect rect = mStatsContainer->getRect();
 
 	mStatsContainer->reshape(rect.getWidth() - 2, rect.getHeight(), TRUE);
 
-	LLFloater::reshape(width, height);
+	LLFloater::reshape(width, height, called_from_parent);
 }
 
 
diff --git a/linden/indra/newview/llfloaterstats.h b/linden/indra/newview/llfloaterstats.h
index 0b6feb0..15a8362 100644
--- a/linden/indra/newview/llfloaterstats.h
+++ b/linden/indra/newview/llfloaterstats.h
@@ -45,7 +45,7 @@ class LLFloaterStats : public LLFloater
 	LLFloaterStats(const LLRect& rect);
 	virtual ~LLFloaterStats();
 	void addStatView(LLStatView* stat);
-	void reshape(S32 width, S32 height);
+	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	void onClose(bool app_quitting);
 	
  private:
diff --git a/linden/indra/newview/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp
index 3ea9c80..3d84135 100644
--- a/linden/indra/newview/llfloatertelehub.cpp
+++ b/linden/indra/newview/llfloatertelehub.cpp
@@ -81,7 +81,7 @@ void LLFloaterTelehub::show()
 }
 
 LLFloaterTelehub::LLFloaterTelehub()
-:	LLFloater("telehub"),
+:	LLFloater(std::string("telehub")),
 	mTelehubObjectID(),
 	mTelehubObjectName(),
 	mTelehubPos(),
@@ -244,8 +244,8 @@ void LLFloaterTelehub::onClickRemoveSpawnPoint(void* data)
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", "spawnpoint remove");
 
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-	snprintf(buffer, MAX_STRING, "%d", spawn_index);	/* Flawfinder: ignore */
+	std::string buffer;
+	buffer = llformat("%d", spawn_index);
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", buffer);
 
@@ -263,11 +263,8 @@ void LLFloaterTelehub::processTelehubInfo(LLMessageSystem* msg, void**)
 
 void LLFloaterTelehub::unpackTelehubInfo(LLMessageSystem* msg)
 {
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-
 	msg->getUUID("TelehubBlock", "ObjectID", mTelehubObjectID);
-	msg->getString("TelehubBlock", "ObjectName", MAX_STRING, buffer);
-	mTelehubObjectName = buffer;
+	msg->getString("TelehubBlock", "ObjectName", mTelehubObjectName);
 	msg->getVector3("TelehubBlock", "TelehubPos", mTelehubPos);
 	msg->getQuat("TelehubBlock", "TelehubRot", mTelehubRot);
 
@@ -301,7 +298,7 @@ void LLFloaterTelehub::unpackTelehubInfo(LLMessageSystem* msg)
 		list->deleteAllItems();
 		for (S32 i = 0; i < mNumSpawn; i++)
 		{
-			LLString pos = llformat("%.1f, %.1f, %.1f", 
+			std::string pos = llformat("%.1f, %.1f, %.1f", 
 									mSpawnPointPos[i].mV[VX],
 									mSpawnPointPos[i].mV[VY],
 									mSpawnPointPos[i].mV[VZ]);
diff --git a/linden/indra/newview/llfloatertelehub.h b/linden/indra/newview/llfloatertelehub.h
index c93ef90..05080ee 100644
--- a/linden/indra/newview/llfloatertelehub.h
+++ b/linden/indra/newview/llfloatertelehub.h
@@ -68,7 +68,7 @@ private:
 
 private:
 	LLUUID mTelehubObjectID;	// null if no telehub
-	LLString mTelehubObjectName;
+	std::string mTelehubObjectName;
 	LLVector3 mTelehubPos;	// region local, fallback if viewer can't see the object
 	LLQuaternion mTelehubRot;
 
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp
index b18dabb..ceba079 100644
--- a/linden/indra/newview/llfloatertest.cpp
+++ b/linden/indra/newview/llfloatertest.cpp
@@ -94,7 +94,7 @@ private:
 
 
 LLFloaterTestImpl::LLFloaterTestImpl()
-:	LLFloater("test", LLRect(0, 500, 700, 0), "Test UI")
+:	LLFloater(std::string("test"), LLRect(0, 500, 700, 0), std::string("Test UI"))
 {
 	const S32 HPAD = 5;
 	const S32 VPAD = 5;
@@ -114,16 +114,16 @@ LLFloaterTestImpl::LLFloaterTestImpl()
 	LLCheckBoxCtrl* check = NULL;
 	LLComboBox* combo = NULL;
 
-	btn = new LLButton("can't click",
+	btn = new LLButton(std::string("can't click"),
 		LLRect(LEFT+150, y, LEFT+150+100, y-LINE),
-		NULL,	// LLString converts to ""
+		LLStringUtil::null,
 		onClickButton, this);
 	btn->setFollows(FOLLOWS_LEFT|FOLLOWS_TOP);
 	btn->setFont(LLFontGL::sSansSerifSmall);
 	addChild(btn);
 
-	text = new LLTextBox("simple_text", 
-		"simple sans-serif text that is mouse opaque opaque opaque",
+	text = new LLTextBox(std::string("simple_text"), 
+		std::string("simple sans-serif text that is mouse opaque opaque opaque"),
 		50,	// max_width
 		LLFontGL::sSansSerifSmall,
 		TRUE);	// mouse_opaque
@@ -133,25 +133,25 @@ LLFloaterTestImpl::LLFloaterTestImpl()
 
 	y -= VPAD + LINE;
 
-	btn = new LLButton("can click",
+	btn = new LLButton(std::string("can click"),
 		LLRect(LEFT+150, y, LEFT+150+100, y-LINE),
-		NULL,	// LLString converts to ""
+		LLStringUtil::null,
 		onClickButton, this);
 	btn->setFollows(FOLLOWS_LEFT|FOLLOWS_TOP);
 	btn->setFont(LLFontGL::sSansSerifSmall);
 	addChild(btn);
 
-	text = new LLTextBox("simple2_text", 
+	text = new LLTextBox(std::string("simple2_text"), 
 		LLRect(LEFT, y, RIGHT, y-LINE),
-		"monospaced, non-opaque text with tooltip, non-opaque non-opaque",
+		std::string("monospaced, non-opaque text with tooltip, non-opaque non-opaque"),
 		LLFontGL::sMonospace,
 		FALSE);	// mouse_opaque
-	text->setToolTip(LLString("I'm a tooltip"));
+	text->setToolTip(std::string("I'm a tooltip"));
 	addChild(text);
 
 	y -= VPAD + LINE;
 
-	tab = new LLTabContainer("test_tab", 
+	tab = new LLTabContainer(std::string("test_tab"), 
 		LLRect(LEFT, y, RIGHT, BOTTOM),
 		LLTabContainer::TOP,
 		TRUE,	// bordered
@@ -162,36 +162,36 @@ LLFloaterTestImpl::LLFloaterTestImpl()
 	//-----------------------------------------------------------------------
 	// First tab container panel
 	//-----------------------------------------------------------------------
-	panel = new LLPanel("first_tab_panel",
+	panel = new LLPanel(std::string("first_tab_panel"),
 		LLRect(0, 400, 400, 0),	// dummy rect
 		TRUE);	// bordered
-	tab->addTabPanel(panel, "First", 
+	tab->addTabPanel(panel, std::string("First"), 
 		TRUE,	// select
 		onClickTab, this);
 
 	y = panel->getRect().getHeight() - VPAD;
 
-	text = new LLTextBox("unicode_text",
+	text = new LLTextBox(std::string("unicode_text"),
 		LLRect(LEFT, y, RIGHT, y-LINE),
-		LLString("File"),
+		std::string("File"),
 		LLFontGL::sSansSerif,
 		TRUE);	// mouse_opaque
-	text->setToolTip(LLString("This should be Unicode text"));
+	text->setToolTip(std::string("This should be Unicode text"));
 	panel->addChild(text);
 
 	y -= VPAD + LINE;
 
-	btn = new LLButton("unicode_btn", LLRect(LEFT, y, LEFT+100, y-20));
-	btn->setLabel(LLString("unicode"));
+	btn = new LLButton(std::string("unicode_btn"), LLRect(LEFT, y, LEFT+100, y-20));
+	btn->setLabel(std::string("unicode"));
 	panel->addChild(btn);
 
 	y -= VPAD + 20;
 
-	btn = new LLButton("image_btn",
+	btn = new LLButton(std::string("image_btn"),
 		LLRect(LEFT, y, LEFT+32, y-32),
-		"tool_zoom.tga",
-		"tool_zoom_active.tga",
-		"",	// control_name,
+		std::string("tool_zoom.tga"),
+		std::string("tool_zoom_active.tga"),
+		LLStringUtil::null,
 		onClickButton, this,
 		LLFontGL::sSansSerifSmall);
 	btn->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP);
@@ -199,56 +199,56 @@ LLFloaterTestImpl::LLFloaterTestImpl()
 
 	y -= VPAD + 32;
 
-	check = new LLCheckBoxCtrl("simple_check",
+	check = new LLCheckBoxCtrl(std::string("simple_check"),
 		LLRect(LEFT, y, LEFT+150, y-LLCHECKBOXCTRL_HEIGHT),
-		"Simple Checkbox",
+		std::string("Simple Checkbox"),
 		LLFontGL::sSansSerifSmall,
 		onCommitCheck, this,
 		TRUE,	// initial_value
 		FALSE,	// radio_style
-		"UIFloaterTestBool");	// control_which
+		std::string("UIFloaterTestBool"));	// control_which
 	panel->addChild(check);
 
 	y -= VPAD + LLCHECKBOXCTRL_HEIGHT;
 
-	check = new LLCheckBoxCtrl("unicode_check",
+	check = new LLCheckBoxCtrl(std::string("unicode_check"),
 		LLRect(LEFT, y, LEFT+150, y-LLCHECKBOXCTRL_HEIGHT),
-		"TODO: Unicode Checkbox",
+		std::string("TODO: Unicode Checkbox"),
 		LLFontGL::sSansSerifSmall,
 		onCommitCheck, this,
 		TRUE,	// initial_value
 		FALSE,	// radio_style
-		"");	// control_which
+		LLStringUtil::null);	// control_which
 	panel->addChild(check);
 	mCheckUnicode = check;
 
 	y -= VPAD + LLCHECKBOXCTRL_HEIGHT;
 
-	combo = new LLComboBox("combo",
+	combo = new LLComboBox(std::string("combo"),
 		LLRect(LEFT, y, LEFT+100, y-LLCOMBOBOX_HEIGHT),
-		"Combobox Label",
+		std::string("Combobox Label"),
 		onCommitCombo, this);
-	combo->add("first item");
-	combo->add("second item");
-	combo->add("should go to the top", ADD_TOP);
-	combo->add("disabled item", NULL, ADD_BOTTOM, FALSE);
+	combo->add(std::string("first item"));
+	combo->add(std::string("second item"));
+	combo->add(std::string("should go to the top"), ADD_TOP);
+	combo->add(std::string("disabled item"), NULL, ADD_BOTTOM, FALSE);
 	panel->addChild(combo);
 
 	y -= VPAD + LLCOMBOBOX_HEIGHT;
 
 	LLIconCtrl* icon = new LLIconCtrl(
-		"test_icon",
+		std::string("test_icon"),
 		LLRect(LEFT, y, LEFT+32, y-32),
-		"object_cone.tga" );
+		std::string("object_cone.tga") );
 	panel->addChild(icon);
 	mIcon = icon;
 
 	y -= VPAD + 32;
 
 	LLLineEditor* line = new LLLineEditor(
-		"test_line",
+		std::string("test_line"),
 		LLRect(LEFT, y, LEFT+200, y-20),
-		"test some unicode text here",
+		std::string("test some unicode text here"),
 		LLFontGL::sSansSerif,
 		200,	// max_length_bytes
 		onCommitLine,
@@ -261,7 +261,7 @@ LLFloaterTestImpl::LLFloaterTestImpl()
 	y -= VPAD + 20;
 
 	LLRadioGroup* group = new LLRadioGroup(
-		"radio_group",
+		std::string("radio_group"),
 		LLRect(LEFT, y, LEFT+200, y - 50),
 		0,	// initial_index
 		onChangeRadioGroup, this,
@@ -269,28 +269,28 @@ LLFloaterTestImpl::LLFloaterTestImpl()
 	panel->addChild(group);
 
 	S32 yy = 100;
-	group->addRadioButton("Radio1", "Radio 1", LLRect(0, yy, 200, yy-LINE), LLFontGL::sSansSerifSmall);
+	group->addRadioButton(std::string("Radio1"), std::string("Radio 1"), LLRect(0, yy, 200, yy-LINE), LLFontGL::sSansSerifSmall);
 	yy -= LINE;
-	group->addRadioButton("Radio2", "Radio 2", LLRect(0, yy, 200, yy-LINE), LLFontGL::sSansSerifSmall);
+	group->addRadioButton(std::string("Radio2"), std::string("Radio 2"), LLRect(0, yy, 200, yy-LINE), LLFontGL::sSansSerifSmall);
 	yy -= LINE;
-	group->addRadioButton("Radio3", "Radio 3", LLRect(0, yy, 200, yy-LINE), LLFontGL::sSansSerifSmall);
+	group->addRadioButton(std::string("Radio3"), std::string("Radio 3"), LLRect(0, yy, 200, yy-LINE), LLFontGL::sSansSerifSmall);
 	yy -= LINE;
 
 	//-----------------------------------------------------------------------
 	// Second tab container panel
 	//-----------------------------------------------------------------------
-	panel = new LLPanel("second_tab_panel",
+	panel = new LLPanel(std::string("second_tab_panel"),
 		LLRect(0, 400, 400, 0),	// dummy rect
 		TRUE);	// bordered
-	tab->addTabPanel(panel, "Second", 
+	tab->addTabPanel(panel, std::string("Second"), 
 		FALSE,	// select
 		onClickTab, this);
 
 	y = panel->getRect().getHeight() - VPAD;
 
-	btn = new LLButton("Simple Button",
+	btn = new LLButton(std::string("Simple Button"),
 		LLRect(LEFT, y, LEFT+100, y - 20),
-		"",
+		LLStringUtil::null,
 		onClickButton, this);
 	btn->setFollows(FOLLOWS_TOP|FOLLOWS_LEFT);
 	panel->addChild(btn);
@@ -331,7 +331,7 @@ void LLFloaterTestImpl::onCommitCheck(LLUICtrl*, void*)
 void LLFloaterTestImpl::onCommitCombo(LLUICtrl* ctrl, void*)
 {
 	LLComboBox* combo = (LLComboBox*)ctrl;
-	LLString name = combo->getSimple();
+	std::string name = combo->getSimple();
 	LLSD value = combo->getValue();
 	llinfos << "commit combo name " << name << " value " << value.asString() << llendl;
 }
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 97150e3..9c00ca6 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -54,6 +54,7 @@
 #include "llpanelvolume.h"
 #include "llpanelpermissions.h"
 #include "llselectmgr.h"
+#include "llslider.h"
 #include "llstatusbar.h"
 #include "lltabcontainer.h"
 #include "lltextbox.h"
@@ -82,13 +83,13 @@
 LLFloaterTools *gFloaterTools = NULL;
 
 
-const LLString PANEL_NAMES[LLFloaterTools::PANEL_COUNT] =
+const std::string PANEL_NAMES[LLFloaterTools::PANEL_COUNT] =
 {
-	LLString("General"), 	// PANEL_GENERAL,
-	LLString("Object"), 	// PANEL_OBJECT,
-	LLString("Features"),	// PANEL_FEATURES,
-	LLString("Texture"),	// PANEL_FACE,
-	LLString("Content"),	// PANEL_CONTENTS,
+	std::string("General"), 	// PANEL_GENERAL,
+	std::string("Object"), 	// PANEL_OBJECT,
+	std::string("Features"),	// PANEL_FEATURES,
+	std::string("Texture"),	// PANEL_FACE,
+	std::string("Content"),	// PANEL_CONTENTS,
 };
 
 // Local prototypes
@@ -106,6 +107,7 @@ void click_popup_rotate_reset(void*);
 void click_popup_rotate_right(void*);
 void click_popup_dozer_mode(LLUICtrl *, void *user);
 void click_popup_dozer_size(LLUICtrl *, void *user);
+void commit_slider_dozer_force(LLUICtrl *, void*);
 void click_dozer_size(LLUICtrl *, void*);
 void click_apply_to_selection(void*);
 void commit_radio_zoom(LLUICtrl *, void*);
@@ -158,7 +160,7 @@ void*	LLFloaterTools::createPanelContents(void* data)
 void*	LLFloaterTools::createPanelContentsInventory(void* data)
 {
 	LLFloaterTools* floater = (LLFloaterTools*)data;
-	floater->mPanelContents->mPanelInventory = new LLPanelInventory("ContentsInventory", LLRect());
+	floater->mPanelContents->mPanelInventory = new LLPanelInventory(std::string("ContentsInventory"), LLRect());
 	return floater->mPanelContents->mPanelInventory;
 }
 
@@ -166,7 +168,7 @@ void*	LLFloaterTools::createPanelContentsInventory(void* data)
 void*	LLFloaterTools::createPanelLandInfo(void* data)
 {
 	LLFloaterTools* floater = (LLFloaterTools*)data;
-	floater->mPanelLandInfo = new LLPanelLandInfo("land info panel");
+	floater->mPanelLandInfo = new LLPanelLandInfo(std::string("land info panel"));
 	return floater->mPanelLandInfo;
 }
 
@@ -236,7 +238,7 @@ BOOL	LLFloaterTools::postBuild()
 	// Create Buttons
 	//
 
-	static	const LLString	toolNames[]={
+	static	const std::string	toolNames[]={
 			"ToolCube",
 			"ToolPrism",
 			"ToolPyramid",
@@ -308,6 +310,12 @@ BOOL	LLFloaterTools::postBuild()
 	childSetAction("button apply to selection",click_apply_to_selection,  (void*)0);
 	mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
 	childSetValue("checkbox show owners",gSavedSettings.getBOOL("ShowParcelOwners"));
+
+	mSliderDozerForce = getChild<LLSlider>("slider force");
+	childSetCommitCallback("slider force",commit_slider_dozer_force,  (void*)0);
+	// the setting stores the actual force multiplier, but the slider is logarithmic, so we convert here
+	childSetValue( "slider force", log10(gSavedSettings.getF32("LandBrushForce")));
+
 	childSetAction("button more", click_show_more, this);
 	childSetAction("button less", click_show_more, this);
 	mTab = getChild<LLTabContainer>("Object Info Tabs");
@@ -335,7 +343,7 @@ BOOL	LLFloaterTools::postBuild()
 // Create the popupview with a dummy center.  It will be moved into place
 // during LLViewerWindow's per-frame hover processing.
 LLFloaterTools::LLFloaterTools()
-:	LLFloater("toolbox floater"),
+:	LLFloater(std::string("toolbox floater")),
 	mBtnFocus(NULL),
 	mBtnMove(NULL),
 	mBtnEdit(NULL),
@@ -741,6 +749,11 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 	{
 		mCheckShowOwners	->setVisible( land_visible );
 	}
+	if (mSliderDozerForce)
+	{
+		mSliderDozerForce	->setVisible( land_visible );
+		childSetVisible("Strength:", land_visible);
+	}
 
 	//
 	// More panel visibility
@@ -765,8 +778,8 @@ void LLFloaterTools::onOpen()
 	mParcelSelection = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
 	mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
 	
-	gMenuBarView->setItemVisible("Tools", TRUE);
-	gMenuBarView->arrange();
+	// gMenuBarView->setItemVisible(std::string("Tools"), TRUE);
+	// gMenuBarView->arrange();
 }
 
 // virtual
@@ -799,8 +812,8 @@ void LLFloaterTools::onClose(bool app_quitting)
 	// so manually reset tool to default (pie menu tool)
 	LLToolMgr::getInstance()->getCurrentToolset()->selectFirstTool();
 
-	gMenuBarView->setItemVisible("Tools", FALSE);
-	gMenuBarView->arrange();
+	// gMenuBarView->setItemVisible(std::string("Tools"), FALSE);
+	// gMenuBarView->arrange();
 }
 
 void LLFloaterTools::showMore(BOOL show_more)
@@ -939,6 +952,16 @@ void click_dozer_size(LLUICtrl *ctrl, void *user)
 	gSavedSettings.setS32("RadioLandBrushSize", size);
 }
 
+void commit_slider_dozer_force(LLUICtrl *ctrl, void*)
+{
+	// the slider is logarithmic, so we exponentiate to get the actual force multiplier
+	F32 dozer_force = pow(10.f, (F32)ctrl->getValue().asReal());
+	gSavedSettings.setF32("LandBrushForce", dozer_force);
+}
+
+
+
+
 void click_apply_to_selection(void* user)
 {
 	LLToolBrushLand::getInstance()->modifyLandInSelectionGlobal();
@@ -988,7 +1011,7 @@ void LLFloaterTools::setObjectType( void* data )
 	LLPCode pcode = *(LLPCode*) data;
 	LLToolPlacer::setObjectType( pcode );
 	gSavedSettings.setBOOL("CreateToolCopySelection", FALSE);
-	gViewerWindow->setMouseCapture(NULL);
+	gFocusMgr.setMouseCapture(NULL);
 }
 
 // static
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index b0a804b..a75aa87 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -48,6 +48,7 @@ class LLPanelContents;
 class LLPanelFace;
 class LLPanelLandInfo;
 class LLComboBox;
+class LLSlider;
 class LLParcelSelection;
 class LLObjectSelection;
 
@@ -167,6 +168,7 @@ public:
 	LLCheckBoxCtrl	*mRadioDozerSmooth;
 	LLCheckBoxCtrl	*mRadioDozerNoise;
 	LLCheckBoxCtrl	*mRadioDozerRevert;
+	LLSlider		*mSliderDozerForce;
 
 	LLComboBox		*mComboDozerSize;
 	LLButton		*mBtnApplyToSelection;
diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index a6efb06..02be0f9 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -44,6 +44,7 @@
 #include "lllineeditor.h"
 #include "lltextbox.h"
 #include "lltracker.h"
+#include "llviewermessage.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "lluictrlfactory.h"
@@ -51,6 +52,8 @@
 
 LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
 
+// Globals
+// const U32 TIME_STR_LENGTH = 30;
 
 // static
 void LLFloaterTopObjects::show()
@@ -67,7 +70,7 @@ void LLFloaterTopObjects::show()
 }
 
 LLFloaterTopObjects::LLFloaterTopObjects()
-:	LLFloater("top_objects"),
+:	LLFloater(std::string("top_objects")),
 	mInitialized(FALSE),
 	mtotalScore(0.f)
 {
@@ -124,7 +127,7 @@ BOOL LLFloaterTopObjects::postBuild()
 
 	mCurrentMode = STAT_REPORT_TOP_SCRIPTS;
 	mFlags = 0;
-	mFilter = "";
+	mFilter.clear();
 
 	return TRUE;
 }
@@ -161,11 +164,14 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 	for (S32 block = 0; block < block_count; ++block)
 	{
 		U32 task_local_id;
+		U32 time_stamp = 0;
 		LLUUID task_id;
 		F32 location_x, location_y, location_z;
 		F32 score;
-		char name_buf[MAX_STRING];		/* Flawfinder: ignore */
-		char owner_buf[MAX_STRING];		/* Flawfinder: ignore */
+		std::string name_buf;
+		std::string owner_buf;
+		F32 mono_score = 0.f;
+		bool have_extended_data = false;
 
 		msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block);
 		msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block);
@@ -173,17 +179,24 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		msg->getF32Fast(_PREHASH_ReportData, _PREHASH_LocationY, location_y, block);
 		msg->getF32Fast(_PREHASH_ReportData, _PREHASH_LocationZ, location_z, block);
 		msg->getF32Fast(_PREHASH_ReportData, _PREHASH_Score, score, block);
-		msg->getStringFast(_PREHASH_ReportData, _PREHASH_TaskName, MAX_STRING, name_buf, block);
-		msg->getStringFast(_PREHASH_ReportData, _PREHASH_OwnerName, MAX_STRING, owner_buf, block);
-		
+		msg->getStringFast(_PREHASH_ReportData, _PREHASH_TaskName, name_buf, block);
+		msg->getStringFast(_PREHASH_ReportData, _PREHASH_OwnerName, owner_buf, block);
+		if(msg->getNumberOfBlocks("DataExtended"))
+		{
+			have_extended_data = true;
+			msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
+			msg->getF32(_PREHASH_ReportData, "MonoScore", mono_score, block);
+		}
+
 		LLSD element;
 
 		element["id"] = task_id;
-		element["object_name"] = LLString(name_buf);
-		element["owner_name"] = LLString(owner_buf);
+		element["object_name"] = name_buf;
+		element["owner_name"] = owner_buf;
 		element["columns"][0]["column"] = "score";
 		element["columns"][0]["value"] = llformat("%0.3f", score);
 		element["columns"][0]["font"] = "SANSSERIF";
+		
 		element["columns"][1]["column"] = "name";
 		element["columns"][1]["value"] = name_buf;
 		element["columns"][1]["font"] = "SANSSERIF";
@@ -193,7 +206,18 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		element["columns"][3]["column"] = "location";
 		element["columns"][3]["value"] = llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z);
 		element["columns"][3]["font"] = "SANSSERIF";
+		element["columns"][3]["column"] = "time";
+		element["columns"][3]["value"] = formatted_time((time_t)time_stamp);
+		element["columns"][3]["font"] = "SANSSERIF";
 
+		if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS
+			&& have_extended_data)
+		{
+			element["columns"][4]["column"] = "Mono Time";
+			element["columns"][4]["value"] = llformat("%0.3f", mono_score);
+			element["columns"][4]["font"] = "SANSSERIF";
+		}
+		
 		list->addElement(element);
 		
 		mObjectListData.append(element);
@@ -393,7 +417,7 @@ void LLFloaterTopObjects::onRefresh(void* data)
 {
 	U32 mode = STAT_REPORT_TOP_SCRIPTS;
 	U32 flags = 0;
-	LLString filter = "";
+	std::string filter = "";
 
 	if (sInstance)
 	{
@@ -418,7 +442,7 @@ void LLFloaterTopObjects::onRefresh(void* data)
 
 	if (sInstance)
 	{
-		sInstance->mFilter = "";
+		sInstance->mFilter.clear();
 		sInstance->mFlags = 0;
 	}
 }
@@ -451,8 +475,8 @@ void LLFloaterTopObjects::showBeacon()
 	LLScrollListItem* first_selected = list->getFirstSelected();
 	if (!first_selected) return;
 
-	LLString name = first_selected->getColumn(1)->getValue().asString();
-	LLString pos_string =  first_selected->getColumn(3)->getValue().asString();
+	std::string name = first_selected->getColumn(1)->getValue().asString();
+	std::string pos_string =  first_selected->getColumn(3)->getValue().asString();
 
 	F32 x, y, z;
 	S32 matched = sscanf(pos_string.c_str(), "<%g,%g,%g>", &x, &y, &z);
@@ -460,6 +484,6 @@ void LLFloaterTopObjects::showBeacon()
 
 	LLVector3 pos_agent(x, y, z);
 	LLVector3d pos_global = gAgent.getPosGlobalFromAgent(pos_agent);
-	LLString tooltip("");
+	std::string tooltip("");
 	LLTracker::trackLocation(pos_global, name, tooltip, LLTracker::LOCATION_ITEM);
 }
diff --git a/linden/indra/newview/llfloatertopobjects.h b/linden/indra/newview/llfloatertopobjects.h
index 18d68cd..fcc91f2 100644
--- a/linden/indra/newview/llfloatertopobjects.h
+++ b/linden/indra/newview/llfloatertopobjects.h
@@ -84,14 +84,14 @@ private:
 	void showBeacon();
 
 private:
-	LLString mMethod;
+	std::string mMethod;
 
 	LLSD mObjectListData;
 	std::vector<LLUUID> mObjectListIDs;
 
 	U32 mCurrentMode;
 	U32 mFlags;
-	LLString mFilter;
+	std::string mFilter;
 
 	BOOL mInitialized;
 
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index e4073f1..f37388a 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -74,7 +74,7 @@ LLFloaterTOS* LLFloaterTOS::show(ETOSType type, const std::string & message)
 
 
 LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)
-:	LLModalDialog( " ", 100, 100 ),
+:	LLModalDialog( std::string(" "), 100, 100 ),
 	mType(type),
 	mMessage(message),
 	mWebBrowserWindowId( 0 ),
@@ -127,50 +127,38 @@ BOOL LLFloaterTOS::postBuild()
 {	
 	childSetAction("Continue", onContinue, this);
 	childSetAction("Cancel", onCancel, this);
-	childSetCommitCallback("tos_agreement", updateAgree, this);
+	childSetCommitCallback("agree_chk", updateAgree, this);
 
 	if ( mType != TOS_TOS )
 	{
 		// this displays the critical message
-		LLTextEditor *Editor = getChild<LLTextEditor>("tos_text");
-		if (Editor)
-		{
-			Editor->setHandleEditKeysDirectly( TRUE );
-			Editor->setEnabled( FALSE );
-			Editor->setReadOnlyFgColor(LLColor4::white);
-			Editor->setWordWrap(TRUE);
-			Editor->setFocus(TRUE);
-		}
-		childSetValue("tos_text", LLSD(mMessage));
+		LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
+		editor->setHandleEditKeysDirectly( TRUE );
+		editor->setEnabled( FALSE );
+		editor->setWordWrap(TRUE);
+		editor->setFocus(TRUE);
+		editor->setValue(LLSD(mMessage));
+
 		return TRUE;
 	}
 
 	// disable Agree to TOS radio button until the page has fully loaded
-	LLRadioGroup* tos_agreement = getChild<LLRadioGroup>("tos_agreement");
-	if ( tos_agreement )
-	{
-		tos_agreement->setEnabled( false );
-	};
+	LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+	tos_agreement->setEnabled( false );
 
 	// hide the SL text widget if we're displaying TOS with using a browser widget.
 	LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
-	if ( editor )
-	{
-		editor->setVisible( FALSE );
-	};
+	editor->setVisible( FALSE );
 
 	LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
 	if ( web_browser )
 	{
 		// start to observe it so we see navigate complete events
-		if ( web_browser )
-		{
-			web_browser->addObserver( this );
-		};
+		web_browser->addObserver( this );
 
 		gResponsePtr = LLIamHere::build( this );
 		LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
-	};
+	}
 
 	return TRUE;
 }
@@ -194,11 +182,8 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
 		{
 			// normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
 			// but if the page is unavailable, we need to do this now
-			LLRadioGroup* tos_agreement = getChild<LLRadioGroup>("tos_agreement");
-			if ( tos_agreement )
-			{
-				tos_agreement->setEnabled( true );
-			};
+			LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+			tos_agreement->setEnabled( true );
 
 			if ( web_browser )
 			{
@@ -236,8 +221,8 @@ void LLFloaterTOS::draw()
 void LLFloaterTOS::updateAgree(LLUICtrl*, void* userdata )
 {
 	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
-	std::string agree = self->childGetValue("tos_agreement").asString();
-	self->childSetEnabled("Continue", (agree == "radio_agree") );
+	bool agree = self->childGetValue("agree_chk").asBoolean(); 
+	self->childSetEnabled("Continue", agree);
 }
 
 // static
@@ -286,10 +271,7 @@ void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )
 	{
 		llinfos << "NAVIGATE COMPLETE" << llendl;
 		// enable Agree to TOS radio button now that page has loaded
-		LLRadioGroup* tos_agreement = getChild<LLRadioGroup>("tos_agreement");
-		if ( tos_agreement )
-		{
-			tos_agreement->setEnabled( true );
-		};
+		LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+		tos_agreement->setEnabled( true );
 	};
 }
diff --git a/linden/indra/newview/llfloatertos.h b/linden/indra/newview/llfloatertos.h
index b923406..3832877 100644
--- a/linden/indra/newview/llfloatertos.h
+++ b/linden/indra/newview/llfloatertos.h
@@ -77,7 +77,7 @@ private:
 
 private:
 	ETOSType		mType;
-	LLString		mMessage;
+	std::string		mMessage;
 	int				mWebBrowserWindowId;
 	int				mLoadCompleteCount;
 
diff --git a/linden/indra/newview/llfloaterurlentry.cpp b/linden/indra/newview/llfloaterurlentry.cpp
index e9c828b..bddef85 100644
--- a/linden/indra/newview/llfloaterurlentry.cpp
+++ b/linden/indra/newview/llfloaterurlentry.cpp
@@ -213,7 +213,7 @@ void LLFloaterURLEntry::onBtnOK( void* userdata )
 	}
 
 	// leading whitespace causes problems with the MIME-type detection so strip it
-	LLString::trim( media_url );
+	LLStringUtil::trim( media_url );
 
 	// First check the URL scheme
 	LLURI url(media_url);
diff --git a/linden/indra/newview/llfloatervoicedevicesettings.cpp b/linden/indra/newview/llfloatervoicedevicesettings.cpp
index c7b9562..7ffaa73 100644
--- a/linden/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/linden/indra/newview/llfloatervoicedevicesettings.cpp
@@ -105,7 +105,7 @@ void LLPanelVoiceDeviceSettings::draw()
 	{
 		for(S32 power_bar_idx = 0; power_bar_idx < 5; power_bar_idx++)
 		{
-			LLString view_name = llformat("%s%d", "bar", power_bar_idx);
+			std::string view_name = llformat("%s%d", "bar", power_bar_idx);
 			LLView* bar_view = getChild<LLView>(view_name);
 			if (bar_view)
 			{
@@ -260,7 +260,9 @@ void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user
 // LLFloaterVoiceDeviceSettings
 //
 
-LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed) : LLFloater("floater_device_settings"), mDevicePanel(NULL)
+LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed)
+	: LLFloater(std::string("floater_device_settings")),
+	  mDevicePanel(NULL)
 {
 	mFactoryMap["device_settings"] = LLCallbackMap(createPanelVoiceDeviceSettings, this);
 	// do not automatically open singleton floaters (as result of getInstance())
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 98b449b..371f17a 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -65,7 +65,7 @@ LLFloaterWater* LLFloaterWater::sWaterMenu = NULL;
 
 std::set<std::string> LLFloaterWater::sDefaultPresets;
 
-LLFloaterWater::LLFloaterWater() : LLFloater("water floater")
+LLFloaterWater::LLFloaterWater() : LLFloater(std::string("water floater"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_water.xml");
 	
@@ -85,14 +85,14 @@ LLFloaterWater::LLFloaterWater() : LLFloater("water floater")
 		comboBox->selectByValue(LLSD("Default"));
 	}
 
-	LLString def_water = getString("WLDefaultWaterNames");
+	std::string def_water = getString("WLDefaultWaterNames");
 
 	// no editing or deleting of the blank string
 	sDefaultPresets.insert("");
 	boost_tokenizer tokens(def_water, boost::char_separator<char>(":"));
 	for (boost_tokenizer::iterator token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
 	{
-		LLString tok(*token_iter);
+		std::string tok(*token_iter);
 		sDefaultPresets.insert(tok);
 	}
 
@@ -175,8 +175,8 @@ void LLFloaterWater::onClickHelp(void* data)
 {
 	LLFloaterWater* self = LLFloaterWater::instance();
 
-	const char* xml_alert = (const char*) data;
-	LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
+	const std::string* xml_alert = (std::string*)data;
+	LLAlertDialog* dialogp = gViewerWindow->alertXml(*xml_alert);
 	if (dialogp)
 	{
 		LLFloater* root_floater = gFloaterView->getParentFloater(self);
@@ -185,14 +185,15 @@ void LLFloaterWater::onClickHelp(void* data)
 			root_floater->addDependentFloater(dialogp);
 		}
 	}
+	delete xml_alert;
 }
 
-void LLFloaterWater::initHelpBtn(const char* name, const char* xml_alert)
+void LLFloaterWater::initHelpBtn(const std::string& name, const std::string& xml_alert)
 {
-	childSetAction(name, onClickHelp, (void*)xml_alert);
+	childSetAction(name, onClickHelp, new std::string(xml_alert));
 }
 
-void LLFloaterWater::newPromptCallback(S32 option, const LLString& text, void* userData)
+void LLFloaterWater::newPromptCallback(S32 option, const std::string& text, void* userData)
 {
 	if(text == "")
 	{
@@ -207,13 +208,12 @@ void LLFloaterWater::newPromptCallback(S32 option, const LLString& text, void* u
 		// add the current parameters to the list
 		// see if it's there first
 		std::map<std::string, LLWaterParamSet>::iterator mIt = 
-			param_mgr->mParamList.find(text.c_str());
+			param_mgr->mParamList.find(text);
 
 		// if not there, add a new one
 		if(mIt == param_mgr->mParamList.end()) 
 		{
-			param_mgr->addParamSet(text.c_str(), 
-				param_mgr->mCurParams);
+			param_mgr->addParamSet(text, param_mgr->mCurParams);
 			comboBox->add(text);
 			comboBox->sortByName();
 
@@ -537,9 +537,9 @@ void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
 		}
 
 		// set the sliders to the new vals
-		sWaterMenu->childSetValue(rName.c_str(), colorControl->mR);
-		sWaterMenu->childSetValue(gName.c_str(), colorControl->mG);
-		sWaterMenu->childSetValue(bName.c_str(), colorControl->mB);
+		sWaterMenu->childSetValue(rName, colorControl->mR);
+		sWaterMenu->childSetValue(gName, colorControl->mG);
+		sWaterMenu->childSetValue(bName, colorControl->mB);
 	}
 
 	// now update the current parameters and send them to shaders
@@ -597,7 +597,7 @@ void LLFloaterWater::onNormalMapPicked(LLUICtrl* ctrl, void* userData)
 
 void LLFloaterWater::onNewPreset(void* userData)
 {
-	gViewerWindow->alertXmlEditText("NewWaterPreset", LLString::format_map_t(), 
+	gViewerWindow->alertXmlEditText("NewWaterPreset", LLStringUtil::format_map_t(), 
 		NULL, NULL, newPromptCallback, NULL);
 }
 
@@ -617,7 +617,7 @@ void LLFloaterWater::onSavePreset(void* userData)
 
 	// check to see if it's a default and shouldn't be overwritten
 	std::set<std::string>::iterator sIt = sDefaultPresets.find(
-		comboBox->getSelectedItemLabel().c_str());
+		comboBox->getSelectedItemLabel());
 	if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets")) 
 	{
 		gViewerWindow->alertXml("WLNoEditDefault");
@@ -653,7 +653,7 @@ void LLFloaterWater::onDeletePreset(void* userData)
 		return;
 	}
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[SKY]"] = combo_box->getSelectedValue().asString();
 	gViewerWindow->alertXml("WLDeletePresetAlert", args, deleteAlertCallback, sWaterMenu);
 }
@@ -675,10 +675,10 @@ void LLFloaterWater::deleteAlertCallback(S32 option, void* userdata)
 			mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WaterDayCycleKeys");
 		}
 
-		LLString name = combo_box->getSelectedValue().asString();
+		std::string name = combo_box->getSelectedValue().asString();
 
 		// check to see if it's a default and shouldn't be deleted
-		std::set<std::string>::iterator sIt = sDefaultPresets.find(name.c_str());
+		std::set<std::string>::iterator sIt = sDefaultPresets.find(name);
 		if(sIt != sDefaultPresets.end()) 
 		{
 			gViewerWindow->alertXml("WaterNoEditDefault");
diff --git a/linden/indra/newview/llfloaterwater.h b/linden/indra/newview/llfloaterwater.h
index 60d175e..3fa4c09 100644
--- a/linden/indra/newview/llfloaterwater.h
+++ b/linden/indra/newview/llfloaterwater.h
@@ -61,9 +61,9 @@ public:
 
 	// help button stuff
 	static void onClickHelp(void* data);
-	void initHelpBtn(const char* name, const char* xml_alert);
+	void initHelpBtn(const std::string& name, const std::string& xml_alert);
 
-	static void newPromptCallback(S32 option, const LLString& text, void* userData);
+	static void newPromptCallback(S32 option, const std::string& text, void* userData);
 
 	/// general purpose callbacks for dealing with color controllers
 	static void onColorControlRMoved(LLUICtrl* ctrl, void* userData);
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 26e2184..8ed95da 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -66,7 +66,7 @@ std::set<std::string> LLFloaterWindLight::sDefaultPresets;
 
 static const F32 WL_SUN_AMBIENT_SLIDER_SCALE = 3.0f;
 
-LLFloaterWindLight::LLFloaterWindLight() : LLFloater("windlight floater")
+LLFloaterWindLight::LLFloaterWindLight() : LLFloater(std::string("windlight floater"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_windlight_options.xml");
 	
@@ -83,21 +83,21 @@ LLFloaterWindLight::LLFloaterWindLight() : LLFloater("windlight floater")
 		}
 
 		// entry for when we're in estate time
-		comboBox->add("");
+		comboBox->add(LLStringUtil::null);
 
 		// set defaults on combo boxes
 		comboBox->selectByValue(LLSD("Default"));
 	}
 
 	// add the list of presets
-	LLString def_days = getString("WLDefaultSkyNames");
+	std::string def_days = getString("WLDefaultSkyNames");
 
 	// no editing or deleting of the blank string
 	sDefaultPresets.insert("");
 	boost_tokenizer tokens(def_days, boost::char_separator<char>(":"));
 	for (boost_tokenizer::iterator token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
 	{
-		LLString tok(*token_iter);
+		std::string tok(*token_iter);
 		sDefaultPresets.insert(tok);
 	}
 
@@ -233,8 +233,8 @@ void LLFloaterWindLight::onClickHelp(void* data)
 {
 	LLFloaterWindLight* self = LLFloaterWindLight::instance();
 
-	const char* xml_alert = (const char*) data;
-	LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
+	const std::string* xml_alert = (std::string*)data;
+	LLAlertDialog* dialogp = gViewerWindow->alertXml(*xml_alert);
 	if (dialogp)
 	{
 		LLFloater* root_floater = gFloaterView->getParentFloater(self);
@@ -243,15 +243,15 @@ void LLFloaterWindLight::onClickHelp(void* data)
 			root_floater->addDependentFloater(dialogp);
 		}
 	}		
-	
+	delete xml_alert;
 }
 
-void LLFloaterWindLight::initHelpBtn(const char* name, const char* xml_alert)
+void LLFloaterWindLight::initHelpBtn(const std::string& name, const std::string& xml_alert)
 {
-	childSetAction(name, onClickHelp, (void*)xml_alert);
+	childSetAction(name, onClickHelp, new std::string(xml_alert));
 }
 
-void LLFloaterWindLight::newPromptCallback(S32 option, const LLString& text, void* userData)
+void LLFloaterWindLight::newPromptCallback(S32 option, const std::string& text, void* userData)
 {
 	if(text == "")
 	{
@@ -274,12 +274,12 @@ void LLFloaterWindLight::newPromptCallback(S32 option, const LLString& text, voi
 		// add the current parameters to the list
 		// see if it's there first
 		std::map<std::string, LLWLParamSet>::iterator mIt = 
-			LLWLParamManager::instance()->mParamList.find(text.c_str());
+			LLWLParamManager::instance()->mParamList.find(text);
 
 		// if not there, add a new one
 		if(mIt == LLWLParamManager::instance()->mParamList.end()) 
 		{
-			LLWLParamManager::instance()->addParamSet(text.c_str(), 
+			LLWLParamManager::instance()->addParamSet(text, 
 				LLWLParamManager::instance()->mCurParams);
 			comboBox->add(text);
 			comboBox->sortByName();
@@ -290,7 +290,7 @@ void LLFloaterWindLight::newPromptCallback(S32 option, const LLString& text, voi
 			{
 				comboBox->remove(0);
 			}
-			comboBox->add("");
+			comboBox->add(LLStringUtil::null);
 
 			comboBox->setSelectedByValue(text, true);
 			if(LLFloaterDayCycle::isOpen()) 
@@ -319,7 +319,7 @@ void LLFloaterWindLight::syncMenu()
 	//std::map<std::string, LLVector4> & currentParams = param_mgr->mCurParams.mParamValues;
 
 	// blue horizon
-	param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.name, err);
+	param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.mName, err);
 	childSetValue("WLBlueHorizonR", param_mgr->mBlueHorizon.r / 2.0);
 	childSetValue("WLBlueHorizonG", param_mgr->mBlueHorizon.g / 2.0);
 	childSetValue("WLBlueHorizonB", param_mgr->mBlueHorizon.b / 2.0);
@@ -329,18 +329,18 @@ void LLFloaterWindLight::syncMenu()
 				param_mgr->mBlueHorizon.b / 2.0)));
 
 	// haze density, horizon, mult, and altitude
-	param_mgr->mHazeDensity = currentParams.getVector(param_mgr->mHazeDensity.name, err);
+	param_mgr->mHazeDensity = currentParams.getVector(param_mgr->mHazeDensity.mName, err);
 	childSetValue("WLHazeDensity", param_mgr->mHazeDensity.r);
-	param_mgr->mHazeHorizon = currentParams.getVector(param_mgr->mHazeHorizon.name, err);
+	param_mgr->mHazeHorizon = currentParams.getVector(param_mgr->mHazeHorizon.mName, err);
 	childSetValue("WLHazeHorizon", param_mgr->mHazeHorizon.r);
-	param_mgr->mDensityMult = currentParams.getVector(param_mgr->mDensityMult.name, err);
+	param_mgr->mDensityMult = currentParams.getVector(param_mgr->mDensityMult.mName, err);
 	childSetValue("WLDensityMult", param_mgr->mDensityMult.x * 
 		param_mgr->mDensityMult.mult);
-	param_mgr->mMaxAlt = currentParams.getVector(param_mgr->mMaxAlt.name, err);
+	param_mgr->mMaxAlt = currentParams.getVector(param_mgr->mMaxAlt.mName, err);
 	childSetValue("WLMaxAltitude", param_mgr->mMaxAlt.x);
 
 	// blue density
-	param_mgr->mBlueDensity = currentParams.getVector(param_mgr->mBlueDensity.name, err);
+	param_mgr->mBlueDensity = currentParams.getVector(param_mgr->mBlueDensity.mName, err);
 	childSetValue("WLBlueDensityR", param_mgr->mBlueDensity.r / 2.0);
 	childSetValue("WLBlueDensityG", param_mgr->mBlueDensity.g / 2.0);
 	childSetValue("WLBlueDensityB", param_mgr->mBlueDensity.b / 2.0);
@@ -351,7 +351,7 @@ void LLFloaterWindLight::syncMenu()
 	// Lighting
 	
 	// sunlight
-	param_mgr->mSunlight = currentParams.getVector(param_mgr->mSunlight.name, err);
+	param_mgr->mSunlight = currentParams.getVector(param_mgr->mSunlight.mName, err);
 	childSetValue("WLSunlightR", param_mgr->mSunlight.r / WL_SUN_AMBIENT_SLIDER_SCALE);
 	childSetValue("WLSunlightG", param_mgr->mSunlight.g / WL_SUN_AMBIENT_SLIDER_SCALE);
 	childSetValue("WLSunlightB", param_mgr->mSunlight.b / WL_SUN_AMBIENT_SLIDER_SCALE);
@@ -360,12 +360,12 @@ void LLFloaterWindLight::syncMenu()
 		std::max(param_mgr->mSunlight.g / WL_SUN_AMBIENT_SLIDER_SCALE, param_mgr->mSunlight.b / WL_SUN_AMBIENT_SLIDER_SCALE)));
 
 	// glow
-	param_mgr->mGlow = currentParams.getVector(param_mgr->mGlow.name, err);
+	param_mgr->mGlow = currentParams.getVector(param_mgr->mGlow.mName, err);
 	childSetValue("WLGlowR", 2 - param_mgr->mGlow.r / 20.0f);
 	childSetValue("WLGlowB", -param_mgr->mGlow.b / 5.0f);
 		
 	// ambient
-	param_mgr->mAmbient = currentParams.getVector(param_mgr->mAmbient.name, err);
+	param_mgr->mAmbient = currentParams.getVector(param_mgr->mAmbient.mName, err);
 	childSetValue("WLAmbientR", param_mgr->mAmbient.r / WL_SUN_AMBIENT_SLIDER_SCALE);
 	childSetValue("WLAmbientG", param_mgr->mAmbient.g / WL_SUN_AMBIENT_SLIDER_SCALE);
 	childSetValue("WLAmbientB", param_mgr->mAmbient.b / WL_SUN_AMBIENT_SLIDER_SCALE);
@@ -379,7 +379,7 @@ void LLFloaterWindLight::syncMenu()
 	// Clouds
 
 	// Cloud Color
-	param_mgr->mCloudColor = currentParams.getVector(param_mgr->mCloudColor.name, err);
+	param_mgr->mCloudColor = currentParams.getVector(param_mgr->mCloudColor.mName, err);
 	childSetValue("WLCloudColorR", param_mgr->mCloudColor.r);
 	childSetValue("WLCloudColorG", param_mgr->mCloudColor.g);
 	childSetValue("WLCloudColorB", param_mgr->mCloudColor.b);
@@ -388,20 +388,20 @@ void LLFloaterWindLight::syncMenu()
 		std::max(param_mgr->mCloudColor.g, param_mgr->mCloudColor.b)));
 
 	// Cloud
-	param_mgr->mCloudMain = currentParams.getVector(param_mgr->mCloudMain.name, err);
+	param_mgr->mCloudMain = currentParams.getVector(param_mgr->mCloudMain.mName, err);
 	childSetValue("WLCloudX", param_mgr->mCloudMain.r);
 	childSetValue("WLCloudY", param_mgr->mCloudMain.g);
 	childSetValue("WLCloudDensity", param_mgr->mCloudMain.b);
 
 	// Cloud Detail
-	param_mgr->mCloudDetail = currentParams.getVector(param_mgr->mCloudDetail.name, err);
+	param_mgr->mCloudDetail = currentParams.getVector(param_mgr->mCloudDetail.mName, err);
 	childSetValue("WLCloudDetailX", param_mgr->mCloudDetail.r);
 	childSetValue("WLCloudDetailY", param_mgr->mCloudDetail.g);
 	childSetValue("WLCloudDetailDensity", param_mgr->mCloudDetail.b);
 
 	// Cloud extras
-	param_mgr->mCloudCoverage = currentParams.getVector(param_mgr->mCloudCoverage.name, err);
-	param_mgr->mCloudScale = currentParams.getVector(param_mgr->mCloudScale.name, err);
+	param_mgr->mCloudCoverage = currentParams.getVector(param_mgr->mCloudCoverage.mName, err);
+	param_mgr->mCloudScale = currentParams.getVector(param_mgr->mCloudScale.mName, err);
 	childSetValue("WLCloudCoverage", param_mgr->mCloudCoverage.x);
 	childSetValue("WLCloudScale", param_mgr->mCloudScale.x);
 
@@ -430,12 +430,12 @@ void LLFloaterWindLight::syncMenu()
 	childSetValue("WLCloudScrollX", param_mgr->mCurParams.getCloudScrollX() - 10.0f);
 	childSetValue("WLCloudScrollY", param_mgr->mCurParams.getCloudScrollY() - 10.0f);
 
-	param_mgr->mDistanceMult = currentParams.getVector(param_mgr->mDistanceMult.name, err);
+	param_mgr->mDistanceMult = currentParams.getVector(param_mgr->mDistanceMult.mName, err);
 	childSetValue("WLDistanceMult", param_mgr->mDistanceMult.x);
 
 	// Tweak extras
 
-	param_mgr->mWLGamma = currentParams.getVector(param_mgr->mWLGamma.name, err);
+	param_mgr->mWLGamma = currentParams.getVector(param_mgr->mWLGamma.mName, err);
 	childSetValue("WLGamma", param_mgr->mWLGamma.x);
 
 	childSetValue("WLStarAlpha", param_mgr->mCurParams.getStarBrightness());
@@ -653,24 +653,24 @@ void LLFloaterWindLight::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
 		// divide sun color vals by three
 		if(colorControl->isSunOrAmbientColor) 
 		{
-			sWindLight->childSetValue(rName.c_str(), colorControl->r/3);
-			sWindLight->childSetValue(gName.c_str(), colorControl->g/3);
-			sWindLight->childSetValue(bName.c_str(), colorControl->b/3);	
+			sWindLight->childSetValue(rName, colorControl->r/3);
+			sWindLight->childSetValue(gName, colorControl->g/3);
+			sWindLight->childSetValue(bName, colorControl->b/3);	
 		
 		} 
 		else if(colorControl->isBlueHorizonOrDensity) 
 		{
-			sWindLight->childSetValue(rName.c_str(), colorControl->r/2);
-			sWindLight->childSetValue(gName.c_str(), colorControl->g/2);
-			sWindLight->childSetValue(bName.c_str(), colorControl->b/2);	
+			sWindLight->childSetValue(rName, colorControl->r/2);
+			sWindLight->childSetValue(gName, colorControl->g/2);
+			sWindLight->childSetValue(bName, colorControl->b/2);	
 		
 		} 
 		else 
 		{
 			// set the sliders to the new vals
-			sWindLight->childSetValue(rName.c_str(), colorControl->r);
-			sWindLight->childSetValue(gName.c_str(), colorControl->g);
-			sWindLight->childSetValue(bName.c_str(), colorControl->b);
+			sWindLight->childSetValue(rName, colorControl->r);
+			sWindLight->childSetValue(gName, colorControl->g);
+			sWindLight->childSetValue(bName, colorControl->b);
 		}
 	}
 
@@ -785,7 +785,7 @@ void LLFloaterWindLight::onStarAlphaMoved(LLUICtrl* ctrl, void* userData)
 
 void LLFloaterWindLight::onNewPreset(void* userData)
 {
-	gViewerWindow->alertXmlEditText("NewSkyPreset", LLString::format_map_t(), 
+	gViewerWindow->alertXmlEditText("NewSkyPreset", LLStringUtil::format_map_t(), 
 		NULL, NULL, newPromptCallback, NULL);
 }
 
@@ -803,7 +803,7 @@ void LLFloaterWindLight::onSavePreset(void* userData)
 
 	// check to see if it's a default and shouldn't be overwritten
 	std::set<std::string>::iterator sIt = sDefaultPresets.find(
-		comboBox->getSelectedItemLabel().c_str());
+		comboBox->getSelectedItemLabel());
 	if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("SkyEditPresets")) 
 	{
 		gViewerWindow->alertXml("WLNoEditDefault");
@@ -841,7 +841,7 @@ void LLFloaterWindLight::onDeletePreset(void* userData)
 		return;
 	}
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[SKY]"] = combo_box->getSelectedValue().asString();
 	gViewerWindow->alertXml("WLDeletePresetAlert", args, deleteAlertCallback, sWindLight);
 }
@@ -865,10 +865,10 @@ void LLFloaterWindLight::deleteAlertCallback(S32 option, void* userdata)
 			mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
 		}
 
-		LLString name(combo_box->getSelectedValue().asString());
+		std::string name(combo_box->getSelectedValue().asString());
 
 		// check to see if it's a default and shouldn't be deleted
-		std::set<std::string>::iterator sIt = sDefaultPresets.find(name.c_str());
+		std::set<std::string>::iterator sIt = sDefaultPresets.find(name);
 		if(sIt != sDefaultPresets.end()) 
 		{
 			gViewerWindow->alertXml("WLNoEditDefault");
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index 2dbabdb..94373ca 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -61,9 +61,9 @@ public:
 
 	// help button stuff
 	static void onClickHelp(void* data);
-	void initHelpBtn(const char* name, const char* xml_alert);
+	void initHelpBtn(const std::string& name, const std::string& xml_alert);
 
-	static void newPromptCallback(S32 option, const LLString& text, void* userData);
+	static void newPromptCallback(S32 option, const std::string& text, void* userData);
 
 	/// general purpose callbacks for dealing with color controllers
 	static void onColorControlRMoved(LLUICtrl* ctrl, void* userData);
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 75fbff2..b56bfcb 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -150,7 +150,7 @@ const LLUUID LLFloaterWorldMap::sHomeID( "10000000-0000-0000-0000-000000000001"
 
 
 LLFloaterWorldMap::LLFloaterWorldMap()
-:	LLFloater("worldmap"),
+:	LLFloater(std::string("worldmap")),
 	mInventory(NULL),
 	mInventoryObserver(NULL),
 	mFriendObserver(NULL),
@@ -171,7 +171,7 @@ LLFloaterWorldMap::LLFloaterWorldMap()
 // static
 void* LLFloaterWorldMap::createWorldMapView(void* data)
 {
-	return new LLWorldMapView("mapview", LLRect(0,300,400,0));
+	return new LLWorldMapView(std::string("mapview"), LLRect(0,300,400,0));
 }
 
 BOOL LLFloaterWorldMap::postBuild()
@@ -398,12 +398,18 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
 	if (!isMinimized() && isFrontmost())
 	{
-		F32 slider_value = (F32)childGetValue("zoom slider").asReal();
-		slider_value += ((F32)clicks * -0.3333f);
-		childSetValue("zoom slider", LLSD(slider_value));
-		return TRUE;
+		LLRect area;
+		childGetRect("search_results", area);
+		if(!area.pointInRect(x, y))
+		{
+			F32 slider_value = (F32)childGetValue("zoom slider").asReal();
+			slider_value += ((F32)clicks * -0.3333f);
+			childSetValue("zoom slider", LLSD(slider_value));
+			return TRUE;
+		}
 	}
-	return FALSE;
+
+	return LLFloater::handleScrollWheel(x, y, clicks);
 }
 
 
@@ -515,7 +521,7 @@ void LLFloaterWorldMap::draw()
 //-------------------------------------------------------------------------
 
 
-void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const LLString& name )
+void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const std::string& name )
 {
 	LLCtrlSelectionInterface *iface = childGetSelectionInterface("friend combo");
 	if (!iface) return;
@@ -565,7 +571,7 @@ void LLFloaterWorldMap::trackLandmark( const LLUUID& landmark_item_id )
 	if (found && iface->setCurrentByID( landmark_item_id ) ) 
 	{
 		LLUUID asset_id = mLandmarkAssetIDList.get( idx );
-		LLString name;
+		std::string name;
 		LLComboBox* combo = getChild<LLComboBox>( "landmark combo");
 		if (combo) name = combo->getSimple();
 		mTrackedStatus = LLTracker::TRACKING_LANDMARK;
@@ -630,17 +636,17 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
 		return;
 	}
 
-	LLString sim_name;
+	std::string sim_name;
 	LLWorldMap::getInstance()->simNameFromPosGlobal( pos_global, sim_name );
 	F32 region_x = (F32)fmod( pos_global.mdV[VX], (F64)REGION_WIDTH_METERS );
 	F32 region_y = (F32)fmod( pos_global.mdV[VY], (F64)REGION_WIDTH_METERS );
-	LLString full_name = llformat("%s (%d, %d, %d)", 
+	std::string full_name = llformat("%s (%d, %d, %d)", 
 								  sim_name.c_str(), 
 								  llround(region_x), 
 								  llround(region_y),
 								  llround((F32)pos_global.mdV[VZ]));
 
-	LLString tooltip("");
+	std::string tooltip("");
 	mTrackedStatus = LLTracker::TRACKING_LOCATION;
 	LLTracker::trackLocation(pos_global, full_name, tooltip);
 	LLWorldMap::getInstance()->mIsTrackingUnknownLocation = FALSE;
@@ -667,7 +673,7 @@ void LLFloaterWorldMap::updateLocation()
 		if ( status == LLTracker::TRACKING_NOTHING && mSetToUserPosition )
 		{
 			// Make sure we know where we are before setting the current user position
-			LLString agent_sim_name;
+			std::string agent_sim_name;
 			gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( agentPos, agent_sim_name );
 			if ( gotSimName )
 			{
@@ -694,7 +700,7 @@ void LLFloaterWorldMap::updateLocation()
 
 		return; // invalid location
 	}
-	LLString sim_name;
+	std::string sim_name;
 	gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( pos_global, sim_name );
 	if ((status != LLTracker::TRACKING_NOTHING) &&
 		(status != mTrackedStatus || pos_global != mTrackedLocation || sim_name != mTrackedSimName))
@@ -734,7 +740,7 @@ void LLFloaterWorldMap::updateLocation()
 	}
 }
 
-void LLFloaterWorldMap::trackURL(const LLString& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
+void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
 {
 	LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
 	z_coord = llclamp(z_coord, 0, 1000);
@@ -759,7 +765,7 @@ void LLFloaterWorldMap::trackURL(const LLString& region_name, S32 x_coord, S32 y
 		// pass sim name to combo box
 		gFloaterWorldMap->mCompletingRegionName = region_name;
 		LLWorldMap::getInstance()->sendNamedRegionRequest(region_name);
-		LLString::toLower(gFloaterWorldMap->mCompletingRegionName);
+		LLStringUtil::toLower(gFloaterWorldMap->mCompletingRegionName);
 		LLWorldMap::getInstance()->mIsTrackingCommit = TRUE;
 	}
 }
@@ -904,8 +910,7 @@ void LLFloaterWorldMap::buildLandmarkIDLists()
 		mLandmarkAssetIDList.put( item->getAssetUUID() );
 		mLandmarkItemIDList.put( item->getUUID() );
 	}
-	
-	list->sortByColumn("landmark name", TRUE);
+	list->sortByColumn(std::string("landmark name"), TRUE);
 
 	list->selectFirstItem();
 }
@@ -1182,7 +1187,7 @@ void LLFloaterWorldMap::onAvatarComboCommit( LLUICtrl* ctrl, void* userdata )
 	const LLUUID& new_avatar_id = list->getCurrentID();
 	if (new_avatar_id.notNull())
 	{
-		LLString name;
+		std::string name;
 		LLComboBox* combo = gFloaterWorldMap->getChild<LLComboBox>("friend combo");
 		if (combo) name = combo->getSimple();
 		self->trackAvatar(new_avatar_id, name);
@@ -1228,17 +1233,17 @@ void LLFloaterWorldMap::onLocationCommit( void* userdata )
 	self->mCompletingRegionName = "";
 	self->mLastRegionName = "";
 
-	LLString str = self->childGetValue("location").asString();
+	std::string str = self->childGetValue("location").asString();
 
 	// Trim any leading and trailing spaces in the search target
-	LLString saved_str = str;
-	LLString::trim( str );
+	std::string saved_str = str;
+	LLStringUtil::trim( str );
 	if ( str != saved_str )
 	{	// Set the value in the UI if any spaces were removed
 		self->childSetValue("location", str);
 	}
 
-	LLString::toLower(str);
+	LLStringUtil::toLower(str);
 	gFloaterWorldMap->mCompletingRegionName = str;
 	LLWorldMap::getInstance()->mIsTrackingCommit = TRUE;
 	self->mExactMatch = FALSE;
@@ -1300,7 +1305,7 @@ void LLFloaterWorldMap::onCopySLURL(void* data)
 	LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
 	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(self->mSLURL));
 	
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[SLURL]"] = self->mSLURL;
 
 	LLAlertDialog::showXml("CopySLURL", args);
@@ -1552,9 +1557,9 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
 	for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
 	{
 		LLSimInfo* info = (*it).second;
-		LLString sim_name = info->mName;
-		LLString sim_name_lower = sim_name;
-		LLString::toLower(sim_name_lower);
+		std::string sim_name = info->mName;
+		std::string sim_name_lower = sim_name;
+		LLStringUtil::toLower(sim_name_lower);
 
 		if (sim_name_lower.substr(0, name_length) == mCompletingRegionName)
 		{
@@ -1597,7 +1602,7 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
 	}
 	else
 	{
-		list->addCommentText("None found.");
+		list->addCommentText(std::string("None found."));
 		list->operateOnAll(LLCtrlListInterface::OP_DESELECT);
 	}
 }
@@ -1629,19 +1634,19 @@ void LLFloaterWorldMap::onCommitSearchResult(LLUICtrl*, void* userdata)
 	if (!list) return;
 
 	LLSD selected_value = list->getSelectedValue();
-	LLString sim_name = selected_value.asString();
+	std::string sim_name = selected_value.asString();
 	if (sim_name.empty())
 	{
 		return;
 	}
-	LLString::toLower(sim_name);
+	LLStringUtil::toLower(sim_name);
 
 	std::map<U64, LLSimInfo*>::const_iterator it;
 	for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
 	{
 		LLSimInfo* info = (*it).second;
-		LLString info_sim_name = info->mName;
-		LLString::toLower(info_sim_name);
+		std::string info_sim_name = info->mName;
+		LLStringUtil::toLower(info_sim_name);
 
 		if (sim_name == info_sim_name)
 		{
diff --git a/linden/indra/newview/llfloaterworldmap.h b/linden/indra/newview/llfloaterworldmap.h
index 5fe685e..e2f2479 100644
--- a/linden/indra/newview/llfloaterworldmap.h
+++ b/linden/indra/newview/llfloaterworldmap.h
@@ -85,12 +85,12 @@ public:
 	void friendsChanged();
 
 	// tracking methods
-	void			trackAvatar( const LLUUID& avatar_id, const LLString& name );
+	void			trackAvatar( const LLUUID& avatar_id, const std::string& name );
 	void			trackLandmark( const LLUUID& landmark_item_id ); 
 	void			trackLocation(const LLVector3d& pos);
 	void			trackEvent(const LLItemInfo &event_info);
 	void			trackGenericItem(const LLItemInfo &item);
-	void			trackURL(const LLString& region_name, S32 x_coord, S32 y_coord, S32 z_coord);
+	void			trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord);
 
 	static const LLUUID& getHomeID() { return sHomeID; }
 
@@ -177,8 +177,8 @@ protected:
 	LLInventoryObserver* mInventoryObserver;
 	LLFriendObserver* mFriendObserver;
 
-	LLString				mCompletingRegionName;
-	LLString				mLastRegionName;
+	std::string				mCompletingRegionName;
+	std::string				mLastRegionName;
 	BOOL					mWaitingForTracker;
 	BOOL					mExactMatch;
 
@@ -187,9 +187,9 @@ protected:
 
 	LLVector3d				mTrackedLocation;
 	LLTracker::ETrackingStatus mTrackedStatus;
-	LLString				mTrackedSimName;
-	LLString				mTrackedAvatarName;
-	LLString				mSLURL;
+	std::string				mTrackedSimName;
+	std::string				mTrackedAvatarName;
+	std::string				mSLURL;
 };
 
 extern LLFloaterWorldMap* gFloaterWorldMap;
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 4833c12..4b487ce 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -118,7 +118,7 @@ LLColor4 LLFolderViewItem::sSuffixColor;
 LLColor4 LLFolderViewItem::sSearchStatusColor;
 
 // Default constructor
-LLFolderViewItem::LLFolderViewItem( const LLString& name, LLUIImagePtr icon,
+LLFolderViewItem::LLFolderViewItem( const std::string& name, LLUIImagePtr icon,
 								   S32 creation_date,
 								   LLFolderView* root,
 									LLFolderViewEventListener* listener ) :
@@ -137,7 +137,7 @@ LLFolderViewItem::LLFolderViewItem( const LLString& name, LLUIImagePtr icon,
 	mNumDescendantsSelected(0),
 	mFiltered(FALSE),
 	mLastFilterGeneration(-1),
-	mStringMatchOffset(LLString::npos),
+	mStringMatchOffset(std::string::npos),
 	mControlLabelRotation(0.f),
 	mRoot( root ),
 	mDragAndDropTarget(FALSE),
@@ -280,10 +280,9 @@ void LLFolderViewItem::refresh()
 {
 	if(mListener)
 	{
-		const char* label = mListener->getDisplayName().c_str();
-		mLabel = label ? label : "";
+		mLabel = mListener->getDisplayName();
 		setIcon(mListener->getIcon());
-		U32 creation_date = mListener->getCreationDate();
+		time_t creation_date = mListener->getCreationDate();
 		if (mCreationDate != creation_date)
 		{
 			mCreationDate = mListener->getCreationDate();
@@ -292,9 +291,9 @@ void LLFolderViewItem::refresh()
 		mLabelStyle = mListener->getLabelStyle();
 		mLabelSuffix = mListener->getLabelSuffix();
 
-		LLString searchable_label(mLabel);
+		std::string searchable_label(mLabel);
 		searchable_label.append(mLabelSuffix);
-		LLString::toUpper(searchable_label);
+		LLStringUtil::toUpper(searchable_label);
 
 		if (mSearchableLabel.compare(searchable_label))
 		{
@@ -564,11 +563,11 @@ void LLFolderViewItem::preview( void )
 	}
 }
 
-void LLFolderViewItem::rename(const LLString& new_name)
+void LLFolderViewItem::rename(const std::string& new_name)
 {
 	if( !new_name.empty() )
 	{
-		mLabel = new_name.c_str();
+		mLabel = new_name;
 		if( mListener )
 		{
 			mListener->renameItem(new_name);
@@ -581,12 +580,12 @@ void LLFolderViewItem::rename(const LLString& new_name)
 	}
 }
 
-const LLString& LLFolderViewItem::getSearchableLabel() const
+const std::string& LLFolderViewItem::getSearchableLabel() const
 {
 	return mSearchableLabel;
 }
 
-const LLString& LLFolderViewItem::getName( void ) const
+const std::string& LLFolderViewItem::getName( void ) const
 {
 	if(mListener)
 	{
@@ -610,7 +609,7 @@ BOOL LLFolderViewItem::handleMouseDown( S32 x, S32 y, MASK mask )
 {
 	// No handler needed for focus lost since this class has no
 	// state that depends on it.
-	gViewerWindow->setMouseCapture( this );
+	gFocusMgr.setMouseCapture( this );
 
 	if (!mIsSelected)
 	{
@@ -681,7 +680,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
 					// Release keyboard focus, so that if stuff is dropped into the
 					// world, pressing the delete key won't blow away the inventory
 					// item.
-					gViewerWindow->setKeyboardFocus(NULL);
+					gFocusMgr.setKeyboardFocus(NULL);
 
 					return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
 				}
@@ -748,7 +747,7 @@ BOOL LLFolderViewItem::handleMouseUp( S32 x, S32 y, MASK mask )
 	if( hasMouseCapture() )
 	{
 		getRoot()->setShowSelectionContext(FALSE);
-		gViewerWindow->setMouseCapture( NULL );
+		gFocusMgr.setMouseCapture( NULL );
 	}
 	return TRUE;
 }
@@ -757,7 +756,7 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 										 EDragAndDropType cargo_type,
 										 void* cargo_data,
 										 EAcceptance* accept,
-										 LLString& tooltip_msg)
+										 std::string& tooltip_msg)
 {
 	BOOL accepted = FALSE;
 	BOOL handled = FALSE;
@@ -922,7 +921,8 @@ void LLFolderViewItem::draw()
 
 		if ( mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") )
 		{
-			sFont->renderUTF8( "Loading... ", 0, text_left, y, sSearchStatusColor,
+			// *TODO: Translate
+			sFont->renderUTF8( std::string("Loading... "), 0, text_left, y, sSearchStatusColor,
 						LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, S32_MAX, S32_MAX, &right_x, FALSE);
 			text_left = right_x;
 		}
@@ -937,13 +937,13 @@ void LLFolderViewItem::draw()
 								S32_MAX, S32_MAX, &right_x, FALSE );
 		}
 
-		if (mBoxImage.notNull() && mStringMatchOffset != LLString::npos)
+		if (mBoxImage.notNull() && mStringMatchOffset != std::string::npos)
 		{
 			// don't draw backgrounds for zero-length strings
 			S32 filter_string_length = mRoot->getFilterSubString().size();
 			if (filter_string_length > 0)
 			{
-				LLString combined_string = mLabel + mLabelSuffix;
+				std::string combined_string = mLabel + mLabelSuffix;
 				S32 left = llround(text_left) + sFont->getWidth(combined_string, 0, mStringMatchOffset) - 1;
 				S32 right = left + sFont->getWidth(combined_string, mStringMatchOffset, filter_string_length) + 2;
 				S32 bottom = llfloor(getRect().getHeight() - sFont->getLineHeight() - 3);
@@ -972,7 +972,7 @@ void LLFolderViewItem::draw()
 ///----------------------------------------------------------------------------
 
 // Default constructor
-LLFolderViewFolder::LLFolderViewFolder( const LLString& name, LLUIImagePtr icon,
+LLFolderViewFolder::LLFolderViewFolder( const std::string& name, LLUIImagePtr icon,
 										LLFolderView* root,
 										LLFolderViewEventListener* listener ): 
 	LLFolderViewItem( name, icon, 0, root, listener ),	// 0 = no create time
@@ -988,7 +988,7 @@ LLFolderViewFolder::LLFolderViewFolder( const LLString& name, LLUIImagePtr icon,
 	mCompletedFilterGeneration(-1),
 	mMostFilteredDescendantGeneration(-1)
 {
-	mType = "(folder)";
+	mType = std::string("(folder)");
 }
 
 // Destroys the object
@@ -1733,7 +1733,7 @@ void LLFolderViewFolder::sortBy(U32 order)
 
 	if (order & LLInventoryFilter::SO_DATE)
 	{
-		U32 latest = 0;
+		time_t latest = 0;
 		
 		if (!mItems.empty())
 		{
@@ -1958,7 +1958,7 @@ BOOL LLFolderViewFolder::handleDragAndDropFromChild(MASK mask,
 						EDragAndDropType c_type,
 						void* cargo_data,
 						EAcceptance* accept,
-						LLString& tooltip_msg)
+						std::string& tooltip_msg)
 {
 	BOOL accepted = mListener && mListener->dragOrDrop(mask,drop,c_type,cargo_data);
 	if (accepted) 
@@ -2023,7 +2023,7 @@ BOOL LLFolderViewFolder::handleDragAndDrop(S32 x, S32 y, MASK mask,
 										   EDragAndDropType cargo_type,
 										   void* cargo_data,
 										   EAcceptance* accept,
-										   LLString& tooltip_msg)
+										   std::string& tooltip_msg)
 {
 	LLFolderView* root_view = getRoot();
 
@@ -2191,9 +2191,9 @@ void LLFolderViewFolder::draw()
 	mExpanderHighlighted = FALSE;
 }
 
-U32 LLFolderViewFolder::getCreationDate() const
+time_t LLFolderViewFolder::getCreationDate() const
 {
-	return llmax<U32>(mCreationDate, mSubtreeCreationDate);
+	return llmax<time_t>(mCreationDate, mSubtreeCreationDate);
 }
 
 
@@ -2487,7 +2487,7 @@ void LLCloseAllFoldersFunctor::doItem(LLFolderViewItem* item)
 ///----------------------------------------------------------------------------
 
 // Default constructor
-LLFolderView::LLFolderView( const LLString& name, LLUIImagePtr root_folder_icon, 
+LLFolderView::LLFolderView( const std::string& name, LLUIImagePtr root_folder_icon, 
 						   const LLRect& rect, const LLUUID& source_id, LLView *parent_view ) :
 #if LL_WINDOWS
 #pragma warning( push )
@@ -2534,9 +2534,9 @@ LLFolderView::LLFolderView( const LLString& name, LLUIImagePtr root_folder_icon,
 	//clear label
 	// go ahead and render root folder as usual
 	// just make sure the label ("Inventory Folder") never shows up
-	mLabel = LLString::null;
+	mLabel = LLStringUtil::null;
 
-	mRenamer = new LLLineEditor("ren", getRect(), "", sFont,
+	mRenamer = new LLLineEditor(std::string("ren"), getRect(), LLStringUtil::null, sFont,
 								DB_INV_ITEM_NAME_STR_LEN,
 								&LLFolderView::commitRename,
 								NULL,
@@ -2553,7 +2553,7 @@ LLFolderView::LLFolderView( const LLString& name, LLUIImagePtr root_folder_icon,
 	LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_inventory.xml", parent_view);
 	if (!menu)
 	{
-		menu = new LLMenuGL("");
+		menu = new LLMenuGL(LLStringUtil::null);
 	}
 	menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
 	menu->setVisible(FALSE);
@@ -2585,9 +2585,9 @@ LLFolderView::~LLFolderView( void )
 
 	LLView::deleteViewByHandle(mPopupMenuHandle);
 
-	if(gViewerWindow->hasTopCtrl(mRenamer))
+	if(mRenamer == gFocusMgr.getTopCtrl())
 	{
-		gViewerWindow->setTopCtrl(NULL);
+		gFocusMgr.setTopCtrl(NULL);
 	}
 
 	mAutoOpenItems.removeAllNodes();
@@ -2665,7 +2665,7 @@ void LLFolderView::closeAllFolders()
 	setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN);
 }
 
-void LLFolderView::openFolder(const LLString& foldername)
+void LLFolderView::openFolder(const std::string& foldername)
 {
 	LLFolderViewFolder* inv = getChild<LLFolderViewFolder>(foldername);
 	if (inv)
@@ -2771,7 +2771,7 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen
 	return llround(mTargetHeight);
 }
 
-const LLString LLFolderView::getFilterSubString(BOOL trim)
+const std::string LLFolderView::getFilterSubString(BOOL trim)
 {
 	return mFilter.getFilterSubString(trim);
 }
@@ -3119,7 +3119,7 @@ void LLFolderView::draw()
 {
 	if (mDebugFilters)
 	{
-		LLString current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
+		std::string current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
 										mFilter.getCurrentGeneration(), mFilter.getMinRequiredGeneration(), mFilter.getMustPassGeneration());
 		sSmallFont->renderUTF8(current_filter_string, 0, 2, 
 			getRect().getHeight() - sSmallFont->getLineHeight(), LLColor4(0.5f, 0.5f, 0.8f, 1.f), 
@@ -3132,9 +3132,9 @@ void LLFolderView::draw()
 	{
 		closeAutoOpenedFolders();
 	}
-	if(gViewerWindow->hasKeyboardFocus(this) && !getVisible())
+	if(this == gFocusMgr.getKeyboardFocus() && !getVisible())
 	{
-		gViewerWindow->setKeyboardFocus( NULL );
+		gFocusMgr.setKeyboardFocus( NULL );
 	}
 
 	// while dragging, update selection rendering to reflect single/multi drag status
@@ -3169,12 +3169,12 @@ void LLFolderView::draw()
 	{
 		if (gInventory.backgroundFetchActive() || mCompletedFilterGeneration < mFilter.getMinRequiredGeneration())
 		{
-			mStatusText = "Searching..."; // *TODO:translate
+			mStatusText = std::string("Searching..."); // *TODO:translate
 			sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
 		}
 		else
 		{
-			mStatusText = "No matching items found in inventory."; // *TODO:translate
+			mStatusText = std::string("No matching items found in inventory."); // *TODO:translate
 			sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
 		}
 	}
@@ -3192,14 +3192,14 @@ void LLFolderView::finishRenamingItem( void )
 	}
 	if( mRenameItem )
 	{
-		mRenameItem->rename( mRenamer->getText().c_str() );
+		mRenameItem->rename( mRenamer->getText() );
 	}
 
 	mRenamer->setCommitOnFocusLost( FALSE );
 	mRenamer->setFocus( FALSE );
 	mRenamer->setVisible( FALSE );
 	mRenamer->setCommitOnFocusLost( TRUE );
-	gViewerWindow->setTopCtrl( NULL );
+	gFocusMgr.setTopCtrl( NULL );
 
 	if( mRenameItem )
 	{
@@ -3211,13 +3211,12 @@ void LLFolderView::finishRenamingItem( void )
 	scrollToShowSelection();
 }
 
-void LLFolderView::revertRenamingItem( void )
+void LLFolderView::closeRenamer( void )
 {
-	mRenamer->setCommitOnFocusLost( FALSE );
+	// will commit current name (which could be same as original name)
 	mRenamer->setFocus( FALSE );
 	mRenamer->setVisible( FALSE );
-	mRenamer->setCommitOnFocusLost( TRUE );
-	gViewerWindow->setTopCtrl( NULL );
+	gFocusMgr.setTopCtrl( NULL );
 
 	if( mRenameItem )
 	{
@@ -3274,11 +3273,11 @@ void LLFolderView::removeSelectedItems( void )
 					// change selection on successful delete
 					if (new_selection)
 					{
-						setSelectionFromRoot(new_selection, new_selection->isOpen(), gViewerWindow->childHasKeyboardFocus(this));
+						setSelectionFromRoot(new_selection, new_selection->isOpen(), gFocusMgr.childHasKeyboardFocus(this));
 					}
 					else
 					{
-						setSelectionFromRoot(NULL, gViewerWindow->childHasKeyboardFocus(this));
+						setSelectionFromRoot(NULL, gFocusMgr.childHasKeyboardFocus(this));
 					}
 				}
 			}
@@ -3304,11 +3303,11 @@ void LLFolderView::removeSelectedItems( void )
 			}
 			if (new_selection)
 			{
-				setSelectionFromRoot(new_selection, new_selection->isOpen(), gViewerWindow->childHasKeyboardFocus(this));
+				setSelectionFromRoot(new_selection, new_selection->isOpen(), gFocusMgr.childHasKeyboardFocus(this));
 			}
 			else
 			{
-				setSelectionFromRoot(NULL, gViewerWindow->childHasKeyboardFocus(this));
+				setSelectionFromRoot(NULL, gFocusMgr.childHasKeyboardFocus(this));
 			}
 
 			for(S32 i = 0; i < count; ++i)
@@ -3626,7 +3625,7 @@ void LLFolderView::startRenamingSelectedItem( void )
 		// set focus will fail unless item is visible
 		mRenamer->setFocus( TRUE );
 		mRenamer->setLostTopCallback(onRenamerLost);
-		gViewerWindow->setTopCtrl( mRenamer );
+		gFocusMgr.setTopCtrl( mRenamer );
 	}
 }
 
@@ -3687,19 +3686,11 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
 		break;
 
 	case KEY_ESCAPE:
-		// mark flag don't commit
 		if( mRenameItem && mRenamer->getVisible() )
 		{
-			revertRenamingItem();
+			closeRenamer();
 			handled = TRUE;
 		}
-		else
-		{
-			if( gViewerWindow->childHasKeyboardFocus( this ) )
-			{
-				gViewerWindow->setKeyboardFocus( NULL );
-			}
-		}
 		mSearchString.clear();
 		break;
 
@@ -3862,7 +3853,7 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
 			{
 				mSearchString.erase(mSearchString.size() - 1, 1);
 			}
-			search(getCurSelectedItem(), mSearchString.c_str(), FALSE);
+			search(getCurSelectedItem(), mSearchString, FALSE);
 			handled = TRUE;
 		}
 	}
@@ -3905,7 +3896,7 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char)
 		{
 			mSearchString += uni_char;
 		}
-		search(getCurSelectedItem(), mSearchString.c_str(), FALSE);
+		search(getCurSelectedItem(), mSearchString, FALSE);
 
 		handled = TRUE;
 	}
@@ -3956,14 +3947,14 @@ void LLFolderView::onFocusLost( )
 	LLUICtrl::onFocusLost();
 }
 
-BOOL LLFolderView::search(LLFolderViewItem* first_item, const LLString &search_string, BOOL backward)
+BOOL LLFolderView::search(LLFolderViewItem* first_item, const std::string &search_string, BOOL backward)
 {
 	// get first selected item
 	LLFolderViewItem* search_item = first_item;
 
 	// make sure search string is upper case
-	LLString upper_case_string = search_string;
-	LLString::toUpper(upper_case_string);
+	std::string upper_case_string = search_string;
+	LLStringUtil::toUpper(upper_case_string);
 
 	// if nothing selected, select first item in folder
 	if (!search_item)
@@ -3994,7 +3985,7 @@ BOOL LLFolderView::search(LLFolderViewItem* first_item, const LLString &search_s
 			}
 		}
 
-		const LLString current_item_label(search_item->getSearchableLabel());
+		const std::string current_item_label(search_item->getSearchableLabel());
 		S32 search_string_length = llmin(upper_case_string.size(), current_item_label.size());
 		if (!current_item_label.compare(0, search_string_length, upper_case_string))
 		{
@@ -4082,7 +4073,7 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 									 EDragAndDropType cargo_type,
 									 void* cargo_data, 
 									 EAcceptance* accept,
-									 LLString& tooltip_msg)
+									 std::string& tooltip_msg)
 {
 	mDragAndDropThisFrame = TRUE;
 	BOOL handled = LLView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
@@ -4107,9 +4098,9 @@ BOOL LLFolderView::handleScrollWheel(S32 x, S32 y, S32 clicks)
 
 void LLFolderView::deleteAllChildren()
 {
-	if(gViewerWindow->hasTopCtrl(mRenamer))
+	if(mRenamer == gFocusMgr.getTopCtrl())
 	{
-		gViewerWindow->setTopCtrl(NULL);
+		gFocusMgr.setTopCtrl(NULL);
 	}
 	LLView::deleteViewByHandle(mPopupMenuHandle);
 	mPopupMenuHandle = LLHandle<LLView>();
@@ -4374,7 +4365,7 @@ bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolde
 
 	if (by_name)
 	{
-		S32 compare = LLString::compareDict(a->getLabel(), b->getLabel());
+		S32 compare = LLStringUtil::compareDict(a->getLabel(), b->getLabel());
 		if (0 == compare)
 		{
 			return (a->getCreationDate() > b->getCreationDate());
@@ -4388,11 +4379,11 @@ bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolde
 	{
 		// BUG: This is very very slow.  The getCreationDate() is log n in number
 		// of inventory items.
-		U32 first_create = a->getCreationDate();
-		U32 second_create = b->getCreationDate();
+		time_t first_create = a->getCreationDate();
+		time_t second_create = b->getCreationDate();
 		if (first_create == second_create)
 		{
-			return (LLString::compareDict(a->getLabel(), b->getLabel()) < 0);
+			return (LLStringUtil::compareDict(a->getLabel(), b->getLabel()) < 0);
 		}
 		else
 		{
@@ -4477,14 +4468,14 @@ void LLFolderViewEventListener::arrangeAndSet(LLFolderViewItem* focus,
 ///----------------------------------------------------------------------------
 /// Class LLInventoryFilter
 ///----------------------------------------------------------------------------
-LLInventoryFilter::LLInventoryFilter(const LLString& name) :
+LLInventoryFilter::LLInventoryFilter(const std::string& name) :
 	mName(name),
 	mModified(FALSE),
 	mNeedTextRebuild(TRUE)
 {
 	mFilterOps.mFilterTypes = 0xffffffff;
-	mFilterOps.mMinDate = 0;
-	mFilterOps.mMaxDate = U32_MAX;
+	mFilterOps.mMinDate = time_min();
+	mFilterOps.mMaxDate = time_max();
 	mFilterOps.mHoursAgo = 0;
 	mFilterOps.mShowFolderState = SHOW_NON_EMPTY_FOLDERS;
 	mFilterOps.mPermissions = PERM_NONE;
@@ -4492,7 +4483,7 @@ LLInventoryFilter::LLInventoryFilter(const LLString& name) :
 	mOrder = SO_FOLDERS_BY_NAME; // This gets overridden by a pref immediately
 
 	mSubStringMatchOffset = 0;
-	mFilterSubString = "";
+	mFilterSubString.clear();
 	mFilterGeneration = 0;
 	mMustPassGeneration = S32_MAX;
 	mMinRequiredGeneration = 0;
@@ -4512,10 +4503,10 @@ LLInventoryFilter::~LLInventoryFilter()
 
 BOOL LLInventoryFilter::check(LLFolderViewItem* item) 
 {
-	U32 earliest;
+	time_t earliest;
 
 	earliest = time_corrected() - mFilterOps.mHoursAgo * 3600;
-	if (mFilterOps.mMinDate && mFilterOps.mMinDate < earliest)
+	if (mFilterOps.mMinDate > time_min() && mFilterOps.mMinDate < earliest)
 	{
 		earliest = mFilterOps.mMinDate;
 	}
@@ -4524,15 +4515,15 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
 		earliest = 0;
 	}
 	LLFolderViewEventListener* listener = item->getListener();
-	mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : LLString::npos;
+	mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
 	BOOL passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE)
-					&& (mFilterSubString.size() == 0 || mSubStringMatchOffset != LLString::npos)
+					&& (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
 					&& ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
 					&& (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
 	return passed;
 }
 
-const LLString LLInventoryFilter::getFilterSubString(BOOL trim)
+const std::string LLInventoryFilter::getFilterSubString(BOOL trim)
 {
 	return mFilterSubString;
 }
@@ -4558,8 +4549,8 @@ BOOL LLInventoryFilter::isActive()
 	return mFilterOps.mFilterTypes != 0xffffffff 
 		|| mFilterSubString.size() 
 		|| mFilterOps.mPermissions != PERM_NONE 
-		|| mFilterOps.mMinDate != 0 
-		|| mFilterOps.mMaxDate != U32_MAX
+		|| mFilterOps.mMinDate != time_min()
+		|| mFilterOps.mMaxDate != time_max()
 		|| mFilterOps.mHoursAgo != 0;
 }
 
@@ -4603,7 +4594,7 @@ void LLInventoryFilter::setFilterTypes(U32 types)
 	}
 }
 
-void LLInventoryFilter::setFilterSubString(const LLString& string)
+void LLInventoryFilter::setFilterSubString(const std::string& string)
 {
 	if (mFilterSubString != string)
 	{
@@ -4612,8 +4603,8 @@ void LLInventoryFilter::setFilterSubString(const LLString& string)
 		// appending new characters
 		BOOL more_restrictive = mFilterSubString.size() < string.size() && !string.substr(0, mFilterSubString.size()).compare(mFilterSubString);
 		mFilterSubString = string;
-		LLString::toUpper(mFilterSubString);
-		LLString::trimHead(mFilterSubString);
+		LLStringUtil::toUpper(mFilterSubString);
+		LLStringUtil::trimHead(mFilterSubString);
 
 		if (less_restrictive)
 		{
@@ -4655,7 +4646,7 @@ void LLInventoryFilter::setFilterPermissions(PermissionMask perms)
 	}
 }
 
-void LLInventoryFilter::setDateRange(U32 min_date, U32 max_date)
+void LLInventoryFilter::setDateRange(time_t min_date, time_t max_date)
 {
 	mFilterOps.mHoursAgo = 0;
 	if (mFilterOps.mMinDate != min_date)
@@ -4674,19 +4665,20 @@ void LLInventoryFilter::setDateRangeLastLogoff(BOOL sl)
 {
 	if (sl && !isSinceLogoff())
 	{
-		setDateRange(mLastLogoff, U32_MAX);
+		setDateRange(mLastLogoff, time_max());
 		setModified();
 	}
 	if (!sl && isSinceLogoff())
 	{
-		setDateRange(0, U32_MAX);
+		setDateRange(0, time_max());
 		setModified();
 	}
 }
 
 BOOL LLInventoryFilter::isSinceLogoff()
 {
-	return (mFilterOps.mMinDate == mLastLogoff) && (mFilterOps.mMaxDate == U32_MAX);
+	return (mFilterOps.mMinDate == mLastLogoff) &&
+		(mFilterOps.mMaxDate == time_max());
 }
 
 void LLInventoryFilter::setHoursAgo(U32 hours)
@@ -4694,11 +4686,11 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 	if (mFilterOps.mHoursAgo != hours)
 	{
 		// *NOTE: need to cache last filter time, in case filter goes stale
-		BOOL less_restrictive = (mFilterOps.mMinDate == 0 && mFilterOps.mMaxDate == U32_MAX && hours > mFilterOps.mHoursAgo);
-		BOOL more_restrictive = (mFilterOps.mMinDate == 0 && mFilterOps.mMaxDate == U32_MAX && hours <= mFilterOps.mHoursAgo);
+		BOOL less_restrictive = (mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max() && hours > mFilterOps.mHoursAgo);
+		BOOL more_restrictive = (mFilterOps.mMinDate == time_min() && mFilterOps.mMaxDate == time_max() && hours <= mFilterOps.mHoursAgo);
 		mFilterOps.mHoursAgo = hours;
-		mFilterOps.mMinDate = 0;
-		mFilterOps.mMaxDate = U32_MAX;
+		mFilterOps.mMinDate = time_min();
+		mFilterOps.mMaxDate = time_max();
 		if (less_restrictive)
 		{
 			setModified(FILTER_LESS_RESTRICTIVE);
@@ -4807,7 +4799,7 @@ BOOL LLInventoryFilter::isFilterWith(LLInventoryType::EType t)
 	return mFilterOps.mFilterTypes & (0x01 << t);
 }
 
-LLString LLInventoryFilter::getFilterText()
+std::string LLInventoryFilter::getFilterText()
 {
 	if (!mNeedTextRebuild)
 	{
@@ -4815,12 +4807,12 @@ LLString LLInventoryFilter::getFilterText()
 	}
 
 	mNeedTextRebuild = FALSE;
-	LLString filtered_types;
-	LLString not_filtered_types;
+	std::string filtered_types;
+	std::string not_filtered_types;
 	BOOL filtered_by_type = FALSE;
 	BOOL filtered_by_all_types = TRUE;
 	S32 num_filter_types = 0;
-	mFilterText = "";
+	mFilterText.clear();
 
 	if (isFilterWith(LLInventoryType::IT_ANIMATION))
 	{
@@ -4999,7 +4991,7 @@ void LLInventoryFilter::fromLLSD(LLSD& data)
 
 	if(data.has("min_date") && data.has("max_date"))
 	{
-		setDateRange((U32)data["min_date"].asInteger(), (U32)data["max_date"].asInteger());
+		setDateRange(data["min_date"].asInteger(), data["max_date"].asInteger());
 	}
 
 	if(data.has("hours_ago"))
@@ -5019,7 +5011,7 @@ void LLInventoryFilter::fromLLSD(LLSD& data)
 
 	if(data.has("substring"))
 	{
-		setFilterSubString(LLString(data["substring"].asString()));
+		setFilterSubString(std::string(data["substring"].asString()));
 	}
 
 	if(data.has("sort_order"))
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 3858388..6369120 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -70,26 +70,25 @@ class LLFolderViewItem;
 class LLFolderView;
 class LLInventoryModel;
 class LLScrollableContainerView;
-typedef BOOL (*LLFolderSearchFunction)(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
 
 class LLFolderViewEventListener
 {
 public:
 	virtual ~LLFolderViewEventListener( void ) {}
-	virtual const LLString& getName() const = 0;
-	virtual const LLString& getDisplayName() const = 0;
+	virtual const std::string& getName() const = 0;
+	virtual const std::string& getDisplayName() const = 0;
 	virtual const LLUUID& getUUID() const = 0;
-	virtual U32 getCreationDate() const = 0;	// UTC seconds
+	virtual time_t getCreationDate() const = 0;	// UTC seconds
 	virtual PermissionMask getPermissionMask() const = 0;
 	virtual LLUIImagePtr getIcon() const = 0;
 	virtual LLFontGL::StyleFlags getLabelStyle() const = 0;
-	virtual LLString getLabelSuffix() const = 0;
+	virtual std::string getLabelSuffix() const = 0;
 	virtual void openItem( void ) = 0;
 	virtual void previewItem( void ) = 0;
 	virtual void selectItem(void) = 0;
 	virtual void showProperties(void) = 0;
 	virtual BOOL isItemRenameable() const = 0;
-	virtual BOOL renameItem(const LLString& new_name) = 0;
+	virtual BOOL renameItem(const std::string& new_name) = 0;
 	virtual BOOL isItemMovable( void ) = 0;		// Can be moved to another folder
 	virtual BOOL isItemRemovable( void ) = 0;	// Can be destroyed
 	virtual BOOL removeItem() = 0;
@@ -104,7 +103,7 @@ public:
 	virtual BOOL isUpToDate() const = 0;
 	virtual BOOL hasChildren() const = 0;
 	virtual LLInventoryType::EType getInventoryType() const = 0;
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action) {}
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action) {}
 
 	// This method should be called when a drag begins. returns TRUE
 	// if the drag can begin, otherwise FALSE.
@@ -186,22 +185,22 @@ public:
 	static const U32 SO_FOLDERS_BY_NAME = 2;
 	static const U32 SO_SYSTEM_FOLDERS_TO_TOP = 4;
 
-	LLInventoryFilter(const LLString& name);
+	LLInventoryFilter(const std::string& name);
 	virtual ~LLInventoryFilter();
 
 	void setFilterTypes(U32 types);
 	U32 getFilterTypes() const { return mFilterOps.mFilterTypes; }
 	
-	void setFilterSubString(const LLString& string);
-	const LLString getFilterSubString(BOOL trim = FALSE);
+	void setFilterSubString(const std::string& string);
+	const std::string getFilterSubString(BOOL trim = FALSE);
 
 	void setFilterPermissions(PermissionMask perms);
 	PermissionMask getFilterPermissions() const { return mFilterOps.mPermissions; }
 
-	void setDateRange(U32 min_date, U32 max_date);
+	void setDateRange(time_t min_date, time_t max_date);
 	void setDateRangeLastLogoff(BOOL sl);
-	U32 getMinDate() const { return mFilterOps.mMinDate; }
-	U32 getMaxDate() const { return mFilterOps.mMaxDate; }
+	time_t getMinDate() const { return mFilterOps.mMinDate; }
+	time_t getMaxDate() const { return mFilterOps.mMaxDate; }
 
 	void setHoursAgo(U32 hours);
 	U32 getHoursAgo() const { return mFilterOps.mHoursAgo; }
@@ -220,8 +219,8 @@ public:
 	BOOL isModifiedAndClear();
 	BOOL isSinceLogoff();
 	void clearModified() { mModified = FALSE; mFilterBehavior = FILTER_NONE; }
-	const LLString getName() const { return mName; }
-	LLString getFilterText();
+	const std::string getName() const { return mName; }
+	std::string getFilterText();
 
 	void setFilterCount(S32 count) { mFilterCount = count; }
 	S32 getFilterCount() { return mFilterCount; }
@@ -246,8 +245,8 @@ protected:
 	struct filter_ops
 	{
 		U32			mFilterTypes;
-		U32			mMinDate;
-		U32			mMaxDate;
+		time_t		mMinDate;
+		time_t		mMaxDate;
 		U32			mHoursAgo;
 		EFolderShow	mShowFolderState;
 		PermissionMask	mPermissions;
@@ -255,9 +254,9 @@ protected:
 	filter_ops		mFilterOps;
 	filter_ops		mDefaultFilterOps;
 	std::string::size_type	mSubStringMatchOffset;
-	LLString		mFilterSubString;
+	std::string		mFilterSubString;
 	U32				mOrder;
-	const LLString	mName;
+	const std::string	mName;
 	S32				mFilterGeneration;
 	S32				mMustPassGeneration;
 	S32				mMinRequiredGeneration;
@@ -269,7 +268,7 @@ private:
 	U32 mLastLogoff;
 	BOOL mModified;
 	BOOL mNeedTextRebuild;
-	LLString mFilterText;
+	std::string mFilterText;
 };
 
 // These are grouping of inventory types.
@@ -329,9 +328,9 @@ protected:
 	static LLColor4				sSuffixColor;
 	static LLColor4				sSearchStatusColor;
 
-	LLString					mLabel;
-	LLString					mSearchableLabel;
-	LLString					mType;
+	std::string					mLabel;
+	std::string					mSearchableLabel;
+	std::string					mType;
 	S32							mLabelWidth;
 	U32							mCreationDate;
 	LLFolderViewFolder*			mParentFolder;
@@ -340,9 +339,9 @@ protected:
 	BOOL						mIsCurSelection;
 	BOOL						mSelectPending;
 	LLFontGL::StyleFlags		mLabelStyle;
-	LLString					mLabelSuffix;
+	std::string					mLabelSuffix;
 	LLUIImagePtr				mIcon;
-	LLString					mStatusText;
+	std::string					mStatusText;
 	BOOL						mHasVisibleChildren;
 	S32							mIndentation;
 	S32							mNumDescendantsSelected;
@@ -383,7 +382,7 @@ public:
 	void filterFromRoot( void );
 
 	// creation_date is in UTC seconds
-	LLFolderViewItem( const LLString& name, LLUIImagePtr icon, S32 creation_date, LLFolderView* root, LLFolderViewEventListener* listener );
+	LLFolderViewItem( const std::string& name, LLUIImagePtr icon, S32 creation_date, LLFolderView* root, LLFolderViewEventListener* listener );
 	virtual ~LLFolderViewItem( void );
 
 	// addToFolder() returns TRUE if it succeeds. FALSE otherwise
@@ -454,17 +453,17 @@ public:
 
 	// This method returns the actual name of the thing being
 	// viewed. This method will ask the viewed object itself.
-	const LLString& getName( void ) const;
+	const std::string& getName( void ) const;
 
-	const LLString& getSearchableLabel( void ) const;
+	const std::string& getSearchableLabel( void ) const;
 
 	// This method returns the label displayed on the view. This
 	// method was primarily added to allow sorting on the folder
 	// contents possible before the entire view has been constructed.
-	const char* getLabel() const { return mLabel.c_str(); }
+	const std::string& getLabel() const { return mLabel; }
 
 	// Used for sorting, like getLabel() above.
-	virtual U32 getCreationDate() const { return mCreationDate; }
+	virtual time_t getCreationDate() const { return mCreationDate; }
 	
 	LLFolderViewFolder* getParentFolder( void ) { return mParentFolder; }
 	const LLFolderViewFolder* getParentFolder( void ) const { return mParentFolder; }
@@ -476,7 +475,7 @@ public:
 	LLFolderViewEventListener* getListener( void ) { return mListener; }
 
 	// just rename the object.
-	void rename(const LLString& new_name);
+	void rename(const std::string& new_name);
 
 	// open
 	virtual void openItem( void );
@@ -519,7 +518,7 @@ public:
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg);
+								   std::string& tooltip_msg);
 };
 
 
@@ -555,7 +554,7 @@ protected:
 	F32			mCurHeight;
 	F32			mTargetHeight;
 	F32			mAutoOpenCountdown;
-	U32			mSubtreeCreationDate;
+	time_t		mSubtreeCreationDate;
 	mutable ETrash mAmTrash;
 	S32			mLastArrangeGeneration;
 	S32			mLastCalculatedWidth;
@@ -570,7 +569,7 @@ public:
 		RECURSE_UP_DOWN
 	} ERecurseType;
 
-	LLFolderViewFolder( const LLString& name, LLUIImagePtr icon,
+	LLFolderViewFolder( const std::string& name, LLUIImagePtr icon,
 						LLFolderView* root,
 						LLFolderViewEventListener* listener );
 	virtual ~LLFolderViewFolder( void );
@@ -681,7 +680,7 @@ public:
 									EDragAndDropType cargo_type,
 									void* cargo_data,
 									EAcceptance* accept,
-									LLString& tooltip_msg);
+									std::string& tooltip_msg);
 
 	void applyFunctorRecursively(LLFolderViewFunctor& functor);
 	virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
@@ -699,10 +698,10 @@ public:
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg);
+								   std::string& tooltip_msg);
 	virtual void draw();
 
-	U32 getCreationDate() const;
+	time_t getCreationDate() const;
 	bool isTrash() const;
 };
 
@@ -724,7 +723,7 @@ public:
 
 	static F32 sAutoOpenTime;
 
-	LLFolderView( const LLString& name, LLUIImagePtr root_folder_icon, const LLRect& rect, 
+	LLFolderView( const std::string& name, LLUIImagePtr root_folder_icon, const LLRect& rect, 
 					const LLUUID& source_id, LLView *parent_view );
 	virtual ~LLFolderView( void );
 
@@ -739,7 +738,7 @@ public:
 	void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; }
 
 	LLInventoryFilter* getFilter() { return &mFilter; }
-	const LLString getFilterSubString(BOOL trim = FALSE);
+	const std::string getFilterSubString(BOOL trim = FALSE);
 	U32 getFilterTypes() const { return mFilter.getFilterTypes(); }
 	PermissionMask getFilterPermissions() const { return mFilter.getFilterPermissions(); }
 	LLInventoryFilter::EFolderShow getShowFolderState() { return mFilter.getShowFolderState(); }
@@ -749,7 +748,7 @@ public:
 
 	// Close all folders in the view
 	void closeAllFolders();
-	void openFolder(const LLString& foldername);
+	void openFolder(const std::string& foldername);
 
 	virtual void toggleOpen() {};
 	virtual void setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse);
@@ -839,7 +838,7 @@ public:
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg);
+								   std::string& tooltip_msg);
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	/*virtual*/ void onFocusLost();
 	virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
@@ -851,7 +850,7 @@ public:
 	void setScrollContainer( LLScrollableContainerView* parent ) { mScrollContainer = parent; }
 	LLRect getVisibleRect();
 
-	BOOL search(LLFolderViewItem* first_item, const LLString &search_string, BOOL backward);
+	BOOL search(LLFolderViewItem* first_item, const std::string &search_string, BOOL backward);
 	void setShowSelectionContext(BOOL show) { mShowSelectionContext = show; }
 	BOOL getShowSelectionContext();
 	void setShowSingleSelection(BOOL show);
@@ -881,7 +880,7 @@ protected:
 	static void onRenamerLost( LLUICtrl* renamer, void* user_data);
 
 	void finishRenamingItem( void );
-	void revertRenamingItem( void );
+	void closeRenamer( void );
 
 protected:
 	LLHandle<LLView>					mPopupMenuHandle;
@@ -910,7 +909,7 @@ protected:
 	LLFolderViewFolder*				mAutoOpenCandidate;
 	LLFrameTimer					mAutoOpenTimer;
 	LLFrameTimer					mSearchTimer;
-	LLString						mSearchString;
+	std::string						mSearchString;
 	LLInventoryFilter				mFilter;
 	BOOL							mShowSelectionContext;
 	BOOL							mShowSingleSelection;
diff --git a/linden/indra/newview/llfollowcam.cpp b/linden/indra/newview/llfollowcam.cpp
index 0fc0661..4943e08 100644
--- a/linden/indra/newview/llfollowcam.cpp
+++ b/linden/indra/newview/llfollowcam.cpp
@@ -264,6 +264,7 @@ LLFollowCam::LLFollowCam() : LLFollowCamParams()
 	mSubjectRotation					= LLQuaternion::DEFAULT;
 
 	mZoomedToMinimumDistance			= false;
+	mPitchCos = mPitchSin = 0.f;
 	mPitchSineAndCosineNeedToBeUpdated	= true; 
 
 	mSimulatedDistance = mDistance;
diff --git a/linden/indra/newview/llfollowcam.h b/linden/indra/newview/llfollowcam.h
index 390dbb6..fe68cd9 100644
--- a/linden/indra/newview/llfollowcam.h
+++ b/linden/indra/newview/llfollowcam.h
@@ -169,8 +169,6 @@ public:
 	// protected members of FollowCam
 	//------------------------------------------
 protected:
-	F32		mPositionLagTimeScale;		// derived from mPositionLag
-	F32		mFocusLagTimeScale;			// derived from mFocusLag
 	F32		mPitchCos;					// derived from mPitch
 	F32		mPitchSin;					// derived from mPitch
 	LLGlobalVec		mSimulatedPositionGlobal;		// where the camera is (global coordinates), simulated
diff --git a/linden/indra/newview/llframestats.cpp b/linden/indra/newview/llframestats.cpp
index c7519c9..537753e 100644
--- a/linden/indra/newview/llframestats.cpp
+++ b/linden/indra/newview/llframestats.cpp
@@ -41,7 +41,7 @@
 LLFrameStats gFrameStats;
 
 // static
-char *LLFrameStats::sStatLabels[NUM_STATS] = {
+std::string LLFrameStats::sStatLabels[NUM_STATS] = {
 					"IdleNetwork",
 					"AgentMisc",
 					"ObjectUpdate",
@@ -178,12 +178,12 @@ void LLFrameStats::dump()
 
 		static S32 dump_count = 0;
 
-		char file_with_num[256];		/* Flawfinder: ignore */
-		snprintf(file_with_num, sizeof(file_with_num), "fs%d.txt", dump_count);			/* Flawfinder: ignore */
+		std::string file_with_num;
+		file_with_num = llformat("fs%d.txt", dump_count);
 		dump_count++;
 
-		char filename[LL_MAX_PATH];		/* Flawfinder: ignore */
-		snprintf(filename, LL_MAX_PATH, "%s", gDirUtilp->getExpandedFilename(LL_PATH_LOGS, file_with_num).c_str());			/* Flawfinder: ignore */
+		std::string filename;
+		filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, file_with_num);
 		LLFILE *fp = LLFile::fopen(filename, "w");		/* Flawfinder: ignore */
 		if (!fp)
 		{
@@ -197,7 +197,7 @@ void LLFrameStats::dump()
 		S32 i;
 		for (i = 0; i < NUM_STATS; i++)
 		{
-			fprintf(fp, "%s\t", sStatLabels[i]);
+			fprintf(fp, "%s\t", sStatLabels[i].c_str());
 		}
 		fprintf(fp, "Full Updates\tTerse Updates\tTotal Vorbis\tLong Vorbis\tNum Vorbis Decodes\t");
 		fprintf(fp, "\n");
@@ -224,7 +224,7 @@ void LLFrameStats::dump()
 		fclose(fp);
 
 		// Now dump cumulative stats
-		snprintf(filename, LL_MAX_PATH, "%s", gDirUtilp->getExpandedFilename(LL_PATH_LOGS, mSummaryFilename.c_str()).c_str());			/* Flawfinder: ignore */
+		filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, mSummaryFilename);
 		fp = LLFile::fopen(filename, "a");		/* Flawfinder: ignore */
 		if (!fp)
 		{
@@ -306,7 +306,3 @@ void LLFrameStats::timedLogging10(void *)
 	gFrameStats.mUseTimer = TRUE;
 }
 
-const char *LLFrameStats::getCurStatName() const
-{
-	return getStatLabel(mCurrentStat);
-}
diff --git a/linden/indra/newview/llframestats.h b/linden/indra/newview/llframestats.h
index 7b4da19..dde443f 100644
--- a/linden/indra/newview/llframestats.h
+++ b/linden/indra/newview/llframestats.h
@@ -80,10 +80,8 @@ public:
 
 	void dump();
 
-	const char *getCurStatName() const;
-
 	LLStat &getStat(const S32 i)						{ return mStats[i]; }
-	const char *getStatLabel(const S32 i) const			{ return sStatLabels[i]; }
+	const std::string& getStatLabel(const S32 i) const	{ return sStatLabels[i]; } // array of const char*'s
 	LLColor4 getStatColor(const S32 i) const			{ return sStatColors[i]; }
 
 	static void startLogging(void *);
@@ -107,8 +105,8 @@ private:
 		S32 mNumVorbisDecodes;
 	};
 
-	LLString			mFilename;
-	LLString			mSummaryFilename;
+	std::string			mFilename;
+	std::string			mSummaryFilename;
 
 	BOOL				mTrackStats;
 	LLTimer				mTimer;
@@ -118,7 +116,7 @@ private:
 	EStat				mCurrentStat;
 
 	LLStat				mStats[NUM_STATS];
-	static char			*sStatLabels[NUM_STATS];
+	static std::string	sStatLabels[NUM_STATS];
 	static LLColor4		sStatColors[NUM_STATS];
 	LLDynamicArray<FrameData> mFrameData;
 	void stop();
diff --git a/linden/indra/newview/llframestatview.cpp b/linden/indra/newview/llframestatview.cpp
index 71d810c..752c6c4 100644
--- a/linden/indra/newview/llframestatview.cpp
+++ b/linden/indra/newview/llframestatview.cpp
@@ -191,7 +191,7 @@ void LLFrameStatView::draw()
 	
 	// Draw ticks for the "Average bar"
 	F32 tick_value;
-	char tick_label[256];		/* Flawfinder: ignore */
+	std::string tick_label;
 	for (tick_value = 0; tick_value <= 100; tick_value += 10)
 	{
 		left = 10 + llfloor(tick_value*(total_width/100.f));
@@ -208,7 +208,7 @@ void LLFrameStatView::draw()
 		right = left + 1;
 		gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.2f));
 
-		snprintf(tick_label, sizeof(tick_label), "%.2f", tick_value);			/* Flawfinder: ignore */
+		tick_label = llformat("%.2f", tick_value);
 		// draw labels for the tick marks
 		LLFontGL::sMonospace->renderUTF8(tick_label, 0, left, bottom,
 			LLColor4(1.f, 1.f, 1.f, 0.5f),
@@ -258,7 +258,7 @@ void LLFrameStatView::draw()
 			right = left + 1;
 			gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
 
-			snprintf(tick_label, sizeof(tick_label), "%.2f", tick_value);			/* Flawfinder: ignore */
+			tick_label = llformat("%.2f", tick_value);
 			// draw labels for the tick marks
 			LLFontGL::sMonospace->renderUTF8(tick_label, 0, left, bottom,
 				LLColor4(1.f, 1.f, 1.f, 0.5f),
@@ -283,7 +283,7 @@ void LLFrameStatView::draw()
 			right = left + 1;
 			gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
 
-			snprintf(tick_label, sizeof(tick_label), "%.2f", tick_value);			/* Flawfinder: ignore */
+			tick_label = llformat("%.2f", tick_value);
 			// draw labels for the tick marks
 			LLFontGL::sMonospace->renderUTF8(tick_label, 0, left, bottom,
 				LLColor4(1.f, 1.f, 1.f, 0.5f),
@@ -368,7 +368,7 @@ void LLFrameStatView::draw()
 	LLView::draw();
 }
 
-void LLFrameStatView::addStat(LLStat *statp, const char *label, const LLColor4 &color)
+void LLFrameStatView::addStat(LLStat *statp, const std::string& label, const LLColor4 &color)
 {
 	if( mNumStats >= MAX_STATS )
 	{
diff --git a/linden/indra/newview/llframestatview.h b/linden/indra/newview/llframestatview.h
index 2528891..2491a83 100644
--- a/linden/indra/newview/llframestatview.h
+++ b/linden/indra/newview/llframestatview.h
@@ -61,11 +61,11 @@ public:
 	F32 mLabelSpacing;
 	S32 mCenterOn;
 	BOOL mShowPercent;
-	void addStat(LLStat *statp, const char *label, const LLColor4 &color);
+	void addStat(LLStat *statp, const std::string& label, const LLColor4 &color);
 private:
 	LLStat *mStats[MAX_STATS];
 	LLColor4 mColors[MAX_STATS];
-	const char *mLabels[MAX_STATS];		/* Flawfinder: ignore */
+	std::string mLabels[MAX_STATS];
 	S32 mNumStats;
 };
 
diff --git a/linden/indra/newview/llgenepool.cpp b/linden/indra/newview/llgenepool.cpp
index 553bcad..a427af6 100644
--- a/linden/indra/newview/llgenepool.cpp
+++ b/linden/indra/newview/llgenepool.cpp
@@ -60,10 +60,9 @@ LLGenePool::~LLGenePool()
 
 BOOL LLGenePool::load()
 {
-	char filename[MAX_PATH]; /*Flawfinder: ignore*/
+	std::string filename;
 
-	strncpy(filename,gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"genepool.xml").c_str(), sizeof(filename) -1);		/*Flawfinder: ignore*/	
-        filename[sizeof(filename) -1] = '\0';
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"genepool.xml");
 	if( mLoaded )
 	{
 		return TRUE;
@@ -91,7 +90,7 @@ BOOL LLGenePool::load()
 		return FALSE;
 	}
 
-	LLString version;
+	std::string version;
 	static LLStdStringHandle version_string = LLXmlTree::addAttributeString("version");
 	if( !root->getFastAttributeString( version_string, version ) || (version != "1.0") )
 	{
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index 27c9836..86b2242 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -489,7 +489,7 @@ void LLGestureManager::playGesture(const LLUUID& item_id)
 // and (as a minor side effect) has multiple spaces in a row replaced by single spaces.
 BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::string* revised_string)
 {
-	LLString tokenized = LLString(utf8str.c_str());
+	std::string tokenized = utf8str;
 
 	BOOL found_gestures = FALSE;
 	BOOL first_token = TRUE;
@@ -507,8 +507,8 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 		// Only pay attention to the first gesture in the string.
 		if( !found_gestures )
 		{
-			LLString cur_token_lower = cur_token;
-			LLString::toLower(cur_token_lower);
+			std::string cur_token_lower = cur_token;
+			LLStringUtil::toLower(cur_token_lower);
 
 			// collect gestures that match
 			std::vector <LLMultiGesture *> matching;
@@ -520,7 +520,7 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 				// Gesture asset data might not have arrived yet
 				if (!gesture) continue;
 				
-				if (!stricmp(gesture->mTrigger.c_str(), cur_token_lower.c_str()))
+				if (gesture->mTrigger == cur_token_lower)
 				{
 					matching.push_back(gesture);
 				}
@@ -548,9 +548,9 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 						}
 
 						// Don't muck with the user's capitalization if we don't have to.
-						LLString output = gesture->mReplaceText.c_str();
-						LLString output_lower = output;
-						LLString::toLower(output_lower);
+						std::string output = gesture->mReplaceText;
+						std::string output_lower = output;
+						LLStringUtil::toLower(output_lower);
 						if( cur_token_lower == output_lower )
 						{
 							if (revised_string)
@@ -958,7 +958,7 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs,
 					&& gGestureManager.mDeactivateSimilarNames.length() > 0)
 				{
 					// we're done with this set of deactivations
-					LLString::format_map_t args;
+					LLStringUtil::format_map_t args;
 					args["[NAMES]"] = gGestureManager.mDeactivateSimilarNames;
 					LLNotifyBox::showXml("DeactivatedGesturesTrigger", args);
 				}
@@ -1123,9 +1123,9 @@ BOOL LLGestureManager::matchPrefix(const std::string& in_str, std::string* out_s
 				continue;
 			}
 
-			LLString trigger_trunc = trigger;
-			LLString::truncate(trigger_trunc, in_len);
-			if (!LLString::compareInsensitive(in_str.c_str(), trigger_trunc.c_str()))
+			std::string trigger_trunc = trigger;
+			LLStringUtil::truncate(trigger_trunc, in_len);
+			if (!LLStringUtil::compareInsensitive(in_str, trigger_trunc))
 			{
 				*out_str = trigger;
 				return TRUE;
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index 016acd5..82fead1 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -55,8 +55,6 @@
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
 
-const char* GIVE_MONEY_TITLE = "";	// Dialog contains text "Pay"
-
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLGiveMoneyInfo
 //
@@ -84,7 +82,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 						   money_callback callback,
 						   const LLUUID& uuid,
 						   BOOL target_is_object) :
-	LLFloater(name, "FloaterPayRectB", GIVE_MONEY_TITLE, RESIZE_NO,
+	LLFloater(name, std::string("FloaterPayRectB"), LLStringUtil::null, RESIZE_NO,
 				DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, DRAG_ON_TOP,
 				MINIMIZE_NO, CLOSE_YES),
 	mCallbackData(),
@@ -150,7 +148,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 	
     childSetVisible("amount text", FALSE);	
 
-	LLString last_amount;
+	std::string last_amount;
 	if(sLastAmount > 0)
 	{
 		last_amount = llformat("%d", sLastAmount);
@@ -241,7 +239,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
 			msg->getS32Fast(_PREHASH_ButtonData,_PREHASH_PayButton,pay_button,i);
 			if (pay_button > 0)
 			{
-				LLString button_str = "L$";
+				std::string button_str = "L$";
 				button_str += LLResMgr::getInstance()->getMonetaryString( pay_button );
 
 				self->mQuickPayButton[i]->setLabelSelected(button_str);
@@ -262,10 +260,10 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
 		}
 
 		// build a string containing the maximum value and calc nerw button width from it.
-		LLString balance_str = "L$";
+		std::string balance_str = "L$";
 		balance_str += LLResMgr::getInstance()->getMonetaryString( max_pay_amount );
 		const LLFontGL* font = LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF);
-		S32 new_button_width = font->getWidth( LLString(balance_str));
+		S32 new_button_width = font->getWidth( std::string(balance_str));
 		new_button_width += ( 12 + 12 );	// padding
 
 		// dialong is sized for 2 digit pay amounts - larger pay values need to be scaled
@@ -276,7 +274,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
 			S32 num_digits_max = (S32)log10((double)max_pay_amount) + 1;
 				
 			// calculate the extra width required by 2 buttons with max amount and some commas
-			padding_required = ( num_digits_max - num_digits_threshold + ( num_digits_max / 3 ) ) * font->getWidth( "0" );
+			padding_required = ( num_digits_max - num_digits_threshold + ( num_digits_max / 3 ) ) * font->getWidth( std::string("0") );
 		};
 
 		// change in button width
@@ -388,8 +386,8 @@ void LLFloaterPay::finishPayUI(const LLUUID& target_id, BOOL is_group)
 
 // static
 void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id,
-									const char* firstname,
-									const char* lastname,
+									const std::string& firstname,
+									const std::string& lastname,
 									BOOL is_group,
 									void* userdata)
 {
@@ -407,8 +405,8 @@ void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id,
 		self->childSetVisible("payee_resident",true);
 	}
 	
-	self->childSetTextArg("payee_name", "[FIRST]", LLString(firstname));
-	self->childSetTextArg("payee_name", "[LAST]", LLString(lastname));
+	self->childSetTextArg("payee_name", "[FIRST]", firstname);
+	self->childSetTextArg("payee_name", "[LAST]", lastname);
 }
 
 // static
@@ -428,7 +426,7 @@ void LLFloaterPay::onKeystroke(LLLineEditor*, void* data)
 	if(self)
 	{
 		// enable the Pay button when amount is non-empty and positive, disable otherwise
-		LLString amtstr = self->childGetText("amount");
+		std::string amtstr = self->childGetText("amount");
 		self->childSetEnabled("pay btn", !amtstr.empty() && atoi(amtstr.c_str()) > 0);
 	}
 }
@@ -467,7 +465,7 @@ void LLFloaterPay::give(S32 amount)
 				{
 					// Find the name of the root object
 					LLSelectNode* node = mObjectSelection->getFirstRootNode();
-					LLString object_name;
+					std::string object_name;
 					if (node)
 					{
 						object_name = node->mName;
@@ -493,7 +491,7 @@ void LLFloaterPay::give(S32 amount)
 		else
 		{
 			// just transfer the L$
-			mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLString::null);
+			mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLStringUtil::null);
 
 			// check if the payee needs to be unmuted
 			LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY);
diff --git a/linden/indra/newview/llgivemoney.h b/linden/indra/newview/llgivemoney.h
index e150679..b3cf556 100644
--- a/linden/indra/newview/llgivemoney.h
+++ b/linden/indra/newview/llgivemoney.h
@@ -47,7 +47,7 @@ class LLButton;
 class LLObjectSelection;
 struct LLGiveMoneyInfo;
 
-typedef void (*money_callback)(const LLUUID&, LLViewerRegion*,S32,BOOL,S32,const LLString&);
+typedef void (*money_callback)(const LLUUID&, LLViewerRegion*,S32,BOOL,S32,const std::string&);
 
 class LLFloaterPay : public LLFloater
 {
@@ -77,8 +77,8 @@ private:
 	void give(S32 amount);
 	static void processPayPriceReply(LLMessageSystem* msg, void **userdata);
 	static void onCacheOwnerName(const LLUUID& owner_id,
-								 const char* firstname,
-								 const char* lastname,
+								 const std::string& firstname,
+								 const std::string& lastname,
 								 BOOL is_group,
 								 void* userdata);
 	void finishPayUI(const LLUUID& target_id, BOOL is_group);
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 30c76c9..45f674d 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -1102,7 +1102,7 @@ void LLViewerObjectList::renderObjectBeacons()
 			color = debug_beacon.mTextColor;
 			color.mV[3] *= 1.f;
 
-			hud_textp->setString(utf8str_to_wstring(debug_beacon.mString.c_str()));
+			hud_textp->setString(utf8str_to_wstring(debug_beacon.mString));
 			hud_textp->setColor(color);
 			hud_textp->setPositionAgent(debug_beacon.mPositionAgent);
 			debug_beacon.mHUDObject = hud_textp;
@@ -1111,44 +1111,3 @@ void LLViewerObjectList::renderObjectBeacons()
 }
 
 
-void pre_show_depth_buffer()
-{
-	glClear(GL_STENCIL_BUFFER_BIT);
-	glEnable(GL_STENCIL_TEST);
-	glStencilFunc(GL_ALWAYS,0,0);
-	glStencilOp(GL_INCR,GL_INCR,GL_INCR);
-}
-
-void post_show_depth_buffer()
-{
-	int xsize =500, ysize =500;
-	U8 *buf = new U8[xsize*ysize];
-
-	glReadPixels(0,0,xsize,ysize,GL_STENCIL_INDEX,GL_UNSIGNED_BYTE, buf);
-
-	int total = 0;
-	int i;
-	for (i=0;i<xsize*ysize;i++) 
-	{
-		total += buf[i];
-		buf[i] <<= 3;
-	}
-
-	float DC = (float)total/(float)(ysize*xsize);
-	int DCline = llfloor((xsize-20) * DC / 10.0f);
-	int stride = xsize / 10;
-
-	int y = 2;
-
-	for (i=0;i<DCline;i++)
-	{
-		if (i % stride == 0) i+=2;
-		if (i > xsize) y=6;
-		buf[ysize*(y+0)+i]=255;
-		buf[ysize*(y+1)+i]=255;
-		buf[ysize*(y+2)+i]=255;
-	}
-	glDrawPixels(xsize,ysize,GL_RED,GL_UNSIGNED_BYTE,buf);
-
-	delete [] buf;
-}
diff --git a/linden/indra/newview/llglslshader.cpp b/linden/indra/newview/llglslshader.cpp
deleted file mode 100644
index a9274b5..0000000
--- a/linden/indra/newview/llglslshader.cpp
+++ /dev/null
@@ -1,2310 +0,0 @@
-/** 
- * @file llglslshader.cpp
- * @brief GLSL helper functions and state.
- *
- * $LicenseInfo:firstyear=2005&license=viewergpl$
- * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfeaturemanager.h"
-#include "llglslshader.h"
-
-#include "llfile.h"
-#include "llviewerwindow.h"
-#include "llviewercontrol.h"
-#include "pipeline.h"
-#include "llworld.h"
-#include "llwlparammanager.h"
-#include "llwaterparammanager.h"
-#include "llsky.h"
-#include "llvosky.h"
-#include "llrender.h"
-
-#if LL_DARWIN
-#include "OpenGL/OpenGL.h"
-#endif
-
-#ifdef LL_RELEASE_FOR_DOWNLOAD
-#define UNIFORM_ERRS LL_WARNS_ONCE("Shader")
-#else
-#define UNIFORM_ERRS LL_ERRS("Shader")
-#endif
-
-// Lots of STL stuff in here, using namespace std to keep things more readable
-using std::vector;
-using std::pair;
-using std::make_pair;
-using std::string;
-
-LLVector4			gShinyOrigin;
-
-//object shaders
-LLGLSLShader		gObjectSimpleProgram;
-LLGLSLShader		gObjectSimpleWaterProgram;
-LLGLSLShader		gObjectFullbrightProgram;
-LLGLSLShader		gObjectFullbrightWaterProgram;
-
-LLGLSLShader		gObjectFullbrightShinyProgram;
-LLGLSLShader		gObjectShinyProgram;
-LLGLSLShader		gObjectShinyWaterProgram;
-
-//environment shaders
-LLGLSLShader		gTerrainProgram;
-LLGLSLShader		gTerrainWaterProgram;
-LLGLSLShader		gWaterProgram;
-LLGLSLShader		gUnderWaterProgram;
-
-//interface shaders
-LLGLSLShader		gHighlightProgram;
-
-//avatar skinning utility shader object
-GLhandleARB			gAvatarSkinVertex;
-
-//avatar shader handles
-LLGLSLShader		gAvatarProgram;
-LLGLSLShader		gAvatarWaterProgram;
-LLGLSLShader		gAvatarEyeballProgram;
-LLGLSLShader		gAvatarPickProgram;
-
-// WindLight shader handles
-LLGLSLShader			gWLSkyProgram;
-LLGLSLShader			gWLCloudProgram;
-
-// Effects Shaders
-LLGLSLShader			gGlowProgram;
-LLGLSLShader			gGlowExtractProgram;
-LLGLSLShader			gPostColorFilterProgram;
-LLGLSLShader			gPostNightVisionProgram;
-
-// Deferred rendering shaders
-LLGLSLShader			gDeferredDiffuseProgram;
-
-//current avatar shader parameter pointer
-GLint				gAvatarMatrixParam;
-
-S32	LLShaderMgr::sVertexShaderLevel[SHADER_COUNT] = { 0 };
-
-S32	LLShaderMgr::sMaxAvatarShaderLevel = 0;
-
-std::map<string, GLhandleARB> LLShaderMgr::sShaderObjects;
-vector<string> LLShaderMgr::sReservedAttribs;
-vector<string> LLShaderMgr::sWLUniforms;
-vector<string> LLShaderMgr::sTerrainUniforms;
-vector<string> LLShaderMgr::sReservedUniforms;
-vector<string> LLShaderMgr::sShinyUniforms;
-vector<string> LLShaderMgr::sWaterUniforms;
-vector<string> LLShaderMgr::sGlowUniforms;
-vector<string> LLShaderMgr::sGlowExtractUniforms;
-vector<string> LLShaderMgr::sAvatarAttribs;
-vector<string> LLShaderMgr::sAvatarUniforms;
-//vector< GLhandleARB > LLShaderMgr::sBaseObjects;
-
-/// Make sure WL Sky is the first program
-LLGLSLShader * const LLShaderMgr::sShaderList[] = 
-{
-	&gWLSkyProgram,
-	&gWLCloudProgram,
-	&gAvatarProgram,
-	&gObjectShinyProgram,
-	&gWaterProgram,
-	&gAvatarEyeballProgram, 
-	&gObjectSimpleProgram,
-	&gObjectFullbrightProgram,
-	&gObjectFullbrightShinyProgram,
-	&gTerrainProgram,
-	&gTerrainWaterProgram,
-	&gObjectSimpleWaterProgram,
-	&gObjectFullbrightWaterProgram,
-	&gAvatarWaterProgram,
-	&gObjectShinyWaterProgram,
-	&gUnderWaterProgram,
-};
-const size_t LLShaderMgr::sNumShaders = sizeof(sShaderList) / sizeof(sShaderList[0]);
-
-
-BOOL shouldChange(const LLVector4& v1, const LLVector4& v2)
-{
-	/*F32 dot = v1.mV[0] * v2.mV[0] +
-				v1.mV[1] * v2.mV[1] +
-				v1.mV[2] * v2.mV[2] +
-				v1.mV[3] * v2.mV[3];
-
-	F32 mag = v1.mV[0] * v1.mV[0] +
-				v1.mV[1] * v1.mV[1] +
-				v1.mV[2] * v1.mV[2] +
-				v1.mV[3] * v1.mV[3];
-
-	F32 val = (dot/mag);
-
-	if (val > 2.0f || val < 0.1f)
-	{
-		return TRUE;
-	}
-
-	return FALSE;*/
-
-	return v1 != v2;
-}
-
-LLShaderFeatures::LLShaderFeatures()
-: calculatesLighting(false), isShiny(false), isFullbright(false), hasWaterFog(false),
-hasTransport(false), hasSkinning(false), hasAtmospherics(false), isSpecular(false),
-hasGamma(false), hasLighting(false), calculatesAtmospherics(false)
-{
-}
-
-void LLShaderMgr::initAttribsAndUniforms(void)
-{
-	if (sReservedAttribs.empty())
-	{
-		sReservedAttribs.push_back("materialColor");
-		sReservedAttribs.push_back("specularColor");
-		sReservedAttribs.push_back("binormal");
-
-		sAvatarAttribs.reserve(5);
-		sAvatarAttribs.push_back("weight");
-		sAvatarAttribs.push_back("clothing");
-		sAvatarAttribs.push_back("gWindDir");
-		sAvatarAttribs.push_back("gSinWaveParams");
-		sAvatarAttribs.push_back("gGravity");
-
-		sAvatarUniforms.push_back("matrixPalette");
-
-		sReservedUniforms.reserve(24);
-		sReservedUniforms.push_back("diffuseMap");
-		sReservedUniforms.push_back("specularMap");
-		sReservedUniforms.push_back("bumpMap");
-		sReservedUniforms.push_back("environmentMap");
-		sReservedUniforms.push_back("cloude_noise_texture");
-		sReservedUniforms.push_back("fullbright");
-		sReservedUniforms.push_back("lightnorm");
-		sReservedUniforms.push_back("sunlight_color");
-		sReservedUniforms.push_back("ambient");
-		sReservedUniforms.push_back("blue_horizon");
-		sReservedUniforms.push_back("blue_density");
-		sReservedUniforms.push_back("haze_horizon");
-		sReservedUniforms.push_back("haze_density");
-		sReservedUniforms.push_back("cloud_shadow");
-		sReservedUniforms.push_back("density_multiplier");
-		sReservedUniforms.push_back("distance_multiplier");
-		sReservedUniforms.push_back("max_y");
-		sReservedUniforms.push_back("glow");
-		sReservedUniforms.push_back("cloud_color");
-		sReservedUniforms.push_back("cloud_pos_density1");
-		sReservedUniforms.push_back("cloud_pos_density2");
-		sReservedUniforms.push_back("cloud_scale");
-		sReservedUniforms.push_back("gamma");
-		sReservedUniforms.push_back("scene_light_strength");
-
-		sWLUniforms.push_back("camPosLocal");
-
-		sTerrainUniforms.reserve(5);
-		sTerrainUniforms.push_back("detail_0");
-		sTerrainUniforms.push_back("detail_1");
-		sTerrainUniforms.push_back("detail_2");
-		sTerrainUniforms.push_back("detail_3");
-		sTerrainUniforms.push_back("alpha_ramp");
-
-		sGlowUniforms.push_back("glowDelta");
-		sGlowUniforms.push_back("glowStrength");
-
-		sGlowExtractUniforms.push_back("minLuminance");
-		sGlowExtractUniforms.push_back("maxExtractAlpha");
-		sGlowExtractUniforms.push_back("lumWeights");
-		sGlowExtractUniforms.push_back("warmthWeights");
-		sGlowExtractUniforms.push_back("warmthAmount");
-
-		sShinyUniforms.push_back("origin");
-
-		sWaterUniforms.reserve(12);
-		sWaterUniforms.push_back("screenTex");
-		sWaterUniforms.push_back("screenDepth");
-		sWaterUniforms.push_back("refTex");
-		sWaterUniforms.push_back("eyeVec");
-		sWaterUniforms.push_back("time");
-		sWaterUniforms.push_back("d1");
-		sWaterUniforms.push_back("d2");
-		sWaterUniforms.push_back("lightDir");
-		sWaterUniforms.push_back("specular");
-		sWaterUniforms.push_back("lightExp");
-		sWaterUniforms.push_back("fogCol");
-		sWaterUniforms.push_back("kd");
-		sWaterUniforms.push_back("refScale");
-		sWaterUniforms.push_back("waterHeight");
-	}	
-}
-
-BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
-{
-	llassert_always(shader != NULL);
-	LLShaderFeatures *features = & shader->mFeatures;
-	
-	//////////////////////////////////////
-	// Attach Vertex Shader Features First
-	//////////////////////////////////////
-	
-	// NOTE order of shader object attaching is VERY IMPORTANT!!!
-	if (features->calculatesAtmospherics)
-	{
-		if (!shader->attachObject("windlight/atmosphericsVarsV.glsl"))
-		{
-			return FALSE;
-		}
-	}
-
-	if (features->calculatesLighting)
-	{
-		if (!shader->attachObject("windlight/atmosphericsHelpersV.glsl"))
-		{
-			return FALSE;
-		}
-		
-		if (features->isSpecular)
-		{
-			if (!shader->attachObject("lighting/lightFuncSpecularV.glsl"))
-			{
-				return FALSE;
-			}
-			
-			if (!shader->attachObject("lighting/sumLightsSpecularV.glsl"))
-			{
-				return FALSE;
-			}
-			
-			if (!shader->attachObject("lighting/lightSpecularV.glsl"))
-			{
-				return FALSE;
-			}
-		}
-		else 
-		{
-			if (!shader->attachObject("lighting/lightFuncV.glsl"))
-			{
-				return FALSE;
-			}
-			
-			if (!shader->attachObject("lighting/sumLightsV.glsl"))
-			{
-				return FALSE;
-			}
-			
-			if (!shader->attachObject("lighting/lightV.glsl"))
-			{
-				return FALSE;
-			}
-		}
-	}
-	
-	// NOTE order of shader object attaching is VERY IMPORTANT!!!
-	if (features->calculatesAtmospherics)
-	{
-		if (!shader->attachObject("windlight/atmosphericsV.glsl"))
-		{
-			return FALSE;
-		}
-	}
-
-	if (features->hasSkinning)
-	{
-		if (!shader->attachObject("avatar/avatarSkinV.glsl"))
-		{
-			return FALSE;
-		}
-	}
-	
-	///////////////////////////////////////
-	// Attach Fragment Shader Features Next
-	///////////////////////////////////////
-
-	if(features->calculatesAtmospherics)
-	{
-		if (!shader->attachObject("windlight/atmosphericsVarsF.glsl"))
-		{
-			return FALSE;
-		}
-	}
-
-	// NOTE order of shader object attaching is VERY IMPORTANT!!!
-	if (features->hasGamma)
-	{
-		if (!shader->attachObject("windlight/gammaF.glsl"))
-		{
-			return FALSE;
-		}
-	}
-	
-	if (features->hasAtmospherics)
-	{
-		if (!shader->attachObject("windlight/atmosphericsF.glsl"))
-		{
-			return FALSE;
-		}
-	}
-	
-	if (features->hasTransport)
-	{
-		if (!shader->attachObject("windlight/transportF.glsl"))
-		{
-			return FALSE;
-		}
-
-		// Test hasFullbright and hasShiny and attach fullbright and 
-		// fullbright shiny atmos transport if we split them out.
-	}
-
-	// NOTE order of shader object attaching is VERY IMPORTANT!!!
-	if (features->hasWaterFog)
-	{
-		if (!shader->attachObject("environment/waterFogF.glsl"))
-		{
-			return FALSE;
-		}
-	}
-	
-	if (features->hasLighting)
-	{
-	
-		if (features->hasWaterFog)
-		{
-			if (!shader->attachObject("lighting/lightWaterF.glsl"))
-			{
-				return FALSE;
-			}
-		}
-		
-		else
-		{
-			if (!shader->attachObject("lighting/lightF.glsl"))
-			{
-				return FALSE;
-			}
-		}		
-	}
-	
-	// NOTE order of shader object attaching is VERY IMPORTANT!!!
-	else if (features->isFullbright)
-	{
-	
-		if (features->hasWaterFog)
-		{
-			if (!shader->attachObject("lighting/lightFullbrightWaterF.glsl"))
-			{
-				return FALSE;
-			}
-		}
-		
-		else if (features->isShiny)
-		{
-			if (!shader->attachObject("lighting/lightFullbrightShinyF.glsl"))
-			{
-				return FALSE;
-			}
-		}
-		
-		else
-		{
-			if (!shader->attachObject("lighting/lightFullbrightF.glsl"))
-			{
-				return FALSE;
-			}
-		}
-	}
-
-	// NOTE order of shader object attaching is VERY IMPORTANT!!!
-	else if (features->isShiny)
-	{
-	
-		if (features->hasWaterFog)
-		{
-			if (!shader->attachObject("lighting/lightShinyWaterF.glsl"))
-			{
-				return FALSE;
-			}
-		}
-		
-		else 
-		{
-			if (!shader->attachObject("lighting/lightShinyF.glsl"))
-			{
-				return FALSE;
-			}
-		}
-	}
-	return TRUE;
-}
-
-//============================================================================
-// Set Levels
-
-S32 LLShaderMgr::getVertexShaderLevel(S32 type)
-{
-	return LLPipeline::sDisableShaders ? 0 : sVertexShaderLevel[type];
-}
-
-
-//============================================================================
-// Load Shader
-
-static LLString get_object_log(GLhandleARB ret)
-{
-	LLString res;
-	
-	//get log length 
-	GLint length;
-	glGetObjectParameterivARB(ret, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
-	if (length > 0)
-	{
-		//the log could be any size, so allocate appropriately
-		GLcharARB* log = new GLcharARB[length];
-		glGetInfoLogARB(ret, length, &length, log);
-		res = LLString((char *)log);
-		delete[] log;
-	}
-	return res;
-}
-
-void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns) 
-{
-	LLString log = get_object_log(ret);
-	if (warns)
-	{
-		LL_WARNS("ShaderLoading") << log << LL_ENDL;
-	}
-	else
-	{
-		LL_DEBUGS("ShaderLoading") << log << LL_ENDL;
-	}
-}
-
-GLhandleARB LLShaderMgr::loadShaderFile(const LLString& filename, S32 & shader_level, GLenum type)
-{
-	GLenum error;
-	error = glGetError();
-	if (error != GL_NO_ERROR)
-	{
-		LL_WARNS("ShaderLoading") << "GL ERROR entering loadShaderFile(): " << error << LL_ENDL;
-	}
-	
-	LL_DEBUGS("ShaderLoading") << "Loading shader file: " << filename << " class " << shader_level << LL_ENDL;
-
-	if (filename.empty()) 
-	{
-		return 0;
-	}
-
-
-	//read in from file
-	LLFILE* file = NULL;
-
-	S32 try_gpu_class = shader_level;
-	S32 gpu_class;
-
-	//find the most relevant file
-	for (gpu_class = try_gpu_class; gpu_class > 0; gpu_class--)
-	{	//search from the current gpu class down to class 1 to find the most relevant shader
-		std::stringstream fname;
-		fname << gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "shaders/class");
-		fname << gpu_class << "/" << filename;
-		
- 		LL_DEBUGS("ShaderLoading") << "Looking in " << fname.str().c_str() << LL_ENDL;
-		file = LLFile::fopen(fname.str().c_str(), "r");		/* Flawfinder: ignore */
-		if (file)
-		{
-			LL_INFOS("ShaderLoading") << "Loading file: shaders/class" << gpu_class << "/" << filename << " (Want class " << gpu_class << ")" << LL_ENDL;
-			break; // done
-		}
-	}
-	
-	if (file == NULL)
-	{
-		LL_WARNS("ShaderLoading") << "GLSL Shader file not found: " << filename << LL_ENDL;
-		return 0;
-	}
-
-	//we can't have any lines longer than 1024 characters 
-	//or any shaders longer than 1024 lines... deal - DaveP
-	GLcharARB buff[1024];
-	GLcharARB* text[1024];
-	GLuint count = 0;
-
-
-	//copy file into memory
-	while(fgets((char *)buff, 1024, file) != NULL && count < (sizeof(buff)/sizeof(buff[0]))) 
-	{
-		text[count++] = (GLcharARB *)strdup((char *)buff); 
-	}
-	fclose(file);
-
-	//create shader object
-	GLhandleARB ret = glCreateShaderObjectARB(type);
-	error = glGetError();
-	if (error != GL_NO_ERROR)
-	{
-		LL_WARNS("ShaderLoading") << "GL ERROR in glCreateShaderObjectARB: " << error << LL_ENDL;
-	}
-	else
-	{
-		//load source
-		glShaderSourceARB(ret, count, (const GLcharARB**) text, NULL);
-		error = glGetError();
-		if (error != GL_NO_ERROR)
-		{
-			LL_WARNS("ShaderLoading") << "GL ERROR in glShaderSourceARB: " << error << LL_ENDL;
-		}
-		else
-		{
-			//compile source
-			glCompileShaderARB(ret);
-			error = glGetError();
-			if (error != GL_NO_ERROR)
-			{
-				LL_WARNS("ShaderLoading") << "GL ERROR in glCompileShaderARB: " << error << LL_ENDL;
-			}
-		}
-	}
-	//free memory
-	for (GLuint i = 0; i < count; i++)
-	{
-		free(text[i]);
-	}
-	if (error == GL_NO_ERROR)
-	{
-		//check for errors
-		GLint success = GL_TRUE;
-		glGetObjectParameterivARB(ret, GL_OBJECT_COMPILE_STATUS_ARB, &success);
-		error = glGetError();
-		if (error != GL_NO_ERROR || success == GL_FALSE) 
-		{
-			//an error occured, print log
-			LL_WARNS("ShaderLoading") << "GLSL Compilation Error: (" << error << ") in " << filename << LL_ENDL;
-			dumpObjectLog(ret);
-			ret = 0;
-		}
-	}
-	else
-	{
-		ret = 0;
-	}
-	stop_glerror();
-
-	//successfully loaded, save results
-	if (ret)
-	{
-		// Add shader file to map
-		sShaderObjects[filename] = ret;
-		shader_level = try_gpu_class;
-	}
-	else
-	{
-		if (shader_level > 1)
-		{
-			shader_level--;
-			return loadShaderFile(filename,shader_level,type);
-		}
-		LL_WARNS("ShaderLoading") << "Failed to load " << filename << LL_ENDL;	
-	}
-	return ret;
-}
-
-BOOL LLShaderMgr::linkProgramObject(GLhandleARB obj, BOOL suppress_errors) 
-{
-	//check for errors
-	glLinkProgramARB(obj);
-	GLint success = GL_TRUE;
-	glGetObjectParameterivARB(obj, GL_OBJECT_LINK_STATUS_ARB, &success);
-	if (!suppress_errors && success == GL_FALSE) 
-	{
-		//an error occured, print log
-		LL_WARNS("ShaderLoading") << "GLSL Linker Error:" << LL_ENDL;
-	}
-
-// NOTE: Removing LL_DARWIN block as it doesn't seem to actually give the correct answer, 
-// but want it for reference once I move it.
-#if 0
-	// Force an evaluation of the gl state so the driver can tell if the shader will run in hardware or software
-	// per Apple's suggestion   
-	glBegin(gGL.mMode);
-	glEnd();
-
-	// Query whether the shader can or cannot run in hardware
-	// http://developer.apple.com/qa/qa2007/qa1502.html
-	long vertexGPUProcessing;
-	CGLContextObj ctx = CGLGetCurrentContext();
-	CGLGetParameter (ctx, kCGLCPGPUVertexProcessing, &vertexGPUProcessing);	
-	long fragmentGPUProcessing;
-	CGLGetParameter (ctx, kCGLCPGPUFragmentProcessing, &fragmentGPUProcessing);
-	if (!fragmentGPUProcessing || !vertexGPUProcessing)
-	{
-		LL_WARNS("ShaderLoading") << "GLSL Linker: Running in Software:" << LL_ENDL;
-		success = GL_FALSE;
-		suppress_errors = FALSE;		
-	}
-	
-#else
-	LLString log = get_object_log(obj);
-	LLString::toLower(log);
-	if (log.find("software") != LLString::npos)
-	{
-		LL_WARNS("ShaderLoading") << "GLSL Linker: Running in Software:" << LL_ENDL;
-		success = GL_FALSE;
-		suppress_errors = FALSE;
-	}
-#endif
-	if (!suppress_errors)
-	{
-        dumpObjectLog(obj, !success);
-	}
-
-	return success;
-}
-
-BOOL LLShaderMgr::validateProgramObject(GLhandleARB obj)
-{
-	//check program validity against current GL
-	glValidateProgramARB(obj);
-	GLint success = GL_TRUE;
-	glGetObjectParameterivARB(obj, GL_OBJECT_VALIDATE_STATUS_ARB, &success);
-	if (success == GL_FALSE)
-	{
-		LL_WARNS("ShaderLoading") << "GLSL program not valid: " << LL_ENDL;
-		dumpObjectLog(obj);
-	}
-	else
-	{
-		dumpObjectLog(obj, FALSE);
-	}
-
-	return success;
-}
-
-//============================================================================
-// Shader Management
-
-void LLShaderMgr::setShaders()
-{
-	if (!gPipeline.mInitialized)
-	{
-		return;
-	}
-	// Make sure the compiled shader map is cleared before we recompile shaders.
-	sShaderObjects.clear();
-	
-	initAttribsAndUniforms();
-	gPipeline.releaseGLBuffers();
-
-	if (gSavedSettings.getBOOL("VertexShaderEnable"))
-	{
-		LLPipeline::sWaterReflections = gGLManager.mHasCubeMap;
-		LLPipeline::sRenderGlow = gSavedSettings.getBOOL("RenderGlow"); 
-	}
-	else
-	{
-			LLPipeline::sRenderGlow = 
-			LLPipeline::sWaterReflections = FALSE;
-	}
-	
-	//hack to reset buffers that change behavior with shaders
-	gPipeline.resetVertexBuffers();
-
-	if (gViewerWindow)
-	{
-		gViewerWindow->setCursor(UI_CURSOR_WAIT);
-	}
-
-	// Lighting
-	gPipeline.setLightingDetail(-1);
-
-	// Shaders
-	LL_INFOS("ShaderLoading") << "\n~~~~~~~~~~~~~~~~~~\n Loading Shaders:\n~~~~~~~~~~~~~~~~~~" << LL_ENDL;
-	for (S32 i = 0; i < SHADER_COUNT; i++)
-	{
-		sVertexShaderLevel[i] = 0;
-	}
-	sMaxAvatarShaderLevel = 0;
-
-	if (LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") 
-		&& gSavedSettings.getBOOL("VertexShaderEnable"))
-	{
-		S32 light_class = 2;
-		S32 env_class = 2;
-		S32 obj_class = 2;
-		S32 effect_class = 2;
-		S32 wl_class = 2;
-		S32 water_class = 2;
-		S32 deferred_class = 0;
-		if (!gSavedSettings.getBOOL("WindLightUseAtmosShaders"))
-		{
-			// user has disabled WindLight in their settings, downgrade
-			// windlight shaders to stub versions.
-			wl_class = 1;
-
-			// if class one or less, turn off more shaders
-			// since higher end cards won't see any real gain
-			// from turning off most of the shaders,
-			// but class one would
-			// TODO: Make water on class one cards color things
-			// beneath it properly
-			if(LLFeatureManager::getInstance()->getGPUClass() < GPU_CLASS_2)
-			{
-				// use lesser water and other stuff
-				light_class = 2;
-				env_class = 0;
-				obj_class = 0;
-				effect_class = 1;
-				water_class = 1;
-			}
-		}
-
-		if (gSavedSettings.getBOOL("RenderDeferred"))
-		{
-			light_class = 1;
-			env_class = 0;
-			obj_class = 0;
-			water_class = 1;
-			effect_class = 1;
-			deferred_class = 1;
-		}
-
-		if(!gSavedSettings.getBOOL("EnableRippleWater"))
-		{
-			water_class = 0;
-		}
-
-		// Trigger a full rebuild of the fallback skybox / cubemap if we've toggled windlight shaders
-		if (sVertexShaderLevel[SHADER_WINDLIGHT] != wl_class && gSky.mVOSkyp.notNull())
-		{
-			gSky.mVOSkyp->forceSkyUpdate();
-		}
-
-		// Load lighting shaders
-		sVertexShaderLevel[SHADER_LIGHTING] = light_class;
-		sVertexShaderLevel[SHADER_INTERFACE] = light_class;
-		sVertexShaderLevel[SHADER_ENVIRONMENT] = env_class;
-		sVertexShaderLevel[SHADER_WATER] = water_class;
-		sVertexShaderLevel[SHADER_OBJECT] = obj_class;
-		sVertexShaderLevel[SHADER_EFFECT] = effect_class;
-		sVertexShaderLevel[SHADER_WINDLIGHT] = wl_class;
-		sVertexShaderLevel[SHADER_DEFERRED] = deferred_class;
-
-		BOOL loaded = loadBasicShaders();
-
-		if (loaded)
-		{
-			gPipeline.mVertexShadersEnabled = TRUE;
-			gPipeline.mVertexShadersLoaded = 1;
-
-			// Load all shaders to set max levels
-			loadShadersEnvironment();
-			loadShadersWater();
-			loadShadersObject();
-			loadShadersWindLight();
-			loadShadersEffects();
-			loadShadersInterface();
-			loadShadersDeferred();
-
-			// Load max avatar shaders to set the max level
-			sVertexShaderLevel[SHADER_AVATAR] = 3;
-			sMaxAvatarShaderLevel = 3;
-			loadShadersAvatar();
-			
-#if 0 && LL_DARWIN // force avatar shaders off for mac
-			sVertexShaderLevel[SHADER_AVATAR] = 0;
-			sMaxAvatarShaderLevel = 0;
-#else
-			if (gSavedSettings.getBOOL("RenderAvatarVP"))
-			{
-				BOOL avatar_cloth = gSavedSettings.getBOOL("RenderAvatarCloth");
-				S32 avatar_class = 1;
-				
-				// cloth is a class3 shader
-				if(avatar_cloth)
-				{
-					avatar_class = 3;
-				}
-
-				// Set the actual level
-				sVertexShaderLevel[SHADER_AVATAR] = avatar_class;
-				loadShadersAvatar();
-				if (sVertexShaderLevel[SHADER_AVATAR] != avatar_class)
-				{
-					if (sVertexShaderLevel[SHADER_AVATAR] == 0)
-					{
-						gSavedSettings.setBOOL("RenderAvatarVP", FALSE);
-					}
-					if(llmax(sVertexShaderLevel[SHADER_AVATAR]-1,0) >= 3)
-					{
-						avatar_cloth = true;
-					}
-					else
-					{
-						avatar_cloth = false;
-					}
-					gSavedSettings.setBOOL("RenderAvatarCloth", avatar_cloth);
-				}
-			}
-			else
-			{
-				sVertexShaderLevel[SHADER_AVATAR] = 0;
-				gSavedSettings.setBOOL("RenderAvatarCloth", FALSE);
-				loadShadersAvatar(); // unloads
-			}
-#endif
-		}
-		else
-		{
-			gPipeline.mVertexShadersEnabled = FALSE;
-			gPipeline.mVertexShadersLoaded = 0;
-			sVertexShaderLevel[SHADER_LIGHTING] = 0;
-			sVertexShaderLevel[SHADER_INTERFACE] = 0;
-			sVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
-			sVertexShaderLevel[SHADER_WATER] = 0;
-			sVertexShaderLevel[SHADER_OBJECT] = 0;
-			sVertexShaderLevel[SHADER_EFFECT] = 0;
-			sVertexShaderLevel[SHADER_WINDLIGHT] = 0;
-		}
-	}
-	else
-	{
-		gPipeline.mVertexShadersEnabled = FALSE;
-		gPipeline.mVertexShadersLoaded = 0;
-		sVertexShaderLevel[SHADER_LIGHTING] = 0;
-		sVertexShaderLevel[SHADER_INTERFACE] = 0;
-		sVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
-		sVertexShaderLevel[SHADER_WATER] = 0;
-		sVertexShaderLevel[SHADER_OBJECT] = 0;
-		sVertexShaderLevel[SHADER_EFFECT] = 0;
-		sVertexShaderLevel[SHADER_WINDLIGHT] = 0;
-	}
-	
-	if (gViewerWindow)
-	{
-		gViewerWindow->setCursor(UI_CURSOR_ARROW);
-	}
-	gPipeline.createGLBuffers();
-}
-
-void LLShaderMgr::unloadShaders()
-{
-	gObjectSimpleProgram.unload();
-	gObjectSimpleWaterProgram.unload();
-	gObjectFullbrightProgram.unload();
-	gObjectFullbrightWaterProgram.unload();
-
-	gObjectShinyProgram.unload();
-	gObjectFullbrightShinyProgram.unload();
-	gObjectShinyWaterProgram.unload();
-	gWaterProgram.unload();
-	gUnderWaterProgram.unload();
-	gTerrainProgram.unload();
-	gTerrainWaterProgram.unload();
-	gGlowProgram.unload();
-	gGlowExtractProgram.unload();
-	gAvatarProgram.unload();
-	gAvatarWaterProgram.unload();
-	gAvatarEyeballProgram.unload();
-	gAvatarPickProgram.unload();
-	gHighlightProgram.unload();
-
-	gWLSkyProgram.unload();
-	gWLCloudProgram.unload();
-
-	gPostColorFilterProgram.unload();
-	gPostNightVisionProgram.unload();
-
-	gDeferredDiffuseProgram.unload();
-
-	sVertexShaderLevel[SHADER_LIGHTING] = 0;
-	sVertexShaderLevel[SHADER_OBJECT] = 0;
-	sVertexShaderLevel[SHADER_AVATAR] = 0;
-	sVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
-	sVertexShaderLevel[SHADER_WATER] = 0;
-	sVertexShaderLevel[SHADER_INTERFACE] = 0;
-
-	gPipeline.mVertexShadersLoaded = 0;
-}
-
-BOOL LLShaderMgr::loadBasicShaders()
-{
-	// Load basic dependency shaders first
-	// All of these have to load for any shaders to function
-	
-#if LL_DARWIN // Mac can't currently handle all 8 lights, 
-	S32 sum_lights_class = 2;
-#else 
-	S32 sum_lights_class = 3;
-
-	// class one cards will get the lower sum lights
-	// class zero we're not going to think about
-	// since a class zero card COULD be a ridiculous new card
-	// and old cards should have the features masked
-	if(LLFeatureManager::getInstance()->getGPUClass() == GPU_CLASS_1)
-	{
-		sum_lights_class = 2;
-	}
-#endif
-
-	// If we have sun and moon only checked, then only sum those lights.
-	if (gPipeline.getLightingDetail() == 0)
-	{
-		sum_lights_class = 1;
-	}
-
-	// Load the Basic Vertex Shaders at the appropriate level. 
-	// (in order of shader function call depth for reference purposes, deepest level first)
-
-	vector< pair<string, S32> > shaders;
-	shaders.reserve(10);
-	shaders.push_back( make_pair( "windlight/atmosphericsVarsV.glsl",		sVertexShaderLevel[SHADER_WINDLIGHT] ) );
-	shaders.push_back( make_pair( "windlight/atmosphericsHelpersV.glsl",	sVertexShaderLevel[SHADER_WINDLIGHT] ) );
-	shaders.push_back( make_pair( "lighting/lightFuncV.glsl",				sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/sumLightsV.glsl",				sum_lights_class ) );
-	shaders.push_back( make_pair( "lighting/lightV.glsl",					sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/lightFuncSpecularV.glsl",		sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/sumLightsSpecularV.glsl",		sum_lights_class ) );
-	shaders.push_back( make_pair( "lighting/lightSpecularV.glsl",			sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "windlight/atmosphericsV.glsl",			sVertexShaderLevel[SHADER_WINDLIGHT] ) );
-	shaders.push_back( make_pair( "avatar/avatarSkinV.glsl",				1 ) );
-
-	// We no longer have to bind the shaders to global glhandles, they are automatically added to a map now.
-	for (U32 i = 0; i < shaders.size(); i++)
-	{
-		// Note usage of GL_VERTEX_SHADER_ARB
-		if (loadShaderFile(shaders[i].first, shaders[i].second, GL_VERTEX_SHADER_ARB) == 0)
-		{
-			return FALSE;
-		}
-	}
-
-	// Load the Basic Fragment Shaders at the appropriate level. 
-	// (in order of shader function call depth for reference purposes, deepest level first)
-
-	shaders.clear();
-	shaders.reserve(12);
-	shaders.push_back( make_pair( "windlight/atmosphericsVarsF.glsl",		sVertexShaderLevel[SHADER_WINDLIGHT] ) );
-	shaders.push_back( make_pair( "windlight/gammaF.glsl",					sVertexShaderLevel[SHADER_WINDLIGHT]) );
-	shaders.push_back( make_pair( "windlight/atmosphericsF.glsl",			sVertexShaderLevel[SHADER_WINDLIGHT] ) );
-	shaders.push_back( make_pair( "windlight/transportF.glsl",				sVertexShaderLevel[SHADER_WINDLIGHT] ) );	
-	shaders.push_back( make_pair( "environment/waterFogF.glsl",				sVertexShaderLevel[SHADER_WATER] ) );
-	shaders.push_back( make_pair( "lighting/lightF.glsl",					sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/lightFullbrightF.glsl",			sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/lightWaterF.glsl",				sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/lightFullbrightWaterF.glsl",	sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/lightShinyF.glsl",				sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/lightFullbrightShinyF.glsl",	sVertexShaderLevel[SHADER_LIGHTING] ) );
-	shaders.push_back( make_pair( "lighting/lightShinyWaterF.glsl",			sVertexShaderLevel[SHADER_LIGHTING] ) );
-	
-	for (U32 i = 0; i < shaders.size(); i++)
-	{
-		// Note usage of GL_FRAGMENT_SHADER_ARB
-		if (loadShaderFile(shaders[i].first, shaders[i].second, GL_FRAGMENT_SHADER_ARB) == 0)
-		{
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-BOOL LLShaderMgr::loadShadersEnvironment()
-{
-	BOOL success = TRUE;
-
-	if (sVertexShaderLevel[SHADER_ENVIRONMENT] == 0)
-	{
-		gTerrainProgram.unload();
-		return FALSE;
-	}
-
-	if (success)
-	{
-		gTerrainProgram.mName = "Terrain Shader";
-		gTerrainProgram.mFeatures.calculatesLighting = true;
-		gTerrainProgram.mFeatures.calculatesAtmospherics = true;
-		gTerrainProgram.mFeatures.hasAtmospherics = true;
-		gTerrainProgram.mFeatures.hasGamma = true;
-		gTerrainProgram.mShaderFiles.clear();
-		gTerrainProgram.mShaderFiles.push_back(make_pair("environment/terrainV.glsl", GL_VERTEX_SHADER_ARB));
-		gTerrainProgram.mShaderFiles.push_back(make_pair("environment/terrainF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gTerrainProgram.mShaderLevel = sVertexShaderLevel[SHADER_ENVIRONMENT];
-		success = gTerrainProgram.createShader(NULL, &sTerrainUniforms);
-	}
-
-	if (!success)
-	{
-		sVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
-		return FALSE;
-	}
-	
-	LLWorld::getInstance()->updateWaterObjects();
-	
-	return TRUE;
-}
-
-BOOL LLShaderMgr::loadShadersWater()
-{
-	BOOL success = TRUE;
-	BOOL terrainWaterSuccess = TRUE;
-
-	if (sVertexShaderLevel[SHADER_WATER] == 0)
-	{
-		gWaterProgram.unload();
-		gUnderWaterProgram.unload();
-		gTerrainWaterProgram.unload();
-		return FALSE;
-	}
-
-	if (success)
-	{
-		// load water shader
-		gWaterProgram.mName = "Water Shader";
-		gWaterProgram.mFeatures.calculatesAtmospherics = true;
-		gWaterProgram.mFeatures.hasGamma = true;
-		gWaterProgram.mFeatures.hasTransport = true;
-		gWaterProgram.mShaderFiles.clear();
-		gWaterProgram.mShaderFiles.push_back(make_pair("environment/waterV.glsl", GL_VERTEX_SHADER_ARB));
-		gWaterProgram.mShaderFiles.push_back(make_pair("environment/waterF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gWaterProgram.mShaderLevel = sVertexShaderLevel[SHADER_WATER];
-		success = gWaterProgram.createShader(NULL, &sWaterUniforms);
-	}
-
-	if (success)
-	{
-		//load under water vertex shader
-		gUnderWaterProgram.mName = "Underwater Shader";
-		gUnderWaterProgram.mFeatures.calculatesAtmospherics = true;
-		gUnderWaterProgram.mShaderFiles.clear();
-		gUnderWaterProgram.mShaderFiles.push_back(make_pair("environment/waterV.glsl", GL_VERTEX_SHADER_ARB));
-		gUnderWaterProgram.mShaderFiles.push_back(make_pair("environment/underWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gUnderWaterProgram.mShaderLevel = sVertexShaderLevel[SHADER_WATER];
-		gUnderWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
-		
-		success = gUnderWaterProgram.createShader(NULL, &sWaterUniforms);
-	}
-
-	if (success)
-	{
-		//load terrain water shader
-		gTerrainWaterProgram.mName = "Terrain Water Shader";
-		gTerrainWaterProgram.mFeatures.calculatesLighting = true;
-		gTerrainWaterProgram.mFeatures.calculatesAtmospherics = true;
-		gTerrainWaterProgram.mFeatures.hasAtmospherics = true;
-		gTerrainWaterProgram.mFeatures.hasWaterFog = true;
-		gTerrainWaterProgram.mShaderFiles.clear();
-		gTerrainWaterProgram.mShaderFiles.push_back(make_pair("environment/terrainV.glsl", GL_VERTEX_SHADER_ARB));
-		gTerrainWaterProgram.mShaderFiles.push_back(make_pair("environment/terrainWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gTerrainWaterProgram.mShaderLevel = sVertexShaderLevel[SHADER_ENVIRONMENT];
-		gTerrainWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
-		terrainWaterSuccess = gTerrainWaterProgram.createShader(NULL, &sTerrainUniforms);
-	}	
-
-	/// Keep track of water shader levels
-	if (gWaterProgram.mShaderLevel != sVertexShaderLevel[SHADER_WATER]
-		|| gUnderWaterProgram.mShaderLevel != sVertexShaderLevel[SHADER_WATER])
-	{
-		sVertexShaderLevel[SHADER_WATER] = llmin(gWaterProgram.mShaderLevel, gUnderWaterProgram.mShaderLevel);
-	}
-
-	if (!success)
-	{
-		sVertexShaderLevel[SHADER_WATER] = 0;
-		return FALSE;
-	}
-
-	// if we failed to load the terrain water shaders and we need them (using class2 water),
-	// then drop down to class1 water.
-	if (sVertexShaderLevel[SHADER_WATER] > 1 && !terrainWaterSuccess)
-	{
-		sVertexShaderLevel[SHADER_WATER]--;
-		return loadShadersWater();
-	}
-	
-	LLWorld::getInstance()->updateWaterObjects();
-
-	return TRUE;
-}
-
-BOOL LLShaderMgr::loadShadersEffects()
-{
-	BOOL success = TRUE;
-
-	if (sVertexShaderLevel[SHADER_EFFECT] == 0)
-	{
-		gGlowProgram.unload();
-		gGlowExtractProgram.unload();
-		gPostColorFilterProgram.unload();	
-		gPostNightVisionProgram.unload();
-		return FALSE;
-	}
-
-	if (success)
-	{
-		gGlowProgram.mName = "Glow Shader (Post)";
-		gGlowProgram.mShaderFiles.clear();
-		gGlowProgram.mShaderFiles.push_back(make_pair("effects/glowV.glsl", GL_VERTEX_SHADER_ARB));
-		gGlowProgram.mShaderFiles.push_back(make_pair("effects/glowF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gGlowProgram.mShaderLevel = sVertexShaderLevel[SHADER_EFFECT];
-		success = gGlowProgram.createShader(NULL, &sGlowUniforms);
-		if (!success)
-		{
-			LLPipeline::sRenderGlow = FALSE;
-		}
-	}
-	
-	if (success)
-	{
-		gGlowExtractProgram.mName = "Glow Extract Shader (Post)";
-		gGlowExtractProgram.mShaderFiles.clear();
-		gGlowExtractProgram.mShaderFiles.push_back(make_pair("effects/glowExtractV.glsl", GL_VERTEX_SHADER_ARB));
-		gGlowExtractProgram.mShaderFiles.push_back(make_pair("effects/glowExtractF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gGlowExtractProgram.mShaderLevel = sVertexShaderLevel[SHADER_EFFECT];
-		success = gGlowExtractProgram.createShader(NULL, &sGlowExtractUniforms);
-		if (!success)
-		{
-			LLPipeline::sRenderGlow = FALSE;
-		}
-	}
-	
-#if 0
-	// disabling loading of postprocess shaders until we fix
-	// ATI sampler2DRect compatibility.
-	
-	//load Color Filter Shader
-	if (success)
-	{
-		vector<string> shaderUniforms;
-		shaderUniforms.reserve(7);
-		shaderUniforms.push_back("RenderTexture");
-		shaderUniforms.push_back("gamma");
-		shaderUniforms.push_back("brightness");
-		shaderUniforms.push_back("contrast");
-		shaderUniforms.push_back("contrastBase");
-		shaderUniforms.push_back("saturation");
-		shaderUniforms.push_back("lumWeights");
-
-		gPostColorFilterProgram.mName = "Color Filter Shader (Post)";
-		gPostColorFilterProgram.mShaderFiles.clear();
-		gPostColorFilterProgram.mShaderFiles.push_back(make_pair("effects/colorFilterF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gPostColorFilterProgram.mShaderFiles.push_back(make_pair("effects/drawQuadV.glsl", GL_VERTEX_SHADER_ARB));
-		gPostColorFilterProgram.mShaderLevel = sVertexShaderLevel[SHADER_EFFECT];
-		success = gPostColorFilterProgram.createShader(NULL, &shaderUniforms);
-	}
-
-	//load Night Vision Shader
-	if (success)
-	{
-		vector<string> shaderUniforms;
-		shaderUniforms.reserve(5);
-		shaderUniforms.push_back("RenderTexture");
-		shaderUniforms.push_back("NoiseTexture");
-		shaderUniforms.push_back("brightMult");
-		shaderUniforms.push_back("noiseStrength");
-		shaderUniforms.push_back("lumWeights");
-
-		gPostNightVisionProgram.mName = "Night Vision Shader (Post)";
-		gPostNightVisionProgram.mShaderFiles.clear();
-		gPostNightVisionProgram.mShaderFiles.push_back(make_pair("effects/nightVisionF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gPostNightVisionProgram.mShaderFiles.push_back(make_pair("effects/drawQuadV.glsl", GL_VERTEX_SHADER_ARB));
-		gPostNightVisionProgram.mShaderLevel = sVertexShaderLevel[SHADER_EFFECT];
-		success = gPostNightVisionProgram.createShader(NULL, &shaderUniforms);
-	}
-	#endif
-
-	return success;
-
-}
-
-BOOL LLShaderMgr::loadShadersDeferred()
-{
-	if (sVertexShaderLevel[SHADER_DEFERRED] == 0)
-	{
-		gDeferredDiffuseProgram.unload();
-		return FALSE;
-	}
-
-	BOOL success = TRUE;
-
-	if (success)
-	{
-		gDeferredDiffuseProgram.mName = "Deffered Diffuse Shader";
-		gDeferredDiffuseProgram.mShaderFiles.clear();
-		gDeferredDiffuseProgram.mShaderFiles.push_back(make_pair("deferred/diffuseV.glsl", GL_VERTEX_SHADER_ARB));
-		gDeferredDiffuseProgram.mShaderFiles.push_back(make_pair("deferred/diffuseF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gDeferredDiffuseProgram.mShaderLevel = sVertexShaderLevel[SHADER_DEFERRED];
-		success = gDeferredDiffuseProgram.createShader(NULL, NULL);
-	}
-
-	return success;
-}
-
-BOOL LLShaderMgr::loadShadersObject()
-{
-	BOOL success = TRUE;
-
-	if (sVertexShaderLevel[SHADER_OBJECT] == 0)
-	{
-		gObjectShinyProgram.unload();
-		gObjectFullbrightShinyProgram.unload();
-		gObjectShinyWaterProgram.unload();
-		gObjectSimpleProgram.unload();
-		gObjectSimpleWaterProgram.unload();
-		gObjectFullbrightProgram.unload();
-		gObjectFullbrightWaterProgram.unload();
-		return FALSE;
-	}
-
-	if (success)
-	{
-		gObjectSimpleProgram.mName = "Simple Shader";
-		gObjectSimpleProgram.mFeatures.calculatesLighting = true;
-		gObjectSimpleProgram.mFeatures.calculatesAtmospherics = true;
-		gObjectSimpleProgram.mFeatures.hasGamma = true;
-		gObjectSimpleProgram.mFeatures.hasAtmospherics = true;
-		gObjectSimpleProgram.mFeatures.hasLighting = true;
-		gObjectSimpleProgram.mShaderFiles.clear();
-		gObjectSimpleProgram.mShaderFiles.push_back(make_pair("objects/simpleV.glsl", GL_VERTEX_SHADER_ARB));
-		gObjectSimpleProgram.mShaderFiles.push_back(make_pair("objects/simpleF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gObjectSimpleProgram.mShaderLevel = sVertexShaderLevel[SHADER_OBJECT];
-		success = gObjectSimpleProgram.createShader(NULL, NULL);
-	}
-	
-	if (success)
-	{
-		gObjectSimpleWaterProgram.mName = "Simple Water Shader";
-		gObjectSimpleWaterProgram.mFeatures.calculatesLighting = true;
-		gObjectSimpleWaterProgram.mFeatures.calculatesAtmospherics = true;
-		gObjectSimpleWaterProgram.mFeatures.hasWaterFog = true;
-		gObjectSimpleWaterProgram.mFeatures.hasAtmospherics = true;
-		gObjectSimpleWaterProgram.mFeatures.hasLighting = true;
-		gObjectSimpleWaterProgram.mShaderFiles.clear();
-		gObjectSimpleWaterProgram.mShaderFiles.push_back(make_pair("objects/simpleV.glsl", GL_VERTEX_SHADER_ARB));
-		gObjectSimpleWaterProgram.mShaderFiles.push_back(make_pair("objects/simpleWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gObjectSimpleWaterProgram.mShaderLevel = sVertexShaderLevel[SHADER_OBJECT];
-		gObjectSimpleWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
-		success = gObjectSimpleWaterProgram.createShader(NULL, NULL);
-	}
-	
-	if (success)
-	{
-		gObjectFullbrightProgram.mName = "Fullbright Shader";
-		gObjectFullbrightProgram.mFeatures.calculatesAtmospherics = true;
-		gObjectFullbrightProgram.mFeatures.hasGamma = true;
-		gObjectFullbrightProgram.mFeatures.hasTransport = true;
-		gObjectFullbrightProgram.mFeatures.isFullbright = true;
-		gObjectFullbrightProgram.mShaderFiles.clear();
-		gObjectFullbrightProgram.mShaderFiles.push_back(make_pair("objects/fullbrightV.glsl", GL_VERTEX_SHADER_ARB));
-		gObjectFullbrightProgram.mShaderFiles.push_back(make_pair("objects/fullbrightF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gObjectFullbrightProgram.mShaderLevel = sVertexShaderLevel[SHADER_OBJECT];
-		success = gObjectFullbrightProgram.createShader(NULL, NULL);
-	}
-
-	if (success)
-	{
-		gObjectFullbrightWaterProgram.mName = "Fullbright Water Shader";
-		gObjectFullbrightWaterProgram.mFeatures.calculatesAtmospherics = true;
-		gObjectFullbrightWaterProgram.mFeatures.isFullbright = true;
-		gObjectFullbrightWaterProgram.mFeatures.hasWaterFog = true;		
-		gObjectFullbrightWaterProgram.mFeatures.hasTransport = true;
-		gObjectFullbrightWaterProgram.mShaderFiles.clear();
-		gObjectFullbrightWaterProgram.mShaderFiles.push_back(make_pair("objects/fullbrightV.glsl", GL_VERTEX_SHADER_ARB));
-		gObjectFullbrightWaterProgram.mShaderFiles.push_back(make_pair("objects/fullbrightWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gObjectFullbrightWaterProgram.mShaderLevel = sVertexShaderLevel[SHADER_OBJECT];
-		gObjectFullbrightWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
-		success = gObjectFullbrightWaterProgram.createShader(NULL, NULL);
-	}
-
-	if (success)
-	{
-		gObjectShinyProgram.mName = "Shiny Shader";
-		gObjectShinyProgram.mFeatures.calculatesAtmospherics = true;
-		gObjectShinyProgram.mFeatures.calculatesLighting = true;
-		gObjectShinyProgram.mFeatures.hasGamma = true;
-		gObjectShinyProgram.mFeatures.hasAtmospherics = true;
-		gObjectShinyProgram.mFeatures.isShiny = true;
-		gObjectShinyProgram.mShaderFiles.clear();
-		gObjectShinyProgram.mShaderFiles.push_back(make_pair("objects/shinyV.glsl", GL_VERTEX_SHADER_ARB));
-		gObjectShinyProgram.mShaderFiles.push_back(make_pair("objects/shinyF.glsl", GL_FRAGMENT_SHADER_ARB));		
-		gObjectShinyProgram.mShaderLevel = sVertexShaderLevel[SHADER_OBJECT];
-		success = gObjectShinyProgram.createShader(NULL, &sShinyUniforms);
-	}
-
-	if (success)
-	{
-		gObjectShinyWaterProgram.mName = "Shiny Water Shader";
-		gObjectShinyWaterProgram.mFeatures.calculatesAtmospherics = true;
-		gObjectShinyWaterProgram.mFeatures.calculatesLighting = true;
-		gObjectShinyWaterProgram.mFeatures.isShiny = true;
-		gObjectShinyWaterProgram.mFeatures.hasWaterFog = true;
-		gObjectShinyWaterProgram.mFeatures.hasAtmospherics = true;
-		gObjectShinyWaterProgram.mShaderFiles.clear();
-		gObjectShinyWaterProgram.mShaderFiles.push_back(make_pair("objects/shinyWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gObjectShinyWaterProgram.mShaderFiles.push_back(make_pair("objects/shinyV.glsl", GL_VERTEX_SHADER_ARB));
-		gObjectShinyWaterProgram.mShaderLevel = sVertexShaderLevel[SHADER_OBJECT];
-		gObjectShinyWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
-		success = gObjectShinyWaterProgram.createShader(NULL, &sShinyUniforms);
-	}
-	
-	if (success)
-	{
-		gObjectFullbrightShinyProgram.mName = "Fullbright Shiny Shader";
-		gObjectFullbrightShinyProgram.mFeatures.calculatesAtmospherics = true;
-		gObjectFullbrightShinyProgram.mFeatures.isFullbright = true;
-		gObjectFullbrightShinyProgram.mFeatures.isShiny = true;
-		gObjectFullbrightShinyProgram.mFeatures.hasGamma = true;
-		gObjectFullbrightShinyProgram.mFeatures.hasTransport = true;
-		gObjectFullbrightShinyProgram.mShaderFiles.clear();
-		gObjectFullbrightShinyProgram.mShaderFiles.push_back(make_pair("objects/fullbrightShinyV.glsl", GL_VERTEX_SHADER_ARB));
-		gObjectFullbrightShinyProgram.mShaderFiles.push_back(make_pair("objects/fullbrightShinyF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gObjectFullbrightShinyProgram.mShaderLevel = sVertexShaderLevel[SHADER_OBJECT];
-		success = gObjectFullbrightShinyProgram.createShader(NULL, &sShinyUniforms);
-	}
-
-
-	if( !success )
-	{
-		sVertexShaderLevel[SHADER_OBJECT] = 0;
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-BOOL LLShaderMgr::loadShadersAvatar()
-{
-	BOOL success = TRUE;
-
-	if (sVertexShaderLevel[SHADER_AVATAR] == 0)
-	{
-		gAvatarProgram.unload();
-		gAvatarWaterProgram.unload();
-		gAvatarEyeballProgram.unload();
-		gAvatarPickProgram.unload();
-		return FALSE;
-	}
-
-	if (success)
-	{
-		gAvatarProgram.mName = "Avatar Shader";
-		gAvatarProgram.mFeatures.hasSkinning = true;
-		gAvatarProgram.mFeatures.calculatesAtmospherics = true;
-		gAvatarProgram.mFeatures.calculatesLighting = true;
-		gAvatarProgram.mFeatures.hasGamma = true;
-		gAvatarProgram.mFeatures.hasAtmospherics = true;
-		gAvatarProgram.mFeatures.hasLighting = true;
-		gAvatarProgram.mShaderFiles.clear();
-		gAvatarProgram.mShaderFiles.push_back(make_pair("avatar/avatarV.glsl", GL_VERTEX_SHADER_ARB));
-		gAvatarProgram.mShaderFiles.push_back(make_pair("avatar/avatarF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gAvatarProgram.mShaderLevel = sVertexShaderLevel[SHADER_AVATAR];
-		success = gAvatarProgram.createShader(&sAvatarAttribs, &sAvatarUniforms);
-			
-		if (success)
-		{
-			gAvatarWaterProgram.mName = "Avatar Water Shader";
-			gAvatarWaterProgram.mFeatures.hasSkinning = true;
-			gAvatarWaterProgram.mFeatures.calculatesAtmospherics = true;
-			gAvatarWaterProgram.mFeatures.calculatesLighting = true;
-			gAvatarWaterProgram.mFeatures.hasWaterFog = true;
-			gAvatarWaterProgram.mFeatures.hasAtmospherics = true;
-			gAvatarWaterProgram.mFeatures.hasLighting = true;
-			gAvatarWaterProgram.mShaderFiles.clear();
-			gAvatarWaterProgram.mShaderFiles.push_back(make_pair("avatar/avatarV.glsl", GL_VERTEX_SHADER_ARB));
-			gAvatarWaterProgram.mShaderFiles.push_back(make_pair("objects/simpleWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
-			// Note: no cloth under water:
-			gAvatarWaterProgram.mShaderLevel = llmin(sVertexShaderLevel[SHADER_AVATAR], 1);	
-			gAvatarWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;				
-			success = gAvatarWaterProgram.createShader(&sAvatarAttribs, &sAvatarUniforms);
-		}
-
-		/// Keep track of avatar levels
-		if (gAvatarProgram.mShaderLevel != sVertexShaderLevel[SHADER_AVATAR])
-		{
-			sMaxAvatarShaderLevel = sVertexShaderLevel[SHADER_AVATAR] = gAvatarProgram.mShaderLevel;
-		}
-	}
-
-	if (success)
-	{
-		gAvatarPickProgram.mName = "Avatar Pick Shader";
-		gAvatarPickProgram.mFeatures.hasSkinning = true;
-		gAvatarPickProgram.mShaderFiles.clear();
-		gAvatarPickProgram.mShaderFiles.push_back(make_pair("avatar/pickAvatarV.glsl", GL_VERTEX_SHADER_ARB));
-		gAvatarPickProgram.mShaderFiles.push_back(make_pair("avatar/pickAvatarF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gAvatarPickProgram.mShaderLevel = sVertexShaderLevel[SHADER_AVATAR];
-		success = gAvatarPickProgram.createShader(&sAvatarAttribs, &sAvatarUniforms);
-	}
-
-	if (success)
-	{
-		gAvatarEyeballProgram.mName = "Avatar Eyeball Program";
-		gAvatarEyeballProgram.mFeatures.calculatesLighting = true;
-		gAvatarEyeballProgram.mFeatures.isSpecular = true;
-		gAvatarEyeballProgram.mFeatures.calculatesAtmospherics = true;
-		gAvatarEyeballProgram.mFeatures.hasGamma = true;
-		gAvatarEyeballProgram.mFeatures.hasAtmospherics = true;
-		gAvatarEyeballProgram.mFeatures.hasLighting = true;
-		gAvatarEyeballProgram.mShaderFiles.clear();
-		gAvatarEyeballProgram.mShaderFiles.push_back(make_pair("avatar/eyeballV.glsl", GL_VERTEX_SHADER_ARB));
-		gAvatarEyeballProgram.mShaderFiles.push_back(make_pair("avatar/eyeballF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gAvatarEyeballProgram.mShaderLevel = sVertexShaderLevel[SHADER_AVATAR];
-		success = gAvatarEyeballProgram.createShader(NULL, NULL);
-	}
-
-	if( !success )
-	{
-		sVertexShaderLevel[SHADER_AVATAR] = 0;
-		sMaxAvatarShaderLevel = 0;
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-BOOL LLShaderMgr::loadShadersInterface()
-{
-	BOOL success = TRUE;
-
-	if (sVertexShaderLevel[SHADER_INTERFACE] == 0)
-	{
-		gHighlightProgram.unload();
-		return FALSE;
-	}
-	
-	if (success)
-	{
-		gHighlightProgram.mName = "Highlight Shader";
-		gHighlightProgram.mShaderFiles.clear();
-		gHighlightProgram.mShaderFiles.push_back(make_pair("interface/highlightV.glsl", GL_VERTEX_SHADER_ARB));
-		gHighlightProgram.mShaderFiles.push_back(make_pair("interface/highlightF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gHighlightProgram.mShaderLevel = sVertexShaderLevel[SHADER_INTERFACE];		
-		success = gHighlightProgram.createShader(NULL, NULL);
-	}
-
-	if( !success )
-	{
-		sVertexShaderLevel[SHADER_INTERFACE] = 0;
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-BOOL LLShaderMgr::loadShadersWindLight()
-{	
-	BOOL success = TRUE;
-
-	if (sVertexShaderLevel[SHADER_WINDLIGHT] < 2)
-	{
-		gWLSkyProgram.unload();
-		gWLCloudProgram.unload();
-		return FALSE;
-	}
-
-	if (success)
-	{
-		gWLSkyProgram.mName = "Windlight Sky Shader";
-		//gWLSkyProgram.mFeatures.hasGamma = true;
-		gWLSkyProgram.mShaderFiles.clear();
-		gWLSkyProgram.mShaderFiles.push_back(make_pair("windlight/skyV.glsl", GL_VERTEX_SHADER_ARB));
-		gWLSkyProgram.mShaderFiles.push_back(make_pair("windlight/skyF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gWLSkyProgram.mShaderLevel = sVertexShaderLevel[SHADER_WINDLIGHT];
-		gWLSkyProgram.mShaderGroup = LLGLSLShader::SG_SKY;
-		success = gWLSkyProgram.createShader(NULL, &sWLUniforms);
-	}
-
-	if (success)
-	{
-		gWLCloudProgram.mName = "Windlight Cloud Program";
-		//gWLCloudProgram.mFeatures.hasGamma = true;
-		gWLCloudProgram.mShaderFiles.clear();
-		gWLCloudProgram.mShaderFiles.push_back(make_pair("windlight/cloudsV.glsl", GL_VERTEX_SHADER_ARB));
-		gWLCloudProgram.mShaderFiles.push_back(make_pair("windlight/cloudsF.glsl", GL_FRAGMENT_SHADER_ARB));
-		gWLCloudProgram.mShaderLevel = sVertexShaderLevel[SHADER_WINDLIGHT];
-		gWLCloudProgram.mShaderGroup = LLGLSLShader::SG_SKY;
-		success = gWLCloudProgram.createShader(NULL, &sWLUniforms);
-	}
-
-	return success;
-}
-
-
-//===============================
-// LLGLSL Shader implementation
-//===============================
-LLGLSLShader::LLGLSLShader()
-: mProgramObject(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT)
-{
-}
-
-void LLGLSLShader::unload()
-{
-	stop_glerror();
-	mAttribute.clear();
-	mTexture.clear();
-	mUniform.clear();
-	mShaderFiles.clear();
-
-	if (mProgramObject)
-	{
-		GLhandleARB obj[1024];
-		GLsizei count;
-
-		glGetAttachedObjectsARB(mProgramObject, 1024, &count, obj);
-		for (GLsizei i = 0; i < count; i++)
-		{
-			glDeleteObjectARB(obj[i]);
-		}
-
-		glDeleteObjectARB(mProgramObject);
-
-		mProgramObject = 0;
-	}
-	
-	//hack to make apple not complain
-	glGetError();
-	
-	stop_glerror();
-}
-
-BOOL LLGLSLShader::createShader(vector<string> * attributes,
-								vector<string> * uniforms)
-{
-	llassert_always(!mShaderFiles.empty());
-	BOOL success = TRUE;
-
-	// Create program
-	mProgramObject = glCreateProgramObjectARB();
-	
-	// Attach existing objects
-	if (!LLShaderMgr::attachShaderFeatures(this))
-	{
-		return FALSE;
-	}
-
-	vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin();
-	for ( ; fileIter != mShaderFiles.end(); fileIter++ )
-	{
-		GLhandleARB shaderhandle = LLShaderMgr::loadShaderFile((*fileIter).first, mShaderLevel, (*fileIter).second);
-		LL_DEBUGS("ShaderLoading") << "SHADER FILE: " << (*fileIter).first << " mShaderLevel=" << mShaderLevel << LL_ENDL;
-		if (mShaderLevel > 0)
-		{
-			attachObject(shaderhandle);
-		}
-		else
-		{
-			success = FALSE;
-		}
-	}
-
-	// Map attributes and uniforms
-	if (success)
-	{
-		success = mapAttributes(attributes);
-	}
-	if (success)
-	{
-		success = mapUniforms(uniforms);
-	}
-	if( !success )
-	{
-		LL_WARNS("ShaderLoading") << "Failed to link shader: " << mName << LL_ENDL;
-
-		// Try again using a lower shader level;
-		if (mShaderLevel > 0)
-		{
-			LL_WARNS("ShaderLoading") << "Failed to link using shader level " << mShaderLevel << " trying again using shader level " << (mShaderLevel - 1) << LL_ENDL;
-			mShaderLevel--;
-			return createShader(attributes,uniforms);
-		}
-	}
-	return success;
-}
-
-BOOL LLGLSLShader::attachObject(std::string object)
-{
-	if (LLShaderMgr::sShaderObjects.count(object) > 0)
-	{
-		stop_glerror();
-		glAttachObjectARB(mProgramObject, LLShaderMgr::sShaderObjects[object]);
-		stop_glerror();
-		return TRUE;
-	}
-	else
-	{
-		LL_WARNS("ShaderLoading") << "Attempting to attach shader object that hasn't been compiled: " << object << LL_ENDL;
-		return FALSE;
-	}
-}
-
-void LLGLSLShader::attachObject(GLhandleARB object)
-{
-	if (object != 0)
-	{
-		stop_glerror();
-		glAttachObjectARB(mProgramObject, object);
-		stop_glerror();
-	}
-	else
-	{
-		LL_WARNS("ShaderLoading") << "Attempting to attach non existing shader object. " << LL_ENDL;
-	}
-}
-
-void LLGLSLShader::attachObjects(GLhandleARB* objects, S32 count)
-{
-	for (S32 i = 0; i < count; i++)
-	{
-		attachObject(objects[i]);
-	}
-}
-
-BOOL LLGLSLShader::mapAttributes(const vector<string> * attributes)
-{
-	//link the program
-	BOOL res = link();
-
-	mAttribute.clear();
-	U32 numAttributes = (attributes == NULL) ? 0 : attributes->size();
-	mAttribute.resize(LLShaderMgr::sReservedAttribs.size() + numAttributes, -1);
-	
-	if (res)
-	{ //read back channel locations
-
-		//read back reserved channels first
-		for (U32 i = 0; i < (S32) LLShaderMgr::sReservedAttribs.size(); i++)
-		{
-			const char* name = LLShaderMgr::sReservedAttribs[i].c_str();
-			S32 index = glGetAttribLocationARB(mProgramObject, (GLcharARB *)name);
-			if (index != -1)
-			{
-				mAttribute[i] = index;
-				LL_DEBUGS("ShaderLoading") << "Attribute " << name << " assigned to channel " << index << LL_ENDL;
-			}
-		}
-		if (attributes != NULL)
-		{
-			for (U32 i = 0; i < numAttributes; i++)
-			{
-				const char* name = (*attributes)[i].c_str();
-				S32 index = glGetAttribLocationARB(mProgramObject, name);
-				if (index != -1)
-				{
-					mAttribute[LLShaderMgr::sReservedAttribs.size() + i] = index;
-					LL_DEBUGS("ShaderLoading") << "Attribute " << name << " assigned to channel " << index << LL_ENDL;
-				}
-			}
-		}
-
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-void LLGLSLShader::mapUniform(GLint index, const vector<string> * uniforms)
-{
-	if (index == -1)
-	{
-		return;
-	}
-
-	GLenum type;
-	GLsizei length;
-	GLint size;
-	char name[1024];		/* Flawfinder: ignore */
-	name[0] = 0;
-
-	glGetActiveUniformARB(mProgramObject, index, 1024, &length, &size, &type, (GLcharARB *)name);
-	S32 location = glGetUniformLocationARB(mProgramObject, name);
-	if (location != -1)
-	{
-		mUniformMap[name] = location;
-		LL_DEBUGS("ShaderLoading") << "Uniform " << name << " is at location " << location << LL_ENDL;
-	
-		//find the index of this uniform
-		for (S32 i = 0; i < (S32) LLShaderMgr::sReservedUniforms.size(); i++)
-		{
-			if ( (mUniform[i] == -1)
-				&& (LLShaderMgr::sReservedUniforms[i].compare(0, length, name, LLShaderMgr::sReservedUniforms[i].length()) == 0))
-			{
-				//found it
-				mUniform[i] = location;
-				mTexture[i] = mapUniformTextureChannel(location, type);
-				return;
-			}
-		}
-
-		if (uniforms != NULL)
-		{
-			for (U32 i = 0; i < uniforms->size(); i++)
-			{
-				if ( (mUniform[i+LLShaderMgr::sReservedUniforms.size()] == -1)
-					&& ((*uniforms)[i].compare(0, length, name, (*uniforms)[i].length()) == 0))
-				{
-					//found it
-					mUniform[i+LLShaderMgr::sReservedUniforms.size()] = location;
-					mTexture[i+LLShaderMgr::sReservedUniforms.size()] = mapUniformTextureChannel(location, type);
-					return;
-				}
-			}
-		}
-	}
- }
-
-GLint LLGLSLShader::mapUniformTextureChannel(GLint location, GLenum type)
-{
-	if (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB)
-	{	//this here is a texture
-		glUniform1iARB(location, mActiveTextureChannels);
-		LL_DEBUGS("ShaderLoading") << "Assigned to texture channel " << mActiveTextureChannels << LL_ENDL;
-		return mActiveTextureChannels++;
-	}
-	return -1;
-}
-
-BOOL LLGLSLShader::mapUniforms(const vector<string> * uniforms)
-{
-	BOOL res = TRUE;
-	
-	mActiveTextureChannels = 0;
-	mUniform.clear();
-	mUniformMap.clear();
-	mTexture.clear();
-	mValue.clear();
-	//initialize arrays
-	U32 numUniforms = (uniforms == NULL) ? 0 : uniforms->size();
-	mUniform.resize(numUniforms + LLShaderMgr::sReservedUniforms.size(), -1);
-	mTexture.resize(numUniforms + LLShaderMgr::sReservedUniforms.size(), -1);
-	
-	bind();
-
-	//get the number of active uniforms
-	GLint activeCount;
-	glGetObjectParameterivARB(mProgramObject, GL_OBJECT_ACTIVE_UNIFORMS_ARB, &activeCount);
-
-	for (S32 i = 0; i < activeCount; i++)
-	{
-		mapUniform(i, uniforms);
-	}
-
-	unbind();
-
-	return res;
-}
-
-BOOL LLGLSLShader::link(BOOL suppress_errors)
-{
-	return LLShaderMgr::linkProgramObject(mProgramObject, suppress_errors);
-}
-
-void LLGLSLShader::bind()
-{
-	if (gGLManager.mHasShaderObjects)
-	{
-		glUseProgramObjectARB(mProgramObject);
-
-		if (mUniformsDirty)
-		{
-			LLWLParamManager::instance()->updateShaderUniforms(this);
-			LLWaterParamManager::instance()->updateShaderUniforms(this);
-			mUniformsDirty = FALSE;
-		}
-	}
-}
-
-void LLGLSLShader::unbind()
-{
-	if (gGLManager.mHasShaderObjects)
-	{
-		for (U32 i = 0; i < mAttribute.size(); ++i)
-		{
-			vertexAttrib4f(i, 0,0,0,1);
-		}
-		glUseProgramObjectARB(0);
-	}
-}
-
-void LLGLSLShader::bindNoShader(void)
-{
-	glUseProgramObjectARB(0);
-}
-
-S32 LLGLSLShader::enableTexture(S32 uniform, S32 mode)
-{
-	if (uniform < 0 || uniform >= (S32)mTexture.size())
-	{
-		UNIFORM_ERRS << "Uniform out of range: " << uniform << LL_ENDL;
-		return -1;
-	}
-	S32 index = mTexture[uniform];
-	if (index != -1)
-	{
-		gGL.getTexUnit(index)->activate();
-		glEnable(mode);
-	}
-	return index;
-}
-
-S32 LLGLSLShader::disableTexture(S32 uniform, S32 mode)
-{
-	if (uniform < 0 || uniform >= (S32)mTexture.size())
-	{
-		UNIFORM_ERRS << "Uniform out of range: " << uniform << LL_ENDL;
-		return -1;
-	}
-	S32 index = mTexture[uniform];
-	if (index != -1)
-	{
-		gGL.getTexUnit(index)->activate();
-		glDisable(mode);
-	}
-	return index;
-}
-
-void LLGLSLShader::uniform1f(U32 index, GLfloat x)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			if (iter == mValue.end() || iter->second.mV[0] != x)
-			{
-				glUniform1fARB(mUniform[index], x);
-				mValue[mUniform[index]] = LLVector4(x,0.f,0.f,0.f);
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniform2f(U32 index, GLfloat x, GLfloat y)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			LLVector4 vec(x,y,0.f,0.f);
-			if (iter == mValue.end() || shouldChange(iter->second,vec))
-			{
-				glUniform2fARB(mUniform[index], x, y);
-				mValue[mUniform[index]] = vec;
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniform3f(U32 index, GLfloat x, GLfloat y, GLfloat z)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			LLVector4 vec(x,y,z,0.f);
-			if (iter == mValue.end() || shouldChange(iter->second,vec))
-			{
-				glUniform3fARB(mUniform[index], x, y, z);
-				mValue[mUniform[index]] = vec;
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniform4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			LLVector4 vec(x,y,z,w);
-			if (iter == mValue.end() || shouldChange(iter->second,vec))
-			{
-				glUniform4fARB(mUniform[index], x, y, z, w);
-				mValue[mUniform[index]] = vec;
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniform1fv(U32 index, U32 count, const GLfloat* v)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			LLVector4 vec(v[0],0.f,0.f,0.f);
-			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-			{
-				glUniform1fvARB(mUniform[index], count, v);
-				mValue[mUniform[index]] = vec;
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniform2fv(U32 index, U32 count, const GLfloat* v)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			LLVector4 vec(v[0],v[1],0.f,0.f);
-			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-			{
-				glUniform2fvARB(mUniform[index], count, v);
-				mValue[mUniform[index]] = vec;
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniform3fv(U32 index, U32 count, const GLfloat* v)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			LLVector4 vec(v[0],v[1],v[2],0.f);
-			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-			{
-				glUniform3fvARB(mUniform[index], count, v);
-				mValue[mUniform[index]] = vec;
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniform4fv(U32 index, U32 count, const GLfloat* v)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			std::map<GLint, LLVector4>::iterator iter = mValue.find(mUniform[index]);
-			LLVector4 vec(v[0],v[1],v[2],v[3]);
-			if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-			{
-				glUniform4fvARB(mUniform[index], count, v);
-				mValue[mUniform[index]] = vec;
-			}
-		}
-	}
-}
-
-void LLGLSLShader::uniformMatrix2fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			glUniformMatrix2fvARB(mUniform[index], count, transpose, v);
-		}
-	}
-}
-
-void LLGLSLShader::uniformMatrix3fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			glUniformMatrix3fvARB(mUniform[index], count, transpose, v);
-		}
-	}
-}
-
-void LLGLSLShader::uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v)
-{
-	if (mProgramObject > 0)
-	{	
-		if (mUniform.size() <= index)
-		{
-			UNIFORM_ERRS << "Uniform index out of bounds." << LL_ENDL;
-			return;
-		}
-
-		if (mUniform[index] >= 0)
-		{
-			glUniformMatrix4fvARB(mUniform[index], count, transpose, v);
-		}
-	}
-}
-
-GLint LLGLSLShader::getUniformLocation(const string& uniform)
-{
-	if (mProgramObject > 0)
-	{
-		std::map<string, GLint>::iterator iter = mUniformMap.find(uniform);
-		if (iter != mUniformMap.end())
-		{
-			llassert(iter->second == glGetUniformLocationARB(mProgramObject, uniform.c_str()));
-			return iter->second;
-		}
-	}
-
-	return -1;
-}
-
-void LLGLSLShader::uniform1f(const string& uniform, GLfloat v)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		LLVector4 vec(v,0.f,0.f,0.f);
-		if (iter == mValue.end() || shouldChange(iter->second,vec))
-		{
-			glUniform1fARB(location, v);
-			mValue[location] = vec;
-		}
-	}
-}
-
-void LLGLSLShader::uniform2f(const string& uniform, GLfloat x, GLfloat y)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		LLVector4 vec(x,y,0.f,0.f);
-		if (iter == mValue.end() || shouldChange(iter->second,vec))
-		{
-			glUniform2fARB(location, x,y);
-			mValue[location] = vec;
-		}
-	}
-
-}
-
-void LLGLSLShader::uniform3f(const string& uniform, GLfloat x, GLfloat y, GLfloat z)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		LLVector4 vec(x,y,z,0.f);
-		if (iter == mValue.end() || shouldChange(iter->second,vec))
-		{
-			glUniform3fARB(location, x,y,z);
-			mValue[location] = vec;
-		}
-	}
-}
-
-void LLGLSLShader::uniform4f(const string& uniform, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	GLint location = getUniformLocation(uniform);
-
-	if (location >= 0)
-	{
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		LLVector4 vec(x,y,z,w);
-		if (iter == mValue.end() || shouldChange(iter->second,vec))
-		{
-			glUniform4fARB(location, x,y,z,w);
-			mValue[location] = vec;
-		}
-	}
-}
-
-void LLGLSLShader::uniform1fv(const string& uniform, U32 count, const GLfloat* v)
-{
-	GLint location = getUniformLocation(uniform);
-
-	if (location >= 0)
-	{
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		LLVector4 vec(v[0],0.f,0.f,0.f);
-		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-		{
-			glUniform1fvARB(location, count, v);
-			mValue[location] = vec;
-		}
-	}
-}
-
-void LLGLSLShader::uniform2fv(const string& uniform, U32 count, const GLfloat* v)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		LLVector4 vec(v[0],v[1],0.f,0.f);
-		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-		{
-			glUniform2fvARB(location, count, v);
-			mValue[location] = vec;
-		}
-	}
-}
-
-void LLGLSLShader::uniform3fv(const string& uniform, U32 count, const GLfloat* v)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		LLVector4 vec(v[0],v[1],v[2],0.f);
-		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-		{
-			glUniform3fvARB(location, count, v);
-			mValue[location] = vec;
-		}
-	}
-}
-
-void LLGLSLShader::uniform4fv(const string& uniform, U32 count, const GLfloat* v)
-{
-	GLint location = getUniformLocation(uniform);
-
-	if (location >= 0)
-	{
-		LLVector4 vec(v);
-		std::map<GLint, LLVector4>::iterator iter = mValue.find(location);
-		if (iter == mValue.end() || shouldChange(iter->second,vec) || count != 1)
-		{
-			glUniform4fvARB(location, count, v);
-			mValue[location] = vec;
-		}
-	}
-}
-
-void LLGLSLShader::uniformMatrix2fv(const string& uniform, U32 count, GLboolean transpose, const GLfloat* v)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		glUniformMatrix2fvARB(location, count, transpose, v);
-	}
-}
-
-void LLGLSLShader::uniformMatrix3fv(const string& uniform, U32 count, GLboolean transpose, const GLfloat* v)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		glUniformMatrix3fvARB(location, count, transpose, v);
-	}
-}
-
-void LLGLSLShader::uniformMatrix4fv(const string& uniform, U32 count, GLboolean transpose, const GLfloat* v)
-{
-	GLint location = getUniformLocation(uniform);
-				
-	if (location >= 0)
-	{
-		glUniformMatrix4fvARB(location, count, transpose, v);
-	}
-}
-
-
-void LLGLSLShader::vertexAttrib4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	if (mAttribute[index] > 0)
-	{
-		glVertexAttrib4fARB(mAttribute[index], x, y, z, w);
-	}
-}
-
-void LLGLSLShader::vertexAttrib4fv(U32 index, GLfloat* v)
-{
-	if (mAttribute[index] > 0)
-	{
-		glVertexAttrib4fvARB(mAttribute[index], v);
-	}
-}
diff --git a/linden/indra/newview/llglslshader.h b/linden/indra/newview/llglslshader.h
deleted file mode 100644
index e517b94..0000000
--- a/linden/indra/newview/llglslshader.h
+++ /dev/null
@@ -1,420 +0,0 @@
-/** 
- * @file llglslshader.h
- * @brief GLSL shader wrappers
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLGLSLSHADER_H
-#define LL_LLGLSLSHADER_H
-
-#include "llgl.h"
-
-class LLShaderFeatures
-{
-public:
-	bool calculatesLighting;
-	bool calculatesAtmospherics;
-	bool hasLighting; // implies no transport (it's possible to have neither though)
-	bool isShiny;
-	bool isFullbright; // implies no lighting
-	bool isSpecular;
-	bool hasWaterFog; // implies no gamma
-	bool hasTransport; // implies no lighting (it's possible to have neither though)
-	bool hasSkinning;	
-	bool hasAtmospherics;
-	bool hasGamma;
-
-	// char numLights;
-	
-	LLShaderFeatures();
-};
-
-class LLGLSLShader
-{
-public:
-
-	enum 
-	{
-		SG_DEFAULT = 0,
-		SG_SKY,
-		SG_WATER
-	};
-	
-	LLGLSLShader();
-
-	void unload();
-	BOOL createShader(std::vector<std::string> * attributes,
-						std::vector<std::string> * uniforms);
-	BOOL attachObject(std::string object);
-	void attachObject(GLhandleARB object);
-	void attachObjects(GLhandleARB* objects = NULL, S32 count = 0);
-	BOOL mapAttributes(const std::vector<std::string> * attributes);
-	BOOL mapUniforms(const std::vector<std::string> * uniforms);
-	void mapUniform(GLint index, const std::vector<std::string> * uniforms);
-	void uniform1f(U32 index, GLfloat v);
-	void uniform2f(U32 index, GLfloat x, GLfloat y);
-	void uniform3f(U32 index, GLfloat x, GLfloat y, GLfloat z);
-	void uniform4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-	void uniform1fv(U32 index, U32 count, const GLfloat* v);
-	void uniform2fv(U32 index, U32 count, const GLfloat* v);
-	void uniform3fv(U32 index, U32 count, const GLfloat* v);
-	void uniform4fv(U32 index, U32 count, const GLfloat* v);
-	void uniform1f(const std::string& uniform, GLfloat v);
-	void uniform2f(const std::string& uniform, GLfloat x, GLfloat y);
-	void uniform3f(const std::string& uniform, GLfloat x, GLfloat y, GLfloat z);
-	void uniform4f(const std::string& uniform, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-	void uniform1fv(const std::string& uniform, U32 count, const GLfloat* v);
-	void uniform2fv(const std::string& uniform, U32 count, const GLfloat* v);
-	void uniform3fv(const std::string& uniform, U32 count, const GLfloat* v);
-	void uniform4fv(const std::string& uniform, U32 count, const GLfloat* v);
-	void uniformMatrix2fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v);
-	void uniformMatrix3fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v);
-	void uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v);
-	void uniformMatrix2fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v);
-	void uniformMatrix3fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v);
-	void uniformMatrix4fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v);
-
-	void vertexAttrib4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-	void vertexAttrib4fv(U32 index, GLfloat* v);
-	
-	GLint getUniformLocation(const std::string& uniform);
-	
-	GLint mapUniformTextureChannel(GLint location, GLenum type);
-	
-
-	//enable/disable texture channel for specified uniform
-	//if given texture uniform is active in the shader, 
-	//the corresponding channel will be active upon return
-	//returns channel texture is enabled in from [0-MAX)
-	S32 enableTexture(S32 uniform, S32 mode = GL_TEXTURE_2D);
-	S32 disableTexture(S32 uniform, S32 mode = GL_TEXTURE_2D); 
-	
-    BOOL link(BOOL suppress_errors = FALSE);
-	void bind();
-	void unbind();
-
-	// Unbinds any previously bound shader by explicitly binding no shader.
-	static void bindNoShader(void);
-
-	GLhandleARB mProgramObject;
-	std::vector<GLint> mAttribute; //lookup table of attribute enum to attribute channel
-	std::vector<GLint> mUniform;   //lookup table of uniform enum to uniform location
-	std::map<std::string, GLint> mUniformMap;  //lookup map of uniform name to uniform location
-	std::map<GLint, LLVector4> mValue; //lookup map of uniform location to last known value
-	std::vector<GLint> mTexture;
-	S32 mActiveTextureChannels;
-	S32 mShaderLevel;
-	S32 mShaderGroup;
-	BOOL mUniformsDirty;
-	LLShaderFeatures mFeatures;
-	std::vector< std::pair< std::string, GLenum > > mShaderFiles;
-	std::string mName;
-};
-
-class LLShaderMgr
-{
-	friend class LLGLSLShader;
-
-public:
-	static void initAttribsAndUniforms(void);
-	static BOOL attachShaderFeatures(LLGLSLShader * shader);
-	static void setShaders();
-	static void unloadShaders();
-	static void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE);
-	static BOOL	linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE);
-	static BOOL	validateProgramObject(GLhandleARB obj);
-	static GLhandleARB loadShaderFile(const LLString& filename, S32 & shader_level, GLenum type);
-	static S32 getVertexShaderLevel(S32 type);
-	static BOOL loadBasicShaders();
-	static BOOL loadShadersEffects();
-	static BOOL loadShadersDeferred();
-	static BOOL loadShadersObject();
-	static BOOL loadShadersAvatar();
-	static BOOL loadShadersEnvironment();
-	static BOOL loadShadersWater();
-	static BOOL loadShadersInterface();
-	static BOOL loadShadersWindLight();
-
-	// simple model of forward iterator
-	// http://www.sgi.com/tech/stl/ForwardIterator.html
-	class shader_iter
-	{
-		friend bool operator == (shader_iter const & a, shader_iter const & b);
-		friend bool operator != (shader_iter const & a, shader_iter const & b);
-	public:
-		shader_iter() : mPtr(NULL)
-		{
-		}
-
-		shader_iter(LLGLSLShader * const * ptr) : mPtr(ptr)
-		{
-		}
-
-		LLGLSLShader & operator * () const
-		{
-			return **mPtr;
-		}
-
-		LLGLSLShader * operator -> () const
-		{
-			return *mPtr;
-		}
-
-		shader_iter & operator++ ()
-		{
-			++mPtr;
-			return *this;
-		}
-
-		shader_iter operator++ (int)
-		{
-			return mPtr++;
-		}
-
-	private:
-		LLGLSLShader * const * mPtr;
-	};
-
-	static shader_iter beginShaders()
-	{
-		return sShaderList;
-	}
-
-	static shader_iter endShaders()
-	{
-		return sShaderList + sNumShaders;
-	}
-
-	static S32	sVertexShaderLevel[];
-	static S32	sMaxAvatarShaderLevel;
-
-	enum EShaderClass
-	{
-		SHADER_LIGHTING,
-		SHADER_OBJECT,
-		SHADER_AVATAR,
-		SHADER_ENVIRONMENT,
-		SHADER_INTERFACE,
-		SHADER_EFFECT,
-		SHADER_WINDLIGHT,
-		SHADER_WATER,
-		SHADER_DEFERRED,
-		SHADER_COUNT
-	};
-
-	typedef enum 
-	{
-		MATERIAL_COLOR = 0,
-		SPECULAR_COLOR,
-		BINORMAL,
-		END_RESERVED_ATTRIBS
-	} eGLSLReservedAttribs;
-	
-	typedef enum
-	{
-		DIFFUSE_MAP = 0,
-		SPECULAR_MAP,
-		BUMP_MAP,
-		ENVIRONMENT_MAP,
-		CLOUD_NOISE_MAP,
-		FULLBRIGHT,
-		LIGHTNORM,
-		SUNLIGHT_COLOR,
-		AMBIENT,
-		BLUE_HORIZON,
-		BLUE_DENSITY,
-		HAZE_HORIZON,
-		HAZE_DENSITY,
-		CLOUD_SHADOW,
-		DENSITY_MULTIPLIER,
-		DISTANCE_MULTIPLIER,
-		MAX_Y,
-		GLOW,
-		CLOUD_COLOR,
-		CLOUD_POS_DENSITY1,
-		CLOUD_POS_DENSITY2,
-		CLOUD_SCALE,
-		GAMMA,
-		SCENE_LIGHT_STRENGTH,
-		END_RESERVED_UNIFORMS
-	} eGLSLReservedUniforms;
-
-	typedef enum
-	{
-		SHINY_ORIGIN = END_RESERVED_UNIFORMS
-	} eShinyUniforms;
-
-	typedef enum
-	{
-		WATER_SCREENTEX = END_RESERVED_UNIFORMS,
-		WATER_SCREENDEPTH,
-		WATER_REFTEX,
-		WATER_EYEVEC,
-		WATER_TIME,
-		WATER_WAVE_DIR1,
-		WATER_WAVE_DIR2,
-		WATER_LIGHT_DIR,
-		WATER_SPECULAR,
-		WATER_SPECULAR_EXP,
-		WATER_FOGCOLOR,
-		WATER_FOGDENSITY,
-		WATER_REFSCALE,
-		WATER_WATERHEIGHT,
-	} eWaterUniforms;
-
-	typedef enum
-	{
-		WL_CAMPOSLOCAL = END_RESERVED_UNIFORMS,
-		WL_WATERHEIGHT
-	} eWLUniforms;
-
-	typedef enum
-	{
-		TERRAIN_DETAIL0 = END_RESERVED_UNIFORMS,
-		TERRAIN_DETAIL1,
-		TERRAIN_DETAIL2,
-		TERRAIN_DETAIL3,
-		TERRAIN_ALPHARAMP
-	} eTerrainUniforms;
-
-	typedef enum
-	{
-		GLOW_DELTA = END_RESERVED_UNIFORMS
-	} eGlowUniforms;
-
-	typedef enum
-	{
-		AVATAR_WEIGHT = END_RESERVED_ATTRIBS,
-		AVATAR_CLOTHING,
-		AVATAR_WIND,
-		AVATAR_SINWAVE,
-		AVATAR_GRAVITY
-	} eAvatarAttribs;
-
-	typedef enum
-	{
-		AVATAR_MATRIX = END_RESERVED_UNIFORMS
-	} eAvatarUniforms;
-
-private:
-
-	// Map of shader names to compiled
-	static std::map<std::string, GLhandleARB> sShaderObjects;
-
-	//global (reserved slot) shader parameters
-	static std::vector<std::string> sReservedAttribs;
-
-	static std::vector<std::string> sReservedUniforms;
-
-	static std::vector<std::string> sShinyUniforms;
-
-	//water parameters
-	static std::vector<std::string> sWaterUniforms;
-
-	static std::vector<std::string> sWLUniforms;
-
-	//terrain parameters
-	static std::vector<std::string> sTerrainUniforms;
-
-	//glow parameters
-	static std::vector<std::string> sGlowUniforms;
-
-	static std::vector<std::string> sGlowExtractUniforms;
-
-	//avatar shader parameter tables
-	static std::vector<std::string> sAvatarAttribs;
-
-	static std::vector<std::string> sAvatarUniforms;
-	// static std::vector< GLhandleARB > sBaseObjects;
-
-	// the list of shaders we need to propagate parameters to.
-	static LLGLSLShader * const sShaderList[];
-
-	// the size of our shader list for convenience.
-	static const size_t sNumShaders;
-
-}; //LLShaderMgr
-
-inline bool operator == (LLShaderMgr::shader_iter const & a, LLShaderMgr::shader_iter const & b)
-{
-	return a.mPtr == b.mPtr;
-}
-
-inline bool operator != (LLShaderMgr::shader_iter const & a, LLShaderMgr::shader_iter const & b)
-{
-	return a.mPtr != b.mPtr;
-}
-
-
-extern LLVector4			gShinyOrigin;
-
-//object shaders
-extern LLGLSLShader			gObjectSimpleProgram;
-extern LLGLSLShader			gObjectSimpleWaterProgram;
-extern LLGLSLShader			gObjectFullbrightProgram;
-extern LLGLSLShader			gObjectFullbrightWaterProgram;
-
-extern LLGLSLShader			gObjectSimpleLODProgram;
-extern LLGLSLShader			gObjectFullbrightLODProgram;
-
-extern LLGLSLShader			gObjectFullbrightShinyProgram;
-extern LLGLSLShader			gObjectShinyProgram;
-extern LLGLSLShader			gObjectShinyWaterProgram;
-
-//environment shaders
-extern LLGLSLShader			gTerrainProgram;
-extern LLGLSLShader			gTerrainWaterProgram;
-extern LLGLSLShader			gWaterProgram;
-extern LLGLSLShader			gUnderWaterProgram;
-extern LLGLSLShader			gGlowProgram;
-extern LLGLSLShader			gGlowExtractProgram;
-
-//interface shaders
-extern LLGLSLShader			gHighlightProgram;
-
-// avatar shader handles
-extern LLGLSLShader			gAvatarProgram;
-extern LLGLSLShader			gAvatarWaterProgram;
-extern LLGLSLShader			gAvatarEyeballProgram;
-extern LLGLSLShader			gAvatarPickProgram;
-
-// WindLight shader handles
-extern LLGLSLShader			gWLSkyProgram;
-extern LLGLSLShader			gWLCloudProgram;
-
-// Post Process Shaders
-extern LLGLSLShader			gPostColorFilterProgram;
-extern LLGLSLShader			gPostNightVisionProgram;
-
-// Deferred rendering shaders
-extern LLGLSLShader			gDeferredDiffuseProgram;
-
-//current avatar shader parameter pointer
-extern GLint				gAvatarMatrixParam;
-
-#endif
diff --git a/linden/indra/newview/llgroupmgr.cpp b/linden/indra/newview/llgroupmgr.cpp
index 7ea28e0..30b7cbd 100644
--- a/linden/indra/newview/llgroupmgr.cpp
+++ b/linden/indra/newview/llgroupmgr.cpp
@@ -821,8 +821,8 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 	if (group_datap->mMemberCount > 0)
 	{
 		S32 contribution = 0;
-		char online_status[DB_DATETIME_BUF_SIZE];		/* Flawfinder: ignore */
-		char title[DB_GROUP_TITLE_BUF_SIZE];		/* Flawfinder: ignore */
+		std::string online_status;
+		std::string title;
 		U64 agent_powers = 0;
 		BOOL is_owner = FALSE;
 
@@ -834,8 +834,8 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 			msg->getUUIDFast(_PREHASH_MemberData, _PREHASH_AgentID, member_id, i );
 			msg->getS32(_PREHASH_MemberData, _PREHASH_Contribution, contribution, i);
 			msg->getU64(_PREHASH_MemberData, "AgentPowers", agent_powers, i);
-			msg->getStringFast(_PREHASH_MemberData, _PREHASH_OnlineStatus, DB_DATETIME_BUF_SIZE, online_status, i);
-			msg->getString(_PREHASH_MemberData, "Title", DB_GROUP_TITLE_BUF_SIZE, title, i);
+			msg->getStringFast(_PREHASH_MemberData, _PREHASH_OnlineStatus, online_status, i);
+			msg->getString(_PREHASH_MemberData, "Title", title, i);
 			msg->getBOOL(_PREHASH_MemberData,"IsOwner",is_owner,i);
 
 			if (member_id.notNull())
@@ -844,8 +844,8 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 				LLGroupMemberData* newdata = new LLGroupMemberData(member_id, 
 																	contribution, 
 																	agent_powers, 
-																	std::string(title),
-																	std::string(online_status),
+																	title,
+																	online_status,
 																	is_owner);
 #if LL_DEBUG
 				LLGroupMgrGroupData::member_list_t::iterator mit = group_datap->mMembers.find(member_id);
@@ -898,13 +898,13 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 	}
 
 	LLUUID group_id;
-	char	name[DB_GROUP_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-	char	charter[DB_GROUP_CHARTER_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string	name;
+	std::string	charter;
 	BOOL	show_in_list = FALSE;
 	LLUUID	founder_id;
 	U64		powers_mask = GP_NO_POWERS;
 	S32		money = 0;
-	char	member_title[DB_GROUP_TITLE_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string	member_title;
 	LLUUID	insignia_id;
 	LLUUID	owner_role;
 	U32		membership_fee = 0;
@@ -915,18 +915,18 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 	BOOL	mature = FALSE;
 
 	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_id );
-	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_FounderID,		founder_id);	
-	msg->getStringFast(_PREHASH_GroupData, _PREHASH_Name,			DB_GROUP_NAME_BUF_SIZE,	name );
-	msg->getStringFast(_PREHASH_GroupData, _PREHASH_Charter,			DB_GROUP_CHARTER_BUF_SIZE, charter );
-	msg->getBOOLFast(_PREHASH_GroupData, _PREHASH_ShowInList,		show_in_list );
-	msg->getStringFast(_PREHASH_GroupData, _PREHASH_MemberTitle, DB_GROUP_TITLE_BUF_SIZE, member_title );
-	msg->getUUIDFast(_PREHASH_GroupData,	_PREHASH_InsigniaID,			insignia_id );
-	msg->getU64Fast(_PREHASH_GroupData,		_PREHASH_PowersMask,			powers_mask );
-	msg->getU32Fast(_PREHASH_GroupData,		_PREHASH_MembershipFee,			membership_fee );
-	msg->getBOOLFast(_PREHASH_GroupData,	_PREHASH_OpenEnrollment,		open_enrollment );
-	msg->getS32Fast(_PREHASH_GroupData,		_PREHASH_GroupMembershipCount,	num_group_members);
-	msg->getS32(_PREHASH_GroupData,		"GroupRolesCount",		num_group_roles);
-	msg->getS32Fast(_PREHASH_GroupData,		_PREHASH_Money,					money);
+	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_FounderID, founder_id);	
+	msg->getStringFast(_PREHASH_GroupData, _PREHASH_Name, name );
+	msg->getStringFast(_PREHASH_GroupData, _PREHASH_Charter, charter );
+	msg->getBOOLFast(_PREHASH_GroupData, _PREHASH_ShowInList, show_in_list );
+	msg->getStringFast(_PREHASH_GroupData, _PREHASH_MemberTitle, member_title );
+	msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_InsigniaID, insignia_id );
+	msg->getU64Fast(_PREHASH_GroupData, _PREHASH_PowersMask, powers_mask );
+	msg->getU32Fast(_PREHASH_GroupData, _PREHASH_MembershipFee, membership_fee );
+	msg->getBOOLFast(_PREHASH_GroupData, _PREHASH_OpenEnrollment, open_enrollment );
+	msg->getS32Fast(_PREHASH_GroupData, _PREHASH_GroupMembershipCount, num_group_members);
+	msg->getS32(_PREHASH_GroupData, "GroupRolesCount", num_group_roles);
+	msg->getS32Fast(_PREHASH_GroupData, _PREHASH_Money, money);
 	msg->getBOOL("GroupData", "AllowPublish", allow_publish);
 	msg->getBOOL("GroupData", "MaturePublish", mature);
 	msg->getUUID(_PREHASH_GroupData, "OwnerRole", owner_role);
@@ -979,9 +979,9 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
 
 	msg->getS32(_PREHASH_GroupData, "RoleCount", group_data->mRoleCount );
 
-	char	name[DB_GROUP_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-	char	title[DB_GROUP_TITLE_BUF_SIZE];		/* Flawfinder: ignore */
-	char	desc[DB_GROUP_CHARTER_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string	name;
+	std::string	title;
+	std::string	desc;
 	U64		powers = 0;
 	U32		member_count = 0;
 	LLUUID role_id;
@@ -992,9 +992,9 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
 	{
 		msg->getUUID("RoleData", "RoleID", role_id, i );
 		
-		msg->getString("RoleData","Name",DB_GROUP_NAME_BUF_SIZE,name,i);
-		msg->getString("RoleData","Title",DB_GROUP_TITLE_BUF_SIZE,title,i);
-		msg->getString("RoleData","Description",DB_GROUP_CHARTER_BUF_SIZE,desc,i);
+		msg->getString("RoleData","Name",name,i);
+		msg->getString("RoleData","Title",title,i);
+		msg->getString("RoleData","Description",desc,i);
 		msg->getU64("RoleData","Powers",powers,i);
 		msg->getU32("RoleData","Members",member_count,i);
 
@@ -1154,20 +1154,17 @@ void LLGroupMgr::processGroupTitlesReply(LLMessageSystem* msg, void** data)
 		return;
 	}
 
-	char title_buf[DB_GROUP_TITLE_BUF_SIZE];		/* Flawfinder: ignore */
-
 	LLGroupTitle title;
 
 	S32 i = 0;
 	S32 blocks = msg->getNumberOfBlocksFast(_PREHASH_GroupData);
 	for (i=0; i<blocks; ++i)
 	{
-		msg->getString("GroupData","Title",DB_GROUP_TITLE_BUF_SIZE,title_buf,i);
-		title.mTitle = title_buf;
+		msg->getString("GroupData","Title",title.mTitle,i);
 		msg->getUUID("GroupData","RoleID",title.mRoleID,i);
 		msg->getBOOL("GroupData","Selected",title.mSelected,i);
 
-		if (title_buf[0] != '\0')
+		if (!title.mTitle.empty())
 		{
 			lldebugs << "LLGroupMgr adding title: " << title.mTitle << ", " << title.mRoleID << ", " << (title.mSelected ? 'Y' : 'N') << llendl;
 			group_data->mTitles.push_back(title);
@@ -1243,12 +1240,12 @@ void LLGroupMgr::processCreateGroupReply(LLMessageSystem* msg, void ** data)
 {
 	LLUUID group_id;
 	BOOL success;
-	char message[MAX_STRING];		/* Flawfinder: ignore */
+	std::string message;
 
 	msg->getUUIDFast(_PREHASH_ReplyData, _PREHASH_GroupID, group_id );
 
 	msg->getBOOLFast(_PREHASH_ReplyData, _PREHASH_Success,	success );
-	msg->getStringFast(_PREHASH_ReplyData, _PREHASH_Message, MAX_STRING, message );
+	msg->getStringFast(_PREHASH_ReplyData, _PREHASH_Message, message );
 
 	if (success)
 	{
@@ -1274,7 +1271,7 @@ void LLGroupMgr::processCreateGroupReply(LLMessageSystem* msg, void ** data)
 	else
 	{
 		// *TODO:translate
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MESSAGE]"] = message;
 		gViewerWindow->alertXml("UnableToCreateGroup", args);
 	}
@@ -1723,7 +1720,7 @@ void LLGroupMgr::cancelGroupRoleChanges(const LLUUID& group_id)
 }
 
 //static
-bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
+bool LLGroupMgr::parseRoleActions(const std::string& xml_filename)
 {
 	LLXMLNodePtr root;
 
@@ -1747,7 +1744,7 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
 		LLRoleAction* role_action_data = new LLRoleAction();
 		
 		// name=
-		LLString action_set_name;
+		std::string action_set_name;
 		if (action_set->getAttributeString("name", action_set_name))
 		{
 			lldebugs << "Loading action set " << action_set_name << llendl;
@@ -1761,13 +1758,13 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
 			continue;
 		}
 		// description=
-		LLString set_description;
+		std::string set_description;
 		if (action_set->getAttributeString("description", set_description))
 		{
 			role_action_data->mDescription = set_description;
 		}
 		// long description=
-		LLString set_longdescription;
+		std::string set_longdescription;
 		if (action_set->getAttributeString("longdescription", set_longdescription))
 		{
 			role_action_data->mLongDescription = set_longdescription;
@@ -1788,7 +1785,7 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
 			LLRoleAction* role_action = new LLRoleAction();
 
 			// name=
-			LLString action_name;
+			std::string action_name;
 			if (action->getAttributeString("name", action_name))
 			{
 				lldebugs << "Loading action " << action_name << llendl;
@@ -1801,13 +1798,13 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
 				continue;
 			}
 			// description=
-			LLString description;
+			std::string description;
 			if (action->getAttributeString("description", description))
 			{
 				role_action->mDescription = description;
 			}
 			// long description=
-			LLString longdescription;
+			std::string longdescription;
 			if (action->getAttributeString("longdescription", longdescription))
 			{
 				role_action->mLongDescription = longdescription;
diff --git a/linden/indra/newview/llgroupmgr.h b/linden/indra/newview/llgroupmgr.h
index 709bfd8..4950b66 100644
--- a/linden/indra/newview/llgroupmgr.h
+++ b/linden/indra/newview/llgroupmgr.h
@@ -343,7 +343,7 @@ public:
 	static void processEjectGroupMemberReply(LLMessageSystem* msg, void ** data);
 	static void processLeaveGroupReply(LLMessageSystem* msg, void ** data);
 
-	static bool parseRoleActions(const LLString& xml_filename);
+	static bool parseRoleActions(const std::string& xml_filename);
 
 	std::vector<LLRoleActionSet*> mRoleActionSets;
 
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index b8d38e4..3f8ff3d 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -61,35 +61,36 @@ S32 LLGroupNotifyBox::sGroupNotifyBoxCount = 0;
 // LLGroupNotifyBox
 //---------------------------------------------------------------------------
 
-char* g_formatted_time(const time_t& the_time, char* buffer)
+static std::string g_formatted_time(const time_t& the_time)
 {
+	char buffer[30];		/*Flawfinder: ignore*/	
 	time_t t = the_time;
 	if (!t) time(&t);
-	LLString::copy(buffer, ctime(&t), 30);
+	LLStringUtil::copy(buffer, ctime(&t), 30);
 	buffer[24] = '\0';
-	return buffer;
+	return std::string(buffer);
 }
 
 // static
-LLGroupNotifyBox* LLGroupNotifyBox::show(const char* subject,
-							 const char* message,
-							 const char* from_name,
-							 const LLUUID& group_id,
-							 const U32& t,
-							 const bool& has_inventory,
-							 const char* inventory_name,
-							 LLOfferInfo* inventory_offer)
+LLGroupNotifyBox* LLGroupNotifyBox::show(const std::string& subject,
+										 const std::string& message,
+										 const std::string& from_name,
+										 const LLUUID& group_id,
+										 const U32& t,
+										 const bool& has_inventory,
+										 const std::string& inventory_name,
+										 LLOfferInfo* inventory_offer)
 {
 	// Get the group data
 	LLGroupData group_data;
 	if (!gAgent.getGroupData(group_id,group_data))
 	{
-		llwarns << "Group notice for unkown group: " << group_id << llendl;
+		llwarns << "Group notice for unknown group: " << group_id << llendl;
 		return NULL;
 	}
 
 	LLGroupNotifyBox* self;
-	self = new LLGroupNotifyBox(subject, message, from_name, group_id, group_data.mInsigniaID, group_data.mName.c_str(),t,has_inventory,inventory_name,inventory_offer);
+	self = new LLGroupNotifyBox(subject, message, from_name, group_id, group_data.mInsigniaID, group_data.mName,t,has_inventory,inventory_name,inventory_offer);
 	gNotifyBoxView->addChild(self);
 
 	// TODO: play a sound
@@ -112,17 +113,17 @@ bool is_openable(LLAssetType::EType type)
 	}
 }
 
-LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
-							 const char* message,
-							 const char* from_name,
-							 const LLUUID& group_id,
-							 const LLUUID& group_insignia,
-							 const char* group_name,
-							 const U32& t,
-							 const bool& has_inventory,
-							 const char* inventory_name,
-							 LLOfferInfo* inventory_offer)
-:	LLPanel("groupnotify", LLGroupNotifyBox::getGroupNotifyRect(), BORDER_YES),
+LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
+								   const std::string& message,
+								   const std::string& from_name,
+								   const LLUUID& group_id,
+								   const LLUUID& group_insignia,
+								   const std::string& group_name,
+								   const U32& t,
+								   const bool& has_inventory,
+								   const std::string& inventory_name,
+								   LLOfferInfo* inventory_offer)
+:	LLPanel(std::string("groupnotify"), LLGroupNotifyBox::getGroupNotifyRect(), BORDER_YES),
 	mAnimating(TRUE),
 	mTimer(),
 	mGroupID(group_id),
@@ -133,8 +134,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 
 	time_t timestamp = (time_t)t;
 
-	char time_buf[30];		/*Flawfinder: ignore*/	
-	g_formatted_time(timestamp, time_buf);
+	std::string time_buf = g_formatted_time(timestamp);
 
 	setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
 	setBackgroundVisible(TRUE);
@@ -162,7 +162,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 	class NoticeText : public LLTextBox
 	{
 	public:
-		NoticeText(const LLString& name, const LLRect& rect, const LLString& text = LLString::null, const LLFontGL* font = NULL) 
+		NoticeText(const std::string& name, const LLRect& rect, const std::string& text = LLStringUtil::null, const LLFontGL* font = NULL) 
 			: LLTextBox(name, rect, text, font)
 		{
 			setHAlign(LLFontGL::RIGHT);
@@ -175,7 +175,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 
 
 	// Title
-	addChild(new NoticeText("title",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),"Group Notice",LLFontGL::sSansSerifHuge));
+	addChild(new NoticeText(std::string("title"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),std::string("Group Notice"),LLFontGL::sSansSerifHuge));
 
 	y -= llfloor(1.5f*LINE_HEIGHT);
 
@@ -184,7 +184,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 	std::stringstream from;
 	from << "Sent by " << from_name << ", " << group_name;
 
-	addChild(new NoticeText("group",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str().c_str(),LLFontGL::sSansSerif));
+	addChild(new NoticeText(std::string("group"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str(),LLFontGL::sSansSerif));
 	
 	y -= (LINE_HEIGHT + VPAD);
 	x = HPAD + HPAD;
@@ -192,15 +192,15 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 	// TODO: change this to be the group icon.
 	if (!group_insignia.isNull())
 	{
-		icon = new LLIconCtrl("icon",
+		icon = new LLIconCtrl(std::string("icon"),
 							  LLRect(x, y, x+ICON_WIDTH, y-ICON_WIDTH),
 							  group_insignia);
 	}
 	else
 	{
-		icon = new LLIconCtrl("icon",
+		icon = new LLIconCtrl(std::string("icon"),
 							  LLRect(x, y, x+ICON_WIDTH, y-ICON_WIDTH),
-							  "notify_box_icon.tga");
+							  std::string("notify_box_icon.tga"));
 	}
 
 	icon->setMouseOpaque(FALSE);
@@ -210,10 +210,10 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 	// If we have inventory with this message, leave room for the name.
 	S32 box_bottom = BTN_TOP + (mHasInventory ? (LINE_HEIGHT + 2*VPAD) : 0);
 
-	text = new LLViewerTextEditor("box",
+	text = new LLViewerTextEditor(std::string("box"),
 		LLRect(x, y, RIGHT, box_bottom),
 		DB_GROUP_NOTICE_MSG_STR_LEN,
-		"",
+		LLStringUtil::null,
 		LLFontGL::sSansSerif,
 		FALSE);
 
@@ -224,14 +224,14 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 	text->appendStyledText(time_buf,false,false,&datestyle);
 	// Sadly, our LLTextEditor can't handle both styled and unstyled text
 	// at the same time.  Hence this space must be styled. JC
-	text->appendColoredText(" ",false,false,LLColor4::grey4);
+	text->appendColoredText(std::string(" "),false,false,LLColor4::grey4);
 	text->appendColoredText(message,false,false,LLColor4::grey4);
 
 	LLColor4 semi_transparent(1.0f,1.0f,1.0f,0.8f);
 	text->setCursor(0,0);
 	text->setEnabled(FALSE);
 	text->setWordWrap(TRUE);
-	text->setTabStop(FALSE);
+	//text->setTabStop(FALSE); // was interfering with copy-and-paste
 	text->setTabsToNextField(TRUE);
 	text->setMouseOpaque(TRUE);
 	text->setBorderVisible(TRUE);
@@ -246,7 +246,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 
 	if (mHasInventory)
 	{
-			addChild(new NoticeText("subjecttitle",LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),"Attached: ",LLFontGL::sSansSerif));
+			addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::sSansSerif));
 
 			LLUIImagePtr item_icon = get_item_icon(mInventoryOffer->mType,
 													LLInventoryType::IT_TEXTURE,
@@ -257,7 +257,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 
 			std::stringstream ss;
 			ss << "        " << inventory_name;
-			LLTextBox *line = new LLTextBox("object_name",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),ss.str().c_str(),LLFontGL::sSansSerif);
+			LLTextBox *line = new LLTextBox(std::string("object_name"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),ss.str(),LLFontGL::sSansSerif);
 			line->setEnabled(FALSE);
 			line->setBorderVisible(TRUE);
 			line->setDisabledColor(LLColor4::blue4);
@@ -266,7 +266,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 			line->setBackgroundColor( semi_transparent );
 			addChild(line);
 
-			icon = new LLIconCtrl("icon",
+			icon = new LLIconCtrl(std::string("icon"),
 									LLRect(x, y, x+16, y-16),
 									item_icon->getName());
 			icon->setMouseOpaque(FALSE);
@@ -274,15 +274,15 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 	}
 
 	LLButton* btn;
-	btn = new LLButton("next",
+	btn = new LLButton(std::string("next"),
 				LLRect(getRect().getWidth()-26, BOTTOM_PAD + 20, getRect().getWidth()-2, BOTTOM_PAD),
-				"notify_next.png",
-				"notify_next.png",
-				"",
+				std::string("notify_next.png"),
+				std::string("notify_next.png"),
+				LLStringUtil::null,
 				onClickNext,
 				this,
 				LLFontGL::sSansSerif);
-	btn->setToolTip(LLString("Next")); // *TODO: Translate
+	btn->setToolTip(std::string("Next")); // *TODO: Translate
 	btn->setScaleImage(TRUE);
 	addChild(btn);
 	mNextBtn = btn;
@@ -297,7 +297,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 								btn_width,
 								BTN_HEIGHT);
 
-	btn = new LLButton("OK", btn_rect, "", onClickOk, this);
+	btn = new LLButton(std::string("OK"), btn_rect, LLStringUtil::null, onClickOk, this);
 	addChild(btn, -1);
 	setDefaultBtn(btn);
 
@@ -309,8 +309,8 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 								wide_btn_width,
 								BTN_HEIGHT);
 
-	btn = new LLButton("Group Notices", btn_rect, "", onClickGroupInfo, this);
-	btn->setToolTip(LLString("View past notices or opt-out of receiving these messages here.")); // TODO: Translate
+	btn = new LLButton(std::string("Group Notices"), btn_rect, LLStringUtil::null, onClickGroupInfo, this);
+	btn->setToolTip(std::string("View past notices or opt-out of receiving these messages here.")); // TODO: Translate
 	addChild(btn, -1);
 
 	if (mHasInventory && mInventoryOffer)
@@ -322,7 +322,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 									wide_btn_width,
 									BTN_HEIGHT);
 
-		LLString btn_lbl("");
+		std::string btn_lbl("");
 		if(is_openable(mInventoryOffer->mType))
 		{
 			btn_lbl = "Open Attachment";
@@ -331,7 +331,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 		{
 			btn_lbl = "Save Attachment";
 		}
-		mSaveInventoryBtn = new LLButton(btn_lbl, btn_rect, "", onClickSaveInventory, this);
+		mSaveInventoryBtn = new LLButton(btn_lbl, btn_rect, LLStringUtil::null, onClickSaveInventory, this);
 		mSaveInventoryBtn->setVisible(mHasInventory);
 		addChild(mSaveInventoryBtn);
 	}
diff --git a/linden/indra/newview/llgroupnotify.h b/linden/indra/newview/llgroupnotify.h
index 9bc58f9..7befdf4 100644
--- a/linden/indra/newview/llgroupnotify.h
+++ b/linden/indra/newview/llgroupnotify.h
@@ -46,30 +46,30 @@ class LLGroupNotifyBox
 :	public LLPanel
 {
 public:
-	static LLGroupNotifyBox* show(const char* subject,
-									const char* message,
-									const char* from_name,
-									const LLUUID& group_id,
-									const U32& time_stamp,
-									const bool& has_inventory = FALSE,
-									const char* inventory_name = NULL,
-									LLOfferInfo* inventory_offer = NULL);
+	static LLGroupNotifyBox* show(const std::string& subject,
+								  const std::string& message,
+								  const std::string& from_name,
+								  const LLUUID& group_id,
+								  const U32& time_stamp,
+								  const bool& has_inventory = FALSE,
+								  const std::string& inventory_name = std::string(),
+								  LLOfferInfo* inventory_offer = NULL);
 	void close();
 
 protected:
 	// Non-transient messages.  You can specify non-default button
 	// layouts (like one for script dialogs) by passing various
 	// numbers in for "layout".
-	LLGroupNotifyBox(const char* subject,
-						const char* message,
-						const char* from_name,
-						const LLUUID& group_id,
-						const LLUUID& group_insignia,
-						const char* group_name,
-						const U32& t,
-						const bool& has_inventory = FALSE,
-						const char* inventory_name = NULL,
-						LLOfferInfo* inventory_offer = NULL);
+	LLGroupNotifyBox(const std::string& subject,
+					 const std::string& message,
+					 const std::string& from_name,
+					 const LLUUID& group_id,
+					 const LLUUID& group_insignia,
+					 const std::string& group_name,
+					 const U32& t,
+					 const bool& has_inventory = FALSE,
+					 const std::string& inventory_name = std::string(),
+					 LLOfferInfo* inventory_offer = NULL);
 
 	/*virtual*/ ~LLGroupNotifyBox();
 
diff --git a/linden/indra/newview/llhippo.cpp b/linden/indra/newview/llhippo.cpp
deleted file mode 100644
index 27c27e8..0000000
--- a/linden/indra/newview/llhippo.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/** 
- * @file llhippo.cpp
- * @brief Create a bug for our users to find
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llhippo.h"
-
-#include "llchat.h"
-
-#include "llagent.h"
-#include "llviewerregion.h"
-#include "llfloaterchat.h"	// for add_chat
-
-void trigger_hippo_bug(void*)
-{
-	BOOL chat = FALSE;
-	LLViewerRegion* region = gAgent.getRegion();
-	const char* name = (region ? region->getName().c_str() : NULL);
-
-	if (name)
-	{
-		if (   name[0] == 'A'
-			|| name[0] == 'E'
-			|| name[0] == 'I'
-			|| name[0] == 'O'
-			|| name[0] == 'U')
-		{
-			chat = TRUE;
-		}
-		else if (ll_frand() > 0.5f)
-		{
-			chat = TRUE;
-		}
-	}
-
-	if (chat)
-	{
-		LLChat chat("hippos!");
-		chat.mFromName = "Ghostly Bug";
-		LLFloaterChat::addChat(chat);
-	}
-}
diff --git a/linden/indra/newview/llhippo.h b/linden/indra/newview/llhippo.h
deleted file mode 100644
index ba39595..0000000
--- a/linden/indra/newview/llhippo.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/** 
- * @file llhippo.h
- * @brief Implement a "bug" for our users to find.
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLHIPPO_H
-#define LL_LLHIPPO_H
-
-void trigger_hippo_bug(void*);
-
-#endif
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index c19b361..6d0dd72 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -136,7 +136,7 @@ void LLHoverView::updateHover(LLTool* current_tool)
 			}
 			else if (mStartHoverTimer.getElapsedTimeF32() > DELAY_BEFORE_SHOW_TIP)
 			{
-				gViewerWindow->hitObjectOrLandGlobalAsync(gViewerWindow->getCurrentMouseX(),
+				gViewerWindow->pickAsync(gViewerWindow->getCurrentMouseX(),
 													 gViewerWindow->getCurrentMouseY(), 0, pickCallback );
 			}
 		}
@@ -148,16 +148,16 @@ void LLHoverView::updateHover(LLTool* current_tool)
 
 }
 
-void LLHoverView::pickCallback(S32 x, S32 y, MASK mask)
+void LLHoverView::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj = pick_info.getObject();
 
 	if (hit_obj)
 	{
 		gHoverView->setHoverActive(TRUE);
 		LLSelectMgr::getInstance()->setHoverObject(hit_obj);
 		gHoverView->mLastHoverObject = hit_obj;
-		gHoverView->mHoverOffset = gViewerWindow->lastObjectHitOffset();
+		gHoverView->mHoverOffset = pick_info.mObjectOffset;
 	}
 	else
 	{
@@ -165,10 +165,10 @@ void LLHoverView::pickCallback(S32 x, S32 y, MASK mask)
 	}
 
 	// We didn't hit an object, but we did hit land.
-	if (!hit_obj && gLastHitPosGlobal != LLVector3d::zero)
+	if (!hit_obj && pick_info.mPosGlobal != LLVector3d::zero)
 	{
 		gHoverView->setHoverActive(TRUE);
-		gHoverView->mHoverLandGlobal = gLastHitPosGlobal;
+		gHoverView->mHoverLandGlobal = pick_info.mPosGlobal;
 		LLViewerParcelMgr::getInstance()->requestHoverParcelProperties( gHoverView->mHoverLandGlobal );
 	}
 	else
@@ -413,7 +413,7 @@ void LLHoverView::updateText()
 					}
 					else if (for_sale)
 					{
-						LLString::format_map_t args;
+						LLStringUtil::format_map_t args;
 						args["[AMOUNT]"] = llformat("%d", nodep->mSaleInfo.getSalePrice());
 						line.append(LLTrans::getString("TooltipForSaleL$", args));
 						suppressObjectHoverDisplay = FALSE;		//  Show tip
@@ -426,7 +426,7 @@ void LLHoverView::updateText()
 				}
 				else
 				{
-					LLString::format_map_t args;
+					LLStringUtil::format_map_t args;
 					args["[MESSAGE]"] = LLTrans::getString("RetrievingData");
 					line.append(LLTrans::getString("TooltipForSaleMsg", args));
 				}
@@ -588,7 +588,7 @@ void LLHoverView::updateText()
 		*/
 		if (hover_parcel && hover_parcel->getParcelFlag(PF_FOR_SALE))
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[AMOUNT]"] = llformat("%d", hover_parcel->getSalePrice());
 			line = LLTrans::getString("TooltipForSaleL$", args);
 			mText.push_back(line);
@@ -635,8 +635,7 @@ void LLHoverView::draw()
 			}
 			else
 			{
-				LLVector3 local_offset((F32)mHoverOffset.mdV[VX], (F32)mHoverOffset.mdV[VY], (F32)mHoverOffset.mdV[VZ]);
-				gAgent.setLookAt(LOOKAT_TARGET_HOVER, getLastHoverObject(), local_offset);
+				gAgent.setLookAt(LOOKAT_TARGET_HOVER, getLastHoverObject(), mHoverOffset);
 			}
 		}
 	}
diff --git a/linden/indra/newview/llhoverview.h b/linden/indra/newview/llhoverview.h
index 5d76cc7..ff39790 100644
--- a/linden/indra/newview/llhoverview.h
+++ b/linden/indra/newview/llhoverview.h
@@ -44,6 +44,7 @@
 #include "llviewerobject.h"
 
 class LLTool;
+class LLPickInfo;
 
 
 //
@@ -78,7 +79,7 @@ public:
 
 	LLViewerObject* getLastHoverObject() const;
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& info);
 
 protected:
 	void	updateText();
@@ -104,7 +105,7 @@ protected:
 
 	// If not LLVector3d::ZERO, we're over land.
 	LLVector3d					mHoverLandGlobal;
-	LLVector3d					mHoverOffset;
+	LLVector3					mHoverOffset;
 
 	BOOL		mTyping;
 
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 0829fb2..b5f6ec7 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -73,13 +73,16 @@ const F32 MAX_TIMEOUT = F32_MAX / 2.f;
 class LLAttention
 {
 public:
-	LLAttention(){}
-	LLAttention(F32 timeout, F32 priority, char *name, LLColor3 color) :
+	LLAttention()
+		: mTimeout(0.f),
+		  mPriority(0.f)
+	{}
+	LLAttention(F32 timeout, F32 priority, const std::string& name, LLColor3 color) :
 	  mTimeout(timeout), mPriority(priority), mName(name), mColor(color)
 	{
 	}
 	F32 mTimeout, mPriority;
-	LLString mName;
+	std::string mName;
 	LLColor3 mColor;
 };
 
@@ -147,7 +150,7 @@ static BOOL loadGender(LLXmlTreeNode* gender)
 	{
 		return FALSE;
 	}
-	LLString str;
+	std::string str;
 	gender->getAttributeString("name", str);
 	LLAttentionSet& attentions = (str.compare("Masculine") == 0) ? gBoyAttentions : gGirlAttentions;
 	for (LLXmlTreeNode* attention_node = gender->getChildByName( "param" );
@@ -186,9 +189,8 @@ static BOOL loadAttentions()
 	}
 	first_time = FALSE;
 	
-	char filename[MAX_PATH]; /*Flawfinder: ignore*/
-	strncpy(filename,gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"attentions.xml").c_str(), sizeof(filename) -1);		/*Flawfinder: ignore*/	
-        filename[sizeof(filename) -1] = '\0';
+	std::string filename;
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"attentions.xml");
 	LLXmlTree xml_tree;
 	BOOL success = xml_tree.parseFile( filename, FALSE );
 	if( !success )
@@ -210,7 +212,7 @@ static BOOL loadAttentions()
 		return FALSE;
 	}
 
-	LLString version;
+	std::string version;
 	static LLStdStringHandle version_string = LLXmlTree::addAttributeString("version");
 	if( !root->getFastAttributeString( version_string, version ) || (version != "1.0") )
 	{
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index 5b9872a..5521451 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -67,6 +67,8 @@ public:
 
 	U8 getType() const { return mType; }
 
+	LLVector3d getPositionGlobal() const { return mPositionGlobal; }
+
 	static LLHUDObject *addHUDObject(const U8 type);
 	static LLHUDEffect *addHUDEffect(const U8 type);
 	static void updateAll();
diff --git a/linden/indra/newview/llhudrender.cpp b/linden/indra/newview/llhudrender.cpp
index 556b6d6..e0d47f8 100644
--- a/linden/indra/newview/llhudrender.cpp
+++ b/linden/indra/newview/llhudrender.cpp
@@ -33,6 +33,7 @@
 
 #include "llhudrender.h"
 
+#include "llrender.h"
 #include "llgl.h"
 #include "llviewercamera.h"
 #include "v3math.h"
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp
index 26df22a..c45c284 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -1,3 +1,4 @@
+
 /** 
  * @file llhudtext.cpp
  * @brief LLHUDText class implementation
@@ -921,8 +922,7 @@ void LLHUDText::setLOD(S32 lod)
 {
 	mLOD = lod;
 	//RN: uncomment this to visualize LOD levels
-	//char label[255];
-	//sprintf(label, "%d", lod);
+	//std::string label = llformat("%d", lod);
 	//setLabel(label);
 }
 
@@ -961,6 +961,21 @@ void LLHUDText::renderAllHUD()
 	}
 }
 
+void LLHUDText::shiftAll(const LLVector3& offset)
+{
+	TextObjectIterator text_it;
+	for (text_it = sTextObjects.begin(); text_it != sTextObjects.end(); ++text_it)
+	{
+		LLHUDText *textp = text_it->get();
+		textp->shift(offset);
+	}
+}
+
+void LLHUDText::shift(const LLVector3& offset)
+{
+	mPositionAgent += offset;
+}
+
 //static 
 void LLHUDText::addPickable(std::set<LLViewerObject*> &pick_list)
 {
diff --git a/linden/indra/newview/llhudtext.h b/linden/indra/newview/llhudtext.h
index bd4da88..5719a19 100644
--- a/linden/indra/newview/llhudtext.h
+++ b/linden/indra/newview/llhudtext.h
@@ -121,6 +121,9 @@ public:
 	BOOL getHidden() const { return mHidden; }
 	void setHidden( BOOL hide ) { mHidden = hide; }
 	void setOnHUDAttachment(BOOL on_hud) { mOnHUDAttachment = on_hud; }
+	void shift(const LLVector3& offset);
+
+	static void shiftAll(const LLVector3& offset);
 	static void renderAllHUD();
 	static void addPickable(std::set<LLViewerObject*> &pick_list);
 	static void reshape();
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index ae8bd4b..c2b54f3 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -86,9 +86,9 @@ const U32 DEFAULT_RETRIES_COUNT = 3;
 // Statics
 //
 //
-static LLString sTitleString = "Instant Message with [NAME]";
-static LLString sTypingStartString = "[NAME]: ...";
-static LLString sSessionStartString = "Starting session with [NAME] please wait.";
+static std::string sTitleString = "Instant Message with [NAME]";
+static std::string sTypingStartString = "[NAME]: ...";
+static std::string sSessionStartString = "Starting session with [NAME] please wait.";
 
 LLVoiceChannel::voice_channel_map_t LLVoiceChannel::sVoiceChannelMap;
 LLVoiceChannel::voice_channel_map_uri_t LLVoiceChannel::sVoiceChannelURIMap;
@@ -121,7 +121,7 @@ void session_starter_helper(
 	gAgent.buildFullname(name);
 
 	msg->addStringFast(_PREHASH_FromAgentName, name);
-	msg->addStringFast(_PREHASH_Message, LLString::null);
+	msg->addStringFast(_PREHASH_Message, LLStringUtil::null);
 	msg->addU32Fast(_PREHASH_ParentEstateID, 0);
 	msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
 	msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
@@ -342,7 +342,7 @@ void LLVoiceCallCapResponder::result(const LLSD& content)
 //
 // LLVoiceChannel
 //
-LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const LLString& session_name) : 
+LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& session_name) : 
 	mSessionID(session_id), 
 	mState(STATE_NO_CHANNEL_INFO), 
 	mSessionName(session_name),
@@ -373,8 +373,8 @@ LLVoiceChannel::~LLVoiceChannel()
 }
 
 void LLVoiceChannel::setChannelInfo(
-	const LLString& uri,
-	const LLString& credentials)
+	const std::string& uri,
+	const std::string& credentials)
 {
 	setURI(uri);
 
@@ -563,7 +563,7 @@ LLVoiceChannel* LLVoiceChannel::getChannelByID(const LLUUID& session_id)
 }
 
 //static 
-LLVoiceChannel* LLVoiceChannel::getChannelByURI(LLString uri)
+LLVoiceChannel* LLVoiceChannel::getChannelByURI(std::string uri)
 {
 	voice_channel_map_uri_t::iterator found_it = sVoiceChannelURIMap.find(uri);
 	if (found_it == sVoiceChannelURIMap.end())
@@ -584,7 +584,7 @@ void LLVoiceChannel::updateSessionID(const LLUUID& new_session_id)
 	sVoiceChannelMap.insert(std::make_pair(mSessionID, this));
 }
 
-void LLVoiceChannel::setURI(LLString uri)
+void LLVoiceChannel::setURI(std::string uri)
 {
 	sVoiceChannelURIMap.erase(mURI);
 	mURI = uri;
@@ -654,7 +654,7 @@ void LLVoiceChannel::resume()
 // LLVoiceChannelGroup
 //
 
-LLVoiceChannelGroup::LLVoiceChannelGroup(const LLUUID& session_id, const LLString& session_name) : 
+LLVoiceChannelGroup::LLVoiceChannelGroup(const LLUUID& session_id, const std::string& session_name) : 
 	LLVoiceChannel(session_id, session_name)
 {
 	mRetries = DEFAULT_RETRIES_COUNT;
@@ -701,8 +701,8 @@ void LLVoiceChannelGroup::getChannelInfo()
 }
 
 void LLVoiceChannelGroup::setChannelInfo(
-	const LLString& uri,
-	const LLString& credentials)
+	const std::string& uri,
+	const std::string& credentials)
 {
 	setURI(uri);
 
@@ -795,7 +795,7 @@ void LLVoiceChannelGroup::handleError(EStatusType status)
 	{
 		LLNotifyBox::showXml(notify, mNotifyArgs);
 		// echo to im window
-		gIMMgr->addMessage(mSessionID, LLUUID::null, SYSTEM_FROM, LLNotifyBox::getTemplateMessage(notify, mNotifyArgs).c_str());
+		gIMMgr->addMessage(mSessionID, LLUUID::null, SYSTEM_FROM, LLNotifyBox::getTemplateMessage(notify, mNotifyArgs));
 	}
 
 	LLVoiceChannel::handleError(status);
@@ -822,7 +822,7 @@ void LLVoiceChannelGroup::setState(EState state)
 // LLVoiceChannelProximal
 //
 LLVoiceChannelProximal::LLVoiceChannelProximal() : 
-	LLVoiceChannel(LLUUID::null, LLString::null)
+	LLVoiceChannel(LLUUID::null, LLStringUtil::null)
 {
 	activate();
 }
@@ -914,7 +914,7 @@ void LLVoiceChannelProximal::deactivate()
 //
 // LLVoiceChannelP2P
 //
-LLVoiceChannelP2P::LLVoiceChannelP2P(const LLUUID& session_id, const LLString& session_name, const LLUUID& other_user_id) : 
+LLVoiceChannelP2P::LLVoiceChannelP2P(const LLUUID& session_id, const std::string& session_name, const LLUUID& other_user_id) : 
 		LLVoiceChannelGroup(session_id, session_name), 
 		mOtherUserID(other_user_id),
 		mReceivedCall(FALSE)
@@ -1000,7 +1000,7 @@ void LLVoiceChannelP2P::getChannelInfo()
 }
 
 // receiving session from other user who initiated call
-void LLVoiceChannelP2P::setSessionHandle(const LLString& handle)
+void LLVoiceChannelP2P::setSessionHandle(const std::string& handle)
 { 
 	BOOL needs_activate = FALSE;
 	if (callStarted())
@@ -1109,11 +1109,11 @@ LLFloaterIMPanel::LLFloaterIMPanel(
 }
 
 
-void LLFloaterIMPanel::init(const LLString& session_label)
+void LLFloaterIMPanel::init(const std::string& session_label)
 {
 	mSessionLabel = session_label;
 
-	LLString xml_filename;
+	std::string xml_filename;
 	switch(mDialog)
 	{
 	case IM_SESSION_GROUP_START:
@@ -1238,6 +1238,7 @@ BOOL LLFloaterIMPanel::postBuild()
 		mInputEditor->setCallbackUserData(this);
 		mInputEditor->setCommitOnFocusLost( FALSE );
 		mInputEditor->setRevertOnEsc( FALSE );
+		mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
 
 		childSetAction("profile_callee_btn", onClickProfile, this);
 		childSetAction("group_info_btn", onClickGroupInfo, this);
@@ -1460,7 +1461,7 @@ BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
 	return TRUE;
 }
 
-void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4& color, bool log_to_file, const LLUUID& source, const char *name)
+void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4& color, bool log_to_file, const LLUUID& source, const std::string& name)
 {
 	// start tab flashing when receiving im for background session from user
 	if (source != LLUUID::null)
@@ -1480,7 +1481,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 	removeTypingIndicator(NULL);
 
 	// Actually add the line
-	LLString timestring;
+	std::string timestring;
 	bool prepend_newline = true;
 	if (gSavedSettings.getBOOL("IMShowTimestamps"))
 	{
@@ -1489,10 +1490,10 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 	}
 
 	// 'name' is a sender name that we want to hotlink so that clicking on it opens a profile.
-	if (name != NULL) // If name exists, then add it to the front of the message.
+	if (!name.empty()) // If name exists, then add it to the front of the message.
 	{
 		// Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text.
-		if (!strcmp(name,SYSTEM_FROM))
+		if (name == SYSTEM_FROM)
 		{
 			mHistoryEditor->appendColoredText(name,false,prepend_newline,color);
 		}
@@ -1509,11 +1510,11 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
 	if (log_to_file
 		&& gSavedPerAccountSettings.getBOOL("LogInstantMessages") ) 
 	{
-		LLString histstr;
+		std::string histstr;
 		if (gSavedPerAccountSettings.getBOOL("IMLogTimestamp"))
-			histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + LLString(name) + utf8msg;
+			histstr = LLLogChat::timestamp(gSavedPerAccountSettings.getBOOL("LogTimestampDate")) + name + utf8msg;
 		else
-			histstr = LLString(name) + utf8msg;
+			histstr = name + utf8msg;
 
 		LLLogChat::saveHistory(getTitle(),histstr);
 	}
@@ -1603,17 +1604,54 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 								  EDragAndDropType cargo_type,
 								  void* cargo_data,
 								  EAcceptance* accept,
-								  LLString& tooltip_msg)
+								  std::string& tooltip_msg)
 {
 	BOOL accepted = FALSE;
 	switch(cargo_type)
 	{
-	case DAD_CALLINGCARD:
-		accepted = dropCallingCard((LLInventoryItem*)cargo_data, drop);
-		break;
-	case DAD_CATEGORY:
-		accepted = dropCategory((LLInventoryCategory*)cargo_data, drop);
-		break;
+		case DAD_CALLINGCARD:
+		{
+			accepted = dropCallingCard((LLInventoryItem*)cargo_data, drop);
+			break;
+		}
+		case DAD_CATEGORY:
+		{
+			accepted = dropCategory((LLInventoryCategory*)cargo_data, drop);
+			break;
+		}
+
+		// See stdenums.h
+		case DAD_TEXTURE:
+		case DAD_SOUND:
+		// DAD_CALLINGCARD above
+		case DAD_LANDMARK:
+		case DAD_SCRIPT:
+		case DAD_CLOTHING:
+		case DAD_OBJECT:
+		case DAD_NOTECARD:
+		// DAD_CATEGORY above
+		case DAD_BODYPART:
+		case DAD_ANIMATION:
+		case DAD_GESTURE:
+		{
+			if (mDialog == IM_NOTHING_SPECIAL)
+			{
+				// See LLDropTarget for similar code.
+				LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
+				if(gInventory.getItem(inv_item->getUUID())
+				   && LLToolDragAndDrop::isInventoryGiveAcceptable(inv_item))
+				{
+					accepted = true;
+					if(drop)
+					{
+						LLToolDragAndDrop::giveInventory(mOtherParticipantUUID, inv_item);
+						LLStringUtil::format_map_t args;
+						gIMMgr->addSystemMessage(mSessionUUID, "inventory_item_offered", args);
+					}
+				}
+			}
+			break;
+		}
 	default:
 		break;
 	}
@@ -1782,7 +1820,7 @@ void LLFloaterIMPanel::onInputEditorFocusLost(LLFocusableElement* caller, void*
 void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller, void* userdata)
 {
 	LLFloaterIMPanel* self = (LLFloaterIMPanel*)userdata;
-	LLString text = self->mInputEditor->getText();
+	std::string text = self->mInputEditor->getText();
 	if (!text.empty())
 	{
 		self->setTyping(TRUE);
@@ -1808,8 +1846,8 @@ void LLFloaterIMPanel::onClose(bool app_quitting)
 			FALSE,
 			gAgent.getSessionID(),
 			mOtherParticipantUUID,
-			name.c_str(), 
-			"",
+			name, 
+			LLStringUtil::null,
 			IM_ONLINE,
 			IM_SESSION_LEAVE,
 			mSessionUUID);
@@ -1855,8 +1893,8 @@ void deliver_message(const std::string& utf8_text,
 		FALSE,
 		gAgent.getSessionID(),
 		other_participant_id,
-		name.c_str(),
-		utf8_text.c_str(),
+		name,
+		utf8_text,
 		offline,
 		(EInstantMessage)new_dialog,
 		im_session_id);
@@ -1888,8 +1926,6 @@ void deliver_message(const std::string& utf8_text,
 
 void LLFloaterIMPanel::sendMsg()
 {
-	LLWString text = mInputEditor->getWText();
-	LLWString::trim(text);
 	if (!gAgent.isGodlike() 
 		&& (mDialog == IM_NOTHING_SPECIAL)
 		&& mOtherParticipantUUID.isNull())
@@ -1897,64 +1933,65 @@ void LLFloaterIMPanel::sendMsg()
 		llinfos << "Cannot send IM to everyone unless you're a god." << llendl;
 		return;
 	}
-	if(text.length() > 0)
-	{
-		// Truncate and convert to UTF8 for transport
-		std::string utf8_text = wstring_to_utf8str(text);
-		utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1);
 
-		if ( mSessionInitialized )
+	if (mInputEditor)
+	{
+		LLWString text = mInputEditor->getConvertedText();
+		if(!text.empty())
 		{
-			deliver_message(utf8_text,
-							mSessionUUID,
-							mOtherParticipantUUID,
-							mDialog);
-
-			// local echo
-			if((mDialog == IM_NOTHING_SPECIAL) && 
-			   (mOtherParticipantUUID.notNull()))
+			// Truncate and convert to UTF8 for transport
+			std::string utf8_text = wstring_to_utf8str(text);
+			utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1);
+			
+			if ( mSessionInitialized )
 			{
-				std::string history_echo;
-				gAgent.buildFullname(history_echo);
-
-				// Look for IRC-style emotes here.
-				char tmpstr[5];		/* Flawfinder: ignore */
-				strncpy(tmpstr,
-						utf8_text.substr(0,4).c_str(),
-						sizeof(tmpstr) -1);		/* Flawfinder: ignore */
-				tmpstr[sizeof(tmpstr) -1] = '\0';
-				if (!strncmp(tmpstr, "/me ", 4) || 
-					!strncmp(tmpstr, "/me'", 4))
+				deliver_message(utf8_text,
+								mSessionUUID,
+								mOtherParticipantUUID,
+								mDialog);
+
+				// local echo
+				if((mDialog == IM_NOTHING_SPECIAL) && 
+				   (mOtherParticipantUUID.notNull()))
 				{
-					utf8_text.replace(0,3,"");
-				}
-				else
-				{
-					history_echo += ": ";
-				}
-				history_echo += utf8_text;
-
-				BOOL other_was_typing = mOtherTyping;
+					std::string history_echo;
+					gAgent.buildFullname(history_echo);
+
+					// Look for IRC-style emotes here.
+					std::string prefix = utf8_text.substr(0, 4);
+					if (prefix == "/me " || prefix == "/me'")
+					{
+						utf8_text.replace(0,3,"");
+					}
+					else
+					{
+						history_echo += ": ";
+					}
+					history_echo += utf8_text;
+
+					BOOL other_was_typing = mOtherTyping;
+
+					addHistoryLine(history_echo, gSavedSettings.getColor("IMChatColor"), true, gAgent.getID());
+
+					if (other_was_typing) 
+					{
+						addTypingIndicator(mOtherTypingName);
+					}
 
-				addHistoryLine(history_echo, gSavedSettings.getColor("IMChatColor"), true, gAgent.getID());
-
-				if (other_was_typing) 
-				{
-					addTypingIndicator(mOtherTypingName);
 				}
-
 			}
-		}
-		else
-		{
-			//queue up the message to send once the session is
-			//initialized
-			mQueuedMsgsForInit.append(utf8_text);
+			else
+			{
+				//queue up the message to send once the session is
+				//initialized
+				mQueuedMsgsForInit.append(utf8_text);
+			}
 		}
 
 		LLViewerStats::getInstance()->incStat(LLViewerStats::ST_IM_COUNT);
+
 	}
-	mInputEditor->setText(LLString::null);
+	mInputEditor->setText(LLStringUtil::null);
 
 	// Don't need to actually send the typing stop message, the other
 	// client will infer it from receiving the message.
@@ -1977,7 +2014,7 @@ void LLFloaterIMPanel::processSessionUpdate(const LLSD& session_update)
 
 		if (voice_moderated)
 		{
-			setTitle(mSessionLabel + LLString(" ") + getString("moderated_chat_label"));
+			setTitle(mSessionLabel + std::string(" ") + getString("moderated_chat_label"));
 		}
 		else
 		{
@@ -2074,8 +2111,8 @@ void LLFloaterIMPanel::sendTypingState(BOOL typing)
 		FALSE,
 		gAgent.getSessionID(),
 		mOtherParticipantUUID,
-		name.c_str(),
-		"typing",
+		name,
+		std::string("typing"),
 		IM_ONLINE,
 		(typing ? IM_TYPING_START : IM_TYPING_STOP),
 		mSessionUUID);
@@ -2132,7 +2169,7 @@ void LLFloaterIMPanel::removeTypingIndicator(const LLIMInfo* im_info)
 }
 
 //static
-void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, LLString line, void* userdata)
+void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata)
 {
 	LLFloaterIMPanel* self = (LLFloaterIMPanel*)userdata;
 	LLUIString message = line;
@@ -2141,11 +2178,17 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, LLString li
 	{
 	case LLLogChat::LOG_EMPTY:
 		// add warning log enabled message
-		message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
+		if (gSavedPerAccountSettings.getBOOL("LogInstantMessages"))
+		{
+			message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
+		}
 		break;
 	case LLLogChat::LOG_END:
 		// add log end message
-		message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
+		if (gSavedPerAccountSettings.getBOOL("LogInstantMessages"))
+		{
+			message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
+		}
 		break;
 	case LLLogChat::LOG_LINE:
 		// just add normal lines from file
@@ -2172,7 +2215,7 @@ void LLFloaterIMPanel::showSessionStartError(
 	//their own XML file which would be read in by any LLIMPanel
 	//post build function instead of repeating the same info
 	//in the group, adhoc and normal IM xml files.
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[REASON]"] =
 		LLFloaterIM::sErrorStringsMap[error_string];
 	args["[RECIPIENT]"] = getTitle();
@@ -2188,7 +2231,7 @@ void LLFloaterIMPanel::showSessionEventError(
 	const std::string& event_string,
 	const std::string& error_string)
 {
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[REASON]"] =
 		LLFloaterIM::sErrorStringsMap[error_string];
 	args["[EVENT]"] =
@@ -2203,7 +2246,7 @@ void LLFloaterIMPanel::showSessionEventError(
 void LLFloaterIMPanel::showSessionForceClose(
 	const std::string& reason_string)
 {
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 
 	args["[NAME]"] = getTitle();
 	args["[REASON]"] = LLFloaterIM::sForceCloseSessionMap[reason_string];
@@ -2212,7 +2255,7 @@ void LLFloaterIMPanel::showSessionForceClose(
 		"ForceCloseChatterBoxSession",
 		args,
 		LLFloaterIMPanel::onConfirmForceCloseError,
-		this);
+		new LLUUID(mSessionUUID));
 
 }
 
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 2ed866b..974fc4d 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -61,7 +61,7 @@ public:
 		STATE_CONNECTED
 	} EState;
 
-	LLVoiceChannel(const LLUUID& session_id, const LLString& session_name);
+	LLVoiceChannel(const LLUUID& session_id, const std::string& session_name);
 	virtual ~LLVoiceChannel();
 
 	/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal);
@@ -71,8 +71,8 @@ public:
 	virtual void deactivate();
 	virtual void activate();
 	virtual void setChannelInfo(
-		const LLString& uri,
-		const LLString& credentials);
+		const std::string& uri,
+		const std::string& credentials);
 	virtual void getChannelInfo();
 	virtual BOOL isActive();
 	virtual BOOL callStarted();
@@ -81,10 +81,10 @@ public:
 	EState getState() { return mState; }
 
 	void updateSessionID(const LLUUID& new_session_id);
-	const LLString::format_map_t& getNotifyArgs() { return mNotifyArgs; }
+	const LLStringUtil::format_map_t& getNotifyArgs() { return mNotifyArgs; }
 
 	static LLVoiceChannel* getChannelByID(const LLUUID& session_id);
-	static LLVoiceChannel* getChannelByURI(LLString uri);
+	static LLVoiceChannel* getChannelByURI(std::string uri);
 	static LLVoiceChannel* getCurrentVoiceChannel() { return sCurrentVoiceChannel; }
 	static void initClass();
 	
@@ -93,21 +93,21 @@ public:
 
 protected:
 	virtual void setState(EState state);
-	void setURI(LLString uri);
+	void setURI(std::string uri);
 
-	LLString	mURI;
-	LLString	mCredentials;
+	std::string	mURI;
+	std::string	mCredentials;
 	LLUUID		mSessionID;
 	EState		mState;
-	LLString	mSessionName;
-	LLString::format_map_t mNotifyArgs;
+	std::string	mSessionName;
+	LLStringUtil::format_map_t mNotifyArgs;
 	BOOL		mIgnoreNextSessionLeave;
 	LLHandle<LLPanel> mLoginNotificationHandle;
 
 	typedef std::map<LLUUID, LLVoiceChannel*> voice_channel_map_t;
 	static voice_channel_map_t sVoiceChannelMap;
 
-	typedef std::map<LLString, LLVoiceChannel*> voice_channel_map_uri_t;
+	typedef std::map<std::string, LLVoiceChannel*> voice_channel_map_uri_t;
 	static voice_channel_map_uri_t sVoiceChannelURIMap;
 
 	static LLVoiceChannel* sCurrentVoiceChannel;
@@ -118,15 +118,15 @@ protected:
 class LLVoiceChannelGroup : public LLVoiceChannel
 {
 public:
-	LLVoiceChannelGroup(const LLUUID& session_id, const LLString& session_name);
+	LLVoiceChannelGroup(const LLUUID& session_id, const std::string& session_name);
 
 	/*virtual*/ void handleStatusChange(EStatusType status);
 	/*virtual*/ void handleError(EStatusType status);
 	/*virtual*/ void activate();
 	/*virtual*/ void deactivate();
 	/*vritual*/ void setChannelInfo(
-		const LLString& uri,
-		const LLString& credentials);
+		const std::string& uri,
+		const std::string& credentials);
 	/*virtual*/ void getChannelInfo();
 
 protected:
@@ -154,20 +154,20 @@ public:
 class LLVoiceChannelP2P : public LLVoiceChannelGroup
 {
 public:
-	LLVoiceChannelP2P(const LLUUID& session_id, const LLString& session_name, const LLUUID& other_user_id);
+	LLVoiceChannelP2P(const LLUUID& session_id, const std::string& session_name, const LLUUID& other_user_id);
 
 	/*virtual*/ void handleStatusChange(EStatusType status);
 	/*virtual*/ void handleError(EStatusType status);
     /*virtual*/ void activate();
 	/*virtual*/ void getChannelInfo();
 
-	void setSessionHandle(const LLString& handle);
+	void setSessionHandle(const std::string& handle);
 
 protected:
 	virtual void setState(EState state);
 
 private:
-	LLString	mSessionHandle;
+	std::string	mSessionHandle;
 	LLUUID		mOtherUserID;
 	BOOL		mReceivedCall;
 };
@@ -207,7 +207,7 @@ public:
 						const LLColor4& color = LLColor4::white, 
 						bool log_to_file = true,
 						const LLUUID& source = LLUUID::null,
-						const char *name = NULL);
+						const std::string& name = LLStringUtil::null);
 
 	void setInputFocus( BOOL b );
 
@@ -221,7 +221,7 @@ public:
 	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
 						   BOOL drop, EDragAndDropType cargo_type,
 						   void *cargo_data, EAcceptance *accept,
-						   LLString& tooltip_msg);
+						   std::string& tooltip_msg);
 
 	static void		onInputEditorFocusReceived( LLFocusableElement* caller, void* userdata );
 	static void		onInputEditorFocusLost(LLFocusableElement* caller, void* userdata);
@@ -257,7 +257,7 @@ public:
 
 	// Handle other participant in the session typing.
 	void processIMTyping(const LLIMInfo* im_info, BOOL typing);
-	static void chatFromLogFile(LLLogChat::ELogLineType type, LLString line, void* userdata);
+	static void chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata);
 
 	//show error statuses to the user
 	void showSessionStartError(const std::string& error_string);
@@ -270,7 +270,7 @@ public:
 
 private:
 	// called by constructors
-	void init(const LLString& session_label);
+	void init(const std::string& session_label);
 
 	// Called by UI methods.
 	void sendMsg();
@@ -307,7 +307,7 @@ private:
 	//   911 ==> Gaurdian_Angel_Group_ID ^ gAgent.getID()
 	LLUUID mSessionUUID;
 
-	LLString mSessionLabel;
+	std::string mSessionLabel;
 	LLVoiceChannel*	mVoiceChannel;
 
 	BOOL mSessionInitialized;
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index e6169d5..309e479 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -78,14 +78,14 @@ LLIMMgr* gIMMgr = NULL;
 // Statics
 //
 // *FIXME: make these all either UIStrings or Strings
-static LLString sOnlyUserMessage;
+static std::string sOnlyUserMessage;
 static LLUIString sOfflineMessage;
-static LLString sMutedMessage;
+static std::string sMutedMessage;
 static LLUIString sInviteMessage;
 
-std::map<std::string,LLString> LLFloaterIM::sEventStringsMap;
-std::map<std::string,LLString> LLFloaterIM::sErrorStringsMap;
-std::map<std::string,LLString> LLFloaterIM::sForceCloseSessionMap;
+std::map<std::string,std::string> LLFloaterIM::sEventStringsMap;
+std::map<std::string,std::string> LLFloaterIM::sErrorStringsMap;
+std::map<std::string,std::string> LLFloaterIM::sForceCloseSessionMap;
 
 //
 // Helper Functions
@@ -94,7 +94,7 @@ std::map<std::string,LLString> LLFloaterIM::sForceCloseSessionMap;
 // returns true if a should appear before b
 //static BOOL group_dictionary_sort( LLGroupData* a, LLGroupData* b )
 //{
-//	return (LLString::compareDict( a->mName, b->mName ) < 0);
+//	return (LLStringUtil::compareDict( a->mName, b->mName ) < 0);
 //}
 
 
@@ -267,13 +267,13 @@ class LLIMMgr::LLIMSessionInvite
 public:
 	LLIMSessionInvite(
 		const LLUUID& session_id,
-		const LLString& session_name,
+		const std::string& session_name,
 		const LLUUID& caller_id,
-		const LLString& caller_name,
+		const std::string& caller_name,
 		EInstantMessage type,
 		EInvitationType inv_type,
-		const LLString& session_handle,
-		const LLString& notify_box) : 
+		const std::string& session_handle,
+		const std::string& notify_box) : 
 		mSessionID(session_id),
 		mSessionName(session_name),
 		mCallerID(caller_id),
@@ -285,13 +285,13 @@ public:
 	{};
 
 	LLUUID		mSessionID;
-	LLString	mSessionName;
+	std::string	mSessionName;
 	LLUUID		mCallerID;
-	LLString	mCallerName;
+	std::string	mCallerName;
 	EInstantMessage mType;
 	EInvitationType mInvType;
-	LLString	mSessionHandle;
-	LLString	mNotifyBox;
+	std::string	mSessionHandle;
+	std::string	mNotifyBox;
 };
 
 
@@ -394,9 +394,9 @@ LLIMMgr::~LLIMMgr()
 void LLIMMgr::addMessage(
 	const LLUUID& session_id,
 	const LLUUID& target_id,
-	const char* from,
-	const char* msg,
-	const char* session_name,
+	const std::string& from,
+	const std::string& msg,
+	const std::string& session_name,
 	EInstantMessage dialog,
 	U32 parent_estate_id,
 	const LLUUID& region_id,
@@ -441,8 +441,8 @@ void LLIMMgr::addMessage(
 	// create IM window as necessary
 	if(!floater)
 	{
-		const char* name = from;
-		if(session_name && (strlen(session_name)>1))
+		std::string name = from;
+		if(!session_name.empty() && session_name.size()>1)
 		{
 			name = session_name;
 		}
@@ -480,7 +480,7 @@ void LLIMMgr::addMessage(
 	}
 
 	// now add message to floater
-	bool is_from_system = target_id.isNull() || !strcmp(from, SYSTEM_FROM);
+	bool is_from_system = target_id.isNull() || (from == SYSTEM_FROM);
 	const LLColor4& color = ( is_from_system ? 
 							  gSavedSettings.getColor4("SystemChatColor") : 
 							  gSavedSettings.getColor("IMChatColor"));
@@ -516,7 +516,7 @@ void LLIMMgr::addMessage(
 	}
 }
 
-void LLIMMgr::addSystemMessage(const LLUUID& session_id, const LLString& message_name, const LLString::format_map_t& args)
+void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLStringUtil::format_map_t& args)
 {
 	LLUIString message;
 	
@@ -540,7 +540,7 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const LLString& message
 			message = floaterp->getUIString(message_name);
 			message.setArgList(args);
 
-			gIMMgr->addMessage(session_id, LLUUID::null, SYSTEM_FROM, message.getString().c_str());
+			gIMMgr->addMessage(session_id, LLUUID::null, SYSTEM_FROM, message.getString());
 		}
 	}
 }
@@ -574,7 +574,7 @@ BOOL LLIMMgr::isIMSessionOpen(const LLUUID& uuid)
 
 LLUUID LLIMMgr::addP2PSession(const std::string& name,
 							const LLUUID& other_participant_id,
-							const LLString& voice_session_handle)
+							const std::string& voice_session_handle)
 {
 	LLUUID session_id = addSession(name, IM_NOTHING_SPECIAL, other_participant_id);
 
@@ -700,12 +700,12 @@ void LLIMMgr::removeSession(const LLUUID& session_id)
 
 void LLIMMgr::inviteToSession(
 	const LLUUID& session_id, 
-	const LLString& session_name, 
+	const std::string& session_name, 
 	const LLUUID& caller_id, 
-	const LLString& caller_name,
+	const std::string& caller_name,
 	EInstantMessage type,
 	EInvitationType inv_type,
-	const LLString& session_handle)
+	const std::string& session_handle)
 {
 	//ignore invites from muted residents
 	if (LLMuteList::getInstance()->isMuted(caller_id))
@@ -713,7 +713,7 @@ void LLIMMgr::inviteToSession(
 		return;
 	}
 
-	LLString notify_box_type;
+	std::string notify_box_type;
 
 	BOOL ad_hoc_invite = FALSE;
 	if(type == IM_SESSION_P2P_INVITE)
@@ -777,11 +777,11 @@ void LLIMMgr::inviteToSession(
 	{
 		if (caller_name.empty())
 		{
-			gCacheName->getName(caller_id, onInviteNameLookup, invite);
+			gCacheName->get(caller_id, FALSE, onInviteNameLookup, invite);
 		}
 		else
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[NAME]"] = caller_name;
 			args["[GROUP]"] = session_name;
 
@@ -800,14 +800,14 @@ void LLIMMgr::inviteToSession(
 }
 
 //static 
-void LLIMMgr::onInviteNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* userdata)
+void LLIMMgr::onInviteNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* userdata)
 {
 	LLIMSessionInvite* invite = (LLIMSessionInvite*)userdata;
 
-	invite->mCallerName = llformat("%s %s", first, last);
+	invite->mCallerName = first + " " + last;
 	invite->mSessionName = invite->mCallerName;
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[NAME]"] = invite->mCallerName;
 
 	LLNotifyBox::showXml(
@@ -1421,7 +1421,7 @@ public:
 					  const LLSD& input) const
 	{
 		LLUUID session_id;
-		LLString reason;
+		std::string reason;
 
 		session_id = input["body"]["session_id"].asUUID();
 		reason = input["body"]["reason"].asString();
@@ -1503,7 +1503,6 @@ public:
 			{
 				return;
 			}
-			char buffer[DB_IM_MSG_BUF_SIZE * 2];  /* Flawfinder: ignore */
 			LLChat chat;
 
 			std::string message = message_params["message"].asString();
@@ -1519,19 +1518,18 @@ public:
 			BOOL is_busy = gAgent.getBusy();
 			BOOL is_muted = LLMuteList::getInstance()->isMuted(
 				from_id,
-				name.c_str(),
+				name,
 				LLMute::flagTextChat);
 
-			BOOL is_linden = LLMuteList::getInstance()->isLinden(
-				name.c_str());
-			char separator_string[3]=": ";		/* Flawfinder: ignore */
+			BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
+			std::string separator_string(": ");
 			int message_offset=0;
 
 			//Handle IRC styled /me messages.
-			if (!strncmp(message.c_str(), "/me ", 4) ||
-				!strncmp(message.c_str(), "/me'", 4))
+			std::string prefix = message.substr(0, 4);
+			if (prefix == "/me " || prefix == "/me'")
 			{
-				strcpy(separator_string,"");	   /* Flawfinder: ignore */
+				separator_string = "";
 				message_offset = 3;
 			}
 			
@@ -1545,23 +1543,12 @@ public:
 			}
 
 			// standard message, not from system
-			char saved[MAX_STRING];		/* Flawfinder: ignore */
-			saved[0] = '\0';
+			std::string saved;
 			if(offline == IM_OFFLINE)
 			{
-				char time_buf[TIME_STR_LENGTH]; /* Flawfinder: ignore */
-				snprintf(saved,		/* Flawfinder: ignore */
-						 MAX_STRING, 
-						 "(Saved %s) ", 
-						 formatted_time(timestamp, time_buf));
+				saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
 			}
-			snprintf(
-				buffer,
-				sizeof(buffer),
-				"%s%s%s",
-				separator_string,
-				saved,
-				(message.c_str() + message_offset)); /*Flawfinder: ignore*/
+			std::string buffer = separator_string + saved + message.substr(message_offset);
 
 			BOOL is_this_agent = FALSE;
 			if(from_id == gAgentID)
@@ -1571,24 +1558,16 @@ public:
 			gIMMgr->addMessage(
 				session_id,
 				from_id,
-				name.c_str(),
+				name,
 				buffer,
-				(char*)&bin_bucket[0],
+				std::string((char*)&bin_bucket[0]),
 				IM_SESSION_INVITE,
 				message_params["parent_estate_id"].asInteger(),
 				message_params["region_id"].asUUID(),
 				ll_vector3_from_sd(message_params["position"]),
 				true);
 
-			snprintf(
-				buffer,
-				sizeof(buffer),
-				"IM: %s%s%s%s",
-				name.c_str(),
-				separator_string,
-				saved,
-				(message.c_str()+message_offset)); /* Flawfinder: ignore */
-			chat.mText = buffer;
+			chat.mText = std::string("IM: ") + name + separator_string + saved + message.substr(message_offset);
 			LLFloaterChat::addChat(chat, TRUE, is_this_agent);
 
 			//K now we want to accept the invitation
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index b2621e8..9046a2e 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -59,16 +59,16 @@ public:
 	// or agent id.
 	void addMessage(const LLUUID& session_id,
 					const LLUUID& target_id,
-					const char* from,
-					const char* msg,
-					const char* session_name = NULL,
+					const std::string& from,
+					const std::string& msg,
+					const std::string& session_name = LLStringUtil::null,
 					EInstantMessage dialog = IM_NOTHING_SPECIAL,
 					U32 parent_estate_id = 0,
 					const LLUUID& region_id = LLUUID::null,
 					const LLVector3& position = LLVector3::zero,
 					bool link_name = false);
 
-	void addSystemMessage(const LLUUID& session_id, const LLString& message_name, const LLString::format_map_t& args);
+	void addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLStringUtil::format_map_t& args);
 
 	// This method returns TRUE if the local viewer has a session
 	// currently open keyed to the uuid. The uuid can be keyed by
@@ -97,7 +97,7 @@ public:
 	// Creates a P2P session with the requisite handle for responding to voice calls
 	LLUUID addP2PSession(const std::string& name,
 					  const LLUUID& other_participant_id,
-					  const LLString& voice_session_handle);
+					  const std::string& voice_session_handle);
 
 	// This removes the panel referenced by the uuid, and then
 	// restores internal consistency. The internal pointer is not
@@ -106,12 +106,12 @@ public:
 
 	void inviteToSession(
 		const LLUUID& session_id, 
-		const LLString& session_name, 
+		const std::string& session_name, 
 		const LLUUID& caller, 
-		const LLString& caller_name,
+		const std::string& caller_name,
 		EInstantMessage type,
 		EInvitationType inv_type, 
-		const LLString& session_handle = LLString::null);
+		const std::string& session_handle = LLStringUtil::null);
 
 	//Updates a given session's session IDs.  Does not open,
 	//create or do anything new.  If the old session doesn't
@@ -198,7 +198,7 @@ private:
 	void processIMTypingCore(const LLIMInfo* im_info, BOOL typing);
 
 	static void inviteUserResponse(S32 option, void* user_data);
-	static void onInviteNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* userdata);
+	static void onInviteNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* userdata);
 
 private:
 	std::set<LLHandle<LLFloater> > mFloaters;
@@ -218,9 +218,9 @@ public:
 	LLFloaterIM();
 	/*virtual*/ BOOL postBuild();
 
-	static std::map<std::string,LLString> sEventStringsMap;
-	static std::map<std::string,LLString> sErrorStringsMap;
-	static std::map<std::string,LLString> sForceCloseSessionMap;
+	static std::map<std::string,std::string> sEventStringsMap;
+	static std::map<std::string,std::string> sErrorStringsMap;
+	static std::map<std::string,std::string> sForceCloseSessionMap;
 };
 
 // Globals
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 7f7a15f..cf95eef 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -85,15 +85,15 @@
 #include "lluictrlfactory.h"
 #include "llselectmgr.h"
 
-const char* NEW_LSL_NAME = "New Script"; // *TODO:Translate? (probably not)
-const char* NEW_NOTECARD_NAME = "New Note"; // *TODO:Translate? (probably not)
-const char* NEW_GESTURE_NAME = "New Gesture"; // *TODO:Translate? (probably not)
+const std::string NEW_LSL_NAME = "New Script"; // *TODO:Translate? (probably not)
+const std::string NEW_NOTECARD_NAME = "New Note"; // *TODO:Translate? (probably not)
+const std::string NEW_GESTURE_NAME = "New Gesture"; // *TODO:Translate? (probably not)
 
 typedef LLMemberListener<LLPanelInventory> object_inventory_listener_t;
 typedef LLMemberListener<LLInventoryView> inventory_listener_t;
 typedef LLMemberListener<LLInventoryPanel> inventory_panel_listener_t;
 
-bool doToSelected(LLFolderView* folder, LLString action)
+bool doToSelected(LLFolderView* folder, std::string action)
 {
 	LLInventoryModel* model = &gInventory;
 	if ("rename" == action)
@@ -169,7 +169,7 @@ class LLDoToSelectedPanel : public object_inventory_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString action = userdata.asString();
+		std::string action = userdata.asString();
 		LLPanelInventory *panel = mPtr;
 		LLFolderView* folder = panel->getRootFolder();
 		if(!folder) return true;
@@ -182,7 +182,7 @@ class LLDoToSelectedFloater : public inventory_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString action = userdata.asString();
+		std::string action = userdata.asString();
 		LLInventoryPanel *panel = mPtr->getPanel();
 		LLFolderView* folder = panel->getRootFolder();
 		if(!folder) return true;
@@ -195,7 +195,7 @@ class LLDoToSelected : public inventory_panel_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString action = userdata.asString();
+		std::string action = userdata.asString();
 		LLInventoryPanel *panel = mPtr;
 		LLFolderView* folder = panel->getRootFolder();
 		if(!folder) return true;
@@ -212,7 +212,7 @@ class LLNewWindow : public inventory_listener_t
 		S32 left = 0 , top = 0;
 		gFloaterView->getNewFloaterPosition(&left, &top);
 		rect.setLeftTopAndSize(left, top, rect.getWidth(), rect.getHeight());
-		LLInventoryView* iv = new LLInventoryView("Inventory",
+		LLInventoryView* iv = new LLInventoryView(std::string("Inventory"),
 												rect,
 												mPtr->getActivePanel()->getModel());
 		iv->getActivePanel()->setFilterTypes(mPtr->getActivePanel()->getFilterTypes());
@@ -327,19 +327,19 @@ class LLEmptyTrashFloater : public inventory_listener_t
 	}
 };
 
-void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, LLString type, LLFolderBridge *self = NULL)
+void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, std::string type, LLFolderBridge *self = NULL)
 {
 	if ("category" == type)
 	{
 		LLUUID category;
 		if (self)
 		{
-			category = model->createNewCategory(self->getUUID(), LLAssetType::AT_NONE, NULL);
+			category = model->createNewCategory(self->getUUID(), LLAssetType::AT_NONE, LLStringUtil::null);
 		}
 		else
 		{
 			category = model->createNewCategory(gAgent.getInventoryRootID(),
-									LLAssetType::AT_NONE, NULL);
+												LLAssetType::AT_NONE, LLStringUtil::null);
 		}
 		model->notifyObservers();
 		ptr->setSelection(category, TRUE);
@@ -446,7 +446,7 @@ class LLDoCreate : public inventory_panel_listener_t
 	{
 		LLInventoryModel* model = mPtr->getModel();
 		if(!model) return false;
-		LLString type = userdata.asString();
+		std::string type = userdata.asString();
 		do_create(model, mPtr, type, LLFolderBridge::sSelf);
 		return true;
 	}
@@ -458,7 +458,7 @@ class LLDoCreateFloater : public inventory_listener_t
 	{
 		LLInventoryModel* model = mPtr->getPanel()->getModel();
 		if(!model) return false;
-		LLString type = userdata.asString();
+		std::string type = userdata.asString();
 		do_create(model, mPtr->getPanel(), type);
 		return true;
 	}
@@ -468,7 +468,7 @@ class LLSetSortBy : public inventory_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString sort_field = userdata.asString();
+		std::string sort_field = userdata.asString();
 		if (sort_field == "name")
 		{
 			U32 order = mPtr->getActivePanel()->getSortOrder();
@@ -534,7 +534,7 @@ class LLBeginIMSession : public inventory_panel_listener_t
 		std::set<LLUUID> selected_items;
 		panel->getRootFolder()->getSelectionList(selected_items);
 
-		LLString name;
+		std::string name;
 		static int session_num = 1;
 
 		LLDynamicArray<LLUUID> members;
@@ -615,9 +615,7 @@ class LLBeginIMSession : public inventory_panel_listener_t
 
 		if (name.empty())
 		{
-			char buffer [50];
-			sprintf(buffer, "Session %d", session_num++);
-			name = buffer;
+			name = llformat("Session %d", session_num++);
 		}
 
 
@@ -645,7 +643,7 @@ class LLAttachObject : public inventory_panel_listener_t
 		folder->getSelectionList(selected_items);
 		LLUUID id = *selected_items.begin();
 
-		LLString joint_name = userdata.asString();
+		std::string joint_name = userdata.asString();
 		LLVOAvatar *avatarp = gAgent.getAvatarObject();
 		LLViewerJointAttachment* attachmentp = NULL;
 		for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); 
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index a909262..12670e2 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -112,7 +112,7 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata);
 void move_task_inventory_callback(S32 option, void* user_data);
 void confirm_replace_attachment_rez(S32 option, void* user_data);
 
-const char* ICON_NAME[ICON_NAME_COUNT] =
+std::string ICON_NAME[ICON_NAME_COUNT] =
 {
 	"inv_item_texture.tga",
 	"inv_item_sound.tga",
@@ -158,17 +158,17 @@ BOOL gAddToOutfit = FALSE;
 // |        LLInvFVBridge                            |
 // +=================================================+
 
-const LLString& LLInvFVBridge::getName() const
+const std::string& LLInvFVBridge::getName() const
 {
 	LLInventoryObject* obj = getInventoryObject();
 	if(obj)
 	{
 		return obj->getName();
 	}
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
-const LLString& LLInvFVBridge::getDisplayName() const
+const std::string& LLInvFVBridge::getDisplayName() const
 {
 	return getName();
 }
@@ -181,7 +181,7 @@ PermissionMask LLInvFVBridge::getPermissionMask() const
 }
 
 // Folders don't have creation dates.
-U32 LLInvFVBridge::getCreationDate() const
+time_t LLInvFVBridge::getCreationDate() const
 {
 	return 0;
 }
@@ -378,15 +378,15 @@ BOOL LLInvFVBridge::isClipboardPasteable() const
 }
 
 void hideContextEntries(LLMenuGL& menu, 
-									   const std::vector<LLString> &entries_to_show,
-									   const std::vector<LLString> &disabled_entries)
+									   const std::vector<std::string> &entries_to_show,
+									   const std::vector<std::string> &disabled_entries)
 {
 	const LLView::child_list_t *list = menu.getChildList();
 
 	LLView::child_list_t::const_iterator itor;
 	for (itor = list->begin(); itor != list->end(); ++itor)
 	{
-		LLString name = (*itor)->getName();
+		std::string name = (*itor)->getName();
 
 		// descend into split menus:
 		LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(*itor);
@@ -397,7 +397,7 @@ void hideContextEntries(LLMenuGL& menu,
 		
 		
 		bool found = false;
-		std::vector<LLString>::const_iterator itor2;
+		std::vector<std::string>::const_iterator itor2;
 		for (itor2 = entries_to_show.begin(); itor2 != entries_to_show.end(); ++itor2)
 		{
 			if (*itor2 == name)
@@ -423,66 +423,68 @@ void hideContextEntries(LLMenuGL& menu,
 }
 
 // Helper for commonly-used entries
-void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector<LLString> &items, 
-		std::vector<LLString> &disabled_items, U32 flags)
+void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector<std::string> &items, 
+		std::vector<std::string> &disabled_items, U32 flags)
 {
-	items.push_back("Rename");
+	// *TODO: Translate	
+	items.push_back(std::string("Rename"));
 	if (!isItemRenameable() || (flags & FIRST_SELECTED_ITEM) == 0)
 	{
-		disabled_items.push_back("Rename");
+		disabled_items.push_back(std::string("Rename"));
 	}
 
 	if (show_asset_id)
 	{
-		items.push_back("Copy Asset UUID");
+		items.push_back(std::string("Copy Asset UUID"));
 		if ( (! ( isItemPermissive() || gAgent.isGodlike() ) ) 
 			  || (flags & FIRST_SELECTED_ITEM) == 0)
 		{
-			disabled_items.push_back("Copy Asset UUID");
+			disabled_items.push_back(std::string("Copy Asset UUID"));
 		}
 	}
 
-	items.push_back("Copy Separator");
+	items.push_back(std::string("Copy Separator"));
 
-	items.push_back("Copy");
+	items.push_back(std::string("Copy"));
 	if (!isItemCopyable())
 	{
-		disabled_items.push_back("Copy");
+		disabled_items.push_back(std::string("Copy"));
 	}
 
-	items.push_back("Paste");
+	items.push_back(std::string("Paste"));
 	if (!isClipboardPasteable() || (flags & FIRST_SELECTED_ITEM) == 0)
 	{
-		disabled_items.push_back("Paste");
+		disabled_items.push_back(std::string("Paste"));
 	}
 
-	items.push_back("Paste Separator");
+	items.push_back(std::string("Paste Separator"));
 
-	items.push_back("Delete");
+	items.push_back(std::string("Delete"));
 	if (!isItemRemovable())
 	{
-		disabled_items.push_back("Delete");
+		disabled_items.push_back(std::string("Delete"));
 	}
 }
 
 void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
+	// *TODO: Translate
 	lldebugs << "LLInvFVBridge::buildContextMenu()" << llendl;
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-		items.push_back("Open");
-		items.push_back("Properties");
+		items.push_back(std::string("Open"));
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 	}
@@ -729,7 +731,7 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
 // |        LLItemBridge                             |
 // +=================================================+
 
-void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if ("open" == action)
 	{
@@ -763,7 +765,7 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
 		LLInventoryItem* item = model->getItem(mUUID);
 		if(!item) return;
 		LLUUID asset_id = item->getAssetUUID();
-		char buffer[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
+		std::string buffer;
 		asset_id.toString(buffer);
 
 		gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
@@ -833,7 +835,7 @@ PermissionMask LLItemBridge::getPermissionMask() const
 	return perm_mask;
 }
 	
-const LLString& LLItemBridge::getDisplayName() const
+const std::string& LLItemBridge::getDisplayName() const
 {
 	if(mDisplayName.empty())
 	{
@@ -842,7 +844,7 @@ const LLString& LLItemBridge::getDisplayName() const
 	return mDisplayName;
 }
 
-void LLItemBridge::buildDisplayName(LLInventoryItem* item, LLString& name)
+void LLItemBridge::buildDisplayName(LLInventoryItem* item, std::string& name)
 {
 	if(item) 
 	{
@@ -850,13 +852,13 @@ void LLItemBridge::buildDisplayName(LLInventoryItem* item, LLString& name)
 	}
 	else
 	{
-		name.assign(LLString::null);
+		name.assign(LLStringUtil::null);
 	}
 }
 
-LLString LLItemBridge::getLabelSuffix() const
+std::string LLItemBridge::getLabelSuffix() const
 {
-	LLString suffix;
+	std::string suffix;
 	LLInventoryItem* item = getItem();
 	if(item) 
 	{
@@ -868,6 +870,7 @@ LLString LLItemBridge::getLabelSuffix() const
 			BOOL mod = item->getPermissions().allowModifyBy(gAgent.getID());
 			BOOL xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER,
 																gAgent.getID());
+			// *TODO: Translate
 			const char* EMPTY = "";
 			const char* NO_COPY = " (no copy)";
 			const char* NO_MOD = " (no modify)";
@@ -881,21 +884,13 @@ LLString LLItemBridge::getLabelSuffix() const
 			const char* sxfer;
 			if(xfer) sxfer = EMPTY;
 			else sxfer = NO_XFER;
-			char buffer[MAX_STRING];		/*Flawfinder: ignore*/
-			snprintf(						/* Flawfinder: ignore */
-				buffer,
-				MAX_STRING,
-				"%s%s%s",
-				scopy,
-				smod,
-				sxfer);
-			suffix.assign(buffer);
+			suffix = llformat("%s%s%s",scopy,smod,sxfer);
 		}
 	}
 	return suffix;
 }
 
-U32 LLItemBridge::getCreationDate() const
+time_t LLItemBridge::getCreationDate() const
 {
 	LLViewerInventoryItem* item = getItem();
 	if (item)
@@ -916,7 +911,7 @@ BOOL LLItemBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLItemBridge::renameItem(const LLString& new_name)
+BOOL LLItemBridge::renameItem(const std::string& new_name)
 {
 	if(!isItemRenameable()) return FALSE;
 	LLPreview::rename(mUUID, getPrefix() + new_name);
@@ -1370,7 +1365,9 @@ bool LLFindWearables::operator()(LLInventoryCategory* cat,
 class LLRightClickInventoryFetchObserver : public LLInventoryFetchObserver
 {
 public:
-	LLRightClickInventoryFetchObserver()  {};
+	LLRightClickInventoryFetchObserver() :
+		mCopyItems(false)
+	{ };
 	LLRightClickInventoryFetchObserver(const LLUUID& cat_id, bool copy_items) :
 		mCatID(cat_id),
 		mCopyItems(copy_items)
@@ -1542,7 +1539,7 @@ void LLInventoryCopyAndWearObserver::changed(U32 mask)
 
 
 
-void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if ("open" == action)
 	{
@@ -1691,7 +1688,7 @@ LLUIImagePtr LLFolderBridge::getIcon() const
 	return LLUI::getUIImage(control);
 }
 
-BOOL LLFolderBridge::renameItem(const LLString& new_name)
+BOOL LLFolderBridge::renameItem(const std::string& new_name)
 {
 	if(!isItemRenameable()) return FALSE;
 	LLInventoryModel* model = mInventoryPanel->getModel();
@@ -1795,8 +1792,10 @@ void LLFolderBridge::staticFolderOptionsMenu()
 
 void LLFolderBridge::folderOptionsMenu()
 {
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> disabled_items;
 
+	// *TODO: Translate
+	
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return;
 	
@@ -1805,9 +1804,9 @@ void LLFolderBridge::folderOptionsMenu()
 	LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD);
 	if (mCallingCards || checkFolderForContentsOfType(model, is_callingcard))
 	{
-		mItems.push_back("Calling Card Separator");
-		mItems.push_back("Conference Chat Folder");
-		mItems.push_back("IM All Contacts In Folder");
+		mItems.push_back(std::string("Calling Card Separator"));
+		mItems.push_back(std::string("Conference Chat Folder"));
+		mItems.push_back(std::string("IM All Contacts In Folder"));
 	}
 	
 	// wearables related functionality for folders.
@@ -1821,16 +1820,16 @@ void LLFolderBridge::folderOptionsMenu()
 		checkFolderForContentsOfType(model, is_object) ||
 		checkFolderForContentsOfType(model, is_gesture) )
 	{
-		mItems.push_back("Folder Wearables Separator");
+		mItems.push_back(std::string("Folder Wearables Separator"));
 
 		// Only enable add/replace outfit for non-default folders.
 		const LLInventoryCategory* category = model->getCategory(mUUID);
 		if (!category || (LLAssetType::AT_NONE == category->getPreferredType()))
 		{
-			mItems.push_back("Add To Outfit");
-			mItems.push_back("Replace Outfit");
+			mItems.push_back(std::string("Add To Outfit"));
+			mItems.push_back(std::string("Replace Outfit"));
 		}
-		mItems.push_back("Take Off Items");
+		mItems.push_back(std::string("Take Off Items"));
 	}
 	hideContextEntries(*mMenu, mItems, disabled_items);
 }
@@ -1850,8 +1849,9 @@ BOOL LLFolderBridge::checkFolderForContentsOfType(LLInventoryModel* model, LLInv
 // Flags unused
 void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
+	// *TODO: Translate
 	lldebugs << "LLFolderBridge::buildContextMenu()" << llendl;
-//	std::vector<LLString> disabled_items;
+//	std::vector<std::string> disabled_items;
 	LLInventoryModel* model = mInventoryPanel->getModel();
 	if(!model) return;
 	LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -1860,25 +1860,25 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	if (lost_and_found_id == mUUID)
 	  {
 		// This is the lost+found folder.
-		mItems.push_back("Empty Lost And Found");
+		  mItems.push_back(std::string("Empty Lost And Found"));
 	  }
 
 	if(trash_id == mUUID)
 	{
 		// This is the trash.
-		mItems.push_back("Empty Trash");
+		mItems.push_back(std::string("Empty Trash"));
 	}
 	else if(model->isObjectDescendentOf(mUUID, trash_id))
 	{
 		// This is a folder in the trash.
 		mItems.clear(); // clear any items that used to exist
-		mItems.push_back("Purge Item");
+		mItems.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			mDisabledItems.push_back("Purge Item");
+			mDisabledItems.push_back(std::string("Purge Item"));
 		}
 
-		mItems.push_back("Restore Item");
+		mItems.push_back(std::string("Restore Item"));
 	}
 	else if(isAgentInventory()) // do not allow creating in library
 	{
@@ -1907,12 +1907,12 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 									is_callingcard);
 		if(item_array.count() > 0) contains_calling_cards = TRUE;
 */
-		mItems.push_back("New Folder");
-		mItems.push_back("New Script");
-		mItems.push_back("New Note");
-		mItems.push_back("New Gesture");
-		mItems.push_back("New Clothes");
-		mItems.push_back("New Body Parts");
+		mItems.push_back(std::string("New Folder"));
+		mItems.push_back(std::string("New Script"));
+		mItems.push_back(std::string("New Note"));
+		mItems.push_back(std::string("New Gesture"));
+		mItems.push_back(std::string("New Clothes"));
+		mItems.push_back(std::string("New Body Parts"));
 
 		getClipboardEntries(false, mItems, mDisabledItems, flags);
 
@@ -1959,8 +1959,8 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	}
 	else
 	{
-		mItems.push_back("--no options--");
-		mDisabledItems.push_back("--no options--");
+		mItems.push_back(std::string("--no options--"));
+		mDisabledItems.push_back(std::string("--no options--"));
 	}
 	hideContextEntries(menu, mItems, mDisabledItems);
 }
@@ -2035,7 +2035,7 @@ void LLFolderBridge::createNewCategory(void* user_data)
 	LLUUID id;
 	id = model->createNewCategory(bridge->getUUID(),
 								  LLAssetType::AT_NONE,
-								  NULL);
+								  LLStringUtil::null);
 	model->notifyObservers();
 
 	// At this point, the bridge has probably been deleted, but the
@@ -2238,7 +2238,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 		if(accept && drop)
 		{
 			if (inv_item->getType() == LLAssetType::AT_GESTURE
-				&& gGestureManager.isGestureActive(inv_item->getUUID()))
+				&& gGestureManager.isGestureActive(inv_item->getUUID()) && move_is_into_trash)
 			{
 				gGestureManager.deactivateGesture(inv_item->getUUID());
 			}
@@ -2360,7 +2360,7 @@ LLUIImagePtr LLScriptBridge::getIcon() const
 // |        LLTextureBridge                          |
 // +=================================================+
 
-LLString LLTextureBridge::sPrefix("Texture: ");
+std::string LLTextureBridge::sPrefix("Texture: ");
 
 
 LLUIImagePtr LLTextureBridge::getIcon() const
@@ -2369,7 +2369,7 @@ LLUIImagePtr LLTextureBridge::getIcon() const
 }
 	
 void open_texture(const LLUUID& item_id, 
-				   const LLString& title,
+				   const std::string& title,
 				   BOOL show_keep_discard,
 				   const LLUUID& source_id,
 				   BOOL take_focus)
@@ -2410,7 +2410,7 @@ void LLTextureBridge::openItem()
 // |        LLSoundBridge                            |
 // +=================================================+
 
-LLString LLSoundBridge::sPrefix("Sound: ");
+std::string LLSoundBridge::sPrefix("Sound: ");
 
 
 LLUIImagePtr LLSoundBridge::getIcon() const
@@ -2475,29 +2475,30 @@ void LLSoundBridge::openSoundPreview(void* which)
 void LLSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
 	lldebugs << "LLTextureBridge::buildContextMenu()" << llendl;
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 
+	// *TODO: Translate
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
 
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-		items.push_back("Sound Open");
-		items.push_back("Properties");
+		items.push_back(std::string("Sound Open"));
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 	}
 
-	items.push_back("Sound Separator");
-	items.push_back("Sound Play");
+	items.push_back(std::string("Sound Separator"));
+	items.push_back(std::string("Sound Play"));
 
 	hideContextEntries(menu, items, disabled_items);
 }
@@ -2506,7 +2507,7 @@ void LLSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 // |        LLLandmarkBridge                         |
 // +=================================================+
 
-LLString LLLandmarkBridge::sPrefix("Landmark:  ");
+std::string LLLandmarkBridge::sPrefix("Landmark:  ");
 
 LLUIImagePtr LLLandmarkBridge::getIcon() const
 {
@@ -2515,37 +2516,38 @@ LLUIImagePtr LLLandmarkBridge::getIcon() const
 
 void LLLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 
+	// *TODO: Translate
 	lldebugs << "LLLandmarkBridge::buildContextMenu()" << llendl;
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
 
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-		items.push_back("Landmark Open");
-		items.push_back("Properties");
+		items.push_back(std::string("Landmark Open"));
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 	}
 
-	items.push_back("Landmark Separator");
-	items.push_back("Teleport To Landmark");
+	items.push_back(std::string("Landmark Separator"));
+	items.push_back(std::string("Teleport To Landmark"));
 
 	hideContextEntries(menu, items, disabled_items);
 
 }
 
 // virtual
-void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if ("teleport" == action)
 	{
@@ -2567,14 +2569,14 @@ void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
 		LLViewerInventoryItem* item = getItem();
 		if(item)
 		{
-			open_landmark(item, LLString("  ") + getPrefix() + item->getName(), FALSE);
+			open_landmark(item, std::string("  ") + getPrefix() + item->getName(), FALSE);
 		}
 	}
 	else LLItemBridge::performAction(folder, model, action);
 }
 
 void open_landmark(LLViewerInventoryItem* inv_item,
-				   const LLString& title,
+				   const std::string& title,
 				   BOOL show_keep_discard,
 				   const LLUUID& source_id,
 				   BOOL take_focus)
@@ -2626,7 +2628,7 @@ void LLLandmarkBridge::openItem()
 	{
 		// Opening (double-clicking) a landmark immediately teleports,
 		// but warns you the first time.
-		// open_landmark(item, LLString("  ") + getPrefix() + item->getName(), FALSE);
+		// open_landmark(item, std::string("  ") + getPrefix() + item->getName(), FALSE);
 		LLUUID* asset_idp = new LLUUID(item->getAssetUUID());
 		LLAlertDialog::showXml("TeleportFromLandmark",
 			open_landmark_callback, (void*)asset_idp);
@@ -2646,7 +2648,7 @@ void LLCallingCardObserver::changed(U32 mask)
 // |        LLCallingCardBridge                      |
 // +=================================================+
 
-LLString LLCallingCardBridge::sPrefix("Calling Card: ");
+std::string LLCallingCardBridge::sPrefix("Calling Card: ");
 
 LLCallingCardBridge::LLCallingCardBridge( LLInventoryPanel* inventory, const LLUUID& uuid ) :
 	LLItemBridge(inventory, uuid)
@@ -2671,7 +2673,7 @@ void LLCallingCardBridge::refreshFolderViewItem()
 }
 
 // virtual
-void LLCallingCardBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLCallingCardBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if ("begin_im" == action)
 	{
@@ -2706,7 +2708,7 @@ LLUIImagePtr LLCallingCardBridge::getIcon() const
 	return get_item_icon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, online, FALSE);
 }
 
-LLString LLCallingCardBridge::getLabelSuffix() const
+std::string LLCallingCardBridge::getLabelSuffix() const
 {
 	LLViewerInventoryItem* item = getItem();
 	if( item && LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID()) )
@@ -2732,24 +2734,25 @@ void LLCallingCardBridge::openItem()
 
 void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
+	// *TODO: Translate
 	lldebugs << "LLCallingCardBridge::buildContextMenu()" << llendl;
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
 
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-		items.push_back("Open");
-		items.push_back("Properties");
+		items.push_back(std::string("Open"));
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 
@@ -2758,19 +2761,19 @@ void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 						  && (LLUUID::null != item->getCreatorUUID())
 						  && (item->getCreatorUUID() != gAgent.getID()));
 		BOOL user_online = (LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID()));
-		items.push_back("Send Instant Message Separator");
-		items.push_back("Send Instant Message");
-		items.push_back("Offer Teleport...");
-		items.push_back("Conference Chat");
+		items.push_back(std::string("Send Instant Message Separator"));
+		items.push_back(std::string("Send Instant Message"));
+		items.push_back(std::string("Offer Teleport..."));
+		items.push_back(std::string("Conference Chat"));
 
 		if (!good_card)
 		{
-			disabled_items.push_back("Send Instant Message");
+			disabled_items.push_back(std::string("Send Instant Message"));
 		}
 		if (!good_card || !user_online)
 		{
-			disabled_items.push_back("Offer Teleport...");
-			disabled_items.push_back("Conference Chat");
+			disabled_items.push_back(std::string("Offer Teleport..."));
+			disabled_items.push_back(std::string("Conference Chat"));
 		}
 	}
 	hideContextEntries(menu, items, disabled_items);
@@ -2852,7 +2855,7 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop,
 // |        LLNotecardBridge                         |
 // +=================================================+
 
-LLString LLNotecardBridge::sPrefix("Note: ");
+std::string LLNotecardBridge::sPrefix("Note: ");
 
 
 LLUIImagePtr LLNotecardBridge::getIcon() const
@@ -2861,7 +2864,7 @@ LLUIImagePtr LLNotecardBridge::getIcon() const
 }
 
 void open_notecard(LLViewerInventoryItem* inv_item,
-				   const LLString& title,
+				   const std::string& title,
 				   const LLUUID& object_id,
 				   BOOL show_keep_discard,
 				   const LLUUID& source_id,
@@ -2921,7 +2924,7 @@ void LLNotecardBridge::openItem()
 // |        LLGestureBridge                          |
 // +=================================================+
 
-LLString LLGestureBridge::sPrefix("Gesture: ");
+std::string LLGestureBridge::sPrefix("Gesture: ");
 
 LLUIImagePtr LLGestureBridge::getIcon() const
 {
@@ -2940,7 +2943,7 @@ LLFontGL::StyleFlags LLGestureBridge::getLabelStyle() const
 	}
 }
 
-LLString LLGestureBridge::getLabelSuffix() const
+std::string LLGestureBridge::getLabelSuffix() const
 {
 	if( gGestureManager.isGestureActive(mUUID) )
 	{
@@ -2953,7 +2956,7 @@ LLString LLGestureBridge::getLabelSuffix() const
 }
 
 // virtual
-void LLGestureBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLGestureBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if ("activate" == action)
 	{
@@ -2991,7 +2994,7 @@ void LLGestureBridge::openItem()
 	if(!LLPreview::show(mUUID))
 	{
 		LLUUID item_id = mUUID;
-		LLString title = getPrefix() + item->getName();
+		std::string title = getPrefix() + item->getName();
 		LLUUID object_id = LLUUID::null;
 
 		// TODO: save the rectangle
@@ -3012,29 +3015,30 @@ BOOL LLGestureBridge::removeItem()
 
 void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
+	// *TODO: Translate
 	lldebugs << "LLGestureBridge::buildContextMenu()" << llendl;
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
 
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-		items.push_back("Open");
-		items.push_back("Properties");
+		items.push_back(std::string("Open"));
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 
-		items.push_back("Gesture Separator");
-		items.push_back("Activate");
-		items.push_back("Deactivate");
+		items.push_back(std::string("Gesture Separator"));
+		items.push_back(std::string("Activate"));
+		items.push_back(std::string("Deactivate"));
 
 		/*menu.append(new LLMenuItemCallGL("Activate",
 										 handleActivateGesture,
@@ -3052,7 +3056,7 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 // |        LLAnimationBridge                        |
 // +=================================================+
 
-LLString LLAnimationBridge::sPrefix("Animation: ");
+std::string LLAnimationBridge::sPrefix("Animation: ");
 
 
 LLUIImagePtr LLAnimationBridge::getIcon() const
@@ -3062,38 +3066,39 @@ LLUIImagePtr LLAnimationBridge::getIcon() const
 
 void LLAnimationBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	// *TODO: Translate
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 
 	lldebugs << "LLAnimationBridge::buildContextMenu()" << llendl;
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
 
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-		items.push_back("Animation Open");
-		items.push_back("Properties");
+		items.push_back(std::string("Animation Open"));
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 	}
 
-	items.push_back("Animation Separator");
-	items.push_back("Animation Play");
-	items.push_back("Animation Audition");
+	items.push_back(std::string("Animation Separator"));
+	items.push_back(std::string("Animation Play"));
+	items.push_back(std::string("Animation Audition"));
 
 	hideContextEntries(menu, items, disabled_items);
 
 }
 
 // virtual
-void LLAnimationBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLAnimationBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	S32 activate = 0;
 
@@ -3160,7 +3165,7 @@ void LLAnimationBridge::openItem()
 // +=================================================+
 
 // static
-LLString LLObjectBridge::sPrefix("Object: ");
+std::string LLObjectBridge::sPrefix("Object: ");
 
 // static
 LLUUID LLObjectBridge::sContextMenuItemID;
@@ -3181,7 +3186,7 @@ LLUIImagePtr LLObjectBridge::getIcon() const
 void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attachment);
 
 // virtual
-void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if ("attach" == action)
 	{
@@ -3254,14 +3259,14 @@ LLFontGL::StyleFlags LLObjectBridge::getLabelStyle() const
 	}
 }
 
-LLString LLObjectBridge::getLabelSuffix() const
+std::string LLObjectBridge::getLabelSuffix() const
 {
 	LLVOAvatar* avatar = gAgent.getAvatarObject();
 	if( avatar && avatar->isWearingAttachment( mUUID ) )
 	{
-		LLString attachment_point_name = avatar->getAttachedPointName(mUUID);
-		LLString::toLower(attachment_point_name);
-		return LLItemBridge::getLabelSuffix() + LLString(" (worn on ") + attachment_point_name + LLString(")");
+		std::string attachment_point_name = avatar->getAttachedPointName(mUUID);
+		LLStringUtil::toLower(attachment_point_name);
+		return LLItemBridge::getLabelSuffix() + std::string(" (worn on ") + attachment_point_name + std::string(")");
 	}
 	else
 	{
@@ -3329,21 +3334,22 @@ void confirm_replace_attachment_rez(S32 option, void* user_data)
 
 void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	// *TODO: Translate
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
 
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-		items.push_back("Properties");
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 
@@ -3360,15 +3366,15 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			
 			if( avatarp->isWearingAttachment( mUUID ) )
 			{
-				items.push_back("Detach From Yourself");
+				items.push_back(std::string("Detach From Yourself"));
 			}
 			else
 			if( !isInTrash() )
 			{
-				items.push_back("Attach Separator");
-				items.push_back("Object Wear");
-				items.push_back("Attach To");
-				items.push_back("Attach To HUD");
+				items.push_back(std::string("Attach Separator"));
+				items.push_back(std::string("Object Wear"));
+				items.push_back(std::string("Attach To"));
+				items.push_back(std::string("Attach To HUD"));
 
 				LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE);
 				LLMenuGL* attach_hud_menu = menu.getChildMenuByName("Attach To HUD", TRUE);
@@ -3410,7 +3416,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	hideContextEntries(menu, items, disabled_items);
 }
 
-BOOL LLObjectBridge::renameItem(const LLString& new_name)
+BOOL LLObjectBridge::renameItem(const std::string& new_name)
 {
 	if(!isItemRenameable()) return FALSE;
 	LLPreview::rename(mUUID, getPrefix() + new_name);
@@ -3448,7 +3454,7 @@ BOOL LLObjectBridge::renameItem(const LLString& new_name)
 // |        LLLSLTextBridge                          |
 // +=================================================+
 
-LLString LLLSLTextBridge::sPrefix("Script: ");
+std::string LLLSLTextBridge::sPrefix("Script: ");
 
 LLUIImagePtr LLLSLTextBridge::getIcon() const
 {
@@ -3504,7 +3510,7 @@ struct LLFoundData
 {
 	LLFoundData(const LLUUID& item_id,
 				const LLUUID& asset_id,
-				const LLString& name,
+				const std::string& name,
 				LLAssetType::EType asset_type) :
 		mItemID(item_id),
 		mAssetID(asset_id),
@@ -3514,7 +3520,7 @@ struct LLFoundData
 	
 	LLUUID mItemID;
 	LLUUID mAssetID;
-	LLString mName;
+	std::string mName;
 	LLAssetType::EType mAssetType;
 	LLWearable* mWearable;
 };
@@ -3597,7 +3603,7 @@ void LLOutfitObserver::done()
 	if(mCopyItems)
 	{
 		LLInventoryCategory* cat = gInventory.getCategory(mCatID);
-		LLString name;
+		std::string name;
 		if(!cat)
 		{
 			// should never happen.
@@ -3728,7 +3734,7 @@ void LLOutfitFetch::done()
 	}
 }
 
-void wear_outfit_by_name(const char* name)
+void wear_outfit_by_name(const std::string& name)
 {
 	llinfos << "Wearing category " << name << llendl;
 	inc_busy_count();
@@ -4203,7 +4209,7 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
 	category_id = NULL;
 }
 
-BOOL LLWearableBridge::renameItem(const LLString& new_name)
+BOOL LLWearableBridge::renameItem(const std::string& new_name)
 {
 	if( gAgent.isWearingItem( mUUID ) )
 	{
@@ -4231,7 +4237,7 @@ LLFontGL::StyleFlags LLWearableBridge::getLabelStyle() const
 	}
 }
 
-LLString LLWearableBridge::getLabelSuffix() const
+std::string LLWearableBridge::getLabelSuffix() const
 {
 	if( gAgent.isWearingItem( mUUID ) )
 	{
@@ -4249,7 +4255,7 @@ LLUIImagePtr LLWearableBridge::getIcon() const
 }
 
 // virtual
-void LLWearableBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLWearableBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if ("wear" == action)
 	{
@@ -4318,18 +4324,19 @@ void LLWearableBridge::openItem()
 
 void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
+	// *TODO: Translate
 	lldebugs << "LLWearableBridge::buildContextMenu()" << llendl;
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 	if(isInTrash())
 	{
-		items.push_back("Purge Item");
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back("Purge Item");
+			disabled_items.push_back(std::string("Purge Item"));
 		}
 
-		items.push_back("Restore Item");
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{	// FWIW, it looks like SUPPRESS_OPEN_ITEM is not set anywhere
@@ -4344,22 +4351,22 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		}
 		if (!no_open)
 		{
-			items.push_back("Open");
+			items.push_back(std::string("Open"));
 		}
 
-		items.push_back("Properties");
+		items.push_back(std::string("Properties"));
 
 		getClipboardEntries(true, items, disabled_items, flags);
 
-		items.push_back("Wearable Separator");
+		items.push_back(std::string("Wearable Separator"));
 		
-		items.push_back("Wearable Wear");
-		items.push_back("Wearable Edit");
+		items.push_back(std::string("Wearable Wear"));
+		items.push_back(std::string("Wearable Edit"));
 
 
 		if ((flags & FIRST_SELECTED_ITEM) == 0)
 		{
-			disabled_items.push_back("Wearable Edit");
+			disabled_items.push_back(std::string("Wearable Edit"));
 		}
 		//menu.appendSeparator();
 		//menu.append(new LLMenuItemCallGL("Wear",
@@ -4373,7 +4380,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 
 		if( item && (item->getType() == LLAssetType::AT_CLOTHING) )
 		{
-			items.push_back("Take Off");
+			items.push_back(std::string("Take Off"));
 			/*menu.append(new LLMenuItemCallGL("Take Off",
 											 LLWearableBridge::onRemoveFromAvatar,
 											 LLWearableBridge::canRemoveFromAvatar,
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 80b65b2..fc04b28 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -70,7 +70,7 @@ enum EInventoryIcon
 	ICON_NAME_COUNT
 };
 
-extern const char* ICON_NAME[ICON_NAME_COUNT];
+extern std::string ICON_NAME[ICON_NAME_COUNT];
 
 typedef std::pair<LLUUID, LLUUID> two_uuids_t;
 typedef std::list<two_uuids_t> two_uuids_list_t;
@@ -157,24 +157,24 @@ public:
 
 	virtual const LLUUID& getUUID() const { return mUUID; }
 
-	virtual const LLString& getPrefix() { return LLString::null; }
+	virtual const std::string& getPrefix() { return LLStringUtil::null; }
 	virtual void restoreItem() {}
 
 	// LLFolderViewEventListener functions
-	virtual const LLString& getName() const;
-	virtual const LLString& getDisplayName() const;
+	virtual const std::string& getName() const;
+	virtual const std::string& getDisplayName() const;
 	virtual PermissionMask getPermissionMask() const;
-	virtual U32 getCreationDate() const;
+	virtual time_t getCreationDate() const;
 	virtual LLFontGL::StyleFlags getLabelStyle() const
 	{
 		return LLFontGL::NORMAL;
 	}
-	virtual LLString getLabelSuffix() const { return LLString::null; }
+	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
 	virtual void openItem() {}
 	virtual void previewItem() {openItem();}
 	virtual void showProperties();
 	virtual BOOL isItemRenameable() const { return TRUE; }
-	//virtual BOOL renameItem(const LLString& new_name) {}
+	//virtual BOOL renameItem(const std::string& new_name) {}
 	virtual BOOL isItemRemovable();
 	virtual BOOL isItemMovable();
 	//virtual BOOL removeItem() = 0;
@@ -185,8 +185,8 @@ public:
 	virtual void cutToClipboard() {}
 	virtual BOOL isClipboardPasteable() const;
 	virtual void pasteFromClipboard() {}
-	void getClipboardEntries(bool show_asset_id, std::vector<LLString> &items, 
-		std::vector<LLString> &disabled_items, U32 flags);
+	void getClipboardEntries(bool show_asset_id, std::vector<std::string> &items, 
+		std::vector<std::string> &disabled_items, U32 flags);
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;
 	virtual BOOL dragOrDrop(MASK mask, BOOL drop,
@@ -230,18 +230,18 @@ public:
 	LLItemBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
 		LLInvFVBridge(inventory, uuid) {}
 
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 
 	virtual void selectItem();
 	virtual void restoreItem();
 
 	virtual LLUIImagePtr getIcon() const;
-	virtual const LLString& getDisplayName() const;
-	virtual LLString getLabelSuffix() const;
+	virtual const std::string& getDisplayName() const;
+	virtual std::string getLabelSuffix() const;
 	virtual PermissionMask getPermissionMask() const;
-	virtual U32 getCreationDate() const;
+	virtual time_t getCreationDate() const;
 	virtual BOOL isItemRenameable() const;
-	virtual BOOL renameItem(const LLString& new_name);
+	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL removeItem();
 	virtual BOOL isItemCopyable() const;
 	virtual BOOL copyToClipboard() const;
@@ -255,8 +255,8 @@ public:
 
 protected:
 	virtual BOOL isItemPermissive() const;
-	static void buildDisplayName(LLInventoryItem* item, LLString& name);
-	mutable LLString mDisplayName;
+	static void buildDisplayName(LLInventoryItem* item, std::string& name);
+	mutable std::string mDisplayName;
 };
 
 
@@ -268,7 +268,7 @@ public:
 							BOOL drop);
 	BOOL dragCategoryIntoFolder(LLInventoryCategory* inv_category,
 								BOOL drop);
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void openItem();
 	virtual BOOL isItemRenameable() const;
 	virtual void selectItem();
@@ -276,7 +276,7 @@ public:
 
 
 	virtual LLUIImagePtr getIcon() const;
-	virtual BOOL renameItem(const LLString& new_name);
+	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL removeItem();
 	virtual BOOL isClipboardPasteable() const;
 	virtual void pasteFromClipboard();
@@ -328,8 +328,8 @@ private:
 	BOOL			mCallingCards;
 	BOOL			mWearables;
 	LLMenuGL*		mMenu;
-	std::vector<LLString> mItems;
-	std::vector<LLString> mDisabledItems;
+	std::vector<std::string> mItems;
+	std::vector<std::string> mDisabledItems;
 };
 
 // DEPRECATED
@@ -349,7 +349,7 @@ class LLTextureBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -357,7 +357,7 @@ public:
 protected:
 	LLTextureBridge(LLInventoryPanel* inventory, const LLUUID& uuid, LLInventoryType::EType type) :
 		LLItemBridge(inventory, uuid), mInvType(type) {}
-	static LLString sPrefix;
+	static std::string sPrefix;
 	LLInventoryType::EType mInvType;
 };
 
@@ -365,7 +365,7 @@ class LLSoundBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -376,16 +376,16 @@ public:
 protected:
 	LLSoundBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
 		LLItemBridge(inventory, uuid) {}
-	static LLString sPrefix;
+	static std::string sPrefix;
 };
 
 class LLLandmarkBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	static const LLString& prefix() { return sPrefix; }
-	virtual const LLString& getPrefix() { return sPrefix; }
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	static const std::string& prefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -402,7 +402,7 @@ protected:
 	}
 
 protected:
-	static LLString sPrefix;
+	static std::string sPrefix;
 	BOOL mVisited;
 };
 
@@ -423,15 +423,15 @@ class LLCallingCardBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
 
-	virtual LLString getLabelSuffix() const;
-	//virtual const LLString& getDisplayName() const;
+	virtual std::string getLabelSuffix() const;
+	//virtual const std::string& getDisplayName() const;
 	virtual LLUIImagePtr getIcon() const;
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void openItem();
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
-	//virtual void renameItem(const LLString& new_name);
+	//virtual void renameItem(const std::string& new_name);
 	//virtual BOOL removeItem();
 	virtual BOOL dragOrDrop(MASK mask, BOOL drop,
 							EDragAndDropType cargo_type,
@@ -443,7 +443,7 @@ protected:
 	~LLCallingCardBridge();
 	
 protected:
-	static LLString sPrefix;
+	static std::string sPrefix;
 	LLCallingCardObserver* mObserver;
 };
 
@@ -452,7 +452,7 @@ class LLNotecardBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -462,23 +462,23 @@ protected:
 		LLItemBridge(inventory, uuid) {}
 
 protected:
-	static LLString sPrefix;
+	static std::string sPrefix;
 };
 
 class LLGestureBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
 
 	virtual LLUIImagePtr getIcon() const;
 
 	// Only suffix for gesture items, not task items, because only
 	// gestures in your inventory can be active.
 	virtual LLFontGL::StyleFlags getLabelStyle() const;
-	virtual LLString getLabelSuffix() const;
+	virtual std::string getLabelSuffix() const;
 
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void openItem();
 	virtual BOOL removeItem();
 
@@ -489,7 +489,7 @@ protected:
 	:	LLItemBridge(inventory, uuid) {}
 
 protected:
-	static LLString sPrefix;
+	static std::string sPrefix;
 };
 
 
@@ -497,8 +497,8 @@ class LLAnimationBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual const std::string& getPrefix() { return sPrefix; }
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 
 	virtual LLUIImagePtr getIcon() const;
@@ -509,7 +509,7 @@ protected:
 		LLItemBridge(inventory, uuid) {}
 
 protected:
-	static LLString sPrefix;
+	static std::string sPrefix;
 };
 
 
@@ -517,16 +517,16 @@ class LLObjectBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
 
 	virtual LLUIImagePtr	getIcon() const;
-	virtual void			performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void			performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void			openItem();
 	virtual LLFontGL::StyleFlags getLabelStyle() const;
-	virtual LLString getLabelSuffix() const;
+	virtual std::string getLabelSuffix() const;
 	virtual void			buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual BOOL			isItemRemovable();
-	virtual BOOL renameItem(const LLString& new_name);
+	virtual BOOL renameItem(const std::string& new_name);
 
 protected:
 	LLObjectBridge(LLInventoryPanel* inventory, const LLUUID& uuid, LLInventoryType::EType type, U32 flags) :
@@ -538,7 +538,7 @@ protected:
 	}
 
 protected:
-	static LLString sPrefix;
+	static std::string sPrefix;
 	static LLUUID	sContextMenuItemID;  // Only valid while the context menu is open.
 	LLInventoryType::EType mInvType;
 	U32 mAttachPt;
@@ -550,7 +550,7 @@ class LLLSLTextBridge : public LLItemBridge
 {
 	friend class LLInvFVBridge;
 public:
-	virtual const LLString& getPrefix() { return sPrefix; }
+	virtual const std::string& getPrefix() { return sPrefix; }
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -560,7 +560,7 @@ protected:
 		LLItemBridge(inventory, uuid) {}
 
 protected:
-	static LLString sPrefix;
+	static std::string sPrefix;
 };
 
 
@@ -569,13 +569,13 @@ class LLWearableBridge : public LLItemBridge
 	friend class LLInvFVBridge;
 public:
 	virtual LLUIImagePtr getIcon() const;
-	virtual void	performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void	performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void	openItem();
 	virtual void	buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual LLFontGL::StyleFlags getLabelStyle() const;
-	virtual LLString getLabelSuffix() const;
+	virtual std::string getLabelSuffix() const;
 	virtual BOOL	isItemRemovable();
-	virtual BOOL renameItem(const LLString& new_name);
+	virtual BOOL renameItem(const std::string& new_name);
 
 	static void		onWearOnAvatar( void* userdata );	// Access to wearOnAvatar() from menu
 	static BOOL		canWearOnAvatar( void* userdata );
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 15f5398..0e6056f 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -56,6 +56,7 @@
 #include "llcallbacklist.h"
 #include "llpreview.h"
 #include "llviewercontrol.h"
+#include "llvoavatar.h"
 #include "llsdutil.h"
 #include <deque>
 
@@ -304,7 +305,7 @@ LLUUID LLInventoryModel::findCategoryUUIDForType(LLAssetType::EType t, bool crea
 		LLUUID root_id = gAgent.getInventoryRootID();
 		if(root_id.notNull())
 		{
-			rv = createNewCategory(root_id, t, NULL);
+			rv = createNewCategory(root_id, t, LLStringUtil::null);
 		}
 	}
 	return rv;
@@ -344,7 +345,7 @@ LLUUID LLInventoryModel::findCatUUID(LLAssetType::EType preferred_type)
 // based on preferred type. Returns the UUID of the new category.
 LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 										   LLAssetType::EType preferred_type,
-										   const LLString& pname)
+										   const std::string& pname)
 {
 	LLUUID id;
 	if(!isInventoryUsable())
@@ -360,7 +361,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	}
 
 	id.generate();
-	LLString name = pname;
+	std::string name = pname;
 	if(!pname.empty())
 	{
 		name.assign(pname);
@@ -473,13 +474,13 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
 
 // Generates a string containing the path to the item specified by
 // item_id.
-void LLInventoryModel::appendPath(const LLUUID& id, LLString& path)
+void LLInventoryModel::appendPath(const LLUUID& id, std::string& path)
 {
-	LLString temp;
+	std::string temp;
 	LLInventoryObject* obj = getObject(id);
 	LLUUID parent_id;
 	if(obj) parent_id = obj->getParentUUID();
-	LLString forward_slash("/");
+	std::string forward_slash("/");
 	while(obj)
 	{
 		obj = getCategory(parent_id);
@@ -1516,19 +1517,15 @@ void LLInventoryModel::cache(
 		items,
 		INCLUDE_TRASH,
 		can_cache);
-	char agent_id_str[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
-	char inventory_filename[LL_MAX_PATH];		/*Flawfinder: ignore*/
+	std::string agent_id_str;
+	std::string inventory_filename;
 	agent_id.toString(agent_id_str);
 	std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, agent_id_str));
-	snprintf(			/* Flawfinder: ignore */
-		inventory_filename,
-		LL_MAX_PATH,
-		CACHE_FORMAT_STRING,
-		path.c_str());
+	inventory_filename = llformat(CACHE_FORMAT_STRING, path.c_str());
 	saveToFile(inventory_filename, categories, items);
 	std::string gzip_filename(inventory_filename);
 	gzip_filename.append(".gz");
-	if(gzip_file(inventory_filename, gzip_filename.c_str()))
+	if(gzip_file(inventory_filename, gzip_filename))
 	{
 		lldebugs << "Successfully compressed " << inventory_filename << llendl;
 		LLFile::remove(inventory_filename);
@@ -1766,16 +1763,16 @@ bool LLInventoryModel::loadSkeleton(
 		response_t::const_iterator skel;
 		skel = (*it).find("name");
 		if(skel == no_response) goto clean_cat;
-		cat->rename(LLString((*skel).second.c_str()));
+		cat->rename(std::string((*skel).second));
 		skel = (*it).find("folder_id");
 		if(skel == no_response) goto clean_cat;
-		id.set((*skel).second.c_str());
+		id.set((*skel).second);
 		// if an id is null, it locks the viewer.
 		if(id.isNull()) goto clean_cat;
 		cat->setUUID(id);
 		skel = (*it).find("parent_id");
 		if(skel == no_response) goto clean_cat;
-		id.set((*skel).second.c_str());
+		id.set((*skel).second);
 		cat->setParent(id);
 		skel = (*it).find("type_default");
 		if(skel == no_response)
@@ -1805,25 +1802,21 @@ bool LLInventoryModel::loadSkeleton(
 	{
 		cat_array_t categories;
 		item_array_t items;
-		char owner_id_str[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
+		std::string owner_id_str;
 		owner_id.toString(owner_id_str);
 		std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, owner_id_str));
-		char inventory_filename[LL_MAX_PATH];		/*Flawfinder: ignore*/
-		snprintf(			/* Flawfinder: ignore */
-			inventory_filename,
-			LL_MAX_PATH,
-			CACHE_FORMAT_STRING,
-			path.c_str());
+		std::string inventory_filename;
+		inventory_filename = llformat(CACHE_FORMAT_STRING, path.c_str());
 		const S32 NO_VERSION = LLViewerInventoryCategory::VERSION_UNKNOWN;
 		std::string gzip_filename(inventory_filename);
 		gzip_filename.append(".gz");
-		LLFILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb");		/*Flawfinder: ignore*/
+		LLFILE* fp = LLFile::fopen(gzip_filename, "rb");
 		bool remove_inventory_file = false;
 		if(fp)
 		{
 			fclose(fp);
 			fp = NULL;
-			if(gunzip_file(gzip_filename.c_str(), inventory_filename))
+			if(gunzip_file(gzip_filename, inventory_filename))
 			{
 				// we only want to remove the inventory file if it was
 				// gzipped before we loaded, and we successfully
@@ -1977,14 +1970,14 @@ bool LLInventoryModel::loadMeat(
 		response_t::const_iterator meat;
 		meat = (*it).find("name");
 		if(meat == no_response) goto clean_item;
-		item->rename(LLString((*meat).second.c_str()));
+		item->rename(std::string((*meat).second));
 		meat = (*it).find("item_id");
 		if(meat == no_response) goto clean_item;
-		id.set((*meat).second.c_str());
+		id.set((*meat).second);
 		item->setUUID(id);
 		meat = (*it).find("parent_id");
 		if(meat == no_response) goto clean_item;
-		id.set((*meat).second.c_str());
+		id.set((*meat).second);
 		item->setParent(id);
 		meat = (*it).find("type");
 		if(meat == no_response) goto clean_item;
@@ -1998,7 +1991,7 @@ bool LLInventoryModel::loadMeat(
 		}
 		meat = (*it).find("data_id");
 		if(meat == no_response) goto clean_item;
-		id.set((*meat).second.c_str());
+		id.set((*meat).second);
 		if(LLAssetType::AT_CALLINGCARD == type)
 		{
 			LLPermissions perm;
@@ -2243,16 +2236,16 @@ void LLInventoryModel::buildParentChildMap()
 struct LLUUIDAndName
 {
 	LLUUIDAndName() {}
-	LLUUIDAndName(const LLUUID& id, const LLString& name);
+	LLUUIDAndName(const LLUUID& id, const std::string& name);
 	bool operator==(const LLUUIDAndName& rhs) const;
 	bool operator<(const LLUUIDAndName& rhs) const;
 	bool operator>(const LLUUIDAndName& rhs) const;
 
 	LLUUID mID;
-	LLString mName;
+	std::string mName;
 };
 
-LLUUIDAndName::LLUUIDAndName(const LLUUID& id, const LLString& name) :
+LLUUIDAndName::LLUUIDAndName(const LLUUID& id, const std::string& name) :
 	mID(id), mName(name)
 {
 }
@@ -2340,12 +2333,11 @@ bool LLUUIDAndName::operator>(const LLUUIDAndName& rhs) const
 //}
 
 // static
-bool LLInventoryModel::loadFromFile(
-	const char* filename,
-	LLInventoryModel::cat_array_t& categories,
-	LLInventoryModel::item_array_t& items)
+bool LLInventoryModel::loadFromFile(const std::string& filename,
+									LLInventoryModel::cat_array_t& categories,
+									LLInventoryModel::item_array_t& items)
 {
-	if(!filename)
+	if(filename.empty())
 	{
 		llerrs << "Filename is Null!" << llendl;
 		return false;
@@ -2413,12 +2405,11 @@ bool LLInventoryModel::loadFromFile(
 }
 
 // static
-bool LLInventoryModel::saveToFile(
-	const char* filename,
-	const cat_array_t& categories,
-	const item_array_t& items)
+bool LLInventoryModel::saveToFile(const std::string& filename,
+								  const cat_array_t& categories,
+								  const item_array_t& items)
 {
-	if(!filename)
+	if(filename.empty())
 	{
 		llerrs << "Filename is Null!" << llendl;
 		return false;
@@ -2993,7 +2984,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
 
 	LLUUID item_id;
 	LLUUID folder_id;
-	char new_name[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string new_name;
 	bool anything_changed = false;
 	S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
 	for(S32 i = 0; i < count; ++i)
@@ -3004,7 +2995,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
 		{
 			LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 			msg->getUUIDFast(_PREHASH_InventoryData, _PREHASH_FolderID, folder_id, i);
-			msg->getString("InventoryData", "NewName", MAX_STRING, new_name, i);
+			msg->getString("InventoryData", "NewName", new_name, i);
 
 			lldebugs << "moving item " << item_id << " to folder "
 					 << folder_id << llendl;
@@ -3016,7 +3007,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
 			gInventory.accountForUpdate(update);
 
 			new_item->setParent(folder_id);
-			if(strlen(new_name) > 0)		/*Flawfinder: ignore*/
+			if (new_name.length() > 0)
 			{
 				new_item->rename(new_name);
 			}
@@ -3074,6 +3065,45 @@ void LLInventoryModel::dumpInventory()
 /// LLInventoryCollectFunctor implementations
 ///----------------------------------------------------------------------------
 
+// static
+bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* item)
+{
+	if (!item)
+		return false;
+
+	bool allowed = false;
+	LLVOAvatar* my_avatar = NULL;
+
+	switch(item->getType())
+	{
+	case LLAssetType::AT_CALLINGCARD:
+		// not allowed
+		break;
+		
+	case LLAssetType::AT_OBJECT:
+		my_avatar = gAgent.getAvatarObject();
+		if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))
+		{
+			allowed = true;
+		}
+		break;
+		
+	case LLAssetType::AT_BODYPART:
+	case LLAssetType::AT_CLOTHING:
+		if(!gAgent.isWearingItem(item->getUUID()))
+		{
+			allowed = true;
+		}
+		break;
+		
+	default:
+		allowed = true;
+		break;
+	}
+
+	return allowed;
+}
+
 bool LLIsType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 {
 	if(mType == LLAssetType::AT_CATEGORY)
@@ -3206,7 +3236,7 @@ bool LLNameCategoryCollector::operator()(
 {
 	if(cat)
 	{
-		if (!LLString::compareInsensitive(mName.c_str(), cat->getName().c_str()))
+		if (!LLStringUtil::compareInsensitive(mName, cat->getName()))
 		{
 			return true;
 		}
@@ -3600,11 +3630,14 @@ void LLInventoryAddedObserver::changed(U32 mask)
 	// the network, figure out which item was updated.
 	// Code from Gigs Taggert, sin allowed by JC.
 	LLMessageSystem* msg = gMessageSystem;
-	const char* msg_name = msg->getMessageName();
-	if (!msg_name) return;
-
+	std::string msg_name = msg->getMessageName();
+	if (msg_name.empty())
+	{
+		return;
+	}
+	
 	// We only want newly created inventory items. JC
-	if ( strcmp(msg_name, "UpdateCreateInventoryItem") )
+	if ( msg_name != "UpdateCreateInventoryItem")
 	{
 		return;
 	}
diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index b03be24..d8c3163 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -292,7 +292,7 @@ public:
 
 	// Generates a string containing the path to the item specified by
 	// item_id.
-	void appendPath(const LLUUID& id, LLString& path);
+	void appendPath(const LLUUID& id, std::string& path);
 
 	// message handling functionality
 	static void registerCallbacks(LLMessageSystem* msg);
@@ -305,7 +305,7 @@ public:
 	// pass in a NULL to the 'name parameter.
 	LLUUID createNewCategory(const LLUUID& parent_id,
 							 LLAssetType::EType preferred_type,
-							 const LLString& name);
+							 const std::string& name);
 
 	// methods to load up inventory skeleton & meat. These are used
 	// during authentication. return true if everything parsed.
@@ -392,14 +392,12 @@ protected:
 	//void recalculateCloneInformation();
 
 	// file import/export.
-	static bool loadFromFile(
-		const char* filename,
-		cat_array_t& categories,
-		item_array_t& items); 
-	static bool saveToFile(
-		const char* filename,
-		const cat_array_t& categories,
-		const item_array_t& items); 
+	static bool loadFromFile(const std::string& filename,
+							 cat_array_t& categories,
+							 item_array_t& items); 
+	static bool saveToFile(const std::string& filename,
+						   const cat_array_t& categories,
+						   const item_array_t& items); 
 
 	// message handling functionality
 	//static void processUseCachedInventory(LLMessageSystem* msg, void**);
@@ -486,6 +484,8 @@ class LLInventoryCollectFunctor
 public:
 	virtual ~LLInventoryCollectFunctor(){};
 	virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) = 0;
+
+	static bool itemTransferCommonlyAllowed(LLInventoryItem* item);
 };
 
 
@@ -645,7 +645,7 @@ protected:
 class LLNameCategoryCollector : public LLInventoryCollectFunctor
 {
 public:
-	LLNameCategoryCollector(const char* name) : mName(name) {}
+	LLNameCategoryCollector(const std::string& name) : mName(name) {}
 	virtual ~LLNameCategoryCollector() {}
 	virtual bool operator()(LLInventoryCategory* cat,
 							LLInventoryItem* item);
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index d21a3af..2150b70 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -105,10 +105,10 @@ const S32 INV_FINDER_HEIGHT = 408;
 /// LLInventoryViewFinder
 ///----------------------------------------------------------------------------
 
-LLInventoryViewFinder::LLInventoryViewFinder(const LLString& name,
+LLInventoryViewFinder::LLInventoryViewFinder(const std::string& name,
 						const LLRect& rect,
 						LLInventoryView* inventory_view) :
-	LLFloater(name, rect, "Filters", RESIZE_NO,
+	LLFloater(name, rect, std::string("Filters"), RESIZE_NO,
 				INV_FINDER_WIDTH, INV_FINDER_HEIGHT, DRAG_ON_TOP,
 				MINIMIZE_NO, CLOSE_YES),
 	mInventoryView(inventory_view),
@@ -175,7 +175,7 @@ void LLInventoryViewFinder::updateElementsFromFilter()
 
 	// Get data needed for filter display
 	U32 filter_types = mFilter->getFilterTypes();
-	LLString filter_string = mFilter->getFilterSubString();
+	std::string filter_string = mFilter->getFilterSubString();
 	LLInventoryFilter::EFolderShow show_folders = mFilter->getShowFolderState();
 	U32 hours = mFilter->getHoursAgo();
 
@@ -449,10 +449,10 @@ void LLSaveFolderState::doFolder(LLFolderViewFolder* folder)
 }
 
 // Default constructor
-LLInventoryView::LLInventoryView(const LLString& name,
-								 const LLString& rect,
+LLInventoryView::LLInventoryView(const std::string& name,
+								 const std::string& rect,
 								 LLInventoryModel* inventory) :
-	LLFloater(name, rect, "Inventory", RESIZE_YES,
+	LLFloater(name, rect, std::string("Inventory"), RESIZE_YES,
 			  INV_MIN_WIDTH, INV_MIN_HEIGHT, DRAG_ON_TOP,
 			  MINIMIZE_NO, CLOSE_YES)
 	//LLHandle<LLFloater> mFinderHandle takes care of its own initialization
@@ -460,10 +460,10 @@ LLInventoryView::LLInventoryView(const LLString& name,
 	init(inventory);
 }
 
-LLInventoryView::LLInventoryView(const LLString& name,
+LLInventoryView::LLInventoryView(const std::string& name,
 								 const LLRect& rect,
 								 LLInventoryModel* inventory) :
-	LLFloater(name, rect, "Inventory", RESIZE_YES,
+	LLFloater(name, rect, std::string("Inventory"), RESIZE_YES,
 			  INV_MIN_WIDTH, INV_MIN_HEIGHT, DRAG_ON_TOP,
 			  MINIMIZE_NO, CLOSE_YES)
 	//LLHandle<LLFloater> mFinderHandle takes care of its own initialization
@@ -521,7 +521,7 @@ void LLInventoryView::init(LLInventoryModel* inventory)
 	std::ostringstream filterSaveName;
 	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
 	llinfos << "LLInventoryView::init: reading from " << filterSaveName << llendl;
-    llifstream file(filterSaveName.str().c_str());
+    llifstream file(filterSaveName.str());
 	LLSD savedFilterState;
     if (file.is_open())
     {
@@ -587,7 +587,7 @@ LLInventoryView::~LLInventoryView( void )
 
 	std::ostringstream filterSaveName;
 	filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
-	llofstream filtersFile(filterSaveName.str().c_str());
+	llofstream filtersFile(filterSaveName.str());
 	if(!LLSDSerialize::toPrettyXML(filterRoot, filtersFile))
 	{
 		llwarns << "Could not write to filters save file " << filterSaveName << llendl;
@@ -607,7 +607,7 @@ void LLInventoryView::draw()
 		LLLocale locale(LLLocale::USER_LOCALE);
 		std::ostringstream title;
 		title << "Inventory";
-		LLString item_count_string;
+		std::string item_count_string;
 		LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
 		title << " (" << item_count_string << " items)";
 		title << mFilterText;
@@ -764,7 +764,7 @@ void LLInventoryView::changed(U32 mask)
  	if (LLInventoryModel::backgroundFetchActive())
 	{
 		LLLocale locale(LLLocale::USER_LOCALE);
-		LLString item_count_string;
+		std::string item_count_string;
 		LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
 		title << " (Fetched " << item_count_string << " items...)";
 	}
@@ -793,8 +793,8 @@ LLInventoryView* LLInventoryView::showAgentInventory(BOOL take_keyboard_focus)
 	if(!iv && !gAgent.cameraMouselook())
 	{
 		// create one.
-		iv = new LLInventoryView("Inventory",
-								 "FloaterInventoryRect",
+		iv = new LLInventoryView(std::string("Inventory"),
+								 std::string("FloaterInventoryRect"),
 								 &gInventory);
 		iv->open();
 		// keep onscreen
@@ -805,7 +805,7 @@ LLInventoryView* LLInventoryView::showAgentInventory(BOOL take_keyboard_focus)
 	if(iv)
 	{
 		// Make sure it's in front and it makes a noise
-		iv->setTitle("Inventory");
+		iv->setTitle(std::string("Inventory"));
 		iv->open();		/*Flawfinder: ignore*/
 	}
 	//if (take_keyboard_focus)
@@ -887,7 +887,7 @@ void LLInventoryView::toggleFindOptions()
 	LLFloater *floater = getFinder();
 	if (!floater)
 	{
-		LLInventoryViewFinder * finder = new LLInventoryViewFinder("Inventory Finder",
+		LLInventoryViewFinder * finder = new LLInventoryViewFinder(std::string("Inventory Finder"),
 										LLRect(getRect().mLeft - INV_FINDER_WIDTH, getRect().mTop, getRect().mLeft, getRect().mTop - INV_FINDER_HEIGHT),
 										this);
 		mFinderHandle = finder->getHandle();
@@ -897,13 +897,13 @@ void LLInventoryView::toggleFindOptions()
 		// start background fetch of folders
 		gInventory.startBackgroundFetch();
 
-		mFloaterControls["Inventory.ShowFilters"]->setValue(TRUE);
+		mFloaterControls[std::string("Inventory.ShowFilters")]->setValue(TRUE);
 	}
 	else
 	{
 		floater->close();
 
-		mFloaterControls["Inventory.ShowFilters"]->setValue(FALSE);
+		mFloaterControls[std::string("Inventory.ShowFilters")]->setValue(FALSE);
 	}
 }
 
@@ -925,7 +925,7 @@ void LLInventoryView::onClearSearch(void* user_data)
 	LLFloater *finder = self->getFinder();
 	if (self->mActivePanel)
 	{
-		self->mActivePanel->setFilterSubString("");
+		self->mActivePanel->setFilterSubString(LLStringUtil::null);
 		self->mActivePanel->setFilterTypes(0xffffffff);
 	}
 
@@ -946,7 +946,7 @@ void LLInventoryView::onClearSearch(void* user_data)
 }
 
 //static
-void LLInventoryView::onSearchEdit(const LLString& search_string, void* user_data )
+void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_data )
 {
 	if (search_string == "")
 	{
@@ -960,9 +960,9 @@ void LLInventoryView::onSearchEdit(const LLString& search_string, void* user_dat
 
 	gInventory.startBackgroundFetch();
 
-	LLString filter_text = search_string;
-	LLString uppercase_search_string = filter_text;
-	LLString::toUpper(uppercase_search_string);
+	std::string filter_text = search_string;
+	std::string uppercase_search_string = filter_text;
+	LLStringUtil::toUpper(uppercase_search_string);
 	if (self->mActivePanel->getFilterSubString().empty() && uppercase_search_string.empty())
 	{
 			// current filter and new filter empty, do nothing
@@ -982,39 +982,39 @@ void LLInventoryView::onSearchEdit(const LLString& search_string, void* user_dat
 
 
 // static
-BOOL LLInventoryView::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward)
-{
-	LLInventoryView* active_view = NULL;
-
-	for (S32 i = 0; i < sActiveViews.count(); i++)
-	{
-		if (gFocusMgr.childHasKeyboardFocus(sActiveViews[i]))
-		{
-			active_view = sActiveViews[i];
-			break;
-		}
-	}
-
-	if (!active_view)
-	{
-		return FALSE;
-	}
-
-	LLString search_string(find_text);
-
-	if (search_string.empty())
-	{
-		return FALSE;
-	}
-
-	if (active_view->mActivePanel &&
-		active_view->mActivePanel->getRootFolder()->search(first_item, search_string, backward))
-	{
-		return TRUE;
-	}
-
-	return FALSE;
-}
+// BOOL LLInventoryView::incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward)
+// {
+// 	LLInventoryView* active_view = NULL;
+
+// 	for (S32 i = 0; i < sActiveViews.count(); i++)
+// 	{
+// 		if (gFocusMgr.childHasKeyboardFocus(sActiveViews[i]))
+// 		{
+// 			active_view = sActiveViews[i];
+// 			break;
+// 		}
+// 	}
+
+// 	if (!active_view)
+// 	{
+// 		return FALSE;
+// 	}
+
+// 	std::string search_string(find_text);
+
+// 	if (search_string.empty())
+// 	{
+// 		return FALSE;
+// 	}
+
+// 	if (active_view->mActivePanel &&
+// 		active_view->mActivePanel->getRootFolder()->search(first_item, search_string, backward))
+// 	{
+// 		return TRUE;
+// 	}
+
+// 	return FALSE;
+// }
 
 //static
 void LLInventoryView::onFilterSelected(void* userdata, bool from_click)
@@ -1062,7 +1062,7 @@ BOOL LLInventoryView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 										 EDragAndDropType cargo_type,
 										 void* cargo_data,
 										 EAcceptance* accept,
-										 LLString& tooltip_msg)
+										 std::string& tooltip_msg)
 {
 	// Check to see if we are auto scrolling from the last frame
 	LLInventoryPanel* panel = (LLInventoryPanel*)this->getActivePanel();
@@ -1079,7 +1079,7 @@ BOOL LLInventoryView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 	return handled;
 }
-LLString get_item_icon_name(LLAssetType::EType asset_type,
+std::string get_item_icon_name(LLAssetType::EType asset_type,
 							 LLInventoryType::EType inventory_type,
 							 U32 attachment_point,
 							 BOOL item_is_multi )
@@ -1197,7 +1197,7 @@ LLString get_item_icon_name(LLAssetType::EType asset_type,
 		break;
 	}
 	
-	return LLString(ICON_NAME[idx]);
+	return ICON_NAME[idx];
 }
 
 LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
@@ -1205,19 +1205,18 @@ LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
 							 U32 attachment_point,
 							 BOOL item_is_multi)
 {
-	const LLString& icon_name = get_item_icon_name(asset_type, inventory_type, attachment_point, item_is_multi );
+	const std::string& icon_name = get_item_icon_name(asset_type, inventory_type, attachment_point, item_is_multi );
 	return LLUI::getUIImage(icon_name);
 }
 
-const LLString LLInventoryPanel::DEFAULT_SORT_ORDER = LLString("InventorySortOrder");
-const LLString LLInventoryPanel::RECENTITEMS_SORT_ORDER = LLString("RecentItemsSortOrder");
-const LLString LLInventoryPanel::INHERIT_SORT_ORDER = LLString("");
+const std::string LLInventoryPanel::DEFAULT_SORT_ORDER = std::string("InventorySortOrder");
+const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("RecentItemsSortOrder");
+const std::string LLInventoryPanel::INHERIT_SORT_ORDER = std::string("");
 
-LLInventoryPanel::LLInventoryPanel(const LLString& name,
-								    const LLString& sort_order_setting,
+LLInventoryPanel::LLInventoryPanel(const std::string& name,
+								    const std::string& sort_order_setting,
 									const LLRect& rect,
 									LLInventoryModel* inventory,
-									LLFolderSearchFunction search,
 									BOOL allow_multi_select,
 									LLView *parent_view) :
 	LLPanel(name, rect, TRUE),
@@ -1226,8 +1225,7 @@ LLInventoryPanel::LLInventoryPanel(const LLString& name,
 	mFolders(NULL),
 	mScroller(NULL),
 	mAllowMultiSelect(allow_multi_select),
-	mSortOrderSetting(sort_order_setting),
-	mSearchFunction(search)
+	mSortOrderSetting(sort_order_setting)
 {
 	setBackgroundColor(gColors.getColor("InventoryBackgroundColor"));
 	setBackgroundVisible(TRUE);
@@ -1248,7 +1246,7 @@ BOOL LLInventoryPanel::postBuild()
 	// scroller
 	LLRect scroller_view_rect = getRect();
 	scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom);
-	mScroller = new LLScrollableContainerView("Inventory Scroller",
+	mScroller = new LLScrollableContainerView(std::string("Inventory Scroller"),
 											   scroller_view_rect,
 											  mFolders);
 	mScroller->setFollowsAll();
@@ -1263,7 +1261,7 @@ BOOL LLInventoryPanel::postBuild()
 	rebuildViewsFor(LLUUID::null, LLInventoryObserver::ADD);
 
 	// bit of a hack to make sure the inventory is open.
-	mFolders->openFolder("My Inventory");
+	mFolders->openFolder(std::string("My Inventory"));
 
 	if (mSortOrderSetting != INHERIT_SORT_ORDER)
 	{
@@ -1308,7 +1306,7 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 {
 	LLInventoryPanel* panel;
 
-	LLString name("inventory_panel");
+	std::string name("inventory_panel");
 	node->getAttributeString("name", name);
 
 	BOOL allow_multi_select = TRUE;
@@ -1317,12 +1315,12 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 	LLRect rect;
 	createRect(node, rect, parent, LLRect());
 
-	LLString sort_order(INHERIT_SORT_ORDER);
+	std::string sort_order(INHERIT_SORT_ORDER);
 	node->getAttributeString("sort_order", sort_order);
 
 	panel = new LLInventoryPanel(name, sort_order,
-								rect, &gInventory,
-								 LLInventoryView::incrementalFind, allow_multi_select, parent);
+								 rect, &gInventory,
+								 allow_multi_select, parent);
 
 	panel->initFromXML(node, parent);
 
@@ -1341,7 +1339,7 @@ void LLInventoryPanel::setFilterPermMask(PermissionMask filter_perm_mask)
 	mFolders->getFilter()->setFilterPermissions(filter_perm_mask);
 }
 
-void LLInventoryPanel::setFilterSubString(const LLString& string)
+void LLInventoryPanel::setFilterSubString(const std::string& string)
 {
 	mFolders->getFilter()->setFilterSubString(string);
 }
@@ -1666,7 +1664,7 @@ BOOL LLInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg)
+								   std::string& tooltip_msg)
 {
 
 	BOOL handled = LLPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
@@ -1715,13 +1713,13 @@ void LLInventoryPanel::clearSelection()
 	mFolders->clearSelection();
 }
 
-void LLInventoryPanel::createNewItem(const char* name,
+void LLInventoryPanel::createNewItem(const std::string& name,
 									const LLUUID& parent_id,
 									LLAssetType::EType asset_type,
 									LLInventoryType::EType inv_type,
 									U32 next_owner_perm)
 {
-	LLString desc;
+	std::string desc;
 	LLAssetType::generateDescriptionFor(asset_type, desc);
 	next_owner_perm = (next_owner_perm) ? next_owner_perm : PERM_MOVE | PERM_TRANSFER;
 
@@ -1730,15 +1728,15 @@ void LLInventoryPanel::createNewItem(const char* name,
 	{
 		LLPointer<LLInventoryCallback> cb = new CreateGestureCallback();
 		create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
-		parent_id, LLTransactionID::tnull, name, desc, asset_type, inv_type,
-		NOT_WEARABLE, next_owner_perm, cb);
+							  parent_id, LLTransactionID::tnull, name, desc, asset_type, inv_type,
+							  NOT_WEARABLE, next_owner_perm, cb);
 	}
 	else
 	{
 		LLPointer<LLInventoryCallback> cb = NULL;
 		create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
-		parent_id, LLTransactionID::tnull, name, desc, asset_type, inv_type,
-		NOT_WEARABLE, next_owner_perm, cb);
+							  parent_id, LLTransactionID::tnull, name, desc, asset_type, inv_type,
+							  NOT_WEARABLE, next_owner_perm, cb);
 	}
 	
 }	
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index a648eb8..a37d370 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -66,15 +66,14 @@ class LLSearchEditor;
 class LLInventoryPanel : public LLPanel
 {
 public:
-	static const LLString DEFAULT_SORT_ORDER;
-	static const LLString RECENTITEMS_SORT_ORDER;
-	static const LLString INHERIT_SORT_ORDER;
+	static const std::string DEFAULT_SORT_ORDER;
+	static const std::string RECENTITEMS_SORT_ORDER;
+	static const std::string INHERIT_SORT_ORDER;
 
-	LLInventoryPanel(const LLString& name,
-			const LLString& sort_order_setting,
+	LLInventoryPanel(const std::string& name,
+			const std::string& sort_order_setting,
 			const LLRect& rect,
 			LLInventoryModel* inventory,
-			LLFolderSearchFunction search,
 			BOOL allow_multi_select,
 			LLView *parent_view = NULL);
 	~LLInventoryPanel();
@@ -92,7 +91,7 @@ public:
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg);
+								   std::string& tooltip_msg);
 
 	// Call this method to set the selection.
 	void openAllFolders();
@@ -106,8 +105,8 @@ public:
 	U32 getFilterTypes() const { return mFolders->getFilterTypes(); }
 	void setFilterPermMask(PermissionMask filter_perm_mask);
 	U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); }
-	void setFilterSubString(const LLString& string);
-	const LLString getFilterSubString() { return mFolders->getFilterSubString(); }
+	void setFilterSubString(const std::string& string);
+	const std::string getFilterSubString() { return mFolders->getFilterSubString(); }
 	void setSortOrder(U32 order);
 	U32 getSortOrder() { return mFolders->getSortOrder(); }
 	void setSinceLogoff(BOOL sl);
@@ -139,7 +138,7 @@ public:
 	// helper method which creates an item with a good description,
 	// updates the inventory, updates the server, and pushes the
 	// inventory update out to other observers.
-	void createNewItem(const char* name,
+	void createNewItem(const std::string& name,
 					   const LLUUID& parent_id,
 					   LLAssetType::EType asset_type,
 					   LLInventoryType::EType inv_type,
@@ -151,8 +150,7 @@ protected:
 	LLFolderView*				mFolders;
 	LLScrollableContainerView*	mScroller;
 	BOOL 						mAllowMultiSelect;
-	const LLString				mSortOrderSetting;
-	LLFolderSearchFunction 		mSearchFunction;
+	const std::string				mSortOrderSetting;
 };
 
 class LLInventoryView;
@@ -160,7 +158,7 @@ class LLInventoryView;
 class LLInventoryViewFinder : public LLFloater
 {
 public:
-	LLInventoryViewFinder(const LLString& name,
+	LLInventoryViewFinder(const std::string& name,
 						const LLRect& rect,
 						LLInventoryView* inventory_view);
 	virtual void draw();
@@ -188,9 +186,9 @@ class LLInventoryView : public LLFloater, LLInventoryObserver
 friend class LLInventoryViewFinder;
 
 public:
-	LLInventoryView(const LLString& name, const LLString& rect,
+	LLInventoryView(const std::string& name, const std::string& rect,
 			LLInventoryModel* inventory);
-	LLInventoryView(const LLString& name, const LLRect& rect,
+	LLInventoryView(const std::string& name, const LLRect& rect,
 					LLInventoryModel* inventory);
 	~LLInventoryView();
 
@@ -230,7 +228,7 @@ public:
 		EDragAndDropType cargo_type,
 		void* cargo_data,
 		EAcceptance* accept,
-		LLString& tooltip_msg);
+		std::string& tooltip_msg);
 
 
 	LLInventoryPanel* getPanel() { return mActivePanel; }
@@ -240,17 +238,14 @@ public:
 	static void onClearSearch(void* user_data);
 	static void onFoldersByName(void *user_data);
 	static BOOL checkFoldersByName(void *user_data);
-	static void onSearchEdit(const LLString& search_string, void* user_data );
-	//static void onSearchCommit(LLUICtrl* caller, void* user_data );
+	static void onSearchEdit(const std::string& search_string, void* user_data );
 	static void onFilterSelected(void* userdata, bool from_click);
 	static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
-	static BOOL incrementalFind(LLFolderViewItem* first_item, const char* find_text, BOOL backward);
 
-	const LLString getFilterSubString() { return mActivePanel->getFilterSubString(); }
-	void setFilterSubString(const LLString& string) { mActivePanel->setFilterSubString(string); }
+	const std::string getFilterSubString() { return mActivePanel->getFilterSubString(); }
+	void setFilterSubString(const std::string& string) { mActivePanel->setFilterSubString(string); }
 
 	// HACK: Until we can route this info through the instant message hierarchy
-	//static BOOL sOpenNextNewItem;
 	static BOOL sWearNewClothing;
 	static LLUUID sWearNewClothingTransactionID;	// wear all clothing in this transaction
 
@@ -269,7 +264,7 @@ protected:
 	LLInventoryPanel*			mActivePanel;
 	LLSaveFolderState*			mSavedFolderState;
 
-	LLString					mFilterText;
+	std::string					mFilterText;
 
 
 	// This container is used to hold all active inventory views. This
@@ -336,15 +331,15 @@ class LLInventoryItem;
 //void wear_inventory_category_on_avatar(LLInventoryCategory* category);
 
 void wear_inventory_item_on_avatar(LLInventoryItem* item);
-void wear_outfit_by_name(const char* name);
+void wear_outfit_by_name(const std::string& name);
 void wear_inventory_category(LLInventoryCategory* category, bool copy, bool append);
 
 // These methods can open items without the inventory being visible
-void open_notecard(LLViewerInventoryItem* inv_item, const LLString& title, const LLUUID& object_id, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
-void open_landmark(LLViewerInventoryItem* inv_item, const LLString& title,                          BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
-void open_texture(const LLUUID& item_id, const LLString& title, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
+void open_notecard(LLViewerInventoryItem* inv_item, const std::string& title, const LLUUID& object_id, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
+void open_landmark(LLViewerInventoryItem* inv_item, const std::string& title,                          BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
+void open_texture(const LLUUID& item_id, const std::string& title, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
 
-LLString get_item_icon_name(LLAssetType::EType asset_type,
+std::string get_item_icon_name(LLAssetType::EType asset_type,
 							 LLInventoryType::EType inventory_type,
 							 U32 attachment_point, 
 							 BOOL item_is_multi );
diff --git a/linden/indra/newview/lljoystickbutton.cpp b/linden/indra/newview/lljoystickbutton.cpp
index 3957b0a..773c57e 100644
--- a/linden/indra/newview/lljoystickbutton.cpp
+++ b/linden/indra/newview/lljoystickbutton.cpp
@@ -59,13 +59,13 @@ const F32 ORBIT_NUDGE_RATE = 0.05f; // fraction of normal speed
 // Public Methods
 //
 LLJoystick::LLJoystick(
-	const LLString& name, 
+	const std::string& name, 
 	LLRect rect,
-	const LLString &default_image,
-	const LLString &selected_image,
+	const std::string &default_image,
+	const std::string &selected_image,
 	EJoystickQuadrant initial_quadrant )
 	:	
-	LLButton(name, rect, default_image, selected_image, NULL, NULL),
+	LLButton(name, rect, default_image, selected_image, LLStringUtil::null, NULL, NULL),
 	mInitialQuadrant(initial_quadrant),
 	mInitialOffset(0, 0),
 	mLastMouse(0, 0),
@@ -196,27 +196,27 @@ EJoystickQuadrant LLJoystick::selectQuadrant(LLXMLNodePtr node)
 
 	if (node->hasAttribute("quadrant"))
 	{
-		LLString quadrant_name;
+		std::string quadrant_name;
 		node->getAttributeString("quadrant", quadrant_name);
 
-		quadrant = quadrantFromName(quadrant_name.c_str());
+		quadrant = quadrantFromName(quadrant_name);
 	}
 	return quadrant;
 }
 
 
-LLString LLJoystick::nameFromQuadrant(EJoystickQuadrant	quadrant)
+std::string LLJoystick::nameFromQuadrant(EJoystickQuadrant	quadrant)
 {
-	if (quadrant == JQ_ORIGIN)	    return LLString("origin");
-	else if (quadrant == JQ_UP)	    return LLString("up");
-	else if (quadrant == JQ_DOWN)	return LLString("down");
-	else if (quadrant == JQ_LEFT)	return LLString("left");
-	else if (quadrant == JQ_RIGHT)	return LLString("right");
-	else return LLString();
+	if (quadrant == JQ_ORIGIN)	    return std::string("origin");
+	else if (quadrant == JQ_UP)	    return std::string("up");
+	else if (quadrant == JQ_DOWN)	return std::string("down");
+	else if (quadrant == JQ_LEFT)	return std::string("left");
+	else if (quadrant == JQ_RIGHT)	return std::string("right");
+	else return std::string();
 }
 
 
-EJoystickQuadrant LLJoystick::quadrantFromName(const LLString& sQuadrant)
+EJoystickQuadrant LLJoystick::quadrantFromName(const std::string& sQuadrant)
 {
 	EJoystickQuadrant quadrant = JQ_RIGHT;
 
@@ -252,8 +252,8 @@ LLXMLNodePtr LLJoystick::getXML(bool save_children) const
 	node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(getHAlign()));
 	node->createChild("quadrant", TRUE)->setStringValue(nameFromQuadrant(mInitialQuadrant));
 
-	addImageAttributeToXML(node,getImageUnselectedName(),getImageUnselectedID(),"image_unselected");
-	addImageAttributeToXML(node,getImageSelectedName(),getImageSelectedID(),"image_selected");
+	addImageAttributeToXML(node,getImageUnselectedName(),getImageUnselectedID(),std::string("image_unselected"));
+	addImageAttributeToXML(node,getImageSelectedName(),getImageSelectedID(),std::string("image_selected"));
 	
 	node->createChild("scale_image", TRUE)->setBoolValue(getScaleImage());
 
@@ -328,13 +328,13 @@ void LLJoystickAgentTurn::onHeldDown()
 
 LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("button");
+	std::string name("button");
 	node->getAttributeString("name", name);
 
-	LLString	image_unselected;
+	std::string	image_unselected;
 	if (node->hasAttribute("image_unselected")) node->getAttributeString("image_unselected",image_unselected);
 	
-	LLString	image_selected;
+	std::string	image_selected;
 	if (node->hasAttribute("image_selected")) node->getAttributeString("image_selected",image_selected);
 
 	EJoystickQuadrant quad = JQ_ORIGIN;
@@ -437,13 +437,13 @@ void LLJoystickAgentSlide::onHeldDown()
 // static
 LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("button");
+	std::string name("button");
 	node->getAttributeString("name", name);
 
-	LLString	image_unselected;
+	std::string	image_unselected;
 	if (node->hasAttribute("image_unselected")) node->getAttributeString("image_unselected",image_unselected);
 	
-	LLString	image_selected;
+	std::string	image_selected;
 	if (node->hasAttribute("image_selected")) node->getAttributeString("image_selected",image_selected);
 	
 	
@@ -479,7 +479,7 @@ LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtr
 // LLJoystickCameraRotate
 //-------------------------------------------------------------------------------
 
-LLJoystickCameraRotate::LLJoystickCameraRotate(const LLString& name, LLRect rect, const LLString &out_img, const LLString &in_img)
+LLJoystickCameraRotate::LLJoystickCameraRotate(const std::string& name, LLRect rect, const std::string &out_img, const std::string &in_img)
 	: 
 	LLJoystick(name, rect, out_img, in_img, JQ_ORIGIN),
 	mInLeft( FALSE ),
@@ -716,9 +716,9 @@ void LLJoystickCameraTrack::onHeldDown()
 // LLJoystickCameraZoom
 //-------------------------------------------------------------------------------
 
-LLJoystickCameraZoom::LLJoystickCameraZoom(const LLString& name, LLRect rect, const LLString &out_img, const LLString &plus_in_img, const LLString &minus_in_img)
+LLJoystickCameraZoom::LLJoystickCameraZoom(const std::string& name, LLRect rect, const std::string &out_img, const std::string &plus_in_img, const std::string &minus_in_img)
 	: 
-	LLJoystick(name, rect, out_img, "", JQ_ORIGIN),
+	LLJoystick(name, rect, out_img, LLStringUtil::null, JQ_ORIGIN),
 	mInTop( FALSE ),
 	mInBottom( FALSE )
 {
diff --git a/linden/indra/newview/lljoystickbutton.h b/linden/indra/newview/lljoystickbutton.h
index 49db055..806f8fb 100644
--- a/linden/indra/newview/lljoystickbutton.h
+++ b/linden/indra/newview/lljoystickbutton.h
@@ -49,7 +49,7 @@ class LLJoystick
 :	public LLButton
 {
 public:
-	LLJoystick(const LLString& name, LLRect rect,	const LLString &default_image,	const LLString &selected_image, EJoystickQuadrant initial);
+	LLJoystick(const std::string& name, LLRect rect,	const std::string &default_image,	const std::string &selected_image, EJoystickQuadrant initial);
 
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
@@ -63,8 +63,8 @@ public:
 	void            setInitialQuadrant(EJoystickQuadrant initial) { mInitialQuadrant = initial; };
 	
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
-	static LLString nameFromQuadrant(const EJoystickQuadrant quadrant);
-	static EJoystickQuadrant quadrantFromName(const LLString& name);
+	static std::string nameFromQuadrant(const EJoystickQuadrant quadrant);
+	static EJoystickQuadrant quadrantFromName(const std::string& name);
 	static EJoystickQuadrant selectQuadrant(LLXMLNodePtr node);
 
 
@@ -90,7 +90,7 @@ class LLJoystickAgentTurn
 :	public LLJoystick
 {
 public:
-	LLJoystickAgentTurn(const LLString& name, LLRect rect, const LLString &default_image, const LLString &selected_image, EJoystickQuadrant initial)
+	LLJoystickAgentTurn(const std::string& name, LLRect rect, const std::string &default_image, const std::string &selected_image, EJoystickQuadrant initial)
 		: LLJoystick(name, rect, default_image, selected_image, initial)
 	{ }
 
@@ -106,7 +106,7 @@ class LLJoystickAgentSlide
 :	public LLJoystick
 {
 public:
-	LLJoystickAgentSlide(const LLString& name, LLRect rect, const LLString &default_image, const LLString &selected_image, EJoystickQuadrant initial)
+	LLJoystickAgentSlide(const std::string& name, LLRect rect, const std::string &default_image, const std::string &selected_image, EJoystickQuadrant initial)
 		: LLJoystick(name, rect, default_image, selected_image, initial)
 	{ }
 	
@@ -122,7 +122,7 @@ class LLJoystickCameraRotate
 :	public LLJoystick
 {
 public:
-	LLJoystickCameraRotate(const LLString& name, LLRect rect, const LLString &out_img, const LLString &in_img);
+	LLJoystickCameraRotate(const std::string& name, LLRect rect, const std::string &out_img, const std::string &in_img);
 
 	virtual void	setToggleState( BOOL left, BOOL top, BOOL right, BOOL bottom );
 
@@ -148,7 +148,7 @@ class LLJoystickCameraTrack
 :	public LLJoystickCameraRotate
 {
 public:
-	LLJoystickCameraTrack(const LLString& name, LLRect rect, const LLString &out_img, const LLString &in_img)
+	LLJoystickCameraTrack(const std::string& name, LLRect rect, const std::string &out_img, const std::string &in_img)
 		: LLJoystickCameraRotate(name, rect, out_img, in_img)
 	{ }
 
@@ -161,7 +161,7 @@ class LLJoystickCameraZoom
 :	public LLJoystick
 {
 public:
-	LLJoystickCameraZoom(const LLString& name, LLRect rect, const LLString &out_img, const LLString &plus_in_img, const LLString &minus_in_img);
+	LLJoystickCameraZoom(const std::string& name, LLRect rect, const std::string &out_img, const std::string &plus_in_img, const std::string &minus_in_img);
 
 	virtual void	setToggleState( BOOL top, BOOL bottom );
 
diff --git a/linden/indra/newview/lllcd.cpp b/linden/indra/newview/lllcd.cpp
deleted file mode 100644
index 6574f6f..0000000
--- a/linden/indra/newview/lllcd.cpp
+++ /dev/null
@@ -1,703 +0,0 @@
-/** 
- * @file lllcd.cpp
- * @brief Lcd panel class
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-
-#include "llviewerprecompiledheaders.h"
-#include "lllcd.h"
-
-#include "llcontrol.h"
-#include "llstatusbar.h"
-#include "llviewerregion.h"
-#include "llviewerstats.h"
-#include "lluictrlfactory.h"
-#include "llviewercontrol.h"
-
-#if LL_LCD_COMPILE
-
-extern LLControlGroup gSavedSettings;
-
-#define ICON_WIDTH 28
-
-#if LL_WINDOWS
-// for Logitech LCD keyboards / speakers
-#include "EZ_LCD.h"
-#include "lllogitechlcd.h"
-
-LLLCD	*gLcdScreen = NULL; // Singleton-ish?
-
-// not happy about this, but there's no local class to put it in.
-LLPanel *bogus = NULL;
-
-// oh yeah baby! Construct those LCD page group handlers - make them all and we just turn off displaying them according to the preferences set up
-void CreateLCDDebugWindows()
-{
-	if (gLcdScreen->Enabled())
-	{
-		// load up the text so we are sure it's externalized and localized correctly.
-		bogus = new LLPanel();
-		LLUICtrlFactory::getInstance()->buildPanel(bogus, "lcd_text.xml");
-
-		LLLCDPageGroup *pageGroup = NULL;
-		pageGroup = new llDefaultPageGroup(gLcdScreen->mLCD, LLLCD::kLCDDefault, gLcdScreen->mSLIcon);
-		// push this new group onto the array
-		gLcdScreen->mPageGroupArray.push_back(pageGroup);
-
-		pageGroup = new LLChatPageGroup(gLcdScreen->mLCD, LLLCD::kLCDChat, gLcdScreen->mSLIcon);
-		// push this new group onto the array
-		gLcdScreen->mPageGroupArray.push_back(pageGroup);
-
-		pageGroup = new LLIMPageGroup(gLcdScreen->mLCD, LLLCD::kLCDIM, gLcdScreen->mSLIcon);
-		// push this new group onto the array
-		gLcdScreen->mPageGroupArray.push_back(pageGroup);
-
-		pageGroup = new LLDebugPageGroup(gLcdScreen->mLCD, LLLCD::kLCDDebug, gLcdScreen->mSLIcon);
-		// push this new group onto the array
-		gLcdScreen->mPageGroupArray.push_back(pageGroup);
-
-		pageGroup = new LLLindenPageGroup(gLcdScreen->mLCD, LLLCD::kLCDLinden, gLcdScreen->mSLIcon);
-		// push this new group onto the array
-		gLcdScreen->mPageGroupArray.push_back(pageGroup);
-
-		pageGroup = new LLRegionPageGroup(gLcdScreen->mLCD, LLLCD::kLCDRegion, gLcdScreen->mSLIcon);
-		// push this new group onto the array
-		gLcdScreen->mPageGroupArray.push_back(pageGroup);
-
-		pageGroup = new LLDebugConsolePageGroup(gLcdScreen->mLCD, LLLCD::kLCDDebugConsole, gLcdScreen->mSLIcon);
-		// push this new group onto the array
-		gLcdScreen->mPageGroupArray.push_back(pageGroup);
-	}
-}
-
-// functions that allow the chat and IM handler to insert new lines directly into the LCD page group handlers
-void AddNewIMToLCD(const LLString &newLine)
-{
-	if (gLcdScreen->Enabled())
-	{
-		LLIMPageGroup *imGroup = (LLIMPageGroup *)gLcdScreen->mPageGroupArray[2];
-		imGroup->InsertText(newLine);
-	}
-}
-
-void AddNewChatToLCD(const LLString &newLine)
-{
-	if (gLcdScreen->Enabled())
-	{
-		LLChatPageGroup *chatGroup = (LLChatPageGroup *)gLcdScreen->mPageGroupArray[1];
-		chatGroup->InsertText(newLine);
-	}
-}
-
-void AddNewDebugConsoleToLCD(const LLWString &newLine)
-{
-	if (gLcdScreen->Enabled())
-	{
- 		LLDebugConsolePageGroup *debugGroup = (LLDebugConsolePageGroup *)gLcdScreen->mPageGroupArray[6];
-		debugGroup->InsertText(newLine);
-	}
-}
-
-/////////////////////////////////////
-//
-//	Debug Console Page group class
-//
-/////////////////////////////////////
-
-void LLDebugConsolePageGroup::UpdateDetails()
-{
-	mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex); 
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(wstring_to_utf16str(mLine1).c_str()));
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[1], (LPCTSTR)(wstring_to_utf16str(mLine2).c_str()));
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[2], (LPCTSTR)(wstring_to_utf16str(mLine3).c_str()));
-}
-
-void LLDebugConsolePageGroup::GetDisplayable()
-{
-	mDisplayPage = gSavedSettings.getBOOL("DisplayDebugConsole");
-}
-
-void LLDebugConsolePageGroup::InsertText(const LLWString &newLine)
-{
-	mLine1 = mLine2;
-	mLine2 = mLine3;
-	mLine3 = newLine;
-}
-
-LLDebugConsolePageGroup::LLDebugConsolePageGroup(CEzLcd *LCD, int type, HICON SLIcon)
-:LLLCDPageGroup(LCD, type, SLIcon)
-{
-	// create a new specific pagea
-	LLLCDSpecificPage newPage;
-	newPage.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 0);
-	mLCD->SetText(title, _T("Debug Console"));
-
-	// add line
-	HANDLE chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 11);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// add line
-	chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 22);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// add line
-	chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 33);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// and then insert it
-	mPageArray.push_back(newPage);
-}
-
-/////////////////////////////////////
-//
-//	Network Comms Page group class
-//
-/////////////////////////////////////
-
-void LLDebugPageGroup::UpdateDetails()
-{
-	mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex);
-	LLString ping = "1000";
-	LLString packetsIn = "0";
-	LLString packetsOut = "0";
-	LLString packetLoss = "0";
-	LLString fps = "0";
-	LLString simfps = "0";
-	// region name
-	if (gStatusBar)
-	{ 
-		ping = llformat("%d", gStatusBar->mRegionDetails.mPing);	
-	}
-
-	packetLoss = llformat("%.1f%%", LLViewerStats::getInstance()->mPacketsLostPercentStat.getCurrent());
-	simfps = llformat("%d", (int)LLViewerStats::getInstance()->mSimFPS.getCurrent());
-	fps = llformat("%.1f%", LLViewerStats::getInstance()->mFPSStat.getMeanPerSec());
-	packetsIn = llformat("%d", (int)LLViewerStats::getInstance()->mSimInPPS.getCurrent());
-	packetsOut = llformat("%d", (int)LLViewerStats::getInstance()->mSimOutPPS.getCurrent());
-
-	// fps
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(fps).c_str()));
-	// simfps
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[1], (LPCTSTR)(utf8str_to_utf16str(simfps).c_str()));
-	// packets in
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[2], (LPCTSTR)(utf8str_to_utf16str(packetsIn).c_str()));
-	// packets out
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[3], (LPCTSTR)(utf8str_to_utf16str(packetsOut).c_str()));
-	// packet loss
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[4], (LPCTSTR)(utf8str_to_utf16str(packetLoss).c_str()));
-	// ping
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[5], (LPCTSTR)(utf8str_to_utf16str(ping).c_str())); 
-}
-
-void LLDebugPageGroup::GetDisplayable()
-{
-	mDisplayPage = gSavedSettings.getBOOL("DisplayDebug");
-}
-
-LLDebugPageGroup::LLDebugPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
-:LLLCDPageGroup(LCD, type, SLIcon)
-{
-	// create a new specific page
-	LLLCDSpecificPage newPage;
-	newPage.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 0);
-	mLCD->SetText(title, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("DebugInfo")).c_str()));
-
-	HANDLE fpsStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 18);
-	mLCD->SetOrigin(fpsStatic, ICON_WIDTH, 11);
-	mLCD->SetText(fpsStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("FPS")).c_str()));
-
-	HANDLE fps = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 25);
-	mLCD->SetOrigin(fps, ICON_WIDTH+25, 11);
-	mLCD->SetText(fps, _T(""));
-	newPage.mDisplayItemArray.push_back(fps);
-
-	HANDLE simfpsStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 35);
-	mLCD->SetOrigin(simfpsStatic, ICON_WIDTH+37+25, 11);
-	mLCD->SetText(simfpsStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("SimFPS")).c_str()));
-
-	HANDLE simfps = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 25);
-	mLCD->SetOrigin(simfps, ICON_WIDTH+37+27+37, 11);
-	mLCD->SetText(simfps, _T(""));
-	newPage.mDisplayItemArray.push_back(simfps);
-
-	HANDLE packetsinStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 25);
-	mLCD->SetOrigin(packetsinStatic, ICON_WIDTH, 22);
-	mLCD->SetText(packetsinStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Pin")).c_str()));
-
-	HANDLE packetsin = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 25);
-	mLCD->SetOrigin(packetsin, ICON_WIDTH+32, 22);
-	mLCD->SetText(packetsin, _T(""));
-	newPage.mDisplayItemArray.push_back(packetsin);
-
-	HANDLE packetsoutStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(packetsoutStatic, ICON_WIDTH+37+25, 22);
-	mLCD->SetText(packetsoutStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Pout")).c_str()));
-
-	HANDLE packetsout = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 25);
-	mLCD->SetOrigin(packetsout, ICON_WIDTH+37+27+37, 22);
-	mLCD->SetText(packetsout, _T(""));
-	newPage.mDisplayItemArray.push_back(packetsout);
-
-	HANDLE packetlossStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(packetlossStatic, ICON_WIDTH, 33);
-	mLCD->SetText(packetlossStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("PLoss")).c_str()));
-
-	HANDLE packetloss = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 35);
-	mLCD->SetOrigin(packetloss, ICON_WIDTH+33, 33);
-	mLCD->SetText(packetloss, _T(""));
-	newPage.mDisplayItemArray.push_back(packetloss);
-
-	HANDLE pingStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 20);
-	mLCD->SetOrigin(pingStatic, ICON_WIDTH+32+38, 33);
-	mLCD->SetText(pingStatic,(LPCTSTR)(utf8str_to_utf16str(bogus->getString("Ping")).c_str()));
-
-	HANDLE ping = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(ping, ICON_WIDTH+37+27+37, 33);
-	mLCD->SetText(ping, _T(""));
-	newPage.mDisplayItemArray.push_back(ping);
-
-	// and then insert it
-	mPageArray.push_back(newPage);
-}
-
-/////////////////////////////////////
-//
-//	Linden Account group class
-//
-/////////////////////////////////////
-
-void LLLindenPageGroup::UpdateDetails()
-{
-	mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex);
-	LLString time = "Unknown";
-	LLString balance = "Unknown";
-	// region name
-	if (gStatusBar)
-	{ 
-		time = gStatusBar->mRegionDetails.mTime;
-		balance = llformat("%d", gStatusBar->mRegionDetails.mBalance);
-	}
-
-	// time name
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(time).c_str()));
-	// balance
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[1], (LPCTSTR)(utf8str_to_utf16str(balance).c_str()));
-}
-
-void LLLindenPageGroup::GetDisplayable()
-{
-	mDisplayPage = gSavedSettings.getBOOL("DisplayLinden");
-}
-
-LLLindenPageGroup::LLLindenPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
-:LLLCDPageGroup(LCD, type, SLIcon)
-{
-	// create a new specific page
-	LLLCDSpecificPage newPage;
-	newPage.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 0);
-	mLCD->SetText(title, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("AccountDetails")).c_str()));
-
-	HANDLE timeStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(timeStatic, ICON_WIDTH, 11);
-	mLCD->SetText(timeStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Time")).c_str()));
-
-	HANDLE time = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH - 32);
-	mLCD->SetOrigin(time, ICON_WIDTH+32, 11);
-	mLCD->SetText(time, _T(""));
-	newPage.mDisplayItemArray.push_back(time);
-
-	HANDLE balanceStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(balanceStatic, ICON_WIDTH, 22);
-	mLCD->SetText(balanceStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("LBal")).c_str()));
-
-	HANDLE balance = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH - 35);
-	mLCD->SetOrigin(balance, ICON_WIDTH+35, 22);
-	mLCD->SetText(balance, _T(""));
-	newPage.mDisplayItemArray.push_back(balance);
-
-	// and then insert it
-	mPageArray.push_back(newPage);
-}
-
-/////////////////////////////////////
-//
-//	Region Group page
-//
-/////////////////////////////////////
-
-void LLRegionPageGroup::UpdateDetails()
-{
-	LLString pos = "Unknown";
-	LLString parcel = "Unknown";
-	LLString region = "Unknown";
-	LLString owner = "Unknown";
-	LLString forsale = bogus->getString("No");
-	LLString rtype = "Unknown";
-	LLString sqm = "0";
-	LLString traffic = "0";
-
-	// region name
-	if (gStatusBar)
-	{
-		pos = llformat(" %d, %d, %d", gStatusBar->mRegionDetails.mX, gStatusBar->mRegionDetails.mY, gStatusBar->mRegionDetails.mZ);
-		parcel = gStatusBar->mRegionDetails.mParcelName;
-		region = gStatusBar->mRegionDetails.mRegionName;
-		rtype = gStatusBar->mRegionDetails.mAccesString;
-		sqm = llformat("%d", gStatusBar->mRegionDetails.mArea);
-		if (gStatusBar->mRegionDetails.mForSale)
-		{
-			forsale = bogus->getString("Yes");
-		}
-		owner = gStatusBar->mRegionDetails.mOwner;
-		traffic = llformat("%d", (int)gStatusBar->mRegionDetails.mTraffic);
-	}
-
-	// update first page
-	mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex);
-	// region name
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(region).c_str()));
-	// parcel name
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[1], (LPCTSTR)(utf8str_to_utf16str(parcel).c_str()));
-	// position name
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[2], (LPCTSTR)(utf8str_to_utf16str(pos).c_str()));
-	// Sqm
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[3], (LPCTSTR)(utf8str_to_utf16str(sqm).c_str()));
-
-	// update second page
-	mLCD->ModifyControlsOnPage(mPageArray[1].mPageIndex);
-	// owner
-	mLCD->SetText(mPageArray[1].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(owner).c_str()));
-	// access type
-	mLCD->SetText(mPageArray[1].mDisplayItemArray[1], (LPCTSTR)(utf8str_to_utf16str(rtype).c_str()));
-	// forsale
-	mLCD->SetText(mPageArray[1].mDisplayItemArray[2], (LPCTSTR)(utf8str_to_utf16str(forsale).c_str()));
-	// traffic
-	mLCD->SetText(mPageArray[1].mDisplayItemArray[3], (LPCTSTR)(utf8str_to_utf16str(traffic).c_str()));
-
-}
-
-void LLRegionPageGroup::GetDisplayable()
-{
-	mDisplayPage = gSavedSettings.getBOOL("DisplayRegion");
-}
-
-LLRegionPageGroup::LLRegionPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
-:LLLCDPageGroup(LCD, type, SLIcon)
-{
-	// create a new specific page
-	LLLCDSpecificPage newPage;
-	newPage.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 0);
-	mLCD->SetText(title, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("LocationDetails1")).c_str()));
-
-	HANDLE regionNameStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(regionNameStatic, ICON_WIDTH, 11);
-	mLCD->SetText(regionNameStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Region")).c_str()));
-
-	HANDLE regionName = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH - 30 - 2);
-	mLCD->SetOrigin(regionName, ICON_WIDTH+32, 11);
-	mLCD->SetText(regionName, _T(""));
-	newPage.mDisplayItemArray.push_back(regionName);
-
-	HANDLE parcelStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(parcelStatic, ICON_WIDTH, 22);
-	mLCD->SetText(parcelStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Parcel")).c_str()));
-
-	HANDLE parcel = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_CENTER, 160 - ICON_WIDTH - 30 - 2);
-	mLCD->SetOrigin(parcel, ICON_WIDTH+32, 22);
-	mLCD->SetText(parcel, _T(""));
-	newPage.mDisplayItemArray.push_back(parcel);
-
-	HANDLE positionStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 18);
-	mLCD->SetOrigin(positionStatic, 0, 33);
-	mLCD->SetText(positionStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Parcel")).c_str()));
-
-	HANDLE position = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 60);
-	mLCD->SetOrigin(position, 20, 33);
-	mLCD->SetText(position, _T("100, 100, 100"));
-	newPage.mDisplayItemArray.push_back(position);
-
-	HANDLE sqmStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 18);
-	mLCD->SetOrigin(sqmStatic, 90, 33);
-	mLCD->SetText(sqmStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Sqm")).c_str()));
-
-	HANDLE sqm = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 40);
-	mLCD->SetOrigin(sqm, 90 + 20, 33);
-	mLCD->SetText(sqm, _T("1000"));
-	newPage.mDisplayItemArray.push_back(sqm);
-
-	// and then insert it
-	mPageArray.push_back(newPage);
-
-	// create a new specific page
-	LLLCDSpecificPage newPage2;
-	newPage2.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage2.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	title = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 0);
-	mLCD->SetText(title, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("LocationDetails2")).c_str()));
-
-	HANDLE ownerStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(ownerStatic, ICON_WIDTH, 11);
-	mLCD->SetText(ownerStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Owner")).c_str()));
-
-	HANDLE owner = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - 30 - ICON_WIDTH - 2);
-	mLCD->SetOrigin(owner, ICON_WIDTH+32, 11);
-	mLCD->SetText(owner, _T(""));
-	newPage2.mDisplayItemArray.push_back(owner);
-
-	HANDLE typeStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(typeStatic, ICON_WIDTH, 22);
-	mLCD->SetText(typeStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Type")).c_str()));
-
-	HANDLE rtype = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 160 - 30 - ICON_WIDTH - 2);
-	mLCD->SetOrigin(rtype, ICON_WIDTH+32, 22);
-	mLCD->SetText(rtype, _T(""));
-	newPage2.mDisplayItemArray.push_back(rtype);
-
-	HANDLE forsaleStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 40);
-	mLCD->SetOrigin(forsaleStatic, 0, 33);
-	mLCD->SetText(forsaleStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Forsale")).c_str()));
-
-	HANDLE forsale = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(forsale, 42, 33);
-	mLCD->SetText(forsale, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("No")).c_str()));
-	newPage2.mDisplayItemArray.push_back(forsale);
-
-	HANDLE trafficStatic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 50);
-	mLCD->SetOrigin(trafficStatic, 70, 33);
-	mLCD->SetText(trafficStatic, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Traffic")).c_str()));
-
-	HANDLE traffic = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_LEFT, 30);
-	mLCD->SetOrigin(traffic, 122, 33);
-	mLCD->SetText(traffic, _T("200"));
-	newPage2.mDisplayItemArray.push_back(traffic);
-
-	// and then insert it
-	mPageArray.push_back(newPage2);
-}
-
-/////////////////////////////////////
-//
-//	Chat group Page class
-//
-/////////////////////////////////////
-
-void LLChatPageGroup::UpdateDetails()
-{
-	mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex);
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(mLine1).c_str()));
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[1], (LPCTSTR)(utf8str_to_utf16str(mLine2).c_str()));
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[2], (LPCTSTR)(utf8str_to_utf16str(mLine3).c_str()));
-}
-
-void LLChatPageGroup::GetDisplayable()
-{
-	mDisplayPage = gSavedSettings.getBOOL("DisplayChat");
-}
-
-void LLChatPageGroup::InsertText(const LLString &newLine)
-{
-	mLine1 = mLine2;
-	mLine2 = mLine3;
-	mLine3 = newLine;
-}
-
-LLChatPageGroup::LLChatPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
-:LLLCDPageGroup(LCD, type, SLIcon)
-{
-	mLine1 = "";
-	mLine2 = "";
-	mLine3 = "";
-	// create a new specific page
-	LLLCDSpecificPage newPage;
-	newPage.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 0);
-	mLCD->SetText(title, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Last3ChatLines")).c_str()));
-
-	// add line
-	HANDLE chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 11);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// add line
-	chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 22);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// add line
-	chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 33);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// and then insert it
-	mPageArray.push_back(newPage);
-}
-
-/////////////////////////////////////
-//
-//	IM Page Group class
-//
-/////////////////////////////////////
-
-void LLIMPageGroup::UpdateDetails()
-{
-	mLCD->ModifyControlsOnPage(mPageArray[0].mPageIndex);
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(mLine1).c_str()));
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[1], (LPCTSTR)(utf8str_to_utf16str(mLine2).c_str()));
-	mLCD->SetText(mPageArray[0].mDisplayItemArray[2], (LPCTSTR)(utf8str_to_utf16str(mLine3).c_str()));
-}
-
-void LLIMPageGroup::GetDisplayable()
-{
-	mDisplayPage = gSavedSettings.getBOOL("DisplayIM");
-}
-
-void LLIMPageGroup::InsertText(const LLString &newLine)
-{
-	mLine1 = mLine2;
-	mLine2 = mLine3;
-	mLine3 = newLine;
-}
-
-LLIMPageGroup::LLIMPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
-:LLLCDPageGroup(LCD, type, SLIcon){
-	mLine1 = "";
-	mLine2 = "";
-	mLine3 = "";
-	// create a new specific page
-	LLLCDSpecificPage newPage;
-	newPage.mPageIndex = mLCD->AddNewPage() - 1;
-	mLCD->ModifyControlsOnPage(newPage.mPageIndex);
-
-	// add in all the display parts for this specific page
-
-	// add in the icon - all pages have this - we don't need to track this because we never update it
-	HANDLE m_rightIcon = mLCD->AddIcon(mSLIcon, 32, 32);
-	mLCD->SetOrigin(m_rightIcon, 0, 0);
-
-	// add Title
-	HANDLE title = mLCD->AddText(LG_STATIC_TEXT, LG_SMALL, DT_CENTER, 128);
-	mLCD->SetOrigin(title, 32, 0);
-	mLCD->SetText(title, (LPCTSTR)(utf8str_to_utf16str(bogus->getString("Last3IMLines")).c_str()));
-
-	// add line
-	HANDLE chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 11);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// add line
-	chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 22);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// add line
-	chatLine = mLCD->AddText(LG_SCROLLING_TEXT, LG_SMALL, DT_LEFT, 160 - ICON_WIDTH);
-	mLCD->SetOrigin(chatLine, ICON_WIDTH, 33);
-	mLCD->SetText(chatLine, _T(""));
-	newPage.mDisplayItemArray.push_back(chatLine);
-
-	// and then insert it
-	mPageArray.push_back(newPage);
-}
-
-#endif //LL_WINDOWS
-#endif //LL_LCD_COMPILE
diff --git a/linden/indra/newview/lllcd.h b/linden/indra/newview/lllcd.h
deleted file mode 100644
index 2e5f7d5..0000000
--- a/linden/indra/newview/lllcd.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/** 
- * @file lllcd.h
- * @brief Description of the LCDdisplay class.
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#define LL_LLLCD_H
-
-#ifndef LL_LOGITECH_LCD_H
-#include "lllogitechlcd.h"
-#endif
-
-
-// class that defines the specific Debug page group of pages
-class LLDebugPageGroup : public LLLCDPageGroup
-{
-public:
-	LLDebugPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual void UpdateDetails();
-	virtual void GetDisplayable();
-};
-
-// class that defines the specific Debug Console group of pages
-class LLDebugConsolePageGroup : public LLLCDPageGroup
-{
-public:
-	LLDebugConsolePageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual void UpdateDetails();
-	virtual void GetDisplayable();
-	void InsertText(const LLWString &newLine);
-private:
-	LLWString mLine1;
-	LLWString mLine2;
-	LLWString mLine3;
-};
-
-// class that defines the specific Linden Account group of pages
-class LLLindenPageGroup : public LLLCDPageGroup
-{
-public:
-	LLLindenPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual void UpdateDetails();
-	virtual void GetDisplayable();
-};
-
-// class that defines the specific Chat group of pages
-class LLChatPageGroup : public LLLCDPageGroup
-{
-public:
-	LLChatPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual void UpdateDetails();
-	virtual void GetDisplayable();
-	void InsertText(const LLString &newLine);
-private:
-	LLString mLine1;
-	LLString mLine2;
-	LLString mLine3;
-};
-
-// class that defines the specific IM group of pages
-class LLIMPageGroup : public LLLCDPageGroup
-{
-public:
-	LLIMPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual void UpdateDetails();
-	virtual void GetDisplayable();
-	void InsertText(const LLString &newLine);
-private:
-	LLString mLine1;
-	LLString mLine2;
-	LLString mLine3;
-};
-
-// class that defines the specific Region group of pages
-class LLRegionPageGroup : public LLLCDPageGroup
-{
-public:
-	LLRegionPageGroup(CEzLcd *LCD, int type, HICON SLIcon);
-	virtual void UpdateDetails();
-	virtual void GetDisplayable();
-};
-
-class LLLCD;
-
-// The following symbols are exported from lllcd.cpp
-extern LLLCD	*gLcdScreen; 
-extern void CreateLCDDebugWindows();
-
-//#endif
diff --git a/linden/indra/newview/lllogchat.cpp b/linden/indra/newview/lllogchat.cpp
index 38c4869..030b357 100644
--- a/linden/indra/newview/lllogchat.cpp
+++ b/linden/indra/newview/lllogchat.cpp
@@ -38,16 +38,29 @@
 const S32 LOG_RECALL_SIZE = 2048;
 
 //static
-LLString LLLogChat::makeLogFileName(LLString filename)
+std::string LLLogChat::makeLogFileName(std::string filename)
 {
-	filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS,filename.c_str());
+	filename = cleanFileName(filename);
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS,filename);
 	filename += ".txt";
 	return filename;
 }
 
-LLString LLLogChat::timestamp(bool withdate)
+std::string LLLogChat::cleanFileName(std::string filename)
 {
-	U32 utc_time;
+	std::string invalidChars = "\"\'\\/?*:<>|";
+	S32 position = filename.find_first_of(invalidChars);
+	while (position != filename.npos)
+	{
+		filename[position] = '_';
+		position = filename.find_first_of(invalidChars, position);
+	}
+	return filename;
+}
+
+std::string LLLogChat::timestamp(bool withdate)
+{
+	time_t utc_time;
 	utc_time = time_corrected();
 
 	// There's only one internal tm buffer.
@@ -57,7 +70,7 @@ LLString LLLogChat::timestamp(bool withdate)
 	// it's daylight savings time there.
 	timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
 
-	LLString text;
+	std::string text;
 	if (withdate)
 		text = llformat("[%d/%02d/%02d %d:%02d]  ", (timep->tm_year-100)+2000, timep->tm_mon+1, timep->tm_mday, timep->tm_hour, timep->tm_min);
 	else
@@ -68,7 +81,7 @@ LLString LLLogChat::timestamp(bool withdate)
 
 
 //static
-void LLLogChat::saveHistory(LLString filename, LLString line)
+void LLLogChat::saveHistory(std::string filename, std::string line)
 {
 	if(!filename.size())
 	{
@@ -76,7 +89,7 @@ void LLLogChat::saveHistory(LLString filename, LLString line)
 		return;
 	}
 
-	LLFILE* fp = LLFile::fopen(LLLogChat::makeLogFileName(filename).c_str(), "a"); 		/*Flawfinder: ignore*/
+	LLFILE* fp = LLFile::fopen(LLLogChat::makeLogFileName(filename), "a"); 		/*Flawfinder: ignore*/
 	if (!fp)
 	{
 		llinfos << "Couldn't open chat history log!" << llendl;
@@ -89,19 +102,19 @@ void LLLogChat::saveHistory(LLString filename, LLString line)
 	}
 }
 
-void LLLogChat::loadHistory(LLString filename , void (*callback)(ELogLineType,LLString,void*), void* userdata)
+void LLLogChat::loadHistory(std::string filename , void (*callback)(ELogLineType,std::string,void*), void* userdata)
 {
 	if(!filename.size())
 	{
 		llerrs << "Filename is Empty!" << llendl;
 	}
 
-	LLFILE* fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r");		/*Flawfinder: ignore*/
+	LLFILE* fptr = LLFile::fopen(makeLogFileName(filename), "r");		/*Flawfinder: ignore*/
 	if (!fptr)
 	{
 		//LLUIString message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
 		//callback(LOG_EMPTY,"IM_logging_string",userdata);
-		callback(LOG_EMPTY,"",userdata);
+		callback(LOG_EMPTY,LLStringUtil::null,userdata);
 		return;			//No previous conversation with this name.
 	}
 	else
@@ -128,14 +141,14 @@ void LLLogChat::loadHistory(LLString filename , void (*callback)(ELogLineType,LL
 			
 			if (!firstline)
 			{
-				callback(LOG_LINE,buffer,userdata);
+				callback(LOG_LINE,std::string(buffer),userdata);
 			}
 			else
 			{
 				firstline = FALSE;
 			}
 		}
-		callback(LOG_END,"",userdata);
+		callback(LOG_END,LLStringUtil::null,userdata);
 		
 		fclose(fptr);
 	}
diff --git a/linden/indra/newview/lllogchat.h b/linden/indra/newview/lllogchat.h
index 8c21ff2..694cec6 100644
--- a/linden/indra/newview/lllogchat.h
+++ b/linden/indra/newview/lllogchat.h
@@ -42,12 +42,14 @@ public:
 		LOG_LINE,
 		LOG_END
 	};
-	static LLString timestamp(bool withdate = false);
-	static LLString makeLogFileName(LLString(filename));
-	static void saveHistory(LLString filename, LLString line);
-	static void loadHistory(LLString filename, 
-		                    void (*callback)(ELogLineType,LLString,void*), 
+	static std::string timestamp(bool withdate = false);
+	static std::string makeLogFileName(std::string(filename));
+	static void saveHistory(std::string filename, std::string line);
+	static void loadHistory(std::string filename, 
+		                    void (*callback)(ELogLineType,std::string,void*), 
 							void* userdata);
+private:
+	static std::string cleanFileName(std::string filename);
 };
 
 #endif
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index 5c19685..89f13fe 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -92,11 +92,12 @@ void LLManip::rebuild(LLViewerObject* vobj)
 // LLManip
 
 
-LLManip::LLManip( const LLString& name, LLToolComposite* composite )
+LLManip::LLManip( const std::string& name, LLToolComposite* composite )
 	:
 	LLTool( name, composite ),
 	mInSnapRegime(FALSE),
-	mHighlightedPart(LL_NO_PART)
+	mHighlightedPart(LL_NO_PART),
+	mManipPart(LL_NO_PART)
 {
 }
 
@@ -177,7 +178,7 @@ F32 LLManip::getSubdivisionLevel(const LLVector3 &reference_point, const LLVecto
 	LLVector3 cam_to_reference;
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		cam_to_reference = LLVector3(1.f / gAgent.getAvatarObject()->mHUDCurZoom, 0.f, 0.f);
+		cam_to_reference = LLVector3(1.f / gAgent.mHUDCurZoom, 0.f, 0.f);
 	}
 	else
 	{
@@ -199,6 +200,8 @@ void LLManip::handleSelect()
 
 void LLManip::handleDeselect()
 {
+	mHighlightedPart = LL_NO_PART;
+	mManipPart = LL_NO_PART;
 	mObjectSelection = NULL;
 }
 
@@ -260,8 +263,8 @@ BOOL LLManip::getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVect
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
 		BOOL result = FALSE;
-		F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidth() - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
-		F32 mouse_y = ((F32)y / gViewerWindow->getWindowHeight() - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidth() - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.mHUDCurZoom;
+		F32 mouse_y = ((F32)y / gViewerWindow->getWindowHeight() - 0.5f) / gAgent.mHUDCurZoom;
 
 		LLVector3 origin_agent = gAgent.getPosAgentFromGlobal(origin);
 		LLVector3 mouse_pos = LLVector3(0.f, -mouse_x, mouse_y);
@@ -299,8 +302,8 @@ BOOL LLManip::nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, co
 
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
-		F32 mouse_y = (((F32)y / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.mHUDCurZoom;
+		F32 mouse_y = (((F32)y / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.mHUDCurZoom;
 		a1 = LLVector3(llmin(b1.mV[VX] - 0.1f, b2.mV[VX] - 0.1f, 0.f), -mouse_x, mouse_y);
 		a2 = a1 + LLVector3(1.f, 0.f, 0.f);
 	}
@@ -422,7 +425,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
 void LLManip::renderXYZ(const LLVector3 &vec) 
 {
 	const S32 PAD = 10;
-	char feedback_string[128];		/*Flawfinder: ignore*/
+	std::string feedback_string;
 	LLVector3 camera_pos = LLViewerCamera::getInstance()->getOrigin() + LLViewerCamera::getInstance()->getAtAxis();
 	S32 vertical_offset = gViewerWindow->getWindowHeight() / 2 - VERTICAL_OFFSET;
 	S32 window_center_x = gViewerWindow->getWindowWidth() / 2;
@@ -451,30 +454,30 @@ void LLManip::renderXYZ(const LLVector3 &vec)
 		LLLocale locale(LLLocale::USER_LOCALE);
 		LLGLDepthTest gls_depth(GL_FALSE);
 		// render drop shadowed text
-		snprintf(feedback_string, sizeof(feedback_string), "X: %.3f", vec.mV[VX]);			/* Flawfinder: ignore */
+		feedback_string = llformat("X: %.3f", vec.mV[VX]);
 		hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
 
-		snprintf(feedback_string, sizeof(feedback_string), "Y: %.3f", vec.mV[VY]);			/* Flawfinder: ignore */
+		feedback_string = llformat("Y: %.3f", vec.mV[VY]);
 		hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
 		
-		snprintf(feedback_string, sizeof(feedback_string), "Z: %.3f", vec.mV[VZ]);			/* Flawfinder: ignore */
+		feedback_string = llformat("Z: %.3f", vec.mV[VZ]);
 		hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
 
 		// render text on top
-		snprintf(feedback_string, sizeof(feedback_string), "X: %.3f", vec.mV[VX]);			/* Flawfinder: ignore */
+		feedback_string = llformat("X: %.3f", vec.mV[VX]);
 		hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f, (F32)vertical_offset, LLColor4(1.f, 0.5f, 0.5f, 1.f), FALSE);
 
 		glColor3f(0.5f, 1.f, 0.5f);
-		snprintf(feedback_string, sizeof(feedback_string), "Y: %.3f", vec.mV[VY]);			/* Flawfinder: ignore */
+		feedback_string = llformat("Y: %.3f", vec.mV[VY]);
 		hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f, (F32)vertical_offset, LLColor4(0.5f, 1.f, 0.5f, 1.f), FALSE);
 		
 		glColor3f(0.5f, 0.5f, 1.f);
-		snprintf(feedback_string, sizeof(feedback_string), "Z: %.3f", vec.mV[VZ]);			/* Flawfinder: ignore */
+		feedback_string = llformat("Z: %.3f", vec.mV[VZ]);
 		hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f, (F32)vertical_offset, LLColor4(0.5f, 0.5f, 1.f, 1.f), FALSE);
 	}
 }
 
-void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLColor4 &color)
+void LLManip::renderTickText(const LLVector3& pos, const std::string& text, const LLColor4 &color)
 {
 	const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
 
@@ -484,7 +487,7 @@ void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLCol
 	LLVector3 render_pos = pos;
 	if (hud_selection)
 	{
-		F32 zoom_amt = gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 zoom_amt = gAgent.mHUDCurZoom;
 		F32 inv_zoom_amt = 1.f / zoom_amt;
 		// scale text back up to counter-act zoom level
 		render_pos = pos * zoom_amt;
@@ -502,37 +505,37 @@ void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLCol
 	glPopMatrix();
 }
 
-void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffix, const LLColor4 &color)
+void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string& suffix, const LLColor4 &color)
 {
 	LLLocale locale(LLLocale::USER_LOCALE);
 
 	const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
 	const LLFontGL* small_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
 
-	char val_string[128];		/*Flawfinder: ignore*/
-	char fraction_string[128];		/*Flawfinder: ignore*/
+	std::string val_string;
+	std::string fraction_string;
 	F32 val_to_print = llround(value, 0.001f);
 	S32 fractional_portion = llround(fmodf(llabs(val_to_print), 1.f) * 100.f);
 	if (val_to_print < 0.f)
 	{
 		if (fractional_portion == 0)
 		{
-			snprintf(val_string, sizeof(val_string), "-%d%s", lltrunc(llabs(val_to_print)), suffix);			/* Flawfinder: ignore */
+			val_string = llformat("-%d%s", lltrunc(llabs(val_to_print)), suffix.c_str());
 		}
 		else
 		{
-			snprintf(val_string, sizeof(val_string), "-%d", lltrunc(llabs(val_to_print)));			/* Flawfinder: ignore */
+			val_string = llformat("-%d", lltrunc(llabs(val_to_print)));
 		}
 	}
 	else
 	{
 		if (fractional_portion == 0)
 		{
-			snprintf(val_string, sizeof(val_string), "%d%s", lltrunc(llabs(val_to_print)), suffix);			/* Flawfinder: ignore */
+			val_string = llformat("%d%s", lltrunc(llabs(val_to_print)), suffix.c_str());
 		}
 		else
 		{
-			snprintf(val_string, sizeof(val_string), "%d", lltrunc(val_to_print));			/* Flawfinder: ignore */
+			val_string = llformat("%d", lltrunc(val_to_print));
 		}
 	}
 
@@ -542,7 +545,7 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
 	LLVector3 render_pos = pos;
 	if (hud_selection)
 	{
-		F32 zoom_amt = gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 zoom_amt = gAgent.mHUDCurZoom;
 		F32 inv_zoom_amt = 1.f / zoom_amt;
 		// scale text back up to counter-act zoom level
 		render_pos = pos * zoom_amt;
@@ -554,7 +557,7 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
 
 	if (fractional_portion != 0)
 	{
-		snprintf(fraction_string, sizeof(fraction_string), "%c%02d%s", LLResMgr::getInstance()->getDecimalPoint(), fractional_portion, suffix);			/* Flawfinder: ignore */
+		fraction_string = llformat("%c%02d%s", LLResMgr::getInstance()->getDecimalPoint(), fractional_portion, suffix.c_str());
 
 		gViewerWindow->setupViewport(1, -1);
 		hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, -1.f * big_fontp->getWidthF32(val_string), 3.f, shadow_color, hud_selection);
diff --git a/linden/indra/newview/llmanip.h b/linden/indra/newview/llmanip.h
index 34847e7..24cd35a 100644
--- a/linden/indra/newview/llmanip.h
+++ b/linden/indra/newview/llmanip.h
@@ -120,7 +120,7 @@ public:
 public:
 	static void rebuild(LLViewerObject* vobj);
 	
-	LLManip( const LLString& name, LLToolComposite* composite );
+	LLManip( const std::string& name, LLToolComposite* composite );
 
 	virtual BOOL		handleMouseDownOnPart(S32 x, S32 y, MASK mask) = 0;
 	void				renderGuidelines(BOOL draw_x = TRUE, BOOL draw_y = TRUE, BOOL draw_z = TRUE);
@@ -143,8 +143,8 @@ protected:
 	void				getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3 &normal);
 	BOOL				getManipAxis(LLViewerObject* object, EManipPart manip, LLVector3 &axis);
 	F32					getSubdivisionLevel(const LLVector3 &reference_point, const LLVector3 &translate_axis, F32 grid_scale, S32 min_pixel_spacing = MIN_DIVISION_PIXEL_WIDTH);
-	void				renderTickValue(const LLVector3& pos, F32 value, const char* suffix, const LLColor4 &color);
-	void				renderTickText(const LLVector3& pos, const char* suffix, const LLColor4 &color);
+	void				renderTickValue(const LLVector3& pos, F32 value, const std::string& suffix, const LLColor4 &color);
+	void				renderTickText(const LLVector3& pos, const std::string& suffix, const LLColor4 &color);
 	void				updateGridSettings();
 	BOOL				getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal) const;
 	BOOL				getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector3 origin, LLVector3 normal);
@@ -155,6 +155,7 @@ protected:
 	BOOL				mInSnapRegime;
 	LLSafeHandle<LLObjectSelection> mObjectSelection;
 	EManipPart			mHighlightedPart;
+	EManipPart			mManipPart;
 
 	static F32			sHelpTextVisibleTime;
 	static F32			sHelpTextFadeTime;
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index b60e29a..11b5e8c 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -86,7 +86,7 @@ const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 extern void handle_reset_rotation(void*);  // in LLViewerWindow
 
 LLManipRotate::LLManipRotate( LLToolComposite* composite )
-: 	LLManip( "Rotate", composite ),
+: 	LLManip( std::string("Rotate"), composite ),
 	mRotationCenter(),
 	mCenterScreen(),
 	mRotation(),
@@ -98,7 +98,6 @@ LLManipRotate::LLManipRotate( LLToolComposite* composite )
 	mCenterToCamMag(0.f),
 	mCenterToProfilePlane(),
 	mCenterToProfilePlaneMag(0.f),
-	mManipPart( LL_NO_PART ),
 	mSendUpdateOnMouseUp( FALSE ),
 	mSmoothRotate( FALSE ),
 	mCamEdgeOn(FALSE),
@@ -113,13 +112,6 @@ void LLManipRotate::handleSelect()
 	LLManip::handleSelect();
 }
 
-void LLManipRotate::handleDeselect()
-{
-	mHighlightedPart = LL_NO_PART;
-	mManipPart = LL_NO_PART;
-	LLManip::handleDeselect();
-}
-
 void LLManipRotate::render()
 {
 	LLGLSUIDefault gls_ui;
@@ -144,7 +136,7 @@ void LLManipRotate::render()
 	glPushMatrix();
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 zoom = gAgent.mHUDCurZoom;
 		glScalef(zoom, zoom, zoom);
 	}
 
@@ -363,8 +355,7 @@ BOOL LLManipRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 	LLViewerObject* first_object = mObjectSelection->getFirstMoveableObject(TRUE);
 	if( first_object )
 	{
-		LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-		if( hit_obj && mHighlightedPart != LL_NO_PART )
+		if( mHighlightedPart != LL_NO_PART )
 		{
 			handled = handleMouseDownOnPart( x, y, mask );
 		}
@@ -457,6 +448,19 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
 
 	if( hasMouseCapture() )
 	{
+		for (LLObjectSelection::iterator iter = mObjectSelection->begin();
+		 iter != mObjectSelection->end(); iter++)
+		{
+			LLSelectNode* selectNode = *iter;
+			LLViewerObject* object = selectNode->getObject();
+
+			// have permission to move and object is root of selection or individually selected
+			if (object->permMove() && (object->isRootEdit() || selectNode->mIndividualSelection))
+			{
+				object->mUnselectedChildrenPositions.clear() ;
+			}
+		}
+
 		mManipPart = LL_NO_PART;
 
 		// Might have missed last update due to timing.
@@ -553,16 +557,12 @@ void LLManipRotate::drag( S32 x, S32 y )
 			}
 
 			LLQuaternion new_rot = selectNode->mSavedRotation * mRotation;
-			std::vector<LLVector3> child_positions;
+			std::vector<LLVector3>& child_positions = object->mUnselectedChildrenPositions ;
 			std::vector<LLQuaternion> child_rotations;
 			if (object->isRootEdit() && selectNode->mIndividualSelection)
 			{
-				for (U32 i = 0; i < object->mChildList.size(); i++)
-				{
-					LLViewerObject* childp = object->mChildList[i];
-					child_positions.push_back(childp->getPositionEdit());
-					child_rotations.push_back(childp->getRotationEdit());
-				}
+				object->saveUnselectedChildrenRotation(child_rotations) ;
+				object->saveUnselectedChildrenPosition(child_positions) ;			
 			}
 
 			if (object->getParent() && object->mDrawable.notNull())
@@ -584,17 +584,7 @@ void LLManipRotate::drag( S32 x, S32 y )
 			{
 				//RN: must do non-damped updates on these objects so relative rotation appears constant
 				// instead of having two competing slerps making the child objects appear to "wobble"
-				for (U32 i = 0; i < object->mChildList.size(); i++)
-				{
-					LLViewerObject* childp = object->mChildList[i];
-					LLVector3 child_offset = ((child_positions[i] - object->getPositionEdit()) * ~object->getRotationEdit()) - childp->getPosition();
-					if (!childp->isSelected() && childp->mDrawable.notNull())
-					{
-						childp->setRotation(child_rotations[i] * ~object->getRotationEdit());
-						childp->setPosition((child_positions[i] - object->getPositionEdit()) * ~object->getRotationEdit());
-						rebuild(childp);
-					}
-				}
+				object->resetChildrenRotationAndPosition(child_rotations, child_positions) ;
 			}
 		}
 	}
@@ -676,28 +666,8 @@ void LLManipRotate::drag( S32 x, S32 y )
 			if (object->isRootEdit() && selectNode->mIndividualSelection)
 			{
 				// only offset by parent's translation as we've already countered parent's rotation
-				LLVector3 child_offset;
-				if (object->isAttachment() && object->mDrawable.notNull())
-				{
-					LLXform* attachment_point_xform = object->mDrawable->getXform()->getParent();
-					LLQuaternion parent_rotation = object->getRotation() * attachment_point_xform->getWorldRotation();
-					child_offset = LLVector3(old_position - new_position) * ~parent_rotation;
-				}
-				else
-				{
-					child_offset = LLVector3(old_position - new_position) * ~object->getRenderRotation();
-				}
-
 				rebuild(object);
-				for (U32 i = 0; i < object->mChildList.size(); i++)
-				{
-					LLViewerObject* childp = object->mChildList[i];
-					if (!childp->isSelected() && childp->mDrawable.notNull())
-					{
-						childp->setPosition(childp->getPosition() + child_offset);
-						rebuild(childp);
-					}
-				}
+				object->resetChildrenPosition(old_position - new_position) ;				
 			}
 		}
 	}
@@ -926,6 +896,7 @@ void LLManipRotate::renderSnapGuides()
 				}
 				gGL.end();
 
+				// *TODO: Translate
 				//RN: text rendering does own shadow pass, so only render once
 				if (pass == 1 && render_text && i % 16 == 0)
 				{
@@ -933,32 +904,32 @@ void LLManipRotate::renderSnapGuides()
 					{
 						if (i == 0)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
+							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
 						}
 						else if (i == 16)
 						{
 							if (constraint_axis.mV[VZ] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
 							}
 						}
 						else if (i == 32)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
+							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
 						}
 						else
 						{
 							if (constraint_axis.mV[VZ] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
 							}
 						}
 					}
@@ -966,32 +937,32 @@ void LLManipRotate::renderSnapGuides()
 					{
 						if (i == 0)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
+							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
 						}
 						else if (i == 16)
 						{
 							if (constraint_axis.mV[VX] > 0.f)
 							{
-								renderTickText(text_point, "Up", LLColor4::white);
+								renderTickText(text_point, std::string("Up"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, "Down", LLColor4::white);
+								renderTickText(text_point, std::string("Down"), LLColor4::white);
 							}
 						}
 						else if (i == 32)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
+							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
 						}
 						else
 						{
 							if (constraint_axis.mV[VX] > 0.f)
 							{
-								renderTickText(text_point, "Down", LLColor4::white);
+								renderTickText(text_point, std::string("Down"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, "Up", LLColor4::white);
+								renderTickText(text_point, std::string("Up"), LLColor4::white);
 							}
 						}
 					}
@@ -999,32 +970,32 @@ void LLManipRotate::renderSnapGuides()
 					{
 						if (i == 0)
 						{
-							renderTickText(text_point, "Up", LLColor4::white);
+							renderTickText(text_point, std::string("Up"), LLColor4::white);
 						}
 						else if (i == 16)
 						{
 							if (constraint_axis.mV[VY] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
 							}
 						}
 						else if (i == 32)
 						{
-							renderTickText(text_point, "Down", LLColor4::white);
+							renderTickText(text_point, std::string("Down"), LLColor4::white);
 						}
 						else
 						{
 							if (constraint_axis.mV[VY] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
+								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
 							}
 						}
 					}
@@ -1125,18 +1096,18 @@ BOOL LLManipRotate::updateVisiblity()
 	LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		mCenterToCam = LLVector3(-1.f / gAgent.getAvatarObject()->mHUDCurZoom, 0.f, 0.f);
+		mCenterToCam = LLVector3(-1.f / gAgent.mHUDCurZoom, 0.f, 0.f);
 		mCenterToCamNorm = mCenterToCam;
 		mCenterToCamMag = mCenterToCamNorm.normVec();
 
 		mRadiusMeters = RADIUS_PIXELS / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
-		mRadiusMeters /= gAgent.getAvatarObject()->mHUDCurZoom;
+		mRadiusMeters /= gAgent.mHUDCurZoom;
 
 		mCenterToProfilePlaneMag = mRadiusMeters * mRadiusMeters / mCenterToCamMag;
 		mCenterToProfilePlane = -mCenterToProfilePlaneMag * mCenterToCamNorm;
 
-		mCenterScreen.set((S32)((0.5f - mRotationCenter.mdV[VY]) / gAgent.getAvatarObject()->mHUDCurZoom * gViewerWindow->getWindowWidth()),
-							(S32)((mRotationCenter.mdV[VZ] + 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom * gViewerWindow->getWindowHeight()));
+		mCenterScreen.set((S32)((0.5f - mRotationCenter.mdV[VY]) / gAgent.mHUDCurZoom * gViewerWindow->getWindowWidth()),
+							(S32)((mRotationCenter.mdV[VZ] + 0.5f) / gAgent.mHUDCurZoom * gViewerWindow->getWindowHeight()));
 		visible = TRUE;
 	}
 	else
@@ -1652,8 +1623,8 @@ void LLManipRotate::mouseToRay( S32 x, S32 y, LLVector3* ray_pt, LLVector3* ray_
 {
 	if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
 	{
-		F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
-		F32 mouse_y = ((((F32)y) / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) / gAgent.mHUDCurZoom;
+		F32 mouse_y = ((((F32)y) / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.mHUDCurZoom;
 
 		*ray_pt = LLVector3(-1.f, -mouse_x, mouse_y);
 		*ray_dir = LLVector3(1.f, 0.f, 0.f);
diff --git a/linden/indra/newview/llmaniprotate.h b/linden/indra/newview/llmaniprotate.h
index 5e7aa6d..b17e030 100644
--- a/linden/indra/newview/llmaniprotate.h
+++ b/linden/indra/newview/llmaniprotate.h
@@ -64,7 +64,6 @@ public:
 	virtual void	render();
 
 	virtual void	handleSelect();
-	virtual void	handleDeselect();
 
 	virtual BOOL	handleMouseDownOnPart(S32 x, S32 y, MASK mask);
 	virtual void	highlightManipulators(S32 x, S32 y);
@@ -109,8 +108,6 @@ private:
 	LLVector3			mCenterToProfilePlane;
 	F32					mCenterToProfilePlaneMag;
 
-	EManipPart			mManipPart;
-
 	BOOL				mSendUpdateOnMouseUp;
 
 	BOOL				mSmoothRotate;
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index d5ab7a1..0fa5fa5 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -166,19 +166,11 @@ void LLManipScale::handleSelect()
 	LLManip::handleSelect();
 }
 
-void LLManipScale::handleDeselect()
-{
-	mHighlightedPart = LL_NO_PART;
-	mManipPart = LL_NO_PART;
-	LLManip::handleDeselect();
-}
-
 LLManipScale::LLManipScale( LLToolComposite* composite )
 	: 
-	LLManip( "Scale", composite ),
+	LLManip( std::string("Scale"), composite ),
 	mBoxHandleSize( 1.f ),
 	mScaledBoxHandleSize( 1.f ),
-	mManipPart( LL_NO_PART ),
 	mLastMouseX( -1 ),
 	mLastMouseY( -1 ),
 	mSendUpdateOnMouseUp( FALSE ),
@@ -216,7 +208,7 @@ void LLManipScale::render()
 		glPushMatrix();
 		if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 		{
-			F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
+			F32 zoom = gAgent.mHUDCurZoom;
 			glScalef(zoom, zoom, zoom);
 		}
 
@@ -233,7 +225,7 @@ void LLManipScale::render()
 		if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 		{
 			mBoxHandleSize = BOX_HANDLE_BASE_SIZE * BOX_HANDLE_BASE_FACTOR / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
-			mBoxHandleSize /= gAgent.getAvatarObject()->mHUDCurZoom;
+			mBoxHandleSize /= gAgent.mHUDCurZoom;
 		}
 		else
 		{
@@ -316,9 +308,7 @@ BOOL LLManipScale::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	BOOL	handled = FALSE;
 
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-	if( hit_obj ||  
-		(mHighlightedPart != LL_NO_PART) )
+	if(mHighlightedPart != LL_NO_PART)
 	{
 		handled = handleMouseDownOnPart( x, y, mask );
 	}
@@ -446,7 +436,7 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
 			LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
 			transform *= cfr;
 			LLMatrix4 window_scale;
-			F32 zoom_level = 2.f * gAgent.getAvatarObject()->mHUDCurZoom;
+			F32 zoom_level = 2.f * gAgent.mHUDCurZoom;
 			window_scale.initAll(LLVector3(zoom_level / LLViewerCamera::getInstance()->getAspect(), zoom_level, 0.f),
 				LLQuaternion::DEFAULT,
 				LLVector3::zero);
@@ -1013,9 +1003,11 @@ void LLManipScale::dragCorner( S32 x, S32 y )
 			if (selectNode->mIndividualSelection)
 			{
 				// counter-translate child objects if we are moving the root as an individual
-				for (U32 child_num = 0; child_num < cur->mChildList.size(); child_num++)
+				LLViewerObject::const_child_list_t& child_list = cur->getChildren();
+				for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+					 iter != child_list.end(); iter++)
 				{
-					LLViewerObject* childp = cur->mChildList[child_num];
+					LLViewerObject* childp = *iter;
 
 					if (cur->isAttachment())
 					{
@@ -1311,9 +1303,11 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
 			if (cur->isRootEdit() && selectNode->mIndividualSelection)
 			{
 				// counter-translate child objects if we are moving the root as an individual
-				for (U32 child_num = 0; child_num < cur->mChildList.size(); child_num++)
+				LLViewerObject::const_child_list_t& child_list = cur->getChildren();
+				for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+					 iter != child_list.end(); iter++)
 				{
-					LLViewerObject* childp = cur->mChildList[child_num];
+					LLViewerObject* childp = *iter;
 					if (!getUniform())
 					{
 						LLVector3 child_pos = childp->getPosition() - (delta_pos * ~cur->getRotationEdit());
@@ -1367,7 +1361,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
 
 	if(mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		mSnapRegimeOffset = SNAP_GUIDE_SCREEN_OFFSET / gAgent.getAvatarObject()->mHUDCurZoom;
+		mSnapRegimeOffset = SNAP_GUIDE_SCREEN_OFFSET / gAgent.mHUDCurZoom;
 
 	}
 	else
@@ -1380,7 +1374,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
 		cam_at_axis.setVec(1.f, 0.f, 0.f);
-		snap_guide_length = SNAP_GUIDE_SCREEN_LENGTH / gAgent.getAvatarObject()->mHUDCurZoom;
+		snap_guide_length = SNAP_GUIDE_SCREEN_LENGTH / gAgent.mHUDCurZoom;
 	}
 	else
 	{
@@ -1751,7 +1745,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
 					text_highlight = 1.f;
 				}
 
-				renderTickValue(text_origin, tick_val, grid_mode == GRID_MODE_WORLD ? "m" : "x", LLColor4(text_highlight, text_highlight, text_highlight, alpha));
+				renderTickValue(text_origin, tick_val, grid_mode == GRID_MODE_WORLD ? std::string("m") : std::string("x"), LLColor4(text_highlight, text_highlight, text_highlight, alpha));
 			}
 		}
 
@@ -1803,7 +1797,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
 						text_highlight = 1.f;
 					}
 
-					renderTickValue(text_origin, tick_val, grid_mode == GRID_MODE_WORLD ? "m" : "x", LLColor4(text_highlight, text_highlight, text_highlight, alpha));
+					renderTickValue(text_origin, tick_val, grid_mode == GRID_MODE_WORLD ? std::string("m") : std::string("x"), LLColor4(text_highlight, text_highlight, text_highlight, alpha));
 				}
 			}
 		}
diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index f3d0996..333cbd2 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -76,7 +76,6 @@ public:
 	virtual BOOL	handleHover( S32 x, S32 y, MASK mask );
 	virtual void	render();
 	virtual void	handleSelect();
-	virtual void	handleDeselect();
 
 	virtual BOOL	handleMouseDownOnPart(S32 x, S32 y, MASK mask);
 	virtual void	highlightManipulators(S32 x, S32 y);	// decided which manipulator, if any, should be highlighted by mouse hover
@@ -140,7 +139,6 @@ private:
 
 	F32				mBoxHandleSize;		// The size of the handles at the corners of the bounding box
 	F32				mScaledBoxHandleSize; // handle size after scaling for selection feedback
-	EManipPart		mManipPart;
 	LLVector3d		mDragStartPointGlobal;
 	LLVector3d		mDragStartCenterGlobal;	// The center of the bounding box of all selected objects at time of drag start
 	LLVector3d		mDragPointGlobal;
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 7dbb470..2278453 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -101,7 +101,7 @@ const U32 ARROW_TO_AXIS[4] =
 };
 
 LLManipTranslate::LLManipTranslate( LLToolComposite* composite )
-:	LLManip( "Move", composite ),
+:	LLManip( std::string("Move"), composite ),
 	mLastHoverMouseX(-1),
 	mLastHoverMouseY(-1),
 	mSendUpdateOnMouseUp(FALSE),
@@ -113,7 +113,6 @@ LLManipTranslate::LLManipTranslate( LLToolComposite* composite )
 	mConeSize(0),
 	mArrowLengthMeters(0.f),
 	mPlaneManipOffsetMeters(0.f),
-	mManipPart(LL_NO_PART),
 	mUpdateTimer(),
 	mSnapOffsetMeters(0.f),
 	mArrowScales(1.f, 1.f, 1.f),
@@ -257,21 +256,12 @@ void LLManipTranslate::handleSelect()
 	LLManip::handleSelect();
 }
 
-void LLManipTranslate::handleDeselect()
-{
-	mHighlightedPart = LL_NO_PART;
-	mManipPart = LL_NO_PART;
-	LLManip::handleDeselect();
-}
-
 BOOL LLManipTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	BOOL	handled = FALSE;
 
 	// didn't click in any UI object, so must have clicked in the world
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-	if( hit_obj && 
-		(mHighlightedPart == LL_X_ARROW ||
+	if( (mHighlightedPart == LL_X_ARROW ||
 		 mHighlightedPart == LL_Y_ARROW ||
 		 mHighlightedPart == LL_Z_ARROW ||
 		 mHighlightedPart == LL_YZ_PLANE ||
@@ -687,19 +677,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 				if (selectNode->mIndividualSelection)
 				{
 					send_update = FALSE;
-					LLVector3 child_offset = (old_position_local - new_position_local) * ~object->getRotation();
-
+		
 					// counter-translate child objects if we are moving the root as an individual
-					for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++)
-					{
-						LLViewerObject* childp = object->mChildList[child_num];
-
-						if (!childp->isSelected())
-						{
-							childp->setPosition(childp->getPosition() + child_offset);
-							rebuild(childp);
-						}
-					}
+					object->resetChildrenPosition(old_position_local - new_position_local, TRUE) ;					
 				}
 			}
 			else
@@ -753,18 +733,8 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 
 				if (selectNode->mIndividualSelection)
 				{
-					LLVector3 parent_offset = (new_position_agent - old_position_agent) * ~object->getRotation();
-
 					// counter-translate child objects if we are moving the root as an individual
-					for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++)
-					{
-						LLViewerObject* childp = object->mChildList[child_num];
-						if (!childp->isSelected())
-						{
-							childp->setPosition(childp->getPosition() - parent_offset);
-							rebuild(childp);
-						}
-					}
+					object->resetChildrenPosition(old_position_agent - new_position_agent, TRUE) ;					
 					send_update = FALSE;
 				}
 				else if (old_position_global != new_position_global)
@@ -818,7 +788,7 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
 		LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
 		transform *= cfr;
 		LLMatrix4 window_scale;
-		F32 zoom_level = 2.f * gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 zoom_level = 2.f * gAgent.mHUDCurZoom;
 		window_scale.initAll(LLVector3(zoom_level / LLViewerCamera::getInstance()->getAspect(), zoom_level, 0.f),
 			LLQuaternion::DEFAULT,
 			LLVector3::zero);
@@ -1056,7 +1026,7 @@ void LLManipTranslate::render()
 	gGL.pushMatrix();
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
-		F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 zoom = gAgent.mHUDCurZoom;
 		glScalef(zoom, zoom, zoom);
 	}
 	{
@@ -1220,7 +1190,7 @@ void LLManipTranslate::renderSnapGuides()
 
 		if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 		{
-			guide_size_meters = 1.f / gAgent.getAvatarObject()->mHUDCurZoom;
+			guide_size_meters = 1.f / gAgent.mHUDCurZoom;
 			mSnapOffsetMeters = mArrowLengthMeters * 1.5f;
 		}
 		else
@@ -1412,11 +1382,11 @@ void LLManipTranslate::renderSnapGuides()
 				{
 					// rescale units to meters from multiple of grid scale
 					offset_val *= 2.f * grid_scale[ARROW_TO_AXIS[mManipPart]];
-					renderTickValue(text_origin, offset_val, "m", LLColor4(text_highlight, text_highlight, text_highlight, alpha));
+					renderTickValue(text_origin, offset_val, std::string("m"), LLColor4(text_highlight, text_highlight, text_highlight, alpha));
 				}
 				else
 				{
-					renderTickValue(text_origin, offset_val, "x", LLColor4(text_highlight, text_highlight, text_highlight, alpha));
+					renderTickValue(text_origin, offset_val, std::string("x"), LLColor4(text_highlight, text_highlight, text_highlight, alpha));
 				}
 			}
 		}
@@ -1803,7 +1773,7 @@ void LLManipTranslate::renderTranslationHandles()
 	if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
 	{
 		mArrowLengthMeters = mAxisArrowLength / gViewerWindow->getWindowHeight();
-		mArrowLengthMeters /= gAgent.getAvatarObject()->mHUDCurZoom;
+		mArrowLengthMeters /= gAgent.mHUDCurZoom;
 	}
 	else
 	{
diff --git a/linden/indra/newview/llmaniptranslate.h b/linden/indra/newview/llmaniptranslate.h
index 05decfb..7784860 100644
--- a/linden/indra/newview/llmaniptranslate.h
+++ b/linden/indra/newview/llmaniptranslate.h
@@ -61,7 +61,6 @@ public:
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual void	render();
 	virtual void	handleSelect();
-	virtual void	handleDeselect();
 
 	virtual void	highlightManipulators(S32 x, S32 y);
 	virtual BOOL	handleMouseDownOnPart(S32 x, S32 y, MASK mask);
@@ -110,7 +109,6 @@ private:
 	F32			mArrowLengthMeters;		// meters
 	F32			mGridSizeMeters;
 	F32			mPlaneManipOffsetMeters;
-	EManipPart	mManipPart;
 	LLVector3	mManipNormal;
 	LLVector3d	mDragCursorStartGlobal;
 	LLVector3d	mDragSelectionStartGlobal;
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 448bc7f..1b337ab 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -133,11 +133,11 @@ void* LLMediaRemoteCtrl::createVolumePanel(void* data)
 }
 
 // Virtual
-void LLMediaRemoteCtrl::setToolTip(const LLString& msg)
+void LLMediaRemoteCtrl::setToolTip(const std::string& msg)
 {
-	LLString mime_type = LLMIMETypes::translate(LLViewerMedia::getMimeType());
-	LLString tool_tip = LLMIMETypes::findToolTip(LLViewerMedia::getMimeType());
-	LLString play_tip = LLMIMETypes::findPlayTip(LLViewerMedia::getMimeType());
+	std::string mime_type = LLMIMETypes::translate(LLViewerMedia::getMimeType());
+	std::string tool_tip = LLMIMETypes::findToolTip(LLViewerMedia::getMimeType());
+	std::string play_tip = LLMIMETypes::findPlayTip(LLViewerMedia::getMimeType());
 	// childSetToolTip("media_stop", mControls->getString("stop_label") + "\n" + tool_tip);
 	childSetToolTip("media_icon", tool_tip);
 	childSetToolTip("media_play", play_tip);
@@ -154,10 +154,10 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 	bool media_show_pause = false;
 	LLColor4 music_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
 	LLColor4 media_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
-	LLString media_type = "none/none";
+	std::string media_type = "none/none";
 
 	// Put this in xui file
-	LLString media_url = mControls->getString("default_tooltip_label");
+	std::string media_url = mControls->getString("default_tooltip_label");
 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 
 	if (gSavedSettings.getBOOL("AudioStreamingVideo"))
@@ -225,7 +225,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 			stop_media_enabled = false;
 		}
 	}
-	const LLString media_icon_name = LLMIMETypes::findIcon(media_type);
+	const std::string media_icon_name = LLMIMETypes::findIcon(media_type);
 	LLButton* music_play_btn = getChild<LLButton>("music_play");
 	LLButton* music_stop_btn = getChild<LLButton>("music_stop");
 	LLButton* music_pause_btn = getChild<LLButton>("music_pause");
diff --git a/linden/indra/newview/llmediaremotectrl.h b/linden/indra/newview/llmediaremotectrl.h
index 07c2ee9..cb1cbbe 100644
--- a/linden/indra/newview/llmediaremotectrl.h
+++ b/linden/indra/newview/llmediaremotectrl.h
@@ -52,7 +52,7 @@ public:
 	static void onClickExpandBtn(void* user_data);
 	static void* createVolumePanel(void* data);
 	
-	virtual void setToolTip(const LLString& msg);
+	virtual void setToolTip(const std::string& msg);
 
 protected:
 	void build();
diff --git a/linden/indra/newview/llmemoryview.cpp b/linden/indra/newview/llmemoryview.cpp
index 32f5431..c814e2b 100644
--- a/linden/indra/newview/llmemoryview.cpp
+++ b/linden/indra/newview/llmemoryview.cpp
@@ -121,6 +121,7 @@ static const struct mtv_display_info mtv_display_table[] =
 	{ LLMemType::MTYPE_SPACE_PARTITION,	"Space Partition",	&LLColor4::blue2 },
 	{ LLMemType::MTYPE_VERTEX_DATA,		"Vertex Buffer",	&LLColor4::blue3 },
 	{ LLMemType::MTYPE_AVATAR,			"Avatar",			&LLColor4::purple1 },
+	{ LLMemType::MTYPE_AVATAR_MESH,		"Avatar Mesh",		&LLColor4::purple2 },
 	{ LLMemType::MTYPE_ANIMATION,		"Animation",		&LLColor4::purple3 },
 	{ LLMemType::MTYPE_REGIONS,			"Regions",			&LLColor4::blue1 },
 	{ LLMemType::MTYPE_VOLUME,			"Volume",			&LLColor4::pink1 },
diff --git a/linden/indra/newview/llmimetypes.cpp b/linden/indra/newview/llmimetypes.cpp
index d5a1ffe..355dc33 100644
--- a/linden/indra/newview/llmimetypes.cpp
+++ b/linden/indra/newview/llmimetypes.cpp
@@ -39,17 +39,17 @@
 LLMIMETypes::mime_info_map_t LLMIMETypes::sMap;
 LLMIMETypes::mime_widget_set_map_t LLMIMETypes::sWidgetMap;
 
-LLString sDefaultLabel;
+std::string sDefaultLabel;
 	// Returned when we don't know what to do with the mime type
-LLString sDefaultWidgetType;
+std::string sDefaultWidgetType;
 	// Returned when we don't know what widget set to use
-LLString sDefaultImpl;
+std::string sDefaultImpl;
 	// Returned when we don't know what impl to use
 
 /////////////////////////////////////////////////////////////////////////////
 
 // static
-bool LLMIMETypes::parseMIMETypes(const LLString& xml_filename)
+bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename)
 {
 	LLXMLNodePtr root;
 	bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
@@ -78,7 +78,7 @@ bool LLMIMETypes::parseMIMETypes(const LLString& xml_filename)
 		}
 		else if (node->hasName("mimetype") || node->hasName("scheme"))
 		{
-			LLString mime_type;
+			std::string mime_type;
 			node->getAttributeString("name", mime_type);
 			LLMIMEInfo info;
 			for (LLXMLNode* child = node->getFirstChild();
@@ -102,7 +102,7 @@ bool LLMIMETypes::parseMIMETypes(const LLString& xml_filename)
 		}
 		else if (node->hasName("widgetset"))
 		{
-			LLString set_name;
+			std::string set_name;
 			node->getAttributeString("name", set_name);
 			LLMIMEWidgetSet info;
 			for (LLXMLNode* child = node->getFirstChild();
@@ -149,7 +149,7 @@ bool LLMIMETypes::parseMIMETypes(const LLString& xml_filename)
 }
 
 // static
-LLString LLMIMETypes::translate(const LLString& mime_type)
+std::string LLMIMETypes::translate(const std::string& mime_type)
 {
 	mime_info_map_t::const_iterator it = sMap.find(mime_type);
 	if (it != sMap.end())
@@ -163,7 +163,7 @@ LLString LLMIMETypes::translate(const LLString& mime_type)
 }
 
 // static
-LLString LLMIMETypes::widgetType(const LLString& mime_type)
+std::string LLMIMETypes::widgetType(const std::string& mime_type)
 {
 	mime_info_map_t::const_iterator it = sMap.find(mime_type);
 	if (it != sMap.end())
@@ -177,7 +177,7 @@ LLString LLMIMETypes::widgetType(const LLString& mime_type)
 }
 
 // static
-LLString LLMIMETypes::implType(const LLString& mime_type)
+std::string LLMIMETypes::implType(const std::string& mime_type)
 {
 	mime_info_map_t::const_iterator it = sMap.find(mime_type);
 	if (it != sMap.end())
@@ -191,10 +191,10 @@ LLString LLMIMETypes::implType(const LLString& mime_type)
 }
 
 // static
-LLString LLMIMETypes::findIcon(const LLString& mime_type)
+std::string LLMIMETypes::findIcon(const std::string& mime_type)
 {
-	LLString icon = "";
-	LLString widget_type = LLMIMETypes::widgetType(mime_type);
+	std::string icon = "";
+	std::string widget_type = LLMIMETypes::widgetType(mime_type);
 	mime_widget_set_map_t::iterator it = sWidgetMap.find(widget_type);
 	if(it != sWidgetMap.end())
 	{
@@ -204,9 +204,9 @@ LLString LLMIMETypes::findIcon(const LLString& mime_type)
 }
 
 // static
-LLString LLMIMETypes::findDefaultMimeType(const LLString& widget_type)
+std::string LLMIMETypes::findDefaultMimeType(const std::string& widget_type)
 {
-	LLString mime_type = "none/none";
+	std::string mime_type = "none/none";
 	mime_widget_set_map_t::iterator it = sWidgetMap.find(widget_type);
 	if(it != sWidgetMap.end())
 	{
@@ -216,10 +216,10 @@ LLString LLMIMETypes::findDefaultMimeType(const LLString& widget_type)
 }
 
 // static
-LLString LLMIMETypes::findToolTip(const LLString& mime_type)
+std::string LLMIMETypes::findToolTip(const std::string& mime_type)
 {
-	LLString tool_tip = "";
-	LLString widget_type = LLMIMETypes::widgetType(mime_type);
+	std::string tool_tip = "";
+	std::string widget_type = LLMIMETypes::widgetType(mime_type);
 	mime_widget_set_map_t::iterator it = sWidgetMap.find(widget_type);
 	if(it != sWidgetMap.end())
 	{
@@ -229,10 +229,10 @@ LLString LLMIMETypes::findToolTip(const LLString& mime_type)
 }
 
 // static
-LLString LLMIMETypes::findPlayTip(const LLString& mime_type)
+std::string LLMIMETypes::findPlayTip(const std::string& mime_type)
 {
-	LLString play_tip = "";
-	LLString widget_type = LLMIMETypes::widgetType(mime_type);
+	std::string play_tip = "";
+	std::string widget_type = LLMIMETypes::widgetType(mime_type);
 	mime_widget_set_map_t::iterator it = sWidgetMap.find(widget_type);
 	if(it != sWidgetMap.end())
 	{
@@ -242,10 +242,10 @@ LLString LLMIMETypes::findPlayTip(const LLString& mime_type)
 }
 
 // static
-bool LLMIMETypes::findAllowResize(const LLString& mime_type)
+bool LLMIMETypes::findAllowResize(const std::string& mime_type)
 {
 	bool allow_resize = false;
-	LLString widget_type = LLMIMETypes::widgetType(mime_type);
+	std::string widget_type = LLMIMETypes::widgetType(mime_type);
 	mime_widget_set_map_t::iterator it = sWidgetMap.find(widget_type);
 	if(it != sWidgetMap.end())
 	{
@@ -255,10 +255,10 @@ bool LLMIMETypes::findAllowResize(const LLString& mime_type)
 }
 
 // static
-bool LLMIMETypes::findAllowLooping(const LLString& mime_type)
+bool LLMIMETypes::findAllowLooping(const std::string& mime_type)
 {
 	bool allow_looping = false;
-	LLString widget_type = LLMIMETypes::widgetType(mime_type);
+	std::string widget_type = LLMIMETypes::widgetType(mime_type);
 	mime_widget_set_map_t::iterator it = sWidgetMap.find(widget_type);
 	if(it != sWidgetMap.end())
 	{
diff --git a/linden/indra/newview/llmimetypes.h b/linden/indra/newview/llmimetypes.h
index a6a3fde..56aba9b 100644
--- a/linden/indra/newview/llmimetypes.h
+++ b/linden/indra/newview/llmimetypes.h
@@ -33,71 +33,71 @@
 #ifndef LLMIMETYPES_H
 #define LLMIMETYPES_H
 
-#include "llstring.h"	// because XML parsing lib uses LLString, ugh
+#include <string>
 #include <map>
 
 class LLMIMETypes
 {
 public:
-	static bool parseMIMETypes(const LLString& xml_file_path);
+	static bool parseMIMETypes(const std::string& xml_file_path);
 		// Loads the MIME string definition XML file, usually
 		// from the application skins directory
 
-	static LLString translate(const LLString& mime_type);
+	static std::string translate(const std::string& mime_type);
 		// Returns "QuickTime Movie" from "video/quicktime"
 
-	static LLString widgetType(const LLString& mime_type);
+	static std::string widgetType(const std::string& mime_type);
 		// Type of control widgets for this MIME type
 		// Returns "movie" from "video/quicktime"
 
-	static LLString implType(const LLString& mime_type);
+	static std::string implType(const std::string& mime_type);
 		// Type of Impl to use for decoding media.
 
-	static LLString findIcon(const LLString& mime_type);
+	static std::string findIcon(const std::string& mime_type);
 		// Icon from control widget type for this MIME type
 
-	static LLString findToolTip(const LLString& mime_type);
+	static std::string findToolTip(const std::string& mime_type);
 		// Tool tip from control widget type for this MIME type
 
-	static LLString findPlayTip(const LLString& mime_type);
+	static std::string findPlayTip(const std::string& mime_type);
 		// Play button tool tip from control widget type for this MIME type
 
-	static LLString findDefaultMimeType(const LLString& widget_type);
+	static std::string findDefaultMimeType(const std::string& widget_type);
 		// Canonical mime type associated with this widget set
 
-	static bool findAllowResize(const LLString& mime_type);
+	static bool findAllowResize(const std::string& mime_type);
 		// accessor for flag to enable/disable media size edit fields
 
-	static bool findAllowLooping(const LLString& mime_type);
+	static bool findAllowLooping(const std::string& mime_type);
 		// accessor for flag to enable/disable media looping checkbox
 
 public:
 	struct LLMIMEInfo
 	{
-		LLString mLabel;
+		std::string mLabel;
 			// friendly label like "QuickTime Movie"
 
-		LLString mWidgetType;
+		std::string mWidgetType;
 			// "web" means use web media UI widgets
 
-		LLString mImpl;
+		std::string mImpl;
 			// which impl to use with this mime type
 	};
 	struct LLMIMEWidgetSet
 	{
-		LLString mLabel;
+		std::string mLabel;
 			// friendly label like "QuickTime Movie"
 
-		LLString mIcon;
+		std::string mIcon;
 			// Name of icon asset to display in toolbar
 
-		LLString mDefaultMimeType;
+		std::string mDefaultMimeType;
 			// Mime type string to use in absence of a specific one
 
-		LLString mToolTip;
+		std::string mToolTip;
 			// custom tool tip for this mime type
 
-		LLString mPlayTip;
+		std::string mPlayTip;
 			// custom tool tip to display for Play button
 
 		bool mAllowResize;
@@ -106,8 +106,8 @@ public:
 		bool mAllowLooping;
 			// enable/disable media looping checkbox
 	};
-	typedef std::map< LLString, LLMIMEInfo > mime_info_map_t;
-	typedef std::map< LLString, LLMIMEWidgetSet > mime_widget_set_map_t;
+	typedef std::map< std::string, LLMIMEInfo > mime_info_map_t;
+	typedef std::map< std::string, LLMIMEWidgetSet > mime_widget_set_map_t;
 
 	// Public so users can iterate over it
 	static mime_info_map_t sMap;
diff --git a/linden/indra/newview/llmoveview.cpp b/linden/indra/newview/llmoveview.cpp
index 0bb0a5e..0427072 100644
--- a/linden/indra/newview/llmoveview.cpp
+++ b/linden/indra/newview/llmoveview.cpp
@@ -58,7 +58,7 @@ const F32 NUDGE_TIME = 0.25f;		// in seconds
 
 // protected
 LLFloaterMove::LLFloaterMove(const LLSD& key)
-:	LLFloater("move floater")
+:	LLFloater(std::string("move floater"))
 {
 	setIsChrome(TRUE);
 
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 408b70e..0cdfe83 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -97,9 +97,9 @@ const char AGENT_SUFFIX[] = " (resident)";
 const char OBJECT_SUFFIX[] = " (object)";
 const char GROUP_SUFFIX[] = " (group)";
 
-LLString LLMute::getDisplayName() const
+std::string LLMute::getDisplayName() const
 {
-	LLString name_with_suffix = mName;
+	std::string name_with_suffix = mName;
 	switch (mType)
 	{
 		case BY_NAME:
@@ -119,7 +119,7 @@ LLString LLMute::getDisplayName() const
 	return name_with_suffix;
 }
 
-void LLMute::setFromDisplayName(const LLString& display_name)
+void LLMute::setFromDisplayName(const std::string& display_name)
 {
 	size_t pos = 0;
 	mName = display_name;
@@ -198,7 +198,7 @@ void LLMuteList::loadUserVolumes()
 
 	LLSD settings_llsd;
 	llifstream file;
-	file.open(filename.c_str());
+	file.open(filename);
 	if (file.is_open())
 	{
 		LLSDSerialize::fromXML(settings_llsd, file);
@@ -225,11 +225,11 @@ LLMuteList::~LLMuteList()
 	}
 
 	llofstream file;
-	file.open(filename.c_str());
+	file.open(filename);
 	LLSDSerialize::toPrettyXML(settings_llsd, file);
 }
 
-BOOL LLMuteList::isLinden(const LLString& name) const
+BOOL LLMuteList::isLinden(const std::string& name) const
 {
 	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 	boost::char_separator<char> sep(" ");
@@ -240,7 +240,7 @@ BOOL LLMuteList::isLinden(const LLString& name) const
 	token_iter++;
 	if (token_iter == tokens.end()) return FALSE;
 	
-	LLString last_name = *token_iter;
+	std::string last_name = *token_iter;
 	return last_name == "Linden";
 }
 
@@ -449,9 +449,9 @@ void LLMuteList::updateRemove(const LLMute& mute)
 	gAgent.sendReliableMessage();
 }
 
-void notify_automute_callback(const LLUUID& agent_id, const char* first_name, const char* last_name, BOOL is_group, void* user_data)
+void notify_automute_callback(const LLUUID& agent_id, const std::string& first_name, const std::string& last_name, BOOL is_group, void* user_data)
 {
-	U32 temp_data = (U32)user_data;
+	U32 temp_data = (U32) (uintptr_t) user_data;
 	LLMuteList::EAutoReason reason = (LLMuteList::EAutoReason)temp_data;
 	LLUIString auto_message;
 
@@ -486,20 +486,19 @@ void notify_automute_callback(const LLUUID& agent_id, const char* first_name, co
 }
 
 
-BOOL LLMuteList::autoRemove(const LLUUID& agent_id, const EAutoReason reason, const LLString& first_name, const LLString& last_name)
+BOOL LLMuteList::autoRemove(const LLUUID& agent_id, const EAutoReason reason, const std::string& first_name, const std::string& last_name)
 {
 	BOOL removed = FALSE;
 
 	if (isMuted(agent_id))
 	{
-		LLMute automute(agent_id, "", LLMute::AGENT);
+		LLMute automute(agent_id, LLStringUtil::null, LLMute::AGENT);
 		removed = TRUE;
 		remove(automute);
 
 		if (first_name.empty() && last_name.empty())
 		{
-			char cache_first[DB_FIRST_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-			char cache_last[DB_LAST_NAME_BUF_SIZE];		/* Flawfinder: ignore */
+			std::string cache_first, cache_last;
 			if (gCacheName->getName(agent_id, cache_first, cache_last))
 			{
 				// name in cache, call callback directly
@@ -514,7 +513,7 @@ BOOL LLMuteList::autoRemove(const LLUUID& agent_id, const EAutoReason reason, co
 		else
 		{
 			// call callback directly
-			notify_automute_callback(agent_id, first_name.c_str(), last_name.c_str(), FALSE, (void *)reason);
+			notify_automute_callback(agent_id, first_name, last_name, FALSE, (void *)reason);
 		}
 	}
 
@@ -548,7 +547,7 @@ std::vector<LLMute> LLMuteList::getMutes() const
 //-----------------------------------------------------------------------------
 // loadFromFile()
 //-----------------------------------------------------------------------------
-BOOL LLMuteList::loadFromFile(const LLString& filename)
+BOOL LLMuteList::loadFromFile(const std::string& filename)
 {
 	if(!filename.size())
 	{
@@ -556,7 +555,7 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
 		return FALSE;
 	}
 
-	LLFILE* fp = LLFile::fopen(filename.c_str(), "rb");		/*Flawfinder: ignore*/
+	LLFILE* fp = LLFile::fopen(filename, "rb");		/*Flawfinder: ignore*/
 	if (!fp)
 	{
 		llwarns << "Couldn't open mute list " << filename << llendl;
@@ -579,7 +578,7 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
 			buffer, " %d %254s %254[^|]| %u\n", &type, id_buffer, name_buffer,
 			&flags);
 		LLUUID id = LLUUID(id_buffer);
-		LLMute mute(id, name_buffer, (LLMute::EType)type, flags);
+		LLMute mute(id, std::string(name_buffer), (LLMute::EType)type, flags);
 		if (mute.mID.isNull()
 			|| mute.mType == LLMute::BY_NAME)
 		{
@@ -598,7 +597,7 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
 //-----------------------------------------------------------------------------
 // saveToFile()
 //-----------------------------------------------------------------------------
-BOOL LLMuteList::saveToFile(const LLString& filename)
+BOOL LLMuteList::saveToFile(const std::string& filename)
 {
 	if(!filename.size())
 	{
@@ -606,35 +605,35 @@ BOOL LLMuteList::saveToFile(const LLString& filename)
 		return FALSE;
 	}
 
-	LLFILE* fp = LLFile::fopen(filename.c_str(), "wb");		/*Flawfinder: ignore*/
+	LLFILE* fp = LLFile::fopen(filename, "wb");		/*Flawfinder: ignore*/
 	if (!fp)
 	{
 		llwarns << "Couldn't open mute list " << filename << llendl;
 		return FALSE;
 	}
 	// legacy mutes have null uuid
-	char id_string[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
+	std::string id_string;
 	LLUUID::null.toString(id_string);
 	for (string_set_t::iterator it = mLegacyMutes.begin();
 		 it != mLegacyMutes.end();
 		 ++it)
 	{
-		fprintf(fp, "%d %s %s|\n", (S32)LLMute::BY_NAME, id_string, it->c_str());
+		fprintf(fp, "%d %s %s|\n", (S32)LLMute::BY_NAME, id_string.c_str(), it->c_str());
 	}
 	for (mute_set_t::iterator it = mMutes.begin();
 		 it != mMutes.end();
 		 ++it)
 	{
 		it->mID.toString(id_string);
-		const LLString& name = it->mName;
-		fprintf(fp, "%d %s %s|%u\n", (S32)it->mType, id_string, name.c_str(), it->mFlags);
+		const std::string& name = it->mName;
+		fprintf(fp, "%d %s %s|%u\n", (S32)it->mType, id_string.c_str(), name.c_str(), it->mFlags);
 	}
 	fclose(fp);
 	return TRUE;
 }
 
 
-BOOL LLMuteList::isMuted(const LLUUID& id, const LLString& name, U32 flags) const
+BOOL LLMuteList::isMuted(const LLUUID& id, const std::string& name, U32 flags) const
 {
 	LLUUID id_to_check = id;
 	
@@ -677,10 +676,10 @@ void LLMuteList::requestFromServer(const LLUUID& agent_id)
 {
 	loadUserVolumes();
 	
-	char agent_id_string[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
-	char filename[LL_MAX_PATH];		/*Flawfinder: ignore*/
+	std::string agent_id_string;
+	std::string filename;
 	agent_id.toString(agent_id_string);
-	snprintf(filename, sizeof(filename), "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());			/* Flawfinder: ignore */
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string) + ".cached_mute";
 	LLCRC crc;
 	crc.update(filename);
 
@@ -703,10 +702,10 @@ void LLMuteList::cache(const LLUUID& agent_id)
 	// Write to disk even if empty.
 	if(mIsLoaded)
 	{
-		char agent_id_string[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
-		char filename[LL_MAX_PATH];		/*Flawfinder: ignore*/
+		std::string agent_id_string;
+		std::string filename;
 		agent_id.toString(agent_id_string);
-		snprintf(filename, sizeof(filename), "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());			/* Flawfinder: ignore */
+		filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string) + ".cached_mute";
 		saveToFile(filename);
 	}
 }
@@ -745,12 +744,11 @@ void LLMuteList::processMuteListUpdate(LLMessageSystem* msg, void**)
 		llwarns << "Got an mute list update for the wrong agent." << llendl;
 		return;
 	}
-	char filename[MAX_STRING];		/*Flawfinder: ignore*/
-	filename[0] = '\0';
-	msg->getStringFast(_PREHASH_MuteData, _PREHASH_Filename, MAX_STRING, filename);
+	std::string filename;
+	msg->getStringFast(_PREHASH_MuteData, _PREHASH_Filename, filename);
 	
 	std::string *local_filename_and_path = new std::string(gDirUtilp->getExpandedFilename( LL_PATH_CACHE, filename ));
-	gXferManager->requestFile(local_filename_and_path->c_str(),
+	gXferManager->requestFile(*local_filename_and_path,
 							  filename,
 							  LL_PATH_CACHE,
 							  msg->getSender(),
@@ -764,10 +762,10 @@ void LLMuteList::processUseCachedMuteList(LLMessageSystem* msg, void**)
 {
 	llinfos << "LLMuteList::processUseCachedMuteList()" << llendl;
 
-	char agent_id_string[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
+	std::string agent_id_string;
 	gAgent.getID().toString(agent_id_string);
-	char filename[LL_MAX_PATH];		/*Flawfinder: ignore*/
-	snprintf(filename, sizeof(filename), "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());			/* Flawfinder: ignore */
+	std::string filename;
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string) + ".cached_mute";
 	LLMuteList::getInstance()->loadFromFile(filename);
 }
 
@@ -775,11 +773,11 @@ void LLMuteList::onFileMuteList(void** user_data, S32 error_code, LLExtStat ext_
 {
 	llinfos << "LLMuteList::processMuteListFile()" << llendl;
 
-	std::string *local_filename_and_path = (std::string*)user_data;
+	std::string* local_filename_and_path = (std::string*)user_data;
 	if(local_filename_and_path && !local_filename_and_path->empty() && (error_code == 0))
 	{
-		LLMuteList::getInstance()->loadFromFile(local_filename_and_path->c_str());
-		LLFile::remove(local_filename_and_path->c_str());
+		LLMuteList::getInstance()->loadFromFile(*local_filename_and_path);
+		LLFile::remove(*local_filename_and_path);
 	}
 	delete local_filename_and_path;
 }
diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h
index fa38cde..400f13e 100644
--- a/linden/indra/newview/llmutelist.h
+++ b/linden/indra/newview/llmutelist.h
@@ -60,21 +60,21 @@ public:
 		flagAll				= 0x0000000F		// Mask of all currently defined flags
 	};
 	
-	LLMute(const LLUUID& id, const LLString& name = LLString(), EType type = BY_NAME, U32 flags = 0) 
+	LLMute(const LLUUID& id, const std::string& name = std::string(), EType type = BY_NAME, U32 flags = 0) 
 	: mID(id), mName(name), mType(type),mFlags(flags) { }
 
 	// Returns name + suffix based on type
 	// For example:  "James Tester (resident)"
-	LLString getDisplayName() const;
+	std::string getDisplayName() const;
 	
 	// Converts a UI name into just the agent or object name
 	// For example: "James Tester (resident)" sets the name to "James Tester"
 	// and the type to AGENT.
-	void setFromDisplayName(const LLString& display_name);
+	void setFromDisplayName(const std::string& display_name);
 	
 public:
 	LLUUID		mID;	// agent or object id
-	LLString	mName;	// agent or object name
+	std::string	mName;	// agent or object name
 	EType		mType;	// needed for UI display of existing mutes
 	U32			mFlags;	// flags pertaining to this mute entry
 };
@@ -107,15 +107,15 @@ public:
 
 	// Remove both normal and legacy mutes, for any or all properties.
 	BOOL remove(const LLMute& mute, U32 flags = 0);
-	BOOL autoRemove(const LLUUID& agent_id, const EAutoReason reason, const LLString& first_name = "", const LLString& last_name = "");
+	BOOL autoRemove(const LLUUID& agent_id, const EAutoReason reason, const std::string& first_name = LLStringUtil::null, const std::string& last_name = LLStringUtil::null);
 	
 	// Name is required to test against legacy text-only mutes.
-	BOOL isMuted(const LLUUID& id, const LLString& name = LLString::null, U32 flags = 0) const;
+	BOOL isMuted(const LLUUID& id, const std::string& name = LLStringUtil::null, U32 flags = 0) const;
 	
 	// Alternate (convenience) form for places we don't need to pass the name, but do need flags
-	BOOL isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLString::null, flags); };
+	BOOL isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLStringUtil::null, flags); };
 	
-	BOOL isLinden(const LLString& name) const;
+	BOOL isLinden(const std::string& name) const;
 	
 	BOOL isLoaded() const { return mIsLoaded; }
 
@@ -133,8 +133,8 @@ public:
 private:
 	void loadUserVolumes();
 	
-	BOOL loadFromFile(const LLString& filename);
-	BOOL saveToFile(const LLString& filename);
+	BOOL loadFromFile(const std::string& filename);
+	BOOL saveToFile(const std::string& filename);
 
 	void setLoaded();
 	void notifyObservers();
@@ -166,7 +166,7 @@ private:
 	typedef std::set<LLMute, compare_by_id> mute_set_t;
 	mute_set_t mMutes;
 	
-	typedef std::set<LLString> string_set_t;
+	typedef std::set<std::string> string_set_t;
 	string_set_t mLegacyMutes;
 	
 	typedef std::set<LLMuteListObserver*> observer_set_t;
diff --git a/linden/indra/newview/llnamebox.cpp b/linden/indra/newview/llnamebox.cpp
index 5a164b4..d178c5a 100644
--- a/linden/indra/newview/llnamebox.cpp
+++ b/linden/indra/newview/llnamebox.cpp
@@ -47,7 +47,7 @@ std::set<LLNameBox*> LLNameBox::sInstances;
 
 
 LLNameBox::LLNameBox(const std::string& name, const LLRect& rect, const LLUUID& name_id, BOOL is_group, const LLFontGL* font, BOOL mouse_opaque)
-:	LLTextBox(name, rect, "(retrieving)", font, mouse_opaque),
+:	LLTextBox(name, rect, std::string("(retrieving)"), font, mouse_opaque),
 	mNameID(name_id)
 {
 	LLNameBox::sInstances.insert(this);
@@ -57,7 +57,7 @@ LLNameBox::LLNameBox(const std::string& name, const LLRect& rect, const LLUUID&
 	}
 	else
 	{
-		setText(LLString::null);
+		setText(LLStringUtil::null);
 	}
 }
 
@@ -84,26 +84,26 @@ void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group)
 	setText(name);
 }
 
-void LLNameBox::refresh(const LLUUID& id, const char* firstname,
-						   const char* lastname, BOOL is_group)
+void LLNameBox::refresh(const LLUUID& id, const std::string& firstname,
+						const std::string& lastname, BOOL is_group)
 {
 	if (id == mNameID)
 	{
-		LLString name;
-
-		name.assign(firstname);
+		std::string name;
 		if (!is_group)
 		{
-			name.append(1, ' ');
-			name.append(lastname);
+			name = firstname + " " + lastname;
+		}
+		else
+		{
+			name = firstname;
 		}
-
 		setText(name);
 	}
 }
 
-void LLNameBox::refreshAll(const LLUUID& id, const char* firstname,
-						   const char* lastname, BOOL is_group)
+void LLNameBox::refreshAll(const LLUUID& id, const std::string& firstname,
+						   const std::string& lastname, BOOL is_group)
 {
 	std::set<LLNameBox*>::iterator it;
 	for (it = LLNameBox::sInstances.begin();
diff --git a/linden/indra/newview/llnamebox.h b/linden/indra/newview/llnamebox.h
index 8afac5c..09770e3 100644
--- a/linden/indra/newview/llnamebox.h
+++ b/linden/indra/newview/llnamebox.h
@@ -51,11 +51,10 @@ public:
 
 	void setNameID(const LLUUID& name_id, BOOL is_group);
 
-	void refresh(const LLUUID& id, const char* first, const char* last,
-				 BOOL is_group);
+	void refresh(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
 
-	static void refreshAll(const LLUUID& id, const char* firstname,
-						   const char* lastname, BOOL is_group);
+	static void refreshAll(const LLUUID& id, const std::string& firstname,
+						   const std::string& lastname, BOOL is_group);
 
 private:
 	static std::set<LLNameBox*> sInstances;
diff --git a/linden/indra/newview/llnameeditor.cpp b/linden/indra/newview/llnameeditor.cpp
index 99f9ee7..5557f84 100644
--- a/linden/indra/newview/llnameeditor.cpp
+++ b/linden/indra/newview/llnameeditor.cpp
@@ -58,7 +58,7 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect,
 		void* userdata,
 		LLLinePrevalidateFunc prevalidate_func)
 :	LLLineEditor(name, rect, 
-				 "(retrieving)", 
+				 std::string("(retrieving)"), 
 				 glfont, 
 				 max_text_length, 
 				 commit_callback, 
@@ -99,26 +99,26 @@ void LLNameEditor::setNameID(const LLUUID& name_id, BOOL is_group)
 	setText(name);
 }
 
-void LLNameEditor::refresh(const LLUUID& id, const char* firstname,
-						   const char* lastname, BOOL is_group)
+void LLNameEditor::refresh(const LLUUID& id, const std::string& firstname,
+						   const std::string& lastname, BOOL is_group)
 {
 	if (id == mNameID)
 	{
-		LLString name;
-
-		name.assign(firstname);
+		std::string name;
 		if (!is_group)
 		{
-			name.append(1, ' ');
-			name.append(lastname);
+			name = firstname + " " + lastname;
+		}
+		else
+		{
+			name = firstname;
 		}
-
 		setText(name);
 	}
 }
 
-void LLNameEditor::refreshAll(const LLUUID& id, const char* firstname,
-						   const char* lastname, BOOL is_group)
+void LLNameEditor::refreshAll(const LLUUID& id, const std::string& firstname,
+							  const std::string& lastname, BOOL is_group)
 {
 	std::set<LLNameEditor*>::iterator it;
 	for (it = LLNameEditor::sInstances.begin();
@@ -142,7 +142,7 @@ LLSD LLNameEditor::getValue() const
 
 LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("name_editor");
+	std::string name("name_editor");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -162,7 +162,7 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 								max_text_length,
 								commit_callback);
 
-	LLString label;
+	std::string label;
 	if(node->getAttributeString("label", label))
 	{
 		line_editor->setLabel(label);
diff --git a/linden/indra/newview/llnameeditor.h b/linden/indra/newview/llnameeditor.h
index 3d9a9cc..84ae219 100644
--- a/linden/indra/newview/llnameeditor.h
+++ b/linden/indra/newview/llnameeditor.h
@@ -65,11 +65,10 @@ public:
 
 	void setNameID(const LLUUID& name_id, BOOL is_group);
 
-	void refresh(const LLUUID& id, const char* first, const char* last,
-				 BOOL is_group);
+	void refresh(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
 
-	static void refreshAll(const LLUUID& id, const char* firstname,
-						   const char* lastname, BOOL is_group);
+	static void refreshAll(const LLUUID& id, const std::string& firstname,
+						   const std::string& lastname, BOOL is_group);
 
 
 	// Take/return agent UUIDs
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index 564677a..b8bda78 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -44,14 +44,14 @@ static LLRegisterWidget<LLNameListCtrl> r("name_list");
 // statics
 std::set<LLNameListCtrl*> LLNameListCtrl::sInstances;
 
-LLNameListCtrl::LLNameListCtrl(const LLString& name,
+LLNameListCtrl::LLNameListCtrl(const std::string& name,
 							   const LLRect& rect,
 							   LLUICtrlCallback cb,
 							   void* userdata,
 							   BOOL allow_multiple_selection,
 							   BOOL draw_border,
 							   S32 name_column_index,
-							   const LLString& tooltip)
+							   const std::string& tooltip)
 :	LLScrollListCtrl(name, rect, cb, userdata, allow_multiple_selection,
 					 draw_border),
 	mNameColumnIndex(name_column_index),
@@ -71,7 +71,7 @@ LLNameListCtrl::~LLNameListCtrl()
 
 // public
 BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos,
-								 BOOL enabled, LLString& suffix)
+								 BOOL enabled, std::string& suffix)
 {
 	//llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl;
 
@@ -91,7 +91,7 @@ BOOL LLNameListCtrl::handleDragAndDrop(
 		BOOL drop,
 		EDragAndDropType cargo_type, void *cargo_data, 
 		EAcceptance *accept,
-		LLString& tooltip_msg)
+		std::string& tooltip_msg)
 {
 	if (!mAllowCallingCardDrop)
 	{
@@ -153,7 +153,7 @@ void LLNameListCtrl::addGroupNameItem(LLScrollListItem* item, EAddPosition pos)
 	gCacheName->getGroupName(item->getUUID(), group_name);
 
 	LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
-	((LLScrollListText*)cell)->setText( LLString(group_name) );
+	((LLScrollListText*)cell)->setText( std::string(group_name) );
 
 	addItem(item, pos);
 }
@@ -234,19 +234,20 @@ void LLNameListCtrl::removeNameItem(const LLUUID& agent_id)
 }
 
 // public
-void LLNameListCtrl::refresh(const LLUUID& id, const char* first, 
-							 const char* last,
-							 BOOL is_group)
+void LLNameListCtrl::refresh(const LLUUID& id, const std::string& first, 
+							 const std::string& last, BOOL is_group)
 {
 	//llinfos << "LLNameListCtrl::refresh " << id << " '" << first << " "
 	//	<< last << "'" << llendl;
 
-	LLString fullname;
-	fullname.assign(first);
-	if (last[0] && !is_group)
+	std::string fullname;
+	if (!is_group)
+	{
+		fullname = first + " " + last;
+	}
+	else
 	{
-		fullname.append(1, ' ');
-		fullname.append(last);
+		fullname = first;
 	}
 
 	// TODO: scan items for that ID, fix if necessary
@@ -268,9 +269,8 @@ void LLNameListCtrl::refresh(const LLUUID& id, const char* first,
 
 
 // static
-void LLNameListCtrl::refreshAll(const LLUUID& id, const char* first,
-								const char* last,
-								BOOL is_group)
+void LLNameListCtrl::refreshAll(const LLUUID& id, const std::string& first,
+								const std::string& last, BOOL is_group)
 {
 	std::set<LLNameListCtrl*>::iterator it;
 	for (it = LLNameListCtrl::sInstances.begin();
@@ -301,7 +301,7 @@ LLXMLNodePtr LLNameListCtrl::getXML(bool save_children) const
 
 LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("name_list");
+	std::string name("name_list");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -355,16 +355,16 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 	{
 		if (child->hasName("column"))
 		{
-			LLString labelname("");
+			std::string labelname("");
 			child->getAttributeString("label", labelname);
 
-			LLString columnname(labelname);
+			std::string columnname(labelname);
 			child->getAttributeString("name", columnname);
 
 			BOOL columndynamicwidth = FALSE;
 			child->getAttributeBOOL("dynamicwidth", columndynamicwidth);
 
-			LLString sortname(columnname);
+			std::string sortname(columnname);
 			child->getAttributeString("sort", sortname);
 		
 			S32 columnwidth = -1;
@@ -415,15 +415,15 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 			{
 				if (row_child->hasName("column"))
 				{
-					LLString value = row_child->getTextContents();
+					std::string value = row_child->getTextContents();
 
-					LLString columnname("");
+					std::string columnname("");
 					row_child->getAttributeString("name", columnname);
 
-					LLString font("");
+					std::string font("");
 					row_child->getAttributeString("font", font);
 
-					LLString font_style("");
+					std::string font_style("");
 					row_child->getAttributeString("font-style", font_style);
 
 					row["columns"][column_idx]["column"] = columnname;
@@ -437,7 +437,7 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 		}
 	}
 
-	LLString contents = node->getTextContents();
+	std::string contents = node->getTextContents();
 
 	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 	boost::char_separator<char> sep("\t\n");
@@ -446,7 +446,7 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
 
 	while(token_iter != tokens.end())
 	{
-		const char* line = token_iter->c_str();
+		const std::string& line = *token_iter;
 		name_list->addCommentText(line);
 		++token_iter;
 	}
diff --git a/linden/indra/newview/llnamelistctrl.h b/linden/indra/newview/llnamelistctrl.h
index 3aa4dfc..c4bf12b 100644
--- a/linden/indra/newview/llnamelistctrl.h
+++ b/linden/indra/newview/llnamelistctrl.h
@@ -41,14 +41,14 @@ class LLNameListCtrl
 :	public LLScrollListCtrl
 {
 public:
-	LLNameListCtrl(const LLString& name,
+	LLNameListCtrl(const std::string& name,
 				   const LLRect& rect,
 				   LLUICtrlCallback callback,
 				   void* userdata,
 				   BOOL allow_multiple_selection,
 				   BOOL draw_border = TRUE,
 				   S32 name_column_index = 0,
-				   const LLString& tooltip = LLString::null);
+				   const std::string& tooltip = LLStringUtil::null);
 	virtual ~LLNameListCtrl();
 
 	virtual LLXMLNodePtr getXML(bool save_children = true) const;
@@ -57,7 +57,7 @@ public:
 	// Add a user to the list by name.  It will be added, the name 
 	// requested from the cache, and updated as necessary.
 	BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
-					 BOOL enabled = TRUE, LLString& suffix = LLString::null);
+					 BOOL enabled = TRUE, std::string& suffix = LLStringUtil::null);
 	BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM);
 
 	virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
@@ -71,16 +71,15 @@ public:
 
 	void removeNameItem(const LLUUID& agent_id);
 
-	void refresh(const LLUUID& id, const char* first, const char* last,
-				 BOOL is_group);
+	void refresh(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
 
-	static void refreshAll(const LLUUID& id, const char* firstname,
-						   const char* lastname, BOOL is_group);
+	static void refreshAll(const LLUUID& id, const std::string& firstname,
+						   const std::string& lastname, BOOL is_group);
 
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask,
 									  BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
 									  EAcceptance *accept,
-									  LLString& tooltip_msg);
+									  std::string& tooltip_msg);
 
 	void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
 
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 9629d06..b277998 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -114,52 +114,52 @@ LLNetMap::LLNetMap(
 	//mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
 	//mTextBoxNorth->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
 	//addChild( mTextBoxNorth );
-	mTextBoxNorth =	new LLTextBox( "N", major_dir_rect );
+	mTextBoxNorth =	new LLTextBox( std::string("N"), major_dir_rect );
 	mTextBoxNorth->setColor( minor_color );
 	addChild( mTextBoxNorth );
 	
-	mTextBoxEast =	new LLTextBox( "E", major_dir_rect );
+	mTextBoxEast =	new LLTextBox( std::string("E"), major_dir_rect );
 	mTextBoxEast->setColor( minor_color );
 	addChild( mTextBoxEast );
 	
 	major_dir_rect.mRight += 1 ;
-	mTextBoxWest =	new LLTextBox( "W", major_dir_rect );
+	mTextBoxWest =	new LLTextBox( std::string("W"), major_dir_rect );
 	mTextBoxWest->setColor( minor_color );
 	addChild( mTextBoxWest );
 	major_dir_rect.mRight -= 1 ;
 
-	mTextBoxSouth = new LLTextBox( "S", major_dir_rect );
+	mTextBoxSouth = new LLTextBox( std::string("S"), major_dir_rect );
 	mTextBoxSouth->setColor( minor_color );
 	addChild( mTextBoxSouth );
 
-	mTextBoxSouthEast =	new LLTextBox( "SE", minor_dir_rect );
+	mTextBoxSouthEast =	new LLTextBox( std::string("SE"), minor_dir_rect );
 	mTextBoxSouthEast->setColor( minor_color );
 	addChild( mTextBoxSouthEast );
 	
-	mTextBoxNorthEast = new LLTextBox( "NE", minor_dir_rect );
+	mTextBoxNorthEast = new LLTextBox( std::string("NE"), minor_dir_rect );
 	mTextBoxNorthEast->setColor( minor_color );
 	addChild( mTextBoxNorthEast );
 	
-	mTextBoxSouthWest =	new LLTextBox( "SW", minor_dir_rect );
+	mTextBoxSouthWest =	new LLTextBox( std::string("SW"), minor_dir_rect );
 	mTextBoxSouthWest->setColor( minor_color );
 	addChild( mTextBoxSouthWest );
 
-	mTextBoxNorthWest = new LLTextBox( "NW", minor_dir_rect );
+	mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect );
 	mTextBoxNorthWest->setColor( minor_color );
 	addChild( mTextBoxNorthWest );
 
 	// Right-click menu
 	LLMenuGL* menu;
-	menu = new LLMenuGL("popup");
+	menu = new LLMenuGL(std::string("popup"));
 	menu->setCanTearOff(FALSE);
-	menu->append(new LLMenuItemCallGL("Zoom Close", handleZoomLevel,
+	menu->append(new LLMenuItemCallGL(std::string("Zoom Close"), handleZoomLevel,
 										NULL, (void*)2) );
-	menu->append(new LLMenuItemCallGL("Zoom Medium", handleZoomLevel,
+	menu->append(new LLMenuItemCallGL(std::string("Zoom Medium"), handleZoomLevel,
 										NULL, (void*)1) );
-	menu->append(new LLMenuItemCallGL("Zoom Far", handleZoomLevel,
+	menu->append(new LLMenuItemCallGL(std::string("Zoom Far"), handleZoomLevel,
 										NULL, (void*)0) );
 	menu->appendSeparator();
-	menu->append(new LLMenuItemCallGL("Stop Tracking", &LLTracker::stopTracking,
+	menu->append(new LLMenuItemCallGL(std::string("Stop Tracking"), &LLTracker::stopTracking,
 										&LLTracker::isTracking, NULL) );
 	menu->setVisible(FALSE);
 	addChild(menu);
@@ -279,7 +279,7 @@ void LLNetMap::draw()
 				gGL.color4f(0.8f, 0.8f, 0.8f, 1.f);
 			}
 
-			if (!regionp->mAlive)
+			if (!regionp->isAlive())
 			{
 				gGL.color4f(1.f, 0.5f, 0.5f, 1.f);
 			}
@@ -580,7 +580,7 @@ BOOL LLNetMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return TRUE;
 }
 
-BOOL LLNetMap::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen )
+BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen )
 {
 	BOOL handled = FALSE;
 	if (gDisconnected)
@@ -593,12 +593,12 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_s
 		msg.assign( region->getName() );
 
 #ifndef LL_RELEASE_FOR_DOWNLOAD
-		char buffer[MAX_STRING];		/*Flawfinder: ignore*/
+		std::string buffer;
 		msg.append("\n");
-		region->getHost().getHostName(buffer, MAX_STRING);
+		buffer = region->getHost().getHostName();
 		msg.append(buffer);
 		msg.append("\n");
-		region->getHost().getString(buffer, MAX_STRING);
+		buffer = region->getHost().getString();
 		msg.append(buffer);
 #endif
 		// *TODO: put this under the control of XUI so it can be
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 7a3654c..3fb20cc 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -55,7 +55,7 @@ public:
 	virtual BOOL	handleDoubleClick( S32 x, S32 y, MASK mask );
 	virtual BOOL	handleRightMouseDown( S32 x, S32 y, MASK mask );
 	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
-	virtual BOOL	handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen );
+	virtual BOOL	handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen );
 
 	void			setScale( F32 scale );
 	void			translatePan( F32 delta_x, F32 delta_y );
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 17aff78..f703736 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -63,7 +63,7 @@ const F32 ANIMATION_TIME = 0.333f;
 S32 LLNotifyBox::sNotifyBoxCount = 0;
 const LLFontGL* LLNotifyBox::sFont = NULL;
 const LLFontGL* LLNotifyBox::sFontSmall = NULL;
-std::map<LLString, LLNotifyBox*> LLNotifyBox::sOpenUniqueNotifyBoxes;
+std::map<std::string, LLNotifyBox*> LLNotifyBox::sOpenUniqueNotifyBoxes;
 LLPointer<LLNotifyBoxTemplate> LLNotifyBox::sDefaultTemplate;
 
 
@@ -80,14 +80,14 @@ LLNotifyBox::LLNotifyBehavior::LLNotifyBehavior(notify_callback_t callback, void
 //---------------------------------------------------------------------------
 
 //static
-LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, notify_callback_t callback, void *user_data)
+LLNotifyBox* LLNotifyBox::showXml( const std::string& xml_desc, notify_callback_t callback, void *user_data)
 {
-	return showXml(xml_desc, LLString::format_map_t(), callback, user_data);
+	return showXml(xml_desc, LLStringUtil::format_map_t(), callback, user_data);
 }
 
 
 //static
-LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::format_map_t& args, BOOL is_caution,
+LLNotifyBox* LLNotifyBox::showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args, BOOL is_caution,
 						   notify_callback_t callback, void *user_data)
 {
 	// for script permission prompts
@@ -108,7 +108,7 @@ LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::for
 }
 
 //static
-LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::format_map_t& args,
+LLNotifyBox* LLNotifyBox::showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 						   notify_callback_t callback, void *user_data)
 {
 	LLPointer<LLNotifyBoxTemplate> xml_template = getTemplate(xml_desc);
@@ -128,7 +128,7 @@ LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::for
 }
 
 //static
-LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::format_map_t& args,
+LLNotifyBox* LLNotifyBox::showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 						   notify_callback_t callback, void *user_data,
 						   const option_list_t& options,
 						   BOOL layout_script_dialog)
@@ -149,11 +149,11 @@ LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::for
 }
 
 //static
-LLNotifyBox* LLNotifyBox::findExistingNotify(LLPointer<LLNotifyBoxTemplate> notify_template, const LLString::format_map_t &args)
+LLNotifyBox* LLNotifyBox::findExistingNotify(LLPointer<LLNotifyBoxTemplate> notify_template, const LLStringUtil::format_map_t &args)
 {
 	if(notify_template->mUnique)
 	{
-		LLString message = notify_template->mMessage;
+		std::string message = notify_template->mMessage;
 		format(message, args);
 		unique_map_t::iterator found_it = sOpenUniqueNotifyBoxes.find(notify_template->mLabel + message);
 		if (found_it != sOpenUniqueNotifyBoxes.end())
@@ -172,7 +172,7 @@ void LLNotifyBox::cleanup()
 
 //---------------------------------------------------------------------------
 
-LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLString::format_map_t& args,
+LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLStringUtil::format_map_t& args,
 						 notify_callback_t callback, void* user_data, BOOL is_caution,
 						 const option_list_t& extra_options,
 						 BOOL layout_script_dialog)
@@ -250,17 +250,17 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
 	if (mIsTip)
 	{
 		// use the tip notification icon
-		icon = new LLIconCtrl("icon", LLRect(x, y, x+32, TOP-32), "notify_tip_icon.tga");
+		icon = new LLIconCtrl(std::string("icon"), LLRect(x, y, x+32, TOP-32), std::string("notify_tip_icon.tga"));
 	}
 	else if (mIsCaution)
 	{
 		// use the caution notification icon
-		icon = new LLIconCtrl("icon", LLRect(x, y, x+32, TOP-32), "notify_caution_icon.tga");
+		icon = new LLIconCtrl(std::string("icon"), LLRect(x, y, x+32, TOP-32), std::string("notify_caution_icon.tga"));
 	}
 	else
 	{
 		// use the default notification icon
-		icon = new LLIconCtrl("icon", LLRect(x, y, x+32, TOP-32), "notify_box_icon.tga");
+		icon = new LLIconCtrl(std::string("icon"), LLRect(x, y, x+32, TOP-32), std::string("notify_box_icon.tga"));
 	}
 
 	icon->setMouseOpaque(FALSE);
@@ -274,9 +274,9 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
 	{
 		S32 caution_height = ((S32)sFont->getLineHeight() * 2) + VPAD;
 		caution_box = new LLTextBox(
-			"caution_box", 
+			std::string("caution_box"), 
 			LLRect(x, y, getRect().getWidth() - 2, caution_height), 
-			"", 
+			LLStringUtil::null, 
 			sFont, 
 			FALSE);
 
@@ -303,7 +303,7 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
 		DB_LAST_NAME_BUF_SIZE +
 		DB_INV_ITEM_NAME_BUF_SIZE;  // For script dialogs: add space for title.
 
-	text = new LLTextEditor("box",
+	text = new LLTextEditor(std::string("box"),
 							LLRect(x, y, getRect().getWidth()-2, mIsTip ? BOTTOM : BTN_TOP+16),
 							MAX_LENGTH,
 							mMessage,
@@ -333,16 +333,16 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
 	else
 	{
 		LLButton* btn;
-		btn = new LLButton("next",
+		btn = new LLButton(std::string("next"),
 						   LLRect(getRect().getWidth()-26, BOTTOM_PAD + 20, getRect().getWidth()-2, BOTTOM_PAD),
-						   "notify_next.png",
-						   "notify_next.png",
-						   "",
+						   std::string("notify_next.png"),
+						   std::string("notify_next.png"),
+						   LLStringUtil::null,
 						   onClickNext,
 						   this,
 						   sFont);
 		btn->setScaleImage(TRUE);
-		btn->setToolTip(LLString("Next")); // *TODO: Translate
+		btn->setToolTip(std::string("Next")); // *TODO: Translate
 		addChild(btn);
 		mNextBtn = btn;
 
@@ -382,7 +382,7 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
 
 			mBtnCallbackData.push_back(userdata);
 
-			btn = new LLButton(options[i], btn_rect, "", onClickButton, userdata);
+			btn = new LLButton(options[i], btn_rect, LLStringUtil::null, onClickButton, userdata);
 			btn->setFont(font);
 
 			if (mIsCaution)
@@ -569,12 +569,12 @@ void LLNotifyBox::close()
 	}
 }
 
-void LLNotifyBox::format(LLString& msg, const LLString::format_map_t& args)
+void LLNotifyBox::format(std::string& msg, const LLStringUtil::format_map_t& args)
 {
 	// XUI:translate!
-	LLString::format_map_t targs = args;
+	LLStringUtil::format_map_t targs = args;
 	targs["[SECOND_LIFE]"] = "Second Life";
-	LLString::format(msg, targs);
+	LLStringUtil::format(msg, targs);
 }
 
 
@@ -667,7 +667,7 @@ LLRect LLNotifyBox::getNotifyRect(S32 num_options, BOOL layout_script_dialog, BO
 }
 
 // static
-LLRect LLNotifyBox::getNotifyTipRect(const LLString &utf8message)
+LLRect LLNotifyBox::getNotifyTipRect(const std::string &utf8message)
 {
 	S32 line_count = 1;
 	LLWString message = utf8str_to_wstring(utf8message);
@@ -789,7 +789,7 @@ void LLNotifyBox::onClickNext(void* data)
 }
 
 // static
-LLPointer<LLNotifyBoxTemplate> LLNotifyBox::getTemplate(const LLString& xml_desc)
+LLPointer<LLNotifyBoxTemplate> LLNotifyBox::getTemplate(const std::string& xml_desc)
 {
 	// get template
 	
@@ -808,7 +808,7 @@ LLPointer<LLNotifyBoxTemplate> LLNotifyBox::getTemplate(const LLString& xml_desc
 	}
 	else
 	{
-		LLString tmsg = "[Notification template not found:\n " + xml_desc + " ]";
+		std::string tmsg = "[Notification template not found:\n " + xml_desc + " ]";
 		sDefaultTemplate->setMessage(tmsg);
 		xml_template = sDefaultTemplate;
 	}
@@ -819,12 +819,12 @@ LLPointer<LLNotifyBoxTemplate> LLNotifyBox::getTemplate(const LLString& xml_desc
 //-----------------------------------------------------------------------------
 
 //static
-const LLString LLNotifyBox::getTemplateMessage(const LLString& xml_desc, const LLString::format_map_t& args)
+const std::string LLNotifyBox::getTemplateMessage(const std::string& xml_desc, const LLStringUtil::format_map_t& args)
 {
 	template_map_t::iterator iter = sNotifyTemplates.find(xml_desc);
 	if (iter != sNotifyTemplates.end())
 	{
-		LLString message = iter->second->mMessage;
+		std::string message = iter->second->mMessage;
 		format(message, args);
 		return message;
 	}
@@ -835,7 +835,7 @@ const LLString LLNotifyBox::getTemplateMessage(const LLString& xml_desc, const L
 }
 
 //static
-const LLString LLNotifyBox::getTemplateMessage(const LLString& xml_desc)
+const std::string LLNotifyBox::getTemplateMessage(const std::string& xml_desc)
 {
 	template_map_t::iterator iter = sNotifyTemplates.find(xml_desc);
 	if (iter != sNotifyTemplates.end())
@@ -849,7 +849,7 @@ const LLString LLNotifyBox::getTemplateMessage(const LLString& xml_desc)
 }
 
 // method to check whether a given notify template show as a caution or not
-BOOL LLNotifyBox::getTemplateIsCaution(const LLString& xml_desc)
+BOOL LLNotifyBox::getTemplateIsCaution(const std::string& xml_desc)
 {
 	BOOL is_caution = FALSE;
 
@@ -863,7 +863,7 @@ BOOL LLNotifyBox::getTemplateIsCaution(const LLString& xml_desc)
 }
 
 //static
-bool LLNotifyBox::parseNotify(const LLString& xml_filename)
+bool LLNotifyBox::parseNotify(const std::string& xml_filename)
 {
 	LLXMLNodePtr root;
 
@@ -892,7 +892,7 @@ bool LLNotifyBox::parseNotify(const LLString& xml_filename)
 		LLPointer<LLNotifyBoxTemplate> xml_template = new LLNotifyBoxTemplate(unique, duration);
 
 		// label=
-		LLString notify_name;
+		std::string notify_name;
 		if (notify->getAttributeString("name", notify_name))
 		{
 			xml_template->mLabel = notify_name;
@@ -934,10 +934,10 @@ bool LLNotifyBox::parseNotify(const LLString& xml_filename)
 			// <option>
 			if (child->hasName("option"))
 			{
-				LLString label = child->getValue();
+				std::string label = child->getValue();
 				BOOL is_default = FALSE;
 				child->getAttributeBOOL("default", is_default);
-				LLString ignore_text;
+				std::string ignore_text;
 				if (!child->getAttributeString("ignore", ignore_text))
 				{
 					ignore_text = label;
@@ -957,7 +957,7 @@ bool LLNotifyBox::parseNotify(const LLString& xml_filename)
 	return true;
 }
 
-LLNotifyBoxView::LLNotifyBoxView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows)
+LLNotifyBoxView::LLNotifyBoxView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows)
 	: LLUICtrl(name,rect,mouse_opaque,NULL,NULL,follows) 
 {
 }
diff --git a/linden/indra/newview/llnotify.h b/linden/indra/newview/llnotify.h
index f2d37c1..95d61eb 100644
--- a/linden/indra/newview/llnotify.h
+++ b/linden/indra/newview/llnotify.h
@@ -45,24 +45,24 @@ class LLNotifyBox : public LLPanel, public LLEventTimer
 {
 public:
 	typedef void (*notify_callback_t)(S32 option, void* data);
-	typedef std::vector<LLString> option_list_t;
+	typedef std::vector<std::string> option_list_t;
 
-	static LLNotifyBox* showXml( const LLString& xml_desc,
+	static LLNotifyBox* showXml( const std::string& xml_desc,
 						 notify_callback_t callback = NULL, void *user_data = NULL);
-	static LLNotifyBox* showXml( const LLString& xml_desc, const LLString::format_map_t& args, BOOL is_caution,
+	static LLNotifyBox* showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args, BOOL is_caution,
 						 notify_callback_t callback = NULL, void *user_data = NULL);
-	static LLNotifyBox* showXml( const LLString& xml_desc, const LLString::format_map_t& args,
+	static LLNotifyBox* showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 						 notify_callback_t callback = NULL, void *user_data = NULL);
 	// For script notifications:
-	static LLNotifyBox* showXml( const LLString& xml_desc, const LLString::format_map_t& args,
+	static LLNotifyBox* showXml( const std::string& xml_desc, const LLStringUtil::format_map_t& args,
 						 notify_callback_t callback, void *user_data,
 						 const option_list_t& options,
 						 BOOL layout_script_dialog = FALSE);
 
-	static bool parseNotify(const LLString& xml_filename);
-	static const LLString getTemplateMessage(const LLString& xml_desc, const LLString::format_map_t& args);
-	static const LLString getTemplateMessage(const LLString& xml_desc);
- 	static BOOL getTemplateIsCaution(const LLString& xml_desc);
+	static bool parseNotify(const std::string& xml_filename);
+	static const std::string getTemplateMessage(const std::string& xml_desc, const LLStringUtil::format_map_t& args);
+	static const std::string getTemplateMessage(const std::string& xml_desc);
+ 	static BOOL getTemplateIsCaution(const std::string& xml_desc);
 	
 	BOOL isTip() const { return mIsTip; }
 	BOOL isCaution() const { return mIsCaution; }
@@ -74,10 +74,10 @@ public:
 	void close();
 
 	static void cleanup();
-	static void format(LLString& msg, const LLString::format_map_t& args);
+	static void format(std::string& msg, const LLStringUtil::format_map_t& args);
 
 protected:
-	LLNotifyBox(LLPointer<LLNotifyBoxTemplate> notify_template, const LLString::format_map_t& args,
+	LLNotifyBox(LLPointer<LLNotifyBoxTemplate> notify_template, const LLStringUtil::format_map_t& args,
 							 notify_callback_t callback, void* user_data,
  							 BOOL is_caution = FALSE,
 							 const option_list_t& extra_options = option_list_t(),
@@ -97,7 +97,7 @@ protected:
 	// Returns the rect, relative to gNotifyView, where this
 	// notify box should be placed.
 	static LLRect getNotifyRect(S32 num_options, BOOL layout_script_dialog, BOOL is_caution);
-	static LLRect getNotifyTipRect(const LLString &message);
+	static LLRect getNotifyTipRect(const std::string &message);
 
 	// internal handler for button being clicked
 	static void onClickButton(void* data);
@@ -105,8 +105,8 @@ protected:
 	// for "next" button
 	static void onClickNext(void* data);
 
-	static LLPointer<LLNotifyBoxTemplate> getTemplate(const LLString& xml_desc);
-	static LLNotifyBox* findExistingNotify(LLPointer<LLNotifyBoxTemplate> notify_template, const LLString::format_map_t& args);
+	static LLPointer<LLNotifyBoxTemplate> getTemplate(const std::string& xml_desc);
+	static LLNotifyBox* findExistingNotify(LLPointer<LLNotifyBoxTemplate> notify_template, const LLStringUtil::format_map_t& args);
 
 private:
 	void drawBackground() const;
@@ -114,7 +114,7 @@ private:
 	static LLPointer<LLNotifyBoxTemplate> sDefaultTemplate;
 
 protected:
-	LLString mMessage;
+	std::string mMessage;
 
 	BOOL mIsTip;
 	BOOL mIsCaution; // is this a caution notification?
@@ -150,21 +150,21 @@ protected:
 	};
 	std::vector<InstanceAndS32*> mBtnCallbackData;
 
-	typedef std::map<LLString, LLPointer<LLNotifyBoxTemplate> > template_map_t;
+	typedef std::map<std::string, LLPointer<LLNotifyBoxTemplate> > template_map_t;
 	static template_map_t sNotifyTemplates; // by mLabel
 	
 	static S32 sNotifyBoxCount;
 	static const LLFontGL* sFont;
 	static const LLFontGL* sFontSmall;
 
-	typedef std::map<LLString, LLNotifyBox*> unique_map_t;
+	typedef std::map<std::string, LLNotifyBox*> unique_map_t;
 	static unique_map_t sOpenUniqueNotifyBoxes;
 };
 
 class LLNotifyBoxView : public LLUICtrl
 {
 public:
-	LLNotifyBoxView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
+	LLNotifyBoxView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
 	void showOnly(LLView * ctrl);
 	LLNotifyBox * getFirstNontipBox() const;
 
@@ -195,12 +195,12 @@ public:
 		mDefaultOption(0)
 	{}
 
-	void setMessage(const LLString& message)
+	void setMessage(const std::string& message)
 	{
 		mMessage = message;
 	}
 	
-	void addOption(const LLString& label, BOOL is_default = FALSE)
+	void addOption(const std::string& label, BOOL is_default = FALSE)
 	{
 		if (is_default)
 		{
@@ -210,8 +210,8 @@ public:
 	}
 
 public:
-	LLString mLabel;			// Handle for access from code, etc
-	LLString mMessage;			// Message to display
+	std::string mLabel;			// Handle for access from code, etc
+	std::string mMessage;			// Message to display
 	BOOL mIsTip;
 	BOOL mIsCaution;
 	BOOL mUnique;
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index d430d17..d0aad25 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -87,7 +87,7 @@ void* LLOverlayBar::createMediaRemote(void* userdata)
 void* LLOverlayBar::createVoiceRemote(void* userdata)
 {
 	LLOverlayBar *self = (LLOverlayBar*)userdata;	
-	self->mVoiceRemote = new LLVoiceRemoteCtrl("voice_remote");
+	self->mVoiceRemote = new LLVoiceRemoteCtrl(std::string("voice_remote"));
 	return self->mVoiceRemote;
 }
 
@@ -120,7 +120,6 @@ BOOL LLOverlayBar::postBuild()
 {
 	childSetAction("IM Received",onClickIMReceived,this);
 	childSetAction("Set Not Busy",onClickSetNotBusy,this);
-	childSetAction("Release Keys",onClickReleaseKeys,this);
 	childSetAction("Mouselook",onClickMouselook,this);
 	childSetAction("Stand Up",onClickStandUp,this);
 	childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
@@ -210,17 +209,6 @@ void LLOverlayBar::refresh()
 		buttons_changed = TRUE;
 	}
 
-	BOOL controls_grabbed = gAgent.anyControlGrabbed();
-	button = getChild<LLButton>("Release Keys");
-
-	if (button && button->getVisible() != controls_grabbed)
-	{
-		button->setVisible(controls_grabbed);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
-	}
-
 	BOOL mouselook_grabbed;
 	mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
 		|| gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
@@ -296,12 +284,6 @@ void LLOverlayBar::onClickSetNotBusy(void*)
 
 
 // static
-void LLOverlayBar::onClickReleaseKeys(void*)
-{
-	gAgent.forceReleaseControls();
-}
-
-// static
 void LLOverlayBar::onClickResetView(void* data)
 {
 	handle_reset_view();
@@ -379,7 +361,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
 				// stream is stopped, it doesn't return the right thing - commenting out for now.
 	// 			if ( gAudiop->isInternetStreamPlaying() == 0 )
 				{
-					gAudiop->startInternetStream(parcel->getMusicURL().c_str());
+					gAudiop->startInternetStream(parcel->getMusicURL());
 				}
 			}
 		}
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 51a6e50..907441e 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -68,7 +68,6 @@ public:
 	
 	static void onClickIMReceived(void* data);
 	static void onClickSetNotBusy(void* data);
-	static void onClickReleaseKeys(void* data);
 	static void onClickMouselook(void* data);
 	static void onClickStandUp(void* data);
 	static void onClickResetView(void* data);
diff --git a/linden/indra/newview/llpanelaudiovolume.cpp b/linden/indra/newview/llpanelaudiovolume.cpp
index e5bc9c5..9a66366 100644
--- a/linden/indra/newview/llpanelaudiovolume.cpp
+++ b/linden/indra/newview/llpanelaudiovolume.cpp
@@ -88,7 +88,7 @@ void LLPanelAudioVolume::draw()
 void LLPanelAudioVolume::onCommitVolumeChange(LLUICtrl* ctrl, void* user_data)
 {
 	// unmute various audio sources when user changes volume
-	LLString control_name = ctrl->getControlName();
+	std::string control_name = ctrl->getControlName();
 	if (control_name == "AudioLevelMaster")
 	{
 		gSavedSettings.setBOOL("MuteAudio", FALSE);
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 3314ec1..7b21a15 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -111,7 +111,7 @@ public:
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg);
+								   std::string& tooltip_msg);
 	void setAgentID(const LLUUID &agent_id)		{ mAgentID = agent_id; }
 protected:
 	LLUUID mAgentID;
@@ -138,7 +138,7 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 									 EDragAndDropType cargo_type,
 									 void* cargo_data,
 									 EAcceptance* accept,
-									 LLString& tooltip_msg)
+									 std::string& tooltip_msg)
 {
 	BOOL handled = FALSE;
 	if(getParent())
@@ -234,7 +234,7 @@ void LLPanelAvatarTab::draw()
 	LLPanel::draw();
 }
 
-void LLPanelAvatarTab::sendAvatarProfileRequestIfNeeded(const char* method)
+void LLPanelAvatarTab::sendAvatarProfileRequestIfNeeded(const std::string& method)
 {
 	if (!mDataRequested)
 	{
@@ -292,8 +292,8 @@ void LLPanelAvatarSecondLife::clearControls()
 	childSetValue("born", "");
 	childSetValue("acct", "");
 
-	childSetTextArg("partner_edit", "[FIRST]", LLString::null);
-	childSetTextArg("partner_edit", "[LAST]", LLString::null);
+	childSetTextArg("partner_edit", "[FIRST]", LLStringUtil::null);
+	childSetTextArg("partner_edit", "[LAST]", LLStringUtil::null);
 
 	mPartnerID = LLUUID::null;
 	
@@ -459,9 +459,9 @@ BOOL LLPanelAvatarNotes::postBuild(void)
 
 BOOL LLPanelAvatarWeb::postBuild(void)
 {
-	childSetAction("load",onClickLoad,this);
-	childSetAction("open",onClickOpen,this);
-	childSetAction("home",onClickLoad,this);
+	childSetKeystrokeCallback("url_edit", onURLKeystroke, this);
+	childSetCommitCallback("load", onCommitLoad, this);
+
 	childSetAction("web_profile_help",onClickWebProfileHelp,this);
 
 	childSetCommitCallback("url_edit",onCommitURL,this);
@@ -502,7 +502,7 @@ BOOL LLPanelAvatarAdvanced::postBuild()
 	mWantToCount = (8>kArraySize(mWantToCheck))?kArraySize(mWantToCheck):8;
 	for(S32 tt=0; tt < mWantToCount; ++tt)
 	{	
-		LLString ctlname = llformat("chk%d", tt);
+		std::string ctlname = llformat("chk%d", tt);
 		mWantToCheck[tt] = getChild<LLCheckBoxCtrl>(ctlname);
 	}	
 	mSkillsCount = (6>kArraySize(mSkillsCheck))?kArraySize(mSkillsCheck):6;
@@ -510,7 +510,7 @@ BOOL LLPanelAvatarAdvanced::postBuild()
 	for(S32 tt=0; tt < mSkillsCount; ++tt)
 	{
 		//Find the Skills checkboxes and save off thier controls
-		LLString ctlname = llformat("schk%d",tt);
+		std::string ctlname = llformat("schk%d",tt);
 		mSkillsCheck[tt] = getChild<LLCheckBoxCtrl>(ctlname);
 	}
 
@@ -544,31 +544,26 @@ LLPanelAvatarWeb::~LLPanelAvatarWeb()
 void LLPanelAvatarWeb::enableControls(BOOL self)
 {	
 	childSetEnabled("url_edit",self);
-	childSetVisible("status_text",!self && !mURL.empty());
-	childSetText("status_text", LLString::null);
+	childSetVisible("status_text",!self && !mHome.empty());
+	childSetText("status_text", LLStringUtil::null);
 }
 
 void LLPanelAvatarWeb::setWebURL(std::string url)
 {
-	bool changed_url = (mURL != url);
+	bool changed_url = (mHome != url);
 
-	mURL = url;
-	bool have_url = !mURL.empty();
+	mHome = url;
+	bool have_url = !mHome.empty();
 	
-	childSetText("url_edit",mURL);
-
-	childSetEnabled("load",have_url);
-	childSetEnabled("open",have_url);
-
-	childSetVisible("home",false);
-	childSetVisible("load",true);
+	childSetText("url_edit", mHome);
+	childSetEnabled("load", mHome.length() > 0);
 
 	if (have_url
 		&& gSavedSettings.getBOOL("AutoLoadWebProfiles"))
 	{
 		if (changed_url)
 		{
-			load();
+			load(mHome);
 		}
 	}
 	else
@@ -577,7 +572,7 @@ void LLPanelAvatarWeb::setWebURL(std::string url)
 	}
 
 	BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
-	childSetVisible("status_text",!own_avatar && !mURL.empty());
+	childSetVisible("status_text",!own_avatar && !mHome.empty());
 	
 }
 
@@ -607,47 +602,45 @@ void LLPanelAvatarWeb::load(std::string url)
 		mWebBrowser->navigateTo( url );
 	}
 
-	// If we have_url then we loaded so use the home button
-	// Or if the url in address bar is not the home url show the home button.
-	bool use_home = (have_url
-					 || url != mURL);
-					 
-	childSetVisible("profile_html",have_url);
-	childSetVisible("load",!use_home);	
-	childSetVisible("home",use_home);
-
-	childSetEnabled("load",!use_home);
-	childSetEnabled("home",use_home);
-	childSetEnabled("open",have_url);
-	
+	childSetVisible("profile_html", have_url);
 }
 
-void LLPanelAvatarWeb::load()
-{
-	load(mURL);
-}
-
-// static
-void LLPanelAvatarWeb::onClickLoad(void* data)
+//static
+void LLPanelAvatarWeb::onURLKeystroke(LLLineEditor* editor, void* data)
 {
 	LLPanelAvatarWeb* self = (LLPanelAvatarWeb*)data;
-
 	if (!self) return;
-	
-	self->load();
+	LLSD::String url = editor->getText();
+	self->childSetEnabled("load", url.length() > 0);
+	return;
 }
 
 // static
-void LLPanelAvatarWeb::onClickOpen(void* data)
+void LLPanelAvatarWeb::onCommitLoad(LLUICtrl* ctrl, void* data)
 {
 	LLPanelAvatarWeb* self = (LLPanelAvatarWeb*)data;
 
 	if (!self) return;
 
-	std::string url = self->childGetText("url_edit");
-	if (!url.empty())
+	LLSD::String valstr = ctrl->getValue().asString();
+	LLSD::String urlstr = self->childGetText("url_edit");
+	if (valstr == "") // load url string into browser panel
 	{
-		LLWeb::loadURLExternal(url);
+		self->load(urlstr);
+	}
+	else if (valstr == "open") // open in user's external browser
+	{
+		if (!urlstr.empty())
+		{
+			LLWeb::loadURLExternal(urlstr);
+		}
+	}
+	else if (valstr == "home") // reload profile owner's home page
+	{
+		if (!self->mHome.empty())
+		{
+			self->load(self->mHome);
+		}
 	}
 }
 
@@ -780,7 +773,7 @@ void LLPanelAvatarNotes::onCommitNotes(LLUICtrl*, void* userdata)
 //-----------------------------------------------------------------------------
 // LLPanelAvatarClassified()
 //-----------------------------------------------------------------------------
-LLPanelAvatarClassified::LLPanelAvatarClassified(const LLString& name, const LLRect& rect,
+LLPanelAvatarClassified::LLPanelAvatarClassified(const std::string& name, const LLRect& rect,
 									   LLPanelAvatar* panel_avatar)
 :	LLPanelAvatarTab(name, rect, panel_avatar)
 {
@@ -885,7 +878,7 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
 	S32 block = 0;
 	S32 block_count = 0;
 	LLUUID classified_id;
-	char classified_name[DB_PICK_NAME_SIZE];		/*Flawfinder: ignore*/
+	std::string classified_name;
 	LLPanelClassified* panel_classified = NULL;
 
 	LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
@@ -897,7 +890,7 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
 	for (block = 0; block < block_count; block++)
 	{
 		msg->getUUIDFast(_PREHASH_Data, _PREHASH_ClassifiedID, classified_id, block);
-		msg->getStringFast(_PREHASH_Data, _PREHASH_Name, DB_PICK_NAME_SIZE, classified_name, block);
+		msg->getStringFast(_PREHASH_Data, _PREHASH_Name, classified_name, block);
 
 		panel_classified = new LLPanelClassified(false, false);
 
@@ -969,7 +962,7 @@ void LLPanelAvatarClassified::onClickDelete(void* data)
 	}
 	if (!panel_classified) return;
 
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[NAME]"] = panel_classified->getClassifiedName();
 	gViewerWindow->alertXml("DeleteClassified", args, callbackDelete, self);
 		
@@ -1054,7 +1047,7 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
 	S32 block = 0;
 	S32 block_count = 0;
 	LLUUID pick_id;
-	char pick_name[DB_PICK_NAME_SIZE];		/*Flawfinder: ignore*/
+	std::string pick_name;
 	LLPanelPick* panel_pick = NULL;
 
 	LLTabContainer* tabs =  getChild<LLTabContainer>("picks tab");
@@ -1070,7 +1063,7 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
 	for (block = 0; block < block_count; block++)
 	{
 		msg->getUUID("Data", "PickID", pick_id, block);
-		msg->getString("Data", "PickName", DB_PICK_NAME_SIZE, pick_name, block);
+		msg->getString("Data", "PickName", pick_name, block);
 
 		panel_pick = new LLPanelPick(FALSE);
 
@@ -1127,7 +1120,7 @@ void LLPanelAvatarPicks::onClickDelete(void* data)
 
 	if (!panel_pick) return;
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[PICK]"] = panel_pick->getPickName();
 
 	gViewerWindow->alertXml("DeleteAvatarPick", args,
@@ -1275,7 +1268,7 @@ void LLPanelAvatar::setAvatar(LLViewerObject *avatarp)
 	LLNameValue *firstname = avatarp->getNVPair("FirstName");
 	LLNameValue *lastname = avatarp->getNVPair("LastName");
 
-	LLString name;
+	std::string name;
 	if (firstname && lastname)
 	{
 		name.assign( firstname->getString() );
@@ -1330,7 +1323,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
 	}
 }
 
-void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
+void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name,
 								EOnlineStatus online_status)
 {
 	if (avatar_id.isNull()) return;
@@ -1532,7 +1525,7 @@ void LLPanelAvatar::resetGroupList()
 				row["columns"][0]["width"] = 0;
 				group_list->addElement(row);
 			}
-			group_list->sortByColumn(0, TRUE);
+			group_list->sortByColumnIndex(0, TRUE);
 		}
 	}
 }
@@ -1742,9 +1735,9 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 	LLUUID	image_id;
 	LLUUID	fl_image_id;
 	LLUUID	partner_id;
-	char	about_text[DB_USER_ABOUT_BUF_SIZE];		/*Flawfinder: ignore*/
-	char	fl_about_text[DB_USER_FL_ABOUT_BUF_SIZE];		/*Flawfinder: ignore*/
-	char	born_on[DB_BORN_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string	about_text;
+	std::string	fl_about_text;
+	std::string	born_on;
 	S32		charter_member_size = 0;
 	BOOL	allow_publish = FALSE;
 	//BOOL	mature = FALSE;
@@ -1752,7 +1745,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 	BOOL	transacted = FALSE;
 	BOOL	age_verified = FALSE;
 	BOOL	online = FALSE;
-	char	profile_url[DB_USER_PROFILE_URL_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string	profile_url;
 
 	U32		flags = 0x0;
 
@@ -1780,10 +1773,10 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 		msg->getUUIDFast(  _PREHASH_PropertiesData,	_PREHASH_ImageID,		image_id );
 		msg->getUUIDFast(  _PREHASH_PropertiesData,	_PREHASH_FLImageID,	fl_image_id );
 		msg->getUUIDFast(_PREHASH_PropertiesData, _PREHASH_PartnerID, partner_id);
-		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_AboutText,	DB_USER_ABOUT_BUF_SIZE,		about_text );
-		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_FLAboutText,	DB_USER_FL_ABOUT_BUF_SIZE,		fl_about_text );
-		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_BornOn, DB_BORN_BUF_SIZE, born_on);
-		msg->getString("PropertiesData","ProfileURL", DB_USER_PROFILE_URL_BUF_SIZE, profile_url);
+		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_AboutText,	about_text );
+		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_FLAboutText, fl_about_text );
+		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_BornOn, born_on);
+		msg->getString("PropertiesData","ProfileURL", profile_url);
 		msg->getU32Fast(_PREHASH_PropertiesData, _PREHASH_Flags, flags);
 		
 		identified = (flags & AVATAR_IDENTIFIED);
@@ -1793,7 +1786,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 		online = (flags & AVATAR_ONLINE);
 		
 		U8 caption_index = 0;
-		LLString caption_text;
+		std::string caption_text;
 		charter_member_size = msg->getSize("PropertiesData", "CharterMember");
 		if(1 == charter_member_size)
 		{
@@ -1801,15 +1794,13 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 		}
 		else if(1 < charter_member_size)
 		{
-			char caption[MAX_STRING];		/*Flawfinder: ignore*/
-			msg->getString("PropertiesData", "CharterMember", MAX_STRING, caption);
-			caption_text = caption;
+			msg->getString("PropertiesData", "CharterMember", caption_text);
 		}
 		
 
 		if(caption_text.empty())
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			caption_text = self->mPanelSecondLife->getString("CaptionTextAcctInfo");
 			
 			const char* ACCT_TYPE[] = {
@@ -1821,7 +1812,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 			caption_index = llclamp(caption_index, (U8)0, (U8)(sizeof(ACCT_TYPE)/sizeof(ACCT_TYPE[0])-1));
 			args["[ACCTTYPE]"] = self->mPanelSecondLife->getString(ACCT_TYPE[caption_index]);
 
-			LLString payment_text = " ";
+			std::string payment_text = " ";
 			const S32 DEFAULT_CAPTION_LINDEN_INDEX = 3;
 			if(caption_index != DEFAULT_CAPTION_LINDEN_INDEX)
 			{			
@@ -1838,7 +1829,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 					payment_text = "NoPaymentInfoOnFile";
 				}
 				args["[PAYMENTINFO]"] = self->mPanelSecondLife->getString(payment_text);
-				LLString age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
+				std::string age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
 				// Do not display age verification status at this time
 				//args["[AGEVERIFICATION]"] = self->mPanelSecondLife->getString(age_text);
 				args["[AGEVERIFICATION]"] = " ";
@@ -1848,7 +1839,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 				args["[PAYMENTINFO]"] = " ";
 				args["[AGEVERIFICATION]"] = " ";
 			}
-			LLString::format(caption_text, args);
+			LLStringUtil::format(caption_text, args);
 		}
 		
 		self->mPanelSecondLife->childSetValue("acct", caption_text);
@@ -1858,7 +1849,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 
 		self->setOnlineStatus(online_status);
 
-		self->mPanelWeb->setWebURL(std::string(profile_url));
+		self->mPanelWeb->setWebURL(profile_url);
 
 		LLTextureCtrl*	image_ctrl = self->mPanelSecondLife->getChild<LLTextureCtrl>("img");
 		if(image_ctrl)
@@ -1893,10 +1884,10 @@ void LLPanelAvatar::processAvatarInterestsReply(LLMessageSystem *msg, void**)
 	LLUUID	avatar_id;	// target of this panel
 
 	U32		want_to_mask;
-	char	want_to_text[DB_USER_WANT_TO_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string	want_to_text;
 	U32		skills_mask;
-	char	skills_text[DB_USER_SKILLS_BUF_SIZE];		/*Flawfinder: ignore*/
-	char	languages_text[DB_USER_SKILLS_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string	skills_text;
+	std::string	languages_text;
 
 	//llinfos << "properties packet size " << msg->getReceiveSize() << llendl;
 
@@ -1912,10 +1903,10 @@ void LLPanelAvatar::processAvatarInterestsReply(LLMessageSystem *msg, void**)
 		}
 
 		msg->getU32Fast(   _PREHASH_PropertiesData,	_PREHASH_WantToMask,	want_to_mask );
-		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_WantToText,	DB_USER_WANT_TO_BUF_SIZE,	want_to_text );
+		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_WantToText,	want_to_text );
 		msg->getU32Fast(   _PREHASH_PropertiesData,	_PREHASH_SkillsMask,	skills_mask );
-		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_SkillsText,	DB_USER_SKILLS_BUF_SIZE,	skills_text );
-		msg->getString(_PREHASH_PropertiesData, "LanguagesText",	DB_USER_SKILLS_BUF_SIZE,	languages_text );
+		msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_SkillsText,	skills_text );
+		msg->getString(_PREHASH_PropertiesData, "LanguagesText",			languages_text );
 
 		self->mPanelAdvanced->setWantSkills(want_to_mask, want_to_text, skills_mask, skills_text, languages_text);
 	}
@@ -1929,9 +1920,9 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
 	LLUUID	agent_id;	// your id
 	LLUUID	avatar_id;	// target of this panel
 	U64		group_powers;
-	char	group_title[DB_GROUP_TITLE_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string	group_title;
 	LLUUID	group_id;
-	char	group_name[DB_GROUP_NAME_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string	group_name;
 	LLUUID	group_insignia_id;
 
 	llinfos << "groups packet size " << msg->getReceiveSize() << llendl;
@@ -1956,19 +1947,19 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
 		S32 group_count = msg->getNumberOfBlocksFast(_PREHASH_GroupData);
 		if (0 == group_count)
 		{
-			if(group_list) group_list->addCommentText("None");
+			if(group_list) group_list->addCommentText(std::string("None")); // *TODO: Translate
 		}
 		else
 		{
 			for(S32 i = 0; i < group_count; ++i)
 			{
 				msg->getU64(    _PREHASH_GroupData, "GroupPowers",	group_powers, i );
-				msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupTitle,	DB_GROUP_TITLE_BUF_SIZE,	group_title, i );
-				msg->getUUIDFast(  _PREHASH_GroupData, _PREHASH_GroupID,		group_id, i);
-				msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupName,	DB_GROUP_NAME_BUF_SIZE,		group_name, i );
+				msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupTitle,	group_title, i );
+				msg->getUUIDFast(  _PREHASH_GroupData, _PREHASH_GroupID,	group_id, i);
+				msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupName,	group_name, i );
 				msg->getUUIDFast(  _PREHASH_GroupData, _PREHASH_GroupInsigniaID, group_insignia_id, i );
 
-				LLString group_string;
+				std::string group_string;
 				if (group_id.notNull())
 				{
 					group_string.assign(group_name);
@@ -1999,7 +1990,7 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
 				}
 			}
 		}
-		if(group_list) group_list->sortByColumn(0, TRUE);
+		if(group_list) group_list->sortByColumnIndex(0, TRUE);
 	}
 }
 
@@ -2036,7 +2027,7 @@ void LLPanelAvatar::sendAvatarPropertiesUpdate()
 	mPanelAdvanced->getWantSkills(&want_to_mask, want_to_text, &skills_mask, skills_text, languages_text);
 
 	LLUUID first_life_image_id;
-	LLString first_life_about_text;
+	std::string first_life_about_text;
 	if (mPanelFirstLife)
 	{
 		first_life_about_text = mPanelFirstLife->childGetValue("about").asString();
@@ -2047,7 +2038,7 @@ void LLPanelAvatar::sendAvatarPropertiesUpdate()
 		}
 	}
 
-	LLString about_text = mPanelSecondLife->childGetValue("about").asString();
+	std::string about_text = mPanelSecondLife->childGetValue("about").asString();
 
 	LLMessageSystem *msg = gMessageSystem;
 
@@ -2131,8 +2122,8 @@ void LLPanelAvatar::processAvatarNotesReply(LLMessageSystem *msg, void**)
 			continue;
 		}
 
-		char text[DB_USER_NOTE_SIZE];		/*Flawfinder: ignore*/
-		msg->getString("Data", "Notes", DB_USER_NOTE_SIZE, text);
+		std::string text;
+		msg->getString("Data", "Notes", text);
 		self->childSetValue("notes edit", text);
 		self->childSetEnabled("notes edit", true);
 		self->mHaveNotes = true;
@@ -2192,13 +2183,13 @@ void LLPanelAvatar::onClickKick(void* userdata)
 	gFloaterView->getNewFloaterPosition(&left, &top);
 	LLRect rect(left, top, left+400, top-300);
 
-	gViewerWindow->alertXmlEditText("KickUser", LLString::format_map_t(),
+	gViewerWindow->alertXmlEditText("KickUser", LLStringUtil::format_map_t(),
 									NULL, NULL,
 									LLPanelAvatar::finishKick, self);
 }
 
 // static
-void LLPanelAvatar::finishKick(S32 option, const LLString& text, void* userdata)
+void LLPanelAvatar::finishKick(S32 option, const std::string& text, void* userdata)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*) userdata;
 
@@ -2220,13 +2211,13 @@ void LLPanelAvatar::finishKick(S32 option, const LLString& text, void* userdata)
 // static
 void LLPanelAvatar::onClickFreeze(void* userdata)
 {
-	gViewerWindow->alertXmlEditText("FreezeUser", LLString::format_map_t(),
+	gViewerWindow->alertXmlEditText("FreezeUser", LLStringUtil::format_map_t(),
 									NULL, NULL,
 									LLPanelAvatar::finishFreeze, userdata);
 }
 
 // static
-void LLPanelAvatar::finishFreeze(S32 option, const LLString& text, void* userdata)
+void LLPanelAvatar::finishFreeze(S32 option, const std::string& text, void* userdata)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*) userdata;
 
@@ -2248,13 +2239,13 @@ void LLPanelAvatar::finishFreeze(S32 option, const LLString& text, void* userdat
 // static
 void LLPanelAvatar::onClickUnfreeze(void* userdata)
 {
-	gViewerWindow->alertXmlEditText("UnFreezeUser", LLString::format_map_t(),
+	gViewerWindow->alertXmlEditText("UnFreezeUser", LLStringUtil::format_map_t(),
 									NULL, NULL,
 									LLPanelAvatar::finishUnfreeze, userdata);
 }
 
 // static
-void LLPanelAvatar::finishUnfreeze(S32 option, const LLString& text, void* userdata)
+void LLPanelAvatar::finishUnfreeze(S32 option, const std::string& text, void* userdata)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*) userdata;
 
@@ -2282,10 +2273,10 @@ void LLPanelAvatar::onClickCSR(void* userdata)
 	LLNameEditor* name_edit = self->getChild<LLNameEditor>("name");
 	if (!name_edit) return;
 
-	LLString name = name_edit->getText();
+	std::string name = name_edit->getText();
 	if (name.empty()) return;
 	
-	LLString url = "http://csr.lindenlab.com/agent/";
+	std::string url = "http://csr.lindenlab.com/agent/";
 	
 	// slow and stupid, but it's late
 	S32 len = name.length();
@@ -2308,21 +2299,21 @@ void LLPanelAvatar::onClickCSR(void* userdata)
 void*	LLPanelAvatar::createPanelAvatarSecondLife(void* data)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*)data;
-	self->mPanelSecondLife = new LLPanelAvatarSecondLife("2nd Life",LLRect(),self);
+	self->mPanelSecondLife = new LLPanelAvatarSecondLife(std::string("2nd Life"),LLRect(),self);
 	return self->mPanelSecondLife;
 }
 
 void*	LLPanelAvatar::createPanelAvatarWeb(void*	data)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*)data;
-	self->mPanelWeb = new LLPanelAvatarWeb("Web",LLRect(),self);
+	self->mPanelWeb = new LLPanelAvatarWeb(std::string("Web"),LLRect(),self);
 	return self->mPanelWeb;
 }
 
 void*	LLPanelAvatar::createPanelAvatarInterests(void*	data)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*)data;
-	self->mPanelAdvanced = new LLPanelAvatarAdvanced("Interests",LLRect(),self);
+	self->mPanelAdvanced = new LLPanelAvatarAdvanced(std::string("Interests"),LLRect(),self);
 	return self->mPanelAdvanced;
 }
 
@@ -2330,27 +2321,27 @@ void*	LLPanelAvatar::createPanelAvatarInterests(void*	data)
 void*	LLPanelAvatar::createPanelAvatarPicks(void*	data)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*)data;
-	self->mPanelPicks = new LLPanelAvatarPicks("Picks",LLRect(),self);
+	self->mPanelPicks = new LLPanelAvatarPicks(std::string("Picks"),LLRect(),self);
 	return self->mPanelPicks;
 }
 
 void*	LLPanelAvatar::createPanelAvatarClassified(void* data)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*)data;
-	self->mPanelClassified = new LLPanelAvatarClassified("Classified",LLRect(),self);
+	self->mPanelClassified = new LLPanelAvatarClassified(std::string("Classified"),LLRect(),self);
 	return self->mPanelClassified;
 }
 
 void*	LLPanelAvatar::createPanelAvatarFirstLife(void*	data)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*)data;
-	self->mPanelFirstLife = new LLPanelAvatarFirstLife("1st Life", LLRect(), self);
+	self->mPanelFirstLife = new LLPanelAvatarFirstLife(std::string("1st Life"), LLRect(), self);
 	return self->mPanelFirstLife;
 }
 
 void*	LLPanelAvatar::createPanelAvatarNotes(void*	data)
 {
 	LLPanelAvatar* self = (LLPanelAvatar*)data;
-	self->mPanelNotes = new LLPanelAvatarNotes("My Notes",LLRect(),self);
+	self->mPanelNotes = new LLPanelAvatarNotes(std::string("My Notes"),LLRect(),self);
 	return self->mPanelNotes;
 }
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 2a3d36c..c0ef260 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -84,7 +84,7 @@ public:
 	// when they are first displayed.
 	// type is one of "avatarnotesrequest", "avatarpicksrequest",
 	// or "avatarclassifiedsrequest"
-	void sendAvatarProfileRequestIfNeeded(const char* method);
+	void sendAvatarProfileRequestIfNeeded(const std::string& method);
 
 private:
 	LLPanelAvatar* mPanelAvatar;
@@ -147,10 +147,9 @@ public:
 
 	void setWebURL(std::string url);
 
-	void load();
 	void load(std::string url);
-	static void onClickLoad(void* data);
-	static void onClickOpen(void* data);
+	static void onURLKeystroke(LLLineEditor* editor, void* data);
+	static void onCommitLoad(LLUICtrl* ctrl, void* data);
 	static void onCommitURL(LLUICtrl* ctrl, void* data);
 	static void onClickWebProfileHelp(void *);
 
@@ -159,7 +158,7 @@ public:
 	virtual void onLocationChange( const EventType& eventIn );
 
 private:
-	std::string			mURL;
+	std::string			mHome;
 	LLWebBrowserCtrl*	mWebBrowser;
 };
 
@@ -207,7 +206,7 @@ public:
 class LLPanelAvatarClassified : public LLPanelAvatarTab
 {
 public:
-	LLPanelAvatarClassified(const LLString& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
+	LLPanelAvatarClassified(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
 
 	/*virtual*/ BOOL postBuild(void);
 
@@ -279,7 +278,7 @@ public:
 	// Fill in the avatar ID and handle some field fill-in, as well as 
 	// button enablement.
 	// Pass one of the ONLINE_STATUS_foo constants above.
-	void setAvatarID(const LLUUID &avatar_id, const LLString &name, EOnlineStatus online_status);
+	void setAvatarID(const LLUUID &avatar_id, const std::string &name, EOnlineStatus online_status);
 
 	void setOnlineStatus(EOnlineStatus online_status);
 
@@ -326,9 +325,9 @@ public:
 private:
 	void enableOKIfReady();
 
-	static void finishKick(S32 option, const LLString& text, void* userdata);
-	static void finishFreeze(S32 option, const LLString& text, void* userdata);
-	static void finishUnfreeze(S32 option, const LLString& text, void* userdata);
+	static void finishKick(S32 option, const std::string& text, void* userdata);
+	static void finishFreeze(S32 option, const std::string& text, void* userdata);
+	static void finishUnfreeze(S32 option, const std::string& text, void* userdata);
 
 	static void showProfileCallback(S32 option, void *userdata);
 
@@ -374,7 +373,7 @@ private:
 };
 
 // helper funcs
-void add_left_label(LLPanel *panel, const LLString& name, S32 y);
+void add_left_label(LLPanel *panel, const std::string& name, S32 y);
 
 
 #endif // LL_LLPANELAVATAR_H
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 45ceeba..8228a97 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -148,7 +148,7 @@ LLClassifiedTeleportHandler gClassifiedTeleportHandler;
 */
 
 LLPanelClassified::LLPanelClassified(bool in_finder, bool from_search)
-:	LLPanel("Classified Panel"),
+:	LLPanel(std::string("Classified Panel")),
 	mInFinder(in_finder),
 	mFromSearch(from_search),
 	mDirty(false),
@@ -313,7 +313,7 @@ BOOL LLPanelClassified::titleIsValid()
 {
 	// Disallow leading spaces, punctuation, etc. that screw up
 	// sort order.
-	const LLString& name = mNameEditor->getText();
+	const std::string& name = mNameEditor->getText();
 	if (name.empty())
 	{
 		gViewerWindow->alertXml("BlankClassifiedName");
@@ -379,7 +379,7 @@ BOOL LLPanelClassified::canClose()
 	if (mForceClose || !checkDirty()) 
 		return TRUE;
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[NAME]"] = mNameEditor->getText();
 	LLAlertDialog::showXml("ClassifiedSave", args, saveCallback, this);
 	return FALSE;
@@ -576,33 +576,27 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
     LLUUID parcel_id;
     msg->getUUIDFast(_PREHASH_Data, _PREHASH_ParcelID, parcel_id);
 
-	char name[DB_PARCEL_NAME_SIZE];		/*Flawfinder: ignore*/
-	msg->getStringFast(_PREHASH_Data, _PREHASH_Name, DB_PARCEL_NAME_SIZE, name);
+	std::string name;
+	msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name);
 
-	char desc[DB_PICK_DESC_SIZE];		/*Flawfinder: ignore*/
-	msg->getStringFast(_PREHASH_Data, _PREHASH_Desc, DB_PICK_DESC_SIZE, desc);
+	std::string desc;
+	msg->getStringFast(_PREHASH_Data, _PREHASH_Desc, desc);
 
 	LLUUID snapshot_id;
 	msg->getUUIDFast(_PREHASH_Data, _PREHASH_SnapshotID, snapshot_id);
 
     // "Location text" is actually the original
     // name that owner gave the parcel, and the location.
-	char buffer[256];		/*Flawfinder: ignore*/
-    LLString location_text;
+	std::string location_text;
 
-    msg->getStringFast(_PREHASH_Data, _PREHASH_ParcelName, 256, buffer);
-	if (buffer[0] != '\0')
+    msg->getStringFast(_PREHASH_Data, _PREHASH_ParcelName, location_text);
+	if (!location_text.empty())
 	{
-		location_text.assign(buffer);
 		location_text.append(", ");
 	}
-	else
-	{
-		location_text.assign("");
-	}
 
-	char sim_name[256];		/*Flawfinder: ignore*/
-	msg->getStringFast(_PREHASH_Data, _PREHASH_SimName, 256, sim_name);
+	std::string sim_name;
+	msg->getStringFast(_PREHASH_Data, _PREHASH_SimName, sim_name);
 
 	LLVector3d pos_global;
 	msg->getVector3dFast(_PREHASH_Data, _PREHASH_PosGlobal, pos_global);
@@ -610,8 +604,8 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
     S32 region_x = llround((F32)pos_global.mdV[VX]) % REGION_WIDTH_UNITS;
     S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
 	S32 region_z = llround((F32)pos_global.mdV[VZ]);
-   
-    snprintf(buffer, sizeof(buffer), "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z);			/* Flawfinder: ignore */
+
+	std::string buffer = llformat("%s (%d, %d, %d)", sim_name.c_str(), region_x, region_y, region_z);
     location_text.append(buffer);
 
 	U8 flags;
@@ -654,8 +648,8 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
 		self->mPosGlobal = pos_global;
 
 		// Update UI controls
-        self->mNameEditor->setText(LLString(name));
-        self->mDescEditor->setText(LLString(desc));
+        self->mNameEditor->setText(name);
+        self->mDescEditor->setText(desc);
         self->mSnapshotCtrl->setImageAssetID(snapshot_id);
         self->mLocationEditor->setText(location_text);
 		self->mLocationChanged = false;
@@ -674,8 +668,8 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
 			self->mAutoRenewCheck->set(auto_renew);
 		}
 
-		LLString datestr = llformat("%02d/%02d/%d", now->tm_mon+1, now->tm_mday, now->tm_year+1900);
-		LLString::format_map_t string_args;
+		std::string datestr = llformat("%02d/%02d/%d", now->tm_mon+1, now->tm_mday, now->tm_year+1900);
+		LLStringUtil::format_map_t string_args;
 		string_args["[DATE]"] = datestr;
 		string_args["[AMT]"] = llformat("%d", price_for_listing);
 		self->childSetText("classified_info_text", self->getString("ad_placed_paid", string_args));
@@ -790,7 +784,7 @@ void LLPanelClassified::onClickUpdate(void* data)
 	// If user has not set mature, do not allow publish
 	if(self->mMatureCombo->getCurrentIndex() == DECLINE_TO_STATE)
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		gViewerWindow->alertXml("SetClassifiedMature", &callbackConfirmMature, self);
 		return;
 	}
@@ -845,7 +839,7 @@ void LLPanelClassified::gotMature()
 }
 
 // static
-void LLPanelClassified::callbackGotPriceForListing(S32 option, LLString text, void* data)
+void LLPanelClassified::callbackGotPriceForListing(S32 option, std::string text, void* data)
 {
 	LLPanelClassified* self = (LLPanelClassified*)data;
 
@@ -855,8 +849,8 @@ void LLPanelClassified::callbackGotPriceForListing(S32 option, LLString text, vo
 	S32 price_for_listing = strtol(text.c_str(), NULL, 10);
 	if (price_for_listing < MINIMUM_PRICE_FOR_LISTING)
 	{
-		LLString::format_map_t args;
-		LLString price_text = llformat("%d", MINIMUM_PRICE_FOR_LISTING);
+		LLStringUtil::format_map_t args;
+		std::string price_text = llformat("%d", MINIMUM_PRICE_FOR_LISTING);
 		args["[MIN_PRICE]"] = price_text;
 			
 		gViewerWindow->alertXml("MinClassifiedPrice", args);
@@ -867,7 +861,7 @@ void LLPanelClassified::callbackGotPriceForListing(S32 option, LLString text, vo
 	// update send
 	self->mPriceForListing = price_for_listing;
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[AMOUNT]"] = llformat("%d", price_for_listing);
 	gViewerWindow->alertXml("PublishClassified", args, &callbackConfirmPublish, self);
 
@@ -907,7 +901,7 @@ void LLPanelClassified::confirmPublish(S32 option)
 	{
 		// TODO: enable this
 		//LLPanelDirClassifieds* panel = (LLPanelDirClassifieds*)getParent();
-		//panel->renameClassified(mClassifiedID, mNameEditor->getText().c_str());
+		//panel->renameClassified(mClassifiedID, mNameEditor->getText());
 	}
 	else
 	{
@@ -963,7 +957,7 @@ void LLPanelClassified::onClickProfile(void* data)
 void LLPanelClassified::onClickLandmark(void* data)
 {
     LLPanelClassified* self = (LLPanelClassified*)data;
-	create_landmark(self->mNameEditor->getText().c_str(), "", self->mPosGlobal);
+	create_landmark(self->mNameEditor->getText(), "", self->mPosGlobal);
 }
 */
 
@@ -975,7 +969,7 @@ void LLPanelClassified::onClickSet(void* data)
 	// Save location for later.
 	self->mPosGlobal = gAgent.getPositionGlobal();
 
-	LLString location_text;
+	std::string location_text;
 	location_text.assign("(will update after publish)");
 	location_text.append(", ");
 
@@ -1029,7 +1023,7 @@ void LLPanelClassified::focusReceived(LLFocusableElement* ctrl, void* data)
 }
 
 
-void LLPanelClassified::sendClassifiedClickMessage(const char* type)
+void LLPanelClassified::sendClassifiedClickMessage(const std::string& type)
 {
 	// You're allowed to click on your own ads to reassure yourself
 	// that the system is working.
@@ -1049,7 +1043,7 @@ void LLPanelClassified::sendClassifiedClickMessage(const char* type)
 ////////////////////////////////////////////////////////////////////////////////////////////
 
 LLFloaterPriceForListing::LLFloaterPriceForListing()
-:	LLFloater("PriceForListing"),
+:	LLFloater(std::string("PriceForListing")),
 	mCallback(NULL),
 	mUserData(NULL)
 { }
@@ -1065,7 +1059,7 @@ BOOL LLFloaterPriceForListing::postBuild()
 	if (edit)
 	{
 		edit->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32);
-		LLString min_price = llformat("%d", MINIMUM_PRICE_FOR_LISTING);
+		std::string min_price = llformat("%d", MINIMUM_PRICE_FOR_LISTING);
 		edit->setText(min_price);
 		edit->selectAll();
 		edit->setFocus(TRUE);
@@ -1080,7 +1074,7 @@ BOOL LLFloaterPriceForListing::postBuild()
 }
 
 //static
-void LLFloaterPriceForListing::show( void (*callback)(S32, LLString, void*), void* userdata)
+void LLFloaterPriceForListing::show( void (*callback)(S32, std::string, void*), void* userdata)
 {
 	LLFloaterPriceForListing *self = new LLFloaterPriceForListing();
 
@@ -1111,7 +1105,7 @@ void LLFloaterPriceForListing::buttonCore(S32 button, void* data)
 
 	if (self->mCallback)
 	{
-		LLString text = self->childGetText("price_edit");
+		std::string text = self->childGetText("price_edit");
 		self->mCallback(button, text, self->mUserData);
 		self->close();
 	}
diff --git a/linden/indra/newview/llpanelclassified.h b/linden/indra/newview/llpanelclassified.h
index e4c8f42..93bb726 100644
--- a/linden/indra/newview/llpanelclassified.h
+++ b/linden/indra/newview/llpanelclassified.h
@@ -103,11 +103,11 @@ public:
 	static void callbackConfirmMature(S32 option, void* data);
 	void confirmMature(S32 option);
 	void gotMature();
-	static void callbackGotPriceForListing(S32 option, LLString text, void* data);
+	static void callbackGotPriceForListing(S32 option, std::string text, void* data);
 	static void callbackConfirmPublish(S32 option, void* data);
 	void confirmPublish(S32 option);
 
-	void sendClassifiedClickMessage(const char* type);
+	void sendClassifiedClickMessage(const std::string& type);
 
 protected:
 	static void saveCallback(S32 option, void* data);
@@ -150,7 +150,7 @@ protected:
 	// yet for this classified?  That is, have they saved once?
 	BOOL mPaidFor;
 
-	LLString mSimName;
+	std::string mSimName;
 	LLVector3d mPosGlobal;
 
 	// Values the user may change
@@ -185,7 +185,7 @@ public:
 	virtual ~LLFloaterPriceForListing();
 	virtual BOOL postBuild();
 
-	static void show( void (*callback)(S32 option, LLString value, void* userdata), void* userdata );
+	static void show( void (*callback)(S32 option, std::string value, void* userdata), void* userdata );
 
 private:
 	static void onClickSetPrice(void*);
@@ -193,7 +193,7 @@ private:
 	static void buttonCore(S32 button, void* data);
 
 private:
-	void (*mCallback)(S32 option, LLString, void*);
+	void (*mCallback)(S32 option, std::string, void*);
 	void* mUserData;
 };
 
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index be4d9db..4d6508a 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -168,7 +168,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
 			PERM_NONE,
 			PERM_NONE,
 			PERM_MOVE | PERM_TRANSFER);
-		LLString desc;
+		std::string desc;
 		LLAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc);
 		LLPointer<LLViewerInventoryItem> new_item =
 			new LLViewerInventoryItem(
@@ -178,7 +178,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
 				LLUUID::null,
 				LLAssetType::AT_LSL_TEXT,
 				LLInventoryType::IT_LSL,
-				LLString("New Script"),
+				std::string("New Script"),
 				desc,
 				LLSaleInfo::DEFAULT,
 				LLViewerInventoryItem::II_FLAGS_NONE,
diff --git a/linden/indra/newview/llpaneldebug.cpp b/linden/indra/newview/llpaneldebug.cpp
index dce0235..9d3b865 100644
--- a/linden/indra/newview/llpaneldebug.cpp
+++ b/linden/indra/newview/llpaneldebug.cpp
@@ -94,50 +94,48 @@ LLPanelDebug::LLPanelDebug(const std::string& name, const LLRect& rect)
 
 	S32 cur_y = rect.getHeight() - TOP_PAD;
 
-	sliderctrl = new LLSliderCtrl(
-		"Drop Shadow Floater",
-		LLRect( LEFT, cur_y, RIGHT, cur_y - SLIDERCTRL_HEIGHT ),
-		"Drop Shadow Floater",
-		font,
-		LABEL_OFFSET,
-		RULER2 + SPINCTRL_DEFAULT_LABEL_WIDTH + SPINCTRL_BTN_WIDTH,
-		TRUE,
-		TRUE,
-		FALSE,
-		NULL, NULL,
-	    (F32)gSavedSettings.getS32("DropShadowFloater"), 
-		0.f, 10.f, 1.0f, 
-		"DropShadowFloater");
+	sliderctrl = new LLSliderCtrl(std::string("Drop Shadow Floater"),
+								  LLRect( LEFT, cur_y, RIGHT, cur_y - SLIDERCTRL_HEIGHT ),
+								  std::string("Drop Shadow Floater"),
+								  font,
+								  LABEL_OFFSET,
+								  RULER2 + SPINCTRL_DEFAULT_LABEL_WIDTH + SPINCTRL_BTN_WIDTH,
+								  TRUE,
+								  TRUE,
+								  FALSE,
+								  NULL, NULL,
+								  (F32)gSavedSettings.getS32("DropShadowFloater"), 
+								  0.f, 10.f, 1.0f, 
+								  std::string("DropShadowFloater"));
 	sliderctrl->setFollowsTop();
 	sliderctrl->setFollowsLeft();
 	addChild(sliderctrl);
 	cur_y -= VPAD + SLIDERCTRL_HEIGHT;
 
-	sliderctrl = new LLSliderCtrl(
-		"Drop Shadow Button",
-		LLRect( LEFT, cur_y, RIGHT, cur_y - SLIDERCTRL_HEIGHT ),
-		"Drop Shadow Button",
-		font,
-		LABEL_OFFSET,
-		RULER2 + SPINCTRL_DEFAULT_LABEL_WIDTH + SPINCTRL_BTN_WIDTH,
-		TRUE,
-		TRUE,
-		FALSE,
-		NULL, NULL,
-	    (F32)gSavedSettings.getS32("DropShadowButton"), 
-		0.f, 10.f, 1.0f, 
-		"DropShadowButton");
+	sliderctrl = new LLSliderCtrl(std::string("Drop Shadow Button"),
+								  LLRect( LEFT, cur_y, RIGHT, cur_y - SLIDERCTRL_HEIGHT ),
+								  std::string("Drop Shadow Button"),
+								  font,
+								  LABEL_OFFSET,
+								  RULER2 + SPINCTRL_DEFAULT_LABEL_WIDTH + SPINCTRL_BTN_WIDTH,
+								  TRUE,
+								  TRUE,
+								  FALSE,
+								  NULL, NULL,
+								  (F32)gSavedSettings.getS32("DropShadowButton"), 
+								  0.f, 10.f, 1.0f, 
+								  std::string("DropShadowButton"));
 	sliderctrl->setFollowsTop();
 	sliderctrl->setFollowsLeft();
 	addChild(sliderctrl);
 	cur_y -= VPAD + SLIDERCTRL_HEIGHT;
 
-	check = new LLCheckboxCtrl("left click",
-		LLRect(LEFT, cur_y, RIGHT, cur_y - 20),
-		"Left Click Shows Menu Unless Interactive",
-		font,
-		NULL, NULL,
-		gSavedSettings.getBOOL("LeftClickShowMenu"));
+	check = new LLCheckboxCtrl(std::string("left click"),
+							   LLRect(LEFT, cur_y, RIGHT, cur_y - 20),
+							   std::string("Left Click Shows Menu Unless Interactive"),
+							   font,
+							   NULL, NULL,
+							   gSavedSettings.getBOOL("LeftClickShowMenu"));
 	check->setFollows(FOLLOWS_LEFT|FOLLOWS_TOP);
 	addChild(check);
 	mLeftClickCheck = check;
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index 4d82023..b37d9fa 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -185,7 +185,7 @@ void LLPanelDirBrowser::updateResultCount()
 	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("results");
 
 	S32 result_count = list->getItemCount();
-	LLString result_text;
+	std::string result_text;
 
 	if (!mHaveSearchResults) result_count = 0;
 
@@ -207,7 +207,7 @@ void LLPanelDirBrowser::updateResultCount()
 		// add none found response
 		if (list->getItemCount() == 0)
 		{
-			list->addCommentText(getString("not_found_text"));
+			list->addCommentText(std::string("None found.")); // *TODO: Translate
 			list->operateOnAll(LLCtrlListInterface::OP_DESELECT);
 		}
 	}
@@ -324,7 +324,7 @@ void LLPanelDirBrowser::getSelectedInfo(LLUUID* id, S32 *type)
 
 	*id = id_sd.asUUID();
 
-	LLString id_str = id_sd.asString();
+	std::string id_str = id_sd.asString();
 	*type = mResultsContents[id_str]["type"];
 }
 
@@ -347,7 +347,7 @@ void LLPanelDirBrowser::onCommitList(LLUICtrl* ctrl, void* data)
 		return;
 	}
 
-	LLString id_str = self->childGetValue("results").asString();
+	std::string id_str = self->childGetValue("results").asString();
 	if (id_str.empty())
 	{
 		return;
@@ -361,7 +361,7 @@ void LLPanelDirBrowser::onCommitList(LLUICtrl* ctrl, void* data)
 		item_id = self->mResultsContents[id_str]["event_id"];
 	}
 
-	//LLString name = self->mResultsContents[id_str]["name"].asString();
+	//std::string name = self->mResultsContents[id_str]["name"].asString();
 	self->showDetailPanel(type, item_id);
 }
 
@@ -373,7 +373,7 @@ void LLPanelDirBrowser::showDetailPanel(S32 type, LLSD id)
 		if (mFloaterDirectory && mFloaterDirectory->mPanelAvatarp)
 		{
 			mFloaterDirectory->mPanelAvatarp->setVisible(TRUE);
-			mFloaterDirectory->mPanelAvatarp->setAvatarID(id.asUUID(), "", ONLINE_STATUS_NO);
+			mFloaterDirectory->mPanelAvatarp->setAvatarID(id.asUUID(), LLStringUtil::null, ONLINE_STATUS_NO);
 		}
 		break;
 	case EVENT_CODE:
@@ -445,8 +445,8 @@ void LLPanelDirBrowser::showEvent(const U32 event_id)
 void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
 {
 	LLUUID query_id;
-	char   first_name[DB_FIRST_NAME_BUF_SIZE];	/* Flawfinder: ignore */
-	char   last_name[DB_LAST_NAME_BUF_SIZE];	/* Flawfinder: ignore */
+	std::string   first_name;
+	std::string   last_name;
 	LLUUID agent_id;
 
 	msg->getUUIDFast(_PREHASH_QueryData,_PREHASH_QueryID, query_id);
@@ -477,12 +477,12 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
 
 	for (S32 i = 0; i < rows; i++)
 	{			
-		msg->getStringFast(_PREHASH_QueryReplies,_PREHASH_FirstName, DB_FIRST_NAME_BUF_SIZE, first_name, i);
-		msg->getStringFast(_PREHASH_QueryReplies,_PREHASH_LastName,	DB_LAST_NAME_BUF_SIZE, last_name, i);
+		msg->getStringFast(_PREHASH_QueryReplies,_PREHASH_FirstName, first_name, i);
+		msg->getStringFast(_PREHASH_QueryReplies,_PREHASH_LastName,	last_name, i);
 		msg->getUUIDFast(  _PREHASH_QueryReplies,_PREHASH_AgentID, agent_id, i);
 		// msg->getU8Fast(    _PREHASH_QueryReplies,_PREHASH_Online, online, i);
 		// unused
-		// msg->getStringFast(_PREHASH_QueryReplies,_PREHASH_Group, DB_GROUP_NAME_BUF_SIZE, group, i);
+		// msg->getStringFast(_PREHASH_QueryReplies,_PREHASH_Group, group, i);
 		// msg->getS32Fast(   _PREHASH_QueryReplies,_PREHASH_Reputation, reputation, i);
 
 		if (agent_id.isNull())
@@ -503,7 +503,7 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
 
 		content["type"] = AVATAR_CODE;
 
-		LLString fullname = LLString(first_name) + " " + LLString(last_name);
+		std::string fullname = first_name + " " + last_name;
 		row["columns"][1]["column"] = "name";
 		row["columns"][1]["value"] = fullname;
 		row["columns"][1]["font"] = "SANSSERIF";
@@ -528,7 +528,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
 	LLUUID	agent_id;
 	LLUUID	query_id;
 	LLUUID	parcel_id;
-	char	name[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string	name;
 	BOOL	is_for_sale;
 	BOOL	is_auction;
 	F32		dwell;
@@ -555,16 +555,15 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
 		self->mResultsContents = LLSD();
 	}
 
-	S32 i;
 	S32 count = msg->getNumberOfBlocks("QueryReplies");
 	self->mResultsReceived += count;
 
 	count = self->showNextButton(count);
 
-	for (i = 0; i < count ; i++)
+	for (S32 i = 0; i < count ; i++)
 	{
 		msg->getUUID("QueryReplies", "ParcelID", parcel_id, i);
-		msg->getString("QueryReplies", "Name", MAX_STRING, name, i);
+		msg->getString("QueryReplies", "Name", name, i);
 		msg->getBOOL("QueryReplies", "ForSale", is_for_sale, i);
 		msg->getBOOL("QueryReplies", "Auction", is_auction, i);
 		msg->getF32("QueryReplies", "Dwell", dwell, i);
@@ -577,12 +576,12 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
 		LLSD content;
 		S32 type;
 
-		LLSD row = self->createLandSale(parcel_id, is_auction, is_for_sale,  name, &type);
+		LLSD row = self->createLandSale(parcel_id, is_auction, is_for_sale, name, &type);
 
 		content["type"] = type;
 		content["name"] = name;
 
-		LLString buffer = llformat("%.0f", (F64)dwell);
+		std::string buffer = llformat("%.0f", (F64)dwell);
 		row["columns"][3]["column"] = "dwell";
 		row["columns"][3]["value"] = buffer;
 		row["columns"][3]["font"] = "SANSSERIFSMALL";
@@ -605,8 +604,8 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
 	LLUUID	agent_id;
 	LLUUID	query_id;
 	LLUUID	owner_id;
-	char	name[MAX_STRING];			/*Flawfinder: ignore*/
-	char	date[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string	name;
+	std::string	date;
 	BOOL	show_mature = gSavedSettings.getBOOL("ShowMatureEvents");
 
 	msg->getUUID("AgentData", "AgentID", agent_id);
@@ -642,9 +641,9 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
 		U32 event_flags;
 
 		msg->getUUID("QueryReplies", "OwnerID", owner_id, i);
-		msg->getString("QueryReplies", "Name", MAX_STRING, name, i);
+		msg->getString("QueryReplies", "Name", name, i);
 		msg->getU32("QueryReplies", "EventID", event_id, i);
-		msg->getString("QueryReplies", "Date", MAX_STRING, date, i);
+		msg->getString("QueryReplies", "Date", date, i);
 		msg->getU32("QueryReplies", "UnixTime", unix_time, i);
 		msg->getU32("QueryReplies", "EventFlags", event_flags, i);
 	
@@ -701,7 +700,7 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
 
 		list->addElement(row, ADD_SORTED);
 
-		LLString id_str = llformat("%u", event_id);
+		std::string id_str = llformat("%u", event_id);
 		self->mResultsContents[id_str] = content;
 	}
 
@@ -721,7 +720,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
 	
 	LLUUID	query_id;
 	LLUUID	group_id;
-	char	group_name[DB_GROUP_NAME_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string	group_name;
 	S32     members;
 	F32     search_order;
 
@@ -753,7 +752,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
 	for (i = 0; i < rows; i++)
 	{
 		msg->getUUIDFast(_PREHASH_QueryReplies, _PREHASH_GroupID,		group_id, i );
-		msg->getStringFast(_PREHASH_QueryReplies, _PREHASH_GroupName,	DB_GROUP_NAME_BUF_SIZE,		group_name,		i);
+		msg->getStringFast(_PREHASH_QueryReplies, _PREHASH_GroupName,	group_name,		i);
 		msg->getS32Fast(_PREHASH_QueryReplies, _PREHASH_Members,		members, i );
 		msg->getF32Fast(_PREHASH_QueryReplies, _PREHASH_SearchOrder,	search_order, i );
 		
@@ -839,12 +838,12 @@ void LLPanelDirBrowser::processDirClassifiedReply(LLMessageSystem* msg, void**)
 	for (i = 0; i < num_new_rows; i++)
 	{
 		LLUUID classified_id;
-		char name[DB_PARCEL_NAME_SIZE];		/*Flawfinder: ignore*/
+		std::string name;
 		U32 creation_date = 0;	// unix timestamp
 		U32 expiration_date = 0;	// future use
 		S32 price_for_listing = 0;
 		msg->getUUID("QueryReplies", "ClassifiedID", classified_id, i);
-		msg->getString("QueryReplies", "Name", DB_PARCEL_NAME_SIZE, name, i);
+		msg->getString("QueryReplies", "Name", name, i);
 		msg->getU32("QueryReplies","CreationDate",creation_date,i);
 		msg->getU32("QueryReplies","ExpirationDate",expiration_date,i);
 		msg->getS32("QueryReplies","PriceForListing",price_for_listing,i);
@@ -872,7 +871,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
 	LLUUID	agent_id;
 	LLUUID	query_id;
 	LLUUID	parcel_id;
-	char	name[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string	name;
 	BOOL	auction;
 	BOOL	for_sale;
 	S32		sale_price;
@@ -917,7 +916,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
 	for (i = 0; i < count; i++)
 	{
 		msg->getUUID(	"QueryReplies", "ParcelID", parcel_id, i);
-		msg->getString(	"QueryReplies", "Name", MAX_STRING, name, i);
+		msg->getString(	"QueryReplies", "Name", name, i);
 		msg->getBOOL(	"QueryReplies", "Auction", auction, i);
 		msg->getBOOL(	"QueryReplies", "ForSale", for_sale, i);
 		msg->getS32(	"QueryReplies", "SalePrice", sale_price, i);
@@ -937,7 +936,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
 		content["type"] = type;
 		content["name"] = name;
 
-		LLString buffer = "Auction";
+		std::string buffer = "Auction";
 		if (!auction)
 		{
 			buffer = llformat("%d", sale_price);
@@ -987,7 +986,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
 	count = self->showNextButton(non_auction_count);
 
 	// Empty string will sort by current sort options.
-	list->sortByColumn("",FALSE);
+	list->sortByColumn(LLStringUtil::null,FALSE);
 	self->updateResultCount();
 
 	// Poke the result received timer
@@ -995,9 +994,9 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
 	self->mDidAutoSelect = FALSE;
 }
 
-void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& pick_id, const char* name, const U32 creation_date, const S32 price_for_listing)
+void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& pick_id, const std::string& name, const U32 creation_date, const S32 price_for_listing)
 {
-	LLString type = llformat("%d", CLASSIFIED_CODE);
+	std::string type = llformat("%d", CLASSIFIED_CODE);
 
 	LLSD row;
 	row["id"] = pick_id;
@@ -1017,7 +1016,7 @@ void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& p
 	list->addElement(row);
 }
 
-LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale,  const LLString& name, S32 *type)
+LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale,  const std::string& name, S32 *type)
 {
 	LLSD row;
 	row["id"] = parcel_id;
@@ -1074,7 +1073,7 @@ void LLPanelDirBrowser::newClassified()
 		LLUUID classified_id = mFloaterDirectory->mPanelClassifiedp->getClassifiedID();
 
 		// Put it in the list on the left
-		addClassified(list, classified_id, mFloaterDirectory->mPanelClassifiedp->getClassifiedName().c_str(),0,0);
+		addClassified(list, classified_id, mFloaterDirectory->mPanelClassifiedp->getClassifiedName(),0,0);
 
 		// Select it.
 		list->setCurrentByID(classified_id);
@@ -1096,7 +1095,7 @@ void LLPanelDirBrowser::setupNewSearch()
 
 	// ready the list for results
 	list->operateOnAll(LLCtrlListInterface::OP_DELETE);
-	list->addCommentText(getString("searching_text"));
+	list->addCommentText(std::string("Searching...")); // *TODO: Translate
 	childDisable("results");
 
 	mResultsReceived = 0;
@@ -1127,7 +1126,7 @@ void LLPanelDirBrowser::onClickSearchCore(void* userdata)
 void LLPanelDirBrowser::sendDirFindQuery(
 	LLMessageSystem* msg,
 	const LLUUID& query_id,
-	const LLString& text,
+	const std::string& text,
 	U32 flags,
 	S32 query_start)
 {
@@ -1144,15 +1143,6 @@ void LLPanelDirBrowser::sendDirFindQuery(
 }
 
 
-void LLPanelDirBrowser::addHelpText(const char* text)
-{
-	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("results");
-
-	list->addCommentText(text);
-	childDisable("results");
-}
-
-
 void LLPanelDirBrowser::onKeystrokeName(LLLineEditor* line, void* data)
 {
 	LLPanelDirBrowser *self = (LLPanelDirBrowser*)data;
diff --git a/linden/indra/newview/llpaneldirbrowser.h b/linden/indra/newview/llpaneldirbrowser.h
index 46d1369..aa7b0f5 100644
--- a/linden/indra/newview/llpaneldirbrowser.h
+++ b/linden/indra/newview/llpaneldirbrowser.h
@@ -94,13 +94,10 @@ public:
 	static void sendDirFindQuery(
 		LLMessageSystem* msg,
 		const LLUUID& query_id,
-		const LLString& text,
+		const std::string& text,
 		U32 flags,
 		S32 query_start);
 
-	// Put an item in the first line of the results list.
-	void addHelpText(const char* text);
-
 	void newClassified();
 
 	void showEvent(const U32 event_id);
@@ -123,8 +120,8 @@ public:
 protected:
 	void updateResultCount();
 
-	void addClassified(LLCtrlListInterface *list, const LLUUID& classified_id, const char* name, const U32 creation_date, const S32 price_for_listing);
-	LLSD createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale, const LLString& name, S32 *type);
+	void addClassified(LLCtrlListInterface *list, const LLUUID& classified_id, const std::string& name, const U32 creation_date, const S32 price_for_listing);
+	LLSD createLandSale(const LLUUID& parcel_id, BOOL is_auction, BOOL is_for_sale, const std::string& name, S32 *type);
 
 	static void onKeystrokeName(LLLineEditor* line, void* data);
 
@@ -136,7 +133,7 @@ protected:
 protected:
 	LLUUID			mSearchID;		// Unique ID for a pending search
 	LLUUID			mWantSelectID;	// scroll item to select on arrival
-	LLString        mCurrentSortColumn;
+	std::string     mCurrentSortColumn;
 	BOOL            mCurrentSortAscending;
 	// Some searches return a max of 100 items per page, so we can
 	// start the search from the 100th item rather than the 0th, etc.
diff --git a/linden/indra/newview/llpaneldirclassified.cpp b/linden/indra/newview/llpaneldirclassified.cpp
index 7edf78d..1114707 100644
--- a/linden/indra/newview/llpaneldirclassified.cpp
+++ b/linden/indra/newview/llpaneldirclassified.cpp
@@ -69,7 +69,7 @@
 // Constants
 //-----------------------------------------------------------------------------
 
-LLPanelDirClassified::LLPanelDirClassified(const char* name, LLFloaterDirectory* floater)
+LLPanelDirClassified::LLPanelDirClassified(const std::string& name, LLFloaterDirectory* floater)
 :	LLPanelDirBrowser(name, floater)
 {
 }
diff --git a/linden/indra/newview/llpaneldirclassified.h b/linden/indra/newview/llpaneldirclassified.h
index c809dbc..58bcb9c 100644
--- a/linden/indra/newview/llpaneldirclassified.h
+++ b/linden/indra/newview/llpaneldirclassified.h
@@ -44,7 +44,7 @@ class LLScrollListCtrl;
 class LLPanelDirClassified : public LLPanelDirBrowser
 {
 public:
-	LLPanelDirClassified(const char* name, LLFloaterDirectory* floater);
+	LLPanelDirClassified(const std::string& name, LLFloaterDirectory* floater);
 	/*virtual*/ ~LLPanelDirClassified();
 
 	/*virtual*/ void draw();
diff --git a/linden/indra/newview/llpaneldirevents.cpp b/linden/indra/newview/llpaneldirevents.cpp
index 0d1e0e3..81e5a38 100644
--- a/linden/indra/newview/llpaneldirevents.cpp
+++ b/linden/indra/newview/llpaneldirevents.cpp
@@ -136,7 +136,7 @@ void LLPanelDirEvents::setDay(S32 day)
 	// it's daylight savings time there.
 	internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
 
-	LLString buffer = llformat("%d/%d",
+	std::string buffer = llformat("%d/%d",
 			1 + internal_time->tm_mon,		// Jan = 0
 			internal_time->tm_mday);	// 2001 = 101
 	childSetValue("date_text", buffer);
@@ -168,7 +168,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
 	// it's daylight savings time there.
 	internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
 
-	LLString buffer = llformat("%d/%d",
+	std::string buffer = llformat("%d/%d",
 			1 + internal_time->tm_mon,		// Jan = 0
 			internal_time->tm_mday);	// 2001 = 101
 	childSetValue("date_text", buffer);
@@ -207,7 +207,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
 	// send the message
 	if (0 == event_id)
 	{
-		sendDirFindQuery(gMessageSystem, mSearchID, params.str().c_str(), scope, mSearchStart);
+		sendDirFindQuery(gMessageSystem, mSearchID, params.str(), scope, mSearchStart);
 	}
 	else
 	{
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 92964ba..cc0a700 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -73,7 +73,8 @@ class LLPanelDirFindAll
 public:
 	LLPanelDirFindAll(const std::string& name, LLFloaterDirectory* floater);
 
-	/*Virtual*/ void search(const std::string& search_text);
+	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
+	/*virtual*/ void search(const std::string& search_text);
 };
 
 LLPanelDirFindAll::LLPanelDirFindAll(const std::string& name, LLFloaterDirectory* floater)
@@ -168,6 +169,15 @@ void LLPanelDirFind::onVisibilityChange(BOOL new_visibility)
 	LLPanel::onVisibilityChange(new_visibility);
 }
 
+// virtual
+void LLPanelDirFindAll::reshape(S32 width, S32 height, BOOL called_from_parent = TRUE)
+{
+	if ( mWebBrowser )
+		mWebBrowser->navigateTo( mWebBrowser->getCurrentNavUrl() );
+
+	LLUICtrl::reshape( width, height, called_from_parent );
+}
+
 void LLPanelDirFindAll::search(const std::string& search_text)
 {
 	if (!search_text.empty())
@@ -367,7 +377,7 @@ void LLPanelDirFind::onCommitSearch(LLUICtrl*, void* data)
 void LLPanelDirFind::onClickSearch(void* data)
 {
 	LLPanelDirFind* self = ( LLPanelDirFind* )data;
-	LLString search_text = self->childGetText("search_editor");
+	std::string search_text = self->childGetText("search_editor");
 	self->search(search_text);
 
 	LLFloaterDirectory::sNewSearchCount++;
diff --git a/linden/indra/newview/llpaneldirpeople.cpp b/linden/indra/newview/llpaneldirpeople.cpp
index cae2bef..4ecf3da 100644
--- a/linden/indra/newview/llpaneldirpeople.cpp
+++ b/linden/indra/newview/llpaneldirpeople.cpp
@@ -93,7 +93,7 @@ void LLPanelDirPeople::performQuery()
 	// if we filtered something out, display a popup
 	if ( query_was_filtered )
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[FINALQUERY]"] = query_string;
 		gViewerWindow->alertXml("SeachFilteredOnShortWords", args);
 	};
diff --git a/linden/indra/newview/llpaneldirplaces.cpp b/linden/indra/newview/llpaneldirplaces.cpp
index 5b63e23..a795845 100644
--- a/linden/indra/newview/llpaneldirplaces.cpp
+++ b/linden/indra/newview/llpaneldirplaces.cpp
@@ -111,7 +111,7 @@ void LLPanelDirPlaces::draw()
 // virtual
 void LLPanelDirPlaces::performQuery()
 {
-	LLString place_name = childGetValue("name").asString();
+	std::string place_name = childGetValue("name").asString();
 	if (place_name.length() < mMinSearchChars)
 	{
 		return;
@@ -119,7 +119,7 @@ void LLPanelDirPlaces::performQuery()
 
     // "hi " is three chars but not a long-enough search
 	std::string query_string = place_name;
-	LLString::trim( query_string );
+	LLStringUtil::trim( query_string );
 	bool query_was_filtered = (query_string != place_name);
 
 	// possible we threw away all the short words in the query so check length
@@ -132,12 +132,12 @@ void LLPanelDirPlaces::performQuery()
 	// if we filtered something out, display a popup
 	if ( query_was_filtered )
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[FINALQUERY]"] = query_string;
 		gViewerWindow->alertXml("SeachFilteredOnShortWords", args);
 	};
 
-	LLString catstring = childGetValue("Category").asString();
+	std::string catstring = childGetValue("Category").asString();
 	
 	// Because LLParcel::C_ANY is -1, must do special check
 	S32 category = 0;
@@ -147,7 +147,7 @@ void LLPanelDirPlaces::performQuery()
 	}
 	else
 	{
-		category = LLParcel::getCategoryFromString(catstring.c_str());
+		category = LLParcel::getCategoryFromString(catstring);
 	}
 
 	BOOL pg_only = !gSavedSettings.getBOOL("ShowMatureSims") 
@@ -160,10 +160,10 @@ void LLPanelDirPlaces::initialQuery()
 {
 	// All Linden locations in PG/Mature sims, any name.
 	const BOOL pg_only = FALSE;
-	queryCore("", LLParcel::C_LINDEN, pg_only);
+	queryCore(LLStringUtil::null, LLParcel::C_LINDEN, pg_only);
 }
 
-void LLPanelDirPlaces::queryCore(const LLString& name, 
+void LLPanelDirPlaces::queryCore(const std::string& name, 
 								 S32 category, 
 								 BOOL pg_only)
 {
diff --git a/linden/indra/newview/llpaneldirplaces.h b/linden/indra/newview/llpaneldirplaces.h
index 7bc2b08..bd86235 100644
--- a/linden/indra/newview/llpaneldirplaces.h
+++ b/linden/indra/newview/llpaneldirplaces.h
@@ -56,7 +56,7 @@ public:
 	void initialQuery();
 
 private:
-	void queryCore(const LLString& name, S32 category, BOOL pg_only);
+	void queryCore(const std::string& name, S32 category, BOOL pg_only);
 };
 
 #endif
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index cc70f79..23379cf 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -70,7 +70,7 @@
 #include "pipeline.h"
 #include "lluictrlfactory.h"
 #include "llfeaturemanager.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llfloaterhardwaresettings.h"
 #include "llboost.h"
 
@@ -338,7 +338,7 @@ void LLPanelDisplay::initWindowSizeControls()
 		U32 height_test = 0;
 		U32 width_test = 0;
 		mCtrlWindowSize->setCurrentByIndex(i);
-		if (extractWindowSizeFromString(mCtrlWindowSize->getValue().asString().c_str(), width_test, height_test))
+		if (extractWindowSizeFromString(mCtrlWindowSize->getValue().asString(), width_test, height_test))
 		{
 			if ((height_test == height) && (width_test == width))
 			{
@@ -448,11 +448,11 @@ void LLPanelDisplay::refreshEnabledState()
 	// Reflections
 	BOOL reflections = gSavedSettings.getBOOL("VertexShaderEnable") 
 		&& gGLManager.mHasCubeMap 
-		&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
+		&& LLCubeMap::sUseCubeMaps;
 	mCtrlReflections->setEnabled(reflections);
 	
 	// Bump & Shiny
-	bool bumpshiny = gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap") && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
+	bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
 	mCtrlBumpShiny->setEnabled(bumpshiny ? TRUE : FALSE);
 	
 	for (S32 i = 0; i < mRadioReflectionDetail->getItemCount(); ++i)
@@ -461,7 +461,7 @@ void LLPanelDisplay::refreshEnabledState()
 	}
 
 	// Avatar Mode
-	S32 max_avatar_shader = LLShaderMgr::sMaxAvatarShaderLevel;
+	S32 max_avatar_shader = LLViewerShaderMgr::instance()->mMaxAvatarShaderLevel;
 	mCtrlAvatarVP->setEnabled((max_avatar_shader > 0) ? TRUE : FALSE);
 	
 	if (gSavedSettings.getBOOL("VertexShaderEnable") == FALSE || 
@@ -756,6 +756,7 @@ void LLPanelDisplay::applyResolution()
 	char aspect_ratio_text[ASPECT_RATIO_STR_LEN];		/*Flawfinder: ignore*/
 	if (mCtrlAspectRatio->getCurrentIndex() == -1)
 	{
+		// *Can't pass const char* from c_str() into strtok
 		strncpy(aspect_ratio_text, mCtrlAspectRatio->getSimple().c_str(), sizeof(aspect_ratio_text) -1);	/*Flawfinder: ignore*/
 		aspect_ratio_text[sizeof(aspect_ratio_text) -1] = '\0';
 		char *element = strtok(aspect_ratio_text, ":/\\");
@@ -863,12 +864,12 @@ void LLPanelDisplay::applyResolution()
 }
 
 // Extract from strings of the form "<width> x <height>", e.g. "640 x 480".
-bool LLPanelDisplay::extractWindowSizeFromString(const char *sInput, U32 &width, U32 &height)
+bool LLPanelDisplay::extractWindowSizeFromString(const std::string& instr, U32 &width, U32 &height)
 {
 	using namespace boost;
 	cmatch what;
 	const regex expression("([0-9]+) x ([0-9]+)");
-	if (regex_match(sInput, what, expression))
+	if (regex_match(instr.c_str(), what, expression))
 	{
 		width = atoi(what[1].first);
 		height = atoi(what[2].first);
@@ -917,7 +918,7 @@ void LLPanelDisplay::onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data)
 		gViewerWindow->mWindow->setNativeAspectRatio(0.f);
 		fractionFromDecimal(gViewerWindow->mWindow->getNativeAspectRatio(), numerator, denominator);
 
-		LLString aspect;
+		std::string aspect;
 		if (numerator != 0)
 		{
 			aspect = llformat("%d:%d", numerator, denominator);
@@ -997,15 +998,15 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
 	// choose the right text
 	if(slider->getValueF32() < midPoint)
 	{
-		text_box->setText(LLString("Low"));
+		text_box->setText(std::string("Low"));
 	} 
 	else if (slider->getValueF32() < highPoint)
 	{
-		text_box->setText(LLString("Mid"));
+		text_box->setText(std::string("Mid"));
 	}
 	else
 	{
-		text_box->setText(LLString("High"));
+		text_box->setText(std::string("High"));
 	}
 }
 
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index e100a18..4b0d9d7 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -77,7 +77,7 @@ public:
 	
 protected:
 	void initWindowSizeControls();
-	bool extractWindowSizeFromString(const char *sInput, U32 &width, U32 &height);
+	bool extractWindowSizeFromString(const std::string& instr, U32 &width, U32 &height);
 	
 	// aspect ratio sliders and boxes
 	LLComboBox		*mCtrlFullScreen;               // Fullscreen resolution
diff --git a/linden/indra/newview/llpanelevent.cpp b/linden/indra/newview/llpanelevent.cpp
index abfbe79..f205e94 100644
--- a/linden/indra/newview/llpanelevent.cpp
+++ b/linden/indra/newview/llpanelevent.cpp
@@ -56,7 +56,7 @@
 //static
 std::list<LLPanelEvent*> LLPanelEvent::sAllPanels;
 
-LLPanelEvent::LLPanelEvent() : LLPanel("Event Panel")
+LLPanelEvent::LLPanelEvent() : LLPanel(std::string("Event Panel"))
 {
 	sAllPanels.push_back(this);
 }
@@ -175,7 +175,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
 		S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
 		S32 region_z = llround((F32)self->mEventInfo.mPosGlobal.mdV[VZ]);
 		
-		LLString desc = self->mEventInfo.mSimName + llformat(" (%d, %d, %d)", region_x, region_y, region_z);
+		std::string desc = self->mEventInfo.mSimName + llformat(" (%d, %d, %d)", region_x, region_y, region_z);
 		self->mTBLocation->setText(desc);
 
 		if (self->mEventInfo.mEventFlags & EVENT_FLAG_MATURE)
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index ee676b0..256f02a 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -110,7 +110,7 @@ BOOL LLPanelGeneral::postBuild()
 {
 	childSetCommitCallback("fade_out_combobox", set_render_name_fade_out);
 
-	LLString region_name_prompt = getString("region_name_prompt");
+	std::string region_name_prompt = getString("region_name_prompt");
 
 
 	// location combobox
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index df9e10e..a7b526d 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -72,8 +72,8 @@ protected:
 	BOOL mUIAutoScale;
 	BOOL mMiniMapRotate;
 	S32 mOldCrashBehavior;
-	LLString mLoginLocation;
-	LLString mLanguage;
+	std::string mLoginLocation;
+	std::string mLanguage;
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelgroup.cpp b/linden/indra/newview/llpanelgroup.cpp
index 84f6594..9ced1bb 100644
--- a/linden/indra/newview/llpanelgroup.cpp
+++ b/linden/indra/newview/llpanelgroup.cpp
@@ -112,10 +112,10 @@ void LLPanelGroupTab::onClickHelp(void* user_data)
 void LLPanelGroupTab::handleClickHelp()
 {
 	// Display the help text.
-	LLString help_text( getHelpText() );
+	std::string help_text( getHelpText() );
 	if ( !help_text.empty() )
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MESSAGE]"] = help_text;
 		LLAlertDialog* dialogp = gViewerWindow->alertXml("GenericAlert", args);
 		if (dialogp)
@@ -193,7 +193,7 @@ void LLPanelGroup::updateTabVisibility()
 		LLPanelGroupTab* panelp =
 			(LLPanelGroupTab*) mTabContainer->getPanelByIndex(i);
 
-		BOOL visible = panelp->isVisibleByAgent(&gAgent);
+		BOOL visible = panelp->isVisibleByAgent(&gAgent) || gAgent.isGodlike();
 		mTabContainer->enableTabButton(i, visible);
 
 		if ( !visible && mCurrentTab == panelp )
@@ -323,7 +323,7 @@ void LLPanelGroup::tabChanged()
 	//based on if they need an apply
 	if ( mApplyBtn )
 	{
-		LLString mesg;
+		std::string mesg;
 		mApplyBtn->setEnabled(mCurrentTab->needsApply(mesg));
 	}
 }
@@ -402,7 +402,7 @@ BOOL LLPanelGroup::canClose()
 BOOL LLPanelGroup::attemptTransition()
 {
 	// Check if the current tab needs to be applied.
-	LLString mesg;
+	std::string mesg;
 	if (mCurrentTab && mCurrentTab->needsApply(mesg))
 	{
 		// If no message was provided, give a generic one.
@@ -411,7 +411,7 @@ BOOL LLPanelGroup::attemptTransition()
 			mesg = mDefaultNeedsApplyMesg;
 		}
 		// Create a notify box, telling the user about the unapplied tab.
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[NEEDS_APPLY_MESSAGE]"] = mesg;
 		args["[WANT_APPLY_MESSAGE]"] = mWantApplyMesg;
 		gViewerWindow->alertXml("PanelGroupApply", args,
@@ -547,7 +547,7 @@ bool LLPanelGroup::apply()
 	LLPanelGroupTab* panelp = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
 	if (!panelp) return false;
 	
-	LLString mesg;
+	std::string mesg;
 	if ( !panelp->needsApply(mesg) )
 	{
 		// We don't need to apply anything.
@@ -557,7 +557,7 @@ bool LLPanelGroup::apply()
 
 	// Ignore the needs apply message.
 	// Try to do the actual apply.
-	LLString apply_mesg;
+	std::string apply_mesg;
 	if ( panelp->apply( apply_mesg ) )
 	{
 		// Everything worked.  We're done.
@@ -568,7 +568,7 @@ bool LLPanelGroup::apply()
 	// Inform the user.
 	if ( !apply_mesg.empty() )
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MESSAGE]"] = apply_mesg;
 		gViewerWindow->alertXml("GenericAlert", args);
 	}
@@ -595,7 +595,7 @@ void LLPanelGroup::draw()
 	}
 	if (mCurrentTab)
 	{
-		LLString mesg;
+		std::string mesg;
 		childSetEnabled("btn_apply", mCurrentTab->needsApply(mesg));
 	}
 
@@ -627,11 +627,11 @@ void LLPanelGroup::close()
 	}
 }
 
-void LLPanelGroup::showNotice(const char* subject,
-							const char* message,
-							const bool& has_inventory,
-							const char* inventory_name,
-							LLOfferInfo* inventory_offer)
+void LLPanelGroup::showNotice(const std::string& subject,
+							  const std::string& message,
+							  const bool& has_inventory,
+							  const std::string& inventory_name,
+							  LLOfferInfo* inventory_offer)
 {
 	if (mCurrentTab->getName() != "notices_tab")
 	{
diff --git a/linden/indra/newview/llpanelgroup.h b/linden/indra/newview/llpanelgroup.h
index 2157b34..90ce8fc 100644
--- a/linden/indra/newview/llpanelgroup.h
+++ b/linden/indra/newview/llpanelgroup.h
@@ -103,11 +103,11 @@ public:
 
 	void setAllowEdit(BOOL v) { mAllowEdit = v; }
 
-	void showNotice(const char* subject,
-							const char* message,
-							const bool& has_inventory,
-							const char* inventory_name,
-							LLOfferInfo* inventory_offer);
+	void showNotice(const std::string& subject,
+					const std::string& message,
+					const bool& has_inventory,
+					const std::string& inventory_name,
+					LLOfferInfo* inventory_offer);
 protected:
 	LLPanelGroupTab*		mCurrentTab;
 	LLPanelGroupTab*		mRequestedTab;
@@ -123,8 +123,8 @@ protected:
 	std::string mInitialTab;
 	std::string mFilename;
 
-	LLString mDefaultNeedsApplyMesg;
-	LLString mWantApplyMesg;
+	std::string mDefaultNeedsApplyMesg;
+	std::string mWantApplyMesg;
 
 	BOOL mAllowEdit;
 	BOOL mShowingNotifyDialog;
@@ -148,14 +148,14 @@ public:
 
 	// Asks if something needs to be applied.
 	// If returning true, this function should modify the message to the user.
-	virtual bool needsApply(LLString& mesg) { return false; }
+	virtual bool needsApply(std::string& mesg) { return false; }
 
 	// Asks if there is currently a modal dialog being shown.
 	virtual BOOL hasModal() { return mHasModal; }
 
 	// Request to apply current data.
 	// If returning fail, this function should modify the message to the user.
-	virtual bool apply(LLString& mesg) { return true; }
+	virtual bool apply(std::string& mesg) { return true; }
 
 	// Request a cancel of changes
 	virtual void cancel() { }
@@ -164,7 +164,7 @@ public:
 	virtual void update(LLGroupChange gc) { }
 
 	// This is the text to be displayed when a help button is pressed.
-	virtual LLString getHelpText() const { return mHelpText; }
+	virtual std::string getHelpText() const { return mHelpText; }
 
 	// Display anything returned by getHelpText
 	static void onClickHelp(void* data);
@@ -184,7 +184,7 @@ public:
 protected:
 	LLUUID	mGroupID;
 	LLTabContainer*	mTabContainer;
-	LLString	mHelpText;
+	std::string	mHelpText;
 
 	BOOL mAllowEdit;
 	BOOL mHasModal;
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index a7eac37..bb2c096 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -344,7 +344,7 @@ void LLPanelGroupGeneral::onClickJoin(void *userdata)
 	if (gdatap)
 	{
 		S32 cost = gdatap->mMembershipFee;
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[COST]"] = llformat("%d", cost);
 		
 		if (can_afford_transaction(cost))
@@ -394,7 +394,7 @@ void LLPanelGroupGeneral::openProfile(void* data)
 	}
 }
 
-bool LLPanelGroupGeneral::needsApply(LLString& mesg)
+bool LLPanelGroupGeneral::needsApply(std::string& mesg)
 { 
 	mesg = getUIString("group_info_unchanged");
 	return mChanged || mGroupID.isNull();
@@ -432,7 +432,7 @@ void LLPanelGroupGeneral::draw()
 	}
 }
 
-bool LLPanelGroupGeneral::apply(LLString& mesg)
+bool LLPanelGroupGeneral::apply(std::string& mesg)
 {
 	BOOL has_power_in_group = gAgent.hasPowerInGroup(mGroupID,GP_GROUP_CHANGE_IDENTITY);
 
@@ -441,9 +441,10 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
 		llinfos << "LLPanelGroupGeneral::apply" << llendl;
 
 		// Check to make sure mature has been set
-		if(mComboMature->getCurrentIndex() == DECLINE_TO_STATE)
+		if(mComboMature &&
+		   mComboMature->getCurrentIndex() == DECLINE_TO_STATE)
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			gViewerWindow->alertXml("SetGroupMature", &callbackConfirmMatureApply,
 				new LLHandle<LLPanel>(getHandle()));
 			return false;
@@ -463,7 +464,7 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
 				return false;
 			}
 
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[MESSAGE]"] = mConfirmGroupCreateStr;
 			gViewerWindow->alertXml("GenericAlertYesCancel", args,
 				createGroupCallback, new LLHandle<LLPanel>(getHandle()) );
@@ -474,7 +475,8 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
 		LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
 		if (!gdatap)
 		{
-			mesg = "No group data found for group ";
+			// *TODO: Translate
+			mesg = std::string("No group data found for group ");
 			mesg.append(mGroupID.asString());
 			return false;
 		}
@@ -575,7 +577,7 @@ void LLPanelGroupGeneral::confirmMatureApply(S32 option)
 	}
 
 	// If we got here it means they set a valid value
-	LLString mesg = "";
+	std::string mesg = "";
 	apply(mesg);
 }
 
@@ -721,7 +723,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 	}
 	if ( mBtnJoinGroup )
 	{
-		char fee_buff[20];		/*Flawfinder: ignore*/
+		std::string fee_buff;
 		bool visible;
 
 		visible = !is_member && gdatap->mOpenEnrollment;
@@ -729,9 +731,9 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
 		if ( visible )
 		{
-			snprintf(fee_buff, sizeof(fee_buff), "Join (L$%d)", gdatap->mMembershipFee);			/* Flawfinder: ignore */
-			mBtnJoinGroup->setLabelSelected(std::string(fee_buff));
-			mBtnJoinGroup->setLabelUnselected(std::string(fee_buff));
+			fee_buff = llformat( "Join (L$%d)", gdatap->mMembershipFee);
+			mBtnJoinGroup->setLabelSelected(fee_buff);
+			mBtnJoinGroup->setLabelUnselected(fee_buff);
 		}
 	}
 	if ( mBtnInfo )
@@ -825,7 +827,7 @@ void LLPanelGroupGeneral::updateMembers()
 			continue;
 		}
 		// Owners show up in bold.
-		LLString style = "NORMAL";
+		std::string style = "NORMAL";
 		if ( member->isOwner() )
 		{
 			style = "BOLD";
diff --git a/linden/indra/newview/llpanelgroupgeneral.h b/linden/indra/newview/llpanelgroupgeneral.h
index 169fcff..407057c 100644
--- a/linden/indra/newview/llpanelgroupgeneral.h
+++ b/linden/indra/newview/llpanelgroupgeneral.h
@@ -54,8 +54,8 @@ public:
 	// LLPanelGroupTab
 	static void* createTab(void* data);
 	virtual void activate();
-	virtual bool needsApply(LLString& mesg);
-	virtual bool apply(LLString& mesg);
+	virtual bool needsApply(std::string& mesg);
+	virtual bool apply(std::string& mesg);
 	virtual void cancel();
 	static void createGroupCallback(S32 option, void* user_data);
 	static void callbackConfirmMatureApply(S32 option, void* data);
diff --git a/linden/indra/newview/llpanelgroupinvite.cpp b/linden/indra/newview/llpanelgroupinvite.cpp
index e051bb6..17312ef 100644
--- a/linden/indra/newview/llpanelgroupinvite.cpp
+++ b/linden/indra/newview/llpanelgroupinvite.cpp
@@ -71,13 +71,13 @@ public:
 public:
 	LLUUID mGroupID;
 
-	LLString		mLoadingText;
+	std::string		mLoadingText;
 	LLNameListCtrl	*mInvitees;
 	LLComboBox      *mRoleNames;
 	LLButton		*mOKButton;
  	LLButton		*mRemoveButton;
 	LLTextBox		*mGroupName;
-	LLString		mOwnerWarning;
+	std::string		mOwnerWarning;
 	bool		mConfirmedOwnerInvite;
 
 	void (*mCloseCallback)(void* data);
@@ -158,7 +158,7 @@ void LLPanelGroupInvite::impl::submitInvitations()
 		// owner role: display confirmation and wait for callback
 		if ((role_id == gdatap->mOwnerRole) && (!mConfirmedOwnerInvite))
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[MESSAGE]"] = mOwnerWarning;
 			gViewerWindow->alertXml("GenericAlertYesCancel", args, inviteOwnerCallback, this);
 			return; // we'll be called again if user confirms
@@ -395,8 +395,8 @@ void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids)
 		LLViewerObject* dest = gObjectList.findObject(agent_id);
 		if(dest && dest->isAvatar())
 		{
-			LLString fullname;
-			LLString::format_map_t args;
+			std::string fullname;
+			LLStringUtil::format_map_t args;
 			LLNameValue* nvfirst = dest->getNVPair("FirstName");
 			LLNameValue* nvlast = dest->getNVPair("LastName");
 			if(nvfirst && nvlast)
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index 419d6d2..1914901 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -62,7 +62,7 @@ public:
 								LLTextEditor* text_editor,
 								LLTabContainer* tab_containerp,
 								LLPanel* panelp,
-								const LLString& loading_text,
+								const std::string& loading_text,
 								const LLUUID& group_id,
 								S32 interval_length_days,
 								S32 max_interval_days);
@@ -94,7 +94,7 @@ public:
 									   LLTextEditor* text_editorp,
 									   LLTabContainer* tab_containerp,
 									   LLPanel* panelp,
-									   const LLString& loading_text,
+									   const std::string& loading_text,
 									   const LLUUID& group_id);
 	virtual ~LLGroupMoneyDetailsTabEventHandler();
 
@@ -111,7 +111,7 @@ public:
 									 LLTextEditor* text_editorp,
 									 LLTabContainer* tab_containerp,
 									 LLPanel* panelp,
-									 const LLString& loading_text,
+									 const std::string& loading_text,
 									 const LLUUID& group_id);
 	virtual ~LLGroupMoneySalesTabEventHandler();
 
@@ -125,7 +125,7 @@ public:
 	LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editor,
 										LLTabContainer* tab_containerp,
 										LLPanel* panelp,
-										const LLString& loading_text,
+										const std::string& loading_text,
 										const LLUUID& group_id);
 	virtual ~LLGroupMoneyPlanningTabEventHandler();
 
@@ -306,7 +306,7 @@ int LLPanelGroupLandMoney::impl::getStoredContribution()
 // Fills in the text field with the contribution, contrib
 void LLPanelGroupLandMoney::impl::setYourContributionTextField(int contrib)
 {
-	LLString buffer = llformat("%d", contrib);
+	std::string buffer = llformat("%d", contrib);
 
 	if ( mYourContributionEditorp )
 	{
@@ -405,41 +405,40 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 			mMapButtonp->setEnabled(TRUE);
 		}
 
-		char name[MAX_STRING];		/*Flawfinder: ignore*/
-		char desc[MAX_STRING];		/*Flawfinder: ignore*/
+		std::string name;
+		std::string desc;
 		S32 actual_area;
 		S32 billable_area;
 		U8 flags;
 		F32 global_x;
 		F32 global_y;
-		char sim_name[MAX_STRING];		/*Flawfinder: ignore*/
+		std::string sim_name;
 		for(S32 i = first_block; i < count; ++i)
 		{
 			msg->getUUID("QueryData", "OwnerID", owner_id, i);
-			msg->getString("QueryData", "Name", MAX_STRING, name, i);
-			msg->getString("QueryData", "Desc", MAX_STRING, desc, i);
+			msg->getString("QueryData", "Name", name, i);
+			msg->getString("QueryData", "Desc", desc, i);
 			msg->getS32("QueryData", "ActualArea", actual_area, i);
 			msg->getS32("QueryData", "BillableArea", billable_area, i);
 			msg->getU8("QueryData", "Flags", flags, i);
 			msg->getF32("QueryData", "GlobalX", global_x, i);
 			msg->getF32("QueryData", "GlobalY", global_y, i);
-			msg->getString("QueryData", "SimName", MAX_STRING, sim_name, i);
+			msg->getString("QueryData", "SimName", sim_name, i);
 
 			S32 region_x = llround(global_x) % REGION_WIDTH_UNITS;
 			S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
-			char location[MAX_STRING];		/*Flawfinder: ignore*/
-			snprintf(location, MAX_STRING, "%s (%d, %d)", sim_name, region_x, region_y);			/* Flawfinder: ignore */
-			char area[MAX_STRING];		/*Flawfinder: ignore*/
+			std::string location = sim_name + llformat(" (%d, %d)", region_x, region_y);
+			std::string area;
 			if(billable_area == actual_area)
 			{
-				snprintf(area, MAX_STRING, "%d", billable_area);			/* Flawfinder: ignore */
+				area = llformat("%d", billable_area);
 			}
 			else
 			{
-				snprintf(area, MAX_STRING, "%d / %d", billable_area, actual_area);			/* Flawfinder: ignore */
+				area = llformat("%d / %d", billable_area, actual_area);	
 			}
-			char hidden[MAX_STRING];		/*Flawfinder: ignore*/
-			snprintf(hidden, MAX_STRING, "%f %f", global_x, global_y);			/* Flawfinder: ignore */
+			std::string hidden;
+			hidden = llformat("%f %f", global_x, global_y);
 
 			LLSD row;
 
@@ -563,12 +562,12 @@ void LLPanelGroupLandMoney::update(LLGroupChange gc)
 	mImplementationp->setYourContributionTextField(mImplementationp->getStoredContribution());
 }
 
-bool LLPanelGroupLandMoney::needsApply(LLString& mesg)
+bool LLPanelGroupLandMoney::needsApply(std::string& mesg)
 {
 	return mImplementationp->mNeedsApply;
 }
 
-bool LLPanelGroupLandMoney::apply(LLString& mesg)
+bool LLPanelGroupLandMoney::apply(std::string& mesg)
 {
 	if (!mImplementationp->applyContribution() )
 	{
@@ -679,7 +678,7 @@ BOOL LLPanelGroupLandMoney::postBuild()
 		}
 	}
 
-	LLString loading_text = getString("loading_txt");
+	std::string loading_text = getString("loading_txt");
 	
 	//pull out the widgets for the L$ details tab
 	earlierp = getChild<LLButton>("earlier_details_button", true);
@@ -777,7 +776,7 @@ public:
 		 LLButton* later_buttonp,
 		 LLTextEditor* text_editorp,
 		 LLPanel* tabpanelp,
-		 const LLString& loading_text,
+		 const std::string& loading_text,
 		 const LLUUID& group_id,
 		 S32 interval_length_days,
 		 S32 max_interval_days);
@@ -803,14 +802,14 @@ public:
 	LLButton*     mEarlierButtonp;
 	LLButton*     mLaterButtonp;
 
-	LLString mLoadingText;
+	std::string mLoadingText;
 };
 
 LLGroupMoneyTabEventHandler::impl::impl(LLButton* earlier_buttonp,
 										LLButton* later_buttonp,
 										LLTextEditor* text_editorp,
 										LLPanel* tabpanelp,
-										const LLString& loading_text,
+										const std::string& loading_text,
 										const LLUUID& group_id,
 										S32 interval_length_days,
 										S32 max_interval_days)
@@ -868,7 +867,7 @@ LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_butto
 														 LLTextEditor* text_editorp,
 														 LLTabContainer* tab_containerp,
 														 LLPanel* panelp,
-														 const LLString& loading_text,
+														 const std::string& loading_text,
 														 const LLUUID& group_id,
 														 S32 interval_length_days,
 														 S32 max_interval_days)
@@ -985,7 +984,7 @@ LLGroupMoneyDetailsTabEventHandler::LLGroupMoneyDetailsTabEventHandler(LLButton*
 																	   LLTextEditor* text_editorp,
 																	   LLTabContainer* tab_containerp,
 																	   LLPanel* panelp,
-																	   const LLString& loading_text,
+																	   const std::string& loading_text,
 																	   const LLUUID& group_id)
 	: LLGroupMoneyTabEventHandler(earlier_buttonp,
 								  later_buttonp,
@@ -1036,16 +1035,13 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
 		return;
 	}
 
-	char line[MAX_STRING];		/*Flawfinder: ignore*/
-	LLString text;
-
-	char start_date[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string start_date;
 	S32 interval_days;
 	S32 current_interval;
 
 	msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
 	msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_CurrentInterval, current_interval );
-	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, MAX_STRING, start_date);
+	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, start_date);
 
 	if ( interval_days != mImplementationp->mIntervalLength || 
 		 current_interval != mImplementationp->mCurrentInterval )
@@ -1055,23 +1051,22 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
 		return;
 	}
 
-	snprintf(line, MAX_STRING,  "%s\n\n", start_date);			/* Flawfinder: ignore */
-	text.append(line);
+	std::string text = start_date;
+	text.append("\n\n");
 
 	S32 total_amount = 0;
 	S32 transactions = msg->getNumberOfBlocksFast(_PREHASH_HistoryData);
 	for(S32 i = 0; i < transactions; i++)
 	{
-		S32			amount = 0;
-		char		desc[MAX_STRING];		/*Flawfinder: ignore*/
+		S32 amount = 0;
+		std::string desc;
 
-		msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Description,	MAX_STRING, desc, i );
-		msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Amount,		amount, i);
+		msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Description, desc, i );
+		msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Amount, amount, i);
 
 		if (amount != 0)
 		{
-			snprintf(line, MAX_STRING, "%-24s %6d\n", desc, amount );			/* Flawfinder: ignore */
-			text.append(line);
+			text.append(llformat("%-24s %6d\n", desc.c_str(), amount));
 		}
 		else
 		{
@@ -1083,8 +1078,7 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
 
 	text.append(1, '\n');
 
-	snprintf(line, MAX_STRING, "%-24s %6d\n", "Total", total_amount );			/* Flawfinder: ignore */
-	text.append(line);
+	text.append(llformat("%-24s %6d\n", "Total", total_amount));
 
 	if ( mImplementationp->mTextEditorp )
 	{
@@ -1125,7 +1119,7 @@ LLGroupMoneySalesTabEventHandler::LLGroupMoneySalesTabEventHandler(LLButton* ear
 																   LLTextEditor* text_editorp,
 																   LLTabContainer* tab_containerp,
 																   LLPanel* panelp,
-																   const LLString& loading_text,
+																   const std::string& loading_text,
 																   const LLUUID& group_id)
 	: LLGroupMoneyTabEventHandler(earlier_buttonp,
 								  later_buttonp,
@@ -1176,16 +1170,15 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
 		return;
 	}
 
-	char line[MAX_STRING];		/*Flawfinder: ignore*/
 	std::string text = mImplementationp->mTextEditorp->getText();
 
-	char start_date[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string start_date;
 	S32 interval_days;
 	S32 current_interval;
 
 	msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
 	msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_CurrentInterval, current_interval );
-	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, MAX_STRING, start_date);
+	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, start_date);
 
 	if (interval_days != mImplementationp->mIntervalLength ||
 	    current_interval != mImplementationp->mCurrentInterval)
@@ -1199,10 +1192,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
 	// Start with the date.
 	if (text == mImplementationp->mLoadingText)
 	{
-		text.clear();
-
-		snprintf(line, MAX_STRING, "%s\n\n", start_date); 			/* Flawfinder: ignore */
-		text.append(line);
+		text = start_date + "\n\n";
 	}
 
 	S32 transactions = msg->getNumberOfBlocksFast(_PREHASH_HistoryData);
@@ -1214,22 +1204,21 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
 	{
 		for(S32 i = 0; i < transactions; i++)
 		{
-			const S32 SHORT_STRING = 64;
-			char		time[SHORT_STRING];		/*Flawfinder: ignore*/
+			std::string	time;
 			S32			type = 0;
 			S32			amount = 0;
-			char		user[SHORT_STRING];		/*Flawfinder: ignore*/
-			char		item[SHORT_STRING];		/*Flawfinder: ignore*/
+			std::string	user;
+			std::string	item;
 
-			msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Time,		SHORT_STRING, time, i);
-			msg->getStringFast(_PREHASH_HistoryData, _PREHASH_User,		SHORT_STRING, user, i );
+			msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Time,		time, i);
+			msg->getStringFast(_PREHASH_HistoryData, _PREHASH_User,		user, i );
 			msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Type,		type, i);
-			msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Item,		SHORT_STRING, item, i );
-			msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Amount,	amount, i);
+			msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Item,		item, i );
+			msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Amount,		amount, i);
 
 			if (amount != 0)
 			{
-				char* verb;
+				std::string verb;
 
 				switch(type)
 				{
@@ -1256,7 +1245,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
 					break;
 				}
 
-				snprintf(line, sizeof(line), "%s %6d - %s %s %s\n", time, amount, user, verb, item);			/* Flawfinder: ignore */
+				std::string line = llformat("%s %6d - %s %s %s\n", time.c_str(), amount, user.c_str(), verb.c_str(), item.c_str());
 				text.append(line);
 			}
 		}
@@ -1302,7 +1291,7 @@ void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem
 LLGroupMoneyPlanningTabEventHandler::LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editorp,
 																		 LLTabContainer* tab_containerp,
 																		 LLPanel* panelp,
-																		 const LLString& loading_text,
+																		 const std::string& loading_text,
 																		 const LLUUID& group_id)
 	: LLGroupMoneyTabEventHandler(NULL,
 								  NULL,
@@ -1353,12 +1342,11 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
 		return;
 	}
 
-	char line[MAX_STRING];		/*Flawfinder: ignore*/
-	LLString text;
+	std::string text;
 
-	char start_date[MAX_STRING];		/*Flawfinder: ignore*/
-	char last_stipend_date[MAX_STRING];		/*Flawfinder: ignore*/
-	char next_stipend_date[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string start_date;
+	std::string last_stipend_date;
+	std::string next_stipend_date;
 	S32 interval_days;
 	S32 current_interval;
 	S32 balance;
@@ -1395,9 +1383,9 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
 	msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_ParcelDirFeeEstimate, proj_parcel_dir_fee );
 	msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_NonExemptMembers, non_exempt_members );
 
-	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, MAX_STRING, start_date);
-	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, MAX_STRING, last_stipend_date);
-	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, MAX_STRING, next_stipend_date);
+	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, start_date);
+	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date);
+	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date);
 
 	cur_total_tax = cur_object_tax + cur_light_tax + cur_land_tax + cur_group_tax +  cur_parcel_dir_fee;
 	proj_total_tax = proj_object_tax + proj_light_tax + proj_land_tax + proj_group_tax + proj_parcel_dir_fee;
@@ -1410,27 +1398,22 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
 		return;
 	}
 
-	snprintf(line, MAX_STRING, "Summary for this week, beginning on %s\n", start_date);			/* Flawfinder: ignore */
-	text.append(line);
+	text.append("Summary for this week, beginning on ");
+	text.append(start_date);
 
 	if (current_interval == 0)
 	{
-		snprintf(line, MAX_STRING, "The next stipend day is %s\n\n", next_stipend_date);			/* Flawfinder: ignore */
-		text.append(line);
-		snprintf(line, MAX_STRING, "%-24sL$%6d\n", "Balance", balance );			/* Flawfinder: ignore */
-		text.append(line);
-
+		text.append("The next stipend day is ");
+		text.append(next_stipend_date);
+		text.append("\n\n");
+		text.append(llformat("%-24sL$%6d\n", "Balance", balance ));
 		text.append(1, '\n');
 	}
 
-	snprintf(line, MAX_STRING,  "                      Group       Individual Share\n");			/* Flawfinder: ignore */
-	text.append(line);
-	snprintf(line, MAX_STRING,     "%-24s %6d      %6d \n", "Credits", total_credits, (S32)floor((F32)total_credits/(F32)non_exempt_members));			/* Flawfinder: ignore */
-	text.append(line);
-	snprintf(line, MAX_STRING,     "%-24s %6d      %6d \n", "Debits", total_debits,  (S32)floor((F32)total_debits/(F32)non_exempt_members));			/* Flawfinder: ignore */
-	text.append(line);
-	snprintf(line, MAX_STRING,     "%-24s %6d      %6d \n", "Total", total_credits + total_debits,  (S32)floor((F32)(total_credits + total_debits)/(F32)non_exempt_members));			/* Flawfinder: ignore */
-	text.append(line);
+	text.append( "                      Group       Individual Share\n");
+	text.append(llformat( "%-24s %6d      %6d \n", "Credits", total_credits, (S32)floor((F32)total_credits/(F32)non_exempt_members)));
+	text.append(llformat( "%-24s %6d      %6d \n", "Debits", total_debits, (S32)floor((F32)total_debits/(F32)non_exempt_members)));
+	text.append(llformat( "%-24s %6d      %6d \n", "Total", total_credits + total_debits,  (S32)floor((F32)(total_credits + total_debits)/(F32)non_exempt_members)));
 
 	if ( mImplementationp->mTextEditorp )
 	{
diff --git a/linden/indra/newview/llpanelgrouplandmoney.h b/linden/indra/newview/llpanelgrouplandmoney.h
index 1ee9861..3a4236c 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.h
+++ b/linden/indra/newview/llpanelgrouplandmoney.h
@@ -51,8 +51,8 @@ public:
 	static void* createTab(void* data);
 
 	virtual void activate();
-	virtual bool needsApply(LLString& mesg);
-	virtual bool apply(LLString& mesg);
+	virtual bool needsApply(std::string& mesg);
+	virtual bool apply(std::string& mesg);
 	virtual void cancel();
 	virtual void update(LLGroupChange gc);
 
diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index 846a4c1..30a9c5b 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -80,7 +80,7 @@ public:
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
 								   EAcceptance* accept,
-								   LLString& tooltip_msg);
+								   std::string& tooltip_msg);
 protected:
 	LLPanelGroupNotices* mGroupNoticesPanel;
 	LLUUID	mGroupID;
@@ -103,7 +103,7 @@ BOOL LLGroupDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 									 EDragAndDropType cargo_type,
 									 void* cargo_data,
 									 EAcceptance* accept,
-									 LLString& tooltip_msg)
+									 std::string& tooltip_msg)
 {
 	BOOL handled = FALSE;
 
@@ -168,14 +168,14 @@ BOOL LLGroupDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 //-----------------------------------------------------------------------------
 // LLPanelGroupNotices
 //-----------------------------------------------------------------------------
-char* build_notice_date(const time_t& the_time, char* buffer)
+std::string build_notice_date(const time_t& the_time)
 {
 	time_t t = the_time;
 	if (!t) time(&t);
 	tm* lt = localtime(&t);
 	//for some reason, the month is off by 1.  See other uses of
 	//"local" time in the code...
-	snprintf(buffer, NOTICE_DATE_STRING_SIZE, "%i/%i/%i", lt->tm_mon + 1, lt->tm_mday, lt->tm_year + 1900);		/*Flawfinder: ignore*/
+	std::string buffer = llformat("%i/%i/%i", lt->tm_mon + 1, lt->tm_mday, lt->tm_year + 1900);
 	return buffer;
 }
 
@@ -316,7 +316,7 @@ void LLPanelGroupNotices::setItem(LLPointer<LLInventoryItem> inv_item)
 		item_is_multi = TRUE;
 	};
 
-	LLString icon_name = get_item_icon_name(inv_item->getType(),
+	std::string icon_name = get_item_icon_name(inv_item->getType(),
 										inv_item->getInventoryType(),
 										inv_item->getFlags(),
 										item_is_multi );
@@ -362,8 +362,8 @@ void LLPanelGroupNotices::onClickSendMessage(void* data)
 	}
 	send_group_notice(
 			self->mGroupID,
-			self->mCreateSubject->getText().c_str(),
-			self->mCreateMessage->getText().c_str(),
+			self->mCreateSubject->getText(),
+			self->mCreateMessage->getText(),
 			self->mInventoryItem);
 
 	self->mCreateMessage->clear();
@@ -442,8 +442,8 @@ void LLPanelGroupNotices::processGroupNoticesListReply(LLMessageSystem* msg, voi
 void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 {
 	LLUUID id;
-	char subj[MAX_STRING];		/*Flawfinder: ignore*/
-	char name[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string subj;
+	std::string name;
 	U32 timestamp;
 	BOOL has_attachment;
 	U8 asset_type;
@@ -461,8 +461,8 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 			return;
 		}
 			
-		msg->getString("Data","Subject",MAX_STRING,subj,i);
-		msg->getString("Data","FromName",MAX_STRING,name,i);
+		msg->getString("Data","Subject",subj,i);
+		msg->getString("Data","FromName",name,i);
 		msg->getBOOL("Data","HasAttachment",has_attachment,i);
 		msg->getU8("Data","AssetType",asset_type,i);
 		msg->getU32("Data","Timestamp",timestamp,i);
@@ -474,7 +474,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 		row["columns"][0]["column"] = "icon";
 		if (has_attachment)
 		{
-			LLString icon_name = get_item_icon_name(
+			std::string icon_name = get_item_icon_name(
 									(LLAssetType::EType)asset_type,
 									LLInventoryType::IT_NONE,FALSE, FALSE);
 			row["columns"][0]["type"] = "icon";
@@ -487,12 +487,11 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 		row["columns"][2]["column"] = "from";
 		row["columns"][2]["value"] = name;
 
-		char buffer[NOTICE_DATE_STRING_SIZE];		/*Flawfinder: ignore*/
-		build_notice_date(t, buffer);
+		std::string buffer = build_notice_date(t);
 		row["columns"][3]["column"] = "date";
 		row["columns"][3]["value"] = buffer;
 
-		snprintf(buffer, 30, "%u", timestamp);			/* Flawfinder: ignore */
+		buffer = llformat( "%u", timestamp);
 		row["columns"][4]["column"] = "sort";
 		row["columns"][4]["value"] = buffer;
 
@@ -522,16 +521,16 @@ void LLPanelGroupNotices::onSelectNotice(LLUICtrl* ctrl, void* data)
 	lldebugs << "Item " << item->getUUID() << " selected." << llendl;
 }
 
-void LLPanelGroupNotices::showNotice(const char* subject,
-										const char* message,
-										const bool& has_inventory,
-										const char* inventory_name,
-										LLOfferInfo* inventory_offer)
+void LLPanelGroupNotices::showNotice(const std::string& subject,
+									 const std::string& message,
+									 const bool& has_inventory,
+									 const std::string& inventory_name,
+									 LLOfferInfo* inventory_offer)
 {
 	arrangeNoticeView(VIEW_PAST_NOTICE);
 
-	if(mViewSubject) mViewSubject->setText(LLString(subject));
-	if(mViewMessage) mViewMessage->setText(LLString(message));
+	if(mViewSubject) mViewSubject->setText(subject);
+	if(mViewMessage) mViewMessage->setText(message);
 	
 	if (mInventoryOffer)
 	{
@@ -544,7 +543,7 @@ void LLPanelGroupNotices::showNotice(const char* subject,
 	{
 		mInventoryOffer = inventory_offer;
 
-		LLString icon_name = get_item_icon_name(mInventoryOffer->mType,
+		std::string icon_name = get_item_icon_name(mInventoryOffer->mType,
 												LLInventoryType::IT_TEXTURE,
 												0, FALSE);
 
diff --git a/linden/indra/newview/llpanelgroupnotices.h b/linden/indra/newview/llpanelgroupnotices.h
index b09a201..8064c6a 100644
--- a/linden/indra/newview/llpanelgroupnotices.h
+++ b/linden/indra/newview/llpanelgroupnotices.h
@@ -52,8 +52,8 @@ public:
 	// LLPanelGroupTab
 	static void* createTab(void* data);
 	virtual void activate();
-	//virtual bool needsApply(LLString& mesg);
-	//virtual bool apply(LLString& mesg);
+	//virtual bool needsApply(std::string& mesg);
+	//virtual bool apply(std::string& mesg);
 	//virtual void update();
 	
 	virtual BOOL postBuild();
@@ -63,11 +63,11 @@ public:
 
 	static void processGroupNoticesListReply(LLMessageSystem* msg, void** data);
 
-	void showNotice(const char* subject,
-							const char* message,
-							const bool& has_inventory,
-							const char* inventory_name,
-							LLOfferInfo* inventory_offer);
+	void showNotice(const std::string& subject,
+					const std::string& message,
+					const bool& has_inventory,
+					const std::string& inventory_name,
+					LLOfferInfo* inventory_offer);
 
 private:
 	static void onClickRemoveAttachment(void* data);
diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index ccf776f..e956dff 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -61,6 +61,9 @@ bool agentCanRemoveFromRole(const LLUUID& group_id,
 bool agentCanAddToRole(const LLUUID& group_id,
 					   const LLUUID& role_id)
 {
+	if (gAgent.isGodlike())
+		return true;
+    
 	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
 	if (!gdatap) 
 	{
@@ -177,9 +180,6 @@ BOOL LLPanelGroupRoles::postBuild()
 
 BOOL LLPanelGroupRoles::isVisibleByAgent(LLAgent* agentp)
 {
-	if (agentp->isGodlike())
-		return TRUE;
-	
 	/* This power was removed to make group roles simpler
 	return agentp->hasPowerInGroup(mGroupID, 
 								   GP_ROLE_CREATE |
@@ -228,7 +228,7 @@ void LLPanelGroupRoles::handleClickSubTab()
 BOOL LLPanelGroupRoles::attemptTransition()
 {
 	// Check if the current tab needs to be applied.
-	LLString mesg;
+	std::string mesg;
 	if (mCurrentTab && mCurrentTab->needsApply(mesg))
 	{
 		// If no message was provided, give a generic one.
@@ -237,7 +237,7 @@ BOOL LLPanelGroupRoles::attemptTransition()
 			mesg = mDefaultNeedsApplyMesg;
 		}
 		// Create a notify box, telling the user about the unapplied tab.
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[NEEDS_APPLY_MESSAGE]"] = mesg;
 		args["[WANT_APPLY_MESSAGE]"] = mWantApplyMesg;
 		gViewerWindow->alertXml("PanelGroupApply", args,
@@ -300,14 +300,14 @@ void LLPanelGroupRoles::handleNotifyCallback(S32 option)
 	case 0: // "Apply Changes"
 	{
 		// Try to apply changes, and switch to the requested tab.
-		LLString apply_mesg;
+		std::string apply_mesg;
 		if ( !apply( apply_mesg ) )
 		{
 			// There was a problem doing the apply.
 			if ( !apply_mesg.empty() )
 			{
 				mHasModal = TRUE;
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[MESSAGE]"] = apply_mesg;
 				gViewerWindow->alertXml("GenericAlert", args, onModalClose, (void*) this);
 			}
@@ -350,7 +350,7 @@ void LLPanelGroupRoles::onModalClose(S32 option, void* user_data)
 }
 
 
-bool LLPanelGroupRoles::apply(LLString& mesg)
+bool LLPanelGroupRoles::apply(std::string& mesg)
 {
 	// Pass this along to the currently visible sub tab.
 	if (!mSubTabContainer) return false;
@@ -359,7 +359,7 @@ bool LLPanelGroupRoles::apply(LLString& mesg)
 	if (!panelp) return false;
 	
 	// Ignore the needs apply message.
-	LLString ignore_mesg;
+	std::string ignore_mesg;
 	if ( !panelp->needsApply(ignore_mesg) )
 	{
 		// We don't need to apply anything.
@@ -383,7 +383,7 @@ void LLPanelGroupRoles::cancel()
 }
 
 // Pass all of these messages to the currently visible sub tab.
-LLString LLPanelGroupRoles::getHelpText() const
+std::string LLPanelGroupRoles::getHelpText() const
 {
 	LLPanelGroupTab* panelp = (LLPanelGroupTab*) mSubTabContainer->getCurrentPanel();
 	if (panelp)
@@ -458,7 +458,7 @@ void LLPanelGroupRoles::deactivate()
 	if (panelp) panelp->deactivate();
 }
 
-bool LLPanelGroupRoles::needsApply(LLString& mesg)
+bool LLPanelGroupRoles::needsApply(std::string& mesg)
 {
 	LLPanelGroupTab* panelp = (LLPanelGroupTab*) mSubTabContainer->getCurrentPanel();
 	if (!panelp) return false;
@@ -606,15 +606,15 @@ void LLPanelGroupSubTab::onClickShowAll(void* user_data)
 void LLPanelGroupSubTab::handleClickShowAll()
 {
 	lldebugs << "LLPanelGroupSubTab::handleClickShowAll()" << llendl;
-	setSearchFilter( LLString::null );
+	setSearchFilter( LLStringUtil::null );
 	mShowAllButton->setEnabled(FALSE);
 }
 
-void LLPanelGroupSubTab::setSearchFilter(const LLString& filter)
+void LLPanelGroupSubTab::setSearchFilter(const std::string& filter)
 {
 	lldebugs << "LLPanelGroupSubTab::setSearchFilter() ==> '" << filter << "'" << llendl;
 	mSearchFilter = filter;
-	LLString::toLower(mSearchFilter);
+	LLStringUtil::toLower(mSearchFilter);
 	update(GC_ALL);
 }
 
@@ -656,7 +656,7 @@ bool LLPanelGroupSubTab::matchesActionSearchFilter(std::string action)
 	// If the search filter is empty, everything passes.
 	if (mSearchFilter.empty()) return true;
 
-	LLString::toLower(action);
+	LLStringUtil::toLower(action);
 	std::string::size_type match = action.find(mSearchFilter);
 
 	if (std::string::npos == match)
@@ -1131,6 +1131,9 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 	}
 	mAssignedRolesList->setEnabled(TRUE);
 
+	if (gAgent.isGodlike())
+		can_eject_members = TRUE;
+
 	if (!can_eject_members && !member_is_owner)
 	{
 		// Maybe we can eject them because we are an owner...
@@ -1335,7 +1338,7 @@ void LLPanelGroupMembersSubTab::deactivate()
 	LLPanelGroupSubTab::deactivate();
 }
 
-bool LLPanelGroupMembersSubTab::needsApply(LLString& mesg)
+bool LLPanelGroupMembersSubTab::needsApply(std::string& mesg)
 {
 	return mChanged;
 }
@@ -1354,7 +1357,7 @@ void LLPanelGroupMembersSubTab::cancel()
 	}
 }
 
-bool LLPanelGroupMembersSubTab::apply(LLString& mesg)
+bool LLPanelGroupMembersSubTab::apply(std::string& mesg)
 {
 	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
 	if (!gdatap)
@@ -1372,7 +1375,7 @@ bool LLPanelGroupMembersSubTab::apply(LLString& mesg)
 		if ( mNumOwnerAdditions > 0 )
 		{
 			LLRoleData rd;
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 
 			if ( gdatap->getRoleData(gdatap->mOwnerRole, rd) )
 			{
@@ -1462,7 +1465,7 @@ bool LLPanelGroupMembersSubTab::matchesSearchFilter(const std::string& fullname)
 
 	// Create a full name, and compare it to the search filter.
 	std::string fullname_lc(fullname);
-	LLString::toLower(fullname_lc);
+	LLStringUtil::toLower(fullname_lc);
 
 	std::string::size_type match = fullname_lc.find(mSearchFilter);
 
@@ -1718,7 +1721,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
 		else
 		{
 			mMembersList->setEnabled(FALSE);
-			mMembersList->addCommentText("No match.");
+			mMembersList->addCommentText(std::string("No match."));
 		}
 	}
 	else
@@ -1852,7 +1855,7 @@ void LLPanelGroupRolesSubTab::deactivate()
 	LLPanelGroupSubTab::deactivate();
 }
 
-bool LLPanelGroupRolesSubTab::needsApply(LLString& mesg)
+bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg)
 {
 	lldebugs << "LLPanelGroupRolesSubTab::needsApply()" << llendl;
 
@@ -1862,7 +1865,7 @@ bool LLPanelGroupRolesSubTab::needsApply(LLString& mesg)
 			|| (gdatap && gdatap->pendingRoleChanges()));	// Pending role changes in the group
 }
 
-bool LLPanelGroupRolesSubTab::apply(LLString& mesg)
+bool LLPanelGroupRolesSubTab::apply(std::string& mesg)
 {
 	lldebugs << "LLPanelGroupRolesSubTab::apply()" << llendl;
 
@@ -1907,8 +1910,8 @@ bool LLPanelGroupRolesSubTab::matchesSearchFilter(std::string rolename, std::str
 	// If the search filter is empty, everything passes.
 	if (mSearchFilter.empty()) return true;
 
-	LLString::toLower(rolename);
-	LLString::toLower(roletitle);
+	LLStringUtil::toLower(rolename);
+	LLStringUtil::toLower(roletitle);
 	std::string::size_type match_name = rolename.find(mSearchFilter);
 	std::string::size_type match_title = roletitle.find(mSearchFilter);
 
@@ -1975,7 +1978,7 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 			}
 		}
 
-		mRolesList->sortByColumn("name", TRUE);
+		mRolesList->sortByColumn(std::string("name"), TRUE);
 
 		if ( (gdatap->mRoles.size() < (U32)MAX_ROLES)
 			&& gAgent.hasPowerInGroup(mGroupID, GP_ROLE_CREATE) )
@@ -2213,7 +2216,7 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLCheckBoxCtrl* check, bool forc
 			check->set(FALSE);
 
 			LLRoleData rd;
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 
 			if ( gdatap->getRoleData(role_id, rd) )
 			{
@@ -2223,7 +2226,7 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLCheckBoxCtrl* check, bool forc
 				cb_data->mSelf = this;
 				cb_data->mCheck = check;
 				mHasModal = TRUE;
-				LLString warning = "AssignDangerousActionWarning";
+				std::string warning = "AssignDangerousActionWarning";
 				if (GP_ROLE_CHANGE_ACTIONS == power)
 				{
 					warning = "AssignDangerousAbilityWarning";
@@ -2401,7 +2404,7 @@ void LLPanelGroupRolesSubTab::handleDeleteRole()
 
 	if (role_item->getUUID().isNull() || role_item->getUUID() == gdatap->mOwnerRole)
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MESSAGE]"] = mRemoveEveryoneTxt;
 		LLNotifyBox::showXml("GenericNotify", args);
 		return;
@@ -2508,14 +2511,14 @@ void LLPanelGroupActionsSubTab::deactivate()
 	LLPanelGroupSubTab::deactivate();
 }
 
-bool LLPanelGroupActionsSubTab::needsApply(LLString& mesg)
+bool LLPanelGroupActionsSubTab::needsApply(std::string& mesg)
 {
 	lldebugs << "LLPanelGroupActionsSubTab::needsApply()" << llendl;
 
 	return false;
 }
 
-bool LLPanelGroupActionsSubTab::apply(LLString& mesg)
+bool LLPanelGroupActionsSubTab::apply(std::string& mesg)
 {
 	lldebugs << "LLPanelGroupActionsSubTab::apply()" << llendl;
 	return true;
diff --git a/linden/indra/newview/llpanelgrouproles.h b/linden/indra/newview/llpanelgrouproles.h
index 83052c0..d510260 100644
--- a/linden/indra/newview/llpanelgrouproles.h
+++ b/linden/indra/newview/llpanelgrouproles.h
@@ -78,12 +78,12 @@ public:
 	static void onModalClose(S32 option, void* user_data);
 
 	// Most of these messages are just passed on to the current sub-tab.
-	virtual LLString getHelpText() const;
+	virtual std::string getHelpText() const;
 	virtual void activate();
 	virtual void deactivate();
-	virtual bool needsApply(LLString& mesg);
+	virtual bool needsApply(std::string& mesg);
 	virtual BOOL hasModal();
-	virtual bool apply(LLString& mesg);
+	virtual bool apply(std::string& mesg);
 	virtual void cancel();
 	virtual void update(LLGroupChange gc);
 
@@ -97,8 +97,8 @@ protected:
 	BOOL					mFirstUse;
 	BOOL					mIgnoreTransition;
 
-	LLString				mDefaultNeedsApplyMesg;
-	LLString				mWantApplyMesg;
+	std::string				mDefaultNeedsApplyMesg;
+	std::string				mWantApplyMesg;
 };
 
 class LLPanelGroupSubTab : public LLPanelGroupTab
@@ -120,7 +120,7 @@ public:
 	static void onClickShowAll(void*);
 	void handleClickShowAll();
 
-	virtual void setSearchFilter( const LLString& filter );
+	virtual void setSearchFilter( const std::string& filter );
 
 	virtual void activate();
 	virtual void deactivate();
@@ -154,7 +154,7 @@ protected:
 	LLButton*		mSearchButton;
 	LLButton*		mShowAllButton;
 
-	LLString mSearchFilter;
+	std::string mSearchFilter;
 
 	icon_map_t	mActionIcons;
 
@@ -193,8 +193,8 @@ public:
 	virtual void activate();
 	virtual void deactivate();
 	virtual void cancel();
-	virtual bool needsApply(LLString& mesg);
-	virtual bool apply(LLString& mesg);
+	virtual bool needsApply(std::string& mesg);
+	virtual bool apply(std::string& mesg);
 	virtual void update(LLGroupChange gc);
 	void updateMembers();
 
@@ -238,8 +238,8 @@ public:
 
 	virtual void activate();
 	virtual void deactivate();
-	virtual bool needsApply(LLString& mesg);
-	virtual bool apply(LLString& mesg);
+	virtual bool needsApply(std::string& mesg);
+	virtual bool apply(std::string& mesg);
 	virtual void cancel();
 	bool matchesSearchFilter(std::string rolename, std::string roletitle);
 	virtual void update(LLGroupChange gc);
@@ -302,8 +302,8 @@ public:
 
 	virtual void activate();
 	virtual void deactivate();
-	virtual bool needsApply(LLString& mesg);
-	virtual bool apply(LLString& mesg);
+	virtual bool needsApply(std::string& mesg);
+	virtual bool apply(std::string& mesg);
 	virtual void update(LLGroupChange gc);
 
 	static void onActionSelect(LLUICtrl*, void*);
diff --git a/linden/indra/newview/llpanelgroupvoting.cpp b/linden/indra/newview/llpanelgroupvoting.cpp
index d58af78..b1e3e15 100644
--- a/linden/indra/newview/llpanelgroupvoting.cpp
+++ b/linden/indra/newview/llpanelgroupvoting.cpp
@@ -72,7 +72,7 @@ public:
 
 	void sendGroupProposalsRequest(const LLUUID& group_id);
 	void sendStartGroupProposal();
-	void sendGroupProposalBallot(const char* vote);
+	void sendGroupProposalBallot(const std::string& vote);
 	void sendGroupVoteHistoryRequest(const LLUUID& group_id);
 
 	void setEnableCreateProposal();
@@ -307,7 +307,7 @@ void LLPanelGroupVoting::impl::setEnableVoteProposal()
 		}
 		else
 		{	// Something's wrong... should have some text
-			mProposalText->setText(LLString());
+			mProposalText->setText(LLStringUtil::null);
 		}
 
 		proposal_cell = item->getColumn(2);
@@ -318,7 +318,7 @@ void LLPanelGroupVoting::impl::setEnableVoteProposal()
 		}
 		else
 		{	// Something's wrong... should have some text
-			mEndDate->setText(LLString());
+			mEndDate->setText(LLStringUtil::null);
 		}
 
 		// col 3: Vote Type
@@ -341,7 +341,7 @@ void LLPanelGroupVoting::impl::setEnableVoteProposal()
 		}
 		else
 		{	// Something's wrong... should have some text
-			mStartDate->setText(LLString());
+			mStartDate->setText(LLStringUtil::null);
 		}
 
 		proposal_cell = item->getColumn(6);
@@ -461,7 +461,7 @@ void LLPanelGroupVoting::impl::setEnableCreateProposal()
 	mProposals->setVisible(FALSE); 
 	mProposalText->setEnabled(TRUE);
 	mProposalText->setVisible(TRUE);
-	mProposalText->setText(LLString::null);
+	mProposalText->setText(LLStringUtil::null);
 	mBtnYes->setEnabled(FALSE);
 	mBtnYes->setVisible(FALSE);
 	mBtnNo->setEnabled(FALSE);
@@ -556,7 +556,7 @@ void LLPanelGroupVoting::impl::setEnableHistoryItem()
 	}
 	else
 	{	// Something's wrong...
-		mVoteHistoryText->setText(LLString());
+		mVoteHistoryText->setText(LLStringUtil::null);
 	}
 	mVotesHistoryLbl->setVisible(FALSE);
 	mVotesHistory->setVisible(FALSE);
@@ -631,7 +631,7 @@ void LLPanelGroupVoting::handleResponse(
 		
 		if (response == BALLOT)
 		{
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 	
 			if (success)
 			{
@@ -791,7 +791,7 @@ void LLPanelGroupVoting::impl::sendStartGroupProposal()
 		msg->addF32Fast(_PREHASH_Majority, majority );
 		msg->addS32Fast(_PREHASH_Quorum, quorum );
 		msg->addS32Fast(_PREHASH_Duration, duration_seconds );
-		msg->addStringFast(_PREHASH_ProposalText, mProposalText->getText().c_str());
+		msg->addStringFast(_PREHASH_ProposalText, mProposalText->getText());
 
 		gAgent.sendReliableMessage();
 
@@ -801,7 +801,7 @@ void LLPanelGroupVoting::impl::sendStartGroupProposal()
 	}
 }
 
-void LLPanelGroupVoting::impl::sendGroupProposalBallot(const char* vote)
+void LLPanelGroupVoting::impl::sendGroupProposalBallot(const std::string& vote)
 {
 	if ( !gAgent.hasPowerInGroup(mGroupID, GP_PROPOSAL_VOTE) )
 		return;
@@ -904,13 +904,13 @@ void LLPanelGroupVoting::impl::addPendingActiveScrollListItem(unsigned int curre
 void LLPanelGroupVoting::impl::addNoActiveScrollListItem(EAddPosition pos)
 {
 	//*TODO: translate
-	mProposals->addCommentText("There are currently no active proposals", pos);
+	mProposals->addCommentText(std::string("There are currently no active proposals"), pos);
 }
 
 void LLPanelGroupVoting::impl::addNoHistoryScrollListItem(EAddPosition pos)
 {
 	//*TODO: translate
-	mVotesHistory->addCommentText("There are currently no archived proposals", pos);
+	mVotesHistory->addCommentText(std::string("There are currently no archived proposals"), pos);
 }
 
 void LLPanelGroupVoting::impl::addPendingHistoryScrollListItem(unsigned int current,
@@ -958,16 +958,15 @@ void LLPanelGroupVoting::impl::processGroupActiveProposalItemReply(LLMessageSyst
 
 
 	U32 num_expected;
-	const S32 MAX_STRING_NUM_LEN = 20;
-	char item_num_string[DB_TERSE_DATETIME_BUF_SIZE];		/*Flawfinder: ignore*/
-	char proposal_text[DB_VOTE_TEXT_BUF_SIZE];		/*Flawfinder: ignore*/
-	char vote_cast[DB_VOTE_RESULT_BUF_SIZE];		/*Flawfinder: ignore*/
-	char start_datetime[DB_DATETIME_BUF_SIZE];		/*Flawfinder: ignore*/
-	char end_datetime[DB_DATETIME_BUF_SIZE];		/*Flawfinder: ignore*/
-	char vote_type[DB_VOTE_TYPE_BUF_SIZE];		/*Flawfinder: ignore*/
-	char majority_text[MAX_STRING_NUM_LEN];		/*Flawfinder: ignore*/
-	char quorum_text[MAX_STRING_NUM_LEN];		/*Flawfinder: ignore*/
-	char vote_initiator_string[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
+	std::string item_num_string;
+	std::string proposal_text;
+	std::string vote_cast;
+	std::string start_datetime;
+	std::string end_datetime;
+	std::string vote_type;
+	std::string majority_text;
+	std::string quorum_text;
+	std::string vote_initiator_string;
 
 	LLUUID vote_id;
 	LLUUID vote_initiator;
@@ -989,20 +988,20 @@ void LLPanelGroupVoting::impl::processGroupActiveProposalItemReply(LLMessageSyst
 
 	for (int i = 0; i < num_proposals; i++)
 	{
-		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_TerseDateID, DB_TERSE_DATETIME_BUF_SIZE, item_num_string, i );
+		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_TerseDateID, item_num_string, i );
 		msg->getUUIDFast(_PREHASH_ProposalData, _PREHASH_VoteID,	vote_id, i );
-		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_StartDateTime, DB_DATETIME_BUF_SIZE, start_datetime, i );
-		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_EndDateTime, DB_DATETIME_BUF_SIZE, end_datetime, i );
+		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_StartDateTime, start_datetime, i );
+		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_EndDateTime, end_datetime, i );
 		msg->getUUIDFast(_PREHASH_ProposalData, _PREHASH_VoteInitiator, vote_initiator, i );
 		msg->getBOOLFast(_PREHASH_ProposalData,_PREHASH_AlreadyVoted, already_voted, i );
-		msg->getStringFast(_PREHASH_ProposalData,_PREHASH_VoteCast, DB_VOTE_RESULT_BUF_SIZE, vote_cast, i );
-		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_ProposalText, DB_VOTE_TEXT_BUF_SIZE, proposal_text, i );
+		msg->getStringFast(_PREHASH_ProposalData,_PREHASH_VoteCast, vote_cast, i );
+		msg->getStringFast(_PREHASH_ProposalData, _PREHASH_ProposalText, proposal_text, i );
 		msg->getF32Fast(_PREHASH_ProposalData, _PREHASH_Majority, majority, i );
 		msg->getS32Fast(_PREHASH_ProposalData, _PREHASH_Quorum, quorum, i );
 
 		vote_initiator.toString(vote_initiator_string);
-		snprintf(majority_text, MAX_STRING_NUM_LEN, "%f", majority);			/* Flawfinder: ignore */
-		snprintf(quorum_text, MAX_STRING_NUM_LEN, "%i", quorum);			/* Flawfinder: ignore */
+		majority_text = llformat("%f", majority);
+		quorum_text = llformat("%i", quorum);
 
 		LLSD row;
 		S32 index = 0;
@@ -1139,15 +1138,14 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
 		return;
 	}
 
-	const S32 ITEM_NUM_MAX_BUF_LEN = 15;
-	char item_num_string[ITEM_NUM_MAX_BUF_LEN];		/*Flawfinder: ignore*/
-	char proposal_text[DB_VOTE_TEXT_BUF_SIZE];		/*Flawfinder: ignore*/
-	char vote_result[MAX_STRING];		/*Flawfinder: ignore*/
-	char start_datetime[DB_DATETIME_BUF_SIZE];		/*Flawfinder: ignore*/
-	char end_datetime[DB_DATETIME_BUF_SIZE];		/*Flawfinder: ignore*/
-	char vote_type[DB_VOTE_TYPE_BUF_SIZE];		/*Flawfinder: ignore*/
+	std::string item_num_string;
+	std::string proposal_text;
+	std::string vote_result;
+	std::string start_datetime;
+	std::string end_datetime;
+	std::string vote_type;
 
-	LLString vote_text;
+	std::string vote_text;
 	LLUUID vote_id;
 	LLUUID vote_initiator;
 	LLUUID winner_id;
@@ -1155,14 +1153,14 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
 	F32	majority;
 	S32	quorum;
 
-	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_TerseDateID, ITEM_NUM_MAX_BUF_LEN, item_num_string );
+	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_TerseDateID, item_num_string );
 	msg->getUUIDFast(_PREHASH_HistoryItemData, _PREHASH_VoteID,	vote_id );
-	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_StartDateTime, DB_DATETIME_BUF_SIZE, start_datetime );
-	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_EndDateTime, DB_DATETIME_BUF_SIZE, end_datetime );
+	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_StartDateTime, start_datetime );
+	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_EndDateTime, end_datetime );
 	msg->getUUIDFast(_PREHASH_HistoryItemData, _PREHASH_VoteInitiator, vote_initiator);
-	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_VoteType, DB_VOTE_TYPE_BUF_SIZE, vote_type);
-	msg->getStringFast(_PREHASH_HistoryItemData,_PREHASH_VoteResult, DB_VOTE_RESULT_BUF_SIZE, vote_result);
-	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_ProposalText, DB_VOTE_TEXT_BUF_SIZE, proposal_text );
+	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_VoteType, vote_type);
+	msg->getStringFast(_PREHASH_HistoryItemData,_PREHASH_VoteResult, vote_result);
+	msg->getStringFast(_PREHASH_HistoryItemData, _PREHASH_ProposalText, proposal_text );
 	msg->getF32Fast(_PREHASH_HistoryItemData, _PREHASH_Majority, majority);
 	msg->getS32Fast(_PREHASH_HistoryItemData, _PREHASH_Quorum, quorum);
 
@@ -1170,7 +1168,7 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
 
 	if (vote_items > 0)
 	{
-		if (!strcmp(vote_type, "Proposal"))
+		if (vote_type == "Proposal")
 		{
 			LLSD row;
 			row["id"] = vote_id;
@@ -1183,7 +1181,7 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
 			
 			vote_text.assign(proposal_text);
 			vote_text.append("\n\n--\n");
-			if (!strcmp(vote_result, "Success"))
+			if (vote_result == "Success")
 			{
 				vote_text.append("Proposal PASSED.");
 			}
@@ -1193,25 +1191,20 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
 			}
 			vote_text.append("  Votes->\n");
 
-			char vote_result[DB_VOTE_RESULT_BUF_SIZE];		/*Flawfinder: ignore*/
-			char result_msg[MAX_STRING];		/*Flawfinder: ignore*/
+			std::string vote_result;
 			S32 num_votes;
 
 			for (S32 i = 0; i < vote_items; ++i)
 			{
-				msg->getStringFast(_PREHASH_VoteItem, _PREHASH_VoteCast, DB_VOTE_RESULT_BUF_SIZE, vote_result, i);
+				msg->getStringFast(_PREHASH_VoteItem, _PREHASH_VoteCast, vote_result, i);
 				msg->getS32Fast(_PREHASH_VoteItem, _PREHASH_NumVotes, num_votes, i);
-				snprintf(result_msg, MAX_STRING,			/* Flawfinder: ignore */
-						"    %s: %d\n",
-						vote_result,
-						num_votes);
-				vote_text.append(result_msg);
+				vote_text.append(llformat("    %s: %d\n", vote_result.c_str(), num_votes));
 			}
 
 			vote_text.append("\n");
 
-			LLString vote_text_stripped = vote_text;
-			LLString::stripNonprintable(vote_text_stripped);
+			std::string vote_text_stripped = vote_text;
+			LLStringUtil::stripNonprintable(vote_text_stripped);
 
 			row["columns"][1]["column"] = "vote_text_stripped";
 			row["columns"][1]["value"] = vote_text_stripped;
@@ -1328,7 +1321,7 @@ void LLPanelGroupVoting::impl::onClickSubmitProposal(void *userdata)
 		if ( self->mProposalText->getText().empty() )
 		{
 			//throw up an error dialog
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[MESSAGE]"] = self->mPanel.getString("empty_proposal_txt");
 			gViewerWindow->alertXml("GenericAlert", args);
 			return;
@@ -1596,12 +1589,12 @@ void LLPanelGroupVoting::activate()
 	mImpl->setEnableHistoryList();
 }
 
-bool LLPanelGroupVoting::needsApply(LLString& mesg)
+bool LLPanelGroupVoting::needsApply(std::string& mesg)
 {
 	return false;
 }
 
-bool LLPanelGroupVoting::apply(LLString& mesg)
+bool LLPanelGroupVoting::apply(std::string& mesg)
 {
 	return true;
 }
diff --git a/linden/indra/newview/llpanelgroupvoting.h b/linden/indra/newview/llpanelgroupvoting.h
index 05f53b5..c7721d7 100644
--- a/linden/indra/newview/llpanelgroupvoting.h
+++ b/linden/indra/newview/llpanelgroupvoting.h
@@ -52,8 +52,8 @@ public:
 	virtual BOOL isVisibleByAgent(LLAgent* agentp);
 
 	virtual void activate();
-	virtual bool needsApply(LLString& mesg);
-	virtual bool apply(LLString& mesg);
+	virtual bool needsApply(std::string& mesg);
+	virtual bool apply(std::string& mesg);
 	virtual void update(LLGroupChange gc);
 	static  void handleResponse(
 		const LLUUID& group_id,
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 466e2b3..3c0e6d7 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -94,8 +94,8 @@ class LLTaskInvFVBridge : public LLFolderViewEventListener
 {
 protected:
 	LLUUID mUUID;
-	LLString mName;
-	mutable LLString mDisplayName;
+	std::string mName;
+	mutable std::string mDisplayName;
 	LLPanelInventory* mPanel;
 	U32 mFlags;
 
@@ -105,12 +105,12 @@ public:
 	LLTaskInvFVBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name,
+		const std::string& name,
 		U32 flags=0);
 	virtual ~LLTaskInvFVBridge( void ) {}
 
 	virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; }
-	virtual LLString getLabelSuffix() const { return LLString::null; }
+	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
 
 	static LLTaskInvFVBridge* createObjectBridge(LLPanelInventory* panel,
 												 LLInventoryObject* object);
@@ -120,17 +120,17 @@ public:
 	static void commitBuyItem(S32 option, void* data);
 
 	// LLFolderViewEventListener functionality
-	virtual const LLString& getName() const;
-	virtual const LLString& getDisplayName() const;
+	virtual const std::string& getName() const;
+	virtual const std::string& getDisplayName() const;
 	virtual PermissionMask getPermissionMask() const { return PERM_NONE; }
 	virtual const LLUUID& getUUID() const { return mUUID; }
-	virtual U32 getCreationDate() const;
+	virtual time_t getCreationDate() const;
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
 	virtual void previewItem();
 	virtual void selectItem() {}
 	virtual BOOL isItemRenameable() const;
-	virtual BOOL renameItem(const LLString& new_name);
+	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL isItemMovable();
 	virtual BOOL isItemRemovable();
 	virtual BOOL removeItem();
@@ -142,7 +142,7 @@ public:
 	virtual BOOL isClipboardPasteable() const;
 	virtual void pasteFromClipboard();
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual BOOL isUpToDate() const { return TRUE; }
 	virtual BOOL hasChildren() const { return FALSE; }
 	virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; }
@@ -158,7 +158,7 @@ public:
 LLTaskInvFVBridge::LLTaskInvFVBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name,
+	const std::string& name,
 	U32 flags):
 	mUUID(uuid),
 	mName(name),
@@ -219,7 +219,7 @@ void LLTaskInvFVBridge::buyItem()
 
 	const LLSaleInfo& sale_info = item->getSaleInfo();
 	const LLPermissions& perm = item->getPermissions();
-	const LLString owner_name; // no owner name currently... FIXME?
+	const std::string owner_name; // no owner name currently... FIXME?
 
 	LLViewerObject* obj;
 	if( ( obj = gObjectList.findObject( mPanel->getTaskUUID() ) ) && obj->isAttachment() )
@@ -230,7 +230,7 @@ void LLTaskInvFVBridge::buyItem()
 	}
 	else
 	{
-        LLString::format_map_t args;
+        LLStringUtil::format_map_t args;
         args["[PRICE]"] = llformat("%d",sale_info.getSalePrice());
         args["[OWNER]"] = owner_name;
         if (sale_info.getSaleType() != LLSaleInfo::FS_CONTENTS)
@@ -241,7 +241,7 @@ void LLTaskInvFVBridge::buyItem()
         	args["[RESELLPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_TRANSFER) ? "PermYes" : "PermNo");
         }
 
-		LLString alertdesc;
+		std::string alertdesc;
        	switch(sale_info.getSaleType())
        	{
        	  case LLSaleInfo::FS_ORIGINAL:
@@ -299,12 +299,12 @@ void LLTaskInvFVBridge::commitBuyItem(S32 option, void* data)
 	delete inv;
 }
 
-const LLString& LLTaskInvFVBridge::getName() const
+const std::string& LLTaskInvFVBridge::getName() const
 {
 	return mName;
 }
 
-const LLString& LLTaskInvFVBridge::getDisplayName() const
+const std::string& LLTaskInvFVBridge::getDisplayName() const
 {
 	LLInventoryItem* item = findItem();
 	if(item)
@@ -334,7 +334,7 @@ const LLString& LLTaskInvFVBridge::getDisplayName() const
 }
 
 // BUG: No creation dates for task inventory
-U32 LLTaskInvFVBridge::getCreationDate() const
+time_t LLTaskInvFVBridge::getCreationDate() const
 {
 	return 0;
 }
@@ -378,7 +378,7 @@ BOOL LLTaskInvFVBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLTaskInvFVBridge::renameItem(const LLString& new_name)
+BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
 {
 	LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
 	if(object)
@@ -595,7 +595,7 @@ BOOL LLTaskInvFVBridge::dragOrDrop(MASK mask, BOOL drop,
 //}
 
 // virtual
-void LLTaskInvFVBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLTaskInvFVBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if (action == "task_buy")
 	{
@@ -631,16 +631,17 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
 	LLInventoryItem* item = findItem();
 	if(!item) return;
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 
+	 // *TODO: Translate
 	if(gAgent.allowOperation(PERM_OWNER, item->getPermissions(),
 							 GP_OBJECT_MANIPULATE)
 	   && item->getSaleInfo().isForSale())
 	{
-		items.push_back("Task Buy");
+		items.push_back(std::string("Task Buy"));
 
-		LLString label("Buy");
+		std::string label("Buy");
 		// Check the price of the item.
 		S32 price = getPrice();
 		if (-1 == price)
@@ -658,7 +659,7 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		LLView::child_list_t::const_iterator itor;
 		for (itor = list->begin(); itor != list->end(); ++itor)
 		{
-			LLString name = (*itor)->getName();
+			std::string name = (*itor)->getName();
 			LLMenuItemCallGL* menu_itemp = dynamic_cast<LLMenuItemCallGL*>(*itor);
 			if (name == "Task Buy" && menu_itemp)
 			{
@@ -668,20 +669,20 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	}
 	else
 	{
-		items.push_back("Task Open");
+		items.push_back(std::string("Task Open"));
 		if (!isItemCopyable())
 		{
-			disabled_items.push_back("Task Open");
+			disabled_items.push_back(std::string("Task Open"));
 		}
 	}
-	items.push_back("Task Properties");
+	items.push_back(std::string("Task Properties"));
 	if(isItemRenameable())
 	{
-		items.push_back("Task Rename");
+		items.push_back(std::string("Task Rename"));
 	}
 	if(isItemRemovable())
 	{
-		items.push_back("Task Remove");
+		items.push_back(std::string("Task Remove"));
 	}
 
 	hideContextEntries(menu, items, disabled_items);
@@ -698,12 +699,12 @@ public:
 	LLTaskCategoryBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
-	virtual const LLString& getDisplayName() const { return getName(); }
+	virtual const std::string& getDisplayName() const { return getName(); }
 	virtual BOOL isItemRenameable() const;
-	virtual BOOL renameItem(const LLString& new_name);
+	virtual BOOL renameItem(const std::string& new_name);
 	virtual BOOL isItemRemovable();
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual BOOL hasChildren() const;
@@ -716,7 +717,7 @@ public:
 LLTaskCategoryBridge::LLTaskCategoryBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -731,7 +732,7 @@ BOOL LLTaskCategoryBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLTaskCategoryBridge::renameItem(const LLString& new_name)
+BOOL LLTaskCategoryBridge::renameItem(const std::string& new_name)
 {
 	return FALSE;
 }
@@ -743,9 +744,9 @@ BOOL LLTaskCategoryBridge::isItemRemovable()
 
 void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
-	items.push_back("Task Open");
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
+	items.push_back(std::string("Task Open"));  // *TODO: Translate
 	hideContextEntries(menu, items, disabled_items);
 }
 
@@ -871,7 +872,7 @@ public:
 	LLTaskTextureBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name,
+		const std::string& name,
 		LLInventoryType::EType it);
 
 	virtual LLUIImagePtr getIcon() const;
@@ -883,7 +884,7 @@ protected:
 LLTaskTextureBridge::LLTaskTextureBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name,
+	const std::string& name,
 	LLInventoryType::EType it) :
 	LLTaskInvFVBridge(panel, uuid, name),
 	mInventoryType(it)
@@ -925,11 +926,11 @@ public:
 	LLTaskSoundBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
-	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
+	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	static void openSoundPreview(void* data);
 };
@@ -937,7 +938,7 @@ public:
 LLTaskSoundBridge::LLTaskSoundBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -973,7 +974,7 @@ void LLTaskSoundBridge::openSoundPreview(void* data)
 }
 
 // virtual
-void LLTaskSoundBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLString action)
+void LLTaskSoundBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
 {
 	if (action == "task_play")
 	{
@@ -990,15 +991,16 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
 	LLInventoryItem* item = findItem();
 	if(!item) return;
-	std::vector<LLString> items;
-	std::vector<LLString> disabled_items;
+	std::vector<std::string> items;
+	std::vector<std::string> disabled_items;
 
+	// *TODO: Translate
 	if(item->getPermissions().getOwner() != gAgent.getID()
 	   && item->getSaleInfo().isForSale())
 	{
-		items.push_back("Task Buy");
+		items.push_back(std::string("Task Buy"));
 
-		LLString label("Buy");
+		std::string label("Buy");
 		// Check the price of the item.
 		S32 price = getPrice();
 		if (-1 == price)
@@ -1016,7 +1018,7 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		LLView::child_list_t::const_iterator itor;
 		for (itor = list->begin(); itor != list->end(); ++itor)
 		{
-			LLString name = (*itor)->getName();
+			std::string name = (*itor)->getName();
 			LLMenuItemCallGL* menu_itemp = dynamic_cast<LLMenuItemCallGL*>(*itor);
 			if (name == "Task Buy" && menu_itemp)
 			{
@@ -1026,23 +1028,23 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	}
 	else
 	{
-		items.push_back("Task Open");
+		items.push_back(std::string("Task Open")); 
 		if (!isItemCopyable())
 		{
-			disabled_items.push_back("Task Open");
+			disabled_items.push_back(std::string("Task Open"));
 		}
 	}
-	items.push_back("Task Properties");
+	items.push_back(std::string("Task Properties"));
 	if(isItemRenameable())
 	{
-		items.push_back("Task Rename");
+		items.push_back(std::string("Task Rename"));
 	}
 	if(isItemRemovable())
 	{
-		items.push_back("Task Remove");
+		items.push_back(std::string("Task Remove"));
 	}
 
-	items.push_back("Task Play");
+	items.push_back(std::string("Task Play"));
 	/*menu.appendSeparator();
 	menu.append(new LLMenuItemCallGL("Play",
 									 &LLTaskSoundBridge::playSound,
@@ -1062,7 +1064,7 @@ public:
 	LLTaskLandmarkBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 };
@@ -1070,7 +1072,7 @@ public:
 LLTaskLandmarkBridge::LLTaskLandmarkBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -1091,17 +1093,17 @@ public:
 	LLTaskCallingCardBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual BOOL isItemRenameable() const;
-	virtual BOOL renameItem(const LLString& new_name);
+	virtual BOOL renameItem(const std::string& new_name);
 };
 
 LLTaskCallingCardBridge::LLTaskCallingCardBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -1116,7 +1118,7 @@ BOOL LLTaskCallingCardBridge::isItemRenameable() const
 	return FALSE;
 }
 
-BOOL LLTaskCallingCardBridge::renameItem(const LLString& new_name)
+BOOL LLTaskCallingCardBridge::renameItem(const std::string& new_name)
 {
 	return FALSE;
 }
@@ -1132,7 +1134,7 @@ public:
 	LLTaskScriptBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 	//static BOOL enableIfCopyable( void* userdata );
@@ -1141,7 +1143,7 @@ public:
 LLTaskScriptBridge::LLTaskScriptBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -1158,7 +1160,7 @@ public:
 	LLTaskLSLBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual void openItem();
 	virtual BOOL removeItem();
@@ -1170,7 +1172,7 @@ public:
 LLTaskLSLBridge::LLTaskLSLBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskScriptBridge(panel, uuid, name)
 {
 }
@@ -1189,7 +1191,7 @@ void LLTaskLSLBridge::openItem()
 	}
 	if(object->permModify() || gAgent.isGodlike())
 	{
-		LLString title("Script: ");
+		std::string title("Script: ");
 		LLInventoryItem* item = findItem();
 		if (item)
 		{
@@ -1232,7 +1234,7 @@ public:
 	LLTaskObjectBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 };
@@ -1240,7 +1242,7 @@ public:
 LLTaskObjectBridge::LLTaskObjectBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -1266,7 +1268,7 @@ public:
 	LLTaskNotecardBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -1276,7 +1278,7 @@ public:
 LLTaskNotecardBridge::LLTaskNotecardBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -1332,7 +1334,7 @@ public:
 	LLTaskGestureBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -1342,7 +1344,7 @@ public:
 LLTaskGestureBridge::LLTaskGestureBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -1365,7 +1367,7 @@ void LLTaskGestureBridge::openItem()
 	}
 
 	// TODO: save rectangle
-	LLString title = getName();
+	std::string title = getName();
 	LLUUID item_id = mUUID;
 	LLUUID object_id = mPanel->getTaskUUID();
 	LLPreviewGesture* preview = LLPreviewGesture::show(title, item_id, object_id);
@@ -1392,7 +1394,7 @@ public:
 	LLTaskAnimationBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name);
+		const std::string& name);
 
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
@@ -1402,7 +1404,7 @@ public:
 LLTaskAnimationBridge::LLTaskAnimationBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name) :
+	const std::string& name) :
 	LLTaskInvFVBridge(panel, uuid, name)
 {
 }
@@ -1428,7 +1430,7 @@ void LLTaskAnimationBridge::openItem()
 	if(object->permModify() || gAgent.isGodlike())
 	{
 		// TODO: save rectangle
-		LLString title = getName();
+		std::string title = getName();
 		LLUUID item_id = mUUID;
 		LLUUID object_id = mPanel->getTaskUUID();
 
@@ -1470,7 +1472,7 @@ public:
 	LLTaskWearableBridge(
 		LLPanelInventory* panel,
 		const LLUUID& uuid,
-		const LLString& name,
+		const std::string& name,
 		LLAssetType::EType asset_type,
 		U32 flags);
 
@@ -1483,7 +1485,7 @@ protected:
 LLTaskWearableBridge::LLTaskWearableBridge(
 	LLPanelInventory* panel,
 	const LLUUID& uuid,
-	const LLString& name,
+	const std::string& name,
 	LLAssetType::EType asset_type,
 	U32 flags) :
 	LLTaskInvFVBridge(panel, uuid, name, flags),
@@ -1591,7 +1593,7 @@ LLTaskInvFVBridge* LLTaskInvFVBridge::createObjectBridge(LLPanelInventory* panel
 ///----------------------------------------------------------------------------
 
 // Default constructor
-LLPanelInventory::LLPanelInventory(const LLString& name, const LLRect& rect) :
+LLPanelInventory::LLPanelInventory(const std::string& name, const LLRect& rect) :
 	LLPanel(name, rect),
 	mScroller(NULL),
 	mFolders(NULL),
@@ -1642,13 +1644,12 @@ void LLPanelInventory::reset()
 	setBorderVisible(FALSE);
 
 	LLRect dummy_rect(0, 1, 1, 0);
-	mFolders = new LLFolderView("task inventory", NULL, dummy_rect, getTaskUUID(), this);
+	mFolders = new LLFolderView(std::string("task inventory"), NULL, dummy_rect, getTaskUUID(), this);
 	// this ensures that we never say "searching..." or "no items found"
 	mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS);
 
 	LLRect scroller_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-	mScroller = new LLScrollableContainerView(
-		"task inventory scroller", scroller_rect, mFolders );
+	mScroller = new LLScrollableContainerView(std::string("task inventory scroller"), scroller_rect, mFolders );
 	mScroller->setFollowsAll();
 	addChild(mScroller);
 
@@ -1928,9 +1929,10 @@ void LLPanelInventory::draw()
 
 	if(mIsInventoryEmpty)
 	{
+		// *TODO: Translate
 		if((LLUUID::null != mTaskUUID) && (!mHaveInventory))
 		{
-			LLFontGL::sSansSerif->renderUTF8("Loading contents...", 0,
+			LLFontGL::sSansSerif->renderUTF8(std::string("Loading contents..."), 0,
 										 (S32)(getRect().getWidth() * 0.5f),
 										 10,
 										 LLColor4( 1, 1, 1, 1 ),
@@ -1939,7 +1941,7 @@ void LLPanelInventory::draw()
 		}
 		else if(mHaveInventory)
 		{
-			LLFontGL::sSansSerif->renderUTF8("No contents", 0,
+			LLFontGL::sSansSerif->renderUTF8(std::string("No contents"), 0,
 										 (S32)(getRect().getWidth() * 0.5f),
 										 10,
 										 LLColor4( 1, 1, 1, 1 ),
@@ -1956,7 +1958,7 @@ void LLPanelInventory::deleteAllChildren()
 	LLView::deleteAllChildren();
 }
 
-BOOL LLPanelInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, LLString& tooltip_msg)
+BOOL LLPanelInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)
 {
 	if (mFolders && mHaveInventory)
 	{
diff --git a/linden/indra/newview/llpanelinventory.h b/linden/indra/newview/llpanelinventory.h
index 9315ccd..d848300 100644
--- a/linden/indra/newview/llpanelinventory.h
+++ b/linden/indra/newview/llpanelinventory.h
@@ -60,8 +60,8 @@ class LLFolderViewEventListener;
 // Utility function to hide all entries except those in the list
 class LLMenuGL;
 void hideContextEntries(LLMenuGL& menu, 
-		const std::vector<LLString> &entries_to_show, 
-		const std::vector<LLString> &disabled_entries);
+		const std::vector<std::string> &entries_to_show, 
+		const std::vector<std::string> &disabled_entries);
 
 class LLPanelInventory : public LLPanel, public LLVOInventoryListener
 {
@@ -89,7 +89,7 @@ protected:
 	void clearContents();
 
 public:
-	LLPanelInventory(const LLString& name, const LLRect& rect);
+	LLPanelInventory(const std::string& name, const LLRect& rect);
 	virtual ~LLPanelInventory();
 
 	void refresh();
@@ -101,7 +101,7 @@ public:
 
 	virtual void draw();
 	virtual void deleteAllChildren();
-	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, LLString& tooltip_msg);
+	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
 	
 	static void idle(void* user_data);
 };
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index be05703..c1e9ab3 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -120,8 +120,8 @@ void LLPanelLandInfo::refresh()
 		childSetVisible("label_area_price",false);
 		childSetVisible("label_area",false);
 
-		//mTextPrice->setText(LLString::null);
-		childSetText("textbox price",LLString::null);
+		//mTextPrice->setText(LLStringUtil::null);
+		childSetText("textbox price",LLStringUtil::null);
 
 		childSetEnabled("button buy land",FALSE);
 		childSetEnabled("button abandon land",FALSE);
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index 6810c0a..e4cdfaf 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -66,7 +66,7 @@ enum
 //---------------------------------------------------------------------------
 
 LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
-:	LLPanel("land_media_panel"), mParcel(parcel)
+:	LLPanel(std::string("land_media_panel")), mParcel(parcel)
 {
 }
 
@@ -150,9 +150,9 @@ void LLPanelLandMedia::refresh()
 		mCheckSoundLocal->set( parcel->getSoundLocal() );
 		mCheckSoundLocal->setEnabled( can_change_media );
 
-		if(parcel->getVoiceEnabled())
+		if(parcel->getParcelFlagAllowVoice())
 		{
-			if(parcel->getVoiceUseEstateChannel())
+			if(parcel->getParcelFlagUseEstateVoiceChannel())
 				mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatEstate);
 			else
 				mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatPrivate);
@@ -170,7 +170,7 @@ void LLPanelLandMedia::refresh()
 		mMediaURLEdit->setText(parcel->getMediaURL());
 		mMediaURLEdit->setEnabled( FALSE );
 
-		mMediaDescEdit->setText(LLString(parcel->getMediaDesc()));
+		mMediaDescEdit->setText(parcel->getMediaDesc());
 		mMediaDescEdit->setEnabled( can_change_media );
 
 		std::string mime_type = parcel->getMediaType();
@@ -267,12 +267,12 @@ void LLPanelLandMedia::refresh()
 
 void LLPanelLandMedia::populateMIMECombo()
 {
-	LLString default_mime_type = "none/none";
-	LLString default_label;
+	std::string default_mime_type = "none/none";
+	std::string default_label;
 	LLMIMETypes::mime_widget_set_map_t::const_iterator it;
 	for (it = LLMIMETypes::sWidgetMap.begin(); it != LLMIMETypes::sWidgetMap.end(); ++it)
 	{
-		const LLString& mime_type = it->first;
+		const std::string& mime_type = it->first;
 		const LLMIMETypes::LLMIMEWidgetSet& info = it->second;
 		if (info.mDefaultMimeType == default_mime_type)
 		{
@@ -289,24 +289,24 @@ void LLPanelLandMedia::populateMIMECombo()
 	mMediaTypeCombo->add( default_label, default_mime_type, ADD_BOTTOM );
 }
 
-void LLPanelLandMedia::setMediaType(const LLString& mime_type)
+void LLPanelLandMedia::setMediaType(const std::string& mime_type)
 {
 	LLParcel *parcel = mParcel->getParcel();
 	if(parcel)
-		parcel->setMediaType(mime_type.c_str());
+		parcel->setMediaType(mime_type);
 
-	LLString media_key = LLMIMETypes::widgetType(mime_type);
+	std::string media_key = LLMIMETypes::widgetType(mime_type);
 	mMediaTypeCombo->setValue(media_key);
 	childSetText("mime_type", mime_type);
 }
 
-void LLPanelLandMedia::setMediaURL(const LLString& media_url)
+void LLPanelLandMedia::setMediaURL(const std::string& media_url)
 {
 	mMediaURLEdit->setText(media_url);
 	mMediaURLEdit->onCommit();
 }
 
-LLString LLPanelLandMedia::getMediaURL()
+std::string LLPanelLandMedia::getMediaURL()
 {
 	return mMediaURLEdit->getText();
 }
@@ -374,17 +374,17 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	}
 
 	// Remove leading/trailing whitespace (common when copying/pasting)
-	LLString::trim(music_url);
-	LLString::trim(media_url);
+	LLStringUtil::trim(music_url);
+	LLStringUtil::trim(media_url);
 
 	// Push data into current parcel
 	parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);
 	parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
 	parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
-	parcel->setMusicURL(music_url.c_str());
-	parcel->setMediaURL(media_url.c_str());
-	parcel->setMediaType(mime_type.c_str());
-	parcel->setMediaDesc(media_desc.c_str());
+	parcel->setMusicURL(music_url);
+	parcel->setMediaURL(media_url);
+	parcel->setMediaType(mime_type);
+	parcel->setMediaDesc(media_desc);
 	parcel->setMediaWidth(media_width);
 	parcel->setMediaHeight(media_height);
 	parcel->setMediaID(media_id);
diff --git a/linden/indra/newview/llpanellandmedia.h b/linden/indra/newview/llpanellandmedia.h
index b2b0abe..7320f56 100644
--- a/linden/indra/newview/llpanellandmedia.h
+++ b/linden/indra/newview/llpanellandmedia.h
@@ -46,9 +46,9 @@ public:
 	/*virtual*/ ~LLPanelLandMedia();
 	/*virtual*/ BOOL postBuild();
 	void refresh();
-	void setMediaType(const LLString& media_type);
-	void setMediaURL(const LLString& media_type);
-	LLString getMediaURL();
+	void setMediaType(const std::string& media_type);
+	void setMediaURL(const std::string& media_type);
+	std::string getMediaURL();
 
 private:
 	void populateMIMECombo();
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index d7fecfd..ffee058 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -79,7 +79,7 @@
 
 #define USE_VIEWER_AUTH 0
 
-LLString load_password_from_disk(void);
+std::string load_password_from_disk(void);
 void save_password_to_disk(const char* hashed_password);
 
 const S32 BLACK_BORDER_HEIGHT = 160;
@@ -146,6 +146,10 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 	{
 		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;
@@ -204,7 +208,7 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 		LLViewerLogin::getInstance()->setGridChoice(grid_choice);
 	}
 
-	LLString startLocation = queryMap["location"].asString();
+	std::string startLocation = queryMap["location"].asString();
 
 	if (startLocation == "specify")
 	{
@@ -213,12 +217,12 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 	else if (startLocation == "home")
 	{
 		gSavedSettings.setBOOL("LoginLastLocation", FALSE);
-		LLURLSimString::setString("");
+		LLURLSimString::setString(LLStringUtil::null);
 	}
 	else if (startLocation == "last")
 	{
 		gSavedSettings.setBOOL("LoginLastLocation", TRUE);
-		LLURLSimString::setString("");
+		LLURLSimString::setString(LLStringUtil::null);
 	}
 }
 
@@ -234,7 +238,7 @@ bool LLLoginHandler::handle(const LLSD& tokens,
 		return true;
 	}
 	
-	LLString password = queryMap["password"].asString();
+	std::string password = queryMap["password"].asString();
 
 	if (!password.empty())
 	{
@@ -245,7 +249,7 @@ bool LLLoginHandler::handle(const LLSD& tokens,
 			LLMD5 pass((unsigned char*)password.c_str());
 			char md5pass[33];		/* Flawfinder: ignore */
 			pass.hex_digest(md5pass);
-			password = md5pass;
+			password = ll_safe_string(md5pass, 32);
 			save_password_to_disk(password.c_str());
 		}
 	}
@@ -324,7 +328,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 						 BOOL show_server,
 						 void (*callback)(S32 option, void* user_data),
 						 void *cb_data)
-:	LLPanel("panel_login", LLRect(0,600,800,0), FALSE),		// not bordered
+:	LLPanel(std::string("panel_login"), LLRect(0,600,800,0), FALSE),		// not bordered
 	mLogoImage(),
 	mCallback(callback),
 	mCallbackData(cb_data),
@@ -371,7 +375,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	// change z sort of clickable text to be behind buttons
 	sendChildToBack(getChildView("channel_text"));
-	sendChildToBack(getChildView("version_text"));
 	sendChildToBack(getChildView("forgot_password_text"));
 
 	LLLineEditor* edit = getChild<LLLineEditor>("password_edit");
@@ -386,7 +389,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	// 2 - "<Type region name>"
 
 	BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
-	LLString sim_string = LLURLSimString::sInstance.mSimString;
+	std::string sim_string = LLURLSimString::sInstance.mSimString;
 	if (!sim_string.empty())
 	{
 		// Replace "<Type region name>" with this region name
@@ -414,25 +417,25 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	setDefaultBtn("connect_btn");
 
-	childSetAction("quit_btn", onClickQuit, this);
+	// childSetAction("quit_btn", onClickQuit, this);
 
-	LLTextBox* version_text = getChild<LLTextBox>("version_text");
-	LLString version = llformat("%d.%d.%d (%d)",
+	std::string channel = gSavedSettings.getString("VersionChannelName");
+	std::string version = llformat("%d.%d.%d (%d)",
 		LL_VERSION_MAJOR,
 		LL_VERSION_MINOR,
 		LL_VERSION_PATCH,
 		LL_VIEWER_BUILD );
-	version_text->setText(version);
-	version_text->setClickedCallback(onClickVersion);
-	version_text->setCallbackUserData(this);
-
 	LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-	channel_text->setText(gSavedSettings.getString("VersionChannelName"));
+	channel_text->setTextArg("[CHANNEL]", channel);
+	channel_text->setTextArg("[VERSION]", version);
 	channel_text->setClickedCallback(onClickVersion);
 	channel_text->setCallbackUserData(this);
 	
 	LLTextBox* forgot_password_text = getChild<LLTextBox>("forgot_password_text");
 	forgot_password_text->setClickedCallback(onClickForgotPassword);
+
+	LLTextBox* create_new_account_text = getChild<LLTextBox>("create_new_account_text");
+	create_new_account_text->setClickedCallback(onClickNewAccount);
 #endif    
 	
 	// get the web browser control
@@ -746,7 +749,7 @@ void LLPanelLogin::setFields(const std::string& firstname, const std::string& la
 
 
 // static
-void LLPanelLogin::addServer(const char *server, S32 domain_name)
+void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
 {
 	if (!sInstance)
 	{
@@ -760,7 +763,7 @@ void LLPanelLogin::addServer(const char *server, S32 domain_name)
 }
 
 // static
-void LLPanelLogin::getFields(LLString &firstname, LLString &lastname, LLString &password,
+void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password,
 							BOOL &remember)
 {
 	if (!sInstance)
@@ -770,10 +773,10 @@ void LLPanelLogin::getFields(LLString &firstname, LLString &lastname, LLString &
 	}
 
 	firstname = sInstance->childGetText("first_name_edit");
-	LLString::trim(firstname);
+	LLStringUtil::trim(firstname);
 
 	lastname = sInstance->childGetText("last_name_edit");
-	LLString::trim(lastname);
+	LLStringUtil::trim(lastname);
 
 	password = sInstance->mMungedPassword;
 	remember = sInstance->childGetValue("remember_check");
@@ -796,7 +799,7 @@ BOOL LLPanelLogin::isGridComboDirty()
 }
 
 // static
-void LLPanelLogin::getLocation(LLString &location)
+void LLPanelLogin::getLocation(std::string &location)
 {
 	if (!sInstance)
 	{
@@ -898,7 +901,7 @@ void LLPanelLogin::loadLoginPage()
 	}
 
 	// Language
-	LLString language(gSavedSettings.getString("Language"));
+	std::string language(gSavedSettings.getString("Language"));
 	if(language == "default")
 	{
 		language = gSavedSettings.getString("SystemLanguage");
@@ -912,7 +915,7 @@ void LLPanelLogin::loadLoginPage()
 	}
 
 	// Channel and Version
-	LLString version = llformat("%d.%d.%d (%d)",
+	std::string version = llformat("%d.%d.%d (%d)",
 						LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD);
 
 	char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0);
@@ -936,9 +939,9 @@ void LLPanelLogin::loadLoginPage()
 #if USE_VIEWER_AUTH
 	LLURLSimString::sInstance.parse();
 
-	LLString location;
-	LLString region;
-	LLString password;
+	std::string location;
+	std::string region;
+	std::string password;
 	
 	if (LLURLSimString::parse())
 	{
@@ -961,7 +964,7 @@ void LLPanelLogin::loadLoginPage()
 		}
 	}
 	
-	LLString firstname, lastname;
+	std::string firstname, lastname;
 
     if(gSavedSettings.getLLSD("UserLoginInfo").size() == 3)
     {
@@ -1054,8 +1057,8 @@ void LLPanelLogin::onClickConnect(void *)
 		// JC - Make sure the fields all get committed.
 		sInstance->setFocus(FALSE);
 
-		LLString first = sInstance->childGetText("first_name_edit");
-		LLString last  = sInstance->childGetText("last_name_edit");
+		std::string first = sInstance->childGetText("first_name_edit");
+		std::string last  = sInstance->childGetText("last_name_edit");
 		if (!first.empty() && !last.empty())
 		{
 			// has both first and last name typed
@@ -1063,9 +1066,15 @@ void LLPanelLogin::onClickConnect(void *)
 		}
 		else
 		{
-			// empty first or last name
-			// same as clicking new account
-			onClickNewAccount(NULL);
+			if (gHideLinks)
+			{
+				gViewerWindow->alertXml("MustHaveAccountToLogInNoLinks");
+			}
+			else
+			{
+				gViewerWindow->alertXml("MustHaveAccountToLogIn",
+										LLPanelLogin::newAccountAlertCallback);
+			}
 		}
 	}
 }
@@ -1077,7 +1086,7 @@ void LLPanelLogin::newAccountAlertCallback(S32 option, void*)
 	if (0 == option)
 	{
 		llinfos << "Going to account creation URL" << llendl;
-		LLWeb::loadURL( CREATE_ACCOUNT_URL );
+		LLWeb::loadURLExternal( CREATE_ACCOUNT_URL );
 	}
 	else
 	{
@@ -1089,18 +1098,12 @@ void LLPanelLogin::newAccountAlertCallback(S32 option, void*)
 // static
 void LLPanelLogin::onClickNewAccount(void*)
 {
-	if (gHideLinks)
-	{
-		gViewerWindow->alertXml("MustHaveAccountToLogInNoLinks");
-	}
-	else
-	{
-		gViewerWindow->alertXml("MustHaveAccountToLogIn",
-								LLPanelLogin::newAccountAlertCallback);
-	}
+	LLWeb::loadURLExternal( CREATE_ACCOUNT_URL );
 }
 
 
+// *NOTE: This function is dead as of 2008 August.  I left it here in case
+// we suddenly decide to put the Quit button back. JC
 // static
 void LLPanelLogin::onClickQuit(void*)
 {
@@ -1121,15 +1124,15 @@ void LLPanelLogin::onClickVersion(void*)
 	LLFloaterAbout::show(NULL);
 }
 
+//static
 void LLPanelLogin::onClickForgotPassword(void*)
 {
 	if (sInstance )
 	{
-		LLWeb::loadURL(sInstance->getString( "forgot_password_url" ));
+		LLWeb::loadURLExternal(sInstance->getString( "forgot_password_url" ));
 	}
 }
 
-
 // static
 void LLPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
 {
@@ -1149,7 +1152,7 @@ void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
 
 	// The user twiddled with the grid choice ui.
 	// apply the selection to the grid setting.
-	LLString grid_label;
+	std::string grid_label;
 	S32 grid_index;
 
 	LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index b15e5e7..539997b 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -58,8 +58,8 @@ class LLLoginHandler : public LLCommandHandler
 	void parse(const LLSD& queryMap);
 
 	LLUUID mWebLoginKey;
-	LLString mFirstName;
-	LLString mLastName;
+	std::string mFirstName;
+	std::string mLastName;
 };
 
 extern LLLoginHandler gLoginHandler;
@@ -86,14 +86,14 @@ public:
 	static void setFields(const std::string& firstname, const std::string& lastname, 
 		const std::string& password, BOOL remember);
 
-	static void addServer(const char *server, S32 domain_name);
+	static void addServer(const std::string& server, S32 domain_name);
 	static void refreshLocation( bool force_visible );
 
-	static void getFields(LLString &firstname, LLString &lastname,
-		LLString &password, BOOL &remember);
+	static void getFields(std::string& firstname, std::string& lastname,
+						  std::string& password, BOOL& remember);
 
 	static BOOL isGridComboDirty();
-	static void getLocation(LLString &location);
+	static void getLocation(std::string &location);
 
 	static void close();
 
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index fb33edf..cc3579e 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -52,7 +52,7 @@ LLPopupData sPopupData;
 
 //-----------------------------------------------------------------------------
 LLPanelMsgs::LLPanelMsgs() : 
-	LLPanel("Messages Panel"),
+	LLPanel(std::string("Messages Panel")),
 	mDisabledPopups( NULL ),
 	mEnabledPopups( NULL )
 {
@@ -199,10 +199,10 @@ void LLPanelMsgs::onClickEnablePopup(void* user_data)
 	std::vector<LLScrollListItem*>::iterator itor;
 	for (itor = items.begin(); itor != items.end(); ++itor)
 	{
-		LLAlertDialog::template_map_t::iterator found_alert = LLAlertDialog::sAlertTemplates.find(*(LLString*)((*itor)->getUserdata()));
+		LLAlertDialog::template_map_t::iterator found_alert = LLAlertDialog::sAlertTemplates.find(*(std::string*)((*itor)->getUserdata()));
 		if (found_alert != LLAlertDialog::sAlertTemplates.end())
 		{
-			LLAlertDialogTemplate* alert_temp = LLAlertDialog::sAlertTemplates[*(LLString*)((*itor)->getUserdata())];
+			LLAlertDialogTemplate* alert_temp = LLAlertDialog::sAlertTemplates[*(std::string*)((*itor)->getUserdata())];
 			gSavedSettings.setWarning(alert_temp->mIgnoreLabel, TRUE);
 		}
 	}
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index a900d0e..e324c3b 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -63,7 +63,7 @@ LLPanelNetwork::LLPanelNetwork()
 
 BOOL LLPanelNetwork::postBuild()
 {
-	LLString cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
+	std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
 	childSetText("cache_location", cache_location);
 		
 	childSetAction("clear_cache", onClickClearCache, this);
@@ -121,8 +121,8 @@ void LLPanelNetwork::onClickSetCache(void* user_data)
 {
 	LLPanelNetwork* self = (LLPanelNetwork*)user_data;
 
-	LLString cur_name(gSavedSettings.getString("CacheLocation"));
-	LLString proposed_name(cur_name);
+	std::string cur_name(gSavedSettings.getString("CacheLocation"));
+	std::string proposed_name(cur_name);
 	
 	LLDirPicker& picker = LLDirPicker::instance();
 	if (! picker.getDir(&proposed_name ) )
@@ -130,7 +130,7 @@ void LLPanelNetwork::onClickSetCache(void* user_data)
 		return; //Canceled!
 	}
 
-	LLString dir_name = picker.getDirName();
+	std::string dir_name = picker.getDirName();
 	if (!dir_name.empty() && dir_name != cur_name)
 	{
 		self->childSetText("cache_location", dir_name);
@@ -139,7 +139,7 @@ void LLPanelNetwork::onClickSetCache(void* user_data)
 	}
 	else
 	{
-		LLString cache_location = gDirUtilp->getCacheDir();
+		std::string cache_location = gDirUtilp->getCacheDir();
 		self->childSetText("cache_location", cache_location);
 	}
 }
@@ -153,7 +153,7 @@ void LLPanelNetwork::onClickResetCache(void* user_data)
 		gSavedSettings.setString("NewCacheLocation", "");
 		gViewerWindow->alertXml("CacheWillBeMoved");
 	}
-	LLString cache_location = gDirUtilp->getCacheDir(true);
+	std::string cache_location = gDirUtilp->getCacheDir(true);
 	self->childSetText("cache_location", cache_location);
 }
 
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 7024691..9022c14 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -99,7 +99,7 @@ enum {
 };
 
 //*TODO:translate (depricated, so very low priority)
-static const LLString LEGACY_FULLBRIGHT_DESC("Fullbright (Legacy)");
+static const std::string LEGACY_FULLBRIGHT_DESC("Fullbright (Legacy)");
 
 BOOL	LLPanelObject::postBuild()
 {
@@ -289,9 +289,12 @@ BOOL	LLPanelObject::postBuild()
 	}
 
 	mLabelSculptType = getChild<LLTextBox>("label sculpt type");
-	mCtrlSculptType = getChild<LLComboBox>( "sculpt type control");
+	mCtrlSculptType = getChild<LLComboBox>("sculpt type control");
 	childSetCommitCallback("sculpt type control", onCommitSculptType, this);
-
+	mCtrlSculptMirror = getChild<LLCheckBoxCtrl>("sculpt mirror control");
+	childSetCommitCallback("sculpt mirror control", onCommitSculptType, this);
+	mCtrlSculptInvert = getChild<LLCheckBoxCtrl>("sculpt invert control");
+	childSetCommitCallback("sculpt invert control", onCommitSculptType, this);
 	
 	// Start with everyone disabled
 	clearCtrls();
@@ -429,7 +432,7 @@ void LLPanelObject::getState( )
 
 	BOOL owners_identical;
 	LLUUID owner_id;
-	LLString owner_name;
+	std::string owner_name;
 	owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
 	// BUG? Check for all objects being editable?
@@ -538,7 +541,7 @@ void LLPanelObject::getState( )
 				mComboMaterial->remove(LEGACY_FULLBRIGHT_DESC);
 			}
 			// *TODO:Translate
-			mComboMaterial->setSimple(LLString(LLMaterialTable::basic.getName(material_code)));
+			mComboMaterial->setSimple(std::string(LLMaterialTable::basic.getName(material_code)));
 		}
 	}
 	else
@@ -1057,6 +1060,8 @@ void LLPanelObject::getState( )
 	mCtrlSculptTexture->setVisible(sculpt_texture_visible);
 	mLabelSculptType->setVisible(sculpt_texture_visible);
 	mCtrlSculptType->setVisible(sculpt_texture_visible);
+	mCtrlSculptMirror->setVisible(sculpt_texture_visible);
+	mCtrlSculptInvert->setVisible(sculpt_texture_visible);
 
 
 	// sculpt texture
@@ -1086,12 +1091,29 @@ void LLPanelObject::getState( )
 					mTextureCtrl->setImageAssetID(LLUUID::null);
 			}
 
+			U8 sculpt_type = sculpt_params->getSculptType();
+			U8 sculpt_stitching = sculpt_type & LL_SCULPT_TYPE_MASK;
+			BOOL sculpt_invert = sculpt_type & LL_SCULPT_FLAG_INVERT;
+			BOOL sculpt_mirror = sculpt_type & LL_SCULPT_FLAG_MIRROR;
+			
 			if (mCtrlSculptType)
 			{
-				mCtrlSculptType->setCurrentByIndex(sculpt_params->getSculptType());
+				mCtrlSculptType->setCurrentByIndex(sculpt_stitching);
 				mCtrlSculptType->setEnabled(editable);
 			}
 
+			if (mCtrlSculptMirror)
+			{
+				mCtrlSculptMirror->set(sculpt_mirror);
+				mCtrlSculptMirror->setEnabled(editable);
+			}
+
+			if (mCtrlSculptInvert)
+			{
+				mCtrlSculptInvert->set(sculpt_invert);
+				mCtrlSculptInvert->setEnabled(editable);
+			}
+
 			if (mLabelSculptType)
 			{
 				mLabelSculptType->setEnabled(TRUE);
@@ -1191,10 +1213,10 @@ void LLPanelObject::onCommitMaterial( LLUICtrl* ctrl, void* userdata )
 	if (box)
 	{
 		// apply the currently selected material to the object
-		const LLString& material_name = box->getSimple();
+		const std::string& material_name = box->getSimple();
 		if (material_name != LEGACY_FULLBRIGHT_DESC)
 		{
-			U8 material_code = LLMaterialTable::basic.getMCode(material_name.c_str());
+			U8 material_code = LLMaterialTable::basic.getMCode(material_name);
 			LLSelectMgr::getInstance()->selectionSetMaterial(material_code);
 		}
 	}
@@ -1546,7 +1568,7 @@ void LLPanelObject::getVolumeParams(LLVolumeParams& volume_params)
 }
 
 // BUG: Make work with multiple objects
-void LLPanelObject::sendRotation()
+void LLPanelObject::sendRotation(BOOL btn_down)
 {
 	if (mObject.isNull()) return;
 
@@ -1570,16 +1592,34 @@ void LLPanelObject::sendRotation()
 		{
 			rotation = rotation * ~mRootObject->getRotationRegion();
 		}
+		std::vector<LLVector3>& child_positions = mObject->mUnselectedChildrenPositions ;
+		std::vector<LLQuaternion> child_rotations;
+		if (mObject->isRootEdit())
+		{
+			mObject->saveUnselectedChildrenRotation(child_rotations) ;
+			mObject->saveUnselectedChildrenPosition(child_positions) ;			
+		}
 
-		mObject->setRotation(rotation, TRUE );
+		mObject->setRotation(rotation);
+		LLManip::rebuild(mObject) ;
 
-		LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_ROTATION);
+		// for individually selected roots, we need to counterrotate all the children
+		if (mObject->isRootEdit())
+		{			
+			mObject->resetChildrenRotationAndPosition(child_rotations, child_positions) ;			
+		}
+
+		if(!btn_down)
+		{
+			child_positions.clear() ;
+			LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_ROTATION | UPD_POSITION);
+		}
 	}
 }
 
 
 // BUG: Make work with multiple objects
-void LLPanelObject::sendScale()
+void LLPanelObject::sendScale(BOOL btn_down)
 {
 	if (mObject.isNull()) return;
 
@@ -1599,7 +1639,11 @@ void LLPanelObject::sendScale()
 		}
 
 		mObject->setScale(newscale, TRUE);
-		LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_SCALE | UPD_POSITION);
+
+		if(!btn_down)
+		{
+			LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_SCALE | UPD_POSITION);
+		}
 
 		LLSelectMgr::getInstance()->adjustTexturesByScale(TRUE, !dont_stretch_textures);
 //		llinfos << "scale sent" << llendl;
@@ -1611,7 +1655,7 @@ void LLPanelObject::sendScale()
 }
 
 
-void LLPanelObject::sendPosition()
+void LLPanelObject::sendPosition(BOOL btn_down)
 {	
 	if (mObject.isNull()) return;
 
@@ -1654,7 +1698,7 @@ void LLPanelObject::sendPosition()
 		LLVector3d delta = new_pos_global - old_pos_global;
 		// moved more than 1/2 millimeter
 		if (delta.magVec() >= 0.0005f)
-		{
+		{			
 			if (mRootObject != mObject)
 			{
 				newpos = newpos - mRootObject->getPositionRegion();
@@ -1664,8 +1708,21 @@ void LLPanelObject::sendPosition()
 			else
 			{
 				mObject->setPositionEdit(newpos);
+			}			
+			
+			LLManip::rebuild(mObject) ;
+
+			// for individually selected roots, we need to counter-translate all unselected children
+			if (mObject->isRootEdit())
+			{								
+				// only offset by parent's translation
+				mObject->resetChildrenPosition(LLVector3(-delta), TRUE) ;				
+			}
+
+			if(!btn_down)
+			{
+				LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
 			}
-			LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
 
 			LLSelectMgr::getInstance()->updateSelectionCenter();
 		}
@@ -1690,9 +1747,18 @@ void LLPanelObject::sendSculpt()
 	if (mCtrlSculptTexture)
 		sculpt_params.setSculptTexture(mCtrlSculptTexture->getImageAssetID());
 
+	U8 sculpt_type = 0;
+	
 	if (mCtrlSculptType)
-		sculpt_params.setSculptType(mCtrlSculptType->getCurrentIndex());
+		sculpt_type |= mCtrlSculptType->getCurrentIndex();
+
+	if ((mCtrlSculptMirror) && (mCtrlSculptMirror->get()))
+		sculpt_type |= LL_SCULPT_FLAG_MIRROR;
+
+	if ((mCtrlSculptInvert) && (mCtrlSculptInvert->get()))
+		sculpt_type |= LL_SCULPT_FLAG_INVERT;
 	
+	sculpt_params.setSculptType(sculpt_type);
 	mObject->setParameterEntry(LLNetworkData::PARAMS_SCULPT, sculpt_params, TRUE);
 }
 
@@ -1846,21 +1912,24 @@ void LLPanelObject::onCommitLock(LLUICtrl *ctrl, void *data)
 void LLPanelObject::onCommitPosition( LLUICtrl* ctrl, void* userdata )
 {
 	LLPanelObject* self = (LLPanelObject*) userdata;
-	self->sendPosition();
+	BOOL btn_down = ((LLSpinCtrl*)ctrl)->isMouseHeldDown() ;
+	self->sendPosition(btn_down);
 }
 
 // static
 void LLPanelObject::onCommitScale( LLUICtrl* ctrl, void* userdata )
 {
 	LLPanelObject* self = (LLPanelObject*) userdata;
-	self->sendScale();
+	BOOL btn_down = ((LLSpinCtrl*)ctrl)->isMouseHeldDown() ;
+	self->sendScale(btn_down);
 }
 
 // static
 void LLPanelObject::onCommitRotation( LLUICtrl* ctrl, void* userdata )
 {
 	LLPanelObject* self = (LLPanelObject*) userdata;
-	self->sendRotation();
+	BOOL btn_down = ((LLSpinCtrl*)ctrl)->isMouseHeldDown() ;
+	self->sendRotation(btn_down);
 }
 
 // static
diff --git a/linden/indra/newview/llpanelobject.h b/linden/indra/newview/llpanelobject.h
index 3e7f0bc..afdfd30 100644
--- a/linden/indra/newview/llpanelobject.h
+++ b/linden/indra/newview/llpanelobject.h
@@ -87,9 +87,9 @@ public:
 protected:
 	void			getState();
 
-	void			sendRotation();
-	void			sendScale();
-	void			sendPosition();
+	void			sendRotation(BOOL btn_down);
+	void			sendScale(BOOL btn_down);
+	void			sendPosition(BOOL btn_down);
 	void			sendIsPhysical();
 	void			sendIsTemporary();
 	void			sendIsPhantom();
@@ -170,6 +170,8 @@ protected:
 	LLTextureCtrl   *mCtrlSculptTexture;
 	LLTextBox       *mLabelSculptType;
 	LLComboBox      *mCtrlSculptType;
+	LLCheckBoxCtrl  *mCtrlSculptMirror;
+	LLCheckBoxCtrl  *mCtrlSculptInvert;
 	
 	LLVector3		mCurEulerDegrees;		// to avoid sending rotation when not changed
 	BOOL			mIsPhysical;			// to avoid sending "physical" when not changed
@@ -180,7 +182,7 @@ protected:
 
 	LLUUID          mSculptTextureRevert;   // so we can revert the sculpt texture on cancel
 	U8              mSculptTypeRevert;      // so we can revert the sculpt type on cancel
-	
+
 	LLPointer<LLViewerObject> mObject;
 	LLPointer<LLViewerObject> mRootObject;
 };
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 0d50f38..4867980 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -98,8 +98,8 @@ BOOL LLPanelPermissions::postBuild()
 	
 	this->childSetCommitCallback("checkbox for sale",LLPanelPermissions::onCommitSaleInfo,this);
 
-	this->childSetCommitCallback("EdCost",LLPanelPermissions::onCommitSaleInfo,this);
-	this->childSetPrevalidate("EdCost",LLLineEditor::prevalidateNonNegativeS32);
+	this->childSetCommitCallback("Edit Cost",LLPanelPermissions::onCommitSaleInfo,this);
+	this->childSetPrevalidate("Edit Cost",LLLineEditor::prevalidateNonNegativeS32);
 
 	this->childSetCommitCallback("sale type",LLPanelPermissions::onCommitSaleType,this);
 	
@@ -135,7 +135,7 @@ void LLPanelPermissions::refresh()
 	LLButton*	BtnDeedToGroup = getChild<LLButton>("button deed");
 	if(BtnDeedToGroup)
 	{	
-		LLString deedText;
+		std::string deedText;
 		if (gSavedSettings.getWarning("DeedObject"))
 		{
 			deedText = getString("text deed continued");
@@ -165,33 +165,33 @@ void LLPanelPermissions::refresh()
 	{
 		// ...nothing selected
 		childSetEnabled("perm_modify",false);
-		childSetText("perm_modify",LLString::null);
+		childSetText("perm_modify",LLStringUtil::null);
 
 		childSetEnabled("Creator:",false);
-		childSetText("Creator Name",LLString::null);
+		childSetText("Creator Name",LLStringUtil::null);
 		childSetEnabled("Creator Name",false);
 		childSetEnabled("button creator profile",false);
 
 		childSetEnabled("Owner:",false);
-		childSetText("Owner Name",LLString::null);
+		childSetText("Owner Name",LLStringUtil::null);
 		childSetEnabled("Owner Name",false);
 		childSetEnabled("button owner profile",false);
 
 		childSetEnabled("Group:",false);
-		childSetText("Group Name",LLString::null);
+		childSetText("Group Name",LLStringUtil::null);
 		childSetEnabled("Group Name",false);
 		childSetEnabled("button set group",false);
 
-		childSetText("Object Name",LLString::null);
+		childSetText("Object Name",LLStringUtil::null);
 		childSetEnabled("Object Name",false);
 		childSetEnabled("Name:",false);
-		childSetText("Group Name",LLString::null);
+		childSetText("Group Name",LLStringUtil::null);
 		childSetEnabled("Group Name",false);
 		childSetEnabled("Description:",false);
-		childSetText("Object Description",LLString::null);
+		childSetText("Object Description",LLStringUtil::null);
 		childSetEnabled("Object Description",false);
  
-		childSetText("prim info",LLString::null);
+		childSetText("prim info",LLStringUtil::null);
 		childSetEnabled("prim info",false);
 
 		childSetEnabled("Permissions:",false);
@@ -229,9 +229,10 @@ void LLPanelPermissions::refresh()
 			RadioSaleType->setEnabled(FALSE);
 		}
 		
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",LLString::null);
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetText("Cost",getString("Cost Default"));
+		childSetText("Edit Cost",LLStringUtil::null);
+		childSetEnabled("Edit Cost",false);
 		
 		childSetEnabled("label click action",false);
 		LLComboBox*	ComboClickAction = getChild<LLComboBox>("clickaction");
@@ -259,7 +260,7 @@ void LLPanelPermissions::refresh()
 							|| LLSelectMgr::getInstance()->selectGetModify();
 	const LLView* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
 	S32 string_index = 0;
-	LLString MODIFY_INFO_STRINGS[] =
+	std::string MODIFY_INFO_STRINGS[] =
 	{
 		getString("text modify info 1"),
 		getString("text modify info 2"),
@@ -282,7 +283,7 @@ void LLPanelPermissions::refresh()
 	// Update creator text field
 	childSetEnabled("Creator:",true);
 	BOOL creators_identical;
-	LLString creator_name;
+	std::string creator_name;
 	creators_identical = LLSelectMgr::getInstance()->selectGetCreator(mCreatorID,
 													  creator_name);
 
@@ -294,7 +295,7 @@ void LLPanelPermissions::refresh()
 	childSetEnabled("Owner:",true);
 
 	BOOL owners_identical;
-	LLString owner_name;
+	std::string owner_name;
 	owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_name);
 
 //	llinfos << "owners_identical " << (owners_identical ? "TRUE": "FALSE") << llendl;
@@ -308,7 +309,7 @@ void LLPanelPermissions::refresh()
 		else
 		{
 			// Display last owner if public
-			LLString last_owner_name;
+			std::string last_owner_name;
 			LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name);
 
 			// It should never happen that the last owner is null and the owner
@@ -327,7 +328,7 @@ void LLPanelPermissions::refresh()
 
 	// update group text field
 	childSetEnabled("Group:",true);
-	childSetText("Group Name",LLString::null);
+	childSetText("Group Name",LLStringUtil::null);
 	LLUUID group_id;
 	BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id);
 	if (groups_identical)
@@ -343,7 +344,7 @@ void LLPanelPermissions::refresh()
 		if(mLabelGroupName)
 		{
 			mLabelGroupName->setNameID(LLUUID::null, TRUE);
-			mLabelGroupName->refresh(LLUUID::null, "", "", TRUE);
+			mLabelGroupName->refresh(LLUUID::null, LLStringUtil::null, LLStringUtil::null, TRUE);
 			mLabelGroupName->setEnabled(FALSE);
 		}
 	}
@@ -392,16 +393,14 @@ void LLPanelPermissions::refresh()
 	S32 prim_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
 	S32 obj_count = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
 
-	LLString object_info_string;
+	std::string object_info_string;
 	if (1 == obj_count)
 	{
 		object_info_string.assign("1 Object, ");
 	}
 	else
 	{
-		char buffer[MAX_STRING];		/*Flawfinder: ignore*/
-		snprintf(buffer, MAX_STRING, "%d Objects, ", obj_count);			/* Flawfinder: ignore */
-		object_info_string.assign(buffer);
+		object_info_string = llformat( "%d Objects, ", obj_count);
 	}
 	if (1 == prim_count)
 	{
@@ -409,63 +408,99 @@ void LLPanelPermissions::refresh()
 	}
 	else
 	{
-		char buffer[MAX_STRING];		/*Flawfinder: ignore*/
-		snprintf(buffer, MAX_STRING, "%d Primitives", prim_count);			/* Flawfinder: ignore */
+		std::string buffer;
+		buffer = llformat( "%d Primitives", prim_count);
 		object_info_string.append(buffer);
 	}
 	childSetText("prim info",object_info_string);
 	childSetEnabled("prim info",true);
 
-	S32 price;
-	BOOL is_for_sale = LLSelectMgr::getInstance()->selectIsForSale(price);
-	if (!is_for_sale)
-	{
-		price = DEFAULT_PRICE;
-	}
-
-	BOOL self_owned = (gAgent.getID() == mOwnerID);
-	BOOL group_owned = LLSelectMgr::getInstance()->selectIsGroupOwned() ;
-	BOOL public_owned = (mOwnerID.isNull() && !LLSelectMgr::getInstance()->selectIsGroupOwned());
-	BOOL can_transfer = LLSelectMgr::getInstance()->selectGetRootsTransfer();
-	BOOL can_copy = LLSelectMgr::getInstance()->selectGetRootsCopy();
+	S32 total_sale_price = 0;
+	S32 individual_sale_price = 0;
+	BOOL is_for_sale_mixed = FALSE;
+	BOOL is_sale_price_mixed = FALSE;
+	U32 num_for_sale = FALSE;
+    LLSelectMgr::getInstance()->selectGetAggregateSaleInfo(num_for_sale,
+										   is_for_sale_mixed,
+										   is_sale_price_mixed,
+										   total_sale_price,
+										   individual_sale_price);
+
+	const BOOL self_owned = (gAgent.getID() == mOwnerID);
+	const BOOL group_owned = LLSelectMgr::getInstance()->selectIsGroupOwned() ;
+	const BOOL public_owned = (mOwnerID.isNull() && !LLSelectMgr::getInstance()->selectIsGroupOwned());
+	const BOOL can_transfer = LLSelectMgr::getInstance()->selectGetRootsTransfer();
+	const BOOL can_copy = LLSelectMgr::getInstance()->selectGetRootsCopy();
 
 	if(!owners_identical)
 	{
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",LLString::null);
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetText("Edit Cost",LLStringUtil::null);
+		childSetEnabled("Edit Cost",false);
 	}
+	// You own these objects.
 	else if(self_owned || (group_owned && gAgent.hasPowerInGroup(group_id,GP_OBJECT_SET_SALE)))
 	{
-		LLLineEditor*	EditPrice = getChild<LLLineEditor>("EdCost");
-		if(keyboard_focus_view != EditPrice)
+		// If there are multiple items for sale then set text to PRICE PER UNIT.
+		if (num_for_sale > 1)
 		{
-			childSetText("EdCost",llformat("%d",price));
+			childSetText("Cost",getString("Cost Per Unit"));
 		}
-		if(is_for_sale && is_one_object && can_transfer)
+		else
 		{
-			childSetEnabled("Price:  L$",true);
-			childSetEnabled("EdCost",true);
+			childSetText("Cost",getString("Cost Default"));
 		}
-		else
+		
+		LLLineEditor *editPrice = getChild<LLLineEditor>("Edit Cost");
+		if(keyboard_focus_view != editPrice)
 		{
-			childSetEnabled("Price:  L$",false);
-			childSetEnabled("EdCost",false);
+			// If the sale price is mixed then set the cost to MIXED, otherwise
+			// set to the actual cost.
+			if (num_for_sale > 0 && is_for_sale_mixed)
+			{
+				childSetText("Edit Cost",getString("Sale Mixed"));
+			}
+			else if (num_for_sale > 0 && is_sale_price_mixed)
+			{
+				childSetText("Edit Cost",getString("Cost Mixed"));
+			}
+			else 
+			{
+				childSetText("Edit Cost",llformat("%d",individual_sale_price));
+			}
 		}
+		// The edit fields are only enabled if you can sell this object
+		// and the sale price is not mixed.
+		bool enable_edit = (num_for_sale && can_transfer) ? !is_for_sale_mixed : false;
+		childSetEnabled("Cost",enable_edit);
+		childSetEnabled("Edit Cost",enable_edit);
 	}
+	// Someone, not you, owns these objects.
 	else if(!public_owned)
 	{
-		// ...someone, not you, owns it
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",llformat("%d",price));
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetEnabled("Edit Cost",false);
+		
+		// Don't show a price if none of the items are for sale.
+		if (num_for_sale)
+			childSetText("Edit Cost",llformat("%d",total_sale_price));
+		else
+			childSetText("Edit Cost",LLStringUtil::null);
+
+		// If multiple items are for sale, set text to TOTAL PRICE.
+		if (num_for_sale > 1)
+			childSetText("Cost",getString("Cost Total"));
+		else
+			childSetText("Cost",getString("Cost Default"));
 	}
+	// This is a public object.
 	else
 	{
-		// ...public object
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",LLString::null);
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetText("Cost",getString("Cost Default"));
+		
+		childSetText("Edit Cost",LLStringUtil::null);
+		childSetEnabled("Edit Cost",false);
 	}
 
 	// Enable and disable the permissions checkboxes
@@ -601,8 +636,11 @@ void LLPanelPermissions::refresh()
 
 	if (has_change_sale_ability && (owner_mask_on & PERM_TRANSFER))
 	{
-		childSetEnabled("checkbox for sale", can_transfer || (!can_transfer && is_for_sale));
-		childSetEnabled("sale type",is_for_sale && can_transfer);
+		childSetEnabled("checkbox for sale", can_transfer || (!can_transfer && num_for_sale));
+		// Set the checkbox to tentative if the prices of each object selected
+		// are not the same.
+		childSetTentative("checkbox for sale", is_for_sale_mixed);
+		childSetEnabled("sale type",num_for_sale && can_transfer && !is_sale_price_mixed);
 
 		childSetEnabled("Next owner can:", TRUE);
 		childSetEnabled("checkbox next owner can modify",base_mask_on & PERM_MODIFY);
@@ -744,21 +782,23 @@ void LLPanelPermissions::refresh()
 		if (valid_sale_info)
 		{
 			RadioSaleType->setSelectedIndex((S32)sale_type - 1);
+			RadioSaleType->setTentative(FALSE); // unfortunately this doesn't do anything at the moment.
 		}
 		else
 		{
 			// default option is sell copy, determined to be safest
 			RadioSaleType->setSelectedIndex((S32)LLSaleInfo::FS_COPY - 1);
+			RadioSaleType->setTentative(TRUE); // unfortunately this doesn't do anything at the moment.
 		}
 	}
 
-	childSetValue("checkbox for sale", is_for_sale);
+	childSetValue("checkbox for sale", num_for_sale != 0);
 
 	// HACK: There are some old objects in world that are set for sale,
 	// but are no-transfer.  We need to let users turn for-sale off, but only
 	// if for-sale is set.
 	bool cannot_actually_sell = !can_transfer || (!can_copy && sale_type == LLSaleInfo::FS_COPY);
-	if (is_for_sale && has_change_sale_ability && cannot_actually_sell)
+	if (num_for_sale && has_change_sale_ability && cannot_actually_sell)
 	{
 		childSetEnabled("checkbox for sale", true);
 	}
@@ -829,7 +869,7 @@ void LLPanelPermissions::onClickGroup(void* data)
 {
 	LLPanelPermissions* panelp = (LLPanelPermissions*)data;
 	LLUUID owner_id;
-	LLString name;
+	std::string name;
 	BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, name);
 	LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
 
@@ -982,9 +1022,10 @@ void LLPanelPermissions::setAllSaleInfo()
 	llinfos << "LLPanelPermissions::setAllSaleInfo()" << llendl;
 	LLSaleInfo::EForSale sale_type = LLSaleInfo::FS_NOT;
 
-	LLCheckBoxCtrl*	mCheckPurchase = getChild<LLCheckBoxCtrl>("checkbox for sale");
-
-	if(mCheckPurchase && mCheckPurchase->get())
+	LLCheckBoxCtrl *checkPurchase = getChild<LLCheckBoxCtrl>("checkbox for sale");
+	
+	// Set the sale type if the object(s) are for sale.
+	if(checkPurchase && checkPurchase->get())
 	{
 		LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("sale type");
 		if(RadioSaleType)
@@ -1006,23 +1047,37 @@ void LLPanelPermissions::setAllSaleInfo()
 			}
 		}
 	}
-	LLLineEditor*	mEditPrice = getChild<LLLineEditor>("EdCost");
 
 	S32 price = -1;
-	if(mEditPrice)
+	
+	LLLineEditor *editPrice = getChild<LLLineEditor>("Edit Cost");
+	if (editPrice)
 	{
-		price = atoi(mEditPrice->getText().c_str());
+		// Don't extract the price if it's labeled as MIXED or is empty.
+		const std::string& editPriceString = editPrice->getText();
+		if (editPriceString != getString("Cost Mixed") &&
+			!editPriceString.empty())
+		{
+			price = atoi(editPriceString.c_str());
+		}
+		else
+		{
+			price = DEFAULT_PRICE;
+		}
 	}
-	// Invalid data - turn off the sale
+	// If somehow an invalid price, turn the sale off.
 	if (price < 0)
-	{
 		sale_type = LLSaleInfo::FS_NOT;
-		price = 0;
-	}
 
+	// Force the sale price of not-for-sale items to DEFAULT_PRICE.
+	if (sale_type == LLSaleInfo::FS_NOT)
+	{
+		price = DEFAULT_PRICE;
+	}
+	// Pack up the sale info and send the update.
 	LLSaleInfo sale_info(sale_type, price);
 	LLSelectMgr::getInstance()->selectionSetObjectSaleInfo(sale_info);
-
+	
 	// If turned off for-sale, make sure click-action buy is turned
 	// off as well
 	if (sale_type == LLSaleInfo::FS_NOT)
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 32894ce..8c2b175 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -63,7 +63,7 @@
 std::list<LLPanelPick*> LLPanelPick::sAllPanels;
 
 LLPanelPick::LLPanelPick(BOOL top_pick)
-:	LLPanel("Top Picks Panel"),
+:	LLPanel(std::string("Top Picks Panel")),
 	mTopPick(top_pick),
 	mPickID(),
 	mCreatorID(),
@@ -292,33 +292,33 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
     LLUUID parcel_id;
     msg->getUUID("Data", "ParcelID", parcel_id);
 
-	char name[DB_PARCEL_NAME_SIZE];		/*Flawfinder: ignore*/
-	msg->getString("Data", "Name", DB_PARCEL_NAME_SIZE, name);
+	std::string name;
+	msg->getString("Data", "Name", name);
 
-	char desc[DB_PICK_DESC_SIZE];		/*Flawfinder: ignore*/
-	msg->getString("Data", "Desc", DB_PICK_DESC_SIZE, desc);
+	std::string desc;
+	msg->getString("Data", "Desc", desc);
 
 	LLUUID snapshot_id;
 	msg->getUUID("Data", "SnapshotID", snapshot_id);
 
     // "Location text" is actually the owner name, the original
     // name that owner gave the parcel, and the location.
-	char buffer[256];		/*Flawfinder: ignore*/
-    LLString location_text;
-
-    msg->getString("Data", "User", 256, buffer);
-    location_text.assign(buffer);
+	std::string location_text;
+    msg->getString("Data", "User", location_text);
     location_text.append(", ");
 
-    msg->getString("Data", "OriginalName", 256, buffer);
-	if (buffer[0] != '\0')
+	std::string original_name;
+    msg->getString("Data", "OriginalName", original_name);
+	if (!original_name.empty())
 	{
-		location_text.append(buffer);
+		location_text.append(original_name);
 		location_text.append(", ");
 	}
 
-	char sim_name[256];		/*Flawfinder: ignore*/
-	msg->getString("Data", "SimName", 256, sim_name);
+	std::string sim_name;
+	msg->getString("Data", "SimName", sim_name);
+	location_text.append(sim_name);
+	location_text.append(" ");
 
 	LLVector3d pos_global;
 	msg->getVector3d("Data", "PosGlobal", pos_global);
@@ -327,7 +327,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
     S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
 	S32 region_z = llround((F32)pos_global.mdV[VZ]);
    
-    location_text.append(llformat("%s (%d, %d, %d)", sim_name, region_x, region_y, region_z));
+    location_text.append(llformat("(%d, %d, %d)", region_x, region_y, region_z));
 
 	S32 sort_order;
     msg->getS32("Data", "SortOrder", sort_order);
@@ -355,8 +355,8 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
 		self->mPosGlobal = pos_global;
 
 		// Update UI controls
-        self->mNameEditor->setText(LLString(name));
-        self->mDescEditor->setText(LLString(desc));
+        self->mNameEditor->setText(std::string(name));
+        self->mDescEditor->setText(std::string(desc));
         self->mSnapshotCtrl->setImageAssetID(snapshot_id);
         self->mLocationEditor->setText(location_text);
         self->mEnabledCheck->set(enabled);
@@ -448,7 +448,7 @@ void LLPanelPick::onClickMap(void* data)
 void LLPanelPick::onClickLandmark(void* data)
 {
     LLPanelPick* self = (LLPanelPick*)data;
-	create_landmark(self->mNameEditor->getText().c_str(), "", self->mPosGlobal);
+	create_landmark(self->mNameEditor->getText(), "", self->mPosGlobal);
 }
 */
 
@@ -460,7 +460,7 @@ void LLPanelPick::onClickSet(void* data)
 	// Save location for later.
 	self->mPosGlobal = gAgent.getPositionGlobal();
 
-	LLString location_text;
+	std::string location_text;
 	location_text.assign("(will update after save)");
 	location_text.append(", ");
 
@@ -500,7 +500,7 @@ void LLPanelPick::onCommitAny(LLUICtrl* ctrl, void* data)
 		/*if (self->mTopPick)
 		{
 			LLPanelDirPicks* panel = (LLPanelDirPicks*)self->getParent();
-			panel->renamePick(self->mPickID, self->mNameEditor->getText().c_str());
+			panel->renamePick(self->mPickID, self->mNameEditor->getText());
 		}
 		else
 		{*/
diff --git a/linden/indra/newview/llpanelpick.h b/linden/indra/newview/llpanelpick.h
index e2aaa6f..57483dc 100644
--- a/linden/indra/newview/llpanelpick.h
+++ b/linden/indra/newview/llpanelpick.h
@@ -103,7 +103,7 @@ protected:
 	BOOL mDataRequested;
 	BOOL mDataReceived;
 
-	LLString mSimName;
+	std::string mSimName;
     LLVector3d mPosGlobal;
 
     LLTextureCtrl*	mSnapshotCtrl;
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index e7dc08f..37ad05e 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -61,7 +61,7 @@
 std::list<LLPanelPlace*> LLPanelPlace::sAllPanels;
 
 LLPanelPlace::LLPanelPlace()
-:	LLPanel("Places Panel"),
+:	LLPanel(std::string("Places Panel")),
 	mParcelID(),
 	mRequestedID(),
 	mRegionID(),
@@ -91,7 +91,7 @@ BOOL LLPanelPlace::postBuild()
     mNameEditor = getChild<LLTextBox>("name_editor");
 	// Text boxes appear to have a " " in them by default.  This breaks the
 	// emptiness test for filling in data from the network.  Slam to empty.
-	mNameEditor->setText( LLString::null );
+	mNameEditor->setText( LLStringUtil::null );
 
     mDescEditor = getChild<LLTextEditor>("desc_editor");
 
@@ -144,10 +144,10 @@ void LLPanelPlace::resetLocation()
 	mPosGlobal.clearVec();
 	mPosRegion.clearVec();
 	mAuctionID = 0;
-	mNameEditor->setText( LLString::null );
-	mDescEditor->setText( LLString::null );
-	mInfoEditor->setText( LLString::null );
-	mLocationEditor->setText( LLString::null );
+	mNameEditor->setText( LLStringUtil::null );
+	mDescEditor->setText( LLStringUtil::null );
+	mInfoEditor->setText( LLStringUtil::null );
+	mLocationEditor->setText( LLStringUtil::null );
 }
 
 void LLPanelPlace::setParcelID(const LLUUID& parcel_id)
@@ -187,7 +187,7 @@ void LLPanelPlace::sendParcelInfoRequest()
 void LLPanelPlace::setErrorStatus(U32 status, const std::string& reason)
 {
 	// We only really handle 404 and 499 errors
-	LLString error_text;
+	std::string error_text;
 	if(status == 404)
 	{	
 		error_text = getString("server_error_text");
@@ -205,15 +205,15 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
 	LLUUID	agent_id;
 	LLUUID	parcel_id;
 	LLUUID	owner_id;
-	char	name[MAX_STRING];		/*Flawfinder: ignore*/
-	char	desc[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string	name;
+	std::string	desc;
 	S32		actual_area;
 	S32		billable_area;
 	U8		flags;
 	F32		global_x;
 	F32		global_y;
 	F32		global_z;
-	char	sim_name[MAX_STRING];		/*Flawfinder: ignore*/
+	std::string	sim_name;
 	LLUUID	snapshot_id;
 	F32		dwell;
 	S32		sale_price;
@@ -232,15 +232,15 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
 		}
 
 		msg->getUUID	("Data", "OwnerID", owner_id);
-		msg->getString	("Data", "Name", MAX_STRING, name);
-		msg->getString	("Data", "Desc", MAX_STRING, desc);
+		msg->getString	("Data", "Name", name);
+		msg->getString	("Data", "Desc", desc);
 		msg->getS32		("Data", "ActualArea", actual_area);
 		msg->getS32		("Data", "BillableArea", billable_area);
 		msg->getU8		("Data", "Flags", flags);
 		msg->getF32		("Data", "GlobalX", global_x);
 		msg->getF32		("Data", "GlobalY", global_y);
 		msg->getF32		("Data", "GlobalZ", global_z);
-		msg->getString	("Data", "SimName", MAX_STRING, sim_name);
+		msg->getString	("Data", "SimName", sim_name);
 		msg->getUUID	("Data", "SnapshotID", snapshot_id);
 		msg->getF32		("Data", "Dwell", dwell);
 		msg->getS32		("Data", "SalePrice", sale_price);
@@ -256,22 +256,20 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
 
 		// Only assign the name and description if they are not empty and there is not a 
 		// value present (passed in from a landmark, e.g.)
-		std::string name_str(name);
-		std::string desc_str(desc);
 
-		if( !name_str.empty()
+		if( !name.empty()
 		   && self->mNameEditor && self->mNameEditor->getText().empty())
 		{
-			self->mNameEditor->setText(name_str);
+			self->mNameEditor->setText(name);
 		}
 
-		if( !desc_str.empty()
+		if( !desc.empty()
 			&& self->mDescEditor && self->mDescEditor->getText().empty())
 		{
-			self->mDescEditor->setText(desc_str);
+			self->mDescEditor->setText(desc);
 		}
 
-		LLString info_text;
+		std::string info_text;
 		LLUIString traffic = self->getUIString("traffic_text");
 		traffic.setArg("[TRAFFIC]", llformat("%d ", (int)dwell));
 		info_text = traffic;
@@ -296,7 +294,7 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
 		}
 
 		// HACK: Flag 0x1 == mature region, otherwise assume PG
-		const char* rating = LLViewerRegion::accessToString(SIM_ACCESS_PG);
+		std::string rating = LLViewerRegion::accessToString(SIM_ACCESS_PG);
 		if (flags & 0x1)
 		{
 			rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE);
@@ -320,8 +318,8 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
 			self->mPosGlobal.setVec(global_x, global_y, global_z);
 		}
 
-		LLString location = llformat("%s %d, %d, %d (%s)",
-			sim_name, region_x, region_y, region_z, rating);
+		std::string location = llformat("%s %d, %d, %d (%s)",
+										sim_name.c_str(), region_x, region_y, region_z, rating.c_str());
 		if (self->mLocationEditor)
 		{
 			self->mLocationEditor->setText(location);
@@ -430,8 +428,8 @@ void LLPanelPlace::callbackAuctionWebPage(S32 option, void* data)
 
 	if (0 == option)
 	{
-		char url[256];		/*Flawfinder: ignore*/
-		snprintf(url, sizeof(url), "%s%010d", AUCTION_URL, self->mAuctionID);			/* Flawfinder: ignore */
+		std::string url;
+		url = AUCTION_URL + llformat( "%010d", self->mAuctionID);
 
 		llinfos << "Loading auction page " << url << llendl;
 
diff --git a/linden/indra/newview/llpanelplace.h b/linden/indra/newview/llpanelplace.h
index 9ca008a..df53013 100644
--- a/linden/indra/newview/llpanelplace.h
+++ b/linden/indra/newview/llpanelplace.h
@@ -74,6 +74,8 @@ public:
 			const LLVector3d& pos_global);
 	static void processParcelInfoReply(LLMessageSystem* msg, void**);
 
+	LLTextureCtrl *getSnapshotCtrl() const { return mSnapshotCtrl; }
+
 protected:
 	static void onClickTeleport(void* data);
 	static void onClickMap(void* data);
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index 23ca7c4..43c80f1 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -182,7 +182,7 @@ void LLPanelVolume::getState( )
 
 	BOOL owners_identical;
 	LLUUID owner_id;
-	LLString owner_name;
+	std::string owner_name;
 	owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
 	// BUG? Check for all objects being editable?
diff --git a/linden/indra/newview/llpanelweb.h b/linden/indra/newview/llpanelweb.h
index 25dceaa..34d7b3d 100644
--- a/linden/indra/newview/llpanelweb.h
+++ b/linden/indra/newview/llpanelweb.h
@@ -63,7 +63,7 @@ private:
 private:
 	BOOL mCookiesEnabled;
 	BOOL mWebProxyEnabled;
-	LLString mWebProxyAddress;
+	std::string mWebProxyAddress;
 	S32 mWebProxyPort;
 	BOOL mExternalBrowser;
 };
diff --git a/linden/indra/newview/llpolymesh.cpp b/linden/indra/newview/llpolymesh.cpp
index 3884b31..0a1e2ce 100644
--- a/linden/indra/newview/llpolymesh.cpp
+++ b/linden/indra/newview/llpolymesh.cpp
@@ -261,12 +261,12 @@ BOOL LLPolyMeshSharedData::allocateJointNames( U32 numJointNames )
 //--------------------------------------------------------------------
 // LLPolyMeshSharedData::loadMesh()
 //--------------------------------------------------------------------
-BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
+BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 {
 	//-------------------------------------------------------------------------
 	// Open the file
 	//-------------------------------------------------------------------------
-	if(!fileName)
+	if(fileName.empty())
 	{
 		llerrs << "Filename is Empty!" << llendl;
 		return FALSE;
@@ -595,7 +595,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
 					// we reached the end of the morphs
 					break;
 				}
-				LLPolyMorphData* morph_data = new LLPolyMorphData(morphName);
+				LLPolyMorphData* morph_data = new LLPolyMorphData(std::string(morphName));
 
 				BOOL result = morph_data->loadBinary(fp, this);
 
@@ -679,7 +679,9 @@ const LLVector2 &LLPolyMeshSharedData::getUVs(U32 index)
 // LLPolyMesh()
 //-----------------------------------------------------------------------------
 LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_mesh)
-{
+{	
+	LLMemType mt(LLMemType::MTYPE_AVATAR_MESH);
+
 	llassert(shared_data);
 
 	mSharedData = shared_data;
@@ -687,6 +689,12 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_
 	mAvatarp = NULL;
 	mVertexData = NULL;
 
+	mCurVertexCount = 0;
+	mFaceIndexCount = 0;
+	mFaceIndexOffset = 0;
+	mFaceVertexCount = 0;
+	mFaceVertexOffset = 0;
+
 	if (shared_data->isLOD() && reference_mesh)
 	{
 		mCoords = reference_mesh->mCoords;
@@ -755,7 +763,7 @@ LLPolyMesh::~LLPolyMesh()
 //-----------------------------------------------------------------------------
 // LLPolyMesh::getMesh()
 //-----------------------------------------------------------------------------
-LLPolyMesh *LLPolyMesh::getMesh(const LLString &name, LLPolyMesh* reference_mesh)
+LLPolyMesh *LLPolyMesh::getMesh(const std::string &name, LLPolyMesh* reference_mesh)
 {
 	//-------------------------------------------------------------------------
 	// search for an existing mesh by this name
@@ -771,8 +779,8 @@ LLPolyMesh *LLPolyMesh::getMesh(const LLString &name, LLPolyMesh* reference_mesh
 	//-------------------------------------------------------------------------
 	// if not found, create a new one, add it to the list
 	//-------------------------------------------------------------------------
-	char full_path[LL_MAX_PATH];		/*Flawfinder: ignore*/
-	snprintf(full_path, LL_MAX_PATH, "%s", (gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,name.c_str())).c_str());			/* Flawfinder: ignore */
+	std::string full_path;
+	full_path = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,name);
 
 	LLPolyMeshSharedData *mesh_data = new LLPolyMeshSharedData();
 	if (reference_mesh)
@@ -929,7 +937,7 @@ void LLPolyMesh::initializeForMorph()
 //-----------------------------------------------------------------------------
 // getMorphData()
 //-----------------------------------------------------------------------------
-LLPolyMorphData*	LLPolyMesh::getMorphData(const char *morph_name)
+LLPolyMorphData*	LLPolyMesh::getMorphData(const std::string& morph_name)
 {
 	if (!mSharedData)
 		return NULL;
@@ -937,7 +945,7 @@ LLPolyMorphData*	LLPolyMesh::getMorphData(const char *morph_name)
 		 iter != mSharedData->mMorphData.end(); ++iter)
 	{
 		LLPolyMorphData *morph_data = *iter;
-		if (!strcmp(morph_data->getName(), morph_name))
+		if (morph_data->getName() == morph_name)
 		{
 			return morph_data;
 		}
@@ -1003,7 +1011,7 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
 	{
 		if (bone->hasName("bone"))
 		{
-			LLString name;
+			std::string name;
 			LLVector3 scale;
 			LLVector3 pos;
 			BOOL haspos = FALSE;
diff --git a/linden/indra/newview/llpolymesh.h b/linden/indra/newview/llpolymesh.h
index 8b6affe..7f4f087 100644
--- a/linden/indra/newview/llpolymesh.h
+++ b/linden/indra/newview/llpolymesh.h
@@ -134,7 +134,7 @@ private:
 	U32 getNumKB();
 
 	// Load mesh data from file
-	BOOL loadMesh( const char *fileName );
+	BOOL loadMesh( const std::string& fileName );
 
 public:
 	void genIndices(S32 offset);
@@ -171,7 +171,7 @@ public:
 	// Requests a mesh by name.
 	// If the mesh already exists in the global mesh table, it is returned,
 	// otherwise it is loaded from file, added to the table, and returned.
-	static LLPolyMesh *getMesh( const LLString &name, LLPolyMesh* reference_mesh = NULL);
+	static LLPolyMesh *getMesh( const std::string &name, LLPolyMesh* reference_mesh = NULL);
 
 	// Frees all loaded meshes.
 	// This should only be called once you know there are no outstanding
@@ -311,7 +311,7 @@ public:
 		return mSharedData->mJointNames;
 	}
 
-	LLPolyMorphData*	getMorphData(const char *morph_name);
+	LLPolyMorphData*	getMorphData(const std::string& morph_name);
 // 	void	removeMorphData(LLPolyMorphData *morph_target);
 // 	void	deleteAllMorphData();
 
@@ -362,7 +362,7 @@ protected:
 	LLPolyMesh				*mReferenceMesh;
 
 	// global mesh list
-	typedef std::map<LLString, LLPolyMeshSharedData*> LLPolyMeshSharedDataTable; 
+	typedef std::map<std::string, LLPolyMeshSharedData*> LLPolyMeshSharedDataTable; 
 	static LLPolyMeshSharedDataTable sGlobalSharedMeshList;
 
 	// Backlink only; don't make this an LLPointer.
@@ -375,12 +375,12 @@ protected:
 //-----------------------------------------------------------------------------
 struct LLPolySkeletalBoneInfo
 {
-	LLPolySkeletalBoneInfo(LLString &name, LLVector3 &scale, LLVector3 &pos, BOOL haspos)
+	LLPolySkeletalBoneInfo(std::string &name, LLVector3 &scale, LLVector3 &pos, BOOL haspos)
 		: mBoneName(name),
 		  mScaleDeformation(scale),
 		  mPositionDeformation(pos),
 		  mHasPositionDeformation(haspos) {}
-	LLString mBoneName;
+	std::string mBoneName;
 	LLVector3 mScaleDeformation;
 	LLVector3 mPositionDeformation;
 	BOOL mHasPositionDeformation;
diff --git a/linden/indra/newview/llpolymorph.cpp b/linden/indra/newview/llpolymorph.cpp
index 11ca7af..34a9b71 100644
--- a/linden/indra/newview/llpolymorph.cpp
+++ b/linden/indra/newview/llpolymorph.cpp
@@ -46,13 +46,9 @@ const F32 NORMAL_SOFTEN_FACTOR = 0.65f;
 //-----------------------------------------------------------------------------
 // LLPolyMorphData()
 //-----------------------------------------------------------------------------
-LLPolyMorphData::LLPolyMorphData(char *morph_name)
+LLPolyMorphData::LLPolyMorphData(const std::string& morph_name)
+	: mName(morph_name)
 {
-	llassert (morph_name);
-
-	mName = new char[strlen(morph_name) + 1];	/*Flawfinder: ignore*/
-	strcpy(mName, morph_name);	/*Flawfinder: ignore*/
-
 	mNumIndices = 0;
 	mCurrentIndex = 0;
 	mTotalDistortion = 0.f;
@@ -72,7 +68,6 @@ LLPolyMorphData::LLPolyMorphData(char *morph_name)
 //-----------------------------------------------------------------------------
 LLPolyMorphData::~LLPolyMorphData()
 {
-	delete [] mName;
 	delete [] mVertexIndices;
 	delete [] mCoords;
 	delete [] mNormals;
@@ -226,7 +221,7 @@ BOOL LLPolyMorphTargetInfo::parseXml(LLXmlTreeNode* node)
 		static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
 		if (child_node->hasName("volume_morph"))
 		{
-			LLString volume_name;
+			std::string volume_name;
 			if (child_node->getFastAttributeString(name_string, volume_name))
 			{
 				LLVector3 scale;
@@ -284,10 +279,9 @@ BOOL LLPolyMorphTarget::setInfo(LLPolyMorphTargetInfo* info)
 	for (iter = getInfo()->mVolumeInfoList.begin(); iter != getInfo()->mVolumeInfoList.end(); iter++)
 	{
 		LLPolyVolumeMorphInfo *volume_info = &(*iter);
-		std::string vol_string(volume_info->mName);
 		for (S32 i = 0; i < avatarp->mNumCollisionVolumes; i++)
 		{
-			if (avatarp->mCollisionVolumes[i].getName() == vol_string)
+			if (avatarp->mCollisionVolumes[i].getName() == volume_info->mName)
 			{
 				mVolumeMorphs.push_back(LLPolyVolumeMorph(&avatarp->mCollisionVolumes[i],
 														  volume_info->mScale,
@@ -297,7 +291,7 @@ BOOL LLPolyMorphTarget::setInfo(LLPolyMorphTargetInfo* info)
 		}
 	}
 
-	mMorphData = mMesh->getMorphData(getInfo()->mMorphName.c_str());
+	mMorphData = mMesh->getMorphData(getInfo()->mMorphName);
 	if (!mMorphData)
 	{
 		llwarns << "No morph target named " << getInfo()->mMorphName << " found in mesh." << llendl;
diff --git a/linden/indra/newview/llpolymorph.h b/linden/indra/newview/llpolymorph.h
index 0ad5b18..aea30e6 100644
--- a/linden/indra/newview/llpolymorph.h
+++ b/linden/indra/newview/llpolymorph.h
@@ -48,15 +48,14 @@ class LLViewerJointCollisionVolume;
 class LLPolyMorphData
 {
 public:
-	LLPolyMorphData(char *morph_name);
+	LLPolyMorphData(const std::string& morph_name);
 	~LLPolyMorphData();
 
 	BOOL			loadBinary(LLFILE* fp, LLPolyMeshSharedData *mesh);
-	char*			loadASCII(char* text, LLPolyMeshSharedData *mesh);
-	char*			getName() { return mName; }
+	const std::string& getName() { return mName; }
 
 public:
-	char*				mName;
+	std::string			mName;
 
 	// morphology
 	U32					mNumIndices;
@@ -98,10 +97,10 @@ protected:
 //-----------------------------------------------------------------------------
 struct LLPolyVolumeMorphInfo
 {
-	LLPolyVolumeMorphInfo(LLString &name, LLVector3 &scale, LLVector3 &pos)
+	LLPolyVolumeMorphInfo(std::string &name, LLVector3 &scale, LLVector3 &pos)
 		: mName(name), mScale(scale), mPos(pos) {};
 
-	LLString						mName;
+	std::string						mName;
 	LLVector3						mScale;
 	LLVector3						mPos;
 };
@@ -130,7 +129,7 @@ public:
 	/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
 
 protected:
-	LLString		mMorphName;
+	std::string		mMorphName;
 	BOOL			mIsClothingMorph;
 	typedef std::vector<LLPolyVolumeMorphInfo> volume_info_list_t;
 	volume_info_list_t mVolumeInfoList;	
diff --git a/linden/indra/newview/llpostprocess.cpp b/linden/indra/newview/llpostprocess.cpp
deleted file mode 100644
index 7ee7100..0000000
--- a/linden/indra/newview/llpostprocess.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/** 
- * @file llpostprocess.cpp
- * @brief LLPostProcess class implementation
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "pipeline.h"
-#include "llpostprocess.h"
-#include "llglslshader.h"
-#include "llsdserialize.h"
-#include "llrender.h"
-
-
-LLPostProcess * gPostProcess = NULL;
-
-
-static const unsigned int NOISE_SIZE = 512;
-
-/// CALCULATING LUMINANCE (Using NTSC lum weights)
-/// http://en.wikipedia.org/wiki/Luma_%28video%29
-static const float LUMINANCE_R = 0.299f;
-static const float LUMINANCE_G = 0.587f;
-static const float LUMINANCE_B = 0.114f;
-
-static const char * const XML_FILENAME = "postprocesseffects.xml";
-
-LLPostProcess::LLPostProcess(void) : 
-					sceneRenderTexture(0), noiseTexture(0),
-					tempBloomTexture(0),
-					initialized(false),  
-					mAllEffects(LLSD::emptyMap()),
-					screenW(1), screenH(1)
-{
-	LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
-	LL_DEBUGS2("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
-
-	llifstream effectsXML(pathName.c_str());
-
-	if (effectsXML)
-	{
-		LLPointer<LLSDParser> parser = new LLSDXMLParser();
-
-		parser->parse(effectsXML, mAllEffects, LLSDSerialize::SIZE_UNLIMITED);
-	}
-
-	if (!mAllEffects.has("default"))
-	{
-		LLSD & defaultEffect = (mAllEffects["default"] = LLSD::emptyMap());
-
-		defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
-		defaultEffect["enable_bloom"] = LLSD::Boolean(false);
-		defaultEffect["enable_color_filter"] = LLSD::Boolean(false);
-
-		/// NVG Defaults
-		defaultEffect["brightness_multiplier"] = 3.0;
-		defaultEffect["noise_size"] = 25.0;
-		defaultEffect["noise_strength"] = 0.4;
-
-		// TODO BTest potentially add this to tweaks?
-		noiseTextureScale = 1.0f;
-		
-		/// Bloom Defaults
-		defaultEffect["extract_low"] = 0.95;
-		defaultEffect["extract_high"] = 1.0;
-		defaultEffect["bloom_width"] = 2.25;
-		defaultEffect["bloom_strength"] = 1.5;
-
-		/// Color Filter Defaults
-		defaultEffect["brightness"] = 1.0;
-		defaultEffect["contrast"] = 1.0;
-		defaultEffect["saturation"] = 1.0;
-
-		LLSD& contrastBase = (defaultEffect["contrast_base"] = LLSD::emptyArray());
-		contrastBase.append(1.0);
-		contrastBase.append(1.0);
-		contrastBase.append(1.0);
-		contrastBase.append(0.5);
-	}
-
-	setSelectedEffect("default");
-}
-
-LLPostProcess::~LLPostProcess(void)
-{
-	glDeleteTextures(1, &sceneRenderTexture);
-	glDeleteTextures(1, &noiseTexture);
-	glDeleteTextures(1, &tempBloomTexture);
-}
-
-// static
-void LLPostProcess::initClass(void)
-{
-	//this will cause system to crash at second time login
-	//if first time login fails due to network connection --- bao
-	//***llassert_always(gPostProcess == NULL);
-	//replaced by the following line:
-	if(gPostProcess)
-		return ;
-	
-	
-	gPostProcess = new LLPostProcess();
-}
-
-// static
-void LLPostProcess::cleanupClass()
-{
-	delete gPostProcess;
-	gPostProcess = NULL;
-}
-
-void LLPostProcess::setSelectedEffect(std::string const & effectName)
-{
-	mSelectedEffectName = effectName;
-	static_cast<LLSD &>(tweaks) = mAllEffects[effectName];
-}
-
-void LLPostProcess::saveEffect(std::string const & effectName)
-{
-	mAllEffects[effectName] = tweaks;
-
-	LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
-	//llinfos << "Saving PostProcess Effects settings to " << pathName << llendl;
-
-	llofstream effectsXML(pathName.c_str());
-
-	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
-
-	formatter->format(mAllEffects, effectsXML);
-}
-
-void LLPostProcess::apply(unsigned int width, unsigned int height)
-{
-	if (!initialized || width != screenW || height != screenH){
-		initialize(width, height);
-	}
-	if (shadersEnabled()){
-		doEffects();
-	}
-}
-
-void LLPostProcess::initialize(unsigned int width, unsigned int height)
-{
-	screenW = width;
-	screenH = height;
-	createTexture(sceneRenderTexture, screenW, screenH);
-	initialized = true;
-
-	checkError();
-	createNightVisionShader();
-	createBloomShader();
-	createColorFilterShader();
-	checkError();
-}
-
-inline bool LLPostProcess::shadersEnabled(void)
-{
-	return (tweaks.useColorFilter().asBoolean() ||
-			tweaks.useNightVisionShader().asBoolean() ||
-			tweaks.useBloomShader().asBoolean() );
-
-}
-
-void LLPostProcess::applyShaders(void)
-{
-	if (tweaks.useColorFilter()){
-		applyColorFilterShader();
-		checkError();
-	}	
-	if (tweaks.useNightVisionShader()){
-		/// If any of the above shaders have been called update the frame buffer;
-		if (tweaks.useColorFilter()){
-			copyFrameBuffer(sceneRenderTexture, screenW, screenH);
-		}
-		applyNightVisionShader();
-		checkError();
-	}
-	if (tweaks.useBloomShader()){
-		/// If any of the above shaders have been called update the frame buffer;
-		if (tweaks.useColorFilter().asBoolean() || tweaks.useNightVisionShader().asBoolean()){
-			copyFrameBuffer(sceneRenderTexture, screenW, screenH);
-		}
-		applyBloomShader();
-		checkError();
-	}
-}
-
-void LLPostProcess::applyColorFilterShader(void)
-{	
-	gPostColorFilterProgram.bind();
-
-	gGL.getTexUnit(0)->activate();
-	glEnable(GL_TEXTURE_RECTANGLE_ARB);	
-
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, sceneRenderTexture);
-
-	getShaderUniforms(colorFilterUniforms, gPostColorFilterProgram.mProgramObject);
-	glUniform1iARB(colorFilterUniforms["RenderTexture"], 0);
-	glUniform1fARB(colorFilterUniforms["brightness"], tweaks.getBrightness());
-	glUniform1fARB(colorFilterUniforms["contrast"], tweaks.getContrast());
-	float baseI = (tweaks.getContrastBaseR() + tweaks.getContrastBaseG() + tweaks.getContrastBaseB()) / 3.0f;
-	baseI = tweaks.getContrastBaseIntensity() / ((baseI < 0.001f) ? 0.001f : baseI);
-	float baseR = tweaks.getContrastBaseR() * baseI;
-	float baseG = tweaks.getContrastBaseG() * baseI;
-	float baseB = tweaks.getContrastBaseB() * baseI;
-	glUniform3fARB(colorFilterUniforms["contrastBase"], baseR, baseG, baseB);
-	glUniform1fARB(colorFilterUniforms["saturation"], tweaks.getSaturation());
-	glUniform3fARB(colorFilterUniforms["lumWeights"], LUMINANCE_R, LUMINANCE_G, LUMINANCE_B);
-	
-	LLGLEnable blend(GL_BLEND);
-	gGL.setSceneBlendType(LLRender::BT_REPLACE);
-	LLGLDepthTest depth(GL_FALSE);
-		
-	/// Draw a screen space quad
-	drawOrthoQuad(screenW, screenH, QUAD_NORMAL);
-	gPostColorFilterProgram.unbind();
-}
-
-void LLPostProcess::createColorFilterShader(void)
-{
-	/// Define uniform names
-	colorFilterUniforms["RenderTexture"] = 0;
-	colorFilterUniforms["brightness"] = 0;
-	colorFilterUniforms["contrast"] = 0;
-	colorFilterUniforms["contrastBase"] = 0;
-	colorFilterUniforms["saturation"] = 0;
-	colorFilterUniforms["lumWeights"] = 0;
-}
-
-void LLPostProcess::applyNightVisionShader(void)
-{	
-	gPostNightVisionProgram.bind();
-
-	gGL.getTexUnit(0)->activate();
-	glEnable(GL_TEXTURE_RECTANGLE_ARB);	
-
-	getShaderUniforms(nightVisionUniforms, gPostNightVisionProgram.mProgramObject);
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, sceneRenderTexture);
-	glUniform1iARB(nightVisionUniforms["RenderTexture"], 0);
-
-	gGL.getTexUnit(1)->activate();
-	glEnable(GL_TEXTURE_2D);	
-
-	glBindTexture(GL_TEXTURE_2D, noiseTexture);
-	glUniform1iARB(nightVisionUniforms["NoiseTexture"], 1);
-
-	
-	glUniform1fARB(nightVisionUniforms["brightMult"], tweaks.getBrightMult());
-	glUniform1fARB(nightVisionUniforms["noiseStrength"], tweaks.getNoiseStrength());
-	noiseTextureScale = 0.01f + ((101.f - tweaks.getNoiseSize()) / 100.f);
-	noiseTextureScale *= (screenH / NOISE_SIZE);
-
-
-	glUniform3fARB(nightVisionUniforms["lumWeights"], LUMINANCE_R, LUMINANCE_G, LUMINANCE_B);
-	
-	LLGLEnable blend(GL_BLEND);
-	gGL.setSceneBlendType(LLRender::BT_REPLACE);
-	LLGLDepthTest depth(GL_FALSE);
-		
-	/// Draw a screen space quad
-	drawOrthoQuad(screenW, screenH, QUAD_NOISE);
-	gPostNightVisionProgram.unbind();
-	gGL.getTexUnit(0)->activate();
-}
-
-void LLPostProcess::createNightVisionShader(void)
-{
-	/// Define uniform names
-	nightVisionUniforms["RenderTexture"] = 0;
-	nightVisionUniforms["NoiseTexture"] = 0;
-	nightVisionUniforms["brightMult"] = 0;	
-	nightVisionUniforms["noiseStrength"] = 0;
-	nightVisionUniforms["lumWeights"] = 0;	
-
-	createNoiseTexture(noiseTexture);
-}
-
-void LLPostProcess::applyBloomShader(void)
-{
-
-}
-
-void LLPostProcess::createBloomShader(void)
-{
-	createTexture(tempBloomTexture, unsigned(screenW * 0.5), unsigned(screenH * 0.5));
-
-	/// Create Bloom Extract Shader
-	bloomExtractUniforms["RenderTexture"] = 0;
-	bloomExtractUniforms["extractLow"] = 0;
-	bloomExtractUniforms["extractHigh"] = 0;	
-	bloomExtractUniforms["lumWeights"] = 0;	
-	
-	/// Create Bloom Blur Shader
-	bloomBlurUniforms["RenderTexture"] = 0;
-	bloomBlurUniforms["bloomStrength"] = 0;	
-	bloomBlurUniforms["texelSize"] = 0;
-	bloomBlurUniforms["blurDirection"] = 0;
-	bloomBlurUniforms["blurWidth"] = 0;
-}
-
-void LLPostProcess::getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog)
-{
-	/// Find uniform locations and insert into map	
-	std::map<const char *, GLuint>::iterator i;
-	for (i  = uniforms.begin(); i != uniforms.end(); ++i){
-		i->second = glGetUniformLocationARB(prog, i->first);
-	}
-}
-
-void LLPostProcess::doEffects(void)
-{
-	/// Save GL State
-	glPushAttrib(GL_ALL_ATTRIB_BITS);
-	glPushClientAttrib(GL_ALL_ATTRIB_BITS);
-
-	/// Copy the screen buffer to the render texture
-	copyFrameBuffer(sceneRenderTexture, screenW, screenH);
-
-	/// Clear the frame buffer.
-	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-	glClear(GL_COLOR_BUFFER_BIT);
-	
-	/// Change to an orthogonal view
-	viewOrthogonal(screenW, screenH);
-	
-	checkError();
-	applyShaders();
-	
-	LLGLSLShader::bindNoShader();
-	checkError();
-
-	/// Change to a perspective view
-	viewPerspective();	
-
-	/// Reset GL State
-	glPopClientAttrib();
-	glPopAttrib();
-	checkError();
-}
-
-void LLPostProcess::copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height)
-{
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
-	glCopyTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, 0, 0, width, height, 0);
-}
-
-void LLPostProcess::drawOrthoQuad(unsigned int width, unsigned int height, QuadType type)
-{
-#if 0
-	float noiseX = 0.f;
-	float noiseY = 0.f;
-	float screenRatio = 1.0f;
-
-	if (type == QUAD_NOISE){
-		noiseX = ((float) rand() / (float) RAND_MAX);
-		noiseY = ((float) rand() / (float) RAND_MAX);
-		screenRatio = (float) width / (float) height;
-	}
-	
-
-	glBegin(GL_QUADS);
-		if (type != QUAD_BLOOM_EXTRACT){
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, (GLfloat) height);
-		} else {
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, (GLfloat) height * 2.0f);
-		}
-		if (type == QUAD_NOISE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
-									noiseX,
-									noiseTextureScale + noiseY);
-		} else if (type == QUAD_BLOOM_COMBINE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0.f, (GLfloat) height * 0.5f);
-		}
-		glVertex2f(0.f, (GLfloat) screenH - height);
-
-		if (type != QUAD_BLOOM_EXTRACT){
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, 0.f);
-		} else {
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, 0.f, 0.f);
-		}
-		if (type == QUAD_NOISE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
-									noiseX,
-									noiseY);
-		} else if (type == QUAD_BLOOM_COMBINE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0.f, 0.f);
-		}
-		glVertex2f(0.f, (GLfloat) height + (screenH - height));
-
-		
-		if (type != QUAD_BLOOM_EXTRACT){
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width, 0.f);
-		} else {
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width * 2.0f, 0.f);
-		}
-		if (type == QUAD_NOISE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
-									screenRatio * noiseTextureScale + noiseX,
-									noiseY);
-		} else if (type == QUAD_BLOOM_COMBINE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, (GLfloat) width * 0.5f, 0.f);
-		}
-		glVertex2f((GLfloat) width, (GLfloat) height + (screenH - height));
-
-		
-		if (type != QUAD_BLOOM_EXTRACT){
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width, (GLfloat) height);
-		} else {
-			glMultiTexCoord2fARB(GL_TEXTURE0_ARB, (GLfloat) width * 2.0f, (GLfloat) height * 2.0f);
-		}
-		if (type == QUAD_NOISE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB,
-									screenRatio * noiseTextureScale + noiseX,
-									noiseTextureScale + noiseY);
-		} else if (type == QUAD_BLOOM_COMBINE){
-			glMultiTexCoord2fARB(GL_TEXTURE1_ARB, (GLfloat) width * 0.5f, (GLfloat) height * 0.5f);
-		}
-		glVertex2f((GLfloat) width, (GLfloat) screenH - height);
-	glEnd();
-#endif
-}
-
-void LLPostProcess::viewOrthogonal(unsigned int width, unsigned int height)
-{
-	glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-	glLoadIdentity();
-	glOrtho( 0.f, (GLdouble) width , (GLdouble) height , 0.f, -1.f, 1.f );
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-	glLoadIdentity();
-}
-
-void LLPostProcess::viewPerspective(void)
-{
-	glMatrixMode( GL_PROJECTION );
-	glPopMatrix();
-	glMatrixMode( GL_MODELVIEW );
-	glPopMatrix();
-}
-
-void LLPostProcess::changeOrthogonal(unsigned int width, unsigned int height)
-{
-	viewPerspective();
-	viewOrthogonal(width, height);
-}
-
-void LLPostProcess::createTexture(GLuint & texture, unsigned int width, unsigned int height)
-{
-	if (texture != 0){
-		glDeleteTextures(1, &texture);
-	}
-
-	std::vector<GLubyte> data(width * height * 4, 0);
-
-	glGenTextures(1, &texture);
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
-	glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 4, width, height, 0,
-		GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-}
-
-void LLPostProcess::createNoiseTexture(GLuint & texture)
-{
-	if (texture != 0){
-		glDeleteTextures(1, &texture);
-	}
-	glGenTextures(1, &texture);
-
-	std::vector<GLubyte> buffer(NOISE_SIZE * NOISE_SIZE);
-	for (unsigned int i = 0; i < NOISE_SIZE; i++){
-		for (unsigned int k = 0; k < NOISE_SIZE; k++){
-			buffer[(i * NOISE_SIZE) + k] = (GLubyte)((double) rand() / ((double) RAND_MAX + 1.f) * 255.f);
-		}
-	}
-	glBindTexture(GL_TEXTURE_2D, texture);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-}
-
-bool LLPostProcess::checkError(void)
-{
-	GLenum glErr;
-    bool    retCode = false;
-
-    glErr = glGetError();
-    while (glErr != GL_NO_ERROR)
-    {
-		// shaderErrorLog << (const char *) gluErrorString(glErr) << std::endl;
-		char const * err_str_raw = (const char *) gluErrorString(glErr);
-
-		if(err_str_raw == NULL)
-		{
-			std::ostringstream err_builder;
-			err_builder << "unknown error number " << glErr;
-			mShaderErrorString = err_builder.str();
-		}
-		else
-		{
-			mShaderErrorString = err_str_raw;
-		}
-
-        retCode = true;
-        glErr = glGetError();
-    }
-    return retCode;
-}
-
-void LLPostProcess::checkShaderError(GLhandleARB shader)
-{
-    GLint infologLength = 0;
-    GLint charsWritten  = 0;
-    GLchar *infoLog;
-
-    checkError();  // Check for OpenGL errors
-
-    glGetObjectParameterivARB(shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &infologLength);
-
-    checkError();  // Check for OpenGL errors
-
-    if (infologLength > 0)
-    {
-        infoLog = (GLchar *)malloc(infologLength);
-        if (infoLog == NULL)
-        {
-            /// Could not allocate infolog buffer
-            return;
-        }
-        glGetInfoLogARB(shader, infologLength, &charsWritten, infoLog);
-		// shaderErrorLog << (char *) infoLog << std::endl;
-		mShaderErrorString = (char *) infoLog;
-        free(infoLog);
-    }
-    checkError();  // Check for OpenGL errors
-}
diff --git a/linden/indra/newview/llpostprocess.h b/linden/indra/newview/llpostprocess.h
deleted file mode 100644
index 738d0f0..0000000
--- a/linden/indra/newview/llpostprocess.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/** 
- * @file llpostprocess.h
- * @brief LLPostProcess class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_POSTPROCESS_H
-#define LL_POSTPROCESS_H
-
-#include <map>
-#include <fstream>
-#include "llgl.h"
-#include "llglheaders.h"
-
-class LLPostProcess 
-{
-public:
-
-	typedef enum _QuadType {
-		QUAD_NORMAL,
-		QUAD_NOISE,
-		QUAD_BLOOM_EXTRACT,
-		QUAD_BLOOM_COMBINE
-	} QuadType;
-
-	/// GLSL Shader Encapsulation Struct
-	typedef std::map<const char *, GLuint> glslUniforms;
-
-	struct PostProcessTweaks : public LLSD {
-		inline PostProcessTweaks() : LLSD(LLSD::emptyMap())
-		{
-		}
-
-		inline LLSD & brightMult() {
-			return (*this)["brightness_multiplier"];
-		}
-
-		inline LLSD & noiseStrength() {
-			return (*this)["noise_strength"];
-		}
-
-		inline LLSD & noiseSize() {
-			return (*this)["noise_size"];
-		}
-
-		inline LLSD & extractLow() {
-			return (*this)["extract_low"];
-		}
-
-		inline LLSD & extractHigh() {
-			return (*this)["extract_high"];
-		}
-
-		inline LLSD & bloomWidth() {
-			return (*this)["bloom_width"];
-		}
-
-		inline LLSD & bloomStrength() {
-			return (*this)["bloom_strength"];
-		}
-
-		inline LLSD & brightness() {
-			return (*this)["brightness"];
-		}
-
-		inline LLSD & contrast() {
-			return (*this)["contrast"];
-		}
-
-		inline LLSD & contrastBaseR() {
-			return (*this)["contrast_base"][0];
-		}
-
-		inline LLSD & contrastBaseG() {
-			return (*this)["contrast_base"][1];
-		}
-
-		inline LLSD & contrastBaseB() {
-			return (*this)["contrast_base"][2];
-		}
-
-		inline LLSD & contrastBaseIntensity() {
-			return (*this)["contrast_base"][3];
-		}
-
-		inline LLSD & saturation() {
-			return (*this)["saturation"];
-		}
-
-		inline LLSD & useNightVisionShader() {
-			return (*this)["enable_night_vision"];
-		}
-
-		inline LLSD & useBloomShader() {
-			return (*this)["enable_bloom"];
-		}
-
-		inline LLSD & useColorFilter() {
-			return (*this)["enable_color_filter"];
-		}
-
-
-		inline F32 getBrightMult() const {
-			return F32((*this)["brightness_multiplier"].asReal());
-		}
-
-		inline F32 getNoiseStrength() const {
-			return F32((*this)["noise_strength"].asReal());
-		}
-
-		inline F32 getNoiseSize() const {
-			return F32((*this)["noise_size"].asReal());
-		}
-
-		inline F32 getExtractLow() const {
-			return F32((*this)["extract_low"].asReal());
-		}
-
-		inline F32 getExtractHigh() const {
-			return F32((*this)["extract_high"].asReal());
-		}
-
-		inline F32 getBloomWidth() const {
-			return F32((*this)["bloom_width"].asReal());
-		}
-
-		inline F32 getBloomStrength() const {
-			return F32((*this)["bloom_strength"].asReal());
-		}
-
-		inline F32 getBrightness() const {
-			return F32((*this)["brightness"].asReal());
-		}
-
-		inline F32 getContrast() const {
-			return F32((*this)["contrast"].asReal());
-		}
-
-		inline F32 getContrastBaseR() const {
-			return F32((*this)["contrast_base"][0].asReal());
-		}
-
-		inline F32 getContrastBaseG() const {
-			return F32((*this)["contrast_base"][1].asReal());
-		}
-
-		inline F32 getContrastBaseB() const {
-			return F32((*this)["contrast_base"][2].asReal());
-		}
-
-		inline F32 getContrastBaseIntensity() const {
-			return F32((*this)["contrast_base"][3].asReal());
-		}
-
-		inline F32 getSaturation() const {
-			return F32((*this)["saturation"].asReal());
-		}
-
-	};
-	
-	GLuint sceneRenderTexture;
-	GLuint noiseTexture;
-	GLuint tempBloomTexture;
-	bool initialized;
-	PostProcessTweaks tweaks;
-
-	// the map of all availible effects
-	LLSD mAllEffects;
-
-public:
-	LLPostProcess(void);
-
-	~LLPostProcess(void);
-
-	void apply(unsigned int width, unsigned int height);
-
-	/// Perform global initialization for this class.
-	static void initClass(void);
-
-	// Cleanup of global data that's only inited once per class.
-	static void cleanupClass();
-
-	void setSelectedEffect(std::string const & effectName);
-
-	inline LLString const & getSelectedEffect(void) const {
-		return mSelectedEffectName;
-	}
-
-	void saveEffect(std::string const & effectName);
-
-private:
-		/// read in from file
-	std::string mShaderErrorString;
-	unsigned int screenW;
-	unsigned int screenH;
-
-	float noiseTextureScale;
-	
-	/// Shader Uniforms
-	glslUniforms nightVisionUniforms;
-	glslUniforms bloomExtractUniforms;
-	glslUniforms bloomBlurUniforms;
-	glslUniforms colorFilterUniforms;
-
-	// the name of currently selected effect in mAllEffects
-	// invariant: tweaks == mAllEffects[mSelectedEffectName]
-	LLString mSelectedEffectName;
-
-	/// General functions
-	void initialize(unsigned int width, unsigned int height);
-	void doEffects(void);
-	void applyShaders(void);
-	bool shadersEnabled(void);
-
-	/// Night Vision Functions
-	void createNightVisionShader(void);
-	void applyNightVisionShader(void);
-
-	/// Bloom Functions
-	void createBloomShader(void);
-	void applyBloomShader(void);
-
-	/// Color Filter Functions
-	void createColorFilterShader(void);
-	void applyColorFilterShader(void);
-
-	/// OpenGL Helper Functions
-	void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog);
-	void createTexture(GLuint & texture, unsigned int width, unsigned int height);
-	void copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height);
-	void createNoiseTexture(GLuint & texture);
-	bool checkError(void);
-	void checkShaderError(GLhandleARB shader);
-	void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);
-	void viewOrthogonal(unsigned int width, unsigned int height);
-	void changeOrthogonal(unsigned int width, unsigned int height);
-	void viewPerspective(void);
-};
-
-extern LLPostProcess * gPostProcess;
-
-
-#endif // LL_POSTPROCESS_H
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 3236f79..e045e61 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -36,6 +36,7 @@
 #include "lltexteditor.h"
 #include "llviewercontrol.h"
 #include "lluictrlfactory.h"
+#include "llstylemap.h"
 
 class LLPrefsChatImpl : public LLPanel
 {
@@ -53,6 +54,7 @@ protected:
 	F32	mChatPersist;
 	S32	mChatMaxLines;
 	LLColor4 mSystemChatColor;
+	LLColor4 mUserChatColor;
 	LLColor4 mAgentChatColor;
 	LLColor4 mIMChatColor;
 	LLColor4 mObjectChatColor;
@@ -73,7 +75,7 @@ protected:
 
 
 LLPrefsChatImpl::LLPrefsChatImpl()
-:	LLPanel("Chat Panel")
+	:	LLPanel(std::string("Chat Panel"))
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_chat.xml");
 
@@ -89,6 +91,7 @@ void LLPrefsChatImpl::refresh()
 	mChatPersist = gSavedSettings.getF32("ChatPersistTime");
 	mChatMaxLines = gSavedSettings.getS32("ConsoleMaxLines");
 	mSystemChatColor = gSavedSettings.getColor4("SystemChatColor");
+	mUserChatColor = gSavedSettings.getColor4("UserChatColor");
 	mAgentChatColor = gSavedSettings.getColor4("AgentChatColor");
 	mIMChatColor = gSavedSettings.getColor4("IMChatColor");
 	mObjectChatColor = gSavedSettings.getColor4("ObjectChatColor");
@@ -102,6 +105,7 @@ void LLPrefsChatImpl::refresh()
 	mChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
 	mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth");
 	mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn");
+	mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 
 	mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
 	mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
 }
@@ -112,6 +116,7 @@ void LLPrefsChatImpl::cancel()
 	gSavedSettings.setF32("ChatPersistTime", mChatPersist);
 	gSavedSettings.setS32("ConsoleMaxLines", mChatMaxLines);
 	gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
+	gSavedSettings.setColor4("UserChatColor", mUserChatColor);
 	gSavedSettings.setColor4("AgentChatColor", mAgentChatColor);
 	gSavedSettings.setColor4("IMChatColor", mIMChatColor);
 	gSavedSettings.setColor4("ObjectChatColor", mObjectChatColor);
@@ -125,6 +130,7 @@ void LLPrefsChatImpl::cancel()
 	gSavedSettings.setBOOL("UseChatBubbles", mChatBubbles);
 	gSavedSettings.setBOOL("ChatFullWidth", mChatFullWidth);
 	gSavedSettings.setBOOL("CloseChatOnReturn", mCloseChatOnReturn);
+	gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); 
 	gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
 	gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);	
 }
@@ -149,6 +155,7 @@ void LLPrefsChat::apply()
 {
 	impl.apply();
 	LLTextEditor::setLinkColor( gSavedSettings.getColor4("HTMLLinkColor") );
+	LLStyleMap::instance().update();
 }
 
 void LLPrefsChat::cancel()
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index fff10c7..5333df8 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -76,8 +76,8 @@ protected:
 	BOOL mLogIMChat;
 	BOOL mLogTimestampDate;
 
-	LLString mIMBusyResponse;
-	LLString mLogPath;
+	std::string mIMBusyResponse;
+	std::string mLogPath;
 
 	bool mGotPersonalInfo;
 	bool mOriginalIMViaEmail;
@@ -89,7 +89,7 @@ protected:
 
 
 LLPrefsIMImpl::LLPrefsIMImpl()
- : LLPanel("IM Prefs Panel")
+	: LLPanel(std::string("IM Prefs Panel"))
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_im.xml");
 }
@@ -190,16 +190,16 @@ void LLPrefsIMImpl::apply()
 	LLTextEditor* busy = getChild<LLTextEditor>("busy_response");
 	LLWString busy_response;
 	if (busy) busy_response = busy->getWText(); 
-	LLWString::replaceTabsWithSpaces(busy_response, 4);
-	LLWString::replaceChar(busy_response, '\n', '^');
-	LLWString::replaceChar(busy_response, ' ', '%');
+	LLWStringUtil::replaceTabsWithSpaces(busy_response, 4);
+	LLWStringUtil::replaceChar(busy_response, '\n', '^');
+	LLWStringUtil::replaceChar(busy_response, ' ', '%');
 	
 	if(mGotPersonalInfo)
 	{ 
 
-		gSavedPerAccountSettings.setString("BusyModeResponse", LLString(wstring_to_utf8str(busy_response)));
+		gSavedPerAccountSettings.setString("BusyModeResponse", std::string(wstring_to_utf8str(busy_response)));
 
-		gSavedPerAccountSettings.setString("InstantMessageLogPath", childGetText("log_path_string").c_str());
+		gSavedPerAccountSettings.setString("InstantMessageLogPath", childGetText("log_path_string"));
 		gSavedPerAccountSettings.setBOOL("LogInstantMessages",childGetValue("log_instant_messages").asBoolean());
 		gSavedPerAccountSettings.setBOOL("LogChat",childGetValue("log_chat").asBoolean());
 		gSavedPerAccountSettings.setBOOL("LogShowHistory",childGetValue("log_show_history").asBoolean());
@@ -210,9 +210,9 @@ void LLPrefsIMImpl::apply()
 
 		gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
 
-		gDirUtilp->setPerAccountChatLogsDir(gSavedSettings.getString("FirstName").c_str(), 
-											gSavedSettings.getString("LastName").c_str() );
-		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir().c_str());
+		gDirUtilp->setPerAccountChatLogsDir(gSavedSettings.getString("FirstName"), 
+											gSavedSettings.getString("LastName") );
+		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
 		
 		bool new_im_via_email = childGetValue("send_im_to_email").asBoolean();
 		bool new_hide_online = childGetValue("online_visibility").asBoolean();		
@@ -281,8 +281,8 @@ void LLPrefsIMImpl::setPersonalInfo(
 	
 	//RN: get wide string so replace char can work (requires fixed-width encoding)
 	LLWString busy_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("BusyModeResponse") );
-	LLWString::replaceChar(busy_response, '^', '\n');
-	LLWString::replaceChar(busy_response, '%', ' ');
+	LLWStringUtil::replaceChar(busy_response, '^', '\n');
+	LLWStringUtil::replaceChar(busy_response, '%', ' ');
 	childSetText("busy_response", wstring_to_utf8str(busy_response));
 
 	enableHistory();
@@ -305,7 +305,7 @@ void LLPrefsIMImpl::onClickLogPath(void* user_data)
 {
 	LLPrefsIMImpl* self=(LLPrefsIMImpl*)user_data;
 	
-	LLString proposed_name(self->childGetText("log_path_string"));	 
+	std::string proposed_name(self->childGetText("log_path_string"));	 
 	
 	LLDirPicker& picker = LLDirPicker::instance();
 	if (! picker.getDir(&proposed_name ) )
@@ -346,15 +346,9 @@ void LLPrefsIM::cancel()
 	impl.cancel();
 }
 
-void LLPrefsIM::setPersonalInfo(
-	const char* visibility,
-	bool im_via_email,
-	const char* email)
+void LLPrefsIM::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
-	impl.setPersonalInfo(
-		ll_safe_string(visibility),
-		im_via_email,
-		ll_safe_string(email));
+	impl.setPersonalInfo(visibility, im_via_email, email);
 }
 
 LLPanel* LLPrefsIM::getPanel()
diff --git a/linden/indra/newview/llprefsim.h b/linden/indra/newview/llprefsim.h
index 11851f7..839501f 100644
--- a/linden/indra/newview/llprefsim.h
+++ b/linden/indra/newview/llprefsim.h
@@ -44,10 +44,7 @@ public:
 
 	void apply();
 	void cancel();
-	void setPersonalInfo(
-		const char* visibility,
-		bool im_via_email,
-		const char* email);
+	void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
 
 	LLPanel* getPanel();
 
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 22a0115..5aa2cf4 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -57,7 +57,7 @@ private:
 
 public:
 	LLVoiceHotkeySelectDialog( LLPrefsVoiceLogic *parent )
-		: LLModalDialog( "", 240, 100 ),
+		: LLModalDialog( LLStringUtil::null, 240, 100 ),
 		  mParent( parent )
 	{
 		mOldFrontmost = gFloaterView->getFrontmost();
@@ -229,7 +229,7 @@ BOOL LLVoiceHotkeySelectDialog::handleKeyHere(KEY key, MASK mask)
 
 
 LLPrefsVoice::LLPrefsVoice()
-:	LLPanel("Voice Chat Panel")
+	:	LLPanel(std::string("Voice Chat Panel"))
 { 
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_voice.xml");
 	mLogic = new LLPrefsVoiceLogic(this);
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 39bdfd4..ef212d2 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -541,7 +541,7 @@ void LLPreview::userSetShape(const LLRect& new_rect)
 // LLMultiPreview
 //
 
-LLMultiPreview::LLMultiPreview(const LLRect& rect) : LLMultiFloater("Preview", rect)
+LLMultiPreview::LLMultiPreview(const LLRect& rect) : LLMultiFloater(std::string("Preview"), rect)
 {
 	setCanResize(TRUE);
 }
diff --git a/linden/indra/newview/llpreviewanim.h b/linden/indra/newview/llpreviewanim.h
index 74408ed..8c32d9f 100644
--- a/linden/indra/newview/llpreviewanim.h
+++ b/linden/indra/newview/llpreviewanim.h
@@ -53,7 +53,7 @@ protected:
 	
 	LLAnimPauseRequest	mPauseRequest;
 	LLUUID		mItemID;
-	LLString	mTitle;
+	std::string	mTitle;
 	LLUUID		mObjectID;
 	LLButton*	mPlayBtn;
 	LLButton*	mAuditionBtn;
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index c53eab7..c0c3c93 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -72,9 +72,9 @@
 
 
 // *TODO: Translate?
-const char NONE_LABEL[] = "---";
-const char SHIFT_LABEL[] = "Shift";
-const char CTRL_LABEL[] = "Ctrl";
+const std::string NONE_LABEL = "---";
+const std::string SHIFT_LABEL = "Shift";
+const std::string CTRL_LABEL = "Ctrl";
 
 void dialog_refresh_all();
 
@@ -111,7 +111,7 @@ struct SortItemPtrsByName
 {
 	bool operator()(const LLInventoryItem* i1, const LLInventoryItem* i2)
 	{
-		return (LLString::compareDict(i1->getName(), i2->getName()) < 0);
+		return (LLStringUtil::compareDict(i1->getName(), i2->getName()) < 0);
 	}
 };
 
@@ -203,7 +203,7 @@ BOOL LLPreviewGesture::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 										 EDragAndDropType cargo_type,
 										 void* cargo_data,
 										 EAcceptance* accept,
-										 LLString& tooltip_msg)
+										 std::string& tooltip_msg)
 {
 	BOOL handled = TRUE;
 	switch(cargo_type)
@@ -584,7 +584,7 @@ void LLPreviewGesture::addAnimations()
 
 	combo->removeall();
 	
-	LLString none_text = getString("none_text");
+	std::string none_text = getString("none_text");
 
 	combo->add(none_text, LLUUID::null);
 
@@ -639,7 +639,7 @@ void LLPreviewGesture::addSounds()
 	LLComboBox* combo = mSoundCombo;
 	combo->removeall();
 	
-	LLString none_text = getString("none_text");
+	std::string none_text = getString("none_text");
 
 	combo->add(none_text, LLUUID::null);
 
@@ -775,7 +775,7 @@ void LLPreviewGesture::refresh()
 	mWaitTimeCheck->setVisible(FALSE);
 	mWaitTimeEditor->setVisible(FALSE);
 
-	LLString optionstext;
+	std::string optionstext;
 	
 	if (have_step)
 	{
@@ -995,13 +995,13 @@ void LLPreviewGesture::loadUIFromGesture(LLMultiGesture* gesture)
 	{
 	default:
 	  case MASK_NONE:
-		mModifierCombo->setSimple( LLString(NONE_LABEL) );
+		mModifierCombo->setSimple( NONE_LABEL );
 		break;
 	  case MASK_SHIFT:
-		mModifierCombo->setSimple( LLString(SHIFT_LABEL) );
+		mModifierCombo->setSimple( SHIFT_LABEL );
 		break;
 	  case MASK_CONTROL:
-		mModifierCombo->setSimple( LLString(CTRL_LABEL) );
+		mModifierCombo->setSimple( CTRL_LABEL );
 		break;
 	}
 
@@ -1075,7 +1075,7 @@ void LLPreviewGesture::loadUIFromGesture(LLMultiGesture* gesture)
 // after the save finishes.
 struct LLSaveInfo
 {
-	LLSaveInfo(const LLUUID& item_id, const LLUUID& object_id, const LLString& desc,
+	LLSaveInfo(const LLUUID& item_id, const LLUUID& object_id, const std::string& desc,
 				const LLTransactionID tid)
 		: mItemUUID(item_id), mObjectUUID(object_id), mDesc(desc), mTransactionID(tid)
 	{
@@ -1083,7 +1083,7 @@ struct LLSaveInfo
 
 	LLUUID mItemUUID;
 	LLUUID mObjectUUID;
-	LLString mDesc;
+	std::string mDesc;
 	LLTransactionID mTransactionID;
 };
 
@@ -1274,7 +1274,7 @@ void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data,
 	else
 	{
 		llwarns << "Problem saving gesture: " << status << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("GestureSaveFailedReason",args);
 	}
@@ -1290,7 +1290,7 @@ LLMultiGesture* LLPreviewGesture::createGesture()
 	gesture->mTrigger = mTriggerEditor->getText();
 	gesture->mReplaceText = mReplaceEditor->getText();
 
-	const LLString& modifier = mModifierCombo->getSimple();
+	const std::string& modifier = mModifierCombo->getSimple();
 	if (modifier == CTRL_LABEL)
 	{
 		gesture->mMask = MASK_CONTROL;
@@ -1310,8 +1310,8 @@ LLMultiGesture* LLPreviewGesture::createGesture()
 	}
 	else
 	{
-		const LLString& key_string = mKeyCombo->getSimple();
-		LLKeyboard::keyFromString(key_string.c_str(), &(gesture->mKey));
+		const std::string& key_string = mKeyCombo->getSimple();
+		LLKeyboard::keyFromString(key_string, &(gesture->mKey));
 	}
 
 	std::vector<LLScrollListItem*> data_list = mStepList->getAllData();
@@ -1609,19 +1609,19 @@ void LLPreviewGesture::onClickAdd(void* data)
 LLScrollListItem* LLPreviewGesture::addStep(const std::string& library_text)
 {
 	LLGestureStep* step = NULL;
-	if (!LLString::compareInsensitive(library_text.c_str(), "Animation"))
+	if (!LLStringUtil::compareInsensitive(library_text, "Animation"))
 	{
 		step = new LLGestureStepAnimation();
 	}
-	else if (!LLString::compareInsensitive(library_text.c_str(), "Sound"))
+	else if (!LLStringUtil::compareInsensitive(library_text, "Sound"))
 	{
 		step = new LLGestureStepSound();
 	}
-	else if (!LLString::compareInsensitive(library_text.c_str(), "Chat"))
+	else if (!LLStringUtil::compareInsensitive(library_text, "Chat"))
 	{
 		step = new LLGestureStepChat();
 	}
-	else if (!LLString::compareInsensitive(library_text.c_str(), "Wait"))
+	else if (!LLStringUtil::compareInsensitive(library_text, "Wait"))
 	{
 		step = new LLGestureStepWait();
 	}
diff --git a/linden/indra/newview/llpreviewgesture.h b/linden/indra/newview/llpreviewgesture.h
index ec80c45..41008f9 100644
--- a/linden/indra/newview/llpreviewgesture.h
+++ b/linden/indra/newview/llpreviewgesture.h
@@ -58,7 +58,7 @@ public:
 									 EDragAndDropType cargo_type,
 									 void* cargo_data,
 									 EAcceptance* accept,
-									 LLString& tooltip_msg);
+									 std::string& tooltip_msg);
 
 	// LLPanel
 	virtual BOOL postBuild();
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index adb6db1..01d77f6 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -57,6 +57,7 @@
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "lluictrlfactory.h"
+#include "lltexturectrl.h"
 
 
 
@@ -137,14 +138,14 @@ void LLPreviewLandmark::getDegreesAndDist( F32* degrees, F64* horiz_dist, F64* v
 	}
 }
 
-const LLString& LLPreviewLandmark::getName() const
+const std::string& LLPreviewLandmark::getName() const
 {
 	const LLInventoryItem *item = getItem();
 	if (item)
 	{
 		return item->getName();
 	}
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
 LLVector3d LLPreviewLandmark::getPositionGlobal() const
diff --git a/linden/indra/newview/llpreviewlandmark.h b/linden/indra/newview/llpreviewlandmark.h
index 2204d2d..61d8309 100644
--- a/linden/indra/newview/llpreviewlandmark.h
+++ b/linden/indra/newview/llpreviewlandmark.h
@@ -69,7 +69,7 @@ public:
 
 	/*virtual*/ void			draw();
 
-	const LLString&				getName() const;
+	const std::string&				getName() const;
 	const LLColor4&				getMarkerColor() const;
 
 	LLVector3d getPositionGlobal() const;
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 9e4272f..30df1c3 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -281,7 +281,7 @@ void LLPreviewNotecard::loadAsset()
 			mAssetID = item->getAssetUUID();
 			if(mAssetID.isNull())
 			{
-				editor->setText(LLString::null);
+				editor->setText(LLStringUtil::null);
 				editor->makePristine();
 				editor->setEnabled(TRUE);
 				mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -341,7 +341,7 @@ void LLPreviewNotecard::loadAsset()
 	}
 	else
 	{
-		editor->setText(LLString::null);
+		editor->setText(LLStringUtil::null);
 		editor->makePristine();
 		editor->setEnabled(TRUE);
 		mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -376,7 +376,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
 
 			if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
 			{
-				if( !previewEditor->importBuffer( buffer ) )
+				if( !previewEditor->importBuffer( buffer, file_length+1 ) )
 				{
 					llwarns << "Problem importing notecard" << llendl;
 				}
@@ -479,7 +479,7 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem)
 
 		LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
 
-		LLString buffer;
+		std::string buffer;
 		if (!editor->exportBuffer(buffer))
 		{
 			return false;
@@ -601,15 +601,15 @@ void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data
 	else
 	{
 		llwarns << "Problem saving notecard: " << status << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("SaveNotecardFailReason",args);
 	}
 
-	char uuid_string[UUID_STR_LENGTH];		/*Flawfinder: ignore*/
+	std::string uuid_string;
 	asset_uuid.toString(uuid_string);
-	char filename[LL_MAX_PATH];		/*Flawfinder: ignore*/
-	snprintf(filename, LL_MAX_PATH, "%s.tmp", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());			/* Flawfinder: ignore */
+	std::string filename;
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string) + ".tmp";
 	LLFile::remove(filename);
 	delete info;
 }
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 9ef711d..52fca27 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -88,7 +88,7 @@
 #include "llpanelinventory.h"
 
 
-const char HELLO_LSL[] =
+const std::string HELLO_LSL =
 	"default\n"
 	"{\n"
 	"    state_entry()\n"
@@ -101,10 +101,10 @@ const char HELLO_LSL[] =
 	"        llSay(0, \"Touched.\");\n"
 	"    }\n"
 	"}\n";
-const char HELP_LSL[] = "lsl_guide.html";
+const std::string HELP_LSL = "lsl_guide.html";
 
-const char DEFAULT_SCRIPT_NAME[] = "New Script"; // *TODO:Translate?
-const char DEFAULT_SCRIPT_DESC[] = "(No Description)"; // *TODO:Translate?
+const std::string DEFAULT_SCRIPT_NAME = "New Script"; // *TODO:Translate?
+const std::string DEFAULT_SCRIPT_DESC = "(No Description)"; // *TODO:Translate?
 
 // Description and header information
 
@@ -139,6 +139,12 @@ const S32 TEXT_EDIT_COLUMN_HEIGHT = 16;
 const S32 MAX_HISTORY_COUNT = 10;
 const F32 LIVE_HELP_REFRESH_TIME = 1.f;
 
+static bool have_script_upload_cap(LLUUID& object_id)
+{
+	LLViewerObject* object = gObjectList.findObject(object_id);
+	return object && (! object->getRegion()->getCapability("UpdateScriptTask").empty());
+}
+
 /// ---------------------------------------------------------------------------
 /// LLFloaterScriptSearch
 /// ---------------------------------------------------------------------------
@@ -173,7 +179,7 @@ private:
 LLFloaterScriptSearch* LLFloaterScriptSearch::sInstance = NULL;
 
 LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLScriptEdCore* editor_core)
-		: LLFloater("script search",rect,title), mEditorCore(editor_core)
+	: LLFloater("script	search",rect,title), mEditorCore(editor_core)
 {
 	
 	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_search.xml");
@@ -296,7 +302,7 @@ LLScriptEdCore::LLScriptEdCore(
 	void* userdata,
 	S32 bottom_pad)
 	:
-	LLPanel( "name", rect ),
+	LLPanel( std::string("name"), rect ),
 	mSampleText(sample),
 	mHelpFile ( help ),
 	mEditor( NULL ),
@@ -306,14 +312,15 @@ LLScriptEdCore::LLScriptEdCore(
 	mUserdata( userdata ),
 	mForceClose( FALSE ),
 	mLastHelpToken(NULL),
-	mLiveHelpHistorySize(0)
+	mLiveHelpHistorySize(0),
+	mEnableSave(FALSE)
 {
 	setFollowsAll();
 	setBorderVisible(FALSE);
 
 	
 	LLUICtrlFactory::getInstance()->buildPanel(this, "floater_script_ed_panel.xml");
-	
+
 	mErrorList = getChild<LLScrollListCtrl>("lsl errors");
 
 	mFunctions = getChild<LLComboBox>( "Insert...");
@@ -326,15 +333,15 @@ LLScriptEdCore::LLScriptEdCore(
 	mEditor->setEnabled(TRUE);
 	mEditor->setWordWrap(TRUE);
 
-	LLDynamicArray<const char*> funcs;
-	LLDynamicArray<const char*> tooltips;
+	std::vector<std::string> funcs;
+	std::vector<std::string> tooltips;
 	for (S32 i = 0; i < gScriptLibrary.mNextNumber; i++)
 	{
 		// Make sure this isn't a god only function, or the agent is a god.
 		if (!gScriptLibrary.mFunctions[i]->mGodOnly || gAgent.isGodlike())
 		{
-			funcs.put(gScriptLibrary.mFunctions[i]->mName);
-			tooltips.put(gScriptLibrary.mFunctions[i]->mDesc);
+			funcs.push_back(ll_safe_string(gScriptLibrary.mFunctions[i]->mName));
+			tooltips.push_back(ll_safe_string(gScriptLibrary.mFunctions[i]->mDesc));
 		}
 	}
 	LLColor3 color(0.5f, 0.0f, 0.15f);
@@ -439,13 +446,13 @@ BOOL LLScriptEdCore::hasChanged(void* userdata)
 	LLScriptEdCore* self = (LLScriptEdCore*)userdata;
 	if (!self || !self->mEditor) return FALSE;
 
-	return !self->mEditor->isPristine();
+	return !self->mEditor->isPristine() || self->mEnableSave;
 }
 
 void LLScriptEdCore::draw()
 {
-	BOOL script_changed = !mEditor->isPristine();
-	childSetEnabled("Save_btn", script_changed);
+	BOOL script_changed	= hasChanged(this);
+	childSetEnabled("Save_btn",	script_changed);
 
 	if( mEditor->hasFocus() )
 	{
@@ -458,7 +465,7 @@ void LLScriptEdCore::draw()
 	}
 	else
 	{
-		childSetText("line_col", LLString::null);
+		childSetText("line_col", LLStringUtil::null);
 	}
 
 	updateDynamicHelp();
@@ -517,18 +524,18 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
 		}
 		if (immediate || (mLiveHelpTimer.getStarted() && mLiveHelpTimer.getElapsedTimeF32() > LIVE_HELP_REFRESH_TIME))
 		{
-			LLString help_string = mEditor->getText().substr(segment->getStart(), segment->getEnd() - segment->getStart());
+			std::string help_string = mEditor->getText().substr(segment->getStart(), segment->getEnd() - segment->getStart());
 			setHelpPage(help_string);
 			mLiveHelpTimer.stop();
 		}
 	}
 	else if (immediate)
 	{
-		setHelpPage("");
+		setHelpPage(LLStringUtil::null);
 	}
 }
 
-void LLScriptEdCore::setHelpPage(const LLString& help_string)
+void LLScriptEdCore::setHelpPage(const std::string& help_string)
 {
 	LLFloater* help_floater = mLiveHelpHandle.get();
 	if (!help_floater) return;
@@ -549,7 +556,7 @@ void LLScriptEdCore::setHelpPage(const LLString& help_string)
 
 }
 
-void LLScriptEdCore::addHelpItemToHistory(const LLString& help_string)
+void LLScriptEdCore::addHelpItemToHistory(const std::string& help_string)
 {
 	if (help_string.empty()) return;
 
@@ -594,7 +601,7 @@ void LLScriptEdCore::addHelpItemToHistory(const LLString& help_string)
 
 BOOL LLScriptEdCore::canClose()
 {
-	if(mForceClose || mEditor->isPristine())
+	if(mForceClose || !hasChanged(this))
 	{
 		return TRUE;
 	}
@@ -640,7 +647,7 @@ void LLScriptEdCore::onHelpWebDialog(S32 option, void* userdata)
 	switch(option)
 	{
 	case 0:
-		load_url_local_file(corep->mHelpFile.c_str());
+		load_url_local_file(corep->mHelpFile);
 		break;
 	default:
 		break;
@@ -669,7 +676,7 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
 		return;
 	}
 
-	live_help_floater = new LLFloater("lsl_help");
+	live_help_floater = new LLFloater(std::string("lsl_help"));
 	LLUICtrlFactory::getInstance()->buildFloater(live_help_floater, "floater_lsl_guide.xml");
 	((LLFloater*)corep->getParent())->addDependentFloater(live_help_floater, TRUE);
 	live_help_floater->childSetCommitCallback("lock_check", onCheckLock, userdata);
@@ -760,7 +767,7 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
 	LLFloater* live_help_floater = corep->mLiveHelpHandle.get();
 	if (live_help_floater)
 	{
-		LLString help_string = ctrl->getValue().asString();
+		std::string help_string = ctrl->getValue().asString();
 
 		corep->addHelpItemToHistory(help_string);
 
@@ -947,10 +954,10 @@ void LLScriptEdCore::onErrorList(LLUICtrl*, void* user_data)
 		S32 row = 0;
 		S32 column = 0;
 		const LLScrollListCell* cell = item->getColumn(0);
-		LLString line(cell->getValue().asString());
+		std::string line(cell->getValue().asString());
 		line.erase(0, 1);
-		LLString::replaceChar(line, ',',' ');
-		LLString::replaceChar(line, ')',' ');
+		LLStringUtil::replaceChar(line, ',',' ');
+		LLStringUtil::replaceChar(line, ')',' ');
 		sscanf(line.c_str(), "%d %d", &row, &column);
 		//llinfos << "LLScriptEdCore::onErrorList() - " << row << ", "
 		//<< column << llendl;
@@ -1047,10 +1054,10 @@ BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask)
 struct LLScriptSaveInfo
 {
 	LLUUID mItemUUID;
-	LLString mDescription;
+	std::string mDescription;
 	LLTransactionID mTransactionID;
 
-	LLScriptSaveInfo(const LLUUID& uuid, const LLString& desc, LLTransactionID tid) :
+	LLScriptSaveInfo(const LLUUID& uuid, const std::string& desc, LLTransactionID tid) :
 		mItemUUID(uuid), mDescription(desc),  mTransactionID(tid) {}
 };
 
@@ -1117,8 +1124,9 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
 void LLPreviewLSL::callbackLSLCompileSucceeded()
 {
 	llinfos << "LSL Bytecode saved" << llendl;
-	mScriptEd->mErrorList->addCommentText("Compile successful!");
-	mScriptEd->mErrorList->addCommentText("Save complete.");
+	// *TODO: Translate
+	mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
+	mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
 	closeIfNeeded();
 }
 
@@ -1132,7 +1140,9 @@ void LLPreviewLSL::callbackLSLCompileFailed(const LLSD& compile_errors)
 		line++)
 	{
 		LLSD row;
-		row["columns"][0]["value"] = line->asString();
+		std::string error_message = line->asString();
+		LLStringUtil::stripNonprintable(error_message);
+		row["columns"][0]["value"] = error_message;
 		row["columns"][0]["font"] = "OCRA";
 		mScriptEd->mErrorList->addElement(row);
 	}
@@ -1189,7 +1199,7 @@ void LLPreviewLSL::loadAsset()
 	}
 	else
 	{
-		mScriptEd->mEditor->setText(LLString(HELLO_LSL));
+		mScriptEd->mEditor->setText(std::string(HELLO_LSL));
 		mAssetStatus = PREVIEW_ASSET_LOADED;
 	}
 }
@@ -1246,7 +1256,7 @@ void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save)
 void LLPreviewLSL::saveIfNeeded()
 {
 	// llinfos << "LLPreviewLSL::saveIfNeeded()" << llendl;
-	if(mScriptEd->mEditor->isPristine())
+	if(!LLScriptEdCore::hasChanged(mScriptEd))
 	{
 		return;
 	}
@@ -1260,9 +1270,9 @@ void LLPreviewLSL::saveIfNeeded()
 	tid.generate();
 	LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
 	std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
-	std::string filename = llformat("%s.lsl", filepath.c_str());
+	std::string filename = filepath + ".lsl";
 
-	LLFILE* fp = LLFile::fopen(filename.c_str(), "wb");
+	LLFILE* fp = LLFile::fopen(filename, "wb");
 	if(!fp)
 	{
 		llwarns << "Unable to write to " << filename << llendl;
@@ -1274,14 +1284,14 @@ void LLPreviewLSL::saveIfNeeded()
 		return;
 	}
 
-	LLString utf8text = mScriptEd->mEditor->getText();
+	std::string utf8text = mScriptEd->mEditor->getText();
 	fputs(utf8text.c_str(), fp);
 	fclose(fp);
 	fp = NULL;
 
 	const LLInventoryItem *inv_item = getItem();
 	// save it out to asset server
-	std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgentInventory");
+	std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgent");
 	if(inv_item)
 	{
 		getWindow()->incBusyCount();
@@ -1304,7 +1314,8 @@ void LLPreviewLSL::uploadAssetViaCaps(const std::string& url,
 	llinfos << "Update Agent Inventory via capability" << llendl;
 	LLSD body;
 	body["item_id"] = item_id;
-	LLHTTPClient::post(url, body, new LLUpdateAgentInventoryResponder(body, filename));
+	body["target"] = "lsl2";
+	LLHTTPClient::post(url, body, new LLUpdateAgentInventoryResponder(body, filename, LLAssetType::AT_LSL_TEXT));
 }
 
 void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
@@ -1315,7 +1326,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 	LLScriptSaveInfo* info = new LLScriptSaveInfo(item_id,
 								descEditor->getText(),
 								tid);
-	gAssetStorage->storeAssetData(filename.c_str(),	tid,
+	gAssetStorage->storeAssetData(filename,	tid,
 								  LLAssetType::AT_LSL_TEXT,
 								  &LLPreviewLSL::onSaveComplete,
 								  info);
@@ -1325,22 +1336,25 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 	std::string dst_filename = llformat("%s.lso", filepath.c_str());
 	std::string err_filename = llformat("%s.out", filepath.c_str());
 
+	const BOOL compile_to_mono = FALSE;
 	if(!lscript_compile(filename.c_str(),
 						dst_filename.c_str(),
 						err_filename.c_str(),
+						compile_to_mono,
+						asset_id.asString().c_str(),
 						gAgent.isGodlike()))
 	{
 		llinfos << "Compile failed!" << llendl;
 		//char command[256];
-		//sprintf(command, "type %s\n", err_filename);
+		//sprintf(command, "type %s\n", err_filename.c_str());
 		//system(command);
 
 		// load the error file into the error scrolllist
-		LLFILE* fp = LLFile::fopen(err_filename.c_str(), "r");
+		LLFILE* fp = LLFile::fopen(err_filename, "r");
 		if(fp)
 		{
 			char buffer[MAX_STRING];		/*Flawfinder: ignore*/
-			LLString line;
+			std::string line;
 			while(!feof(fp)) 
 			{
 				if (fgets(buffer, MAX_STRING, fp) == NULL)
@@ -1354,7 +1368,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 				else
 				{
 					line.assign(buffer);
-					LLString::stripNonprintable(line);
+					LLStringUtil::stripNonprintable(line);
 
 					LLSD row;
 					row["columns"][0]["value"] = line;
@@ -1374,7 +1388,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 			getWindow()->incBusyCount();
 			mPendingUploads++;
 			LLUUID* this_uuid = new LLUUID(mItemUUID);
-			gAssetStorage->storeAssetData(dst_filename.c_str(),
+			gAssetStorage->storeAssetData(dst_filename,
 										  tid,
 										  LLAssetType::AT_LSL_BYTECODE,
 										  &LLPreviewLSL::onSaveBytecodeComplete,
@@ -1383,9 +1397,9 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 	}
 
 	// get rid of any temp files left lying around
-	LLFile::remove(filename.c_str());
-	LLFile::remove(err_filename.c_str());
-	LLFile::remove(dst_filename.c_str());
+	LLFile::remove(filename);
+	LLFile::remove(err_filename);
+	LLFile::remove(dst_filename);
 }
 
 
@@ -1431,7 +1445,7 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
 	else
 	{
 		llwarns << "Problem saving script: " << status << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("SaveScriptFailReason", args);
 	}
@@ -1469,7 +1483,7 @@ void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_d
 	else
 	{
 		llwarns << "Problem saving LSL Bytecode (Preview)" << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("SaveBytecodeFailReason", args);
 	}
@@ -1600,7 +1614,8 @@ LLLiveLSLEditor::LLLiveLSLEditor(const std::string& name,
 	mAskedForRunningInfo(FALSE),
 	mHaveRunningInfo(FALSE),
 	mCloseAfterSave(FALSE),
-	mPendingUploads(0)
+	mPendingUploads(0),
+	mIsModifiable(FALSE)
 {
 
 	
@@ -1614,13 +1629,14 @@ LLLiveLSLEditor::LLLiveLSLEditor(const std::string& name,
 
 	LLLiveLSLEditor::sInstances.addData(mItemID ^ mObjectID, this);
 
-
-
 	LLCallbackMap::map_t factory_map;
 	factory_map["script ed panel"] = LLCallbackMap(LLLiveLSLEditor::createScriptEdPanel, this);
 
 	LLUICtrlFactory::getInstance()->buildFloater(this,"floater_live_lsleditor.xml", &factory_map);
-
+	
+	mMonoCheckbox =	getChild<LLCheckBoxCtrl>("mono");
+	childSetCommitCallback("mono", &LLLiveLSLEditor::onMonoCheckboxClicked, this);
+	childSetEnabled("mono", FALSE);
 
 	childSetCommitCallback("running", LLLiveLSLEditor::onRunningCheckboxClicked, this);
 	childSetEnabled("running", FALSE);
@@ -1632,7 +1648,6 @@ LLLiveLSLEditor::LLLiveLSLEditor(const std::string& name,
 	mScriptEd->mEditor->makePristine();
 	loadAsset(is_new);
 	mScriptEd->mEditor->setFocus(TRUE);
-
 	
 	if (!getHost())
 	{
@@ -1661,8 +1676,9 @@ void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
 												  bool is_script_running)
 {
 	lldebugs << "LSL Bytecode saved" << llendl;
-	mScriptEd->mErrorList->addCommentText("Compile successful!");
-	mScriptEd->mErrorList->addCommentText("Save complete.");
+	// *TODO: Translate
+	mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
+	mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
 	closeIfNeeded();
 }
 
@@ -1675,7 +1691,9 @@ void LLLiveLSLEditor::callbackLSLCompileFailed(const LLSD& compile_errors)
 		line++)
 	{
 		LLSD row;
-		row["columns"][0]["value"] = line->asString();
+		std::string error_message = line->asString();
+		LLStringUtil::stripNonprintable(error_message);
+		row["columns"][0]["value"] = error_message;
 		row["columns"][0]["font"] = "OCRA";
 		mScriptEd->mErrorList->addElement(row);
 	}
@@ -1710,6 +1728,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
 				mScriptEd->mEditor->setText(getString("not_allowed"));
 				mScriptEd->mEditor->makePristine();
 				mScriptEd->mEditor->setEnabled(FALSE);
+				mScriptEd->enableSave(FALSE);
 				mAssetStatus = PREVIEW_ASSET_LOADED;
 			}
 			else if(item && mItem.notNull())
@@ -1738,17 +1757,19 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
 			}
 			else
 			{
-				mScriptEd->mEditor->setText(LLString::null);
+				mScriptEd->mEditor->setText(LLStringUtil::null);
 				mScriptEd->mEditor->makePristine();
 				mAssetStatus = PREVIEW_ASSET_LOADED;
 			}
 
-			if(item
-			   && !gAgent.allowOperation(PERM_MODIFY, item->getPermissions(),
-				   						GP_OBJECT_MANIPULATE))
+			mIsModifiable = item && gAgent.allowOperation(PERM_MODIFY, 
+										item->getPermissions(),
+				   						GP_OBJECT_MANIPULATE);
+			if(!mIsModifiable)
 			{
 				mScriptEd->mEditor->setEnabled(FALSE);
 			}
+			
 			// This is commented out, because we don't completely
 			// handle script exports yet.
 			/*
@@ -1773,7 +1794,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
 			// This may be better than having a accessible null pointer around,
 			// though this newly allocated object will most likely be replaced.
 			mItem = new LLViewerInventoryItem();
-			mScriptEd->mEditor->setText(LLString::null);
+			mScriptEd->mEditor->setText(LLStringUtil::null);
 			mScriptEd->mEditor->makePristine();
 			mScriptEd->mEditor->setEnabled(FALSE);
 			mAssetStatus = PREVIEW_ASSET_LOADED;
@@ -1781,9 +1802,8 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
 	}
 	else
 	{
-		mScriptEd->mEditor->setText(LLString(HELLO_LSL));
-		//mScriptEd->mEditor->setText(LLString::null);
-		//mScriptEd->mEditor->makePristine();
+		mScriptEd->mEditor->setText(std::string(HELLO_LSL));
+		mScriptEd->enableSave(FALSE);
 		LLPermissions perm;
 		perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, gAgent.getGroupID());
 		perm.initMasks(PERM_ALL, PERM_ALL, PERM_NONE, PERM_NONE, PERM_MOVE | PERM_TRANSFER);
@@ -1844,37 +1864,38 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
 	delete xored_id;
 }
 
-void LLLiveLSLEditor::loadScriptText(const char* filename)
-{
-	if(!filename)
-	{
-		llerrs << "Filename is Empty!" << llendl;
-		return;
-	}
-	LLFILE* file = LLFile::fopen(filename, "rb");		/*Flawfinder: ignore*/
-	if(file)
-	{
-		// read in the whole file
-		fseek(file, 0L, SEEK_END);
-		long file_length = ftell(file);
-		fseek(file, 0L, SEEK_SET);
-		char* buffer = new char[file_length+1];
-		size_t nread = fread(buffer, 1, file_length, file);
-		if (nread < (size_t) file_length)
-		{
-			llwarns << "Short read" << llendl;
-		}
-		buffer[nread] = '\0';
-		fclose(file);
-		mScriptEd->mEditor->setText(LLStringExplicit(buffer));
-		mScriptEd->mEditor->makePristine();
-		delete[] buffer;
-	}
-	else
-	{
-		llwarns << "Error opening " << filename << llendl;
-	}
-}
+// unused
+// void LLLiveLSLEditor::loadScriptText(const std::string& filename)
+// {
+// 	if(!filename)
+// 	{
+// 		llerrs << "Filename is Empty!" << llendl;
+// 		return;
+// 	}
+// 	LLFILE* file = LLFile::fopen(filename, "rb");		/*Flawfinder: ignore*/
+// 	if(file)
+// 	{
+// 		// read in the whole file
+// 		fseek(file, 0L, SEEK_END);
+// 		long file_length = ftell(file);
+// 		fseek(file, 0L, SEEK_SET);
+// 		char* buffer = new char[file_length+1];
+// 		size_t nread = fread(buffer, 1, file_length, file);
+// 		if (nread < (size_t) file_length)
+// 		{
+// 			llwarns << "Short read" << llendl;
+// 		}
+// 		buffer[nread] = '\0';
+// 		fclose(file);
+// 		mScriptEd->mEditor->setText(LLStringExplicit(buffer));
+// 		mScriptEd->mEditor->makePristine();
+// 		delete[] buffer;
+// 	}
+// 	else
+// 	{
+// 		llwarns << "Error opening " << filename << llendl;
+// 	}
+// }
 
 void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type)
 {
@@ -1952,29 +1973,51 @@ void LLLiveLSLEditor::draw()
 {
 	LLViewerObject* object = gObjectList.findObject(mObjectID);
 	LLCheckBoxCtrl* runningCheckbox = getChild<LLCheckBoxCtrl>( "running");
-		if(object && mAskedForRunningInfo && mHaveRunningInfo)
+	if(object && mAskedForRunningInfo && mHaveRunningInfo)
 	{
 		if(object->permAnyOwner())
 		{
 			runningCheckbox->setLabel(getString("script_running"));
 			runningCheckbox->setEnabled(TRUE);
+
+			if(object->permAnyOwner())
+			{
+				runningCheckbox->setLabel(getString("script_running"));
+				runningCheckbox->setEnabled(TRUE);
+			}
+			else
+			{
+				runningCheckbox->setLabel(getString("public_objects_can_not_run"));
+				runningCheckbox->setEnabled(FALSE);
+				// *FIX: Set it to false so that the ui is correct for
+				// a box that is released to public. It could be
+				// incorrect after a release/claim cycle, but will be
+				// correct after clicking on it.
+				runningCheckbox->set(FALSE);
+				mMonoCheckbox->set(FALSE);
+			}
 		}
 		else
 		{
 			runningCheckbox->setLabel(getString("public_objects_can_not_run"));
 			runningCheckbox->setEnabled(FALSE);
+
 			// *FIX: Set it to false so that the ui is correct for
 			// a box that is released to public. It could be
 			// incorrect after a release/claim cycle, but will be
 			// correct after clicking on it.
 			runningCheckbox->set(FALSE);
+			mMonoCheckbox->setEnabled(FALSE);
+			// object may have fallen out of range.
+			mHaveRunningInfo = FALSE;
 		}
 	}
 	else if(!object)
 	{
 		// HACK: Display this information in the title bar.
 		// Really ought to put in main window.
-		setTitle("Script (object out of range)");
+		// *TODO: Translate
+		setTitle(std::string("Script (object out of range)"));
 		runningCheckbox->setEnabled(FALSE);
 		// object may have fallen out of range.
 		mHaveRunningInfo = FALSE;
@@ -2040,7 +2083,7 @@ void LLLiveLSLEditor::saveIfNeeded()
 	}
 
 	// Don't need to save if we're pristine
-	if(mScriptEd->mEditor->isPristine())
+	if(!LLScriptEdCore::hasChanged(mScriptEd))
 	{
 		return;
 	}
@@ -2048,6 +2091,7 @@ void LLLiveLSLEditor::saveIfNeeded()
 	mPendingUploads = 0;
 
 	// save the script
+	mScriptEd->enableSave(FALSE);
 	mScriptEd->mEditor->makePristine();
 	mScriptEd->mErrorList->deleteAllItems();
 
@@ -2063,7 +2107,7 @@ void LLLiveLSLEditor::saveIfNeeded()
 	mItem->setTransactionID(tid);
 
 	// write out the data, and store it in the asset database
-	LLFILE* fp = LLFile::fopen(filename.c_str(), "wb");
+	LLFILE* fp = LLFile::fopen(filename, "wb");
 	if(!fp)
 	{
 		llwarns << "Unable to write to " << filename << llendl;
@@ -2074,7 +2118,7 @@ void LLLiveLSLEditor::saveIfNeeded()
 		mScriptEd->mErrorList->addElement(row);
 		return;
 	}
-	LLString utf8text = mScriptEd->mEditor->getText();
+	std::string utf8text = mScriptEd->mEditor->getText();
 
 	// Special case for a completely empty script - stuff in one space so it can store properly.  See SL-46889
 	if ( utf8text.size() == 0 )
@@ -2087,7 +2131,7 @@ void LLLiveLSLEditor::saveIfNeeded()
 	fp = NULL;
 	
 	// save it out to asset server
-	std::string url = gAgent.getRegion()->getCapability("UpdateScriptTaskInventory");
+	std::string url = object->getRegion()->getCapability("UpdateScriptTask");
 	getWindow()->incBusyCount();
 	mPendingUploads++;
 	BOOL is_running = getChild<LLCheckBoxCtrl>( "running")->get();
@@ -2113,8 +2157,9 @@ void LLLiveLSLEditor::uploadAssetViaCaps(const std::string& url,
 	body["task_id"] = task_id;
 	body["item_id"] = item_id;
 	body["is_script_running"] = is_running;
+	body["target"] = monoChecked() ? "mono" : "lsl2";
 	LLHTTPClient::post(url, body,
-		new LLUpdateTaskInventoryResponder(body, filename));
+		new LLUpdateTaskInventoryResponder(body, filename, LLAssetType::AT_LSL_TEXT));
 }
 
 void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
@@ -2125,7 +2170,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 	LLLiveLSLSaveData* data = new LLLiveLSLSaveData(mObjectID,
 													mItem,
 													is_running);
-	gAssetStorage->storeAssetData(filename.c_str(), tid,
+	gAssetStorage->storeAssetData(filename, tid,
 								  LLAssetType::AT_LSL_TEXT,
 								  &onSaveTextComplete,
 								  (void*)data,
@@ -2137,17 +2182,20 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 	std::string err_filename = llformat("%s.out", filepath.c_str());
 
 	LLFILE *fp;
+	const BOOL compile_to_mono = FALSE;
 	if(!lscript_compile(filename.c_str(),
 						dst_filename.c_str(),
 						err_filename.c_str(),
+						compile_to_mono,
+						asset_id.asString().c_str(),
 						gAgent.isGodlike()))
 	{
 		// load the error file into the error scrolllist
 		llinfos << "Compile failed!" << llendl;
-		if(NULL != (fp = LLFile::fopen(err_filename.c_str(), "r")))
+		if(NULL != (fp = LLFile::fopen(err_filename, "r")))
 		{
 			char buffer[MAX_STRING];		/*Flawfinder: ignore*/
-			LLString line;
+			std::string line;
 			while(!feof(fp)) 
 			{
 				
@@ -2162,7 +2210,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 				else
 				{
 					line.assign(buffer);
-					LLString::stripNonprintable(line);
+					LLStringUtil::stripNonprintable(line);
 				
 					LLSD row;
 					row["columns"][0]["value"] = line;
@@ -2182,7 +2230,8 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 	else
 	{
 		llinfos << "Compile worked!" << llendl;
-		mScriptEd->mErrorList->addCommentText("Compile successful, saving...");
+		// *TODO: Translate
+		mScriptEd->mErrorList->addCommentText(std::string("Compile successful, saving..."));
 		if(gAssetStorage)
 		{
 			llinfos << "LLLiveLSLEditor::saveAsset "
@@ -2193,7 +2242,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 			data = new LLLiveLSLSaveData(mObjectID,
 										 mItem,
 										 is_running);
-			gAssetStorage->storeAssetData(dst_filename.c_str(),
+			gAssetStorage->storeAssetData(dst_filename,
 										  tid,
 										  LLAssetType::AT_LSL_BYTECODE,
 										  &LLLiveLSLEditor::onSaveBytecodeComplete,
@@ -2203,9 +2252,9 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 	}
 
 	// get rid of any temp files left lying around
-	LLFile::remove(filename.c_str());
-	LLFile::remove(err_filename.c_str());
-	LLFile::remove(dst_filename.c_str());
+	LLFile::remove(filename);
+	LLFile::remove(err_filename);
+	LLFile::remove(dst_filename);
 
 	// If we successfully saved it, then we should be able to check/uncheck the running box!
 	LLCheckBoxCtrl* runningCheckbox = getChild<LLCheckBoxCtrl>( "running");
@@ -2220,7 +2269,7 @@ void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_da
 	if (status)
 	{
 		llwarns << "Unable to save text for a script." << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("CompileQueueSaveText", args);
 	}
@@ -2256,7 +2305,8 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
 		if(self)
 		{
 			// Tell the user that the compile worked.
-			self->mScriptEd->mErrorList->addCommentText("Save complete.");
+			// *TODO: Translate
+			self->mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
 			// close the window if this completes both uploads
 			self->getWindow()->decBusyCount();
 			self->mPendingUploads--;
@@ -2280,14 +2330,14 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
 		llinfos << "Problem saving LSL Bytecode (Live Editor)" << llendl;
 		llwarns << "Unable to save a compiled script." << llendl;
 
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
 		gViewerWindow->alertXml("CompileQueueSaveBytecode", args);
 	}
 
 	std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_uuid.asString());
 	std::string dst_filename = llformat("%s.lso", filepath.c_str());
-	LLFile::remove(dst_filename.c_str());
+	LLFile::remove(dst_filename);
 	delete data;
 }
 
@@ -2378,6 +2428,11 @@ void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)
 		msg->getBOOLFast(_PREHASH_Script, _PREHASH_Running, running);
 		LLCheckBoxCtrl* runningCheckbox = instance->getChild<LLCheckBoxCtrl>("running");
 		runningCheckbox->set(running);
+		BOOL mono;
+		msg->getBOOLFast(_PREHASH_Script, "Mono", mono);
+		LLCheckBoxCtrl* monoCheckbox = instance->getChild<LLCheckBoxCtrl>("mono");
+		monoCheckbox->setEnabled(instance->getIsModifiable() && have_script_upload_cap(object_id));
+		monoCheckbox->set(mono);
 	}
 }
 
@@ -2392,3 +2447,19 @@ void LLLiveLSLEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 		gSavedSettings.setRect("PreviewScriptRect", getRect());
 	}
 }
+
+void LLLiveLSLEditor::onMonoCheckboxClicked(LLUICtrl*, void* userdata)
+{
+	LLLiveLSLEditor* self = static_cast<LLLiveLSLEditor*>(userdata);
+	self->mMonoCheckbox->setEnabled(have_script_upload_cap(self->mObjectID));
+	self->mScriptEd->enableSave(self->getIsModifiable());
+}
+
+BOOL LLLiveLSLEditor::monoChecked() const
+{
+	if(NULL != mMonoCheckbox)
+	{
+		return mMonoCheckbox->getValue()? TRUE : FALSE;
+	}
+	return FALSE;
+}
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index e4c165f..977b9ce 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -118,19 +118,20 @@ public:
 	void selectFirstError();
 
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
+	
+	void enableSave(BOOL b) {mEnableSave = b;}
 
 protected:
 	void deleteBridges();
-	void setHelpPage(const LLString& help_string);
+	void setHelpPage(const std::string& help_string);
 	void updateDynamicHelp(BOOL immediate = FALSE);
-	void addHelpItemToHistory(const LLString& help_string);
-
+	void addHelpItemToHistory(const std::string& help_string);
 	static void onErrorList(LLUICtrl*, void* user_data);
 
  	virtual const char *getTitleName() const { return "Script"; }
 
 private:
-	LLString		mSampleText;
+	std::string		mSampleText;
 	std::string		mHelpFile;
 	LLTextEditor*	mEditor;
 	void			(*mLoadCallback)(void* userdata);
@@ -147,6 +148,7 @@ private:
 	LLKeywordToken* mLastHelpToken;
 	LLFrameTimer	mLiveHelpTimer;
 	S32				mLiveHelpHistorySize;
+	BOOL			mEnableSave;
 };
 
 
@@ -184,8 +186,9 @@ protected:
 							   void* user_data, S32 status, LLExtStat ext_status);
 	static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status);
 	static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
+public:
 	static LLPreviewLSL* getInstance(const LLUUID& uuid);
-
+protected:
 	static void* createScriptEdPanel(void* userdata);
 
 
@@ -195,6 +198,7 @@ protected:
 	LLScriptEdCore* mScriptEd;
 	// Can safely close only after both text and bytecode are uploaded
 	S32 mPendingUploads;
+
 };
 
 
@@ -253,7 +257,7 @@ protected:
 	static void onRunningCheckboxClicked(LLUICtrl*, void* userdata);
 	static void onReset(void* userdata);
 
-	void loadScriptText(const char* filename);
+// 	void loadScriptText(const std::string& filename); // unused
 	void loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type);
 
 	static void onErrorList(LLUICtrl*, void* user_data);
@@ -277,9 +281,15 @@ protected:
 	S32 mPendingUploads;
 
 	static LLMap<LLUUID, LLLiveLSLEditor*> sInstances;
-};
+	BOOL getIsModifiable() const { return mIsModifiable; } // Evaluated on load assert
+	
+private:
 
-// name of help file for lsl
-extern const char HELP_LSL[];
+	static void	onMonoCheckboxClicked(LLUICtrl*, void* userdata);
+	BOOL monoChecked() const;
+
+	LLCheckBoxCtrl*	mMonoCheckbox;
+	BOOL mIsModifiable;
+};
 
 #endif  // LL_LLPREVIEWSCRIPT_H
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index fe94fa4..0a204dc 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -240,7 +240,8 @@ void LLPreviewTexture::draw()
 
 			if( mLoadingFullImage )
 			{
-				LLFontGL::sSansSerif->renderUTF8("Receiving:", 0,
+				// *TODO: Translate
+				LLFontGL::sSansSerif->renderUTF8(std::string("Receiving:"), 0,
 					interior.mLeft + 4, 
 					interior.mBottom + 4,
 					LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
@@ -276,7 +277,8 @@ void LLPreviewTexture::draw()
 			else
 			if( !mSavedFileTimer.hasExpired() )
 			{
-				LLFontGL::sSansSerif->renderUTF8("File Saved", 0,
+				// *TODO: Translate
+				LLFontGL::sSansSerif->renderUTF8(std::string("File Saved"), 0,
 					interior.mLeft + 4,
 					interior.mBottom + 4,
 					LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
@@ -309,9 +311,7 @@ void LLPreviewTexture::saveAs()
 		mLoadingFullImage = TRUE;
 		getWindow()->incBusyCount();
 		mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 
-									0, 
-									TRUE, 
-									new LLUUID( mItemUUID ) );
+								   0, TRUE, FALSE, new LLUUID( mItemUUID ) );
 	}
 }
 
@@ -349,13 +349,13 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
 		LLPointer<LLImageTGA> image_tga = new LLImageTGA;
 		if( !image_tga->encode( src ) )
 		{
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[FILE]"] = self->mSaveFileName;
 			gViewerWindow->alertXml("CannotEncodeFile", args);
 		}
 		else if( !image_tga->save( self->mSaveFileName ) )
 		{
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[FILE]"] = self->mSaveFileName;
 			gViewerWindow->alertXml("CannotWriteFile", args);
 		}
diff --git a/linden/indra/newview/llpreviewtexture.h b/linden/indra/newview/llpreviewtexture.h
index 5a649da..aaa740f 100644
--- a/linden/indra/newview/llpreviewtexture.h
+++ b/linden/indra/newview/llpreviewtexture.h
@@ -86,7 +86,7 @@ private:
 	LLUUID						mImageID;
 	LLPointer<LLViewerImage>		mImage;
 	BOOL				mLoadingFullImage;
-	LLString			mSaveFileName;
+	std::string			mSaveFileName;
 	LLFrameTimer		mSavedFileTimer;
 	BOOL                mShowKeepDiscard;
 	BOOL                mCopyToInv;
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp
index d10cc8f..123c583 100644
--- a/linden/indra/newview/llprogressview.cpp
+++ b/linden/indra/newview/llprogressview.cpp
@@ -59,8 +59,8 @@ S32 gStartImageWidth = 1;
 S32 gStartImageHeight = 1;
 const F32 FADE_IN_TIME = 1.f;
 
-const LLString ANIMATION_FILENAME = "Login Sequence ";
-const LLString ANIMATION_SUFFIX = ".jpg";
+const std::string ANIMATION_FILENAME = "Login Sequence ";
+const std::string ANIMATION_SUFFIX = ".jpg";
 const F32 TOTAL_LOGIN_TIME = 10.f;	// seconds, wild guess at time from GL context to actual world view
 S32 gLastStartAnimationFrame = 0;	// human-style indexing, first image = 1
 const S32 ANIMATION_FRAMES = 1; //13;
@@ -78,12 +78,11 @@ LLProgressView::LLProgressView(const std::string& name, const LLRect &rect)
 		getRect().getWidth() - CANCEL_BTN_OFFSET - CANCEL_BTN_WIDTH, CANCEL_BTN_OFFSET,
 		CANCEL_BTN_WIDTH, BTN_HEIGHT );
 	
-	mCancelBtn = new LLButton( 
-		"Quit",
-		r,
-		"",
-		LLProgressView::onCancelButtonClicked,
-		NULL );
+	mCancelBtn = new LLButton(std::string("Quit"),
+							  r,
+							  std::string(""),
+							  LLProgressView::onCancelButtonClicked,
+							  NULL );
 	mCancelBtn->setFollows( FOLLOWS_RIGHT | FOLLOWS_BOTTOM );
 	addChild( mCancelBtn );
 	mFadeTimer.stop();
@@ -264,7 +263,7 @@ void LLProgressView::draw()
 	F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
 	// background_color.mV[3] = background_color.mV[3]*alpha;
 
-	LLString top_line = LLAppViewer::instance()->getSecondLifeTitle();
+	std::string top_line = LLAppViewer::instance()->getSecondLifeTitle();
 
 	S32 bar_bottom = line_two_y - 30;
 	S32 bar_height = 18;
@@ -380,7 +379,7 @@ void LLProgressView::draw()
 	LLView::draw();
 }
 
-void LLProgressView::setText(const LLString& text)
+void LLProgressView::setText(const std::string& text)
 {
 	mText = text;
 }
@@ -390,12 +389,12 @@ void LLProgressView::setPercent(const F32 percent)
 	mPercentDone = llclamp(percent, 0.f, 100.f);
 }
 
-void LLProgressView::setMessage(const LLString& msg)
+void LLProgressView::setMessage(const std::string& msg)
 {
 	mMessage = msg;
 }
 
-void LLProgressView::setCancelButtonVisible(BOOL b, const LLString& label)
+void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label)
 {
 	mCancelBtn->setVisible( b );
 	mCancelBtn->setEnabled( b );
diff --git a/linden/indra/newview/llprogressview.h b/linden/indra/newview/llprogressview.h
index 853bab7..8ea3dfb 100644
--- a/linden/indra/newview/llprogressview.h
+++ b/linden/indra/newview/llprogressview.h
@@ -52,20 +52,20 @@ public:
 	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
 	/*virtual*/ void setVisible(BOOL visible);
 
-	void setText(const LLString& text);
+	void setText(const std::string& text);
 	void setPercent(const F32 percent);
 
 	// Set it to NULL when you want to eliminate the message.
-	void setMessage(const LLString& msg);
+	void setMessage(const std::string& msg);
 	
-	void setCancelButtonVisible(BOOL b, const LLString& label);
+	void setCancelButtonVisible(BOOL b, const std::string& label);
 
 	static void onCancelButtonClicked( void* );
 
 protected:
 	F32 mPercentDone;
-	LLString mText;
-	LLString mMessage;
+	std::string mText;
+	std::string mMessage;
 	LLButton*	mCancelBtn;
 	LLFrameTimer	mFadeTimer;
 	LLFrameTimer mProgressTimer;
diff --git a/linden/indra/newview/llrendersphere.cpp b/linden/indra/newview/llrendersphere.cpp
deleted file mode 100644
index 6e5c850..0000000
--- a/linden/indra/newview/llrendersphere.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/** 
- * @file llrendersphere.cpp
- * @brief implementation of the LLRenderSphere class.
- *
- * $LicenseInfo:firstyear=2001&license=internal$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-//	Sphere creates a set of display lists that can then be called to create 
-//	a lit sphere at different LOD levels.  You only need one instance of sphere 
-//	per viewer - then call the appropriate list.  
-
-#include "llviewerprecompiledheaders.h"
-#include "llrendersphere.h"
-#include "llerror.h"
-
-#include "llglheaders.h"
-
-GLUquadricObj *gQuadObj2 = NULL;
-LLRenderSphere gSphere;
-
-void drawSolidSphere(GLdouble radius, GLint slices, GLint stacks);
-
-void drawSolidSphere(GLdouble radius, GLint slices, GLint stacks)
-{
-	if (!gQuadObj2)
-	{
-		gQuadObj2 = gluNewQuadric();
-		if (!gQuadObj2)
-		{
-			llwarns << "drawSolidSphere couldn't allocate quadric" << llendl;
-			return;
-		}
-	}
-
-	gluQuadricDrawStyle(gQuadObj2, GLU_FILL);
-	gluQuadricNormals(gQuadObj2, GLU_SMOOTH);
-	// If we ever changed/used the texture or orientation state
-	// of quadObj, we'd need to change it to the defaults here
-	// with gluQuadricTexture and/or gluQuadricOrientation.
-	gluQuadricTexture(gQuadObj2, GL_TRUE);
-	gluSphere(gQuadObj2, radius, slices, stacks);
-}
-
-
-// lat = 0 is Z-axis
-// lon = 0, lat = 90 at X-axis
-void lat2xyz(LLVector3 * result, F32 lat, F32 lon)
-{
-	// Convert a latitude and longitude to x,y,z on a normal sphere and return it in result
-	F32 r;
-	result->mV[VX] = (F32) (cos(lon * DEG_TO_RAD) * sin(lat * DEG_TO_RAD));
-	result->mV[VY] = (F32) (sin(lon * DEG_TO_RAD) * sin(lat * DEG_TO_RAD));
-	r = (F32) pow(result->mV[VX] * result->mV[VX] + result->mV[VY] * result->mV[VY], 0.5f);
-	if (r == 1.0f) 
-	{
-		result->mV[VZ] = 0.0f;
-	}
-	else
-	{
-		result->mV[VZ] = (F32) pow(1 - r*r, 0.5f);
-		if (lat > 90.01)
-		{
-			result->mV[VZ] *= -1.0;
-		}
-	}
-}
-
-void lat2xyz_rad(LLVector3 * result, F32 lat, F32 lon)
-{
-	// Convert a latitude and longitude to x,y,z on a normal sphere and return it in result
-	F32 r;
-	result->mV[VX] = (F32) (cos(lon) * sin(lat));
-	result->mV[VY] = (F32) (sin(lon) * sin(lat));
-	r = (F32) pow(result->mV[VX] * result->mV[VX] + result->mV[VY] * result->mV[VY], 0.5f);
-	if (r == 1.0f) 
-		result->mV[VZ] = 0.0f;
-	else
-	{
-		result->mV[VZ] = (F32) pow(1 - r*r, 0.5f);
-		if (lat > F_PI_BY_TWO) result->mV[VZ] *= -1.0;
-	}
-}
-
-// A couple thoughts on sphere drawing:
-// 1) You need more slices than stacks, but little less than 2:1
-// 2) At low LOD, setting stacks to an odd number avoids a "band" around the equator, making things look smoother
-void LLRenderSphere::prerender()
-{
-	//  Create a series of display lists for different LODs
-	mDList[0] = glGenLists(1);
-	glNewList(mDList[0], GL_COMPILE);
-	drawSolidSphere(1.0, 30, 20);
-	glEndList();
-
-	mDList[1] = glGenLists(1);
-	glNewList(mDList[1], GL_COMPILE);
-	drawSolidSphere(1.0, 20, 15);
-	glEndList();
-
-	mDList[2] = glGenLists(1);
-	glNewList(mDList[2], GL_COMPILE);
-	drawSolidSphere(1.0, 12, 8);
-	glEndList();
-
-	mDList[3] = glGenLists(1);
-	glNewList(mDList[3], GL_COMPILE);
-	drawSolidSphere(1.0, 8, 5);
-	glEndList();
-}
-
-void LLRenderSphere::cleanupGL()
-{
-	for (S32 detail = 0; detail < 4; detail++)
-	{
-		glDeleteLists(mDList[detail], 1);
-		mDList[detail] = 0;
-	}
-	
-	if (gQuadObj2)
-	{
-		gluDeleteQuadric(gQuadObj2);
-		gQuadObj2 = NULL;
-	}
-}
-
-// Constants here are empirically derived from my eyeballs, JNC
-//
-// The toughest adjustment is the cutoff for the lowest LOD
-// Maybe we should have more LODs at the low end?
-void LLRenderSphere::render(F32 pixel_area)
-{
-	S32 level_of_detail;
-
-	if (pixel_area > 10000.f)
-	{
-		level_of_detail = 0;
-	}
-	else if (pixel_area > 800.f)
-	{
-		level_of_detail = 1;
-	}
-	else if (pixel_area > 100.f)
-	{
-		level_of_detail = 2;
-	}
-	else
-	{
-		level_of_detail = 3;
-	}
-	glCallList(mDList[level_of_detail]);
-}
-
-
-void LLRenderSphere::render()
-{
-	glCallList(mDList[0]);
-}
diff --git a/linden/indra/newview/llrendersphere.h b/linden/indra/newview/llrendersphere.h
deleted file mode 100644
index ace57e4..0000000
--- a/linden/indra/newview/llrendersphere.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/** 
- * @file llrendersphere.h
- * @brief interface for the LLRenderSphere class.
- *
- * $LicenseInfo:firstyear=2001&license=internal$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLRENDERSPHERE_H
-#define LL_LLRENDERSPHERE_H
-
-#include "llmath.h"
-#include "v3math.h"
-#include "v4math.h"
-#include "m3math.h"
-#include "m4math.h"
-#include "v4color.h"
-#include "llgl.h"
-
-void lat2xyz(LLVector3 * result, F32 lat, F32 lon);			// utility routine
-
-class LLRenderSphere  
-{
-public:
-	LLGLuint	mDList[5];
-
-	void prerender();
-	void cleanupGL();
-	void render(F32 pixel_area);		// of a box of size 1.0 at that position
-	void render();						// render at highest LOD
-};
-
-extern LLRenderSphere gSphere;
-#endif
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 75e1fcc..ebfdd39 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -96,9 +96,6 @@ const S32 MAX_ACTION_QUEUE_SIZE = 20;
 const S32 MAX_SILS_PER_FRAME = 50;
 const S32 MAX_OBJECTS_PER_PACKET = 254;
 
-extern LLUUID			gLastHitObjectID;
-extern LLVector3d		gLastHitObjectOffset;
-
 //
 // Globals
 //
@@ -848,9 +845,12 @@ void LLSelectMgr::highlightObjectAndFamily(LLViewerObject* objectp)
 
 	highlightObjectOnly(root_obj);
 
-	for(U32 i = 0; i < root_obj->mChildList.size(); i++)
+	LLViewerObject::const_child_list_t& child_list = root_obj->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
-		highlightObjectOnly(root_obj->mChildList[i]);
+		LLViewerObject* child = *iter;
+		highlightObjectOnly(child);
 	}
 }
 
@@ -875,8 +875,9 @@ void LLSelectMgr::highlightObjectAndFamily(const std::vector<LLViewerObject*>& o
 		LLViewerObject* root = (LLViewerObject*)object->getRoot();
 		mRectSelectedObjects.insert(root);
 
-		for (LLViewerObject::child_list_t::const_iterator iter2 = root->mChildList.begin();
-			 iter2 != root->mChildList.end(); ++iter2)
+		LLViewerObject::const_child_list_t& child_list = root->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter2 = child_list.begin();
+			 iter2 != child_list.end(); iter2++)
 		{
 			LLViewerObject* child = *iter2;
 			mRectSelectedObjects.insert(child);
@@ -905,10 +906,11 @@ void LLSelectMgr::unhighlightObjectAndFamily(LLViewerObject* objectp)
 
 	unhighlightObjectOnly(root_obj);
 
-	for (LLViewerObject::child_list_t::iterator iter2 = root_obj->mChildList.begin();
-		 iter2 != root_obj->mChildList.end(); ++iter2)
+	LLViewerObject::const_child_list_t& child_list = root_obj->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
-		LLViewerObject* child = *iter2;
+		LLViewerObject* child = *iter;
 		unhighlightObjectOnly(child);
 	}
 }
@@ -1008,10 +1010,11 @@ void LLSelectMgr::addGridObject(LLViewerObject* objectp)
 	LLSelectNode* nodep = new LLSelectNode(objectp, FALSE);
 	mGridObjects.addNodeAtEnd(nodep);
 
-	for (LLViewerObject::child_list_t::iterator iter2 = objectp->mChildList.begin();
-		 iter2 != objectp->mChildList.end(); ++iter2)
+	LLViewerObject::const_child_list_t& child_list = objectp->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
-		LLViewerObject* child = *iter2;
+		LLViewerObject* child = *iter;
 		nodep = new LLSelectNode(child, FALSE);
 		mGridObjects.addNodeAtEnd(nodep);
 	}
@@ -1955,12 +1958,13 @@ void LLSelectMgr::selectionSetClickAction(U8 action)
 // godlike requests
 //-----------------------------------------------------------------------------
 
-typedef std::pair<const LLString, const LLString> godlike_request_t;
-void LLSelectMgr::sendGodlikeRequest(const LLString& request, const LLString& param)
+typedef std::pair<const std::string, const std::string> godlike_request_t;
+
+void LLSelectMgr::sendGodlikeRequest(const std::string& request, const std::string& param)
 {
 	// If the agent is neither godlike nor an estate owner, the server
 	// will reject the request.
-	LLString message_type;
+	std::string message_type;
 	if (gAgent.isGodlike())
 	{
 		message_type = "GodlikeMessage";
@@ -1993,7 +1997,7 @@ void LLSelectMgr::packGodlikeHead(void* user_data)
 	msg->addUUID("TransactionID", LLUUID::null);
 	godlike_request_t* data = (godlike_request_t*)user_data;
 	msg->nextBlock("MethodData");
-	msg->addString("Method", data->first.c_str());
+	msg->addString("Method", data->first);
 	msg->addUUID("Invoice", LLUUID::null);
 
 	// The parameters used to be restricted to either string or
@@ -2011,8 +2015,7 @@ void LLSelectMgr::packGodlikeHead(void* user_data)
 // static
 void LLSelectMgr::packObjectIDAsParam(LLSelectNode* node, void *)
 {
-	char buf [MAX_STRING];		/* Flawfinder: ignore */
-	snprintf(buf, MAX_STRING, "%u", node->getObject()->getLocalID());			/* Flawfinder: ignore */
+	std::string buf = llformat("%u", node->getObject()->getLocalID());
 	gMessageSystem->nextBlock("ParamList");
 	gMessageSystem->addString("Parameter", buf);
 }
@@ -2304,7 +2307,7 @@ BOOL LLSelectMgr::selectGetRootsCopy()
 // selectGetCreator()
 // Creator information only applies to root objects.
 //-----------------------------------------------------------------------------
-BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, LLString& name)
+BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, std::string& name)
 {
 	BOOL identical = TRUE;
 	BOOL first = TRUE;
@@ -2356,7 +2359,7 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, LLString& name)
 // selectGetOwner()
 // Owner information only applies to roots.
 //-----------------------------------------------------------------------------
-BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, LLString& name)
+BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, std::string& name)
 {
 	BOOL identical = TRUE;
 	BOOL first = TRUE;
@@ -2424,7 +2427,7 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, LLString& name)
 // selectGetLastOwner()
 // Owner information only applies to roots.
 //-----------------------------------------------------------------------------
-BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, LLString& name)
+BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, std::string& name)
 {
 	BOOL identical = TRUE;
 	BOOL first = TRUE;
@@ -2825,27 +2828,53 @@ void LLSelectMgr::selectForceDelete()
 		SEND_ONLY_ROOTS);
 }
 
-
-// returns TRUE if anything is for sale. calculates the total price
-// and stores that value in price.
-BOOL LLSelectMgr::selectIsForSale(S32& price)
+void LLSelectMgr::selectGetAggregateSaleInfo(U32 &num_for_sale,
+											 BOOL &is_for_sale_mixed, 
+											 BOOL &is_sale_price_mixed,
+											 S32 &total_sale_price,
+											 S32 &individual_sale_price)
 {
-	BOOL any_for_sale = FALSE;
-	price = 0;
+	num_for_sale = 0;
+	is_for_sale_mixed = FALSE;
+	is_sale_price_mixed = FALSE;
+	total_sale_price = 0;
+	individual_sale_price = 0;
+
 
+	// Empty set.
+	if (getSelection()->root_begin() == getSelection()->root_end())
+		return;
+	
+	LLSelectNode *node = *(getSelection()->root_begin());
+	const BOOL first_node_for_sale = node->mSaleInfo.isForSale();
+	const S32 first_node_sale_price = node->mSaleInfo.getSalePrice();
+	
 	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
 		 iter != getSelection()->root_end(); iter++)
 	{
 		LLSelectNode* node = *iter;
-		if (node->mSaleInfo.isForSale())
+		const BOOL node_for_sale = node->mSaleInfo.isForSale();
+		const S32 node_sale_price = node->mSaleInfo.getSalePrice();
+		
+		// Set mixed if the fields don't match the first node's fields.
+		if (node_for_sale != first_node_for_sale) 
+			is_for_sale_mixed = TRUE;
+		if (node_sale_price != first_node_sale_price)
+			is_sale_price_mixed = TRUE;
+		
+		if (node_for_sale)
 		{
-			price += node->mSaleInfo.getSalePrice();
-			any_for_sale = TRUE;
+			total_sale_price += node_sale_price;
+			num_for_sale ++;
 		}
 	}
-
-	return any_for_sale;
-
+	
+	individual_sale_price = first_node_sale_price;
+	if (is_for_sale_mixed)
+	{
+		is_sale_price_mixed = TRUE;
+		individual_sale_price = 0;
+	}
 }
 
 // returns TRUE if all nodes are valid. method also stores an
@@ -3445,7 +3474,7 @@ void LLSelectMgr::deselectAllIfTooFar()
 }
 
 
-void LLSelectMgr::selectionSetObjectName(const LLString& name)
+void LLSelectMgr::selectionSetObjectName(const std::string& name)
 {
 	// we only work correctly if 1 object is selected.
 	if(mSelectedObjects->getRootObjectCount() == 1)
@@ -3453,7 +3482,7 @@ void LLSelectMgr::selectionSetObjectName(const LLString& name)
 		sendListToRegions("ObjectName",
 						  packAgentAndSessionID,
 						  packObjectName,
-						  (void*)name.c_str(),
+						  (void*)(new std::string(name)),
 						  SEND_ONLY_ROOTS);
 	}
 	else if(mSelectedObjects->getObjectCount() == 1)
@@ -3461,12 +3490,12 @@ void LLSelectMgr::selectionSetObjectName(const LLString& name)
 		sendListToRegions("ObjectName",
 						  packAgentAndSessionID,
 						  packObjectName,
-						  (void*)name.c_str(),
+						  (void*)(new std::string(name)),
 						  SEND_INDIVIDUALS);
 	}
 }
 
-void LLSelectMgr::selectionSetObjectDescription(const LLString& desc)
+void LLSelectMgr::selectionSetObjectDescription(const std::string& desc)
 {
 	// we only work correctly if 1 object is selected.
 	if(mSelectedObjects->getRootObjectCount() == 1)
@@ -3474,7 +3503,7 @@ void LLSelectMgr::selectionSetObjectDescription(const LLString& desc)
 		sendListToRegions("ObjectDescription",
 						  packAgentAndSessionID,
 						  packObjectDescription,
-						  (void*)desc.c_str(),
+						  (void*)(new std::string(desc)),
 						  SEND_ONLY_ROOTS);
 	}
 	else if(mSelectedObjects->getObjectCount() == 1)
@@ -3482,7 +3511,7 @@ void LLSelectMgr::selectionSetObjectDescription(const LLString& desc)
 		sendListToRegions("ObjectDescription",
 						  packAgentAndSessionID,
 						  packObjectDescription,
-						  (void*)desc.c_str(),
+						  (void*)(new std::string(desc)),
 						  SEND_INDIVIDUALS);
 	}
 }
@@ -3501,8 +3530,6 @@ void LLSelectMgr::selectionSetObjectCategory(const LLCategory& category)
 
 void LLSelectMgr::selectionSetObjectSaleInfo(const LLSaleInfo& sale_info)
 {
-	// Only one sale info at a time for now
-	if(mSelectedObjects->getRootObjectCount() != 1) return;
 	sendListToRegions("ObjectSaleInfo",
 					  packAgentAndSessionID,
 					  packObjectSaleInfo,
@@ -3969,22 +3996,26 @@ void LLSelectMgr::packObjectLocalID(LLSelectNode* node, void *)
 // static
 void LLSelectMgr::packObjectName(LLSelectNode* node, void* user_data)
 {
-	char* name = (char*)user_data;
-	if(!name) return;
-	gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-	gMessageSystem->addU32Fast(_PREHASH_LocalID, node->getObject()->getLocalID());
-	gMessageSystem->addStringFast(_PREHASH_Name, name);
+	const std::string* name = (const std::string*)user_data;
+	if(!name->empty())
+	{
+		gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+		gMessageSystem->addU32Fast(_PREHASH_LocalID, node->getObject()->getLocalID());
+		gMessageSystem->addStringFast(_PREHASH_Name, *name);
+	}
+	delete name;
 }
 
 // static
-void LLSelectMgr::packObjectDescription(LLSelectNode* node,
-										void* user_data)
+void LLSelectMgr::packObjectDescription(LLSelectNode* node, void* user_data)
 {
-	char* desc = (char*)user_data;
-	if(!desc) return;
-	gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-	gMessageSystem->addU32Fast(_PREHASH_LocalID, node->getObject()->getLocalID());
-	gMessageSystem->addStringFast(_PREHASH_Description, desc);
+	const std::string* desc = (const std::string*)user_data;
+	if(!desc->empty())
+	{
+		gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+		gMessageSystem->addU32Fast(_PREHASH_LocalID, node->getObject()->getLocalID());
+		gMessageSystem->addStringFast(_PREHASH_Description, *desc);
+	}
 }
 
 // static
@@ -4033,7 +4064,7 @@ void LLSelectMgr::packPermissions(LLSelectNode* node, void *user_data)
 // Utility function to send some information to every region containing
 // an object on the selection list.  We want to do this to reduce the total
 // number of packets sent by the viewer.
-void LLSelectMgr::sendListToRegions(const LLString& message_name,
+void LLSelectMgr::sendListToRegions(const std::string& message_name,
 									void (*pack_header)(void *user_data), 
 									void (*pack_body)(LLSelectNode* node, void *user_data), 
 									void *user_data,
@@ -4273,15 +4304,15 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
 
 		msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_LastOwnerID, last_owner_id, i);
 
-		char name[DB_INV_ITEM_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name, i);
-		char desc[DB_INV_ITEM_DESC_BUF_SIZE];		/* Flawfinder: ignore */
-		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, DB_INV_ITEM_DESC_BUF_SIZE, desc, i);
+		std::string name;
+		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, name, i);
+		std::string desc;
+		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, desc, i);
 
-		char touch_name[DB_INV_ITEM_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_TouchName, DB_INV_ITEM_NAME_BUF_SIZE, touch_name, i);
-		char sit_name[DB_INV_ITEM_DESC_BUF_SIZE];		/* Flawfinder: ignore */
-		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_SitName, DB_INV_ITEM_DESC_BUF_SIZE, sit_name, i);
+		std::string touch_name;
+		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_TouchName, touch_name, i);
+		std::string sit_name;
+		msg->getStringFast(_PREHASH_ObjectData, _PREHASH_SitName, sit_name, i);
 
 		//unpack TE IDs
 		std::vector<LLUUID> texture_ids;
@@ -4424,11 +4455,11 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
 	msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_LastOwnerID, last_owner_id );
 
 	// unpack name & desc
-	char name[DB_INV_ITEM_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-	msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name);
+	std::string name;
+	msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, name);
 
-	char desc[DB_INV_ITEM_DESC_BUF_SIZE];		/* Flawfinder: ignore */
-	msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, DB_INV_ITEM_DESC_BUF_SIZE, desc);
+	std::string desc;
+	msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, desc);
 
 	// the reporter widget askes the server for info about picked objects
 	if (request_flags & (COMPLAINT_REPORT_REQUEST | BUG_REPORT_REQUEST))
@@ -4694,8 +4725,9 @@ void LLSelectMgr::updateSilhouettes()
 			}
 			else
 			{
-				for (LLViewerObject::child_list_t::iterator iter = objectp->mChildList.begin();
-					 iter != objectp->mChildList.end(); ++iter)
+				LLViewerObject::const_child_list_t& child_list = objectp->getChildren();
+				for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+					 iter != child_list.end(); iter++)
 				{
 					LLViewerObject* child_objectp = *iter;
 				
@@ -4805,7 +4837,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 	{
 		LLBBox hud_bbox = avatar->getHUDBBox();
 
-		F32 cur_zoom = avatar->mHUDCurZoom;
+		F32 cur_zoom = gAgent.mHUDCurZoom;
 
 		// set up transform to encompass bounding box of HUD
 		glMatrixMode(GL_PROJECTION);
@@ -4928,10 +4960,10 @@ LLSelectNode::LLSelectNode(LLViewerObject* object, BOOL glow)
 	mValid			= FALSE;
 	mPermissions	= new LLPermissions();
 	mInventorySerial = 0;
-	mName = LLString::null;
-	mDescription = LLString::null;
-	mTouchName = LLString::null;
-	mSitName = LLString::null;
+	mName = LLStringUtil::null;
+	mDescription = LLStringUtil::null;
+	mTouchName = LLStringUtil::null;
+	mSitName = LLStringUtil::null;
 	mSilhouetteExists = FALSE;
 	mDuplicated = FALSE;
 
@@ -5252,7 +5284,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
 		F32 silhouette_thickness;
 		if (is_hud_object && gAgent.getAvatarObject())
 		{
-			silhouette_thickness = LLSelectMgr::sHighlightThickness / gAgent.getAvatarObject()->mHUDCurZoom;
+			silhouette_thickness = LLSelectMgr::sHighlightThickness / gAgent.mHUDCurZoom;
 		}
 		else
 		{
@@ -5387,8 +5419,9 @@ S32 get_family_count(LLViewerObject *parent)
 		llwarns << "Trying to get_family_count on null parent!" << llendl;
 	}
 	S32 count = 1;	// for this object
-	for (LLViewerObject::child_list_t::iterator iter = parent->mChildList.begin();
-		 iter != parent->mChildList.end(); ++iter)
+	LLViewerObject::const_child_list_t& child_list = parent->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
 		LLViewerObject* child = *iter;
 
@@ -5451,8 +5484,8 @@ void LLSelectMgr::updateSelectionCenter()
 		if (mSelectedObjects->mSelectType != SELECT_TYPE_HUD && gAgent.getAvatarObject())
 		{
 			// reset hud ZOOM
-			gAgent.getAvatarObject()->mHUDTargetZoom = 1.f;
-			gAgent.getAvatarObject()->mHUDCurZoom = 1.f;
+			gAgent.mHUDTargetZoom = 1.f;
+			gAgent.mHUDCurZoom = 1.f;
 		}
 
 		mShowSelection = FALSE;
@@ -5536,11 +5569,12 @@ void LLSelectMgr::updatePointAt()
 		if (mSelectedObjects->getObjectCount())
 		{					
 			LLVector3 select_offset;
-			LLViewerObject *click_object = gObjectList.findObject(gLastHitObjectID);
+			const LLPickInfo& pick = gViewerWindow->getLastPick();
+			LLViewerObject *click_object = pick.getObject();
 			if (click_object && click_object->isSelected())
 			{
 				// clicked on another object in our selection group, use that as target
-				select_offset.setVec(gLastHitObjectOffset);
+				select_offset.setVec(pick.mObjectOffset);
 				select_offset.rotVec(~click_object->getRenderRotation());
 		
 				gAgent.setPointAt(POINTAT_TARGET_SELECT, click_object, select_offset);
@@ -5738,29 +5772,20 @@ BOOL LLSelectMgr::setForceSelection(BOOL force)
 
 void LLSelectMgr::resetAgentHUDZoom()
 {
-	if (gAgent.getAvatarObject())
-	{
-		gAgent.getAvatarObject()->mHUDTargetZoom = 1.f;
-		gAgent.getAvatarObject()->mHUDCurZoom = 1.f;
-	}
+	gAgent.mHUDTargetZoom = 1.f;
+	gAgent.mHUDCurZoom = 1.f;
 }
 
 void LLSelectMgr::getAgentHUDZoom(F32 &target_zoom, F32 &current_zoom) const
 {
-	if (gAgent.getAvatarObject())
-	{
-		target_zoom = gAgent.getAvatarObject()->mHUDTargetZoom;
-		current_zoom = gAgent.getAvatarObject()->mHUDCurZoom;
-	}
+	target_zoom = gAgent.mHUDTargetZoom;
+	current_zoom = gAgent.mHUDCurZoom;
 }
 
 void LLSelectMgr::setAgentHUDZoom(F32 target_zoom, F32 current_zoom)
 {
-	if (gAgent.getAvatarObject())
-	{
-		gAgent.getAvatarObject()->mHUDTargetZoom = target_zoom;
-		gAgent.getAvatarObject()->mHUDCurZoom = current_zoom;
-	}
+	gAgent.mHUDTargetZoom = target_zoom;
+	gAgent.mHUDCurZoom = current_zoom;
 }
 
 LLObjectSelection::LLObjectSelection() : 
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 80ba192..d85ba04 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -159,8 +159,8 @@ public:
 	LLAggregatePermissions mAggregatePerm;
 	LLAggregatePermissions mAggregateTexturePerm;
 	LLAggregatePermissions mAggregateTexturePermOwner;
-	LLString		mName;
-	LLString		mDescription;
+	std::string		mName;
+	std::string		mDescription;
 	LLCategory		mCategory;
 	S16				mInventorySerial;
 	LLVector3		mSavedPositionLocal;	// for interactively modifying object position
@@ -176,8 +176,8 @@ public:
 	LLUUID			mItemID;
 	LLUUID			mFolderID;
 	LLUUID			mFromTaskID;
-	LLString		mTouchName;
-	LLString		mSitName;
+	std::string		mTouchName;
+	std::string		mSitName;
 	U64				mCreationDate;
 	std::vector<LLColor4>	mSavedColors;
 	std::vector<LLUUID>		mSavedTextures;
@@ -506,8 +506,8 @@ public:
 	void selectionSetGlow(const F32 glow);
 
 	void selectionSetObjectPermissions(U8 perm_field, BOOL set, U32 perm_mask, BOOL override = FALSE);
-	void selectionSetObjectName(const LLString& name);
-	void selectionSetObjectDescription(const LLString& desc);
+	void selectionSetObjectName(const std::string& name);
+	void selectionSetObjectDescription(const std::string& desc);
 	void selectionSetObjectCategory(const LLCategory& category);
 	void selectionSetObjectSaleInfo(const LLSaleInfo& sale_info);
 
@@ -520,7 +520,7 @@ public:
 					   U32 update_type);
 	void sendSelectionMove();
 
-	void sendGodlikeRequest(const LLString& request, const LLString& parameter);
+	void sendGodlikeRequest(const std::string& request, const std::string& parameter);
 
 
 	// will make sure all selected object meet current criteria, or deselect them otherwise
@@ -543,9 +543,9 @@ public:
 	// returns TRUE if selected objects can be copied.
 	BOOL selectGetRootsCopy();
 	
-	BOOL selectGetCreator(LLUUID& id, LLString& name);					// TRUE if all have same creator, returns id
-	BOOL selectGetOwner(LLUUID& id, LLString& name);					// TRUE if all objects have same owner, returns id
-	BOOL selectGetLastOwner(LLUUID& id, LLString& name);				// TRUE if all objects have same owner, returns id
+	BOOL selectGetCreator(LLUUID& id, std::string& name);					// TRUE if all have same creator, returns id
+	BOOL selectGetOwner(LLUUID& id, std::string& name);					// TRUE if all objects have same owner, returns id
+	BOOL selectGetLastOwner(LLUUID& id, std::string& name);				// TRUE if all objects have same owner, returns id
 
 	// returns TRUE if all are the same. id is stuffed with
 	// the value found if available.
@@ -558,10 +558,14 @@ public:
 	// returns TRUE if all the nodes are valid. Accumulates
 	// permissions in the parameter.
 	BOOL selectGetPermissions(LLPermissions& perm);
-
-	// returns TRUE if anything is for sale. calculates the total
-	// price and stores that value in price.
-	BOOL selectIsForSale(S32& price);
+	
+	// Get a bunch of useful sale information for the object(s) selected.
+	// "_mixed" is true if not all objects have the same setting.
+	void selectGetAggregateSaleInfo(U32 &num_for_sale,
+									BOOL &is_for_sale_mixed, 
+									BOOL &is_sale_price_mixed,
+									S32 &total_sale_price,
+									S32 &individual_sale_price);
 
 	// returns TRUE if all nodes are valid. 
 	BOOL selectGetCategory(LLCategory& category);
@@ -642,7 +646,7 @@ private:
 	void addAsFamily(std::vector<LLViewerObject*>& objects, BOOL add_to_end = FALSE);
 	void generateSilhouette(LLSelectNode *nodep, const LLVector3& view_point);
 	// Send one message to each region containing an object on selection list.
-	void sendListToRegions(	const LLString& message_name,
+	void sendListToRegions(	const std::string& message_name,
 							void (*pack_header)(void *user_data), 
 							void (*pack_body)(LLSelectNode* node, void *user_data), 
 							void *user_data,
diff --git a/linden/indra/newview/llsky.h b/linden/indra/newview/llsky.h
index 5a2794b..60c449a 100644
--- a/linden/indra/newview/llsky.h
+++ b/linden/indra/newview/llsky.h
@@ -117,9 +117,6 @@ protected:
 	F32				mSunPhase;
 	LLColor4		mFogColor;				// Color to use for fog and haze
 
-	F32				mHaze;					// a multiplier to scale the lighting
-	F32				mDomeRadius;			// sky dome size
-
 	LLVector3		mLastSunDirection;
 };
 
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 4ec5720..9f5d115 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -36,6 +36,7 @@
 #include "llviewerwindow.h"
 #include "llviewerobjectlist.h"
 #include "llvovolume.h"
+#include "llvolume.h"
 #include "llviewercamera.h"
 #include "llface.h"
 #include "llviewercontrol.h"
@@ -243,28 +244,6 @@ void LLSpatialGroup::buildOcclusion()
 
 BOOL earlyFail(LLCamera* camera, LLSpatialGroup* group);
 
-BOOL LLLineSegmentAABB(const LLVector3& start, const LLVector3& end, const LLVector3& center, const LLVector3& size)
-{
-	float fAWdU[3];
-	LLVector3 dir;
-	LLVector3 diff;
-	
-	for (U32 i = 0; i < 3; i++)
-	{
-		dir.mV[i] = 0.5f * (end.mV[i] - start.mV[i]);
-		diff.mV[i] = (0.5f * (end.mV[i] + start.mV[i])) - center.mV[i];
-		fAWdU[i] = fabsf(dir.mV[i]);
-		if(fabsf(diff.mV[i])>size.mV[i] + fAWdU[i])	return false;
-	}
-
-	float f;
-	f = dir.mV[1] * diff.mV[2] - dir.mV[2] * diff.mV[1];	if(fabsf(f)>size.mV[1]*fAWdU[2] + size.mV[2]*fAWdU[1])	return false;
-	f = dir.mV[2] * diff.mV[0] - dir.mV[0] * diff.mV[2];	if(fabsf(f)>size.mV[0]*fAWdU[2] + size.mV[2]*fAWdU[0])	return false;
-	f = dir.mV[0] * diff.mV[1] - dir.mV[1] * diff.mV[0];	if(fabsf(f)>size.mV[0]*fAWdU[1] + size.mV[1]*fAWdU[0])	return false;
-
-	return true;
-}
-
 //returns:
 //	0 if sphere and AABB are not intersecting 
 //	1 if they are
@@ -2170,7 +2149,8 @@ void renderBoundingBox(LLDrawable* drawable)
 	if (vobj && vobj->onActiveList())
 	{
 		gGL.flush();
-		glLineWidth(4.f*sinf(gFrameTimeSeconds*2.f)+1.f);
+		glLineWidth(4.f*(sinf(gFrameTimeSeconds*2.f)*0.25f+0.75f));
+		stop_glerror();
 		drawBoxOutline(pos,size);
 		gGL.flush();
 		glLineWidth(1.f);
@@ -2305,6 +2285,56 @@ void renderLights(LLDrawable* drawablep)
 	}
 }
 
+
+void renderRaycast(LLDrawable* drawablep)
+{
+	if (drawablep->getVObj() != gDebugRaycastObject)
+	{
+		return;
+	}
+	
+	if (drawablep->getNumFaces())
+	{
+		LLGLEnable blend(GL_BLEND);
+		gGL.color4f(0,1,1,0.5f);
+
+		for (S32 i = 0; i < drawablep->getNumFaces(); i++)
+		{
+			pushVerts(drawablep->getFace(i), LLVertexBuffer::MAP_VERTEX);
+		}
+
+		// draw intersection point
+		glPushMatrix();
+		glLoadMatrixd(gGLModelView);
+		LLVector3 translate = gDebugRaycastIntersection;
+		glTranslatef(translate.mV[0], translate.mV[1], translate.mV[2]);
+		LLCoordFrame orient;
+		orient.lookDir(gDebugRaycastNormal, gDebugRaycastBinormal);
+		LLMatrix4 rotation;
+		orient.getRotMatrixToParent(rotation);
+		glMultMatrixf((float*)rotation.mMatrix);
+		
+		gGL.color4f(1,0,0,0.5f);
+		drawBox(LLVector3(0, 0, 0), LLVector3(0.1f, 0.022f, 0.022f));
+		gGL.color4f(0,1,0,0.5f);
+		drawBox(LLVector3(0, 0, 0), LLVector3(0.021f, 0.1f, 0.021f));
+		gGL.color4f(0,0,1,0.5f);
+		drawBox(LLVector3(0, 0, 0), LLVector3(0.02f, 0.02f, 0.1f));
+		glPopMatrix();
+
+		// draw bounding box of prim
+		const LLVector3* ext = drawablep->getSpatialExtents();
+
+		LLVector3 pos = (ext[0] + ext[1]) * 0.5f;
+		LLVector3 size = (ext[1] - ext[0]) * 0.5f;
+
+		LLGLDepthTest depth(GL_FALSE, GL_TRUE);
+		gGL.color4f(0,0.5f,0.5f,1);
+		drawBoxOutline(pos, size);
+
+	}
+}
+
 class LLOctreeRenderNonOccluded : public LLOctreeTraveler<LLDrawable>
 {
 public:
@@ -2318,16 +2348,19 @@ public:
 		if (!mCamera || mCamera->AABBInFrustumNoFarClip(group->mBounds[0], group->mBounds[1]))
 		{
 			node->accept(this);
+			stop_glerror();
 
 			for (U32 i = 0; i < node->getChildCount(); i++)
 			{
 				traverse(node->getChild(i));
+				stop_glerror();
 			}
 			
 			//draw tight fit bounding boxes for spatial group
 			if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCTREE))
 			{	
 				renderOctree(group);
+				stop_glerror();
 			}
 
 			//render visibility wireframe
@@ -2339,6 +2372,7 @@ public:
 				gGLLastMatrix = NULL;
 				glLoadMatrixd(gGLModelView);
 				renderVisibility(group, mCamera);
+				stop_glerror();
 				gGLLastMatrix = NULL;
 				glPopMatrix();
 				gGL.color4f(1,1,1,1);
@@ -2381,6 +2415,11 @@ public:
 			{
 				renderLights(drawable);
 			}
+
+			if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST))
+			{
+				renderRaycast(drawable);
+			}
 		}
 		
 		for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
@@ -2411,7 +2450,8 @@ void LLSpatialPartition::renderDebug()
 									  LLPipeline::RENDER_DEBUG_BBOXES |
 									  LLPipeline::RENDER_DEBUG_POINTS |
 									  LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY |
-									  LLPipeline::RENDER_DEBUG_TEXTURE_ANIM))
+									  LLPipeline::RENDER_DEBUG_TEXTURE_ANIM |
+									  LLPipeline::RENDER_DEBUG_RAYCAST))
 	{
 		return;
 	}
@@ -2457,17 +2497,37 @@ BOOL LLSpatialPartition::isVisible(const LLVector3& v)
 	return TRUE;
 }
 
-class LLOctreePick : public LLSpatialGroup::OctreeTraveler
+class LLOctreeIntersect : public LLSpatialGroup::OctreeTraveler
 {
 public:
 	LLVector3 mStart;
 	LLVector3 mEnd;
-	LLDrawable* mRet;
+	S32       *mFaceHit;
+	LLVector3 *mIntersection;
+	LLVector2 *mTexCoord;
+	LLVector3 *mNormal;
+	LLVector3 *mBinormal;
+	LLDrawable* mHit;
 	
-	LLOctreePick(LLVector3 start, LLVector3 end)
-	: mStart(start), mEnd(end)
+	LLOctreeIntersect(LLVector3 start, LLVector3 end,
+					  S32* face_hit, LLVector3* intersection, LLVector2* tex_coord, LLVector3* normal, LLVector3* binormal)
+		: mStart(start),
+		  mEnd(end),
+		  mFaceHit(face_hit),
+		  mIntersection(intersection),
+		  mTexCoord(tex_coord),
+		  mNormal(normal),
+		  mBinormal(binormal),
+		  mHit(NULL)
 	{
-		mRet = NULL;
+	}
+	
+	virtual void visit(const LLSpatialGroup::OctreeNode* branch) 
+	{	
+		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
+	{
+			check(*i);
+		}
 	}
 
 	virtual LLDrawable* check(const LLSpatialGroup::OctreeNode* node)
@@ -2487,41 +2547,73 @@ public:
 			size = group->mBounds[1];
 			center = group->mBounds[0];
 			
-			if (LLLineSegmentAABB(mStart, mEnd, center, size))
+			LLVector3 local_start = mStart;
+			LLVector3 local_end   = mEnd;
+
+			if (group->mSpatialPartition->isBridge())
+			{
+				LLMatrix4 local_matrix = group->mSpatialPartition->asBridge()->mDrawable->getRenderMatrix();
+				local_matrix.invert();
+				
+				local_start = mStart * local_matrix;
+				local_end   = mEnd   * local_matrix;
+			}
+
+			if (LLLineSegmentBoxIntersect(local_start, local_end, center, size))
 			{
 				check(child);
 			}
 		}	
 
-		return mRet;
+		return mHit;
 	}
 
-	virtual void visit(const LLSpatialGroup::OctreeNode* branch) 
+	virtual bool check(LLDrawable* drawable)
 	{	
-		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
+		if (drawable->isSpatialBridge())
 		{
-			check(*i);
-		}
+			LLSpatialPartition *part = drawable->asPartition();
+
+			check(part->mOctree);
 	}
 
-	virtual bool check(LLDrawable* drawable)
+		else
 	{
 		LLViewerObject* vobj = drawable->getVObj();
-		if (vobj->lineSegmentIntersect(mStart, mEnd))
+
+			if (vobj)
+			{
+				LLVector3 intersection;
+				if (vobj->lineSegmentIntersect(mStart, mEnd, -1, mFaceHit, &intersection, mTexCoord, mNormal, mBinormal))
+				{
+					mEnd = intersection;  // shorten ray so we only find CLOSER hits
+					if (mIntersection)
 		{
-			mRet = vobj->mDrawable;
+						*mIntersection = intersection;
+					}
+					
+					mHit = vobj->mDrawable;
+				}
+			}
 		}
 		
 		return false;
 	}
 };
 
-LLDrawable*	LLSpatialPartition::pickDrawable(const LLVector3& start, const LLVector3& end, LLVector3& collision)
+LLDrawable* LLSpatialPartition::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+													 S32* face_hit,                   // return the face hit
+													 LLVector3* intersection,         // return the intersection point
+													 LLVector2* tex_coord,            // return the texture coordinates of the intersection point
+													 LLVector3* normal,               // return the surface normal at the intersection point
+													 LLVector3* bi_normal             // return the surface bi-normal at the intersection point
+	)
+
 {
-	LLOctreePick pick(start, end);
-	LLDrawable* ret = pick.check(mOctree);
-	collision.setVec(pick.mEnd);
-	return ret;
+	LLOctreeIntersect intersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
+	LLDrawable* drawable = intersect.check(mOctree);
+
+	return drawable;
 }
 
 LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset, 
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index b4b1101..bd09da2 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -300,7 +300,14 @@ public:
 	LLSpatialGroup *put(LLDrawable *drawablep, BOOL was_visible = FALSE);
 	BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp);
 	
-	LLDrawable*	pickDrawable(const LLVector3& start, const LLVector3& end, LLVector3& collision);
+	LLDrawable* lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+									 S32* face_hit,                          // return the face hit
+									 LLVector3* intersection = NULL,         // return the intersection point
+									 LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
+									 LLVector3* normal = NULL,               // return the surface normal at the intersection point
+									 LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point
+		);
+	
 	
 	// If the drawable moves, move it here.
 	virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE);
diff --git a/linden/indra/newview/llsprite.cpp b/linden/indra/newview/llsprite.cpp
index 624e03d..7da1d48 100644
--- a/linden/indra/newview/llsprite.cpp
+++ b/linden/indra/newview/llsprite.cpp
@@ -59,30 +59,18 @@ LLVector3 LLSprite::sNormal(0.0f,0.0f,0.0f);
 //////////////////////////////////////////////////////////////////////
 
 // A simple initialization
-LLSprite::LLSprite(const LLUUID &image_uuid)
+LLSprite::LLSprite(const LLUUID &image_uuid) :
+	mImageID(image_uuid),
+	mImagep(NULL),
+	mPitch(0.f),
+	mYaw(0.f),
+	mPosition(0.0f, 0.0f, 0.0f),
+	mFollow(TRUE),
+	mUseCameraUp(TRUE),
+	mColor(0.5f, 0.5f, 0.5f, 1.0f),
+	mTexMode(GL_REPLACE)
 {
-	mImageID = image_uuid;
-	mImagep = NULL;
-
 	setSize(1.0f, 1.0f);
-	setPosition(LLVector3(0.0f, 0.0f, 0.0f));
-	mTexMode = GL_REPLACE;
-	mColor.setVec(0.5f, 0.5f, 0.5f, 1.0f);
-	mFollow = TRUE;
-	mUseCameraUp = TRUE;
-}
-
-LLSprite::LLSprite(const LLUUID &image_uuid, const F32 width, const F32 height, const BOOL b_usemipmap)
-{
-	mImageID = image_uuid;
-	mImagep = NULL;
-
-	setSize(width,height);
-	setPosition(LLVector3(0.0f, 0.0f, 0.0f));
-	mTexMode = GL_REPLACE;
-	mColor.setVec(0.5f, 0.5f, 0.5f, 1.0f);
-	mFollow = TRUE;
-	mUseCameraUp = TRUE;
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llsprite.h b/linden/indra/newview/llsprite.h
index f6e392a..7170cb2 100644
--- a/linden/indra/newview/llsprite.h
+++ b/linden/indra/newview/llsprite.h
@@ -49,7 +49,6 @@ class LLSprite
 {
 public:
 	LLSprite(const LLUUID &image_uuid);
-	LLSprite(const LLUUID &image_uuid, const F32 width, const F32 height, const BOOL b_usemipmap = TRUE);
 	~LLSprite();
 
 	void render(LLViewerCamera * camerap);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b5ab0ee..d018eaa 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -41,8 +41,8 @@
 
 #include "audioengine.h"
 
-#if LL_FMOD
-#include "audioengine_fmod.h"
+#ifdef LL_FMOD
+# include "audioengine_fmod.h"
 #endif
 
 #include "llares.h"
@@ -174,6 +174,11 @@
 #include "llpostprocess.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "llagentlanguage.h"
+
+#if LL_LIBXUL_ENABLED
+#include "llmozlib.h"
+#endif // LL_LIBXUL_ENABLED
 
 #if LL_WINDOWS
 #include "llwindebug.h"
@@ -183,10 +188,12 @@
 //
 // exported globals
 //
-BOOL gAgentMovementCompleted = FALSE;
+bool gAgentMovementCompleted = false;
+std::string gInitialOutfit;
+std::string gInitialOutfitGender;
 
-const char* SCREEN_HOME_FILENAME = "screen_home.bmp";
-const char* SCREEN_LAST_FILENAME = "screen_last.bmp";
+std::string SCREEN_HOME_FILENAME = "screen_home.bmp";
+std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
 
 //
 // Imported globals
@@ -204,12 +211,12 @@ static LLHost gAgentSimHost;
 static BOOL gSkipOptionalUpdate = FALSE;
 
 static bool gGotUseCircuitCodeAck = false;
-LLString gInitialOutfit;
-LLString gInitialOutfitGender;	// "male" or "female"
+static std::string sInitialOutfit;
+static std::string sInitialOutfitGender;	// "male" or "female"
 
 static bool gUseCircuitCallbackCalled = false;
 
-S32 LLStartUp::gStartupState = STATE_FIRST;
+EStartupState LLStartUp::gStartupState = STATE_FIRST;
 
 
 //
@@ -218,12 +225,12 @@ S32 LLStartUp::gStartupState = STATE_FIRST;
 
 void login_show();
 void login_callback(S32 option, void* userdata);
-LLString load_password_from_disk();
+std::string load_password_from_disk();
 void save_password_to_disk(const char* hashed_password);
-BOOL is_hex_string(U8* str, S32 len);
+bool is_hex_string(U8* str, S32 len);
 void show_first_run_dialog();
 void first_run_dialog_callback(S32 option, void* userdata);
-void set_startup_status(const F32 frac, const char* string, const char* msg);
+void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
 void login_alert_status(S32 option, void* user_data);
 void update_app(BOOL mandatory, const std::string& message);
 void update_dialog_callback(S32 option, void *userdata);
@@ -238,7 +245,7 @@ void init_start_screen(S32 location_id);
 void release_start_screen();
 void reset_login();
 
-void callback_cache_name(const LLUUID& id, const char* firstname, const char* lastname, BOOL is_group, void* data)
+void callback_cache_name(const LLUUID& id, const std::string& firstname, const std::string& lastname, BOOL is_group, void* data)
 {
 	LLNameListCtrl::refreshAll(id, firstname, lastname, is_group);
 	LLNameBox::refreshAll(id, firstname, lastname, is_group);
@@ -262,7 +269,7 @@ namespace
 	class LLNullHTTPSender : public LLHTTPSender
 	{
 		virtual void send(const LLHost& host, 
-						  const char* message, const LLSD& body, 
+						  const std::string& message, const LLSD& body, 
 						  LLHTTPClient::ResponderPtr response) const
 		{
 			LL_WARNS("AppInit") << " attemped to send " << message << " to " << host
@@ -296,9 +303,9 @@ void update_texture_fetch()
 static std::vector<std::string> sAuthUris;
 static S32 sAuthUriNum = -1;
 
-// Returns FALSE to skip other idle processing. Should only return
-// TRUE when all initialization done.
-BOOL idle_startup()
+// Returns false to skip other idle processing. Should only return
+// true when all initialization done.
+bool idle_startup()
 {
 	LLMemType mt1(LLMemType::MTYPE_STARTUP);
 	
@@ -317,10 +324,10 @@ BOOL idle_startup()
 	static std::string auth_method;
 	static std::string auth_desc;
 	static std::string auth_message;
-	static LLString firstname;
-	static LLString lastname;
+	static std::string firstname;
+	static std::string lastname;
 	static LLUUID web_login_key;
-	static LLString password;
+	static std::string password;
 	static std::vector<const char*> requested_options;
 
 	static U64 first_sim_handle = 0;
@@ -336,14 +343,12 @@ BOOL idle_startup()
 	static S32  agent_location_id = START_LOCATION_ID_LAST;
 	static S32  location_which = START_LOCATION_ID_LAST;
 
-	static BOOL show_connect_box = TRUE;
+	static bool show_connect_box = true;
 	static BOOL remember_password = TRUE;
 
-	static BOOL stipend_since_login = FALSE;
-
-	static BOOL samename = FALSE;
+	static bool stipend_since_login = false;
 
-	BOOL do_normal_idle = FALSE;
+	static bool samename = false;
 
 	// HACK: These are things from the main loop that usually aren't done
 	// until initialization is complete, but need to be done here for things
@@ -389,16 +394,16 @@ BOOL idle_startup()
 			
 		gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion());
 
-		LLString xml_file = LLUI::locateSkin("xui_version.xml");
+		std::string xml_file = LLUI::locateSkin("xui_version.xml");
 		LLXMLNodePtr root;
 		bool xml_ok = false;
 		if (LLXMLNode::parseFile(xml_file, root, NULL))
 		{
 			if( (root->hasName("xui_version") ) )
 			{
-				LLString value = root->getValue();
+				std::string value = root->getValue();
 				F32 version = 0.0f;
-				LLString::convertToF32(value, version);
+				LLStringUtil::convertToF32(value, version);
 				if (version >= 1.0f)
 				{
 					xml_ok = true;
@@ -409,7 +414,7 @@ BOOL idle_startup()
 		{
 			// *TODO:translate (maybe - very unlikely error message)
 			// Note: alerts.xml may be invalid - if this gets translated it will need to be in the code
-			LLString bad_xui_msg = "An error occured while updating Second Life. Please download the latest version from www.secondlife.com.";
+			std::string bad_xui_msg = "An error occured while updating Second Life. Please download the latest version from www.secondlife.com.";
             LLAppViewer::instance()->earlyExit(bad_xui_msg);
 		}
 		//
@@ -417,7 +422,7 @@ BOOL idle_startup()
 		//
 
 		// Load autopilot and stats stuff
-		gAgentPilot.load(gSavedSettings.getString("StatsPilotFile").c_str());
+		gAgentPilot.load(gSavedSettings.getString("StatsPilotFile"));
 		gFrameStats.setFilename(gSavedSettings.getString("StatsFile"));
 		gFrameStats.setSummaryFilename(gSavedSettings.getString("StatsSummaryFile"));
 
@@ -439,7 +444,19 @@ BOOL idle_startup()
 		std::string message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message_template.msg");
 
 		LLFILE* found_template = NULL;
-		found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
+		found_template = LLFile::fopen(message_template_path, "r");		/* Flawfinder: ignore */
+		
+		#if LL_WINDOWS
+			// On the windows dev builds, unpackaged, the message_template.msg 
+			// file will be located in 
+			// indra/build-vc**/newview/<config>/app_settings.
+			if (!found_template)
+			{
+				message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "message_template.msg");
+				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
+			}	
+		#endif
+
 		if (found_template)
 		{
 			fclose(found_template);
@@ -465,11 +482,28 @@ BOOL idle_startup()
 				std::string msg = llformat("Unable to start networking, error %d", gMessageSystem->getErrorCode());
 				LLAppViewer::instance()->earlyExit(msg);
 			}
-			LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+
+			#if LL_WINDOWS
+				// On the windows dev builds, unpackaged, the message.xml file will 
+				// be located in indra/build-vc**/newview/<config>/app_settings.
+				std::string message_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message.xml");
+							
+				if (!LLFile::isfile(message_path.c_str())) 
+				{
+					LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", ""));
+				}
+				else
+				{
+					LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+				}
+			#else			
+				LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+			#endif
+
 		}
 		else
 		{
-			LLAppViewer::instance()->earlyExit("Unable to initialize communications.");
+			LLAppViewer::instance()->earlyExit("Message Template " + message_template_path + " not found.");
 		}
 
 		if(gMessageSystem && gMessageSystem->isOK())
@@ -540,7 +574,7 @@ BOOL idle_startup()
 
 		if (FALSE == gSavedSettings.getBOOL("NoAudio"))
 		{
-#if LL_FMOD
+#ifdef LL_FMOD
 			gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
 #else
 			gAudiop = NULL;
@@ -555,7 +589,7 @@ BOOL idle_startup()
 #else
 				void* window_handle = NULL;
 #endif
-				BOOL init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);
+				bool init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);
 				if(!init)
 				{
 					LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;
@@ -581,7 +615,7 @@ BOOL idle_startup()
 			lastname = gLoginHandler.mLastName;
 			web_login_key = gLoginHandler.mWebLoginKey;
 
-			show_connect_box = FALSE;
+			show_connect_box = false;
 		}
         else if(gSavedSettings.getLLSD("UserLoginInfo").size() == 3)
         {
@@ -596,9 +630,9 @@ BOOL idle_startup()
 			remember_password = gSavedSettings.getBOOL("RememberPassword");
 			
 #ifdef USE_VIEWER_AUTH
-			show_connect_box = TRUE;
+			show_connect_box = true;
 #else
-			show_connect_box = FALSE;
+			show_connect_box = false;
 #endif
 			gSavedSettings.setBOOL("AutoLogin", TRUE);
         }
@@ -611,9 +645,9 @@ BOOL idle_startup()
 			remember_password = TRUE;
 			
 #ifdef USE_VIEWER_AUTH
-			show_connect_box = TRUE;
+			show_connect_box = true;
 #else
-			show_connect_box = FALSE;
+			show_connect_box = false;
 #endif
 		}
 		else
@@ -624,39 +658,31 @@ BOOL idle_startup()
 			lastname = gSavedSettings.getString("LastName");
 			password = load_password_from_disk();
 			remember_password = gSavedSettings.getBOOL("RememberPassword");
-			show_connect_box = TRUE;
+			show_connect_box = true;
 		}
 
 
 		// Go to the next startup state
-		LLStartUp::setStartupState( STATE_MEDIA_INIT );
-		return do_normal_idle;
+		LLStartUp::setStartupState( STATE_BROWSER_INIT );
+		return FALSE;
 	}
 
 	
-	//---------------------------------------------------------------------
-	// LLMediaEngine Init
-	//---------------------------------------------------------------------
-	if (STATE_MEDIA_INIT == LLStartUp::getStartupState())
+	if (STATE_BROWSER_INIT == LLStartUp::getStartupState())
 	{
-		LL_DEBUGS("AppInit") << "Initializing Multimedia...." << LL_ENDL;
-		set_startup_status(0.03f, "Initializing Multimedia...", gAgent.mMOTD.c_str());
+		LL_DEBUGS("AppInit") << "STATE_BROWSER_INIT" << LL_ENDL;
+		std::string msg = LLTrans::getString("LoginInitializingBrowser");
+		set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
 		display_startup();
-		LLViewerMedia::initClass();
-		LLViewerParcelMedia::initClass();
-
-		if (gViewerWindow)
-		{
-			audio_update_volume(true);
-		}
+		LLViewerMedia::initBrowser();
 
 		LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-		return do_normal_idle;
+		return FALSE;
 	}
 
-	if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())
-	{		
 
+	if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())
+	{
 		LL_DEBUGS("AppInit") << "Initializing Window" << LL_ENDL;
 		
 		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
@@ -718,7 +744,7 @@ BOOL idle_startup()
 		gLoginMenuBarView->setEnabled( TRUE );
 
 		timeout.reset();
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	if (STATE_LOGIN_WAIT == LLStartUp::getStartupState())
@@ -728,7 +754,7 @@ BOOL idle_startup()
 
 		// Sleep so we don't spin the CPU
 		ms_sleep(1);
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
@@ -773,8 +799,8 @@ BOOL idle_startup()
 
 		// create necessary directories
 		// *FIX: these mkdir's should error check
-		gDirUtilp->setLindenUserDir(firstname.c_str(), lastname.c_str());
-    	LLFile::mkdir(gDirUtilp->getLindenUserDir().c_str());
+		gDirUtilp->setLindenUserDir(firstname, lastname);
+    	LLFile::mkdir(gDirUtilp->getLindenUserDir());
 
         // Set PerAccountSettingsFile to the default value.
 		gSavedSettings.setString("PerAccountSettingsFile",
@@ -804,10 +830,10 @@ BOOL idle_startup()
 			gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));		
 		}
 		
-		gDirUtilp->setPerAccountChatLogsDir(firstname.c_str(), lastname.c_str());
+		gDirUtilp->setPerAccountChatLogsDir(firstname, lastname);
 
-		LLFile::mkdir(gDirUtilp->getChatLogsDir().c_str());
-		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir().c_str());
+		LLFile::mkdir(gDirUtilp->getChatLogsDir());
+		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
 
 		if (show_connect_box)
 		{
@@ -818,7 +844,7 @@ BOOL idle_startup()
 				sAuthUris.clear();
 			}
 			
-			LLString location;
+			std::string location;
 			LLPanelLogin::getLocation( location );
 			LLURLSimString::setString( location );
 
@@ -829,9 +855,6 @@ BOOL idle_startup()
 		
 		//For HTML parsing in text boxes.
 		LLTextEditor::setLinkColor( gSavedSettings.getColor4("HTMLLinkColor") );
-		LLTextEditor::setURLCallbacks ( &LLWeb::loadURL,
-				&LLURLDispatcher::dispatchFromTextEditor,
-				&LLURLDispatcher::dispatchFromTextEditor   );
 
 		// Load URL History File
 		LLURLHistory::loadFile("url_history.xml");
@@ -874,11 +897,11 @@ BOOL idle_startup()
 
 		// Display the startup progress bar.
 		gViewerWindow->setShowProgress(TRUE);
-		gViewerWindow->setProgressCancelButtonVisible(TRUE, "Quit");
+		gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Quit")); // *TODO: Translate
 
 		// Poke the VFS, which could potentially block for a while if
 		// Windows XP is acting up
-		set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache").c_str(), NULL);
+		set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache"), LLStringUtil::null);
 		display_startup();
 
 		gVFS->pokeFiles();
@@ -889,13 +912,13 @@ BOOL idle_startup()
 		// skipping over STATE_UPDATE_CHECK because that just waits for input
 		LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
 
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	if (STATE_UPDATE_CHECK == LLStartUp::getStartupState())
 	{
 		// wait for user to give input via dialog box
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState())
@@ -948,16 +971,16 @@ BOOL idle_startup()
 		sAuthUriNum = 0;
 		auth_method = "login_to_simulator";
 		
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
-		auth_desc = LLTrans::getString("LoginInProgress", args).c_str();
+		auth_desc = LLTrans::getString("LoginInProgress", args);
 		LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
 	}
 
 	if (STATE_LOGIN_AUTHENTICATE == LLStartUp::getStartupState())
 	{
 		LL_DEBUGS("AppInit") << "STATE_LOGIN_AUTHENTICATE" << LL_ENDL;
-		set_startup_status(progress, auth_desc.c_str(), auth_message.c_str());
+		set_startup_status(progress, auth_desc, auth_message);
 		progress += 0.02f;
 		display_startup();
 		
@@ -971,7 +994,7 @@ BOOL idle_startup()
 							<< LLURLSimString::sInstance.mX << "&" 
 							<< LLURLSimString::sInstance.mY << "&" 
 							<< LLURLSimString::sInstance.mZ;
-			start << xml_escape_string(unescaped_start.str().c_str());
+			start << xml_escape_string(unescaped_start.str());
 			
 		}
 		else if (gSavedSettings.getBOOL("LoginLastLocation"))
@@ -992,13 +1015,12 @@ BOOL idle_startup()
 		// TODO if statement here to use web_login_key
 		sAuthUriNum = llclamp(sAuthUriNum, 0, (S32)sAuthUris.size()-1);
 		LLUserAuth::getInstance()->authenticate(
-			sAuthUris[sAuthUriNum].c_str(),
-			auth_method.c_str(),
-			firstname.c_str(),
-			lastname.c_str(),
-			// web_login_key,
-			password.c_str(),
-			start.str().c_str(),
+			sAuthUris[sAuthUriNum],
+			auth_method,
+			firstname,
+			lastname,			
+			password, // web_login_key,
+			start.str(),
 			gSkipOptionalUpdate,
 			gAcceptTOS,
 			gAcceptCriticalMessage,
@@ -1011,7 +1033,7 @@ BOOL idle_startup()
 		gAcceptTOS = FALSE;
 		gAcceptCriticalMessage = FALSE;
 		LLStartUp::setStartupState( STATE_LOGIN_NO_DATA_YET );
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	if(STATE_LOGIN_NO_DATA_YET == LLStartUp::getStartupState())
@@ -1020,7 +1042,7 @@ BOOL idle_startup()
 		// If we get here we have gotten past the potential stall
 		// in curl, so take "may appear frozen" out of progress bar. JC
 		auth_desc = "Logging in...";
-		set_startup_status(progress, auth_desc.c_str(), auth_message.c_str());
+		set_startup_status(progress, auth_desc, auth_message);
 		// Process messages to keep from dropping circuit.
 		LLMessageSystem* msg = gMessageSystem;
 		while (msg->checkAllMessages(gFrameCount, gServicePump))
@@ -1031,12 +1053,12 @@ BOOL idle_startup()
 		if(LLUserAuth::E_NO_RESPONSE_YET == error)
 		{
 			LL_DEBUGS("AppInit") << "waiting..." << LL_ENDL;
-			return do_normal_idle;
+			return FALSE;
 		}
 		LLStartUp::setStartupState( STATE_LOGIN_DOWNLOADING );
 		progress += 0.01f;
-		set_startup_status(progress, auth_desc.c_str(), auth_message.c_str());
-		return do_normal_idle;
+		set_startup_status(progress, auth_desc, auth_message);
+		return FALSE;
 	}
 
 	if(STATE_LOGIN_DOWNLOADING == LLStartUp::getStartupState())
@@ -1052,23 +1074,23 @@ BOOL idle_startup()
 		if(LLUserAuth::E_DOWNLOADING == error)
 		{
 			LL_DEBUGS("AppInit") << "downloading..." << LL_ENDL;
-			return do_normal_idle;
+			return FALSE;
 		}
 		LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE );
 		progress += 0.01f;
-		set_startup_status(progress, LLTrans::getString("LoginProcessingResponse").c_str(), auth_message.c_str());
-		return do_normal_idle;
+		set_startup_status(progress, LLTrans::getString("LoginProcessingResponse"), auth_message);
+		return FALSE;
 	}
 
 	if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState())
 	{
 		LL_DEBUGS("AppInit") << "STATE_LOGIN_PROCESS_RESPONSE" << LL_ENDL;
 		std::ostringstream emsg;
-		BOOL quit = FALSE;
-		const char* login_response = NULL;
-		const char* reason_response = NULL;
-		const char* message_response = NULL;
-		BOOL successful_login = FALSE;
+		bool quit = false;
+		std::string login_response;
+		std::string reason_response;
+		std::string message_response;
+		bool successful_login = false;
 		LLUserAuth::UserAuthcode error = LLUserAuth::getInstance()->authResponse();
 		// reset globals
 		gAcceptTOS = FALSE;
@@ -1077,12 +1099,12 @@ BOOL idle_startup()
 		{
 		case LLUserAuth::E_OK:
 			login_response = LLUserAuth::getInstance()->getResponse("login");
-			if(login_response && (0 == strcmp(login_response, "true")))
+			if(login_response == "true")
 			{
 				// Yay, login!
-				successful_login = TRUE;
+				successful_login = true;
 			}
-			else if(login_response && (0 == strcmp(login_response, "indeterminate")))
+			else if(login_response == "indeterminate")
 			{
 				LL_INFOS("AppInit") << "Indeterminate login..." << LL_ENDL;
 				sAuthUris = LLSRV::rewriteURI(LLUserAuth::getInstance()->getResponse("next_url"));
@@ -1091,16 +1113,16 @@ BOOL idle_startup()
 				auth_message = LLUserAuth::getInstance()->getResponse("message");
 				if(auth_method.substr(0, 5) == "login")
 				{
-					auth_desc.assign(LLTrans::getString("LoginAuthenticating").c_str());
+					auth_desc.assign(LLTrans::getString("LoginAuthenticating"));
 				}
 				else
 				{
-					auth_desc.assign(LLTrans::getString("LoginMaintenance").c_str());
+					auth_desc.assign(LLTrans::getString("LoginMaintenance"));
 				}
 				// ignoring the duration & options array for now.
 				// Go back to authenticate.
 				LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
-				return do_normal_idle;
+				return FALSE;
 			}
 			else
 			{
@@ -1108,15 +1130,15 @@ BOOL idle_startup()
 				reason_response = LLUserAuth::getInstance()->getResponse("reason");
 				message_response = LLUserAuth::getInstance()->getResponse("message");
 
-				if (gHideLinks && reason_response && (0 == strcmp(reason_response, "disabled")))
+				if (gHideLinks && reason_response == "disabled")
 				{
 					emsg << gDisabledMessage;
 				}
-				else if (message_response)
+				else if (!message_response.empty())
 				{
 					// XUI: fix translation for strings returned during login
 					// We need a generic table for translations
-					LLString big_reason = LLAgent::sTeleportErrorMessages[ message_response ];
+					std::string big_reason = LLAgent::sTeleportErrorMessages[ message_response ];
 					if ( big_reason.size() == 0 )
 					{
 						emsg << message_response;
@@ -1127,7 +1149,7 @@ BOOL idle_startup()
 					}
 				}
 
-				if(reason_response && (0 == strcmp(reason_response, "tos")))
+				if(reason_response == "tos")
 				{
 					if (show_connect_box)
 					{
@@ -1137,14 +1159,14 @@ BOOL idle_startup()
 																	message_response);
 						tos_dialog->startModal();
 						// LLFloaterTOS deletes itself.
-						return FALSE;
+						return false;
 					}
 					else
 					{
-						quit = TRUE;
+						quit = true;
 					}
 				}
-				if(reason_response && (0 == strcmp(reason_response, "critical")))
+				if(reason_response == "critical")
 				{
 					if (show_connect_box)
 					{
@@ -1154,34 +1176,34 @@ BOOL idle_startup()
 																	message_response);
 						tos_dialog->startModal();
 						// LLFloaterTOS deletes itself.
-						return FALSE;
+						return false;
 					}
 					else
 					{
-						quit = TRUE;
+						quit = true;
 					}
 				}
-				if(reason_response && (0 == strcmp(reason_response, "key")))
+				if(reason_response == "key")
 				{
 					// Couldn't login because user/password is wrong
 					// Clear the password
 					password = "";
 				}
-				if(reason_response && (0 == strcmp(reason_response, "update")))
+				if(reason_response == "update")
 				{
 					auth_message = LLUserAuth::getInstance()->getResponse("message");
 					if (show_connect_box)
 					{
 						update_app(TRUE, auth_message);
 						LLStartUp::setStartupState( STATE_UPDATE_CHECK );
-						return FALSE;
+						return false;
 					}
 					else
 					{
-						quit = TRUE;
+						quit = true;
 					}
 				}
-				if(reason_response && (0 == strcmp(reason_response, "optional")))
+				if(reason_response == "optional")
 				{
 					LL_DEBUGS("AppInit") << "Login got optional update" << LL_ENDL;
 					auth_message = LLUserAuth::getInstance()->getResponse("message");
@@ -1190,7 +1212,7 @@ BOOL idle_startup()
 						update_app(FALSE, auth_message);
 						LLStartUp::setStartupState( STATE_UPDATE_CHECK );
 						gSkipOptionalUpdate = TRUE;
-						return FALSE;
+						return false;
 					}
 				}
 			}
@@ -1208,11 +1230,11 @@ BOOL idle_startup()
 			} else {
 				sAuthUriNum++;
 				std::ostringstream s;
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[NUMBER]"] = llformat("%d", sAuthUriNum + 1);
-				auth_desc = LLTrans::getString("LoginAttempt", args).c_str();
+				auth_desc = LLTrans::getString("LoginAttempt", args);
 				LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
-				return do_normal_idle;
+				return FALSE;
 			}
 			break;
 		}
@@ -1222,35 +1244,35 @@ BOOL idle_startup()
 		{
 			LLUserAuth::getInstance()->reset();
 			LLAppViewer::instance()->forceQuit();
-			return FALSE;
+			return false;
 		}
 
 		if(successful_login)
 		{
 			// unpack login data needed by the application
-			const char* text;
+			std::string text;
 			text = LLUserAuth::getInstance()->getResponse("agent_id");
-			if(text) gAgentID.set(text);
+			if(!text.empty()) gAgentID.set(text);
 			gDebugInfo["AgentID"] = text;
 			
 			text = LLUserAuth::getInstance()->getResponse("session_id");
-			if(text) gAgentSessionID.set(text);
+			if(!text.empty()) gAgentSessionID.set(text);
 			gDebugInfo["SessionID"] = text;
 			
 			text = LLUserAuth::getInstance()->getResponse("secure_session_id");
-			if(text) gAgent.mSecureSessionID.set(text);
+			if(!text.empty()) gAgent.mSecureSessionID.set(text);
 
 			text = LLUserAuth::getInstance()->getResponse("first_name");
-			if(text) 
+			if(!text.empty()) 
 			{
 				// Remove quotes from string.  Login.cgi sends these to force
 				// names that look like numbers into strings.
 				firstname.assign(text);
-				LLString::replaceChar(firstname, '"', ' ');
-				LLString::trim(firstname);
+				LLStringUtil::replaceChar(firstname, '"', ' ');
+				LLStringUtil::trim(firstname);
 			}
 			text = LLUserAuth::getInstance()->getResponse("last_name");
-			if(text) lastname.assign(text);
+			if(!text.empty()) lastname.assign(text);
 			gSavedSettings.setString("FirstName", firstname);
 			gSavedSettings.setString("LastName", lastname);
 
@@ -1265,7 +1287,7 @@ BOOL idle_startup()
 			gSavedSettings.setBOOL("RememberPassword", remember_password);
 
 			text = LLUserAuth::getInstance()->getResponse("agent_access");
-			if(text && (text[0] == 'M'))
+			if(!text.empty() && (text[0] == 'M'))
 			{
 				gAgent.setTeen(false);
 			}
@@ -1275,52 +1297,48 @@ BOOL idle_startup()
 			}
 
 			text = LLUserAuth::getInstance()->getResponse("start_location");
-			if(text) agent_start_location.assign(text);
+			if(!text.empty()) agent_start_location.assign(text);
 			text = LLUserAuth::getInstance()->getResponse("circuit_code");
-			if(text)
+			if(!text.empty())
 			{
-				gMessageSystem->mOurCircuitCode = strtoul(text, NULL, 10);
+				gMessageSystem->mOurCircuitCode = strtoul(text.c_str(), NULL, 10);
 			}
-			const char* sim_ip_str = LLUserAuth::getInstance()->getResponse("sim_ip");
-			const char* sim_port_str = LLUserAuth::getInstance()->getResponse("sim_port");
-			if(sim_ip_str && sim_port_str)
+			std::string sim_ip_str = LLUserAuth::getInstance()->getResponse("sim_ip");
+			std::string sim_port_str = LLUserAuth::getInstance()->getResponse("sim_port");
+			if(!sim_ip_str.empty() && !sim_port_str.empty())
 			{
-				U32 sim_port = strtoul(sim_port_str, NULL, 10);
+				U32 sim_port = strtoul(sim_port_str.c_str(), NULL, 10);
 				first_sim.set(sim_ip_str, sim_port);
 				if (first_sim.isOk())
 				{
 					gMessageSystem->enableCircuit(first_sim, TRUE);
 				}
 			}
-			const char* region_x_str = LLUserAuth::getInstance()->getResponse("region_x");
-			const char* region_y_str = LLUserAuth::getInstance()->getResponse("region_y");
-			if(region_x_str && region_y_str)
+			std::string region_x_str = LLUserAuth::getInstance()->getResponse("region_x");
+			std::string region_y_str = LLUserAuth::getInstance()->getResponse("region_y");
+			if(!region_x_str.empty() && !region_y_str.empty())
 			{
-				U32 region_x = strtoul(region_x_str, NULL, 10);
-				U32 region_y = strtoul(region_y_str, NULL, 10);
+				U32 region_x = strtoul(region_x_str.c_str(), NULL, 10);
+				U32 region_y = strtoul(region_y_str.c_str(), NULL, 10);
 				first_sim_handle = to_region_handle(region_x, region_y);
 			}
 			
-			const char* look_at_str = LLUserAuth::getInstance()->getResponse("look_at");
-			if (look_at_str)
+			const std::string look_at_str = LLUserAuth::getInstance()->getResponse("look_at");
+			if (!look_at_str.empty())
 			{
-#if !LL_WINDOWS && !LL_DARWIN
-				size_t len = strnlen(look_at_str, MAX_STRING);
-#else
-				size_t len = strlen(look_at_str);
-#endif
-				LLMemoryStream mstr((U8*)look_at_str, len);
+				size_t len = look_at_str.size();
+				LLMemoryStream mstr((U8*)look_at_str.c_str(), len);
 				LLSD sd = LLSDSerialize::fromNotation(mstr, len);
 				agent_start_look_at = ll_vector3_from_sd(sd);
 			}
 
 			text = LLUserAuth::getInstance()->getResponse("seed_capability");
-			if (text) first_sim_seed_cap = text;
+			if (!text.empty()) first_sim_seed_cap = text;
 						
 			text = LLUserAuth::getInstance()->getResponse("seconds_since_epoch");
-			if(text)
+			if(!text.empty())
 			{
-				U32 server_utc_time = strtoul(text, NULL, 10);
+				U32 server_utc_time = strtoul(text.c_str(), NULL, 10);
 				if(server_utc_time)
 				{
 					time_t now = time(NULL);
@@ -1328,15 +1346,11 @@ BOOL idle_startup()
 				}
 			}
 
-			const char* home_location = LLUserAuth::getInstance()->getResponse("home");
-			if(home_location)
+			std::string home_location = LLUserAuth::getInstance()->getResponse("home");
+			if(!home_location.empty())
 			{
-#if !LL_WINDOWS && !LL_DARWIN
-				size_t len = strnlen(home_location, MAX_STRING);
-#else
-				size_t len = strlen(home_location);
-#endif
-				LLMemoryStream mstr((U8*)home_location, len);
+				size_t len = home_location.size();
+				LLMemoryStream mstr((U8*)home_location.c_str(), len);
 				LLSD sd = LLSDSerialize::fromNotation(mstr, len);
 				S32 region_x = sd["region_handle"][0].asInteger();
 				S32 region_y = sd["region_handle"][1].asInteger();
@@ -1353,7 +1367,7 @@ BOOL idle_startup()
 				it = options[0].find("folder_id");
 				if(it != options[0].end())
 				{
-					gAgent.mInventoryRootID.set((*it).second.c_str());
+					gAgent.mInventoryRootID.set((*it).second);
 					//gInventory.mock(gAgent.getInventoryRootID());
 				}
 			}
@@ -1372,7 +1386,7 @@ BOOL idle_startup()
 				it = options[0].find("stipend_since_login");
 				if(it != no_flag)
 				{
-					if((*it).second == "Y") stipend_since_login = TRUE;
+					if((*it).second == "Y") stipend_since_login = true;
 				}
 				it = options[0].find("gendered");
 				if(it != no_flag)
@@ -1395,12 +1409,14 @@ BOOL idle_startup()
 				it = options[0].find("folder_name");
 				if(it != it_end)
 				{
-					gInitialOutfit = (*it).second;
+					// Initial outfit is a folder in your inventory,
+					// must be an exact folder-name match.
+					sInitialOutfit = (*it).second;
 				}
 				it = options[0].find("gender");
 				if (it != it_end)
 				{
-					gInitialOutfitGender = (*it).second;
+					sInitialOutfitGender = (*it).second;
 				}
 			}
 
@@ -1415,17 +1431,17 @@ BOOL idle_startup()
 				it = options[0].find("sun_texture_id");
 				if(it != no_texture)
 				{
-					gSunTextureID.set((*it).second.c_str());
+					gSunTextureID.set((*it).second);
 				}
 				it = options[0].find("moon_texture_id");
 				if(it != no_texture)
 				{
-					gMoonTextureID.set((*it).second.c_str());
+					gMoonTextureID.set((*it).second);
 				}
 				it = options[0].find("cloud_texture_id");
 				if(it != no_texture)
 				{
-					gCloudTextureID.set((*it).second.c_str());
+					gCloudTextureID.set((*it).second);
 				}
 			}
 
@@ -1450,12 +1466,12 @@ BOOL idle_startup()
 					exit(0);
 				}
 				// Bounce back to the login screen.
-				LLStringBase<char>::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[ERROR_MESSAGE]"] = emsg.str();
 				gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
 				reset_login();
 				gSavedSettings.setBOOL("AutoLogin", FALSE);
-				show_connect_box = TRUE;
+				show_connect_box = true;
 			}
 			
 			// Pass the user information to the voice chat server interface.
@@ -1470,16 +1486,16 @@ BOOL idle_startup()
 				exit(0);
 			}
 			// Bounce back to the login screen.
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[ERROR_MESSAGE]"] = emsg.str();
 			gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
 			reset_login();
 			gSavedSettings.setBOOL("AutoLogin", FALSE);
-			show_connect_box = TRUE;
+			show_connect_box = true;
 			// Don't save an incorrect password to disk.
 			save_password_to_disk(NULL);
 		}
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	//---------------------------------------------------------------------
@@ -1487,7 +1503,7 @@ BOOL idle_startup()
 	//---------------------------------------------------------------------
 	if (STATE_WORLD_INIT == LLStartUp::getStartupState())
 	{
-		set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld").c_str(), gAgent.mMOTD.c_str());
+		set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
 		display_startup();
 		// We should have an agent id by this point.
 		llassert(!(gAgentID == LLUUID::null));
@@ -1537,7 +1553,6 @@ BOOL idle_startup()
 		LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(first_sim_handle);
 		LL_INFOS("AppInit") << "Adding initial simulator " << regionp->getOriginGlobal() << LL_ENDL;
 		
-		LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
 		regionp->setSeedCapability(first_sim_seed_cap);
 		LL_DEBUGS("AppInit") << "Waiting for seed grant ...." << LL_ENDL;
 		
@@ -1549,16 +1564,28 @@ BOOL idle_startup()
 		gAgent.setPositionAgent(agent_start_position_region);
 
 		display_startup();
-		return do_normal_idle;
+		LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );
+		return FALSE;
 	}
 
 
 	//---------------------------------------------------------------------
+	// Load QuickTime/GStreamer and other multimedia engines, can be slow.
+	// Do it while we're waiting on the network for our seed capability. JC
+	//---------------------------------------------------------------------
+	if (STATE_MULTIMEDIA_INIT == LLStartUp::getStartupState())
+	{
+		LLStartUp::multimediaInit();
+		LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
+		return FALSE;
+	}
+
+	//---------------------------------------------------------------------
 	// Wait for Seed Cap Grant
 	//---------------------------------------------------------------------
 	if(STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
 	{
-		return do_normal_idle;
+		return FALSE;
 	}
 
 
@@ -1579,6 +1606,9 @@ BOOL idle_startup()
 
 		gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") );
 
+		LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
+		gViewerWindow->adjustControlRectanglesForFirstUse(window);
+
 		if (gSavedSettings.getBOOL("ShowCameraControls"))
 		{
 			LLFloaterCamera::showInstance();
@@ -1703,7 +1733,7 @@ BOOL idle_startup()
 		for (int i = 0; i < DECODE_TIME_SEC; i++)
 		{
 			F32 frac = (F32)i / (F32)DECODE_TIME_SEC;
-			set_startup_status(0.45f + frac*0.1f, LLTrans::getString("LoginDecodingImages").c_str(), gAgent.mMOTD.c_str());
+			set_startup_status(0.45f + frac*0.1f, LLTrans::getString("LoginDecodingImages"), gAgent.mMOTD);
 			display_startup();
 			gImageList.decodeAllImages(1.f);
 		}
@@ -1737,18 +1767,16 @@ BOOL idle_startup()
 
 		timeout.reset();
 
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	//---------------------------------------------------------------------
-
-
 	// Agent Send
 	//---------------------------------------------------------------------
 	if(STATE_WORLD_WAIT == LLStartUp::getStartupState())
 	{
 		LL_DEBUGS("AppInit") << "Waiting for simulator ack...." << LL_ENDL;
-		set_startup_status(0.59f, LLTrans::getString("LoginWaitingForRegionHandshake").c_str(), gAgent.mMOTD.c_str());
+		set_startup_status(0.59f, LLTrans::getString("LoginWaitingForRegionHandshake"), gAgent.mMOTD);
 		if(gGotUseCircuitCodeAck)
 		{
 			LLStartUp::setStartupState( STATE_AGENT_SEND );
@@ -1758,7 +1786,7 @@ BOOL idle_startup()
 		{
 		}
 		msg->processAcks();
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	//---------------------------------------------------------------------
@@ -1767,7 +1795,7 @@ BOOL idle_startup()
 	if (STATE_AGENT_SEND == LLStartUp::getStartupState())
 	{
 		LL_DEBUGS("AppInit") << "Connecting to region..." << LL_ENDL;
-		set_startup_status(0.60f, LLTrans::getString("LoginConnectingToRegion").c_str(), gAgent.mMOTD.c_str());
+		set_startup_status(0.60f, LLTrans::getString("LoginConnectingToRegion"), gAgent.mMOTD);
 		// register with the message system so it knows we're
 		// expecting this message
 		LLMessageSystem* msg = gMessageSystem;
@@ -1797,7 +1825,7 @@ BOOL idle_startup()
 		LLStartUp::setStartupState( STATE_AGENT_WAIT );		// Go to STATE_AGENT_WAIT
 
 		timeout.reset();
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	//---------------------------------------------------------------------
@@ -1829,7 +1857,7 @@ BOOL idle_startup()
 			LLStartUp::setStartupState( STATE_INVENTORY_SEND );
 		}
 
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	//---------------------------------------------------------------------
@@ -1850,7 +1878,7 @@ BOOL idle_startup()
 			it = options[0].find("folder_id");
 			if(it != options[0].end())
 			{
-				gInventoryLibraryRoot.set((*it).second.c_str());
+				gInventoryLibraryRoot.set((*it).second);
 			}
 		}
  		options.clear();
@@ -1862,7 +1890,7 @@ BOOL idle_startup()
 			it = options[0].find("agent_id");
 			if(it != options[0].end())
 			{
-				gInventoryLibraryOwner.set((*it).second.c_str());
+				gInventoryLibraryOwner.set((*it).second);
 			}
 		}
  		options.clear();
@@ -1897,7 +1925,7 @@ BOOL idle_startup()
 				option_it = (*it).find("buddy_id");
 				if(option_it != (*it).end())
 				{
-					agent_id.set((*option_it).second.c_str());
+					agent_id.set((*option_it).second);
 				}
 				option_it = (*it).find("buddy_rights_has");
 				if(option_it != (*it).end())
@@ -1933,6 +1961,7 @@ BOOL idle_startup()
 			}
  		}
 		options.clear();
+		bool show_hud = false;
 		if(LLUserAuth::getInstance()->getOptions("tutorial_setting", options))
 		{
 			LLUserAuth::options_t::iterator it = options.begin();
@@ -1951,11 +1980,19 @@ BOOL idle_startup()
 				{
 					if (option_it->second == "true")
 					{
-						LLFloaterHUD::show();
+						show_hud = true;
 					}
 				}
 			}
 		}
+		// Either we want to show tutorial because this is the first login
+		// to a Linden Help Island or the user quit with the tutorial
+		// visible.  JC
+		if (show_hud
+			|| gSavedSettings.getBOOL("ShowTutorial"))
+		{
+			LLFloaterHUD::showHUD();
+		}
 
 		options.clear();
 		if(LLUserAuth::getInstance()->getOptions("event_categories", options))
@@ -1972,19 +2009,27 @@ BOOL idle_startup()
 			LLClassifiedInfo::loadCategories(options);
 		}
 		gInventory.buildParentChildMap();
+
+		llinfos << "Setting Inventory changed mask and notifying observers" << llendl;
 		gInventory.addChangedMask(LLInventoryObserver::ALL, LLUUID::null);
 		gInventory.notifyObservers();
 
 		// set up callbacks
+		llinfos << "Registering Callbacks" << llendl;
 		LLMessageSystem* msg = gMessageSystem;
+		llinfos << " Inventory" << llendl;
 		LLInventoryModel::registerCallbacks(msg);
+		llinfos << " AvatarTracker" << llendl;
 		LLAvatarTracker::instance().registerCallbacks(msg);
+		llinfos << " Landmark" << llendl;
 		LLLandmark::registerCallbacks(msg);
 
 		// request mute list
+		llinfos << "Requesting Mute List" << llendl;
 		LLMuteList::getInstance()->requestFromServer(gAgent.getID());
 
 		// Get L$ and ownership credit information
+		llinfos << "Requesting Money Balance" << llendl;
 		msg->newMessageFast(_PREHASH_MoneyBalanceRequest);
 		msg->nextBlockFast(_PREHASH_AgentData);
 		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -1994,11 +2039,13 @@ BOOL idle_startup()
 		gAgent.sendReliableMessage();
 
 		// request all group information
+		llinfos << "Requesting Agent Data" << llendl;
 		gAgent.sendAgentDataUpdateRequest();
 
-		BOOL shown_at_exit = gSavedSettings.getBOOL("ShowInventory");
+		bool shown_at_exit = gSavedSettings.getBOOL("ShowInventory");
 
 		// Create the inventory views
+		llinfos << "Creating Inventory Views" << llendl;
 		LLInventoryView::showAgentInventory();
 
 		// Hide the inventory if it wasn't shown at exit
@@ -2008,7 +2055,7 @@ BOOL idle_startup()
 		}
 
 		LLStartUp::setStartupState( STATE_MISC );
-		return do_normal_idle;
+		return FALSE;
 	}
 
 
@@ -2053,7 +2100,7 @@ BOOL idle_startup()
 
 		// based on the comments, we've successfully logged in so we can delete the 'forced'
 		// URL that the updater set in settings.ini (in a mostly paranoid fashion)
-		LLString nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
+		std::string nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
 		if ( nextLoginLocation.length() )
 		{
 			// clear it
@@ -2091,13 +2138,13 @@ BOOL idle_startup()
 					if (option_it != response.end())
 					{
 						const std::string& uuid_string = (*option_it).second;
-						item_id.set(uuid_string.c_str());
+						item_id.set(uuid_string);
 					}
 					option_it = response.find("asset_id");
 					if (option_it != response.end())
 					{
 						const std::string& uuid_string = (*option_it).second;
-						asset_id.set(uuid_string.c_str());
+						asset_id.set(uuid_string);
 					}
 
 					if (item_id.notNull() && asset_id.notNull())
@@ -2106,8 +2153,8 @@ BOOL idle_startup()
 						const BOOL no_inform_server = FALSE;
 						const BOOL no_deactivate_similar = FALSE;
 						gGestureManager.activateGestureWithAsset(item_id, asset_id,
-																 no_inform_server,
-																 no_deactivate_similar);
+											 no_inform_server,
+											 no_deactivate_similar);
 						// We need to fetch the inventory items for these gestures
 						// so we have the names to populate the UI.
 						item_ids.push_back(item_id);
@@ -2139,6 +2186,10 @@ BOOL idle_startup()
 		// JC - 7/20/2002
 		gViewerWindow->sendShapeToSim();
 
+		// Inform simulator of our language preference
+		LLAgentLanguage::update();
+
+		
 		// Ignore stipend information for now.  Money history is on the web site.
 		// if needed, show the L$ history window
 		//if (stipend_since_login && !gNoRender)
@@ -2157,7 +2208,7 @@ BOOL idle_startup()
 				// location is not your expected location. So, if this is
 				// your first login, then you do not have an expectation,
 				// thus, do not show this alert.
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				if (url_ok)
 				{
 					args["[TYPE]"] = "desired";
@@ -2195,26 +2246,42 @@ BOOL idle_startup()
 
 		LLStartUp::setStartupState( STATE_PRECACHE );
 		timeout.reset();
-		return do_normal_idle;
+		return FALSE;
 	}
 
 	if (STATE_PRECACHE == LLStartUp::getStartupState())
 	{
-		do_normal_idle = TRUE;
-		
-		// Avoid generic Ruth avatar in Orientation Island by starting
-		// our outfit load as soon as possible.  This will be replaced
-		// with a more definitive patch from featurettes-4 later. JC
+		F32 timeout_frac = timeout.getElapsedTimeF32()/PRECACHING_DELAY;
+
+		// We now have an inventory skeleton, so if this is a user's first
+		// login, we can start setting up their clothing and avatar 
+		// appearance.  This helps to avoid the generic "Ruth" avatar in
+		// the orientation island tutorial experience. JC
 		if (gAgent.isFirstLogin()
-			&& !gInitialOutfit.empty()  // registration set up an outfit
-			&& gAgent.getAvatarObject()	// can't wear clothes until have obj
-			&& !gAgent.isGenderChosen() ) // nothing already loaded
+			&& !sInitialOutfit.empty()    // registration set up an outfit
+			&& !sInitialOutfitGender.empty() // and a gender
+			&& gAgent.getAvatarObject()	  // can't wear clothes without object
+			&& !gAgent.isGenderChosen() ) // nothing already loading
 		{
-			llinfos << "Wearing initial outfit " << gInitialOutfit << llendl;
-			callback_choose_gender(-1, NULL);
+			// Start loading the wearables, textures, gestures
+			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
+		}
+
+
+		// We now have an inventory skeleton, so if this is a user's first
+		// login, we can start setting up their clothing and avatar 
+		// appearance.  This helps to avoid the generic "Ruth" avatar in
+		// the orientation island tutorial experience. JC
+		if (gAgent.isFirstLogin()
+			&& !sInitialOutfit.empty()    // registration set up an outfit
+			&& !sInitialOutfitGender.empty() // and a gender
+			&& gAgent.getAvatarObject()	  // can't wear clothes without object
+			&& !gAgent.isGenderChosen() ) // nothing already loading
+		{
+			// Start loading the wearables, textures, gestures
+			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
 		}
 
-		F32 timeout_frac = timeout.getElapsedTimeF32()/PRECACHING_DELAY;
 		// wait precache-delay and for agent's avatar or a lot longer.
 		if(((timeout_frac > 1.f) && gAgent.getAvatarObject())
 		   || (timeout_frac > 3.f))
@@ -2224,48 +2291,79 @@ BOOL idle_startup()
 		else
 		{
 			update_texture_fetch();
-			set_startup_status(0.60f + 0.20f * timeout_frac,
+			set_startup_status(0.60f + 0.30f * timeout_frac,
 				"Loading world...",
-					gAgent.mMOTD.c_str());
+					gAgent.mMOTD);
 		}
 
-		return do_normal_idle;
+		return TRUE;
 	}
 
 	if (STATE_WEARABLES_WAIT == LLStartUp::getStartupState())
 	{
-		do_normal_idle = TRUE;
-
 		static LLFrameTimer wearables_timer;
 
 		const F32 wearables_time = wearables_timer.getElapsedTimeF32();
 		const F32 MAX_WEARABLES_TIME = 10.f;
 
-		if(gAgent.getWearablesLoaded() || !gAgent.isGenderChosen())
+		if (!gAgent.isGenderChosen())
 		{
+			// No point in waiting for clothing, we don't even
+			// know what gender we are.  Pop a dialog to ask and
+			// proceed to draw the world. JC
+			//
+			// *NOTE: We might hit this case even if we have an
+			// initial outfit, but if the load hasn't started
+			// already then something is wrong so fall back
+			// to generic outfits. JC
+			gViewerWindow->alertXml("WelcomeChooseSex",
+				callback_choose_gender, NULL);
 			LLStartUp::setStartupState( STATE_CLEANUP );
+			return TRUE;
 		}
-		else if (wearables_time > MAX_WEARABLES_TIME)
+		
+		if (wearables_time > MAX_WEARABLES_TIME)
 		{
+			// It's taken too long to load, show the world
 			gViewerWindow->alertXml("ClothingLoading");
 			LLViewerStats::getInstance()->incStat(LLViewerStats::ST_WEARABLES_TOO_LONG);
 			LLStartUp::setStartupState( STATE_CLEANUP );
+			return TRUE;
+		}
+
+		if (gAgent.isFirstLogin())
+		{
+			// wait for avatar to be completely loaded
+			if (gAgent.getAvatarObject()
+				&& gAgent.getAvatarObject()->isFullyLoaded())
+			{
+				//llinfos << "avatar fully loaded" << llendl;
+				LLStartUp::setStartupState( STATE_CLEANUP );
+				return TRUE;
+			}
 		}
 		else
 		{
-			update_texture_fetch();
-			set_startup_status(0.80f + 0.20f * wearables_time / MAX_WEARABLES_TIME,
-							 LLTrans::getString("LoginDownloadingClothing").c_str(),
-							 gAgent.mMOTD.c_str());
+			// OK to just get the wearables
+			if ( gAgent.getWearablesLoaded() )
+			{
+				// We have our clothing, proceed.
+				//llinfos << "wearables loaded" << llendl;
+				LLStartUp::setStartupState( STATE_CLEANUP );
+				return TRUE;
+			}
 		}
-		return do_normal_idle;
+
+		update_texture_fetch();
+		set_startup_status(0.9f + 0.1f * wearables_time / MAX_WEARABLES_TIME,
+						 LLTrans::getString("LoginDownloadingClothing").c_str(),
+						 gAgent.mMOTD.c_str());
+		return TRUE;
 	}
 
 	if (STATE_CLEANUP == LLStartUp::getStartupState())
 	{
-		set_startup_status(1.0, "", NULL);
-
-		do_normal_idle = TRUE;
+		set_startup_status(1.0, "", "");
 
 		// Let the map know about the inventory.
 		if(gFloaterWorldMap)
@@ -2279,7 +2377,7 @@ BOOL idle_startup()
 		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
 		LL_DEBUGS("AppInit") << "Done releasing bitmap" << LL_ENDL;
 		gViewerWindow->setShowProgress(FALSE);
-		gViewerWindow->setProgressCancelButtonVisible(FALSE, "");
+		gViewerWindow->setProgressCancelButtonVisible(FALSE);
 
 		// We're not away from keyboard, even though login might have taken
 		// a while. JC
@@ -2292,9 +2390,6 @@ BOOL idle_startup()
 			gAgent.requestEnterGodMode();
 		}
 		
-		// On first start, ask user for gender
-		dialog_choose_gender_first_start();
-
 		// Start automatic replay if the flag is set.
 		if (gSavedSettings.getBOOL("StatsAutoRun"))
 		{
@@ -2328,11 +2423,11 @@ BOOL idle_startup()
 
 		LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
 
-		return do_normal_idle;
+		return TRUE;
 	}
 
 	LL_WARNS("AppInit") << "Reached end of idle_startup for state " << LLStartUp::getStartupState() << LL_ENDL;
-	return do_normal_idle;
+	return TRUE;
 }
 
 //
@@ -2357,12 +2452,12 @@ void login_show()
 	
 	LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
 
-	LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel().c_str(), LLViewerLogin::getInstance()->getGridChoice());
+	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)
 	{
-		LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index).c_str(), grid_index);
+		LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
 	}
 }
 
@@ -2380,7 +2475,7 @@ void login_callback(S32 option, void *userdata)
 	else if (QUIT_OPTION == option)
 	{
 		// Make sure we don't save the password if the user is trying to clear it.
-		LLString first, last, password;
+		std::string first, last, password;
 		BOOL remember = TRUE;
 		LLPanelLogin::getFields(first, last, password, remember);
 		if (!remember)
@@ -2408,9 +2503,9 @@ void login_callback(S32 option, void *userdata)
 	}
 }
 
-LLString load_password_from_disk()
+std::string load_password_from_disk()
 {
-	LLString hashed_password("");
+	std::string hashed_password("");
 
 	// Look for legacy "marker" password from settings.ini
 	hashed_password = gSavedSettings.getString("Marker");
@@ -2425,7 +2520,7 @@ LLString load_password_from_disk()
 
 	std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
 													   "password.dat");
-	LLFILE* fp = LLFile::fopen(filepath.c_str(), "rb");		/* Flawfinder: ignore */
+	LLFILE* fp = LLFile::fopen(filepath, "rb");		/* Flawfinder: ignore */
 	if (!fp)
 	{
 		return hashed_password;
@@ -2468,11 +2563,11 @@ void save_password_to_disk(const char* hashed_password)
 	if (!hashed_password)
 	{
 		// No password, remove the file.
-		LLFile::remove(filepath.c_str());
+		LLFile::remove(filepath);
 	}
 	else
 	{
-		LLFILE* fp = LLFile::fopen(filepath.c_str(), "wb");		/* Flawfinder: ignore */
+		LLFILE* fp = LLFile::fopen(filepath, "wb");		/* Flawfinder: ignore */
 		if (!fp)
 		{
 			return;
@@ -2482,7 +2577,7 @@ void save_password_to_disk(const char* hashed_password)
 		const S32 HASHED_LENGTH = 32;
 		U8 buffer[HASHED_LENGTH+1];
 
-		LLString::copy((char*)buffer, hashed_password, HASHED_LENGTH+1);
+		LLStringUtil::copy((char*)buffer, hashed_password, HASHED_LENGTH+1);
 
 		LLXORCipher cipher(gMACAddress, 6);
 		cipher.encrypt(buffer, HASHED_LENGTH);
@@ -2496,9 +2591,9 @@ void save_password_to_disk(const char* hashed_password)
 	}
 }
 
-BOOL is_hex_string(U8* str, S32 len)
+bool is_hex_string(U8* str, S32 len)
 {
-	BOOL rv = TRUE;
+	bool rv = true;
 	U8* c = str;
 	while(rv && len--)
 	{
@@ -2523,7 +2618,7 @@ BOOL is_hex_string(U8* str, S32 len)
 			++c;
 			break;
 		default:
-			rv = FALSE;
+			rv = false;
 			break;
 		}
 	}
@@ -2548,7 +2643,7 @@ void first_run_dialog_callback(S32 option, void* userdata)
 
 
 
-void set_startup_status(const F32 frac, const char *string, const char* msg)
+void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)
 {
 	gViewerWindow->setProgressPercent(frac*100);
 	gViewerWindow->setProgressString(string);
@@ -2591,7 +2686,7 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
 	{
 		msg = "(" + auth_msg + ") \n";
 	}
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[MESSAGE]"] = msg;
 	
 	// represent a bool as a null/non-null pointer
@@ -2643,7 +2738,7 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
 void update_dialog_callback(S32 option, void *userdata)
 {
 	std::string update_exe_path;
-	BOOL mandatory = userdata != NULL;
+	bool mandatory = userdata != NULL;
 
 #if !LL_RELEASE_FOR_DOWNLOAD
 	if (option == 2)
@@ -2701,7 +2796,7 @@ void update_dialog_callback(S32 option, void *userdata)
 	updater_source += gDirUtilp->getDirDelimiter();
 	updater_source += "updater.exe";
 
-	LL_DEBUGS("AppInit") << "Calling CopyFile source: " << updater_source.c_str()
+	LL_DEBUGS("AppInit") << "Calling CopyFile source: " << updater_source
 			<< " dest: " << update_exe_path
 			<< LL_ENDL;
 
@@ -2725,9 +2820,9 @@ void update_dialog_callback(S32 option, void *userdata)
 	if (gHideLinks)
 	{
 		// Figure out the program name.
-		const char* data_dir = gDirUtilp->getAppRODataDir().c_str();
+		const std::string& data_dir = gDirUtilp->getAppRODataDir();
 		// Roll back from the end, stopping at the first '\'
-		const char* program_name = data_dir + strlen(data_dir);		/* Flawfinder: ignore */
+		const char* program_name = data_dir.c_str() + data_dir.size();		/* Flawfinder: ignore */
 		while ( (data_dir != --program_name) &&
 				*(program_name) != '\\');
 		
@@ -2765,7 +2860,7 @@ void update_dialog_callback(S32 option, void *userdata)
 	
 	update_exe_path = "'";
 	update_exe_path += gDirUtilp->getAppRODataDir();
-	update_exe_path += "/AutoUpdater.app/Contents/MacOS/AutoUpdater' -url \"";
+	update_exe_path += "/mac-updater.app/Contents/MacOS/mac-updater' -url \"";
 	update_exe_path += update_url.asString();
 	update_exe_path += "\" -name \"";
 	update_exe_path += LLAppViewer::instance()->getSecondLifeTitle();
@@ -2779,7 +2874,7 @@ void update_dialog_callback(S32 option, void *userdata)
 #elif LL_LINUX
 	OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
 		"Please download the latest version from www.secondlife.com.",
-		NULL, OSMB_OK);
+		LLStringUtil::null, OSMB_OK);
 #endif
 	LLAppViewer::instance()->forceQuit();
 }
@@ -3341,13 +3436,13 @@ void init_stat_view()
 	stat_barp->mDisplayBar = FALSE;
 	stat_barp->mDisplayMean = FALSE;
 
-	stat_barp = sim_statviewp->addStat("Script Perf", &(LLViewerStats::getInstance()->mSimLSLIPS));
-	stat_barp->setUnitLabel(" ips");
+	stat_barp = sim_statviewp->addStat("Script Events", &(LLViewerStats::getInstance()->mSimScriptEPS));
+	stat_barp->setUnitLabel(" eps");
 	stat_barp->mPrecision = 0;
 	stat_barp->mMinBar = 0.f;
-	stat_barp->mMaxBar = 100000.f;
-	stat_barp->mTickSpacing = 25000.f;
-	stat_barp->mLabelSpacing = 50000.f;
+	stat_barp->mMaxBar = 20000.f;
+	stat_barp->mTickSpacing = 2500.f;
+	stat_barp->mLabelSpacing = 5000.f;
 	stat_barp->mPerSec = FALSE;
 	stat_barp->mDisplayBar = FALSE;
 	stat_barp->mDisplayMean = FALSE;
@@ -3536,61 +3631,52 @@ void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S3
 }
 
 // *HACK: Must match name in Library or agent inventory
-const char* COMMON_GESTURES_FOLDER = "Common Gestures";
-const char* MALE_GESTURES_FOLDER = "Male Gestures";
-const char* FEMALE_GESTURES_FOLDER = "Female Gestures";
-const char* MALE_OUTFIT_FOLDER = "Male Shape & Outfit";
-const char* FEMALE_OUTFIT_FOLDER = "Female Shape & Outfit";
-const S32 OPT_USE_INITIAL_OUTFIT = -2;
+const std::string COMMON_GESTURES_FOLDER = "Common Gestures";
+const std::string MALE_GESTURES_FOLDER = "Male Gestures";
+const std::string FEMALE_GESTURES_FOLDER = "Female Gestures";
+const std::string MALE_OUTFIT_FOLDER = "Male Shape & Outfit";
+const std::string FEMALE_OUTFIT_FOLDER = "Female Shape & Outfit";
 const S32 OPT_CLOSED_WINDOW = -1;
 const S32 OPT_MALE = 0;
 const S32 OPT_FEMALE = 1;
 
 void callback_choose_gender(S32 option, void* userdata)
 {
-	S32 gender = OPT_FEMALE;
-	const char* outfit = FEMALE_OUTFIT_FOLDER;
-	const char* gestures = FEMALE_GESTURES_FOLDER;
-	const char* common_gestures = COMMON_GESTURES_FOLDER;
-	if (!gInitialOutfit.empty())
+	switch(option)
 	{
-		outfit = gInitialOutfit.c_str();
-		if (gInitialOutfitGender == "male")
-		{
-			gender = OPT_MALE;
-			gestures = MALE_GESTURES_FOLDER;
-		}
-		else
-		{
-			gender = OPT_FEMALE;
-			gestures = FEMALE_GESTURES_FOLDER;
-		}
+	case OPT_MALE:
+		LLStartUp::loadInitialOutfit( MALE_OUTFIT_FOLDER, "male" );
+		break;
+
+	case OPT_FEMALE:
+	case OPT_CLOSED_WINDOW:
+	default:
+		LLStartUp::loadInitialOutfit( FEMALE_OUTFIT_FOLDER, "female" );
+		break;
+	}
+}
+
+void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
+								   const std::string& gender_name )
+{
+	S32 gender = 0;
+	std::string gestures;
+	if (gender_name == "male")
+	{
+		gender = OPT_MALE;
+		gestures = MALE_GESTURES_FOLDER;
 	}
 	else
 	{
-		switch(option)
-		{
-		case OPT_MALE:
-			gender = OPT_MALE;
-			outfit = MALE_OUTFIT_FOLDER;
-			gestures = MALE_GESTURES_FOLDER;
-			break;
-
-		case OPT_FEMALE:
-		case OPT_CLOSED_WINDOW:
-		default:
-			gender = OPT_FEMALE;
-			outfit = FEMALE_OUTFIT_FOLDER;
-			gestures = FEMALE_GESTURES_FOLDER;
-			break;
-		}
+		gender = OPT_FEMALE;
+		gestures = FEMALE_GESTURES_FOLDER;
 	}
 
 	// try to find the outfit - if not there, create some default
 	// wearables.
 	LLInventoryModel::cat_array_t cat_array;
 	LLInventoryModel::item_array_t item_array;
-	LLNameCategoryCollector has_name(outfit);
+	LLNameCategoryCollector has_name(outfit_folder_name);
 	gInventory.collectDescendentsIf(LLUUID::null,
 									cat_array,
 									item_array,
@@ -3602,36 +3688,16 @@ void callback_choose_gender(S32 option, void* userdata)
 	}
 	else
 	{
-		wear_outfit_by_name(outfit);
+		wear_outfit_by_name(outfit_folder_name);
 	}
 	wear_outfit_by_name(gestures);
-	wear_outfit_by_name(common_gestures);
-
-	typedef std::map<LLUUID, LLMultiGesture*> item_map_t;
-	item_map_t::iterator gestureIterator;
+	wear_outfit_by_name(COMMON_GESTURES_FOLDER);
 
-	// Must be here so they aren't invisible if they close the window.
+	// This is really misnamed -- it means we have started loading
+	// an outfit/shape that will give the avatar a gender eventually. JC
 	gAgent.setGenderChosen(TRUE);
 }
-
-void dialog_choose_gender_first_start()
-{
-	if (!gNoRender
-		&& (!gAgent.isGenderChosen()))
-	{
-		if (!gInitialOutfit.empty())
-		{
-			gViewerWindow->alertXml("WelcomeNoClothes",
-				callback_choose_gender, NULL);
-		}
-		else
-		{	
-			gViewerWindow->alertXml("WelcomeChooseSex",
-				callback_choose_gender, NULL);
 			
-		}
-	}
-}
 
 // Loads a bitmap to display during load
 // location_id = 0 => last position
@@ -3646,7 +3712,7 @@ void init_start_screen(S32 location_id)
 
 	LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;
 
-	LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
+	std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
 
 	if ((S32)START_LOCATION_ID_LAST == location_id)
 	{
@@ -3698,9 +3764,45 @@ void release_start_screen()
 
 
 // static
-void LLStartUp::setStartupState( S32 state )
+std::string LLStartUp::startupStateToString(EStartupState state)
+{
+#define RTNENUM(E) case E: return #E
+	switch(state){
+		RTNENUM( STATE_FIRST );
+		RTNENUM( STATE_LOGIN_SHOW );
+		RTNENUM( STATE_LOGIN_WAIT );
+		RTNENUM( STATE_LOGIN_CLEANUP );
+		RTNENUM( STATE_UPDATE_CHECK );
+		RTNENUM( STATE_LOGIN_AUTH_INIT );
+		RTNENUM( STATE_LOGIN_AUTHENTICATE );
+		RTNENUM( STATE_LOGIN_NO_DATA_YET );
+		RTNENUM( STATE_LOGIN_DOWNLOADING );
+		RTNENUM( STATE_LOGIN_PROCESS_RESPONSE );
+		RTNENUM( STATE_WORLD_INIT );
+		RTNENUM( STATE_SEED_GRANTED_WAIT );
+		RTNENUM( STATE_SEED_CAP_GRANTED );
+		RTNENUM( STATE_WORLD_WAIT );
+		RTNENUM( STATE_AGENT_SEND );
+		RTNENUM( STATE_AGENT_WAIT );
+		RTNENUM( STATE_INVENTORY_SEND );
+		RTNENUM( STATE_MISC );
+		RTNENUM( STATE_PRECACHE );
+		RTNENUM( STATE_WEARABLES_WAIT );
+		RTNENUM( STATE_CLEANUP );
+		RTNENUM( STATE_STARTED );
+	default:
+		return llformat("(state #%d)", state);
+	}
+#undef RTNENUM
+}
+
+
+// static
+void LLStartUp::setStartupState( EStartupState state )
 {
-	LL_INFOS("AppInit") << "Startup state changing from " << gStartupState << " to " << state << LL_ENDL;
+	LL_INFOS("AppInit") << "Startup state changing from " <<  
+		startupStateToString(gStartupState) << " to " <<  
+		startupStateToString(state) << LL_ENDL;
 	gStartupState = state;
 }
 
@@ -3730,6 +3832,19 @@ bool LLStartUp::canGoFullscreen()
 	return gStartupState >= STATE_WORLD_INIT;
 }
 
+// Initialize all plug-ins except the web browser (which was initialized
+// early, before the login screen). JC
+void LLStartUp::multimediaInit()
+{
+	LL_DEBUGS("AppInit") << "Initializing Multimedia...." << LL_ENDL;
+	std::string msg = LLTrans::getString("LoginInitializingMultimedia");
+	set_startup_status(0.50f, msg.c_str(), gAgent.mMOTD.c_str());
+	display_startup();
+
+	LLViewerMedia::initClass();
+	LLViewerParcelMedia::initClass();
+}
+
 bool LLStartUp::dispatchURL()
 {
 	// ok, if we've gotten this far and have a startup URL
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index f38f7bf..1a9f659 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -35,18 +35,18 @@
 #include "llimagegl.h"
 
 // functions
-BOOL idle_startup();
-LLString load_password_from_disk();
+bool idle_startup();
+std::string load_password_from_disk();
 void release_start_screen();
 void login_alert_done(S32 option, void* user_data);
 
 // constants, variables,  & enumerations
-extern const char* SCREEN_HOME_FILENAME;
-extern const char* SCREEN_LAST_FILENAME;
+extern std::string SCREEN_HOME_FILENAME;
+extern std::string SCREEN_LAST_FILENAME;
 
-enum EStartupState{
+typedef enum {
 	STATE_FIRST,					// Initial startup
-	STATE_MEDIA_INIT,               // Initialzie media library
+	STATE_BROWSER_INIT,             // Initialize web browser for login screen
 	STATE_LOGIN_SHOW,				// Show login screen
 	STATE_LOGIN_WAIT,				// Wait for user input at login screen
 	STATE_LOGIN_CLEANUP,			// Get rid of login screen and start login
@@ -57,6 +57,7 @@ enum EStartupState{
 	STATE_LOGIN_DOWNLOADING,		// Waiting for authentication replies to download
 	STATE_LOGIN_PROCESS_RESPONSE,	// Check authentication reply
 	STATE_WORLD_INIT,				// Start building the world
+	STATE_MULTIMEDIA_INIT,			// Init the rest of multimedia library
 	STATE_SEED_GRANTED_WAIT,		// Wait for seed cap grant
 	STATE_SEED_CAP_GRANTED,			// Have seed cap grant 
 	STATE_WORLD_WAIT,				// Waiting for simulator
@@ -68,11 +69,13 @@ enum EStartupState{
 	STATE_WEARABLES_WAIT,			// Wait for clothing to download
 	STATE_CLEANUP,					// Final cleanup
 	STATE_STARTED					// Up and running in-world
-};
+} EStartupState;
 
 // exported symbols
-extern BOOL gAgentMovementCompleted;
+extern bool gAgentMovementCompleted;
 extern LLPointer<LLImageGL> gStartImageGL;
+extern std::string gInitialOutfit;
+extern std::string gInitialOutfitGender;	// "male" or "female"
 
 class LLStartUp
 {
@@ -82,8 +85,17 @@ public:
 		// going full screen
 
 	// Always use this to set gStartupState so changes are logged
-	static void	setStartupState( S32 state );
-	static S32	getStartupState()				{ return gStartupState;		};
+	static void setStartupState( EStartupState state );
+	static EStartupState getStartupState() { return gStartupState; };
+
+	static void multimediaInit();
+		// Initialize LLViewerMedia multimedia engine.
+
+	// outfit_folder_name can be a folder anywhere in your inventory, 
+	// but the name must be a case-sensitive exact match.
+	// gender_name is either "male" or "female"
+	static void loadInitialOutfit( const std::string& outfit_folder_name,
+								   const std::string& gender_name );
 
 	static bool dispatchURL();
 		// if we have a SLURL or sim string ("Ahern/123/45") that started
@@ -93,8 +105,9 @@ public:
 		// *HACK: On startup, if we were passed a secondlife://app/do/foo
 		// command URL, store it for later processing.
 
-protected:
-	static S32 gStartupState;			// Do not set directly, use LLStartup::setStartupState
+private:
+	static std::string startupStateToString(EStartupState state);
+	static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState
 };
 
 
diff --git a/linden/indra/newview/llstatbar.cpp b/linden/indra/newview/llstatbar.cpp
index 13b8358..19a9442 100644
--- a/linden/indra/newview/llstatbar.cpp
+++ b/linden/indra/newview/llstatbar.cpp
@@ -137,17 +137,17 @@ void LLStatBar::draw()
 	LLFontGL::sMonospace->renderUTF8(mLabel, 0, 0, getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, 1.f),
 							LLFontGL::LEFT, LLFontGL::TOP);
 
-	char value_format[64];		/* Flawfinder: ignore */
-	char value_str[256];		/* Flawfinder: ignore */
+	std::string value_format;
+	std::string value_str;
 	if (!mUnitLabel.empty())
 	{
-		snprintf(value_format, sizeof(value_format), "%%.%df%%s", mPrecision);		/* Flawfinder: ignore */
-		snprintf(value_str, sizeof(value_str), value_format, mValue, mUnitLabel.c_str());		/* Flawfinder: ignore */
+		value_format = llformat( "%%.%df%%s", mPrecision);
+		value_str = llformat( value_format.c_str(), mValue, mUnitLabel.c_str());
 	}
 	else
 	{
-		snprintf(value_format, sizeof(value_format), "%%.%df", mPrecision);		/* Flawfinder: ignore */
-		snprintf(value_str, sizeof(value_str), value_format, mValue);		/* Flawfinder: ignore */
+		value_format = llformat( "%%.%df", mPrecision);
+		value_str = llformat( value_format.c_str(), mValue);
 	}
 
 	// Draw the value.
@@ -155,10 +155,10 @@ void LLStatBar::draw()
 		LLColor4(1.f, 1.f, 1.f, 0.5f),
 		LLFontGL::RIGHT, LLFontGL::TOP);
 
-	snprintf(value_format, sizeof(value_format), "%%.%df", mPrecision);		/* Flawfinder: ignore */
+	value_format = llformat( "%%.%df", mPrecision);
 	if (mDisplayBar)
 	{
-		char tick_label[256];		/* Flawfinder: ignore */
+		std::string tick_label;
 
 		// Draw the tick marks.
 		F32 tick_value;
@@ -182,7 +182,7 @@ void LLStatBar::draw()
 			right = left + tick_width;
 			gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
 
-			snprintf(tick_label, sizeof(tick_label), value_format, tick_value);		/* Flawfinder: ignore */
+			tick_label = llformat( value_format.c_str(), tick_value);
 			// draw labels for the tick marks
 			LLFontGL::sMonospace->renderUTF8(tick_label, 0, left - 1, bar_top - bar_height - tick_height,
 											 LLColor4(1.f, 1.f, 1.f, 0.5f),
@@ -258,17 +258,17 @@ void LLStatBar::draw()
 	LLView::draw();
 }
 
-const LLString& LLStatBar::getLabel() const
+const std::string& LLStatBar::getLabel() const
 {
 	return mLabel;
 }
 
-void LLStatBar::setLabel(const LLString& label)
+void LLStatBar::setLabel(const std::string& label)
 {
 	mLabel = label;
 }
 
-void LLStatBar::setUnitLabel(const LLString& unit_label)
+void LLStatBar::setUnitLabel(const std::string& unit_label)
 {
 	mUnitLabel = unit_label;
 }
diff --git a/linden/indra/newview/llstatbar.h b/linden/indra/newview/llstatbar.h
index 204a8da..d79a117 100644
--- a/linden/indra/newview/llstatbar.h
+++ b/linden/indra/newview/llstatbar.h
@@ -45,9 +45,9 @@ public:
 	virtual void draw();
 	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 
-	const LLString& getLabel() const;
-	void setLabel(const LLString& label);
-	void setUnitLabel(const LLString& unit_label);
+	const std::string& getLabel() const;
+	void setLabel(const std::string& label);
+	void setUnitLabel(const std::string& unit_label);
 	/*virtual*/ LLRect getRequiredRect();	// Return the height of this object, given the set options.
 
 	F32 mMinBar;
@@ -64,8 +64,8 @@ public:
 	LLStat *mStatp;
 private:
 	LLFrameTimer mUpdateTimer;
-	LLString mLabel;
-	LLString mUnitLabel;
+	std::string mLabel;
+	std::string mUnitLabel;
 	F32 mValue;
 };
 
diff --git a/linden/indra/newview/llstatgraph.cpp b/linden/indra/newview/llstatgraph.cpp
index 9f219e2..73c80ca 100644
--- a/linden/indra/newview/llstatgraph.cpp
+++ b/linden/indra/newview/llstatgraph.cpp
@@ -140,12 +140,12 @@ void LLStatGraph::setStat(LLStat *statp)
 	mStatp = statp;
 }
 
-void LLStatGraph::setLabel(const char *label)
+void LLStatGraph::setLabel(const std::string& label)
 {
 	mLabel = label;
 }
 
-void LLStatGraph::setUnits(const char *units)
+void LLStatGraph::setUnits(const std::string& units)
 {
 	mUnits = units;
 }
diff --git a/linden/indra/newview/llstatgraph.h b/linden/indra/newview/llstatgraph.h
index db0e1ca..73e0ba0 100644
--- a/linden/indra/newview/llstatgraph.h
+++ b/linden/indra/newview/llstatgraph.h
@@ -45,8 +45,8 @@ public:
 
 	virtual void draw();
 
-	void setLabel(const char *label);
-	void setUnits(const char *units);
+	void setLabel(const std::string& label);
+	void setUnits(const std::string& units);
 	void setPrecision(const S32 precision);
 	void setStat(LLStat *statp);
 	void setThreshold(const S32 i, F32 value);
@@ -63,8 +63,8 @@ private:
 	F32 mMin;
 	F32 mMax;
 	LLFrameTimer mUpdateTimer;
-	LLString mLabel;
-	LLString mUnits;
+	std::string mLabel;
+	std::string mUnits;
 	S32 mPrecision; // Num of digits of precision after dot
 
 	S32 mNumThresholds;
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 42acdcc..2f9227a 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -1,33 +1,33 @@
 /** 
- * @file llstatusbar.cpp
- * @brief LLStatusBar class implementation
- *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
+* @file llstatusbar.cpp
+* @brief LLStatusBar class implementation
+*
+* $LicenseInfo:firstyear=2002&license=viewergpl$
+* 
+* Copyright (c) 2002-2008, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
 
 #include "llviewerprecompiledheaders.h"
 
@@ -121,10 +121,10 @@ const U32 LLStatusBar::MAX_DATE_STRING_LENGTH = 2000;
 
 LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
 :	LLPanel(name, LLRect(), FALSE),		// not mouse opaque
-	mBalance(0),
-	mHealth(100),
-	mSquareMetersCredit(0),
-	mSquareMetersCommitted(0)
+mBalance(0),
+mHealth(100),
+mSquareMetersCredit(0),
+mSquareMetersCommitted(0)
 {
 	// status bar can possible overlay menus?
 	setMouseOpaque(FALSE);
@@ -150,7 +150,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
 
 	mTextHealth = getChild<LLTextBox>("HealthText" );
 	mTextTime = getChild<LLTextBox>("TimeText" );
-	
+
 	childSetAction("scriptout", onClickScriptDebug, this);
 	childSetAction("health", onClickHealth, this);
 	childSetAction("no_fly", onClickFly, this);
@@ -179,9 +179,9 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
 	mSGBandwidth = new LLStatGraph("BandwidthGraph", r);
 	mSGBandwidth->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
 	mSGBandwidth->setStat(&LLViewerStats::getInstance()->mKBitStat);
-	LLString text = childGetText("bandwidth_tooltip") + " ";
+	std::string text = childGetText("bandwidth_tooltip") + " ";
 	LLUIString bandwidth_tooltip = text;	// get the text from XML until this widget is XML driven
-	mSGBandwidth->setLabel(bandwidth_tooltip.getString().c_str());
+	mSGBandwidth->setLabel(bandwidth_tooltip.getString());
 	mSGBandwidth->setUnits("Kbps");
 	mSGBandwidth->setPrecision(0);
 	mSGBandwidth->setMouseOpaque(FALSE);
@@ -194,7 +194,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
 	mSGPacketLoss->setStat(&LLViewerStats::getInstance()->mPacketsLostPercentStat);
 	text = childGetText("packet_loss_tooltip") + " ";
 	LLUIString packet_loss_tooltip = text;	// get the text from XML until this widget is XML driven
-	mSGPacketLoss->setLabel(packet_loss_tooltip.getString().c_str());
+	mSGPacketLoss->setLabel(packet_loss_tooltip.getString());
 	mSGPacketLoss->setUnits("%");
 	mSGPacketLoss->setMin(0.f);
 	mSGPacketLoss->setMax(5.f);
@@ -233,8 +233,8 @@ void LLStatusBar::draw()
 	if (isBackgroundVisible())
 	{
 		gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0, 
-				LLUI::sColorsGroup->getColor("ColorDropShadow"), 
-				LLUI::sConfigGroup->getS32("DropShadowFloater") );
+			LLUI::sColorsGroup->getColor("ColorDropShadow"), 
+			LLUI::sConfigGroup->getS32("DropShadowFloater") );
 	}
 	LLPanel::draw();
 }
@@ -252,10 +252,10 @@ void LLStatusBar::refresh()
 	mSGBandwidth->setThreshold(2, bwtotal);
 
 	// *TODO: Localize / translate time
-	
+
 	// Get current UTC time, adjusted for the user's clock
 	// being off.
-	U32 utc_time;
+	time_t utc_time;
 	utc_time = time_corrected();
 
 	// There's only one internal tm buffer.
@@ -284,23 +284,23 @@ void LLStatusBar::refresh()
 	if (hour == 0) hour = 12;
 	std::ostringstream t;
 	t << std::setfill(' ') << std::setw(2) << hour << ":" 
-	  << std::setfill('0') << std::setw(2) << min 
-	  << " " << am_pm << " " << tz;
+		<< std::setfill('0') << std::setw(2) << min 
+		<< " " << am_pm << " " << tz;
 	mTextTime->setText(t.str());
 
 	// Year starts at 1900, set the tooltip to have the date
 	std::ostringstream date;
 	date	<< sDays[internal_time->tm_wday] << ", "
-			<< std::setfill('0') << std::setw(2) << internal_time->tm_mday << " "
-			<< sMonths[internal_time->tm_mon] << " "
-			<< internal_time->tm_year + 1900;
+		<< std::setfill('0') << std::setw(2) << internal_time->tm_mday << " "
+		<< sMonths[internal_time->tm_mon] << " "
+		<< internal_time->tm_year + 1900;
 	mTextTime->setToolTip(date.str());
 
 	LLRect r;
 	const S32 MENU_RIGHT = gMenuBarView->getRightmostMenuEdge();
 	S32 x = MENU_RIGHT + MENU_PARCEL_SPACING;
 	S32 y = 0;
-	
+
 	bool search_visible = gSavedSettings.getBOOL("ShowSearchBar");
 
 	// reshape menu bar to its content's width
@@ -348,7 +348,7 @@ void LLStatusBar::refresh()
 		childSetRect("health", r);
 		x += buttonRect.getWidth();
 
-		const S32 health_width = S32( LLFontGL::sSansSerifSmall->getWidth("100%") );
+		const S32 health_width = S32( LLFontGL::sSansSerifSmall->getWidth(std::string("100%")) );
 		r.set(x, y+TEXT_HEIGHT - 2, x+health_width, y);
 		mTextHealth->setRect(r);
 		x += health_width;
@@ -394,8 +394,8 @@ void LLStatusBar::refresh()
 	BOOL no_scripts = FALSE;
 	if((region
 		&& ((region->getRegionFlags() & REGION_FLAGS_SKIP_SCRIPTS)
-			|| (region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS)))
-	   || (parcel && !parcel->getAllowOtherScripts()))
+		|| (region->getRegionFlags() & REGION_FLAGS_ESTATE_SKIP_SCRIPTS)))
+		|| (parcel && !parcel->getAllowOtherScripts()))
 	{
 		no_scripts = TRUE;
 	}
@@ -429,7 +429,7 @@ void LLStatusBar::refresh()
 		childSetVisible("restrictpush", FALSE);
 	}
 
-	BOOL have_voice = parcel && parcel->getVoiceEnabled(); 
+	BOOL have_voice = parcel && parcel->getParcelFlagAllowVoice(); 
 	if (have_voice)
 	{
 		childSetVisible("status_no_voice", FALSE);
@@ -457,7 +457,7 @@ void LLStatusBar::refresh()
 		x += buttonRect.getWidth();
 	}
 
-	LLString location_name;
+	std::string location_name;
 	if (region)
 	{
 		const LLVector3& agent_pos_region = gAgent.getPositionAgent();
@@ -487,14 +487,14 @@ void LLStatusBar::refresh()
 
 		mRegionDetails.mTime = mTextTime->getText();
 		mRegionDetails.mBalance = mBalance;
-		mRegionDetails.mAccesString = region->getSimAccessString();
+		mRegionDetails.mAccessString = region->getSimAccessString();
 		mRegionDetails.mPing = region->getNetDetailsForLCD();
-		if (parcel && !parcel->getName().empty())
+		if (parcel)
 		{
 			location_name = region->getName()
 				+ llformat(" %d, %d, %d (%s) - %s", 
 						   pos_x, pos_y, pos_z,
-						   region->getSimAccessString(),
+						   region->getSimAccessString().c_str(),
 						   parcel->getName().c_str());
 
 			// keep these around for the LCD to use
@@ -503,6 +503,7 @@ void LLStatusBar::refresh()
 			mRegionDetails.mX = pos_x;
 			mRegionDetails.mY = pos_y;
 			mRegionDetails.mZ = pos_z;
+
 			mRegionDetails.mArea = parcel->getArea();
 			mRegionDetails.mForSale = parcel->getForSale();
 			mRegionDetails.mTraffic = LLViewerParcelMgr::getInstance()->getDwelling();
@@ -536,7 +537,7 @@ void LLStatusBar::refresh()
 			location_name = region->getName()
 				+ llformat(" %d, %d, %d (%s)", 
 						   pos_x, pos_y, pos_z,
-						   region->getSimAccessString());
+						   region->getSimAccessString().c_str());
 			// keep these around for the LCD to use
 			mRegionDetails.mRegionName = region->getName();
 			mRegionDetails.mParcelName = "Unknown";
@@ -557,7 +558,7 @@ void LLStatusBar::refresh()
 		// keep these around for the LCD to use
 		mRegionDetails.mRegionName = "Unknown";
 		mRegionDetails.mParcelName = "Unknown";
-		mRegionDetails.mAccesString = "Unknown";
+		mRegionDetails.mAccessString = "Unknown";
 		mRegionDetails.mX = 0;
 		mRegionDetails.mY = 0;
 		mRegionDetails.mZ = 0;
@@ -655,8 +656,8 @@ void LLStatusBar::creditBalance(S32 credit)
 
 void LLStatusBar::setBalance(S32 balance)
 {
-	LLString money_str = LLResMgr::getInstance()->getMonetaryString( balance );
-	LLString balance_str = "L$";
+	std::string money_str = LLResMgr::getInstance()->getMonetaryString( balance );
+	std::string balance_str = "L$";
 	balance_str += money_str;
 	mTextBalance->setText( balance_str );
 
@@ -821,14 +822,14 @@ static void onClickBuyLand(void*)
 void LLStatusBar::setupDate()
 {
 	// fill the day array with what's in the xui
-	LLString day_list = getString("StatBarDaysOfWeek");
+	std::string day_list = getString("StatBarDaysOfWeek");
 	size_t length = day_list.size();
 	
 	// quick input check
 	if(length < MAX_DATE_STRING_LENGTH)
 	{
 		// tokenize it and put it in the array
-		LLString cur_word;
+		std::string cur_word;
 		for(size_t i = 0; i < length; ++i)
 		{
 			if(day_list[i] == ':')
@@ -838,21 +839,21 @@ void LLStatusBar::setupDate()
 			}
 			else
 			{
-				cur_word.append(1, day_list.c_str()[i]);
+				cur_word.append(1, day_list[i]);
 			}
 		}
 		sDays.push_back(cur_word);
 	}
 	
 	// fill the day array with what's in the xui	
-	LLString month_list = getString( "StatBarMonthsOfYear" );
+	std::string month_list = getString( "StatBarMonthsOfYear" );
 	length = month_list.size();
 	
 	// quick input check
 	if(length < MAX_DATE_STRING_LENGTH)
 	{
 		// tokenize it and put it in the array
-		LLString cur_word;
+		std::string cur_word;
 		for(size_t i = 0; i < length; ++i)
 		{
 			if(month_list[i] == ':')
@@ -862,7 +863,7 @@ void LLStatusBar::setupDate()
 			}
 			else
 			{
-				cur_word.append(1, month_list.c_str()[i]);
+				cur_word.append(1, month_list[i]);
 			}
 		}
 		sMonths.push_back(cur_word);
@@ -891,7 +892,7 @@ void LLStatusBar::onCommitSearch(LLUICtrl*, void* data)
 void LLStatusBar::onClickSearch(void* data)
 {
 	LLStatusBar* self = (LLStatusBar*)data;
-	LLString search_text = self->childGetText("search_editor");
+	std::string search_text = self->childGetText("search_editor");
 	LLFloaterDirectory::showFindAll(search_text);
 }
 
diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index ff898dc..5cdb481 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -54,7 +54,7 @@ public:
 	LLRegionDetails() :
 		mRegionName("Unknown"),
 		mParcelName("Unknown"),
-		mAccesString("Unknown"),
+		mAccessString("Unknown"),
 		mX(0),
 		mY(0),
 		mZ(0),
@@ -68,7 +68,7 @@ public:
 	}
 	std::string mRegionName;
 	std::string	mParcelName;
-	std::string	mAccesString;
+	std::string	mAccessString;
 	S32		mX;
 	S32		mY;
 	S32		mZ;
diff --git a/linden/indra/newview/llstatview.cpp b/linden/indra/newview/llstatview.cpp
index 221c4e1..84d4d83 100644
--- a/linden/indra/newview/llstatview.cpp
+++ b/linden/indra/newview/llstatview.cpp
@@ -42,7 +42,7 @@
 #include "llstatbar.h"
 #include "llviewercontrol.h"
 
-LLStatView::LLStatView(const LLString& name, const LLString& label, const LLString& setting, const LLRect& rect)
+LLStatView::LLStatView(const std::string& name, const std::string& label, const std::string& setting, const LLRect& rect)
 	:	LLContainerView(name, rect),
 		mNumStatBars(0),
 		mSetting(setting)
@@ -67,7 +67,7 @@ LLStatView::~LLStatView()
 	}
 }
 
-LLStatBar *LLStatView::addStat(const LLString& name, LLStat *statp)
+LLStatBar *LLStatView::addStat(const std::string& name, LLStat *statp)
 {
 	LLStatBar *stat_barp;
 	LLRect r;
@@ -92,7 +92,7 @@ LLStatBar *LLStatView::addStat(const LLString& name, LLStat *statp)
 	return stat_barp;
 }
 
-LLStatBar *LLStatView::getStatBar(const LLString& name)
+LLStatBar *LLStatView::getStatBar(const std::string& name)
 {
 	sb_vector_t::iterator iter;
 	for(iter = mStatBars.begin(); iter != mStatBars.end(); ++iter)
diff --git a/linden/indra/newview/llstatview.h b/linden/indra/newview/llstatview.h
index cff5809..2588f44 100644
--- a/linden/indra/newview/llstatview.h
+++ b/linden/indra/newview/llstatview.h
@@ -41,7 +41,7 @@ class LLStatBar;
 class LLStatView : public LLContainerView
 {
 public:
-	LLStatView(const LLString& name, const LLString& label, const LLString& setting, const LLRect& rect);
+	LLStatView(const std::string& name, const std::string& label, const std::string& setting, const LLRect& rect);
 	~LLStatView();
 
 /*
@@ -50,13 +50,13 @@ public:
 	virtual LLRect getRequiredRect();	// Return the height of this object, given the set options.
 */
 
-	LLStatBar *addStat(const LLString& name, LLStat *statp);
-	LLStatBar *getStatBar(const LLString& name);
+	LLStatBar *addStat(const std::string& name, LLStat *statp);
+	LLStatBar *getStatBar(const std::string& name);
 
 protected:
 	typedef std::vector<LLStatBar *> sb_vector_t;
 	sb_vector_t mStatBars;
 	U32 mNumStatBars;
-	LLString mSetting;
+	std::string mSetting;
 };
 #endif // LL_STATVIEW_
diff --git a/linden/indra/newview/llstylemap.cpp b/linden/indra/newview/llstylemap.cpp
index a8c8bf7..365de2f 100644
--- a/linden/indra/newview/llstylemap.cpp
+++ b/linden/indra/newview/llstylemap.cpp
@@ -60,11 +60,11 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID &source)
 	{
 		LLStyleSP style(new LLStyle);
 		style->setVisible(true);
-		style->setFontName(LLString::null);
-		if (source != gAgent.getID() && source != LLUUID::null)
+		style->setFontName(LLStringUtil::null);
+		if (source != LLUUID::null)
 		{
 			style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
-			LLString link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
+			std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
 			style->setLinkHREF(link);
 		}
 		else
@@ -73,3 +73,13 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID &source)
 	}
 	return (*this)[source];
 }
+
+void LLStyleMap::update()
+{
+	for (style_map_t::iterator iter = begin(); iter != end(); ++iter)
+	{
+		LLStyleSP &style = iter->second;
+		// Update the link color in case it has been changed.
+		style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+	}
+}
diff --git a/linden/indra/newview/llstylemap.h b/linden/indra/newview/llstylemap.h
index 2e9339c..782299e 100644
--- a/linden/indra/newview/llstylemap.h
+++ b/linden/indra/newview/llstylemap.h
@@ -49,6 +49,9 @@ public:
 	// Just like the [] accessor but it will add the entry in if it doesn't exist.
 	const LLStyleSP &lookup(const LLUUID &source); 
 	static LLStyleMap &instance();
+
+	// Forces refresh of the entries, call when something changes (e.g. link color).
+	void update();
 };
 
 #endif  // LL_LLSTYLE_MAP_H
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index 48e469b..017517c 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -73,7 +73,9 @@ LLSurface::LLSurface(U32 type, LLViewerRegion *regionp) :
 	mGridsPerEdge(0),
 	mOOGridsPerEdge(0.f),
 	mPatchesPerEdge(0),
+	mNumberOfPatches(0),
 	mType(type),
+	mDetailTextureScale(0.f),
 	mOriginGlobal(0.0, 0.0, 0.0),
 	mSTexturep(NULL),
 	mWaterTexturep(NULL),
diff --git a/linden/indra/newview/llsurface.h b/linden/indra/newview/llsurface.h
index d8da6fc..ebd8595 100644
--- a/linden/indra/newview/llsurface.h
+++ b/linden/indra/newview/llsurface.h
@@ -217,9 +217,6 @@ protected:
 	F32			mMetersPerGrid;				// Converts (i,j) indecies to distance
 	F32			mMetersPerEdge;				// = mMetersPerGrid * (mGridsPerEdge-1)
 
-	F32			mSurfaceTexScale;			// Scale factors for automatic tex coord generation
-	F32			mDetailTexScale;
-
 	LLPatchVertexArray mPVArray;
 
 	BOOL		mHasZData;				// We've received any patch data for this surface.
diff --git a/linden/indra/newview/llsurfacepatch.cpp b/linden/indra/newview/llsurfacepatch.cpp
index 42aea9e..68ce4af 100644
--- a/linden/indra/newview/llsurfacepatch.cpp
+++ b/linden/indra/newview/llsurfacepatch.cpp
@@ -52,28 +52,29 @@ extern U64 gFrameTime;
 extern LLPipeline gPipeline;
 
 LLSurfacePatch::LLSurfacePatch() :
-						mDataZ(NULL),
-						mVObjp(NULL),
-						mLastUpdateTime(0),
-						mSurfacep(NULL)
-{
-	// This flag is used to communicate between adjacent surfaces and is set
-	// to non-zero values by higher classes.  
-	mConnectedEdge = NO_EDGE;
-	mCenterRegion = LLVector3(0.f, 0.f, 0.f);
-	mOriginRegion = LLVector3(0.f, 0.f, 0.f);
-	mHasReceivedData = FALSE;
-	mMinZ = 0.0f;
-	mMaxZ = 0.0f;
-	mMeanZ = 0.0f;
-	mMinComposition = 0.f;
-	mMeanComposition = 0.f;
-	mMaxComposition = 0.f;
-	mRadius = 0.f;
-	mDirty = FALSE;
-	mDirtyZStats = TRUE;
-	mHeightsGenerated = FALSE;
-	
+	mHasReceivedData(FALSE),
+	mSTexUpdate(FALSE),
+	mDirty(FALSE),
+	mDirtyZStats(TRUE),
+	mHeightsGenerated(FALSE),
+	mDataOffset(0),
+	mDataZ(NULL),
+	mVObjp(NULL),
+	mOriginRegion(0.f, 0.f, 0.f),
+	mCenterRegion(0.f, 0.f, 0.f),
+	mMinZ(0.f),
+	mMaxZ(0.f),
+	mMeanZ(0.f),
+	mRadius(0.f),
+	mMinComposition(0.f),
+	mMaxComposition(0.f),
+	mMeanComposition(0.f),
+	// This flag is used to communicate between adjacent surfaces and is
+	// set to non-zero values by higher classes.  
+	mConnectedEdge(NO_EDGE),
+	mLastUpdateTime(0),
+	mSurfacep(NULL)
+{	
 	S32 i;
 	for (i = 0; i < 8; i++)
 	{
diff --git a/linden/indra/newview/llsurfacepatch.h b/linden/indra/newview/llsurfacepatch.h
index 174743e..92756ba 100644
--- a/linden/indra/newview/llsurfacepatch.h
+++ b/linden/indra/newview/llsurfacepatch.h
@@ -44,9 +44,17 @@ class LLAgent;
 
 // A patch shouldn't know about its visibility since that really depends on the 
 // camera that is looking (or not looking) at it.  So, anything about a patch
-// that is specific to a camera should be in the struct below.
-struct LLPatchVisibilityInfo
+// that is specific to a camera should be in the class below.
+class LLPatchVisibilityInfo
 {
+public:
+	LLPatchVisibilityInfo() :
+		mbIsVisible(FALSE),
+		mDistance(0.f),
+		mRenderLevel(0),
+		mRenderStride(0) { };
+	~LLPatchVisibilityInfo() { };
+
 	BOOL mbIsVisible;
 	F32 mDistance;			// Distance from camera
 	S32 mRenderLevel;
@@ -153,7 +161,7 @@ protected:
 	// Pointer to the LLVOSurfacePatch object which is used in the new renderer.
 	LLPointer<LLVOSurfacePatch> mVObjp;
 
-	// All of the camera-dependent stuff should be in its own structure...
+	// All of the camera-dependent stuff should be in its own class...
 	LLPatchVisibilityInfo mVisInfo;
 
 	// pointers to beginnings of patch data fields
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 0e4c9c2..e331146 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -991,7 +991,7 @@ BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
 	static LLStdStringHandle write_all_channels_string = LLXmlTree::addAttributeString("write_all_channels");
 	node->getFastAttributeBOOL( write_all_channels_string, mWriteAllChannels );
 
-	LLString render_pass_name;
+	std::string render_pass_name;
 	static LLStdStringHandle render_pass_string = LLXmlTree::addAttributeString("render_pass");
 	if( node->getFastAttributeString( render_pass_string, render_pass_name ) )
 	{
@@ -1019,7 +1019,7 @@ BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
 		 texture_node;
 		 texture_node = node->getNextNamedChild())
 	{
-		LLString local_texture;
+		std::string local_texture;
 		static LLStdStringHandle tga_file_string = LLXmlTree::addAttributeString("tga_file");
 		static LLStdStringHandle local_texture_string = LLXmlTree::addAttributeString("local_texture");
 		static LLStdStringHandle file_is_mask_string = LLXmlTree::addAttributeString("file_is_mask");
@@ -1105,14 +1105,14 @@ BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
 		 maskNode;
 		 maskNode = node->getNextNamedChild())
 	{
-		LLString morph_name;
+		std::string morph_name;
 		static LLStdStringHandle morph_name_string = LLXmlTree::addAttributeString("morph_name");
 		if (maskNode->getFastAttributeString(morph_name_string, morph_name))
 		{
 			BOOL invert = FALSE;
 			static LLStdStringHandle invert_string = LLXmlTree::addAttributeString("invert");
 			maskNode->getFastAttributeBOOL(invert_string, invert);			
-			mMorphNameList.push_back(std::pair<LLString,BOOL>(morph_name,invert));
+			mMorphNameList.push_back(std::pair<std::string,BOOL>(morph_name,invert));
 		}
 	}
 
@@ -1206,7 +1206,7 @@ BOOL LLTexLayer::setInfo(LLTexLayerInfo* info)
 			// morph target, need a better way of actually looking
 			// this up.
 			LLPolyMorphTarget *morph_param;
-			LLString *name = &(iter->first);
+			std::string *name = &(iter->first);
 			morph_param = (LLPolyMorphTarget *)(getTexLayerSet()->getAvatar()->getVisualParam(name->c_str()));
 			if (morph_param)
 			{
@@ -2244,11 +2244,11 @@ BOOL LLTexParamColorInfo::parseXml(LLXmlTreeNode *node)
 		return FALSE;
 	}
 
-	LLString op_string;
+	std::string op_string;
 	static LLStdStringHandle operation_string = LLXmlTree::addAttributeString("operation");
 	if( param_color_node->getFastAttributeString( operation_string, op_string ) )
 	{
-		LLString::toLower(op_string);
+		LLStringUtil::toLower(op_string);
 		if		( op_string == "add" ) 		mOperation = OP_ADD;
 		else if	( op_string == "multiply" )	mOperation = OP_MULTIPLY;
 		else if	( op_string == "blend" )	mOperation = OP_BLEND;
@@ -2465,7 +2465,7 @@ void LLTexStaticImageList::deleteCachedImages()
 
 // Returns an LLImageTGA that contains the encoded data from a tga file named file_name.
 // Caches the result to speed identical subsequent requests.
-LLImageTGA* LLTexStaticImageList::getImageTGA(const LLString& file_name)
+LLImageTGA* LLTexStaticImageList::getImageTGA(const std::string& file_name)
 {
 	const char *namekey = sImageNames.addString(file_name);
 	image_tga_map_t::iterator iter = mStaticImageListTGA.find(namekey);
@@ -2476,7 +2476,7 @@ LLImageTGA* LLTexStaticImageList::getImageTGA(const LLString& file_name)
 	else
 	{
 		std::string path;
-		path = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,file_name.c_str());
+		path = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,file_name);
 		LLPointer<LLImageTGA> image_tga = new LLImageTGA( path );
 		if( image_tga->getDataSize() > 0 )
 		{
@@ -2495,7 +2495,7 @@ LLImageTGA* LLTexStaticImageList::getImageTGA(const LLString& file_name)
 
 // Returns a GL Image (without a backing ImageRaw) that contains the decoded data from a tga file named file_name.
 // Caches the result to speed identical subsequent requests.
-LLImageGL* LLTexStaticImageList::getImageGL(const LLString& file_name, BOOL is_mask )
+LLImageGL* LLTexStaticImageList::getImageGL(const std::string& file_name, BOOL is_mask )
 {
 	LLPointer<LLImageGL> image_gl;
 	const char *namekey = sImageNames.addString(file_name);
@@ -2536,11 +2536,11 @@ LLImageGL* LLTexStaticImageList::getImageGL(const LLString& file_name, BOOL is_m
 
 // Reads a .tga file, decodes it, and puts the decoded data in image_raw.
 // Returns TRUE if successful.
-BOOL LLTexStaticImageList::loadImageRaw( const LLString& file_name, LLImageRaw* image_raw )
+BOOL LLTexStaticImageList::loadImageRaw( const std::string& file_name, LLImageRaw* image_raw )
 {
 	BOOL success = FALSE;
 	std::string path;
-	path = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,file_name.c_str());
+	path = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,file_name);
 	LLPointer<LLImageTGA> image_tga = new LLImageTGA( path );
 	if( image_tga->getDataSize() > 0 )
 	{
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 17cfb7c..742b484 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -86,7 +86,7 @@ public:
 	/*virtual*/ BOOL parseXml(LLXmlTreeNode* node);
 
 protected:
-	LLString				mStaticImageFileName;
+	std::string				mStaticImageFileName;
 	BOOL					mMultiplyBlend;
 	BOOL					mSkipIfZeroWeight;
 	F32						mDomain;
@@ -126,7 +126,7 @@ public:
 protected:
 	typedef std::vector<LLTexParamColorInfo *> color_info_list_t;
 	color_info_list_t		mColorInfoList;
-	LLString				mName;
+	std::string				mName;
 };
 
 //-----------------------------------------------------------------------------
@@ -143,10 +143,10 @@ public:
 	BOOL parseXml(LLXmlTreeNode* node);
 
 protected:
-	LLString				mBodyRegion;
+	std::string				mBodyRegion;
 	S32						mWidth;
 	S32						mHeight;
-	LLString				mStaticAlphaFileName;
+	std::string				mStaticAlphaFileName;
 	BOOL					mClearAlpha;		// Set alpha to 1 for this layerset (if there is no mStaticAlphaFileName)
 	
 	typedef std::vector<LLTexLayerInfo*> layer_info_list_t;
@@ -173,20 +173,20 @@ public:
 	BOOL parseXml(LLXmlTreeNode* node);
 
 protected:
-	LLString				mName;
+	std::string				mName;
 	
 	BOOL					mWriteAllChannels;  // Don't use masking.  Just write RGBA into buffer,
 	ERenderPass				mRenderPass;
 
-	LLString				mGlobalColor;
+	std::string				mGlobalColor;
 	LLColor4				mFixedColor;
 
 	S32						mLocalTexture;
-	LLString				mStaticImageFileName;
+	std::string				mStaticImageFileName;
 	BOOL					mStaticImageIsMask;
 	BOOL					mUseLocalTextureAlphaOnly;	// Ignore RGB channels from the input texture.  Use alpha as a mask
 
-	typedef std::vector<std::pair<LLString,BOOL> > morph_name_list_t;
+	typedef std::vector<std::pair<std::string,BOOL> > morph_name_list_t;
 	morph_name_list_t		mMorphNameList;
 
 	typedef std::vector<LLTexParamColorInfo*> color_info_list_t;
@@ -260,7 +260,7 @@ public:
 	
 	BOOL					render( S32 x, S32 y, S32 width, S32 height );
 	BOOL					renderBump( S32 x, S32 y, S32 width,S32 height );
-	BOOL					isBodyRegion( const char* region )		{ return mInfo->mBodyRegion == region; }
+	BOOL					isBodyRegion( const std::string& region ) { return mInfo->mBodyRegion == region; }
 	LLTexLayerSetBuffer*	getComposite();
 	void					requestUpdate();
 	void					requestUpload();
@@ -276,7 +276,7 @@ public:
 	void					deleteCaches();
 	void					gatherAlphaMasks(U8 *data, S32 width, S32 height);
 	void					applyMorphMask(U8* tex_data, S32 width, S32 height, S32 num_components);
-	const LLString&			getBodyRegion() 				{ return mInfo->mBodyRegion; }
+	const std::string		getBodyRegion() 				{ return mInfo->mBodyRegion; }
 	BOOL					hasComposite()					{ return (mComposite != NULL); }
 	void					setBump( BOOL b )				{ mHasBump = b; }
 	BOOL					hasBump()						{ return mHasBump; }
@@ -338,7 +338,7 @@ public:
 
 	void					invalidateMorphMasks();
 	ERenderPass				getRenderPass() 						{ return mInfo->mRenderPass; }
-	const LLString&			getGlobalColor() 						{ return mInfo->mGlobalColor; }
+	const std::string&			getGlobalColor() 						{ return mInfo->mGlobalColor; }
 	BOOL					findNetColor( LLColor4* color );
 	BOOL					renderImageRaw( U8* in_data, S32 in_width, S32 in_height, S32 in_components, S32 width, S32 height, BOOL is_mask );
 	BOOL					renderAlphaMasks(  S32 x, S32 y, S32 width, S32 height, LLColor4* colorp );
@@ -505,15 +505,15 @@ public:
 	LLTexStaticImageList();
 	~LLTexStaticImageList();
 
-	LLImageRaw*	getImageRaw( const LLString& file_name );
-	LLImageGL*	getImageGL( const LLString& file_name, BOOL is_mask  );
-	LLImageTGA*	getImageTGA( const LLString& file_name );
+	LLImageRaw*	getImageRaw( const std::string& file_name );
+	LLImageGL*	getImageGL( const std::string& file_name, BOOL is_mask  );
+	LLImageTGA*	getImageTGA( const std::string& file_name );
 
 	void		deleteCachedImages();
 	void		dumpByteCount();
 
 private:
-	BOOL		loadImageRaw( const LLString& file_name, LLImageRaw* image_raw );
+	BOOL		loadImageRaw( const std::string& file_name, LLImageRaw* image_raw );
 
 private:
 	static LLStringTable sImageNames;
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 22cb6c1..da23710 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -155,7 +155,7 @@ protected:
 class LLTextureCacheLocalFileWorker : public LLTextureCacheWorker
 {
 public:
-	LLTextureCacheLocalFileWorker(LLTextureCache* cache, U32 priority, const LLString& filename, const LLUUID& id,
+	LLTextureCacheLocalFileWorker(LLTextureCache* cache, U32 priority, const std::string& filename, const LLUUID& id,
 						 U8* data, S32 datasize, S32 offset,
 						 S32 imagesize, // for writes
 						 LLTextureCache::Responder* responder) 
@@ -169,7 +169,7 @@ public:
 	virtual bool doWrite();
 	
 private:
-	LLString	mFileName;
+	std::string	mFileName;
 };
 
 bool LLTextureCacheLocalFileWorker::doRead()
@@ -180,7 +180,7 @@ bool LLTextureCacheLocalFileWorker::doRead()
 	{
 		mDataSize = local_size; // Only a complete file is valid
 
-		LLString extension = mFileName.substr(mFileName.size() - 3, 3);
+		std::string extension = mFileName.substr(mFileName.size() - 3, 3);
 
 		mImageFormat = LLImageBase::getCodecFromExtension(extension);
 
@@ -1034,12 +1034,12 @@ S64 LLTextureCache::initCache(ELLPath location, S64 max_size, BOOL read_only)
 	
 	if (!mReadOnly)
 	{
-		LLFile::mkdir(mTexturesDirName.c_str());
+		LLFile::mkdir(mTexturesDirName);
 		const char* subdirs = "0123456789abcdef";
 		for (S32 i=0; i<16; i++)
 		{
 			std::string dirname = mTexturesDirName + gDirUtilp->getDirDelimiter() + subdirs[i];
-			LLFile::mkdir(dirname.c_str());
+			LLFile::mkdir(dirname);
 		}
 	}
 	readHeaderCache();
@@ -1060,12 +1060,10 @@ struct lru_data
 		typedef const lru_data* lru_data_ptr;
 		bool operator()(const lru_data_ptr& a, const lru_data_ptr& b) const
 		{
-			if (a->time > b->time)
-				return true;
-			else if (b->time > a->time)
-				return false;
+			if(a->time == b->time)
+				return (a->index < b->index);
 			else
-				return a->index < b->index;
+				return (a->time >= b->time);
 		}
 	};				
 };
@@ -1137,16 +1135,16 @@ void LLTextureCache::purgeAllTextures(bool purge_directories)
 		for (S32 i=0; i<16; i++)
 		{
 			std::string dirname = mTexturesDirName + delem + subdirs[i];
-			gDirUtilp->deleteFilesInDir(dirname.c_str(),mask);
+			gDirUtilp->deleteFilesInDir(dirname,mask);
 			if (purge_directories)
 			{
-				LLFile::rmdir(dirname.c_str());
+				LLFile::rmdir(dirname);
 			}
 		}
 		ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
 		if (purge_directories)
 		{
-			LLFile::rmdir(mTexturesDirName.c_str());
+			LLFile::rmdir(mTexturesDirName);
 		}
 	}
 	mTexturesSizeMap.clear();
@@ -1395,7 +1393,7 @@ S32 LLTextureCache::getHeaderCacheEntry(const LLUUID& id, bool touch, S32* image
 
 // Calls from texture pipeline thread (i.e. LLTextureFetch)
 
-LLTextureCache::handle_t LLTextureCache::readFromCache(const LLString& filename, const LLUUID& id, U32 priority,
+LLTextureCache::handle_t LLTextureCache::readFromCache(const std::string& filename, const LLUUID& id, U32 priority,
 													   S32 offset, S32 size, ReadResponder* responder)
 {
 	// Note: checking to see if an entry exists can cause a stall,
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index f083dd0..14f44ba 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -83,7 +83,7 @@ public:
 	void purgeCache(ELLPath location);
 	S64 initCache(ELLPath location, S64 maxsize, BOOL read_only);
 
-	handle_t readFromCache(const LLString& local_filename, const LLUUID& id, U32 priority, S32 offset, S32 size,
+	handle_t readFromCache(const std::string& local_filename, const LLUUID& id, U32 priority, S32 offset, S32 size,
 						   ReadResponder* responder);
 
 	handle_t readFromCache(const LLUUID& id, U32 priority, S32 offset, S32 size,
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 9a02c5a..48cacf8 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -65,6 +65,7 @@
 #include "llviewercontrol.h"
 #include "llglheaders.h"
 #include "lluictrlfactory.h"
+#include "lltrans.h"
 
 
 static const S32 CLOSE_BTN_WIDTH = 100;
@@ -117,7 +118,7 @@ public:
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask,
 						BOOL drop, EDragAndDropType cargo_type, void *cargo_data, 
 						EAcceptance *accept,
-						LLString& tooltip_msg);
+						std::string& tooltip_msg);
 	virtual void	draw();
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
 
@@ -155,7 +156,7 @@ public:
 	static void		onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
 	static void		onShowFolders(LLUICtrl* ctrl, void* userdata);
 	static void		onApplyImmediateCheck(LLUICtrl* ctrl, void* userdata);
-	static void		onSearchEdit(const LLString& search_string, void* user_data );
+	static void		onSearchEdit(const std::string& search_string, void* user_data );
 	static void		onTextureSelect( const LLTextureEntry& te, void *data );
 
 protected:
@@ -173,7 +174,7 @@ protected:
 	LLTextBox*			mTentativeLabel;
 	LLTextBox*			mResolutionLabel;
 
-	LLString			mPendingName;
+	std::string			mPendingName;
 	BOOL				mIsDirty;
 	BOOL				mActive;
 
@@ -195,9 +196,9 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	PermissionMask non_immediate_filter_perm_mask,
 	BOOL can_apply_immediately)
 	:
-	LLFloater( "texture picker",
+	LLFloater( std::string("texture picker"),
 		rect,
-		LLString( "Pick: " ) + label,
+		std::string( "Pick: " ) + label,
 		TRUE,
 		TEX_PICKER_MIN_WIDTH, TEX_PICKER_MIN_HEIGHT ),
 	mOwner( owner ),
@@ -345,12 +346,12 @@ void LLFloaterTexturePicker::updateImageStats()
 		//RN: have we received header data for this image?
 		if (mTexturep->getWidth(0) > 0 && mTexturep->getHeight(0) > 0)
 		{
-			LLString formatted_dims = llformat("%d x %d", mTexturep->getWidth(0),mTexturep->getHeight(0));
+			std::string formatted_dims = llformat("%d x %d", mTexturep->getWidth(0),mTexturep->getHeight(0));
 			mResolutionLabel->setTextArg("[DIMENSIONS]", formatted_dims);
 		}
 		else
 		{
-			mResolutionLabel->setTextArg("[DIMENSIONS]", LLString("[? x ?]"));
+			mResolutionLabel->setTextArg("[DIMENSIONS]", std::string("[? x ?]"));
 		}
 	}
 }
@@ -361,7 +362,7 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
 		BOOL drop,
 		EDragAndDropType cargo_type, void *cargo_data, 
 		EAcceptance *accept,
-		LLString& tooltip_msg)
+		std::string& tooltip_msg)
 {
 	BOOL handled = FALSE;
 
@@ -815,12 +816,12 @@ void LLFloaterTexturePicker::updateFilterPermMask()
 	//mInventoryPanel->setFilterPermMask( getFilterPermMask() );  Commented out due to no-copy texture loss.
 }
 
-void LLFloaterTexturePicker::onSearchEdit(const LLString& search_string, void* user_data )
+void LLFloaterTexturePicker::onSearchEdit(const std::string& search_string, void* user_data )
 {
 	LLFloaterTexturePicker* picker = (LLFloaterTexturePicker*)user_data;
 
 	std::string upper_case_search_string = search_string;
-	LLString::toUpper(upper_case_search_string);
+	LLStringUtil::toUpper(upper_case_search_string);
 
 	if (upper_case_search_string.empty())
 	{
@@ -908,7 +909,8 @@ LLTextureCtrl::LLTextureCtrl(
 	mCanApplyImmediately( FALSE ),
 	mNeedsRawImageData( FALSE ),
 	mValid( TRUE ),
-	mDirty( FALSE )
+	mDirty( FALSE ),
+	mShowLoadingPlaceholder( TRUE )
 {
 	mCaption = new LLTextBox( label, 
 		LLRect( 0, BTN_HEIGHT_SMALL, getRect().getWidth(), 0 ),
@@ -922,11 +924,11 @@ LLTextureCtrl::LLTextureCtrl(
 	S32 image_middle = (image_top + image_bottom) / 2;
 	S32 line_height = llround(LLFontGL::sSansSerifSmall->getLineHeight());
 
-	mTentativeLabel = new LLTextBox( "Multiple", 
+	mTentativeLabel = new LLTextBox( std::string("Multiple"), 
 		LLRect( 
 			0, image_middle + line_height / 2,
 			getRect().getWidth(), image_middle - line_height / 2 ),
-		"Multiple",
+		std::string("Multiple"),
 		LLFontGL::sSansSerifSmall );
 	mTentativeLabel->setHAlign( LLFontGL::HCENTER );
 	mTentativeLabel->setFollowsAll();
@@ -934,11 +936,12 @@ LLTextureCtrl::LLTextureCtrl(
 
 	LLRect border_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
 	border_rect.mBottom += BTN_HEIGHT_SMALL;
-	mBorder = new LLViewBorder("border", border_rect, LLViewBorder::BEVEL_IN);
+	mBorder = new LLViewBorder(std::string("border"), border_rect, LLViewBorder::BEVEL_IN);
 	mBorder->setFollowsAll();
 	addChild(mBorder);
 
 	setEnabled(TRUE); // for the tooltip
+	mLoadingPlaceholderString = LLTrans::getString("texture_loading");
 }
 
 
@@ -965,22 +968,22 @@ LLXMLNodePtr LLTextureCtrl::getXML(bool save_children) const
 
 LLView* LLTextureCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("texture_picker");
+	std::string name("texture_picker");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
 	createRect(node, rect, parent);
 
-	LLString label;
+	std::string label;
 	node->getAttributeString("label", label);
 
-	LLString image_id("");
+	std::string image_id("");
 	node->getAttributeString("image", image_id);
 
-	LLString default_image_id("");
+	std::string default_image_id("");
 	node->getAttributeString("default_image", default_image_id);
 
-	LLString default_image_name("Default");
+	std::string default_image_name("Default");
 	node->getAttributeString("default_image_name", default_image_name);
 
 	BOOL allow_no_texture = FALSE;
@@ -1009,7 +1012,12 @@ LLView* LLTextureCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
 	return texture_picker;
 }
 
-void LLTextureCtrl::setCaption(const LLString& caption)
+void LLTextureCtrl::setShowLoadingPlaceholder(BOOL showLoadingPlaceholder)
+{
+	mShowLoadingPlaceholder = showLoadingPlaceholder;
+}
+
+void LLTextureCtrl::setCaption(const std::string& caption)
 {
 	mCaption->setText( caption );
 }
@@ -1038,13 +1046,13 @@ void LLTextureCtrl::setEnabled( BOOL enabled )
 	LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
 	if( enabled )
 	{
-		LLString tooltip;
+		std::string tooltip;
 		if (floaterp) tooltip = floaterp->getUIString("choose_picture");
 		setToolTip( tooltip );
 	}
 	else
 	{
-		setToolTip( LLString() );
+		setToolTip( std::string() );
 		// *TODO: would be better to keep floater open and show
 		// disabled state.
 		closeFloater();
@@ -1092,7 +1100,7 @@ void LLTextureCtrl::clear()
 	setImageAssetID(LLUUID::null);
 }
 
-void LLTextureCtrl::setLabel(const LLString& label)
+void LLTextureCtrl::setLabel(const std::string& label)
 {
 	mLabel = label;
 	mCaption->setText(label);
@@ -1243,7 +1251,7 @@ void LLTextureCtrl::setImageAssetID( const LLUUID& asset_id )
 BOOL LLTextureCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
 					  BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
 					  EAcceptance *accept,
-					  LLString& tooltip_msg)
+					  std::string& tooltip_msg)
 {
 	BOOL handled = FALSE;
 
@@ -1318,6 +1326,26 @@ void LLTextureCtrl::draw()
 	}
 
 	mTentativeLabel->setVisible( !mTexturep.isNull() && getTentative() );
+	
+	
+	// Show "Loading..." string on the top left corner while this texture is loading.
+	// Using the discard level, do not show the string if the texture is almost but not 
+	// fully loaded.
+	if ( mTexturep.notNull() &&
+		 (mShowLoadingPlaceholder == TRUE) && 
+		 (mTexturep->getDiscardLevel() != 1) &&
+		 (mTexturep->getDiscardLevel() != 0))
+	{
+		LLFontGL* font = LLFontGL::sSansSerifBig;
+		font->renderUTF8(
+			mLoadingPlaceholderString, 0,
+			llfloor(interior.mLeft+10), 
+			llfloor(interior.mTop-20),
+			LLColor4::white,
+			LLFontGL::LEFT,
+			LLFontGL::BASELINE,
+			LLFontGL::DROP_SHADOW);
+	}
 
 	LLUICtrl::draw();
 }
@@ -1411,7 +1439,7 @@ protected:
 LLToolTexEyedropper::LLToolTexEyedropper( 
 	void (*callback)(const LLUUID& obj_id, const LLUUID& image_id, void* userdata ),
 	void* userdata )
-	: LLTool("texeyedropper"),
+	: LLTool(std::string("texeyedropper")),
 	  mCallback( callback ),
 	  mCallbackUserData( userdata )
 {
@@ -1424,13 +1452,15 @@ LLToolTexEyedropper::~LLToolTexEyedropper()
 
 BOOL LLToolTexEyedropper::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	LLViewerObject* hit_obj	= gViewerWindow->lastObjectHit();
+	// this will affect framerate on mouse down
+	const LLPickInfo& pick = gViewerWindow->pickImmediate(x, y, FALSE);
+	LLViewerObject* hit_obj	= pick.getObject();
 	if (hit_obj && 
 		!hit_obj->isAvatar())
 	{
-		if( (0 <= gLastHitObjectFace) && (gLastHitObjectFace < hit_obj->getNumTEs()) )
+		if( (0 <= pick.mObjectFace) && (pick.mObjectFace < hit_obj->getNumTEs()) )
 		{
-			LLViewerImage* image = hit_obj->getTEImage( gLastHitObjectFace );
+			LLViewerImage* image = hit_obj->getTEImage( pick.mObjectFace );
 			if( image )
 			{
 				if( mCallback )
diff --git a/linden/indra/newview/lltexturectrl.h b/linden/indra/newview/lltexturectrl.h
index 36f6ea2..24cde30 100644
--- a/linden/indra/newview/lltexturectrl.h
+++ b/linden/indra/newview/lltexturectrl.h
@@ -81,7 +81,7 @@ public:
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask,
 						BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
 						EAcceptance *accept,
-						LLString& tooltip_msg);
+						std::string& tooltip_msg);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
 
@@ -103,8 +103,8 @@ public:
 
 	// LLTextureCtrl interface
 	void			showPicker(BOOL take_focus);
-	void			setLabel(const LLString& label);
-	const LLString&	getLabel() const							{ return mLabel; }
+	void			setLabel(const std::string& label);
+	const std::string&	getLabel() const							{ return mLabel; }
 
 	void			setAllowNoTexture( BOOL b )					{ mAllowNoTexture = b; }
 	bool			getAllowNoTexture() const					{ return mAllowNoTexture; }
@@ -116,10 +116,10 @@ public:
 
 	void			setDefaultImageAssetID( const LLUUID& id )	{ mDefaultImageAssetID = id; }
 
-	const LLString&	getDefaultImageName() const					{ return mDefaultImageName; }
+	const std::string&	getDefaultImageName() const					{ return mDefaultImageName; }
 	const LLUUID&	getDefaultImageAssetID() const				{ return mDefaultImageAssetID; }
 
-	void			setCaption(const LLString& caption);
+	void			setCaption(const std::string& caption);
 	void			setCanApplyImmediately(BOOL b);
 
 	void			setImmediateFilterPermMask(PermissionMask mask)
@@ -147,6 +147,8 @@ public:
 	
 	void setOnSelectCallback(LLUICtrlCallback cb)	{ mOnSelectCallback = cb; }
 
+	void setShowLoadingPlaceholder(BOOL showLoadingPlaceholder);
+
 private:
 	BOOL allowDrop(LLInventoryItem* item);
 	BOOL doDrop(LLInventoryItem* item);
@@ -161,11 +163,11 @@ private:
 	LLUUID					 mImageItemID;
 	LLUUID					 mImageAssetID;
 	LLUUID					 mDefaultImageAssetID;
-	LLString				 mDefaultImageName;
+	std::string				 mDefaultImageName;
 	LLHandle<LLFloater>			 mFloaterHandle;
 	LLTextBox*				 mTentativeLabel;
 	LLTextBox*				 mCaption;
-	LLString				 mLabel;
+	std::string				 mLabel;
 	BOOL					 mAllowNoTexture; // If true, the user can select "none" as an option
 	LLCoordGL				 mLastFloaterLeftTop;
 	PermissionMask			 mImmediateFilterPermMask;
@@ -175,6 +177,8 @@ private:
 	LLViewBorder*			 mBorder;
 	BOOL					 mValid;
 	BOOL					 mDirty;
+	BOOL					 mShowLoadingPlaceholder;
+	std::string				 mLoadingPlaceholderString;
 };
 
 // XUI HACK: When floaters converted, switch this file to lltexturepicker.h/cpp
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index e412dfe..e945102 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -234,7 +234,7 @@ private:
 	/*virtual*/ void startWork(S32 param); // called from addWork() (MAIN THREAD)
 	/*virtual*/ void endWork(S32 param, bool aborted); // called from doWork() (MAIN THREAD)
 
-	virtual LLString getName() { return LLString::null; }
+	virtual std::string getName() { return LLStringUtil::null; }
 	void resetFormattedData();
 	
 	void setImagePriority(F32 priority);
@@ -344,18 +344,18 @@ class LLTextureFetchLocalFileWorker : public LLTextureFetchWorker
 friend class LLTextureFetch;
 
 protected:
-	LLTextureFetchLocalFileWorker(LLTextureFetch* fetcher, const LLString& filename, const LLUUID& id, const LLHost& host,
+	LLTextureFetchLocalFileWorker(LLTextureFetch* fetcher, const std::string& filename, const LLUUID& id, const LLHost& host,
 						 F32 priority, S32 discard, S32 size)
 		:	LLTextureFetchWorker(fetcher, id, host, priority, discard, size),
 			mFileName(filename)
 	{}
 
 private:
-	/*virtual*/ LLString getName() { return mFileName; }
+	/*virtual*/ std::string getName() { return mFileName; }
 
 
 private:
-	LLString mFileName;
+	std::string mFileName;
 };
 
 
@@ -1315,10 +1315,10 @@ LLTextureFetch::~LLTextureFetch()
 bool LLTextureFetch::createRequest(const LLUUID& id, const LLHost& host, F32 priority,
 									S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux)
 {
-	return createRequest(LLString::null, id, host, priority, w, h, c, desired_discard, needs_aux);
+	return createRequest(LLStringUtil::null, id, host, priority, w, h, c, desired_discard, needs_aux);
 }
 
-bool LLTextureFetch::createRequest(const LLString& filename, const LLUUID& id, const LLHost& host, F32 priority,
+bool LLTextureFetch::createRequest(const std::string& filename, const LLUUID& id, const LLHost& host, F32 priority,
 								   S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux)
 {
 	if (mDebugPause)
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 195cb98..6c7f6ba 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -55,7 +55,7 @@ public:
 
 	bool createRequest(const LLUUID& id, const LLHost& host, F32 priority,
 					   S32 w, S32 h, S32 c, S32 discard, bool needs_aux);
-	bool createRequest(const LLString& filename, const LLUUID& id, const LLHost& host, F32 priority,
+	bool createRequest(const std::string& filename, const LLUUID& id, const LLHost& host, F32 priority,
 					   S32 w, S32 h, S32 c, S32 discard, bool needs_aux);
 	void deleteRequest(const LLUUID& id, bool cancel);
 	bool getRequestFinished(const LLUUID& id, S32& discard_level,
diff --git a/linden/indra/newview/lltextureview.cpp b/linden/indra/newview/lltextureview.cpp
index a2b3d47..49bc968 100644
--- a/linden/indra/newview/lltextureview.cpp
+++ b/linden/indra/newview/lltextureview.cpp
@@ -61,11 +61,11 @@ std::set<LLViewerImage*> LLTextureView::sDebugImages;
 
 ////////////////////////////////////////////////////////////////////////////
 
-static LLString title_string1a("Tex UUID Area  DDis(Req)  DecodePri(Fetch)     [download]        pk/max");
-static LLString title_string1b("Tex UUID Area  DDis(Req)  Fetch(DecodePri)     [download]        pk/max");
-static LLString title_string2("State");
-static LLString title_string3("Pkt Bnd");
-static LLString title_string4("  W x H (Dis) Mem");
+static std::string title_string1a("Tex UUID Area  DDis(Req)  DecodePri(Fetch)     [download]        pk/max");
+static std::string title_string1b("Tex UUID Area  DDis(Req)  Fetch(DecodePri)     [download]        pk/max");
+static std::string title_string2("State");
+static std::string title_string3("Pkt Bnd");
+static std::string title_string4("  W x H (Dis) Mem");
 
 static S32 title_x1 = 0;
 static S32 title_x2 = 440;
@@ -175,7 +175,7 @@ void LLTextureBar::draw()
 	// The texture UUID or name
 	// The progress bar for the texture, highlighted if it's being download
 	// Various numerical stats.
-	char tex_str[256];
+	std::string tex_str;
 	S32 left, right;
 	S32 top = 0;
 	S32 bottom = top + 6;
@@ -184,28 +184,28 @@ void LLTextureBar::draw()
 	LLGLSUIDefault gls_ui;
 	
 	// Name, pixel_area, requested pixel area, decode priority
-	char uuid_str[255];
+	std::string uuid_str;
 	mImagep->mID.toString(uuid_str);
-	uuid_str[8] = 0;
+	uuid_str = uuid_str.substr(0,7);
 	if (mTextureView->mOrderFetch)
 	{
-		sprintf(tex_str, "%s %7.0f %d(%d) 0x%08x(%8.0f)",
-				uuid_str,
-				mImagep->mMaxVirtualSize,
-				mImagep->mDesiredDiscardLevel,
-				mImagep->mRequestedDiscardLevel,
-				mImagep->mFetchPriority,
-				mImagep->getDecodePriority());
+		tex_str = llformat("%s %7.0f %d(%d) 0x%08x(%8.0f)",
+						   uuid_str.c_str(),
+						   mImagep->mMaxVirtualSize,
+						   mImagep->mDesiredDiscardLevel,
+						   mImagep->mRequestedDiscardLevel,
+						   mImagep->mFetchPriority,
+						   mImagep->getDecodePriority());
 	}
 	else
 	{
-		sprintf(tex_str, "%s %7.0f %d(%d) %8.0f(0x%08x)",
-				uuid_str,
-				mImagep->mMaxVirtualSize,
-				mImagep->mDesiredDiscardLevel,
-				mImagep->mRequestedDiscardLevel,
-				mImagep->getDecodePriority(),
-				mImagep->mFetchPriority);
+		tex_str = llformat("%s %7.0f %d(%d) %8.0f(0x%08x)",
+						   uuid_str.c_str(),
+						   mImagep->mMaxVirtualSize,
+						   mImagep->mDesiredDiscardLevel,
+						   mImagep->mRequestedDiscardLevel,
+						   mImagep->getDecodePriority(),
+						   mImagep->mFetchPriority);
 	}
 
 	LLFontGL::sMonospace->renderUTF8(tex_str, 0, title_x1, getRect().getHeight(),
@@ -213,7 +213,7 @@ void LLTextureBar::draw()
 
 	// State
 	// Hack: mirrored from lltexturefetch.cpp
-	struct { const char* desc; LLColor4 color; } fetch_state_desc[] = {
+	struct { const std::string desc; LLColor4 color; } fetch_state_desc[] = {
 		{ "---", LLColor4::red },	// INVALID
 		{ "INI", LLColor4::white },	// INIT
 		{ "DSK", LLColor4::cyan },	// LOAD_FROM_TEXTURE_CACHE
@@ -325,14 +325,14 @@ void LLTextureBar::draw()
 		LLGLSUIDefault gls_ui;
 		// draw the packet data
 // 		{
-// 			LLString num_str = llformat("%3d/%3d", mImagep->mLastPacket+1, mImagep->mPackets);
+// 			std::string num_str = llformat("%3d/%3d", mImagep->mLastPacket+1, mImagep->mPackets);
 // 			LLFontGL::sMonospace->renderUTF8(num_str, 0, bar_left + 100, getRect().getHeight(), color,
 // 											 LLFontGL::LEFT, LLFontGL::TOP);
 // 		}
 		
 		// draw the image size at the end
 		{
-			LLString num_str = llformat("%3dx%3d (%d) %7d", mImagep->getWidth(), mImagep->getHeight(),
+			std::string num_str = llformat("%3dx%3d (%d) %7d", mImagep->getWidth(), mImagep->getHeight(),
 										mImagep->getDiscardLevel(), mImagep->mTextureMemory);
 			LLFontGL::sMonospace->renderUTF8(num_str, 0, title_x4, getRect().getHeight(), color,
 											LLFontGL::LEFT, LLFontGL::TOP);
@@ -459,14 +459,15 @@ void LLGLTexMemBar::draw()
 
 	//----------------------------------------------------------------------------
 
-	text = llformat("Textures: Count: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d IW:%d(%d) RAW:%d",
+	text = llformat("Textures: Count: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d IW:%d(%d) RAW:%d mRaw:%d mAux:%d CB:%d",
 					gImageList.getNumImages(),
 					LLAppViewer::getTextureFetch()->getNumRequests(), LLAppViewer::getTextureFetch()->getNumDeletes(),
 					LLAppViewer::getTextureFetch()->mPacketCount, LLAppViewer::getTextureFetch()->mBadPacketCount, 
 					LLAppViewer::getTextureCache()->getNumReads(), LLAppViewer::getTextureCache()->getNumWrites(),
 					LLLFSThread::sLocal->getPending(),
 					LLImageWorker::sCount, LLImageWorker::getWorkerThread()->getNumDeletes(),
-					LLImageRaw::sRawImageCount);
+					LLImageRaw::sRawImageCount, LLViewerImage::sRawCount, LLViewerImage::sAuxCount,
+					gImageList.mCallbackList.size());
 
 	LLFontGL::sMonospace->renderUTF8(text, 0, 0, line_height*2,
 									 text_color, LLFontGL::LEFT, LLFontGL::TOP);
@@ -474,13 +475,13 @@ void LLGLTexMemBar::draw()
 	S32 dx1 = 0;
 	if (LLAppViewer::getTextureFetch()->mDebugPause)
 	{
-		LLFontGL::sMonospace->renderUTF8("!", 0, title_x1, line_height,
+		LLFontGL::sMonospace->renderUTF8(std::string("!"), 0, title_x1, line_height,
 										 text_color, LLFontGL::LEFT, LLFontGL::TOP);
 		dx1 += 8;
 	}
 	if (mTextureView->mFreezeView)
 	{
-		LLFontGL::sMonospace->renderUTF8("*", 0, title_x1, line_height,
+		LLFontGL::sMonospace->renderUTF8(std::string("*"), 0, title_x1, line_height,
 										 text_color, LLFontGL::LEFT, LLFontGL::TOP);
 		dx1 += 8;
 	}
@@ -713,8 +714,8 @@ void LLTextureView::draw()
 
 		/*
 		  count = gImageList.getNumImages();
-		  char info_string[512];
-		  sprintf(info_string, "Global Info:\nTexture Count: %d", count);
+		  std::string info_string;
+		  info_string = llformat("Global Info:\nTexture Count: %d", count);
 		  mInfoTextp->setText(info_string);
 		*/
 
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index 00395e2..cb0d3b1 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -46,9 +46,9 @@
 extern BOOL gDebugClicks;
 
 //static
-const LLString LLTool::sNameNull("null");
+const std::string LLTool::sNameNull("null");
 
-LLTool::LLTool( const LLString& name, LLToolComposite* composite ) :
+LLTool::LLTool( const std::string& name, LLToolComposite* composite ) :
 	mComposite( composite ),
 	mName(name)
 {
@@ -124,7 +124,7 @@ BOOL LLTool::handleRightMouseUp(S32 x, S32 y, MASK mask)
 	return FALSE;
 }
 
-BOOL LLTool::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLTool::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
 	// by default, didn't handle it
 	// llinfos << "LLTool::handleToolTip" << llendl;
@@ -135,12 +135,12 @@ void LLTool::setMouseCapture( BOOL b )
 {
 	if( b )
 	{
-		gViewerWindow->setMouseCapture(mComposite ? mComposite : this );
+		gFocusMgr.setMouseCapture(mComposite ? mComposite : this );
 	}
 	else
 	if( hasMouseCapture() )
 	{
-		gViewerWindow->setMouseCapture( NULL );
+		gFocusMgr.setMouseCapture( NULL );
 	}
 }
 
diff --git a/linden/indra/newview/lltool.h b/linden/indra/newview/lltool.h
index 0c72e79..2cc4ec2 100644
--- a/linden/indra/newview/lltool.h
+++ b/linden/indra/newview/lltool.h
@@ -47,7 +47,7 @@ class LLTool
 :	public LLMouseHandler
 {
 public:
-	LLTool( const LLString& name, LLToolComposite* composite = NULL );
+	LLTool( const std::string& name, LLToolComposite* composite = NULL );
 	virtual ~LLTool();
 
 	// Hack to support LLFocusMgr
@@ -61,14 +61,17 @@ public:
 	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen);
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen);
+
+	virtual EShowToolTip getShowToolTip() { return SHOW_ALWAYS; }; // tools should permit tips even when the mouse is down, as that's pretty normal for tools
+
 		// Return FALSE to allow context menu to be shown.
 	virtual void	screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const
 							{ *local_x = screen_x; *local_y = screen_y;	}
 	virtual void	localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const
 							{ *screen_x = local_x; *screen_y = local_y;	}
 
-	virtual const LLString& getName() const	{ return mName; }
+	virtual const std::string& getName() const	{ return mName; }
 
 	// New virtual functions
 	virtual LLViewerObject*	getEditingObject()		{ return NULL; }
@@ -99,10 +102,10 @@ public:
 
 protected:
 	LLToolComposite*	mComposite;  // Composite will handle mouse captures.
-	LLString			mName;
+	std::string			mName;
 	
 public:
-	static const LLString sNameNull;
+	static const std::string sNameNull;
 };
 
 #endif
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 6612538..fb23567 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -75,7 +75,7 @@
 	class LLFakeResizeHandle : public LLResizeHandle
 	{
 	public:
-		LLFakeResizeHandle(const LLString& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM )
+		LLFakeResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM )
 		: LLResizeHandle(name, rect, min_width, min_height, corner )
 		{
 			
@@ -169,7 +169,7 @@ BOOL LLToolBar::postBuild()
 	if(mResizeHandle == NULL)
 	{
 		LLRect rect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT);
-		mResizeHandle = new LLFakeResizeHandle(LLString(""), rect, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT);
+		mResizeHandle = new LLFakeResizeHandle(std::string(""), rect, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT);
 		this->addChildAtEnd(mResizeHandle);
 		LLLayoutStack* toolbar_stack = getChild<LLLayoutStack>("toolbar_stack");
 		toolbar_stack->reshape(toolbar_stack->getRect().getWidth() - RESIZE_HANDLE_WIDTH, toolbar_stack->getRect().getHeight());
@@ -191,7 +191,7 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 									 EDragAndDropType cargo_type,
 									 void* cargo_data,
 									 EAcceptance* accept,
-									 LLString& tooltip_msg)
+									 std::string& tooltip_msg)
 {
 	LLButton* inventory_btn = getChild<LLButton>("inventory_btn");
 	if (!inventory_btn) return FALSE;
@@ -356,7 +356,7 @@ void LLToolBar::updateCommunicateList()
 		LLFloaterIMPanel* im_floaterp = (LLFloaterIMPanel*)floater_handle_it->get();
 		if (im_floaterp)
 		{
-			LLString floater_title = im_floaterp->getNumUnreadMessages() > 0 ? "*" : "";
+			std::string floater_title = im_floaterp->getNumUnreadMessages() > 0 ? "*" : "";
 			floater_title.append(im_floaterp->getShortTitle());
 			itemp = communicate_button->add(floater_title, im_floaterp->getSessionID(), ADD_TOP);
 			if (im_floaterp  == frontmost_floater)
diff --git a/linden/indra/newview/lltoolbar.h b/linden/indra/newview/lltoolbar.h
index dcefb98..be0e1b4 100644
--- a/linden/indra/newview/lltoolbar.h
+++ b/linden/indra/newview/lltoolbar.h
@@ -56,7 +56,7 @@ public:
 									 EDragAndDropType cargo_type,
 									 void* cargo_data,
 									 EAcceptance* accept,
-									 LLString& tooltip_msg);
+									 std::string& tooltip_msg);
 
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 89cb0b6..0869cf3 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -89,7 +89,7 @@ const LLColor4 OVERLAY_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
 
 // constructor
 LLToolBrushLand::LLToolBrushLand()
-:	LLTool("Land"),
+:	LLTool(std::string("Land")),
 	mStartingZ( 0.0f ),
 	mMouseX( 0 ),
 	mMouseY(0),
@@ -154,7 +154,7 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
 		regionp->forceUpdate();
 
 		// tell the simulator what we've done
-		F32 seconds = 1.0f / gFPSClamped;
+		F32 seconds = (1.0f / gFPSClamped) * gSavedSettings.getF32("LandBrushForce");
 		F32 x_pos = (F32)pos_region.mV[VX];
 		F32 y_pos = (F32)pos_region.mV[VY];
 		U8 brush_size = (U8)mBrushIndex;
@@ -242,7 +242,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
 	
 		min_region.clamp(0.f, regionp->getWidth());
 		max_region.clamp(0.f, regionp->getWidth());
-		F32 seconds = 1.0f;
+		F32 seconds = gSavedSettings.getF32("LandBrushForce");
 
 		LLSurface &land = regionp->getLand();
 		char action = E_LAND_LEVEL;
@@ -251,21 +251,23 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
 		case 0:
 		//	// average toward mStartingZ
 			action = E_LAND_LEVEL;
-			seconds = 1.f;
+			seconds *= 0.25f;
 			break;
 		case 1:
 			action = E_LAND_RAISE;
+			seconds *= 0.25f;
 			break;
 		case 2:
 			action = E_LAND_LOWER;
+			seconds *= 0.25f;
 			break;
 		case 3:
 			action = E_LAND_SMOOTH;
-			seconds = 10.f;
+			seconds *= 5.0f;
 			break;
 		case 4:
 			action = E_LAND_NOISE;
-			seconds = 0.5f;
+			seconds *= 0.5f;
 			break;
 		case 5:
 			action = E_LAND_REVERT;
@@ -464,6 +466,27 @@ void LLToolBrushLand::render()
 	}
 }
 
+/*
+ * Draw vertical lines from each vertex straight up in world space
+ * with lengths indicating the current "strength" slider.
+ * Decorate the tops and bottoms of the lines like this:
+ *
+ *		Raise        Revert
+ *		/|\           ___
+ *		 |             |
+ *		 |             |
+ *
+ *		Rough        Smooth
+ *		/|\           ___
+ *		 |             |
+ *		 |             |
+ *		\|/..........._|_
+ *
+ *		Lower        Flatten
+ *		 |             |
+ *		 |             |
+ *		\|/..........._|_
+ */
 void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region,
 									const LLVector3& pos_world)
 {
@@ -477,19 +500,55 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region
 	S32 i = (S32) pos_region.mV[VX];
 	S32 j = (S32) pos_region.mV[VY];
 	S32 half_edge = llfloor(LAND_BRUSH_SIZE[mBrushIndex]);
+	S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction");
+	F32 force = gSavedSettings.getF32("LandBrushForce"); // .1 to 100?
 	
-	gGL.begin(LLVertexBuffer::POINTS);
+	gGL.begin(LLVertexBuffer::LINES);
 	for(S32 di = -half_edge; di <= half_edge; di++)
 	{
 		if((i+di) < 0 || (i+di) >= (S32)land.mGridsPerEdge) continue;
 		for(S32 dj = -half_edge; dj <= half_edge; dj++)
 		{
 			if( (j+dj) < 0 || (j+dj) >= (S32)land.mGridsPerEdge ) continue;
-			gGL.vertex3f(pos_world.mV[VX] + di, pos_world.mV[VY] + dj,
-					   land.getZ((i+di)+(j+dj)*land.mGridsPerEdge));
+			const F32 
+				wx = pos_world.mV[VX] + di,
+				wy = pos_world.mV[VY] + dj,
+				wz = land.getZ((i+di)+(j+dj)*land.mGridsPerEdge),
+				norm_dist = sqrt((float)di*di + dj*dj) / half_edge,
+				force_scale = sqrt(2.f) - norm_dist, // 1 at center, 0 at corner
+				wz2 = wz + .2 + (.2 + force/100) * force_scale, // top vertex
+				tic = .075f; // arrowhead size
+			// vertical line
+			gGL.vertex3f(wx, wy, wz);
+			gGL.vertex3f(wx, wy, wz2);
+			if(radioAction == E_LAND_RAISE || radioAction == E_LAND_NOISE) // up arrow
+			{
+				gGL.vertex3f(wx, wy, wz2);
+				gGL.vertex3f(wx+tic, wy, wz2-tic);
+				gGL.vertex3f(wx, wy, wz2);
+				gGL.vertex3f(wx-tic, wy, wz2-tic);
+			}
+			if(radioAction == E_LAND_LOWER || radioAction == E_LAND_NOISE) // down arrow
+			{
+				gGL.vertex3f(wx, wy, wz);
+				gGL.vertex3f(wx+tic, wy, wz+tic);
+				gGL.vertex3f(wx, wy, wz);
+				gGL.vertex3f(wx-tic, wy, wz+tic);
+			}
+			if(radioAction == E_LAND_REVERT || radioAction == E_LAND_SMOOTH) // flat top
+			{
+				gGL.vertex3f(wx-tic, wy, wz2);
+				gGL.vertex3f(wx+tic, wy, wz2);
+			}
+			if(radioAction == E_LAND_LEVEL || radioAction == E_LAND_SMOOTH) // flat bottom
+			{
+				gGL.vertex3f(wx-tic, wy, wz);
+				gGL.vertex3f(wx+tic, wy, wz);
+			}
 		}
 	}
 	gGL.end();
+
 	glPopMatrix();
 }
 
@@ -589,7 +648,7 @@ void LLToolBrushLand::alertNoTerraform(LLViewerRegion* regionp)
 {
 	if (!regionp) return;
 	
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[REGION]"] = regionp->getName();
 	gViewerWindow->alertXml("RegionNoTerraforming", args);
 
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index f840a15..26f0bac 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -84,7 +84,7 @@ void LLToolComposite::setCurrentTool( LLTool* new_tool )
 	}
 }
 
-LLToolComposite::LLToolComposite(const LLString& name)
+LLToolComposite::LLToolComposite(const std::string& name)
 	: LLTool(name),
 	  mCur(NULL), mDefault(NULL), mSelected(FALSE),
 	  mMouseDown(FALSE), mManip(NULL), mSelectRect(NULL)
@@ -129,7 +129,7 @@ void LLToolComposite::handleSelect()
 //----------------------------------------------------------------------------
 
 LLToolCompInspect::LLToolCompInspect()
-: LLToolComposite("Inspect")
+: LLToolComposite(std::string("Inspect"))
 {
 	mSelectRect		= new LLToolSelectRect(this);
 	mDefault = mSelectRect;
@@ -145,18 +145,18 @@ LLToolCompInspect::~LLToolCompInspect()
 BOOL LLToolCompInspect::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	mMouseDown = TRUE;
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback);
 	return TRUE;
 }
 
-void LLToolCompInspect::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompInspect::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj = pick_info.getObject();
 
 	if (!LLToolCompInspect::getInstance()->mMouseDown)
 	{
 		// fast click on object, but mouse is already up...just do select
-		LLToolCompInspect::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+		LLToolCompInspect::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
 		return;
 	}
 
@@ -167,13 +167,13 @@ void LLToolCompInspect::pickCallback(S32 x, S32 y, MASK mask)
 			LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
 		}
 		LLToolCompInspect::getInstance()->setCurrentTool( LLToolCompInspect::getInstance()->mSelectRect );
-		LLToolCompInspect::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
+		LLToolCompInspect::getInstance()->mSelectRect->handlePick( pick_info );
 
 	}
 	else
 	{
 		LLToolCompInspect::getInstance()->setCurrentTool( LLToolCompInspect::getInstance()->mSelectRect );
-		LLToolCompInspect::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
+		LLToolCompInspect::getInstance()->mSelectRect->handlePick( pick_info );
 	}
 }
 
@@ -187,7 +187,7 @@ BOOL LLToolCompInspect::handleDoubleClick(S32 x, S32 y, MASK mask)
 //----------------------------------------------------------------------------
 
 LLToolCompTranslate::LLToolCompTranslate()
-	: LLToolComposite("Move")
+	: LLToolComposite(std::string("Move"))
 {
 	mManip		= new LLManipTranslate(this);
 	mSelectRect		= new LLToolSelectRect(this);
@@ -218,19 +218,19 @@ BOOL LLToolCompTranslate::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	mMouseDown = TRUE;
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback, TRUE);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback, TRUE);
 	return TRUE;
 }
 
-void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompTranslate::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj = pick_info.getObject();
 
-	LLToolCompTranslate::getInstance()->mManip->highlightManipulators(x, y);
+	LLToolCompTranslate::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);
 	if (!LLToolCompTranslate::getInstance()->mMouseDown)
 	{
 		// fast click on object, but mouse is already up...just do select
-		LLToolCompTranslate::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+		LLToolCompTranslate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
 		return;
 	}
 
@@ -246,12 +246,12 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
 		if(	LLManip::LL_NO_PART != LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() && can_move)
 		{
 			LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mManip );
-			LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
+			LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );
 		}
 		else
 		{
 			LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );
-			LLToolCompTranslate::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
+			LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );
 
 			// *TODO: add toggle to trigger old click-drag functionality
 			// LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( XY_part, x, y, mask);
@@ -260,7 +260,7 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
 	else
 	{
 		LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );
-		LLToolCompTranslate::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
+		LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );
 	}
 }
 
@@ -314,7 +314,7 @@ void LLToolCompTranslate::render()
 // LLToolCompScale
 
 LLToolCompScale::LLToolCompScale()
-	: LLToolComposite("Stretch")
+	: LLToolComposite(std::string("Stretch"))
 {
 	mManip = new LLManipScale(this);
 	mSelectRect = new LLToolSelectRect(this);
@@ -342,19 +342,19 @@ BOOL LLToolCompScale::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompScale::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	mMouseDown = TRUE;
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback);
 	return TRUE;
 }
 
-void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompScale::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj = pick_info.getObject();
 
-	LLToolCompScale::getInstance()->mManip->highlightManipulators(x, y);
+	LLToolCompScale::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);
 	if (!LLToolCompScale::getInstance()->mMouseDown)
 	{
 		// fast click on object, but mouse is already up...just do select
-		LLToolCompScale::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+		LLToolCompScale::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
 
 		return;
 	}
@@ -368,18 +368,18 @@ void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
 		if(	LLManip::LL_NO_PART != LLToolCompScale::getInstance()->mManip->getHighlightedPart() )
 		{
 			LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mManip );
-			LLToolCompScale::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
+			LLToolCompScale::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );
 		}
 		else
 		{
 			LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );
-			LLToolCompScale::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
+			LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );
 		}
 	}
 	else
 	{
 		LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );
-		LLToolCompScale::getInstance()->mCur->handleMouseDown( x, y, mask );
+		LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );
 	}
 }
 
@@ -434,7 +434,7 @@ void LLToolCompScale::render()
 // LLToolCompCreate
 
 LLToolCompCreate::LLToolCompCreate()
-	: LLToolComposite("Create")
+	: LLToolComposite(std::string("Create"))
 {
 	mPlacer = new LLToolPlacer();
 	mSelectRect = new LLToolSelectRect(this);
@@ -457,15 +457,15 @@ BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
 	BOOL handled = FALSE;
 	mMouseDown = TRUE;
 
-	if ( !(mask == MASK_SHIFT) && !(mask == MASK_CONTROL) )
+	if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
 	{
-		setCurrentTool( mPlacer );
-		handled = mPlacer->placeObject( x, y, mask );
+		gViewerWindow->pickAsync(x, y, mask, pickCallback);
+		handled = TRUE;
 	}
 	else
 	{
-		gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
-		handled = TRUE;
+		setCurrentTool( mPlacer );
+		handled = mPlacer->placeObject( x, y, mask );
 	}
 	
 	mObjectPlacedOnMouseDown = TRUE;
@@ -473,15 +473,15 @@ BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 
-void LLToolCompCreate::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompCreate::pickCallback(const LLPickInfo& pick_info)
 {
 	// *NOTE: We mask off shift and control, so you cannot
 	// multi-select multiple objects with the create tool.
-	mask = (mask & ~MASK_SHIFT);
+	MASK mask = (pick_info.mKeyMask & ~MASK_SHIFT);
 	mask = (mask & ~MASK_CONTROL);
 
 	LLToolCompCreate::getInstance()->setCurrentTool( LLToolCompCreate::getInstance()->mSelectRect );
-	LLToolCompCreate::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
+	LLToolCompCreate::getInstance()->mSelectRect->handlePick( pick_info );
 }
 
 BOOL LLToolCompCreate::handleDoubleClick(S32 x, S32 y, MASK mask)
@@ -514,7 +514,7 @@ BOOL LLToolCompCreate::handleMouseUp(S32 x, S32 y, MASK mask)
 // LLToolCompRotate
 
 LLToolCompRotate::LLToolCompRotate()
-	: LLToolComposite("Rotate")
+	: LLToolComposite(std::string("Rotate"))
 {
 	mManip = new LLManipRotate(this);
 	mSelectRect = new LLToolSelectRect(this);
@@ -543,19 +543,19 @@ BOOL LLToolCompRotate::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	mMouseDown = TRUE;
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback);
 	return TRUE;
 }
 
-void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompRotate::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj = pick_info.getObject();
 
-	LLToolCompRotate::getInstance()->mManip->highlightManipulators(x, y);
+	LLToolCompRotate::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);
 	if (!LLToolCompRotate::getInstance()->mMouseDown)
 	{
 		// fast click on object, but mouse is already up...just do select
-		LLToolCompRotate::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+		LLToolCompRotate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
 		return;
 	}
 	
@@ -568,18 +568,18 @@ void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
 		if(	LLManip::LL_NO_PART != LLToolCompRotate::getInstance()->mManip->getHighlightedPart() )
 		{
 			LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mManip );
-			LLToolCompRotate::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
+			LLToolCompRotate::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );
 		}
 		else
 		{
 			LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );
-			LLToolCompRotate::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
+			LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );
 		}
 	}
 	else
 	{
 		LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );
-		LLToolCompRotate::getInstance()->mCur->handleMouseDown( x, y, mask );
+		LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );
 	}
 }
 
@@ -633,11 +633,11 @@ void LLToolCompRotate::render()
 // LLToolCompGun
 
 LLToolCompGun::LLToolCompGun()
-	: LLToolComposite("Mouselook")
+	: LLToolComposite(std::string("Mouselook"))
 {
 	mGun = new LLToolGun(this);
 	mGrab = new LLToolGrab(this);
-	mNull = new LLTool("null", this);
+	mNull = new LLTool(std::string("null"), this);
 
 	setCurrentTool(mGun);
 	mDefault = mGun;
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index 929a7e6..0fd13fe 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -37,6 +37,7 @@
 class LLManip;
 class LLToolSelectRect;
 class LLToolPlacer;
+class LLPickInfo;
 
 class LLView;
 class LLTextBox;
@@ -47,7 +48,7 @@ class LLTextBox;
 class LLToolComposite : public LLTool
 {
 public:
-	LLToolComposite(const LLString& name);
+	LLToolComposite(const std::string& name);
 
     virtual BOOL			handleMouseDown(S32 x, S32 y, MASK mask) = 0;	// Sets the current tool
     virtual BOOL			handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
@@ -97,7 +98,7 @@ protected:
 	LLToolSelectRect*		mSelectRect;
 
 public:
-	static const LLString sNameComp;
+	static const std::string sNameComp;
 };
 
 
@@ -114,7 +115,7 @@ public:
     virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
     virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 };
 
 //-----------------------------------------------------------------------
@@ -135,7 +136,7 @@ public:
 
 	virtual LLTool*		getOverrideTool(MASK mask);
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 };
 
 //-----------------------------------------------------------------------
@@ -156,7 +157,7 @@ public:
 
 	virtual LLTool*		getOverrideTool(MASK mask);
 	
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 };
 
 
@@ -178,7 +179,7 @@ public:
 
 	virtual LLTool*		getOverrideTool(MASK mask);
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 
 protected:
 };
@@ -197,7 +198,7 @@ public:
     virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
 	
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 protected:
 	LLToolPlacer*		mPlacer;
 	BOOL				mObjectPlacedOnMouseDown;
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index c492c7b..39070b7 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -42,6 +42,7 @@
 #include "llfirstuse.h"
 #include "llfloater.h"
 #include "llfloatertools.h"
+#include "llfocusmgr.h"
 #include "llgesturemgr.h"
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
@@ -52,6 +53,7 @@
 #include "llpreviewnotecard.h"
 #include "llselectmgr.h"
 #include "lltoolmgr.h"
+#include "lltrans.h"
 #include "llui.h"
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
@@ -70,10 +72,6 @@
 // or 18 * count < 1200 => count < 1200/18 => 66. I've cut it down a
 // bit from there to give some pad.
 const S32 MAX_ITEMS = 42;
-const char* FOLDER_INCLUDES_ATTACHMENTS_BEING_WORN = 
-				"Cannot give folders that contain objects that are attached to you.\n"
-				"Detach the object(s) and then try again.";
-
 
 // syntactic sugar
 #define callMemberFunction(object,ptrToMember)  ((object).*(ptrToMember))
@@ -127,41 +125,17 @@ protected:
 };
 
 bool LLDroppableItem::operator()(LLInventoryCategory* cat,
-								 LLInventoryItem* item)
+				 LLInventoryItem* item)
 {
 	bool allowed = false;
 	if(item)
 	{
-		LLVOAvatar* my_avatar = NULL;
-		switch(item->getType())
-		{
-		case LLAssetType::AT_CALLINGCARD:
-			// not allowed
-			break;
-
-		case LLAssetType::AT_OBJECT:
-			my_avatar = gAgent.getAvatarObject();
-			if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))
-			{
-				allowed = true;
-			}
-			break;
+		allowed = itemTransferCommonlyAllowed(item);
 
-		case LLAssetType::AT_BODYPART:
-		case LLAssetType::AT_CLOTHING:
-			if(!gAgent.isWearingItem(item->getUUID()))
-			{
-				allowed = true;
-			}
-			break;
-
-		default:
-			allowed = true;
-			break;
-		}
-		if(mIsTransfer
+		if(allowed
+		   && mIsTransfer
 		   && !item->getPermissions().allowOperationBy(PERM_TRANSFER,
-													   gAgent.getID()))
+							       gAgent.getID()))
 		{
 			allowed = false;
 		}
@@ -182,45 +156,18 @@ public:
 };
 
 bool LLUncopyableItems::operator()(LLInventoryCategory* cat,
-								   LLInventoryItem* item)
+				   LLInventoryItem* item)
 {
-	BOOL uncopyable = FALSE;
+	bool uncopyable = false;
 	if(item)
 	{
-		BOOL allowed = FALSE;
-		LLVOAvatar* my_avatar = NULL;
-		switch(item->getType())
-		{
-		case LLAssetType::AT_CALLINGCARD:
-			// not allowed
-			break;
-
-		case LLAssetType::AT_OBJECT:
-			my_avatar = gAgent.getAvatarObject();
-			if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))
-			{
-				allowed = TRUE;
-			}
-			break;
-
-		case LLAssetType::AT_BODYPART:
-		case LLAssetType::AT_CLOTHING:
-			if(!gAgent.isWearingItem(item->getUUID()))
-			{
-				allowed = TRUE;
-			}
-			break;
-
-		default:
-			allowed = TRUE;
-			break;
-		}
-		if(allowed && !item->getPermissions().allowCopyBy(gAgent.getID()))
+		if (itemTransferCommonlyAllowed(item) &&
+		   !item->getPermissions().allowCopyBy(gAgent.getID()))
 		{
-			uncopyable = TRUE;
+			uncopyable = true;
 		}
 	}
-	return (uncopyable ? true : false);
+	return uncopyable;
 }
 
 class LLDropCopyableItems : public LLInventoryCollectFunctor
@@ -233,45 +180,21 @@ public:
 
 
 bool LLDropCopyableItems::operator()(
-	LLInventoryCategory* cat, LLInventoryItem* item)
+	LLInventoryCategory* cat,
+	LLInventoryItem* item)
 {
-	BOOL allowed = FALSE;
+	bool allowed = false;
 	if(item)
 	{
-		LLVOAvatar* my_avatar = NULL;
-		switch(item->getType())
-		{
-		case LLAssetType::AT_CALLINGCARD:
-			// not allowed
-			break;
-
-		case LLAssetType::AT_OBJECT:
-			my_avatar = gAgent.getAvatarObject();
-			if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))
-			{
-				allowed = TRUE;
-			}
-			break;
-
-		case LLAssetType::AT_BODYPART:
-		case LLAssetType::AT_CLOTHING:
-			if(!gAgent.isWearingItem(item->getUUID()))
-			{
-				allowed = TRUE;
-			}
-			break;
-
-		default:
-			allowed = TRUE;
-			break;
-		}
-		if(allowed && !item->getPermissions().allowCopyBy(gAgent.getID()))
+		allowed = itemTransferCommonlyAllowed(item);
+		if(allowed &&
+		   !item->getPermissions().allowCopyBy(gAgent.getID()))
 		{
 			// whoops, can't copy it - don't allow it.
-			allowed = FALSE;
+			allowed = false;
 		}
 	}
-	return (allowed ? true : false);
+	return allowed;
 }
 
 class LLGiveable : public LLInventoryCollectFunctor
@@ -289,48 +212,26 @@ protected:
 bool LLGiveable::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 {
 	// All categories can be given.
-	if(cat) return TRUE;
-	BOOL allowed = FALSE;
+	if (cat)
+		return true;
+
+	bool allowed = false;
 	if(item)
 	{
-		LLVOAvatar* my_avatar = NULL;
-		switch(item->getType())
-		{
-		case LLAssetType::AT_CALLINGCARD:
-			// not allowed
-			break;
-
-		case LLAssetType::AT_OBJECT:
-			my_avatar = gAgent.getAvatarObject();
-			if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))
-			{
-				allowed = TRUE;
-			}
-			break;
-
-		case LLAssetType::AT_BODYPART:
-		case LLAssetType::AT_CLOTHING:
-			if(!gAgent.isWearingItem(item->getUUID()))
-			{
-				allowed = TRUE;
-			}
-			break;
-
-		default:
-			allowed = TRUE;
-			break;
-		}
-		if(!item->getPermissions().allowOperationBy(PERM_TRANSFER,
-													gAgent.getID()))
+		allowed = itemTransferCommonlyAllowed(item);
+		if(allowed &&
+		   !item->getPermissions().allowOperationBy(PERM_TRANSFER,
+							    gAgent.getID()))
 		{
 			allowed = FALSE;
 		}
-		if(allowed && !item->getPermissions().allowCopyBy(gAgent.getID()))
+		if(allowed &&
+		   !item->getPermissions().allowCopyBy(gAgent.getID()))
 		{
 			++mCountLosing;
 		}
 	}
-	return (allowed ? true : false);
+	return allowed;
 }
 
 class LLCategoryFireAndForget : public LLInventoryFetchComboObserver
@@ -569,8 +470,7 @@ LLToolDragAndDrop::dragOrDrop3dImpl LLToolDragAndDrop::sDragAndDrop3d[DAD_COUNT]
 };
 
 LLToolDragAndDrop::LLToolDragAndDrop()
-	 :
-	 LLTool("draganddrop", NULL),
+:	 LLTool(std::string("draganddrop"), NULL),
 	 mDragStartX(0),
 	 mDragStartY(0),
 	 mSource(SOURCE_AGENT),
@@ -688,7 +588,7 @@ void LLToolDragAndDrop::beginMultiDrag(
 	mCursor = UI_CURSOR_NO;
 	if((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY))
 	{
-		// find cats in the cargo.
+		// find categories (i.e. inventory folders) in the cargo.
 		LLInventoryCategory* cat = NULL;
 		S32 count = llmin(cargo_ids.size(), types.size());
 		std::set<LLUUID> cat_ids;
@@ -737,7 +637,7 @@ void LLToolDragAndDrop::endDrag()
 
 void LLToolDragAndDrop::onMouseCaptureLost()
 {
-	// Called whenever the drag ends or if mouse captue is simply lost
+	// Called whenever the drag ends or if mouse capture is simply lost
 	LLToolMgr::getInstance()->clearTransientTool();
 	mCargoTypes.clear();
 	mCargoIDs.clear();
@@ -757,11 +657,8 @@ BOOL LLToolDragAndDrop::handleMouseUp( S32 x, S32 y, MASK mask )
 	return TRUE;
 }
 
-BOOL LLToolDragAndDrop::handleHover( S32 x, S32 y, MASK mask )
+ECursorType LLToolDragAndDrop::acceptanceToCursor( EAcceptance acceptance )
 {
-	EAcceptance acceptance = ACCEPT_NO;
-	dragOrDrop( x, y, mask, FALSE, &acceptance );
-
 	switch( acceptance )
 	{
 	case ACCEPT_YES_MULTI:
@@ -774,8 +671,16 @@ BOOL LLToolDragAndDrop::handleHover( S32 x, S32 y, MASK mask )
 			mCursor = UI_CURSOR_ARROWDRAG;
 		}
 		break;
-	case ACCEPT_YES_SINGLE: 
-		mCursor = UI_CURSOR_ARROWDRAG;
+	case ACCEPT_YES_SINGLE:
+		if (mCargoIDs.size() > 1)
+		{
+			mToolTipMsg = LLTrans::getString("TooltipMustSingleDrop");
+			mCursor = UI_CURSOR_NO;
+		}
+		else
+		{
+			mCursor = UI_CURSOR_ARROWDRAG;
+		}
 		break;
 
 	case ACCEPT_NO_LOCKED:
@@ -797,7 +702,15 @@ BOOL LLToolDragAndDrop::handleHover( S32 x, S32 y, MASK mask )
 		}
 		break;
 	case ACCEPT_YES_COPY_SINGLE:
-		mCursor = UI_CURSOR_ARROWCOPY;
+		if (mCargoIDs.size() > 1)
+		{
+			mToolTipMsg = LLTrans::getString("TooltipMustSingleDrop");
+			mCursor = UI_CURSOR_NO;
+		}
+		else
+		{
+			mCursor = UI_CURSOR_ARROWCOPY;
+		}
 		break;
 	case ACCEPT_POSTPONED:
 		break;
@@ -805,7 +718,17 @@ BOOL LLToolDragAndDrop::handleHover( S32 x, S32 y, MASK mask )
 		llassert( FALSE );
 	}
 
-	gViewerWindow->getWindow()->setCursor( mCursor );
+	return mCursor;
+}
+
+BOOL LLToolDragAndDrop::handleHover( S32 x, S32 y, MASK mask )
+{
+	EAcceptance acceptance = ACCEPT_NO;
+	dragOrDrop( x, y, mask, FALSE, &acceptance );
+
+	ECursorType cursor = acceptanceToCursor(acceptance);
+	gViewerWindow->getWindow()->setCursor( cursor );
+
 	lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolDragAndDrop" << llendl;
 	return TRUE;
 }
@@ -822,12 +745,12 @@ BOOL LLToolDragAndDrop::handleKey(KEY key, MASK mask)
 	return FALSE;
 }
 
-BOOL LLToolDragAndDrop::handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_rect_screen)
+BOOL LLToolDragAndDrop::handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen)
 {
 	if (!mToolTipMsg.empty())
 	{
 		msg = mToolTipMsg;
-		//*stick_rect_screen = gViewerWindow->getWindowRect();
+		//*sticky_rect_screen = gViewerWindow->getWindowRect();
 		return TRUE;
 	}
 	return FALSE;
@@ -846,11 +769,11 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
 
 	BOOL handled = FALSE;
 
-	LLView* top_view = gViewerWindow->getTopCtrl();
+	LLView* top_view = gFocusMgr.getTopCtrl();
 	LLViewerInventoryItem* item;
 	LLViewerInventoryCategory* cat;
 
-	mToolTipMsg.assign("");
+	mToolTipMsg.clear();
 
 	if(top_view)
 	{
@@ -885,17 +808,15 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
 		// all objects passed, go ahead and perform drop if necessary
 		if (handled && drop && (U32)*acceptance >= ACCEPT_YES_COPY_SINGLE)
 		{
-			// drop all items
-			if ((U32)*acceptance >= ACCEPT_YES_COPY_MULTI)
+			if ((U32)*acceptance < ACCEPT_YES_COPY_MULTI &&
+			    mCargoIDs.size() > 1)
 			{
-				mCurItemIndex = 0;
-			}
-			// drop just last item
-			else
-			{
-				mCurItemIndex = mCargoIDs.size() - 1;
+				// tried to give multi-cargo to a single-acceptor - refuse and return.
+				*acceptance = ACCEPT_NO;
+				return;
 			}
-			for (; mCurItemIndex < (S32)mCargoIDs.size(); mCurItemIndex++)
+
+			for (mCurItemIndex = 0; mCurItemIndex < (S32)mCargoIDs.size(); mCurItemIndex++)
 			{
 				LLInventoryObject* cargo = locateInventory(item, cat);
 
@@ -944,30 +865,26 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
 		// all objects passed, go ahead and perform drop if necessary
 		if (handled && drop && (U32)*acceptance > ACCEPT_NO_LOCKED)
 		{	
-			// drop all items
-			if ((U32)*acceptance >= ACCEPT_YES_COPY_MULTI)
+			if ((U32)*acceptance < ACCEPT_YES_COPY_MULTI &&
+			    mCargoIDs.size() > 1)
 			{
-				mCurItemIndex = 0;
-			}
-			// drop just last item
-			else
-			{
-				mCurItemIndex = mCargoIDs.size() - 1;
+				// tried to give multi-cargo to a single-acceptor - refuse and return.
+				*acceptance = ACCEPT_NO;
+				return;
 			}
-			for (; mCurItemIndex < (S32)mCargoIDs.size(); mCurItemIndex++)
+
+			for (mCurItemIndex = 0; mCurItemIndex < (S32)mCargoIDs.size(); mCurItemIndex++)
 			{
 				LLInventoryObject* cargo = locateInventory(item, cat);
 
 				if (cargo)
 				{
-					//S32 local_x, local_y;
-
 					EAcceptance item_acceptance;
 					handled = handled && root_view->handleDragAndDrop(x, y, mask, TRUE,
-														mCargoTypes[mCurItemIndex],
-														(void*)cargo,
-														&item_acceptance,
-														mToolTipMsg);
+											  mCargoTypes[mCurItemIndex],
+											  (void*)cargo,
+											  &item_acceptance,
+											  mToolTipMsg);
 				}
 			}
 		}
@@ -989,32 +906,37 @@ void LLToolDragAndDrop::dragOrDrop3D( S32 x, S32 y, MASK mask, BOOL drop, EAccep
 	mDrop = drop;
 	if (mDrop)
 	{
-		gPickFaces = TRUE;
 		// don't allow drag and drop onto transparent objects
-		gViewerWindow->hitObjectOrLandGlobalImmediate(x, y, pickCallback, FALSE);
+		pickCallback(gViewerWindow->pickImmediate(x, y, FALSE));
 	}
 	else
 	{
-		// Don't pick faces during hover.  Nothing currently requires per-face
-		// data.
 		// don't allow drag and drop onto transparent objects
-		gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback, FALSE);
+		gViewerWindow->pickAsync(x, y, mask, pickCallback, FALSE);
 	}
 
 	*acceptance = mLastAccept;
 }
 
-void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolDragAndDrop::pickCallback(const LLPickInfo& pick_info)
 {
 	EDropTarget target = DT_NONE;
 	S32	hit_face = -1;
 
-	LLViewerObject* hit_obj = gViewerWindow->lastNonFloraObjectHit();
+	LLViewerObject* hit_obj = pick_info.getObject();
 	LLSelectMgr::getInstance()->unhighlightAll();
 
 	// Treat attachments as part of the avatar they are attached to.
 	if (hit_obj)
 	{
+		// don't allow drag and drop on grass, trees, etc.
+		if(pick_info.mPickType == LLPickInfo::PICK_FLORA)
+		{
+			LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_NO;
+			gViewerWindow->getWindow()->setCursor( LLToolDragAndDrop::getInstance()->mCursor );
+			return;
+		}
+
 		if(hit_obj->isAttachment() && !hit_obj->isHUDAttachment())
 		{
 			LLVOAvatar* avatar = LLVOAvatar::findAvatarFromAttachment( hit_obj );
@@ -1045,12 +967,12 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
 		else
 		{
 			target = DT_OBJECT;
-			hit_face = gLastHitNonFloraObjectFace;
+			hit_face = pick_info.mObjectFace;
 			// if any item being dragged will be applied to the object under our cursor
 			// highlight that object
 			for (S32 i = 0; i < (S32)LLToolDragAndDrop::getInstance()->mCargoIDs.size(); i++)
 			{
-				if (LLToolDragAndDrop::getInstance()->mCargoTypes[i] != DAD_OBJECT || (mask & MASK_CONTROL))
+				if (LLToolDragAndDrop::getInstance()->mCargoTypes[i] != DAD_OBJECT || (pick_info.mKeyMask & MASK_CONTROL))
 				{
 					LLSelectMgr::getInstance()->highlightObjectAndFamily(hit_obj);
 					break;
@@ -1058,7 +980,7 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
 			}
 		}
 	}
-	else if(gLastHitLand)
+	else if(pick_info.mPickType == LLPickInfo::PICK_LAND)
 	{
 		target = DT_LAND;
 		hit_face = -1;
@@ -1074,79 +996,39 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
 			(U32)LLToolDragAndDrop::getInstance()->mLastAccept,
 			(U32)callMemberFunction((*LLToolDragAndDrop::getInstance()), 
 				LLToolDragAndDrop::getInstance()->sDragAndDrop3d[LLToolDragAndDrop::getInstance()->mCargoTypes[LLToolDragAndDrop::getInstance()->mCurItemIndex]][target])
-				(hit_obj, hit_face, mask, FALSE));
+				(hit_obj, hit_face, pick_info.mKeyMask, FALSE));
 	}
 
-	if (LLToolDragAndDrop::getInstance()->mDrop && (U32)LLToolDragAndDrop::getInstance()->mLastAccept >= ACCEPT_YES_COPY_SINGLE)
+	if (LLToolDragAndDrop::getInstance()->mDrop &&
+	    (U32)LLToolDragAndDrop::getInstance()->mLastAccept >= ACCEPT_YES_COPY_SINGLE)
 	{
-		// if target allows multi-drop, go ahead and start iteration at beginning of cargo list
-		if (LLToolDragAndDrop::getInstance()->mLastAccept >= ACCEPT_YES_COPY_MULTI)
+		// if target allows multi-drop or there is only one item being dropped, go ahead
+		if (LLToolDragAndDrop::getInstance()->mLastAccept >= ACCEPT_YES_COPY_MULTI ||
+		    LLToolDragAndDrop::getInstance()->mCargoIDs.size() == 1)
 		{
-			LLToolDragAndDrop::getInstance()->mCurItemIndex = 0;
+			// Target accepts multi, or cargo is a single-drop
+			for (LLToolDragAndDrop::getInstance()->mCurItemIndex = 0;
+			     LLToolDragAndDrop::getInstance()->mCurItemIndex < (S32)LLToolDragAndDrop::getInstance()->mCargoIDs.size(); 
+			     LLToolDragAndDrop::getInstance()->mCurItemIndex++)
+			{
+				// Call the right implementation function
+				(U32)callMemberFunction((*LLToolDragAndDrop::getInstance()), 
+							LLToolDragAndDrop::getInstance()->sDragAndDrop3d[LLToolDragAndDrop::getInstance()->mCargoTypes[LLToolDragAndDrop::getInstance()->mCurItemIndex]][target])
+					(hit_obj, hit_face, pick_info.mKeyMask, TRUE);
+			}
 		}
-		// otherwise start at end, to follow selection rules (last selected item is most current)
 		else
 		{
-			LLToolDragAndDrop::getInstance()->mCurItemIndex = LLToolDragAndDrop::getInstance()->mCargoIDs.size() - 1;
-		}
-
-		for (; LLToolDragAndDrop::getInstance()->mCurItemIndex < (S32)LLToolDragAndDrop::getInstance()->mCargoIDs.size(); 
-			LLToolDragAndDrop::getInstance()->mCurItemIndex++)
-		{
-			// Call the right implementation function
-			(U32)callMemberFunction((*LLToolDragAndDrop::getInstance()), 
-				LLToolDragAndDrop::getInstance()->sDragAndDrop3d[LLToolDragAndDrop::getInstance()->mCargoTypes[LLToolDragAndDrop::getInstance()->mCurItemIndex]][target])
-				(hit_obj, hit_face, mask, TRUE);
+			// Target does not accept multi, but cargo is multi
+			LLToolDragAndDrop::getInstance()->mLastAccept = ACCEPT_NO;
 		}
 	}
 
-	switch( LLToolDragAndDrop::getInstance()->mLastAccept )
-	{
-	case ACCEPT_YES_MULTI: 
-		if (LLToolDragAndDrop::getInstance()->mCargoIDs.size() > 1)
-		{
-			LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWDRAGMULTI;
-		}
-		else
-		{
-			LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWDRAG;
-		}
-		break;
-	case ACCEPT_YES_SINGLE: 
-		LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWDRAG;
-		break;
+	ECursorType cursor = LLToolDragAndDrop::getInstance()->acceptanceToCursor( LLToolDragAndDrop::getInstance()->mLastAccept );
+	gViewerWindow->getWindow()->setCursor( cursor );
 
-	case ACCEPT_NO_LOCKED:
-		LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_NOLOCKED;
-		break;
-
-	case ACCEPT_NO:
-		LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_NO;
-		break;
-
-	case ACCEPT_YES_COPY_MULTI:
-	if (LLToolDragAndDrop::getInstance()->mCargoIDs.size() > 1)
-		{
-			LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWCOPYMULTI;
-		}
-		else
-		{
-			LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWCOPY;
-		}
-		break;
-	case ACCEPT_YES_COPY_SINGLE:
-		LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWCOPY;
-		break;
-	case ACCEPT_POSTPONED:
-		break;
-	default:
-		llassert( FALSE );
-	}
-
-	LLToolDragAndDrop::getInstance()->mLastHitPos = gLastHitPosGlobal + gLastHitObjectOffset;
+	LLToolDragAndDrop::getInstance()->mLastHitPos = pick_info.mPosGlobal;
 	LLToolDragAndDrop::getInstance()->mLastCameraPos = gAgent.getCameraPositionGlobal();
-
-	gViewerWindow->getWindow()->setCursor( LLToolDragAndDrop::getInstance()->mCursor );
 }
 
 // static
@@ -1169,7 +1051,7 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
 	if (hit_obj->isInventoryDirty())
 	{
 		hit_obj->fetchInventoryFromServer();
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[ERROR_MESSAGE]"] = "Unable to add texture.\nPlease wait a few seconds and try again.";
 		gViewerWindow->alertXml("ErrorMessage", args);
 		return FALSE;
@@ -1225,7 +1107,7 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
 	else if(!item->getPermissions().allowOperationBy(PERM_TRANSFER,
 													 gAgent.getID()))
 	{
-		// Check that we can add the testure as inventory to the object
+		// Check that we can add the texture as inventory to the object
 		if (willObjectAcceptInventory(hit_obj,item) < ACCEPT_YES_COPY_SINGLE )
 		{
 			return FALSE;
@@ -1546,7 +1428,7 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
 	}
 
 	LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-	S32 creation_date = time_corrected();
+	time_t creation_date = time_corrected();
 	new_item->setCreationDate(creation_date);
 
 	if(!item->getPermissions().allowCopyBy(gAgent.getID()))
@@ -1601,7 +1483,7 @@ struct LLGiveInventoryInfo
 };
 
 void LLToolDragAndDrop::giveInventory(const LLUUID& to_agent,
-									  LLInventoryItem* item)
+				      LLInventoryItem* item)
 {
 	llinfos << "LLToolDragAndDrop::giveInventory()" << llendl;
 	if(!isInventoryGiveAcceptable(item))
@@ -1617,11 +1499,11 @@ void LLToolDragAndDrop::giveInventory(const LLUUID& to_agent,
 	{
 		// ask if the agent is sure.
 		LLGiveInventoryInfo* info = new LLGiveInventoryInfo(to_agent,
-															item->getUUID());
+								    item->getUUID());
 
 		gViewerWindow->alertXml("CannotCopyWarning",
-								  &LLToolDragAndDrop::handleCopyProtectedItem,
-								  (void*)info);
+					&LLToolDragAndDrop::handleCopyProtectedItem,
+					(void*)info);
 	}
 }
 
@@ -1674,8 +1556,8 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
 		FALSE,
 		gAgent.getSessionID(),
 		to_agent,
-		name.c_str(),
-		item->getName().c_str(),
+		name,
+		item->getName(),
 		IM_ONLINE,
 		IM_INVENTORY_OFFERED,
 		transaction_id,
@@ -1756,7 +1638,7 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
 		{
 			LLGiveInventoryInfo* info = NULL;
 			info = new LLGiveInventoryInfo(to_agent, cat->getUUID());
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[COUNT]"] = llformat("%d",giveable.countNoCopy());
 			gViewerWindow->alertXml("CannotCopyCountItems", args,
 				&LLToolDragAndDrop::handleCopyProtectedCategory,
@@ -1877,8 +1759,8 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
 			FALSE,
 			gAgent.getSessionID(),
 			to_agent,
-			name.c_str(),
-			cat->getName().c_str(),
+			name,
+			cat->getName(),
 			IM_ONLINE,
 			IM_INVENTORY_OFFERED,
 			transaction_id,
@@ -1916,11 +1798,13 @@ BOOL LLToolDragAndDrop::isInventoryGiveAcceptable(LLInventoryItem* item)
 	}
 	BOOL copyable = FALSE;
 	if(item->getPermissions().allowCopyBy(gAgent.getID())) copyable = TRUE;
+
 	LLVOAvatar* my_avatar = gAgent.getAvatarObject();
 	if(!my_avatar)
 	{
 		return FALSE;
 	}
+
 	BOOL acceptable = TRUE;
 	switch(item->getType())
 	{
@@ -2990,11 +2874,11 @@ LLInventoryObject* LLToolDragAndDrop::locateMultipleInventory(LLViewerInventoryC
 }
 */
 
-void LLToolDragAndDrop::createContainer(LLViewerInventoryItem::item_array_t &items, const char* preferred_name )
-{
-	llwarns << "LLToolDragAndDrop::createContainer()" << llendl;
-	return;
-}
+// void LLToolDragAndDrop::createContainer(LLViewerInventoryItem::item_array_t &items, const char* preferred_name )
+// {
+// 	llwarns << "LLToolDragAndDrop::createContainer()" << llendl;
+// 	return;
+// }
 
 
 // utility functions
diff --git a/linden/indra/newview/lltooldraganddrop.h b/linden/indra/newview/lltooldraganddrop.h
index eb99aa9..7e96b81 100644
--- a/linden/indra/newview/lltooldraganddrop.h
+++ b/linden/indra/newview/lltooldraganddrop.h
@@ -45,6 +45,7 @@
 class LLToolDragAndDrop;
 class LLViewerRegion;
 class LLVOAvatar;
+class LLPickInfo;
 
 class LLToolDragAndDrop : public LLTool, public LLSingleton<LLToolDragAndDrop>
 {
@@ -55,7 +56,7 @@ public:
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleKey(KEY key, MASK mask);
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_rect_screen);
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen);
 	virtual void	onMouseCaptureLost();
 	virtual void	handleDeselect();
 
@@ -106,7 +107,7 @@ protected:
 					EAcceptance* acceptance);
 	void dragOrDrop3D(S32 x, S32 y, MASK mask, BOOL drop,
 					  EAcceptance* acceptance);
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 
 protected:
 
@@ -127,7 +128,7 @@ protected:
 	EAcceptance		mLastAccept;
 	BOOL			mDrop;
 	S32				mCurItemIndex;
-	LLString		mToolTipMsg;
+	std::string		mToolTipMsg;
 
 	// array of pointers to functions that implement the logic to
 	// dragging and dropping into the simulator.
@@ -177,6 +178,9 @@ protected:
 	EAcceptance dad3dActivateGesture(LLViewerObject *obj, S32 face,
 								 MASK mask, BOOL drop);
 
+	// set the LLToolDragAndDrop's cursor based on the given acceptance
+	ECursorType acceptanceToCursor( EAcceptance acceptance );
+
 	// This method converts mCargoID to an inventory item or
 	// folder. If no item or category is found, both pointers will be
 	// returned NULL.
@@ -187,11 +191,10 @@ protected:
 	//	LLViewerInventoryCategory::cat_array_t& cats,
 	//	LLViewerInventoryItem::item_array_t& items);
 
-	void createContainer(LLViewerInventoryItem::item_array_t &items, const char* preferred_name);
 	void dropObject(LLViewerObject* raycast_target,
-					BOOL bypass_sim_raycast,
-					BOOL from_task_inventory,
-					BOOL remove_from_inventory);
+			BOOL bypass_sim_raycast,
+			BOOL from_task_inventory,
+			BOOL remove_from_inventory);
 	
 	// accessor that looks at permissions, copyability, and names of
 	// inventory items to determine if a drop would be ok.
@@ -200,9 +203,9 @@ protected:
 	// deal with permissions of object, etc. returns TRUE if drop can
 	// proceed, otherwise FALSE.
 	static BOOL handleDropTextureProtections(LLViewerObject* hit_obj,
-											 LLInventoryItem* item,
-											 LLToolDragAndDrop::ESource source,
-											 const LLUUID& src_id);
+						 LLInventoryItem* item,
+						 LLToolDragAndDrop::ESource source,
+						 const LLUUID& src_id);
 
 
 	// give inventory item functionality
@@ -213,7 +216,7 @@ protected:
 	// give inventory category functionality
 	static void handleCopyProtectedCategory(S32 option, void* data);
 	static void commitGiveInventoryCategory(const LLUUID& to_agent,
-											LLInventoryCategory* cat);
+						LLInventoryCategory* cat);
 public:
 	// helper functions
 	static BOOL isInventoryDropAcceptable(LLViewerObject* obj, LLInventoryItem* item) { return (ACCEPT_YES_COPY_SINGLE <= willObjectAcceptInventory(obj, item)); }
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 071d5d2..0ebb2c3 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -52,7 +52,7 @@
 //
 
 LLToolFace::LLToolFace()
-:	LLTool("Texture")
+:	LLTool(std::string("Texture"))
 { }
 
 
@@ -82,17 +82,16 @@ BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask)
 
 BOOL LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	gPickFaces = TRUE;
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback);
 	return TRUE;
 }
 
-void LLToolFace::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolFace::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* hit_obj	= gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj	= pick_info.getObject();
 	if (hit_obj)
 	{
-		S32 hit_face = gLastHitObjectFace;
+		S32 hit_face = pick_info.mObjectFace;
 		
 		if (hit_obj->isAvatar())
 		{
@@ -102,7 +101,7 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask)
 
 		// ...clicked on a world object, try to pick the appropriate face
 
-		if (mask & MASK_SHIFT)
+		if (pick_info.mKeyMask & MASK_SHIFT)
 		{
 			// If object not selected, need to inform sim
 			if ( !hit_obj->isSelected() )
@@ -133,7 +132,7 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask)
 	}
 	else
 	{
-		if (!(mask == MASK_SHIFT))
+		if (!(pick_info.mKeyMask == MASK_SHIFT))
 		{
 			LLSelectMgr::getInstance()->deselectAll();
 		}
diff --git a/linden/indra/newview/lltoolface.h b/linden/indra/newview/lltoolface.h
index b16aedc..b9ce9a5 100644
--- a/linden/indra/newview/lltoolface.h
+++ b/linden/indra/newview/lltoolface.h
@@ -35,6 +35,7 @@
 #include "lltool.h"
 
 class LLViewerObject;
+class LLPickInfo;
 
 class LLToolFace
 :	public LLTool, public LLSingleton<LLToolFace>
@@ -49,7 +50,7 @@ public:
 	virtual void	handleDeselect();
 	virtual void	render();			// draw face highlights
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 };
 
 #endif
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index e5a3ed5..ffc1766 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -69,7 +69,7 @@ const F32 FOCUS_OFFSET_FACTOR = 1.f;
 //
 
 LLToolCamera::LLToolCamera()
-:	LLTool("Camera"),
+:	LLTool(std::string("Camera")),
 	mAccumX(0),
 	mAccumY(0),
 	mMouseDownX(0),
@@ -126,28 +126,28 @@ BOOL LLToolCamera::handleMouseDown(S32 x, S32 y, MASK mask)
 
 	gViewerWindow->hideCursor();
 
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback);
 	// don't steal focus from UI
 	return FALSE;
 }
 
-void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCamera::pickCallback(const LLPickInfo& pick_info)
 {
 	if (!LLToolCamera::getInstance()->hasMouseCapture())
 	{
 		return;
 	}
 
-	LLToolCamera::getInstance()->mMouseDownX = x;
-	LLToolCamera::getInstance()->mMouseDownY = y;
+	LLToolCamera::getInstance()->mMouseDownX = pick_info.mMousePt.mX;
+	LLToolCamera::getInstance()->mMouseDownY = pick_info.mMousePt.mY;
 
 	gViewerWindow->moveCursorToCenter();
 
 	// Potentially recenter if click outside rectangle
-	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj = pick_info.getObject();
 
 	// Check for hit the sky, or some other invalid point
-	if (!hit_obj && gLastHitPosGlobal.isExactlyZero())
+	if (!hit_obj && pick_info.mPosGlobal.isExactlyZero())
 	{
 		LLToolCamera::getInstance()->mValidClickPoint = FALSE;
 		return;
@@ -195,29 +195,27 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
 		}
 	}
 	//RN: check to see if this is mouse-driving as opposed to ALT-zoom or Focus tool
-	else if (mask & MASK_ALT || 
+	else if (pick_info.mKeyMask & MASK_ALT || 
 			(LLToolMgr::getInstance()->getCurrentTool()->getName() == "Camera")) 
 	{
-		LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+		LLViewerObject* hit_obj = pick_info.getObject();
 		if (hit_obj)
 		{
 			// ...clicked on a world object, so focus at its position
-			// Use "gLastHitPosGlobal" because it's correct for avatar heads,
-			// not pelvis.
 			if (!hit_obj->isHUDAttachment())
 			{
 				gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-				gAgent.setFocusGlobal( gLastHitObjectOffset + gLastHitPosGlobal, gLastHitObjectID);
+				gAgent.setFocusGlobal(pick_info);
 			}
 		}
-		else if (!gLastHitPosGlobal.isExactlyZero())
+		else if (!pick_info.mPosGlobal.isExactlyZero())
 		{
 			// Hit the ground
 			gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-			gAgent.setFocusGlobal( gLastHitPosGlobal, gLastHitObjectID);
+			gAgent.setFocusGlobal(pick_info);
 		}
 
-		if (!(mask & MASK_ALT) &&
+		if (!(pick_info.mKeyMask & MASK_ALT) &&
 			gAgent.cameraThirdPerson() &&
 			gViewerWindow->getLeftMouseDown() && 
 			!gSavedSettings.getBOOL("FreezeTime") &&
@@ -238,7 +236,7 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
 		LLVector3d cam_pos = gAgent.getCameraPositionGlobal();
 		cam_pos -= LLVector3d(LLViewerCamera::getInstance()->getLeftAxis() * gAgent.calcCustomizeAvatarUIOffset( cam_pos ));
 
-		gAgent.setCameraPosAndFocusGlobal( cam_pos, gLastHitObjectOffset + gLastHitPosGlobal, gLastHitObjectID);
+		gAgent.setCameraPosAndFocusGlobal( cam_pos, pick_info.mPosGlobal, pick_info.mObjectID);
 	}
 }
 
diff --git a/linden/indra/newview/lltoolfocus.h b/linden/indra/newview/lltoolfocus.h
index e50ea5e..a09cc52 100644
--- a/linden/indra/newview/lltoolfocus.h
+++ b/linden/indra/newview/lltoolfocus.h
@@ -34,6 +34,8 @@
 
 #include "lltool.h"
 
+class LLPickInfo;
+
 class LLToolCamera
 :	public LLTool, public LLSingleton<LLToolCamera>
 {
@@ -52,7 +54,7 @@ public:
 
 	virtual LLTool*	getOverrideTool(MASK mask) { return NULL; }
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 	BOOL mouseSteerMode() { return mMouseSteering; }
 
 protected:
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index a8e789d..74810d1 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -75,15 +75,12 @@ extern BOOL gDebugClicks;
 // Methods
 //
 LLToolGrab::LLToolGrab( LLToolComposite* composite )
-:	LLTool( "Grab", composite ),
+:	LLTool( std::string("Grab"), composite ),
 	mMode( GRAB_INACTIVE ),
 	mVerticalDragging( FALSE ),
-	mHitLand(FALSE),
-	mHitObjectID(),
-	mGrabObject( NULL ),
-	mMouseDownX( -1 ),
-	mMouseDownY( -1 ),
 	mHasMoved( FALSE ),
+	mOutsideSlop(FALSE),
+	mDeselectedThisClick(FALSE),
 	mSpinGrabbing( FALSE ),
 	mSpinRotation(),
 	mHideBuildHighlight(FALSE)
@@ -131,24 +128,23 @@ BOOL LLToolGrab::handleMouseDown(S32 x, S32 y, MASK mask)
 		llinfos << "LLToolGrab handleMouseDown" << llendl;
 	}
 
-	mHitLand = FALSE;
-
 	// call the base class to propogate info to sim
 	LLTool::handleMouseDown(x, y, mask);
 	
 	if (!gAgent.leftButtonGrabbed())
 	{
 		// can grab transparent objects (how touch event propagates, scripters rely on this)
-		gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback, TRUE);
+		gViewerWindow->pickAsync(x, y, mask, pickCallback, TRUE, TRUE);
 	}
 	return TRUE;
 }
 
-void LLToolGrab::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolGrab::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject	*objectp = gObjectList.findObject( gLastHitObjectID );
+	LLToolGrab::getInstance()->mGrabPick = pick_info;
+	LLViewerObject	*objectp = pick_info.getObject();
 
-	BOOL extend_select = (mask & MASK_SHIFT);
+	BOOL extend_select = (pick_info.mKeyMask & MASK_SHIFT);
 
 	if (!extend_select && !LLSelectMgr::getInstance()->getSelection()->isEmpty())
 	{
@@ -165,23 +161,22 @@ void LLToolGrab::pickCallback(S32 x, S32 y, MASK mask)
 	{
 		LLToolGrab::getInstance()->setMouseCapture(TRUE);
 		LLToolGrab::getInstance()->mMode = GRAB_NOOBJECT;
-		LLToolGrab::getInstance()->mHitObjectID.setNull();
+		LLToolGrab::getInstance()->mGrabPick.mObjectID.setNull();
 	}
 	else
 	{
-		LLToolGrab::getInstance()->handleObjectHit(objectp, x, y, mask);
+		LLToolGrab::getInstance()->handleObjectHit(LLToolGrab::getInstance()->mGrabPick);
 	}
 }
 
-BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mask)
+BOOL LLToolGrab::handleObjectHit(const LLPickInfo& info)
 {
-	mMouseDownX = x;
-	mMouseDownY = y;
-	mMouseMask = mask;
+	mGrabPick = info;
+	LLViewerObject* objectp = mGrabPick.getObject();
 
 	if (gDebugClicks)
 	{
-		llinfos << "LLToolGrab handleObjectHit " << mMouseDownX << "," << mMouseDownY << llendl;
+		llinfos << "LLToolGrab handleObjectHit " << info.mMousePt.mX << "," << info.mMousePt.mY << llendl;
 	}
 
 	if (NULL == objectp) // unexpected
@@ -202,8 +197,6 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
 
 	setMouseCapture( TRUE );
 
-	mHitObjectID = objectp->getID();
-
 	// Grabs always start from the root
 	// objectp = (LLViewerObject *)objectp->getRoot();
 
@@ -223,13 +216,13 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
 		if (gAgent.cameraMouselook() && !script_touch)
 		{
 			mMode = GRAB_LOCKED;
+			gViewerWindow->hideCursor();
+			gViewerWindow->moveCursorToCenter();
 		}
 		else
 		{
 			mMode = GRAB_NONPHYSICAL;
 		}
-		gViewerWindow->hideCursor();
-		gViewerWindow->moveCursorToCenter();
 		// Don't bail out here, go on and grab so buttons can get
 		// their "touched" event.
 	}
@@ -254,20 +247,18 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
 
 	// Always send "touched" message
 
+	mLastMouseX = gViewerWindow->getCurrentMouseX();
+	mLastMouseY = gViewerWindow->getCurrentMouseY();
 	mAccumDeltaX = 0;
 	mAccumDeltaY = 0;
 	mHasMoved = FALSE;
 	mOutsideSlop = FALSE;
 
-	mGrabObject = objectp;
+	mVerticalDragging = (info.mKeyMask == MASK_VERTICAL) || gGrabBtnVertical;
 
-	mGrabOffset.clearVec();
+	startGrab();
 
-	mVerticalDragging = (mask == MASK_VERTICAL) || gGrabBtnVertical;
-
-	startGrab(x, y);
-
-	if ((mask == MASK_SPIN) || gGrabBtnSpin)
+	if ((info.mKeyMask == MASK_SPIN) || gGrabBtnSpin)
 	{
 		startSpin();
 	}
@@ -275,10 +266,10 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
 	LLSelectMgr::getInstance()->updateSelectionCenter();		// update selection beam
 
 	// update point at
-	LLViewerObject *edit_object = gObjectList.findObject(mHitObjectID);
-	if (edit_object)
+	LLViewerObject *edit_object = info.getObject();
+	if (edit_object && info.mPickType != LLPickInfo::PICK_FLORA)
 	{
-		LLVector3 local_edit_point = gAgent.getPosAgentFromGlobal(gLastHitNonFloraPosGlobal);
+		LLVector3 local_edit_point = gAgent.getPosAgentFromGlobal(info.mPosGlobal);
 		local_edit_point -= edit_object->getPositionAgent();
 		local_edit_point = local_edit_point * ~edit_object->getRenderRotation();
 		gAgent.setPointAt(POINTAT_TARGET_GRAB, edit_object, local_edit_point );
@@ -300,10 +291,15 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
 
 void LLToolGrab::startSpin()
 {
+	LLViewerObject* objectp = mGrabPick.getObject();
+	if (!objectp)
+	{
+		return;
+	}
 	mSpinGrabbing = TRUE;
 
 	// Was saveSelectedObjectTransform()
-	LLViewerObject *root = (LLViewerObject *)mGrabObject->getRoot();
+	LLViewerObject *root = (LLViewerObject *)objectp->getRoot();
 	mSpinRotation = root->getRotation();
 
 	LLMessageSystem *msg = gMessageSystem;
@@ -312,8 +308,8 @@ void LLToolGrab::startSpin()
 	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
 	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 	msg->nextBlockFast(_PREHASH_ObjectData);
-	msg->addUUIDFast(_PREHASH_ObjectID, mGrabObject->getID() );
-	msg->sendMessage( mGrabObject->getRegion()->getHost() );
+	msg->addUUIDFast(_PREHASH_ObjectID, mGrabPick.mObjectID );
+	msg->sendMessage( objectp->getRegion()->getHost() );
 }
 
 
@@ -321,6 +317,12 @@ void LLToolGrab::stopSpin()
 {
 	mSpinGrabbing = FALSE;
 
+	LLViewerObject* objectp = mGrabPick.getObject();
+	if (!objectp)
+	{
+		return;
+	}
+
 	LLMessageSystem *msg = gMessageSystem;
 	switch(mMode)
 	{
@@ -332,8 +334,8 @@ void LLToolGrab::stopSpin()
 		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
 		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 		msg->nextBlockFast(_PREHASH_ObjectData);
-		msg->addUUIDFast(_PREHASH_ObjectID, mGrabObject->getID() );
-		msg->sendMessage( mGrabObject->getRegion()->getHost() );
+		msg->addUUIDFast(_PREHASH_ObjectID, objectp->getID() );
+		msg->sendMessage( objectp->getRegion()->getHost() );
 		break;
 
 	case GRAB_NOOBJECT:
@@ -345,11 +347,17 @@ void LLToolGrab::stopSpin()
 }
 
 
-void LLToolGrab::startGrab(S32 x, S32 y)
+void LLToolGrab::startGrab()
 {
 	// Compute grab_offset in the OBJECT's root's coordinate frame
 	// (sometimes root == object)
-	LLViewerObject *root = (LLViewerObject *)mGrabObject->getRoot();
+	LLViewerObject* objectp = mGrabPick.getObject();
+	if (!objectp)
+	{
+		return;
+	}
+
+	LLViewerObject *root = (LLViewerObject *)objectp->getRoot();
 
 	// drag from center
 	LLVector3d grab_start_global = root->getPositionGlobal();
@@ -358,7 +366,7 @@ void LLToolGrab::startGrab(S32 x, S32 y)
 	// JC - This code looks wonky, but I believe it does the right thing.
 	// Otherwise, when you grab a linked object set, it "pops" on the start
 	// of the drag.
-	LLVector3d grab_offsetd = root->getPositionGlobal() - mGrabObject->getPositionGlobal();
+	LLVector3d grab_offsetd = root->getPositionGlobal() - objectp->getPositionGlobal();
 
 	LLVector3 grab_offset;
 	grab_offset.setVec(grab_offsetd);
@@ -377,9 +385,16 @@ void LLToolGrab::startGrab(S32 x, S32 y)
 	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
 	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 	msg->nextBlockFast(_PREHASH_ObjectData);
-	msg->addU32Fast(_PREHASH_LocalID, mGrabObject->mLocalID);
+	msg->addU32Fast(_PREHASH_LocalID, objectp->mLocalID);
 	msg->addVector3Fast(_PREHASH_GrabOffset, grab_offset );
-	msg->sendMessage( mGrabObject->getRegion()->getHost());
+	msg->nextBlock("SurfaceInfo");
+	msg->addVector3("UVCoord", LLVector3(mGrabPick.mUVCoords));
+	msg->addVector3("STCoord", LLVector3(mGrabPick.mSTCoords));
+	msg->addS32Fast(_PREHASH_FaceIndex, mGrabPick.mObjectFace);
+	msg->addVector3("Position", mGrabPick.mIntersection);
+	msg->addVector3("Normal", mGrabPick.mNormal);
+	msg->addVector3("Binormal", mGrabPick.mBinormal);
+	msg->sendMessage( objectp->getRegion()->getHost());
 
 	mGrabOffsetFromCenterInitial = grab_offset;
 	mGrabHiddenOffsetFromCamera = mDragStartFromCamera;
@@ -390,9 +405,6 @@ void LLToolGrab::startGrab(S32 x, S32 y)
 
 BOOL LLToolGrab::handleHover(S32 x, S32 y, MASK mask)
 {
-	mLastMouseX = x;
-	mLastMouseY = y;
-
 	if (!gViewerWindow->getLeftMouseDown())
 	{
 		gViewerWindow->setCursor(UI_CURSOR_TOOLGRAB);
@@ -404,9 +416,12 @@ BOOL LLToolGrab::handleHover(S32 x, S32 y, MASK mask)
 	switch( mMode )
 	{
 	case GRAB_ACTIVE_CENTER:
-	case GRAB_NONPHYSICAL:
 		handleHoverActive( x, y, mask );	// cursor hidden
 		break;
+		
+	case GRAB_NONPHYSICAL:
+		handleHoverNonPhysical(x, y, mask);
+		break;
 
 	case GRAB_INACTIVE:
 		handleHoverInactive( x, y, mask );  // cursor set here
@@ -419,18 +434,24 @@ BOOL LLToolGrab::handleHover(S32 x, S32 y, MASK mask)
 
 	}
 
+	mLastMouseX = x;
+	mLastMouseY = y;
+	
 	return TRUE;
 }
 
+const F32 GRAB_SENSITIVITY_X = 0.0075f;
+const F32 GRAB_SENSITIVITY_Y = 0.0075f;
+
 
 
 		
 // Dragging.
 void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 {
-	llassert( hasMouseCapture() );
-	llassert( mGrabObject );
-	if (mGrabObject->isDead())
+	LLViewerObject* objectp = mGrabPick.getObject();
+	if (!objectp || !hasMouseCapture() ) return;
+	if (objectp->isDead())
 	{
 		// Bail out of drag because object has been killed
 		setMouseCapture(FALSE);
@@ -459,7 +480,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 		// ...switch to horizontal dragging
 		mVerticalDragging = FALSE;
 
-		mDragStartPointGlobal = gViewerWindow->clickPointInWorldGlobal(x, y, mGrabObject);
+		mDragStartPointGlobal = gViewerWindow->clickPointInWorldGlobal(x, y, objectp);
 		mDragStartFromCamera = mDragStartPointGlobal - gAgent.getCameraPositionGlobal();
 	}
 	else if (!mVerticalDragging && (mask == MASK_VERTICAL) )
@@ -467,16 +488,13 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 		// ...switch to vertical dragging
 		mVerticalDragging = TRUE;
 
-		mDragStartPointGlobal = gViewerWindow->clickPointInWorldGlobal(x, y, mGrabObject);
+		mDragStartPointGlobal = gViewerWindow->clickPointInWorldGlobal(x, y, objectp);
 		mDragStartFromCamera = mDragStartPointGlobal - gAgent.getCameraPositionGlobal();
 	}
 
 	const F32 RADIANS_PER_PIXEL_X = 0.01f;
 	const F32 RADIANS_PER_PIXEL_Y = 0.01f;
 
-	const F32 SENSITIVITY_X = 0.0075f;
-	const F32 SENSITIVITY_Y = 0.0075f;
-
 	S32 dx = x - (gViewerWindow->getWindowWidth() / 2);
 	S32 dy = y - (gViewerWindow->getWindowHeight() / 2);
 
@@ -518,9 +536,9 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
 			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 			msg->nextBlockFast(_PREHASH_ObjectData);
-			msg->addUUIDFast(_PREHASH_ObjectID, mGrabObject->getID() );
+			msg->addUUIDFast(_PREHASH_ObjectID, objectp->getID() );
 			msg->addQuatFast(_PREHASH_Rotation, mSpinRotation );
-			msg->sendMessage( mGrabObject->getRegion()->getHost() );
+			msg->sendMessage( objectp->getRegion()->getHost() );
 		}
 		else
 		{
@@ -548,8 +566,8 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 			}
 
 			mGrabHiddenOffsetFromCamera = mGrabHiddenOffsetFromCamera 
-				+ (x_part * (-dx * SENSITIVITY_X)) 
-				+ (y_part * ( dy * SENSITIVITY_Y));
+				+ (x_part * (-dx * GRAB_SENSITIVITY_X)) 
+				+ (y_part * ( dy * GRAB_SENSITIVITY_Y));
 
 
 			// Send the message to the viewer.
@@ -633,7 +651,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 				&& (grab_center_gl.mY > 24))
 			{
 				// Transmit update to simulator
-				LLVector3 grab_pos_region = mGrabObject->getRegion()->getPosRegionFromGlobal( grab_point_global );
+				LLVector3 grab_pos_region = objectp->getRegion()->getPosRegionFromGlobal( grab_point_global );
 
 				LLMessageSystem *msg = gMessageSystem;
 				msg->newMessageFast(_PREHASH_ObjectGrabUpdate);
@@ -641,11 +659,19 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 				msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
 				msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 				msg->nextBlockFast(_PREHASH_ObjectData);
-				msg->addUUIDFast(_PREHASH_ObjectID, mGrabObject->getID() );
+				msg->addUUIDFast(_PREHASH_ObjectID, objectp->getID() );
 				msg->addVector3Fast(_PREHASH_GrabOffsetInitial, mGrabOffsetFromCenterInitial );
 				msg->addVector3Fast(_PREHASH_GrabPosition, grab_pos_region );
 				msg->addU32Fast(_PREHASH_TimeSinceLast, dt_milliseconds );
-				msg->sendMessage( mGrabObject->getRegion()->getHost() );
+				msg->nextBlock("SurfaceInfo");
+				msg->addVector3("UVCoord", LLVector3(mGrabPick.mUVCoords));
+				msg->addVector3("STCoord", LLVector3(mGrabPick.mSTCoords));
+				msg->addS32Fast(_PREHASH_FaceIndex, mGrabPick.mObjectFace);
+				msg->addVector3("Position", mGrabPick.mIntersection);
+				msg->addVector3("Normal", mGrabPick.mNormal);
+				msg->addVector3("Binormal", mGrabPick.mBinormal);
+
+				msg->sendMessage( objectp->getRegion()->getHost() );
 			}
 		}
 
@@ -659,8 +685,8 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 	if (mHasMoved)
 	{
 		if (!gAgent.cameraMouselook() && 
-			!mGrabObject->isHUDAttachment() && 
-			mGrabObject->getRoot() == gAgent.getAvatarObject()->getRoot())
+			!objectp->isHUDAttachment() && 
+			objectp->getRoot() == gAgent.getAvatarObject()->getRoot())
 		{
 			// force focus to point in space where we were looking previously
 			gAgent.setFocusGlobal(gAgent.calcFocusPositionTargetGlobal(), LLUUID::null);
@@ -679,6 +705,134 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
 }
  
 
+void LLToolGrab::handleHoverNonPhysical(S32 x, S32 y, MASK mask)
+{
+	LLViewerObject* objectp = mGrabPick.getObject();
+	if (!objectp || !hasMouseCapture() ) return;
+	if (objectp->isDead())
+	{
+		// Bail out of drag because object has been killed
+		setMouseCapture(FALSE);
+		return;
+	}
+
+	LLPickInfo pick = mGrabPick;
+	pick.mMousePt = LLCoordGL(x, y);
+	pick.getSurfaceInfo();
+
+	// compute elapsed time
+	F32 dt = mGrabTimer.getElapsedTimeAndResetF32();
+	U32 dt_milliseconds = (U32) (1000.f * dt);
+
+	// i'm not a big fan of the following code - it's been culled from the physical grab case.
+	// ideally these two would be nicely integrated - but the code in that method is a serious
+	// mess of spaghetti.  so here we go:
+
+	LLVector3 grab_pos_region(0,0,0);
+	
+	const BOOL SUPPORT_LLDETECTED_GRAB = TRUE;
+	if (SUPPORT_LLDETECTED_GRAB)
+	{
+		//--------------------------------------------------
+		// Toggle vertical dragging
+		//--------------------------------------------------
+		if (mVerticalDragging && !(mask == MASK_VERTICAL) && !gGrabBtnVertical)
+		{
+			mVerticalDragging = FALSE;
+		}
+	
+		else if (!mVerticalDragging && (mask == MASK_VERTICAL) )
+		{
+			mVerticalDragging = TRUE;
+		}
+	
+		S32 dx = x - mLastMouseX;
+		S32 dy = y - mLastMouseY;
+
+		if (dx != 0 || dy != 0)
+		{
+			mAccumDeltaX += dx;
+			mAccumDeltaY += dy;
+		
+			S32 dist_sq = mAccumDeltaX * mAccumDeltaX + mAccumDeltaY * mAccumDeltaY;
+			if (dist_sq > SLOP_DIST_SQ)
+			{
+				mOutsideSlop = TRUE;
+			}
+
+			// mouse has moved 
+			mHasMoved = TRUE;
+
+			//------------------------------------------------------
+			// Handle grabbing
+			//------------------------------------------------------
+
+			LLVector3d x_part;
+			x_part.setVec(LLViewerCamera::getInstance()->getLeftAxis());
+			x_part.mdV[VZ] = 0.0;
+			x_part.normVec();
+
+			LLVector3d y_part;
+			if( mVerticalDragging )
+			{
+				y_part.setVec(LLViewerCamera::getInstance()->getUpAxis());
+				// y_part.setVec(0.f, 0.f, 1.f);
+			}
+			else
+			{
+				// drag toward camera
+				y_part = x_part % LLVector3d::z_axis;
+				y_part.mdV[VZ] = 0.0;
+				y_part.normVec();
+			}
+
+			mGrabHiddenOffsetFromCamera = mGrabHiddenOffsetFromCamera 
+				+ (x_part * (-dx * GRAB_SENSITIVITY_X)) 
+				+ (y_part * ( dy * GRAB_SENSITIVITY_Y));
+
+		}
+		
+		// need to return offset from mGrabStartPoint
+		LLVector3d grab_point_global = gAgent.getCameraPositionGlobal() + mGrabHiddenOffsetFromCamera;
+		grab_pos_region = objectp->getRegion()->getPosRegionFromGlobal( grab_point_global );
+	}
+
+	LLMessageSystem *msg = gMessageSystem;
+	msg->newMessageFast(_PREHASH_ObjectGrabUpdate);
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+	msg->nextBlockFast(_PREHASH_ObjectData);
+	msg->addUUIDFast(_PREHASH_ObjectID, objectp->getID() );
+	msg->addVector3Fast(_PREHASH_GrabOffsetInitial, mGrabOffsetFromCenterInitial );
+	msg->addVector3Fast(_PREHASH_GrabPosition, grab_pos_region );
+	msg->addU32Fast(_PREHASH_TimeSinceLast, dt_milliseconds );
+	msg->nextBlock("SurfaceInfo");
+	msg->addVector3("UVCoord", LLVector3(pick.mUVCoords));
+	msg->addVector3("STCoord", LLVector3(pick.mSTCoords));
+	msg->addS32Fast(_PREHASH_FaceIndex, pick.mObjectFace);
+	msg->addVector3("Position", pick.mIntersection);
+	msg->addVector3("Normal", pick.mNormal);
+	msg->addVector3("Binormal", pick.mBinormal);
+
+	msg->sendMessage( objectp->getRegion()->getHost() );
+
+	// update point-at / look-at
+	if (pick.mObjectFace != -1) // if the intersection was on the surface of the obejct
+	{
+		LLVector3 local_edit_point = pick.mIntersection;
+		local_edit_point -= objectp->getPositionAgent();
+		local_edit_point = local_edit_point * ~objectp->getRenderRotation();
+		gAgent.setPointAt(POINTAT_TARGET_GRAB, objectp, local_edit_point );
+		gAgent.setLookAt(LOOKAT_TARGET_SELECT, objectp, local_edit_point );
+	}
+	
+	
+	
+	gViewerWindow->setCursor(UI_CURSOR_HAND);  
+}
+ 
+
 // Not dragging.  Just showing affordances
 void LLToolGrab::handleHoverInactive(S32 x, S32 y, MASK mask)
 {
@@ -719,7 +873,7 @@ void LLToolGrab::handleHoverFailed(S32 x, S32 y, MASK mask)
 	}
 	else
 	{
-		S32 dist_sq = (x-mMouseDownX) * (x-mMouseDownX) + (y-mMouseDownY) * (y-mMouseDownY);
+		S32 dist_sq = (x-mGrabPick.mMousePt.mX) * (x-mGrabPick.mMousePt.mX) + (y-mGrabPick.mMousePt.mY) * (y-mGrabPick.mMousePt.mY);
 		if( mOutsideSlop || dist_sq > SLOP_DIST_SQ )
 		{
 			mOutsideSlop = TRUE;
@@ -784,23 +938,27 @@ void LLToolGrab::stopEditing()
 
 void LLToolGrab::onMouseCaptureLost()
 {
+	LLViewerObject* objectp = mGrabPick.getObject();
+	if (!objectp)
+	{
+		gViewerWindow->showCursor();
+		return;
+	}
 	// First, fix cursor placement
 	if( !gAgent.cameraMouselook() 
-		&& (GRAB_ACTIVE_CENTER == mMode || GRAB_NONPHYSICAL == mMode))
+		&& (GRAB_ACTIVE_CENTER == mMode))
 	{
-		llassert( mGrabObject ); 
-
-		if (mGrabObject->isHUDAttachment())
+		if (objectp->isHUDAttachment())
 		{
 			// ...move cursor "naturally", as if it had moved when hidden
-			S32 x = mMouseDownX + mAccumDeltaX;
-			S32 y = mMouseDownY + mAccumDeltaY;
+			S32 x = mGrabPick.mMousePt.mX + mAccumDeltaX;
+			S32 y = mGrabPick.mMousePt.mY + mAccumDeltaY;
 			LLUI::setCursorPositionScreen(x, y);
 		}
 		else if (mHasMoved)
 		{
 			// ...move cursor back to the center of the object
-			LLVector3 grab_point_agent = mGrabObject->getRenderPosition();
+			LLVector3 grab_point_agent = objectp->getRenderPosition();
 
 			LLCoordGL gl_point;
 			if (LLViewerCamera::getInstance()->projectPosAgentToScreen(grab_point_agent, gl_point))
@@ -811,19 +969,21 @@ void LLToolGrab::onMouseCaptureLost()
 		else
 		{
 			// ...move cursor back to click position
-			LLUI::setCursorPositionScreen(mMouseDownX, mMouseDownY);
+			LLUI::setCursorPositionScreen(mGrabPick.mMousePt.mX, mGrabPick.mMousePt.mY);
 		}
 
 		gViewerWindow->showCursor();
 	}
 
 	stopGrab();
+	if (mSpinGrabbing)
 	stopSpin();
+	
 	mMode = GRAB_INACTIVE;
 
 	mHideBuildHighlight = FALSE;
 
-	mGrabObject = NULL;
+	mGrabPick.mObjectID.setNull();
 
 	LLSelectMgr::getInstance()->updateSelectionCenter();
 	gAgent.setPointAt(POINTAT_TARGET_CLEAR);
@@ -835,6 +995,24 @@ void LLToolGrab::onMouseCaptureLost()
 
 void LLToolGrab::stopGrab()
 {
+	LLViewerObject* objectp = mGrabPick.getObject();
+	if (!objectp)
+	{
+		return;
+	}
+
+	LLPickInfo pick = mGrabPick;
+
+	if (mMode == GRAB_NONPHYSICAL)
+	{
+		// for non-physical (touch) grabs,
+		// gather surface info for this degrab (mouse-up)
+		S32 x = gViewerWindow->getCurrentMouseX();
+		S32 y = gViewerWindow->getCurrentMouseY();
+		pick.mMousePt = LLCoordGL(x, y);
+		pick.getSurfaceInfo();
+	}
+
 	// Next, send messages to simulator
 	LLMessageSystem *msg = gMessageSystem;
 	switch(mMode)
@@ -847,11 +1025,18 @@ void LLToolGrab::stopGrab()
 		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
 		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 		msg->nextBlockFast(_PREHASH_ObjectData);
-		msg->addU32Fast(_PREHASH_LocalID, mGrabObject->mLocalID);
-		msg->sendMessage(mGrabObject->getRegion()->getHost());
+		msg->addU32Fast(_PREHASH_LocalID, objectp->mLocalID);
+		msg->nextBlock("SurfaceInfo");
+		msg->addVector3("UVCoord", LLVector3(pick.mUVCoords));
+		msg->addVector3("STCoord", LLVector3(pick.mSTCoords));
+		msg->addS32Fast(_PREHASH_FaceIndex, pick.mObjectFace);
+		msg->addVector3("Position", pick.mIntersection);
+		msg->addVector3("Normal", pick.mNormal);
+		msg->addVector3("Binormal", pick.mBinormal);
+
+		msg->sendMessage(objectp->getRegion()->getHost());
 
 		mVerticalDragging = FALSE;
-		mGrabOffset.clearVec();
 		break;
 
 	case GRAB_NOOBJECT:
@@ -873,14 +1058,12 @@ void LLToolGrab::render()
 
 BOOL LLToolGrab::isEditing()
 {
-	// Can't just compare to null directly due to "smart" pointer.
-	LLViewerObject *obj = mGrabObject;
-	return (obj != NULL);
+	return (mGrabPick.getObject().notNull());
 }
 
 LLViewerObject* LLToolGrab::getEditingObject()
 {
-	return mGrabObject;
+	return mGrabPick.getObject();
 }
 
 
diff --git a/linden/indra/newview/lltoolgrab.h b/linden/indra/newview/lltoolgrab.h
index c54b0ff..5db7fcf 100644
--- a/linden/indra/newview/lltoolgrab.h
+++ b/linden/indra/newview/lltoolgrab.h
@@ -37,10 +37,12 @@
 #include "llquaternion.h"
 #include "llmemory.h"
 #include "lluuid.h"
+#include "llviewerwindow.h" // for LLPickInfo
 
 class LLView;
 class LLTextBox;
 class LLViewerObject;
+class LLPickInfo;
 
 class LLToolGrab : public LLTool, public LLSingleton<LLToolGrab>
 {
@@ -69,15 +71,15 @@ public:
 	LLVector3		getGrabOffset(S32 x, S32 y);		// HACK
 
 	// Capture the mouse and start grabbing.
-	BOOL			handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mask);
+	BOOL			handleObjectHit(const LLPickInfo& info);
 
 	// Certain grabs should not highlight the "Build" toolbar button
 	BOOL getHideBuildHighlight() { return mHideBuildHighlight; }
 
-	static void		pickCallback(S32 x, S32 y, MASK mask);
+	static void		pickCallback(const LLPickInfo& pick_info);
 private:
 	LLVector3d		getGrabPointGlobal();
-	void			startGrab(S32 x, S32 y);
+	void			startGrab();
 	void			stopGrab();
 
 	void			startSpin();
@@ -85,6 +87,7 @@ private:
 
 	void			handleHoverSpin(S32 x, S32 y, MASK mask);
 	void			handleHoverActive(S32 x, S32 y, MASK mask);
+	void			handleHoverNonPhysical(S32 x, S32 y, MASK mask);
 	void			handleHoverInactive(S32 x, S32 y, MASK mask);
 	void			handleHoverFailed(S32 x, S32 y, MASK mask);
 
@@ -96,29 +99,26 @@ private:
 	BOOL			mVerticalDragging;
 
 	BOOL			mHitLand;
-	LLUUID			mHitObjectID;				// if hit something, its ID
 
-	LLPointer<LLViewerObject>	mGrabObject;					// the object currently being grabbed
 	LLTimer			mGrabTimer;						// send simulator time between hover movements
 
 	LLVector3		mGrabOffsetFromCenterInitial;	// meters from CG of object
-	LLVector3		mGrabOffset;					// how far cursor currently is from grab start point, meters
 	LLVector3d		mGrabHiddenOffsetFromCamera;	// in cursor hidden drag, how far is grab offset from camera
 
 	LLVector3d		mDragStartPointGlobal;				// projected into world
 	LLVector3d		mDragStartFromCamera;			// drag start relative to camera
 
+	LLPickInfo		mGrabPick;
+
 	S32				mLastMouseX;
 	S32				mLastMouseY;
-	S32				mMouseDownX;
-	S32				mMouseDownY;
-	MASK			mMouseMask;
 	S32				mAccumDeltaX;	// since cursor hidden, how far have you moved?
 	S32				mAccumDeltaY;
 	BOOL			mHasMoved;		// has mouse moved off center at all?
 	BOOL			mOutsideSlop;	// has mouse moved outside center 5 pixels?
 	BOOL			mDeselectedThisClick;
 
+
 	BOOL			mSpinGrabbing;
 	LLQuaternion	mSpinRotation;
 
@@ -131,3 +131,4 @@ extern LLTool* gGrabTransientTool;
 
 #endif  // LL_TOOLGRAB_H
 
+
diff --git a/linden/indra/newview/lltoolgun.cpp b/linden/indra/newview/lltoolgun.cpp
index e4a7f6c..f63e554 100644
--- a/linden/indra/newview/lltoolgun.cpp
+++ b/linden/indra/newview/lltoolgun.cpp
@@ -48,8 +48,7 @@
 #include "lltoolgrab.h"
 
 LLToolGun::LLToolGun( LLToolComposite* composite )
-	:
-	LLTool( "gun", composite )
+:	LLTool( std::string("gun"), composite )
 {
 }
 
diff --git a/linden/indra/newview/lltoolindividual.cpp b/linden/indra/newview/lltoolindividual.cpp
index d7f7b12..219858d 100644
--- a/linden/indra/newview/lltoolindividual.cpp
+++ b/linden/indra/newview/lltoolindividual.cpp
@@ -61,7 +61,7 @@
 
 // Default constructor
 LLToolIndividual::LLToolIndividual()
-	: LLTool("Individual")
+: LLTool(std::string("Individual"))
 {
 }
 
@@ -72,13 +72,13 @@ LLToolIndividual::~LLToolIndividual()
 
 BOOL LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback);
 	return TRUE;
 }
 
-void LLToolIndividual::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolIndividual::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* obj = pick_info.getObject();
 	LLSelectMgr::getInstance()->deselectAll();
 	if(obj)
 	{
diff --git a/linden/indra/newview/lltoolindividual.h b/linden/indra/newview/lltoolindividual.h
index 12340fc..c0e3116 100644
--- a/linden/indra/newview/lltoolindividual.h
+++ b/linden/indra/newview/lltoolindividual.h
@@ -34,6 +34,8 @@
 
 #include "lltool.h"
 
+class LLPickInfo;
+
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class lltoolindividual
 //
@@ -52,7 +54,7 @@ public:
 	//virtual void handleDeselect();
 	//virtual void render();
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 
 protected:
 
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index b7a5ab9..19ebe28 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -74,7 +74,7 @@ LLToolMgr::LLToolMgr()
 	mSelectedTool( NULL ),
 	mCurrentToolset( NULL )
 {
-	gToolNull = new LLTool(NULL);  // Does nothing
+	gToolNull = new LLTool(LLStringUtil::null);  // Does nothing
 	setCurrentTool(gToolNull);
 
 	gBasicToolset		= new LLToolset();
diff --git a/linden/indra/newview/lltoolobjpicker.cpp b/linden/indra/newview/lltoolobjpicker.cpp
index f5d25d8..401c6c6 100644
--- a/linden/indra/newview/lltoolobjpicker.cpp
+++ b/linden/indra/newview/lltoolobjpicker.cpp
@@ -50,7 +50,7 @@
 
 
 LLToolObjPicker::LLToolObjPicker()
-:	LLTool( "ObjPicker", NULL ),
+:	LLTool( std::string("ObjPicker"), NULL ),
 	mPicked( FALSE ),
 	mHitObjectID( LLUUID::null ),
 	mExitCallback( NULL ),
@@ -69,7 +69,7 @@ BOOL LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask)
 	if (! handled)
 	{
 		// didn't click in any UI object, so must have clicked in the world
-		gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+		gViewerWindow->pickAsync(x, y, mask, pickCallback);
 		handled = TRUE;
 	}
 	else
@@ -90,16 +90,10 @@ BOOL LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask)
 	return handled;
 }
 
-void LLToolObjPicker::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolObjPicker::pickCallback(const LLPickInfo& pick_info)
 {
-	// You must hit the body for this tool to think you hit the object.
-	LLViewerObject*	objectp = NULL;
-	objectp = gObjectList.findObject( gLastHitObjectID );
-	if (objectp)
-	{
-		LLToolObjPicker::getInstance()->mHitObjectID = objectp->mID;
-		LLToolObjPicker::getInstance()->mPicked = TRUE;
-	}
+	LLToolObjPicker::getInstance()->mHitObjectID = pick_info.mObjectID;
+	LLToolObjPicker::getInstance()->mPicked = pick_info.mObjectID.notNull();
 }
 
 
@@ -181,3 +175,4 @@ void LLToolObjPicker::handleDeselect()
 }
 
 
+
diff --git a/linden/indra/newview/lltoolobjpicker.h b/linden/indra/newview/lltoolobjpicker.h
index e56b390..63e272c 100644
--- a/linden/indra/newview/lltoolobjpicker.h
+++ b/linden/indra/newview/lltoolobjpicker.h
@@ -36,6 +36,8 @@
 #include "v3math.h"
 #include "lluuid.h"
 
+class LLPickInfo;
+
 class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker>
 {
 public:
@@ -54,7 +56,7 @@ public:
 
 	LLUUID				getObjectID() const { return mHitObjectID; }
 
-	static void			pickCallback(S32 x, S32 y, MASK mask);
+	static void			pickCallback(const LLPickInfo& pick_info);
 
 protected:
 	BOOL				mPicked;
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 4bb2111..0e8ba56 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -81,53 +81,51 @@ static ECursorType cursor_from_parcel_media(U8 click_action);
 
 
 LLToolPie::LLToolPie()
-:	LLTool("Select"),
+:	LLTool(std::string("Select")),
 	mPieMouseButtonDown( FALSE ),
 	mGrabMouseButtonDown( FALSE ),
-	mHitLand( FALSE ),
-	mHitObjectID(),
 	mMouseOutsideSlop( FALSE )
 { }
 
 
 BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	gPickFaces = TRUE;
 	//left mouse down always picks transparent
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, leftMouseCallback, 
-											  TRUE, TRUE);
+	gViewerWindow->pickAsync(x, y, mask, leftMouseCallback, TRUE, TRUE);
 	mGrabMouseButtonDown = TRUE;
 	return TRUE;
 }
 
 // static
-void LLToolPie::leftMouseCallback(S32 x, S32 y, MASK mask)
+void LLToolPie::leftMouseCallback(const LLPickInfo& pick_info)
 {
-	LLToolPie::getInstance()->pickAndShowMenu(x, y, mask, FALSE);
+	LLToolPie::getInstance()->mPick = pick_info;
+	LLToolPie::getInstance()->pickAndShowMenu(FALSE);
 }
 
 BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	// Pick faces in case they select "Copy Texture" and need that info.
-	gPickFaces = TRUE;
 	// don't pick transparent so users can't "pay" transparent objects
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, rightMouseCallback,
-											  FALSE, TRUE);
+	gViewerWindow->pickAsync(x, y, mask, rightMouseCallback, FALSE, TRUE);
 	mPieMouseButtonDown = TRUE; 
 	// don't steal focus from UI
 	return FALSE;
 }
 
 // static
-void LLToolPie::rightMouseCallback(S32 x, S32 y, MASK mask)
+void LLToolPie::rightMouseCallback(const LLPickInfo& pick_info)
 {
-	LLToolPie::getInstance()->pickAndShowMenu(x, y, mask, TRUE);
+	LLToolPie::getInstance()->mPick = pick_info;
+	LLToolPie::getInstance()->pickAndShowMenu(TRUE);
 }
 
 // True if you selected an object.
-BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
+BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 {
-	if (!always_show && gLastHitParcelWall)
+	S32 x = mPick.mMousePt.mX;
+	S32 y = mPick.mMousePt.mY;
+	MASK mask = mPick.mKeyMask;
+	if (!always_show && mPick.mPickType == LLPickInfo::PICK_PARCEL_WALL)
 	{
 		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getCollisionParcel();
 		if (parcel)
@@ -151,25 +149,18 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 	}
 
 	// didn't click in any UI object, so must have clicked in the world
-	LLViewerObject *object = gViewerWindow->lastObjectHit();
+	LLViewerObject *object = mPick.getObject();
 	LLViewerObject *parent = NULL;
 
-	mHitLand = !object && !gLastHitPosGlobal.isExactlyZero();
-	if (!mHitLand)
+	if (mPick.mPickType != LLPickInfo::PICK_LAND)
 	{
 		LLViewerParcelMgr::getInstance()->deselectLand();
 	}
 	
 	if (object)
 	{
-		mHitObjectID = object->mID;
-
 		parent = object->getRootEdit();
 	}
-	else
-	{
-		mHitObjectID.setNull();
-	}
 
 	BOOL touchable = (object && object->flagHandleTouch()) 
 					 || (parent && parent->flagHandleTouch());
@@ -206,19 +197,19 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 			{
 				// pay event goes to object actually clicked on
 				sClickActionObject = object;
-				sLeftClickSelection = LLToolSelect::handleObjectSelection(object, MASK_NONE, FALSE, TRUE);
+				sLeftClickSelection = LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE);
 				return TRUE;
 			}
 			break;
 		case CLICK_ACTION_BUY:
 			sClickActionObject = parent;
-			sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+			sLeftClickSelection = LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE, TRUE);
 			return TRUE;
 		case CLICK_ACTION_OPEN:
 			if (parent && parent->allowOpen())
 			{
 				sClickActionObject = parent;
-				sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+				sLeftClickSelection = LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE, TRUE);
 			}
 			return TRUE;
 		case CLICK_ACTION_PLAY:
@@ -239,12 +230,13 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 	{
 		gGrabTransientTool = this;
 		LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
-		return LLToolGrab::getInstance()->handleObjectHit( object, x, y, mask);
+		return LLToolGrab::getInstance()->handleObjectHit( mPick );
 	}
 	
-	if (!object && gLastHitHUDIcon && gLastHitHUDIcon->getSourceObject())
+	LLHUDIcon* last_hit_hud_icon = mPick.mHUDIcon;
+	if (!object && last_hit_hud_icon && last_hit_hud_icon->getSourceObject())
 	{
-		LLFloaterScriptDebug::show(gLastHitHUDIcon->getSourceObject()->getID());
+		LLFloaterScriptDebug::show(last_hit_hud_icon->getSourceObject()->getID());
 	}
 
 	// If left-click never selects or spawns a menu
@@ -273,7 +265,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 			LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance());
 			gViewerWindow->hideCursor();
 			LLToolCamera::getInstance()->setMouseCapture(TRUE);
-			LLToolCamera::getInstance()->pickCallback(gViewerWindow->getCurrentMouseX(), gViewerWindow->getCurrentMouseY(), mask);
+			LLToolCamera::getInstance()->pickCallback(mPick);
 			gAgent.setFocusOnAvatar(TRUE, TRUE);
 
 			return TRUE;
@@ -292,22 +284,22 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 	}
 
 	// Can't ignore children here.
-	LLToolSelect::handleObjectSelection(object, mask, FALSE, TRUE);
+	LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE);
 
 	// Spawn pie menu
-	if (mHitLand)
+	if (mPick.mPickType == LLPickInfo::PICK_LAND)
 	{
-		LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( gLastHitPosGlobal );
+		LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( mPick.mPosGlobal );
 		gMenuHolder->setParcelSelection(selection);
 		gPieLand->show(x, y, mPieMouseButtonDown);
 
 		// VEFFECT: ShowPie
 		LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
-		effectp->setPositionGlobal(gLastHitPosGlobal);
+		effectp->setPositionGlobal(mPick.mPosGlobal);
 		effectp->setColor(LLColor4U(gAgent.getEffectColor()));
 		effectp->setDuration(0.25f);
 	}
-	else if (mHitObjectID == gAgent.getID() )
+	else if (mPick.mObjectID == gAgent.getID() )
 	{
 		if(!gPieSelf) 
 		{
@@ -333,15 +325,15 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 
 			// Object is an avatar, so check for mute by id.
 			LLVOAvatar* avatar = (LLVOAvatar*)object;
-			LLString name = avatar->getFullname();
+			std::string name = avatar->getFullname();
 			if (LLMuteList::getInstance()->isMuted(avatar->getID(), name))
 			{
-				gMenuHolder->childSetText("Avatar Mute", LLString("Unmute")); // *TODO:Translate
+				gMenuHolder->childSetText("Avatar Mute", std::string("Unmute")); // *TODO:Translate
 				//gMutePieMenu->setLabel("Unmute");
 			}
 			else
 			{
-				gMenuHolder->childSetText("Avatar Mute", LLString("Mute")); // *TODO:Translate
+				gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
 				//gMutePieMenu->setLabel("Mute");
 			}
 
@@ -354,7 +346,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 		else
 		{
 			// BUG: What about chatting child objects?
-			LLString name;
+			std::string name;
 			LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
 			if (node)
 			{
@@ -362,12 +354,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 			}
 			if (LLMuteList::getInstance()->isMuted(object->getID(), name))
 			{
-				gMenuHolder->childSetText("Object Mute", LLString("Unmute")); // *TODO:Translate
+				gMenuHolder->childSetText("Object Mute", std::string("Unmute")); // *TODO:Translate
 				//gMuteObjectPieMenu->setLabel("Unmute");
 			}
 			else
 			{
-				gMenuHolder->childSetText("Object Mute", LLString("Mute")); // *TODO:Translate
+				gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
 				//gMuteObjectPieMenu->setLabel("Mute");
 			}
 			
@@ -377,7 +369,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 			// Don't show when you click on someone else, it freaks them
 			// out.
 			LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
-			effectp->setPositionGlobal(gLastHitPosGlobal);
+			effectp->setPositionGlobal(mPick.mPosGlobal);
 			effectp->setColor(LLColor4U(gAgent.getEffectColor()));
 			effectp->setDuration(0.25f);
 		}
@@ -544,7 +536,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
 	LLViewerObject *parent = NULL;
 	if (gHoverView)
 	{
-		object = gHoverView->getLastHoverObject();
+		object = gViewerWindow->getHoverPick().getObject();
 	}
 
 	if (object)
@@ -581,7 +573,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
 
 BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-	LLViewerObject* obj = gViewerWindow->lastObjectHit();
+	LLViewerObject* obj = mPick.getObject();
 	U8 click_action = final_click_action(obj);
 	if (click_action != CLICK_ACTION_NONE)
 	{
@@ -626,18 +618,18 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 
 	if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
 	{
-		if (gLastHitLand
-			&& !gLastHitPosGlobal.isExactlyZero())
+		if (mPick.mPickType == LLPickInfo::PICK_LAND
+			&& !mPick.mPosGlobal.isExactlyZero())
 		{
 			handle_go_to();
 			return TRUE;
 		}
-		else if (gLastHitObjectID.notNull()
-				 && !gLastHitPosGlobal.isExactlyZero())
+		else if (mPick.mObjectID.notNull()
+				 && !mPick.mPosGlobal.isExactlyZero())
 		{
 			// Hit an object
 			// HACK: Call the last hit position the point we hit on the object
-			gLastHitPosGlobal += gLastHitObjectOffset;
+			//gLastHitPosGlobal += gLastHitObjectOffset;
 			handle_go_to();
 			return TRUE;
 		}
@@ -649,7 +641,7 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 	objects gets you into trouble.
 
 	// If double-click on object or land, go there.
-	LLViewerObject *object = gViewerWindow->lastObjectHit();
+	LLViewerObject *object = gViewerWindow->getLastPick().getObject();
 	if (object)
 	{
 		if (object->isAvatar())
@@ -756,10 +748,11 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
 	if (objectp.isNull()) return;
 
 	// did we hit a valid face on the object?
-	if( gLastHitObjectFace < 0 || gLastHitObjectFace >= objectp->getNumTEs() ) return;
+	S32 face = LLToolPie::getInstance()->getPick().mObjectFace;
+	if( face < 0 || face >= objectp->getNumTEs() ) return;
 		
 	// is media playing on this face?
-	if (!LLViewerMedia::isActiveMediaTexture(objectp->getTE(gLastHitObjectFace)->getID()))
+	if (!LLViewerMedia::isActiveMediaTexture(objectp->getTE(face)->getID()))
 	{
 		handle_click_action_play();
 		return;
@@ -767,7 +760,7 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
 
 	std::string media_url = std::string ( parcel->getMediaURL () );
 	std::string media_type = std::string ( parcel->getMediaType() );
-	LLString::trim(media_url);
+	LLStringUtil::trim(media_url);
 
 	// Get the scheme, see if that is handled as well.
 	LLURI uri(media_url);
@@ -796,7 +789,7 @@ static ECursorType cursor_from_parcel_media(U8 click_action)
 
 	std::string media_url = std::string ( parcel->getMediaURL () );
 	std::string media_type = std::string ( parcel->getMediaType() );
-	LLString::trim(media_url);
+	LLStringUtil::trim(media_url);
 
 	// Get the scheme, see if that is handled as well.
 	LLURI uri(media_url);
diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h
index 1b03ef8..9f9ccd0 100644
--- a/linden/indra/newview/lltoolpie.h
+++ b/linden/indra/newview/lltoolpie.h
@@ -34,6 +34,7 @@
 
 #include "lltool.h"
 #include "lluuid.h"
+#include "llviewerwindow.h" // for LLPickInfo
 
 class LLViewerObject;
 class LLObjectSelection;
@@ -58,23 +59,25 @@ public:
 	virtual void		handleDeselect();
 	virtual LLTool*		getOverrideTool(MASK mask);
 
-	static void			leftMouseCallback(S32 x, S32 y, MASK mask);
-	static void			rightMouseCallback(S32 x, S32 y, MASK mask);
+	LLPickInfo&			getPick() { return mPick; }
+
+	static void			leftMouseCallback(const LLPickInfo& pick_info);
+	static void			rightMouseCallback(const LLPickInfo& pick_info);
 
 	static void			selectionPropertiesReceived();
 
+
 protected:
 	BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
-	BOOL pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL edit_menu);
+	BOOL pickAndShowMenu(BOOL edit_menu);
 	BOOL useClickAction(BOOL always_show, MASK mask, LLViewerObject* object,
 						LLViewerObject* parent);
 
 protected:
 	BOOL				mPieMouseButtonDown;
 	BOOL				mGrabMouseButtonDown;
-	BOOL				mHitLand;
-	LLUUID				mHitObjectID;
 	BOOL				mMouseOutsideSlop;				// for this drag, has mouse moved outside slop region
+	LLPickInfo			mPick;
 	static LLPointer<LLViewerObject> sClickActionObject;
 	static U8				sClickAction;
 	static LLSafeHandle<LLObjectSelection> sLeftClickSelection;
diff --git a/linden/indra/newview/lltoolpipette.cpp b/linden/indra/newview/lltoolpipette.cpp
index eaae390..5bafc0a 100644
--- a/linden/indra/newview/lltoolpipette.cpp
+++ b/linden/indra/newview/lltoolpipette.cpp
@@ -51,8 +51,8 @@
 //
 
 LLToolPipette::LLToolPipette()
-:	LLTool("Pipette"),
-mSuccess(TRUE)
+:	LLTool(std::string("Pipette")),
+	mSuccess(TRUE)
 { 
 	mSelectCallback = NULL;
 	mUserData = NULL;
@@ -67,9 +67,8 @@ BOOL LLToolPipette::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	mSuccess = TRUE;
 	mTooltipMsg.clear();
-	gPickFaces = TRUE;
 	setMouseCapture(TRUE);
-	gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+	gViewerWindow->pickAsync(x, y, mask, pickCallback);
 	return TRUE;
 }
 
@@ -88,14 +87,13 @@ BOOL LLToolPipette::handleHover(S32 x, S32 y, MASK mask)
 	gViewerWindow->setCursor(mSuccess ? UI_CURSOR_PIPETTE : UI_CURSOR_NO);
 	if (hasMouseCapture()) // mouse button is down
 	{
-		gPickFaces = TRUE;
-		gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+		gViewerWindow->pickAsync(x, y, mask, pickCallback);
 		return TRUE;
 	}
 	return FALSE;
 }
 
-BOOL LLToolPipette::handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_rect_screen)
+BOOL LLToolPipette::handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen)
 {
 	if (mTooltipMsg.empty())
 	{
@@ -107,19 +105,19 @@ BOOL LLToolPipette::handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_re
 	return TRUE;
 }
 
-void LLToolPipette::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolPipette::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* hit_obj	= gViewerWindow->lastObjectHit();
+	LLViewerObject* hit_obj	= pick_info.getObject();
 	LLSelectMgr::getInstance()->unhighlightAll();
 
 	// if we clicked on a face of a valid prim, save off texture entry data
 	if (hit_obj && 
 		hit_obj->getPCode() == LL_PCODE_VOLUME &&
-		gLastHitObjectFace != -1)
+		pick_info.mObjectFace != -1)
 	{
 		//TODO: this should highlight the selected face only
 		LLSelectMgr::getInstance()->highlightObjectOnly(hit_obj);
-		LLToolPipette::getInstance()->mTextureEntry = *hit_obj->getTE(gLastHitObjectFace);
+		LLToolPipette::getInstance()->mTextureEntry = *hit_obj->getTE(pick_info.mObjectFace);
 		if (LLToolPipette::getInstance()->mSelectCallback)
 		{
 			LLToolPipette::getInstance()->mSelectCallback(LLToolPipette::getInstance()->mTextureEntry, LLToolPipette::getInstance()->mUserData);
@@ -133,7 +131,7 @@ void LLToolPipette::setSelectCallback(select_callback callback, void* user_data)
 	mUserData = user_data;
 }
 
-void LLToolPipette::setResult(BOOL success, const LLString& msg)
+void LLToolPipette::setResult(BOOL success, const std::string& msg)
 {
 	mTooltipMsg = msg;
 	mSuccess = success;
diff --git a/linden/indra/newview/lltoolpipette.h b/linden/indra/newview/lltoolpipette.h
index 28d0393..bb50f49 100644
--- a/linden/indra/newview/lltoolpipette.h
+++ b/linden/indra/newview/lltoolpipette.h
@@ -41,6 +41,7 @@
 #include "lltextureentry.h"
 
 class LLViewerObject;
+class LLPickInfo;
 
 class LLToolPipette
 :	public LLTool, public LLSingleton<LLToolPipette>
@@ -52,19 +53,19 @@ public:
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_rect_screen);
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen);
 
 	typedef void (*select_callback)(const LLTextureEntry& te, void *data);
 	void setSelectCallback(select_callback callback, void* user_data);
-	void setResult(BOOL success, const LLString& msg);
+	void setResult(BOOL success, const std::string& msg);
 
-	static void pickCallback(S32 x, S32 y, MASK mask);
+	static void pickCallback(const LLPickInfo& pick_info);
 
 protected:
 	LLTextureEntry	mTextureEntry;
 	select_callback mSelectCallback;
 	BOOL			mSuccess;
-	LLString		mTooltipMsg;
+	std::string		mTooltipMsg;
 	void*			mUserData;
 };
 
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index a319236..30347be 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -70,7 +70,7 @@ const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 LLPCode	LLToolPlacer::sObjectType = LL_PCODE_CUBE;
 
 LLToolPlacer::LLToolPlacer()
-:	LLTool( "Create" )
+:	LLTool( std::string("Create") )
 {
 }
 
@@ -81,14 +81,22 @@ BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj,
 
 	// Viewer-side pick to find the right sim to create the object on.  
 	// First find the surface the object will be created on.
-	gViewerWindow->hitObjectOrLandGlobalImmediate(x, y, NULL, FALSE);
+	LLPickInfo pick = gViewerWindow->pickImmediate(x, y, FALSE);
 	
 	// Note: use the frontmost non-flora version because (a) plants usually have lots of alpha and (b) pants' Havok
 	// representations (if any) are NOT the same as their viewer representation.
-	*hit_obj = gObjectList.findObject( gLastHitNonFloraObjectID );
-	*hit_face = gLastHitNonFloraObjectFace;
-	*b_hit_land = !(*hit_obj) && !gLastHitNonFloraPosGlobal.isExactlyZero();
-	LLVector3d land_pos_global = gLastHitNonFloraPosGlobal;
+	if (pick.mPickType == LLPickInfo::PICK_FLORA)
+	{
+		*hit_obj = NULL;
+		*hit_face = -1;
+	}
+	else
+	{
+		*hit_obj = pick.getObject();
+		*hit_face = pick.mObjectFace;
+	}
+	*b_hit_land = !(*hit_obj) && !pick.mPosGlobal.isExactlyZero();
+	LLVector3d land_pos_global = pick.mPosGlobal;
 
 	// Make sure there's a surface to place the new object on.
 	BOOL bypass_sim_raycast = FALSE;
@@ -570,7 +578,7 @@ LLToolPlacerPanel::LLToolPlacerPanel(const std::string& name, const LLRect& rect
 	*/
 }
 
-void LLToolPlacerPanel::addButton( const LLString& up_state, const LLString& down_state, LLPCode* pcode )
+void LLToolPlacerPanel::addButton( const std::string& up_state, const std::string& down_state, LLPCode* pcode )
 {
 	const S32 TOOL_SIZE = 32;
 	const S32 HORIZ_SPACING = TOOL_SIZE + 5;
@@ -593,11 +601,11 @@ void LLToolPlacerPanel::addButton( const LLString& up_state, const LLString& dow
 		TOOL_SIZE );
 
 	LLButton* btn = new LLButton(
-		"ToolPlacerOptBtn",
+		std::string("ToolPlacerOptBtn"),
 		rect,
 		up_state,
 		down_state,
-		"", &LLToolPlacerPanel::setObjectType,
+		LLStringUtil::null, &LLToolPlacerPanel::setObjectType,
 		pcode,
 		LLFontGL::sSansSerif);
 	btn->setFollowsBottom();
diff --git a/linden/indra/newview/lltoolplacer.h b/linden/indra/newview/lltoolplacer.h
index 3e4cad7..7c3db8c 100644
--- a/linden/indra/newview/lltoolplacer.h
+++ b/linden/indra/newview/lltoolplacer.h
@@ -98,7 +98,7 @@ public:
 	static LLPCode sGrass;
 
 private:
-	void		addButton( const LLString& up_state, const LLString& down_state, LLPCode* pcode );
+	void		addButton( const std::string& up_state, const std::string& down_state, LLPCode* pcode );
 
 private:
 	static S32			sButtonsAdded;
diff --git a/linden/indra/newview/lltoolselect.cpp b/linden/indra/newview/lltoolselect.cpp
index d4a8153..d2f23ab 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -56,7 +56,7 @@ extern BOOL gAllowSelectAvatar;
 const F32 SELECTION_ROTATION_TRESHOLD = 0.1f;
 
 LLToolSelect::LLToolSelect( LLToolComposite* composite )
-:	LLTool( "Select", composite ),
+:	LLTool( std::string("Select"), composite ),
 	mIgnoreGroup( FALSE )
 {
  }
@@ -64,39 +64,24 @@ LLToolSelect::LLToolSelect( LLToolComposite* composite )
 // True if you selected an object.
 BOOL LLToolSelect::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	BOOL handled = FALSE;
-
-	// didn't click in any UI object, so must have clicked in the world
-	LLViewerObject*	object = NULL;
-
-	// You must hit the body for this tool to think you hit the object.
-	object = gObjectList.findObject( gLastHitObjectID );
-
-	if (object)
-	{
-		mSelectObjectID = object->getID();
-		handled = TRUE;
-	}
-	else
-	{
-		mSelectObjectID.setNull();
-	}
+	// do immediate pick query
+	mPick = gViewerWindow->pickImmediate(x, y, TRUE);
 
 	// Pass mousedown to agent
 	LLTool::handleMouseDown(x, y, mask);
 
-	return handled;
+	return mPick.getObject().notNull();
 }
 
-BOOL LLToolSelect::handleDoubleClick(S32 x, S32 y, MASK mask)
-{
-	//RN: double click to toggle individual/linked picking???
-	return LLTool::handleDoubleClick(x, y, mask);
-}
 
 // static
-LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select)
+LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pick, BOOL ignore_group, BOOL temp_select, BOOL select_root)
 {
+	LLViewerObject* object = pick.getObject();
+	if (select_root)
+	{
+		object = object->getRootEdit();
+	}
 	BOOL select_owned = gSavedSettings.getBOOL("SelectOwnedOnly");
 	BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly");
 	
@@ -108,14 +93,16 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
 		LLSelectMgr::getInstance()->setForceSelection(TRUE);
 	}
 
-	BOOL extend_select = (mask == MASK_SHIFT) || (mask == MASK_CONTROL);
+	BOOL extend_select = (pick.mKeyMask == MASK_SHIFT) || (pick.mKeyMask == MASK_CONTROL);
 
 	// If no object, check for icon, then just deselect
 	if (!object)
 	{
-		if (gLastHitHUDIcon && gLastHitHUDIcon->getSourceObject())
+		LLHUDIcon* last_hit_hud_icon = pick.mHUDIcon;
+
+		if (last_hit_hud_icon && last_hit_hud_icon->getSourceObject())
 		{
-			LLFloaterScriptDebug::show(gLastHitHUDIcon->getSourceObject()->getID());
+			LLFloaterScriptDebug::show(last_hit_hud_icon->getSourceObject()->getID());
 		}
 		else if (!extend_select)
 		{
@@ -212,9 +199,12 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
 					select_node->setTransient(TRUE);
 				}
 
-				for (S32 i = 0; i < (S32)root_object->mChildList.size(); i++)
+				LLViewerObject::const_child_list_t& child_list = root_object->getChildren();
+				for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+					 iter != child_list.end(); iter++)
 				{
-					select_node = selection->findNode(root_object->mChildList[i]);
+					LLViewerObject* child = *iter;
+					select_node = selection->findNode(child);
 					if (select_node)
 					{
 						select_node->setTransient(TRUE);
@@ -240,8 +230,7 @@ BOOL LLToolSelect::handleMouseUp(S32 x, S32 y, MASK mask)
 {
 	mIgnoreGroup = gSavedSettings.getBOOL("EditLinkedParts");
 
-	LLViewerObject* object = gObjectList.findObject(mSelectObjectID);
-	LLToolSelect::handleObjectSelection(object, mask, mIgnoreGroup, FALSE);
+	handleObjectSelection(mPick, mIgnoreGroup, FALSE);
 
 	return LLTool::handleMouseUp(x, y, mask);
 }
@@ -275,3 +264,4 @@ void LLToolSelect::onMouseCaptureLost()
 
 
 
+
diff --git a/linden/indra/newview/lltoolselect.h b/linden/indra/newview/lltoolselect.h
index a23729f..d3b86f5 100644
--- a/linden/indra/newview/lltoolselect.h
+++ b/linden/indra/newview/lltoolselect.h
@@ -35,6 +35,7 @@
 #include "lltool.h"
 #include "v3math.h"
 #include "lluuid.h"
+#include "llviewerwindow.h" // for LLPickInfo
 
 class LLObjectSelection;
 
@@ -45,11 +46,10 @@ public:
 
 	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
 
 	virtual void		stopEditing();
 
-	static LLSafeHandle<LLObjectSelection>	handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select);
+	static LLSafeHandle<LLObjectSelection>	handleObjectSelection(const LLPickInfo& pick, BOOL ignore_group, BOOL temp_select, BOOL select_root = FALSE);
 
 	virtual void		onMouseCaptureLost();
 	virtual void		handleDeselect();
@@ -57,6 +57,7 @@ public:
 protected:
 	BOOL				mIgnoreGroup;
 	LLUUID				mSelectObjectID;
+	LLPickInfo			mPick;
 };
 
 
diff --git a/linden/indra/newview/lltoolselectland.cpp b/linden/indra/newview/lltoolselectland.cpp
index 78c4c24..98d0d02 100644
--- a/linden/indra/newview/lltoolselectland.cpp
+++ b/linden/indra/newview/lltoolselectland.cpp
@@ -51,7 +51,7 @@
 //
 
 LLToolSelectLand::LLToolSelectLand( )
-:	LLTool( "Parcel" ),
+:	LLTool( std::string("Parcel") ),
 	mDragStartGlobal(),
 	mDragEndGlobal(),
 	mDragEndValid(FALSE),
diff --git a/linden/indra/newview/lltoolselectrect.cpp b/linden/indra/newview/lltoolselectrect.cpp
index ceb0659..26d9756 100644
--- a/linden/indra/newview/lltoolselectrect.cpp
+++ b/linden/indra/newview/lltoolselectrect.cpp
@@ -78,18 +78,26 @@ void dialog_refresh_all(void);
 
 BOOL LLToolSelectRect::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+	handlePick(gViewerWindow->pickImmediate(x, y, TRUE));
+
+	LLTool::handleMouseDown(x, y, mask);
+
+	return mPick.getObject().notNull();
+}
+
+void LLToolSelectRect::handlePick(const LLPickInfo& pick)
+{
+	mPick = pick;
+
 	// start dragging rectangle
 	setMouseCapture( TRUE );
 
-	mDragStartX = x;
-	mDragStartY = y;
-	mDragEndX = x;
-	mDragEndY = y;
+	mDragStartX = pick.mMousePt.mX;
+	mDragStartY = pick.mMousePt.mY;
+	mDragEndX = pick.mMousePt.mX;
+	mDragEndY = pick.mMousePt.mY;
 
 	mMouseOutsideSlop = FALSE;
-
-	LLToolSelect::handleMouseDown(x, y, mask);
-	return TRUE;
 }
 
 
diff --git a/linden/indra/newview/lltoolselectrect.h b/linden/indra/newview/lltoolselectrect.h
index e4bb384..07310ae 100644
--- a/linden/indra/newview/lltoolselectrect.h
+++ b/linden/indra/newview/lltoolselectrect.h
@@ -46,6 +46,8 @@ public:
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual void	draw();							// draw the select rectangle
 
+	void handlePick(const LLPickInfo& pick);
+
 protected:
 	void			handleRectangleSelection(S32 x, S32 y, MASK mask);	// true if you selected one
 	BOOL			outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
diff --git a/linden/indra/newview/lltoolview.cpp b/linden/indra/newview/lltoolview.cpp
index 13b6e2a..561147b 100644
--- a/linden/indra/newview/lltoolview.cpp
+++ b/linden/indra/newview/lltoolview.cpp
@@ -77,50 +77,50 @@ LLToolView::~LLToolView()
 }
 
 //*TODO:translate?
-void LLToolView::addTool(const LLString& icon_off, const LLString& icon_on, LLPanel* panel, LLTool* tool, LLView* hoverView, const char* label)
-{
-	llassert(tool);
-
-	LLToolContainer* contain = new LLToolContainer(this);
-
-	LLRect btn_rect = getButtonRect(mButtonCount);
-
-	contain->mButton = new LLButton("ToolBtn",
-		btn_rect, 
-		icon_off,
-		icon_on, 
-		"",
-		&LLToolView::onClickToolButton,
-		contain,
-		LLFontGL::sSansSerif);
-
-	contain->mPanel = panel;
-	contain->mTool = tool;
-
-	addChild(contain->mButton);
-	mButtonCount++;
-
-	const S32 LABEL_TOP_SPACING = 0;
-	const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
-	S32 label_width = font->getWidth( label );
-	LLRect label_rect;
-	label_rect.setLeftTopAndSize( 
-		btn_rect.mLeft + btn_rect.getWidth() / 2 - label_width / 2,
-		btn_rect.mBottom - LABEL_TOP_SPACING,
-		label_width, 
-		llfloor(font->getLineHeight()));
-	addChild( new LLTextBox( "tool label", label_rect, label, font ) );
-
-	// Can optionally ignore panel
-	if (contain->mPanel)
-	{
-		contain->mPanel->setBackgroundVisible( FALSE );
-		contain->mPanel->setBorderVisible( FALSE );
-		addChild(contain->mPanel);
-	}
-
-	mContainList.push_back(contain);
-}
+// void LLToolView::addTool(const std::string& icon_off, const std::string& icon_on, LLPanel* panel, LLTool* tool, LLView* hoverView, const char* label)
+// {
+// 	llassert(tool);
+
+// 	LLToolContainer* contain = new LLToolContainer(this);
+
+// 	LLRect btn_rect = getButtonRect(mButtonCount);
+
+// 	contain->mButton = new LLButton("ToolBtn",
+// 		btn_rect, 
+// 		icon_off,
+// 		icon_on, 
+// 		"",
+// 		&LLToolView::onClickToolButton,
+// 		contain,
+// 		LLFontGL::sSansSerif);
+
+// 	contain->mPanel = panel;
+// 	contain->mTool = tool;
+
+// 	addChild(contain->mButton);
+// 	mButtonCount++;
+
+// 	const S32 LABEL_TOP_SPACING = 0;
+// 	const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
+// 	S32 label_width = font->getWidth( label );
+// 	LLRect label_rect;
+// 	label_rect.setLeftTopAndSize( 
+// 		btn_rect.mLeft + btn_rect.getWidth() / 2 - label_width / 2,
+// 		btn_rect.mBottom - LABEL_TOP_SPACING,
+// 		label_width, 
+// 		llfloor(font->getLineHeight()));
+// 	addChild( new LLTextBox( "tool label", label_rect, label, font ) );
+
+// 	// Can optionally ignore panel
+// 	if (contain->mPanel)
+// 	{
+// 		contain->mPanel->setBackgroundVisible( FALSE );
+// 		contain->mPanel->setBorderVisible( FALSE );
+// 		addChild(contain->mPanel);
+// 	}
+
+// 	mContainList.push_back(contain);
+// }
 
 
 LLRect LLToolView::getButtonRect(S32 button_index)
diff --git a/linden/indra/newview/lltoolview.h b/linden/indra/newview/lltoolview.h
index 8c955a3..80c9346 100644
--- a/linden/indra/newview/lltoolview.h
+++ b/linden/indra/newview/lltoolview.h
@@ -73,8 +73,6 @@ public:
 
 	static void		onClickToolButton(void* container);
 
-	void			addTool(const LLString& icon_off, const LLString& icon_on, LLPanel* panel, LLTool* tool, LLView* hoverView, const char* label);
-
 	LLView*			getCurrentHoverView();
 
 private:
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index b5854c8..8572283 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -90,7 +90,8 @@ LLTracker::LLTracker()
 	mHasLandmarkPosition(FALSE),
 	mLandmarkHasBeenVisited(FALSE),
 	mTrackedLocationName( "" ),
-	mIsTrackingLocation(FALSE)
+	mIsTrackingLocation(FALSE),
+	mHasReachedLocation(FALSE)
 { }
 
 
@@ -284,7 +285,7 @@ void LLTracker::render3D()
 
 
 // static 
-void LLTracker::trackAvatar( const LLUUID& avatar_id, const LLString& name )
+void LLTracker::trackAvatar( const LLUUID& avatar_id, const std::string& name )
 {
 	instance()->stopTrackingLandmark();
 	instance()->stopTrackingLocation();
@@ -296,7 +297,7 @@ void LLTracker::trackAvatar( const LLUUID& avatar_id, const LLString& name )
 
 
 // static 
-void LLTracker::trackLandmark( const LLUUID& asset_id, const LLUUID& item_id, const LLString& name)
+void LLTracker::trackLandmark( const LLUUID& asset_id, const LLUUID& item_id, const std::string& name)
 {
 	instance()->stopTrackingAvatar();
 	instance()->stopTrackingLocation();
@@ -311,7 +312,7 @@ void LLTracker::trackLandmark( const LLUUID& asset_id, const LLUUID& item_id, co
 
 
 // static 
-void LLTracker::trackLocation(const LLVector3d& pos_global, const LLString& full_name, const LLString& tooltip, ETrackingLocationType location_type)
+void LLTracker::trackLocation(const LLVector3d& pos_global, const std::string& full_name, const std::string& tooltip, ETrackingLocationType location_type)
 {
 	instance()->stopTrackingAvatar();
 	instance()->stopTrackingLandmark();
@@ -397,7 +398,7 @@ BOOL LLTracker::hasLandmarkPosition()
 
 
 // static
-const LLString& LLTracker::getTrackedLocationName()
+const std::string& LLTracker::getTrackedLocationName()
 {
 	return instance()->mTrackedLocationName;
 }
@@ -556,8 +557,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
 		//gCylinder.render(1000);
 	glPopMatrix();
 
-	char text[1024];		/* Flawfinder: ignore */
-	snprintf(text, sizeof(text), "%.0f m", to_vec.magVec());		/* Flawfinder: ignore */
+	std::string text;
+	text = llformat( "%.0f m", to_vec.magVec());
 
 	LLWString wstr;
 	wstr += utf8str_to_wstring(label);
diff --git a/linden/indra/newview/lltracker.h b/linden/indra/newview/lltracker.h
index 6d45a8d..756bc18 100644
--- a/linden/indra/newview/lltracker.h
+++ b/linden/indra/newview/lltracker.h
@@ -87,15 +87,15 @@ public:
 	static const LLUUID& getTrackedLandmarkAssetID() { return instance()->mTrackedLandmarkAssetID; }
 	static const LLUUID& getTrackedLandmarkItemID()	 { return instance()->mTrackedLandmarkItemID; }
 
-	static void	trackAvatar( const LLUUID& avatar_id, const LLString& name );
-	static void	trackLandmark( const LLUUID& landmark_asset_id, const LLUUID& landmark_item_id , const LLString& name);
-	static void	trackLocation(const LLVector3d& pos, const LLString& full_name, const LLString& tooltip, ETrackingLocationType location_type = LOCATION_NOTHING);
+	static void	trackAvatar( const LLUUID& avatar_id, const std::string& name );
+	static void	trackLandmark( const LLUUID& landmark_asset_id, const LLUUID& landmark_item_id , const std::string& name);
+	static void	trackLocation(const LLVector3d& pos, const std::string& full_name, const std::string& tooltip, ETrackingLocationType location_type = LOCATION_NOTHING);
 
 	// returns global pos of tracked thing
 	static LLVector3d 	getTrackedPositionGlobal();
 
 	static BOOL 		hasLandmarkPosition();
-	static const LLString& getTrackedLocationName();
+	static const std::string& getTrackedLocationName();
 
 	static void drawHUDArrow();
 
@@ -107,8 +107,8 @@ public:
 	static LLTracker* sTrackerp;
 	static BOOL sCheesyBeacon;
 	
-	static const LLString& getLabel() { return instance()->mLabel; }
-	static const LLString& getToolTip() { return instance()->mToolTip; }
+	static const std::string& getLabel() { return instance()->mLabel; }
+	static const std::string& getToolTip() { return instance()->mToolTip; }
 protected:
 	LLTracker();
 	~LLTracker();
@@ -137,10 +137,10 @@ protected:
 
 	LLVector3d				mTrackedPositionGlobal;
 
-	LLString				mLabel;
-	LLString				mToolTip;
+	std::string				mLabel;
+	std::string				mToolTip;
 
-	LLString				mTrackedLandmarkName;
+	std::string				mTrackedLandmarkName;
 	LLUUID					mTrackedLandmarkAssetID;
 	LLUUID					mTrackedLandmarkItemID;
 	LLDynamicArray<LLUUID>	mLandmarkAssetIDList;
@@ -149,7 +149,7 @@ protected:
 	BOOL 					mHasLandmarkPosition;
 	BOOL					mLandmarkHasBeenVisited;
 
-	LLString				mTrackedLocationName;
+	std::string				mTrackedLocationName;
 	BOOL					mIsTrackingLocation;
 	BOOL					mHasReachedLocation;
 };
diff --git a/linden/indra/newview/lltrans.cpp b/linden/indra/newview/lltrans.cpp
index a848250..9a90112 100644
--- a/linden/indra/newview/lltrans.cpp
+++ b/linden/indra/newview/lltrans.cpp
@@ -41,7 +41,7 @@
 LLTrans::template_map_t LLTrans::sStringTemplates;
 
 //static 
-bool LLTrans::parseStrings(const LLString& xml_filename)
+bool LLTrans::parseStrings(const std::string& xml_filename)
 {
 	LLXMLNodePtr root;
 	BOOL success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
@@ -60,7 +60,7 @@ bool LLTrans::parseStrings(const LLString& xml_filename)
 			continue;
 		}
 		
-		LLString string_name;
+		std::string string_name;
 
 		if (! string->getAttributeString("name", string_name))
 		{
@@ -76,20 +76,20 @@ bool LLTrans::parseStrings(const LLString& xml_filename)
 }
 
 //static 
-LLString LLTrans::getString(const LLString &xml_desc, const LLString::format_map_t& args)
+std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
 {
 	template_map_t::iterator iter = sStringTemplates.find(xml_desc);
 
 	if (iter != sStringTemplates.end())
 	{
-		LLString text = iter->second.mText;
-		LLString::format(text, args);
+		std::string text = iter->second.mText;
+		LLStringUtil::format(text, args);
 		
 		return text;
 	}
 	else
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[STRING_NAME]"] = xml_desc;
 		llwarns << "Missing String: [" << xml_desc << "]" << llendl;
 		LLAlertDialog* dialogp = LLAlertDialog::showXml("MissingString", args);
diff --git a/linden/indra/newview/lltrans.h b/linden/indra/newview/lltrans.h
index eb159f2..b127471 100644
--- a/linden/indra/newview/lltrans.h
+++ b/linden/indra/newview/lltrans.h
@@ -40,10 +40,10 @@
 class LLTransTemplate
 {
 public:
-	LLTransTemplate(const LLString& name = "", const LLString& text = "") : mName(name), mText(text) {}
+	LLTransTemplate(const std::string& name = LLStringUtil::null, const std::string& text = LLStringUtil::null) : mName(name), mText(text) {}
 
-	LLString mName;
-	LLString mText;
+	std::string mName;
+	std::string mText;
 };
 
 /**
@@ -62,7 +62,7 @@ public:
 	 * @param xml_filename Filename to parse
 	 * @returns true if the file was parsed successfully, true if something went wrong
 	 */
-	static bool parseStrings(const LLString& xml_filename);
+	static bool parseStrings(const std::string& xml_filename);
 
 	/**
 	 * @brief Returns a translated string
@@ -70,22 +70,22 @@ public:
 	 * @param args A list of substrings to replace in the string
 	 * @returns Translated string
 	 */
-	static LLString getString(const LLString &xml_desc, const LLString::format_map_t& args);
+	static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args);
 
 	/**
 	 * @brief Returns a translated string
 	 * @param xml_desc String's description
 	 * @returns Translated string
 	 */
-	static LLString getString(const LLString &xml_desc)
+	static std::string getString(const std::string &xml_desc)
 	{
-		LLString::format_map_t empty;
+		LLStringUtil::format_map_t empty;
 		return getString(xml_desc, empty);
 	}
 	
 
 private:
-	typedef std::map<LLString, LLTransTemplate > template_map_t;
+	typedef std::map<std::string, LLTransTemplate > template_map_t;
 	static template_map_t sStringTemplates;
 };
 
diff --git a/linden/indra/newview/lluploaddialog.cpp b/linden/indra/newview/lluploaddialog.cpp
index edf5505..3cceea8 100644
--- a/linden/indra/newview/lluploaddialog.cpp
+++ b/linden/indra/newview/lluploaddialog.cpp
@@ -64,7 +64,7 @@ void LLUploadDialog::modalUploadFinished()
 
 LLUploadDialog::LLUploadDialog( const std::string& msg)
 	:
-	LLPanel( "Uploading...", LLRect(0,100,100,0) )  // dummy rect.  Will reshape below.
+	LLPanel( std::string("Uploading..."), LLRect(0,100,100,0) )  // dummy rect.  Will reshape below.
 {
 	setBackgroundVisible( TRUE );
 
@@ -78,14 +78,14 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
 	LLRect msg_rect;
 	for (int line_num=0; line_num<16; ++line_num)
 	{
-		mLabelBox[line_num] = new LLTextBox( "Filename", msg_rect, "Filename", font );
+		mLabelBox[line_num] = new LLTextBox( std::string("Filename"), msg_rect, std::string("Filename"), font );
 		addChild(mLabelBox[line_num]);
 	}
 
 	setMessage(msg);
 
 	// The dialog view is a root view
-	gViewerWindow->setTopCtrl( this );
+	gFocusMgr.setTopCtrl( this );
 }
 
 void LLUploadDialog::setMessage( const std::string& msg)
@@ -116,9 +116,10 @@ void LLUploadDialog::setMessage( const std::string& msg)
 	char* token = strtok( temp_msg, "\n" );
 	while( token )
 	{
-		S32 cur_width = S32(font->getWidth(token) + 0.99f) + TEXT_PAD;
+		std::string tokstr(token);
+		S32 cur_width = S32(font->getWidth(tokstr) + 0.99f) + TEXT_PAD;
 		max_msg_width = llmax( max_msg_width, cur_width );
-		msg_lines.push_back( std::string( token ) );
+		msg_lines.push_back( tokstr );
 		token = strtok( NULL, "\n" );
 	}
 	delete[] temp_msg;
diff --git a/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp
index 658cf39..229314e 100644
--- a/linden/indra/newview/llurldispatcher.cpp
+++ b/linden/indra/newview/llurldispatcher.cpp
@@ -163,11 +163,13 @@ bool LLURLDispatcherImpl::dispatchRightClick(const std::string& url)
 // static
 bool LLURLDispatcherImpl::dispatchHelp(const std::string& url, BOOL right_mouse)
 {
+#if LL_LIBXUL_ENABLED
 	if (matchPrefix(url, SLURL_SL_HELP_PREFIX))
 	{
 		gViewerHtmlHelp.show();
 		return true;
 	}
+#endif
 	return false;
 }
 
@@ -324,7 +326,7 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
 bool LLURLDispatcherImpl::matchPrefix(const std::string& url, const std::string& prefix)
 {
 	std::string test_prefix = url.substr(0, prefix.length());
-	LLString::toLower(test_prefix);
+	LLStringUtil::toLower(test_prefix);
 	return test_prefix == prefix;
 }
 
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index da69df6..ac3fa93 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -43,13 +43,13 @@ const int MAX_URL_COUNT = 10;
 /////////////////////////////////////////////////////////////////////////////
 
 // static
-bool LLURLHistory::loadFile(const LLString& filename)
+bool LLURLHistory::loadFile(const std::string& filename)
 {
 	LLSD data;
 	{
-		LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
+		std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
 
-		llifstream file((temp_str + filename).c_str());
+		llifstream file((temp_str + filename));
 
 		if (file.is_open())
 		{
@@ -71,10 +71,10 @@ bool LLURLHistory::loadFile(const LLString& filename)
 }
 
 // static
-bool LLURLHistory::saveFile(const LLString& filename)
+bool LLURLHistory::saveFile(const std::string& filename)
 {
-	LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
-	llofstream out((temp_str + filename).c_str());
+	std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
+	llofstream out((temp_str + filename));
 	if (!out.good())
 	{
 		llwarns << "Unable to open " << filename << " for output." << llendl;
diff --git a/linden/indra/newview/llurlhistory.h b/linden/indra/newview/llurlhistory.h
index 05d81b1..df97e19 100644
--- a/linden/indra/newview/llurlhistory.h
+++ b/linden/indra/newview/llurlhistory.h
@@ -40,10 +40,10 @@ class LLURLHistory
 {
 public:
 	// Loads an xml file of URLs.  Currently only supports Parcel URL history
-	static bool loadFile(const LLString& filename);
+	static bool loadFile(const std::string& filename);
 
 	// Saves the current history to XML
-	static bool saveFile(const LLString& filename);
+	static bool saveFile(const std::string& filename);
 
 	static LLSD getURLHistory(const std::string& collection);
 
diff --git a/linden/indra/newview/llurlsimstring.cpp b/linden/indra/newview/llurlsimstring.cpp
index 07669db..03c6f84 100644
--- a/linden/indra/newview/llurlsimstring.cpp
+++ b/linden/indra/newview/llurlsimstring.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file llsimurlstring.cpp
+ * @file llurlsimstring.cpp (was llsimurlstring.cpp)
  * @brief Handles "SLURL fragments" like Ahern/123/45 for
  * startup processing, login screen, prefs, etc.
  *
@@ -41,13 +41,13 @@
 
 //static
 LLURLSimString LLURLSimString::sInstance;
-LLString LLURLSimString::sLocationStringHome("My Home");
-LLString LLURLSimString::sLocationStringLast("My Last Location");
+std::string LLURLSimString::sLocationStringHome("My Home");
+std::string LLURLSimString::sLocationStringLast("My Last Location");
 
 // "secondlife://simname/x/y/z" -> "simname/x/y/z"
 // (actually .*//foo -> foo)
 // static
-void LLURLSimString::setString(const LLString& sim_string)
+void LLURLSimString::setString(const std::string& sim_string)
 {
 	sInstance.mSimString.clear();
 	sInstance.mSimName.clear();
@@ -63,29 +63,31 @@ void LLURLSimString::setString(const LLString& sim_string)
 	else
 	{
 		char* curlstr = curl_unescape(sim_string.c_str(), sim_string.size());
-		LLString tstring = LLString(curlstr);
+		std::string tstring = std::string(curlstr);
 		curl_free(curlstr);
 		std::string::size_type idx = tstring.find("//");
-		idx = (idx == LLString::npos) ? 0 : idx+2;
+		idx = (idx == std::string::npos) ? 0 : idx+2;
 		sInstance.mSimString = tstring.substr(idx);
 	}
 }
 
 // "/100" -> 100
 // static
-S32 LLURLSimString::parseGridIdx(const LLString& in_string, S32 idx0, S32* res)
+std::string::size_type LLURLSimString::parseGridIdx(const std::string& in_string,
+												 std::string::size_type idx0,
+												 std::string::size_type* res)
 {
-	if (idx0 == LLString::npos || in_string[idx0] != '/')
+	if (idx0 == std::string::npos || in_string[idx0] != '/')
 	{
-		return (S32)LLString::npos; // parse error
+		return std::string::npos; // parse error
 	}
 	idx0++;
-	LLString::size_type idx1 = in_string.find_first_of('/', idx0);
-	LLString::size_type len = (idx1 == LLString::npos) ? LLString::npos : idx1-idx0;
-	LLString tstring = in_string.substr(idx0,len);
+	std::string::size_type idx1 = in_string.find_first_of('/', idx0);
+	std::string::size_type len = (idx1 == std::string::npos) ? std::string::npos : idx1-idx0;
+	std::string tstring = in_string.substr(idx0,len);
 	if (!tstring.empty())
 	{
-		S32 val = atoi(tstring.c_str());
+		std::string::size_type val = atoi(tstring.c_str());
 		*res = val;
 	}
 	return idx1;
@@ -118,24 +120,32 @@ bool LLURLSimString::parse()
 }
 
 // static
-bool LLURLSimString::parse(const LLString& sim_string, std::string *region_name, S32 *x, S32 *y, S32 *z)
+bool LLURLSimString::parse(const std::string& sim_string,
+						   std::string *region_name,
+						   S32 *x, S32 *y, S32 *z)
 {
-	 // strip any bogus initial '/'
-	LLString::size_type idx0 = sim_string.find_first_not_of('/');
+	// strip any bogus initial '/'
+	std::string::size_type idx0 = sim_string.find_first_not_of('/');
 	if (idx0 == std::string::npos) idx0 = 0;
 
-	LLString::size_type idx1 = sim_string.find_first_of('/', idx0);
-	LLString::size_type len = (idx1 == std::string::npos) ? std::string::npos : idx1-idx0;
-	LLString tstring = sim_string.substr(idx0,len);
+	std::string::size_type idx1 = sim_string.find_first_of('/', idx0);
+	std::string::size_type len = (idx1 == std::string::npos) ? std::string::npos : idx1-idx0;
+	std::string tstring = sim_string.substr(idx0,len);
 	*region_name = unescapeRegionName(tstring);
 	if (!region_name->empty())
 	{
+		// return position data if found. otherwise leave passed-in values alone. (DEV-18380) -MG
 		if (idx1 != std::string::npos)
 		{
-			idx1 = parseGridIdx(sim_string, idx1, x);
-			idx1 = parseGridIdx(sim_string, idx1, y);
-			idx1 = parseGridIdx(sim_string, idx1, z);
+			std::string::size_type xs = *x, ys = *y, zs = *z;
+			idx1 = parseGridIdx(sim_string, idx1, &xs);
+			idx1 = parseGridIdx(sim_string, idx1, &ys);
+			idx1 = parseGridIdx(sim_string, idx1, &zs);
+			*x = xs;
+			*y = ys;
+			*z = zs;
 		}
+		
 		return true;
 	}
 	else
diff --git a/linden/indra/newview/llurlsimstring.h b/linden/indra/newview/llurlsimstring.h
index 420030f..a1c3bfc 100644
--- a/linden/indra/newview/llurlsimstring.h
+++ b/linden/indra/newview/llurlsimstring.h
@@ -39,7 +39,7 @@ class LLURLSimString
 public:
 	enum { NOT_SET=0, NOT_PARSED=1, PARSE_OK=2, PARSE_FAIL=-1 };
 
-	static void setString(const LLString& url);
+	static void setString(const std::string& url);
 		// Accepts all sorts of fragments:
 		//   secondlife://RegionName/1/2/
 		//   sl://RegionName/1/2/3/
@@ -51,7 +51,7 @@ public:
 		// (and it parsed correctly, which is basically always because
 		// any bare region string is a valid fragment).
 
-	static bool parse(const LLString& sim_string, std::string *region_name, S32 *x, S32 *y, S32 *z);
+	static bool parse(const std::string& sim_string, std::string *region_name, S32 *x, S32 *y, S32 *z);
 		// Parse a sim string "Ahern/1/2" and return location data,
 		// doesn't affect static instance.
 
@@ -64,16 +64,18 @@ public:
 	LLURLSimString() : mX(128), mY(128), mZ(0), mParseState(NOT_PARSED) {}
 
 private:
-	static S32 parseGridIdx(const LLString& in_string, S32 idx0, S32* res);
+	static std::string::size_type parseGridIdx(const std::string& in_string,
+											   std::string::size_type idx0,
+											   std::string::size_type* res);
 
 public:
 	static LLURLSimString sInstance;
-	static LLString sLocationStringHome;
-	static LLString sLocationStringLast;
+	static std::string sLocationStringHome;
+	static std::string sLocationStringLast;
 
 public:
-	LLString mSimString; // "name/x/y/z"
-	LLString mSimName;
+	std::string mSimString; // "name/x/y/z"
+	std::string mSimName;
 	S32 mX,mY,mZ;
 	S32 mParseState;
 };
diff --git a/linden/indra/newview/llurlwhitelist.cpp b/linden/indra/newview/llurlwhitelist.cpp
index ebd6ccd..a3d401b 100644
--- a/linden/indra/newview/llurlwhitelist.cpp
+++ b/linden/indra/newview/llurlwhitelist.cpp
@@ -89,10 +89,10 @@ bool LLUrlWhiteList::load ()
 	clear ();
 
 	// build filename for each user
-	LLString resolvedFilename = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, mFilename.c_str () );
+	std::string resolvedFilename = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, mFilename );
 
 	// open a file for reading
-	llifstream file ( resolvedFilename.c_str () );
+	llifstream file ( resolvedFilename );
 	if ( file.is_open () )
 	{
 		// add each line in the file to the list
@@ -118,10 +118,10 @@ bool LLUrlWhiteList::load ()
 bool LLUrlWhiteList::save ()
 {
 	// build filename for each user
-	LLString resolvedFilename = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, mFilename.c_str () );
+	std::string resolvedFilename = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, mFilename );
 
 	// open a file for writing
-	llofstream file ( resolvedFilename.c_str () );
+	llofstream file ( resolvedFilename );
 	if ( file.is_open () )
 	{
 		// for each entry we have
@@ -149,9 +149,9 @@ bool LLUrlWhiteList::clear ()
 	return true;
 }
 
-LLString url_cleanup(LLString pattern)
+std::string url_cleanup(std::string pattern)
 {
-	LLString::trim(pattern);
+	LLStringUtil::trim(pattern);
 	S32 length = pattern.length();
 	S32 position = 0;
 	std::string::reverse_iterator it = pattern.rbegin();
@@ -164,7 +164,7 @@ LLString url_cleanup(LLString pattern)
 		{
 			// found second to last '/'
 			S32 desired_length = length - position;
-			LLString::truncate(pattern, desired_length);
+			LLStringUtil::truncate(pattern, desired_length);
 			break;
 		}
 		++position;
@@ -174,9 +174,9 @@ LLString url_cleanup(LLString pattern)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-bool LLUrlWhiteList::addItem ( const LLString& itemIn, bool saveAfterAdd )
+bool LLUrlWhiteList::addItem ( const std::string& itemIn, bool saveAfterAdd )
 {
-	LLString item = url_cleanup(itemIn);
+	std::string item = url_cleanup(itemIn);
 	
 	mUrlList.push_back ( item );
 
@@ -189,7 +189,7 @@ bool LLUrlWhiteList::addItem ( const LLString& itemIn, bool saveAfterAdd )
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-bool LLUrlWhiteList::getFirst ( LLString& valueOut )
+bool LLUrlWhiteList::getFirst ( std::string& valueOut )
 {
 	if ( mUrlList.size () == 0 )
 		return false;
@@ -202,7 +202,7 @@ bool LLUrlWhiteList::getFirst ( LLString& valueOut )
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-bool LLUrlWhiteList::getNext ( LLString& valueOut )
+bool LLUrlWhiteList::getNext ( std::string& valueOut )
 {
 	if ( mCurIndex >= mUrlList.size () )
 		return false;
@@ -214,7 +214,7 @@ bool LLUrlWhiteList::getNext ( LLString& valueOut )
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-bool LLUrlWhiteList::containsMatch ( const LLString& patternIn )
+bool LLUrlWhiteList::containsMatch ( const std::string& patternIn )
 {
 	return false;
 }
diff --git a/linden/indra/newview/llurlwhitelist.h b/linden/indra/newview/llurlwhitelist.h
index 2b980b2..3e796f4 100644
--- a/linden/indra/newview/llurlwhitelist.h
+++ b/linden/indra/newview/llurlwhitelist.h
@@ -48,21 +48,21 @@ class LLUrlWhiteList
 		bool save ();
 
 		bool clear ();
-		bool addItem ( const LLString& itemIn, bool saveAfterAdd );
+		bool addItem ( const std::string& itemIn, bool saveAfterAdd );
 
-		bool containsMatch ( const LLString& patternIn );
+		bool containsMatch ( const std::string& patternIn );
 
-		bool getFirst ( LLString& valueOut );
-		bool getNext ( LLString& valueOut );
+		bool getFirst ( std::string& valueOut );
+		bool getNext ( std::string& valueOut );
 
 	private:
 		LLUrlWhiteList ();
 		static LLUrlWhiteList* sInstance;
 
-		typedef std::vector < LLString > string_list_t ;
+		typedef std::vector < std::string > string_list_t ;
 
 		bool mLoaded;
-		const LLString mFilename;
+		const std::string mFilename;
 		string_list_t mUrlList;
 		U32 mCurIndex;
 };
diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp
index 6c8801a..a9b00e1 100644
--- a/linden/indra/newview/lluserauth.cpp
+++ b/linden/indra/newview/lluserauth.cpp
@@ -89,12 +89,12 @@ void LLUserAuth::reset()
 
 
 void LLUserAuth::authenticate(
-	const char* auth_uri,
-	const char* method,
-	const char* firstname,
-	const char* lastname,
+	const std::string& auth_uri,
+	const std::string& method,
+	const std::string& firstname,
+	const std::string& lastname,
 	LLUUID web_login_key,
-	const char* start,
+	const std::string& start,
 	BOOL skip_optional,
 	BOOL accept_tos,
 	BOOL accept_critical_message,
@@ -111,22 +111,22 @@ void LLUserAuth::authenticate(
 	std::copy(requested_options.begin(), requested_options.end(), appender);
 	option_str << "END";
 	
-	LL_INFOS2("AppInit", "Authentication") << option_str.str().c_str() << LL_ENDL;
+	LL_INFOS2("AppInit", "Authentication") << option_str.str() << LL_ENDL;
 
 	mAuthResponse = E_NO_RESPONSE_YET;
 	//mDownloadTimer.reset();
 	
 	// create the request
 	XMLRPC_REQUEST request = XMLRPC_RequestNew();
-	XMLRPC_RequestSetMethodName(request, method);
+	XMLRPC_RequestSetMethodName(request, method.c_str());
 	XMLRPC_RequestSetRequestType(request, xmlrpc_request_call);
 
 	// stuff the parameters
 	XMLRPC_VALUE params = XMLRPC_CreateVector(NULL, xmlrpc_vector_struct);
-	XMLRPC_VectorAppendString(params, "first", firstname, 0);
-	XMLRPC_VectorAppendString(params, "last", lastname, 0);
+	XMLRPC_VectorAppendString(params, "first", firstname.c_str(), 0);
+	XMLRPC_VectorAppendString(params, "last", lastname.c_str(), 0);
 	XMLRPC_VectorAppendString(params, "web_login_key", web_login_key.getString().c_str(), 0);
-	XMLRPC_VectorAppendString(params, "start", start, 0);
+	XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
 	XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
 	XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
 	XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
@@ -173,12 +173,12 @@ void LLUserAuth::authenticate(
 
 // passwd is already MD5 hashed by the time we get to it.
 void LLUserAuth::authenticate(
-	const char* auth_uri,
-	const char* method,
-	const char* firstname,
-	const char* lastname,
-	const char* passwd,
-	const char* start,
+	const std::string& auth_uri,
+	const std::string& method,
+	const std::string& firstname,
+	const std::string& lastname,
+	const std::string& passwd,
+	const std::string& start,
 	BOOL skip_optional,
 	BOOL accept_tos,
 	BOOL accept_critical_message,
@@ -204,15 +204,15 @@ void LLUserAuth::authenticate(
 	
 	// create the request
 	XMLRPC_REQUEST request = XMLRPC_RequestNew();
-	XMLRPC_RequestSetMethodName(request, method);
+	XMLRPC_RequestSetMethodName(request, method.c_str());
 	XMLRPC_RequestSetRequestType(request, xmlrpc_request_call);
 
 	// stuff the parameters
 	XMLRPC_VALUE params = XMLRPC_CreateVector(NULL, xmlrpc_vector_struct);
-	XMLRPC_VectorAppendString(params, "first", firstname, 0);
-	XMLRPC_VectorAppendString(params, "last", lastname, 0);
+	XMLRPC_VectorAppendString(params, "first", firstname.c_str(), 0);
+	XMLRPC_VectorAppendString(params, "last", lastname.c_str(), 0);
 	XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0);
-	XMLRPC_VectorAppendString(params, "start", start, 0);
+	XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
 	XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
 	XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
 	XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
@@ -379,9 +379,7 @@ LLUserAuth::UserAuthcode LLUserAuth::parseResponse()
 		}
 		else if(xmlrpc_type_int == type)
 		{
-			char buf[MAX_STRING];		/* Flawfinder: ignore */
-			snprintf(buf, MAX_STRING, "%d", XMLRPC_GetValueInt(current));		/* Flawfinder: ignore */
-			val.assign(buf);
+			val = llformat( "%d", XMLRPC_GetValueInt(current));
 			lldebugs << "val: " << val << llendl;
 			mResponses.insert(response_t::value_type(key, val));
 		}
@@ -407,22 +405,18 @@ LLUserAuth::UserAuthcode LLUserAuth::parseResponse()
 	return rv;
 }
 
-const char* LLUserAuth::getResponse(const char* name) const
+const std::string& LLUserAuth::getResponse(const std::string& key) const
 {
-	if(!name) return NULL;
-	std::string key(name);
 	response_t::const_iterator it = mResponses.find(key);
 	if(it != mResponses.end())
 	{
-		return((*it).second.c_str());
+		return((*it).second);
 	}
-	return NULL;
+	return LLStringUtil::null;
 }
 
-BOOL LLUserAuth::getOptions(const char* name, options_t& options) const
+BOOL LLUserAuth::getOptions(const std::string& key, options_t& options) const
 {
-	if(!name) return FALSE;
-	std::string key(name);
 	all_options_t::const_iterator it = mOptions.find(key);
 	if(it != mOptions.end())
 	{
diff --git a/linden/indra/newview/lluserauth.h b/linden/indra/newview/lluserauth.h
index b59c3f3..14321b7 100644
--- a/linden/indra/newview/lluserauth.h
+++ b/linden/indra/newview/lluserauth.h
@@ -95,12 +95,12 @@ public:
 
 	// viewer auth version
 	void authenticate(
-		const char* auth_uri,
-		const char* auth_method,
-		const char* firstname,
-		const char* lastname,
+		const std::string& auth_uri,
+		const std::string& auth_method,
+		const std::string& firstname,
+		const std::string& lastname,
 		LLUUID web_login_key,
-		const char* start,
+		const std::string& start,
 		BOOL skip_optional_update,
 		BOOL accept_tos,
 		BOOL accept_critical_message,
@@ -111,12 +111,12 @@ public:
 
 	// legacy version
 	void authenticate(
-		const char* auth_uri,
-		const char* auth_method,
-		const char* firstname,
-		const char* lastname,
-		const char* password,
-		const char* start,
+		const std::string& auth_uri,
+		const std::string& auth_method,
+		const std::string& firstname,
+		const std::string& lastname,
+		const std::string& password,
+		const std::string& start,
 		BOOL skip_optional_update,
 		BOOL accept_tos,
 		BOOL accept_critical_message,
@@ -134,8 +134,8 @@ public:
 
 	// function to get a direct reponse from the login api by
 	// name. returns NULL if the named response was not found.
-	const char* getResponse(const char* name) const;
-	BOOL getOptions(const char* name, options_t& options) const;
+	const std::string& getResponse(const std::string& name) const;
+	BOOL getOptions(const std::string& name, options_t& options) const;
 
 	F64 getLastTransferRateBPS() const { return mLastTransferRateBPS; }
 
diff --git a/linden/indra/newview/llvelocitybar.cpp b/linden/indra/newview/llvelocitybar.cpp
index 169ecac..e8b9a74 100644
--- a/linden/indra/newview/llvelocitybar.cpp
+++ b/linden/indra/newview/llvelocitybar.cpp
@@ -109,32 +109,32 @@ void LLVelocityBar::draw()
 
 	top = BAR_TOP + 15;
 	left = 0;
-	char str[80];		/* Flawfinder: ignore */
-	snprintf(str, sizeof(str), "Velocity %.3fm/s", velocity);		/* Flawfinder: ignore */
+	std::string str;
+	str = llformat( "Velocity %.3fm/s", velocity);
 	LLFontGL::sMonospace->renderUTF8(str, 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	top = TICK_BOTTOM;
 
 	left = - MAGIC_CHAR_WIDTH/2;
-	LLFontGL::sMonospace->renderUTF8("0", 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
+	LLFontGL::sMonospace->renderUTF8(std::string("0"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	left = (getRect().getWidth()*1 / 6) - MAGIC_CHAR_WIDTH * 2;
-	LLFontGL::sMonospace->renderUTF8("1", 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
+	LLFontGL::sMonospace->renderUTF8(std::string("1"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	left = (getRect().getWidth()*2 / 6) - MAGIC_CHAR_WIDTH;
-	LLFontGL::sMonospace->renderUTF8("2", 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
+	LLFontGL::sMonospace->renderUTF8(std::string("2"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	left = (getRect().getWidth()*3 / 6) - MAGIC_CHAR_WIDTH * 2;
-	LLFontGL::sMonospace->renderUTF8("3", 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
+	LLFontGL::sMonospace->renderUTF8(std::string("3"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	left = (getRect().getWidth()*4 / 6) - MAGIC_CHAR_WIDTH;
-	LLFontGL::sMonospace->renderUTF8("4", 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
+	LLFontGL::sMonospace->renderUTF8(std::string("4"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	left = (getRect().getWidth()*5 / 6) - MAGIC_CHAR_WIDTH * 2;
-	LLFontGL::sMonospace->renderUTF8("5", 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
+	LLFontGL::sMonospace->renderUTF8(std::string("5"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	left = (getRect().getWidth()*6 / 6) - MAGIC_CHAR_WIDTH * 3;
-	LLFontGL::sMonospace->renderUTF8("6 m/s", 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
+	LLFontGL::sMonospace->renderUTF8(std::string("6 m/s"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
 	// draw idle time
 	top = BAR_TOP;
diff --git a/linden/indra/newview/llviewchildren.cpp b/linden/indra/newview/llviewchildren.cpp
index b19a336..f96915b 100644
--- a/linden/indra/newview/llviewchildren.cpp
+++ b/linden/indra/newview/llviewchildren.cpp
@@ -52,18 +52,18 @@ LLViewChildren::LLViewChildren(LLPanel& parent)
 }
 
 
-void LLViewChildren::show(const char* id, bool visible)
+void LLViewChildren::show(const std::string& id, bool visible)
 {
 	mParent.childSetVisible(id, visible);
 }
 
-void LLViewChildren::enable(const char* id, bool enabled)
+void LLViewChildren::enable(const std::string& id, bool enabled)
 {
 	mParent.childSetEnabled(id, enabled);
 }
 
 void LLViewChildren::setText(
-	const char* id, const std::string& text, bool visible)
+	const std::string& id, const std::string& text, bool visible)
 {
 	LLTextBox* child = mParent.getChild<LLTextBox>(id);
 	if (child)
@@ -74,7 +74,7 @@ void LLViewChildren::setText(
 }
 
 void LLViewChildren::setWrappedText(
-	const char* id, const std::string& text, bool visible)
+	const std::string& id, const std::string& text, bool visible)
 {
 	LLTextBox* child = mParent.getChild<LLTextBox>(id);
 	if (child)
@@ -84,7 +84,7 @@ void LLViewChildren::setWrappedText(
 	}
 }
 
-void LLViewChildren::setBadge(const char* id, Badge badge, bool visible)
+void LLViewChildren::setBadge(const std::string& id, Badge badge, bool visible)
 {
 	LLIconCtrl* child = mParent.getChild<LLIconCtrl>(id);
 	if (child)
@@ -93,15 +93,15 @@ void LLViewChildren::setBadge(const char* id, Badge badge, bool visible)
 		switch (badge)
 		{
 			default:
-			case BADGE_OK:		child->setImage("badge_ok.j2c");	break;
-			case BADGE_NOTE:	child->setImage("badge_note.j2c");	break;
-			case BADGE_WARN:	child->setImage("badge_warn.j2c");	break;
-			case BADGE_ERROR:	child->setImage("badge_error.j2c");	break;
+			case BADGE_OK:		child->setImage(std::string("badge_ok.j2c"));	break;
+			case BADGE_NOTE:	child->setImage(std::string("badge_note.j2c"));	break;
+			case BADGE_WARN:	child->setImage(std::string("badge_warn.j2c"));	break;
+			case BADGE_ERROR:	child->setImage(std::string("badge_error.j2c"));	break;
 		}
 	}
 }
 
-void LLViewChildren::setAction(const char* id,
+void LLViewChildren::setAction(const std::string& id,
 	void(*function)(void*), void* value)
 {
 	LLButton* button = mParent.getChild<LLButton>(id);
diff --git a/linden/indra/newview/llviewchildren.h b/linden/indra/newview/llviewchildren.h
index 75c550b..f3d1560 100644
--- a/linden/indra/newview/llviewchildren.h
+++ b/linden/indra/newview/llviewchildren.h
@@ -42,27 +42,27 @@ public:
 	LLViewChildren(LLPanel& parent);
 	
 	// all views
-	void show(const char* id, bool visible = true);
-	void hide(const char* id) { show(id, false); }
+	void show(const std::string& id, bool visible = true);
+	void hide(const std::string& id) { show(id, false); }
 
-	void enable(const char* id, bool enabled = true);
-	void disable(const char* id) { enable(id, false); };
+	void enable(const std::string& id, bool enabled = true);
+	void disable(const std::string& id) { enable(id, false); };
 
 	//
 	// LLTextBox
-	void setText(const char* id,
+	void setText(const std::string& id,
 		const std::string& text, bool visible = true);
-	void setWrappedText(const char* id,
+	void setWrappedText(const std::string& id,
 		const std::string& text, bool visible = true);
 
 	// LLIconCtrl
 	enum Badge { BADGE_OK, BADGE_NOTE, BADGE_WARN, BADGE_ERROR };
 	
-	void setBadge(const char* id, Badge b, bool visible = true);
+	void setBadge(const std::string& id, Badge b, bool visible = true);
 
 	
 	// LLButton
-	void setAction(const char* id, void(*function)(void*), void* value);
+	void setAction(const std::string& id, void(*function)(void*), void* value);
 
 
 private:
diff --git a/linden/indra/newview/llviewerassetstorage.cpp b/linden/indra/newview/llviewerassetstorage.cpp
index ac4003b..03e5b40 100644
--- a/linden/indra/newview/llviewerassetstorage.cpp
+++ b/linden/indra/newview/llviewerassetstorage.cpp
@@ -88,7 +88,7 @@ void LLViewerAssetStorage::storeAssetData(
 				// This can happen if there's a bug in our code or if the VFS has been corrupted.
 				llwarns << "LLViewerAssetStorage::storeAssetData()  Data _should_ already be in the VFS, but it's not! " << asset_id << llendl;
 				// LLAssetStorage metric: Zero size VFS
-				reportMetric( asset_id, asset_type, NULL, LLUUID::null, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
+				reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
 
 				delete req;
 				if (callback)
@@ -102,7 +102,7 @@ void LLViewerAssetStorage::storeAssetData(
 				// LLAssetStorage metric: Successful Request
 				S32 size = mVFS->getSize(asset_id, asset_type);
 				const char *message = "Added to upload queue";
-				reportMetric( asset_id, asset_type, NULL, LLUUID::null, size, MR_OKAY, __FILE__, __LINE__, message );
+				reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, size, MR_OKAY, __FILE__, __LINE__, message );
 
 				if(is_priority)
 				{
@@ -130,7 +130,7 @@ void LLViewerAssetStorage::storeAssetData(
 					llwarns << "Probable corruption in VFS file, aborting store asset data" << llendl;
 
 					// LLAssetStorage metric: VFS corrupt - bogus size
-					reportMetric( asset_id, asset_type, NULL, LLUUID::null, asset_size, MR_VFS_CORRUPTION, __FILE__, __LINE__, "VFS corruption" );
+					reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, asset_size, MR_VFS_CORRUPTION, __FILE__, __LINE__, "VFS corruption" );
 
 					if (callback)
 					{
@@ -158,7 +158,7 @@ void LLViewerAssetStorage::storeAssetData(
 		{
 			llwarns << "AssetStorage: attempt to upload non-existent vfile " << asset_id << ":" << LLAssetType::lookup(asset_type) << llendl;
 			// LLAssetStorage metric: Zero size VFS
-			reportMetric( asset_id, asset_type, NULL, LLUUID::null, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
+			reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
 			if (callback)
 			{
 				callback(asset_id, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LL_EXSTAT_NONEXISTENT_FILE);
@@ -169,7 +169,7 @@ void LLViewerAssetStorage::storeAssetData(
 	{
 		llwarns << "Attempt to move asset store request upstream w/o valid upstream provider" << llendl;
 		// LLAssetStorage metric: Upstream provider dead
-		reportMetric( asset_id, asset_type, NULL, LLUUID::null, 0, MR_NO_UPSTREAM, __FILE__, __LINE__, "No upstream provider" );
+		reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_NO_UPSTREAM, __FILE__, __LINE__, "No upstream provider" );
 		if (callback)
 		{
 			callback(asset_id, user_data, LL_ERR_CIRCUIT_GONE, LL_EXSTAT_NO_UPSTREAM);
@@ -178,7 +178,7 @@ void LLViewerAssetStorage::storeAssetData(
 }
 
 void LLViewerAssetStorage::storeAssetData(
-	const char* filename,
+	const std::string& filename,
 	const LLTransactionID& tid,
 	LLAssetType::EType asset_type,
 	LLStoreAssetCallback callback,
@@ -188,10 +188,10 @@ void LLViewerAssetStorage::storeAssetData(
 	bool user_waiting,
 	F64 timeout)
 {
-if(!filename)
+	if(filename.empty())
 	{
 		// LLAssetStorage metric: no filename
-		reportMetric( LLUUID::null, asset_type, "", LLUUID::null, 0, MR_VFS_CORRUPTION, __FILE__, __LINE__, "Filename missing" );
+		reportMetric( LLUUID::null, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_VFS_CORRUPTION, __FILE__, __LINE__, "Filename missing" );
 		llerrs << "No filename specified" << llendl;
 		return;
 	}
diff --git a/linden/indra/newview/llviewerassetstorage.h b/linden/indra/newview/llviewerassetstorage.h
index 7b57e99..f606098 100644
--- a/linden/indra/newview/llviewerassetstorage.h
+++ b/linden/indra/newview/llviewerassetstorage.h
@@ -58,7 +58,7 @@ public:
 		F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 	
 	virtual void storeAssetData(
-		const char* filename,
+		const std::string& filename,
 		const LLTransactionID& tid,
 		LLAssetType::EType type,
 		LLStoreAssetCallback callback,
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 07e3109..32d20a9 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -50,9 +50,6 @@
 #include "lltoolmgr.h"
 #include "llviewerjoystick.h"
 
-GLfloat gGLZFar;
-GLfloat gGLZNear;
-
 //glu pick matrix implementation borrowed from Mesa3D
 glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport)
 {
@@ -146,12 +143,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
 	mScreenPixelArea =(S32)((F32)mViewHeightInPixels * ((F32)mViewHeightInPixels * mAspect));
 }
 
-// Handy copies of last good GL matrices
-F64	gGLModelView[16];
-F64	gGLLastModelView[16];
-F64 gGLProjection[16];
-S32	gGLViewport[4];
-
 const LLMatrix4 &LLViewerCamera::getProjection() const
 {
 	calcProjection(getFar());
@@ -343,9 +334,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
 		gGLProjection[i] = proj_mat.m[i];
 	}
 
-	gGLZNear = z_near;
-	gGLZFar = z_far;
-
 	glMatrixMode( GL_MODELVIEW );
 
 	glh::matrix4f modelview((GLfloat*) OGL_TO_CFR_ROTATION);
diff --git a/linden/indra/newview/llviewercamera.h b/linden/indra/newview/llviewercamera.h
index 1f61ca9..2672a46 100644
--- a/linden/indra/newview/llviewercamera.h
+++ b/linden/indra/newview/llviewercamera.h
@@ -111,11 +111,4 @@ protected:
 public:
 };
 
-extern F64 gGLModelView[16];
-extern F64 gGLLastModelView[16];
-extern F64 gGLProjection[16];
-extern S32 gGLViewport[4];
-extern F32 gGLZNear;
-extern F32 gGLZFar;
-
 #endif // LL_LLVIEWERCAMERA_H
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 98d19bc..9651fa3 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -43,7 +43,7 @@
 #include "lldrawpoolterrain.h"
 #include "llflexibleobject.h"
 #include "llfeaturemanager.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llnetmap.h"
 #include "llpanelgeneral.h"
 #include "llpanelinput.h"
@@ -76,14 +76,14 @@ BOOL 				gHackGodmode = FALSE;
 #endif
 
 
-std::map<LLString, LLControlGroup*> gSettings;
+std::map<std::string, LLControlGroup*> gSettings;
 LLControlGroup gSavedSettings;	// saved at end of session
 LLControlGroup gSavedPerAccountSettings; // saved at end of session
 LLControlGroup gColors;			// read-only
 LLControlGroup gCrashSettings;	// saved at end of session
 
-LLString gLastRunVersion;
-LLString gCurrentVersion;
+std::string gLastRunVersion;
+std::string gCurrentVersion;
 
 extern BOOL gResizeScreenTexture;
 extern BOOL gDebugGL;
@@ -114,7 +114,7 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
 
 static bool handleSetShaderChanged(const LLSD& newvalue)
 {
-	LLShaderMgr::setShaders();
+	LLViewerShaderMgr::instance()->setShaders();
 	return true;
 }
 
@@ -141,6 +141,12 @@ static bool handleAvatarLODChanged(const LLSD& newvalue)
 	return true;
 }
 
+static bool handleAvatarMaxVisibleChanged(const LLSD& newvalue)
+{
+	LLVOAvatar::sMaxVisible = (U32) newvalue.asInteger();
+	return true;
+}
+
 static bool handleTerrainLODChanged(const LLSD& newvalue)
 {
 		LLVOSurfacePatch::sLODFactor = (F32)newvalue.asReal();
@@ -271,7 +277,7 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
 				// otherwise music will briefly stop
 				if ( !gAudiop->isInternetStreamPlaying() )
 				{
-					gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL().c_str());
+					gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
 				}
 			}
 		}
@@ -385,7 +391,7 @@ static bool handleDebugViewsChanged(const LLSD& newvalue)
 static bool handleLogFileChanged(const LLSD& newvalue)
 {
 	std::string log_filename = newvalue.asString();
-	LLFile::remove(log_filename.c_str());
+	LLFile::remove(log_filename);
 	LLError::logToFile(log_filename);
 	return true;
 }
@@ -454,6 +460,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
 	gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
 	gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+	gSavedSettings.getControl("RenderAvatarMaxVisible")->getSignal()->connect(boost::bind(&handleAvatarMaxVisibleChanged, _1));
 	gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _1));
 	gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _1));
 	gSavedSettings.getControl("RenderTerrainLODFactor")->getSignal()->connect(boost::bind(&handleTerrainLODChanged, _1));
@@ -686,4 +693,5 @@ void test_cached_control()
 
 	if((std::string)test_BrowserHomePage != "http://www.secondlife.com") llerrs << "Fail BrowserHomePage" << llendl;
 }
-#endif // TEST_CACHED_CONTROL
\ No newline at end of file
+#endif // TEST_CACHED_CONTROL
+
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index 2475984..7892905 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -46,7 +46,7 @@ extern BOOL gHackGodmode;
 //setting variables are declared in this function
 void settings_setup_listeners();
 
-extern std::map<LLString, LLControlGroup*> gSettings;
+extern std::map<std::string, LLControlGroup*> gSettings;
 
 // for the graphics settings
 void create_graphics_group(LLControlGroup& group);
@@ -62,8 +62,8 @@ extern LLControlGroup gColors;
 extern LLControlGroup gCrashSettings;
 
 // Set after settings loaded
-extern LLString gLastRunVersion;
-extern LLString gCurrentVersion;
+extern std::string gLastRunVersion;
+extern std::string gCurrentVersion;
 
 //! Helper function for LLCachedControl
 template <class T> 
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index e02ff6f..627609b 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -44,6 +44,7 @@
 #include "lldynamictexture.h"
 #include "lldrawpoolalpha.h"
 #include "llfeaturemanager.h"
+#include "llfirstuse.h"
 #include "llframestats.h"
 #include "llhudmanager.h"
 #include "llimagebmp.h"
@@ -68,6 +69,7 @@
 #include "llspatialpartition.h"
 #include "llappviewer.h"
 #include "llstartup.h"
+#include "llviewershadermgr.h"
 #include "llfasttimer.h"
 #include "llfloatertools.h"
 #include "llviewerimagelist.h"
@@ -105,7 +107,7 @@ LLFrameTimer gRecentMemoryTime;
 // Rendering stuff
 void pre_show_depth_buffer();
 void post_show_depth_buffer();
-void render_ui_and_swap();
+void render_ui();
 void render_hud_attachments();
 void render_ui_3d();
 void render_ui_2d();
@@ -239,6 +241,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			gFrameStats.start(LLFrameStats::REBUILD);
 			gPipeline.rebuildPools();
 		}
+
+		gViewerWindow->returnEmptyPicks();
 		return; 
 	}
 
@@ -331,10 +335,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		{
 			// Give up.  Don't keep the UI locked forever.
 			gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
-			gAgent.setTeleportMessage("");
+			gAgent.setTeleportMessage(std::string());
 		}
 
-		const LLString& message = gAgent.getTeleportMessage();
+		const std::string& message = gAgent.getTeleportMessage();
 		switch( gAgent.getTeleportState() )
 		{
 		case LLAgent::TELEPORT_START:
@@ -363,7 +367,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		case LLAgent::TELEPORT_START_ARRIVAL:
 			// Transition to ARRIVING.  Viewer has received avatar update, etc., from destination simulator
 			gTeleportArrivalTimer.reset();
-			gViewerWindow->setProgressCancelButtonVisible(FALSE, "Cancel");
+			gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
 			gViewerWindow->setProgressPercent(75.f);
 			gAgent.setTeleportState( LLAgent::TELEPORT_ARRIVING );
 			gAgent.setTeleportMessage(
@@ -378,9 +382,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 				if( arrival_fraction > 1.f )
 				{
 					arrival_fraction = 1.f;
+					LLFirstUse::useTeleport();
 					gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
 				}
-				gViewerWindow->setProgressCancelButtonVisible(FALSE, "Cancel");
+				gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
 				gViewerWindow->setProgressPercent(  arrival_fraction * 25.f + 75.f);
 				gViewerWindow->setProgressString(message);
 			}
@@ -455,7 +460,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	if (gDisconnected)
 	{
 		LLAppViewer::instance()->pingMainloopTimeout("Display:Disconnected");
-		render_ui_and_swap();
+		render_ui();
 		render_disconnected_background();
 	}
 	
@@ -466,12 +471,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	//
 	LLAppViewer::instance()->pingMainloopTimeout("Display:RenderSetup");
 	stop_glerror();
-	if (gSavedSettings.getBOOL("ShowDepthBuffer"))
-	{
-		pre_show_depth_buffer();
-	}
-
-	stop_glerror();
 
 	///////////////////////////////////////
 	//
@@ -531,7 +530,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		
 		gFrameStats.start(LLFrameStats::UPDATE_CULL);
 		S32 water_clip = 0;
-		if ((LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) > 1) &&
+		if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT) > 1) &&
 			 gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_WATER))
 		{
 			if (LLViewerCamera::getInstance()->cameraUnderWater())
@@ -759,7 +758,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
 		if (!for_snapshot)
 		{
-			render_ui_and_swap();
+			render_ui();
 		}
 
 		LLSpatialGroup::sNoDelete = FALSE;
@@ -797,7 +796,12 @@ void render_hud_attachments()
 	glh::matrix4f current_proj = glh_get_current_projection();
 	glh::matrix4f current_mod = glh_get_current_modelview();
 
-	if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices(FALSE))
+	// clamp target zoom level to reasonable values
+	gAgent.mHUDTargetZoom = llclamp(gAgent.mHUDTargetZoom, 0.1f, 1.f);
+	// smoothly interpolate current zoom level
+	gAgent.mHUDCurZoom = lerp(gAgent.mHUDCurZoom, gAgent.mHUDTargetZoom, LLCriticalDamp::getInterpolant(0.03f));
+
+	if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices())
 	{
 		LLCamera hud_cam = *LLViewerCamera::getInstance();
 		LLVector3 origin = hud_cam.getOrigin();
@@ -855,52 +859,53 @@ void render_hud_attachments()
 	glh_set_current_modelview(current_mod);
 }
 
-BOOL setup_hud_matrices(BOOL for_select)
+BOOL setup_hud_matrices()
+{
+	LLRect whole_screen = gViewerWindow->getVirtualWindowRect();
+
+	// apply camera zoom transform (for high res screenshots)
+	F32 zoom_factor = LLViewerCamera::getInstance()->getZoomFactor();
+	S16 sub_region = LLViewerCamera::getInstance()->getZoomSubRegion();
+	if (zoom_factor > 1.f)
+	{
+		S32 num_horizontal_tiles = llceil(zoom_factor);
+		S32 tile_width = llround((F32)gViewerWindow->getWindowWidth() / zoom_factor);
+		S32 tile_height = llround((F32)gViewerWindow->getWindowHeight() / zoom_factor);
+		int tile_y = sub_region / num_horizontal_tiles;
+		int tile_x = sub_region - (tile_y * num_horizontal_tiles);
+		glh::matrix4f mat;
+
+		whole_screen.setLeftTopAndSize(tile_x * tile_width, gViewerWindow->getWindowHeight() - (tile_y * tile_height), tile_width, tile_height);
+	}
+
+	return setup_hud_matrices(whole_screen);
+}
+
+BOOL setup_hud_matrices(const LLRect& screen_region)
 {
 	LLVOAvatar* my_avatarp = gAgent.getAvatarObject();
 	if (my_avatarp && my_avatarp->hasHUDAttachment())
 	{
-		if (!for_select)
-		{
-			// clamp target zoom level to reasonable values
-			my_avatarp->mHUDTargetZoom = llclamp(my_avatarp->mHUDTargetZoom, 0.1f, 1.f);
-			// smoothly interpolate current zoom level
-			my_avatarp->mHUDCurZoom = lerp(my_avatarp->mHUDCurZoom, my_avatarp->mHUDTargetZoom, LLCriticalDamp::getInterpolant(0.03f));
-		}
-
-		F32 zoom_level = my_avatarp->mHUDCurZoom;
-		// clear z buffer and set up transform for hud
-		if (!for_select)
-		{
-			//glClear(GL_DEPTH_BUFFER_BIT);
-		}
+		F32 zoom_level = gAgent.mHUDCurZoom;
 		LLBBox hud_bbox = my_avatarp->getHUDBBox();
 
-		
-		// set up transform to encompass bounding box of HUD
+		// set up transform to keep HUD objects in front of camera
 		glMatrixMode(GL_PROJECTION);
 		F32 hud_depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f);
-		if (for_select)
-		{
-			//RN: reset viewport to window extents so ortho screen is calculated with proper reference frame
-			gViewerWindow->setupViewport();
-		}
 		glh::matrix4f proj = gl_ortho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, hud_depth);
 		proj.element(2,2) = -0.01f;
 
-		// apply camera zoom transform (for high res screenshots)
-		F32 zoom_factor = LLViewerCamera::getInstance()->getZoomFactor();
-		S16 sub_region = LLViewerCamera::getInstance()->getZoomSubRegion();
-		if (zoom_factor > 1.f)
-		{
-			float offset = zoom_factor - 1.f;
-			int pos_y = sub_region / llceil(zoom_factor);
-			int pos_x = sub_region - (pos_y*llceil(zoom_factor));
-			glh::matrix4f mat;
-			mat.set_scale(glh::vec3f(zoom_factor, zoom_factor, 1.f));
-			mat.set_translate(glh::vec3f(LLViewerCamera::getInstance()->getAspect() * 0.5f * (offset - (F32)pos_x * 2.f), 0.5f * (offset - (F32)pos_y * 2.f), 0.f));
-			proj *= mat;
-		}
+		F32 aspect_ratio = LLViewerCamera::getInstance()->getAspect();
+
+		glh::matrix4f mat;
+		F32 scale_x = (F32)gViewerWindow->getWindowWidth() / (F32)screen_region.getWidth();
+		F32 scale_y = (F32)gViewerWindow->getWindowHeight() / (F32)screen_region.getHeight();
+		mat.set_scale(glh::vec3f(scale_x, scale_y, 1.f));
+		mat.set_translate(
+			glh::vec3f(clamp_rescale((F32)screen_region.getCenterX(), 0.f, (F32)gViewerWindow->getWindowWidth(), 0.5f * scale_x * aspect_ratio, -0.5f * scale_x * aspect_ratio),
+						clamp_rescale((F32)screen_region.getCenterY(), 0.f, (F32)gViewerWindow->getWindowHeight(), 0.5f * scale_y, -0.5f * scale_y),
+						0.f));
+		proj *= mat;
 
 		glLoadMatrixf(proj.m);
 		glh_set_current_projection(proj);
@@ -908,9 +913,8 @@ BOOL setup_hud_matrices(BOOL for_select)
 		glMatrixMode(GL_MODELVIEW);
 		glh::matrix4f model((GLfloat*) OGL_TO_CFR_ROTATION);
 		
-		glh::matrix4f mat;
-		mat.set_translate(glh::vec3f(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f));
 		mat.set_scale(glh::vec3f(zoom_level, zoom_level, zoom_level));
+		mat.set_translate(glh::vec3f(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f));
 
 		model *= mat;
 		glLoadMatrixf(model.m);
@@ -925,7 +929,7 @@ BOOL setup_hud_matrices(BOOL for_select)
 }
 
 
-void render_ui_and_swap()
+void render_ui()
 {
 	LLGLState::checkStates();
 	
@@ -1078,11 +1082,6 @@ void render_ui_3d()
 
 	// Debugging stuff goes before the UI.
 
-	if (gSavedSettings.getBOOL("ShowDepthBuffer"))
-	{
-		post_show_depth_buffer();
-	}
-
 	// Coordinate axes
 	if (gSavedSettings.getBOOL("ShowAxes"))
 	{
@@ -1126,14 +1125,14 @@ void render_ui_2d()
 	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
 
 	// render outline for HUD
-	if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->mHUDCurZoom < 0.98f)
+	if (gAgent.getAvatarObject() && gAgent.mHUDCurZoom < 0.98f)
 	{
 		glPushMatrix();
 		S32 half_width = (gViewerWindow->getWindowWidth() / 2);
 		S32 half_height = (gViewerWindow->getWindowHeight() / 2);
 		glScalef(LLUI::sGLScaleFactor.mV[0], LLUI::sGLScaleFactor.mV[1], 1.f);
 		glTranslatef((F32)half_width, (F32)half_height, 0.f);
-		F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
+		F32 zoom = gAgent.mHUDCurZoom;
 		glScalef(zoom,zoom,1.f);
 		gGL.color4fv(LLColor4::white.mV);
 		gl_rect_2d(-half_width, half_height, half_width, -half_height, FALSE);
@@ -1157,12 +1156,8 @@ void render_disconnected_background()
 	{
 		llinfos << "Loading last bitmap..." << llendl;
 
-		char temp_str[MAX_PATH];		/* Flawfinder: ignore */
-		strncpy(temp_str, gDirUtilp->getLindenUserDir().c_str(), MAX_PATH -1);		/* Flawfinder: ignore */
-		temp_str[MAX_PATH -1] = '\0';
-		strncat(temp_str, gDirUtilp->getDirDelimiter().c_str(), MAX_PATH - strlen(temp_str) -1);		/* Flawfinder: ignore */
-
-		strcat(temp_str, SCREEN_LAST_FILENAME);		/* Flawfinder: ignore */
+		std::string temp_str;
+		temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_LAST_FILENAME;
 
 		LLPointer<LLImageBMP> image_bmp = new LLImageBMP;
 		if( !image_bmp->load(temp_str) )
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index 9480574..c0c4592 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -44,7 +44,7 @@
 LLDispatcher gGenericDispatcher;
 
 
-void send_generic_message(const char* method,
+void send_generic_message(const std::string& method,
 						  const std::vector<std::string>& strings,
 						  const LLUUID& invoice)
 {
@@ -69,7 +69,7 @@ void send_generic_message(const char* method,
 		for(; it != end; ++it)
 		{
 			msg->nextBlock("ParamList");
-			msg->addString("Parameter", (*it).c_str());
+			msg->addString("Parameter", *it);
 		}
 	}
 	gAgent.sendReliableMessage();
diff --git a/linden/indra/newview/llviewergenericmessage.h b/linden/indra/newview/llviewergenericmessage.h
index a5f2920..b190009 100644
--- a/linden/indra/newview/llviewergenericmessage.h
+++ b/linden/indra/newview/llviewergenericmessage.h
@@ -37,7 +37,7 @@ class LLUUID;
 class LLDispatcher;
 
 
-void send_generic_message(const char* method,
+void send_generic_message(const std::string& method,
 						  const std::vector<std::string>& strings,
 						  const LLUUID& invoice = LLUUID::null);
 
diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp
index 5c739b7..a080663 100644
--- a/linden/indra/newview/llviewergesture.cpp
+++ b/linden/indra/newview/llviewergesture.cpp
@@ -126,7 +126,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat )
 		}
 		else
 		{
-			LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation.c_str());
+			LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation);
 			gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START);
 		}
 	}
@@ -161,8 +161,8 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou
 {
 	S32 in_len = in_str.length();
 
-	LLString in_str_lc = in_str;
-	LLString::toLower(in_str_lc);
+	std::string in_str_lc = in_str;
+	LLStringUtil::toLower(in_str_lc);
 
 	for (S32 i = 0; i < count(); i++)
 	{
@@ -176,7 +176,7 @@ BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* ou
 		}
 
 		std::string trigger_trunc = utf8str_truncate(trigger, in_len);
-		LLString::toLower(trigger_trunc);
+		LLStringUtil::toLower(trigger_trunc);
 		if (in_str_lc == trigger_trunc)
 		{
 			*out_str = trigger;
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index d436cd0..0b70f51 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -68,6 +68,8 @@ LLPointer<LLViewerImage> LLViewerImage::sSmokeImagep = NULL;
 LLPointer<LLImageGL> LLViewerImage::sNullImagep = NULL;
 
 S32 LLViewerImage::sImageCount = 0;
+S32 LLViewerImage::sRawCount = 0;
+S32 LLViewerImage::sAuxCount = 0;
 LLTimer LLViewerImage::sEvaluationTimer;
 F32 LLViewerImage::sDesiredDiscardBias = 0.f;
 static F32 sDesiredDiscardBiasMin = -2.0f; // -max number of levels to improve image quality by
@@ -206,7 +208,7 @@ LLViewerImage::LLViewerImage(const LLUUID& id, BOOL usemipmaps)
 	sImageCount++;
 }
 
-LLViewerImage::LLViewerImage(const LLString& filename, const LLUUID& id, BOOL usemipmaps)
+LLViewerImage::LLViewerImage(const std::string& filename, const LLUUID& id, BOOL usemipmaps)
 	: LLImageGL(usemipmaps),
 	  mID(id),
 	  mLocalFileName(filename)
@@ -220,7 +222,6 @@ LLViewerImage::LLViewerImage(const U32 width, const U32 height, const U8 compone
 	: LLImageGL(width, height, components, usemipmaps)
 {
 	init(true);
-	mNeedsAux = FALSE;
 	// Create an empty image of the specified size and width
 	mID.generate();
 	mFullyLoaded = TRUE;
@@ -231,7 +232,6 @@ LLViewerImage::LLViewerImage(const LLImageRaw* raw, BOOL usemipmaps)
 	: LLImageGL(raw, usemipmaps)
 {
 	init(true);
-	mNeedsAux = FALSE;
 	// Create an empty image of the specified size and width
 	mID.generate();
 	mFullyLoaded = TRUE;
@@ -335,7 +335,8 @@ void LLViewerImage::cleanup()
 		delete entryp;
 	}
 	mLoadedCallbackList.clear();
-
+	mNeedsAux = FALSE;
+	
 	// Clean up image data
 	destroyRawImage();
 	
@@ -423,6 +424,7 @@ BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
 
 	if (!imageraw_callbacks)
 	{
+		mNeedsAux = FALSE;
 		destroyRawImage();
 	}
 	return res;
@@ -605,6 +607,7 @@ F32 LLViewerImage::calcDecodePriority()
 
 	F32 priority;
 	S32 cur_discard = getDiscardLevel();
+	bool have_all_data = (cur_discard >= 0 && (cur_discard <= mDesiredDiscardLevel));
 	F32 pixel_priority = fsqrtf(mMaxVirtualSize) * (1.f + mMaxCosAngle);
 	const S32 MIN_NOT_VISIBLE_FRAMES = 30; // NOTE: this function is not called every frame
 	mDecodeFrame++;
@@ -622,11 +625,11 @@ F32 LLViewerImage::calcDecodePriority()
 		// Don't decode anything we don't need
 		priority = -1.0f;
 	}
-	else if (mBoostLevel == LLViewerImage::BOOST_UI)
+	else if (mBoostLevel == LLViewerImage::BOOST_UI && !have_all_data)
 	{
 		priority = 1.f;
 	}
-	else if (pixel_priority <= 0.f && (cur_discard < 0 || mDesiredDiscardLevel < cur_discard))
+	else if (pixel_priority <= 0.f && !have_all_data)
 	{
 		// Not on screen but we might want some data
 		if (mBoostLevel > BOOST_HIGH)
@@ -645,6 +648,11 @@ F32 LLViewerImage::calcDecodePriority()
 			return mDecodePriority;
 		}
 	}
+	else if ((mBoostLevel == LLViewerImage::BOOST_SCULPTED) && !have_all_data)
+	{
+		// Sculpted images are small, treat them like they always have no data.
+		priority = 900000.f;
+	}
 	else if (cur_discard < 0)
 	{
 		// We don't have any data yet, so we don't know the size of the image, treat as 1024x1024
@@ -655,7 +663,7 @@ F32 LLViewerImage::calcDecodePriority()
 		ddiscard = llclamp(ddiscard, 1, 9);
 		priority = ddiscard*100000.f;
 	}
-	else if (cur_discard <= mMinDiscardLevel)
+	else if ((mMinDiscardLevel > 0) && (cur_discard <= mMinDiscardLevel))
 	{
 		// larger mips are corrupted
 		priority = -3.0f;
@@ -681,15 +689,14 @@ F32 LLViewerImage::calcDecodePriority()
 	}
 	if (priority > 0.0f)
 	{
-		pixel_priority = llclamp(pixel_priority, 0.0f, priority-1.f);
-		priority += pixel_priority;
+		pixel_priority = llclamp(pixel_priority, 0.0f, priority-1.f); // priority range = 100000-900000
 		if ( mBoostLevel > BOOST_HIGH)
 		{
-			priority += 1000000.f + 1000.f * mBoostLevel;
+			priority = 1000000.f + pixel_priority + 1000.f * mBoostLevel;
 		}
-		else if ( mBoostLevel > 0)
+		else
 		{
-			priority +=       0.f + 1000.f * mBoostLevel;
+			priority +=      0.f + pixel_priority + 1000.f * mBoostLevel;
 		}
 	}
 	return priority;
@@ -774,7 +781,11 @@ bool LLViewerImage::updateFetch()
 	{
 		// Sets mRawDiscardLevel, mRawImage, mAuxRawImage
 		S32 fetch_discard = current_discard;
+		if (mRawImage.notNull()) sRawCount--;
+		if (mAuxRawImage.notNull()) sAuxCount--;
 		bool finished = LLAppViewer::getTextureFetch()->getRequestFinished(getID(), fetch_discard, mRawImage, mAuxRawImage);
+		if (mRawImage.notNull()) sRawCount++;
+		if (mAuxRawImage.notNull()) sAuxCount++;
 		if (finished)
 		{
 			mIsFetching = FALSE;
@@ -958,7 +969,8 @@ void LLViewerImage::setIsMissingAsset()
 
 //============================================================================
 
-void LLViewerImage::setLoadedCallback( loaded_callback_func loaded_callback, S32 discard_level, BOOL keep_imageraw, void* userdata)
+void LLViewerImage::setLoadedCallback( loaded_callback_func loaded_callback,
+									   S32 discard_level, BOOL keep_imageraw, BOOL needs_aux, void* userdata)
 {
 	//
 	// Don't do ANYTHING here, just add it to the global callback list
@@ -970,6 +982,12 @@ void LLViewerImage::setLoadedCallback( loaded_callback_func loaded_callback, S32
 	}
 	LLLoadedCallbackEntry* entryp = new LLLoadedCallbackEntry(loaded_callback, discard_level, keep_imageraw, userdata);
 	mLoadedCallbackList.push_back(entryp);
+	mNeedsAux |= needs_aux;
+	if (mNeedsAux && mAuxRawImage.isNull() && getDiscardLevel() >= 0)
+	{
+		// We need aux data, but we've already loaded the image, and it didn't have any
+		llwarns << "No aux data available for callback for image:" << getID() << llendl;
+	}
 }
 
 bool LLViewerImage::doLoadedCallbacks()
@@ -1090,9 +1108,7 @@ bool LLViewerImage::doLoadedCallbacks()
 		// We have GL data.
 
 		destroyRawImage();
-		createRawImage(gl_discard, TRUE);
-		readBackRaw(gl_discard, mRawImage, false);
-		mIsRawImageValid = TRUE;
+		readBackRawImage(gl_discard);
 		llassert_always(mRawImage.notNull());
 		llassert_always(!mNeedsAux || mAuxRawImage.notNull());
 	}
@@ -1237,32 +1253,28 @@ BOOL LLViewerImage::bind(S32 stage) const
 }
 
 // Was in LLImageGL
-LLImageRaw* LLViewerImage::createRawImage(S8 discard_level, BOOL allocate)
+LLImageRaw* LLViewerImage::readBackRawImage(S8 discard_level)
 {
-	llassert(discard_level >= 0);
+	llassert_always(discard_level >= 0);
+	llassert_always(mComponents > 0);
 	if (mRawImage.notNull())
 	{
-		llerrs << "createRawImage() called with existing mRawImage" << llendl;
+		llerrs << "called with existing mRawImage" << llendl;
 		mRawImage = NULL;
-		mAuxRawImage = NULL;
-	}
-	if (allocate && mComponents)
-	{
-		mRawImage = new LLImageRaw(getWidth(discard_level), getHeight(discard_level), mComponents);
-		mIsRawImageValid = TRUE;
-	}
-	else
-	{
-		mRawImage = new LLImageRaw;
-		mIsRawImageValid = FALSE;
 	}
+	mRawImage = new LLImageRaw(getWidth(discard_level), getHeight(discard_level), mComponents);
+	sRawCount++;
 	mRawDiscardLevel = discard_level;
+	readBackRaw(mRawDiscardLevel, mRawImage, false);
+	mIsRawImageValid = TRUE;
 	
 	return mRawImage;
 }
 
 void LLViewerImage::destroyRawImage()
 {
+	if (mRawImage.notNull()) sRawCount--;
+	if (mAuxRawImage.notNull()) sAuxCount--;
 	mRawImage = NULL;
 	mAuxRawImage = NULL;
 	mIsRawImageValid = FALSE;
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index a84cb72..60d9fb8 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -182,7 +182,7 @@ protected:
 	/*virtual*/ ~LLViewerImage();
 	
 public:
-	LLViewerImage(const LLString& filename, const LLUUID& id, BOOL usemipmaps = TRUE);
+	LLViewerImage(const std::string& filename, const LLUUID& id, BOOL usemipmaps = TRUE);
 	LLViewerImage(const LLUUID& id, BOOL usemipmaps = TRUE);
 	LLViewerImage(const U32 width, const U32 height, const U8 components, BOOL usemipmaps);
 	LLViewerImage(const LLImageRaw* raw, BOOL usemipmaps);
@@ -226,15 +226,13 @@ public:
 	// Set callbacks to get called when the image gets updated with higher 
 	// resolution versions.
 	void setLoadedCallback(loaded_callback_func cb,
-						   S32 discard_level,
-						   BOOL keep_imageraw,
+						   S32 discard_level, BOOL keep_imageraw, BOOL needs_aux,
 						   void* userdata);
 
 	 // ONLY call from LLViewerImageList
 	BOOL createTexture(S32 usename = 0);
 
 	BOOL needsAux() const							{ return mNeedsAux; }
-	void setNeedsAux(const BOOL needs_aux)			{ mNeedsAux = needs_aux; }
 
 	// setDesiredDiscardLevel is only used by LLViewerImageList
 	void setDesiredDiscardLevel(S32 discard) { mDesiredDiscardLevel = discard; }
@@ -303,7 +301,7 @@ private:
 	void init(bool firstinit);
 
 	// Used to be in LLImageGL
-	LLImageRaw* createRawImage(S8 discard_level = 0, BOOL allocate = FALSE);
+	LLImageRaw* readBackRawImage(S8 discard_level = 0);
 	void destroyRawImage();
 	
 public:
@@ -312,7 +310,7 @@ public:
 
 	S32 mOrigWidth;
 	S32 mOrigHeight;
-	LLString mLocalFileName;
+	std::string mLocalFileName;
 
 	// Data used for calculating required image priority/quality level/decimation
 	mutable F32 mMaxVirtualSize;	// The largest virtual size of the image, in pixels - how much data to we need?
@@ -385,6 +383,8 @@ public:
 	static LLPointer<LLImageGL> sNullImagep; // Null texture for non-textured objects.
 
 	static S32 sImageCount;
+	static S32 sRawCount;
+	static S32 sAuxCount;
 	static LLTimer sEvaluationTimer;
 	static F32 sDesiredDiscardBias;
 	static F32 sDesiredDiscardScale;
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 3ff0013..28f51e1 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -126,6 +126,14 @@ void LLViewerImageList::doPreloadImages()
 	LLUIImageList* image_list = LLUIImageList::getInstance();
 
 	image_list->initFromFile();
+	
+	// turn off clamping and bilinear filtering for uv picking images
+	//LLViewerImage* uv_test = preloadUIImage("uv_test1.tga", LLUUID::null, FALSE);
+	//uv_test->setClamp(FALSE, FALSE);
+	//uv_test->setMipFilterNearest(TRUE, TRUE);
+	//uv_test = preloadUIImage("uv_test2.tga", LLUUID::null, FALSE);
+	//uv_test->setClamp(FALSE, FALSE);
+	//uv_test->setMipFilterNearest(TRUE, TRUE);
 
 	// prefetch specific UUIDs
 	getImage(IMG_SHOT, TRUE);
@@ -181,7 +189,7 @@ void LLViewerImageList::doPrefetchImages()
 	LLSD imagelist;
 	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, get_texture_list_name());
 	llifstream file;
-	file.open(filename.c_str());
+	file.open(filename);
 	if (file.is_open())
 	{
 		LLSDSerialize::fromXML(imagelist, file);
@@ -206,7 +214,6 @@ void LLViewerImageList::doPrefetchImages()
 
 LLViewerImageList::~LLViewerImageList()
 {
-	llassert(mIRCallbackData.empty());
 }
 
 void LLViewerImageList::shutdown()
@@ -252,7 +259,7 @@ void LLViewerImageList::shutdown()
 	{
 		std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, get_texture_list_name());
 		llofstream file;
-		file.open(filename.c_str());
+		file.open(filename);
 		LLSDSerialize::toPrettyXML(imagelist, file);
 	}
 	
@@ -260,7 +267,6 @@ void LLViewerImageList::shutdown()
 	// Clean up "loaded" callbacks.
 	//
 	mCallbackList.clear();
-	mIRCallbackData.clear();
 	
 	// Flush all of the references
 	mLoadingStreamList.clear();
@@ -307,7 +313,7 @@ void LLViewerImageList::restoreGL()
 
 ///////////////////////////////////////////////////////////////////////////////
 
-LLViewerImage* LLViewerImageList::getImageFromFile(const LLString& filename,
+LLViewerImage* LLViewerImageList::getImageFromFile(const std::string& filename,
 												   BOOL usemipmaps,
 												   BOOL level_immediate,
 												   LLGLint internal_format,
@@ -336,7 +342,7 @@ LLViewerImage* LLViewerImageList::getImageFromFile(const LLString& filename,
 	}
 	else
 	{
-		new_id.generate(std::string(full_path));
+		new_id.generate(full_path);
 	}
 
 	LLPointer<LLViewerImage> imagep = hasImage(new_id);
@@ -452,7 +458,7 @@ void LLViewerImageList::addImage(LLViewerImage *new_image)
 	LLViewerImage *image = hasImage(image_id);
 	if (image)
 	{
-		llerrs << "Image with ID " << image_id << " already in list" << llendl;
+		llwarns << "Image with ID " << image_id << " already in list" << llendl;
 	}
 	sNumImages++;
 	
@@ -667,6 +673,7 @@ F32 LLViewerImageList::updateImagesFetchTextures(F32 max_time)
 		if(iter1 == mImageList.end())
 		{
 			llerrs << "DEV-12002: update_counter not calculated correctly!" << llendl;
+			return 0.f;
 		}
 
 		LLPointer<LLViewerImage> const & ptr = *iter1;
@@ -795,8 +802,8 @@ void LLViewerImageList::decodeAllImages(F32 max_time)
 }
 
 
-BOOL LLViewerImageList::createUploadFile(const LLString& filename,
-										 const LLString& out_filename,
+BOOL LLViewerImageList::createUploadFile(const std::string& filename,
+										 const std::string& out_filename,
 										 const U8 codec)
 {
 	// First, load the image.
@@ -1170,7 +1177,7 @@ void LLUIImageList::cleanUp()
 LLUIImagePtr LLUIImageList::getUIImageByID(const LLUUID& image_id)
 {
 	// use id as image name
-	LLString image_name = image_id.asString();
+	std::string image_name = image_id.asString();
 
 	// look for existing image
 	uuid_ui_image_map_t::iterator found_it = mUIImages.find(image_name);
@@ -1182,7 +1189,7 @@ LLUIImagePtr LLUIImageList::getUIImageByID(const LLUUID& image_id)
 	return loadUIImageByID(image_id);
 }
 
-LLUIImagePtr LLUIImageList::getUIImage(const LLString& image_name)
+LLUIImagePtr LLUIImageList::getUIImage(const std::string& image_name)
 {
 	// look for existing image
 	uuid_ui_image_map_t::iterator found_it = mUIImages.find(image_name);
@@ -1194,7 +1201,7 @@ LLUIImagePtr LLUIImageList::getUIImage(const LLString& image_name)
 	return loadUIImageByName(image_name, image_name);
 }
 
-LLUIImagePtr LLUIImageList::loadUIImageByName(const LLString& name, const LLString& filename, BOOL use_mips, const LLRect& scale_rect)
+LLUIImagePtr LLUIImageList::loadUIImageByName(const std::string& name, const std::string& filename, BOOL use_mips, const LLRect& scale_rect)
 {
 	LLViewerImage* imagep = gImageList.getImageFromFile(filename, MIPMAP_NO, IMMEDIATE_YES);
 	return loadUIImage(imagep, name, use_mips, scale_rect);
@@ -1206,7 +1213,7 @@ LLUIImagePtr LLUIImageList::loadUIImageByID(const LLUUID& id, BOOL use_mips, con
 	return loadUIImage(imagep, id.asString(), use_mips, scale_rect);
 }
 
-LLUIImagePtr LLUIImageList::loadUIImage(LLViewerImage* imagep, const LLString& name, BOOL use_mips, const LLRect& scale_rect)
+LLUIImagePtr LLUIImageList::loadUIImage(LLViewerImage* imagep, const std::string& name, BOOL use_mips, const LLRect& scale_rect)
 {
 	if (!imagep) return NULL;
 
@@ -1219,12 +1226,12 @@ LLUIImagePtr LLUIImageList::loadUIImage(LLViewerImage* imagep, const LLString& n
 	datap->mImageName = name;
 	datap->mImageScaleRegion = scale_rect;
 
-	imagep->setLoadedCallback(onUIImageLoaded, 0, FALSE, datap);
+	imagep->setLoadedCallback(onUIImageLoaded, 0, FALSE, FALSE, datap);
 
 	return new_imagep;
 }
 
-LLUIImagePtr LLUIImageList::preloadUIImage(const LLString& name, const LLString& filename, BOOL use_mips, const LLRect& scale_rect)
+LLUIImagePtr LLUIImageList::preloadUIImage(const std::string& name, const std::string& filename, BOOL use_mips, const LLRect& scale_rect)
 {
 	// look for existing image
 	uuid_ui_image_map_t::iterator found_it = mUIImages.find(name);
@@ -1245,7 +1252,7 @@ void LLUIImageList::onUIImageLoaded( BOOL success, LLViewerImage *src_vi, LLImag
 		return;
 	}
 
-	LLString ui_image_name ;
+	std::string ui_image_name ;
 	LLRect scale_rect ;
 	{
 		LLUIImageLoadData* image_datap = (LLUIImageLoadData*)user_data;
@@ -1345,10 +1352,10 @@ bool LLUIImageList::initFromFile()
 		LLXMLNodePtr child_nodep = root->getFirstChild();
 		while(child_nodep.notNull())
 		{
-			LLString image_name;
+			std::string image_name;
 			child_nodep->getAttributeString("name", image_name);
 
-			LLString file_name = image_name;
+			std::string file_name = image_name;
 			LLRect scale_rect;
 			BOOL use_mip_maps = FALSE;
 
@@ -1394,3 +1401,4 @@ bool LLUIImageList::initFromFile()
 	return true;
 }
 
+
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 6cf84b9..8aa9913 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -71,7 +71,7 @@ class LLViewerImageList
 	friend class LLTextureView;
 	
 public:
-	static BOOL createUploadFile(const LLString& filename, const LLString& out_filename, const U8 codec);
+	static BOOL createUploadFile(const std::string& filename, const std::string& out_filename, const U8 codec);
 	static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image);
 	static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );
 	static S32 calcMaxTextureRAM();
@@ -96,7 +96,7 @@ public:
 									 LLHost request_from_host = LLHost()
 									 );
 	
-	LLViewerImage * getImageFromFile(const LLString& filename,
+	LLViewerImage * getImageFromFile(const std::string& filename,
 									 BOOL usemipmap = TRUE,
 									 BOOL level_immediate = FALSE,		// Get the requested level immediately upon creation.
 									 LLGLint internal_format = 0,
@@ -168,10 +168,6 @@ private:
 	// simply holds on to LLViewerImage references to stop them from being purged too soon
 	std::set<LLPointer<LLViewerImage> > mImagePreloads;
 
-	typedef std::vector<LLPointer<LLViewerImage> > callback_data_t;
-	typedef std::set< callback_data_t* > callback_data_list_t;
-	callback_data_list_t mIRCallbackData;
-
 	BOOL mUpdateStats;
 	S32	mMaxResidentTexMem;
 	LLFrameTimer mForceDecodeTimer;
@@ -197,28 +193,28 @@ class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIIm
 public:
 	// LLImageProviderInterface
 	LLUIImagePtr getUIImageByID(const LLUUID& id);
-	LLUIImagePtr getUIImage(const LLString& name);
+	LLUIImagePtr getUIImage(const std::string& name);
 	void cleanUp();
 
 	bool initFromFile();
 
-	LLUIImagePtr preloadUIImage(const LLString& name, const LLString& filename, BOOL use_mips, const LLRect& scale_rect);
+	LLUIImagePtr preloadUIImage(const std::string& name, const std::string& filename, BOOL use_mips, const LLRect& scale_rect);
 	
 	static void onUIImageLoaded( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
 private:
-	LLUIImagePtr loadUIImageByName(const LLString& name, const LLString& filename, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
+	LLUIImagePtr loadUIImageByName(const std::string& name, const std::string& filename, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
 	LLUIImagePtr loadUIImageByID(const LLUUID& id, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
 
-	LLUIImagePtr loadUIImage(LLViewerImage* imagep, const LLString& name, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
+	LLUIImagePtr loadUIImage(LLViewerImage* imagep, const std::string& name, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
 
 
 	struct LLUIImageLoadData
 	{
-		LLString mImageName;
+		std::string mImageName;
 		LLRect mImageScaleRegion;
 	};
 
-	typedef std::map< LLString, LLPointer<LLUIImage> > uuid_ui_image_map_t;
+	typedef std::map< std::string, LLPointer<LLUIImage> > uuid_ui_image_map_t;
 	uuid_ui_image_map_t mUIImages;
 };
 
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index d7c1778..6d9d685 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -64,11 +64,11 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLUUID& uuid,
 											 const LLUUID& asset_uuid,
 											 LLAssetType::EType type,
 											 LLInventoryType::EType inv_type,
-											 const LLString& name,
-											 const LLString& desc,
+											 const std::string& name,
+											 const std::string& desc,
 											 const LLSaleInfo& sale_info,
 											 U32 flags,
-											 S32 creation_date_utc) :
+											 time_t creation_date_utc) :
 	LLInventoryItem(uuid, parent_uuid, perm, asset_uuid, type, inv_type,
 					name, desc, sale_info, flags, creation_date_utc),
 	mIsComplete(TRUE)
@@ -77,7 +77,7 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLUUID& uuid,
 
 LLViewerInventoryItem::LLViewerInventoryItem(const LLUUID& item_id,
 											 const LLUUID& parent_id,
-											 const char* name,
+											 const std::string& name,
 											 LLInventoryType::EType inv_type) :
 	LLInventoryItem(),
 	mIsComplete(FALSE)
@@ -85,7 +85,7 @@ LLViewerInventoryItem::LLViewerInventoryItem(const LLUUID& item_id,
 	mUUID = item_id;
 	mParentUUID = parent_id;
 	mInventoryType = inv_type;
-	mName.assign(name);
+	mName = name;
 }
 
 LLViewerInventoryItem::LLViewerInventoryItem() :
@@ -279,18 +279,18 @@ bool LLViewerInventoryItem::importFileLocal(LLFILE* fp)
 
 bool LLViewerInventoryItem::exportFileLocal(LLFILE* fp) const
 {
-	char uuid_str[UUID_STR_LENGTH];		/* Flawfinder: ignore */
+	std::string uuid_str;
 	fprintf(fp, "\tinv_item\t0\n\t{\n");
 	mUUID.toString(uuid_str);
-	fprintf(fp, "\t\titem_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\titem_id\t%s\n", uuid_str.c_str());
 	mParentUUID.toString(uuid_str);
-	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str.c_str());
 	mPermissions.exportFile(fp);
 	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
 	const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
 	if(inv_type_str) fprintf(fp, "\t\tinv_type\t%s\n", inv_type_str);
 	fprintf(fp, "\t\tname\t%s|\n", mName.c_str());
-	fprintf(fp, "\t\tcreation_date\t%d\n", mCreationDate);
+	fprintf(fp, "\t\tcreation_date\t%d\n", (S32) mCreationDate);
 	fprintf(fp,"\t}\n");
 	return true;
 }
@@ -327,7 +327,7 @@ void LLViewerInventoryItem::updateParentOnServer(BOOL restamp) const
 LLViewerInventoryCategory::LLViewerInventoryCategory(const LLUUID& uuid,
 													 const LLUUID& parent_uuid,
 													 LLAssetType::EType pref,
-													 const LLString& name,
+													 const std::string& name,
 													 const LLUUID& owner_id) :
 	LLInventoryCategory(uuid, parent_uuid, pref, name),
 	mOwnerID(owner_id),
@@ -518,8 +518,8 @@ bool LLViewerInventoryCategory::importFileLocal(LLFILE* fp)
 			sscanf(	/* Flawfinder: ignore */
 				buffer, " %254s %254[^|]", keyword, valuestr);
 			mName.assign(valuestr);
-			LLString::replaceNonstandardASCII(mName, ' ');
-			LLString::replaceChar(mName, '|', ' ');
+			LLStringUtil::replaceNonstandardASCII(mName, ' ');
+			LLStringUtil::replaceChar(mName, '|', ' ');
 		}
 		else if(0 == strcmp("owner_id", keyword))
 		{
@@ -540,17 +540,17 @@ bool LLViewerInventoryCategory::importFileLocal(LLFILE* fp)
 
 bool LLViewerInventoryCategory::exportFileLocal(LLFILE* fp) const
 {
-	char uuid_str[UUID_STR_LENGTH];		/* Flawfinder: ignore */
+	std::string uuid_str;
 	fprintf(fp, "\tinv_category\t0\n\t{\n");
 	mUUID.toString(uuid_str);
-	fprintf(fp, "\t\tcat_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tcat_id\t%s\n", uuid_str.c_str());
 	mParentUUID.toString(uuid_str);
-	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\tparent_id\t%s\n", uuid_str.c_str());
 	fprintf(fp, "\t\ttype\t%s\n", LLAssetType::lookup(mType));
 	fprintf(fp, "\t\tpref_type\t%s\n", LLAssetType::lookup(mPreferredType));
 	fprintf(fp, "\t\tname\t%s|\n", mName.c_str());
 	mOwnerID.toString(uuid_str);
-	fprintf(fp, "\t\towner_id\t%s\n", uuid_str);
+	fprintf(fp, "\t\towner_id\t%s\n", uuid_str.c_str());
 	fprintf(fp, "\t\tversion\t%d\n", mVersion);
 	fprintf(fp,"\t}\n");
 	return true;
@@ -560,17 +560,6 @@ bool LLViewerInventoryCategory::exportFileLocal(LLFILE* fp) const
 /// Local function definitions
 ///----------------------------------------------------------------------------
 
-/*
-void inventory_reliable_callback(void**, S32 status)
-{
-	if(0 != status)
-	{
-		char buffer[MAX_STRING];
-		sprintf(buffer, "Reliable packet failure: %d", status);
-		llwarns << buffer << llendl;
-	}
-}
-*/
 LLInventoryCallbackManager *LLInventoryCallbackManager::sInstance = NULL;
 
 LLInventoryCallbackManager::LLInventoryCallbackManager() :
@@ -677,7 +666,7 @@ void CreateGestureCallback::fire(const LLUUID& inv_item)
 
 	if(!LLPreview::show(inv_item,FALSE))
 	{
-		LLPreviewGesture* preview = LLPreviewGesture::show(LLString("Gesture: ") + item->getName(), inv_item,  LLUUID::null);
+		LLPreviewGesture* preview = LLPreviewGesture::show(std::string("Gesture: ") + item->getName(), inv_item,  LLUUID::null);
 		// Force to be entirely onscreen.
 		gFloaterView->adjustToFitScreen(preview, FALSE);
 	}
diff --git a/linden/indra/newview/llviewerinventory.h b/linden/indra/newview/llviewerinventory.h
index e80a042..b39545b 100644
--- a/linden/indra/newview/llviewerinventory.h
+++ b/linden/indra/newview/llviewerinventory.h
@@ -58,18 +58,18 @@ public:
 						  const LLUUID& asset_uuid,
 						  LLAssetType::EType type,
 						  LLInventoryType::EType inv_type,
-						  const LLString& name, 
-						  const LLString& desc,
+						  const std::string& name, 
+						  const std::string& desc,
 						  const LLSaleInfo& sale_info,
 						  U32 flags,
-						  S32 creation_date_utc);
+						  time_t creation_date_utc);
 
 	// construct a viewer inventory item which has the minimal amount
 	// of information to use in the UI.
 	LLViewerInventoryItem(
 		const LLUUID& item_id,
 		const LLUUID& parent_id,
-		const char* name,
+		const std::string& name,
 		LLInventoryType::EType inv_type);
 
 	// construct an invalid and incomplete viewer inventory item.
@@ -149,7 +149,7 @@ protected:
 public:
 	LLViewerInventoryCategory(const LLUUID& uuid, const LLUUID& parent_uuid,
 							  LLAssetType::EType preferred_type,
-							  const LLString& name,
+							  const std::string& name,
 							  const LLUUID& owner_id);
 	LLViewerInventoryCategory(const LLUUID& owner_id);
 	// Create a copy of an inventory category from a pointer to another category
@@ -161,7 +161,6 @@ public:
 	virtual void removeFromServer();
 	virtual void updateParentOnServer(BOOL restamp_children) const;
 	virtual void updateServer(BOOL is_new) const;
-	//virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
 
 	const LLUUID& getOwnerID() const { return mOwnerID; }
 
diff --git a/linden/indra/newview/llviewerjointattachment.cpp b/linden/indra/newview/llviewerjointattachment.cpp
index 1cdd10f..4b58361 100644
--- a/linden/indra/newview/llviewerjointattachment.cpp
+++ b/linden/indra/newview/llviewerjointattachment.cpp
@@ -129,8 +129,9 @@ void LLViewerJointAttachment::setupDrawable(LLDrawable* drawablep)
 		}
 	}
 
-	for (LLViewerObject::child_list_t::iterator iter = mAttachedObject->mChildList.begin();
-		 iter != mAttachedObject->mChildList.end(); ++iter)
+	LLViewerObject::const_child_list_t& child_list = mAttachedObject->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
 		LLViewerObject* childp = *iter;
 		if (childp && childp->mDrawable.notNull())
@@ -208,8 +209,9 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
 		{
 			object->mText->setOnHUDAttachment(TRUE);
 		}
-		for (LLViewerObject::child_list_t::iterator iter = object->mChildList.begin();
-			iter != object->mChildList.end(); ++iter)
+		LLViewerObject::const_child_list_t& child_list = object->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+			 iter != child_list.end(); iter++)
 		{
 			LLViewerObject* childp = *iter;
 			if (childp && childp->mText.notNull())
@@ -258,8 +260,9 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object)
 		}
 	}
 
-	for (LLViewerObject::child_list_t::iterator iter = object->mChildList.begin();
-		 iter != object->mChildList.end(); ++iter)
+	LLViewerObject::const_child_list_t& child_list = object->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
 		LLViewerObject* childp = *iter;
 		if (childp && childp->mDrawable.notNull())
@@ -282,8 +285,9 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object)
 		{
 			object->mText->setOnHUDAttachment(FALSE);
 		}
-		for (LLViewerObject::child_list_t::iterator iter = object->mChildList.begin();
-			iter != object->mChildList.end(); ++iter)
+		LLViewerObject::const_child_list_t& child_list = object->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+			 iter != child_list.end(); iter++)
 		{
 			LLViewerObject* childp = *iter;
 			if (childp->mText.notNull())
@@ -351,8 +355,9 @@ void LLViewerJointAttachment::clampObjectPosition()
 void LLViewerJointAttachment::calcLOD()
 {
 	F32 maxarea = mAttachedObject->getMaxScale() * mAttachedObject->getMidScale();
-	for (LLViewerObject::child_list_t::iterator iter = mAttachedObject->mChildList.begin();
-		 iter != mAttachedObject->mChildList.end(); ++iter)
+	LLViewerObject::const_child_list_t& child_list = mAttachedObject->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
 		LLViewerObject* childp = *iter;
 		F32 area = childp->getMaxScale() * childp->getMidScale();
diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index 9ffeee4..b590907 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -56,7 +56,7 @@
 #include "llvoavatar.h"
 #include "llsky.h"
 #include "pipeline.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llmath.h"
 #include "v4math.h"
 #include "m3math.h"
@@ -307,7 +307,7 @@ void LLViewerJointMesh::setMesh( LLPolyMesh *mesh )
 		U32 jn;
 		for (jn = 0; jn < numJointNames; jn++)
 		{
-			//llinfos << "Setting up joint " << jointNames[jn].c_str() << llendl;
+			//llinfos << "Setting up joint " << jointNames[jn] << llendl;
 			LLViewerJoint* joint = (LLViewerJoint*)(getRoot()->findJoint(jointNames[jn]) );
 			mSkinJoints[jn].setupSkinJoint( joint );
 		}
@@ -880,7 +880,7 @@ void LLViewerJointMesh::updateJointGeometry()
 		  && mFace
 		  && mMesh->hasWeights()
 		  && mFace->mVertexBuffer.notNull()
-		  && LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR) == 0))
+		  && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) == 0))
 	{
 		return;
 	}
diff --git a/linden/indra/newview/llviewerjoystick.cpp b/linden/indra/newview/llviewerjoystick.cpp
index cf9d8a1..2e57843 100644
--- a/linden/indra/newview/llviewerjoystick.cpp
+++ b/linden/indra/newview/llviewerjoystick.cpp
@@ -99,6 +99,11 @@ void LLViewerJoystick::setOverrideCamera(bool val)
 	{
 		mOverrideCamera = val;
 	}
+
+	if (mOverrideCamera)
+	{
+		gAgent.changeCameraToDefault();
+	}
 }
 
 // -----------------------------------------------------------------------------
@@ -793,14 +798,6 @@ void LLViewerJoystick::moveFlycam(bool reset)
 	{
 		cur_delta[i] = -getJoystickAxis(axis[i]);
 
-		// we need smaller camera movements in build mode
-		if (in_build_mode)
-		{
-			if (i == X_I || i == Y_I || i == Z_I)
-			{
-				cur_delta[i] /= BUILDMODE_FLYCAM_T_SCALE;
-			}
-		}
 
 		F32 tmp = cur_delta[i];
 		if (absolute)
@@ -817,6 +814,18 @@ void LLViewerJoystick::moveFlycam(bool reset)
 		{
 			cur_delta[i] = llmin(cur_delta[i]+dead_zone[i], 0.f);
 		}
+
+		// we need smaller camera movements in build mode
+		// NOTE: this needs to remain after the deadzone calculation, otherwise
+		// we have issues with flycam "jumping" when the build dialog is opened/closed  -Nyx
+		if (in_build_mode)
+		{
+			if (i == X_I || i == Y_I || i == Z_I)
+			{
+				cur_delta[i] /= BUILDMODE_FLYCAM_T_SCALE;
+			}
+		}
+
 		cur_delta[i] *= axis_scale[i];
 		
 		if (!absolute)
@@ -875,10 +884,16 @@ bool LLViewerJoystick::toggleFlycam()
 	{
 		return false;
 	}
+	if (!mOverrideCamera)
+	{
+		gAgent.changeCameraToDefault();
+	}
+
 	mOverrideCamera = !mOverrideCamera;
 	if (mOverrideCamera)
 	{
 		moveFlycam(true);
+		
 	}
 	else if (!LLToolMgr::getInstance()->inBuildMode())
 	{
diff --git a/linden/indra/newview/llviewerjoystick.h b/linden/indra/newview/llviewerjoystick.h
index c7c78f3..6a582fd 100644
--- a/linden/indra/newview/llviewerjoystick.h
+++ b/linden/indra/newview/llviewerjoystick.h
@@ -34,8 +34,6 @@
 
 #include "stdtypes.h"
 
-#define LIB_NDOF (LL_WINDOWS || LL_DARWIN)
-
 #if LIB_NDOF
 #include "ndofdev_external.h"
 #else
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index c732ae5..3c2fb88 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -564,7 +564,8 @@ void bind_keyboard_functions()
 	gViewerKeyboard.bindNamedFunction("start_gesture", start_gesture);
 }
 
-LLViewerKeyboard::LLViewerKeyboard()
+LLViewerKeyboard::LLViewerKeyboard() :
+	mNamedFunctionCount(0)
 {
 	for (S32 i = 0; i < MODE_COUNT; i++)
 	{
@@ -583,7 +584,7 @@ LLViewerKeyboard::LLViewerKeyboard()
 }
 
 
-void LLViewerKeyboard::bindNamedFunction(const char *name, LLKeyFunc func)
+void LLViewerKeyboard::bindNamedFunction(const std::string& name, LLKeyFunc func)
 {
 	S32 i = mNamedFunctionCount;
 	mNamedFunctions[i].mName = name;
@@ -592,29 +593,29 @@ void LLViewerKeyboard::bindNamedFunction(const char *name, LLKeyFunc func)
 }
 
 
-BOOL LLViewerKeyboard::modeFromString(const char *string, S32 *mode)
+BOOL LLViewerKeyboard::modeFromString(const std::string& string, S32 *mode)
 {
-	if (!strcmp(string, "FIRST_PERSON"))
+	if (string == "FIRST_PERSON")
 	{
 		*mode = MODE_FIRST_PERSON;
 		return TRUE;
 	}
-	else if (!strcmp(string, "THIRD_PERSON"))
+	else if (string == "THIRD_PERSON")
 	{
 		*mode = MODE_THIRD_PERSON;
 		return TRUE;
 	}
-	else if (!strcmp(string, "EDIT"))
+	else if (string == "EDIT")
 	{
 		*mode = MODE_EDIT;
 		return TRUE;
 	}
-	else if (!strcmp(string, "EDIT_AVATAR"))
+	else if (string == "EDIT_AVATAR")
 	{
 		*mode = MODE_EDIT_AVATAR;
 		return TRUE;
 	}
-	else if (!strcmp(string, "SITTING"))
+	else if (string == "SITTING")
 	{
 		*mode = MODE_SITTING;
 		return TRUE;
@@ -662,11 +663,11 @@ BOOL LLViewerKeyboard::handleKey(KEY translated_key,  MASK translated_mask, BOOL
 
 
 
-BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, const char *function_name)
+BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name)
 {
 	S32 i,index;
 	void (*function)(EKeystate keystate) = NULL;
-	const char *name = NULL;
+	std::string name;
 
 	// Allow remapping of F2-F12
 	if (function_name[0] == 'F')
@@ -690,7 +691,7 @@ BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, c
 	// Not remapped, look for a function
 	for (i = 0; i < mNamedFunctionCount; i++)
 	{
-		if (!strcmp(function_name, mNamedFunctions[i].mName))
+		if (function_name == mNamedFunctions[i].mName)
 		{
 			function = mNamedFunctions[i].mFunction;
 			name = mNamedFunctions[i].mName;
@@ -730,22 +731,20 @@ BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, c
 	if (index == mBindingCount[mode])
 		mBindingCount[mode]++;
 
-	// printf("Bound key %c to %s\n", key, name);
-
 	return TRUE;
 }
 
 
-S32 LLViewerKeyboard::loadBindings(const char *filename)
+S32 LLViewerKeyboard::loadBindings(const std::string& filename)
 {
 	LLFILE *fp;
 	const S32 BUFFER_SIZE = 2048;
 	char buffer[BUFFER_SIZE];	/* Flawfinder: ignore */
 	// *NOTE: This buffer size is hard coded into scanf() below.
-	char mode_string[MAX_STRING];	/* Flawfinder: ignore */
-	char key_string[MAX_STRING];	/* Flawfinder: ignore */
-	char mask_string[MAX_STRING];	/* Flawfinder: ignore */
-	char function_string[MAX_STRING];	/* Flawfinder: ignore */
+	char mode_string[MAX_STRING] = "";	/* Flawfinder: ignore */
+	char key_string[MAX_STRING] = "";	/* Flawfinder: ignore */
+	char mask_string[MAX_STRING] = "";	/* Flawfinder: ignore */
+	char function_string[MAX_STRING] = "";	/* Flawfinder: ignore */
 	S32 mode = MODE_THIRD_PERSON;
 	KEY key = 0;
 	MASK mask = 0;
@@ -753,7 +752,7 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
 	S32 binding_count = 0;
 	S32 line_count = 0;
 
-	if(!filename)
+	if(filename.empty())
 	{
 		llerrs << " No filename specified" << llendl;
 		return 0;
diff --git a/linden/indra/newview/llviewerkeyboard.h b/linden/indra/newview/llviewerkeyboard.h
index 2013125..115bd69 100644
--- a/linden/indra/newview/llviewerkeyboard.h
+++ b/linden/indra/newview/llviewerkeyboard.h
@@ -40,7 +40,10 @@ const S32 MAX_KEY_BINDINGS = 128; // was 60
 class LLNamedFunction
 {
 public:
-	const char *mName;
+	LLNamedFunction() : mFunction(NULL) { };
+	~LLNamedFunction() { };
+
+	std::string	mName;
 	LLKeyFunc	mFunction;
 };
 
@@ -65,16 +68,16 @@ public:
 
 	BOOL			handleKey(KEY key, MASK mask, BOOL repeated);
 
-	void			bindNamedFunction(const char *name, LLKeyFunc func);
+	void			bindNamedFunction(const std::string& name, LLKeyFunc func);
 
-	S32				loadBindings(const char *filename);										// returns number bound, 0 on error
+	S32				loadBindings(const std::string& filename);										// returns number bound, 0 on error
 	EKeyboardMode	getMode();
 
-	BOOL			modeFromString(const char *string, S32 *mode);			// False on failure
+	BOOL			modeFromString(const std::string& string, S32 *mode);			// False on failure
 
 	void			scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
 protected:
-	BOOL			bindKey(const S32 mode, const KEY key, const MASK mask, const char *function_name);
+	BOOL			bindKey(const S32 mode, const KEY key, const MASK mask, const std::string& function_name);
 	S32				mNamedFunctionCount;
 	LLNamedFunction	mNamedFunctions[MAX_NAMED_FUNCTIONS];
 
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index e11d1a2..76c11f1 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -460,13 +460,45 @@ bool LLViewerMediaImpl::handleSkinCurrentChanged(const LLSD& /*newvalue*/)
 // Wrapper class
 //////////////////////////////////////////////////////////////////////////////////////////
 
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// The viewer takes a long time to load the start screen.  Part of the problem
+// is media initialization -- in particular, QuickTime loads many DLLs and
+// hits the disk heavily.  So we initialize only the browser component before
+// the login screen, then do the rest later when we have a progress bar. JC
+// static
+void LLViewerMedia::initBrowser()
+{
+	LLMediaManagerData* init_data = new LLMediaManagerData;
+	buildMediaManagerData( init_data );
+	LLMediaManager::initBrowser( init_data );
+	delete init_data;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 void LLViewerMedia::initClass()
 {
 	// *TODO: This looks like a memory leak to me. JC
 	LLMediaManagerData* init_data = new LLMediaManagerData;
+	buildMediaManagerData( init_data );
+	LLMediaManager::initClass( init_data );
+	delete init_data;
 
+	LLMediaManager* mm = LLMediaManager::getInstance();
+	LLMIMETypes::mime_info_map_t::const_iterator it;
+	for (it = LLMIMETypes::sMap.begin(); it != LLMIMETypes::sMap.end(); ++it)
+	{
+		const std::string& mime_type = it->first;
+		const LLMIMETypes::LLMIMEInfo& info = it->second;
+		mm->addMimeTypeImplNameMap( mime_type, info.mImpl );
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
+{
 //	std::string executable_dir = std::string( arg0 ).substr( 0, std::string( arg0 ).find_last_of("\\/") );
 //	std::string component_dir = std::string( executable_dir ).substr( 0, std::string( executable_dir ).find_last_of("\\/") );
 //	component_dir = std::string( component_dir ).substr( 0, std::string( component_dir ).find_last_of("\\/") );
@@ -504,9 +536,7 @@ void LLViewerMedia::initClass()
 	init_data->setBrowserComponentDir( component_dir );
 	std::string profile_name("Second Life");
 	init_data->setBrowserProfileName( profile_name );
-	init_data->setBrowserParentWindow( gViewerWindow->getPlatformWindow() );
-
-	LLMediaManager::initClass( init_data );
+	init_data->setBrowserParentWindow( gViewerWindow->getMediaWindow() );
 
 	// We use a custom user agent with viewer version and skin name.
 	LLViewerMediaImpl::updateBrowserUserAgent();
@@ -516,14 +546,6 @@ void LLViewerMedia::initClass()
 	gSavedSettings.getControl("SkinCurrent")->getSignal()->connect( 
 		boost::bind( LLViewerMediaImpl::handleSkinCurrentChanged, _1 ) );
 
-	LLMediaManager* mm = LLMediaManager::getInstance();
-	LLMIMETypes::mime_info_map_t::const_iterator it;
-	for (it = LLMIMETypes::sMap.begin(); it != LLMIMETypes::sMap.end(); ++it)
-	{
-		const LLString& mime_type = it->first;
-		const LLMIMETypes::LLMIMEInfo& info = it->second;
-		mm->addMimeTypeImplNameMap( mime_type, info.mImpl );
-	}
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -672,5 +694,3 @@ void LLViewerMedia::setMimeType(std::string mime_type)
 {
 	sViewerMediaImpl.mMimeType = mime_type;
 }
-
-
diff --git a/linden/indra/newview/llviewermedia.h b/linden/indra/newview/llviewermedia.h
index a335117..2a78585 100644
--- a/linden/indra/newview/llviewermedia.h
+++ b/linden/indra/newview/llviewermedia.h
@@ -34,11 +34,16 @@
 
 #include "llmediabase.h"	// for status codes
 
+class LLMediaManagerData;
 class LLUUID;
 
 class LLViewerMedia
 {
 	public:
+		// Special case early init for just web browser component
+		// so we can show login screen.  See .cpp file for details. JC
+		static void initBrowser();
+
 		static void initClass();
 		static void cleanupClass();
 
@@ -67,6 +72,10 @@ class LLViewerMedia
 		static void setMimeType(std::string mime_type);
 
 		static void updateImagesMediaStreams();
+
+	private:
+		// Fill in initialization data for LLMediaManager::initClass()
+		static void buildMediaManagerData( LLMediaManagerData* init_data );
 };
 
 #endif	// LLVIEWERMEDIA_H
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3e99384..d78847e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -128,6 +128,7 @@
 #include "llfloaterwater.h"
 #include "llfloaterwindlight.h"
 #include "llfloaterworldmap.h"
+#include "llfloatermemleak.h"
 #include "llframestats.h"
 #include "llframestatview.h"
 #include "llfasttimerview.h"
@@ -255,24 +256,12 @@ LLPieMenu	*gPieAttachment = NULL;
 LLPieMenu	*gPieLand	= NULL;
 
 // local constants
-const LLString LANDMARK_MENU_NAME("Landmarks");
-const LLString CLIENT_MENU_NAME("Advanced");
-const LLString SERVER_MENU_NAME("Admin");
+const std::string LANDMARK_MENU_NAME("Landmarks");
+const std::string CLIENT_MENU_NAME("Advanced");
+const std::string SERVER_MENU_NAME("Admin");
 
-const LLString SAVE_INTO_INVENTORY("Save Object Back to My Inventory");
-const LLString SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents");
-
-#if LL_WINDOWS
-static const char* SOUND_EXTENSIONS = ".wav";
-static const char* IMAGE_EXTENSIONS = ".tga .bmp .jpg .jpeg .png";
-static const char* ANIM_EXTENSIONS =  ".bvh";
-#ifdef _CORY_TESTING
-static const char* GEOMETRY_EXTENSIONS = ".slg";
-#endif
-static const char* XML_EXTENSIONS = ".xml";
-static const char* SLOBJECT_EXTENSIONS = ".slobject";
-#endif
-static const char* ALL_FILE_EXTENSIONS = "*.*";
+const std::string SAVE_INTO_INVENTORY("Save Object Back to My Inventory");
+const std::string SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents");
 
 LLMenuGL* gAttachSubMenu = NULL;
 LLMenuGL* gDetachSubMenu = NULL;
@@ -316,7 +305,7 @@ void handle_region_clear_temp_asset_data(void*);
 BOOL sitting_on_selection();
 
 void near_sit_object();
-void label_sit_or_stand(LLString& label, void*);
+void label_sit_or_stand(std::string& label, void*);
 // buy and take alias into the same UI positions, so these
 // declarations handle this mess.
 BOOL is_selection_buy_not_take();
@@ -328,7 +317,7 @@ BOOL enable_buy(void*);
 void handle_buy(void *);
 void handle_buy_object(LLSaleInfo sale_info);
 void handle_buy_contents(LLSaleInfo sale_info);
-void label_touch(LLString& label, void*);
+void label_touch(std::string& label, void*);
 
 // Land pie menu
 void near_sit_down_point(BOOL success, void *);
@@ -339,7 +328,6 @@ void handle_talk_to(void *userdata);
 
 // Debug menu
 void show_permissions_control(void*);
-void load_url_local_file(const char* file_name);
 void toggle_build_options(void* user_data);
 #if 0 // Unused
 void handle_audio_status_1(void*);
@@ -502,10 +490,12 @@ BOOL enable_selection_you_own_one(void*);
 BOOL enable_save_into_inventory(void*);
 BOOL enable_save_into_task_inventory(void*);
 BOOL enable_not_thirdperson(void*);
-BOOL enable_export_selected(void *);
+// BOOL enable_export_selected(void *);
 BOOL enable_have_card(void*);
 BOOL enable_detach(void*);
 BOOL enable_region_owner(void*);
+void menu_toggle_attached_lights(void* user_data);
+void menu_toggle_attached_particles(void* user_data);
 
 class LLLandmarkObserver : public LLInventoryObserver
 {
@@ -712,7 +702,7 @@ void init_menus()
 	gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
 	gMenuBarView->setBackgroundColor( color );
 
-    gMenuBarView->setItemVisible("Tools", FALSE);
+    // gMenuBarView->setItemVisible("Tools", FALSE);
 	gMenuBarView->arrange();
 	
 	gMenuHolder->addChild(gMenuBarView);
@@ -725,7 +715,7 @@ void init_menus()
         LLViewerLogin::getInstance()->isInProductionGrid());
 
 	// *TODO:Get the cost info from the server
-	const LLString upload_cost("10");
+	const std::string upload_cost("10");
 	gMenuHolder->childSetLabelArg("Upload Image", "[COST]", upload_cost);
 	gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost);
 	gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost);
@@ -792,6 +782,7 @@ void init_landmark_menu(LLMenuGL* menu)
 	// clear existing menu, as we might be rebuilding as result of inventory update
 	clear_landmark_menu(menu);
 
+	// *TODO: Translate
 	menu->append(new LLMenuItemCallGL("Organize Landmarks", 
 			&manage_landmarks, NULL));
 	menu->append(new LLMenuItemCallGL("New Landmark...", 
@@ -808,7 +799,7 @@ void init_landmark_menu(LLMenuGL* menu)
 		for(S32 i = 0; i < count; ++i)
 		{
 			LLInventoryItem* item = items->get(i);
-			LLString landmark_name = item->getName();
+			std::string landmark_name = item->getName();
 			LLUUID* landmark_id_ptr = new LLUUID( item->getUUID() );
 			LLMenuItemCallGL* menu_item =
 				new LLMenuItemCallGL(landmark_name, landmark_menu_action, 
@@ -847,9 +838,10 @@ void init_client_menu(LLMenuGL* menu)
 	LLMenuGL* sub_menu = NULL;
 
 	//menu->append(new LLMenuItemCallGL("Permissions Control", &show_permissions_control));
-
-// this is now in the view menu so we don't need it here!
+	// this is now in the view menu so we don't need it here!
+	
 	{
+		// *TODO: Translate
 		LLMenuGL* sub = new LLMenuGL("Consoles");
 		menu->appendMenu(sub);
 		sub->append(new LLMenuItemCheckGL("Frame Console", 
@@ -871,22 +863,7 @@ void init_client_menu(LLMenuGL* menu)
 										&get_visibility,
 										debugview,
 									   	'4', MASK_CONTROL|MASK_SHIFT ) );
-#if 0 // Unused
-	{
-		LLMenuGL* sub = new LLMenuGL("Audio");
-		menu->appendMenu(sub);
 
-		sub->append(new LLMenuItemCallGL("Global Pos", 
-					&handle_audio_status_1, NULL, NULL ,'5', MASK_CONTROL|MASK_SHIFT) );
-		sub->append(new LLMenuItemCallGL("Cone", 
-					&handle_audio_status_2, NULL, NULL ,'6', MASK_CONTROL|MASK_SHIFT) );
-		sub->append(new LLMenuItemCallGL("Local Pos", 
-					&handle_audio_status_3, NULL, NULL ,'7', MASK_CONTROL|MASK_SHIFT) );
-		sub->append(new LLMenuItemCallGL("Duration", 
-					&handle_audio_status_4, NULL, NULL ,'8', MASK_CONTROL|MASK_SHIFT) );
-		sub->createJumpKeys();
-	}
-#endif
 		sub->append(new LLMenuItemCheckGL("Fast Timers", 
 										&toggle_visibility,
 										NULL,
@@ -1059,8 +1036,7 @@ void init_client_menu(LLMenuGL* menu)
 	menu->appendSeparator();
 
 	menu->append(new LLMenuItemToggleGL("Show Updates", 
-		&gShowObjectUpdates,
-		'U', MASK_ALT | MASK_SHIFT | MASK_CONTROL));
+		&gShowObjectUpdates));
 	
 	menu->appendSeparator(); 
 	
@@ -1168,7 +1144,7 @@ void handle_export_menus_to_xml(void*)
 		llwarns << "No file" << llendl;
 		return;
 	}
- 	const char* filename = picker.getFirstFile();
+	std::string filename = picker.getFirstFile();
 
 	llofstream out(filename);
 	LLXMLNodePtr node = gMenuBarView->getXML();
@@ -1385,12 +1361,10 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 	sub_menu->append(new LLMenuItemCheckGL("Glow",&LLPipeline::toggleRenderDebug, NULL,
 													&LLPipeline::toggleRenderDebugControl,
 													(void*)LLPipeline::RENDER_DEBUG_GLOW));
+	sub_menu->append(new LLMenuItemCheckGL("Raycasting",	&LLPipeline::toggleRenderDebug, NULL,
+													&LLPipeline::toggleRenderDebugControl,
+													(void*)LLPipeline::RENDER_DEBUG_RAYCAST));
 	
-	sub_menu->append(new LLMenuItemCheckGL("Show Depth Buffer",
-										   &menu_toggle_control,
-										   NULL,
-										   &menu_check_control,
-										   (void*)"ShowDepthBuffer"));
 	sub_menu->append(new LLMenuItemToggleGL("Show Select Buffer", &gDebugSelect));
 
 	sub_menu->append(new LLMenuItemCallGL("Vectorize Perf Test", &run_vectorize_perf_test));
@@ -1457,6 +1431,23 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 
 	item = new LLMenuItemCheckGL("Cheesy Beacon", menu_toggle_control, NULL, menu_check_control, (void*)"CheesyBeacon");
 	menu->append(item);
+
+	item = new LLMenuItemCheckGL("Attached Lights", menu_toggle_attached_lights, NULL, menu_check_control, (void*)"RenderAttachedLights");
+	menu->append(item);
+
+	item = new LLMenuItemCheckGL("Attached Particles", menu_toggle_attached_particles, NULL, menu_check_control, (void*)"RenderAttachedParticles");
+	menu->append(item);
+
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+	menu->appendSeparator();
+	menu->append(new LLMenuItemCallGL("Memory Leaking Simulation", LLFloaterMemLeak::show, NULL, NULL));
+#else
+	if(gSavedSettings.getBOOL("QAMode"))
+	{
+		menu->appendSeparator();
+		menu->append(new LLMenuItemCallGL("Memory Leaking Simulation", LLFloaterMemLeak::show, NULL, NULL));
+	}
+#endif
 	
 	menu->createJumpKeys();
 }
@@ -1531,37 +1522,6 @@ void init_debug_baked_texture_menu(LLMenuGL* menu)
 
 void init_server_menu(LLMenuGL* menu)
 {
-	/*
-	{
-		// These messages are now trusted. We can write scripts to do
-		// this, and the message is unchecked for source.
-		LLMenuGL* sub_menu = NULL;
-		sub_menu = new LLMenuGL("Sim Logging");
-
-		sub_menu->append(new LLMenuItemCallGL("Turn off llinfos Log", 
-			&handle_reduce_llinfo_log, &enable_god_customer_service));
-
-		sub_menu->append(new LLMenuItemCallGL("Normal Logging", 
-			&handle_normal_llinfo_log, &enable_god_customer_service));
-
-		sub_menu->appendSeparator();
-		sub_menu->append(new LLMenuItemCallGL("Enable Message Log",  
-			&handle_sim_enable_message_log,  &enable_god_customer_service));
-		sub_menu->append(new LLMenuItemCallGL("Disable Message Log", 
-			&handle_sim_disable_message_log, &enable_god_customer_service));
-
-		sub_menu->appendSeparator();
-
-		sub_menu->append(new LLMenuItemCallGL("Fetch Message Log",	
-			&handle_sim_fetch_message_log,  &enable_god_customer_service));
-
-		sub_menu->append(new LLMenuItemCallGL("Fetch Log",			
-			&handle_sim_fetch_log, &enable_god_customer_service));
-
-		menu->appendMenu( sub_menu );
-	}
-	*/
-
 	{
 		LLMenuGL* sub = new LLMenuGL("Object");
 		menu->appendMenu(sub);
@@ -1685,7 +1645,11 @@ class LLObjectReportAbuse : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLFloaterReporter::showFromObject(gLastHitObjectID);
+		LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+		if (objectp)
+		{
+			LLFloaterReporter::showFromObject(objectp->getID());
+		}
 		return true;
 	}
 };
@@ -1695,7 +1659,7 @@ class LLObjectEnableReportAbuse : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		bool new_value = !gLastHitObjectID.isNull();
+		bool new_value = LLSelectMgr::getInstance()->getSelection()->getObjectCount() != 0;
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 		return true;
 	}
@@ -1705,9 +1669,11 @@ class LLObjectTouch : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLViewerObject* object = gObjectList.findObject(gLastHitObjectID);
+		LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		if (!object) return true;
 
+		LLPickInfo pick = LLToolPie::getInstance()->getPick();
+
 		LLMessageSystem	*msg = gMessageSystem;
 
 		msg->newMessageFast(_PREHASH_ObjectGrab);
@@ -1717,6 +1683,13 @@ class LLObjectTouch : public view_listener_t
 		msg->nextBlockFast( _PREHASH_ObjectData);
 		msg->addU32Fast(    _PREHASH_LocalID, object->mLocalID);
 		msg->addVector3Fast(_PREHASH_GrabOffset, LLVector3::zero );
+		msg->nextBlock("SurfaceInfo");
+		msg->addVector3("UVCoord", LLVector3(pick.mUVCoords));
+		msg->addVector3("STCoord", LLVector3(pick.mSTCoords));
+		msg->addS32Fast(_PREHASH_FaceIndex, pick.mObjectFace);
+		msg->addVector3("Position", pick.mIntersection);
+		msg->addVector3("Normal", pick.mNormal);
+		msg->addVector3("Binormal", pick.mBinormal);
 		msg->sendMessage( object->getRegion()->getHost());
 
 		// *NOTE: Hope the packets arrive safely and in order or else
@@ -1728,6 +1701,13 @@ class LLObjectTouch : public view_listener_t
 		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 		msg->nextBlockFast(_PREHASH_ObjectData);
 		msg->addU32Fast(_PREHASH_LocalID, object->mLocalID);
+		msg->nextBlock("SurfaceInfo");
+		msg->addVector3("UVCoord", LLVector3(pick.mUVCoords));
+		msg->addVector3("STCoord", LLVector3(pick.mSTCoords));
+		msg->addS32Fast(_PREHASH_FaceIndex, pick.mObjectFace);
+		msg->addVector3("Position", pick.mIntersection);
+		msg->addVector3("Normal", pick.mNormal);
+		msg->addVector3("Binormal", pick.mBinormal);
 		msg->sendMessage(object->getRegion()->getHost());
 
 		return true;
@@ -1740,7 +1720,7 @@ class LLObjectEnableTouch : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLViewerObject* obj = gObjectList.findObject(gLastHitObjectID);
+		LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		bool new_value = obj && obj->flagHandleTouch();
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
@@ -1759,7 +1739,7 @@ class LLObjectEnableTouch : public view_listener_t
 	}
 };
 
-void label_touch(LLString& label, void*)
+void label_touch(std::string& label, void*)
 {
 	LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
 	if (node && node->mValid && !node->mTouchName.empty())
@@ -1774,7 +1754,7 @@ void label_touch(LLString& label, void*)
 
 bool handle_object_open()
 {
-	LLViewerObject* obj = gObjectList.findObject(gLastHitObjectID);
+	LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 	if(!obj) return true;
 
 	LLFloaterOpenObject::show();
@@ -1795,7 +1775,7 @@ class LLObjectEnableOpen : public view_listener_t
 	{
 		// Look for contents in root object, which is all the LLFloaterOpenObject
 		// understands.
-		LLViewerObject* obj = gObjectList.findObject(gLastHitObjectID);
+		LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		bool new_value = (obj != NULL);
 		if (new_value)
 		{
@@ -1821,35 +1801,62 @@ class LLViewCheckBuildMode : public view_listener_t
 
 bool toggle_build_mode()
 {
-	if (LLToolMgr::getInstance()->inEdit())
+	if (LLToolMgr::getInstance()->inBuildMode())
 	{
-		// just reset the view, will pull us out of edit mode
-		handle_reset_view();
-
+		if (gSavedSettings.getBOOL("EditCameraMovement"))
+		{
+			// just reset the view, will pull us out of edit mode
+			handle_reset_view();
+		}
+		else
+		{
+			// manually disable edit mode, but do not affect the camera
+			gAgent.resetView(false);
+			gFloaterTools->close();
+			gViewerWindow->showCursor();			
+		}
 		// avoid spurious avatar movements pulling out of edit mode
 		LLViewerJoystick::getInstance()->moveAvatar(true);
 	}
 	else
 	{
-		if (LLViewerJoystick::getInstance()->getOverrideCamera())
+		ECameraMode camMode = gAgent.getCameraMode();
+		if (CAMERA_MODE_MOUSELOOK == camMode ||	CAMERA_MODE_CUSTOMIZE_AVATAR == camMode)
 		{
-			handle_toggle_flycam();
+			// pull the user out of mouselook or appearance mode when entering build mode
+			handle_reset_view();
 		}
-			
-		if (gAgent.getFocusOnAvatar() && gSavedSettings.getBOOL("EditCameraMovement") )
+
+		if (gSavedSettings.getBOOL("EditCameraMovement"))
 		{
-			// zoom in if we're looking at the avatar
-			gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-			gAgent.setFocusGlobal(gAgent.getPositionGlobal() + 2.0 * LLVector3d(gAgent.getAtAxis()));
-			gAgent.cameraZoomIn(0.666f);
-			gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
+			// camera should be set
+			if (LLViewerJoystick::getInstance()->getOverrideCamera())
+			{
+				handle_toggle_flycam();
+			}
+				
+			if (gAgent.getFocusOnAvatar())
+			{
+				// zoom in if we're looking at the avatar
+				gAgent.setFocusOnAvatar(FALSE, ANIMATE);
+				gAgent.setFocusGlobal(gAgent.getPositionGlobal() + 2.0 * LLVector3d(gAgent.getAtAxis()));
+				gAgent.cameraZoomIn(0.666f);
+				gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
+			}
 		}
 
+		
 		LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
 		LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
 
 		// Could be first use
 		LLFirstUse::useBuild();
+
+		gAgent.resetView(false);
+
+		// avoid spurious avatar movements
+		LLViewerJoystick::getInstance()->moveAvatar(true);
+
 	}
 	return true;
 }
@@ -1895,14 +1902,14 @@ class LLObjectBuild : public view_listener_t
 		{
 			// zoom in if we're looking at the avatar
 			gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-			gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+			gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 			gAgent.cameraZoomIn(0.666f);
 			gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
 			gViewerWindow->moveCursorToCenter();
 		}
 		else if ( gSavedSettings.getBOOL("EditCameraMovement") )
 		{
-			gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+			gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 			gViewerWindow->moveCursorToCenter();
 		}
 
@@ -1935,13 +1942,17 @@ class LLObjectEdit : public view_listener_t
 			else
 			{
 				gAgent.setFocusOnAvatar(FALSE, ANIMATE);
+				LLViewerObject* selected_objectp = selection->getFirstRootObject();
+				if (selected_objectp)
+				{
 				// zoom in on object center instead of where we clicked, as we need to see the manipulator handles
-				gAgent.setFocusGlobal(gLastHitPosGlobal /*+ gLastHitObjectOffset*/, gLastHitObjectID);
+					gAgent.setFocusGlobal(selected_objectp->getPositionGlobal(), selected_objectp->getID());
 				gAgent.cameraZoomIn(0.666f);
 				gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
 				gViewerWindow->moveCursorToCenter();
 			}
 		}
+		}
 
 		gFloaterTools->open();		/* Flawfinder: ignore */
 	
@@ -1980,7 +1991,7 @@ class LLLandBuild : public view_listener_t
 		{
 			// zoom in if we're looking at the avatar
 			gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-			gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+			gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 			gAgent.cameraZoomIn(0.666f);
 			gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
 			gViewerWindow->moveCursorToCenter();
@@ -1988,7 +1999,7 @@ class LLLandBuild : public view_listener_t
 		else if ( gSavedSettings.getBOOL("EditCameraMovement")  )
 		{
 			// otherwise just move focus
-			gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+			gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 			gViewerWindow->moveCursorToCenter();
 		}
 
@@ -2055,8 +2066,18 @@ class LLEnableEdit : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		bool new_value = gAgent.isGodlike() || !gAgent.inPrelude();
-		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+		// *HACK:  The new "prelude" Help Islands have a build sandbox area,
+		// so users need the Edit and Create pie menu options when they are
+		// there.  Eventually this needs to be replaced with code that only 
+		// lets you edit objects if you have permission to do so (edit perms,
+		// group edit, god).  See also lltoolbar.cpp.  JC
+		bool enable = true;
+		if (gAgent.inPrelude())
+		{
+			enable = LLViewerParcelMgr::getInstance()->agentCanBuild()
+				|| LLSelectMgr::getInstance()->getSelection()->isAttachment();
+		}
+		gMenuHolder->findControl(userdata["control"].asString())->setValue(enable);
 		return true;
 	}
 };
@@ -2106,15 +2127,19 @@ BOOL enable_has_attachments(void*)
 //---------------------------------------------------------------------------
 void handle_follow(void *userdata)
 {
-	// follow a given avatar, ID in gLastHitObjectID
-	gAgent.startFollowPilot(gLastHitObjectID);
+	// follow a given avatar by ID
+	LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+	if (objectp)
+	{
+		gAgent.startFollowPilot(objectp->getID());
+	}
 }
 
 class LLObjectEnableMute : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLViewerObject* object = gViewerWindow->lastObjectHit();
+		LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		bool new_value = (object != NULL);
 		if (new_value)
 		{
@@ -2123,7 +2148,7 @@ class LLObjectEnableMute : public view_listener_t
 			{
 				// It's an avatar
 				LLNameValue *lastname = avatar->getNVPair("LastName");
-				BOOL is_linden = lastname && !LLString::compareStrings(lastname->getString(), "Linden");
+				BOOL is_linden = lastname && !LLStringUtil::compareStrings(lastname->getString(), "Linden");
 				BOOL is_self = avatar->isSelf();
 				new_value = !is_linden && !is_self;
 			}
@@ -2137,11 +2162,11 @@ class LLObjectMute : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLViewerObject* object = gViewerWindow->lastObjectHit();
+		LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		if (!object) return true;
 		
 		LLUUID id;
-		LLString name;
+		std::string name;
 		LLMute::EType type;
 		LLVOAvatar* avatar = find_avatar_from_object(object); 
 		if (avatar)
@@ -2193,11 +2218,12 @@ bool handle_go_to()
 	// JAMESDEBUG try simulator autopilot
 	std::vector<std::string> strings;
 	std::string val;
-	val = llformat("%g", gLastHitPosGlobal.mdV[VX]);
+	LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
+	val = llformat("%g", pos.mdV[VX]);
 	strings.push_back(val);
-	val = llformat("%g", gLastHitPosGlobal.mdV[VY]);
+	val = llformat("%g", pos.mdV[VY]);
 	strings.push_back(val);
-	val = llformat("%g", gLastHitPosGlobal.mdV[VZ]);
+	val = llformat("%g", pos.mdV[VZ]);
 	strings.push_back(val);
 	send_generic_message("autopilot", strings);
 
@@ -2266,15 +2292,15 @@ class LLAvatarFreeze : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
 		if( avatar )
 		{
 			LLUUID* avatar_id = new LLUUID( avatar->getID() );
-			LLString fullname = avatar->getFullname();
+			std::string fullname = avatar->getFullname();
 
 			if (!fullname.empty())
 			{
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[AVATAR_NAME]"] = fullname;
 				gViewerWindow->alertXml("FreezeAvatarFullname",
 							args,
@@ -2316,7 +2342,7 @@ class LLAvatarDebug : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
 		if( avatar )
 		{
 			avatar->dumpLocalTextures();
@@ -2368,15 +2394,15 @@ class LLAvatarEject : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
 		if( avatar )
 		{
 			LLUUID* avatar_id = new LLUUID( avatar->getID() );
-			LLString fullname = avatar->getFullname();
+			std::string fullname = avatar->getFullname();
 
 			if (!fullname.empty())
 			{
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[AVATAR_NAME]"] = fullname;
 				gViewerWindow->alertXml("EjectAvatarFullname",
 							args,
@@ -2398,7 +2424,7 @@ class LLAvatarEnableFreezeEject : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
 		bool new_value = (avatar != NULL);
 
 		if (new_value)
@@ -2423,11 +2449,11 @@ class LLAvatarGiveCard : public view_listener_t
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		llinfos << "handle_give_card()" << llendl;
-		LLViewerObject* dest = gViewerWindow->lastObjectHit();
+		LLViewerObject* dest = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		if(dest && dest->isAvatar())
 		{
 			bool found_name = false;
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			LLNameValue* nvfirst = dest->getNVPair("FirstName");
 			LLNameValue* nvlast = dest->getNVPair("LastName");
 			if(nvfirst && nvlast)
@@ -2496,63 +2522,34 @@ void handle_leave_group(void *)
 {
 	if (gAgent.getGroupID() != LLUUID::null)
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[GROUP]"] = gAgent.mGroupName;
 		gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callback_leave_group);
 	}
 }
 
-void append_aggregate(LLString& string, const LLAggregatePermissions& ag_perm, PermissionBit bit, const char* txt)
+void append_aggregate(std::string& string, const LLAggregatePermissions& ag_perm, PermissionBit bit, const char* txt)
 {
 	LLAggregatePermissions::EValue val = ag_perm.getValue(bit);
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-	buffer[0] = '\0';
+	std::string buffer;
 	switch(val)
 	{
-	case LLAggregatePermissions::AP_NONE:
-		snprintf(buffer, MAX_STRING, "* %s None\n", txt);		/* Flawfinder: ignore */
+	  case LLAggregatePermissions::AP_NONE:
+		buffer = llformat( "* %s None\n", txt);
 		break;
-	case LLAggregatePermissions::AP_SOME:
-		snprintf(buffer, MAX_STRING, "* %s Some\n", txt);		/* Flawfinder: ignore */
+	  case LLAggregatePermissions::AP_SOME:
+		buffer = llformat( "* %s Some\n", txt);
 		break;
-	case LLAggregatePermissions::AP_ALL:
-		snprintf(buffer, MAX_STRING, "* %s All\n", txt);		/* Flawfinder: ignore */
+	  case LLAggregatePermissions::AP_ALL:
+		buffer = llformat( "* %s All\n", txt);
 		break;
-	case LLAggregatePermissions::AP_EMPTY:
-	default:
+	  case LLAggregatePermissions::AP_EMPTY:
+	  default:
 		break;
 	}
 	string.append(buffer);
 }
 
-const char* build_extensions_string(LLFilePicker::ELoadFilter filter)
-{
-	switch(filter)
-	{
-#if LL_WINDOWS
-	case LLFilePicker::FFLOAD_IMAGE:
-		return IMAGE_EXTENSIONS;
-	case LLFilePicker::FFLOAD_WAV:
-		return SOUND_EXTENSIONS;
-	case LLFilePicker::FFLOAD_ANIM:
-		return ANIM_EXTENSIONS;
-	case LLFilePicker::FFLOAD_SLOBJECT:
-		return SLOBJECT_EXTENSIONS;
-#ifdef _CORY_TESTING
-	case LLFilePicker::FFLOAD_GEOMETRY:
-		return GEOMETRY_EXTENSIONS;
-#endif
-	case LLFilePicker::FFLOAD_XML:
-	    return XML_EXTENSIONS;
-	case LLFilePicker::FFLOAD_ALL:
-		return ALL_FILE_EXTENSIONS;
-#endif
-    default:
-	return ALL_FILE_EXTENSIONS;
-	}
-}
-
-
 BOOL enable_buy(void*)
 {
     // In order to buy, there must only be 1 purchaseable object in
@@ -2595,7 +2592,7 @@ void handle_buy_object(LLSaleInfo sale_info)
 	}
 
 	LLUUID owner_id;
-	LLString owner_name;
+	std::string owner_name;
 	BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 	if (!owners_identical)
 	{
@@ -2691,9 +2688,9 @@ void handle_dump_region_object_cache(void*)
 
 void handle_dump_focus(void *)
 {
-	LLView *view = gFocusMgr.getKeyboardFocus();
+	LLUICtrl *ctrl = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
 
-	llinfos << "Keyboard focus " << (view ? view->getName() : "(none)") << llendl;
+	llinfos << "Keyboard focus " << (ctrl ? ctrl->getName() : "(none)") << llendl;
 }
 
 class LLSelfStandUp : public view_listener_t
@@ -2761,7 +2758,7 @@ void set_god_level(U8 god_level)
             LLViewerLogin::getInstance()->isInProductionGrid());
     }
 
-    LLString::format_map_t args;
+    LLStringUtil::format_map_t args;
 	if(god_level > GOD_NOT)
 	{
 		args["[LEVEL]"] = llformat("%d",(S32)god_level);
@@ -2809,7 +2806,7 @@ void process_grant_godlike_powers(LLMessageSystem* msg, void**)
 	}
 }
 
-void load_url_local_file(const char* file_name)
+void load_url_local_file(const std::string& file_name)
 {
 	if( gAgent.cameraMouselook() )
 	{
@@ -2833,7 +2830,7 @@ void load_url_local_file(const char* file_name)
 	full_path.append(gDirUtilp->getDirDelimiter());
 	full_path.append(file_name);
 
-	LLWeb::loadURL(full_path.c_str());
+	LLWeb::loadURL(full_path);
 }
 
 /*
@@ -2909,7 +2906,7 @@ class LLAvatarEnableAddFriend : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object(gViewerWindow->lastObjectHit());
+		LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getFirstObject());
 		bool new_value = avatar && !is_agent_friend(avatar->getID());
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 		return true;
@@ -2921,8 +2918,8 @@ void request_friendship(const LLUUID& dest_id)
 	LLViewerObject* dest = gObjectList.findObject(dest_id);
 	if(dest && dest->isAvatar())
 	{
-		LLString fullname;
-		LLString::format_map_t args;
+		std::string fullname;
+		LLStringUtil::format_map_t args;
 		LLNameValue* nvfirst = dest->getNVPair("FirstName");
 		LLNameValue* nvlast = dest->getNVPair("LastName");
 		if(nvfirst && nvlast)
@@ -2935,8 +2932,7 @@ void request_friendship(const LLUUID& dest_id)
 		}
 		if (!fullname.empty())
 		{
-			LLPanelFriends::requestFriendship(dest_id, fullname);
-			LLNotifyBox::showXml("OfferedFriendship", args);
+			LLPanelFriends::requestFriendshipDialog(dest_id, fullname);
 		}
 		else
 		{
@@ -2950,16 +2946,22 @@ class LLEditEnableCustomizeAvatar : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		bool new_value = gAgent.getWearablesLoaded();
-		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+		LLVOAvatar* avatar = gAgent.getAvatarObject();
+
+		bool enabled = ((avatar && avatar->isFullyLoaded()) &&
+				   (gAgent.getWearablesLoaded()));
+
+		gMenuHolder->findControl(userdata["control"].asString())->setValue(enabled);
 		return true;
 	}
 };
 
+// only works on pie menu
 bool handle_sit_or_stand()
 {
-	LLViewerObject *object = gObjectList.findObject(gLastHitNonFloraObjectID);	
-	if (!object)
+	LLPickInfo pick = LLToolPie::getInstance()->getPick();
+	LLViewerObject *object = pick.getObject();;
+	if (!object || pick.mPickType == LLPickInfo::PICK_FLORA)
 	{
 		return true;
 	}
@@ -2974,17 +2976,13 @@ bool handle_sit_or_stand()
 
 	if (object && object->getPCode() == LL_PCODE_VOLUME)
 	{
-		LLVector3d offset_double = gViewerWindow->lastNonFloraObjectHitOffset();
-		LLVector3 offset_single;
-		offset_single.setVec(offset_double);
-		
 		gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
 		gMessageSystem->nextBlockFast(_PREHASH_AgentData);
 		gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
 		gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 		gMessageSystem->nextBlockFast(_PREHASH_TargetObject);
 		gMessageSystem->addUUIDFast(_PREHASH_TargetID, object->mID);
-		gMessageSystem->addVector3Fast(_PREHASH_Offset, offset_single);
+		gMessageSystem->addVector3Fast(_PREHASH_Offset, pick.mObjectOffset);
 
 		object->getRegion()->sendReliableMessage();
 	}
@@ -3018,7 +3016,7 @@ class LLLandSit : public view_listener_t
 		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
 		LLViewerParcelMgr::getInstance()->deselectLand();
 
-		LLVector3d posGlobal = gLastHitPosGlobal;
+		LLVector3d posGlobal = LLToolPie::getInstance()->getPick().mPosGlobal;
 		
 		LLQuaternion target_rot;
 		if (gAgent.getAvatarObject())
@@ -3631,17 +3629,17 @@ void handle_claim_public_land(void*)
 	msg->nextBlock("MethodData");
 	msg->addString("Method", "claimpublicland");
 	msg->addUUID("Invoice", LLUUID::null);
-	char buffer[32];		/* Flawfinder: ignore */
-	snprintf(buffer, sizeof(buffer), "%f", west_south.mV[VX]);		/* Flawfinder: ignore */
+	std::string buffer;
+	buffer = llformat( "%f", west_south.mV[VX]);
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", buffer);
-	snprintf(buffer, sizeof(buffer), "%f", west_south.mV[VY]);		/* Flawfinder: ignore */
+	buffer = llformat( "%f", west_south.mV[VY]);
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", buffer);
-	snprintf(buffer, sizeof(buffer), "%f", east_north.mV[VX]);		/* Flawfinder: ignore */
+	buffer = llformat( "%f", east_north.mV[VX]);
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", buffer);
-	snprintf(buffer, sizeof(buffer), "%f", east_north.mV[VY]);		/* Flawfinder: ignore */
+	buffer = llformat( "%f", east_north.mV[VY]);
 	msg->nextBlock("ParamList");
 	msg->addString("Parameter", buffer);
 	gAgent.sendReliableMessage();
@@ -4152,11 +4150,11 @@ class LLToolsEnableBuyOrTake : public view_listener_t
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
 		// Update label
-		LLString label;
-		LLString buy_text;
-		LLString take_text;
-		LLString param = userdata["data"].asString();
-		LLString::size_type offset = param.find(",");
+		std::string label;
+		std::string buy_text;
+		std::string take_text;
+		std::string param = userdata["data"].asString();
+		std::string::size_type offset = param.find(",");
 		if (offset != param.npos)
 		{
 			buy_text = param.substr(0, offset);
@@ -4250,7 +4248,7 @@ void show_buy_currency(const char* extra)
 	}
 	mesg << "Go to " << BUY_CURRENCY_URL << "\nfor information on purchasing currency?";
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	if (extra != NULL)
 	{
 		args["[EXTRA]"] = extra;
@@ -4444,7 +4442,7 @@ class LLToolsLink : public view_listener_t
 		S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
 		if (object_count > MAX_CHILDREN_PER_TASK + 1)
 		{
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[COUNT]"] = llformat("%d", object_count);
 			int max = MAX_CHILDREN_PER_TASK+1;
 			args["[MAX]"] = llformat("%d", max);
@@ -4463,7 +4461,7 @@ class LLToolsLink : public view_listener_t
 			return true;
 		}
 		LLUUID owner_id;
-		LLString owner_name;
+		std::string owner_name;
 		if(!LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name))
 		{
 			// we don't actually care if you're the owner, but novices are
@@ -4503,13 +4501,31 @@ class LLToolsStopAllAnimations : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatarp = gAgent.getAvatarObject();
-		
-		if (!avatarp) return true;
-		
-		avatarp->deactivateAllMotions();
-	
-		avatarp->processAnimationStateChanges();
+		LLVOAvatar* avatarp = gAgent.getAvatarObject();		
+		if (avatarp)
+		{
+			avatarp->deactivateAllMotions();	
+			avatarp->startDefaultMotions();
+		}
+		return true;
+	}
+};
+
+class LLToolsReleaseKeys : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		gAgent.forceReleaseControls();
+
+		return true;
+	}
+};
+
+class LLToolsEnableReleaseKeys : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		gMenuHolder->findControl(userdata["control"].asString())->setValue( gAgent.anyControlGrabbed() );
 		return true;
 	}
 };
@@ -4842,8 +4858,8 @@ void show_debug_menus()
 		gMenuBarView->setItemVisible(SERVER_MENU_NAME, show_server_menu);
 		gMenuBarView->setItemEnabled(SERVER_MENU_NAME, show_server_menu);
 
-		//gMenuBarView->setItemVisible(LLString("DebugOptions"),	visible);
-		//gMenuBarView->setItemVisible(LLString(AVI_TOOLS),	visible);
+		//gMenuBarView->setItemVisible("DebugOptions",	visible);
+		//gMenuBarView->setItemVisible(std::string(AVI_TOOLS),	visible);
 
 		gMenuBarView->arrange(); // clean-up positioning 
 	};
@@ -4873,43 +4889,43 @@ void toggle_map( void* user_data )
 }
 
 
-LLUUID gExporterRequestID;
-LLString gExportDirectory;
+// LLUUID gExporterRequestID;
+// std::string gExportDirectory;
 
-LLUploadDialog *gExportDialog = NULL;
+// LLUploadDialog *gExportDialog = NULL;
 
-void handle_export_selected( void * )
-{
-	LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
-	if (selection->isEmpty())
-	{
-		return;
-	}
-	llinfos << "Exporting selected objects:" << llendl;
+// void handle_export_selected( void * )
+// {
+// 	LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
+// 	if (selection->isEmpty())
+// 	{
+// 		return;
+// 	}
+// 	llinfos << "Exporting selected objects:" << llendl;
 
-	gExporterRequestID.generate();
-	gExportDirectory = "";
+// 	gExporterRequestID.generate();
+// 	gExportDirectory = "";
 
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_ObjectExportSelected);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_RequestID, gExporterRequestID);
-	msg->addS16Fast(_PREHASH_VolumeDetail, 4);
+// 	LLMessageSystem* msg = gMessageSystem;
+// 	msg->newMessageFast(_PREHASH_ObjectExportSelected);
+// 	msg->nextBlockFast(_PREHASH_AgentData);
+// 	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+// 	msg->addUUIDFast(_PREHASH_RequestID, gExporterRequestID);
+// 	msg->addS16Fast(_PREHASH_VolumeDetail, 4);
 
-	for (LLObjectSelection::root_iterator iter = selection->root_begin();
-		 iter != selection->root_end(); iter++)
-	{
-		LLSelectNode* node = *iter;
-		LLViewerObject* object = node->getObject();
-		msg->nextBlockFast(_PREHASH_ObjectData);
-		msg->addUUIDFast(_PREHASH_ObjectID, object->getID());
-		llinfos << "Object: " << object->getID() << llendl;
-	}
-	msg->sendReliable(gAgent.getRegion()->getHost());
+// 	for (LLObjectSelection::root_iterator iter = selection->root_begin();
+// 		 iter != selection->root_end(); iter++)
+// 	{
+// 		LLSelectNode* node = *iter;
+// 		LLViewerObject* object = node->getObject();
+// 		msg->nextBlockFast(_PREHASH_ObjectData);
+// 		msg->addUUIDFast(_PREHASH_ObjectID, object->getID());
+// 		llinfos << "Object: " << object->getID() << llendl;
+// 	}
+// 	msg->sendReliable(gAgent.getRegion()->getHost());
 
-	gExportDialog = LLUploadDialog::modalUploadDialog("Exporting selected objects...");
-}
+// 	gExportDialog = LLUploadDialog::modalUploadDialog("Exporting selected objects...");
+// }
 
 BOOL menu_check_build_tool( void* user_data )
 {
@@ -5114,7 +5130,7 @@ class LLAvatarInviteToGroup : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
 		if(avatar)
 		{
 			invite_to_group(avatar->getID());
@@ -5127,7 +5143,7 @@ class LLAvatarAddFriend : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
 		if(avatar && !is_agent_friend(avatar->getID()))
 		{
 			request_friendship(avatar->getID());
@@ -5200,11 +5216,11 @@ class LLEnablePayObject : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object(gViewerWindow->lastObjectHit());
+		LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getFirstObject());
 		bool new_value = (avatar != NULL);
 		if (!new_value)
 		{
-			LLViewerObject* object = gViewerWindow->lastObjectHit();
+			LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 			if( object )
 			{
 				LLViewerObject *parent = (LLViewerObject *)object->getParent();
@@ -5224,8 +5240,9 @@ class LLObjectEnableSitOrStand : public view_listener_t
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		bool new_value = false;
-		LLViewerObject* dest_object = NULL;
-		if((dest_object = gObjectList.findObject(gLastHitObjectID)))
+		LLViewerObject* dest_object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+
+		if(dest_object)
 		{
 			if(dest_object->getPCode() == LL_PCODE_VOLUME)
 			{
@@ -5235,11 +5252,11 @@ class LLObjectEnableSitOrStand : public view_listener_t
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
 		// Update label
-		LLString label;
-		LLString sit_text;
-		LLString stand_text;
-		LLString param = userdata["data"].asString();
-		LLString::size_type offset = param.find(",");
+		std::string label;
+		std::string sit_text;
+		std::string stand_text;
+		std::string param = userdata["data"].asString();
+		std::string::size_type offset = param.find(",");
 		if (offset != param.npos)
 		{
 			sit_text = param.substr(0, offset);
@@ -5326,7 +5343,7 @@ class LLShowFloater : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString floater_name = userdata.asString();
+		std::string floater_name = userdata.asString();
 		if (floater_name == "gestures")
 		{
 			LLFloaterGesture::toggleVisibility();
@@ -5426,7 +5443,7 @@ class LLShowFloater : public view_listener_t
 		}
 		else if (floater_name == "help tutorial")
 		{
-			LLFloaterHUD::show();
+			LLFloaterHUD::showHUD();
 		}
 		else if (floater_name == "complaint reporter")
 		{
@@ -5471,8 +5488,8 @@ class LLFloaterVisible : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString control_name = userdata["control"].asString();
-		LLString floater_name = userdata["data"].asString();
+		std::string control_name = userdata["control"].asString();
+		std::string floater_name = userdata["data"].asString();
 		bool new_value = false;
 		if (floater_name == "friends")
 		{
@@ -5515,12 +5532,12 @@ class LLFloaterVisible : public view_listener_t
 	}
 };
 
-void callback_show_url(S32 option, void* url)
+void callback_show_url(S32 option, void* data)
 {
-	const char* urlp = (const char*)url;
+	std::string* urlp = (std::string*)data;
 	if (0 == option)
 	{
-		LLWeb::loadURL(urlp);
+		LLWeb::loadURL(*urlp);
 	}
 	delete urlp;
 }
@@ -5529,22 +5546,13 @@ class LLPromptShowURL : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString param = userdata.asString();
-		LLString::size_type offset = param.find(",");
+		std::string param = userdata.asString();
+		std::string::size_type offset = param.find(",");
 		if (offset != param.npos)
 		{
-			LLString alert = param.substr(0, offset);
-			LLString url = param.substr(offset+1);
-			char *url_copy = new char[url.size()+1];
-			if (url_copy != NULL)
-			{
-				strcpy(url_copy, url.c_str());		/* Flawfinder: ignore */
-			}
-			else
-			{
-				llerrs << "Memory Allocation Failed" << llendl;
-				return false;
-			}
+			std::string alert = param.substr(0, offset);
+			std::string url = param.substr(offset+1);
+			std::string* url_copy = new std::string(url);
 			gViewerWindow->alertXml(alert, callback_show_url, url_copy);
 		}
 		else
@@ -5555,12 +5563,12 @@ class LLPromptShowURL : public view_listener_t
 	}
 };
 
-void callback_show_file(S32 option, void* filename)
+void callback_show_file(S32 option, void* data)
 {
-	const char* filenamep = (const char*)filename;
+	std::string* filenamep = (std::string*)data;
 	if (0 == option)
 	{
-		load_url_local_file(filenamep);
+		load_url_local_file(*filenamep);
 	}
 	delete filenamep;
 }
@@ -5569,22 +5577,13 @@ class LLPromptShowFile : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString param = userdata.asString();
-		LLString::size_type offset = param.find(",");
+		std::string param = userdata.asString();
+		std::string::size_type offset = param.find(",");
 		if (offset != param.npos)
 		{
-			LLString alert = param.substr(0, offset);
-			LLString file = param.substr(offset+1);
-			char *file_copy = new char[file.size()+1];
-			if (file_copy != NULL)
-			{
-				strcpy(file_copy, file.c_str());		/* Flawfinder: ignore */
-			}
-			else
-			{
-				llerrs << "Memory Allocation Failed" << llendl;
-				return false;
-			}
+			std::string alert = param.substr(0, offset);
+			std::string file = param.substr(offset+1);
+			std::string* file_copy = new std::string(file);
 			gViewerWindow->alertXml(alert, callback_show_file, file_copy);
 		}
 		else
@@ -5606,7 +5605,11 @@ class LLShowAgentProfile : public view_listener_t
 		}
 		else if (userdata.asString() == "hit object")
 		{
-			agent_id = gLastHitObjectID;
+			LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+			if (objectp)
+			{
+				agent_id = objectp->getID();
+			}
 		}
 		else
 		{
@@ -5642,12 +5645,12 @@ void handle_focus(void *)
 	{
 		// zoom in if we're looking at the avatar
 		gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-		gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+		gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 		gAgent.cameraZoomIn(0.666f);
 	}
 	else
 	{
-		gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+		gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 	}
 
 	gViewerWindow->moveCursorToCenter();
@@ -5665,19 +5668,19 @@ class LLLandEdit : public view_listener_t
 		{
 			// zoom in if we're looking at the avatar
 			gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-			gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+			gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 
 			gAgent.cameraOrbitOver( F_PI * 0.25f );
 			gViewerWindow->moveCursorToCenter();
 		}
 		else if ( gSavedSettings.getBOOL("EditCameraMovement") )
 		{
-			gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+			gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 			gViewerWindow->moveCursorToCenter();
 		}
 
 
-		LLViewerParcelMgr::getInstance()->selectParcelAt( gLastHitPosGlobal );
+		LLViewerParcelMgr::getInstance()->selectParcelAt( LLToolPie::getInstance()->getPick().mPosGlobal );
 
 		gFloaterTools->showMore(TRUE);
 		gFloaterView->bringToFront( gFloaterTools );
@@ -5715,13 +5718,13 @@ void handle_move(void*)
 	{
 		// zoom in if we're looking at the avatar
 		gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-		gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+		gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 
 		gAgent.cameraZoomIn(0.666f);
 	}
 	else
 	{
-		gAgent.setFocusGlobal(gLastHitPosGlobal + gLastHitObjectOffset, gLastHitObjectID);
+		gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
 	}
 
 	gViewerWindow->moveCursorToCenter();
@@ -5823,7 +5826,7 @@ class LLAttachmentDrop : public view_listener_t
 	{
 		// Called when the user clicked on an object attached to them
 		// and selected "Drop".
-		LLViewerObject *object = gViewerWindow->lastObjectHit();
+		LLViewerObject *object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		if (!object)
 		{
 			llwarns << "handle_drop_attachment() - no object to drop" << llendl;
@@ -5882,7 +5885,7 @@ void handle_detach_from_avatar(void* user_data)
 	}
 }
 
-void attach_label(LLString& label, void* user_data)
+void attach_label(std::string& label, void* user_data)
 {
 	LLViewerJointAttachment* attachmentp = (LLViewerJointAttachment*)user_data;
 	if (attachmentp)
@@ -5893,13 +5896,13 @@ void attach_label(LLString& label, void* user_data)
 			LLViewerInventoryItem* itemp = gInventory.getItem(attachmentp->getItemID());
 			if (itemp)
 			{
-				label += LLString(" (") + itemp->getName() + LLString(")");
+				label += std::string(" (") + itemp->getName() + std::string(")");
 			}
 		}
 	}
 }
 
-void detach_label(LLString& label, void* user_data)
+void detach_label(std::string& label, void* user_data)
 {
 	LLViewerJointAttachment* attachmentp = (LLViewerJointAttachment*)user_data;
 	if (attachmentp)
@@ -5910,7 +5913,7 @@ void detach_label(LLString& label, void* user_data)
 			LLViewerInventoryItem* itemp = gInventory.getItem(attachmentp->getItemID());
 			if (itemp)
 			{
-				label += LLString(" (") + itemp->getName() + LLString(")");
+				label += std::string(" (") + itemp->getName() + std::string(")");
 			}
 		}
 	}
@@ -5923,7 +5926,7 @@ class LLAttachmentDetach : public view_listener_t
 	{
 		// Called when the user clicked on an object attached to them
 		// and selected "Detach".
-		LLViewerObject *object = gViewerWindow->lastObjectHit();
+		LLViewerObject *object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		if (!object)
 		{
 			llwarns << "handle_detach() - no object to detach" << llendl;
@@ -6003,7 +6006,7 @@ class LLAttachmentEnableDrop : public view_listener_t
 		// in your inventory.  Therefore, we disable the drop option until the
 		// item is in your inventory
 
-		LLViewerObject*              object         = gViewerWindow->lastObjectHit();
+		LLViewerObject*              object         = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 		LLViewerJointAttachment*     attachment_pt  = NULL;
 		LLInventoryItem*             item           = NULL;
 
@@ -6045,7 +6048,7 @@ class LLAttachmentEnableDrop : public view_listener_t
 
 BOOL enable_detach(void*)
 {
-	LLViewerObject* object = gViewerWindow->lastObjectHit();
+	LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 	if (!object) return FALSE;
 	if (!object->isAttachment()) return FALSE;
 
@@ -6085,9 +6088,12 @@ BOOL object_selected_and_point_valid(void *user_data)
 	{
 		LLSelectNode* node = *iter;
 		LLViewerObject* object = node->getObject();
-		for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++ )
+		LLViewerObject::const_child_list_t& child_list = object->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+			 iter != child_list.end(); iter++)
 		{
-			if (object->mChildList[child_num]->isAvatar())
+			LLViewerObject* child = *iter;
+			if (child->isAvatar())
 			{
 				return FALSE;
 			}
@@ -6149,10 +6155,10 @@ class LLAvatarSendIM : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+		LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getFirstObject() );
 		if(avatar)
 		{
-			LLString name("IM");
+			std::string name("IM");
 			LLNameValue *first = avatar->getNVPair("FirstName");
 			LLNameValue *last = avatar->getNVPair("LastName");
 			if (first && last)
@@ -6243,11 +6249,15 @@ class LLToolsSelectedScriptAction : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString action = userdata.asString();
+		std::string action = userdata.asString();
 		LLFloaterScriptQueue* queue = NULL;
-		if (action == "compile")
+		if (action == "compile mono")
 		{
-			queue = LLFloaterCompileQueue::create();
+			queue = LLFloaterCompileQueue::create(TRUE);
+		}
+		if (action == "compile lsl")
+		{
+			queue = LLFloaterCompileQueue::create(FALSE);
 		}
 		else if (action == "reset")
 		{
@@ -6408,7 +6418,7 @@ BOOL menu_ui_enabled(void *user_data)
 void menu_toggle_control( void* user_data )
 {
         BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) );
-        if (LLString(static_cast<char*>(user_data)) == "HighResSnapshot" && !checked)
+        if (std::string(static_cast<char*>(user_data)) == "HighResSnapshot" && !checked)
         {
                 // High Res Snapshot active, must uncheck RenderUIInSnapshot
                 gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
@@ -6422,7 +6432,7 @@ class LLToggleControl : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString control_name = userdata.asString();
+		std::string control_name = userdata.asString();
 		BOOL checked = gSavedSettings.getBOOL( control_name );
 		if (control_name == "HighResSnapshot" && !checked)
 		{
@@ -6464,6 +6474,18 @@ BOOL enable_land_selected( void* )
 	return !(LLViewerParcelMgr::getInstance()->selectionEmpty());
 }
 
+void menu_toggle_attached_lights(void* user_data)
+{
+	menu_toggle_control(user_data);
+	LLPipeline::sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights");
+}
+
+void menu_toggle_attached_particles(void* user_data)
+{
+	menu_toggle_control(user_data);
+	LLPipeline::sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles");
+}
+
 class LLSomethingSelected : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -6490,16 +6512,36 @@ BOOL enable_more_than_one_selected(void* )
 	return (LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1);
 }
 
+static bool is_editable_selected()
+{
+	return (LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() != NULL);
+}
+
 class LLEditableSelected : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		bool new_value = (LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() != NULL);
-		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+		gMenuHolder->findControl(userdata["control"].asString())->setValue(is_editable_selected());
 		return true;
 	}
 };
 
+class LLEditableSelectedMono : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		LLViewerRegion* region = gAgent.getRegion();
+		if(region && gMenuHolder && gMenuHolder->findControl(userdata["control"].asString()))
+		{
+			bool have_cap = (! region->getCapability("UpdateScriptTask").empty());
+			bool selected = is_editable_selected() && have_cap;
+			gMenuHolder->findControl(userdata["control"].asString())->setValue(selected);
+			return true;
+		}
+		return false;
+	}
+};
+
 class LLToolsEnableTakeCopy : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -6676,22 +6718,22 @@ BOOL enable_not_thirdperson(void*)
 }
 
 
-BOOL enable_export_selected(void *)
-{
-	if (LLSelectMgr::getInstance()->getSelection()->isEmpty())
-	{
-		return FALSE;
-	}
-	if (!gExporterRequestID.isNull())
-	{
-		return FALSE;
-	}
-	if (!LLUploadDialog::modalUploadIsFinished())
-	{
-		return FALSE;
-	}
-	return TRUE;
-}
+// BOOL enable_export_selected(void *)
+// {
+// 	if (LLSelectMgr::getInstance()->getSelection()->isEmpty())
+// 	{
+// 		return FALSE;
+// 	}
+// 	if (!gExporterRequestID.isNull())
+// 	{
+// 		return FALSE;
+// 	}
+// 	if (!LLUploadDialog::modalUploadIsFinished())
+// 	{
+// 		return FALSE;
+// 	}
+// 	return TRUE;
+// }
 
 class LLViewEnableMouselook : public view_listener_t
 {
@@ -6925,7 +6967,11 @@ void handle_dump_avatar_local_textures(void*)
 
 void handle_debug_avatar_textures(void*)
 {
-	LLFloaterAvatarTextures::show(gLastHitObjectID);
+	LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+	if (objectp)
+	{
+		LLFloaterAvatarTextures::show(objectp->getID());
+	}
 }
 
 void handle_grab_texture(void* data)
@@ -6941,7 +6987,7 @@ void handle_grab_texture(void* data)
 		LLUUID folder_id(gInventory.findCategoryUUIDForType(asset_type));
 		if(folder_id.notNull())
 		{
-			LLString name = "Baked ";
+			std::string name = "Baked ";
 			switch (index)
 			{
 			case LLVOAvatar::TEX_EYES_BAKED:
@@ -6978,7 +7024,7 @@ void handle_grab_texture(void* data)
 						   PERM_NONE,
 						   PERM_NONE,
 						   next_owner_perm);
-			S32 creation_date_now = time_corrected();
+			time_t creation_date_now = time_corrected();
 			LLPointer<LLViewerInventoryItem> item
 				= new LLViewerInventoryItem(item_id,
 											folder_id,
@@ -6987,7 +7033,7 @@ void handle_grab_texture(void* data)
 											asset_type,
 											inv_type,
 											name,
-											"",
+											LLStringUtil::null,
 											LLSaleInfo::DEFAULT,
 											LLInventoryItem::II_FLAGS_NONE,
 											creation_date_now);
@@ -7064,12 +7110,7 @@ LLVOAvatar* find_avatar_from_object( const LLUUID& object_id )
 
 void handle_disconnect_viewer(void *)
 {
-	char message[2048];		/* Flawfinder: ignore */
-	message[0] = '\0';
-
-	snprintf(message, sizeof(message), "Testing viewer disconnect");		/* Flawfinder: ignore */
-
-	LLAppViewer::instance()->forceDisconnect(message);
+	LLAppViewer::instance()->forceDisconnect("Testing viewer disconnect");
 }
 
 void force_error_breakpoint(void *)
@@ -7175,20 +7216,20 @@ void handle_save_to_xml(void*)
 		return;
 	}
 
-	LLString default_name = "floater_";
+	std::string default_name = "floater_";
 	default_name += frontmost->getTitle();
 	default_name += ".xml";
 
-	LLString::toLower(default_name);
-	LLString::replaceChar(default_name, ' ', '_');
-	LLString::replaceChar(default_name, '/', '_');
-	LLString::replaceChar(default_name, ':', '_');
-	LLString::replaceChar(default_name, '"', '_');
+	LLStringUtil::toLower(default_name);
+	LLStringUtil::replaceChar(default_name, ' ', '_');
+	LLStringUtil::replaceChar(default_name, '/', '_');
+	LLStringUtil::replaceChar(default_name, ':', '_');
+	LLStringUtil::replaceChar(default_name, '"', '_');
 
 	LLFilePicker& picker = LLFilePicker::instance();
-	if (picker.getSaveFile(LLFilePicker::FFSAVE_XML, default_name.c_str()))
+	if (picker.getSaveFile(LLFilePicker::FFSAVE_XML, default_name))
 	{
-		LLString filename = picker.getFirstFile();
+		std::string filename = picker.getFirstFile();
 		LLUICtrlFactory::getInstance()->saveToXML(frontmost, filename);
 	}
 }
@@ -7198,7 +7239,7 @@ void handle_load_from_xml(void*)
 	LLFilePicker& picker = LLFilePicker::instance();
 	if (picker.getOpenFile(LLFilePicker::FFLOAD_XML))
 	{
-		LLString filename = picker.getFirstFile();
+		std::string filename = picker.getFirstFile();
 		LLFloater* floater = new LLFloater("sample_floater");
 		LLUICtrlFactory::getInstance()->buildFloater(floater, filename);
 	}
@@ -7281,7 +7322,7 @@ class LLViewBeaconWidth : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString width = userdata.asString();
+		std::string width = userdata.asString();
 		if(width == "1")
 		{
 			gSavedSettings.setS32("DebugBeaconLineWidth", 1);
@@ -7308,7 +7349,7 @@ class LLViewToggleBeacon : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString beacon = userdata.asString();
+		std::string beacon = userdata.asString();
 		if (beacon == "scriptsbeacon")
 		{
 			LLPipeline::toggleRenderScriptedBeacons(NULL);
@@ -7377,7 +7418,7 @@ class LLViewCheckBeaconEnabled : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString beacon = userdata["data"].asString();
+		std::string beacon = userdata["data"].asString();
 		bool new_value = false;
 		if (beacon == "scriptsbeacon")
 		{
@@ -7423,7 +7464,7 @@ class LLViewToggleRenderType : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString type = userdata.asString();
+		std::string type = userdata.asString();
 		if (type == "hideparticles")
 		{
 			LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
@@ -7436,7 +7477,7 @@ class LLViewCheckRenderType : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString type = userdata["data"].asString();
+		std::string type = userdata["data"].asString();
 		bool new_value = false;
 		if (type == "hideparticles")
 		{
@@ -7470,8 +7511,8 @@ class LLEditEnableTakeOff : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString control_name = userdata["control"].asString();
-		LLString clothing = userdata["data"].asString();
+		std::string control_name = userdata["control"].asString();
+		std::string clothing = userdata["data"].asString();
 		bool new_value = false;
 		if (clothing == "shirt")
 		{
@@ -7518,7 +7559,7 @@ class LLEditTakeOff : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString clothing = userdata.asString();
+		std::string clothing = userdata.asString();
 		if (clothing == "shirt")
 		{
 			LLAgent::userRemoveWearable((void*)WT_SHIRT);
@@ -7576,7 +7617,7 @@ class LLToolsSelectTool : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString tool_name = userdata.asString();
+		std::string tool_name = userdata.asString();
 		if (tool_name == "focus")
 		{
 			LLToolMgr::getInstance()->getCurrentToolset()->selectToolByIndex(1);
@@ -7606,7 +7647,7 @@ class LLWorldEnvSettings : public view_listener_t
 {	
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLString tod = userdata.asString();
+		std::string tod = userdata.asString();
 		LLVector3 sun_direction;
 		
 		if (tod == "editor")
@@ -7720,7 +7761,7 @@ class LLWorldDayCycle : public view_listener_t
 
 
 
-static void addMenu(view_listener_t *menu, const char *name)
+static void addMenu(view_listener_t *menu, const std::string& name)
 {
 	sMenus.push_back(menu);
 	menu->registerListener(gMenuHolder, name);
@@ -7821,6 +7862,8 @@ void initialize_menus()
 	addMenu(new LLToolsLink(), "Tools.Link");
 	addMenu(new LLToolsUnlink(), "Tools.Unlink");
 	addMenu(new LLToolsStopAllAnimations(), "Tools.StopAllAnimations");
+	addMenu(new LLToolsReleaseKeys(), "Tools.ReleaseKeys");
+	addMenu(new LLToolsEnableReleaseKeys(), "Tools.EnableReleaseKeys");
 	addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
 	addMenu(new LLToolsBuyOrTake(), "Tools.BuyOrTake");
 	addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
@@ -7928,4 +7971,5 @@ void initialize_menus()
 	addMenu(new LLSomethingSelected(), "SomethingSelected");
 	addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD");
 	addMenu(new LLEditableSelected(), "EditableSelected");
+	addMenu(new LLEditableSelectedMono(), "EditableSelectedMono");
 }
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 384c1cc..e003e90 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -50,7 +50,7 @@ void cleanup_menus();
 void show_debug_menus(); // checks for if menus should be shown first.
 void show_context_menu( S32 x, S32 y, MASK mask );
 void show_build_mode_context_menu(S32 x, S32 y, MASK mask);
-void load_url_local_file(const char *file_name);
+void load_url_local_file(const std::string& file_name);
 BOOL enable_save_into_inventory(void*);
 void handle_reset_view();
 void handle_cut(void*);
@@ -83,8 +83,8 @@ void menu_toggle_control( void* user_data );
 void check_toggle_control( LLUICtrl *, void* user_data );
 void confirm_replace_attachment(S32 option, void* user_data);
 void handle_detach_from_avatar(void* user_data);
-void attach_label(LLString& label, void* user_data);
-void detach_label(LLString& label, void* user_data);
+void attach_label(std::string& label, void* user_data);
+void detach_label(std::string& label, void* user_data);
 BOOL object_selected_and_point_valid(void* user_data);
 BOOL object_attached(void* user_data);
 void handle_detach(void*);
@@ -112,9 +112,6 @@ bool handle_go_to();
 // Export to XML or Collada
 void handle_export_selected( void * );
 
-//Retrieve a list of valid extensions for a given file "type"
-const char* build_extensions_string(LLFilePicker::ELoadFilter filter);
-
 // Pass in an empty string and this function will build a string that
 // describes buyer permissions.
 class LLSaleInfo;
@@ -137,7 +134,7 @@ protected:
 	LLSafeHandle<LLObjectSelection> mObjectSelection;
 };
 
-extern const LLString SAVE_INTO_INVENTORY;
+extern const std::string SAVE_INTO_INVENTORY;
 
 extern LLMenuBarGL*		gMenuBarView;
 //extern LLView*			gMenuBarHolder;
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 6f2d8e2..5dd760e 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -92,6 +92,47 @@ class LLFileEnableUpload : public view_listener_t
 	}
 };
 
+//============================================================================
+
+#if LL_WINDOWS
+static std::string SOUND_EXTENSIONS = "wav";
+static std::string IMAGE_EXTENSIONS = "tga bmp jpg jpeg png";
+static std::string ANIM_EXTENSIONS =  "bvh";
+#ifdef _CORY_TESTING
+static std::string GEOMETRY_EXTENSIONS = "slg";
+#endif
+static std::string XML_EXTENSIONS = "xml";
+static std::string SLOBJECT_EXTENSIONS = "slobject";
+#endif
+static std::string ALL_FILE_EXTENSIONS = "*.*";
+
+std::string build_extensions_string(LLFilePicker::ELoadFilter filter)
+{
+	switch(filter)
+	{
+#if LL_WINDOWS
+	case LLFilePicker::FFLOAD_IMAGE:
+		return IMAGE_EXTENSIONS;
+	case LLFilePicker::FFLOAD_WAV:
+		return SOUND_EXTENSIONS;
+	case LLFilePicker::FFLOAD_ANIM:
+		return ANIM_EXTENSIONS;
+	case LLFilePicker::FFLOAD_SLOBJECT:
+		return SLOBJECT_EXTENSIONS;
+#ifdef _CORY_TESTING
+	case LLFilePicker::FFLOAD_GEOMETRY:
+		return GEOMETRY_EXTENSIONS;
+#endif
+	case LLFilePicker::FFLOAD_XML:
+	    return XML_EXTENSIONS;
+	case LLFilePicker::FFLOAD_ALL:
+		return ALL_FILE_EXTENSIONS;
+#endif
+    default:
+	return ALL_FILE_EXTENSIONS;
+	}
+}
+
 /**
    char* upload_pick(void* data)
 
@@ -100,7 +141,7 @@ class LLFileEnableUpload : public view_listener_t
    returns the string to the full path filename, else returns NULL.
    Data is the load filter for the type of file as defined in LLFilePicker.
 **/
-const char* upload_pick(void* data)
+const std::string upload_pick(void* data)
 {
  	if( gAgent.cameraMouselook() )
 	{
@@ -123,23 +164,23 @@ const char* upload_pick(void* data)
 	if (!picker.getOpenFile(type))
 	{
 		llinfos << "Couldn't import objects from file" << llendl;
-		return NULL;
+		return std::string();
 	}
 
- 	const char* filename = picker.getFirstFile();
-	const char* ext = strrchr(filename, '.');
+	
+	const std::string& filename = picker.getFirstFile();
+	std::string ext = gDirUtilp->getExtension(filename);
 
 	//strincmp doesn't like NULL pointers
-	if (ext == NULL)
+	if (ext.empty())
 	{
-		const char* short_name = strrchr(filename,
-										 *gDirUtilp->getDirDelimiter().c_str());
+		std::string short_name = gDirUtilp->getBaseFileName(filename);
 		
 		// No extension
-		LLStringBase<char>::format_map_t args;
-		args["[FILE]"] = LLString(short_name + 1);
+		LLStringUtil::format_map_t args;
+		args["[FILE]"] = short_name;
 		gViewerWindow->alertXml("NoFileExtension", args);
-		return NULL;
+		return std::string();
 	}
 	else
 	{
@@ -148,8 +189,7 @@ const char* upload_pick(void* data)
 		//if the extension is valid
 
 		//now grab the set of valid file extensions
-		const char* valids = build_extensions_string(type);
-		std::string valid_extensions = std::string(valids);
+		std::string valid_extensions = build_extensions_string(type);
 
 		BOOL ext_valid = FALSE;
 		
@@ -165,10 +205,9 @@ const char* upload_pick(void* data)
 			 token_iter != tokens.end() && ext_valid != TRUE;
 			 ++token_iter)
 		{
-			const char* cur_token = token_iter->c_str();
+			const std::string& cur_token = *token_iter;
 
-			if (0 == strnicmp(cur_token, ext, strlen(cur_token)) ||		/* Flawfinder: ignore */
-				0 == strnicmp(cur_token, "*.*", strlen(cur_token))) 		/* Flawfinder: ignore */
+			if (cur_token == ext || cur_token == "*.*")
 			{
 				//valid extension
 				//or the acceptable extension is any
@@ -180,11 +219,11 @@ const char* upload_pick(void* data)
 		{
 			//should only get here if the extension exists
 			//but is invalid
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[EXTENSION]"] = ext;
-			args["[VALIDS]"] = valids;
+			args["[VALIDS]"] = valid_extensions;
 			gViewerWindow->alertXml("InvalidFileExtension", args);
-			return NULL;
+			return std::string();
 		}
 	}//end else (non-null extension)
 
@@ -195,14 +234,14 @@ const char* upload_pick(void* data)
 	if (type == LLFilePicker::FFLOAD_WAV)
 	{
 		// pre-qualify wavs to make sure the format is acceptable
-		char error_msg[MAX_STRING];		/* Flawfinder: ignore */	
+		std::string error_msg;
 		if (check_for_invalid_wav_formats(filename,error_msg))
 		{
 			llinfos << error_msg << ": " << filename << llendl;
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[FILE]"] = filename;
 			gViewerWindow->alertXml( error_msg, args );
-			return NULL;
+			return std::string();
 		}
 	}//end if a wave/sound file
 
@@ -214,8 +253,8 @@ class LLFileUploadImage : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		const char* filename = upload_pick((void *)LLFilePicker::FFLOAD_IMAGE);
-		if (filename)
+		std::string filename = upload_pick((void *)LLFilePicker::FFLOAD_IMAGE);
+		if (!filename.empty())
 		{
 			LLFloaterImagePreview* floaterp = new LLFloaterImagePreview(filename);
 			LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_image_preview.xml");
@@ -228,8 +267,8 @@ class LLFileUploadSound : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		const char* filename = upload_pick((void*)LLFilePicker::FFLOAD_WAV);
-		if (filename)
+		std::string filename = upload_pick((void*)LLFilePicker::FFLOAD_WAV);
+		if (!filename.empty())
 		{
 			LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
 			LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_sound_preview.xml");
@@ -242,8 +281,8 @@ class LLFileUploadAnim : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		const char* filename = upload_pick((void*)LLFilePicker::FFLOAD_ANIM);
-		if (filename)
+		const std::string filename = upload_pick((void*)LLFilePicker::FFLOAD_ANIM);
+		if (!filename.empty())
 		{
 			LLFloaterAnimPreview* floaterp = new LLFloaterAnimPreview(filename);
 			LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_animation_preview.xml");
@@ -274,27 +313,18 @@ class LLFileUploadBulk : public view_listener_t
 		LLFilePicker& picker = LLFilePicker::instance();
 		if (picker.getMultipleOpenFiles())
 		{
-			const char* filename = picker.getFirstFile();
-			const char* name = picker.getDirname();
-
-			LLString asset_name = name;
-			LLString::replaceNonstandardASCII( asset_name, '?' );
-			LLString::replaceChar(asset_name, '|', '?');
-			LLString::stripNonprintable(asset_name);
-			LLString::trim(asset_name);
-
-			char* asset_name_str = (char*)asset_name.c_str();
-			char* end_p = strrchr(asset_name_str, '.');		 // strip extension if exists
-			if( !end_p )
-			{
-				end_p = asset_name_str + strlen( asset_name_str );		/* Flawfinder: ignore */
-			}
-				
-			S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
-
-			asset_name = asset_name.substr( 0, len );
-
+			const std::string& filename = picker.getFirstFile();
+			std::string name = gDirUtilp->getBaseFileName(filename, true);
+			
+			std::string asset_name = name;
+			LLStringUtil::replaceNonstandardASCII( asset_name, '?' );
+			LLStringUtil::replaceChar(asset_name, '|', '?');
+			LLStringUtil::stripNonprintable(asset_name);
+			LLStringUtil::trim(asset_name);
+			
 			upload_new_resource(filename, asset_name, asset_name, 0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE); // file
+			// *NOTE: Ew, we don't iterate over the file list here,
+			// we handle the next files in upload_done_callback()
 		}
 		else
 		{
@@ -304,11 +334,11 @@ class LLFileUploadBulk : public view_listener_t
 	}
 };
 
-void upload_error(const char* error_message, const char* label, const std::string filename, const LLStringBase<char>::format_map_t args) 
+void upload_error(const std::string& error_message, const std::string& label, const std::string& filename, const LLStringUtil::format_map_t args) 
 {
 	llwarns << error_message << llendl;
 	gViewerWindow->alertXml(label, args);
-	if(remove(filename.c_str()) == -1)
+	if(LLFile::remove(filename) == -1)
 	{
 		lldebugs << "unable to remove temp file" << llendl;
 	}
@@ -403,9 +433,29 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
 									   FALSE))
 		{
 			gViewerWindow->playSnapshotAnimAndSound();
+			
 			LLImageBase::setSizeOverride(TRUE);
-			gViewerWindow->saveImageNumbered(raw);
+			LLPointer<LLImageFormatted> formatted;
+			switch(LLFloaterSnapshot::ESnapshotFormat(gSavedSettings.getS32("SnapshotFormat")))
+			{
+			  case LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG:
+				formatted = new LLImageJPEG(gSavedSettings.getS32("SnapshotQuality"));
+				break;
+			  case LLFloaterSnapshot::SNAPSHOT_FORMAT_PNG:
+				formatted = new LLImagePNG;
+				break;
+			  case LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP: 
+				formatted = new LLImageBMP;
+				break;
+			  default: 
+				llwarns << "Unknown Local Snapshot format" << llendl;
+				LLImageBase::setSizeOverride(FALSE);
+				return true;
+			}
+
+			formatted->encode(raw, 0);
 			LLImageBase::setSizeOverride(FALSE);
+			gViewerWindow->saveImageNumbered(formatted);
 		}
 		return true;
 	}
@@ -422,8 +472,8 @@ class LLFileQuit : public view_listener_t
 
 void handle_upload(void* data)
 {
-	const char* filename = upload_pick(data);
-	if (filename)
+	const std::string filename = upload_pick(data);
+	if (!filename.empty())
 	{
 		LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
 		LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_name_description.xml");
@@ -435,10 +485,9 @@ void handle_compress_image(void*)
 	LLFilePicker& picker = LLFilePicker::instance();
 	if (picker.getMultipleOpenFiles(LLFilePicker::FFLOAD_IMAGE))
 	{
-		const char* input_file = picker.getFirstFile();
-		while (input_file)
+		std::string infile = picker.getFirstFile();
+		while (!infile.empty())
 		{
-			std::string infile(input_file);
 			std::string outfile = infile + ".j2c";
 
 			llinfos << "Input:  " << infile << llendl;
@@ -457,59 +506,54 @@ void handle_compress_image(void*)
 				llinfos << "Compression failed: " << LLImageBase::getLastError() << llendl;
 			}
 
-			input_file = picker.getNextFile();
+			infile = picker.getNextFile();
 		}
 	}
 }
 
-void upload_new_resource(const LLString& src_filename, std::string name,
+void upload_new_resource(const std::string& src_filename, std::string name,
 						 std::string desc, S32 compression_info,
 						 LLAssetType::EType destination_folder_type,
 						 LLInventoryType::EType inv_type,
 						 U32 next_owner_perm,
-						 const LLString& display_name,
+						 const std::string& display_name,
 						 LLAssetStorage::LLStoreAssetCallback callback,
 						 void *userdata)
 {	
 	// Generate the temporary UUID.
-	LLString filename = gDirUtilp->getTempFilename();
+	std::string filename = gDirUtilp->getTempFilename();
 	LLTransactionID tid;
 	LLAssetID uuid;
 	
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
+
+	std::string exten = gDirUtilp->getExtension(src_filename);
 
-	LLString ext = src_filename.substr(src_filename.find_last_of('.'));
 	LLAssetType::EType asset_type = LLAssetType::AT_NONE;
-	char error_message[MAX_STRING];		/* Flawfinder: ignore */	
-	error_message[0] = '\0';
-	LLString temp_str;
+	std::string error_message;
 
 	BOOL error = FALSE;
 	
-	if (ext.empty())
+	if (exten.empty())
 	{
-		LLString::size_type offset = filename.find_last_of(gDirUtilp->getDirDelimiter());
-		if (offset != LLString::npos)
-			offset++;
-		LLString short_name = filename.substr(offset);
+		std::string short_name = gDirUtilp->getBaseFileName(filename);
 		
 		// No extension
-		snprintf(error_message,		/* Flawfinder: ignore */
-				MAX_STRING,
+		error_message = llformat(
 				"No file extension for the file: '%s'\nPlease make sure the file has a correct file extension",
 				short_name.c_str());
 		args["[FILE]"] = short_name;
  		upload_error(error_message, "NofileExtension", filename, args);
 		return;
 	}
-	else if( LLString::compareInsensitive(ext.c_str(),".bmp") == 0 )
+	else if( exten == "bmp")
 	{
 		asset_type = LLAssetType::AT_TEXTURE;
 		if (!LLViewerImageList::createUploadFile(src_filename,
 												 filename,
 												 IMG_CODEC_BMP ))
 		{
-			snprintf(error_message, MAX_STRING, "Problem with file %s:\n\n%s\n",		/* Flawfinder: ignore */
+			error_message = llformat( "Problem with file %s:\n\n%s\n",
 					src_filename.c_str(), LLImageBase::getLastError().c_str());
 			args["[FILE]"] = src_filename;
 			args["[ERROR]"] = LLImageBase::getLastError();
@@ -517,14 +561,14 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 			return;
 		}
 	}
-	else if( LLString::compareInsensitive(ext.c_str(),".tga") == 0 )
+	else if( exten == "tga")
 	{
 		asset_type = LLAssetType::AT_TEXTURE;
 		if (!LLViewerImageList::createUploadFile(src_filename,
 												 filename,
 												 IMG_CODEC_TGA ))
 		{
-			snprintf(error_message, MAX_STRING, "Problem with file %s:\n\n%s\n",		/* Flawfinder: ignore */
+			error_message = llformat("Problem with file %s:\n\n%s\n",
 					src_filename.c_str(), LLImageBase::getLastError().c_str());
 			args["[FILE]"] = src_filename;
 			args["[ERROR]"] = LLImageBase::getLastError();
@@ -532,14 +576,14 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 			return;
 		}
 	}
-	else if( LLString::compareInsensitive(ext.c_str(),".jpg") == 0 || LLString::compareInsensitive(ext.c_str(),".jpeg") == 0)
+	else if( exten == "jpg" || exten == "jpeg")
 	{
 		asset_type = LLAssetType::AT_TEXTURE;
 		if (!LLViewerImageList::createUploadFile(src_filename,
 												 filename,
 												 IMG_CODEC_JPEG ))
 		{
-			snprintf(error_message, MAX_STRING, "Problem with file %s:\n\n%s\n",		/* Flawfinder: ignore */
+			error_message = llformat("Problem with file %s:\n\n%s\n",
 					src_filename.c_str(), LLImageBase::getLastError().c_str());
 			args["[FILE]"] = src_filename;
 			args["[ERROR]"] = LLImageBase::getLastError();
@@ -547,14 +591,14 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 			return;
 		}
 	}
- 	else if( LLString::compareInsensitive(ext.c_str(),".png") == 0 )
+ 	else if( exten == "png")
  	{
  		asset_type = LLAssetType::AT_TEXTURE;
  		if (!LLViewerImageList::createUploadFile(src_filename,
  												 filename,
  												 IMG_CODEC_PNG ))
  		{
- 			sprintf(error_message, "Problem with file %s:\n\n%s\n",
+ 			error_message = llformat("Problem with file %s:\n\n%s\n",
  					src_filename.c_str(), LLImageBase::getLastError().c_str());
  			args["[FILE]"] = src_filename;
  			args["[ERROR]"] = LLImageBase::getLastError();
@@ -562,27 +606,27 @@ void upload_new_resource(const LLString& src_filename, std::string name,
  			return;
  		}
  	}
-	else if(LLString::compareInsensitive(ext.c_str(),".wav") == 0)
+	else if(exten == "wav")
 	{
 		asset_type = LLAssetType::AT_SOUND;  // tag it as audio
 		S32 encode_result = 0;
 
 		llinfos << "Attempting to encode wav as an ogg file" << llendl;
 
-		encode_result = encode_vorbis_file(src_filename.c_str(), filename.c_str());
+		encode_result = encode_vorbis_file(src_filename, filename);
 		
 		if (LLVORBISENC_NOERR != encode_result)
 		{
 			switch(encode_result)
 			{
 				case LLVORBISENC_DEST_OPEN_ERR:
-                    snprintf(error_message, MAX_STRING, "Couldn't open temporary compressed sound file for writing: %s\n", filename.c_str());		/* Flawfinder: ignore */
+				    error_message = llformat( "Couldn't open temporary compressed sound file for writing: %s\n", filename.c_str());
 					args["[FILE]"] = filename;
 					upload_error(error_message, "CannotOpenTemporarySoundFile", filename, args);
 					break;
 
 				default:	
-				  snprintf(error_message, MAX_STRING, "Unknown vorbis encode failure on: %s\n", src_filename.c_str());		/* Flawfinder: ignore */
+				  error_message = llformat("Unknown vorbis encode failure on: %s\n", src_filename.c_str());
 					args["[FILE]"] = src_filename;
 					upload_error(error_message, "UnknownVorbisEncodeFailure", filename, args);
 					break;	
@@ -590,11 +634,11 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 			return;
 		}
 	}
-	else if(LLString::compareInsensitive(ext.c_str(),".tmp") == 0)	 	
+	else if(exten == "tmp")	 	
 	{	 	
 		// This is a generic .lin resource file	 	
          asset_type = LLAssetType::AT_OBJECT;	 	
-         LLFILE* in = LLFile::fopen(src_filename.c_str(), "rb");		/* Flawfinder: ignore */	 	
+         LLFILE* in = LLFile::fopen(src_filename, "rb");		/* Flawfinder: ignore */	 	
          if (in)	 	
          {	 	
                  // read in the file header	 	
@@ -624,7 +668,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                                          if (EOF == tokens_read)	 	
                                          {	 	
                                                  fclose(in);	 	
-                                                 snprintf(error_message, MAX_STRING, "corrupt resource file: %s", src_filename.c_str());		/* Flawfinder: ignore */
+                                                 error_message = llformat("corrupt resource file: %s", src_filename.c_str());
 												 args["[FILE]"] = src_filename;
 												 upload_error(error_message, "CorruptResourceFile", filename, args);
                                                  return;
@@ -652,7 +696,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                          else	 	
                          {	 	
                                  fclose(in);	 	
-                                 snprintf(error_message, MAX_STRING, "unknown linden resource file version in file: %s", src_filename.c_str());		/* Flawfinder: ignore */
+                                 error_message = llformat("unknown linden resource file version in file: %s", src_filename.c_str());
 								 args["[FILE]"] = src_filename;
 								 upload_error(error_message, "UnknownResourceFileVersion", filename, args);
                                  return;
@@ -679,7 +723,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                  }	 	
 
                  // copy the file's data segment into another file for uploading	 	
-                 LLFILE* out = LLFile::fopen(filename.c_str(), "wb");		/* Flawfinder: ignore */	
+                 LLFILE* out = LLFile::fopen(filename, "wb");		/* Flawfinder: ignore */	
                  if (out)	 	
                  {	 	
                          while((read = fread(buf, 1, 16384, in)))		/* Flawfinder: ignore */	 	
@@ -694,7 +738,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                  else	 	
                  {	 	
                          fclose(in);	 	
-                         snprintf(error_message, MAX_STRING, "Unable to create output file: %s", filename.c_str());		/* Flawfinder: ignore */
+                         error_message = llformat( "Unable to create output file: %s", filename.c_str());
 						 args["[FILE]"] = filename;
 						 upload_error(error_message, "UnableToCreateOutputFile", filename, args);
                          return;
@@ -707,16 +751,17 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                  llinfos << "Couldn't open .lin file " << src_filename << llendl;	 	
          }	 	
 	}
-	else if (LLString::compareInsensitive(ext.c_str(),".bvh") == 0)
+	else if (exten == "bvh")
 	{
-		snprintf(error_message, MAX_STRING, "We do not currently support bulk upload of animation files\n");		/* Flawfinder: ignore */
+		error_message = llformat("We do not currently support bulk upload of animation files\n");
 		upload_error(error_message, "DoNotSupportBulkAnimationUpload", filename, args);
 		return;
 	}
 	else
 	{
 		// Unknown extension
-		snprintf(error_message, MAX_STRING, "Unknown file extension %s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", ext.c_str());		/* Flawfinder: ignore */
+		// *TODO: Translate?
+		error_message = llformat("Unknown file extension .%s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", exten.c_str());
 		error = TRUE;;
 	}
 
@@ -745,14 +790,14 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 		}
 		else
 		{
-			snprintf(error_message, MAX_STRING, "Unable to access output file: %s", filename.c_str());		/* Flawfinder: ignore */
+			error_message = llformat( "Unable to access output file: %s", filename.c_str());
 			error = TRUE;
 		}
 	}
 
 	if (!error)
 	{
-		LLString t_disp_name = display_name;
+		std::string t_disp_name = display_name;
 		if (t_disp_name.empty())
 		{
 			t_disp_name = src_filename;
@@ -764,10 +809,10 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 	else
 	{
 		llwarns << error_message << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[ERROR_MESSAGE]"] = error_message;
 		gViewerWindow->alertXml("ErrorMessage", args);
-		if(LLFile::remove(filename.c_str()) == -1)
+		if(LLFile::remove(filename) == -1)
 		{
 			lldebugs << "unable to remove temp file" << llendl;
 		}
@@ -796,7 +841,7 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
 			{
 				LLFloaterBuyCurrency::buyCurrency(
 					llformat("Uploading %s costs",
-						data->mAssetInfo.getName().c_str()),
+							 data->mAssetInfo.getName().c_str()), // *TODO: Translate
 					upload_cost);
 				is_balance_sufficient = FALSE;
 			}
@@ -849,9 +894,9 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
 	}
 	else // 	if(result >= 0)
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[FILE]"] = LLInventoryType::lookupHumanReadable(data->mInventoryType);
-		args["[REASON]"] = LLString(LLAssetStorage::getErrorString(result));
+		args["[REASON]"] = std::string(LLAssetStorage::getErrorString(result));
 		gViewerWindow->alertXml("CannotUploadReason", args);
 	}
 
@@ -861,27 +906,14 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
 	// *NOTE: This is a pretty big hack. What this does is check the
 	// file picker if there are any more pending uploads. If so,
 	// upload that file.
-	const char* next_file = LLFilePicker::instance().getNextFile();
-	if(is_balance_sufficient && next_file)
+	const std::string& next_file = LLFilePicker::instance().getNextFile();
+	if(is_balance_sufficient && !next_file.empty())
 	{
-		const char* name = LLFilePicker::instance().getDirname();
-
-		LLString asset_name = name;
-		LLString::replaceNonstandardASCII( asset_name, '?' );
-		LLString::replaceChar(asset_name, '|', '?');
-		LLString::stripNonprintable(asset_name);
-		LLString::trim(asset_name);
-
-		char* asset_name_str = (char*)asset_name.c_str();
-		char* end_p = strrchr(asset_name_str, '.');		 // strip extension if exists
-		if( !end_p )
-		{
-			end_p = asset_name_str + strlen( asset_name_str );		/* Flawfinder: ignore */
-		}
-			
-		S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
-
-		asset_name = asset_name.substr( 0, len );
+		std::string asset_name = gDirUtilp->getBaseFileName(next_file, true);
+		LLStringUtil::replaceNonstandardASCII( asset_name, '?' );
+		LLStringUtil::replaceChar(asset_name, '|', '?');
+		LLStringUtil::stripNonprintable(asset_name);
+		LLStringUtil::trim(asset_name);
 
 		upload_new_resource(next_file, asset_name, asset_name,	// file
 							0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE);
@@ -894,7 +926,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
 						 LLAssetType::EType destination_folder_type,
 						 LLInventoryType::EType inv_type,
 						 U32 next_owner_perm,
-						 const LLString& display_name,
+						 const std::string& display_name,
 						 LLAssetStorage::LLStoreAssetCallback callback,
 						 void *userdata)
 {
@@ -919,8 +951,8 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
 	{
 		inv_type = LLInventoryType::defaultForAssetType(asset_type);
 	}
-	LLString::stripNonprintable(name);
-	LLString::stripNonprintable(desc);
+	LLStringUtil::stripNonprintable(name);
+	LLStringUtil::stripNonprintable(desc);
 	if(name.empty())
 	{
 		name = "(No Name)";
@@ -931,7 +963,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
 	}
 	
 	// At this point, we're ready for the upload.
-	LLString upload_message = "Uploading...\n\n";
+	std::string upload_message = "Uploading...\n\n";
 	upload_message.append(display_name);
 	LLUploadDialog::modalUploadDialog(upload_message);
 
diff --git a/linden/indra/newview/llviewermenufile.h b/linden/indra/newview/llviewermenufile.h
index 94c18c4..3ac6202 100644
--- a/linden/indra/newview/llviewermenufile.h
+++ b/linden/indra/newview/llviewermenufile.h
@@ -40,12 +40,12 @@ class LLTransactionID;
 
 void init_menu_file();
 
-void upload_new_resource(const LLString& src_filename, std::string name,
+void upload_new_resource(const std::string& src_filename, std::string name,
 						 std::string desc, S32 compression_info,
 						 LLAssetType::EType destination_folder_type,
 						 LLInventoryType::EType inv_type,
 						 U32 next_owner_perm = 0x0,	// PERM_NONE
-						 const LLString& display_name = LLString::null,
+						 const std::string& display_name = LLStringUtil::null,
 						 LLAssetStorage::LLStoreAssetCallback callback = NULL,
 						 void *userdata = NULL);
 
@@ -55,7 +55,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType type,
 						 LLAssetType::EType destination_folder_type,
 						 LLInventoryType::EType inv_type,
 						 U32 next_owner_perm = 0x0,	// PERM_NONE
-						 const LLString& display_name = LLString::null,
+						 const std::string& display_name = LLStringUtil::null,
 						 LLAssetStorage::LLStoreAssetCallback callback = NULL,
 						 void *userdata = NULL);
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 7cc833a..f79730b 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1,3 +1,4 @@
+
 /** 
  * @file llviewermessage.cpp
  * @brief Dumping ground for viewer-side message system callbacks.
@@ -48,7 +49,6 @@
 #include "llfilepicker.h"
 #include "llfocusmgr.h"
 #include "llfollowcamparams.h"
-#include "llfloaterreleasemsg.h"
 #include "llinstantmessage.h"
 #include "llquantize.h"
 #include "llregionflags.h"
@@ -85,7 +85,6 @@
 #include "llfloatermute.h"
 #include "llfloaterpostcard.h"
 #include "llfloaterpreference.h"
-#include "llfloaterreleasemsg.h"
 #include "llfollowcam.h"
 #include "llgroupnotify.h"
 #include "llhudeffect.h"
@@ -108,6 +107,7 @@
 #include "lltool.h"
 #include "lltoolbar.h"
 #include "lltoolmgr.h"
+#include "lltrans.h"
 #include "llui.h"			// for make_ui_sound
 #include "lluploaddialog.h"
 #include "llviewercamera.h"
@@ -159,6 +159,9 @@ extern BOOL gDebugClicks;
 void open_offer(const std::vector<LLUUID>& items, const std::string& from_name);
 void friendship_offer_callback(S32 option, void* user_data);
 bool check_offer_throttle(const std::string& from_name, bool check_only);
+void callbackCacheEstateOwnerName(const LLUUID& id,
+								  const std::string& first, const std::string& last,
+								  BOOL is_group, void*);
 
 //inventory offer throttle globals
 LLFrameTimer gThrottleTimer;
@@ -166,7 +169,7 @@ const U32 OFFER_THROTTLE_MAX_COUNT=5; //number of items per time period
 const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
 
 //script permissions
-const LLString SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = 
+const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = 
 	{ 
 		"ScriptTakeMoney",
 		"ActOnControlInputs",
@@ -198,7 +201,7 @@ struct LLFriendshipOffer
 //
 
 void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group,
-				S32 trx_type, const LLString& desc)
+				S32 trx_type, const std::string& desc)
 {
 	if(0 == amount) return;
 	amount = abs(amount);
@@ -219,7 +222,7 @@ void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_
 		msg->addU8Fast(_PREHASH_AggregatePermNextOwner, (U8)LLAggregatePermissions::AP_EMPTY);
 		msg->addU8Fast(_PREHASH_AggregatePermInventory, (U8)LLAggregatePermissions::AP_EMPTY);
 		msg->addS32Fast(_PREHASH_TransactionType, trx_type );
-		msg->addStringFast(_PREHASH_Description, desc.c_str());
+		msg->addStringFast(_PREHASH_Description, desc);
 		msg->sendReliable(region->getHost());
 	}
 	else
@@ -324,194 +327,191 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 	}
 }
 
-S32 exported_object_count = 0;
-S32 exported_image_count = 0;
-S32 current_object_count = 0;
-S32 current_image_count = 0;
-
-extern LLNotifyBox *gExporterNotify;
-extern LLUUID gExporterRequestID;
-extern LLString gExportDirectory;
-
-extern LLUploadDialog *gExportDialog;
-
-LLString gExportedFile;
-
-std::map<LLUUID, LLString> gImageChecksums;
-
-void export_complete()
-{
-		LLUploadDialog::modalUploadFinished();
-		gExporterRequestID.setNull();
-		gExportDirectory = "";
-
-		LLFILE* fXML = LLFile::fopen(gExportedFile.c_str(), "rb");		/* Flawfinder: ignore */
-		fseek(fXML, 0, SEEK_END);
-		long length = ftell(fXML);
-		fseek(fXML, 0, SEEK_SET);
-		U8 *buffer = new U8[length + 1];
-		size_t nread = fread(buffer, 1, length, fXML);
-		if (nread < (size_t) length)
-		{
-			LL_WARNS("Messaging") << "Short read" << LL_ENDL;
-		}
-		buffer[nread] = '\0';
-		fclose(fXML);
-
-		char *pos = (char *)buffer;
-		while ((pos = strstr(pos+1, "<sl:image ")) != 0)
-		{
-			char *pos_check = strstr(pos, "checksum=\"");
-
-			if (pos_check)
-			{
-				char *pos_uuid = strstr(pos_check, "\">");
-
-				if (pos_uuid)
-				{
-					char image_uuid_str[UUID_STR_SIZE];		/* Flawfinder: ignore */
-					memcpy(image_uuid_str, pos_uuid+2, UUID_STR_SIZE-1);		/* Flawfinder: ignore */
-					image_uuid_str[UUID_STR_SIZE-1] = 0;
+// S32 exported_object_count = 0;
+// S32 exported_image_count = 0;
+// S32 current_object_count = 0;
+// S32 current_image_count = 0;
+
+// extern LLNotifyBox *gExporterNotify;
+// extern LLUUID gExporterRequestID;
+// extern std::string gExportDirectory;
+
+// extern LLUploadDialog *gExportDialog;
+
+// std::string gExportedFile;
+
+// std::map<LLUUID, std::string> gImageChecksums;
+
+// void export_complete()
+// {
+// 		LLUploadDialog::modalUploadFinished();
+// 		gExporterRequestID.setNull();
+// 		gExportDirectory = "";
+
+// 		LLFILE* fXML = LLFile::fopen(gExportedFile, "rb");		/* Flawfinder: ignore */
+// 		fseek(fXML, 0, SEEK_END);
+// 		long length = ftell(fXML);
+// 		fseek(fXML, 0, SEEK_SET);
+// 		U8 *buffer = new U8[length + 1];
+// 		size_t nread = fread(buffer, 1, length, fXML);
+// 		if (nread < (size_t) length)
+// 		{
+// 			llwarns << "Short read" << llendl;
+// 		}
+// 		buffer[nread] = '\0';
+// 		fclose(fXML);
+
+// 		char *pos = (char *)buffer;
+// 		while ((pos = strstr(pos+1, "<sl:image ")) != 0)
+// 		{
+// 			char *pos_check = strstr(pos, "checksum=\"");
+
+// 			if (pos_check)
+// 			{
+// 				char *pos_uuid = strstr(pos_check, "\">");
+
+// 				if (pos_uuid)
+// 				{
+// 					char image_uuid_str[UUID_STR_SIZE];		/* Flawfinder: ignore */
+// 					memcpy(image_uuid_str, pos_uuid+2, UUID_STR_SIZE-1);		/* Flawfinder: ignore */
+// 					image_uuid_str[UUID_STR_SIZE-1] = 0;
 					
-					LLUUID image_uuid(image_uuid_str);
-
-					LL_INFOS("Messaging") << "Found UUID: " << image_uuid << LL_ENDL;
-
-					std::map<LLUUID, LLString>::iterator itor = gImageChecksums.find(image_uuid);
-					if (itor != gImageChecksums.end())
-					{
-						LL_INFOS("Messaging") << "Replacing with checksum: " << itor->second << LL_ENDL;
-						if (itor->second.c_str() != NULL)
-							{
-								memcpy(&pos_check[10], itor->second.c_str(), 32);		/* Flawfinder: ignore */
-							}
-					}
-				}
-			}
-		}
-
-		LLFILE* fXMLOut = LLFile::fopen(gExportedFile.c_str(), "wb");		/* Flawfinder: ignore */
-		if (fwrite(buffer, 1, length, fXMLOut) != length)
-		{
-			LL_WARNS("Messaging") << "Short write" << LL_ENDL;
-		}
-		fclose(fXMLOut);
-
-		delete [] buffer;
-}
-
-
-void exported_item_complete(const LLTSCode status, void *user_data)
-{
-	//LLString *filename = (LLString *)user_data;
-
-	if (status < LLTS_OK)
-	{
-		LL_WARNS("Messaging") << "Export failed!" << LL_ENDL;
-	}
-	else
-	{
-		++current_object_count;
-		if (current_image_count == exported_image_count && current_object_count == exported_object_count)
-		{
-			LL_INFOS("Messaging") << "*** Export complete ***" << LL_ENDL;
-
-			export_complete();
-		}
-		else
-		{
-			gExportDialog->setMessage(llformat("Exported %d/%d object files, %d/%d textures.", current_object_count, exported_object_count, current_image_count, exported_image_count));
-		}
-	}
-}
-
-struct exported_image_info
-{
-	LLUUID image_id;
-	LLString filename;
-	U32 image_num;
-};
-
-void exported_j2c_complete(const LLTSCode status, void *user_data)
-{
-	exported_image_info *info = (exported_image_info *)user_data;
-	LLUUID image_id = info->image_id;
-	U32 image_num = info->image_num;
-	LLString filename = info->filename;
-	delete info;
-
-	if (status < LLTS_OK)
-	{
-		LL_WARNS("Messaging") << "Image download failed!" << LL_ENDL;
-	}
-	else
-	{
-		LLFILE* fIn = LLFile::fopen(filename.c_str(), "rb");		/* Flawfinder: ignore */
-		if (fIn) 
-		{
-			LLPointer<LLImageJ2C> ImageUtility = new LLImageJ2C;
-			LLPointer<LLImageTGA> TargaUtility = new LLImageTGA;
-
-			fseek(fIn, 0, SEEK_END);
-			S32 length = ftell(fIn);
-			fseek(fIn, 0, SEEK_SET);
-			U8 *buffer = ImageUtility->allocateData(length);
-			if (fread(buffer, 1, length, fIn) != length)
-			{
-				LL_WARNS("Messaging") << "Short read" << LL_ENDL;
-			}
-			fclose(fIn);
-			LLFile::remove(filename.c_str());
-
-			// Convert to TGA
-			LLPointer<LLImageRaw> image = new LLImageRaw();
-
-			ImageUtility->updateData();
-			ImageUtility->decode(image, 100000.0f);
+// 					LLUUID image_uuid(image_uuid_str);
+
+// 					LL_INFOS("Messaging") << "Found UUID: " << image_uuid << LL_ENDL;
+
+// 					std::map<LLUUID, std::string>::iterator itor = gImageChecksums.find(image_uuid);
+// 					if (itor != gImageChecksums.end())
+// 					{
+// 						LL_INFOS("Messaging") << "Replacing with checksum: " << itor->second << LL_ENDL;
+// 						if (!itor->second.empty())
+// 						{
+// 							memcpy(&pos_check[10], itor->second.c_str(), 32);		/* Flawfinder: ignore */
+// 						}
+// 					}
+// 				}
+// 			}
+// 		}
+
+// 		LLFILE* fXMLOut = LLFile::fopen(gExportedFile, "wb");		/* Flawfinder: ignore */
+// 		if (fwrite(buffer, 1, length, fXMLOut) != length)
+// 		{
+// 			LL_WARNS("Messaging") << "Short write" << LL_ENDL;
+// 		}
+// 		fclose(fXMLOut);
+
+// 		delete [] buffer;
+// }
+
+
+// void exported_item_complete(const LLTSCode status, void *user_data)
+// {
+// 	//std::string *filename = (std::string *)user_data;
+
+// 	if (status < LLTS_OK)
+// 	{
+// 		LL_WARNS("Messaging") << "Export failed!" << LL_ENDL;
+// 	}
+// 	else
+// 	{
+// 		++current_object_count;
+// 		if (current_image_count == exported_image_count && current_object_count == exported_object_count)
+// 		{
+// 			LL_INFOS("Messaging") << "*** Export complete ***" << LL_ENDL;
+
+// 			export_complete();
+// 		}
+// 		else
+// 		{
+// 			gExportDialog->setMessage(llformat("Exported %d/%d object files, %d/%d textures.", current_object_count, exported_object_count, current_image_count, exported_image_count));
+// 		}
+// 	}
+// }
+
+// struct exported_image_info
+// {
+// 	LLUUID image_id;
+// 	std::string filename;
+// 	U32 image_num;
+// };
+
+// void exported_j2c_complete(const LLTSCode status, void *user_data)
+// {
+// 	exported_image_info *info = (exported_image_info *)user_data;
+// 	LLUUID image_id = info->image_id;
+// 	U32 image_num = info->image_num;
+// 	std::string filename = info->filename;
+// 	delete info;
+
+// 	if (status < LLTS_OK)
+// 	{
+// 		LL_WARNS("Messaging") << "Image download failed!" << LL_ENDL;
+// 	}
+// 	else
+// 	{
+// 		LLFILE* fIn = LLFile::fopen(filename, "rb");		/* Flawfinder: ignore */
+// 		if (fIn) 
+// 		{
+// 			LLPointer<LLImageJ2C> ImageUtility = new LLImageJ2C;
+// 			LLPointer<LLImageTGA> TargaUtility = new LLImageTGA;
+
+// 			fseek(fIn, 0, SEEK_END);
+// 			S32 length = ftell(fIn);
+// 			fseek(fIn, 0, SEEK_SET);
+// 			U8 *buffer = ImageUtility->allocateData(length);
+// 			if (fread(buffer, 1, length, fIn) != length)
+// 			{
+// 				LL_WARNS("Messaging") << "Short read" << LL_ENDL;
+// 			}
+// 			fclose(fIn);
+// 			LLFile::remove(filename);
+
+// 			// Convert to TGA
+// 			LLPointer<LLImageRaw> image = new LLImageRaw();
+
+// 			ImageUtility->updateData();
+// 			ImageUtility->decode(image, 100000.0f);
 			
-			TargaUtility->encode(image);
-			U8 *data = TargaUtility->getData();
-			S32 data_size = TargaUtility->getDataSize();
-
-			char *file_path = new char[filename.size()+1];
-			strcpy(file_path, filename.c_str());		/* Flawfinder: ignore */
-			char *end = strrchr(file_path, gDirUtilp->getDirDelimiter()[0]);
-			end[0] = 0;
-			LLString output_file = llformat("%s/image-%03d.tga", file_path, image_num);//filename;
-			delete [] file_path;
-			//S32 name_len = output_file.length();
-			//strcpy(&output_file[name_len-3], "tga");
-			LLFILE* fOut = LLFile::fopen(output_file.c_str(), "wb");		/* Flawfinder: ignore */
-			char md5_hash_string[33];		/* Flawfinder: ignore */
-			strcpy(md5_hash_string, "00000000000000000000000000000000");		/* Flawfinder: ignore */
-			if (fOut)
-			{
-				if (fwrite(data, 1, data_size, fOut) != data_size)
-				{
-					LL_WARNS("Messaging") << "Short write" << LL_ENDL;
-				}
-				fseek(fOut, 0, SEEK_SET);
-				fclose(fOut);
-				fOut = LLFile::fopen(output_file.c_str(), "rb");		/* Flawfinder: ignore */
-				LLMD5 my_md5_hash(fOut);
-				my_md5_hash.hex_digest(md5_hash_string);
-			}
+// 			TargaUtility->encode(image);
+// 			U8 *data = TargaUtility->getData();
+// 			S32 data_size = TargaUtility->getDataSize();
 
-			gImageChecksums.insert(std::pair<LLUUID, LLString>(image_id, md5_hash_string));
-		}
-	}
-
-	++current_image_count;
-	if (current_image_count == exported_image_count && current_object_count == exported_object_count)
-	{
-		LL_INFOS("Messaging") << "*** Export textures complete ***" << LL_ENDL;
-			export_complete();
-	}
-	else
-	{
-		gExportDialog->setMessage(llformat("Exported %d/%d object files, %d/%d textures.", current_object_count, exported_object_count, current_image_count, exported_image_count));
-	}
-}
+// 			std::string file_path = gDirUtilp->getDirName(filename);
+			
+// 			std::string output_file = llformat("%s/image-%03d.tga", file_path.c_str(), image_num);//filename;
+// 			//S32 name_len = output_file.length();
+// 			//strcpy(&output_file[name_len-3], "tga");
+// 			LLFILE* fOut = LLFile::fopen(output_file, "wb");		/* Flawfinder: ignore */
+// 			char md5_hash_string[33];		/* Flawfinder: ignore */
+// 			strcpy(md5_hash_string, "00000000000000000000000000000000");		/* Flawfinder: ignore */
+// 			if (fOut)
+// 			{
+// 				if (fwrite(data, 1, data_size, fOut) != data_size)
+// 				{
+// 					LL_WARNS("Messaging") << "Short write" << LL_ENDL;
+// 				}
+// 				fseek(fOut, 0, SEEK_SET);
+// 				fclose(fOut);
+// 				fOut = LLFile::fopen(output_file, "rb");		/* Flawfinder: ignore */
+// 				LLMD5 my_md5_hash(fOut);
+// 				my_md5_hash.hex_digest(md5_hash_string);
+// 			}
+
+// 			gImageChecksums.insert(std::pair<LLUUID, std::string>(image_id, md5_hash_string));
+// 		}
+// 	}
+
+// 	++current_image_count;
+// 	if (current_image_count == exported_image_count && current_object_count == exported_object_count)
+// 	{
+// 		LL_INFOS("Messaging") << "*** Export textures complete ***" << LL_ENDL;
+// 			export_complete();
+// 	}
+// 	else
+// 	{
+// 		gExportDialog->setMessage(llformat("Exported %d/%d object files, %d/%d textures.", current_object_count, exported_object_count, current_image_count, exported_image_count));
+// 	}
+//}
 
 void process_derez_ack(LLMessageSystem*, void**)
 {
@@ -581,7 +581,7 @@ void join_group_callback(S32 option, void* user_data)
 	if (option == 2 && data && !data->mGroupID.isNull())
 	{
 		LLFloaterGroupInfo::showFromUUID(data->mGroupID);
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MESSAGE]"] = data->mMessage;
 		LLNotifyBox::showXml("JoinGroup", args, &join_group_callback, data);
 		return;
@@ -599,7 +599,7 @@ void join_group_callback(S32 option, void* user_data)
 		else
 		{
 			delete_context_data = FALSE;
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[NAME]"] = data->mName;
 			args["[INVITE]"] = data->mMessage;
 			LLAlertDialog::showXml("JoinedTooManyGroupsMember", args, join_group_callback, (void*)data);
@@ -613,7 +613,7 @@ void join_group_callback(S32 option, void* user_data)
 		if (data->mFee > 0)
 		{
 			delete_context_data = FALSE;
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[COST]"] = llformat("%d", data->mFee);
 			// Set the fee to 0, so that we don't keep
 			// asking about a fee.
@@ -626,8 +626,8 @@ void join_group_callback(S32 option, void* user_data)
 		else
 		{
 			send_improved_im(data->mGroupID,
-							"name",
-							"message",
+							 std::string("name"),
+							 std::string("message"),
 							IM_ONLINE,
 							IM_GROUP_INVITATION_ACCEPT,
 							data->mTransactionID);
@@ -636,8 +636,8 @@ void join_group_callback(S32 option, void* user_data)
 	else if (data)
 	{
 		send_improved_im(data->mGroupID,
-						"name",
-						"message",
+						 std::string("name"),
+						 std::string("message"),
 						IM_ONLINE,
 						IM_GROUP_INVITATION_DECLINE,
 						data->mTransactionID);
@@ -754,7 +754,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 	static U32 throttle_count;
 	static bool throttle_logged;
 	LLChat chat;
-	LLString log_message;
+	std::string log_message;
 
 	if (!gSavedSettings.getBOOL("ShowNewInventory"))
 		return false;
@@ -828,22 +828,24 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 		{
 			continue;
 		}
+		LLAssetType::EType asset_type = item->getType();
+
 		//if we are throttled, don't display them - Gigs
 		if (check_offer_throttle(from_name, false))
 		{
 			// I'm not sure this is a good idea.  JC
 			bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
 			//bool show_keep_discard = true;
-			switch(item->getType())
+			switch(asset_type)
 			{
 			case LLAssetType::AT_NOTECARD:
-				open_notecard((LLViewerInventoryItem*)item, LLString("Note: ") + item->getName(), LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
+				open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
 				break;
 			case LLAssetType::AT_LANDMARK:
-				open_landmark((LLViewerInventoryItem*)item, LLString("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
+				open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
 				break;
 			case LLAssetType::AT_TEXTURE:
-				open_texture(*it, LLString("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
+				open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
 				break;
 			default:
 				break;
@@ -858,6 +860,11 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 			return;
 		}
 
+		if(gSavedSettings.getBOOL("ShowInInventory") &&
+			asset_type != LLAssetType::AT_CALLINGCARD)
+		{
+			LLInventoryView::showAgentInventory(TRUE);
+		}
 		//Trash Check
 		LLUUID trash_id;
 		trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -890,12 +897,12 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 }
 
 void inventory_offer_mute_callback(const LLUUID& blocked_id,
-								   const char* first_name,
-								   const char* last_name,
+								   const std::string& first_name,
+								   const std::string& last_name,
 								   BOOL is_group,
 								   void* user_data)
 {
-	LLString from_name;
+	std::string from_name;
 	LLMute::EType type;
 
 	if (is_group)
@@ -906,9 +913,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
 	else
 	{
 		type = LLMute::AGENT;
-		from_name += first_name;
-		from_name += " ";
-		from_name += last_name;
+		from_name = first_name + " " + last_name;
 	}
 
 	LLMute mute(blocked_id, from_name, type);
@@ -936,7 +941,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
 void inventory_offer_callback(S32 button, void* user_data)
  {
 	LLChat chat;
-	LLString log_message;
+	std::string log_message;
 	LLOfferInfo* info = (LLOfferInfo*)user_data;
 	if(!info) return;
 
@@ -978,8 +983,8 @@ void inventory_offer_callback(S32 button, void* user_data)
 	}
 
 	// *TODO:translate
-	LLString from_string; // Used in the pop-up.
-	LLString chatHistory_string;  // Used in chat history.
+	std::string from_string; // Used in the pop-up.
+	std::string chatHistory_string;  // Used in chat history.
 	if (info->mFromObject == TRUE)
 	{
 		if (info->mFromGroup)
@@ -987,12 +992,12 @@ void inventory_offer_callback(S32 button, void* user_data)
 			std::string group_name;
 			if (gCacheName->getGroupName(info->mFromID, group_name))
 			{
-				from_string = LLString("An object named '") + info->mFromName + "' owned by the group '" + group_name + "'";
+				from_string = std::string("An object named '") + info->mFromName + "' owned by the group '" + group_name + "'";
 				chatHistory_string = info->mFromName + " owned by the group '" + group_name + "'";
 			}
 			else
 			{
-				from_string = LLString("An object named '") + info->mFromName + "' owned by an unknown group";
+				from_string = std::string("An object named '") + info->mFromName + "' owned by an unknown group";
 				chatHistory_string = info->mFromName + " owned by an unknown group";
 			}
 		}
@@ -1001,12 +1006,12 @@ void inventory_offer_callback(S32 button, void* user_data)
 			std::string first_name, last_name;
 			if (gCacheName->getName(info->mFromID, first_name, last_name))
 			{
-				from_string = LLString("An object named '") + info->mFromName + "' owned by " + first_name + " " + last_name;
+				from_string = std::string("An object named '") + info->mFromName + "' owned by " + first_name + " " + last_name;
 				chatHistory_string = info->mFromName + " owned by " + first_name + " " + last_name;
 			}
 			else
 			{
-				from_string = LLString("An object named '") + info->mFromName + "' owned by an unknown user";
+				from_string = std::string("An object named '") + info->mFromName + "' owned by an unknown user";
 				chatHistory_string = info->mFromName + " owned by an unknown user";
 			}
 		}
@@ -1177,8 +1182,17 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 		return;
 	}
 
-	LLString::format_map_t args;
-	args["[OBJECTNAME]"] = info->mDesc;
+	// Strip any SLURL from the message display. (DEV-2754)
+	std::string msg = info->mDesc;
+	int indx = msg.find(" ( http://slurl.com/secondlife/");
+	if(indx >= 0)
+	{
+		LLStringUtil::truncate(msg, indx);
+	}
+	
+	LLStringUtil::format_map_t args;
+	args["[OBJECTNAME]"] = msg;
+
 	// must protect against a NULL return from lookupHumanReadable()
 	std::string typestr = ll_safe_string(LLAssetType::lookupHumanReadable(info->mType));
 	if (!typestr.empty())
@@ -1285,7 +1299,7 @@ void lure_callback(S32 option, void* user_data)
 	default:
 		// decline
 		send_simple_im(info->mFromID,
-					   "",
+					   LLStringUtil::null,
 					   IM_LURE_DECLINED,
 					   info->mLureID);
 		break;
@@ -1317,16 +1331,16 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	U8 d = 0;
 	LLUUID session_id;
 	U32 t;
-	char name[DB_FULL_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-	char message[DB_IM_MSG_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string name;
+	std::string message;
 	U32 parent_estate_id = 0;
 	LLUUID region_id;
 	LLVector3 position;
-	char buffer[DB_IM_MSG_BUF_SIZE * 2];		/* Flawfinder: ignore */
 	U8 binary_bucket[MTUBYTES];
 	S32 binary_bucket_size;
 	LLChat chat;
-
+	std::string buffer;
+	
 	// *TODO:translate - need to fix the full name to first/last (maybe)
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id);
 	msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group);
@@ -1336,8 +1350,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ID, session_id);
 	msg->getU32Fast( _PREHASH_MessageBlock, _PREHASH_Timestamp, t);
 	//msg->getData("MessageBlock", "Count",		&count);
-	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, DB_FULL_NAME_BUF_SIZE, name);
-	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message,		DB_IM_MSG_BUF_SIZE, message);
+	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, name);
+	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message,		message);
 	msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_ParentEstateID, parent_estate_id);
 	msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_RegionID, region_id);
 	msg->getVector3Fast(_PREHASH_MessageBlock, _PREHASH_Position, position);
@@ -1354,7 +1368,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	chat.mMuted = is_muted && !is_linden;
 	chat.mFromID = from_id;
 	chat.mFromName = name;
-	chat.mSourceType = (from_id.isNull() || !strcmp(name, SYSTEM_FROM)) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;
+	chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;
 
 	LLViewerObject *source = gObjectList.findObject(session_id); //Session ID is probably the wrong thing.
 	if (source)
@@ -1362,17 +1376,18 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		is_owned_by_me = source->permYouOwner();
 	}
 
-	char separator_string[3]=": ";		/* Flawfinder: ignore */
-	int message_offset=0;
+	std::string separator_string(": ");
+	int message_offset = 0;
 
 		//Handle IRC styled /me messages.
-	if (!strncmp(message, "/me ", 4) || !strncmp(message, "/me'", 4))
+	std::string prefix = message.substr(0, 4);
+	if (prefix == "/me " || prefix == "/me'")
 	{
-		strcpy(separator_string,"");		/* Flawfinder: ignore */
-		message_offset=3;
+		separator_string = "";
+		message_offset = 3;
 	}
 
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	switch(dialog)
 	{
 	case IM_CONSOLE_AND_CHAT_HISTORY:
@@ -1395,7 +1410,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// do nothing -- don't distract newbies in
 			// Prelude with global IMs
 		}
-		else if (offline == IM_ONLINE && !is_linden && is_busy && strcmp(name, SYSTEM_FROM))
+		else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
 		{
 			// return a standard "busy" message, but only do it to online IM 
 			// (i.e. not other auto responses and not store-and-forward IM)
@@ -1405,15 +1420,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				// initiated by the other party) then...
 				std::string my_name;
 				gAgent.buildFullname(my_name);
-				LLString response = gSavedPerAccountSettings.getText("BusyModeResponse");
+				std::string response = gSavedPerAccountSettings.getText("BusyModeResponse");
 				pack_instant_message(
 					gMessageSystem,
 					gAgent.getID(),
 					FALSE,
 					gAgent.getSessionID(),
 					from_id,
-					my_name.c_str(),
-					response.c_str(),
+					my_name,
+					response,
 					IM_ONLINE,
 					IM_BUSY_AUTO_RESPONSE,
 					session_id);
@@ -1422,7 +1437,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 			// now store incoming IM in chat history
 
-			snprintf(buffer, sizeof(buffer), "%s%s", separator_string, (message+message_offset));		/* Flawfinder: ignore */
+			buffer = separator_string + message.substr(message_offset);
 	
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
@@ -1432,7 +1447,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				from_id,
 				name,
 				buffer,
-				NULL,
+				LLStringUtil::null,
 				dialog,
 				parent_estate_id,
 				region_id,
@@ -1440,16 +1455,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				true);
 
 			// pretend this is chat generated by self, so it does not show up on screen
-			snprintf(buffer, sizeof(buffer), "IM: %s%s%s", name, separator_string, (message+message_offset));		/* Flawfinder: ignore */
-			chat.mText = buffer;
+			chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
 			LLFloaterChat::addChat( chat, TRUE, TRUE );
 		}
 		else if (from_id.isNull())
 		{
 			// Messages from "Second Life" ID don't go to IM history
 			// messages which should be routed to IM window come from a user ID with name=SYSTEM_NAME
-			snprintf(buffer, sizeof(buffer), "%s: %s", name, message);		/* Flawfinder: ignore */
-			chat.mText = buffer;
+			chat.mText = name + ": " + message;
 			LLFloaterChat::addChat(chat, FALSE, FALSE);
 		}
 		else if (to_id.isNull())
@@ -1462,23 +1475,19 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// Treat like a system message and put in chat history.
 			// Claim to be from a local agent so it doesn't go into
 			// console.
-			snprintf(buffer, sizeof(buffer), "%s%s%s", name, separator_string, (message+message_offset));		/* Flawfinder: ignore */
-			chat.mText = buffer;
+			chat.mText = name + separator_string + message.substr(message_offset);
 			BOOL local_agent = TRUE;
 			LLFloaterChat::addChat(chat, FALSE, local_agent);
 		}
 		else
 		{
 			// standard message, not from system
-			char saved[MAX_STRING];		/* Flawfinder: ignore */
-			saved[0] = '\0';
+			std::string saved;
 			if(offline == IM_OFFLINE)
 			{
-				char time_buf[TIME_STR_LENGTH];		/* Flawfinder: ignore */
-				snprintf(saved, MAX_STRING, "(Saved %s) ",		/* Flawfinder: ignore */
-						formatted_time(timestamp, time_buf));
+				saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
 			}
-			snprintf(buffer, sizeof(buffer), "%s%s%s", separator_string, saved,(message+message_offset));		/* Flawfinder: ignore */
+			buffer = separator_string + saved  + message.substr(message_offset);
 
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
@@ -1489,15 +1498,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					from_id,
 					name,
 					buffer,
-					NULL,
+					LLStringUtil::null,
 					dialog,
 					parent_estate_id,
 					region_id,
 					position,
 					true);
-				snprintf(buffer, sizeof(buffer), "IM: %s%s%s%s", name, separator_string, saved, (message+message_offset));		/* Flawfinder: ignore */
+				chat.mText = std::string("IM: ") + name + separator_string + saved + message.substr(message_offset);
 
-				chat.mText = buffer;
 				BOOL local_agent = FALSE;
 				LLFloaterChat::addChat( chat, TRUE, local_agent );
 			}
@@ -1565,7 +1573,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			U8 has_inventory = notice_bin_bucket->header.has_inventory;
 			U8 asset_type = notice_bin_bucket->header.asset_type;
 			LLUUID group_id = notice_bin_bucket->header.group_id;
-			const char* item_name = (const char*) notice_bin_bucket->item_name;
+			std::string item_name = ll_safe_string((const char*) notice_bin_bucket->item_name);
 
 			// If there is inventory, give the user the inventory offer.
 			LLOfferInfo* info = NULL;
@@ -1597,18 +1605,18 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			tokenizer tokens(str, sep);
 			tokenizer::iterator iter = tokens.begin();
 
-			LLString subj(*iter++);
-			LLString mes(*iter++);
+			std::string subj(*iter++);
+			std::string mes(*iter++);
 
 			if (IM_GROUP_NOTICE == dialog)
 			{
 				subj += "\n";
 				mes = "\n\n" + mes;
-				LLGroupNotifyBox::show(subj.c_str(),mes.c_str(),name,group_id,t,has_inventory,item_name,info);
+				LLGroupNotifyBox::show(subj,mes,name,group_id,t,has_inventory,item_name,info);
 			}
 			else if (IM_GROUP_NOTICE_REQUESTED == dialog)
 			{
-				LLFloaterGroupInfo::showNotice(subj.c_str(),mes.c_str(),group_id,has_inventory,item_name,info);
+				LLFloaterGroupInfo::showNotice(subj,mes,group_id,has_inventory,item_name,info);
 			}
 		}
 		break;
@@ -1648,7 +1656,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				userdata->mMessage.assign(message);
 				userdata->mFee = membership_fee;
 
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[MESSAGE]"] = message;
 				LLNotifyBox::showXml("JoinGroup", args,
 									 &join_group_callback,
@@ -1764,17 +1772,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		}
 
 		// standard message, not from system
-		char saved[MAX_STRING];		/* Flawfinder: ignore */
-		saved[0] = '\0';
+		std::string saved;
 		if(offline == IM_OFFLINE)
 		{
-			char time_buf[TIME_STR_LENGTH];		/* Flawfinder: ignore */
-			snprintf(saved,		/* Flawfinder: ignore */
-					 MAX_STRING, 
-					 "(Saved %s) ", 
-					 formatted_time(timestamp, time_buf));
+			saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
 		}
-		snprintf(buffer, sizeof(buffer), "%s%s%s", separator_string, saved, (message+message_offset));		/* Flawfinder: ignore */
+		buffer = separator_string + saved + message.substr(message_offset);
 		BOOL is_this_agent = FALSE;
 		if(from_id == gAgentID)
 		{
@@ -1785,15 +1788,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			from_id,
 			name,
 			buffer,
-			(char*)binary_bucket,
+			ll_safe_string((char*)binary_bucket),
 			IM_SESSION_INVITE,
 			parent_estate_id,
 			region_id,
 			position,
 			true);
 
-		snprintf(buffer, sizeof(buffer), "IM: %s%s%s%s", name, separator_string, saved, (message+message_offset));		/* Flawfinder: ignore */
-		chat.mText = buffer;
+		chat.mText = std::string("IM: ") + name + separator_string +  saved + message.substr(message_offset);
 		LLFloaterChat::addChat(chat, TRUE, is_this_agent);
 	}
 	break;
@@ -1803,10 +1805,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		{
 			return;
 		}
-		snprintf(buffer, sizeof(buffer), "%s%s%s", name, separator_string, (message+message_offset));		/* Flawfinder: ignore */
+		chat.mText = name + separator_string + message.substr(message_offset);
 		// Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
 		// IMs from objcts don't open IM sessions.
-		chat.mText = buffer;
 		chat.mSourceType = CHAT_SOURCE_OBJECT;
 		LLFloaterChat::addChat(chat, FALSE, FALSE);
 		break;
@@ -1831,7 +1832,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		else
 		{
 			// TODO: after LLTrans hits release, get "busy response" into translatable file
-			snprintf(buffer, sizeof(buffer), "%s (%s): %s", name, "busy response", (message+message_offset)); /* Flawfinder: ignore */
+			buffer = llformat("%s (%s): %s", name.c_str(), "busy response", message.substr(message_offset).c_str());
 			gIMMgr->addMessage(session_id, from_id, name, buffer);
 		}
 		break;
@@ -1915,8 +1916,18 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			else
 			{
 				args["[NAME]"] = name;
-				LLNotifyBox::showXml("OfferFriendship", args,
-					&friendship_offer_callback, (void*)offer);
+				if(message.empty())
+				{
+					//support for frienship offers from clients before July 2008
+					LLNotifyBox::showXml("OfferFriendshipNoMessage", args,
+						&friendship_offer_callback, (void*)offer);
+				}
+				else
+				{
+					args["[MESSAGE]"] = message;
+					LLNotifyBox::showXml("OfferFriendship", args,
+						&friendship_offer_callback, (void*)offer);
+				}
 			}
 		}
 		break;
@@ -1961,15 +1972,15 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id)
 	{
 		std::string my_name;
 		gAgent.buildFullname(my_name);
-		LLString response = gSavedPerAccountSettings.getText("BusyModeResponse");
+		std::string response = gSavedPerAccountSettings.getText("BusyModeResponse");
 		pack_instant_message(
 			gMessageSystem,
 			gAgent.getID(),
 			FALSE,
 			gAgent.getSessionID(),
 			from_id,
-			my_name.c_str(),
-			response.c_str(),
+			my_name,
+			response,
 			IM_ONLINE,
 			IM_BUSY_AUTO_RESPONSE);
 		gAgent.sendReliableMessage();
@@ -2085,7 +2096,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
 	offerdata->mHost = msg->getSender();
 
 	LLViewerObject* source = gObjectList.findObject(source_id);
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	std::string source_name;
 	if(source && source->isAvatar())
 	{
@@ -2138,8 +2149,8 @@ void process_decline_callingcard(LLMessageSystem* msg, void**)
 void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 {
 	LLChat		chat;
-	char		mesg[DB_CHAT_MSG_BUF_SIZE];		/* Flawfinder: ignore */
-	char		from_name[DB_FULL_NAME_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string		mesg;
+	std::string		from_name;
 	U8			source_temp;
 	U8			type_temp;
 	U8			audible_temp;
@@ -2149,7 +2160,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	BOOL		is_owned_by_me = FALSE;
 	LLViewerObject*	chatter;
 
-	msg->getString("ChatData", "FromName", DB_FULL_NAME_BUF_SIZE, from_name);
+	msg->getString("ChatData", "FromName", from_name);
 	chat.mFromName = from_name;
 	
 	msg->getUUID("ChatData", "SourceID", from_id);
@@ -2169,7 +2180,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	
 	chat.mTime = LLFrameTimer::getElapsedSeconds();
 	
-	BOOL is_self = (from_id == gAgent.getID());
 	BOOL is_busy = gAgent.getBusy();
 
 	BOOL is_muted = FALSE;
@@ -2221,15 +2231,16 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		std::string verb;
 
 		color.setVec(1.f,1.f,1.f,1.f);
-		msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, DB_CHAT_MSG_BUF_SIZE, mesg);
+		msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
 
 		BOOL ircstyle = FALSE;
 
 		// Look for IRC-style emotes here so chatbubbles work
-		if (!strncmp(mesg, "/me ", 4) || !strncmp(mesg, "/me'", 4))
+		std::string prefix = mesg.substr(0, 4);
+		if (prefix == "/me " || prefix == "/me'")
 		{
 			chat.mText = from_name;
-			chat.mText += (mesg + 3);
+			chat.mText += mesg.substr(3);
 			ircstyle = TRUE;
 		}
 		else
@@ -2284,14 +2295,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			switch(chat.mChatType)
 			{
 			case CHAT_TYPE_WHISPER:
-				if (is_self)
-				{
-					verb = " whisper: ";
-				}
-				else
-				{
-					verb = " whispers: ";
-				}
+				verb = " " + LLTrans::getString("whisper") + " ";
 				break;
 			case CHAT_TYPE_DEBUG_MSG:
 			case CHAT_TYPE_OWNER:
@@ -2299,14 +2303,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				verb = ": ";
 				break;
 			case CHAT_TYPE_SHOUT:
-				if (is_self)
-				{
-					verb = " shout: ";
-				}
-				else
-				{
-					verb = " shouts: ";
-				}
+				verb = " " + LLTrans::getString("shout") + " ";
 				break;
 			case CHAT_TYPE_START:
 			case CHAT_TYPE_STOP:
@@ -2318,14 +2315,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				break;
 			}
 
-			if (is_self)
-			{
-				chat.mText = "You";
-			}
-			else
-			{
-				chat.mText = from_name;
-			}
+
+			chat.mText = from_name;
 			chat.mText += verb;
 			chat.mText += mesg;
 		}
@@ -2378,11 +2369,11 @@ void process_teleport_start(LLMessageSystem *msg, void**)
 
 	if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL)
 	{
-		gViewerWindow->setProgressCancelButtonVisible(FALSE, "");
+		gViewerWindow->setProgressCancelButtonVisible(FALSE);
 	}
 	else
 	{
-		gViewerWindow->setProgressCancelButtonVisible(TRUE, "Cancel");
+		gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); // *TODO: Translate
 	}
 
 	// Freeze the UI and show progress bar
@@ -2413,19 +2404,19 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
 	msg->getU32("Info", "TeleportFlags", teleport_flags);
 	if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL)
 	{
-		gViewerWindow->setProgressCancelButtonVisible(FALSE, "");
+		gViewerWindow->setProgressCancelButtonVisible(FALSE);
 	}
 	else
 	{
-		gViewerWindow->setProgressCancelButtonVisible(TRUE, "Cancel");
+		gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); //TODO: Translate
 	}
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-	msg->getString("Info", "Message", MAX_STRING, buffer);
+	std::string buffer;
+	msg->getString("Info", "Message", buffer);
 	LL_DEBUGS("Messaging") << "teleport progress: " << buffer << LL_ENDL;
 
 	//Sorta hacky...default to using simulator raw messages
 	//if we don't find the coresponding mapping in our progress mappings
-	LLString message = buffer;
+	std::string message = buffer;
 
 	if (LLAgent::sTeleportProgressMessages.find(buffer) != 
 		LLAgent::sTeleportProgressMessages.end() )
@@ -2467,7 +2458,7 @@ public:
 				LLInventoryModel::EXCLUDE_TRASH,
 				is_card);
 		}
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		if ( land_items.count() > 0 )
 		{	// Show notification that they can now teleport to landmarks.  Use a random landmark from the inventory
 			S32 random_land = ll_rand( land_items.count() - 1 );
@@ -2576,9 +2567,8 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
 	
 	
-	char seedCap[STD_STRING_BUF_SIZE];		/* Flawfinder: ignore */
-	msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability,
-		STD_STRING_BUF_SIZE, seedCap);
+	std::string seedCap;
+	msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability, seedCap);
 
 	// update home location if we are teleporting out of prelude - specific to teleporting to welcome area 
 	if((teleport_flags & TELEPORT_FLAGS_SET_HOME_TO_TARGET)
@@ -2631,7 +2621,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	gAgent.setTeleportState( LLAgent::TELEPORT_MOVING );
 	gAgent.setTeleportMessage(LLAgent::sTeleportProgressMessages["contacting"]);
 
-	regionp->setSeedCapability(std::string(seedCap));
+	regionp->setSeedCapability(seedCap);
 
 	// Don't send camera updates to the new region until we're
 	// actually there...
@@ -2648,9 +2638,6 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 //	gTeleportDisplay = TRUE;
 //	gTeleportDisplayTimer.reset();
 //	gViewerWindow->setShowProgress(TRUE);
-
-	// This could be first use of teleport, so test for that
-	LLFirstUse::useTeleport();
 }
 
 // stuff we have to do every time we get an AvatarInitComplete from a sim
@@ -2663,16 +2650,14 @@ void process_avatar_init_complete(LLMessageSystem* msg, void**)
 }
 */
 
-static void display_release_message(S32, void* data)
+static void display_release_notes(S32, void* data)
 {
-	std::string* msg = (std::string*)data;
-	LLFloaterReleaseMsg::displayMessage(msg->c_str());
-	delete msg;
+	gAgent.getRegion()->showReleaseNotes();
 }
 
 void process_agent_movement_complete(LLMessageSystem* msg, void**)
 {
-	gAgentMovementCompleted = TRUE;
+	gAgentMovementCompleted = true;
 
 	LLUUID agent_id;
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
@@ -2696,8 +2681,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 	U64 region_handle;
 	msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle);
 	
-	char version_channel_char[MAX_STRING];
-	msg->getString("SimData", "ChannelVersion", MAX_STRING, version_channel_char);
+	std::string version_channel;
+	msg->getString("SimData", "ChannelVersion", version_channel);
 
 	LLVOAvatar* avatarp = gAgent.getAvatarObject();
 	if (!avatarp)
@@ -2832,10 +2817,20 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 	// send walk-vs-run status
 	gAgent.sendWalkRun(gAgent.getRunning() || gAgent.getAlwaysRun());
 
-	if (LLFloaterReleaseMsg::checkVersion(version_channel_char))
+	// If the server version has changed, display an info box and offer
+	// to display the release notes, unless this is the initial log in.
+	if (gLastVersionChannel == version_channel)
 	{
-		LLNotifyBox::showXml("ServerVersionChanged", display_release_message, new std::string(version_channel_char) );
+		return;
+	}
+
+	if (!gLastVersionChannel.empty())
+	{
+		LLNotifyBox::showXml(
+			"ServerVersionChanged",	display_release_notes, NULL);
 	}
+
+	gLastVersionChannel = version_channel;
 }
 
 void process_crossed_region(LLMessageSystem* msg, void**)
@@ -2860,13 +2855,13 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 	U64 region_handle;
 	msg->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
 	
-	char seedCap[STD_STRING_BUF_SIZE];		/* Flawfinder: ignore */
-	msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, STD_STRING_BUF_SIZE, seedCap);
+	std::string seedCap;
+	msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
 
 	send_complete_agent_movement(sim_host);
 
 	LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
-	regionp->setSeedCapability(std::string(seedCap));
+	regionp->setSeedCapability(seedCap);
 }
 
 
@@ -3470,8 +3465,8 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
 		case LL_SIM_STAT_NUMSCRIPTSACTIVE:
 			LLViewerStats::getInstance()->mSimActiveScripts.addValue(stat_value);
 			break;
-		case LL_SIM_STAT_LSLIPS:
-			LLViewerStats::getInstance()->mSimLSLIPS.addValue(stat_value);
+		case LL_SIM_STAT_SCRIPT_EPS:
+			LLViewerStats::getInstance()->mSimScriptEPS.addValue(stat_value);
 			break;
 		case LL_SIM_STAT_INPPS:
 			LLViewerStats::getInstance()->mSimInPPS.addValue(stat_value);
@@ -3858,7 +3853,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
 // Culled from newsim lltask.cpp
 void process_name_value(LLMessageSystem *mesgsys, void **user_data)
 {
-	char	temp_str[NAME_VALUE_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string	temp_str;
 	LLUUID	id;
 	S32		i, num_blocks;
 
@@ -3871,7 +3866,7 @@ void process_name_value(LLMessageSystem *mesgsys, void **user_data)
 		num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_NameValueData);
 		for (i = 0; i < num_blocks; i++)
 		{
-			mesgsys->getStringFast(_PREHASH_NameValueData, _PREHASH_NVPair, NAME_VALUE_BUF_SIZE, temp_str, i);
+			mesgsys->getStringFast(_PREHASH_NameValueData, _PREHASH_NVPair, temp_str, i);
 			LL_INFOS("Messaging") << "Added to object Name Value: " << temp_str << LL_ENDL;
 			object->addNVPair(temp_str);
 		}
@@ -3884,7 +3879,7 @@ void process_name_value(LLMessageSystem *mesgsys, void **user_data)
 
 void process_remove_name_value(LLMessageSystem *mesgsys, void **user_data)
 {
-	char	temp_str[NAME_VALUE_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string	temp_str;
 	LLUUID	id;
 	S32		i, num_blocks;
 
@@ -3897,7 +3892,7 @@ void process_remove_name_value(LLMessageSystem *mesgsys, void **user_data)
 		num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_NameValueData);
 		for (i = 0; i < num_blocks; i++)
 		{
-			mesgsys->getStringFast(_PREHASH_NameValueData, _PREHASH_NVPair, NAME_VALUE_BUF_SIZE, temp_str, i);
+			mesgsys->getStringFast(_PREHASH_NameValueData, _PREHASH_NVPair, temp_str, i);
 			LL_INFOS("Messaging") << "Removed from object Name Value: " << temp_str << LL_ENDL;
 			object->removeNVPair(temp_str);
 		}
@@ -3910,10 +3905,9 @@ void process_remove_name_value(LLMessageSystem *mesgsys, void **user_data)
 
 void process_kick_user(LLMessageSystem *msg, void** /*user_data*/)
 {
-	char message[2048];		/* Flawfinder: ignore */
-	message[0] = '\0';
+	std::string message;
 
-	msg->getStringFast(_PREHASH_UserInfo, _PREHASH_Reason, 2048, message);
+	msg->getStringFast(_PREHASH_UserInfo, _PREHASH_Reason, message);
 
 	LLAppViewer::instance()->forceDisconnect(message);
 }
@@ -3978,12 +3972,12 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 	S32 balance = 0;
 	S32 credit = 0;
 	S32 committed = 0;
-	char desc[STD_STRING_BUF_SIZE] = "";		/* Flawfinder: ignore */
+	std::string desc;
 
 	msg->getS32("MoneyData", "MoneyBalance", balance);
 	msg->getS32("MoneyData", "SquareMetersCredit", credit);
 	msg->getS32("MoneyData", "SquareMetersCommitted", committed);
-	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_Description,	STD_STRING_BUF_SIZE,	desc);
+	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_Description, desc);
 	LL_INFOS("Messaging") << "L$, credit, committed: " << balance << " " << credit << " "
 			<< committed << LL_ENDL;
 
@@ -4013,13 +4007,13 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 	LLUUID tid;
 	msg->getUUID("MoneyData", "TransactionID", tid);
 	static std::deque<LLUUID> recent;
-	if(desc[0] && gSavedSettings.getBOOL("NotifyMoneyChange")
+	if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange")
 	   && (std::find(recent.rbegin(), recent.rend(), tid) == recent.rend()))
 	{
 		// Make the user confirm the transaction, since they might
 		// have missed something during an event.
 		// *TODO:translate
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MESSAGE]"] = desc;
 		LLNotifyBox::showXml("SystemMessage", args);
 
@@ -4039,8 +4033,8 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 
 void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
 {
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-	msgsystem->getStringFast(_PREHASH_AlertData, _PREHASH_Message, MAX_STRING, buffer);
+	std::string buffer;
+	msgsystem->getStringFast(_PREHASH_AlertData, _PREHASH_Message, buffer);
 	BOOL modal = FALSE;
 	msgsystem->getBOOL("AlertData", "Modal", modal);
 	process_alert_core(buffer, modal);
@@ -4048,8 +4042,8 @@ void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
 
 void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
 {
-	char buffer[MAX_STRING];		/* Flawfinder: ignore */
-	msgsystem->getStringFast(_PREHASH_AlertData, _PREHASH_Message, MAX_STRING, buffer);
+	std::string buffer;
+	msgsystem->getStringFast(_PREHASH_AlertData, _PREHASH_Message, buffer);
 	BOOL modal = FALSE;
 	process_alert_core(buffer, modal);
 }
@@ -4068,7 +4062,7 @@ void process_alert_core(const std::string& message, BOOL modal)
 	else if( message == "Home position set." )
 	{
 		// save the home location image to disk
-		LLString snap_filename = gDirUtilp->getLindenUserDir();
+		std::string snap_filename = gDirUtilp->getLindenUserDir();
 		snap_filename += gDirUtilp->getDirDelimiter();
 		snap_filename += SCREEN_HOME_FILENAME;
 		gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE);
@@ -4093,19 +4087,19 @@ void process_alert_core(const std::string& message, BOOL modal)
 	else if (message[0] == '/')
 	{
 		// System message is important, show in upper-right box not tip
-		LLString text(message.substr(1));
-		LLString::format_map_t args;
+		std::string text(message.substr(1));
+		LLStringUtil::format_map_t args;
 		if (text.substr(0,17) == "RESTART_X_MINUTES")
 		{
 			S32 mins = 0;
-			LLString::convertToS32(text.substr(18), mins);
+			LLStringUtil::convertToS32(text.substr(18), mins);
 			args["[MINUTES]"] = llformat("%d",mins);
 			LLNotifyBox::showXml("RegionRestartMinutes", args);
 		}
 		else if (text.substr(0,17) == "RESTART_X_SECONDS")
 		{
 			S32 secs = 0;
-			LLString::convertToS32(text.substr(18), secs);
+			LLStringUtil::convertToS32(text.substr(18), secs);
 			args["[SECONDS]"] = llformat("%d",secs);
 			LLNotifyBox::showXml("RegionRestartSeconds", args);
 		}
@@ -4119,14 +4113,14 @@ void process_alert_core(const std::string& message, BOOL modal)
 	else if (modal)
 	{
 		// *TODO:translate
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[ERROR_MESSAGE]"] = message;
 		gViewerWindow->alertXml("ErrorMessage", args);
 	}
 	else
 	{
 		// *TODO:translate
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[MESSAGE]"] = message;
 		LLNotifyBox::showXml("SystemMessageTip", args);
 	}
@@ -4145,7 +4139,7 @@ void handle_show_mean_events(void *)
 	LLFloaterBump::show(NULL);
 }
 
-void mean_name_callback(const LLUUID &id, const char *first, const char *last, BOOL always_false, void* data)
+void mean_name_callback(const LLUUID &id, const std::string& first, const std::string& last, BOOL always_false, void* data)
 {
 	if (gNoRender)
 	{
@@ -4167,10 +4161,8 @@ void mean_name_callback(const LLUUID &id, const char *first, const char *last, B
 		LLMeanCollisionData *mcd = *iter;
 		if (mcd->mPerp == id)
 		{
-			strncpy(mcd->mFirstName, first, DB_FIRST_NAME_BUF_SIZE -1);		/* Flawfinder: ignore */
-			mcd->mFirstName[DB_FIRST_NAME_BUF_SIZE -1] = '\0';
-			strncpy(mcd->mLastName, last, DB_LAST_NAME_BUF_SIZE -1);		/* Flawfinder: ignore */
-			mcd->mLastName[DB_LAST_NAME_BUF_SIZE -1] = '\0';
+			mcd->mFirstName = first;
+			mcd->mLastName = last;
 		}
 	}
 }
@@ -4265,7 +4257,7 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 class LLScriptQuestionCBData
 {
 public:
-	LLScriptQuestionCBData(const LLUUID &taskid, const LLUUID &itemid, const LLHost &sender, S32 questions, const char *object_name, const char *owner_name)
+	LLScriptQuestionCBData(const LLUUID &taskid, const LLUUID &itemid, const LLHost &sender, S32 questions, const std::string& object_name, const std::string& owner_name)
 		: mTaskID(taskid), mItemID(itemid), mSender(sender), mQuestions(questions), mObjectName(object_name), mOwnerName(owner_name)
 	{
 	}
@@ -4274,8 +4266,8 @@ public:
 	LLUUID mItemID;
 	LLHost mSender;
 	S32	   mQuestions;
-	LLString mObjectName;
-	LLString mOwnerName;
+	std::string mObjectName;
+	std::string mOwnerName;
 };
 
 void notify_cautioned_script_question(LLScriptQuestionCBData* cbdata, S32 orig_questions, BOOL granted)
@@ -4310,7 +4302,7 @@ void notify_cautioned_script_question(LLScriptQuestionCBData* cbdata, S32 orig_q
 			{
 				// got the region, so include the region and 3d coordinates of the object
 				notice.setArg("[REGIONNAME]", viewregion->getName());				
-				LLString formatpos = llformat("%.1f, %.1f,%.1f", objpos[VX], objpos[VY], objpos[VZ]);
+				std::string formatpos = llformat("%.1f, %.1f,%.1f", objpos[VX], objpos[VY], objpos[VZ]);
 				notice.setArg("[REGIONPOS]", formatpos);
 
 				foundpos = TRUE;
@@ -4328,7 +4320,7 @@ void notify_cautioned_script_question(LLScriptQuestionCBData* cbdata, S32 orig_q
 		// permission that has been flagged as a caution permission
 		BOOL caution = FALSE;
 		S32 count = 0;
-		LLString perms;
+		std::string perms;
 		for (S32 i = 0; i < SCRIPT_PERMISSION_EOF; i++)
 		{
 			if ((orig_questions & LSCRIPTRunTimePermissionBits[i]) && LLNotifyBox::getTemplateIsCaution(SCRIPT_QUESTIONS[i]))
@@ -4455,26 +4447,25 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 	LLUUID taskid;
 	LLUUID itemid;
 	S32		questions;
-	char object_name[255];		/* Flawfinder: ignore */
-	char owner_name[DB_FULL_NAME_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string object_name;
+	std::string owner_name;
 
 	// taskid -> object key of object requesting permissions
 	msg->getUUIDFast(_PREHASH_Data, _PREHASH_TaskID, taskid );
 	// itemid -> script asset key of script requesting permissions
 	msg->getUUIDFast(_PREHASH_Data, _PREHASH_ItemID, itemid );
-	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectName, 255, object_name);
-	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectOwner, DB_FULL_NAME_BUF_SIZE, owner_name);
+	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectName, object_name);
+	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectOwner, owner_name);
 	msg->getS32Fast(_PREHASH_Data, _PREHASH_Questions, questions );
 
 	// don't display permission requests if this object is muted - JS.
 	if (LLMuteList::getInstance()->isMuted(taskid)) return;
 
 	// throttle excessive requests from any specific user's scripts
-	LLString throttle_owner_name = owner_name;
-	typedef LLKeyThrottle<LLString> LLStringThrottle;
+	typedef LLKeyThrottle<std::string> LLStringThrottle;
 	static LLStringThrottle question_throttle( LLREQUEST_PERMISSION_THROTTLE_LIMIT, LLREQUEST_PERMISSION_THROTTLE_INTERVAL );
 
-	switch (question_throttle.noteAction(throttle_owner_name))
+	switch (question_throttle.noteAction(owner_name))
 	{
 		case LLStringThrottle::THROTTLE_NEWLY_BLOCKED:
 			LL_INFOS("Messaging") << "process_script_question throttled"
@@ -4490,12 +4481,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 			break;
 	}
 
-	LLString script_question;
+	std::string script_question;
 	if (questions)
 	{
 		BOOL caution = FALSE;
 		S32 count = 0;
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[OBJECTNAME]"] = object_name;
 		args["[NAME]"] = owner_name;
 
@@ -4563,7 +4554,7 @@ void container_inventory_arrived(LLViewerObject* object,
 		LLUUID cat_id;
 		cat_id = gInventory.createNewCategory(gAgent.getInventoryRootID(),
 											  LLAssetType::AT_NONE,
-											  "Acquired Items");
+											  std::string("Acquired Items")); //TODO: Translate
 
 		InventoryObjectList::const_iterator it = inventory->begin();
 		InventoryObjectList::const_iterator end = inventory->end();
@@ -4576,7 +4567,7 @@ void container_inventory_arrived(LLViewerObject* object,
 				LLInventoryItem* item = (LLInventoryItem*)(obj);
 				LLUUID item_id;
 				item_id.generate();
-				S32 creation_date_utc = time_corrected();
+				time_t creation_date_utc = time_corrected();
 				LLPointer<LLViewerInventoryItem> new_item
 					= new LLViewerInventoryItem(item_id,
 												cat_id,
@@ -4616,7 +4607,7 @@ void container_inventory_arrived(LLViewerObject* object,
 
 		LLUUID item_id;
 		item_id.generate();
-		S32 creation_date_utc = time_corrected();
+		time_t creation_date_utc = time_corrected();
 		LLPointer<LLViewerInventoryItem> new_item
 			= new LLViewerInventoryItem(item_id, category,
 										item->getPermissions(),
@@ -4654,24 +4645,23 @@ void container_inventory_arrived(LLViewerObject* object,
 	}
 }
 
-// method to format the time. Buffer should be at least
-// TIME_STR_LENGTH long, and the function returns buffer (for use in
-// sprintf and the like)
-char* formatted_time(const time_t& the_time, char* buffer)
+// method to format the time.
+std::string formatted_time(const time_t& the_time)
 {
-	LLString::copy(buffer, ctime(&the_time), TIME_STR_LENGTH);
+	char buffer[30]; /* Flawfinder: ignore */
+	LLStringUtil::copy(buffer, ctime(&the_time), 30);
 	buffer[24] = '\0';
-	return buffer;
+	return std::string(buffer);
 }
 
 
 void process_teleport_failed(LLMessageSystem *msg, void**)
 {
-	char reason[STD_STRING_BUF_SIZE];		/* Flawfinder: ignore */
-	msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, STD_STRING_BUF_SIZE, reason);
+	std::string reason;
+	msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, reason);
 
-	LLStringBase<char>::format_map_t args;
-	LLString big_reason = LLAgent::sTeleportErrorMessages[reason];
+	LLStringUtil::format_map_t args;
+	std::string big_reason = LLAgent::sTeleportErrorMessages[reason];
 	if ( big_reason.size() > 0 )
 	{	// Substitute verbose reason from the local map
 		args["[REASON]"] = big_reason;
@@ -4735,14 +4725,14 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 }
 
 void send_simple_im(const LLUUID& to_id,
-					const char* message,
+					const std::string& message,
 					EInstantMessage dialog,
 					const LLUUID& id)
 {
 	std::string my_name;
 	gAgent.buildFullname(my_name);
 	send_improved_im(to_id,
-					 my_name.c_str(),
+					 my_name,
 					 message,
 					 IM_ONLINE,
 					 dialog,
@@ -4753,8 +4743,8 @@ void send_simple_im(const LLUUID& to_id,
 }
 
 void send_group_notice(const LLUUID& group_id,
-					   const char* subject,
-					   const char* message,
+					   const std::string& subject,
+					   const std::string& message,
 					   const LLInventoryItem* item)
 {
 	// Put this notice into an instant message form.
@@ -4793,8 +4783,8 @@ void send_group_notice(const LLUUID& group_id,
 
 	send_improved_im(
 			group_id,
-			my_name.c_str(),
-			subject_and_message.str().c_str(),
+			my_name,
+			subject_and_message.str(),
 			IM_ONLINE,
 			IM_GROUP_NOTICE,
 			LLUUID::null,
@@ -4803,7 +4793,7 @@ void send_group_notice(const LLUUID& group_id,
 			bin_bucket_size);
 }
 
-void handle_lure_callback(S32 option, const LLString& text, void* userdata)
+void handle_lure_callback(S32 option, const std::string& text, void* userdata)
 {
 	LLDynamicArray<LLUUID>* invitees = (LLDynamicArray<LLUUID>*)userdata;
 
@@ -4816,7 +4806,7 @@ void handle_lure_callback(S32 option, const LLString& text, void* userdata)
 		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 		msg->nextBlockFast(_PREHASH_Info);
 		msg->addU8Fast(_PREHASH_LureType, (U8)0); // sim will fill this in.
-		msg->addStringFast(_PREHASH_Message, text.c_str());
+		msg->addStringFast(_PREHASH_Message, text);
 		for(LLDynamicArray<LLUUID>::iterator itr = invitees->begin(); itr != invitees->end(); ++itr)
 		{
 			msg->nextBlockFast(_PREHASH_TargetData);
@@ -4831,7 +4821,7 @@ void handle_lure_callback(S32 option, const LLString& text, void* userdata)
 
 void handle_lure_callback_godlike(S32 option, void* userdata)
 {
-	handle_lure_callback(option, LLString::null, userdata);
+	handle_lure_callback(option, LLStringUtil::null, userdata);
 }
 
 void handle_lure(const LLUUID& invitee)
@@ -4846,7 +4836,7 @@ void handle_lure(LLDynamicArray<LLUUID>& ids)
 {
 	LLDynamicArray<LLUUID>* userdata = new LLDynamicArray<LLUUID>(ids);
 
-	LLString::format_map_t edit_args;
+	LLStringUtil::format_map_t edit_args;
 	edit_args["[REGION]"] = gAgent.getRegion()->getName();
 	if (gAgent.isGodlike())
 	{
@@ -4864,8 +4854,8 @@ void handle_lure(LLDynamicArray<LLUUID>& ids)
 
 
 void send_improved_im(const LLUUID& to_id,
-							const char* name,
-							const char* message,
+							const std::string& name,
+							const std::string& message,
 							U8 offline,
 							EInstantMessage dialog,
 							const LLUUID& id,
@@ -4896,10 +4886,10 @@ void send_improved_im(const LLUUID& to_id,
 
 void send_places_query(const LLUUID& query_id,
 					   const LLUUID& trans_id,
-					   const char* query_text,
+					   const std::string& query_text,
 					   U32 query_flags,
 					   S32 category,
-					   const char* sim_name)
+					   const std::string& sim_name)
 {
 	LLMessageSystem* msg = gMessageSystem;
 
@@ -4931,12 +4921,10 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
 	
 	BOOL im_via_email;
 	msg->getBOOLFast(_PREHASH_UserData, _PREHASH_IMViaEMail, im_via_email);
-	char email[DB_USER_EMAIL_ADDR_BUF_SIZE];		/* Flawfinder: ignore */
-	msg->getStringFast(_PREHASH_UserData, _PREHASH_EMail, DB_USER_EMAIL_ADDR_BUF_SIZE,
-					   email);
-	char dir_visibility[MAX_STRING];			/* Flawfinder: ignore */	
-	msg->getString(
-		"UserData", "DirectoryVisibility", MAX_STRING, dir_visibility);
+	std::string email;
+	msg->getStringFast(_PREHASH_UserData, _PREHASH_EMail, email);
+	std::string dir_visibility;
+	msg->getString( "UserData", "DirectoryVisibility", dir_visibility);
 
 	LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, email);
 	LLFloaterPostcard::updateUserInfo(email);
@@ -4957,7 +4945,7 @@ struct ScriptDialogInfo
 	LLHost mSender;
 	LLUUID mObjectID;
 	S32 mChatChannel;
-	std::vector<LLString> mButtons;
+	std::vector<std::string> mButtons;
 };
 
 void callback_script_dialog(S32 option, void* data)
@@ -4990,19 +4978,17 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 
 	ScriptDialogInfo* info = new ScriptDialogInfo;
 
-	const S32 messageLength = SCRIPT_DIALOG_MAX_MESSAGE_SIZE + sizeof(SCRIPT_DIALOG_HEADER);
-	char message[messageLength]; 		/* Flawfinder: ignore */		// Account for size of "Script Dialog:\n"
-
-	char first_name[DB_FIRST_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-	char last_name[DB_GROUP_NAME_BUF_SIZE];		/* Flawfinder: ignore */
-	char title[DB_INV_ITEM_NAME_BUF_SIZE];		/* Flawfinder: ignore */
+	std::string message; // Account for size of "Script Dialog:\n"
+	std::string first_name;
+	std::string last_name;
+	std::string title;
 	info->mSender = msg->getSender();
 
 	msg->getUUID("Data", "ObjectID", info->mObjectID);
-	msg->getString("Data", "FirstName", DB_FIRST_NAME_BUF_SIZE, first_name);
-	msg->getString("Data", "LastName", DB_LAST_NAME_BUF_SIZE, last_name);
-	msg->getString("Data", "ObjectName", DB_INV_ITEM_NAME_BUF_SIZE, title);
-	msg->getString("Data", "Message", SCRIPT_DIALOG_MAX_MESSAGE_SIZE, message);
+	msg->getString("Data", "FirstName", first_name);
+	msg->getString("Data", "LastName", last_name);
+	msg->getString("Data", "ObjectName", title);
+	msg->getString("Data", "Message", message);
 	msg->getS32("Data", "ChatChannel", info->mChatChannel);
 
 		// unused for now
@@ -5017,15 +5003,15 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 
 	for (i = 0; i < button_count; i++)
 	{
-		char tdesc[SCRIPT_DIALOG_BUTTON_STR_SIZE+1];		/* Flawfinder: ignore */
-		msg->getString("Buttons", "ButtonLabel", SCRIPT_DIALOG_BUTTON_STR_SIZE + 1,  tdesc, i);
-		info->mButtons.push_back(LLString(tdesc));
+		std::string tdesc;
+		msg->getString("Buttons", "ButtonLabel", tdesc, i);
+		info->mButtons.push_back(tdesc);
 	}
 
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[TITLE]"] = title;
 	args["[MESSAGE]"] = message;
-	if (strlen(first_name) > 0)		/* Flawfinder: ignore */
+	if (!first_name.empty())
 	{
 		args["[FIRST]"] = first_name;
 		args["[LAST]"] = last_name;
@@ -5051,9 +5037,9 @@ struct LoadUrlInfo
 	LLUUID mObjectID;
 	LLUUID mOwnerID;
 	BOOL mOwnerIsGroup;
-	char mObjectName[256];		/* Flawfinder: ignore */
-	char mMessage[256];		/* Flawfinder: ignore */
-	char mUrl[256];		/* Flawfinder: ignore */
+	std::string mObjectName;
+	std::string mMessage;
+	std::string mUrl;
 };
 
 std::vector<LoadUrlInfo*> gLoadUrlList;
@@ -5075,7 +5061,7 @@ void callback_load_url(S32 option, void* data)
 
 // We've got the name of the person who owns the object hurling the url.
 // Display confirmation dialog.
-void callback_load_url_name(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* data)
+void callback_load_url_name(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
 {
 	std::vector<LoadUrlInfo*>::iterator it;
 	for (it = gLoadUrlList.begin(); it != gLoadUrlList.end(); )
@@ -5085,15 +5071,14 @@ void callback_load_url_name(const LLUUID& id, const char* first, const char* las
 		{
 			it = gLoadUrlList.erase(it);
 
-			std::string owner_name(first);
+			std::string owner_name;
 			if (is_group)
 			{
-				owner_name += " (group)";
+				owner_name = first + " (group)";
 			}
 			else
 			{
-				owner_name += " ";
-				owner_name += last;
+				owner_name = first + " " + last;
 			}
 
 			// For legacy name-only mutes.
@@ -5103,7 +5088,7 @@ void callback_load_url_name(const LLUUID& id, const char* first, const char* las
 				infop = NULL;
 				continue;
 			}
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[URL]"] = infop->mUrl;
 			args["[MESSAGE]"] = infop->mMessage;
 			args["[OBJECTNAME]"] = infop->mObjectName;
@@ -5121,12 +5106,12 @@ void process_load_url(LLMessageSystem* msg, void**)
 {
 	LoadUrlInfo* infop = new LoadUrlInfo;
 
-	msg->getString("Data", "ObjectName", 256, infop->mObjectName);
+	msg->getString("Data", "ObjectName", infop->mObjectName);
 	msg->getUUID(  "Data", "ObjectID", infop->mObjectID);
 	msg->getUUID(  "Data", "OwnerID", infop->mOwnerID);
 	msg->getBOOL(  "Data", "OwnerIsGroup", infop->mOwnerIsGroup);
-	msg->getString("Data", "Message", 256, infop->mMessage);
-	msg->getString("Data", "URL", 256, infop->mUrl);
+	msg->getString("Data", "Message", infop->mMessage);
+	msg->getString("Data", "URL", infop->mUrl);
 
 	// URL is safety checked in load_url above
 
@@ -5149,8 +5134,8 @@ void process_load_url(LLMessageSystem* msg, void**)
 
 void callback_download_complete(void** data, S32 result, LLExtStat ext_status)
 {
-	LLString* filepath = (LLString*)data;
-	LLString::format_map_t args;
+	std::string* filepath = (std::string*)data;
+	LLStringUtil::format_map_t args;
 	args["[DOWNLOAD_PATH]"] = *filepath;
 	gViewerWindow->alertXml("FinishedRawDownload", args);
 	delete filepath;
@@ -5167,10 +5152,10 @@ void process_initiate_download(LLMessageSystem* msg, void**)
 		return;
 	}
 
-	char sim_filename[MAX_PATH];		/* Flawfinder: ignore */
-	char viewer_filename[MAX_PATH];		/* Flawfinder: ignore */
-	msg->getString("FileData", "SimFilename", MAX_PATH, sim_filename);
-	msg->getString("FileData", "ViewerFilename", MAX_PATH, viewer_filename);
+	std::string sim_filename;
+	std::string viewer_filename;
+	msg->getString("FileData", "SimFilename", sim_filename);
+	msg->getString("FileData", "ViewerFilename", viewer_filename);
 
 	gXferManager->requestFile(viewer_filename,
 		sim_filename,
@@ -5178,19 +5163,19 @@ void process_initiate_download(LLMessageSystem* msg, void**)
 		msg->getSender(),
 		FALSE,	// don't delete remote
 		callback_download_complete,
-		(void**)new LLString(viewer_filename));
+		(void**)new std::string(viewer_filename));
 }
 
 
 void process_script_teleport_request(LLMessageSystem* msg, void**)
 {
-	char object_name[256];	/* Flawfinder: ignore */		
-	char sim_name[256];		/* Flawfinder: ignore */
+	std::string object_name;
+	std::string sim_name;
 	LLVector3 pos;
 	LLVector3 look_at;
 
-	msg->getString("Data", "ObjectName", 255, object_name);
-	msg->getString(  "Data", "SimName", 255, sim_name);
+	msg->getString("Data", "ObjectName", object_name);
+	msg->getString("Data", "SimName", sim_name);
 	msg->getVector3("Data", "SimPosition", pos);
 	msg->getVector3("Data", "LookAt", look_at);
 
@@ -5206,11 +5191,11 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
 void process_covenant_reply(LLMessageSystem* msg, void**)
 {
 	LLUUID covenant_id, estate_owner_id;
-	char estate_name[MAX_STRING];		/* Flawfinder: ignore */
+	std::string estate_name;
 	U32 covenant_timestamp;
 	msg->getUUID("Data", "CovenantID", covenant_id);
 	msg->getU32("Data", "CovenantTimestamp", covenant_timestamp);
-	msg->getString("Data", "EstateName", MAX_STRING, estate_name);
+	msg->getString("Data", "EstateName", estate_name);
 	msg->getUUID("Data", "EstateOwnerID", estate_owner_id);
 
 	LLPanelEstateCovenant::updateEstateName(estate_name);
@@ -5218,11 +5203,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
 	LLFloaterBuyLand::updateEstateName(estate_name);
 
 	// standard message, not from system
-	char last_modified[MAX_STRING];		/* Flawfinder: ignore */
-	last_modified[0] = '\0';
-	char time_buf[TIME_STR_LENGTH];		/* Flawfinder: ignore */
-	snprintf(last_modified, MAX_STRING, "Last Modified %s",		/* Flawfinder: ignore */
-	formatted_time((time_t)covenant_timestamp, time_buf));
+	std::string last_modified = std::string("Last Modified ") + formatted_time((time_t)covenant_timestamp);
 
 	LLPanelEstateCovenant::updateLastModified(last_modified);
 	LLPanelLandCovenant::updateLastModified(last_modified);
@@ -5262,12 +5243,9 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
 	}
 }
 
-void callbackCacheEstateOwnerName(
-		const LLUUID& id,
-		const char* first,
-		const char* last,
-		BOOL is_group,
-		void*)
+void callbackCacheEstateOwnerName(const LLUUID& id,
+								  const std::string& first, const std::string& last,
+								  BOOL is_group, void*)
 {
 	std::string name;
 	
@@ -5277,9 +5255,7 @@ void callbackCacheEstateOwnerName(
 	}
 	else
 	{
-		name = first;
-		name += " ";
-		name += last;
+		name = first + " " + last;
 	}
 	LLPanelEstateCovenant::updateEstateOwnerName(name);
 	LLPanelLandCovenant::updateEstateOwnerName(name);
@@ -5314,10 +5290,10 @@ void onCovenantLoadComplete(LLVFS *vfs,
 		if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
 		{
 			LLViewerTextEditor* editor =
-				new LLViewerTextEditor("temp",
+				new LLViewerTextEditor(std::string("temp"),
 						       LLRect(0,0,0,0),
 						       file_length+1);
-			if( !editor->importBuffer( buffer ) )
+			if( !editor->importBuffer( buffer, file_length+1 ) )
 			{
 				LL_WARNS("Messaging") << "Problem importing estate covenant." << LL_ENDL;
 				covenant_text = "Problem importing estate covenant.";
@@ -5367,12 +5343,12 @@ void process_feature_disabled_message(LLMessageSystem* msg, void**)
 	// Handle Blacklisted feature simulator response...
 	LLUUID	agentID;
 	LLUUID	transactionID;
-	char	messageText[MAX_STRING];		/* Flawfinder: ignore */
-	msg->getStringFast(_PREHASH_FailureInfo,_PREHASH_ErrorMessage,MAX_STRING,&messageText[0],0);
+	std::string	messageText;
+	msg->getStringFast(_PREHASH_FailureInfo,_PREHASH_ErrorMessage, messageText,0);
 	msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_AgentID,agentID);
 	msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_TransactionID,transactionID);
 	
-	LL_WARNS("Messaging") << "Blacklisted Feature Response:" << &messageText[0] << LL_ENDL;
+	LL_WARNS("Messaging") << "Blacklisted Feature Response:" << messageText << LL_ENDL;
 }
 
 // ------------------------------------------------------------
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index 5abd9d1..a4bae57 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -61,7 +61,7 @@ enum InventoryOfferResponse
 
 BOOL can_afford_transaction(S32 cost);
 void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group = FALSE,
-				S32 trx_type = TRANS_GIFT, const LLString& desc = LLString::null);
+				S32 trx_type = TRANS_GIFT, const std::string& desc = LLStringUtil::null);
 void busy_message (LLMessageSystem* msg, LLUUID from_id);
 
 void process_logout_reply(LLMessageSystem* msg, void**);
@@ -139,13 +139,13 @@ void process_teleport_local(LLMessageSystem *msg,void**);
 void process_user_sim_location_reply(LLMessageSystem *msg,void**);
 
 void send_simple_im(const LLUUID& to_id,
-					const char* message,
+					const std::string& message,
 					EInstantMessage dialog = IM_NOTHING_SPECIAL,
 					const LLUUID& id = LLUUID::null);
 
 void send_group_notice(const LLUUID& group_id,
-					   const char* subject,
-					   const char* message,
+					   const std::string& subject,
+					   const std::string& message,
 					   const LLInventoryItem* item);
 
 void handle_lure(const LLUUID& invitee);
@@ -154,8 +154,8 @@ void handle_lure(LLDynamicArray<LLUUID>& ids);
 // always from gAgent and 
 // routes through the gAgent's current simulator
 void send_improved_im(const LLUUID& to_id,
-					const char* name,
-					const char* message,
+					const std::string& name,
+					const std::string& message,
 					U8 offline = IM_ONLINE,
 					EInstantMessage dialog = IM_NOTHING_SPECIAL,
 					const LLUUID& id = LLUUID::null,
@@ -165,18 +165,15 @@ void send_improved_im(const LLUUID& to_id,
 
 void process_user_info_reply(LLMessageSystem* msg, void**);
 
-// method to format the time. Buffer should be at least
-// TIME_STR_LENGTH long, and the function reutnrs buffer (for use in
-// sprintf and the like)
-const S32 TIME_STR_LENGTH = 30;
-char* formatted_time(const time_t& the_time, char* buffer);
+// method to format the time. 
+std::string formatted_time(const time_t& the_time);
 
 void send_places_query(const LLUUID& query_id,
 					   const LLUUID& trans_id,
-					   const char* query_text,
+					   const std::string& query_text,
 					   U32 query_flags,
 					   S32 category, 
-					   const char* sim_name);
+					   const std::string& sim_name);
 void process_script_dialog(LLMessageSystem* msg, void**);
 void process_load_url(LLMessageSystem* msg, void**);
 void process_script_teleport_request(LLMessageSystem* msg, void**);
@@ -185,12 +182,6 @@ void onCovenantLoadComplete(LLVFS *vfs,
 							const LLUUID& asset_uuid,
 							LLAssetType::EType type,
 							void* user_data, S32 status, LLExtStat ext_status);
-void callbackCacheEstateOwnerName(
-		const LLUUID& id,
-		const char* first,
-		const char* last,
-		BOOL is_group,
-		void*);
 
 // calling cards
 void process_offer_callingcard(LLMessageSystem* msg, void**);
@@ -214,8 +205,8 @@ struct LLOfferInfo
 	LLUUID mFolderID;
 	LLUUID mObjectID;
 	LLAssetType::EType mType;
-	LLString mFromName;
-	LLString mDesc;
+	std::string mFromName;
+	std::string mDesc;
 	LLHost mHost;
 };
 
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 42cbe46..13d432a 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -58,6 +58,10 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
 	  "util.aruna.lindenlab.com",
 	  "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
 	  "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
+	{ "Damballah",
+	  "util.damballah.lindenlab.com",
+	  "https://login.damballah.lindenlab.com/cgi-bin/login.cgi",
+	  "http://damballah-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "Durga",
 	  "util.durga.lindenlab.com",
 	  "https://login.durga.lindenlab.com/cgi-bin/login.cgi",
@@ -171,7 +175,7 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name)
         int grid_index = GRID_INFO_NONE; 
         for(;grid_index < GRID_INFO_OTHER; ++grid_index)
         {
-            if(0 == LLString::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name.c_str()))
+            if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
             {
 				// Founding a matching label in the list...
 				setGridChoice((EGridInfo)grid_index);
@@ -296,7 +300,7 @@ bool LLViewerLogin::isInProductionGrid()
 	// but it seems that loginURI trumps that.
 	std::vector<std::string> uris;
 	getLoginURIs(uris);
-	LLString::toLower(uris[0]);
+	LLStringUtil::toLower(uris[0]);
 	if((uris[0].find("agni") != std::string::npos))
 	{
 		return true;
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 966034f..53bb0ab 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -41,6 +41,7 @@ enum EGridInfo
 	GRID_INFO_ADITI,
 	GRID_INFO_AGNI,
 	GRID_INFO_ARUNA,
+	GRID_INFO_DAMBALLAH,
 	GRID_INFO_DURGA,
 	GRID_INFO_GANGA,
 	GRID_INFO_MITRA,
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index a989c9d..c560ced 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -96,6 +96,7 @@
 #include "pipeline.h"
 #include "llviewernetwork.h"
 #include "llvowlsky.h"
+#include "llmanip.h"
 
 //#define DEBUG_UPDATE_TYPE
 
@@ -402,13 +403,10 @@ void LLViewerObject::dump() const
 		mNameValuePairs[key]->printNameValue(buffer);
 		llinfos << buffer << llendl;
 	}
-
-	S32 i;
-
-	LLViewerObject *child;
-	for (i = 0; i < mChildList.size(); i++)
+	for (child_list_t::iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
 	{
-		child = mChildList[i];
+		LLViewerObject* child = *iter;
 		llinfos << "  child " << child->getID() << llendl;
 	}
 	*/
@@ -467,7 +465,7 @@ void LLViewerObject::setNameValueList(const std::string& name_value_list)
 		if (end > start)
 		{
 			std::string tok = name_value_list.substr(start, end - start);
-			addNVPair(tok.c_str());
+			addNVPair(tok);
 		}
 		start = end+1;
 	}
@@ -555,20 +553,16 @@ void LLViewerObject::removeChild(LLViewerObject *childp)
 	}
 }
 
-LLViewerObject::child_list_t& LLViewerObject::getChildren()
-{
-	return mChildList;
-}
-
 void LLViewerObject::addThisAndAllChildren(LLDynamicArray<LLViewerObject*>& objects)
 {
 	objects.put(this);
-	S32 count = mChildList.size();
-	for(S32 i = 0; i < count; i++)
+	for (child_list_t::iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
 	{
-		if (!mChildList[i]->isAvatar())
+		LLViewerObject* child = *iter;
+		if (!child->isAvatar())
 		{
-			(mChildList[i])->addThisAndAllChildren(objects);
+			child->addThisAndAllChildren(objects);
 		}
 	}
 }
@@ -581,24 +575,25 @@ void LLViewerObject::addThisAndNonJointChildren(LLDynamicArray<LLViewerObject*>&
 	{
 		return;
 	}
-	S32 count = mChildList.size();
-	for(S32 i = 0; i < count; i++)
+	for (child_list_t::iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
 	{
-		if ( (!mChildList[i]->isAvatar())
-			&& (!mChildList[i]->isJointChild()))
+		LLViewerObject* child = *iter;
+		if ( (!child->isAvatar()) && (!child->isJointChild()))
 		{
-			(mChildList[i])->addThisAndNonJointChildren(objects);
+			child->addThisAndNonJointChildren(objects);
 		}
 	}
 }
 
 BOOL LLViewerObject::isChild(LLViewerObject *childp) const
 {
-	S32 count = mChildList.size();
-	for(S32 i = 0; i < count; i++)
+	for (child_list_t::const_iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
 	{
-		const LLViewerObject *testChildp = &(*mChildList[i]);
-		if (testChildp == childp) return TRUE;
+		LLViewerObject* testchild = *iter;
+		if (testchild == childp)
+			return TRUE;
 	}
 	return FALSE;
 }
@@ -607,11 +602,11 @@ BOOL LLViewerObject::isChild(LLViewerObject *childp) const
 // returns TRUE if at least one avatar is sitting on this object
 BOOL LLViewerObject::isSeat() const
 {
-	S32 count = mChildList.size();
-	for(S32 i = 0; i < count; i++)
+	for (child_list_t::const_iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
 	{
-		const LLViewerObject *childp = &(*mChildList[i]);
-		if (childp->isAvatar())
+		LLViewerObject* child = *iter;
+		if (child->isAvatar())
 		{
 			return TRUE;
 		}
@@ -955,12 +950,9 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 				S32 nv_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_NameValue);
 				if (nv_size > 0)
 				{
-					char* name_value_list = new char[nv_size];
-					mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_NameValue, nv_size, name_value_list, block_num);
-
+					std::string name_value_list;
+					mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_NameValue, name_value_list, block_num);
 					setNameValueList(name_value_list);
-
-					delete [] name_value_list;
 				}
 
 				// Clear out any existing generic data
@@ -996,8 +988,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 						mText->setOnHUDAttachment(isHUDAttachment());
 					}
 
-					char temp_string[256];			/* Flawfinder: ignore */		// not MAX_STRING, must hold 255 chars + \0
-					mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, 256, temp_string, block_num );
+					std::string temp_string;
+					mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, temp_string, block_num );
 					
 					LLColor4U coloru;
 					mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextColor, coloru.mV, 4, block_num);
@@ -1019,13 +1011,13 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 					mText = NULL;
 				}
 
-				char media_url[MAX_STRING+1];		/* Flawfinder: ignore */
-				mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_MediaURL, MAX_STRING+1, media_url, block_num);
-				//if (media_url[0])
+				std::string media_url;
+				mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_MediaURL, media_url, block_num);
+				//if (!media_url.empty())
 				//{
 				//	llinfos << "WEBONPRIM media_url " << media_url << llendl;
 				//}
-				if (!mMedia && media_url[0] != '\0')
+				if (!mMedia && !media_url.empty())
 				{
 					retval |= MEDIA_URL_ADDED;
 					mMedia = new LLViewerObjectMedia;
@@ -1035,7 +1027,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 				}
 				else if (mMedia)
 				{
-					if (media_url[0] == '\0')
+					if (media_url.empty())
 					{
 						retval |= MEDIA_URL_REMOVED;
 						delete mMedia;
@@ -1514,7 +1506,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 					std::string name_value_list;
 					dp->unpackString(name_value_list, "NV");
 
-					setNameValueList(name_value_list.c_str());
+					setNameValueList(name_value_list);
 				}
 
 				mTotalCRC = crc;
@@ -1847,7 +1839,19 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 			  ||(this_update_precision > mBestUpdatePrecision))))
 	{
 		mBestUpdatePrecision = this_update_precision;
-		setPositionParent(new_pos_parent);
+		
+		LLVector3 diff = new_pos_parent - test_pos_parent ;
+		F32 mag_sqr = diff.magVecSquared() ;
+		if(llfinite(mag_sqr)) 
+		{
+			setPositionParent(new_pos_parent);
+		}
+		else
+		{
+			llwarns << "Can not move the object/avatar to an infinite location!" << llendl ;	
+
+			retval |= INVALID_UPDATE ;
+		}
 
 		if (mParent && ((LLViewerObject*)mParent)->isAvatar())
 		{
@@ -1918,11 +1922,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 	// Additionally, if any child is selected, need to update the dialogs and selection
 	// center.
 	BOOL needs_refresh = mUserSelected;
-	LLViewerObject *childp;
-	for (U32 i = 0; i < mChildList.size(); i++)
+	for (child_list_t::iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
 	{
-		childp = mChildList[i];
-		needs_refresh = needs_refresh || childp->mUserSelected;
+		LLViewerObject* child = *iter;
+		needs_refresh = needs_refresh || child->mUserSelected;
 	}
 
 	if (needs_refresh)
@@ -2148,7 +2152,7 @@ void LLViewerObject::deleteInventoryItem(const LLUUID& item_id)
 }
 
 void LLViewerObject::doUpdateInventory(
-	LLViewerInventoryItem* item,
+	LLPointer<LLViewerInventoryItem>& item,
 	U8 key,
 	bool is_new)
 {
@@ -2220,7 +2224,8 @@ void LLViewerObject::doUpdateInventory(
 				--mInventorySerialNum;
 			}
 		}
-		LLViewerInventoryItem* new_item = new LLViewerInventoryItem(item);
+		LLViewerInventoryItem* oldItem = item;
+		LLViewerInventoryItem* new_item = new LLViewerInventoryItem(oldItem);
 		new_item->setPermissions(perm);
 		mInventory->push_front(new_item);
 		doInventoryCallback();
@@ -2386,7 +2391,7 @@ void LLViewerObject::fetchInventoryFromServer()
 struct LLFilenameAndTask
 {
 	LLUUID mTaskID;
-	char mFilename[MAX_STRING];  		/* Flawfinder: ignore */		// Just the filename, not the path
+	std::string mFilename;
 #ifdef _DEBUG
 	static S32 sCount;
 	LLFilenameAndTask()
@@ -2427,8 +2432,8 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
 	msg->getS16Fast(_PREHASH_InventoryData, _PREHASH_Serial, object->mInventorySerialNum);
 	LLFilenameAndTask* ft = new LLFilenameAndTask;
 	ft->mTaskID = task_id;
-	msg->getStringFast(_PREHASH_InventoryData, _PREHASH_Filename, MAX_STRING, ft->mFilename);
-	if(!ft->mFilename[0])
+	msg->getStringFast(_PREHASH_InventoryData, _PREHASH_Filename, ft->mFilename);
+	if(ft->mFilename.empty())
 	{
 		lldebugs << "Task has no inventory" << llendl;
 		// mock up some inventory to make a drop target.
@@ -2443,13 +2448,13 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
 		LLPointer<LLInventoryObject> obj;
 		obj = new LLInventoryObject(object->mID, LLUUID::null,
 									LLAssetType::AT_CATEGORY,
-									"Contents");
+									std::string("Contents"));
 		object->mInventory->push_front(obj);
 		object->doInventoryCallback();
 		delete ft;
 		return;
 	}
-	gXferManager->requestFile(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ft->mFilename).c_str(), 
+	gXferManager->requestFile(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ft->mFilename), 
 								ft->mFilename, LL_PATH_CACHE,
 								object->mRegionp->getHost(),
 								TRUE,
@@ -2477,12 +2482,12 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS
 	delete ft;
 }
 
-void LLViewerObject::loadTaskInvFile(const char* filename)
+void LLViewerObject::loadTaskInvFile(const std::string& filename)
 {
 	LLMemType mt(LLMemType::MTYPE_OBJECT);
 	
 	std::string filename_and_local_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, filename);
-	llifstream ifs(filename_and_local_path.c_str());
+	llifstream ifs(filename_and_local_path);
 	if(ifs.good())
 	{
 		char buffer[MAX_STRING];	/* Flawfinder: ignore */
@@ -2519,7 +2524,7 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
 			}
 		}
 		ifs.close();
-		LLFile::remove(filename_and_local_path.c_str());
+		LLFile::remove(filename_and_local_path);
 	}
 	else
 	{
@@ -2611,6 +2616,21 @@ void LLViewerObject::updateInventory(
 	doUpdateInventory(task_item, key, is_new);
 }
 
+void LLViewerObject::updateInventoryLocal(LLInventoryItem* item, U8 key)
+{
+	LLPointer<LLViewerInventoryItem> task_item =
+		new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+								  item->getAssetUUID(), item->getType(),
+								  item->getInventoryType(),
+								  item->getName(), item->getDescription(),
+								  item->getSaleInfo(), item->getFlags(),
+								  item->getCreationDate());
+
+	// do the internal logic
+	const bool is_new = false;
+	doUpdateInventory(task_item, key, is_new);
+}
+
 LLInventoryObject* LLViewerObject::getInventoryObject(const LLUUID& item_id)
 {
 	LLInventoryObject* rv = NULL;
@@ -2879,13 +2899,20 @@ void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */)
  		getTEImage(i)->setBoostLevel(LLViewerImage::BOOST_SELECTED);
 	}
 
+	if (isSculpted())
+	{
+		LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+		LLUUID sculpt_id = sculpt_params->getSculptTexture();
+		gImageList.getImage(sculpt_id)->setBoostLevel(LLViewerImage::BOOST_SELECTED);
+	}
+	
 	if (boost_children)
 	{
-		S32 num_children = mChildList.size();
-		for (i = 0; i < num_children; i++)
+		for (child_list_t::iterator iter = mChildList.begin();
+			 iter != mChildList.end(); iter++)
 		{
-			LLViewerObject *childp = mChildList[i];
-			childp->boostTexturePriority();
+			LLViewerObject* child = *iter;
+			child->boostTexturePriority();
 		}
 	}
 }
@@ -2970,7 +2997,7 @@ void LLViewerObject::addNVPair(const std::string& data)
 	mNameValuePairs[nv->mName] = nv;
 }
 
-BOOL LLViewerObject::removeNVPair(const char *name)
+BOOL LLViewerObject::removeNVPair(const std::string& name)
 {
 	char* canonical_name = gNVNameTable.addString(name);
 
@@ -2989,7 +3016,7 @@ BOOL LLViewerObject::removeNVPair(const char *name)
 			gMessageSystem->addUUIDFast(_PREHASH_ID, mID);
 			
 			gMessageSystem->nextBlockFast(_PREHASH_NameValueData);
-			gMessageSystem->addStringFast(_PREHASH_NVPair, buffer.c_str());
+			gMessageSystem->addStringFast(_PREHASH_NVPair, buffer);
 
 			gMessageSystem->sendReliable( mRegionp->getHost() );
 */
@@ -3007,7 +3034,7 @@ BOOL LLViewerObject::removeNVPair(const char *name)
 }
 
 
-LLNameValue *LLViewerObject::getNVPair(const char *name) const
+LLNameValue *LLViewerObject::getNVPair(const std::string& name) const
 {
 	char		*canonical_name;
 
@@ -3042,7 +3069,7 @@ void LLViewerObject::updatePositionCaches() const
 
 const LLVector3d LLViewerObject::getPositionGlobal() const
 {
-	LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());;
+	LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
 
 	if (isAttachment())
 	{
@@ -3368,6 +3395,19 @@ LLViewerObject* LLViewerObject::getRootEdit() const
 	return (LLViewerObject*)root;
 }
 
+
+BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+										  S32 face,
+										  S32* face_hit,
+										  LLVector3* intersection,
+										  LLVector2* tex_coord,
+										  LLVector3* normal,
+										  LLVector3* bi_normal)
+{
+	return false;
+}
+
+
 U8 LLViewerObject::getMediaType() const
 {
 	if (mMedia)
@@ -3394,7 +3434,7 @@ void LLViewerObject::setMediaType(U8 media_type)
 	}
 }
 
-const LLString& LLViewerObject::getMediaURL() const
+std::string LLViewerObject::getMediaURL() const
 {
 	if (mMedia)
 	{
@@ -3402,11 +3442,11 @@ const LLString& LLViewerObject::getMediaURL() const
 	}
 	else
 	{
-		return LLString::null;
+		return std::string();
 	}
 }
 
-void LLViewerObject::setMediaURL(const LLString& media_url)
+void LLViewerObject::setMediaURL(const std::string& media_url)
 {
 	LLMemType mt(LLMemType::MTYPE_OBJECT);
 	
@@ -3970,9 +4010,11 @@ S32 LLViewerObject::countInventoryContents(LLAssetType::EType type)
 void LLViewerObject::setCanSelect(BOOL canSelect)
 {
 	mbCanSelect = canSelect;
-	for (U32 i = 0; i < mChildList.size(); i++)
+	for (child_list_t::iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
 	{
-		mChildList[i]->mbCanSelect = canSelect;
+		LLViewerObject* child = *iter;
+		child->mbCanSelect = canSelect;
 	}
 }
 
@@ -4525,9 +4567,11 @@ void LLViewerObject::setDrawableState(U32 state, BOOL recursive)
 	}
 	if (recursive)
 	{
-		for (U32 i = 0; i < mChildList.size(); i++)
+		for (child_list_t::iterator iter = mChildList.begin();
+			 iter != mChildList.end(); iter++)
 		{
-			mChildList[i]->setDrawableState(state, recursive);
+			LLViewerObject* child = *iter;
+			child->setDrawableState(state, recursive);
 		}
 	}
 }
@@ -4540,9 +4584,11 @@ void LLViewerObject::clearDrawableState(U32 state, BOOL recursive)
 	}
 	if (recursive)
 	{
-		for (U32 i = 0; i < mChildList.size(); i++)
+		for (child_list_t::iterator iter = mChildList.begin();
+			 iter != mChildList.end(); iter++)
 		{
-			mChildList[i]->clearDrawableState(state, recursive);
+			LLViewerObject* child = *iter;
+			child->clearDrawableState(state, recursive);
 		}
 	}
 }
@@ -4777,7 +4823,7 @@ void LLViewerObject::setRegion(LLViewerRegion *regionp)
 	mLatestRecvPacketID = 0;
 	mRegionp = regionp;
 
-	for (child_list_t::iterator i = getChildren().begin(); i != getChildren().end(); ++i)
+	for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
 	{
 		LLViewerObject* child = *i;
 		child->setRegion(regionp);
@@ -4839,11 +4885,6 @@ BOOL LLViewerObject::setFlags(U32 flags, BOOL state)
 	return setit;
 }
 
-BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, LLVector3& end) const
-{
-	return FALSE;
-}
-
 void LLViewerObject::applyAngularVelocity(F32 dt)
 {
 	//do target omega here
@@ -4916,3 +4957,141 @@ void LLStaticViewerObject::updateDrawable(BOOL force_damped)
 	}
 	clearChanged(SHIFTED);
 }
+
+void LLViewerObject::saveUnselectedChildrenPosition(std::vector<LLVector3>& positions)
+{
+	if(mChildList.empty() || !positions.empty())
+	{
+		return ;
+	}
+
+	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+			iter != mChildList.end(); iter++)
+	{
+		LLViewerObject* childp = *iter;
+		if (!childp->isSelected() && childp->mDrawable.notNull())
+		{
+			positions.push_back(childp->getPositionEdit());		
+		}
+	}
+
+	return ;
+}
+
+void LLViewerObject::saveUnselectedChildrenRotation(std::vector<LLQuaternion>& rotations)
+{
+	if(mChildList.empty())
+	{
+		return ;
+	}
+
+	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+			iter != mChildList.end(); iter++)
+	{
+		LLViewerObject* childp = *iter;
+		if (!childp->isSelected() && childp->mDrawable.notNull())
+		{
+			rotations.push_back(childp->getRotationEdit());				
+		}		
+	}
+
+	return ;
+}
+
+//counter-rotation
+void LLViewerObject::resetChildrenRotationAndPosition(const std::vector<LLQuaternion>& rotations, 
+											const std::vector<LLVector3>& positions)
+{
+	if(mChildList.empty())
+	{
+		return ;
+	}
+
+	S32 index = 0 ;
+	LLQuaternion inv_rotation = ~getRotationEdit() ;
+	LLVector3 offset = getPositionEdit() ;
+	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+			iter != mChildList.end(); iter++)
+	{
+		LLViewerObject* childp = *iter;
+		if (!childp->isSelected() && childp->mDrawable.notNull())
+		{
+			if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
+			{
+				childp->setRotation(rotations[index] * inv_rotation);
+				childp->setPosition((positions[index] - offset) * inv_rotation);
+				LLManip::rebuild(childp);					
+			}
+			else //avatar
+			{
+				LLVector3 reset_pos = (positions[index] - offset) * inv_rotation ;
+				LLQuaternion reset_rot = rotations[index] * inv_rotation ;
+
+				((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);				
+				((LLVOAvatar*)childp)->mDrawable->mXform.setRotation(reset_rot) ;
+				
+				((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos, TRUE);				
+				((LLVOAvatar*)childp)->mDrawable->getVObj()->setRotation(reset_rot, TRUE) ;
+
+				LLManip::rebuild(childp);				
+			}	
+			index++;
+		}				
+	}
+
+	return ;
+}
+
+//counter-translation
+void LLViewerObject::resetChildrenPosition(const LLVector3& offset, BOOL simplified)
+{
+	if(mChildList.empty())
+	{
+		return ;
+	}
+
+	LLVector3 child_offset;
+	if(simplified) //translation only, rotation matrix does not change
+	{
+		child_offset = offset * ~getRotation();
+	}
+	else //rotation matrix might change too.
+	{
+		if (isAttachment() && mDrawable.notNull())
+		{
+			LLXform* attachment_point_xform = mDrawable->getXform()->getParent();
+			LLQuaternion parent_rotation = getRotation() * attachment_point_xform->getWorldRotation();
+			child_offset = offset * ~parent_rotation;
+		}
+		else
+		{
+			child_offset = offset * ~getRenderRotation();
+		}
+	}
+
+	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+			iter != mChildList.end(); iter++)
+	{
+		LLViewerObject* childp = *iter;
+		if (!childp->isSelected() && childp->mDrawable.notNull())
+		{
+			if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
+			{
+				childp->setPosition(childp->getPosition() + child_offset);
+				LLManip::rebuild(childp);
+			}
+			else //avatar
+			{
+				LLVector3 reset_pos = ((LLVOAvatar*)childp)->mDrawable->mXform.getPosition() + child_offset ;
+
+				((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);
+				((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos);				
+				
+				LLManip::rebuild(childp);
+			}			
+		}		
+	}
+
+	return ;
+}
+
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 88e2a15..06d385c 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -129,7 +129,8 @@ protected:
 	std::map<U16, ExtraParameter*> mExtraParameterList;
 
 public:
-	typedef std::vector<LLPointer<LLViewerObject> > child_list_t;
+	typedef std::list<LLPointer<LLViewerObject> > child_list_t;
+	typedef const child_list_t const_child_list_t;
 
 	LLViewerObject(const LLUUID &id, const LLPCode type, LLViewerRegion *regionp);
 	MEM_TYPE_NEW(LLMemType::MTYPE_OBJECT);
@@ -143,8 +144,8 @@ public:
 	static void cleanupVOClasses();
 
 	void			addNVPair(const std::string& data);
-	BOOL			removeNVPair(const char *name);
-	LLNameValue		*getNVPair(const char *name) const;			// null if no name value pair by that name
+	BOOL			removeNVPair(const std::string& name);
+	LLNameValue*	getNVPair(const std::string& name) const;			// null if no name value pair by that name
 
 	// Object create and update functions
 	virtual BOOL	idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
@@ -153,7 +154,7 @@ public:
 	enum { MEDIA_TYPE_NONE = 0, MEDIA_TYPE_WEB_PAGE = 1 };
 
 	// Return codes for processUpdateMessage
-	enum { MEDIA_URL_REMOVED = 0x1, MEDIA_URL_ADDED = 0x2, MEDIA_URL_UPDATED = 0x4 };
+	enum { MEDIA_URL_REMOVED = 0x1, MEDIA_URL_ADDED = 0x2, MEDIA_URL_UPDATED = 0x4, INVALID_UPDATE = 0x80000000 };
 
 	virtual U32		processUpdateMessage(LLMessageSystem *mesgsys,
 										void **user_data,
@@ -212,7 +213,8 @@ public:
 	U32 getLocalID() const							{ return mLocalID; }
 	U32 getCRC() const								{ return mTotalCRC; }
 
-	virtual BOOL isFlexible() const					{ return false; }
+	virtual BOOL isFlexible() const					{ return FALSE; }
+	virtual BOOL isSculpted() const 				{ return FALSE; }
 
 	// This method returns true if the object is over land owned by
 	// the agent.
@@ -234,7 +236,8 @@ public:
 	virtual void setParent(LLViewerObject* parent);
 	virtual void addChild(LLViewerObject *childp);
 	virtual void removeChild(LLViewerObject *childp);
-	child_list_t& getChildren();
+	const_child_list_t& getChildren() const { 	return mChildList; }
+	S32 numChildren() const { return mChildList.size(); }
 	void addThisAndAllChildren(LLDynamicArray<LLViewerObject*>& objects);
 	void addThisAndNonJointChildren(LLDynamicArray<LLViewerObject*>& objects);
 	BOOL isChild(LLViewerObject *childp) const;
@@ -242,9 +245,15 @@ public:
 	
 
 	//detect if given line segment (in agent space) intersects with this viewer object.
-	//returns TRUE if intersection detected and moves end to the point of intersection
-	//closest to start.
-	virtual BOOL lineSegmentIntersect(const LLVector3& start, LLVector3& end) const;
+	//returns TRUE if intersection detected and returns information about intersection
+	virtual BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+									  S32 face = -1,                          // which face to check, -1 = ALL_SIDES
+									  S32* face_hit = NULL,                   // which face was hit
+									  LLVector3* intersection = NULL,         // return the intersection point
+									  LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
+									  LLVector3* normal = NULL,               // return the surface normal at the intersection point
+									  LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point
+		);
 	
 	virtual const LLVector3d getPositionGlobal() const;
 	virtual const LLVector3 &getPositionRegion() const;
@@ -326,8 +335,8 @@ public:
 	U8 getMediaType() const;
 	void setMediaType(U8 media_type);
 
-	const LLString& getMediaURL() const;
-	void setMediaURL(const LLString& media_url);
+	std::string getMediaURL() const;
+	void setMediaURL(const std::string& media_url);
 
 	BOOL getMediaPassedWhitelist() const;
 	void setMediaPassedWhitelist(BOOL passed);
@@ -378,6 +387,7 @@ public:
 	// manager, so do no call updateInventory() from the selection
 	// manager until we have better iterators.
 	void updateInventory(LLViewerInventoryItem* item, U8 key, bool is_new);
+	void updateInventoryLocal(LLInventoryItem* item, U8 key); // Update without messaging.
 	LLInventoryObject* getInventoryObject(const LLUUID& item_id);
 	void getInventoryContents(InventoryObjectList& objects);
 	LLInventoryObject* getInventoryRoot();
@@ -465,6 +475,16 @@ public:
 	friend class LLViewerObjectList;
 	friend class LLViewerMediaList;
 
+public:
+	//counter-translation
+	void resetChildrenPosition(const LLVector3& offset, BOOL simplified = FALSE) ;
+	//counter-rotation
+	void resetChildrenRotationAndPosition(const std::vector<LLQuaternion>& rotations, 
+											const std::vector<LLVector3>& positions) ;
+	void saveUnselectedChildrenRotation(std::vector<LLQuaternion>& rotations) ;
+	void saveUnselectedChildrenPosition(std::vector<LLVector3>& positions) ;
+	std::vector<LLVector3> mUnselectedChildrenPositions ;
+
 private:
 	ExtraParameter* createNewParameterEntry(U16 param_type);
 	ExtraParameter* getExtraParameterEntry(U16 param_type) const;
@@ -489,7 +509,6 @@ public:
 		LL_VO_WL_SKY =				LL_PCODE_APP | 0xb0, // should this be moved to 0x40?
 	} EVOType;
 
-	child_list_t	mChildList;
 	LLUUID			mID;
 
 	// unique within region, not unique across regions
@@ -534,7 +553,7 @@ protected:
 
 	// do the update/caching logic. called by saveScript and
 	// updateInventory.
-	void doUpdateInventory(LLViewerInventoryItem* item, U8 key, bool is_new);
+	void doUpdateInventory(LLPointer<LLViewerInventoryItem>& item, U8 key, bool is_new);
 
 
 	static LLViewerObject *createObject(const LLUUID &id, LLPCode pcode, LLViewerRegion *regionp);
@@ -550,7 +569,7 @@ protected:
 	//
 
 	static void processTaskInvFile(void** user_data, S32 error_code, LLExtStat ext_status);
-	void loadTaskInvFile(const char* filename);
+	void loadTaskInvFile(const std::string& filename);
 	void doInventoryCallback();
 	
 	BOOL isOnMap();
@@ -568,6 +587,8 @@ protected:
 	typedef std::map<char *, LLNameValue *> name_value_map_t;
 	name_value_map_t mNameValuePairs;	// Any name-value pairs stored by script
 
+	child_list_t	mChildList;
+	
 	F64				mLastInterpUpdateSecs;			// Last update for purposes of interpolation
 	F64				mLastMessageUpdateSecs;			// Last update from a message from the simulator
 	TPACKETID		mLatestRecvPacketID;			// Latest time stamp on message from simulator
@@ -657,7 +678,7 @@ class LLViewerObjectMedia
 public:
 	LLViewerObjectMedia() : mMediaURL(), mPassedWhitelist(FALSE), mMediaType(0) { }
 
-	LLString mMediaURL;	// for web pages on surfaces, one per prim
+	std::string mMediaURL;	// for web pages on surfaces, one per prim
 	BOOL mPassedWhitelist;	// user has OK'd display
 	U8 mMediaType;			// see LLTextureEntry::WEB_PAGE, etc.
 };
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index bd8ed97..163b039 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -716,17 +716,17 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
 	/*
 	// Debugging code for viewing orphans, and orphaned parents
 	LLUUID id;
-	char id_str[UUID_STR_LENGTH + 20];
 	for (i = 0; i < mOrphanParents.count(); i++)
 	{
 		id = sIndexAndLocalIDToUUID[mOrphanParents[i]];
 		LLViewerObject *objectp = findObject(id);
 		if (objectp)
 		{
-			sprintf(id_str, "Par:    ");
-			objectp->mID.toString(id_str + 5);
+			std::string id_str;
+			objectp->mID.toString(id_str);
+			std::string tmpstr = std::string("Par:    ") + id_str;
 			addDebugBeacon(objectp->getPositionAgent(),
-							id_str,
+							tmpstr,
 							LLColor4(1.f,0.f,0.f,1.f),
 							LLColor4(1.f,1.f,1.f,1.f));
 		}
@@ -739,20 +739,22 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
 		LLViewerObject *objectp = findObject(oi.mChildInfo);
 		if (objectp)
 		{
+			std::string id_str;
+			objectp->mID.toString(id_str);
+			std::string tmpstr;
 			if (objectp->getParent())
 			{
-				sprintf(id_str, "ChP:     ");
+				tmpstr = std::string("ChP:    ") + id_str;
 				text_color = LLColor4(0.f, 1.f, 0.f, 1.f);
 			}
 			else
 			{
-				sprintf(id_str, "ChNoP:    ");
+				tmpstr = std::string("ChNoP:    ") + id_str;
 				text_color = LLColor4(1.f, 0.f, 0.f, 1.f);
 			}
 			id = sIndexAndLocalIDToUUID[oi.mParentInfo];
-			objectp->mID.toString(id_str + 8);
 			addDebugBeacon(objectp->getPositionAgent() + LLVector3(0.f, 0.f, -0.25f),
-							id_str,
+							tmpstr,
 							LLColor4(0.25f,0.25f,0.25f,1.f),
 							text_color);
 		}
@@ -1076,14 +1078,14 @@ void LLViewerObjectList::renderObjectBounds(const LLVector3 &center)
 {
 }
 
-
-U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parcel_wall, BOOL keep_pick_list)
+void LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent)
 {
-	gRenderForSelect = TRUE;
+	generatePickList(camera);
+	renderPickList(screen_rect, pick_parcel_wall, render_transparent);
+}
 
-	//	LLTimer pick_timer;
-	if (!keep_pick_list)
-	{
+void LLViewerObjectList::generatePickList(LLCamera &camera)
+{
 		LLViewerObject *objectp;
 		S32 i;
 		// Reset all of the GL names to zero.
@@ -1161,9 +1163,11 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
 					if (objectp)
 					{
 						mSelectPickList.insert(objectp);		
-						for (U32 i = 0; i < objectp->mChildList.size(); i++)
+						LLViewerObject::const_child_list_t& child_list = objectp->getChildren();
+						for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+							 iter != child_list.end(); iter++)
 						{
-							LLViewerObject* childp = objectp->mChildList[i];
+							LLViewerObject* childp = *iter;
 							if (childp)
 							{
 								mSelectPickList.insert(childp);
@@ -1197,11 +1201,14 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
 			}
 
 			LLHUDIcon::generatePickIDs(i * step, step);
-		
-			// At this point, we should only have live drawables/viewer objects
-			gPipeline.renderForSelect(mSelectPickList);
-		}
 	}
+}
+
+void LLViewerObjectList::renderPickList(const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent)
+{
+	gRenderForSelect = TRUE;
+		
+	gPipeline.renderForSelect(mSelectPickList, render_transparent, screen_rect);
 
 	//
 	// Render pass for selected objects
@@ -1209,8 +1216,13 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
 	gGL.color4f(1,1,1,1);	
 	gViewerWindow->renderSelections( TRUE, pick_parcel_wall, FALSE );
 
-	// render pickable ui elements, like names, etc.
-	LLHUDObject::renderAllForSelect();
+	//fix for DEV-19335.  Don't pick hud objects when customizing avatar (camera mode doesn't play nice with nametags).
+	if (!gAgent.cameraCustomizeAvatar())
+	{
+		// render pickable ui elements, like names, etc.
+		LLHUDObject::renderAllForSelect();
+	}
+	
 	gGL.flush();
 	LLVertexBuffer::unbind();
 
@@ -1218,7 +1230,6 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
 
 	//llinfos << "Rendered " << count << " for select" << llendl;
 	//llinfos << "Took " << pick_timer.getElapsedTimeF32()*1000.f << "ms to pick" << llendl;
-	return 0;
 }
 
 LLViewerObject *LLViewerObjectList::getSelectedObject(const U32 object_id)
@@ -1235,7 +1246,7 @@ LLViewerObject *LLViewerObjectList::getSelectedObject(const U32 object_id)
 }
 
 void LLViewerObjectList::addDebugBeacon(const LLVector3 &pos_agent,
-										const LLString &string,
+										const std::string &string,
 										const LLColor4 &color,
 										const LLColor4 &text_color,
 										S32 line_width)
@@ -1505,6 +1516,7 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
 ////////////////////////////////////////////////////////////////////////////
 
 LLViewerObjectList::OrphanInfo::OrphanInfo()
+	: mParentInfo(0)
 {
 }
 
@@ -1523,3 +1535,4 @@ bool LLViewerObjectList::OrphanInfo::operator!=(const OrphanInfo &rhs) const
 	return !operator==(rhs);
 }
 
+
diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h
index a8fb245..ee34381 100644
--- a/linden/indra/newview/llviewerobjectlist.h
+++ b/linden/indra/newview/llviewerobjectlist.h
@@ -95,7 +95,7 @@ public:
 	void renderObjectsForMap(LLNetMap &netmap);
 	void renderObjectBounds(const LLVector3 &center);
 
-	void addDebugBeacon(const LLVector3 &pos_agent, const LLString &string,
+	void addDebugBeacon(const LLVector3 &pos_agent, const std::string &string,
 						const LLColor4 &color=LLColor4(1.f, 0.f, 0.f, 0.5f),
 						const LLColor4 &text_color=LLColor4(1.f, 1.f, 1.f, 1.f),
 						S32 line_width = 1);
@@ -108,7 +108,10 @@ public:
 	void updateAvatarVisibility();
 
 	// Selection related stuff
-	U32 renderObjectsForSelect(LLCamera &camera, BOOL pick_parcel_wall = FALSE, BOOL keep_pick_list = FALSE);
+	void renderObjectsForSelect(LLCamera &camera, const LLRect& screen_rect, BOOL pick_parcel_wall = FALSE, BOOL render_transparent = TRUE);
+	void generatePickList(LLCamera &camera);
+	void renderPickList(const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent);
+
 	LLViewerObject *getSelectedObject(const U32 object_id);
 
 	inline S32 getNumObjects() { return mObjects.count(); }
@@ -225,7 +228,7 @@ public:
 	}
 
 	LLVector3 mPositionAgent;
-	LLString mString;
+	std::string mString;
 	LLColor4 mColor;
 	LLColor4 mTextColor;
 	S32 mLineWidth;
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index c29f277..956ed03 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -120,7 +120,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 			}
 
 			std::string mediaUrl = std::string ( parcel->getMediaURL () );
-			LLString::trim(mediaUrl);
+			LLStringUtil::trim(mediaUrl);
 
 			// has something changed?
 			if (  ( LLViewerMedia::getMediaURL() != mediaUrl )
@@ -370,7 +370,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 		{
 			// temporarily store these new values in the parcel
 			parcel->setMediaURL(media_url);
-			parcel->setMediaType(media_type.c_str());
+			parcel->setMediaType(media_type);
 			parcel->setMediaID(media_id);
 			parcel->setMediaWidth(media_width);
 			parcel->setMediaHeight(media_height);
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index b151802..a1311d3 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -83,7 +83,7 @@ LLPointer<LLViewerImage> sBlockedImage;
 LLPointer<LLViewerImage> sPassImage;
 
 // Local functions
-void optionally_start_music(const LLString& music_url);
+void optionally_start_music(const std::string& music_url);
 void callback_start_music(S32 option, void* data);
 void optionally_prepare_video(const LLParcel *parcelp);
 void callback_prepare_video(S32 option, void* data);
@@ -112,16 +112,20 @@ struct LLGodForceOwnerData
 //
 LLViewerParcelMgr::LLViewerParcelMgr()
 :	mSelected(FALSE),
+	mRequestResult(0),
 	mWestSouth(),
 	mEastNorth(),
 	mSelectedDwell(0.f),
 	mAgentParcelSequenceID(-1),
+	mHoverRequestResult(0),
 	mHoverWestSouth(),
 	mHoverEastNorth(),
 	mRenderCollision(FALSE),
 	mRenderSelection(TRUE),
 	mCollisionBanned(0),
-	mCollisionTimer()
+	mCollisionTimer(),
+	mMediaParcelId(0),
+	mMediaRegionId(0)
 {
 	mCurrentParcel = new LLParcel();
 	mCurrentParcelSelection = new LLParcelSelection(mCurrentParcel);
@@ -1207,22 +1211,21 @@ void LLViewerParcelMgr::makeLandmarkAtSelection()
 	LLVector3 west_south_bottom_region = region->getPosRegionFromGlobal( mWestSouth );
 	LLVector3 east_north_top_region = region->getPosRegionFromGlobal( mEastNorth );
 
-	LLString name("My Land");
-	char buffer[MAX_STRING];
+	std::string name("My Land");
+	std::string buffer;
 	S32 pos_x = (S32)floor((west_south_bottom_region.mV[VX] + east_north_top_region.mV[VX]) / 2.0f);
 	S32 pos_y = (S32)floor((west_south_bottom_region.mV[VY] + east_north_top_region.mV[VY]) / 2.0f);
-	sprintf(buffer, "%s in %s (%d, %d)",
+	buffer = llformat("%s in %s (%d, %d)",
 			name.c_str(),
 			region->getName().c_str(),
 			pos_x, pos_y);
 	name.assign(buffer);
 
-	const char* desc = "Claimed land";
-	create_landmark(name.c_str(), desc, global_center);
+	create_landmark(name, "Claimed land", global_center);
 }
 */
 
-const LLString& LLViewerParcelMgr::getAgentParcelName() const
+const std::string& LLViewerParcelMgr::getAgentParcelName() const
 {
 	return mAgentParcel->getName();
 }
@@ -1645,16 +1648,16 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 		{
 			if (parcel)
 			{
-				LLString music_url_raw = parcel->getMusicURL();
+				std::string music_url_raw = parcel->getMusicURL();
 
 				// Trim off whitespace from front and back
-				LLString music_url = music_url_raw;
-				LLString::trim(music_url);
+				std::string music_url = music_url_raw;
+				LLStringUtil::trim(music_url);
 
 				// On entering a new parcel, stop the last stream if the
 				// new parcel has a different music url.  (Empty URL counts
 				// as different.)
-				const char* stream_url = gAudiop->getInternetStreamURL();
+				const std::string& stream_url = gAudiop->getInternetStreamURL();
 
 				if (music_url.empty() || music_url != stream_url)
 				{
@@ -1669,10 +1672,10 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 							optionally_start_music(music_url);
 						}
 					}
-					else if (gAudiop->getInternetStreamURL()[0])
+					else if (!gAudiop->getInternetStreamURL().empty())
 					{
 						llinfos << "Stopping parcel music" << llendl;
-						gAudiop->startInternetStream(NULL);
+						gAudiop->startInternetStream(LLStringUtil::null);
 					}
 				}
 			}
@@ -1688,7 +1691,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 	};
 }
 
-void optionally_start_music(const LLString& music_url)
+void optionally_start_music(const std::string& music_url)
 {
 	if (gSavedSettings.getBOOL("AudioStreamingMusic"))
 	{
@@ -1699,7 +1702,7 @@ void optionally_start_music(const LLString& music_url)
 		// changed as part of SL-4878
 		if ( gOverlayBar && gOverlayBar->musicPlaying())
 		{
-			gAudiop->startInternetStream(music_url.c_str());
+			gAudiop->startInternetStream(music_url);
 		}
 	}
 }
@@ -1905,7 +1908,7 @@ void LLViewerParcelMgr::deedLandToGroup()
 {
 	std::string group_name;
 	gCacheName->getGroupName(mCurrentParcel->getGroupID(), group_name);
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[AREA]"] = llformat("%d", mCurrentParcel->getArea());
 	args["[GROUP_NAME]"] = group_name;
 	if(mCurrentParcel->getContributeWithDeed())
@@ -1976,7 +1979,7 @@ void LLViewerParcelMgr::startReleaseLand()
 	if ((region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
 		&& !gAgent.isGodlike())
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[REGION]"] = region->getName();
 		gViewerWindow->alertXml("CannotReleaseLandNoTransfer", args);
 		return;
@@ -1990,7 +1993,7 @@ void LLViewerParcelMgr::startReleaseLand()
 	}
 
 	// Compute claim price
-	LLStringBase<char>::format_map_t args;
+	LLStringUtil::format_map_t args;
 	args["[AREA]"] = llformat("%d",mCurrentParcel->getArea());
 	gViewerWindow->alertXml("ReleaseLandWarning", args,
 				releaseAlertCB, this);
@@ -2189,7 +2192,7 @@ void LLViewerParcelMgr::startDeedLandToGroup()
 		if((region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
 			&& (mCurrentParcel->getOwnerID() != region->getOwner()))
 		{
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[REGION]"] = region->getName();
 			gViewerWindow->alertXml("CannotDeedLandNoTransfer", args);
 			return;
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index 319bbc6..dfd0bb1 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -237,7 +237,7 @@ public:
 	void sendParcelRelease();
 
 	// accessors for mAgentParcel
-	const LLString& getAgentParcelName() const;
+	const std::string& getAgentParcelName() const;
 
 	// Create a landmark at the "appropriate" location for the
 	// currently selected parcel.
diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index 1788a7c..d27e0df 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -44,6 +44,7 @@
 #include "llworld.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
+#include "llvovolume.h"
 
 const F32 PART_SIM_BOX_SIDE = 16.f;
 const F32 PART_SIM_BOX_OFFSET = 0.5f*PART_SIM_BOX_SIDE;
@@ -169,6 +170,10 @@ LLViewerPartGroup::~LLViewerPartGroup()
 	cleanup();
 	
 	S32 count = (S32) mParticles.size();
+	for(S32 i = 0 ; i < count ; i++)
+	{
+		delete mParticles[i] ;
+	}
 	mParticles.clear();
 	
 	LLViewerPartSim::decPartCount(count);
@@ -240,151 +245,150 @@ BOOL LLViewerPartGroup::addPart(LLViewerPart* part, F32 desired_size)
 void LLViewerPartGroup::updateParticles(const F32 lastdt)
 {
 	LLMemType mt(LLMemType::MTYPE_PARTICLES);
-	S32 i;
 	F32 dt;
 	
 	LLVector3 gravity(0.f, 0.f, GRAVITY);
 
 	LLViewerRegion *regionp = getRegion();
 	S32 end = (S32) mParticles.size();
-	for (i = 0; i < end; i++)
+	for (S32 i = 0 ; i < (S32)mParticles.size();)
 	{
 		LLVector3 a(0.f, 0.f, 0.f);
-		LLViewerPart& part = *((LLViewerPart*) mParticles[i]);
+		LLViewerPart* part = mParticles[i] ;
 
-		dt=lastdt+mSkippedTime-part.mSkipOffset;
-		part.mSkipOffset=0.f;
+		dt = lastdt + mSkippedTime - part->mSkipOffset;
+		part->mSkipOffset = 0.f;
 
 		// Update current time
-		const F32 cur_time = part.mLastUpdateTime + dt;
-		const F32 frac = cur_time/part.mMaxAge;
+		const F32 cur_time = part->mLastUpdateTime + dt;
+		const F32 frac = cur_time / part->mMaxAge;
 
 		// "Drift" the object based on the source object
-		if (part.mFlags & LLPartData::LL_PART_FOLLOW_SRC_MASK)
+		if (part->mFlags & LLPartData::LL_PART_FOLLOW_SRC_MASK)
 		{
-			part.mPosAgent = part.mPartSourcep->mPosAgent;
-			part.mPosAgent += part.mPosOffset;
+			part->mPosAgent = part->mPartSourcep->mPosAgent;
+			part->mPosAgent += part->mPosOffset;
 		}
 
 		// Do a custom callback if we have one...
-		if (part.mVPCallback)
+		if (part->mVPCallback)
 		{
-			(*part.mVPCallback)(part, dt);
+			(*part->mVPCallback)(*part, dt);
 		}
 
-		if (part.mFlags & LLPartData::LL_PART_WIND_MASK)
+		if (part->mFlags & LLPartData::LL_PART_WIND_MASK)
 		{
-			LLVector3 tempVel(part.mVelocity);
-			part.mVelocity *= 1.f - 0.1f*dt;
-			part.mVelocity += 0.1f*dt*regionp->mWind.getVelocity(regionp->getPosRegionFromAgent(part.mPosAgent));
+			LLVector3 tempVel(part->mVelocity);
+			part->mVelocity *= 1.f - 0.1f*dt;
+			part->mVelocity += 0.1f*dt*regionp->mWind.getVelocity(regionp->getPosRegionFromAgent(part->mPosAgent));
 		}
 
 		// Now do interpolation towards a target
-		if (part.mFlags & LLPartData::LL_PART_TARGET_POS_MASK)
+		if (part->mFlags & LLPartData::LL_PART_TARGET_POS_MASK)
 		{
-			F32 remaining = part.mMaxAge - part.mLastUpdateTime;
+			F32 remaining = part->mMaxAge - part->mLastUpdateTime;
 			F32 step = dt / remaining;
 
 			step = llclamp(step, 0.f, 0.1f);
 			step *= 5.f;
 			// we want a velocity that will result in reaching the target in the 
 			// Interpolate towards the target.
-			LLVector3 delta_pos = part.mPartSourcep->mTargetPosAgent - part.mPosAgent;
+			LLVector3 delta_pos = part->mPartSourcep->mTargetPosAgent - part->mPosAgent;
 
 			delta_pos /= remaining;
 
-			part.mVelocity *= (1.f - step);
-			part.mVelocity += step*delta_pos;
+			part->mVelocity *= (1.f - step);
+			part->mVelocity += step*delta_pos;
 		}
 
 
-		if (part.mFlags & LLPartData::LL_PART_TARGET_LINEAR_MASK)
+		if (part->mFlags & LLPartData::LL_PART_TARGET_LINEAR_MASK)
 		{
-			LLVector3 delta_pos = part.mPartSourcep->mTargetPosAgent - part.mPartSourcep->mPosAgent;			
-			part.mPosAgent = part.mPartSourcep->mPosAgent;
-			part.mPosAgent += frac*delta_pos;
-			part.mVelocity = delta_pos;
+			LLVector3 delta_pos = part->mPartSourcep->mTargetPosAgent - part->mPartSourcep->mPosAgent;			
+			part->mPosAgent = part->mPartSourcep->mPosAgent;
+			part->mPosAgent += frac*delta_pos;
+			part->mVelocity = delta_pos;
 		}
 		else
 		{
 			// Do velocity interpolation
-			part.mPosAgent += dt*part.mVelocity;
-			part.mPosAgent += 0.5f*dt*dt*part.mAccel;
-			part.mVelocity += part.mAccel*dt;
+			part->mPosAgent += dt*part->mVelocity;
+			part->mPosAgent += 0.5f*dt*dt*part->mAccel;
+			part->mVelocity += part->mAccel*dt;
 		}
 
 		// Do a bounce test
-		if (part.mFlags & LLPartData::LL_PART_BOUNCE_MASK)
+		if (part->mFlags & LLPartData::LL_PART_BOUNCE_MASK)
 		{
 			// Need to do point vs. plane check...
 			// For now, just check relative to object height...
-			F32 dz = part.mPosAgent.mV[VZ] - part.mPartSourcep->mPosAgent.mV[VZ];
+			F32 dz = part->mPosAgent.mV[VZ] - part->mPartSourcep->mPosAgent.mV[VZ];
 			if (dz < 0)
 			{
-				part.mPosAgent.mV[VZ] += -2.f*dz;
-				part.mVelocity.mV[VZ] *= -0.75f;
+				part->mPosAgent.mV[VZ] += -2.f*dz;
+				part->mVelocity.mV[VZ] *= -0.75f;
 			}
 		}
 
 
 		// Reset the offset from the source position
-		if (part.mFlags & LLPartData::LL_PART_FOLLOW_SRC_MASK)
+		if (part->mFlags & LLPartData::LL_PART_FOLLOW_SRC_MASK)
 		{
-			part.mPosOffset = part.mPosAgent;
-			part.mPosOffset -= part.mPartSourcep->mPosAgent;
+			part->mPosOffset = part->mPosAgent;
+			part->mPosOffset -= part->mPartSourcep->mPosAgent;
 		}
 
 		// Do color interpolation
-		if (part.mFlags & LLPartData::LL_PART_INTERP_COLOR_MASK)
+		if (part->mFlags & LLPartData::LL_PART_INTERP_COLOR_MASK)
 		{
-			part.mColor.setVec(part.mStartColor);
+			part->mColor.setVec(part->mStartColor);
 			// note: LLColor4's v%k means multiply-alpha-only,
 			//       LLColor4's v*k means multiply-rgb-only
-			part.mColor *= 1.f - frac; // rgb*k
-			part.mColor %= 1.f - frac; // alpha*k
-			part.mColor += frac%(frac*part.mEndColor); // rgb,alpha
+			part->mColor *= 1.f - frac; // rgb*k
+			part->mColor %= 1.f - frac; // alpha*k
+			part->mColor += frac%(frac*part->mEndColor); // rgb,alpha
 		}
 
 		// Do scale interpolation
-		if (part.mFlags & LLPartData::LL_PART_INTERP_SCALE_MASK)
+		if (part->mFlags & LLPartData::LL_PART_INTERP_SCALE_MASK)
 		{
-			part.mScale.setVec(part.mStartScale);
-			part.mScale *= 1.f - frac;
-			part.mScale += frac*part.mEndScale;
+			part->mScale.setVec(part->mStartScale);
+			part->mScale *= 1.f - frac;
+			part->mScale += frac*part->mEndScale;
 		}
 
 		// Set the last update time to now.
-		part.mLastUpdateTime = cur_time;
+		part->mLastUpdateTime = cur_time;
 
 
 		// Kill dead particles (either flagged dead, or too old)
-		if ((part.mLastUpdateTime > part.mMaxAge) || (LLViewerPart::LL_PART_DEAD_MASK == part.mFlags))
+		if ((part->mLastUpdateTime > part->mMaxAge) || (LLViewerPart::LL_PART_DEAD_MASK == part->mFlags))
 		{
-			end--;
-			LLPointer<LLViewerPart>::swap(mParticles[i], mParticles[end]);
-			// be sure to process the particle we just swapped-in
-			i--;
+			mParticles[i] = mParticles.back() ;
+			mParticles.pop_back() ;
+			delete part ;
 		}
 		else 
 		{
-			F32 desired_size = calc_desired_size(part.mPosAgent, part.mScale);
-			if (!posInGroup(part.mPosAgent, desired_size))
+			F32 desired_size = calc_desired_size(part->mPosAgent, part->mScale);
+			if (!posInGroup(part->mPosAgent, desired_size))
 			{
 				// Transfer particles between groups
-				LLViewerPartSim::getInstance()->put(&part);
-				end--;
-				LLPointer<LLViewerPart>::swap(mParticles[i], mParticles[end]);
-				// be sure to process the particle we just swapped-in
-				i--;
+				LLViewerPartSim::getInstance()->put(part) ;
+				mParticles[i] = mParticles.back() ;
+				mParticles.pop_back() ;
+			}
+			else
+			{
+				i++ ;
 			}
 		}
 	}
 
-	S32 removed = (S32)mParticles.size() - end;
+	S32 removed = end - (S32)mParticles.size();
 	if (removed > 0)
 	{
 		// we removed one or more particles, so flag this group for update
-		mParticles.erase(mParticles.begin() + end, mParticles.end());
 		if (mVOPartGroupp.notNull())
 		{
 			gPipeline.markRebuild(mVOPartGroupp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
@@ -408,9 +412,7 @@ void LLViewerPartGroup::shift(const LLVector3 &offset)
 	mMinObjPos += offset;
 	mMaxObjPos += offset;
 
-	S32 count = (S32) mParticles.size();
-	S32 i;
-	for (i = 0; i < count; i++)
+	for (S32 i = 0 ; i < (S32)mParticles.size(); i++)
 	{
 		mParticles[i]->mPosAgent += offset;
 	}
@@ -419,8 +421,8 @@ void LLViewerPartGroup::shift(const LLVector3 &offset)
 void LLViewerPartGroup::removeParticlesByID(const U32 source_id)
 {
 	LLMemType mt(LLMemType::MTYPE_PARTICLES);
-	S32 end = (S32) mParticles.size();
-	for (int i = 0; i < end; i++)
+
+	for (S32 i = 0; i < (S32)mParticles.size(); i++)
 	{
 		if(mParticles[i]->mPartSourcep->getID() == source_id)
 		{
@@ -500,42 +502,57 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part)
 {
 	LLMemType mt(LLMemType::MTYPE_PARTICLES);
 	const F32 MAX_MAG = 1000000.f*1000000.f; // 1 million
+	LLViewerPartGroup *return_group = NULL ;
 	if (part->mPosAgent.magVecSquared() > MAX_MAG || !part->mPosAgent.isFinite())
 	{
 #if 0 && !LL_RELEASE_FOR_DOWNLOAD
 		llwarns << "LLViewerPartSim::put Part out of range!" << llendl;
 		llwarns << part->mPosAgent << llendl;
 #endif
-		return NULL;
 	}
-	
-	F32 desired_size = calc_desired_size(part->mPosAgent, part->mScale);
+	else
+	{	
+		F32 desired_size = calc_desired_size(part->mPosAgent, part->mScale);
 
-	S32 count = (S32) mViewerPartGroups.size();
-	for (S32 i = 0; i < count; i++)
-	{
-		if (mViewerPartGroups[i]->addPart(part, desired_size))
+		S32 count = (S32) mViewerPartGroups.size();
+		for (S32 i = 0; i < count; i++)
 		{
-			// We found a spatial group that we fit into, add us and exit
-			return mViewerPartGroups[i];
+			if (mViewerPartGroups[i]->addPart(part, desired_size))
+			{
+				// We found a spatial group that we fit into, add us and exit
+				return_group = mViewerPartGroups[i];
+				break ;
+			}
+		}
+
+		// Hmm, we didn't fit in any of the existing spatial groups
+		// Create a new one...
+		if(!return_group)
+		{
+			llassert_always(part->mPosAgent.isFinite());
+			LLViewerPartGroup *groupp = createViewerPartGroup(part->mPosAgent, desired_size);
+			groupp->mUniformParticles = (part->mScale.mV[0] == part->mScale.mV[1] && 
+									!(part->mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK));
+			if (!groupp->addPart(part))
+			{
+				llwarns << "LLViewerPartSim::put - Particle didn't go into its box!" << llendl;
+				llinfos << groupp->getCenterAgent() << llendl;
+				llinfos << part->mPosAgent << llendl;
+				mViewerPartGroups.pop_back() ;
+				delete groupp;
+				groupp = NULL ;
+			}
+			return_group = groupp;
 		}
 	}
 
-	// Hmm, we didn't fit in any of the existing spatial groups
-	// Create a new one...
-	llassert_always(part->mPosAgent.isFinite());
-	LLViewerPartGroup *groupp = createViewerPartGroup(part->mPosAgent, desired_size);
-	groupp->mUniformParticles = (part->mScale.mV[0] == part->mScale.mV[1] && 
-							!(part->mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK));
-	if (!groupp->addPart(part))
+	if(!return_group) //failed to insert the particle
 	{
-		llwarns << "LLViewerPartSim::put - Particle didn't go into its box!" << llendl;
-		llinfos << groupp->getCenterAgent() << llendl;
-		llinfos << part->mPosAgent << llendl;
-		delete groupp;
-		return NULL;
+		delete part ;
+		part = NULL ;
 	}
-	return groupp;
+
+	return return_group ;
 }
 
 LLViewerPartGroup *LLViewerPartSim::createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size)
@@ -614,7 +631,24 @@ void LLViewerPartSim::updateSimulation()
 
 		if (!mViewerPartSources[i]->isDead())
 		{
-			mViewerPartSources[i]->update(dt);
+			BOOL upd = TRUE;
+			if (!LLPipeline::sRenderAttachedParticles)
+			{
+				LLViewerObject* vobj = mViewerPartSources[i]->mSourceObjectp;
+				if (vobj && (vobj->getPCode() == LL_PCODE_VOLUME))
+				{
+					LLVOVolume* vvo = (LLVOVolume *)vobj;
+					if (vvo && vvo->isAttachment())
+					{
+						upd = FALSE;
+					}
+				}
+			}
+
+			if (upd) 
+			{
+				mViewerPartSources[i]->update(dt);
+			}
 		}
 
 		if (mViewerPartSources[i]->isDead())
@@ -630,7 +664,6 @@ void LLViewerPartSim::updateSimulation()
 		num_updates++;
 	}
 
-
 	count = (S32) mViewerPartGroups.size();
 	for (i = 0; i < count; i++)
 	{
diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h
index cea7024..0f51240 100644
--- a/linden/indra/newview/llviewerpartsim.h
+++ b/linden/indra/newview/llviewerpartsim.h
@@ -52,9 +52,9 @@ typedef void (*LLVPCallback)(LLViewerPart &part, const F32 dt);
 //
 
 
-class LLViewerPart : public LLPartData, public LLRefCount
+class LLViewerPart : public LLPartData
 {
-protected:
+public:
 	~LLViewerPart();
 public:
 	LLViewerPart();
@@ -100,7 +100,7 @@ public:
 
 	void shift(const LLVector3 &offset);
 
-	typedef std::vector<LLPointer<LLViewerPart> > part_list_t;
+	typedef std::vector<LLViewerPart*>  part_list_t;
 	part_list_t mParticles;
 
 	const LLVector3 &getCenterAgent() const		{ return mCenterAgent; }
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp
index 6c0596a..dcef8c2 100644
--- a/linden/indra/newview/llviewerpartsource.cpp
+++ b/linden/indra/newview/llviewerpartsource.cpp
@@ -278,7 +278,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
 				continue;
 			}
 
-			LLPointer<LLViewerPart> part = new LLViewerPart();
+			LLViewerPart* part = new LLViewerPart();
 
 			part->init(this, mImagep, NULL);
 			part->mFlags = mPartSysData.mPartData.mFlags;
@@ -569,7 +569,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
 		{
 			mPosAgent = mSourceObjectp->getRenderPosition();
 		}
-		LLPointer<LLViewerPart> part = new LLViewerPart();
+		LLViewerPart* part = new LLViewerPart();
 		part->init(this, mImagep, updatePart);
 		part->mStartColor = mColor;
 		part->mEndColor = mColor;
@@ -717,7 +717,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)
 			mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
 		}
 
-		LLPointer<LLViewerPart> part = new LLViewerPart();
+		LLViewerPart* part = new LLViewerPart();
 		part->init(this, mImagep, NULL);
 
 		part->mFlags = LLPartData::LL_PART_INTERP_COLOR_MASK |
@@ -834,7 +834,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
 		{
 			mPosAgent = mSourceObjectp->getRenderPosition();
 		}
-		LLPointer<LLViewerPart> part = new LLViewerPart();
+		LLViewerPart* part = new LLViewerPart();
 		part->init(this, mImagep, updatePart);
 		part->mStartColor = mColor;
 		part->mEndColor = mColor;
diff --git a/linden/indra/newview/llviewerprecompiledheaders.h b/linden/indra/newview/llviewerprecompiledheaders.h
index 711f8e7..6779d84 100644
--- a/linden/indra/newview/llviewerprecompiledheaders.h
+++ b/linden/indra/newview/llviewerprecompiledheaders.h
@@ -116,6 +116,7 @@
 //#include "llblockdata.h"
 #include "llimage.h"
 #include "llimagebmp.h"
+#include "llimagepng.h"
 #include "llimagej2c.h"
 #include "llimagejpeg.h"
 #include "llimagetga.h"
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index f745aca..08dc979 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -50,7 +50,6 @@
 #include "lldir.h"
 #include "lleventpoll.h"
 #include "llfloatergodtools.h"
-#include "llfloaterreleasemsg.h"
 #include "llfloaterreporter.h"
 #include "llfloaterregioninfo.h"
 #include "llhttpnode.h"
@@ -108,7 +107,7 @@ public:
 
     void result(const LLSD& content)
     {
-		if(!mRegion || this != mRegion->getHttpResponderPtr())//region is removed or responder is not created.
+		if(!mRegion || LLHTTPClient::ResponderPtr(this) != mRegion->getHttpResponderPtr()) //region is removed or responder is not created.
 		{
 			return ;
 		}
@@ -121,10 +120,9 @@ public:
 				<< iter->first << LL_ENDL;
 
 			/* HACK we're waiting for the ServerReleaseNotes */
-			if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage))
+			if (iter->first == "ServerReleaseNotes" && mRegion->getReleaseNotesRequested())
 			{
-				LLFloaterReleaseMsg::show();
-				LLFloaterReleaseMsg::sDisplayMessage = false;
+				mRegion->showReleaseNotes();
 			}
 		}
 		
@@ -163,11 +161,12 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	mRegionFlags( REGION_FLAGS_DEFAULT ),
 	mSimAccess( SIM_ACCESS_MIN ),
 	mBillableFactor(1.0),
-	mMaxTasks(MAX_TASKS_PER_REGION),
+	mMaxTasks(DEFAULT_MAX_REGION_WIDE_PRIM_COUNT),
 	mCacheLoaded(FALSE),
 	mCacheEntriesCount(0),
 	mCacheID(),
-	mEventPoll(NULL)
+	mEventPoll(NULL),
+	mReleaseNotesRequested(FALSE)
 {
 	mWidth = region_width_meters;
 	mOriginGlobal = from_region_handle(handle); 
@@ -233,7 +232,7 @@ void LLViewerRegion::initStats()
 	mPacketsLost = 0;
 	mLastPacketsLost = 0;
 	mPingDelay = 0;
-	mAlive = FALSE;					// can become false if circuit disconnects
+	mAlive = false;					// can become false if circuit disconnects
 }
 
 LLViewerRegion::~LLViewerRegion() 
@@ -276,12 +275,9 @@ void LLViewerRegion::loadCache()
 
 	LLVOCacheEntry *entry;
 
-	char filename[256];		/* Flawfinder: ignore */
-	snprintf(filename, sizeof(filename), "%s%sobjects_%d_%d.slc", 		/* Flawfinder: ignore */
-		gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(), 
-		gDirUtilp->getDirDelimiter().c_str(),
-		U32(mHandle>>32)/REGION_WIDTH_UNITS, 
-		U32(mHandle)/REGION_WIDTH_UNITS );
+	std::string filename;
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() +
+		llformat("objects_%d_%d.slc",U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS );
 
 	LLFILE* fp = LLFile::fopen(filename, "rb");		/* Flawfinder: ignore */
 	if (!fp)
@@ -365,12 +361,9 @@ void LLViewerRegion::saveCache()
 		return;
 	}
 
-	char filename[256];		/* Flawfinder: ignore */
-	snprintf(filename, sizeof(filename), "%s%sobjects_%d_%d.slc", 		/* Flawfinder: ignore */
-		gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(), 
-		gDirUtilp->getDirDelimiter().c_str(),
-		U32(mHandle>>32)/REGION_WIDTH_UNITS, 
-		U32(mHandle)/REGION_WIDTH_UNITS );
+	std::string filename;
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() +
+		llformat("sobjects_%d_%d.slc", U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS );
 
 	LLFILE* fp = LLFile::fopen(filename, "wb");		/* Flawfinder: ignore */
 	if (!fp)
@@ -495,9 +488,8 @@ LLVector3 LLViewerRegion::getCenterAgent() const
 	return gAgent.getPosAgentFromGlobal(mCenterGlobal);
 }
 
-void LLViewerRegion::setRegionNameAndZone(const char* name_and_zone)
+void LLViewerRegion::setRegionNameAndZone	(const std::string& name_zone)
 {
-	LLString name_zone(name_and_zone);
 	std::string::size_type pipe_pos = name_zone.find('|');
 	S32 length   = name_zone.size();
 	if (pipe_pos != std::string::npos)
@@ -511,8 +503,8 @@ void LLViewerRegion::setRegionNameAndZone(const char* name_and_zone)
 		mZoning = "";
 	}
 
-	LLString::stripNonprintable(mName);
-	LLString::stripNonprintable(mZoning);
+	LLStringUtil::stripNonprintable(mName);
+	LLStringUtil::stripNonprintable(mZoning);
 }
 
 BOOL LLViewerRegion::canManageEstate() const
@@ -522,7 +514,7 @@ BOOL LLViewerRegion::canManageEstate() const
 		|| gAgent.getID() == getOwner();
 }
 
-const char* LLViewerRegion::getSimAccessString() const
+const std::string LLViewerRegion::getSimAccessString() const
 {
 	return accessToString(mSimAccess);
 }
@@ -547,16 +539,16 @@ std::string LLViewerRegion::regionFlagsToString(U32 flags)
 }
 
 // *TODO:Translate
-char* SIM_ACCESS_STR[] = { "Free Trial",
+const char* SIM_ACCESS_STR[] = { "Free Trial",
 						   "PG",
 						   "Mature",
 						   "Offline",
 						   "Unknown" };
 							
 // static
-const char* LLViewerRegion::accessToString(U8 access)		/* Flawfinder: ignore */
+std::string LLViewerRegion::accessToString(U8 sim_access)
 {
-	switch(access)		/* Flawfinder: ignore */
+	switch(sim_access)
 	{
 	case SIM_ACCESS_TRIAL:
 		return SIM_ACCESS_STR[0];
@@ -577,28 +569,28 @@ const char* LLViewerRegion::accessToString(U8 access)		/* Flawfinder: ignore */
 }
 
 // static
-U8 LLViewerRegion::stringToAccess(const char* access_str)
+U8 LLViewerRegion::stringToAccess(const std::string& access_str)
 {
-	U8 access = SIM_ACCESS_MIN;
-	if (0 == strcmp(access_str, SIM_ACCESS_STR[0]))
+	U8 sim_access = SIM_ACCESS_MIN;
+	if (access_str == SIM_ACCESS_STR[0])
 	{
-		access = SIM_ACCESS_TRIAL;
+		sim_access = SIM_ACCESS_TRIAL;
 	}
-	else if (0 == strcmp(access_str, SIM_ACCESS_STR[1]))
+	else if (access_str == SIM_ACCESS_STR[1])
 	{
-		access = SIM_ACCESS_PG;
+		sim_access = SIM_ACCESS_PG;
 	}
-	else if (0 == strcmp(access_str, SIM_ACCESS_STR[2]))
+	else if (access_str == SIM_ACCESS_STR[2])
 	{
-		access = SIM_ACCESS_MATURE;
+		sim_access = SIM_ACCESS_MATURE;
 	}
-	return access;		/* Flawfinder: ignore */
+	return sim_access;
 }
 
 // static
-const char* LLViewerRegion::accessToShortString(U8 access)		/* Flawfinder: ignore */
+std::string LLViewerRegion::accessToShortString(U8 sim_access)
 {
-	switch(access)		/* Flawfinder: ignore */
+	switch(sim_access)		/* Flawfinder: ignore */
 	{
 	case SIM_ACCESS_PG:
 		return "PG";
@@ -815,11 +807,11 @@ void LLViewerRegion::updateNetStats()
 	LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mHost);
 	if (!cdp)
 	{
-		mAlive = FALSE;
+		mAlive = false;
 		return;
 	}
 
-	mAlive = TRUE;
+	mAlive = true;
 	mDeltaTime = dt;
 
 	mLastPacketsIn =	mPacketsIn;
@@ -907,6 +899,11 @@ F32 LLViewerRegion::getLandHeightRegion(const LLVector3& region_pos)
 	return mLandp->resolveHeightRegion( region_pos );
 }
 
+bool LLViewerRegion::isAlive()
+{
+	return mAlive;
+}
+
 BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
 {
 	if (mParcelOverlay)
@@ -1277,10 +1274,9 @@ void LLViewerRegion::unpackRegionHandshake()
 {
 	LLMessageSystem *msg = gMessageSystem;
 
-	const S32 SIM_NAME_BUF = 256;
 	U32 region_flags;
 	U8 sim_access;
-	char sim_name[SIM_NAME_BUF];		/* Flawfinder: ignore */
+	std::string sim_name;
 	LLUUID sim_owner;
 	BOOL is_estate_manager;
 	F32 water_height;
@@ -1289,7 +1285,7 @@ void LLViewerRegion::unpackRegionHandshake()
 
 	msg->getU32		("RegionInfo", "RegionFlags", region_flags);
 	msg->getU8		("RegionInfo", "SimAccess", sim_access);
-	msg->getString	("RegionInfo", "SimName", SIM_NAME_BUF, sim_name);
+	msg->getString	("RegionInfo", "SimName", sim_name);
 	msg->getUUID	("RegionInfo", "SimOwner", sim_owner);
 	msg->getBOOL	("RegionInfo", "IsEstateManager", is_estate_manager);
 	msg->getF32		("RegionInfo", "WaterHeight", water_height);
@@ -1408,12 +1404,13 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("SendUserReportWithScreenshot");
 	capabilityNames.append("ServerReleaseNotes");
 	capabilityNames.append("StartGroupProposal");
+	capabilityNames.append("UpdateAgentLanguage");
 	capabilityNames.append("UpdateGestureAgentInventory");
 	capabilityNames.append("UpdateNotecardAgentInventory");
-	capabilityNames.append("UpdateScriptAgentInventory");
+	capabilityNames.append("UpdateScriptAgent");
 	capabilityNames.append("UpdateGestureTaskInventory");
 	capabilityNames.append("UpdateNotecardTaskInventory");
-	capabilityNames.append("UpdateScriptTaskInventory");
+	capabilityNames.append("UpdateScriptTask");
 	capabilityNames.append("ViewerStartAuction");
 	capabilityNames.append("UntrustedSimulatorMessage");
 	capabilityNames.append("ViewerStats");
@@ -1444,6 +1441,11 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u
 	}
 }
 
+bool LLViewerRegion::isSpecialCapabilityName(const std::string &name)
+{
+	return name == "EventQueueGet" || name == "UntrustedSimulatorMessage";
+}
+
 std::string LLViewerRegion::getCapability(const std::string& name) const
 {
 	CapabilityMap::const_iterator iter = mCapabilities.find(name);
@@ -1477,3 +1479,17 @@ LLSpatialPartition* LLViewerRegion::getSpatialPartition(U32 type)
 	return NULL;
 }
 
+void LLViewerRegion::showReleaseNotes()
+{
+	std::string url = this->getCapability("ServerReleaseNotes");
+
+	if (url.empty()) {
+		// HACK haven't received the capability yet, we'll wait until
+		// it arives.
+		mReleaseNotesRequested = TRUE;
+		return;
+	}
+
+	LLWeb::loadURL(url);
+	mReleaseNotesRequested = FALSE;
+}
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h
index c2d11f5..d65ad23 100644
--- a/linden/indra/newview/llviewerregion.h
+++ b/linden/indra/newview/llviewerregion.h
@@ -47,6 +47,7 @@
 #include "lluuid.h"
 #include "lldatapacker.h"
 #include "llvocache.h"
+#include "llweb.h"
 
 // Surface id's
 #define LAND  1
@@ -122,6 +123,9 @@ public:
 	inline BOOL isPrelude()					const;
 	inline BOOL getAllowTerraform() 		const;
 	inline BOOL getRestrictPushObject()		const;
+	inline BOOL getReleaseNotesRequested()		const;
+
+	bool isAlive(); // can become false if circuit disconnects
 
 	void setWaterHeight(F32 water_level);
 	F32 getWaterHeight() const;
@@ -161,9 +165,9 @@ public:
 	const LLVector3d &getCenterGlobal() const	{ return mCenterGlobal; }
 	LLVector3 getCenterAgent() const;
 
-	void setRegionNameAndZone(const char* name_and_zone);
-	const LLString& getName() const				{ return mName; }
-	const LLString& getZoning() const			{ return mZoning; }
+	void setRegionNameAndZone(const std::string& name_and_zone);
+	const std::string& getName() const				{ return mName; }
+	const std::string& getZoning() const			{ return mZoning; }
 
 	void setOwner(const LLUUID& owner_id) { mOwnerID = owner_id; }
 	const LLUUID& getOwner() const { return mOwnerID; }
@@ -175,18 +179,18 @@ public:
 
 	void setSimAccess(U8 sim_access)			{ mSimAccess = sim_access; }
 	U8 getSimAccess() const						{ return mSimAccess; }
-	const char* getSimAccessString() const;
+	const std::string getSimAccessString() const;
 
 	// Returns "Sandbox", "Expensive", etc.
 	static std::string regionFlagsToString(U32 flags);
 
 	// Returns "Mature", "PG", etc.
-	static const char* accessToString(U8 access);
+	static std::string accessToString(U8 sim_access);
 
-	static U8 stringToAccess(const char* access_str);
+	static U8 stringToAccess(const std::string& access_str);
 
 	// Returns "M", "PG", etc.
-	static const char* accessToShortString(U8 access);		/* Flawfinder: ignore */
+	static std::string accessToShortString(U8 sim_access);
 
 	// helper function which just makes sure all interested parties
 	// can process the message.
@@ -215,6 +219,7 @@ public:
 	void setSeedCapability(const std::string& url);
 	void setCapability(const std::string& name, const std::string& url);
 	std::string getCapability(const std::string& name) const;
+	static bool isSpecialCapabilityName(const std::string &name);
 	void logActiveCapabilities() const;
 
 	const LLHost	&getHost() const			{ return mHost; }
@@ -274,7 +279,9 @@ public:
 			return lhs->mCameraDistanceSquared < rhs->mCameraDistanceSquared; 
 		}
 	};
-	
+
+	void showReleaseNotes();
+
 protected:
 	void disconnectAllNeighbors();
 	void initStats();
@@ -285,8 +292,6 @@ public:
 	LLCloudLayer mCloudLayer;
 	LLViewerParcelOverlay	*mParcelOverlay;
 
-	BOOL	mAlive;					// can become false if circuit disconnects
-
 	LLStat	mBitStat;
 	LLStat	mPacketsStat;
 	LLStat	mPacketsLostStat;
@@ -301,7 +306,7 @@ public:
 	LLDynamicArray<U32> mMapAvatars;
 	LLDynamicArray<LLUUID> mMapAvatarIDs;
 
-protected:
+private:
 	// The surfaces and other layers
 	LLSurface*	mLandp;
 
@@ -319,8 +324,8 @@ protected:
 	F32			mTimeDilation;	// time dilation of physics simulation on simulator
 
 	// simulator name
-	LLString mName;
-	LLString mZoning;
+	std::string mName;
+	std::string mZoning;
 
 	// region/estate owner - usually null.
 	LLUUID mOwnerID;
@@ -374,10 +379,14 @@ protected:
 	LLEventPoll* mEventPoll;
 
 private:
+	bool	mAlive;					// can become false if circuit disconnects
+
 	//spatial partitions for objects in this region
 	std::vector<LLSpatialPartition*> mObjectPartition;
 
 	LLHTTPClient::ResponderPtr  mHttpResponderPtr ;
+
+	BOOL mReleaseNotesRequested;
 };
 
 inline BOOL LLViewerRegion::getAllowDamage() const
@@ -430,6 +439,11 @@ inline BOOL LLViewerRegion::getRestrictPushObject() const
 	return ((mRegionFlags & REGION_FLAGS_RESTRICT_PUSHOBJECT) != 0);
 }
 
+inline BOOL LLViewerRegion::getReleaseNotesRequested() const
+{
+	return mReleaseNotesRequested;
+}
+
 #endif
 
 
diff --git a/linden/indra/newview/llviewershadermgr.cpp b/linden/indra/newview/llviewershadermgr.cpp
new file mode 100644
index 0000000..a654120
--- /dev/null
+++ b/linden/indra/newview/llviewershadermgr.cpp
@@ -0,0 +1,1098 @@
+/** 
+ * @file llviewershadermgr.cpp
+ * @brief Viewer shader manager implementation.
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfeaturemanager.h"
+#include "llviewershadermgr.h"
+
+#include "llfile.h"
+#include "llviewerwindow.h"
+#include "llviewercontrol.h"
+#include "pipeline.h"
+#include "llworld.h"
+#include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+#include "llsky.h"
+#include "llvosky.h"
+#include "llrender.h"
+
+#if LL_DARWIN
+#include "OpenGL/OpenGL.h"
+#endif
+
+#ifdef LL_RELEASE_FOR_DOWNLOAD
+#define UNIFORM_ERRS LL_WARNS_ONCE("Shader")
+#else
+#define UNIFORM_ERRS LL_ERRS("Shader")
+#endif
+
+// Lots of STL stuff in here, using namespace std to keep things more readable
+using std::vector;
+using std::pair;
+using std::make_pair;
+using std::string;
+
+LLVector4			gShinyOrigin;
+
+//object shaders
+LLGLSLShader		gObjectSimpleProgram;
+LLGLSLShader		gObjectSimpleWaterProgram;
+LLGLSLShader		gObjectFullbrightProgram;
+LLGLSLShader		gObjectFullbrightWaterProgram;
+
+LLGLSLShader		gObjectFullbrightShinyProgram;
+LLGLSLShader		gObjectShinyProgram;
+LLGLSLShader		gObjectShinyWaterProgram;
+
+//environment shaders
+LLGLSLShader		gTerrainProgram;
+LLGLSLShader		gTerrainWaterProgram;
+LLGLSLShader		gWaterProgram;
+LLGLSLShader		gUnderWaterProgram;
+
+//interface shaders
+LLGLSLShader		gHighlightProgram;
+
+//avatar shader handles
+LLGLSLShader		gAvatarProgram;
+LLGLSLShader		gAvatarWaterProgram;
+LLGLSLShader		gAvatarEyeballProgram;
+LLGLSLShader		gAvatarPickProgram;
+
+// WindLight shader handles
+LLGLSLShader			gWLSkyProgram;
+LLGLSLShader			gWLCloudProgram;
+
+// Effects Shaders
+LLGLSLShader			gGlowProgram;
+LLGLSLShader			gGlowExtractProgram;
+LLGLSLShader			gPostColorFilterProgram;
+LLGLSLShader			gPostNightVisionProgram;
+
+// Deferred rendering shaders
+LLGLSLShader			gDeferredDiffuseProgram;
+
+//current avatar shader parameter pointer
+GLint				gAvatarMatrixParam;
+
+LLViewerShaderMgr::LLViewerShaderMgr() :
+	mVertexShaderLevel(SHADER_COUNT, 0)
+{	
+/// Make sure WL Sky is the first program
+	mShaderList.push_back(&gWLSkyProgram);
+	mShaderList.push_back(&gWLCloudProgram);
+	mShaderList.push_back(&gAvatarProgram);
+	mShaderList.push_back(&gObjectShinyProgram);
+	mShaderList.push_back(&gWaterProgram);
+	mShaderList.push_back(&gAvatarEyeballProgram); 
+	mShaderList.push_back(&gObjectSimpleProgram);
+	mShaderList.push_back(&gObjectFullbrightProgram);
+	mShaderList.push_back(&gObjectFullbrightShinyProgram);
+	mShaderList.push_back(&gTerrainProgram);
+	mShaderList.push_back(&gTerrainWaterProgram);
+	mShaderList.push_back(&gObjectSimpleWaterProgram);
+	mShaderList.push_back(&gObjectFullbrightWaterProgram);
+	mShaderList.push_back(&gAvatarWaterProgram);
+	mShaderList.push_back(&gObjectShinyWaterProgram);
+	mShaderList.push_back(&gUnderWaterProgram);
+}
+
+LLViewerShaderMgr::~LLViewerShaderMgr()
+{
+	mVertexShaderLevel.clear();
+	mShaderList.clear();
+}
+
+// static
+LLViewerShaderMgr * LLViewerShaderMgr::instance()
+{
+	if(NULL == sInstance)
+	{
+		sInstance = new LLViewerShaderMgr();
+	}	
+	
+	return static_cast<LLViewerShaderMgr*>(sInstance);
+	}
+
+void LLViewerShaderMgr::initAttribsAndUniforms(void)
+	{
+	if (mReservedAttribs.empty())
+		{
+		mReservedAttribs.push_back("materialColor");
+		mReservedAttribs.push_back("specularColor");
+		mReservedAttribs.push_back("binormal");
+		
+		mAvatarAttribs.reserve(5);
+		mAvatarAttribs.push_back("weight");
+		mAvatarAttribs.push_back("clothing");
+		mAvatarAttribs.push_back("gWindDir");
+		mAvatarAttribs.push_back("gSinWaveParams");
+		mAvatarAttribs.push_back("gGravity");
+			
+		mAvatarUniforms.push_back("matrixPalette");
+			
+		mReservedUniforms.reserve(24);
+		mReservedUniforms.push_back("diffuseMap");
+		mReservedUniforms.push_back("specularMap");
+		mReservedUniforms.push_back("bumpMap");
+		mReservedUniforms.push_back("environmentMap");
+		mReservedUniforms.push_back("cloude_noise_texture");
+		mReservedUniforms.push_back("fullbright");
+		mReservedUniforms.push_back("lightnorm");
+		mReservedUniforms.push_back("sunlight_color");
+		mReservedUniforms.push_back("ambient");
+		mReservedUniforms.push_back("blue_horizon");
+		mReservedUniforms.push_back("blue_density");
+		mReservedUniforms.push_back("haze_horizon");
+		mReservedUniforms.push_back("haze_density");
+		mReservedUniforms.push_back("cloud_shadow");
+		mReservedUniforms.push_back("density_multiplier");
+		mReservedUniforms.push_back("distance_multiplier");
+		mReservedUniforms.push_back("max_y");
+		mReservedUniforms.push_back("glow");
+		mReservedUniforms.push_back("cloud_color");
+		mReservedUniforms.push_back("cloud_pos_density1");
+		mReservedUniforms.push_back("cloud_pos_density2");
+		mReservedUniforms.push_back("cloud_scale");
+		mReservedUniforms.push_back("gamma");
+		mReservedUniforms.push_back("scene_light_strength");
+			
+		mWLUniforms.push_back("camPosLocal");
+			
+		mTerrainUniforms.reserve(5);
+		mTerrainUniforms.push_back("detail_0");
+		mTerrainUniforms.push_back("detail_1");
+		mTerrainUniforms.push_back("detail_2");
+		mTerrainUniforms.push_back("detail_3");
+		mTerrainUniforms.push_back("alpha_ramp");
+	
+		mGlowUniforms.push_back("glowDelta");
+		mGlowUniforms.push_back("glowStrength");
+
+		mGlowExtractUniforms.push_back("minLuminance");
+		mGlowExtractUniforms.push_back("maxExtractAlpha");
+		mGlowExtractUniforms.push_back("lumWeights");
+		mGlowExtractUniforms.push_back("warmthWeights");
+		mGlowExtractUniforms.push_back("warmthAmount");
+	
+		mShinyUniforms.push_back("origin");
+
+		mWaterUniforms.reserve(12);
+		mWaterUniforms.push_back("screenTex");
+		mWaterUniforms.push_back("screenDepth");
+		mWaterUniforms.push_back("refTex");
+		mWaterUniforms.push_back("eyeVec");
+		mWaterUniforms.push_back("time");
+		mWaterUniforms.push_back("d1");
+		mWaterUniforms.push_back("d2");
+		mWaterUniforms.push_back("lightDir");
+		mWaterUniforms.push_back("specular");
+		mWaterUniforms.push_back("lightExp");
+		mWaterUniforms.push_back("fogCol");
+		mWaterUniforms.push_back("kd");
+		mWaterUniforms.push_back("refScale");
+		mWaterUniforms.push_back("waterHeight");
+		}
+	}
+
+
+//============================================================================
+// Set Levels
+
+S32 LLViewerShaderMgr::getVertexShaderLevel(S32 type)
+{
+	return LLPipeline::sDisableShaders ? 0 : mVertexShaderLevel[type];
+}
+
+//============================================================================
+// Shader Management
+
+void LLViewerShaderMgr::setShaders()
+{
+	if (!gPipeline.mInitialized)
+	{
+		return;
+	}
+	// Make sure the compiled shader map is cleared before we recompile shaders.
+	mShaderObjects.clear();
+	
+	initAttribsAndUniforms();
+	gPipeline.releaseGLBuffers();
+
+	if (gSavedSettings.getBOOL("VertexShaderEnable"))
+	{
+		LLPipeline::sWaterReflections = gGLManager.mHasCubeMap;
+		LLPipeline::sRenderGlow = gSavedSettings.getBOOL("RenderGlow"); 
+	}
+	else
+	{
+			LLPipeline::sRenderGlow = 
+			LLPipeline::sWaterReflections = FALSE;
+	}
+	
+	//hack to reset buffers that change behavior with shaders
+	gPipeline.resetVertexBuffers();
+
+	if (gViewerWindow)
+	{
+		gViewerWindow->setCursor(UI_CURSOR_WAIT);
+	}
+
+	// Lighting
+	gPipeline.setLightingDetail(-1);
+
+	// Shaders
+	LL_INFOS("ShaderLoading") << "\n~~~~~~~~~~~~~~~~~~\n Loading Shaders:\n~~~~~~~~~~~~~~~~~~" << LL_ENDL;
+	for (S32 i = 0; i < SHADER_COUNT; i++)
+	{
+		mVertexShaderLevel[i] = 0;
+	}
+	mMaxAvatarShaderLevel = 0;
+
+	if (LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") 
+		&& gSavedSettings.getBOOL("VertexShaderEnable"))
+	{
+		S32 light_class = 2;
+		S32 env_class = 2;
+		S32 obj_class = 2;
+		S32 effect_class = 2;
+		S32 wl_class = 2;
+		S32 water_class = 2;
+		S32 deferred_class = 0;
+		if (!gSavedSettings.getBOOL("WindLightUseAtmosShaders"))
+		{
+			// user has disabled WindLight in their settings, downgrade
+			// windlight shaders to stub versions.
+			wl_class = 1;
+
+			// if class one or less, turn off more shaders
+			// since higher end cards won't see any real gain
+			// from turning off most of the shaders,
+			// but class one would
+			// TODO: Make water on class one cards color things
+			// beneath it properly
+			if(LLFeatureManager::getInstance()->getGPUClass() < GPU_CLASS_2)
+			{
+				// use lesser water and other stuff
+				light_class = 2;
+				env_class = 0;
+				obj_class = 0;
+				effect_class = 1;
+				water_class = 1;
+			}
+		}
+
+		if (gSavedSettings.getBOOL("RenderDeferred"))
+		{
+			light_class = 1;
+			env_class = 0;
+			obj_class = 0;
+			water_class = 1;
+			effect_class = 1;
+			deferred_class = 1;
+		}
+
+		if(!gSavedSettings.getBOOL("EnableRippleWater"))
+		{
+			water_class = 0;
+		}
+
+		// Trigger a full rebuild of the fallback skybox / cubemap if we've toggled windlight shaders
+		if (mVertexShaderLevel[SHADER_WINDLIGHT] != wl_class && gSky.mVOSkyp.notNull())
+		{
+			gSky.mVOSkyp->forceSkyUpdate();
+		}
+
+		// Load lighting shaders
+		mVertexShaderLevel[SHADER_LIGHTING] = light_class;
+		mVertexShaderLevel[SHADER_INTERFACE] = light_class;
+		mVertexShaderLevel[SHADER_ENVIRONMENT] = env_class;
+		mVertexShaderLevel[SHADER_WATER] = water_class;
+		mVertexShaderLevel[SHADER_OBJECT] = obj_class;
+		mVertexShaderLevel[SHADER_EFFECT] = effect_class;
+		mVertexShaderLevel[SHADER_WINDLIGHT] = wl_class;
+		mVertexShaderLevel[SHADER_DEFERRED] = deferred_class;
+
+		BOOL loaded = loadBasicShaders();
+
+		if (loaded)
+		{
+			gPipeline.mVertexShadersEnabled = TRUE;
+			gPipeline.mVertexShadersLoaded = 1;
+
+			// Load all shaders to set max levels
+			loadShadersEnvironment();
+			loadShadersWater();
+			loadShadersObject();
+			loadShadersWindLight();
+			loadShadersEffects();
+			loadShadersInterface();
+			loadShadersDeferred();
+
+			// Load max avatar shaders to set the max level
+			mVertexShaderLevel[SHADER_AVATAR] = 3;
+			mMaxAvatarShaderLevel = 3;
+			loadShadersAvatar();
+			
+#if 0 && LL_DARWIN // force avatar shaders off for mac
+			mVertexShaderLevel[SHADER_AVATAR] = 0;
+			sMaxAvatarShaderLevel = 0;
+#else
+			if (gSavedSettings.getBOOL("RenderAvatarVP"))
+			{
+				BOOL avatar_cloth = gSavedSettings.getBOOL("RenderAvatarCloth");
+				S32 avatar_class = 1;
+				
+				// cloth is a class3 shader
+				if(avatar_cloth)
+				{
+					avatar_class = 3;
+				}
+
+				// Set the actual level
+				mVertexShaderLevel[SHADER_AVATAR] = avatar_class;
+				loadShadersAvatar();
+				if (mVertexShaderLevel[SHADER_AVATAR] != avatar_class)
+				{
+					if (mVertexShaderLevel[SHADER_AVATAR] == 0)
+					{
+						gSavedSettings.setBOOL("RenderAvatarVP", FALSE);
+					}
+					if(llmax(mVertexShaderLevel[SHADER_AVATAR]-1,0) >= 3)
+					{
+						avatar_cloth = true;
+					}
+					else
+					{
+						avatar_cloth = false;
+					}
+					gSavedSettings.setBOOL("RenderAvatarCloth", avatar_cloth);
+				}
+			}
+			else
+			{
+				mVertexShaderLevel[SHADER_AVATAR] = 0;
+				gSavedSettings.setBOOL("RenderAvatarCloth", FALSE);
+				loadShadersAvatar(); // unloads
+			}
+#endif
+		}
+		else
+		{
+			gPipeline.mVertexShadersEnabled = FALSE;
+			gPipeline.mVertexShadersLoaded = 0;
+			mVertexShaderLevel[SHADER_LIGHTING] = 0;
+			mVertexShaderLevel[SHADER_INTERFACE] = 0;
+			mVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
+			mVertexShaderLevel[SHADER_WATER] = 0;
+			mVertexShaderLevel[SHADER_OBJECT] = 0;
+			mVertexShaderLevel[SHADER_EFFECT] = 0;
+			mVertexShaderLevel[SHADER_WINDLIGHT] = 0;
+			mVertexShaderLevel[SHADER_AVATAR] = 0;
+		}
+	}
+	else
+	{
+		gPipeline.mVertexShadersEnabled = FALSE;
+		gPipeline.mVertexShadersLoaded = 0;
+		mVertexShaderLevel[SHADER_LIGHTING] = 0;
+		mVertexShaderLevel[SHADER_INTERFACE] = 0;
+		mVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
+		mVertexShaderLevel[SHADER_WATER] = 0;
+		mVertexShaderLevel[SHADER_OBJECT] = 0;
+		mVertexShaderLevel[SHADER_EFFECT] = 0;
+		mVertexShaderLevel[SHADER_WINDLIGHT] = 0;
+		mVertexShaderLevel[SHADER_AVATAR] = 0;
+	}
+	
+	if (gViewerWindow)
+	{
+		gViewerWindow->setCursor(UI_CURSOR_ARROW);
+	}
+	gPipeline.createGLBuffers();
+}
+
+void LLViewerShaderMgr::unloadShaders()
+{
+	gObjectSimpleProgram.unload();
+	gObjectSimpleWaterProgram.unload();
+	gObjectFullbrightProgram.unload();
+	gObjectFullbrightWaterProgram.unload();
+
+	gObjectShinyProgram.unload();
+	gObjectFullbrightShinyProgram.unload();
+	gObjectShinyWaterProgram.unload();
+	gWaterProgram.unload();
+	gUnderWaterProgram.unload();
+	gTerrainProgram.unload();
+	gTerrainWaterProgram.unload();
+	gGlowProgram.unload();
+	gGlowExtractProgram.unload();
+	gAvatarProgram.unload();
+	gAvatarWaterProgram.unload();
+	gAvatarEyeballProgram.unload();
+	gAvatarPickProgram.unload();
+	gHighlightProgram.unload();
+
+	gWLSkyProgram.unload();
+	gWLCloudProgram.unload();
+
+	gPostColorFilterProgram.unload();
+	gPostNightVisionProgram.unload();
+
+	gDeferredDiffuseProgram.unload();
+
+	mVertexShaderLevel[SHADER_LIGHTING] = 0;
+	mVertexShaderLevel[SHADER_OBJECT] = 0;
+	mVertexShaderLevel[SHADER_AVATAR] = 0;
+	mVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
+	mVertexShaderLevel[SHADER_WATER] = 0;
+	mVertexShaderLevel[SHADER_INTERFACE] = 0;
+	mVertexShaderLevel[SHADER_EFFECT] = 0;
+	mVertexShaderLevel[SHADER_WINDLIGHT] = 0;
+
+	gPipeline.mVertexShadersLoaded = 0;
+}
+
+BOOL LLViewerShaderMgr::loadBasicShaders()
+{
+	// Load basic dependency shaders first
+	// All of these have to load for any shaders to function
+	
+#if LL_DARWIN // Mac can't currently handle all 8 lights, 
+	S32 sum_lights_class = 2;
+#else 
+	S32 sum_lights_class = 3;
+
+	// class one cards will get the lower sum lights
+	// class zero we're not going to think about
+	// since a class zero card COULD be a ridiculous new card
+	// and old cards should have the features masked
+	if(LLFeatureManager::getInstance()->getGPUClass() == GPU_CLASS_1)
+	{
+		sum_lights_class = 2;
+	}
+#endif
+
+	// If we have sun and moon only checked, then only sum those lights.
+	if (gPipeline.getLightingDetail() == 0)
+	{
+		sum_lights_class = 1;
+	}
+
+	// Load the Basic Vertex Shaders at the appropriate level. 
+	// (in order of shader function call depth for reference purposes, deepest level first)
+
+	vector< pair<string, S32> > shaders;
+	shaders.reserve(10);
+	shaders.push_back( make_pair( "windlight/atmosphericsVarsV.glsl",		mVertexShaderLevel[SHADER_WINDLIGHT] ) );
+	shaders.push_back( make_pair( "windlight/atmosphericsHelpersV.glsl",	mVertexShaderLevel[SHADER_WINDLIGHT] ) );
+	shaders.push_back( make_pair( "lighting/lightFuncV.glsl",				mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/sumLightsV.glsl",				sum_lights_class ) );
+	shaders.push_back( make_pair( "lighting/lightV.glsl",					mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/lightFuncSpecularV.glsl",		mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/sumLightsSpecularV.glsl",		sum_lights_class ) );
+	shaders.push_back( make_pair( "lighting/lightSpecularV.glsl",			mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "windlight/atmosphericsV.glsl",			mVertexShaderLevel[SHADER_WINDLIGHT] ) );
+	shaders.push_back( make_pair( "avatar/avatarSkinV.glsl",				1 ) );
+
+	// We no longer have to bind the shaders to global glhandles, they are automatically added to a map now.
+	for (U32 i = 0; i < shaders.size(); i++)
+	{
+		// Note usage of GL_VERTEX_SHADER_ARB
+		if (loadShaderFile(shaders[i].first, shaders[i].second, GL_VERTEX_SHADER_ARB) == 0)
+		{
+			return FALSE;
+		}
+	}
+
+	// Load the Basic Fragment Shaders at the appropriate level. 
+	// (in order of shader function call depth for reference purposes, deepest level first)
+
+	shaders.clear();
+	shaders.reserve(12);
+	shaders.push_back( make_pair( "windlight/atmosphericsVarsF.glsl",		mVertexShaderLevel[SHADER_WINDLIGHT] ) );
+	shaders.push_back( make_pair( "windlight/gammaF.glsl",					mVertexShaderLevel[SHADER_WINDLIGHT]) );
+	shaders.push_back( make_pair( "windlight/atmosphericsF.glsl",			mVertexShaderLevel[SHADER_WINDLIGHT] ) );
+	shaders.push_back( make_pair( "windlight/transportF.glsl",				mVertexShaderLevel[SHADER_WINDLIGHT] ) );	
+	shaders.push_back( make_pair( "environment/waterFogF.glsl",				mVertexShaderLevel[SHADER_WATER] ) );
+	shaders.push_back( make_pair( "lighting/lightF.glsl",					mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/lightFullbrightF.glsl",			mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/lightWaterF.glsl",				mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/lightFullbrightWaterF.glsl",	mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/lightShinyF.glsl",				mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/lightFullbrightShinyF.glsl",	mVertexShaderLevel[SHADER_LIGHTING] ) );
+	shaders.push_back( make_pair( "lighting/lightShinyWaterF.glsl",			mVertexShaderLevel[SHADER_LIGHTING] ) );
+	
+	for (U32 i = 0; i < shaders.size(); i++)
+	{
+		// Note usage of GL_FRAGMENT_SHADER_ARB
+		if (loadShaderFile(shaders[i].first, shaders[i].second, GL_FRAGMENT_SHADER_ARB) == 0)
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+BOOL LLViewerShaderMgr::loadShadersEnvironment()
+{
+	BOOL success = TRUE;
+
+	if (mVertexShaderLevel[SHADER_ENVIRONMENT] == 0)
+	{
+		gTerrainProgram.unload();
+		return FALSE;
+	}
+
+	if (success)
+	{
+		gTerrainProgram.mName = "Terrain Shader";
+		gTerrainProgram.mFeatures.calculatesLighting = true;
+		gTerrainProgram.mFeatures.calculatesAtmospherics = true;
+		gTerrainProgram.mFeatures.hasAtmospherics = true;
+		gTerrainProgram.mFeatures.hasGamma = true;
+		gTerrainProgram.mShaderFiles.clear();
+		gTerrainProgram.mShaderFiles.push_back(make_pair("environment/terrainV.glsl", GL_VERTEX_SHADER_ARB));
+		gTerrainProgram.mShaderFiles.push_back(make_pair("environment/terrainF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gTerrainProgram.mShaderLevel = mVertexShaderLevel[SHADER_ENVIRONMENT];
+		success = gTerrainProgram.createShader(NULL, &mTerrainUniforms);
+	}
+
+	if (!success)
+	{
+		mVertexShaderLevel[SHADER_ENVIRONMENT] = 0;
+		return FALSE;
+	}
+	
+	LLWorld::getInstance()->updateWaterObjects();
+	
+	return TRUE;
+}
+
+BOOL LLViewerShaderMgr::loadShadersWater()
+{
+	BOOL success = TRUE;
+	BOOL terrainWaterSuccess = TRUE;
+
+	if (mVertexShaderLevel[SHADER_WATER] == 0)
+	{
+		gWaterProgram.unload();
+		gUnderWaterProgram.unload();
+		gTerrainWaterProgram.unload();
+		return FALSE;
+	}
+
+	if (success)
+	{
+		// load water shader
+		gWaterProgram.mName = "Water Shader";
+		gWaterProgram.mFeatures.calculatesAtmospherics = true;
+		gWaterProgram.mFeatures.hasGamma = true;
+		gWaterProgram.mFeatures.hasTransport = true;
+		gWaterProgram.mShaderFiles.clear();
+		gWaterProgram.mShaderFiles.push_back(make_pair("environment/waterV.glsl", GL_VERTEX_SHADER_ARB));
+		gWaterProgram.mShaderFiles.push_back(make_pair("environment/waterF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gWaterProgram.mShaderLevel = mVertexShaderLevel[SHADER_WATER];
+		success = gWaterProgram.createShader(NULL, &mWaterUniforms);
+	}
+
+	if (success)
+	{
+		//load under water vertex shader
+		gUnderWaterProgram.mName = "Underwater Shader";
+		gUnderWaterProgram.mFeatures.calculatesAtmospherics = true;
+		gUnderWaterProgram.mShaderFiles.clear();
+		gUnderWaterProgram.mShaderFiles.push_back(make_pair("environment/waterV.glsl", GL_VERTEX_SHADER_ARB));
+		gUnderWaterProgram.mShaderFiles.push_back(make_pair("environment/underWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gUnderWaterProgram.mShaderLevel = mVertexShaderLevel[SHADER_WATER];
+		gUnderWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
+		
+		success = gUnderWaterProgram.createShader(NULL, &mWaterUniforms);
+	}
+
+	if (success)
+	{
+		//load terrain water shader
+		gTerrainWaterProgram.mName = "Terrain Water Shader";
+		gTerrainWaterProgram.mFeatures.calculatesLighting = true;
+		gTerrainWaterProgram.mFeatures.calculatesAtmospherics = true;
+		gTerrainWaterProgram.mFeatures.hasAtmospherics = true;
+		gTerrainWaterProgram.mFeatures.hasWaterFog = true;
+		gTerrainWaterProgram.mShaderFiles.clear();
+		gTerrainWaterProgram.mShaderFiles.push_back(make_pair("environment/terrainV.glsl", GL_VERTEX_SHADER_ARB));
+		gTerrainWaterProgram.mShaderFiles.push_back(make_pair("environment/terrainWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gTerrainWaterProgram.mShaderLevel = mVertexShaderLevel[SHADER_ENVIRONMENT];
+		gTerrainWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
+		terrainWaterSuccess = gTerrainWaterProgram.createShader(NULL, &mTerrainUniforms);
+	}	
+
+	/// Keep track of water shader levels
+	if (gWaterProgram.mShaderLevel != mVertexShaderLevel[SHADER_WATER]
+		|| gUnderWaterProgram.mShaderLevel != mVertexShaderLevel[SHADER_WATER])
+	{
+		mVertexShaderLevel[SHADER_WATER] = llmin(gWaterProgram.mShaderLevel, gUnderWaterProgram.mShaderLevel);
+	}
+
+	if (!success)
+	{
+		mVertexShaderLevel[SHADER_WATER] = 0;
+		return FALSE;
+	}
+
+	// if we failed to load the terrain water shaders and we need them (using class2 water),
+	// then drop down to class1 water.
+	if (mVertexShaderLevel[SHADER_WATER] > 1 && !terrainWaterSuccess)
+	{
+		mVertexShaderLevel[SHADER_WATER]--;
+		return loadShadersWater();
+	}
+	
+	LLWorld::getInstance()->updateWaterObjects();
+
+	return TRUE;
+}
+
+BOOL LLViewerShaderMgr::loadShadersEffects()
+{
+	BOOL success = TRUE;
+
+	if (mVertexShaderLevel[SHADER_EFFECT] == 0)
+	{
+		gGlowProgram.unload();
+		gGlowExtractProgram.unload();
+		gPostColorFilterProgram.unload();	
+		gPostNightVisionProgram.unload();
+		return FALSE;
+	}
+
+	if (success)
+	{
+		gGlowProgram.mName = "Glow Shader (Post)";
+		gGlowProgram.mShaderFiles.clear();
+		gGlowProgram.mShaderFiles.push_back(make_pair("effects/glowV.glsl", GL_VERTEX_SHADER_ARB));
+		gGlowProgram.mShaderFiles.push_back(make_pair("effects/glowF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gGlowProgram.mShaderLevel = mVertexShaderLevel[SHADER_EFFECT];
+		success = gGlowProgram.createShader(NULL, &mGlowUniforms);
+		if (!success)
+		{
+			LLPipeline::sRenderGlow = FALSE;
+		}
+	}
+	
+	if (success)
+	{
+		gGlowExtractProgram.mName = "Glow Extract Shader (Post)";
+		gGlowExtractProgram.mShaderFiles.clear();
+		gGlowExtractProgram.mShaderFiles.push_back(make_pair("effects/glowExtractV.glsl", GL_VERTEX_SHADER_ARB));
+		gGlowExtractProgram.mShaderFiles.push_back(make_pair("effects/glowExtractF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gGlowExtractProgram.mShaderLevel = mVertexShaderLevel[SHADER_EFFECT];
+		success = gGlowExtractProgram.createShader(NULL, &mGlowExtractUniforms);
+		if (!success)
+		{
+			LLPipeline::sRenderGlow = FALSE;
+		}
+	}
+	
+#if 0
+	// disabling loading of postprocess shaders until we fix
+	// ATI sampler2DRect compatibility.
+	
+	//load Color Filter Shader
+	if (success)
+	{
+		vector<string> shaderUniforms;
+		shaderUniforms.reserve(7);
+		shaderUniforms.push_back("RenderTexture");
+		shaderUniforms.push_back("gamma");
+		shaderUniforms.push_back("brightness");
+		shaderUniforms.push_back("contrast");
+		shaderUniforms.push_back("contrastBase");
+		shaderUniforms.push_back("saturation");
+		shaderUniforms.push_back("lumWeights");
+
+		gPostColorFilterProgram.mName = "Color Filter Shader (Post)";
+		gPostColorFilterProgram.mShaderFiles.clear();
+		gPostColorFilterProgram.mShaderFiles.push_back(make_pair("effects/colorFilterF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gPostColorFilterProgram.mShaderFiles.push_back(make_pair("effects/drawQuadV.glsl", GL_VERTEX_SHADER_ARB));
+		gPostColorFilterProgram.mShaderLevel = mVertexShaderLevel[SHADER_EFFECT];
+		success = gPostColorFilterProgram.createShader(NULL, &shaderUniforms);
+	}
+
+	//load Night Vision Shader
+	if (success)
+	{
+		vector<string> shaderUniforms;
+		shaderUniforms.reserve(5);
+		shaderUniforms.push_back("RenderTexture");
+		shaderUniforms.push_back("NoiseTexture");
+		shaderUniforms.push_back("brightMult");
+		shaderUniforms.push_back("noiseStrength");
+		shaderUniforms.push_back("lumWeights");
+
+		gPostNightVisionProgram.mName = "Night Vision Shader (Post)";
+		gPostNightVisionProgram.mShaderFiles.clear();
+		gPostNightVisionProgram.mShaderFiles.push_back(make_pair("effects/nightVisionF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gPostNightVisionProgram.mShaderFiles.push_back(make_pair("effects/drawQuadV.glsl", GL_VERTEX_SHADER_ARB));
+		gPostNightVisionProgram.mShaderLevel = mVertexShaderLevel[SHADER_EFFECT];
+		success = gPostNightVisionProgram.createShader(NULL, &shaderUniforms);
+	}
+	#endif
+
+	return success;
+
+}
+
+BOOL LLViewerShaderMgr::loadShadersDeferred()
+{
+	if (mVertexShaderLevel[SHADER_DEFERRED] == 0)
+	{
+		gDeferredDiffuseProgram.unload();
+		return FALSE;
+	}
+
+	BOOL success = TRUE;
+
+	if (success)
+	{
+		gDeferredDiffuseProgram.mName = "Deffered Diffuse Shader";
+		gDeferredDiffuseProgram.mShaderFiles.clear();
+		gDeferredDiffuseProgram.mShaderFiles.push_back(make_pair("deferred/diffuseV.glsl", GL_VERTEX_SHADER_ARB));
+		gDeferredDiffuseProgram.mShaderFiles.push_back(make_pair("deferred/diffuseF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gDeferredDiffuseProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
+		success = gDeferredDiffuseProgram.createShader(NULL, NULL);
+	}
+
+	return success;
+}
+
+BOOL LLViewerShaderMgr::loadShadersObject()
+{
+	BOOL success = TRUE;
+
+	if (mVertexShaderLevel[SHADER_OBJECT] == 0)
+	{
+		gObjectShinyProgram.unload();
+		gObjectFullbrightShinyProgram.unload();
+		gObjectShinyWaterProgram.unload();
+		gObjectSimpleProgram.unload();
+		gObjectSimpleWaterProgram.unload();
+		gObjectFullbrightProgram.unload();
+		gObjectFullbrightWaterProgram.unload();
+		return FALSE;
+	}
+
+	if (success)
+	{
+		gObjectSimpleProgram.mName = "Simple Shader";
+		gObjectSimpleProgram.mFeatures.calculatesLighting = true;
+		gObjectSimpleProgram.mFeatures.calculatesAtmospherics = true;
+		gObjectSimpleProgram.mFeatures.hasGamma = true;
+		gObjectSimpleProgram.mFeatures.hasAtmospherics = true;
+		gObjectSimpleProgram.mFeatures.hasLighting = true;
+		gObjectSimpleProgram.mShaderFiles.clear();
+		gObjectSimpleProgram.mShaderFiles.push_back(make_pair("objects/simpleV.glsl", GL_VERTEX_SHADER_ARB));
+		gObjectSimpleProgram.mShaderFiles.push_back(make_pair("objects/simpleF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gObjectSimpleProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT];
+		success = gObjectSimpleProgram.createShader(NULL, NULL);
+	}
+	
+	if (success)
+	{
+		gObjectSimpleWaterProgram.mName = "Simple Water Shader";
+		gObjectSimpleWaterProgram.mFeatures.calculatesLighting = true;
+		gObjectSimpleWaterProgram.mFeatures.calculatesAtmospherics = true;
+		gObjectSimpleWaterProgram.mFeatures.hasWaterFog = true;
+		gObjectSimpleWaterProgram.mFeatures.hasAtmospherics = true;
+		gObjectSimpleWaterProgram.mFeatures.hasLighting = true;
+		gObjectSimpleWaterProgram.mShaderFiles.clear();
+		gObjectSimpleWaterProgram.mShaderFiles.push_back(make_pair("objects/simpleV.glsl", GL_VERTEX_SHADER_ARB));
+		gObjectSimpleWaterProgram.mShaderFiles.push_back(make_pair("objects/simpleWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gObjectSimpleWaterProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT];
+		gObjectSimpleWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
+		success = gObjectSimpleWaterProgram.createShader(NULL, NULL);
+	}
+	
+	if (success)
+	{
+		gObjectFullbrightProgram.mName = "Fullbright Shader";
+		gObjectFullbrightProgram.mFeatures.calculatesAtmospherics = true;
+		gObjectFullbrightProgram.mFeatures.hasGamma = true;
+		gObjectFullbrightProgram.mFeatures.hasTransport = true;
+		gObjectFullbrightProgram.mFeatures.isFullbright = true;
+		gObjectFullbrightProgram.mShaderFiles.clear();
+		gObjectFullbrightProgram.mShaderFiles.push_back(make_pair("objects/fullbrightV.glsl", GL_VERTEX_SHADER_ARB));
+		gObjectFullbrightProgram.mShaderFiles.push_back(make_pair("objects/fullbrightF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gObjectFullbrightProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT];
+		success = gObjectFullbrightProgram.createShader(NULL, NULL);
+	}
+
+	if (success)
+	{
+		gObjectFullbrightWaterProgram.mName = "Fullbright Water Shader";
+		gObjectFullbrightWaterProgram.mFeatures.calculatesAtmospherics = true;
+		gObjectFullbrightWaterProgram.mFeatures.isFullbright = true;
+		gObjectFullbrightWaterProgram.mFeatures.hasWaterFog = true;		
+		gObjectFullbrightWaterProgram.mFeatures.hasTransport = true;
+		gObjectFullbrightWaterProgram.mShaderFiles.clear();
+		gObjectFullbrightWaterProgram.mShaderFiles.push_back(make_pair("objects/fullbrightV.glsl", GL_VERTEX_SHADER_ARB));
+		gObjectFullbrightWaterProgram.mShaderFiles.push_back(make_pair("objects/fullbrightWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gObjectFullbrightWaterProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT];
+		gObjectFullbrightWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
+		success = gObjectFullbrightWaterProgram.createShader(NULL, NULL);
+	}
+
+	if (success)
+	{
+		gObjectShinyProgram.mName = "Shiny Shader";
+		gObjectShinyProgram.mFeatures.calculatesAtmospherics = true;
+		gObjectShinyProgram.mFeatures.calculatesLighting = true;
+		gObjectShinyProgram.mFeatures.hasGamma = true;
+		gObjectShinyProgram.mFeatures.hasAtmospherics = true;
+		gObjectShinyProgram.mFeatures.isShiny = true;
+		gObjectShinyProgram.mShaderFiles.clear();
+		gObjectShinyProgram.mShaderFiles.push_back(make_pair("objects/shinyV.glsl", GL_VERTEX_SHADER_ARB));
+		gObjectShinyProgram.mShaderFiles.push_back(make_pair("objects/shinyF.glsl", GL_FRAGMENT_SHADER_ARB));		
+		gObjectShinyProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT];
+		success = gObjectShinyProgram.createShader(NULL, &mShinyUniforms);
+	}
+
+	if (success)
+	{
+		gObjectShinyWaterProgram.mName = "Shiny Water Shader";
+		gObjectShinyWaterProgram.mFeatures.calculatesAtmospherics = true;
+		gObjectShinyWaterProgram.mFeatures.calculatesLighting = true;
+		gObjectShinyWaterProgram.mFeatures.isShiny = true;
+		gObjectShinyWaterProgram.mFeatures.hasWaterFog = true;
+		gObjectShinyWaterProgram.mFeatures.hasAtmospherics = true;
+		gObjectShinyWaterProgram.mShaderFiles.clear();
+		gObjectShinyWaterProgram.mShaderFiles.push_back(make_pair("objects/shinyWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gObjectShinyWaterProgram.mShaderFiles.push_back(make_pair("objects/shinyV.glsl", GL_VERTEX_SHADER_ARB));
+		gObjectShinyWaterProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT];
+		gObjectShinyWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;
+		success = gObjectShinyWaterProgram.createShader(NULL, &mShinyUniforms);
+	}
+	
+	if (success)
+	{
+		gObjectFullbrightShinyProgram.mName = "Fullbright Shiny Shader";
+		gObjectFullbrightShinyProgram.mFeatures.calculatesAtmospherics = true;
+		gObjectFullbrightShinyProgram.mFeatures.isFullbright = true;
+		gObjectFullbrightShinyProgram.mFeatures.isShiny = true;
+		gObjectFullbrightShinyProgram.mFeatures.hasGamma = true;
+		gObjectFullbrightShinyProgram.mFeatures.hasTransport = true;
+		gObjectFullbrightShinyProgram.mShaderFiles.clear();
+		gObjectFullbrightShinyProgram.mShaderFiles.push_back(make_pair("objects/fullbrightShinyV.glsl", GL_VERTEX_SHADER_ARB));
+		gObjectFullbrightShinyProgram.mShaderFiles.push_back(make_pair("objects/fullbrightShinyF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gObjectFullbrightShinyProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT];
+		success = gObjectFullbrightShinyProgram.createShader(NULL, &mShinyUniforms);
+	}
+
+
+	if( !success )
+	{
+		mVertexShaderLevel[SHADER_OBJECT] = 0;
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+BOOL LLViewerShaderMgr::loadShadersAvatar()
+{
+	BOOL success = TRUE;
+
+	if (mVertexShaderLevel[SHADER_AVATAR] == 0)
+	{
+		gAvatarProgram.unload();
+		gAvatarWaterProgram.unload();
+		gAvatarEyeballProgram.unload();
+		gAvatarPickProgram.unload();
+		return FALSE;
+	}
+
+	if (success)
+	{
+		gAvatarProgram.mName = "Avatar Shader";
+		gAvatarProgram.mFeatures.hasSkinning = true;
+		gAvatarProgram.mFeatures.calculatesAtmospherics = true;
+		gAvatarProgram.mFeatures.calculatesLighting = true;
+		gAvatarProgram.mFeatures.hasGamma = true;
+		gAvatarProgram.mFeatures.hasAtmospherics = true;
+		gAvatarProgram.mFeatures.hasLighting = true;
+		gAvatarProgram.mShaderFiles.clear();
+		gAvatarProgram.mShaderFiles.push_back(make_pair("avatar/avatarV.glsl", GL_VERTEX_SHADER_ARB));
+		gAvatarProgram.mShaderFiles.push_back(make_pair("avatar/avatarF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gAvatarProgram.mShaderLevel = mVertexShaderLevel[SHADER_AVATAR];
+		success = gAvatarProgram.createShader(&mAvatarAttribs, &mAvatarUniforms);
+			
+		if (success)
+		{
+			gAvatarWaterProgram.mName = "Avatar Water Shader";
+			gAvatarWaterProgram.mFeatures.hasSkinning = true;
+			gAvatarWaterProgram.mFeatures.calculatesAtmospherics = true;
+			gAvatarWaterProgram.mFeatures.calculatesLighting = true;
+			gAvatarWaterProgram.mFeatures.hasWaterFog = true;
+			gAvatarWaterProgram.mFeatures.hasAtmospherics = true;
+			gAvatarWaterProgram.mFeatures.hasLighting = true;
+			gAvatarWaterProgram.mShaderFiles.clear();
+			gAvatarWaterProgram.mShaderFiles.push_back(make_pair("avatar/avatarV.glsl", GL_VERTEX_SHADER_ARB));
+			gAvatarWaterProgram.mShaderFiles.push_back(make_pair("objects/simpleWaterF.glsl", GL_FRAGMENT_SHADER_ARB));
+			// Note: no cloth under water:
+			gAvatarWaterProgram.mShaderLevel = llmin(mVertexShaderLevel[SHADER_AVATAR], 1);	
+			gAvatarWaterProgram.mShaderGroup = LLGLSLShader::SG_WATER;				
+			success = gAvatarWaterProgram.createShader(&mAvatarAttribs, &mAvatarUniforms);
+		}
+
+		/// Keep track of avatar levels
+		if (gAvatarProgram.mShaderLevel != mVertexShaderLevel[SHADER_AVATAR])
+		{
+			mMaxAvatarShaderLevel = mVertexShaderLevel[SHADER_AVATAR] = gAvatarProgram.mShaderLevel;
+		}
+	}
+
+	if (success)
+	{
+		gAvatarPickProgram.mName = "Avatar Pick Shader";
+		gAvatarPickProgram.mFeatures.hasSkinning = true;
+		gAvatarPickProgram.mShaderFiles.clear();
+		gAvatarPickProgram.mShaderFiles.push_back(make_pair("avatar/pickAvatarV.glsl", GL_VERTEX_SHADER_ARB));
+		gAvatarPickProgram.mShaderFiles.push_back(make_pair("avatar/pickAvatarF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gAvatarPickProgram.mShaderLevel = mVertexShaderLevel[SHADER_AVATAR];
+		success = gAvatarPickProgram.createShader(&mAvatarAttribs, &mAvatarUniforms);
+	}
+
+	if (success)
+	{
+		gAvatarEyeballProgram.mName = "Avatar Eyeball Program";
+		gAvatarEyeballProgram.mFeatures.calculatesLighting = true;
+		gAvatarEyeballProgram.mFeatures.isSpecular = true;
+		gAvatarEyeballProgram.mFeatures.calculatesAtmospherics = true;
+		gAvatarEyeballProgram.mFeatures.hasGamma = true;
+		gAvatarEyeballProgram.mFeatures.hasAtmospherics = true;
+		gAvatarEyeballProgram.mFeatures.hasLighting = true;
+		gAvatarEyeballProgram.mShaderFiles.clear();
+		gAvatarEyeballProgram.mShaderFiles.push_back(make_pair("avatar/eyeballV.glsl", GL_VERTEX_SHADER_ARB));
+		gAvatarEyeballProgram.mShaderFiles.push_back(make_pair("avatar/eyeballF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gAvatarEyeballProgram.mShaderLevel = mVertexShaderLevel[SHADER_AVATAR];
+		success = gAvatarEyeballProgram.createShader(NULL, NULL);
+	}
+
+	if( !success )
+	{
+		mVertexShaderLevel[SHADER_AVATAR] = 0;
+		mMaxAvatarShaderLevel = 0;
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+BOOL LLViewerShaderMgr::loadShadersInterface()
+{
+	BOOL success = TRUE;
+
+	if (mVertexShaderLevel[SHADER_INTERFACE] == 0)
+	{
+		gHighlightProgram.unload();
+		return FALSE;
+	}
+	
+	if (success)
+	{
+		gHighlightProgram.mName = "Highlight Shader";
+		gHighlightProgram.mShaderFiles.clear();
+		gHighlightProgram.mShaderFiles.push_back(make_pair("interface/highlightV.glsl", GL_VERTEX_SHADER_ARB));
+		gHighlightProgram.mShaderFiles.push_back(make_pair("interface/highlightF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gHighlightProgram.mShaderLevel = mVertexShaderLevel[SHADER_INTERFACE];		
+		success = gHighlightProgram.createShader(NULL, NULL);
+	}
+
+	if( !success )
+	{
+		mVertexShaderLevel[SHADER_INTERFACE] = 0;
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+BOOL LLViewerShaderMgr::loadShadersWindLight()
+{	
+	BOOL success = TRUE;
+
+	if (mVertexShaderLevel[SHADER_WINDLIGHT] < 2)
+	{
+		gWLSkyProgram.unload();
+		gWLCloudProgram.unload();
+		return FALSE;
+	}
+
+	if (success)
+	{
+		gWLSkyProgram.mName = "Windlight Sky Shader";
+		//gWLSkyProgram.mFeatures.hasGamma = true;
+		gWLSkyProgram.mShaderFiles.clear();
+		gWLSkyProgram.mShaderFiles.push_back(make_pair("windlight/skyV.glsl", GL_VERTEX_SHADER_ARB));
+		gWLSkyProgram.mShaderFiles.push_back(make_pair("windlight/skyF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gWLSkyProgram.mShaderLevel = mVertexShaderLevel[SHADER_WINDLIGHT];
+		gWLSkyProgram.mShaderGroup = LLGLSLShader::SG_SKY;
+		success = gWLSkyProgram.createShader(NULL, &mWLUniforms);
+	}
+
+	if (success)
+	{
+		gWLCloudProgram.mName = "Windlight Cloud Program";
+		//gWLCloudProgram.mFeatures.hasGamma = true;
+		gWLCloudProgram.mShaderFiles.clear();
+		gWLCloudProgram.mShaderFiles.push_back(make_pair("windlight/cloudsV.glsl", GL_VERTEX_SHADER_ARB));
+		gWLCloudProgram.mShaderFiles.push_back(make_pair("windlight/cloudsF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gWLCloudProgram.mShaderLevel = mVertexShaderLevel[SHADER_WINDLIGHT];
+		gWLCloudProgram.mShaderGroup = LLGLSLShader::SG_SKY;
+		success = gWLCloudProgram.createShader(NULL, &mWLUniforms);
+	}
+
+	return success;
+}
+
+std::string LLViewerShaderMgr::getShaderDirPrefix(void)
+	{
+	return gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "shaders/class");
+	}
+
+void LLViewerShaderMgr::updateShaderUniforms(LLGLSLShader * shader)
+			{
+	LLWLParamManager::instance()->updateShaderUniforms(shader);
+	LLWaterParamManager::instance()->updateShaderUniforms(shader);
+}
diff --git a/linden/indra/newview/llviewershadermgr.h b/linden/indra/newview/llviewershadermgr.h
new file mode 100644
index 0000000..3894cd5
--- /dev/null
+++ b/linden/indra/newview/llviewershadermgr.h
@@ -0,0 +1,313 @@
+/** 
+ * @file llviewershadermgr.h
+ * @brief Viewer Shader Manager
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_VIEWER_SHADER_MGR_H
+#define LL_VIEWER_SHADER_MGR_H
+
+#include "llshadermgr.h"
+
+class LLViewerShaderMgr: public LLShaderMgr
+{
+public:
+	LLViewerShaderMgr();
+	/* virtual */ ~LLViewerShaderMgr();
+
+	// singleton pattern implementation
+	static LLViewerShaderMgr * instance();
+
+	void initAttribsAndUniforms(void);
+	void setShaders();
+	void unloadShaders();
+	S32 getVertexShaderLevel(S32 type);
+	BOOL loadBasicShaders();
+	BOOL loadShadersEffects();
+	BOOL loadShadersDeferred();
+	BOOL loadShadersObject();
+	BOOL loadShadersAvatar();
+	BOOL loadShadersEnvironment();
+	BOOL loadShadersWater();
+	BOOL loadShadersInterface();
+	BOOL loadShadersWindLight();
+
+	std::vector<S32> mVertexShaderLevel;
+	S32	mMaxAvatarShaderLevel;
+
+	enum EShaderClass
+	{
+		SHADER_LIGHTING,
+		SHADER_OBJECT,
+		SHADER_AVATAR,
+		SHADER_ENVIRONMENT,
+		SHADER_INTERFACE,
+		SHADER_EFFECT,
+		SHADER_WINDLIGHT,
+		SHADER_WATER,
+		SHADER_DEFERRED,
+		SHADER_COUNT
+	};
+
+	typedef enum 
+	{
+		MATERIAL_COLOR = 0,
+		SPECULAR_COLOR,
+		BINORMAL,
+		END_RESERVED_ATTRIBS
+	} eGLSLReservedAttribs;
+	
+	typedef enum
+	{
+		DIFFUSE_MAP = 0,
+		SPECULAR_MAP,
+		BUMP_MAP,
+		ENVIRONMENT_MAP,
+		CLOUD_NOISE_MAP,
+		FULLBRIGHT,
+		LIGHTNORM,
+		SUNLIGHT_COLOR,
+		AMBIENT,
+		BLUE_HORIZON,
+		BLUE_DENSITY,
+		HAZE_HORIZON,
+		HAZE_DENSITY,
+		CLOUD_SHADOW,
+		DENSITY_MULTIPLIER,
+		DISTANCE_MULTIPLIER,
+		MAX_Y,
+		GLOW,
+		CLOUD_COLOR,
+		CLOUD_POS_DENSITY1,
+		CLOUD_POS_DENSITY2,
+		CLOUD_SCALE,
+		GAMMA,
+		SCENE_LIGHT_STRENGTH,
+		END_RESERVED_UNIFORMS
+	} eGLSLReservedUniforms;
+
+	typedef enum
+	{
+		SHINY_ORIGIN = END_RESERVED_UNIFORMS
+	} eShinyUniforms;
+
+	typedef enum
+	{
+		WATER_SCREENTEX = END_RESERVED_UNIFORMS,
+		WATER_SCREENDEPTH,
+		WATER_REFTEX,
+		WATER_EYEVEC,
+		WATER_TIME,
+		WATER_WAVE_DIR1,
+		WATER_WAVE_DIR2,
+		WATER_LIGHT_DIR,
+		WATER_SPECULAR,
+		WATER_SPECULAR_EXP,
+		WATER_FOGCOLOR,
+		WATER_FOGDENSITY,
+		WATER_REFSCALE,
+		WATER_WATERHEIGHT,
+	} eWaterUniforms;
+
+	typedef enum
+	{
+		WL_CAMPOSLOCAL = END_RESERVED_UNIFORMS,
+		WL_WATERHEIGHT
+	} eWLUniforms;
+
+	typedef enum
+	{
+		TERRAIN_DETAIL0 = END_RESERVED_UNIFORMS,
+		TERRAIN_DETAIL1,
+		TERRAIN_DETAIL2,
+		TERRAIN_DETAIL3,
+		TERRAIN_ALPHARAMP
+	} eTerrainUniforms;
+
+	typedef enum
+	{
+		GLOW_DELTA = END_RESERVED_UNIFORMS
+	} eGlowUniforms;
+
+	typedef enum
+	{
+		AVATAR_WEIGHT = END_RESERVED_ATTRIBS,
+		AVATAR_CLOTHING,
+		AVATAR_WIND,
+		AVATAR_SINWAVE,
+		AVATAR_GRAVITY
+	} eAvatarAttribs;
+
+	typedef enum
+	{
+		AVATAR_MATRIX = END_RESERVED_UNIFORMS
+	} eAvatarUniforms;
+
+	// simple model of forward iterator
+	// http://www.sgi.com/tech/stl/ForwardIterator.html
+	class shader_iter
+	{
+	private:
+		friend bool operator == (shader_iter const & a, shader_iter const & b);
+		friend bool operator != (shader_iter const & a, shader_iter const & b);
+
+		typedef std::vector<LLGLSLShader *>::const_iterator base_iter_t;
+	public:
+		shader_iter()
+		{
+		}
+
+		shader_iter(base_iter_t iter) : mIter(iter)
+		{
+		}
+
+		LLGLSLShader & operator * () const
+		{
+			return **mIter;
+		}
+
+		LLGLSLShader * operator -> () const
+		{
+			return *mIter;
+		}
+
+		shader_iter & operator++ ()
+		{
+			++mIter;
+			return *this;
+		}
+
+		shader_iter operator++ (int)
+		{
+			return mIter++;
+		}
+
+	private:
+		base_iter_t mIter;
+	};
+
+	shader_iter beginShaders() const
+	{
+		return mShaderList.begin();
+	}
+
+	shader_iter endShaders() const
+	{
+		return mShaderList.end();
+	}
+
+
+	/* virtual */ std::string getShaderDirPrefix(void); // Virtual
+
+	/* virtual */ void updateShaderUniforms(LLGLSLShader * shader); // Virtual
+
+private:
+	
+	std::vector<std::string> mShinyUniforms;
+
+	//water parameters
+	std::vector<std::string> mWaterUniforms;
+
+	std::vector<std::string> mWLUniforms;
+
+	//terrain parameters
+	std::vector<std::string> mTerrainUniforms;
+
+	//glow parameters
+	std::vector<std::string> mGlowUniforms;
+
+	std::vector<std::string> mGlowExtractUniforms;
+
+	//avatar shader parameter tables
+	std::vector<std::string> mAvatarAttribs;
+
+	std::vector<std::string> mAvatarUniforms;
+
+	// the list of shaders we need to propagate parameters to.
+	std::vector<LLGLSLShader *> mShaderList;
+
+}; //LLViewerShaderMgr
+
+inline bool operator == (LLViewerShaderMgr::shader_iter const & a, LLViewerShaderMgr::shader_iter const & b)
+{
+	return a.mIter == b.mIter;
+}
+
+inline bool operator != (LLViewerShaderMgr::shader_iter const & a, LLViewerShaderMgr::shader_iter const & b)
+{
+	return a.mIter != b.mIter;
+}
+
+extern LLVector4			gShinyOrigin;
+
+//object shaders
+extern LLGLSLShader			gObjectSimpleProgram;
+extern LLGLSLShader			gObjectSimpleWaterProgram;
+extern LLGLSLShader			gObjectFullbrightProgram;
+extern LLGLSLShader			gObjectFullbrightWaterProgram;
+
+extern LLGLSLShader			gObjectSimpleLODProgram;
+extern LLGLSLShader			gObjectFullbrightLODProgram;
+
+extern LLGLSLShader			gObjectFullbrightShinyProgram;
+extern LLGLSLShader			gObjectShinyProgram;
+extern LLGLSLShader			gObjectShinyWaterProgram;
+
+//environment shaders
+extern LLGLSLShader			gTerrainProgram;
+extern LLGLSLShader			gTerrainWaterProgram;
+extern LLGLSLShader			gWaterProgram;
+extern LLGLSLShader			gUnderWaterProgram;
+extern LLGLSLShader			gGlowProgram;
+extern LLGLSLShader			gGlowExtractProgram;
+
+//interface shaders
+extern LLGLSLShader			gHighlightProgram;
+
+// avatar shader handles
+extern LLGLSLShader			gAvatarProgram;
+extern LLGLSLShader			gAvatarWaterProgram;
+extern LLGLSLShader			gAvatarEyeballProgram;
+extern LLGLSLShader			gAvatarPickProgram;
+
+// WindLight shader handles
+extern LLGLSLShader			gWLSkyProgram;
+extern LLGLSLShader			gWLCloudProgram;
+
+// Post Process Shaders
+extern LLGLSLShader			gPostColorFilterProgram;
+extern LLGLSLShader			gPostNightVisionProgram;
+
+// Deferred rendering shaders
+extern LLGLSLShader			gDeferredDiffuseProgram;
+
+//current avatar shader parameter pointer
+extern GLint				gAvatarMatrixParam;
+
+
+#endif
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index fd56c21..32d7f63 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -57,15 +57,15 @@
 #include "llviewerwindow.h"		// *TODO: remove, only used for width/height
 #include "llworld.h"
 #include "llfeaturemanager.h"
-#if LL_WINDOWS && LL_LCD_COMPILE
-	#include "lllcd.h"
+#if LL_LCD_COMPILE
+#include "lllcd.h"
 #endif
 
 
 class StatAttributes
 {
 public:
-	StatAttributes(const char *name,
+	StatAttributes(const char* name,
 				   const BOOL enabled,
 				   const BOOL is_timer)
 		: mName(name),
@@ -74,9 +74,9 @@ public:
 	{
 	}
 	
-	const char *mName;
-	const BOOL mEnabled;
-	const BOOL mIsTimer;
+	std::string mName;
+	BOOL mEnabled;
+	BOOL mIsTimer;
 };
 
 const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
@@ -332,17 +332,17 @@ void LLViewerStats::addToMessage(LLSD &body) const
 }
 
 // static
-const char *LLViewerStats::statTypeToText(EStatType type)
-{
-	if (type >= 0 && type < ST_COUNT)
-	{
-		return STAT_INFO[type].mName;
-	}
-	else
-	{
-		return "Unknown statistic";
-	}
-}
+// const std::string LLViewerStats::statTypeToText(EStatType type)
+// {
+// 	if (type >= 0 && type < ST_COUNT)
+// 	{
+// 		return STAT_INFO[type].mName;
+// 	}
+// 	else
+// 	{
+// 		return "Unknown statistic";
+// 	}
+// }
 
 // *NOTE:Mani The following methods used to exist in viewer.cpp
 // Moving them here, but not merging them into LLViewerStats yet.
@@ -598,7 +598,7 @@ void update_statistics(U32 frame_count)
 	LLViewerImageList::sTextureBits = 0;
 	LLViewerImageList::sTexturePackets = 0;
 
-#if LL_WINDOWS && LL_LCD_COMPILE
+#if LL_LCD_COMPILE
 	bool LCDenabled = gLcdScreen->Enabled();
 	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, LCDenabled);
 #else
@@ -680,7 +680,7 @@ void send_stats()
 	// send fps only for time app spends in foreground
 	agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
 	agent["version"] = gCurrentVersion;
-	LLString language(gSavedSettings.getString("Language"));
+	std::string language(gSavedSettings.getString("Language"));
 	if(language == "default") language = gSavedSettings.getString("SystemLanguage");	
 	agent["language"] = language;
 	
@@ -755,10 +755,14 @@ void send_stats()
 
 	S32 window_width = gViewerWindow->getWindowDisplayWidth();
 	S32 window_height = gViewerWindow->getWindowDisplayHeight();
+	S32 window_size = (window_width * window_height) / 1024;
+	misc["string_1"] = llformat("%d", window_size);
 	misc["string_1"] = llformat("%.dx%d", window_width, window_height);
 	// misc["string_2"] = 
-	misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6
-	misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6
+// 	misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6
+// 	misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6
+	misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21
+	misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21
 	
 	LLViewerStats::getInstance()->addToMessage(body);
 
diff --git a/linden/indra/newview/llviewerstats.h b/linden/indra/newview/llviewerstats.h
index a0b80f2..f33ad02 100644
--- a/linden/indra/newview/llviewerstats.h
+++ b/linden/indra/newview/llviewerstats.h
@@ -63,7 +63,7 @@ public:
 	LLStat mSimFPS;
 	LLStat mSimPhysicsFPS;
 	LLStat mSimAgentUPS;
-	LLStat mSimLSLIPS;
+	LLStat mSimScriptEPS;
 
 	LLStat mSimFrameMsec;
 	LLStat mSimNetMsec;
@@ -185,8 +185,6 @@ public:
 	
 	void addToMessage(LLSD &body) const;
 
-	static const char *statTypeToText(EStatType type);
-
 private:
 	F64	mStats[ST_COUNT];
 
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index e1c56a6..8a55b3f 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -108,7 +108,7 @@ public:
 					LLPreviewNotecard* preview;
 					preview = new LLPreviewNotecard("preview notecard", 
 													rect, 
-													LLString("Embedded Note: ") + item->getName(),
+													std::string("Embedded Note: ") + item->getName(),
 													item->getUUID(), 
 													LLUUID::null, 
 													item->getAssetUUID(),
@@ -561,10 +561,10 @@ struct LLNotecardCopyInfo
 // Member functions
 //
 
-LLViewerTextEditor::LLViewerTextEditor(const LLString& name, 
+LLViewerTextEditor::LLViewerTextEditor(const std::string& name, 
 									   const LLRect& rect, 
 									   S32 max_length, 
-									   const LLString& default_text, 
+									   const std::string& default_text, 
 									   const LLFontGL* font,
 									   BOOL allow_embedded_items)
 	: LLTextEditor(name, rect, max_length, default_text, font, allow_embedded_items),
@@ -581,7 +581,7 @@ LLViewerTextEditor::LLViewerTextEditor(const LLString& name,
 	//LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_slurl.xml", this);
 	//if (!menu)
 	//{
-	//	menu = new LLMenuGL("");
+	//	menu = new LLMenuGL(LLStringUtil::null);
 	//}
 	//menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
 	//// menu->setVisible(FALSE);
@@ -608,7 +608,7 @@ void LLViewerTextEditor::makePristine()
 
 ///////////////////////////////////////////////////////////////////
 
-BOOL LLViewerTextEditor::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLViewerTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
 	for (child_list_const_iter_t child_iter = getChildList()->begin();
 			child_iter != getChildList()->end(); ++child_iter)
@@ -1068,7 +1068,7 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
 					  BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
 					  EAcceptance *accept,
-					  LLString& tooltip_msg)
+					  std::string& tooltip_msg)
 {
 	BOOL handled = FALSE;
 
@@ -1084,7 +1084,7 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
 					if (drop)
 					{
 						LLInventoryItem *item = (LLInventoryItem *)cargo_data;
-						LLString name = item->getName();
+						std::string name = item->getName();
 						appendText(name, true, true);
 					}
 					*accept = ACCEPT_YES_COPY_SINGLE;
@@ -1165,7 +1165,7 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
 	return handled;
 }
 
-void LLViewerTextEditor::setASCIIEmbeddedText(const LLString& instr)
+void LLViewerTextEditor::setASCIIEmbeddedText(const std::string& instr)
 {
 	LLWString wtext;
 	const U8* buffer = (U8*)(instr.c_str());
@@ -1187,7 +1187,7 @@ void LLViewerTextEditor::setASCIIEmbeddedText(const LLString& instr)
 	setWText(wtext);
 }
 
-void LLViewerTextEditor::setEmbeddedText(const LLString& instr)
+void LLViewerTextEditor::setEmbeddedText(const std::string& instr)
 {
 	LLWString wtext = utf8str_to_wstring(instr);
 	for (S32 i=0; i<(S32)wtext.size(); i++)
@@ -1202,7 +1202,7 @@ void LLViewerTextEditor::setEmbeddedText(const LLString& instr)
 	setWText(wtext);
 }
 
-LLString LLViewerTextEditor::getEmbeddedText()
+std::string LLViewerTextEditor::getEmbeddedText()
 {
 #if 1
 	// New version (Version 2)
@@ -1218,12 +1218,12 @@ LLString LLViewerTextEditor::getEmbeddedText()
 		}
 		outtextw.push_back(wch);
 	}
-	LLString outtext = wstring_to_utf8str(outtextw);
+	std::string outtext = wstring_to_utf8str(outtextw);
 	return outtext;
 #else
 	// Old version (Version 1)
 	mEmbeddedItemList->copyUsedCharsToIndexed();
-	LLString outtext;
+	std::string outtext;
 	for (S32 i=0; i<(S32)mWText.size(); i++)
 	{
 		llwchar wch = mWText[i];
@@ -1242,9 +1242,9 @@ LLString LLViewerTextEditor::getEmbeddedText()
 #endif
 }
 
-LLString LLViewerTextEditor::appendTime(bool prepend_newline)
+std::string LLViewerTextEditor::appendTime(bool prepend_newline)
 {
-	U32 utc_time;
+	time_t utc_time;
 	utc_time = time_corrected();
 
 	// There's only one internal tm buffer.
@@ -1254,7 +1254,7 @@ LLString LLViewerTextEditor::appendTime(bool prepend_newline)
 	// it's daylight savings time there.
 	timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
 
-	LLString text = llformat("[%d:%02d]  ", timep->tm_hour, timep->tm_min);
+	std::string text = llformat("[%d:%02d]  ", timep->tm_hour, timep->tm_min);
 	appendColoredText(text, false, prepend_newline, LLColor4::grey);
 
 	return text;
@@ -1411,8 +1411,8 @@ void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item )
 
 void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item )
 {
-	LLString title =
-		LLString("  ") + LLLandmarkBridge::prefix()	+ item->getName();
+	std::string title =
+		std::string("  ") + LLLandmarkBridge::prefix()	+ item->getName();
 	open_landmark((LLViewerInventoryItem*)item, title, FALSE, item->getUUID(), TRUE);
 }
 
@@ -1519,13 +1519,13 @@ bool LLViewerTextEditor::hasEmbeddedInventory()
 
 ////////////////////////////////////////////////////////////////////////////
 
-BOOL LLViewerTextEditor::importBuffer( const LLString& buffer )
+BOOL LLViewerTextEditor::importBuffer( const char* buffer, S32 length )
 {
-	LLMemoryStream str((U8*)buffer.c_str(), buffer.length());
+	LLMemoryStream str((U8*)buffer, length);
 	return importStream(str);
 }
 
-BOOL LLViewerTextEditor::exportBuffer( LLString& buffer )
+BOOL LLViewerTextEditor::exportBuffer( std::string& buffer )
 {
 	LLNotecard nc(LLNotecard::MAX_SIZE);
 
@@ -1547,7 +1547,7 @@ BOOL LLViewerTextEditor::exportBuffer( LLString& buffer )
 
 LLView* LLViewerTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("text_editor");
+	std::string name("text_editor");
 	node->getAttributeString("name", name);
 
 	LLRect rect;
@@ -1561,8 +1561,8 @@ LLView* LLViewerTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlF
 
 	LLFontGL* font = LLView::selectFont(node);
 
-	// LLString text = node->getValue();
-	LLString text = node->getTextContents().substr(0, max_text_length - 1);
+	// std::string text = node->getValue();
+	std::string text = node->getTextContents().substr(0, max_text_length - 1);
 
 	if (text.size() > max_text_length)
 	{
@@ -1573,7 +1573,7 @@ LLView* LLViewerTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlF
 	LLViewerTextEditor* text_editor = new LLViewerTextEditor(name, 
 								rect,
 								max_text_length,
-								"",
+								LLStringUtil::null,
 								font,
 								allow_embedded_items);
 
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index 347180b..26fd9b3 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -42,10 +42,10 @@ class LLViewerTextEditor : public LLTextEditor
 {
 	
 public:
-	LLViewerTextEditor(const LLString& name,
+	LLViewerTextEditor(const std::string& name,
 					   const LLRect& rect,
 					   S32 max_length,
-					   const LLString& default_text = LLString(),
+					   const std::string& default_text = std::string(),
 					   const LLFontGL* glfont = NULL,
 					   BOOL allow_embedded_items = FALSE);
 
@@ -62,28 +62,28 @@ public:
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask );
 
-	virtual BOOL	handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
+	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask,
 										BOOL drop, EDragAndDropType cargo_type, 
-										void *cargo_data, EAcceptance *accept, LLString& tooltip_msg);
+										void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
 
   	const class LLInventoryItem* getDragItem() const { return mDragItem; }
-	virtual BOOL 	importBuffer(const LLString& buffer);
+	virtual BOOL 	importBuffer(const char* buffer, S32 length);
 	virtual bool	importStream(std::istream& str);
-	virtual BOOL 	exportBuffer(LLString& buffer);
+	virtual BOOL 	exportBuffer(std::string& buffer);
 	void setNotecardInfo(const LLUUID& notecard_item_id, const LLUUID& object_id)
 	{
 		mNotecardInventoryID = notecard_item_id;
 		mObjectID = object_id;
 	}
 	
-	void setASCIIEmbeddedText(const LLString& instr);
-	void setEmbeddedText(const LLString& instr);
-	LLString getEmbeddedText();
+	void setASCIIEmbeddedText(const std::string& instr);
+	void setEmbeddedText(const std::string& instr);
+	std::string getEmbeddedText();
 	
 	// Appends Second Life time, small font, grey.
 	// If this starts a line, you need to prepend a newline.
-	LLString appendTime(bool prepend_newline);
+	std::string appendTime(bool prepend_newline);
 
 	void copyInventory(const LLInventoryItem* item, U32 callback_id = 0);
 
diff --git a/linden/indra/newview/llviewerthrottle.cpp b/linden/indra/newview/llviewerthrottle.cpp
index 54188cd..311dff3 100644
--- a/linden/indra/newview/llviewerthrottle.cpp
+++ b/linden/indra/newview/llviewerthrottle.cpp
@@ -58,7 +58,7 @@ const F32 DYNAMIC_UPDATE_DURATION = 5.0f; // seconds
 LLViewerThrottle gViewerThrottle;
 
 // static
-const char *LLViewerThrottle::sNames[TC_EOF] = {
+const std:: string LLViewerThrottle::sNames[TC_EOF] = {
 							"Resend",
 							"Land",
 							"Wind",
diff --git a/linden/indra/newview/llviewerthrottle.h b/linden/indra/newview/llviewerthrottle.h
index 07ecf85..48dc9ee 100644
--- a/linden/indra/newview/llviewerthrottle.h
+++ b/linden/indra/newview/llviewerthrottle.h
@@ -77,7 +77,7 @@ public:
 
 	LLViewerThrottleGroup getThrottleGroup(const F32 bandwidth_kbps);
 
-	static const char* sNames[TC_EOF];		/* Flawfinder: ignore */
+	static const std::string sNames[TC_EOF];
 protected:
 	F32 mMaxBandwidth;
 	F32 mCurrentBandwidth;
diff --git a/linden/indra/newview/llviewervisualparam.cpp b/linden/indra/newview/llviewervisualparam.cpp
index 1eac683..8358991 100644
--- a/linden/indra/newview/llviewervisualparam.cpp
+++ b/linden/indra/newview/llviewervisualparam.cpp
@@ -71,7 +71,7 @@ BOOL LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node)
 	
 	// VIEWER SPECIFIC PARAMS
 	
-	LLString wearable;
+	std::string wearable;
 	static LLStdStringHandle wearable_string = LLXmlTree::addAttributeString("wearable");
 	if( node->getFastAttributeString( wearable_string, wearable) )
 	{
diff --git a/linden/indra/newview/llviewervisualparam.h b/linden/indra/newview/llviewervisualparam.h
index aced826..5eb750f 100644
--- a/linden/indra/newview/llviewervisualparam.h
+++ b/linden/indra/newview/llviewervisualparam.h
@@ -50,11 +50,11 @@ public:
 
 protected:
 	S32			mWearableType;
-	LLString	mEditGroup;
+	std::string	mEditGroup;
 	F32			mCamDist;
 	F32			mCamAngle;		// degrees
 	F32			mCamElevation;
-	LLString	mCamTargetName;
+	std::string	mCamTargetName;
 	F32			mEditGroupDisplayOrder;
 	BOOL		mShowSimple;	// show edit controls when in "simple ui" mode?
 	F32			mSimpleMin;		// when in simple UI, apply this minimum, range 0.f to 100.f
@@ -91,7 +91,7 @@ public:
 	// interface methods
 	F32					getDisplayOrder()			{ return getInfo()->mEditGroupDisplayOrder; }
 	S32					getWearableType() const		{ return getInfo()->mWearableType; }
-	const LLString&		getEditGroup() const		{ return getInfo()->mEditGroup; }
+	const std::string&	getEditGroup() const		{ return getInfo()->mEditGroup; }
 
 	F32					getCameraDistance()	const	{ return getInfo()->mCamDist; } 
 	F32					getCameraAngle() const		{ return getInfo()->mCamAngle; }  // degrees
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 3954cf0..1f5dd44 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -29,17 +29,17 @@
  * $/LicenseInfo$
  */
 
+// system library includes
+#include <stdio.h>
+#include <iostream>
+#include <fstream>
+
 #include "llviewerprecompiledheaders.h"
 
 #include "llpanellogin.h"
 #include "llviewerkeyboard.h"
 #include "llviewerwindow.h"
 
-// system library includes
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
 #include "llviewquery.h"
 #include "llxmltree.h"
 //#include "llviewercamera.h"
@@ -47,9 +47,6 @@
 
 #include "llvoiceclient.h"	// for push-to-talk button handling
 
-#ifdef SABINRIG
-#include "cbw.h"
-#endif //SABINRIG
 
 //
 // TODO: Many of these includes are unnecessary.  Remove them.
@@ -60,6 +57,7 @@
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llfontgl.h"
+#include "llmousehandler.h"
 #include "llrect.h"
 #include "llsky.h"
 #include "llstring.h"
@@ -112,7 +110,6 @@
 #include "llframestatview.h"
 #include "llgesturemgr.h"
 #include "llglheaders.h"
-#include "llhippo.h"
 #include "llhoverview.h"
 #include "llhudmanager.h"
 #include "llhudview.h"
@@ -192,7 +189,7 @@
 //
 // Globals
 //
-void render_ui_and_swap();
+void render_ui();
 LLBottomPanel* gBottomPanel = NULL;
 
 extern BOOL gDebugClicks;
@@ -204,32 +201,8 @@ extern S32 gJamesInt;
 LLViewerWindow	*gViewerWindow = NULL;
 LLVelocityBar	*gVelocityBar = NULL;
 
-LLVector3d		gLastHitPosGlobal;
-LLVector3d		gLastHitObjectOffset;
-LLUUID			gLastHitObjectID;
-S32				gLastHitObjectFace = -1;
-BOOL			gLastHitLand = FALSE;
-F32				gLastHitUCoord;
-F32				gLastHitVCoord;
-
-
-LLVector3d		gLastHitNonFloraPosGlobal;
-LLVector3d		gLastHitNonFloraObjectOffset;
-LLUUID			gLastHitNonFloraObjectID;
-S32				gLastHitNonFloraObjectFace = -1;
-BOOL			gLastHitParcelWall = FALSE;
-
-S32				gLastHitUIElement = 0;
-LLHUDIcon*		gLastHitHUDIcon = NULL;
 
 BOOL			gDebugSelect = FALSE;
-U8				gLastPickAlpha = 255;
-BOOL			gUseGLPick = FALSE;
-
-// On the next pick pass (whenever that happens)
-// should we try to pick individual faces?
-// Cleared to FALSE every time a pick happens.
-BOOL			gPickFaces = FALSE;
 
 LLFrameTimer	gMouseIdleTimer;
 LLFrameTimer	gAwayTimer;
@@ -240,6 +213,11 @@ BOOL			gShowOverlayTitle = FALSE;
 BOOL			gPickTransparent = TRUE;
 
 BOOL			gDebugFastUIRender = FALSE;
+LLViewerObject*  gDebugRaycastObject = NULL;
+LLVector3       gDebugRaycastIntersection;
+LLVector2       gDebugRaycastTexCoord;
+LLVector3       gDebugRaycastNormal;
+LLVector3       gDebugRaycastBinormal;
 
 // HUD display lines in lower right
 BOOL				gDisplayWindInfo = FALSE;
@@ -257,120 +235,17 @@ const F32 MIN_AFK_TIME = 2.f; // minimum time after setting away state before co
 const F32 MAX_FAST_FRAME_TIME = 0.5f;
 const F32 FAST_FRAME_INCREMENT = 0.1f;
 
-const S32 PICK_HALF_WIDTH = 5;
-const S32 PICK_DIAMETER = 2 * PICK_HALF_WIDTH+1;
-
-const F32 MIN_DISPLAY_SCALE = 0.85f;
+const F32 MIN_DISPLAY_SCALE = 0.75f;
 
 const S32 CONSOLE_BOTTOM_PAD = 40;
-#ifdef SABINRIG
-/// ALL RIG STUFF
-bool rigControl = false;
-bool voltDisplay = true;
-bool nominalX = false;
-bool nominalY = false;
-static F32 nomerX = 0.0f;
-static F32 nomerY = 0.0f;
-const BOARD_NUM = 0; // rig stuff!
-const ADRANGE = BIP10VOLTS; // rig stuff!
-static unsigned short DataVal; // rig stuff!
-static F32 oldValueX = 0;
-static F32 newValueX = 50;
-static F32 oldValueY = 0;
-static F32 newValueY = 50;
-static S32 mouseX = 50;
-static S32 mouseY = 50;
-static float VoltageX = 50; // rig stuff!
-static float VoltageY = 50; // rig stuff!
-static float nVoltX = 0;
-static float nVoltY = 0;
-static F32 temp1 = 50.f;
-static F32 temp2 = 20.f;
-LLCoordGL new_gl;
-#endif //SABINRIG
-
-char	LLViewerWindow::sSnapshotBaseName[LL_MAX_PATH];
-char	LLViewerWindow::sSnapshotDir[LL_MAX_PATH];
-
-char	LLViewerWindow::sMovieBaseName[LL_MAX_PATH];
-
-extern void toggle_debug_menus(void*);
-
-#ifdef SABINRIG
-// static
-void LLViewerWindow::printFeedback()
-{
-	if(rigControl == true)
-	{
-		cbAIn (BOARD_NUM, 0, ADRANGE, &DataVal);
-		cbToEngUnits (BOARD_NUM,ADRANGE,DataVal,&VoltageX); //Convert raw to voltage for X-axis
-		cbAIn (BOARD_NUM, 1, ADRANGE, &DataVal);
-		cbToEngUnits (BOARD_NUM,ADRANGE,DataVal,&VoltageY); //Convert raw to voltage for Y-axis
-		if(voltDisplay == true)
-		{
-			llinfos <<  "Current Voltages - X:" << VoltageX << " Y:" << VoltageY << llendl; //Display voltage
-		}
-
-		if(nVoltX == 0)
-		{
-			nVoltX = VoltageX;
-			nVoltY = VoltageY; //First time setup of nominal values.
-		}
-
-		newValueX = VoltageX;
-		newValueY = VoltageY; //Take in current voltage and set to a separate value for adjustment.
-
-		mouseX = mCurrentMousePoint.mX;
-		mouseY = mCurrentMousePoint.mY; //Take in current cursor position and set to separate value for adjustment.
-
-		if( abs(newValueX - nVoltX) > nomerX )
-		{
-			if( (newValueX - oldValueX) < 0)
-			{
-				mouseX += (S32)( ((newValueX - oldValueX)*.5)) * -temp;
-			}
-			else
-			{
-				mouseX += (S32)( ((newValueX - oldValueX)*.5) * temp1);
-			}
-		}
-		else
-		{
-			mouseX = getWindowWidth() / 2;
-		}
-		if( abs(newValueY - nVoltY) > nomerY )
-		{
-			if( (newValueY - oldValueY) < 0)
-			{
-				mouseY += (S32)( ((newValueY - oldValueY)*(newValueY - oldValueY)) * -temp2);
-			}
-			else
-			{
-				mouseY += (S32)( ((newValueY - oldValueY)*(newValueY - oldValueY)) * temp2);
-			}
-		}
-		else
-		{
-			mouseY = getWindowHeight() / 2;
-		}
-		//mouseX += (S32)( (newValueX - nVoltX) * temp1 + 0.5 );
-		// (newValueX - oldValueX) = difference between current position and nominal position
-		// * temp1 = the amplification of the number that sets sensitivity
-		// + 0.5 = fixes rounding errors
-		
 
-		//mouseY += (S32)( (newValueY - nVoltY) * temp2 + 0.5 ); //Algorithm to adjust voltage for mouse adjustment.
+std::string	LLViewerWindow::sSnapshotBaseName;
+std::string	LLViewerWindow::sSnapshotDir;
 
-		oldValueX = newValueX;
-		oldValueY = newValueY;
+std::string	LLViewerWindow::sMovieBaseName;
 
-		new_gl.mX = mouseX;
-		new_gl.mY = mouseY; //Setup final coordinate to move mouse to.
+extern void toggle_debug_menus(void*);
 
-		setCursorPosition(new_gl); //Set final cursor position
-	}
-}
-#endif //SABINRIG
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -597,7 +472,7 @@ public:
 			ypos += y_inc;
 		}
 		// only display these messages if we are actually rendering beacons at this moment
-		if (LLPipeline::getRenderBeacons(NULL) && LLPipeline::getProcessBeacons(NULL))
+		if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn"))
 		{
 			if (LLPipeline::getRenderParticleBeacons(NULL))
 			{
@@ -658,6 +533,21 @@ void LLViewerWindow::updateDebugText()
 // LLViewerWindow
 //
 
+bool LLViewerWindow::shouldShowToolTipFor(LLMouseHandler *mh)
+{
+	if (mToolTip && mh)
+	{
+		LLMouseHandler::EShowToolTip showlevel = mh->getShowToolTip();
+
+		return (
+			showlevel == LLMouseHandler::SHOW_ALWAYS ||
+			(showlevel == LLMouseHandler::SHOW_IF_NOT_BLOCKED &&
+			 !mToolTipBlocked)
+			);
+	}
+	return false;
+}
+
 BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
 	S32 x = pos.mX;
@@ -665,7 +555,7 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
 	x = llround((F32)x / mDisplayScale.mV[VX]);
 	y = llround((F32)y / mDisplayScale.mV[VY]);
 
-	LLView::sMouseHandlerMessage = "";
+	LLView::sMouseHandlerMessage.clear();
 
 	if (gDebugClicks)
 	{
@@ -687,11 +577,7 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
 	gMouseIdleTimer.reset();
 
 	// Hide tooltips on mousedown
-	if( mToolTip )
-	{
-		mToolTipBlocked = TRUE;
-		mToolTip->setVisible( FALSE );
-	}
+	mToolTipBlocked = TRUE;
 
 	// Also hide hover info on mousedown
 	if (gHoverView)
@@ -731,7 +617,7 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
 		}
 		else
 		{
-			setTopCtrl(NULL);
+			gFocusMgr.setTopCtrl(NULL);
 		}
 	}
 
@@ -773,7 +659,7 @@ BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK ma
 	x = llround((F32)x / mDisplayScale.mV[VX]);
 	y = llround((F32)y / mDisplayScale.mV[VY]);
 
-	LLView::sMouseHandlerMessage = "";
+	LLView::sMouseHandlerMessage.clear();
 
 	if (gDebugClicks)
 	{
@@ -814,7 +700,7 @@ BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK ma
 		}
 		else
 		{
-			setTopCtrl(NULL);
+			gFocusMgr.setTopCtrl(NULL);
 		}
 	}
 
@@ -853,7 +739,7 @@ BOOL LLViewerWindow::handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
 	x = llround((F32)x / mDisplayScale.mV[VX]);
 	y = llround((F32)y / mDisplayScale.mV[VY]);
 
-	LLView::sMouseHandlerMessage = "";
+	LLView::sMouseHandlerMessage.clear();
 
 	if (gDebugClicks)
 	{
@@ -944,7 +830,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
 	x = llround((F32)x / mDisplayScale.mV[VX]);
 	y = llround((F32)y / mDisplayScale.mV[VY]);
 
-	LLView::sMouseHandlerMessage = "";
+	LLView::sMouseHandlerMessage.clear();
 
 	if (gDebugClicks)
 	{
@@ -1004,7 +890,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
 		}
 		else
 		{
-			setTopCtrl(NULL);
+			gFocusMgr.setTopCtrl(NULL);
 		}
 	}
 
@@ -1051,7 +937,7 @@ BOOL LLViewerWindow::handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK m
 	x = llround((F32)x / mDisplayScale.mV[VX]);
 	y = llround((F32)y / mDisplayScale.mV[VY]);
 
-	LLView::sMouseHandlerMessage = "";
+	LLView::sMouseHandlerMessage.clear();
 
 	// Don't care about caps lock for mouse events.
 	if (gDebugClicks)
@@ -1150,6 +1036,7 @@ BOOL LLViewerWindow::handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK
 	return TRUE;
 }
 
+// WARNING: this is potentially called multiple times per frame
 void LLViewerWindow::handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
 	S32 x = pos.mX;
@@ -1177,13 +1064,9 @@ void LLViewerWindow::handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask
 		gAgent.clearAFK();
 	}
 
-	if(mToolTip && mouse_actually_moved)
+	if(mouse_actually_moved)
 	{
-		mToolTipBlocked = FALSE;  // Blocking starts on keyboard events and (only) ends here.
-		if( mToolTip->getVisible() && !mToolTipStickyRect.pointInRect( x, y ) )
-		{
-			mToolTip->setVisible( FALSE );
-		}
+		mToolTipBlocked = FALSE;
 	}
 
 	// Activate the hover picker on mouse move.
@@ -1406,24 +1289,23 @@ BOOL LLViewerWindow::handlePaint(LLWindow *window,  S32 x,  S32 y, S32 width,  S
 		//SetBKColor(hdc, RGB(255, 255, 255));
 		FillRect(hdc, &wnd_rect, CreateSolidBrush(RGB(255, 255, 255)));
 
-		LLString name_str;
+		std::string name_str;
 		gAgent.getName(name_str);
 
-		S32 len;
-		char temp_str[255];		/* Flawfinder: ignore */
-		snprintf(temp_str, sizeof(temp_str), "%s FPS %3.1f Phy FPS %2.1f Time Dil %1.3f",		/* Flawfinder: ignore */
+		std::string temp_str;
+		temp_str = llformat( "%s FPS %3.1f Phy FPS %2.1f Time Dil %1.3f",		/* Flawfinder: ignore */
 				name_str.c_str(),
 				LLViewerStats::getInstance()->mFPSStat.getMeanPerSec(),
 				LLViewerStats::getInstance()->mSimPhysicsFPS.getPrev(0),
 				LLViewerStats::getInstance()->mSimTimeDilation.getPrev(0));
-		len = strlen(temp_str);		/* Flawfinder: ignore */
-		TextOutA(hdc, 0, 0, temp_str, len); 
+		S32 len = temp_str.length();
+		TextOutA(hdc, 0, 0, temp_str.c_str(), len); 
 
 
 		LLVector3d pos_global = gAgent.getPositionGlobal();
-		snprintf(temp_str, sizeof(temp_str), "Avatar pos %6.1lf %6.1lf %6.1lf", pos_global.mdV[0], pos_global.mdV[1], pos_global.mdV[2]);		/* Flawfinder: ignore */
-		len = strlen(temp_str);		/* Flawfinder: ignore */
-		TextOutA(hdc, 0, 25, temp_str, len); 
+		temp_str = llformat( "Avatar pos %6.1lf %6.1lf %6.1lf", pos_global.mdV[0], pos_global.mdV[1], pos_global.mdV[2]);
+		len = temp_str.length();
+		TextOutA(hdc, 0, 25, temp_str.c_str(), len); 
 
 		TextOutA(hdc, 0, 50, "Set \"DisableRendering FALSE\" in settings.ini file to reenable", 61);
 		EndPaint(window_handle, &ps); 
@@ -1492,7 +1374,7 @@ BOOL LLViewerWindow::handleDeviceChange(LLWindow *window)
 // Classes
 //
 LLViewerWindow::LLViewerWindow(
-	char* title, char* name,
+	const std::string& title, const std::string& name,
 	S32 x, S32 y,
 	S32 width, S32 height,
 	BOOL fullscreen, BOOL ignore_pixel_depth)
@@ -1511,14 +1393,14 @@ LLViewerWindow::LLViewerWindow(
 	mToolStored( NULL ),
 	mSuppressToolbox( FALSE ),
 	mHideCursorPermanent( FALSE ),
-	mPickPending(FALSE),
-	mIgnoreActivate( FALSE )
+	mCursorHidden(FALSE),
+	mIgnoreActivate( FALSE ),
+	mHoverPick()
 {
 	// Default to application directory.
-	strcpy(LLViewerWindow::sSnapshotBaseName, "Snapshot");	/* Flawfinder: ignore */
-	strcpy(LLViewerWindow::sMovieBaseName, "SLmovie");	/* Flawfinder: ignore */
-	LLViewerWindow::sSnapshotDir[0] = '\0';
-
+	LLViewerWindow::sSnapshotBaseName = "Snapshot";
+	LLViewerWindow::sMovieBaseName = "SLmovie";
+	resetSnapshotLoc();
 
 	// create window
 	mWindow = LLWindowManager::createWindow(
@@ -1621,12 +1503,10 @@ LLViewerWindow::LLViewerWindow(
 	mCurrentMousePoint.mX = getWindowWidth() / 2;
 	mCurrentMousePoint.mY = getWindowHeight() / 2;
 
-	mPickBuffer = new U8[PICK_DIAMETER * PICK_DIAMETER * 4];
-
 	gShowOverlayTitle = gSavedSettings.getBOOL("ShowOverlayTitle");
 	mOverlayTitle = gSavedSettings.getString("OverlayTitle");
 	// Can't have spaces in settings.ini strings, so use underscores instead and convert them.
-	LLString::replaceChar(mOverlayTitle, '_', ' ');
+	LLStringUtil::replaceChar(mOverlayTitle, '_', ' ');
 
 	LLAlertDialog::setDisplayCallback(alertCallback); // call this before calling any modal dialogs
 
@@ -1757,7 +1637,7 @@ void LLViewerWindow::initBase()
 	mRootView->addChild(gNotifyBoxView, -2);
 
 	// Tooltips go above floaters
-	mToolTip = new LLTextBox( "tool tip", LLRect(0, 1, 1, 0 ) );
+	mToolTip = new LLTextBox( std::string("tool tip"), LLRect(0, 1, 1, 0 ) );
 	mToolTip->setHPad( 4 );
 	mToolTip->setVPad( 2 );
 	mToolTip->setColor( gColors.getColor( "ToolTipTextColor" ) );
@@ -1770,14 +1650,14 @@ void LLViewerWindow::initBase()
 	mToolTip->setVisible( FALSE );
 
 	// Add the progress bar view (startup view), which overrides everything
-	mProgressView = new LLProgressView("ProgressView", full_window);
+	mProgressView = new LLProgressView(std::string("ProgressView"), full_window);
 	mRootView->addChild(mProgressView);
 	setShowProgress(FALSE);
-	setProgressCancelButtonVisible(FALSE, "");
+	setProgressCancelButtonVisible(FALSE);
 }
 
 
-void adjust_rect_top_left(const LLString& control, const LLRect& window)
+void adjust_rect_top_left(const std::string& control, const LLRect& window)
 {
 	LLRect r = gSavedSettings.getRect(control);
 	if (r.mLeft == 0 && r.mBottom == 0)
@@ -1787,7 +1667,7 @@ void adjust_rect_top_left(const LLString& control, const LLRect& window)
 	}
 }
 
-void adjust_rect_top_center(const LLString& control, const LLRect& window)
+void adjust_rect_top_center(const std::string& control, const LLRect& window)
 {
 	LLRect r = gSavedSettings.getRect(control);
 	if (r.mLeft == 0 && r.mBottom == 0)
@@ -1800,7 +1680,7 @@ void adjust_rect_top_center(const LLString& control, const LLRect& window)
 	}
 }
 
-void adjust_rect_top_right(const LLString& control, const LLRect& window)
+void adjust_rect_top_right(const std::string& control, const LLRect& window)
 {
 	LLRect r = gSavedSettings.getRect(control);
 	if (r.mLeft == 0 && r.mBottom == 0)
@@ -1813,7 +1693,7 @@ void adjust_rect_top_right(const LLString& control, const LLRect& window)
 	}
 }
 
-void adjust_rect_bottom_center(const LLString& control, const LLRect& window)
+void adjust_rect_bottom_center(const std::string& control, const LLRect& window)
 {
 	LLRect r = gSavedSettings.getRect(control);
 	if (r.mLeft == 0 && r.mBottom == 0)
@@ -1829,7 +1709,7 @@ void adjust_rect_bottom_center(const LLString& control, const LLRect& window)
 	}
 }
 
-void adjust_rect_centered_partial_zoom(const LLString& control,
+void adjust_rect_centered_partial_zoom(const std::string& control,
 									   const LLRect& window)
 {
 	LLRect rect = gSavedSettings.getRect(control);
@@ -1868,8 +1748,6 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window)
 
 	adjust_rect_top_left("FloaterLandRect5", window);
 
-	adjust_rect_top_left("FloaterHUDRect2", window);
-
 	adjust_rect_top_left("FloaterFindRect2", window);
 
 	adjust_rect_top_left("FloaterGestureRect2", window);
@@ -1891,8 +1769,29 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window)
 			r.getHeight());
 		gSavedSettings.setRect("FloaterInventoryRect", r);
 	}
+	
+// 	adjust_rect_top_left("FloaterHUDRect2", window);
+
+	// slightly off center to be left of the avatar.
+	r = gSavedSettings.getRect("FloaterHUDRect2");
+	if (r.mLeft == 0 && r.mBottom == 0)
+	{
+		r.setOriginAndSize(
+			window.getWidth()/4 - r.getWidth()/2,
+			2*window.getHeight()/3 - r.getHeight()/2,
+			r.getWidth(),
+			r.getHeight());
+		gSavedSettings.setRect("FloaterHUDRect2", r);
+	}
 }
 
+//Rectangles need to be adjusted after the window is constructed
+//in order for proper centering to take place
+void LLViewerWindow::adjustControlRectanglesForFirstUse(const LLRect& window)
+{
+	adjust_rect_bottom_center("FloaterMoveRect2", window);
+	adjust_rect_top_center("FloaterCameraRect3", window);
+}
 
 void LLViewerWindow::initWorldUI()
 {
@@ -1909,7 +1808,7 @@ void LLViewerWindow::initWorldUI()
 		mRootView->addChild(gBottomPanel);
 
 		// View for hover information
-		gHoverView = new LLHoverView("gHoverView", full_window);
+		gHoverView = new LLHoverView(std::string("gHoverView"), full_window);
 		gHoverView->setVisible(TRUE);
 		mRootView->addChild(gHoverView);
 
@@ -1917,7 +1816,7 @@ void LLViewerWindow::initWorldUI()
 		// Map
 		//
 		// TODO: Move instance management into class
-		gFloaterMap = new LLFloaterMap("Map");
+		gFloaterMap = new LLFloaterMap(std::string("Map"));
 		gFloaterMap->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
 
 		// keep onscreen
@@ -1933,7 +1832,7 @@ void LLViewerWindow::initWorldUI()
 		LLRect morph_view_rect = full_window;
 		morph_view_rect.stretch( -STATUS_BAR_HEIGHT );
 		morph_view_rect.mTop = full_window.mTop - 32;
-		gMorphView = new LLMorphView("gMorphView", morph_view_rect );
+		gMorphView = new LLMorphView(std::string("gMorphView"), morph_view_rect );
 		mRootView->addChild(gMorphView);
 		gMorphView->setVisible(FALSE);
 
@@ -1960,7 +1859,7 @@ void LLViewerWindow::initWorldUI()
 		S32 menu_bar_height = gMenuBarView->getRect().getHeight();
 		LLRect root_rect = getRootView()->getRect();
 		LLRect status_rect(0, root_rect.getHeight(), root_rect.getWidth(), root_rect.getHeight() - menu_bar_height);
-		gStatusBar = new LLStatusBar("status", status_rect);
+		gStatusBar = new LLStatusBar(std::string("status"), status_rect);
 		gStatusBar->setFollows(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_TOP);
 
 		gStatusBar->reshape(root_rect.getWidth(), gStatusBar->getRect().getHeight(), TRUE);
@@ -1977,10 +1876,11 @@ void LLViewerWindow::initWorldUI()
 	}
 }
 
-
-LLViewerWindow::~LLViewerWindow()
+// Destroy the UI
+void LLViewerWindow::shutdownViews()
 {
 	delete mDebugText;
+	mDebugText = NULL;
 	
 	gSavedSettings.setS32("FloaterViewBottom", gFloaterView->getRect().mBottom);
 
@@ -2010,7 +1910,10 @@ LLViewerWindow::~LLViewerWindow()
 
 	delete mToolTip;
 	mToolTip = NULL;
-	
+}
+
+void LLViewerWindow::shutdownGL()
+{
 	//--------------------------------------------------------
 	// Shutdown GL cleanly.  Order is very important here.
 	//--------------------------------------------------------
@@ -2035,9 +1938,6 @@ LLViewerWindow::~LLViewerWindow()
 
 	LLViewerImage::cleanupClass();
 	
-	delete[] mPickBuffer;
-	mPickBuffer = NULL;
-
 	llinfos << "Cleaning up select manager" << llendl;
 	LLSelectMgr::getInstance()->cleanup();
 
@@ -2049,8 +1949,11 @@ LLViewerWindow::~LLViewerWindow()
 		stopGL(FALSE);
 		stop_glerror();
 	}
+}
 
-
+// shutdownViews() and shutdownGL() need to be called first
+LLViewerWindow::~LLViewerWindow()
+{
 	llinfos << "Destroying Window" << llendl;
 	destroyWindow();
 }
@@ -2064,6 +1967,8 @@ void LLViewerWindow::setCursor( ECursorType c )
 void LLViewerWindow::showCursor()
 {
 	mWindow->showCursor();
+	
+	mCursorHidden = FALSE;
 }
 
 void LLViewerWindow::hideCursor()
@@ -2076,6 +1981,8 @@ void LLViewerWindow::hideCursor()
 
 	// And hide the cursor
 	mWindow->hideCursor();
+
+	mCursorHidden = TRUE;
 }
 
 void LLViewerWindow::sendShapeToSim()
@@ -2215,7 +2122,7 @@ void LLViewerWindow::setNormalControlsVisible( BOOL visible )
 
 void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
 {
-   	LLString::format_map_t args;
+   	LLStringUtil::format_map_t args;
     LLColor4 new_bg_color;
 
     if(god_mode && LLViewerLogin::getInstance()->isInProductionGrid())
@@ -2287,7 +2194,7 @@ void LLViewerWindow::draw()
 	if (gSavedSettings.getBOOL("DisplayTimecode"))
 	{
 		// draw timecode block
-		char text[256];		/* Flawfinder: ignore */
+		std::string text;
 
 		glLoadIdentity();
 
@@ -2425,11 +2332,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	}
 
 	// Hide tooltips on keypress
-	if(mToolTip )
-	{
-		mToolTipBlocked = TRUE; // block until next time mouse is moved
-		mToolTip->setVisible( FALSE );
-	}
+	mToolTipBlocked = TRUE; // block until next time mouse is moved
 
 	// Also hide hover info on keypress
 	if (gHoverView)
@@ -2461,32 +2364,9 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 		}
 	}
 
-	// Example "bug" for bug reporter web page
-	if ((MASK_SHIFT & mask) 
-		&& (MASK_ALT & mask)
-		&& (MASK_CONTROL & mask)
-		&& ('H' == key || 'h' == key))
-	{
-		trigger_hippo_bug(NULL);
-	}
-
 	// handle escape key
-	if (key == KEY_ESCAPE && mask == MASK_NONE)
-	{
-		if (gMenuHolder && gMenuHolder->hideMenus())
-		{
-			return TRUE;
-		}
-
-		//if quit from menu, turn off the Keyboardmode for the menu.
-		if(LLMenuGL::getKeyboardMode())
-			LLMenuGL::setKeyboardMode(FALSE);
-
-		if (gFocusMgr.getTopCtrl())
-		{
-			gFocusMgr.setTopCtrl(NULL);
-			return TRUE;
-		}
+	//if (key == KEY_ESCAPE && mask == MASK_NONE)
+	//{
 
 		// *TODO: get this to play well with mouselook and hidden
 		// cursor modes, etc, and re-enable.
@@ -2495,7 +2375,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 		//	gFocusMgr.setMouseCapture(NULL);
 		//	return TRUE;
 		//}
-	}
+	//}
 
 	// let menus handle navigation keys
 	if (gMenuBarView && gMenuBarView->handleKey(key, mask, TRUE))
@@ -2667,7 +2547,7 @@ BOOL LLViewerWindow::handleUnicodeChar(llwchar uni_char, MASK mask)
 
 void LLViewerWindow::handleScrollWheel(S32 clicks)
 {
-	LLView::sMouseHandlerMessage = "";
+	LLView::sMouseHandlerMessage.clear();
 
 	gMouseIdleTimer.reset();
 
@@ -2743,7 +2623,11 @@ BOOL LLViewerWindow::handlePerFrameHover()
 {
 	static std::string last_handle_msg;
 
-	LLView::sMouseHandlerMessage = "";
+	LLView::sMouseHandlerMessage.clear();
+
+	S32 x = mCurrentMousePoint.mX;
+	S32 y = mCurrentMousePoint.mY;
+	MASK mask = gKeyboard->currentMask(TRUE);
 
 	//RN: fix for asynchronous notification of mouse leaving window not working
 	LLCoordWindow mouse_pos;
@@ -2760,6 +2644,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
 		mMouseInWindow = TRUE;
 	}
 
+
 	S32 dx = lltrunc((F32) (mCurrentMousePoint.mX - mLastMousePoint.mX) * LLUI::sGLScaleFactor.mV[VX]);
 	S32 dy = lltrunc((F32) (mCurrentMousePoint.mY - mLastMousePoint.mY) * LLUI::sGLScaleFactor.mV[VY]);
 
@@ -2790,10 +2675,6 @@ BOOL LLViewerWindow::handlePerFrameHover()
 		return TRUE;
 	}
 
-	S32 x = mCurrentMousePoint.mX;
-	S32 y = mCurrentMousePoint.mY;
-	MASK mask = gKeyboard->currentMask(TRUE);
-
 	// clean up current focus
 	LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
 	if (cur_focus)
@@ -2829,13 +2710,6 @@ BOOL LLViewerWindow::handlePerFrameHover()
 		}
 	}
 
-	gPipeline.sRenderProcessBeacons = FALSE;
-	KEY key = gKeyboard->currentKey();
-	if (((mask & MASK_CONTROL) && ('N' == key || 'n' == key)) || gSavedSettings.getBOOL("BeaconAlwaysOn"))
-	{
-		gPipeline.sRenderProcessBeacons = TRUE;
-	}
-
 	BOOL handled = FALSE;
 
 	BOOL handled_by_top_ctrl = FALSE;
@@ -2884,9 +2758,9 @@ BOOL LLViewerWindow::handlePerFrameHover()
 			}
 			else if (LLView::sDebugMouseHandling)
 			{
-				if (last_handle_msg != "")
+				if (last_handle_msg != LLStringUtil::null)
 				{
-					last_handle_msg = "";
+					last_handle_msg.clear();
 					llinfos << "Hover not handled by view" << llendl;
 				}
 			}
@@ -2928,10 +2802,9 @@ BOOL LLViewerWindow::handlePerFrameHover()
 
 	}
 
-	//llinfos << (mToolTipBlocked ? "BLOCKED" : "NOT BLOCKED") << llendl;
 	// Show a new tool tip (or update one that is alrady shown)
 	BOOL tool_tip_handled = FALSE;
-	LLString tool_tip_msg;
+	std::string tool_tip_msg;
 	F32 tooltip_delay = gSavedSettings.getF32( "ToolTipDelay" );
 	//HACK: hack for tool-based tooltips which need to pop up more quickly
 	//Also for show xui names as tooltips debug mode
@@ -2940,38 +2813,48 @@ BOOL LLViewerWindow::handlePerFrameHover()
 		tooltip_delay = gSavedSettings.getF32( "DragAndDropToolTipDelay" );
 	}
 	if( handled && 
-		!mToolTipBlocked &&
-		(gMouseIdleTimer.getElapsedTimeF32() > tooltip_delay) &&
-		!mWindow->isCursorHidden() )
+	    gMouseIdleTimer.getElapsedTimeF32() > tooltip_delay &&
+	    !mWindow->isCursorHidden() )
 	{
 		LLRect screen_sticky_rect;
-
+		LLMouseHandler *mh;
+		S32 local_x, local_y;
 		if (mouse_captor)
 		{
-			S32 local_x, local_y;
-			mouse_captor->screenPointToLocal( x, y, &local_x, &local_y );
-			tool_tip_handled = mouse_captor->handleToolTip( local_x, local_y, tool_tip_msg, &screen_sticky_rect );
+			mouse_captor->screenPointToLocal(x, y, &local_x, &local_y);
+			mh = mouse_captor;
 		}
 		else if (handled_by_top_ctrl)
 		{
-			S32 local_x, local_y;
-			top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
-			tool_tip_handled = top_ctrl->handleToolTip( local_x, local_y, tool_tip_msg, &screen_sticky_rect );
+			top_ctrl->screenPointToLocal(x, y, &local_x, &local_y);
+			mh = top_ctrl;
 		}
 		else
 		{
-			tool_tip_handled = mRootView->handleToolTip(x, y, tool_tip_msg, &screen_sticky_rect );
+			local_x = x; local_y = y;
+			mh = mRootView;
+		}
+
+		BOOL tooltip_vis = FALSE;
+		if (shouldShowToolTipFor(mh))
+		{
+			tool_tip_handled = mh->handleToolTip(local_x, local_y, tool_tip_msg, &screen_sticky_rect );
+		
+			if( tool_tip_handled && !tool_tip_msg.empty() )
+			{
+				mToolTipStickyRect = screen_sticky_rect;
+				mToolTip->setWrappedText( tool_tip_msg, 200 );
+				mToolTip->reshapeToFitText();
+				mToolTip->setOrigin( x, y );
+				LLRect virtual_window_rect(0, getWindowHeight(), getWindowWidth(), 0);
+				mToolTip->translateIntoRect( virtual_window_rect, FALSE );
+				tooltip_vis = TRUE;
+			}
 		}
 
-		if( tool_tip_handled && !tool_tip_msg.empty() )
+		if (mToolTip)
 		{
-			mToolTipStickyRect = screen_sticky_rect;
-			mToolTip->setWrappedText( tool_tip_msg, 200 );
-			mToolTip->reshapeToFitText();
-			mToolTip->setOrigin( x, y );
-			LLRect virtual_window_rect(0, getWindowHeight(), getWindowWidth(), 0);
-			mToolTip->translateIntoRect( virtual_window_rect, FALSE );
-			mToolTip->setVisible( TRUE );
+			mToolTip->setVisible( tooltip_vis );
 		}
 	}		
 	
@@ -3135,10 +3018,65 @@ BOOL LLViewerWindow::handlePerFrameHover()
 		LLSelectMgr::getInstance()->deselectUnused();
 	}
 
+	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST))
+	{
+		gDebugRaycastObject = cursorIntersect(-1, -1, 512.f, NULL, -1,
+											  NULL,
+											  &gDebugRaycastIntersection,
+											  &gDebugRaycastTexCoord,
+											  &gDebugRaycastNormal,
+											  &gDebugRaycastBinormal);
+	}
+
+
+	// per frame picking - for tooltips and changing cursor over interactive objects
+	static S32 previous_x = -1;
+	static S32 previous_y = -1;
+	static BOOL mouse_moved_since_pick = FALSE;
+
+	if ((previous_x != x) || (previous_y != y))
+		mouse_moved_since_pick = TRUE;
+
+	BOOL do_pick = FALSE;
+
+	F32 picks_moving = gSavedSettings.getF32("PicksPerSecondMouseMoving");
+	if ((mouse_moved_since_pick) && (picks_moving > 0.0) && (mPickTimer.getElapsedTimeF32() > 1.0f / picks_moving))
+	{
+		do_pick = TRUE;
+	}
+
+	F32 picks_stationary = gSavedSettings.getF32("PicksPerSecondMouseStationary");
+	if ((!mouse_moved_since_pick) && (picks_stationary > 0.0) && (mPickTimer.getElapsedTimeF32() > 1.0f / picks_stationary))
+	{
+		do_pick = TRUE;
+	}
+
+	if (getCursorHidden())
+	{
+		do_pick = FALSE;
+	}
+
+	if (do_pick)
+	{
+		mouse_moved_since_pick = FALSE;
+		mPickTimer.reset();
+		pickAsync(getCurrentMouseX(), getCurrentMouseY(), mask, hoverPickCallback, TRUE);
+	}
+
+	previous_x = x;
+	previous_y = y;
+	
 	return handled;
 }
 
 
+/* static */
+void LLViewerWindow::hoverPickCallback(const LLPickInfo& pick_info)
+{
+	gViewerWindow->mHoverPick = pick_info;
+}
+	
+
 void LLViewerWindow::saveLastMouse(const LLCoordGL &point)
 {
 	// Store last mouse location.
@@ -3232,7 +3170,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
 			glPushMatrix();
 			if (selection->getSelectType() == SELECT_TYPE_HUD)
 			{
-				F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
+				F32 zoom = gAgent.mHUDCurZoom;
 				glScalef(zoom, zoom, zoom);
 			}
 
@@ -3384,19 +3322,14 @@ BOOL LLViewerWindow::clickPointOnSurfaceGlobal(const S32 x, const S32 y, LLViewe
 	return intersect;
 }
 
-void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask, void (*callback)(S32 x, S32 y, MASK mask), BOOL pick_transparent, BOOL pick_parcel_walls)
+void LLViewerWindow::pickAsync(S32 x, S32 y_from_bot, MASK mask, void (*callback)(const LLPickInfo& info), BOOL pick_transparent, BOOL get_surface_info)
 {
 	if (gNoRender)
 	{
 		return;
 	}
 	
-	glClear(GL_DEPTH_BUFFER_BIT);
-	gDepthDirty = TRUE;
-
-	S32 scaled_x = llround((F32)x * mDisplayScale.mV[VX]);
-	S32 scaled_y = llround((F32)y_from_bot * mDisplayScale.mV[VY]);
-
+	// push back pick info object
 	BOOL in_build_mode = gFloaterTools && gFloaterTools->getVisible();
 	if (in_build_mode || LLDrawPoolAlpha::sShowDebugAlpha)
 	{
@@ -3404,29 +3337,54 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
 		// "Show Debug Alpha" means no object actually transparent
 		pick_transparent = TRUE;
 	}
-	gPickTransparent = pick_transparent;
 
-	gUseGLPick = FALSE;
-	mPickCallback = callback;
+	// center initial pick frame buffer region under mouse cursor
+	// since that area is guaranteed to be onscreen and hence a valid
+	// part of the framebuffer
+	if (mPicks.empty())
+	{
+		mPickScreenRegion.setCenterAndSize(x, y_from_bot, PICK_DIAMETER, PICK_DIAMETER);
 
-	// Default to not hitting anything
-	gLastHitPosGlobal.zeroVec();
-	gLastHitObjectOffset.zeroVec();
-	gLastHitObjectID.setNull();
-	gLastHitObjectFace = -1;
+		if (mPickScreenRegion.mLeft < 0) mPickScreenRegion.translate(-mPickScreenRegion.mLeft, 0);
+		if (mPickScreenRegion.mBottom < 0) mPickScreenRegion.translate(0, -mPickScreenRegion.mBottom);
+		if (mPickScreenRegion.mRight > mWindowRect.getWidth() ) mPickScreenRegion.translate(mWindowRect.getWidth() - mPickScreenRegion.mRight, 0);
+		if (mPickScreenRegion.mTop > mWindowRect.getHeight() ) mPickScreenRegion.translate(0, mWindowRect.getHeight() - mPickScreenRegion.mTop);
+	}
+
+	// set frame buffer region for picking results
+	// stack multiple picks left to right
+	LLRect screen_region = mPickScreenRegion;
+	screen_region.translate(mPicks.size() * PICK_DIAMETER, 0);
 
-	gLastHitNonFloraPosGlobal.zeroVec();
-	gLastHitNonFloraObjectOffset.zeroVec();
-	gLastHitNonFloraObjectID.setNull();
-	gLastHitNonFloraObjectFace = -1;
+	LLPickInfo pick(LLCoordGL(x, y_from_bot), screen_region, mask, pick_transparent, get_surface_info, callback);
+
+	schedulePick(pick);
+}
 
-	gLastHitParcelWall = FALSE;
+void LLViewerWindow::schedulePick(LLPickInfo& pick_info)
+{
+	if (mPicks.size() >= 1024 || mWindow->getMinimized())
+	{ //something went wrong, picks are being scheduled but not processed
+		
+		if (pick_info.mPickCallback)
+		{
+			pick_info.mPickCallback(pick_info);
+		}
+	
+		return;
+	}
+	llassert_always(pick_info.mScreenRegion.notNull());
+	mPicks.push_back(pick_info);
+	
+	S32 scaled_x = llround((F32)pick_info.mMousePt.mX * mDisplayScale.mV[VX]);
+	S32 scaled_y = llround((F32)pick_info.mMousePt.mY * mDisplayScale.mV[VY]);
 
+	// Default to not hitting anything
 	LLCamera pick_camera;
 	pick_camera.setOrigin(LLViewerCamera::getInstance()->getOrigin());
 	pick_camera.setOriginAndLookAt(LLViewerCamera::getInstance()->getOrigin(),
 								   LLViewerCamera::getInstance()->getUpAxis(),
-								   LLViewerCamera::getInstance()->getOrigin() + mouseDirectionGlobal(x, y_from_bot));
+								   LLViewerCamera::getInstance()->getOrigin() + mouseDirectionGlobal(pick_info.mMousePt.mX, pick_info.mMousePt.mY));
 	pick_camera.setView(0.5f*DEG_TO_RAD);
 	pick_camera.setNear(LLViewerCamera::getInstance()->getNear());
 	pick_camera.setFar(LLViewerCamera::getInstance()->getFar());
@@ -3443,26 +3401,39 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
 	glPushMatrix();
 	glLoadIdentity();
 
+	// clear work area
+	{
+		LLGLState scissor_state(GL_SCISSOR_TEST);
+		scissor_state.enable();
+		glScissor(pick_info.mScreenRegion.mLeft, pick_info.mScreenRegion.mBottom, pick_info.mScreenRegion.getWidth(), pick_info.mScreenRegion.getHeight());
+	glClearColor(0.f, 0.f, 0.f, 0.f);
+	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+	//glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+	}
+	
 	// build perspective transform and picking viewport
 	// Perform pick on a PICK_DIAMETER x PICK_DIAMETER pixel region around cursor point.
 	// Don't limit the select distance for this pick.
-	LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, scaled_x - (PICK_HALF_WIDTH + 2), scaled_y - (PICK_HALF_WIDTH + 2), PICK_DIAMETER + 4, PICK_DIAMETER + 4, FALSE);
+	LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, scaled_x - PICK_HALF_WIDTH, scaled_y - PICK_HALF_WIDTH, PICK_DIAMETER, PICK_DIAMETER, FALSE);
+
+	// render for object picking
+
 	// make viewport big enough to handle antialiased frame buffers
-	gGLViewport[0] = scaled_x - (PICK_HALF_WIDTH + 2);
-	gGLViewport[1] = scaled_y - (PICK_HALF_WIDTH + 2);
-	gGLViewport[2] = PICK_DIAMETER + 4;
-	gGLViewport[3] = PICK_DIAMETER + 4;
+	gGLViewport[0] = pick_info.mScreenRegion.mLeft;
+	gGLViewport[1] = pick_info.mScreenRegion.mBottom;
+	gGLViewport[2] = pick_info.mScreenRegion.getWidth();
+	gGLViewport[3] = pick_info.mScreenRegion.getHeight();
+
 	glViewport(gGLViewport[0], gGLViewport[1], gGLViewport[2], gGLViewport[3]);
 	LLViewerCamera::updateFrustumPlanes(pick_camera);
 	stop_glerror();
 
-	glClearColor(0.f, 0.f, 0.f, 0.f);
-	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-	//glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
 	// Draw the objects so the user can select them.
 	// The starting ID is 1, since land is zero.
-	gObjectList.renderObjectsForSelect(pick_camera, pick_parcel_walls);
+	LLRect pick_region;
+	pick_region.setOriginAndSize(pick_info.mMousePt.mX - PICK_HALF_WIDTH,
+								 pick_info.mMousePt.mY - PICK_HALF_WIDTH, PICK_DIAMETER, PICK_DIAMETER);
+	gObjectList.renderObjectsForSelect(pick_camera, pick_region, FALSE, pick_info.mPickTransparent);
 
 	stop_glerror();
 
@@ -3472,400 +3443,135 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
 	glMatrixMode(GL_MODELVIEW);
 	glPopMatrix();
 
+	setup3DRender();
+	setup2DRender();
 	setupViewport();
 
-	mPickPoint.set(x, y_from_bot);
-	mPickOffset.set(0, 0);
-	mPickMask = mask;
-	mPickPending = TRUE;
-
 	// delay further event processing until we receive results of pick
 	mWindow->delayInputProcessing();
 }
 
-void LLViewerWindow::hitUIElementImmediate(S32 x, S32 y, void (*callback)(S32 x, S32 y, MASK mask))
+
+void LLViewerWindow::performPick()
 {
-	// Performs the GL UI pick.
-	// Stores its results in global, gLastHitUIElement
 	if (gNoRender)
 	{
 		return;
 	}
-	
-	hitUIElementAsync(x, y, gKeyboard->currentMask(TRUE), NULL);
-	performPick();
-	if (callback)
+
+	if (!mPicks.empty())
+	{
+		std::vector<LLPickInfo>::iterator pick_it;
+		for (pick_it = mPicks.begin(); pick_it != mPicks.end(); ++pick_it)
+		{
+			pick_it->fetchResults();
+		}
+
+		mLastPick = mPicks.back();
+		mPicks.clear();
+	}
+}
+
+void LLViewerWindow::returnEmptyPicks()
+{
+	std::vector<LLPickInfo>::iterator pick_it;
+	for (pick_it = mPicks.begin(); pick_it != mPicks.end(); ++pick_it)
 	{
-		callback(x, y, gKeyboard->currentMask(TRUE));
+		mLastPick = *pick_it;
+		// just trigger callback with empty results
+		if (pick_it->mPickCallback)
+		{
+			pick_it->mPickCallback(*pick_it);
+		}
 	}
+	mPicks.clear();
 }
 
-//RN: this currently doesn't do anything
-void LLViewerWindow::hitUIElementAsync(S32 x, S32 y_from_bot, MASK mask, void (*callback)(S32 x, S32 y, MASK mask))
+// Performs the GL object/land pick.
+LLPickInfo LLViewerWindow::pickImmediate(S32 x, S32 y_from_bot,  BOOL pick_transparent)
 {
 	if (gNoRender)
 	{
-		return;
+		return LLPickInfo();
 	}
 
-// 	F32 delta_time = gAlphaFadeTimer.getElapsedTimeAndResetF32();
+	pickAsync(x, y_from_bot, gKeyboard->currentMask(TRUE), NULL, pick_transparent);
+	// assume that pickAsync put the results in the back of the mPicks list
+	mLastPick = mPicks.back();
+	mLastPick.fetchResults();
+	mPicks.pop_back();
 
-	gUseGLPick = FALSE;
-	mPickCallback = callback;
+	return mLastPick;
+}
 
-	// Default to not hitting anything
-	gLastHitUIElement = 0;
+LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 depth,
+												LLViewerObject *this_object,
+												S32 this_face,
+												S32* face_hit,
+												LLVector3 *intersection,
+												LLVector2 *uv,
+												LLVector3 *normal,
+												LLVector3 *binormal)
+{
+	S32 x = mouse_x;
+	S32 y = mouse_y;
 
-	LLCamera pick_camera;
-	pick_camera.setOrigin(LLViewerCamera::getInstance()->getOrigin());
-	pick_camera.setOriginAndLookAt(LLViewerCamera::getInstance()->getOrigin(),
-								   LLViewerCamera::getInstance()->getUpAxis(),
-								   LLViewerCamera::getInstance()->getOrigin() + mouseDirectionGlobal(x, y_from_bot));
-	pick_camera.setView(0.5f*DEG_TO_RAD);
-	pick_camera.setNear(LLViewerCamera::getInstance()->getNear());
-	pick_camera.setFar(LLViewerCamera::getInstance()->getFar());
-	pick_camera.setAspect(1.f);
+	if ((mouse_x == -1) && (mouse_y == -1)) // use current mouse position
+	{
+		x = getCurrentMouseX();
+		y = getCurrentMouseY();
+	}
 
-	// save our drawing state
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-	glLoadIdentity();
+	// HUD coordinates of mouse
+	LLVector3 mouse_point_hud = mousePointHUD(x, y);
+	LLVector3 mouse_hud_start = mouse_point_hud - LLVector3(depth, 0, 0);
+	LLVector3 mouse_hud_end   = mouse_point_hud + LLVector3(depth, 0, 0);
 	
-	glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-	glLoadIdentity();
+	// world coordinates of mouse
+	LLVector3		mouse_direction_global = mouseDirectionGlobal(x,y);
+	LLVector3 mouse_point_global = LLViewerCamera::getInstance()->getOrigin();
+	LLVector3 mouse_world_start = mouse_point_global;
+	LLVector3 mouse_world_end   = mouse_point_global + mouse_direction_global * depth;
 
-	// build orthogonal transform and picking viewport
-	// Perform pick on a PICK_DIAMETER x PICK_DIAMETER pixel region around cursor point.
-	// Don't limit the select distance for this pick.
-	setup2DRender();
-	const LLVector2& display_scale = getDisplayScale();
-	glScalef(display_scale.mV[VX], display_scale.mV[VY], 1.f);
+	
+	LLViewerObject* found = NULL;
 
-	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
+	if (this_object)  // check only this object
+	{
+		if (this_object->isHUDAttachment()) // is a HUD object?
+		{
+			if (this_object->lineSegmentIntersect(mouse_hud_start, mouse_hud_end, this_face,
+												  face_hit, intersection, uv, normal, binormal))
+			{
+				found = this_object;
+			}
+			}
+		
+		else // is a world object
+		{
+			if (this_object->lineSegmentIntersect(mouse_world_start, mouse_world_end, this_face,
+												  face_hit, intersection, uv, normal, binormal))
+			{
+				found = this_object;
+			}
+			}
+			}
 
-	// make viewport big enough to handle antialiased frame buffers
-	glViewport(x - (PICK_HALF_WIDTH + 2), y_from_bot - (PICK_HALF_WIDTH + 2), PICK_DIAMETER + 4, PICK_DIAMETER + 4);
-	stop_glerror();
+	else // check ALL objects
+			{
+		found = gPipeline.lineSegmentIntersectInHUD(mouse_hud_start, mouse_hud_end,
+													face_hit, intersection, uv, normal, binormal);
 
-	glClearColor(0.f, 0.f, 0.f, 0.f);
-	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+		if (!found) // if not found in HUD, look in world:
 
-	// Draw the objects so the user can select them.
-	// The starting ID is 1, since land is zero.
-	//drawForSelect();
-
-	stop_glerror();
-
-	// restore drawing state
-	glMatrixMode(GL_PROJECTION);
-	glPopMatrix();
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
-
-	setupViewport();
-
-	mPickPoint.set(x, y_from_bot);
-	mPickOffset.set(0, 0);
-	mPickMask = mask;
-	mPickPending = TRUE;
-}
-
-void LLViewerWindow::performPick()
-{
-	if (gNoRender || !mPickPending)
-	{
-		return;
-	}
-
-	mPickPending = FALSE;
-	U32	te_offset = NO_FACE;
-	
-	// find pick region that is fully onscreen
-	LLCoordGL scaled_pick_point = mPickPoint;
-	scaled_pick_point.mX = llclamp(llround((F32)mPickPoint.mX * mDisplayScale.mV[VX]), PICK_HALF_WIDTH, getWindowDisplayWidth() - PICK_HALF_WIDTH);
-	scaled_pick_point.mY = llclamp(llround((F32)mPickPoint.mY * mDisplayScale.mV[VY]), PICK_HALF_WIDTH, getWindowDisplayHeight() - PICK_HALF_WIDTH);
-
-	glReadPixels(scaled_pick_point.mX - PICK_HALF_WIDTH, scaled_pick_point.mY - PICK_HALF_WIDTH, PICK_DIAMETER, PICK_DIAMETER, GL_RGBA, GL_UNSIGNED_BYTE, mPickBuffer);
-
-	S32 pixel_index = PICK_HALF_WIDTH * PICK_DIAMETER + PICK_HALF_WIDTH;
-	S32 name = (U32)mPickBuffer[(pixel_index * 4) + 0] << 16 | (U32)mPickBuffer[(pixel_index * 4) + 1] << 8 | (U32)mPickBuffer[(pixel_index * 4) + 2];
-	gLastPickAlpha = mPickBuffer[(pixel_index * 4) + 3];
-
-	if (name >= (S32)GL_NAME_UI_RESERVED && name < (S32)GL_NAME_INDEX_OFFSET)
-	{
-		// hit a UI element
-		gLastHitUIElement = name;
-		if (mPickCallback)
-		{
-			mPickCallback(mPickPoint.mX, mPickPoint.mY, mPickMask);
-		}
-	}
-
-	//imdebug("rgba rbga=bbba b=8 w=%d h=%d %p", PICK_DIAMETER, PICK_DIAMETER, mPickBuffer);
-
-	S32 x_offset = mPickPoint.mX - llround((F32)scaled_pick_point.mX / mDisplayScale.mV[VX]);
-	S32 y_offset = mPickPoint.mY - llround((F32)scaled_pick_point.mY / mDisplayScale.mV[VY]);
-
-	
-	// we hit nothing, scan surrounding pixels for something useful
-	if (!name)
-	{
-		S32 closest_distance = 10000;
-		//S32 closest_pick_name = 0;
-		for (S32 col = 0; col < PICK_DIAMETER; col++)
-		{
-			for (S32 row = 0; row < PICK_DIAMETER; row++)
-			{
-				S32 distance_squared = (llabs(col - x_offset - PICK_HALF_WIDTH) * llabs(col - x_offset - PICK_HALF_WIDTH)) + (llabs(row - y_offset - PICK_HALF_WIDTH) * llabs(row - y_offset - PICK_HALF_WIDTH));
-				pixel_index = row * PICK_DIAMETER + col;
-				S32 test_name = (U32)mPickBuffer[(pixel_index * 4) + 0] << 16 | (U32)mPickBuffer[(pixel_index * 4) + 1] << 8 | (U32)mPickBuffer[(pixel_index * 4) + 2];
-				gLastPickAlpha = mPickBuffer[(pixel_index * 4) + 3];
-				if (test_name && distance_squared < closest_distance)
-				{
-					closest_distance = distance_squared;
-					name = test_name;
-					gLastPickAlpha = mPickBuffer[(pixel_index * 4) + 3];
-					mPickOffset.mX = col - PICK_HALF_WIDTH;
-					mPickOffset.mY = row - PICK_HALF_WIDTH;
-				}
-			}
-		}
-	}
-
-	if (name)
-	{
-		mPickPoint.mX += llround((F32)mPickOffset.mX * mDisplayScale.mV[VX]);
-		mPickPoint.mY += llround((F32)mPickOffset.mY * mDisplayScale.mV[VY]);
-	}
-
-	if (gPickFaces)
-	{
-		te_offset = ((U32)name >> 20);
-		name &= 0x000fffff;
-		// don't clear gPickFaces, as we still need to check for UV coordinates
-	}
-
-	LLViewerObject	*objectp = NULL;
-
-	// Frontmost non-foreground object that isn't trees or grass
-	LLViewerObject* nonflora_objectp = NULL;
-	S32 nonflora_name = -1;
-	S32 nonflora_te_offset = NO_FACE;
-
-	if (name == (S32)GL_NAME_PARCEL_WALL)
-	{
-		gLastHitParcelWall = TRUE;
-	}
-
-	gLastHitHUDIcon = NULL;
-
-	objectp = gObjectList.getSelectedObject(name);
-	if (objectp)
-	{
-		LLViewerObject* parent = (LLViewerObject*)(objectp->getParent());
-		if (NULL == parent) {
-			// if you are the parent
-			parent = objectp;
-		}
-		if (objectp->mbCanSelect)
-		{
-			te_offset = (te_offset == 16) ? NO_FACE : te_offset;
-
-			// If the hit object isn't a plant, store it as the frontmost non-flora object.
-			LLPCode pcode = objectp->getPCode();
-			if( (LL_PCODE_LEGACY_GRASS != pcode) &&
-				(LL_PCODE_LEGACY_TREE != pcode) &&
-				(LL_PCODE_TREE_NEW != pcode))
-			{
-				nonflora_objectp = objectp;
-				nonflora_name = name;
-				nonflora_te_offset = te_offset;
-			}
-		}
-		else
-		{
-			//llinfos << "Hit object you can't select" << llendl;
-		}
-	}
-	else
-	{
-		// was this name referring to a hud icon?
-		gLastHitHUDIcon = LLHUDIcon::handlePick(name);
-	}
-
-	analyzeHit( 
-		mPickPoint.mX, mPickPoint.mY, objectp, te_offset,
-		&gLastHitObjectID, &gLastHitObjectFace, &gLastHitPosGlobal, &gLastHitLand, &gLastHitUCoord, &gLastHitVCoord );
-
-	if (objectp && !gLastHitObjectID.isNull())
-	{
-		gLastHitObjectOffset = gAgent.calcFocusOffset(objectp, mPickPoint.mX, mPickPoint.mY);
-	}
-
-	if( objectp == nonflora_objectp )
-	{
-		gLastHitNonFloraObjectID	= gLastHitObjectID;
-		gLastHitNonFloraObjectFace	= gLastHitObjectFace;
-		gLastHitNonFloraPosGlobal	= gLastHitPosGlobal;
-		gLastHitNonFloraObjectOffset= gLastHitObjectOffset;
-	}
-	else
-	{
-		analyzeHit(  mPickPoint.mX, mPickPoint.mY, nonflora_objectp, nonflora_te_offset,
-			&gLastHitNonFloraObjectID, &gLastHitNonFloraObjectFace, &gLastHitNonFloraPosGlobal,
-			&gLastHitLand, &gLastHitUCoord, &gLastHitVCoord);
-
-		if( nonflora_objectp )
-		{
-			gLastHitNonFloraObjectOffset = gAgent.calcFocusOffset(nonflora_objectp, mPickPoint.mX, mPickPoint.mY);
-		}
-	}
-
-	if (mPickCallback)
-	{
-		mPickCallback(mPickPoint.mX, mPickPoint.mY, mPickMask);
-	}
-
-	gPickFaces = FALSE;
-}
-
-// Performs the GL object/land pick.
-// Stores its results in globals, gHit*
-void LLViewerWindow::hitObjectOrLandGlobalImmediate(S32 x, S32 y_from_bot, void (*callback)(S32 x, S32 y, MASK mask), BOOL pick_transparent)
-{
-	if (gNoRender)
-	{
-		return;
-	}
-	
-	hitObjectOrLandGlobalAsync(x, y_from_bot, gKeyboard->currentMask(TRUE), NULL, pick_transparent);
-	performPick();
-	if (callback)
-	{
-		callback(x, y_from_bot, gKeyboard->currentMask(TRUE));
-	}
-}
-
-LLViewerObject* LLViewerWindow::getObjectUnderCursor(const F32 depth)
-{
-	S32 x = getCurrentMouseX();
-	S32 y = getCurrentMouseY();
-	
-	LLVector3		mouse_direction_global = mouseDirectionGlobal(x,y);
-	LLVector3		camera_pos_global = LLViewerCamera::getInstance()->getOrigin();
-	LLVector3		pick_end = camera_pos_global + mouse_direction_global * depth;
-	LLVector3		collision_point;
-	return gPipeline.pickObject(camera_pos_global, pick_end, collision_point);
-}
-
-void LLViewerWindow::analyzeHit(
-	S32				x,				// input
-	S32				y_from_bot,		// input
-	LLViewerObject* objectp,		// input
-	U32				te_offset,		// input
-	LLUUID*			hit_object_id_p,// output
-	S32*			hit_face_p,		// output
-	LLVector3d*		hit_pos_p,		// output
-	BOOL*			hit_land,		// output
-	F32*			hit_u_coord,	// output
-	F32*			hit_v_coord)	// output
-{
-	// Clean up inputs
-	S32 face = -1;
-	
-	if (te_offset != NO_FACE ) 
-	{
-		face = te_offset;
-	}
-
-	*hit_land = FALSE;
-
-	if (objectp)
-	{
-		if( objectp->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH )
-		{
-			// Hit land
-			*hit_land = TRUE;
-
-			// put global position into land_pos
-			LLVector3d land_pos;
-			if (mousePointOnLandGlobal(x, y_from_bot, &land_pos))
 			{
-				*hit_object_id_p = LLUUID::null;
-				*hit_face_p = -1;
-
-				// Fudge the land focus a little bit above ground.
-				*hit_pos_p = land_pos + LLVector3d(0.f, 0.f, 0.1f);
-				//llinfos << "DEBUG Hit Land " << *hit_pos_p  << llendl;
-				return;
+			found = gPipeline.lineSegmentIntersectInWorld(mouse_world_start, mouse_world_end,
+														  face_hit, intersection, uv, normal, binormal);
 			}
-			else
-			{
-				//llinfos << "Hit land but couldn't find position" << llendl;
-				// Fall through to "Didn't hit anything"
-			}
-		}
-		else
-		{
-			*hit_object_id_p = objectp->mID;
-			*hit_face_p = face;
 
-			// Hit an object
-			if (objectp->isAvatar())
-			{
-				*hit_pos_p = gAgent.getPosGlobalFromAgent(((LLVOAvatar*)objectp)->mPelvisp->getWorldPosition());
-			}
-			else if (objectp->mDrawable.notNull())
-			{
-				*hit_pos_p = gAgent.getPosGlobalFromAgent(objectp->getRenderPosition());
-			}
-			else
-			{
-				// regular object
-				*hit_pos_p = objectp->getPositionGlobal();
-			}
-
-			if (gPickFaces && face > -1 &&
-				objectp->mDrawable.notNull() && objectp->getPCode() == LL_PCODE_VOLUME &&
-				face < objectp->mDrawable->getNumFaces())
-			{
-				// render red-blue gradient to get 1/256 precision
-				// then render green grid to get final 1/4096 precision
-				S32 scaled_x = llround((F32)x * mDisplayScale.mV[VX]);
-				S32 scaled_y = llround((F32)y_from_bot * mDisplayScale.mV[VY]);
-				const S32 UV_PICK_WIDTH = 41;
-				const S32 UV_PICK_HALF_WIDTH = (UV_PICK_WIDTH - 1) / 2;
-				U8 uv_pick_buffer[UV_PICK_WIDTH * UV_PICK_WIDTH * 4];
-				S32 pick_face = face;
-				LLFace* facep = objectp->mDrawable->getFace(pick_face);
-				LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH, FALSE);
-				glViewport(scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH);
-				gPipeline.renderFaceForUVSelect(facep);
-
-				glReadPixels(scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH, GL_RGBA, GL_UNSIGNED_BYTE, uv_pick_buffer);
-				U8* center_pixel = &uv_pick_buffer[4 * ((UV_PICK_WIDTH * UV_PICK_HALF_WIDTH) + UV_PICK_HALF_WIDTH + 1)];
-				*hit_u_coord = (F32)((center_pixel[VGREEN] & 0xf) + (16.f * center_pixel[VRED])) / 4095.f;
-				*hit_v_coord = (F32)((center_pixel[VGREEN] >> 4) + (16.f * center_pixel[VBLUE])) / 4095.f;
-			}
-			else
-			{
-				*hit_u_coord = 0.f;
-				*hit_v_coord = 0.f;
-			}
-
-			//llinfos << "DEBUG Hit Object " << *hit_pos_p << llendl;
-			return;
-		}
 	}
 
-	// Didn't hit anything.
-	*hit_object_id_p = LLUUID::null;
-	*hit_face_p = -1;
-	*hit_pos_p = LLVector3d::zero;
-	*hit_u_coord = 0.f;
-	*hit_v_coord = 0.f;
-	//llinfos << "DEBUG Hit Nothing " << llendl;
+	return found;
 }
 
 // Returns unit vector relative to camera
@@ -3896,6 +3602,18 @@ LLVector3 LLViewerWindow::mouseDirectionGlobal(const S32 x, const S32 y) const
 	return mouse_vector;
 }
 
+LLVector3 LLViewerWindow::mousePointHUD(const S32 x, const S32 y) const
+{
+	// find screen resolution
+	S32			height = getWindowHeight();
+	S32			width = getWindowWidth();
+
+	// remap with uniform scale (1/height) so that top is -0.5, bottom is +0.5
+	F32 hud_x = -((F32)x - (F32)width/2.f)  / height;
+	F32 hud_y = ((F32)y - (F32)height/2.f) / height;
+
+	return LLVector3(0.f, hud_x, hud_y);
+}
 
 // Returns unit vector relative to camera in camera space
 // indicating direction of point on screen x,y
@@ -4064,14 +3782,14 @@ BOOL LLViewerWindow::mousePointOnLandGlobal(const S32 x, const S32 y, LLVector3d
 }
 
 // Saves an image to the harddrive as "SnapshotX" where X >= 1.
-BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw, const LLString& extension_in)
+BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image)
 {
-	if (! raw)
+	if (!image)
 	{
 		return FALSE;
 	}
 
-	LLString extension(extension_in);
+	std::string extension("." + image->getExtension());
 	if (extension.empty())
 	{
 		extension = (gSavedSettings.getBOOL("CompressSnapshotsToDisk")) ? ".j2c" : ".bmp";
@@ -4082,101 +3800,62 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw, const LLString& extensio
 		pick_type = LLFilePicker::FFSAVE_J2C;
 	else if (extension == ".bmp")
 		pick_type = LLFilePicker::FFSAVE_BMP;
+	else if (extension == ".jpg")
+		pick_type = LLFilePicker::FFSAVE_JPEG;
+	else if (extension == ".png")
+		pick_type = LLFilePicker::FFSAVE_PNG;
 	else if (extension == ".tga")
 		pick_type = LLFilePicker::FFSAVE_TGA;
 	else
 		pick_type = LLFilePicker::FFSAVE_ALL; // ???
 	
-	// Get a directory if this is the first time.
-	if (strlen(sSnapshotDir) == 0)		/* Flawfinder: ignore */
+	// Get a base file location if needed.
+	if ( ! isSnapshotLocSet())		
 	{
-		LLString proposed_name( sSnapshotBaseName );
+		std::string proposed_name( sSnapshotBaseName );
 		proposed_name.append( extension );
 
 		// pick a directory in which to save
 		LLFilePicker& picker = LLFilePicker::instance();
-		if (!picker.getSaveFile(pick_type, proposed_name.c_str()))
+		if (!picker.getSaveFile(pick_type, proposed_name))
 		{
 			// Clicked cancel
 			return FALSE;
 		}
 
 		// Copy the directory + file name
-		char directory[LL_MAX_PATH];		/* Flawfinder: ignore */
-		strncpy(directory, picker.getFirstFile(), LL_MAX_PATH -1);		/* Flawfinder: ignore */
-		directory[LL_MAX_PATH -1] = '\0';
+		std::string filepath = picker.getFirstFile();
 
-		// Smash the file extension
-		S32 length = strlen(directory);		/* Flawfinder: ignore */
-		S32 index = length;
-
-		// Back up over extension
-		index -= extension.length();
-		if (index >= 0 && directory[index] == '.')
-		{
-			directory[index] = '\0';
-		}
-		else
-		{
-			index = length;
-		}
-
-		// Find trailing backslash
-		while (index >= 0 && directory[index] != gDirUtilp->getDirDelimiter()[0])
-		{
-			index--;
-		}
-
-		// If we found one, truncate the string there
-		if (index >= 0)
-		{
-			if (index + 1 <= length)
-			{
-				strncpy(LLViewerWindow::sSnapshotBaseName, directory + index + 1, LL_MAX_PATH -1);		/* Flawfinder: ignore */
-				LLViewerWindow::sSnapshotBaseName[LL_MAX_PATH -1] = '\0';
-			}
-
-			index++;
-			directory[index] = '\0';
-			strncpy(LLViewerWindow::sSnapshotDir, directory, LL_MAX_PATH -1);		/* Flawfinder: ignore */
-			LLViewerWindow::sSnapshotDir[LL_MAX_PATH -1] = '\0';
-		}
+		LLViewerWindow::sSnapshotBaseName = gDirUtilp->getBaseFileName(filepath, true);
+		LLViewerWindow::sSnapshotDir = gDirUtilp->getDirName(filepath);
 	}
 
 	// Look for an unused file name
-	LLString filepath;
+	std::string filepath;
 	S32 i = 1;
 	S32 err = 0;
 
 	do
 	{
 		filepath = sSnapshotDir;
+		filepath += gDirUtilp->getDirDelimiter();
 		filepath += sSnapshotBaseName;
 		filepath += llformat("_%.3d",i);
 		filepath += extension;
 
-		struct stat stat_info;
-		err = mWindow->stat( filepath.c_str(), &stat_info );
+		llstat stat_info;
+		err = LLFile::stat( filepath, &stat_info );
 		i++;
 	}
 	while( -1 != err );  // search until the file is not found (i.e., stat() gives an error).
 
-	LLPointer<LLImageFormatted> formatted_image = LLImageFormatted::createFromExtension(extension);
-	LLImageBase::setSizeOverride(TRUE);
-	BOOL success = formatted_image->encode(raw, 0.0f);
-	if( success )
-	{
-		success = formatted_image->save(filepath);
-	}
-	else
-	{
-		llwarns << "Unable to encode bmp snapshot" << llendl;
-	}
-	LLImageBase::setSizeOverride(FALSE);
-
-	return success;
+	return image->save(filepath);
 }
 
+void LLViewerWindow::resetSnapshotLoc()
+{
+	sSnapshotDir.clear();
+}
 
 static S32 BORDERHEIGHT = 0;
 static S32 BORDERWIDTH = 0;
@@ -4211,7 +3890,7 @@ void LLViewerWindow::movieSize(S32 new_width, S32 new_height)
 	}
 }
 
-BOOL LLViewerWindow::saveSnapshot( const LLString& filepath, S32 image_width, S32 image_height, BOOL show_ui, BOOL do_rebuild, ESnapshotType type)
+BOOL LLViewerWindow::saveSnapshot( const std::string& filepath, S32 image_width, S32 image_height, BOOL show_ui, BOOL do_rebuild, ESnapshotType type)
 {
 	llinfos << "Saving snapshot to: " << filepath << llendl;
 
@@ -4300,13 +3979,12 @@ BOOL LLViewerWindow::thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 p
 	LLHUDText::setDisplayText(FALSE) ;
 	if (type == SNAPSHOT_TYPE_OBJECT_ID)
 	{
-		gPickTransparent = FALSE;
-		gObjectList.renderObjectsForSelect(*LLViewerCamera::getInstance(), FALSE, FALSE);
+		gObjectList.renderPickList(gViewerWindow->getVirtualWindowRect(), FALSE, FALSE);
 	}
 	else
 	{
 		display(do_rebuild, 1.0f, 0, TRUE);
-		render_ui_and_swap();
+		render_ui();
 	}
 
 	S32 glformat, gltype, glpixel_length ;
@@ -4456,7 +4134,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 					window_width = snapshot_width;
 					window_height = snapshot_height;
 					scale_factor = 1.f;
-					mWindowRect.set(0, 0, snapshot_width, snapshot_height);
+					mWindowRect.set(0, snapshot_height, snapshot_width, 0);
 					target.bindTarget();			
 				}
 			}
@@ -4483,7 +4161,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 		image_buffer_x = llfloor(snapshot_width*scale_factor) ;
 		image_buffer_y = llfloor(snapshot_height *scale_factor) ;
 	}
-	raw->resize(image_buffer_x, image_buffer_y, type == SNAPSHOT_TYPE_DEPTH ? 4 : 3);
+	raw->resize(image_buffer_x, image_buffer_y, 3);
 	if(raw->isBufferInvalid())
 	{
 		return FALSE ;
@@ -4503,6 +4181,8 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 	F32 depth_conversion_factor_1 = (LLViewerCamera::getInstance()->getFar() + LLViewerCamera::getInstance()->getNear()) / (2.f * LLViewerCamera::getInstance()->getFar() * LLViewerCamera::getInstance()->getNear());
 	F32 depth_conversion_factor_2 = (LLViewerCamera::getInstance()->getFar() - LLViewerCamera::getInstance()->getNear()) / (2.f * LLViewerCamera::getInstance()->getFar() * LLViewerCamera::getInstance()->getNear());
 
+	gObjectList.generatePickList(*LLViewerCamera::getInstance());
+
 	for (int subimage_y = 0; subimage_y < scale_factor; ++subimage_y)
 	{
 		S32 subimage_y_offset = llclamp(buffer_y_offset - (subimage_y * window_height), 0, window_height);;
@@ -4523,13 +4203,13 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 				LLViewerCamera::getInstance()->setZoomParameters(scale_factor, subimage_x+(subimage_y*llceil(scale_factor)));
 				setup3DRender();
 				setupViewport();
-				BOOL first_time_through = (subimage_x + subimage_y == 0);
-				gPickTransparent = FALSE;
-				gObjectList.renderObjectsForSelect(*LLViewerCamera::getInstance(), FALSE, !first_time_through);
+				gObjectList.renderPickList(gViewerWindow->getVirtualWindowRect(), FALSE, FALSE);
 			}
 			else
 			{
-				display(do_rebuild, scale_factor, subimage_x+(subimage_y*llceil(scale_factor)), use_fbo);
+				display(do_rebuild, scale_factor, subimage_x+(subimage_y*llceil(scale_factor)), TRUE);
+				// Required for showing the GUI in snapshots?  See DEV-16350 for details. JC
+				render_ui();
 			}
 
 			S32 subimage_x_offset = llclamp(buffer_x_offset - (subimage_x * window_width), 0, window_width);
@@ -4538,49 +4218,43 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 									llmax(0, (window_width * (subimage_x + 1)) - (buffer_x_offset + raw->getWidth())));
 			for(U32 out_y = 0; out_y < read_height ; out_y++)
 			{
+				S32 output_buffer_offset = ( 
+							(out_y * (raw->getWidth())) // ...plus iterated y...
+							+ (window_width * subimage_x) // ...plus subimage start in x...
+							+ (raw->getWidth() * window_height * subimage_y) // ...plus subimage start in y...
+							- output_buffer_offset_x // ...minus buffer padding x...
+							- (output_buffer_offset_y * (raw->getWidth()))  // ...minus buffer padding y...
+						) * raw->getComponents();
 				if (type == SNAPSHOT_TYPE_OBJECT_ID || type == SNAPSHOT_TYPE_COLOR)
 				{
 					glReadPixels(
 						subimage_x_offset, out_y + subimage_y_offset,
 						read_width, 1,
 						GL_RGB, GL_UNSIGNED_BYTE,
-						raw->getData() + // current output pixel is beginning of buffer...
-							( 
-								(out_y * (raw->getWidth())) // ...plus iterated y...
-								+ (window_width * subimage_x) // ...plus subimage start in x...
-								+ (raw->getWidth() * window_height * subimage_y) // ...plus subimage start in y...
-								- output_buffer_offset_x // ...minus buffer padding x...
-								- (output_buffer_offset_y * (raw->getWidth()))  // ...minus buffer padding y...
-							) * 3 // times 3 bytes per pixel
+						raw->getData() + output_buffer_offset
 					);
 				}
 				else // SNAPSHOT_TYPE_DEPTH
 				{
-					S32 output_buffer_offset = ( 
-								(out_y * (raw->getWidth())) // ...plus iterated y...
-								+ (window_width * subimage_x) // ...plus subimage start in x...
-								+ (raw->getWidth() * window_height * subimage_y) // ...plus subimage start in y...
-								- output_buffer_offset_x // ...minus buffer padding x...
-								- (output_buffer_offset_y * (raw->getWidth()))  // ...minus buffer padding y...
-							) * 4; // times 4 bytes per pixel
-
+					LLPointer<LLImageRaw> depth_line_buffer = new LLImageRaw(read_width, 1, sizeof(GL_FLOAT)); // need to store floating point values
 					glReadPixels(
 						subimage_x_offset, out_y + subimage_y_offset,
 						read_width, 1,
 						GL_DEPTH_COMPONENT, GL_FLOAT,
-						raw->getData() + output_buffer_offset// current output pixel is beginning of buffer...
+						depth_line_buffer->getData()// current output pixel is beginning of buffer...
 					);
 
-					for (S32 i = output_buffer_offset; i < output_buffer_offset + (S32)read_width * 4; i += 4)
+					for (S32 i = 0; i < (S32)read_width; i++)
 					{
-						F32 depth_float = *(F32*)(raw->getData() + i);
+						F32 depth_float = *(F32*)(depth_line_buffer->getData() + (i * sizeof(F32)));
 					
 						F32 linear_depth_float = 1.f / (depth_conversion_factor_1 - (depth_float * depth_conversion_factor_2));
 						U8 depth_byte = F32_to_U8(linear_depth_float, LLViewerCamera::getInstance()->getNear(), LLViewerCamera::getInstance()->getFar());
-						*(raw->getData() + i + 0) = depth_byte;
-						*(raw->getData() + i + 1) = depth_byte;
-						*(raw->getData() + i + 2) = depth_byte;
-						*(raw->getData() + i + 3) = 255;
+						//write converted scanline out to result image
+						for(S32 j = 0; j < raw->getComponents(); j++)
+						{
+							*(raw->getData() + output_buffer_offset + (i * raw->getComponents()) + j) = depth_byte;
+						}
 					}
 				}
 			}
@@ -4618,7 +4292,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 
 	// Pre-pad image to number of pixels such that the line length is a multiple of 4 bytes (for BMP encoding)
 	// Note: this formula depends on the number of components being 3.  Not obvious, but it's correct.	
-	image_width += (image_width * (type == SNAPSHOT_TYPE_DEPTH ? 4 : 3)) % 4 ;	
+	image_width += (image_width * 3) % 4;
 
 	BOOL ret = TRUE ;
 	// Resize image
@@ -4665,7 +4339,7 @@ void LLViewerWindow::destroyWindow()
 void LLViewerWindow::drawMouselookInstructions()
 {
 	// Draw instructions for mouselook ("Press ESC to leave Mouselook" in a box at the top of the screen.)
-	const char* instructions = "Press ESC to leave Mouselook.";
+	const std::string instructions = "Press ESC to leave Mouselook.";
 	const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
 
 	const S32 INSTRUCTIONS_PAD = 5;
@@ -4691,39 +4365,6 @@ void LLViewerWindow::drawMouselookInstructions()
 }
 
 
-// These functions are here only because LLViewerWindow used to do the work that gFocusMgr does now.
-// They let other objects continue to work without change.
-
-void LLViewerWindow::setKeyboardFocus(LLUICtrl* new_focus)
-{
-	gFocusMgr.setKeyboardFocus( new_focus );
-}
-
-LLUICtrl* LLViewerWindow::getKeyboardFocus()
-{
-	return gFocusMgr.getKeyboardFocus();
-}
-
-BOOL LLViewerWindow::hasKeyboardFocus(const LLUICtrl* possible_focus) const
-{
-	return possible_focus == gFocusMgr.getKeyboardFocus();
-}
-
-BOOL LLViewerWindow::childHasKeyboardFocus(const LLView* parent) const
-{
-	return gFocusMgr.childHasKeyboardFocus( parent );
-}
-
-void LLViewerWindow::setMouseCapture(LLMouseHandler* new_captor)
-{
-	gFocusMgr.setMouseCapture( new_captor );
-}
-
-LLMouseHandler* LLViewerWindow::getMouseCaptor() const
-{
-	return gFocusMgr.getMouseCapture();
-}
-
 S32	LLViewerWindow::getWindowHeight()	const 	
 { 
 	return mVirtualWindowRect.getHeight(); 
@@ -4744,21 +4385,6 @@ S32	LLViewerWindow::getWindowDisplayWidth() const
 	return mWindowRect.getWidth(); 
 }
 
-LLUICtrl* LLViewerWindow::getTopCtrl() const
-{
-	return gFocusMgr.getTopCtrl();
-}
-
-BOOL LLViewerWindow::hasTopCtrl(LLView* view) const
-{
-	return view == gFocusMgr.getTopCtrl();
-}
-
-void LLViewerWindow::setTopCtrl(LLUICtrl* new_top)
-{
-	gFocusMgr.setTopCtrl( new_top );
-}
-
 void LLViewerWindow::setupViewport(S32 x_offset, S32 y_offset)
 {
 	gGLViewport[0] = x_offset;
@@ -4778,27 +4404,6 @@ void LLViewerWindow::setup2DRender()
 	gl_state_for_2d(mWindowRect.getWidth(), mWindowRect.getHeight());
 }
 
-// Could cache the pointer from the last hitObjectOrLand here.
-LLViewerObject *LLViewerWindow::lastObjectHit()
-{
-	return gObjectList.findObject( gLastHitObjectID );
-}
-
-const LLVector3d& LLViewerWindow::lastObjectHitOffset()
-{
-	return gLastHitObjectOffset;
-}
-
-// Could cache the pointer from the last hitObjectOrLand here.
-LLViewerObject *LLViewerWindow::lastNonFloraObjectHit()
-{
-	return gObjectList.findObject( gLastHitNonFloraObjectID );
-}
-
-const LLVector3d& LLViewerWindow::lastNonFloraObjectHitOffset()
-{
-	return gLastHitNonFloraObjectOffset;
-}
 
 
 void LLViewerWindow::setShowProgress(const BOOL show)
@@ -4824,7 +4429,7 @@ void LLViewerWindow::moveProgressViewToFront()
 	}
 }
 
-void LLViewerWindow::setProgressString(const LLString& string)
+void LLViewerWindow::setProgressString(const std::string& string)
 {
 	if (mProgressView)
 	{
@@ -4832,7 +4437,7 @@ void LLViewerWindow::setProgressString(const LLString& string)
 	}
 }
 
-void LLViewerWindow::setProgressMessage(const LLString& msg)
+void LLViewerWindow::setProgressMessage(const std::string& msg)
 {
 	if(mProgressView)
 	{
@@ -4848,7 +4453,7 @@ void LLViewerWindow::setProgressPercent(const F32 percent)
 	}
 }
 
-void LLViewerWindow::setProgressCancelButtonVisible( BOOL b, const LLString& label )
+void LLViewerWindow::setProgressCancelButtonVisible( BOOL b, const std::string& label )
 {
 	if (mProgressView)
 	{
@@ -4916,7 +4521,7 @@ void LLViewerWindow::stopGL(BOOL save_state)
 	}
 }
 
-void LLViewerWindow::restoreGL(const LLString& progress_message)
+void LLViewerWindow::restoreGL(const std::string& progress_message)
 {
 	if (gGLManager.mIsDisabled)
 	{
@@ -5154,7 +4759,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
 
 	if (!result_first_try)
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[RESX]"] = llformat("%d",size.mX);
 		args["[RESY]"] = llformat("%d",size.mY);
 		alertXml("ResolutionSwitchFail", args);
@@ -5221,46 +4826,7 @@ F32 LLViewerWindow::getDisplayAspectRatio() const
 
 void LLViewerWindow::drawPickBuffer() const
 {
-	if (mPickBuffer)
-	{
-		gGL.color4f(1,1,1,1);
-		gGL.pushMatrix();
-		LLGLDisable no_blend(GL_BLEND);
-		LLGLDisable no_alpha_test(GL_ALPHA_TEST);
-		LLGLSNoTexture no_texture;
-		glPixelZoom(10.f, 10.f);
-		glRasterPos2f(((F32)mPickPoint.mX * mDisplayScale.mV[VX] + 10.f), 
-			((F32)mPickPoint.mY * mDisplayScale.mV[VY] + 10.f));
-		glDrawPixels(PICK_DIAMETER, PICK_DIAMETER, GL_RGBA, GL_UNSIGNED_BYTE, mPickBuffer);
-		glPixelZoom(1.f, 1.f);
-		gGL.color4fv(LLColor4::white.mV);
-		gl_rect_2d(llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] - (F32)(PICK_HALF_WIDTH)), 
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_HALF_WIDTH)),
-			llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] + (F32)(PICK_HALF_WIDTH)),
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] - (F32)(PICK_HALF_WIDTH)),
-			FALSE);
-		gl_line_2d(llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] - (F32)(PICK_HALF_WIDTH)), 
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_HALF_WIDTH)),
-			llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] + 10.f), 
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_DIAMETER) * 10.f + 10.f));
-		gl_line_2d(llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] + (F32)(PICK_HALF_WIDTH)),
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] - (F32)(PICK_HALF_WIDTH)),
-			llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] + (F32)(PICK_DIAMETER) * 10.f + 10.f), 
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + 10.f));
-		gGL.translatef(10.f, 10.f, 0.f);
-		gl_rect_2d(llround((F32)mPickPoint.mX * mDisplayScale.mV[VX]), 
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_DIAMETER) * 10.f),
-			llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] + (F32)(PICK_DIAMETER) * 10.f),
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY]),
-			FALSE);
-		gl_rect_2d(llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] + (F32)(PICK_HALF_WIDTH + mPickOffset.mX)* 10.f), 
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_HALF_WIDTH + mPickOffset.mY + 1) * 10.f),
-			llround((F32)mPickPoint.mX * mDisplayScale.mV[VX] + (F32)(PICK_HALF_WIDTH + mPickOffset.mX + 1) * 10.f),
-			llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_HALF_WIDTH  + mPickOffset.mY) * 10.f),
-			FALSE);
-		gGL.popMatrix();
-		gGL.flush();
-	}
+	mHoverPick.drawPickBuffer();
 }
 
 void LLViewerWindow::calcDisplayScale()
@@ -5327,11 +4893,11 @@ bool LLViewerWindow::alertCallback(S32 modal)
 LLAlertDialog* LLViewerWindow::alertXml(const std::string& xml_filename,
 							  LLAlertDialog::alert_callback_t callback, void* user_data)
 {
-	LLString::format_map_t args;
+	LLStringUtil::format_map_t args;
 	return alertXml( xml_filename, args, callback, user_data );
 }
 
-LLAlertDialog* LLViewerWindow::alertXml(const std::string& xml_filename, const LLString::format_map_t& args,
+LLAlertDialog* LLViewerWindow::alertXml(const std::string& xml_filename, const LLStringUtil::format_map_t& args,
 							  LLAlertDialog::alert_callback_t callback, void* user_data)
 {
 	if (gNoRender)
@@ -5355,10 +4921,10 @@ LLAlertDialog* LLViewerWindow::alertXml(const std::string& xml_filename, const L
 	return LLAlertDialog::showXml( xml_filename, args, callback, user_data );
 }
 
-LLAlertDialog* LLViewerWindow::alertXmlEditText(const std::string& xml_filename, const LLString::format_map_t& args,
+LLAlertDialog* LLViewerWindow::alertXmlEditText(const std::string& xml_filename, const LLStringUtil::format_map_t& args,
 									  LLAlertDialog::alert_callback_t callback, void* user_data,
 									  LLAlertDialog::alert_text_callback_t text_callback, void *text_data,
-									  const LLString::format_map_t& edit_args, BOOL draw_asterixes)
+									  const LLStringUtil::format_map_t& edit_args, BOOL draw_asterixes)
 {
 	if (gNoRender)
 	{
@@ -5395,7 +4961,7 @@ LLAlertDialog* LLViewerWindow::alertXmlEditText(const std::string& xml_filename,
 ////////////////////////////////////////////////////////////////////////////
 
 LLBottomPanel::LLBottomPanel(const LLRect &rect) : 
-	LLPanel("", rect, FALSE),
+	LLPanel(LLStringUtil::null, rect, FALSE),
 	mIndicator(NULL)
 {
 	// bottom panel is focus root, so Tab moves through the toolbar and button bar, and overlay
@@ -5449,3 +5015,342 @@ void* LLBottomPanel::createToolBar(void* data)
 	gToolBar = new LLToolBar();
 	return gToolBar;
 }
+
+//
+// LLPickInfo
+//
+LLPickInfo::LLPickInfo()
+	: mKeyMask(MASK_NONE),
+	  mPickCallback(NULL),
+	  mPickType(PICK_INVALID),
+	  mWantSurfaceInfo(FALSE),
+	  mObjectFace(-1),
+	  mUVCoords(-1.f, -1.f),
+	  mSTCoords(-1.f, -1.f),
+	  mXYCoords(-1, -1),
+	  mIntersection(),
+	  mNormal(),
+	  mBinormal(),
+	  mHUDIcon(NULL),
+	  mPickTransparent(FALSE)
+{
+}
+
+LLPickInfo::LLPickInfo(const LLCoordGL& mouse_pos, 
+					   const LLRect& screen_region,
+						MASK keyboard_mask, 
+						BOOL pick_transparent,
+						BOOL pick_uv_coords,
+						void (*pick_callback)(const LLPickInfo& pick_info))
+	: mMousePt(mouse_pos),
+	  mScreenRegion(screen_region),
+	  mKeyMask(keyboard_mask),
+	  mPickCallback(pick_callback),
+	  mPickType(PICK_INVALID),
+	  mWantSurfaceInfo(pick_uv_coords),
+	  mObjectFace(-1),
+	  mUVCoords(-1.f, -1.f),
+	  mSTCoords(-1.f, -1.f),
+	  mXYCoords(-1, -1),
+	  mNormal(),
+	  mBinormal(),
+	  mHUDIcon(NULL),
+	  mPickTransparent(pick_transparent)
+{
+}
+
+LLPickInfo::~LLPickInfo()
+{
+}
+
+void LLPickInfo::fetchResults()
+{
+	// read back colors and depth values from buffer
+	glReadPixels(mScreenRegion.mLeft, mScreenRegion.mBottom, mScreenRegion.getWidth(), mScreenRegion.getHeight(), GL_RGBA, GL_UNSIGNED_BYTE, mPickBuffer);
+	glReadPixels(mScreenRegion.mLeft, mScreenRegion.mBottom, mScreenRegion.getWidth(), mScreenRegion.getHeight(), GL_DEPTH_COMPONENT, GL_FLOAT, mPickDepthBuffer );
+
+	// find pick region that is fully onscreen
+	LLCoordGL scaled_pick_point;;
+	scaled_pick_point.mX = llclamp(llround((F32)mMousePt.mX * gViewerWindow->getDisplayScale().mV[VX]), PICK_HALF_WIDTH, gViewerWindow->getWindowDisplayWidth() - PICK_HALF_WIDTH);
+	scaled_pick_point.mY = llclamp(llround((F32)mMousePt.mY * gViewerWindow->getDisplayScale().mV[VY]), PICK_HALF_WIDTH, gViewerWindow->getWindowDisplayHeight() - PICK_HALF_WIDTH);
+	S32 pixel_index = PICK_HALF_WIDTH * PICK_DIAMETER + PICK_HALF_WIDTH;
+	S32 pick_id = (U32)mPickBuffer[(pixel_index * 4) + 0] << 16 | (U32)mPickBuffer[(pixel_index * 4) + 1] << 8 | (U32)mPickBuffer[(pixel_index * 4) + 2];
+	F32 depth = mPickDepthBuffer[pixel_index];
+
+	S32 x_offset = mMousePt.mX - llround((F32)scaled_pick_point.mX / gViewerWindow->getDisplayScale().mV[VX]);
+	S32 y_offset = mMousePt.mY - llround((F32)scaled_pick_point.mY / gViewerWindow->getDisplayScale().mV[VY]);
+
+	mPickPt = mMousePt;
+
+	// we hit nothing, scan surrounding pixels for something useful
+	if (!pick_id)
+	{
+		S32 closest_distance = 10000;
+		//S32 closest_pick_name = 0;
+		for (S32 col = 0; col < PICK_DIAMETER; col++)
+		{
+			for (S32 row = 0; row < PICK_DIAMETER; row++)
+			{
+				S32 distance_squared = (llabs(col - x_offset - PICK_HALF_WIDTH) * llabs(col - x_offset - PICK_HALF_WIDTH)) + (llabs(row - y_offset - PICK_HALF_WIDTH) * llabs(row - y_offset - PICK_HALF_WIDTH));
+				pixel_index = row * PICK_DIAMETER + col;
+				S32 test_name = (U32)mPickBuffer[(pixel_index * 4) + 0] << 16 | (U32)mPickBuffer[(pixel_index * 4) + 1] << 8 | (U32)mPickBuffer[(pixel_index * 4) + 2];
+				if (test_name && distance_squared < closest_distance)
+				{
+					closest_distance = distance_squared;
+					pick_id = test_name;
+					depth = mPickDepthBuffer[pixel_index];
+					mPickPt.mX = mMousePt.mX + (col - PICK_HALF_WIDTH);
+					mPickPt.mY = mMousePt.mY + (row - PICK_HALF_WIDTH);
+				}
+			}
+		}
+	}
+
+	U32 te_offset = ((U32)pick_id >> 20);
+	pick_id &= 0x000fffff;
+
+	//unproject relative clicked coordinate from window coordinate using GL
+	GLint viewport[4];
+	GLdouble modelview[16];
+	GLdouble projection[16];
+	GLfloat winX, winY;
+	GLdouble posX, posY, posZ;
+
+	LLViewerObject* objectp = gObjectList.getSelectedObject(pick_id);
+
+	if (pick_id == (S32)GL_NAME_PARCEL_WALL)
+	{
+		mPickType = PICK_PARCEL_WALL;
+	}
+	else if (objectp)
+	{
+		if( objectp->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH )
+		{
+			// Hit land
+			mPickType = PICK_LAND;
+			mObjectID.setNull(); // land has no id
+
+			// put global position into land_pos
+			LLVector3d land_pos;
+			if (gViewerWindow->mousePointOnLandGlobal(mPickPt.mX, mPickPt.mY, &land_pos))
+			{
+				// Fudge the land focus a little bit above ground.
+				mPosGlobal = land_pos + LLVector3d::z_axis * 0.1f;
+			}
+		}
+		else
+		{
+			if(isFlora(objectp))
+			{
+				mPickType = PICK_FLORA;
+			}
+			else
+			{
+				mPickType = PICK_OBJECT;
+			}
+			mObjectOffset = gAgent.calcFocusOffset(objectp, mPickPt.mX, mPickPt.mY);
+			mObjectID = objectp->mID;
+			mObjectFace = (te_offset == NO_FACE) ? -1 : (S32)te_offset;
+
+			glh::matrix4f newModel((F32*)LLViewerCamera::getInstance()->getModelview().mMatrix);
+
+			for(U32 i = 0; i < 16; ++i)
+			{
+				modelview[i] = newModel.m[i];
+				projection[i] = LLViewerCamera::getInstance()->getProjection().mMatrix[i/4][i%4];
+			}
+			glGetIntegerv( GL_VIEWPORT, viewport );
+
+			winX = ((F32)mPickPt.mX) * gViewerWindow->getDisplayScale().mV[VX];
+			winY = ((F32)mPickPt.mY) * gViewerWindow->getDisplayScale().mV[VY];
+
+			gluUnProject( winX, winY, depth, modelview, projection, viewport, &posX, &posY, &posZ);
+
+			mPosGlobal = gAgent.getPosGlobalFromAgent(LLVector3(posX, posY, posZ));
+			
+			if (mWantSurfaceInfo)
+			{
+				getSurfaceInfo();
+			}
+		}
+	}
+	else
+	{
+		// was this name referring to a hud icon?
+		mHUDIcon = LLHUDIcon::handlePick(pick_id);
+		if (mHUDIcon)
+		{
+			mPickType = PICK_ICON;
+			mPosGlobal = mHUDIcon->getPositionGlobal();
+		}
+	}
+
+	if (mPickCallback)
+	{
+		mPickCallback(*this);
+	}
+}
+
+LLPointer<LLViewerObject> LLPickInfo::getObject() const
+{
+	return gObjectList.findObject( mObjectID );
+}
+
+void LLPickInfo::updateXYCoords()
+{
+	const LLTextureEntry* tep = getObject()->getTE(mObjectFace);
+	LLPointer<LLViewerImage> imagep = gImageList.getImage(tep->getID());
+	if(mUVCoords.mV[VX] >= 0.f && mUVCoords.mV[VY] >= 0.f && imagep.notNull())
+	{
+		LLCoordGL coords;
+		
+		coords.mX = llround(mUVCoords.mV[VX] * (F32)imagep->getWidth());
+		coords.mY = llround(mUVCoords.mV[VY] * (F32)imagep->getHeight());
+
+		gViewerWindow->getWindow()->convertCoords(coords, &mXYCoords);
+	}
+}
+
+void LLPickInfo::drawPickBuffer() const
+{
+	if (mPickBuffer)
+	{
+		gGL.pushMatrix();
+		LLGLDisable no_blend(GL_BLEND);
+		LLGLDisable no_alpha_test(GL_ALPHA_TEST);
+		LLGLSNoTexture no_texture;
+		glPixelZoom(10.f, 10.f);
+		LLVector2 display_scale = gViewerWindow->getDisplayScale();
+		glRasterPos2f(((F32)mMousePt.mX * display_scale.mV[VX] + 10.f), 
+			((F32)mMousePt.mY * display_scale.mV[VY] + 10.f));
+		glDrawPixels(PICK_DIAMETER, PICK_DIAMETER, GL_RGBA, GL_UNSIGNED_BYTE, mPickBuffer);
+		glPixelZoom(1.f, 1.f);
+		gGL.color4fv(LLColor4::white.mV);
+		gl_rect_2d(llround((F32)mMousePt.mX * display_scale.mV[VX] - (F32)(PICK_HALF_WIDTH)), 
+			llround((F32)mMousePt.mY * display_scale.mV[VY] + (F32)(PICK_HALF_WIDTH)),
+			llround((F32)mMousePt.mX * display_scale.mV[VX] + (F32)(PICK_HALF_WIDTH)),
+			llround((F32)mMousePt.mY * display_scale.mV[VY] - (F32)(PICK_HALF_WIDTH)),
+			FALSE);
+		gl_line_2d(llround((F32)mMousePt.mX * display_scale.mV[VX] - (F32)(PICK_HALF_WIDTH)), 
+			llround((F32)mMousePt.mY * display_scale.mV[VY] + (F32)(PICK_HALF_WIDTH)),
+			llround((F32)mMousePt.mX * display_scale.mV[VX] + 10.f), 
+			llround((F32)mMousePt.mY * display_scale.mV[VY] + (F32)(PICK_DIAMETER) * 10.f + 10.f));
+		gl_line_2d(llround((F32)mMousePt.mX * display_scale.mV[VX] + (F32)(PICK_HALF_WIDTH)),
+			llround((F32)mMousePt.mY * display_scale.mV[VY] - (F32)(PICK_HALF_WIDTH)),
+			llround((F32)mMousePt.mX * display_scale.mV[VX] + (F32)(PICK_DIAMETER) * 10.f + 10.f), 
+			llround((F32)mMousePt.mY * display_scale.mV[VY] + 10.f));
+		gGL.translatef(10.f, 10.f, 0.f);
+		gl_rect_2d(llround((F32)mPickPt.mX * display_scale.mV[VX]), 
+			llround((F32)mPickPt.mY * display_scale.mV[VY] + (F32)(PICK_DIAMETER) * 10.f),
+			llround((F32)mPickPt.mX * display_scale.mV[VX] + (F32)(PICK_DIAMETER) * 10.f),
+			llround((F32)mPickPt.mY * display_scale.mV[VY]),
+			FALSE);
+		gl_rect_2d(llround((F32)mPickPt.mX * display_scale.mV[VX]), 
+			llround((F32)mPickPt.mY * display_scale.mV[VY] + 10.f),
+			llround((F32)mPickPt.mX * display_scale.mV[VX] + 10.f),
+			llround((F32)mPickPt.mY * display_scale.mV[VY]),
+			FALSE);
+		gGL.popMatrix();
+	}
+}
+
+void LLPickInfo::getSurfaceInfo()
+{
+	// set values to uninitialized - this is what we return if no intersection is found
+	mObjectFace   = -1;
+	mUVCoords     = LLVector2(-1, -1);
+	mSTCoords     = LLVector2(-1, -1);
+	mXYCoords	  = LLCoordScreen(-1, -1);
+	mIntersection = LLVector3(0,0,0);
+	mNormal       = LLVector3(0,0,0);
+	mBinormal     = LLVector3(0,0,0);
+	
+	LLViewerObject* objectp = getObject();
+
+	if (objectp)
+	{
+		if (gViewerWindow->cursorIntersect(llround((F32)mMousePt.mX), llround((F32)mMousePt.mY), 1024.f,
+										   objectp, -1,
+										   &mObjectFace,
+										   &mIntersection,
+										   &mSTCoords,
+										   &mNormal,
+										   &mBinormal))
+		{
+			// if we succeeded with the intersect above, compute the texture coordinates:
+
+			if (objectp->mDrawable.notNull())
+			{
+				LLFace* facep = objectp->mDrawable->getFace(mObjectFace);
+
+				mUVCoords = facep->surfaceToTexture(mSTCoords, mIntersection, mNormal);
+			}
+
+			// and XY coords:
+			updateXYCoords();
+			
+		}
+	}
+}
+
+
+/* code to get UV via a special UV render - removed in lieu of raycast method
+LLVector2 LLPickInfo::pickUV()
+{
+	LLVector2 result(-1.f, -1.f);
+
+	LLViewerObject* objectp = getObject();
+	if (!objectp)
+	{
+		return result;
+	}
+
+	if (mObjectFace > -1 &&
+		objectp->mDrawable.notNull() && objectp->getPCode() == LL_PCODE_VOLUME &&
+		mObjectFace < objectp->mDrawable->getNumFaces())
+	{
+		S32 scaled_x = llround((F32)mPickPt.mX * gViewerWindow->getDisplayScale().mV[VX]);
+		S32 scaled_y = llround((F32)mPickPt.mY * gViewerWindow->getDisplayScale().mV[VY]);
+		const S32 UV_PICK_WIDTH = 5;
+		const S32 UV_PICK_HALF_WIDTH = (UV_PICK_WIDTH - 1) / 2;
+		U8 uv_pick_buffer[UV_PICK_WIDTH * UV_PICK_WIDTH * 4];
+		LLFace* facep = objectp->mDrawable->getFace(mObjectFace);
+		if (facep)
+		{
+			LLGLState scissor_state(GL_SCISSOR_TEST);
+			scissor_state.enable();
+			LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH, FALSE);
+			//glViewport(scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH);
+			glScissor(scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH);
+
+			glClear(GL_DEPTH_BUFFER_BIT);
+
+			facep->renderSelectedUV();
+
+			glReadPixels(scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH, GL_RGBA, GL_UNSIGNED_BYTE, uv_pick_buffer);
+			U8* center_pixel = &uv_pick_buffer[4 * ((UV_PICK_WIDTH * UV_PICK_HALF_WIDTH) + UV_PICK_HALF_WIDTH + 1)];
+
+			result.mV[VX] = (F32)((center_pixel[VGREEN] & 0xf) + (16.f * center_pixel[VRED])) / 4095.f;
+			result.mV[VY] = (F32)((center_pixel[VGREEN] >> 4) + (16.f * center_pixel[VBLUE])) / 4095.f;
+		}
+	}
+
+	return result;
+} */
+
+
+//static 
+bool LLPickInfo::isFlora(LLViewerObject* object)
+{
+	if (!object) return false;
+
+	LLPCode pcode = object->getPCode();
+
+	if( (LL_PCODE_LEGACY_GRASS == pcode) 
+		|| (LL_PCODE_LEGACY_TREE == pcode) 
+		|| (LL_PCODE_TREE_NEW == pcode))
+	{
+		return true;
+	}
+	return false;
+}
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index da5fa4e..683d331 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -51,14 +51,77 @@
 class LLView;
 class LLViewerObject;
 class LLUUID;
-class LLMouseHandler;
 class LLProgressView;
 class LLTool;
 class LLVelocityBar;
-class LLViewerWindow;
 class LLTextBox;
 class LLImageRaw;
 class LLHUDIcon;
+class LLMouseHandler;
+
+#define PICK_HALF_WIDTH 5
+#define PICK_DIAMETER (2 * PICK_HALF_WIDTH + 1)
+
+class LLPickInfo
+{
+public:
+	LLPickInfo();
+	LLPickInfo(const LLCoordGL& mouse_pos, 
+		const LLRect& screen_region,
+		MASK keyboard_mask, 
+		BOOL pick_transparent, 
+		BOOL pick_surface_info,
+		void (*pick_callback)(const LLPickInfo& pick_info));
+	~LLPickInfo();
+
+	void fetchResults();
+	LLPointer<LLViewerObject> getObject() const;
+	LLUUID getObjectID() const { return mObjectID; }
+	void drawPickBuffer() const;
+
+	static bool isFlora(LLViewerObject* object);
+
+	typedef enum e_pick_type
+	{
+		PICK_OBJECT,
+		PICK_FLORA,
+		PICK_LAND,
+		PICK_ICON,
+		PICK_PARCEL_WALL,
+		PICK_INVALID
+	} EPickType;
+
+public:
+	LLCoordGL		mMousePt;
+	MASK			mKeyMask;
+	void			(*mPickCallback)(const LLPickInfo& pick_info);
+
+	EPickType		mPickType;
+	LLCoordGL		mPickPt;
+	LLVector3d		mPosGlobal;
+	LLVector3		mObjectOffset;
+	LLUUID			mObjectID;
+	S32				mObjectFace;
+	LLHUDIcon*		mHUDIcon;
+	LLVector3       mIntersection;
+	LLVector2		mUVCoords;
+	LLVector2       mSTCoords;
+	LLCoordScreen	mXYCoords;
+	LLVector3		mNormal;
+	LLVector3		mBinormal;
+	BOOL			mPickTransparent;
+	LLRect			mScreenRegion;
+	void		    getSurfaceInfo();
+
+private:
+	void			updateXYCoords();
+
+	BOOL			mWantSurfaceInfo;   // do we populate mUVCoord, mNormal, mBinormal?
+	U8				mPickBuffer[PICK_DIAMETER * PICK_DIAMETER * 4];
+	F32				mPickDepthBuffer[PICK_DIAMETER * PICK_DIAMETER];
+	BOOL			mPickParcelWall;
+
+};
 
 #define MAX_IMAGE_SIZE 6144 //6 * 1024, max snapshot image size 6144 * 6144
 
@@ -68,12 +131,16 @@ public:
 	//
 	// CREATORS
 	//
-	LLViewerWindow(char* title, char* name, S32 x, S32 y, S32 width, S32 height, BOOL fullscreen, BOOL ignore_pixel_depth);
+	LLViewerWindow(const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height, BOOL fullscreen, BOOL ignore_pixel_depth);
 	virtual ~LLViewerWindow();
 
+	void			shutdownViews();
+	void			shutdownGL();
+	
 	void			initGLDefaults();
 	void			initBase();
-	void			adjustRectanglesForFirstUse(const LLRect& full_window);
+	void			adjustRectanglesForFirstUse(const LLRect& window);
+	void            adjustControlRectanglesForFirstUse(const LLRect& window);
 	void			initWorldUI();
 
 	//
@@ -128,6 +195,7 @@ public:
 
 	LLWindow*		getWindow()			const	{ return mWindow; }
 	void*			getPlatformWindow() const	{ return mWindow->getPlatformWindow(); }
+	void*			getMediaWindow() 	const	{ return mWindow->getMediaWindow(); }
 	void			focusClient()		const	{ return mWindow->focusClient(); };
 
 	LLCoordGL		getLastMouse()		const	{ return mLastMousePoint; }
@@ -143,17 +211,17 @@ public:
 	BOOL			getLeftMouseDown()	const	{ return mLeftMouseDown; }
 	BOOL			getRightMouseDown()	const	{ return mRightMouseDown; }
 
-	LLUICtrl*		getTopCtrl() const;
-	BOOL			hasTopCtrl(LLView* view) const;
+	const LLPickInfo&	getLastPick() const { return mLastPick; }
+	const LLPickInfo&	getHoverPick() const { return mHoverPick; }
 
 	void			setupViewport(S32 x_offset = 0, S32 y_offset = 0);
 	void			setup3DRender();
 	void			setup2DRender();
 
-	BOOL			isPickPending()				{ return mPickPending; }
-
 	LLVector3		mouseDirectionGlobal(const S32 x, const S32 y) const;
 	LLVector3		mouseDirectionCamera(const S32 x, const S32 y) const;
+	LLVector3       mousePointHUD(const S32 x, const S32 y) const;
+		
 
 	// Is window of our application frontmost?
 	BOOL			getActive() const			{ return mActive; }
@@ -162,7 +230,7 @@ public:
 		// The 'target' is where the user wants the window to be. It may not be
 		// there yet, because we may be supressing fullscreen prior to login.
 
-	const LLString&	getInitAlert() { return mInitAlert; }
+	const std::string&	getInitAlert() { return mInitAlert; }
 	
 	//
 	// MANIPULATORS
@@ -172,15 +240,16 @@ public:
 	void			setCursor( ECursorType c );
 	void			showCursor();
 	void			hideCursor();
+	BOOL            getCursorHidden() { return mCursorHidden; }
 	void			moveCursorToCenter();								// move to center of window
 													
 	void			setShowProgress(const BOOL show);
 	BOOL			getShowProgress() const;
 	void			moveProgressViewToFront();
-	void			setProgressString(const LLString& string);
+	void			setProgressString(const std::string& string);
 	void			setProgressPercent(const F32 percent);
-	void			setProgressMessage(const LLString& msg);
-	void			setProgressCancelButtonVisible( BOOL b, const LLString&  label );
+	void			setProgressMessage(const std::string& msg);
+	void			setProgressCancelButtonVisible( BOOL b, const std::string& label = LLStringUtil::null );
 	LLProgressView *getProgressView() const;
 
 	void			updateObjectUnderCursor();
@@ -192,26 +261,12 @@ public:
 
 	// Hide normal UI when a logon fails, re-show everything when logon is attempted again
 	void			setNormalControlsVisible( BOOL visible );
-    void            setMenuBackgroundColor(bool god_mode = false, bool dev_grid = false);
-
-	// Handle the application becoming active (frontmost) or inactive
-	//BOOL			handleActivate(BOOL activate);
-
-	void			setKeyboardFocus(LLUICtrl* new_focus);		// new_focus = NULL to release the focus.
-	LLUICtrl*		getKeyboardFocus();	
-	BOOL			hasKeyboardFocus( const LLUICtrl* possible_focus ) const;
-	BOOL			childHasKeyboardFocus( const LLView* parent ) const;
-	
-	void			setMouseCapture(LLMouseHandler* new_captor);	// new_captor = NULL to release the mouse.
-	LLMouseHandler*	getMouseCaptor() const;
-
-	void			setTopCtrl(LLUICtrl* new_top); // set new_top = NULL to release top_view.
+	void			setMenuBackgroundColor(bool god_mode = false, bool dev_grid = false);
 
 	void			reshape(S32 width, S32 height);
 	void			sendShapeToSim();
 
 	void			draw();
-//	void			drawSelectedObjects();
 	void			updateDebugText();
 	void			drawDebugText();
 
@@ -219,39 +274,55 @@ public:
 
 	static void		movieSize(S32 new_width, S32 new_height);
 
+	// snapshot functionality.
+	// perhaps some of this should move to llfloatershapshot?  -MG
 	typedef enum e_snapshot_type
 	{
 		SNAPSHOT_TYPE_COLOR,
 		SNAPSHOT_TYPE_DEPTH,
 		SNAPSHOT_TYPE_OBJECT_ID
 	} ESnapshotType;
-
-	BOOL			saveSnapshot(const LLString&  filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR);
+	BOOL			saveSnapshot(const std::string&  filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR);
 	BOOL			rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, BOOL is_texture = FALSE,
 								BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_IMAGE_SIZE );
-	BOOL            thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL do_rebuild, ESnapshotType type) ;
-	BOOL		    saveImageNumbered(LLImageRaw *raw, const LLString& extension = LLString());
+	BOOL			thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL do_rebuild, ESnapshotType type) ;
+	BOOL			isSnapshotLocSet() const { return ! sSnapshotDir.empty(); }
+	void			resetSnapshotLoc() const { sSnapshotDir.clear(); }
+	BOOL		    saveImageNumbered(LLImageFormatted *image);
+
+	// Reset the directory where snapshots are saved.
+	// Client will open directory picker on next snapshot save.
+	void resetSnapshotLoc();
 
 	void			playSnapshotAnimAndSound();
 	
 	// draws selection boxes around selected objects, must call displayObjects first
 	void			renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, BOOL for_hud );
 	void			performPick();
+	void			returnEmptyPicks();
 
-	void			hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask, void (*callback)(S32 x, S32 y, MASK mask), BOOL pick_transparent = FALSE, BOOL pick_parcel_walls = FALSE);
-	void			hitObjectOrLandGlobalImmediate(S32 x, S32 y, void (*callback)(S32 x, S32 y, MASK mask), BOOL pick_transparent);
-	
-	void			hitUIElementAsync(S32 x, S32 y_from_bot, MASK mask, void (*callback)(S32 x, S32 y, MASK mask));
-	void			hitUIElementImmediate(S32 x, S32 y, void (*callback)(S32 x, S32 y, MASK mask));
 
-	LLViewerObject*	getObjectUnderCursor(const F32 depth = 16.0f);
+	void			pickAsync(S32 x, S32 y_from_bot, MASK mask, void (*callback)(const LLPickInfo& pick_info),
+							  BOOL pick_transparent = FALSE, BOOL get_surface_info = FALSE);
+	LLPickInfo		pickImmediate(S32 x, S32 y, BOOL pick_transparent);
+	static void     hoverPickCallback(const LLPickInfo& pick_info);
+	
+	LLViewerObject* cursorIntersect(S32 mouse_x = -1, S32 mouse_y = -1, F32 depth = 512.f,
+									LLViewerObject *this_object = NULL,
+									S32 this_face = -1,
+									S32* face_hit = NULL,
+									LLVector3 *intersection = NULL,
+									LLVector2 *uv = NULL,
+									LLVector3 *normal = NULL,
+									LLVector3 *binormal = NULL);
+	
 	
 	// Returns a pointer to the last object hit
-	LLViewerObject	*lastObjectHit();
-	LLViewerObject  *lastNonFloraObjectHit();
+	//LLViewerObject	*getObject();
+	//LLViewerObject  *lastNonFloraObjectHit();
 
-	const LLVector3d& lastObjectHitOffset();
-	const LLVector3d& lastNonFloraObjectHitOffset();
+	//const LLVector3d& getObjectOffset();
+	//const LLVector3d& lastNonFloraObjectHitOffset();
 
 	// mousePointOnLand() returns true if found point
 	BOOL			mousePointOnLandGlobal(const S32 x, const S32 y, LLVector3d *land_pos_global);
@@ -278,41 +349,25 @@ public:
 
 	LLAlertDialog* alertXml(const std::string& xml_filename,
 				  LLAlertDialog::alert_callback_t callback = NULL, void* user_data = NULL);
-	LLAlertDialog* alertXml(const std::string& xml_filename, const LLString::format_map_t& args,
+	LLAlertDialog* alertXml(const std::string& xml_filename, const LLStringUtil::format_map_t& args,
 				  LLAlertDialog::alert_callback_t callback = NULL, void* user_data = NULL);
-	LLAlertDialog* alertXmlEditText(const std::string& xml_filename, const LLString::format_map_t& args,
+	LLAlertDialog* alertXmlEditText(const std::string& xml_filename, const LLStringUtil::format_map_t& args,
 						  LLAlertDialog::alert_callback_t callback, void* user_data,
 						  LLAlertDialog::alert_text_callback_t text_callback, void *text_data,
-						  const LLString::format_map_t& edit_args = LLString::format_map_t(),
+						  const LLStringUtil::format_map_t& edit_args = LLStringUtil::format_map_t(),
 						  BOOL draw_asterixes = FALSE);
 
 	static bool alertCallback(S32 modal);
 	
-#ifdef SABINRIG
-	//Silly rig stuff
-	void		printFeedback(); //RIG STUFF!
-#endif //SABINRIG
-
 private:
+	bool                    shouldShowToolTipFor(LLMouseHandler *mh);
 	void			switchToolByMask(MASK mask);
 	void			destroyWindow();
 	void			drawMouselookInstructions();
 	void			stopGL(BOOL save_state = TRUE);
-	void			restoreGL(const LLString& progress_message = LLString::null);
+	void			restoreGL(const std::string& progress_message = LLStringUtil::null);
 	void			initFonts(F32 zoom_factor = 1.f);
-	
-	void			analyzeHit(
-						S32				x,				// input
-						S32				y_from_bot,		// input
-						LLViewerObject* objectp,		// input
-						U32				te_offset,		// input
-						LLUUID*			hit_object_id_p,// output
-						S32*			hit_face_p,		// output
-						LLVector3d*		hit_pos_p,		// output
-						BOOL*			hit_land,		// output
-						F32*			hit_u_coord,	// output
-						F32*			hit_v_coord);	// output
-
+	void			schedulePick(LLPickInfo& pick_info);
 	
 public:
 	LLWindow*		mWindow;						// graphical window object
@@ -348,26 +403,26 @@ protected:
 	BOOL			mSuppressToolbox;	// sometimes hide the toolbox, despite
 										// having a camera tool selected
 	BOOL			mHideCursorPermanent;	// true during drags, mouselook
-	LLCoordGL		mPickPoint;
-	LLCoordGL		mPickOffset;
-	MASK			mPickMask;
-	BOOL			mPickPending;
-	void			(*mPickCallback)(S32 x, S32 y, MASK mask);
+	BOOL            mCursorHidden;
+	LLPickInfo		mLastPick;
+	LLPickInfo		mHoverPick;
+	std::vector<LLPickInfo> mPicks;
+	LLRect			mPickScreenRegion; // area of frame buffer for rendering pick frames (generally follows mouse to avoid going offscreen)
+	LLTimer         mPickTimer;        // timer for scheduling n picks per second
 
-	LLString		mOverlayTitle;		// Used for special titles such as "Second Life - Special E3 2003 Beta"
+	std::string		mOverlayTitle;		// Used for special titles such as "Second Life - Special E3 2003 Beta"
 
 	BOOL			mIgnoreActivate;
-	U8*				mPickBuffer;
 
-	LLString		mInitAlert;			// Window / GL initialization requires an alert
+	std::string		mInitAlert;			// Window / GL initialization requires an alert
 	
 	class LLDebugText* mDebugText; // Internal class for debug text
 
 protected:
-	static char		sSnapshotBaseName[LL_MAX_PATH];		/* Flawfinder: ignore */
-	static char		sSnapshotDir[LL_MAX_PATH];		/* Flawfinder: ignore */
+	static std::string sSnapshotBaseName;
+	static std::string sSnapshotDir;
 
-	static char		sMovieBaseName[LL_MAX_PATH];		/* Flawfinder: ignore */
+	static std::string sMovieBaseName;
 };	
 
 class LLBottomPanel : public LLPanel
@@ -391,10 +446,8 @@ void toggle_flying(void*);
 void toggle_first_person();
 void toggle_build(void*);
 void reset_viewer_state_on_sim(void);
-void update_saved_window_size(const LLString& control,S32 delta_width, S32 delta_height);
-//
-// Constants
-//
+void update_saved_window_size(const std::string& control,S32 delta_width, S32 delta_height);
+
 
 
 //
@@ -408,28 +461,15 @@ extern LLFrameTimer		gMouseIdleTimer;		// how long has it been since the mouse l
 extern LLFrameTimer		gAwayTimer;				// tracks time before setting the avatar away state to true
 extern LLFrameTimer		gAwayTriggerTimer;		// how long the avatar has been away
 
-extern LLVector3d		gLastHitPosGlobal;
-extern LLVector3d		gLastHitObjectOffset;
-extern LLUUID			gLastHitObjectID;
-extern S32				gLastHitObjectFace;
-extern BOOL				gLastHitLand;
-extern F32				gLastHitUCoord;
-extern F32				gLastHitVCoord;
-
-
-extern LLVector3d		gLastHitNonFloraPosGlobal;
-extern LLVector3d		gLastHitNonFloraObjectOffset;
-extern LLUUID			gLastHitNonFloraObjectID;
-extern S32				gLastHitNonFloraObjectFace;
-
-extern S32				gLastHitUIElement;
-extern LLHUDIcon*		gLastHitHUDIcon;
-extern BOOL				gLastHitParcelWall;
 extern BOOL				gDebugSelect;
-extern BOOL				gPickFaces;
-extern BOOL				gPickTransparent;
 
 extern BOOL				gDebugFastUIRender;
+extern LLViewerObject*  gDebugRaycastObject;
+extern LLVector3        gDebugRaycastIntersection;
+extern LLVector2        gDebugRaycastTexCoord;
+extern LLVector3        gDebugRaycastNormal;
+extern LLVector3        gDebugRaycastBinormal;
+
 extern S32 CHAT_BAR_HEIGHT; 
 
 extern BOOL			gDisplayCameraPos;
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index b4357d8..d6c9e2f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -114,7 +114,7 @@
 #include "llworld.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llappviewer.h"
 #include "llsky.h"
 #include "llanimstatelabels.h"
@@ -138,7 +138,7 @@ S32 LLVOAvatar::sFreezeCounter = 0 ;
 //-----------------------------------------------------------------------------
 // Constants
 //-----------------------------------------------------------------------------
-const F32 MIN_PIXEL_AREA_FOR_COMPOSITE = 200.f;
+const F32 MIN_PIXEL_AREA_FOR_COMPOSITE = 1024;
 
 F32 SHADOW_OFFSET_AMT = 0.03f;
 
@@ -622,8 +622,6 @@ LLVOAvatar::LLVOAvatar(
 	LLViewerRegion* regionp)
 	:
 	LLViewerObject(id, pcode, regionp),
-	mHUDTargetZoom(1.f),
-	mHUDCurZoom(1.f),
 	mLastHeadBakedID( IMG_DEFAULT_AVATAR ),
 	mLastUpperBodyBakedID( IMG_DEFAULT_AVATAR ),
 	mLastLowerBodyBakedID( IMG_DEFAULT_AVATAR ),
@@ -675,6 +673,10 @@ LLVOAvatar::LLVOAvatar(
 	mUpperMaskTexName(0),
 	mLowerMaskTexName(0),
 	mCulled( FALSE ),
+	mVisibilityRank(0),
+	mFadeTime(0.f),
+	mLastFadeTime(0.f),
+	mLastFadeDistance(1.f),
 	mTexSkinColor( NULL ),
 	mTexHairColor( NULL ),
 	mTexEyeColor( NULL ),
@@ -718,8 +720,6 @@ LLVOAvatar::LLVOAvatar(
 	mSpeed = 0.f;
 	setAnimationData("Speed", &mSpeed);
 
-	strcpy(mAvatarDefinition, AVATAR_DEFAULT_CHAR);		/* Flawfinder: ignore */
-
 	if (id == gAgentID)
 	{
 		mIsSelf = TRUE;
@@ -735,6 +735,7 @@ LLVOAvatar::LLVOAvatar(
 	mNeedsAnimUpdate = TRUE;
 
 	mImpostorDistance = 0;
+	mImpostorPixelArea = 0;
 
 	setNumTEs(TEX_NUM_ENTRIES);
 
@@ -1359,9 +1360,9 @@ void LLVOAvatar::initClass()
 { 
 	LLVOAvatar::sMaxOtherAvatarsToComposite = gSavedSettings.getS32("AvatarCompositeLimit");
 
-	char xmlFile[MAX_PATH];		/* Flawfinder: ignore */
+	std::string xmlFile;
 
-	snprintf(xmlFile, MAX_PATH, "%s_lad.xml", gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,AVATAR_DEFAULT_CHAR).c_str());		/* Flawfinder: ignore */
+	xmlFile = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,AVATAR_DEFAULT_CHAR) + "_lad.xml";
 	BOOL success = sXMLTree.parseFile( xmlFile, FALSE );
 	if (!success)
 	{
@@ -1384,7 +1385,7 @@ void LLVOAvatar::initClass()
 		llerrs << "Invalid avatar file header: " << xmlFile << llendl;
 	}
 	
-	LLString version;
+	std::string version;
 	static LLStdStringHandle version_string = LLXmlTree::addAttributeString("version");
 	if( !root->getFastAttributeString( version_string, version ) || (version != "1.0") )
 	{
@@ -1396,7 +1397,7 @@ void LLVOAvatar::initClass()
 	root->getFastAttributeS32( wearable_definition_version_string, wearable_def_version );
 	LLWearable::setCurrentDefinitionVersion( wearable_def_version );
 
-	LLString mesh_file_name;
+	std::string mesh_file_name;
 
 	LLXmlTreeNode* skeleton_node = root->getChildByName( "skeleton" );
 	if (!skeleton_node)
@@ -1405,7 +1406,7 @@ void LLVOAvatar::initClass()
 		return;
 	}
 	
-	LLString skeleton_file_name;
+	std::string skeleton_file_name;
 	static LLStdStringHandle file_name_string = LLXmlTree::addAttributeString("file_name");
 	if (!skeleton_node->getFastAttributeString(file_name_string, skeleton_file_name))
 	{
@@ -1532,6 +1533,8 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax)
 		}
 	}
 
+	mPixelArea = LLPipeline::calcPixelArea((newMin+newMax)*0.5f, (newMax-newMin)*0.5f, *LLViewerCamera::getInstance());
+
 	//stretch bounding box by attachments
 	for (attachment_map_t::iterator iter = mAttachmentPoints.begin(); 
 		iter != mAttachmentPoints.end();
@@ -1570,7 +1573,7 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax)
 //-----------------------------------------------------------------------------
 // parseSkeletonFile()
 //-----------------------------------------------------------------------------
-BOOL LLVOAvatar::parseSkeletonFile(const LLString& filename)
+BOOL LLVOAvatar::parseSkeletonFile(const std::string& filename)
 {
 	LLMemType mt(LLMemType::MTYPE_AVATAR);
 	
@@ -1597,7 +1600,7 @@ BOOL LLVOAvatar::parseSkeletonFile(const LLString& filename)
 		llerrs << "Invalid avatar skeleton file header: " << filename << llendl;
 	}
 
-	LLString version;
+	std::string version;
 	static LLStdStringHandle version_string = LLXmlTree::addAttributeString("version");
 	if( !root->getFastAttributeString( version_string, version ) || (version != "1.0") )
 	{
@@ -1734,6 +1737,27 @@ BOOL LLVOAvatar::buildSkeleton(LLVOAvatarSkeletonInfo *info)
 }
 
 //-----------------------------------------------------------------------------
+// LLVOAvatar::startDefaultMotions()
+//-----------------------------------------------------------------------------
+void LLVOAvatar::startDefaultMotions()
+{
+	//-------------------------------------------------------------------------
+	// start default motions
+	//-------------------------------------------------------------------------
+	startMotion( ANIM_AGENT_HEAD_ROT );
+	startMotion( ANIM_AGENT_EYE );
+	startMotion( ANIM_AGENT_BODY_NOISE );
+	startMotion( ANIM_AGENT_BREATHE_ROT );
+	startMotion( ANIM_AGENT_HAND_MOTION );
+	startMotion( ANIM_AGENT_PELVIS_FIX );
+
+	//-------------------------------------------------------------------------
+	// restart any currently active motions
+	//-------------------------------------------------------------------------
+	processAnimationStateChanges();
+}
+
+//-----------------------------------------------------------------------------
 // LLVOAvatar::buildCharacter()
 // Deferred initialization and rebuild of the avatar.
 //-----------------------------------------------------------------------------
@@ -1816,7 +1840,6 @@ void LLVOAvatar::buildCharacter()
 		if ( mIsSelf )
 		{
 			llerrs << "Unable to load user's avatar" << llendl;
-			//set_avatar_character( &LLString(AVATAR_DEFAULT_CHAR));
 		}
 		else
 		{
@@ -1903,21 +1926,8 @@ void LLVOAvatar::buildCharacter()
 		mAahMorph = getVisualParam( "Express_Open_Mouth" );
 	}
 
-	//-------------------------------------------------------------------------
-	// start default motions
-	//-------------------------------------------------------------------------
-	startMotion( ANIM_AGENT_HEAD_ROT );
-	startMotion( ANIM_AGENT_EYE );
-	startMotion( ANIM_AGENT_BODY_NOISE );
-	startMotion( ANIM_AGENT_BREATHE_ROT );
-	startMotion( ANIM_AGENT_HAND_MOTION );
-	startMotion( ANIM_AGENT_PELVIS_FIX );
-
-	//-------------------------------------------------------------------------
-	// restart any currently active motions
-	//-------------------------------------------------------------------------
-	processAnimationStateChanges();
-
+	startDefaultMotions();
+	
 	mIsBuilt = TRUE;
 	stop_glerror();
 
@@ -1926,23 +1936,24 @@ void LLVOAvatar::buildCharacter()
 	//-------------------------------------------------------------------------
 	if (mIsSelf)
 	{
+		// *TODO: Translate
 		gAttachBodyPartPieMenus[0] = NULL;
-		gAttachBodyPartPieMenus[1] = new LLPieMenu("Right Arm >");
-		gAttachBodyPartPieMenus[2] = new LLPieMenu("Head >");
-		gAttachBodyPartPieMenus[3] = new LLPieMenu("Left Arm >");
+		gAttachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
+		gAttachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
+		gAttachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
 		gAttachBodyPartPieMenus[4] = NULL;
-		gAttachBodyPartPieMenus[5] = new LLPieMenu("Left Leg >");
-		gAttachBodyPartPieMenus[6] = new LLPieMenu("Torso >");
-		gAttachBodyPartPieMenus[7] = new LLPieMenu("Right Leg >");
+		gAttachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
+		gAttachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
+		gAttachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
 
 		gDetachBodyPartPieMenus[0] = NULL;
-		gDetachBodyPartPieMenus[1] = new LLPieMenu("Right Arm >");
-		gDetachBodyPartPieMenus[2] = new LLPieMenu("Head >");
-		gDetachBodyPartPieMenus[3] = new LLPieMenu("Left Arm >");
+		gDetachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
+		gDetachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
+		gDetachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
 		gDetachBodyPartPieMenus[4] = NULL;
-		gDetachBodyPartPieMenus[5] = new LLPieMenu("Left Leg >");
-		gDetachBodyPartPieMenus[6] = new LLPieMenu("Torso >");
-		gDetachBodyPartPieMenus[7] = new LLPieMenu("Right Leg >");
+		gDetachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
+		gDetachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
+		gDetachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
 
 		for (S32 i = 0; i < 8; i++)
 		{
@@ -2342,6 +2353,15 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
 	// Do base class updates...
 	U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
 
+	if(retval & LLViewerObject::INVALID_UPDATE)
+	{
+		if(this == gAgent.getAvatarObject())
+		{
+			//tell sim to cancel this update
+			gAgent.teleportViaLocation(gAgent.getPositionGlobal());
+		}
+	}
+
 	//llinfos << getRotation() << llendl;
 	//llinfos << getPosition() << llendl;
 	if (update_type == OUT_FULL )
@@ -2466,12 +2486,32 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 	// animate the character
 	// store off last frame's root position to be consistent with camera position
 	LLVector3 root_pos_last = mRoot.getWorldPosition();
-	BOOL detailed_update = updateCharacter(agent);
-	bool voiceEnabled = gVoiceClient->getVoiceEnabled( mID ) && gVoiceClient->inProximalChannel();
+	bool detailed_update = updateCharacter(agent);
+	bool voice_enabled = gVoiceClient->getVoiceEnabled( mID ) && gVoiceClient->inProximalChannel();
+
+	if (gNoRender)
+	{
+		return TRUE;
+	}
+
+	idleUpdateVoiceVisualizer( voice_enabled );
+	idleUpdateMisc( detailed_update );
+	idleUpdateAppearanceAnimation();
+	idleUpdateLipSync( voice_enabled );
+	idleUpdateLoadingEffect();
+	idleUpdateBelowWater();	// wind effect uses this
+	idleUpdateWindEffect();
+	idleUpdateNameTag( root_pos_last );
+	idleUpdateRenderCost();
+	idleUpdateTractorBeam();
+	return TRUE;
+}
 
+void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled)
+{
 	// disable voice visualizer when in mouselook
-	mVoiceVisualizer->setVoiceEnabled( voiceEnabled && !(mIsSelf && gAgent.cameraMouselook()) );
-	if ( voiceEnabled )
+	mVoiceVisualizer->setVoiceEnabled( voice_enabled && !(mIsSelf && gAgent.cameraMouselook()) );
+	if ( voice_enabled )
 	{		
 		//----------------------------------------------------------------
 		// Only do gesture triggering for your own avatar, and only when you're in a proximal channel.
@@ -2491,7 +2531,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			{
 				if ( mCurrentGesticulationLevel != VOICE_GESTICULATION_LEVEL_OFF )
 				{
-					LLString gestureString = "unInitialized";
+					std::string gestureString = "unInitialized";
 					if ( mCurrentGesticulationLevel == 0 )	{ gestureString = "/voicelevel1";	}
 					else	if ( mCurrentGesticulationLevel == 1 )	{ gestureString = "/voicelevel2";	}
 					else	if ( mCurrentGesticulationLevel == 2 )	{ gestureString = "/voicelevel3";	}
@@ -2553,7 +2593,10 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		mVoiceVisualizer->setVoiceSourceWorldPosition( mRoot.getWorldPosition() + headOffset );
 		
 	}//if ( voiceEnabled )
-		
+}		
+
+void LLVOAvatar::idleUpdateMisc(bool detailed_update)
+{
 	if (LLVOAvatar::sJointDebug)
 	{
 		llinfos << getFullname() << ": joint touches: " << LLJoint::sNumTouches << " updates: " << LLJoint::sNumUpdates << llendl;
@@ -2562,11 +2605,6 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 	LLJoint::sNumUpdates = 0;
 	LLJoint::sNumTouches = 0;
 
-	if (gNoRender)
-	{
-		return TRUE;
-	}
-
 	// *NOTE: this is necessary for the floating name text above your head.
 	if (mDrawable.notNull())
 	{
@@ -2628,7 +2666,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			F32 old_angle = mImpostorAngle.mV[i];
 			F32 angle_diff = fabsf(cur_angle-old_angle);
 		
-			if (angle_diff > 3.14159f/512.f*distance)
+			if (angle_diff > 3.14159f/512.f*distance*mUpdatePeriod)
 			{
 				mNeedsImpostorUpdate = TRUE;
 			}
@@ -2662,7 +2700,10 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 	{
 		gPipeline.markMoved(mDrawable, TRUE);
 	}
+}
 
+void LLVOAvatar::idleUpdateAppearanceAnimation()
+{
 	// update morphing params
 	if (mAppearanceAnimating)
 	{
@@ -2725,9 +2766,12 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		}
 		dirtyMesh();
 	}
+}
 
+void LLVOAvatar::idleUpdateLipSync(bool voice_enabled)
+{
 	// Use the Lipsync_Ooh and Lipsync_Aah morphs for lip sync
-	if ( voiceEnabled && (gVoiceClient->lipSyncEnabled()) && gVoiceClient->getIsSpeaking( mID ) )
+	if ( voice_enabled && (gVoiceClient->lipSyncEnabled()) && gVoiceClient->getIsSpeaking( mID ) )
 	{
 		F32 ooh_morph_amount = 0.0f;
 		F32 aah_morph_amount = 0.0f;
@@ -2754,7 +2798,10 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		LLCharacter::updateVisualParams();
 		dirtyMesh();
 	}
+}
 
+void LLVOAvatar::idleUpdateLoadingEffect()
+{
 	// update visibility when avatar is partially loaded
 	if (updateIsFullyLoaded()) // changed?
 	{
@@ -2794,10 +2841,12 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			setParticleSource(particle_parameters, getID());
 		}
 	}
-	
+}	
 
+void LLVOAvatar::idleUpdateWindEffect()
+{
 	// update wind effect
-	if ((LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR) >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH))
+	if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH))
 	{
 		F32 hover_strength = 0.f;
 		F32 time_delta = mRippleTimer.getElapsedTimeF32() - mRippleTimeLast;
@@ -2850,7 +2899,10 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			mRipplePhase = fmodf(mRipplePhase, F_TWO_PI);
 		}
 	}
+}
 
+void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
+{
 	// update chat bubble
 	//--------------------------------------------------------------------
 	// draw text label over characters head
@@ -2863,9 +2915,10 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 	const F32 time_visible = mTimeVisible.getElapsedTimeF32();
 	const F32 NAME_SHOW_TIME = gSavedSettings.getF32("RenderNameShowTime");	// seconds
 	const F32 FADE_DURATION = gSavedSettings.getF32("RenderNameFadeDuration"); // seconds
+	BOOL visible_avatar = isVisible() || mNeedsAnimUpdate;
 	BOOL visible_chat = gSavedSettings.getBOOL("UseChatBubbles") && (mChats.size() || mTyping);
 	BOOL render_name =	visible_chat ||
-						(visible &&
+						(visible_avatar &&
 						((sRenderName == RENDER_NAME_ALWAYS) ||
 						(sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
 	// If it's your own avatar, don't draw in mouselook, and don't
@@ -3160,15 +3213,16 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		mNameText = NULL;
 		sNumVisibleChatBubbles--;
 	}
+}
 
-	shame();
-
+void LLVOAvatar::idleUpdateTractorBeam()
+{
 	//--------------------------------------------------------------------
 	// draw tractor beam when editing objects
 	//--------------------------------------------------------------------
 	if (!mIsSelf)
 	{
-		return TRUE;
+		return;
 	}
 
 	// This is only done for yourself (maybe it should be in the agent?)
@@ -3218,7 +3272,8 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			}
 			else
 			{
-				mBeam->setPositionGlobal(gLastHitNonFloraPosGlobal + gLastHitNonFloraObjectOffset);
+				const LLPickInfo& pick = gViewerWindow->getLastPick();
+				mBeam->setPositionGlobal(pick.mPosGlobal);
 			}
 
 		}
@@ -3229,15 +3284,16 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			mBeamTimer.reset();
 		}
 	}
+}
 
+void LLVOAvatar::idleUpdateBelowWater()
+{
 	F32 avatar_height = (F32)(getPositionGlobal().mdV[VZ]);
 
 	F32 water_height;
 	water_height = getRegion()->getWaterHeight();
 
 	mBelowWater =  avatar_height < water_height;
-	
-	return TRUE;
 }
 
 void LLVOAvatar::slamPosition()
@@ -3330,32 +3386,43 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 	// the rest should only be done occasionally for far away avatars
 	//--------------------------------------------------------------------
 
-	if (!mIsSelf && !mIsDummy && sUseImpostors && !mNeedsAnimUpdate && !sFreezeCounter)
+	if (visible && !mIsSelf && !mIsDummy && sUseImpostors && !mNeedsAnimUpdate && !sFreezeCounter)
 	{
 		F32 impostor_area = 256.f*512.f*(8.125f - LLVOAvatar::sLODFactor*8.f);
 		if (LLMuteList::getInstance()->isMuted(getID()))
-		{
+		{ // muted avatars update at 16 hz
 			mUpdatePeriod = 16;
-			visible = (LLDrawable::getCurrentFrame()+mID.mData[0])%mUpdatePeriod == 0 ? TRUE : FALSE;
 		}
-		else if (visible && mPixelArea <= impostor_area)
-		{
-			mUpdatePeriod = llclamp((S32) sqrtf(impostor_area*4.f/mPixelArea), 2, 8);
-
-			visible = (LLDrawable::getCurrentFrame()+mID.mData[0])%mUpdatePeriod == 0 ? TRUE : FALSE;
+		else if (visible && mVisibilityRank <= LLVOAvatar::sMaxVisible * 0.25f)
+		{ //first 25% of max visible avatars are not impostored
+			mUpdatePeriod = 1;
+		}
+		else if (visible && mVisibilityRank > LLVOAvatar::sMaxVisible * 0.75f)
+		{ //back 25% of max visible avatars are slow updating impostors
+			mUpdatePeriod = 8;
+		}
+		else if (visible && mImpostorPixelArea <= impostor_area)
+		{  // stuff in between gets an update period based on pixel area
+			mUpdatePeriod = llclamp((S32) sqrtf(impostor_area*4.f/mImpostorPixelArea), 2, 8);
+		}
+		else if (visible && mVisibilityRank > LLVOAvatar::sMaxVisible * 0.25f)
+		{ // force nearby impostors in ultra crowded areas
+			mUpdatePeriod = 2;
 		}
 		else
-		{
+		{ // not impostored
 			mUpdatePeriod = 1;
 		}
 
-		if (!visible)
-		{
-			updateMotions(LLCharacter::HIDDEN_UPDATE);
-			return FALSE;
-		}
+		visible = (LLDrawable::getCurrentFrame()+mID.mData[0])%mUpdatePeriod == 0 ? TRUE : FALSE;
 	}
-	
+
+	if (!visible)
+	{
+		updateMotions(LLCharacter::HIDDEN_UPDATE);
+		return FALSE;
+	}
+
 	// change animation time quanta based on avatar render load
 	if (!mIsSelf && !mIsDummy)
 	{
@@ -3726,32 +3793,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 
 	mRoot.updateWorldMatrixChildren();
 
-	// Send the speaker position to the spatialized voice system.
-	if(mIsSelf)
-	{
-		LLMatrix3 rot;
-		LLVector3d pos;
-#if 1
-		// character rotation (stable, shouldn't move with animations)
-		rot = mRoot.getWorldRotation().getMatrix3();
-#else	
-		// actual head rotation (moves with animations, probably a bit too much)
-		rot.setRows(
-				LLVector3::x_axis * mSkullp->getWorldRotation(), 
-				LLVector3::y_axis * mSkullp->getWorldRotation(),  
-				LLVector3::z_axis * mSkullp->getWorldRotation());		
-#endif
-	
-		pos = getPositionGlobal();
-		pos += LLVector3d(mHeadOffset);
-		
-		// MBW -- XXX -- Setting velocity to 0 for now.  May figure it out later...
-		gVoiceClient->setAvatarPosition(
-				pos,				// position
-				LLVector3::zero, 	// velocity
-				rot);				// rotation matrix
-	}
-
 	if (!mDebugText.size() && mText.notNull())
 	{
 		mText->markDead();
@@ -3967,7 +4008,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
 		mDrawable->clearState(LLDrawable::REBUILD_GEOMETRY);
 	}
 
-	if (LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR) <= 0)
+	if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) <= 0)
 	{
 		if (mNeedsSkin)
 		{
@@ -4222,7 +4263,23 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color)
 	LLGLEnable test(GL_ALPHA_TEST);
 	gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f);
 
-	gGL.color4f(1,1,1,1);
+	F32 blend = gFrameTimeSeconds - mFadeTime;
+
+	LLGLState gl_blend(GL_BLEND, blend < 1.f ? TRUE : FALSE);
+	gGL.setSceneBlendType(LLRender::BT_ALPHA);
+
+	F32 alpha;
+	if (mVisibilityRank >= (U32) LLVOAvatar::sMaxVisible)
+	{ //fade out
+		alpha = 1.f - llmin(blend, 1.f);
+	}
+	else 
+	{ //fade in
+		alpha = llmin(blend, 1.f);
+	}
+
+	color.mV[3] = (U8) (alpha*255);
+	
 	gGL.color4ubv(color.mV);
 	mImpostor.bindTexture();
 	gGL.begin(LLVertexBuffer::QUADS);
@@ -4348,7 +4405,6 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
 			
 			const LLTextureEntry *te = getTE(i);
 			F32 texel_area_ratio = fabs(te->mScaleS * te->mScaleT);
-// 			BOOL boost_aux = (imagep->needsAux() && (!imagep->mFullWidth || !imagep->mFullHeight));
 			S32 boost_level = mIsSelf ? LLViewerImage::BOOST_AVATAR_BAKED_SELF : LLViewerImage::BOOST_AVATAR_BAKED;
 			
 			// Spam if this is a baked texture, not set to default image, without valid host info
@@ -4358,7 +4414,7 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
 			{
 				llwarns << "LLVOAvatar::updateTextures No host for texture "
 					<< imagep->getID() << " for avatar "
-					<< (mIsSelf ? "<myself>" : getID().asString().c_str()) 
+					<< (mIsSelf ? "<myself>" : getID().asString()) 
 					<< " on host " << getRegion()->getHost() << llendl;
 			}
 			
@@ -5440,7 +5496,7 @@ BOOL LLVOAvatar::loadMeshNodes()
 		 iter != sAvatarInfo->mMeshInfoList.end(); iter++)
 	{
 		LLVOAvatarInfo::LLVOAvatarMeshInfo *info = *iter;
-		LLString &type = info->mType;
+		std::string &type = info->mType;
 		S32 lod = info->mLOD;
 
 		LLViewerJointMesh* mesh = NULL;
@@ -5640,7 +5696,7 @@ BOOL LLVOAvatar::loadMeshNodes()
 		}
 
 		// Multimap insert
-		mMeshes.insert(std::pair<LLString, LLPolyMesh*>(info->mMeshFileName, poly_mesh));
+		mMeshes.insert(std::make_pair(info->mMeshFileName, poly_mesh));
 	
 		mesh->setMesh( poly_mesh );
 
@@ -5718,7 +5774,7 @@ void LLVOAvatar::setPixelAreaAndAngle(LLAgent &agent)
 	LLVector3 center = (ext[1] + ext[0]) * 0.5f;
 	LLVector3 size = (ext[1]-ext[0])*0.5f;
 
-	mPixelArea = LLPipeline::calcPixelArea(center, size, *LLViewerCamera::getInstance());
+	mImpostorPixelArea = LLPipeline::calcPixelArea(center, size, *LLViewerCamera::getInstance());
 
 	F32 range = mDrawable->mDistanceWRTCamera;
 
@@ -6167,9 +6223,11 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object)
 				stopMotionFromSource(viewer_object->getID());
 				LLFollowCamMgr::setCameraActive(viewer_object->getID(), FALSE);
 
-				for (S32 i = 0; i < (S32)viewer_object->mChildList.size(); i++)
+				LLViewerObject::const_child_list_t& child_list = viewer_object->getChildren();
+				for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+					 iter != child_list.end(); iter++)
 				{
-					LLViewerObject* child_objectp = viewer_object->mChildList[i];
+					LLViewerObject* child_objectp = *iter;
 					// the simulator should automatically handle
 					// permissions revocation
 
@@ -6211,6 +6269,10 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
 	mDrawable->mXform.setPosition(rel_pos);
 	mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot);
 
+	//in case the viewerobject is not updated in time
+	mDrawable->getVObj()->setPosition(sit_object->getWorldPosition()) ;
+	mDrawable->getVObj()->setRotation(sit_object->getWorldRotation()) ;
+
 	gPipeline.markMoved(mDrawable, TRUE);
 	mIsSitting = TRUE;
 	mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject
@@ -6252,9 +6314,11 @@ void LLVOAvatar::getOffObject()
 		stopMotionFromSource(sit_object->getID());
 		LLFollowCamMgr::setCameraActive(sit_object->getID(), FALSE);
 
-		for (S32 i = 0; i < (S32)sit_object->mChildList.size(); i++)
+		LLViewerObject::const_child_list_t& child_list = sit_object->getChildren();
+		for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+			 iter != child_list.end(); iter++)
 		{
-			LLViewerObject* child_objectp = sit_object->mChildList[i];
+			LLViewerObject* child_objectp = *iter;
 
 			stopMotionFromSource(child_objectp->getID());
 			LLFollowCamMgr::setCameraActive(child_objectp->getID(), FALSE);
@@ -6267,7 +6331,11 @@ void LLVOAvatar::getOffObject()
 
 	// set *local* position based on last *world* position, since we're unparenting the avatar
 	mDrawable->mXform.setPosition(cur_position_world);
-	mDrawable->mXform.setRotation(cur_rotation_world);
+	mDrawable->mXform.setRotation(cur_rotation_world);	
+	
+	//in case the viewerobject is not updated from sim in time
+	mDrawable->getVObj()->setPosition(cur_position_world);
+	mDrawable->getVObj()->setRotation(cur_rotation_world);
 
 	gPipeline.markMoved(mDrawable, TRUE);
 
@@ -6356,7 +6424,7 @@ LLViewerObject* LLVOAvatar::getWornAttachment( const LLUUID& inv_item_id )
 	return NULL;
 }
 
-const LLString LLVOAvatar::getAttachedPointName(const LLUUID& inv_item_id)
+const std::string LLVOAvatar::getAttachedPointName(const LLUUID& inv_item_id)
 {
 	for (attachment_map_t::iterator iter = mAttachmentPoints.begin(); 
 		 iter != mAttachmentPoints.end(); )
@@ -6365,11 +6433,11 @@ const LLString LLVOAvatar::getAttachedPointName(const LLUUID& inv_item_id)
 		LLViewerJointAttachment* attachment = curiter->second;
 		if( attachment->getItemID() == inv_item_id )
 		{
-			return (LLString)attachment->getName();
+			return attachment->getName();
 		}
 	}
 
-	return LLString::null;
+	return LLStringUtil::null;
 }
 
 
@@ -6453,7 +6521,7 @@ void LLVOAvatar::updateComposites()
 	}
 }
 
-LLColor4 LLVOAvatar::getGlobalColor( const LLString& color_name )
+LLColor4 LLVOAvatar::getGlobalColor( const std::string& color_name )
 {
 	if( color_name=="skin_color" && mTexSkinColor )
 	{
@@ -6718,7 +6786,9 @@ void LLVOAvatar::dumpTotalLocalTextureByteCount()
 
 BOOL LLVOAvatar::isVisible()
 {
-	return mDrawable.notNull() && (mDrawable->isVisible() || mIsDummy); 
+	return mDrawable.notNull()
+		&& (mDrawable->isVisible() || mIsDummy)
+		&& (mVisibilityRank < (U32) sMaxVisible || gFrameTimeSeconds - mFadeTime < 1.f); 
 }
 
 
@@ -7152,9 +7222,8 @@ void LLVOAvatar::updateMeshTextures()
 		{
 			mHeadBakedLoaded = FALSE;
 			mHeadMaskDiscard = -1;
-			baked->setNeedsAux(TRUE);
-			baked->setLoadedCallback(onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, new LLTextureMaskData( mID ));	
-			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, new LLUUID( mID ) );
+			baked->setLoadedCallback(onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));	
+			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, FALSE, new LLUUID( mID ) );
 		}
 	}
 	else
@@ -7203,9 +7272,8 @@ void LLVOAvatar::updateMeshTextures()
 		{
 			mUpperBakedLoaded = FALSE;
 			mUpperMaskDiscard = -1;
-			baked->setNeedsAux(TRUE);
-			baked->setLoadedCallback(onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, new LLTextureMaskData( mID ));
-			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, new LLUUID( mID ) );
+			baked->setLoadedCallback(onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));
+			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, FALSE, new LLUUID( mID ) );
 		}
 	}
 	else
@@ -7251,9 +7319,8 @@ void LLVOAvatar::updateMeshTextures()
 		{
 			mLowerBakedLoaded = FALSE;
 			mLowerMaskDiscard = -1;
-			baked->setNeedsAux(TRUE);
-			baked->setLoadedCallback(onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, new LLTextureMaskData( mID ));
-			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, new LLUUID( mID ) );
+			baked->setLoadedCallback(onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));
+			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, FALSE, new LLUUID( mID ) );
 		}
 	}
 	else
@@ -7297,7 +7364,7 @@ void LLVOAvatar::updateMeshTextures()
 		else
 		{
 			mEyesBakedLoaded = FALSE;
-			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, new LLUUID( mID ) );
+			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, FALSE, new LLUUID( mID ) );
 		}
 	}
 	else
@@ -7340,7 +7407,7 @@ void LLVOAvatar::updateMeshTextures()
 		else
 		{
 			mSkirtBakedLoaded = FALSE;
-			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, new LLUUID( mID ) );
+			baked->setLoadedCallback(onBakedTextureLoaded, SWITCH_TO_BAKED_DISCARD, FALSE, FALSE, new LLUUID( mID ) );
 		}
 	}
 	else
@@ -7441,7 +7508,7 @@ void LLVOAvatar::setLocalTexture( ELocTexIndex idx, LLViewerImage* tex, BOOL bak
 				}
 				else
 				{
-					tex->setLoadedCallback( onLocalTextureLoaded, desired_discard, TRUE, new LLAvatarTexData(getID(), idx) );
+					tex->setLoadedCallback( onLocalTextureLoaded, desired_discard, TRUE, FALSE, new LLAvatarTexData(getID(), idx) );
 				}
 			}
 			tex->setMinDiscardLevel(desired_discard);
@@ -7962,7 +8029,7 @@ LLColor4  LLVOAvatar::getClothesColor( ETextureIndex te )
 
 
 
-void LLVOAvatar::dumpAvatarTEs( const char* context )
+void LLVOAvatar::dumpAvatarTEs( const std::string& context )
 {
 	llinfos << (mIsSelf ? "Self: " : "Other: ") << context << llendl;
 	for( S32 i=0; i<TEX_NUM_ENTRIES; i++ )
@@ -8242,9 +8309,12 @@ LLBBox LLVOAvatar::getHUDBBox()
 			bbox.addPointLocal(hud_object->getPosition());
 			// add rotated bounding box for attached object
 			bbox.addBBoxAgent(hud_object->getBoundingBoxAgent());
-			for (U32 i = 0; i < hud_object->mChildList.size(); i++)
+			LLViewerObject::const_child_list_t& child_list = hud_object->getChildren();
+			for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+				 iter != child_list.end(); iter++)
 			{
-				bbox.addBBoxAgent(hud_object->mChildList[i]->getBoundingBoxAgent());
+				LLViewerObject* child_objectp = *iter;
+				bbox.addBBoxAgent(child_objectp->getBoundingBoxAgent());
 			}
 		}
 	}
@@ -8277,41 +8347,38 @@ void LLVOAvatar::onFirstTEMessageReceived()
 		{
 			mLastHeadBakedID = getTEImage( TEX_HEAD_BAKED )->getID();
 			LLViewerImage* image = getTEImage( TEX_HEAD_BAKED );
-			image->setNeedsAux(TRUE);
-			image->setLoadedCallback( onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, new LLTextureMaskData( mID ));	
-			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, new LLUUID( mID ) );
+			image->setLoadedCallback( onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));	
+			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, FALSE, new LLUUID( mID ) );
 		}
 
 		if( upper_baked )
 		{
 			mLastUpperBodyBakedID = getTEImage( TEX_UPPER_BAKED )->getID();
 			LLViewerImage* image = getTEImage( TEX_UPPER_BAKED );
-			image->setNeedsAux(TRUE);
-			image->setLoadedCallback( onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, new LLTextureMaskData( mID ));	
-			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, new LLUUID( mID ) );
+			image->setLoadedCallback( onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));	
+			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, FALSE, new LLUUID( mID ) );
 		}
 		
 		if( lower_baked )
 		{
 			mLastLowerBodyBakedID = getTEImage( TEX_LOWER_BAKED )->getID();
 			LLViewerImage* image = getTEImage( TEX_LOWER_BAKED );
-			image->setNeedsAux(TRUE);
-			image->setLoadedCallback( onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, new LLTextureMaskData( mID ));	
-			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, new LLUUID( mID ) );
+			image->setLoadedCallback( onBakedTextureMasksLoaded, MORPH_MASK_REQUESTED_DISCARD, TRUE, TRUE, new LLTextureMaskData( mID ));	
+			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, FALSE, new LLUUID( mID ) );
 		}
 
 		if( eyes_baked )
 		{
 			mLastEyesBakedID = getTEImage( TEX_EYES_BAKED )->getID();
 			LLViewerImage* image = getTEImage( TEX_EYES_BAKED );
-			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, new LLUUID( mID ) );
+			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, FALSE, new LLUUID( mID ) );
 		}
 
 		if( skirt_baked )
 		{
 			mLastSkirtBakedID = getTEImage( TEX_SKIRT_BAKED )->getID();
 			LLViewerImage* image = getTEImage( TEX_SKIRT_BAKED );
-			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, new LLUUID( mID ) );
+			image->setLoadedCallback( onInitialBakedTextureLoaded, MAX_DISCARD_LEVEL, FALSE, FALSE, new LLUUID( mID ) );
 		}
 
 		updateMeshTextures();
@@ -8323,6 +8390,12 @@ void LLVOAvatar::onFirstTEMessageReceived()
 //-----------------------------------------------------------------------------
 void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 {
+	if (gSavedSettings.getBOOL("BlockAvatarAppearanceMessages"))
+	{
+		llwarns << "Blocking AvatarAppearance message" << llendl;
+		return;
+	}
+	
 	LLMemType mt(LLMemType::MTYPE_AVATAR);
 	
 //	llinfos << "processAvatarAppearance start " << mID << llendl;
@@ -8780,8 +8853,8 @@ void LLVOAvatar::dumpArchetypeXML( void* )
 	// only body parts, not clothing.
 	for( S32 type = WT_SHAPE; type <= WT_EYES; type++ )
 	{
-		const char* wearable_name = LLWearable::typeToTypeName( (EWearableType) type );
-		apr_file_printf( file, "\n\t\t<!-- wearable: %s -->\n", wearable_name );
+		const std::string& wearable_name = LLWearable::typeToTypeName( (EWearableType) type );
+		apr_file_printf( file, "\n\t\t<!-- wearable: %s -->\n", wearable_name.c_str() );
 
 		for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
 		{
@@ -8801,9 +8874,9 @@ void LLVOAvatar::dumpArchetypeXML( void* )
 				LLViewerImage* te_image = avatar->getTEImage( te );
 				if( te_image )
 				{
-					char uuid_str[UUID_STR_LENGTH];		/* Flawfinder: ignore */
+					std::string uuid_str;
 					te_image->getID().toString( uuid_str );
-					apr_file_printf( file, "\t\t<texture te=\"%i\" uuid=\"%s\"/>\n", te, uuid_str);
+					apr_file_printf( file, "\t\t<texture te=\"%i\" uuid=\"%s\"/>\n", te, uuid_str.c_str());
 				}
 			}
 		}
@@ -8814,6 +8887,42 @@ void LLVOAvatar::dumpArchetypeXML( void* )
 }
 
 
+U32 LLVOAvatar::getVisibilityRank()
+{
+	return mVisibilityRank;
+}
+
+void LLVOAvatar::setVisibilityRank(U32 rank)
+{
+	BOOL stale = gFrameTimeSeconds - mLastFadeTime > 10.f;
+	
+	//only raise visibility rank or trigger a fade out every 10 seconds
+	if (mVisibilityRank >= (U32) LLVOAvatar::sMaxVisible && rank < (U32) LLVOAvatar::sMaxVisible ||
+		(stale && mVisibilityRank < (U32) LLVOAvatar::sMaxVisible && rank >= (U32) LLVOAvatar::sMaxVisible))
+	{ //remember the time we became visible/invisible based on visibility rank
+		mVisibilityRank = rank;
+		mLastFadeTime = gFrameTimeSeconds;
+		mLastFadeDistance = mDrawable->mDistanceWRTCamera;
+
+		F32 blend = gFrameTimeSeconds - mFadeTime;
+		mFadeTime = gFrameTimeSeconds;
+		if (blend < 1.f)
+		{ //move the blend time back if a blend is already in progress (prevent flashes)
+			mFadeTime -= 1.f-blend;
+		}
+	}
+	else if (stale)
+	{
+		mLastFadeTime = gFrameTimeSeconds;
+		mLastFadeDistance = mDrawable->mDistanceWRTCamera;
+		mVisibilityRank = rank;
+	}
+	else
+	{
+		mVisibilityRank = llmin(mVisibilityRank, rank);
+	}
+}
+
 // Assumes LLVOAvatar::sInstances has already been sorted.
 S32 LLVOAvatar::getUnbakedPixelAreaRank()
 {
@@ -8843,8 +8952,8 @@ void LLVOAvatar::cullAvatarsByPixelArea()
 	std::sort(LLCharacter::sInstances.begin(), LLCharacter::sInstances.end(), CompareScreenAreaGreater());
 	
 	// Update the avatars that have changed status
-	S32 rank = 1;
-
+	S32 comp_rank = 1;
+	U32 rank = 0;
 	for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
 		iter != LLCharacter::sInstances.end(); ++iter)
 	{
@@ -8860,8 +8969,8 @@ void LLVOAvatar::cullAvatarsByPixelArea()
 		}
 		else
 		{
-			culled = (rank > LLVOAvatar::sMaxOtherAvatarsToComposite) || (inst->mPixelArea < MIN_PIXEL_AREA_FOR_COMPOSITE);
-			rank++;
+			culled = (comp_rank > LLVOAvatar::sMaxOtherAvatarsToComposite) || (inst->mPixelArea < MIN_PIXEL_AREA_FOR_COMPOSITE);
+			comp_rank++;
 		}
 
 		if( inst->mCulled != culled )
@@ -8872,6 +8981,15 @@ void LLVOAvatar::cullAvatarsByPixelArea()
 
 			inst->updateMeshTextures();
 		}
+
+		if (inst->isSelf())
+		{
+			inst->setVisibilityRank(0);
+		}
+		else if (inst->mDrawable.notNull() && inst->mDrawable->isVisible())
+		{
+			inst->setVisibilityRank(rank++);
+		}
 	}
 
 	if( LLVOAvatar::areAllNearbyInstancesBaked() )
@@ -8984,7 +9102,7 @@ void LLVOAvatar::dumpLocalTextures()
 {
 	llinfos << "Local Textures:" << llendl;
 
-	char* names[] = {
+	const char* names[] = {
 		"Shirt     ",
 		"UpperTatoo",
 		"Pants     ",
@@ -9434,7 +9552,7 @@ BOOL LLVOAvatarInfo::parseXmlColorNodes(LLXmlTreeNode* root)
 		 color_node;
 		 color_node = root->getNextNamedChild())
 	{
-		LLString global_color_name;
+		std::string global_color_name;
 		static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
 		if (color_node->getFastAttributeString( name_string, global_color_name ) )
 		{
@@ -9574,9 +9692,9 @@ void LLVOAvatar::updateRegion(LLViewerRegion *regionp)
 	}
 }
 
-LLString LLVOAvatar::getFullname() const
+std::string LLVOAvatar::getFullname() const
 {
-	LLString name;
+	std::string name;
 
 	LLNameValue* first = getNVPair("FirstName"); 
 	LLNameValue* last  = getNVPair("LastName"); 
@@ -9681,7 +9799,7 @@ BOOL LLVOAvatar::updateLOD()
 	}
 	
 	updateVisibility();
-	
+
 	return res;
 }
 
@@ -9835,15 +9953,26 @@ U32 calc_shame(LLVOVolume* volume, std::set<LLUUID> &textures)
 
 	shame += invisi + shiny + glow + alpha*4 + flexi*8 + animtex*4 + particles*16+bump*4+scale+planar;
 
-	for (U32 i = 0; i < drawablep->getChildCount(); ++i)
+	LLViewerObject::const_child_list_t& child_list = volume->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); iter++)
 	{
-		shame += calc_shame(drawablep->getChild(i)->getVOVolume(), textures);
+		LLViewerObject* child_objectp = *iter;
+		LLDrawable* child_drawablep = child_objectp->mDrawable;
+		if (child_drawablep)
+		{
+			LLVOVolume* child_volumep = child_drawablep->getVOVolume();
+			if (child_volumep)
+			{
+				shame += calc_shame(child_volumep, textures);
+			}
+		}
 	}
 
 	return shame;
 }
 
-void LLVOAvatar::shame()
+void LLVOAvatar::idleUpdateRenderCost()
 {
 	if (!gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SHAME))
 	{
@@ -9884,3 +10013,4 @@ void LLVOAvatar::shame()
 	mText->setColor(LLColor4(red,green,0,1));
 }
 
+
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index a1f5bd2..d4c5e8a 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -128,7 +128,7 @@ public:
 	BOOL parseXml(LLXmlTreeNode* node);
 	
 protected:
-	LLString mName;
+	std::string mName;
 	BOOL mIsJoint;
 	LLVector3 mPos;
 	LLVector3 mRot;
@@ -194,10 +194,10 @@ protected:
 			mPolyMorphTargetInfoList.clear();
 		}
 
-		LLString 	mType;
+		std::string mType;
 		S32			mLOD;
-		LLString	mMeshFileName;
-		LLString	mReferenceMeshName;
+		std::string	mMeshFileName;
+		std::string	mReferenceMeshName;
 		F32			mMinPixelArea;
 		morph_info_list_t mPolyMorphTargetInfoList;
 	};
@@ -212,8 +212,8 @@ protected:
 		LLVOAvatarAttachmentInfo()
 			: mGroup(-1), mAttachmentID(-1), mPieMenuSlice(-1), mVisibleFirstPerson(FALSE),
 			  mIsHUDAttachment(FALSE), mHasPosition(FALSE), mHasRotation(FALSE) {}
-		LLString mName;
-		LLString mJointName;
+		std::string mName;
+		std::string mJointName;
 		LLVector3 mPosition;
 		LLVector3 mRotationEuler;
 		S32 mGroup;
@@ -277,13 +277,24 @@ public:
 	//--------------------------------------------------------------------
 	static void initClass();	// Initialize data that's only inited once per class.
 	static void cleanupClass();	// Cleanup data that's only inited once per class.
-	static BOOL parseSkeletonFile(const LLString& filename);
+	static BOOL parseSkeletonFile(const std::string& filename);
 	virtual U32 processUpdateMessage(	LLMessageSystem *mesgsys,
 										void **user_data,
 										U32 block_num,
 										const EObjectUpdateType update_type,
 										LLDataPacker *dp);
-	virtual BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
+	/*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
+	void idleUpdateVoiceVisualizer(bool voice_enabled);
+	void idleUpdateMisc(bool detailed_update);
+	void idleUpdateAppearanceAnimation();
+	void idleUpdateLipSync(bool voice_enabled);
+	void idleUpdateLoadingEffect();
+	void idleUpdateWindEffect();
+	void idleUpdateNameTag(const LLVector3& root_pos_last);
+	void idleUpdateRenderCost();
+	void idleUpdateTractorBeam();
+	void idleUpdateBelowWater();
+
 	virtual BOOL updateLOD();
 	void setFootPlane(const LLVector4 &plane) { mFootPlane = plane; }
 	/*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
@@ -428,6 +439,8 @@ public:
 	BOOL			isCulled() { return mCulled; }
 	
 	S32				getUnbakedPixelAreaRank();
+	void			setVisibilityRank(U32 rank);
+	U32				getVisibilityRank();
 	static void		cullAvatarsByPixelArea();
 
 	void			dumpLocalTextures();
@@ -443,13 +456,14 @@ public:
 	void			stopTyping() { mTyping = FALSE; }
 
 	// Returns "FirstName LastName"
-	LLString		getFullname() const;
+	std::string		getFullname() const;
 
 	//--------------------------------------------------------------------
 	// internal (pseudo-private) functions
 	//--------------------------------------------------------------------
 	F32 getPelvisToFoot() { return mPelvisToFoot; }
-
+	
+	void startDefaultMotions();
 	void buildCharacter();
 	void releaseMeshData();
 	void restoreMeshData();
@@ -499,7 +513,7 @@ public:
 
 	BOOL isWearingAttachment( const LLUUID& inv_item_id );
 	LLViewerObject* getWornAttachment( const LLUUID& inv_item_id );
-	const LLString getAttachedPointName(const LLUUID& inv_item_id);
+	const std::string getAttachedPointName(const LLUUID& inv_item_id);
 
 	static LLVOAvatar* findAvatarFromAttachment( LLViewerObject* obj );
 
@@ -530,7 +544,7 @@ public:
 	//--------------------------------------------------------------------
 	// texture compositing (used only by the LLTexLayer series of classes)
 	//--------------------------------------------------------------------
-	LLColor4		getGlobalColor( const LLString& color_name );
+	LLColor4		getGlobalColor( const std::string& color_name );
 	BOOL			isLocalTextureDataAvailable( LLTexLayerSet* layerset );
 	BOOL			isLocalTextureDataFinal( LLTexLayerSet* layerset );
 	ETextureIndex	getBakedTE( LLTexLayerSet* layerset );
@@ -591,11 +605,6 @@ public:
 	BOOL mIsBuilt;
 
 	//--------------------------------------------------------------------
-	// avatar definition name
-	//--------------------------------------------------------------------
-	char mAvatarDefinition[64];		/* Flawfinder: ignore */
-
-	//--------------------------------------------------------------------
 	// skeleton for skinned avatar
 	//--------------------------------------------------------------------
 	S32				mNumJoints;
@@ -630,8 +639,6 @@ public:
 	// special purpose joint for HUD attachments
 	//--------------------------------------------------------------------
 	LLViewerJoint *mScreenp;
-	F32				mHUDTargetZoom;
-	F32				mHUDCurZoom;
 
 	//--------------------------------------------------------------------
 	// mesh objects for skinned avatar
@@ -683,7 +690,7 @@ public:
 	LLViewerJointMesh		mSkirtMesh3;
 	LLViewerJointMesh		mSkirtMesh4;
 
-	typedef std::multimap<LLString, LLPolyMesh*> mesh_map_t;
+	typedef std::multimap<std::string, LLPolyMesh*> mesh_map_t;
 	mesh_map_t				mMeshes;
 
 	//--------------------------------------------------------------------
@@ -713,8 +720,9 @@ public:
 	LLVector3		mImpostorExtents[2];
 	LLVector3		mImpostorAngle;
 	F32				mImpostorDistance;
+	F32				mImpostorPixelArea;
 	LLVector3		mLastAnimExtents[2];  
-
+	
 	//--------------------------------------------------------------------
 	// Misc Render State
 	//--------------------------------------------------------------------
@@ -913,7 +921,7 @@ protected:
 	F32		mAdjustedPixelArea;
 
 	LLWString mNameString;
-	LLString  mTitle;
+	std::string  mTitle;
 	BOOL	  mNameAway;
 	BOOL	  mNameBusy;
 	BOOL	  mNameMute;
@@ -921,8 +929,7 @@ protected:
 	BOOL	  mVisibleChat;
 	BOOL      mRenderGroupTitles;
 
-
-	LLString  mDebugText;
+	std::string  mDebugText;
 	U64		  mLastRegionHandle;
 	LLFrameTimer mRegionCrossingTimer;
 	S32		  mRegionCrossingCount;
@@ -953,6 +960,10 @@ protected:
 	U32					mLowerMaskTexName;
 
 	BOOL				mCulled;
+	U32					mVisibilityRank;
+	F32					mFadeTime;
+	F32					mLastFadeTime;
+	F32					mLastFadeDistance;
 	F32					mMinPixelArea; // debug
 	F32					mMaxPixelArea; // debug
 	
@@ -1002,13 +1013,12 @@ protected:
 	static void		onInitialBakedTextureLoaded( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata );
 	static void		onBakedTextureLoaded(BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata);
 	void			useBakedTexture(const LLUUID& id);
-	void			dumpAvatarTEs(const char* context);
+	void			dumpAvatarTEs(const std::string& context);
 	void			removeMissingBakedTextures();
 	LLTexLayerSet*	getLayerSet(ETextureIndex index) const;
 	LLHost			getObjectHost() const;
 	S32				getLocalDiscardLevel( S32 index);
 	
-	void			shame();  //generate shame metric
 
 	//-----------------------------------------------------------------------------------------------
 	// the Voice Visualizer is responsible for detecting the user's voice signal, and when the
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index a0e98ce..a028a63 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -172,7 +172,7 @@ void LLVOGrass::initClass()
 
 		if (newGrass->mTextureID.isNull())
 		{
-			LLString textureName;
+			std::string textureName;
 
 			static LLStdStringHandle texture_name_string = LLXmlTree::addAttributeString("texture_name");
 			success &= grass_def->getFastAttributeString(texture_name_string, textureName);
@@ -203,7 +203,7 @@ void LLVOGrass::initClass()
 
 		if (!success)
 		{
-			LLString name;
+			std::string name;
 			static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
 			grass_def->getFastAttributeString(name_string, name);
 			llwarns << "Incomplete definition of grass " << name << llendl;
@@ -211,22 +211,20 @@ void LLVOGrass::initClass()
 	}
 
 	BOOL have_all_grass = TRUE;
-	LLString err;
-	char buffer[10];		/* Flawfinder: ignore */
+	std::string err;
 
 	for (S32 i=0;i<sMaxGrassSpecies;++i)
 	{
 		if (!sSpeciesTable.count(i))
 		{
-			snprintf(buffer,10," %d",i);		/* Flawfinder: ignore */
-			err.append(buffer);
+			err.append(llformat(" %d",i));
 			have_all_grass = FALSE;
 		}
 	}
 
 	if (!have_all_grass) 
 	{
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[SPECIES]"] = err;
 		gViewerWindow->alertXml("ErrorUndefinedGrasses", args, alert_done );
 	}
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 7f63aca..bedf1d9 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1,4 +1,4 @@
-/** 
+ /** 
  * @file llvoiceclient.cpp
  * @brief Implementation of LLVoiceClient class which is the interface to the voice client process.
  *
@@ -39,7 +39,11 @@
 #include "llvoavatar.h"
 #include "llbufferstream.h"
 #include "llfile.h"
-#include "expat/expat.h"
+#ifdef LL_STANDALONE
+# include "expat.h"
+#else
+# include "expat/expat.h"
+#endif
 #include "llcallbacklist.h"
 #include "llviewerregion.h"
 #include "llviewernetwork.h"		// for gGridChoice
@@ -56,12 +60,13 @@
 #include "llviewerparcelmgr.h"
 #include "llfirstuse.h"
 #include "llviewerwindow.h"
+#include "llviewercamera.h"
 
 // for base64 decoding
-#include "apr-1/apr_base64.h"
+#include "apr_base64.h"
 
 // for SHA1 hash
-#include "apr-1/apr_sha1.h"
+#include "apr_sha1.h"
 
 // If we are connecting to agni AND the user's last name is "Linden", join this channel instead of looking up the sim name.
 // If we are connecting to agni and the user's last name is NOT "Linden", disable voice.
@@ -218,6 +223,19 @@ void LLVivoxProtocolParser::reset()
 	ignoringTags = false;
 	accumulateText = false;
 	textBuffer.clear();
+
+	energy = 0.f;
+	ignoreDepth = 0;
+	isChannel = false;
+	isEvent = false;
+	isLocallyMuted = false;
+	isModeratorMuted = false;
+	isSpeaking = false;
+	participantType = 0;
+	returnCode = 0;
+	state = 0;
+	statusCode = 0;
+	volume = 0;
 }
 
 //virtual 
@@ -404,7 +422,7 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
 
 void LLVivoxProtocolParser::EndTag(const char *tag)
 {
-	const char	*string = textBuffer.c_str();
+	const std::string& string = textBuffer;
 	bool clearbuffer = true;
 
 	responseDepth--;
@@ -428,9 +446,9 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
 
 		// Closing a tag. Finalize the text we've accumulated and reset
 		if (strcmp("ReturnCode", tag) == 0)
-			returnCode = strtol(string, NULL, 10);
+			returnCode = strtol(string.c_str(), NULL, 10);
 		else if (strcmp("StatusCode", tag) == 0)
-			statusCode = strtol(string, NULL, 10);
+			statusCode = strtol(string.c_str(), NULL, 10);
 		else if (strcmp("ConnectorHandle", tag) == 0)
 			connectorHandle = string;
 		else if (strcmp("AccountHandle", tag) == 0)
@@ -445,11 +463,11 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
 		else if (strcmp("StatusString", tag) == 0)
 			statusString = string;
 		else if (strcmp("State", tag) == 0)
-			state = strtol(string, NULL, 10);
+			state = strtol(string.c_str(), NULL, 10);
 		else if (strcmp("URI", tag) == 0)
 			uriString = string;
 		else if (strcmp("IsChannel", tag) == 0)
-			isChannel = strcmp(string, "true") == 0;
+			isChannel = string == "true" ? true : false;
 		else if (strcmp("Name", tag) == 0)
 			nameString = string;
 		else if (strcmp("AudioMedia", tag) == 0)
@@ -463,19 +481,19 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
 		else if (strcmp("AccountName", tag) == 0)
 			nameString = string;
 		else if (strcmp("ParticipantTyppe", tag) == 0)
-			participantType = strtol(string, NULL, 10);
+			participantType = strtol(string.c_str(), NULL, 10);
 		else if (strcmp("IsLocallyMuted", tag) == 0)
-			isLocallyMuted = strcmp(string, "true") == 0;
+			isLocallyMuted = string == "true" ? true : false;
 		else if (strcmp("IsModeratorMuted", tag) == 0)
-			isModeratorMuted = strcmp(string, "true") == 0;
+			isModeratorMuted = string == "true" ? true : false;
 		else if (strcmp("IsSpeaking", tag) == 0)
-			isSpeaking = strcmp(string, "true") == 0;
+			isSpeaking = string == "true" ? true : false;
 		else if (strcmp("Volume", tag) == 0)
-			volume = strtol(string, NULL, 10);
+			volume = strtol(string.c_str(), NULL, 10);
 		else if (strcmp("Energy", tag) == 0)
-			energy = (F32)strtod(string, NULL);
+			energy = (F32)strtod(string.c_str(), NULL);
 		else if (strcmp("MicEnergy", tag) == 0)
-			energy = (F32)strtod(string, NULL);
+			energy = (F32)strtod(string.c_str(), NULL);
 		else if (strcmp("ChannelName", tag) == 0)
 			nameString = string;
 		else if (strcmp("ChannelURI", tag) == 0)
@@ -1079,9 +1097,9 @@ void LLVoiceClient::idle(void* user_data)
 	self->stateMachine();
 }
 
-const char *LLVoiceClient::state2string(LLVoiceClient::state inState)
+std::string LLVoiceClient::state2string(LLVoiceClient::state inState)
 {
-	const char *result = "UNKNOWN";
+	std::string result = "UNKNOWN";
 	
 		// Prevent copy-paste errors when updating this list...
 #define CASE(x)  case x:  result = #x;  break
@@ -1131,9 +1149,9 @@ const char *LLVoiceClient::state2string(LLVoiceClient::state inState)
 	return result;
 }
 
-const char *LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserver::EStatusType inStatus)
+std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserver::EStatusType inStatus)
 {
-	const char *result = "UNKNOWN";
+	std::string result = "UNKNOWN";
 	
 		// Prevent copy-paste errors when updating this list...
 #define CASE(x)  case x:  result = #x;  break
@@ -1174,7 +1192,11 @@ void LLVoiceClient::stateMachine()
 		setVoiceEnabled(false);
 	}
 	
-	if(!mVoiceEnabled)
+	if(mVoiceEnabled)
+	{
+		updatePosition();
+	}
+	else
 	{
 		if(getState() != stateDisabled)
 		{
@@ -1246,17 +1268,23 @@ void LLVoiceClient::stateMachine()
 				if(true)
 				{
 					// Launch the voice daemon
-					std::string exe_path = gDirUtilp->getAppRODataDir();
+					
+					// *FIX:Mani - Using the executable dir instead 
+					// of mAppRODataDir, the working directory from which the app
+					// is launched.
+					//std::string exe_path = gDirUtilp->getAppRODataDir();
+					std::string exe_path = gDirUtilp->getExecutableDir();
 					exe_path += gDirUtilp->getDirDelimiter();
 #if LL_WINDOWS
 					exe_path += "SLVoice.exe";
+#elif LL_DARWIN
+					exe_path += "../Resources/SLVoice";
 #else
-					// This will be the same for mac and linux
 					exe_path += "SLVoice";
 #endif
 					// See if the vivox executable exists
 					llstat s;
-					if(!LLFile::stat(exe_path.c_str(), &s))
+					if(!LLFile::stat(exe_path, &s))
 					{
 						// vivox executable exists.  Build the command line and launch the daemon.
 						std::string args = " -p tcp -h -c";
@@ -1302,7 +1330,7 @@ void LLVoiceClient::stateMachine()
 						// This should be the same for mac and linux
 						{
 							std::vector<std::string> arglist;
-							arglist.push_back(exe_path.c_str());
+							arglist.push_back(exe_path);
 							
 							// Split the argument string into separate strings for each argument
 							typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
@@ -1323,6 +1351,7 @@ void LLVoiceClient::stateMachine()
 
 							fakeargv[i] = NULL;
 							
+							fflush(NULL); // flush all buffers before the child inherits them
 							pid_t id = vfork();
 							if(id == 0)
 							{
@@ -1343,7 +1372,7 @@ void LLVoiceClient::stateMachine()
 					}	
 					else
 					{
-						LL_INFOS("Voice") << exe_path << "not found." << LL_ENDL
+						LL_INFOS("Voice") << exe_path << "not found." << LL_ENDL;
 					}	
 				}
 				else
@@ -1352,7 +1381,7 @@ void LLVoiceClient::stateMachine()
 					// To do this, launch the gateway on a nearby host like this:
 					//  vivox-gw.exe -p tcp -i 0.0.0.0:44124
 					// and put that host's IP address here.
-					mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost").c_str(), gSavedSettings.getU32("VoicePort"));
+					mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost"), gSavedSettings.getU32("VoicePort"));
 				}
 
 				mUpdateTimer.start();
@@ -2903,9 +2932,9 @@ void LLVoiceClient::sessionNewEvent(
 						LLIMMgr::computeSessionID(
 							IM_SESSION_P2P_INVITE,
 							caller_id),
-						LLString::null,
+						LLStringUtil::null,
 						caller_id, 
-						LLString::null, 
+						LLStringUtil::null, 
 						IM_SESSION_P2P_INVITE, 
 						LLIMMgr::INVITATION_TYPE_VOICE,
 						eventSessionHandle);
@@ -3012,7 +3041,7 @@ void LLVoiceClient::muteListChanged()
 /////////////////////////////
 // Managing list of participants
 LLVoiceClient::participantState::participantState(const std::string &uri) : 
-	 mURI(uri), mPTT(false), mIsSpeaking(false), mIsModeratorMuted(false), mPower(0.0), mServiceType(serviceTypeUnknown),
+	 mURI(uri), mPTT(false), mIsSpeaking(false), mIsModeratorMuted(false), mLastSpokeTimestamp(0.f), mPower(0.f), mVolume(0), mServiceType(serviceTypeUnknown),
 	 mOnMuteList(false), mUserVolume(100), mVolumeDirty(false), mAvatarIDValid(false)
 {
 }
@@ -3402,18 +3431,15 @@ std::string LLVoiceClient::nameFromAvatar(LLVOAvatar *avatar)
 std::string LLVoiceClient::nameFromID(const LLUUID &uuid)
 {
 	std::string result;
-	U8 rawuuid[UUID_BYTES + 1]; 
-	uuid.toCompressedString((char*)rawuuid);
-	
 	// Prepending this apparently prevents conflicts with reserved names inside the vivox and diamondware code.
 	result = "x";
 	
 	// Base64 encode and replace the pieces of base64 that are less compatible 
 	// with e-mail local-parts.
 	// See RFC-4648 "Base 64 Encoding with URL and Filename Safe Alphabet"
-	result += LLBase64::encode(rawuuid, UUID_BYTES);
-	LLString::replaceChar(result, '+', '-');
-	LLString::replaceChar(result, '/', '_');
+	result += LLBase64::encode(uuid.mData, UUID_BYTES);
+	LLStringUtil::replaceChar(result, '+', '-');
+	LLStringUtil::replaceChar(result, '/', '_');
 	
 	// If you need to transform a GUID to this form on the Mac OS X command line, this will do so:
 	// echo -n x && (echo e669132a-6c43-4ee1-a78d-6c82fff59f32 |xxd -r -p |openssl base64|tr '/+' '_-')
@@ -3435,16 +3461,14 @@ bool LLVoiceClient::IDFromName(const std::string name, LLUUID &uuid)
 
 		// Reverse the transforms done by nameFromID
 		std::string temp = name;
-		LLString::replaceChar(temp, '-', '+');
-		LLString::replaceChar(temp, '_', '/');
+		LLStringUtil::replaceChar(temp, '-', '+');
+		LLStringUtil::replaceChar(temp, '_', '/');
 
 		U8 rawuuid[UUID_BYTES + 1]; 
 		int len = apr_base64_decode_binary(rawuuid, temp.c_str() + 1);
 		if(len == UUID_BYTES)
 		{
 			// The decode succeeded.  Stuff the bits into the result's UUID
-			// MBW -- XXX -- there's no analogue of LLUUID::toCompressedString that allows you to set a UUID from binary data.
-			// The data field is public, so we cheat thusly:
 			memcpy(uuid.mData, rawuuid, UUID_BYTES);
 			result = true;
 		}
@@ -3466,7 +3490,7 @@ std::string LLVoiceClient::sipURIFromName(std::string &name)
 	result += "@";
 	result += mAccountServerName;
 
-//	LLString::toLower(result);
+//	LLStringUtil::toLower(result);
 
 	return result;
 }
@@ -3497,6 +3521,45 @@ void LLVoiceClient::enforceTether(void)
 	}
 }
 
+void LLVoiceClient::updatePosition(void)
+{
+	
+	if(gVoiceClient)
+	{
+		LLVOAvatar *agent = gAgent.getAvatarObject();
+		LLViewerRegion *region = gAgent.getRegion();
+		if(region && agent)
+		{
+			LLMatrix3 rot;
+			LLVector3d pos;
+
+			// MBW -- XXX -- Setting both camera and avatar velocity to 0 for now.  May figure it out later...
+
+			// Send the current camera position to the voice code
+			rot.setRows(LLViewerCamera::getInstance()->getAtAxis(), LLViewerCamera::getInstance()->getLeftAxis (),  LLViewerCamera::getInstance()->getUpAxis());		
+			pos = gAgent.getRegion()->getPosGlobalFromRegion(LLViewerCamera::getInstance()->getOrigin());
+			
+			gVoiceClient->setCameraPosition(
+					pos,				// position
+					LLVector3::zero, 	// velocity
+					rot);				// rotation matrix
+					
+			// Send the current avatar position to the voice code
+			rot = agent->getRootJoint()->getWorldRotation().getMatrix3();
+	
+			pos = agent->getPositionGlobal();
+			// MBW -- XXX -- Can we get the head offset from outside the LLVOAvatar?
+//			pos += LLVector3d(mHeadOffset);
+			pos += LLVector3d(0.f, 0.f, 1.f);
+		
+			gVoiceClient->setAvatarPosition(
+					pos,				// position
+					LLVector3::zero, 	// velocity
+					rot);				// rotation matrix
+		}
+	}
+}
+
 void LLVoiceClient::setCameraPosition(const LLVector3d &position, const LLVector3 &velocity, const LLMatrix3 &rot)
 {
 	mCameraRequestedPosition = position;
@@ -3831,9 +3894,9 @@ F32 LLVoiceClient::getCurrentPower(const LLUUID& id)
 }
 
 
-LLString LLVoiceClient::getDisplayName(const LLUUID& id)
+std::string LLVoiceClient::getDisplayName(const LLUUID& id)
 {
-	LLString result;
+	std::string result;
 	participantState *participant = findParticipantByID(id);
 	if(participant)
 	{
@@ -4030,17 +4093,17 @@ void LLVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::EStatusTy
 }
 
 //static
-void LLVoiceClient::onAvatarNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* user_data)
-{
-	participantState* statep = gVoiceClient->findParticipantByID(id);
-
-	if (statep)
-	{
-		statep->mDisplayName = llformat("%s %s", first, last);
-	}
+// void LLVoiceClient::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data)
+// {
+// 	participantState* statep = gVoiceClient->findParticipantByID(id);
+
+// 	if (statep)
+// 	{
+// 		statep->mDisplayName = first + " " + last;
+// 	}
 	
-	gVoiceClient->notifyObservers();
-}
+// 	gVoiceClient->notifyObservers();
+// }
 
 class LLViewerParcelVoiceInfo : public LLHTTPNode
 {
@@ -4052,6 +4115,9 @@ class LLViewerParcelVoiceInfo : public LLHTTPNode
 		//the parcel you are in has changed something about its
 		//voice information
 
+		//this is a misnomer, as it can also be when you are not in
+		//a parcel at all.  Should really be something like
+		//LLViewerVoiceInfoChanged.....
 		if ( input.has("body") )
 		{
 			LLSD body = input["body"];
@@ -4061,6 +4127,11 @@ class LLViewerParcelVoiceInfo : public LLHTTPNode
 
 			//body["voice_credentials"] has "channel_uri" (str),
 			//body["voice_credentials"] has "channel_credentials" (str)
+
+			//if we really wanted to be extra careful,
+			//we'd check the supplied
+			//local parcel id to make sure it's for the same parcel
+			//we believe we're in
 			if ( body.has("voice_credentials") )
 			{
 				LLSD voice_credentials = body["voice_credentials"];
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index 8d2c2ac..9dfcd52 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -72,7 +72,7 @@ public:
 	virtual ~LLVoiceClientStatusObserver() { }
 	virtual void onChange(EStatusType status, const std::string &channelURI, bool proximal) = 0;
 
-	static const char *status2string(EStatusType inStatus);
+	static std::string status2string(EStatusType inStatus);
 };
 
 class LLVoiceClient: public LLSingleton<LLVoiceClient>
@@ -188,6 +188,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
 		
 		/////////////////////////////
 		// Sending updates of current state
+static	void updatePosition(void);
 		void setCameraPosition(const LLVector3d &position, const LLVector3 &velocity, const LLMatrix3 &rot);
 		void setAvatarPosition(const LLVector3d &position, const LLVector3 &velocity, const LLMatrix3 &rot);
 		bool channelFromRegion(LLViewerRegion *region, std::string &name);
@@ -225,7 +226,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
 		BOOL getPTTPressed(const LLUUID& id);			// This is the inverse of the "locally muted" property.
 		BOOL getOnMuteList(const LLUUID& id);
 		F32 getUserVolume(const LLUUID& id);
-		LLString getDisplayName(const LLUUID& id);
+		std::string getDisplayName(const LLUUID& id);
 		
 		// MBW -- XXX -- Not sure how to get this data out of the TVC
 		BOOL getUsingPTT(const LLUUID& id);
@@ -272,7 +273,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
 		void addStatusObserver(LLVoiceClientStatusObserver* observer);
 		void removeStatusObserver(LLVoiceClientStatusObserver* observer);
 		
-		static void onAvatarNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* user_data);
+// 		static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
 		typedef std::vector<std::string> deviceList;
 
 		deviceList *getCaptureDevices();
@@ -355,7 +356,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
 		
 		void setState(state inState);
 		state getState(void)  { return mState; };
-		static const char *state2string(state inState);
+		static std::string state2string(state inState);
 		
 		void stateMachine();
 		static void idle(void *user_data);
diff --git a/linden/indra/newview/llvoiceremotectrl.cpp b/linden/indra/newview/llvoiceremotectrl.cpp
index 3779ffd..6a11471 100644
--- a/linden/indra/newview/llvoiceremotectrl.cpp
+++ b/linden/indra/newview/llvoiceremotectrl.cpp
@@ -45,7 +45,7 @@
 #include "lloverlaybar.h"
 #include "lltextbox.h"
 
-LLVoiceRemoteCtrl::LLVoiceRemoteCtrl (const LLString& name) : LLPanel(name)
+LLVoiceRemoteCtrl::LLVoiceRemoteCtrl (const std::string& name) : LLPanel(name)
 {
 	setIsChrome(TRUE);
 
@@ -116,7 +116,7 @@ void LLVoiceRemoteCtrl::draw()
 	mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD()));
 	mTalkLockBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
 
-	LLString talk_blip_image;
+	std::string talk_blip_image;
 	if (gVoiceClient->getIsSpeaking(gAgent.getID()))
 	{
 		F32 voice_power = gVoiceClient->getCurrentPower(gAgent.getID());
@@ -156,7 +156,7 @@ void LLVoiceRemoteCtrl::draw()
 	}
 
 	LLFloater* voice_floater = LLFloaterChatterBox::getInstance()->getCurrentVoiceFloater();
-	LLString active_channel_name;
+	std::string active_channel_name;
 	if (voice_floater)
 	{
 		active_channel_name = voice_floater->getShortTitle();
@@ -204,11 +204,11 @@ void LLVoiceRemoteCtrl::draw()
 	{
 		if (expand_button->getToggleState())
 		{
-			expand_button->setImageOverlay("arrow_down.tga");
+			expand_button->setImageOverlay(std::string("arrow_down.tga"));
 		}
 		else
 		{
-			expand_button->setImageOverlay("arrow_up.tga");
+			expand_button->setImageOverlay(std::string("arrow_up.tga"));
 		}
 	}
 
diff --git a/linden/indra/newview/llvoiceremotectrl.h b/linden/indra/newview/llvoiceremotectrl.h
index 17f55fb..b5e1b38 100644
--- a/linden/indra/newview/llvoiceremotectrl.h
+++ b/linden/indra/newview/llvoiceremotectrl.h
@@ -39,7 +39,7 @@ class LLButton;
 class LLVoiceRemoteCtrl : public LLPanel
 {
 public:
-	LLVoiceRemoteCtrl (const LLString& name);
+	LLVoiceRemoteCtrl (const std::string& name);
 	virtual ~LLVoiceRemoteCtrl();
 
 	/*virtual*/ BOOL postBuild();
diff --git a/linden/indra/newview/llvoicevisualizer.cpp b/linden/indra/newview/llvoicevisualizer.cpp
index ba16feb..f00247b 100644
--- a/linden/indra/newview/llvoicevisualizer.cpp
+++ b/linden/indra/newview/llvoicevisualizer.cpp
@@ -293,10 +293,6 @@ void LLVoiceVisualizer::lipSyncOohAah( F32& ooh, F32& aah )
 	if( ( sLipSyncEnabled == TRUE ) && mCurrentlySpeaking )
 	{
 		U32 transfer_index = (U32) (sOohPowerTransfersf * mSpeakingAmplitude);
-		if (transfer_index < 0)
-		{
-		   transfer_index = 0;
-		}
 		if (transfer_index >= sOohPowerTransfers)
 		{
 		   transfer_index = sOohPowerTransfers - 1;
@@ -304,10 +300,6 @@ void LLVoiceVisualizer::lipSyncOohAah( F32& ooh, F32& aah )
 		F32 transfer_ooh = sOohPowerTransfer[transfer_index];
 
 		transfer_index = (U32) (sAahPowerTransfersf * mSpeakingAmplitude);
-		if (transfer_index < 0)
-		{
-		   transfer_index = 0;
-		}
 		if (transfer_index >= sAahPowerTransfers)
 		{
 		   transfer_index = sAahPowerTransfers - 1;
diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 7d1fec4..11d7341 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -180,14 +180,13 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 	pixel_meter_ratio *= pixel_meter_ratio;
 
 	S32 count=0;
-	S32 i;
 	mDepth = 0.f;
-
-	for (i = 0; i < num_parts; i++)
+	S32 i = 0 ;
+	for (i = 0 ; i < (S32)mViewerPartGroupp->mParticles.size(); i++)
 	{
-		const LLViewerPart &part = *((LLViewerPart*) mViewerPartGroupp->mParticles[i]);
+		const LLViewerPart *part = mViewerPartGroupp->mParticles[i];
 
-		LLVector3 part_pos_agent(part.mPosAgent);
+		LLVector3 part_pos_agent(part->mPosAgent);
 		at = part_pos_agent - camera_agent;
 
 		F32 camera_dist_squared = at.magVecSquared();
@@ -196,7 +195,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 			inv_camera_dist_squared = 1.f / camera_dist_squared;
 		else
 			inv_camera_dist_squared = 1.f;
-		F32 area = part.mScale.mV[0] * part.mScale.mV[1] * inv_camera_dist_squared;
+		F32 area = part->mScale.mV[0] * part->mScale.mV[1] * inv_camera_dist_squared;
 		tot_area = llmax(tot_area, area);
  		
 		if (tot_area > max_area)
@@ -227,7 +226,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 		
 		facep->setViewerObject(this);
 
-		if (part.mFlags & LLPartData::LL_PART_EMISSIVE_MASK)
+		if (part->mFlags & LLPartData::LL_PART_EMISSIVE_MASK)
 		{
 			facep->setState(LLFace::FULLBRIGHT);
 		}
@@ -236,9 +235,9 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 			facep->clearState(LLFace::FULLBRIGHT);
 		}
 
-		facep->mCenterLocal = part.mPosAgent;
-		facep->setFaceColor(part.mColor);
-		facep->setTexture(part.mImagep);
+		facep->mCenterLocal = part->mPosAgent;
+		facep->setFaceColor(part->mColor);
+		facep->setTexture(part->mImagep);
 
 		mPixelArea = tot_area * pixel_meter_ratio;
 		const F32 area_scale = 10.f; // scale area to increase priority a bit
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index eae322e..60f674e 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -441,7 +441,7 @@ void LLVOSky::initCubeMap()
 	{
 		mCubeMap->init(images);
 	}
-	else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
+	else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)
 	{
 		mCubeMap = new LLCubeMap();
 		mCubeMap->init(images);
@@ -479,7 +479,7 @@ void LLVOSky::restoreGL()
 	calcAtmospherics();	
 
 	if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap
-	    && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
+	    && LLCubeMap::sUseCubeMaps)
 	{
 		LLCubeMap* cube_map = getCubeMap();
 
diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index 124b690..b213322 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -555,7 +555,7 @@ public:
 	LLColor4U getFadeColor() const						{ return mFadeColor; }
 	F32 getFogRatio() const								{ return mFogRatio; }
 	void setCloudDensity(F32 cloud_density)				{ mCloudDensity = cloud_density; }
-	void setWind ( const LLVector3& wind )				{ mWind = wind.magVec(); }
+	void setWind ( const LLVector3& wind )				{ mWind = wind.length(); }
 
 	const LLVector3 &getCameraPosAgent() const			{ return mCameraPosAgent; }
 	LLVector3 getEarthCenter() const					{ return mEarthCenter; }
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 993c2a0..c86803d 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -232,7 +232,7 @@ void LLVOTree::initClass()
 
 			if (!success)
 			{
-				LLString name;
+				std::string name;
 				static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
 				tree_def->getFastAttributeString(name_string, name);
 				llwarns << "Incomplete definition of tree " << name << llendl;
@@ -240,22 +240,20 @@ void LLVOTree::initClass()
 		}
 		
 		BOOL have_all_trees = TRUE;
-		LLString err;
-		char buffer[10];		/* Flawfinder: ignore */
+		std::string err;
 
 		for (S32 i=0;i<sMaxTreeSpecies;++i)
 		{
 			if (!sSpeciesTable.count(i))
 			{
-				snprintf(buffer,10," %d",i);		/* Flawfinder: ignore */
-				err.append(buffer);
+				err.append(llformat(" %d",i));
 				have_all_trees = FALSE;
 			}
 		}
 
 		if (!have_all_trees) 
 		{
-			LLStringBase<char>::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[SPECIES]"] = err;
 			gViewerWindow->alertXml("ErrorUndefinedTrees", args );
 		}
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index e352f14..3716a76 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -68,7 +68,7 @@
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
-const S32 SCULPT_REZ = 128;
+const S32 SCULPT_REZ = 64;
 
 BOOL gAnimateTextures = TRUE;
 extern BOOL gHideSelectedObjects;
@@ -87,6 +87,7 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
 	mRelativeXformInvTrans.setIdentity();
 
 	mLOD = MIN_LOD;
+	mSculptLevel = -2;
 	mTextureAnimp = NULL;
 	mVObjRadius = LLVector3(1,1,0.5f).magVec();
 	mNumFaces = 0;
@@ -212,9 +213,9 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 				// Well, crap, there's something bogus in the data that we're unpacking.
 				dp->dumpBufferToLog();
 				llwarns << "Flushing cache files" << llendl;
-				char mask[LL_MAX_PATH];		/* Flawfinder: ignore */
-				snprintf(mask, LL_MAX_PATH, "%s*.slc", gDirUtilp->getDirDelimiter().c_str());		/* Flawfinder: ignore */
-				gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(),mask);
+				std::string mask;
+				mask = gDirUtilp->getDirDelimiter() + "*.slc";
+				gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""), mask);
 // 				llerrs << "Bogus TE data in " << getID() << ", crashing!" << llendl;
 				llwarns << "Bogus TE data in " << getID() << llendl;
 			}
@@ -515,12 +516,13 @@ void LLVOVolume::updateTextures()
 		if (mSculptTexture.notNull())
 		{
 			mSculptTexture->addTextureStats(SCULPT_REZ * SCULPT_REZ);
-			mSculptTexture->setBoostLevel(LLViewerImage::BOOST_SCULPTED);
+			mSculptTexture->setBoostLevel(llmax((S32)mSculptTexture->getBoostLevel(),
+												(S32)LLViewerImage::BOOST_SCULPTED));
 		}
 
 		S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture
-		S32 current_discard = getVolume()->getSculptLevel();
-		
+		S32 current_discard = mSculptLevel;
+
 		if (texture_discard >= 0 && //texture has some data available
 			(texture_discard < current_discard || //texture has more data than last rebuild
 			current_discard < 0)) //no previous rebuild
@@ -701,6 +703,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
 			if (mSculptTexture.notNull())
 			{
 				sculpt();
+				mSculptLevel = getVolume()->getSculptLevel();
 			}
 		}
 		else
@@ -1893,26 +1896,42 @@ LLVector3 LLVOVolume::agentPositionToVolume(const LLVector3& pos) const
 
 LLVector3 LLVOVolume::agentDirectionToVolume(const LLVector3& dir) const
 {
-	return dir * ~getRenderRotation();
+	LLVector3 ret = dir * ~getRenderRotation();
+	
+	LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale();
+	ret.scaleVec(objScale);
+
+	return ret;
 }
 
 LLVector3 LLVOVolume::volumePositionToAgent(const LLVector3& dir) const
 {
 	LLVector3 ret = dir;
-	ret.scaleVec(getScale());
+	LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale();
+	ret.scaleVec(objScale);
 	ret = ret * getRenderRotation();
 	ret += getRenderPosition();
 	
 	return ret;
 }
 
-BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, LLVector3& end) const
+LLVector3 LLVOVolume::volumeDirectionToAgent(const LLVector3& dir) const
 {
-	return FALSE;
+	LLVector3 ret = dir;
+	LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale();
+	LLVector3 invObjScale(1.f / objScale.mV[VX], 1.f / objScale.mV[VY], 1.f / objScale.mV[VZ]);
+	ret.scaleVec(invObjScale);
+	ret = ret * getRenderRotation();
+
+	return ret;
+}
+
+
+BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, S32 *face_hitp,
+									  LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
 	
-#if 0 // needs to be rewritten to use face extents instead of volume bounds
+{
 	LLVolume* volume = getVolume();
-	BOOL ret = FALSE;
 	if (volume)
 	{	
 		LLVector3 v_start, v_end, v_dir;
@@ -1920,17 +1939,38 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, LLVector3& end) co
 		v_start = agentPositionToVolume(start);
 		v_end = agentPositionToVolume(end);
 		
-		if (LLLineSegmentAABB(v_start, v_end, volume->mBounds[0], volume->mBounds[1]))
+		S32 face_hit = volume->lineSegmentIntersect(v_start, v_end, face,
+													intersection, tex_coord, normal, bi_normal);
+		if (face_hit >= 0)
 		{
-			if (volume->lineSegmentIntersect(v_start, v_end) >= 0)
+			if (face_hitp != NULL)
+			{
+				*face_hitp = face_hit;
+			}
+			
+			if (intersection != NULL)
 			{
-				end = volumePositionToAgent(v_end);
-				ret = TRUE;
+				*intersection = volumePositionToAgent(*intersection);  // must map back to agent space
 			}
+
+			if (normal != NULL)
+			{
+				*normal = volumeDirectionToAgent(*normal);
+				(*normal).normVec();
+			}
+
+			if (bi_normal != NULL)
+			{
+				*bi_normal = volumeDirectionToAgent(*bi_normal);
+				(*bi_normal).normVec();
+			}
+
+			
+			return TRUE;
 		}
 	}
-	return ret;
-#endif
+	
+	return FALSE;
 }
 
 U32 LLVOVolume::getPartitionType() const
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 6177340..d8828f0 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -111,10 +111,20 @@ public:
 	const LLMatrix3&	getRelativeXformInvTrans() const		{ return mRelativeXformInvTrans; }
 	/*virtual*/	const LLMatrix4	getRenderMatrix() const;
 
-	/*virtual*/ BOOL	lineSegmentIntersect(const LLVector3& start, LLVector3& end) const;
+
+	/*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
+										  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
+										  S32* face_hit = NULL,                 // which face was hit
+										  LLVector3* intersection = NULL,       // return the intersection point
+										  LLVector2* tex_coord = NULL,          // return the texture coordinates of the intersection point
+										  LLVector3* normal = NULL,             // return the surface normal at the intersection point
+										  LLVector3* bi_normal = NULL           // return the surface bi-normal at the intersection point
+		);
+	
 				LLVector3 agentPositionToVolume(const LLVector3& pos) const;
 				LLVector3 agentDirectionToVolume(const LLVector3& dir) const;
 				LLVector3 volumePositionToAgent(const LLVector3& dir) const;
+				LLVector3 volumeDirectionToAgent(const LLVector3& dir) const;
 
 				
 				BOOL	getVolumeChanged() const				{ return mVolumeChanged; }
@@ -214,6 +224,7 @@ private:
 	LLFrameTimer mTextureUpdateTimer;
 	S32			mLOD;
 	BOOL		mLODChanged;
+	S32         mSculptLevel;
 	BOOL		mSculptChanged;
 	LLMatrix4	mRelativeXform;
 	LLMatrix3	mRelativeXformInvTrans;
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index fb09fd8..f4f1163 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -33,6 +33,8 @@
 
 #include "llwaterparammanager.h"
 
+#include "llrender.h"
+
 #include "pipeline.h"
 #include "llsky.h"
 
@@ -84,9 +86,9 @@ LLWaterParamManager::~LLWaterParamManager()
 {
 }
 
-void LLWaterParamManager::loadAllPresets(const LLString& file_name)
+void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 {
-	LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
+	std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
 	LL_INFOS2("AppInit", "Shaders") << "Loading water settings from " << path_name << LL_ENDL;
 
 	//mParamList.clear();
@@ -111,10 +113,10 @@ void LLWaterParamManager::loadAllPresets(const LLString& file_name)
 			// not much error checking here since we're getting rid of this
 			std::string water_name = unescaped_name.substr(0, unescaped_name.size() - 4);
 		
-			LLString cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", name));
+			std::string cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", name));
 			LL_DEBUGS2("AppInit", "Shaders") << "Loading water from " << cur_path << LL_ENDL;
 			
-			std::ifstream water_xml(cur_path.c_str());
+			llifstream water_xml(cur_path);
 			if (water_xml)
 			{
 				LLSD water_data(LLSD::emptyMap());
@@ -122,12 +124,13 @@ void LLWaterParamManager::loadAllPresets(const LLString& file_name)
 				parser->parse(water_xml, water_data, LLSDSerialize::SIZE_UNLIMITED);
 
 				addParamSet(water_name, water_data);
+				water_xml.close();
 			}
 		}
 	}
 }
 
-void LLWaterParamManager::loadPreset(const LLString & name)
+void LLWaterParamManager::loadPreset(const std::string & name)
 {
 	// bugfix for SL-46920: preventing filenames that break stuff.
 	char * curl_str = curl_escape(name.c_str(), name.size());
@@ -140,7 +143,7 @@ void LLWaterParamManager::loadPreset(const LLString & name)
 	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
 	llinfos << "Loading water settings from " << pathName << llendl;
 
-	std::ifstream presetsXML(pathName.c_str());
+	llifstream presetsXML(pathName);
 
 	if (presetsXML)
 	{
@@ -159,6 +162,7 @@ void LLWaterParamManager::loadPreset(const LLString & name)
 		{
 			setParamSet(name, paramsData);
 		}
+		presetsXML.close();
 	} 
 	else 
 	{
@@ -171,7 +175,7 @@ void LLWaterParamManager::loadPreset(const LLString & name)
 	propagateParameters();
 }
 
-void LLWaterParamManager::savePreset(const LLString & name)
+void LLWaterParamManager::savePreset(const std::string & name)
 {
 	// bugfix for SL-46920: preventing filenames that break stuff.
 	char * curl_str = curl_escape(name.c_str(), name.size());
@@ -189,7 +193,7 @@ void LLWaterParamManager::savePreset(const LLString & name)
 	paramsData = mParamList[name].getAll();
 
 	// write to file
-	std::ofstream presetsXML(pathName.c_str());
+	llofstream presetsXML(pathName);
 	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
 	formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
 	presetsXML.close();
@@ -203,9 +207,9 @@ void LLWaterParamManager::propagateParameters(void)
 	// bind the variables only if we're using shaders
 	if(gPipeline.canUseVertexShaders())
 	{
-		LLShaderMgr::shader_iter shaders_iter, end_shaders;
-		end_shaders = LLShaderMgr::endShaders();
-		for(shaders_iter = LLShaderMgr::beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
+		LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
+		end_shaders = LLViewerShaderMgr::instance()->endShaders();
+		for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
 		{
 			if (shaders_iter->mProgramObject != 0
 				&& shaders_iter->mShaderGroup == LLGLSLShader::SG_WATER)
@@ -227,7 +231,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 {
 	if (shader->mShaderGroup == LLGLSLShader::SG_WATER)
 	{
-		shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV);
+		shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV);
 		shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
 		shader->uniform4fv("waterFogColor", 1, LLDrawPoolWater::sWaterFogColor.mV);
 		shader->uniform4fv("waterPlane", 1, mWaterPlane.mV);
@@ -287,9 +291,9 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
 		sunMoonDir.normVec();
 		mWaterFogKS = 1.f/llmax(sunMoonDir.mV[2], WATER_FOG_LIGHT_CLAMP);
 
-		LLShaderMgr::shader_iter shaders_iter, end_shaders;
-		end_shaders = LLShaderMgr::endShaders();
-		for(shaders_iter = LLShaderMgr::beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
+		LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
+		end_shaders = LLViewerShaderMgr::instance()->endShaders();
+		for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
 		{
 			if (shaders_iter->mProgramObject != 0
 				&& shaders_iter->mShaderGroup == LLGLSLShader::SG_WATER)
@@ -386,7 +390,7 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 
 	if(delete_from_disk)
 	{
-		LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
+		std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
 		
 		// use full curl escaped name
 		char * curl_str = curl_escape(name.c_str(), name.size());
@@ -425,7 +429,7 @@ LLWaterParamManager * LLWaterParamManager::instance()
 	{
 		sInstance = new LLWaterParamManager();
 
-		sInstance->loadAllPresets("");
+		sInstance->loadAllPresets(LLStringUtil::null);
 
 		sInstance->getParamSet("Default", sInstance->mCurParams);
 	}
diff --git a/linden/indra/newview/llwaterparammanager.h b/linden/indra/newview/llwaterparammanager.h
index 6c9ce3e..872725e 100644
--- a/linden/indra/newview/llwaterparammanager.h
+++ b/linden/indra/newview/llwaterparammanager.h
@@ -44,12 +44,12 @@ const F32 WATER_FOG_LIGHT_CLAMP = 0.3f;
 struct WaterColorControl {
 	
 	F32 mR, mG, mB, mA, mI;			/// the values
-	char const * mName;				/// name to use to dereference params
+	std::string mName;				/// name to use to dereference params
 	std::string mSliderName;		/// name of the slider in menu
 	bool mHasSliderName;			/// only set slider name for true color types
 
 	inline WaterColorControl(F32 red, F32 green, F32 blue, F32 alpha,
-		F32 intensity, char const * n, char const * sliderName = "")
+							 F32 intensity, const std::string& n, const std::string& sliderName = LLStringUtil::null)
 		: mR(red), mG(green), mB(blue), mA(alpha), mI(intensity), mName(n), mSliderName(sliderName)
 	{
 		// if there's a slider name, say we have one
@@ -104,10 +104,10 @@ struct WaterVector3Control
 	F32 mY;
 	F32 mZ;
 
-	char const * mName;
+	std::string mName;
 
 	// basic constructor
-	inline WaterVector3Control(F32 valX, F32 valY, F32 valZ, char const * n)
+	inline WaterVector3Control(F32 valX, F32 valY, F32 valZ, const std::string& n)
 		: mX(valX), mY(valY), mZ(valZ), mName(n)
 	{
 	}
@@ -133,10 +133,10 @@ struct WaterVector2Control
 	F32 mX;
 	F32 mY;
 
-	char const * mName;
+	std::string mName;
 
 	// basic constructor
-	inline WaterVector2Control(F32 valX, F32 valY, char const * n)
+	inline WaterVector2Control(F32 valX, F32 valY, const std::string& n)
 		: mX(valX), mY(valY), mName(n)
 	{
 	}
@@ -159,10 +159,10 @@ struct WaterVector2Control
 struct WaterFloatControl 
 {
 	F32 mX;
-	char const * mName;
+	std::string mName;
 	F32 mMult;
 
-	inline WaterFloatControl(F32 val, char const * n, F32 m=1.0f)
+	inline WaterFloatControl(F32 val, const std::string& n, F32 m=1.0f)
 		: mX(val), mName(n), mMult(m)
 	{
 	}
@@ -189,10 +189,10 @@ struct WaterFloatControl
 struct WaterExpFloatControl 
 {
 	F32 mExp;
-	char const * mName;
+	std::string mName;
 	F32 mBase;
 
-	inline WaterExpFloatControl(F32 val, char const * n, F32 b)
+	inline WaterExpFloatControl(F32 val, const std::string& n, F32 b)
 		: mExp(val), mName(n), mBase(b)
 	{
 	}
@@ -225,13 +225,13 @@ public:
 	~LLWaterParamManager();
 
 	/// load a preset file
-	void loadAllPresets(const LLString & fileName);
+	void loadAllPresets(const std::string & fileName);
 
 	/// load an individual preset into the sky
-	void loadPreset(const LLString & name);
+	void loadPreset(const std::string & name);
 
 	/// save the parameter presets to file
-	void savePreset(const LLString & name);
+	void savePreset(const std::string & name);
 
 	/// send the parameters to the shaders
 	void propagateParameters(void);
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index 78d882a..e7a05f4 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -87,7 +87,7 @@ LLWaterParamSet::LLWaterParamSet(void) :
 
 }
 
-void LLWaterParamSet::set(const char * paramName, float x) 
+void LLWaterParamSet::set(const std::string& paramName, float x) 
 {	
 	// handle case where no array
 	if(mParamValues[paramName].isReal()) 
@@ -103,19 +103,19 @@ void LLWaterParamSet::set(const char * paramName, float x)
 	}
 }
 
-void LLWaterParamSet::set(const char * paramName, float x, float y) {
+void LLWaterParamSet::set(const std::string& paramName, float x, float y) {
 	mParamValues[paramName][0] = x;
 	mParamValues[paramName][1] = y;
 }
 
-void LLWaterParamSet::set(const char * paramName, float x, float y, float z)
+void LLWaterParamSet::set(const std::string& paramName, float x, float y, float z)
 {
 	mParamValues[paramName][0] = x;
 	mParamValues[paramName][1] = y;
 	mParamValues[paramName][2] = z;
 }
 
-void LLWaterParamSet::set(const char * paramName, float x, float y, float z, float w) 
+void LLWaterParamSet::set(const std::string& paramName, float x, float y, float z, float w) 
 {
 	mParamValues[paramName][0] = x;
 	mParamValues[paramName][1] = y;
@@ -123,7 +123,7 @@ void LLWaterParamSet::set(const char * paramName, float x, float y, float z, flo
 	mParamValues[paramName][3] = w;
 }
 
-void LLWaterParamSet::set(const char * paramName, const float * val) 
+void LLWaterParamSet::set(const std::string& paramName, const float * val) 
 {
 	mParamValues[paramName][0] = val[0];
 	mParamValues[paramName][1] = val[1];
@@ -131,7 +131,7 @@ void LLWaterParamSet::set(const char * paramName, const float * val)
 	mParamValues[paramName][3] = val[3];
 }
 
-void LLWaterParamSet::set(const char * paramName, const LLVector4 & val) 
+void LLWaterParamSet::set(const std::string& paramName, const LLVector4 & val) 
 {
 	mParamValues[paramName][0] = val.mV[0];
 	mParamValues[paramName][1] = val.mV[1];
@@ -139,7 +139,7 @@ void LLWaterParamSet::set(const char * paramName, const LLVector4 & val)
 	mParamValues[paramName][3] = val.mV[3];
 }
 
-void LLWaterParamSet::set(const char * paramName, const LLColor4 & val) 
+void LLWaterParamSet::set(const std::string& paramName, const LLColor4 & val) 
 {
 	mParamValues[paramName][0] = val.mV[0];
 	mParamValues[paramName][1] = val.mV[1];
@@ -147,7 +147,7 @@ void LLWaterParamSet::set(const char * paramName, const LLColor4 & val)
 	mParamValues[paramName][3] = val.mV[3];
 }
 
-LLVector4 LLWaterParamSet::getVector4(const char * paramName, bool& error) 
+LLVector4 LLWaterParamSet::getVector4(const std::string& paramName, bool& error) 
 {
 	
 	// test to see if right type
@@ -168,7 +168,7 @@ LLVector4 LLWaterParamSet::getVector4(const char * paramName, bool& error)
 	return val;
 }
 
-LLVector3 LLWaterParamSet::getVector3(const char * paramName, bool& error) 
+LLVector3 LLWaterParamSet::getVector3(const std::string& paramName, bool& error) 
 {
 	
 	// test to see if right type
@@ -188,7 +188,7 @@ LLVector3 LLWaterParamSet::getVector3(const char * paramName, bool& error)
 	return val;
 }
 
-LLVector2 LLWaterParamSet::getVector2(const char * paramName, bool& error) 
+LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) 
 {
 	// test to see if right type
 	int ttest;
@@ -208,7 +208,7 @@ LLVector2 LLWaterParamSet::getVector2(const char * paramName, bool& error)
 	return val;
 }
 
-F32 LLWaterParamSet::getFloat(const char * paramName, bool& error) 
+F32 LLWaterParamSet::getFloat(const std::string& paramName, bool& error) 
 {
 	
 	// test to see if right type
diff --git a/linden/indra/newview/llwaterparamset.h b/linden/indra/newview/llwaterparamset.h
index 5d2581a..17ee1df 100644
--- a/linden/indra/newview/llwaterparamset.h
+++ b/linden/indra/newview/llwaterparamset.h
@@ -37,7 +37,7 @@
 
 #include "v4math.h"
 #include "v4color.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 
 class LLFloaterWater;
 class LLWaterParamSet;
@@ -48,7 +48,7 @@ class LLWaterParamSet
 	friend class LLWaterParamManager;
 
 public:
-	LLString mName;	
+	std::string mName;	
 	
 private:
 
@@ -70,20 +70,20 @@ public:
 	/// Set a float parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param x			The float value to set.
-	void set(const char * paramName, float x);
+	void set(const std::string& paramName, float x);
 
 	/// Set a float2 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param x			The x component's value to set.
 	/// \param y			The y component's value to set.
-	void set(const char * paramName, float x, float y);
+	void set(const std::string& paramName, float x, float y);
 
 	/// Set a float3 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param x			The x component's value to set.
 	/// \param y			The y component's value to set.
 	/// \param z			The z component's value to set.
-	void set(const char * paramName, float x, float y, float z);
+	void set(const std::string& paramName, float x, float y, float z);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
@@ -91,42 +91,42 @@ public:
 	/// \param y			The y component's value to set.
 	/// \param z			The z component's value to set.
 	/// \param w			The w component's value to set.
-	void set(const char * paramName, float x, float y, float z, float w);
+	void set(const std::string& paramName, float x, float y, float z, float w);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param val			An array of the 4 float values to set the parameter to.
-	void set(const char * paramName, const float * val);
+	void set(const std::string& paramName, const float * val);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param val			A struct of the 4 float values to set the parameter to.
-	void set(const char * paramName, const LLVector4 & val);
+	void set(const std::string& paramName, const LLVector4 & val);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param val			A struct of the 4 float values to set the parameter to.
-	void set(const char * paramName, const LLColor4 & val);
+	void set(const std::string& paramName, const LLColor4 & val);
 
 	/// Get a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param error		A flag to set if it's not the proper return type
-	LLVector4 getVector4(const char * paramName, bool& error);
+	LLVector4 getVector4(const std::string& paramName, bool& error);
 
 	/// Get a float3 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param error		A flag to set if it's not the proper return type
-	LLVector3 getVector3(const char * paramName, bool& error);
+	LLVector3 getVector3(const std::string& paramName, bool& error);
 	
 	/// Get a float2 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param error		A flag to set if it's not the proper return type
-	LLVector2 getVector2(const char * paramName, bool& error);
+	LLVector2 getVector2(const std::string& paramName, bool& error);
 	
 	/// Get an integer parameter
 	/// \param paramName	The name of the parameter to set.
 	/// \param error		A flag to set if it's not the proper return type	
-	F32 getFloat(const char * paramName, bool& error);
+	F32 getFloat(const std::string& paramName, bool& error);
 		
 	/// interpolate two parameter sets
 	/// \param src			The parameter set to start with
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index 27811e8..a746ebd 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -52,7 +52,7 @@
 S32 LLWearable::sCurrentDefinitionVersion = 1;
 
 // static
-const char* LLWearable::sTypeName[ WT_COUNT ] =
+const std::string LLWearable::sTypeName[ WT_COUNT+1 ] =
 {
 	"shape",
 	"skin",
@@ -66,11 +66,12 @@ const char* LLWearable::sTypeName[ WT_COUNT ] =
 	"gloves",
 	"undershirt",
 	"underpants",
-	"skirt"
+	"skirt",
+	"invalid"
 };
 
 // static
-const char* LLWearable::sTypeLabel[ WT_COUNT ] =
+const std::string LLWearable::sTypeLabel[ WT_COUNT+1 ] =
 {
 	"Shape",
 	"Skin",
@@ -84,7 +85,8 @@ const char* LLWearable::sTypeLabel[ WT_COUNT ] =
 	"Gloves",
 	"Undershirt",
 	"Underpants",
-	"Skirt"
+	"Skirt",
+	"invalid"
 };
 
 
@@ -136,7 +138,7 @@ LLWearable::~LLWearable()
 
 
 // static
-EWearableType LLWearable::typeNameToType( const LLString& type_name )
+EWearableType LLWearable::typeNameToType( const std::string& type_name )
 {
 	for( S32 i = 0; i < WT_COUNT; i++ )
 	{
@@ -149,37 +151,35 @@ EWearableType LLWearable::typeNameToType( const LLString& type_name )
 }
 
 
-const char* terse_F32_to_string( F32 f, char s[MAX_STRING] )		/* Flawfinder: ignore */
+std::string terse_F32_to_string( F32 f )
 {
-	char* r = s;
-	S32 len = snprintf( s, MAX_STRING, "%.2f", f );		/* Flawfinder: ignore */
+	std::string r = llformat( "%.2f", f );
 
 	// "1.20"  -> "1.2"
 	// "24.00" -> "24."
-	while( '0' == r[len - 1] )
+	S32 len = r.length();
+	while( len > 0 && '0' == r[len - 1] )
 	{
-		len--;  
-		r[len] = '\0';
+		r.erase(len-1, 1);
+		len--;
 	}
 
 	if( '.' == r[len - 1] )
 	{
 		// "24." -> "24"
-		len--;
-		r[len] = '\0';
+		r.erase(len-1, 1);
 	}
 	else
 	if( ('-' == r[0]) && ('0' == r[1]) )
 	{
 		// "-0.59" -> "-.59"
-		r++;
-		r[0] = '-';
+		r.erase(1, 1);
 	}
 	else
 	if( '0' == r[0] )
 	{
 		// "0.59" -> ".59"
-		r++;
+		r.erase(0, 1);
 	}
 
 	return r;
@@ -231,13 +231,12 @@ BOOL LLWearable::exportFile( LLFILE* file )
 		return FALSE;
 	}
 
-	char s[ MAX_STRING ];		/* Flawfinder: ignore */
 	for (param_map_t::iterator iter = mVisualParamMap.begin();
 		 iter != mVisualParamMap.end(); ++iter)
 	{
 		S32 param_id = iter->first;
 		F32 param_weight = iter->second;
-		if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight, s ) ) < 0 )
+		if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight ).c_str() ) < 0 )
 		{
 			return FALSE;
 		}
@@ -311,7 +310,7 @@ BOOL LLWearable::importFile( LLFILE* file )
 			return FALSE;
 		}
 		mName = text_buffer;
-		LLString::truncate(mName, DB_INV_ITEM_NAME_STR_LEN );
+		LLStringUtil::truncate(mName, DB_INV_ITEM_NAME_STR_LEN );
 	}
 
 	// description
@@ -334,7 +333,7 @@ BOOL LLWearable::importFile( LLFILE* file )
 			return FALSE;
 		}
 		mDescription = text_buffer;
-		LLString::truncate(mDescription, DB_INV_ITEM_DESC_STR_LEN );
+		LLStringUtil::truncate(mDescription, DB_INV_ITEM_DESC_STR_LEN );
 	}
 
 	// permissions
@@ -848,10 +847,10 @@ void LLWearable::saveNewAsset()
 //	llinfos << "LLWearable::saveNewAsset() type: " << getTypeName() << llendl;
 	//llinfos << *this << llendl;
 
-	char new_asset_id_string[UUID_STR_LENGTH];		/* Flawfinder: ignore */
+	std::string new_asset_id_string;
 	mAssetID.toString(new_asset_id_string);
-	char filename[LL_MAX_PATH];		/* Flawfinder: ignore */
-	snprintf(filename, LL_MAX_PATH, "%s.wbl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string).c_str());		/* Flawfinder: ignore */
+	std::string filename;
+	filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string) + ".wbl";
 	LLFILE* fp = LLFile::fopen(filename, "wb");		/* Flawfinder: ignore */
 	BOOL successful_save = FALSE;
 	if(fp && exportFile(fp))
@@ -865,14 +864,10 @@ void LLWearable::saveNewAsset()
 	}
 	if(!successful_save)
 	{
-		char buffer[2*MAX_STRING];		/* Flawfinder: ignore */
-		snprintf(buffer,		/* Flawfinder: ignore */
-				sizeof(buffer),
-				"Unable to save '%s' to wearable file.",
-				mName.c_str());
+		std::string buffer = llformat("Unable to save '%s' to wearable file.", mName.c_str());
 		llwarns << buffer << llendl;
 		
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[NAME]"] = mName;
 		gViewerWindow->alertXml("CannotSaveWearableOutOfSpace", args);
 		return;
@@ -910,7 +905,7 @@ void LLWearable::saveNewAsset()
 void LLWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* userdata, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
 	LLWearableSaveData* data = (LLWearableSaveData*)userdata;
-	const char* type_name = LLWearable::typeToTypeName(data->mType);
+	const std::string& type_name = LLWearable::typeToTypeName(data->mType);
 	if(0 == status)
 	{
 		// Success
@@ -918,22 +913,18 @@ void LLWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* userda
 	}
 	else
 	{
-		char buffer[2*MAX_STRING];		/* Flawfinder: ignore */
-		snprintf(buffer,		/* Flawfinder: ignore */
-				sizeof(buffer),
-				"Unable to save %s to central asset store.",
-				type_name);
+		std::string buffer = llformat("Unable to save %s to central asset store.", type_name.c_str());
 		llwarns << buffer << " Status: " << status << llendl;
-		LLStringBase<char>::format_map_t args;
+		LLStringUtil::format_map_t args;
 		args["[NAME]"] = type_name;
 		gViewerWindow->alertXml("CannotSaveToAssetStore", args);
 	}
 
 	// Delete temp file
-	char new_asset_id_string[UUID_STR_LENGTH];		/* Flawfinder: ignore */
+	std::string new_asset_id_string;
 	new_asset_id.toString(new_asset_id_string);
-	char src_filename[LL_MAX_PATH];		/* Flawfinder: ignore */
-	snprintf(src_filename, LL_MAX_PATH, "%s.wbl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string).c_str());		/* Flawfinder: ignore */
+	std::string src_filename;
+	src_filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string) + ".wbl";
 	LLFile::remove(src_filename);
 
 	// delete the context data
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index 977d29b..c5f9d06 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -61,15 +61,13 @@ enum	EWearableType  // If you change this, update LLWearable::getTypeName(), get
 
 class LLWearable
 {
+	friend class LLWearableList;
 public:
-	LLWearable(const LLTransactionID& transactionID);
-	LLWearable(const LLAssetID& assetID);
 	~LLWearable();
 
 	const LLAssetID&		getID() { return mAssetID; }
 	const LLTransactionID&		getTransactionID() { return mTransactionID; }
 
-	BOOL				readData( const char *buffer );
 	BOOL				isDirty();
 	BOOL				isOldVersion();
 
@@ -84,11 +82,11 @@ public:
 	EWearableType		getType() const							{ return mType; }
 	void				setType( EWearableType type )			{ mType = type; }
 
-	void				setName( const LLString& name )			{ mName = name; }
-	const LLString&		getName()								{ return mName; }
+	void				setName( const std::string& name )			{ mName = name; }
+	const std::string&	getName()								{ return mName; }
 
-	void				setDescription( const LLString& desc )	{ mDescription = desc; }
-	const LLString&		getDescription()						{ return mDescription; }
+	void				setDescription( const std::string& desc )	{ mDescription = desc; }
+	const std::string&	getDescription()						{ return mDescription; }
 
 	void				setPermissions( const LLPermissions& p ) { mPermissions = p; }
 	const LLPermissions& getPermissions()						{ return mPermissions; }
@@ -96,17 +94,17 @@ public:
 	void				setSaleInfo( const LLSaleInfo& info )	{ mSaleInfo = info; }
 	const LLSaleInfo&	getSaleInfo()							{ return mSaleInfo; }
 
-	const char*			getTypeLabel() const					{ return LLWearable::sTypeLabel[ mType ]; }
-	const char*			getTypeName() const						{ return LLWearable::sTypeName[ mType ]; }
+	const std::string&	getTypeLabel() const					{ return LLWearable::sTypeLabel[ mType ]; }
+	const std::string&	getTypeName() const						{ return LLWearable::sTypeName[ mType ]; }
 
 	void				setParamsToDefaults();
 	void				setTexturesToDefaults();
 
 	LLAssetType::EType	getAssetType() const					{ return LLWearable::typeToAssetType( mType ); }
 
-	static EWearableType typeNameToType( const LLString& type_name );
-	static const char*	typeToTypeName( EWearableType type )	{ return (type<WT_COUNT) ? LLWearable::sTypeName[type] : "invalid"; }
-	static const char*	typeToTypeLabel( EWearableType type )	{ return (type<WT_COUNT) ? LLWearable::sTypeLabel[type] : "invalid"; }
+	static EWearableType typeNameToType( const std::string& type_name );
+	static const std::string& typeToTypeName( EWearableType type )	{ return LLWearable::sTypeName[llmin(type,WT_COUNT)]; }
+	static const std::string& typeToTypeLabel( EWearableType type )	{ return LLWearable::sTypeLabel[llmin(type,WT_COUNT)]; }
 	static LLAssetType::EType typeToAssetType( EWearableType wearable_type );
 
 	void				saveNewAsset();
@@ -121,10 +119,14 @@ public:
 	friend std::ostream& operator<<(std::ostream &s, const LLWearable &w);
 
 private:
+	// Private constructor used by LLWearableList
+	LLWearable(const LLTransactionID& transactionID);
+	LLWearable(const LLAssetID& assetID);
+
 	static S32			sCurrentDefinitionVersion;	// Depends on the current state of the avatar_lad.xml.
 	S32					mDefinitionVersion;			// Depends on the state of the avatar_lad.xml when this asset was created.
-	LLString			mName;
-	LLString			mDescription;
+	std::string			mName;
+	std::string			mDescription;
 	LLPermissions		mPermissions;
 	LLSaleInfo			mSaleInfo;
 	LLAssetID mAssetID;
@@ -136,8 +138,8 @@ private:
 	typedef std::map<S32, LLUUID> te_map_t;
 	te_map_t mTEMap;				// maps TE to Image ID
 
-	static const char* sTypeName[ WT_COUNT ];
-	static const char* sTypeLabel[ WT_COUNT ];
+	static const std::string sTypeName[ WT_COUNT+1 ];
+	static const std::string sTypeLabel[ WT_COUNT+1 ];
 };
 
 #endif  // LL_LLWEARABLE_H
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index 75986c1..cf5d91b 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -43,14 +43,14 @@
 #include "llnotify.h"
 
 // Globals
-LLWearableList gWearableList;
+LLWearableList gWearableList; // Globally constructed; be careful that there's no dependency with gAgent.
 
 
 struct LLWearableArrivedData
 {
 	LLWearableArrivedData( 
 		LLAssetType::EType asset_type,
-		const LLString& wearable_name,
+		const std::string& wearable_name,
 		void(*asset_arrived_callback)(LLWearable*, void* userdata),
 		void* userdata ) 
 		:
@@ -64,7 +64,7 @@ struct LLWearableArrivedData
 	LLAssetType::EType mAssetType;
 	void	(*mCallback)(LLWearable*, void* userdata);
 	void*	mUserdata;
-	LLString mName;
+	std::string mName;
 	S32	mRetries;
 };
 
@@ -79,7 +79,7 @@ LLWearableList::~LLWearableList()
 	mList.clear();
 }
 
-void LLWearableList::getAsset( const LLAssetID& assetID, const LLString& wearable_name, LLAssetType::EType asset_type, void(*asset_arrived_callback)(LLWearable*, void* userdata), void* userdata )
+void LLWearableList::getAsset( const LLAssetID& assetID, const std::string& wearable_name, LLAssetType::EType asset_type, void(*asset_arrived_callback)(LLWearable*, void* userdata), void* userdata )
 {
 	llassert( (asset_type == LLAssetType::AT_CLOTHING) || (asset_type == LLAssetType::AT_BODYPART) );
 	LLWearable* instance = get_if_there(mList, assetID, (LLWearable*)NULL );
@@ -112,7 +112,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 	if( status >= 0 )
 	{
 		// read the file
-		LLFILE* fp = LLFile::fopen(filename, "rb");		/*Flawfinder: ignore*/
+		LLFILE* fp = LLFile::fopen(std::string(filename), "rb");		/*Flawfinder: ignore*/
 		if( !fp )
 		{
 			LL_WARNS("Wearable") << "Bad Wearable Asset: unable to open file: '" << filename << "'" << LL_ENDL;
@@ -130,7 +130,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 			fclose( fp );
 			if(filename)
 			{
-				LLFile::remove(filename);
+				LLFile::remove(std::string(filename));
 			}
 		}
 	}
@@ -138,7 +138,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 	{
 		if(filename)
 		{
-			LLFile::remove(filename);
+			LLFile::remove(std::string(filename));
 		}
 		LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
 
@@ -180,7 +180,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 	}
 	else
 	{
-		LLString::format_map_t args;
+		LLStringUtil::format_map_t args;
 		// *TODO:translate
 		args["[TYPE]"] = LLAssetType::lookupHumanReadable(data->mAssetType);
 		if (data->mName.empty())
@@ -290,7 +290,7 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type )
 	LLWearable* wearable = new LLWearable( tid );
 	wearable->setType( type );
 	
-	LLString name = "New ";
+	std::string name = "New ";
 	name.append( wearable->getTypeLabel() );
 	wearable->setName( name );
 
diff --git a/linden/indra/newview/llwearablelist.h b/linden/indra/newview/llwearablelist.h
index 7a01be0..1ee03e8 100644
--- a/linden/indra/newview/llwearablelist.h
+++ b/linden/indra/newview/llwearablelist.h
@@ -46,7 +46,7 @@ public:
 
 	void				getAsset( 
 							const LLAssetID& assetID,
-							const LLString& wearable_name,
+							const std::string& wearable_name,
 							LLAssetType::EType asset_type,
 							void(*asset_arrived_callback)(LLWearable*, void* userdata),
 							void* userdata );
@@ -56,7 +56,7 @@ public:
 	LLWearable*			createCopy( LLWearable* old_wearable );
 	LLWearable*			createNewWearable( EWearableType type );
 	
-	// Pseudo-private
+	// Callback
 	static void	 	    processGetAssetReply(const char* filename, const LLAssetID& assetID, void* user_data, S32 status, LLExtStat ext_status);
 
 protected:
diff --git a/linden/indra/newview/llweb.cpp b/linden/indra/newview/llweb.cpp
index dcae7a0..a3ccab3 100644
--- a/linden/indra/newview/llweb.cpp
+++ b/linden/indra/newview/llweb.cpp
@@ -34,7 +34,7 @@
 
 #include "llweb.h"
 
-#include "llwindow.h"
+#include "llviewerwindow.h"
 
 #include "llviewercontrol.h"
 #include "llfloaterhtmlhelp.h"
@@ -63,7 +63,7 @@ void LLWeb::loadURL(const std::string& url)
 void LLWeb::loadURLExternal(const std::string& url)
 {
 	std::string escaped_url = escapeURL(url);
-	spawn_web_browser(escaped_url.c_str());
+	gViewerWindow->getWindow()->spawnWebBrowser(escaped_url);
 }
 
 
diff --git a/linden/indra/newview/llweb.h b/linden/indra/newview/llweb.h
index 159752a..8dbddaf 100644
--- a/linden/indra/newview/llweb.h
+++ b/linden/indra/newview/llweb.h
@@ -45,7 +45,7 @@ public:
 	// browser, depending on user settings.
 	static void loadURL(const std::string& url);
 	
-	static void loadURL(const char* url) { loadURL( std::string(url) ); }
+	static void loadURL(const char* url) { loadURL( ll_safe_string(url) ); }
 
 	// Loads unescaped url in external browser.
 	static void loadURLExternal(const std::string& url);
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index 209af42..e9a7132 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -50,6 +50,8 @@
 // linden library includes
 #include "llfocusmgr.h"
 
+extern BOOL gRestoreGL;
+
 // Setting the mozilla buffer width to 2048 exactly doesn't work, since it pads its rowbytes a bit, pushing the texture width over 2048.
 // 2000 should give enough headroom for any amount of padding it cares to add.
 const S32 MAX_DIMENSION = 2000;
@@ -73,7 +75,8 @@ LLWebBrowserCtrl::LLWebBrowserCtrl( const std::string& name, const LLRect& rect
 	mAlwaysRefresh( false ),
 	mExternalUrl( "" ),
 	mMediaSource( 0 ),
-	mTakeFocusOnClick( true )
+	mTakeFocusOnClick( true ),
+	mCurrentNavUrl( "about:blank" )
 {
 	S32 screen_width = mIgnoreUIScale ? 
 		llround((F32)getRect().getWidth() * LLUI::sGLScaleFactor.mV[VX]) : getRect().getWidth();
@@ -109,7 +112,7 @@ LLWebBrowserCtrl::LLWebBrowserCtrl( const std::string& name, const LLRect& rect
 	}
 
 	LLRect border_rect( 0, getRect().getHeight() + 2, getRect().getWidth() + 2, 0 );
-	mBorder = new LLViewBorder( "web control border", border_rect, LLViewBorder::BEVEL_IN );
+	mBorder = new LLViewBorder( std::string("web control border"), border_rect, LLViewBorder::BEVEL_IN );
 	addChild( mBorder );
 }
 
@@ -230,7 +233,7 @@ BOOL LLWebBrowserCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
 		}
 	}
 	
-	gViewerWindow->setMouseCapture( NULL );
+	gFocusMgr.setMouseCapture( NULL );
 
 	return TRUE;
 }
@@ -244,7 +247,7 @@ BOOL LLWebBrowserCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
 	if (mMediaSource)
 		mMediaSource->mouseDown(x, y);
 	
-	gViewerWindow->setMouseCapture( this );
+	gFocusMgr.setMouseCapture( this );
 
 	if (mTakeFocusOnClick)
 	{
@@ -263,7 +266,7 @@ BOOL LLWebBrowserCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
 	if (mMediaSource)
 		mMediaSource->mouseLeftDoubleClick( x, y );
 
-	gViewerWindow->setMouseCapture( this );
+	gFocusMgr.setMouseCapture( this );
 
 	if (mTakeFocusOnClick)
 	{
@@ -462,8 +465,8 @@ void LLWebBrowserCtrl::navigateTo( std::string urlIn )
 	// don't browse to anything that starts with secondlife:// or sl://
 	const std::string protocol1 = "secondlife://";
 	const std::string protocol2 = "sl://";
-	if ((LLString::compareInsensitive(urlIn.substr(0, protocol1.length()).c_str(), protocol1.c_str()) == 0) ||
-	    (LLString::compareInsensitive(urlIn.substr(0, protocol2.length()).c_str(), protocol2.c_str()) == 0))
+	if ((LLStringUtil::compareInsensitive(urlIn.substr(0, protocol1.length()), protocol1) == 0) ||
+	    (LLStringUtil::compareInsensitive(urlIn.substr(0, protocol2.length()), protocol2) == 0))
 	{
 		// TODO: Print out/log this attempt?
 		// llinfos << "Rejecting attempt to load restricted website :" << urlIn << llendl;
@@ -471,7 +474,10 @@ void LLWebBrowserCtrl::navigateTo( std::string urlIn )
 	}
 	
 	if (mMediaSource)
+	{
+		mCurrentNavUrl = urlIn;
 		mMediaSource->navigateTo(urlIn);
+        }
 }
 
 
@@ -553,6 +559,14 @@ void LLWebBrowserCtrl::draw()
 	if ( ! mWebBrowserImage )
 		return;
 
+	if ( gRestoreGL == 1 )
+	{
+		LLRect r = getRect();
+		mMediaSource->updateMedia();
+		reshape( r.getWidth(), r.getHeight(), FALSE );
+		return;
+	};
+
 	// NOTE: optimization needed here - probably only need to do this once
 	// unless tearoffs change the parent which they probably do.
 	const LLUICtrl* ptr = findRootMostFocusRoot();
@@ -721,8 +735,8 @@ void LLWebBrowserCtrl::onClickLinkHref( const EventType& eventIn )
 	{
 		if ( eventIn.getStringValue().length() )
 		{
-			if ( LLString::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ).c_str(), protocol1.c_str() ) == 0 ||
-				 LLString::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ).c_str(), protocol2.c_str() ) == 0 )
+			if ( LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ), protocol1 ) == 0 ||
+				 LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ), protocol2 ) == 0 )
 			{
 				LLWeb::loadURLExternal( eventIn.getStringValue() );
 			};
@@ -733,8 +747,8 @@ void LLWebBrowserCtrl::onClickLinkHref( const EventType& eventIn )
 	{
 		if ( eventIn.getStringValue().length() )
 		{
-			if ( LLString::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ).c_str(), protocol1.c_str() ) == 0 ||
-				 LLString::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ).c_str(), protocol2.c_str() ) == 0 )
+			if ( LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol1.length() ), protocol1 ) == 0 ||
+				 LLStringUtil::compareInsensitive( eventIn.getStringValue().substr( 0, protocol2.length() ), protocol2 ) == 0 )
 			{
 				// If we spawn a new LLFloaterHTML, assume we want it to
 				// follow this LLWebBrowserCtrl's setting for whether or
@@ -922,6 +936,7 @@ void LLWebBrowserTexture::resize( S32 new_width, S32 new_height )
 	// HACK - this code is executing a render - resize should call render() instead
 	// (and render() should be refactored so it doesn't call resize())
 	
+	mMediaSource->updateMedia();
 	const unsigned char* pixels = mMediaSource->getMediaData();
 
 	S32 media_width  = mMediaSource->getMediaWidth();
@@ -1011,10 +1026,10 @@ void LLWebBrowserTexture::resize( S32 new_width, S32 new_height )
 
 LLView* LLWebBrowserCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	LLString name("web_browser");
+	std::string name("web_browser");
 	node->getAttributeString("name", name);
 
-	LLString start_url("start_url");
+	std::string start_url("start_url");
 	node->getAttributeString("start_url", start_url );
 
 	BOOL border_visible = true;
@@ -1048,4 +1063,8 @@ LLView* LLWebBrowserCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 	return web_browser;
 }
 
+std::string LLWebBrowserCtrl::getCurrentNavUrl()
+{
+	return mCurrentNavUrl;
+}
 
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index 95757f1..8a31421 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -209,6 +209,7 @@ class LLWebBrowserCtrl :
 		bool canNavigateForward();
 		void setOpenInExternalBrowser( bool valIn );
 		void setOpenInInternalBrowser( bool valIn );
+		std::string getCurrentNavUrl();
 
 		// By default, we do not handle "secondlife:///app/" SLURLs, because
 		// those can cause teleports, open windows, etc.  We cannot be sure
@@ -284,6 +285,7 @@ class LLWebBrowserCtrl :
 		bool mOpenAppSLURLs;
 		std::string mHomePageUrl;
 		std::string mExternalUrl;
+		std::string mCurrentNavUrl;
 		bool mIgnoreUIScale;
 		bool mAlwaysRefresh;
 		LLMediaBase* mMediaSource;
diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp
index 3f0364b..7607315 100644
--- a/linden/indra/newview/llwindebug.cpp
+++ b/linden/indra/newview/llwindebug.cpp
@@ -31,8 +31,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#ifdef LL_WINDOWS
-
 #include <tchar.h>
 #include <tlhelp32.h>
 #include "llwindebug.h"
@@ -488,7 +486,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
 		
 		// Save instruction that caused exception.
 		/*
-		LLString str;
+		std::string str;
 		for (i = 0; i < 16; i++)
 			str += llformat(" %02X", PBYTE(E.ExceptionAddress)[i]);
 		info["Instruction"] = str;
@@ -641,7 +639,7 @@ bool LLWinDebug::checkExceptionHandler()
 	return ok;
 }
 
-void LLWinDebug::writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const char *filename)
+void LLWinDebug::writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename)
 {
 	if(f_mdwp == NULL || gDirUtilp == NULL) 
 	{
@@ -650,8 +648,7 @@ void LLWinDebug::writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMAT
 	}
 	else
 	{
-		std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-																	   filename);
+		std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, filename);
 
 		HANDLE hFile = CreateFileA(dump_path.c_str(),
 									GENERIC_WRITE,
@@ -736,9 +733,7 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop
 
     info["Threads"] = threads;
 
-	std::ofstream out_file(log_path.c_str());
+	llofstream out_file(log_path);
 	LLSDSerialize::toPrettyXML(info, out_file);
 	out_file.close();
 }
-
-#endif
diff --git a/linden/indra/newview/llwindebug.h b/linden/indra/newview/llwindebug.h
index cf15fae..eef2340 100644
--- a/linden/indra/newview/llwindebug.h
+++ b/linden/indra/newview/llwindebug.h
@@ -66,7 +66,7 @@ public:
 	static bool checkExceptionHandler();
 
 	static void generateCrashStacks(struct _EXCEPTION_POINTERS *pExceptionInfo = NULL);
-	static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const char *filename);
+	static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename);
 private:
 };
 
diff --git a/linden/indra/newview/llwldaycycle.cpp b/linden/indra/newview/llwldaycycle.cpp
index 4626160..2bf9e58 100644
--- a/linden/indra/newview/llwldaycycle.cpp
+++ b/linden/indra/newview/llwldaycycle.cpp
@@ -48,17 +48,17 @@ LLWLDayCycle::~LLWLDayCycle()
 {
 }
 
-void LLWLDayCycle::loadDayCycle(const LLString & fileName)
+void LLWLDayCycle::loadDayCycle(const std::string & fileName)
 {
 	// clear the first few things
 	mTimeMap.clear();
 
 	// now load the file
-	LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, 
+	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, 
 		"windlight/days", fileName));
 	llinfos << "Loading DayCycle settings from " << pathName << llendl;
 	
-	llifstream day_cycle_xml(pathName.c_str());
+	llifstream day_cycle_xml(pathName);
 	if (day_cycle_xml.is_open())
 	{
 		// load and parse it
@@ -82,7 +82,7 @@ void LLWLDayCycle::loadDayCycle(const LLString & fileName)
 			if(!success)
 			{
 				// alert the user
-				LLString::format_map_t args;
+				LLStringUtil::format_map_t args;
 				args["[SKY]"] = day_data[i][1].asString();
 				gViewerWindow->alertXml("WLMissingSky", args);
 				continue;
@@ -96,11 +96,11 @@ void LLWLDayCycle::loadDayCycle(const LLString & fileName)
 	}
 }
 
-void LLWLDayCycle::saveDayCycle(const LLString & fileName)
+void LLWLDayCycle::saveDayCycle(const std::string & fileName)
 {
 	LLSD day_data(LLSD::emptyArray());
 
-	LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/days", fileName));
+	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/days", fileName));
 	//llinfos << "Saving WindLight settings to " << pathName << llendl;
 
 	for(std::map<F32, std::string>::const_iterator mIt = mTimeMap.begin();
@@ -113,11 +113,10 @@ void LLWLDayCycle::saveDayCycle(const LLString & fileName)
 		day_data.append(key);
 	}
 
-	std::ofstream day_cycle_xml(pathName.c_str());
+	llofstream day_cycle_xml(pathName);
 	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
 	formatter->format(day_data, day_cycle_xml, LLSDFormatter::OPTIONS_PRETTY);
-
-	//day_cycle_xml.close();
+	day_cycle_xml.close();
 }
 
 
@@ -127,7 +126,7 @@ void LLWLDayCycle::clearKeys()
 }
 
 
-bool LLWLDayCycle::addKey(F32 newTime, const LLString & paramName)
+bool LLWLDayCycle::addKey(F32 newTime, const std::string & paramName)
 {
 	// no adding negative time
 	if(newTime < 0) 
@@ -160,7 +159,7 @@ bool LLWLDayCycle::changeKeyTime(F32 oldTime, F32 newTime)
 	return addKey(newTime, name);
 }
 
-bool LLWLDayCycle::changeKeyParam(F32 time, const LLString & name)
+bool LLWLDayCycle::changeKeyParam(F32 time, const std::string & name)
 {
 	// just remove and add back
 	// make sure param exists
@@ -189,7 +188,7 @@ bool LLWLDayCycle::removeKey(F32 time)
 	return false;
 }
 
-bool LLWLDayCycle::getKey(const LLString & name, F32& key)
+bool LLWLDayCycle::getKey(const std::string & name, F32& key)
 {
 	// scroll through till we find the 
 	std::map<F32, std::string>::iterator mIt = mTimeMap.begin();
@@ -218,7 +217,7 @@ bool LLWLDayCycle::getKeyedParam(F32 time, LLWLParamSet& param)
 	return false;
 }
 
-bool LLWLDayCycle::getKeyedParamName(F32 time, LLString & name)
+bool LLWLDayCycle::getKeyedParamName(F32 time, std::string & name)
 {
 	// just scroll on through till you find it
 	std::map<F32, std::string>::iterator mIt = mTimeMap.find(time);
diff --git a/linden/indra/newview/llwldaycycle.h b/linden/indra/newview/llwldaycycle.h
index 85e75c2..1438306 100644
--- a/linden/indra/newview/llwldaycycle.h
+++ b/linden/indra/newview/llwldaycycle.h
@@ -61,10 +61,10 @@ public:
 	~LLWLDayCycle();
 
 	/// load a day cycle
-	void loadDayCycle(const LLString & fileName);
+	void loadDayCycle(const std::string & fileName);
 
 	/// load a day cycle
-	void saveDayCycle(const LLString & fileName);
+	void saveDayCycle(const std::string & fileName);
 
 	/// clear keys
 	void clearKeys();
@@ -73,7 +73,7 @@ public:
 	/// add a new key frame to the day cycle
 	/// returns true if successful
 	/// no negative time
-	bool addKey(F32 newTime, const LLString & paramName);
+	bool addKey(F32 newTime, const std::string & paramName);
 
 	/// adjust a key's placement in the day cycle
 	/// returns true if successful
@@ -81,7 +81,7 @@ public:
 
 	/// adjust a key's parameter used
 	/// returns true if successful
-	bool changeKeyParam(F32 time, const LLString & paramName);
+	bool changeKeyParam(F32 time, const std::string & paramName);
 
 	/// remove a key from the day cycle
 	/// returns true if successful
@@ -89,7 +89,7 @@ public:
 
 	/// get the first key time for a parameter
 	/// returns false if not there
-	bool getKey(const LLString & name, F32& key);
+	bool getKey(const std::string & name, F32& key);
 
 	/// get the param set at a given time
 	/// returns true if found one
@@ -97,7 +97,7 @@ public:
 
 	/// get the name
 	/// returns true if it found one
-	bool getKeyedParamName(F32 time, LLString & name);
+	bool getKeyedParamName(F32 time, std::string & name);
 
 };
 
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 9f23b37..1707fe9 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -104,16 +104,16 @@ LLWLParamManager::~LLWLParamManager()
 {
 }
 
-void LLWLParamManager::loadPresets(const LLString& file_name)
+void LLWLParamManager::loadPresets(const std::string& file_name)
 {
 	// if fileName exists, use legacy loading form the big file, otherwise, search the sky 
 	// directory, and add the list
 	if(file_name != "") 
 	{
-		LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", file_name));
+		std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", file_name));
 		LL_INFOS2("AppInit", "Shaders") << "Loading WindLight settings from " << path_name << LL_ENDL;
 
-		llifstream presetsXML(path_name.c_str());
+		llifstream presetsXML(path_name);
 	
 		if (presetsXML)
 		{
@@ -136,7 +136,7 @@ void LLWLParamManager::loadPresets(const LLString& file_name)
 	// otherwise, search the sky directory and find things there
 	else
 	{
-		LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
+		std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
 		LL_INFOS2("AppInit", "Shaders") << "Loading WindLight settings from " << path_name << LL_ENDL;
 	
 		//mParamList.clear();
@@ -161,10 +161,10 @@ void LLWLParamManager::loadPresets(const LLString& file_name)
 				// not much error checking here since we're getting rid of this
 				std::string sky_name = unescaped_name.substr(0, unescaped_name.size() - 4);
 			
-				LLString cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", name));
+				std::string cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", name));
 				LL_DEBUGS2("AppInit", "Shaders") << "Loading sky from " << cur_path << LL_ENDL;
 				
-				std::ifstream sky_xml(cur_path.c_str());
+				llifstream sky_xml(cur_path);
 				if (sky_xml)
 				{
 					LLSD sky_data(LLSD::emptyMap());
@@ -172,17 +172,18 @@ void LLWLParamManager::loadPresets(const LLString& file_name)
 					parser->parse(sky_xml, sky_data, LLSDSerialize::SIZE_UNLIMITED);
 
 					addParamSet(sky_name, sky_data);
+					sky_xml.close();
 				}
 			}
 		}
 	}
 }
 
-void LLWLParamManager::savePresets(const LLString & fileName)
+void LLWLParamManager::savePresets(const std::string & fileName)
 {
 	LLSD paramsData(LLSD::emptyMap());
 	
-	LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", fileName));
+	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", fileName));
 
 	for(std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.begin();
 		mIt != mParamList.end();
@@ -191,7 +192,7 @@ void LLWLParamManager::savePresets(const LLString & fileName)
 		paramsData[mIt->first] = mIt->second.getAll();
 	}
 
-	std::ofstream presetsXML(pathName.c_str());
+	llofstream presetsXML(pathName);
 
 	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
 
@@ -200,7 +201,7 @@ void LLWLParamManager::savePresets(const LLString & fileName)
 	presetsXML.close();
 }
 
-void LLWLParamManager::loadPreset(const LLString & name)
+void LLWLParamManager::loadPreset(const std::string & name)
 {
 	// bugfix for SL-46920: preventing filenames that break stuff.
 	char * curl_str = curl_escape(name.c_str(), name.size());
@@ -213,7 +214,7 @@ void LLWLParamManager::loadPreset(const LLString & name)
 	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", escaped_filename));
 	llinfos << "Loading WindLight sky setting from " << pathName << llendl;
 
-	std::ifstream presetsXML(pathName.c_str());
+	llifstream presetsXML(pathName);
 
 	if (presetsXML)
 	{
@@ -232,6 +233,7 @@ void LLWLParamManager::loadPreset(const LLString & name)
 		{
 			setParamSet(name, paramsData);
 		}
+		presetsXML.close();
 	} 
 	else 
 	{
@@ -244,7 +246,7 @@ void LLWLParamManager::loadPreset(const LLString & name)
 	propagateParameters();
 }
 
-void LLWLParamManager::savePreset(const LLString & name)
+void LLWLParamManager::savePreset(const std::string & name)
 {
 	// bugfix for SL-46920: preventing filenames that break stuff.
 	char * curl_str = curl_escape(name.c_str(), name.size());
@@ -262,7 +264,7 @@ void LLWLParamManager::savePreset(const LLString & name)
 	paramsData = mParamList[name].getAll();
 
 	// write to file
-	std::ofstream presetsXML(pathName.c_str());
+	llofstream presetsXML(pathName);
 	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
 	formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
 	presetsXML.close();
@@ -279,13 +281,13 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
 
 	if (shader->mShaderGroup == LLGLSLShader::SG_DEFAULT)
 	{
-		shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV);
+		shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV);
 		shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
 	} 
 
 	else if (shader->mShaderGroup == LLGLSLShader::SG_SKY)
 	{
-		shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, mClampedLightDir.mV);
+		shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mClampedLightDir.mV);
 	}
 
 	shader->uniform1f("scene_light_strength", mSceneLightStrength);
@@ -343,9 +345,9 @@ void LLWLParamManager::propagateParameters(void)
 	mCurParams.set("lightnorm", mLightDir);
 
 	// bind the variables for all shaders only if we're using WindLight
-	LLShaderMgr::shader_iter shaders_iter, end_shaders;
-	end_shaders = LLShaderMgr::endShaders();
-	for(shaders_iter = LLShaderMgr::beginShaders(); shaders_iter != end_shaders; ++shaders_iter) 
+	LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
+	end_shaders = LLViewerShaderMgr::instance()->endShaders();
+	for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter) 
 	{
 		if (shaders_iter->mProgramObject != 0
 			&& (gPipeline.canUseWindLightShaders()
@@ -406,9 +408,9 @@ void LLWLParamManager::update(LLViewerCamera * cam)
 		lightNorm3 *= LLQuaternion(-(camYaw + camYawDelta), LLVector3(0.f, 1.f, 0.f));
 		mRotatedLightDir = LLVector4(lightNorm3, 0.f);
 
-		LLShaderMgr::shader_iter shaders_iter, end_shaders;
-		end_shaders = LLShaderMgr::endShaders();
-		for(shaders_iter = LLShaderMgr::beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
+		LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
+		end_shaders = LLViewerShaderMgr::instance()->endShaders();
+		for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
 		{
 			if (shaders_iter->mProgramObject != 0
 				&& (gPipeline.canUseWindLightShaders()
@@ -531,7 +533,7 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
 	
 	if(delete_from_disk)
 	{
-		LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
+		std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
 		
 		// use full curl escaped name
 		char * curl_str = curl_escape(name.c_str(), name.size());
@@ -553,10 +555,10 @@ LLWLParamManager * LLWLParamManager::instance()
 	{
 		sInstance = new LLWLParamManager();
 
-		sInstance->loadPresets("");
+		sInstance->loadPresets(LLStringUtil::null);
 
 		// load the day
-		sInstance->mDay.loadDayCycle("Default.xml");
+		sInstance->mDay.loadDayCycle(std::string("Default.xml"));
 
 		// *HACK - sets cloud scrolling to what we want... fix this better in the future
 		sInstance->getParamSet("Default", sInstance->mCurParams);
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 72b888d..7094051 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -45,15 +45,15 @@ class LLGLSLShader;
 struct WLColorControl {
 	
 	F32 r, g, b, i;				/// the values
-	char const * name;			/// name to use to dereference params
+	std::string mName;			/// name to use to dereference params
 	std::string mSliderName;	/// name of the slider in menu
 	bool hasSliderName;			/// only set slider name for true color types
 	bool isSunOrAmbientColor;			/// flag for if it's the sun or ambient color controller
 	bool isBlueHorizonOrDensity;		/// flag for if it's the Blue Horizon or Density color controller
 
-	inline WLColorControl(F32 red, F32 green, F32 blue, F32 intensity, char const * n,
-		char const * sliderName = "")
-		: r(red), g(green), b(blue), i(intensity), name(n), mSliderName(sliderName)
+	inline WLColorControl(F32 red, F32 green, F32 blue, F32 intensity,
+						  const std::string& n, const std::string& sliderName = LLStringUtil::null)
+		: r(red), g(green), b(blue), i(intensity), mName(n), mSliderName(sliderName)
 	{
 		// if there's a slider name, say we have one
 		hasSliderName = false;
@@ -90,18 +90,18 @@ struct WLColorControl {
 	}
 
 	inline void update(LLWLParamSet & params) const {
-		params.set(name, r, g, b, i);
+		params.set(mName, r, g, b, i);
 	}
 };
 
 // float slider control
 struct WLFloatControl {
 	F32 x;
-	char const * name;
+	std::string mName;
 	F32 mult;
 
-	inline WLFloatControl(F32 val, char const * n, F32 m=1.0f)
-		: x(val), name(n), mult(m)
+	inline WLFloatControl(F32 val, const std::string& n, F32 m=1.0f)
+		: x(val), mName(n), mult(m)
 	{
 	}
 
@@ -116,7 +116,7 @@ struct WLFloatControl {
 	}
 
 	inline void update(LLWLParamSet & params) const {
-		params.set(name, x);
+		params.set(mName, x);
 	}
 };
 
@@ -129,16 +129,16 @@ public:
 	~LLWLParamManager();
 
 	/// load a preset file
-	void loadPresets(const LLString & fileName);
+	void loadPresets(const std::string & fileName);
 
 	/// save the preset file
-	void savePresets(const LLString & fileName);
+	void savePresets(const std::string & fileName);
 
 	/// load an individual preset into the sky
-	void loadPreset(const LLString & name);
+	void loadPreset(const std::string & name);
 
 	/// save the parameter presets to file
-	void savePreset(const LLString & name);
+	void savePreset(const std::string & name);
 
 	/// Set shader uniforms dirty, so they'll update automatically.
 	void propagateParameters(void);
diff --git a/linden/indra/newview/llwlparamset.cpp b/linden/indra/newview/llwlparamset.cpp
index d6e1f03..5cb93fb 100644
--- a/linden/indra/newview/llwlparamset.cpp
+++ b/linden/indra/newview/llwlparamset.cpp
@@ -80,7 +80,7 @@ void LLWLParamSet::update(LLGLSLShader * shader) const
 		i != mParamValues.endMap();
 		++i)
 	{
-		const LLString& param = i->first;
+		const std::string& param = i->first;
 		
 		if(	param == "star_brightness" || param == "preset_num" || param == "sun_angle" ||
 			param == "east_angle" || param == "enable_cloud_scroll" ||
@@ -130,7 +130,7 @@ void LLWLParamSet::update(LLGLSLShader * shader) const
 	}
 }
 
-void LLWLParamSet::set(const char * paramName, float x) 
+void LLWLParamSet::set(const std::string& paramName, float x) 
 {	
 	// handle case where no array
 	if(mParamValues[paramName].isReal()) 
@@ -146,19 +146,19 @@ void LLWLParamSet::set(const char * paramName, float x)
 	}
 }
 
-void LLWLParamSet::set(const char * paramName, float x, float y) {
+void LLWLParamSet::set(const std::string& paramName, float x, float y) {
 	mParamValues[paramName][0] = x;
 	mParamValues[paramName][1] = y;
 }
 
-void LLWLParamSet::set(const char * paramName, float x, float y, float z) 
+void LLWLParamSet::set(const std::string& paramName, float x, float y, float z) 
 {
 	mParamValues[paramName][0] = x;
 	mParamValues[paramName][1] = y;
 	mParamValues[paramName][2] = z;
 }
 
-void LLWLParamSet::set(const char * paramName, float x, float y, float z, float w) 
+void LLWLParamSet::set(const std::string& paramName, float x, float y, float z, float w) 
 {
 	mParamValues[paramName][0] = x;
 	mParamValues[paramName][1] = y;
@@ -166,7 +166,7 @@ void LLWLParamSet::set(const char * paramName, float x, float y, float z, float
 	mParamValues[paramName][3] = w;
 }
 
-void LLWLParamSet::set(const char * paramName, const float * val) 
+void LLWLParamSet::set(const std::string& paramName, const float * val) 
 {
 	mParamValues[paramName][0] = val[0];
 	mParamValues[paramName][1] = val[1];
@@ -174,7 +174,7 @@ void LLWLParamSet::set(const char * paramName, const float * val)
 	mParamValues[paramName][3] = val[3];
 }
 
-void LLWLParamSet::set(const char * paramName, const LLVector4 & val) 
+void LLWLParamSet::set(const std::string& paramName, const LLVector4 & val) 
 {
 	mParamValues[paramName][0] = val.mV[0];
 	mParamValues[paramName][1] = val.mV[1];
@@ -182,7 +182,7 @@ void LLWLParamSet::set(const char * paramName, const LLVector4 & val)
 	mParamValues[paramName][3] = val.mV[3];
 }
 
-void LLWLParamSet::set(const char * paramName, const LLColor4 & val) 
+void LLWLParamSet::set(const std::string& paramName, const LLColor4 & val) 
 {
 	mParamValues[paramName][0] = val.mV[0];
 	mParamValues[paramName][1] = val.mV[1];
@@ -190,7 +190,7 @@ void LLWLParamSet::set(const char * paramName, const LLColor4 & val)
 	mParamValues[paramName][3] = val.mV[3];
 }
 
-LLVector4 LLWLParamSet::getVector(const char * paramName, bool& error) 
+LLVector4 LLWLParamSet::getVector(const std::string& paramName, bool& error) 
 {
 	
 	// test to see if right type
@@ -211,7 +211,7 @@ LLVector4 LLWLParamSet::getVector(const char * paramName, bool& error)
 	return val;
 }
 
-F32 LLWLParamSet::getFloat(const char * paramName, bool& error) 
+F32 LLWLParamSet::getFloat(const std::string& paramName, bool& error) 
 {
 	
 	// test to see if right type
diff --git a/linden/indra/newview/llwlparamset.h b/linden/indra/newview/llwlparamset.h
index ed3453d..721627a 100644
--- a/linden/indra/newview/llwlparamset.h
+++ b/linden/indra/newview/llwlparamset.h
@@ -37,7 +37,7 @@
 
 #include "v4math.h"
 #include "v4color.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 
 class LLFloaterWindLight;
 class LLWLParamSet;
@@ -48,7 +48,7 @@ class LLWLParamSet {
 	friend class LLWLParamManager;
 
 public:
-	LLString mName;	
+	std::string mName;	
 	
 private:
 
@@ -73,20 +73,20 @@ public:
 	/// Set a float parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param x			The float value to set.
-	void set(const char * paramName, float x);
+	void set(const std::string& paramName, float x);
 
 	/// Set a float2 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param x			The x component's value to set.
 	/// \param y			The y component's value to set.
-	void set(const char * paramName, float x, float y);
+	void set(const std::string& paramName, float x, float y);
 
 	/// Set a float3 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param x			The x component's value to set.
 	/// \param y			The y component's value to set.
 	/// \param z			The z component's value to set.
-	void set(const char * paramName, float x, float y, float z);
+	void set(const std::string& paramName, float x, float y, float z);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
@@ -94,32 +94,32 @@ public:
 	/// \param y			The y component's value to set.
 	/// \param z			The z component's value to set.
 	/// \param w			The w component's value to set.
-	void set(const char * paramName, float x, float y, float z, float w);
+	void set(const std::string& paramName, float x, float y, float z, float w);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param val			An array of the 4 float values to set the parameter to.
-	void set(const char * paramName, const float * val);
+	void set(const std::string& paramName, const float * val);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param val			A struct of the 4 float values to set the parameter to.
-	void set(const char * paramName, const LLVector4 & val);
+	void set(const std::string& paramName, const LLVector4 & val);
 
 	/// Set a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param val			A struct of the 4 float values to set the parameter to.
-	void set(const char * paramName, const LLColor4 & val);
+	void set(const std::string& paramName, const LLColor4 & val);
 
 	/// Get a float4 parameter.
 	/// \param paramName	The name of the parameter to set.
 	/// \param error		A flag to set if it's not the proper return type
-	LLVector4 getVector(const char * paramName, bool& error);
+	LLVector4 getVector(const std::string& paramName, bool& error);
 
 	/// Get an integer parameter
 	/// \param paramName	The name of the parameter to set.
 	/// \param error		A flag to set if it's not the proper return type	
-	F32 getFloat(const char * paramName, bool& error);
+	F32 getFloat(const std::string& paramName, bool& error);
 	
 	
 	// specific getters and setters
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 2c2440c..66c4068 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -88,10 +88,6 @@ LLWorld::LLWorld() :
 	mLastPacketsIn(0),
 	mLastPacketsOut(0),
 	mLastPacketsLost(0),
-	mMinRegionX(0),
-	mMaxRegionX(0),
-	mMinRegionY(0),
-	mMaxRegionY(0),
 	mSpaceTimeUSec(0)
 {
 	for (S32 i = 0; i < 8; i++)
@@ -139,7 +135,7 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 	{
 		LLHost old_host = regionp->getHost();
 		// region already exists!
-		if (host == old_host && regionp->mAlive)
+		if (host == old_host && regionp->isAlive())
 		{
 			// This is a duplicate for the same host and it's alive, don't bother.
 			return regionp;
@@ -150,7 +146,7 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 			llwarns << "LLWorld::addRegion exists, but old host " << old_host
 					<< " does not match new host " << host << llendl;
 		}
-		if (!regionp->mAlive)
+		if (!regionp->isAlive())
 		{
 			llwarns << "LLWorld::addRegion exists, but isn't alive" << llendl;
 		}
@@ -422,7 +418,7 @@ BOOL LLWorld::positionRegionValidGlobal(const LLVector3d &pos_global)
 F32 LLWorld::getMinAllowedZ(LLViewerObject* object)
 {
 	F32 land_height = resolveLandHeightGlobal(object->getPositionGlobal());
-	F32 radius = 0.5f * object->getScale().magVec();
+	F32 radius = 0.5f * object->getScale().length();
 	return land_height - radius;
 }
 
@@ -501,7 +497,7 @@ F32 LLWorld::resolveStepHeightGlobal(const LLVOAvatar* avatarp, const LLVector3d
 	}
 	
 	// calculate the length of the segment
-	F32 segment_length = (F32)((point_a - point_b).magVec());
+	F32 segment_length = (F32)((point_a - point_b).length());
 	if (0.0f == segment_length)
 	{
 		intersection = point_a;
@@ -779,7 +775,7 @@ void LLWorld::printPacketsLost()
 		{
 			LLVector3d range = regionp->getCenterGlobal() - gAgent.getPositionGlobal();
 				
-			llinfos << regionp->getHost() << ", range: " << range.magVec()
+			llinfos << regionp->getHost() << ", range: " << range.length()
 					<< " packets lost: " << cdp->getPacketsLost() << llendl;
 		}
 	}
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index d297d47..8936a58 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -170,22 +170,17 @@ private:
 	S32 mLastPacketsOut;
 	S32 mLastPacketsLost;
 
+	U64 mSpaceTimeUSec;
+
 	////////////////////////////
 	//
 	// Data for "Fake" objects
 	//
 
-	// Used to define the "Square" which we need to fill in
-	U32 mMinRegionX;
-	U32 mMaxRegionX;
-	U32 mMinRegionY;
-	U32 mMaxRegionY;
-
 	std::list<LLVOWater*> mHoleWaterObjects;
 	LLPointer<LLVOWater> mEdgeWaterObjects[8];
 
 	LLPointer<LLViewerImage> mDefaultWaterTexturep;
-	U64 mSpaceTimeUSec;
 };
 
 
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 231f5dc..1048fe9 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -67,6 +67,7 @@ LLSimInfo::LLSimInfo()
 :	mHandle(0),
 	mName(),
 	mAgentsUpdateTime(0),
+	mShowAgentLocations(FALSE),
 	mAccess(0x0),
 	mRegionFlags(0x0),
 	mWaterHeight(0.f),
@@ -178,7 +179,6 @@ void LLWorldMap::eraseItems()
 		mPGEvents.clear();
 		mMatureEvents.clear();
 		mLandForSale.clear();
-		mClassifieds.clear();
 	}
 // 	mAgentLocationsMap.clear(); // persists
 // 	mNumAgents.clear(); // persists
@@ -236,7 +236,7 @@ LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 handle)
 }
 
 
-LLSimInfo* LLWorldMap::simInfoFromName(const LLString& sim_name)
+LLSimInfo* LLWorldMap::simInfoFromName(const std::string& sim_name)
 {
 	LLSimInfo* sim_info = NULL;
 	if (!sim_name.empty())
@@ -245,7 +245,7 @@ LLSimInfo* LLWorldMap::simInfoFromName(const LLString& sim_name)
 		{
 			sim_info = (*it).second;
 			if (sim_info
-				&& (0 == LLString::compareInsensitive(sim_name.c_str(), sim_info->mName.c_str())) )
+				&& (0 == LLStringUtil::compareInsensitive(sim_name, sim_info->mName)) )
 			{
 				break;
 			}
@@ -255,7 +255,7 @@ LLSimInfo* LLWorldMap::simInfoFromName(const LLString& sim_name)
 	return sim_info;
 }
 
-bool LLWorldMap::simNameFromPosGlobal(const LLVector3d& pos_global, LLString & outSimName )
+bool LLWorldMap::simNameFromPosGlobal(const LLVector3d& pos_global, std::string & outSimName )
 {
 	bool gotSimName = true;
 
@@ -265,7 +265,7 @@ bool LLWorldMap::simNameFromPosGlobal(const LLVector3d& pos_global, LLString & o
 	if (it != mSimInfoMap.end())
 	{
 		LLSimInfo* info = (*it).second;
-		outSimName = info->mName.c_str();
+		outSimName = info->mName;
 	}
 	else
 	{
@@ -309,11 +309,6 @@ void LLWorldMap::setCurrentLayer(S32 layer, bool request_layer)
 		sendItemRequest(MAP_ITEM_LAND_FOR_SALE);
 	}
 
-	if (mClassifieds.size() == 0)
-	{
-		sendItemRequest(MAP_ITEM_CLASSIFIED);
-	}
-
 	clearImageRefs();
 	clearSimFlags();
 }
@@ -551,16 +546,16 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
 	{
 		U16 x_regions;
 		U16 y_regions;
-		char name[MAX_STRING];		/* Flawfinder: ignore */
-		U8 access;		/* Flawfinder: ignore */
+		std::string name;
+		U8 accesscode;
 		U32 region_flags;
 		U8 water_height;
 		U8 agents;
 		LLUUID image_id;
 		msg->getU16Fast(_PREHASH_Data, _PREHASH_X, x_regions, block);
 		msg->getU16Fast(_PREHASH_Data, _PREHASH_Y, y_regions, block);
-		msg->getStringFast(_PREHASH_Data, _PREHASH_Name, MAX_STRING, name, block);
-		msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, access, block);		/* Flawfinder: ignore */
+		msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name, block);
+		msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, accesscode, block);
 		msg->getU32Fast(_PREHASH_Data, _PREHASH_RegionFlags, region_flags, block);
 		msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block);
 		msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
@@ -571,7 +566,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
 
 		U64 handle = to_region_handle(x_meters, y_meters);
 
-		if (access == 255)
+		if (accesscode == 255)
 		{
 			// This region doesn't exist
 			if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation &&
@@ -610,7 +605,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
 
 			siminfo->mHandle = handle;
 			siminfo->mName.assign( name );
-			siminfo->mAccess = access;		/* Flawfinder: ignore */
+			siminfo->mAccess = accesscode;
 			siminfo->mRegionFlags = region_flags;
 			siminfo->mWaterHeight = (F32) water_height;
 			siminfo->mMapImageID[agent_flags] = image_id;
@@ -654,9 +649,9 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
 				
 		if(LLWorldMap::getInstance()->mSLURLCallback != NULL)
 		{
-			// Server returns definitive capitalization, SLURL might
-			// not have that.
-			if (!stricmp(LLWorldMap::getInstance()->mSLURLRegionName.c_str(), name) || (LLWorldMap::getInstance()->mSLURLRegionHandle == handle))
+			// Server returns definitive capitalization, SLURL might not have that.
+			if ((LLStringUtil::compareInsensitive(LLWorldMap::getInstance()->mSLURLRegionName, name)==0)
+				|| (LLWorldMap::getInstance()->mSLURLRegionHandle == handle))
 			{
 				url_callback_t callback = LLWorldMap::getInstance()->mSLURLCallback;
 
@@ -684,12 +679,12 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
 	for (S32 block=0; block<num_blocks; ++block)
 	{
 		U32 X, Y;
-		char name[MAX_STRING];		/* Flawfinder: ignore */
+		std::string name;
 		S32 extra, extra2;
 		LLUUID uuid;
 		msg->getU32Fast(_PREHASH_Data, _PREHASH_X, X, block);
 		msg->getU32Fast(_PREHASH_Data, _PREHASH_Y, Y, block);
-		msg->getStringFast(_PREHASH_Data, _PREHASH_Name, MAX_STRING, name, block);
+		msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name, block);
 		msg->getUUIDFast(_PREHASH_Data, _PREHASH_ID, uuid, block);
 		msg->getS32Fast(_PREHASH_Data, _PREHASH_Extra, extra, block);
 		msg->getS32Fast(_PREHASH_Data, _PREHASH_Extra2, extra2, block);
@@ -734,7 +729,6 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
 			case MAP_ITEM_PG_EVENT: // events
 			case MAP_ITEM_MATURE_EVENT:
 			{
-				char buffer[32];		/* Flawfinder: ignore */
 				struct tm* timep;
 				// Convert to Pacific, based on server's opinion of whether
 				// it's daylight savings time there.
@@ -743,11 +737,10 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
 				S32 display_hour = timep->tm_hour % 12;
 				if (display_hour == 0) display_hour = 12;
 
-				snprintf(buffer, sizeof(buffer), "%d:%02d %s",		/* Flawfinder: ignore */
-					display_hour,
-					timep->tm_min,
-					(timep->tm_hour < 12 ? "AM" : "PM") );
-				new_item.mToolTip.assign( buffer );
+				new_item.mToolTip = llformat( "%d:%02d %s",
+											  display_hour,
+											  timep->tm_min,
+											  (timep->tm_hour < 12 ? "AM" : "PM") );
 
 				// HACK: store Z in extra2
 				new_item.mPosGlobal.mdV[VZ] = (F64)extra2;
@@ -769,9 +762,7 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
 			}
 			case MAP_ITEM_CLASSIFIED: // classifieds
 			{
-				// HACK: Z-height is in Extra2 field.
-				new_item.mPosGlobal.mdV[VZ] = (F64)extra2;
-				LLWorldMap::getInstance()->mClassifieds.push_back(new_item);
+				//DEPRECATED: no longer used
 				break;
 			}
 			case MAP_ITEM_AGENT_LOCATIONS: // agent locations
@@ -823,7 +814,7 @@ void LLWorldMap::dump()
 		from_region_handle(handle, &x_pos, &y_pos);
 
 		llinfos << x_pos << "," << y_pos
-			<< " " << info->mName.c_str() 
+			<< " " << info->mName 
 			<< " " << (S32)info->mAccess
 			<< " " << std::hex << info->mRegionFlags << std::dec
 			<< " " << info->mWaterHeight
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index 3f3a8e9..e522acc 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -138,10 +138,10 @@ public:
 	LLSimInfo* simInfoFromPosGlobal(const LLVector3d& pos_global);
 
 	// Returns simulator information for named sim, or NULL if non-existent
-	LLSimInfo* simInfoFromName(const LLString& sim_name);
+	LLSimInfo* simInfoFromName(const std::string& sim_name);
 
 	// Gets simulator name for a global position, returns true if it was found
-	bool simNameFromPosGlobal(const LLVector3d& pos_global, LLString & outSimName );
+	bool simNameFromPosGlobal(const LLVector3d& pos_global, std::string& outSimName );
 
 	// Sets the current layer
 	void setCurrentLayer(S32 layer, bool request_layer = false);
@@ -192,7 +192,6 @@ public:
 	item_info_list_t mPGEvents;
 	item_info_list_t mMatureEvents;
 	item_info_list_t mLandForSale;
-	item_info_list_t mClassifieds;
 
 	std::map<U64,S32> mNumAgents;
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index a9e1061..92d9588 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -61,6 +61,7 @@
 #include "llviewerwindow.h"
 #include "llworldmap.h"
 #include "llappviewer.h"				// Only for constants!
+#include "lltrans.h"
 
 #include "llglheaders.h"
 
@@ -98,6 +99,7 @@ S32 LLWorldMapView::sTrackingArrowY = 0;
 F32 LLWorldMapView::sPixelsPerMeter = 1.f;
 F32 CONE_SIZE = 0.6f;
 
+std::map<std::string,std::string> LLWorldMapView::sStringsMap;
 
 #define SIM_NULL_MAP_SCALE 1 // width in pixels, where we start drawing "null" sims
 #define SIM_MAP_AGENT_SCALE 2 // width in pixels, where we start drawing agents
@@ -126,6 +128,9 @@ void LLWorldMapView::initClass()
 	sTrackArrowImage =		LLUI::getUIImage("direction_arrow.tga");
 	sClassifiedsImage =		LLUI::getUIImage("icon_top_pick.tga");
 	sForSaleImage =			LLUI::getUIImage("icon_for_sale.tga");
+	
+	sStringsMap["loading"] = LLTrans::getString("texture_loading");
+	sStringsMap["offline"] = LLTrans::getString("worldmap_offline");
 }
 
 // static
@@ -167,40 +172,40 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
 	const S32 DIR_HEIGHT = 10;
 	LLRect major_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH, 0 );
 
-	mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
+	mTextBoxNorth = new LLTextBox( std::string("N"), major_dir_rect );
 	addChild( mTextBoxNorth );
 
 	LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );
 	
-	mTextBoxEast =	new LLTextBox( "E", major_dir_rect );
+	mTextBoxEast =	new LLTextBox( std::string("E"), major_dir_rect );
 	mTextBoxEast->setColor( minor_color );
 	addChild( mTextBoxEast );
 	
 	major_dir_rect.mRight += 1 ;
-	mTextBoxWest =	new LLTextBox( "W", major_dir_rect );
+	mTextBoxWest =	new LLTextBox( std::string("W"), major_dir_rect );
 	mTextBoxWest->setColor( minor_color );
 	addChild( mTextBoxWest );
 	major_dir_rect.mRight -= 1 ;
 
-	mTextBoxSouth = new LLTextBox( "S", major_dir_rect );
+	mTextBoxSouth = new LLTextBox( std::string("S"), major_dir_rect );
 	mTextBoxSouth->setColor( minor_color );
 	addChild( mTextBoxSouth );
 
 	LLRect minor_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH * 2, 0 );
 
-	mTextBoxSouthEast =	new LLTextBox( "SE", minor_dir_rect );
+	mTextBoxSouthEast =	new LLTextBox( std::string("SE"), minor_dir_rect );
 	mTextBoxSouthEast->setColor( minor_color );
 	addChild( mTextBoxSouthEast );
 	
-	mTextBoxNorthEast = new LLTextBox( "NE", minor_dir_rect );
+	mTextBoxNorthEast = new LLTextBox( std::string("NE"), minor_dir_rect );
 	mTextBoxNorthEast->setColor( minor_color );
 	addChild( mTextBoxNorthEast );
 	
-	mTextBoxSouthWest =	new LLTextBox( "SW", minor_dir_rect );
+	mTextBoxSouthWest =	new LLTextBox( std::string("SW"), minor_dir_rect );
 	mTextBoxSouthWest->setColor( minor_color );
 	addChild( mTextBoxSouthWest );
 
-	mTextBoxNorthWest = new LLTextBox( "NW", minor_dir_rect );
+	mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect );
 	mTextBoxNorthWest->setColor( minor_color );
 	addChild( mTextBoxNorthWest );
 }
@@ -620,33 +625,31 @@ void LLWorldMapView::draw()
 		// Draw the region name in the lower left corner
 		LLFontGL* font = LLFontGL::sSansSerifSmall;
 
-		char mesg[MAX_STRING];		/* Flawfinder: ignore */
+		std::string mesg;
 		if (gMapScale < sThresholdA)
 		{
-			mesg[0] = '\0';
 		}
 		else if (gMapScale < sThresholdB)
 		{
-			//sprintf(mesg, "%d", info->mAgents);
-			mesg[0] = '\0';
+			//	mesg = llformat( info->mAgents);
 		}
 		else
 		{
-			//sprintf(mesg, "%d / %s (%s)",
+			//mesg = llformat("%d / %s (%s)",
 			//			info->mAgents,
 			//			info->mName.c_str(),
-			//			LLViewerRegion::accessToShortString(info->mAccess) );
+			//			LLViewerRegion::accessToShortString(info->mAccess).c_str() );
 			if (info->mAccess == SIM_ACCESS_DOWN)
 			{
-				snprintf(mesg, MAX_STRING, "%s (Offline)", info->mName.c_str());		/* Flawfinder: ignore */
+				mesg = llformat( "%s (%s)", info->mName.c_str(), sStringsMap["offline"].c_str());
 			}
 			else
 			{
-				snprintf(mesg, MAX_STRING, "%s", info->mName.c_str());		/* Flawfinder: ignore */
+				mesg = info->mName;
 			}
 		}
 
-		if (mesg[0] != '\0')
+		if (!mesg.empty())
 		{
 			font->renderUTF8(
 				mesg, 0,
@@ -656,6 +659,21 @@ void LLWorldMapView::draw()
 				LLFontGL::LEFT,
 				LLFontGL::BASELINE,
 				LLFontGL::DROP_SHADOW);
+			
+			// If map texture is still loading,
+			// display "Loading" placeholder text.
+			if (simimage->getDiscardLevel() != 1 &&
+				simimage->getDiscardLevel() != 0)
+			{
+				font->renderUTF8(
+					sStringsMap["loading"], 0,
+					llfloor(left + 18), 
+					llfloor(top - 25),
+					LLColor4::white,
+					LLFontGL::LEFT,
+					LLFontGL::BASELINE,
+					LLFontGL::DROP_SHADOW);			
+			}
 		}
 	}
 #endif
@@ -699,11 +717,6 @@ void LLWorldMapView::draw()
 		drawGenericItems(LLWorldMap::getInstance()->mLandForSale, sForSaleImage);
 	}
 
-	if (gSavedSettings.getBOOL("MapShowClassifieds"))
-	{
-		drawGenericItems(LLWorldMap::getInstance()->mClassifieds, sClassifiedsImage);
-	}
-
 	if (gSavedSettings.getBOOL("MapShowEvents"))
 	{
 		drawEvents();
@@ -997,8 +1010,8 @@ LLVector3 LLWorldMapView::globalPosToView( const LLVector3d& global_pos )
 }
 
 
-void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4& color, 
-							BOOL draw_arrow, LLString label, LLString tooltip, S32 vert_offset )
+void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4& color, BOOL draw_arrow,
+								  const std::string& label, const std::string& tooltip, S32 vert_offset )
 {
 	LLVector3 pos_local = globalPosToView( pos_global );
 	S32 x = llround( pos_local.mV[VX] );
@@ -1088,7 +1101,7 @@ LLVector3d LLWorldMapView::viewPosToGlobal( S32 x, S32 y )
 }
 
 
-BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen )
+BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen )
 {
 	LLVector3d pos_global = viewPosToGlobal(x, y);
 
@@ -1100,7 +1113,7 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_
 		std::string message = 
 			llformat("%s (%s)",
 					 info->mName.c_str(),
-					 LLViewerRegion::accessToString(info->mAccess));
+					 LLViewerRegion::accessToString(info->mAccess).c_str());
 
 		if (info->mAccess != SIM_ACCESS_DOWN)
 		{
@@ -1531,10 +1544,6 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
 	{
 		(*it).mSelected = FALSE;
 	}
-	for (it = LLWorldMap::getInstance()->mClassifieds.begin(); it != LLWorldMap::getInstance()->mClassifieds.end(); ++it)
-	{
-		(*it).mSelected = FALSE;
-	}
 
 	// Select event you clicked on
 	if (gSavedSettings.getBOOL("MapShowEvents"))
@@ -1583,21 +1592,6 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
 		}
 	}
 
-	if (gSavedSettings.getBOOL("MapShowClassifieds"))
-	{
-		for (it = LLWorldMap::getInstance()->mClassifieds.begin(); it != LLWorldMap::getInstance()->mClassifieds.end(); ++it)
-		{
-			LLItemInfo& classified = *it;
-
-			if (checkItemHit(x, y, classified, id, true))
-			{
-				*hit_type = MAP_ITEM_CLASSIFIED;
-				mItemPicked = TRUE;
-				return;
-			}
-		}
-	}
-
 	// If we get here, we haven't clicked on an icon
 
 	gFloaterWorldMap->trackLocation(pos_global);
@@ -1764,10 +1758,11 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
 			{
 				gFloaterWorldMap->close();
 				// This is an ungainly hack
-				char uuid_str[38];		/* Flawfinder: ignore */
+				std::string uuid_str;
 				S32 event_id;
 				id.toString(uuid_str);
-				sscanf(&uuid_str[28], "%X", &event_id);
+				uuid_str = uuid_str.substr(28);
+				sscanf(uuid_str.c_str(), "%X", &event_id);
 				LLFloaterDirectory::showEvents(event_id);
 				break;
 			}
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 079cd47..915a196 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -69,7 +69,7 @@ public:
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleDoubleClick( S32 x, S32 y, MASK mask );
 	virtual BOOL	handleHover( S32 x, S32 y, MASK mask );
-	virtual BOOL	handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen );
+	virtual BOOL	handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen );
 
 	bool			checkItemHit(S32 x, S32 y, LLItemInfo& item, LLUUID* id, bool track);
 	void			handleClick(S32 x, S32 y, MASK mask, S32* hit_type, LLUUID* id);
@@ -95,9 +95,9 @@ public:
 
 	// Draw the tracking indicator, doing the right thing if it's outside
 	// the view area.
-	void			drawTracking( const LLVector3d& pos_global, 
-								  const LLColor4& color,
-								  BOOL draw_arrow = TRUE, LLString label = LLString(), LLString tooltip = "", S32 vert_offset = 0);
+	void			drawTracking( const LLVector3d& pos_global, const LLColor4& color, BOOL draw_arrow = TRUE,
+								  const std::string& label = std::string(), const std::string& tooltip = std::string(),
+								  S32 vert_offset = 0);
 	static void		drawTrackingArrow(const LLRect& view_rect, S32 x, S32 y, 
 									  const LLColor4& color,
 									  S32 arrow_size = DEFAULT_TRACKING_ARROW_SIZE);
@@ -187,6 +187,8 @@ public:
 
 	typedef std::vector<U64> handle_list_t;
 	handle_list_t mVisibleRegions; // set every frame
+
+	static std::map<std::string,std::string> sStringsMap;
 };
 
 #endif
diff --git a/linden/indra/newview/macview.r b/linden/indra/newview/macview.r
new file mode 100644
index 0000000..8124232
--- /dev/null
+++ b/linden/indra/newview/macview.r
@@ -0,0 +1,123 @@
+/* main.r */
+
+#include <Carbon/Carbon.r>
+#include "macmain.h"
+
+resource 'MBAR' (rMenuBar, preload) {
+        {       /* array MenuArray: 3 elements */
+                /* [1] */
+                128,
+                /* [2] */
+                129,
+                /* [3] */
+                130
+        }
+};
+
+resource 'MENU' (mApple, preload) {
+        128,
+        textMenuProc,
+        0x7FFFFFFD,
+        enabled,
+        apple,
+        {       /* array: 2 elements */
+                /* [1] */
+                "About Second Life", noIcon, noKey, noMark, plain,
+                /* [2] */
+                "-", noIcon, noKey, noMark, plain
+        }
+};
+
+resource 'MENU' (mFile, preload) {
+        129,
+        textMenuProc,
+        0x1400,
+        enabled,
+        "File",
+        {       /* array: 11 elements */
+                /* [1] */
+                "New", noIcon, "N", noMark, plain,
+                /* [2] */
+                "Open", noIcon, "O", noMark, plain,
+                /* [3] */
+                "-", noIcon, noKey, noMark, plain,
+                /* [4] */
+                "Close", noIcon, "W", noMark, plain,
+                /* [5] */
+                "Save", noIcon, "S", noMark, plain,
+                /* [6] */
+                "Save AsÉ", noIcon, noKey, noMark, plain,
+                /* [7] */
+                "-", noIcon, noKey, noMark, plain,
+                /* [8] */
+                "Page SetupÉ", noIcon, noKey, noMark, plain,
+                /* [9] */
+                "PrintÉ", noIcon, noKey, noMark, plain,
+                /* [10] */
+                "-", noIcon, noKey, noMark, plain,
+                /* [11] */
+                "Quit", noIcon, "Q", noMark, plain
+        }
+};
+
+resource 'MENU' (mEdit, preload) {
+        130,
+        textMenuProc,
+        0x0,
+        enabled,
+        "Edit",
+        {       /* array: 6 elements */
+                /* [1] */
+                "Undo", noIcon, "Z", noMark, plain,
+                /* [2] */
+                "-", noIcon, noKey, noMark, plain,
+                /* [3] */
+                "Cut", noIcon, "X", noMark, plain,
+                /* [4] */
+                "Copy", noIcon, "C", noMark, plain,
+                /* [5] */
+                "Paste", noIcon, "V", noMark, plain,
+                /* [6] */
+                "Clear", noIcon, noKey, noMark, plain
+        }
+};
+
+resource 'DITL' (kAboutBox) {
+        {       /* array DITLarray: 3 elements */
+                /* [1] */
+                {16, 21, 38, 208},
+                StaticText {
+                        disabled,
+                        "Hello hello hello..."
+                },
+                /* [2] */
+                {116, 287, 136, 345},
+                Button {
+                        enabled,
+                        "OK"
+                },
+                /* [3] */
+                {54, 139, 74, 197},
+                Button {
+                        enabled,
+                        "OK"
+                }
+        }
+};
+
+resource 'ALRT' (kAboutBox) {
+        {40, 40, 139, 280},
+        200,
+        {       /* array: 4 elements */
+                /* [1] */
+                OK, visible, sound1,
+                /* [2] */
+                OK, visible, sound1,
+                /* [3] */
+                OK, visible, sound1,
+                /* [4] */
+                OK, visible, sound1
+        },
+	noAutoCenter
+};
+
diff --git a/linden/indra/newview/macview.xcodeproj/default.pbxuser b/linden/indra/newview/macview.xcodeproj/default.pbxuser
deleted file mode 100644
index 62e730f..0000000
--- a/linden/indra/newview/macview.xcodeproj/default.pbxuser
+++ /dev/null
@@ -1,183 +0,0 @@
-// !$*UTF8*$!
-{
-	20286C28FDCF999611CA2CEA /* Project object */ = {
-		activeBuildConfigurationName = Development;
-		activeExecutable = E3C7DAB60CFF871100AD076D /* newview */;
-		activeTarget = 5503B89E05446B1F003D051F /* newview */;
-		breakpointsGroup = E3C7DAE10CFF885000AD076D /* XCBreakpointsBucket */;
-		codeSenseManager = E3C7DAC70CFF874400AD076D /* Code sense */;
-		executables = (
-			E3C7DAB40CFF871100AD076D /* AutoUpdater */,
-			E3C7DAB50CFF871100AD076D /* crashreporter */,
-			E3C7DAB60CFF871100AD076D /* newview */,
-		);
-		perUserDictionary = {
-			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					243,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					200,
-					131,
-					20,
-					48.1626,
-					43,
-					43,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXTargetDataSource_PrimaryAttribute,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-				);
-			};
-			PBXPerProjectTemplateStateSaveDate = 218073202;
-			PBXWorkspaceStateSaveDate = 218073202;
-		};
-		sourceControlManager = E3C7DAC60CFF874400AD076D /* Source Control */;
-		userBuildSettings = {
-		};
-	};
-	5503B89E05446B1F003D051F /* newview */ = {
-		activeExec = 0;
-		executables = (
-			E3C7DAB60CFF871100AD076D /* newview */,
-		);
-	};
-	9932ED1E056C1F0900554101 /* crashreporter */ = {
-		activeExec = 0;
-		executables = (
-			E3C7DAB50CFF871100AD076D /* crashreporter */,
-		);
-	};
-	9967E9080B37533F0087BD1B /* fmodwrapper */ = {
-		activeExec = 0;
-	};
-	99CDED4905E70BAB0000F8AA /* llcommon */ = {
-		activeExec = 0;
-	};
-	99D5703205BDEFD7004DE704 /* AutoUpdater */ = {
-		activeExec = 0;
-		executables = (
-			E3C7DAB40CFF871100AD076D /* AutoUpdater */,
-		);
-	};
-	D64593550B3B4D7D00FAB68F /* llkdu */ = {
-		activeExec = 0;
-	};
-	E3C7DAB40CFF871100AD076D /* AutoUpdater */ = {
-		isa = PBXExecutable;
-		activeArgIndex = 2147483647;
-		activeArgIndices = (
-		);
-		argumentStrings = (
-		);
-		autoAttachOnCrash = 1;
-		configStateDict = {
-		};
-		customDataFormattersEnabled = 1;
-		debuggerPlugin = GDBDebugging;
-		disassemblyDisplayState = 0;
-		enableDebugStr = 1;
-		environmentEntries = (
-		);
-		executableSystemSymbolLevel = 0;
-		executableUserSymbolLevel = 0;
-		libgmallocEnabled = 0;
-		name = AutoUpdater;
-		sourceDirectories = (
-		);
-	};
-	E3C7DAB50CFF871100AD076D /* crashreporter */ = {
-		isa = PBXExecutable;
-		activeArgIndex = 2147483647;
-		activeArgIndices = (
-		);
-		argumentStrings = (
-		);
-		autoAttachOnCrash = 1;
-		configStateDict = {
-		};
-		customDataFormattersEnabled = 1;
-		debuggerPlugin = GDBDebugging;
-		disassemblyDisplayState = 0;
-		enableDebugStr = 1;
-		environmentEntries = (
-		);
-		executableSystemSymbolLevel = 0;
-		executableUserSymbolLevel = 0;
-		libgmallocEnabled = 0;
-		name = crashreporter;
-		sourceDirectories = (
-		);
-	};
-	E3C7DAB60CFF871100AD076D /* newview */ = {
-		isa = PBXExecutable;
-		activeArgIndex = 2147483647;
-		activeArgIndices = (
-		);
-		argumentStrings = (
-		);
-		autoAttachOnCrash = 1;
-		configStateDict = {
-		};
-		customDataFormattersEnabled = 1;
-		debuggerPlugin = GDBDebugging;
-		disassemblyDisplayState = 0;
-		enableDebugStr = 1;
-		environmentEntries = (
-		);
-		executableSystemSymbolLevel = 0;
-		executableUserSymbolLevel = 0;
-		libgmallocEnabled = 0;
-		name = newview;
-		sourceDirectories = (
-		);
-	};
-	E3C7DAC60CFF874400AD076D /* Source Control */ = {
-		isa = PBXSourceControlManager;
-		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 0;
-		scmConfiguration = {
-		};
-		scmType = "";
-	};
-	E3C7DAC70CFF874400AD076D /* Code sense */ = {
-		isa = PBXCodeSenseManager;
-		indexTemplatePath = "";
-	};
-	E3C7DAE10CFF885000AD076D /* XCBreakpointsBucket */ = {
-		isa = XCBreakpointsBucket;
-		name = "Project Breakpoints";
-		objects = (
-		);
-	};
-	FD53B40509BDF9F600BFE3BC /* third party libs */ = {
-		activeExec = 0;
-	};
-}
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
deleted file mode 100644
index 46ee787..0000000
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,6200 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		FD53B40509BDF9F600BFE3BC /* third party libs */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = FD53B40609BDFA1500BFE3BC /* Build configuration list for PBXAggregateTarget "third party libs" */;
-			buildPhases = (
-				FD53B40409BDF9F600BFE3BC /* ShellScript */,
-			);
-			dependencies = (
-			);
-			name = "third party libs";
-			productName = "third party libs";
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		0633E5D209E341F500712406 /* llfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0633E5D009E341F500712406 /* llfile.cpp */; };
-		0633E5D509E3421500712406 /* llstreamtools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0633E5D309E3421500712406 /* llstreamtools.cpp */; };
-		07167BBC0DCA8059003FE31D /* llrender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07167BBA0DCA8059003FE31D /* llrender.cpp */; };
-		1A02016F0B7A85DE00D5C589 /* llbase64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02016D0B7A85DE00D5C589 /* llbase64.cpp */; };
-		1A0201850B7A861200D5C589 /* llblowfishcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02017E0B7A861200D5C589 /* llblowfishcipher.cpp */; };
-		1A0201860B7A861200D5C589 /* llnullcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0201810B7A861200D5C589 /* llnullcipher.cpp */; };
-		1A0201870B7A861200D5C589 /* llxorcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0201830B7A861200D5C589 /* llxorcipher.cpp */; };
-		1A0DA5130C3AC07800361F49 /* llviewerjointmesh_vec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DA5100C3AC07700361F49 /* llviewerjointmesh_vec.cpp */; };
-		1A0DA5140C3AC07800361F49 /* llviewerjointmesh_sse2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DA5110C3AC07700361F49 /* llviewerjointmesh_sse2.cpp */; };
-		1A0DA5150C3AC07800361F49 /* llviewerjointmesh_sse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0DA5120C3AC07700361F49 /* llviewerjointmesh_sse.cpp */; };
-		1A1C61620847AEE6005D7227 /* llvolumemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C615E0847AEE6005D7227 /* llvolumemgr.cpp */; };
-		1A1C61630847AEE6005D7227 /* llvolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C615F0847AEE6005D7227 /* llvolume.cpp */; };
-		1A1C61760847B307005D7227 /* llvolumemessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C61740847B307005D7227 /* llvolumemessage.cpp */; };
-		1A1F130C0B3919F100845A6C /* lleditmenuhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1F130B0B3919F100845A6C /* lleditmenuhandler.cpp */; };
-		1A47B8E00860FDF100F73746 /* llpanelweb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A47B8DE0860FDF100F73746 /* llpanelweb.cpp */; };
-		1A5104450ABF5B5A00520F6D /* llnotecard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5104440ABF5B5A00520F6D /* llnotecard.cpp */; };
-		1A5104570ABF60A800520F6D /* llviewerassetstorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5104560ABF60A800520F6D /* llviewerassetstorage.cpp */; };
-		1A531BFC0D81056E00DEB305 /* llfloatercamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A531BFB0D81056E00DEB305 /* llfloatercamera.cpp */; };
-		1A5B3B550A70147000A90391 /* llfloaterbump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B3B540A70147000A90391 /* llfloaterbump.cpp */; };
-		1A61A7F00A5ED446009FE3D2 /* llfloateravatarpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A61A7EF0A5ED446009FE3D2 /* llfloateravatarpicker.cpp */; };
-		1A758C920A436FCA00589675 /* llagentdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A758C910A436FCA00589675 /* llagentdata.cpp */; };
-		1A758C940A436FD800589675 /* llpanellandobjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A758C930A436FD800589675 /* llpanellandobjects.cpp */; };
-		1A758C960A436FDE00589675 /* llpanellandoptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A758C950A436FDE00589675 /* llpanellandoptions.cpp */; };
-		1A83767E0BA2169600F28979 /* llviewergenericmessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A83767D0BA2169600F28979 /* llviewergenericmessage.cpp */; };
-		1A8870D50BCC5A6300E89AA6 /* llinventorytype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8870D40BCC5A6300E89AA6 /* llinventorytype.cpp */; };
-		1A8870E50BCC5A9500E89AA6 /* llviewermenufile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8870E40BCC5A9500E89AA6 /* llviewermenufile.cpp */; };
-		1A89230508B12D1000A04AA9 /* llurlwhitelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A89230308B12D1000A04AA9 /* llurlwhitelist.cpp */; };
-		1A89230808B12D2E00A04AA9 /* llfloateropenobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A89230608B12D2E00A04AA9 /* llfloateropenobject.cpp */; };
-		1A97C4560B8BCF9C00331A24 /* llliveappconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */; };
-		1A9897E90B98E2F4005C45D7 /* llbase32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9897E80B98E2F4005C45D7 /* llbase32.cpp */; };
-		1A9EC237083EA0100023D510 /* llfloatereditui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9EC236083EA0100023D510 /* llfloatereditui.cpp */; };
-		1AA2EE9E0CBBE2790017E185 /* llfloaterlandmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA2EE9D0CBBE2790017E185 /* llfloaterlandmark.cpp */; };
-		1AA2EEA10CBBE28C0017E185 /* llclassifiedstatsresponder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA2EEA00CBBE28C0017E185 /* llclassifiedstatsresponder.cpp */; };
-		1AA2EEA40CBBE2BF0017E185 /* llfloaterurldisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA2EEA30CBBE2BF0017E185 /* llfloaterurldisplay.cpp */; };
-		1AA2EEA70CBBE2D40017E185 /* llremoteparcelrequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA2EEA60CBBE2D40017E185 /* llremoteparcelrequest.cpp */; };
-		1AD394100CAB000F004BA76A /* llurlsimstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3940E0CAB000F004BA76A /* llurlsimstring.cpp */; };
-		1AD394110CAB000F004BA76A /* llurldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3940F0CAB000F004BA76A /* llurldispatcher.cpp */; };
-		1AD394130CAB001B004BA76A /* llcommandhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD394120CAB001B004BA76A /* llcommandhandler.cpp */; };
-		1AD61F6B0AC09B1900507FB9 /* llimview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD61F6A0AC09B1900507FB9 /* llimview.cpp */; };
-		1ADE58940D7CCF6000183F7F /* llfloaterhud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADE58920D7CCF6000183F7F /* llfloaterhud.cpp */; };
-		1AE0820F0DA708E900575141 /* llanimstatelabels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE082090DA708E900575141 /* llanimstatelabels.cpp */; };
-		1AE082100DA708E900575141 /* llstylemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE0820B0DA708E900575141 /* llstylemap.cpp */; };
-		1AE082110DA708E900575141 /* lltrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE0820D0DA708E900575141 /* lltrans.cpp */; };
-		1AE5D7120844FBD300278605 /* llwebbrowserctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE5D7100844FBD300278605 /* llwebbrowserctrl.cpp */; };
-		1AEF0A580B2DFE67003F107C /* llctrlselectioninterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEF0A560B2DFE67003F107C /* llctrlselectioninterface.cpp */; };
-		1AEF0A5B0B2DFE72003F107C /* llrootview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEF0A5A0B2DFE72003F107C /* llrootview.cpp */; };
-		1AF7C1E40AF6C44800C4BF4A /* llweb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF7C1E30AF6C44800C4BF4A /* llweb.cpp */; };
-		1AF9CA470AE972DA003EFF2D /* llfloateravatartextures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF9CA460AE972DA003EFF2D /* llfloateravatartextures.cpp */; };
-		1AFA409C0A2DFC7F00C13F70 /* llviewernetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3143D00A02B701005B87E7 /* llviewernetwork.cpp */; };
-		1AFA409F0A2DFC8700C13F70 /* llprefsim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3143DE0A02B737005B87E7 /* llprefsim.cpp */; };
-		1AFA40A20A2DFC9000C13F70 /* llprefschat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3143E00A02B73D005B87E7 /* llprefschat.cpp */; };
-		1AFA40A50A2DFC9400C13F70 /* llfloatertest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8BF3780A1AAB99005B9D5A /* llfloatertest.cpp */; };
-		1AFA40B50A2DFD7200C13F70 /* llsavedsettingsglue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA40B40A2DFD7200C13F70 /* llsavedsettingsglue.cpp */; };
-		1C0D59510CF0B2B800222B10 /* libboost_regex-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0D59500CF0B2B800222B10 /* libboost_regex-mt.a */; };
-		1CBB67D80C7CCCB2007DAAAE /* llfloaterwater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CBB67D20C7CCCB2007DAAAE /* llfloaterwater.cpp */; };
-		1CBB67D90C7CCCB2007DAAAE /* llwaterparammanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CBB67D40C7CCCB2007DAAAE /* llwaterparammanager.cpp */; };
-		1CBB67DA0C7CCCB2007DAAAE /* llwaterparamset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CBB67D60C7CCCB2007DAAAE /* llwaterparamset.cpp */; };
-		1CFFA2D60C90472B000CF7DD /* llfloaterenvsettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CFFA2D40C90472B000CF7DD /* llfloaterenvsettings.cpp */; };
-		1CFFA2ED0C9048D7000CF7DD /* llrendertarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CFFA2EB0C9048D7000CF7DD /* llrendertarget.cpp */; };
-		2613A6DA05D843D80041A7A9 /* llfloatersnapshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2613A6D905D843D80041A7A9 /* llfloatersnapshot.cpp */; };
-		26C5F3E705DB1E3D00994065 /* llfloaterpostcard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26C5F3E605DB1E3C00994065 /* llfloaterpostcard.cpp */; };
-		299F95C00ADDE5D000C94EEF /* llviewquery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299F95BE0ADDE5D000C94EEF /* llviewquery.cpp */; };
-		299F95C10ADDE5D000C94EEF /* llviewquery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299F95BE0ADDE5D000C94EEF /* llviewquery.cpp */; };
-		2E6FE91009FD56DB00AF02FF /* llpanelgroupnotices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E6FE90D09FD560A00AF02FF /* llpanelgroupnotices.cpp */; };
-		2EA4CF0809F8531C008F60F7 /* llpanelgrouplandmoney.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA4CEED09F83BE8008F60F7 /* llpanelgrouplandmoney.cpp */; };
-		2EA4CF0909F8531C008F60F7 /* llpanelgrouproles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EA4CEEC09F83AC2008F60F7 /* llpanelgrouproles.cpp */; };
-		2EFEA8E909F4556F00CB0193 /* llgroupnotify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EFEA8E809F4556F00CB0193 /* llgroupnotify.cpp */; };
-		2EFEA8EC09F455B900CB0193 /* llpanelgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EFEA8EB09F455B900CB0193 /* llpanelgroup.cpp */; };
-		2EFEA8F109F4588B00CB0193 /* llpanelgroupgeneral.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EFEA8F009F4588B00CB0193 /* llpanelgroupgeneral.cpp */; };
-		3834D6050B73ABC1002B61C8 /* llmessagereader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3834D6010B73ABC1002B61C8 /* llmessagereader.cpp */; };
-		3834D6060B73ABC1002B61C8 /* lltemplatemessagereader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3834D6030B73ABC1002B61C8 /* lltemplatemessagereader.cpp */; };
-		38D0FA6C0B4BF898003323BA /* lltemplatemessagebuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D0FA690B4BF897003323BA /* lltemplatemessagebuilder.cpp */; };
-		38D0FA6D0B4BF898003323BA /* llmessagetemplate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D0FA6A0B4BF898003323BA /* llmessagetemplate.cpp */; };
-		38D0FA6E0B4BF898003323BA /* llmessagebuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D0FA6B0B4BF898003323BA /* llmessagebuilder.cpp */; };
-		5503BB1205446B20003D051F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
-		5503BB1E05446B20003D051F /* llgenepool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529A1051F61DF00A80050 /* llgenepool.cpp */; };
-		5503BB1F05446B20003D051F /* llviewercamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529A2051F61DF00A80050 /* llviewercamera.cpp */; };
-		5503BB2205446B20003D051F /* llvelocitybar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529A5051F61DF00A80050 /* llvelocitybar.cpp */; };
-		5503BB2405446B20003D051F /* llpanelcontents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529A7051F61DF00A80050 /* llpanelcontents.cpp */; };
-		5503BB2605446B20003D051F /* llmanip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529A9051F61DF00A80050 /* llmanip.cpp */; };
-		5503BB2A05446B20003D051F /* lltoolplacer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529AD051F61DF00A80050 /* lltoolplacer.cpp */; };
-		5503BB2B05446B20003D051F /* lltoolpie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529AE051F61DF00A80050 /* lltoolpie.cpp */; };
-		5503BB2C05446B20003D051F /* lltoolbrush.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529B0051F61DF00A80050 /* lltoolbrush.cpp */; };
-		5503BB2E05446B20003D051F /* llstatgraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529B2051F61DF00A80050 /* llstatgraph.cpp */; };
-		5503BB2F05446B20003D051F /* llstatbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529B3051F61DF00A80050 /* llstatbar.cpp */; };
-		5503BB3405446B20003D051F /* pipeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529BA051F61DF00A80050 /* pipeline.cpp */; };
-		5503BB3705446B20003D051F /* noise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529BD051F61DF00A80050 /* noise.cpp */; };
-		5503BB3905446B20003D051F /* llworldmapview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529BF051F61DF00A80050 /* llworldmapview.cpp */; };
-		5503BB3A05446B20003D051F /* llworldmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C0051F61DF00A80050 /* llworldmap.cpp */; };
-		5503BB3B05446B20003D051F /* llworld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C1051F61DF00A80050 /* llworld.cpp */; };
-		5503BB3C05446B20003D051F /* llwind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C2051F61DF00A80050 /* llwind.cpp */; };
-		5503BB3D05446B20003D051F /* llwearablelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C3051F61DF00A80050 /* llwearablelist.cpp */; };
-		5503BB3E05446B20003D051F /* llwearable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C4051F61DF00A80050 /* llwearable.cpp */; };
-		5503BB4005446B20003D051F /* llvowater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C6051F61DF00A80050 /* llvowater.cpp */; };
-		5503BB4105446B20003D051F /* llvovolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C7051F61DF00A80050 /* llvovolume.cpp */; };
-		5503BB4305446B20003D051F /* llvotree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C9051F61DF00A80050 /* llvotree.cpp */; };
-		5503BB4405446B20003D051F /* llvotextbubble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CA051F61DF00A80050 /* llvotextbubble.cpp */; };
-		5503BB4505446B20003D051F /* llvosurfacepatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CB051F61DF00A80050 /* llvosurfacepatch.cpp */; };
-		5503BB4605446B20003D051F /* llvosky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CC051F61DF00A80050 /* llvosky.cpp */; };
-		5503BB4705446B20003D051F /* llvopartgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CD051F61DF00A80050 /* llvopartgroup.cpp */; };
-		5503BB4905446B20003D051F /* llvoground.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CF051F61DF00A80050 /* llvoground.cpp */; };
-		5503BB4A05446B20003D051F /* llvograss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D0051F61DF00A80050 /* llvograss.cpp */; };
-		5503BB4B05446B20003D051F /* llvoclouds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D1051F61DF00A80050 /* llvoclouds.cpp */; };
-		5503BB4C05446B20003D051F /* llvocache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D2051F61DF00A80050 /* llvocache.cpp */; };
-		5503BB4D05446B20003D051F /* llvoavatar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D3051F61DF00A80050 /* llvoavatar.cpp */; };
-		5503BB4E05446B20003D051F /* llvlmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D4051F61DF00A80050 /* llvlmanager.cpp */; };
-		5503BB4F05446B20003D051F /* llvlcomposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D5051F61DF00A80050 /* llvlcomposition.cpp */; };
-		5503BB5005446B20003D051F /* llviewerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D6051F61DF00A80050 /* llviewerwindow.cpp */; };
-		5503BB5105446B20003D051F /* llviewervisualparam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D7051F61DF00A80050 /* llviewervisualparam.cpp */; };
-		5503BB5205446B20003D051F /* llviewerthrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D8051F61DF00A80050 /* llviewerthrottle.cpp */; };
-		5503BB5305446B20003D051F /* llviewertextureanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D9051F61DF00A80050 /* llviewertextureanim.cpp */; };
-		5503BB5405446B20003D051F /* llviewerstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529DA051F61DF00A80050 /* llviewerstats.cpp */; };
-		5503BB5605446B20003D051F /* llviewerregion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529DC051F61DF00A80050 /* llviewerregion.cpp */; };
-		5503BB5705446B20003D051F /* llviewerpartsource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529DD051F61DF00A80050 /* llviewerpartsource.cpp */; };
-		5503BB5805446B20003D051F /* llviewerpartsim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529DE051F61DF00A80050 /* llviewerpartsim.cpp */; };
-		5503BB5905446B20003D051F /* llviewerparceloverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529DF051F61DF00A80050 /* llviewerparceloverlay.cpp */; };
-		5503BB5A05446B20003D051F /* llviewerparcelmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E0051F61DF00A80050 /* llviewerparcelmgr.cpp */; };
-		5503BB5B05446B20003D051F /* llviewerobjectlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E1051F61DF00A80050 /* llviewerobjectlist.cpp */; };
-		5503BB5C05446B20003D051F /* llviewerobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E2051F61DF00A80050 /* llviewerobject.cpp */; };
-		5503BB5D05446B20003D051F /* llviewermessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E3051F61DF00A80050 /* llviewermessage.cpp */; };
-		5503BB5E05446B20003D051F /* llviewermenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E4051F61DF00A80050 /* llviewermenu.cpp */; };
-		5503BB5F05446B20003D051F /* llsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E5051F61DF00A80050 /* llsprite.cpp */; };
-		5503BB6105446B20003D051F /* llrendersphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E7051F61DF00A80050 /* llrendersphere.cpp */; };
-		5503BB6305446B20003D051F /* llpreviewtexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E9051F61DF00A80050 /* llpreviewtexture.cpp */; };
-		5503BB6405446B20003D051F /* llpreviewsound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529EA051F61DF00A80050 /* llpreviewsound.cpp */; };
-		5503BB6505446B20003D051F /* llspatialpartition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529EB051F61DF00A80050 /* llspatialpartition.cpp */; };
-		5503BB6705446B20003D051F /* llpanelland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529ED051F61DF00A80050 /* llpanelland.cpp */; };
-		5503BB6805446B20003D051F /* llpanelinventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529EE051F61DF00A80050 /* llpanelinventory.cpp */; };
-		5503BB6905446B20003D051F /* lldrawpoolterrain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529EF051F61DF00A80050 /* lldrawpoolterrain.cpp */; };
-		5503BB6A05446B20003D051F /* llcallbacklist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529F0051F61DF00A80050 /* llcallbacklist.cpp */; };
-		5503BB6C05446B20003D051F /* llpolymorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529F2051F61DF00A80050 /* llpolymorph.cpp */; };
-		5503BB6D05446B20003D051F /* llpolymesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529F3051F61DF00A80050 /* llpolymesh.cpp */; };
-		5503BB6E05446B20003D051F /* lltoolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529F4051F61DF00A80050 /* lltoolbar.cpp */; };
-		5503BB6F05446B20003D051F /* lltool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529F5051F61DF00A80050 /* lltool.cpp */; };
-		5503BB7005446B20003D051F /* lltextureview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529F6051F61DF00A80050 /* lltextureview.cpp */; };
-		5503BB7205446B20003D051F /* llinventorymodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529F8051F61DF00A80050 /* llinventorymodel.cpp */; };
-		5503BB7405446B20003D051F /* lltoolview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529FA051F61DF00A80050 /* lltoolview.cpp */; };
-		5503BB7505446B20003D051F /* lltoolselectrect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529FB051F61DF00A80050 /* lltoolselectrect.cpp */; };
-		5503BB7605446B20003D051F /* lltoolselectland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529FC051F61DF00A80050 /* lltoolselectland.cpp */; };
-		5503BB7705446B20003D051F /* llpanelgeneral.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529FD051F61DF00A80050 /* llpanelgeneral.cpp */; };
-		5503BB7905446B20003D051F /* llpaneldirbrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529FF051F61DF00A80050 /* llpaneldirbrowser.cpp */; };
-		5503BB7C05446B20003D051F /* llfloaterchat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A02051F61DF00A80050 /* llfloaterchat.cpp */; };
-		5503BB7D05446B20003D051F /* llconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A03051F61DF00A80050 /* llconsole.cpp */; };
-		5503BB7E05446B20003D051F /* lllandmarklist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A04051F61DF00A80050 /* lllandmarklist.cpp */; };
-		5503BB7F05446B20003D051F /* llfloaterbuildoptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A05051F61DF00A80050 /* llfloaterbuildoptions.cpp */; };
-		5503BB8605446B20003D051F /* lluserauth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A0C051F61DF00A80050 /* lluserauth.cpp */; };
-		5503BB8705446B20003D051F /* llurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A0D051F61DF00A80050 /* llurl.cpp */; };
-		5503BB8805446B20003D051F /* lluploaddialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A0E051F61DF00A80050 /* lluploaddialog.cpp */; };
-		5503BB8B05446B20003D051F /* lltoolindividual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A11051F61DF00A80050 /* lltoolindividual.cpp */; };
-		5503BB8C05446B20003D051F /* lltoolgun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A12051F61DF00A80050 /* lltoolgun.cpp */; };
-		5503BB8D05446B20003D051F /* lltoolgrab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A13051F61DF00A80050 /* lltoolgrab.cpp */; };
-		5503BB8E05446B20003D051F /* lldrawpoolsky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A14051F61DF00A80050 /* lldrawpoolsky.cpp */; };
-		5503BB9105446B20003D051F /* llfloaterland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A17051F61DF00A80050 /* llfloaterland.cpp */; };
-		5503BB9205446B20003D051F /* llpanelface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A18051F61DF00A80050 /* llpanelface.cpp */; };
-		5503BB9305446B20003D051F /* llpanelevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A19051F61DF00A80050 /* llpanelevent.cpp */; };
-		5503BB9805446B20003D051F /* llframestatview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A1E051F61DF00A80050 /* llframestatview.cpp */; };
-		5503BB9905446B20003D051F /* llframestats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A1F051F61DF00A80050 /* llframestats.cpp */; };
-		5503BB9E05446B20003D051F /* llhudobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A24051F61DF00A80050 /* llhudobject.cpp */; };
-		5503BB9F05446B20003D051F /* llhudmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A25051F61DF00A80050 /* llhudmanager.cpp */; };
-		5503BBA005446B20003D051F /* lldrawpoolalpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A26051F61DF00A80050 /* lldrawpoolalpha.cpp */; };
-		5503BBA205446B20003D051F /* lltexturectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A28051F61DF00A80050 /* lltexturectrl.cpp */; };
-		5503BBA405446B20003D051F /* llpanelobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A2A051F61DF00A80050 /* llpanelobject.cpp */; };
-		5503BBA505446B20003D051F /* llpanelnetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A2B051F61DF00A80050 /* llpanelnetwork.cpp */; };
-		5503BBA605446B20003D051F /* lldrawpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A2C051F61DF00A80050 /* lldrawpool.cpp */; };
-		5503BBA905446B20003D051F /* llviewerinventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A2F051F61DF00A80050 /* llviewerinventory.cpp */; };
-		5503BBAA05446B20003D051F /* llviewerimagelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A30051F61DF00A80050 /* llviewerimagelist.cpp */; };
-		5503BBAB05446B20003D051F /* llviewerimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A31051F61DF00A80050 /* llviewerimage.cpp */; };
-		5503BBAC05446B20003D051F /* llviewergesture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A32051F61DF00A80050 /* llviewergesture.cpp */; };
-		5503BBAD05446B20003D051F /* llbbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A33051F61DF00A80050 /* llbbox.cpp */; };
-		5503BBAE05446B20003D051F /* llfloatercustomize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A34051F61DF00A80050 /* llfloatercustomize.cpp */; };
-		5503BBAF05446B20003D051F /* llviewerlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A35051F61DF00A80050 /* llviewerlayer.cpp */; };
-		5503BBB105446B20003D051F /* llviewerjointmesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A37051F61DF00A80050 /* llviewerjointmesh.cpp */; settings = {COMPILER_FLAGS = "-O0"; }; };
-		5503BBB205446B20003D051F /* llviewerjointattachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A38051F61DF00A80050 /* llviewerjointattachment.cpp */; };
-		5503BBB305446B20003D051F /* llviewerjoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A39051F61DF00A80050 /* llviewerjoint.cpp */; };
-		5503BBB405446B20003D051F /* llface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A3A051F61DF00A80050 /* llface.cpp */; };
-		5503BBB505446B20003D051F /* llcloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A3B051F61DF00A80050 /* llcloud.cpp */; };
-		5503BBB705446B20003D051F /* llhudview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A3D051F61DF00A80050 /* llhudview.cpp */; };
-		5503BBB805446B20003D051F /* llhudtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A3E051F61DF00A80050 /* llhudtext.cpp */; };
-		5503BBB905446B20003D051F /* llmaniprotate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A40051F61DF00A80050 /* llmaniprotate.cpp */; };
-		5503BBBA05446B20003D051F /* llagent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A41051F61DF00A80050 /* llagent.cpp */; };
-		5503BBBB05446B20003D051F /* llsurfacepatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A42051F61DF00A80050 /* llsurfacepatch.cpp */; };
-		5503BBBC05446B20003D051F /* llsurface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A43051F61DF00A80050 /* llsurface.cpp */; };
-		5503BBBE05446B20003D051F /* llpaneldirgroups.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A45051F61DF00A80050 /* llpaneldirgroups.cpp */; };
-		5503BBC005446B20003D051F /* llpaneldisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A47051F61DF00A80050 /* llpaneldisplay.cpp */; };
-		5503BBC705446B20003D051F /* lltracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A4E051F61DF00A80050 /* lltracker.cpp */; };
-		5503BBC905446B20003D051F /* llhudeffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A51051F61DF00A80050 /* llhudeffect.cpp */; };
-		5503BBCB05446B20003D051F /* lldrawpoolbump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A53051F61DF00A80050 /* lldrawpoolbump.cpp */; };
-		5503BBCC05446B20003D051F /* llpaneldebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A54051F61DF00A80050 /* llpaneldebug.cpp */; };
-		5503BBCE05446B20003D051F /* llfloaterdirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A56051F61DF00A80050 /* llfloaterdirectory.cpp */; };
-		5503BBCF05446B20003D051F /* llinventoryclipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A57051F61DF00A80050 /* llinventoryclipboard.cpp */; };
-		5503BBD205446B20003D051F /* llpanelmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A5A051F61DF00A80050 /* llpanelmorph.cpp */; };
-		5503BBD305446B20003D051F /* llfloaterproperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A5B051F61DF00A80050 /* llfloaterproperties.cpp */; };
-		5503BBD405446B20003D051F /* llhudrender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A5C051F61DF00A80050 /* llhudrender.cpp */; };
-		5503BBD505446B20003D051F /* llagentpilot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A5D051F61DF00A80050 /* llagentpilot.cpp */; };
-		5503BBD605446B20003D051F /* lldrawpoolavatar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A5E051F61DF00A80050 /* lldrawpoolavatar.cpp */; };
-		5503BBD705446B20003D051F /* llpatchvertexarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A5F051F61DF00A80050 /* llpatchvertexarray.cpp */; };
-		5503BBDA05446B20003D051F /* llemote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A62051F61DF00A80050 /* llemote.cpp */; };
-		5503BBDB05446B20003D051F /* llfloatergesture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A63051F61DF00A80050 /* llfloatergesture.cpp */; };
-		5503BBDC05446B20003D051F /* lldrawable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A64051F61DF00A80050 /* lldrawable.cpp */; };
-		5503BBDD05446B20003D051F /* llhudeffecttrail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A65051F61DF00A80050 /* llhudeffecttrail.cpp */; };
-		5503BBDE05446B20003D051F /* llfloatermute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A66051F61DF00A80050 /* llfloatermute.cpp */; };
-		5503BBDF05446B20003D051F /* llmorphview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A67051F61DF00A80050 /* llmorphview.cpp */; };
-		5503BBE105446B20003D051F /* llfloaterworldmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A69051F61DF00A80050 /* llfloaterworldmap.cpp */; };
-		5503BBE305446B20003D051F /* llfloaterpreference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A6B051F61DF00A80050 /* llfloaterpreference.cpp */; };
-		5503BBE505446B20003D051F /* lltoolobjpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A6D051F61DF00A80050 /* lltoolobjpicker.cpp */; };
-		5503BBE605446B20003D051F /* lltoolmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A6E051F61DF00A80050 /* lltoolmorph.cpp */; };
-		5503BBE705446B20003D051F /* lltoolmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A6F051F61DF00A80050 /* lltoolmgr.cpp */; };
-		5503BBE905446B20003D051F /* llfloatergroupinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A71051F61DF00A80050 /* llfloatergroupinfo.cpp */; };
-		5503BBEA05446B20003D051F /* llpreviewscript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A72051F61DF00A80050 /* llpreviewscript.cpp */; };
-		5503BBEB05446B20003D051F /* llpreviewnotecard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A73051F61DF00A80050 /* llpreviewnotecard.cpp */; };
-		5503BBEC05446B20003D051F /* lltoolfocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A74051F61DF00A80050 /* lltoolfocus.cpp */; };
-		5503BBED05446B20003D051F /* lltoolface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A75051F61DF00A80050 /* lltoolface.cpp */; };
-		5503BBEE05446B20003D051F /* lltooldraganddrop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A76051F61DF00A80050 /* lltooldraganddrop.cpp */; };
-		5503BBEF05446B20003D051F /* lltoolcomp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A77051F61DF00A80050 /* lltoolcomp.cpp */; };
-		5503BBF005446B20003D051F /* llcontainerview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A78051F61DF00A80050 /* llcontainerview.cpp */; };
-		5503BBF305446B20003D051F /* lldrawpooltree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A7B051F61DF00A80050 /* lldrawpooltree.cpp */; };
-		5503BBF605446B20003D051F /* llfloatergroups.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A7E051F61DF00A80050 /* llfloatergroups.cpp */; };
-		5503BBFA05446B20003D051F /* llfloaterabout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A82051F61DF00A80050 /* llfloaterabout.cpp */; };
-		5503BBFB05446B20003D051F /* llcolorswatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A83051F61DF00A80050 /* llcolorswatch.cpp */; };
-		5503BBFC05446B20003D051F /* lldriverparam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A84051F61DF00A80050 /* lldriverparam.cpp */; };
-		5503BBFD05446B20003D051F /* llhoverview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A85051F61DF00A80050 /* llhoverview.cpp */; };
-		5503BBFE05446B20003D051F /* llcylinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A86051F61DF00A80050 /* llcylinder.cpp */; };
-		5503BBFF05446B20003D051F /* llhippo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A87051F61DF00A80050 /* llhippo.cpp */; };
-		5503BC0305446B20003D051F /* llfloateravatarinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8B051F61DF00A80050 /* llfloateravatarinfo.cpp */; };
-		5503BC0405446B20003D051F /* llcallingcard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8C051F61DF00A80050 /* llcallingcard.cpp */; };
-		5503BC0505446B20003D051F /* llhudeffectbeam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8D051F61DF00A80050 /* llhudeffectbeam.cpp */; };
-		5503BC0605446B20003D051F /* llfloatertos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8E051F61DF00A80050 /* llfloatertos.cpp */; };
-		5503BC0705446B20003D051F /* llfloatertools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8F051F61DF00A80050 /* llfloatertools.cpp */; };
-		5503BC0805446B20003D051F /* llpaneldirfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A90051F61DF00A80050 /* llpaneldirfind.cpp */; };
-		5503BC0905446B20003D051F /* llpaneldirevents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A91051F61DF00A80050 /* llpaneldirevents.cpp */; };
-		5503BC0B05446B20003D051F /* llstatview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A93051F61DF00A80050 /* llstatview.cpp */; };
-		5503BC0C05446B20003D051F /* llstatusbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A94051F61DF00A80050 /* llstatusbar.cpp */; };
-		5503BC0D05446B20003D051F /* lldrawpoolground.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A95051F61DF00A80050 /* lldrawpoolground.cpp */; };
-		5503BC0F05446B20003D051F /* llnetmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A97051F61DF00A80050 /* llnetmap.cpp */; };
-		5503BC1005446B20003D051F /* llnamelistctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A98051F61DF00A80050 /* llnamelistctrl.cpp */; };
-		5503BC1205446B20003D051F /* llmaniptranslate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9A051F61DF00A80050 /* llmaniptranslate.cpp */; };
-		5503BC1305446B20003D051F /* llmanipscale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9B051F61DF00A80050 /* llmanipscale.cpp */; };
-		5503BC1705446B20003D051F /* llfloaternamedesc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9F051F61DF00A80050 /* llfloaternamedesc.cpp */; };
-		5503BC1805446B20003D051F /* llpanelplace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA0051F61DF00A80050 /* llpanelplace.cpp */; };
-		5503BC1905446B20003D051F /* llpanelpermissions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA1051F61DF00A80050 /* llpanelpermissions.cpp */; };
-		5503BC1A05446B20003D051F /* lldebugview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA2051F61DF00A80050 /* lldebugview.cpp */; };
-		5503BC1B05446B20003D051F /* llpaneldirplaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA3051F61DF00A80050 /* llpaneldirplaces.cpp */; };
-		5503BC1C05446B20003D051F /* llpaneldirpeople.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA4051F61DF00A80050 /* llpaneldirpeople.cpp */; };
-		5503BC1D05446B20003D051F /* llfolderview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA5051F61DF00A80050 /* llfolderview.cpp */; };
-		5503BC1E05446B20003D051F /* llglsandbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA6051F61DF00A80050 /* llglsandbox.cpp */; };
-		5503BC1F05446B20003D051F /* llgivemoney.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA7051F61DF00A80050 /* llgivemoney.cpp */; };
-		5503BC2005446B20003D051F /* llcompass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA8051F61DF00A80050 /* llcompass.cpp */; };
-		5503BC2105446B20003D051F /* llcolorscheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA9051F61DF00A80050 /* llcolorscheme.cpp */; };
-		5503BC2205446B20003D051F /* llmutelist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AAA051F61DF00A80050 /* llmutelist.cpp */; };
-		5503BC2305446B20003D051F /* llmoveview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AAB051F61DF00A80050 /* llmoveview.cpp */; };
-		5503BC2505446B20003D051F /* llfloatermap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AAD051F61DF00A80050 /* llfloatermap.cpp */; };
-		5503BC2705446B20003D051F /* llregionposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AAF051F61DF00A80050 /* llregionposition.cpp */; };
-		5503BC2B05446B20003D051F /* llpanelavatar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AB4051F61DF00A80050 /* llpanelavatar.cpp */; };
-		5503BC2C05446B20003D051F /* llpanelaudioprefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AB5051F61DF00A80050 /* llpanelaudioprefs.cpp */; };
-		5503BC2D05446B20003D051F /* llfloaterbuy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AB6051F61DF00A80050 /* llfloaterbuy.cpp */; };
-		5503BC2F05446B20003D051F /* lltexlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AB8051F61DF00A80050 /* lltexlayer.cpp */; };
-		5503BC3305446B20003D051F /* llpreviewlandmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ABC051F61DF00A80050 /* llpreviewlandmark.cpp */; };
-		5503BC3405446B20003D051F /* llpreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ABD051F61DF00A80050 /* llpreview.cpp */; };
-		5503BC3605446B20003D051F /* llbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ABF051F61DF00A80050 /* llbox.cpp */; };
-		5503BC3905446B20003D051F /* llfloaterreporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AC2051F61DF00A80050 /* llfloaterreporter.cpp */; };
-		5503BC3D05446B20003D051F /* llcompilequeue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AC6051F61DF00A80050 /* llcompilequeue.cpp */; };
-		5503BC3E05446B20003D051F /* llpanelgroupvoting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AC7051F61DF00A80050 /* llpanelgroupvoting.cpp */; };
-		5503BC4105446B20003D051F /* lldrawpoolsimple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ACA051F61DF00A80050 /* lldrawpoolsimple.cpp */; };
-		5503BC4205446B20003D051F /* llcubemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ACB051F61DF00A80050 /* llcubemap.cpp */; };
-		5503BC4305446B20003D051F /* lljoystickbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ACC051F61DF00A80050 /* lljoystickbutton.cpp */; };
-		5503BC4805446B20003D051F /* llsky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AD1051F61DF00A80050 /* llsky.cpp */; };
-		5503BC4905446B20003D051F /* llselectmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AD2051F61DF00A80050 /* llselectmgr.cpp */; };
-		5503BC4A05446B20003D051F /* llfilepicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AD3051F61DF00A80050 /* llfilepicker.cpp */; };
-		5503BC4C05446B20003D051F /* llprogressview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AD5051F61DF00A80050 /* llprogressview.cpp */; };
-		5503BC4D05446B20003D051F /* llimpanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AD6051F61DF00A80050 /* llimpanel.cpp */; };
-		5503BC4E05446B20003D051F /* llmenucommands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AD8051F61DF00A80050 /* llmenucommands.cpp */; };
-		5503BC4F05446B20003D051F /* llhudeffectpointat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ADA051F61DF00A80050 /* llhudeffectpointat.cpp */; };
-		5503BC5005446B20003D051F /* llhudeffectlookat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ADB051F61DF00A80050 /* llhudeffectlookat.cpp */; };
-		5503BCDC05446B20003D051F /* llnameeditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2617306405221AB700A80050 /* llnameeditor.cpp */; };
-		5503BCDD05446B20003D051F /* llnamebox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2617306805221DF400A80050 /* llnamebox.cpp */; };
-		5503BCEB05446B20003D051F /* llfeaturemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263E02FE05239C9A00A80050 /* llfeaturemanager.cpp */; };
-		5503BCEC05446B20003D051F /* lldrawpoolwater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A3F051F61DF00A80050 /* lldrawpoolwater.cpp */; };
-		5503BCF105446B20003D051F /* llfirstuse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B2ECFA00534C21A00A80059 /* llfirstuse.cpp */; };
-		5503BCF505446B20003D051F /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
-		5503BD0405446B20003D051F /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55593DF0053F5C7C0095DD27 /* QuickTime.framework */; };
-		616C4A980752C534006C2C65 /* lltimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4A8E0752C3D1006C2C65 /* lltimer.cpp */; };
-		616C4A990752C572006C2C65 /* u64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4A8F0752C3D1006C2C65 /* u64.cpp */; };
-		616C4A9D0752C5CF006C2C65 /* lluuid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4A9B0752C5CF006C2C65 /* lluuid.cpp */; };
-		616C4AA30752C6D2006C2C65 /* v2math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4AA10752C6D2006C2C65 /* v2math.cpp */; };
-		616C4E0F075507DF006C2C65 /* llbboxlocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4E07075507DF006C2C65 /* llbboxlocal.cpp */; };
-		616C4E11075507DF006C2C65 /* llcamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4E09075507DF006C2C65 /* llcamera.cpp */; };
-		616C4E13075507DF006C2C65 /* llcoordframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4E0B075507DF006C2C65 /* llcoordframe.cpp */; };
-		616C4E3207551735006C2C65 /* lldir_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4E2E07551735006C2C65 /* lldir_mac.cpp */; };
-		616C4E3407551735006C2C65 /* lldir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4E3007551735006C2C65 /* lldir.cpp */; };
-		619222F0074A9B5B005E1F34 /* llcriticaldamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922127074A9B57005E1F34 /* llcriticaldamp.cpp */; };
-		619222F8074A9B5B005E1F34 /* llerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192212F074A9B57005E1F34 /* llerror.cpp */; };
-		619222FE074A9B5B005E1F34 /* llfasttimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922135074A9B57005E1F34 /* llfasttimer.cpp */; };
-		61922300074A9B5B005E1F34 /* llfixedbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922137074A9B57005E1F34 /* llfixedbuffer.cpp */; };
-		61922302074A9B5B005E1F34 /* llframetimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922139074A9B57005E1F34 /* llframetimer.cpp */; };
-		61922307074A9B5B005E1F34 /* llmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192213E074A9B57005E1F34 /* llmemory.cpp */; };
-		6192230C074A9B5B005E1F34 /* llprocessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922143074A9B57005E1F34 /* llprocessor.cpp */; };
-		61922314074A9B5B005E1F34 /* llstat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192214B074A9B57005E1F34 /* llstat.cpp */; };
-		61922318074A9B5B005E1F34 /* llstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192214F074A9B58005E1F34 /* llstring.cpp */; };
-		6192231A074A9B5B005E1F34 /* llstringtable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922151074A9B58005E1F34 /* llstringtable.cpp */; };
-		6192232A074A9B5B005E1F34 /* timing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922161074A9B58005E1F34 /* timing.cpp */; };
-		61922347074A9B5B005E1F34 /* llcategory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922180074A9B58005E1F34 /* llcategory.cpp */; };
-		61922349074A9B5B005E1F34 /* lleconomy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922182074A9B58005E1F34 /* lleconomy.cpp */; };
-		6192234B074A9B5B005E1F34 /* llinventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922184074A9B58005E1F34 /* llinventory.cpp */; };
-		6192234D074A9B5B005E1F34 /* llparcel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922186074A9B58005E1F34 /* llparcel.cpp */; };
-		6192234F074A9B5B005E1F34 /* llpermissions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922188074A9B58005E1F34 /* llpermissions.cpp */; };
-		61922352074A9B5B005E1F34 /* llsaleinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192218B074A9B58005E1F34 /* llsaleinfo.cpp */; };
-		61922354074A9B5B005E1F34 /* lltransactionflags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192218D074A9B58005E1F34 /* lltransactionflags.cpp */; };
-		61922359074A9B5B005E1F34 /* llcrc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922193074A9B58005E1F34 /* llcrc.cpp */; };
-		6192235C074A9B5B005E1F34 /* llmd5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922196074A9B58005E1F34 /* llmd5.cpp */; };
-		6192235F074A9B5B005E1F34 /* llrand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922199074A9B58005E1F34 /* llrand.cpp */; };
-		61922361074A9B5B005E1F34 /* llrect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192219B074A9B58005E1F34 /* llrect.cpp */; };
-		61922363074A9B5B005E1F34 /* m3math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192219D074A9B58005E1F34 /* m3math.cpp */; };
-		61922365074A9B5B005E1F34 /* m4math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192219F074A9B58005E1F34 /* m4math.cpp */; };
-		61922367074A9B5B005E1F34 /* llquaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221A1074A9B58005E1F34 /* llquaternion.cpp */; };
-		61922369074A9B5B005E1F34 /* raytrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221A3074A9B58005E1F34 /* raytrace.cpp */; };
-		6192236F074A9B5B005E1F34 /* v3color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221A9074A9B58005E1F34 /* v3color.cpp */; };
-		61922371074A9B5B005E1F34 /* v3dmath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221AB074A9B58005E1F34 /* v3dmath.cpp */; };
-		61922373074A9B5B005E1F34 /* v3math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221AD074A9B58005E1F34 /* v3math.cpp */; };
-		61922375074A9B5B005E1F34 /* v4color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221AF074A9B58005E1F34 /* v4color.cpp */; };
-		61922377074A9B5B005E1F34 /* v4coloru.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221B1074A9B58005E1F34 /* v4coloru.cpp */; };
-		61922379074A9B5B005E1F34 /* v4math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221B3074A9B58005E1F34 /* v4math.cpp */; };
-		6192237C074A9B5B005E1F34 /* xform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221B6074A9B58005E1F34 /* xform.cpp */; };
-		6192237E074A9B5B005E1F34 /* llassetstorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221B9074A9B59005E1F34 /* llassetstorage.cpp */; };
-		61922380074A9B5B005E1F34 /* llcachename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221BB074A9B59005E1F34 /* llcachename.cpp */; };
-		61922383074A9B5B005E1F34 /* llcircuit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221BE074A9B59005E1F34 /* llcircuit.cpp */; };
-		6192238A074A9B5B005E1F34 /* lldatapacker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221C5074A9B59005E1F34 /* lldatapacker.cpp */; };
-		61922395074A9B5C005E1F34 /* lldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221D0074A9B59005E1F34 /* lldispatcher.cpp */; };
-		61922398074A9B5C005E1F34 /* llhost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221D3074A9B59005E1F34 /* llhost.cpp */; };
-		619223A2074A9B5C005E1F34 /* llnamevalue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221DD074A9B59005E1F34 /* llnamevalue.cpp */; };
-		619223A4074A9B5C005E1F34 /* llnullcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221DF074A9B59005E1F34 /* llnullcipher.cpp */; };
-		619223A6074A9B5C005E1F34 /* llpacketbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221E1074A9B59005E1F34 /* llpacketbuffer.cpp */; };
-		619223A8074A9B5C005E1F34 /* llpacketring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221E3074A9B59005E1F34 /* llpacketring.cpp */; };
-		619223AA074A9B5C005E1F34 /* llpartdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221E5074A9B59005E1F34 /* llpartdata.cpp */; };
-		619223B1074A9B5C005E1F34 /* llthrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221EC074A9B59005E1F34 /* llthrottle.cpp */; };
-		619223B3074A9B5C005E1F34 /* lltransfermanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221EE074A9B59005E1F34 /* lltransfermanager.cpp */; };
-		619223B5074A9B5C005E1F34 /* lltransfersourceasset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F0074A9B59005E1F34 /* lltransfersourceasset.cpp */; };
-		619223B7074A9B5C005E1F34 /* lltransfersourcefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F2074A9B59005E1F34 /* lltransfersourcefile.cpp */; };
-		619223B9074A9B5C005E1F34 /* lltransfertargetfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F4074A9B59005E1F34 /* lltransfertargetfile.cpp */; };
-		619223BB074A9B5C005E1F34 /* lltransfertargetvfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F6074A9B59005E1F34 /* lltransfertargetvfile.cpp */; };
-		619223BD074A9B5C005E1F34 /* lluseroperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F8074A9B59005E1F34 /* lluseroperation.cpp */; };
-		619223C0074A9B5C005E1F34 /* llxfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221FB074A9B59005E1F34 /* llxfer.cpp */; };
-		619223C2074A9B5C005E1F34 /* llxfer_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221FD074A9B59005E1F34 /* llxfer_file.cpp */; };
-		619223C4074A9B5C005E1F34 /* llxfer_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221FF074A9B59005E1F34 /* llxfer_mem.cpp */; };
-		619223C6074A9B5C005E1F34 /* llxfer_vfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922201074A9B59005E1F34 /* llxfer_vfile.cpp */; };
-		619223C8074A9B5C005E1F34 /* llxfermanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922203074A9B59005E1F34 /* llxfermanager.cpp */; };
-		619223CA074A9B5C005E1F34 /* llxorcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922205074A9B59005E1F34 /* llxorcipher.cpp */; };
-		619223CD074A9B5C005E1F34 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922208074A9B59005E1F34 /* message.cpp */; };
-		619223CF074A9B5C005E1F34 /* message_prehash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220A074A9B59005E1F34 /* message_prehash.cpp */; };
-		619223D1074A9B5C005E1F34 /* message_string_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220C074A9B59005E1F34 /* message_string_table.cpp */; };
-		619223D2074A9B5C005E1F34 /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220D074A9B59005E1F34 /* net.cpp */; };
-		619223D4074A9B5C005E1F34 /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220F074A9B59005E1F34 /* network.cpp */; };
-		619223D6074A9B5C005E1F34 /* partsyspacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922211074A9B59005E1F34 /* partsyspacket.cpp */; };
-		619223D8074A9B5C005E1F34 /* patch_code.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922213074A9B59005E1F34 /* patch_code.cpp */; };
-		619223DA074A9B5C005E1F34 /* patch_dct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922215074A9B59005E1F34 /* patch_dct.cpp */; };
-		619223DC074A9B5C005E1F34 /* patch_idct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922217074A9B59005E1F34 /* patch_idct.cpp */; };
-		619223E3074A9B5C005E1F34 /* llmaterialtable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192221F074A9B59005E1F34 /* llmaterialtable.cpp */; };
-		619223E5074A9B5C005E1F34 /* llprimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922221074A9B5A005E1F34 /* llprimitive.cpp */; };
-		619223E7074A9B5C005E1F34 /* lltextureanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922223074A9B5A005E1F34 /* lltextureanim.cpp */; };
-		619223E9074A9B5C005E1F34 /* lltextureentry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922225074A9B5A005E1F34 /* lltextureentry.cpp */; };
-		619223EB074A9B5C005E1F34 /* lltreeparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922227074A9B5A005E1F34 /* lltreeparams.cpp */; };
-		61922420074A9B5C005E1F34 /* llundo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192225F074A9B5A005E1F34 /* llundo.cpp */; };
-		61922426074A9B5C005E1F34 /* llvfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922266074A9B5A005E1F34 /* llvfile.cpp */; };
-		61922428074A9B5C005E1F34 /* llvfs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922268074A9B5A005E1F34 /* llvfs.cpp */; };
-		61922433074A9B5C005E1F34 /* llwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922274074A9B5A005E1F34 /* llwindow.cpp */; };
-		61922437074A9B5C005E1F34 /* llxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922279074A9B5A005E1F34 /* llxmlparser.cpp */; };
-		61922439074A9B5C005E1F34 /* llxmltree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192227B074A9B5A005E1F34 /* llxmltree.cpp */; };
-		61922442074A9B5C005E1F34 /* indra.l in Sources */ = {isa = PBXBuildFile; fileRef = 61922286074A9B5B005E1F34 /* indra.l */; };
-		61922443074A9B5C005E1F34 /* indra.y in Sources */ = {isa = PBXBuildFile; fileRef = 61922287074A9B5B005E1F34 /* indra.y */; };
-		61922445074A9B5C005E1F34 /* lscript_bytecode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922289074A9B5B005E1F34 /* lscript_bytecode.cpp */; };
-		61922447074A9B5C005E1F34 /* lscript_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192228B074A9B5B005E1F34 /* lscript_error.cpp */; };
-		61922449074A9B5C005E1F34 /* lscript_heap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192228D074A9B5B005E1F34 /* lscript_heap.cpp */; };
-		6192244B074A9B5C005E1F34 /* lscript_resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192228F074A9B5B005E1F34 /* lscript_resource.cpp */; };
-		6192244D074A9B5C005E1F34 /* lscript_scope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922291074A9B5B005E1F34 /* lscript_scope.cpp */; };
-		6192244F074A9B5C005E1F34 /* lscript_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922293074A9B5B005E1F34 /* lscript_tree.cpp */; };
-		61922451074A9B5C005E1F34 /* lscript_typecheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922295074A9B5B005E1F34 /* lscript_typecheck.cpp */; };
-		61922454074A9B5C005E1F34 /* lscript_execute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192229A074A9B5B005E1F34 /* lscript_execute.cpp */; };
-		61922455074A9B5C005E1F34 /* lscript_heapruntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192229B074A9B5B005E1F34 /* lscript_heapruntime.cpp */; };
-		61922457074A9B5C005E1F34 /* lscript_readlso.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192229D074A9B5B005E1F34 /* lscript_readlso.cpp */; };
-		6192245C074A9B5C005E1F34 /* lscript_alloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619222A4074A9B5B005E1F34 /* lscript_alloc.cpp */; };
-		6192245D074A9B5C005E1F34 /* lscript_export.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619222A5074A9B5B005E1F34 /* lscript_export.cpp */; };
-		6192245E074A9B5C005E1F34 /* lscript_library.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619222A6074A9B5B005E1F34 /* lscript_library.cpp */; };
-		61923C89074ACA70005E1F34 /* libllcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6192E764074A7CE9005E1F34 /* libllcommon.a */; };
-		61923C8B074ACA8D005E1F34 /* libllcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6192E764074A7CE9005E1F34 /* libllcommon.a */; };
-		61923C8D074ACFDD005E1F34 /* libllcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6192E764074A7CE9005E1F34 /* libllcommon.a */; };
-		61923C9E074AD920005E1F34 /* mac_crash_logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923C97074AD8B7005E1F34 /* mac_crash_logger.cpp */; };
-		61923CA5074ADD54005E1F34 /* llsys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922153074A9B58005E1F34 /* llsys.cpp */; };
-		61923CEB074AE2CB005E1F34 /* audioengine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923CD7074AE2CB005E1F34 /* audioengine.cpp */; };
-		61923CEF074AE2CB005E1F34 /* listener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923CDB074AE2CB005E1F34 /* listener.cpp */; };
-		61923CF5074AE2CB005E1F34 /* llaudiodecodemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923CE1074AE2CB005E1F34 /* llaudiodecodemgr.cpp */; };
-		61923CF9074AE2CB005E1F34 /* vorbisdecode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923CE5074AE2CB005E1F34 /* vorbisdecode.cpp */; };
-		61923CFB074AE2CB005E1F34 /* vorbisencode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923CE7074AE2CB005E1F34 /* vorbisencode.cpp */; };
-		61923D47074AE3C0005E1F34 /* llanimationstates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D00074AE3BF005E1F34 /* llanimationstates.cpp */; };
-		61923D49074AE3C0005E1F34 /* llbvhloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D02074AE3BF005E1F34 /* llbvhloader.cpp */; };
-		61923D4B074AE3C0005E1F34 /* llcharacter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D04074AE3BF005E1F34 /* llcharacter.cpp */; };
-		61923D4D074AE3C0005E1F34 /* lleditingmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D06074AE3BF005E1F34 /* lleditingmotion.cpp */; };
-		61923D4F074AE3C0005E1F34 /* llgesture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D08074AE3BF005E1F34 /* llgesture.cpp */; };
-		61923D51074AE3C0005E1F34 /* llhandmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D0A074AE3BF005E1F34 /* llhandmotion.cpp */; };
-		61923D53074AE3C0005E1F34 /* llheadrotmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D0C074AE3BF005E1F34 /* llheadrotmotion.cpp */; };
-		61923D55074AE3C0005E1F34 /* lljoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D0E074AE3BF005E1F34 /* lljoint.cpp */; };
-		61923D57074AE3C0005E1F34 /* lljointsolverrp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D10074AE3BF005E1F34 /* lljointsolverrp3.cpp */; };
-		61923D5A074AE3C0005E1F34 /* llkeyframefallmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D13074AE3BF005E1F34 /* llkeyframefallmotion.cpp */; };
-		61923D5C074AE3C0005E1F34 /* llkeyframemotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D15074AE3BF005E1F34 /* llkeyframemotion.cpp */; };
-		61923D5E074AE3C0005E1F34 /* llkeyframemotionparam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D17074AE3C0005E1F34 /* llkeyframemotionparam.cpp */; };
-		61923D60074AE3C0005E1F34 /* llkeyframestandmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D19074AE3C0005E1F34 /* llkeyframestandmotion.cpp */; };
-		61923D62074AE3C0005E1F34 /* llkeyframewalkmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D1B074AE3C0005E1F34 /* llkeyframewalkmotion.cpp */; };
-		61923D64074AE3C0005E1F34 /* llmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D1D074AE3C0005E1F34 /* llmotion.cpp */; };
-		61923D66074AE3C0005E1F34 /* llmotioncontroller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D1F074AE3C0005E1F34 /* llmotioncontroller.cpp */; };
-		61923D68074AE3C0005E1F34 /* llmultigesture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D21074AE3C0005E1F34 /* llmultigesture.cpp */; };
-		61923D6A074AE3C0005E1F34 /* llpose.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D23074AE3C0005E1F34 /* llpose.cpp */; };
-		61923D6C074AE3C0005E1F34 /* llstatemachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D25074AE3C0005E1F34 /* llstatemachine.cpp */; };
-		61923D6E074AE3C0005E1F34 /* lltargetingmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D27074AE3C0005E1F34 /* lltargetingmotion.cpp */; };
-		61923D70074AE3C0005E1F34 /* llvisualparam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D29074AE3C0005E1F34 /* llvisualparam.cpp */; };
-		79E592770D1B4932002135A7 /* llimagepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693B0C18AF33007F52DA /* llimagepng.cpp */; };
-		79E592870D1B4961002135A7 /* llpngwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693C0C18AF33007F52DA /* llpngwrapper.cpp */; };
-		79E5928A0D1B4A1A002135A7 /* libpng12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88AA282B0C17720D0032DF53 /* libpng12.a */; };
-		79E593440D1B4A72002135A7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BE09B919DF00FBF1CA /* libz.dylib */; };
-		79ED67F20E197D67003D1E78 /* llpanelskins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79ED67F00E197D66003D1E78 /* llpanelskins.cpp */; };
-		84401E2F0A13CC9A006720A5 /* llfloatergroupinvite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84401E2D0A13CC9A006720A5 /* llfloatergroupinvite.cpp */; };
-		84401E320A13CCB2006720A5 /* llpanelgroupinvite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84401E300A13CCB2006720A5 /* llpanelgroupinvite.cpp */; };
-		8833693F0C18AF33007F52DA /* llimagepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693B0C18AF33007F52DA /* llimagepng.cpp */; };
-		883369400C18AF33007F52DA /* llpngwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693C0C18AF33007F52DA /* llpngwrapper.cpp */; };
-		8849626C0C7B3E8A00A777FB /* llares.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8849626B0C7B3E8A00A777FB /* llares.cpp */; };
-		88A95BB20C14D5FC0027E363 /* llsrv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88A95BB10C14D5FC0027E363 /* llsrv.cpp */; };
-		88A95BCA0C14D92C0027E363 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 88A95BC90C14D92C0027E363 /* libresolv.dylib */; };
-		88AA282C0C17720D0032DF53 /* libpng12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88AA282B0C17720D0032DF53 /* libpng12.a */; };
-		9104C0CC0778AE0F001EC4F6 /* llpanelmsgs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9104C0CB0778AE0F001EC4F6 /* llpanelmsgs.cpp */; };
-		9117EAA20BF24A6100845BD2 /* llpacketack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9117EAA10BF24A6100845BD2 /* llpacketack.cpp */; };
-		9118669B07F4FAF700E3D5BC /* llmediaremotectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9118669907F4FAF700E3D5BC /* llmediaremotectrl.cpp */; };
-		911CAD87075BE87B00CD1090 /* llinventoryview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 911CAD86075BE87B00CD1090 /* llinventoryview.cpp */; };
-		911CAD8B075BE90600CD1090 /* llgroupmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 911CAD8A075BE90600CD1090 /* llgroupmgr.cpp */; };
-		911CAD93075BEAAC00CD1090 /* lltoolselect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 911CAD92075BEAAC00CD1090 /* lltoolselect.cpp */; };
-		912541AE0691FF79008C66F7 /* llfasttimerview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 912541AD0691FF79008C66F7 /* llfasttimerview.cpp */; };
-		912541AF0691FF79008C66F7 /* llfasttimerview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 912541AD0691FF79008C66F7 /* llfasttimerview.cpp */; };
-		91287B27078DCD1800E958B2 /* llkeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91287B25078DCD1800E958B2 /* llkeyboard.cpp */; };
-		91287B30078DCE0A00E958B2 /* llkeyboardmacosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91287B2F078DCE0A00E958B2 /* llkeyboardmacosx.cpp */; };
-		91287B4C078DE4B300E958B2 /* llviewerkeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91287B4A078DE4B300E958B2 /* llviewerkeyboard.cpp */; };
-		9130442B057428D800571B0A /* llfloaterbuycontents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9130442A057428D800571B0A /* llfloaterbuycontents.cpp */; };
-		9131094405C6D5A300A18084 /* llpanelpick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9131094305C6D5A300A18084 /* llpanelpick.cpp */; };
-		913AA1FD079855E900D111CE /* llfloaterfriends.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913AA1FC079855E900D111CE /* llfloaterfriends.cpp */; };
-		913ADF0F0A250C750055AB21 /* llsdutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913ADF0D0A250C750055AB21 /* llsdutil.cpp */; };
-		913B26990B4DDCDA0030C3EC /* lllandmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913B26970B4DDCDA0030C3EC /* lllandmark.cpp */; };
-		91469E7B0B4486C10009E8F9 /* llmime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91469E790B4486C10009E8F9 /* llmime.cpp */; };
-		915862FA075D2F7300F6A924 /* llapr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915862D8075D2CE400F6A924 /* llapr.cpp */; };
-		9159DDD807662E7900F15AA1 /* llthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9159DDD607662E7900F15AA1 /* llthread.cpp */; };
-		915F492106B572E700F629BF /* lleventnotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915F492006B572E700F629BF /* lleventnotifier.cpp */; };
-		915F492906B5738A00F629BF /* lleventinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915F492806B5738A00F629BF /* lleventinfo.cpp */; };
-		916083930649560B00CAF63E /* llfloateranimpreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 916083920649560B00CAF63E /* llfloateranimpreview.cpp */; };
-		916724C507551DF600CA4513 /* llfloatercolorpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 916724C407551DF600CA4513 /* llfloatercolorpicker.cpp */; };
-		9174D2C10653FC2600A7E32B /* llfloaterregioninfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9174D2C00653FC2600A7E32B /* llfloaterregioninfo.cpp */; };
-		918166CC06516C59005727DC /* llaudiosourcevo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 918166CA06516C59005727DC /* llaudiosourcevo.cpp */; };
-		9190431808327117002396D4 /* llfiltersd2xmlrpc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190430C08327117002396D4 /* llfiltersd2xmlrpc.cpp */; };
-		9190431A08327117002396D4 /* lliobuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190430E08327117002396D4 /* lliobuffer.cpp */; };
-		9190431C08327117002396D4 /* lliopipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190431008327117002396D4 /* lliopipe.cpp */; };
-		9190431E08327117002396D4 /* llpumpio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190431208327117002396D4 /* llpumpio.cpp */; };
-		9190432008327117002396D4 /* llservice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190431408327117002396D4 /* llservice.cpp */; };
-		919A166006F8F244006E46FB /* llstartup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91DF401F06A739BA00CA7FE5 /* llstartup.cpp */; };
-		91A155FF081EE7F70089988C /* llfloaterhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91A155FE081EE7F70089988C /* llfloaterhtml.cpp */; };
-		91B9EB8306370586007B3F3E /* lldynamictexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B9EB8206370586007B3F3E /* lldynamictexture.cpp */; };
-		91B9EC4D06370E4E007B3F3E /* llfloaterimagepreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B9EC4C06370E4D007B3F3E /* llfloaterimagepreview.cpp */; };
-		91C8C05505922AC100633E8C /* llfloatergodtools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C8C05405922AC100633E8C /* llfloatergodtools.cpp */; };
-		91CB311606FB584C00DBCE1E /* llfloaterclothing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91CB311506FB584C00DBCE1E /* llfloaterclothing.cpp */; };
-		91D2527705C9C0630099BB54 /* llfloaterauction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91D2527605C9C0620099BB54 /* llfloaterauction.cpp */; };
-		91D530CF056EE55C00CD1AD7 /* lloverlaybar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91D530CE056EE55C00CD1AD7 /* lloverlaybar.cpp */; };
-		91D530D3056EE57900CD1AD7 /* llchatbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91D530D2056EE57900CD1AD7 /* llchatbar.cpp */; };
-		91D61FD1057ED9DF005B4B69 /* llnotify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91D61FD0057ED9DF005B4B69 /* llnotify.cpp */; };
-		91E3336F0ABB5379004351DE /* llapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E3336D0ABB5379004351DE /* llapp.cpp */; };
-		91E333750ABB79AC004351DE /* llrun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E333730ABB79AC004351DE /* llrun.cpp */; };
-		91E36BB805B4C70600C919E4 /* llpanelinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E36BB705B4C70600C919E4 /* llpanelinput.cpp */; };
-		91E579B20770D43100404933 /* llwindowmacosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E579B00770D43100404933 /* llwindowmacosx.cpp */; };
-		91E7BB2205EFCBA40026CC40 /* llviewerdisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E7BB2105EFCBA40026CC40 /* llviewerdisplay.cpp */; };
-		91F8BBA4062DF7AB00DE42BA /* llpreviewgesture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F8BBA3062DF7AB00DE42BA /* llpreviewgesture.cpp */; };
-		91F8BBAC062DF91A00DE42BA /* llgesturemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91F8BBAB062DF91A00DE42BA /* llgesturemgr.cpp */; };
-		91FC1C8806527F19009CF498 /* llpreviewanim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91FC1C8706527F19009CF498 /* llpreviewanim.cpp */; };
-		93AE41C708F483C900141675 /* llalertdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AE41C508F483C800141675 /* llalertdialog.cpp */; };
-		93AE41C808F483C900141675 /* llmodaldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AE41C608F483C900141675 /* llmodaldialog.cpp */; };
-		93AE41CC08F4842F00141675 /* llsecondlifeurls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AE41CB08F4842F00141675 /* llsecondlifeurls.cpp */; };
-		93AE41D008F4845400141675 /* llinstantmessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AE41CF08F4845400141675 /* llinstantmessage.cpp */; };
-		990032FD05EC0A9C0035CB09 /* llpaneldirland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 990032FC05EC0A9B0035CB09 /* llpaneldirland.cpp */; };
-		9900330105EC0ADD0035CB09 /* llpaneldirpopular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9900330005EC0ADD0035CB09 /* llpaneldirpopular.cpp */; };
-		990CDBE205C1EA7900739545 /* AutoUpdater.nib in Resources */ = {isa = PBXBuildFile; fileRef = 990CDBD805C1EA7900739545 /* AutoUpdater.nib */; };
-		990CDBE405C1EA7900739545 /* FSCopyObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 990CDBDA05C1EA7900739545 /* FSCopyObject.c */; };
-		990CDBE605C1EA7900739545 /* GenLinkedList.c in Sources */ = {isa = PBXBuildFile; fileRef = 990CDBDC05C1EA7900739545 /* GenLinkedList.c */; };
-		990CDBE905C1EA7900739545 /* mac_updater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 990CDBDF05C1EA7900739545 /* mac_updater.cpp */; };
-		990CDBEA05C1EA7900739545 /* MoreFilesX.c in Sources */ = {isa = PBXBuildFile; fileRef = 990CDBE005C1EA7900739545 /* MoreFilesX.c */; };
-		991ED2E00883646B003EC818 /* llclassifiedinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 991ED2DF0883646B003EC818 /* llclassifiedinfo.cpp */; };
-		9928ACA5056D9353003865BE /* CrashReporter.nib in Resources */ = {isa = PBXBuildFile; fileRef = 9928ACA4056D9353003865BE /* CrashReporter.nib */; };
-		9930A8E40B8FB10A00197ECA /* language.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9930A8E30B8FB10A00197ECA /* language.txt */; };
-		99321B14081DD26000678159 /* llworkerthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99321B12081DD26000678159 /* llworkerthread.cpp */; };
-		99374E4E0B5C6059008DB4BE /* lliosocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99374E460B5C603E008DB4BE /* lliosocket.cpp */; };
-		993A3E050B546D47007A0790 /* llvoiceclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 993A3E040B546D47007A0790 /* llvoiceclient.cpp */; };
-		9950AF460B3762A1007E36E0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
-		9950AF610B3763DF007E36E0 /* libfmodwrapper.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9967E9090B37533F0087BD1B /* libfmodwrapper.dylib */; };
-		9956CAFD0B96679C00F58C6D /* llprefsvoice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9956CAFC0B96679C00F58C6D /* llprefsvoice.cpp */; };
-		996209690B864D0E00392531 /* SLVoiceAgent.app in Resources */ = {isa = PBXBuildFile; fileRef = 996209680B864D0E00392531 /* SLVoiceAgent.app */; };
-		9967E9200B3754800087BD1B /* libfmodwrapper.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9967E9090B37533F0087BD1B /* libfmodwrapper.dylib */; };
-		9967E98D0B375B0E0087BD1B /* fmodwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9967E9520B37564D0087BD1B /* fmodwrapper.cpp */; };
-		9967E9B30B375D9D0087BD1B /* libfmod.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765009BEA39600AF6316 /* libfmod.a */; };
-		9985A1280AC1FE4E00579AFB /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9985A1270AC1FE4E00579AFB /* AppKit.framework */; };
-		99AAD74F09DC8B9D0036C309 /* lllfsthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99AAD74E09DC8B9D0036C309 /* lllfsthread.cpp */; };
-		99BB5168099ABDEB004BF9F2 /* llfloaterbuyland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB5166099ABDEB004BF9F2 /* llfloaterbuyland.cpp */; };
-		99BB516B099AC1AE004BF9F2 /* llxmlrpctransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB516A099AC1AE004BF9F2 /* llxmlrpctransaction.cpp */; };
-		99BB516F099AC1E9004BF9F2 /* llviewchildren.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB516D099AC1E9004BF9F2 /* llviewchildren.cpp */; };
-		99BB5172099AC1FC004BF9F2 /* llcurrencyuimanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB5170099AC1FC004BF9F2 /* llcurrencyuimanager.cpp */; };
-		99BB5176099AC2A4004BF9F2 /* llconfirmationmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB5174099AC2A4004BF9F2 /* llconfirmationmanager.cpp */; };
-		99C7B320081F128400499A23 /* llvfsthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91A154F8081DC15E0089988C /* llvfsthread.cpp */; };
-		99C9FA670B6AD9BF00A1BBA6 /* SLVoice in Resources */ = {isa = PBXBuildFile; fileRef = 99C9FA660B6AD9BF00A1BBA6 /* SLVoice */; };
-		99DB67DF07C161A500CF3185 /* llmediaimplquicktime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99DB67DB07C161A500CF3185 /* llmediaimplquicktime.cpp */; };
-		99E4326D092D5996003AE728 /* llassettype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E4326B092D5996003AE728 /* llassettype.cpp */; };
-		99E4350C092D644F003AE728 /* llmortician.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E4350B092D644F003AE728 /* llmortician.cpp */; };
-		99E43511092D64A4003AE728 /* llfloaterbuycurrency.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E4350F092D64A4003AE728 /* llfloaterbuycurrency.cpp */; };
-		99E43514092D64CC003AE728 /* llmemoryview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E43513092D64CC003AE728 /* llmemoryview.cpp */; };
-		99E43517092D64E6003AE728 /* llvoinventorylistener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E43516092D64E6003AE728 /* llvoinventorylistener.cpp */; };
-		99E4351A092D6535003AE728 /* llcommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E43519092D6535003AE728 /* llcommon.cpp */; };
-		99E63DFF0BCADD2F000C1751 /* libalut.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 99E63DEF0BCADD14000C1751 /* libalut.dylib */; };
-		99E63E000BCADD2F000C1751 /* libopenal.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 99E63DF20BCADD14000C1751 /* libopenal.dylib */; };
-		99E63E010BCADD2F000C1751 /* libortp.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 99E63DF00BCADD14000C1751 /* libortp.dylib */; };
-		99E63E020BCADD2F000C1751 /* libvivoxsdk.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 99E63DF10BCADD14000C1751 /* libvivoxsdk.dylib */; };
-		99E64039081F1CB80009003F /* llgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E64036081F1CB80009003F /* llgl.cpp */; };
-		99EDDF5C05892E720031B20D /* llfloaterlandholdings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99EDDF5B05892E720031B20D /* llfloaterlandholdings.cpp */; };
-		99EDE33705896DC10031B20D /* SecondLife.nib in Resources */ = {isa = PBXBuildFile; fileRef = 99EDE33605896DC10031B20D /* SecondLife.nib */; };
-		99F998FB0BAA34B90034E41C /* libopenjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 99F998FA0BAA34B90034E41C /* libopenjpeg.a */; };
-		99F99A160BAA3D4C0034E41C /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26E79A7A0520ED1200A80050 /* AGL.framework */; };
-		99F99A190BAA3D520034E41C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26E79A3D0520B56600A80050 /* OpenGL.framework */; };
-		99FBB045087362B60048A5CC /* llpanelclassified.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99FBB044087362B60048A5CC /* llpanelclassified.cpp */; };
-		99FBB073087365E90048A5CC /* llclassifiedflags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99FBB071087365E90048A5CC /* llclassifiedflags.cpp */; };
-		99FBB08F087366780048A5CC /* llpaneldirclassified.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99FBB08E087366780048A5CC /* llpaneldirclassified.cpp */; };
-		99FCDD0709476389003D3B63 /* audioengine_fmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923CD9074AE2CB005E1F34 /* audioengine_fmod.cpp */; };
-		99FCDD080947638A003D3B63 /* listener_fmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923CDE074AE2CB005E1F34 /* listener_fmod.cpp */; };
-		9B2863B20ABF637200A05D7C /* llerrorthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B2863B00ABF637200A05D7C /* llerrorthread.cpp */; };
-		9B39350D0AD6F96900F57245 /* llhttpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B39350B0AD6F96900F57245 /* llhttpclient.cpp */; };
-		9B3935110AD6F9F400F57245 /* llurlrequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B39350F0AD6F9F400F57245 /* llurlrequest.cpp */; };
-		9B6A24D90AC8C69600EA9CB5 /* llwindowmacosx-objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9985A08F0AC1FE3600579AFB /* llwindowmacosx-objc.mm */; };
-		9C18425B0B9F951500208356 /* llcaphttpsender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C18425A0B9F951500208356 /* llcaphttpsender.cpp */; };
-		9C1853AE0A91175E00DA7B01 /* llviewercontrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C1853AD0A91175E00DA7B01 /* llviewercontrol.cpp */; };
-		9C1A4F6D0A8D4BB30037639E /* llsdserialize_xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558240A06BB5F00DE9AE5 /* llsdserialize_xml.cpp */; };
-		9C659A870BAB0B6E00D2EB60 /* llmessageconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C659A850BAB0B6E00D2EB60 /* llmessageconfig.cpp */; };
-		9CC280FF0BE79737006D8BDC /* llmessagetemplateparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CC280FE0BE79737006D8BDC /* llmessagetemplateparser.cpp */; };
-		9CD49D5709D0BAC100192434 /* llflexibleobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CD49D5609D0BAC100192434 /* llflexibleobject.cpp */; };
-		A241CB7D07B3DE0D001A39E3 /* llviewerprecompiledheaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A241CB7B07B3DE0D001A39E3 /* llviewerprecompiledheaders.cpp */; };
-		A241CB9207B3E383001A39E3 /* llmessagethrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A241CB8E07B3E383001A39E3 /* llmessagethrottle.cpp */; };
-		A241CB9507B3E3A7001A39E3 /* llperlin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A241CB9407B3E3A7001A39E3 /* llperlin.cpp */; };
-		A26560520C9F53CC004042A0 /* llfloaterhardwaresettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A26560500C9F53CC004042A0 /* llfloaterhardwaresettings.cpp */; };
-		A2A8C5480C649EE20001FEB2 /* llmultislider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C5440C649EE20001FEB2 /* llmultislider.cpp */; };
-		A2A8C5490C649EE20001FEB2 /* llmultisliderctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C5460C649EE20001FEB2 /* llmultisliderctrl.cpp */; };
-		A2A8C5600C649F490001FEB2 /* lldrawpoolwlsky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C54A0C649F480001FEB2 /* lldrawpoolwlsky.cpp */; };
-		A2A8C5610C649F490001FEB2 /* llfloaterdaycycle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C54C0C649F480001FEB2 /* llfloaterdaycycle.cpp */; };
-		A2A8C5620C649F490001FEB2 /* llfloaterpostprocess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C54E0C649F480001FEB2 /* llfloaterpostprocess.cpp */; };
-		A2A8C5640C649F490001FEB2 /* llfloaterwindlight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C5520C649F480001FEB2 /* llfloaterwindlight.cpp */; };
-		A2A8C5650C649F490001FEB2 /* llpostprocess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C5540C649F480001FEB2 /* llpostprocess.cpp */; };
-		A2A8C5660C649F490001FEB2 /* llvowlsky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C5560C649F480001FEB2 /* llvowlsky.cpp */; };
-		A2A8C5670C649F490001FEB2 /* llwlanimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C5580C649F480001FEB2 /* llwlanimator.cpp */; };
-		A2A8C5680C649F490001FEB2 /* llwldaycycle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C55A0C649F490001FEB2 /* llwldaycycle.cpp */; };
-		A2A8C5690C649F490001FEB2 /* llwlparammanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C55C0C649F490001FEB2 /* llwlparammanager.cpp */; };
-		A2A8C56A0C649F490001FEB2 /* llwlparamset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2A8C55E0C649F490001FEB2 /* llwlparamset.cpp */; };
-		A30273570B3A13D800704420 /* llvertexbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30273550B3A13D800704420 /* llvertexbuffer.cpp */; };
-		A3077C0B09DCB8140059ED75 /* llpanelvolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3077C0309DCB8140059ED75 /* llpanelvolume.cpp */; };
-		A32748BF0B5F38A00099BE18 /* llfontgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D628315D0B4F3FA100F8830F /* llfontgl.cpp */; };
-		A32748C00B5F38A20099BE18 /* llimagegl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831610B4F3FA200F8830F /* llimagegl.cpp */; };
-		A32748C10B5F38A80099BE18 /* llfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D628315B0B4F3FA100F8830F /* llfont.cpp */; };
-		A3285A360A7141A200F619A5 /* llinventorybridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3285A340A71419F00F619A5 /* llinventorybridge.cpp */; };
-		A3285A3B0A71425A00F619A5 /* llinventoryactions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3285A3A0A71425100F619A5 /* llinventoryactions.cpp */; };
-		A3AF6BCB0A544C71005B5E2C /* llevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AF6BC80A544C71005B5E2C /* llevent.cpp */; };
-		A3AF6BCF0A544EF0005B5E2C /* llpanellogin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AF6BCE0A544EF0005B5E2C /* llpanellogin.cpp */; };
-		A3C20E4A0BB0BCDF007E872B /* llglslshader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3C20E490BB0BCDF007E872B /* llglslshader.cpp */; };
-		A3C20E4C0BB0BD12007E872B /* llviewerjoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3C20E4B0BB0BD12007E872B /* llviewerjoystick.cpp */; };
-		A3D969160A6ED4CB007E8BD2 /* llfloaternewim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3D968F00A6EBCA7007E8BD2 /* llfloaternewim.cpp */; };
-		A3D9691F0A6ED666007E8BD2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3D9691B0A6ED5F6007E8BD2 /* IOKit.framework */; };
-		AA02B9BC0B0CE44D00F2996D /* lltexturefetch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA02B9BA0B0CE44D00F2996D /* lltexturefetch.cpp */; };
-		AA0E2A610A2FDAEE0066250A /* llcontrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0E2A5F0A2FDAEE0066250A /* llcontrol.cpp */; };
-		AA0E2A640A2FDB340066250A /* lltoolpipette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0E2A620A2FDB340066250A /* lltoolpipette.cpp */; };
-		AA1183500C1DF9C400FDE5BA /* llpanelaudiovolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA11834E0C1DF9C400FDE5BA /* llpanelaudiovolume.cpp */; };
-		AA348DFA0B0EAB31002C3015 /* llcurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA348DF80B0EAB31002C3015 /* llcurl.cpp */; };
-		AA38F8F20D8A3687003B39F9 /* llfloaterjoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA38F8F00D8A3687003B39F9 /* llfloaterjoystick.cpp */; };
-		AA38F8FE0D8AFCF4003B39F9 /* libndofdev.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AA38F8FD0D8AFCF4003B39F9 /* libndofdev.dylib */; };
-		AAA1336B0A3F94D000419F7C /* lluistring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA133690A3F94D000419F7C /* lluistring.cpp */; };
-		AABD9F130D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */; };
-		AABD9F140D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */; };
-		AAC121A50A93A8380080E8A9 /* llfloatersellland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC121A30A93A8380080E8A9 /* llfloatersellland.cpp */; };
-		AAE98CC20B38FE0800E2F204 /* llimageworker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE98CC00B38FE0800E2F204 /* llimageworker.cpp */; };
-		AAEAAF270A8104D8005F0707 /* llscrollingpanellist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAEAAF250A8104D8005F0707 /* llscrollingpanellist.cpp */; };
-		AAF5FFD20B13F71900D28A84 /* lltexturecache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAF5FFD00B13F71900D28A84 /* lltexturecache.cpp */; };
-		C16C08500B4AE6C7009AD67F /* llfloaterinspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C16C084E0B4AE6C7009AD67F /* llfloaterinspect.cpp */; };
-		C19628F50D53D7AB007C909A /* llfloatersettingsdebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C19628F30D53D7AB007C909A /* llfloatersettingsdebug.cpp */; };
-		C1E4A5760CC020FC005FB0A6 /* llcrashloggermac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1E4A5750CC020FC005FB0A6 /* llcrashloggermac.cpp */; };
-		C1E4A5790CC0210F005FB0A6 /* llcrashlogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1E4A5770CC0210F005FB0A6 /* llcrashlogger.cpp */; };
-		C1E4A57B0CC02160005FB0A6 /* lldate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558220A06BB5F00DE9AE5 /* lldate.cpp */; };
-		C1E4A57C0CC02160005FB0A6 /* llthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9159DDD607662E7900F15AA1 /* llthread.cpp */; };
-		C1E4A57D0CC02160005FB0A6 /* u64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4A8F0752C3D1006C2C65 /* u64.cpp */; };
-		C1E4A57E0CC02160005FB0A6 /* llerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192212F074A9B57005E1F34 /* llerror.cpp */; };
-		C1E4A57F0CC02160005FB0A6 /* llstreamtools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0633E5D309E3421500712406 /* llstreamtools.cpp */; };
-		C1E4A5800CC02160005FB0A6 /* llapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E3336D0ABB5379004351DE /* llapp.cpp */; };
-		C1E4A5810CC02160005FB0A6 /* llfasttimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922135074A9B57005E1F34 /* llfasttimer.cpp */; };
-		C1E4A5820CC02160005FB0A6 /* llfixedbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922137074A9B57005E1F34 /* llfixedbuffer.cpp */; };
-		C1E4A5830CC02160005FB0A6 /* llstat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192214B074A9B57005E1F34 /* llstat.cpp */; };
-		C1E4A5840CC02160005FB0A6 /* llmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192213E074A9B57005E1F34 /* llmemory.cpp */; };
-		C1E4A5850CC02160005FB0A6 /* llsd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 918B123A07B19605008CD6CD /* llsd.cpp */; };
-		C1E4A5860CC02160005FB0A6 /* llcommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E43519092D6535003AE728 /* llcommon.cpp */; };
-		C1E4A5870CC02160005FB0A6 /* llares.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8849626B0C7B3E8A00A777FB /* llares.cpp */; };
-		C1E4A5880CC02160005FB0A6 /* llbase32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9897E80B98E2F4005C45D7 /* llbase32.cpp */; };
-		C1E4A5890CC02160005FB0A6 /* llbase64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02016D0B7A85DE00D5C589 /* llbase64.cpp */; };
-		C1E4A58A0CC02160005FB0A6 /* llmortician.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E4350B092D644F003AE728 /* llmortician.cpp */; };
-		C1E4A58B0CC02160005FB0A6 /* llprocessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922143074A9B57005E1F34 /* llprocessor.cpp */; };
-		C1E4A58C0CC02160005FB0A6 /* llformat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA9C40DF0B54B4BA00DD6F44 /* llformat.cpp */; };
-		C1E4A58D0CC02160005FB0A6 /* llsecondlifeurls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AE41CB08F4842F00141675 /* llsecondlifeurls.cpp */; };
-		C1E4A58E0CC02160005FB0A6 /* llstringtable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922151074A9B58005E1F34 /* llstringtable.cpp */; };
-		C1E4A58F0CC02160005FB0A6 /* llsdutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913ADF0D0A250C750055AB21 /* llsdutil.cpp */; };
-		C1E4A5900CC02160005FB0A6 /* llstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192214F074A9B58005E1F34 /* llstring.cpp */; };
-		C1E4A5910CC02160005FB0A6 /* lluri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558280A06BB5F00DE9AE5 /* lluri.cpp */; };
-		C1E4A5920CC02160005FB0A6 /* llevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AF6BC80A544C71005B5E2C /* llevent.cpp */; };
-		C1E4A5930CC02160005FB0A6 /* llapr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915862D8075D2CE400F6A924 /* llapr.cpp */; };
-		C1E4A5940CC02160005FB0A6 /* llworkerthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99321B12081DD26000678159 /* llworkerthread.cpp */; };
-		C1E4A5960CC02160005FB0A6 /* llerrorthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B2863B00ABF637200A05D7C /* llerrorthread.cpp */; };
-		C1E4A5970CC02160005FB0A6 /* llsdserialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558260A06BB5F00DE9AE5 /* llsdserialize.cpp */; };
-		C1E4A5980CC02160005FB0A6 /* llrun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E333730ABB79AC004351DE /* llrun.cpp */; };
-		C1E4A59A0CC02160005FB0A6 /* llframetimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922139074A9B57005E1F34 /* llframetimer.cpp */; };
-		C1E4A59B0CC02160005FB0A6 /* llmemorystream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A3E09C75B3A00AA1849 /* llmemorystream.cpp */; };
-		C1E4A59C0CC02160005FB0A6 /* metaproperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C6E0A37203E006E8A2D /* metaproperty.cpp */; };
-		C1E4A59D0CC02160005FB0A6 /* llfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0633E5D009E341F500712406 /* llfile.cpp */; };
-		C1E4A59E0CC02160005FB0A6 /* llcriticaldamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922127074A9B57005E1F34 /* llcriticaldamp.cpp */; };
-		C1E4A59F0CC02160005FB0A6 /* llsdserialize_xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558240A06BB5F00DE9AE5 /* llsdserialize_xml.cpp */; };
-		C1E4A5A00CC02160005FB0A6 /* metaclass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C6B0A37203E006E8A2D /* metaclass.cpp */; };
-		C1E4A5A10CC02160005FB0A6 /* reflective.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C710A37203E006E8A2D /* reflective.cpp */; };
-		C1E4A5A20CC02160005FB0A6 /* llsys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922153074A9B58005E1F34 /* llsys.cpp */; };
-		C1E4A5A30CC02160005FB0A6 /* llassettype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99E4326B092D5996003AE728 /* llassettype.cpp */; };
-		C1E4A5A40CC02160005FB0A6 /* lltimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 616C4A8E0752C3D1006C2C65 /* lltimer.cpp */; };
-		C1E4A5A50CC02160005FB0A6 /* timing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922161074A9B58005E1F34 /* timing.cpp */; };
-		C1E4A5A60CC02160005FB0A6 /* llliveappconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */; };
-		C1E4A5A70CC0216F005FB0A6 /* llnullcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221DF074A9B59005E1F34 /* llnullcipher.cpp */; };
-		C1E4A5A80CC0216F005FB0A6 /* llurlrequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B39350F0AD6F9F400F57245 /* llurlrequest.cpp */; };
-		C1E4A5AA0CC0216F005FB0A6 /* lltransfersourceasset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F0074A9B59005E1F34 /* lltransfersourceasset.cpp */; };
-		C1E4A5AB0CC0216F005FB0A6 /* llhost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221D3074A9B59005E1F34 /* llhost.cpp */; };
-		C1E4A5AC0CC0216F005FB0A6 /* llmessageconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C659A850BAB0B6E00D2EB60 /* llmessageconfig.cpp */; };
-		C1E4A5AD0CC0216F005FB0A6 /* partsyspacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922211074A9B59005E1F34 /* partsyspacket.cpp */; };
-		C1E4A5AE0CC0216F005FB0A6 /* lltemplatemessagebuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D0FA690B4BF897003323BA /* lltemplatemessagebuilder.cpp */; };
-		C1E4A5AF0CC0216F005FB0A6 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922208074A9B59005E1F34 /* message.cpp */; };
-		C1E4A5B00CC0216F005FB0A6 /* llbufferstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A3A09C75B0500AA1849 /* llbufferstream.cpp */; };
-		C1E4A5B10CC0216F005FB0A6 /* llhttpnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDCB54F40AFBC5060033B433 /* llhttpnode.cpp */; };
-		C1E4A5B20CC0216F005FB0A6 /* lltransfersourcefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F2074A9B59005E1F34 /* lltransfersourcefile.cpp */; };
-		C1E4A5B30CC0216F005FB0A6 /* llchainio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD835B800AD1CB6700038B74 /* llchainio.cpp */; };
-		C1E4A5B40CC0216F005FB0A6 /* llhttpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B39350B0AD6F96900F57245 /* llhttpclient.cpp */; };
-		C1E4A5B50CC0216F005FB0A6 /* llxfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221FB074A9B59005E1F34 /* llxfer.cpp */; };
-		C1E4A5B60CC0216F005FB0A6 /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220F074A9B59005E1F34 /* network.cpp */; };
-		C1E4A5B70CC0216F005FB0A6 /* llpacketring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221E3074A9B59005E1F34 /* llpacketring.cpp */; };
-		C1E4A5B80CC0216F005FB0A6 /* llxfer_vfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922201074A9B59005E1F34 /* llxfer_vfile.cpp */; };
-		C1E4A5B90CC0216F005FB0A6 /* llsdmessagereader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4B14190B978815003F64DE /* llsdmessagereader.cpp */; };
-		C1E4A5BA0CC0216F005FB0A6 /* llxfermanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922203074A9B59005E1F34 /* llxfermanager.cpp */; };
-		C1E4A5BB0CC0216F005FB0A6 /* llmessagethrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A241CB8E07B3E383001A39E3 /* llmessagethrottle.cpp */; };
-		C1E4A5BC0CC0216F005FB0A6 /* llsdmessagebuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4B14170B978815003F64DE /* llsdmessagebuilder.cpp */; };
-		C1E4A5BD0CC0216F005FB0A6 /* message_string_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220C074A9B59005E1F34 /* message_string_table.cpp */; };
-		C1E4A5BE0CC0216F005FB0A6 /* message_prehash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220A074A9B59005E1F34 /* message_prehash.cpp */; };
-		C1E4A5BF0CC0216F005FB0A6 /* llmessagetemplate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D0FA6A0B4BF898003323BA /* llmessagetemplate.cpp */; };
-		C1E4A5C00CC0216F005FB0A6 /* llxfer_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221FD074A9B59005E1F34 /* llxfer_file.cpp */; };
-		C1E4A5C10CC0216F005FB0A6 /* llmime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91469E790B4486C10009E8F9 /* llmime.cpp */; };
-		C1E4A5C20CC0216F005FB0A6 /* llmessagereader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3834D6010B73ABC1002B61C8 /* llmessagereader.cpp */; };
-		C1E4A5C30CC0216F005FB0A6 /* patch_idct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922217074A9B59005E1F34 /* patch_idct.cpp */; };
-		C1E4A5C40CC0216F005FB0A6 /* lliosocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99374E460B5C603E008DB4BE /* lliosocket.cpp */; };
-		C1E4A5C50CC0216F005FB0A6 /* llcachename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221BB074A9B59005E1F34 /* llcachename.cpp */; };
-		C1E4A5C60CC0216F005FB0A6 /* llblowfishcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02017E0B7A861200D5C589 /* llblowfishcipher.cpp */; };
-		C1E4A5C70CC0216F005FB0A6 /* llpacketbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221E1074A9B59005E1F34 /* llpacketbuffer.cpp */; };
-		C1E4A5C80CC0216F005FB0A6 /* llmessagetemplateparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9CC280FE0BE79737006D8BDC /* llmessagetemplateparser.cpp */; };
-		C1E4A5C90CC0216F005FB0A6 /* llbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A3809C75B0500AA1849 /* llbuffer.cpp */; };
-		C1E4A5CA0CC0216F005FB0A6 /* llcurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA348DF80B0EAB31002C3015 /* llcurl.cpp */; };
-		C1E4A5CB0CC0216F005FB0A6 /* llxorcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922205074A9B59005E1F34 /* llxorcipher.cpp */; };
-		C1E4A5CC0CC0216F005FB0A6 /* llnamevalue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221DD074A9B59005E1F34 /* llnamevalue.cpp */; };
-		C1E4A5CD0CC0216F005FB0A6 /* lliobuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190430E08327117002396D4 /* lliobuffer.cpp */; };
-		C1E4A5CE0CC0216F005FB0A6 /* llpartdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221E5074A9B59005E1F34 /* llpartdata.cpp */; };
-		C1E4A5CF0CC0216F005FB0A6 /* llfiltersd2xmlrpc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190430C08327117002396D4 /* llfiltersd2xmlrpc.cpp */; };
-		C1E4A5D00CC0216F005FB0A6 /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192220D074A9B59005E1F34 /* net.cpp */; };
-		C1E4A5D10CC0216F005FB0A6 /* llxfer_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221FF074A9B59005E1F34 /* llxfer_mem.cpp */; };
-		C1E4A5D20CC0216F005FB0A6 /* llthrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221EC074A9B59005E1F34 /* llthrottle.cpp */; };
-		C1E4A5D40CC0216F005FB0A6 /* llinstantmessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AE41CF08F4845400141675 /* llinstantmessage.cpp */; };
-		C1E4A5D50CC0216F005FB0A6 /* llmessagebuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D0FA6B0B4BF898003323BA /* llmessagebuilder.cpp */; };
-		C1E4A5D60CC0216F005FB0A6 /* lldatapacker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221C5074A9B59005E1F34 /* lldatapacker.cpp */; };
-		C1E4A5D70CC0216F005FB0A6 /* patch_code.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922213074A9B59005E1F34 /* patch_code.cpp */; };
-		C1E4A5D80CC0216F005FB0A6 /* llservice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190431408327117002396D4 /* llservice.cpp */; };
-		C1E4A5D90CC0216F005FB0A6 /* llclassifiedflags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99FBB071087365E90048A5CC /* llclassifiedflags.cpp */; };
-		C1E4A5DA0CC0216F005FB0A6 /* patch_dct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922215074A9B59005E1F34 /* patch_dct.cpp */; };
-		C1E4A5DB0CC0216F005FB0A6 /* lltransfertargetvfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F6074A9B59005E1F34 /* lltransfertargetvfile.cpp */; };
-		C1E4A5DC0CC0216F005FB0A6 /* lltemplatemessagereader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3834D6030B73ABC1002B61C8 /* lltemplatemessagereader.cpp */; };
-		C1E4A5DD0CC0216F005FB0A6 /* llassetstorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221B9074A9B59005E1F34 /* llassetstorage.cpp */; };
-		C1E4A5DE0CC0216F005FB0A6 /* lldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221D0074A9B59005E1F34 /* lldispatcher.cpp */; };
-		C1E4A5DF0CC0216F005FB0A6 /* llpacketack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9117EAA10BF24A6100845BD2 /* llpacketack.cpp */; };
-		C1E4A5E00CC0216F005FB0A6 /* llcircuit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221BE074A9B59005E1F34 /* llcircuit.cpp */; };
-		C1E4A5E10CC0216F005FB0A6 /* llhttpsender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4B14140B978815003F64DE /* llhttpsender.cpp */; };
-		C1E4A5E20CC0216F005FB0A6 /* llpumpio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190431208327117002396D4 /* llpumpio.cpp */; };
-		C1E4A5E30CC0216F005FB0A6 /* lltransfertargetfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F4074A9B59005E1F34 /* lltransfertargetfile.cpp */; };
-		C1E4A5E40CC0216F005FB0A6 /* lluseroperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221F8074A9B59005E1F34 /* lluseroperation.cpp */; };
-		C1E4A5E50CC0216F005FB0A6 /* lliopipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9190431008327117002396D4 /* lliopipe.cpp */; };
-		C1E4A5E60CC0216F005FB0A6 /* llioutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A4609C75BCD00AA1849 /* llioutil.cpp */; };
-		C1E4A5E70CC0216F005FB0A6 /* lltransfermanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 619221EE074A9B59005E1F34 /* lltransfermanager.cpp */; };
-		C1E4A5F70CC0226A005FB0A6 /* llxmltree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192227B074A9B5A005E1F34 /* llxmltree.cpp */; };
-		C1E4A5F80CC0226A005FB0A6 /* llxmlnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBAAFE160858EBA400B9269A /* llxmlnode.cpp */; };
-		C1E4A5F90CC0226A005FB0A6 /* llcontrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0E2A5F0A2FDAEE0066250A /* llcontrol.cpp */; };
-		C1E4A5FA0CC0226A005FB0A6 /* llxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922279074A9B5A005E1F34 /* llxmlparser.cpp */; };
-		C1E4A5FE0CC02365005FB0A6 /* libxmlrpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765809BEA39700AF6316 /* libxmlrpc.a */; };
-		C1F5D0A50B138AEB00827F1D /* lluserrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1F5D0A30B138AEB00827F1D /* lluserrelations.cpp */; };
-		C64F673F0AFBED80009732B5 /* lllogchat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64F673D0AFBED80009732B5 /* lllogchat.cpp */; };
-		C64F67420AFBED91009732B5 /* lldirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64F67400AFBED91009732B5 /* lldirpicker.cpp */; };
-		CB0873B60D62226B009600F8 /* lldelayedgestureerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB0873B40D62226B009600F8 /* lldelayedgestureerror.cpp */; };
-		D1BB623D0D91BBEC00001516 /* llfloatervoicedevicesettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1BB623B0D91BBEB00001516 /* llfloatervoicedevicesettings.cpp */; };
-		D1CA83CE0D62634400C61743 /* llfloaterstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1CA83CD0D62634400C61743 /* llfloaterstats.cpp */; };
-		D23289B50C453A3600304FEF /* llfloaterreleasemsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */; };
-		D2768CE50CEA38940000BD66 /* llfloaterlagmeter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D2768CE30CEA38940000BD66 /* llfloaterlagmeter.cpp */; };
-		D62830DB0B4DC76300F8830F /* llimagej2coj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62830D80B4DC76300F8830F /* llimagej2coj.cpp */; };
-		D645940C0B3B6D9000FAB68F /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
-		D645940D0B3B6D9A00FAB68F /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
-		D64594130B3B6DE100FAB68F /* libllcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6192E764074A7CE9005E1F34 /* libllcommon.a */; };
-		D64594620B3B731700FAB68F /* llimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D9B074AE4F2005E1F34 /* llimage.cpp */; };
-		D64594630B3B731800FAB68F /* llimagebmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D9D074AE4F2005E1F34 /* llimagebmp.cpp */; };
-		D64594640B3B731A00FAB68F /* llimagedxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE725083AC2F2002BF676 /* llimagedxt.cpp */; };
-		D64594660B3B731D00FAB68F /* llimagej2c.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923DA0074AE4F2005E1F34 /* llimagej2c.cpp */; };
-		D64594680B3B732200FAB68F /* llimagejpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923DA2074AE4F2005E1F34 /* llimagejpeg.cpp */; };
-		D64594690B3B732300FAB68F /* llimagetga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923DA4074AE4F2005E1F34 /* llimagetga.cpp */; };
-		D651349D0B3C40870042C56E /* llqueuedthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF9D84F08B405630094E8E7 /* llqueuedthread.cpp */; };
-		D6B766800BFE8E9B00DC8153 /* llfloaterchatterbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6B7667F0BFE8E9A00DC8153 /* llfloaterchatterbox.cpp */; };
-		D6F77CBC0B445C3B0040826D /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9985A1270AC1FE4E00579AFB /* AppKit.framework */; };
-		D8CA570F0BAF74FC0093D6D4 /* llvoicevisualizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D8CA570E0BAF74FC0093D6D4 /* llvoicevisualizer.cpp */; };
-		D8EAB8B60BE7B3D10067DBB3 /* llfloateractivespeakers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D8EAB8B40BE7B3D10067DBB3 /* llfloateractivespeakers.cpp */; };
-		D8EAB8BA0BE7B4490067DBB3 /* llvoiceremotectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D8EAB8B80BE7B4490067DBB3 /* llvoiceremotectrl.cpp */; };
-		DA4B141B0B978815003F64DE /* llhttpsender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4B14140B978815003F64DE /* llhttpsender.cpp */; };
-		DA4B141C0B978815003F64DE /* llsdmessagebuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4B14170B978815003F64DE /* llsdmessagebuilder.cpp */; };
-		DA4B141D0B978815003F64DE /* llsdmessagereader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4B14190B978815003F64DE /* llsdmessagereader.cpp */; };
-		DA8C5F9B0B61A9F900BCA79A /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764F09BEA39600AF6316 /* libexpat.a */; };
-		DA9C40E00B54B4BA00DD6F44 /* llformat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA9C40DF0B54B4BA00DD6F44 /* llformat.cpp */; };
-		DA9C41140B54B8CA00DD6F44 /* lllivefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA9C41120B54B8CA00DD6F44 /* lllivefile.cpp */; };
-		DA9C411F0B54B9AE00DD6F44 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764F09BEA39600AF6316 /* libexpat.a */; };
-		DA9C41200B54B9B300DD6F44 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
-		DA9C412B0B54B9DA00DD6F44 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
-		DA9C412C0B54B9DE00DD6F44 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764F09BEA39600AF6316 /* libexpat.a */; };
-		E34C14740AE6A3F0009BF4DE /* llmapresponders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E34C14730AE6A3F0009BF4DE /* llmapresponders.cpp */; };
-		EB3EE6C6083ABB5E002BF676 /* llbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE68E083ABB5D002BF676 /* llbutton.cpp */; };
-		EB3EE6C8083ABB5E002BF676 /* llcheckboxctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE690083ABB5D002BF676 /* llcheckboxctrl.cpp */; };
-		EB3EE6CA083ABB5E002BF676 /* llclipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE692083ABB5D002BF676 /* llclipboard.cpp */; };
-		EB3EE6CC083ABB5E002BF676 /* llcombobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE694083ABB5D002BF676 /* llcombobox.cpp */; };
-		EB3EE6CE083ABB5E002BF676 /* lldraghandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE696083ABB5D002BF676 /* lldraghandle.cpp */; };
-		EB3EE6D0083ABB5E002BF676 /* llfloater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE698083ABB5D002BF676 /* llfloater.cpp */; };
-		EB3EE6D2083ABB5E002BF676 /* llfocusmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE69A083ABB5D002BF676 /* llfocusmgr.cpp */; };
-		EB3EE6D4083ABB5E002BF676 /* lliconctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE69C083ABB5D002BF676 /* lliconctrl.cpp */; };
-		EB3EE6D6083ABB5E002BF676 /* llkeywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE69E083ABB5D002BF676 /* llkeywords.cpp */; };
-		EB3EE6D8083ABB5E002BF676 /* lllineeditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6A0083ABB5D002BF676 /* lllineeditor.cpp */; };
-		EB3EE6DA083ABB5E002BF676 /* llpanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6A2083ABB5D002BF676 /* llpanel.cpp */; };
-		EB3EE6DC083ABB5E002BF676 /* llradiogroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6A4083ABB5D002BF676 /* llradiogroup.cpp */; };
-		EB3EE6DE083ABB5E002BF676 /* llresizebar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6A6083ABB5D002BF676 /* llresizebar.cpp */; };
-		EB3EE6E0083ABB5E002BF676 /* llresizehandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6A8083ABB5D002BF676 /* llresizehandle.cpp */; };
-		EB3EE6E2083ABB5E002BF676 /* llscrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6AA083ABB5D002BF676 /* llscrollbar.cpp */; };
-		EB3EE6E4083ABB5E002BF676 /* llscrollcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6AC083ABB5D002BF676 /* llscrollcontainer.cpp */; };
-		EB3EE6E6083ABB5E002BF676 /* llscrolllistctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6AE083ABB5D002BF676 /* llscrolllistctrl.cpp */; };
-		EB3EE6E8083ABB5E002BF676 /* llslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6B0083ABB5D002BF676 /* llslider.cpp */; };
-		EB3EE6EA083ABB5E002BF676 /* llsliderctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6B2083ABB5D002BF676 /* llsliderctrl.cpp */; };
-		EB3EE6EC083ABB5E002BF676 /* llspinctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6B4083ABB5D002BF676 /* llspinctrl.cpp */; };
-		EB3EE6EE083ABB5E002BF676 /* llstyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6B6083ABB5D002BF676 /* llstyle.cpp */; };
-		EB3EE6F0083ABB5E002BF676 /* lltabcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6B8083ABB5D002BF676 /* lltabcontainer.cpp */; };
-		EB3EE6F2083ABB5E002BF676 /* lltabcontainervertical.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6BA083ABB5D002BF676 /* lltabcontainervertical.cpp */; };
-		EB3EE6F4083ABB5E002BF676 /* lltextbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6BC083ABB5D002BF676 /* lltextbox.cpp */; };
-		EB3EE6F8083ABB5E002BF676 /* lltexteditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6C0083ABB5D002BF676 /* lltexteditor.cpp */; };
-		EB3EE6FA083ABB5E002BF676 /* lluictrlfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6C2083ABB5D002BF676 /* lluictrlfactory.cpp */; };
-		EB3EE6FC083ABB5E002BF676 /* llviewborder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6C4083ABB5E002BF676 /* llviewborder.cpp */; };
-		EB3EE720083AC23D002BF676 /* llviewertexteditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE712083AC23D002BF676 /* llviewertexteditor.cpp */; };
-		EB9E831F082AEEF3007B4479 /* llmenugl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E8314082AEEF2007B4479 /* llmenugl.cpp */; };
-		EB9E8321082AEEF3007B4479 /* llresmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E8316082AEEF2007B4479 /* llresmgr.cpp */; };
-		EB9E8323082AEEF3007B4479 /* llui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E8318082AEEF3007B4479 /* llui.cpp */; };
-		EB9E8326082AEEF3007B4479 /* lluictrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E831B082AEEF3007B4479 /* lluictrl.cpp */; };
-		EB9E8328082AEEF3007B4479 /* llview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E831D082AEEF3007B4479 /* llview.cpp */; };
-		EBAAFE180858EBA400B9269A /* llxmlnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBAAFE160858EBA400B9269A /* llxmlnode.cpp */; };
-		F626410C0B1F75D000E5BBAD /* llwindowheadless.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62641080B1F757D00E5BBAD /* llwindowheadless.cpp */; };
-		FD15582A0A06BB5F00DE9AE5 /* lldate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558220A06BB5F00DE9AE5 /* lldate.cpp */; };
-		FD15582D0A06BB5F00DE9AE5 /* lluri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558280A06BB5F00DE9AE5 /* lluri.cpp */; };
-		FD1558330A06BC0600DE9AE5 /* llsd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 918B123A07B19605008CD6CD /* llsd.cpp */; };
-		FD15583B0A06BD2500DE9AE5 /* llsdserialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558260A06BB5F00DE9AE5 /* llsdserialize.cpp */; };
-		FD1558B20A06C1C700DE9AE5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1558B00A06C16C00DE9AE5 /* libiconv.dylib */; };
-		FD34696B0B5C3C55007318E5 /* libllcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD34696A0B5C3C55007318E5 /* libllcurl.a */; };
-		FD34696E0B5C47B0007318E5 /* libllcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD34696A0B5C3C55007318E5 /* libllcurl.a */; };
-		FD34696F0B5C47B0007318E5 /* libllcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD34696A0B5C3C55007318E5 /* libllcurl.a */; };
-		FD53B3C309BDD5F900BFE3BC /* AutoUpdater.app in Resources */ = {isa = PBXBuildFile; fileRef = 99D5703305BDEFD7004DE704 /* AutoUpdater.app */; };
-		FD53B3C409BDD5FA00BFE3BC /* crashreporter.app in Resources */ = {isa = PBXBuildFile; fileRef = 9932ED1F056C1F0900554101 /* crashreporter.app */; };
-		FD59ED5F0AF2AF460086642A /* llassetuploadresponders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD59ED5D0AF2AF460086642A /* llassetuploadresponders.cpp */; };
-		FD6C9A2909C758BC00AA1849 /* llfloaterscriptdebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A2109C758BC00AA1849 /* llfloaterscriptdebug.cpp */; };
-		FD6C9A2A09C758BC00AA1849 /* llfloatertelehub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A2309C758BC00AA1849 /* llfloatertelehub.cpp */; };
-		FD6C9A2B09C758BC00AA1849 /* llfollowcam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A2509C758BC00AA1849 /* llfollowcam.cpp */; };
-		FD6C9A2C09C758BC00AA1849 /* llhudicon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A2709C758BC00AA1849 /* llhudicon.cpp */; };
-		FD6C9A3609C75A8500AA1849 /* llfloaterpermissionsmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A3409C75A8500AA1849 /* llfloaterpermissionsmgr.cpp */; };
-		FD6C9A3C09C75B0500AA1849 /* llbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A3809C75B0500AA1849 /* llbuffer.cpp */; };
-		FD6C9A3D09C75B0500AA1849 /* llbufferstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A3A09C75B0500AA1849 /* llbufferstream.cpp */; };
-		FD6C9A4009C75B3A00AA1849 /* llmemorystream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A3E09C75B3A00AA1849 /* llmemorystream.cpp */; };
-		FD6C9A4409C75B8900AA1849 /* llfloatertopobjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A4209C75B8900AA1849 /* llfloatertopobjects.cpp */; };
-		FD6C9A4809C75BCD00AA1849 /* llioutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A4609C75BCD00AA1849 /* llioutil.cpp */; };
-		FD6C9A5309C773A000AA1849 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
-		FD835B810AD1CB6700038B74 /* llchainio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD835B800AD1CB6700038B74 /* llchainio.cpp */; };
-		FDA39C790A372074006E8A2D /* metaclass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C6B0A37203E006E8A2D /* metaclass.cpp */; };
-		FDA39C7A0A372074006E8A2D /* metaproperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C6E0A37203E006E8A2D /* metaproperty.cpp */; };
-		FDA39C7B0A372074006E8A2D /* reflective.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C710A37203E006E8A2D /* reflective.cpp */; };
-		FDAA36AA09B916BD00FBF1CA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
-		FDAA36AB09B916CA00FBF1CA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
-		FDAA36B709B919AD00FBF1CA /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36B609B919AD00FBF1CA /* libssl.dylib */; };
-		FDAA36B809B919AD00FBF1CA /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36B609B919AD00FBF1CA /* libssl.dylib */; };
-		FDAA36B909B919AD00FBF1CA /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36B609B919AD00FBF1CA /* libssl.dylib */; };
-		FDAA36BB09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BA09B919CD00FBF1CA /* libcrypto.dylib */; };
-		FDAA36BC09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BA09B919CD00FBF1CA /* libcrypto.dylib */; };
-		FDAA36BD09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BA09B919CD00FBF1CA /* libcrypto.dylib */; };
-		FDAA36BF09B919DF00FBF1CA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BE09B919DF00FBF1CA /* libz.dylib */; };
-		FDAA36C009B919DF00FBF1CA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BE09B919DF00FBF1CA /* libz.dylib */; };
-		FDAA36C109B919DF00FBF1CA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BE09B919DF00FBF1CA /* libz.dylib */; };
-		FDAA36C309B919F600FBF1CA /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36C209B919F600FBF1CA /* libmx.dylib */; };
-		FDCB54F60AFBC5060033B433 /* llhttpnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDCB54F40AFBC5060033B433 /* llhttpnode.cpp */; };
-		FDCB55290AFBD4310033B433 /* lleventpoll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDCB55270AFBD4310033B433 /* lleventpoll.cpp */; };
-		FDD3FD710B6A89A0009173F1 /* libcares.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDD3FD700B6A89A0009173F1 /* libcares.a */; };
-		FDD3FD720B6A89A0009173F1 /* libcares.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDD3FD700B6A89A0009173F1 /* libcares.a */; };
-		FDD3FD730B6A89A0009173F1 /* libcares.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDD3FD700B6A89A0009173F1 /* libcares.a */; };
-		FDE8765909BEA3B800AF6316 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
-		FDE8765A09BEA3BC00AF6316 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
-		FDE8765C09BEA3C300AF6316 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
-		FDE8765D09BEA3C400AF6316 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764F09BEA39600AF6316 /* libexpat.a */; };
-		FDE8765F09BEA3C500AF6316 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765109BEA39600AF6316 /* libfreetype.a */; };
-		FDE8766109BEA3C600AF6316 /* liblljpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765309BEA39600AF6316 /* liblljpeg.a */; };
-		FDE8766209BEA3C600AF6316 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765409BEA39600AF6316 /* libogg.a */; };
-		FDE8766309BEA3C600AF6316 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765509BEA39600AF6316 /* libvorbis.a */; };
-		FDE8766409BEA3C700AF6316 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765609BEA39600AF6316 /* libvorbisenc.a */; };
-		FDE8766509BEA3C700AF6316 /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765709BEA39600AF6316 /* libvorbisfile.a */; };
-		FDE8766609BEA3C800AF6316 /* libxmlrpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765809BEA39700AF6316 /* libxmlrpc.a */; };
-		FE065EA40D8B0EE60089E9F1 /* llwatchdog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE065EA10D8B0EE60089E9F1 /* llwatchdog.cpp */; };
-		FE065EA50D8B0EE60089E9F1 /* llwindebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE065EA30D8B0EE60089E9F1 /* llwindebug.cpp */; };
-		FE0AEE2D0D2D96D20097256A /* libllmozlib2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FE0AEE2C0D2D96D20097256A /* libllmozlib2.dylib */; };
-		FE0AEE4D0D2D9C6E0097256A /* llparcelselection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE0AEE4A0D2D9C6E0097256A /* llparcelselection.cpp */; };
-		FE42C3140D231D1A00D9F143 /* llcommandlineparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE42C3120D231D1A00D9F143 /* llcommandlineparser.cpp */; };
-		FE43BB870D368B4100C93D63 /* libboost_program_options-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FE43BB860D368B4100C93D63 /* libboost_program_options-mt.a */; };
-		FE5138790CD80BAE00F32EE3 /* lldebugmessagebox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5138700CD80BAE00F32EE3 /* lldebugmessagebox.cpp */; };
-		FE51387B0CD80BAE00F32EE3 /* llfloaterclassified.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5138730CD80BAE00F32EE3 /* llfloaterclassified.cpp */; };
-		FE51387C0CD80BAE00F32EE3 /* llfloaterevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5138750CD80BAE00F32EE3 /* llfloaterevent.cpp */; };
-		FE51387D0CD80BAE00F32EE3 /* llfloaterparcel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5138770CD80BAE00F32EE3 /* llfloaterparcel.cpp */; };
-		FE679A3D0CDFF5AC00959041 /* llappviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE679A350CDFF5AC00959041 /* llappviewer.cpp */; };
-		FE679A3E0CDFF5AC00959041 /* llappviewermacosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE679A370CDFF5AC00959041 /* llappviewermacosx.cpp */; };
-		FE679A3F0CDFF5AC00959041 /* llvectorperfoptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE679A390CDFF5AC00959041 /* llvectorperfoptions.cpp */; };
-		FE679A400CDFF5AC00959041 /* llvieweraudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE679A3B0CDFF5AC00959041 /* llvieweraudio.cpp */; };
-		FEE6C82D0D2D6DAC00C97E9C /* llmediaimplcommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8160D2D6DAC00C97E9C /* llmediaimplcommon.cpp */; };
-		FEE6C82E0D2D6DAC00C97E9C /* llmediaimplexample1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8180D2D6DAC00C97E9C /* llmediaimplexample1.cpp */; };
-		FEE6C82F0D2D6DAC00C97E9C /* llmediaimplexample2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C81A0D2D6DAC00C97E9C /* llmediaimplexample2.cpp */; };
-		FEE6C8300D2D6DAC00C97E9C /* llmediaimplfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C81C0D2D6DAC00C97E9C /* llmediaimplfactory.cpp */; };
-		FEE6C8310D2D6DAC00C97E9C /* llmediaimplgstreamer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C81E0D2D6DAC00C97E9C /* llmediaimplgstreamer.cpp */; };
-		FEE6C8320D2D6DAC00C97E9C /* llmediaimplgstreamer_syms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8200D2D6DAC00C97E9C /* llmediaimplgstreamer_syms.cpp */; };
-		FEE6C8360D2D6DAC00C97E9C /* llmediaimplgstreamervidplug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8250D2D6DAC00C97E9C /* llmediaimplgstreamervidplug.cpp */; };
-		FEE6C8370D2D6DAC00C97E9C /* llmediaimplllmozlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8270D2D6DAC00C97E9C /* llmediaimplllmozlib.cpp */; };
-		FEE6C8380D2D6DAC00C97E9C /* llmediamanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C82A0D2D6DAC00C97E9C /* llmediamanager.cpp */; };
-		FEE6C8490D2D6E1500C97E9C /* llfloaterhtmlhelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8390D2D6E1500C97E9C /* llfloaterhtmlhelp.cpp */; };
-		FEE6C84A0D2D6E1500C97E9C /* llfloaterurlentry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C83B0D2D6E1500C97E9C /* llfloaterurlentry.cpp */; };
-		FEE6C84B0D2D6E1500C97E9C /* llmimetypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C83D0D2D6E1500C97E9C /* llmimetypes.cpp */; };
-		FEE6C84C0D2D6E1500C97E9C /* llpanellandmedia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C83F0D2D6E1500C97E9C /* llpanellandmedia.cpp */; };
-		FEE6C84D0D2D6E1500C97E9C /* llurlhistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8410D2D6E1500C97E9C /* llurlhistory.cpp */; };
-		FEE6C84E0D2D6E1500C97E9C /* llviewermedia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8430D2D6E1500C97E9C /* llviewermedia.cpp */; };
-		FEE6C84F0D2D6E1500C97E9C /* llviewerparcelmedia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8450D2D6E1500C97E9C /* llviewerparcelmedia.cpp */; };
-		FEE6C8500D2D6E1500C97E9C /* llviewerparcelmediaautoplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE6C8470D2D6E1500C97E9C /* llviewerparcelmediaautoplay.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXBuildRule section */
-		99AB96D708833F2A00AA3C8C /* PBXBuildRule */ = {
-			isa = PBXBuildRule;
-			compilerSpec = com.apple.compilers.proxy.script;
-			fileType = sourcecode.yacc;
-			isEditable = 1;
-			outputFiles = (
-				"$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.cpp",
-				"$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.h",
-			);
-			script = "mkdir -p \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}\"\n/usr/bin/yacc -d -o \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.cpp\" \"${INPUT_FILE_PATH}\"\n\nif [ -f \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.hpp\" ] ; then\n\tif [ \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.hpp\" -nt \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.h\" ] ; then\n\t\tcp \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.hpp\" \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.h\"\n\tfi\nfi\n";
-		};
-		99AB96D808833FCD00AA3C8C /* PBXBuildRule */ = {
-			isa = PBXBuildRule;
-			compilerSpec = com.apple.compilers.proxy.script;
-			fileType = sourcecode.lex;
-			isEditable = 1;
-			outputFiles = (
-				"$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).l.cpp",
-			);
-			script = "mkdir -p \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}\"\n/usr/bin/lex -o\"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.l.cpp\" \"${INPUT_FILE_PATH}\"";
-		};
-/* End PBXBuildRule section */
-
-/* Begin PBXContainerItemProxy section */
-		993576720B4489EE00D10C77 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = FD53B40509BDF9F600BFE3BC;
-			remoteInfo = "third party libs";
-		};
-		9950AF490B3762BE007E36E0 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = FD53B40509BDF9F600BFE3BC;
-			remoteInfo = "third party libs";
-		};
-		9967E91B0B3754610087BD1B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 9967E9080B37533F0087BD1B;
-			remoteInfo = fmodwrapper;
-		};
-		99CDED6B05E70D850000F8AA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 99CDED4905E70BAB0000F8AA;
-			remoteInfo = llcommon;
-		};
-		99CDED6F05E70DA20000F8AA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 99CDED4905E70BAB0000F8AA;
-			remoteInfo = llcommon;
-		};
-		99CDED7105E70DAA0000F8AA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 99CDED4905E70BAB0000F8AA;
-			remoteInfo = llcommon;
-		};
-		99FCDAE7093D1FC3003D3B63 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 99D5703205BDEFD7004DE704;
-			remoteInfo = AutoUpdater;
-		};
-		99FCDAEB093D1FC8003D3B63 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 9932ED1E056C1F0900554101;
-			remoteInfo = crashreporter;
-		};
-		D64593570B3B4D8500FAB68F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 99CDED4905E70BAB0000F8AA;
-			remoteInfo = llcommon;
-		};
-		D64E29CD0B4B288600963559 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteInfo = llkdu;
-		};
-		FD53B40B09BDFD3E00BFE3BC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteInfo = "third party libs";
-		};
-		FD53B40F09BDFD5300BFE3BC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteInfo = "third party libs";
-		};
-		FD53B41109BDFD5A00BFE3BC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteInfo = "third party libs";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		019200F004DD7D2B00A800A7 /* macview_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macview_Prefix.h; sourceTree = "<group>"; };
-		019200F204DD7D3500A800A7 /* macview.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = macview.r; sourceTree = "<group>"; };
-		0633E5D009E341F500712406 /* llfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfile.cpp; sourceTree = "<group>"; };
-		0633E5D109E341F500712406 /* llfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfile.h; sourceTree = "<group>"; };
-		0633E5D309E3421500712406 /* llstreamtools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstreamtools.cpp; sourceTree = "<group>"; };
-		0633E5D409E3421500712406 /* llstreamtools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstreamtools.h; sourceTree = "<group>"; };
-		07167BBA0DCA8059003FE31D /* llrender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llrender.cpp; sourceTree = "<group>"; };
-		07167BBB0DCA8059003FE31D /* llrender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llrender.h; sourceTree = "<group>"; };
-		0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1A02016D0B7A85DE00D5C589 /* llbase64.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbase64.cpp; sourceTree = "<group>"; };
-		1A02016E0B7A85DE00D5C589 /* llbase64.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbase64.h; sourceTree = "<group>"; };
-		1A02017E0B7A861200D5C589 /* llblowfishcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llblowfishcipher.cpp; sourceTree = "<group>"; };
-		1A02017F0B7A861200D5C589 /* llblowfishcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llblowfishcipher.h; sourceTree = "<group>"; };
-		1A0201800B7A861200D5C589 /* llcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcipher.h; sourceTree = "<group>"; };
-		1A0201810B7A861200D5C589 /* llnullcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnullcipher.cpp; sourceTree = "<group>"; };
-		1A0201820B7A861200D5C589 /* llnullcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnullcipher.h; sourceTree = "<group>"; };
-		1A0201830B7A861200D5C589 /* llxorcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxorcipher.cpp; sourceTree = "<group>"; };
-		1A0201840B7A861200D5C589 /* llxorcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxorcipher.h; sourceTree = "<group>"; };
-		1A0DA5100C3AC07700361F49 /* llviewerjointmesh_vec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerjointmesh_vec.cpp; sourceTree = "<group>"; };
-		1A0DA5110C3AC07700361F49 /* llviewerjointmesh_sse2.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerjointmesh_sse2.cpp; sourceTree = "<group>"; };
-		1A0DA5120C3AC07700361F49 /* llviewerjointmesh_sse.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerjointmesh_sse.cpp; sourceTree = "<group>"; };
-		1A1C615E0847AEE6005D7227 /* llvolumemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvolumemgr.cpp; sourceTree = "<group>"; };
-		1A1C615F0847AEE6005D7227 /* llvolume.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvolume.cpp; sourceTree = "<group>"; };
-		1A1C61600847AEE6005D7227 /* llvolumemgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvolumemgr.h; sourceTree = "<group>"; };
-		1A1C61610847AEE6005D7227 /* llvolume.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvolume.h; sourceTree = "<group>"; };
-		1A1C61730847B307005D7227 /* llvolumemessage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvolumemessage.h; sourceTree = "<group>"; };
-		1A1C61740847B307005D7227 /* llvolumemessage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvolumemessage.cpp; sourceTree = "<group>"; };
-		1A1F130A0B3919F100845A6C /* lleditmenuhandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleditmenuhandler.h; sourceTree = "<group>"; };
-		1A1F130B0B3919F100845A6C /* lleditmenuhandler.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lleditmenuhandler.cpp; sourceTree = "<group>"; };
-		1A3143D00A02B701005B87E7 /* llviewernetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewernetwork.cpp; sourceTree = "<group>"; };
-		1A3143DB0A02B70E005B87E7 /* llviewernetwork.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewernetwork.h; sourceTree = "<group>"; };
-		1A3143DC0A02B720005B87E7 /* llprefsim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprefsim.h; sourceTree = "<group>"; };
-		1A3143DD0A02B725005B87E7 /* llprefschat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprefschat.h; sourceTree = "<group>"; };
-		1A3143DE0A02B737005B87E7 /* llprefsim.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llprefsim.cpp; sourceTree = "<group>"; };
-		1A3143E00A02B73D005B87E7 /* llprefschat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llprefschat.cpp; sourceTree = "<group>"; };
-		1A46370909DA1FD10040EA83 /* llclickaction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclickaction.h; sourceTree = "<group>"; };
-		1A47B8DD0860FDF100F73746 /* llpanelweb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelweb.h; sourceTree = "<group>"; };
-		1A47B8DE0860FDF100F73746 /* llpanelweb.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelweb.cpp; sourceTree = "<group>"; };
-		1A5104440ABF5B5A00520F6D /* llnotecard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnotecard.cpp; sourceTree = "<group>"; };
-		1A5104460ABF5B6600520F6D /* llnotecard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnotecard.h; sourceTree = "<group>"; };
-		1A5104560ABF60A800520F6D /* llviewerassetstorage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerassetstorage.cpp; sourceTree = "<group>"; };
-		1A5104580ABF60BF00520F6D /* llviewerassetstorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerassetstorage.h; sourceTree = "<group>"; };
-		1A531BFA0D81056E00DEB305 /* llfloatercamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloatercamera.h; sourceTree = "<group>"; };
-		1A531BFB0D81056E00DEB305 /* llfloatercamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatercamera.cpp; sourceTree = "<group>"; };
-		1A57B92C09F8303A004D8B1A /* lllslconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllslconstants.h; sourceTree = "<group>"; };
-		1A57B92D09F8303A004D8B1A /* llagentconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagentconstants.h; sourceTree = "<group>"; };
-		1A5B3B530A70146900A90391 /* llfloaterbump.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbump.h; sourceTree = "<group>"; };
-		1A5B3B540A70147000A90391 /* llfloaterbump.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbump.cpp; sourceTree = "<group>"; };
-		1A61A7EF0A5ED446009FE3D2 /* llfloateravatarpicker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateravatarpicker.cpp; sourceTree = "<group>"; };
-		1A61A7FA0A5ED44E009FE3D2 /* llfloateravatarpicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateravatarpicker.h; sourceTree = "<group>"; };
-		1A758C910A436FCA00589675 /* llagentdata.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llagentdata.cpp; sourceTree = "<group>"; };
-		1A758C930A436FD800589675 /* llpanellandobjects.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanellandobjects.cpp; sourceTree = "<group>"; };
-		1A758C950A436FDE00589675 /* llpanellandoptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanellandoptions.cpp; sourceTree = "<group>"; };
-		1A758C970A436FF000589675 /* llpanellandobjects.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanellandobjects.h; sourceTree = "<group>"; };
-		1A758C980A436FF400589675 /* llpanellandoptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanellandoptions.h; sourceTree = "<group>"; };
-		1A758C990A43700400589675 /* llagentdata.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagentdata.h; sourceTree = "<group>"; };
-		1A83767C0BA2169600F28979 /* llviewergenericmessage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewergenericmessage.h; sourceTree = "<group>"; };
-		1A83767D0BA2169600F28979 /* llviewergenericmessage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewergenericmessage.cpp; sourceTree = "<group>"; };
-		1A8870D30BCC5A6300E89AA6 /* llinventorytype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinventorytype.h; sourceTree = "<group>"; };
-		1A8870D40BCC5A6300E89AA6 /* llinventorytype.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventorytype.cpp; sourceTree = "<group>"; };
-		1A8870E30BCC5A9500E89AA6 /* llviewermenufile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewermenufile.h; sourceTree = "<group>"; };
-		1A8870E40BCC5A9500E89AA6 /* llviewermenufile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewermenufile.cpp; sourceTree = "<group>"; };
-		1A8870E60BCC5AAD00E89AA6 /* llresourcedata.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llresourcedata.h; sourceTree = "<group>"; };
-		1A89230308B12D1000A04AA9 /* llurlwhitelist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlwhitelist.cpp; sourceTree = "<group>"; };
-		1A89230408B12D1000A04AA9 /* llurlwhitelist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlwhitelist.h; sourceTree = "<group>"; };
-		1A89230608B12D2E00A04AA9 /* llfloateropenobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateropenobject.cpp; sourceTree = "<group>"; };
-		1A89230708B12D2E00A04AA9 /* llfloateropenobject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateropenobject.h; sourceTree = "<group>"; };
-		1A8BF3770A1AAB7B005B9D5A /* llcallbackmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallbackmap.h; sourceTree = "<group>"; };
-		1A8BF3780A1AAB99005B9D5A /* llfloatertest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatertest.cpp; sourceTree = "<group>"; };
-		1A8BF3790A1AABAD005B9D5A /* llfloatertest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatertest.h; sourceTree = "<group>"; };
-		1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llliveappconfig.cpp; sourceTree = "<group>"; };
-		1A97C4550B8BCF9C00331A24 /* llliveappconfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llliveappconfig.h; sourceTree = "<group>"; };
-		1A9897E70B98E2F4005C45D7 /* llbase32.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbase32.h; sourceTree = "<group>"; };
-		1A9897E80B98E2F4005C45D7 /* llbase32.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbase32.cpp; sourceTree = "<group>"; };
-		1A9EC236083EA0100023D510 /* llfloatereditui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatereditui.cpp; sourceTree = "<group>"; };
-		1A9EC23A083EA01F0023D510 /* llfloatereditui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatereditui.h; sourceTree = "<group>"; };
-		1AA2EE9C0CBBE2790017E185 /* llfloaterlandmark.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterlandmark.h; sourceTree = "<group>"; };
-		1AA2EE9D0CBBE2790017E185 /* llfloaterlandmark.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterlandmark.cpp; sourceTree = "<group>"; };
-		1AA2EE9F0CBBE28C0017E185 /* llclassifiedstatsresponder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclassifiedstatsresponder.h; sourceTree = "<group>"; };
-		1AA2EEA00CBBE28C0017E185 /* llclassifiedstatsresponder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llclassifiedstatsresponder.cpp; sourceTree = "<group>"; };
-		1AA2EEA20CBBE2BF0017E185 /* llfloaterurldisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterurldisplay.h; sourceTree = "<group>"; };
-		1AA2EEA30CBBE2BF0017E185 /* llfloaterurldisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterurldisplay.cpp; sourceTree = "<group>"; };
-		1AA2EEA50CBBE2D40017E185 /* llremoteparcelrequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llremoteparcelrequest.h; sourceTree = "<group>"; };
-		1AA2EEA60CBBE2D40017E185 /* llremoteparcelrequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llremoteparcelrequest.cpp; sourceTree = "<group>"; };
-		1AB0DADC0A52E8A0001CACEB /* message_template.msg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = message_template.msg; path = ../../scripts/messages/message_template.msg; sourceTree = SOURCE_ROOT; };
-		1AD3940C0CAB0003004BA76A /* llurlsimstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlsimstring.h; sourceTree = "<group>"; };
-		1AD3940D0CAB0003004BA76A /* llurldispatcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurldispatcher.h; sourceTree = "<group>"; };
-		1AD3940E0CAB000F004BA76A /* llurlsimstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlsimstring.cpp; sourceTree = "<group>"; };
-		1AD3940F0CAB000F004BA76A /* llurldispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurldispatcher.cpp; sourceTree = "<group>"; };
-		1AD394120CAB001B004BA76A /* llcommandhandler.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcommandhandler.cpp; sourceTree = "<group>"; };
-		1AD394140CAB0023004BA76A /* llcommandhandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcommandhandler.h; sourceTree = "<group>"; };
-		1AD61F6A0AC09B1900507FB9 /* llimview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimview.cpp; sourceTree = "<group>"; };
-		1AD61F6C0AC09B2600507FB9 /* llimview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimview.h; sourceTree = "<group>"; };
-		1ADE58920D7CCF6000183F7F /* llfloaterhud.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterhud.cpp; sourceTree = "<group>"; };
-		1ADE58930D7CCF6000183F7F /* llfloaterhud.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloaterhud.h; sourceTree = "<group>"; };
-		1AE082090DA708E900575141 /* llanimstatelabels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llanimstatelabels.cpp; sourceTree = "<group>"; };
-		1AE0820A0DA708E900575141 /* llanimstatelabels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llanimstatelabels.h; sourceTree = "<group>"; };
-		1AE0820B0DA708E900575141 /* llstylemap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llstylemap.cpp; sourceTree = "<group>"; };
-		1AE0820C0DA708E900575141 /* llstylemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llstylemap.h; sourceTree = "<group>"; };
-		1AE0820D0DA708E900575141 /* lltrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lltrans.cpp; sourceTree = "<group>"; };
-		1AE0820E0DA708E900575141 /* lltrans.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lltrans.h; sourceTree = "<group>"; };
-		1AE5D70F0844FBD200278605 /* llwebbrowserctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwebbrowserctrl.h; sourceTree = "<group>"; };
-		1AE5D7100844FBD300278605 /* llwebbrowserctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwebbrowserctrl.cpp; sourceTree = "<group>"; };
-		1AEF0A560B2DFE67003F107C /* llctrlselectioninterface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llctrlselectioninterface.cpp; sourceTree = "<group>"; };
-		1AEF0A570B2DFE67003F107C /* llctrlselectioninterface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llctrlselectioninterface.h; sourceTree = "<group>"; };
-		1AEF0A590B2DFE71003F107C /* llrootview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llrootview.h; sourceTree = "<group>"; };
-		1AEF0A5A0B2DFE72003F107C /* llrootview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrootview.cpp; sourceTree = "<group>"; };
-		1AF6402B0B2F393900FE6840 /* llgltypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgltypes.h; sourceTree = "<group>"; };
-		1AF7C1E30AF6C44800C4BF4A /* llweb.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llweb.cpp; sourceTree = "<group>"; };
-		1AF7C1F20AF6C45000C4BF4A /* llweb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llweb.h; sourceTree = "<group>"; };
-		1AF9CA450AE972D4003EFF2D /* llfloateravatartextures.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateravatartextures.h; sourceTree = "<group>"; };
-		1AF9CA460AE972DA003EFF2D /* llfloateravatartextures.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateravatartextures.cpp; sourceTree = "<group>"; };
-		1AF9D84F08B405630094E8E7 /* llqueuedthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llqueuedthread.cpp; sourceTree = "<group>"; };
-		1AF9D85008B405630094E8E7 /* llqueuedthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llqueuedthread.h; sourceTree = "<group>"; };
-		1AFA40B40A2DFD7200C13F70 /* llsavedsettingsglue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsavedsettingsglue.cpp; sourceTree = "<group>"; };
-		1AFA40B60A2DFD8200C13F70 /* llsavedsettingsglue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsavedsettingsglue.h; sourceTree = "<group>"; };
-		1C0D59500CF0B2B800222B10 /* libboost_regex-mt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_regex-mt.a"; path = "build/Development/libboost_regex-mt.a"; sourceTree = "<group>"; };
-		1CBB67D20C7CCCB2007DAAAE /* llfloaterwater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterwater.cpp; sourceTree = "<group>"; };
-		1CBB67D30C7CCCB2007DAAAE /* llfloaterwater.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterwater.h; sourceTree = "<group>"; };
-		1CBB67D40C7CCCB2007DAAAE /* llwaterparammanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwaterparammanager.cpp; sourceTree = "<group>"; };
-		1CBB67D50C7CCCB2007DAAAE /* llwaterparammanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwaterparammanager.h; sourceTree = "<group>"; };
-		1CBB67D60C7CCCB2007DAAAE /* llwaterparamset.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwaterparamset.cpp; sourceTree = "<group>"; };
-		1CBB67D70C7CCCB2007DAAAE /* llwaterparamset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwaterparamset.h; sourceTree = "<group>"; };
-		1CFFA2D40C90472B000CF7DD /* llfloaterenvsettings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterenvsettings.cpp; sourceTree = "<group>"; };
-		1CFFA2D50C90472B000CF7DD /* llfloaterenvsettings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterenvsettings.h; sourceTree = "<group>"; };
-		1CFFA2EB0C9048D7000CF7DD /* llrendertarget.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = llrendertarget.cpp; path = ../llrender/llrendertarget.cpp; sourceTree = SOURCE_ROOT; };
-		1CFFA2EC0C9048D7000CF7DD /* llrendertarget.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = llrendertarget.h; path = ../llrender/llrendertarget.h; sourceTree = SOURCE_ROOT; };
-		20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		2613A6D905D843D80041A7A9 /* llfloatersnapshot.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatersnapshot.cpp; sourceTree = "<group>"; };
-		2617306405221AB700A80050 /* llnameeditor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnameeditor.cpp; sourceTree = "<group>"; };
-		2617306805221DF400A80050 /* llnamebox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnamebox.cpp; sourceTree = "<group>"; };
-		263E02FE05239C9A00A80050 /* llfeaturemanager.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; path = llfeaturemanager.cpp; sourceTree = SOURCE_ROOT; };
-		26C5F3E605DB1E3C00994065 /* llfloaterpostcard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterpostcard.cpp; sourceTree = "<group>"; };
-		26E79A3D0520B56600A80050 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		26E79A630520BC6D00A80050 /* libSystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSystem.dylib; path = /usr/lib/libSystem.B.dylib; sourceTree = "<absolute>"; };
-		26E79A7A0520ED1200A80050 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
-		26F529A1051F61DF00A80050 /* llgenepool.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgenepool.cpp; sourceTree = SOURCE_ROOT; };
-		26F529A2051F61DF00A80050 /* llviewercamera.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewercamera.cpp; sourceTree = SOURCE_ROOT; };
-		26F529A5051F61DF00A80050 /* llvelocitybar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvelocitybar.cpp; sourceTree = SOURCE_ROOT; };
-		26F529A7051F61DF00A80050 /* llpanelcontents.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelcontents.cpp; sourceTree = SOURCE_ROOT; };
-		26F529A9051F61DF00A80050 /* llmanip.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmanip.cpp; sourceTree = SOURCE_ROOT; };
-		26F529AD051F61DF00A80050 /* lltoolplacer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolplacer.cpp; sourceTree = SOURCE_ROOT; };
-		26F529AE051F61DF00A80050 /* lltoolpie.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolpie.cpp; sourceTree = SOURCE_ROOT; };
-		26F529B0051F61DF00A80050 /* lltoolbrush.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolbrush.cpp; sourceTree = SOURCE_ROOT; };
-		26F529B2051F61DF00A80050 /* llstatgraph.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstatgraph.cpp; sourceTree = SOURCE_ROOT; };
-		26F529B3051F61DF00A80050 /* llstatbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstatbar.cpp; sourceTree = SOURCE_ROOT; };
-		26F529BA051F61DF00A80050 /* pipeline.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = pipeline.cpp; sourceTree = SOURCE_ROOT; };
-		26F529BD051F61DF00A80050 /* noise.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = noise.cpp; sourceTree = "<group>"; };
-		26F529BF051F61DF00A80050 /* llworldmapview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llworldmapview.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C0051F61DF00A80050 /* llworldmap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llworldmap.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C1051F61DF00A80050 /* llworld.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llworld.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C2051F61DF00A80050 /* llwind.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwind.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C3051F61DF00A80050 /* llwearablelist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwearablelist.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C4051F61DF00A80050 /* llwearable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwearable.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C6051F61DF00A80050 /* llvowater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvowater.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C7051F61DF00A80050 /* llvovolume.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvovolume.cpp; sourceTree = SOURCE_ROOT; };
-		26F529C9051F61DF00A80050 /* llvotree.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvotree.cpp; sourceTree = SOURCE_ROOT; };
-		26F529CA051F61DF00A80050 /* llvotextbubble.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvotextbubble.cpp; sourceTree = SOURCE_ROOT; };
-		26F529CB051F61DF00A80050 /* llvosurfacepatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvosurfacepatch.cpp; sourceTree = SOURCE_ROOT; };
-		26F529CC051F61DF00A80050 /* llvosky.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvosky.cpp; sourceTree = SOURCE_ROOT; };
-		26F529CD051F61DF00A80050 /* llvopartgroup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvopartgroup.cpp; sourceTree = SOURCE_ROOT; };
-		26F529CF051F61DF00A80050 /* llvoground.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoground.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D0051F61DF00A80050 /* llvograss.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvograss.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D1051F61DF00A80050 /* llvoclouds.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoclouds.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D2051F61DF00A80050 /* llvocache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvocache.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D3051F61DF00A80050 /* llvoavatar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoavatar.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D4051F61DF00A80050 /* llvlmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvlmanager.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D5051F61DF00A80050 /* llvlcomposition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvlcomposition.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D6051F61DF00A80050 /* llviewerwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerwindow.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D7051F61DF00A80050 /* llviewervisualparam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewervisualparam.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D8051F61DF00A80050 /* llviewerthrottle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerthrottle.cpp; sourceTree = SOURCE_ROOT; };
-		26F529D9051F61DF00A80050 /* llviewertextureanim.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewertextureanim.cpp; sourceTree = SOURCE_ROOT; };
-		26F529DA051F61DF00A80050 /* llviewerstats.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerstats.cpp; sourceTree = SOURCE_ROOT; };
-		26F529DB051F61DF00A80050 /* llviewerreputation.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerreputation.cpp; sourceTree = SOURCE_ROOT; };
-		26F529DC051F61DF00A80050 /* llviewerregion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerregion.cpp; sourceTree = SOURCE_ROOT; };
-		26F529DD051F61DF00A80050 /* llviewerpartsource.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerpartsource.cpp; sourceTree = SOURCE_ROOT; };
-		26F529DE051F61DF00A80050 /* llviewerpartsim.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerpartsim.cpp; sourceTree = SOURCE_ROOT; };
-		26F529DF051F61DF00A80050 /* llviewerparceloverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerparceloverlay.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E0051F61DF00A80050 /* llviewerparcelmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerparcelmgr.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E1051F61DF00A80050 /* llviewerobjectlist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerobjectlist.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E2051F61DF00A80050 /* llviewerobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerobject.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E3051F61DF00A80050 /* llviewermessage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewermessage.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E4051F61DF00A80050 /* llviewermenu.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewermenu.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E5051F61DF00A80050 /* llsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsprite.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E7051F61DF00A80050 /* llrendersphere.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrendersphere.cpp; sourceTree = SOURCE_ROOT; };
-		26F529E9051F61DF00A80050 /* llpreviewtexture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewtexture.cpp; sourceTree = SOURCE_ROOT; };
-		26F529EA051F61DF00A80050 /* llpreviewsound.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewsound.cpp; sourceTree = SOURCE_ROOT; };
-		26F529EB051F61DF00A80050 /* llspatialpartition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llspatialpartition.cpp; sourceTree = SOURCE_ROOT; };
-		26F529ED051F61DF00A80050 /* llpanelland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelland.cpp; sourceTree = SOURCE_ROOT; };
-		26F529EE051F61DF00A80050 /* llpanelinventory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelinventory.cpp; sourceTree = SOURCE_ROOT; };
-		26F529EF051F61DF00A80050 /* lldrawpoolterrain.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolterrain.cpp; sourceTree = SOURCE_ROOT; };
-		26F529F0051F61DF00A80050 /* llcallbacklist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcallbacklist.cpp; sourceTree = SOURCE_ROOT; };
-		26F529F2051F61DF00A80050 /* llpolymorph.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpolymorph.cpp; sourceTree = SOURCE_ROOT; };
-		26F529F3051F61DF00A80050 /* llpolymesh.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpolymesh.cpp; sourceTree = SOURCE_ROOT; };
-		26F529F4051F61DF00A80050 /* lltoolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolbar.cpp; sourceTree = SOURCE_ROOT; };
-		26F529F5051F61DF00A80050 /* lltool.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltool.cpp; sourceTree = SOURCE_ROOT; };
-		26F529F6051F61DF00A80050 /* lltextureview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltextureview.cpp; sourceTree = SOURCE_ROOT; };
-		26F529F8051F61DF00A80050 /* llinventorymodel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventorymodel.cpp; sourceTree = SOURCE_ROOT; };
-		26F529FA051F61DF00A80050 /* lltoolview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolview.cpp; sourceTree = SOURCE_ROOT; };
-		26F529FB051F61DF00A80050 /* lltoolselectrect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolselectrect.cpp; sourceTree = SOURCE_ROOT; };
-		26F529FC051F61DF00A80050 /* lltoolselectland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolselectland.cpp; sourceTree = SOURCE_ROOT; };
-		26F529FD051F61DF00A80050 /* llpanelgeneral.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgeneral.cpp; sourceTree = SOURCE_ROOT; };
-		26F529FF051F61DF00A80050 /* llpaneldirbrowser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirbrowser.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A02051F61DF00A80050 /* llfloaterchat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterchat.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A03051F61DF00A80050 /* llconsole.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llconsole.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A04051F61DF00A80050 /* lllandmarklist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllandmarklist.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A05051F61DF00A80050 /* llfloaterbuildoptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbuildoptions.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A0C051F61DF00A80050 /* lluserauth.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserauth.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A0D051F61DF00A80050 /* llurl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurl.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A0E051F61DF00A80050 /* lluploaddialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluploaddialog.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A11051F61DF00A80050 /* lltoolindividual.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolindividual.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A12051F61DF00A80050 /* lltoolgun.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolgun.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A13051F61DF00A80050 /* lltoolgrab.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolgrab.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A14051F61DF00A80050 /* lldrawpoolsky.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolsky.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A17051F61DF00A80050 /* llfloaterland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterland.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A18051F61DF00A80050 /* llpanelface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelface.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A19051F61DF00A80050 /* llpanelevent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelevent.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A1E051F61DF00A80050 /* llframestatview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llframestatview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A1F051F61DF00A80050 /* llframestats.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llframestats.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A24051F61DF00A80050 /* llhudobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudobject.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A25051F61DF00A80050 /* llhudmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudmanager.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A26051F61DF00A80050 /* lldrawpoolalpha.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolalpha.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A28051F61DF00A80050 /* lltexturectrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturectrl.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A2A051F61DF00A80050 /* llpanelobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelobject.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A2B051F61DF00A80050 /* llpanelnetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelnetwork.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A2C051F61DF00A80050 /* lldrawpool.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpool.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A2F051F61DF00A80050 /* llviewerinventory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerinventory.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A30051F61DF00A80050 /* llviewerimagelist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerimagelist.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A31051F61DF00A80050 /* llviewerimage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerimage.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A32051F61DF00A80050 /* llviewergesture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewergesture.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A33051F61DF00A80050 /* llbbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbbox.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A34051F61DF00A80050 /* llfloatercustomize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatercustomize.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A35051F61DF00A80050 /* llviewerlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerlayer.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A37051F61DF00A80050 /* llviewerjointmesh.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerjointmesh.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A38051F61DF00A80050 /* llviewerjointattachment.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerjointattachment.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A39051F61DF00A80050 /* llviewerjoint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerjoint.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A3A051F61DF00A80050 /* llface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llface.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A3B051F61DF00A80050 /* llcloud.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcloud.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A3D051F61DF00A80050 /* llhudview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A3E051F61DF00A80050 /* llhudtext.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudtext.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A3F051F61DF00A80050 /* lldrawpoolwater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolwater.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A40051F61DF00A80050 /* llmaniprotate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmaniprotate.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A41051F61DF00A80050 /* llagent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llagent.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A42051F61DF00A80050 /* llsurfacepatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsurfacepatch.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A43051F61DF00A80050 /* llsurface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsurface.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A45051F61DF00A80050 /* llpaneldirgroups.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirgroups.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A47051F61DF00A80050 /* llpaneldisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldisplay.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A4E051F61DF00A80050 /* lltracker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltracker.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A51051F61DF00A80050 /* llhudeffect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffect.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A53051F61DF00A80050 /* lldrawpoolbump.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolbump.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A54051F61DF00A80050 /* llpaneldebug.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldebug.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A56051F61DF00A80050 /* llfloaterdirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterdirectory.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A57051F61DF00A80050 /* llinventoryclipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventoryclipboard.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A5A051F61DF00A80050 /* llpanelmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelmorph.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A5B051F61DF00A80050 /* llfloaterproperties.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterproperties.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A5C051F61DF00A80050 /* llhudrender.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudrender.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A5D051F61DF00A80050 /* llagentpilot.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llagentpilot.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A5E051F61DF00A80050 /* lldrawpoolavatar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolavatar.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A5F051F61DF00A80050 /* llpatchvertexarray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpatchvertexarray.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A62051F61DF00A80050 /* llemote.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llemote.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A63051F61DF00A80050 /* llfloatergesture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatergesture.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A64051F61DF00A80050 /* lldrawable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawable.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A65051F61DF00A80050 /* llhudeffecttrail.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffecttrail.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A66051F61DF00A80050 /* llfloatermute.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatermute.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A67051F61DF00A80050 /* llmorphview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmorphview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A69051F61DF00A80050 /* llfloaterworldmap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterworldmap.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A6B051F61DF00A80050 /* llfloaterpreference.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterpreference.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A6D051F61DF00A80050 /* lltoolobjpicker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolobjpicker.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A6E051F61DF00A80050 /* lltoolmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolmorph.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A6F051F61DF00A80050 /* lltoolmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolmgr.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A71051F61DF00A80050 /* llfloatergroupinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatergroupinfo.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A72051F61DF00A80050 /* llpreviewscript.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewscript.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A73051F61DF00A80050 /* llpreviewnotecard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewnotecard.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A74051F61DF00A80050 /* lltoolfocus.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolfocus.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A75051F61DF00A80050 /* lltoolface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolface.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A76051F61DF00A80050 /* lltooldraganddrop.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltooldraganddrop.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A77051F61DF00A80050 /* lltoolcomp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolcomp.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A78051F61DF00A80050 /* llcontainerview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcontainerview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A7B051F61DF00A80050 /* lldrawpooltree.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpooltree.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A7C051F61DF00A80050 /* llfloaterrate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterrate.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A7E051F61DF00A80050 /* llfloatergroups.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatergroups.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A82051F61DF00A80050 /* llfloaterabout.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterabout.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A83051F61DF00A80050 /* llcolorswatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcolorswatch.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A84051F61DF00A80050 /* lldriverparam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldriverparam.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A85051F61DF00A80050 /* llhoverview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhoverview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A86051F61DF00A80050 /* llcylinder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcylinder.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A87051F61DF00A80050 /* llhippo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhippo.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A8B051F61DF00A80050 /* llfloateravatarinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateravatarinfo.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A8C051F61DF00A80050 /* llcallingcard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcallingcard.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A8D051F61DF00A80050 /* llhudeffectbeam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffectbeam.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A8E051F61DF00A80050 /* llfloatertos.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatertos.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A8F051F61DF00A80050 /* llfloatertools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatertools.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A90051F61DF00A80050 /* llpaneldirfind.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirfind.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A91051F61DF00A80050 /* llpaneldirevents.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirevents.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A93051F61DF00A80050 /* llstatview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstatview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A94051F61DF00A80050 /* llstatusbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstatusbar.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A95051F61DF00A80050 /* lldrawpoolground.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolground.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A97051F61DF00A80050 /* llnetmap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnetmap.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A98051F61DF00A80050 /* llnamelistctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnamelistctrl.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A9A051F61DF00A80050 /* llmaniptranslate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmaniptranslate.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A9B051F61DF00A80050 /* llmanipscale.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmanipscale.cpp; sourceTree = SOURCE_ROOT; };
-		26F52A9F051F61DF00A80050 /* llfloaternamedesc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaternamedesc.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA0051F61DF00A80050 /* llpanelplace.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelplace.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA1051F61DF00A80050 /* llpanelpermissions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelpermissions.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA2051F61DF00A80050 /* lldebugview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldebugview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA3051F61DF00A80050 /* llpaneldirplaces.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirplaces.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA4051F61DF00A80050 /* llpaneldirpeople.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirpeople.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA5051F61DF00A80050 /* llfolderview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfolderview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA6051F61DF00A80050 /* llglsandbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llglsandbox.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA7051F61DF00A80050 /* llgivemoney.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgivemoney.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA8051F61DF00A80050 /* llcompass.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcompass.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AA9051F61DF00A80050 /* llcolorscheme.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcolorscheme.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AAA051F61DF00A80050 /* llmutelist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmutelist.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AAB051F61DF00A80050 /* llmoveview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmoveview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AAD051F61DF00A80050 /* llfloatermap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatermap.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AAF051F61DF00A80050 /* llregionposition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llregionposition.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AB4051F61DF00A80050 /* llpanelavatar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelavatar.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AB5051F61DF00A80050 /* llpanelaudioprefs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelaudioprefs.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AB6051F61DF00A80050 /* llfloaterbuy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbuy.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AB8051F61DF00A80050 /* lltexlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexlayer.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ABC051F61DF00A80050 /* llpreviewlandmark.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewlandmark.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ABD051F61DF00A80050 /* llpreview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ABF051F61DF00A80050 /* llbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbox.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AC2051F61DF00A80050 /* llfloaterreporter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterreporter.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AC6051F61DF00A80050 /* llcompilequeue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcompilequeue.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AC7051F61DF00A80050 /* llpanelgroupvoting.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupvoting.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ACA051F61DF00A80050 /* lldrawpoolsimple.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolsimple.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ACB051F61DF00A80050 /* llcubemap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcubemap.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ACC051F61DF00A80050 /* lljoystickbutton.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lljoystickbutton.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AD1051F61DF00A80050 /* llsky.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsky.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AD2051F61DF00A80050 /* llselectmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llselectmgr.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AD3051F61DF00A80050 /* llfilepicker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfilepicker.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AD5051F61DF00A80050 /* llprogressview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llprogressview.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AD6051F61DF00A80050 /* llimpanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimpanel.cpp; sourceTree = SOURCE_ROOT; };
-		26F52AD8051F61DF00A80050 /* llmenucommands.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmenucommands.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ADA051F61DF00A80050 /* llhudeffectpointat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffectpointat.cpp; sourceTree = SOURCE_ROOT; };
-		26F52ADB051F61DF00A80050 /* llhudeffectlookat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffectlookat.cpp; sourceTree = SOURCE_ROOT; };
-		295542580C3B371500025801 /* llversionviewer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llversionviewer.h; sourceTree = "<group>"; };
-		299F95BE0ADDE5D000C94EEF /* llviewquery.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewquery.cpp; sourceTree = "<group>"; };
-		299F95BF0ADDE5D000C94EEF /* llviewquery.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewquery.h; sourceTree = "<group>"; };
-		2E6FE90D09FD560A00AF02FF /* llpanelgroupnotices.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupnotices.cpp; sourceTree = SOURCE_ROOT; };
-		2E6FE90E09FD562D00AF02FF /* llpanelgroupnotices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgroupnotices.h; sourceTree = SOURCE_ROOT; };
-		2EA4CEEC09F83AC2008F60F7 /* llpanelgrouproles.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgrouproles.cpp; sourceTree = SOURCE_ROOT; };
-		2EA4CEED09F83BE8008F60F7 /* llpanelgrouplandmoney.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgrouplandmoney.cpp; sourceTree = SOURCE_ROOT; };
-		2EA4CEEE09F83C0B008F60F7 /* llpanelgrouplandmoney.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgrouplandmoney.h; sourceTree = SOURCE_ROOT; };
-		2EA4CEEF09F83C16008F60F7 /* llpanelgrouproles.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgrouproles.h; sourceTree = SOURCE_ROOT; };
-		2EFEA8E809F4556F00CB0193 /* llgroupnotify.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgroupnotify.cpp; sourceTree = "<group>"; };
-		2EFEA8EA09F4557900CB0193 /* llgroupnotify.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgroupnotify.h; sourceTree = "<group>"; };
-		2EFEA8EB09F455B900CB0193 /* llpanelgroup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroup.cpp; sourceTree = "<group>"; };
-		2EFEA8ED09F455C900CB0193 /* llpanelgroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgroup.h; sourceTree = "<group>"; };
-		2EFEA8EF09F4588000CB0193 /* llpanelgroupgeneral.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgroupgeneral.h; sourceTree = "<group>"; };
-		2EFEA8F009F4588B00CB0193 /* llpanelgroupgeneral.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupgeneral.cpp; sourceTree = "<group>"; };
-		3834D6010B73ABC1002B61C8 /* llmessagereader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmessagereader.cpp; sourceTree = "<group>"; };
-		3834D6020B73ABC1002B61C8 /* llmessagereader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessagereader.h; sourceTree = "<group>"; };
-		3834D6030B73ABC1002B61C8 /* lltemplatemessagereader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltemplatemessagereader.cpp; sourceTree = "<group>"; };
-		3834D6040B73ABC1002B61C8 /* lltemplatemessagereader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltemplatemessagereader.h; sourceTree = "<group>"; };
-		38D0FA690B4BF897003323BA /* lltemplatemessagebuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltemplatemessagebuilder.cpp; sourceTree = "<group>"; };
-		38D0FA6A0B4BF898003323BA /* llmessagetemplate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmessagetemplate.cpp; sourceTree = "<group>"; };
-		38D0FA6B0B4BF898003323BA /* llmessagebuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmessagebuilder.cpp; sourceTree = "<group>"; };
-		38D0FA6F0B4BF8C5003323BA /* lltemplatemessagebuilder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltemplatemessagebuilder.h; sourceTree = "<group>"; };
-		38D0FA700B4BF8C5003323BA /* llmessagebuilder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessagebuilder.h; sourceTree = "<group>"; };
-		38D0FA710B4BF8C5003323BA /* llmsgvariabletype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmsgvariabletype.h; sourceTree = "<group>"; };
-		496B968B0C022A69009833CB /* llline.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llline.cpp; sourceTree = "<group>"; };
-		496B968C0C022A69009833CB /* llline.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llline.h; sourceTree = "<group>"; };
-		5503B89A05446B15003D051F /* Info-SecondLifeVorbis.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Info-SecondLifeVorbis.plist"; sourceTree = "<group>"; };
-		5503BD0605446B20003D051F /* Info-SecondLife.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Info-SecondLife.plist"; sourceTree = "<group>"; };
-		5503BD0705446B20003D051F /* Second Life.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Second Life.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		55593DF0053F5C7C0095DD27 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
-		616C4A8C0752C3D1006C2C65 /* linden_common.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = linden_common.h; sourceTree = "<group>"; };
-		616C4A8D0752C3D1006C2C65 /* lldefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldefs.h; sourceTree = "<group>"; };
-		616C4A8E0752C3D1006C2C65 /* lltimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltimer.cpp; sourceTree = "<group>"; };
-		616C4A8F0752C3D1006C2C65 /* u64.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = u64.cpp; sourceTree = "<group>"; };
-		616C4A900752C3D1006C2C65 /* u64.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = u64.h; sourceTree = "<group>"; };
-		616C4A9B0752C5CF006C2C65 /* lluuid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluuid.cpp; sourceTree = "<group>"; };
-		616C4A9C0752C5CF006C2C65 /* lluuid.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluuid.h; sourceTree = "<group>"; };
-		616C4A9F0752C682006C2C65 /* timer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; };
-		616C4AA10752C6D2006C2C65 /* v2math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v2math.cpp; sourceTree = "<group>"; };
-		616C4AA20752C6D2006C2C65 /* v2math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v2math.h; sourceTree = "<group>"; };
-		616C4E05075507DE006C2C65 /* camera.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = camera.h; sourceTree = "<group>"; };
-		616C4E06075507DE006C2C65 /* coordframe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = coordframe.h; sourceTree = "<group>"; };
-		616C4E07075507DF006C2C65 /* llbboxlocal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbboxlocal.cpp; sourceTree = "<group>"; };
-		616C4E08075507DF006C2C65 /* llbboxlocal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbboxlocal.h; sourceTree = "<group>"; };
-		616C4E09075507DF006C2C65 /* llcamera.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcamera.cpp; sourceTree = "<group>"; };
-		616C4E0A075507DF006C2C65 /* llcamera.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcamera.h; sourceTree = "<group>"; };
-		616C4E0B075507DF006C2C65 /* llcoordframe.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcoordframe.cpp; sourceTree = "<group>"; };
-		616C4E0C075507DF006C2C65 /* llcoordframe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcoordframe.h; sourceTree = "<group>"; };
-		616C4E2C07550E97006C2C65 /* sound_ids.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sound_ids.h; sourceTree = "<group>"; };
-		616C4E2E07551735006C2C65 /* lldir_mac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldir_mac.cpp; sourceTree = "<group>"; };
-		616C4E2F07551735006C2C65 /* lldir_mac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldir_mac.h; sourceTree = "<group>"; };
-		616C4E3007551735006C2C65 /* lldir.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldir.cpp; sourceTree = "<group>"; };
-		616C4E3107551735006C2C65 /* lldir.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldir.h; sourceTree = "<group>"; };
-		61922120074A9B57005E1F34 /* bitpack.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = bitpack.h; sourceTree = "<group>"; };
-		61922121074A9B57005E1F34 /* doublelinkedlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doublelinkedlist.h; sourceTree = "<group>"; };
-		61922122074A9B57005E1F34 /* imageids.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = imageids.h; sourceTree = "<group>"; };
-		61922123074A9B57005E1F34 /* indra_constants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = indra_constants.h; sourceTree = "<group>"; };
-		61922124074A9B57005E1F34 /* llpreprocessor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreprocessor.h; sourceTree = "<group>"; };
-		61922125074A9B57005E1F34 /* linked_lists.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = linked_lists.h; sourceTree = "<group>"; };
-		61922126074A9B57005E1F34 /* llassoclist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llassoclist.h; sourceTree = "<group>"; };
-		61922127074A9B57005E1F34 /* llcriticaldamp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcriticaldamp.cpp; sourceTree = "<group>"; };
-		61922128074A9B57005E1F34 /* llcriticaldamp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcriticaldamp.h; sourceTree = "<group>"; };
-		61922129074A9B57005E1F34 /* lldarray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldarray.h; sourceTree = "<group>"; };
-		6192212A074A9B57005E1F34 /* lldarrayptr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldarrayptr.h; sourceTree = "<group>"; };
-		6192212B074A9B57005E1F34 /* lldepthstack.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldepthstack.h; sourceTree = "<group>"; };
-		6192212C074A9B57005E1F34 /* lldlinked.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldlinked.h; sourceTree = "<group>"; };
-		6192212D074A9B57005E1F34 /* lldqueueptr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldqueueptr.h; sourceTree = "<group>"; };
-		6192212E074A9B57005E1F34 /* llendianswizzle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llendianswizzle.h; sourceTree = "<group>"; };
-		6192212F074A9B57005E1F34 /* llerror.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerror.cpp; sourceTree = "<group>"; };
-		61922130074A9B57005E1F34 /* llerror.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerror.h; sourceTree = "<group>"; };
-		61922135074A9B57005E1F34 /* llfasttimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfasttimer.cpp; sourceTree = "<group>"; };
-		61922136074A9B57005E1F34 /* llfasttimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfasttimer.h; sourceTree = "<group>"; };
-		61922137074A9B57005E1F34 /* llfixedbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfixedbuffer.cpp; sourceTree = "<group>"; };
-		61922138074A9B57005E1F34 /* llfixedbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfixedbuffer.h; sourceTree = "<group>"; };
-		61922139074A9B57005E1F34 /* llframetimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llframetimer.cpp; sourceTree = "<group>"; };
-		6192213A074A9B57005E1F34 /* llframetimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llframetimer.h; sourceTree = "<group>"; };
-		6192213B074A9B57005E1F34 /* lllinkedqueue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllinkedqueue.h; sourceTree = "<group>"; };
-		6192213C074A9B57005E1F34 /* lllocalidhashmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllocalidhashmap.h; sourceTree = "<group>"; };
-		6192213D074A9B57005E1F34 /* llmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmap.h; sourceTree = "<group>"; };
-		6192213E074A9B57005E1F34 /* llmemory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmemory.cpp; sourceTree = "<group>"; };
-		6192213F074A9B57005E1F34 /* llmemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmemory.h; sourceTree = "<group>"; };
-		61922140074A9B57005E1F34 /* llnametable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnametable.h; sourceTree = "<group>"; };
-		61922141074A9B57005E1F34 /* llpagemem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpagemem.h; sourceTree = "<group>"; };
-		61922142074A9B57005E1F34 /* llpriqueuemap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpriqueuemap.h; sourceTree = "<group>"; };
-		61922143074A9B57005E1F34 /* llprocessor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llprocessor.cpp; sourceTree = "<group>"; };
-		61922144074A9B57005E1F34 /* llprocessor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprocessor.h; sourceTree = "<group>"; };
-		61922145074A9B57005E1F34 /* llptrskiplist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llptrskiplist.h; sourceTree = "<group>"; };
-		61922146074A9B57005E1F34 /* llptrskipmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llptrskipmap.h; sourceTree = "<group>"; };
-		61922147074A9B57005E1F34 /* llsecondlifeurls.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsecondlifeurls.h; sourceTree = "<group>"; };
-		61922148074A9B57005E1F34 /* llskiplist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llskiplist.h; sourceTree = "<group>"; };
-		61922149074A9B57005E1F34 /* llskipmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llskipmap.h; sourceTree = "<group>"; };
-		6192214A074A9B57005E1F34 /* llstack.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstack.h; sourceTree = "<group>"; };
-		6192214B074A9B57005E1F34 /* llstat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstat.cpp; sourceTree = "<group>"; };
-		6192214C074A9B58005E1F34 /* llstat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstat.h; sourceTree = "<group>"; };
-		6192214D074A9B58005E1F34 /* llstl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstl.h; sourceTree = "<group>"; };
-		6192214E074A9B58005E1F34 /* llstrider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstrider.h; sourceTree = "<group>"; };
-		6192214F074A9B58005E1F34 /* llstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstring.cpp; sourceTree = "<group>"; };
-		61922150074A9B58005E1F34 /* llstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstring.h; sourceTree = "<group>"; };
-		61922151074A9B58005E1F34 /* llstringtable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstringtable.cpp; sourceTree = "<group>"; };
-		61922152074A9B58005E1F34 /* llstringtable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstringtable.h; sourceTree = "<group>"; };
-		61922153074A9B58005E1F34 /* llsys.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsys.cpp; sourceTree = "<group>"; };
-		61922154074A9B58005E1F34 /* llsys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsys.h; sourceTree = "<group>"; };
-		61922155074A9B58005E1F34 /* lltimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltimer.h; sourceTree = "<group>"; };
-		61922158074A9B58005E1F34 /* lluuidhashmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluuidhashmap.h; sourceTree = "<group>"; };
-		6192215B074A9B58005E1F34 /* processor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = processor.h; sourceTree = "<group>"; };
-		6192215C074A9B58005E1F34 /* stdenums.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stdenums.h; sourceTree = "<group>"; };
-		6192215D074A9B58005E1F34 /* stdtypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stdtypes.h; sourceTree = "<group>"; };
-		6192215E074A9B58005E1F34 /* string_table.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = string_table.h; sourceTree = "<group>"; };
-		61922161074A9B58005E1F34 /* timing.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = timing.cpp; sourceTree = "<group>"; };
-		61922162074A9B58005E1F34 /* timing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timing.h; sourceTree = "<group>"; };
-		61922180074A9B58005E1F34 /* llcategory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcategory.cpp; sourceTree = "<group>"; };
-		61922181074A9B58005E1F34 /* llcategory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcategory.h; sourceTree = "<group>"; };
-		61922182074A9B58005E1F34 /* lleconomy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lleconomy.cpp; sourceTree = "<group>"; };
-		61922183074A9B58005E1F34 /* lleconomy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleconomy.h; sourceTree = "<group>"; };
-		61922184074A9B58005E1F34 /* llinventory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventory.cpp; sourceTree = "<group>"; };
-		61922185074A9B58005E1F34 /* llinventory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinventory.h; sourceTree = "<group>"; };
-		61922186074A9B58005E1F34 /* llparcel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llparcel.cpp; sourceTree = "<group>"; };
-		61922187074A9B58005E1F34 /* llparcel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llparcel.h; sourceTree = "<group>"; };
-		61922188074A9B58005E1F34 /* llpermissions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpermissions.cpp; sourceTree = "<group>"; };
-		61922189074A9B58005E1F34 /* llpermissions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpermissions.h; sourceTree = "<group>"; };
-		6192218A074A9B58005E1F34 /* llpermissionsflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpermissionsflags.h; sourceTree = "<group>"; };
-		6192218B074A9B58005E1F34 /* llsaleinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsaleinfo.cpp; sourceTree = "<group>"; };
-		6192218C074A9B58005E1F34 /* llsaleinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsaleinfo.h; sourceTree = "<group>"; };
-		6192218D074A9B58005E1F34 /* lltransactionflags.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransactionflags.cpp; sourceTree = "<group>"; };
-		6192218E074A9B58005E1F34 /* lltransactionflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransactionflags.h; sourceTree = "<group>"; };
-		6192218F074A9B58005E1F34 /* lltransactiontypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransactiontypes.h; sourceTree = "<group>"; };
-		61922191074A9B58005E1F34 /* llmath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmath.h; sourceTree = "<group>"; };
-		61922192074A9B58005E1F34 /* llcoord.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcoord.h; sourceTree = "<group>"; };
-		61922193074A9B58005E1F34 /* llcrc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcrc.cpp; sourceTree = "<group>"; };
-		61922194074A9B58005E1F34 /* llcrc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcrc.h; sourceTree = "<group>"; };
-		61922195074A9B58005E1F34 /* llinterp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinterp.h; sourceTree = "<group>"; };
-		61922196074A9B58005E1F34 /* llmd5.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmd5.cpp; sourceTree = "<group>"; };
-		61922197074A9B58005E1F34 /* llmd5.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmd5.h; sourceTree = "<group>"; };
-		61922198074A9B58005E1F34 /* llquantize.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llquantize.h; sourceTree = "<group>"; };
-		61922199074A9B58005E1F34 /* llrand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrand.cpp; sourceTree = "<group>"; };
-		6192219A074A9B58005E1F34 /* llrand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llrand.h; sourceTree = "<group>"; };
-		6192219B074A9B58005E1F34 /* llrect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrect.cpp; sourceTree = "<group>"; };
-		6192219C074A9B58005E1F34 /* llrect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llrect.h; sourceTree = "<group>"; };
-		6192219D074A9B58005E1F34 /* m3math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = m3math.cpp; sourceTree = "<group>"; };
-		6192219E074A9B58005E1F34 /* m3math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = m3math.h; sourceTree = "<group>"; };
-		6192219F074A9B58005E1F34 /* m4math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = m4math.cpp; sourceTree = "<group>"; };
-		619221A0074A9B58005E1F34 /* m4math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = m4math.h; sourceTree = "<group>"; };
-		619221A1074A9B58005E1F34 /* llquaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llquaternion.cpp; sourceTree = "<group>"; };
-		619221A2074A9B58005E1F34 /* llquaternion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llquaternion.h; sourceTree = "<group>"; };
-		619221A3074A9B58005E1F34 /* raytrace.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = raytrace.cpp; sourceTree = "<group>"; };
-		619221A4074A9B58005E1F34 /* raytrace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = raytrace.h; sourceTree = "<group>"; };
-		619221A9074A9B58005E1F34 /* v3color.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v3color.cpp; sourceTree = "<group>"; };
-		619221AA074A9B58005E1F34 /* v3color.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v3color.h; sourceTree = "<group>"; };
-		619221AB074A9B58005E1F34 /* v3dmath.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v3dmath.cpp; sourceTree = "<group>"; };
-		619221AC074A9B58005E1F34 /* v3dmath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v3dmath.h; sourceTree = "<group>"; };
-		619221AD074A9B58005E1F34 /* v3math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v3math.cpp; sourceTree = "<group>"; };
-		619221AE074A9B58005E1F34 /* v3math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v3math.h; sourceTree = "<group>"; };
-		619221AF074A9B58005E1F34 /* v4color.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v4color.cpp; sourceTree = "<group>"; };
-		619221B0074A9B58005E1F34 /* v4color.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v4color.h; sourceTree = "<group>"; };
-		619221B1074A9B58005E1F34 /* v4coloru.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v4coloru.cpp; sourceTree = "<group>"; };
-		619221B2074A9B58005E1F34 /* v4coloru.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v4coloru.h; sourceTree = "<group>"; };
-		619221B3074A9B58005E1F34 /* v4math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v4math.cpp; sourceTree = "<group>"; };
-		619221B4074A9B58005E1F34 /* v4math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v4math.h; sourceTree = "<group>"; };
-		619221B6074A9B58005E1F34 /* xform.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = xform.cpp; sourceTree = "<group>"; };
-		619221B7074A9B58005E1F34 /* xform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = xform.h; sourceTree = "<group>"; };
-		619221B9074A9B59005E1F34 /* llassetstorage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llassetstorage.cpp; sourceTree = "<group>"; };
-		619221BA074A9B59005E1F34 /* llassetstorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llassetstorage.h; sourceTree = "<group>"; };
-		619221BB074A9B59005E1F34 /* llcachename.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcachename.cpp; sourceTree = "<group>"; };
-		619221BC074A9B59005E1F34 /* llcachename.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcachename.h; sourceTree = "<group>"; };
-		619221BD074A9B59005E1F34 /* llcallbacklisth.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallbacklisth.h; sourceTree = "<group>"; };
-		619221BE074A9B59005E1F34 /* llcircuit.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcircuit.cpp; sourceTree = "<group>"; };
-		619221BF074A9B59005E1F34 /* llcircuit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcircuit.h; sourceTree = "<group>"; };
-		619221C5074A9B59005E1F34 /* lldatapacker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldatapacker.cpp; sourceTree = "<group>"; };
-		619221C6074A9B59005E1F34 /* lldatapacker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldatapacker.h; sourceTree = "<group>"; };
-		619221C7074A9B59005E1F34 /* lldbstrings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldbstrings.h; sourceTree = "<group>"; };
-		619221D0074A9B59005E1F34 /* lldispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldispatcher.cpp; sourceTree = "<group>"; };
-		619221D1074A9B59005E1F34 /* lldispatcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldispatcher.h; sourceTree = "<group>"; };
-		619221D2074A9B59005E1F34 /* lleventflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleventflags.h; sourceTree = "<group>"; };
-		619221D3074A9B59005E1F34 /* llhost.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhost.cpp; sourceTree = "<group>"; };
-		619221D4074A9B59005E1F34 /* llhost.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhost.h; sourceTree = "<group>"; };
-		619221D7074A9B59005E1F34 /* llinstantmessage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinstantmessage.h; sourceTree = "<group>"; };
-		619221D8074A9B59005E1F34 /* llinvite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinvite.h; sourceTree = "<group>"; };
-		619221D9074A9B59005E1F34 /* llloginflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llloginflags.h; sourceTree = "<group>"; };
-		619221DB074A9B59005E1F34 /* llmail.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmail.cpp; sourceTree = "<group>"; };
-		619221DC074A9B59005E1F34 /* llmail.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmail.h; sourceTree = "<group>"; };
-		619221DD074A9B59005E1F34 /* llnamevalue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnamevalue.cpp; sourceTree = "<group>"; };
-		619221DE074A9B59005E1F34 /* llnamevalue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnamevalue.h; sourceTree = "<group>"; };
-		619221DF074A9B59005E1F34 /* llnullcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnullcipher.cpp; sourceTree = "<group>"; };
-		619221E0074A9B59005E1F34 /* llpacketack.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpacketack.h; sourceTree = "<group>"; };
-		619221E1074A9B59005E1F34 /* llpacketbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpacketbuffer.cpp; sourceTree = "<group>"; };
-		619221E2074A9B59005E1F34 /* llpacketbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpacketbuffer.h; sourceTree = "<group>"; };
-		619221E3074A9B59005E1F34 /* llpacketring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpacketring.cpp; sourceTree = "<group>"; };
-		619221E4074A9B59005E1F34 /* llpacketring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpacketring.h; sourceTree = "<group>"; };
-		619221E5074A9B59005E1F34 /* llpartdata.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpartdata.cpp; sourceTree = "<group>"; };
-		619221E6074A9B59005E1F34 /* llpartdata.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpartdata.h; sourceTree = "<group>"; };
-		619221E7074A9B59005E1F34 /* llqueryflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llqueryflags.h; sourceTree = "<group>"; };
-		619221E8074A9B59005E1F34 /* llregionflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llregionflags.h; sourceTree = "<group>"; };
-		619221E9074A9B59005E1F34 /* llregionhandle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llregionhandle.h; sourceTree = "<group>"; };
-		619221EA074A9B59005E1F34 /* lltaskname.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltaskname.h; sourceTree = "<group>"; };
-		619221EB074A9B59005E1F34 /* llteleportflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llteleportflags.h; sourceTree = "<group>"; };
-		619221EC074A9B59005E1F34 /* llthrottle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llthrottle.cpp; sourceTree = "<group>"; };
-		619221ED074A9B59005E1F34 /* llthrottle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llthrottle.h; sourceTree = "<group>"; };
-		619221EE074A9B59005E1F34 /* lltransfermanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfermanager.cpp; sourceTree = "<group>"; };
-		619221EF074A9B59005E1F34 /* lltransfermanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfermanager.h; sourceTree = "<group>"; };
-		619221F0074A9B59005E1F34 /* lltransfersourceasset.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfersourceasset.cpp; sourceTree = "<group>"; };
-		619221F1074A9B59005E1F34 /* lltransfersourceasset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfersourceasset.h; sourceTree = "<group>"; };
-		619221F2074A9B59005E1F34 /* lltransfersourcefile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfersourcefile.cpp; sourceTree = "<group>"; };
-		619221F3074A9B59005E1F34 /* lltransfersourcefile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfersourcefile.h; sourceTree = "<group>"; };
-		619221F4074A9B59005E1F34 /* lltransfertargetfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfertargetfile.cpp; sourceTree = "<group>"; };
-		619221F5074A9B59005E1F34 /* lltransfertargetfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfertargetfile.h; sourceTree = "<group>"; };
-		619221F6074A9B59005E1F34 /* lltransfertargetvfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfertargetvfile.cpp; sourceTree = "<group>"; };
-		619221F7074A9B59005E1F34 /* lltransfertargetvfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfertargetvfile.h; sourceTree = "<group>"; };
-		619221F8074A9B59005E1F34 /* lluseroperation.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluseroperation.cpp; sourceTree = "<group>"; };
-		619221F9074A9B59005E1F34 /* lluseroperation.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluseroperation.h; sourceTree = "<group>"; };
-		619221FA074A9B59005E1F34 /* llvehicleparams.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvehicleparams.h; sourceTree = "<group>"; };
-		619221FB074A9B59005E1F34 /* llxfer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer.cpp; sourceTree = "<group>"; };
-		619221FC074A9B59005E1F34 /* llxfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer.h; sourceTree = "<group>"; };
-		619221FD074A9B59005E1F34 /* llxfer_file.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer_file.cpp; sourceTree = "<group>"; };
-		619221FE074A9B59005E1F34 /* llxfer_file.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer_file.h; sourceTree = "<group>"; };
-		619221FF074A9B59005E1F34 /* llxfer_mem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer_mem.cpp; sourceTree = "<group>"; };
-		61922200074A9B59005E1F34 /* llxfer_mem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer_mem.h; sourceTree = "<group>"; };
-		61922201074A9B59005E1F34 /* llxfer_vfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer_vfile.cpp; sourceTree = "<group>"; };
-		61922202074A9B59005E1F34 /* llxfer_vfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer_vfile.h; sourceTree = "<group>"; };
-		61922203074A9B59005E1F34 /* llxfermanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfermanager.cpp; sourceTree = "<group>"; };
-		61922204074A9B59005E1F34 /* llxfermanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfermanager.h; sourceTree = "<group>"; };
-		61922205074A9B59005E1F34 /* llxorcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxorcipher.cpp; sourceTree = "<group>"; };
-		61922206074A9B59005E1F34 /* machine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = machine.h; sourceTree = "<group>"; };
-		61922207074A9B59005E1F34 /* mean_collision_data.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = mean_collision_data.h; sourceTree = "<group>"; };
-		61922208074A9B59005E1F34 /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; };
-		61922209074A9B59005E1F34 /* message.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = message.h; sourceTree = "<group>"; };
-		6192220A074A9B59005E1F34 /* message_prehash.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_prehash.cpp; sourceTree = "<group>"; };
-		6192220B074A9B59005E1F34 /* message_prehash.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = message_prehash.h; sourceTree = "<group>"; };
-		6192220C074A9B59005E1F34 /* message_string_table.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_string_table.cpp; sourceTree = "<group>"; };
-		6192220D074A9B59005E1F34 /* net.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = net.cpp; sourceTree = "<group>"; };
-		6192220E074A9B59005E1F34 /* net.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net.h; sourceTree = "<group>"; };
-		6192220F074A9B59005E1F34 /* network.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = network.cpp; sourceTree = "<group>"; };
-		61922210074A9B59005E1F34 /* network.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = network.h; sourceTree = "<group>"; };
-		61922211074A9B59005E1F34 /* partsyspacket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = partsyspacket.cpp; sourceTree = "<group>"; };
-		61922212074A9B59005E1F34 /* partsyspacket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = partsyspacket.h; sourceTree = "<group>"; };
-		61922213074A9B59005E1F34 /* patch_code.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = patch_code.cpp; sourceTree = "<group>"; };
-		61922214074A9B59005E1F34 /* patch_code.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = patch_code.h; sourceTree = "<group>"; };
-		61922215074A9B59005E1F34 /* patch_dct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = patch_dct.cpp; sourceTree = "<group>"; };
-		61922216074A9B59005E1F34 /* patch_dct.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = patch_dct.h; sourceTree = "<group>"; };
-		61922217074A9B59005E1F34 /* patch_idct.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = patch_idct.cpp; sourceTree = "<group>"; };
-		6192221A074A9B59005E1F34 /* legacy_object_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = legacy_object_types.h; sourceTree = "<group>"; };
-		6192221F074A9B59005E1F34 /* llmaterialtable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmaterialtable.cpp; sourceTree = "<group>"; };
-		61922220074A9B5A005E1F34 /* llmaterialtable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmaterialtable.h; sourceTree = "<group>"; };
-		61922221074A9B5A005E1F34 /* llprimitive.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llprimitive.cpp; sourceTree = "<group>"; };
-		61922222074A9B5A005E1F34 /* llprimitive.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprimitive.h; sourceTree = "<group>"; };
-		61922223074A9B5A005E1F34 /* lltextureanim.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltextureanim.cpp; sourceTree = "<group>"; };
-		61922224074A9B5A005E1F34 /* lltextureanim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltextureanim.h; sourceTree = "<group>"; };
-		61922225074A9B5A005E1F34 /* lltextureentry.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltextureentry.cpp; sourceTree = "<group>"; };
-		61922226074A9B5A005E1F34 /* lltextureentry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltextureentry.h; sourceTree = "<group>"; };
-		61922227074A9B5A005E1F34 /* lltreeparams.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltreeparams.cpp; sourceTree = "<group>"; };
-		61922228074A9B5A005E1F34 /* lltreeparams.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltreeparams.h; sourceTree = "<group>"; };
-		6192225F074A9B5A005E1F34 /* llundo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llundo.cpp; sourceTree = "<group>"; };
-		61922260074A9B5A005E1F34 /* llundo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llundo.h; sourceTree = "<group>"; };
-		61922266074A9B5A005E1F34 /* llvfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvfile.cpp; sourceTree = "<group>"; };
-		61922267074A9B5A005E1F34 /* llvfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvfile.h; sourceTree = "<group>"; };
-		61922268074A9B5A005E1F34 /* llvfs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvfs.cpp; sourceTree = "<group>"; };
-		61922269074A9B5A005E1F34 /* llvfs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvfs.h; sourceTree = "<group>"; };
-		6192226F074A9B5A005E1F34 /* llmousehandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmousehandler.h; sourceTree = "<group>"; };
-		61922274074A9B5A005E1F34 /* llwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwindow.cpp; sourceTree = "<group>"; };
-		61922275074A9B5A005E1F34 /* llwindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwindow.h; sourceTree = "<group>"; };
-		61922279074A9B5A005E1F34 /* llxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxmlparser.cpp; sourceTree = "<group>"; };
-		6192227A074A9B5A005E1F34 /* llxmlparser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxmlparser.h; sourceTree = "<group>"; };
-		6192227B074A9B5A005E1F34 /* llxmltree.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxmltree.cpp; sourceTree = "<group>"; };
-		6192227C074A9B5A005E1F34 /* llxmltree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxmltree.h; sourceTree = "<group>"; };
-		6192227E074A9B5A005E1F34 /* lscript_alloc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_alloc.h; sourceTree = "<group>"; };
-		6192227F074A9B5A005E1F34 /* lscript_byteconvert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_byteconvert.h; sourceTree = "<group>"; };
-		61922280074A9B5B005E1F34 /* lscript_byteformat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_byteformat.h; sourceTree = "<group>"; };
-		61922286074A9B5B005E1F34 /* indra.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; path = indra.l; sourceTree = "<group>"; };
-		61922287074A9B5B005E1F34 /* indra.y */ = {isa = PBXFileReference; explicitFileType = sourcecode.yacc; fileEncoding = 30; path = indra.y; sourceTree = "<group>"; };
-		61922289074A9B5B005E1F34 /* lscript_bytecode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_bytecode.cpp; sourceTree = "<group>"; };
-		6192228A074A9B5B005E1F34 /* lscript_bytecode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_bytecode.h; sourceTree = "<group>"; };
-		6192228B074A9B5B005E1F34 /* lscript_error.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_error.cpp; sourceTree = "<group>"; };
-		6192228C074A9B5B005E1F34 /* lscript_error.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_error.h; sourceTree = "<group>"; };
-		6192228D074A9B5B005E1F34 /* lscript_heap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_heap.cpp; sourceTree = "<group>"; };
-		6192228E074A9B5B005E1F34 /* lscript_heap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_heap.h; sourceTree = "<group>"; };
-		6192228F074A9B5B005E1F34 /* lscript_resource.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_resource.cpp; sourceTree = "<group>"; };
-		61922290074A9B5B005E1F34 /* lscript_resource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_resource.h; sourceTree = "<group>"; };
-		61922291074A9B5B005E1F34 /* lscript_scope.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_scope.cpp; sourceTree = "<group>"; };
-		61922292074A9B5B005E1F34 /* lscript_scope.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_scope.h; sourceTree = "<group>"; };
-		61922293074A9B5B005E1F34 /* lscript_tree.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_tree.cpp; sourceTree = "<group>"; };
-		61922294074A9B5B005E1F34 /* lscript_tree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_tree.h; sourceTree = "<group>"; };
-		61922295074A9B5B005E1F34 /* lscript_typecheck.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_typecheck.cpp; sourceTree = "<group>"; };
-		61922296074A9B5B005E1F34 /* lscript_typecheck.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_typecheck.h; sourceTree = "<group>"; };
-		6192229A074A9B5B005E1F34 /* lscript_execute.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_execute.cpp; sourceTree = "<group>"; };
-		6192229B074A9B5B005E1F34 /* lscript_heapruntime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_heapruntime.cpp; sourceTree = "<group>"; };
-		6192229C074A9B5B005E1F34 /* lscript_heapruntime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_heapruntime.h; sourceTree = "<group>"; };
-		6192229D074A9B5B005E1F34 /* lscript_readlso.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_readlso.cpp; sourceTree = "<group>"; };
-		6192229E074A9B5B005E1F34 /* lscript_readlso.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_readlso.h; sourceTree = "<group>"; };
-		6192229F074A9B5B005E1F34 /* lscript_execute.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_execute.h; sourceTree = "<group>"; };
-		619222A2074A9B5B005E1F34 /* lscript_export.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_export.h; sourceTree = "<group>"; };
-		619222A4074A9B5B005E1F34 /* lscript_alloc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_alloc.cpp; sourceTree = "<group>"; };
-		619222A5074A9B5B005E1F34 /* lscript_export.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_export.cpp; sourceTree = "<group>"; };
-		619222A6074A9B5B005E1F34 /* lscript_library.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lscript_library.cpp; sourceTree = "<group>"; };
-		619222A7074A9B5B005E1F34 /* lscript_library.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_library.h; sourceTree = "<group>"; };
-		619222A8074A9B5B005E1F34 /* lscript_rt_interface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_rt_interface.h; sourceTree = "<group>"; };
-		61923C97074AD8B7005E1F34 /* mac_crash_logger.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mac_crash_logger.cpp; sourceTree = "<group>"; };
-		61923CD7074AE2CB005E1F34 /* audioengine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = audioengine.cpp; sourceTree = "<group>"; };
-		61923CD8074AE2CB005E1F34 /* audioengine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = audioengine.h; sourceTree = "<group>"; };
-		61923CD9074AE2CB005E1F34 /* audioengine_fmod.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = audioengine_fmod.cpp; sourceTree = "<group>"; };
-		61923CDA074AE2CB005E1F34 /* audioengine_fmod.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = audioengine_fmod.h; sourceTree = "<group>"; };
-		61923CDB074AE2CB005E1F34 /* listener.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = listener.cpp; sourceTree = "<group>"; };
-		61923CDC074AE2CB005E1F34 /* listener.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = listener.h; sourceTree = "<group>"; };
-		61923CDD074AE2CB005E1F34 /* listener_ds3d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = listener_ds3d.h; sourceTree = "<group>"; };
-		61923CDE074AE2CB005E1F34 /* listener_fmod.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = listener_fmod.cpp; sourceTree = "<group>"; };
-		61923CDF074AE2CB005E1F34 /* listener_fmod.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = listener_fmod.h; sourceTree = "<group>"; };
-		61923CE0074AE2CB005E1F34 /* listener_openal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = listener_openal.h; sourceTree = "<group>"; };
-		61923CE1074AE2CB005E1F34 /* llaudiodecodemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llaudiodecodemgr.cpp; sourceTree = "<group>"; };
-		61923CE2074AE2CB005E1F34 /* llaudiodecodemgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llaudiodecodemgr.h; sourceTree = "<group>"; };
-		61923CE5074AE2CB005E1F34 /* vorbisdecode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vorbisdecode.cpp; sourceTree = "<group>"; };
-		61923CE6074AE2CB005E1F34 /* vorbisdecode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vorbisdecode.h; sourceTree = "<group>"; };
-		61923CE7074AE2CB005E1F34 /* vorbisencode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vorbisencode.cpp; sourceTree = "<group>"; };
-		61923CE8074AE2CB005E1F34 /* vorbisencode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vorbisencode.h; sourceTree = "<group>"; };
-		61923D00074AE3BF005E1F34 /* llanimationstates.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llanimationstates.cpp; sourceTree = "<group>"; };
-		61923D01074AE3BF005E1F34 /* llanimationstates.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llanimationstates.h; sourceTree = "<group>"; };
-		61923D02074AE3BF005E1F34 /* llbvhloader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbvhloader.cpp; sourceTree = "<group>"; };
-		61923D03074AE3BF005E1F34 /* llbvhloader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbvhloader.h; sourceTree = "<group>"; };
-		61923D04074AE3BF005E1F34 /* llcharacter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcharacter.cpp; sourceTree = "<group>"; };
-		61923D05074AE3BF005E1F34 /* llcharacter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcharacter.h; sourceTree = "<group>"; };
-		61923D06074AE3BF005E1F34 /* lleditingmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lleditingmotion.cpp; sourceTree = "<group>"; };
-		61923D07074AE3BF005E1F34 /* lleditingmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleditingmotion.h; sourceTree = "<group>"; };
-		61923D08074AE3BF005E1F34 /* llgesture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgesture.cpp; sourceTree = "<group>"; };
-		61923D09074AE3BF005E1F34 /* llgesture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgesture.h; sourceTree = "<group>"; };
-		61923D0A074AE3BF005E1F34 /* llhandmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhandmotion.cpp; sourceTree = "<group>"; };
-		61923D0B074AE3BF005E1F34 /* llhandmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhandmotion.h; sourceTree = "<group>"; };
-		61923D0C074AE3BF005E1F34 /* llheadrotmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llheadrotmotion.cpp; sourceTree = "<group>"; };
-		61923D0D074AE3BF005E1F34 /* llheadrotmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llheadrotmotion.h; sourceTree = "<group>"; };
-		61923D0E074AE3BF005E1F34 /* lljoint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lljoint.cpp; sourceTree = "<group>"; };
-		61923D0F074AE3BF005E1F34 /* lljoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lljoint.h; sourceTree = "<group>"; };
-		61923D10074AE3BF005E1F34 /* lljointsolverrp3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lljointsolverrp3.cpp; sourceTree = "<group>"; };
-		61923D11074AE3BF005E1F34 /* lljointsolverrp3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lljointsolverrp3.h; sourceTree = "<group>"; };
-		61923D12074AE3BF005E1F34 /* lljointstate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lljointstate.h; sourceTree = "<group>"; };
-		61923D13074AE3BF005E1F34 /* llkeyframefallmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llkeyframefallmotion.cpp; sourceTree = "<group>"; };
-		61923D14074AE3BF005E1F34 /* llkeyframefallmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llkeyframefallmotion.h; sourceTree = "<group>"; };
-		61923D15074AE3BF005E1F34 /* llkeyframemotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llkeyframemotion.cpp; sourceTree = "<group>"; };
-		61923D16074AE3BF005E1F34 /* llkeyframemotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llkeyframemotion.h; sourceTree = "<group>"; };
-		61923D17074AE3C0005E1F34 /* llkeyframemotionparam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llkeyframemotionparam.cpp; sourceTree = "<group>"; };
-		61923D18074AE3C0005E1F34 /* llkeyframemotionparam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llkeyframemotionparam.h; sourceTree = "<group>"; };
-		61923D19074AE3C0005E1F34 /* llkeyframestandmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llkeyframestandmotion.cpp; sourceTree = "<group>"; };
-		61923D1A074AE3C0005E1F34 /* llkeyframestandmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llkeyframestandmotion.h; sourceTree = "<group>"; };
-		61923D1B074AE3C0005E1F34 /* llkeyframewalkmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llkeyframewalkmotion.cpp; sourceTree = "<group>"; };
-		61923D1C074AE3C0005E1F34 /* llkeyframewalkmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llkeyframewalkmotion.h; sourceTree = "<group>"; };
-		61923D1D074AE3C0005E1F34 /* llmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmotion.cpp; sourceTree = "<group>"; };
-		61923D1E074AE3C0005E1F34 /* llmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmotion.h; sourceTree = "<group>"; };
-		61923D1F074AE3C0005E1F34 /* llmotioncontroller.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmotioncontroller.cpp; sourceTree = "<group>"; };
-		61923D20074AE3C0005E1F34 /* llmotioncontroller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmotioncontroller.h; sourceTree = "<group>"; };
-		61923D21074AE3C0005E1F34 /* llmultigesture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmultigesture.cpp; sourceTree = "<group>"; };
-		61923D22074AE3C0005E1F34 /* llmultigesture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmultigesture.h; sourceTree = "<group>"; };
-		61923D23074AE3C0005E1F34 /* llpose.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpose.cpp; sourceTree = "<group>"; };
-		61923D24074AE3C0005E1F34 /* llpose.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpose.h; sourceTree = "<group>"; };
-		61923D25074AE3C0005E1F34 /* llstatemachine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstatemachine.cpp; sourceTree = "<group>"; };
-		61923D26074AE3C0005E1F34 /* llstatemachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatemachine.h; sourceTree = "<group>"; };
-		61923D27074AE3C0005E1F34 /* lltargetingmotion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltargetingmotion.cpp; sourceTree = "<group>"; };
-		61923D28074AE3C0005E1F34 /* lltargetingmotion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltargetingmotion.h; sourceTree = "<group>"; };
-		61923D29074AE3C0005E1F34 /* llvisualparam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvisualparam.cpp; sourceTree = "<group>"; };
-		61923D2A074AE3C0005E1F34 /* llvisualparam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvisualparam.h; sourceTree = "<group>"; };
-		61923D9B074AE4F2005E1F34 /* llimage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimage.cpp; sourceTree = "<group>"; };
-		61923D9C074AE4F2005E1F34 /* llimage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimage.h; sourceTree = "<group>"; };
-		61923D9D074AE4F2005E1F34 /* llimagebmp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagebmp.cpp; sourceTree = "<group>"; };
-		61923D9E074AE4F2005E1F34 /* llimagebmp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagebmp.h; sourceTree = "<group>"; };
-		61923DA0074AE4F2005E1F34 /* llimagej2c.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagej2c.cpp; sourceTree = "<group>"; };
-		61923DA1074AE4F2005E1F34 /* llimagej2c.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagej2c.h; sourceTree = "<group>"; };
-		61923DA2074AE4F2005E1F34 /* llimagejpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagejpeg.cpp; sourceTree = "<group>"; };
-		61923DA3074AE4F2005E1F34 /* llimagejpeg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagejpeg.h; sourceTree = "<group>"; };
-		61923DA4074AE4F2005E1F34 /* llimagetga.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagetga.cpp; sourceTree = "<group>"; };
-		61923DA5074AE4F2005E1F34 /* llimagetga.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagetga.h; sourceTree = "<group>"; };
-		61923DA8074AE4F3005E1F34 /* llmapimagetype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmapimagetype.h; sourceTree = "<group>"; };
-		6192E764074A7CE9005E1F34 /* libllcommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libllcommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		79ED67F00E197D66003D1E78 /* llpanelskins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelskins.cpp; sourceTree = "<group>"; };
-		79ED67F10E197D67003D1E78 /* llpanelskins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llpanelskins.h; sourceTree = "<group>"; };
-		84401E2D0A13CC9A006720A5 /* llfloatergroupinvite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatergroupinvite.cpp; sourceTree = "<group>"; };
-		84401E2E0A13CC9A006720A5 /* llfloatergroupinvite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatergroupinvite.h; sourceTree = "<group>"; };
-		84401E300A13CCB2006720A5 /* llpanelgroupinvite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupinvite.cpp; sourceTree = "<group>"; };
-		84401E310A13CCB2006720A5 /* llpanelgroupinvite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgroupinvite.h; sourceTree = "<group>"; };
-		8833693B0C18AF33007F52DA /* llimagepng.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagepng.cpp; sourceTree = "<group>"; };
-		8833693C0C18AF33007F52DA /* llpngwrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpngwrapper.cpp; sourceTree = "<group>"; };
-		8833693D0C18AF33007F52DA /* llpngwrapper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpngwrapper.h; sourceTree = "<group>"; };
-		8833693E0C18AF33007F52DA /* llimagepng.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagepng.h; sourceTree = "<group>"; };
-		8849626B0C7B3E8A00A777FB /* llares.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = llares.cpp; path = ../llcommon/llares.cpp; sourceTree = SOURCE_ROOT; };
-		88A95BB10C14D5FC0027E363 /* llsrv.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsrv.cpp; sourceTree = SOURCE_ROOT; };
-		88A95BC90C14D92C0027E363 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = /usr/lib/libresolv.dylib; sourceTree = "<absolute>"; };
-		88AA282B0C17720D0032DF53 /* libpng12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpng12.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		8B2ECF9E0534C17A00A80059 /* llfirstuse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfirstuse.h; sourceTree = "<group>"; };
-		8B2ECFA00534C21A00A80059 /* llfirstuse.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfirstuse.cpp; sourceTree = "<group>"; };
-		9104C0CB0778AE0F001EC4F6 /* llpanelmsgs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelmsgs.cpp; sourceTree = "<group>"; };
-		9104C0CD0778AE20001EC4F6 /* llpanelmsgs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelmsgs.h; sourceTree = "<group>"; };
-		9117EAA10BF24A6100845BD2 /* llpacketack.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpacketack.cpp; sourceTree = "<group>"; };
-		9118669907F4FAF700E3D5BC /* llmediaremotectrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaremotectrl.cpp; sourceTree = "<group>"; };
-		9118669A07F4FAF700E3D5BC /* llmediaremotectrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmediaremotectrl.h; sourceTree = "<group>"; };
-		911CAD86075BE87B00CD1090 /* llinventoryview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventoryview.cpp; sourceTree = "<group>"; };
-		911CAD8A075BE90600CD1090 /* llgroupmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgroupmgr.cpp; sourceTree = "<group>"; };
-		911CAD92075BEAAC00CD1090 /* lltoolselect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolselect.cpp; sourceTree = "<group>"; };
-		912541AD0691FF79008C66F7 /* llfasttimerview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfasttimerview.cpp; sourceTree = "<group>"; };
-		912541B00691FF8D008C66F7 /* llfasttimerview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfasttimerview.h; sourceTree = "<group>"; };
-		91287B25078DCD1800E958B2 /* llkeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llkeyboard.cpp; sourceTree = "<group>"; };
-		91287B26078DCD1800E958B2 /* llkeyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llkeyboard.h; sourceTree = "<group>"; };
-		91287B2D078DCDF700E958B2 /* llkeyboardmacosx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llkeyboardmacosx.h; sourceTree = "<group>"; };
-		91287B2F078DCE0A00E958B2 /* llkeyboardmacosx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llkeyboardmacosx.cpp; sourceTree = "<group>"; };
-		91287B4A078DE4B300E958B2 /* llviewerkeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerkeyboard.cpp; sourceTree = "<group>"; };
-		91287B4B078DE4B300E958B2 /* llviewerkeyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerkeyboard.h; sourceTree = "<group>"; };
-		9130442A057428D800571B0A /* llfloaterbuycontents.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbuycontents.cpp; sourceTree = "<group>"; };
-		9131094305C6D5A300A18084 /* llpanelpick.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelpick.cpp; sourceTree = "<group>"; };
-		913AA1FC079855E900D111CE /* llfloaterfriends.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterfriends.cpp; sourceTree = "<group>"; };
-		913AA1FE0798560200D111CE /* llfloaterfriends.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterfriends.h; sourceTree = "<group>"; };
-		913ADF0D0A250C750055AB21 /* llsdutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdutil.cpp; sourceTree = "<group>"; };
-		913ADF0E0A250C750055AB21 /* llsdutil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdutil.h; sourceTree = "<group>"; };
-		913B1EFA0B4DBB420030C3EC /* object_flags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = object_flags.h; sourceTree = "<group>"; };
-		913B1F020B4DBCAA0030C3EC /* lltree_common.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltree_common.h; sourceTree = "<group>"; };
-		913B26970B4DDCDA0030C3EC /* lllandmark.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllandmark.cpp; sourceTree = "<group>"; };
-		913B26980B4DDCDA0030C3EC /* lllandmark.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllandmark.h; sourceTree = "<group>"; };
-		91469E790B4486C10009E8F9 /* llmime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmime.cpp; sourceTree = "<group>"; };
-		91469E7A0B4486C10009E8F9 /* llmime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmime.h; sourceTree = "<group>"; };
-		915862D8075D2CE400F6A924 /* llapr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llapr.cpp; sourceTree = "<group>"; };
-		915862D9075D2CE400F6A924 /* llapr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llapr.h; sourceTree = "<group>"; };
-		9159DDD607662E7900F15AA1 /* llthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llthread.cpp; sourceTree = "<group>"; };
-		9159DDD707662E7900F15AA1 /* llthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llthread.h; sourceTree = "<group>"; };
-		915F492006B572E700F629BF /* lleventnotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lleventnotifier.cpp; sourceTree = "<group>"; };
-		915F492306B572FB00F629BF /* lleventnotifier.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleventnotifier.h; sourceTree = "<group>"; };
-		915F492806B5738A00F629BF /* lleventinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lleventinfo.cpp; sourceTree = "<group>"; };
-		915F492B06B5739800F629BF /* lleventinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleventinfo.h; sourceTree = "<group>"; };
-		916083920649560B00CAF63E /* llfloateranimpreview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateranimpreview.cpp; sourceTree = "<group>"; };
-		916724C207551DE400CA4513 /* llfloatercolorpicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatercolorpicker.h; sourceTree = "<group>"; };
-		916724C407551DF600CA4513 /* llfloatercolorpicker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatercolorpicker.cpp; sourceTree = "<group>"; };
-		9174D2C00653FC2600A7E32B /* llfloaterregioninfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterregioninfo.cpp; sourceTree = "<group>"; };
-		9174D2C20653FC3700A7E32B /* llfloaterregioninfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterregioninfo.h; sourceTree = "<group>"; };
-		918166CA06516C59005727DC /* llaudiosourcevo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llaudiosourcevo.cpp; sourceTree = "<group>"; };
-		918B123A07B19605008CD6CD /* llsd.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsd.cpp; sourceTree = "<group>"; };
-		918B123C07B19610008CD6CD /* llsd.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsd.h; sourceTree = "<group>"; };
-		9190430C08327117002396D4 /* llfiltersd2xmlrpc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfiltersd2xmlrpc.cpp; sourceTree = "<group>"; };
-		9190430D08327117002396D4 /* llfiltersd2xmlrpc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfiltersd2xmlrpc.h; sourceTree = "<group>"; };
-		9190430E08327117002396D4 /* lliobuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lliobuffer.cpp; sourceTree = "<group>"; };
-		9190430F08327117002396D4 /* lliobuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lliobuffer.h; sourceTree = "<group>"; };
-		9190431008327117002396D4 /* lliopipe.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lliopipe.cpp; sourceTree = "<group>"; };
-		9190431108327117002396D4 /* lliopipe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lliopipe.h; sourceTree = "<group>"; };
-		9190431208327117002396D4 /* llpumpio.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpumpio.cpp; sourceTree = "<group>"; };
-		9190431308327117002396D4 /* llpumpio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpumpio.h; sourceTree = "<group>"; };
-		9190431408327117002396D4 /* llservice.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llservice.cpp; sourceTree = "<group>"; };
-		9190431508327117002396D4 /* llservice.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llservice.h; sourceTree = "<group>"; };
-		91A154F6081DC14C0089988C /* llvfsthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvfsthread.h; sourceTree = "<group>"; };
-		91A154F8081DC15E0089988C /* llvfsthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvfsthread.cpp; sourceTree = "<group>"; };
-		91A155FE081EE7F70089988C /* llfloaterhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterhtml.cpp; sourceTree = "<group>"; };
-		91A15600081EE8060089988C /* llfloaterhtml.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterhtml.h; sourceTree = "<group>"; };
-		91B9EB8206370586007B3F3E /* lldynamictexture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldynamictexture.cpp; sourceTree = "<group>"; };
-		91B9EC4C06370E4D007B3F3E /* llfloaterimagepreview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterimagepreview.cpp; sourceTree = "<group>"; };
-		91C8C05405922AC100633E8C /* llfloatergodtools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatergodtools.cpp; sourceTree = "<group>"; };
-		91CB311506FB584C00DBCE1E /* llfloaterclothing.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterclothing.cpp; sourceTree = "<group>"; };
-		91CB311706FB586300DBCE1E /* llfloaterclothing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterclothing.h; sourceTree = "<group>"; };
-		91D2527605C9C0620099BB54 /* llfloaterauction.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterauction.cpp; sourceTree = "<group>"; };
-		91D530CE056EE55C00CD1AD7 /* lloverlaybar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lloverlaybar.cpp; sourceTree = "<group>"; };
-		91D530D2056EE57900CD1AD7 /* llchatbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llchatbar.cpp; sourceTree = "<group>"; };
-		91D61FD0057ED9DF005B4B69 /* llnotify.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnotify.cpp; sourceTree = "<group>"; };
-		91DF401F06A739BA00CA7FE5 /* llstartup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstartup.cpp; sourceTree = "<group>"; };
-		91DF402206A739CB00CA7FE5 /* llstartup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstartup.h; sourceTree = "<group>"; };
-		91DF405006A73E0C00CA7FE5 /* llviewerdisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerdisplay.h; sourceTree = "<group>"; };
-		91E3336D0ABB5379004351DE /* llapp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llapp.cpp; sourceTree = "<group>"; };
-		91E3336E0ABB5379004351DE /* llapp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llapp.h; sourceTree = "<group>"; };
-		91E333730ABB79AC004351DE /* llrun.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrun.cpp; sourceTree = "<group>"; };
-		91E333740ABB79AC004351DE /* llrun.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llrun.h; sourceTree = "<group>"; };
-		91E36BB705B4C70600C919E4 /* llpanelinput.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelinput.cpp; sourceTree = "<group>"; };
-		91E579B00770D43100404933 /* llwindowmacosx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwindowmacosx.cpp; sourceTree = "<group>"; };
-		91E7BB2105EFCBA40026CC40 /* llviewerdisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerdisplay.cpp; sourceTree = "<group>"; };
-		91E86A0407BBFA5D00F56E75 /* llmediabase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmediabase.h; sourceTree = "<group>"; };
-		91E86A0507BBFA5D00F56E75 /* llmediaemitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmediaemitter.h; sourceTree = "<group>"; };
-		91E86C3307BD3B6400F56E75 /* llfloatersaveavatar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatersaveavatar.h; sourceTree = "<group>"; };
-		91F8BBA3062DF7AB00DE42BA /* llpreviewgesture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewgesture.cpp; sourceTree = "<group>"; };
-		91F8BBAB062DF91A00DE42BA /* llgesturemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgesturemgr.cpp; sourceTree = "<group>"; };
-		91FC1C8706527F19009CF498 /* llpreviewanim.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewanim.cpp; sourceTree = "<group>"; };
-		91FC1D4606527FEC009CF498 /* llpreviewgesture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreviewgesture.h; sourceTree = "<group>"; };
-		91FC1D480652802C009CF498 /* llgesturemgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgesturemgr.h; sourceTree = "<group>"; };
-		93AE41C508F483C800141675 /* llalertdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llalertdialog.cpp; sourceTree = "<group>"; };
-		93AE41C608F483C900141675 /* llmodaldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmodaldialog.cpp; sourceTree = "<group>"; };
-		93AE41C908F483E300141675 /* llalertdialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llalertdialog.h; sourceTree = "<group>"; };
-		93AE41CA08F483E300141675 /* llmodaldialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmodaldialog.h; sourceTree = "<group>"; };
-		93AE41CB08F4842F00141675 /* llsecondlifeurls.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsecondlifeurls.cpp; sourceTree = "<group>"; };
-		93AE41CF08F4845400141675 /* llinstantmessage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinstantmessage.cpp; sourceTree = "<group>"; };
-		990032FC05EC0A9B0035CB09 /* llpaneldirland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirland.cpp; sourceTree = "<group>"; };
-		9900330005EC0ADD0035CB09 /* llpaneldirpopular.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirpopular.cpp; sourceTree = "<group>"; };
-		990CDBD805C1EA7900739545 /* AutoUpdater.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = AutoUpdater.nib; sourceTree = "<group>"; };
-		990CDBDA05C1EA7900739545 /* FSCopyObject.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = FSCopyObject.c; sourceTree = "<group>"; };
-		990CDBDB05C1EA7900739545 /* FSCopyObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FSCopyObject.h; sourceTree = "<group>"; };
-		990CDBDC05C1EA7900739545 /* GenLinkedList.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = GenLinkedList.c; sourceTree = "<group>"; };
-		990CDBDD05C1EA7900739545 /* GenLinkedList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GenLinkedList.h; sourceTree = "<group>"; };
-		990CDBDF05C1EA7900739545 /* mac_updater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mac_updater.cpp; sourceTree = "<group>"; };
-		990CDBE005C1EA7900739545 /* MoreFilesX.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = MoreFilesX.c; sourceTree = "<group>"; };
-		990CDBE105C1EA7900739545 /* MoreFilesX.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MoreFilesX.h; sourceTree = "<group>"; };
-		991ED2DF0883646B003EC818 /* llclassifiedinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llclassifiedinfo.cpp; sourceTree = "<group>"; };
-		9928ACA4056D9353003865BE /* CrashReporter.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = CrashReporter.nib; sourceTree = "<group>"; };
-		9930A8DD0B8FB0E200197ECA /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = English; path = English.lproj/language.txt; sourceTree = "<group>"; };
-		9930A8E70B8FB14E00197ECA /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = text; name = Japanese; path = Japanese.lproj/language.txt; sourceTree = "<group>"; };
-		9930A8EA0B8FB1D500197ECA /* German */ = {isa = PBXFileReference; lastKnownFileType = text; name = German; path = German.lproj/language.txt; sourceTree = "<group>"; };
-		9930A8ED0B8FB1E500197ECA /* Korean */ = {isa = PBXFileReference; lastKnownFileType = text; name = Korean; path = Korean.lproj/language.txt; sourceTree = "<group>"; };
-		99321B11081DD26000678159 /* llworkerthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llworkerthread.h; sourceTree = "<group>"; };
-		99321B12081DD26000678159 /* llworkerthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llworkerthread.cpp; sourceTree = "<group>"; };
-		9932ED1F056C1F0900554101 /* crashreporter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = crashreporter.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		99374E450B5C603E008DB4BE /* lliosocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lliosocket.h; sourceTree = "<group>"; };
-		99374E460B5C603E008DB4BE /* lliosocket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lliosocket.cpp; sourceTree = "<group>"; };
-		993A3E030B546D47007A0790 /* llvoiceclient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoiceclient.h; sourceTree = "<group>"; };
-		993A3E040B546D47007A0790 /* llvoiceclient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoiceclient.cpp; sourceTree = "<group>"; };
-		9956CAFB0B96679C00F58C6D /* llprefsvoice.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = llprefsvoice.h; sourceTree = "<group>"; };
-		9956CAFC0B96679C00F58C6D /* llprefsvoice.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; lineEnding = 0; path = llprefsvoice.cpp; sourceTree = "<group>"; };
-		996209680B864D0E00392531 /* SLVoiceAgent.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = SLVoiceAgent.app; path = "vivox-runtime/universal-darwin/SLVoiceAgent.app"; sourceTree = SOURCE_ROOT; };
-		9967E9090B37533F0087BD1B /* libfmodwrapper.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libfmodwrapper.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		9967E9520B37564D0087BD1B /* fmodwrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fmodwrapper.cpp; sourceTree = "<group>"; };
-		997B4BD106015820001B0407 /* VertexCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VertexCache.h; sourceTree = SOURCE_ROOT; };
-		997B4BD406015820001B0407 /* randgauss.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = randgauss.h; sourceTree = SOURCE_ROOT; };
-		997B4BD506015820001B0407 /* pipeline.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pipeline.h; sourceTree = SOURCE_ROOT; };
-		997B4BD906015821001B0407 /* noise.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = noise.h; sourceTree = SOURCE_ROOT; };
-		997B4BDB06015821001B0407 /* macview_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macview_Prefix.h; sourceTree = SOURCE_ROOT; };
-		997B4BDC06015821001B0407 /* macmain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macmain.h; sourceTree = SOURCE_ROOT; };
-		997B4BDE06015821001B0407 /* llworldmapview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llworldmapview.h; sourceTree = SOURCE_ROOT; };
-		997B4BDF06015821001B0407 /* llworldmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llworldmap.h; sourceTree = SOURCE_ROOT; };
-		997B4BE006015821001B0407 /* llworld.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llworld.h; sourceTree = SOURCE_ROOT; };
-		997B4BE106015821001B0407 /* llwindebug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwindebug.h; sourceTree = SOURCE_ROOT; };
-		997B4BE206015821001B0407 /* llwind.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwind.h; sourceTree = SOURCE_ROOT; };
-		997B4BE306015821001B0407 /* llwearablelist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwearablelist.h; sourceTree = SOURCE_ROOT; };
-		997B4BE406015821001B0407 /* llwearable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwearable.h; sourceTree = SOURCE_ROOT; };
-		997B4BE606015821001B0407 /* llvowater.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvowater.h; sourceTree = SOURCE_ROOT; };
-		997B4BE706015821001B0407 /* llvovolume.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvovolume.h; sourceTree = SOURCE_ROOT; };
-		997B4BE806015821001B0407 /* llvotreenew.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvotreenew.h; sourceTree = SOURCE_ROOT; };
-		997B4BE906015821001B0407 /* llvotree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvotree.h; sourceTree = SOURCE_ROOT; };
-		997B4BEA06015821001B0407 /* llvotextbubble.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvotextbubble.h; sourceTree = SOURCE_ROOT; };
-		997B4BEB06015821001B0407 /* llvosurfacepatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvosurfacepatch.h; sourceTree = SOURCE_ROOT; };
-		997B4BEC06015821001B0407 /* llvosky.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvosky.h; sourceTree = SOURCE_ROOT; };
-		997B4BED06015821001B0407 /* llvopartgroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvopartgroup.h; sourceTree = SOURCE_ROOT; };
-		997B4BEF06015821001B0407 /* llvoground.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoground.h; sourceTree = SOURCE_ROOT; };
-		997B4BF006015821001B0407 /* llvograss.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvograss.h; sourceTree = SOURCE_ROOT; };
-		997B4BF106015821001B0407 /* llvoclouds.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoclouds.h; sourceTree = SOURCE_ROOT; };
-		997B4BF206015821001B0407 /* llvocache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvocache.h; sourceTree = SOURCE_ROOT; };
-		997B4BF306015821001B0407 /* llvoavatar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoavatar.h; sourceTree = SOURCE_ROOT; };
-		997B4BF406015821001B0407 /* llvlmanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvlmanager.h; sourceTree = SOURCE_ROOT; };
-		997B4BF506015821001B0407 /* llvlcomposition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvlcomposition.h; sourceTree = SOURCE_ROOT; };
-		997B4BF606015821001B0407 /* llviewerwindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerwindow.h; sourceTree = SOURCE_ROOT; };
-		997B4BF706015821001B0407 /* llviewervisualparam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewervisualparam.h; sourceTree = SOURCE_ROOT; };
-		997B4BF806015821001B0407 /* llviewerthrottle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerthrottle.h; sourceTree = SOURCE_ROOT; };
-		997B4BF906015821001B0407 /* llviewertextureanim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewertextureanim.h; sourceTree = SOURCE_ROOT; };
-		997B4BFA06015821001B0407 /* llviewerstats.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerstats.h; sourceTree = SOURCE_ROOT; };
-		997B4BFC06015821001B0407 /* llviewerregion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerregion.h; sourceTree = SOURCE_ROOT; };
-		997B4BFD06015821001B0407 /* llviewerpartsource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerpartsource.h; sourceTree = SOURCE_ROOT; };
-		997B4BFE06015821001B0407 /* llviewerpartsim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerpartsim.h; sourceTree = SOURCE_ROOT; };
-		997B4BFF06015821001B0407 /* llviewerparceloverlay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerparceloverlay.h; sourceTree = SOURCE_ROOT; };
-		997B4C0006015821001B0407 /* llviewerparcelmgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerparcelmgr.h; sourceTree = SOURCE_ROOT; };
-		997B4C0106015821001B0407 /* llviewerobjectlist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerobjectlist.h; sourceTree = SOURCE_ROOT; };
-		997B4C0206015821001B0407 /* llviewerobject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerobject.h; sourceTree = SOURCE_ROOT; };
-		997B4C0306015821001B0407 /* llviewermessage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewermessage.h; sourceTree = SOURCE_ROOT; };
-		997B4C0406015821001B0407 /* llviewermenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewermenu.h; sourceTree = SOURCE_ROOT; };
-		997B4C0506015821001B0407 /* llviewerlayer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerlayer.h; sourceTree = SOURCE_ROOT; };
-		997B4C0706015821001B0407 /* llviewerimagelist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerimagelist.h; sourceTree = SOURCE_ROOT; };
-		997B4C0806015821001B0407 /* llviewerimage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerimage.h; sourceTree = SOURCE_ROOT; };
-		997B4C0906015821001B0407 /* llviewergesture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewergesture.h; sourceTree = SOURCE_ROOT; };
-		997B4C0A06015821001B0407 /* llviewercamera.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewercamera.h; sourceTree = SOURCE_ROOT; };
-		997B4C0B06015821001B0407 /* llviewerbuild.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerbuild.h; sourceTree = SOURCE_ROOT; };
-		997B4C0E06015821001B0407 /* llvelocitybar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvelocitybar.h; sourceTree = SOURCE_ROOT; };
-		997B4C0F06015821001B0407 /* llviewerjointmesh.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerjointmesh.h; sourceTree = SOURCE_ROOT; };
-		997B4C1006015821001B0407 /* llviewerjointattachment.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerjointattachment.h; sourceTree = SOURCE_ROOT; };
-		997B4C1106015821001B0407 /* llviewerjoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerjoint.h; sourceTree = SOURCE_ROOT; };
-		997B4C1206015821001B0407 /* llviewerinventory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerinventory.h; sourceTree = SOURCE_ROOT; };
-		997B4C1306015821001B0407 /* lluserauth.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluserauth.h; sourceTree = SOURCE_ROOT; };
-		997B4C1406015821001B0407 /* llurl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurl.h; sourceTree = SOURCE_ROOT; };
-		997B4C1506015821001B0407 /* lluploaddialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluploaddialog.h; sourceTree = SOURCE_ROOT; };
-		997B4C1806015821001B0407 /* lluiconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluiconstants.h; sourceTree = SOURCE_ROOT; };
-		997B4C1B06015821001B0407 /* lltoolview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolview.h; sourceTree = SOURCE_ROOT; };
-		997B4C1C06015821001B0407 /* lltoolselectrect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolselectrect.h; sourceTree = SOURCE_ROOT; };
-		997B4C1D06015821001B0407 /* lltoolselectland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolselectland.h; sourceTree = SOURCE_ROOT; };
-		997B4C1E06015821001B0407 /* lltoolselect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolselect.h; sourceTree = SOURCE_ROOT; };
-		997B4C2006015821001B0407 /* lltoolplacer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolplacer.h; sourceTree = SOURCE_ROOT; };
-		997B4C2106015821001B0407 /* lltoolpie.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolpie.h; sourceTree = SOURCE_ROOT; };
-		997B4C2406015821001B0407 /* lltracker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltracker.h; sourceTree = SOURCE_ROOT; };
-		997B4C2506015821001B0407 /* lltoolobjpicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolobjpicker.h; sourceTree = SOURCE_ROOT; };
-		997B4C2606015821001B0407 /* lltoolmorph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolmorph.h; sourceTree = SOURCE_ROOT; };
-		997B4C2706015821001B0407 /* lltoolmgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolmgr.h; sourceTree = SOURCE_ROOT; };
-		997B4C2806015821001B0407 /* lltoolindividual.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolindividual.h; sourceTree = SOURCE_ROOT; };
-		997B4C2906015821001B0407 /* lltoolgun.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolgun.h; sourceTree = SOURCE_ROOT; };
-		997B4C2A06015821001B0407 /* lltoolgrab.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolgrab.h; sourceTree = SOURCE_ROOT; };
-		997B4C2B06015821001B0407 /* lltoolfocus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolfocus.h; sourceTree = SOURCE_ROOT; };
-		997B4C2C06015821001B0407 /* lltoolface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolface.h; sourceTree = SOURCE_ROOT; };
-		997B4C2D06015821001B0407 /* lltooldraganddrop.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltooldraganddrop.h; sourceTree = SOURCE_ROOT; };
-		997B4C2E06015821001B0407 /* lltoolcomp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolcomp.h; sourceTree = SOURCE_ROOT; };
-		997B4C3006015821001B0407 /* lltoolbrush.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolbrush.h; sourceTree = SOURCE_ROOT; };
-		997B4C3206015821001B0407 /* lltoolbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolbar.h; sourceTree = SOURCE_ROOT; };
-		997B4C3306015821001B0407 /* lltool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltool.h; sourceTree = SOURCE_ROOT; };
-		997B4C3406015821001B0407 /* lltextureview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltextureview.h; sourceTree = SOURCE_ROOT; };
-		997B4C3606015821001B0407 /* lltexturectrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturectrl.h; sourceTree = SOURCE_ROOT; };
-		997B4C3B06015821001B0407 /* lltexlayer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexlayer.h; sourceTree = SOURCE_ROOT; };
-		997B4C3D06015821001B0407 /* lltable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltable.h; sourceTree = SOURCE_ROOT; };
-		997B4C4006015821001B0407 /* llstatview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatview.h; sourceTree = SOURCE_ROOT; };
-		997B4C4106015821001B0407 /* llstatusbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatusbar.h; sourceTree = SOURCE_ROOT; };
-		997B4C4206015821001B0407 /* llstatgraph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatgraph.h; sourceTree = SOURCE_ROOT; };
-		997B4C4306015821001B0407 /* llstatbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatbar.h; sourceTree = SOURCE_ROOT; };
-		997B4C4406015821001B0407 /* llsprite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsprite.h; sourceTree = SOURCE_ROOT; };
-		997B4C4606015821001B0407 /* llrendersphere.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llrendersphere.h; sourceTree = SOURCE_ROOT; };
-		997B4C4706015821001B0407 /* llspatialpartition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llspatialpartition.h; sourceTree = SOURCE_ROOT; };
-		997B4C4A06015821001B0407 /* llsurfacepatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsurfacepatch.h; sourceTree = SOURCE_ROOT; };
-		997B4C4B06015821001B0407 /* llsurface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsurface.h; sourceTree = SOURCE_ROOT; };
-		997B4C4D06015821001B0407 /* llsky.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsky.h; sourceTree = SOURCE_ROOT; };
-		997B4C4E06015821001B0407 /* llselectmgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llselectmgr.h; sourceTree = SOURCE_ROOT; };
-		997B4C5706015821001B0407 /* llregionposition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llregionposition.h; sourceTree = SOURCE_ROOT; };
-		997B4C5A06015821001B0407 /* llprogressview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprogressview.h; sourceTree = SOURCE_ROOT; };
-		997B4C5C06015821001B0407 /* llpreviewtexture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreviewtexture.h; sourceTree = SOURCE_ROOT; };
-		997B4C5D06015821001B0407 /* llpreviewsound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreviewsound.h; sourceTree = SOURCE_ROOT; };
-		997B4C5E06015821001B0407 /* llpreviewscript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreviewscript.h; sourceTree = SOURCE_ROOT; };
-		997B4C6006015821001B0407 /* llpreviewnotecard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreviewnotecard.h; sourceTree = SOURCE_ROOT; };
-		997B4C6106015821001B0407 /* llpreviewlandmark.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreviewlandmark.h; sourceTree = SOURCE_ROOT; };
-		997B4C6206015821001B0407 /* llpreview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreview.h; sourceTree = SOURCE_ROOT; };
-		997B4C6406015821001B0407 /* llpolymorph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpolymorph.h; sourceTree = SOURCE_ROOT; };
-		997B4C6506015821001B0407 /* llpolymesh.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpolymesh.h; sourceTree = SOURCE_ROOT; };
-		997B4C6706015821001B0407 /* llpatchvertexarray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpatchvertexarray.h; sourceTree = SOURCE_ROOT; };
-		997B4C6906015821001B0407 /* llpanelplace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelplace.h; sourceTree = SOURCE_ROOT; };
-		997B4C6A06015821001B0407 /* llpanelpick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelpick.h; sourceTree = SOURCE_ROOT; };
-		997B4C6B06015821001B0407 /* llpanelpermissions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelpermissions.h; sourceTree = SOURCE_ROOT; };
-		997B4C6C06015821001B0407 /* llpanelobject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelobject.h; sourceTree = SOURCE_ROOT; };
-		997B4C6D06015822001B0407 /* llpanelnetwork.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelnetwork.h; sourceTree = SOURCE_ROOT; };
-		997B4C6F06015822001B0407 /* llpanelmorph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelmorph.h; sourceTree = SOURCE_ROOT; };
-		997B4C7206015822001B0407 /* llpanelland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelland.h; sourceTree = SOURCE_ROOT; };
-		997B4C7306015822001B0407 /* llpanelinventory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelinventory.h; sourceTree = SOURCE_ROOT; };
-		997B4C7406015822001B0407 /* llpanelinput.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelinput.h; sourceTree = SOURCE_ROOT; };
-		997B4C7506015822001B0407 /* llpanelgroupvoting.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgroupvoting.h; sourceTree = SOURCE_ROOT; };
-		997B4C7706015822001B0407 /* llpanelgeneral.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgeneral.h; sourceTree = SOURCE_ROOT; };
-		997B4C7906015822001B0407 /* llpanelface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelface.h; sourceTree = SOURCE_ROOT; };
-		997B4C7A06015822001B0407 /* llpanelevent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelevent.h; sourceTree = SOURCE_ROOT; };
-		997B4C7C06015822001B0407 /* llpaneldisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldisplay.h; sourceTree = SOURCE_ROOT; };
-		997B4C7D06015822001B0407 /* llpaneldirpopular.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirpopular.h; sourceTree = SOURCE_ROOT; };
-		997B4C7E06015822001B0407 /* llpaneldirplaces.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirplaces.h; sourceTree = SOURCE_ROOT; };
-		997B4C8006015822001B0407 /* llpaneldirpeople.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirpeople.h; sourceTree = SOURCE_ROOT; };
-		997B4C8206015822001B0407 /* llpaneldirland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirland.h; sourceTree = SOURCE_ROOT; };
-		997B4C8306015822001B0407 /* llpaneldirgroups.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirgroups.h; sourceTree = SOURCE_ROOT; };
-		997B4C8406015822001B0407 /* llpaneldirfind.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirfind.h; sourceTree = SOURCE_ROOT; };
-		997B4C8506015822001B0407 /* llpaneldirevents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirevents.h; sourceTree = SOURCE_ROOT; };
-		997B4C8606015822001B0407 /* llpaneldirbrowser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirbrowser.h; sourceTree = SOURCE_ROOT; };
-		997B4C8906015822001B0407 /* llpaneldebug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldebug.h; sourceTree = SOURCE_ROOT; };
-		997B4C8B06015822001B0407 /* llpanelcontents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelcontents.h; sourceTree = SOURCE_ROOT; };
-		997B4C8D06015822001B0407 /* llpanelavatar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelavatar.h; sourceTree = SOURCE_ROOT; };
-		997B4C8E06015822001B0407 /* llpanelaudioprefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelaudioprefs.h; sourceTree = SOURCE_ROOT; };
-		997B4C9006015822001B0407 /* lloverlaybar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lloverlaybar.h; sourceTree = SOURCE_ROOT; };
-		997B4C9106015822001B0407 /* llnotify.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnotify.h; sourceTree = SOURCE_ROOT; };
-		997B4C9306015822001B0407 /* llnetmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnetmap.h; sourceTree = SOURCE_ROOT; };
-		997B4C9406015822001B0407 /* llnamelistctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnamelistctrl.h; sourceTree = SOURCE_ROOT; };
-		997B4C9506015822001B0407 /* llnameeditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnameeditor.h; sourceTree = SOURCE_ROOT; };
-		997B4C9606015822001B0407 /* llnamebox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnamebox.h; sourceTree = SOURCE_ROOT; };
-		997B4C9706015822001B0407 /* llmutelist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmutelist.h; sourceTree = SOURCE_ROOT; };
-		997B4C9806015822001B0407 /* llmoveview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmoveview.h; sourceTree = SOURCE_ROOT; };
-		997B4C9906015822001B0407 /* llmorphview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmorphview.h; sourceTree = SOURCE_ROOT; };
-		997B4C9D06015822001B0407 /* llmenucommands.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmenucommands.h; sourceTree = SOURCE_ROOT; };
-		997B4C9E06015822001B0407 /* llmaniptranslate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmaniptranslate.h; sourceTree = SOURCE_ROOT; };
-		997B4C9F06015822001B0407 /* llmanipscale.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmanipscale.h; sourceTree = SOURCE_ROOT; };
-		997B4CA006015822001B0407 /* llmaniprotate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmaniprotate.h; sourceTree = SOURCE_ROOT; };
-		997B4CA106015822001B0407 /* llmanip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmanip.h; sourceTree = SOURCE_ROOT; };
-		997B4CA406015822001B0407 /* lllightconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllightconstants.h; sourceTree = SOURCE_ROOT; };
-		997B4CA506015822001B0407 /* lllandmarklist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllandmarklist.h; sourceTree = SOURCE_ROOT; };
-		997B4CA806015822001B0407 /* lljoystickbutton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lljoystickbutton.h; sourceTree = SOURCE_ROOT; };
-		997B4CA906015822001B0407 /* llinventoryview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinventoryview.h; sourceTree = SOURCE_ROOT; };
-		997B4CAA06015822001B0407 /* llinventorymodel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinventorymodel.h; sourceTree = SOURCE_ROOT; };
-		997B4CAB06015822001B0407 /* llinventoryclipboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinventoryclipboard.h; sourceTree = SOURCE_ROOT; };
-		997B4CAC06015822001B0407 /* llimpanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimpanel.h; sourceTree = SOURCE_ROOT; };
-		997B4CAE06015822001B0407 /* llhudview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudview.h; sourceTree = SOURCE_ROOT; };
-		997B4CAF06015822001B0407 /* llhudtext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudtext.h; sourceTree = SOURCE_ROOT; };
-		997B4CB006015822001B0407 /* llhudrender.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudrender.h; sourceTree = SOURCE_ROOT; };
-		997B4CB106015822001B0407 /* llhudobject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudobject.h; sourceTree = SOURCE_ROOT; };
-		997B4CB206015822001B0407 /* llhudmanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudmanager.h; sourceTree = SOURCE_ROOT; };
-		997B4CB306015822001B0407 /* llhudeffecttrail.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudeffecttrail.h; sourceTree = SOURCE_ROOT; };
-		997B4CB406015822001B0407 /* llhudeffectpointat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudeffectpointat.h; sourceTree = SOURCE_ROOT; };
-		997B4CB506015822001B0407 /* llhudeffectlookat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudeffectlookat.h; sourceTree = SOURCE_ROOT; };
-		997B4CB606015822001B0407 /* llhudeffectbeam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudeffectbeam.h; sourceTree = SOURCE_ROOT; };
-		997B4CB706015822001B0407 /* llhudeffect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudeffect.h; sourceTree = SOURCE_ROOT; };
-		997B4CB806015822001B0407 /* llhudconnector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudconnector.h; sourceTree = SOURCE_ROOT; };
-		997B4CB906015822001B0407 /* llhoverview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhoverview.h; sourceTree = SOURCE_ROOT; };
-		997B4CBA06015822001B0407 /* llhippo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhippo.h; sourceTree = SOURCE_ROOT; };
-		997B4CBC06015822001B0407 /* llgivemoney.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgivemoney.h; sourceTree = SOURCE_ROOT; };
-		997B4CBD06015822001B0407 /* llgenepool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgenepool.h; sourceTree = SOURCE_ROOT; };
-		997B4CBE06015822001B0407 /* llframestatview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llframestatview.h; sourceTree = SOURCE_ROOT; };
-		997B4CBF06015822001B0407 /* llframestats.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llframestats.h; sourceTree = SOURCE_ROOT; };
-		997B4CC006015822001B0407 /* llfolderview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfolderview.h; sourceTree = SOURCE_ROOT; };
-		997B4CC106015822001B0407 /* llfloaterworldmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterworldmap.h; sourceTree = SOURCE_ROOT; };
-		997B4CC406015822001B0407 /* llfloatertos.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatertos.h; sourceTree = SOURCE_ROOT; };
-		997B4CC506015822001B0407 /* llfloatertools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatertools.h; sourceTree = SOURCE_ROOT; };
-		997B4CC606015822001B0407 /* llfloatersnapshot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatersnapshot.h; sourceTree = SOURCE_ROOT; };
-		997B4CC706015822001B0407 /* llfloaterreporter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterreporter.h; sourceTree = SOURCE_ROOT; };
-		997B4CC906015822001B0407 /* llfloaterproperties.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterproperties.h; sourceTree = SOURCE_ROOT; };
-		997B4CCA06015822001B0407 /* llfloaterpreference.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterpreference.h; sourceTree = SOURCE_ROOT; };
-		997B4CCB06015822001B0407 /* llfloaterpostcard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterpostcard.h; sourceTree = SOURCE_ROOT; };
-		997B4CCC06015822001B0407 /* llfloaternamedesc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaternamedesc.h; sourceTree = SOURCE_ROOT; };
-		997B4CCD06015822001B0407 /* llfloatermute.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatermute.h; sourceTree = SOURCE_ROOT; };
-		997B4CCF06015822001B0407 /* llfloatermap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatermap.h; sourceTree = SOURCE_ROOT; };
-		997B4CD106015822001B0407 /* llfloaterlandholdings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterlandholdings.h; sourceTree = SOURCE_ROOT; };
-		997B4CD206015822001B0407 /* llfloaterland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterland.h; sourceTree = SOURCE_ROOT; };
-		997B4CD406015822001B0407 /* llfloatergroups.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatergroups.h; sourceTree = SOURCE_ROOT; };
-		997B4CD606015822001B0407 /* llfloatergroupinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatergroupinfo.h; sourceTree = SOURCE_ROOT; };
-		997B4CD806015822001B0407 /* llfloatergodtools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatergodtools.h; sourceTree = SOURCE_ROOT; };
-		997B4CD906015822001B0407 /* llfloatergesture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatergesture.h; sourceTree = SOURCE_ROOT; };
-		997B4CDA06015822001B0407 /* llfloaterdirectory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterdirectory.h; sourceTree = SOURCE_ROOT; };
-		997B4CDB06015822001B0407 /* llfloatercustomize.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatercustomize.h; sourceTree = SOURCE_ROOT; };
-		997B4CDC06015822001B0407 /* llfloaterchat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterchat.h; sourceTree = SOURCE_ROOT; };
-		997B4CDE06015822001B0407 /* llfloaterbuycontents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbuycontents.h; sourceTree = SOURCE_ROOT; };
-		997B4CDF06015822001B0407 /* llfloaterbuy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbuy.h; sourceTree = SOURCE_ROOT; };
-		997B4CE006015822001B0407 /* llfloaterbuildoptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbuildoptions.h; sourceTree = SOURCE_ROOT; };
-		997B4CE206015822001B0407 /* llfloateravatarinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateravatarinfo.h; sourceTree = SOURCE_ROOT; };
-		997B4CE306015822001B0407 /* llfloaterauction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterauction.h; sourceTree = SOURCE_ROOT; };
-		997B4CE506015822001B0407 /* llfloaterabout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterabout.h; sourceTree = SOURCE_ROOT; };
-		997B4CE706015822001B0407 /* llfirstuse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfirstuse.h; sourceTree = SOURCE_ROOT; };
-		997B4CE906015822001B0407 /* llfilepicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfilepicker.h; sourceTree = SOURCE_ROOT; };
-		997B4CEB06015822001B0407 /* llfeaturemanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfeaturemanager.h; sourceTree = SOURCE_ROOT; };
-		997B4CEC06015822001B0407 /* llface.inl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = llface.inl; sourceTree = SOURCE_ROOT; };
-		997B4CEE06015822001B0407 /* llcylinder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcylinder.h; sourceTree = SOURCE_ROOT; };
-		997B4CEF06015822001B0407 /* llcubemap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcubemap.h; sourceTree = SOURCE_ROOT; };
-		997B4CF106015822001B0407 /* llface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llface.h; sourceTree = SOURCE_ROOT; };
-		997B4CF206015822001B0407 /* llemote.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llemote.h; sourceTree = SOURCE_ROOT; };
-		997B4CF406015822001B0407 /* lldriverparam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldriverparam.h; sourceTree = SOURCE_ROOT; };
-		997B4CF506015823001B0407 /* lldrawpoolwater.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolwater.h; sourceTree = SOURCE_ROOT; };
-		997B4CF706015823001B0407 /* lldrawpooltree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpooltree.h; sourceTree = SOURCE_ROOT; };
-		997B4CF806015823001B0407 /* lldrawpoolterrain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolterrain.h; sourceTree = SOURCE_ROOT; };
-		997B4CFA06015823001B0407 /* lldrawpoolsky.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolsky.h; sourceTree = SOURCE_ROOT; };
-		997B4CFB06015823001B0407 /* lldrawpoolsimple.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolsimple.h; sourceTree = SOURCE_ROOT; };
-		997B4CFC06015823001B0407 /* lldrawpoolground.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolground.h; sourceTree = SOURCE_ROOT; };
-		997B4CFD06015823001B0407 /* lldrawpoolbump.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolbump.h; sourceTree = SOURCE_ROOT; };
-		997B4CFE06015823001B0407 /* lldrawpoolavatar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolavatar.h; sourceTree = SOURCE_ROOT; };
-		997B4CFF06015823001B0407 /* lldrawpoolalpha.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolalpha.h; sourceTree = SOURCE_ROOT; };
-		997B4D0006015823001B0407 /* lldrawpool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpool.h; sourceTree = SOURCE_ROOT; };
-		997B4D0106015823001B0407 /* lldrawable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawable.h; sourceTree = SOURCE_ROOT; };
-		997B4D0306015823001B0407 /* lldebugview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldebugview.h; sourceTree = SOURCE_ROOT; };
-		997B4D0606015823001B0407 /* llcontainerview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcontainerview.h; sourceTree = SOURCE_ROOT; };
-		997B4D0706015823001B0407 /* llconsole.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llconsole.h; sourceTree = SOURCE_ROOT; };
-		997B4D0806015823001B0407 /* llcompilequeue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcompilequeue.h; sourceTree = SOURCE_ROOT; };
-		997B4D0906015823001B0407 /* llcompass.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcompass.h; sourceTree = SOURCE_ROOT; };
-		997B4D0B06015823001B0407 /* llcolorswatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcolorswatch.h; sourceTree = SOURCE_ROOT; };
-		997B4D0C06015823001B0407 /* llcolorscheme.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcolorscheme.h; sourceTree = SOURCE_ROOT; };
-		997B4D0D06015823001B0407 /* llcloud.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcloud.h; sourceTree = SOURCE_ROOT; };
-		997B4D1006015823001B0407 /* llchatbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llchatbar.h; sourceTree = SOURCE_ROOT; };
-		997B4D1206015823001B0407 /* llcallingcard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallingcard.h; sourceTree = SOURCE_ROOT; };
-		997B4D1306015823001B0407 /* llcallbacklist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallbacklist.h; sourceTree = SOURCE_ROOT; };
-		997B4D1606015823001B0407 /* llbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbox.h; sourceTree = SOURCE_ROOT; };
-		997B4D1806015823001B0407 /* llbbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbbox.h; sourceTree = SOURCE_ROOT; };
-		997B4D1E06015823001B0407 /* llappearance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llappearance.h; sourceTree = SOURCE_ROOT; };
-		997B4D2206015823001B0407 /* llagentpilot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagentpilot.h; sourceTree = SOURCE_ROOT; };
-		997B4D2306015823001B0407 /* llagent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagent.h; sourceTree = SOURCE_ROOT; };
-		9985A08E0AC1FE3600579AFB /* llwindowmacosx-objc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "llwindowmacosx-objc.h"; sourceTree = "<group>"; };
-		9985A08F0AC1FE3600579AFB /* llwindowmacosx-objc.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = "llwindowmacosx-objc.mm"; sourceTree = "<group>"; };
-		9985A1270AC1FE4E00579AFB /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = ../../../../../../../../System/Library/Frameworks/AppKit.framework; sourceTree = "<group>"; };
-		99AAD74D09DC8B9D0036C309 /* lllfsthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllfsthread.h; sourceTree = "<group>"; };
-		99AAD74E09DC8B9D0036C309 /* lllfsthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllfsthread.cpp; sourceTree = "<group>"; };
-		99BB5166099ABDEB004BF9F2 /* llfloaterbuyland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbuyland.cpp; sourceTree = SOURCE_ROOT; };
-		99BB5167099ABDEB004BF9F2 /* llfloaterbuyland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbuyland.h; sourceTree = SOURCE_ROOT; };
-		99BB5169099AC1AE004BF9F2 /* llxmlrpctransaction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxmlrpctransaction.h; sourceTree = SOURCE_ROOT; };
-		99BB516A099AC1AE004BF9F2 /* llxmlrpctransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxmlrpctransaction.cpp; sourceTree = SOURCE_ROOT; };
-		99BB516D099AC1E9004BF9F2 /* llviewchildren.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewchildren.cpp; sourceTree = SOURCE_ROOT; };
-		99BB516E099AC1E9004BF9F2 /* llviewchildren.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewchildren.h; sourceTree = SOURCE_ROOT; };
-		99BB5170099AC1FC004BF9F2 /* llcurrencyuimanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcurrencyuimanager.cpp; sourceTree = SOURCE_ROOT; };
-		99BB5171099AC1FC004BF9F2 /* llcurrencyuimanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcurrencyuimanager.h; sourceTree = SOURCE_ROOT; };
-		99BB5174099AC2A4004BF9F2 /* llconfirmationmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llconfirmationmanager.cpp; sourceTree = SOURCE_ROOT; };
-		99BB5175099AC2A4004BF9F2 /* llconfirmationmanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llconfirmationmanager.h; sourceTree = SOURCE_ROOT; };
-		99C9FA660B6AD9BF00A1BBA6 /* SLVoice */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = SLVoice; path = "vivox-runtime/universal-darwin/SLVoice"; sourceTree = SOURCE_ROOT; };
-		99D5703305BDEFD7004DE704 /* AutoUpdater.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AutoUpdater.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		99D5703505BDEFD8004DE704 /* AutoUpdater-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "AutoUpdater-Info.plist"; sourceTree = SOURCE_ROOT; };
-		99D8B25508735BFE002F8938 /* material_codes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = material_codes.h; sourceTree = "<group>"; };
-		99DB67DA07C161A500CF3185 /* llmediaimplquicktime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmediaimplquicktime.h; sourceTree = "<group>"; };
-		99DB67DB07C161A500CF3185 /* llmediaimplquicktime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplquicktime.cpp; sourceTree = "<group>"; };
-		99E4326B092D5996003AE728 /* llassettype.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = llassettype.cpp; path = ../llcommon/llassettype.cpp; sourceTree = SOURCE_ROOT; };
-		99E4326C092D5996003AE728 /* llassettype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = llassettype.h; path = ../llcommon/llassettype.h; sourceTree = SOURCE_ROOT; };
-		99E4350A092D644F003AE728 /* llmortician.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = llmortician.h; path = ../llcommon/llmortician.h; sourceTree = SOURCE_ROOT; };
-		99E4350B092D644F003AE728 /* llmortician.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = llmortician.cpp; path = ../llcommon/llmortician.cpp; sourceTree = SOURCE_ROOT; };
-		99E4350F092D64A4003AE728 /* llfloaterbuycurrency.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbuycurrency.cpp; sourceTree = SOURCE_ROOT; };
-		99E43510092D64A4003AE728 /* llfloaterbuycurrency.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbuycurrency.h; sourceTree = SOURCE_ROOT; };
-		99E43512092D64CC003AE728 /* llmemoryview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmemoryview.h; sourceTree = SOURCE_ROOT; };
-		99E43513092D64CC003AE728 /* llmemoryview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmemoryview.cpp; sourceTree = SOURCE_ROOT; };
-		99E43515092D64E6003AE728 /* llvoinventorylistener.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoinventorylistener.h; sourceTree = SOURCE_ROOT; };
-		99E43516092D64E6003AE728 /* llvoinventorylistener.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoinventorylistener.cpp; sourceTree = SOURCE_ROOT; };
-		99E43518092D6535003AE728 /* llcommon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = llcommon.h; path = ../llcommon/llcommon.h; sourceTree = SOURCE_ROOT; };
-		99E43519092D6535003AE728 /* llcommon.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = llcommon.cpp; path = ../llcommon/llcommon.cpp; sourceTree = SOURCE_ROOT; };
-		99E63DEF0BCADD14000C1751 /* libalut.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libalut.dylib; path = "vivox-runtime/universal-darwin/libalut.dylib"; sourceTree = SOURCE_ROOT; };
-		99E63DF00BCADD14000C1751 /* libortp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libortp.dylib; path = "vivox-runtime/universal-darwin/libortp.dylib"; sourceTree = SOURCE_ROOT; };
-		99E63DF10BCADD14000C1751 /* libvivoxsdk.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvivoxsdk.dylib; path = "vivox-runtime/universal-darwin/libvivoxsdk.dylib"; sourceTree = SOURCE_ROOT; };
-		99E63DF20BCADD14000C1751 /* libopenal.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenal.dylib; path = "vivox-runtime/universal-darwin/libopenal.dylib"; sourceTree = SOURCE_ROOT; };
-		99E64035081F1CB80009003F /* llglheaders.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llglheaders.h; sourceTree = "<group>"; };
-		99E64036081F1CB80009003F /* llgl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgl.cpp; sourceTree = "<group>"; };
-		99E64037081F1CB80009003F /* llgl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgl.h; sourceTree = "<group>"; };
-		99EDDF5B05892E720031B20D /* llfloaterlandholdings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterlandholdings.cpp; sourceTree = "<group>"; };
-		99EDE33605896DC10031B20D /* SecondLife.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = SecondLife.nib; sourceTree = "<group>"; };
-		99F998FA0BAA34B90034E41C /* libopenjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopenjpeg.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		99FBB044087362B60048A5CC /* llpanelclassified.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelclassified.cpp; sourceTree = "<group>"; };
-		99FBB048087363B00048A5CC /* llpanelclassified.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelclassified.h; sourceTree = "<group>"; };
-		99FBB071087365E90048A5CC /* llclassifiedflags.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llclassifiedflags.cpp; sourceTree = "<group>"; };
-		99FBB072087365E90048A5CC /* llclassifiedflags.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclassifiedflags.h; sourceTree = "<group>"; };
-		99FBB08E087366780048A5CC /* llpaneldirclassified.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpaneldirclassified.cpp; sourceTree = "<group>"; };
-		99FBB090087366930048A5CC /* llpaneldirclassified.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpaneldirclassified.h; sourceTree = "<group>"; };
-		9B2863B00ABF637200A05D7C /* llerrorthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerrorthread.cpp; sourceTree = "<group>"; };
-		9B2863B10ABF637200A05D7C /* llerrorthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerrorthread.h; sourceTree = "<group>"; };
-		9B39350B0AD6F96900F57245 /* llhttpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpclient.cpp; sourceTree = "<group>"; };
-		9B39350C0AD6F96900F57245 /* llhttpclient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpclient.h; sourceTree = "<group>"; };
-		9B39350F0AD6F9F400F57245 /* llurlrequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlrequest.cpp; sourceTree = "<group>"; };
-		9B3935100AD6F9F400F57245 /* llurlrequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlrequest.h; sourceTree = "<group>"; };
-		9C1842500B9F94F200208356 /* llcaphttpsender.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcaphttpsender.h; sourceTree = "<group>"; };
-		9C18425A0B9F951500208356 /* llcaphttpsender.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcaphttpsender.cpp; sourceTree = "<group>"; };
-		9C1853AD0A91175E00DA7B01 /* llviewercontrol.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewercontrol.cpp; sourceTree = "<group>"; };
-		9C659A850BAB0B6E00D2EB60 /* llmessageconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmessageconfig.cpp; sourceTree = "<group>"; };
-		9C659A860BAB0B6E00D2EB60 /* llmessageconfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessageconfig.h; sourceTree = "<group>"; };
-		9C67A8440A02BBA60056B4E0 /* gpu_table.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = gpu_table.txt; sourceTree = "<group>"; };
-		9CC280FE0BE79737006D8BDC /* llmessagetemplateparser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmessagetemplateparser.cpp; sourceTree = "<group>"; };
-		9CC281000BE79746006D8BDC /* llmessagetemplateparser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessagetemplateparser.h; sourceTree = "<group>"; };
-		9CD49D5609D0BAC100192434 /* llflexibleobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llflexibleobject.cpp; sourceTree = "<group>"; };
-		9CD49D5809D0BAD600192434 /* llflexibleobject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llflexibleobject.h; sourceTree = "<group>"; };
-		A241CB7B07B3DE0D001A39E3 /* llviewerprecompiledheaders.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerprecompiledheaders.cpp; sourceTree = "<group>"; };
-		A241CB7C07B3DE0D001A39E3 /* llviewerprecompiledheaders.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerprecompiledheaders.h; sourceTree = "<group>"; };
-		A241CB8807B3E324001A39E3 /* llperlin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llperlin.h; sourceTree = "<group>"; };
-		A241CB8907B3E324001A39E3 /* llplane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llplane.h; sourceTree = "<group>"; };
-		A241CB8E07B3E383001A39E3 /* llmessagethrottle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmessagethrottle.cpp; sourceTree = "<group>"; };
-		A241CB8F07B3E383001A39E3 /* llmessagethrottle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessagethrottle.h; sourceTree = "<group>"; };
-		A241CB9407B3E3A7001A39E3 /* llperlin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llperlin.cpp; sourceTree = "<group>"; };
-		A26560500C9F53CC004042A0 /* llfloaterhardwaresettings.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterhardwaresettings.cpp; sourceTree = "<group>"; };
-		A26560510C9F53CC004042A0 /* llfloaterhardwaresettings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterhardwaresettings.h; sourceTree = "<group>"; };
-		A29852A10BC6BC630005FA09 /* llhtmlhelp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhtmlhelp.h; sourceTree = "<group>"; };
-		A2A57EBA0ADF10FD00F6EF97 /* llavatarconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llavatarconstants.h; sourceTree = "<group>"; };
-		A2A8C5440C649EE20001FEB2 /* llmultislider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmultislider.cpp; sourceTree = "<group>"; };
-		A2A8C5450C649EE20001FEB2 /* llmultislider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmultislider.h; sourceTree = "<group>"; };
-		A2A8C5460C649EE20001FEB2 /* llmultisliderctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmultisliderctrl.cpp; sourceTree = "<group>"; };
-		A2A8C5470C649EE20001FEB2 /* llmultisliderctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmultisliderctrl.h; sourceTree = "<group>"; };
-		A2A8C54A0C649F480001FEB2 /* lldrawpoolwlsky.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolwlsky.cpp; sourceTree = "<group>"; };
-		A2A8C54B0C649F480001FEB2 /* lldrawpoolwlsky.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolwlsky.h; sourceTree = "<group>"; };
-		A2A8C54C0C649F480001FEB2 /* llfloaterdaycycle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterdaycycle.cpp; sourceTree = "<group>"; };
-		A2A8C54D0C649F480001FEB2 /* llfloaterdaycycle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterdaycycle.h; sourceTree = "<group>"; };
-		A2A8C54E0C649F480001FEB2 /* llfloaterpostprocess.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterpostprocess.cpp; sourceTree = "<group>"; };
-		A2A8C54F0C649F480001FEB2 /* llfloaterpostprocess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterpostprocess.h; sourceTree = "<group>"; };
-		A2A8C5520C649F480001FEB2 /* llfloaterwindlight.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterwindlight.cpp; sourceTree = "<group>"; };
-		A2A8C5530C649F480001FEB2 /* llfloaterwindlight.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterwindlight.h; sourceTree = "<group>"; };
-		A2A8C5540C649F480001FEB2 /* llpostprocess.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpostprocess.cpp; sourceTree = "<group>"; };
-		A2A8C5550C649F480001FEB2 /* llpostprocess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpostprocess.h; sourceTree = "<group>"; };
-		A2A8C5560C649F480001FEB2 /* llvowlsky.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvowlsky.cpp; sourceTree = "<group>"; };
-		A2A8C5570C649F480001FEB2 /* llvowlsky.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvowlsky.h; sourceTree = "<group>"; };
-		A2A8C5580C649F480001FEB2 /* llwlanimator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwlanimator.cpp; sourceTree = "<group>"; };
-		A2A8C5590C649F490001FEB2 /* llwlanimator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwlanimator.h; sourceTree = "<group>"; };
-		A2A8C55A0C649F490001FEB2 /* llwldaycycle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwldaycycle.cpp; sourceTree = "<group>"; };
-		A2A8C55B0C649F490001FEB2 /* llwldaycycle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwldaycycle.h; sourceTree = "<group>"; };
-		A2A8C55C0C649F490001FEB2 /* llwlparammanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwlparammanager.cpp; sourceTree = "<group>"; };
-		A2A8C55D0C649F490001FEB2 /* llwlparammanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwlparammanager.h; sourceTree = "<group>"; };
-		A2A8C55E0C649F490001FEB2 /* llwlparamset.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwlparamset.cpp; sourceTree = "<group>"; };
-		A2A8C55F0C649F490001FEB2 /* llwlparamset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwlparamset.h; sourceTree = "<group>"; };
-		A30273550B3A13D800704420 /* llvertexbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvertexbuffer.cpp; sourceTree = "<group>"; };
-		A30273560B3A13D800704420 /* llvertexbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvertexbuffer.h; sourceTree = "<group>"; };
-		A3077C0309DCB8140059ED75 /* llpanelvolume.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelvolume.cpp; sourceTree = "<group>"; };
-		A3077C0409DCB8140059ED75 /* llpanelvolume.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelvolume.h; sourceTree = "<group>"; };
-		A3285A340A71419F00F619A5 /* llinventorybridge.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventorybridge.cpp; sourceTree = "<group>"; };
-		A3285A350A71419F00F619A5 /* llinventorybridge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinventorybridge.h; sourceTree = "<group>"; };
-		A3285A3A0A71425100F619A5 /* llinventoryactions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventoryactions.cpp; sourceTree = "<group>"; };
-		A3653EBB0AC5F3D500E1E936 /* lltreenode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltreenode.h; sourceTree = "<group>"; };
-		A3AF6BC80A544C71005B5E2C /* llevent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llevent.cpp; sourceTree = "<group>"; };
-		A3AF6BC90A544C71005B5E2C /* llevent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llevent.h; sourceTree = "<group>"; };
-		A3AF6BCA0A544C71005B5E2C /* lleventemitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleventemitter.h; sourceTree = "<group>"; };
-		A3AF6BCE0A544EF0005B5E2C /* llpanellogin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanellogin.cpp; sourceTree = "<group>"; };
-		A3AF6BD00A544F0A005B5E2C /* llpanellogin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanellogin.h; sourceTree = "<group>"; };
-		A3C20E490BB0BCDF007E872B /* llglslshader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llglslshader.cpp; sourceTree = "<group>"; };
-		A3C20E4B0BB0BD12007E872B /* llviewerjoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerjoystick.cpp; sourceTree = "<group>"; };
-		A3C20E4D0BB0BD37007E872B /* llglslshader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llglslshader.h; sourceTree = "<group>"; };
-		A3C20E4E0BB0BD49007E872B /* llviewerjoystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerjoystick.h; sourceTree = "<group>"; };
-		A3D968F00A6EBCA7007E8BD2 /* llfloaternewim.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaternewim.cpp; sourceTree = "<group>"; };
-		A3D968F10A6EBCA7007E8BD2 /* llfloaternewim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaternewim.h; sourceTree = "<group>"; };
-		A3D9691B0A6ED5F6007E8BD2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		AA02B9BA0B0CE44D00F2996D /* lltexturefetch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturefetch.cpp; sourceTree = "<group>"; };
-		AA02B9BB0B0CE44D00F2996D /* lltexturefetch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturefetch.h; sourceTree = "<group>"; };
-		AA0E2A5F0A2FDAEE0066250A /* llcontrol.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcontrol.cpp; sourceTree = "<group>"; };
-		AA0E2A600A2FDAEE0066250A /* llcontrol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcontrol.h; sourceTree = "<group>"; };
-		AA0E2A620A2FDB340066250A /* lltoolpipette.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolpipette.cpp; sourceTree = "<group>"; };
-		AA0E2A630A2FDB340066250A /* lltoolpipette.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolpipette.h; sourceTree = "<group>"; };
-		AA11834E0C1DF9C400FDE5BA /* llpanelaudiovolume.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelaudiovolume.cpp; sourceTree = "<group>"; };
-		AA11834F0C1DF9C400FDE5BA /* llpanelaudiovolume.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelaudiovolume.h; sourceTree = "<group>"; };
-		AA348DF80B0EAB31002C3015 /* llcurl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcurl.cpp; sourceTree = "<group>"; };
-		AA348DF90B0EAB31002C3015 /* llcurl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcurl.h; sourceTree = "<group>"; };
-		AA38F8F00D8A3687003B39F9 /* llfloaterjoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterjoystick.cpp; sourceTree = "<group>"; };
-		AA38F8F10D8A3687003B39F9 /* llfloaterjoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloaterjoystick.h; sourceTree = "<group>"; };
-		AA38F8FD0D8AFCF4003B39F9 /* libndofdev.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libndofdev.dylib; path = "../../libraries/universal-darwin/lib_release/libndofdev.dylib"; sourceTree = SOURCE_ROOT; };
-		AAA133690A3F94D000419F7C /* lluistring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluistring.cpp; sourceTree = "<group>"; };
-		AAA1336A0A3F94D000419F7C /* lluistring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluistring.h; sourceTree = "<group>"; };
-		AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_signals-mt.a"; path = "../../libraries/i386-darwin/lib_release/libboost_signals-mt.a"; sourceTree = SOURCE_ROOT; };
-		AAC121A30A93A8380080E8A9 /* llfloatersellland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatersellland.cpp; sourceTree = "<group>"; };
-		AAC121A40A93A8380080E8A9 /* llfloatersellland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatersellland.h; sourceTree = "<group>"; };
-		AAE98CC00B38FE0800E2F204 /* llimageworker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimageworker.cpp; sourceTree = "<group>"; };
-		AAE98CC10B38FE0800E2F204 /* llimageworker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimageworker.h; sourceTree = "<group>"; };
-		AAEAAF250A8104D8005F0707 /* llscrollingpanellist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llscrollingpanellist.cpp; sourceTree = "<group>"; };
-		AAEAAF260A8104D8005F0707 /* llscrollingpanellist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llscrollingpanellist.h; sourceTree = "<group>"; };
-		AAF5FFD00B13F71900D28A84 /* lltexturecache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturecache.cpp; sourceTree = "<group>"; };
-		AAF5FFD10B13F71900D28A84 /* lltexturecache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturecache.h; sourceTree = "<group>"; };
-		AB058FE40B3B74AD003C59D8 /* llvoicevisualizer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoicevisualizer.h; sourceTree = "<group>"; };
-		ABD8702D0B3C68630007C63B /* llvoavatar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoavatar.h; sourceTree = "<group>"; };
-		C16C084E0B4AE6C7009AD67F /* llfloaterinspect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterinspect.cpp; sourceTree = "<group>"; };
-		C16C084F0B4AE6C7009AD67F /* llfloaterinspect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterinspect.h; sourceTree = "<group>"; };
-		C19628F30D53D7AB007C909A /* llfloatersettingsdebug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatersettingsdebug.cpp; sourceTree = "<group>"; };
-		C19628F40D53D7AB007C909A /* llfloatersettingsdebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloatersettingsdebug.h; sourceTree = "<group>"; };
-		C1B2AF890CD679EB004CD4EF /* llcrashloggermac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcrashloggermac.h; sourceTree = "<group>"; };
-		C1E4A5750CC020FC005FB0A6 /* llcrashloggermac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcrashloggermac.cpp; sourceTree = "<group>"; };
-		C1E4A5770CC0210F005FB0A6 /* llcrashlogger.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = llcrashlogger.cpp; path = ../llcrashlogger/llcrashlogger.cpp; sourceTree = SOURCE_ROOT; };
-		C1E4A5780CC0210F005FB0A6 /* llcrashlogger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = llcrashlogger.h; path = ../llcrashlogger/llcrashlogger.h; sourceTree = SOURCE_ROOT; };
-		C1F5D0A30B138AEB00827F1D /* lluserrelations.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserrelations.cpp; sourceTree = "<group>"; };
-		C1F5D0A40B138AEB00827F1D /* lluserrelations.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluserrelations.h; sourceTree = "<group>"; };
-		C64F673D0AFBED80009732B5 /* lllogchat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllogchat.cpp; sourceTree = "<group>"; };
-		C64F673E0AFBED80009732B5 /* lllogchat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllogchat.h; sourceTree = "<group>"; };
-		C64F67400AFBED91009732B5 /* lldirpicker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldirpicker.cpp; sourceTree = "<group>"; };
-		C64F67410AFBED91009732B5 /* lldirpicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldirpicker.h; sourceTree = "<group>"; };
-		CB0873B40D62226B009600F8 /* lldelayedgestureerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lldelayedgestureerror.cpp; sourceTree = "<group>"; };
-		CB0873B50D62226B009600F8 /* lldelayedgestureerror.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lldelayedgestureerror.h; sourceTree = "<group>"; };
-		CB162DB40C6CCCFE00BF83BB /* llextendedstatus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llextendedstatus.h; sourceTree = "<group>"; };
-		D158CB820D75F0580060BD44 /* llsmoothstep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llsmoothstep.h; sourceTree = "<group>"; };
-		D1BB623B0D91BBEB00001516 /* llfloatervoicedevicesettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatervoicedevicesettings.cpp; sourceTree = "<group>"; };
-		D1BB623C0D91BBEC00001516 /* llfloatervoicedevicesettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloatervoicedevicesettings.h; sourceTree = "<group>"; };
-		D1CA83CC0D62634400C61743 /* llfloaterstats.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterstats.h; sourceTree = "<group>"; };
-		D1CA83CD0D62634400C61743 /* llfloaterstats.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterstats.cpp; sourceTree = "<group>"; };
-		D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterreleasemsg.cpp; sourceTree = "<group>"; };
-		D23289B40C453A3600304FEF /* llfloaterreleasemsg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterreleasemsg.h; sourceTree = "<group>"; };
-		D2768CE30CEA38940000BD66 /* llfloaterlagmeter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterlagmeter.cpp; sourceTree = "<group>"; };
-		D2768CE40CEA38940000BD66 /* llfloaterlagmeter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloaterlagmeter.h; sourceTree = "<group>"; };
-		D62830D80B4DC76300F8830F /* llimagej2coj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagej2coj.cpp; sourceTree = "<group>"; };
-		D62830D90B4DC76300F8830F /* llimagej2coj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagej2coj.h; sourceTree = "<group>"; };
-		D628315B0B4F3FA100F8830F /* llfont.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfont.cpp; sourceTree = "<group>"; };
-		D628315C0B4F3FA100F8830F /* llfont.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfont.h; sourceTree = "<group>"; };
-		D628315D0B4F3FA100F8830F /* llfontgl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfontgl.cpp; sourceTree = "<group>"; };
-		D628315E0B4F3FA100F8830F /* llfontgl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfontgl.h; sourceTree = "<group>"; };
-		D628315F0B4F3FA100F8830F /* llgldbg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgldbg.cpp; sourceTree = "<group>"; };
-		D62831600B4F3FA200F8830F /* llgldbg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgldbg.h; sourceTree = "<group>"; };
-		D62831610B4F3FA200F8830F /* llimagegl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagegl.cpp; sourceTree = "<group>"; };
-		D62831620B4F3FA200F8830F /* llimagegl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagegl.h; sourceTree = "<group>"; };
-		D62831640B4F3FA200F8830F /* llvertexprogramgl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvertexprogramgl.cpp; sourceTree = "<group>"; };
-		D62831650B4F3FA200F8830F /* llvertexprogramgl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvertexprogramgl.h; sourceTree = "<group>"; };
-		D6B7667F0BFE8E9A00DC8153 /* llfloaterchatterbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterchatterbox.cpp; sourceTree = "<group>"; };
-		D6B766820BFE8ED700DC8153 /* llfloaterchatterbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterchatterbox.h; sourceTree = "<group>"; };
-		D8CA570D0BAF74FC0093D6D4 /* llvoicevisualizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llvoicevisualizer.h; sourceTree = "<group>"; };
-		D8CA570E0BAF74FC0093D6D4 /* llvoicevisualizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llvoicevisualizer.cpp; sourceTree = "<group>"; };
-		D8EAB8B40BE7B3D10067DBB3 /* llfloateractivespeakers.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateractivespeakers.cpp; sourceTree = "<group>"; };
-		D8EAB8B50BE7B3D10067DBB3 /* llfloateractivespeakers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateractivespeakers.h; sourceTree = "<group>"; };
-		D8EAB8B80BE7B4490067DBB3 /* llvoiceremotectrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoiceremotectrl.cpp; sourceTree = "<group>"; };
-		D8EAB8B90BE7B4490067DBB3 /* llvoiceremotectrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoiceremotectrl.h; sourceTree = "<group>"; };
-		DA4B14140B978815003F64DE /* llhttpsender.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpsender.cpp; sourceTree = "<group>"; };
-		DA4B14150B978815003F64DE /* llhttpsender.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpsender.h; sourceTree = "<group>"; };
-		DA4B14160B978815003F64DE /* llmessagetemplate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessagetemplate.h; sourceTree = "<group>"; };
-		DA4B14170B978815003F64DE /* llsdmessagebuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdmessagebuilder.cpp; sourceTree = "<group>"; };
-		DA4B14180B978815003F64DE /* llsdmessagebuilder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdmessagebuilder.h; sourceTree = "<group>"; };
-		DA4B14190B978815003F64DE /* llsdmessagereader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdmessagereader.cpp; sourceTree = "<group>"; };
-		DA4B141A0B978815003F64DE /* llsdmessagereader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdmessagereader.h; sourceTree = "<group>"; };
-		DA55FCB20B59F75C001C28B6 /* llerrorcontrol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerrorcontrol.h; sourceTree = "<group>"; };
-		DA9C40DE0B54B4BA00DD6F44 /* llformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llformat.h; sourceTree = "<group>"; };
-		DA9C40DF0B54B4BA00DD6F44 /* llformat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llformat.cpp; sourceTree = "<group>"; };
-		DA9C40EC0B54B5C700DD6F44 /* llerrorlegacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llerrorlegacy.h; sourceTree = "<group>"; };
-		DA9C41120B54B8CA00DD6F44 /* lllivefile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllivefile.cpp; sourceTree = "<group>"; };
-		DA9C41130B54B8CA00DD6F44 /* lllivefile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllivefile.h; sourceTree = "<group>"; };
-		E34C14730AE6A3F0009BF4DE /* llmapresponders.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmapresponders.cpp; sourceTree = "<group>"; };
-		E34C14750AE6A3FF009BF4DE /* llmapresponders.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmapresponders.h; sourceTree = "<group>"; };
-		EB3EE68E083ABB5D002BF676 /* llbutton.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbutton.cpp; sourceTree = "<group>"; };
-		EB3EE68F083ABB5D002BF676 /* llbutton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbutton.h; sourceTree = "<group>"; };
-		EB3EE690083ABB5D002BF676 /* llcheckboxctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcheckboxctrl.cpp; sourceTree = "<group>"; };
-		EB3EE691083ABB5D002BF676 /* llcheckboxctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcheckboxctrl.h; sourceTree = "<group>"; };
-		EB3EE692083ABB5D002BF676 /* llclipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llclipboard.cpp; sourceTree = "<group>"; };
-		EB3EE693083ABB5D002BF676 /* llclipboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclipboard.h; sourceTree = "<group>"; };
-		EB3EE694083ABB5D002BF676 /* llcombobox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcombobox.cpp; sourceTree = "<group>"; };
-		EB3EE695083ABB5D002BF676 /* llcombobox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcombobox.h; sourceTree = "<group>"; };
-		EB3EE696083ABB5D002BF676 /* lldraghandle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldraghandle.cpp; sourceTree = "<group>"; };
-		EB3EE697083ABB5D002BF676 /* lldraghandle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldraghandle.h; sourceTree = "<group>"; };
-		EB3EE698083ABB5D002BF676 /* llfloater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloater.cpp; sourceTree = "<group>"; };
-		EB3EE699083ABB5D002BF676 /* llfloater.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloater.h; sourceTree = "<group>"; };
-		EB3EE69A083ABB5D002BF676 /* llfocusmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfocusmgr.cpp; sourceTree = "<group>"; };
-		EB3EE69B083ABB5D002BF676 /* llfocusmgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfocusmgr.h; sourceTree = "<group>"; };
-		EB3EE69C083ABB5D002BF676 /* lliconctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lliconctrl.cpp; sourceTree = "<group>"; };
-		EB3EE69D083ABB5D002BF676 /* lliconctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lliconctrl.h; sourceTree = "<group>"; };
-		EB3EE69E083ABB5D002BF676 /* llkeywords.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llkeywords.cpp; sourceTree = "<group>"; };
-		EB3EE69F083ABB5D002BF676 /* llkeywords.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llkeywords.h; sourceTree = "<group>"; };
-		EB3EE6A0083ABB5D002BF676 /* lllineeditor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllineeditor.cpp; sourceTree = "<group>"; };
-		EB3EE6A1083ABB5D002BF676 /* lllineeditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllineeditor.h; sourceTree = "<group>"; };
-		EB3EE6A2083ABB5D002BF676 /* llpanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanel.cpp; sourceTree = "<group>"; };
-		EB3EE6A3083ABB5D002BF676 /* llpanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanel.h; sourceTree = "<group>"; };
-		EB3EE6A4083ABB5D002BF676 /* llradiogroup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llradiogroup.cpp; sourceTree = "<group>"; };
-		EB3EE6A5083ABB5D002BF676 /* llradiogroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llradiogroup.h; sourceTree = "<group>"; };
-		EB3EE6A6083ABB5D002BF676 /* llresizebar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llresizebar.cpp; sourceTree = "<group>"; };
-		EB3EE6A7083ABB5D002BF676 /* llresizebar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llresizebar.h; sourceTree = "<group>"; };
-		EB3EE6A8083ABB5D002BF676 /* llresizehandle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llresizehandle.cpp; sourceTree = "<group>"; };
-		EB3EE6A9083ABB5D002BF676 /* llresizehandle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llresizehandle.h; sourceTree = "<group>"; };
-		EB3EE6AA083ABB5D002BF676 /* llscrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llscrollbar.cpp; sourceTree = "<group>"; };
-		EB3EE6AB083ABB5D002BF676 /* llscrollbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llscrollbar.h; sourceTree = "<group>"; };
-		EB3EE6AC083ABB5D002BF676 /* llscrollcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llscrollcontainer.cpp; sourceTree = "<group>"; };
-		EB3EE6AD083ABB5D002BF676 /* llscrollcontainer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llscrollcontainer.h; sourceTree = "<group>"; };
-		EB3EE6AE083ABB5D002BF676 /* llscrolllistctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llscrolllistctrl.cpp; sourceTree = "<group>"; };
-		EB3EE6AF083ABB5D002BF676 /* llscrolllistctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llscrolllistctrl.h; sourceTree = "<group>"; };
-		EB3EE6B0083ABB5D002BF676 /* llslider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llslider.cpp; sourceTree = "<group>"; };
-		EB3EE6B1083ABB5D002BF676 /* llslider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llslider.h; sourceTree = "<group>"; };
-		EB3EE6B2083ABB5D002BF676 /* llsliderctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsliderctrl.cpp; sourceTree = "<group>"; };
-		EB3EE6B3083ABB5D002BF676 /* llsliderctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsliderctrl.h; sourceTree = "<group>"; };
-		EB3EE6B4083ABB5D002BF676 /* llspinctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llspinctrl.cpp; sourceTree = "<group>"; };
-		EB3EE6B5083ABB5D002BF676 /* llspinctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llspinctrl.h; sourceTree = "<group>"; };
-		EB3EE6B6083ABB5D002BF676 /* llstyle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstyle.cpp; sourceTree = "<group>"; };
-		EB3EE6B7083ABB5D002BF676 /* llstyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstyle.h; sourceTree = "<group>"; };
-		EB3EE6B8083ABB5D002BF676 /* lltabcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltabcontainer.cpp; sourceTree = "<group>"; };
-		EB3EE6B9083ABB5D002BF676 /* lltabcontainer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltabcontainer.h; sourceTree = "<group>"; };
-		EB3EE6BA083ABB5D002BF676 /* lltabcontainervertical.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltabcontainervertical.cpp; sourceTree = "<group>"; };
-		EB3EE6BB083ABB5D002BF676 /* lltabcontainervertical.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltabcontainervertical.h; sourceTree = "<group>"; };
-		EB3EE6BC083ABB5D002BF676 /* lltextbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltextbox.cpp; sourceTree = "<group>"; };
-		EB3EE6BD083ABB5D002BF676 /* lltextbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltextbox.h; sourceTree = "<group>"; };
-		EB3EE6C0083ABB5D002BF676 /* lltexteditor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexteditor.cpp; sourceTree = "<group>"; };
-		EB3EE6C1083ABB5D002BF676 /* lltexteditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexteditor.h; sourceTree = "<group>"; };
-		EB3EE6C2083ABB5D002BF676 /* lluictrlfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluictrlfactory.cpp; sourceTree = "<group>"; };
-		EB3EE6C3083ABB5D002BF676 /* lluictrlfactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluictrlfactory.h; sourceTree = "<group>"; };
-		EB3EE6C4083ABB5E002BF676 /* llviewborder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewborder.cpp; sourceTree = "<group>"; };
-		EB3EE6C5083ABB5E002BF676 /* llviewborder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewborder.h; sourceTree = "<group>"; };
-		EB3EE703083ABCC5002BF676 /* llwindowmacosx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwindowmacosx.h; sourceTree = "<group>"; };
-		EB3EE709083AC23D002BF676 /* lldynamictexture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldynamictexture.h; sourceTree = "<group>"; };
-		EB3EE70A083AC23D002BF676 /* llfloateranimpreview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateranimpreview.h; sourceTree = "<group>"; };
-		EB3EE70B083AC23D002BF676 /* llfloaterimagepreview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterimagepreview.h; sourceTree = "<group>"; };
-		EB3EE70C083AC23D002BF676 /* llgroupmgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgroupmgr.h; sourceTree = "<group>"; };
-		EB3EE70D083AC23D002BF676 /* llpreviewanim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreviewanim.h; sourceTree = "<group>"; };
-		EB3EE70F083AC23D002BF676 /* llviewercontrol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewercontrol.h; sourceTree = "<group>"; };
-		EB3EE712083AC23D002BF676 /* llviewertexteditor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewertexteditor.cpp; sourceTree = "<group>"; };
-		EB3EE713083AC23D002BF676 /* llviewertexteditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewertexteditor.h; sourceTree = "<group>"; };
-		EB3EE725083AC2F2002BF676 /* llimagedxt.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagedxt.cpp; sourceTree = "<group>"; };
-		EB3EE726083AC2F2002BF676 /* llimagedxt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagedxt.h; sourceTree = "<group>"; };
-		EB9E8314082AEEF2007B4479 /* llmenugl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmenugl.cpp; sourceTree = "<group>"; };
-		EB9E8315082AEEF2007B4479 /* llmenugl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmenugl.h; sourceTree = "<group>"; };
-		EB9E8316082AEEF2007B4479 /* llresmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llresmgr.cpp; sourceTree = "<group>"; };
-		EB9E8317082AEEF2007B4479 /* llresmgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llresmgr.h; sourceTree = "<group>"; };
-		EB9E8318082AEEF3007B4479 /* llui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llui.cpp; sourceTree = "<group>"; };
-		EB9E8319082AEEF3007B4479 /* llui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llui.h; sourceTree = "<group>"; };
-		EB9E831A082AEEF3007B4479 /* lluiconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluiconstants.h; sourceTree = "<group>"; };
-		EB9E831B082AEEF3007B4479 /* lluictrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluictrl.cpp; sourceTree = "<group>"; };
-		EB9E831C082AEEF3007B4479 /* lluictrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluictrl.h; sourceTree = "<group>"; };
-		EB9E831D082AEEF3007B4479 /* llview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llview.cpp; sourceTree = "<group>"; };
-		EB9E831E082AEEF3007B4479 /* llview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llview.h; sourceTree = "<group>"; };
-		EBAAFE160858EBA400B9269A /* llxmlnode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxmlnode.cpp; sourceTree = "<group>"; };
-		EBAAFE170858EBA400B9269A /* llxmlnode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxmlnode.h; sourceTree = "<group>"; };
-		F4DE841C0CC5567300BD4636 /* llpreeditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpreeditor.h; sourceTree = "<group>"; };
-		F62641080B1F757D00E5BBAD /* llwindowheadless.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwindowheadless.cpp; sourceTree = "<group>"; };
-		F62641090B1F757D00E5BBAD /* llwindowheadless.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwindowheadless.h; sourceTree = "<group>"; };
-		FD1558220A06BB5F00DE9AE5 /* lldate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldate.cpp; sourceTree = "<group>"; };
-		FD1558230A06BB5F00DE9AE5 /* lldate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldate.h; sourceTree = "<group>"; };
-		FD1558240A06BB5F00DE9AE5 /* llsdserialize_xml.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdserialize_xml.cpp; sourceTree = "<group>"; };
-		FD1558250A06BB5F00DE9AE5 /* llsdserialize_xml.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdserialize_xml.h; sourceTree = "<group>"; };
-		FD1558260A06BB5F00DE9AE5 /* llsdserialize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdserialize.cpp; sourceTree = "<group>"; };
-		FD1558270A06BB5F00DE9AE5 /* llsdserialize.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdserialize.h; sourceTree = "<group>"; };
-		FD1558280A06BB5F00DE9AE5 /* lluri.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluri.cpp; sourceTree = "<group>"; };
-		FD1558290A06BB5F00DE9AE5 /* lluri.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluri.h; sourceTree = "<group>"; };
-		FD1558B00A06C16C00DE9AE5 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
-		FD34696A0B5C3C55007318E5 /* libllcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libllcurl.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FD53B3DB09BDE88B00BFE3BC /* macutil_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macutil_Prefix.h; sourceTree = "<group>"; };
-		FD59ED5D0AF2AF460086642A /* llassetuploadresponders.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llassetuploadresponders.cpp; sourceTree = "<group>"; };
-		FD59ED5E0AF2AF460086642A /* llassetuploadresponders.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llassetuploadresponders.h; sourceTree = "<group>"; };
-		FD6B3D5C09E18FEA00E493E3 /* lscript_http.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lscript_http.h; sourceTree = "<group>"; };
-		FD6C9A2109C758BC00AA1849 /* llfloaterscriptdebug.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterscriptdebug.cpp; sourceTree = "<group>"; };
-		FD6C9A2209C758BC00AA1849 /* llfloaterscriptdebug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterscriptdebug.h; sourceTree = "<group>"; };
-		FD6C9A2309C758BC00AA1849 /* llfloatertelehub.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatertelehub.cpp; sourceTree = "<group>"; };
-		FD6C9A2409C758BC00AA1849 /* llfloatertelehub.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatertelehub.h; sourceTree = "<group>"; };
-		FD6C9A2509C758BC00AA1849 /* llfollowcam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfollowcam.cpp; sourceTree = "<group>"; };
-		FD6C9A2609C758BC00AA1849 /* llfollowcam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfollowcam.h; sourceTree = "<group>"; };
-		FD6C9A2709C758BC00AA1849 /* llhudicon.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudicon.cpp; sourceTree = "<group>"; };
-		FD6C9A2809C758BC00AA1849 /* llhudicon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhudicon.h; sourceTree = "<group>"; };
-		FD6C9A3409C75A8500AA1849 /* llfloaterpermissionsmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterpermissionsmgr.cpp; sourceTree = "<group>"; };
-		FD6C9A3509C75A8500AA1849 /* llfloaterpermissionsmgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterpermissionsmgr.h; sourceTree = "<group>"; };
-		FD6C9A3809C75B0500AA1849 /* llbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbuffer.cpp; sourceTree = "<group>"; };
-		FD6C9A3909C75B0500AA1849 /* llbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbuffer.h; sourceTree = "<group>"; };
-		FD6C9A3A09C75B0500AA1849 /* llbufferstream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbufferstream.cpp; sourceTree = "<group>"; };
-		FD6C9A3B09C75B0500AA1849 /* llbufferstream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbufferstream.h; sourceTree = "<group>"; };
-		FD6C9A3E09C75B3A00AA1849 /* llmemorystream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmemorystream.cpp; sourceTree = "<group>"; };
-		FD6C9A3F09C75B3A00AA1849 /* llmemorystream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmemorystream.h; sourceTree = "<group>"; };
-		FD6C9A4209C75B8900AA1849 /* llfloatertopobjects.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatertopobjects.cpp; sourceTree = "<group>"; };
-		FD6C9A4309C75B8900AA1849 /* llfloatertopobjects.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatertopobjects.h; sourceTree = "<group>"; };
-		FD6C9A4609C75BCD00AA1849 /* llioutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llioutil.cpp; sourceTree = "<group>"; };
-		FD6C9A4709C75BCD00AA1849 /* llioutil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llioutil.h; sourceTree = "<group>"; };
-		FD6C9A5209C773A000AA1849 /* libaprutil-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libaprutil-1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		FD835B800AD1CB6700038B74 /* llchainio.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llchainio.cpp; sourceTree = "<group>"; };
-		FD870C4F09EAC19700F5956C /* lldrawpoolclouds.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolclouds.h; sourceTree = "<group>"; };
-		FDA39C6B0A37203E006E8A2D /* metaclass.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = metaclass.cpp; sourceTree = "<group>"; };
-		FDA39C6C0A37203E006E8A2D /* metaclass.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = metaclass.h; sourceTree = "<group>"; };
-		FDA39C6D0A37203E006E8A2D /* metaclasst.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = metaclasst.h; sourceTree = "<group>"; };
-		FDA39C6E0A37203E006E8A2D /* metaproperty.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = metaproperty.cpp; sourceTree = "<group>"; };
-		FDA39C6F0A37203E006E8A2D /* metaproperty.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = metaproperty.h; sourceTree = "<group>"; };
-		FDA39C700A37203E006E8A2D /* metapropertyt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = metapropertyt.h; sourceTree = "<group>"; };
-		FDA39C710A37203E006E8A2D /* reflective.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reflective.cpp; sourceTree = "<group>"; };
-		FDA39C720A37203E006E8A2D /* reflective.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = reflective.h; sourceTree = "<group>"; };
-		FDA39C730A37203E006E8A2D /* reflectivet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = reflectivet.h; sourceTree = "<group>"; };
-		FDAA36B609B919AD00FBF1CA /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; };
-		FDAA36BA09B919CD00FBF1CA /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
-		FDAA36BE09B919DF00FBF1CA /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
-		FDAA36C209B919F600FBF1CA /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = /usr/lib/libmx.dylib; sourceTree = "<absolute>"; };
-		FDCB54F40AFBC5060033B433 /* llhttpnode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpnode.cpp; sourceTree = "<group>"; };
-		FDCB54F50AFBC5060033B433 /* llhttpnode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpnode.h; sourceTree = "<group>"; };
-		FDCB55270AFBD4310033B433 /* lleventpoll.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lleventpoll.cpp; sourceTree = "<group>"; };
-		FDCB55280AFBD4310033B433 /* lleventpoll.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleventpoll.h; sourceTree = "<group>"; };
-		FDD3FD700B6A89A0009173F1 /* libcares.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcares.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8764E09BEA39600AF6316 /* libapr-1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libapr-1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8764F09BEA39600AF6316 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765009BEA39600AF6316 /* libfmod.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfmod.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765109BEA39600AF6316 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfreetype.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765309BEA39600AF6316 /* liblljpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = liblljpeg.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765409BEA39600AF6316 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libogg.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765509BEA39600AF6316 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libvorbis.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765609BEA39600AF6316 /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libvorbisenc.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765709BEA39600AF6316 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libvorbisfile.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDE8765809BEA39700AF6316 /* libxmlrpc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libxmlrpc.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		FE065EA10D8B0EE60089E9F1 /* llwatchdog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llwatchdog.cpp; sourceTree = "<group>"; };
-		FE065EA30D8B0EE60089E9F1 /* llwindebug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llwindebug.cpp; sourceTree = "<group>"; };
-		FE065EA60D8B0F170089E9F1 /* llwatchdog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llwatchdog.h; sourceTree = "<group>"; };
-		FE0AEE2C0D2D96D20097256A /* libllmozlib2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libllmozlib2.dylib; path = "../../libraries/universal-darwin/lib_debug/libllmozlib2.dylib"; sourceTree = SOURCE_ROOT; };
-		FE0AEE480D2D9C6E0097256A /* lllcd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lllcd.cpp; sourceTree = SOURCE_ROOT; };
-		FE0AEE490D2D9C6E0097256A /* lllcd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lllcd.h; sourceTree = SOURCE_ROOT; };
-		FE0AEE4A0D2D9C6E0097256A /* llparcelselection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llparcelselection.cpp; sourceTree = SOURCE_ROOT; };
-		FE0AEE4B0D2D9C6E0097256A /* llparcelselection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llparcelselection.h; sourceTree = SOURCE_ROOT; };
-		FE42C3120D231D1A00D9F143 /* llcommandlineparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llcommandlineparser.cpp; sourceTree = "<group>"; };
-		FE42C3130D231D1A00D9F143 /* llcommandlineparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llcommandlineparser.h; sourceTree = "<group>"; };
-		FE43BB860D368B4100C93D63 /* libboost_program_options-mt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libboost_program_options-mt.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		FE51386F0CD80BAE00F32EE3 /* llclassifiedinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclassifiedinfo.h; sourceTree = "<group>"; };
-		FE5138700CD80BAE00F32EE3 /* lldebugmessagebox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldebugmessagebox.cpp; sourceTree = "<group>"; };
-		FE5138710CD80BAE00F32EE3 /* lldebugmessagebox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldebugmessagebox.h; sourceTree = "<group>"; };
-		FE5138730CD80BAE00F32EE3 /* llfloaterclassified.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterclassified.cpp; sourceTree = "<group>"; };
-		FE5138740CD80BAE00F32EE3 /* llfloaterclassified.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterclassified.h; sourceTree = "<group>"; };
-		FE5138750CD80BAE00F32EE3 /* llfloaterevent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterevent.cpp; sourceTree = "<group>"; };
-		FE5138760CD80BAE00F32EE3 /* llfloaterevent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterevent.h; sourceTree = "<group>"; };
-		FE5138770CD80BAE00F32EE3 /* llfloaterparcel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterparcel.cpp; sourceTree = "<group>"; };
-		FE5138780CD80BAE00F32EE3 /* llfloaterparcel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterparcel.h; sourceTree = "<group>"; };
-		FE679A350CDFF5AC00959041 /* llappviewer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llappviewer.cpp; sourceTree = "<group>"; };
-		FE679A360CDFF5AC00959041 /* llappviewer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llappviewer.h; sourceTree = "<group>"; };
-		FE679A370CDFF5AC00959041 /* llappviewermacosx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llappviewermacosx.cpp; sourceTree = "<group>"; };
-		FE679A380CDFF5AC00959041 /* llappviewermacosx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llappviewermacosx.h; sourceTree = "<group>"; };
-		FE679A390CDFF5AC00959041 /* llvectorperfoptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvectorperfoptions.cpp; sourceTree = "<group>"; };
-		FE679A3A0CDFF5AC00959041 /* llvectorperfoptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvectorperfoptions.h; sourceTree = "<group>"; };
-		FE679A3B0CDFF5AC00959041 /* llvieweraudio.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvieweraudio.cpp; sourceTree = "<group>"; };
-		FE679A3C0CDFF5AC00959041 /* llvieweraudio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvieweraudio.h; sourceTree = "<group>"; };
-		FEE6C8160D2D6DAC00C97E9C /* llmediaimplcommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplcommon.cpp; sourceTree = "<group>"; };
-		FEE6C8170D2D6DAC00C97E9C /* llmediaimplcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplcommon.h; sourceTree = "<group>"; };
-		FEE6C8180D2D6DAC00C97E9C /* llmediaimplexample1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplexample1.cpp; sourceTree = "<group>"; };
-		FEE6C8190D2D6DAC00C97E9C /* llmediaimplexample1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplexample1.h; sourceTree = "<group>"; };
-		FEE6C81A0D2D6DAC00C97E9C /* llmediaimplexample2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplexample2.cpp; sourceTree = "<group>"; };
-		FEE6C81B0D2D6DAC00C97E9C /* llmediaimplexample2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplexample2.h; sourceTree = "<group>"; };
-		FEE6C81C0D2D6DAC00C97E9C /* llmediaimplfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplfactory.cpp; sourceTree = "<group>"; };
-		FEE6C81D0D2D6DAC00C97E9C /* llmediaimplfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplfactory.h; sourceTree = "<group>"; };
-		FEE6C81E0D2D6DAC00C97E9C /* llmediaimplgstreamer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplgstreamer.cpp; sourceTree = "<group>"; };
-		FEE6C81F0D2D6DAC00C97E9C /* llmediaimplgstreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplgstreamer.h; sourceTree = "<group>"; };
-		FEE6C8200D2D6DAC00C97E9C /* llmediaimplgstreamer_syms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplgstreamer_syms.cpp; sourceTree = "<group>"; };
-		FEE6C8210D2D6DAC00C97E9C /* llmediaimplgstreamer_syms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplgstreamer_syms.h; sourceTree = "<group>"; };
-		FEE6C8250D2D6DAC00C97E9C /* llmediaimplgstreamervidplug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplgstreamervidplug.cpp; sourceTree = "<group>"; };
-		FEE6C8260D2D6DAC00C97E9C /* llmediaimplgstreamervidplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplgstreamervidplug.h; sourceTree = "<group>"; };
-		FEE6C8270D2D6DAC00C97E9C /* llmediaimplllmozlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediaimplllmozlib.cpp; sourceTree = "<group>"; };
-		FEE6C8280D2D6DAC00C97E9C /* llmediaimplllmozlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplllmozlib.h; sourceTree = "<group>"; };
-		FEE6C8290D2D6DAC00C97E9C /* llmediaimplregister.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaimplregister.h; sourceTree = "<group>"; };
-		FEE6C82A0D2D6DAC00C97E9C /* llmediamanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmediamanager.cpp; sourceTree = "<group>"; };
-		FEE6C82B0D2D6DAC00C97E9C /* llmediamanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediamanager.h; sourceTree = "<group>"; };
-		FEE6C82C0D2D6DAC00C97E9C /* llmediaobserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmediaobserver.h; sourceTree = "<group>"; };
-		FEE6C8390D2D6E1500C97E9C /* llfloaterhtmlhelp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = llfloaterhtmlhelp.cpp; sourceTree = SOURCE_ROOT; };
-		FEE6C83A0D2D6E1500C97E9C /* llfloaterhtmlhelp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloaterhtmlhelp.h; sourceTree = "<group>"; };
-		FEE6C83B0D2D6E1500C97E9C /* llfloaterurlentry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterurlentry.cpp; sourceTree = "<group>"; };
-		FEE6C83C0D2D6E1500C97E9C /* llfloaterurlentry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloaterurlentry.h; sourceTree = "<group>"; };
-		FEE6C83D0D2D6E1500C97E9C /* llmimetypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llmimetypes.cpp; sourceTree = "<group>"; };
-		FEE6C83E0D2D6E1500C97E9C /* llmimetypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llmimetypes.h; sourceTree = "<group>"; };
-		FEE6C83F0D2D6E1500C97E9C /* llpanellandmedia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llpanellandmedia.cpp; sourceTree = "<group>"; };
-		FEE6C8400D2D6E1500C97E9C /* llpanellandmedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llpanellandmedia.h; sourceTree = "<group>"; };
-		FEE6C8410D2D6E1500C97E9C /* llurlhistory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llurlhistory.cpp; sourceTree = "<group>"; };
-		FEE6C8420D2D6E1500C97E9C /* llurlhistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llurlhistory.h; sourceTree = "<group>"; };
-		FEE6C8430D2D6E1500C97E9C /* llviewermedia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llviewermedia.cpp; sourceTree = "<group>"; };
-		FEE6C8440D2D6E1500C97E9C /* llviewermedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llviewermedia.h; sourceTree = "<group>"; };
-		FEE6C8450D2D6E1500C97E9C /* llviewerparcelmedia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerparcelmedia.cpp; sourceTree = "<group>"; };
-		FEE6C8460D2D6E1500C97E9C /* llviewerparcelmedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llviewerparcelmedia.h; sourceTree = "<group>"; };
-		FEE6C8470D2D6E1500C97E9C /* llviewerparcelmediaautoplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerparcelmediaautoplay.cpp; sourceTree = "<group>"; };
-		FEE6C8480D2D6E1500C97E9C /* llviewerparcelmediaautoplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llviewerparcelmediaautoplay.h; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		5503BCF405446B20003D051F /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				5503BCF505446B20003D051F /* Carbon.framework in Frameworks */,
-				5503BD0405446B20003D051F /* QuickTime.framework in Frameworks */,
-				A3D9691F0A6ED666007E8BD2 /* IOKit.framework in Frameworks */,
-				9985A1280AC1FE4E00579AFB /* AppKit.framework in Frameworks */,
-				61923C8B074ACA8D005E1F34 /* libllcommon.a in Frameworks */,
-				FDE8765C09BEA3C300AF6316 /* libapr-1.a in Frameworks */,
-				FDE8765D09BEA3C400AF6316 /* libexpat.a in Frameworks */,
-				FDE8766509BEA3C700AF6316 /* libvorbisfile.a in Frameworks */,
-				FDE8766309BEA3C600AF6316 /* libvorbis.a in Frameworks */,
-				FDE8766209BEA3C600AF6316 /* libogg.a in Frameworks */,
-				FDE8765F09BEA3C500AF6316 /* libfreetype.a in Frameworks */,
-				FDE8766109BEA3C600AF6316 /* liblljpeg.a in Frameworks */,
-				FDE8766409BEA3C700AF6316 /* libvorbisenc.a in Frameworks */,
-				FDE8766609BEA3C800AF6316 /* libxmlrpc.a in Frameworks */,
-				FDAA36B809B919AD00FBF1CA /* libssl.dylib in Frameworks */,
-				FDAA36BC09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */,
-				FDAA36C009B919DF00FBF1CA /* libz.dylib in Frameworks */,
-				FDAA36C309B919F600FBF1CA /* libmx.dylib in Frameworks */,
-				FD6C9A5309C773A000AA1849 /* libaprutil-1.a in Frameworks */,
-				FD1558B20A06C1C700DE9AE5 /* libiconv.dylib in Frameworks */,
-				9967E9200B3754800087BD1B /* libfmodwrapper.dylib in Frameworks */,
-				FD34696B0B5C3C55007318E5 /* libllcurl.a in Frameworks */,
-				FDD3FD730B6A89A0009173F1 /* libcares.a in Frameworks */,
-				99F998FB0BAA34B90034E41C /* libopenjpeg.a in Frameworks */,
-				99F99A160BAA3D4C0034E41C /* AGL.framework in Frameworks */,
-				99F99A190BAA3D520034E41C /* OpenGL.framework in Frameworks */,
-				88A95BCA0C14D92C0027E363 /* libresolv.dylib in Frameworks */,
-				88AA282C0C17720D0032DF53 /* libpng12.a in Frameworks */,
-				FE0AEE2D0D2D96D20097256A /* libllmozlib2.dylib in Frameworks */,
-				1C0D59510CF0B2B800222B10 /* libboost_regex-mt.a in Frameworks */,
-				FE43BB870D368B4100C93D63 /* libboost_program_options-mt.a in Frameworks */,
-				AABD9F130D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */,
-				AA38F8FE0D8AFCF4003B39F9 /* libndofdev.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		9932ED1D056C1F0900554101 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				61923C89074ACA70005E1F34 /* libllcommon.a in Frameworks */,
-				C1E4A5FE0CC02365005FB0A6 /* libxmlrpc.a in Frameworks */,
-				FDE8765A09BEA3BC00AF6316 /* libapr-1.a in Frameworks */,
-				FDAA36AA09B916BD00FBF1CA /* Carbon.framework in Frameworks */,
-				FDAA36B909B919AD00FBF1CA /* libssl.dylib in Frameworks */,
-				FDAA36BD09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */,
-				FDAA36C109B919DF00FBF1CA /* libz.dylib in Frameworks */,
-				FD34696F0B5C47B0007318E5 /* libllcurl.a in Frameworks */,
-				FDD3FD720B6A89A0009173F1 /* libcares.a in Frameworks */,
-				DA9C412B0B54B9DA00DD6F44 /* libaprutil-1.a in Frameworks */,
-				DA9C412C0B54B9DE00DD6F44 /* libexpat.a in Frameworks */,
-				AABD9F140D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		9967E9070B37533F0087BD1B /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9967E9B30B375D9D0087BD1B /* libfmod.a in Frameworks */,
-				9950AF460B3762A1007E36E0 /* Carbon.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		99D5703105BDEFD7004DE704 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				61923C8D074ACFDD005E1F34 /* libllcommon.a in Frameworks */,
-				FDE8765909BEA3B800AF6316 /* libapr-1.a in Frameworks */,
-				FDAA36AB09B916CA00FBF1CA /* Carbon.framework in Frameworks */,
-				FDAA36B709B919AD00FBF1CA /* libssl.dylib in Frameworks */,
-				FDAA36BB09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */,
-				FDAA36BF09B919DF00FBF1CA /* libz.dylib in Frameworks */,
-				DA9C411F0B54B9AE00DD6F44 /* libexpat.a in Frameworks */,
-				DA9C41200B54B9B300DD6F44 /* libaprutil-1.a in Frameworks */,
-				FD34696E0B5C47B0007318E5 /* libllcurl.a in Frameworks */,
-				FDD3FD710B6A89A0009173F1 /* libcares.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D64593540B3B4D7D00FAB68F /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D64594130B3B6DE100FAB68F /* libllcommon.a in Frameworks */,
-				D6F77CBC0B445C3B0040826D /* AppKit.framework in Frameworks */,
-				D645940C0B3B6D9000FAB68F /* libapr-1.a in Frameworks */,
-				D645940D0B3B6D9A00FAB68F /* libaprutil-1.a in Frameworks */,
-				79E593440D1B4A72002135A7 /* libz.dylib in Frameworks */,
-				79E5928A0D1B4A1A002135A7 /* libpng12.a in Frameworks */,
-				DA8C5F9B0B61A9F900BCA79A /* libexpat.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		195DF8C9FE9D4F0611CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				5503BD0705446B20003D051F /* Second Life.app */,
-				9932ED1F056C1F0900554101 /* crashreporter.app */,
-				6192E764074A7CE9005E1F34 /* libllcommon.a */,
-				99D5703305BDEFD7004DE704 /* AutoUpdater.app */,
-				9967E9090B37533F0087BD1B /* libfmodwrapper.dylib */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		20286C29FDCF999611CA2CEA /* PROJECTNAME */ = {
-			isa = PBXGroup;
-			children = (
-				1AB0DADC0A52E8A0001CACEB /* message_template.msg */,
-				9C67A8440A02BBA60056B4E0 /* gpu_table.txt */,
-				20286C2AFDCF999611CA2CEA /* Sources */,
-				20286C2CFDCF999611CA2CEA /* Resources */,
-				20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */,
-				195DF8C9FE9D4F0611CA2CBB /* Products */,
-				5503B89A05446B15003D051F /* Info-SecondLifeVorbis.plist */,
-				5503BD0605446B20003D051F /* Info-SecondLife.plist */,
-				9928ACA4056D9353003865BE /* CrashReporter.nib */,
-				99EDE33605896DC10031B20D /* SecondLife.nib */,
-				99D5703505BDEFD8004DE704 /* AutoUpdater-Info.plist */,
-			);
-			name = PROJECTNAME;
-			sourceTree = "<group>";
-		};
-		20286C2AFDCF999611CA2CEA /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				61923CD6074AE2CB005E1F34 /* llaudio */,
-				61923CFF074AE3BF005E1F34 /* llcharacter */,
-				6192211E074A9B57005E1F34 /* llcommon */,
-				61923D8D074AE4F2005E1F34 /* llimage */,
-				D62830D70B4DC76300F8830F /* llimagej2coj */,
-				6192217F074A9B58005E1F34 /* llinventory */,
-				61922190074A9B58005E1F34 /* llmath */,
-				91E86A0107BBFA5D00F56E75 /* llmedia */,
-				619221B8074A9B58005E1F34 /* llmessage */,
-				61922218074A9B59005E1F34 /* llprimitive */,
-				D628314D0B4F3FA100F8830F /* llrender */,
-				6192225C074A9B5A005E1F34 /* llui */,
-				61922263074A9B5A005E1F34 /* llvfs */,
-				6192226A074A9B5A005E1F34 /* llwindow */,
-				61922278074A9B5A005E1F34 /* llxml */,
-				6192227D074A9B5A005E1F34 /* lscript */,
-				26F529A0051F61CD00A80050 /* newview */,
-				997B4BCB060157E5001B0407 /* newview headers */,
-				61923C96074AD8B7005E1F34 /* mac_crash_logger */,
-				990CDBD705C1EA7900739545 /* mac_updater */,
-				61923C99074AD8F1005E1F34 /* tools */,
-				9967E9520B37564D0087BD1B /* fmodwrapper.cpp */,
-			);
-			name = Sources;
-			sourceTree = "<group>";
-		};
-		20286C2CFDCF999611CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				D1CA83CC0D62634400C61743 /* llfloaterstats.h */,
-				D1CA83CD0D62634400C61743 /* llfloaterstats.cpp */,
-				019200F204DD7D3500A800A7 /* macview.r */,
-				0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */,
-				99C9FA660B6AD9BF00A1BBA6 /* SLVoice */,
-				996209680B864D0E00392531 /* SLVoiceAgent.app */,
-				9930A8E30B8FB10A00197ECA /* language.txt */,
-				99E63DEF0BCADD14000C1751 /* libalut.dylib */,
-				99E63DF00BCADD14000C1751 /* libortp.dylib */,
-				99E63DF10BCADD14000C1751 /* libvivoxsdk.dylib */,
-				99E63DF20BCADD14000C1751 /* libopenal.dylib */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				FDE8761909BE9C7D00AF6316 /* Third Party Libraries */,
-				FDE8761809BE9C6500AF6316 /* System Libraries */,
-				FDE8746E09BE9C4E00AF6316 /* Frameworks */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		26F529A0051F61CD00A80050 /* newview */ = {
-			isa = PBXGroup;
-			children = (
-				79ED67F00E197D66003D1E78 /* llpanelskins.cpp */,
-				79ED67F10E197D67003D1E78 /* llpanelskins.h */,
-				AA38F8F00D8A3687003B39F9 /* llfloaterjoystick.cpp */,
-				AA38F8F10D8A3687003B39F9 /* llfloaterjoystick.h */,
-				1AE082090DA708E900575141 /* llanimstatelabels.cpp */,
-				1AE0820A0DA708E900575141 /* llanimstatelabels.h */,
-				1AE0820B0DA708E900575141 /* llstylemap.cpp */,
-				1AE0820C0DA708E900575141 /* llstylemap.h */,
-				1AE0820D0DA708E900575141 /* lltrans.cpp */,
-				1AE0820E0DA708E900575141 /* lltrans.h */,
-				1ADE58920D7CCF6000183F7F /* llfloaterhud.cpp */,
-				1ADE58930D7CCF6000183F7F /* llfloaterhud.h */,
-				D1BB623B0D91BBEB00001516 /* llfloatervoicedevicesettings.cpp */,
-				D1BB623C0D91BBEC00001516 /* llfloatervoicedevicesettings.h */,
-				FE065EA60D8B0F170089E9F1 /* llwatchdog.h */,
-				FE065EA10D8B0EE60089E9F1 /* llwatchdog.cpp */,
-				FE065EA30D8B0EE60089E9F1 /* llwindebug.cpp */,
-				FE0AEE480D2D9C6E0097256A /* lllcd.cpp */,
-				FE0AEE490D2D9C6E0097256A /* lllcd.h */,
-				FE0AEE4A0D2D9C6E0097256A /* llparcelselection.cpp */,
-				FE0AEE4B0D2D9C6E0097256A /* llparcelselection.h */,
-				C19628F30D53D7AB007C909A /* llfloatersettingsdebug.cpp */,
-				C19628F40D53D7AB007C909A /* llfloatersettingsdebug.h */,
-				FE42C3120D231D1A00D9F143 /* llcommandlineparser.cpp */,
-				FE42C3130D231D1A00D9F143 /* llcommandlineparser.h */,
-				FEE6C8390D2D6E1500C97E9C /* llfloaterhtmlhelp.cpp */,
-				FEE6C83A0D2D6E1500C97E9C /* llfloaterhtmlhelp.h */,
-				FEE6C83B0D2D6E1500C97E9C /* llfloaterurlentry.cpp */,
-				FEE6C83C0D2D6E1500C97E9C /* llfloaterurlentry.h */,
-				FEE6C83D0D2D6E1500C97E9C /* llmimetypes.cpp */,
-				FEE6C83E0D2D6E1500C97E9C /* llmimetypes.h */,
-				FEE6C83F0D2D6E1500C97E9C /* llpanellandmedia.cpp */,
-				FEE6C8400D2D6E1500C97E9C /* llpanellandmedia.h */,
-				FEE6C8410D2D6E1500C97E9C /* llurlhistory.cpp */,
-				FEE6C8420D2D6E1500C97E9C /* llurlhistory.h */,
-				FEE6C8430D2D6E1500C97E9C /* llviewermedia.cpp */,
-				FEE6C8440D2D6E1500C97E9C /* llviewermedia.h */,
-				FEE6C8450D2D6E1500C97E9C /* llviewerparcelmedia.cpp */,
-				FEE6C8460D2D6E1500C97E9C /* llviewerparcelmedia.h */,
-				FEE6C8470D2D6E1500C97E9C /* llviewerparcelmediaautoplay.cpp */,
-				FEE6C8480D2D6E1500C97E9C /* llviewerparcelmediaautoplay.h */,
-				CB0873B40D62226B009600F8 /* lldelayedgestureerror.cpp */,
-				CB0873B50D62226B009600F8 /* lldelayedgestureerror.h */,
-				D2768CE30CEA38940000BD66 /* llfloaterlagmeter.cpp */,
-				D2768CE40CEA38940000BD66 /* llfloaterlagmeter.h */,
-				FE679A350CDFF5AC00959041 /* llappviewer.cpp */,
-				FE679A360CDFF5AC00959041 /* llappviewer.h */,
-				FE679A370CDFF5AC00959041 /* llappviewermacosx.cpp */,
-				FE679A380CDFF5AC00959041 /* llappviewermacosx.h */,
-				FE679A390CDFF5AC00959041 /* llvectorperfoptions.cpp */,
-				FE679A3A0CDFF5AC00959041 /* llvectorperfoptions.h */,
-				FE679A3B0CDFF5AC00959041 /* llvieweraudio.cpp */,
-				FE679A3C0CDFF5AC00959041 /* llvieweraudio.h */,
-				FE51386F0CD80BAE00F32EE3 /* llclassifiedinfo.h */,
-				FE5138700CD80BAE00F32EE3 /* lldebugmessagebox.cpp */,
-				FE5138710CD80BAE00F32EE3 /* lldebugmessagebox.h */,
-				FE5138730CD80BAE00F32EE3 /* llfloaterclassified.cpp */,
-				FE5138740CD80BAE00F32EE3 /* llfloaterclassified.h */,
-				FE5138750CD80BAE00F32EE3 /* llfloaterevent.cpp */,
-				FE5138760CD80BAE00F32EE3 /* llfloaterevent.h */,
-				FE5138770CD80BAE00F32EE3 /* llfloaterparcel.cpp */,
-				FE5138780CD80BAE00F32EE3 /* llfloaterparcel.h */,
-				1AA2EEA50CBBE2D40017E185 /* llremoteparcelrequest.h */,
-				1AA2EEA60CBBE2D40017E185 /* llremoteparcelrequest.cpp */,
-				1AA2EEA20CBBE2BF0017E185 /* llfloaterurldisplay.h */,
-				1AA2EEA30CBBE2BF0017E185 /* llfloaterurldisplay.cpp */,
-				1AA2EE9F0CBBE28C0017E185 /* llclassifiedstatsresponder.h */,
-				1AA2EEA00CBBE28C0017E185 /* llclassifiedstatsresponder.cpp */,
-				1AA2EE9C0CBBE2790017E185 /* llfloaterlandmark.h */,
-				1AA2EE9D0CBBE2790017E185 /* llfloaterlandmark.cpp */,
-				1AD394120CAB001B004BA76A /* llcommandhandler.cpp */,
-				1AD3940E0CAB000F004BA76A /* llurlsimstring.cpp */,
-				A26560500C9F53CC004042A0 /* llfloaterhardwaresettings.cpp */,
-				A26560510C9F53CC004042A0 /* llfloaterhardwaresettings.h */,
-				1AD3940F0CAB000F004BA76A /* llurldispatcher.cpp */,
-				26F52A41051F61DF00A80050 /* llagent.cpp */,
-				1A758C910A436FCA00589675 /* llagentdata.cpp */,
-				26F52A5D051F61DF00A80050 /* llagentpilot.cpp */,
-				FD59ED5D0AF2AF460086642A /* llassetuploadresponders.cpp */,
-				FD59ED5E0AF2AF460086642A /* llassetuploadresponders.h */,
-				918166CA06516C59005727DC /* llaudiosourcevo.cpp */,
-				26F52A33051F61DF00A80050 /* llbbox.cpp */,
-				26F52ABF051F61DF00A80050 /* llbox.cpp */,
-				26F529F0051F61DF00A80050 /* llcallbacklist.cpp */,
-				26F52A8C051F61DF00A80050 /* llcallingcard.cpp */,
-				9C18425A0B9F951500208356 /* llcaphttpsender.cpp */,
-				91D530D2056EE57900CD1AD7 /* llchatbar.cpp */,
-				991ED2DF0883646B003EC818 /* llclassifiedinfo.cpp */,
-				26F52A3B051F61DF00A80050 /* llcloud.cpp */,
-				26F52AA9051F61DF00A80050 /* llcolorscheme.cpp */,
-				26F52A83051F61DF00A80050 /* llcolorswatch.cpp */,
-				26F52AA8051F61DF00A80050 /* llcompass.cpp */,
-				26F52AC6051F61DF00A80050 /* llcompilequeue.cpp */,
-				99BB5174099AC2A4004BF9F2 /* llconfirmationmanager.cpp */,
-				99BB5175099AC2A4004BF9F2 /* llconfirmationmanager.h */,
-				26F52A03051F61DF00A80050 /* llconsole.cpp */,
-				26F52A78051F61DF00A80050 /* llcontainerview.cpp */,
-				26F52ACB051F61DF00A80050 /* llcubemap.cpp */,
-				99BB5170099AC1FC004BF9F2 /* llcurrencyuimanager.cpp */,
-				99BB5171099AC1FC004BF9F2 /* llcurrencyuimanager.h */,
-				26F52A86051F61DF00A80050 /* llcylinder.cpp */,
-				26F52AA2051F61DF00A80050 /* lldebugview.cpp */,
-				C64F67400AFBED91009732B5 /* lldirpicker.cpp */,
-				C64F67410AFBED91009732B5 /* lldirpicker.h */,
-				26F52A64051F61DF00A80050 /* lldrawable.cpp */,
-				26F52A2C051F61DF00A80050 /* lldrawpool.cpp */,
-				26F52A26051F61DF00A80050 /* lldrawpoolalpha.cpp */,
-				26F52A5E051F61DF00A80050 /* lldrawpoolavatar.cpp */,
-				26F52A53051F61DF00A80050 /* lldrawpoolbump.cpp */,
-				FD870C4F09EAC19700F5956C /* lldrawpoolclouds.h */,
-				26F52A95051F61DF00A80050 /* lldrawpoolground.cpp */,
-				26F52ACA051F61DF00A80050 /* lldrawpoolsimple.cpp */,
-				26F52A14051F61DF00A80050 /* lldrawpoolsky.cpp */,
-				26F529EF051F61DF00A80050 /* lldrawpoolterrain.cpp */,
-				26F52A7B051F61DF00A80050 /* lldrawpooltree.cpp */,
-				26F52A3F051F61DF00A80050 /* lldrawpoolwater.cpp */,
-				A2A8C54A0C649F480001FEB2 /* lldrawpoolwlsky.cpp */,
-				A2A8C54B0C649F480001FEB2 /* lldrawpoolwlsky.h */,
-				26F52A84051F61DF00A80050 /* lldriverparam.cpp */,
-				91B9EB8206370586007B3F3E /* lldynamictexture.cpp */,
-				EB3EE709083AC23D002BF676 /* lldynamictexture.h */,
-				26F52A62051F61DF00A80050 /* llemote.cpp */,
-				915F492806B5738A00F629BF /* lleventinfo.cpp */,
-				915F492006B572E700F629BF /* lleventnotifier.cpp */,
-				FDCB55270AFBD4310033B433 /* lleventpoll.cpp */,
-				FDCB55280AFBD4310033B433 /* lleventpoll.h */,
-				26F52A3A051F61DF00A80050 /* llface.cpp */,
-				912541AD0691FF79008C66F7 /* llfasttimerview.cpp */,
-				263E02FE05239C9A00A80050 /* llfeaturemanager.cpp */,
-				26F52AD3051F61DF00A80050 /* llfilepicker.cpp */,
-				8B2ECFA00534C21A00A80059 /* llfirstuse.cpp */,
-				8B2ECF9E0534C17A00A80059 /* llfirstuse.h */,
-				9CD49D5609D0BAC100192434 /* llflexibleobject.cpp */,
-				9CD49D5809D0BAD600192434 /* llflexibleobject.h */,
-				26F52A82051F61DF00A80050 /* llfloaterabout.cpp */,
-				D8EAB8B40BE7B3D10067DBB3 /* llfloateractivespeakers.cpp */,
-				D8EAB8B50BE7B3D10067DBB3 /* llfloateractivespeakers.h */,
-				916083920649560B00CAF63E /* llfloateranimpreview.cpp */,
-				EB3EE70A083AC23D002BF676 /* llfloateranimpreview.h */,
-				91D2527605C9C0620099BB54 /* llfloaterauction.cpp */,
-				26F52A8B051F61DF00A80050 /* llfloateravatarinfo.cpp */,
-				1A61A7EF0A5ED446009FE3D2 /* llfloateravatarpicker.cpp */,
-				1AF9CA460AE972DA003EFF2D /* llfloateravatartextures.cpp */,
-				26F52A05051F61DF00A80050 /* llfloaterbuildoptions.cpp */,
-				1A5B3B540A70147000A90391 /* llfloaterbump.cpp */,
-				26F52AB6051F61DF00A80050 /* llfloaterbuy.cpp */,
-				9130442A057428D800571B0A /* llfloaterbuycontents.cpp */,
-				99E4350F092D64A4003AE728 /* llfloaterbuycurrency.cpp */,
-				99E43510092D64A4003AE728 /* llfloaterbuycurrency.h */,
-				99BB5166099ABDEB004BF9F2 /* llfloaterbuyland.cpp */,
-				99BB5167099ABDEB004BF9F2 /* llfloaterbuyland.h */,
-				26F52A02051F61DF00A80050 /* llfloaterchat.cpp */,
-				D6B7667F0BFE8E9A00DC8153 /* llfloaterchatterbox.cpp */,
-				D6B766820BFE8ED700DC8153 /* llfloaterchatterbox.h */,
-				91CB311506FB584C00DBCE1E /* llfloaterclothing.cpp */,
-				916724C407551DF600CA4513 /* llfloatercolorpicker.cpp */,
-				916724C207551DE400CA4513 /* llfloatercolorpicker.h */,
-				26F52A34051F61DF00A80050 /* llfloatercustomize.cpp */,
-				A2A8C54C0C649F480001FEB2 /* llfloaterdaycycle.cpp */,
-				A2A8C54D0C649F480001FEB2 /* llfloaterdaycycle.h */,
-				26F52A56051F61DF00A80050 /* llfloaterdirectory.cpp */,
-				1A9EC236083EA0100023D510 /* llfloatereditui.cpp */,
-				1A9EC23A083EA01F0023D510 /* llfloatereditui.h */,
-				1CFFA2D40C90472B000CF7DD /* llfloaterenvsettings.cpp */,
-				1CFFA2D50C90472B000CF7DD /* llfloaterenvsettings.h */,
-				913AA1FC079855E900D111CE /* llfloaterfriends.cpp */,
-				26F52A63051F61DF00A80050 /* llfloatergesture.cpp */,
-				91C8C05405922AC100633E8C /* llfloatergodtools.cpp */,
-				26F52A71051F61DF00A80050 /* llfloatergroupinfo.cpp */,
-				84401E2D0A13CC9A006720A5 /* llfloatergroupinvite.cpp */,
-				26F52A7E051F61DF00A80050 /* llfloatergroups.cpp */,
-				91A155FE081EE7F70089988C /* llfloaterhtml.cpp */,
-				91A15600081EE8060089988C /* llfloaterhtml.h */,
-				91B9EC4C06370E4D007B3F3E /* llfloaterimagepreview.cpp */,
-				EB3EE70B083AC23D002BF676 /* llfloaterimagepreview.h */,
-				C16C084E0B4AE6C7009AD67F /* llfloaterinspect.cpp */,
-				C16C084F0B4AE6C7009AD67F /* llfloaterinspect.h */,
-				26F52A17051F61DF00A80050 /* llfloaterland.cpp */,
-				99EDDF5B05892E720031B20D /* llfloaterlandholdings.cpp */,
-				26F52AAD051F61DF00A80050 /* llfloatermap.cpp */,
-				26F52A66051F61DF00A80050 /* llfloatermute.cpp */,
-				26F52A9F051F61DF00A80050 /* llfloaternamedesc.cpp */,
-				A3D968F00A6EBCA7007E8BD2 /* llfloaternewim.cpp */,
-				1A89230608B12D2E00A04AA9 /* llfloateropenobject.cpp */,
-				1A89230708B12D2E00A04AA9 /* llfloateropenobject.h */,
-				FD6C9A3409C75A8500AA1849 /* llfloaterpermissionsmgr.cpp */,
-				FD6C9A3509C75A8500AA1849 /* llfloaterpermissionsmgr.h */,
-				26C5F3E605DB1E3C00994065 /* llfloaterpostcard.cpp */,
-				A2A8C54E0C649F480001FEB2 /* llfloaterpostprocess.cpp */,
-				A2A8C54F0C649F480001FEB2 /* llfloaterpostprocess.h */,
-				26F52A6B051F61DF00A80050 /* llfloaterpreference.cpp */,
-				26F52A5B051F61DF00A80050 /* llfloaterproperties.cpp */,
-				26F52A7C051F61DF00A80050 /* llfloaterrate.cpp */,
-				9174D2C00653FC2600A7E32B /* llfloaterregioninfo.cpp */,
-				D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */,
-				D23289B40C453A3600304FEF /* llfloaterreleasemsg.h */,
-				26F52AC2051F61DF00A80050 /* llfloaterreporter.cpp */,
-				FD6C9A2109C758BC00AA1849 /* llfloaterscriptdebug.cpp */,
-				FD6C9A2209C758BC00AA1849 /* llfloaterscriptdebug.h */,
-				AAC121A30A93A8380080E8A9 /* llfloatersellland.cpp */,
-				AAC121A40A93A8380080E8A9 /* llfloatersellland.h */,
-				2613A6D905D843D80041A7A9 /* llfloatersnapshot.cpp */,
-				FD6C9A2309C758BC00AA1849 /* llfloatertelehub.cpp */,
-				FD6C9A2409C758BC00AA1849 /* llfloatertelehub.h */,
-				1A8BF3780A1AAB99005B9D5A /* llfloatertest.cpp */,
-				26F52A8F051F61DF00A80050 /* llfloatertools.cpp */,
-				FD6C9A4209C75B8900AA1849 /* llfloatertopobjects.cpp */,
-				FD6C9A4309C75B8900AA1849 /* llfloatertopobjects.h */,
-				26F52A8E051F61DF00A80050 /* llfloatertos.cpp */,
-				1CBB67D20C7CCCB2007DAAAE /* llfloaterwater.cpp */,
-				1CBB67D30C7CCCB2007DAAAE /* llfloaterwater.h */,
-				A2A8C5520C649F480001FEB2 /* llfloaterwindlight.cpp */,
-				A2A8C5530C649F480001FEB2 /* llfloaterwindlight.h */,
-				26F52A69051F61DF00A80050 /* llfloaterworldmap.cpp */,
-				26F52AA5051F61DF00A80050 /* llfolderview.cpp */,
-				FD6C9A2509C758BC00AA1849 /* llfollowcam.cpp */,
-				FD6C9A2609C758BC00AA1849 /* llfollowcam.h */,
-				26F52A1F051F61DF00A80050 /* llframestats.cpp */,
-				26F52A1E051F61DF00A80050 /* llframestatview.cpp */,
-				26F529A1051F61DF00A80050 /* llgenepool.cpp */,
-				91F8BBAB062DF91A00DE42BA /* llgesturemgr.cpp */,
-				26F52AA7051F61DF00A80050 /* llgivemoney.cpp */,
-				26F52AA6051F61DF00A80050 /* llglsandbox.cpp */,
-				A3C20E490BB0BCDF007E872B /* llglslshader.cpp */,
-				911CAD8A075BE90600CD1090 /* llgroupmgr.cpp */,
-				EB3EE70C083AC23D002BF676 /* llgroupmgr.h */,
-				2EFEA8E809F4556F00CB0193 /* llgroupnotify.cpp */,
-				26F52A87051F61DF00A80050 /* llhippo.cpp */,
-				26F52A85051F61DF00A80050 /* llhoverview.cpp */,
-				26F52A51051F61DF00A80050 /* llhudeffect.cpp */,
-				26F52A8D051F61DF00A80050 /* llhudeffectbeam.cpp */,
-				26F52ADB051F61DF00A80050 /* llhudeffectlookat.cpp */,
-				26F52ADA051F61DF00A80050 /* llhudeffectpointat.cpp */,
-				26F52A65051F61DF00A80050 /* llhudeffecttrail.cpp */,
-				FD6C9A2709C758BC00AA1849 /* llhudicon.cpp */,
-				FD6C9A2809C758BC00AA1849 /* llhudicon.h */,
-				26F52A25051F61DF00A80050 /* llhudmanager.cpp */,
-				26F52A24051F61DF00A80050 /* llhudobject.cpp */,
-				26F52A5C051F61DF00A80050 /* llhudrender.cpp */,
-				26F52A3E051F61DF00A80050 /* llhudtext.cpp */,
-				26F52A3D051F61DF00A80050 /* llhudview.cpp */,
-				26F52AD6051F61DF00A80050 /* llimpanel.cpp */,
-				1AD61F6A0AC09B1900507FB9 /* llimview.cpp */,
-				A3285A3A0A71425100F619A5 /* llinventoryactions.cpp */,
-				A3285A340A71419F00F619A5 /* llinventorybridge.cpp */,
-				26F52A57051F61DF00A80050 /* llinventoryclipboard.cpp */,
-				26F529F8051F61DF00A80050 /* llinventorymodel.cpp */,
-				911CAD86075BE87B00CD1090 /* llinventoryview.cpp */,
-				26F52ACC051F61DF00A80050 /* lljoystickbutton.cpp */,
-				26F52A04051F61DF00A80050 /* lllandmarklist.cpp */,
-				C64F673D0AFBED80009732B5 /* lllogchat.cpp */,
-				C64F673E0AFBED80009732B5 /* lllogchat.h */,
-				26F529A9051F61DF00A80050 /* llmanip.cpp */,
-				26F52A40051F61DF00A80050 /* llmaniprotate.cpp */,
-				26F52A9B051F61DF00A80050 /* llmanipscale.cpp */,
-				26F52A9A051F61DF00A80050 /* llmaniptranslate.cpp */,
-				E34C14730AE6A3F0009BF4DE /* llmapresponders.cpp */,
-				9118669907F4FAF700E3D5BC /* llmediaremotectrl.cpp */,
-				9118669A07F4FAF700E3D5BC /* llmediaremotectrl.h */,
-				99E43513092D64CC003AE728 /* llmemoryview.cpp */,
-				99E43512092D64CC003AE728 /* llmemoryview.h */,
-				26F52AD8051F61DF00A80050 /* llmenucommands.cpp */,
-				26F52A67051F61DF00A80050 /* llmorphview.cpp */,
-				26F52AAB051F61DF00A80050 /* llmoveview.cpp */,
-				26F52AAA051F61DF00A80050 /* llmutelist.cpp */,
-				2617306805221DF400A80050 /* llnamebox.cpp */,
-				2617306405221AB700A80050 /* llnameeditor.cpp */,
-				26F52A98051F61DF00A80050 /* llnamelistctrl.cpp */,
-				26F52A97051F61DF00A80050 /* llnetmap.cpp */,
-				91D61FD0057ED9DF005B4B69 /* llnotify.cpp */,
-				91D530CE056EE55C00CD1AD7 /* lloverlaybar.cpp */,
-				26F52AB5051F61DF00A80050 /* llpanelaudioprefs.cpp */,
-				AA11834E0C1DF9C400FDE5BA /* llpanelaudiovolume.cpp */,
-				AA11834F0C1DF9C400FDE5BA /* llpanelaudiovolume.h */,
-				26F52AB4051F61DF00A80050 /* llpanelavatar.cpp */,
-				99FBB044087362B60048A5CC /* llpanelclassified.cpp */,
-				26F529A7051F61DF00A80050 /* llpanelcontents.cpp */,
-				26F52A54051F61DF00A80050 /* llpaneldebug.cpp */,
-				26F529FF051F61DF00A80050 /* llpaneldirbrowser.cpp */,
-				99FBB08E087366780048A5CC /* llpaneldirclassified.cpp */,
-				26F52A91051F61DF00A80050 /* llpaneldirevents.cpp */,
-				26F52A90051F61DF00A80050 /* llpaneldirfind.cpp */,
-				26F52A45051F61DF00A80050 /* llpaneldirgroups.cpp */,
-				990032FC05EC0A9B0035CB09 /* llpaneldirland.cpp */,
-				26F52AA4051F61DF00A80050 /* llpaneldirpeople.cpp */,
-				26F52AA3051F61DF00A80050 /* llpaneldirplaces.cpp */,
-				9900330005EC0ADD0035CB09 /* llpaneldirpopular.cpp */,
-				26F52A47051F61DF00A80050 /* llpaneldisplay.cpp */,
-				26F52A19051F61DF00A80050 /* llpanelevent.cpp */,
-				26F52A18051F61DF00A80050 /* llpanelface.cpp */,
-				26F529FD051F61DF00A80050 /* llpanelgeneral.cpp */,
-				2EFEA8EB09F455B900CB0193 /* llpanelgroup.cpp */,
-				2EFEA8F009F4588B00CB0193 /* llpanelgroupgeneral.cpp */,
-				84401E300A13CCB2006720A5 /* llpanelgroupinvite.cpp */,
-				2EA4CEED09F83BE8008F60F7 /* llpanelgrouplandmoney.cpp */,
-				2E6FE90D09FD560A00AF02FF /* llpanelgroupnotices.cpp */,
-				2EA4CEEC09F83AC2008F60F7 /* llpanelgrouproles.cpp */,
-				26F52AC7051F61DF00A80050 /* llpanelgroupvoting.cpp */,
-				91E36BB705B4C70600C919E4 /* llpanelinput.cpp */,
-				26F529EE051F61DF00A80050 /* llpanelinventory.cpp */,
-				26F529ED051F61DF00A80050 /* llpanelland.cpp */,
-				1A758C930A436FD800589675 /* llpanellandobjects.cpp */,
-				1A758C950A436FDE00589675 /* llpanellandoptions.cpp */,
-				A3AF6BCE0A544EF0005B5E2C /* llpanellogin.cpp */,
-				26F52A5A051F61DF00A80050 /* llpanelmorph.cpp */,
-				9104C0CB0778AE0F001EC4F6 /* llpanelmsgs.cpp */,
-				26F52A2B051F61DF00A80050 /* llpanelnetwork.cpp */,
-				26F52A2A051F61DF00A80050 /* llpanelobject.cpp */,
-				26F52AA1051F61DF00A80050 /* llpanelpermissions.cpp */,
-				9131094305C6D5A300A18084 /* llpanelpick.cpp */,
-				26F52AA0051F61DF00A80050 /* llpanelplace.cpp */,
-				A3077C0309DCB8140059ED75 /* llpanelvolume.cpp */,
-				A3077C0409DCB8140059ED75 /* llpanelvolume.h */,
-				1A47B8DE0860FDF100F73746 /* llpanelweb.cpp */,
-				1A47B8DD0860FDF100F73746 /* llpanelweb.h */,
-				26F52A5F051F61DF00A80050 /* llpatchvertexarray.cpp */,
-				26F529F3051F61DF00A80050 /* llpolymesh.cpp */,
-				26F529F2051F61DF00A80050 /* llpolymorph.cpp */,
-				A2A8C5540C649F480001FEB2 /* llpostprocess.cpp */,
-				A2A8C5550C649F480001FEB2 /* llpostprocess.h */,
-				1A3143E00A02B73D005B87E7 /* llprefschat.cpp */,
-				1A3143DE0A02B737005B87E7 /* llprefsim.cpp */,
-				9956CAFC0B96679C00F58C6D /* llprefsvoice.cpp */,
-				9956CAFB0B96679C00F58C6D /* llprefsvoice.h */,
-				26F52ABD051F61DF00A80050 /* llpreview.cpp */,
-				91FC1C8706527F19009CF498 /* llpreviewanim.cpp */,
-				EB3EE70D083AC23D002BF676 /* llpreviewanim.h */,
-				91F8BBA3062DF7AB00DE42BA /* llpreviewgesture.cpp */,
-				26F52ABC051F61DF00A80050 /* llpreviewlandmark.cpp */,
-				26F52A73051F61DF00A80050 /* llpreviewnotecard.cpp */,
-				26F52A72051F61DF00A80050 /* llpreviewscript.cpp */,
-				26F529EA051F61DF00A80050 /* llpreviewsound.cpp */,
-				26F529E9051F61DF00A80050 /* llpreviewtexture.cpp */,
-				26F52AD5051F61DF00A80050 /* llprogressview.cpp */,
-				26F52AAF051F61DF00A80050 /* llregionposition.cpp */,
-				1CFFA2EB0C9048D7000CF7DD /* llrendertarget.cpp */,
-				1CFFA2EC0C9048D7000CF7DD /* llrendertarget.h */,
-				1AFA40B40A2DFD7200C13F70 /* llsavedsettingsglue.cpp */,
-				26F52AD2051F61DF00A80050 /* llselectmgr.cpp */,
-				26F52AD1051F61DF00A80050 /* llsky.cpp */,
-				26F529EB051F61DF00A80050 /* llspatialpartition.cpp */,
-				26F529E7051F61DF00A80050 /* llrendersphere.cpp */,
-				26F529E5051F61DF00A80050 /* llsprite.cpp */,
-				88A95BB10C14D5FC0027E363 /* llsrv.cpp */,
-				91DF401F06A739BA00CA7FE5 /* llstartup.cpp */,
-				26F529B3051F61DF00A80050 /* llstatbar.cpp */,
-				26F529B2051F61DF00A80050 /* llstatgraph.cpp */,
-				26F52A94051F61DF00A80050 /* llstatusbar.cpp */,
-				26F52A93051F61DF00A80050 /* llstatview.cpp */,
-				26F52A43051F61DF00A80050 /* llsurface.cpp */,
-				26F52A42051F61DF00A80050 /* llsurfacepatch.cpp */,
-				26F52AB8051F61DF00A80050 /* lltexlayer.cpp */,
-				AAF5FFD00B13F71900D28A84 /* lltexturecache.cpp */,
-				AAF5FFD10B13F71900D28A84 /* lltexturecache.h */,
-				26F52A28051F61DF00A80050 /* lltexturectrl.cpp */,
-				AA02B9BA0B0CE44D00F2996D /* lltexturefetch.cpp */,
-				AA02B9BB0B0CE44D00F2996D /* lltexturefetch.h */,
-				26F529F6051F61DF00A80050 /* lltextureview.cpp */,
-				26F529F5051F61DF00A80050 /* lltool.cpp */,
-				26F529F4051F61DF00A80050 /* lltoolbar.cpp */,
-				26F529B0051F61DF00A80050 /* lltoolbrush.cpp */,
-				26F52A77051F61DF00A80050 /* lltoolcomp.cpp */,
-				26F52A76051F61DF00A80050 /* lltooldraganddrop.cpp */,
-				26F52A75051F61DF00A80050 /* lltoolface.cpp */,
-				26F52A74051F61DF00A80050 /* lltoolfocus.cpp */,
-				26F52A13051F61DF00A80050 /* lltoolgrab.cpp */,
-				26F52A12051F61DF00A80050 /* lltoolgun.cpp */,
-				26F52A11051F61DF00A80050 /* lltoolindividual.cpp */,
-				26F52A6F051F61DF00A80050 /* lltoolmgr.cpp */,
-				26F52A6E051F61DF00A80050 /* lltoolmorph.cpp */,
-				26F52A6D051F61DF00A80050 /* lltoolobjpicker.cpp */,
-				26F529AE051F61DF00A80050 /* lltoolpie.cpp */,
-				AA0E2A620A2FDB340066250A /* lltoolpipette.cpp */,
-				AA0E2A630A2FDB340066250A /* lltoolpipette.h */,
-				26F529AD051F61DF00A80050 /* lltoolplacer.cpp */,
-				911CAD92075BEAAC00CD1090 /* lltoolselect.cpp */,
-				26F529FC051F61DF00A80050 /* lltoolselectland.cpp */,
-				26F529FB051F61DF00A80050 /* lltoolselectrect.cpp */,
-				26F529FA051F61DF00A80050 /* lltoolview.cpp */,
-				26F52A4E051F61DF00A80050 /* lltracker.cpp */,
-				26F52A0E051F61DF00A80050 /* lluploaddialog.cpp */,
-				26F52A0D051F61DF00A80050 /* llurl.cpp */,
-				1A89230308B12D1000A04AA9 /* llurlwhitelist.cpp */,
-				1A89230408B12D1000A04AA9 /* llurlwhitelist.h */,
-				26F52A0C051F61DF00A80050 /* lluserauth.cpp */,
-				26F529A5051F61DF00A80050 /* llvelocitybar.cpp */,
-				99BB516D099AC1E9004BF9F2 /* llviewchildren.cpp */,
-				99BB516E099AC1E9004BF9F2 /* llviewchildren.h */,
-				1A5104560ABF60A800520F6D /* llviewerassetstorage.cpp */,
-				1A5104580ABF60BF00520F6D /* llviewerassetstorage.h */,
-				26F529A2051F61DF00A80050 /* llviewercamera.cpp */,
-				9C1853AD0A91175E00DA7B01 /* llviewercontrol.cpp */,
-				EB3EE70F083AC23D002BF676 /* llviewercontrol.h */,
-				91E7BB2105EFCBA40026CC40 /* llviewerdisplay.cpp */,
-				1A83767D0BA2169600F28979 /* llviewergenericmessage.cpp */,
-				1A83767C0BA2169600F28979 /* llviewergenericmessage.h */,
-				26F52A32051F61DF00A80050 /* llviewergesture.cpp */,
-				26F52A31051F61DF00A80050 /* llviewerimage.cpp */,
-				26F52A30051F61DF00A80050 /* llviewerimagelist.cpp */,
-				26F52A2F051F61DF00A80050 /* llviewerinventory.cpp */,
-				26F52A39051F61DF00A80050 /* llviewerjoint.cpp */,
-				26F52A38051F61DF00A80050 /* llviewerjointattachment.cpp */,
-				26F52A37051F61DF00A80050 /* llviewerjointmesh.cpp */,
-				1A0DA5120C3AC07700361F49 /* llviewerjointmesh_sse.cpp */,
-				1A0DA5110C3AC07700361F49 /* llviewerjointmesh_sse2.cpp */,
-				1A0DA5100C3AC07700361F49 /* llviewerjointmesh_vec.cpp */,
-				A3C20E4B0BB0BD12007E872B /* llviewerjoystick.cpp */,
-				91287B4A078DE4B300E958B2 /* llviewerkeyboard.cpp */,
-				91287B4B078DE4B300E958B2 /* llviewerkeyboard.h */,
-				26F52A35051F61DF00A80050 /* llviewerlayer.cpp */,
-				26F529E4051F61DF00A80050 /* llviewermenu.cpp */,
-				1A8870E40BCC5A9500E89AA6 /* llviewermenufile.cpp */,
-				1A8870E30BCC5A9500E89AA6 /* llviewermenufile.h */,
-				26F529E3051F61DF00A80050 /* llviewermessage.cpp */,
-				1A3143D00A02B701005B87E7 /* llviewernetwork.cpp */,
-				26F529E2051F61DF00A80050 /* llviewerobject.cpp */,
-				26F529E1051F61DF00A80050 /* llviewerobjectlist.cpp */,
-				26F529E0051F61DF00A80050 /* llviewerparcelmgr.cpp */,
-				26F529DF051F61DF00A80050 /* llviewerparceloverlay.cpp */,
-				26F529DE051F61DF00A80050 /* llviewerpartsim.cpp */,
-				26F529DD051F61DF00A80050 /* llviewerpartsource.cpp */,
-				A241CB7B07B3DE0D001A39E3 /* llviewerprecompiledheaders.cpp */,
-				A241CB7C07B3DE0D001A39E3 /* llviewerprecompiledheaders.h */,
-				26F529DC051F61DF00A80050 /* llviewerregion.cpp */,
-				26F529DB051F61DF00A80050 /* llviewerreputation.cpp */,
-				26F529DA051F61DF00A80050 /* llviewerstats.cpp */,
-				EB3EE712083AC23D002BF676 /* llviewertexteditor.cpp */,
-				EB3EE713083AC23D002BF676 /* llviewertexteditor.h */,
-				26F529D9051F61DF00A80050 /* llviewertextureanim.cpp */,
-				26F529D8051F61DF00A80050 /* llviewerthrottle.cpp */,
-				26F529D7051F61DF00A80050 /* llviewervisualparam.cpp */,
-				26F529D6051F61DF00A80050 /* llviewerwindow.cpp */,
-				26F529D5051F61DF00A80050 /* llvlcomposition.cpp */,
-				26F529D4051F61DF00A80050 /* llvlmanager.cpp */,
-				26F529D3051F61DF00A80050 /* llvoavatar.cpp */,
-				ABD8702D0B3C68630007C63B /* llvoavatar.h */,
-				26F529D2051F61DF00A80050 /* llvocache.cpp */,
-				26F529D1051F61DF00A80050 /* llvoclouds.cpp */,
-				26F529D0051F61DF00A80050 /* llvograss.cpp */,
-				26F529CF051F61DF00A80050 /* llvoground.cpp */,
-				993A3E040B546D47007A0790 /* llvoiceclient.cpp */,
-				993A3E030B546D47007A0790 /* llvoiceclient.h */,
-				D8EAB8B80BE7B4490067DBB3 /* llvoiceremotectrl.cpp */,
-				D8EAB8B90BE7B4490067DBB3 /* llvoiceremotectrl.h */,
-				D8CA570E0BAF74FC0093D6D4 /* llvoicevisualizer.cpp */,
-				AB058FE40B3B74AD003C59D8 /* llvoicevisualizer.h */,
-				99E43516092D64E6003AE728 /* llvoinventorylistener.cpp */,
-				99E43515092D64E6003AE728 /* llvoinventorylistener.h */,
-				26F529CD051F61DF00A80050 /* llvopartgroup.cpp */,
-				26F529CC051F61DF00A80050 /* llvosky.cpp */,
-				26F529CB051F61DF00A80050 /* llvosurfacepatch.cpp */,
-				26F529CA051F61DF00A80050 /* llvotextbubble.cpp */,
-				26F529C9051F61DF00A80050 /* llvotree.cpp */,
-				26F529C7051F61DF00A80050 /* llvovolume.cpp */,
-				26F529C6051F61DF00A80050 /* llvowater.cpp */,
-				A2A8C5560C649F480001FEB2 /* llvowlsky.cpp */,
-				A2A8C5570C649F480001FEB2 /* llvowlsky.h */,
-				1CBB67D40C7CCCB2007DAAAE /* llwaterparammanager.cpp */,
-				1CBB67D50C7CCCB2007DAAAE /* llwaterparammanager.h */,
-				1CBB67D60C7CCCB2007DAAAE /* llwaterparamset.cpp */,
-				1CBB67D70C7CCCB2007DAAAE /* llwaterparamset.h */,
-				26F529C4051F61DF00A80050 /* llwearable.cpp */,
-				26F529C3051F61DF00A80050 /* llwearablelist.cpp */,
-				1AF7C1E30AF6C44800C4BF4A /* llweb.cpp */,
-				1AE5D7100844FBD300278605 /* llwebbrowserctrl.cpp */,
-				1AE5D70F0844FBD200278605 /* llwebbrowserctrl.h */,
-				26F529C2051F61DF00A80050 /* llwind.cpp */,
-				A2A8C5580C649F480001FEB2 /* llwlanimator.cpp */,
-				A2A8C5590C649F490001FEB2 /* llwlanimator.h */,
-				A2A8C55A0C649F490001FEB2 /* llwldaycycle.cpp */,
-				A2A8C55B0C649F490001FEB2 /* llwldaycycle.h */,
-				A2A8C55C0C649F490001FEB2 /* llwlparammanager.cpp */,
-				A2A8C55D0C649F490001FEB2 /* llwlparammanager.h */,
-				A2A8C55E0C649F490001FEB2 /* llwlparamset.cpp */,
-				A2A8C55F0C649F490001FEB2 /* llwlparamset.h */,
-				26F529C1051F61DF00A80050 /* llworld.cpp */,
-				26F529C0051F61DF00A80050 /* llworldmap.cpp */,
-				26F529BF051F61DF00A80050 /* llworldmapview.cpp */,
-				99BB516A099AC1AE004BF9F2 /* llxmlrpctransaction.cpp */,
-				99BB5169099AC1AE004BF9F2 /* llxmlrpctransaction.h */,
-				019200F004DD7D2B00A800A7 /* macview_Prefix.h */,
-				26F529BD051F61DF00A80050 /* noise.cpp */,
-				26F529BA051F61DF00A80050 /* pipeline.cpp */,
-				D8CA570D0BAF74FC0093D6D4 /* llvoicevisualizer.h */,
-				1A531BFA0D81056E00DEB305 /* llfloatercamera.h */,
-				1A531BFB0D81056E00DEB305 /* llfloatercamera.cpp */,
-			);
-			name = newview;
-			sourceTree = "<group>";
-		};
-		6192211E074A9B57005E1F34 /* llcommon */ = {
-			isa = PBXGroup;
-			children = (
-				D158CB820D75F0580060BD44 /* llsmoothstep.h */,
-				8849626B0C7B3E8A00A777FB /* llares.cpp */,
-				295542580C3B371500025801 /* llversionviewer.h */,
-				CB162DB40C6CCCFE00BF83BB /* llextendedstatus.h */,
-				1A9897E70B98E2F4005C45D7 /* llbase32.h */,
-				1A9897E80B98E2F4005C45D7 /* llbase32.cpp */,
-				1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */,
-				1A97C4550B8BCF9C00331A24 /* llliveappconfig.h */,
-				1A02016D0B7A85DE00D5C589 /* llbase64.cpp */,
-				1A02016E0B7A85DE00D5C589 /* llbase64.h */,
-				DA55FCB20B59F75C001C28B6 /* llerrorcontrol.h */,
-				DA9C41120B54B8CA00DD6F44 /* lllivefile.cpp */,
-				DA9C41130B54B8CA00DD6F44 /* lllivefile.h */,
-				A2A57EBA0ADF10FD00F6EF97 /* llavatarconstants.h */,
-				9B2863B00ABF637200A05D7C /* llerrorthread.cpp */,
-				91E333730ABB79AC004351DE /* llrun.cpp */,
-				9B2863B10ABF637200A05D7C /* llerrorthread.h */,
-				91E333740ABB79AC004351DE /* llrun.h */,
-				91E3336D0ABB5379004351DE /* llapp.cpp */,
-				91E3336E0ABB5379004351DE /* llapp.h */,
-				A3AF6BC80A544C71005B5E2C /* llevent.cpp */,
-				A3AF6BC90A544C71005B5E2C /* llevent.h */,
-				A3AF6BCA0A544C71005B5E2C /* lleventemitter.h */,
-				FDA39C6B0A37203E006E8A2D /* metaclass.cpp */,
-				FDA39C6C0A37203E006E8A2D /* metaclass.h */,
-				FDA39C6D0A37203E006E8A2D /* metaclasst.h */,
-				FDA39C6E0A37203E006E8A2D /* metaproperty.cpp */,
-				FDA39C6F0A37203E006E8A2D /* metaproperty.h */,
-				FDA39C700A37203E006E8A2D /* metapropertyt.h */,
-				FDA39C710A37203E006E8A2D /* reflective.cpp */,
-				FDA39C720A37203E006E8A2D /* reflective.h */,
-				FDA39C730A37203E006E8A2D /* reflectivet.h */,
-				913ADF0D0A250C750055AB21 /* llsdutil.cpp */,
-				913ADF0E0A250C750055AB21 /* llsdutil.h */,
-				1A57B92C09F8303A004D8B1A /* lllslconstants.h */,
-				1A57B92D09F8303A004D8B1A /* llagentconstants.h */,
-				0633E5D309E3421500712406 /* llstreamtools.cpp */,
-				0633E5D409E3421500712406 /* llstreamtools.h */,
-				0633E5D009E341F500712406 /* llfile.cpp */,
-				0633E5D109E341F500712406 /* llfile.h */,
-				1A46370909DA1FD10040EA83 /* llclickaction.h */,
-				FD1558220A06BB5F00DE9AE5 /* lldate.cpp */,
-				FD1558230A06BB5F00DE9AE5 /* lldate.h */,
-				FD1558240A06BB5F00DE9AE5 /* llsdserialize_xml.cpp */,
-				FD1558250A06BB5F00DE9AE5 /* llsdserialize_xml.h */,
-				FD1558260A06BB5F00DE9AE5 /* llsdserialize.cpp */,
-				FD1558270A06BB5F00DE9AE5 /* llsdserialize.h */,
-				FD1558280A06BB5F00DE9AE5 /* lluri.cpp */,
-				FD1558290A06BB5F00DE9AE5 /* lluri.h */,
-				FD6C9A3E09C75B3A00AA1849 /* llmemorystream.cpp */,
-				FD6C9A3F09C75B3A00AA1849 /* llmemorystream.h */,
-				99E43518092D6535003AE728 /* llcommon.h */,
-				99E43519092D6535003AE728 /* llcommon.cpp */,
-				93AE41CB08F4842F00141675 /* llsecondlifeurls.cpp */,
-				1AF9D84F08B405630094E8E7 /* llqueuedthread.cpp */,
-				1AF9D85008B405630094E8E7 /* llqueuedthread.h */,
-				918B123C07B19610008CD6CD /* llsd.h */,
-				918B123A07B19605008CD6CD /* llsd.cpp */,
-				9159DDD607662E7900F15AA1 /* llthread.cpp */,
-				9159DDD707662E7900F15AA1 /* llthread.h */,
-				915862D8075D2CE400F6A924 /* llapr.cpp */,
-				915862D9075D2CE400F6A924 /* llapr.h */,
-				616C4A9F0752C682006C2C65 /* timer.h */,
-				616C4A8F0752C3D1006C2C65 /* u64.cpp */,
-				616C4A900752C3D1006C2C65 /* u64.h */,
-				616C4A8E0752C3D1006C2C65 /* lltimer.cpp */,
-				616C4A8D0752C3D1006C2C65 /* lldefs.h */,
-				616C4A8C0752C3D1006C2C65 /* linden_common.h */,
-				61922120074A9B57005E1F34 /* bitpack.h */,
-				61922121074A9B57005E1F34 /* doublelinkedlist.h */,
-				61922122074A9B57005E1F34 /* imageids.h */,
-				61922123074A9B57005E1F34 /* indra_constants.h */,
-				61922124074A9B57005E1F34 /* llpreprocessor.h */,
-				61922125074A9B57005E1F34 /* linked_lists.h */,
-				99E4326B092D5996003AE728 /* llassettype.cpp */,
-				99E4326C092D5996003AE728 /* llassettype.h */,
-				61922126074A9B57005E1F34 /* llassoclist.h */,
-				61922127074A9B57005E1F34 /* llcriticaldamp.cpp */,
-				61922128074A9B57005E1F34 /* llcriticaldamp.h */,
-				61922129074A9B57005E1F34 /* lldarray.h */,
-				6192212A074A9B57005E1F34 /* lldarrayptr.h */,
-				6192212B074A9B57005E1F34 /* lldepthstack.h */,
-				6192212C074A9B57005E1F34 /* lldlinked.h */,
-				6192212D074A9B57005E1F34 /* lldqueueptr.h */,
-				6192212E074A9B57005E1F34 /* llendianswizzle.h */,
-				6192212F074A9B57005E1F34 /* llerror.cpp */,
-				61922130074A9B57005E1F34 /* llerror.h */,
-				61922135074A9B57005E1F34 /* llfasttimer.cpp */,
-				61922136074A9B57005E1F34 /* llfasttimer.h */,
-				61922137074A9B57005E1F34 /* llfixedbuffer.cpp */,
-				61922138074A9B57005E1F34 /* llfixedbuffer.h */,
-				61922139074A9B57005E1F34 /* llframetimer.cpp */,
-				6192213A074A9B57005E1F34 /* llframetimer.h */,
-				6192213B074A9B57005E1F34 /* lllinkedqueue.h */,
-				6192213C074A9B57005E1F34 /* lllocalidhashmap.h */,
-				6192213D074A9B57005E1F34 /* llmap.h */,
-				6192213E074A9B57005E1F34 /* llmemory.cpp */,
-				6192213F074A9B57005E1F34 /* llmemory.h */,
-				99E4350A092D644F003AE728 /* llmortician.h */,
-				99E4350B092D644F003AE728 /* llmortician.cpp */,
-				61922140074A9B57005E1F34 /* llnametable.h */,
-				61922141074A9B57005E1F34 /* llpagemem.h */,
-				61922142074A9B57005E1F34 /* llpriqueuemap.h */,
-				61922143074A9B57005E1F34 /* llprocessor.cpp */,
-				61922144074A9B57005E1F34 /* llprocessor.h */,
-				61922145074A9B57005E1F34 /* llptrskiplist.h */,
-				61922146074A9B57005E1F34 /* llptrskipmap.h */,
-				61922147074A9B57005E1F34 /* llsecondlifeurls.h */,
-				61922148074A9B57005E1F34 /* llskiplist.h */,
-				61922149074A9B57005E1F34 /* llskipmap.h */,
-				6192214A074A9B57005E1F34 /* llstack.h */,
-				6192214B074A9B57005E1F34 /* llstat.cpp */,
-				6192214C074A9B58005E1F34 /* llstat.h */,
-				6192214D074A9B58005E1F34 /* llstl.h */,
-				6192214E074A9B58005E1F34 /* llstrider.h */,
-				6192214F074A9B58005E1F34 /* llstring.cpp */,
-				61922150074A9B58005E1F34 /* llstring.h */,
-				61922151074A9B58005E1F34 /* llstringtable.cpp */,
-				61922152074A9B58005E1F34 /* llstringtable.h */,
-				61922153074A9B58005E1F34 /* llsys.cpp */,
-				61922154074A9B58005E1F34 /* llsys.h */,
-				61922155074A9B58005E1F34 /* lltimer.h */,
-				61922158074A9B58005E1F34 /* lluuidhashmap.h */,
-				99321B11081DD26000678159 /* llworkerthread.h */,
-				99321B12081DD26000678159 /* llworkerthread.cpp */,
-				6192215B074A9B58005E1F34 /* processor.h */,
-				6192215C074A9B58005E1F34 /* stdenums.h */,
-				6192215D074A9B58005E1F34 /* stdtypes.h */,
-				6192215E074A9B58005E1F34 /* string_table.h */,
-				61922161074A9B58005E1F34 /* timing.cpp */,
-				61922162074A9B58005E1F34 /* timing.h */,
-				DA9C40DE0B54B4BA00DD6F44 /* llformat.h */,
-				DA9C40DF0B54B4BA00DD6F44 /* llformat.cpp */,
-				DA9C40EC0B54B5C700DD6F44 /* llerrorlegacy.h */,
-			);
-			name = llcommon;
-			path = ../llcommon;
-			sourceTree = "<group>";
-		};
-		6192217F074A9B58005E1F34 /* llinventory */ = {
-			isa = PBXGroup;
-			children = (
-				1A8870D30BCC5A6300E89AA6 /* llinventorytype.h */,
-				1A8870D40BCC5A6300E89AA6 /* llinventorytype.cpp */,
-				913B26970B4DDCDA0030C3EC /* lllandmark.cpp */,
-				913B26980B4DDCDA0030C3EC /* lllandmark.h */,
-				C1F5D0A30B138AEB00827F1D /* lluserrelations.cpp */,
-				C1F5D0A40B138AEB00827F1D /* lluserrelations.h */,
-				1A5104460ABF5B6600520F6D /* llnotecard.h */,
-				1A5104440ABF5B5A00520F6D /* llnotecard.cpp */,
-				61922180074A9B58005E1F34 /* llcategory.cpp */,
-				61922181074A9B58005E1F34 /* llcategory.h */,
-				61922182074A9B58005E1F34 /* lleconomy.cpp */,
-				61922183074A9B58005E1F34 /* lleconomy.h */,
-				61922184074A9B58005E1F34 /* llinventory.cpp */,
-				61922185074A9B58005E1F34 /* llinventory.h */,
-				61922186074A9B58005E1F34 /* llparcel.cpp */,
-				61922187074A9B58005E1F34 /* llparcel.h */,
-				61922188074A9B58005E1F34 /* llpermissions.cpp */,
-				61922189074A9B58005E1F34 /* llpermissions.h */,
-				6192218A074A9B58005E1F34 /* llpermissionsflags.h */,
-				6192218B074A9B58005E1F34 /* llsaleinfo.cpp */,
-				6192218C074A9B58005E1F34 /* llsaleinfo.h */,
-				6192218D074A9B58005E1F34 /* lltransactionflags.cpp */,
-				6192218E074A9B58005E1F34 /* lltransactionflags.h */,
-				6192218F074A9B58005E1F34 /* lltransactiontypes.h */,
-			);
-			name = llinventory;
-			path = ../llinventory;
-			sourceTree = "<group>";
-		};
-		61922190074A9B58005E1F34 /* llmath */ = {
-			isa = PBXGroup;
-			children = (
-				496B968B0C022A69009833CB /* llline.cpp */,
-				496B968C0C022A69009833CB /* llline.h */,
-				A3653EBB0AC5F3D500E1E936 /* lltreenode.h */,
-				A241CB9407B3E3A7001A39E3 /* llperlin.cpp */,
-				A241CB8807B3E324001A39E3 /* llperlin.h */,
-				A241CB8907B3E324001A39E3 /* llplane.h */,
-				616C4E05075507DE006C2C65 /* camera.h */,
-				616C4E06075507DE006C2C65 /* coordframe.h */,
-				616C4E07075507DF006C2C65 /* llbboxlocal.cpp */,
-				616C4E08075507DF006C2C65 /* llbboxlocal.h */,
-				616C4E09075507DF006C2C65 /* llcamera.cpp */,
-				616C4E0A075507DF006C2C65 /* llcamera.h */,
-				616C4E0B075507DF006C2C65 /* llcoordframe.cpp */,
-				616C4E0C075507DF006C2C65 /* llcoordframe.h */,
-				616C4AA10752C6D2006C2C65 /* v2math.cpp */,
-				616C4AA20752C6D2006C2C65 /* v2math.h */,
-				616C4A9B0752C5CF006C2C65 /* lluuid.cpp */,
-				616C4A9C0752C5CF006C2C65 /* lluuid.h */,
-				61922191074A9B58005E1F34 /* llmath.h */,
-				61922192074A9B58005E1F34 /* llcoord.h */,
-				61922193074A9B58005E1F34 /* llcrc.cpp */,
-				61922194074A9B58005E1F34 /* llcrc.h */,
-				61922195074A9B58005E1F34 /* llinterp.h */,
-				61922196074A9B58005E1F34 /* llmd5.cpp */,
-				61922197074A9B58005E1F34 /* llmd5.h */,
-				61922198074A9B58005E1F34 /* llquantize.h */,
-				61922199074A9B58005E1F34 /* llrand.cpp */,
-				6192219A074A9B58005E1F34 /* llrand.h */,
-				6192219B074A9B58005E1F34 /* llrect.cpp */,
-				6192219C074A9B58005E1F34 /* llrect.h */,
-				1A1C615E0847AEE6005D7227 /* llvolumemgr.cpp */,
-				1A1C615F0847AEE6005D7227 /* llvolume.cpp */,
-				1A1C61600847AEE6005D7227 /* llvolumemgr.h */,
-				1A1C61610847AEE6005D7227 /* llvolume.h */,
-				6192219D074A9B58005E1F34 /* m3math.cpp */,
-				6192219E074A9B58005E1F34 /* m3math.h */,
-				6192219F074A9B58005E1F34 /* m4math.cpp */,
-				619221A0074A9B58005E1F34 /* m4math.h */,
-				619221A1074A9B58005E1F34 /* llquaternion.cpp */,
-				619221A2074A9B58005E1F34 /* llquaternion.h */,
-				619221A3074A9B58005E1F34 /* raytrace.cpp */,
-				619221A4074A9B58005E1F34 /* raytrace.h */,
-				619221A9074A9B58005E1F34 /* v3color.cpp */,
-				619221AA074A9B58005E1F34 /* v3color.h */,
-				619221AB074A9B58005E1F34 /* v3dmath.cpp */,
-				619221AC074A9B58005E1F34 /* v3dmath.h */,
-				619221AD074A9B58005E1F34 /* v3math.cpp */,
-				619221AE074A9B58005E1F34 /* v3math.h */,
-				619221AF074A9B58005E1F34 /* v4color.cpp */,
-				619221B0074A9B58005E1F34 /* v4color.h */,
-				619221B1074A9B58005E1F34 /* v4coloru.cpp */,
-				619221B2074A9B58005E1F34 /* v4coloru.h */,
-				619221B3074A9B58005E1F34 /* v4math.cpp */,
-				619221B4074A9B58005E1F34 /* v4math.h */,
-				619221B6074A9B58005E1F34 /* xform.cpp */,
-				619221B7074A9B58005E1F34 /* xform.h */,
-			);
-			name = llmath;
-			path = ../llmath;
-			sourceTree = "<group>";
-		};
-		619221B8074A9B58005E1F34 /* llmessage */ = {
-			isa = PBXGroup;
-			children = (
-				99374E450B5C603E008DB4BE /* lliosocket.h */,
-				99374E460B5C603E008DB4BE /* lliosocket.cpp */,
-				9117EAA10BF24A6100845BD2 /* llpacketack.cpp */,
-				9CC281000BE79746006D8BDC /* llmessagetemplateparser.h */,
-				9CC280FE0BE79737006D8BDC /* llmessagetemplateparser.cpp */,
-				9C659A850BAB0B6E00D2EB60 /* llmessageconfig.cpp */,
-				9C659A860BAB0B6E00D2EB60 /* llmessageconfig.h */,
-				AA348DF80B0EAB31002C3015 /* llcurl.cpp */,
-				AA348DF90B0EAB31002C3015 /* llcurl.h */,
-				1A02017E0B7A861200D5C589 /* llblowfishcipher.cpp */,
-				1A02017F0B7A861200D5C589 /* llblowfishcipher.h */,
-				1A0201800B7A861200D5C589 /* llcipher.h */,
-				1A0201810B7A861200D5C589 /* llnullcipher.cpp */,
-				1A0201820B7A861200D5C589 /* llnullcipher.h */,
-				1A0201830B7A861200D5C589 /* llxorcipher.cpp */,
-				1A0201840B7A861200D5C589 /* llxorcipher.h */,
-				DA4B14140B978815003F64DE /* llhttpsender.cpp */,
-				DA4B14150B978815003F64DE /* llhttpsender.h */,
-				DA4B14160B978815003F64DE /* llmessagetemplate.h */,
-				DA4B14170B978815003F64DE /* llsdmessagebuilder.cpp */,
-				DA4B14180B978815003F64DE /* llsdmessagebuilder.h */,
-				DA4B14190B978815003F64DE /* llsdmessagereader.cpp */,
-				DA4B141A0B978815003F64DE /* llsdmessagereader.h */,
-				3834D6010B73ABC1002B61C8 /* llmessagereader.cpp */,
-				3834D6020B73ABC1002B61C8 /* llmessagereader.h */,
-				3834D6030B73ABC1002B61C8 /* lltemplatemessagereader.cpp */,
-				3834D6040B73ABC1002B61C8 /* lltemplatemessagereader.h */,
-				91469E790B4486C10009E8F9 /* llmime.cpp */,
-				91469E7A0B4486C10009E8F9 /* llmime.h */,
-				38D0FA6F0B4BF8C5003323BA /* lltemplatemessagebuilder.h */,
-				38D0FA700B4BF8C5003323BA /* llmessagebuilder.h */,
-				38D0FA710B4BF8C5003323BA /* llmsgvariabletype.h */,
-				38D0FA690B4BF897003323BA /* lltemplatemessagebuilder.cpp */,
-				38D0FA6A0B4BF898003323BA /* llmessagetemplate.cpp */,
-				38D0FA6B0B4BF898003323BA /* llmessagebuilder.cpp */,
-				FDCB54F40AFBC5060033B433 /* llhttpnode.cpp */,
-				FDCB54F50AFBC5060033B433 /* llhttpnode.h */,
-				FD835B800AD1CB6700038B74 /* llchainio.cpp */,
-				9B39350F0AD6F9F400F57245 /* llurlrequest.cpp */,
-				9B3935100AD6F9F400F57245 /* llurlrequest.h */,
-				9B39350B0AD6F96900F57245 /* llhttpclient.cpp */,
-				9B39350C0AD6F96900F57245 /* llhttpclient.h */,
-				FD6C9A4609C75BCD00AA1849 /* llioutil.cpp */,
-				FD6C9A4709C75BCD00AA1849 /* llioutil.h */,
-				FD6C9A3809C75B0500AA1849 /* llbuffer.cpp */,
-				FD6C9A3909C75B0500AA1849 /* llbuffer.h */,
-				FD6C9A3A09C75B0500AA1849 /* llbufferstream.cpp */,
-				FD6C9A3B09C75B0500AA1849 /* llbufferstream.h */,
-				93AE41CF08F4845400141675 /* llinstantmessage.cpp */,
-				9190430C08327117002396D4 /* llfiltersd2xmlrpc.cpp */,
-				9190430D08327117002396D4 /* llfiltersd2xmlrpc.h */,
-				9190430E08327117002396D4 /* lliobuffer.cpp */,
-				9190430F08327117002396D4 /* lliobuffer.h */,
-				9190431008327117002396D4 /* lliopipe.cpp */,
-				9190431108327117002396D4 /* lliopipe.h */,
-				9190431208327117002396D4 /* llpumpio.cpp */,
-				9190431308327117002396D4 /* llpumpio.h */,
-				9190431408327117002396D4 /* llservice.cpp */,
-				9190431508327117002396D4 /* llservice.h */,
-				A241CB8E07B3E383001A39E3 /* llmessagethrottle.cpp */,
-				A241CB8F07B3E383001A39E3 /* llmessagethrottle.h */,
-				616C4E2C07550E97006C2C65 /* sound_ids.h */,
-				619221B9074A9B59005E1F34 /* llassetstorage.cpp */,
-				619221BA074A9B59005E1F34 /* llassetstorage.h */,
-				619221BB074A9B59005E1F34 /* llcachename.cpp */,
-				619221BC074A9B59005E1F34 /* llcachename.h */,
-				619221BD074A9B59005E1F34 /* llcallbacklisth.h */,
-				619221BE074A9B59005E1F34 /* llcircuit.cpp */,
-				619221BF074A9B59005E1F34 /* llcircuit.h */,
-				99FBB071087365E90048A5CC /* llclassifiedflags.cpp */,
-				99FBB072087365E90048A5CC /* llclassifiedflags.h */,
-				619221C5074A9B59005E1F34 /* lldatapacker.cpp */,
-				619221C6074A9B59005E1F34 /* lldatapacker.h */,
-				619221C7074A9B59005E1F34 /* lldbstrings.h */,
-				619221D0074A9B59005E1F34 /* lldispatcher.cpp */,
-				619221D1074A9B59005E1F34 /* lldispatcher.h */,
-				619221D2074A9B59005E1F34 /* lleventflags.h */,
-				619221D3074A9B59005E1F34 /* llhost.cpp */,
-				619221D4074A9B59005E1F34 /* llhost.h */,
-				619221D7074A9B59005E1F34 /* llinstantmessage.h */,
-				619221D8074A9B59005E1F34 /* llinvite.h */,
-				619221D9074A9B59005E1F34 /* llloginflags.h */,
-				619221DB074A9B59005E1F34 /* llmail.cpp */,
-				619221DC074A9B59005E1F34 /* llmail.h */,
-				619221DD074A9B59005E1F34 /* llnamevalue.cpp */,
-				619221DE074A9B59005E1F34 /* llnamevalue.h */,
-				619221DF074A9B59005E1F34 /* llnullcipher.cpp */,
-				619221E0074A9B59005E1F34 /* llpacketack.h */,
-				619221E1074A9B59005E1F34 /* llpacketbuffer.cpp */,
-				619221E2074A9B59005E1F34 /* llpacketbuffer.h */,
-				619221E3074A9B59005E1F34 /* llpacketring.cpp */,
-				619221E4074A9B59005E1F34 /* llpacketring.h */,
-				619221E5074A9B59005E1F34 /* llpartdata.cpp */,
-				619221E6074A9B59005E1F34 /* llpartdata.h */,
-				619221E7074A9B59005E1F34 /* llqueryflags.h */,
-				619221E8074A9B59005E1F34 /* llregionflags.h */,
-				619221E9074A9B59005E1F34 /* llregionhandle.h */,
-				619221EA074A9B59005E1F34 /* lltaskname.h */,
-				619221EB074A9B59005E1F34 /* llteleportflags.h */,
-				619221EC074A9B59005E1F34 /* llthrottle.cpp */,
-				619221ED074A9B59005E1F34 /* llthrottle.h */,
-				619221EE074A9B59005E1F34 /* lltransfermanager.cpp */,
-				619221EF074A9B59005E1F34 /* lltransfermanager.h */,
-				619221F0074A9B59005E1F34 /* lltransfersourceasset.cpp */,
-				619221F1074A9B59005E1F34 /* lltransfersourceasset.h */,
-				619221F2074A9B59005E1F34 /* lltransfersourcefile.cpp */,
-				619221F3074A9B59005E1F34 /* lltransfersourcefile.h */,
-				619221F4074A9B59005E1F34 /* lltransfertargetfile.cpp */,
-				619221F5074A9B59005E1F34 /* lltransfertargetfile.h */,
-				619221F6074A9B59005E1F34 /* lltransfertargetvfile.cpp */,
-				619221F7074A9B59005E1F34 /* lltransfertargetvfile.h */,
-				619221F8074A9B59005E1F34 /* lluseroperation.cpp */,
-				619221F9074A9B59005E1F34 /* lluseroperation.h */,
-				619221FA074A9B59005E1F34 /* llvehicleparams.h */,
-				619221FB074A9B59005E1F34 /* llxfer.cpp */,
-				619221FC074A9B59005E1F34 /* llxfer.h */,
-				619221FD074A9B59005E1F34 /* llxfer_file.cpp */,
-				619221FE074A9B59005E1F34 /* llxfer_file.h */,
-				619221FF074A9B59005E1F34 /* llxfer_mem.cpp */,
-				61922200074A9B59005E1F34 /* llxfer_mem.h */,
-				61922201074A9B59005E1F34 /* llxfer_vfile.cpp */,
-				61922202074A9B59005E1F34 /* llxfer_vfile.h */,
-				61922203074A9B59005E1F34 /* llxfermanager.cpp */,
-				61922204074A9B59005E1F34 /* llxfermanager.h */,
-				61922205074A9B59005E1F34 /* llxorcipher.cpp */,
-				61922206074A9B59005E1F34 /* machine.h */,
-				61922207074A9B59005E1F34 /* mean_collision_data.h */,
-				61922208074A9B59005E1F34 /* message.cpp */,
-				61922209074A9B59005E1F34 /* message.h */,
-				6192220A074A9B59005E1F34 /* message_prehash.cpp */,
-				6192220B074A9B59005E1F34 /* message_prehash.h */,
-				6192220C074A9B59005E1F34 /* message_string_table.cpp */,
-				6192220D074A9B59005E1F34 /* net.cpp */,
-				6192220E074A9B59005E1F34 /* net.h */,
-				6192220F074A9B59005E1F34 /* network.cpp */,
-				61922210074A9B59005E1F34 /* network.h */,
-				61922211074A9B59005E1F34 /* partsyspacket.cpp */,
-				61922212074A9B59005E1F34 /* partsyspacket.h */,
-				61922213074A9B59005E1F34 /* patch_code.cpp */,
-				61922214074A9B59005E1F34 /* patch_code.h */,
-				61922215074A9B59005E1F34 /* patch_dct.cpp */,
-				61922216074A9B59005E1F34 /* patch_dct.h */,
-				61922217074A9B59005E1F34 /* patch_idct.cpp */,
-			);
-			name = llmessage;
-			path = ../llmessage;
-			sourceTree = "<group>";
-		};
-		61922218074A9B59005E1F34 /* llprimitive */ = {
-			isa = PBXGroup;
-			children = (
-				913B1F020B4DBCAA0030C3EC /* lltree_common.h */,
-				913B1EFA0B4DBB420030C3EC /* object_flags.h */,
-				6192221A074A9B59005E1F34 /* legacy_object_types.h */,
-				6192221F074A9B59005E1F34 /* llmaterialtable.cpp */,
-				61922220074A9B5A005E1F34 /* llmaterialtable.h */,
-				61922221074A9B5A005E1F34 /* llprimitive.cpp */,
-				61922222074A9B5A005E1F34 /* llprimitive.h */,
-				61922223074A9B5A005E1F34 /* lltextureanim.cpp */,
-				61922224074A9B5A005E1F34 /* lltextureanim.h */,
-				61922225074A9B5A005E1F34 /* lltextureentry.cpp */,
-				61922226074A9B5A005E1F34 /* lltextureentry.h */,
-				61922227074A9B5A005E1F34 /* lltreeparams.cpp */,
-				61922228074A9B5A005E1F34 /* lltreeparams.h */,
-				1A1C61730847B307005D7227 /* llvolumemessage.h */,
-				1A1C61740847B307005D7227 /* llvolumemessage.cpp */,
-				99D8B25508735BFE002F8938 /* material_codes.h */,
-			);
-			name = llprimitive;
-			path = ../llprimitive;
-			sourceTree = "<group>";
-		};
-		6192225C074A9B5A005E1F34 /* llui */ = {
-			isa = PBXGroup;
-			children = (
-				A2A8C5440C649EE20001FEB2 /* llmultislider.cpp */,
-				A2A8C5450C649EE20001FEB2 /* llmultislider.h */,
-				A2A8C5460C649EE20001FEB2 /* llmultisliderctrl.cpp */,
-				A2A8C5470C649EE20001FEB2 /* llmultisliderctrl.h */,
-				93AE41C508F483C800141675 /* llalertdialog.cpp */,
-				93AE41C908F483E300141675 /* llalertdialog.h */,
-				EB3EE68E083ABB5D002BF676 /* llbutton.cpp */,
-				EB3EE68F083ABB5D002BF676 /* llbutton.h */,
-				1A8BF3770A1AAB7B005B9D5A /* llcallbackmap.h */,
-				EB3EE690083ABB5D002BF676 /* llcheckboxctrl.cpp */,
-				EB3EE691083ABB5D002BF676 /* llcheckboxctrl.h */,
-				EB3EE692083ABB5D002BF676 /* llclipboard.cpp */,
-				EB3EE693083ABB5D002BF676 /* llclipboard.h */,
-				EB3EE694083ABB5D002BF676 /* llcombobox.cpp */,
-				EB3EE695083ABB5D002BF676 /* llcombobox.h */,
-				1AEF0A560B2DFE67003F107C /* llctrlselectioninterface.cpp */,
-				1AEF0A570B2DFE67003F107C /* llctrlselectioninterface.h */,
-				EB3EE696083ABB5D002BF676 /* lldraghandle.cpp */,
-				EB3EE697083ABB5D002BF676 /* lldraghandle.h */,
-				1A1F130B0B3919F100845A6C /* lleditmenuhandler.cpp */,
-				1A1F130A0B3919F100845A6C /* lleditmenuhandler.h */,
-				EB3EE698083ABB5D002BF676 /* llfloater.cpp */,
-				EB3EE699083ABB5D002BF676 /* llfloater.h */,
-				EB3EE69A083ABB5D002BF676 /* llfocusmgr.cpp */,
-				EB3EE69B083ABB5D002BF676 /* llfocusmgr.h */,
-				A29852A10BC6BC630005FA09 /* llhtmlhelp.h */,
-				EB3EE69C083ABB5D002BF676 /* lliconctrl.cpp */,
-				EB3EE69D083ABB5D002BF676 /* lliconctrl.h */,
-				EB3EE69E083ABB5D002BF676 /* llkeywords.cpp */,
-				EB3EE69F083ABB5D002BF676 /* llkeywords.h */,
-				EB3EE6A0083ABB5D002BF676 /* lllineeditor.cpp */,
-				EB3EE6A1083ABB5D002BF676 /* lllineeditor.h */,
-				EB9E8314082AEEF2007B4479 /* llmenugl.cpp */,
-				EB9E8315082AEEF2007B4479 /* llmenugl.h */,
-				93AE41C608F483C900141675 /* llmodaldialog.cpp */,
-				93AE41CA08F483E300141675 /* llmodaldialog.h */,
-				EB3EE6A2083ABB5D002BF676 /* llpanel.cpp */,
-				EB3EE6A3083ABB5D002BF676 /* llpanel.h */,
-				EB3EE6A4083ABB5D002BF676 /* llradiogroup.cpp */,
-				EB3EE6A5083ABB5D002BF676 /* llradiogroup.h */,
-				EB3EE6A6083ABB5D002BF676 /* llresizebar.cpp */,
-				EB3EE6A7083ABB5D002BF676 /* llresizebar.h */,
-				EB3EE6A8083ABB5D002BF676 /* llresizehandle.cpp */,
-				EB3EE6A9083ABB5D002BF676 /* llresizehandle.h */,
-				EB9E8316082AEEF2007B4479 /* llresmgr.cpp */,
-				EB9E8317082AEEF2007B4479 /* llresmgr.h */,
-				1AEF0A5A0B2DFE72003F107C /* llrootview.cpp */,
-				1AEF0A590B2DFE71003F107C /* llrootview.h */,
-				EB3EE6AA083ABB5D002BF676 /* llscrollbar.cpp */,
-				EB3EE6AB083ABB5D002BF676 /* llscrollbar.h */,
-				EB3EE6AC083ABB5D002BF676 /* llscrollcontainer.cpp */,
-				EB3EE6AD083ABB5D002BF676 /* llscrollcontainer.h */,
-				AAEAAF250A8104D8005F0707 /* llscrollingpanellist.cpp */,
-				AAEAAF260A8104D8005F0707 /* llscrollingpanellist.h */,
-				EB3EE6AE083ABB5D002BF676 /* llscrolllistctrl.cpp */,
-				EB3EE6AF083ABB5D002BF676 /* llscrolllistctrl.h */,
-				EB3EE6B0083ABB5D002BF676 /* llslider.cpp */,
-				EB3EE6B1083ABB5D002BF676 /* llslider.h */,
-				EB3EE6B2083ABB5D002BF676 /* llsliderctrl.cpp */,
-				EB3EE6B3083ABB5D002BF676 /* llsliderctrl.h */,
-				EB3EE6B4083ABB5D002BF676 /* llspinctrl.cpp */,
-				EB3EE6B5083ABB5D002BF676 /* llspinctrl.h */,
-				EB3EE6B6083ABB5D002BF676 /* llstyle.cpp */,
-				EB3EE6B7083ABB5D002BF676 /* llstyle.h */,
-				EB3EE6B8083ABB5D002BF676 /* lltabcontainer.cpp */,
-				EB3EE6B9083ABB5D002BF676 /* lltabcontainer.h */,
-				EB3EE6BA083ABB5D002BF676 /* lltabcontainervertical.cpp */,
-				EB3EE6BB083ABB5D002BF676 /* lltabcontainervertical.h */,
-				EB3EE6BC083ABB5D002BF676 /* lltextbox.cpp */,
-				EB3EE6BD083ABB5D002BF676 /* lltextbox.h */,
-				EB3EE6C0083ABB5D002BF676 /* lltexteditor.cpp */,
-				EB3EE6C1083ABB5D002BF676 /* lltexteditor.h */,
-				EB9E8318082AEEF3007B4479 /* llui.cpp */,
-				EB9E8319082AEEF3007B4479 /* llui.h */,
-				EB9E831A082AEEF3007B4479 /* lluiconstants.h */,
-				EB9E831B082AEEF3007B4479 /* lluictrl.cpp */,
-				EB9E831C082AEEF3007B4479 /* lluictrl.h */,
-				EB3EE6C2083ABB5D002BF676 /* lluictrlfactory.cpp */,
-				EB3EE6C3083ABB5D002BF676 /* lluictrlfactory.h */,
-				AAA133690A3F94D000419F7C /* lluistring.cpp */,
-				AAA1336A0A3F94D000419F7C /* lluistring.h */,
-				6192225F074A9B5A005E1F34 /* llundo.cpp */,
-				61922260074A9B5A005E1F34 /* llundo.h */,
-				EB9E831D082AEEF3007B4479 /* llview.cpp */,
-				EB9E831E082AEEF3007B4479 /* llview.h */,
-				EB3EE6C4083ABB5E002BF676 /* llviewborder.cpp */,
-				EB3EE6C5083ABB5E002BF676 /* llviewborder.h */,
-				299F95BE0ADDE5D000C94EEF /* llviewquery.cpp */,
-				299F95BF0ADDE5D000C94EEF /* llviewquery.h */,
-			);
-			name = llui;
-			path = ../llui;
-			sourceTree = "<group>";
-		};
-		61922263074A9B5A005E1F34 /* llvfs */ = {
-			isa = PBXGroup;
-			children = (
-				91A154F8081DC15E0089988C /* llvfsthread.cpp */,
-				91A154F6081DC14C0089988C /* llvfsthread.h */,
-				616C4E2E07551735006C2C65 /* lldir_mac.cpp */,
-				616C4E2F07551735006C2C65 /* lldir_mac.h */,
-				616C4E3007551735006C2C65 /* lldir.cpp */,
-				616C4E3107551735006C2C65 /* lldir.h */,
-				61922266074A9B5A005E1F34 /* llvfile.cpp */,
-				61922267074A9B5A005E1F34 /* llvfile.h */,
-				61922268074A9B5A005E1F34 /* llvfs.cpp */,
-				61922269074A9B5A005E1F34 /* llvfs.h */,
-				99AAD74D09DC8B9D0036C309 /* lllfsthread.h */,
-				99AAD74E09DC8B9D0036C309 /* lllfsthread.cpp */,
-			);
-			name = llvfs;
-			path = ../llvfs;
-			sourceTree = "<group>";
-		};
-		6192226A074A9B5A005E1F34 /* llwindow */ = {
-			isa = PBXGroup;
-			children = (
-				1AF6402B0B2F393900FE6840 /* llgltypes.h */,
-				F62641080B1F757D00E5BBAD /* llwindowheadless.cpp */,
-				F62641090B1F757D00E5BBAD /* llwindowheadless.h */,
-				EB3EE703083ABCC5002BF676 /* llwindowmacosx.h */,
-				91287B2F078DCE0A00E958B2 /* llkeyboardmacosx.cpp */,
-				91287B2D078DCDF700E958B2 /* llkeyboardmacosx.h */,
-				99E64035081F1CB80009003F /* llglheaders.h */,
-				99E64036081F1CB80009003F /* llgl.cpp */,
-				99E64037081F1CB80009003F /* llgl.h */,
-				91287B25078DCD1800E958B2 /* llkeyboard.cpp */,
-				91287B26078DCD1800E958B2 /* llkeyboard.h */,
-				91E579B00770D43100404933 /* llwindowmacosx.cpp */,
-				9985A08E0AC1FE3600579AFB /* llwindowmacosx-objc.h */,
-				9985A08F0AC1FE3600579AFB /* llwindowmacosx-objc.mm */,
-				6192226F074A9B5A005E1F34 /* llmousehandler.h */,
-				61922274074A9B5A005E1F34 /* llwindow.cpp */,
-				61922275074A9B5A005E1F34 /* llwindow.h */,
-				F4DE841C0CC5567300BD4636 /* llpreeditor.h */,
-			);
-			name = llwindow;
-			path = ../llwindow;
-			sourceTree = "<group>";
-		};
-		61922278074A9B5A005E1F34 /* llxml */ = {
-			isa = PBXGroup;
-			children = (
-				AA0E2A5F0A2FDAEE0066250A /* llcontrol.cpp */,
-				AA0E2A600A2FDAEE0066250A /* llcontrol.h */,
-				EBAAFE160858EBA400B9269A /* llxmlnode.cpp */,
-				EBAAFE170858EBA400B9269A /* llxmlnode.h */,
-				61922279074A9B5A005E1F34 /* llxmlparser.cpp */,
-				6192227A074A9B5A005E1F34 /* llxmlparser.h */,
-				6192227B074A9B5A005E1F34 /* llxmltree.cpp */,
-				6192227C074A9B5A005E1F34 /* llxmltree.h */,
-			);
-			name = llxml;
-			path = ../llxml;
-			sourceTree = "<group>";
-		};
-		6192227D074A9B5A005E1F34 /* lscript */ = {
-			isa = PBXGroup;
-			children = (
-				FD6B3D5C09E18FEA00E493E3 /* lscript_http.h */,
-				6192227E074A9B5A005E1F34 /* lscript_alloc.h */,
-				6192227F074A9B5A005E1F34 /* lscript_byteconvert.h */,
-				61922280074A9B5B005E1F34 /* lscript_byteformat.h */,
-				61922281074A9B5B005E1F34 /* lscript_compile */,
-				61922299074A9B5B005E1F34 /* lscript_execute */,
-				6192229F074A9B5B005E1F34 /* lscript_execute.h */,
-				619222A2074A9B5B005E1F34 /* lscript_export.h */,
-				619222A3074A9B5B005E1F34 /* lscript_library */,
-				619222A7074A9B5B005E1F34 /* lscript_library.h */,
-				619222A8074A9B5B005E1F34 /* lscript_rt_interface.h */,
-			);
-			name = lscript;
-			path = ../lscript;
-			sourceTree = "<group>";
-		};
-		61922281074A9B5B005E1F34 /* lscript_compile */ = {
-			isa = PBXGroup;
-			children = (
-				61922286074A9B5B005E1F34 /* indra.l */,
-				61922287074A9B5B005E1F34 /* indra.y */,
-				61922289074A9B5B005E1F34 /* lscript_bytecode.cpp */,
-				6192228A074A9B5B005E1F34 /* lscript_bytecode.h */,
-				6192228B074A9B5B005E1F34 /* lscript_error.cpp */,
-				6192228C074A9B5B005E1F34 /* lscript_error.h */,
-				6192228D074A9B5B005E1F34 /* lscript_heap.cpp */,
-				6192228E074A9B5B005E1F34 /* lscript_heap.h */,
-				6192228F074A9B5B005E1F34 /* lscript_resource.cpp */,
-				61922290074A9B5B005E1F34 /* lscript_resource.h */,
-				61922291074A9B5B005E1F34 /* lscript_scope.cpp */,
-				61922292074A9B5B005E1F34 /* lscript_scope.h */,
-				61922293074A9B5B005E1F34 /* lscript_tree.cpp */,
-				61922294074A9B5B005E1F34 /* lscript_tree.h */,
-				61922295074A9B5B005E1F34 /* lscript_typecheck.cpp */,
-				61922296074A9B5B005E1F34 /* lscript_typecheck.h */,
-			);
-			path = lscript_compile;
-			sourceTree = "<group>";
-		};
-		61922299074A9B5B005E1F34 /* lscript_execute */ = {
-			isa = PBXGroup;
-			children = (
-				6192229A074A9B5B005E1F34 /* lscript_execute.cpp */,
-				6192229B074A9B5B005E1F34 /* lscript_heapruntime.cpp */,
-				6192229C074A9B5B005E1F34 /* lscript_heapruntime.h */,
-				6192229D074A9B5B005E1F34 /* lscript_readlso.cpp */,
-				6192229E074A9B5B005E1F34 /* lscript_readlso.h */,
-			);
-			path = lscript_execute;
-			sourceTree = "<group>";
-		};
-		619222A3074A9B5B005E1F34 /* lscript_library */ = {
-			isa = PBXGroup;
-			children = (
-				619222A4074A9B5B005E1F34 /* lscript_alloc.cpp */,
-				619222A5074A9B5B005E1F34 /* lscript_export.cpp */,
-				619222A6074A9B5B005E1F34 /* lscript_library.cpp */,
-			);
-			path = lscript_library;
-			sourceTree = "<group>";
-		};
-		61923C96074AD8B7005E1F34 /* mac_crash_logger */ = {
-			isa = PBXGroup;
-			children = (
-				C1B2AF890CD679EB004CD4EF /* llcrashloggermac.h */,
-				C1E4A5770CC0210F005FB0A6 /* llcrashlogger.cpp */,
-				C1E4A5780CC0210F005FB0A6 /* llcrashlogger.h */,
-				C1E4A5750CC020FC005FB0A6 /* llcrashloggermac.cpp */,
-				61923C97074AD8B7005E1F34 /* mac_crash_logger.cpp */,
-			);
-			name = mac_crash_logger;
-			path = ../mac_crash_logger;
-			sourceTree = "<group>";
-		};
-		61923C99074AD8F1005E1F34 /* tools */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = tools;
-			path = ../tools;
-			sourceTree = "<group>";
-		};
-		61923CD6074AE2CB005E1F34 /* llaudio */ = {
-			isa = PBXGroup;
-			children = (
-				61923CD7074AE2CB005E1F34 /* audioengine.cpp */,
-				61923CD8074AE2CB005E1F34 /* audioengine.h */,
-				61923CD9074AE2CB005E1F34 /* audioengine_fmod.cpp */,
-				61923CDA074AE2CB005E1F34 /* audioengine_fmod.h */,
-				61923CDB074AE2CB005E1F34 /* listener.cpp */,
-				61923CDC074AE2CB005E1F34 /* listener.h */,
-				61923CDD074AE2CB005E1F34 /* listener_ds3d.h */,
-				61923CDE074AE2CB005E1F34 /* listener_fmod.cpp */,
-				61923CDF074AE2CB005E1F34 /* listener_fmod.h */,
-				61923CE0074AE2CB005E1F34 /* listener_openal.h */,
-				61923CE1074AE2CB005E1F34 /* llaudiodecodemgr.cpp */,
-				61923CE2074AE2CB005E1F34 /* llaudiodecodemgr.h */,
-				61923CE5074AE2CB005E1F34 /* vorbisdecode.cpp */,
-				61923CE6074AE2CB005E1F34 /* vorbisdecode.h */,
-				61923CE7074AE2CB005E1F34 /* vorbisencode.cpp */,
-				61923CE8074AE2CB005E1F34 /* vorbisencode.h */,
-			);
-			name = llaudio;
-			path = ../llaudio;
-			sourceTree = "<group>";
-		};
-		61923CFF074AE3BF005E1F34 /* llcharacter */ = {
-			isa = PBXGroup;
-			children = (
-				61923D00074AE3BF005E1F34 /* llanimationstates.cpp */,
-				61923D01074AE3BF005E1F34 /* llanimationstates.h */,
-				61923D02074AE3BF005E1F34 /* llbvhloader.cpp */,
-				61923D03074AE3BF005E1F34 /* llbvhloader.h */,
-				61923D04074AE3BF005E1F34 /* llcharacter.cpp */,
-				61923D05074AE3BF005E1F34 /* llcharacter.h */,
-				61923D06074AE3BF005E1F34 /* lleditingmotion.cpp */,
-				61923D07074AE3BF005E1F34 /* lleditingmotion.h */,
-				61923D08074AE3BF005E1F34 /* llgesture.cpp */,
-				61923D09074AE3BF005E1F34 /* llgesture.h */,
-				61923D0A074AE3BF005E1F34 /* llhandmotion.cpp */,
-				61923D0B074AE3BF005E1F34 /* llhandmotion.h */,
-				61923D0C074AE3BF005E1F34 /* llheadrotmotion.cpp */,
-				61923D0D074AE3BF005E1F34 /* llheadrotmotion.h */,
-				61923D0E074AE3BF005E1F34 /* lljoint.cpp */,
-				61923D0F074AE3BF005E1F34 /* lljoint.h */,
-				61923D10074AE3BF005E1F34 /* lljointsolverrp3.cpp */,
-				61923D11074AE3BF005E1F34 /* lljointsolverrp3.h */,
-				61923D12074AE3BF005E1F34 /* lljointstate.h */,
-				61923D13074AE3BF005E1F34 /* llkeyframefallmotion.cpp */,
-				61923D14074AE3BF005E1F34 /* llkeyframefallmotion.h */,
-				61923D15074AE3BF005E1F34 /* llkeyframemotion.cpp */,
-				61923D16074AE3BF005E1F34 /* llkeyframemotion.h */,
-				61923D17074AE3C0005E1F34 /* llkeyframemotionparam.cpp */,
-				61923D18074AE3C0005E1F34 /* llkeyframemotionparam.h */,
-				61923D19074AE3C0005E1F34 /* llkeyframestandmotion.cpp */,
-				61923D1A074AE3C0005E1F34 /* llkeyframestandmotion.h */,
-				61923D1B074AE3C0005E1F34 /* llkeyframewalkmotion.cpp */,
-				61923D1C074AE3C0005E1F34 /* llkeyframewalkmotion.h */,
-				61923D1D074AE3C0005E1F34 /* llmotion.cpp */,
-				61923D1E074AE3C0005E1F34 /* llmotion.h */,
-				61923D1F074AE3C0005E1F34 /* llmotioncontroller.cpp */,
-				61923D20074AE3C0005E1F34 /* llmotioncontroller.h */,
-				61923D21074AE3C0005E1F34 /* llmultigesture.cpp */,
-				61923D22074AE3C0005E1F34 /* llmultigesture.h */,
-				61923D23074AE3C0005E1F34 /* llpose.cpp */,
-				61923D24074AE3C0005E1F34 /* llpose.h */,
-				61923D25074AE3C0005E1F34 /* llstatemachine.cpp */,
-				61923D26074AE3C0005E1F34 /* llstatemachine.h */,
-				61923D27074AE3C0005E1F34 /* lltargetingmotion.cpp */,
-				61923D28074AE3C0005E1F34 /* lltargetingmotion.h */,
-				61923D29074AE3C0005E1F34 /* llvisualparam.cpp */,
-				61923D2A074AE3C0005E1F34 /* llvisualparam.h */,
-			);
-			name = llcharacter;
-			path = ../llcharacter;
-			sourceTree = "<group>";
-		};
-		61923D8D074AE4F2005E1F34 /* llimage */ = {
-			isa = PBXGroup;
-			children = (
-				AAE98CC00B38FE0800E2F204 /* llimageworker.cpp */,
-				AAE98CC10B38FE0800E2F204 /* llimageworker.h */,
-				EB3EE725083AC2F2002BF676 /* llimagedxt.cpp */,
-				EB3EE726083AC2F2002BF676 /* llimagedxt.h */,
-				61923D9B074AE4F2005E1F34 /* llimage.cpp */,
-				61923D9C074AE4F2005E1F34 /* llimage.h */,
-				61923D9D074AE4F2005E1F34 /* llimagebmp.cpp */,
-				61923D9E074AE4F2005E1F34 /* llimagebmp.h */,
-				61923DA0074AE4F2005E1F34 /* llimagej2c.cpp */,
-				61923DA1074AE4F2005E1F34 /* llimagej2c.h */,
-				61923DA2074AE4F2005E1F34 /* llimagejpeg.cpp */,
-				61923DA3074AE4F2005E1F34 /* llimagejpeg.h */,
-				61923DA4074AE4F2005E1F34 /* llimagetga.cpp */,
-				61923DA5074AE4F2005E1F34 /* llimagetga.h */,
-				61923DA8074AE4F3005E1F34 /* llmapimagetype.h */,
-				8833693B0C18AF33007F52DA /* llimagepng.cpp */,
-				8833693C0C18AF33007F52DA /* llpngwrapper.cpp */,
-				8833693D0C18AF33007F52DA /* llpngwrapper.h */,
-				8833693E0C18AF33007F52DA /* llimagepng.h */,
-			);
-			name = llimage;
-			path = ../llimage;
-			sourceTree = "<group>";
-		};
-		91E86A0107BBFA5D00F56E75 /* llmedia */ = {
-			isa = PBXGroup;
-			children = (
-				FEE6C8160D2D6DAC00C97E9C /* llmediaimplcommon.cpp */,
-				FEE6C8170D2D6DAC00C97E9C /* llmediaimplcommon.h */,
-				FEE6C8180D2D6DAC00C97E9C /* llmediaimplexample1.cpp */,
-				FEE6C8190D2D6DAC00C97E9C /* llmediaimplexample1.h */,
-				FEE6C81A0D2D6DAC00C97E9C /* llmediaimplexample2.cpp */,
-				FEE6C81B0D2D6DAC00C97E9C /* llmediaimplexample2.h */,
-				FEE6C81C0D2D6DAC00C97E9C /* llmediaimplfactory.cpp */,
-				FEE6C81D0D2D6DAC00C97E9C /* llmediaimplfactory.h */,
-				FEE6C81E0D2D6DAC00C97E9C /* llmediaimplgstreamer.cpp */,
-				FEE6C81F0D2D6DAC00C97E9C /* llmediaimplgstreamer.h */,
-				FEE6C8200D2D6DAC00C97E9C /* llmediaimplgstreamer_syms.cpp */,
-				FEE6C8210D2D6DAC00C97E9C /* llmediaimplgstreamer_syms.h */,
-				FEE6C8250D2D6DAC00C97E9C /* llmediaimplgstreamervidplug.cpp */,
-				FEE6C8260D2D6DAC00C97E9C /* llmediaimplgstreamervidplug.h */,
-				FEE6C8270D2D6DAC00C97E9C /* llmediaimplllmozlib.cpp */,
-				FEE6C8280D2D6DAC00C97E9C /* llmediaimplllmozlib.h */,
-				FEE6C8290D2D6DAC00C97E9C /* llmediaimplregister.h */,
-				FEE6C82A0D2D6DAC00C97E9C /* llmediamanager.cpp */,
-				FEE6C82B0D2D6DAC00C97E9C /* llmediamanager.h */,
-				FEE6C82C0D2D6DAC00C97E9C /* llmediaobserver.h */,
-				91E86A0407BBFA5D00F56E75 /* llmediabase.h */,
-				91E86A0507BBFA5D00F56E75 /* llmediaemitter.h */,
-				99DB67DB07C161A500CF3185 /* llmediaimplquicktime.cpp */,
-				99DB67DA07C161A500CF3185 /* llmediaimplquicktime.h */,
-			);
-			name = llmedia;
-			path = ../llmedia;
-			sourceTree = "<group>";
-		};
-		990CDBD705C1EA7900739545 /* mac_updater */ = {
-			isa = PBXGroup;
-			children = (
-				990CDBDF05C1EA7900739545 /* mac_updater.cpp */,
-				990CDBD805C1EA7900739545 /* AutoUpdater.nib */,
-				990CDBDA05C1EA7900739545 /* FSCopyObject.c */,
-				990CDBDB05C1EA7900739545 /* FSCopyObject.h */,
-				990CDBDC05C1EA7900739545 /* GenLinkedList.c */,
-				990CDBDD05C1EA7900739545 /* GenLinkedList.h */,
-				990CDBE005C1EA7900739545 /* MoreFilesX.c */,
-				990CDBE105C1EA7900739545 /* MoreFilesX.h */,
-			);
-			name = mac_updater;
-			path = ../mac_updater;
-			sourceTree = SOURCE_ROOT;
-		};
-		997B4BCB060157E5001B0407 /* newview headers */ = {
-			isa = PBXGroup;
-			children = (
-				1AD394140CAB0023004BA76A /* llcommandhandler.h */,
-				1AD3940C0CAB0003004BA76A /* llurlsimstring.h */,
-				1AD3940D0CAB0003004BA76A /* llurldispatcher.h */,
-				997B4D2306015823001B0407 /* llagent.h */,
-				1A758C990A43700400589675 /* llagentdata.h */,
-				997B4D2206015823001B0407 /* llagentpilot.h */,
-				997B4D1E06015823001B0407 /* llappearance.h */,
-				997B4D1806015823001B0407 /* llbbox.h */,
-				997B4D1606015823001B0407 /* llbox.h */,
-				997B4D1306015823001B0407 /* llcallbacklist.h */,
-				997B4D1206015823001B0407 /* llcallingcard.h */,
-				9C1842500B9F94F200208356 /* llcaphttpsender.h */,
-				997B4D1006015823001B0407 /* llchatbar.h */,
-				997B4D0D06015823001B0407 /* llcloud.h */,
-				997B4D0C06015823001B0407 /* llcolorscheme.h */,
-				997B4D0B06015823001B0407 /* llcolorswatch.h */,
-				997B4D0906015823001B0407 /* llcompass.h */,
-				997B4D0806015823001B0407 /* llcompilequeue.h */,
-				997B4D0706015823001B0407 /* llconsole.h */,
-				997B4D0606015823001B0407 /* llcontainerview.h */,
-				997B4CEF06015822001B0407 /* llcubemap.h */,
-				997B4CEE06015822001B0407 /* llcylinder.h */,
-				997B4D0306015823001B0407 /* lldebugview.h */,
-				997B4D0106015823001B0407 /* lldrawable.h */,
-				997B4D0006015823001B0407 /* lldrawpool.h */,
-				997B4CFF06015823001B0407 /* lldrawpoolalpha.h */,
-				997B4CFE06015823001B0407 /* lldrawpoolavatar.h */,
-				997B4CFD06015823001B0407 /* lldrawpoolbump.h */,
-				997B4CFC06015823001B0407 /* lldrawpoolground.h */,
-				997B4CFB06015823001B0407 /* lldrawpoolsimple.h */,
-				997B4CFA06015823001B0407 /* lldrawpoolsky.h */,
-				997B4CF806015823001B0407 /* lldrawpoolterrain.h */,
-				997B4CF706015823001B0407 /* lldrawpooltree.h */,
-				997B4CF506015823001B0407 /* lldrawpoolwater.h */,
-				997B4CF406015822001B0407 /* lldriverparam.h */,
-				997B4CF206015822001B0407 /* llemote.h */,
-				915F492B06B5739800F629BF /* lleventinfo.h */,
-				915F492306B572FB00F629BF /* lleventnotifier.h */,
-				997B4CF106015822001B0407 /* llface.h */,
-				997B4CEC06015822001B0407 /* llface.inl */,
-				912541B00691FF8D008C66F7 /* llfasttimerview.h */,
-				997B4CEB06015822001B0407 /* llfeaturemanager.h */,
-				997B4CE906015822001B0407 /* llfilepicker.h */,
-				997B4CE706015822001B0407 /* llfirstuse.h */,
-				997B4CE506015822001B0407 /* llfloaterabout.h */,
-				997B4CE306015822001B0407 /* llfloaterauction.h */,
-				997B4CE206015822001B0407 /* llfloateravatarinfo.h */,
-				1A61A7FA0A5ED44E009FE3D2 /* llfloateravatarpicker.h */,
-				1AF9CA450AE972D4003EFF2D /* llfloateravatartextures.h */,
-				997B4CE006015822001B0407 /* llfloaterbuildoptions.h */,
-				1A5B3B530A70146900A90391 /* llfloaterbump.h */,
-				997B4CDF06015822001B0407 /* llfloaterbuy.h */,
-				997B4CDE06015822001B0407 /* llfloaterbuycontents.h */,
-				997B4CDC06015822001B0407 /* llfloaterchat.h */,
-				91CB311706FB586300DBCE1E /* llfloaterclothing.h */,
-				997B4CDB06015822001B0407 /* llfloatercustomize.h */,
-				997B4CDA06015822001B0407 /* llfloaterdirectory.h */,
-				913AA1FE0798560200D111CE /* llfloaterfriends.h */,
-				997B4CD906015822001B0407 /* llfloatergesture.h */,
-				997B4CD806015822001B0407 /* llfloatergodtools.h */,
-				997B4CD606015822001B0407 /* llfloatergroupinfo.h */,
-				84401E2E0A13CC9A006720A5 /* llfloatergroupinvite.h */,
-				997B4CD406015822001B0407 /* llfloatergroups.h */,
-				997B4CD206015822001B0407 /* llfloaterland.h */,
-				997B4CD106015822001B0407 /* llfloaterlandholdings.h */,
-				997B4CCF06015822001B0407 /* llfloatermap.h */,
-				997B4CCD06015822001B0407 /* llfloatermute.h */,
-				997B4CCC06015822001B0407 /* llfloaternamedesc.h */,
-				A3D968F10A6EBCA7007E8BD2 /* llfloaternewim.h */,
-				997B4CCB06015822001B0407 /* llfloaterpostcard.h */,
-				997B4CCA06015822001B0407 /* llfloaterpreference.h */,
-				997B4CC906015822001B0407 /* llfloaterproperties.h */,
-				9174D2C20653FC3700A7E32B /* llfloaterregioninfo.h */,
-				997B4CC706015822001B0407 /* llfloaterreporter.h */,
-				91E86C3307BD3B6400F56E75 /* llfloatersaveavatar.h */,
-				997B4CC606015822001B0407 /* llfloatersnapshot.h */,
-				1A8BF3790A1AABAD005B9D5A /* llfloatertest.h */,
-				997B4CC506015822001B0407 /* llfloatertools.h */,
-				997B4CC406015822001B0407 /* llfloatertos.h */,
-				997B4CC106015822001B0407 /* llfloaterworldmap.h */,
-				997B4CC006015822001B0407 /* llfolderview.h */,
-				997B4CBF06015822001B0407 /* llframestats.h */,
-				997B4CBE06015822001B0407 /* llframestatview.h */,
-				997B4CBD06015822001B0407 /* llgenepool.h */,
-				91FC1D480652802C009CF498 /* llgesturemgr.h */,
-				997B4CBC06015822001B0407 /* llgivemoney.h */,
-				A3C20E4D0BB0BD37007E872B /* llglslshader.h */,
-				2EFEA8EA09F4557900CB0193 /* llgroupnotify.h */,
-				997B4CBA06015822001B0407 /* llhippo.h */,
-				997B4CB906015822001B0407 /* llhoverview.h */,
-				997B4CB806015822001B0407 /* llhudconnector.h */,
-				997B4CB706015822001B0407 /* llhudeffect.h */,
-				997B4CB606015822001B0407 /* llhudeffectbeam.h */,
-				997B4CB506015822001B0407 /* llhudeffectlookat.h */,
-				997B4CB406015822001B0407 /* llhudeffectpointat.h */,
-				997B4CB306015822001B0407 /* llhudeffecttrail.h */,
-				997B4CB206015822001B0407 /* llhudmanager.h */,
-				997B4CB106015822001B0407 /* llhudobject.h */,
-				997B4CB006015822001B0407 /* llhudrender.h */,
-				997B4CAF06015822001B0407 /* llhudtext.h */,
-				997B4CAE06015822001B0407 /* llhudview.h */,
-				997B4CAC06015822001B0407 /* llimpanel.h */,
-				1AD61F6C0AC09B2600507FB9 /* llimview.h */,
-				A3285A350A71419F00F619A5 /* llinventorybridge.h */,
-				997B4CAB06015822001B0407 /* llinventoryclipboard.h */,
-				997B4CAA06015822001B0407 /* llinventorymodel.h */,
-				997B4CA906015822001B0407 /* llinventoryview.h */,
-				997B4CA806015822001B0407 /* lljoystickbutton.h */,
-				997B4CA506015822001B0407 /* lllandmarklist.h */,
-				997B4CA406015822001B0407 /* lllightconstants.h */,
-				997B4CA106015822001B0407 /* llmanip.h */,
-				997B4CA006015822001B0407 /* llmaniprotate.h */,
-				997B4C9F06015822001B0407 /* llmanipscale.h */,
-				997B4C9E06015822001B0407 /* llmaniptranslate.h */,
-				E34C14750AE6A3FF009BF4DE /* llmapresponders.h */,
-				997B4C9D06015822001B0407 /* llmenucommands.h */,
-				997B4C9906015822001B0407 /* llmorphview.h */,
-				997B4C9806015822001B0407 /* llmoveview.h */,
-				997B4C9706015822001B0407 /* llmutelist.h */,
-				997B4C9606015822001B0407 /* llnamebox.h */,
-				997B4C9506015822001B0407 /* llnameeditor.h */,
-				997B4C9406015822001B0407 /* llnamelistctrl.h */,
-				997B4C9306015822001B0407 /* llnetmap.h */,
-				997B4C9106015822001B0407 /* llnotify.h */,
-				997B4C9006015822001B0407 /* lloverlaybar.h */,
-				997B4C8E06015822001B0407 /* llpanelaudioprefs.h */,
-				997B4C8D06015822001B0407 /* llpanelavatar.h */,
-				99FBB048087363B00048A5CC /* llpanelclassified.h */,
-				997B4C8B06015822001B0407 /* llpanelcontents.h */,
-				997B4C8906015822001B0407 /* llpaneldebug.h */,
-				997B4C8606015822001B0407 /* llpaneldirbrowser.h */,
-				99FBB090087366930048A5CC /* llpaneldirclassified.h */,
-				997B4C8506015822001B0407 /* llpaneldirevents.h */,
-				997B4C8406015822001B0407 /* llpaneldirfind.h */,
-				997B4C8306015822001B0407 /* llpaneldirgroups.h */,
-				997B4C8206015822001B0407 /* llpaneldirland.h */,
-				997B4C8006015822001B0407 /* llpaneldirpeople.h */,
-				997B4C7E06015822001B0407 /* llpaneldirplaces.h */,
-				997B4C7D06015822001B0407 /* llpaneldirpopular.h */,
-				997B4C7C06015822001B0407 /* llpaneldisplay.h */,
-				997B4C7A06015822001B0407 /* llpanelevent.h */,
-				997B4C7906015822001B0407 /* llpanelface.h */,
-				997B4C7706015822001B0407 /* llpanelgeneral.h */,
-				2EFEA8ED09F455C900CB0193 /* llpanelgroup.h */,
-				2EFEA8EF09F4588000CB0193 /* llpanelgroupgeneral.h */,
-				84401E310A13CCB2006720A5 /* llpanelgroupinvite.h */,
-				2EA4CEEE09F83C0B008F60F7 /* llpanelgrouplandmoney.h */,
-				2E6FE90E09FD562D00AF02FF /* llpanelgroupnotices.h */,
-				2EA4CEEF09F83C16008F60F7 /* llpanelgrouproles.h */,
-				997B4C7506015822001B0407 /* llpanelgroupvoting.h */,
-				997B4C7406015822001B0407 /* llpanelinput.h */,
-				997B4C7306015822001B0407 /* llpanelinventory.h */,
-				997B4C7206015822001B0407 /* llpanelland.h */,
-				1A758C970A436FF000589675 /* llpanellandobjects.h */,
-				1A758C980A436FF400589675 /* llpanellandoptions.h */,
-				A3AF6BD00A544F0A005B5E2C /* llpanellogin.h */,
-				997B4C6F06015822001B0407 /* llpanelmorph.h */,
-				9104C0CD0778AE20001EC4F6 /* llpanelmsgs.h */,
-				997B4C6D06015822001B0407 /* llpanelnetwork.h */,
-				997B4C6C06015821001B0407 /* llpanelobject.h */,
-				997B4C6B06015821001B0407 /* llpanelpermissions.h */,
-				997B4C6A06015821001B0407 /* llpanelpick.h */,
-				997B4C6906015821001B0407 /* llpanelplace.h */,
-				997B4C6706015821001B0407 /* llpatchvertexarray.h */,
-				997B4C6506015821001B0407 /* llpolymesh.h */,
-				997B4C6406015821001B0407 /* llpolymorph.h */,
-				1A3143DD0A02B725005B87E7 /* llprefschat.h */,
-				1A3143DC0A02B720005B87E7 /* llprefsim.h */,
-				997B4C6206015821001B0407 /* llpreview.h */,
-				91FC1D4606527FEC009CF498 /* llpreviewgesture.h */,
-				997B4C6106015821001B0407 /* llpreviewlandmark.h */,
-				997B4C6006015821001B0407 /* llpreviewnotecard.h */,
-				997B4C5E06015821001B0407 /* llpreviewscript.h */,
-				997B4C5D06015821001B0407 /* llpreviewsound.h */,
-				997B4C5C06015821001B0407 /* llpreviewtexture.h */,
-				997B4C5A06015821001B0407 /* llprogressview.h */,
-				997B4C5706015821001B0407 /* llregionposition.h */,
-				1A8870E60BCC5AAD00E89AA6 /* llresourcedata.h */,
-				1AFA40B60A2DFD8200C13F70 /* llsavedsettingsglue.h */,
-				997B4C4E06015821001B0407 /* llselectmgr.h */,
-				997B4C4D06015821001B0407 /* llsky.h */,
-				997B4C4706015821001B0407 /* llspatialpartition.h */,
-				997B4C4606015821001B0407 /* llrendersphere.h */,
-				997B4C4406015821001B0407 /* llsprite.h */,
-				91DF402206A739CB00CA7FE5 /* llstartup.h */,
-				997B4C4306015821001B0407 /* llstatbar.h */,
-				997B4C4206015821001B0407 /* llstatgraph.h */,
-				997B4C4106015821001B0407 /* llstatusbar.h */,
-				997B4C4006015821001B0407 /* llstatview.h */,
-				997B4C4B06015821001B0407 /* llsurface.h */,
-				997B4C4A06015821001B0407 /* llsurfacepatch.h */,
-				997B4C3D06015821001B0407 /* lltable.h */,
-				997B4C3B06015821001B0407 /* lltexlayer.h */,
-				997B4C3606015821001B0407 /* lltexturectrl.h */,
-				997B4C3406015821001B0407 /* lltextureview.h */,
-				997B4C3306015821001B0407 /* lltool.h */,
-				997B4C3206015821001B0407 /* lltoolbar.h */,
-				997B4C3006015821001B0407 /* lltoolbrush.h */,
-				997B4C2E06015821001B0407 /* lltoolcomp.h */,
-				997B4C2D06015821001B0407 /* lltooldraganddrop.h */,
-				997B4C2C06015821001B0407 /* lltoolface.h */,
-				997B4C2B06015821001B0407 /* lltoolfocus.h */,
-				997B4C2A06015821001B0407 /* lltoolgrab.h */,
-				997B4C2906015821001B0407 /* lltoolgun.h */,
-				997B4C2806015821001B0407 /* lltoolindividual.h */,
-				997B4C2706015821001B0407 /* lltoolmgr.h */,
-				997B4C2606015821001B0407 /* lltoolmorph.h */,
-				997B4C2506015821001B0407 /* lltoolobjpicker.h */,
-				997B4C2106015821001B0407 /* lltoolpie.h */,
-				997B4C2006015821001B0407 /* lltoolplacer.h */,
-				997B4C1E06015821001B0407 /* lltoolselect.h */,
-				997B4C1D06015821001B0407 /* lltoolselectland.h */,
-				997B4C1C06015821001B0407 /* lltoolselectrect.h */,
-				997B4C1B06015821001B0407 /* lltoolview.h */,
-				997B4C2406015821001B0407 /* lltracker.h */,
-				997B4C1806015821001B0407 /* lluiconstants.h */,
-				997B4C1506015821001B0407 /* lluploaddialog.h */,
-				997B4C1406015821001B0407 /* llurl.h */,
-				997B4C1306015821001B0407 /* lluserauth.h */,
-				997B4C0E06015821001B0407 /* llvelocitybar.h */,
-				997B4C0B06015821001B0407 /* llviewerbuild.h */,
-				997B4C0A06015821001B0407 /* llviewercamera.h */,
-				91DF405006A73E0C00CA7FE5 /* llviewerdisplay.h */,
-				997B4C0906015821001B0407 /* llviewergesture.h */,
-				997B4C0806015821001B0407 /* llviewerimage.h */,
-				997B4C0706015821001B0407 /* llviewerimagelist.h */,
-				997B4C1206015821001B0407 /* llviewerinventory.h */,
-				997B4C1106015821001B0407 /* llviewerjoint.h */,
-				997B4C1006015821001B0407 /* llviewerjointattachment.h */,
-				997B4C0F06015821001B0407 /* llviewerjointmesh.h */,
-				A3C20E4E0BB0BD49007E872B /* llviewerjoystick.h */,
-				997B4C0506015821001B0407 /* llviewerlayer.h */,
-				997B4C0406015821001B0407 /* llviewermenu.h */,
-				997B4C0306015821001B0407 /* llviewermessage.h */,
-				1A3143DB0A02B70E005B87E7 /* llviewernetwork.h */,
-				997B4C0206015821001B0407 /* llviewerobject.h */,
-				997B4C0106015821001B0407 /* llviewerobjectlist.h */,
-				997B4C0006015821001B0407 /* llviewerparcelmgr.h */,
-				997B4BFF06015821001B0407 /* llviewerparceloverlay.h */,
-				997B4BFE06015821001B0407 /* llviewerpartsim.h */,
-				997B4BFD06015821001B0407 /* llviewerpartsource.h */,
-				997B4BFC06015821001B0407 /* llviewerregion.h */,
-				997B4BFA06015821001B0407 /* llviewerstats.h */,
-				997B4BF906015821001B0407 /* llviewertextureanim.h */,
-				997B4BF806015821001B0407 /* llviewerthrottle.h */,
-				997B4BF706015821001B0407 /* llviewervisualparam.h */,
-				997B4BF606015821001B0407 /* llviewerwindow.h */,
-				997B4BF506015821001B0407 /* llvlcomposition.h */,
-				997B4BF406015821001B0407 /* llvlmanager.h */,
-				997B4BF306015821001B0407 /* llvoavatar.h */,
-				997B4BF206015821001B0407 /* llvocache.h */,
-				997B4BF106015821001B0407 /* llvoclouds.h */,
-				997B4BF006015821001B0407 /* llvograss.h */,
-				997B4BEF06015821001B0407 /* llvoground.h */,
-				997B4BED06015821001B0407 /* llvopartgroup.h */,
-				997B4BEC06015821001B0407 /* llvosky.h */,
-				997B4BEB06015821001B0407 /* llvosurfacepatch.h */,
-				997B4BEA06015821001B0407 /* llvotextbubble.h */,
-				997B4BE906015821001B0407 /* llvotree.h */,
-				997B4BE806015821001B0407 /* llvotreenew.h */,
-				997B4BE706015821001B0407 /* llvovolume.h */,
-				997B4BE606015821001B0407 /* llvowater.h */,
-				997B4BE406015821001B0407 /* llwearable.h */,
-				997B4BE306015821001B0407 /* llwearablelist.h */,
-				1AF7C1F20AF6C45000C4BF4A /* llweb.h */,
-				997B4BE206015821001B0407 /* llwind.h */,
-				997B4BE106015821001B0407 /* llwindebug.h */,
-				997B4BE006015821001B0407 /* llworld.h */,
-				997B4BDF06015821001B0407 /* llworldmap.h */,
-				997B4BDE06015821001B0407 /* llworldmapview.h */,
-				997B4BDC06015821001B0407 /* macmain.h */,
-				FD53B3DB09BDE88B00BFE3BC /* macutil_Prefix.h */,
-				997B4BDB06015821001B0407 /* macview_Prefix.h */,
-				997B4BD906015821001B0407 /* noise.h */,
-				997B4BD506015820001B0407 /* pipeline.h */,
-				997B4BD406015820001B0407 /* randgauss.h */,
-				997B4BD106015820001B0407 /* VertexCache.h */,
-			);
-			name = "newview headers";
-			sourceTree = "<group>";
-		};
-		D62830D70B4DC76300F8830F /* llimagej2coj */ = {
-			isa = PBXGroup;
-			children = (
-				D62830D80B4DC76300F8830F /* llimagej2coj.cpp */,
-				D62830D90B4DC76300F8830F /* llimagej2coj.h */,
-			);
-			name = llimagej2coj;
-			path = ../llimagej2coj;
-			sourceTree = "<group>";
-		};
-		D628314D0B4F3FA100F8830F /* llrender */ = {
-			isa = PBXGroup;
-			children = (
-				07167BBA0DCA8059003FE31D /* llrender.cpp */,
-				07167BBB0DCA8059003FE31D /* llrender.h */,
-				A30273550B3A13D800704420 /* llvertexbuffer.cpp */,
-				A30273560B3A13D800704420 /* llvertexbuffer.h */,
-				D628315B0B4F3FA100F8830F /* llfont.cpp */,
-				D628315C0B4F3FA100F8830F /* llfont.h */,
-				D628315D0B4F3FA100F8830F /* llfontgl.cpp */,
-				D628315E0B4F3FA100F8830F /* llfontgl.h */,
-				D628315F0B4F3FA100F8830F /* llgldbg.cpp */,
-				D62831600B4F3FA200F8830F /* llgldbg.h */,
-				D62831610B4F3FA200F8830F /* llimagegl.cpp */,
-				D62831620B4F3FA200F8830F /* llimagegl.h */,
-				D62831640B4F3FA200F8830F /* llvertexprogramgl.cpp */,
-				D62831650B4F3FA200F8830F /* llvertexprogramgl.h */,
-			);
-			name = llrender;
-			path = ../llrender;
-			sourceTree = "<group>";
-		};
-		FDE8746E09BE9C4E00AF6316 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				20286C33FDCF999611CA2CEA /* Carbon.framework */,
-				9985A1270AC1FE4E00579AFB /* AppKit.framework */,
-				26E79A7A0520ED1200A80050 /* AGL.framework */,
-				A3D9691B0A6ED5F6007E8BD2 /* IOKit.framework */,
-				26E79A3D0520B56600A80050 /* OpenGL.framework */,
-				55593DF0053F5C7C0095DD27 /* QuickTime.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		FDE8761809BE9C6500AF6316 /* System Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				FDAA36BA09B919CD00FBF1CA /* libcrypto.dylib */,
-				FD1558B00A06C16C00DE9AE5 /* libiconv.dylib */,
-				FDAA36C209B919F600FBF1CA /* libmx.dylib */,
-				FDAA36B609B919AD00FBF1CA /* libssl.dylib */,
-				FDAA36BE09B919DF00FBF1CA /* libz.dylib */,
-				88A95BC90C14D92C0027E363 /* libresolv.dylib */,
-				26E79A630520BC6D00A80050 /* libSystem.dylib */,
-			);
-			name = "System Libraries";
-			sourceTree = "<group>";
-		};
-		FDE8761909BE9C7D00AF6316 /* Third Party Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				AA38F8FD0D8AFCF4003B39F9 /* libndofdev.dylib */,
-				FE0AEE2C0D2D96D20097256A /* libllmozlib2.dylib */,
-				1C0D59500CF0B2B800222B10 /* libboost_regex-mt.a */,
-				FE43BB860D368B4100C93D63 /* libboost_program_options-mt.a */,
-				AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */,
-				FDD3FD700B6A89A0009173F1 /* libcares.a */,
-				FD34696A0B5C3C55007318E5 /* libllcurl.a */,
-				FDE8764E09BEA39600AF6316 /* libapr-1.a */,
-				FD6C9A5209C773A000AA1849 /* libaprutil-1.a */,
-				FDE8764F09BEA39600AF6316 /* libexpat.a */,
-				FDE8765009BEA39600AF6316 /* libfmod.a */,
-				FDE8765109BEA39600AF6316 /* libfreetype.a */,
-				FDE8765309BEA39600AF6316 /* liblljpeg.a */,
-				FDE8765409BEA39600AF6316 /* libogg.a */,
-				99F998FA0BAA34B90034E41C /* libopenjpeg.a */,
-				FDE8765509BEA39600AF6316 /* libvorbis.a */,
-				88AA282B0C17720D0032DF53 /* libpng12.a */,
-				FDE8765609BEA39600AF6316 /* libvorbisenc.a */,
-				FDE8765709BEA39600AF6316 /* libvorbisfile.a */,
-				FDE8765809BEA39700AF6316 /* libxmlrpc.a */,
-			);
-			name = "Third Party Libraries";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		9967E9050B37533F0087BD1B /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D64593520B3B4D7D00FAB68F /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		5503B89E05446B1F003D051F /* newview */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 999484530883114300EFC621 /* Build configuration list for PBXNativeTarget "newview" */;
-			buildPhases = (
-				5503B8A105446B1F003D051F /* Rez */,
-				5503BB1105446B20003D051F /* Resources */,
-				5579AE0605460A290023A09E /* ShellScript */,
-				5503BB1D05446B20003D051F /* Sources */,
-				5503BCF405446B20003D051F /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				FD53B41009BDFD5300BFE3BC /* PBXTargetDependency */,
-				99CDED6C05E70D850000F8AA /* PBXTargetDependency */,
-				99FCDAE8093D1FC3003D3B63 /* PBXTargetDependency */,
-				99FCDAEC093D1FC8003D3B63 /* PBXTargetDependency */,
-				9967E91C0B3754610087BD1B /* PBXTargetDependency */,
-				D64E29CE0B4B288600963559 /* PBXTargetDependency */,
-			);
-			name = newview;
-			productInstallPath = "$(HOME)/Applications";
-			productName = PROJECTNAME;
-			productReference = 5503BD0705446B20003D051F /* Second Life.app */;
-			productType = "com.apple.product-type.application";
-		};
-		9932ED1E056C1F0900554101 /* crashreporter */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 999484440883114200EFC621 /* Build configuration list for PBXNativeTarget "crashreporter" */;
-			buildPhases = (
-				9932ED1A056C1F0900554101 /* Resources */,
-				9932ED1B056C1F0900554101 /* Sources */,
-				9932ED1D056C1F0900554101 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				FD53B41209BDFD5A00BFE3BC /* PBXTargetDependency */,
-				99CDED7005E70DA20000F8AA /* PBXTargetDependency */,
-			);
-			name = crashreporter;
-			productName = crashreporter;
-			productReference = 9932ED1F056C1F0900554101 /* crashreporter.app */;
-			productType = "com.apple.product-type.application";
-		};
-		9967E9080B37533F0087BD1B /* fmodwrapper */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 9967E90A0B37536D0087BD1B /* Build configuration list for PBXNativeTarget "fmodwrapper" */;
-			buildPhases = (
-				9967E9050B37533F0087BD1B /* Headers */,
-				9967E9060B37533F0087BD1B /* Sources */,
-				9967E9070B37533F0087BD1B /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				9950AF4A0B3762BE007E36E0 /* PBXTargetDependency */,
-			);
-			name = fmodwrapper;
-			productName = fmodwrapper;
-			productReference = 9967E9090B37533F0087BD1B /* libfmodwrapper.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		99CDED4905E70BAB0000F8AA /* llcommon */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 9994843A0883114200EFC621 /* Build configuration list for PBXNativeTarget "llcommon" */;
-			buildPhases = (
-				99CDED4805E70BAB0000F8AA /* Sources */,
-			);
-			buildRules = (
-				99AB96D708833F2A00AA3C8C /* PBXBuildRule */,
-				99AB96D808833FCD00AA3C8C /* PBXBuildRule */,
-			);
-			dependencies = (
-			);
-			name = llcommon;
-			productName = llcommon;
-			productReference = 6192E764074A7CE9005E1F34 /* libllcommon.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		99D5703205BDEFD7004DE704 /* AutoUpdater */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 999484490883114200EFC621 /* Build configuration list for PBXNativeTarget "AutoUpdater" */;
-			buildPhases = (
-				99D5702E05BDEFD7004DE704 /* Resources */,
-				99D5702F05BDEFD7004DE704 /* Sources */,
-				99D5703105BDEFD7004DE704 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				FD53B40C09BDFD3E00BFE3BC /* PBXTargetDependency */,
-				99CDED7205E70DAA0000F8AA /* PBXTargetDependency */,
-			);
-			name = AutoUpdater;
-			productName = AutoUpdater;
-			productReference = 99D5703305BDEFD7004DE704 /* AutoUpdater.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		20286C28FDCF999611CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 999484580883114300EFC621 /* Build configuration list for PBXProject "macview" */;
-			compatibilityVersion = "Xcode 2.4";
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-				Korean,
-			);
-			mainGroup = 20286C29FDCF999611CA2CEA /* PROJECTNAME */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				FD53B40509BDF9F600BFE3BC /* third party libs */,
-				99CDED4905E70BAB0000F8AA /* llcommon */,
-				99D5703205BDEFD7004DE704 /* AutoUpdater */,
-				9932ED1E056C1F0900554101 /* crashreporter */,
-				5503B89E05446B1F003D051F /* newview */,
-				9967E9080B37533F0087BD1B /* fmodwrapper */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		5503BB1105446B20003D051F /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9950AF610B3763DF007E36E0 /* libfmodwrapper.dylib in Resources */,
-				5503BB1205446B20003D051F /* InfoPlist.strings in Resources */,
-				99EDE33705896DC10031B20D /* SecondLife.nib in Resources */,
-				FD53B3C309BDD5F900BFE3BC /* AutoUpdater.app in Resources */,
-				FD53B3C409BDD5FA00BFE3BC /* crashreporter.app in Resources */,
-				99C9FA670B6AD9BF00A1BBA6 /* SLVoice in Resources */,
-				99E63DFF0BCADD2F000C1751 /* libalut.dylib in Resources */,
-				99E63E000BCADD2F000C1751 /* libopenal.dylib in Resources */,
-				99E63E010BCADD2F000C1751 /* libortp.dylib in Resources */,
-				99E63E020BCADD2F000C1751 /* libvivoxsdk.dylib in Resources */,
-				996209690B864D0E00392531 /* SLVoiceAgent.app in Resources */,
-				9930A8E40B8FB10A00197ECA /* language.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		9932ED1A056C1F0900554101 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9928ACA5056D9353003865BE /* CrashReporter.nib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		99D5702E05BDEFD7004DE704 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				990CDBE205C1EA7900739545 /* AutoUpdater.nib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		5503B8A105446B1F003D051F /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		5579AE0605460A290023A09E /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# exit on any error\nset -e\n\n# Check that the message template is compatible\npython ../../scripts/template_verifier.py --mode=\"development\"\n\n# Copy the necessary resources into the build directory.\npython viewer_manifest.py --actions=\"copy\" --configuration=\"${CONFIGURATION}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\n";
-		};
-		FD53B40409BDF9F600BFE3BC /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 12;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Glue together intel and ppc versions of .a files\nLIBS=\"apr-1 aprutil-1 expat ogg vorbis fmod freetype cares llcurl lljpeg png12 openjpeg vorbisenc vorbisfile xmlrpc boost_regex-mt boost_program_options-mt boost_signals-mt\"\nLIBDIR=\"${SRCROOT}/../../libraries\"\n\ncd \"${LIBDIR}\"\n\nif [ \\! -e ppc-darwin ]\nthen\n\tln -s powerpc-darwin ppc-darwin\nfi\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}\"\n\nfor i in ${LIBS}; do\n\tNEED_UPDATE=false\n\tARCH_COUNT=0\n\tOUT=\"${BUILT_PRODUCTS_DIR}/lib$i.a\"\n\tTEST_ARCH=`echo \"${ARCHS}\" | grep i386`\n\tif [ -n \"$TEST_ARCH\" ]; then\n\t\tIN_i386=\"i386-darwin/lib_release/lib$i.a\"\n\t\tARCH_COUNT=`expr $ARCH_COUNT \"+\" 1`\n\t\tif [ \"$IN_i386\" -nt \"$OUT\" ]; then\n\t\t\tNEED_UPDATE=true\n\t\tfi\n\tfi\n\tTEST_ARCH=`echo \"${ARCHS}\" | grep ppc`\n\tif [ -n \"$TEST_ARCH\" ]; then\n\t\tIN_ppc=\"ppc-darwin/lib_release/lib$i.a\"\n\t\tARCH_COUNT=`expr $ARCH_COUNT \"+\" 1`\n\t\tif [ \"$IN_ppc\" -nt \"$OUT\" ]; then\n\t\t\tNEED_UPDATE=true\n\t\tfi\n\tfi\n\tif [ $ARCH_COUNT -eq 0 ]; then\n\t\techo \"No supported architectures found.\"\n\t\texit 1\n\tfi\n\tif [ ! -f \"$OUT\" -o \"$NEED_UPDATE\" != \"false\" ]; then\n\t\techo Preparing third party library lib$i.a\n\t\tif [ $ARCH_COUNT -eq 1 ]; then\n\t\t\tIN=\"$IN_i386\"\"$IN_ppc\"\n\t\t\t#echo cp \"$IN\" \"$OUT\"\n\t\t\tcp \"$IN\" \"$OUT\"\n\t\telse\n\t\t\t#echo libtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\t\t\tlibtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\t\tfi\n\t\tranlib \"$OUT\"\n\telse\n\t\techo Third party library lib$i.a is up to date\n\tfi\ndone\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		5503BB1D05446B20003D051F /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				5503BB1E05446B20003D051F /* llgenepool.cpp in Sources */,
-				5503BB1F05446B20003D051F /* llviewercamera.cpp in Sources */,
-				5503BB2205446B20003D051F /* llvelocitybar.cpp in Sources */,
-				5503BB2405446B20003D051F /* llpanelcontents.cpp in Sources */,
-				5503BB2605446B20003D051F /* llmanip.cpp in Sources */,
-				5503BB2A05446B20003D051F /* lltoolplacer.cpp in Sources */,
-				5503BB2B05446B20003D051F /* lltoolpie.cpp in Sources */,
-				5503BB2C05446B20003D051F /* lltoolbrush.cpp in Sources */,
-				5503BB2E05446B20003D051F /* llstatgraph.cpp in Sources */,
-				5503BB2F05446B20003D051F /* llstatbar.cpp in Sources */,
-				5503BB3405446B20003D051F /* pipeline.cpp in Sources */,
-				5503BB3705446B20003D051F /* noise.cpp in Sources */,
-				5503BB3905446B20003D051F /* llworldmapview.cpp in Sources */,
-				5503BB3A05446B20003D051F /* llworldmap.cpp in Sources */,
-				5503BB3B05446B20003D051F /* llworld.cpp in Sources */,
-				5503BB3C05446B20003D051F /* llwind.cpp in Sources */,
-				5503BB3D05446B20003D051F /* llwearablelist.cpp in Sources */,
-				5503BB3E05446B20003D051F /* llwearable.cpp in Sources */,
-				5503BB4005446B20003D051F /* llvowater.cpp in Sources */,
-				5503BB4105446B20003D051F /* llvovolume.cpp in Sources */,
-				5503BB4305446B20003D051F /* llvotree.cpp in Sources */,
-				5503BB4405446B20003D051F /* llvotextbubble.cpp in Sources */,
-				5503BB4505446B20003D051F /* llvosurfacepatch.cpp in Sources */,
-				5503BB4605446B20003D051F /* llvosky.cpp in Sources */,
-				5503BB4705446B20003D051F /* llvopartgroup.cpp in Sources */,
-				5503BB4905446B20003D051F /* llvoground.cpp in Sources */,
-				5503BB4A05446B20003D051F /* llvograss.cpp in Sources */,
-				5503BB4B05446B20003D051F /* llvoclouds.cpp in Sources */,
-				5503BB4C05446B20003D051F /* llvocache.cpp in Sources */,
-				5503BB4D05446B20003D051F /* llvoavatar.cpp in Sources */,
-				5503BB4E05446B20003D051F /* llvlmanager.cpp in Sources */,
-				5503BB4F05446B20003D051F /* llvlcomposition.cpp in Sources */,
-				5503BB5005446B20003D051F /* llviewerwindow.cpp in Sources */,
-				5503BB5105446B20003D051F /* llviewervisualparam.cpp in Sources */,
-				5503BB5205446B20003D051F /* llviewerthrottle.cpp in Sources */,
-				5503BB5305446B20003D051F /* llviewertextureanim.cpp in Sources */,
-				5503BB5405446B20003D051F /* llviewerstats.cpp in Sources */,
-				5503BB5605446B20003D051F /* llviewerregion.cpp in Sources */,
-				5503BB5705446B20003D051F /* llviewerpartsource.cpp in Sources */,
-				5503BB5805446B20003D051F /* llviewerpartsim.cpp in Sources */,
-				5503BB5905446B20003D051F /* llviewerparceloverlay.cpp in Sources */,
-				5503BB5A05446B20003D051F /* llviewerparcelmgr.cpp in Sources */,
-				5503BB5B05446B20003D051F /* llviewerobjectlist.cpp in Sources */,
-				5503BB5C05446B20003D051F /* llviewerobject.cpp in Sources */,
-				5503BB5D05446B20003D051F /* llviewermessage.cpp in Sources */,
-				5503BB5E05446B20003D051F /* llviewermenu.cpp in Sources */,
-				5503BB5F05446B20003D051F /* llsprite.cpp in Sources */,
-				5503BB6105446B20003D051F /* llrendersphere.cpp in Sources */,
-				5503BB6305446B20003D051F /* llpreviewtexture.cpp in Sources */,
-				5503BB6405446B20003D051F /* llpreviewsound.cpp in Sources */,
-				5503BB6505446B20003D051F /* llspatialpartition.cpp in Sources */,
-				5503BB6705446B20003D051F /* llpanelland.cpp in Sources */,
-				5503BB6805446B20003D051F /* llpanelinventory.cpp in Sources */,
-				5503BB6905446B20003D051F /* lldrawpoolterrain.cpp in Sources */,
-				5503BB6A05446B20003D051F /* llcallbacklist.cpp in Sources */,
-				5503BB6C05446B20003D051F /* llpolymorph.cpp in Sources */,
-				5503BB6D05446B20003D051F /* llpolymesh.cpp in Sources */,
-				5503BB6E05446B20003D051F /* lltoolbar.cpp in Sources */,
-				5503BB6F05446B20003D051F /* lltool.cpp in Sources */,
-				5503BB7005446B20003D051F /* lltextureview.cpp in Sources */,
-				5503BB7205446B20003D051F /* llinventorymodel.cpp in Sources */,
-				5503BB7405446B20003D051F /* lltoolview.cpp in Sources */,
-				5503BB7505446B20003D051F /* lltoolselectrect.cpp in Sources */,
-				5503BB7605446B20003D051F /* lltoolselectland.cpp in Sources */,
-				5503BB7705446B20003D051F /* llpanelgeneral.cpp in Sources */,
-				5503BB7905446B20003D051F /* llpaneldirbrowser.cpp in Sources */,
-				5503BB7C05446B20003D051F /* llfloaterchat.cpp in Sources */,
-				5503BB7D05446B20003D051F /* llconsole.cpp in Sources */,
-				5503BB7E05446B20003D051F /* lllandmarklist.cpp in Sources */,
-				5503BB7F05446B20003D051F /* llfloaterbuildoptions.cpp in Sources */,
-				5503BB8605446B20003D051F /* lluserauth.cpp in Sources */,
-				5503BB8705446B20003D051F /* llurl.cpp in Sources */,
-				5503BB8805446B20003D051F /* lluploaddialog.cpp in Sources */,
-				5503BB8B05446B20003D051F /* lltoolindividual.cpp in Sources */,
-				5503BB8C05446B20003D051F /* lltoolgun.cpp in Sources */,
-				5503BB8D05446B20003D051F /* lltoolgrab.cpp in Sources */,
-				5503BB8E05446B20003D051F /* lldrawpoolsky.cpp in Sources */,
-				5503BB9105446B20003D051F /* llfloaterland.cpp in Sources */,
-				5503BB9205446B20003D051F /* llpanelface.cpp in Sources */,
-				5503BB9305446B20003D051F /* llpanelevent.cpp in Sources */,
-				5503BB9805446B20003D051F /* llframestatview.cpp in Sources */,
-				5503BB9905446B20003D051F /* llframestats.cpp in Sources */,
-				5503BB9E05446B20003D051F /* llhudobject.cpp in Sources */,
-				5503BB9F05446B20003D051F /* llhudmanager.cpp in Sources */,
-				5503BBA005446B20003D051F /* lldrawpoolalpha.cpp in Sources */,
-				5503BBA205446B20003D051F /* lltexturectrl.cpp in Sources */,
-				5503BBA405446B20003D051F /* llpanelobject.cpp in Sources */,
-				5503BBA505446B20003D051F /* llpanelnetwork.cpp in Sources */,
-				5503BBA605446B20003D051F /* lldrawpool.cpp in Sources */,
-				5503BBA905446B20003D051F /* llviewerinventory.cpp in Sources */,
-				5503BBAA05446B20003D051F /* llviewerimagelist.cpp in Sources */,
-				5503BBAB05446B20003D051F /* llviewerimage.cpp in Sources */,
-				5503BBAC05446B20003D051F /* llviewergesture.cpp in Sources */,
-				5503BBAD05446B20003D051F /* llbbox.cpp in Sources */,
-				5503BBAE05446B20003D051F /* llfloatercustomize.cpp in Sources */,
-				5503BBAF05446B20003D051F /* llviewerlayer.cpp in Sources */,
-				5503BBB105446B20003D051F /* llviewerjointmesh.cpp in Sources */,
-				5503BBB205446B20003D051F /* llviewerjointattachment.cpp in Sources */,
-				5503BBB305446B20003D051F /* llviewerjoint.cpp in Sources */,
-				5503BBB405446B20003D051F /* llface.cpp in Sources */,
-				5503BBB505446B20003D051F /* llcloud.cpp in Sources */,
-				5503BBB705446B20003D051F /* llhudview.cpp in Sources */,
-				5503BBB805446B20003D051F /* llhudtext.cpp in Sources */,
-				5503BBB905446B20003D051F /* llmaniprotate.cpp in Sources */,
-				5503BBBA05446B20003D051F /* llagent.cpp in Sources */,
-				5503BBBB05446B20003D051F /* llsurfacepatch.cpp in Sources */,
-				5503BBBC05446B20003D051F /* llsurface.cpp in Sources */,
-				5503BBBE05446B20003D051F /* llpaneldirgroups.cpp in Sources */,
-				5503BBC005446B20003D051F /* llpaneldisplay.cpp in Sources */,
-				5503BBC705446B20003D051F /* lltracker.cpp in Sources */,
-				5503BBC905446B20003D051F /* llhudeffect.cpp in Sources */,
-				5503BBCB05446B20003D051F /* lldrawpoolbump.cpp in Sources */,
-				5503BBCC05446B20003D051F /* llpaneldebug.cpp in Sources */,
-				5503BBCE05446B20003D051F /* llfloaterdirectory.cpp in Sources */,
-				5503BBCF05446B20003D051F /* llinventoryclipboard.cpp in Sources */,
-				5503BBD205446B20003D051F /* llpanelmorph.cpp in Sources */,
-				5503BBD305446B20003D051F /* llfloaterproperties.cpp in Sources */,
-				5503BBD405446B20003D051F /* llhudrender.cpp in Sources */,
-				5503BBD505446B20003D051F /* llagentpilot.cpp in Sources */,
-				5503BBD605446B20003D051F /* lldrawpoolavatar.cpp in Sources */,
-				5503BBD705446B20003D051F /* llpatchvertexarray.cpp in Sources */,
-				5503BBDA05446B20003D051F /* llemote.cpp in Sources */,
-				5503BBDB05446B20003D051F /* llfloatergesture.cpp in Sources */,
-				5503BBDC05446B20003D051F /* lldrawable.cpp in Sources */,
-				5503BBDD05446B20003D051F /* llhudeffecttrail.cpp in Sources */,
-				5503BBDE05446B20003D051F /* llfloatermute.cpp in Sources */,
-				5503BBDF05446B20003D051F /* llmorphview.cpp in Sources */,
-				5503BBE105446B20003D051F /* llfloaterworldmap.cpp in Sources */,
-				5503BBE305446B20003D051F /* llfloaterpreference.cpp in Sources */,
-				5503BBE505446B20003D051F /* lltoolobjpicker.cpp in Sources */,
-				5503BBE605446B20003D051F /* lltoolmorph.cpp in Sources */,
-				5503BBE705446B20003D051F /* lltoolmgr.cpp in Sources */,
-				5503BBE905446B20003D051F /* llfloatergroupinfo.cpp in Sources */,
-				5503BBEA05446B20003D051F /* llpreviewscript.cpp in Sources */,
-				5503BBEB05446B20003D051F /* llpreviewnotecard.cpp in Sources */,
-				5503BBEC05446B20003D051F /* lltoolfocus.cpp in Sources */,
-				5503BBED05446B20003D051F /* lltoolface.cpp in Sources */,
-				5503BBEE05446B20003D051F /* lltooldraganddrop.cpp in Sources */,
-				5503BBEF05446B20003D051F /* lltoolcomp.cpp in Sources */,
-				5503BBF005446B20003D051F /* llcontainerview.cpp in Sources */,
-				5503BBF305446B20003D051F /* lldrawpooltree.cpp in Sources */,
-				5503BBF605446B20003D051F /* llfloatergroups.cpp in Sources */,
-				5503BBFA05446B20003D051F /* llfloaterabout.cpp in Sources */,
-				5503BBFB05446B20003D051F /* llcolorswatch.cpp in Sources */,
-				5503BBFC05446B20003D051F /* lldriverparam.cpp in Sources */,
-				5503BBFD05446B20003D051F /* llhoverview.cpp in Sources */,
-				5503BBFE05446B20003D051F /* llcylinder.cpp in Sources */,
-				5503BBFF05446B20003D051F /* llhippo.cpp in Sources */,
-				5503BC0305446B20003D051F /* llfloateravatarinfo.cpp in Sources */,
-				5503BC0405446B20003D051F /* llcallingcard.cpp in Sources */,
-				5503BC0505446B20003D051F /* llhudeffectbeam.cpp in Sources */,
-				5503BC0605446B20003D051F /* llfloatertos.cpp in Sources */,
-				5503BC0705446B20003D051F /* llfloatertools.cpp in Sources */,
-				5503BC0805446B20003D051F /* llpaneldirfind.cpp in Sources */,
-				5503BC0905446B20003D051F /* llpaneldirevents.cpp in Sources */,
-				5503BC0B05446B20003D051F /* llstatview.cpp in Sources */,
-				5503BC0C05446B20003D051F /* llstatusbar.cpp in Sources */,
-				5503BC0D05446B20003D051F /* lldrawpoolground.cpp in Sources */,
-				5503BC0F05446B20003D051F /* llnetmap.cpp in Sources */,
-				5503BC1005446B20003D051F /* llnamelistctrl.cpp in Sources */,
-				5503BC1205446B20003D051F /* llmaniptranslate.cpp in Sources */,
-				5503BC1305446B20003D051F /* llmanipscale.cpp in Sources */,
-				5503BC1705446B20003D051F /* llfloaternamedesc.cpp in Sources */,
-				5503BC1805446B20003D051F /* llpanelplace.cpp in Sources */,
-				5503BC1905446B20003D051F /* llpanelpermissions.cpp in Sources */,
-				5503BC1A05446B20003D051F /* lldebugview.cpp in Sources */,
-				5503BC1B05446B20003D051F /* llpaneldirplaces.cpp in Sources */,
-				5503BC1C05446B20003D051F /* llpaneldirpeople.cpp in Sources */,
-				5503BC1D05446B20003D051F /* llfolderview.cpp in Sources */,
-				5503BC1E05446B20003D051F /* llglsandbox.cpp in Sources */,
-				5503BC1F05446B20003D051F /* llgivemoney.cpp in Sources */,
-				5503BC2005446B20003D051F /* llcompass.cpp in Sources */,
-				5503BC2105446B20003D051F /* llcolorscheme.cpp in Sources */,
-				5503BC2205446B20003D051F /* llmutelist.cpp in Sources */,
-				5503BC2305446B20003D051F /* llmoveview.cpp in Sources */,
-				5503BC2505446B20003D051F /* llfloatermap.cpp in Sources */,
-				5503BC2705446B20003D051F /* llregionposition.cpp in Sources */,
-				5503BC2B05446B20003D051F /* llpanelavatar.cpp in Sources */,
-				5503BC2C05446B20003D051F /* llpanelaudioprefs.cpp in Sources */,
-				5503BC2D05446B20003D051F /* llfloaterbuy.cpp in Sources */,
-				5503BC2F05446B20003D051F /* lltexlayer.cpp in Sources */,
-				5503BC3305446B20003D051F /* llpreviewlandmark.cpp in Sources */,
-				5503BC3405446B20003D051F /* llpreview.cpp in Sources */,
-				5503BC3605446B20003D051F /* llbox.cpp in Sources */,
-				5503BC3905446B20003D051F /* llfloaterreporter.cpp in Sources */,
-				5503BC3D05446B20003D051F /* llcompilequeue.cpp in Sources */,
-				5503BC3E05446B20003D051F /* llpanelgroupvoting.cpp in Sources */,
-				5503BC4105446B20003D051F /* lldrawpoolsimple.cpp in Sources */,
-				5503BC4205446B20003D051F /* llcubemap.cpp in Sources */,
-				5503BC4305446B20003D051F /* lljoystickbutton.cpp in Sources */,
-				5503BC4805446B20003D051F /* llsky.cpp in Sources */,
-				5503BC4905446B20003D051F /* llselectmgr.cpp in Sources */,
-				5503BC4A05446B20003D051F /* llfilepicker.cpp in Sources */,
-				5503BC4C05446B20003D051F /* llprogressview.cpp in Sources */,
-				5503BC4D05446B20003D051F /* llimpanel.cpp in Sources */,
-				5503BC4E05446B20003D051F /* llmenucommands.cpp in Sources */,
-				5503BC4F05446B20003D051F /* llhudeffectpointat.cpp in Sources */,
-				5503BC5005446B20003D051F /* llhudeffectlookat.cpp in Sources */,
-				5503BCDC05446B20003D051F /* llnameeditor.cpp in Sources */,
-				5503BCDD05446B20003D051F /* llnamebox.cpp in Sources */,
-				5503BCEB05446B20003D051F /* llfeaturemanager.cpp in Sources */,
-				5503BCEC05446B20003D051F /* lldrawpoolwater.cpp in Sources */,
-				5503BCF105446B20003D051F /* llfirstuse.cpp in Sources */,
-				91D530CF056EE55C00CD1AD7 /* lloverlaybar.cpp in Sources */,
-				91D530D3056EE57900CD1AD7 /* llchatbar.cpp in Sources */,
-				9130442B057428D800571B0A /* llfloaterbuycontents.cpp in Sources */,
-				91D61FD1057ED9DF005B4B69 /* llnotify.cpp in Sources */,
-				99EDDF5C05892E720031B20D /* llfloaterlandholdings.cpp in Sources */,
-				91C8C05505922AC100633E8C /* llfloatergodtools.cpp in Sources */,
-				91E36BB805B4C70600C919E4 /* llpanelinput.cpp in Sources */,
-				9131094405C6D5A300A18084 /* llpanelpick.cpp in Sources */,
-				91D2527705C9C0630099BB54 /* llfloaterauction.cpp in Sources */,
-				2613A6DA05D843D80041A7A9 /* llfloatersnapshot.cpp in Sources */,
-				26C5F3E705DB1E3D00994065 /* llfloaterpostcard.cpp in Sources */,
-				990032FD05EC0A9C0035CB09 /* llpaneldirland.cpp in Sources */,
-				9900330105EC0ADD0035CB09 /* llpaneldirpopular.cpp in Sources */,
-				91E7BB2205EFCBA40026CC40 /* llviewerdisplay.cpp in Sources */,
-				91F8BBA4062DF7AB00DE42BA /* llpreviewgesture.cpp in Sources */,
-				91F8BBAC062DF91A00DE42BA /* llgesturemgr.cpp in Sources */,
-				91B9EB8306370586007B3F3E /* lldynamictexture.cpp in Sources */,
-				91B9EC4D06370E4E007B3F3E /* llfloaterimagepreview.cpp in Sources */,
-				916083930649560B00CAF63E /* llfloateranimpreview.cpp in Sources */,
-				918166CC06516C59005727DC /* llaudiosourcevo.cpp in Sources */,
-				91FC1C8806527F19009CF498 /* llpreviewanim.cpp in Sources */,
-				9174D2C10653FC2600A7E32B /* llfloaterregioninfo.cpp in Sources */,
-				912541AE0691FF79008C66F7 /* llfasttimerview.cpp in Sources */,
-				915F492106B572E700F629BF /* lleventnotifier.cpp in Sources */,
-				915F492906B5738A00F629BF /* lleventinfo.cpp in Sources */,
-				919A166006F8F244006E46FB /* llstartup.cpp in Sources */,
-				91CB311606FB584C00DBCE1E /* llfloaterclothing.cpp in Sources */,
-				61923CA5074ADD54005E1F34 /* llsys.cpp in Sources */,
-				61923CEB074AE2CB005E1F34 /* audioengine.cpp in Sources */,
-				61923CEF074AE2CB005E1F34 /* listener.cpp in Sources */,
-				61923CF5074AE2CB005E1F34 /* llaudiodecodemgr.cpp in Sources */,
-				61923CF9074AE2CB005E1F34 /* vorbisdecode.cpp in Sources */,
-				61923CFB074AE2CB005E1F34 /* vorbisencode.cpp in Sources */,
-				61923D47074AE3C0005E1F34 /* llanimationstates.cpp in Sources */,
-				61923D49074AE3C0005E1F34 /* llbvhloader.cpp in Sources */,
-				61923D4B074AE3C0005E1F34 /* llcharacter.cpp in Sources */,
-				61923D4D074AE3C0005E1F34 /* lleditingmotion.cpp in Sources */,
-				61923D4F074AE3C0005E1F34 /* llgesture.cpp in Sources */,
-				61923D51074AE3C0005E1F34 /* llhandmotion.cpp in Sources */,
-				61923D53074AE3C0005E1F34 /* llheadrotmotion.cpp in Sources */,
-				61923D55074AE3C0005E1F34 /* lljoint.cpp in Sources */,
-				61923D57074AE3C0005E1F34 /* lljointsolverrp3.cpp in Sources */,
-				61923D5A074AE3C0005E1F34 /* llkeyframefallmotion.cpp in Sources */,
-				61923D5C074AE3C0005E1F34 /* llkeyframemotion.cpp in Sources */,
-				61923D5E074AE3C0005E1F34 /* llkeyframemotionparam.cpp in Sources */,
-				61923D60074AE3C0005E1F34 /* llkeyframestandmotion.cpp in Sources */,
-				61923D62074AE3C0005E1F34 /* llkeyframewalkmotion.cpp in Sources */,
-				61923D64074AE3C0005E1F34 /* llmotion.cpp in Sources */,
-				61923D66074AE3C0005E1F34 /* llmotioncontroller.cpp in Sources */,
-				61923D68074AE3C0005E1F34 /* llmultigesture.cpp in Sources */,
-				61923D6A074AE3C0005E1F34 /* llpose.cpp in Sources */,
-				61923D6C074AE3C0005E1F34 /* llstatemachine.cpp in Sources */,
-				61923D6E074AE3C0005E1F34 /* lltargetingmotion.cpp in Sources */,
-				61923D70074AE3C0005E1F34 /* llvisualparam.cpp in Sources */,
-				916724C507551DF600CA4513 /* llfloatercolorpicker.cpp in Sources */,
-				911CAD87075BE87B00CD1090 /* llinventoryview.cpp in Sources */,
-				911CAD8B075BE90600CD1090 /* llgroupmgr.cpp in Sources */,
-				911CAD93075BEAAC00CD1090 /* lltoolselect.cpp in Sources */,
-				9104C0CC0778AE0F001EC4F6 /* llpanelmsgs.cpp in Sources */,
-				91287B4C078DE4B300E958B2 /* llviewerkeyboard.cpp in Sources */,
-				913AA1FD079855E900D111CE /* llfloaterfriends.cpp in Sources */,
-				A241CB7D07B3DE0D001A39E3 /* llviewerprecompiledheaders.cpp in Sources */,
-				A241CB9207B3E383001A39E3 /* llmessagethrottle.cpp in Sources */,
-				A241CB9507B3E3A7001A39E3 /* llperlin.cpp in Sources */,
-				99DB67DF07C161A500CF3185 /* llmediaimplquicktime.cpp in Sources */,
-				9118669B07F4FAF700E3D5BC /* llmediaremotectrl.cpp in Sources */,
-				91A155FF081EE7F70089988C /* llfloaterhtml.cpp in Sources */,
-				EB9E831F082AEEF3007B4479 /* llmenugl.cpp in Sources */,
-				EB9E8321082AEEF3007B4479 /* llresmgr.cpp in Sources */,
-				EB9E8323082AEEF3007B4479 /* llui.cpp in Sources */,
-				EB9E8326082AEEF3007B4479 /* lluictrl.cpp in Sources */,
-				EB9E8328082AEEF3007B4479 /* llview.cpp in Sources */,
-				9190431808327117002396D4 /* llfiltersd2xmlrpc.cpp in Sources */,
-				9190431A08327117002396D4 /* lliobuffer.cpp in Sources */,
-				9190431C08327117002396D4 /* lliopipe.cpp in Sources */,
-				9190431E08327117002396D4 /* llpumpio.cpp in Sources */,
-				9190432008327117002396D4 /* llservice.cpp in Sources */,
-				EB3EE6C6083ABB5E002BF676 /* llbutton.cpp in Sources */,
-				EB3EE6C8083ABB5E002BF676 /* llcheckboxctrl.cpp in Sources */,
-				EB3EE6CA083ABB5E002BF676 /* llclipboard.cpp in Sources */,
-				EB3EE6CC083ABB5E002BF676 /* llcombobox.cpp in Sources */,
-				EB3EE6CE083ABB5E002BF676 /* lldraghandle.cpp in Sources */,
-				EB3EE6D0083ABB5E002BF676 /* llfloater.cpp in Sources */,
-				EB3EE6D2083ABB5E002BF676 /* llfocusmgr.cpp in Sources */,
-				EB3EE6D4083ABB5E002BF676 /* lliconctrl.cpp in Sources */,
-				EB3EE6D6083ABB5E002BF676 /* llkeywords.cpp in Sources */,
-				EB3EE6D8083ABB5E002BF676 /* lllineeditor.cpp in Sources */,
-				EB3EE6DA083ABB5E002BF676 /* llpanel.cpp in Sources */,
-				EB3EE6DC083ABB5E002BF676 /* llradiogroup.cpp in Sources */,
-				EB3EE6DE083ABB5E002BF676 /* llresizebar.cpp in Sources */,
-				EB3EE6E0083ABB5E002BF676 /* llresizehandle.cpp in Sources */,
-				EB3EE6E2083ABB5E002BF676 /* llscrollbar.cpp in Sources */,
-				EB3EE6E4083ABB5E002BF676 /* llscrollcontainer.cpp in Sources */,
-				EB3EE6E6083ABB5E002BF676 /* llscrolllistctrl.cpp in Sources */,
-				EB3EE6E8083ABB5E002BF676 /* llslider.cpp in Sources */,
-				EB3EE6EA083ABB5E002BF676 /* llsliderctrl.cpp in Sources */,
-				EB3EE6EC083ABB5E002BF676 /* llspinctrl.cpp in Sources */,
-				EB3EE6EE083ABB5E002BF676 /* llstyle.cpp in Sources */,
-				EB3EE6F0083ABB5E002BF676 /* lltabcontainer.cpp in Sources */,
-				EB3EE6F2083ABB5E002BF676 /* lltabcontainervertical.cpp in Sources */,
-				EB3EE6F4083ABB5E002BF676 /* lltextbox.cpp in Sources */,
-				EB3EE6F8083ABB5E002BF676 /* lltexteditor.cpp in Sources */,
-				EB3EE6FA083ABB5E002BF676 /* lluictrlfactory.cpp in Sources */,
-				EB3EE6FC083ABB5E002BF676 /* llviewborder.cpp in Sources */,
-				EB3EE720083AC23D002BF676 /* llviewertexteditor.cpp in Sources */,
-				1A9EC237083EA0100023D510 /* llfloatereditui.cpp in Sources */,
-				1AE5D7120844FBD300278605 /* llwebbrowserctrl.cpp in Sources */,
-				1A1C61620847AEE6005D7227 /* llvolumemgr.cpp in Sources */,
-				1A1C61630847AEE6005D7227 /* llvolume.cpp in Sources */,
-				1A1C61760847B307005D7227 /* llvolumemessage.cpp in Sources */,
-				EBAAFE180858EBA400B9269A /* llxmlnode.cpp in Sources */,
-				1A47B8E00860FDF100F73746 /* llpanelweb.cpp in Sources */,
-				99FBB045087362B60048A5CC /* llpanelclassified.cpp in Sources */,
-				99FBB08F087366780048A5CC /* llpaneldirclassified.cpp in Sources */,
-				991ED2E00883646B003EC818 /* llclassifiedinfo.cpp in Sources */,
-				1A89230508B12D1000A04AA9 /* llurlwhitelist.cpp in Sources */,
-				1A89230808B12D2E00A04AA9 /* llfloateropenobject.cpp in Sources */,
-				93AE41C708F483C900141675 /* llalertdialog.cpp in Sources */,
-				93AE41C808F483C900141675 /* llmodaldialog.cpp in Sources */,
-				99E43511092D64A4003AE728 /* llfloaterbuycurrency.cpp in Sources */,
-				99E43514092D64CC003AE728 /* llmemoryview.cpp in Sources */,
-				99E43517092D64E6003AE728 /* llvoinventorylistener.cpp in Sources */,
-				99FCDD0709476389003D3B63 /* audioengine_fmod.cpp in Sources */,
-				99FCDD080947638A003D3B63 /* listener_fmod.cpp in Sources */,
-				99BB5168099ABDEB004BF9F2 /* llfloaterbuyland.cpp in Sources */,
-				99BB516B099AC1AE004BF9F2 /* llxmlrpctransaction.cpp in Sources */,
-				99BB516F099AC1E9004BF9F2 /* llviewchildren.cpp in Sources */,
-				99BB5172099AC1FC004BF9F2 /* llcurrencyuimanager.cpp in Sources */,
-				99BB5176099AC2A4004BF9F2 /* llconfirmationmanager.cpp in Sources */,
-				FD6C9A2909C758BC00AA1849 /* llfloaterscriptdebug.cpp in Sources */,
-				FD6C9A2A09C758BC00AA1849 /* llfloatertelehub.cpp in Sources */,
-				FD6C9A2B09C758BC00AA1849 /* llfollowcam.cpp in Sources */,
-				FD6C9A2C09C758BC00AA1849 /* llhudicon.cpp in Sources */,
-				FD6C9A3609C75A8500AA1849 /* llfloaterpermissionsmgr.cpp in Sources */,
-				FD6C9A4409C75B8900AA1849 /* llfloatertopobjects.cpp in Sources */,
-				2EFEA8E909F4556F00CB0193 /* llgroupnotify.cpp in Sources */,
-				2EFEA8EC09F455B900CB0193 /* llpanelgroup.cpp in Sources */,
-				2EFEA8F109F4588B00CB0193 /* llpanelgroupgeneral.cpp in Sources */,
-				2EA4CF0809F8531C008F60F7 /* llpanelgrouplandmoney.cpp in Sources */,
-				2EA4CF0909F8531C008F60F7 /* llpanelgrouproles.cpp in Sources */,
-				2E6FE91009FD56DB00AF02FF /* llpanelgroupnotices.cpp in Sources */,
-				9CD49D5709D0BAC100192434 /* llflexibleobject.cpp in Sources */,
-				A3077C0B09DCB8140059ED75 /* llpanelvolume.cpp in Sources */,
-				1AFA409C0A2DFC7F00C13F70 /* llviewernetwork.cpp in Sources */,
-				1AFA409F0A2DFC8700C13F70 /* llprefsim.cpp in Sources */,
-				1AFA40A20A2DFC9000C13F70 /* llprefschat.cpp in Sources */,
-				1AFA40A50A2DFC9400C13F70 /* llfloatertest.cpp in Sources */,
-				1AFA40B50A2DFD7200C13F70 /* llsavedsettingsglue.cpp in Sources */,
-				AA0E2A610A2FDAEE0066250A /* llcontrol.cpp in Sources */,
-				AA0E2A640A2FDB340066250A /* lltoolpipette.cpp in Sources */,
-				AAA1336B0A3F94D000419F7C /* lluistring.cpp in Sources */,
-				1A758C920A436FCA00589675 /* llagentdata.cpp in Sources */,
-				1A758C940A436FD800589675 /* llpanellandobjects.cpp in Sources */,
-				1A758C960A436FDE00589675 /* llpanellandoptions.cpp in Sources */,
-				A3AF6BCB0A544C71005B5E2C /* llevent.cpp in Sources */,
-				A3AF6BCF0A544EF0005B5E2C /* llpanellogin.cpp in Sources */,
-				1A61A7F00A5ED446009FE3D2 /* llfloateravatarpicker.cpp in Sources */,
-				A3D969160A6ED4CB007E8BD2 /* llfloaternewim.cpp in Sources */,
-				1A5B3B550A70147000A90391 /* llfloaterbump.cpp in Sources */,
-				A3285A360A7141A200F619A5 /* llinventorybridge.cpp in Sources */,
-				A3285A3B0A71425A00F619A5 /* llinventoryactions.cpp in Sources */,
-				AAEAAF270A8104D8005F0707 /* llscrollingpanellist.cpp in Sources */,
-				9C1853AE0A91175E00DA7B01 /* llviewercontrol.cpp in Sources */,
-				84401E2F0A13CC9A006720A5 /* llfloatergroupinvite.cpp in Sources */,
-				84401E320A13CCB2006720A5 /* llpanelgroupinvite.cpp in Sources */,
-				AAC121A50A93A8380080E8A9 /* llfloatersellland.cpp in Sources */,
-				1A5104450ABF5B5A00520F6D /* llnotecard.cpp in Sources */,
-				1A5104570ABF60A800520F6D /* llviewerassetstorage.cpp in Sources */,
-				1AD61F6B0AC09B1900507FB9 /* llimview.cpp in Sources */,
-				9B39350D0AD6F96900F57245 /* llhttpclient.cpp in Sources */,
-				9B3935110AD6F9F400F57245 /* llurlrequest.cpp in Sources */,
-				E34C14740AE6A3F0009BF4DE /* llmapresponders.cpp in Sources */,
-				1AF9CA470AE972DA003EFF2D /* llfloateravatartextures.cpp in Sources */,
-				299F95C00ADDE5D000C94EEF /* llviewquery.cpp in Sources */,
-				C64F673F0AFBED80009732B5 /* lllogchat.cpp in Sources */,
-				C64F67420AFBED91009732B5 /* lldirpicker.cpp in Sources */,
-				1AF7C1E40AF6C44800C4BF4A /* llweb.cpp in Sources */,
-				AA02B9BC0B0CE44D00F2996D /* lltexturefetch.cpp in Sources */,
-				FD59ED5F0AF2AF460086642A /* llassetuploadresponders.cpp in Sources */,
-				FDCB54F60AFBC5060033B433 /* llhttpnode.cpp in Sources */,
-				FDCB55290AFBD4310033B433 /* lleventpoll.cpp in Sources */,
-				AA348DFA0B0EAB31002C3015 /* llcurl.cpp in Sources */,
-				AAF5FFD20B13F71900D28A84 /* lltexturecache.cpp in Sources */,
-				C1F5D0A50B138AEB00827F1D /* lluserrelations.cpp in Sources */,
-				D62830DB0B4DC76300F8830F /* llimagej2coj.cpp in Sources */,
-				AAE98CC20B38FE0800E2F204 /* llimageworker.cpp in Sources */,
-				1AEF0A580B2DFE67003F107C /* llctrlselectioninterface.cpp in Sources */,
-				1AEF0A5B0B2DFE72003F107C /* llrootview.cpp in Sources */,
-				A30273570B3A13D800704420 /* llvertexbuffer.cpp in Sources */,
-				1A1F130C0B3919F100845A6C /* lleditmenuhandler.cpp in Sources */,
-				993A3E050B546D47007A0790 /* llvoiceclient.cpp in Sources */,
-				C16C08500B4AE6C7009AD67F /* llfloaterinspect.cpp in Sources */,
-				A32748C10B5F38A80099BE18 /* llfont.cpp in Sources */,
-				A32748BF0B5F38A00099BE18 /* llfontgl.cpp in Sources */,
-				A32748C00B5F38A20099BE18 /* llimagegl.cpp in Sources */,
-				1A02016F0B7A85DE00D5C589 /* llbase64.cpp in Sources */,
-				1A0201850B7A861200D5C589 /* llblowfishcipher.cpp in Sources */,
-				1A0201860B7A861200D5C589 /* llnullcipher.cpp in Sources */,
-				1A0201870B7A861200D5C589 /* llxorcipher.cpp in Sources */,
-				9956CAFD0B96679C00F58C6D /* llprefsvoice.cpp in Sources */,
-				D8CA570F0BAF74FC0093D6D4 /* llvoicevisualizer.cpp in Sources */,
-				1A83767E0BA2169600F28979 /* llviewergenericmessage.cpp in Sources */,
-				38D0FA6C0B4BF898003323BA /* lltemplatemessagebuilder.cpp in Sources */,
-				38D0FA6D0B4BF898003323BA /* llmessagetemplate.cpp in Sources */,
-				38D0FA6E0B4BF898003323BA /* llmessagebuilder.cpp in Sources */,
-				3834D6050B73ABC1002B61C8 /* llmessagereader.cpp in Sources */,
-				3834D6060B73ABC1002B61C8 /* lltemplatemessagereader.cpp in Sources */,
-				DA4B141B0B978815003F64DE /* llhttpsender.cpp in Sources */,
-				DA4B141C0B978815003F64DE /* llsdmessagebuilder.cpp in Sources */,
-				DA4B141D0B978815003F64DE /* llsdmessagereader.cpp in Sources */,
-				9C18425B0B9F951500208356 /* llcaphttpsender.cpp in Sources */,
-				9C659A870BAB0B6E00D2EB60 /* llmessageconfig.cpp in Sources */,
-				A3C20E4A0BB0BCDF007E872B /* llglslshader.cpp in Sources */,
-				A3C20E4C0BB0BD12007E872B /* llviewerjoystick.cpp in Sources */,
-				D8EAB8B60BE7B3D10067DBB3 /* llfloateractivespeakers.cpp in Sources */,
-				D8EAB8BA0BE7B4490067DBB3 /* llvoiceremotectrl.cpp in Sources */,
-				1A8870D50BCC5A6300E89AA6 /* llinventorytype.cpp in Sources */,
-				1A8870E50BCC5A9500E89AA6 /* llviewermenufile.cpp in Sources */,
-				D6B766800BFE8E9B00DC8153 /* llfloaterchatterbox.cpp in Sources */,
-				AA1183500C1DF9C400FDE5BA /* llpanelaudiovolume.cpp in Sources */,
-				9CC280FF0BE79737006D8BDC /* llmessagetemplateparser.cpp in Sources */,
-				88A95BB20C14D5FC0027E363 /* llsrv.cpp in Sources */,
-				8833693F0C18AF33007F52DA /* llimagepng.cpp in Sources */,
-				883369400C18AF33007F52DA /* llpngwrapper.cpp in Sources */,
-				1A0DA5130C3AC07800361F49 /* llviewerjointmesh_vec.cpp in Sources */,
-				1A0DA5140C3AC07800361F49 /* llviewerjointmesh_sse2.cpp in Sources */,
-				1A0DA5150C3AC07800361F49 /* llviewerjointmesh_sse.cpp in Sources */,
-				D23289B50C453A3600304FEF /* llfloaterreleasemsg.cpp in Sources */,
-				8849626C0C7B3E8A00A777FB /* llares.cpp in Sources */,
-				1AD394100CAB000F004BA76A /* llurlsimstring.cpp in Sources */,
-				1AD394110CAB000F004BA76A /* llurldispatcher.cpp in Sources */,
-				1AD394130CAB001B004BA76A /* llcommandhandler.cpp in Sources */,
-				1AA2EE9E0CBBE2790017E185 /* llfloaterlandmark.cpp in Sources */,
-				1AA2EEA10CBBE28C0017E185 /* llclassifiedstatsresponder.cpp in Sources */,
-				1AA2EEA40CBBE2BF0017E185 /* llfloaterurldisplay.cpp in Sources */,
-				1AA2EEA70CBBE2D40017E185 /* llremoteparcelrequest.cpp in Sources */,
-				FE5138790CD80BAE00F32EE3 /* lldebugmessagebox.cpp in Sources */,
-				FE51387B0CD80BAE00F32EE3 /* llfloaterclassified.cpp in Sources */,
-				FE51387C0CD80BAE00F32EE3 /* llfloaterevent.cpp in Sources */,
-				FE51387D0CD80BAE00F32EE3 /* llfloaterparcel.cpp in Sources */,
-				FE679A3D0CDFF5AC00959041 /* llappviewer.cpp in Sources */,
-				FE679A3E0CDFF5AC00959041 /* llappviewermacosx.cpp in Sources */,
-				FE679A3F0CDFF5AC00959041 /* llvectorperfoptions.cpp in Sources */,
-				FE679A400CDFF5AC00959041 /* llvieweraudio.cpp in Sources */,
-				D2768CE50CEA38940000BD66 /* llfloaterlagmeter.cpp in Sources */,
-				FE42C3140D231D1A00D9F143 /* llcommandlineparser.cpp in Sources */,
-				C19628F50D53D7AB007C909A /* llfloatersettingsdebug.cpp in Sources */,
-				FEE6C82D0D2D6DAC00C97E9C /* llmediaimplcommon.cpp in Sources */,
-				FEE6C82E0D2D6DAC00C97E9C /* llmediaimplexample1.cpp in Sources */,
-				FEE6C82F0D2D6DAC00C97E9C /* llmediaimplexample2.cpp in Sources */,
-				FEE6C8300D2D6DAC00C97E9C /* llmediaimplfactory.cpp in Sources */,
-				FEE6C8310D2D6DAC00C97E9C /* llmediaimplgstreamer.cpp in Sources */,
-				FEE6C8320D2D6DAC00C97E9C /* llmediaimplgstreamer_syms.cpp in Sources */,
-				FEE6C8360D2D6DAC00C97E9C /* llmediaimplgstreamervidplug.cpp in Sources */,
-				FEE6C8370D2D6DAC00C97E9C /* llmediaimplllmozlib.cpp in Sources */,
-				FEE6C8380D2D6DAC00C97E9C /* llmediamanager.cpp in Sources */,
-				FEE6C8490D2D6E1500C97E9C /* llfloaterhtmlhelp.cpp in Sources */,
-				FEE6C84A0D2D6E1500C97E9C /* llfloaterurlentry.cpp in Sources */,
-				FEE6C84B0D2D6E1500C97E9C /* llmimetypes.cpp in Sources */,
-				FEE6C84C0D2D6E1500C97E9C /* llpanellandmedia.cpp in Sources */,
-				FEE6C84D0D2D6E1500C97E9C /* llurlhistory.cpp in Sources */,
-				FEE6C84E0D2D6E1500C97E9C /* llviewermedia.cpp in Sources */,
-				FEE6C84F0D2D6E1500C97E9C /* llviewerparcelmedia.cpp in Sources */,
-				FEE6C8500D2D6E1500C97E9C /* llviewerparcelmediaautoplay.cpp in Sources */,
-				FE0AEE4D0D2D9C6E0097256A /* llparcelselection.cpp in Sources */,
-				A2A8C5480C649EE20001FEB2 /* llmultislider.cpp in Sources */,
-				A2A8C5490C649EE20001FEB2 /* llmultisliderctrl.cpp in Sources */,
-				A2A8C5600C649F490001FEB2 /* lldrawpoolwlsky.cpp in Sources */,
-				A2A8C5610C649F490001FEB2 /* llfloaterdaycycle.cpp in Sources */,
-				A2A8C5620C649F490001FEB2 /* llfloaterpostprocess.cpp in Sources */,
-				A2A8C5640C649F490001FEB2 /* llfloaterwindlight.cpp in Sources */,
-				A2A8C5650C649F490001FEB2 /* llpostprocess.cpp in Sources */,
-				A2A8C5660C649F490001FEB2 /* llvowlsky.cpp in Sources */,
-				A2A8C5670C649F490001FEB2 /* llwlanimator.cpp in Sources */,
-				A2A8C5680C649F490001FEB2 /* llwldaycycle.cpp in Sources */,
-				A2A8C5690C649F490001FEB2 /* llwlparammanager.cpp in Sources */,
-				A2A8C56A0C649F490001FEB2 /* llwlparamset.cpp in Sources */,
-				07167BBC0DCA8059003FE31D /* llrender.cpp in Sources */,
-				1CBB67D80C7CCCB2007DAAAE /* llfloaterwater.cpp in Sources */,
-				1CBB67D90C7CCCB2007DAAAE /* llwaterparammanager.cpp in Sources */,
-				1CBB67DA0C7CCCB2007DAAAE /* llwaterparamset.cpp in Sources */,
-				1CFFA2D60C90472B000CF7DD /* llfloaterenvsettings.cpp in Sources */,
-				1CFFA2ED0C9048D7000CF7DD /* llrendertarget.cpp in Sources */,
-				A26560520C9F53CC004042A0 /* llfloaterhardwaresettings.cpp in Sources */,
-				D1CA83CE0D62634400C61743 /* llfloaterstats.cpp in Sources */,
-				1ADE58940D7CCF6000183F7F /* llfloaterhud.cpp in Sources */,
-				FE065EA40D8B0EE60089E9F1 /* llwatchdog.cpp in Sources */,
-				FE065EA50D8B0EE60089E9F1 /* llwindebug.cpp in Sources */,
-				CB0873B60D62226B009600F8 /* lldelayedgestureerror.cpp in Sources */,
-				1A531BFC0D81056E00DEB305 /* llfloatercamera.cpp in Sources */,
-				D1BB623D0D91BBEC00001516 /* llfloatervoicedevicesettings.cpp in Sources */,
-				AA38F8F20D8A3687003B39F9 /* llfloaterjoystick.cpp in Sources */,
-				1AE0820F0DA708E900575141 /* llanimstatelabels.cpp in Sources */,
-				1AE082100DA708E900575141 /* llstylemap.cpp in Sources */,
-				1AE082110DA708E900575141 /* lltrans.cpp in Sources */,
-				79ED67F20E197D67003D1E78 /* llpanelskins.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		9932ED1B056C1F0900554101 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				C1E4A5F70CC0226A005FB0A6 /* llxmltree.cpp in Sources */,
-				C1E4A5F80CC0226A005FB0A6 /* llxmlnode.cpp in Sources */,
-				C1E4A5F90CC0226A005FB0A6 /* llcontrol.cpp in Sources */,
-				C1E4A5FA0CC0226A005FB0A6 /* llxmlparser.cpp in Sources */,
-				C1E4A57B0CC02160005FB0A6 /* lldate.cpp in Sources */,
-				C1E4A57C0CC02160005FB0A6 /* llthread.cpp in Sources */,
-				C1E4A57D0CC02160005FB0A6 /* u64.cpp in Sources */,
-				C1E4A57E0CC02160005FB0A6 /* llerror.cpp in Sources */,
-				C1E4A57F0CC02160005FB0A6 /* llstreamtools.cpp in Sources */,
-				C1E4A5800CC02160005FB0A6 /* llapp.cpp in Sources */,
-				C1E4A5810CC02160005FB0A6 /* llfasttimer.cpp in Sources */,
-				C1E4A5820CC02160005FB0A6 /* llfixedbuffer.cpp in Sources */,
-				C1E4A5830CC02160005FB0A6 /* llstat.cpp in Sources */,
-				C1E4A5840CC02160005FB0A6 /* llmemory.cpp in Sources */,
-				C1E4A5850CC02160005FB0A6 /* llsd.cpp in Sources */,
-				C1E4A5860CC02160005FB0A6 /* llcommon.cpp in Sources */,
-				C1E4A5870CC02160005FB0A6 /* llares.cpp in Sources */,
-				C1E4A5880CC02160005FB0A6 /* llbase32.cpp in Sources */,
-				C1E4A5890CC02160005FB0A6 /* llbase64.cpp in Sources */,
-				C1E4A58A0CC02160005FB0A6 /* llmortician.cpp in Sources */,
-				C1E4A58B0CC02160005FB0A6 /* llprocessor.cpp in Sources */,
-				C1E4A58C0CC02160005FB0A6 /* llformat.cpp in Sources */,
-				C1E4A58D0CC02160005FB0A6 /* llsecondlifeurls.cpp in Sources */,
-				C1E4A58E0CC02160005FB0A6 /* llstringtable.cpp in Sources */,
-				C1E4A58F0CC02160005FB0A6 /* llsdutil.cpp in Sources */,
-				C1E4A5900CC02160005FB0A6 /* llstring.cpp in Sources */,
-				C1E4A5910CC02160005FB0A6 /* lluri.cpp in Sources */,
-				C1E4A5930CC02160005FB0A6 /* llapr.cpp in Sources */,
-				C1E4A5940CC02160005FB0A6 /* llworkerthread.cpp in Sources */,
-				C1E4A5960CC02160005FB0A6 /* llerrorthread.cpp in Sources */,
-				C1E4A5970CC02160005FB0A6 /* llsdserialize.cpp in Sources */,
-				C1E4A5980CC02160005FB0A6 /* llrun.cpp in Sources */,
-				C1E4A59A0CC02160005FB0A6 /* llframetimer.cpp in Sources */,
-				C1E4A59B0CC02160005FB0A6 /* llmemorystream.cpp in Sources */,
-				C1E4A59C0CC02160005FB0A6 /* metaproperty.cpp in Sources */,
-				C1E4A59D0CC02160005FB0A6 /* llfile.cpp in Sources */,
-				C1E4A59E0CC02160005FB0A6 /* llcriticaldamp.cpp in Sources */,
-				C1E4A59F0CC02160005FB0A6 /* llsdserialize_xml.cpp in Sources */,
-				C1E4A5A00CC02160005FB0A6 /* metaclass.cpp in Sources */,
-				C1E4A5A10CC02160005FB0A6 /* reflective.cpp in Sources */,
-				C1E4A5A20CC02160005FB0A6 /* llsys.cpp in Sources */,
-				C1E4A5A30CC02160005FB0A6 /* llassettype.cpp in Sources */,
-				C1E4A5A40CC02160005FB0A6 /* lltimer.cpp in Sources */,
-				C1E4A5A50CC02160005FB0A6 /* timing.cpp in Sources */,
-				C1E4A5A60CC02160005FB0A6 /* llliveappconfig.cpp in Sources */,
-				C1E4A5A70CC0216F005FB0A6 /* llnullcipher.cpp in Sources */,
-				C1E4A5A80CC0216F005FB0A6 /* llurlrequest.cpp in Sources */,
-				C1E4A5AA0CC0216F005FB0A6 /* lltransfersourceasset.cpp in Sources */,
-				C1E4A5AB0CC0216F005FB0A6 /* llhost.cpp in Sources */,
-				C1E4A5AC0CC0216F005FB0A6 /* llmessageconfig.cpp in Sources */,
-				C1E4A5AD0CC0216F005FB0A6 /* partsyspacket.cpp in Sources */,
-				C1E4A5AE0CC0216F005FB0A6 /* lltemplatemessagebuilder.cpp in Sources */,
-				C1E4A5AF0CC0216F005FB0A6 /* message.cpp in Sources */,
-				C1E4A5B00CC0216F005FB0A6 /* llbufferstream.cpp in Sources */,
-				C1E4A5B10CC0216F005FB0A6 /* llhttpnode.cpp in Sources */,
-				C1E4A5B20CC0216F005FB0A6 /* lltransfersourcefile.cpp in Sources */,
-				C1E4A5B30CC0216F005FB0A6 /* llchainio.cpp in Sources */,
-				C1E4A5B40CC0216F005FB0A6 /* llhttpclient.cpp in Sources */,
-				C1E4A5B50CC0216F005FB0A6 /* llxfer.cpp in Sources */,
-				C1E4A5B60CC0216F005FB0A6 /* network.cpp in Sources */,
-				C1E4A5B70CC0216F005FB0A6 /* llpacketring.cpp in Sources */,
-				C1E4A5B80CC0216F005FB0A6 /* llxfer_vfile.cpp in Sources */,
-				C1E4A5B90CC0216F005FB0A6 /* llsdmessagereader.cpp in Sources */,
-				C1E4A5BA0CC0216F005FB0A6 /* llxfermanager.cpp in Sources */,
-				C1E4A5BB0CC0216F005FB0A6 /* llmessagethrottle.cpp in Sources */,
-				C1E4A5BC0CC0216F005FB0A6 /* llsdmessagebuilder.cpp in Sources */,
-				C1E4A5BD0CC0216F005FB0A6 /* message_string_table.cpp in Sources */,
-				C1E4A5BE0CC0216F005FB0A6 /* message_prehash.cpp in Sources */,
-				C1E4A5BF0CC0216F005FB0A6 /* llmessagetemplate.cpp in Sources */,
-				C1E4A5C00CC0216F005FB0A6 /* llxfer_file.cpp in Sources */,
-				C1E4A5C10CC0216F005FB0A6 /* llmime.cpp in Sources */,
-				C1E4A5C20CC0216F005FB0A6 /* llmessagereader.cpp in Sources */,
-				C1E4A5C30CC0216F005FB0A6 /* patch_idct.cpp in Sources */,
-				C1E4A5C40CC0216F005FB0A6 /* lliosocket.cpp in Sources */,
-				C1E4A5C50CC0216F005FB0A6 /* llcachename.cpp in Sources */,
-				C1E4A5C60CC0216F005FB0A6 /* llblowfishcipher.cpp in Sources */,
-				C1E4A5C70CC0216F005FB0A6 /* llpacketbuffer.cpp in Sources */,
-				C1E4A5C80CC0216F005FB0A6 /* llmessagetemplateparser.cpp in Sources */,
-				C1E4A5C90CC0216F005FB0A6 /* llbuffer.cpp in Sources */,
-				C1E4A5CA0CC0216F005FB0A6 /* llcurl.cpp in Sources */,
-				C1E4A5CB0CC0216F005FB0A6 /* llxorcipher.cpp in Sources */,
-				C1E4A5CC0CC0216F005FB0A6 /* llnamevalue.cpp in Sources */,
-				C1E4A5CD0CC0216F005FB0A6 /* lliobuffer.cpp in Sources */,
-				C1E4A5CE0CC0216F005FB0A6 /* llpartdata.cpp in Sources */,
-				C1E4A5CF0CC0216F005FB0A6 /* llfiltersd2xmlrpc.cpp in Sources */,
-				C1E4A5D00CC0216F005FB0A6 /* net.cpp in Sources */,
-				C1E4A5D10CC0216F005FB0A6 /* llxfer_mem.cpp in Sources */,
-				C1E4A5D20CC0216F005FB0A6 /* llthrottle.cpp in Sources */,
-				C1E4A5920CC02160005FB0A6 /* llevent.cpp in Sources */,
-				C1E4A5D40CC0216F005FB0A6 /* llinstantmessage.cpp in Sources */,
-				C1E4A5D50CC0216F005FB0A6 /* llmessagebuilder.cpp in Sources */,
-				C1E4A5D60CC0216F005FB0A6 /* lldatapacker.cpp in Sources */,
-				C1E4A5D70CC0216F005FB0A6 /* patch_code.cpp in Sources */,
-				C1E4A5D80CC0216F005FB0A6 /* llservice.cpp in Sources */,
-				C1E4A5D90CC0216F005FB0A6 /* llclassifiedflags.cpp in Sources */,
-				C1E4A5DA0CC0216F005FB0A6 /* patch_dct.cpp in Sources */,
-				C1E4A5DB0CC0216F005FB0A6 /* lltransfertargetvfile.cpp in Sources */,
-				C1E4A5DC0CC0216F005FB0A6 /* lltemplatemessagereader.cpp in Sources */,
-				C1E4A5DD0CC0216F005FB0A6 /* llassetstorage.cpp in Sources */,
-				C1E4A5DE0CC0216F005FB0A6 /* lldispatcher.cpp in Sources */,
-				C1E4A5DF0CC0216F005FB0A6 /* llpacketack.cpp in Sources */,
-				C1E4A5E00CC0216F005FB0A6 /* llcircuit.cpp in Sources */,
-				C1E4A5E10CC0216F005FB0A6 /* llhttpsender.cpp in Sources */,
-				C1E4A5E20CC0216F005FB0A6 /* llpumpio.cpp in Sources */,
-				C1E4A5E30CC0216F005FB0A6 /* lltransfertargetfile.cpp in Sources */,
-				C1E4A5E40CC0216F005FB0A6 /* lluseroperation.cpp in Sources */,
-				C1E4A5E50CC0216F005FB0A6 /* lliopipe.cpp in Sources */,
-				C1E4A5E60CC0216F005FB0A6 /* llioutil.cpp in Sources */,
-				C1E4A5E70CC0216F005FB0A6 /* lltransfermanager.cpp in Sources */,
-				61923C9E074AD920005E1F34 /* mac_crash_logger.cpp in Sources */,
-				C1E4A5760CC020FC005FB0A6 /* llcrashloggermac.cpp in Sources */,
-				C1E4A5790CC0210F005FB0A6 /* llcrashlogger.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		9967E9060B37533F0087BD1B /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9967E98D0B375B0E0087BD1B /* fmodwrapper.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		99CDED4805E70BAB0000F8AA /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				79E592770D1B4932002135A7 /* llimagepng.cpp in Sources */,
-				61922443074A9B5C005E1F34 /* indra.y in Sources */,
-				61922442074A9B5C005E1F34 /* indra.l in Sources */,
-				912541AF0691FF79008C66F7 /* llfasttimerview.cpp in Sources */,
-				79E592870D1B4961002135A7 /* llpngwrapper.cpp in Sources */,
-				619222F0074A9B5B005E1F34 /* llcriticaldamp.cpp in Sources */,
-				619222F8074A9B5B005E1F34 /* llerror.cpp in Sources */,
-				619222FE074A9B5B005E1F34 /* llfasttimer.cpp in Sources */,
-				61922300074A9B5B005E1F34 /* llfixedbuffer.cpp in Sources */,
-				61922302074A9B5B005E1F34 /* llframetimer.cpp in Sources */,
-				61922307074A9B5B005E1F34 /* llmemory.cpp in Sources */,
-				6192230C074A9B5B005E1F34 /* llprocessor.cpp in Sources */,
-				61922314074A9B5B005E1F34 /* llstat.cpp in Sources */,
-				61922318074A9B5B005E1F34 /* llstring.cpp in Sources */,
-				6192231A074A9B5B005E1F34 /* llstringtable.cpp in Sources */,
-				6192232A074A9B5B005E1F34 /* timing.cpp in Sources */,
-				61922347074A9B5B005E1F34 /* llcategory.cpp in Sources */,
-				61922349074A9B5B005E1F34 /* lleconomy.cpp in Sources */,
-				6192234B074A9B5B005E1F34 /* llinventory.cpp in Sources */,
-				6192234D074A9B5B005E1F34 /* llparcel.cpp in Sources */,
-				6192234F074A9B5B005E1F34 /* llpermissions.cpp in Sources */,
-				61922352074A9B5B005E1F34 /* llsaleinfo.cpp in Sources */,
-				61922354074A9B5B005E1F34 /* lltransactionflags.cpp in Sources */,
-				61922359074A9B5B005E1F34 /* llcrc.cpp in Sources */,
-				6192235C074A9B5B005E1F34 /* llmd5.cpp in Sources */,
-				6192235F074A9B5B005E1F34 /* llrand.cpp in Sources */,
-				61922361074A9B5B005E1F34 /* llrect.cpp in Sources */,
-				61922363074A9B5B005E1F34 /* m3math.cpp in Sources */,
-				61922365074A9B5B005E1F34 /* m4math.cpp in Sources */,
-				61922367074A9B5B005E1F34 /* llquaternion.cpp in Sources */,
-				61922369074A9B5B005E1F34 /* raytrace.cpp in Sources */,
-				6192236F074A9B5B005E1F34 /* v3color.cpp in Sources */,
-				61922371074A9B5B005E1F34 /* v3dmath.cpp in Sources */,
-				61922373074A9B5B005E1F34 /* v3math.cpp in Sources */,
-				61922375074A9B5B005E1F34 /* v4color.cpp in Sources */,
-				61922377074A9B5B005E1F34 /* v4coloru.cpp in Sources */,
-				61922379074A9B5B005E1F34 /* v4math.cpp in Sources */,
-				6192237C074A9B5B005E1F34 /* xform.cpp in Sources */,
-				6192237E074A9B5B005E1F34 /* llassetstorage.cpp in Sources */,
-				61922380074A9B5B005E1F34 /* llcachename.cpp in Sources */,
-				61922383074A9B5B005E1F34 /* llcircuit.cpp in Sources */,
-				6192238A074A9B5B005E1F34 /* lldatapacker.cpp in Sources */,
-				61922395074A9B5C005E1F34 /* lldispatcher.cpp in Sources */,
-				61922398074A9B5C005E1F34 /* llhost.cpp in Sources */,
-				619223A2074A9B5C005E1F34 /* llnamevalue.cpp in Sources */,
-				619223A4074A9B5C005E1F34 /* llnullcipher.cpp in Sources */,
-				619223A6074A9B5C005E1F34 /* llpacketbuffer.cpp in Sources */,
-				619223A8074A9B5C005E1F34 /* llpacketring.cpp in Sources */,
-				619223AA074A9B5C005E1F34 /* llpartdata.cpp in Sources */,
-				619223B1074A9B5C005E1F34 /* llthrottle.cpp in Sources */,
-				619223B3074A9B5C005E1F34 /* lltransfermanager.cpp in Sources */,
-				619223B5074A9B5C005E1F34 /* lltransfersourceasset.cpp in Sources */,
-				619223B7074A9B5C005E1F34 /* lltransfersourcefile.cpp in Sources */,
-				619223B9074A9B5C005E1F34 /* lltransfertargetfile.cpp in Sources */,
-				619223BB074A9B5C005E1F34 /* lltransfertargetvfile.cpp in Sources */,
-				619223BD074A9B5C005E1F34 /* lluseroperation.cpp in Sources */,
-				619223C0074A9B5C005E1F34 /* llxfer.cpp in Sources */,
-				619223C2074A9B5C005E1F34 /* llxfer_file.cpp in Sources */,
-				619223C4074A9B5C005E1F34 /* llxfer_mem.cpp in Sources */,
-				619223C6074A9B5C005E1F34 /* llxfer_vfile.cpp in Sources */,
-				619223C8074A9B5C005E1F34 /* llxfermanager.cpp in Sources */,
-				619223CA074A9B5C005E1F34 /* llxorcipher.cpp in Sources */,
-				619223CD074A9B5C005E1F34 /* message.cpp in Sources */,
-				619223CF074A9B5C005E1F34 /* message_prehash.cpp in Sources */,
-				619223D1074A9B5C005E1F34 /* message_string_table.cpp in Sources */,
-				619223D2074A9B5C005E1F34 /* net.cpp in Sources */,
-				619223D4074A9B5C005E1F34 /* network.cpp in Sources */,
-				619223D6074A9B5C005E1F34 /* partsyspacket.cpp in Sources */,
-				619223D8074A9B5C005E1F34 /* patch_code.cpp in Sources */,
-				619223DA074A9B5C005E1F34 /* patch_dct.cpp in Sources */,
-				619223DC074A9B5C005E1F34 /* patch_idct.cpp in Sources */,
-				619223E3074A9B5C005E1F34 /* llmaterialtable.cpp in Sources */,
-				619223E5074A9B5C005E1F34 /* llprimitive.cpp in Sources */,
-				619223E7074A9B5C005E1F34 /* lltextureanim.cpp in Sources */,
-				619223E9074A9B5C005E1F34 /* lltextureentry.cpp in Sources */,
-				619223EB074A9B5C005E1F34 /* lltreeparams.cpp in Sources */,
-				61922420074A9B5C005E1F34 /* llundo.cpp in Sources */,
-				61922426074A9B5C005E1F34 /* llvfile.cpp in Sources */,
-				61922428074A9B5C005E1F34 /* llvfs.cpp in Sources */,
-				61922433074A9B5C005E1F34 /* llwindow.cpp in Sources */,
-				61922437074A9B5C005E1F34 /* llxmlparser.cpp in Sources */,
-				61922439074A9B5C005E1F34 /* llxmltree.cpp in Sources */,
-				61922445074A9B5C005E1F34 /* lscript_bytecode.cpp in Sources */,
-				61922447074A9B5C005E1F34 /* lscript_error.cpp in Sources */,
-				61922449074A9B5C005E1F34 /* lscript_heap.cpp in Sources */,
-				6192244B074A9B5C005E1F34 /* lscript_resource.cpp in Sources */,
-				6192244D074A9B5C005E1F34 /* lscript_scope.cpp in Sources */,
-				6192244F074A9B5C005E1F34 /* lscript_tree.cpp in Sources */,
-				61922451074A9B5C005E1F34 /* lscript_typecheck.cpp in Sources */,
-				61922454074A9B5C005E1F34 /* lscript_execute.cpp in Sources */,
-				61922455074A9B5C005E1F34 /* lscript_heapruntime.cpp in Sources */,
-				61922457074A9B5C005E1F34 /* lscript_readlso.cpp in Sources */,
-				6192245C074A9B5C005E1F34 /* lscript_alloc.cpp in Sources */,
-				6192245D074A9B5C005E1F34 /* lscript_export.cpp in Sources */,
-				6192245E074A9B5C005E1F34 /* lscript_library.cpp in Sources */,
-				616C4A980752C534006C2C65 /* lltimer.cpp in Sources */,
-				616C4A990752C572006C2C65 /* u64.cpp in Sources */,
-				616C4A9D0752C5CF006C2C65 /* lluuid.cpp in Sources */,
-				616C4AA30752C6D2006C2C65 /* v2math.cpp in Sources */,
-				616C4E0F075507DF006C2C65 /* llbboxlocal.cpp in Sources */,
-				616C4E11075507DF006C2C65 /* llcamera.cpp in Sources */,
-				616C4E13075507DF006C2C65 /* llcoordframe.cpp in Sources */,
-				616C4E3207551735006C2C65 /* lldir_mac.cpp in Sources */,
-				616C4E3407551735006C2C65 /* lldir.cpp in Sources */,
-				915862FA075D2F7300F6A924 /* llapr.cpp in Sources */,
-				9159DDD807662E7900F15AA1 /* llthread.cpp in Sources */,
-				91E579B20770D43100404933 /* llwindowmacosx.cpp in Sources */,
-				91287B27078DCD1800E958B2 /* llkeyboard.cpp in Sources */,
-				91287B30078DCE0A00E958B2 /* llkeyboardmacosx.cpp in Sources */,
-				99321B14081DD26000678159 /* llworkerthread.cpp in Sources */,
-				99C7B320081F128400499A23 /* llvfsthread.cpp in Sources */,
-				99E64039081F1CB80009003F /* llgl.cpp in Sources */,
-				99FBB073087365E90048A5CC /* llclassifiedflags.cpp in Sources */,
-				93AE41CC08F4842F00141675 /* llsecondlifeurls.cpp in Sources */,
-				93AE41D008F4845400141675 /* llinstantmessage.cpp in Sources */,
-				99E4326D092D5996003AE728 /* llassettype.cpp in Sources */,
-				99E4350C092D644F003AE728 /* llmortician.cpp in Sources */,
-				99E4351A092D6535003AE728 /* llcommon.cpp in Sources */,
-				FD6C9A3C09C75B0500AA1849 /* llbuffer.cpp in Sources */,
-				FD6C9A3D09C75B0500AA1849 /* llbufferstream.cpp in Sources */,
-				FD6C9A4009C75B3A00AA1849 /* llmemorystream.cpp in Sources */,
-				FD6C9A4809C75BCD00AA1849 /* llioutil.cpp in Sources */,
-				99AAD74F09DC8B9D0036C309 /* lllfsthread.cpp in Sources */,
-				0633E5D209E341F500712406 /* llfile.cpp in Sources */,
-				0633E5D509E3421500712406 /* llstreamtools.cpp in Sources */,
-				FD15582A0A06BB5F00DE9AE5 /* lldate.cpp in Sources */,
-				FD15582D0A06BB5F00DE9AE5 /* lluri.cpp in Sources */,
-				FD1558330A06BC0600DE9AE5 /* llsd.cpp in Sources */,
-				FD15583B0A06BD2500DE9AE5 /* llsdserialize.cpp in Sources */,
-				913ADF0F0A250C750055AB21 /* llsdutil.cpp in Sources */,
-				FDA39C790A372074006E8A2D /* metaclass.cpp in Sources */,
-				FDA39C7A0A372074006E8A2D /* metaproperty.cpp in Sources */,
-				FDA39C7B0A372074006E8A2D /* reflective.cpp in Sources */,
-				9C1A4F6D0A8D4BB30037639E /* llsdserialize_xml.cpp in Sources */,
-				91E3336F0ABB5379004351DE /* llapp.cpp in Sources */,
-				91E333750ABB79AC004351DE /* llrun.cpp in Sources */,
-				9B2863B20ABF637200A05D7C /* llerrorthread.cpp in Sources */,
-				9B6A24D90AC8C69600EA9CB5 /* llwindowmacosx-objc.mm in Sources */,
-				F626410C0B1F75D000E5BBAD /* llwindowheadless.cpp in Sources */,
-				FD835B810AD1CB6700038B74 /* llchainio.cpp in Sources */,
-				299F95C10ADDE5D000C94EEF /* llviewquery.cpp in Sources */,
-				D64594620B3B731700FAB68F /* llimage.cpp in Sources */,
-				D64594630B3B731800FAB68F /* llimagebmp.cpp in Sources */,
-				D64594640B3B731A00FAB68F /* llimagedxt.cpp in Sources */,
-				D64594660B3B731D00FAB68F /* llimagej2c.cpp in Sources */,
-				D64594680B3B732200FAB68F /* llimagejpeg.cpp in Sources */,
-				D64594690B3B732300FAB68F /* llimagetga.cpp in Sources */,
-				D651349D0B3C40870042C56E /* llqueuedthread.cpp in Sources */,
-				91469E7B0B4486C10009E8F9 /* llmime.cpp in Sources */,
-				99374E4E0B5C6059008DB4BE /* lliosocket.cpp in Sources */,
-				913B26990B4DDCDA0030C3EC /* lllandmark.cpp in Sources */,
-				DA9C40E00B54B4BA00DD6F44 /* llformat.cpp in Sources */,
-				DA9C41140B54B8CA00DD6F44 /* lllivefile.cpp in Sources */,
-				1A97C4560B8BCF9C00331A24 /* llliveappconfig.cpp in Sources */,
-				1A9897E90B98E2F4005C45D7 /* llbase32.cpp in Sources */,
-				9117EAA20BF24A6100845BD2 /* llpacketack.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		99D5702F05BDEFD7004DE704 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				990CDBE405C1EA7900739545 /* FSCopyObject.c in Sources */,
-				990CDBE605C1EA7900739545 /* GenLinkedList.c in Sources */,
-				990CDBE905C1EA7900739545 /* mac_updater.cpp in Sources */,
-				990CDBEA05C1EA7900739545 /* MoreFilesX.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D64593530B3B4D7D00FAB68F /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		993576730B4489EE00D10C77 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD53B40509BDF9F600BFE3BC /* third party libs */;
-			targetProxy = 993576720B4489EE00D10C77 /* PBXContainerItemProxy */;
-		};
-		9950AF4A0B3762BE007E36E0 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD53B40509BDF9F600BFE3BC /* third party libs */;
-			targetProxy = 9950AF490B3762BE007E36E0 /* PBXContainerItemProxy */;
-		};
-		9967E91C0B3754610087BD1B /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 9967E9080B37533F0087BD1B /* fmodwrapper */;
-			targetProxy = 9967E91B0B3754610087BD1B /* PBXContainerItemProxy */;
-		};
-		99CDED6C05E70D850000F8AA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 99CDED4905E70BAB0000F8AA /* llcommon */;
-			targetProxy = 99CDED6B05E70D850000F8AA /* PBXContainerItemProxy */;
-		};
-		99CDED7005E70DA20000F8AA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 99CDED4905E70BAB0000F8AA /* llcommon */;
-			targetProxy = 99CDED6F05E70DA20000F8AA /* PBXContainerItemProxy */;
-		};
-		99CDED7205E70DAA0000F8AA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 99CDED4905E70BAB0000F8AA /* llcommon */;
-			targetProxy = 99CDED7105E70DAA0000F8AA /* PBXContainerItemProxy */;
-		};
-		99FCDAE8093D1FC3003D3B63 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 99D5703205BDEFD7004DE704 /* AutoUpdater */;
-			targetProxy = 99FCDAE7093D1FC3003D3B63 /* PBXContainerItemProxy */;
-		};
-		99FCDAEC093D1FC8003D3B63 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 9932ED1E056C1F0900554101 /* crashreporter */;
-			targetProxy = 99FCDAEB093D1FC8003D3B63 /* PBXContainerItemProxy */;
-		};
-		D64593580B3B4D8500FAB68F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 99CDED4905E70BAB0000F8AA /* llcommon */;
-			targetProxy = D64593570B3B4D8500FAB68F /* PBXContainerItemProxy */;
-		};
-		FD53B40C09BDFD3E00BFE3BC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD53B40509BDF9F600BFE3BC /* third party libs */;
-			targetProxy = FD53B40B09BDFD3E00BFE3BC /* PBXContainerItemProxy */;
-		};
-		FD53B41009BDFD5300BFE3BC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD53B40509BDF9F600BFE3BC /* third party libs */;
-			targetProxy = FD53B40F09BDFD5300BFE3BC /* PBXContainerItemProxy */;
-		};
-		FD53B41209BDFD5A00BFE3BC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD53B40509BDF9F600BFE3BC /* third party libs */;
-			targetProxy = FD53B41109BDFD5A00BFE3BC /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				0867D6ABFE840B52C02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		9930A8E30B8FB10A00197ECA /* language.txt */ = {
-			isa = PBXVariantGroup;
-			children = (
-				9930A8DD0B8FB0E200197ECA /* English */,
-				9930A8E70B8FB14E00197ECA /* Japanese */,
-				9930A8EA0B8FB1D500197ECA /* German */,
-				9930A8ED0B8FB1E500197ECA /* Korean */,
-			);
-			name = language.txt;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		9919347D09786FF300BF6EE0 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-					../llrender,
-				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = llcommon;
-			};
-			name = Universal;
-		};
-		9919347E09786FF300BF6EE0 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INFOPLIST_FILE = "AutoUpdater-Info.plist";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = AutoUpdater;
-			};
-			name = Universal;
-		};
-		9919348009786FF300BF6EE0 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = macutil_Prefix.h;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = (
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-					../llcrashlogger,
-				);
-				INFOPLIST_FILE = "crashreporter-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = crashreporter;
-			};
-			name = Universal;
-		};
-		9919348109786FF300BF6EE0 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				DEPLOYMENT_POSTPROCESSING = YES;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = llviewerprecompiledheaders.h;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
-				INFOPLIST_FILE = "Info-SecondLife.plist";
-				INSTALL_PATH = Applications;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../../libraries/universal-darwin/lib_release",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/universal-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/build/Development\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/build/Universal\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
-				OTHER_CFLAGS = (
-					"-DLL_DARWIN=1",
-					"-DLL_RELEASE=1",
-					"-DLL_RELEASE_FOR_DOWNLOAD=1",
-					"-DNDEBUG",
-					"-fconstant-cfstrings",
-					"-mlong-branch",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-ffor-scope",
-					"-Wno-reorder",
-				);
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = "Second Life";
-				SEPARATE_STRIP = YES;
-				SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
-				STRIP_STYLE = debugging;
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Universal;
-		};
-		9919348209786FF300BF6EE0 /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					i386,
-					ppc,
-				);
-				DEAD_CODE_STRIPPING = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				GCC_ALTIVEC_EXTENSIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VALUE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../,
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-				);
-				LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)";
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				OTHER_CFLAGS = (
-					"-DLL_CURRENT_HAVOK_VERSION=460",
-					"-DLL_DARWIN=1",
-					"-DLL_RELEASE=1",
-					"-DLL_RELEASE_FOR_DOWNLOAD=1",
-					"-DNDEBUG",
-					"-fconstant-cfstrings",
-					"-mlong-branch",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-ffor-scope",
-					"-Wno-reorder",
-				);
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-				USER_HEADER_SEARCH_PATHS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-sign-compare",
-					"-Wno-switch",
-				);
-				ZERO_LINK = NO;
-			};
-			name = Universal;
-		};
-		9967E90B0B37536D0087BD1B /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEAD_CODE_STRIPPING = NO;
-				EXECUTABLE_PREFIX = lib;
-				EXPORTED_SYMBOLS_FILE = "";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GENERATE_MASTER_OBJECT_FILE = NO;
-				INSTALL_PATH = "@executable_path/../Resources/";
-				KEEP_PRIVATE_EXTERNS = NO;
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRELINK_LIBS = "";
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
-				PRODUCT_NAME = fmodwrapper;
-				UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp;
-				ZERO_LINK = NO;
-			};
-			name = Development;
-		};
-		9967E90C0B37536D0087BD1B /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEAD_CODE_STRIPPING = NO;
-				EXECUTABLE_PREFIX = lib;
-				EXPORTED_SYMBOLS_FILE = "";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_MODEL_TUNING = G5;
-				GENERATE_MASTER_OBJECT_FILE = NO;
-				INSTALL_PATH = "@executable_path/../Resources/";
-				KEEP_PRIVATE_EXTERNS = NO;
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRELINK_LIBS = "";
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
-				PRODUCT_NAME = fmodwrapper;
-				UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		9967E90D0B37536D0087BD1B /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEAD_CODE_STRIPPING = NO;
-				EXECUTABLE_PREFIX = lib;
-				EXPORTED_SYMBOLS_FILE = "";
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_MODEL_TUNING = G5;
-				GENERATE_MASTER_OBJECT_FILE = NO;
-				INSTALL_PATH = "@executable_path/../Resources/";
-				KEEP_PRIVATE_EXTERNS = NO;
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRELINK_LIBS = "";
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
-				PRODUCT_NAME = fmodwrapper;
-				UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp;
-				ZERO_LINK = NO;
-			};
-			name = Universal;
-		};
-		9994843B0883114200EFC621 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-					../llrender,
-				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = llcommon;
-			};
-			name = Development;
-		};
-		9994843C0883114200EFC621 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-					../llrender,
-				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = llcommon;
-			};
-			name = Deployment;
-		};
-		999484450883114200EFC621 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = macutil_Prefix.h;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INFOPLIST_FILE = "crashreporter-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = crashreporter;
-				ZERO_LINK = NO;
-			};
-			name = Development;
-		};
-		999484460883114200EFC621 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = macutil_Prefix.h;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INFOPLIST_FILE = "crashreporter-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = crashreporter;
-			};
-			name = Deployment;
-		};
-		9994844A0883114200EFC621 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INFOPLIST_FILE = "AutoUpdater-Info.plist";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = AutoUpdater;
-			};
-			name = Development;
-		};
-		9994844B0883114200EFC621 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				INFOPLIST_FILE = "AutoUpdater-Info.plist";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = AutoUpdater;
-			};
-			name = Deployment;
-		};
-		999484540883114300EFC621 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = llviewerprecompiledheaders.h;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
-				INFOPLIST_FILE = "Info-SecondLife.plist";
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../../libraries/universal-darwin/lib_release",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/universal-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/build/Universal\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = "Second Life";
-				SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-sign-compare",
-					"-Wno-switch",
-					"-Winvalid-pch",
-				);
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Development;
-		};
-		999484550883114300EFC621 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = llviewerprecompiledheaders.h;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS)";
-				INFOPLIST_FILE = "Info-SecondLife.plist";
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../../libraries/universal-darwin/lib_release",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/build/Universal\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/build/Development\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
-				OTHER_CFLAGS = (
-					"-DLL_DARWIN=1",
-					"-DLL_RELEASE=1",
-					"-DLL_RELEASE_FOR_DOWNLOAD=1",
-					"-DNDEBUG",
-					"-fconstant-cfstrings",
-				);
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PRODUCT_NAME = "Second Life";
-				SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		999484590883114300EFC621 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEAD_CODE_STRIPPING = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				GCC_ALTIVEC_EXTENSIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VALUE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../,
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-				);
-				LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)";
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				OTHER_CFLAGS = (
-					"-DLL_CURRENT_HAVOK_VERSION=460",
-					"-DLL_DARWIN=1",
-					"-DLL_DEBUG=1",
-					"-D_DEBUG",
-					"-fconstant-cfstrings",
-					"-gfull",
-					"-mlong-branch",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-ffor-scope",
-					"-Wno-reorder",
-				);
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-				USER_HEADER_SEARCH_PATHS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-sign-compare",
-					"-Wno-switch",
-				);
-				ZERO_LINK = NO;
-			};
-			name = Development;
-		};
-		9994845A0883114300EFC621 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEAD_CODE_STRIPPING = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				GCC_ALTIVEC_EXTENSIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = NO;
-				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VALUE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../,
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-				);
-				LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)";
-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				OTHER_CFLAGS = (
-					"-DLL_CURRENT_HAVOK_VERSION=460",
-					"-DLL_DARWIN=1",
-					"-DLL_RELEASE=1",
-					"-DLL_RELEASE_FOR_DOWNLOAD=1",
-					"-DNDEBUG",
-					"-fconstant-cfstrings",
-					"-gfull",
-					"-mlong-branch",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-ffor-scope",
-					"-Wno-reorder",
-				);
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-				USER_HEADER_SEARCH_PATHS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-sign-compare",
-					"-Wno-switch",
-				);
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		D645935A0B3B4DA300FAB68F /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEAD_CODE_STRIPPING = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = "@executable_path/../Resources/";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
-				PRODUCT_NAME = llkdu;
-				ZERO_LINK = YES;
-			};
-			name = Development;
-		};
-		D645935B0B3B4DA300FAB68F /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEAD_CODE_STRIPPING = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = "@executable_path/../Resources/";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\"";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
-				PRODUCT_NAME = llkdu;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		D645935C0B3B4DA300FAB68F /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEAD_CODE_STRIPPING = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = "@executable_path/../Resources/";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\"";
-				OTHER_LDFLAGS = "-Wl,-search_paths_first";
-				PREBINDING = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
-				PRODUCT_NAME = llkdu;
-				ZERO_LINK = YES;
-			};
-			name = Universal;
-		};
-		FD53B40709BDFA1500BFE3BC /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PRODUCT_NAME = "third party libs";
-			};
-			name = Development;
-		};
-		FD53B40809BDFA1500BFE3BC /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				PRODUCT_NAME = "third party libs";
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		FD53B40909BDFA1500BFE3BC /* Universal */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "third party libs";
-			};
-			name = Universal;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		9967E90A0B37536D0087BD1B /* Build configuration list for PBXNativeTarget "fmodwrapper" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				9967E90B0B37536D0087BD1B /* Development */,
-				9967E90C0B37536D0087BD1B /* Deployment */,
-				9967E90D0B37536D0087BD1B /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		9994843A0883114200EFC621 /* Build configuration list for PBXNativeTarget "llcommon" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				9994843B0883114200EFC621 /* Development */,
-				9994843C0883114200EFC621 /* Deployment */,
-				9919347D09786FF300BF6EE0 /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		999484440883114200EFC621 /* Build configuration list for PBXNativeTarget "crashreporter" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				999484450883114200EFC621 /* Development */,
-				999484460883114200EFC621 /* Deployment */,
-				9919348009786FF300BF6EE0 /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		999484490883114200EFC621 /* Build configuration list for PBXNativeTarget "AutoUpdater" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				9994844A0883114200EFC621 /* Development */,
-				9994844B0883114200EFC621 /* Deployment */,
-				9919347E09786FF300BF6EE0 /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		999484530883114300EFC621 /* Build configuration list for PBXNativeTarget "newview" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				999484540883114300EFC621 /* Development */,
-				999484550883114300EFC621 /* Deployment */,
-				9919348109786FF300BF6EE0 /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		999484580883114300EFC621 /* Build configuration list for PBXProject "macview" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				999484590883114300EFC621 /* Development */,
-				9994845A0883114300EFC621 /* Deployment */,
-				9919348209786FF300BF6EE0 /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		D64593590B3B4DA300FAB68F /* Build configuration list for PBXNativeTarget "llkdu" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D645935A0B3B4DA300FAB68F /* Development */,
-				D645935B0B3B4DA300FAB68F /* Deployment */,
-				D645935C0B3B4DA300FAB68F /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		FD53B40609BDFA1500BFE3BC /* Build configuration list for PBXAggregateTarget "third party libs" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				FD53B40709BDFA1500BFE3BC /* Development */,
-				FD53B40809BDFA1500BFE3BC /* Deployment */,
-				FD53B40909BDFA1500BFE3BC /* Universal */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 20286C28FDCF999611CA2CEA /* Project object */;
-}
diff --git a/linden/indra/newview/mozilla-theme/classic.jar b/linden/indra/newview/mozilla-theme/classic.jar
deleted file mode 100644
index 9626bcb..0000000
Binary files a/linden/indra/newview/mozilla-theme/classic.jar and /dev/null differ
diff --git a/linden/indra/newview/mozilla-theme/classic.manifest b/linden/indra/newview/mozilla-theme/classic.manifest
deleted file mode 100644
index dfb1303..0000000
--- a/linden/indra/newview/mozilla-theme/classic.manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-skin communicator classic/1.0 jar:classic.jar!/skin/classic/communicator/
-skin global classic/1.0 jar:classic.jar!/skin/classic/global/
-skin mozapps classic/1.0 jar:classic.jar!/skin/classic/mozapps/
-skin help classic/1.0 jar:classic.jar!/skin/classic/help/
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
deleted file mode 100644
index aa2283f..0000000
--- a/linden/indra/newview/newview.vcproj
+++ /dev/null
@@ -1,3451 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="newview"
-	ProjectGUID="{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"
-	RootNamespace="newview"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;LL_DEBUG;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				MinimalRebuild="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="FALSE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib EZ_LCD_Wrapper_d.lib lgLcd.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-sgd-1_34_1.lib libboost_signals-vc71-mt-sgd-1_34_1.lib libboost_program_options-vc71-mt-sgd-1_34_1.lib  libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/debugview.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
-				IgnoreDefaultLibraryNames="msvcrt.lib;MSVCRTD.lib;libcd.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat debug"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat debug"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				GlobalOptimizations="FALSE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				OptimizeForProcessor="3"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libboost_signals-vc71-mt-s-1_34_1.lib libboost_program_options-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2.lib  llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/newview.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="TRUE"
-				MapFileName="$(TargetName).map"
-				MapLines="TRUE"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat release"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat release"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseForDownload|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Copying $(TargetFileName) to $(ProjectDir)"
-				CommandLine="copy $(TargetDir)\$(TargetFileName) $(ProjectDir)
-"
-				Outputs="$(TargetFileName)"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libboost_signals-vc71-mt-s-1_34_1.lib libboost_program_options-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/SecondLife.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="TRUE"
-				MapFileName="$(TargetName).map"
-				MapExports="FALSE"
-				MapLines="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat releasefordownload"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat releasefordownload"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include;..\..\libraries\include\zlib;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libboost_signals-vc71-mt-s-1_34_1.lib libboost_program_options-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llmozlib2.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/newview_noopt.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="FALSE"
-				MapFileName="newview.map"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat releasenoopt"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat releasenoopt"
-				ExcludedFromBuild="TRUE"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\llagent.cpp">
-			</File>
-			<File
-				RelativePath=".\llagentdata.cpp">
-			</File>
-			<File
-				RelativePath=".\llagentpilot.cpp">
-			</File>
-			<File
-				RelativePath=".\llanimstatelabels.cpp">
-			</File>
-			<File
-				RelativePath=".\llappviewer.cpp">
-			</File>
-			<File
-				RelativePath=".\llappviewerwin32.cpp">
-			</File>
-			<File
-				RelativePath=".\llassetuploadresponders.cpp">
-			</File>
-			<File
-				RelativePath=".\llaudiosourcevo.cpp">
-			</File>
-			<File
-				RelativePath=".\llbbox.cpp">
-			</File>
-			<File
-				RelativePath=".\llbox.cpp">
-			</File>
-			<File
-				RelativePath=".\llcallbacklist.cpp">
-			</File>
-			<File
-				RelativePath=".\llcallingcard.cpp">
-			</File>
-			<File
-				RelativePath=".\llcaphttpsender.cpp">
-			</File>
-			<File
-				RelativePath=".\llchatbar.cpp">
-			</File>
-			<File
-				RelativePath=".\llclassifiedinfo.cpp">
-			</File>
-			<File
-				RelativePath=".\llclassifiedstatsresponder.cpp">
-			</File>
-			<File
-				RelativePath=".\llcloud.cpp">
-			</File>
-			<File
-				RelativePath=".\llcolorscheme.cpp">
-			</File>
-			<File
-				RelativePath=".\llcolorswatch.cpp">
-			</File>
-			<File
-				RelativePath=".\llcommandhandler.cpp">
-			</File>
-			<File
-				RelativePath=".\llcommandlineparser.cpp">
-			</File>
-			<File
-				RelativePath=".\llcompass.cpp">
-			</File>
-			<File
-				RelativePath=".\llcompilequeue.cpp">
-			</File>
-			<File
-				RelativePath=".\llconfirmationmanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llconsole.cpp">
-			</File>
-			<File
-				RelativePath=".\llcontainerview.cpp">
-			</File>
-			<File
-				RelativePath=".\llcubemap.cpp">
-			</File>
-			<File
-				RelativePath=".\llcurrencyuimanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llcylinder.cpp">
-			</File>
-			<File
-				RelativePath=".\lldebugmessagebox.cpp">
-			</File>
-			<File
-				RelativePath=".\lldebugview.cpp">
-			</File>
-			<File
-				RelativePath=".\lldelayedgestureerror.cpp">
-			</File>
-			<File
-				RelativePath=".\lldirpicker.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawable.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpool.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolalpha.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolavatar.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolbump.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolground.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsimple.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsky.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolterrain.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpooltree.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwater.cpp">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwlsky.cpp">
-			</File>
-			<File
-				RelativePath=".\lldriverparam.cpp">
-			</File>
-			<File
-				RelativePath=".\lldynamictexture.cpp">
-			</File>
-			<File
-				RelativePath=".\llemote.cpp">
-			</File>
-			<File
-				RelativePath=".\lleventinfo.cpp">
-			</File>
-			<File
-				RelativePath=".\lleventnotifier.cpp">
-			</File>
-			<File
-				RelativePath=".\lleventpoll.cpp">
-			</File>
-			<File
-				RelativePath=".\llface.cpp">
-			</File>
-			<File
-				RelativePath=".\llface.inl">
-			</File>
-			<File
-				RelativePath=".\llfasttimerview.cpp">
-			</File>
-			<File
-				RelativePath=".\llfeaturemanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llfilepicker.cpp">
-			</File>
-			<File
-				RelativePath=".\llfirstuse.cpp">
-			</File>
-			<File
-				RelativePath=".\llflexibleobject.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterabout.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloateractivespeakers.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloateranimpreview.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterauction.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloateravatarinfo.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloateravatarpicker.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloateravatartextures.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuildoptions.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterbump.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuy.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycontents.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycurrency.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuyland.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatercamera.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterchat.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterchatterbox.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterclassified.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterclothing.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatercolorpicker.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatercustomize.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterdaycycle.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterdirectory.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatereditui.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterenvsettings.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterevent.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterfriends.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatergesture.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatergodtools.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinfo.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinvite.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatergroups.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterhardwaresettings.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterhtml.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterhtmlhelp.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterhud.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterimagepreview.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterinspect.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterjoystick.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterlagmeter.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterland.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterlandholdings.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterlandmark.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatermap.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatermute.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaternamedesc.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaternewim.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloateropenobject.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterparcel.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterpermissionsmgr.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterpostcard.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterpostprocess.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterpreference.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterproperties.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterregioninfo.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterreleasemsg.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterscriptdebug.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatersellland.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatersettingsdebug.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatersnapshot.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterstats.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatertelehub.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatertest.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatertools.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatertopobjects.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatertos.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterurldisplay.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterurlentry.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloatervoicedevicesettings.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterwater.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterwater.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterwindlight.cpp">
-			</File>
-			<File
-				RelativePath=".\llfloaterworldmap.cpp">
-			</File>
-			<File
-				RelativePath=".\llfolderview.cpp">
-			</File>
-			<File
-				RelativePath=".\llfollowcam.cpp">
-			</File>
-			<File
-				RelativePath=".\llframestats.cpp">
-			</File>
-			<File
-				RelativePath=".\llframestatview.cpp">
-			</File>
-			<File
-				RelativePath=".\llgenepool.cpp">
-			</File>
-			<File
-				RelativePath=".\llgesturemgr.cpp">
-			</File>
-			<File
-				RelativePath=".\llgivemoney.cpp">
-			</File>
-			<File
-				RelativePath=".\llglsandbox.cpp">
-			</File>
-			<File
-				RelativePath=".\llglslshader.cpp">
-			</File>
-			<File
-				RelativePath=".\llgroupmgr.cpp">
-			</File>
-			<File
-				RelativePath=".\llgroupnotify.cpp">
-			</File>
-			<File
-				RelativePath=".\llhippo.cpp">
-			</File>
-			<File
-				RelativePath=".\llhoverview.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudeffect.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudeffectbeam.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudeffectlookat.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudeffectpointat.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudeffecttrail.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudicon.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudmanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudobject.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudrender.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudtext.cpp">
-			</File>
-			<File
-				RelativePath=".\llhudview.cpp">
-			</File>
-			<File
-				RelativePath=".\llimpanel.cpp">
-			</File>
-			<File
-				RelativePath=".\llimview.cpp">
-			</File>
-			<File
-				RelativePath=".\llinventoryactions.cpp">
-			</File>
-			<File
-				RelativePath=".\llinventorybridge.cpp">
-			</File>
-			<File
-				RelativePath=".\llinventoryclipboard.cpp">
-			</File>
-			<File
-				RelativePath=".\llinventorymodel.cpp">
-			</File>
-			<File
-				RelativePath=".\llinventoryview.cpp">
-			</File>
-			<File
-				RelativePath=".\lljoystickbutton.cpp">
-			</File>
-			<File
-				RelativePath=".\lllandmarklist.cpp">
-			</File>
-			<File
-				RelativePath=".\lllcd.cpp">
-			</File>
-			<File
-				RelativePath=".\lllogchat.cpp">
-			</File>
-			<File
-				RelativePath=".\llmanip.cpp">
-			</File>
-			<File
-				RelativePath=".\llmaniprotate.cpp">
-			</File>
-			<File
-				RelativePath=".\llmanipscale.cpp">
-			</File>
-			<File
-				RelativePath=".\llmaniptranslate.cpp">
-			</File>
-			<File
-				RelativePath=".\llmapresponders.cpp">
-			</File>
-			<File
-				RelativePath=".\llmediaremotectrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llmemoryview.cpp">
-			</File>
-			<File
-				RelativePath=".\llmenucommands.cpp">
-			</File>
-			<File
-				RelativePath=".\llmimetypes.cpp">
-			</File>
-			<File
-				RelativePath=".\llmorphview.cpp">
-			</File>
-			<File
-				RelativePath=".\llmoveview.cpp">
-			</File>
-			<File
-				RelativePath=".\llmutelist.cpp">
-			</File>
-			<File
-				RelativePath=".\llnamebox.cpp">
-			</File>
-			<File
-				RelativePath=".\llnameeditor.cpp">
-			</File>
-			<File
-				RelativePath=".\llnamelistctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llnetmap.cpp">
-			</File>
-			<File
-				RelativePath=".\llnotify.cpp">
-			</File>
-			<File
-				RelativePath=".\lloverlaybar.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelaudioprefs.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelaudiovolume.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelavatar.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelclassified.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelcontents.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldebug.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirbrowser.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirclassified.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirevents.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirfind.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirgroups.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirland.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirpeople.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirplaces.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldirpopular.cpp">
-			</File>
-			<File
-				RelativePath=".\llpaneldisplay.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelevent.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelface.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgeneral.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgroup.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupgeneral.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupinvite.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgrouplandmoney.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupnotices.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgrouproles.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupvoting.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelinput.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelinventory.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelland.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanellandmedia.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanellandobjects.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanellandoptions.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelLCD.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanellogin.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelmorph.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelmsgs.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelnetwork.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelobject.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelpermissions.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelpick.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelplace.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelskins.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelvolume.cpp">
-			</File>
-			<File
-				RelativePath=".\llpanelweb.cpp">
-			</File>
-			<File
-				RelativePath=".\llparcelselection.cpp">
-			</File>
-			<File
-				RelativePath=".\llpatchvertexarray.cpp">
-			</File>
-			<File
-				RelativePath=".\llpolymesh.cpp">
-			</File>
-			<File
-				RelativePath=".\llpolymorph.cpp">
-			</File>
-			<File
-				RelativePath=".\llpostprocess.cpp">
-			</File>
-			<File
-				RelativePath=".\llprefschat.cpp">
-			</File>
-			<File
-				RelativePath=".\llprefsim.cpp">
-			</File>
-			<File
-				RelativePath=".\llprefsvoice.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreview.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreviewanim.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreviewgesture.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreviewlandmark.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreviewnotecard.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreviewscript.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreviewsound.cpp">
-			</File>
-			<File
-				RelativePath=".\llpreviewtexture.cpp">
-			</File>
-			<File
-				RelativePath=".\llprogressview.cpp">
-			</File>
-			<File
-				RelativePath=".\llregionposition.cpp">
-			</File>
-			<File
-				RelativePath=".\llremoteparcelrequest.cpp">
-			</File>
-			<File
-				RelativePath=".\llrendersphere.cpp">
-			</File>
-			<File
-				RelativePath=".\llsavedsettingsglue.cpp">
-			</File>
-			<File
-				RelativePath=".\llselectmgr.cpp">
-			</File>
-			<File
-				RelativePath=".\llsky.cpp">
-			</File>
-			<File
-				RelativePath=".\llspatialpartition.cpp">
-			</File>
-			<File
-				RelativePath=".\llsprite.cpp">
-			</File>
-			<File
-				RelativePath=".\llsrv.cpp">
-			</File>
-			<File
-				RelativePath=".\llstartup.cpp">
-			</File>
-			<File
-				RelativePath=".\llstatbar.cpp">
-			</File>
-			<File
-				RelativePath=".\llstatgraph.cpp">
-			</File>
-			<File
-				RelativePath=".\llstatusbar.cpp">
-			</File>
-			<File
-				RelativePath=".\llstatview.cpp">
-			</File>
-			<File
-				RelativePath=".\llstylemap.cpp">
-			</File>
-			<File
-				RelativePath=".\llsurface.cpp">
-			</File>
-			<File
-				RelativePath=".\llsurfacepatch.cpp">
-			</File>
-			<File
-				RelativePath=".\lltexlayer.cpp">
-			</File>
-			<File
-				RelativePath=".\lltexturecache.cpp">
-			</File>
-			<File
-				RelativePath=".\lltexturectrl.cpp">
-			</File>
-			<File
-				RelativePath=".\lltexturefetch.cpp">
-			</File>
-			<File
-				RelativePath=".\lltextureview.cpp">
-			</File>
-			<File
-				RelativePath=".\lltool.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolbar.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolbrush.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolcomp.cpp">
-			</File>
-			<File
-				RelativePath=".\lltooldraganddrop.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolface.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolfocus.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolgrab.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolgun.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolindividual.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolmgr.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolmorph.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolobjpicker.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolpie.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolpipette.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolplacer.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolselect.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolselectland.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolselectrect.cpp">
-			</File>
-			<File
-				RelativePath=".\lltoolview.cpp">
-			</File>
-			<File
-				RelativePath=".\lltracker.cpp">
-			</File>
-			<File
-				RelativePath=".\lltrans.cpp">
-			</File>
-			<File
-				RelativePath=".\lluploaddialog.cpp">
-			</File>
-			<File
-				RelativePath=".\llurl.cpp">
-			</File>
-			<File
-				RelativePath=".\llurldispatcher.cpp">
-			</File>
-			<File
-				RelativePath=".\llurlhistory.cpp">
-			</File>
-			<File
-				RelativePath=".\llurlsimstring.cpp">
-			</File>
-			<File
-				RelativePath=".\llurlwhitelist.cpp">
-			</File>
-			<File
-				RelativePath=".\lluserauth.cpp">
-			</File>
-			<File
-				RelativePath=".\llvectorperfoptions.cpp">
-			</File>
-			<File
-				RelativePath=".\llvelocitybar.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewchildren.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.h">
-			</File>
-			<File
-				RelativePath=".\llvieweraudio.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewercamera.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewercontrol.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerdisplay.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewergenericmessage.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewergesture.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerimage.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerimagelist.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerinventory.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerjoint.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerjointattachment.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_sse.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseForDownload|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseNoOpt|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="3"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_sse2.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseForDownload|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseNoOpt|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="3"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_vec.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerjoystick.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerkeyboard.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerlayer.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewermedia.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewermenu.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewermenufile.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewermessage.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewernetwork.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerobject.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerobjectlist.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmedia.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmediaautoplay.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmgr.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerparceloverlay.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerpartsim.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerpartsource.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerregion.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerstats.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewertexteditor.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewertextureanim.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerthrottle.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewervisualparam.cpp">
-			</File>
-			<File
-				RelativePath=".\llviewerwindow.cpp">
-			</File>
-			<File
-				RelativePath=".\llvlcomposition.cpp">
-			</File>
-			<File
-				RelativePath=".\llvlmanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llvoavatar.cpp">
-			</File>
-			<File
-				RelativePath=".\llvocache.cpp">
-			</File>
-			<File
-				RelativePath=".\llvoclouds.cpp">
-			</File>
-			<File
-				RelativePath=".\llvograss.cpp">
-			</File>
-			<File
-				RelativePath=".\llvoground.cpp">
-			</File>
-			<File
-				RelativePath=".\llvoiceclient.cpp">
-			</File>
-			<File
-				RelativePath=".\llvoiceremotectrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llvoicevisualizer.cpp">
-			</File>
-			<File
-				RelativePath=".\llvoinventorylistener.cpp">
-			</File>
-			<File
-				RelativePath=".\llvopartgroup.cpp">
-			</File>
-			<File
-				RelativePath=".\llvosky.cpp">
-			</File>
-			<File
-				RelativePath=".\llvosurfacepatch.cpp">
-			</File>
-			<File
-				RelativePath=".\llvotextbubble.cpp">
-			</File>
-			<File
-				RelativePath=".\llvotree.cpp">
-			</File>
-			<File
-				RelativePath=".\llvovolume.cpp">
-			</File>
-			<File
-				RelativePath=".\llvowater.cpp">
-			</File>
-			<File
-				RelativePath=".\llvowlsky.cpp">
-			</File>
-			<File
-				RelativePath=".\llwatchdog.cpp">
-			</File>
-			<File
-				RelativePath=".\llwaterparammanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llwaterparammanager.h">
-			</File>
-			<File
-				RelativePath=".\llwaterparamset.cpp">
-			</File>
-			<File
-				RelativePath=".\llwaterparamset.h">
-			</File>
-			<File
-				RelativePath=".\llwearable.cpp">
-			</File>
-			<File
-				RelativePath=".\llwearablelist.cpp">
-			</File>
-			<File
-				RelativePath=".\llweb.cpp">
-			</File>
-			<File
-				RelativePath=".\llwebbrowserctrl.cpp">
-			</File>
-			<File
-				RelativePath=".\llwind.cpp">
-			</File>
-			<File
-				RelativePath=".\llwindebug.cpp">
-			</File>
-			<File
-				RelativePath=".\llwlanimator.cpp">
-			</File>
-			<File
-				RelativePath=".\llwldaycycle.cpp">
-			</File>
-			<File
-				RelativePath=".\llwlparammanager.cpp">
-			</File>
-			<File
-				RelativePath=".\llwlparamset.cpp">
-			</File>
-			<File
-				RelativePath=".\llworld.cpp">
-			</File>
-			<File
-				RelativePath=".\llworldmap.cpp">
-			</File>
-			<File
-				RelativePath=".\llworldmapview.cpp">
-			</File>
-			<File
-				RelativePath=".\llxmlrpctransaction.cpp">
-			</File>
-			<File
-				RelativePath=".\noise.cpp">
-			</File>
-			<File
-				RelativePath=".\pipeline.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llagent.h">
-			</File>
-			<File
-				RelativePath=".\llagentdata.h">
-			</File>
-			<File
-				RelativePath=".\llagentpilot.h">
-			</File>
-			<File
-				RelativePath=".\llanimstatelabels.h">
-			</File>
-			<File
-				RelativePath=".\llappearance.h">
-			</File>
-			<File
-				RelativePath=".\llappviewer.h">
-			</File>
-			<File
-				RelativePath=".\llappviewerwin32.h">
-			</File>
-			<File
-				RelativePath=".\llassetuploadresponders.h">
-			</File>
-			<File
-				RelativePath=".\llasynchostbyname.h">
-			</File>
-			<File
-				RelativePath=".\llaudiosourcevo.h">
-			</File>
-			<File
-				RelativePath=".\llautocomplete.h">
-			</File>
-			<File
-				RelativePath=".\llbbox.h">
-			</File>
-			<File
-				RelativePath=".\llbox.h">
-			</File>
-			<File
-				RelativePath=".\llcallbacklist.h">
-			</File>
-			<File
-				RelativePath=".\llcallingcard.h">
-			</File>
-			<File
-				RelativePath=".\llcaphttpsender.h">
-			</File>
-			<File
-				RelativePath=".\llchatbar.h">
-			</File>
-			<File
-				RelativePath=".\llclassifiedinfo.h">
-			</File>
-			<File
-				RelativePath=".\llclassifiedstatsresponder.h">
-			</File>
-			<File
-				RelativePath=".\llcloud.h">
-			</File>
-			<File
-				RelativePath=".\llcolorscheme.h">
-			</File>
-			<File
-				RelativePath=".\llcolorswatch.h">
-			</File>
-			<File
-				RelativePath=".\llcommandhandler.h">
-			</File>
-			<File
-				RelativePath=".\llcommandlineparser.h">
-			</File>
-			<File
-				RelativePath=".\llcompass.h">
-			</File>
-			<File
-				RelativePath=".\llcompilequeue.h">
-			</File>
-			<File
-				RelativePath=".\llconfirmationmanager.h">
-			</File>
-			<File
-				RelativePath=".\llconsole.h">
-			</File>
-			<File
-				RelativePath=".\llcontainerview.h">
-			</File>
-			<File
-				RelativePath=".\llcubemap.h">
-			</File>
-			<File
-				RelativePath=".\llcurrencyuimanager.h">
-			</File>
-			<File
-				RelativePath=".\llcylinder.h">
-			</File>
-			<File
-				RelativePath=".\lldebugmessagebox.h">
-			</File>
-			<File
-				RelativePath=".\lldebugview.h">
-			</File>
-			<File
-				RelativePath=".\lldelayedgestureerror.h">
-			</File>
-			<File
-				RelativePath=".\lldirpicker.h">
-			</File>
-			<File
-				RelativePath=".\lldrawable.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpool.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolalpha.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolavatar.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolbump.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolground.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsimple.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsky.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolterrain.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpooltree.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwater.h">
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwlsky.h">
-			</File>
-			<File
-				RelativePath=".\lldriverparam.h">
-			</File>
-			<File
-				RelativePath=".\lldynamictexture.h">
-			</File>
-			<File
-				RelativePath=".\llemote.h">
-			</File>
-			<File
-				RelativePath=".\lleventemitter.h">
-			</File>
-			<File
-				RelativePath=".\lleventinfo.h">
-			</File>
-			<File
-				RelativePath=".\lleventnotifier.h">
-			</File>
-			<File
-				RelativePath=".\lleventpoll.h">
-			</File>
-			<File
-				RelativePath=".\llface.h">
-			</File>
-			<File
-				RelativePath=".\llfasttimerview.h">
-			</File>
-			<File
-				RelativePath=".\llfeaturemanager.h">
-			</File>
-			<File
-				RelativePath=".\llfilepicker.h">
-			</File>
-			<File
-				RelativePath=".\llfilist.h">
-			</File>
-			<File
-				RelativePath="..\llcommon\llfindlocale.h">
-			</File>
-			<File
-				RelativePath=".\llfirstuse.h">
-			</File>
-			<File
-				RelativePath=".\llflexibleobject.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterabout.h">
-			</File>
-			<File
-				RelativePath=".\llfloateractivespeakers.h">
-			</File>
-			<File
-				RelativePath=".\llfloateranimpreview.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterauction.h">
-			</File>
-			<File
-				RelativePath=".\llfloateravatarinfo.h">
-			</File>
-			<File
-				RelativePath=".\llfloateravatarpicker.h">
-			</File>
-			<File
-				RelativePath=".\llfloateravatartextures.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuildoptions.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterbump.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuy.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycontents.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycurrency.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterbuyland.h">
-			</File>
-			<File
-				RelativePath=".\llfloatercamera.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterchat.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterchatterbox.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterclassified.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterclothing.h">
-			</File>
-			<File
-				RelativePath=".\llfloatercolorpicker.h">
-			</File>
-			<File
-				RelativePath=".\llfloatercustomize.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterdaycycle.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterdirectory.h">
-			</File>
-			<File
-				RelativePath=".\llfloatereditui.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterenvsettings.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterevent.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterfriends.h">
-			</File>
-			<File
-				RelativePath=".\llfloatergesture.h">
-			</File>
-			<File
-				RelativePath=".\llfloatergodtools.h">
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinfo.h">
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinvite.h">
-			</File>
-			<File
-				RelativePath=".\llfloatergroups.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterhardwaresettings.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterhtml.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterhtmlhelp.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterhud.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterimagepreview.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterinspect.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterjoystick.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterlagmeter.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterland.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterlandholdings.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterlandmark.h">
-			</File>
-			<File
-				RelativePath=".\llfloatermap.h">
-			</File>
-			<File
-				RelativePath=".\llfloatermute.h">
-			</File>
-			<File
-				RelativePath=".\llfloaternamedesc.h">
-			</File>
-			<File
-				RelativePath=".\llfloaternewim.h">
-			</File>
-			<File
-				RelativePath=".\llfloateropenobject.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterparcel.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterpermissionsmgr.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterpostcard.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterpostprocess.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterpreference.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterproperties.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterregioninfo.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterscriptdebug.h">
-			</File>
-			<File
-				RelativePath=".\llfloatersellland.h">
-			</File>
-			<File
-				RelativePath=".\llfloatersettingsdebug.h">
-			</File>
-			<File
-				RelativePath=".\llfloatersnapshot.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterstats.h">
-			</File>
-			<File
-				RelativePath=".\llfloatertelehub.h">
-			</File>
-			<File
-				RelativePath=".\llfloatertest.h">
-			</File>
-			<File
-				RelativePath=".\llfloatertools.h">
-			</File>
-			<File
-				RelativePath=".\llfloatertopobjects.h">
-			</File>
-			<File
-				RelativePath=".\llfloatertos.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterurldisplay.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterurlentry.h">
-			</File>
-			<File
-				RelativePath=".\llfloatervoicedevicesettings.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterwindlight.h">
-			</File>
-			<File
-				RelativePath=".\llfloaterworldmap.h">
-			</File>
-			<File
-				RelativePath=".\llfolderview.h">
-			</File>
-			<File
-				RelativePath=".\llfollowcam.h">
-			</File>
-			<File
-				RelativePath=".\llframestats.h">
-			</File>
-			<File
-				RelativePath=".\llframestatview.h">
-			</File>
-			<File
-				RelativePath=".\llgenepool.h">
-			</File>
-			<File
-				RelativePath=".\llgesturemgr.h">
-			</File>
-			<File
-				RelativePath=".\llgivemoney.h">
-			</File>
-			<File
-				RelativePath=".\llglslshader.h">
-			</File>
-			<File
-				RelativePath=".\llgroupmgr.h">
-			</File>
-			<File
-				RelativePath=".\llgroupnotify.h">
-			</File>
-			<File
-				RelativePath=".\llhippo.h">
-			</File>
-			<File
-				RelativePath=".\llhoverview.h">
-			</File>
-			<File
-				RelativePath=".\llhudeffect.h">
-			</File>
-			<File
-				RelativePath=".\llhudeffectbeam.h">
-			</File>
-			<File
-				RelativePath=".\llhudeffectlookat.h">
-			</File>
-			<File
-				RelativePath=".\llhudeffectpointat.h">
-			</File>
-			<File
-				RelativePath=".\llhudeffecttrail.h">
-			</File>
-			<File
-				RelativePath=".\llhudicon.h">
-			</File>
-			<File
-				RelativePath=".\llhudmanager.h">
-			</File>
-			<File
-				RelativePath=".\llhudobject.h">
-			</File>
-			<File
-				RelativePath=".\llhudrender.h">
-			</File>
-			<File
-				RelativePath=".\llhudtext.h">
-			</File>
-			<File
-				RelativePath=".\llhudview.h">
-			</File>
-			<File
-				RelativePath=".\llimpanel.h">
-			</File>
-			<File
-				RelativePath=".\llimview.h">
-			</File>
-			<File
-				RelativePath=".\llinventorybridge.h">
-			</File>
-			<File
-				RelativePath=".\llinventoryclipboard.h">
-			</File>
-			<File
-				RelativePath=".\llinventorymodel.h">
-			</File>
-			<File
-				RelativePath=".\llinventoryview.h">
-			</File>
-			<File
-				RelativePath=".\lljoystickbutton.h">
-			</File>
-			<File
-				RelativePath=".\lllandmarklist.h">
-			</File>
-			<File
-				RelativePath=".\lllcd.h">
-			</File>
-			<File
-				RelativePath=".\lllightconstants.h">
-			</File>
-			<File
-				RelativePath=".\lllogchat.h">
-			</File>
-			<File
-				RelativePath=".\llmanip.h">
-			</File>
-			<File
-				RelativePath=".\llmaniprotate.h">
-			</File>
-			<File
-				RelativePath=".\llmanipscale.h">
-			</File>
-			<File
-				RelativePath=".\llmaniptranslate.h">
-			</File>
-			<File
-				RelativePath=".\llmediaremotectrl.h">
-			</File>
-			<File
-				RelativePath=".\llmemoryview.h">
-			</File>
-			<File
-				RelativePath=".\llmenucommands.h">
-			</File>
-			<File
-				RelativePath=".\llmimetypes.h">
-			</File>
-			<File
-				RelativePath=".\llmorphview.h">
-			</File>
-			<File
-				RelativePath=".\llmoveview.h">
-			</File>
-			<File
-				RelativePath=".\llmutelist.h">
-			</File>
-			<File
-				RelativePath=".\llnamebox.h">
-			</File>
-			<File
-				RelativePath=".\llnameeditor.h">
-			</File>
-			<File
-				RelativePath=".\llnamelistctrl.h">
-			</File>
-			<File
-				RelativePath=".\llnetmap.h">
-			</File>
-			<File
-				RelativePath=".\llnotify.h">
-			</File>
-			<File
-				RelativePath=".\lloverlaybar.h">
-			</File>
-			<File
-				RelativePath=".\llpanelaudioprefs.h">
-			</File>
-			<File
-				RelativePath=".\llpanelaudiovolume.h">
-			</File>
-			<File
-				RelativePath=".\llpanelavatar.h">
-			</File>
-			<File
-				RelativePath=".\llpanelclassified.h">
-			</File>
-			<File
-				RelativePath=".\llpanelcontents.h">
-			</File>
-			<File
-				RelativePath=".\llpanelcreate.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldebug.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirbrowser.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirclassified.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirevents.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirfind.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirgroups.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirland.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirpeople.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirplaces.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldirpopular.h">
-			</File>
-			<File
-				RelativePath=".\llpaneldisplay.h">
-			</File>
-			<File
-				RelativePath=".\llpanelevent.h">
-			</File>
-			<File
-				RelativePath=".\llpanelface.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgeneral.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgroup.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupgeneral.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupinvite.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgrouplandmoney.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupnotices.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgrouproles.h">
-			</File>
-			<File
-				RelativePath=".\llpanelgroupvoting.h">
-			</File>
-			<File
-				RelativePath=".\llpanelinput.h">
-			</File>
-			<File
-				RelativePath=".\llpanelinventory.h">
-			</File>
-			<File
-				RelativePath=".\llpanelland.h">
-			</File>
-			<File
-				RelativePath=".\llpanellandmedia.h">
-			</File>
-			<File
-				RelativePath=".\llpanellandobjects.h">
-			</File>
-			<File
-				RelativePath=".\llpanellandoptions.h">
-			</File>
-			<File
-				RelativePath=".\llpanelLCD.h">
-			</File>
-			<File
-				RelativePath=".\llpanellogin.h">
-			</File>
-			<File
-				RelativePath=".\llpanelmorph.h">
-			</File>
-			<File
-				RelativePath=".\llpanelmsgs.h">
-			</File>
-			<File
-				RelativePath=".\llpanelnetwork.h">
-			</File>
-			<File
-				RelativePath=".\llpanelobject.h">
-			</File>
-			<File
-				RelativePath=".\llpanelpermissions.h">
-			</File>
-			<File
-				RelativePath=".\llpanelpick.h">
-			</File>
-			<File
-				RelativePath=".\llpanelplace.h">
-			</File>
-			<File
-				RelativePath=".\llpanelskins.h">
-			</File>
-			<File
-				RelativePath=".\llpanelvolume.h">
-			</File>
-			<File
-				RelativePath=".\llpanelweb.h">
-			</File>
-			<File
-				RelativePath=".\llparcelselection.h">
-			</File>
-			<File
-				RelativePath=".\llpatchvertexarray.h">
-			</File>
-			<File
-				RelativePath=".\llpbuffer.h">
-			</File>
-			<File
-				RelativePath=".\llpolymesh.h">
-			</File>
-			<File
-				RelativePath=".\llpolymorph.h">
-			</File>
-			<File
-				RelativePath=".\llpostprocess.h">
-			</File>
-			<File
-				RelativePath=".\llprefschat.h">
-			</File>
-			<File
-				RelativePath=".\llprefsim.h">
-			</File>
-			<File
-				RelativePath=".\llprefsvoice.h">
-			</File>
-			<File
-				RelativePath=".\llpreview.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewanim.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewgesture.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewlandmark.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewnotecard.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewobject.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewscript.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewsound.h">
-			</File>
-			<File
-				RelativePath=".\llpreviewtexture.h">
-			</File>
-			<File
-				RelativePath=".\llprogressview.h">
-			</File>
-			<File
-				RelativePath=".\llregionposition.h">
-			</File>
-			<File
-				RelativePath=".\llremoteparcelrequest.h">
-			</File>
-			<File
-				RelativePath=".\llrendersphere.h">
-			</File>
-			<File
-				RelativePath=".\llresourcedata.h">
-			</File>
-			<File
-				RelativePath=".\llrig.h">
-			</File>
-			<File
-				RelativePath=".\llsavedsettingsglue.h">
-			</File>
-			<File
-				RelativePath=".\llselectmgr.h">
-			</File>
-			<File
-				RelativePath=".\llsky.h">
-			</File>
-			<File
-				RelativePath=".\llspatialpartition.h">
-			</File>
-			<File
-				RelativePath=".\llsprite.h">
-			</File>
-			<File
-				RelativePath=".\llsrv.h">
-			</File>
-			<File
-				RelativePath=".\llstartup.h">
-			</File>
-			<File
-				RelativePath=".\llstatbar.h">
-			</File>
-			<File
-				RelativePath=".\llstatgraph.h">
-			</File>
-			<File
-				RelativePath=".\llstatusbar.h">
-			</File>
-			<File
-				RelativePath=".\llstatview.h">
-			</File>
-			<File
-				RelativePath=".\llstylemap.h">
-			</File>
-			<File
-				RelativePath=".\llsurface.h">
-			</File>
-			<File
-				RelativePath=".\llsurfacepatch.h">
-			</File>
-			<File
-				RelativePath=".\lltable.h">
-			</File>
-			<File
-				RelativePath=".\lltexlayer.h">
-			</File>
-			<File
-				RelativePath=".\lltexturebar.h">
-			</File>
-			<File
-				RelativePath=".\lltexturecache.h">
-			</File>
-			<File
-				RelativePath=".\lltexturectrl.h">
-			</File>
-			<File
-				RelativePath=".\lltexturefetch.h">
-			</File>
-			<File
-				RelativePath=".\lltextureview.h">
-			</File>
-			<File
-				RelativePath=".\lltool.h">
-			</File>
-			<File
-				RelativePath=".\lltoolbar.h">
-			</File>
-			<File
-				RelativePath=".\lltoolbrush.h">
-			</File>
-			<File
-				RelativePath=".\lltoolcomp.h">
-			</File>
-			<File
-				RelativePath=".\lltooldraganddrop.h">
-			</File>
-			<File
-				RelativePath=".\lltoolface.h">
-			</File>
-			<File
-				RelativePath=".\lltoolfocus.h">
-			</File>
-			<File
-				RelativePath=".\lltoolgrab.h">
-			</File>
-			<File
-				RelativePath=".\lltoolgun.h">
-			</File>
-			<File
-				RelativePath=".\lltoolindividual.h">
-			</File>
-			<File
-				RelativePath=".\lltoolmgr.h">
-			</File>
-			<File
-				RelativePath=".\lltoolmorph.h">
-			</File>
-			<File
-				RelativePath=".\lltoolobjpicker.h">
-			</File>
-			<File
-				RelativePath=".\lltoolpie.h">
-			</File>
-			<File
-				RelativePath=".\lltoolpipette.h">
-			</File>
-			<File
-				RelativePath=".\lltoolplacer.h">
-			</File>
-			<File
-				RelativePath=".\lltoolselect.h">
-			</File>
-			<File
-				RelativePath=".\lltoolselectland.h">
-			</File>
-			<File
-				RelativePath=".\lltoolselectrect.h">
-			</File>
-			<File
-				RelativePath=".\lltoolview.h">
-			</File>
-			<File
-				RelativePath=".\lltracker.h">
-			</File>
-			<File
-				RelativePath=".\lltrans.h">
-			</File>
-			<File
-				RelativePath=".\lluploaddialog.h">
-			</File>
-			<File
-				RelativePath=".\llurl.h">
-			</File>
-			<File
-				RelativePath=".\llurldispatcher.h">
-			</File>
-			<File
-				RelativePath=".\llurlhistory.h">
-			</File>
-			<File
-				RelativePath=".\llurlsimstring.h">
-			</File>
-			<File
-				RelativePath=".\llurlwhitelist.h">
-			</File>
-			<File
-				RelativePath=".\lluserauth.h">
-			</File>
-			<File
-				RelativePath=".\lluvscreen.h">
-			</File>
-			<File
-				RelativePath=".\llvectorperfoptions.h">
-			</File>
-			<File
-				RelativePath=".\llvelocitybar.h">
-			</File>
-			<File
-				RelativePath=".\llviewchildren.h">
-			</File>
-			<File
-				RelativePath=".\llvieweraudio.h">
-			</File>
-			<File
-				RelativePath=".\llviewerbuild.h">
-			</File>
-			<File
-				RelativePath=".\llviewercamera.h">
-			</File>
-			<File
-				RelativePath=".\llviewercontrol.h">
-			</File>
-			<File
-				RelativePath=".\llviewerdisplay.h">
-			</File>
-			<File
-				RelativePath=".\llviewergenericmessage.h">
-			</File>
-			<File
-				RelativePath=".\llviewergesture.h">
-			</File>
-			<File
-				RelativePath=".\llviewerimage.h">
-			</File>
-			<File
-				RelativePath=".\llviewerimagelist.h">
-			</File>
-			<File
-				RelativePath=".\llviewerinventory.h">
-			</File>
-			<File
-				RelativePath=".\llviewerjoint.h">
-			</File>
-			<File
-				RelativePath=".\llviewerjointattachment.h">
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh.h">
-			</File>
-			<File
-				RelativePath=".\llviewerjoystick.h">
-			</File>
-			<File
-				RelativePath=".\llviewerkeyboard.h">
-			</File>
-			<File
-				RelativePath=".\llviewerlayer.h">
-			</File>
-			<File
-				RelativePath=".\llviewermedia.h">
-			</File>
-			<File
-				RelativePath=".\llviewermenu.h">
-			</File>
-			<File
-				RelativePath=".\llviewermenufile.h">
-			</File>
-			<File
-				RelativePath=".\llviewermessage.h">
-			</File>
-			<File
-				RelativePath=".\llviewernetwork.h">
-			</File>
-			<File
-				RelativePath=".\llviewerobject.h">
-			</File>
-			<File
-				RelativePath=".\llviewerobjectlist.h">
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmedia.h">
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmediaautoplay.h">
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmgr.h">
-			</File>
-			<File
-				RelativePath=".\llviewerparceloverlay.h">
-			</File>
-			<File
-				RelativePath=".\llviewerpartsim.h">
-			</File>
-			<File
-				RelativePath=".\llviewerpartsource.h">
-			</File>
-			<File
-				RelativePath=".\llviewerregion.h">
-			</File>
-			<File
-				RelativePath=".\llviewerstats.h">
-			</File>
-			<File
-				RelativePath=".\llviewertexteditor.h">
-			</File>
-			<File
-				RelativePath=".\llviewertextureanim.h">
-			</File>
-			<File
-				RelativePath=".\llviewerthrottle.h">
-			</File>
-			<File
-				RelativePath=".\llviewervisualparam.h">
-			</File>
-			<File
-				RelativePath=".\llviewerwindow.h">
-			</File>
-			<File
-				RelativePath=".\llvlcomposition.h">
-			</File>
-			<File
-				RelativePath=".\llvlmanager.h">
-			</File>
-			<File
-				RelativePath=".\llvoavatar.h">
-			</File>
-			<File
-				RelativePath=".\llvocache.h">
-			</File>
-			<File
-				RelativePath=".\llvoclouds.h">
-			</File>
-			<File
-				RelativePath=".\llvograss.h">
-			</File>
-			<File
-				RelativePath=".\llvoground.h">
-			</File>
-			<File
-				RelativePath=".\llvoiceclient.h">
-			</File>
-			<File
-				RelativePath=".\llvoiceremotectrl.h">
-			</File>
-			<File
-				RelativePath=".\llvoicevisualizer.h">
-			</File>
-			<File
-				RelativePath=".\llvoinventorylistener.h">
-			</File>
-			<File
-				RelativePath=".\llvopartgroup.h">
-			</File>
-			<File
-				RelativePath=".\llvosky.h">
-			</File>
-			<File
-				RelativePath=".\llvosurfacepatch.h">
-			</File>
-			<File
-				RelativePath=".\llvotextbubble.h">
-			</File>
-			<File
-				RelativePath=".\llvotree.h">
-			</File>
-			<File
-				RelativePath=".\llvovolume.h">
-			</File>
-			<File
-				RelativePath=".\llvowater.h">
-			</File>
-			<File
-				RelativePath=".\llvowlsky.h">
-			</File>
-			<File
-				RelativePath=".\llwatchdog.h">
-			</File>
-			<File
-				RelativePath=".\llwearable.h">
-			</File>
-			<File
-				RelativePath=".\llwearablelist.h">
-			</File>
-			<File
-				RelativePath=".\llweb.h">
-			</File>
-			<File
-				RelativePath=".\llwebbrowserctrl.h">
-			</File>
-			<File
-				RelativePath=".\llwind.h">
-			</File>
-			<File
-				RelativePath=".\llwindebug.h">
-			</File>
-			<File
-				RelativePath=".\llwlanimator.h">
-			</File>
-			<File
-				RelativePath=".\llwldaycycle.h">
-			</File>
-			<File
-				RelativePath=".\llwlparammanager.h">
-			</File>
-			<File
-				RelativePath=".\llwlparamset.h">
-			</File>
-			<File
-				RelativePath=".\llworld.h">
-			</File>
-			<File
-				RelativePath=".\llworldmap.h">
-			</File>
-			<File
-				RelativePath=".\llworldmapview.h">
-			</File>
-			<File
-				RelativePath=".\llxmlrpctransaction.h">
-			</File>
-			<File
-				RelativePath=".\macmain.h">
-			</File>
-			<File
-				RelativePath=".\noise.h">
-			</File>
-			<File
-				RelativePath=".\pipeline.h">
-			</File>
-			<File
-				RelativePath=".\randgauss.h">
-			</File>
-			<File
-				RelativePath=".\VertexCache.h">
-			</File>
-			<File
-				RelativePath=".\VorbisFramework.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-			<File
-				RelativePath=".\skins\xui\en-us\alerts.xml">
-			</File>
-			<File
-				RelativePath=".\app_settings\anim.ini">
-			</File>
-			<File
-				RelativePath=".\res\arrowcop.cur">
-			</File>
-			<File
-				RelativePath=".\res\arrowcopmulti.cur">
-			</File>
-			<File
-				RelativePath=".\character\avatar_lad.xml">
-			</File>
-			<File
-				RelativePath=".\res\bitmap2.bmp">
-			</File>
-			<File
-				RelativePath=".\res\bitmap4.bmp">
-			</File>
-			<File
-				RelativePath=".\app_settings\colors.xml">
-			</File>
-			<File
-				RelativePath=".\app_settings\colors_base.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_about.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_about_land.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_account_history.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_active_speakers.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_animation_preview.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_auction.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_audio_volume.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_avatar_picker.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_avatar_textures.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_build_options.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_bumps.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_contents.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_currency.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_land.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_object.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_chat_history.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_chatterbox.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_choose_group.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_clothing.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_color_picker.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_critical.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_customize.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_day_cycle_options.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_device_settings.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_directory.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_gesture.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_god_tools.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_group_info.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_groups.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_html.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_html_help.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_im.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_image_preview.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_import.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inspect.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message_ad_hoc.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message_group.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory_item_properties.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory_view_finder.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_joystick.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_lagmeter.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_land_holdings.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_live_lsleditor.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_lsl_guide.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_media_browser.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_moveview.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_mute.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_my_friends.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_name_description.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_new_im.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_new_outfit_dialog.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_openobject.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_pay.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_pay_object.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_postcard.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preferences.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_animation.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_classified.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_embedded_texture.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_event.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_existing_landmark.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_gesture.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_new_landmark.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_notecard.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_notecard_keep_discard.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_sound.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_texture.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_texture_keep_discard.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_url.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_price_for_listing.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_profile.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_rate.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_region_info.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_report_abuse.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_report_bug.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_debug.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_ed_panel.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_preview.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_preview_new.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_queue.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_search.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_select_key.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sell_land.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_settings_debug.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sim_release_message.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sky_settings.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_snapshot.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sound_preview.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_telehub.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_test.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_texture_ctrl.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_tools.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_top_objects.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_tos.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_url_entry.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_voice_wizard.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_wearable_save_as.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_windlight_options.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_world_map.xml">
-			</File>
-			<File
-				RelativePath=".\app_settings\grass.xml">
-			</File>
-			<File
-				RelativePath=".\Info-SecondLife.plist">
-			</File>
-			<File
-				RelativePath=".\English.lproj\InfoPlist.strings">
-			</File>
-			<File
-				RelativePath=".\res\install_icon.ico">
-			</File>
-			<File
-				RelativePath=".\app_settings\keys.ini">
-			</File>
-			<File
-				RelativePath=".\app_settings\keywords.ini">
-			</File>
-			<File
-				RelativePath=".\res\ll_icon.ico">
-			</File>
-			<File
-				RelativePath=".\res\llarrow.cur">
-			</File>
-			<File
-				RelativePath=".\res\llarrowdrag.cur">
-			</File>
-			<File
-				RelativePath=".\res\llarrowdragmulti.cur">
-			</File>
-			<File
-				RelativePath=".\res\llarrowlocked.cur">
-			</File>
-			<File
-				RelativePath=".\res\llgrablocked.cur">
-			</File>
-			<File
-				RelativePath=".\res\llnolocked.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolcamera.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolcreate.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolfocus.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolgrab.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolland.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolpan.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolpipette.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolrotate.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolscale.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltooltranslate.cur">
-			</File>
-			<File
-				RelativePath=".\res\lltoolzoomin.cur">
-			</File>
-			<File
-				RelativePath=".\res\loginbackground.bmp">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_inventory.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_login.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_attachment.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_avatar.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_land.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_object.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_self.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_viewer.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\mime_types.xml">
-			</File>
-			<File
-				RelativePath=".\res\newViewRes.rc">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\notify.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_details.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_planning.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_transactions.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_audio.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_audio_device.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_classified.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_bars.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_bg_tab.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_chat_bar.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_classified.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_event.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_friends.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_finder.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_general.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_invite.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_land_money.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_notices.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_roles.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_voting.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_groups.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_land_covenant.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_login.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_master_volume.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_controls.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_remote.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_remote_expanded.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_music_remote.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_overlaybar.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_place.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_place_small.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_audio.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_chat.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_general.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_graphics1.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_graphics2.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_graphics3.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_im.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_input.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_network.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_popups.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_voice.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_web.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_covenant.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_debug.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_estate.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_general.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_terrain.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_texture.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_scrolling_param.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_chat.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_im.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_im.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_msgbox.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_network.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_web.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_speaker_controls.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_status_bar.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_toolbar.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_top_pick.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_controls.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_enable.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_options.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_remote.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_remote_expanded.xml">
-			</File>
-			<File
-				RelativePath=".\app_settings\popups.xml">
-			</File>
-			<File
-				RelativePath=".\releasenotes.full.txt">
-			</File>
-			<File
-				RelativePath=".\releasenotes.txt">
-			</File>
-			<File
-				RelativePath=".\res\resource.h">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\role_actions.xml">
-			</File>
-			<File
-				RelativePath=".\app_settings\settings.xml">
-			</File>
-			<File
-				RelativePath=".\app_settings\std_bump.ini">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\teleport_strings.xml">
-			</File>
-			<File
-				RelativePath=".\skins\textures\textures.xml">
-			</File>
-			<File
-				RelativePath=".\res\toolbuy.cur">
-			</File>
-			<File
-				RelativePath=".\res\toolopen.cur">
-			</File>
-			<File
-				RelativePath=".\res\toolpay.cur">
-			</File>
-			<File
-				RelativePath=".\res\toolpickobject3.cur">
-			</File>
-			<File
-				RelativePath=".\res\toolpipette.cur">
-			</File>
-			<File
-				RelativePath=".\res\toolsit.cur">
-			</File>
-			<File
-				RelativePath=".\app_settings\trees.xml">
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\xui_version.xml">
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\files.lst">
-		</File>
-		<File
-			RelativePath=".\llviewerprecompiledheaders.cpp">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\llviewerprecompiledheaders.h">
-		</File>
-		<File
-			RelativePath="..\..\etc\message.xml">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml
-"
-					Outputs="./app_settings/message.xml"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml
-"
-					Outputs="./app_settings/message.xml"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml
-"
-					Outputs="./app_settings/message.xml"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml
-"
-					Outputs="./app_settings/message.xml"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\scripts\messages\message_template.msg">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg
-"
-					Outputs="./app_settings/message_template.msg"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg
-"
-					Outputs="./app_settings/message_template.msg"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg
-"
-					Outputs="./app_settings/message_template.msg"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg
-"
-					Outputs="./app_settings/message_template.msg"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\skins\textures\textures.xml">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
deleted file mode 100644
index 60b1907..0000000
--- a/linden/indra/newview/newview_vc8.vcproj
+++ /dev/null
@@ -1,4647 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="newview"
-	ProjectGUID="{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"
-	RootNamespace="newview"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat debug"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-sgd-1_34_1.lib libboost_signals-vc80-mt-sgd-1_34_1.lib libboost_program_options-vc80-mt-sgd-1_34_1.lib libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d-vc80.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/debugview.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
-				GenerateManifest="false"
-				IgnoreDefaultLibraryNames="msvcrtd;libcd;libcmt"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="newview.map"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat debug"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat release"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/newview.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				GenerateManifest="false"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="newview.map"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat release"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseForDownload|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat releasefordownload"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Copying $(TargetFileName) to $(ProjectDir)"
-				CommandLine="copy $(TargetDir)\$(TargetFileName) $(ProjectDir)&#x0D;&#x0A;"
-				Outputs="$(TargetFileName)"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/SecondLife.exe"
-				LinkIncremental="0"
-				AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				GenerateManifest="false"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat releasefordownload"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat releasenoopt"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				AssemblerOutput="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib lgLcd.lib EZ_LCD_Wrapper_vc8.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/newview_noopt.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				GenerateManifest="false"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="newview.map"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat releasenoopt"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llagent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentdata.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentpilot.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llanimstatelabels.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewerwin32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llassetuploadresponders.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiosourcevo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallbacklist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallingcard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcaphttpsender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llchatbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedstatsresponder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcloud.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorscheme.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorswatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandhandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandlineparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompass.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompilequeue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llconfirmationmanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llconsole.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcontainerview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcubemap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurrencyuimanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcylinder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugmessagebox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldelayedgestureerror.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldirpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolalpha.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolavatar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolbump.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolground.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsimple.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolterrain.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpooltree.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwlsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldriverparam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldynamictexture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llemote.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventnotifier.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventpoll.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llface.inl"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimerview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfeaturemanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfilepicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfirstuse.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llflexibleobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterabout.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateractivespeakers.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateranimpreview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterauction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatartextures.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuildoptions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbump.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuy.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycontents.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycurrency.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuyland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercamera.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchatterbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclassified.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclothing.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercolorpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercustomize.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdaycycle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdirectory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatereditui.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterenvsettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterfriends.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergodtools.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinvite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroups.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhardwaresettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtml.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtmlhelp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhud.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterimagepreview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterinspect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterjoystick.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlagmeter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandholdings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandmark.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermute.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternamedesc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternewim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateropenobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterparcel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpermissionsmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostcard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostprocess.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpreference.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterproperties.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterregioninfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreleasemsg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterscriptdebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersellland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersettingsdebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersnapshot.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterstats.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertelehub.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertest.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertools.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertopobjects.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertos.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurldisplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurlentry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatervoicedevicesettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwindlight.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterworldmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfolderview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfollowcam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestats.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestatview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgenepool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesturemgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgivemoney.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llglsandbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llglslshader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupnotify.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhippo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhoverview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectbeam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectlookat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectpointat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffecttrail.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudicon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudmanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudrender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudtext.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimpanel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryactions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorybridge.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryclipboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorymodel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoystickbutton.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmarklist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllcd.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogchat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanip.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniprotate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanipscale.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniptranslate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmapresponders.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaremotectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemoryview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenucommands.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmimetypes.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmorphview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmoveview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmutelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamebox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnameeditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamelistctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnetmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotify.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lloverlaybar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudioprefs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudiovolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelavatar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelclassified.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelcontents.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirbrowser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirclassified.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirevents.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirfind.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirgroups.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpeople.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirplaces.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpopular.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldisplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgeneral.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupgeneral.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupinvite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouplandmoney.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupnotices.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouproles.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupvoting.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinput.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandmedia.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandobjects.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandoptions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelLCD.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellogin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmorph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmsgs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelnetwork.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpermissions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpick.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelplace.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelskins.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelvolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelweb.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcelselection.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpatchvertexarray.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymesh.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymorph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpostprocess.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefschat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsvoice.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewanim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewgesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewlandmark.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewnotecard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewscript.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewsound.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewtexture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprogressview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionposition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llremoteparcelrequest.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendersphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsavedsettingsglue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llselectmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llspatialpartition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsprite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsrv.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstartup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatgraph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatusbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstylemap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurfacepatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexlayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturecache.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturefetch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbrush.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolcomp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltooldraganddrop.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolfocus.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgrab.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgun.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolindividual.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmorph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolobjpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpie.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpipette.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolplacer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectrect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltracker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltrans.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluploaddialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurldispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlhistory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlsimstring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlwhitelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserauth.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvectorperfoptions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvelocitybar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewchildren.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvieweraudio.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercamera.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercontrol.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerdisplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergenericmessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimagelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerinventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointattachment.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_sse.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseForDownload|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseNoOpt|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_sse2.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseForDownload|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseNoOpt|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_vec.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoystick.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerkeyboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerlayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermedia.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenufile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewernetwork.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobjectlist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmedia.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmediaautoplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparceloverlay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsource.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerregion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerstats.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertexteditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertextureanim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerthrottle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewervisualparam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerwindow.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlcomposition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlmanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoavatar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvocache.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoclouds.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvograss.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoground.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceclient.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceremotectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoicevisualizer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoinventorylistener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvopartgroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosurfacepatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotextbubble.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotree.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvovolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowlsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwatchdog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparammanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparamset.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearablelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llweb.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwebbrowserctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwind.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlanimator.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwldaycycle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparammanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparamset.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworld.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmapview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlrpctransaction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\noise.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\pipeline.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llagent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentdata.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentpilot.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llanimstatelabels.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llappearance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewerwin32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassetuploadresponders.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiosourcevo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llautocomplete.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallbacklist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallingcard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcaphttpsender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llchatbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedstatsresponder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcloud.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorscheme.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorswatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandhandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandlineparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompilequeue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llconfirmationmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llconsole.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcontainerview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcubemap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurrencyuimanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcylinder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugmessagebox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldelayedgestureerror.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldirpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolalpha.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolavatar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolbump.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolground.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsimple.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolterrain.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpooltree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwlsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldriverparam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldynamictexture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llemote.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventemitter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventnotifier.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventpoll.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimerview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfeaturemanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfilepicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfilist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfirstuse.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llflexibleobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterabout.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateractivespeakers.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateranimpreview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterauction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatartextures.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuildoptions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbump.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuy.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycontents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycurrency.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuyland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchatterbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclassified.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclothing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercolorpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercustomize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdaycycle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdirectory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatereditui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterenvsettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterevent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterfriends.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergodtools.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinvite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroups.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhardwaresettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtml.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtmlhelp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhud.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterimagepreview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterinspect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterjoystick.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlagmeter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandholdings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandmark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermute.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternamedesc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternewim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateropenobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterparcel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpermissionsmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostcard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostprocess.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpreference.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterproperties.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterregioninfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreleasemsg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterscriptdebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersellland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersettingsdebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterskysettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersnapshot.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterstats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertelehub.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertest.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertools.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertopobjects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertos.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurldisplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurlentry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatervoicedevicesettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwindlight.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterworldmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfolderview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfollowcam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestatview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgenepool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesturemgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgivemoney.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llglslshader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupnotify.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhippo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhoverview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectbeam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectlookat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectpointat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffecttrail.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudicon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudrender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudtext.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimpanel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorybridge.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryclipboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorymodel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoystickbutton.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmarklist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllcd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllightconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogchat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanip.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniprotate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanipscale.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniptranslate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaremotectrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemoryview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenucommands.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmimetypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmorphview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmoveview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmutelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamebox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnameeditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamelistctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnetmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotify.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lloverlaybar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudioprefs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudiovolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelavatar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelclassified.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelcontents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelcreate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirbrowser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirclassified.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirevents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirfind.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirgroups.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpeople.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirplaces.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpopular.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldisplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelevent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgeneral.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupgeneral.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupinvite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouplandmoney.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupnotices.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouproles.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupvoting.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinput.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinventory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandmedia.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandobjects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandoptions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelLCD.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellogin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmorph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmsgs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelnetwork.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpermissions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpick.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelplace.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelskins.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelvolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelweb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcelselection.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpatchvertexarray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymesh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymorph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpostprocess.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefschat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsvoice.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewanim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewgesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewlandmark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewnotecard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewscript.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewsound.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewtexture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprogressview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionposition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llremoteparcelrequest.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendersphere.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresourcedata.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsavedsettingsglue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llselectmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llspatialpartition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsprite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsrv.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstartup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatgraph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatusbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstylemap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurfacepatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexlayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturebar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturecache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturectrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturefetch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbrush.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolcomp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltooldraganddrop.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolfocus.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgrab.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgun.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolindividual.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmorph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolobjpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpie.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpipette.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolplacer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectrect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltracker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltrans.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluiconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluploaddialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurldispatcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlhistory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlsimstring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlwhitelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserauth.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluvscreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvectorperfoptions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvelocitybar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewchildren.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvieweraudio.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerbuild.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercontrol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerdisplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergenericmessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimagelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerinventory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoint.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointattachment.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoystick.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerkeyboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerlayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermedia.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenufile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewernetwork.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobjectlist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmedia.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmediaautoplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparceloverlay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerregion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerstats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertexteditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertextureanim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerthrottle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewervisualparam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerwindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlcomposition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoavatar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvocache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoclouds.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvograss.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoground.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceremotectrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoicevisualizer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoinventorylistener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvopartgroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosurfacepatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotextbubble.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvovolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowlsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwatchdog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparammanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparamset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearablelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llweb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwebbrowserctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwind.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlanimator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwldaycycle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparammanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparamset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworld.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmapview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlrpctransaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\noise.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pipeline.h"
-				>
-			</File>
-			<File
-				RelativePath=".\randgauss.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VertexCache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\viewer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VorbisFramework.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="xml;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\skins\xui\en-us\alerts.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\anim.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\res\arrowcop.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\arrowcopmulti.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\bitmap2.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\res\bitmap4.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\colors.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\colors_base.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_about.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_about_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_active_speakers.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_animation_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_auction.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_audio_volume.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_avatar_picker.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_avatar_textures.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_build_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_bumps.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_contents.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_currency.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_object.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_chat_history.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_chatterbox.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_choose_group.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_clothing.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_color_picker.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_critical.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_customize.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_day_cycle_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_device_settings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_directory.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_friends.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_gesture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_god_tools.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_group_info.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_groups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_hardware_settings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_html.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_html_help.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_image_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_import.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inspect.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message_ad_hoc.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message_group.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory_item_properties.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory_view_finder.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_joystick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_lagmeter.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_land_holdings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_landmark_ctrl.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_live_lsleditor.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_lsl_guide.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_media_browser.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_moveview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_mute.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_my_friends.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_name_description.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_new_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_new_outfit_dialog.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_openobject.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_pay.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_pay_object.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_postcard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preferences.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_animation.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_classified.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_embedded_texture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_event.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_existing_landmark.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_gesture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_new_landmark.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_notecard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_notecard_keep_discard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_sound.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_texture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_texture_keep_discard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_url.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_price_for_listing.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_profile.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_rate.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_region_info.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_report_abuse.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_report_bug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_debug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_ed_panel.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_preview_new.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_queue.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_search.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_select_key.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sell_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_settings_debug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sim_release_message.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_snapshot.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sound_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_telehub.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_test.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_texture_ctrl.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_tools.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_top_objects.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_tos.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_url_entry.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_voice_wizard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_water.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_wearable_save_as.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_windlight_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_world_map.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\gpu_table.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\grass.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\high_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\icon1.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\Info-SecondLife.plist"
-				>
-			</File>
-			<File
-				RelativePath=".\English.lproj\InfoPlist.strings"
-				>
-			</File>
-			<File
-				RelativePath=".\res\install_icon.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\keys.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\keywords.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\LCD_text.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\ll_icon.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrow.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrowdrag.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrowdragmulti.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrowlocked.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llgrablocked.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llnolocked.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolcamera.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolcreate.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolfocus.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolgrab.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolland.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolpan.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolpipette.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolrotate.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolscale.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltooltranslate.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolzoomin.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\loginbackground.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\low_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_inventory.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_login.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_attachment.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_avatar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_object.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_self.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_slurl.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_viewer.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\mid_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\mime_types.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\newViewRes.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\notify.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\notify.xml.bak"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_details.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_planning.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_transactions.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_audio.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_audio_device.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_classified.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_bars.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_bg_tab.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_chat_bar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_classified.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_event.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_friends.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_finder.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_general.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_invite.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_land_money.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_notices.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_roles.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_voting.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_groups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_land_covenant.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_login.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_master_volume.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_controls.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_remote.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_remote_expanded.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_music_remote.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_overlaybar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_place.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_place_small.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_audio.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_chat.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_general.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_graphics1.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_input.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_LCD.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_network.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_popups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_voice.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_web.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_covenant.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_debug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_estate.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_general.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_terrain.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_texture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_scrolling_param.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_chat.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_msgbox.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_network.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_web.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_speaker_controls.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_status_bar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_toolbar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_top_pick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_controls.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_enable.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_remote.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_remote_expanded.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\popups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\releasenotes.full.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\releasenotes.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\res\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\role_actions.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\std_bump.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\teleport_strings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolbuy.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolopen.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolpay.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolpickobject3.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolpipette.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolsit.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\trees.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\ultra_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\xui_version.xml"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\llviewerprecompiledheaders.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\llviewerprecompiledheaders.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\etc\message.xml"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\scripts\messages\message_template.msg"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/newview/newview_vc9.vcproj b/linden/indra/newview/newview_vc9.vcproj
deleted file mode 100644
index 6b693b5..0000000
--- a/linden/indra/newview/newview_vc9.vcproj
+++ /dev/null
@@ -1,4624 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="newview"
-	ProjectGUID="{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"
-	RootNamespace="newview"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat debug"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-sgd-1_34_1.lib libboost_signals-vc80-mt-sgd-1_34_1.lib libboost_program_options-vc80-mt-sgd-1_34_1.lib libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d-vc80.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/debugview.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
-				IgnoreDefaultLibraryNames="msvcrtd;libcd;libcmt"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="newview.map"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat debug"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat release"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/newview.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="newview.map"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat release"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseForDownload|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat releasefordownload"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Copying $(TargetFileName) to $(ProjectDir)"
-				CommandLine="copy $(TargetDir)\$(TargetFileName) $(ProjectDir)&#x0D;&#x0A;"
-				Outputs="$(TargetFileName)"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/SecondLife.exe"
-				LinkIncremental="0"
-				AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat releasefordownload"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Executing pre-build batch file"
-				CommandLine="prebuild.bat releasenoopt"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Oy-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;;..\..\libraries\include\Logitech_LCD;..\..\libraries\include\Logitech_LCD\LCDUI"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-				AssemblerOutput="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib dnsapi.lib lgLcd.lib EZ_LCD_Wrapper_vc8.lib libndofdev.lib"
-				OutputFile="$(ConfigurationName)/newview_noopt.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="newview.map"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Executing post-build batch file"
-				CommandLine="postbuild.bat releasenoopt"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\llagent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentdata.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentpilot.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llanimstatelabels.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewerwin32.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llassetuploadresponders.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiosourcevo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallbacklist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallingcard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcaphttpsender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llchatbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedstatsresponder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcloud.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorscheme.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorswatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandhandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandlineparser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompass.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompilequeue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llconfirmationmanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llconsole.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcontainerview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcubemap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurrencyuimanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcylinder.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugmessagebox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldelayedgestureerror.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldirpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolalpha.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolavatar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolbump.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolground.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsimple.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolterrain.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpooltree.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwlsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldriverparam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldynamictexture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llemote.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventnotifier.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventpoll.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llface.inl"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimerview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfeaturemanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfilepicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfirstuse.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llflexibleobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterabout.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateractivespeakers.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateranimpreview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterauction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatartextures.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuildoptions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbump.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuy.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycontents.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycurrency.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuyland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercamera.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchatterbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclassified.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclothing.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercolorpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercustomize.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdaycycle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdirectory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatereditui.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterenvsettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterfriends.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergodtools.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinvite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroups.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhardwaresettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtml.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtmlhelp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhud.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterimagepreview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterinspect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterjoystick.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlagmeter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandholdings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandmark.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermute.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternamedesc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternewim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateropenobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterparcel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpermissionsmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostcard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostprocess.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpreference.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterproperties.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterregioninfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreleasemsg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterscriptdebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersellland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersettingsdebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersnapshot.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterstats.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertelehub.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertest.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertools.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertopobjects.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertos.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurldisplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurlentry.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatervoicedevicesettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwindlight.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterworldmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfolderview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llfollowcam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestats.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestatview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgenepool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesturemgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgivemoney.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llglsandbox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llglslshader.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupnotify.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhippo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhoverview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectbeam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectlookat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectpointat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffecttrail.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudicon.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudmanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudrender.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudtext.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimpanel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llimview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryactions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorybridge.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryclipboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorymodel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoystickbutton.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmarklist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllcd.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogchat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanip.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniprotate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanipscale.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniptranslate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmapresponders.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaremotectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemoryview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenucommands.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmimetypes.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmorphview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmoveview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmutelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamebox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnameeditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamelistctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnetmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotify.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lloverlaybar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudioprefs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudiovolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelavatar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelclassified.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelcontents.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirbrowser.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirclassified.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirevents.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirfind.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirgroups.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpeople.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirplaces.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpopular.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldisplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelevent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgeneral.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupgeneral.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupinvite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouplandmoney.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupnotices.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouproles.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupvoting.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinput.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandmedia.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandobjects.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandoptions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelLCD.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellogin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmorph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmsgs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelnetwork.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpermissions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpick.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelplace.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelvolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelweb.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcelselection.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpatchvertexarray.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymesh.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymorph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpostprocess.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefschat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsvoice.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewanim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewgesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewlandmark.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewnotecard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewscript.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewsound.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewtexture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llprogressview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionposition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llremoteparcelrequest.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendersphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsavedsettingsglue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llselectmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llspatialpartition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsprite.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsrv.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstartup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatgraph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatusbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llstylemap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurfacepatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexlayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturecache.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturefetch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltool.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbrush.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolcomp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltooldraganddrop.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolfocus.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgrab.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgun.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolindividual.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmorph.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolobjpicker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpie.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpipette.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolplacer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectland.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectrect.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltracker.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltrans.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluploaddialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurldispatcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlhistory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlsimstring.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlwhitelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserauth.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvectorperfoptions.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvelocitybar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewchildren.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvieweraudio.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercamera.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercontrol.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerdisplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergenericmessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergesture.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimagelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerinventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointattachment.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_sse.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseForDownload|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseNoOpt|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_sse2.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseForDownload|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseNoOpt|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						EnableEnhancedInstructionSet="0"
-						UsePrecompiledHeader="2"
-						WarnAsError="false"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh_vec.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoystick.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerkeyboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerlayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermedia.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenu.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenufile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermessage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewernetwork.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobject.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobjectlist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmedia.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmediaautoplay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmgr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparceloverlay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsource.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerregion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerstats.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertexteditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertextureanim.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerthrottle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewervisualparam.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerwindow.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlcomposition.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlmanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoavatar.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvocache.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoclouds.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvograss.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoground.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceclient.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceremotectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoicevisualizer.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoinventorylistener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvopartgroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosurfacepatch.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotextbubble.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotree.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvovolume.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowlsky.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwatchdog.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparammanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparamset.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearable.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearablelist.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llweb.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwebbrowserctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwind.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlanimator.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwldaycycle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparammanager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparamset.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworld.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmapview.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlrpctransaction.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\noise.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\pipeline.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llagent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentdata.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llagentpilot.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llanimstatelabels.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llappearance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llappviewerwin32.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llassetuploadresponders.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llaudiosourcevo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llautocomplete.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallbacklist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcallingcard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcaphttpsender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llchatbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llclassifiedstatsresponder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcloud.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorscheme.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcolorswatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandhandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcommandlineparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcompilequeue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llconfirmationmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llconsole.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcontainerview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcubemap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcurrencyuimanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcylinder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugmessagebox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldebugview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldelayedgestureerror.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldirpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolalpha.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolavatar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolbump.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolground.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsimple.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolterrain.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpooltree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldrawpoolwlsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldriverparam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lldynamictexture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llemote.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventemitter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventnotifier.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lleventpoll.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfasttimerview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfeaturemanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfilepicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfilist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfirstuse.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llflexibleobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterabout.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateractivespeakers.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateranimpreview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterauction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatarpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateravatartextures.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuildoptions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbump.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuy.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycontents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuycurrency.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterbuyland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterchatterbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclassified.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterclothing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercolorpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatercustomize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdaycycle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterdirectory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatereditui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterenvsettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterevent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterfriends.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergodtools.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroupinvite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatergroups.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhardwaresettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtml.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhtmlhelp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterhud.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterimagepreview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterinspect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterjoystick.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlagmeter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandholdings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterlandmark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatermute.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternamedesc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaternewim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloateropenobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterparcel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpermissionsmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostcard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpostprocess.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterpreference.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterproperties.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterregioninfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreleasemsg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterreporter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterscriptdebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersellland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersettingsdebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterskysettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatersnapshot.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterstats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertelehub.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertest.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertools.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertopobjects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatertos.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurldisplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterurlentry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloatervoicedevicesettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterwindlight.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfloaterworldmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfolderview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llfollowcam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llframestatview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgenepool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgesturemgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgivemoney.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llglslshader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llgroupnotify.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhippo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhoverview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectbeam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectlookat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffectpointat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudeffecttrail.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudicon.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudrender.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudtext.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llhudview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimpanel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llimview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorybridge.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryclipboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventorymodel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lljoystickbutton.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllandmarklist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllcd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllightconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lllogchat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanip.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniprotate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmanipscale.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmaniptranslate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmediaremotectrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmemoryview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmenucommands.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmimetypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmorphview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmoveview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llmutelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamebox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnameeditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnamelistctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnetmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llnotify.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lloverlaybar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudioprefs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelaudiovolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelavatar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelclassified.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelcontents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelcreate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirbrowser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirclassified.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirevents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirfind.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirgroups.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpeople.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirplaces.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldirpopular.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpaneldisplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelevent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgeneral.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupgeneral.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupinvite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouplandmoney.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupnotices.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgrouproles.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelgroupvoting.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinput.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelinventory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandmedia.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandobjects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellandoptions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelLCD.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanellogin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmorph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelmsgs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelnetwork.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpermissions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelpick.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelplace.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelvolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpanelweb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llparcelselection.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpatchvertexarray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymesh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpolymorph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpostprocess.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefschat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprefsvoice.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewanim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewgesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewlandmark.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewnotecard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewscript.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewsound.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llpreviewtexture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llprogressview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llregionposition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llremoteparcelrequest.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrendersphere.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llresourcedata.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llrig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsavedsettingsglue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llselectmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llspatialpartition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsprite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsrv.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstartup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatgraph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatusbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstatview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llstylemap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsurfacepatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexlayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturebar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturecache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturectrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltexturefetch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltextureview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltool.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolbrush.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolcomp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltooldraganddrop.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolfocus.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgrab.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolgun.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolindividual.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolmorph.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolobjpicker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpie.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolpipette.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolplacer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectland.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolselectrect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltoolview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltracker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltrans.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluiconstants.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluploaddialog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurldispatcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlhistory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlsimstring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llurlwhitelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserauth.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lluvscreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvectorperfoptions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvelocitybar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewchildren.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerassetstorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvieweraudio.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerbuild.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercamera.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewercontrol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerdisplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergenericmessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewergesture.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerimagelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerinventory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoint.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointattachment.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjointmesh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerjoystick.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerkeyboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerlayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermedia.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermenufile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewermessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewernetwork.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerobjectlist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmedia.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmediaautoplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparcelmgr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerparceloverlay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerpartsource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerregion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerstats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertexteditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewertextureanim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerthrottle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewervisualparam.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llviewerwindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlcomposition.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvlmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoavatar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvocache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoclouds.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvograss.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoground.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoiceremotectrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoicevisualizer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvoinventorylistener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvopartgroup.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvosurfacepatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotextbubble.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvotree.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvovolume.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowater.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llvowlsky.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwatchdog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparammanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwaterparamset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwearablelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llweb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwebbrowserctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwind.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwindebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlanimator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwldaycycle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparammanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llwlparamset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworld.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llworldmapview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llxmlrpctransaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\noise.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pipeline.h"
-				>
-			</File>
-			<File
-				RelativePath=".\randgauss.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VertexCache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\viewer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\VorbisFramework.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="xml;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\skins\xui\en-us\alerts.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\anim.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\res\arrowcop.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\arrowcopmulti.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\bitmap2.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\res\bitmap4.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\colors.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\colors_base.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_about.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_about_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_active_speakers.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_animation_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_auction.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_audio_volume.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_avatar_picker.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_avatar_textures.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_build_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_bumps.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_contents.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_currency.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_buy_object.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_chat_history.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_chatterbox.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_choose_group.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_clothing.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_color_picker.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_critical.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_customize.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_day_cycle_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_device_settings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_directory.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_friends.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_gesture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_god_tools.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_group_info.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_groups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_hardware_settings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_html.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_html_help.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_image_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_import.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inspect.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message_ad_hoc.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_instant_message_group.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory_item_properties.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_inventory_view_finder.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_joystick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_lagmeter.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_land_holdings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_landmark_ctrl.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_live_lsleditor.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_lsl_guide.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_media_browser.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_moveview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_mute.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_my_friends.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_name_description.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_new_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_new_outfit_dialog.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_openobject.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_pay.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_pay_object.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_postcard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preferences.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_animation.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_classified.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_embedded_texture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_event.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_existing_landmark.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_gesture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_new_landmark.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_notecard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_notecard_keep_discard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_sound.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_texture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_texture_keep_discard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_preview_url.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_price_for_listing.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_profile.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_rate.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_region_info.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_report_abuse.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_report_bug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_debug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_ed_panel.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_preview_new.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_queue.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_script_search.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_select_key.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sell_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_settings_debug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sim_release_message.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_snapshot.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_sound_preview.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_telehub.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_test.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_texture_ctrl.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_tools.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_top_objects.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_tos.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_url_entry.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_voice_wizard.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_water.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_wearable_save_as.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_windlight_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\floater_world_map.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\gpu_table.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\grass.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\high_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\icon1.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\Info-SecondLife.plist"
-				>
-			</File>
-			<File
-				RelativePath=".\English.lproj\InfoPlist.strings"
-				>
-			</File>
-			<File
-				RelativePath=".\res\install_icon.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\keys.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\keywords.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\LCD_text.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\ll_icon.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrow.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrowdrag.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrowdragmulti.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llarrowlocked.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llgrablocked.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\llnolocked.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolcamera.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolcreate.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolfocus.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolgrab.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolland.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolpan.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolpipette.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolrotate.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolscale.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltooltranslate.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\lltoolzoomin.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\loginbackground.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\low_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_inventory.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_login.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_attachment.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_avatar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_land.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_object.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_pie_self.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_slurl.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\menu_viewer.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\mid_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\mime_types.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\newViewRes.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\notify.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\notify.xml.bak"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_details.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_planning.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_account_transactions.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_audio.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_audio_device.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_classified.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_bars.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_bg_tab.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_chat_bar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_classified.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_event.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_friends.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_finder.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_general.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_invite.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_land_money.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_notices.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_roles.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_group_voting.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_groups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_land_covenant.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_login.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_master_volume.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_controls.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_remote.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_media_remote_expanded.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_music_remote.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_overlaybar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_place.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_place_small.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_audio.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_chat.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_general.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_graphics1.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_input.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_LCD.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_network.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_popups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_voice.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_preferences_web.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_covenant.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_debug.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_estate.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_general.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_terrain.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_region_texture.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_scrolling_param.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_chat.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_im.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_msgbox.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_network.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_settings_web.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_speaker_controls.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_status_bar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_toolbar.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_top_pick.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_controls.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_enable.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_options.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_remote.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\panel_voice_remote_expanded.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\popups.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\releasenotes.full.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\releasenotes.txt"
-				>
-			</File>
-			<File
-				RelativePath=".\res\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\role_actions.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\std_bump.ini"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\teleport_strings.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolbuy.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolopen.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolpay.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolpickobject3.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolpipette.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\res\toolsit.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\trees.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\app_settings\ultra_graphics.xml"
-				>
-			</File>
-			<File
-				RelativePath=".\skins\xui\en-us\xui_version.xml"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\llviewerprecompiledheaders.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\llviewerprecompiledheaders.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\etc\message.xml"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message.xml"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message.xml&#x0D;&#x0A;"
-					Outputs="./app_settings/message.xml"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\scripts\messages\message_template.msg"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseForDownload|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="ReleaseNoOpt|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Copying message template"
-					CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"
-					Outputs="./app_settings/message_template.msg"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index cd546d4..0827986 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -93,7 +93,7 @@
 #include "llworld.h"
 #include "llcubemap.h"
 #include "lldebugmessagebox.h"
-#include "llglslshader.h"
+#include "llviewershadermgr.h"
 #include "llviewerjoystick.h"
 #include "llviewerdisplay.h"
 #include "llwlparammanager.h"
@@ -139,6 +139,24 @@ const LLMatrix4* gGLLastMatrix = NULL;
 
 //----------------------------------------
 
+std::string gPoolNames[] = 
+{
+	// Correspond to LLDrawpool enum render type
+	"NONE",
+	"POOL_SIMPLE",
+	"POOL_TERRAIN",	
+	"POOL_TREE",
+	"POOL_SKY",
+	"POOL_WL_SKY",
+	"POOL_GROUND",
+	"POOL_BUMP",
+	"POOL_INVISIBLE",
+	"POOL_AVATAR",
+	"POOL_WATER",
+	"POOL_GLOW",
+	"POOL_ALPHA",
+};
+
 U32 nhpo2(U32 v) 
 {
 	U32 r = 1;
@@ -197,6 +215,7 @@ glh::matrix4f gl_ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
 	return ret;
 }
 
+void display_update_camera();
 //----------------------------------------
 
 S32		LLPipeline::sCompiles = 0;
@@ -210,7 +229,6 @@ BOOL	LLPipeline::sRenderParticleBeacons = FALSE;
 BOOL	LLPipeline::sRenderSoundBeacons = FALSE;
 BOOL	LLPipeline::sRenderBeacons = FALSE;
 BOOL	LLPipeline::sRenderHighlight = TRUE;
-BOOL	LLPipeline::sRenderProcessBeacons = FALSE;
 S32		LLPipeline::sUseOcclusion = 0;
 BOOL	LLPipeline::sFastAlpha = TRUE;
 BOOL	LLPipeline::sDisableShaders = FALSE;
@@ -224,6 +242,8 @@ BOOL	LLPipeline::sImpostorRender = FALSE;
 BOOL	LLPipeline::sUnderWaterRender = FALSE;
 BOOL	LLPipeline::sTextureBindTest = FALSE;
 BOOL	LLPipeline::sRenderFrameTest = FALSE;
+BOOL	LLPipeline::sRenderAttachedLights = TRUE;
+BOOL	LLPipeline::sRenderAttachedParticles = TRUE;
 
 static LLCullResult* sCull = NULL;
 
@@ -240,10 +260,30 @@ static const U32 gl_cube_face[] =
 void validate_framebuffer_object();
 
 LLPipeline::LLPipeline() :
+	mBackfaceCull(FALSE),
+	mBatchCount(0),
+	mMatrixOpCount(0),
+	mTextureMatrixOps(0),
+	mMaxBatchSize(0),
+	mMinBatchSize(0),
+	mMeanBatchSize(0),
+	mTrianglesDrawn(0),
+	mNumVisibleNodes(0),
+	mVerticesRelit(0),
+	mLightingChanges(0),
+	mGeometryChanges(0),
+	mNumVisibleFaces(0),
+
 	mCubeBuffer(NULL),
+	mCubeFrameBuffer(0),
+	mCubeDepth(0),
 	mInitialized(FALSE),
 	mVertexShadersEnabled(FALSE),
 	mVertexShadersLoaded(0),
+	mRenderTypeMask(0),
+	mRenderDebugFeatureMask(0),
+	mRenderDebugMask(0),
+	mOldRenderDebugMask(0),
 	mLastRebuildPool(NULL),
 	mAlphaPool(NULL),
 	mSkyPool(NULL),
@@ -256,15 +296,11 @@ LLPipeline::LLPipeline() :
 	mBumpPool(NULL),
 	mWLSkyPool(NULL),
 	mLightMask(0),
-	mLightMovingMask(0)
+	mLightMovingMask(0),
+	mLightingDetail(0)
 {
-	//mFramebuffer[0] = mFramebuffer[1] = mFramebuffer[2] = mFramebuffer[3] = 0;
 	mBlurCubeBuffer[0] = mBlurCubeBuffer[1] = mBlurCubeBuffer[2] = 0;
 	mBlurCubeTexture[0] = mBlurCubeTexture[1] = mBlurCubeTexture[2] = 0;
-
-	//mDepthbuffer[0] = mDepthbuffer[1] = 0;
-	mCubeFrameBuffer = 0;
-	mCubeDepth = 0;
 }
 
 void LLPipeline::init()
@@ -273,6 +309,8 @@ void LLPipeline::init()
 
 	sDynamicLOD = gSavedSettings.getBOOL("RenderDynamicLOD");
 	sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
+	sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights");
+	sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles");
 
 	mInitialized = TRUE;
 	
@@ -300,7 +338,7 @@ void LLPipeline::init()
 	
 	// Enable features
 		
-	LLShaderMgr::setShaders();
+	LLViewerShaderMgr::instance()->setShaders();
 
 	stop_glerror();
 }
@@ -439,12 +477,6 @@ void LLPipeline::releaseGLBuffers()
 		mCubeDepth = mCubeFrameBuffer = 0;
 	}
 
-	/*if (mFramebuffer[0])
-	{
-		glDeleteFramebuffersEXT(4, mFramebuffer);
-		mFramebuffer[0] = mFramebuffer[1] = mFramebuffer[2] = mFramebuffer[3] = 0;
-	}*/
-
 	if (mBlurCubeBuffer[0])
 	{
 		glDeleteFramebuffersEXT(3, mBlurCubeBuffer);
@@ -539,7 +571,6 @@ void LLPipeline::createGLBuffers()
 #endif
 	}
 
-
 	stop_glerror();
 
 	if (LLPipeline::sRenderGlow)
@@ -551,12 +582,12 @@ void LLPipeline::createGLBuffers()
 		{
 			mGlow[i].allocate(512,glow_res,GL_RGBA,FALSE);
 		}
+		
+		GLuint resX = gViewerWindow->getWindowDisplayWidth();
+		GLuint resY = gViewerWindow->getWindowDisplayHeight();
+		
+		mScreen.allocate(resX, resY, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB);
 	}
-
-	GLuint resX = gViewerWindow->getWindowDisplayWidth();
-	GLuint resY = gViewerWindow->getWindowDisplayHeight();
-	
-	mScreen.allocate(resX, resY, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB);
 }
 
 void LLPipeline::restoreGL() 
@@ -565,7 +596,7 @@ void LLPipeline::restoreGL()
 
 	if (mVertexShadersEnabled)
 	{
-		LLShaderMgr::setShaders();
+		LLViewerShaderMgr::instance()->setShaders();
 	}
 
 	for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
@@ -603,18 +634,18 @@ BOOL LLPipeline::canUseWindLightShaders() const
 {
 	return (!LLPipeline::sDisableShaders &&
 			gWLSkyProgram.mProgramObject != 0 &&
-			LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_WINDLIGHT) > 1);
+			LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1);
 }
 
 BOOL LLPipeline::canUseWindLightShadersOnObjects() const
 {
 	return (canUseWindLightShaders() 
-		&& LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT) > 0);
+		&& LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0);
 }
 
 void LLPipeline::unloadShaders()
 {
-	LLShaderMgr::unloadShaders();
+	LLViewerShaderMgr::instance()->unloadShaders();
 
 	mVertexShadersLoaded = 0;
 }
@@ -660,7 +691,7 @@ S32 LLPipeline::setLightingDetail(S32 level)
 
 		if (mVertexShadersLoaded == 1)
 		{
-			LLShaderMgr::setShaders();
+			LLViewerShaderMgr::instance()->setShaders();
 		}
 	}
 	return mLightingDetail;
@@ -870,7 +901,7 @@ void LLPipeline::allocDrawable(LLViewerObject *vobj)
 	
 	//encompass completely sheared objects by taking 
 	//the most extreme point possible (<1,1,0.5>)
-	drawable->setRadius(LLVector3(1,1,0.5f).scaleVec(vobj->getScale()).magVec());
+	drawable->setRadius(LLVector3(1,1,0.5f).scaleVec(vobj->getScale()).length());
 	if (vobj->isOrphaned())
 	{
 		drawable->setState(LLDrawable::FORCE_INVISIBLE);
@@ -1133,7 +1164,7 @@ void LLPipeline::updateMove()
 F32 LLPipeline::calcPixelArea(LLVector3 center, LLVector3 size, LLCamera &camera)
 {
 	LLVector3 lookAt = center - camera.getOrigin();
-	F32 dist = lookAt.magVec();
+	F32 dist = lookAt.length();
 
 	//ramp down distance for nearby objects
 	if (dist < 16.f)
@@ -1144,7 +1175,7 @@ F32 LLPipeline::calcPixelArea(LLVector3 center, LLVector3 size, LLCamera &camera
 	}
 
 	//get area of circle around node
-	F32 app_angle = atanf(size.magVec()/dist);
+	F32 app_angle = atanf(size.length()/dist);
 	F32 radius = app_angle*LLDrawable::sCurPixelAngle;
 	return radius*radius * 3.14159f;
 }
@@ -1582,6 +1613,9 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
 			}
 		}
 	}
+
+	LLHUDText::shiftAll(offset);
+	display_update_camera();
 }
 
 void LLPipeline::markTextured(LLDrawable *drawablep)
@@ -1766,6 +1800,12 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
 		{
 			return;
 		}
+
+		LLVOAvatar* avatarp = (LLVOAvatar*) drawablep->getVObj().get();
+		if (!avatarp->isVisible())
+		{
+			return;
+		}
 	}
 
 	assertInitialized();
@@ -1795,7 +1835,7 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
 			else if (drawablep->isAvatar())
 			{
 				drawablep->updateDistance(camera); // calls vobj->updateLOD() which calls LLVOAvatar::updateVisibility()
-			}
+		}
 		}
 	}
 
@@ -2060,8 +2100,8 @@ void LLPipeline::postSort(LLCamera& camera)
 		std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater());
 	}
 
-	// only render if the flag is set. The flag is only set if the right key is pressed, we are in edit mode or the toggle is set in the menus
-	if (sRenderProcessBeacons)
+	// 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 (sRenderScriptedTouchBeacons)
 		{
@@ -2132,6 +2172,8 @@ void LLPipeline::postSort(LLCamera& camera)
 		} func;
 		LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
 	}
+
+	LLSpatialGroup::sNoDelete = FALSE;
 }
 
 
@@ -2151,6 +2193,7 @@ void render_hud_elements()
 	gGL.color4f(1,1,1,1);
 	if (!LLPipeline::sReflectionRender && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
 	{
+		LLGLEnable multisample(GL_MULTISAMPLE_ARB);
 		gViewerWindow->renderSelections(FALSE, FALSE, FALSE); // For HUD version in render_ui_3d()
 	
 		// Draw the tracking overlays
@@ -2186,14 +2229,15 @@ void LLPipeline::renderHighlights()
 
 	// Draw 3D UI elements here (before we clear the Z buffer in POOL_HUD)
 	// Render highlighted faces.
+	LLGLSPipelineAlpha gls_pipeline_alpha;
 	LLColor4 color(1.f, 1.f, 1.f, 0.5f);
 	LLGLEnable color_mat(GL_COLOR_MATERIAL);
 	disableLights();
 
-	if ((LLShaderMgr::sVertexShaderLevel[LLShaderMgr::SHADER_INTERFACE] > 0))
+	if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_INTERFACE) > 0))
 	{
 		gHighlightProgram.bind();
-		gHighlightProgram.vertexAttrib4f(LLShaderMgr::MATERIAL_COLOR,1,1,1,0.5f);
+		gHighlightProgram.vertexAttrib4f(LLViewerShaderMgr::MATERIAL_COLOR,1,1,1,0.5f);
 	}
 	
 	if (hasRenderDebugFeatureMask(RENDER_DEBUG_FEATURE_SELECTED))
@@ -2223,9 +2267,9 @@ void LLPipeline::renderHighlights()
 	{
 		// Paint 'em red!
 		color.setVec(1.f, 0.f, 0.f, 0.5f);
-		if ((LLShaderMgr::sVertexShaderLevel[LLShaderMgr::SHADER_INTERFACE] > 0))
+		if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_INTERFACE) > 0))
 		{
-			gHighlightProgram.vertexAttrib4f(LLShaderMgr::MATERIAL_COLOR,1,0,0,0.5f);
+			gHighlightProgram.vertexAttrib4f(LLViewerShaderMgr::MATERIAL_COLOR,1,0,0,0.5f);
 		}
 		int count = mHighlightFaces.size();
 		for (S32 i = 0; i < count; i++)
@@ -2239,7 +2283,7 @@ void LLPipeline::renderHighlights()
 	// have touch-handlers.
 	mHighlightFaces.clear();
 
-	if (LLShaderMgr::sVertexShaderLevel[LLShaderMgr::SHADER_INTERFACE] > 0)
+	if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_INTERFACE) > 0)
 	{
 		gHighlightProgram.unbind();
 	}
@@ -2339,7 +2383,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 
 	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING))
 	{
-		gObjectList.renderObjectsForSelect(camera);
+		gObjectList.renderObjectsForSelect(camera, gViewerWindow->getVirtualWindowRect());
 	}
 	else if (gSavedSettings.getBOOL("RenderDeferred"))
 	{
@@ -2407,9 +2451,10 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 						{
 							llerrs << "GL matrix stack corrupted!" << llendl;
 						}
-						LLGLState::checkStates();
-						LLGLState::checkTextureChannels();
-						LLGLState::checkClientArrays();
+						std::string msg = llformat("%s pass %d", gPoolNames[cur_type].c_str(), i);
+						LLGLState::checkStates(msg);
+						LLGLState::checkTextureChannels(msg);
+						LLGLState::checkClientArrays(msg);
 					}
 				}
 			}
@@ -2589,7 +2634,7 @@ void LLPipeline::renderDebug()
 	gGL.flush();
 }
 
-void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
+void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render_transparent, const LLRect& screen_rect)
 {
 	assertInitialized();
 
@@ -2642,7 +2687,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
 	}	
 
 	LLGLEnable alpha_test(GL_ALPHA_TEST);
-	if (gPickTransparent)
+	if (render_transparent)
 	{
 		gGL.setAlphaRejectSettings(LLRender::CF_GREATER_EQUAL, 0.f);
 	}
@@ -2687,14 +2732,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
 		glh::matrix4f save_proj(glh_get_current_projection());
 		glh::matrix4f save_model(glh_get_current_modelview());
 
-		U32 viewport[4];
-
-		for (U32 i = 0; i < 4; i++)
-		{
-			viewport[i] = gGLViewport[i];
-		}
-		
-		setup_hud_matrices(TRUE);
+		setup_hud_matrices(screen_rect);
 		for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); 
 			 iter != avatarp->mAttachmentPoints.end(); )
 		{
@@ -2721,12 +2759,15 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
 					}
 
 					//render child faces
-					for (U32 k = 0; k < drawable->getChildCount(); ++k)
+					LLViewerObject::const_child_list_t& child_list = objectp->getChildren();
+					for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+						 iter != child_list.end(); iter++)
 					{
-						LLDrawable* child = drawable->getChild(k);
-						for (S32 l = 0; l < child->getNumFaces(); ++l)
+						LLViewerObject* child = *iter;
+						LLDrawable* child_drawable = child->mDrawable;
+						for (S32 l = 0; l < child_drawable->getNumFaces(); ++l)
 						{
-							LLFace* facep = child->getFace(l);
+							LLFace* facep = child_drawable->getFace(l);
 							if (!facep->getPool())
 							{
 								facep->renderForSelect(prim_mask);
@@ -2746,11 +2787,6 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
 		glh_set_current_modelview(save_model);
 
 	
-		for (U32 i = 0; i < 4; i++)
-		{
-			gGLViewport[i] = viewport[i];
-		}
-		glViewport(gGLViewport[0], gGLViewport[1], gGLViewport[2], gGLViewport[3]);
 	}
 
 	gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
@@ -2760,11 +2796,6 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
 	gGL.setColorMask(true, true);
 }
 
-void LLPipeline::renderFaceForUVSelect(LLFace* facep)
-{
-	if (facep) facep->renderSelectedUV();
-}
-
 void LLPipeline::rebuildPools()
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE);
@@ -3129,7 +3160,7 @@ static F32 calc_light_dist(LLVOVolume* light, const LLVector3& cam_pos, F32 max_
 	F32 radius = light->getLightRadius();
 	BOOL selected = light->isSelected();
 	LLVector3 dpos = light->getRenderPosition() - cam_pos;
-	F32 dist2 = dpos.magVecSquared();
+	F32 dist2 = dpos.lengthSquared();
 	if (!selected && dist2 > (max_dist + radius)*(max_dist + radius))
 	{
 		return max_dist;
@@ -3188,12 +3219,16 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
 				if (light->fade <= -LIGHT_FADE_TIME)
 				{
 					drawable->clearState(LLDrawable::NEARBY_LIGHT);
+					continue;
 				}
-				else
+				if (!sRenderAttachedLights && volight && volight->isAttachment())
 				{
-					F32 dist = calc_light_dist(volight, cam_pos, max_dist);
-					cur_nearby_lights.insert(Light(drawable, dist, light->fade));
+					drawable->clearState(LLDrawable::NEARBY_LIGHT);
+					continue;
 				}
+
+				F32 dist = calc_light_dist(volight, cam_pos, max_dist);
+				cur_nearby_lights.insert(Light(drawable, dist, light->fade));
 			}
 			mNearbyLights = cur_nearby_lights;
 		}
@@ -3951,13 +3986,47 @@ BOOL LLPipeline::getRenderHighlights(void*)
 	return sRenderHighlight;
 }
 
-// static
-BOOL LLPipeline::getProcessBeacons(void* data)
+LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end,
+														S32* face_hit,
+														LLVector3* intersection,         // return the intersection point
+														LLVector2* tex_coord,            // return the texture coordinates of the intersection point
+														LLVector3* normal,               // return the surface normal at the intersection point
+														LLVector3* bi_normal             // return the surface bi-normal at the intersection point
+	)
 {
-	return sRenderProcessBeacons;
+	LLDrawable* drawable = NULL;
+
+	for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+			iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+	{
+		LLViewerRegion* region = *iter;
+
+		for (U32 j = 0; j < LLViewerRegion::NUM_PARTITIONS; j++)
+		{
+			if ((j == LLViewerRegion::PARTITION_VOLUME) || (j == LLViewerRegion::PARTITION_BRIDGE))  // only check these partitions for now
+			{
+				LLSpatialPartition* part = region->getSpatialPartition(j);
+				if (part)
+				{
+					LLDrawable* hit = part->lineSegmentIntersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
+					if (hit)
+					{
+						drawable = hit;
+					}
+				}
+			}
+		}
+	}
+	return drawable ? drawable->getVObj().get() : NULL;
 }
 
-LLViewerObject* LLPipeline::pickObject(const LLVector3 &start, const LLVector3 &end, LLVector3 &collision)
+LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end,
+													  S32* face_hit,
+													  LLVector3* intersection,         // return the intersection point
+													  LLVector2* tex_coord,            // return the texture coordinates of the intersection point
+													  LLVector3* normal,               // return the surface normal at the intersection point
+													  LLVector3* bi_normal             // return the surface bi-normal at the intersection point
+	)
 {
 	LLDrawable* drawable = NULL;
 
@@ -3965,10 +4034,11 @@ LLViewerObject* LLPipeline::pickObject(const LLVector3 &start, const LLVector3 &
 			iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
 	{
 		LLViewerRegion* region = *iter;
-		LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
+
+		LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_HUD);
 		if (part)
 		{
-			LLDrawable* hit = part->pickDrawable(start, end, collision);
+			LLDrawable* hit = part->lineSegmentIntersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
 			if (hit)
 			{
 				drawable = hit;
@@ -3999,11 +4069,6 @@ void LLPipeline::resetVertexBuffers(LLDrawable* drawable)
 		return;
 	}
 
-	if (!drawable)
-	{
-		return;
-	}
-
 	for (S32 i = 0; i < drawable->getNumFaces(); i++)
 	{
 		LLFace* facep = drawable->getFace(i);
@@ -5119,7 +5184,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	//glh::matrix4f ortho = gl_ortho(-tdim.mV[0], tdim.mV[0], -tdim.mV[1], tdim.mV[1], 1.0, 256.0);
-	F32 distance = (pos-camera.getOrigin()).magVec();
+	F32 distance = (pos-camera.getOrigin()).length();
 	F32 fov = atanf(tdim.mV[1]/distance)*2.f*RAD_TO_DEG;
 	F32 aspect = tdim.mV[0]/tdim.mV[1]; //128.f/256.f;
 	glh::matrix4f persp = gl_perspective(fov, aspect, 1.f, 256.f);
@@ -5197,7 +5262,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 		LLGLDepthTest depth(GL_FALSE, GL_FALSE);
 
 		gGL.color4f(1,1,1,1);
-		gGL.color4ub(64,64,64,1);
+		gGL.color4ub(64,64,64,255);
 		gGL.begin(LLVertexBuffer::QUADS);
 		gGL.vertex3fv((pos+left-up).mV);
 		gGL.vertex3fv((pos-left-up).mV);
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index 8b032ec..e21d143 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -65,8 +65,8 @@ typedef enum e_avatar_skinning_method
 
 BOOL compute_min_max(LLMatrix4& box, LLVector2& min, LLVector2& max); // Shouldn't be defined here!
 bool LLRayAABB(const LLVector3 &center, const LLVector3 &size, const LLVector3& origin, const LLVector3& dir, LLVector3 &coord, F32 epsilon = 0);
-BOOL LLLineSegmentAABB(const LLVector3& start, const LLVector3& end, const LLVector3& center, const LLVector3& size);
-BOOL setup_hud_matrices(BOOL for_select);
+BOOL setup_hud_matrices(); // use whole screen to render hud
+BOOL setup_hud_matrices(const LLRect& screen_region); // specify portion of screen (in pixels) to render hud attachments from (for picking)
 glh::matrix4f glh_copy_matrix(GLdouble* src);
 glh::matrix4f glh_get_current_modelview();
 void glh_set_current_modelview(const glh::matrix4f& mat);
@@ -129,8 +129,21 @@ public:
 	void        markTextured(LLDrawable *drawablep);
 	void        markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags flag = LLDrawable::REBUILD_ALL, BOOL priority = FALSE);
 		
-	//get the object between start and end that's closest to start.  Return the point of collision in collision.
-	LLViewerObject* pickObject(const LLVector3 &start, const LLVector3 &end, LLVector3 &collision);
+	//get the object between start and end that's closest to start.
+	LLViewerObject* lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end,
+												S32* face_hit,                          // return the face hit
+												LLVector3* intersection = NULL,         // return the intersection point
+												LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
+												LLVector3* normal = NULL,               // return the surface normal at the intersection point
+												LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point  
+		);
+	LLViewerObject* lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end,
+											  S32* face_hit,                          // return the face hit
+											  LLVector3* intersection = NULL,         // return the intersection point
+											  LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
+											  LLVector3* normal = NULL,               // return the surface normal at the intersection point
+											  LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point
+		);
 
 	// Something about these textures has changed.  Dirty them.
 	void        dirtyPoolObjectTextures(const std::set<LLViewerImage*>& textures);
@@ -185,8 +198,7 @@ public:
 	void renderHighlights();
 	void renderDebug();
 
-	void renderForSelect(std::set<LLViewerObject*>& objects);
-	void renderFaceForUVSelect(LLFace* facep);
+	void renderForSelect(std::set<LLViewerObject*>& objects, BOOL render_transparent, const LLRect& screen_rect);
 	void rebuildPools(); // Rebuild pools
 
 	void findReferences(LLDrawable *drawablep);	// Find the lists which have references to this object
@@ -261,8 +273,6 @@ public:
 	static void toggleRenderHighlights(void* data);
 	static BOOL getRenderHighlights(void* data);
 
-	static BOOL getProcessBeacons(void* data);
-
 private:
 	void unloadShaders();
 	void addToQuickLookup( LLDrawPool* new_poolp );
@@ -329,7 +339,8 @@ public:
 		RENDER_DEBUG_TEXTURE_ANIM		= 0x080000,
 		RENDER_DEBUG_LIGHTS				= 0x100000,
 		RENDER_DEBUG_BATCH_SIZE			= 0x200000,
-		RENDER_DEBUG_SHAME				= 0x400000,
+		RENDER_DEBUG_RAYCAST            = 0x400000,
+		RENDER_DEBUG_SHAME				= 0x800000
 	};
 
 public:
@@ -376,6 +387,8 @@ public:
 	static BOOL				sRenderGlow;
 	static BOOL				sTextureBindTest;
 	static BOOL				sRenderFrameTest;
+	static BOOL				sRenderAttachedLights;
+	static BOOL				sRenderAttachedParticles;
 	
 	//screen texture
 	LLRenderTarget			mScreen;
@@ -390,10 +403,6 @@ public:
 
 	//texture for making the glow
 	LLRenderTarget				mGlow[3];
-	
-	//framebuffer objects for off-screen scratch space
-	//GLuint					mFramebuffer[4];
-	//GLuint					mDepthbuffer[2];
 
 	//dynamic cube map scratch space
 	LLPointer<LLCubeMap>	mCubeBuffer;
@@ -539,7 +548,6 @@ protected:
 public:
 	static BOOL				sRenderBeacons;
 	static BOOL				sRenderHighlight;
-	static BOOL				sRenderProcessBeacons;
 };
 
 void render_bbox(const LLVector3 &min, const LLVector3 &max);
diff --git a/linden/indra/newview/postbuild.bat b/linden/indra/newview/postbuild.bat
deleted file mode 100644
index f8859ac..0000000
--- a/linden/indra/newview/postbuild.bat
+++ /dev/null
@@ -1,167 +0,0 @@
-@echo off
-
-if %1==debug goto debug
-if %1==release goto release
-if %1==releasenoopt goto releasenoopt
-if %1==releasefordownload goto releasefordownload
-
-echo ** unknown configuration **
-goto end
-
-:debug
-echo copying debug files
-xcopy ..\..\libraries\i686-win32\lib_debug\freebl3.dll			.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\gksvggdiplus.dll		.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\js3250.dll			.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\nspr4.dll				.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\nss3.dll				.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\nssckbi.dll			.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\plc4.dll				.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\plds4.dll				.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\smime3.dll			.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\softokn3.dll			.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\ssl3.dll				.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\xpcom.dll				.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\xul.dll				.\debug\ /y
-xcopy ..\..\libraries\i686-win32\lib_debug\openjpegd.dll		.\debug\ /y
-rem --- this is required for mozilla debug builds and displays the aborty/retry/ignore dialog on an assert - crashes without it ---
-xcopy ..\..\libraries\i686-win32\lib_debug\windbgdlg.exe			.\debug\ /y
-
-rem --- runtime pieces for the bHear stuff.
-xcopy .\vivox-runtime\i686-win32\tntk.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\libeay32.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\SLVoice.exe	.\ /y
-xcopy .\vivox-runtime\i686-win32\ssleay32.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe	.\ /y
-xcopy .\vivox-runtime\i686-win32\srtp.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\alut.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\ortp.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\wrap_oal.dll	.\ /y
-
-@IF NOT EXIST ..\llkdu\Debug\llkdu.dll (
-	@IF EXIST ..\..\libraries\i686-win32\lib_debug\llkdu.dll (
-		SET KDU_DLL=..\..\libraries\i686-win32\lib_debug\llkdu.dll
-	) ELSE (
-		SET KDU_DLL=..\..\libraries\i686-win32\lib_release\llkdu.dll
-	)
-) ELSE (
-	SET KDU_DLL=..\llkdu\Debug\llkdu.dll
-)
-copy %KDU_DLL%  .\debug\ /y
-goto end
-
-:release
-echo copying release files
-xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll	.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll		.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll			.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\xul.dll				.\Release\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll		.\Release\ /y
-
-rem --- runtime pieces for the bHear stuff.
-xcopy .\vivox-runtime\i686-win32\tntk.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\libeay32.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\SLVoice.exe	.\ /y
-xcopy .\vivox-runtime\i686-win32\ssleay32.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe	.\ /y
-xcopy .\vivox-runtime\i686-win32\srtp.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\alut.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\ortp.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\wrap_oal.dll	.\ /y
-
-@IF NOT EXIST ..\llkdu\Release\llkdu.dll (
-	xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll 		.\Release\ /y
-) ELSE (
-	xcopy ..\llkdu\Release\llkdu.dll .\Release\ /y
-)
-goto end
-
-:releasenoopt
-echo copying releasenoopt files
-xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll	.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll		.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll			.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\xul.dll				.\ReleaseNoOpt\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll		.\ReleaseNoOpt\ /y
-
-rem --- runtime pieces for the bHear stuff.
-xcopy .\vivox-runtime\i686-win32\tntk.dll	. /y
-xcopy .\vivox-runtime\i686-win32\libeay32.dll	. /y
-xcopy .\vivox-runtime\i686-win32\SLVoice.exe	. /y
-xcopy .\vivox-runtime\i686-win32\ssleay32.dll	. /y
-xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe	. /y
-xcopy .\vivox-runtime\i686-win32\srtp.dll	. /y
-xcopy .\vivox-runtime\i686-win32\alut.dll	. /y
-xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll	. /y
-xcopy .\vivox-runtime\i686-win32\ortp.dll	. /y
-xcopy .\vivox-runtime\i686-win32\wrap_oal.dll	. /y
-
-@IF NOT EXIST ..\llkdu\ReleaseNoOpt\llkdu.dll (
-	xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll		.\ReleaseNoOpt\ /y
-) ELSE (
-  	xcopy ..\llkdu\ReleaseNoOpt\llkdu.dll .\ReleaseNoOpt\ /y
-)
-goto end
-
-:releasefordownload
-echo copying releasefordownload files
-xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll	.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll		.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll			.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\xul.dll				.\ReleaseForDownload\ /y
-xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll		.\ReleaseForDownload\ /y
-rem --- runtime pieces for the bHear stuff.
-xcopy .\vivox-runtime\i686-win32\tntk.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\libeay32.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\SLVoice.exe	.\ /y
-xcopy .\vivox-runtime\i686-win32\ssleay32.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe	.\ /y
-xcopy .\vivox-runtime\i686-win32\srtp.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\alut.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\ortp.dll	.\ /y
-xcopy .\vivox-runtime\i686-win32\wrap_oal.dll	.\ /y
-
-@IF NOT EXIST ..\llkdu\Release\llkdu.dll (
-	xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll		.\ReleaseForDownload\ /y
-) ELSE (
-	xcopy ..\llkdu\Release\llkdu.dll .\ReleaseForDownload\ /y
-)
-
-goto end
-:BuildFailed
-echo POSTBUILD FAILED
-exit 1
-:end
-echo POSTBUILD SUCCESSFUL
-
-:end
diff --git a/linden/indra/newview/prebuild.bat b/linden/indra/newview/prebuild.bat
deleted file mode 100755
index ee714f5..0000000
--- a/linden/indra/newview/prebuild.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-rem -- Check current message template against the master
-
-"../../scripts/template_verifier.py" --mode="development"  --cache_master
-
-if errorlevel 1 goto BuildFailed
-goto end
-
-:BuildFailed
-echo PREBUILD FAILED
-exit 1
-
-:end
-echo PREBUILD SUCCESSFUL
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
deleted file mode 100644
index 172c778..0000000
--- a/linden/indra/newview/releasenotes.txt
+++ /dev/null
@@ -1,569 +0,0 @@
-Release Notes for Second Life 1.20.15 July 23rd, 2008
-=====================================
-
-New features:
-* An improved architecture for the user interface (UI) which now supports:
-** Enhancements to the UI texture rendering system
-** Ability to customize text color of Instant Messages
-** Ability to reference textures by filename rather than UUID
-** Support for non-powers-of-two textures
-** Support for PNG textures
-
-* The viewer installs with a choice between two color themes ("skins") for the User Interface: 
-** This can be changed in Preferences > Skins (It requires a restart of the viewer to take effect.)
-** A new "Silver" skin refreshes the visual design of user interface with a lighter color scheme and improved UI graphics
-
-* The Tools menu is now hidden by default:
-** It displays in the top menu bar ONLY when editing/creating objects in build mode:
-** To enter build mode: click on the Build button, or right-click and select Create.
-** Existing tool short cuts (CTL + 1, 2, 3, 4, 5) all still work to select a specific tool, and will also activate the Tools menu.
-
-* Improvements to Search:
-** Classified ads have a drop-down menu to indicate Mature or Not Mature content
-** Search > Popular Places is replaced by a Search > Showcase tab that points to the web-based Showcase
-** Search > Groups now uses web-based search which dramatically improves relevant matches on multi-word queries, and reduces load on the central database
-*** NOTE:  The new Search > Groups does eliminate the ability to sort results alphabetically or by Group member count, as was possible in Viewer version 1.19.1.
-
-* Improved internationalization support:
-** Improved unicode system font support good Linux
-** The Preferences > General > Language: 'System Default' option works on Linux and Windows.
-*** If you have a non-English language Operating System, and have not previously selected "English" as your chosen language option in the viewer, this viewer will default to your Operating System's language!
-
-* Clicking on resident names in Local Chat or in a Group IM will open their Profile page
-** The color of clickable resident names uses the same color as URL hyperlinks in chat. These may be changed in Preferences > Text Chat > color picker for "URLs"
-
-* Newly created avatars without a gender, or any avatar where "clothing is still downloading", are rendered as a cloud rather than naked/wrong body shape
-
-* Added beta support for basic voice lipsync for voice visualization - via Advanced menu > Character > Enable Lip Sync (Beta)
-
-* Fly button is now shown as disabled when you are sitting
-
-* LSL scripting for object glow
-** A prim's glow attribute can be controlled by scripts. Additional documentation is found at http://wiki.secondlife.com/wiki/LlSetPrimitiveParams
-
-* Improved Joystick and 3D input device support:
-** Integrated a new open source library created by 3Dconnexion designed to integrate multi-axis input devices with Second Life
-** Joystick devices can now control the Avatar, Edited Objects, or the Flycam (View menu > Joystick Flycam)
-** Added a "Joystick Setup" window to the Preferences > Input & Camera tab; for adjusting multi axis input devices
-*** The settings are currently optimized for Logitech's 3Dconnexion SpaceNavigator but should be tunable for any joystick or 3D input device
-
-* Added five texture constants for referencing in llSetLinkTexture:
-** TEXTURE_BLANK is the non-transparent blank texture, equivalent to UUID "5748decc-f629-461c-9a36-a35a221fe21f"
-** TEXTURE_DEFAULT is the default plywood texture, equivalent to UUID "89556747-24cb-43ed-920b-47caed15465f"
-** TEXTURE_PLYWOOD is the default plywood texture, equivalent to UUID "89556747-24cb-43ed-920b-47caed15465f"
-** TEXTURE_TRANSPARENT is a fully transparent texture, equivalent to UUID "8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"
-** TEXTURE_MEDIA is the default Media texture, equivalent to UUID "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"
-** Note: TEXTURE_DEFAULT is a synonym for TEXTURE_PLYWOOD
-** Note on Compatibility:
-*** Scripts using these constants will run smoothly in all Second Life viewers, however previous versions of the viewer will NOT be able to edit
-    and recompile scripts using the new constants. Older versions will report "(XX,YY) : ERROR : Name not defined within scope" when trying to
-    compile such a script.
-*** If you are using an older version of the viewer that does not support the TEXTURE_ contants and want to edit and recompile scripts with a TEXTURE_ constant,
-    then you have to revert to the earlier LSL requirement to use the UUID of the texture you want to use.
-*** The TEXTURE_TRANSPARENT texture will be gray unless you view it with a viewer that supports this transparent texture (viewer 1.20.10 or above).
-
-* Thread monitoring to catch freezes for beta/Release Candidate versions of the viewer:
-** A new thread monitor (also referred to as a Watchdog) will detect when the viewer application frozen for a period greater than 20 seconds and possibly force a crash with detailed logs
-** Thread monitoring is only enabled on beta versions of the viewer, and for Windows only
-** Thread monitoring can be disabled by choosing to never report crashes, or with a command line setting "--set WatchdogEnabled 0"
-** The threshold timing of the thread monitor is set in the file /app_settings/settings.xml under the key "MainloopTimeoutDefault"
-
-
-Changes:
-* Added: VWR-4794: Basic voice lipsync for voice visualization via Advanced menu > Character > Enable Lip Sync (Beta)
-* Added: VWR-4204: Clicking on names in Chat/Group IM history should open Profile page
-* Added: VWR-1735: Directly interacting with a muted resident will unmute them, with a note logged in the Chat console
-* Added: VWR-7893 create a Classic skin for the viewer
-* Added: VWR-5059: add option to switch between a Classic and Silver theme from within Preferences
-* Fixed: VWR-463: Blank is a pre-defined texture in client, but not in LSL
-* Fixed: VWR-6315: Intentionally removed the File > Record Movie to Disk option
-* Added: VWR-2600: Added option to enable Full-Scene Anti-Aliasing (FSAA) in the viewer
-* Added: VWR-442: Require confirmation when inviting a new group owner
-* New users are shown as a cloud rather than naked until they choose a gender.
-* Hyperlinks can be clicked on to the Message Of The Day
-* Added means to detect laggy avatars with Advanced > Rendering > Info Displays > Avatar Rendering Cost
-* Added means to visually mute laggy avatars, when avatar imposters is enabled
-* Updated library version for openssl on Windows libraries
-* Added thread monitoring for beta versions of the viewer
-* Added a setting switch to completely disable thread monitoring
-* Moved "Set Window Size" options from File menu into Preferences > Graphics
-* Make clothing-still-downloading dialog into an ignorable alert dialog
-* Internationalized additional hard-coded viewer strings to a strings.xml file
-* Search > Popular Places is replaced by a Search > Showcase tab that points to the web-based Showcase
-* Converted Search > Group tab to use web-based search
-* Search requires Mature/Not Mature to be set in Classifieds
-* Make strict GL debugging toggleable on-the-fly via Advanced menu > Rendering > Debug GL option - turns on extra rendering error checking and help reproduce crashes
-* Renamed "Auto-snapshot" to "Auto-refresh" in the Snapshot feature
-* Load the initial avatar outfit earlier in the startup process to avoid Ruth effect at Orientation Island
-* Added the new TRANSPARENT_TEXTURE constant's target texture to the inventory Library
-* Critical message window should not say "Critical message", because it is the Community Standards document
-* Removed First Use dialogs for sitting and movement key binding during Orientation Island
-* Set the default visibility of the mini-map to off for new users
-* Changed the reference in Group Information window > Notices tab to to explain the storage limits of 200 notices and 14 days
-* Removed menu option Advanced > Character > Show Collision Plane
-* Renamed link to "Forgot your name or password?" on viewer login page
-* Made minor language tweaks to World Map: "Online Friends" and "Landmarks"
-* Allow the background color for Inventory treeview control to be set in colors_base.xml
-* Added nVidia MCP78 to gpu table
-* Changed llLoadURL to open pages in external browser in Viewer 1.20.
-* Removed voice setup wizard from Viewer
-* Removed "Detecting hardware" from first-use startup to save 10 seconds of start time
-* Removed "Start Gesture" from menu bar
-* Removed "do you want streaming audio" dialog
-* Display the Camera and Movement controls by default
-* Added online offline notification to open IM windows
-* One-click sit should not be available if you are already sitting
-* Replaced "(hippos)" and "(waiting)" with "(Loading...)"
-* Print the name of the missing gesture in the error message
-* Made running more intuitive by double-tapping forward
-* Moved the right justified text on the splash screen just a bit to the left
-* Moved the Statistics display (Ctrl+shift+1) to be in a floater
-* Made login progress bar an indefinite status indicator
-* Added an option to turn off all group titles to make name tags smaller
-* Small UI tweaks to the "near me" floater for usability
-* Added new debug setting "TutorialURL" to change the URL used by the Tutorial window
-* Added new debug setting "SkinCurrent" is used to persist the chosen skin, to avoid crashing older builds
-
-Source Changes:
-* The settings system has been significantly revamped. llcontroldef.cpp has been replaced with an XML file controlling all settings values: app_settings/settings.xml
-* The command line parser has also been revamped. All but a few special arguments are now associated with control settings and controlled by the file app_settings/cmd_line.xml
-* Added 3DConnexion library export
-* Updated llkdu.dll for 1.20 OSS export
-
-Bug Fixes:
-* Fixed: VWR-3529: WindLight: Saving snapshots to disk crashes viewer
-* Fixed: VWR-2633: Some groups can't be accessed from Communicate window and only show in profile
-* Fixed: VWR-6889: Unable to leave group when role has no allowed abilities
-* Fixed: VWR-6800: Eliminate memory leaks in llcharacter/llmotioncontroller.cpp
-* Fixed: VWR-2051: Regular viewer freezes since update to Voice viewer
-* Fixed: VWR-1715: Macintosh: cyclic short-term freezing of display, getting worse over time: does not respond to commands, eventually change of POV attempt crashes app
-* Fixed: VWR-5895: slowly rotating llTargetOmega child prims stop rotating when you move away
-* Fixed: VWR-6107: When uploading animations the Ruth model appears dimly lit and unshaded
-* Fixed: VWR-104:  Unused class LLVertexProgramGL should be removed
-* Fixed: VWR-2778: System skirt textures turn invisible on wearing
-* Fixed: VWR-2272: Fly button doesn't work while sitting
-* Fixed: VWR-2404: Lossless texture compression on small textures is not lossless
-* Fixed: VWR-5807: Wild rotations of linkset while using the editor in Local Ruler Mode via CTRL key
-* Fixed: VWR-6056: Animation viewer does not play animations on upload.
-* Fixed: VWR-4860: WindLight: Planar texturing renders incorrectly in 1.19.0(79674)
-* Fixed: VWR-5963: LLImageGL::setClamp may affect random texture (making repeating textures on objects non-repeating)
-* Fixed: VWR-7061: Trivial UI grammar error in the title of the "Script Warning/Error" window
-* Fixed: VWR-6186: Second Life is leaking Objective-C objects at startup
-* Fixed: VWR-3598: Non-group owned objects appear to belong to the group of the last selected object, no matter the owner/group.
-* Fixed: SVC-1241: Dead code in lscript_execute.cpp
-* Fixed: VWR-4057: Multi-line chat display bug - first character in line missing
-* Fixed: VWR-3857: Script (LSL) editor shows non Latin 1 characters as square boxes
-* Fixed: VWR-2275: Linux 1.18.3 Won't Link
-* Fixed: VWR-3813: gtk_check_version() API changed to return const gchar * - causes gcc ERROR
-* Fixed: VWR-1735: Directly interacting with a muted resident should unmute them
-* Fixed: VWR-2142: Parcel voice icon doesn't reflect disabled status if voice isn't used
-* Fixed: VWR-5853: Double-Clicking on vertical edge of Inventory/Gesture window destroys the floating window.
-* Fixed: VWR-2448: Snapshot Preview tool should respect 'Quiet Snapshots to Disk'
-* Fixed: VWR-1352: A strange copy operation of LLStyle
-* Fixed: VWR-6016: FMOD problem: update3dPosition error
-* Fixed: VWR-7682: Typo on Teleport Failure dialog
-* Fixed: VWR-4580: Property lines are visible through avatar, objects and through ground
-* Fixed: VWR-7042: Incorrect tooltip for "Use built-in web browser" option
-* Fixed: VWR-1843: Inappropriate to offer a default folder name with non-ASCII characters for Make Outfit
-* Fixed: VWR-5869: Broken BVH Animation upload causes dialog / interface error, and crash
-* Fixed: VWR-6668: Eliminate inconsistent help text for Preferences > Graphics panel
-* Fixed: VWR-6286  Changed the method LLControlGroup::loadFromFile to only load values of settings that are persistent
-* Fixed: VWR-5080: Certain color combinations of Silver skin are hard on visually impaired (and the not-visually-impaired)
-* Fixed: VWR-380:  Resized Flexible Prims Render Improperly
-* Fixed: VWR-6251: Snapshots no longer able to capture the full screen.
-* Fixed: VWR-5929: Some UI translation texts are ignored because of missing names in XUI files
-* Fixed: VWR-6430: Comment area of "Debug Settings" floater (dialog box) is aligned badly
-* Fixed: VWR-6232: Tap-Tap-Hold Running should be an 'Advanced' character preference
-* Fixed: VWR-5812: Some media sizes will be placed on the wrong size texture when played by the viewer
-* Fixed: VWR-6386, VWR-6384, VWR-6385: Clean up duplicate and malformed sibling names in en-us xml
-* Fixed: SVC-1072: Havok 4 -- Objects can exist up to 4096 meters up, but scripted rez above 1024 meters fails silently
-* Fixed: SVC-747:  Estate Banned Residents list doesn't increment higher than 252
-* Fixed: VWR-5498: WindLight Release Candidate doesn't rembember correct size of IM window between sessions
-* Fixed: VWR-747:  Texture preview should not have constrained aspect ratio
-* Fixed: VWR-3984: WindLight: Certain snapshot options incorrectly capture a part of the screen
-* Fixed: VWR-3438: WindLight: Glow (including water reflections) shows through HUD objects
-* Fixed: VWR-4616: Snapshot, clicking on more removes current pic
-* Fixed: VWR-1405: llMapDestination does not work as designed for OS X/Intel viewers
-* Fixed: VWR-3625: Highlights don't affect non-root prims
-* Fixed: VWR-2113: Mac Auto Updater "hides", giving appearance of failing
-* Fixed: VWR-2755: duplicate PARCEL_FLAG_RESTRICT_PUSHOBJECT line in keywords.ini
-* Fixed: VWR-4903: Show avatar's name in the "Eject" and "Freeze" confirmation screens
-* Fixed: VWR-6066: "Are you sure you want to clear you browser cache" in Preferences>Web>Clear Now has a typo
-* Fixed: VWR-5656: Secondlife icon missing in Linux version 1.19.1 RC1 
-* Fixed: VWR-3633: Avatar impostor of not-yet-rezzed avatar not appearing
-* Fixed: VWR-6350: Word "Flycam" appears in Flycam Mode, does not disappear with UI
-* Fixed: glow is rendered on property lines and selection silhouettes
-* Fixed: LLImageJ2C should be able to tell you what en/decoding implementation is being used
-* Fixed: Residents That Have Been Granted Modify Rights Can TAKE the Objects.
-* Fixed: Estate tools in non-english UI cannot change maturity level of islands from PG to Mature.
-* Fixed: Agent Limit spontaneously resets to zero
-* Fixed: Web control code does not correctly reject sl:// links
-* Fixed: ait before printing missing gestures if the name isn't yet available
-* Fixed: camera smoothing problem
-* Fixed: LSL call to open place dialog to move user around without opening map
-* Fixed: Cannot close Buy Land floater when (waiting for data) from web site
-* Fixed: the Active Gestures list does not appear alphabetically
-* Fixed: Preference Help button is not pointing to the correct url
-* Fixed: Occlusion crash on SIS cards
-* Fixed: lowest avatar detail is higher than before
-* Fixed: Avatar Impostor sprites have opaque black edges
-* Fixed: impostors tilt 
-* Fixed: impostors need to update once after they stop walking
-* Fixed: Can't drag custom colors in color picker to the color palette
-* Fixed: Age Verified Account cannot access plots blocked for age verification
-* Fixed: can not take hi-res snapshot with size bigger than 4000 by 4000.
-* Fixed: Overlapping text on the Build tool > Object tab
-* Fixed: Pasting multiline clipboard content into Local Chat loses newlines
-* Fixed: Allow the --set option to be specified multiple times on the command line
-* Fixed: Media URL Set > Cancel button does not cancel
-* Fixed: Fix the URL used by crash_logger for pre login crashes
-* Fixed: The viewer's crash logger needs to trim very long SecondLife.log files before sending.
-* Fixed: Parcel tag overlaps image on Sell Land floater if longer than 36 characters
-* Fixed: llrender.cpp export
-* Fixed: Clean up log messages in viewer to make crash logs more readable and useful
-* Fixed: Create secondlife:///app/ URL to open my groups panel
-* Fixed: Create secondlife:///app/ URL to open create groups dialog
-* Fixed: Display a message if LLWebBrowserCtrl blocks a secondlife:///app/* url
-* Fixed: Abstract common glTexParameter calls
-* Fixed: Double-clicking border of communicate window makes window unrecoverable
-* Fixed: Command line parser bug parsing "--multiple true" at beginning of a command line.
-* Fixed: --loginuri is not being handled correctly
-* Fixed: Grid selection drop-down on login screen does not take priority over -loginuri when selection is first opened
-* Fixed: Pop-up menu width should try to accomodate the longest menu item (within reason)
-* Fixed: Can't change values with debug settings floater
-* Fixed: Focus > Zoom button can't be re-selected
-* Fixed: Debug Permissions displays overlap
-* Fixed: Objects with no group tagging show group tags of previously clicked items
-* Fixed: Typographical error in Transfer permissions alert dialog
-* Fixed: On Person-to-Person voice calls, the volume slider overlaps End Call button
-* Fixed: VWR-2645: Source typo RELEASE_FOR_DOWNLOAD should be LL_RELEASE_FOR_DOWNLOAD 
-* Fixed: stop bundling libexpat with the linux viewer
-* Fixed: g++ 4 viewer compile issues
-* Fixed: Dead code removal createLegacyWearableFromAvatar
-* Fixed: Internationalize LLFloaterCamera / llcameraview.cpp
-* Fixed: Eliminate some unused xml files in skins\xui\en-us and language folders
-
-Crash Fixes:
-* Fixed: VWR-5697: RC 1.19.1 crash on startup with Vista UAC enabled
-* Fixed: VWR-7723: crash on LLImageGL::setSubImage line 780
-* Fixed: VWR-3822: ATI crashes on startup when in 16 bit color mode
-* Fixed: crash on LLViewerImageList::removeImageFromList
-* Fixed: crash on LLViewerImageList::updateImagesUpdateStats
-* Fixed: crash on LLSpeakerMgr::findSpeaker
-* Fixed: crash on LLAudioData - llaudio/audioengine.cpp
-* Fixed: crash on LLGroupNotifyBox::moveToBack
-* Fixed: crash on LLPieMenu::show
-* Fixed: crash on LLFloaterWorldMap::buildLandmarkIDLists
-* Fixed: crash on LLDrawable::destroy
-* Fixed: crash in LLFolderViewFolder::setSelection
-* Fixed: crash on LLSurface::resolvePatchRegion()
-* Fixed: crash on LLViewerRegion::setCapability
-* Fixed: crash from infinite loop in wearables (LLWearableList::processGetAssetReply)
-* Fixed: crash in LLMediaImplQuickTime::load
-* Fixed: crash on LLViewerParcelMedia::update
-* Fixed: crash on LLFloaterWorldMap::buildLandmarkIDLists
-* Fixed: crash from glMapBuffer returning 0
-* Fixed: crash in LLVOVolume::sculpt - newview/llvovolume.cpp
-* Fixed: crash in LLFace::renderSelected.
-* Fixed: crash in LLImageRaw::copyLineScaled
-* Fixed: crash in LLImageBase::generateMip
-* Fixed: crash in LLFloaterIMPanel when starting conference
-* Fixed: crash with attached obj using Avatar Rendering Cost
-* Fixed: Linux crash parsing command-line arguments 
-* Fixed: crash on LLVertexBuffer::destroyGLBuffer
-* Fixed: crash on LLUIImageList::onUIImageLoaded
-* Fixed: crash on LLViewerJointMesh::updateFaceData
-* Fixed: VBO related crash on ATI R100 cards 
-
-Localization Fixes:
-* Fixed: VWR-7153: An typo in en-us version of alerts.xml file makes an <ignore> text of unlocalizable
-* Fixed: VWR-7086: floater_buy_land.xml still contains messages regarding First Land
-* Fixed: VWR-7731: erroneous Japanese translation of "Select tool"
-* Fixed: erroneous German translation for "Active Speakers"
-* Fixed: put cleanly-formed Portuguese files (Beta) back into the viewer
-* Fixed: some text overlaps in Buy Land floater in Portuguese
-* Added: new translation strings for German, Korean, Japanese
-* Fixed: Update the viewer credits in About>Second Life...
-
-
-KNOWN ISSUES:
-* This 1.20 Viewer will not run on a Mac PowerPC that is running Mac OS X 10.3.9.  The minimum requirements for running Second Life
-is using Mac OS X 10.4.11 or higher. Please see http://secondlife.com/support/sysreqs.php for more information.
-** The 1.19.1 Viewer still supports the Mac PowerPC that is running Mac OS X 10.3.9.
-
-* There is a known issue in the 1.20 Viewer on Macs using Apple's USB Mighty Mouse and a 3DConnexion SpaceNavigator. The Mighty Mouse will be erroneously detected as a
-joystick and the primary mouse button will toggle "Flycam" with unusual behavior. Therefore the support for the 3DConnexion SpaceNavigator in Second Life does not yet
-extend to Macs using a USB Mighty Mouse.
-WORKAROUND: You must use a different mouse in order to use a 3DConnexion SpaceNavigator in Second Life without problem.
-
-* Second Life is currently unable to run under native Korean-language Windows XP if the WindowsXP username uses default Korean characters
-WORKAROUND:  create a Windows XP username on this computer that uses Latin characters.  We are investigating this issue!
-
-* VWR-6363: In the 1.20 Viewer, there are known issues with camera behavior and/or button-mapping behavior when using the 3DConnexion SpaceNavigator in a
-combination of "Flycam" and Build modes under some circumstances.
-
-* VWR-5749: When running Second Life in Full Screen mode on computers with some NVIDIA graphics cards, you may be unable to scroll up/down on webpages
-that are shown inworld.  This includes the web-based interfaces of Search > All tab, and Search > Groups tab.  We are investigating this issue.
-WORKAROUND: You must run Second Life in a window to avoid this problem. Go to Preferences > Graphics > Run Second Life in a window.
-
-* VWR-7779: On some Macs, there are reports of periodic and cyclic freezing of the computer when running Viewer 1.20.
-WORKAROUND #1: One workaround is to reduce the Draw Distance below 128m in Preferences > Graphics tab > Custom > Draw Distance (slider). Also if you have Disabled Camera Constraints
-from the Advanced menu, behavior is improved if you do not Disable Camera Constraints.
-WORKAROUND #2: One workaround that may help is to use an additional argument "-set YieldTime 20" in the Arguments.txt:
-** To set this argument, right-click (or control-click) the Second Life application and choose "Show package contents".
-** In the resulting finder window, open Resources and in there should be a file named "arguments.txt". Open in text edit, add the argument to the end of the line in there and Save.
-** Close the text edit and run Second Life application.
-** This causes the viewer to sleep for 20 milliseconds every frame. It will slow the frame rate down a little, but may help with freezing.
-
-
-Release Notes for Second Life 1.19.1(4) April 2nd, 2008
-=====================================
-New features and changes:
-
-* Physically accurate atmospheric rendering and lighting (previously code named WindLight)
-** Animateable day cycles
-** Vastly improved realistic water with reflections and glimmer
-** "Glow" as new object attribute
-** Avatar Impostoring, which can speed up crowded scenes tremendously
-** A new cleaned-up, easy to use Graphics Preferences tab with simple and advanced options for performance/quality settings
-
-* Parcel Media - adds the ability to display Web based media on a parcel
-** New API for Media Rendering
-** Enables Web content inworld
-** Added two new click actions, one for playing movies, and one for opening media
-** Embedded web browser
-** Added support for Media resizing
-
-* Estate-Level Abuse Reporting
-** Estate owners and managers now have the ability (under World > Region/Estate) to enter an email address where abuse reports will be sent. 
-** If this address is empty, abuse reports will go to Linden Lab as usual. If the address is present, the abuse reports will be sent there instead. In both cases, all abuse reports are logged by Linden Lab.
-
-* Voice changes
-** Changed the default voice volume to be a bit higher, to better match the volume of in-world sounds 
-** Changed the voice volume slider to default to the middle of its range, so voice volume can be boosted above the default
-
-* Improved Linux Voice support
-** Better support for USB headsets and other devices
-** Better voice audio quality
-
-* Additional rendering optimizations:
-** Faster, more reliable occlusion culling - occluded regions are discovered instantaneously, eliminating random bad frames due to the camera moving too quickly
-** No geometry transform overhead on region crossing - results in region crossings being slightly smoother
-** Faster frustum culling - less time is spent determining what's visible, thus giving better overall framerates
-** No copy-to-texture for ripple water - objects under water are rendered to texture at half resolution, resulting in better overall framerates
-** Faster sky updates - the non-WindLight (aka no-shader) skies update quicker - even faster than the pre-WindLight skies!
-** Single pass shiny when using shaders - making an object shiny will no longer require it to be rendered twice, which results in virtually free shiny functionality from a performance standpoint
-** Single pass terrain when using shaders - the terrain is no longer drawn in two passes, which, from a performance standpoint, results in virtually free high detail terrain for shader friendly cards (See the System Recommendations at http://secondlife.com/corporate/sysreqs.php)
-** Improved object update code (less work for the CPU) - attachments are no longer added to the active list, which improves performance in crowded areas
-** Better scheduling of Avatar LOD (Level of Detail) updates - Avatar LOD is now calculated every 16 frames as opposed to every single frame, which removes redundant work
-** Better Avatar culling through more accurate bounding boxes - Avatar bounding boxes now match their current animation, resulting in more optimized culling of avatars that are not visible in the frame
-** Better tree rendering (70% fewer matrix operations, no reliance on GL matrix stack) - results in improved performance for tree rendering
-** Trimmed unused state in LLDrawable, LLSpatialGroup, LLOctree, and LLFace - results in memory savings
-** 16-bit index buffers are now used instead of 32-bit buffers - improves memory bandwidth for rendering geometry
-** For more information, see: https://wiki.secondlife.com/wiki/WindLight
-** Known Issue:
-*** VWR-1749: Second Life viewer client freezes on MacBook Pro
-
-Fixes:
-* VWR-5087: Attach To... from inventory ignores selected postion and attaches to stored location.
-* VWR-5372 Specific Search (People, Places, etc) queries are modified and words less then 3 characters are removed. Now allow searches for resident names of  2 characters, and place/group names containing 1 char words.
-* VWR-2628: Fix for crash in operator*(LLVector3 const&, LLQuaternion const&) / LL ...
-* VWR-2682: Possible crash fix when accessing dead cubemap
-* VWR-1852: Edit Manipulators have Wrong Orientation with Local Ruler Mode on Linked Objects
-* VWR-4963: Group archive freezes viewer
-* VWR-2273: View menu > Instant Message should be changed to "Communicate"
-* VWR-1722: Profiles are editable in two places (including Search browser)
-* VWR-434: HUD textures are attaching but not being seen
-* VWR-2030: Avatar only turns half-way in Appearance Mode
-* VWR-2920: Sculptie LOD causes object to be deformed into a flattened sphere close while correct far
-* VWR-2164: Particle Alpha transition is done incorrectly
-* VWR-1609: disabling "Show Selection Beam" makes beam render incorrectly for others
-* VWR-2834: Builds fail on 1.18.4.0 with no mozlib
-* VWR-983: Particles -> Offscreen/hidden particles get extended life -> as of 1.16.x at least.
-* VWR-882: Group name showing as (???) in About Land, IM tabs, and object edit window
-* VWR-4921: not recognising in Linux that client is already running
-* VWR-4548: Linux Intel945 feature-blacklist not being applied (Unresponsive, blackscreen, if not using LL_GL_NOEXT=x)
-* Propagate client language setting into search URL
-* Fix for crash in LLViewerPartGroup::updateParticles
-* Updated help text for llGiveInventoryList.
-* Notecards crash users when passed from person to person
-* Add "getting data" progress display to buy currency dialog.
-* Feature table and gpu table changes to help with lenovo.
-* SL Viewer's Client Memory Tool is missing
-* Fix for white areas on lenovo with ATI FireGL 5200
-* Fixed list of names in Friends List showing (Waiting)
-* Help menus have been combined
-* Clean up the Client and Server menu user interface: ctrl-alt-D now toggles the 'Advanced' menu, requesting god status does not display the 'Admin' menu
-* Place Information is hidden behind the tool bar when opened from Second Life Help
-* Fixed: bulk upload of a single file (on Windows) includes the path in the item name and description
-* "Mute" button on script permission dialogs closes all dialogs from the sender
-* Translated camera controls +64 in both directions.
-* Fixed a bug causing the viewer to update the wrong parcel. 
-* revert name of "Local Chat(history)" tab to "Local Chat"
-* Removed confusing "Start in Push-to-Talk mode" preference.
-* JA, KO, DE localizations are truncated on Preferences>Graphics tab> Run in a window descriptor
-* commit JA,KO,DE localization changes to accommodate truncations
-* bumpmapping flips on active objects
-* Fixed various Teleport and Show on Map bugs
-* More Help Buttons in Graphics Preferences
-* (Linux) Working device enumeration A.K.A. USB headset support
-* Linux Voice quality issues in 1.19.0
-* Change the way local output volume is handled 
-* Checkboxes in About Land untick when selected
-* Add missing header file to export list for public SVN repository
-* Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
-* Resolve instant message crash report
-* Textures/Snapshots in a notecard are opened again when you click copy to inventory.
-* Packet-loss while viewing inventory currently results in perceived inventory loss
-* stop and pause Media and music buttons do not work
-* Displayed page in the client browser disappears when crossing property boundaries.
-* replace misspellings in alerts.xml parameters (<message name="messsage")  (3 S's)
-* fix a misspelling of 'participants' in floater_chat_history.xml tool tip
-* Media browser history dropdown does not save items across sessions
-* XML CLEANUP:  duplicate sibling names in en-us xml
-* Crash in LLTabContainer::draw() if selected tab is invalid
-* The Search floater does not enable the "Search" button until the user has typed 3 characters to reduce db load
-* truncated english word 'water' in Advanced Water Editor modal help dialog
-* sculpties on the top10 crash list
-* Adjust gpu-table based on data from default graphics level framerate for specific graphics cards in viewer stats
-* Added command line option to crash on command line startup (-crash).
-
-Source changes:
-* VWR-3290: Linux scons build script doesn't work with distcc
-
-
-Release Notes for Second Life 1.19.0(4) February 28th, 2008
-=====================================
-New features and changes:
-* Voice 
-** Voice Chat is now enabled by default to allow Residents to hear other Residents. 
-** A microphone is required to speak to other Residents.
-** Push-to-Talk is the default mode for transmitting voice.
-** These settings can be modified via the Voice Chat tab of the Preferences dialog. 
-
-* Age Verification:
-** The user interface for parcel and estate access has been clarified and improved.
-** Added the ability to restrict access to parcels and estates to age verified adults. 
-** Removed the ability to *ban* access to Residents who have provided payment info or who have used payment info. We continue to support the ability to *allow* access to only those who have provided payment info.
-
-* Crash Reporter
-** The crash reporting mechanism has been improved. Following a crash, more useful information will be sent and reports should now take less than 10 seconds.
-
-* VWR-210: Voice Support on Linux (EXPERIMENTAL) - see README-linux-voice.txt 
-
-* Other changes:
-** Change alert message that pops up when you set Busy
-** Add "Teleporting from SLURL to SLURL" to the chat history to provide quick and dirty "back" links
-** Print the name of the missing gesture in the error message
-** Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0
-
-Fixes:
-* SVC-930: Prims set for sale - prices are incorrectly set when multiple prims taken to inventory and rezzed
-* SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
-* VWR-1125: Clicking Title Bar While Mouselook'd Repositions SL Window
-* VWR-1137: Inventory names out of sync after renaming via Properties window
-* VWR-1145: Unable To Connect help not available
-* VWR-1162: Land for sale includes L$1 parcels that are not actually for sale
-* VWR-1350: Color settings do not appear to be applied to LSL default text
-* VWR-1475: OpenJPEG always uploads single layer lossless images
-* VWR-1590: Keyboard changes inventory selection after right-click
-* VWR-1627: Classified metrics are reset to 0 when the ad is updated
-* VWR-1651: Add ability to open a partners profile whilst viewing an avatar's profile
-* VWR-1774: Some avatar positions result in no Z-axis arrow when editing attachments
-* VWR-1873: Typos in en-us locale file
-* VWR-1919: Remove texture UUID information from UI unless full-perm
-* VWR-2030: Avatar only turns half-way in Appearance Mode
-* VWR-2142: Parcel voice icon doesn't reflect disabled status if voice isn't used
-* VWR-2256: Mac updater directory permission issues
-* VWR-2367: Wrong handling of maximum length of Group Notice message
-* VWR-2404: lossless texture compression on small textures not lossless
-* VWR-2410: noise dot appear in chat window when clien running long with chatting.
-* VWR-2411: Possible crash in pipeline.cpp
-* VWR-2412: Possible crash drawpoolwater
-* VWR-2421: ATI Radeon HD 2900 XT + Second Life = "Couldn't match GPU to a class","Setting GPU Class to Class0"
-* VWR-2483: the macviewer.xcodeprj file doesn't create stripped binaries on Deployment or Universal
-* VWR-250: Preedit (composition) strings are shown poorly when typing Japanese text on Windows
-* VWR-2550: Scuplty vertex coordinates are size/256 meters too small on the positive faces
-* VWR-2614: gActiveChannelSpeakerMgr not deleted at end of program in viewer.cpp
-* VWR-2617: Adds LLSD support to flex/light/sculpt params for primitives
-* VWR-2652: Changes needed to compile viewer against lastest libopenjpeg2000
-* VWR-2684: Minor leak in floaters using layoutstacks
-* VWR-2722: Muting an object with pie menu only mutes the prim you select, not entire linkset
-* VWR-2847: Wrong hover text in Japanese UI
-* VWR-2854: Some sculpted prims render as balls on close zoom, which look fine in older clients
-* VWR-2867: Eyes rotate unnaturally around their X axis.  Clockwise/Counter-Clockwise
-* VWR-289: URLs for video media streaming need to be URL-encoded or stream doesn't work
-* VWR-2959: Windows (Visual Studio) solution file refers to a non-existing project "build_all"
-* VWR-3088: Unchecking "Automatic Appearance Camera Movement" no longer has any effect
-* VWR-3206: OpenJPEG svn478 causes slviewer to crash
-* VWR-3428: Checking a users profile while editing a linked set causes viewer crash
-* VWR-3458: Mouse cursor background is opaque white instead of transparent on big endian systems
-* VWR-3558: llLoadURL cannot be muted
-* VWR-356: Move delete to the bottom of context menus, separated by spacer
-* VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp
-* VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
-* VWR-412: Object editing arrows hidden but clickable on objects you can't edit.
-* dialogs have extra vertical space
-* Photo Album: name in Properties cut off some Japanese characters
-* New gestures do not appear active in inventory
-* Make parcel name in menu "look" active
-* "Wear" pie option shows up for many objects even if resident does not own and cannot wear them.
-* Textures on no-transfer objects can be transferred
-* Deleted gestures still work
-* Inventory description out of sync after renaming via Properties window
-* Show private estate tiles when World Map is zoomed out
-* Properties description not updated when preview description updated
-* Buying object contents broken
-* Improve window opening behavior, ensuring it is mostly on screen
-* No-modify objects can be modified through Open pane
-* Inventory names out of sync after renaming via Properties
-* Japanese IME mode should be set and postiion of any input windows fixed for non-Japanese fields
-* ctrl-shift-w doesn't work if no windows have focus
-* Avatar falling in place - Alliez Mysterio
-* Linux crash reporter does not run on next execution after forcing an infinite loop and forcefully exiting
-* hitting enter should immediately set the value of a field
-* Inventory Folder Loading state not clearly indicated
-* Add warning dialog to the Land Sale process to warn against selling land to Anyone
-* Legacy flossexception link needs to be fixed in source
-* make link from client log in window to "Forgot Password" page
-* Remove button under estate managers list enables after estate manager clicks in the list
-* Changing search field should cancel current selection
-* Estate tab within Tools / Region Estate has wrong settings for enable of Restrict Access upon initialization
-* llEscapeURL and llUnescapeURL caps output to 255 characters
-* XUI LoadFromXML function doesn't work
-* Sanitize floater sizing behavior when SL window is made very small
-* Animation won't stop if avatar teleports while animated
-* Can't paste name of object into View > Mute List > Mute object by name
-* pressing ctrl-F10 then Escape causes keyboard to be unresponsive
-* Make SL viewer updater show a progress bar so that people know how long to wait
-* Can't double-click on groups in profile after changing your active title
-* Getting multiple copies of texture dragged onto prim
-* blue dialog's 'next' widget steals focus
-* Audio should be encoded for upload at a 'good enough' quality rather than a user-selected bitrate
-* multiple preview windows open for a single texture/snapshot saved inside a note card
-* Enhance Viewer to support new Age Verification feature
-* Rename crash setting to cause crash logger to come up for all residents
-* Change crash logger "Remember this choice" function to default to on
-* Rework Ban tab of floater_about_land
-* Windows IME positioning fixed
-* Viewer crashes in assert when playing Sword Strike animation
-* Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
-* Disable QuickTime when the installed version is less than version with RTSP exploit
-* Korean viewer crashes on startup
-* Move fullscreen message from login screen to viewer prefs
-* linux client doesn't recognise that a viewer is already running (slurl crapout)
-* Search results window displays "s..." and "n..." instead of "searching..." and "none found"
-* QuickTime disabled message can not be ignored
-* Crash on login page when using Logitech LCD Keyboard
-* SEC-17 Ability to Access Sculpted Prim Textures from Database without owning actual sculpt texture, allowing for people to "steal" sculpts.
-* info window does not pop up when transitioning from a Havok1 to Havok4 region
-* Repoint Report Bug... Viewer link to Pjira
-* Upload Animation window: Button missing in Stopped window state
-
-Source changes:
-* Upgrade Win32 libvorbis to v1.2
-* VWR-2881: Bundled Mesa libs are not GPL compatible
-* upgrade in-tree Linux GL headers to Mesa 7.x
-* upgrade in-tree Win32 GL headers to version without SGI Free B license
-* Rebuild and/or update libraries  to use statically linked libs.
-* Remove llfloaterhtmlhelp.cpp / h and floater_html_help.xml
\ No newline at end of file
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
deleted file mode 100644
index 099d5dc..0000000
--- a/linden/indra/newview/res/newViewRes.rc
+++ /dev/null
@@ -1,288 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC (-1)
-#include "winresrc.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-// Commented out because it only compiles if you have MFC installed.
-//#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_LL_ICON             ICON                    "ll_icon.ico"
-IDI_INSTALL_ICON        ICON                    "install_icon.ico"
-IDI_LCD_LL_ICON         ICON                    "icon1.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-CONNECTBOX DIALOGEX 32, 32, 187, 246
-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    CONTROL         149,IDC_STATIC,"Static",SS_BITMAP,0,0,187,246
-    EDITTEXT        IDC_EDIT_FIRSTNAME,9,180,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_LASTNAME,98,180,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD,9,210,80,13,ES_PASSWORD |
-                    ES_AUTOHSCROLL
-    CONTROL         "Remember password",IDC_REMEMBER_PASSWORD,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,9,229,80,10
-    DEFPUSHBUTTON   "Connect...",IDOK,98,210,80,13
-    CONTROL         "Full screen",IDC_FULL_SCREEN,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,100,229,50,10
-    COMBOBOX        IDC_COMBO_SERVER,98,6,84,30,CBS_DROPDOWNLIST | CBS_SORT |
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-CONNECTBOXIP DIALOG  32, 32, 282, 174
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP |
-    WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "First name:",IDC_STATIC_FIRSTNAME,152,24,36,10,NOT
-                    WS_GROUP
-    EDITTEXT        IDC_EDIT_FIRSTNAME,152,37,58,13,ES_AUTOHSCROLL
-    LTEXT           "Last name:",IDC_STATIC_LASTNAME,218,24,38,10,NOT
-                    WS_GROUP
-    EDITTEXT        IDC_EDIT_LASTNAME,218,37,57,13,ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_STATIC_PASSWORD,152,55,38,10
-    EDITTEXT        IDC_EDIT_PASSWORD,152,71,123,13,ES_PASSWORD |
-                    ES_AUTOHSCROLL
-    CONTROL         "Remember password for next time",IDC_REMEMBER_PASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,84,123,10
-    LTEXT           "Return to:",IDC_STATIC,152,97,32,8
-    CONTROL         "Last location",IDC_RADIO_LAST,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,152,109,56,10
-    CONTROL         "Home",IDC_RADIO_HOME,"Button",BS_AUTORADIOBUTTON |
-                    WS_TABSTOP,218,109,35,10
-    LTEXT           "Server:",IDC_STATIC_SERVER,152,119,38,10,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_SERVER,152,134,88,43,CBS_DROPDOWN | WS_VSCROLL |
-                    WS_TABSTOP
-    PUSHBUTTON      "Quit",IDCANCEL,152,152,50,14
-    DEFPUSHBUTTON   "Connect...",IDOK,225,152,50,14
-    CONTROL         140,IDB_BITMAP1,"Static",SS_BITMAP,8,7,133,157
-    LTEXT           "Connect to Second Life",IDC_STATIC,152,7,78,8
-END
-
-SPLASHSCREEN DIALOG  32, 32, 144, 34
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
-    LTEXT           "Loading Second Life...",666,36,13,91,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    "CONNECTBOX", DIALOG
-    BEGIN
-        LEFTMARGIN, 8
-        RIGHTMARGIN, 180
-        VERTGUIDE, 152
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 239
-        HORZGUIDE, 44
-        HORZGUIDE, 57
-        HORZGUIDE, 123
-    END
-
-    "CONNECTBOXIP", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 275
-        VERTGUIDE, 152
-        VERTGUIDE, 218
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 166
-        HORZGUIDE, 12
-        HORZGUIDE, 17
-        HORZGUIDE, 24
-        HORZGUIDE, 50
-        HORZGUIDE, 55
-        HORZGUIDE, 84
-        HORZGUIDE, 105
-        HORZGUIDE, 119
-    END
-
-    "SPLASHSCREEN", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 137
-        VERTGUIDE, 36
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 27
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MENU1 MENU
-BEGIN
-    POPUP "testmenu"
-    BEGIN
-        MENUITEM "test",                        ID_TESTMENU_TEST
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-TOOLGRAB                CURSOR                  "lltoolgrab.cur"
-TOOLLAND                CURSOR                  "lltoolland.cur"
-TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"
-TOOLCREATE              CURSOR                  "lltoolcreate.cur"
-ARROWDRAG               CURSOR                  "llarrowdrag.cur"
-ARROW                   CURSOR                  "llarrow.cur"
-NOLOCKED                CURSOR                  "llnolocked.cur"
-ARROWLOCKED             CURSOR                  "llarrowlocked.cur"
-GRABLOCKED              CURSOR                  "llgrablocked.cur"
-TOOLROTATE              CURSOR                  "lltoolrotate.cur"
-TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"
-TOOLSCALE               CURSOR                  "lltoolscale.cur"
-TOOLCAMERA              CURSOR                  "lltoolcamera.cur"
-TOOLPAN                 CURSOR                  "lltoolpan.cur"
-TOOLFOCUS               CURSOR                  "lltoolfocus.cur"
-TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"
-ARROWCOPY               CURSOR                  "arrowcop.cur"
-ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"
-ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"
-TOOLSIT                 CURSOR                  "toolsit.cur"
-TOOLBUY                 CURSOR                  "toolbuy.cur"
-TOOLPAY                 CURSOR                  "toolpay.cur"
-TOOLOPEN                CURSOR                  "toolopen.cur"
-TOOLPIPETTE             CURSOR                  "toolpipette.cur"
-TOOLPLAY                CURSOR                  "toolplay.cur"
-TOOLPAUSE               CURSOR                  "toolpause.cur"
-TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,6,86975
- PRODUCTVERSION 1,20,6,86975
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Linden Lab"
-            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.20.6.86975"
-            VALUE "InternalName", "Second Life"
-            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
-            VALUE "OriginalFilename", "SecondLife.exe"
-            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.20.6.86975"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BITMAP2             BITMAP                  "bitmap2.bmp"
-IDB_LOGIN               BITMAP                  "loginbackground.bmp"
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/linden/indra/newview/res/resource.h b/linden/indra/newview/res/resource.h
index 75cf866..9fcfa21 100644
--- a/linden/indra/newview/res/resource.h
+++ b/linden/indra/newview/res/resource.h
@@ -30,7 +30,7 @@
 
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by newViewRes.rc
+// Used by viewerRes.rc
 //
 #define IDREMOVE                        3
 #define IDI_LL_ICON                     103
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
new file mode 100644
index 0000000..a39bb9f
--- /dev/null
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -0,0 +1,288 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC (-1)
+#include "winresrc.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+// Commented out because it only compiles if you have MFC installed.
+//#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_LL_ICON             ICON                    "ll_icon.ico"
+IDI_INSTALL_ICON        ICON                    "install_icon.ico"
+IDI_LCD_LL_ICON         ICON                    "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+CONNECTBOX DIALOGEX 32, 32, 187, 246
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
+    WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    CONTROL         149,IDC_STATIC,"Static",SS_BITMAP,0,0,187,246
+    EDITTEXT        IDC_EDIT_FIRSTNAME,9,180,80,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_LASTNAME,98,180,80,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PASSWORD,9,210,80,13,ES_PASSWORD |
+                    ES_AUTOHSCROLL
+    CONTROL         "Remember password",IDC_REMEMBER_PASSWORD,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,9,229,80,10
+    DEFPUSHBUTTON   "Connect...",IDOK,98,210,80,13
+    CONTROL         "Full screen",IDC_FULL_SCREEN,"Button",BS_AUTOCHECKBOX |
+                    WS_TABSTOP,100,229,50,10
+    COMBOBOX        IDC_COMBO_SERVER,98,6,84,30,CBS_DROPDOWNLIST | CBS_SORT |
+                    WS_VSCROLL | WS_TABSTOP
+END
+
+CONNECTBOXIP DIALOG  32, 32, 282, 174
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP |
+    WS_VISIBLE
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "First name:",IDC_STATIC_FIRSTNAME,152,24,36,10,NOT
+                    WS_GROUP
+    EDITTEXT        IDC_EDIT_FIRSTNAME,152,37,58,13,ES_AUTOHSCROLL
+    LTEXT           "Last name:",IDC_STATIC_LASTNAME,218,24,38,10,NOT
+                    WS_GROUP
+    EDITTEXT        IDC_EDIT_LASTNAME,218,37,57,13,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC_PASSWORD,152,55,38,10
+    EDITTEXT        IDC_EDIT_PASSWORD,152,71,123,13,ES_PASSWORD |
+                    ES_AUTOHSCROLL
+    CONTROL         "Remember password for next time",IDC_REMEMBER_PASSWORD,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,84,123,10
+    LTEXT           "Return to:",IDC_STATIC,152,97,32,8
+    CONTROL         "Last location",IDC_RADIO_LAST,"Button",
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,152,109,56,10
+    CONTROL         "Home",IDC_RADIO_HOME,"Button",BS_AUTORADIOBUTTON |
+                    WS_TABSTOP,218,109,35,10
+    LTEXT           "Server:",IDC_STATIC_SERVER,152,119,38,10,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_SERVER,152,134,88,43,CBS_DROPDOWN | WS_VSCROLL |
+                    WS_TABSTOP
+    PUSHBUTTON      "Quit",IDCANCEL,152,152,50,14
+    DEFPUSHBUTTON   "Connect...",IDOK,225,152,50,14
+    CONTROL         140,IDB_BITMAP1,"Static",SS_BITMAP,8,7,133,157
+    LTEXT           "Connect to Second Life",IDC_STATIC,152,7,78,8
+END
+
+SPLASHSCREEN DIALOG  32, 32, 144, 34
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
+FONT 8, "MS Sans Serif"
+BEGIN
+    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
+    LTEXT           "Loading Second Life...",666,36,13,91,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    "CONNECTBOX", DIALOG
+    BEGIN
+        LEFTMARGIN, 8
+        RIGHTMARGIN, 180
+        VERTGUIDE, 152
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 239
+        HORZGUIDE, 44
+        HORZGUIDE, 57
+        HORZGUIDE, 123
+    END
+
+    "CONNECTBOXIP", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 275
+        VERTGUIDE, 152
+        VERTGUIDE, 218
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 166
+        HORZGUIDE, 12
+        HORZGUIDE, 17
+        HORZGUIDE, 24
+        HORZGUIDE, 50
+        HORZGUIDE, 55
+        HORZGUIDE, 84
+        HORZGUIDE, 105
+        HORZGUIDE, 119
+    END
+
+    "SPLASHSCREEN", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 137
+        VERTGUIDE, 36
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 27
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_MENU1 MENU
+BEGIN
+    POPUP "testmenu"
+    BEGIN
+        MENUITEM "test",                        ID_TESTMENU_TEST
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+TOOLGRAB                CURSOR                  "lltoolgrab.cur"
+TOOLLAND                CURSOR                  "lltoolland.cur"
+TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"
+TOOLCREATE              CURSOR                  "lltoolcreate.cur"
+ARROWDRAG               CURSOR                  "llarrowdrag.cur"
+ARROW                   CURSOR                  "llarrow.cur"
+NOLOCKED                CURSOR                  "llnolocked.cur"
+ARROWLOCKED             CURSOR                  "llarrowlocked.cur"
+GRABLOCKED              CURSOR                  "llgrablocked.cur"
+TOOLROTATE              CURSOR                  "lltoolrotate.cur"
+TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"
+TOOLSCALE               CURSOR                  "lltoolscale.cur"
+TOOLCAMERA              CURSOR                  "lltoolcamera.cur"
+TOOLPAN                 CURSOR                  "lltoolpan.cur"
+TOOLFOCUS               CURSOR                  "lltoolfocus.cur"
+TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"
+ARROWCOPY               CURSOR                  "arrowcop.cur"
+ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"
+ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"
+TOOLSIT                 CURSOR                  "toolsit.cur"
+TOOLBUY                 CURSOR                  "toolbuy.cur"
+TOOLPAY                 CURSOR                  "toolpay.cur"
+TOOLOPEN                CURSOR                  "toolopen.cur"
+TOOLPIPETTE             CURSOR                  "toolpipette.cur"
+TOOLPLAY                CURSOR                  "toolplay.cur"
+TOOLPAUSE               CURSOR                  "toolpause.cur"
+TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,20,9,87416
+ PRODUCTVERSION 1,20,9,87416
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Linden Lab"
+            VALUE "FileDescription", "Second Life"
+            VALUE "FileVersion", "1.20.9.87416"
+            VALUE "InternalName", "Second Life"
+            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
+            VALUE "OriginalFilename", "SecondLife.exe"
+            VALUE "ProductName", "Second Life"
+            VALUE "ProductVersion", "1.20.9.87416"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP2             BITMAP                  "bitmap2.bmp"
+IDB_LOGIN               BITMAP                  "loginbackground.bmp"
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/linden/indra/newview/secondlife setup build A08T01.bat b/linden/indra/newview/secondlife setup build A08T01.bat
deleted file mode 100644
index 230319c..0000000
--- a/linden/indra/newview/secondlife setup build A08T01.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --login_channel="Second Life Release A08T01"
diff --git a/linden/indra/newview/secondlife setup build B08T01.bat b/linden/indra/newview/secondlife setup build B08T01.bat
deleted file mode 100644
index 19ea7d0..0000000
--- a/linden/indra/newview/secondlife setup build B08T01.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --login_channel="Second Life Release B08T01"
diff --git a/linden/indra/newview/secondlife setup build aditi.bat b/linden/indra/newview/secondlife setup build aditi.bat
deleted file mode 100644
index cb52caf..0000000
--- a/linden/indra/newview/secondlife setup build aditi.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=aditi
diff --git a/linden/indra/newview/secondlife setup build agni.bat b/linden/indra/newview/secondlife setup build agni.bat
deleted file mode 100644
index fe9dd4f..0000000
--- a/linden/indra/newview/secondlife setup build agni.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat"
\ No newline at end of file
diff --git a/linden/indra/newview/secondlife setup build aruna.bat b/linden/indra/newview/secondlife setup build aruna.bat
deleted file mode 100644
index 0330371..0000000
--- a/linden/indra/newview/secondlife setup build aruna.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=aruna
diff --git a/linden/indra/newview/secondlife setup build dmz.bat b/linden/indra/newview/secondlife setup build dmz.bat
deleted file mode 100644
index 5d5a614..0000000
--- a/linden/indra/newview/secondlife setup build dmz.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=dmz
diff --git a/linden/indra/newview/secondlife setup build durga.bat b/linden/indra/newview/secondlife setup build durga.bat
deleted file mode 100644
index 3ba6bd7..0000000
--- a/linden/indra/newview/secondlife setup build durga.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=durga
diff --git a/linden/indra/newview/secondlife setup build firstlookwindlight.bat b/linden/indra/newview/secondlife setup build firstlookwindlight.bat
deleted file mode 100644
index c62b71c..0000000
--- a/linden/indra/newview/secondlife setup build firstlookwindlight.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --channel="Second Life WindLight"
diff --git a/linden/indra/newview/secondlife setup build ganga.bat b/linden/indra/newview/secondlife setup build ganga.bat
deleted file mode 100644
index f2cff72..0000000
--- a/linden/indra/newview/secondlife setup build ganga.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=ganga
\ No newline at end of file
diff --git a/linden/indra/newview/secondlife setup build mitra.bat b/linden/indra/newview/secondlife setup build mitra.bat
deleted file mode 100644
index f24e6ae..0000000
--- a/linden/indra/newview/secondlife setup build mitra.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=mitra
diff --git a/linden/indra/newview/secondlife setup build mohini.bat b/linden/indra/newview/secondlife setup build mohini.bat
deleted file mode 100644
index 17ed241..0000000
--- a/linden/indra/newview/secondlife setup build mohini.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=mohini
diff --git a/linden/indra/newview/secondlife setup build nandi.bat b/linden/indra/newview/secondlife setup build nandi.bat
deleted file mode 100644
index 3613e90..0000000
--- a/linden/indra/newview/secondlife setup build nandi.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=nandi
diff --git a/linden/indra/newview/secondlife setup build radha.bat b/linden/indra/newview/secondlife setup build radha.bat
deleted file mode 100644
index 6f1d220..0000000
--- a/linden/indra/newview/secondlife setup build radha.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=radha
diff --git a/linden/indra/newview/secondlife setup build ravi.bat b/linden/indra/newview/secondlife setup build ravi.bat
deleted file mode 100644
index fe042df..0000000
--- a/linden/indra/newview/secondlife setup build ravi.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=ravi
diff --git a/linden/indra/newview/secondlife setup build release candidate.bat b/linden/indra/newview/secondlife setup build release candidate.bat
deleted file mode 100644
index e2bdbf3..0000000
--- a/linden/indra/newview/secondlife setup build release candidate.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --channel="Second Life Release Candidate"
diff --git a/linden/indra/newview/secondlife setup build shakti.bat b/linden/indra/newview/secondlife setup build shakti.bat
deleted file mode 100644
index 37aff9b..0000000
--- a/linden/indra/newview/secondlife setup build shakti.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=shakti
\ No newline at end of file
diff --git a/linden/indra/newview/secondlife setup build siva.bat b/linden/indra/newview/secondlife setup build siva.bat
deleted file mode 100644
index ae66128..0000000
--- a/linden/indra/newview/secondlife setup build siva.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=siva
diff --git a/linden/indra/newview/secondlife setup build soma.bat b/linden/indra/newview/secondlife setup build soma.bat
deleted file mode 100644
index c7a9f64..0000000
--- a/linden/indra/newview/secondlife setup build soma.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=soma
diff --git a/linden/indra/newview/secondlife setup build uma.bat b/linden/indra/newview/secondlife setup build uma.bat
deleted file mode 100644
index ad2d849..0000000
--- a/linden/indra/newview/secondlife setup build uma.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=uma
diff --git a/linden/indra/newview/secondlife setup build vaak.bat b/linden/indra/newview/secondlife setup build vaak.bat
deleted file mode 100644
index 63cd71c..0000000
--- a/linden/indra/newview/secondlife setup build vaak.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"viewer_manifest.py" --grid=vaak
diff --git a/linden/indra/newview/secondlife setup build voicebeta.bat b/linden/indra/newview/secondlife setup build voicebeta.bat
deleted file mode 100644
index 293cf82..0000000
--- a/linden/indra/newview/secondlife setup build voicebeta.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=aditi --channel="Second Life Voice Beta"
diff --git a/linden/indra/newview/secondlife setup build voicefirstlook.bat b/linden/indra/newview/secondlife setup build voicefirstlook.bat
deleted file mode 100644
index ebb74ea..0000000
--- a/linden/indra/newview/secondlife setup build voicefirstlook.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --channel="Second Life Voice First Look"
diff --git a/linden/indra/newview/secondlife setup build yami.bat b/linden/indra/newview/secondlife setup build yami.bat
deleted file mode 100644
index 4f88805..0000000
--- a/linden/indra/newview/secondlife setup build yami.bat	
+++ /dev/null
@@ -1,4 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-@"secondlife setup build.bat" --grid=yami
diff --git a/linden/indra/newview/secondlife setup build.bat b/linden/indra/newview/secondlife setup build.bat
deleted file mode 100644
index df6dc72..0000000
--- a/linden/indra/newview/secondlife setup build.bat	
+++ /dev/null
@@ -1,21 +0,0 @@
-@REM Invoke the installer-generation process after
-@REM creating and modifying files necessary for pointing
-@REM the viewer at different grids (production preview, etc)
-@REM
-@REM Usage:
-@REM
-@REM     "secondlife setup build.bat" login-page-url installer-args
-@REM
-@REM Examples:
-@REM
-@REM     "secondlife setup build.bat" http://secondlife.com/app/login/
-@REM     "secondlife setup build.bat" http://secondlife.com/app/login/beta/ /DADITI 
-@REM 
-
-
-@rem use manifest to build installer
-@"viewer_manifest.py" %1 %2 %3 %4 %5 %6 %7 %8
-
-@rem pause
-
-:END
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 608ba55..3b85efa 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -37,6 +37,7 @@
 <ButtonUnselectedBgColor value="62, 62, 62, 255" />
 <ButtonUnselectedFgColor value="255, 255, 255, 255" />
 <ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonFlashBgColor value="255, 190, 62, 127" />
 <ButtonColor value="255, 255, 255, 255" /> 		<!-- Blended with button art, usually left as opaque white -->
 <ButtonImageColor value="255, 255, 255, 255" /> 	<!-- Blended with button art, usually left as opaque white -->
 
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 88e6dfc..9e1d9b5 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -365,10 +365,8 @@
   <texture name="icn_label_music.tga"/>
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
-  <texture name="skin_thumbnail_modern.png" preload="true"/>
-  <texture name="skin_thumbnail_classic.png" preload="true"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
   
   <texture name="skin_thumbnail_default.png" preload="true" />
   <texture name="skin_thumbnail_silver.png" preload="true" />
-</textures>
\ No newline at end of file
+</textures>
diff --git a/linden/indra/newview/skins/default/xui/de/alerts.xml b/linden/indra/newview/skins/default/xui/de/alerts.xml
index d829632..3292470 100644
--- a/linden/indra/newview/skins/default/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/de/alerts.xml
@@ -3219,20 +3219,6 @@ erscheint Ihre Anzeige weiter oben in der Liste.
 			Abbrechen
 		</option>
 	</alert>
-	<alert name="WebLaunchReleaseNotes">
-		<message name="message">
-			Die Release-Hinweise von [SECOND_LIFE] anzeigen?
-		</message>
-		<ignore name="ignore">
-			Beim Starten eines Browsers, um die Versionshinweise anzuzeigen
-		</ignore>
-		<option name="Gotopage">
-			OK
-		</option>
-		<option name="Cancel">
-			Abbrechen
-		</option>
-	</alert>
 	<alert name="ReturnToOwner">
 		<message name="message">
 			Möchten Sie die ausgewählten Objekte
@@ -3313,7 +3299,7 @@ Diese Gruppe verlassen?
 			Stummschalten nach Name betrifft nur Chat und IM, keine Sounds. 
 Sie müssen den Objektnamen exakt angeben.
 		</message>
-		<editline>
+		<editline name="editline">
 			Objektname
 		</editline>
 		<option name="OK">
@@ -3445,7 +3431,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 		<message name="message">
 			Beim Hinauswerfen dieses Benutzers welche Meldung anzeigen?
 		</message>
-		<editline>
+		<editline name="editline">
 			Sie wurden von einem Administrator abgemeldet.
 		</editline>
 		<option name="OK">
@@ -3459,7 +3445,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 		<message name="message">
 			Beim Hinauswerfen aller Personen vom Grid welche Meldung anzeigen?
 		</message>
-		<editline>
+		<editline name="editline">
 			Sie wurden von einem Administrator abgemeldet.
 		</editline>
 		<option name="OK">
@@ -3473,7 +3459,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 		<message name="message">
 			Beim Einfrieren dieses Benutzers welche Meldung anzeigen?
 		</message>
-		<editline>
+		<editline name="editline">
 			Sie wurden eingefroren. Bewegen oder Chatten ist nicht mehr möglich. Ein Administrator wird sich über IM an Sie wenden
 		</editline>
 		<option name="OK">
@@ -3487,7 +3473,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 		<message name="message">
 			Beim Auftauen dieses Benutzers welche Meldung anzeigen?
 		</message>
-		<editline>
+		<editline name="editline">
 			Sie sind nicht mehr eingefroren.
 		</editline>
 		<option name="OK">
@@ -3512,7 +3498,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 		<message name="message">
 			Teleport an Ihre Position mit der folgenden Meldung anbieten?
 		</message>
-		<editline>
+		<editline name="editline">
 			Triff mich in [REGION]
 		</editline>
 		<option name="OK">
@@ -3526,7 +3512,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
 		<message name="message">
 			Benutzer an Ihrem Standort herbeirufen?
 		</message>
-		<editline>
+		<editline name="editline">
 			Triff mich in [REGION]
 		</editline>
 		<option name="OK">
@@ -4944,13 +4930,15 @@ Wolkendichte.
 		<message name="message">
 			Wählen Sie einen Namen für den neuen Himmel.
 		</message>
+		<editline name="editline">
+			Neue Voreinstellung
+		</editline>
 		<option name="OK">
 			OK
 		</option>
 		<option name="Cancel">
 			Abbrechen
 		</option>
-		Neue Voreinstellung
 	</alert>
 	<alert name="ExistsSkyPresetAlert">
 		<message name="message">
@@ -4961,13 +4949,15 @@ Wolkendichte.
 		<message name="message">
 			Wählen Sie einen Namen für die neue Wasservoreinstellung.
 		</message>
+		<editline name="editline">
+			Neue Voreinstellung
+		</editline>
 		<option name="OK">
 			OK
 		</option>
 		<option name="Cancel">
 			Abbrechen
 		</option>
-		Neue Voreinstellung
 	</alert>
 	<alert name="ExistsWaterPresetAlert">
 		<message name="message">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 7e97d4f..5d5877e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -8,4 +8,7 @@
 	<string name="home_page_url">
 		http://de.secondlife.com
 	</string>
+	<string name="support_page_url">
+	  	http://de.secondlife.com/support
+	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
index dec1bb3..6dd4be0 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -43,9 +43,6 @@
 	<check_box label="Verweigern - keine archivierte Zahlungsinfo" name="deny_anonymous" />
 	<check_box label="Verweigern - Zahlungsinfo archiviert" name="deny_identified" />
 	<check_box label="Verweigern - Zahlungsinfo verwendet" name="deny_transacted" />
-	<text name="abuse_email_text">
-		[Abuse E-mail Beta]
-	</text>
 	<button label="Ãœbernehmen" name="apply_btn" />
 	<text name="estate_manager_label">
 		Grundstücksverwalter:
diff --git a/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml b/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml
deleted file mode 100644
index b9c1200..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
-     mouse_opaque="true" name="panel_login" visible="false" width="800">
-	<string name="DebugInfo">
-		Debug Info
-	</string>
-	<string name="FPS">
-		FPS
-	</string>
-	<string name="SimFPS">
-		SimFPS
-	</string>
-	<string name="Pin">
-		P-In
-	</string>
-	<string name="Pout">
-		P-Out
-	</string>
-	<string name="PLoss">
-		P-Loss
-	</string>
-	<string name="Ping">
-		Ping
-	</string>
-	<string name="AccountDetails">
-		Account Details
-	</string>
-	<string name="LBal">
-		L$ bal
-	</string>
-	<string name="Time">
-		Time
-	</string>
-	<string name="LocationDetails1">
-		Location Details 1
-	</string>
-	<string name="LocationDetails2">
-		Location Details 2
-	</string>
-	<string name="Region">
-		Region
-	</string>
-	<string name="Parcel">
-		Parcel
-	</string>
-	<string name="Pos">
-		Pos
-	</string>
-	<string name="Sqm">
-		Sqm
-	</string>
-	<string name="Owner">
-		Owner
-	</string>
-	<string name="Type">
-		Type
-	</string>
-	<string name="Yes">
-		Yes
-	</string>
-	<string name="No">
-		No
-	</string>
-	<string name="Forsale">
-		ForSale
-	</string>
-	<string name="Traffic">
-		Traffic
-	</string>
-	<string name="Last3ChatLines">
-		Last 3 Chat Lines
-	</string>
-	<string name="Last3IMLines">
-		Last 3 IM Lines
-	</string>
-</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index c7ec62f..8b17754 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -367,9 +367,9 @@ according to the Community Standards.
 	</alert>
 	<alert modal="true" name="ClickPublishHelpAvatar">
 		<message name="message">
-			Selecting &quot;Show in Search&quot; will show:
-			- my profile in search results
-			- a link to my profile in public group pages
+Selecting &quot;Show in Search&quot; will show:
+- my profile in search results
+- a link to my profile in public group pages
 		</message>
 	</alert>
 	<alert modal="true" name="ClickPartnerHelpAvatar">
@@ -387,12 +387,13 @@ Go to the Second Life web site for more information on partnering?
 	</alert>
 	<alert modal="true" name="ClickWebProfileHelpAvatar">
 		<message name="message">
-			If this resident has a web profile URL set then you can:
- * Click Load to load the page with the embedded web browser.
- * Click Open to view externally in your default web browser.
+			If this resident has set a web profile URL then you can:
+ * Click "Load" to load the page with the embedded web browser.
+ * Click Load->"Open in external browser" to view externally.
+ * Click Load->"Home URL" to return to resident's web profile if you've navigated away.
  
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
+When viewing your own profile you can enter any URL as your web profile and click OK to set it.
+Other residents can visit the URL you set when they view your profile.
 		</message>
 	</alert>
 	<alert modal="true" name="ClickWebProfileNoWebHelpAvatar">
@@ -674,7 +675,7 @@ to set its Landing Point.
 	</alert>
 	<alert modal="true" name="PromptMissingSubjMsg">
 		<message name="message">
-			Send postcard with the default subject or message?
+			Email snapshot with the default subject or message?
 		</message>
 		<option name="OK">
 			OK
@@ -695,7 +696,7 @@ to set its Landing Point.
 	</alert>
 	<alert modal="true" name="ErrorUploadingPostcard">
 		<message name="message">
-			There was a problem uploading a postcard due to the following reason: [REASON]
+			There was a problem sending a snapshot due to the following reason: [REASON]
 		</message>
 	</alert>
 	<alert modal="true" name="ErrorUploadingReportScreenshot">
@@ -734,14 +735,16 @@ The outfit folder contains no clothing, body parts, or attachments.
 	</alert>
 	<alert modal="true" name="MustHaveAccountToLogIn">
 		<message name="message">
-			You must have an account to connect to [SECOND_LIFE].
-Go to www.secondlife.com to create an account?
-		</message>
+Oops! Something was left blank.
+You need to enter both the First and Last name of your avatar.
+
+You need an account to enter [SECOND_LIFE]. Would you like to create one now?
+</message>
 		<option name="OK">
-			OK
+			Create a new account
 		</option>
 		<option name="Cancel">
-			Cancel
+			Try again
 		</option>
 	</alert>
 	<alert modal="true" name="AddClassified">
@@ -849,7 +852,7 @@ Apply those changes and quit?
 	</alert>
 	<alert modal="true" name="ResetShowNextTimeDialogs">
 		<message name="message">
-			Reset all &apos;Show next time&apos; dialogs?
+			Would you like to re-enable all these popups, which you previously indicated &apos;Don&apos;t show me again&apos;?
 		</message>
 		<option name="OK">
 			OK
@@ -860,7 +863,7 @@ Apply those changes and quit?
 	</alert>
 	<alert modal="true" name="SkipShowNextTimeDialogs">
 		<message name="message">
-			Disable all &apos;Show next time&apos; dialogs?
+			Would you like to disable all popups which can be skipped?
 		</message>
 		<option name="OK">
 			OK
@@ -1344,7 +1347,7 @@ Do you really want to give these items?
 	<alert modal="true" name="CannotGiveCategory">
 		<message name="message">
 			You do not have permission to transfer
-			the selected folder.
+the selected folder.
 		</message>
 	</alert>
 	<alert modal="true" name="FreezeAvatar">
@@ -1781,7 +1784,7 @@ No parcel selected.
 	<alert modal="true" name="CannotBuyLandNoRegion">
 		<message name="message">
 			Unable to buy land:
-			Cannot find the region this land is in.
+Cannot find the region this land is in.
 		</message>
 	</alert>
 	<alert modal="true" name="CannotCloseFloaterBuyLand">
@@ -2079,15 +2082,12 @@ www.secondlife.com/support.
 	</alert>
 	<alert modal="true" name="YouHaveBeenLoggedOut">
 		<message name="message">
-			You have been logged out of [SECOND_LIFE]:
-[MESSAGE]
-
-Click Continue to look at existing IM and chat.
-You will not be able to perform any other operations.
-Click Quit to exit [SECOND_LIFE] immediately.
-		</message>
-		<option name="Continue">
-			Continue
+You have been logged out of [SECOND_LIFE]:
+            [MESSAGE]
+You can still look at existing IM and chat by clicking 'View IM &amp; Chat'. Otherwise, click 'Quit' to exit [SECOND_LIFE] immediately.
+    </message>
+    <option name="Continue">
+			View IM &amp; Chat
 		</option>
 		<option name="Quit">
 			Quit
@@ -2101,12 +2101,14 @@ You do not have permission to buy land for your active group.
 	</alert>
 	<alert modal="true" name="AddFriend" title="Add Friend">
 		<message name="message">
-			Friends can give permissions to 
-track each other on the map and 
-receive online status updates. 
+			Friends can give permissions to track each 
+other on the map and receive online status updates. 
 
 Offer friendship to [NAME]?
 		</message>
+		<editline name="editline">
+			Would you be my friend?
+		</editline>
 		<option name="Offer">
 			OK
 		</option>
@@ -2593,24 +2595,10 @@ Please select only one object and try again.
 			Cancel
 		</option>
 	</alert>
-	<alert modal="true" name="ReturnScriptedOnOthersLand">
-		<message name="message">
-			Are you sure you want to return all scripted objects owned by
-** [USER_NAME] **
-on all land in this region they do not own?
-		</message>
-		<option name="Return">
-			OK
-		</option>
-		<option default="true" name="Cancel">
-			Cancel
-		</option>
-	</alert>
-	<alert modal="true" name="ReturnScriptedOnAllLand">
+	<alert modal="true" name="EstateObjectReturn">
 		<message name="message">
-			Are you sure you want to return ALL scripted objects owned by
-** [USER_NAME] **
-on ALL LAND in this region?
+			Are you sure you want to return objects owned by
+[USER_NAME] ?
 		</message>
 		<option name="Return">
 			OK
@@ -2984,20 +2972,6 @@ Download to your Applications folder?
 			Cancel
 		</option>
 	</alert>
-	<alert modal="true" name="WebLaunchReleaseNotes">
-		<message name="message">
-			View the [SECOND_LIFE] Release Notes?
-		</message>
-		<ignore name="ignore">
-			When launching web browser to view the Release Notes
-		</ignore>
-		<option name="Gotopage">
-			OK
-		</option>
-		<option name="Cancel">
-			Cancel
-		</option>
-	</alert>
 	<alert modal="true" name="ReturnToOwner">
 		<message name="message">
 			Are you sure you want to return the selected
@@ -3195,7 +3169,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			Kick this user with what message?
 		</message>
-		<editline>
+		<editline name="editline">
 			An administrator has logged you off.
 		</editline>
 		<option name="OK">
@@ -3209,7 +3183,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			Kick everyone currently on the grid with what message?
 		</message>
-		<editline>
+		<editline name="editline">
 			An administrator has logged you off.
 		</editline>
 		<option name="OK">
@@ -3223,7 +3197,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			Freeze this user with what message?
 		</message>
-		<editline>
+		<editline name="editline">
 			You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
 		</editline>
 		<option name="OK">
@@ -3237,7 +3211,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			Unfreeze this user with what message?
 		</message>
-		<editline>
+		<editline name="editline">
 			You are no longer frozen.
 		</editline>
 		<option name="OK">
@@ -3263,7 +3237,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			Offer a teleport to your location with the following message?
 		</message>
-		<editline>
+		<editline name="editline">
 			Join me in [REGION]
 		</editline>
 		<option name="OK">
@@ -3277,7 +3251,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			God summon user to your location?
 		</message>
-		<editline>
+		<editline name="editline">
 			Join me in [REGION]
 		</editline>
 		<option name="OK">
@@ -3306,7 +3280,7 @@ from the &apos;Edit&apos; menu.
 			Type a short announcement which will be
 sent to everyone currently in your estate.
 		</message>
-		<editline />
+		<editline name="editline" />
 		<option name="OK">
 			OK
 		</option>
@@ -3597,7 +3571,7 @@ Does this group contain Mature content?
 			Type a short announcement which will be
 sent to everyone in this region.
 		</message>
-		<editline />
+		<editline name="editline" />
 		<option name="OK">
 			OK
 		</option>
@@ -4385,19 +4359,18 @@ Entering an accurate description helps us file and process bug reports.
 	<alert modal="true" name="HelpReportAbuseContainsCopyright">
 		<message name="message">
 			Dear Resident,
- 
-Reports about copyright infringement can only be submitted
-as described at http://secondlife.com/corporate/dmca.php.
 
-Reports concerning copyright infringement will automatically
-be discarded if they are submitted through the &apos;Abuse Report&apos;
-feature. If your report does not relate to copyright infringement,
-you may close this window and finish submitting your report.
- 
+If you are reporting intellectual property infringement, please make sure you are reporting it correctly:
+
+(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
+
+(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you must submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
+
+If you still wish to continue with the abuse process, please close this window and finish submitting your report.
+
 Thank you,
- 
-Linden Lab
-		</message>
+
+Linden Lab</message>
 	</alert>
 	<alert modal="true" name="FailedRequirementsCheck">
 		<message name="message">
@@ -4467,8 +4440,7 @@ the contents of your Trash folder?
 	</alert>
 	<alert modal="true" name="ConfirmClearCookies">
 		<message name="message">
-			Are you sure you want to clear 
-your cookies?
+			Are you sure you want to clear your cookies?
 		</message>
 		<option default="true" name="Yes">
 			Yes
@@ -4829,7 +4801,7 @@ with the the D slider.
 		<message name="message">
 			Give me a name for the new sky.
 		</message>
-		<editline>
+		<editline name="editline">
 			New Preset
 		</editline>
 		<option name="OK">
@@ -4848,7 +4820,7 @@ with the the D slider.
 		<message name="message">
 			Give me a name for the new water preset.
 		</message>
-		<editline>
+		<editline name="editline">
 			New Preset
 		</editline>
 		<option name="OK">
@@ -4907,7 +4879,7 @@ with the the D slider.
 	<alert modal="true" name="Cannot_Purchase_an_Attachment">
 		<message name="message">
 			Items may not be purchased while
-			they are part of an attachment.
+they are part of an attachment.
 		</message>
 	</alert>
 	<alert modal="true" name="DebitPermissionDetails"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 3f6e6b2..fc1b747 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -227,6 +227,10 @@
 			<string name="sale_pending_text">
 				(Sale Pending)
 			</string>
+			<string name="no_selection_text">
+			No parcel selected.
+Go to World menu > About Land or select another parcel to show its details.
+			</string>
 		</panel>
 		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
 		     height="333" label="Covenant" left="0" mouse_opaque="true"
@@ -310,7 +314,7 @@
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="fakse"
+			     mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="false"
 			     width="364">
 				Region Object Bonus Factor: [BONUS]
 			</text>
@@ -463,6 +467,7 @@
 				<column name="online_status" width="-1" />
 				<column name="name" dynamicwidth="true" label="Name" />
 				<column name="count" label="Count" width="70" />
+				<column label="Most Recent" width="160" />
 			</name_list>
 		</panel>
 		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
@@ -819,7 +824,7 @@ Options:
 			     tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
 			     width="278" />
 			<string name="estate_override">
-				One ore more of these options is set at the estate level
+				One or more of these options is set at the estate level
 			</string>
 			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="16" initial_value="false" label="Allow Group Access: [GROUP]"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
index 5ce1f5c..4d1d10d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
@@ -3,17 +3,17 @@
      can_resize="false" height="500" min_height="100" min_width="100"
      name="modal container" title="" width="600">
 	<button bottom="15" font="SansSerif" halign="center" height="20" label="Continue"
-	     label_selected="Continue" left="370" mouse_opaque="true" name="Continue"
+	     label_selected="Continue" left="484" mouse_opaque="true" name="Continue"
 	     width="100" />
 	<button bottom="15" font="SansSerif" halign="center" height="20" label="Cancel"
-	     label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
+	     label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
 	     width="100" />
 	<!-- No title text here because our "critical message" is usually the
 	community standards. JC -->
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-35" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="20" left="20" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
 		Please read the following message carefully.
 	</text>
-	<text_editor bottom="45" embedded_items="false" follows="left|top" font="SansSerif" left="20" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" right="-20" top="-45" word_wrap="true">
+	<text_editor bottom="45" embedded_items="false" follows="left|top" font="SansSerif" left="20" max_length="65536" mouse_opaque="true" text_readonly_color="0,0,0,255" bg_readonly_color="255,255,255,255" name="tos_text" right="-20" top="-45" word_wrap="true">
 		TOS_TEXT
 	</text_editor>
 </floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
index 227e41b..d107454 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
@@ -19,4 +19,7 @@
 	<string name="home_page_url">
 	  	http://www.secondlife.com
 	</string>
+	<string name="support_page_url">
+	  	http://support.secondlife.com
+	</string>
 </floater>
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 cb27be6..cce06b5 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
@@ -16,6 +16,9 @@
 	<string name="hang_up">
 		Call ended
 	</string>
+	<string name="inventory_item_offered">
+		Inventory item offered
+	</string>
 	<string name="voice_icon">
 		icn_voice-pvtfocus.tga
 	</string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
index b47c788..eea285c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -42,7 +42,7 @@
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
 			     label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn"
 			     right="496"
-			     tool_tip="Click here to toggle list of active partipants in this IM session."
+			     tool_tip="Click here to toggle a list of active participants in this IM session."
 			     visible="true" width="80" />
 			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="-265" embedded_items="false" enabled="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 6606980..31d80f6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
-     can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"
+     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"
      follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
      min_height="200" min_width="360" mouse_opaque="true" name="im_floater"
      rect_control="" title="(unknown)" width="501">
@@ -29,7 +29,7 @@
 		[NAME] is typing...
 	</string>
 	<string name="session_start_string">
-		Starting session with [NAME] please wait.
+		Starting session with [NAME], please wait.
 	</string>
 	<string name="moderated_chat_label">
 		(Moderated)
@@ -38,7 +38,7 @@
 		Click here to instant message.
 	</string>
 	<string name="muted_text_label">
-		Text chat has been disabled by a Group Moderator.
+		Your text chat has been disabled by a Group Moderator.
 	</string>
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
 	     orientation="horizontal" tab_group="1" width="495" name="panels">
@@ -57,7 +57,7 @@
 			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
 			     label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
 			     right="176"
-			     tool_tip="Click here to toggle list of active partipants in this IM session."
+			     tool_tip="Click here to toggle a list of active participants in this IM session."
 			     visible="true" width="30" />
 			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="30" embedded_items="false" enabled="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
index 4fa24dd..7b2c6b6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
@@ -66,7 +66,8 @@
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
 	     mouse_opaque="true" name="server_lag_cause" right="-32" v_pad="0" />
 	<button bottom="5" follows="left|top" font="SansSerif" halign="center" height="18"
-	     help_url="http://secondlife.com/support" label="?" mouse_opaque="true"
+	     help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4851" 
+	     label="?" mouse_opaque="true"
 	     name="server_help" right="-10" width="18" />
 	<button bottom="5" follows="left|top" font="SansSerif" halign="center" height="20"
 	     label="&gt;&gt;" left="5" mouse_opaque="true" name="minimize" width="25" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
index 1d4dcb9..2e91a82 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
@@ -9,6 +9,9 @@
 	<check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
 	     height="18" initial_value="true" label="Running" left="12"
 	     mouse_opaque="true" name="running" radio_style="false" width="100" />
+	<check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
+	     height="18" hidden="false" initial_value="true" label="Mono" left="82"
+	     mouse_opaque="true" name="mono" radio_style="false" width="100" />
 	<panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"
 	     left="1" name="script ed panel" width="497" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0" />
 	<string name="not_allowed">
@@ -17,4 +20,4 @@
 	<string name="script_running">
 		Running
 	</string>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mem_leaking.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mem_leaking.xml
new file mode 100644
index 0000000..e7e973e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mem_leaking.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="500" left="100" can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" follows="left|top" height="175" name="MemLeak"
+     title="Memory Leaking Simulation" width="350">					
+	<spinner bottom="125" decimal_digits="0" follows="left|top" height="20"
+	     increment="256" label="Leaking Speed (bytes per frame):" label_width="180" left="10" max_val="4294967296"
+	     min_val="0" initial_val="512" name="leak_speed" width="330" />
+	<spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
+	     increment="4" label="Max Leaked Memory (MB):" label_width="180" left="10" max_val="4096"
+	     min_val="0" initial_val="512" name="max_leak" width="330" />
+	<text bottom_delta="-25" follows="left|top" height="25" left="10" name="total_leaked_label"
+	     width="300">
+		Current leaked memory: [SIZE] KB
+	</text>	
+	<text bottom_delta="-25" follows="left|top" height="25" left="10" name="note_label_1"
+	     width="330">
+		[NOTE1]
+	</text>
+	<text bottom_delta="-25" follows="left|top" height="25" left="10" name="note_label_2"
+	     width="330">
+		[NOTE2]
+	</text>	
+	<button bottom="10" follows="left|top" height="20" label="Start" left="10"
+	     name="start_btn" width="60" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Stop" left="100"
+	     name="stop_btn" width="60" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Release" left="190"
+	     name="release_btn" width="60" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Close" left="280"
+	     name="close_btn" width="60" />	
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index e688ae3..631db0d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="true" height="380" min_height="380" min_width="450"
-     name="Postcard" title="Send Postcard" width="450">
+     name="Postcard" title="Email Snapshot" width="450">
 	<text bottom="-35" follows="top|left" font="SansSerif" left="12" name="to_label">
 		Recipient&apos;s Email:
 	</text>
@@ -36,7 +36,7 @@
 	</text_editor>
 	<text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
 	     name="fine_print">
-		If your postcard recipient joins SL, you&apos;ll get a referral bonus.
+		If your recipient joins SL, you&apos;ll get a referral bonus.
 	</text>
 	<button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
 	     name="cancel_btn" right="-10" width="100" />
@@ -48,4 +48,7 @@
 	<string name="default_message">
 		Check this out!
 	</string>
+	<string name="upload_message">
+	 "Sending..."
+	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
index 5055885..00ee9ac 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="560" min_height="100" min_width="100"
+     can_resize="false" height="590" min_height="100" min_width="100"
      name="floater_report_abuse" title="Report Abuse" width="390">
 	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
 	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
 	     name="screenshot" width="134" />
-	<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Include screenshot" left="234"
+	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Include screenshot" left="13"
 	     mouse_opaque="true" name="screen_check" width="116" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-48" drop_shadow_visible="true" follows="left|top"
@@ -45,12 +45,12 @@
 		{128.1, 128.1, 15.4}
 	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
 	     mouse_opaque="true" name="select_object_label" v_pad="0" width="220">
 		Click the button then the object:
 	</text>
-	<button bottom_delta="-32" font="SansSerif" halign="center" height="32" label=""
+	<button bottom_delta="-30" font="SansSerif" halign="center" height="32" label=""
 	     label_selected="" left="16" mouse_opaque="true" name="pick_btn"
 	     tool_tip="Object Picker - Identify an object as the subject of this report"
 	     width="32" />
@@ -78,37 +78,90 @@
 	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
 		Hendrerit Vulputate
 	</text>
-	<combo_box bottom_delta="-28" follows="left|top" height="20" left="16" mouse_opaque="true"
+	<combo_box bottom_delta="-48" follows="left|top" height="20" left="16" mouse_opaque="true"
 	     name="category_combo"
 	     tool_tip="Category -- select the category that best describes this report"
-	     width="180">
-		<combo_item name="Selectcategory" value="0">
-			Select category
-		</combo_item>
-		<combo_item name="Intolerance" value="23">
-			Intolerance
-		</combo_item>
-		<combo_item name="Harassment" value="24">
-			Harassment
-		</combo_item>
-		<combo_item name="Assault" value="25">
-			Assault
-		</combo_item>
-		<combo_item name="Disclosure" value="26">
-			Disclosure
-		</combo_item>
-		<combo_item name="Indecency" value="27">
-			Indecency
-		</combo_item>
-		<combo_item name="Age" value="28">
-			Age
-		</combo_item>
-		<combo_item name="Parcel" value="29">
-			Parcel
-		</combo_item>
-		<combo_item name="Other" value="30">
-			Other
-		</combo_item>
+	     width="356">
+<combo_item name="Select_category" value="0">
+Select category
+</combo_item><combo_item name="Age__Age_play" value="31">
+Age > Age play
+</combo_item><combo_item name="Age__Adult_resident_on_Teen_Second_Life" value="32">
+Age > Adult resident on Teen Second Life
+</combo_item><combo_item name="Age__Underage_resident_on_Adult_Second_Life" value="33">
+Age > Underage resident on Adult Second Life
+</combo_item><combo_item name="Assault__Combat_sandbox___unsafe_area" value="34">
+Assault > Combat sandbox / unsafe area
+</combo_item><combo_item name="Assault__Safe_area" value="35">
+Assault > Safe area
+</combo_item><combo_item name="Assault__Weapons_testing_sandbox" value="36">
+Assault > Weapons testing sandbox
+</combo_item><combo_item name="Copyright_or_intellectual_property_violation" value="37">
+Copyright or intellectual property violation
+</combo_item><combo_item name="Commerce__Failure_to_deliver_product_or_service" value="38">
+Commerce > Failure to deliver product or service
+</combo_item><combo_item name="Disclosure__First_Life_information" value="39">
+Disclosure > First life information
+</combo_item><combo_item name="Disclosure__Remotely_monitoring chat" value="40">
+Disclosure > Remotely monitoring chat
+</combo_item><combo_item name="Disclosure__Second_Life_information_chat_IMs" value="41">
+Disclosure > Second Life information/chat/IMs
+</combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42">
+Disturbing the peace > Unfair use of region resources
+</combo_item><combo_item name="Disturbing_the_peace__Excessive_scripted_objects" value="43">
+Disturbing the peace > Excessive scripted objects
+</combo_item><combo_item name="Disturbing_the_peace__Object_littering" value="44">
+Disturbing the peace > Object littering
+</combo_item><combo_item name="Disturbing_the_peace__Repetitive_spam" value="45">
+Disturbing the peace > Repetitive spam
+</combo_item><combo_item name="Disturbing_the_peace__Unwanted_advert_spam" value="46">
+Disturbing the peace > Unwanted advert spam
+</combo_item><combo_item name="Fraud__L$" value="47">
+Fraud > L$
+</combo_item><combo_item name="Fraud__Land" value="48">
+Fraud > Land
+</combo_item><combo_item name="Fraud__Pyramid_scheme_or_chain_letter" value="49">
+Fraud > Pyramid scheme or chain letter
+</combo_item><combo_item name="Fraud__US$" value="50">
+Fraud > US$
+</combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
+Harassment > Advert farms / visual spam
+</combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
+Harassment > Defaming individuals or groups
+</combo_item><combo_item name="Harassment__Impeding_movement" value="53">
+Harassment > Impeding movement
+</combo_item><combo_item name="Harassment__Sexual_harassment" value="54">
+Harassment > Sexual harassment
+</combo_item><combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55">
+Harassment > Solicting/inciting others to violate ToS
+</combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
+Harassment > Verbal abuse
+</combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
+Indecency > Broadly offensive content or conduct
+</combo_item><combo_item name="Indecency__Broadly_visible_mature_content" value="58">
+Indecency > Broadly visible mature content
+</combo_item><combo_item name="Indecency__Inappropriate_avatar_name" value="59">
+Indecency > Inappropriate avatar name
+</combo_item><combo_item name="Indecency__Mature_content_in_PG_region" value="60">
+Indecency > Mature content in PG region
+</combo_item><combo_item name="Intolerance" value="61">
+Intolerance
+</combo_item><combo_item name="Land__Abuse_of_sandbox_resources" value="62">
+Land > Abuse of sandbox resources
+</combo_item><combo_item name="Land__Encroachment__Objects_textures" value="63">
+Land > Encroachment > Objects/textures
+</combo_item><combo_item name="Land__Encroachment__Particles" value="64">
+Land > Encroachment > Particles
+</combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
+Land > Encroachment > Trees/plants
+</combo_item><combo_item name="Trademark_violation" value="66">
+Trademark violation
+</combo_item><combo_item name="Wagering_gambling" value="67">
+Wagering/gambling
+</combo_item><combo_item name="Other" value="68">
+Other
+</combo_item>
+
 	</combo_box>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
@@ -125,6 +178,12 @@
 	     label="Choose Resident" label_selected="" left_delta="190"
 	     mouse_opaque="true" name="select_abuser"
 	     tool_tip="Select the name of the abuser from a list" width="160" />
+
+	<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Don't know abuser's name" left="13" visible="false"
+	     mouse_opaque="true" name="omit_abuser_name" width="116" 
+		 tool_tip="Check this if you are unable to provide the abuser's name"/>
+
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -173,8 +232,8 @@ if possible.
 	</text>
 	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
 	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
-	     name="cancel_btn" right="380" width="150" />
+	     name="cancel_btn" right="373" width="150" />
 	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
 	     label="Report Abuse" label_selected="Report Abuse" mouse_opaque="true"
-	     name="send_btn" right="224" width="150" />
+	     name="send_btn" right="217" width="150" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 72d9c35..b83a6df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
 	     embedded_items="false" enabled="true" follows="left|top|right|bottom"
 	     font="Monospace" height="376" ignore_tab="false" left="4"
 	     max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-	     word_wrap="true">
+	     word_wrap="true" show_line_numbers="true">
 		Loading...
 	</text_editor>
 	<button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
index 0702674..d8e6cb5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
@@ -3,7 +3,7 @@
      can_resize="false" can_tear_off="true" enabled="true" height="120"
      left="223" min_height="100" min_width="100" mouse_opaque="true"
      name="script search" title="Script Search" width="300">
-	<check_box bottom="-77" enabled="true" follows="left|top" font="SansSerifSmall"
+	<check_box bottom="-77" control_name="LSLFindCaseInsensitivity" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Case Insensitive" left="55"
 	     mouse_opaque="true" name="case_text" radio_style="false" width="240" />
 	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml b/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
index a029f19..f3d5296 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
@@ -64,7 +64,7 @@
 	     label_width="36" left="5" max_val="1" min_val="0" name="SliderTestName"
 	     show_text="false" volume="true" width="140" />
             <check_box name="check_box_test_1" label="True" bottom_delta="56" initial_value="true" left="0" />
-        <check_box name="check_box_test_1" label="False" bottom_delta="0" left_delta="50" initial_value="false" />
+        <check_box name="check_box_test_2" label="False" bottom_delta="0" left_delta="50" initial_value="false" />
             <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="8" embedded_items="false" enabled="false"
 			      font="SansSerif" height="22" left="2"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index ce19db8..4ec5e6c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -4,18 +4,18 @@
      rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
 	<text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
 	     width="195">
-		What would you like to do?
-	</text>
+    Snapshot destination
+  </text>
 	<radio_group bottom_delta="-65" follows="left|top" height="60" label="Snapshot type"
 	     left="10" name="snapshot_type_radio" width="195">
 		<radio_item bottom="-19" height="16" name="postcard">
-			Send a postcard
+			Send via email
 		</radio_item>
 		<radio_item bottom="-38" height="16" name="texture">
-			Upload a snapshot
-		</radio_item>
+      Save to your inventory (L$10)
+    </radio_item>
 		<radio_item bottom="-57" height="16" name="local">
-			Save snapshot to hard drive
+			Save to your hard drive
 		</radio_item>
 	</radio_group>
 	<text bottom="-236" follows="left|top" height="25" left="10" name="file_size_label"
@@ -26,10 +26,14 @@
 	     name="new_snapshot_btn" width="195" />
 	<button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
 	     name="send_btn" width="105" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Upload (L$10)" left="10"
+	<button bottom_delta="0" follows="left|top" height="20" label="Save (L$10)" left="10"
 	     name="upload_btn" width="105" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
-	     name="save_btn" width="105" />
+  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
+       list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
+       width="105">
+    <flyout_button_item value="save">Save</flyout_button_item>
+    <flyout_button_item value="save as">Save As...</flyout_button_item>
+  </flyout_button>
 	<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
 	     name="discard_btn" width="85" />
 	<button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
@@ -41,11 +45,15 @@
 	     mouse_opaque="true" name="less_btn" scale_image="TRUE"
 	     tool_tip="Advanced Options" width="80" />
 	<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
-	     width="195">
-		What size image do you need?
-	</text>
+	     width="115">
+	Size
+  </text>
+  <text bottom_delta="0" follows="top|left" height="15" left="130" name="format_label"
+       width="70">
+  Format
+  </text>
 	<combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
-	     name="postcard_size_combo" width="195">
+	     name="postcard_size_combo" width="115">
 		<combo_item name="CurrentWindow" value="[i0,i0]">
 			Current Window
 		</combo_item>
@@ -63,7 +71,7 @@
 		</combo_item>
 	</combo_box>
 	<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
-	     name="texture_size_combo" width="195">
+	     name="texture_size_combo" width="115">
 		<combo_item name="CurrentWindow" value="[i0,i0]">
 			Current Window
 		</combo_item>
@@ -81,7 +89,7 @@
 		</combo_item>
 	</combo_box>
 	<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
-	     name="local_size_combo" width="195">
+	     name="local_size_combo" width="115">
 		<combo_item name="CurrentWindow" value="[i0,i0]">
 			Current Window
 		</combo_item>
@@ -107,12 +115,25 @@
 			Custom
 		</combo_item>
 	</combo_box>
+	<combo_box bottom_delta="0" follows="left|top" height="20" label="Format" left="130"
+	     name="local_format_combo" width="70">
+		<combo_item name="PNG">
+			PNG
+		</combo_item>
+		<combo_item name="JPEG">
+			JPEG
+		</combo_item>
+		<combo_item name="BMP">
+			BMP
+		</combo_item>
+	</combo_box>
+
 	<spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
 	     increment="32" label="Width" label_width="30" left="10" max_val="6016"
-	     min_val="32" name="snapshot_width" width="95" />
+	     min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
 	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
 	     increment="32" label="Height" label_width="35" left="110" max_val="6016"
-	     min_val="32" name="snapshot_height" width="95" />
+	     min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
 	<check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
 	     name="keep_aspect_check" />
 	<slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
@@ -148,3 +169,4 @@
 		unknown
 	</string>
 </floater>
+ 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index db176b3..7f2ce76 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -3,7 +3,7 @@
      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=""
-     width="272">
+     short_title="Build" width="272">
 
 <!-- Main floater tabs -->
 
@@ -278,7 +278,16 @@
 			Large
 		</combo_item>
 	</combo_box>
-	<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
+	<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="-22" 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" />
@@ -417,13 +426,13 @@
 			     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="100"
-			     mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
+			     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="56"
-			     max_length="25" mouse_opaque="true" name="EdCost" width="84" />
+			     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"
@@ -537,6 +546,21 @@
 			<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 -->
@@ -843,6 +867,16 @@
 			     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"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 2003548..2108b42 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
      height="350" min_height="300" min_width="450" name="top_objects"
-     title="loading..." width="450">
+     title="loading..." width="550">
 	<text bottom="-50" follows="left|top" font="SansSerif" height="20" left="10"
 	     name="title_text" width="400">
 		Loading...
 	</text>
 	<scroll_list bottom_delta="-150" draw_border="true" draw_heading="true"
 	     follows="left|top|bottom|right" height="150" left="10" multi_select="true"
-	     name="objects_list" width="430">
+	     name="objects_list" width="530">
 		<column label="Score" name="score" width="55" />
 		<column dynamicwidth="true" label="Name" name="name" />
 		<column label="Owner" name="owner" width="105" />
 		<column label="Location" name="location" width="130" />
+		<column label="Time" name="time" width="180" />
 	</scroll_list>
 	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
 	     left="10" name="id_text" width="100">
@@ -20,7 +21,7 @@
 	</text>
 	<line_editor bottom_delta="3" enabled="false"
 	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="id_editor" width="250" />
+	     name="id_editor" width="350" />
 	<button bottom_delta="0" follows="bottom|right" height="20" label="Show Beacon"
 	     name="show_beacon_btn" right="-10" width="100" />
 	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
@@ -29,7 +30,7 @@
 	</text>
 	<line_editor bottom_delta="3" enabled="true"
 	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="object_name_editor" width="250" />
+	     name="object_name_editor" width="350" />
 	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
 	     name="filter_object_btn" right="-10" width="100" />
 	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
@@ -38,7 +39,7 @@
 	</text>
 	<line_editor bottom_delta="3" enabled="true"
 	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="owner_name_editor" width="250" />
+	     name="owner_name_editor" width="350" />
 	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
 	     name="filter_owner_btn" right="-10" width="100" />
 	<button bottom="35" follows="bottom|left" height="20" label="Return Selected" left="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
index 68ddae0..f1bec32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
@@ -3,31 +3,17 @@
      can_resize="false" height="500" min_height="100" min_width="100"
      name="modal container" title="" width="600">
 	<button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
-	     label="Continue" label_selected="Continue" left="376" mouse_opaque="true"
+	     label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
 	     name="Continue" width="100" />
 	<button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
-	     label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
+	     label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
 	     width="100" />
-	<radio_group bottom="-440" draw_border="false" follows="left|top|right" height="40"
-	     left="16" mouse_opaque="true" name="tos_agreement" width="568">
-		<radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
-		     name="radio_disagree" width="187">
-			I Disagree with the Terms of Service
-		</radio_item>
-		<radio_item bottom="-40" follows="left|top" height="16" left="0" mouse_opaque="true"
-		     name="radio_agree" width="216">
-			I Agree to the Terms of Service
-		</radio_item>
-	</radio_group>
+	<check_box bottom="-435" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of Service"
+		left="16" mouse_opaque="true" name="agree_chk" width="55" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-	     h_pad="0" halign="left" height="15" left="16" mouse_opaque="true"
-	     name="tos_title" v_pad="0" width="568">
-		Terms of Service Agreement
-	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-	     h_pad="0" halign="left" height="30" left="32" mouse_opaque="true"
+	     bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+	     h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
 	     name="tos_heading" v_pad="0" width="552">
 		Please read the following Terms of Service carefully. To continue logging in to Second Life,
 you must accept the agreement.
@@ -38,8 +24,8 @@ you must accept the agreement.
 	     word_wrap="true">
 		TOS_TEXT
 	</text_editor>
-	<web_browser bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
-	     height="283" left="16" max_length="65536" mouse_opaque="true"
+	<web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
+	     height="340" left="16" max_length="65536" mouse_opaque="true"
 	     name="tos_html"
 	     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
 	     width="568" word_wrap="true" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index 0ebab6f..059e8fb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
@@ -49,88 +49,76 @@
 	     height="16" label="Go Home" label_selected="Go Home" left_delta="57"
 	     mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
 	     width="88" />
-	<icon bottom="-76" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="icon_top_pick.tga" left="1013" mouse_opaque="true"
-	     name="classifieds" width="16" />
+	<icon bottom="-82" color="0, 1, 0, 1" follows="top|right" height="8"
+		image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
+		width="8" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-76" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-	     mouse_opaque="true" name="classifieds_label" v_pad="0" width="145">
-		Classifieds
-	</text>
-	<check_box bottom="-76" control_name="MapShowClassifieds" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=" "
-	     left_delta="70" mouse_opaque="true" name="class_chk" width="55" />
-	<icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"
-	     image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
-	     width="8" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-96" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="16"
-	     mouse_opaque="true" name="person_label" v_pad="0" width="145">
+		bottom="-86" drop_shadow_visible="true" follows="top|right"
+		font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="16"
+		mouse_opaque="true" name="person_label" v_pad="0" width="145">
 		Person
 	</text>
-	<check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=" "
-	     left_delta="70" mouse_opaque="true" name="people_chk" width="55" />
-	<icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
-	     width="16" />
+	<check_box bottom="-86" control_name="MapShowPeople" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label=" "
+		left_delta="70" mouse_opaque="true" name="people_chk" width="55" />
+	<icon bottom="-106" color="1, 1, 1, 1" follows="top|right" height="16"
+		image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
+		width="16" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-116" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-	     mouse_opaque="true" name="infohub_label" v_pad="0" width="145">
+		bottom="-106" drop_shadow_visible="true" follows="top|right"
+		font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+		mouse_opaque="true" name="infohub_label" v_pad="0" width="145">
 		Infohub
 	</text>
-	<check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=""
-	     left_delta="70" mouse_opaque="true" name="infohub_chk" width="55" />
-	<icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
-	     width="16" />
+	<check_box bottom="-106" control_name="MapShowInfohubs" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label=""
+		left_delta="70" mouse_opaque="true" name="infohub_chk" width="55" />
+	<icon bottom="-126" color="1, 1, 1, 1" follows="top|right" height="16"
+		image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
+		width="16" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-136" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-	     mouse_opaque="true" name="telehub_label" v_pad="0" width="145">
+		bottom="-126" drop_shadow_visible="true" follows="top|right"
+		font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+		mouse_opaque="true" name="telehub_label" v_pad="0" width="145">
 		Telehub
 	</text>
-	<check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label=""
-	     left_delta="70" mouse_opaque="true" name="telehubchk" width="55" />
-	<icon bottom="-76" color="1, 1, 1, 1" follows="top|right" height="16"
+	<check_box bottom="-126" control_name="MapShowTelehubs" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label=""
+		left_delta="70" mouse_opaque="true" name="telehubchk" width="55" />
+	<icon bottom="-86" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="icon_for_sale.tga" left="1123" mouse_opaque="true"
 	     name="landforsale" width="16" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-76" drop_shadow_visible="true" follows="top|right"
+	     bottom="-86" drop_shadow_visible="true" follows="top|right"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
 	     mouse_opaque="true" name="land_for_sale_label2" v_pad="0" width="145">
 		Land For Sale
 	</text>
-	<check_box bottom="-76" control_name="MapShowLandForSale" follows="top|right"
+	<check_box bottom="-86" control_name="MapShowLandForSale" follows="top|right"
 	     font="SansSerifSmall" height="16" initial_value="false" label=""
 	     left_delta="80" mouse_opaque="true" name="land_for_sale_chk" width="55" />
-	<icon bottom="-96" color="1, 1, 1, 1" follows="top|right" height="16"
+	<icon bottom="-106" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="map_event.tga" left="1123" mouse_opaque="true" name="event"
 	     width="16" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-96" drop_shadow_visible="true" follows="top|right"
+	     bottom="-106" drop_shadow_visible="true" follows="top|right"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
 	     mouse_opaque="true" name="events_label" v_pad="0" width="145">
 		Events
 	</text>
-	<check_box bottom="-96" control_name="MapShowEvents" follows="top|right"
+	<check_box bottom="-106" control_name="MapShowEvents" follows="top|right"
 	     font="SansSerifSmall" height="16" initial_value="false" label=""
 	     left_delta="80" mouse_opaque="true" name="event_chk" width="55" />
-	<icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+	<icon bottom="-126" color="1, 1, 1, 1" follows="top|right" height="16"
 	     image_name="map_event_mature.tga" left="1123" mouse_opaque="true"
 	     name="events_mature_icon" width="16" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-116" drop_shadow_visible="true" follows="top|right"
+	     bottom="-126" drop_shadow_visible="true" follows="top|right"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
 	     mouse_opaque="true" name="events_mature_label" v_pad="0" width="145">
 		Events (M)
 	</text>
-	<check_box bottom="-116" control_name="ShowMatureEvents" follows="top|right"
+	<check_box bottom="-126" control_name="ShowMatureEvents" follows="top|right"
 	     font="SansSerifSmall" height="16" initial_value="true" label=""
 	     left_delta="80" mouse_opaque="true" name="event_mature_chk" width="55" />
 	<icon bottom="-181" color="0.5, 0, 0, 1" follows="top|right" height="16"
@@ -147,7 +135,7 @@
 	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
 	     name="landmark_icon" width="16" />
 	<combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-	     label="Landmarks" left_delta="20" max_chars="60" mouse_opaque="true"
+	     label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true"
 	     name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
 		<combo_item name="none_selected" value="None">
 			Landmarks
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index b224954..c8d8ed6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -11,7 +11,7 @@
 		<on_click function="GoToObject" />
 	</menu_item_call>
 	<menu_item_separator />
-	<menu_item_call enabled="false" label="Add Friend" mouse_opaque="true" name="Add Friend">
+	<menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend">
 		<on_click function="Avatar.AddFriend" />
 		<on_enable function="Avatar.EnableAddFriend" />
 	</menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index 72fca5e..327e22e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
@@ -87,5 +87,6 @@
 	</pie_menu>
 	<menu_item_call enabled="true" label="Appearance..." name="Appearance...">
 		<on_click function="ShowFloater" userdata="appearance" />
+		<on_enable function="Edit.EnableCustomizeAvatar" />
 	</menu_item_call>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 054f867..bbe9fbd 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
@@ -357,7 +357,7 @@
 			<on_check function="View.CheckHighlightTransparent" />
 		</menu_item_check>
 		<menu_item_check bottom="-384" enabled="true" height="19" label="Beacons Always On" left="0"
-		     mouse_opaque="true" name="Beacons Always On" shortcut="control|N"
+		     mouse_opaque="true" name="Beacons Always On"
 		     width="211">
 			<on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
 			<on_check control="BeaconAlwaysOn" />
@@ -518,7 +518,12 @@
 		     mouse_opaque="true" name="Stop All Animations" width="250">
 			<on_click function="Tools.StopAllAnimations" userdata="" />
 		</menu_item_call>
-		<menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
+		<menu_item_call bottom="-213" enabled="false" height="19" label="Release Keys" left="0"
+		     mouse_opaque="true" name="Release Keys" width="250">
+			<on_click function="Tools.ReleaseKeys" userdata="" />
+			<on_enable function="Tools.EnableReleaseKeys" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-232" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator4" width="185" />
 		<menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
 		     mouse_opaque="true" name="Account History..." width="185">
@@ -732,12 +737,22 @@
 		     name="Show Script Warning/Error Window" width="250">
 			<on_click function="ShowFloater" userdata="script errors" />
 		</menu_item_call>
-		<menu_item_call bottom="-449" enabled="false" height="19"
-		     label="Recompile Scripts in Selection" left="0" mouse_opaque="true"
-		     name="Recompile Scripts in Selection" width="250">
-			<on_click function="Tools.SelectedScriptAction" userdata="compile" />
-			<on_enable function="EditableSelected" />
-		</menu_item_call>
+		<menu bottom="-449" color="0 0 0 1" drop_shadow="true" enabled="true" height="52"
+		     hidden="false" label="Recompile Scripts in Selection" left="0" mouse_opaque="false"
+		     name="Recompile Scripts in Selection" opaque="true" tear_off="true" create_jump_keys="true" width="169">
+		     <menu_item_call bottom="-29" enabled="true" height="19" 
+		             hidden="false" label="Mono" left="0"
+			     mouse_opaque="true" name="Mono" width="169">
+			     <on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
+			     <on_enable function="EditableSelectedMono" />
+		     </menu_item_call>
+		     <menu_item_call bottom="-48" enabled="true" height="19" 
+		             hidden="false" label="LSL" left="0"
+			     mouse_opaque="true" name="LSL" width="169">
+			     <on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
+			     <on_enable function="EditableSelected" />
+		     </menu_item_call>
+		</menu>
 		<menu_item_call bottom="-468" enabled="false" height="19" label="Reset Scripts in Selection"
 		     left="0" mouse_opaque="true" name="Reset Scripts in Selection" width="250">
 			<on_click function="Tools.SelectedScriptAction" userdata="reset" />
@@ -840,14 +855,6 @@
 				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
 			</menu_item_call>
 		</menu>
-		<menu_item_separator bottom="-221" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator5" width="166" />
-		<menu_item_call bottom="-121" enabled="true" height="19" label="Release Notes..." left="0"
-		     mouse_opaque="true" name="Release Notes..." width="166">
-			<on_click function="PromptShowFile" userdata="WebLaunchReleaseNotes,releasenotes.txt" />
-		</menu_item_call>
-		<menu_item_separator bottom="-294" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator6" width="166" />
 		<menu_item_call bottom="-313" enabled="true" height="19" label="About Second Life..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
index e2e6fb2..e3d1021 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
@@ -224,6 +224,14 @@
 			image
 		</widgettype>
 	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+		    Synchronized Multimedia Integration Language (SMIL)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
 			Web Page (XHTML)
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 02aa57c..60f70b2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -168,11 +168,6 @@ again in a minute.
 			You have offered a calling card to [FIRST] [LAST]
 		</message>
 	</notify>
-	<notify name="OfferedFriendship" tip="true">
-		<message name="message">
-			You have offered friendship to [FIRST] [LAST]
-		</message>
-	</notify>
 	<notify name="UnableToBuyWhileDownloading" tip="true">
 		<message name="message">
 			Unable to buy while downloading object data.
@@ -573,9 +568,24 @@ to his or her location:
 	<notify name="OfferFriendship" tip="false">
 		<message name="message">
 			[NAME] is offering friendship.
-      
-      By default, you will be able to 
-see each other&apos;s online status.
+ 
+[MESSAGE]
+ 
+(By default, you will be able to see each other&apos;s online status.)
+		</message>
+		<option name="Accept">
+			Accept
+		</option>
+		<option name="Decline">
+			Decline
+		</option>
+	</notify>
+	<notify name="OfferFriendshipNoMessage" tip="false">
+		<message name="message">
+			[NAME] is offering friendship.
+
+(By default, you will be able to 
+see each other&apos;s online status.)
 		</message>
 		<option name="Accept">
 			Accept
@@ -636,14 +646,20 @@ From object: [OBJECTNAME], owner: [NAME]?
 	</notify>
 	<notify name="FailedToLoadWearableUnnamed" tip="false">
 		<message name="message">
-			Failed to load [TYPE].
-Please notify the vendor from whom you purchased this item.
+			Oops!
+You tried to wear a [TYPE] and it did not load.
+
+Don't panic.
+Try again in a minute to give things a chance to settle down.
 		</message>
 	</notify>
 	<notify name="FailedToLoadWearable" tip="false">
 		<message name="message">
-			Failed to load [TYPE] named [DESC].
-Please notify the vendor from whom you purchased this item.
+			Oops!
+You tried to wear [TYPE] named [DESC] and it did not load.
+
+Don't panic.
+Try again in a minute to give things a chance to settle down.
 		</message>
 	</notify>
 	<notify name="FailedToFindWearableUnnamed" tip="false">
@@ -828,9 +844,9 @@ Right-click always shows a menu of things you can do.
 	</notify>
 	<notify name="FirstTeleport" tip="false">
 		<message name="message">
-			You have just teleported. 
-You are at the Infohub nearest your destination.
-Your destination is marked with a tall red beacon.
+			This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub. 
+Your destination is marked with a tall beacon. 
+Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
 		</message>
 	</notify>
 	<notify name="FirstOverrideKeys" tip="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index fa7f420..5a2a774 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -182,32 +182,27 @@
 			     width="130" />
 		</panel>
 		<panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-		     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
-			<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="18" label="Home" label_selected="Home" left="10"
-			     mouse_opaque="true" name="home" width="55" />
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="18" label="Load" label_selected="Load" left_delta="60"
-			     mouse_opaque="true" name="load"
-			     tool_tip="Load this profile page with embedded web browser." width="60" />
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="18" label="Open..." label_selected="Open..." left_delta="63"
-			     mouse_opaque="true" name="open"
-			     tool_tip="Open this profile page in your default external web browser."
-			     width="60" />
+		       label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
+		  <line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="10"
+			     max_length="254" mouse_opaque="true" name="url_edit"
+			     width="400" />
+      <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
+			     height="18" label="Load" label_selected="Load" left="10"
+			     mouse_opaque="true" name="load" enabled="false" 
+			     tool_tip="Load this profile page with embedded web browser." width="80" >
+        <flyout_button_item value="open">In external browser</flyout_button_item>
+        <flyout_button_item value="home">Home URL</flyout_button_item>
+      </flyout_button>
 			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-			     height="18" label="?" label_selected="?" left_delta="65"
+			     height="18" label="?" label_selected="?" left_delta="85"
 			     mouse_opaque="true" name="web_profile_help" width="18" />
 			<check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Automatically load web profiles"
 			     left_delta="30" mouse_opaque="true" name="auto_load"
 			     tool_tip="Automatically load ALL profile webpages without asking first."
 			     width="127" />
-			<line_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="10"
-			     max_length="254" mouse_opaque="true" name="url_edit"
-			     width="400" />
 			<web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
 			     ignore_ui_scale="false" left="10" name="profile_html" start_url=""
 			     width="400" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
index 3d5ee66..e9f8f3a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
@@ -46,7 +46,7 @@
 	     max_length="65535" name="covenant_editor" 
 	     width="425" word_wrap="true" />
 	<string name="can_resell">
-		string land in this region may be resold.
+		Purchased land in this region may be resold.
 	</string>
 	<string name="can_not_resell">
 		Purchased land in this region may not be resold.
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 8378eb2..2122ee7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -63,35 +63,33 @@
 	</combo_box>
 	<check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Remember password"
-	     left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
+	     left_delta="163" mouse_opaque="true" name="remember_check" width="138" />
 	<button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-	     height="24" label="Connect" label_selected="Connect"
-	     left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
+	     height="24" label="Log In" label_selected="Log In"
+	     left="435" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
 	     width="120" />
-	<button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-	     height="24" label="Quit" label_selected="Quit" left="572"
-	     mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" />
 	<combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
 	     left_delta="135" max_chars="20" mouse_opaque="true"
 	     name="server_combo" width="120" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="42" drop_shadow_visible="true" follows="right|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="12"
-	     left="-210" mouse_opaque="true" name="channel_text" v_pad="0" width="200"
-	     hover="true">
-		[Viewer Channel Name]
+	     bottom="45" drop_shadow_visible="true" follows="right|bottom"
+	     font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
+	     left="-210" mouse_opaque="true" name="create_new_account_text" v_pad="0" width="200"
+	     hover="true" hover_color="50 115 185">
+		Sign up for account
 	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="30" drop_shadow_visible="true" follows="right|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="12"
-	     left="-110" mouse_opaque="true" name="version_text" v_pad="0" width="100"
-	     hover="true">
-		1.23.4 (5)
+	     bottom="25" drop_shadow_visible="true" follows="right|bottom"
+	     font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
+	     left="-210" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="200"
+	     hover="true" hover_color="50 115 185">
+		Forgot your name or password?
 	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="7" drop_shadow_visible="true" follows="left|bottom"
-	     font="SansSerifSmall" font-style="SHADOW" h_pad="0" halign="right" height="16"
-	     left="440" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170"
-	     hover="true" hover_color="50 115 185">Forgot your name or password?
+	     bottom="5" drop_shadow_visible="true" follows="right|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="16"
+	     left="-310" mouse_opaque="true" name="channel_text" v_pad="0" width="300"
+	     hover="true" hover_color="50 115 185">
+		[CHANNEL] [VERSION]
 	</text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index bcd7bbc..926e3d8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -27,11 +27,6 @@
 					     tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
 					     width="102" />
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-					     label="Release Keys" label_selected="Release Keys" left="229"
-					     name="Release Keys" scale_image="true"
-					     tool_tip="A script has taken control of your keys. Click here to release them."
-					     width="102" />
-					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
 					     label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
 					     scale_image="true"
 					     tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml
deleted file mode 100644
index 2cc8b13..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Logitech LCD" left="102" mouse_opaque="true"
-     name="LCD Options" width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-	     mouse_opaque="true" name="LCD Destination:" v_pad="0" width="266">
-		LCD Destination:
-	</text>
-	<radio_group bottom="-45" control_name="LCDDestination" draw_border="true" enabled="true"
-	     follows="left|top" height="36" left="148" mouse_opaque="true"
-	     name="LCDDestination" width="193">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
-		     mouse_opaque="true" name="DestinationG15"
-		     tool_tip="Display forms selected appear on Logitech G15 Keyboard LCD"
-		     width="463">
-			Logitech G15 Gaming Keyboard
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="3"
-		     mouse_opaque="true" name="DestinationZ10"
-		     tool_tip="Display forms selected appear on Logitech Z10 Speaker LCD"
-		     width="463">
-			Logitech Z10 Speakers
-		</radio_item>
-	</radio_group>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-68" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-	     mouse_opaque="true" name="LCD Display Options" v_pad="0" width="266">
-		LCD Display Options:
-	</text>
-	<check_box bottom="-72" control_name="DisplayChat" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" label="Display Chat" left="148"
-	     mouse_opaque="true" name="DisplayChat" radio_style="false"
-	     tool_tip="Display Last Chat line in LCD Window" width="128" />
-	<check_box bottom="-90" control_name="DisplayIM" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Display IM&apos;s" left="148" mouse_opaque="true" name="DisplayIM"
-	     radio_style="false" tool_tip="Display Last IM in LCD Window" width="242" />
-	<check_box bottom="-108" control_name="DisplayRegion" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show Location Information" left="148" mouse_opaque="true"
-	     name="DisplayRegion" radio_style="false"
-	     tool_tip="Display current location information in LCD Window" width="201" />
-	<check_box bottom="-126" control_name="DisplayLinden" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show Account Information" left="148" mouse_opaque="true"
-	     name="DisplayLinden" radio_style="false"
-	     tool_tip="Display current account information in LCD Window" width="201" />
-	<check_box bottom="-144" control_name="DisplayDebug" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Display Network Comms Info" left="148" mouse_opaque="true"
-	     name="DisplayDebug" radio_style="false"
-	     tool_tip="Display debug information in LCD Window" width="242" />
-	<check_box bottom="-162" control_name="DisplayDebugConsole" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Display Debug Info from Console" left="148" mouse_opaque="true"
-	     name="DisplayDebugConsole" radio_style="false"
-	     tool_tip="Display console debug information in LCD Window" width="242" />
-</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 27ec29a..b2bb65f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -8,67 +8,87 @@
 	     mouse_opaque="false" name="text_box" v_pad="0" width="128">
 		Chat Font Size:
 	</text>
-	<radio_group bottom="-72" control_name="ChatFontSize" draw_border="true" enabled="true"
-	     follows="left|top" height="60" left="148" mouse_opaque="true"
-	     name="chat font size" width="128">
-		<radio_item type="string" length="1" bottom="-20" enabled="true" height="16" left="0" mouse_opaque="true"
+	<radio_group bottom="-40" control_name="ChatFontSize" draw_border="true" enabled="true"
+	     follows="left|top" height="30" left="148" mouse_opaque="true"
+	     name="chat font size" width="331">
+		<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
 		     name="radio" width="98">
 			Small
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-40" enabled="true" height="16" left="0" mouse_opaque="true"
+		<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="110" mouse_opaque="true"
 		     name="radio2" width="98">
 			Medium
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-60" enabled="true" height="16" left="0" mouse_opaque="true"
+		<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="220" mouse_opaque="true"
 		     name="radio3" width="98">
 			Large
 		</radio_item>
 	</radio_group>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-95" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box2" v_pad="0" width="128">
 		Chat Color:
 	</text>
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
+	     can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
+	     enabled="true" follows="left|top" height="56" label="You" left="148"
+	     mouse_opaque="true" name="user" width="44" />
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-	     enabled="true" follows="left|top" height="56" label="Chat" left="148"
-	     mouse_opaque="true" name="users" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+	     enabled="true" follows="left|top" height="56" label="Others" left_delta="48"
+	     mouse_opaque="true" name="agent" width="44" />
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="0.6 0.6 1 1" control_name="IMChatColor"
 	     enabled="true" follows="left|top" height="56" label="IM" left_delta="48"
 	     mouse_opaque="true" name="im" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="0.8 1 1 1"
 	     control_name="SystemChatColor" enabled="true" follows="left|top"
 	     height="56" label="System" left_delta="48" mouse_opaque="true"
 	     name="system" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
+	     can_apply_immediately="true" color="0.82 0.82 0.99 1"
+	     control_name="ScriptErrorColor" enabled="true" follows="left|top"
+	     height="56" label="Errors" left_delta="48" mouse_opaque="true"
+	     name="script_error" width="44" />
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
 	     control_name="ObjectChatColor" enabled="true" follows="left|top"
-	     height="56" label="Objects" left_delta="48" mouse_opaque="true"
+	     height="56" label="Objects" left="148" mouse_opaque="true"
 	     name="objects" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
 	     control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
 	     height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
 	     width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0 0 0 1"
 	     control_name="BackgroundChatColor" enabled="true" follows="left|top"
 	     height="56" label="Bubble" left_delta="48" mouse_opaque="true"
 	     name="background" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.6 0.6 1 1"
 	     control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
 	     label="URLs" left_delta="48" mouse_opaque="true" name="links" width="44" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_box8" v_pad="0" width="128">
+		Script Errors:
+	</text>
+	<check_box bottom="-192" control_name="ScriptErrorsAsChat" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show script errors and warnings as regular chat" left="148"
+	     mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
+	     width="275" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box3" v_pad="0" width="135">
 		Chat Console:
 	</text>
-	<spinner bottom_delta="-6" control_name="ChatPersistTime" decimal_digits="0"
+	<spinner bottom_delta="-27" control_name="ChatPersistTime" decimal_digits="0"
 	     enabled="true" follows="left|top" height="16" increment="1"
 	     initial_val="10" label="Fade chat after" label_width="80" left="148"
 	     max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
@@ -91,25 +111,25 @@
 	     width="60">
 		(# lines)
 	</text>
-	<slider bottom="-185" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
+	<slider bottom="-215" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
 	     decimal_digits="3" enabled="true" follows="left|top" height="12"
 	     increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
 	     min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
 	     value="0.4" width="200" />
+	<check_box bottom="-262" control_name="ChatFullWidth" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Use full screen width  (Requires restart)" left="148"
+	     mouse_opaque="true" name="chat_full_width_check" radio_style="false"
+	     width="239" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-207" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-278" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">
 		Chat Options:
 	</text>
-	<check_box bottom_delta="-6" control_name="ChatFullWidth" enabled="true"
+	<check_box bottom_delta="-10" control_name="CloseChatOnReturn" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Chat uses full screen width (after restart)" left="148"
-	     mouse_opaque="true" name="chat_full_width_check" radio_style="false"
-	     width="239" />
-	<check_box bottom_delta="-20" control_name="CloseChatOnReturn" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Close chat after hitting return" left="148" mouse_opaque="true"
+	     label="Close chat bar after hitting return" left="148" mouse_opaque="true"
 	     name="close_chat_on_return_check" radio_style="false" width="237" />
 	<check_box bottom_delta="-20" control_name="ArrowKeysMoveAvatar" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
@@ -118,37 +138,25 @@
 	     width="237" />
 	<check_box bottom_delta="-20" control_name="ChatShowTimestamps" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show timestamps in chat" left="148" mouse_opaque="true"
+	     label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
 	     name="show_timestamps_check" radio_style="false" width="237" />
+	<check_box bottom_delta="-20" control_name="PlayTypingAnim" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+	     label="Play typing animation when chatting" left="148" mouse_opaque="true"
+	     name="play_typing_animation" radio_style="false" width="237" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-292" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-369" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
 		Bubble Chat:
 	</text>
-	<check_box bottom="-299" control_name="UseChatBubbles" enabled="true" follows="left|top"
+	<check_box bottom="-376" control_name="UseChatBubbles" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show chat bubbles" left="148" mouse_opaque="true"
 	     name="bubble_text_chat" radio_style="false" width="237" />
-	<slider bottom="-315" can_edit_text="false" control_name="ChatBubbleOpacity"
+	<slider bottom="-392" can_edit_text="false" control_name="ChatBubbleOpacity"
 	     decimal_digits="3" enabled="true" follows="left|top" height="12"
 	     increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
 	     min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
 	     value="0.5" width="200" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-339" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box8" v_pad="0" width="128">
-		Script Errors:
-	</text>
-	<check_box bottom="-346" control_name="ScriptErrorsAsChat" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show script errors and warnings as regular chat" left="148"
-	     mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
-	     width="275" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-403"
-	     can_apply_immediately="true" color="0.82 0.82 0.99 1"
-	     control_name="ScriptErrorColor" enabled="true" follows="left|top"
-	     height="56" label="Color" left="148" mouse_opaque="true"
-	     name="script_error" width="48" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 99a376b..67d3307 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -72,26 +72,22 @@
 	     follows="left|top" height="16" increment="1" initial_val="300"
 	     label="Away Timeout:" label_width="141" left="10" max_val="600"
 	     min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
-	<check_box bottom="-286" control_name="ChatOnlineNotification" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show Online Friend Notifications" left="151" mouse_opaque="true"
-	     name="friends_online_notify_checkbox" radio_style="false" width="256" />
-	<check_box bottom="-304" control_name="MiniMapRotate" enabled="true" follows="left|top"
+	<check_box bottom="-286" control_name="MiniMapRotate" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Rotate Mini-Map" left="151" mouse_opaque="true"
 	     name="rotate_mini_map_checkbox" radio_style="false" width="256" />
-	<check_box bottom="-322" control_name="NotifyMoneyChange" enabled="true"
+	<check_box bottom="-304" control_name="NotifyMoneyChange" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Notify when Linden dollars (L$) spent or received" left="151"
 	     mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
 	     width="256" />
-	<check_box bottom="-340" control_name="UseDefaultColorPicker" enabled="true"
+	<check_box bottom="-322" control_name="UseDefaultColorPicker" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Use default system color picker" left="151" mouse_opaque="true"
 	     name="use_system_color_picker_checkbox" radio_style="false"
 	     tool_tip="Use the default system color picker instead of the one built into Second Life."
 	     width="256" />
-	<check_box bottom="-358" control_name="ShowSearchBar" enabled="true" follows="left|top"
+	<check_box bottom="-340" control_name="ShowSearchBar" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show search panel in overlay bar" left="151" mouse_opaque="true"
 	     name="show_search_panel" radio_style="false"
@@ -121,13 +117,13 @@
 		seconds
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-380" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-362" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
 	     mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
 		Crash reports:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-402" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
 	     mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
 		Language:
@@ -142,7 +138,7 @@
 	<string name="region_name_prompt">
 		&lt;Type region name&gt;
 	</string>
-	<combo_box allow_text_entry="false" bottom="-380" enabled="true" follows="left|top"
+	<combo_box allow_text_entry="false" bottom="-362" enabled="true" follows="left|top"
 	     height="18" left="153" max_chars="20" mouse_opaque="true"
 	     name="crash_behavior_combobox" width="146">
 		<combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
@@ -155,7 +151,7 @@
 			Never send
 		</combo_item>
 	</combo_box>
-	<combo_box allow_text_entry="true" bottom="-400" control_name="Language" enabled="true"
+	<combo_box allow_text_entry="true" bottom="-382" control_name="Language" enabled="true"
 	     follows="left|bottom" height="16" left="153" max_chars="135"
 	     mouse_opaque="true" name="language_combobox" width="146">
 		<combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
@@ -186,4 +182,12 @@
 			Español (Spanish) - Beta
 		</combo_item>
 	</combo_box>
+	<check_box bottom="-400" control_name="LanguageIsPublic" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+	     initial_value="false" label="Share language with objects" left="151"
+	     mouse_opaque="true" name="language_is_public"
+	     radio_style="false"
+	     tool_tip="This lets in-world objects know your preferred language."
+	     width="256" />
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 493b153..279202a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -6,11 +6,11 @@
 	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box" v_pad="0" width="128">
-		Profile Online Status:
+		My Online Status:
 	</text>
 	<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false"
-	     label="Make my online status visible only to my Friends and Groups"
+	     label="Only my Friends and Groups can see when I am online"
 	     left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
 	     width="350" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -28,59 +28,66 @@
 	     width="350" />
 	<check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Include IM in Chat History" left="148" mouse_opaque="true"
+	     label="Include IM in Local Chat" left="148" mouse_opaque="true"
 	     name="include_im_in_chat_history" radio_style="false" width="237" />
 	<check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show timestamps in IM" left="148" mouse_opaque="true"
 	     name="show_timestamps_check" radio_style="false" width="237" />
+    <check_box bottom="-105" control_name="ChatOnlineNotification" enabled="true"
+         follows="left|top" font="SansSerifSmall" height="16"
+         initial_value="false" label="Show online Friend notifications" left="148"
+         mouse_opaque="true" name="friends_online_notify_checkbox"
+         radio_style="false" width="256" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box3" v_pad="0" width="128">
 		Busy Mode Response:
 	</text>
-	<text_editor type="string" length="1" bottom="-165" embedded_items="false" enabled="true" follows="left|top"
+	<text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="70" left="148" max_length="255"
 	     mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box4" v_pad="0" width="128">
 		Logging Options:
 	</text>
-	<check_box bottom="-205" control_name="LogInstantMessages" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Log Instant Messages" left="148" mouse_opaque="true"
-	     name="log_instant_messages" radio_style="false" width="237" />
-	<check_box bottom="-225" control_name="IMLogTimestamp" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show timestamps in IM Log" left="148" mouse_opaque="true"
-	     name="log_instant_messages_timestamp" radio_style="false" width="237" />
-	<check_box bottom="-245" control_name="LogShowHistory" enabled="true" follows="left|top"
+	<check_box bottom="-225" control_name="LogInstantMessages" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Save a log of IM on my computer" left="148"
+	     mouse_opaque="true" name="log_instant_messages" radio_style="false"
+	     width="237" />
+	<check_box bottom="-245" control_name="IMLogTimestamp" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Show timestamps in IM Log" left="168"
+	     mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
+	     width="217" />
+	<check_box bottom="-265" control_name="LogShowHistory" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show end of last IM conversation" left="148" mouse_opaque="true"
-	     name="log_show_history" radio_style="false" width="237" />
-	<check_box bottom="-265" control_name="LogChat" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Log Chat"
+	     label="Show the end of last IM conversation" left="168" mouse_opaque="true"
+	     name="log_show_history" radio_style="false" width="217" />
+	<check_box bottom="-285" control_name="LogChat" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
 	     left="148" mouse_opaque="true" name="log_chat" radio_style="false"
 	     width="237" />
-	<check_box bottom="-285" control_name="LogChatTimestamp" enabled="true" follows="left|top"
+	<check_box bottom="-305" control_name="LogChatTimestamp" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show timestamps in Chat Log" left="148" mouse_opaque="true"
-	     name="log_chat_timestamp" radio_style="false" width="237" />
-	<check_box bottom="-305" control_name="LogChatIM" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show incoming IM in Chat Log" left="148" mouse_opaque="true"
-	     name="log_chat_IM" radio_style="false" width="237" />
+	     label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
+	     name="log_chat_timestamp" radio_style="false" width="217" />
 	<check_box bottom="-325" control_name="LogTimestampDate" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Include Date with Timestamp" left="148" mouse_opaque="true"
-	     name="log_date_timestamp" radio_style="false" width="237" />
-	<button bottom="-347" follows="right|bottom" font="SansSerif" halign="center"
+	     label="Include date with timestamp" left="168" mouse_opaque="true"
+	     name="log_date_timestamp" radio_style="false" width="217" />
+	<check_box bottom="-345" control_name="LogChatIM" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
+	     name="log_chat_IM" radio_style="false" width="217" />
+	<button bottom="-367" follows="right|bottom" font="SansSerif" halign="center"
 	     height="20" label="Change Path" label_selected="Change Path" left="170"
 	     mouse_opaque="true" name="log_path_button" width="90" />
-	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-346"
+	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-366"
 	     drop_shadow_visible="true" enabled="false" follows="top|left|right"
 	     font="SansSerifSmall" halign="right" height="19" left="248"
 	     max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index 5e8f871..11d15f4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -2,17 +2,26 @@
 <panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
      title="Popups" width="400">
 	<text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
-		Do not show popups:
+		Do not show these popups:
 	</text>
 	<scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
 	<button follows="top|left" height="20" label="Enable this popup" left="15"
-	     name="enable_popup" width="150" />
-	<text follows="top|left" left="15" width="128" name="show_label">
-		Show popups:
+	     name="enable_popup" width="175" />
+	<button follows="top|left" height="20" label="Enable all popups..." left="200"
+	     name="reset_dialogs_btn"
+	     tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
+	     width="175" bottom_delta="0" />
+	<text follows="top|left" left="15" width="128" name="show_label" bottom_delta="-24">
+		Show these popups:
 	</text>
 	<scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
+	<button bottom_delta="-24" follows="top|left" height="20"
+	     label="Disable all these popups..." left="200"
+	     name="skip_dialogs_btn"
+	     tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
+	     width="175" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-30" drop_shadow_visible="true" enabled="true"
+	     bottom_delta="-24" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="10" left="15" mouse_opaque="false" name="text_box2" v_pad="0"
 	     width="270">
@@ -26,14 +35,8 @@
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 	     label="Automatically view after accepting" left="40" mouse_opaque="true"
 	     name="show_new_inventory" radio_style="false" width="270" />
-	<button bottom_delta="-35" follows="top|left" height="20"
-	     label="Show all &apos;Skip next time&apos; Dialogs..." left="15"
-	     name="reset_dialogs_btn"
-	     tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
-	     width="250" />
-	<button bottom_delta="-24" follows="top|left" height="20"
-	     label="Skip all &apos;Skip next time&apos; Dialogs..." left="15"
-	     name="skip_dialogs_btn"
-	     tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
-	     width="250" />
+	<check_box bottom_delta="-20" control_name="ShowInInventory" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+	     label="Automatically show newly accepted objects in inventory" left="18" mouse_opaque="true"
+	     name="show_in_inventory" radio_style="false" width="270" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index b1c2bb7..3e1cfcd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
@@ -26,16 +26,34 @@
 	     left="160" name="disable_physics_help" width="18" />
 	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
 	     left="60" name="apply_btn" width="100" />
-	<button bottom_delta="-50" follows="left|top" height="20" label="Choose Avatar..."
-	     left="10" name="choose_avatar_btn" width="150" />
-	<text bottom_delta="0" follows="left|top" height="20" left="170"
-	     name="target_avatar_name" width="150" />
-	<button bottom_delta="-23" follows="left|top" height="20"
-	     label="Return avatar&apos;s scripted objects on other people&apos;s land"
-	     left="50" name="return_scripted_other_land_btn" width="350" />
-	<button bottom_delta="-23" follows="left|top" height="20"
-	     label="Return ALL of avatar&apos;s scripted objects" left="50"
-	     name="return_scripted_all_btn" width="350" />
+	<text bottom_delta="-50" follows="left|top" height="20" left="10" width="90">
+	  Object Return
+	</text>
+	<text bottom_delta="-25" follows="left|top" height="20" left="30" width="60">
+	  Resident:
+	</text>
+	<line_editor bottom_delta="2" follows="left|top" height="20" left="90" 
+		 border_style="line" border_thickness="1" enabled="false" max_length="254" mouse_opaque="false"
+	     name="target_avatar_name" width="180">
+	  (none)
+    </line_editor>
+	<button bottom_delta="0" follows="left|top" height="20" label="Choose..."
+	     left="280" name="choose_avatar_btn" width="80" />
+	<text bottom_delta="-25" follows="left|top" height="20" left="30" width="60">
+	  Options:
+	</text>
+    <check_box bottom_delta="0" follows="left|top" height="20" label="Return only those objects with scripts"
+         left="90" name="return_scripts"
+         tool_tip="Return only objects which have scripts." width="80" />
+    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return only those objects on someone else's land"
+         left="90" name="return_other_land"
+         tool_tip="Return only objects which are on land belonging to someone else" width="80" />
+    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return objects in every region of this estate"
+         left="90" name="return_estate_wide"
+         tool_tip="Return objects in all of the regions that make up this estate" width="80" />
+	<button bottom_delta="-25" follows="left|top" height="20"
+	     label="Return"
+	     left="30" name="return_btn" width="80" />
 	<button bottom_delta="-50" follows="left|top" height="20" label="Get Top Colliders..."
 	     left="10" name="top_colliders_btn"
 	     tool_tip="List of objects experiencing the most potential collisions"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index fa172aa..84ce9d0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -75,6 +75,7 @@ regions in the estate.
 	</text>
 	<line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
 	     name="abuse_email_address" width="205" />
+	<string name="email_unsupported">Feature unsupported</string>
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     name="abuse_email_address_help" right="250" width="18" />
 	<button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
diff --git a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
index bcd23d5..58c6bcc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
@@ -181,4 +181,17 @@
 		     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."
 		     name="proposal vote" value="45" />
 	</action_set>
+	<action_set
+	     description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." 
+	     name="Chat">
+		<action description="Join Group Chat"
+		     longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice."
+		     name="join group chat" value="16" />
+		<action description="Join Group Voice Chat"
+		     longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session."
+		     name="join voice chat" value="27" />	
+		<action description="Moderate Group Chat"
+		     longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions."
+		     name="moderate group chat" value="37" />
+	</action_set>
 </role_actions>
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 9952d56..cd49e59 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -12,6 +12,7 @@
 	<string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>
 	<string name="LoginPrecaching">Loading world...</string>
 	<string name="LoginInitializingBrowser">Initializing embedded web browser...</string>
+	<string name="LoginInitializingMultimedia">Initializing multimedia...</string>
 	<string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
 	<string name="LoginProcessingResponse">Processing Response...</string>
 	<string name="LoginInitializingWorld">Initializing World...</string>
@@ -23,9 +24,12 @@
 	<string name="LoginConnectingToRegion">Connecting to region...</string>
 	<string name="LoginDownloadingClothing">Downloading clothing...</string>
 
+
+	<!-- Disconnection -->
+	<string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
 	
 	
-	<!-- Tooltip, llhoverview.cpp. Note: spaces at the end are intentional -->
+	<!-- Tooltip, llhoverview.cpp -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
 	<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
@@ -49,13 +53,15 @@
 	<string name="TooltipFlagNoFly">No Fly</string>
 	<string name="TooltipFlagGroupScripts">Group Scripts</string>
 	<string name="TooltipFlagNoScripts">No Scripts</string>
-	
 	<string name="TooltipLand">Land:</string>
-	
+	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>	
+
 	
 	<!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
 	<string name="RetrievingData">Retrieving...</string>
-	
+
+	<string name="ReleaseNotes">Release Notes</string>
+
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Loading...</string>
 	
@@ -90,7 +96,7 @@
 	<string name="AvatarAway">Away</string>
 	<string name="AvatarBusy">Busy</string>
 	<string name="AvatarMuted">Muted</string>
-	
+
 	<!-- animations -->
 	<string name="anim_express_afraid">Afraid</string>
 	<string name="anim_express_anger">Angry</string>
@@ -162,5 +168,12 @@
 	<string name="anim_yes_happy">Yes (Happy)</string>
 	<string name="anim_yes_head">Yes</string>
 	
+	<string name="texture_loading">Loading...</string>
+	<string name="worldmap_offline">Offline</string>
+	
+	<!-- Chat -->
+	<string name="whisper">whispers:</string>
+	<string name="shout">shouts:</string>
+
 </strings>
 
diff --git a/linden/indra/newview/skins/default/xui/es/alerts.xml b/linden/indra/newview/skins/default/xui/es/alerts.xml
index da0e94c..f9e91a0 100644
--- a/linden/indra/newview/skins/default/xui/es/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/es/alerts.xml
@@ -2827,17 +2827,6 @@ Aceleración de Gráficos AGP en el panel Opciones en Preferencias en [SECOND_LI
 			Cancelar
 		</option>
 	</alert>
-	<alert name="WebLaunchReleaseNotes">
-		<message name="message">
-			¿Ver las notas de lanzamiento de [SECOND_LIFE]?.
-		</message>
-		<option name="Gotopage">
-			Ir hacia página
-		</option>
-		<option name="Cancel">
-			Cancelar
-		</option>
-	</alert>
 	<alert name="ReturnToOwner">
 		<message name="message">
 			¿Seguro que desea devolver los objetos
@@ -2907,7 +2896,7 @@ volverán para sus propietarios anteriores.
 			Desactivar sonido por el nombre apenas afecta chat y MI, no los sonidos. 
 Usted debe teclear el nombre exacto del objeto.
 		</message>
-		<editline>
+		<editline name="editline">
 			Nombre del objeto
 		</editline>
 		<option name="OK">
@@ -3037,7 +3026,7 @@ del menú &apos;Editar&apos;.
 		<message name="message">
 			¿Expulsar a este usuario con cuál mensaje?
 		</message>
-		<editline>
+		<editline name="editline">
 			Un administrador te desconectó.
 		</editline>
 		<option name="OK">
@@ -3051,7 +3040,7 @@ del menú &apos;Editar&apos;.
 		<message name="message">
 			¿Expulsar a todos en la red con cuál mensaje?
 		</message>
-		<editline>
+		<editline name="editline">
 			Un administrador te desconectó.
 		</editline>
 		<option name="OK">
@@ -3065,7 +3054,7 @@ del menú &apos;Editar&apos;.
 		<message name="message">
 			¿Congelar este usuario con cuál mensaje?
 		</message>
-		<editline>
+		<editline name="editline">
 			Usted fue congelado y no podrá moverse o usar el chat. Un administrador hará contacto vía mensaje
 instantáneo (MI).
 		</editline>
@@ -3080,7 +3069,7 @@ instantáneo (MI).
 		<message name="message">
 			¿Descongelar este usuario con este mensaje?
 		</message>
-		<editline>
+		<editline name="editline">
 			Usted no está congelado por mucho tiempo.
 		</editline>
 		<option name="OK">
@@ -3105,7 +3094,7 @@ instantáneo (MI).
 		<message name="message">
 			¿Ofrecer un teletransporte para su local con el siguiente mensaje?
 		</message>
-		<editline>
+		<editline name="editline">
 			Juntarme a la [REGION]
 		</editline>
 		<option name="OK">
@@ -3119,7 +3108,7 @@ instantáneo (MI).
 		<message name="message">
 			¿Dios invoca usuario para su posición?
 		</message>
-		<editline>
+		<editline name="editline">
 			Juntarme a la [REGION]
 		</editline>
 		<option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
index ab36540..9985276 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml
@@ -6,4 +6,7 @@
 	<button label="Parar" name="stop_btn" />
 	<button label="Casa" name="home_btn" />
 	<button label="Ir" name="go_btn" />
+	<string name="support_page_url">
+	  	http://secondlife.com/app/support/index_es.html
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/alerts.xml b/linden/indra/newview/skins/default/xui/fr/alerts.xml
index d8272d3..54af462 100644
--- a/linden/indra/newview/skins/default/xui/fr/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/fr/alerts.xml
@@ -2800,17 +2800,6 @@ l&apos;accélération graphique AGP dans les Options du menu Preferences dans [S
 			Annuler
 		</option>
 	</alert>
-	<alert name="WebLaunchReleaseNotes">
-		<message name="message">
-			Afficher les notes de version de [SECOND_LIFE] ?
-		</message>
-		<option name="Gotopage">
-			Aller à la page
-		</option>
-		<option name="Cancel">
-			Annuler
-		</option>
-	</alert>
 	<alert name="ReturnToOwner">
 		<message name="message">
 			Etes-vous sûr(e) de vouloir renvoyer les objets
@@ -2880,7 +2869,7 @@ Quitter le groupe ?
 			Ignorer par nom n&apos;affecte que le chat et les IM, pas les sons.
 Vous devez entrer le nom exact de l&apos;objet.
 		</message>
-		<editline>
+		<editline name="editline">
 			Nom de l&apos;objet
 		</editline>
 		<option name="OK">
@@ -3009,7 +2998,7 @@ dans le menu &apos;Edition&apos;.
 		<message name="message">
 			Dégager cet utilisateur avec quel message ?
 		</message>
-		<editline>
+		<editline name="editline">
 			Vous avez été déconnecté par un administrateur.
 		</editline>
 		<option name="OK">
@@ -3023,7 +3012,7 @@ dans le menu &apos;Edition&apos;.
 		<message name="message">
 			Dégager tous les utilisateurs actuellement présents sur la grille avec quel message ?
 		</message>
-		<editline>
+		<editline name="editline">
 			Vous avez été déconnecté par un administrateur.
 		</editline>
 		<option name="OK">
@@ -3037,7 +3026,7 @@ dans le menu &apos;Edition&apos;.
 		<message name="message">
 			Bloquer cet utilisateur avec quel message ?
 		</message>
-		<editline>
+		<editline name="editline">
 			Vous avez été bloqué. Vous ne pouvez ni vous déplacer, ni chatter. Un administrateur va vous contacter via message instantané (IM).
 		</editline>
 		<option name="OK">
@@ -3051,7 +3040,7 @@ dans le menu &apos;Edition&apos;.
 		<message name="message">
 			Débloquer cet utilisateur avec quel message ?
 		</message>
-		<editline>
+		<editline name="editline">
 			Vous n&apos;êtes plus bloqué.
 		</editline>
 		<option name="OK">
@@ -3076,7 +3065,7 @@ dans le menu &apos;Edition&apos;.
 		<message name="message">
 			Proposer de téléporter la personne avec le message suivant ?
 		</message>
-		<editline>
+		<editline name="editline">
 			Rejoins-moi à [REGION]
 		</editline>
 		<option name="OK">
@@ -3090,7 +3079,7 @@ dans le menu &apos;Edition&apos;.
 		<message name="message">
 			Super-invoquer l&apos;utilisateur ici ?
 		</message>
-		<editline>
+		<editline name="editline">
 			Rejoins-moi à [REGION]
 		</editline>
 		<option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index c60d6ca..2297609 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -6,4 +6,7 @@
 	<button label="Arrêter" name="stop_btn" />
 	<button label="Domicile" name="home_btn" />
 	<button label="Aller" name="go_btn" />
+	<string name="support_page_url">
+	  	http://secondlife.com/app/support/index_fr.html
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/alerts.xml b/linden/indra/newview/skins/default/xui/ja/alerts.xml
index 6cc6379..a664d36 100644
--- a/linden/indra/newview/skins/default/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ja/alerts.xml
@@ -3256,20 +3256,6 @@ F1キーを押������。
 			�り消�
 		</option>
 	</alert>
-	<alert name="WebLaunchReleaseNotes">
-		<message name="message">
-			[SECOND_LIFE] �リリースノートを閲覧����？
-		</message>
-		<ignore name="ignore">
-			リリースノートを表示�る���ウェブ・ブラウザーを起動�る��
-		</ignore>
-		<option name="Gotopage">
-			OK
-		</option>
-		<option name="Cancel">
-			�り消�
-		</option>
-	</alert>
 	<alert name="ReturnToOwner">
 		<message name="message">
 			�択��オブジェクトを�所有者�返�����？
@@ -3350,7 +3336,7 @@ F1キーを押������。
 			���よるミュート��オブジェクト・�ャット��よ�IM���影響��サウンド��影響���ん。 
 正確�オブジェクト�を入力�る必���り��。
 		</message>
-		<editline>
+		<editline name="editline">
 			オブジェクト�
 		</editline>
 		<option name="OK">
@@ -3491,7 +3477,7 @@ F1キーを押������。
 		<message name="message">
 			�ん�メッセージを表示�����ユーザーを追�出����？
 		</message>
-		<editline>
+		<editline name="editline">
 			����管�者�よりログオフ�れ���。
 		</editline>
 		<option name="OK">
@@ -3505,7 +3491,7 @@ F1キーを押������。
 		<message name="message">
 			�ん�メッセージを表示���グリッド��る全員を追�出����？
 		</message>
-		<editline>
+		<editline name="editline">
 			����管�者�よりログオフ�れ���。
 		</editline>
 		<option name="OK">
@@ -3519,7 +3505,7 @@ F1キーを押������。
 		<message name="message">
 			�ん�メッセージを表示�����ユーザーをフリーズ����？
 		</message>
-		<editline>
+		<editline name="editline">
 			����フリーズ�れ����。 動���も�ャット�る��も����ん。 管�者�IMを通������連絡���。
 		</editline>
 		<option name="OK">
@@ -3533,7 +3519,7 @@ F1キーを押������。
 		<message name="message">
 			�ん�メッセージを表示�����ユーザー�フリーズを解除����？
 		</message>
-		<editline>
+		<editline name="editline">
 			も�フリーズ�れ����ん。
 		</editline>
 		<option name="OK">
@@ -3558,7 +3544,7 @@ F1キーを押������。
 		<message name="message">
 			����ロケーション��テレ�ートを次�メッセージ�共�贈り���？
 		</message>
-		<editline>
+		<editline name="editline">
 			[REGION]��加希望
 		</editline>
 		<option name="OK">
@@ -3572,7 +3558,7 @@ F1キーを押������。
 		<message name="message">
 			ユーザーをゴッド・コール�呼�寄����？
 		</message>
-		<editline>
+		<editline name="editline">
 			[REGION]��加希望
 		</editline>
 		<option name="OK">
@@ -4984,13 +4970,15 @@ Linden Lab
 		<message name="message">
 			新��空���を指定������。
 		</message>
+		<editline name="editline">
+			新��事�設定
+		</editline>
 		<option name="OK">
 			OK
 		</option>
 		<option name="Cancel">
 			キャンセル
 		</option>
-		新��事�設定
 	</alert>
 	<alert name="ExistsSkyPresetAlert">
 		<message name="message">
@@ -5001,13 +4989,15 @@ Linden Lab
 		<message name="message">
 			新��水�事�設定���を指定������。
 		</message>
+		<editline name="editline">
+			新��事�設定
+		</editline>
 		<option name="OK">
 			OK
 		</option>
 		<option name="Cancel">
 			キャンセル
 		</option>
-		新��事�設定
 	</alert>
 	<alert name="ExistsWaterPresetAlert">
 		<message name="message">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
index 6e1e7a0..da63fab 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
@@ -8,4 +8,7 @@
 	<string name="home_page_url">
 		http://jp.secondlife.com
 	</string>
+	<string name="support_page_url">
+	  	http://help.secondlife.com/jp
+	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
index b71cffa..0f1541a 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Joystick" title="ジョイスティック�設定">
 	<check_box name="enable_joystick" width="120" >
 		ジョイスティックを使�：
@@ -112,9 +112,15 @@
 	<text left="0" name="ZoomDeadZone" width="140">
 		ズーム・デッド・ゾーン
 	</text>
-	<spinner left="275" name="FlycamAxisDeadZone6" width="50" />
-	<button label="SpaceNavigator�デフォルト設定" left="330"
-	     name="SpaceNavigatorDefaults" width="210" />
+	<spinner left="275" width="50" name="FlycamAxisDeadZone6" />
+	<button label="SpaceNavigator�デフォルト設定" name="SpaceNavigatorDefaults" width="210" left="330"/>
+
+	<string name="JoystickMonitor">
+		ジョイスティック・モニター
+	</string>
+	<string name="Axis">
+		軸 [NUM]
+	</string>
 	<string name="NoDevice">
 		デ�イス�検出�れ��ん���
 	</string>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 42eaec0..d2fd70e 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -46,9 +46,6 @@
 	<check_box label="支払情報登録���も�を拒�" name="deny_anonymous" />
 	<check_box label="支払情報登録��るも�を拒�" name="deny_identified" />
 	<check_box label="使用�れ��る支払情報を拒�" name="deny_transacted" />
-	<text name="abuse_email_text">
-		[Abuse E-mail Beta]
-	</text>
 	<button label="�用" name="apply_btn" />
 	<text name="allow_resident_label">
 		許��れ��人:
diff --git a/linden/indra/newview/skins/default/xui/ko/alerts.xml b/linden/indra/newview/skins/default/xui/ko/alerts.xml
index 9ad1c5c..67bc992 100644
--- a/linden/indra/newview/skins/default/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ko/alerts.xml
@@ -3284,20 +3284,6 @@ Applications ��� 다운로드하시겠습니까?
 			취소
 		</option>
 	</alert>
-	<alert name="WebLaunchReleaseNotes">
-		<message name="message">
-			[SECOND_LIFE] 출시 정보를 보시겠습니까?
-		</message>
-		<ignore name="ignore">
-			출시 정보를 보려고 웹 브�우저를 시작할 때
-		</ignore>
-		<option name="Gotopage">
-			페�지로 ��
-		</option>
-		<option name="Cancel">
-			취소
-		</option>
-	</alert>
 	<alert name="ReturnToOwner">
 		<message name="message">
 			선�한 오브�트를 소유주�게
@@ -3378,7 +3364,7 @@ Applications ��� 다운로드하시겠습니까?
 			�름별 차단� 오브�트 채팅과 메신저�만 �향� 주며 �소거는 하지 않습니다. 
 오브�트� �름� 정확하게 입력해야 합니다.
 		</message>
-		<editline>
+		<editline name="editline">
 			오브�트 �름
 		</editline>
 		<option name="OK">
@@ -3519,7 +3505,7 @@ Applications ��� 다운로드하시겠습니까?
 		<message name="message">
 			어떤 메시지로 � 사용�를 추방합니까?
 		</message>
-		<editline>
+		<editline name="editline">
 			관리�� �해 로그오프�었습니다.
 		</editline>
 		<option name="OK">
@@ -3533,7 +3519,7 @@ Applications ��� 다운로드하시겠습니까?
 		<message name="message">
 			그리드� 지금 메시지가 있는 모든 사람들� 추방합니까?
 		</message>
-		<editline>
+		<editline name="editline">
 			관리�� �해 로그오프�었습니다.
 		</editline>
 		<option name="OK">
@@ -3547,7 +3533,7 @@ Applications ��� 다운로드하시겠습니까?
 		<message name="message">
 			어떤 메시지로 � 사용�를 �결 시킵니까?
 		</message>
-		<editline>
+		<editline name="editline">
 			귀하는 정지� �태�므로 ��하거나 대화를 나눌 수 없습니다. 관리�가 메신저를 통해 연�� 취할 것입니다.
 		</editline>
 		<option name="OK">
@@ -3561,7 +3547,7 @@ Applications ��� 다운로드하시겠습니까?
 		<message name="message">
 			어떤 메시지를 사용하여 � 사용�� �결 �태를 해제하시겠습니까?
 		</message>
-		<editline>
+		<editline name="editline">
 			� �� 정지 모드� 있지 않습니다.
 		</editline>
 		<option name="OK">
@@ -3586,7 +3572,7 @@ Applications ��� 다운로드하시겠습니까?
 		<message name="message">
 			다� 메시지가 있는 내 위치로 텔레�팅� 제공합니까?
 		</message>
-		<editline>
+		<editline name="editline">
 			[REGION]� 가입하기
 		</editline>
 		<option name="OK">
@@ -3600,7 +3586,7 @@ Applications ��� 다운로드하시겠습니까?
 		<message name="message">
 			사용�를 귀하� 위치로 불러옵니까?
 		</message>
-		<editline>
+		<editline name="editline">
 			[REGION]� 가입하기
 		</editline>
 		<option name="OK">
@@ -5043,13 +5029,15 @@ D 슬���를 사용해서는 구름� ��를
 		<message name="message">
 			새 하늘� �름� 지정하십시오.
 		</message>
+		<editline name="editline">
+			새 사전 설정
+		</editline>
 		<option name="OK">
 			확�
 		</option>
 		<option name="Cancel">
 			취소
 		</option>
-		새 사전 설정
 	</alert>
 	<alert name="ExistsSkyPresetAlert">
 		<message name="message">
@@ -5060,13 +5048,15 @@ D 슬���를 사용해서는 구름� ��를
 		<message name="message">
 			새 수면 사전 설정� �름� 지정하십시오.
 		</message>
+		<editline name="editline">
+			새 사전 설정
+		</editline>
 		<option name="OK">
 			확�
 		</option>
 		<option name="Cancel">
 			취소
 		</option>
-		새 사전 설정
 	</alert>
 	<alert name="ExistsWaterPresetAlert">
 		<message name="message">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_html.xml b/linden/indra/newview/skins/default/xui/ko/floater_html.xml
index c99763e..c4c2055 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_html.xml
@@ -8,4 +8,7 @@
 	<string name="home_page_url">
 		http://kr.secondlife.com
 	</string>
+	<string name="support_page_url">
+	  	http://help.secondlife.com/kr
+	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
index 25e532d..34537ab 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
@@ -71,6 +71,12 @@
 		확대/축소 사�지대
 	</text>
 	<button label="SpaceNavigator 기본값" name="SpaceNavigatorDefaults" />
+	<string name="JoystickMonitor">
+		조�스틱 검사
+	</string>
+	<string name="Axis">
+		축 [NUM]
+	</string>
 	<string name="NoDevice">
 		검색� 장치가 없습니다.
 	</string>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
index a408180..52efd2e 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
@@ -46,9 +46,6 @@
 	<check_box label="결제수단 미등�� 출입 거부" name="deny_anonymous" />
 	<check_box label="결제수단 등�� 출입 거부" name="deny_identified" />
 	<check_box label="결제수단 사용� 출입 거부" name="deny_transacted" />
-	<text name="abuse_email_text">
-		[Abuse E-mail Beta]
-	</text>
 	<button label="�용" name="apply_btn" />
 	<text name="allow_resident_label">
 		허용� 주민:
diff --git a/linden/indra/newview/skins/default/xui/pt/alerts.xml b/linden/indra/newview/skins/default/xui/pt/alerts.xml
index d80c7a5..46dae87 100644
--- a/linden/indra/newview/skins/default/xui/pt/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/pt/alerts.xml
@@ -2597,21 +2597,6 @@ Nota: Isto limpará o cache.
 		</option>
 
 	</alert>
-	<alert name="WebLaunchReleaseNotes">
-		<message name="message">
-			Visite o [SECOND_LIFE] notas de lançamentos.
-		</message>
-		<ignore>
-			Quano iniciar o navegador, visitar as notas de lançamento.
-		</ignore>
-		<option name="Gotopage">
-			Ir para a página
-		</option>
-		<option name="Cancel">
-			Cancelar
-		</option>
-
-	</alert>
 	<alert name="ReturnToOwner">
 		<message name="message">
 			Você tem certeza que quer devolver os objetos selecionados aos seus donos? A autoria dos objetos transferíveis retornará para os seu antigos donos. (Todos os objetos retornarão para as pastas que estavam localizados anteriormente.)* *AVISO* Nenhum objeto transferível acionado será deletado!
@@ -2685,7 +2670,7 @@ Nota: Isto limpará o cache.
 		<message name="message">
 			Silenciar por nome somente afetará objetos, bate-papo e MI, mas não sons. Você deve digitar o nome do objeto corretamente.
 		</message>
-		<editline>
+		<editline name="editline">
 			Nome do objeto
 		</editline>
 		<option name="OK">
@@ -2820,7 +2805,7 @@ Nota: Isto limpará o cache.
 		<message name="message">
 			Expulsar este usuário com qual mensagem?
 		</message>
-		<editline>
+		<editline name="editline">
 			Um administrador o desconectou.
 		</editline>
 		<option name="OK">
@@ -2835,7 +2820,7 @@ Nota: Isto limpará o cache.
 		<message name="message">
 			Expulsar todo mundo atualmente do grid com qual mensagem?
 		</message>
-		<editline>
+		<editline name="editline">
 			Um administrador te desconectou.
 		</editline>
 		<option name="OK">
@@ -2850,7 +2835,7 @@ Nota: Isto limpará o cache.
 		<message name="message">
 			Paralise este usuário com qual mensagem?
 		</message>
-		<editline>
+		<editline name="editline">
 			Você foi paralisado. Você não pode mover-se ou conversar. Um administrador entrará em contato com você através de mensagem instantânea (MI).
 		</editline>
 		<option name="OK">
@@ -2865,7 +2850,7 @@ Nota: Isto limpará o cache.
 		<message name="message">
 			Liberar este usuário com qual mensagem?
 		</message>
-		<editline>
+		<editline name="editline">
 			Você não está mais paralisado.
 		</editline>
 		<option name="OK">
@@ -2891,7 +2876,7 @@ Nota: Isto limpará o cache.
 		<message name="message">
 			Oferecer um teletransporte para uma localização com a seguinte mensagem?
 		</message>
-		<editline>
+		<editline name="editline">
 			Venha para [REGION]
 		</editline>
 		<option name="OK">
@@ -2906,7 +2891,7 @@ Nota: Isto limpará o cache.
 		<message name="message">
 			God user convocou para a sua localização?
 		</message>
-		<editline>
+		<editline name="editline">
 			Venha para [REGION]
 		</editline>
 		<option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
index d9caffc..daa441e 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -6,4 +6,7 @@
 	<text name="f1_help_url">
 		http://secondlife.com/app/support/index_pt.html
 	</text>
+	<string name="support_page_url">
+	  	http://secondlife.com/app/support/index_pt.html
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/notify.xml b/linden/indra/newview/skins/default/xui/pt/notify.xml
index 1e95e22..13c9975 100644
--- a/linden/indra/newview/skins/default/xui/pt/notify.xml
+++ b/linden/indra/newview/skins/default/xui/pt/notify.xml
@@ -197,12 +197,12 @@
 	</notify>
 	<notify name="InventoryAccepted">
 		<message name="message">
-			[NAME] aceitou seu convite de amizade.
+			[NAME] aceitou seu convite de inventário.
 		</message>
 	</notify>
 	<notify name="InventoryDeclined">
 		<message name="message">
-			[NAME] rejeitou seu convite de amizade
+			[NAME] rejeitou seu convite de inventário.
 		</message>
 	</notify>
 	<notify name="ObjectMessage">
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 1560505..f647abb 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -37,7 +37,7 @@
 	<check_box label="Informações de pagamento" name="deny_identified" />
 	<check_box label="Informações de pagtos realizados" name="deny_transacted" />
 	<text name="abuse_email_text">
-		[E-mail do abuso Beta]
+		E-mail do abuso:
 	</text>
 	<button label="Aplicar" name="apply_btn" />
 	<text name="allow_resident_label">
diff --git a/linden/indra/newview/skins/default/xui/zh/alerts.xml b/linden/indra/newview/skins/default/xui/zh/alerts.xml
index 5aaaafa..641f1f3 100644
--- a/linden/indra/newview/skins/default/xui/zh/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/zh/alerts.xml
@@ -2835,17 +2835,6 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
 			�消
 		</option>
 	</alert>
-	<alert name="WebLaunchReleaseNotes">
-		<message name="message">
-			是�查看[SECOND_LIFE] �布的消�?.
-		</message>
-		<option name="Gotopage">
-			回主页
-		</option>
-		<option name="Cancel">
-			�消
-		</option>
-	</alert>
 	<alert name="ReturnToOwner">
 		<message name="message">
 			你确定�将所选东东归还至
@@ -2915,7 +2904,7 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
 			通过�字�蔽声音�会影�对象�天和�时消�, �会影效果声音。 
 你必须准确键入对象的�字.
 		</message>
-		<editline>
+		<editline name="editline">
 			东东�称
 		</editline>
 		<option name="OK">
@@ -3044,7 +3033,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			以哪�消�踢走此人?
 		</message>
-		<editline>
+		<editline name="editline">
 			管�员已�迫使您下线。
 		</editline>
 		<option name="OK">
@@ -3058,7 +3047,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			以哪�消�踢走目�在此的�个人?
 		</message>
-		<editline>
+		<editline name="editline">
 			管�员已�迫使您下线。
 		</editline>
 		<option name="OK">
@@ -3072,7 +3061,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			用哪一�通知冻结化身?
 		</message>
-		<editline>
+		<editline name="editline">
 			你已�被冻结。你�能移动或�天。管�员会通过�时信��系你。
 		</editline>
 		<option name="OK">
@@ -3086,7 +3075,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			��何�信���该用户?
 		</message>
-		<editline>
+		<editline name="editline">
 			你已�被解冻
 		</editline>
 		<option name="OK">
@@ -3111,7 +3100,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			用以下消��供到你所在地的闪电传�?
 		</message>
-		<editline>
+		<editline name="editline">
 			我�加入 [REGION]
 		</editline>
 		<option name="OK">
@@ -3125,7 +3114,7 @@ from the &apos;Edit&apos; menu.
 		<message name="message">
 			是�神明�唤用户去你的�置?
 		</message>
-		<editline>
+		<editline name="editline">
 			我�加入 [REGION]
 		</editline>
 		<option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_html.xml b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
index 0232bdc..8c75fa7 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
@@ -6,4 +6,7 @@
 	<button label="�止" name="stop_btn" />
 	<button label="家" name="home_btn" />
 	<button label="行动" name="go_btn" />
+	<string name="support_page_url">
+	  	http://secondlife.com/app/support/index_zh.html
+	</string>
 </floater>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 8d8117a..19b6013 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -37,6 +37,7 @@
 <ButtonUnselectedBgColor value="62, 62, 62, 255" />
 <ButtonUnselectedFgColor value="255, 255, 255, 255" />
 <ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonFlashBgColor value="255, 190, 62, 127" />
 <ButtonColor value="255, 255, 255, 255" /> 		<!-- Blended with button art, usually left as opaque white -->
 <ButtonImageColor value="255, 255, 255, 255" /> 	<!-- Blended with button art, usually left as opaque white -->
 
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
index b9c3755..d7a6540 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
@@ -227,6 +227,10 @@
 			<string name="sale_pending_text">
 				(Sale Pending)
 			</string>
+			<string name="no_selection_text">
+			No parcel selected.
+Go to World menu > About Land or select another parcel to show its details.
+			</string>
 		</panel>
 		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
 		     height="333" label="Covenant" left="0" mouse_opaque="true"
@@ -310,7 +314,7 @@
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="fakse"
+			     mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="false"
 			     width="364">
 				Region Object Bonus Factor: [BONUS]
 			</text>
@@ -454,7 +458,7 @@
 			     halign="center" height="16" label="Return objects..."
 			     label_selected="Return objects..." left="220" mouse_opaque="true"
 			     name="Return objects..." width="164" />
-			<name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"
+			<name_list allow_calling_card_drop="false" background_visible="true" bottom="-329"
 			     column_padding="0" draw_border="true" draw_heading="true"
 			     draw_stripes="true" enabled="true" 
 			     follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"
@@ -463,6 +467,7 @@
 				<column name="online_status" width="-1" />
 				<column name="name" dynamicwidth="true" label="Name" />
 				<column name="count" label="Count" width="70" />
+				<column label="Most Recent" width="160" />
 			</name_list>
 		</panel>
 		<panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
@@ -819,7 +824,7 @@ Options:
 			     tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
 			     width="278" />
 			<string name="estate_override">
-				One ore more of these options is set at the estate level
+				One or more of these options is set at the estate level
 			</string>
 			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="16" initial_value="false" label="Allow Group Access: [GROUP]"
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
index f7e230f..fa7db4e 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
@@ -11,6 +11,9 @@
 	     mouse_opaque="true" name="running" radio_style="false" width="100" />
 	<panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"
 	     left="1" name="script ed panel" width="497" />
+	<check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
+	     height="18" hidden="false" initial_value="true" label="Mono" left="82"
+	     mouse_opaque="true" name="mono" radio_style="false" width="100" />
 	<string name="not_allowed">
 		You are not allowed to view this script.
 	</string>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
index 0eca4ac..022065e 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
 	     embedded_items="false" enabled="true" follows="left|top|right|bottom"
 	     font="Monospace" height="376" ignore_tab="false" left="4"
 	     max_length="65536" mouse_opaque="true" name="Script Editor" width="492"
-	     word_wrap="true">
+	     word_wrap="true" show_line_numbers="true">
 		Loading...
 	</text_editor>
 	<button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
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
index cd453fa..63e1be2 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
@@ -3,7 +3,7 @@
      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=""
-     width="272">
+     short_title="Build" width="272">
 
 <!-- Main floater tabs -->
 
@@ -278,6 +278,15 @@
 			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"
@@ -417,13 +426,13 @@
 			     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="100"
-			     mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
+			     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="56"
-			     max_length="25" mouse_opaque="true" name="EdCost" width="84" />
+			     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"
@@ -537,6 +546,21 @@
 			<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 -->
@@ -1178,7 +1202,7 @@
 		<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="72">
+		     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"
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 27c12dd..718d6e6 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -39,515 +39,615 @@ sys.path.append(os.path.join(viewer_dir, '../lib/python/indra/util'))
 from llmanifest import LLManifest, main, proper_windows_path, path_ancestors
 
 class ViewerManifest(LLManifest):
-        def construct(self):
-                super(ViewerManifest, self).construct()
-                self.exclude("*.svn*")
-                self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
-                self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
-
-                if self.prefix(src="app_settings"):
-                        self.exclude("logcontrol.xml")
-                        self.exclude("logcontrol-dev.xml")
-                        self.path("*.pem")
-                        self.path("*.ini")
-                        self.path("*.xml")
-                        self.path("*.vp")
-                        self.path("*.db2")
-
-                        # include the entire shaders directory recursively
-                        self.path("shaders")
-                        # ... and the entire windlight directory
-                        self.path("windlight")
-                        self.end_prefix("app_settings")
-
-                if self.prefix(src="character"):
-                        self.path("*.llm")
-                        self.path("*.xml")
-                        self.path("*.tga")
-                        self.end_prefix("character")
-
-
-                # Include our fonts
-                if self.prefix(src="fonts"):
-                        self.path("*.ttf")
-                        self.path("*.txt")
-                        self.end_prefix("fonts")
-
-                # skins
-                if self.prefix(src="skins"):
-                        self.path("paths.xml")
-                        # include the entire textures directory recursively
-                        if self.prefix(src="*/textures"):
-                                self.path("*.tga")
-                                self.path("*.j2c")
-                                self.path("*.jpg")
-                                self.path("*.png")
-                                self.path("textures.xml")
-                                self.end_prefix("*/textures")
-                        self.path("*/xui/*/*.xml")
-                        self.path("*/*.xml")
+    def construct(self):
+        super(ViewerManifest, self).construct()
+        self.exclude("*.svn*")
+        self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
+        self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
+
+        if self.prefix(src="app_settings"):
+            self.exclude("logcontrol.xml")
+            self.exclude("logcontrol-dev.xml")
+            self.path("*.pem")
+            self.path("*.ini")
+            self.path("*.xml")
+            self.path("*.vp")
+            self.path("*.db2")
+
+            # include the entire shaders directory recursively
+            self.path("shaders")
+            # ... and the entire windlight directory
+            self.path("windlight")
+            self.end_prefix("app_settings")
+
+        if self.prefix(src="character"):
+            self.path("*.llm")
+            self.path("*.xml")
+            self.path("*.tga")
+            self.end_prefix("character")
+
+
+        # Include our fonts
+        if self.prefix(src="fonts"):
+            self.path("*.ttf")
+            self.path("*.txt")
+            self.end_prefix("fonts")
+
+            # skins
+            if self.prefix(src="skins"):
+                    self.path("paths.xml")
+                    # include the entire textures directory recursively
+                    if self.prefix(src="*/textures"):
+                            self.path("*.tga")
+                            self.path("*.j2c")
+                            self.path("*.jpg")
+                            self.path("*.png")
+                            self.path("textures.xml")
+                            self.end_prefix("*/textures")
+                    self.path("*/xui/*/*.xml")
+                    self.path("*/*.xml")
+                    
+                    # Local HTML files (e.g. loading screen)
+                    if self.prefix(src="*/html"):
+                            self.path("*.png")
+                            self.path("*/*/*.html")
+                            self.path("*/*/*.gif")
+                            self.end_prefix("*/html")
+                    self.end_prefix("skins")
+        self.path("lsl_guide.html")
+        self.path("gpu_table.txt")
+
+    def login_channel(self):
+        """Channel reported for login and upgrade purposes ONLY;
+        used for A/B testing"""
+        # NOTE: Do not return the normal channel if login_channel
+        # is not specified, as some code may branch depending on
+        # whether or not this is present
+        return self.args.get('login_channel')
+
+    def channel(self):
+        return self.args['channel']
+    def channel_unique(self):
+        return self.channel().replace("Second Life", "").strip()
+    def channel_oneword(self):
+        return "".join(self.channel_unique().split())
+    def channel_lowerword(self):
+        return self.channel_oneword().lower()
+
+    def flags_list(self):
+        """ Convenience function that returns the command-line flags
+        for the grid"""
+        channel_flags = ''
+        grid_flags = ''
+        if not self.default_grid():
+            if self.default_channel():
+                # beta grid viewer
+                channel_flags = '--settings settings_beta.xml'
+            grid_flags = "--grid %(grid)s --helperuri http://preview-%(grid)s.secondlife.com/helpers/" % {'grid':self.args['grid']}
+
+        if not self.default_channel():
+            # some channel on some grid
+            channel_flags = '--settings settings_%s.xml --channel "%s"' % (self.channel_lowerword(), self.channel())
+        elif self.login_channel():
+            # Report a special channel during login, but use default
+            channel_flags = '--channel "%s"' % (self.login_channel())
                         
-                        # Local HTML files (e.g. loading screen)
-                        if self.prefix(src="*/html"):
-                                self.path("*.png")
-                                self.path("*/*/*.html")
-                                self.path("*/*/*.gif")
-                                self.end_prefix("*/html")
-                        self.end_prefix("skins")
-                self.path("releasenotes.txt")
-                self.path("lsl_guide.html")
-                self.path("gpu_table.txt")
-
-        def login_channel(self):
-                """Channel reported for login and upgrade purposes ONLY; used for A/B testing"""
-                # NOTE: Do not return the normal channel if login_channel is not specified, as
-                # some code may branch depending on whether or not this is present
-                return self.args.get('login_channel')
-
-        def channel(self):
-                return self.args['channel']
-        def channel_unique(self):
-                return self.channel().replace("Second Life", "").strip()
-        def channel_oneword(self):
-                return "".join(self.channel_unique().split())
-        def channel_lowerword(self):
-                return self.channel_oneword().lower()
-
-        def flags_list(self):
-                """ Convenience function that returns the command-line flags for the grid"""
-                channel_flags = ''
-                grid_flags = ''
-                if not self.default_grid():
-                        if self.default_channel():
-                                # beta grid viewer
-                                channel_flags = '--settings settings_beta.xml'
-                        grid_flags = "--grid %(grid)s --helperuri http://preview-%(grid)s.secondlife.com/helpers/" % {'grid':self.args['grid']}
-                        
-                if not self.default_channel():
-                        # some channel on some grid
-                        channel_flags = '--settings settings_%s.xml --channel "%s"' % (self.channel_lowerword(), self.channel())
-                elif self.login_channel():
-                        # Report a special channel during login, but use default channel elsewhere
-                        channel_flags = '--channel "%s"' % (self.login_channel())
-                        
-                return " ".join((channel_flags, grid_flags)).strip()
+        return " ".join((channel_flags, grid_flags)).strip()
 
 
 class WindowsManifest(ViewerManifest):
-        def final_exe(self):
-                if self.default_channel():
-                        if self.default_grid():
-                                return "SecondLife.exe"
-                        else:
-                                return "SecondLifePreview.exe"
-                else:
-                        return ''.join(self.channel().split()) + '.exe'
-
-
-        def construct(self):
-                super(WindowsManifest, self).construct()
-                # the final exe is complicated because we're not sure where it's coming from,
-                # nor do we have a fixed name for the executable
-                self.path(self.find_existing_file('ReleaseForDownload/Secondlife.exe', 'Secondlife.exe', 'ReleaseNoOpt/newview_noopt.exe'), dst=self.final_exe())
-                # need to get the kdu dll from any of the build directories as well
-                self.path(self.find_existing_file('ReleaseForDownload/llkdu.dll', 'llkdu.dll', '../../libraries/i686-win32/lib_release/llkdu.dll'), dst='llkdu.dll')
-                self.path(src="licenses-win32.txt", dst="licenses.txt")
-
-                self.path("featuretable.txt")
-
-                # For use in crash reporting (generates minidumps)
-                self.path("dbghelp.dll")
-
-                # For using FMOD for sound... DJS
-                self.path("fmod.dll")
-
-                # For textures
-                if self.prefix(src="../../libraries/i686-win32/lib_release", dst=""):
-                        self.path("openjpeg.dll")
-                        self.end_prefix()
-
-                # Mozilla appears to force a dependency on these files so we need to ship it (CP)
-                self.path("msvcr71.dll")
-                self.path("msvcp71.dll")
-
-                # Mozilla runtime DLLs (CP)
-                if self.prefix(src="../../libraries/i686-win32/lib_release", dst=""):
-                        self.path("freebl3.dll")
-                        self.path("gksvggdiplus.dll")
-                        self.path("js3250.dll")
-                        self.path("nspr4.dll")
-                        self.path("nss3.dll")
-                        self.path("nssckbi.dll")
-                        self.path("plc4.dll")
-                        self.path("plds4.dll")
-                        self.path("smime3.dll")
-                        self.path("softokn3.dll")
-                        self.path("ssl3.dll")
-                        self.path("xpcom.dll")
-                        self.path("xul.dll")
-                        self.end_prefix()
-
-                # Mozilla runtime misc files (CP)
-                if self.prefix(src="app_settings/mozilla"):
-                        self.path("chrome/*.*")
-                        self.path("components/*.*")
-                        self.path("greprefs/*.*")
-                        self.path("plugins/*.*")
-                        self.path("res/*.*")
-                        self.path("res/*/*")
-                        self.end_prefix()
-
-                # Vivox runtimes
-                if self.prefix(src="vivox-runtime/i686-win32", dst=""):
-                        self.path("SLVoice.exe")
-                        self.path("SLVoiceAgent.exe")
-                        self.path("libeay32.dll")
-                        self.path("srtp.dll")
-                        self.path("ssleay32.dll")
-                        self.path("tntk.dll")
-                        self.path("alut.dll")
-                        self.path("vivoxsdk.dll")
-                        self.path("ortp.dll")
-                        self.path("wrap_oal.dll")
-                        self.end_prefix()
-
-#                # pull in the crash logger and updater from other projects
-#                self.path(src="../win_crash_logger/win_crash_logger.exe", dst="win_crash_logger.exe")
-                self.path(src="../win_updater/updater.exe", dst="updater.exe")
-
-        def nsi_file_commands(self, install=True):
-                def wpath(path):
-                        if(path.endswith('/') or path.endswith(os.path.sep)):
-                                path = path[:-1]
-                        path = path.replace('/', '\\')
-                        return path
-
-                result = ""
-                dest_files = [pair[1] for pair in self.file_list if pair[0] and os.path.isfile(pair[1])]
-                # sort deepest hierarchy first
-                dest_files.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
-                dest_files.reverse()
-                out_path = None
-                for pkg_file in dest_files:
-                        rel_file = os.path.normpath(pkg_file.replace(self.get_dst_prefix()+os.path.sep,''))
-                        installed_dir = wpath(os.path.join('$INSTDIR', os.path.dirname(rel_file)))
-                        pkg_file = wpath(os.path.normpath(pkg_file))
-                        if installed_dir != out_path:
-                                if(install):
-                                        out_path = installed_dir
-                                        result += 'SetOutPath ' + out_path + '\n'
-                        if(install):
-                                result += 'File ' + pkg_file + '\n'
-                        else:
-                                result += 'Delete ' + wpath(os.path.join('$INSTDIR', rel_file)) + '\n'
-                # at the end of a delete, just rmdir all the directories
-                if(not install):
-                        deleted_file_dirs = [os.path.dirname(pair[1].replace(self.get_dst_prefix()+os.path.sep,'')) for pair in self.file_list]
-                        # find all ancestors so that we don't skip any dirs that happened to have no non-dir children
-                        deleted_dirs = []
-                        for d in deleted_file_dirs:
-                                deleted_dirs.extend(path_ancestors(d))
-                        # sort deepest hierarchy first
-                        deleted_dirs.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
-                        deleted_dirs.reverse()
-                        prev = None
-                        for d in deleted_dirs:
-                                if d != prev:   # skip duplicates
-                                        result += 'RMDir ' + wpath(os.path.join('$INSTDIR', os.path.normpath(d))) + '\n'
-                                prev = d
-
-                return result
-
-        def package_finish(self):
-                # a standard map of strings for replacing in the templates
-                substitution_strings = {
-                        'version' : '.'.join(self.args['version']),
-                        'version_short' : '.'.join(self.args['version'][:-1]),
-                        'version_dashes' : '-'.join(self.args['version']),
-                        'final_exe' : self.final_exe(),
-                        'grid':self.args['grid'],
-                        'grid_caps':self.args['grid'].upper(),
-                        # escape quotes becase NSIS doesn't handle them well
-                        'flags':self.flags_list().replace('"', '$\\"'),
-                        'channel':self.channel(),
-                        'channel_oneword':self.channel_oneword(),
-                        'channel_unique':self.channel_unique(),
-                        }
-
-                version_vars = """
-                !define INSTEXE  "%(final_exe)s"
-                !define VERSION "%(version_short)s"
-                !define VERSION_LONG "%(version)s"
-                !define VERSION_DASHES "%(version_dashes)s"
-                """ % substitution_strings
-                if self.default_channel():
-                        if self.default_grid():
-                                # release viewer
-                                installer_file = "Second_Life_%(version_dashes)s_Setup.exe"
-                                grid_vars_template = """
-                                OutFile "%(installer_file)s"
-                                !define INSTFLAGS "%(flags)s"
-                                !define INSTNAME   "SecondLife"
-                                !define SHORTCUT   "Second Life"
-                                !define URLNAME   "secondlife"
-                                Caption "Second Life ${VERSION}"
-                                """
-                        else:
-                                # beta grid viewer
-                                installer_file = "Second_Life_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
-                                grid_vars_template = """
-                                OutFile "%(installer_file)s"
-                                !define INSTFLAGS "%(flags)s"
-                                !define INSTNAME   "SecondLife%(grid_caps)s"
-                                !define SHORTCUT   "Second Life (%(grid_caps)s)"
-                                !define URLNAME   "secondlife%(grid)s"
-                                !define UNINSTALL_SETTINGS 1
-                                Caption "Second Life %(grid)s ${VERSION}"
-                                """
-                else:
-                        # some other channel on some grid
-                        installer_file = "Second_Life_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
-                        grid_vars_template = """
-                        OutFile "%(installer_file)s"
-                        !define INSTFLAGS "%(flags)s"
-                        !define INSTNAME   "SecondLife%(channel_oneword)s"
-                        !define SHORTCUT   "%(channel)s"
-                        !define URLNAME   "secondlife"
-                        !define UNINSTALL_SETTINGS 1
-                        Caption "%(channel)s ${VERSION}"
-                        """
-                if(self.args.has_key('installer_name')):
-                        installer_file = self.args['installer_name']
-                else:
-                        installer_file = installer_file % substitution_strings
-                substitution_strings['installer_file'] = installer_file
-
-                tempfile = "../secondlife_setup_tmp.nsi"
-                # the following replaces strings in the nsi template
-                # it also does python-style % substitution
-                self.replace_in("installers/windows/installer_template.nsi", tempfile, {
-                        "%%VERSION%%":version_vars,
-                        "%%GRID_VARS%%":grid_vars_template % substitution_strings,
-                        "%%INSTALL_FILES%%":self.nsi_file_commands(True),
-                        "%%DELETE_FILES%%":self.nsi_file_commands(False)})
-
-                NSIS_path = 'C:\\Program Files\\NSIS\\makensis.exe'
-                self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
-                # self.remove(self.dst_path_of(tempfile))
-                self.created_path(installer_file)
+    def final_exe(self):
+        if self.default_channel():
+            if self.default_grid():
+                return "SecondLife.exe"
+            else:
+                return "SecondLifePreview.exe"
+        else:
+            return ''.join(self.channel().split()) + '.exe'
+
+
+    def construct(self):
+        super(WindowsManifest, self).construct()
+        # the final exe is complicated because we're not sure where it's coming from,
+        # nor do we have a fixed name for the executable
+        self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe())
+        # need to get the kdu dll from any of the build directories as well
+        self.path(self.find_existing_file(
+                # *FIX:Mani we need to add support for packaging specific targets.
+                #'../llkdu/debug/llkdu.dll',
+                '../llkdu/release/llkdu.dll',
+                '../llkdu/relwithdebinfo/llkdu.dll',
+                '../../libraries/i686-win32/lib/release/llkdu.dll'), 
+                  dst='llkdu.dll')
+        self.path(src="licenses-win32.txt", dst="licenses.txt")
+
+        self.path("featuretable.txt")
+
+        # For use in crash reporting (generates minidumps)
+        self.path("dbghelp.dll")
+
+        # For using FMOD for sound... DJS
+        self.path("fmod.dll")
+
+        # For textures
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("openjpeg.dll")
+            self.end_prefix()
+
+        # Mozilla appears to force a dependency on these files so we need to ship it (CP)
+        self.path("msvcr71.dll")
+        self.path("msvcp71.dll")
+
+        # Mozilla runtime DLLs (CP)
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("freebl3.dll")
+            self.path("gksvggdiplus.dll")
+            self.path("js3250.dll")
+            self.path("nspr4.dll")
+            self.path("nss3.dll")
+            self.path("nssckbi.dll")
+            self.path("plc4.dll")
+            self.path("plds4.dll")
+            self.path("smime3.dll")
+            self.path("softokn3.dll")
+            self.path("ssl3.dll")
+            self.path("xpcom.dll")
+            self.path("xul.dll")
+            self.end_prefix()
+
+        # Mozilla runtime misc files (CP)
+        if self.prefix(src="app_settings/mozilla"):
+            self.path("chrome/*.*")
+            self.path("components/*.*")
+            self.path("greprefs/*.*")
+            self.path("plugins/*.*")
+            self.path("res/*.*")
+            self.path("res/*/*")
+            self.end_prefix()
+
+        # Vivox runtimes
+        if self.prefix(src="vivox-runtime/i686-win32", dst=""):
+            self.path("SLVoice.exe")
+            self.path("SLVoiceAgent.exe")
+            self.path("libeay32.dll")
+            self.path("srtp.dll")
+            self.path("ssleay32.dll")
+            self.path("tntk.dll")
+            self.path("alut.dll")
+            self.path("vivoxsdk.dll")
+            self.path("ortp.dll")
+            self.path("wrap_oal.dll")
+            self.end_prefix()
+
+#        # pull in the crash logger and updater from other projects
+#        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
+#                "../win_crash_logger/debug/windows-crash-logger.exe",
+#                "../win_crash_logger/release/windows-crash-logger.exe",
+#                "../win_crash_logger/relwithdebinfo/windows-crash-logger.exe"),
+#                  dst="win_crash_logger.exe")
+        self.path(src=self.find_existing_file(
+                "../win_updater/debug/windows-updater.exe",
+                "../win_updater/release/windows-updater.exe",
+                "../win_updater/relwithdebinfo/windows-updater.exe"),
+                  dst="updater.exe")
+
+    def nsi_file_commands(self, install=True):
+        def wpath(path):
+            if path.endswith('/') or path.endswith(os.path.sep):
+                path = path[:-1]
+            path = path.replace('/', '\\')
+            return path
+
+        result = ""
+        dest_files = [pair[1] for pair in self.file_list if pair[0] and os.path.isfile(pair[1])]
+        # sort deepest hierarchy first
+        dest_files.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
+        dest_files.reverse()
+        out_path = None
+        for pkg_file in dest_files:
+            rel_file = os.path.normpath(pkg_file.replace(self.get_dst_prefix()+os.path.sep,''))
+            installed_dir = wpath(os.path.join('$INSTDIR', os.path.dirname(rel_file)))
+            pkg_file = wpath(os.path.normpath(pkg_file))
+            if installed_dir != out_path:
+                if install:
+                    out_path = installed_dir
+                    result += 'SetOutPath ' + out_path + '\n'
+            if install:
+                result += 'File ' + pkg_file + '\n'
+            else:
+                result += 'Delete ' + wpath(os.path.join('$INSTDIR', rel_file)) + '\n'
+        # at the end of a delete, just rmdir all the directories
+        if not install:
+            deleted_file_dirs = [os.path.dirname(pair[1].replace(self.get_dst_prefix()+os.path.sep,'')) for pair in self.file_list]
+            # find all ancestors so that we don't skip any dirs that happened to have no non-dir children
+            deleted_dirs = []
+            for d in deleted_file_dirs:
+                deleted_dirs.extend(path_ancestors(d))
+            # sort deepest hierarchy first
+            deleted_dirs.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
+            deleted_dirs.reverse()
+            prev = None
+            for d in deleted_dirs:
+                if d != prev:   # skip duplicates
+                    result += 'RMDir ' + wpath(os.path.join('$INSTDIR', os.path.normpath(d))) + '\n'
+                prev = d
+
+        return result
+
+    def package_finish(self):
+        # a standard map of strings for replacing in the templates
+        substitution_strings = {
+            'version' : '.'.join(self.args['version']),
+            'version_short' : '.'.join(self.args['version'][:-1]),
+            'version_dashes' : '-'.join(self.args['version']),
+            'final_exe' : self.final_exe(),
+            'grid':self.args['grid'],
+            'grid_caps':self.args['grid'].upper(),
+            # escape quotes becase NSIS doesn't handle them well
+            'flags':self.flags_list().replace('"', '$\\"'),
+            'channel':self.channel(),
+            'channel_oneword':self.channel_oneword(),
+            'channel_unique':self.channel_unique(),
+            }
+
+        version_vars = """
+        !define INSTEXE  "%(final_exe)s"
+        !define VERSION "%(version_short)s"
+        !define VERSION_LONG "%(version)s"
+        !define VERSION_DASHES "%(version_dashes)s"
+        """ % substitution_strings
+        if self.default_channel():
+            if self.default_grid():
+                # release viewer
+                installer_file = "Second_Life_%(version_dashes)s_Setup.exe"
+                grid_vars_template = """
+                OutFile "%(installer_file)s"
+                !define INSTFLAGS "%(flags)s"
+                !define INSTNAME   "SecondLife"
+                !define SHORTCUT   "Second Life"
+                !define URLNAME   "secondlife"
+                Caption "Second Life ${VERSION}"
+                """
+            else:
+                # beta grid viewer
+                installer_file = "Second_Life_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
+                grid_vars_template = """
+                OutFile "%(installer_file)s"
+                !define INSTFLAGS "%(flags)s"
+                !define INSTNAME   "SecondLife%(grid_caps)s"
+                !define SHORTCUT   "Second Life (%(grid_caps)s)"
+                !define URLNAME   "secondlife%(grid)s"
+                !define UNINSTALL_SETTINGS 1
+                Caption "Second Life %(grid)s ${VERSION}"
+                """
+        else:
+            # some other channel on some grid
+            installer_file = "Second_Life_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
+            grid_vars_template = """
+            OutFile "%(installer_file)s"
+            !define INSTFLAGS "%(flags)s"
+            !define INSTNAME   "SecondLife%(channel_oneword)s"
+            !define SHORTCUT   "%(channel)s"
+            !define URLNAME   "secondlife"
+            !define UNINSTALL_SETTINGS 1
+            Caption "%(channel)s ${VERSION}"
+            """
+        if 'installer_name' in self.args:
+            installer_file = self.args['installer_name']
+        else:
+            installer_file = installer_file % substitution_strings
+        substitution_strings['installer_file'] = installer_file
+
+        tempfile = "secondlife_setup_tmp.nsi"
+        # the following replaces strings in the nsi template
+        # it also does python-style % substitution
+        self.replace_in("installers/windows/installer_template.nsi", tempfile, {
+                "%%VERSION%%":version_vars,
+                "%%SOURCE%%":self.get_src_prefix(),
+                "%%GRID_VARS%%":grid_vars_template % substitution_strings,
+                "%%INSTALL_FILES%%":self.nsi_file_commands(True),
+                "%%DELETE_FILES%%":self.nsi_file_commands(False)})
+
+        NSIS_path = 'C:\\Program Files\\NSIS\\makensis.exe'
+        self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+        # self.remove(self.dst_path_of(tempfile))
+        self.created_path(self.dst_path_of(installer_file))
+        self.package_file = installer_file
 
 
 class DarwinManifest(ViewerManifest):
-        def construct(self):
-                # copy over the build result (this is a no-op if run within the xcode script)
-                self.path("build/" + self.args['configuration'] + "/Second Life.app", dst="")
-
-                if self.prefix(src="", dst="Contents"):  # everything goes in Contents
-                        # Expand the tar file containing the assorted mozilla bits into
-                        #  <bundle>/Contents/MacOS/
-                        self.contents_of_tar('mozilla-universal-darwin.tgz', 'MacOS')
-
-                        # copy additional libs in <bundle>/Contents/MacOS/
-                        self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
-
-                        # replace the default theme with our custom theme (so scrollbars work).
-                        if self.prefix(src="mozilla-theme", dst="MacOS/chrome"):
-                                self.path("classic.jar")
-                                self.path("classic.manifest")
-                                self.end_prefix("MacOS/chrome")
-
-                        # most everything goes in the Resources directory
-                        if self.prefix(src="", dst="Resources"):
-                                super(DarwinManifest, self).construct()
-
-                                if self.prefix("cursors_mac"):
-                                        self.path("*.tif")
-                                        self.end_prefix("cursors_mac")
-
-                                self.path("licenses-mac.txt", dst="licenses.txt")
-                                self.path("featuretable_mac.txt")
-                                self.path("secondlife.icns")
-
-                                # llkdu dynamic library
-#                                self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
-
-                                # command line arguments for connecting to the proper grid
-                                self.put_in_file(self.flags_list(), 'arguments.txt')
-
-                                self.end_prefix("Resources")
-
-                        self.end_prefix("Contents")
-                        
-                # NOTE: the -S argument to strip causes it to keep enough info for
-                # annotated backtraces (i.e. function names in the crash log).  'strip' with no
-                # arguments yields a slightly smaller binary but makes crash logs mostly useless.
-                # This may be desirable for the final release.  Or not.
-                if("package" in self.args['actions'] or
-                   "unpacked" in self.args['actions']):
-                    self.run_command('strip -S "%(viewer_binary)s"' %
-                                 { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
-
-
-        def package_finish(self):
-                channel_standin = 'Second Life'  # hah, our default channel is not usable on its own
-                if not self.default_channel():
-                        channel_standin = self.channel()
-                        
-                imagename="SecondLife_" + '_'.join(self.args['version'])
-                if self.default_channel():
-                        if not self.default_grid():
-                                # beta case
-                                imagename = imagename + '_' + self.args['grid'].upper()
+    def construct(self):
+        # copy over the build result (this is a no-op if run within the xcode script)
+        self.path(self.args['configuration'] + "/Second Life.app", dst="")
+
+        if self.prefix(src="", dst="Contents"):  # everything goes in Contents
+            # Expand the tar file containing the assorted mozilla bits into
+            #  <bundle>/Contents/MacOS/
+            self.contents_of_tar(self.args['source']+'/mozilla-universal-darwin.tgz', 'MacOS')
+
+            self.path("Info-SecondLife.plist", dst="Info.plist")
+
+            # copy additional libs in <bundle>/Contents/MacOS/
+            self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
+
+            # replace the default theme with our custom theme (so scrollbars work).
+            if self.prefix(src="mozilla-theme", dst="MacOS/chrome"):
+                self.path("classic.jar")
+                self.path("classic.manifest")
+                self.end_prefix("MacOS/chrome")
+
+            # most everything goes in the Resources directory
+            if self.prefix(src="", dst="Resources"):
+                super(DarwinManifest, self).construct()
+
+                if self.prefix("cursors_mac"):
+                    self.path("*.tif")
+                    self.end_prefix("cursors_mac")
+
+                self.path("licenses-mac.txt", dst="licenses.txt")
+                self.path("featuretable_mac.txt")
+                self.path("SecondLife.nib")
+
+                # If we are not using the default channel, use the 'Firstlook
+                # icon' to show that it isn't a stable release.
+                if self.default_channel() and self.default_grid():
+                    self.path("secondlife.icns")
                 else:
-                        # first look, etc
-                        imagename = imagename + '_' + self.channel_oneword().upper()
-
-                sparsename = imagename + ".sparseimage"
-                finalname = imagename + ".dmg"
-                # make sure we don't have stale files laying about
-                self.remove(sparsename, finalname)
-
-                self.run_command('hdiutil create "%(sparse)s" -volname "%(channel)s" -fs HFS+ -type SPARSE -megabytes 300 -layout SPUD' % {
-                        'sparse':sparsename,
-                        'channel':channel_standin})
-
-                # mount the image and get the name of the mount point and device node
-                hdi_output = self.run_command('hdiutil attach -private "' + sparsename + '"')
-                devfile = re.search("/dev/disk([0-9]+)[^s]", hdi_output).group(0).strip()
-                volpath = re.search('HFS\s+(.+)', hdi_output).group(1).strip()
-
-                # Copy everything in to the mounted .dmg
-                if self.default_channel() and not self.default_grid():
-                        app_name = "Second Life " + self.args['grid']
-                else:
-                        app_name = channel_standin.strip()
-                        
-                for s,d in {self.get_dst_prefix():app_name + ".app",
-                                        "lsl_guide.html":"Linden Scripting Language Guide.html",
-                                        "releasenotes.txt":"Release Notes.txt",
-                                        "installers/darwin/mac_image_hidden":".hidden",
-                                        "installers/darwin/mac_image_background.tga":"background.tga",
-                                        "installers/darwin/mac_image_DS_Store":".DS_Store"}.items():
-                        print "Copying to dmg", s, d
-                        self.copy_action(self.src_path_of(s), os.path.join(volpath, d))
-
-                # Unmount the image
-                self.run_command('hdiutil detach -force "' + devfile + '"')
-
-                print "Converting temp disk image to final disk image"
-                self.run_command('hdiutil convert "%(sparse)s" -format UDZO -imagekey zlib-level=9 -o "%(final)s"' % {'sparse':sparsename, 'final':finalname})
-                # get rid of the temp file
-                self.remove(sparsename)
+                    self.path("secondlife_firstlook.icns", "secondlife.icns")
+                
+                # Translations
+                self.path("English.lproj")
+                self.path("German.lproj")
+                self.path("Japanese.lproj")
+                self.path("Korean.lproj")
+
+                # SLVoice and vivox lols
+                self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
+                self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
+                self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
+                self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
+                self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
+                self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
+
+                # llkdu dynamic library
+#                self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
+                
+                #libfmodwrapper.dylib
+                self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+                
+                # our apps
+#                self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
+                self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app")
+
+                # command line arguments for connecting to the proper grid
+                self.put_in_file(self.flags_list(), 'arguments.txt')
+
+                self.end_prefix("Resources")
+
+            self.end_prefix("Contents")
+
+        # NOTE: the -S argument to strip causes it to keep enough info for
+        # annotated backtraces (i.e. function names in the crash log).  'strip' with no
+        # arguments yields a slightly smaller binary but makes crash logs mostly useless.
+        # This may be desirable for the final release.  Or not.
+        if ("package" in self.args['actions'] or 
+            "unpacked" in self.args['actions']):
+            self.run_command('strip -S "%(viewer_binary)s"' %
+                             { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
+
+
+    def package_finish(self):
+        channel_standin = 'Second Life'  # hah, our default channel is not usable on its own
+        if not self.default_channel():
+            channel_standin = self.channel()
+
+        imagename="SecondLife_" + '_'.join(self.args['version'])
+
+        # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning.
+        #  If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick.
+
+        volname="Second Life Installer"  # DO NOT CHANGE without understanding comment above
+
+        if self.default_channel():
+            if not self.default_grid():
+                # beta case
+                imagename = imagename + '_' + self.args['grid'].upper()
+        else:
+            # first look, etc
+            imagename = imagename + '_' + self.channel_oneword().upper()
+
+        sparsename = imagename + ".sparseimage"
+        finalname = imagename + ".dmg"
+        # make sure we don't have stale files laying about
+        self.remove(sparsename, finalname)
+
+        self.run_command('hdiutil create "%(sparse)s" -volname "%(vol)s" -fs HFS+ -type SPARSE -megabytes 300 -layout SPUD' % {
+                'sparse':sparsename,
+                'vol':volname})
+
+        # mount the image and get the name of the mount point and device node
+        hdi_output = self.run_command('hdiutil attach -private "' + sparsename + '"')
+        devfile = re.search("/dev/disk([0-9]+)[^s]", hdi_output).group(0).strip()
+        volpath = re.search('HFS\s+(.+)', hdi_output).group(1).strip()
+
+        # Copy everything in to the mounted .dmg
+
+        if self.default_channel() and not self.default_grid():
+            app_name = "Second Life " + self.args['grid']
+        else:
+            app_name = channel_standin.strip()
+
+        # Hack:
+        # Because there is no easy way to coerce the Finder into positioning
+        # the app bundle in the same place with different app names, we are
+        # adding multiple .DS_Store files to svn. There is one for release,
+        # one for release candidate and one for first look. Any other channels
+        # will use the release .DS_Store, and will look broken.
+        # - Ambroff 2008-08-20
+        dmg_template = os.path.join(
+            'installers', 
+            'darwin',
+            '%s-dmg' % "".join(self.channel_unique().split()).lower())
+
+        if not os.path.exists (self.src_path_of(dmg_template)):
+            dmg_template = os.path.join ('installers', 'darwin', 'release-dmg')
+
+        # To reinstate the linden scripting guide, add this to the list below:
+        #            "lsl_guide.html":"Linden Scripting Language Guide.html",
+
+        for s,d in {self.get_dst_prefix():app_name + ".app",
+                    os.path.join(dmg_template, "_VolumeIcon.icns"): ".VolumeIcon.icns",
+                    os.path.join(dmg_template, "background.jpg"): "background.jpg",
+                    os.path.join(dmg_template, "_DS_Store"): ".DS_Store"}.items():
+            print "Copying to dmg", s, d
+            self.copy_action(self.src_path_of(s), os.path.join(volpath, d))
+
+        # Hide the background image, DS_Store file, and volume icon file (set their "visible" bit)
+        self.run_command('SetFile -a V "' + os.path.join(volpath, ".VolumeIcon.icns") + '"')
+        self.run_command('SetFile -a V "' + os.path.join(volpath, "background.jpg") + '"')
+        self.run_command('SetFile -a V "' + os.path.join(volpath, ".DS_Store") + '"')
+
+        # Create the alias file (which is a resource file) from the .r
+        self.run_command('rez "' + self.src_path_of("installers/darwin/release-dmg/Applications-alias.r") + '" -o "' + os.path.join(volpath, "Applications") + '"')
+
+        # Set the alias file's alias and custom icon bits
+        self.run_command('SetFile -a AC "' + os.path.join(volpath, "Applications") + '"')
+
+        # Set the disk image root's custom icon bit
+        self.run_command('SetFile -a C "' + volpath + '"')
+
+        # Unmount the image
+        self.run_command('hdiutil detach -force "' + devfile + '"')
+
+        print "Converting temp disk image to final disk image"
+        self.run_command('hdiutil convert "%(sparse)s" -format UDZO -imagekey zlib-level=9 -o "%(final)s"' % {'sparse':sparsename, 'final':finalname})
+        # get rid of the temp file
+        self.package_file = finalname
+        self.remove(sparsename)
 
 class LinuxManifest(ViewerManifest):
-        def construct(self):
-                super(LinuxManifest, self).construct()
-                self.path("licenses-linux.txt","licenses.txt")
-                self.path("res/ll_icon.png","secondlife_icon.png")
-                if self.prefix("linux_tools", ""):
-                        self.path("client-readme.txt","README-linux.txt")
-                        self.path("client-readme-voice.txt","README-linux-voice.txt")
-                        self.path("wrapper.sh","secondlife")
-                        self.path("handle_secondlifeprotocol.sh")
-                        self.path("register_secondlifeprotocol.sh")
-                        self.end_prefix("linux_tools")
-
-                # Create an appropriate gridargs.dat for this package, denoting required grid.
-                self.put_in_file(self.flags_list(), 'gridargs.dat')
-
-
-        def package_finish(self):
-                # stripping all the libs removes a few megabytes from the end-user package
-                for s,d in self.file_list:
-                        if re.search("lib/lib.+\.so.*", d):
-                                self.run_command('strip -S %s' % d)
-                        if re.search("app_settings/mozilla-runtime-.*/lib.+\.so.*", d):
-                                self.run_command('strip %s' % d)
-
-                if(self.args.has_key('installer_name')):
-                        installer_name = self.args['installer_name']
-                else:
-                        installer_name = '_'.join('SecondLife_', self.args.get('arch'), *self.args['version'])
-                        if self.default_channel():
-                                if not self.default_grid():
-                                        installer_name += '_' + self.args['grid'].upper()
-                        else:
-                                installer_name += '_' + self.channel_oneword().upper()
+    def construct(self):
+        super(LinuxManifest, self).construct()
+        self.path("licenses-linux.txt","licenses.txt")
+        self.path("res/ll_icon.png","secondlife_icon.png")
+        if self.prefix("linux_tools", dst=""):
+            self.path("client-readme.txt","README-linux.txt")
+            self.path("client-readme-voice.txt","README-linux-voice.txt")
+            self.path("wrapper.sh","secondlife")
+            self.path("handle_secondlifeprotocol.sh")
+            self.path("register_secondlifeprotocol.sh")
+            self.end_prefix("linux_tools")
+
+        # Create an appropriate gridargs.dat for this package, denoting required grid.
+        self.put_in_file(self.flags_list(), 'gridargs.dat')
+
+
+    def package_finish(self):
+        # stripping all the libs removes a few megabytes from the end-user package
+        for s,d in self.file_list:
+            if re.search("lib/lib.+\.so.*", d):
+                self.run_command('strip -S %s' % d)
+            if re.search("app_settings/mozilla-runtime-.*/lib.+\.so.*", d):
+                self.run_command('strip %s' % d)
+
+        if 'installer_name' in self.args:
+            installer_name = self.args['installer_name']
+        else:
+            installer_name_components = ['SecondLife_', self.args.get('arch')]
+            installer_name_components.extend(self.args['version'])
+            installer_name = "_".join(installer_name_components)
+            if self.default_channel():
+                if not self.default_grid():
+                    installer_name += '_' + self.args['grid'].upper()
+            else:
+                installer_name += '_' + self.channel_oneword().upper()
 
                 # Fix access permissions
                 self.run_command("""
-                find %(dst)s -type d | xargs chmod 755;
-                find %(dst)s -type f -perm 0700 | xargs chmod 0755;
-                find %(dst)s -type f -perm 0500 | xargs chmod 0555;
-                find %(dst)s -type f -perm 0600 | xargs chmod 0644;
-                find %(dst)s -type f -perm 0400 | xargs chmod 0444;
+                find %(dst)s -type d | xargs --no-run-if-empty chmod 755;
+                find %(dst)s -type f -perm 0700 | xargs --no-run-if-empty chmod 0755;
+                find %(dst)s -type f -perm 0500 | xargs --no-run-if-empty chmod 0555;
+                find %(dst)s -type f -perm 0600 | xargs --no-run-if-empty chmod 0644;
+                find %(dst)s -type f -perm 0400 | xargs --no-run-if-empty chmod 0444;
                 true""" %  {'dst':self.get_dst_prefix() })
-
-                # temporarily move directory tree so that it has the right name in the tarfile
-                self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
-                # --numeric-owner hides the username of the builder for security etc.
-                self.run_command('tar -C %(dir)s --numeric-owner -cjf %(inst_path)s.tar.bz2 %(inst_name)s' % {'dir':self.get_src_prefix(), 'inst_name': installer_name, 'inst_path':self.src_path_of(installer_name)})
-                self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
+        self.package_file = installer_name + '.tar.bz2'
+
+        # temporarily move directory tree so that it has the right
+        # name in the tarfile
+        self.run_command("mv %(dst)s %(inst)s" % {
+            'dst': self.get_dst_prefix(),
+            'inst': self.build_path_of(installer_name)})
+        try:
+            # --numeric-owner hides the username of the builder for
+            # security etc.
+            self.run_command('tar -C %(dir)s --numeric-owner -cjf '
+                             '%(inst_path)s.tar.bz2 %(inst_name)s' % {
+                'dir': self.get_build_prefix(),
+                'inst_name': installer_name,
+                'inst_path':self.build_path_of(installer_name)})
+        finally:
+            self.run_command("mv %(inst)s %(dst)s" % {
+                'dst': self.get_dst_prefix(),
+                'inst': self.build_path_of(installer_name)})
 
 class Linux_i686Manifest(LinuxManifest):
-        def construct(self):
-                super(Linux_i686Manifest, self).construct()
-                self.path("secondlife-i686-bin-stripped","bin/do-not-directly-run-secondlife-bin")
-#                self.path("../linux_crash_logger/linux-crash-logger-i686-bin-stripped","linux-crash-logger.bin")
-                self.path("linux_tools/launch_url.sh","launch_url.sh")
-                if self.prefix("res-sdl"):
-                        self.path("*")
-                        # recurse
-                        self.end_prefix("res-sdl")
-
-                self.path("featuretable_linux.txt")
-                #self.path("secondlife-i686.supp")
-
-                self.path("app_settings/mozilla-runtime-linux-i686")
-
-                if self.prefix("../../libraries/i686-linux/lib_release_client", "lib"):
-#                        self.path("libkdu_v42R.so")
-                        self.path("libfmod-3.75.so")
-                        self.path("libapr-1.so.0")
-                        self.path("libaprutil-1.so.0")
-                        self.path("libdb-4.2.so")
-                        self.path("libcrypto.so.0.9.7")
-                        self.path("libssl.so.0.9.7")
-                        self.path("libexpat.so.1")
-#                        self.path("libstdc++.so.6")
-                        self.path("libuuid.so", "libuuid.so.1")
-                        self.path("libSDL-1.2.so.0")
-                        self.path("libELFIO.so")
-                        self.path("libopenjpeg.so.2")
-                        #self.path("libtcmalloc.so.0") - bugged
-                        #self.path("libstacktrace.so.0") - probably bugged
-#                        self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
-                        self.end_prefix("lib")
-
-                # Vivox runtimes
-                if self.prefix(src="vivox-runtime/i686-linux", dst=""):
-                        self.path("SLVoice")
-                        self.end_prefix()
-                if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
-                        self.path("libopenal.so.1")
-                        self.path("libortp.so")
-                        self.path("libvivoxsdk.so")
-                        self.path("libalut.so")
-                        self.end_prefix("lib")
+    def construct(self):
+        super(Linux_i686Manifest, self).construct()
+        self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin")
+#        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
+        self.path("linux_tools/launch_url.sh","launch_url.sh")
+        if self.prefix("res-sdl"):
+            self.path("*")
+            # recurse
+            self.end_prefix("res-sdl")
+
+        self.path("featuretable_linux.txt")
+        #self.path("secondlife-i686.supp")
+
+        self.path("app_settings/mozilla-runtime-linux-i686")
+
+        if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
+#            self.path("libkdu_v42R.so")
+            self.path("libfmod-3.75.so")
+            self.path("libapr-1.so.0")
+            self.path("libaprutil-1.so.0")
+            self.path("libdb-4.2.so")
+            self.path("libcrypto.so.0.9.7")
+            self.path("libssl.so.0.9.7")
+#            self.path("libstdc++.so.6")
+            self.path("libuuid.so", "libuuid.so.1")
+            self.path("libSDL-1.2.so.0")
+            self.path("libELFIO.so")
+            self.path("libopenjpeg.so.2")
+            #self.path("libtcmalloc.so.0") - bugged
+            #self.path("libstacktrace.so.0") - probably bugged
+#            self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
+            self.end_prefix("lib")
+
+            # Vivox runtimes
+            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
+                    self.path("SLVoice")
+                    self.end_prefix()
+            if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
+                    self.path("libopenal.so.1")
+                    self.path("libortp.so")
+                    self.path("libvivoxsdk.so")
+                    self.path("libalut.so")
+                    self.end_prefix("lib")
 
 class Linux_x86_64Manifest(LinuxManifest):
-        def construct(self):
-                super(Linux_x86_64Manifest, self).construct()
-                self.path("secondlife-x86_64-bin-stripped","bin/do-not-directly-run-secondlife-bin")
-#                self.path("../linux_crash_logger/linux-crash-logger-x86_64-bin-stripped","linux-crash-logger.bin")
-                self.path("linux_tools/launch_url.sh","launch_url.sh")
-                if self.prefix("res-sdl"):
-                        self.path("*")
-                        # recurse
-                        self.end_prefix("res-sdl")
-
-                self.path("featuretable_linux.txt")
-                self.path("secondlife-i686.supp")
+    def construct(self):
+        super(Linux_x86_64Manifest, self).construct()
+        self.path("secondlife-stripped","bin/do-not-directly-run-secondlife-bin")
+#        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
+        self.path("linux_tools/launch_url.sh","launch_url.sh")
+        if self.prefix("res-sdl"):
+            self.path("*")
+            # recurse
+            self.end_prefix("res-sdl")
+
+        self.path("featuretable_linux.txt")
+        self.path("secondlife-i686.supp")
 
 if __name__ == "__main__":
-        main(srctree=viewer_dir, dsttree=os.path.join(viewer_dir, "packaged"))
+    main()
diff --git a/linden/indra/test/CMakeLists.txt b/linden/indra/test/CMakeLists.txt
new file mode 100644
index 0000000..3d085a7
--- /dev/null
+++ b/linden/indra/test/CMakeLists.txt
@@ -0,0 +1,153 @@
+# -*- cmake -*-
+
+project (test)
+
+include(00-Common)
+include(LLCommon)
+include(LLDatabase)
+include(LLInventory)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLXML)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLDATABASE_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLINVENTORY_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(test_SOURCE_FILES
+    common.cpp
+    inventory.cpp
+    io.cpp
+    llapp_tut.cpp
+    llbase64_tut.cpp
+    llblowfish_tut.cpp
+    llbuffer_tut.cpp
+    lldate_tut.cpp
+    llerror_tut.cpp
+    llhost_tut.cpp
+    llhttpdate_tut.cpp
+    llhttpclient_tut.cpp
+    llhttpnode_tut.cpp
+    llinventoryparcel_tut.cpp
+    lliohttpserver_tut.cpp
+    lljoint_tut.cpp
+    llmime_tut.cpp
+    llmessageconfig_tut.cpp
+    llnamevalue_tut.cpp
+    llpermissions_tut.cpp
+    llpipeutil.cpp
+    llquaternion_tut.cpp
+    llrandom_tut.cpp
+    llsaleinfo_tut.cpp
+    llsdmessagebuilder_tut.cpp
+    llsdmessagereader_tut.cpp
+    llsd_new_tut.cpp
+    llsdserialize_tut.cpp
+    llsdutil_tut.cpp
+    llservicebuilder_tut.cpp
+    llstreamtools_tut.cpp
+    llstring_tut.cpp
+    lltemplatemessagebuilder_tut.cpp
+    lltiming_tut.cpp
+    lltut.cpp
+    lluri_tut.cpp
+    lluuidhashmap_tut.cpp
+    llxfer_tut.cpp
+    math.cpp
+    message_tut.cpp
+    reflection_tut.cpp
+    test.cpp
+    v2math_tut.cpp
+    v3color_tut.cpp
+    v3dmath_tut.cpp
+    v3math_tut.cpp
+    v4color_tut.cpp
+    v4coloru_tut.cpp
+    v4math_tut.cpp
+    )
+
+set(test_HEADER_FILES
+    CMakeLists.txt
+
+    llpipeutil.h
+    llsdtraits.h
+    lltut.h
+    )
+
+if (NOT WINDOWS)
+  list(APPEND test_SOURCE_FILES
+       llmessagetemplateparser_tut.cpp
+       )
+endif (NOT WINDOWS)
+
+set_source_files_properties(${test_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND test_SOURC_FILES ${test_HEADER_FILES})
+
+add_executable(test ${test_SOURCE_FILES})
+
+target_link_libraries(test
+    ${LLDATABASE_LIBRARIES}
+    ${LLINVENTORY_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    ${PTHREAD_LIBRARY}
+    ${WINDOWS_LIBRARIES}
+    )
+
+if (WINDOWS)
+  set_target_properties(test
+          PROPERTIES 
+          LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+          LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT"
+          )
+endif (WINDOWS)
+
+get_target_property(TEST_EXE test LOCATION)
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt
+  COMMAND ${TEST_EXE}
+  ARGS
+    --output=${CMAKE_CURRENT_BINARY_DIR}/cpp_test_results.txt
+    --touch=${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt
+  DEPENDS test
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  COMMENT "C++ unit tests"
+  )
+
+set(test_results ${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt)
+
+if (EXISTS /etc/debian_version_FAIL)
+  # The Python tests have all kinds of wacky non-portable assumptions
+  # built in.
+
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/py_tests_ok.txt
+    COMMAND ${PYTHON_EXECUTABLE}
+    ARGS
+      ${CMAKE_CURRENT_SOURCE_DIR}/test.py
+      --mode=static
+      --output=${CMAKE_CURRENT_BINARY_DIR}/py_test_results.txt
+      --touch=${CMAKE_CURRENT_BINARY_DIR}/py_tests_ok.txt
+    DEPENDS test.py
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Python unit tests"
+    )
+
+  list(APPEND test_results ${CMAKE_CURRENT_BINARY_DIR}/py_tests_ok.txt)
+endif (EXISTS /etc/debian_version_FAIL)
+    
+add_custom_target(tests_ok ALL DEPENDS ${test_results})
diff --git a/linden/indra/test/MacTester.xcodeproj/project.pbxproj b/linden/indra/test/MacTester.xcodeproj/project.pbxproj
deleted file mode 100644
index 1aad040..0000000
--- a/linden/indra/test/MacTester.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,1350 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		FD5DF9A109C0A4F5007E3F78 /* third party libs */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = FD5DF9A209C0A51D007E3F78 /* Build configuration list for PBXAggregateTarget "third party libs" */;
-			buildPhases = (
-				FD5DF9A009C0A4F5007E3F78 /* ShellScript */,
-			);
-			dependencies = (
-			);
-			name = "third party libs";
-			productName = "third party libs";
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		386C3F070A14C85000CF4511 /* lliosocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 386C3F050A14C85000CF4511 /* lliosocket.cpp */; };
-		386C3F080A14C85000CF4511 /* lliosocket.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 386C3F060A14C85000CF4511 /* lliosocket.h */; };
-		389CFB460A0B69C700EE2094 /* llfile.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 389CFB440A0B69C700EE2094 /* llfile.h */; };
-		389CFB470A0B69C700EE2094 /* llfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 389CFB450A0B69C700EE2094 /* llfile.cpp */; };
-		38A8BEAB0A18A2BC00814862 /* metaclass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38A8BEAA0A18A2BC00814862 /* metaclass.cpp */; };
-		38A8BF630A18C31D00814862 /* metaproperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38A8BF620A18C31D00814862 /* metaproperty.cpp */; };
-		38A8BF6A0A18C38800814862 /* reflective.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 38A8BF690A18C38800814862 /* reflective.h */; };
-		38A8BF750A18C42900814862 /* reflective.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38A8BF740A18C42900814862 /* reflective.cpp */; };
-		91469E810B4486F20009E8F9 /* llmime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91469E7F0B4486F20009E8F9 /* llmime.cpp */; };
-		91469E820B4486F20009E8F9 /* llmime.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 91469E800B4486F20009E8F9 /* llmime.h */; };
-		91469E840B44870B0009E8F9 /* llmime_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91469E830B44870B0009E8F9 /* llmime_tut.cpp */; };
-		91469E8D0B4489420009E8F9 /* llquaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91469E8B0B4489420009E8F9 /* llquaternion.cpp */; };
-		91469E8E0B4489420009E8F9 /* llquaternion.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 91469E8C0B4489420009E8F9 /* llquaternion.h */; };
-		DA306B450ACD9E8B008D9B2F /* llsdutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B430ACD9E8B008D9B2F /* llsdutil.cpp */; };
-		DA306B460ACD9E8B008D9B2F /* llstreamtools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B440ACD9E8B008D9B2F /* llstreamtools.cpp */; };
-		DA306B490ACD9EBC008D9B2F /* llapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B480ACD9EBC008D9B2F /* llapp.cpp */; };
-		DA306B4E0ACD9EFD008D9B2F /* llcommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B4B0ACD9EFD008D9B2F /* llcommon.cpp */; };
-		DA306B4F0ACD9EFD008D9B2F /* llerrorthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B4C0ACD9EFD008D9B2F /* llerrorthread.cpp */; };
-		DA306B500ACD9EFD008D9B2F /* llrun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B4D0ACD9EFD008D9B2F /* llrun.cpp */; };
-		DA306B560ACD9F3F008D9B2F /* llapp_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B520ACD9F3F008D9B2F /* llapp_tut.cpp */; };
-		DA306B570ACD9F3F008D9B2F /* llhttpclient_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B530ACD9F3F008D9B2F /* llhttpclient_tut.cpp */; };
-		DA306B580ACD9F3F008D9B2F /* lltiming_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B540ACD9F3F008D9B2F /* lltiming_tut.cpp */; };
-		DA306B590ACD9F3F008D9B2F /* lluri_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B550ACD9F3F008D9B2F /* lluri_tut.cpp */; };
-		DA306B5C0ACD9F6F008D9B2F /* llhttpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B5B0ACD9F6F008D9B2F /* llhttpclient.cpp */; };
-		DA4D18170B567E0D0049C10F /* llformat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4D18150B567E0D0049C10F /* llformat.cpp */; };
-		DA4D18180B567E0D0049C10F /* llformat.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA4D18160B567E0D0049C10F /* llformat.h */; };
-		DA4D182D0B567ED70049C10F /* llerrorcontrol.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA4D182B0B567ED70049C10F /* llerrorcontrol.h */; };
-		DA9C40480B540D8A00DD6F44 /* lllivefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA9C40460B540D8A00DD6F44 /* lllivefile.cpp */; };
-		DAD1C4CC0AE2C78C0054574C /* stats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAD1C4CB0AE2C78C0054574C /* stats.cpp */; };
-		FD15584D0A06BE2E00DE9AE5 /* io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15584C0A06BE2E00DE9AE5 /* io.cpp */; };
-		FD15585C0A06BEB000DE9AE5 /* llbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558500A06BEB000DE9AE5 /* llbuffer.cpp */; };
-		FD15585E0A06BEB000DE9AE5 /* llbufferstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558520A06BEB000DE9AE5 /* llbufferstream.cpp */; };
-		FD1558600A06BEB000DE9AE5 /* llinstantmessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558540A06BEB000DE9AE5 /* llinstantmessage.cpp */; };
-		FD1558620A06BEB000DE9AE5 /* llioutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558560A06BEB000DE9AE5 /* llioutil.cpp */; };
-		FD1558640A06BEB000DE9AE5 /* llsdrpcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558580A06BEB000DE9AE5 /* llsdrpcclient.cpp */; };
-		FD1558660A06BEB000DE9AE5 /* llsdrpcserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15585A0A06BEB000DE9AE5 /* llsdrpcserver.cpp */; };
-		FD15587F0A06BFAB00DE9AE5 /* llfiltersd2xmlrpc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558770A06BFAB00DE9AE5 /* llfiltersd2xmlrpc.cpp */; };
-		FD1558810A06BFAB00DE9AE5 /* lliohttpserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558790A06BFAB00DE9AE5 /* lliohttpserver.cpp */; };
-		FD1558830A06BFAB00DE9AE5 /* lliopipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15587B0A06BFAB00DE9AE5 /* lliopipe.cpp */; };
-		FD1558850A06BFAB00DE9AE5 /* llpumpio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15587D0A06BFAB00DE9AE5 /* llpumpio.cpp */; };
-		FD15588A0A06BFE400DE9AE5 /* llchainio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558880A06BFE400DE9AE5 /* llchainio.cpp */; };
-		FD15588E0A06BFF100DE9AE5 /* llmemorystream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15588C0A06BFF100DE9AE5 /* llmemorystream.cpp */; };
-		FD1558930A06C01400DE9AE5 /* llframetimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558910A06C01400DE9AE5 /* llframetimer.cpp */; };
-		FD1558970A06C05100DE9AE5 /* llurlrequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558950A06C05100DE9AE5 /* llurlrequest.cpp */; };
-		FD15589C0A06C08A00DE9AE5 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FD15589B0A06C08A00DE9AE5 /* libcurl.dylib */; };
-		FD1558A70A06C0D000DE9AE5 /* libxmlrpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1558A60A06C0D000DE9AE5 /* libxmlrpc.a */; };
-		FD1558AA0A06C14E00DE9AE5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1558A90A06C14E00DE9AE5 /* libiconv.dylib */; };
-		FD155EF40A08F0B300DE9AE5 /* m3math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155EF00A08F0B300DE9AE5 /* m3math.cpp */; };
-		FD155EF60A08F0B300DE9AE5 /* m4math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155EF20A08F0B300DE9AE5 /* m4math.cpp */; };
-		FD155EFA0A08F0DE00DE9AE5 /* llstringtable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155EF80A08F0DE00DE9AE5 /* llstringtable.cpp */; };
-		FD155F030A08F36A00DE9AE5 /* llmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F010A08F36A00DE9AE5 /* llmemory.cpp */; };
-		FD155F0B0A08F60B00DE9AE5 /* llnullcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F090A08F60B00DE9AE5 /* llnullcipher.cpp */; };
-		FD155F0C0A08F60B00DE9AE5 /* llxorcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F0A0A08F60B00DE9AE5 /* llxorcipher.cpp */; };
-		FD155F100A08F63200DE9AE5 /* message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F0E0A08F63200DE9AE5 /* message.cpp */; };
-		FD155F1F0A08F9D200DE9AE5 /* llpacketring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F1D0A08F9D200DE9AE5 /* llpacketring.cpp */; };
-		FD155F240A08F9F600DE9AE5 /* v3math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F220A08F9F600DE9AE5 /* v3math.cpp */; };
-		FD155F2A0A08FA0F00DE9AE5 /* llpacketbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F280A08FA0F00DE9AE5 /* llpacketbuffer.cpp */; };
-		FD155F2F0A08FA9800DE9AE5 /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F2D0A08FA9800DE9AE5 /* net.cpp */; };
-		FD155F340A08FAD900DE9AE5 /* llxfermanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F320A08FAD900DE9AE5 /* llxfermanager.cpp */; };
-		FD155F3F0A08FAF300DE9AE5 /* llxfer_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F370A08FAF300DE9AE5 /* llxfer_file.cpp */; };
-		FD155F410A08FAF300DE9AE5 /* llxfer_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F390A08FAF300DE9AE5 /* llxfer_mem.cpp */; };
-		FD155F430A08FAF300DE9AE5 /* llxfer_vfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F3B0A08FAF300DE9AE5 /* llxfer_vfile.cpp */; };
-		FD155F450A08FAF300DE9AE5 /* llxfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F3D0A08FAF300DE9AE5 /* llxfer.cpp */; };
-		FD155F5D0A08FB5100DE9AE5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD155F480A08FB5100DE9AE5 /* Carbon.framework */; };
-		FD155F610A08FD5900DE9AE5 /* llfasttimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */; };
-		FD155F670A08FD9100DE9AE5 /* message_string_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F660A08FD9100DE9AE5 /* message_string_table.cpp */; };
-		FD23FEB90B4340F3007A29CA /* llhttpnode_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEB70B4340F3007A29CA /* llhttpnode_tut.cpp */; };
-		FD23FEBA0B4340F3007A29CA /* lluserrelations_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEB80B4340F3007A29CA /* lluserrelations_tut.cpp */; };
-		FD23FEBE0B43410C007A29CA /* lluserrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEBC0B43410C007A29CA /* lluserrelations.cpp */; };
-		FD23FEBF0B43410C007A29CA /* lluserrelations.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FD23FEBD0B43410C007A29CA /* lluserrelations.h */; };
-		FD23FEC60B4341E2007A29CA /* llerror_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEC50B4341E2007A29CA /* llerror_tut.cpp */; };
-		FD396CDD0A1D37DF005DCB1F /* lltut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD396CDC0A1D37DF005DCB1F /* lltut.cpp */; };
-		FD396D160A1DFB4B005DCB1F /* reflection_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 386A940D0A0B5F60001DE10D /* reflection_tut.cpp */; };
-		FD506A0609FEB58900E297C2 /* llsdserialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD506A0409FEB58900E297C2 /* llsdserialize.cpp */; };
-		FD506A2509FEB79700E297C2 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD506A2409FEB79700E297C2 /* libaprutil-1.a */; };
-		FD506A2F09FEC37900E297C2 /* llsdserialize_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD506A2D09FEC37900E297C2 /* llsdserialize_tut.cpp */; };
-		FD506AA909FFC70100E297C2 /* llsdserialize_xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD506AA709FFC70100E297C2 /* llsdserialize_xml.cpp */; };
-		FD506ADB09FFE09700E297C2 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD506ADA09FFE09700E297C2 /* libexpat.a */; };
-		FD5DF87B09C0A0FB007E3F78 /* test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DF87A09C0A0FB007E3F78 /* test.cpp */; };
-		FD5DF9B609C0A571007E3F78 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD5DF9B509C0A571007E3F78 /* libapr-1.a */; };
-		FD5DF9F609C0E20E007E3F78 /* llsd_new_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DF9F409C0E20E007E3F78 /* llsd_new_tut.cpp */; };
-		FD5DFA9109C1DF3E007E3F78 /* lldate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9009C1DF3E007E3F78 /* lldate.cpp */; };
-		FD5DFA9309C1DF4E007E3F78 /* lluuid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9209C1DF4E007E3F78 /* lluuid.cpp */; };
-		FD5DFA9909C1DFB7007E3F78 /* lluri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9709C1DFB7007E3F78 /* lluri.cpp */; };
-		FD5DFAA609C1E01D007E3F78 /* llmd5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAA509C1E01D007E3F78 /* llmd5.cpp */; };
-		FD5DFAA909C1E056007E3F78 /* llerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAA809C1E056007E3F78 /* llerror.cpp */; };
-		FD5DFAAC09C1E09F007E3F78 /* llrand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAAB09C1E09F007E3F78 /* llrand.cpp */; };
-		FD5DFAAF09C1E101007E3F78 /* llapr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAAE09C1E101007E3F78 /* llapr.cpp */; };
-		FD5DFAB109C1E110007E3F78 /* llstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAB009C1E110007E3F78 /* llstring.cpp */; };
-		FD5DFAB309C1E11A007E3F78 /* lltimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAB209C1E11A007E3F78 /* lltimer.cpp */; };
-		FD5DFAB909C1E13A007E3F78 /* u64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAB809C1E13A007E3F78 /* u64.cpp */; };
-		FD7325940A08E7A60072A37B /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325930A08E7A60072A37B /* common.cpp */; };
-		FD7325970A08E8260072A37B /* math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325960A08E8260072A37B /* math.cpp */; };
-		FD73259A0A08E8420072A37B /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325990A08E8420072A37B /* inventory.cpp */; };
-		FD73259F0A08E8A00072A37B /* llinventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD73259D0A08E8A00072A37B /* llinventory.cpp */; };
-		FD7325A60A08E8F00072A37B /* llxmlnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325A40A08E8F00072A37B /* llxmlnode.cpp */; };
-		FD7325AC0A08E9330072A37B /* llpermissions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325AA0A08E9330072A37B /* llpermissions.cpp */; };
-		FD7325B00A08E95F0072A37B /* llsaleinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325AE0A08E95F0072A37B /* llsaleinfo.cpp */; };
-		FD7325BF0A08EA220072A37B /* lldir_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325B90A08EA220072A37B /* lldir_mac.cpp */; };
-		FD7325C10A08EA220072A37B /* lldir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325BB0A08EA220072A37B /* lldir.cpp */; };
-		FD7325C30A08EA220072A37B /* llvfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325BD0A08EA220072A37B /* llvfile.cpp */; };
-		FD7325CA0A08EB370072A37B /* llcircuit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325C60A08EB370072A37B /* llcircuit.cpp */; };
-		FD7325CC0A08EB370072A37B /* message_prehash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325C80A08EB370072A37B /* message_prehash.cpp */; };
-		FD7325D30A08EB590072A37B /* llthrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325D10A08EB590072A37B /* llthrottle.cpp */; };
-		FD7325D80A08EB6B0072A37B /* lltransfermanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325D60A08EB6B0072A37B /* lltransfermanager.cpp */; };
-		FD7325E30A08EB970072A37B /* lltransfersourceasset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325DB0A08EB970072A37B /* lltransfersourceasset.cpp */; };
-		FD7325E50A08EB970072A37B /* lltransfersourcefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325DD0A08EB970072A37B /* lltransfersourcefile.cpp */; };
-		FD7325E70A08EB970072A37B /* lltransfertargetfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325DF0A08EB970072A37B /* lltransfertargetfile.cpp */; };
-		FD7325E90A08EB970072A37B /* lltransfertargetvfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325E10A08EB970072A37B /* lltransfertargetvfile.cpp */; };
-		FD7325EE0A08EBBF0072A37B /* llqueuedthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325EC0A08EBBF0072A37B /* llqueuedthread.cpp */; };
-		FD7325F20A08EBD20072A37B /* llvfsthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325F00A08EBD20072A37B /* llvfsthread.cpp */; };
-		FD7325F70A08EBE40072A37B /* llvfs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325F50A08EBE40072A37B /* llvfs.cpp */; };
-		FD7325FC0A08EC140072A37B /* llthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325FA0A08EC140072A37B /* llthread.cpp */; };
-		FD7326030A08EC490072A37B /* llassetstorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7326010A08EC490072A37B /* llassetstorage.cpp */; };
-		FD7326070A08EC5B0072A37B /* llassettype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7326050A08EC5B0072A37B /* llassettype.cpp */; };
-		FD73260E0A08ECB70072A37B /* lldatapacker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD73260C0A08ECB70072A37B /* lldatapacker.cpp */; };
-		FD7326130A08ECD90072A37B /* llhost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7326110A08ECD90072A37B /* llhost.cpp */; };
-		FD73261C0A08ED580072A37B /* llnamevalue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD73261A0A08ED580072A37B /* llnamevalue.cpp */; };
-		FD9996A30A1C15B10057C816 /* llsdhttpserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD9996A10A1C15AD0057C816 /* llsdhttpserver.cpp */; };
-		FD9996D70A1CA7570057C816 /* llpipeutil.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FD9996D50A1CA7570057C816 /* llpipeutil.h */; };
-		FD9996D80A1CA7570057C816 /* llpipeutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD9996D60A1CA7570057C816 /* llpipeutil.cpp */; };
-		FDBC106B0AEEC3CA00ED2E62 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FD15589B0A06C08A00DE9AE5 /* libcurl.dylib */; };
-		FDBC106D0AEEC3DA00ED2E62 /* llsd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DF9BE09C0A68F007E3F78 /* llsd.cpp */; };
-		FDBC106F0AEEC3E900ED2E62 /* lluuid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9209C1DF4E007E3F78 /* lluuid.cpp */; };
-		FDBC10710AEEC3F800ED2E62 /* llsdserialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD506A0409FEB58900E297C2 /* llsdserialize.cpp */; };
-		FDBC10720AEEC3F900ED2E62 /* llsdserialize_xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD506AA709FFC70100E297C2 /* llsdserialize_xml.cpp */; };
-		FDBC10740AEEC40F00ED2E62 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD506ADA09FFE09700E297C2 /* libexpat.a */; };
-		FDBC10750AEEC41600ED2E62 /* lldate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9009C1DF3E007E3F78 /* lldate.cpp */; };
-		FDBC10760AEEC41B00ED2E62 /* llmd5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAA509C1E01D007E3F78 /* llmd5.cpp */; };
-		FDBC107B0AEEC43200ED2E62 /* lluri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9709C1DFB7007E3F78 /* lluri.cpp */; };
-		FDBC107E0AEEC45100ED2E62 /* lltimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAB209C1E11A007E3F78 /* lltimer.cpp */; };
-		FDBC107F0AEEC45400ED2E62 /* llfasttimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */; };
-		FDBC10810AEEC46D00ED2E62 /* llapr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAAE09C1E101007E3F78 /* llapr.cpp */; };
-		FDBC10830AEEC47900ED2E62 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD5DF9B509C0A571007E3F78 /* libapr-1.a */; };
-		FDBC10840AEEC47A00ED2E62 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD506A2409FEB79700E297C2 /* libaprutil-1.a */; };
-		FDBC10860AEEC49800ED2E62 /* lliopipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15587B0A06BFAB00DE9AE5 /* lliopipe.cpp */; };
-		FDBC10870AEEC49D00ED2E62 /* llpumpio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15587D0A06BFAB00DE9AE5 /* llpumpio.cpp */; };
-		FDBC10890AEEC4BA00ED2E62 /* llurlrequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558950A06C05100DE9AE5 /* llurlrequest.cpp */; };
-		FDBC108B0AEEC4CD00ED2E62 /* llbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558500A06BEB000DE9AE5 /* llbuffer.cpp */; };
-		FDBC108D0AEEC4E500ED2E62 /* llstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAB009C1E110007E3F78 /* llstring.cpp */; };
-		FDBC108F0AEEC50200ED2E62 /* u64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAB809C1E13A007E3F78 /* u64.cpp */; };
-		FDBC10900AEEC50A00ED2E62 /* llmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F010A08F36A00DE9AE5 /* llmemory.cpp */; };
-		FDBC10990AEEC57D00ED2E62 /* llhttpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B5B0ACD9F6F008D9B2F /* llhttpclient.cpp */; };
-		FDBC109D0AEEC5EE00ED2E62 /* llbufferstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558520A06BEB000DE9AE5 /* llbufferstream.cpp */; };
-		FDBC109F0AEEC5FB00ED2E62 /* llchainio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558880A06BFE400DE9AE5 /* llchainio.cpp */; };
-		FDBC10A10AEEC60F00ED2E62 /* llioutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558560A06BEB000DE9AE5 /* llioutil.cpp */; };
-		FDBC10A30AEEC62400ED2E62 /* llthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7325FA0A08EC140072A37B /* llthread.cpp */; };
-		FDBC10A50AEEC63200ED2E62 /* llerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAA809C1E056007E3F78 /* llerror.cpp */; };
-		FDBC10A70AEEC64100ED2E62 /* llrand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAAB09C1E09F007E3F78 /* llrand.cpp */; };
-		FDBC10A90AEEC65700ED2E62 /* llstreamtools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B440ACD9E8B008D9B2F /* llstreamtools.cpp */; };
-		FDBC10AB0AEEC66100ED2E62 /* testwebclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA01B2040ADE839D00A44198 /* testwebclient.cpp */; };
-		FDBC10AD0AEEC67700ED2E62 /* llframetimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558910A06C01400DE9AE5 /* llframetimer.cpp */; };
-		FDCB2A670AF80D9000C44EBA /* llprocessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDCB2A650AF80D9000C44EBA /* llprocessor.cpp */; };
-		FDCB2A680AF80D9000C44EBA /* llprocessor.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDCB2A660AF80D9000C44EBA /* llprocessor.h */; };
-		FDE7AD540B7D047700C56FE0 /* llcurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDE7AD520B7D047700C56FE0 /* llcurl.cpp */; };
-		FDEC4F5509F7EF7A007BAEEC /* llsd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DF9BE09C0A68F007E3F78 /* llsd.cpp */; };
-		FDFAD4210AFFFCC30048A0C7 /* llhttpnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDFAD41F0AFFFCC30048A0C7 /* llhttpnode.cpp */; };
-		FDFAD4220AFFFCC30048A0C7 /* llhttpnode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDFAD4200AFFFCC30048A0C7 /* llhttpnode.h */; };
-		FDFBED130A1B591B0056E81E /* lliohttpserver_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDFBED120A1B591B0056E81E /* lliohttpserver_tut.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		FD5DF9A809C0A537007E3F78 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = FD5DF9A109C0A4F5007E3F78;
-			remoteInfo = "third party libs";
-		};
-		FDBC10500AEEB7C300ED2E62 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = FD5DF9A109C0A4F5007E3F78;
-			remoteInfo = "third party libs";
-		};
-		FDBC10510AEEB7C300ED2E62 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = FD5DF9A109C0A4F5007E3F78;
-			remoteInfo = "third party libs";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		8DD76F690486A84900D96B5E /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 8;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-				389CFB460A0B69C700EE2094 /* llfile.h in CopyFiles */,
-				386C3F080A14C85000CF4511 /* lliosocket.h in CopyFiles */,
-				38A8BF6A0A18C38800814862 /* reflective.h in CopyFiles */,
-				FD9996D70A1CA7570057C816 /* llpipeutil.h in CopyFiles */,
-				FDCB2A680AF80D9000C44EBA /* llprocessor.h in CopyFiles */,
-				FDFAD4220AFFFCC30048A0C7 /* llhttpnode.h in CopyFiles */,
-				91469E820B4486F20009E8F9 /* llmime.h in CopyFiles */,
-				91469E8E0B4489420009E8F9 /* llquaternion.h in CopyFiles */,
-				FD23FEBF0B43410C007A29CA /* lluserrelations.h in CopyFiles */,
-				DA4D18180B567E0D0049C10F /* llformat.h in CopyFiles */,
-				DA4D182D0B567ED70049C10F /* llerrorcontrol.h in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		383A14F90A1A1C6700F420F7 /* metapropertyt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = metapropertyt.h; sourceTree = "<group>"; };
-		386A940D0A0B5F60001DE10D /* reflection_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reflection_tut.cpp; sourceTree = "<group>"; };
-		386C3F050A14C85000CF4511 /* lliosocket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lliosocket.cpp; sourceTree = "<group>"; };
-		386C3F060A14C85000CF4511 /* lliosocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lliosocket.h; sourceTree = "<group>"; };
-		389CFB440A0B69C700EE2094 /* llfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfile.h; sourceTree = "<group>"; };
-		389CFB450A0B69C700EE2094 /* llfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfile.cpp; sourceTree = "<group>"; };
-		38A8BEAA0A18A2BC00814862 /* metaclass.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = metaclass.cpp; sourceTree = "<group>"; };
-		38A8BF140A18A6FF00814862 /* metaclass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = metaclass.h; sourceTree = "<group>"; };
-		38A8BF620A18C31D00814862 /* metaproperty.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = metaproperty.cpp; sourceTree = "<group>"; };
-		38A8BF690A18C38800814862 /* reflective.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = reflective.h; sourceTree = "<group>"; };
-		38A8BF740A18C42900814862 /* reflective.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reflective.cpp; sourceTree = "<group>"; };
-		8DD76F6C0486A84900D96B5E /* MacTester */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = MacTester; sourceTree = BUILT_PRODUCTS_DIR; };
-		91469E7F0B4486F20009E8F9 /* llmime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmime.cpp; sourceTree = "<group>"; };
-		91469E800B4486F20009E8F9 /* llmime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmime.h; sourceTree = "<group>"; };
-		91469E830B44870B0009E8F9 /* llmime_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmime_tut.cpp; sourceTree = "<group>"; };
-		91469E8B0B4489420009E8F9 /* llquaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llquaternion.cpp; sourceTree = "<group>"; };
-		91469E8C0B4489420009E8F9 /* llquaternion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llquaternion.h; sourceTree = "<group>"; };
-		DA01B1EF0ADE82C400A44198 /* TestWebClient */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestWebClient; sourceTree = BUILT_PRODUCTS_DIR; };
-		DA01B2040ADE839D00A44198 /* testwebclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testwebclient.cpp; sourceTree = "<group>"; };
-		DA306B430ACD9E8B008D9B2F /* llsdutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdutil.cpp; sourceTree = "<group>"; };
-		DA306B440ACD9E8B008D9B2F /* llstreamtools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstreamtools.cpp; sourceTree = "<group>"; };
-		DA306B480ACD9EBC008D9B2F /* llapp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llapp.cpp; sourceTree = "<group>"; };
-		DA306B4B0ACD9EFD008D9B2F /* llcommon.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcommon.cpp; sourceTree = "<group>"; };
-		DA306B4C0ACD9EFD008D9B2F /* llerrorthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerrorthread.cpp; sourceTree = "<group>"; };
-		DA306B4D0ACD9EFD008D9B2F /* llrun.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrun.cpp; sourceTree = "<group>"; };
-		DA306B520ACD9F3F008D9B2F /* llapp_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llapp_tut.cpp; sourceTree = "<group>"; };
-		DA306B530ACD9F3F008D9B2F /* llhttpclient_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpclient_tut.cpp; sourceTree = "<group>"; };
-		DA306B540ACD9F3F008D9B2F /* lltiming_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltiming_tut.cpp; sourceTree = "<group>"; };
-		DA306B550ACD9F3F008D9B2F /* lluri_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluri_tut.cpp; sourceTree = "<group>"; };
-		DA306B5B0ACD9F6F008D9B2F /* llhttpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpclient.cpp; sourceTree = "<group>"; };
-		DA4D18150B567E0D0049C10F /* llformat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llformat.cpp; sourceTree = "<group>"; };
-		DA4D18160B567E0D0049C10F /* llformat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llformat.h; sourceTree = "<group>"; };
-		DA4D182B0B567ED70049C10F /* llerrorcontrol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llerrorcontrol.h; sourceTree = "<group>"; };
-		DA9C40460B540D8A00DD6F44 /* lllivefile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllivefile.cpp; sourceTree = "<group>"; };
-		DA9C40470B540D8A00DD6F44 /* lllivefile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllivefile.h; sourceTree = "<group>"; };
-		DAD1C4CA0AE2C78C0054574C /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stats.h; sourceTree = "<group>"; };
-		DAD1C4CB0AE2C78C0054574C /* stats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stats.cpp; sourceTree = "<group>"; };
-		FD15584C0A06BE2E00DE9AE5 /* io.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = io.cpp; sourceTree = "<group>"; };
-		FD1558500A06BEB000DE9AE5 /* llbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbuffer.cpp; sourceTree = "<group>"; };
-		FD1558510A06BEB000DE9AE5 /* llbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbuffer.h; sourceTree = "<group>"; };
-		FD1558520A06BEB000DE9AE5 /* llbufferstream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbufferstream.cpp; sourceTree = "<group>"; };
-		FD1558530A06BEB000DE9AE5 /* llbufferstream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbufferstream.h; sourceTree = "<group>"; };
-		FD1558540A06BEB000DE9AE5 /* llinstantmessage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinstantmessage.cpp; sourceTree = "<group>"; };
-		FD1558550A06BEB000DE9AE5 /* llinstantmessage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinstantmessage.h; sourceTree = "<group>"; };
-		FD1558560A06BEB000DE9AE5 /* llioutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llioutil.cpp; sourceTree = "<group>"; };
-		FD1558570A06BEB000DE9AE5 /* llioutil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llioutil.h; sourceTree = "<group>"; };
-		FD1558580A06BEB000DE9AE5 /* llsdrpcclient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdrpcclient.cpp; sourceTree = "<group>"; };
-		FD1558590A06BEB000DE9AE5 /* llsdrpcclient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdrpcclient.h; sourceTree = "<group>"; };
-		FD15585A0A06BEB000DE9AE5 /* llsdrpcserver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdrpcserver.cpp; sourceTree = "<group>"; };
-		FD15585B0A06BEB000DE9AE5 /* llsdrpcserver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdrpcserver.h; sourceTree = "<group>"; };
-		FD1558770A06BFAB00DE9AE5 /* llfiltersd2xmlrpc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfiltersd2xmlrpc.cpp; sourceTree = "<group>"; };
-		FD1558780A06BFAB00DE9AE5 /* llfiltersd2xmlrpc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfiltersd2xmlrpc.h; sourceTree = "<group>"; };
-		FD1558790A06BFAB00DE9AE5 /* lliohttpserver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lliohttpserver.cpp; sourceTree = "<group>"; };
-		FD15587A0A06BFAB00DE9AE5 /* lliohttpserver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lliohttpserver.h; sourceTree = "<group>"; };
-		FD15587B0A06BFAB00DE9AE5 /* lliopipe.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lliopipe.cpp; sourceTree = "<group>"; };
-		FD15587C0A06BFAB00DE9AE5 /* lliopipe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lliopipe.h; sourceTree = "<group>"; };
-		FD15587D0A06BFAB00DE9AE5 /* llpumpio.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpumpio.cpp; sourceTree = "<group>"; };
-		FD15587E0A06BFAB00DE9AE5 /* llpumpio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpumpio.h; sourceTree = "<group>"; };
-		FD1558880A06BFE400DE9AE5 /* llchainio.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llchainio.cpp; sourceTree = "<group>"; };
-		FD1558890A06BFE400DE9AE5 /* llchainio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llchainio.h; sourceTree = "<group>"; };
-		FD15588C0A06BFF100DE9AE5 /* llmemorystream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmemorystream.cpp; sourceTree = "<group>"; };
-		FD15588D0A06BFF100DE9AE5 /* llmemorystream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmemorystream.h; sourceTree = "<group>"; };
-		FD1558910A06C01400DE9AE5 /* llframetimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llframetimer.cpp; sourceTree = "<group>"; };
-		FD1558920A06C01400DE9AE5 /* llframetimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llframetimer.h; sourceTree = "<group>"; };
-		FD1558950A06C05100DE9AE5 /* llurlrequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlrequest.cpp; sourceTree = "<group>"; };
-		FD1558960A06C05100DE9AE5 /* llurlrequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlrequest.h; sourceTree = "<group>"; };
-		FD15589B0A06C08A00DE9AE5 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = /usr/lib/libcurl.dylib; sourceTree = "<absolute>"; };
-		FD1558A60A06C0D000DE9AE5 /* libxmlrpc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxmlrpc.a; path = build/Debug/libxmlrpc.a; sourceTree = "<group>"; };
-		FD1558A90A06C14E00DE9AE5 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
-		FD155EF00A08F0B300DE9AE5 /* m3math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = m3math.cpp; sourceTree = "<group>"; };
-		FD155EF10A08F0B300DE9AE5 /* m3math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = m3math.h; sourceTree = "<group>"; };
-		FD155EF20A08F0B300DE9AE5 /* m4math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = m4math.cpp; sourceTree = "<group>"; };
-		FD155EF30A08F0B300DE9AE5 /* m4math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = m4math.h; sourceTree = "<group>"; };
-		FD155EF80A08F0DE00DE9AE5 /* llstringtable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstringtable.cpp; sourceTree = "<group>"; };
-		FD155EF90A08F0DE00DE9AE5 /* llstringtable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstringtable.h; sourceTree = "<group>"; };
-		FD155F010A08F36A00DE9AE5 /* llmemory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmemory.cpp; sourceTree = "<group>"; };
-		FD155F020A08F36A00DE9AE5 /* llmemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmemory.h; sourceTree = "<group>"; };
-		FD155F050A08F37900DE9AE5 /* llcrypto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcrypto.h; sourceTree = "<group>"; };
-		FD155F090A08F60B00DE9AE5 /* llnullcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnullcipher.cpp; sourceTree = "<group>"; };
-		FD155F0A0A08F60B00DE9AE5 /* llxorcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxorcipher.cpp; sourceTree = "<group>"; };
-		FD155F0E0A08F63200DE9AE5 /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; };
-		FD155F1D0A08F9D200DE9AE5 /* llpacketring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpacketring.cpp; sourceTree = "<group>"; };
-		FD155F1E0A08F9D200DE9AE5 /* llpacketring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpacketring.h; sourceTree = "<group>"; };
-		FD155F220A08F9F600DE9AE5 /* v3math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = v3math.cpp; sourceTree = "<group>"; };
-		FD155F230A08F9F600DE9AE5 /* v3math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = v3math.h; sourceTree = "<group>"; };
-		FD155F280A08FA0F00DE9AE5 /* llpacketbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpacketbuffer.cpp; sourceTree = "<group>"; };
-		FD155F290A08FA0F00DE9AE5 /* llpacketbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpacketbuffer.h; sourceTree = "<group>"; };
-		FD155F2D0A08FA9800DE9AE5 /* net.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = net.cpp; sourceTree = "<group>"; };
-		FD155F2E0A08FA9800DE9AE5 /* net.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net.h; sourceTree = "<group>"; };
-		FD155F320A08FAD900DE9AE5 /* llxfermanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfermanager.cpp; sourceTree = "<group>"; };
-		FD155F330A08FAD900DE9AE5 /* llxfermanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfermanager.h; sourceTree = "<group>"; };
-		FD155F370A08FAF300DE9AE5 /* llxfer_file.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer_file.cpp; sourceTree = "<group>"; };
-		FD155F380A08FAF300DE9AE5 /* llxfer_file.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer_file.h; sourceTree = "<group>"; };
-		FD155F390A08FAF300DE9AE5 /* llxfer_mem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer_mem.cpp; sourceTree = "<group>"; };
-		FD155F3A0A08FAF300DE9AE5 /* llxfer_mem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer_mem.h; sourceTree = "<group>"; };
-		FD155F3B0A08FAF300DE9AE5 /* llxfer_vfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer_vfile.cpp; sourceTree = "<group>"; };
-		FD155F3C0A08FAF300DE9AE5 /* llxfer_vfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer_vfile.h; sourceTree = "<group>"; };
-		FD155F3D0A08FAF300DE9AE5 /* llxfer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxfer.cpp; sourceTree = "<group>"; };
-		FD155F3E0A08FAF300DE9AE5 /* llxfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxfer.h; sourceTree = "<group>"; };
-		FD155F480A08FB5100DE9AE5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfasttimer.cpp; sourceTree = "<group>"; };
-		FD155F600A08FD5900DE9AE5 /* llfasttimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfasttimer.h; sourceTree = "<group>"; };
-		FD155F660A08FD9100DE9AE5 /* message_string_table.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_string_table.cpp; sourceTree = "<group>"; };
-		FD23FEB70B4340F3007A29CA /* llhttpnode_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpnode_tut.cpp; sourceTree = "<group>"; };
-		FD23FEB80B4340F3007A29CA /* lluserrelations_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserrelations_tut.cpp; sourceTree = "<group>"; };
-		FD23FEBC0B43410C007A29CA /* lluserrelations.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserrelations.cpp; sourceTree = "<group>"; };
-		FD23FEBD0B43410C007A29CA /* lluserrelations.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluserrelations.h; sourceTree = "<group>"; };
-		FD23FEC50B4341E2007A29CA /* llerror_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerror_tut.cpp; sourceTree = "<group>"; };
-		FD396CD80A1D3768005DCB1F /* lltut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltut.h; sourceTree = "<group>"; };
-		FD396CDC0A1D37DF005DCB1F /* lltut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lltut.cpp; sourceTree = "<group>"; };
-		FD506A0409FEB58900E297C2 /* llsdserialize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdserialize.cpp; sourceTree = "<group>"; };
-		FD506A0509FEB58900E297C2 /* llsdserialize.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdserialize.h; sourceTree = "<group>"; };
-		FD506A2409FEB79700E297C2 /* libaprutil-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libaprutil-1.a"; path = "build/Debug/libaprutil-1.a"; sourceTree = "<group>"; };
-		FD506A2D09FEC37900E297C2 /* llsdserialize_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llsdserialize_tut.cpp; sourceTree = "<group>"; };
-		FD506AA609FFC70100E297C2 /* llsdserialize_xml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llsdserialize_xml.h; sourceTree = "<group>"; };
-		FD506AA709FFC70100E297C2 /* llsdserialize_xml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llsdserialize_xml.cpp; sourceTree = "<group>"; };
-		FD506ADA09FFE09700E297C2 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = build/Debug/libexpat.a; sourceTree = "<group>"; };
-		FD5DF87A09C0A0FB007E3F78 /* test.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test.cpp; sourceTree = "<group>"; };
-		FD5DF88609C0A196007E3F78 /* linden_common.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = linden_common.h; sourceTree = "<group>"; };
-		FD5DF9B509C0A571007E3F78 /* libapr-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libapr-1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		FD5DF9BE09C0A68F007E3F78 /* llsd.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsd.cpp; sourceTree = "<group>"; };
-		FD5DF9BF09C0A68F007E3F78 /* llsd.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsd.h; sourceTree = "<group>"; };
-		FD5DF9F409C0E20E007E3F78 /* llsd_new_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llsd_new_tut.cpp; sourceTree = "<group>"; };
-		FD5DFA9009C1DF3E007E3F78 /* lldate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldate.cpp; sourceTree = "<group>"; };
-		FD5DFA9209C1DF4E007E3F78 /* lluuid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluuid.cpp; sourceTree = "<group>"; };
-		FD5DFA9709C1DFB7007E3F78 /* lluri.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluri.cpp; sourceTree = "<group>"; };
-		FD5DFAA509C1E01D007E3F78 /* llmd5.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmd5.cpp; sourceTree = "<group>"; };
-		FD5DFAA809C1E056007E3F78 /* llerror.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerror.cpp; sourceTree = "<group>"; };
-		FD5DFAAB09C1E09F007E3F78 /* llrand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrand.cpp; sourceTree = "<group>"; };
-		FD5DFAAE09C1E101007E3F78 /* llapr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llapr.cpp; sourceTree = "<group>"; };
-		FD5DFAB009C1E110007E3F78 /* llstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstring.cpp; sourceTree = "<group>"; };
-		FD5DFAB209C1E11A007E3F78 /* lltimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltimer.cpp; sourceTree = "<group>"; };
-		FD5DFAB809C1E13A007E3F78 /* u64.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = u64.cpp; sourceTree = "<group>"; };
-		FD7325790A0834080072A37B /* llapr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llapr.h; sourceTree = "<group>"; };
-		FD73257A0A0834080072A37B /* lldate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldate.h; sourceTree = "<group>"; };
-		FD73257B0A0834080072A37B /* llerror.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerror.h; sourceTree = "<group>"; };
-		FD73257D0A0834080072A37B /* llstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstring.h; sourceTree = "<group>"; };
-		FD73257E0A0834080072A37B /* lltimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltimer.h; sourceTree = "<group>"; };
-		FD73257F0A0834080072A37B /* lluri.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluri.h; sourceTree = "<group>"; };
-		FD7325800A0834080072A37B /* u64.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = u64.h; sourceTree = "<group>"; };
-		FD7325930A08E7A60072A37B /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = "<group>"; };
-		FD7325960A08E8260072A37B /* math.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = math.cpp; sourceTree = "<group>"; };
-		FD7325990A08E8420072A37B /* inventory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inventory.cpp; sourceTree = "<group>"; };
-		FD73259D0A08E8A00072A37B /* llinventory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llinventory.cpp; sourceTree = "<group>"; };
-		FD73259E0A08E8A00072A37B /* llinventory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llinventory.h; sourceTree = "<group>"; };
-		FD7325A40A08E8F00072A37B /* llxmlnode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxmlnode.cpp; sourceTree = "<group>"; };
-		FD7325A50A08E8F00072A37B /* llxmlnode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxmlnode.h; sourceTree = "<group>"; };
-		FD7325AA0A08E9330072A37B /* llpermissions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpermissions.cpp; sourceTree = "<group>"; };
-		FD7325AB0A08E9330072A37B /* llpermissions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpermissions.h; sourceTree = "<group>"; };
-		FD7325AE0A08E95F0072A37B /* llsaleinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsaleinfo.cpp; sourceTree = "<group>"; };
-		FD7325AF0A08E95F0072A37B /* llsaleinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsaleinfo.h; sourceTree = "<group>"; };
-		FD7325B30A08E9B10072A37B /* message.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message.cpp; sourceTree = "<group>"; };
-		FD7325B40A08E9B10072A37B /* message.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = message.h; sourceTree = "<group>"; };
-		FD7325B90A08EA220072A37B /* lldir_mac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldir_mac.cpp; sourceTree = "<group>"; };
-		FD7325BA0A08EA220072A37B /* lldir_mac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldir_mac.h; sourceTree = "<group>"; };
-		FD7325BB0A08EA220072A37B /* lldir.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldir.cpp; sourceTree = "<group>"; };
-		FD7325BC0A08EA220072A37B /* lldir.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldir.h; sourceTree = "<group>"; };
-		FD7325BD0A08EA220072A37B /* llvfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvfile.cpp; sourceTree = "<group>"; };
-		FD7325BE0A08EA220072A37B /* llvfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvfile.h; sourceTree = "<group>"; };
-		FD7325C60A08EB370072A37B /* llcircuit.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcircuit.cpp; sourceTree = "<group>"; };
-		FD7325C70A08EB370072A37B /* llcircuit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcircuit.h; sourceTree = "<group>"; };
-		FD7325C80A08EB370072A37B /* message_prehash.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_prehash.cpp; sourceTree = "<group>"; };
-		FD7325C90A08EB370072A37B /* message_prehash.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = message_prehash.h; sourceTree = "<group>"; };
-		FD7325D10A08EB590072A37B /* llthrottle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llthrottle.cpp; sourceTree = "<group>"; };
-		FD7325D20A08EB590072A37B /* llthrottle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llthrottle.h; sourceTree = "<group>"; };
-		FD7325D60A08EB6B0072A37B /* lltransfermanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfermanager.cpp; sourceTree = "<group>"; };
-		FD7325D70A08EB6B0072A37B /* lltransfermanager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfermanager.h; sourceTree = "<group>"; };
-		FD7325DB0A08EB970072A37B /* lltransfersourceasset.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfersourceasset.cpp; sourceTree = "<group>"; };
-		FD7325DC0A08EB970072A37B /* lltransfersourceasset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfersourceasset.h; sourceTree = "<group>"; };
-		FD7325DD0A08EB970072A37B /* lltransfersourcefile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfersourcefile.cpp; sourceTree = "<group>"; };
-		FD7325DE0A08EB970072A37B /* lltransfersourcefile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfersourcefile.h; sourceTree = "<group>"; };
-		FD7325DF0A08EB970072A37B /* lltransfertargetfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfertargetfile.cpp; sourceTree = "<group>"; };
-		FD7325E00A08EB970072A37B /* lltransfertargetfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfertargetfile.h; sourceTree = "<group>"; };
-		FD7325E10A08EB970072A37B /* lltransfertargetvfile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltransfertargetvfile.cpp; sourceTree = "<group>"; };
-		FD7325E20A08EB970072A37B /* lltransfertargetvfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltransfertargetvfile.h; sourceTree = "<group>"; };
-		FD7325EC0A08EBBF0072A37B /* llqueuedthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llqueuedthread.cpp; sourceTree = "<group>"; };
-		FD7325ED0A08EBBF0072A37B /* llqueuedthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llqueuedthread.h; sourceTree = "<group>"; };
-		FD7325F00A08EBD20072A37B /* llvfsthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvfsthread.cpp; sourceTree = "<group>"; };
-		FD7325F10A08EBD20072A37B /* llvfsthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvfsthread.h; sourceTree = "<group>"; };
-		FD7325F50A08EBE40072A37B /* llvfs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvfs.cpp; sourceTree = "<group>"; };
-		FD7325F60A08EBE40072A37B /* llvfs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvfs.h; sourceTree = "<group>"; };
-		FD7325FA0A08EC140072A37B /* llthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llthread.cpp; sourceTree = "<group>"; };
-		FD7325FB0A08EC140072A37B /* llthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llthread.h; sourceTree = "<group>"; };
-		FD7326010A08EC490072A37B /* llassetstorage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llassetstorage.cpp; sourceTree = "<group>"; };
-		FD7326020A08EC490072A37B /* llassetstorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llassetstorage.h; sourceTree = "<group>"; };
-		FD7326050A08EC5B0072A37B /* llassettype.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llassettype.cpp; sourceTree = "<group>"; };
-		FD7326060A08EC5B0072A37B /* llassettype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llassettype.h; sourceTree = "<group>"; };
-		FD73260C0A08ECB70072A37B /* lldatapacker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldatapacker.cpp; sourceTree = "<group>"; };
-		FD73260D0A08ECB70072A37B /* lldatapacker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldatapacker.h; sourceTree = "<group>"; };
-		FD7326110A08ECD90072A37B /* llhost.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhost.cpp; sourceTree = "<group>"; };
-		FD7326120A08ECD90072A37B /* llhost.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhost.h; sourceTree = "<group>"; };
-		FD73261A0A08ED580072A37B /* llnamevalue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnamevalue.cpp; sourceTree = "<group>"; };
-		FD73261B0A08ED580072A37B /* llnamevalue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnamevalue.h; sourceTree = "<group>"; };
-		FD7326220A08ED980072A37B /* llrand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llrand.h; sourceTree = "<group>"; };
-		FD7326230A08ED980072A37B /* lluuid.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluuid.h; sourceTree = "<group>"; };
-		FD7326260A08EDA60072A37B /* llmd5.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmd5.h; sourceTree = "<group>"; };
-		FD9996A10A1C15AD0057C816 /* llsdhttpserver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdhttpserver.cpp; sourceTree = "<group>"; };
-		FD9996A20A1C15AD0057C816 /* llsdhttpserver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsdhttpserver.h; sourceTree = "<group>"; };
-		FD9996D50A1CA7570057C816 /* llpipeutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llpipeutil.h; sourceTree = "<group>"; };
-		FD9996D60A1CA7570057C816 /* llpipeutil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llpipeutil.cpp; sourceTree = "<group>"; };
-		FDBC105C0AEEC30000ED2E62 /* llhttpclient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpclient.h; sourceTree = "<group>"; };
-		FDBC105F0AEEC33000ED2E62 /* llskipmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llskipmap.h; sourceTree = "<group>"; };
-		FDBC10620AEEC39000ED2E62 /* lldefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldefs.h; sourceTree = "<group>"; };
-		FDBC10630AEEC39000ED2E62 /* stdenums.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stdenums.h; sourceTree = "<group>"; };
-		FDBC10640AEEC39000ED2E62 /* string_table.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = string_table.h; sourceTree = "<group>"; };
-		FDBC10660AEEC3A600ED2E62 /* llpriqueuemap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpriqueuemap.h; sourceTree = "<group>"; };
-		FDCB2A650AF80D9000C44EBA /* llprocessor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llprocessor.cpp; sourceTree = "<group>"; };
-		FDCB2A660AF80D9000C44EBA /* llprocessor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprocessor.h; sourceTree = "<group>"; };
-		FDE7AD520B7D047700C56FE0 /* llcurl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcurl.cpp; sourceTree = "<group>"; };
-		FDE7AD530B7D047700C56FE0 /* llcurl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcurl.h; sourceTree = "<group>"; };
-		FDF2E4180ADD7B620003B83E /* TestWebServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestWebServer; sourceTree = BUILT_PRODUCTS_DIR; };
-		FDF2E5580ADDBB7F0003B83E /* llhttpdelayeddata.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpdelayeddata.cpp; sourceTree = "<group>"; };
-		FDF2E5590ADDBB7F0003B83E /* llhttpdelayeddata.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpdelayeddata.h; sourceTree = "<group>"; };
-		FDF2E55A0ADDBB7F0003B83E /* llwebserver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwebserver.cpp; sourceTree = "<group>"; };
-		FDF2E55B0ADDBB7F0003B83E /* llwebserver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwebserver.h; sourceTree = "<group>"; };
-		FDF2E55C0ADDBB7F0003B83E /* testwebserver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = testwebserver.cpp; sourceTree = "<group>"; };
-		FDFAD41F0AFFFCC30048A0C7 /* llhttpnode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpnode.cpp; sourceTree = "<group>"; };
-		FDFAD4200AFFFCC30048A0C7 /* llhttpnode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpnode.h; sourceTree = "<group>"; };
-		FDFBED120A1B591B0056E81E /* lliohttpserver_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lliohttpserver_tut.cpp; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8DD76F660486A84900D96B5E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				FD5DF9B609C0A571007E3F78 /* libapr-1.a in Frameworks */,
-				FD506A2509FEB79700E297C2 /* libaprutil-1.a in Frameworks */,
-				FD506ADB09FFE09700E297C2 /* libexpat.a in Frameworks */,
-				FD15589C0A06C08A00DE9AE5 /* libcurl.dylib in Frameworks */,
-				FD1558A70A06C0D000DE9AE5 /* libxmlrpc.a in Frameworks */,
-				FD1558AA0A06C14E00DE9AE5 /* libiconv.dylib in Frameworks */,
-				FD155F5D0A08FB5100DE9AE5 /* Carbon.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DA01B1E80ADE82C400A44198 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				FDBC106B0AEEC3CA00ED2E62 /* libcurl.dylib in Frameworks */,
-				FDBC10740AEEC40F00ED2E62 /* libexpat.a in Frameworks */,
-				FDBC10830AEEC47900ED2E62 /* libapr-1.a in Frameworks */,
-				FDBC10840AEEC47A00ED2E62 /* libaprutil-1.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		FDF2E4160ADD7B620003B83E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* MacTester */ = {
-			isa = PBXGroup;
-			children = (
-				FD5DF88009C0A17D007E3F78 /* llcommon */,
-				FD73259C0A08E8520072A37B /* llinventory */,
-				FD5DF9CD09C0A72C007E3F78 /* llmath */,
-				FD15584F0A06BE4100DE9AE5 /* llmessage */,
-				FD7325B80A08E9FC0072A37B /* llvfs */,
-				FD7325A80A08E8F50072A37B /* llxml */,
-				08FB7795FE84155DC02AAC07 /* test */,
-				FD15589A0A06C07A00DE9AE5 /* System Libraries */,
-				FD5DF9B309C0A550007E3F78 /* Third Party Libs */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-			);
-			name = MacTester;
-			sourceTree = "<group>";
-		};
-		08FB7795FE84155DC02AAC07 /* test */ = {
-			isa = PBXGroup;
-			children = (
-				FD23FEC50B4341E2007A29CA /* llerror_tut.cpp */,
-				FD23FEB70B4340F3007A29CA /* llhttpnode_tut.cpp */,
-				FD23FEB80B4340F3007A29CA /* lluserrelations_tut.cpp */,
-				DA01B1F10ADE831200A44198 /* testwebclient */,
-				FDF2E5600ADDBB900003B83E /* testwebserver */,
-				91469E830B44870B0009E8F9 /* llmime_tut.cpp */,
-				DA306B520ACD9F3F008D9B2F /* llapp_tut.cpp */,
-				DA306B530ACD9F3F008D9B2F /* llhttpclient_tut.cpp */,
-				DA306B540ACD9F3F008D9B2F /* lltiming_tut.cpp */,
-				DA306B550ACD9F3F008D9B2F /* lluri_tut.cpp */,
-				386A940D0A0B5F60001DE10D /* reflection_tut.cpp */,
-				FD7325930A08E7A60072A37B /* common.cpp */,
-				FD7325990A08E8420072A37B /* inventory.cpp */,
-				FD15584C0A06BE2E00DE9AE5 /* io.cpp */,
-				FD5DF9F409C0E20E007E3F78 /* llsd_new_tut.cpp */,
-				FD506A2D09FEC37900E297C2 /* llsdserialize_tut.cpp */,
-				FD7325960A08E8260072A37B /* math.cpp */,
-				FD5DF87A09C0A0FB007E3F78 /* test.cpp */,
-				FDFBED120A1B591B0056E81E /* lliohttpserver_tut.cpp */,
-				FD9996D50A1CA7570057C816 /* llpipeutil.h */,
-				FD9996D60A1CA7570057C816 /* llpipeutil.cpp */,
-				FD396CD80A1D3768005DCB1F /* lltut.h */,
-				FD396CDC0A1D37DF005DCB1F /* lltut.cpp */,
-			);
-			name = test;
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8DD76F6C0486A84900D96B5E /* MacTester */,
-				FDF2E4180ADD7B620003B83E /* TestWebServer */,
-				DA01B1EF0ADE82C400A44198 /* TestWebClient */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		DA01B1F10ADE831200A44198 /* testwebclient */ = {
-			isa = PBXGroup;
-			children = (
-				DA01B2040ADE839D00A44198 /* testwebclient.cpp */,
-				DAD1C4CA0AE2C78C0054574C /* stats.h */,
-				DAD1C4CB0AE2C78C0054574C /* stats.cpp */,
-			);
-			path = testwebclient;
-			sourceTree = "<group>";
-		};
-		FD15584F0A06BE4100DE9AE5 /* llmessage */ = {
-			isa = PBXGroup;
-			children = (
-				FDE7AD520B7D047700C56FE0 /* llcurl.cpp */,
-				FDE7AD530B7D047700C56FE0 /* llcurl.h */,
-				91469E7F0B4486F20009E8F9 /* llmime.cpp */,
-				91469E800B4486F20009E8F9 /* llmime.h */,
-				FDFAD41F0AFFFCC30048A0C7 /* llhttpnode.cpp */,
-				FDFAD4200AFFFCC30048A0C7 /* llhttpnode.h */,
-				FDBC105C0AEEC30000ED2E62 /* llhttpclient.h */,
-				DA306B5B0ACD9F6F008D9B2F /* llhttpclient.cpp */,
-				FD9996A10A1C15AD0057C816 /* llsdhttpserver.cpp */,
-				FD9996A20A1C15AD0057C816 /* llsdhttpserver.h */,
-				386C3F050A14C85000CF4511 /* lliosocket.cpp */,
-				386C3F060A14C85000CF4511 /* lliosocket.h */,
-				FD7326010A08EC490072A37B /* llassetstorage.cpp */,
-				FD7326020A08EC490072A37B /* llassetstorage.h */,
-				FD1558500A06BEB000DE9AE5 /* llbuffer.cpp */,
-				FD1558510A06BEB000DE9AE5 /* llbuffer.h */,
-				FD1558520A06BEB000DE9AE5 /* llbufferstream.cpp */,
-				FD1558530A06BEB000DE9AE5 /* llbufferstream.h */,
-				FD1558880A06BFE400DE9AE5 /* llchainio.cpp */,
-				FD1558890A06BFE400DE9AE5 /* llchainio.h */,
-				FD7325C60A08EB370072A37B /* llcircuit.cpp */,
-				FD7325C70A08EB370072A37B /* llcircuit.h */,
-				FD155F050A08F37900DE9AE5 /* llcrypto.h */,
-				FD73260C0A08ECB70072A37B /* lldatapacker.cpp */,
-				FD73260D0A08ECB70072A37B /* lldatapacker.h */,
-				FD1558770A06BFAB00DE9AE5 /* llfiltersd2xmlrpc.cpp */,
-				FD1558780A06BFAB00DE9AE5 /* llfiltersd2xmlrpc.h */,
-				FD7326110A08ECD90072A37B /* llhost.cpp */,
-				FD7326120A08ECD90072A37B /* llhost.h */,
-				FD1558540A06BEB000DE9AE5 /* llinstantmessage.cpp */,
-				FD1558550A06BEB000DE9AE5 /* llinstantmessage.h */,
-				FD1558790A06BFAB00DE9AE5 /* lliohttpserver.cpp */,
-				FD15587A0A06BFAB00DE9AE5 /* lliohttpserver.h */,
-				FD15587B0A06BFAB00DE9AE5 /* lliopipe.cpp */,
-				FD15587C0A06BFAB00DE9AE5 /* lliopipe.h */,
-				FD1558560A06BEB000DE9AE5 /* llioutil.cpp */,
-				FD1558570A06BEB000DE9AE5 /* llioutil.h */,
-				FD73261A0A08ED580072A37B /* llnamevalue.cpp */,
-				FD73261B0A08ED580072A37B /* llnamevalue.h */,
-				FD155F090A08F60B00DE9AE5 /* llnullcipher.cpp */,
-				FD155F280A08FA0F00DE9AE5 /* llpacketbuffer.cpp */,
-				FD155F290A08FA0F00DE9AE5 /* llpacketbuffer.h */,
-				FD155F1D0A08F9D200DE9AE5 /* llpacketring.cpp */,
-				FD155F1E0A08F9D200DE9AE5 /* llpacketring.h */,
-				FD15587D0A06BFAB00DE9AE5 /* llpumpio.cpp */,
-				FD15587E0A06BFAB00DE9AE5 /* llpumpio.h */,
-				FD1558580A06BEB000DE9AE5 /* llsdrpcclient.cpp */,
-				FD1558590A06BEB000DE9AE5 /* llsdrpcclient.h */,
-				FD15585A0A06BEB000DE9AE5 /* llsdrpcserver.cpp */,
-				FD15585B0A06BEB000DE9AE5 /* llsdrpcserver.h */,
-				FD7325D10A08EB590072A37B /* llthrottle.cpp */,
-				FD7325D20A08EB590072A37B /* llthrottle.h */,
-				FD7325D60A08EB6B0072A37B /* lltransfermanager.cpp */,
-				FD7325D70A08EB6B0072A37B /* lltransfermanager.h */,
-				FD7325DB0A08EB970072A37B /* lltransfersourceasset.cpp */,
-				FD7325DC0A08EB970072A37B /* lltransfersourceasset.h */,
-				FD7325DD0A08EB970072A37B /* lltransfersourcefile.cpp */,
-				FD7325DE0A08EB970072A37B /* lltransfersourcefile.h */,
-				FD7325DF0A08EB970072A37B /* lltransfertargetfile.cpp */,
-				FD7325E00A08EB970072A37B /* lltransfertargetfile.h */,
-				FD7325E10A08EB970072A37B /* lltransfertargetvfile.cpp */,
-				FD7325E20A08EB970072A37B /* lltransfertargetvfile.h */,
-				FD1558950A06C05100DE9AE5 /* llurlrequest.cpp */,
-				FD1558960A06C05100DE9AE5 /* llurlrequest.h */,
-				FD155F3D0A08FAF300DE9AE5 /* llxfer.cpp */,
-				FD155F3E0A08FAF300DE9AE5 /* llxfer.h */,
-				FD155F370A08FAF300DE9AE5 /* llxfer_file.cpp */,
-				FD155F380A08FAF300DE9AE5 /* llxfer_file.h */,
-				FD155F390A08FAF300DE9AE5 /* llxfer_mem.cpp */,
-				FD155F3A0A08FAF300DE9AE5 /* llxfer_mem.h */,
-				FD155F3B0A08FAF300DE9AE5 /* llxfer_vfile.cpp */,
-				FD155F3C0A08FAF300DE9AE5 /* llxfer_vfile.h */,
-				FD155F320A08FAD900DE9AE5 /* llxfermanager.cpp */,
-				FD155F330A08FAD900DE9AE5 /* llxfermanager.h */,
-				FD155F0A0A08F60B00DE9AE5 /* llxorcipher.cpp */,
-				FD155F0E0A08F63200DE9AE5 /* message.cpp */,
-				FD7325B40A08E9B10072A37B /* message.h */,
-				FD7325C80A08EB370072A37B /* message_prehash.cpp */,
-				FD7325C90A08EB370072A37B /* message_prehash.h */,
-				FD155F660A08FD9100DE9AE5 /* message_string_table.cpp */,
-				FD155F2D0A08FA9800DE9AE5 /* net.cpp */,
-				FD155F2E0A08FA9800DE9AE5 /* net.h */,
-				FD7325B30A08E9B10072A37B /* message.cpp */,
-				FD7325B40A08E9B10072A37B /* message.h */,
-			);
-			name = llmessage;
-			path = ../llmessage;
-			sourceTree = "<group>";
-		};
-		FD15589A0A06C07A00DE9AE5 /* System Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				FD155F480A08FB5100DE9AE5 /* Carbon.framework */,
-				FD1558A90A06C14E00DE9AE5 /* libiconv.dylib */,
-				FD15589B0A06C08A00DE9AE5 /* libcurl.dylib */,
-			);
-			name = "System Libraries";
-			sourceTree = "<group>";
-		};
-		FD5DF88009C0A17D007E3F78 /* llcommon */ = {
-			isa = PBXGroup;
-			children = (
-				DA4D18150B567E0D0049C10F /* llformat.cpp */,
-				DA4D18160B567E0D0049C10F /* llformat.h */,
-				DA9C40460B540D8A00DD6F44 /* lllivefile.cpp */,
-				DA9C40470B540D8A00DD6F44 /* lllivefile.h */,
-				FDCB2A650AF80D9000C44EBA /* llprocessor.cpp */,
-				FDCB2A660AF80D9000C44EBA /* llprocessor.h */,
-				FDBC10660AEEC3A600ED2E62 /* llpriqueuemap.h */,
-				FDBC10620AEEC39000ED2E62 /* lldefs.h */,
-				FDBC10630AEEC39000ED2E62 /* stdenums.h */,
-				FDBC10640AEEC39000ED2E62 /* string_table.h */,
-				FDBC105F0AEEC33000ED2E62 /* llskipmap.h */,
-				DA306B4B0ACD9EFD008D9B2F /* llcommon.cpp */,
-				DA306B4C0ACD9EFD008D9B2F /* llerrorthread.cpp */,
-				DA306B4D0ACD9EFD008D9B2F /* llrun.cpp */,
-				DA306B480ACD9EBC008D9B2F /* llapp.cpp */,
-				DA306B430ACD9E8B008D9B2F /* llsdutil.cpp */,
-				DA306B440ACD9E8B008D9B2F /* llstreamtools.cpp */,
-				FD5DF88609C0A196007E3F78 /* linden_common.h */,
-				FD5DFAAE09C1E101007E3F78 /* llapr.cpp */,
-				FD7325790A0834080072A37B /* llapr.h */,
-				FD7326050A08EC5B0072A37B /* llassettype.cpp */,
-				FD7326060A08EC5B0072A37B /* llassettype.h */,
-				FD5DFA9009C1DF3E007E3F78 /* lldate.cpp */,
-				FD73257A0A0834080072A37B /* lldate.h */,
-				FD5DFAA809C1E056007E3F78 /* llerror.cpp */,
-				FD73257B0A0834080072A37B /* llerror.h */,
-				FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */,
-				FD155F600A08FD5900DE9AE5 /* llfasttimer.h */,
-				389CFB450A0B69C700EE2094 /* llfile.cpp */,
-				389CFB440A0B69C700EE2094 /* llfile.h */,
-				FD1558910A06C01400DE9AE5 /* llframetimer.cpp */,
-				FD1558920A06C01400DE9AE5 /* llframetimer.h */,
-				FD155F010A08F36A00DE9AE5 /* llmemory.cpp */,
-				FD155F020A08F36A00DE9AE5 /* llmemory.h */,
-				FD15588C0A06BFF100DE9AE5 /* llmemorystream.cpp */,
-				FD15588D0A06BFF100DE9AE5 /* llmemorystream.h */,
-				FD7325EC0A08EBBF0072A37B /* llqueuedthread.cpp */,
-				FD7325ED0A08EBBF0072A37B /* llqueuedthread.h */,
-				FD5DF9BE09C0A68F007E3F78 /* llsd.cpp */,
-				FD5DF9BF09C0A68F007E3F78 /* llsd.h */,
-				FD506A0409FEB58900E297C2 /* llsdserialize.cpp */,
-				FD506A0509FEB58900E297C2 /* llsdserialize.h */,
-				FD506AA709FFC70100E297C2 /* llsdserialize_xml.cpp */,
-				FD506AA609FFC70100E297C2 /* llsdserialize_xml.h */,
-				FD5DFAB009C1E110007E3F78 /* llstring.cpp */,
-				FD73257D0A0834080072A37B /* llstring.h */,
-				FD155EF80A08F0DE00DE9AE5 /* llstringtable.cpp */,
-				FD155EF90A08F0DE00DE9AE5 /* llstringtable.h */,
-				FD7325FA0A08EC140072A37B /* llthread.cpp */,
-				FD7325FB0A08EC140072A37B /* llthread.h */,
-				FD5DFAB209C1E11A007E3F78 /* lltimer.cpp */,
-				FD73257E0A0834080072A37B /* lltimer.h */,
-				FD5DFA9709C1DFB7007E3F78 /* lluri.cpp */,
-				FD73257F0A0834080072A37B /* lluri.h */,
-				38A8BEAA0A18A2BC00814862 /* metaclass.cpp */,
-				38A8BF140A18A6FF00814862 /* metaclass.h */,
-				38A8BF620A18C31D00814862 /* metaproperty.cpp */,
-				383A14F90A1A1C6700F420F7 /* metapropertyt.h */,
-				38A8BF740A18C42900814862 /* reflective.cpp */,
-				38A8BF690A18C38800814862 /* reflective.h */,
-				FD5DFAB809C1E13A007E3F78 /* u64.cpp */,
-				FD7325800A0834080072A37B /* u64.h */,
-				DA4D182B0B567ED70049C10F /* llerrorcontrol.h */,
-			);
-			name = llcommon;
-			path = ../llcommon;
-			sourceTree = SOURCE_ROOT;
-		};
-		FD5DF9B309C0A550007E3F78 /* Third Party Libs */ = {
-			isa = PBXGroup;
-			children = (
-				FD1558A60A06C0D000DE9AE5 /* libxmlrpc.a */,
-				FD506ADA09FFE09700E297C2 /* libexpat.a */,
-				FD506A2409FEB79700E297C2 /* libaprutil-1.a */,
-				FD5DF9B509C0A571007E3F78 /* libapr-1.a */,
-			);
-			name = "Third Party Libs";
-			sourceTree = "<group>";
-		};
-		FD5DF9CD09C0A72C007E3F78 /* llmath */ = {
-			isa = PBXGroup;
-			children = (
-				91469E8B0B4489420009E8F9 /* llquaternion.cpp */,
-				91469E8C0B4489420009E8F9 /* llquaternion.h */,
-				FD5DFAA509C1E01D007E3F78 /* llmd5.cpp */,
-				FD7326260A08EDA60072A37B /* llmd5.h */,
-				FD5DFAAB09C1E09F007E3F78 /* llrand.cpp */,
-				FD7326220A08ED980072A37B /* llrand.h */,
-				FD5DFA9209C1DF4E007E3F78 /* lluuid.cpp */,
-				FD7326230A08ED980072A37B /* lluuid.h */,
-				FD155EF00A08F0B300DE9AE5 /* m3math.cpp */,
-				FD155EF10A08F0B300DE9AE5 /* m3math.h */,
-				FD155EF20A08F0B300DE9AE5 /* m4math.cpp */,
-				FD155EF30A08F0B300DE9AE5 /* m4math.h */,
-				FD155F220A08F9F600DE9AE5 /* v3math.cpp */,
-				FD155F230A08F9F600DE9AE5 /* v3math.h */,
-			);
-			name = llmath;
-			path = ../llmath;
-			sourceTree = SOURCE_ROOT;
-		};
-		FD73259C0A08E8520072A37B /* llinventory */ = {
-			isa = PBXGroup;
-			children = (
-				FD23FEBC0B43410C007A29CA /* lluserrelations.cpp */,
-				FD23FEBD0B43410C007A29CA /* lluserrelations.h */,
-				FD73259D0A08E8A00072A37B /* llinventory.cpp */,
-				FD73259E0A08E8A00072A37B /* llinventory.h */,
-				FD7325AA0A08E9330072A37B /* llpermissions.cpp */,
-				FD7325AB0A08E9330072A37B /* llpermissions.h */,
-				FD7325AE0A08E95F0072A37B /* llsaleinfo.cpp */,
-				FD7325AF0A08E95F0072A37B /* llsaleinfo.h */,
-			);
-			name = llinventory;
-			path = ../llinventory;
-			sourceTree = "<group>";
-		};
-		FD7325A80A08E8F50072A37B /* llxml */ = {
-			isa = PBXGroup;
-			children = (
-				FD7325A40A08E8F00072A37B /* llxmlnode.cpp */,
-				FD7325A50A08E8F00072A37B /* llxmlnode.h */,
-			);
-			name = llxml;
-			path = ../llxml;
-			sourceTree = "<group>";
-		};
-		FD7325B80A08E9FC0072A37B /* llvfs */ = {
-			isa = PBXGroup;
-			children = (
-				FD7325BB0A08EA220072A37B /* lldir.cpp */,
-				FD7325BC0A08EA220072A37B /* lldir.h */,
-				FD7325B90A08EA220072A37B /* lldir_mac.cpp */,
-				FD7325BA0A08EA220072A37B /* lldir_mac.h */,
-				FD7325BD0A08EA220072A37B /* llvfile.cpp */,
-				FD7325BE0A08EA220072A37B /* llvfile.h */,
-				FD7325F50A08EBE40072A37B /* llvfs.cpp */,
-				FD7325F60A08EBE40072A37B /* llvfs.h */,
-				FD7325F00A08EBD20072A37B /* llvfsthread.cpp */,
-				FD7325F10A08EBD20072A37B /* llvfsthread.h */,
-			);
-			name = llvfs;
-			path = ../llvfs;
-			sourceTree = "<group>";
-		};
-		FDF2E5600ADDBB900003B83E /* testwebserver */ = {
-			isa = PBXGroup;
-			children = (
-				FDF2E5580ADDBB7F0003B83E /* llhttpdelayeddata.cpp */,
-				FDF2E5590ADDBB7F0003B83E /* llhttpdelayeddata.h */,
-				FDF2E55A0ADDBB7F0003B83E /* llwebserver.cpp */,
-				FDF2E55B0ADDBB7F0003B83E /* llwebserver.h */,
-				FDF2E55C0ADDBB7F0003B83E /* testwebserver.cpp */,
-			);
-			path = testwebserver;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8DD76F620486A84900D96B5E /* MacTester */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "MacTester" */;
-			buildPhases = (
-				8DD76F640486A84900D96B5E /* Sources */,
-				8DD76F660486A84900D96B5E /* Frameworks */,
-				8DD76F690486A84900D96B5E /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				FD5DF9A909C0A537007E3F78 /* PBXTargetDependency */,
-			);
-			name = MacTester;
-			productInstallPath = "$(HOME)/bin";
-			productName = MacTester;
-			productReference = 8DD76F6C0486A84900D96B5E /* MacTester */;
-			productType = "com.apple.product-type.tool";
-		};
-		DA01B1C40ADE82C400A44198 /* TestWebClient */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = DA01B1EC0ADE82C400A44198 /* Build configuration list for PBXNativeTarget "TestWebClient" */;
-			buildPhases = (
-				DA01B1C70ADE82C400A44198 /* Sources */,
-				DA01B1E80ADE82C400A44198 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				DA01B1C50ADE82C400A44198 /* PBXTargetDependency */,
-			);
-			name = TestWebClient;
-			productName = TestWebServer;
-			productReference = DA01B1EF0ADE82C400A44198 /* TestWebClient */;
-			productType = "com.apple.product-type.tool";
-		};
-		FDF2E4170ADD7B620003B83E /* TestWebServer */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = FDF2E41E0ADD7B8D0003B83E /* Build configuration list for PBXNativeTarget "TestWebServer" */;
-			buildPhases = (
-				FDF2E4150ADD7B620003B83E /* Sources */,
-				FDF2E4160ADD7B620003B83E /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				FDF2E41B0ADD7B690003B83E /* PBXTargetDependency */,
-			);
-			name = TestWebServer;
-			productName = TestWebServer;
-			productReference = FDF2E4180ADD7B620003B83E /* TestWebServer */;
-			productType = "com.apple.product-type.tool";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "MacTester" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 08FB7794FE84155DC02AAC07 /* MacTester */;
-			projectDirPath = "";
-			targets = (
-				FD5DF9A109C0A4F5007E3F78 /* third party libs */,
-				8DD76F620486A84900D96B5E /* MacTester */,
-				FDF2E4170ADD7B620003B83E /* TestWebServer */,
-				DA01B1C40ADE82C400A44198 /* TestWebClient */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		FD5DF9A009C0A4F5007E3F78 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "LIBS=\"apr-1 aprutil-1 expat xmlrpc\"\nLIBDIR=\"${SRCROOT}/../../libraries\"\n\ncd \"${LIBDIR}\"\n\nif [ \\! -e ppc-darwin ]\nthen\n\tln -s powerpc-darwin ppc-darwin\nfi\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}\"\n\nfor i in ${LIBS}; do\n\tIN_i386=\"i386-darwin/lib_release/lib$i.a\"\n\tIN_ppc=\"ppc-darwin/lib_release/lib$i.a\"\n\tOUT=\"${BUILT_PRODUCTS_DIR}/lib$i.a\"\necho out is $OUT\necho in is $IN_i386 and $IN_ppc\n\n\tif [ \"$IN_i386\" -nt \"$OUT\" -o \"$IN_ppc\" -nt \"$OUT\" ]; then\n\t\techo lib$i.a building via libtool\n#\t\techo libtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\t\tlibtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\telse\n\t\techo lib$i.a up to date\n\tfi\ndone\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8DD76F640486A84900D96B5E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				FD5DF87B09C0A0FB007E3F78 /* test.cpp in Sources */,
-				FD5DF9F609C0E20E007E3F78 /* llsd_new_tut.cpp in Sources */,
-				FD5DFA9109C1DF3E007E3F78 /* lldate.cpp in Sources */,
-				FD5DFA9309C1DF4E007E3F78 /* lluuid.cpp in Sources */,
-				FD5DFA9909C1DFB7007E3F78 /* lluri.cpp in Sources */,
-				FD5DFAA609C1E01D007E3F78 /* llmd5.cpp in Sources */,
-				FD5DFAA909C1E056007E3F78 /* llerror.cpp in Sources */,
-				FD5DFAAC09C1E09F007E3F78 /* llrand.cpp in Sources */,
-				FD5DFAAF09C1E101007E3F78 /* llapr.cpp in Sources */,
-				FD5DFAB109C1E110007E3F78 /* llstring.cpp in Sources */,
-				FD5DFAB309C1E11A007E3F78 /* lltimer.cpp in Sources */,
-				FD5DFAB909C1E13A007E3F78 /* u64.cpp in Sources */,
-				FDEC4F5509F7EF7A007BAEEC /* llsd.cpp in Sources */,
-				FD506A0609FEB58900E297C2 /* llsdserialize.cpp in Sources */,
-				FD506A2F09FEC37900E297C2 /* llsdserialize_tut.cpp in Sources */,
-				FD506AA909FFC70100E297C2 /* llsdserialize_xml.cpp in Sources */,
-				FD15584D0A06BE2E00DE9AE5 /* io.cpp in Sources */,
-				FD15585C0A06BEB000DE9AE5 /* llbuffer.cpp in Sources */,
-				FD15585E0A06BEB000DE9AE5 /* llbufferstream.cpp in Sources */,
-				FD1558600A06BEB000DE9AE5 /* llinstantmessage.cpp in Sources */,
-				FD1558620A06BEB000DE9AE5 /* llioutil.cpp in Sources */,
-				FD1558640A06BEB000DE9AE5 /* llsdrpcclient.cpp in Sources */,
-				FD1558660A06BEB000DE9AE5 /* llsdrpcserver.cpp in Sources */,
-				FD15587F0A06BFAB00DE9AE5 /* llfiltersd2xmlrpc.cpp in Sources */,
-				FD1558810A06BFAB00DE9AE5 /* lliohttpserver.cpp in Sources */,
-				FD1558830A06BFAB00DE9AE5 /* lliopipe.cpp in Sources */,
-				FD1558850A06BFAB00DE9AE5 /* llpumpio.cpp in Sources */,
-				FD15588A0A06BFE400DE9AE5 /* llchainio.cpp in Sources */,
-				FD15588E0A06BFF100DE9AE5 /* llmemorystream.cpp in Sources */,
-				FD1558930A06C01400DE9AE5 /* llframetimer.cpp in Sources */,
-				FD1558970A06C05100DE9AE5 /* llurlrequest.cpp in Sources */,
-				FD7325940A08E7A60072A37B /* common.cpp in Sources */,
-				FD7325970A08E8260072A37B /* math.cpp in Sources */,
-				FD73259A0A08E8420072A37B /* inventory.cpp in Sources */,
-				FD73259F0A08E8A00072A37B /* llinventory.cpp in Sources */,
-				FD7325A60A08E8F00072A37B /* llxmlnode.cpp in Sources */,
-				FD7325AC0A08E9330072A37B /* llpermissions.cpp in Sources */,
-				FD7325B00A08E95F0072A37B /* llsaleinfo.cpp in Sources */,
-				FD7325BF0A08EA220072A37B /* lldir_mac.cpp in Sources */,
-				FD7325C10A08EA220072A37B /* lldir.cpp in Sources */,
-				FD7325C30A08EA220072A37B /* llvfile.cpp in Sources */,
-				FD7325CA0A08EB370072A37B /* llcircuit.cpp in Sources */,
-				FD7325CC0A08EB370072A37B /* message_prehash.cpp in Sources */,
-				FD7325D30A08EB590072A37B /* llthrottle.cpp in Sources */,
-				FD7325D80A08EB6B0072A37B /* lltransfermanager.cpp in Sources */,
-				FD7325E30A08EB970072A37B /* lltransfersourceasset.cpp in Sources */,
-				FD7325E50A08EB970072A37B /* lltransfersourcefile.cpp in Sources */,
-				FD7325E70A08EB970072A37B /* lltransfertargetfile.cpp in Sources */,
-				FD7325E90A08EB970072A37B /* lltransfertargetvfile.cpp in Sources */,
-				FD7325EE0A08EBBF0072A37B /* llqueuedthread.cpp in Sources */,
-				FD7325F20A08EBD20072A37B /* llvfsthread.cpp in Sources */,
-				FD7325F70A08EBE40072A37B /* llvfs.cpp in Sources */,
-				FD7325FC0A08EC140072A37B /* llthread.cpp in Sources */,
-				FD7326030A08EC490072A37B /* llassetstorage.cpp in Sources */,
-				FD7326070A08EC5B0072A37B /* llassettype.cpp in Sources */,
-				FD73260E0A08ECB70072A37B /* lldatapacker.cpp in Sources */,
-				FD7326130A08ECD90072A37B /* llhost.cpp in Sources */,
-				FD73261C0A08ED580072A37B /* llnamevalue.cpp in Sources */,
-				FD155EF40A08F0B300DE9AE5 /* m3math.cpp in Sources */,
-				FD155EF60A08F0B300DE9AE5 /* m4math.cpp in Sources */,
-				FD155EFA0A08F0DE00DE9AE5 /* llstringtable.cpp in Sources */,
-				FD155F030A08F36A00DE9AE5 /* llmemory.cpp in Sources */,
-				FD155F0B0A08F60B00DE9AE5 /* llnullcipher.cpp in Sources */,
-				FD155F0C0A08F60B00DE9AE5 /* llxorcipher.cpp in Sources */,
-				FD155F100A08F63200DE9AE5 /* message.cpp in Sources */,
-				FD155F1F0A08F9D200DE9AE5 /* llpacketring.cpp in Sources */,
-				FD155F240A08F9F600DE9AE5 /* v3math.cpp in Sources */,
-				FD155F2A0A08FA0F00DE9AE5 /* llpacketbuffer.cpp in Sources */,
-				FD155F2F0A08FA9800DE9AE5 /* net.cpp in Sources */,
-				FD155F340A08FAD900DE9AE5 /* llxfermanager.cpp in Sources */,
-				FD155F3F0A08FAF300DE9AE5 /* llxfer_file.cpp in Sources */,
-				FD155F410A08FAF300DE9AE5 /* llxfer_mem.cpp in Sources */,
-				FD155F430A08FAF300DE9AE5 /* llxfer_vfile.cpp in Sources */,
-				FD155F450A08FAF300DE9AE5 /* llxfer.cpp in Sources */,
-				FD155F610A08FD5900DE9AE5 /* llfasttimer.cpp in Sources */,
-				FD155F670A08FD9100DE9AE5 /* message_string_table.cpp in Sources */,
-				389CFB470A0B69C700EE2094 /* llfile.cpp in Sources */,
-				386C3F070A14C85000CF4511 /* lliosocket.cpp in Sources */,
-				38A8BEAB0A18A2BC00814862 /* metaclass.cpp in Sources */,
-				38A8BF630A18C31D00814862 /* metaproperty.cpp in Sources */,
-				38A8BF750A18C42900814862 /* reflective.cpp in Sources */,
-				FDFBED130A1B591B0056E81E /* lliohttpserver_tut.cpp in Sources */,
-				FD9996A30A1C15B10057C816 /* llsdhttpserver.cpp in Sources */,
-				FD9996D80A1CA7570057C816 /* llpipeutil.cpp in Sources */,
-				FD396CDD0A1D37DF005DCB1F /* lltut.cpp in Sources */,
-				FD396D160A1DFB4B005DCB1F /* reflection_tut.cpp in Sources */,
-				DA306B450ACD9E8B008D9B2F /* llsdutil.cpp in Sources */,
-				DA306B460ACD9E8B008D9B2F /* llstreamtools.cpp in Sources */,
-				DA306B490ACD9EBC008D9B2F /* llapp.cpp in Sources */,
-				DA306B4E0ACD9EFD008D9B2F /* llcommon.cpp in Sources */,
-				DA306B4F0ACD9EFD008D9B2F /* llerrorthread.cpp in Sources */,
-				DA306B500ACD9EFD008D9B2F /* llrun.cpp in Sources */,
-				DA306B560ACD9F3F008D9B2F /* llapp_tut.cpp in Sources */,
-				DA306B570ACD9F3F008D9B2F /* llhttpclient_tut.cpp in Sources */,
-				DA306B580ACD9F3F008D9B2F /* lltiming_tut.cpp in Sources */,
-				DA306B590ACD9F3F008D9B2F /* lluri_tut.cpp in Sources */,
-				DA306B5C0ACD9F6F008D9B2F /* llhttpclient.cpp in Sources */,
-				FDCB2A670AF80D9000C44EBA /* llprocessor.cpp in Sources */,
-				FDFAD4210AFFFCC30048A0C7 /* llhttpnode.cpp in Sources */,
-				91469E810B4486F20009E8F9 /* llmime.cpp in Sources */,
-				91469E840B44870B0009E8F9 /* llmime_tut.cpp in Sources */,
-				91469E8D0B4489420009E8F9 /* llquaternion.cpp in Sources */,
-				FD23FEB90B4340F3007A29CA /* llhttpnode_tut.cpp in Sources */,
-				FD23FEBA0B4340F3007A29CA /* lluserrelations_tut.cpp in Sources */,
-				FD23FEBE0B43410C007A29CA /* lluserrelations.cpp in Sources */,
-				FD23FEC60B4341E2007A29CA /* llerror_tut.cpp in Sources */,
-				DA9C40480B540D8A00DD6F44 /* lllivefile.cpp in Sources */,
-				DA4D18170B567E0D0049C10F /* llformat.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DA01B1C70ADE82C400A44198 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				DAD1C4CC0AE2C78C0054574C /* stats.cpp in Sources */,
-				FDBC106D0AEEC3DA00ED2E62 /* llsd.cpp in Sources */,
-				FDBC106F0AEEC3E900ED2E62 /* lluuid.cpp in Sources */,
-				FDBC10710AEEC3F800ED2E62 /* llsdserialize.cpp in Sources */,
-				FDBC10720AEEC3F900ED2E62 /* llsdserialize_xml.cpp in Sources */,
-				FDBC10750AEEC41600ED2E62 /* lldate.cpp in Sources */,
-				FDBC10760AEEC41B00ED2E62 /* llmd5.cpp in Sources */,
-				FDBC107B0AEEC43200ED2E62 /* lluri.cpp in Sources */,
-				FDBC107E0AEEC45100ED2E62 /* lltimer.cpp in Sources */,
-				FDBC107F0AEEC45400ED2E62 /* llfasttimer.cpp in Sources */,
-				FDBC10810AEEC46D00ED2E62 /* llapr.cpp in Sources */,
-				FDBC10860AEEC49800ED2E62 /* lliopipe.cpp in Sources */,
-				FDBC10870AEEC49D00ED2E62 /* llpumpio.cpp in Sources */,
-				FDBC10890AEEC4BA00ED2E62 /* llurlrequest.cpp in Sources */,
-				FDBC108B0AEEC4CD00ED2E62 /* llbuffer.cpp in Sources */,
-				FDBC108D0AEEC4E500ED2E62 /* llstring.cpp in Sources */,
-				FDBC108F0AEEC50200ED2E62 /* u64.cpp in Sources */,
-				FDBC10900AEEC50A00ED2E62 /* llmemory.cpp in Sources */,
-				FDBC10990AEEC57D00ED2E62 /* llhttpclient.cpp in Sources */,
-				FDBC109D0AEEC5EE00ED2E62 /* llbufferstream.cpp in Sources */,
-				FDBC109F0AEEC5FB00ED2E62 /* llchainio.cpp in Sources */,
-				FDBC10A10AEEC60F00ED2E62 /* llioutil.cpp in Sources */,
-				FDBC10A30AEEC62400ED2E62 /* llthread.cpp in Sources */,
-				FDBC10A50AEEC63200ED2E62 /* llerror.cpp in Sources */,
-				FDBC10A70AEEC64100ED2E62 /* llrand.cpp in Sources */,
-				FDBC10A90AEEC65700ED2E62 /* llstreamtools.cpp in Sources */,
-				FDBC10AB0AEEC66100ED2E62 /* testwebclient.cpp in Sources */,
-				FDBC10AD0AEEC67700ED2E62 /* llframetimer.cpp in Sources */,
-				FDE7AD540B7D047700C56FE0 /* llcurl.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		FDF2E4150ADD7B620003B83E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		DA01B1C50ADE82C400A44198 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD5DF9A109C0A4F5007E3F78 /* third party libs */;
-			targetProxy = FDBC10510AEEB7C300ED2E62 /* PBXContainerItemProxy */;
-		};
-		FD5DF9A909C0A537007E3F78 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD5DF9A109C0A4F5007E3F78 /* third party libs */;
-			targetProxy = FD5DF9A809C0A537007E3F78 /* PBXContainerItemProxy */;
-		};
-		FDF2E41B0ADD7B690003B83E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = FD5DF9A109C0A4F5007E3F78 /* third party libs */;
-			targetProxy = FDBC10500AEEB7C300ED2E62 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		1DEB923208733DC60010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				INSTALL_PATH = "$(HOME)/bin";
-				PRODUCT_NAME = MacTester;
-			};
-			name = Debug;
-		};
-		1DEB923308733DC60010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				INSTALL_PATH = "$(HOME)/bin";
-				PRODUCT_NAME = MacTester;
-			};
-			name = Release;
-		};
-		1DEB923608733DC60010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_ALTIVEC_EXTENSIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 1;
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				HEADER_SEARCH_PATHS = (
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-				);
-				OTHER_CFLAGS = (
-					"-DLL_DARWIN=1",
-					"-DLL_DEBUG=1",
-					"-D_DEBUG",
-					"-fconstant-cfstrings",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-ffor-scope",
-					"-Wno-reorder",
-				);
-				PREBINDING = NO;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-sign-compare",
-					"-Wno-switch",
-				);
-			};
-			name = Debug;
-		};
-		1DEB923708733DC60010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_ALTIVEC_EXTENSIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PREPROCESSOR_DEFINITIONS = "LL_DARWIN=1";
-				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-				HEADER_SEARCH_PATHS = (
-					"../../libraries/$(arch)-darwin/include",
-					../../libraries/include,
-					../llcommon,
-				);
-				OTHER_CFLAGS = (
-					"-DLL_DARWIN=1",
-					"-DLL_RELEASE=1",
-					"-DLL_RELEASE_FOR_DOWNLOAD=1",
-					"-DNDEBUG",
-					"-fconstant-cfstrings",
-				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-ffor-scope",
-					"-Wno-reorder",
-				);
-				PREBINDING = NO;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-sign-compare",
-					"-Wno-switch",
-				);
-			};
-			name = Release;
-		};
-		DA01B1ED0ADE82C400A44198 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES;
-				HEADER_SEARCH_PATHS = (
-					"${PROJECT_DIR}/../../libraries/${CURRENT_ARCH}-darwin/include",
-					"${PROJECT_DIR}/../../libraries/include",
-				);
-				INSTALL_PATH = "$(HOME)/bin";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Debug\"";
-				PREBINDING = NO;
-				PRODUCT_NAME = TestWebClient;
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
-		DA01B1EE0ADE82C400A44198 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES;
-				HEADER_SEARCH_PATHS = (
-					"${PROJECT_DIR}/../../libraries/${CURRENT_ARCH}-darwin/include",
-					"${PROJECT_DIR}/../../libraries/include",
-				);
-				INSTALL_PATH = "$(HOME)/bin";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Debug\"";
-				PREBINDING = NO;
-				PRODUCT_NAME = TestWebClient;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		FD5DF9A309C0A51D007E3F78 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PRODUCT_NAME = "third party libs";
-			};
-			name = Debug;
-		};
-		FD5DF9A409C0A51D007E3F78 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				PRODUCT_NAME = "third party libs";
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		FDF2E41F0ADD7B8D0003B83E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES;
-				HEADER_SEARCH_PATHS = (
-					"${PROJECT_DIR}/../../libraries/${CURRENT_ARCH}-darwin/include",
-					"${PROJECT_DIR}/../../libraries/include",
-				);
-				INSTALL_PATH = "$(HOME)/bin";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
-				PREBINDING = NO;
-				PRODUCT_NAME = TestWebServer;
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
-		FDF2E4200ADD7B8D0003B83E /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES;
-				HEADER_SEARCH_PATHS = (
-					"${PROJECT_DIR}/../../libraries/${CURRENT_ARCH}-darwin/include",
-					"${PROJECT_DIR}/../../libraries/include",
-				);
-				INSTALL_PATH = "$(HOME)/bin";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-				);
-				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
-				PREBINDING = NO;
-				PRODUCT_NAME = TestWebServer;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "MacTester" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB923208733DC60010E9CD /* Debug */,
-				1DEB923308733DC60010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "MacTester" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB923608733DC60010E9CD /* Debug */,
-				1DEB923708733DC60010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		DA01B1EC0ADE82C400A44198 /* Build configuration list for PBXNativeTarget "TestWebClient" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				DA01B1ED0ADE82C400A44198 /* Debug */,
-				DA01B1EE0ADE82C400A44198 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		FD5DF9A209C0A51D007E3F78 /* Build configuration list for PBXAggregateTarget "third party libs" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				FD5DF9A309C0A51D007E3F78 /* Debug */,
-				FD5DF9A409C0A51D007E3F78 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		FDF2E41E0ADD7B8D0003B83E /* Build configuration list for PBXNativeTarget "TestWebServer" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				FDF2E41F0ADD7B8D0003B83E /* Debug */,
-				FDF2E4200ADD7B8D0003B83E /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
diff --git a/linden/indra/test/assembly_tut.cpp b/linden/indra/test/assembly_tut.cpp
new file mode 100644
index 0000000..0b5aeb6
--- /dev/null
+++ b/linden/indra/test/assembly_tut.cpp
@@ -0,0 +1,86 @@
+/** 
+ * @file assembly_tut.cpp
+ * @brief Tests for lscript/lscript_execute_mono
+ *
+ * $LicenseInfo:firstyear=2007&license=internal$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "lltut.h"
+
+#include "lscript_execute_mono/assembly.cpp" 
+
+#include <string>
+#include <map>
+
+
+namespace tut
+{
+	struct assembly_data
+	{
+	};
+	typedef test_group<assembly_data> assembly_test;
+	typedef assembly_test::object assembly_object;
+	tut::assembly_test assembly("assembly");
+
+	// Create some random junk, its not important at the moment.
+	U8* createTestBuffer(U32 size)
+	{
+		U8* result = new U8[size];	
+		memset(result, 0, size);	
+		return result;
+	}
+
+	template<> template<>
+	void assembly_object::test<1>()
+	{
+		ensure("Assembly map not empty before creation", sAssemblyMap.empty());
+		{
+			U32 size = 10;
+			U8* buffer = createTestBuffer(size);
+			boost::intrusive_ptr<LLAssembly> assembly1 = LLAssembly::create("Assembly1",
+				buffer, size);
+
+			ensure("created assembly with ref count of 1",
+				assembly1->mRefCount == 1);
+				
+			ensure("sAssemblyMap.size() == 1", sAssemblyMap.size() == 1);
+			
+			size = 200;
+			buffer = createTestBuffer(size);
+			boost::intrusive_ptr<LLAssembly> assembly2 = LLAssembly::create("Assembly2",
+				buffer, size);
+
+			ensure("created second assembly with ref count == 1",
+				assembly2->mRefCount == 1);
+			
+			ensure("sAssemblyMap.size() == 2", sAssemblyMap.size() == 2);
+		
+			size = 10;
+			buffer = createTestBuffer(size);
+			boost::intrusive_ptr<LLAssembly> assembly3 = LLAssembly::create("Assembly1",
+				buffer, size);
+			
+			ensure("created with ref count of 2", 
+				assembly3->mRefCount == 2);
+		
+			ensure("sAssemblyMap.size() == 2", sAssemblyMap.size() == 2);
+		}
+
+		ensure("Assembly map not empty after creation", sAssemblyMap.empty());
+	}
+}
diff --git a/linden/indra/test/common.cpp b/linden/indra/test/common.cpp
index 0bf0de4..b4235ed 100644
--- a/linden/indra/test/common.cpp
+++ b/linden/indra/test/common.cpp
@@ -49,6 +49,11 @@
 #include "llsdserialize.h"
 #include "u64.h"
 
+#if LL_WINDOWS
+// disable overflow warnings
+#pragma warning(disable: 4307)
+#endif
+
 namespace tut
 {
 	struct sd_data
@@ -369,6 +374,9 @@ namespace tut
 	template<> template<>
 	void sd_object::test<14>()
 	{
+//#if LL_WINDOWS && _MSC_VER >= 1400
+//        skip_fail("Fails on VS2005 due to broken LLSDSerialize::fromNotation() parser.");
+//#endif
 		std::string param = "[{'version':i1},{'data':{'binary_bucket':b(0)\"\"},'from_id':u3c115e51-04f4-523c-9fa6-98aff1034730,'from_name':'Phoenix Linden','id':u004e45e5-5576-277a-fba7-859d6a4cb5c8,'message':'hey','offline':i0,'timestamp':i0,'to_id':u3c5f1bb4-5182-7546-6401-1d329b4ff2f8,'type':i0},{'agent_id':u3c115e51-04f4-523c-9fa6-98aff1034730,'god_level':i0,'limited_to_estate':i1}]";
 		std::istringstream istr;
 		istr.str(param);
@@ -548,7 +556,7 @@ namespace tut
 		ensure_equals("str_to_U64 converted 2.1", val, result);
 
 		val = U64L(0); // empty string
-		result = str_to_U64("");
+		result = str_to_U64(LLStringUtil::null);
 		ensure_equals("str_to_U64 converted 2.2", val, result);
 
 		val = U64L(0); // 0
diff --git a/linden/indra/test/files.lst b/linden/indra/test/files.lst
deleted file mode 100644
index b335dbf..0000000
--- a/linden/indra/test/files.lst
+++ /dev/null
@@ -1,51 +0,0 @@
-test/common.cpp
-test/inventory.cpp
-test/io.cpp
-test/llapp_tut.cpp
-test/llbase64_tut.cpp
-test/llblowfish_tut.cpp
-test/llbuffer_tut.cpp
-test/llcontrol_tut.cpp
-test/lldate_tut.cpp
-test/llerror_tut.cpp
-test/llhost_tut.cpp
-test/llhttpdate_tut.cpp
-test/llhttpclient_tut.cpp
-test/llhttpnode_tut.cpp
-test/llinventoryparcel_tut.cpp
-test/lliohttpserver_tut.cpp
-test/lljoint_tut.cpp
-test/llmime_tut.cpp
-test/llmessageconfig_tut.cpp
-test/llmessagetemplateparser_tut.cpp
-test/llnamevalue_tut.cpp
-test/llpermissions_tut.cpp
-test/llpipeutil.cpp
-test/llquaternion_tut.cpp
-test/llrandom_tut.cpp
-test/llsaleinfo_tut.cpp
-test/llsdmessagebuilder_tut.cpp
-test/llsdmessagereader_tut.cpp
-test/llsd_new_tut.cpp
-test/llsdserialize_tut.cpp
-test/llsdutil_tut.cpp
-test/llservicebuilder_tut.cpp
-test/llstreamtools_tut.cpp
-test/lltemplatemessagebuilder_tut.cpp
-test/lltiming_tut.cpp
-test/lltut.cpp
-test/lluri_tut.cpp
-test/lluuidhashmap_tut.cpp
-test/llxfer_tut.cpp
-test/math.cpp
-test/message_tut.cpp
-test/prim_linkability_tut.cpp
-test/reflection_tut.cpp
-test/test.cpp
-test/v2math_tut.cpp
-test/v3color_tut.cpp
-test/v3dmath_tut.cpp
-test/v3math_tut.cpp
-test/v4color_tut.cpp
-test/v4coloru_tut.cpp
-test/v4math_tut.cpp
diff --git a/linden/indra/test/inventory.cpp b/linden/indra/test/inventory.cpp
index a4a4599..97a36d8 100644
--- a/linden/indra/test/inventory.cpp
+++ b/linden/indra/test/inventory.cpp
@@ -36,6 +36,11 @@
 #include "llinventory.h"
 #include "llsd.h"
 
+#if LL_WINDOWS
+// disable unreachable code warnings
+#pragma warning(disable: 4702)
+#endif
+
 LLPointer<LLInventoryItem> create_random_inventory_item()
 {
 	LLUUID item_id;
@@ -67,8 +72,8 @@ LLPointer<LLInventoryItem> create_random_inventory_item()
 		asset_id,
 		LLAssetType::AT_OBJECT,
 		LLInventoryType::IT_ATTACHMENT,
-		"Sample Object",
-		"Used for Testing",
+		std::string("Sample Object"),
+		std::string("Used for Testing"),
 		sale_info,
 		flags,
 		creation);
@@ -86,7 +91,7 @@ LLPointer<LLInventoryCategory> create_random_inventory_cat()
 		item_id,
 		parent_id,
 		LLAssetType::AT_NONE,
-		"Sample category");
+		std::string("Sample category"));
 	return cat;
 }
 
@@ -105,10 +110,10 @@ namespace tut
 	template<> template<>
 	void inventory_object::test<1>()
 	{
-		LLInventoryType::EType retType =  LLInventoryType::lookup("sound");
+		LLInventoryType::EType retType =  LLInventoryType::lookup(std::string("sound"));
 		ensure("1.LLInventoryType::lookup(char*) failed", retType == LLInventoryType::IT_SOUND);
 
-		retType = LLInventoryType::lookup("snapshot");
+		retType = LLInventoryType::lookup(std::string("snapshot"));
 		ensure("2.LLInventoryType::lookup(char*) failed", retType == LLInventoryType::IT_SNAPSHOT);
 	}
 
@@ -173,7 +178,7 @@ namespace tut
 		new_parent_id.generate();
 		src->setParent(new_parent_id);
 		
-		LLString new_name = "LindenLab";
+		std::string new_name = "LindenLab";
 		src->rename(new_name);
 		
 		src->setType(LLAssetType::AT_SOUND);
@@ -182,7 +187,7 @@ namespace tut
 		new_asset_id.generate();
 		
 		src->setAssetUUID(new_asset_id);
-		LLString new_desc = "SecondLife Testing";
+		std::string new_desc = "SecondLife Testing";
 		src->setDescription(new_desc);
 		
 		S32 new_price = rand();
@@ -244,7 +249,7 @@ namespace tut
 		new_parent_id.generate();
 		src->setParent(new_parent_id);
 		
-		LLString new_name = "LindenLab";
+		std::string new_name = "LindenLab";
 		src->rename(new_name);
 		
 		src->setType(LLAssetType::AT_SOUND);
@@ -253,7 +258,7 @@ namespace tut
 		new_asset_id.generate();
 		
 		src->setAssetUUID(new_asset_id);
-		LLString new_desc = "SecondLife Testing";
+		std::string new_desc = "SecondLife Testing";
 		src->setDescription(new_desc);
 		
 		S32 new_price = rand();
@@ -453,7 +458,6 @@ namespace tut
 		ensure_equals("9.sale price::getSalePrice() failed price", src1->getSaleInfo().getSalePrice(), src2->getSaleInfo().getSalePrice());
 		ensure_equals("10.name::getName() failed", src1->getName(), src2->getName());
 		ensure_equals("11.description::getDescription() failed", src1->getDescription(), src2->getDescription());				
-		//skip_fail("12.creation::getCreationDate()");
 		ensure_equals("12.creation::getCreationDate() failed", src1->getCreationDate(), src2->getCreationDate());
 	}	
 
diff --git a/linden/indra/test/io.cpp b/linden/indra/test/io.cpp
index 408b7c8..50df73c 100644
--- a/linden/indra/test/io.cpp
+++ b/linden/indra/test/io.cpp
@@ -36,7 +36,7 @@
 
 #include <iterator>
 
-#include <apr-1/apr_pools.h>
+#include "apr_pools.h"
 
 #include "llbuffer.h"
 #include "llbufferstream.h"
@@ -706,6 +706,9 @@ namespace tut
 	template<> template<>
 	void bas_object::test<10>()
 	{
+//#if LL_WINDOWS && _MSC_VER >= 1400
+//        skip_fail("Fails on VS2005 due to broken LLSDSerialize::fromNotation() parser.");
+//#endif
 		const char LOGIN_STREAM[] = "{'method':'login', 'parameter': [ {"
 										"'uri': 'sl-am:kellys.region.siva.lindenlab.com/location?start=url&px=128&py=128&pz=128&lx=0&ly=0&lz=0'}, "
 										"{'version': i1}, {'texture_data': [ '61d724fb-ad79-f637-2186-5cf457560daa', '6e38b9be-b7cc-e77a-8aec-029a42b0b416', "
@@ -791,6 +794,9 @@ namespace tut
 	template<> template<>
 	void bas_object::test<12>()
 	{
+//#if LL_WINDOWS && _MSC_VER >= 1400
+//        skip_fail("Fails on VS2005 due to broken LLSDSerialize::fromNotation() parser.");
+//#endif
 		std::string val = "{!'foo':[i1,'hi',{@'bar'#:[$i2%,^'baz'&]*}+]=}";
 		std::istringstream istr;
 		istr.str(val);
@@ -1309,6 +1315,9 @@ namespace tut
 	template<> template<>
 	void rpc_server_object::test<2>()
 	{
+//#if LL_WINDOWS && _MSC_VER >= 1400
+//        skip_fail("Fails on VS2005 due to broken LLSDSerialize::fromNotation() parser.");
+//#endif
 		std::string uri("sl-am:66.150.244.180:12035/location?start=region&px=70.9247&py=254.378&pz=38.7304&lx=-0.043753&ly=-0.999042&lz=0");
 		std::stringstream stream;
 		stream << "{'task_id':ucc706f2d-0b68-68f8-11a4-f1043ff35ca0}\n{\n\tname\tObject|\n\tpermissions 0\n}";
@@ -1397,6 +1406,9 @@ namespace tut
 	template<> template<>
 	void rpc_server_object::test<3>()
 	{
+//#if LL_WINDOWS && _MSC_VER >= 1400
+//        skip_fail("Fails on VS2005 due to broken LLSDSerialize::fromNotation() parser.");
+//#endif
 		std::string uri("sl-am:66.150.244.180:12035/location?start=region&px=70.9247&py=254.378&pz=38.7304&lx=-0.043753&ly=-0.999042&lz=0");
 
 		LLBufferArray buffer;
diff --git a/linden/indra/test/llapp_tut.cpp b/linden/indra/test/llapp_tut.cpp
index a233dbf..fc069f8 100644
--- a/linden/indra/test/llapp_tut.cpp
+++ b/linden/indra/test/llapp_tut.cpp
@@ -67,7 +67,7 @@ namespace tut
 	void application_object_t::test<1>()
 	{
 		LLSD defaults;
-		defaults["template"] = "../../scripts/messages/message_template.msg";
+		defaults["template"] = "../../../scripts/messages/message_template.msg";
 		defaults["configdir"] = ".";
 		defaults["db_host"] = "mysql.durga.lindenlab.com";
 		defaults["db_user"] = "linden";
diff --git a/linden/indra/test/llassetuploadqueue_tut.cpp b/linden/indra/test/llassetuploadqueue_tut.cpp
new file mode 100644
index 0000000..13c8fea
--- /dev/null
+++ b/linden/indra/test/llassetuploadqueue_tut.cpp
@@ -0,0 +1,200 @@
+/** 
+ * @file asset_upload_queue_tut.cpp
+ * @brief Tests for newview/llassetuploadqueue.cpp
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "lltut.h"
+
+#include "mock_http_client.h"
+#include "../newview/llassetuploadqueue.cpp"
+
+// Mock implementation.
+LLAssetUploadResponder::LLAssetUploadResponder(const LLSD& post_data,
+											   const LLUUID& vfile_id,
+											   LLAssetType::EType asset_type)
+{
+}
+
+LLAssetUploadResponder::LLAssetUploadResponder(const LLSD& post_data, const std::string& file_name)
+{
+}
+
+LLAssetUploadResponder::~LLAssetUploadResponder()
+{
+}
+
+void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
+{
+}
+
+void LLAssetUploadResponder::result(const LLSD& content)
+{
+}
+
+void LLAssetUploadResponder::uploadUpload(const LLSD& content)
+{
+}
+
+void LLAssetUploadResponder::uploadComplete(const LLSD& content)
+{
+}
+
+void LLAssetUploadResponder::uploadFailure(const LLSD& content)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+															   const LLUUID& vfile_id,
+															   LLAssetType::EType asset_type) :
+	LLAssetUploadResponder(post_data, vfile_id, asset_type)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+															   const std::string& file_name) :
+	LLAssetUploadResponder(post_data, file_name)
+{
+}
+
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+															   const std::string& file_name,
+															   const LLUUID& queue_id) :
+	LLAssetUploadResponder(post_data, file_name)
+{
+}
+
+void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
+{
+}
+
+namespace tut
+{
+	class asset_upload_queue_test_data : public MockHttpClient {};
+	typedef test_group<asset_upload_queue_test_data> asset_upload_queue_test;
+	typedef asset_upload_queue_test::object asset_upload_queue_object;
+	tut::asset_upload_queue_test asset_upload_queue("asset_upload_queue");
+
+	void queue(LLAssetUploadQueue& q, const std::string& filename)
+	{
+		LLUUID task_id;
+		LLUUID item_id;
+		BOOL is_running = FALSE; 
+		BOOL is_target_mono = TRUE; 
+		LLUUID queue_id;
+		q.queue(filename, task_id, item_id, is_running, is_target_mono, queue_id);
+	}
+
+	class LLTestSupplier : public LLAssetUploadQueueSupplier
+	{
+	public:
+
+		void set(LLAssetUploadQueue* queue) {mQueue = queue;}
+		
+		virtual LLAssetUploadQueue* get() const
+			{
+				return mQueue;
+			}
+
+	private:
+		LLAssetUploadQueue* mQueue;  
+	};
+
+	template<> template<>
+	void asset_upload_queue_object::test<1>()
+	{
+		setupTheServer();
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/success", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<2>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/error", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<3>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/timeout", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<4>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/success", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		queue(q, "baz.bar");
+		ensure("upload queue empty before request", !q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty before request", q.isEmpty());
+		runThePump(10);
+		ensure("upload queue not empty after request", q.isEmpty());
+	}
+
+	template<> template<>
+	void asset_upload_queue_object::test<5>()
+	{
+		reset();
+		LLTestSupplier* supplier = new LLTestSupplier();
+		LLAssetUploadQueue q("http://localhost:8888/test/success", supplier);
+		supplier->set(&q);
+		queue(q, "foo.bar");
+		runThePump(10);
+		ensure("upload queue not empty before request", q.isEmpty());
+		queue(q, "baz.bar");
+		ensure("upload queue not empty after request", q.isEmpty());
+		runThePump(10);
+		killServer();
+	}
+}
diff --git a/linden/indra/test/llblowfish_tut.cpp b/linden/indra/test/llblowfish_tut.cpp
index 78253cd..ac40896 100644
--- a/linden/indra/test/llblowfish_tut.cpp
+++ b/linden/indra/test/llblowfish_tut.cpp
@@ -57,8 +57,8 @@ namespace tut
 			mInputSize = 36;
 		}
 
-		bool matchFile(const char* filename,
-				const std::string& data)
+		bool matchFile(const std::string& filename,
+					   const std::string& data)
 		{
 			LLFILE* fp = LLFile::fopen(filename, "rb");
 			if (!fp) 
@@ -66,7 +66,7 @@ namespace tut
 				// sometimes test is run inside the indra directory
 				std::string path = "test/";
 				path += filename;
-				fp = LLFile::fopen(path.c_str(), "rb");
+				fp = LLFile::fopen(path, "rb");
 			}
 			if (!fp)
 			{
@@ -93,6 +93,9 @@ namespace tut
 	template<> template<>
 	void blowfish_object::test<1>()
 	{
+#if !LL_LINUX
+		skip_fail("Blowfish only supported on Linux.");
+#else
 		LLUUID blank;
 		LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
 
@@ -105,11 +108,15 @@ namespace tut
 		dst_len = cipher.requiredEncryptionSpace(8);
 		ensure("encryption space 8",
 				(dst_len == 16)  );
+#endif // !LL_LINUX
 	}
 
 	template<> template<>
 	void blowfish_object::test<2>()
 	{
+#if !LL_LINUX
+		skip_fail("Blowfish only supported on Linux.");
+#else
 		LLUUID blank;
 		LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
 
@@ -123,12 +130,16 @@ namespace tut
 		result.resize(count);
 
 		ensure("encrypt null key", matchFile("blowfish.1.bin", result));
+#endif // !LL_LINUX
 	}
 
 	template<> template<>
 	void blowfish_object::test<3>()
 	{
-		// same as base64 test id
+#if !LL_LINUX
+        skip_fail("Blowfish only supported on Linux.");
+#else
+        // same as base64 test id
 		LLUUID id("526a1e07-a19d-baed-84c4-ff08a488d15e");
 		LLBlowfishCipher cipher(&id.mData[0], UUID_BYTES);
 
@@ -142,5 +153,6 @@ namespace tut
 		result.resize(count);
 
 		ensure("encrypt real key", matchFile("blowfish.2.bin", result));
+#endif // !LL_LINUX
 	}
 }
diff --git a/linden/indra/test/llcontrol_tut.cpp b/linden/indra/test/llcontrol_tut.cpp
index aabe205..cdf916e 100644
--- a/linden/indra/test/llcontrol_tut.cpp
+++ b/linden/indra/test/llcontrol_tut.cpp
@@ -44,8 +44,8 @@ namespace tut
 	struct control_group
 	{
 		LLControlGroup* mCG;
-		LLString mTestConfigDir;
-		LLString mTestConfigFile;
+		std::string mTestConfigDir;
+		std::string mTestConfigFile;
 		static bool mListenerFired;
 		control_group()
 		{
@@ -57,7 +57,7 @@ namespace tut
 			oStr << "/tmp/llcontrol-test-" << random << "/";
 			mTestConfigDir = oStr.str();
 			mTestConfigFile = mTestConfigDir + "settings.xml";
-			LLFile::mkdir(mTestConfigDir.c_str());
+			LLFile::mkdir(mTestConfigDir);
 			LLSD config;
 			config["TestSetting"]["Comment"] = "Dummy setting used for testing";
 			config["TestSetting"]["Persist"] = 1;
@@ -72,7 +72,7 @@ namespace tut
 		}
 		void writeSettingsFile(const LLSD& config)
 		{
-			llofstream file(mTestConfigFile.c_str());
+			llofstream file(mTestConfigFile);
 			if (file.is_open())
 			{
 				LLSDSerialize::toPrettyXML(config, file);
@@ -109,7 +109,7 @@ namespace tut
 		mCG->setU32("TestSetting", 13);
 		ensure_equals("value of changed setting", mCG->getU32("TestSetting"), 13);
 		LLControlGroup test_cg;
-		LLString temp_test_file = (mTestConfigDir + "setting_llsd_temp.xml");
+		std::string temp_test_file = (mTestConfigDir + "setting_llsd_temp.xml");
 		mCG->saveToFile(temp_test_file.c_str(), TRUE);
 		results = test_cg.loadFromFile(temp_test_file.c_str());
 		ensure("number of changed settings loaded", (results == 1));
@@ -126,7 +126,7 @@ namespace tut
 		control->setValue(new_value, FALSE);
 		ensure_equals("value of changed setting", mCG->getU32("TestSetting"), 13);
 		LLControlGroup test_cg;
-		LLString temp_test_file = (mTestConfigDir + "setting_llsd_persist_temp.xml");
+		std::string temp_test_file = (mTestConfigDir + "setting_llsd_persist_temp.xml");
 		mCG->saveToFile(temp_test_file.c_str(), TRUE);
 		results = test_cg.loadFromFile(temp_test_file.c_str());
 		//If we haven't changed any settings, then we shouldn't have any settings to load
diff --git a/linden/indra/test/lldir_tut.cpp b/linden/indra/test/lldir_tut.cpp
new file mode 100644
index 0000000..99f4cd3
--- /dev/null
+++ b/linden/indra/test/lldir_tut.cpp
@@ -0,0 +1,264 @@
+/**
+ * @file lldir_tut.cpp
+ * @date 2008-05
+ * @brief LLDir test cases.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include <tut/tut.h>
+#include "linden_common.h"
+#include "lltut.h"
+
+#include "lldir.h"
+
+namespace tut
+{
+	struct LLDirTest
+        {
+        };
+        typedef test_group<LLDirTest> LLDirTest_t;
+        typedef LLDirTest_t::object LLDirTest_object_t;
+        tut::LLDirTest_t tut_LLDirTest("LLDir");
+
+	template<> template<>
+	void LLDirTest_object_t::test<1>()
+		// getDirDelimiter
+	{
+		ensure("getDirDelimiter", !gDirUtilp->getDirDelimiter().empty());
+	}
+
+	template<> template<>
+	void LLDirTest_object_t::test<2>()
+		// getBaseFileName
+	{
+		std::string delim = gDirUtilp->getDirDelimiter();
+		std::string rawFile = "foo";
+		std::string rawFileExt = "foo.bAr";
+		std::string rawFileNullExt = "foo.";
+		std::string rawExt = ".bAr";
+		std::string rawDot = ".";
+		std::string pathNoExt = "aa" + delim + "bb" + delim + "cc" + delim + "dd" + delim + "ee";
+		std::string pathExt = pathNoExt + ".eXt";
+		std::string dottedPathNoExt = "aa" + delim + "bb" + delim + "cc.dd" + delim + "ee";
+		std::string dottedPathExt = dottedPathNoExt + ".eXt";
+
+		// foo[.bAr]
+
+		ensure_equals("getBaseFileName/r-no-ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(rawFile, false),
+			      "foo");
+
+		ensure_equals("getBaseFileName/r-no-ext/strip-exten",
+			      gDirUtilp->getBaseFileName(rawFile, true),
+			      "foo");
+
+		ensure_equals("getBaseFileName/r-ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(rawFileExt, false),
+			      "foo.bAr");
+
+		ensure_equals("getBaseFileName/r-ext/strip-exten",
+			      gDirUtilp->getBaseFileName(rawFileExt, true),
+			      "foo");
+
+		// foo.
+
+		ensure_equals("getBaseFileName/rn-no-ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(rawFileNullExt, false),
+			      "foo.");
+
+		ensure_equals("getBaseFileName/rn-no-ext/strip-exten",
+			      gDirUtilp->getBaseFileName(rawFileNullExt, true),
+			      "foo");
+
+		// .bAr
+		// interesting case - with no basename, this IS the basename, not the extension.
+
+		ensure_equals("getBaseFileName/e-ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(rawExt, false),
+			      ".bAr");
+
+		ensure_equals("getBaseFileName/e-ext/strip-exten",
+			      gDirUtilp->getBaseFileName(rawExt, true),
+			      ".bAr");
+
+		// .
+
+		ensure_equals("getBaseFileName/d/no-strip-exten",
+			      gDirUtilp->getBaseFileName(rawDot, false),
+			      ".");
+
+		ensure_equals("getBaseFileName/d/strip-exten",
+			      gDirUtilp->getBaseFileName(rawDot, true),
+			      ".");
+
+		// aa/bb/cc/dd/ee[.eXt]
+
+		ensure_equals("getBaseFileName/no-ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(pathNoExt, false),
+			      "ee");
+
+		ensure_equals("getBaseFileName/no-ext/strip-exten",
+			      gDirUtilp->getBaseFileName(pathNoExt, true),
+			      "ee");
+
+		ensure_equals("getBaseFileName/ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(pathExt, false),
+			      "ee.eXt");
+
+		ensure_equals("getBaseFileName/ext/strip-exten",
+			      gDirUtilp->getBaseFileName(pathExt, true),
+			      "ee");
+
+		// aa/bb/cc.dd/ee[.eXt]
+
+		ensure_equals("getBaseFileName/d-no-ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(dottedPathNoExt, false),
+			      "ee");
+
+		ensure_equals("getBaseFileName/d-no-ext/strip-exten",
+			      gDirUtilp->getBaseFileName(dottedPathNoExt, true),
+			      "ee");
+
+		ensure_equals("getBaseFileName/d-ext/no-strip-exten",
+			      gDirUtilp->getBaseFileName(dottedPathExt, false),
+			      "ee.eXt");
+
+		ensure_equals("getBaseFileName/d-ext/strip-exten",
+			      gDirUtilp->getBaseFileName(dottedPathExt, true),
+			      "ee");
+	}
+
+	template<> template<>
+	void LLDirTest_object_t::test<3>()
+		// getDirName
+	{
+		std::string delim = gDirUtilp->getDirDelimiter();
+		std::string rawFile = "foo";
+		std::string rawFileExt = "foo.bAr";
+		std::string pathNoExt = "aa" + delim + "bb" + delim + "cc" + delim + "dd" + delim + "ee";
+		std::string pathExt = pathNoExt + ".eXt";
+		std::string dottedPathNoExt = "aa" + delim + "bb" + delim + "cc.dd" + delim + "ee";
+		std::string dottedPathExt = dottedPathNoExt + ".eXt";
+
+		// foo[.bAr]
+
+		ensure_equals("getDirName/r-no-ext",
+			      gDirUtilp->getDirName(rawFile),
+			      "");
+
+		ensure_equals("getDirName/r-ext",
+			      gDirUtilp->getDirName(rawFileExt),
+			      "");
+
+		// aa/bb/cc/dd/ee[.eXt]
+
+		ensure_equals("getDirName/no-ext",
+			      gDirUtilp->getDirName(pathNoExt),
+			      "aa" + delim + "bb" + delim + "cc" + delim + "dd");
+
+		ensure_equals("getDirName/ext",
+			      gDirUtilp->getDirName(pathExt),
+			      "aa" + delim + "bb" + delim + "cc" + delim + "dd");
+
+		// aa/bb/cc.dd/ee[.eXt]
+
+		ensure_equals("getDirName/d-no-ext",
+			      gDirUtilp->getDirName(dottedPathNoExt),
+			      "aa" + delim + "bb" + delim + "cc.dd");
+
+		ensure_equals("getDirName/d-ext",
+			      gDirUtilp->getDirName(dottedPathExt),
+			      "aa" + delim + "bb" + delim + "cc.dd");
+	}
+
+	template<> template<>
+	void LLDirTest_object_t::test<4>()
+		// getExtension
+	{
+		std::string delim = gDirUtilp->getDirDelimiter();
+		std::string rawFile = "foo";
+		std::string rawFileExt = "foo.bAr";
+		std::string rawFileNullExt = "foo.";
+		std::string rawExt = ".bAr";
+		std::string rawDot = ".";
+		std::string pathNoExt = "aa" + delim + "bb" + delim + "cc" + delim + "dd" + delim + "ee";
+		std::string pathExt = pathNoExt + ".eXt";
+		std::string dottedPathNoExt = "aa" + delim + "bb" + delim + "cc.dd" + delim + "ee";
+		std::string dottedPathExt = dottedPathNoExt + ".eXt";
+
+		// foo[.bAr]
+
+		ensure_equals("getExtension/r-no-ext",
+			      gDirUtilp->getExtension(rawFile),
+			      "");
+
+		ensure_equals("getExtension/r-ext",
+			      gDirUtilp->getExtension(rawFileExt),
+			      "bar");
+
+		// foo.
+
+		ensure_equals("getExtension/rn-no-ext",
+			      gDirUtilp->getExtension(rawFileNullExt),
+			      "");
+
+		// .bAr
+		// interesting case - with no basename, this IS the basename, not the extension.
+
+		ensure_equals("getExtension/e-ext",
+			      gDirUtilp->getExtension(rawExt),
+			      "");
+
+		// .
+
+		ensure_equals("getExtension/d",
+			      gDirUtilp->getExtension(rawDot),
+			      "");
+
+		// aa/bb/cc/dd/ee[.eXt]
+
+		ensure_equals("getExtension/no-ext",
+			      gDirUtilp->getExtension(pathNoExt),
+			      "");
+
+		ensure_equals("getExtension/ext",
+			      gDirUtilp->getExtension(pathExt),
+			      "ext");
+
+		// aa/bb/cc.dd/ee[.eXt]
+
+		ensure_equals("getExtension/d-no-ext",
+			      gDirUtilp->getExtension(dottedPathNoExt),
+			      "");
+
+		ensure_equals("getExtension/d-ext",
+			      gDirUtilp->getExtension(dottedPathExt),
+			      "ext");
+	}
+}
+
diff --git a/linden/indra/test/llerror_tut.cpp b/linden/indra/test/llerror_tut.cpp
index 46a5707..a240980 100644
--- a/linden/indra/test/llerror_tut.cpp
+++ b/linden/indra/test/llerror_tut.cpp
@@ -372,27 +372,21 @@ namespace
 	std::string logFromClassWithLogTypeMember(bool id) { ClassWithLogType c; return c.logFromMember(id); }
 	std::string logFromClassWithLogTypeStatic(bool id) { return ClassWithLogType::logFromStatic(id); }
 	
-	void ensure_has_once(const std::string& message,
+	void ensure_has(const std::string& message,
 		const std::string& actual, const std::string& expected)
 	{
 		std::string::size_type n1 = actual.find(expected);
-		std::string::size_type n2 = std::string::npos;
-		if (n1 != std::string::npos)
-		{
-			n2 = std::string(actual, n1 + expected.size()).find(expected);
-		}
-		
-		if (n1 == std::string::npos  ||  n2 != std::string::npos)
+		if (n1 == std::string::npos)
 		{
 			std::stringstream ss;
-			ss << message << ": " << "expected to find one copy of " << expected
+			ss << message << ": " << "expected to find a copy of " << expected
 				<< " in actual " << actual;
 			throw tut::failure(ss.str().c_str());
 		}
 	}
 	
 	typedef std::string (*LogFromFunction)(bool);
-	void testLogNameOnce(TestRecorder& recorder, LogFromFunction f,
+	void testLogName(TestRecorder& recorder, LogFromFunction f,
 		const std::string& class_name = "")
 	{
 		recorder.clearMessages();
@@ -402,16 +396,16 @@ namespace
 		std::string messageWithoutName = recorder.message(0);
 		std::string messageWithName = recorder.message(1);
 		
-		ensure_has_once(name + " logged without name",
+		ensure_has(name + " logged without name",
 			messageWithoutName, name);
-		ensure_has_once(name + " logged with name",
+		ensure_has(name + " logged with name",
 			messageWithName, name);
 
 		if (!class_name.empty())
 		{
-			ensure_has_once(name + "logged without name",
+			ensure_has(name + "logged without name",
 				messageWithoutName, class_name);
-			ensure_has_once(name + "logged with name",
+			ensure_has(name + "logged with name",
 				messageWithName, class_name);
 		}
 	}
@@ -423,15 +417,15 @@ namespace tut
 		// 	class/function information in output
 	void ErrorTestObject::test<6>()
 	{
-		testLogNameOnce(mRecorder, logFromGlobal);
-		testLogNameOnce(mRecorder, logFromStatic);
-		testLogNameOnce(mRecorder, logFromAnon);
-		testLogNameOnce(mRecorder, logFromNamespace);
-		//testLogNameOnce(mRecorder, logFromClassWithNoLogTypeMember, "ClassWithNoLogType");
-		//testLogNameOnce(mRecorder, logFromClassWithNoLogTypeStatic, "ClassWithNoLogType");
+		testLogName(mRecorder, logFromGlobal);
+		testLogName(mRecorder, logFromStatic);
+		testLogName(mRecorder, logFromAnon);
+		testLogName(mRecorder, logFromNamespace);
+		//testLogName(mRecorder, logFromClassWithNoLogTypeMember, "ClassWithNoLogType");
+		//testLogName(mRecorder, logFromClassWithNoLogTypeStatic, "ClassWithNoLogType");
 			// XXX: figure out what the exepcted response is for these
-		testLogNameOnce(mRecorder, logFromClassWithLogTypeMember, "ClassWithLogType");
-		testLogNameOnce(mRecorder, logFromClassWithLogTypeStatic, "ClassWithLogType");
+		testLogName(mRecorder, logFromClassWithLogTypeMember, "ClassWithLogType");
+		testLogName(mRecorder, logFromClassWithLogTypeStatic, "ClassWithLogType");
 	}
 }
 
diff --git a/linden/indra/test/llhost_tut.cpp b/linden/indra/test/llhost_tut.cpp
index fc2aee3..f1ad4e0 100644
--- a/linden/indra/test/llhost_tut.cpp
+++ b/linden/indra/test/llhost_tut.cpp
@@ -91,7 +91,7 @@ namespace tut
 		U32 ip = ip_string_to_u32("192.168.1.1");
 		U32 port = 8080;
 
-		LLHost host(ip_port_string.c_str());
+		LLHost host(ip_port_string);
 		ensure("IP address from IP:port is invalid", ip == host.getAddress());
 		ensure("Port Number from from IP:port is invalid", port == host.getPort());
 	}
@@ -138,23 +138,16 @@ namespace tut
 	template<> template<>
 	void host_object::test<8>()
 	{
-		char buffer[50];
-		char buffer1[50];
-		const char* str = "192.168.1.1";
+		const std::string str("192.168.1.1");
 		U32 port = 8080;
 		LLHost host;
 		host.set(str,port);
-		host.getString(buffer, 50);	
-		ensure("Function Failed", (0 == strcmp("192.168.1.1:8080", buffer)));
-
-		host.getIPString(buffer1, 50);
-		ensure("Function Failed", (0 == strcmp(str, buffer1)));
 
 		std::string ip_string = host.getIPString();
-		ensure("Function Failed", (0 == strcmp(str, buffer1)));
+		ensure("Function Failed", (ip_string == str));
 
 		std::string ip_string_port = host.getIPandPort();
-		ensure("Function Failed", (0 == strcmp("192.168.1.1:8080", buffer)));
+		ensure("Function Failed", (ip_string_port == "192.168.1.1:8080"));
 	}
 
 
@@ -163,17 +156,15 @@ namespace tut
 	void host_object::test<9>()
 	{
 		std::string hostStr = "google.com";		
-		char buffer[50] = {0};
 		LLHost host;
-		host.setHostByName(hostStr.c_str());	
-		host.getHostName(buffer, 50);
+		host.setHostByName(hostStr);	
+
 		// reverse DNS will likely result in appending of some
 		// sub-domain to the main hostname. so look for
 		// the main domain name and not do the exact compare
-		ensure("getHostName failed", (NULL != strstr(buffer, hostStr.c_str())));
 		
-		LLString hostname = host.getHostName();
-		ensure("getHostName failed", (NULL != strstr(hostname.c_str(), hostStr.c_str())));
+		std::string hostname = host.getHostName();
+		ensure("getHostName failed", hostname.find(hostStr) != std::string::npos);
 	}
 
 //	setHostByName for dotted IP
@@ -182,7 +173,7 @@ namespace tut
 	{
 		std::string hostStr = "64.233.167.99";		
 		LLHost host;
-		host.setHostByName(hostStr.c_str());	
+		host.setHostByName(hostStr);	
 		ensure("SetHostByName for dotted IP Address failed", host.getAddress() == ip_string_to_u32(hostStr.c_str()));
 	}
 
diff --git a/linden/indra/test/llhttpclient_tut.cpp b/linden/indra/test/llhttpclient_tut.cpp
index 1a2267c..1c41947 100644
--- a/linden/indra/test/llhttpclient_tut.cpp
+++ b/linden/indra/test/llhttpclient_tut.cpp
@@ -259,7 +259,7 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<1>()
 	{
-		LLHTTPClient::get("http://www.secondlife.com/", newResult());
+		LLHTTPClient::get("http://www.google.com/", newResult());
 		runThePump();
 		ensureStatusOK();
 		ensure("result object wasn't destroyed", mResultDeleted);
@@ -365,7 +365,7 @@ namespace tut
 	{
 		// This is testing for the presence of the Header in the returned results
 		// from an HTTP::get call.
-		LLHTTPClient::get("http://www.secondlife.com/", newResult());
+		LLHTTPClient::get("http://www.google.com/", newResult());
 		runThePump();
 		ensureStatusOK();
 		LLSD header = getHeader();
@@ -374,7 +374,7 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<9>()
 	{
-		LLHTTPClient::head("http://www.secondlife.com/", newResult());
+		LLHTTPClient::head("http://www.google.com/", newResult());
 		runThePump();
 		ensureStatusOK();
 		ensure("result object wasn't destroyed", mResultDeleted);
diff --git a/linden/indra/test/llhttpdate_tut.cpp b/linden/indra/test/llhttpdate_tut.cpp
index a07b11f..8e096cb 100644
--- a/linden/indra/test/llhttpdate_tut.cpp
+++ b/linden/indra/test/llhttpdate_tut.cpp
@@ -69,24 +69,25 @@ namespace tut
         time_t sometime;
         time(&sometime);
         some_date = LLDate((F64) sometime);
-        struct tm result;
-        char expected[255], *actual;
+        struct tm *result;
+        char expected[255];
+		std::string actual;
         
-        gmtime_r((time_t *)&sometime, &result);
+        result = gmtime(&sometime);
         /*
-        std::cout << " seconds: "<< result.tm_sec 
-                  << ", minutes: " << result.tm_min
-                  << ", hours: " << result.tm_hour
-                  << ", day of the month: " << result.tm_mday
-                  << ", month: " << result.tm_mon
-                  << ", year: " << result.tm_year
-                  << ", day of the week: " << result.tm_wday
-                  << ", day in the year: " << result.tm_yday
-                  << ", DST: " << result.tm_isdst << std::endl;
+        std::cout << " seconds: "<< result->tm_sec 
+                  << ", minutes: " << result->tm_min
+                  << ", hours: " << result->tm_hour
+                  << ", day of the month: " << result->tm_mday
+                  << ", month: " << result->tm_mon
+                  << ", year: " << result->tm_year
+                  << ", day of the week: " << result->tm_wday
+                  << ", day in the year: " << result->tm_yday
+                  << ", DST: " << result->tm_isdst << std::endl;
         */
-        strftime(expected, 255, "%A, %d %h %Y %H:%M:%S GMT", &result);
-        actual = (char *) some_date.asRFC1123().c_str();
+        strftime(expected, 255, "%A, %d %b %Y %H:%M:%S GMT", result);
+        actual = some_date.asRFC1123();
         // probably not a good idea to use strcmp but this is just a unit test
-        ensure("Current time in RFC 1123", (strcmp(expected, actual) == 0));
+        ensure("Current time in RFC 1123", (strcmp(expected, actual.c_str()) == 0));
     }
 }
diff --git a/linden/indra/test/llinventoryparcel_tut.cpp b/linden/indra/test/llinventoryparcel_tut.cpp
index 17c7244..8c30c38 100644
--- a/linden/indra/test/llinventoryparcel_tut.cpp
+++ b/linden/indra/test/llinventoryparcel_tut.cpp
@@ -51,22 +51,22 @@ namespace tut
 	{
 		for (S32 i=0; i<LLParcel::C_COUNT; ++i)
 		{
-			const char *catstring =  LLParcel::getCategoryString(LLParcel::ECategory(i));
+			const std::string& catstring =  LLParcel::getCategoryString(LLParcel::ECategory(i));
 			ensure("LLParcel::getCategoryString(i)",
-			       NULL != catstring);
+			       !catstring.empty());
 
-			const char *catuistring =  LLParcel::getCategoryUIString(LLParcel::ECategory(i));
+			const std::string& catuistring =  LLParcel::getCategoryUIString(LLParcel::ECategory(i));
 			ensure("LLParcel::getCategoryUIString(i)",
-			       NULL != catuistring);
+			       !catuistring.empty());
 
 			ensure_equals("LLParcel::ECategory mapping of string back to enum", LLParcel::getCategoryFromString(catstring), i);
 			ensure_equals("LLParcel::ECategory mapping of uistring back to enum", LLParcel::getCategoryFromUIString(catuistring), i);
 		}
 
 		// test the C_ANY case, which has to work for UI strings
-		const char *catuistring =  LLParcel::getCategoryUIString(LLParcel::C_ANY);
+		const std::string& catuistring =  LLParcel::getCategoryUIString(LLParcel::C_ANY);
 		ensure("LLParcel::getCategoryUIString(C_ANY)",
-		       NULL != catuistring);
+		       !catuistring.empty());
 
 		ensure_equals("LLParcel::ECategory mapping of uistring back to enum", LLParcel::getCategoryFromUIString(catuistring), LLParcel::C_ANY);
 	}
diff --git a/linden/indra/test/lliohttpserver_tut.cpp b/linden/indra/test/lliohttpserver_tut.cpp
index e9b04c9..e450cc4 100644
--- a/linden/indra/test/lliohttpserver_tut.cpp
+++ b/linden/indra/test/lliohttpserver_tut.cpp
@@ -125,7 +125,7 @@ namespace tut
 			pump->addChain(chain, DEFAULT_CHAIN_EXPIRY_SECS);
 
 			pumpPipe(pump, 10);
-			if(mResponse && (! timeout)) 
+			if(mResponse.notNull() && (! timeout)) 
 			{
 				mResponse->result(mResult);
 				mResponse = NULL;
@@ -138,7 +138,7 @@ namespace tut
 			delete pump;
 			apr_pool_destroy(pool);
 
-			if(mResponse && timeout)
+			if(mResponse.notNull() && timeout)
 			{
 				mResponse->result(mResult);
 				mResponse = NULL;
@@ -327,6 +327,23 @@ namespace tut
 		ensure_starts_with("large echo status", result, "HTTP/1.0 200 OK\r\n");
 	}
 
+	template<> template<>
+	void HTTPServiceTestObject::test<8>()
+	{
+		// test the OPTIONS http method -- the default implementation
+		// should return the X-Documentation-URL
+		std::ostringstream http_request;
+		http_request << "OPTIONS /  HTTP/1.0\r\nHost: localhost\r\n\r\n";
+		bool timeout = false;
+		std::string result = makeRequest("/", http_request.str(), timeout);
+		ensure_starts_with("OPTIONS verb ok", result, "HTTP/1.0 200 OK\r\n");
+		ensure_contains(
+			"Doc url header exists",
+			result,
+			"X-Documentation-URL: http://localhost");
+	}
+
+
 	/* TO DO:
 		test generation of not found and method not allowed errors
 	*/
diff --git a/linden/indra/test/llmessageconfig_tut.cpp b/linden/indra/test/llmessageconfig_tut.cpp
index 869070e..1f71d5f 100644
--- a/linden/indra/test/llmessageconfig_tut.cpp
+++ b/linden/indra/test/llmessageconfig_tut.cpp
@@ -56,7 +56,7 @@ namespace tut
 			oStr << "/tmp/llmessage-config-test-" << random;
 #endif
 			mTestConfigDir = oStr.str();
-			LLFile::mkdir(mTestConfigDir.c_str());
+			LLFile::mkdir(mTestConfigDir);
 			writeConfigFile(LLSD());
 			LLMessageConfig::initClass("simulator", mTestConfigDir);
 		}
@@ -64,16 +64,16 @@ namespace tut
 		~LLMessageConfigTestData()
 		{
 			// rm contents of temp dir
-			int rmfile = LLFile::remove((mTestConfigDir + "/message.xml").c_str());
+			int rmfile = LLFile::remove((mTestConfigDir + "/message.xml"));
 			ensure_equals("rmfile value", rmfile, 0);
 			// rm temp dir
-			int rmdir = LLFile::rmdir(mTestConfigDir.c_str());
+			int rmdir = LLFile::rmdir(mTestConfigDir);
 			ensure_equals("rmdir value", rmdir, 0);
 		}
 
 		void writeConfigFile(const LLSD& config)
 		{
-			llofstream file((mTestConfigDir + "/message.xml").c_str());
+			llofstream file((mTestConfigDir + "/message.xml"));
 			if (file.is_open())
 			{
 				LLSDSerialize::toPrettyXML(config, file);
diff --git a/linden/indra/test/llmessagetemplateparser_tut.cpp b/linden/indra/test/llmessagetemplateparser_tut.cpp
index 7634e90..b90efbb 100644
--- a/linden/indra/test/llmessagetemplateparser_tut.cpp
+++ b/linden/indra/test/llmessagetemplateparser_tut.cpp
@@ -292,7 +292,7 @@ namespace tut
 		delete message;
 	}
 
-	void LLMessageTemplateParserTestObject::test<8>()
+	template<> template<> void LLMessageTemplateParserTestObject::test<8>()
 		// tests message parsing on RezMultipleAttachmentsFromInv, a possibly-faulty message
 	{
 		std::string message_skel(
diff --git a/linden/indra/test/llnamevalue_tut.cpp b/linden/indra/test/llnamevalue_tut.cpp
index f604e84..0655f55 100644
--- a/linden/indra/test/llnamevalue_tut.cpp
+++ b/linden/indra/test/llnamevalue_tut.cpp
@@ -36,6 +36,11 @@
 #include "llnamevalue.h"
 #include "llsdserialize.h"
 
+#if LL_WINDOWS
+// disable unreachable code warnings
+#pragma warning(disable: 4702)
+#endif
+
 namespace tut
 {
 	struct namevalue_test
diff --git a/linden/indra/test/llquaternion_tut.cpp b/linden/indra/test/llquaternion_tut.cpp
index 5b8a6ef..d560a54 100644
--- a/linden/indra/test/llquaternion_tut.cpp
+++ b/linden/indra/test/llquaternion_tut.cpp
@@ -299,7 +299,7 @@ namespace tut
 		ensure("2. LLQuaternion Operator* failed", (4543086.5f == result.mQ[0]) &&
 											(8567578.0f == result.mQ[1]) &&
 											(3967591.25f == result.mQ[2]) &&
-											(-2047783.25f == result.mQ[3]));
+											is_approx_equal(-2047783.25f, result.mQ[3]));
 
 		//inline LLQuaternion operator+(const LLQuaternion &a, const LLQuaternion &b)fn.		
 		result = quat1 + quat2;
@@ -343,11 +343,11 @@ namespace tut
 		LLVector4 result = vect * quat;
 		ensure(
 			"1. LLVector4 operator*(const LLVector4 &a, const LLQuaternion &rot) failed", 
-			(39928406016.0f == result.mV[0]) &&
+			is_approx_equal(39928406016.0f, result.mV[0]) &&
 			// gcc on x86 actually gives us more precision than we were expecting, verified with -ffloat-store - we forgive this
 			(1457802240.0f >= result.mV[1]) && // gcc+x86+linux
-			(1457801728.0f <= result.mV[1]) && // elsewhere
-			(200580612096.0f == result.mV[2]) &&
+			(1457800960.0f <= result.mV[1]) && // elsewhere
+			is_approx_equal(200580612096.0f, result.mV[2]) &&
 			(75.099998f == result.mV[3]));
 
 		LLVector4 vect1(22.0f, 45.0f, 40.0f, 78.1f);
diff --git a/linden/indra/test/llsd_new_tut.cpp b/linden/indra/test/llsd_new_tut.cpp
index 2ab8668..6c8d96a 100644
--- a/linden/indra/test/llsd_new_tut.cpp
+++ b/linden/indra/test/llsd_new_tut.cpp
@@ -132,13 +132,11 @@ namespace tut
 		v = newUUID;	ensureTypeAndValue("set to new UUID", v, newUUID);
 		v = nullUUID;	ensureTypeAndValue("set to null again", v, nullUUID);
 		
-		// strings must be tested with three (!) types of string objects
+		// strings must be tested with two types of string objects
 		std::string s = "now is the time";
-		LLString ls = "for all good zorks";
-		const char* cs = "to come to the air of their planet";
+		const char* cs = "for all good zorks";
 
 		v = s;			ensureTypeAndValue("set to std::string", v, s);		
-		v = ls;			ensureTypeAndValue("set to LLString", v, ls);
 		v = cs;			ensureTypeAndValue("set to const char*", v, cs);
 	
 		LLDate epoch;
@@ -186,10 +184,10 @@ namespace tut
 						ensureTypeAndValue("construct std::string", ss1, "abc");
 		LLSD ss2 = std::string("abc");
 						ensureTypeAndValue("initialize std::string",ss2, "abc");
-		LLSD sl1(LLString("def"));
-						ensureTypeAndValue("construct LLString", sl1, "def");
-		LLSD sl2 = LLString("def");
-						ensureTypeAndValue("initialize LLString", sl2, "def");
+		LLSD sl1(std::string("def"));
+						ensureTypeAndValue("construct std::string", sl1, "def");
+		LLSD sl2 = std::string("def");
+						ensureTypeAndValue("initialize std::string", sl2, "def");
 		LLSD sc1("ghi");
 						ensureTypeAndValue("construct const char*", sc1, "ghi");
 		LLSD sc2 = "ghi";
@@ -432,10 +430,6 @@ namespace tut
 // SAD	s = v;				ensure_equals("assign to string", s, "  42.375");
 		s = (std::string)v;	ensure_equals("cast to string", s, "  42.375");
 
-		LLString t = "yo";
-// SAD	t = v;				ensure_equals("assign to LLString", t, "  42.375");
-		t = (LLString)v;	ensure_equals("cast to LLString", t, "  42.375");
-		
 		std::string uuidStr = "b1e50c2b-b627-4d23-8a86-a65d97b6319b";
 		v = uuidStr;
 		LLUUID u;
@@ -486,10 +480,10 @@ namespace tut
 						ensure_equals("contruct string", s1, "  42.375");
 						ensure_equals("initialize string", s2, "  42.375");
 
-		LLString t1(v);
-		LLString t2 = v.asString();		// SAD
-						ensure_equals("contruct LLString", t1, "  42.375");
-						ensure_equals("initialize LLString", t2, "  42.375");
+		std::string t1(v);
+		std::string t2 = v.asString();		// SAD
+						ensure_equals("contruct std::string", t1, "  42.375");
+						ensure_equals("initialize std::string", t2, "  42.375");
 
 		std::string uuidStr = "b1e50c2b-b627-4d23-8a86-a65d97b6319b";
 		v = uuidStr;
diff --git a/linden/indra/test/llsdmessagereader_tut.cpp b/linden/indra/test/llsdmessagereader_tut.cpp
index 04861c4..9fd4dfc 100755
--- a/linden/indra/test/llsdmessagereader_tut.cpp
+++ b/linden/indra/test/llsdmessagereader_tut.cpp
@@ -33,6 +33,10 @@
 #include <tut/tut.h>
 #include "linden_common.h"
 #include "lltut.h"
+#include "v3dmath.h"
+#include "v3math.h"
+#include "v4math.h"
+#include "llquaternion.h"
 
 #include "message.h"
 #include "llsdmessagereader.h"
diff --git a/linden/indra/test/llsdserialize_tut.cpp b/linden/indra/test/llsdserialize_tut.cpp
index fe732cd..4b4c787 100644
--- a/linden/indra/test/llsdserialize_tut.cpp
+++ b/linden/indra/test/llsdserialize_tut.cpp
@@ -44,7 +44,19 @@
 
 // These tests take too long to run on Windows. JC
 // Yeah, who cares if windows works or not, right? Phoenix
-#if !LL_WINDOWS
+// Change the 'FALSE' here to 'TRUE' to enable them on Windows
+#define RUN_PARSER_TESTS_ON_WINDOWS		FALSE
+
+#define RUN_PARSER_TESTS	(!LL_WINDOWS || RUN_PARSER_TESTS_ON_WINDOWS)
+
+
+
+#if RUN_PARSER_TESTS
+
+#if LL_WINDOWS
+#include <winsock2.h>
+typedef U32 uint32_t;
+#endif
 
 namespace tut
 {
@@ -225,6 +237,7 @@ namespace tut
 		mFormatter->format(v, stream);
 		//llinfos << "checkRoundTrip: length " << stream.str().length() << llendl;
 		LLSD w;
+		mParser->reset();	// reset() call is needed since test code re-uses mParser
 		mParser->parse(stream, w, stream.str().size());
 		
 		try
@@ -475,6 +488,7 @@ namespace tut
 			input.str(in);
 
 			LLSD parsed_result;
+			mParser->reset();	// reset() call is needed since test code re-uses mParser
 			S32 parsed_count = mParser->parse(input, parsed_result, in.size());
 			ensure_equals(msg, parsed_result, expected_value);
 
diff --git a/linden/indra/test/llsdtraits.h b/linden/indra/test/llsdtraits.h
index a9a2691..c462d31 100644
--- a/linden/indra/test/llsdtraits.h
+++ b/linden/indra/test/llsdtraits.h
@@ -84,10 +84,6 @@ LLSDTraits<LLSD::String>::LLSDTraits()
 { }
 
 template<>
-class LLSDTraits<LLString> : public LLSDTraits<LLSD::String>
-{ };
-
-template<>
 class LLSDTraits<const char*> : public LLSDTraits<LLSD::String>
 { };
 
diff --git a/linden/indra/test/llsdutil_tut.cpp b/linden/indra/test/llsdutil_tut.cpp
index 955b8fd..81df9bf 100644
--- a/linden/indra/test/llsdutil_tut.cpp
+++ b/linden/indra/test/llsdutil_tut.cpp
@@ -33,9 +33,15 @@
 
 #include "linden_common.h"
 #include "lltut.h"
+#include "m4math.h"
+#include "v2math.h"
+#include "v2math.h"
 #include "v3color.h"
+#include "v3math.h"
+#include "v3dmath.h"
+#include "v4coloru.h"
 #include "v4math.h"
-#include "m4math.h"
+#include "llquaternion.h"
 #include "llsdutil.h"
 
 
diff --git a/linden/indra/test/llstring_tut.cpp b/linden/indra/test/llstring_tut.cpp
index 16569ea..191b804 100644
--- a/linden/indra/test/llstring_tut.cpp
+++ b/linden/indra/test/llstring_tut.cpp
@@ -31,9 +31,10 @@
  * $/LicenseInfo$
  */
 
+#include "linden_common.h"
+
 #include <tut/tut.h>
 #include "lltut.h"
-#include "linden_common.h"
 #include "llstring.h"
 
 namespace tut
@@ -48,455 +49,624 @@ namespace tut
 	template<> template<>
 	void string_index_object_t::test<1>()
 	{
-		LLString llstr1;
-		ensure("Empty LLString", (llstr1.size() == 0) && llstr1.empty());
+		std::string llstr1;
+		ensure("Empty std::string", (llstr1.size() == 0) && llstr1.empty());
 
-		LLString llstr2("Hello");
-		ensure("LLString = Hello", (!strcmp(llstr2.c_str(), "Hello")) && (llstr2.size() == 5) && !llstr2.empty());
+		std::string llstr2("Hello");
+		ensure("std::string = Hello", (!strcmp(llstr2.c_str(), "Hello")) && (llstr2.size() == 5) && !llstr2.empty());
 
-		LLString llstr3(llstr2);
-		ensure("LLString = LLString(LLString)", (!strcmp(llstr3.c_str(), "Hello")) && (llstr3.size() == 5) && !llstr3.empty());
+		std::string llstr3(llstr2);
+		ensure("std::string = std::string(std::string)", (!strcmp(llstr3.c_str(), "Hello")) && (llstr3.size() == 5) && !llstr3.empty());
 
 		std::string str("Hello World");
-		LLString llstr4(str, 6);
-		ensure("LLString = LLString(s, size_type pos, size_type n = npos)", (!strcmp(llstr4.c_str(), "World")) && (llstr4.size() == 5) && !llstr4.empty());
+		std::string llstr4(str, 6);
+		ensure("std::string = std::string(s, size_type pos, size_type n = npos)", (!strcmp(llstr4.c_str(), "World")) && (llstr4.size() == 5) && !llstr4.empty());
 
-		LLString llstr5(str, str.size());
-		ensure("LLString = LLString(s, size_type pos, size_type n = npos)", (llstr5.size() == 0) && llstr5.empty());
+		std::string llstr5(str, str.size());
+		ensure("std::string = std::string(s, size_type pos, size_type n = npos)", (llstr5.size() == 0) && llstr5.empty());
 
-		LLString llstr6(5, 'A');
-		ensure("LLString = LLString(count, c)", (!strcmp(llstr6.c_str(), "AAAAA")) && (llstr6.size() == 5) && !llstr6.empty());
+		std::string llstr6(5, 'A');
+		ensure("std::string = std::string(count, c)", (!strcmp(llstr6.c_str(), "AAAAA")) && (llstr6.size() == 5) && !llstr6.empty());
 
-		LLString llstr7("Hello World", 5);
-		ensure("LLString(s, n)", (!strcmp(llstr7.c_str(), "Hello")) && (llstr7.size() == 5) && !llstr7.empty());
+		std::string llstr7("Hello World", 5);
+		ensure("std::string(s, n)", (!strcmp(llstr7.c_str(), "Hello")) && (llstr7.size() == 5) && !llstr7.empty());
 
-		LLString llstr8("Hello World", 6, 5);
-		ensure("LLString(s, n, count)", (!strcmp(llstr8.c_str(), "World")) && (llstr8.size() == 5) && !llstr8.empty());
+		std::string llstr8("Hello World", 6, 5);
+		ensure("std::string(s, n, count)", (!strcmp(llstr8.c_str(), "World")) && (llstr8.size() == 5) && !llstr8.empty());
 
-		LLString llstr9("Hello World", sizeof("Hello World")-1, 5); // go past end
-		ensure("LLString(s, n, count) goes past end", (llstr9.size() == 0) && llstr9.empty());
+		std::string llstr9("Hello World", sizeof("Hello World")-1, 5); // go past end
+		ensure("std::string(s, n, count) goes past end", (llstr9.size() == 0) && llstr9.empty());
 	}
 
 	template<> template<>
-	void string_index_object_t::test<2>()
+	void string_index_object_t::test<3>()
 	{
-		LLString str("Len=5");
-		ensure("isValidIndex failed", LLString::isValidIndex(str, 0) == TRUE &&
-									  LLString::isValidIndex(str, 5) == TRUE &&
-									  LLString::isValidIndex(str, 6) == FALSE);
+		std::string str("Len=5");
+		ensure("isValidIndex failed", LLStringUtil::isValidIndex(str, 0) == TRUE &&
+									  LLStringUtil::isValidIndex(str, 5) == TRUE &&
+									  LLStringUtil::isValidIndex(str, 6) == FALSE);
 
-		LLString str1;
-		ensure("isValidIndex failed fo rempty string", LLString::isValidIndex(str1, 0) == FALSE);
+		std::string str1;
+		ensure("isValidIndex failed fo rempty string", LLStringUtil::isValidIndex(str1, 0) == FALSE);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<3>()
+	void string_index_object_t::test<4>()
 	{
-		LLString str_val("               Testing the extra whitespaces   ");
-		LLString::trimHead(str_val);
+		std::string str_val("               Testing the extra whitespaces   ");
+		LLStringUtil::trimHead(str_val);
 		ensure_equals("1: trimHead failed", str_val, "Testing the extra whitespaces   ");
 
-		LLString str_val1("\n\t\r\n  Testing the extra whitespaces   ");
-		LLString::trimHead(str_val1);
+		std::string str_val1("\n\t\r\n  Testing the extra whitespaces   ");
+		LLStringUtil::trimHead(str_val1);
 		ensure_equals("2: trimHead failed", str_val1, "Testing the extra whitespaces   ");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<4>()
+	void string_index_object_t::test<5>()
 	{
-		LLString str_val("  Testing the   extra     whitespaces         ");
-		LLString::trimTail(str_val);
+		std::string str_val("  Testing the   extra     whitespaces         ");
+		LLStringUtil::trimTail(str_val);
 		ensure_equals("1: trimTail failed", str_val, "  Testing the   extra     whitespaces");
 
-		LLString str_val1("\n  Testing the extra whitespaces  \n\t\r\n   ");
-		LLString::trimTail(str_val1);
+		std::string str_val1("\n  Testing the extra whitespaces  \n\t\r\n   ");
+		LLStringUtil::trimTail(str_val1);
 		ensure_equals("2: trimTail failed", str_val1, "\n  Testing the extra whitespaces");
 	}
 
 
 	template<> template<>
-	void string_index_object_t::test<5>()
+	void string_index_object_t::test<6>()
 	{
-		LLString str_val("  \t \r Testing the   extra     \r\n whitespaces     \n \t    ");
-		LLString::trim(str_val);
+		std::string str_val("  \t \r Testing the   extra     \r\n whitespaces     \n \t    ");
+		LLStringUtil::trim(str_val);
 		ensure_equals("1: trim failed", str_val, "Testing the   extra     \r\n whitespaces");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<6>()
+	void string_index_object_t::test<7>()
 	{
-		LLString str("Second LindenLabs");
-		LLString::truncate(str, 6);
+		std::string str("Second LindenLabs");
+		LLStringUtil::truncate(str, 6);
 		ensure_equals("1: truncate", str, "Second");
 
 		// further truncate more than the length
-		LLString::truncate(str, 0);
+		LLStringUtil::truncate(str, 0);
 		ensure_equals("2: truncate", str, "");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<7>()
+	void string_index_object_t::test<8>()
 	{
-		LLString str_val("SecondLife Source");
-		LLString::toUpper(str_val);
+		std::string str_val("SecondLife Source");
+		LLStringUtil::toUpper(str_val);
 		ensure_equals("toUpper failed", str_val, "SECONDLIFE SOURCE");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<8>()
+	void string_index_object_t::test<9>()
 	{
-		LLString str_val("SecondLife Source");
-		LLString::toLower(str_val);
+		std::string str_val("SecondLife Source");
+		LLStringUtil::toLower(str_val);
 		ensure_equals("toLower failed", str_val, "secondlife source");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<9>()
+	void string_index_object_t::test<10>()
 	{
-		LLString str_val("Second");
-		ensure("1. isHead failed", LLString::isHead(str_val, "SecondLife Source") == TRUE);
-		ensure("2. isHead failed", LLString::isHead(str_val, " SecondLife Source") == FALSE);
-		LLString str_val2("");
-		ensure("3. isHead failed", LLString::isHead(str_val2, "") == FALSE);
+		std::string str_val("Second");
+		ensure("1. isHead failed", LLStringUtil::isHead(str_val, "SecondLife Source") == TRUE);
+		ensure("2. isHead failed", LLStringUtil::isHead(str_val, " SecondLife Source") == FALSE);
+		std::string str_val2("");
+		ensure("3. isHead failed", LLStringUtil::isHead(str_val2, "") == FALSE);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<10>()
+	void string_index_object_t::test<11>()
 	{
-		LLString str_val("Hello.\n\n Lindenlabs. \n This is \na simple test.\n");
-		LLString orig_str_val(str_val);
-		LLString::addCRLF(str_val);
+		std::string str_val("Hello.\n\n Lindenlabs. \n This is \na simple test.\n");
+		std::string orig_str_val(str_val);
+		LLStringUtil::addCRLF(str_val);
 		ensure_equals("addCRLF failed", str_val, "Hello.\r\n\r\n Lindenlabs. \r\n This is \r\na simple test.\r\n");
-		LLString::removeCRLF(str_val);
+		LLStringUtil::removeCRLF(str_val);
 		ensure_equals("removeCRLF failed", str_val, orig_str_val);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<11>()
+	void string_index_object_t::test<12>()
 	{
-		LLString str_val("Hello.\n\n\t \t Lindenlabs. \t\t");
-		LLString orig_str_val(str_val);
-		LLString::replaceTabsWithSpaces(str_val, 1);
+		std::string str_val("Hello.\n\n\t \t Lindenlabs. \t\t");
+		std::string orig_str_val(str_val);
+		LLStringUtil::replaceTabsWithSpaces(str_val, 1);
 		ensure_equals("replaceTabsWithSpaces failed", str_val, "Hello.\n\n    Lindenlabs.   ");
-		LLString::replaceTabsWithSpaces(orig_str_val, 0);
+		LLStringUtil::replaceTabsWithSpaces(orig_str_val, 0);
 		ensure_equals("replaceTabsWithSpaces failed for 0", orig_str_val, "Hello.\n\n  Lindenlabs. ");
 
 		str_val = "\t\t\t\t";
-		LLString::replaceTabsWithSpaces(str_val, 0);
+		LLStringUtil::replaceTabsWithSpaces(str_val, 0);
 		ensure_equals("replaceTabsWithSpaces failed for all tabs", str_val, "");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<12>()
+	void string_index_object_t::test<13>()
 	{
-		LLString str_val("Hello.\n\n\t\t\r\nLindenlabsX.");
-		LLString::replaceNonstandardASCII(str_val, 'X');
+		std::string str_val("Hello.\n\n\t\t\r\nLindenlabsX.");
+		LLStringUtil::replaceNonstandardASCII(str_val, 'X');
 		ensure_equals("replaceNonstandardASCII failed", str_val, "Hello.\n\nXXX\nLindenlabsX.");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<13>()
+	void string_index_object_t::test<14>()
 	{
-		LLString str_val("Hello.\n\t\r\nABCDEFGHIABABAB");
-		LLString::replaceChar(str_val, 'A', 'X');
+		std::string str_val("Hello.\n\t\r\nABCDEFGHIABABAB");
+		LLStringUtil::replaceChar(str_val, 'A', 'X');
 		ensure_equals("1: replaceChar failed", str_val, "Hello.\n\t\r\nXBCDEFGHIXBXBXB");
-		LLString str_val1("Hello.\n\t\r\nABCDEFGHIABABAB");
+		std::string str_val1("Hello.\n\t\r\nABCDEFGHIABABAB");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<14>()
+	void string_index_object_t::test<15>()
 	{
-		LLString str_val("Hello.\n\r\t");
-		ensure("containsNonprintable failed", LLString::containsNonprintable(str_val) == TRUE);
+		std::string str_val("Hello.\n\r\t");
+		ensure("containsNonprintable failed", LLStringUtil::containsNonprintable(str_val) == TRUE);
 
 		str_val = "ABC ";
-		ensure("containsNonprintable failed", LLString::containsNonprintable(str_val) == FALSE);
+		ensure("containsNonprintable failed", LLStringUtil::containsNonprintable(str_val) == FALSE);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<15>()
+	void string_index_object_t::test<16>()
 	{
-		LLString str_val("Hello.\n\r\t Again!");
-		LLString::stripNonprintable(str_val);
+		std::string str_val("Hello.\n\r\t Again!");
+		LLStringUtil::stripNonprintable(str_val);
 		ensure_equals("stripNonprintable failed", str_val, "Hello. Again!");
 
 		str_val = "\r\n\t\t";
-		LLString::stripNonprintable(str_val);
+		LLStringUtil::stripNonprintable(str_val);
 		ensure_equals("stripNonprintable resulting in empty string failed", str_val, "");
 	}
 
 	template<> template<>
-	void string_index_object_t::test<16>()
+	void string_index_object_t::test<17>()
 	{
 		BOOL value;
-		LLString str_val("1");
-		ensure("convertToBOOL 1 failed", LLString::convertToBOOL(str_val, value) && value);
+		std::string str_val("1");
+		ensure("convertToBOOL 1 failed", LLStringUtil::convertToBOOL(str_val, value) && value);
 		str_val = "T";
-		ensure("convertToBOOL T failed", LLString::convertToBOOL(str_val, value) && value);
+		ensure("convertToBOOL T failed", LLStringUtil::convertToBOOL(str_val, value) && value);
 		str_val = "t";
-		ensure("convertToBOOL t failed", LLString::convertToBOOL(str_val, value) && value);
+		ensure("convertToBOOL t failed", LLStringUtil::convertToBOOL(str_val, value) && value);
 		str_val = "TRUE";
-		ensure("convertToBOOL TRUE failed", LLString::convertToBOOL(str_val, value) && value);
+		ensure("convertToBOOL TRUE failed", LLStringUtil::convertToBOOL(str_val, value) && value);
 		str_val = "True";
-		ensure("convertToBOOL True failed", LLString::convertToBOOL(str_val, value) && value);
+		ensure("convertToBOOL True failed", LLStringUtil::convertToBOOL(str_val, value) && value);
 		str_val = "true";
-		ensure("convertToBOOL true failed", LLString::convertToBOOL(str_val, value) && value);
+		ensure("convertToBOOL true failed", LLStringUtil::convertToBOOL(str_val, value) && value);
 
 		str_val = "0";
-		ensure("convertToBOOL 0 failed", LLString::convertToBOOL(str_val, value) && !value);
+		ensure("convertToBOOL 0 failed", LLStringUtil::convertToBOOL(str_val, value) && !value);
 		str_val = "F";
-		ensure("convertToBOOL F failed", LLString::convertToBOOL(str_val, value) && !value);
+		ensure("convertToBOOL F failed", LLStringUtil::convertToBOOL(str_val, value) && !value);
 		str_val = "f";
-		ensure("convertToBOOL f failed", LLString::convertToBOOL(str_val, value) && !value);
+		ensure("convertToBOOL f failed", LLStringUtil::convertToBOOL(str_val, value) && !value);
 		str_val = "FALSE";
-		ensure("convertToBOOL FASLE failed", LLString::convertToBOOL(str_val, value) && !value);
+		ensure("convertToBOOL FASLE failed", LLStringUtil::convertToBOOL(str_val, value) && !value);
 		str_val = "False";
-		ensure("convertToBOOL False failed", LLString::convertToBOOL(str_val, value) && !value);
+		ensure("convertToBOOL False failed", LLStringUtil::convertToBOOL(str_val, value) && !value);
 		str_val = "false";
-		ensure("convertToBOOL false failed", LLString::convertToBOOL(str_val, value) && !value);
+		ensure("convertToBOOL false failed", LLStringUtil::convertToBOOL(str_val, value) && !value);
 
 		str_val = "Tblah";
-		ensure("convertToBOOL false failed", !LLString::convertToBOOL(str_val, value));
+		ensure("convertToBOOL false failed", !LLStringUtil::convertToBOOL(str_val, value));
 	}
 
 	template<> template<>
-	void string_index_object_t::test<17>()
+	void string_index_object_t::test<18>()
 	{
 		U8 value;
-		LLString str_val("255");
-		ensure("1: convertToU8 failed", LLString::convertToU8(str_val, value) && value == 255);
+		std::string str_val("255");
+		ensure("1: convertToU8 failed", LLStringUtil::convertToU8(str_val, value) && value == 255);
 
 		str_val = "0";
-		ensure("2: convertToU8 failed", LLString::convertToU8(str_val, value) && value == 0);
+		ensure("2: convertToU8 failed", LLStringUtil::convertToU8(str_val, value) && value == 0);
 
 		str_val = "-1";
-		ensure("3: convertToU8 failed", !LLString::convertToU8(str_val, value));
+		ensure("3: convertToU8 failed", !LLStringUtil::convertToU8(str_val, value));
 
 		str_val = "256"; // bigger than MAX_U8
-		ensure("4: convertToU8 failed", !LLString::convertToU8(str_val, value));
+		ensure("4: convertToU8 failed", !LLStringUtil::convertToU8(str_val, value));
 	}
 
 	template<> template<>
-	void string_index_object_t::test<18>()
+	void string_index_object_t::test<19>()
 	{
 		S8 value;
-		LLString str_val("127");
-		ensure("1: convertToS8 failed", LLString::convertToS8(str_val, value) && value == 127);
+		std::string str_val("127");
+		ensure("1: convertToS8 failed", LLStringUtil::convertToS8(str_val, value) && value == 127);
 
 		str_val = "0";
-		ensure("2: convertToS8 failed", LLString::convertToS8(str_val, value) && value == 0);
+		ensure("2: convertToS8 failed", LLStringUtil::convertToS8(str_val, value) && value == 0);
 
 		str_val = "-128";
-		ensure("3: convertToS8 failed", LLString::convertToS8(str_val, value) && value == -128);
+		ensure("3: convertToS8 failed", LLStringUtil::convertToS8(str_val, value) && value == -128);
 
 		str_val = "128"; // bigger than MAX_S8
-		ensure("4: convertToS8 failed", !LLString::convertToS8(str_val, value));
+		ensure("4: convertToS8 failed", !LLStringUtil::convertToS8(str_val, value));
 
 		str_val = "-129"; 
-		ensure("5: convertToS8 failed", !LLString::convertToS8(str_val, value));
+		ensure("5: convertToS8 failed", !LLStringUtil::convertToS8(str_val, value));
 	}
 
 	template<> template<>
-	void string_index_object_t::test<19>()
+	void string_index_object_t::test<20>()
 	{
 		S16 value;
-		LLString str_val("32767"); 
-		ensure("1: convertToS16 failed", LLString::convertToS16(str_val, value) && value == 32767);
+		std::string str_val("32767"); 
+		ensure("1: convertToS16 failed", LLStringUtil::convertToS16(str_val, value) && value == 32767);
 
 		str_val = "0";
-		ensure("2: convertToS16 failed", LLString::convertToS16(str_val, value) && value == 0);
+		ensure("2: convertToS16 failed", LLStringUtil::convertToS16(str_val, value) && value == 0);
 
 		str_val = "-32768";
-		ensure("3: convertToS16 failed", LLString::convertToS16(str_val, value) && value == -32768);
+		ensure("3: convertToS16 failed", LLStringUtil::convertToS16(str_val, value) && value == -32768);
 
 		str_val = "32768"; 
-		ensure("4: convertToS16 failed", !LLString::convertToS16(str_val, value));
+		ensure("4: convertToS16 failed", !LLStringUtil::convertToS16(str_val, value));
 
 		str_val = "-32769";
-		ensure("5: convertToS16 failed", !LLString::convertToS16(str_val, value));
+		ensure("5: convertToS16 failed", !LLStringUtil::convertToS16(str_val, value));
 	}
 
 	template<> template<>
-	void string_index_object_t::test<20>()
+	void string_index_object_t::test<21>()
 	{
 		U16 value;
-		LLString str_val("65535"); //0xFFFF
-		ensure("1: convertToU16 failed", LLString::convertToU16(str_val, value) && value == 65535);
+		std::string str_val("65535"); //0xFFFF
+		ensure("1: convertToU16 failed", LLStringUtil::convertToU16(str_val, value) && value == 65535);
 
 		str_val = "0";
-		ensure("2: convertToU16 failed", LLString::convertToU16(str_val, value) && value == 0);
+		ensure("2: convertToU16 failed", LLStringUtil::convertToU16(str_val, value) && value == 0);
 
 		str_val = "-1"; 
-		ensure("3: convertToU16 failed", !LLString::convertToU16(str_val, value));
+		ensure("3: convertToU16 failed", !LLStringUtil::convertToU16(str_val, value));
 
 		str_val = "65536"; 
-		ensure("4: convertToU16 failed", !LLString::convertToU16(str_val, value));
+		ensure("4: convertToU16 failed", !LLStringUtil::convertToU16(str_val, value));
 	}
 
 	template<> template<>
-	void string_index_object_t::test<21>()
+	void string_index_object_t::test<22>()
 	{
 		U32 value;
-		LLString str_val("4294967295"); //0xFFFFFFFF
-		ensure("1: convertToU32 failed", LLString::convertToU32(str_val, value) && value == 4294967295);
+		std::string str_val("4294967295"); //0xFFFFFFFF
+		ensure("1: convertToU32 failed", LLStringUtil::convertToU32(str_val, value) && value == 4294967295UL);
 
 		str_val = "0";
-		ensure("2: convertToU32 failed", LLString::convertToU32(str_val, value) && value == 0);
+		ensure("2: convertToU32 failed", LLStringUtil::convertToU32(str_val, value) && value == 0);
 
+#ifndef LL_DARWIN
 		str_val = "-1"; 
-		ensure("3: convertToU32 failed", LLString::convertToU32(str_val, value) && value == 4294967295);
-
+		ensure("3: convertToU32 failed", LLStringUtil::convertToU32(str_val, value) && value == 4294967295UL);
+#endif
+		
 		str_val = "4294967296"; 
-		ensure("4: convertToU32 failed", !LLString::convertToU32(str_val, value));
+		ensure("4: convertToU32 failed", !LLStringUtil::convertToU32(str_val, value));
 	}
 
 	template<> template<>
-	void string_index_object_t::test<22>()
+	void string_index_object_t::test<23>()
 	{
 		S32 value;
-		LLString str_val("2147483647"); //0x7FFFFFFF
-		ensure("1: convertToS32 failed", LLString::convertToS32(str_val, value) && value == 2147483647);
+		std::string str_val("2147483647"); //0x7FFFFFFF
+		ensure("1: convertToS32 failed", LLStringUtil::convertToS32(str_val, value) && value == 2147483647);
 
 		str_val = "0";
-		ensure("2: convertToS32 failed", LLString::convertToS32(str_val, value) && value == 0);
+		ensure("2: convertToS32 failed", LLStringUtil::convertToS32(str_val, value) && value == 0);
 
+		// Avoid "unary minus operator applied to unsigned type" warning on VC++. JC
+		S32 min_val = -2147483647 - 1;
 		str_val = "-2147483648"; 
-		ensure("3: convertToS32 failed", LLString::convertToS32(str_val, value)  && value == -2147483648);
+		ensure("3: convertToS32 failed", LLStringUtil::convertToS32(str_val, value)  && value == min_val);
 
 		str_val = "2147483648"; 
-		ensure("4: convertToS32 failed", !LLString::convertToS32(str_val, value));
+		ensure("4: convertToS32 failed", !LLStringUtil::convertToS32(str_val, value));
 
 		str_val = "-2147483649"; 
-		ensure("5: convertToS32 failed", !LLString::convertToS32(str_val, value));
+		ensure("5: convertToS32 failed", !LLStringUtil::convertToS32(str_val, value));
 	}
 
 	template<> template<>
-	void string_index_object_t::test<23>()
+	void string_index_object_t::test<24>()
 	{
 		F32 value;
-		LLString str_val("2147483647"); //0x7FFFFFFF
-		ensure("1: convertToF32 failed", LLString::convertToF32(str_val, value) && value == 2147483647);
+		std::string str_val("2147483647"); //0x7FFFFFFF
+		ensure("1: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 2147483647);
 
 		str_val = "0";
-		ensure("2: convertToF32 failed", LLString::convertToF32(str_val, value) && value == 0);
+		ensure("2: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 0);
 
 		/* Need to find max/min F32 values
 		str_val = "-2147483648"; 
-		ensure("3: convertToF32 failed", LLString::convertToF32(str_val, value)  && value == -2147483648);
+		ensure("3: convertToF32 failed", LLStringUtil::convertToF32(str_val, value)  && value == -2147483648);
 
 		str_val = "2147483648"; 
-		ensure("4: convertToF32 failed", !LLString::convertToF32(str_val, value));
+		ensure("4: convertToF32 failed", !LLStringUtil::convertToF32(str_val, value));
 
 		str_val = "-2147483649"; 
-		ensure("5: convertToF32 failed", !LLString::convertToF32(str_val, value));
+		ensure("5: convertToF32 failed", !LLStringUtil::convertToF32(str_val, value));
 		*/
 	}
 
 	template<> template<>
-	void string_index_object_t::test<24>()
+	void string_index_object_t::test<25>()
 	{
 		F64 value;
-		LLString str_val("9223372036854775807"); //0x7FFFFFFFFFFFFFFF
-		ensure("1: convertToF64 failed", LLString::convertToF64(str_val, value) && value == 9223372036854775807);
+		std::string str_val("9223372036854775807"); //0x7FFFFFFFFFFFFFFF
+		ensure("1: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 9223372036854775807LL);
 
 		str_val = "0";
-		ensure("2: convertToF64 failed", LLString::convertToF64(str_val, value) && value == 0);
+		ensure("2: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 0.0F);
 
 		/* Need to find max/min F64 values
 		str_val = "-2147483648"; 
-		ensure("3: convertToF32 failed", LLString::convertToF32(str_val, value)  && value == -2147483648);
+		ensure("3: convertToF32 failed", LLStringUtil::convertToF32(str_val, value)  && value == -2147483648);
 
 		str_val = "2147483648"; 
-		ensure("4: convertToF32 failed", !LLString::convertToF32(str_val, value));
+		ensure("4: convertToF32 failed", !LLStringUtil::convertToF32(str_val, value));
 
 		str_val = "-2147483649"; 
-		ensure("5: convertToF32 failed", !LLString::convertToF32(str_val, value));
+		ensure("5: convertToF32 failed", !LLStringUtil::convertToF32(str_val, value));
 		*/
 	}
 
 	template<> template<>
-	void string_index_object_t::test<25>()
+	void string_index_object_t::test<26>()
 	{
 		char* str1 = NULL;
 		char* str2 = NULL;
 
-		ensure("1: compareStrings failed", LLString::compareStrings(str1, str2) == 0);
+		ensure("1: compareStrings failed", LLStringUtil::compareStrings(str1, str2) == 0);
 		str2 = "A";
-		ensure("2: compareStrings failed", LLString::compareStrings(str1, str2) > 0);
-		ensure("3: compareStrings failed", LLString::compareStrings(str2, str1) < 0);
+		ensure("2: compareStrings failed", LLStringUtil::compareStrings(str1, str2) > 0);
+		ensure("3: compareStrings failed", LLStringUtil::compareStrings(str2, str1) < 0);
 		
 		str1 = "A is smaller than B";
 		str2 = "B is greater than A";
-		ensure("4: compareStrings failed", LLString::compareStrings(str1, str2) < 0);
+		ensure("4: compareStrings failed", LLStringUtil::compareStrings(str1, str2) < 0);
 
 		str2 = "A is smaller than B";
-		ensure("5: compareStrings failed", LLString::compareStrings(str1, str2) == 0);
+		ensure("5: compareStrings failed", LLStringUtil::compareStrings(str1, str2) == 0);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<26>()
+	void string_index_object_t::test<27>()
 	{
 		char* str1 = NULL;
 		char* str2 = NULL;
 
-		ensure("1: compareInsensitive failed", LLString::compareInsensitive(str1, str2) == 0);
+		ensure("1: compareInsensitive failed", LLStringUtil::compareInsensitive(str1, str2) == 0);
 		str2 = "A";
-		ensure("2: compareInsensitive failed", LLString::compareInsensitive(str1, str2) > 0);
-		ensure("3: compareInsensitive failed", LLString::compareInsensitive(str2, str1) < 0);
+		ensure("2: compareInsensitive failed", LLStringUtil::compareInsensitive(str1, str2) > 0);
+		ensure("3: compareInsensitive failed", LLStringUtil::compareInsensitive(str2, str1) < 0);
 		
 		str1 = "A is equal to a";
 		str2 = "a is EQUAL to A";
-		ensure("4: compareInsensitive failed", LLString::compareInsensitive(str1, str2) == 0);
+		ensure("4: compareInsensitive failed", LLStringUtil::compareInsensitive(str1, str2) == 0);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<27>()
+	void string_index_object_t::test<28>()
 	{
-		LLString lhs_str("PROgraM12files");
-		LLString rhs_str("PROgram12Files");
-		ensure("compareDict 1 failed", LLString::compareDict(lhs_str, rhs_str) < 0);
-		ensure("precedesDict 1 failed", LLString::precedesDict(lhs_str, rhs_str) == TRUE);
+		std::string lhs_str("PROgraM12files");
+		std::string rhs_str("PROgram12Files");
+		ensure("compareDict 1 failed", LLStringUtil::compareDict(lhs_str, rhs_str) < 0);
+		ensure("precedesDict 1 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == TRUE);
 		
 		lhs_str = "PROgram12Files";
 		rhs_str = "PROgram12Files";
-		ensure("compareDict 2 failed", LLString::compareDict(lhs_str, rhs_str) == 0);
-		ensure("precedesDict 2 failed", LLString::precedesDict(lhs_str, rhs_str) == FALSE);
+		ensure("compareDict 2 failed", LLStringUtil::compareDict(lhs_str, rhs_str) == 0);
+		ensure("precedesDict 2 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == FALSE);
 
 		lhs_str = "PROgram12Files";
 		rhs_str = "PROgRAM12FILES";
-		ensure("compareDict 3 failed", LLString::compareDict(lhs_str, rhs_str) > 0);
-		ensure("precedesDict 3 failed", LLString::precedesDict(lhs_str, rhs_str) == FALSE);
+		ensure("compareDict 3 failed", LLStringUtil::compareDict(lhs_str, rhs_str) > 0);
+		ensure("precedesDict 3 failed", LLStringUtil::precedesDict(lhs_str, rhs_str) == FALSE);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<28>()
+	void string_index_object_t::test<29>()
 	{
 		char str1[] = "First String...";
 		char str2[100];
 
-		LLString::copy(str2, str1, 100);
-		ensure("LLString::copy with enough dest lenght failed", strcmp(str2, str1) == 0);
-		LLString::copy(str2, str1, sizeof("First"));
-		ensure("LLString::copy with less dest lenght failed", strcmp(str2, "First") == 0);
+		LLStringUtil::copy(str2, str1, 100);
+		ensure("LLStringUtil::copy with enough dest length failed", strcmp(str2, str1) == 0);
+		LLStringUtil::copy(str2, str1, sizeof("First"));
+		ensure("LLStringUtil::copy with less dest length failed", strcmp(str2, "First") == 0);
 	}
 
 	template<> template<>
-	void string_index_object_t::test<29>()
+	void string_index_object_t::test<30>()
 	{
-		LLString str1 = "This is the sentence...";
-		LLString str2 = "This is the ";
-		LLString str3 = "first ";
-		LLString str4 = "This is the first sentence...";
-		LLString str5 = "This is the sentence...first ";
-		LLString dest;
+		std::string str1 = "This is the sentence...";
+		std::string str2 = "This is the ";
+		std::string str3 = "first ";
+		std::string str4 = "This is the first sentence...";
+		std::string str5 = "This is the sentence...first ";
+		std::string dest;
 
 		dest = str1;
-		LLString::copyInto(dest, str3, str2.length());
-		ensure("LLString::copyInto insert failed", dest == str4);
+		LLStringUtil::copyInto(dest, str3, str2.length());
+		ensure("LLStringUtil::copyInto insert failed", dest == str4);
 
 		dest = str1;
-		LLString::copyInto(dest, str3, dest.length());
-		ensure("LLString::copyInto append failed", dest == str5);
+		LLStringUtil::copyInto(dest, str3, dest.length());
+		ensure("LLStringUtil::copyInto append failed", dest == str5);
+	}
+
+	template<> template<>
+	void string_index_object_t::test<31>()
+	{
+		std::string stripped;
+
+		// Plain US ASCII text, including spaces and punctuation,
+		// should not be altered.
+		std::string simple_text = "Hello, world!";
+		stripped = LLStringFn::strip_invalid_xml(simple_text);
+		ensure("Simple text passed unchanged", stripped == simple_text);
+
+		// Control characters should be removed
+		// except for 0x09, 0x0a, 0x0d
+		std::string control_chars;
+		for (char c = 0x01; c < 0x20; c++)
+		{
+			control_chars.push_back(c);
+		}
+		std::string allowed_control_chars;
+		allowed_control_chars.push_back( (char)0x09 );
+		allowed_control_chars.push_back( (char)0x0a );
+		allowed_control_chars.push_back( (char)0x0d );
+
+		stripped = LLStringFn::strip_invalid_xml(control_chars);
+		ensure("Only tab, LF, CR control characters allowed",
+			stripped == allowed_control_chars);
+
+		// UTF-8 should be passed intact, including high byte
+		// characters.  Try Francais (with C squiggle cedilla)
+		std::string french = "Fran";
+		french.push_back( (char)0xC3 );
+		french.push_back( (char)0xA7 );
+		french += "ais";
+		stripped = LLStringFn::strip_invalid_xml( french );
+		ensure("UTF-8 high byte text is allowed", french == stripped );
 	}
-}
 
+	template<> template<>
+	void string_index_object_t::test<32>()
+	{
+		// Test LLStringUtil::format() string interpolation
+		LLStringUtil::format_map_t fmt_map;
+		std::string s;
+		int subcount;
+
+		fmt_map["[TRICK1]"] = "[A]";
+		fmt_map["[A]"] = "a";
+		fmt_map["[B]"] = "b";
+		fmt_map["[AAA]"] = "aaa";
+		fmt_map["[BBB]"] = "bbb";
+		fmt_map["[TRICK2]"] = "[A]";
+		fmt_map["[EXPLOIT]"] = "!!!!!!!!!!!![EXPLOIT]!!!!!!!!!!!!";
+		fmt_map["[KEYLONGER]"] = "short";
+		fmt_map["[KEYSHORTER]"] = "Am I not a long string?";
+		fmt_map["?"] = "!";
+		fmt_map["[DELETE]"] = "";
+
+		for (LLStringUtil::format_map_t::const_iterator iter = fmt_map.begin(); iter != fmt_map.end(); ++iter)
+		{
+			// Test when source string is entirely one key
+			s = iter->first;
+			subcount = LLStringUtil::format(s, fmt_map);
+			ensure_equals("LLStringUtil::format: Raw interpolation result", s, iter->second);
+			ensure_equals("LLStringUtil::format: Raw interpolation result count", 1, subcount);
+		}
+
+		for (LLStringUtil::format_map_t::const_iterator iter = fmt_map.begin(); iter != fmt_map.end(); ++iter)
+		{
+			// Test when source string is one key, duplicated
+			s = iter->first + iter->first + iter->first + iter->first;
+			subcount = LLStringUtil::format(s, fmt_map);
+			ensure_equals("LLStringUtil::format: Rawx4 interpolation result", s, iter->second + iter->second + iter->second + iter->second);
+			ensure_equals("LLStringUtil::format: Rawx4 interpolation result count", 4, subcount);
+		}
+
+		// Test when source string has no keys
+		std::string srcs = "!!!!!!!!!!!!!!!!";
+		s = srcs;
+		subcount = LLStringUtil::format(s, fmt_map);
+		ensure_equals("LLStringUtil::format: No key test result", s, srcs);
+		ensure_equals("LLStringUtil::format: No key test result count", 0, subcount);
+
+		// Test when source string has no keys and is empty
+		std::string srcs3;
+		s = srcs3;
+		subcount = LLStringUtil::format(s, fmt_map);
+		ensure("LLStringUtil::format: No key test3 result", s.empty());
+		ensure_equals("LLStringUtil::format: No key test3 result count", 0, subcount);
+
+		// Test a substitution where a key is substituted with blankness
+		std::string srcs2 = "[DELETE]";
+		s = srcs2;
+		subcount = LLStringUtil::format(s, fmt_map);
+		ensure("LLStringUtil::format: Delete key test2 result", s.empty());
+		ensure_equals("LLStringUtil::format: Delete key test2 result count", 1, subcount);
+
+		// Test an assorted substitution
+		std::string srcs4 = "[TRICK1][A][B][AAA][BBB][TRICK2][KEYLONGER][KEYSHORTER]?[DELETE]";
+		s = srcs4;
+		subcount = LLStringUtil::format(s, fmt_map);
+		ensure_equals("LLStringUtil::format: Assorted Test1 result", s, "[A]abaaabbb[A]shortAm I not a long string?!");
+		ensure_equals("LLStringUtil::format: Assorted Test1 result count", 10, subcount);
+
+		// Test an assorted substitution
+		std::string srcs5 = "[DELETE]?[KEYSHORTER][KEYLONGER][TRICK2][BBB][AAA][B][A][TRICK1]";
+		s = srcs5;
+		subcount = LLStringUtil::format(s, fmt_map);
+		ensure_equals("LLStringUtil::format: Assorted Test2 result", s, "!Am I not a long string?short[A]bbbaaaba[A]");
+		ensure_equals("LLStringUtil::format: Assorted Test2 result count", 10, subcount);
+
+		// Test an assorted substitution
+		std::string srcs8 = "foo[DELETE]bar?";
+		s = srcs8;
+		subcount = LLStringUtil::format(s, fmt_map);
+		ensure_equals("LLStringUtil::format: Assorted Test3 result", s, "foobar!");
+		ensure_equals("LLStringUtil::format: Assorted Test3 result count", 2, subcount);		
+	}
+
+	template<> template<>
+	void string_index_object_t::test<33>()
+	{
+		// Test LLStringUtil::format() string interpolation
+		LLStringUtil::format_map_t blank_fmt_map;
+		std::string s;
+		int subcount;
+
+		// Test substituting out of a blank format_map
+		std::string srcs6 = "12345";
+		s = srcs6;
+		subcount = LLStringUtil::format(s, blank_fmt_map);
+		ensure_equals("LLStringUtil::format: Blankfmt Test1 result", s, "12345");
+		ensure_equals("LLStringUtil::format: Blankfmt Test1 result count", 0, subcount);
+		
+		// Test substituting a blank string out of a blank format_map
+		std::string srcs7;
+		s = srcs7;
+		subcount = LLStringUtil::format(s, blank_fmt_map);
+		ensure("LLStringUtil::format: Blankfmt Test2 result", s.empty());
+		ensure_equals("LLStringUtil::format: Blankfmt Test2 result count", 0, subcount);
+	}
+
+	template<> template<>
+	void string_index_object_t::test<34>()
+	{
+		// Test that incorrect LLStringUtil::format() use does not explode.
+		LLStringUtil::format_map_t nasty_fmt_map;
+		std::string s;
+		int subcount;
+
+		nasty_fmt_map[""] = "never used"; // see, this is nasty.
+
+		// Test substituting out of a nasty format_map
+		std::string srcs6 = "12345";
+		s = srcs6;
+		subcount = LLStringUtil::format(s, nasty_fmt_map);
+		ensure_equals("LLStringUtil::format: Nastyfmt Test1 result", s, "12345");
+		ensure_equals("LLStringUtil::format: Nastyfmt Test1 result count", 0, subcount);
+		
+		// Test substituting a blank string out of a nasty format_map
+		std::string srcs7;
+		s = srcs7;
+		subcount = LLStringUtil::format(s, nasty_fmt_map);
+		ensure("LLStringUtil::format: Nastyfmt Test2 result", s.empty());
+		ensure_equals("LLStringUtil::format: Nastyfmt Test2 result count", 0, subcount);
+	}
+}
diff --git a/linden/indra/test/lltemplatemessagebuilder_tut.cpp b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
index 86b1fbd..03346cb 100644
--- a/linden/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -64,7 +64,9 @@ namespace tut
 									   LL_VERSION_MINOR,        
 									   LL_VERSION_PATCH,        
 									   FALSE,        
-									   "notasharedsecret");
+									   "notasharedsecret",
+									   NULL,
+									   false);
 				//init_prehash_data();
 				init = true;
 			}
diff --git a/linden/indra/test/lluri_tut.cpp b/linden/indra/test/lluri_tut.cpp
index 786df92..bed3fcd 100644
--- a/linden/indra/test/lluri_tut.cpp
+++ b/linden/indra/test/lluri_tut.cpp
@@ -253,6 +253,11 @@ namespace tut
 					  LLURI::escape("http://10.0.1.4:12032/agent/god/agent-id/map/layer/?resume=http://station3.ll.com:12032/agent/203ad6df-b522-491d-ba48-4e24eb57aeff/send-postcard", unreserved + ":@!$'()*+,="), 
 					  "http:%2F%2F10.0.1.4:12032%2Fagent%2Fgod%2Fagent-id%2Fmap%2Flayer%2F%3Fresume=http:%2F%2Fstation3.ll.com:12032%2Fagent%2F203ad6df-b522-491d-ba48-4e24eb57aeff%2Fsend-postcard");
 		// French cedilla (C with squiggle, like in the word Francais) is UTF-8 C3 A7
+
+#if LL_WINDOWS
+#pragma warning(disable: 4309)
+#endif
+
 		std::string cedilla;
 		cedilla.push_back( (char)0xC3 );
 		cedilla.push_back( (char)0xA7 );
diff --git a/linden/indra/test/llxfer_tut.cpp b/linden/indra/test/llxfer_tut.cpp
index 5079080..670a929 100644
--- a/linden/indra/test/llxfer_tut.cpp
+++ b/linden/indra/test/llxfer_tut.cpp
@@ -35,8 +35,6 @@
 
 #include "llxfer_file.h"
 
-#include <string>
-
 namespace tut
 {
 	struct llxfer_data
@@ -49,8 +47,8 @@ namespace tut
 	template<> template<>
 	void llxfer_object::test<1>()
 	{
-		// test that he handle an oversized filename correctly.
-		LLString oversized_filename;
+		// test that we handle an oversized filename correctly.
+		std::string oversized_filename;
 		U32 i;
 		for (i=0; i<LL_MAX_PATH*2; ++i) // create oversized filename
 		{
@@ -59,6 +57,6 @@ namespace tut
 
 		LLXfer_File xff(oversized_filename, FALSE, 1);
 		ensure("oversized local_filename nul-terminated",
-		       strnlen(xff.getName(), LL_MAX_PATH) < LL_MAX_PATH);
+		       xff.getFileName().length() < LL_MAX_PATH);
 	}
 }
diff --git a/linden/indra/test/message_tut.cpp b/linden/indra/test/message_tut.cpp
index b619d38..f3325f0 100644
--- a/linden/indra/test/message_tut.cpp
+++ b/linden/indra/test/message_tut.cpp
@@ -35,6 +35,8 @@
 #include "lltut.h"
 
 #include "llapr.h"
+#include "llmessageconfig.h"
+#include "llsdserialize.h"
 #include "llversionserver.h"
 #include "message.h"
 #include "message_prehash.h"
@@ -56,10 +58,13 @@ namespace tut
 {	
 	struct LLMessageSystemTestData 
 	{
+		std::string mTestConfigDir;
+		std::string mSep;
+
 		LLMessageSystemTestData()
 		{
 			static bool init = false;
-			if(! init)
+			if(!init)
 			{
 				ll_init_apr();
 				//init_prehash_data();
@@ -72,7 +77,25 @@ namespace tut
 								   LL_VERSION_MINOR,        
 								   LL_VERSION_PATCH,        
 								   FALSE,        
-								   "notasharedsecret");
+								   "notasharedsecret",
+								   NULL,
+								   false);
+			// generate temp dir
+			std::ostringstream ostr;
+#if LL_WINDOWS
+			mSep = "\\";
+			ostr << "C:" << mSep;
+#else
+			mSep = "/";
+			ostr << mSep << "tmp" << mSep;
+#endif
+			LLUUID random;
+			random.generate();
+			ostr << "message-test-" << random;
+			mTestConfigDir = ostr.str();
+			LLFile::mkdir(mTestConfigDir);
+			writeConfigFile(LLSD());
+			LLMessageConfig::initClass("simulator", ostr.str());
 		}
 
 		~LLMessageSystemTestData()
@@ -80,6 +103,28 @@ namespace tut
 			// not end_messaging_system()
 			delete gMessageSystem;
 			gMessageSystem = NULL;
+
+			// rm contents of temp dir
+			std::ostringstream ostr;
+			ostr << mTestConfigDir << mSep << "message.xml";
+			int rmfile = LLFile::remove(ostr.str());
+			ensure_equals("rmfile value", rmfile, 0);
+
+			// rm temp dir
+			int rmdir = LLFile::rmdir(mTestConfigDir);
+			ensure_equals("rmdir value", rmdir, 0);
+		}
+
+		void writeConfigFile(const LLSD& config)
+		{
+			std::ostringstream ostr;
+			ostr << mTestConfigDir << mSep << "message.xml";
+			llofstream file(ostr.str());
+			if (file.is_open())
+			{
+				LLSDSerialize::toPrettyXML(config, file);
+			}
+			file.close();
 		}
 	};
 	
diff --git a/linden/indra/test/mock_http_client.cpp b/linden/indra/test/mock_http_client.cpp
new file mode 100644
index 0000000..c24c469
--- /dev/null
+++ b/linden/indra/test/mock_http_client.cpp
@@ -0,0 +1,88 @@
+/** 
+ * @file mock_http_client.cpp
+ * @brief Framework for testing HTTP requests
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "llsdhttpserver.h"
+#include "lliohttpserver.h"
+
+namespace tut
+{
+	class SuccessNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+	   	{ 
+	   		LLSD result;
+			result["state"] = "complete";
+	   		result["test"] = "test";
+	   		r->result(result);
+	   	}
+		void post(ResponsePtr r, const LLSD& context, const LLSD& input) const
+		{
+			LLSD result;
+			result["state"] = "complete";
+			result["test"] = "test";
+			r->result(result);
+		}
+	};
+
+	class ErrorNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+			{ r->status(599, "Intentional error"); }
+		void post(ResponsePtr r, const LLSD& context, const LLSD& input) const
+			{ r->status(input["status"], input["reason"]); }
+	};
+
+	class TimeOutNode : public LLHTTPNode
+	{
+	public:
+		void get(ResponsePtr r, const LLSD& context) const
+		{
+            /* do nothing, the request will eventually time out */ 
+		}
+	};
+
+	LLSD storage;
+	
+	class LLSDStorageNode : public LLHTTPNode
+	{
+	public:
+		LLSD get() const{ return storage; }
+		LLSD put(const LLSD& value) const{ storage = value; return LLSD(); }
+	};
+
+	LLHTTPRegistration<LLSDStorageNode> gStorageNode("/test/storage");
+	LLHTTPRegistration<SuccessNode>		gSuccessNode("/test/success");
+	LLHTTPRegistration<ErrorNode>		gErrorNode("/test/error");
+	LLHTTPRegistration<TimeOutNode>		gTimeOutNode("/test/timeout");
+}
diff --git a/linden/indra/test/mock_http_client.h b/linden/indra/test/mock_http_client.h
new file mode 100644
index 0000000..c3f1ade
--- /dev/null
+++ b/linden/indra/test/mock_http_client.h
@@ -0,0 +1,196 @@
+/** 
+ * @file mock_http_client.cpp
+ * @brief Framework for testing HTTP requests
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llsdhttpserver.h"
+#include "lliohttpserver.h"
+#include "llhttpclient.h"
+#include "llformat.h"
+#include "llpipeutil.h"
+#include "llpumpio.h"
+
+namespace tut
+{
+	struct MockHttpClient
+	{
+	public:
+		MockHttpClient()
+		{
+			apr_pool_create(&mPool, NULL);
+			mServerPump = new LLPumpIO(mPool);
+			mClientPump = new LLPumpIO(mPool);
+			
+			LLHTTPClient::setPump(*mClientPump);
+		}
+		
+		~MockHttpClient()
+		{
+			delete mServerPump;
+			delete mClientPump;
+			apr_pool_destroy(mPool);
+		}
+
+		void setupTheServer()
+		{
+			LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888);
+
+			LLHTTPStandardServices::useServices();
+			LLHTTPRegistrar::buildAllServices(root);
+		}
+		
+		void runThePump(float timeout = 100.0f)
+		{
+			LLTimer timer;
+			timer.setTimerExpirySec(timeout);
+
+			while(!mSawCompleted && !timer.hasExpired())
+			{
+				if (mServerPump)
+				{
+					mServerPump->pump();
+					mServerPump->callback();
+				}
+				if (mClientPump)
+				{
+					mClientPump->pump();
+					mClientPump->callback();
+				}
+			}
+		}
+
+		void killServer()
+		{
+			delete mServerPump;
+			mServerPump = NULL;
+		}
+	
+	private:
+		apr_pool_t* mPool;
+		LLPumpIO* mServerPump;
+		LLPumpIO* mClientPump;
+
+		
+	protected:
+		void ensureStatusOK()
+		{
+			if (mSawError)
+			{
+				std::string msg =
+					llformat("error() called when not expected, status %d",
+						mStatus); 
+				fail(msg);
+			}
+		}
+	
+		void ensureStatusError()
+		{
+			if (!mSawError)
+			{
+				fail("error() wasn't called");
+			}
+		}
+		
+		LLSD getResult()
+		{
+			return mResult;
+		}
+	
+	protected:
+		bool mSawError;
+		U32 mStatus;
+		std::string mReason;
+		bool mSawCompleted;
+		LLSD mResult;
+		bool mResultDeleted;
+
+		class Result : public LLHTTPClient::Responder
+		{
+		protected:
+			Result(MockHttpClient& client)
+				: mClient(client)
+			{
+			}
+		
+		public:
+			static boost::intrusive_ptr<Result> build(MockHttpClient& client)
+			{
+				return boost::intrusive_ptr<Result>(new Result(client));
+			}
+			
+			~Result()
+			{
+				mClient.mResultDeleted = true;
+			}
+			
+			virtual void error(U32 status, const std::string& reason)
+			{
+				mClient.mSawError = true;
+				mClient.mStatus = status;
+				mClient.mReason = reason;
+			}
+
+			virtual void result(const LLSD& content)
+			{
+				mClient.mResult = content;
+			}
+
+			virtual void completed(
+							U32 status, const std::string& reason,
+							const LLSD& content)
+			{
+				LLHTTPClient::Responder::completed(status, reason, content);
+				
+				mClient.mSawCompleted = true;
+			}
+
+		private:
+			MockHttpClient& mClient;
+		};
+
+		friend class Result;
+
+	protected:
+
+		void reset()
+		{
+			mSawError = false;
+			mStatus = 0;
+			mSawCompleted = false;
+			mResult.clear();
+			mResultDeleted = false;
+		}
+
+		LLHTTPClient::ResponderPtr newResult()
+		{
+			reset();
+			return Result::build(*this);
+		}
+	};
+}
diff --git a/linden/indra/test/test.cpp b/linden/indra/test/test.cpp
index df4b037..91b1b22 100644
--- a/linden/indra/test/test.cpp
+++ b/linden/indra/test/test.cpp
@@ -43,8 +43,8 @@
 #include "llerrorcontrol.h"
 #include "lltut.h"
 
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_getopt.h>
+#include "apr_pools.h"
+#include "apr_getopt.h"
 
 // the CTYPE_WORKAROUND is needed for linux dev stations that don't
 // have the broken libc6 packages needed by our out-of-date static 
@@ -62,13 +62,14 @@ namespace tut
 class LLTestCallback : public tut::callback
 {
 public:
-	LLTestCallback(bool verbose_mode) :
+	LLTestCallback(bool verbose_mode, std::ostream *stream) :
 		mVerboseMode(verbose_mode),
 		mTotalTests(0),
 		mPassedTests(0),
 		mFailedTests(0),
 		mSkippedTests(0),
-		mSkipedFailTests(0)
+		mSkippedFailTests(0),
+		mStream(stream)
 	{
 	}
 
@@ -109,7 +110,7 @@ public:
 			out << "skipped";
 			break;
 		case tut::test_result::skip_fail:
-			++mSkipedFailTests;
+			++mSkippedFailTests;
 			out << "skipped known failure";
 			break;
 		default:
@@ -122,34 +123,57 @@ public:
 			{
 				out << ": '" << tr.message << "'";
 			}
+			if (mStream)
+			{
+				*mStream << out.str() << std::endl;
+			}
+			
 			std::cout << out.str() << std::endl;
 		}
 	}
 
 	void run_completed()
 	{
-		std::cout << std::endl;
-		std::cout << "Total Tests:   " << mTotalTests << std::endl;
-		std::cout << "Passed Tests: " << mPassedTests << std::endl;
+		if (mStream)
+		{
+			run_completed_(*mStream);
+		}
+		run_completed_(std::cout);
+
+		if (mFailedTests > 0)
+		{
+			exit(1);
+		}
+	}
+	
+private:
+	void run_completed_(std::ostream &stream)
+	{
+		stream << std::endl;
+		stream << "Total Tests:   " << mTotalTests << std::endl;
+		stream << "Passed Tests: " << mPassedTests << std::endl;
+
+		stream << std::endl;
+		stream << "Total Tests:   " << mTotalTests << std::endl;
+		stream << "Passed Tests: " << mPassedTests << std::endl;
 		
 		if (mSkippedTests > 0)
 		{
-			std::cout << "Skipped Tests: " << mSkippedTests << std::endl;
+			stream << "Skipped Tests: " << mSkippedTests << std::endl;
 		}
 
-		if (mSkipedFailTests > 0)
+		if (mSkippedFailTests > 0)
 		{
-			std::cout << "Skipped known failures: " << mSkipedFailTests
+			stream << "Skipped known failures: " << mSkippedFailTests
 				<< std::endl;
 		}
 
 		if(mFailedTests > 0)
 		{
-			std::cout << "*********************************" << std::endl;
-			std::cout << "Failed Tests:   " << mFailedTests << std::endl;
-			std::cout << "Please report or fix the problem." << std::endl;
-			std::cout << "*********************************" << std::endl;
-			exit(1);
+			stream << "*********************************" << std::endl;
+			stream << "Failed Tests:   " << mFailedTests << std::endl;
+			stream << "Please report or fix the problem." << std::endl;
+			stream << "*********************************" << std::endl;
 		}
 	}
 
@@ -159,7 +183,8 @@ protected:
 	int mPassedTests;
 	int mFailedTests;
 	int mSkippedTests;
-	int mSkipedFailTests;
+	int mSkippedFailTests;
+	std::ostream *mStream;
 };
 
 static const apr_getopt_option_t TEST_CL_OPTIONS[] =
@@ -168,7 +193,9 @@ static const apr_getopt_option_t TEST_CL_OPTIONS[] =
 	{"list", 'l', 0, "List available test groups."},
 	{"verbose", 'v', 0, "Verbose output."},
 	{"group", 'g', 1, "Run test group specified by option argument."},
+	{"output", 'o', 1, "Write output to the named file."},
 	{"skip", 's', 1, "Skip test number specified by option argument. Only works when a specific group is being tested"},
+	{"touch", 't', 1, "Touch the given file if all tests succeed"},
 	{"wait", 'w', 0, "Wait for input before exit."},
 	{"debug", 'd', 0, "Emit full debug logs."},
 	{0, 0, 0, 0}
@@ -256,6 +283,9 @@ int main(int argc, char **argv)
 	apr_status_t apr_err;
 	const char* opt_arg = NULL;
 	int opt_id = 0;
+	std::ofstream *output = NULL;
+	const char *touch = NULL;
+	
 	while(true)
 	{
 		apr_err = apr_getopt_long(os, TEST_CL_OPTIONS, &opt_id, &opt_arg);
@@ -285,6 +315,13 @@ int main(int argc, char **argv)
 		case 'v':
 			verbose_mode = true;
 			break;
+		case 'o':
+			output = new std::ofstream;
+			output->open(opt_arg);
+			break;
+		case 't':
+			touch = opt_arg;
+			break;
 		case 'w':
 			wait_at_exit = true;
 			break;
@@ -301,7 +338,7 @@ int main(int argc, char **argv)
 	}
 
 	// run the tests
-	LLTestCallback callback(verbose_mode);
+	LLTestCallback callback(verbose_mode, output);
 	tut::runner.get().set_callback(&callback);
 	
 	if(test_group.empty())
@@ -319,6 +356,20 @@ int main(int argc, char **argv)
 		std::cin.get();
 	}
 	
+	if (output)
+	{
+		output->close();
+		delete output;
+	}
+
+	if (touch)
+	{
+		std::ofstream s;
+		s.open(touch);
+		s << "ok" << std::endl;
+		s.close();
+	}
+	
 	apr_terminate();
 	return 0;
 }
diff --git a/linden/indra/test/test.vcproj b/linden/indra/test/test.vcproj
deleted file mode 100644
index f720d9a..0000000
--- a/linden/indra/test/test.vcproj
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test"
-	ProjectGUID="{BBAA6588-CA96-4A87-A988-B02270B8D02B}"
-	RootNamespace="test"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llprimitive;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-sgd-1_34_1.lib libcurld.lib libeay32.lib libexpatMT.lib llcommon.lib llphysics.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llprimitive;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
-				MinimalRebuild="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llphysics.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath)"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llprimitive;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
-				PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
-				MinimalRebuild="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib gdi32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib ssleay32.lib user32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="&quot;$(TargetPath)&quot;"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\common.cpp">
-			</File>
-			<File
-				RelativePath=".\inventory.cpp">
-			</File>
-			<File
-				RelativePath=".\io.cpp">
-			</File>
-			<File
-				RelativePath=".\llapp_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llbase64_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llbuffer_tut.cpp">
-			</File>
-
-			<File
-				RelativePath=".\lldate_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llerror_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llhost_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llhttpclient_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\lljoint_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llmessageconfig_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llmime_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llnamevalue_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llpermissions_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llpipeutil.cpp">
-			</File>
-			<File
-				RelativePath=".\llquaternion_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llrandom_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llsaleinfo_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llsd_new_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdserialize_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llsdtraits.h">
-			</File>
-			<File
-				RelativePath=".\llsdutil_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llservicebuilder_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\llstreamtools_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\lltemplatemessagebuilder_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\lltiming_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\lltut.cpp">
-			</File>
-			<File
-				RelativePath=".\lluri_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\lluserrelations_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\lluuidhashmap_tut.cpp">
-			</File>
-
-			<File
-				RelativePath=".\math.cpp">
-			</File>
-			<File
-				RelativePath=".\prim_linkability_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\reflection_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\test.cpp">
-			</File>
-			<File
-				RelativePath=".\v2math_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\v3color_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\v3dmath_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\v3math_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\v4color_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\v4coloru_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\v4math_tut.cpp">
-			</File>
-			<File
-				RelativePath=".\xform_tut.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\llpipeutil.h">
-			</File>
-			<File
-				RelativePath=".\lltut.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/test/test_llmanifest.py b/linden/indra/test/test_llmanifest.py
index 1ad5116..764e421 100644
--- a/linden/indra/test/test_llmanifest.py
+++ b/linden/indra/test/test_llmanifest.py
@@ -56,7 +56,8 @@ class Demo_ArchManifest(llmanifest.LLManifest):
 class TestLLManifest(unittest.TestCase):
     mode='static'
     def setUp(self):
-        self.m = llmanifest.LLManifest("src", "dst", {'grid':'default', 'platform':'darwin', 'version':(1,2,3,4)})
+        self.m = llmanifest.LLManifest({'source':'src', 'dest':'dst', 'grid':'default', 'platform':'darwin', 'version':(1,2,3,4),
+                                        'artwork':'art', 'build':'build'})
 
     def testproperwindowspath(self):
         self.assertEqual(llmanifest.proper_windows_path("C:\Program Files", "cygwin"),"/cygdrive/c/Program Files")
diff --git a/linden/indra/test/test_vc8.vcproj b/linden/indra/test/test_vc8.vcproj
deleted file mode 100644
index 6d47de8..0000000
--- a/linden/indra/test/test_vc8.vcproj
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="test"
-	ProjectGUID="{BBAA6588-CA96-4A87-A988-B02270B8D02B}"
-	RootNamespace="test"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\lldatabase;..\llmessage;..\llmath;..\llinventory;..\llvfs;..\llxml;..\..\libraries\include;&quot;..\..\libraries\i686-win32\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				TreatWChar_tAsBuiltInType="false"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-sgd-1_34_1.lib libboost_signals-vc80-mt-sgd-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\lldatabase;..\llmessage;..\llmath;..\llinventory;..\llvfs;..\llxml;..\..\libraries\include;&quot;..\..\libraries\i686-win32\include&quot;"
-				PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\lldatabase;..\llmessage;..\llmath;..\llinventory;..\llvfs;..\llxml;..\..\libraries\include;&quot;..\..\libraries\i686-win32\include&quot;"
-				PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="libcmtd"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\common.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\inventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\io.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llapp_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase64_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbitpack_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llblowfish_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldatabase_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llerror_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpclient_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpnode_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryparcel_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliohttpserver_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessageconfig_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmime_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpipeutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrandom_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsd_new_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llservicebuilder_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltiming_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluri_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserrelations_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\reflection_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\test.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v2math_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3dmath_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3math_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\xform_tut.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llpipeutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdtraits.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltut.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/test/test_vc9.vcproj b/linden/indra/test/test_vc9.vcproj
deleted file mode 100644
index d7fcfae..0000000
--- a/linden/indra/test/test_vc9.vcproj
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test"
-	ProjectGUID="{BBAA6588-CA96-4A87-A988-B02270B8D02B}"
-	RootNamespace="test"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\lldatabase;..\llmessage;..\llmath;..\llinventory;..\llvfs;..\llxml;..\..\libraries\include;&quot;..\..\libraries\i686-win32\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				TreatWChar_tAsBuiltInType="false"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\llcommon;..\lldatabase;..\llmessage;..\llmath;..\llinventory;..\llvfs;..\llxml;..\..\libraries\include;&quot;..\..\libraries\i686-win32\include&quot;"
-				PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
-				StringPooling="true"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\lldatabase;..\llmessage;..\llmath;..\llinventory;..\llvfs;..\llxml;..\..\libraries\include;&quot;..\..\libraries\i686-win32\include&quot;"
-				PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
-				OutputFile="$(OutDir)/test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				IgnoreDefaultLibraryNames="libcmtd"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\common.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\inventory.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\io.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llapp_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbase64_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llbitpack_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llblowfish_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lldatabase_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llerror_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpclient_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llhttpnode_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llinventoryparcel_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lliohttpserver_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmessageconfig_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llmime_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llpipeutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llrandom_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsd_new_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagebuilder_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdmessagereader_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdserialize_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llservicebuilder_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltiming_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lltut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluri_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lluserrelations_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llxfer_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\math.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\reflection_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\test.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v2math_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3dmath_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\v3math_tut.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\xform_tut.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\llpipeutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llsdtraits.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lltut.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/test/v3dmath_tut.cpp b/linden/indra/test/v3dmath_tut.cpp
index 106b1dc..a501531 100644
--- a/linden/indra/test/v3dmath_tut.cpp
+++ b/linden/indra/test/v3dmath_tut.cpp
@@ -386,7 +386,7 @@ namespace tut
 	void v3dmath_object::test<16>()
 	{
 		F64 x1 = 1.23, y1 = 2.0, z1 = 4.;
-		char buf[] = "1.23 2. 4";
+		std::string buf("1.23 2. 4");
 		LLVector3d vec3D, vec3Da(x1,y1,z1);
 		LLVector3d::parseVector3d(buf, &vec3D);
 		ensure_equals("1:parseVector3d: failed " , vec3D, vec3Da);	
@@ -461,7 +461,7 @@ namespace tut
 		F64 x1 = 1111.232222;
 		F64 y1 = 2222222222.22;
 		F64 z1 = 422222222222.0;
-		char buf[] = "1111.232222 2222222222.22 422222222222";
+		std::string buf("1111.232222 2222222222.22 422222222222");
 		LLVector3d vec3Da, vec3Db(x1,y1,z1);
 		LLVector3d::parseVector3d(buf, &vec3Da);
 		ensure_equals("1:parseVector3 failed", vec3Da, vec3Db);	
@@ -509,6 +509,9 @@ namespace tut
 	template<> template<>
 	void v3dmath_object::test<24>()
 	{
+#if LL_WINDOWS && _MSC_VER < 1400
+		skip_fail("This fails on VS2003!");
+#else
 		F64 x = 10., y = 20., z = -15.;
 		F64 angle1, angle2;
 		LLVector3d vec3Da(x,y,z), vec3Db(x,y,z);
@@ -523,5 +526,6 @@ namespace tut
 		F64 angle = vec3Db*vec3Da;
 		angle = acos(angle);
 		ensure("2:angle_between: Fail ", (angle == angle2));
+#endif
 	}
 }
diff --git a/linden/indra/test/v3math_tut.cpp b/linden/indra/test/v3math_tut.cpp
index 30a7b7a..9989a8a 100644
--- a/linden/indra/test/v3math_tut.cpp
+++ b/linden/indra/test/v3math_tut.cpp
@@ -475,7 +475,7 @@ namespace tut
 	void v3math_object::test<28>()
 	{
 		F32 x1 =1.23f, y1 = 2.f,z1 = 4.f;
-		char buf[] = "1.23 2. 4";
+		std::string buf("1.23 2. 4");
 		LLVector3 vec3, vec3a(x1,y1,z1);
 		LLVector3::parseVector3(buf, &vec3);
 		ensure_equals("1:parseVector3 failed", vec3, vec3a);	
diff --git a/linden/indra/test/v4color_tut.cpp b/linden/indra/test/v4color_tut.cpp
index d75acb1..5458f6b 100644
--- a/linden/indra/test/v4color_tut.cpp
+++ b/linden/indra/test/v4color_tut.cpp
@@ -337,7 +337,7 @@ namespace tut
 	{
 		F32 r = 12.0f, g = -2.3f, b = 1.32f, a = 5.0f;
 		LLColor4 llcolor4a(r,g,b,a),llcolor4b;
-		const char *color = "red";
+		std::string color("red");
 		LLColor4::parseColor(color, &llcolor4b);
 		ensure_equals("1:parseColor() failed to parse the color value ", llcolor4b, LLColor4::red);
 
@@ -357,7 +357,7 @@ namespace tut
 	{
 		F32 r = 12.0f, g = -2.3f, b = 1.32f, a = 5.0f;
 		LLColor4 llcolor4a(r,g,b,a),llcolor4b;
-		const char *color = "12.0, -2.3, 1.32, 5.0";
+		std::string color("12.0, -2.3, 1.32, 5.0");
 		LLColor4::parseColor4(color, &llcolor4b);
 		ensure_equals("parseColor4() failed to parse the color value ",  llcolor4a, llcolor4b);
 	}
diff --git a/linden/indra/test/v4coloru_tut.cpp b/linden/indra/test/v4coloru_tut.cpp
index c73f91f..4c931d4 100644
--- a/linden/indra/test/v4coloru_tut.cpp
+++ b/linden/indra/test/v4coloru_tut.cpp
@@ -286,7 +286,7 @@ namespace tut
 	{
 		U8 r = 0x12, g = 0xFF, b = 0xAF, a = 12;
 		LLColor4U llcolor4u1(r,g,b,a);
-		const char *color = "12, 23, 132, 50";
+		std::string color("12, 23, 132, 50");
 		LLColor4U::parseColor4U(color, &llcolor4u1);
 		ensure("parseColor4U() failed to parse the color value ", ((12 == llcolor4u1.mV[VX]) && (23 == llcolor4u1.mV[VY]) && (132 == llcolor4u1.mV[VZ])&& (50 == llcolor4u1.mV[VW])));
 
diff --git a/linden/indra/test/v4math_tut.cpp b/linden/indra/test/v4math_tut.cpp
index f5a6bcb..07b4797 100644
--- a/linden/indra/test/v4math_tut.cpp
+++ b/linden/indra/test/v4math_tut.cpp
@@ -166,6 +166,12 @@ namespace tut
 	template<> template<>
 	void v4math_object::test<8>()
 	{
+#if LL_DEBUG && LL_WINDOWS && _MSC_VER >= 1400
+		skip_fail("This fails on VS2005 debug builds!");
+#else
+#if LL_WINDOWS && _MSC_VER < 1400
+		skip_fail("This fails on VS2003!");
+#else
 		F32 x = 10.f, y = -2.3f, z = -.023f, w = -2.0f;
 		const  F32 val[10] = {1.f,2.f,3.f,.34f,.1f,-.5f,2.f,1.23f,1.234f,.89f};
 		LLMatrix4 mat(val);
@@ -181,6 +187,8 @@ namespace tut
 		vec4c.setVec(a, b, c, d);
 		vec4c.rotVec(q);
 		ensure_equals("2:rotVec: Fail " ,vec4b, vec4c);
+#endif
+#endif
 	}
 	
 	template<> template<>
diff --git a/linden/indra/tools/vstool/README.txt b/linden/indra/tools/vstool/README.txt
new file mode 100644
index 0000000..e419180
--- /dev/null
+++ b/linden/indra/tools/vstool/README.txt
@@ -0,0 +1,9 @@
+VSTool is a command line utility to manipulate VisualStudio settings. 
+
+The windows cmake project configuration uses VSTool.exe
+
+A handy upgrade:
+ figure out how to make cmake build this csharp app
+ - or write the app using script (jscript?!?) so it doesn't need to be built.
+
+
diff --git a/linden/indra/tools/vstool/VSTool.csproj b/linden/indra/tools/vstool/VSTool.csproj
new file mode 100644
index 0000000..24f1031
--- /dev/null
+++ b/linden/indra/tools/vstool/VSTool.csproj
@@ -0,0 +1,95 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{96943E2D-1373-4617-A117-D0F997A94919}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>VSTool</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>VSTool</RootNamespace>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <StartupObject>VSTool.VSToolMain</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="main.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/linden/indra/tools/vstool/VSTool.exe b/linden/indra/tools/vstool/VSTool.exe
new file mode 100755
index 0000000..6d1497d
Binary files /dev/null and b/linden/indra/tools/vstool/VSTool.exe differ
diff --git a/linden/indra/tools/vstool/VSTool.sln b/linden/indra/tools/vstool/VSTool.sln
new file mode 100644
index 0000000..8859671
--- /dev/null
+++ b/linden/indra/tools/vstool/VSTool.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSTool", "VSTool.csproj", "{96943E2D-1373-4617-A117-D0F997A94919}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{96943E2D-1373-4617-A117-D0F997A94919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96943E2D-1373-4617-A117-D0F997A94919}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96943E2D-1373-4617-A117-D0F997A94919}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96943E2D-1373-4617-A117-D0F997A94919}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/linden/indra/tools/vstool/main.cs b/linden/indra/tools/vstool/main.cs
new file mode 100644
index 0000000..cc268d5
--- /dev/null
+++ b/linden/indra/tools/vstool/main.cs
@@ -0,0 +1,711 @@
+// Code about getting running instances visual studio
+// was borrowed from 
+// http://www.codeproject.com/KB/cs/automatingvisualstudio.aspx
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using Microsoft.CSharp;
+
+namespace VSTool
+{
+    // The MessageFilter class comes from:
+    // http://msdn.microsoft.com/en-us/library/ms228772(VS.80).aspx
+    // It allows vstool to get timing error messages from 
+    // visualstudio and handle them.
+    public class MessageFilter : IOleMessageFilter
+    {
+        //
+        // Class containing the IOleMessageFilter
+        // thread error-handling functions.
+
+        // Start the filter.
+        public static void Register()
+        {
+            IOleMessageFilter newFilter = new MessageFilter(); 
+            IOleMessageFilter oldFilter = null; 
+            CoRegisterMessageFilter(newFilter, out oldFilter);
+        }
+
+        // Done with the filter, close it.
+        public static void Revoke()
+        {
+            IOleMessageFilter oldFilter = null; 
+            CoRegisterMessageFilter(null, out oldFilter);
+        }
+
+        //
+        // IOleMessageFilter functions.
+        // Handle incoming thread requests.
+        int IOleMessageFilter.HandleInComingCall(int dwCallType, 
+          System.IntPtr hTaskCaller, int dwTickCount, System.IntPtr 
+          lpInterfaceInfo) 
+        {
+            //Return the flag SERVERCALL_ISHANDLED.
+            return 0;
+        }
+
+        // Thread call was rejected, so try again.
+        int IOleMessageFilter.RetryRejectedCall(System.IntPtr 
+          hTaskCallee, int dwTickCount, int dwRejectType)
+        {
+            if (dwRejectType == 2)
+            // flag = SERVERCALL_RETRYLATER.
+            {
+                // Retry the thread call immediately if return >=0 & 
+                // <100.
+                return 99;
+            }
+            // Too busy; cancel call.
+            return -1;
+        }
+
+        int IOleMessageFilter.MessagePending(System.IntPtr hTaskCallee, 
+          int dwTickCount, int dwPendingType)
+        {
+            //Return the flag PENDINGMSG_WAITDEFPROCESS.
+            return 2; 
+        }
+
+        // Implement the IOleMessageFilter interface.
+        [DllImport("Ole32.dll")]
+        private static extern int 
+          CoRegisterMessageFilter(IOleMessageFilter newFilter, out 
+          IOleMessageFilter oldFilter);
+    }
+
+    [ComImport(), Guid("00000016-0000-0000-C000-000000000046"), 
+    InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    interface IOleMessageFilter 
+    {
+        [PreserveSig]
+        int HandleInComingCall( 
+            int dwCallType, 
+            IntPtr hTaskCaller, 
+            int dwTickCount, 
+            IntPtr lpInterfaceInfo);
+
+        [PreserveSig]
+        int RetryRejectedCall( 
+            IntPtr hTaskCallee, 
+            int dwTickCount,
+            int dwRejectType);
+
+        [PreserveSig]
+        int MessagePending( 
+            IntPtr hTaskCallee, 
+            int dwTickCount,
+            int dwPendingType);
+    }
+
+    class ViaCOM
+    {
+        public static object GetProperty(object from_obj, string prop_name)
+        {
+            try
+            {
+                Type objType = from_obj.GetType();
+                return objType.InvokeMember(
+                    prop_name,
+                    BindingFlags.GetProperty, null,
+                    from_obj,
+                    null);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error getting property: \"{0}\"", prop_name);
+                Console.WriteLine(e.Message);
+                throw e;
+            }
+        }
+
+        public static object SetProperty(object from_obj, string prop_name, object new_value)
+        {
+            try
+            {
+                object[] args = { new_value };
+                Type objType = from_obj.GetType();
+                return objType.InvokeMember(
+                    prop_name,
+                    BindingFlags.DeclaredOnly |
+                    BindingFlags.Public |
+                    BindingFlags.NonPublic |
+                    BindingFlags.Instance |
+                    BindingFlags.SetProperty,
+                    null,
+                    from_obj,
+                    args);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error setting property: \"{0}\"", prop_name);
+                Console.WriteLine(e.Message);
+                throw e;
+            }
+        }
+
+        public static object CallMethod(object from_obj, string method_name, params object[] args)
+        {
+            try
+            {
+                Type objType = from_obj.GetType();
+                return objType.InvokeMember(
+                    method_name,
+                    BindingFlags.DeclaredOnly |
+                    BindingFlags.Public |
+                    BindingFlags.NonPublic |
+                    BindingFlags.Instance |
+                    BindingFlags.InvokeMethod,
+                    null,
+                    from_obj,
+                    args);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error calling method \"{0}\"", method_name);
+                Console.WriteLine(e.Message);
+                throw e;
+            }
+        }
+    };
+
+    /// <summary>
+	/// The main entry point class for VSTool.
+	/// </summary>
+    class VSToolMain
+    {
+        #region Interop imports
+        [DllImport("ole32.dll")]  
+        public static extern int GetRunningObjectTable(int reserved, out IRunningObjectTable prot); 
+ 
+        [DllImport("ole32.dll")]  
+        public static extern int  CreateBindCtx(int reserved, out IBindCtx ppbc);
+        #endregion 
+
+        static System.Boolean ignore_case = true;
+
+        static string solution_name = null;
+        static bool use_new_vs = false;
+        static Hashtable projectDict = new Hashtable();
+        static string startup_project = null;
+        static string config = null;
+
+        static object dte = null;
+        static object solution = null;
+
+        /// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		static int Main(string[] args)
+		{
+            int retVal = 0;
+            bool need_save = false;
+
+            try
+            {
+                parse_command_line(args);
+
+                Console.WriteLine("Editing solution: {0}", solution_name);
+
+                bool found_open_solution = GetDTEAndSolution();
+
+                if (dte == null || solution == null)
+                {
+                    retVal = 1;
+                }
+                else
+                {
+                    MessageFilter.Register();
+
+                    // Walk through all of the projects in the solution
+                    // and list the type of each project.
+                    foreach (DictionaryEntry p in projectDict)
+                    {
+                        string project_name = (string)p.Key;
+                        string working_dir = (string)p.Value;
+                        if (SetProjectWorkingDir(solution, project_name, working_dir))
+                        {
+                            need_save = true;
+                        }
+                    }
+
+                    if (config != null)
+                    {
+                        need_save = SetActiveConfig(config);
+                    }
+
+                    if (startup_project != null)
+                    {
+                        need_save = SetStartupProject(startup_project);
+                    }
+
+                    if (need_save)
+                    {
+                        if (found_open_solution == false)
+                        {
+                            ViaCOM.CallMethod(solution, "Close", null);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+                retVal = 1;
+            }
+            finally
+            {
+                if (solution != null)
+                {
+                    Marshal.ReleaseComObject(solution);
+                    solution = null;
+                }
+
+                if (dte != null)
+                {
+                    Marshal.ReleaseComObject(dte);
+                    dte = null;
+                }
+
+                MessageFilter.Revoke();
+            }
+            return retVal;
+        }
+
+        public static bool parse_command_line(string[] args)
+        {
+            string options_desc = 
+                "--solution <solution_name>   : MSVC solution name. (required)\n" +
+                "--use_new_vs                 : Ignore running versions of visual studio.\n" +
+                "--workingdir <project> <dir> : Set working dir of a VC project.\n" +
+                "--config <config>            : Set the active config for the solution.\n" +
+                "--startup <project>          : Set the startup project for the solution.\n";
+
+            try
+            {
+                // Command line param parsing loop.
+                int i = 0;
+                for (; i < args.Length; ++i)
+                {
+                    if ("--solution" == args[i])
+                    {
+                        if (solution_name != null)
+                        {
+                            throw new ApplicationException("Found second --solution option");
+                        }
+                        solution_name = args[++i];
+                    }
+                    else if ("--use_new_vs" == args[i])
+                    {
+                        use_new_vs = true;
+                    }
+
+                    else if ("--workingdir" == args[i])
+                    {
+                        string project_name = args[++i];
+                        string working_dir = args[++i];
+                        projectDict.Add(project_name, working_dir);
+                    }
+                    else if ("--config" == args[i])
+                    {
+                        if (config != null)
+                        {
+                            throw new ApplicationException("Found second --config option");
+                        }
+                        config = args[++i];
+                    }
+                    else if ("--startup" == args[i])
+                    {
+                        if (startup_project != null)
+                        {
+                            throw new ApplicationException("Found second --startup option");
+                        }
+                        startup_project = args[++i];
+                    }
+                    else
+                    {
+                        throw new ApplicationException("Found unrecognized token on command line: " + args[i]);
+                    }
+                }
+
+                if (solution_name == null)
+                {
+                    throw new ApplicationException("The --solution option is required.");
+                }
+            }
+            catch(ApplicationException e)
+            {
+
+                Console.WriteLine("Oops! " + e.Message);
+                Console.Write("Command line:");
+                foreach (string arg in args)
+                {
+                    Console.Write(" " + arg);
+                }
+                Console.Write("\n\n");
+                Console.WriteLine("VSTool command line usage");
+                Console.Write(options_desc);
+                throw e;
+            }
+            return true;
+        }
+
+        public static bool GetDTEAndSolution()
+        {
+            bool found_open_solution = true;
+
+            Console.WriteLine("Looking for existing VisualStudio instance...");
+
+            // Get an instance of the currently running Visual Studio .NET IDE.
+            // dte = (EnvDTE.DTE)System.Runtime.InteropServices.Marshal.GetActiveObject("VisualStudio.DTE.7.1");
+            string full_solution_name = System.IO.Path.GetFullPath(solution_name);
+            if (false == use_new_vs)
+            {
+                dte = GetIDEInstance(full_solution_name);
+            }
+
+            if (dte == null)
+            {
+                try
+                {
+                    Console.WriteLine("  Didn't find open solution, starting new background VisualStudio instance...");
+                    Console.WriteLine("  Reading .sln file version...");
+                    string version = GetSolutionVersion(full_solution_name);
+
+                    Console.WriteLine("  Using version: {0}...", version);
+                    string progid = GetVSProgID(version);
+
+                    Type objType = Type.GetTypeFromProgID(progid);
+                    dte = System.Activator.CreateInstance(objType);
+                    Console.WriteLine("  Reading solution: \"{0}\"", full_solution_name);
+
+                    solution = ViaCOM.GetProperty(dte, "Solution");
+                    object[] openArgs = { full_solution_name };
+                    ViaCOM.CallMethod(solution, "Open", openArgs);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.Message);
+                    Console.WriteLine("Quitting do to error opening: {0}", full_solution_name);
+                    solution = null;
+                    dte = null;
+                    return found_open_solution;
+                }
+                found_open_solution = false;
+            }
+
+            if (solution == null)
+            {
+                solution = ViaCOM.GetProperty(dte, "Solution");
+            }
+
+            return found_open_solution;
+        }
+
+        /// <summary>
+        /// Get the DTE object for the instance of Visual Studio IDE that has 
+        /// the specified solution open.
+        /// </summary>
+        /// <param name="solutionFile">The absolute filename of the solution</param>
+        /// <returns>Corresponding DTE object or null if no such IDE is running</returns>
+        public static object GetIDEInstance( string solutionFile )
+        {
+            Hashtable runningInstances = GetIDEInstances( true );
+            IDictionaryEnumerator enumerator = runningInstances.GetEnumerator();
+
+            while ( enumerator.MoveNext() )
+            {
+                try
+                {
+                    object ide = enumerator.Value;
+                    if (ide != null)
+                    {
+                        object sol = ViaCOM.GetProperty(ide, "Solution");
+                        if (0 == string.Compare((string)ViaCOM.GetProperty(sol, "FullName"), solutionFile, ignore_case))
+                        {
+                            return ide;
+                        }
+                    }
+                } 
+                catch{}
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Get a table of the currently running instances of the Visual Studio .NET IDE.
+        /// </summary>
+        /// <param name="openSolutionsOnly">Only return instances that have opened a solution</param>
+        /// <returns>A hashtable mapping the name of the IDE in the running object table to the corresponding DTE object</returns>
+        public static Hashtable GetIDEInstances( bool openSolutionsOnly )
+        {
+            Hashtable runningIDEInstances = new Hashtable();
+            Hashtable runningObjects = GetRunningObjectTable();
+
+            IDictionaryEnumerator rotEnumerator = runningObjects.GetEnumerator();
+            while ( rotEnumerator.MoveNext() )
+            {
+                string candidateName = (string) rotEnumerator.Key;
+                if (!candidateName.StartsWith("!VisualStudio.DTE"))
+                    continue;
+
+                object ide = rotEnumerator.Value;
+                if (ide == null)
+                    continue;
+
+                if (openSolutionsOnly)
+                {
+                    try
+                    {
+                        object sol = ViaCOM.GetProperty(ide, "Solution");
+                        string solutionFile = (string)ViaCOM.GetProperty(sol, "FullName");
+                        if (solutionFile != String.Empty)
+                        {
+                            runningIDEInstances[ candidateName ] = ide;
+                        }
+                    } 
+                    catch {}
+                }
+                else
+                {
+                    runningIDEInstances[ candidateName ] = ide;
+                }                       
+            }
+            return runningIDEInstances;
+        }
+
+        /// <summary>
+        /// Get a snapshot of the running object table (ROT).
+        /// </summary>
+        /// <returns>A hashtable mapping the name of the object in the ROT to the corresponding object</returns>
+        [STAThread]
+        public static Hashtable GetRunningObjectTable()
+        {
+            Hashtable result = new Hashtable();
+
+            int numFetched = 0;
+            IRunningObjectTable runningObjectTable;   
+            IEnumMoniker monikerEnumerator;
+            IMoniker[] monikers = new IMoniker[1];
+
+            GetRunningObjectTable(0, out runningObjectTable);    
+            runningObjectTable.EnumRunning(out monikerEnumerator);
+            monikerEnumerator.Reset();          
+            
+            while (monikerEnumerator.Next(1, monikers, new IntPtr(numFetched)) == 0)
+            {     
+                IBindCtx ctx;
+                CreateBindCtx(0, out ctx);     
+                    
+                string runningObjectName;
+                monikers[0].GetDisplayName(ctx, null, out runningObjectName);
+
+                object runningObjectVal;  
+                runningObjectTable.GetObject( monikers[0], out runningObjectVal); 
+
+                result[ runningObjectName ] = runningObjectVal;
+            } 
+
+            return result;
+        }
+
+        public static string GetSolutionVersion(string solutionFullFileName) 
+        {
+            string version;
+            System.IO.StreamReader solutionStreamReader = null;
+            string firstLine;
+            string format;
+            
+            try
+            {
+                solutionStreamReader = new System.IO.StreamReader(solutionFullFileName);
+                do
+                {
+                    firstLine = solutionStreamReader.ReadLine();
+                }
+                while (firstLine == "");
+                
+                format = firstLine.Substring(firstLine.LastIndexOf(" ")).Trim();
+        
+                switch(format)
+                {
+                    case "7.00":
+                        version = "VC70";
+                        break;
+
+                    case "8.00":
+                        version = "VC71";
+                        break;
+
+                    case "9.00":
+                        version = "VC80";
+                        break;
+                
+                    case "10.00":
+                        version = "VC90";
+                        break;
+                    default:
+                        throw new ApplicationException("Unknown .sln version: " + format);
+                }
+            }
+            finally
+            {
+                if(solutionStreamReader != null) 
+                {
+                    solutionStreamReader.Close();
+                }
+            }
+            
+            return version;
+        }
+
+        public static string GetVSProgID(string version)
+        {
+            string progid = null;
+            switch(version)
+            {
+                case "VC70":
+                    progid = "VisualStudio.DTE.7";
+                    break;
+
+                case "VC71":
+                    progid = "VisualStudio.DTE.7.1";
+                    break;
+
+                case "VC80":
+                    progid = "VisualStudio.DTE.8.0";
+                    break;
+                
+                case "VC90":
+                    progid = "VisualStudio.DTE.9.0";
+                    break;
+                default:
+                    throw new ApplicationException("Can't handle VS version: " + version);
+            }
+
+            return progid;
+        }
+
+        public static bool SetProjectWorkingDir(object sol, string project_name, string working_dir)
+        {
+            bool made_change = false;
+            Console.WriteLine("Looking for project {0}...", project_name);
+            try
+            {
+                object prjs = ViaCOM.GetProperty(sol, "Projects");
+                object count = ViaCOM.GetProperty(prjs, "Count");
+                for(int i = 1; i <= (int)count; ++i)
+                {
+                    object[] prjItemArgs = { (object)i };
+                    object prj = ViaCOM.CallMethod(prjs, "Item", prjItemArgs);
+                    string name = (string)ViaCOM.GetProperty(prj, "Name");
+                    if (0 == string.Compare(name, project_name, ignore_case))
+                    {
+                        Console.WriteLine("Found project: {0}", project_name);
+                        Console.WriteLine("Setting working directory");
+
+                        string full_project_name = (string)ViaCOM.GetProperty(prj, "FullName");
+                        Console.WriteLine(full_project_name);
+
+                        // *NOTE:Mani Thanks to incompatibilities between different versions of the 
+                        // VCProjectEngine.dll assembly, we can't cast the objects recevied from the DTE to
+                        // the VCProjectEngine types from a different version than the one built 
+                        // with. ie, VisualStudio.DTE.7.1 objects can't be converted in a project built 
+                        // in VS 8.0. To avoid this problem, we can use the com object interfaces directly, 
+                        // without the type casting. Its tedious code, but it seems to work.
+
+                        // oCfgs should be assigned to a 'Project.Configurations' collection.
+                        object oCfgs = ViaCOM.GetProperty(ViaCOM.GetProperty(prj, "Object"), "Configurations");
+
+                        // oCount will be assigned to the number of configs present in oCfgs.
+                        object oCount = ViaCOM.GetProperty(oCfgs, "Count");
+
+                        for (int cfgIndex = 1; cfgIndex <= (int)oCount; ++cfgIndex)
+                        {
+                            object[] itemArgs = {(object)cfgIndex};
+                            object oCfg = ViaCOM.CallMethod(oCfgs, "Item", itemArgs);
+                            object oDebugSettings = ViaCOM.GetProperty(oCfg, "DebugSettings");
+                            ViaCOM.SetProperty(oDebugSettings, "WorkingDirectory", (object)working_dir);
+                        }
+
+                        break;
+                    }
+                }
+                made_change = true;
+            }
+            catch( Exception e )
+            {
+                Console.WriteLine(e.Message);
+                Console.WriteLine("Failed to set working dir for project, {0}.", project_name);
+            }
+
+            return made_change;
+        }
+
+        public static bool SetStartupProject(string startup_project)
+        {
+            bool result = false;
+            try
+            {
+                // You need the 'unique name of the project to set StartupProjects.
+                // find the project by generic name.
+                Console.WriteLine("Trying to set \"{0}\" to the startup project", startup_project);
+                object prjs = ViaCOM.GetProperty(solution, "Projects");
+                object count = ViaCOM.GetProperty(prjs, "Count");
+                for (int i = 1; i <= (int)count; ++i)
+                {
+                    object[] itemArgs = { (object)i };
+                    object prj = ViaCOM.CallMethod(prjs, "Item", itemArgs);
+                    object prjName = ViaCOM.GetProperty(prj, "Name");
+                    if (0 == string.Compare((string)prjName, startup_project, ignore_case))
+                    {
+                        object solBuild = ViaCOM.GetProperty(solution, "SolutionBuild");
+                        ViaCOM.SetProperty(solBuild, "StartupProjects", ViaCOM.GetProperty(prj, "UniqueName"));
+                        Console.WriteLine("  Success!");
+                        result = true;
+                        break;
+                    }
+                }
+
+                if (result == false)
+                {
+                    Console.WriteLine("  Could not find project \"{0}\" in the solution.", startup_project);
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("  Failed to set the startup project!");
+                Console.WriteLine(e.Message);
+            }
+            return result;
+        }
+
+        public static bool SetActiveConfig(string config)
+        {
+            bool result = false;
+            try
+            {
+                Console.WriteLine("Trying to set active config to \"{0}\"", config);
+                object solBuild = ViaCOM.GetProperty(solution, "SolutionBuild");
+                object solCfgs = ViaCOM.GetProperty(solBuild, "SolutionConfigurations");
+                object[] itemArgs = { (object)config };
+                object solCfg = ViaCOM.CallMethod(solCfgs, "Item", itemArgs);
+                ViaCOM.CallMethod(solCfg, "Activate", null);
+                Console.WriteLine("  Success!");
+                result = true;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("  Failed to set \"{0}\" as the active config.", config);
+                Console.WriteLine(e.Message);
+            }
+            return result;
+        }
+    }
+}
diff --git a/linden/indra/win_crash_logger/CMakeLists.txt b/linden/indra/win_crash_logger/CMakeLists.txt
new file mode 100644
index 0000000..d15377a
--- /dev/null
+++ b/linden/indra/win_crash_logger/CMakeLists.txt
@@ -0,0 +1,83 @@
+# -*- cmake -*-
+
+project(win_crash_logger)
+
+include(00-Common)
+include(LLCommon)
+include(LLCrashLogger)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLWindow)
+include(LLXML)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLCRASHLOGGER_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLWINDOW_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    )
+
+set(win_crash_logger_SOURCE_FILES
+    win_crash_logger.cpp
+    llcrashloggerwindows.cpp
+    )
+
+set(win_crash_logger_HEADER_FILES
+    CMakeLists.txt
+
+    llcrashloggerwindows.h
+    resource.h
+    StdAfx.h
+    win_crash_logger.h
+    )
+
+set_source_files_properties(${win_crash_logger_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+set(win_crash_logger_RESOURCE_FILES
+    ll_icon.ico
+    )
+
+set_source_files_properties(${win_crash_logger_RESOURCE_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+set(win_crash_logger_RESOURCE_FILES 
+    win_crash_logger.rc
+    ${win_crash_logger_RESOURCE_FILES}
+    )
+
+SOURCE_GROUP("Resource Files" FILES ${win_crash_logger_RESOURCE_FILES})
+
+list(APPEND 
+    win_crash_logger_SOURCE_FILES 
+    ${win_crash_logger_HEADER_FILES} 
+    ${win_crash_logger_RESOURCE_FILES}
+    )
+
+find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
+
+add_executable(windows-crash-logger WIN32 ${win_crash_logger_SOURCE_FILES})
+
+target_link_libraries(windows-crash-logger
+    ${LLCRASHLOGGER_LIBRARIES}
+    ${LLWINDOW_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    ${WINDOWS_LIBRARIES}
+    ${DXGUID_LIBRARY}
+    )
+    
+if (WINDOWS)
+    set_target_properties(windows-crash-logger
+        PROPERTIES 
+        LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+        LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD"
+        )
+endif (WINDOWS)
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
index e719d30..ef1e53e 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -59,7 +59,7 @@ HINSTANCE hInst= NULL;					// current instance
 TCHAR szTitle[MAX_LOADSTRING];				/* Flawfinder: ignore */		// The title bar text
 TCHAR szWindowClass[MAX_LOADSTRING];		/* Flawfinder: ignore */		// The title bar text
 
-LLString gProductName;
+std::string gProductName;
 HWND gHwndReport = NULL;	// Send/Don't Send dialog
 HWND gHwndProgress = NULL;	// Progress window
 HCURSOR gCursorArrow = NULL;
@@ -97,7 +97,7 @@ void write_debug(std::string& str)
 	write_debug(str.c_str());
 }
 
-void show_progress(const char* message)
+void show_progress(const std::string& message)
 {
 	std::wstring msg = wstring_to_utf16str(utf8str_to_wstring(message));
 	if (gHwndProgress)
@@ -198,7 +198,7 @@ bool handle_button_click(WORD button_id)
 						wbuffer, // pointer to buffer for text
 						20000 // maximum size of string
 						);
-		LLString user_text(ll_convert_wide_to_string(wbuffer));
+		std::string user_text(ll_convert_wide_to_string(wbuffer));
 		// Activate and show the window.
 		ShowWindow(gHwndProgress, SW_SHOW); 
 		// Try doing this second to make the progress window go frontmost.
@@ -341,7 +341,7 @@ bool LLCrashLoggerWindows::mainLoop()
 		ShowWindow(gHwndReport, SW_SHOW );
 		
 		MSG msg;
-		msg.wParam = 0;
+		memset(&msg, 0, sizeof(msg));
 		while (!LLApp::isQuitting() && GetMessage(&msg, NULL, 0, 0))
 		{
 			TranslateMessage(&msg);
@@ -357,10 +357,10 @@ bool LLCrashLoggerWindows::mainLoop()
 	return 0;
 }
 
-void LLCrashLoggerWindows::updateApplication(LLString message)
+void LLCrashLoggerWindows::updateApplication(const std::string& message)
 {
 	LLCrashLogger::updateApplication();
-	if(message != "") show_progress(message.c_str());
+	if(!message.empty()) show_progress(message);
 	update_messages();
 }
 
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.h b/linden/indra/win_crash_logger/llcrashloggerwindows.h
index 9f95dc2..dbf2d19 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.h
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.h
@@ -44,7 +44,7 @@ public:
 	~LLCrashLoggerWindows(void);
 	virtual bool init();
 	virtual bool mainLoop();
-	virtual void updateApplication(LLString message = "");
+	virtual void updateApplication(const std::string& message = LLStringUtil::null);
 	virtual bool cleanup();
 	virtual void gatherPlatformSpecificFiles();
 	//void annotateCallStack();
diff --git a/linden/indra/win_crash_logger/win_crash_logger.vcproj b/linden/indra/win_crash_logger/win_crash_logger.vcproj
deleted file mode 100644
index fa1bf3d..0000000
--- a/linden/indra/win_crash_logger/win_crash_logger.vcproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="win_crash_logger"
-	ProjectGUID="{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
-	RootNamespace="win_crash_logger"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libcurld.lib libeay32.lib libexpatMT.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib ssleay32.lib user32.lib wininet.lib winmm.lib winspool.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/win_crash_logger.pdb"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib netapi32.lib ole32.lib oleaut32.lib shell32.lib user32.lib wininet.lib winspool.lib libcurl.lib ssleay32.lib libeay32.lib zlib.lib winmm.lib psapi.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib netapi32.lib ole32.lib oleaut32.lib shell32.lib user32.lib wininet.lib winspool.lib libcurl.lib ssleay32.lib libeay32.lib zlib.lib winmm.lib psapi.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\llcrashlogger\llcrashlogger.cpp">
-			</File>
-			<File
-				RelativePath=".\llcrashloggerwindows.cpp">
-			</File>
-			<File
-				RelativePath=".\StdAfx.cpp">
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\llcrashlogger\llcrashlogger.h">
-			</File>
-			<File
-				RelativePath=".\llcrashloggerwindows.h">
-			</File>
-			<File
-				RelativePath=".\resource.h">
-			</File>
-			<File
-				RelativePath=".\StdAfx.h">
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-			<File
-				RelativePath=".\ll_icon.ico">
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.rc">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj b/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj
deleted file mode 100644
index 29f01bd..0000000
--- a/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="win_crash_logger"
-	ProjectGUID="{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
-	RootNamespace="win_crash_logger"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurld.lib libeay32.lib oldnames.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/win_crash_logger.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\llcrashlogger\llcrashlogger.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrashloggerwindows.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\llcrashlogger\llcrashlogger.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrashloggerwindows.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\ll_icon.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj b/linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj
deleted file mode 100644
index 0413ae9..0000000
--- a/linden/indra/win_crash_logger/win_crash_logger_vc9.vcproj
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="win_crash_logger"
-	ProjectGUID="{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"
-	RootNamespace="win_crash_logger"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurld.lib libeay32.lib oldnames.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/win_crash_logger.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcrashlogger;..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib user32.lib wininet.lib winspool.lib winmm.lib ssleay32.lib zlib.lib libcurl.lib libeay32.lib oldnames.lib"
-				OutputFile="win_crash_logger.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\llcrashlogger\llcrashlogger.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrashloggerwindows.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\llcrashlogger\llcrashlogger.h"
-				>
-			</File>
-			<File
-				RelativePath=".\llcrashloggerwindows.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StdAfx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\ll_icon.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\win_crash_logger.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/win_updater/CMakeLists.txt b/linden/indra/win_updater/CMakeLists.txt
new file mode 100644
index 0000000..6379d7c
--- /dev/null
+++ b/linden/indra/win_updater/CMakeLists.txt
@@ -0,0 +1,30 @@
+# -*- cmake -*-
+
+project(win_updater)
+
+include(00-Common)
+include(LLCommon)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    )
+
+set(win_updater_SOURCE_FILES updater.cpp)
+
+set(win_updater_HEADER_FILES CMakeLists.txt)
+
+set_source_files_properties(${win_updater_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND win_updater_SOURCE_FILES ${win_updater_HEADER_FILES})
+
+add_executable(windows-updater WIN32 ${win_updater_SOURCE_FILES})
+
+target_link_libraries(windows-updater wininet)
+
+set_target_properties(windows-updater
+    PROPERTIES
+    LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+    LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;MSVCRTD\""
+    )
diff --git a/linden/indra/win_updater/win_updater.vcproj b/linden/indra/win_updater/win_updater.vcproj
deleted file mode 100644
index 5ec6249..0000000
--- a/linden/indra/win_updater/win_updater.vcproj
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="win_updater"
-	ProjectGUID="{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"
-	RootNamespace="win_updater"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;LL_DEBUG"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/win_updater.pdb"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\updater.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/win_updater/win_updater_vc8.vcproj b/linden/indra/win_updater/win_updater_vc8.vcproj
deleted file mode 100644
index e6c2772..0000000
--- a/linden/indra/win_updater/win_updater_vc8.vcproj
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="win_updater"
-	ProjectGUID="{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"
-	RootNamespace="win_updater"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/win_updater.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\updater.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/indra/win_updater/win_updater_vc9.vcproj b/linden/indra/win_updater/win_updater_vc9.vcproj
deleted file mode 100644
index 0d704f4..0000000
--- a/linden/indra/win_updater/win_updater_vc9.vcproj
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="win_updater"
-	ProjectGUID="{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"
-	RootNamespace="win_updater"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="4"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/win_updater.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseNoOpt|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"
-				OutputFile="updater.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\updater.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/linden/install.xml b/linden/install.xml
new file mode 100644
index 0000000..c94e205
--- /dev/null
+++ b/linden/install.xml
@@ -0,0 +1,1302 @@
+<?xml version="1.0" ?>
+<llsd>
+<map>
+    <key>installables</key>
+    <map>
+      <key>GL</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1991-2000 Silicon Graphics, Inc.</string>
+        <key>description</key>
+        <string>A standard for 3D Graphics rendering engine.</string>
+        <key>license</key>
+        <string>GL</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>0bd2795a2afe09f6c563f2f888f24cc9</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>85f2ed989f853beb3d6cc94413b35f1a</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>e6ba152b7edd4ad2c9db4f9ff7bd38e1</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>SDL</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga</string>
+        <key>description</key>
+        <string>The Simple DirectMedia Layer libraries are used for handling input and basic window/GL setup on the Linux client.</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>025bb5e76fd964b89c508d88d37bb802</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>a28fe914d3f3241c824aabba69f1d946</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>149626b0c10d7eb8b9f9be96b5318218</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>apr_suite</key>
+      <map>
+        <key>license</key>
+        <string>apache 2.0</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>10b11783907b72712daef3ed5803d56d</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-darwin-20080618.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>b99f6bd3548c4f4613fe95320e14dbf3</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-20080618.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>352c46f39773b9415f8a9bf868c4c305</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-windows-20080618.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>ares</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright 1998 by the Massachusetts Institute of Technology.</string>
+        <key>description</key>
+        <string>Performs DNS requests and name resolves asynchronously. Used with libcurl to keep all HTTP operations async.</string>
+        <key>license</key>
+        <string>c-ares</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>d9ce3ace9235249b7edf6f564de83395</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-darwin-20080731b.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>aa111fae0ac550bba5e280275eb25904</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-linux-20080729.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>085a62de4c264d6a3718ad789aacd297</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-windows-20080618.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>berkeley</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1990-1999 Sleepycat Software. All rights reserved.</string>
+        <key>description</key>
+        <string>a high-performance, embedded database library</string>
+        <key>license</key>
+        <string>sleepycat</string>
+      </map>
+      <key>boost</key>
+      <map>
+        <key>copyright</key>
+        <string>various</string>
+        <key>description</key>
+        <string>A set of portable C++ libraries which provide a wide set of functionality. Used primarily for tokenization. </string>
+        <key>license</key>
+        <string>boost</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>792601ce1f38067c086394842852fa11</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.32.0-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>e65f06e2500db0bbc34506194ac49f6a</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.32.0-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>6f03592f4db4c177c7b255520283f547</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.32.0-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>curl</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1996 - 2008, Daniel Stenberg, &lt;daniel@haxx.se&gt;.</string>
+        <key>description</key>
+        <string>Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. </string>
+        <key>license</key>
+        <string>curl</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>73965ddba50e5c4d46d50a966b472626</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.0-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>a7791ee5ca19f208808f71730c3c2feb</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.0-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>fb42c5b40e34b043cee236aa216b141e</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.0-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>elfio</key>
+      <map>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>feb9d72c373c5dd4c6b88ed02e2b2bf0</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>expat</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd</string>
+        <key>description</key>
+        <string>An XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags).</string>
+        <key>license</key>
+        <string>mit</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>7b9380e6bac8d9ba5e6ff20da5cad91a</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20080617.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>e59d8314185e3d87d72ff90d6cff0d30</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>abd100b16dbe4621019a229af0411f5d</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-windows-20080617.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>fmod</key>
+      <map>
+        <key>copyright</key>
+        <string>FMOD Sound System, copyright (C) Firelight Technologies Pty, Ltd., 1994-2006.</string>
+        <key>description</key>
+        <string>Audio engine and mp3 stream decoder .</string>
+        <key>license</key>
+        <string>fmod</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>d13cc275db503492fc87c7b36c1c49d3</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-darwin-20080610.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>85caf188852f2cfede49ff12a3d928d5</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-20080610.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>1a55dec2907821f5f785648a660126c3</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-windows-20080611.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>fontconfig</key>
+      <map>
+        <key>license</key>
+        <string>mit</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>9af6a1ed39fa540bfcaa402b0ea22f78</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>freetype</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright</string>
+        <key>description</key>
+        <string>Font</string>
+        <key>license</key>
+        <string>freetype</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>cd8a8f8af5a01fac015e5b0325daa2ae</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>83e7aafe0807c2adec68f67b5738d856</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>b22d33d86567561eb116aa2ccd024d88</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>glh_linear</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2000 Cass Everitt; Copyright (c) 2000 NVIDIA Corporation; All rights reserved.</string>
+        <key>description</key>
+        <string>nVidia NVParse SDK: platform-indepenedent C++ Apple OpenGL helper library</string>
+        <key>license</key>
+        <string>glh_linear</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>23bd9a75e5a2365a827461e6c324f52b</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>2965646aea1d2a6aec1fbc431c02733f</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>38b9ddfe8dceff55ee4351016a937d1b</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glh_linear-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>google</key>
+      <map>
+        <key>license</key>
+        <string>mit</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>f1161282d7fc11fbe17d0aa077ee054b</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-linux-20080617.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>gstreamer</key>
+      <map>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>c829b638b6eef71ca63418cb9aea46a2</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>gtk-atk-pango-glib</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald</string>
+        <key>description</key>
+        <string>Libraries associated with GTK for gui features. atk: interfaces for accessibility; glib: low-level core functionality for using GTK+ and GNOME; pango: layout/rendering of text w/ emphasis on internationalization.</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>21c16a74f8fc9a62e3ab944a6eb7403d</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>d963750bcd333a108b3697d220c87d09</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>havok</key>
+      <map>
+        <key>copyright</key>
+        <string>on file</string>
+        <key>description</key>
+        <string>Physics engine for the simulator</string>
+        <key>license</key>
+        <string>havok</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>7d3d2d71c08729fe881a059af1d9b938</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6-darwin-20080610.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>36a892b451b5cbc8f72d6f1153f55cf8</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6-linux-20080610.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>b63a2f20df43c68062c6b8e77a2da455</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6-windows-20080611.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>jpeglib</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2003, Yves Piguet.</string>
+        <key>description</key>
+        <string>An open-source JPEG-2000 library; a slower alternative to Kadaku. Used in the open source release </string>
+        <key>license</key>
+        <string>jpeglib</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>30b12debc3efce275a335b824dda22d2</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>9297565a09754fdf2b58cefef60450c7</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>475ab2d2f4b769834bd3f35562b8c445</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>kdu</key>
+      <map>
+        <key>copyright</key>
+        <string>on file</string>
+        <key>description</key>
+        <string>Kakadu (KDU) JPEG-2000 decoder library. </string>
+        <key>license</key>
+        <string>kdu</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>9a91ecd80203a24fb347b1436155b013</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-darwin-20080716.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>daadd8c268e16f8c5f6145be8596b8b8</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-linux-20080716.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>15528c24ca657b524d9ab3ccbb33c766</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>kdu-binaries</key>
+      <map>
+        <key>copyright</key>
+        <string>see kdu</string>
+        <key>description</key>
+        <string>see kdu</string>
+        <key>license</key>
+        <string>kdu</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>480fbeeb47c9b9c4a2f947e310c9821c</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-darwin-20080617.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>ca87644e377a6cf16db4ba6dbd2f8689</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-linux-20080617.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>87af253b1d76437290355e8e20029377</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-windows-20080617.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>libmono</key>
+      <map>
+        <key>copyright</key>
+        <string>(C) 2005 Novell, Inc. http://www.novell.com</string>
+        <key>description</key>
+        <string>An open source implementation of the ECMA/ISO ECMA-334 Common L\
+anguage Infrstructure (CLI) international standard</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>39a803fcbe6f11b72358fc78b7777b6c</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-darwin-20080724.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>df73b95b0980e631ba1ecd930120699f</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-linux-20080722.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>7293312a6c76e5a38ec1b58ff87828d9</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libmono-windows-20080723.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>libpng</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson</string>
+        <key>description</key>
+        <string>An open, extensible image format with lossless compression. PNG Reference Library </string>
+        <key>license</key>
+        <string>libpng</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>90488b309856a82a152348db177a44c5</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>b47eca741c218e13e6838583c9169b64</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>96ad03239a2b1d50584dcaf66162e03e</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>libstdc++</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
+        <key>description</key>
+        <string>Bundled library.</string>
+        <key>license</key>
+        <string>gpl</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>0591314df0293ba948b0445b0215a18d</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.0-linux-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>libuuid</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
+        <key>description</key>
+        <string>Generates UUIDs under Linux. Originally a part of the ext2fs filesystem. Also see lluuid.cpp for all platforms. Part of the e2fsprogs package.</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>495f01afa67ed1ae59b7b8005cfa55ff</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>libxml</key>
+      <map>
+        <key>license</key>
+        <string>mit</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>4b5d2dcfe8a49b73fb69f10aab441092</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>llmozlib</key>
+      <map>
+        <key>license</key>
+        <string>mozillaPL</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>056ad496f0ec2bf386d50f694f6bade3</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>c80e060867b07dd3e3c1dce70f2316eb</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>4bf828c670fb9848c7d2a91bf4eccafc</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>mesa</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1999-2007  Brian Paul All Rights Reserved.</string>
+        <key>description</key>
+        <string>Mesa 3-D graphics library. Provides the required Apple OpenGL headers under Linux.</string>
+        <key>license</key>
+        <string>mesa</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>13802606c5f6e98af7cfa72cc85e3a92</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>82cdcdcb2d0615389a7480485ea35f4c</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>mysql</key>
+      <map>
+        <key>license</key>
+        <string>gpl</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>a60de9d31aa3dfab8851f8c2dfa3f8dc</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysql-darwin-20080610.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>813e8621ca3cd5a720f709620927070f</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysql-windows-20080611.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>ndofdev</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
+        <key>description</key>
+        <string>in use on windows and darwin for joystick support.</string>
+        <key>license</key>
+        <string>linden</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>15df716b66bd83e2198450eed93197cd</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-darwin-20080618.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>489612b246b2f4b2f239611d786c79de</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-linux-20080618.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>03cbdf59996f468f907f11cb9c64f93f</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-windows-20080618.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>ogg-vorbis</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2008 Xiph.org Foundation</string>
+        <key>description</key>
+        <string>Ogg: container format Vorbis: audio compression scheme</string>
+        <key>license</key>
+        <string>ogg-vorbis</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>8d9bb71c06f6494cc767965145f31c63</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>1e912aef160c1d8f46f4194942922654</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>9667525f28adb4ad54bbc883b14324ac</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>openSSL</key>
+      <map>
+        <key>license</key>
+        <string>openSSL</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>a708e7b41b91852b060bb3d62112b4d7</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>727f2a9399b7f414260a03fdf700aef4</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>8a75180cae12d268071c090abb031ba5</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>openjpeg</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium</string>
+        <key>description</key>
+        <string>An open-source JPEG-2000 library; a slower alternative to Kadaku. Used in the open source release </string>
+        <key>license</key>
+        <string>openjpeg</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>85b34723ab22591ebbc51c474588c2e0</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>406ceca1c85b64df18deed95f3b7854c</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>33ceb9232a59c0399ef4d239373c3e42</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>quicktime</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1990-2006 by Apple Computer, Inc., all rights reserved.</string>
+        <key>description</key>
+        <string>Separate download. Used to play in-world video clips on a prim. </string>
+        <key>license</key>
+        <string>quicktime</string>
+        <key>packages</key>
+        <map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>7a2e6fc89b1ef027f3a36ebb46fb0c8a</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/quicktime-windows-20080611.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>smartheap</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1991-2000 Compuware Corporation. All Rights Reserved.</string>
+        <key>description</key>
+        <string>Memory Management Library</string>
+        <key>license</key>
+        <string>smartheap</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>f54131b5f228e805c64c2e4e6c96579a</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-darwin-20080610.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>499208522bf7d7843e1d014d64214e06</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-linux-20080610.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>78fd47017f21d11eae43bca3e38a3e1e</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-windows-20080611.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>tut</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright 2002-2006 Vladimir Dyuzhev</string>
+        <key>description</key>
+        <string>C++ Template Unit Test</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>1116d9ba0c34c042788421d4e520e747</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>da7872a8a5cfe5d14ceeeebe73e58d6b</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>aa5e69f024bb408fac41d77d1101ccb6</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tut-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>unistd</key>
+      <map>
+        <key>copyright</key>
+        <string>(c) 2008 Linden Lab.</string>
+        <key>description</key>
+        <string>Placeholder file to make flex happy on windows.</string>
+        <key>license</key>
+        <string>linden</string>
+        <key>packages</key>
+        <map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>6353aff33d7d03b22055aec76f53a866</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/unistd-windows-20080611.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>vivox</key>
+      <map>
+        <key>copyright</key>
+        <string> </string>
+        <key>license</key>
+        <string>vivox</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>4d786ce5732b70cf230f0eebcec9571c</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>3b7dc33c106e1c4c10fc515249ac7bda</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-linux-20080613.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>ef09fcc8dea5d5fc911667f03c8b8a99</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>xmlrpc-epi</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright 2000 Epinions, Inc.</string>
+        <key>description</key>
+        <string>Implementation of the xmlrpc protocol in C that provides an API for developers to serialize RPC requests to and from XML. </string>
+        <key>license</key>
+        <string>xmlrpc-epi</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>f3e2f3428913bf8b8d70d28a3d079811</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20080613.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>0cc87341785bf23c253e6e69a7c16ca0</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux-20080618.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>ef96676498fef5c2bd1a1de0144163e2</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20080613.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+      <key>zlib</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler</string>
+        <key>description</key>
+        <string>A Massively Spiffy Yet Delicately Unobtrusive Compression Library (Also Free, Not to Mention Unencumbered by Patents)</string>
+        <key>license</key>
+        <string>zlib</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>6f5d1799ffacaec4b61d53051443c672</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-darwin-20080618.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>4140bc104e828c5c33f251a2d5bfe144</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-linux-20080618.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>bebeba689d2a8d19cfde150582a4f85a</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-windows-20080618.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
+    </map>
+    <key>licenses</key>
+    <map>
+      <key>GL</key>
+      <map>
+        <key>url</key>
+        <string>http://www.xfree86.org/4.4.0/LICENSE9.html#sgi</string>
+      </map>
+      <key>apache 2.0</key>
+      <map>
+        <key>url</key>
+        <string>http://www.apache.org/licenses/LICENSE-2.0</string>
+      </map>
+      <key>boost</key>
+      <map>
+        <key>url</key>
+        <string>http://www.boost.org/LICENSE_1_0.txt</string>
+      </map>
+      <key>bsd</key>
+      <map>
+        <key>url</key>
+        <string>http://www.opensource.org/licenses/bsd-license.php</string>
+      </map>
+      <key>c-ares</key>
+      <map>
+        <key>text</key>
+        <string>http://daniel.haxx.se/projects/c-ares/license.html</string>
+      </map>
+      <key>curl</key>
+      <map>
+        <key>url</key>
+        <string>http://curl.haxx.se/docs/copyright.html</string>
+      </map>
+      <key>fmod</key>
+      <map>
+        <key>url</key>
+        <string>http://www.fmod.org/ifmodlicense.html</string>
+      </map>
+      <key>freetype</key>
+      <map>
+        <key>url</key>
+        <string>http://freetype.sourceforge.net/FTL.TXT</string>
+      </map>
+      <key>glh_linear</key>
+      <map>
+        <key>text</key>
+        <string>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
+
+</string>
+      </map>
+      <key>gpl</key>
+      <map>
+        <key>url</key>
+        <string>http://www.gnu.org/licenses/gpl.html</string>
+      </map>
+      <key>havok</key>
+      <map>
+        <key>text</key>
+        <string>on file</string>
+      </map>
+      <key>intel</key>
+      <map>
+        <key>text</key>
+        <string>Haven't yet found.
+</string>
+      </map>
+      <key>jpeglib</key>
+      <map>
+        <key>text</key>
+        <string>http://nyctergatis.com/jpeglib/</string>
+      </map>
+      <key>kdu</key>
+      <map>
+        <key>text</key>
+        <string>jpeg2000 license #00024 (on file)</string>
+      </map>
+      <key>lgpl</key>
+      <map>
+        <key>url</key>
+        <string>http://www.gnu.org/copyleft/lgpl.html</string>
+      </map>
+      <key>libpng</key>
+      <map>
+        <key>text</key>
+        <string>http://www.libpng.org/pub/png/src/libpng-LICENSE.txt</string>
+      </map>
+      <key>linden</key>
+      <map>
+        <key>text</key>
+        <string>Using this license for Linden Lab owned library files</string>
+      </map>
+      <key>mesa</key>
+      <map>
+        <key>url</key>
+        <string>http://www.mesa3d.org/license.html</string>
+      </map>
+      <key>mit</key>
+      <map>
+        <key>text</key>
+        <string>http://www.jclark.com/xml/copying.txt</string>
+      </map>
+      <key>mozillaPL</key>
+      <map>
+        <key>url</key>
+        <string>http://www.mozilla.org/MPL/MPL-1.1.html</string>
+      </map>
+      <key>ogg-vorbis</key>
+      <map>
+        <key>url</key>
+        <string>http://www.xiph.org/licenses/bsd/</string>
+      </map>
+      <key>openSSL</key>
+      <map>
+        <key>url</key>
+        <string>http://www.openssl.org/source/license.html</string>
+      </map>
+      <key>openjpeg</key>
+      <map>
+        <key>url</key>
+        <string>http://www.openjpeg.org/BSDlicense.txt</string>
+      </map>
+      <key>quicktime</key>
+      <map>
+        <key>text</key>
+        <string>ENGLISH
+
+Apple Computer, Inc.
+QuickTime 7 Software Developer Kit (SDK) 
+Software License Agreement
+
+PLEASE READ THIS SOFTWARE LICENSE AGREEMENT ("LICENSE") BEFORE USING THE SOFTWARE.  BY USING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS LICENSE.  IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, SIGNIFY YOUR AGREEMENT TO BE BOUND BY THE TERMS OF THIS LICENSE BY CLICKING THE "AGREE/ACCEPT" BUTTON. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE, RETURN THE APPLE SOFTWARE TO THE PLACE WHERE YOU OBTAINED IT FOR A REFUND OR, IF THE SOFTWARE WAS ACCESSED ELECTRONICALLY, CLICK "DISAGREE/DECLINE".
+
+IMPORTANT NOTE: To the extent this software may be used to reproduce materials, it is licensed to you only for reproduction of materials you are authorized or legally permitted to reproduce.  
+
+1. License.  Any software, tools, utilities, sample code, documentation, fonts, API?s, header files and other materials accompanying this License, whether on disk, print or electronic documentation, in read only memory, or any other media, (collectively, the "Apple Software") are licensed, not sold, to you by Apple Computer, Inc. ("Apple") for use only under the terms of this License, and Apple reserves all rights not expressly granted to you.  The rights granted herein are limited to Apple's and its licensors' intellectual property rights in the Apple Software and do not include any other patents or intellectual property rights.   You own the media on which the Apple Software is recorded but Apple and/or Apple's licensor(s) retain ownership of the Apple Software itself.  The Apple Software in this package and any copies, modifications and derivative works that this License authorizes you to make are subject to this License.  
+
+2. Permitted Uses and Restrictions.  You may use the Apple Software to develop application software that is compatible with, and runs only on Mac OS X and/or Windows platforms with QuickTime installed.  Except for compiling header files and linking libraries as necessary to build your application software, you have no right to modify, incorporate into or include in combination with your own programs, license or otherwise redistribute any portion of the Apple Software. Your software application may not interfere with the functionality of QuickTime Player or the QuickTime Plug-in, including but not limited to file type or MIME type associations that are registered to QuickTime. You may make only as many internal use copies of the Apple Software as reasonably necessary to use the Apple Software as permitted in this paragraph and distribute such copies only to your employees whose job duties require them to so use the Apple Software. You must reproduce on each copy of the Apple Software or portion thereof, the Apple copyright notice and any other proprietary legends that were on the original copy of the Apple Software.  Except as expressly permitted in this License, you may not decompile, reverse engineer, disassemble, modify, rent, lease, loan, sublicense, distribute or create derivative works based upon the Apple Software in whole or part.  Your rights under this License will terminate automatically without notice from Apple if you fail to comply with any term(s) of this License. In addition, Apple reserves the right to terminate this License if a new version of Apple's operating system software or the Apple Software is released which is incompatible with the Apple Software.  
+
+3. Disclaimer Of Warranty.  The Apple Software may be "alpha", "beta", "development", pre-release, untested, and/or not fully tested and may contain errors that could cause failures or loss of data, be incomplete or contain inaccuracies.  YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT USE OF THE APPLE SOFTWARE IS AT YOUR SOLE RISK AND THAT THE ENTIRE RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY AND EFFORT IS WITH YOU. EXCEPT FOR THE LIMITED WARRANTY ON MEDIA SET FORTH ABOVE AND TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE APPLE SOFTWARE IS PROVIDED "AS IS", WITH ALL FAULTS AND WITHOUT WARRANTY OF ANY KIND, AND APPLE AND APPLE'S LICENSORS (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE PURPOSES OF SECTIONS 4 AND 5) HEREBY DISCLAIM ALL WARRANTIES AND CONDITIONS WITH RESPECT TO THE APPLE SOFTWARE, EITHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NON-INFRINGEMENT OF THIRD PARTY RIGHTS.  APPLE DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE APPLE SOFTWARE, THAT THE FUNCTIONS CONTAINED IN THE APPLE SOFTWARE WILL MEET YOUR REQUIREMENTS, THAT THE OPERATION OF THE APPLE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE APPLE SOFTWARE WILL BE CORRECTED. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE OR AN APPLE AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY.  SHOULD THE APPLE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES OR LIMITATIONS ON APPLICABLE STATUTORY RIGHTS OF A CONSUMER, SO THE ABOVE EXCLUSION AND LIMITATIONS MAY NOT APPLY TO YOU.  
+
+4. Limitation Of Liability. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT SHALL APPLE BE LIABLE FOR PERSONAL INJURY, OR ANY INCIDENTAL, SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES WHATSOEVER, INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, LOSS OF DATA, BUSINESS INTERRUPTION OR ANY OTHER COMMERCIAL DAMAGES OR LOSSES, ARISING OUT OF OR RELATED TO YOUR USE OR INABILITY TO USE THE APPLE SOFTWARE, HOWEVER CAUSED, REGARDLESS OF THE THEORY OF LIABILITY (CONTRACT, TORT OR OTHERWISE) AND EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY FOR PERSONAL INJURY, OR OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY TO YOU.  In no event shall Apple's total liability to you for all damages (other than as may be required by applicable law in cases involving personal injury) exceed the amount of fifty dollars ($50.00).  The foregoing limitations will apply even if the above stated remedy fails of its essential purpose.
+
+5. Export Control. You may not use or otherwise export or reexport the Apple Product except as authorized by United States law and the laws of the jurisdiction in which the Apple Product was obtained. In particular, but without limitation, the Apple Product may not be exported or re-exported (a) into any U.S. embargoed countries or (b) to anyone on the U.S. Treasury Department's list of Specially Designated Nationals or the U.S. Department of Commerce Denied Person?s List or Entity List.  By using the Apple Product, you represent and warrant that you are not located in any such country or on any such list. 
+
+6. Government End Users.  The Apple Software and related documentation are "Commercial Items", as that term is defined at 48 C.F.R. ?2.101, consisting of "Commercial Computer Software" and "Commercial Computer Software Documentation", as such terms are used in 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202, as applicable.  Consistent with 48 C.F.R. ?12.212 or 48 C.F.R. ?227.7202-1through 227.7202-4, as applicable, the Commercial Computer Software and Commercial Computer Software Documentation are being licensed to U.S. Government end users (a) only as Commercial Items and (b) with only those rights as are granted to all other end users pursuant to the terms and conditions herein.  Unpublished-rights reserved under the copyright laws of the United States.
+
+7. Controlling Law and Severability.  This License will be governed by and construed in accordance with the laws of the State of California, as applied to agreements entered into and to be performed entirely within California between California residents. This License shall not be governed by the United Nations Convention on Contracts for the International Sale of Goods, the application of which is expressly excluded. If for any reason a court of competent jurisdiction finds any provision, or portion thereof, to be unenforceable, the remainder of this License shall continue in full force and effect.  
+
+8. Complete Agreement.  This License constitutes the entire agreement between the parties with respect to the use of the Apple Software licensed hereunder and supersedes all prior or contemporaneous understandings regarding such subject matter.  No amendment to or modification of this License will be binding unless in writing and signed by Apple. Any translation of this License is done for local requirements and in the event of a dispute between the English and any non-English versions, the English version of this License shall govern.
+
+EA0300
+</string>
+      </map>
+      <key>sleepycat</key>
+      <map>
+        <key>url</key>
+        <string>http://opensource.org/licenses/sleepycat.php</string>
+      </map>
+      <key>smartheap</key>
+      <map>
+        <key>text</key>
+        <string>on file
+</string>
+      </map>
+      <key>things</key>
+      <map>
+      </map>
+      <key>vivox</key>
+      <map>
+        <key>text</key>
+        <string>on file</string>
+      </map>
+      <key>xmlrpc-epi</key>
+      <map>
+        <key>url</key>
+        <string>http://xmlrpc-epi.sourceforge.net/main.php?t=license</string>
+      </map>
+      <key>zlib</key>
+      <map>
+        <key>url</key>
+        <string>http://www.gzip.org/zlib/zlib_license.html</string>
+      </map>
+    </map>
+  </map>
+</llsd>
diff --git a/linden/libraries/i686-win32/include/GL/README.txt b/linden/libraries/i686-win32/include/GL/README.txt
deleted file mode 100644
index f9a39e9..0000000
--- a/linden/libraries/i686-win32/include/GL/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Note:
-Most of these files (glext.h, glxext.h, wglext.h) come from the Khronos GL Extension registry at:
-
-http://www.opengl.org/registry/
-
diff --git a/linden/libraries/i686-win32/include/GL/glext.h b/linden/libraries/i686-win32/include/GL/glext.h
deleted file mode 100644
index 3d69d4e..0000000
--- a/linden/libraries/i686-win32/include/GL/glext.h
+++ /dev/null
@@ -1,7271 +0,0 @@
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-** 
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are 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 Materials.
-** 
-** THE MATERIALS ARE 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
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2007/02/12 */
-/* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 39
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_SLUMINANCE_ALPHA               0x8C44
-#define GL_SLUMINANCE8_ALPHA8             0x8C45
-#define GL_SLUMINANCE                     0x8C46
-#define GL_SLUMINANCE8                    0x8C47
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#define GL_COMPRESSED_SLUMINANCE          0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT              0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
-#define GL_DEPTH24_STENCIL8_EXT           0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_STENCIL_TAG_BITS_EXT           0x88F2
-#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_SRGB_EXT                       0x8C40
-#define GL_SRGB8_EXT                      0x8C41
-#define GL_SRGB_ALPHA_EXT                 0x8C42
-#define GL_SRGB8_ALPHA8_EXT               0x8C43
-#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
-#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
-#define GL_SLUMINANCE_EXT                 0x8C46
-#define GL_SLUMINANCE8_EXT                0x8C47
-#define GL_COMPRESSED_SRGB_EXT            0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
-#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
-#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
-#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CAA
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#define GL_MAX_SAMPLES_EXT                0x8D57
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_TEXTURE_1D_STACK_MESAX         0x8759
-#define GL_TEXTURE_2D_STACK_MESAX         0x875A
-#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
-#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
-#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
-#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_TIME_ELAPSED_EXT               0x88BF
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
-#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
-#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
-#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
-#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
-#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
-#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
-#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_LINES_ADJACENCY_EXT            0x000A
-#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
-#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
-#define GL_GEOMETRY_PROGRAM_NV            0x8C26
-#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
-#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
-#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_GEOMETRY_SHADER_EXT            0x8DD9
-/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
-/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
-/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
-/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-/* reuse GL_LINES_ADJACENCY_EXT */
-/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
-/* reuse GL_TRIANGLES_ADJACENCY_EXT */
-/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-/* reuse GL_PROGRAM_POINT_SIZE_EXT */
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
-#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
-#define GL_SAMPLER_BUFFER_EXT             0x8DC2
-#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
-#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
-#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
-#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
-#define GL_INT_SAMPLER_1D_EXT             0x8DC9
-#define GL_INT_SAMPLER_2D_EXT             0x8DCA
-#define GL_INT_SAMPLER_3D_EXT             0x8DCB
-#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
-#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
-#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
-#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_R11F_G11F_B10F_EXT             0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
-#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
-#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
-#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_TEXTURE_BUFFER_EXT             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_RGB9_E5_EXT                    0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
-#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
-#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
-#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
-#endif
-
-#ifndef GL_NV_fragment_program4
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
-#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
-#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
-#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
-#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
-#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
-#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
-#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
-#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
-#define GL_TEXTURE_COORD_NV               0x8C79
-#define GL_CLIP_DISTANCE_NV               0x8C7A
-#define GL_VERTEX_ID_NV                   0x8C7B
-#define GL_PRIMITIVE_ID_NV                0x8C7C
-#define GL_GENERIC_ATTRIB_NV              0x8C7D
-#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
-#define GL_ACTIVE_VARYINGS_NV             0x8C81
-#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
-#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
-#define GL_PRIMITIVES_GENERATED_NV        0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
-#define GL_RASTERIZER_DISCARD_NV          0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
-#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
-#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
-#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
-#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
-#define GL_UNIFORM_BUFFER_EXT             0x8DEE
-#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_RGBA32UI_EXT                   0x8D70
-#define GL_RGB32UI_EXT                    0x8D71
-#define GL_ALPHA32UI_EXT                  0x8D72
-#define GL_INTENSITY32UI_EXT              0x8D73
-#define GL_LUMINANCE32UI_EXT              0x8D74
-#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
-#define GL_RGBA16UI_EXT                   0x8D76
-#define GL_RGB16UI_EXT                    0x8D77
-#define GL_ALPHA16UI_EXT                  0x8D78
-#define GL_INTENSITY16UI_EXT              0x8D79
-#define GL_LUMINANCE16UI_EXT              0x8D7A
-#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
-#define GL_RGBA8UI_EXT                    0x8D7C
-#define GL_RGB8UI_EXT                     0x8D7D
-#define GL_ALPHA8UI_EXT                   0x8D7E
-#define GL_INTENSITY8UI_EXT               0x8D7F
-#define GL_LUMINANCE8UI_EXT               0x8D80
-#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
-#define GL_RGBA32I_EXT                    0x8D82
-#define GL_RGB32I_EXT                     0x8D83
-#define GL_ALPHA32I_EXT                   0x8D84
-#define GL_INTENSITY32I_EXT               0x8D85
-#define GL_LUMINANCE32I_EXT               0x8D86
-#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
-#define GL_RGBA16I_EXT                    0x8D88
-#define GL_RGB16I_EXT                     0x8D89
-#define GL_ALPHA16I_EXT                   0x8D8A
-#define GL_INTENSITY16I_EXT               0x8D8B
-#define GL_LUMINANCE16I_EXT               0x8D8C
-#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
-#define GL_RGBA8I_EXT                     0x8D8E
-#define GL_RGB8I_EXT                      0x8D8F
-#define GL_ALPHA8I_EXT                    0x8D90
-#define GL_INTENSITY8I_EXT                0x8D91
-#define GL_LUMINANCE8I_EXT                0x8D92
-#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
-#define GL_RED_INTEGER_EXT                0x8D94
-#define GL_GREEN_INTEGER_EXT              0x8D95
-#define GL_BLUE_INTEGER_EXT               0x8D96
-#define GL_ALPHA_INTEGER_EXT              0x8D97
-#define GL_RGB_INTEGER_EXT                0x8D98
-#define GL_RGBA_INTEGER_EXT               0x8D99
-#define GL_BGR_INTEGER_EXT                0x8D9A
-#define GL_BGRA_INTEGER_EXT               0x8D9B
-#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
-#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
-#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-#endif
-
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil 1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_EXT_stencil_clear_tag 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_EXT_texture_sRGB 1
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_EXT_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_MESAX_texture_stack 1
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *);
-GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_APPLE_flush_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_NV_gpu_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_NV_geometry_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint);
-GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_EXT_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_NV_vertex_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint);
-GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_EXT_gpu_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *);
-GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *);
-GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint);
-GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#define GL_EXT_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_EXT_packed_float 1
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_EXT_texture_array 1
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_EXT_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc 1
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_EXT_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_EXT_texture_shared_exponent 1
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_NV_depth_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble);
-GLAPI void APIENTRY glClearDepthdNV (GLdouble);
-GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
-#endif
-
-#ifndef GL_NV_fragment_program4
-#define GL_NV_fragment_program4 1
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_NV_framebuffer_multisample_coverage 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#define GL_NV_geometry_shader4 1
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_NV_parameter_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#define GL_EXT_draw_buffers2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *);
-GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint);
-GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_NV_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum);
-GLAPI void APIENTRY glEndTransformFeedbackNV (void);
-GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum);
-GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
-GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr);
-GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum);
-GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_EXT_bindable_uniform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint);
-GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint);
-GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
-typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_EXT_texture_integer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#define GL_GREMEDY_frame_terminator 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/linden/libraries/i686-win32/include/GL/glut.h b/linden/libraries/i686-win32/include/GL/glut.h
deleted file mode 100644
index e0692ad..0000000
--- a/linden/libraries/i686-win32/include/GL/glut.h
+++ /dev/null
@@ -1,596 +0,0 @@
-#ifndef __glut_h__
-#define __glut_h__
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */
-
-/* This program is freely distributable without licensing fees  and is
-   provided without guarantee or warrantee expressed or  implied. This
-   program is -not- in the public domain. */
-
-#if defined(_WIN32)
-
-/* GLUT 3.7 now tries to avoid including <windows.h>
-   to avoid name space pollution, but Win32's <GL/gl.h> 
-   needs APIENTRY and WINGDIAPI defined properly. */
-# if 0
-#  define  WIN32_LEAN_AND_MEAN
-#  include <windows.h>
-# else
-   /* XXX This is from Win32's <windef.h> */
-#  ifndef APIENTRY
-#   define GLUT_APIENTRY_DEFINED
-#   if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
-#    define APIENTRY    __stdcall
-#   else
-#    define APIENTRY
-#   endif
-#  endif
-   /* XXX This is from Win32's <winnt.h> */
-#  ifndef CALLBACK
-#   if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
-#    define CALLBACK __stdcall
-#   else
-#    define CALLBACK
-#   endif
-#  endif
-   /* XXX This is from Win32's <wingdi.h> and <winnt.h> */
-#  ifndef WINGDIAPI
-#   define GLUT_WINGDIAPI_DEFINED
-#   define WINGDIAPI __declspec(dllimport)
-#  endif
-   /* XXX This is from Win32's <ctype.h> */
-#  ifndef _WCHAR_T_DEFINED
-typedef unsigned short wchar_t;
-#   define _WCHAR_T_DEFINED
-#  endif
-# endif
-
-#pragma comment (lib, "winmm.lib")     /* link with Windows MultiMedia lib */
-#pragma comment (lib, "opengl32.lib")  /* link with Microsoft OpenGL lib */
-#pragma comment (lib, "glu32.lib")     /* link with OpenGL Utility lib */
-#pragma comment (lib, "glut32.lib")    /* link with Win32 GLUT lib */
-
-#pragma warning (disable:4244)	/* Disable bogus conversion warnings. */
-#pragma warning (disable:4305)  /* VC++ 5.0 version of above warning. */
-
-#endif
-
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-/* define APIENTRY and CALLBACK to null string if we aren't on Win32 */
-#if !defined(_WIN32)
-#define APIENTRY
-#define GLUT_APIENTRY_DEFINED
-#define CALLBACK
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- GLUT API revision history:
- 
- GLUT_API_VERSION is updated to reflect incompatible GLUT
- API changes (interface changes, semantic changes, deletions,
- or additions).
- 
- GLUT_API_VERSION=1  First public release of GLUT.  11/29/94
-
- GLUT_API_VERSION=2  Added support for OpenGL/GLX multisampling,
- extension.  Supports new input devices like tablet, dial and button
- box, and Spaceball.  Easy to query OpenGL extensions.
-
- GLUT_API_VERSION=3  glutMenuStatus added.
-
- GLUT_API_VERSION=4  glutInitDisplayString, glutWarpPointer,
- glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic
- video resize subAPI, glutPostWindowRedisplay, glutKeyboardUpFunc,
- glutSpecialUpFunc, glutIgnoreKeyRepeat, glutSetKeyRepeat,
- glutJoystickFunc, glutForceJoystickFunc (NOT FINALIZED!).
-**/
-#ifndef GLUT_API_VERSION  /* allow this to be overriden */
-#define GLUT_API_VERSION		3
-#endif
-
-/**
- GLUT implementation revision history:
- 
- GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT
- API revisions and implementation revisions (ie, bug fixes).
-
- GLUT_XLIB_IMPLEMENTATION=1  mjk's first public release of
- GLUT Xlib-based implementation.  11/29/94
-
- GLUT_XLIB_IMPLEMENTATION=2  mjk's second public release of
- GLUT Xlib-based implementation providing GLUT version 2 
- interfaces.
-
- GLUT_XLIB_IMPLEMENTATION=3  mjk's GLUT 2.2 images. 4/17/95
-
- GLUT_XLIB_IMPLEMENTATION=4  mjk's GLUT 2.3 images. 6/?/95
-
- GLUT_XLIB_IMPLEMENTATION=5  mjk's GLUT 3.0 images. 10/?/95
-
- GLUT_XLIB_IMPLEMENTATION=7  mjk's GLUT 3.1+ with glutWarpPoitner.  7/24/96
-
- GLUT_XLIB_IMPLEMENTATION=8  mjk's GLUT 3.1+ with glutWarpPoitner
- and video resize.  1/3/97
-
- GLUT_XLIB_IMPLEMENTATION=9 mjk's GLUT 3.4 release with early GLUT 4 routines.
-
- GLUT_XLIB_IMPLEMENTATION=11 Mesa 2.5's GLUT 3.6 release.
-
- GLUT_XLIB_IMPLEMENTATION=12 mjk's GLUT 3.6 release with early GLUT 4 routines + signal handling.
-
- GLUT_XLIB_IMPLEMENTATION=13 mjk's GLUT 3.7 release with GameGLUT support.
-**/
-#ifndef GLUT_XLIB_IMPLEMENTATION  /* Allow this to be overriden. */
-#define GLUT_XLIB_IMPLEMENTATION	13
-#endif
-
-/* Display mode bit masks. */
-#define GLUT_RGB			0
-#define GLUT_RGBA			GLUT_RGB
-#define GLUT_INDEX			1
-#define GLUT_SINGLE			0
-#define GLUT_DOUBLE			2
-#define GLUT_ACCUM			4
-#define GLUT_ALPHA			8
-#define GLUT_DEPTH			16
-#define GLUT_STENCIL			32
-#if (GLUT_API_VERSION >= 2)
-#define GLUT_MULTISAMPLE		128
-#define GLUT_STEREO			256
-#endif
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_LUMINANCE			512
-#endif
-
-/* Mouse buttons. */
-#define GLUT_LEFT_BUTTON		0
-#define GLUT_MIDDLE_BUTTON		1
-#define GLUT_RIGHT_BUTTON		2
-
-/* Mouse button  state. */
-#define GLUT_DOWN			0
-#define GLUT_UP				1
-
-#if (GLUT_API_VERSION >= 2)
-/* function keys */
-#define GLUT_KEY_F1			1
-#define GLUT_KEY_F2			2
-#define GLUT_KEY_F3			3
-#define GLUT_KEY_F4			4
-#define GLUT_KEY_F5			5
-#define GLUT_KEY_F6			6
-#define GLUT_KEY_F7			7
-#define GLUT_KEY_F8			8
-#define GLUT_KEY_F9			9
-#define GLUT_KEY_F10			10
-#define GLUT_KEY_F11			11
-#define GLUT_KEY_F12			12
-/* directional keys */
-#define GLUT_KEY_LEFT			100
-#define GLUT_KEY_UP			101
-#define GLUT_KEY_RIGHT			102
-#define GLUT_KEY_DOWN			103
-#define GLUT_KEY_PAGE_UP		104
-#define GLUT_KEY_PAGE_DOWN		105
-#define GLUT_KEY_HOME			106
-#define GLUT_KEY_END			107
-#define GLUT_KEY_INSERT			108
-#endif
-
-/* Entry/exit  state. */
-#define GLUT_LEFT			0
-#define GLUT_ENTERED			1
-
-/* Menu usage  state. */
-#define GLUT_MENU_NOT_IN_USE		0
-#define GLUT_MENU_IN_USE		1
-
-/* Visibility  state. */
-#define GLUT_NOT_VISIBLE		0
-#define GLUT_VISIBLE			1
-
-/* Window status  state. */
-#define GLUT_HIDDEN			0
-#define GLUT_FULLY_RETAINED		1
-#define GLUT_PARTIALLY_RETAINED		2
-#define GLUT_FULLY_COVERED		3
-
-/* Color index component selection values. */
-#define GLUT_RED			0
-#define GLUT_GREEN			1
-#define GLUT_BLUE			2
-
-/* Layers for use. */
-#define GLUT_NORMAL			0
-#define GLUT_OVERLAY			1
-
-#if defined(_WIN32)
-/* Stroke font constants (use these in GLUT program). */
-#define GLUT_STROKE_ROMAN		((void*)0)
-#define GLUT_STROKE_MONO_ROMAN		((void*)1)
-
-/* Bitmap font constants (use these in GLUT program). */
-#define GLUT_BITMAP_9_BY_15		((void*)2)
-#define GLUT_BITMAP_8_BY_13		((void*)3)
-#define GLUT_BITMAP_TIMES_ROMAN_10	((void*)4)
-#define GLUT_BITMAP_TIMES_ROMAN_24	((void*)5)
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_BITMAP_HELVETICA_10	((void*)6)
-#define GLUT_BITMAP_HELVETICA_12	((void*)7)
-#define GLUT_BITMAP_HELVETICA_18	((void*)8)
-#endif
-#else
-/* Stroke font opaque addresses (use constants instead in source code). */
-extern void *glutStrokeRoman;
-extern void *glutStrokeMonoRoman;
-
-/* Stroke font constants (use these in GLUT program). */
-#define GLUT_STROKE_ROMAN		(&glutStrokeRoman)
-#define GLUT_STROKE_MONO_ROMAN		(&glutStrokeMonoRoman)
-
-/* Bitmap font opaque addresses (use constants instead in source code). */
-extern void *glutBitmap9By15;
-extern void *glutBitmap8By13;
-extern void *glutBitmapTimesRoman10;
-extern void *glutBitmapTimesRoman24;
-extern void *glutBitmapHelvetica10;
-extern void *glutBitmapHelvetica12;
-extern void *glutBitmapHelvetica18;
-
-/* Bitmap font constants (use these in GLUT program). */
-#define GLUT_BITMAP_9_BY_15		(&glutBitmap9By15)
-#define GLUT_BITMAP_8_BY_13		(&glutBitmap8By13)
-#define GLUT_BITMAP_TIMES_ROMAN_10	(&glutBitmapTimesRoman10)
-#define GLUT_BITMAP_TIMES_ROMAN_24	(&glutBitmapTimesRoman24)
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_BITMAP_HELVETICA_10	(&glutBitmapHelvetica10)
-#define GLUT_BITMAP_HELVETICA_12	(&glutBitmapHelvetica12)
-#define GLUT_BITMAP_HELVETICA_18	(&glutBitmapHelvetica18)
-#endif
-#endif
-
-/* glutGet parameters. */
-#define GLUT_WINDOW_X			100
-#define GLUT_WINDOW_Y			101
-#define GLUT_WINDOW_WIDTH		102
-#define GLUT_WINDOW_HEIGHT		103
-#define GLUT_WINDOW_BUFFER_SIZE		104
-#define GLUT_WINDOW_STENCIL_SIZE	105
-#define GLUT_WINDOW_DEPTH_SIZE		106
-#define GLUT_WINDOW_RED_SIZE		107
-#define GLUT_WINDOW_GREEN_SIZE		108
-#define GLUT_WINDOW_BLUE_SIZE		109
-#define GLUT_WINDOW_ALPHA_SIZE		110
-#define GLUT_WINDOW_ACCUM_RED_SIZE	111
-#define GLUT_WINDOW_ACCUM_GREEN_SIZE	112
-#define GLUT_WINDOW_ACCUM_BLUE_SIZE	113
-#define GLUT_WINDOW_ACCUM_ALPHA_SIZE	114
-#define GLUT_WINDOW_DOUBLEBUFFER	115
-#define GLUT_WINDOW_RGBA		116
-#define GLUT_WINDOW_PARENT		117
-#define GLUT_WINDOW_NUM_CHILDREN	118
-#define GLUT_WINDOW_COLORMAP_SIZE	119
-#if (GLUT_API_VERSION >= 2)
-#define GLUT_WINDOW_NUM_SAMPLES		120
-#define GLUT_WINDOW_STEREO		121
-#endif
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_WINDOW_CURSOR		122
-#endif
-#define GLUT_SCREEN_WIDTH		200
-#define GLUT_SCREEN_HEIGHT		201
-#define GLUT_SCREEN_WIDTH_MM		202
-#define GLUT_SCREEN_HEIGHT_MM		203
-#define GLUT_MENU_NUM_ITEMS		300
-#define GLUT_DISPLAY_MODE_POSSIBLE	400
-#define GLUT_INIT_WINDOW_X		500
-#define GLUT_INIT_WINDOW_Y		501
-#define GLUT_INIT_WINDOW_WIDTH		502
-#define GLUT_INIT_WINDOW_HEIGHT		503
-#define GLUT_INIT_DISPLAY_MODE		504
-#if (GLUT_API_VERSION >= 2)
-#define GLUT_ELAPSED_TIME		700
-#endif
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-#define GLUT_WINDOW_FORMAT_ID		123
-#endif
-
-#if (GLUT_API_VERSION >= 2)
-/* glutDeviceGet parameters. */
-#define GLUT_HAS_KEYBOARD		600
-#define GLUT_HAS_MOUSE			601
-#define GLUT_HAS_SPACEBALL		602
-#define GLUT_HAS_DIAL_AND_BUTTON_BOX	603
-#define GLUT_HAS_TABLET			604
-#define GLUT_NUM_MOUSE_BUTTONS		605
-#define GLUT_NUM_SPACEBALL_BUTTONS	606
-#define GLUT_NUM_BUTTON_BOX_BUTTONS	607
-#define GLUT_NUM_DIALS			608
-#define GLUT_NUM_TABLET_BUTTONS		609
-#endif
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-#define GLUT_DEVICE_IGNORE_KEY_REPEAT   610
-#define GLUT_DEVICE_KEY_REPEAT          611
-#define GLUT_HAS_JOYSTICK		612
-#define GLUT_OWNS_JOYSTICK		613
-#define GLUT_JOYSTICK_BUTTONS		614
-#define GLUT_JOYSTICK_AXES		615
-#define GLUT_JOYSTICK_POLL_RATE		616
-#endif
-
-#if (GLUT_API_VERSION >= 3)
-/* glutLayerGet parameters. */
-#define GLUT_OVERLAY_POSSIBLE           800
-#define GLUT_LAYER_IN_USE		801
-#define GLUT_HAS_OVERLAY		802
-#define GLUT_TRANSPARENT_INDEX		803
-#define GLUT_NORMAL_DAMAGED		804
-#define GLUT_OVERLAY_DAMAGED		805
-
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-/* glutVideoResizeGet parameters. */
-#define GLUT_VIDEO_RESIZE_POSSIBLE	900
-#define GLUT_VIDEO_RESIZE_IN_USE	901
-#define GLUT_VIDEO_RESIZE_X_DELTA	902
-#define GLUT_VIDEO_RESIZE_Y_DELTA	903
-#define GLUT_VIDEO_RESIZE_WIDTH_DELTA	904
-#define GLUT_VIDEO_RESIZE_HEIGHT_DELTA	905
-#define GLUT_VIDEO_RESIZE_X		906
-#define GLUT_VIDEO_RESIZE_Y		907
-#define GLUT_VIDEO_RESIZE_WIDTH		908
-#define GLUT_VIDEO_RESIZE_HEIGHT	909
-#endif
-
-/* glutUseLayer parameters. */
-#define GLUT_NORMAL			0
-#define GLUT_OVERLAY			1
-
-/* glutGetModifiers return mask. */
-#define GLUT_ACTIVE_SHIFT               1
-#define GLUT_ACTIVE_CTRL                2
-#define GLUT_ACTIVE_ALT                 4
-
-/* glutSetCursor parameters. */
-/* Basic arrows. */
-#define GLUT_CURSOR_RIGHT_ARROW		0
-#define GLUT_CURSOR_LEFT_ARROW		1
-/* Symbolic cursor shapes. */
-#define GLUT_CURSOR_INFO		2
-#define GLUT_CURSOR_DESTROY		3
-#define GLUT_CURSOR_HELP		4
-#define GLUT_CURSOR_CYCLE		5
-#define GLUT_CURSOR_SPRAY		6
-#define GLUT_CURSOR_WAIT		7
-#define GLUT_CURSOR_TEXT		8
-#define GLUT_CURSOR_CROSSHAIR		9
-/* Directional cursors. */
-#define GLUT_CURSOR_UP_DOWN		10
-#define GLUT_CURSOR_LEFT_RIGHT		11
-/* Sizing cursors. */
-#define GLUT_CURSOR_TOP_SIDE		12
-#define GLUT_CURSOR_BOTTOM_SIDE		13
-#define GLUT_CURSOR_LEFT_SIDE		14
-#define GLUT_CURSOR_RIGHT_SIDE		15
-#define GLUT_CURSOR_TOP_LEFT_CORNER	16
-#define GLUT_CURSOR_TOP_RIGHT_CORNER	17
-#define GLUT_CURSOR_BOTTOM_RIGHT_CORNER	18
-#define GLUT_CURSOR_BOTTOM_LEFT_CORNER	19
-/* Inherit from parent window. */
-#define GLUT_CURSOR_INHERIT		100
-/* Blank cursor. */
-#define GLUT_CURSOR_NONE		101
-/* Fullscreen crosshair (if available). */
-#define GLUT_CURSOR_FULL_CROSSHAIR	102
-#endif
-
-/* GLUT initialization sub-API. */
-extern void APIENTRY glutInit(int *argcp, char **argv);
-extern void APIENTRY glutInitDisplayMode(unsigned int mode);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-extern void APIENTRY glutInitDisplayString(const char *string);
-#endif
-extern void APIENTRY glutInitWindowPosition(int x, int y);
-extern void APIENTRY glutInitWindowSize(int width, int height);
-extern void APIENTRY glutMainLoop(void);
-
-/* GLUT window sub-API. */
-extern int APIENTRY glutCreateWindow(const char *title);
-extern int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height);
-extern void APIENTRY glutDestroyWindow(int win);
-extern void APIENTRY glutPostRedisplay(void);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
-extern void APIENTRY glutPostWindowRedisplay(int win);
-#endif
-extern void APIENTRY glutSwapBuffers(void);
-extern int APIENTRY glutGetWindow(void);
-extern void APIENTRY glutSetWindow(int win);
-extern void APIENTRY glutSetWindowTitle(const char *title);
-extern void APIENTRY glutSetIconTitle(const char *title);
-extern void APIENTRY glutPositionWindow(int x, int y);
-extern void APIENTRY glutReshapeWindow(int width, int height);
-extern void APIENTRY glutPopWindow(void);
-extern void APIENTRY glutPushWindow(void);
-extern void APIENTRY glutIconifyWindow(void);
-extern void APIENTRY glutShowWindow(void);
-extern void APIENTRY glutHideWindow(void);
-#if (GLUT_API_VERSION >= 3)
-extern void APIENTRY glutFullScreen(void);
-extern void APIENTRY glutSetCursor(int cursor);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-extern void APIENTRY glutWarpPointer(int x, int y);
-#endif
-
-/* GLUT overlay sub-API. */
-extern void APIENTRY glutEstablishOverlay(void);
-extern void APIENTRY glutRemoveOverlay(void);
-extern void APIENTRY glutUseLayer(GLenum layer);
-extern void APIENTRY glutPostOverlayRedisplay(void);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
-extern void APIENTRY glutPostWindowOverlayRedisplay(int win);
-#endif
-extern void APIENTRY glutShowOverlay(void);
-extern void APIENTRY glutHideOverlay(void);
-#endif
-
-/* GLUT menu sub-API. */
-extern int APIENTRY glutCreateMenu(void (*)(int));
-extern void APIENTRY glutDestroyMenu(int menu);
-extern int APIENTRY glutGetMenu(void);
-extern void APIENTRY glutSetMenu(int menu);
-extern void APIENTRY glutAddMenuEntry(const char *label, int value);
-extern void APIENTRY glutAddSubMenu(const char *label, int submenu);
-extern void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value);
-extern void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu);
-extern void APIENTRY glutRemoveMenuItem(int item);
-extern void APIENTRY glutAttachMenu(int button);
-extern void APIENTRY glutDetachMenu(int button);
-
-/* GLUT window callback sub-API. */
-extern void APIENTRY glutDisplayFunc(void (*func)(void));
-extern void APIENTRY glutReshapeFunc(void (*func)(int width, int height));
-extern void APIENTRY glutKeyboardFunc(void (*func)(unsigned char key, int x, int y));
-extern void APIENTRY glutMouseFunc(void (*func)(int button, int state, int x, int y));
-extern void APIENTRY glutMotionFunc(void (*func)(int x, int y));
-extern void APIENTRY glutPassiveMotionFunc(void (*func)(int x, int y));
-extern void APIENTRY glutEntryFunc(void (*func)(int state));
-extern void APIENTRY glutVisibilityFunc(void (*func)(int state));
-extern void APIENTRY glutIdleFunc(void (*func)(void));
-extern void APIENTRY glutTimerFunc(unsigned int millis, void (*func)(int value), int value);
-extern void APIENTRY glutMenuStateFunc(void (*func)(int state));
-#if (GLUT_API_VERSION >= 2)
-extern void APIENTRY glutSpecialFunc(void (*func)(int key, int x, int y));
-extern void APIENTRY glutSpaceballMotionFunc(void (*func)(int x, int y, int z));
-extern void APIENTRY glutSpaceballRotateFunc(void (*func)(int x, int y, int z));
-extern void APIENTRY glutSpaceballButtonFunc(void (*func)(int button, int state));
-extern void APIENTRY glutButtonBoxFunc(void (*func)(int button, int state));
-extern void APIENTRY glutDialsFunc(void (*func)(int dial, int value));
-extern void APIENTRY glutTabletMotionFunc(void (*func)(int x, int y));
-extern void APIENTRY glutTabletButtonFunc(void (*func)(int button, int state, int x, int y));
-#if (GLUT_API_VERSION >= 3)
-extern void APIENTRY glutMenuStatusFunc(void (*func)(int status, int x, int y));
-extern void APIENTRY glutOverlayDisplayFunc(void (*func)(void));
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-extern void APIENTRY glutWindowStatusFunc(void (*func)(int state));
-#endif
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-extern void APIENTRY glutKeyboardUpFunc(void (*func)(unsigned char key, int x, int y));
-extern void APIENTRY glutSpecialUpFunc(void (*func)(int key, int x, int y));
-extern void APIENTRY glutJoystickFunc(void (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
-#endif
-#endif
-#endif
-
-/* GLUT color index sub-API. */
-extern void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue);
-extern GLfloat APIENTRY glutGetColor(int ndx, int component);
-extern void APIENTRY glutCopyColormap(int win);
-
-/* GLUT state retrieval sub-API. */
-extern int APIENTRY glutGet(GLenum type);
-extern int APIENTRY glutDeviceGet(GLenum type);
-#if (GLUT_API_VERSION >= 2)
-/* GLUT extension support sub-API */
-extern int APIENTRY glutExtensionSupported(const char *name);
-#endif
-#if (GLUT_API_VERSION >= 3)
-extern int APIENTRY glutGetModifiers(void);
-extern int APIENTRY glutLayerGet(GLenum type);
-#endif
-
-/* GLUT font sub-API */
-extern void APIENTRY glutBitmapCharacter(void *font, int character);
-extern int APIENTRY glutBitmapWidth(void *font, int character);
-extern void APIENTRY glutStrokeCharacter(void *font, int character);
-extern int APIENTRY glutStrokeWidth(void *font, int character);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-extern int APIENTRY glutBitmapLength(void *font, const unsigned char *string);
-extern int APIENTRY glutStrokeLength(void *font, const unsigned char *string);
-#endif
-
-/* GLUT pre-built models sub-API */
-extern void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
-extern void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
-extern void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-extern void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-extern void APIENTRY glutWireCube(GLdouble size);
-extern void APIENTRY glutSolidCube(GLdouble size);
-extern void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-extern void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-extern void APIENTRY glutWireDodecahedron(void);
-extern void APIENTRY glutSolidDodecahedron(void);
-extern void APIENTRY glutWireTeapot(GLdouble size);
-extern void APIENTRY glutSolidTeapot(GLdouble size);
-extern void APIENTRY glutWireOctahedron(void);
-extern void APIENTRY glutSolidOctahedron(void);
-extern void APIENTRY glutWireTetrahedron(void);
-extern void APIENTRY glutSolidTetrahedron(void);
-extern void APIENTRY glutWireIcosahedron(void);
-extern void APIENTRY glutSolidIcosahedron(void);
-
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-/* GLUT video resize sub-API. */
-extern int APIENTRY glutVideoResizeGet(GLenum param);
-extern void APIENTRY glutSetupVideoResizing(void);
-extern void APIENTRY glutStopVideoResizing(void);
-extern void APIENTRY glutVideoResize(int x, int y, int width, int height);
-extern void APIENTRY glutVideoPan(int x, int y, int width, int height);
-
-/* GLUT debugging sub-API. */
-extern void APIENTRY glutReportErrors(void);
-#endif
-
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-/* GLUT device control sub-API. */
-/* glutSetKeyRepeat modes. */
-#define GLUT_KEY_REPEAT_OFF		0
-#define GLUT_KEY_REPEAT_ON		1
-#define GLUT_KEY_REPEAT_DEFAULT		2
-
-/* Joystick button masks. */
-#define GLUT_JOYSTICK_BUTTON_A		1
-#define GLUT_JOYSTICK_BUTTON_B		2
-#define GLUT_JOYSTICK_BUTTON_C		4
-#define GLUT_JOYSTICK_BUTTON_D		8
-
-extern void APIENTRY glutIgnoreKeyRepeat(int ignore);
-extern void APIENTRY glutSetKeyRepeat(int repeatMode);
-extern void APIENTRY glutForceJoystickFunc(void);
-
-/* GLUT game mode sub-API. */
-/* glutGameModeGet. */
-#define GLUT_GAME_MODE_ACTIVE           0
-#define GLUT_GAME_MODE_POSSIBLE         1
-#define GLUT_GAME_MODE_WIDTH            2
-#define GLUT_GAME_MODE_HEIGHT           3
-#define GLUT_GAME_MODE_PIXEL_DEPTH      4
-#define GLUT_GAME_MODE_REFRESH_RATE     5
-#define GLUT_GAME_MODE_DISPLAY_CHANGED  6
-
-extern void APIENTRY glutGameModeString(const char *string);
-extern int APIENTRY glutEnterGameMode(void);
-extern void APIENTRY glutLeaveGameMode(void);
-extern int APIENTRY glutGameModeGet(GLenum mode);
-#endif
-
-#ifdef __cplusplus
-}
-
-#endif
-
-#ifdef GLUT_APIENTRY_DEFINED
-# undef GLUT_APIENTRY_DEFINED
-# undef APIENTRY
-#endif
-
-#ifdef GLUT_WINGDIAPI_DEFINED
-# undef GLUT_WINGDIAPI_DEFINED
-# undef WINGDIAPI
-#endif
-
-#endif                  /* __glut_h__ */
diff --git a/linden/libraries/i686-win32/include/GL/glxext.h b/linden/libraries/i686-win32/include/GL/glxext.h
deleted file mode 100644
index 0f66df6..0000000
--- a/linden/libraries/i686-win32/include/GL/glxext.h
+++ /dev/null
@@ -1,785 +0,0 @@
-#ifndef __glxext_h_
-#define __glxext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-** 
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are 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 Materials.
-** 
-** THE MATERIALS ARE 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
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glxext.h last updated 2007/04/21 */
-/* Current version at http://www.opengl.org/registry/ */
-#define GLX_GLXEXT_VERSION 19
-
-#ifndef GLX_VERSION_1_3
-#define GLX_WINDOW_BIT                     0x00000001
-#define GLX_PIXMAP_BIT                     0x00000002
-#define GLX_PBUFFER_BIT                    0x00000004
-#define GLX_RGBA_BIT                       0x00000001
-#define GLX_COLOR_INDEX_BIT                0x00000002
-#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
-#define GLX_FRONT_LEFT_BUFFER_BIT          0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT         0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT           0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT          0x00000008
-#define GLX_AUX_BUFFERS_BIT                0x00000010
-#define GLX_DEPTH_BUFFER_BIT               0x00000020
-#define GLX_STENCIL_BUFFER_BIT             0x00000040
-#define GLX_ACCUM_BUFFER_BIT               0x00000080
-#define GLX_CONFIG_CAVEAT                  0x20
-#define GLX_X_VISUAL_TYPE                  0x22
-#define GLX_TRANSPARENT_TYPE               0x23
-#define GLX_TRANSPARENT_INDEX_VALUE        0x24
-#define GLX_TRANSPARENT_RED_VALUE          0x25
-#define GLX_TRANSPARENT_GREEN_VALUE        0x26
-#define GLX_TRANSPARENT_BLUE_VALUE         0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE        0x28
-#define GLX_DONT_CARE                      0xFFFFFFFF
-#define GLX_NONE                           0x8000
-#define GLX_SLOW_CONFIG                    0x8001
-#define GLX_TRUE_COLOR                     0x8002
-#define GLX_DIRECT_COLOR                   0x8003
-#define GLX_PSEUDO_COLOR                   0x8004
-#define GLX_STATIC_COLOR                   0x8005
-#define GLX_GRAY_SCALE                     0x8006
-#define GLX_STATIC_GRAY                    0x8007
-#define GLX_TRANSPARENT_RGB                0x8008
-#define GLX_TRANSPARENT_INDEX              0x8009
-#define GLX_VISUAL_ID                      0x800B
-#define GLX_SCREEN                         0x800C
-#define GLX_NON_CONFORMANT_CONFIG          0x800D
-#define GLX_DRAWABLE_TYPE                  0x8010
-#define GLX_RENDER_TYPE                    0x8011
-#define GLX_X_RENDERABLE                   0x8012
-#define GLX_FBCONFIG_ID                    0x8013
-#define GLX_RGBA_TYPE                      0x8014
-#define GLX_COLOR_INDEX_TYPE               0x8015
-#define GLX_MAX_PBUFFER_WIDTH              0x8016
-#define GLX_MAX_PBUFFER_HEIGHT             0x8017
-#define GLX_MAX_PBUFFER_PIXELS             0x8018
-#define GLX_PRESERVED_CONTENTS             0x801B
-#define GLX_LARGEST_PBUFFER                0x801C
-#define GLX_WIDTH                          0x801D
-#define GLX_HEIGHT                         0x801E
-#define GLX_EVENT_MASK                     0x801F
-#define GLX_DAMAGED                        0x8020
-#define GLX_SAVED                          0x8021
-#define GLX_WINDOW                         0x8022
-#define GLX_PBUFFER                        0x8023
-#define GLX_PBUFFER_HEIGHT                 0x8040
-#define GLX_PBUFFER_WIDTH                  0x8041
-#endif
-
-#ifndef GLX_VERSION_1_4
-#define GLX_SAMPLE_BUFFERS                 100000
-#define GLX_SAMPLES                        100001
-#endif
-
-#ifndef GLX_ARB_get_proc_address
-#endif
-
-#ifndef GLX_ARB_multisample
-#define GLX_SAMPLE_BUFFERS_ARB             100000
-#define GLX_SAMPLES_ARB                    100001
-#endif
-
-#ifndef GLX_ARB_fbconfig_float
-#define GLX_RGBA_FLOAT_TYPE_ARB            0x20B9
-#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
-#endif
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SAMPLE_BUFFERS_SGIS            100000
-#define GLX_SAMPLES_SGIS                   100001
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_X_VISUAL_TYPE_EXT              0x22
-#define GLX_TRANSPARENT_TYPE_EXT           0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
-#define GLX_NONE_EXT                       0x8000
-#define GLX_TRUE_COLOR_EXT                 0x8002
-#define GLX_DIRECT_COLOR_EXT               0x8003
-#define GLX_PSEUDO_COLOR_EXT               0x8004
-#define GLX_STATIC_COLOR_EXT               0x8005
-#define GLX_GRAY_SCALE_EXT                 0x8006
-#define GLX_STATIC_GRAY_EXT                0x8007
-#define GLX_TRANSPARENT_RGB_EXT            0x8008
-#define GLX_TRANSPARENT_INDEX_EXT          0x8009
-#endif
-
-#ifndef GLX_SGI_swap_control
-#endif
-
-#ifndef GLX_SGI_video_sync
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#endif
-
-#ifndef GLX_SGIX_video_source
-#endif
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_VISUAL_CAVEAT_EXT              0x20
-#define GLX_SLOW_VISUAL_EXT                0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
-/* reuse GLX_NONE_EXT */
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_SHARE_CONTEXT_EXT              0x800A
-#define GLX_VISUAL_ID_EXT                  0x800B
-#define GLX_SCREEN_EXT                     0x800C
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_WINDOW_BIT_SGIX                0x00000001
-#define GLX_PIXMAP_BIT_SGIX                0x00000002
-#define GLX_RGBA_BIT_SGIX                  0x00000001
-#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
-#define GLX_DRAWABLE_TYPE_SGIX             0x8010
-#define GLX_RENDER_TYPE_SGIX               0x8011
-#define GLX_X_RENDERABLE_SGIX              0x8012
-#define GLX_FBCONFIG_ID_SGIX               0x8013
-#define GLX_RGBA_TYPE_SGIX                 0x8014
-#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
-/* reuse GLX_SCREEN_EXT */
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_PBUFFER_BIT_SGIX               0x00000004
-#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
-#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
-#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
-#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
-#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
-#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
-#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
-#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
-#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
-#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
-#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
-#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
-#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
-#define GLX_LARGEST_PBUFFER_SGIX           0x801C
-#define GLX_WIDTH_SGIX                     0x801D
-#define GLX_HEIGHT_SGIX                    0x801E
-#define GLX_EVENT_MASK_SGIX                0x801F
-#define GLX_DAMAGED_SGIX                   0x8020
-#define GLX_SAVED_SGIX                     0x8021
-#define GLX_WINDOW_SGIX                    0x8022
-#define GLX_PBUFFER_SGIX                   0x8023
-#endif
-
-#ifndef GLX_SGI_cushion
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SYNC_FRAME_SGIX                0x00000000
-#define GLX_SYNC_SWAP_SGIX                 0x00000001
-#endif
-
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
-#endif
-
-#ifndef GLX_SGIX_swap_group
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#endif
-
-#ifndef GLX_SGIS_blended_overlay
-#define GLX_BLENDED_RGBA_SGIS              0x8025
-#endif
-
-#ifndef GLX_SGIS_shared_multisample
-#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
-#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#endif
-
-#ifndef GLX_3DFX_multisample
-#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
-#define GLX_SAMPLES_3DFX                   0x8051
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_3DFX_WINDOW_MODE_MESA          0x1
-#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
-#endif
-
-#ifndef GLX_SGIX_visual_select_group
-#define GLX_VISUAL_SELECT_GROUP_SGIX       0x8028
-#endif
-
-#ifndef GLX_OML_swap_method
-#define GLX_SWAP_METHOD_OML                0x8060
-#define GLX_SWAP_EXCHANGE_OML              0x8061
-#define GLX_SWAP_COPY_OML                  0x8062
-#define GLX_SWAP_UNDEFINED_OML             0x8063
-#endif
-
-#ifndef GLX_OML_sync_control
-#endif
-
-#ifndef GLX_NV_float_buffer
-#define GLX_FLOAT_COMPONENTS_NV            0x20B0
-#endif
-
-#ifndef GLX_SGIX_hyperpipe
-#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
-#define GLX_BAD_HYPERPIPE_CONFIG_SGIX      91
-#define GLX_BAD_HYPERPIPE_SGIX             92
-#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX    0x00000001
-#define GLX_HYPERPIPE_RENDER_PIPE_SGIX     0x00000002
-#define GLX_PIPE_RECT_SGIX                 0x00000001
-#define GLX_PIPE_RECT_LIMITS_SGIX          0x00000002
-#define GLX_HYPERPIPE_STEREO_SGIX          0x00000003
-#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX   0x00000004
-#define GLX_HYPERPIPE_ID_SGIX              0x8030
-#endif
-
-#ifndef GLX_MESA_agp_offset
-#endif
-
-#ifndef GLX_EXT_fbconfig_packed_float
-#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT   0x20B1
-#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
-#endif
-
-#ifndef GLX_EXT_framebuffer_sRGB
-#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x20B2
-#endif
-
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-#define GLX_TEXTURE_FORMAT_EXT             0x20D5
-#define GLX_TEXTURE_TARGET_EXT             0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
-#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
-#define GLX_TEXTURE_1D_EXT                 0x20DB
-#define GLX_TEXTURE_2D_EXT                 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
-#define GLX_FRONT_LEFT_EXT                 0x20DE
-#define GLX_FRONT_RIGHT_EXT                0x20DF
-#define GLX_BACK_LEFT_EXT                  0x20E0
-#define GLX_BACK_RIGHT_EXT                 0x20E1
-#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
-#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
-#define GLX_AUX0_EXT                       0x20E2
-#define GLX_AUX1_EXT                       0x20E3
-#define GLX_AUX2_EXT                       0x20E4
-#define GLX_AUX3_EXT                       0x20E5
-#define GLX_AUX4_EXT                       0x20E6
-#define GLX_AUX5_EXT                       0x20E7
-#define GLX_AUX6_EXT                       0x20E8
-#define GLX_AUX7_EXT                       0x20E9
-#define GLX_AUX8_EXT                       0x20EA
-#define GLX_AUX9_EXT                       0x20EB
-#endif
-
-
-/*************************************************************/
-
-#ifndef GLX_ARB_get_proc_address
-typedef void (*__GLXextFuncPtr)(void);
-#endif
-
-#ifndef GLX_SGIX_video_source
-typedef XID GLXVideoSourceSGIX;
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-typedef XID GLXFBConfigIDSGIX;
-typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-typedef XID GLXPbufferSGIX;
-typedef struct {
-    int type;
-    unsigned long serial;	  /* # of last request processed by server */
-    Bool send_event;		  /* true if this came for SendEvent request */
-    Display *display;		  /* display the event was read from */
-    GLXDrawable drawable;	  /* i.d. of Drawable */
-    int event_type;		  /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
-    int draw_type;		  /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
-    unsigned int mask;	  /* mask indicating which buffers are affected*/
-    int x, y;
-    int width, height;
-    int count;		  /* if nonzero, at least this many more */
-} GLXBufferClobberEventSGIX;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GLX_OML_sync_control extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-#endif
-
-#ifndef GLX_VERSION_1_3
-#define GLX_VERSION_1_3 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
-extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
-extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
-extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
-extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
-extern void glXDestroyWindow (Display *, GLXWindow);
-extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
-extern void glXDestroyPixmap (Display *, GLXPixmap);
-extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
-extern void glXDestroyPbuffer (Display *, GLXPbuffer);
-extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
-extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
-extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawable (void);
-extern Display * glXGetCurrentDisplay (void);
-extern int glXQueryContext (Display *, GLXContext, int, int *);
-extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
-typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
-typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
-typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
-typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
-typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
-typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
-typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
-typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
-#endif
-
-#ifndef GLX_VERSION_1_4
-#define GLX_VERSION_1_4 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
-#endif
-
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
-#endif
-
-#ifndef GLX_ARB_multisample
-#define GLX_ARB_multisample 1
-#endif
-
-#ifndef GLX_ARB_fbconfig_float
-#define GLX_ARB_fbconfig_float 1
-#endif
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SGIS_multisample 1
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_EXT_visual_info 1
-#endif
-
-#ifndef GLX_SGI_swap_control
-#define GLX_SGI_swap_control 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXSwapIntervalSGI (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
-#endif
-
-#ifndef GLX_SGI_video_sync
-#define GLX_SGI_video_sync 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetVideoSyncSGI (unsigned int *);
-extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
-typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#define GLX_SGI_make_current_read 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
-#endif
-
-#ifndef GLX_SGIX_video_source
-#define GLX_SGIX_video_source 1
-#ifdef _VL_H
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
-extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
-typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
-#endif /* _VL_H */
-#endif
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_EXT_visual_rating 1
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_EXT_import_context 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Display * glXGetCurrentDisplayEXT (void);
-extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
-extern GLXContextID glXGetContextIDEXT (const GLXContext);
-extern GLXContext glXImportContextEXT (Display *, GLXContextID);
-extern void glXFreeContextEXT (Display *, GLXContext);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
-typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
-typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
-typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_SGIX_fbconfig 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
-extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
-extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
-extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
-extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
-extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
-typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
-typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
-typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_SGIX_pbuffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
-extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
-extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
-extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
-typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
-typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
-typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
-#endif
-
-#ifndef GLX_SGI_cushion
-#define GLX_SGI_cushion 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCushionSGI (Display *, Window, float);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SGIX_video_resize 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
-extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
-extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
-typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
-typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
-typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
-typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
-#endif
-
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_SGIX_dmbuffer 1
-#ifdef _DM_BUFFER_H_
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
-#endif /* _DM_BUFFER_H_ */
-#endif
-
-#ifndef GLX_SGIX_swap_group
-#define GLX_SGIX_swap_group 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#define GLX_SGIX_swap_barrier 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
-extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
-typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#define GLX_SUN_get_transparent_index 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#define GLX_MESA_copy_sub_buffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#define GLX_MESA_pixmap_colormap 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#define GLX_MESA_release_buffers 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_MESA_set_3dfx_mode 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXSet3DfxModeMESA (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
-#endif
-
-#ifndef GLX_SGIX_visual_select_group
-#define GLX_SGIX_visual_select_group 1
-#endif
-
-#ifndef GLX_OML_swap_method
-#define GLX_OML_swap_method 1
-#endif
-
-#ifndef GLX_OML_sync_control
-#define GLX_OML_sync_control 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
-extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
-extern int64_t glXSwapBuffersMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t);
-extern Bool glXWaitForMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *);
-extern Bool glXWaitForSbcOML (Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc);
-typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator);
-typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
-typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
-typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
-#endif
-
-#ifndef GLX_NV_float_buffer
-#define GLX_NV_float_buffer 1
-#endif
-
-#ifndef GLX_SGIX_hyperpipe
-#define GLX_SGIX_hyperpipe 1
-
-typedef struct {
-    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int     networkId;
-} GLXHyperpipeNetworkSGIX;
-
-typedef struct {
-    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int     channel;
-    unsigned int
-      participationType;
-    int     timeSlice;
-} GLXHyperpipeConfigSGIX;
-
-typedef struct {
-    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int srcXOrigin, srcYOrigin, srcWidth, srcHeight;
-    int destXOrigin, destYOrigin, destWidth, destHeight;
-} GLXPipeRect;
-
-typedef struct {
-    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int XOrigin, YOrigin, maxHeight, maxWidth;
-} GLXPipeRectLimits;
-
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXHyperpipeNetworkSGIX * glXQueryHyperpipeNetworkSGIX (Display *, int *);
-extern int glXHyperpipeConfigSGIX (Display *, int, int, GLXHyperpipeConfigSGIX *, int *);
-extern GLXHyperpipeConfigSGIX * glXQueryHyperpipeConfigSGIX (Display *, int, int *);
-extern int glXDestroyHyperpipeConfigSGIX (Display *, int);
-extern int glXBindHyperpipeSGIX (Display *, int);
-extern int glXQueryHyperpipeBestAttribSGIX (Display *, int, int, int, void *, void *);
-extern int glXHyperpipeAttribSGIX (Display *, int, int, int, void *);
-extern int glXQueryHyperpipeAttribSGIX (Display *, int, int, int, void *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
-typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
-typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
-typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
-typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
-typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
-#endif
-
-#ifndef GLX_MESA_agp_offset
-#define GLX_MESA_agp_offset 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern unsigned int glXGetAGPOffsetMESA (const void *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer);
-#endif
-
-#ifndef GLX_EXT_fbconfig_packed_float
-#define GLX_EXT_fbconfig_packed_float 1
-#endif
-
-#ifndef GLX_EXT_framebuffer_sRGB
-#define GLX_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_EXT_texture_from_pixmap 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXBindTexImageEXT (Display *, GLXDrawable, int, const int *);
-extern void glXReleaseTexImageEXT (Display *, GLXDrawable, int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
-typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/linden/libraries/i686-win32/include/GL/wglext.h b/linden/libraries/i686-win32/include/GL/wglext.h
deleted file mode 100644
index 18804be..0000000
--- a/linden/libraries/i686-win32/include/GL/wglext.h
+++ /dev/null
@@ -1,648 +0,0 @@
-#ifndef __wglext_h_
-#define __wglext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-** 
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are 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 Materials.
-** 
-** THE MATERIALS ARE 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
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number */
-/* wglext.h last updated 2007/02/09 */
-/* Current version at http://www.opengl.org/registry/ */
-#define WGL_WGLEXT_VERSION 9
-
-#ifndef WGL_ARB_buffer_region
-#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
-#define WGL_BACK_COLOR_BUFFER_BIT_ARB  0x00000002
-#define WGL_DEPTH_BUFFER_BIT_ARB       0x00000004
-#define WGL_STENCIL_BUFFER_BIT_ARB     0x00000008
-#endif
-
-#ifndef WGL_ARB_multisample
-#define WGL_SAMPLE_BUFFERS_ARB         0x2041
-#define WGL_SAMPLES_ARB                0x2042
-#endif
-
-#ifndef WGL_ARB_extensions_string
-#endif
-
-#ifndef WGL_ARB_pixel_format
-#define WGL_NUMBER_PIXEL_FORMATS_ARB   0x2000
-#define WGL_DRAW_TO_WINDOW_ARB         0x2001
-#define WGL_DRAW_TO_BITMAP_ARB         0x2002
-#define WGL_ACCELERATION_ARB           0x2003
-#define WGL_NEED_PALETTE_ARB           0x2004
-#define WGL_NEED_SYSTEM_PALETTE_ARB    0x2005
-#define WGL_SWAP_LAYER_BUFFERS_ARB     0x2006
-#define WGL_SWAP_METHOD_ARB            0x2007
-#define WGL_NUMBER_OVERLAYS_ARB        0x2008
-#define WGL_NUMBER_UNDERLAYS_ARB       0x2009
-#define WGL_TRANSPARENT_ARB            0x200A
-#define WGL_TRANSPARENT_RED_VALUE_ARB  0x2037
-#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
-#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
-#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
-#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
-#define WGL_SHARE_DEPTH_ARB            0x200C
-#define WGL_SHARE_STENCIL_ARB          0x200D
-#define WGL_SHARE_ACCUM_ARB            0x200E
-#define WGL_SUPPORT_GDI_ARB            0x200F
-#define WGL_SUPPORT_OPENGL_ARB         0x2010
-#define WGL_DOUBLE_BUFFER_ARB          0x2011
-#define WGL_STEREO_ARB                 0x2012
-#define WGL_PIXEL_TYPE_ARB             0x2013
-#define WGL_COLOR_BITS_ARB             0x2014
-#define WGL_RED_BITS_ARB               0x2015
-#define WGL_RED_SHIFT_ARB              0x2016
-#define WGL_GREEN_BITS_ARB             0x2017
-#define WGL_GREEN_SHIFT_ARB            0x2018
-#define WGL_BLUE_BITS_ARB              0x2019
-#define WGL_BLUE_SHIFT_ARB             0x201A
-#define WGL_ALPHA_BITS_ARB             0x201B
-#define WGL_ALPHA_SHIFT_ARB            0x201C
-#define WGL_ACCUM_BITS_ARB             0x201D
-#define WGL_ACCUM_RED_BITS_ARB         0x201E
-#define WGL_ACCUM_GREEN_BITS_ARB       0x201F
-#define WGL_ACCUM_BLUE_BITS_ARB        0x2020
-#define WGL_ACCUM_ALPHA_BITS_ARB       0x2021
-#define WGL_DEPTH_BITS_ARB             0x2022
-#define WGL_STENCIL_BITS_ARB           0x2023
-#define WGL_AUX_BUFFERS_ARB            0x2024
-#define WGL_NO_ACCELERATION_ARB        0x2025
-#define WGL_GENERIC_ACCELERATION_ARB   0x2026
-#define WGL_FULL_ACCELERATION_ARB      0x2027
-#define WGL_SWAP_EXCHANGE_ARB          0x2028
-#define WGL_SWAP_COPY_ARB              0x2029
-#define WGL_SWAP_UNDEFINED_ARB         0x202A
-#define WGL_TYPE_RGBA_ARB              0x202B
-#define WGL_TYPE_COLORINDEX_ARB        0x202C
-#endif
-
-#ifndef WGL_ARB_make_current_read
-#define ERROR_INVALID_PIXEL_TYPE_ARB   0x2043
-#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
-#endif
-
-#ifndef WGL_ARB_pbuffer
-#define WGL_DRAW_TO_PBUFFER_ARB        0x202D
-#define WGL_MAX_PBUFFER_PIXELS_ARB     0x202E
-#define WGL_MAX_PBUFFER_WIDTH_ARB      0x202F
-#define WGL_MAX_PBUFFER_HEIGHT_ARB     0x2030
-#define WGL_PBUFFER_LARGEST_ARB        0x2033
-#define WGL_PBUFFER_WIDTH_ARB          0x2034
-#define WGL_PBUFFER_HEIGHT_ARB         0x2035
-#define WGL_PBUFFER_LOST_ARB           0x2036
-#endif
-
-#ifndef WGL_ARB_render_texture
-#define WGL_BIND_TO_TEXTURE_RGB_ARB    0x2070
-#define WGL_BIND_TO_TEXTURE_RGBA_ARB   0x2071
-#define WGL_TEXTURE_FORMAT_ARB         0x2072
-#define WGL_TEXTURE_TARGET_ARB         0x2073
-#define WGL_MIPMAP_TEXTURE_ARB         0x2074
-#define WGL_TEXTURE_RGB_ARB            0x2075
-#define WGL_TEXTURE_RGBA_ARB           0x2076
-#define WGL_NO_TEXTURE_ARB             0x2077
-#define WGL_TEXTURE_CUBE_MAP_ARB       0x2078
-#define WGL_TEXTURE_1D_ARB             0x2079
-#define WGL_TEXTURE_2D_ARB             0x207A
-#define WGL_MIPMAP_LEVEL_ARB           0x207B
-#define WGL_CUBE_MAP_FACE_ARB          0x207C
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
-#define WGL_FRONT_LEFT_ARB             0x2083
-#define WGL_FRONT_RIGHT_ARB            0x2084
-#define WGL_BACK_LEFT_ARB              0x2085
-#define WGL_BACK_RIGHT_ARB             0x2086
-#define WGL_AUX0_ARB                   0x2087
-#define WGL_AUX1_ARB                   0x2088
-#define WGL_AUX2_ARB                   0x2089
-#define WGL_AUX3_ARB                   0x208A
-#define WGL_AUX4_ARB                   0x208B
-#define WGL_AUX5_ARB                   0x208C
-#define WGL_AUX6_ARB                   0x208D
-#define WGL_AUX7_ARB                   0x208E
-#define WGL_AUX8_ARB                   0x208F
-#define WGL_AUX9_ARB                   0x2090
-#endif
-
-#ifndef WGL_ARB_pixel_format_float
-#define WGL_TYPE_RGBA_FLOAT_ARB        0x21A0
-#endif
-
-#ifndef WGL_EXT_make_current_read
-#define ERROR_INVALID_PIXEL_TYPE_EXT   0x2043
-#endif
-
-#ifndef WGL_EXT_pixel_format
-#define WGL_NUMBER_PIXEL_FORMATS_EXT   0x2000
-#define WGL_DRAW_TO_WINDOW_EXT         0x2001
-#define WGL_DRAW_TO_BITMAP_EXT         0x2002
-#define WGL_ACCELERATION_EXT           0x2003
-#define WGL_NEED_PALETTE_EXT           0x2004
-#define WGL_NEED_SYSTEM_PALETTE_EXT    0x2005
-#define WGL_SWAP_LAYER_BUFFERS_EXT     0x2006
-#define WGL_SWAP_METHOD_EXT            0x2007
-#define WGL_NUMBER_OVERLAYS_EXT        0x2008
-#define WGL_NUMBER_UNDERLAYS_EXT       0x2009
-#define WGL_TRANSPARENT_EXT            0x200A
-#define WGL_TRANSPARENT_VALUE_EXT      0x200B
-#define WGL_SHARE_DEPTH_EXT            0x200C
-#define WGL_SHARE_STENCIL_EXT          0x200D
-#define WGL_SHARE_ACCUM_EXT            0x200E
-#define WGL_SUPPORT_GDI_EXT            0x200F
-#define WGL_SUPPORT_OPENGL_EXT         0x2010
-#define WGL_DOUBLE_BUFFER_EXT          0x2011
-#define WGL_STEREO_EXT                 0x2012
-#define WGL_PIXEL_TYPE_EXT             0x2013
-#define WGL_COLOR_BITS_EXT             0x2014
-#define WGL_RED_BITS_EXT               0x2015
-#define WGL_RED_SHIFT_EXT              0x2016
-#define WGL_GREEN_BITS_EXT             0x2017
-#define WGL_GREEN_SHIFT_EXT            0x2018
-#define WGL_BLUE_BITS_EXT              0x2019
-#define WGL_BLUE_SHIFT_EXT             0x201A
-#define WGL_ALPHA_BITS_EXT             0x201B
-#define WGL_ALPHA_SHIFT_EXT            0x201C
-#define WGL_ACCUM_BITS_EXT             0x201D
-#define WGL_ACCUM_RED_BITS_EXT         0x201E
-#define WGL_ACCUM_GREEN_BITS_EXT       0x201F
-#define WGL_ACCUM_BLUE_BITS_EXT        0x2020
-#define WGL_ACCUM_ALPHA_BITS_EXT       0x2021
-#define WGL_DEPTH_BITS_EXT             0x2022
-#define WGL_STENCIL_BITS_EXT           0x2023
-#define WGL_AUX_BUFFERS_EXT            0x2024
-#define WGL_NO_ACCELERATION_EXT        0x2025
-#define WGL_GENERIC_ACCELERATION_EXT   0x2026
-#define WGL_FULL_ACCELERATION_EXT      0x2027
-#define WGL_SWAP_EXCHANGE_EXT          0x2028
-#define WGL_SWAP_COPY_EXT              0x2029
-#define WGL_SWAP_UNDEFINED_EXT         0x202A
-#define WGL_TYPE_RGBA_EXT              0x202B
-#define WGL_TYPE_COLORINDEX_EXT        0x202C
-#endif
-
-#ifndef WGL_EXT_pbuffer
-#define WGL_DRAW_TO_PBUFFER_EXT        0x202D
-#define WGL_MAX_PBUFFER_PIXELS_EXT     0x202E
-#define WGL_MAX_PBUFFER_WIDTH_EXT      0x202F
-#define WGL_MAX_PBUFFER_HEIGHT_EXT     0x2030
-#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT  0x2031
-#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
-#define WGL_PBUFFER_LARGEST_EXT        0x2033
-#define WGL_PBUFFER_WIDTH_EXT          0x2034
-#define WGL_PBUFFER_HEIGHT_EXT         0x2035
-#endif
-
-#ifndef WGL_EXT_depth_float
-#define WGL_DEPTH_FLOAT_EXT            0x2040
-#endif
-
-#ifndef WGL_3DFX_multisample
-#define WGL_SAMPLE_BUFFERS_3DFX        0x2060
-#define WGL_SAMPLES_3DFX               0x2061
-#endif
-
-#ifndef WGL_EXT_multisample
-#define WGL_SAMPLE_BUFFERS_EXT         0x2041
-#define WGL_SAMPLES_EXT                0x2042
-#endif
-
-#ifndef WGL_I3D_digital_video_control
-#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
-#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
-#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
-#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
-#endif
-
-#ifndef WGL_I3D_gamma
-#define WGL_GAMMA_TABLE_SIZE_I3D       0x204E
-#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D  0x204F
-#endif
-
-#ifndef WGL_I3D_genlock
-#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
-#define WGL_GENLOCK_SOURCE_EXTENAL_SYNC_I3D 0x2045
-#define WGL_GENLOCK_SOURCE_EXTENAL_FIELD_I3D 0x2046
-#define WGL_GENLOCK_SOURCE_EXTENAL_TTL_I3D 0x2047
-#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
-#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
-#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
-#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
-#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
-#endif
-
-#ifndef WGL_I3D_image_buffer
-#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
-#define WGL_IMAGE_BUFFER_LOCK_I3D      0x00000002
-#endif
-
-#ifndef WGL_I3D_swap_frame_lock
-#endif
-
-#ifndef WGL_NV_render_depth_texture
-#define WGL_BIND_TO_TEXTURE_DEPTH_NV   0x20A3
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
-#define WGL_DEPTH_TEXTURE_FORMAT_NV    0x20A5
-#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
-#define WGL_DEPTH_COMPONENT_NV         0x20A7
-#endif
-
-#ifndef WGL_NV_render_texture_rectangle
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
-#define WGL_TEXTURE_RECTANGLE_NV       0x20A2
-#endif
-
-#ifndef WGL_ATI_pixel_format_float
-#define WGL_TYPE_RGBA_FLOAT_ATI        0x21A0
-#endif
-
-#ifndef WGL_NV_float_buffer
-#define WGL_FLOAT_COMPONENTS_NV        0x20B0
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
-#define WGL_TEXTURE_FLOAT_R_NV         0x20B5
-#define WGL_TEXTURE_FLOAT_RG_NV        0x20B6
-#define WGL_TEXTURE_FLOAT_RGB_NV       0x20B7
-#define WGL_TEXTURE_FLOAT_RGBA_NV      0x20B8
-#endif
-
-#ifndef WGL_3DL_stereo_control
-#define WGL_STEREO_EMITTER_ENABLE_3DL  0x2055
-#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
-#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
-#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
-#endif
-
-#ifndef WGL_EXT_pixel_format_packed_float
-#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8
-#endif
-
-#ifndef WGL_EXT_framebuffer_sRGB
-#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9
-#endif
-
-
-/*************************************************************/
-
-#ifndef WGL_ARB_pbuffer
-DECLARE_HANDLE(HPBUFFERARB);
-#endif
-#ifndef WGL_EXT_pbuffer
-DECLARE_HANDLE(HPBUFFEREXT);
-#endif
-
-#ifndef WGL_ARB_buffer_region
-#define WGL_ARB_buffer_region 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern HANDLE WINAPI wglCreateBufferRegionARB (HDC, int, UINT);
-extern VOID WINAPI wglDeleteBufferRegionARB (HANDLE);
-extern BOOL WINAPI wglSaveBufferRegionARB (HANDLE, int, int, int, int);
-extern BOOL WINAPI wglRestoreBufferRegionARB (HANDLE, int, int, int, int, int, int);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
-typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
-typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
-typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
-#endif
-
-#ifndef WGL_ARB_multisample
-#define WGL_ARB_multisample 1
-#endif
-
-#ifndef WGL_ARB_extensions_string
-#define WGL_ARB_extensions_string 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern const char * WINAPI wglGetExtensionsStringARB (HDC);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
-#endif
-
-#ifndef WGL_ARB_pixel_format
-#define WGL_ARB_pixel_format 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetPixelFormatAttribivARB (HDC, int, int, UINT, const int *, int *);
-extern BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC, int, int, UINT, const int *, FLOAT *);
-extern BOOL WINAPI wglChoosePixelFormatARB (HDC, const int *, const FLOAT *, UINT, int *, UINT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
-typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
-#endif
-
-#ifndef WGL_ARB_make_current_read
-#define WGL_ARB_make_current_read 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglMakeContextCurrentARB (HDC, HDC, HGLRC);
-extern HDC WINAPI wglGetCurrentReadDCARB (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void);
-#endif
-
-#ifndef WGL_ARB_pbuffer
-#define WGL_ARB_pbuffer 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern HPBUFFERARB WINAPI wglCreatePbufferARB (HDC, int, int, int, const int *);
-extern HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB);
-extern int WINAPI wglReleasePbufferDCARB (HPBUFFERARB, HDC);
-extern BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB);
-extern BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB, int, int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
-typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
-typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
-typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
-typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
-#endif
-
-#ifndef WGL_ARB_render_texture
-#define WGL_ARB_render_texture 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglBindTexImageARB (HPBUFFERARB, int);
-extern BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB, int);
-extern BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB, const int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
-typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
-typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList);
-#endif
-
-#ifndef WGL_ARB_pixel_format_float
-#define WGL_ARB_pixel_format_float 1
-#endif
-
-#ifndef WGL_EXT_display_color_table
-#define WGL_EXT_display_color_table 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort);
-extern GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *, GLuint);
-extern GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort);
-extern VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length);
-typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-#endif
-
-#ifndef WGL_EXT_extensions_string
-#define WGL_EXT_extensions_string 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern const char * WINAPI wglGetExtensionsStringEXT (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
-#endif
-
-#ifndef WGL_EXT_make_current_read
-#define WGL_EXT_make_current_read 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglMakeContextCurrentEXT (HDC, HDC, HGLRC);
-extern HDC WINAPI wglGetCurrentReadDCEXT (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void);
-#endif
-
-#ifndef WGL_EXT_pbuffer
-#define WGL_EXT_pbuffer 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC, int, int, int, const int *);
-extern HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT);
-extern int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT, HDC);
-extern BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT);
-extern BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT, int, int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
-typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
-typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
-typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
-typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
-#endif
-
-#ifndef WGL_EXT_pixel_format
-#define WGL_EXT_pixel_format 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC, int, int, UINT, int *, int *);
-extern BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC, int, int, UINT, int *, FLOAT *);
-extern BOOL WINAPI wglChoosePixelFormatEXT (HDC, const int *, const FLOAT *, UINT, int *, UINT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
-typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
-#endif
-
-#ifndef WGL_EXT_swap_control
-#define WGL_EXT_swap_control 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglSwapIntervalEXT (int);
-extern int WINAPI wglGetSwapIntervalEXT (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
-typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
-#endif
-
-#ifndef WGL_EXT_depth_float
-#define WGL_EXT_depth_float 1
-#endif
-
-#ifndef WGL_NV_vertex_array_range
-#define WGL_NV_vertex_array_range 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern void* WINAPI wglAllocateMemoryNV (GLsizei, GLfloat, GLfloat, GLfloat);
-extern void WINAPI wglFreeMemoryNV (void *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
-#endif
-
-#ifndef WGL_3DFX_multisample
-#define WGL_3DFX_multisample 1
-#endif
-
-#ifndef WGL_EXT_multisample
-#define WGL_EXT_multisample 1
-#endif
-
-#ifndef WGL_OML_sync_control
-#define WGL_OML_sync_control 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetSyncValuesOML (HDC, INT64 *, INT64 *, INT64 *);
-extern BOOL WINAPI wglGetMscRateOML (HDC, INT32 *, INT32 *);
-extern INT64 WINAPI wglSwapBuffersMscOML (HDC, INT64, INT64, INT64);
-extern INT64 WINAPI wglSwapLayerBuffersMscOML (HDC, int, INT64, INT64, INT64);
-extern BOOL WINAPI wglWaitForMscOML (HDC, INT64, INT64, INT64, INT64 *, INT64 *, INT64 *);
-extern BOOL WINAPI wglWaitForSbcOML (HDC, INT64, INT64 *, INT64 *, INT64 *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
-typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator);
-typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
-typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
-typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
-typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
-#endif
-
-#ifndef WGL_I3D_digital_video_control
-#define WGL_I3D_digital_video_control 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC, int, int *);
-extern BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC, int, const int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
-typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
-#endif
-
-#ifndef WGL_I3D_gamma
-#define WGL_I3D_gamma 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetGammaTableParametersI3D (HDC, int, int *);
-extern BOOL WINAPI wglSetGammaTableParametersI3D (HDC, int, const int *);
-extern BOOL WINAPI wglGetGammaTableI3D (HDC, int, USHORT *, USHORT *, USHORT *);
-extern BOOL WINAPI wglSetGammaTableI3D (HDC, int, const USHORT *, const USHORT *, const USHORT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
-typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
-typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
-typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
-#endif
-
-#ifndef WGL_I3D_genlock
-#define WGL_I3D_genlock 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglEnableGenlockI3D (HDC);
-extern BOOL WINAPI wglDisableGenlockI3D (HDC);
-extern BOOL WINAPI wglIsEnabledGenlockI3D (HDC, BOOL *);
-extern BOOL WINAPI wglGenlockSourceI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSourceI3D (HDC, UINT *);
-extern BOOL WINAPI wglGenlockSourceEdgeI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC, UINT *);
-extern BOOL WINAPI wglGenlockSampleRateI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSampleRateI3D (HDC, UINT *);
-extern BOOL WINAPI wglGenlockSourceDelayI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC, UINT *);
-extern BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC, UINT *, UINT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
-typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
-typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay);
-typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
-#endif
-
-#ifndef WGL_I3D_image_buffer
-#define WGL_I3D_image_buffer 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern LPVOID WINAPI wglCreateImageBufferI3D (HDC, DWORD, UINT);
-extern BOOL WINAPI wglDestroyImageBufferI3D (HDC, LPVOID);
-extern BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC, const HANDLE *, const LPVOID *, const DWORD *, UINT);
-extern BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC, const LPVOID *, UINT);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
-typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
-typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
-typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count);
-#endif
-
-#ifndef WGL_I3D_swap_frame_lock
-#define WGL_I3D_swap_frame_lock 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglEnableFrameLockI3D (void);
-extern BOOL WINAPI wglDisableFrameLockI3D (void);
-extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *);
-extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag);
-typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag);
-#endif
-
-#ifndef WGL_I3D_swap_frame_usage
-#define WGL_I3D_swap_frame_usage 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetFrameUsageI3D (float *);
-extern BOOL WINAPI wglBeginFrameTrackingI3D (void);
-extern BOOL WINAPI wglEndFrameTrackingI3D (void);
-extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *, DWORD *, float *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage);
-typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
-#endif
-
-#ifndef WGL_ATI_pixel_format_float
-#define WGL_ATI_pixel_format_float 1
-#endif
-
-#ifndef WGL_NV_float_buffer
-#define WGL_NV_float_buffer 1
-#endif
-
-#ifndef WGL_EXT_pixel_format_packed_float
-#define WGL_EXT_pixel_format_packed_float 1
-#endif
-
-#ifndef WGL_EXT_framebuffer_sRGB
-#define WGL_EXT_framebuffer_sRGB 1
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/linden/libraries/include/GL/glh_extensions.h b/linden/libraries/include/GL/glh_extensions.h
deleted file mode 100644
index b936b5d..0000000
--- a/linden/libraries/include/GL/glh_extensions.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *  glh_extensions.h
- *  From nVidia Corporation, downloaded 2006-12-18 from:
- *  http://developer.nvidia.com/attach/8196
- *  ("NVParse Library with Source (.zip) (2390 KB)")
- *
- *  License (quoted from license_info.txt in aforementioned file):
- *  "The files bison.exe, bison.simple, and flex.exe are covered by
- *  the GPL.  All other files in this distribution can be used however
- *  you want."
- */
-
-#ifndef GLH_EXTENSIONS
-#define GLH_EXTENSIONS
-
-#include <string.h>
-#include <stdio.h>
-
-#ifdef _WIN32
-# include <windows.h>
-#endif
-
-#ifndef __APPLE__
-#include <GL/gl.h>
-#endif
-
-#ifdef _WIN32
-# include "GL/wglext.h"
-#endif
-
-#define CHECK_MEMORY(ptr) \
-    if (NULL == ptr) { \
-		printf("Error allocating memory in file %s, line %d\n", __FILE__, __LINE__); \
-		exit(-1); \
-	}
-
-#ifdef GLH_EXT_SINGLE_FILE
-#  define GLH_EXTENSIONS_SINGLE_FILE  // have to do this because glh_genext.h unsets GLH_EXT_SINGLE_FILE
-#endif
-
-#include "glh_genext.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef GLH_EXTENSIONS_SINGLE_FILE
-
-class GLHExts
-{
-public:
-	GLHExts()
-	{
-		mSysExts = NULL;
-//		mUnsupportedExts = NULL;
-	}
-	~GLHExts()
-	{
-		if (mSysExts)
-		{
-			free(mSysExts);
-		}
-//		if (mUnsupportedExts)
-//		{
-//			free(mUnsupportedExts);
-//		}
-	}
-	char *mSysExts;
-//	char *mUnsupportedExts;
-};
-
-GLHExts gGLHExts;
-
-static int ExtensionExists(const char* extName, const char* sysExts)
-{
-    char *padExtName = (char*)malloc(strlen(extName) + 2);
-    strcat(strcpy(padExtName, extName), " ");
-
-	if (0 == strcmp(extName, "GL_VERSION_1_2")) {
-		const char *version = (const char*)glGetString(GL_VERSION);
-		if (strstr(version, "1.0") == version || strstr(version, "1.1") == version) {
-			return FALSE;
-		} else {
-			return TRUE;
-		}
-	}
-    if (strstr(sysExts, padExtName)) {
-		free(padExtName);
-        return TRUE;
-    } else {
-		free(padExtName);
-        return FALSE;
-    }
-}
-
-static const char* EatWhiteSpace(const char *str)
-{
-	for (; *str && (' ' == *str || '\t' == *str || '\n' == *str); str++);
-	return str;
-}
-
-static const char* EatNonWhiteSpace(const char *str)
-{
-	for (; *str && (' ' != *str && '\t' != *str && '\n' != *str); str++);
-	return str;
-}
-
-
-int glh_init_extensions(const char *origReqExts)
-{
-	// Length of requested extensions string
-	unsigned reqExtsLen;
-	char *reqExts;
-	// Ptr for individual extensions within reqExts
-	char *reqExt;
-	int success = TRUE;
-
-	// build space-padded extension string
-	if (NULL == gGLHExts.mSysExts) {
-		const char *extensions = (const char*)glGetString(GL_EXTENSIONS);
-		int sysExtsLen = (int)strlen(extensions);
-		const char *winsys_extensions = 0;		
-		int winsysExtsLen = 0;
-#ifdef _WIN32
-		{
-			PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB = 0;
-			wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
-			if(wglGetExtensionsStringARB)
-			{
-				winsys_extensions = wglGetExtensionsStringARB(wglGetCurrentDC());
-				winsysExtsLen = (S32)strlen(winsys_extensions);
-			}
-		}
-#endif
-		// Add 2 bytes, one for padding space, one for terminating NULL
-		gGLHExts.mSysExts = (char*)malloc(sysExtsLen + winsysExtsLen + 3);
-		CHECK_MEMORY(gGLHExts.mSysExts);
-		strcpy(gGLHExts.mSysExts, extensions);
-		gGLHExts.mSysExts[sysExtsLen] = ' ';
-		gGLHExts.mSysExts[sysExtsLen + 1] = 0;
-		if (winsysExtsLen)
-		{
-			strcat(gGLHExts.mSysExts, winsys_extensions);
-		}
-		gGLHExts.mSysExts[sysExtsLen + 1 + winsysExtsLen] = ' ';
-		gGLHExts.mSysExts[sysExtsLen + 1 + winsysExtsLen + 1] = 0;
-	}
-
-	if (NULL == origReqExts)
-	{
-		return TRUE;
-	}
-	reqExts = strdup(origReqExts);
-	reqExtsLen = (S32)strlen(reqExts);
-	/*
-	if (NULL == gGLHExts.mUnsupportedExts)
-	{
-		gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1);
-	}
-	else if (reqExtsLen > strlen(gGLHExts.mUnsupportedExts))
-	{
-		gGLHExts.mUnsupportedExts = (char*)realloc(gGLHExts.mUnsupportedExts, reqExtsLen + 1);
-	}
-	CHECK_MEMORY(gGLHExts.mUnsupportedExts);
-	*gGLHExts.mUnsupportedExts = 0;
-	*/
-
-	// Parse requested extension list
-	for (reqExt = reqExts;
-		(reqExt = (char*)EatWhiteSpace(reqExt)) && *reqExt;
-		reqExt = (char*)EatNonWhiteSpace(reqExt))
-	{
-		char *extEnd = (char*)EatNonWhiteSpace(reqExt);
-		char saveChar = *extEnd;
-		*extEnd = (char)0;
-		
-		if (!ExtensionExists(reqExt, gGLHExts.mSysExts) ||
-			!glh_init_extension(reqExt)) {
-			/*
-			// add reqExt to end of unsupportedExts
-			strcat(gGLHExts.mUnsupportedExts, reqExt);
-			strcat(gGLHExts.mUnsupportedExts, " ");
-			*/
-			success = FALSE;
-		}
-		*extEnd = saveChar;
-	}
-	free(reqExts);
-	return success;
-}
-
-const char* glh_get_unsupported_extensions()
-{
-	return "";
-//	return (const char*)gGLHExts.mUnsupportedExts;
-}
-
-#else
-int glh_init_extensions(const char *origReqExts);
-const char* glh_get_unsupported_extensions();
-#endif /* GLH_EXT_SINGLE_FILE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GLH_EXTENSIONS */
diff --git a/linden/libraries/include/GL/glh_genext.h b/linden/libraries/include/GL/glh_genext.h
deleted file mode 100644
index 8d42025..0000000
--- a/linden/libraries/include/GL/glh_genext.h
+++ /dev/null
@@ -1,1671 +0,0 @@
-/*
- *  glh_genext.h
- *  From nVidia Corporation, downloaded 2006-12-18 from:
- *  http://developer.nvidia.com/attach/8196
- *  ("NVParse Library with Source (.zip) (2390 KB)")
- *
- *  License (quoted from license_info.txt in aforementioned file):
- *  "The files bison.exe, bison.simple, and flex.exe are covered by
- *  the GPL.  All other files in this distribution can be used however
- *  you want."
- */
-
-/* File generated by extgen.cpp -- do not modify */
-#ifndef GLH_GENEXT_H
-#define GLH_GENEXT_H
-
-// MBW -- None of this is necessary on Mac OS.
-#ifndef __APPLE__
-
-#include <GL/gl.h>
-#include <GL/glext.h>
-
-#ifdef _WIN32 /* supports windows, x -- need to generalize */
-#  include <GL/wglext.h>
-#  define GLH_EXT_GET_PROC_ADDRESS(p)   wglGetProcAddress(p) 
-#else if GLX_VERSION_1_3
-#  include <GL/glxext.h>
-#  define GLH_EXT_GET_PROC_ADDRESS(p)   glXGetProcAddressARB(p) 
-#endif
-
-#ifdef GLH_EXT_SINGLE_FILE
-	#define GLH_EXTERN
- #define GLH_INITIALIZER = 0
-#else
-	#define GLH_EXTERN extern
- #define GLH_INITIALIZER
-#endif
-
-#define GLH__PREPROCESSOR_GYMNASTICS2(a,b) a##b
-#define GLH__PREPROCESSOR_GYMNASTICS(a,b) GLH__PREPROCESSOR_GYMNASTICS2(a,b)
-
-#ifndef GLH_EXT_PREFIX
-# define GLH_EXT_NAME(a) a
-#else
-# define GLH_EXT_NAME(a) GLH__PREPROCESSOR_GYMNASTICS(GLH_EXT_PREFIX,a)
-#endif
-
-#ifndef _WIN32
-# ifndef GLH_CORE_1_2_PREFIX
-#  define GLH_CORE_1_2_PREFIX _
-# endif
-#endif
-
-#ifndef GLH_CORE_1_2_PREFIX
-# define GLH_CORE_1_2_NAME(a) a
-#else
-# define GLH_CORE_1_2_NAME(a) GLH__PREPROCESSOR_GYMNASTICS(GLH_CORE_1_2_PREFIX,a)
-#endif
-
-#ifdef GL_ARB_multitexture
-    GLH_EXTERN PFNGLMULTITEXCOORD1DARBPROC GLH_EXT_NAME(glMultiTexCoord1dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD1DVARBPROC GLH_EXT_NAME(glMultiTexCoord1dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD1FARBPROC GLH_EXT_NAME(glMultiTexCoord1fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD1FVARBPROC GLH_EXT_NAME(glMultiTexCoord1fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD1IARBPROC GLH_EXT_NAME(glMultiTexCoord1iARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD1IVARBPROC GLH_EXT_NAME(glMultiTexCoord1ivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD1SARBPROC GLH_EXT_NAME(glMultiTexCoord1sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD1SVARBPROC GLH_EXT_NAME(glMultiTexCoord1svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2DARBPROC GLH_EXT_NAME(glMultiTexCoord2dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2DVARBPROC GLH_EXT_NAME(glMultiTexCoord2dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2FARBPROC GLH_EXT_NAME(glMultiTexCoord2fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2FVARBPROC GLH_EXT_NAME(glMultiTexCoord2fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2IARBPROC GLH_EXT_NAME(glMultiTexCoord2iARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2IVARBPROC GLH_EXT_NAME(glMultiTexCoord2ivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2SARBPROC GLH_EXT_NAME(glMultiTexCoord2sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD2SVARBPROC GLH_EXT_NAME(glMultiTexCoord2svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3DARBPROC GLH_EXT_NAME(glMultiTexCoord3dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3DVARBPROC GLH_EXT_NAME(glMultiTexCoord3dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3FARBPROC GLH_EXT_NAME(glMultiTexCoord3fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3FVARBPROC GLH_EXT_NAME(glMultiTexCoord3fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3IARBPROC GLH_EXT_NAME(glMultiTexCoord3iARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3IVARBPROC GLH_EXT_NAME(glMultiTexCoord3ivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3SARBPROC GLH_EXT_NAME(glMultiTexCoord3sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD3SVARBPROC GLH_EXT_NAME(glMultiTexCoord3svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4DARBPROC GLH_EXT_NAME(glMultiTexCoord4dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4DVARBPROC GLH_EXT_NAME(glMultiTexCoord4dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4FARBPROC GLH_EXT_NAME(glMultiTexCoord4fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4FVARBPROC GLH_EXT_NAME(glMultiTexCoord4fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4IARBPROC GLH_EXT_NAME(glMultiTexCoord4iARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4IVARBPROC GLH_EXT_NAME(glMultiTexCoord4ivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4SARBPROC GLH_EXT_NAME(glMultiTexCoord4sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTITEXCOORD4SVARBPROC GLH_EXT_NAME(glMultiTexCoord4svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLACTIVETEXTUREARBPROC GLH_EXT_NAME(glActiveTextureARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCLIENTACTIVETEXTUREARBPROC GLH_EXT_NAME(glClientActiveTextureARB) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_ARB_texture_border_clamp
-#endif
-
-#ifdef GL_ARB_texture_compression
-    GLH_EXTERN PFNGLCOMPRESSEDTEXIMAGE3DARBPROC GLH_EXT_NAME(glCompressedTexImage3DARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMPRESSEDTEXIMAGE2DARBPROC GLH_EXT_NAME(glCompressedTexImage2DARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMPRESSEDTEXIMAGE1DARBPROC GLH_EXT_NAME(glCompressedTexImage1DARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC GLH_EXT_NAME(glCompressedTexSubImage3DARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC GLH_EXT_NAME(glCompressedTexSubImage2DARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC GLH_EXT_NAME(glCompressedTexSubImage1DARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GLH_EXT_NAME(glGetCompressedTexImageARB) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_ARB_texture_cube_map
-#endif
-
-#ifdef GL_ARB_transpose_matrix
-    GLH_EXTERN PFNGLLOADTRANSPOSEMATRIXFARBPROC GLH_EXT_NAME(glLoadTransposeMatrixfARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLLOADTRANSPOSEMATRIXDARBPROC GLH_EXT_NAME(glLoadTransposeMatrixdARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTTRANSPOSEMATRIXFARBPROC GLH_EXT_NAME(glMultTransposeMatrixfARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMULTTRANSPOSEMATRIXDARBPROC GLH_EXT_NAME(glMultTransposeMatrixdARB) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_ARB_vertex_program
-    GLH_EXTERN PFNGLVERTEXATTRIB1SARBPROC GLH_EXT_NAME(glVertexAttrib1sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1FARBPROC GLH_EXT_NAME(glVertexAttrib1fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1DARBPROC GLH_EXT_NAME(glVertexAttrib1dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2SARBPROC GLH_EXT_NAME(glVertexAttrib2sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2FARBPROC GLH_EXT_NAME(glVertexAttrib2fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2DARBPROC GLH_EXT_NAME(glVertexAttrib2dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3SARBPROC GLH_EXT_NAME(glVertexAttrib3sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3FARBPROC GLH_EXT_NAME(glVertexAttrib3fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3DARBPROC GLH_EXT_NAME(glVertexAttrib3dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4SARBPROC GLH_EXT_NAME(glVertexAttrib4sARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4FARBPROC GLH_EXT_NAME(glVertexAttrib4fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4DARBPROC GLH_EXT_NAME(glVertexAttrib4dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4NUBARBPROC GLH_EXT_NAME(glVertexAttrib4NubARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1SVARBPROC GLH_EXT_NAME(glVertexAttrib1svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1FVARBPROC GLH_EXT_NAME(glVertexAttrib1fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1DVARBPROC GLH_EXT_NAME(glVertexAttrib1dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2SVARBPROC GLH_EXT_NAME(glVertexAttrib2svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2FVARBPROC GLH_EXT_NAME(glVertexAttrib2fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2DVARBPROC GLH_EXT_NAME(glVertexAttrib2dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3SVARBPROC GLH_EXT_NAME(glVertexAttrib3svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3FVARBPROC GLH_EXT_NAME(glVertexAttrib3fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3DVARBPROC GLH_EXT_NAME(glVertexAttrib3dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4BVARBPROC GLH_EXT_NAME(glVertexAttrib4bvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4SVARBPROC GLH_EXT_NAME(glVertexAttrib4svARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4IVARBPROC GLH_EXT_NAME(glVertexAttrib4ivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4UBVARBPROC GLH_EXT_NAME(glVertexAttrib4ubvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4USVARBPROC GLH_EXT_NAME(glVertexAttrib4usvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4UIVARBPROC GLH_EXT_NAME(glVertexAttrib4uivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4FVARBPROC GLH_EXT_NAME(glVertexAttrib4fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4DVARBPROC GLH_EXT_NAME(glVertexAttrib4dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4NBVARBPROC GLH_EXT_NAME(glVertexAttrib4NbvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4NSVARBPROC GLH_EXT_NAME(glVertexAttrib4NsvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4NIVARBPROC GLH_EXT_NAME(glVertexAttrib4NivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4NUBVARBPROC GLH_EXT_NAME(glVertexAttrib4NubvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4NUSVARBPROC GLH_EXT_NAME(glVertexAttrib4NusvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4NUIVARBPROC GLH_EXT_NAME(glVertexAttrib4NuivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBPOINTERARBPROC GLH_EXT_NAME(glVertexAttribPointerARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLENABLEVERTEXATTRIBARRAYARBPROC GLH_EXT_NAME(glEnableVertexAttribArrayARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLDISABLEVERTEXATTRIBARRAYARBPROC GLH_EXT_NAME(glDisableVertexAttribArrayARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMSTRINGARBPROC GLH_EXT_NAME(glProgramStringARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLBINDPROGRAMARBPROC GLH_EXT_NAME(glBindProgramARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLDELETEPROGRAMSARBPROC GLH_EXT_NAME(glDeleteProgramsARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGENPROGRAMSARBPROC GLH_EXT_NAME(glGenProgramsARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4DARBPROC GLH_EXT_NAME(glProgramEnvParameter4dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4DVARBPROC GLH_EXT_NAME(glProgramEnvParameter4dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4FARBPROC GLH_EXT_NAME(glProgramEnvParameter4fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMENVPARAMETER4FVARBPROC GLH_EXT_NAME(glProgramEnvParameter4fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4DARBPROC GLH_EXT_NAME(glProgramLocalParameter4dARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4DVARBPROC GLH_EXT_NAME(glProgramLocalParameter4dvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4FARBPROC GLH_EXT_NAME(glProgramLocalParameter4fARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMLOCALPARAMETER4FVARBPROC GLH_EXT_NAME(glProgramLocalParameter4fvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMENVPARAMETERDVARBPROC GLH_EXT_NAME(glGetProgramEnvParameterdvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMENVPARAMETERFVARBPROC GLH_EXT_NAME(glGetProgramEnvParameterfvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC GLH_EXT_NAME(glGetProgramLocalParameterdvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC GLH_EXT_NAME(glGetProgramLocalParameterfvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMIVARBPROC GLH_EXT_NAME(glGetProgramivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMSTRINGARBPROC GLH_EXT_NAME(glGetProgramStringARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBDVARBPROC GLH_EXT_NAME(glGetVertexAttribdvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBFVARBPROC GLH_EXT_NAME(glGetVertexAttribfvARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBIVARBPROC GLH_EXT_NAME(glGetVertexAttribivARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBPOINTERVARBPROC GLH_EXT_NAME(glGetVertexAttribPointervARB) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLISPROGRAMARBPROC GLH_EXT_NAME(glIsProgramARB) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_abgr
-#endif
-
-#ifdef GL_EXT_bgra
-#endif
-
-#ifdef GL_EXT_blend_color
-    GLH_EXTERN PFNGLBLENDCOLOREXTPROC GLH_EXT_NAME(glBlendColorEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_blend_minmax
-    GLH_EXTERN PFNGLBLENDEQUATIONEXTPROC GLH_EXT_NAME(glBlendEquationEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_blend_subtract
-#endif
-
-#ifdef GL_EXT_compiled_vertex_array
-    GLH_EXTERN PFNGLLOCKARRAYSEXTPROC GLH_EXT_NAME(glLockArraysEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLUNLOCKARRAYSEXTPROC GLH_EXT_NAME(glUnlockArraysEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_fog_coord
-    GLH_EXTERN PFNGLFOGCOORDDEXTPROC GLH_EXT_NAME(glFogCoorddEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLFOGCOORDDVEXTPROC GLH_EXT_NAME(glFogCoorddvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLFOGCOORDFEXTPROC GLH_EXT_NAME(glFogCoordfEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLFOGCOORDFVEXTPROC GLH_EXT_NAME(glFogCoordfvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLFOGCOORDPOINTEREXTPROC GLH_EXT_NAME(glFogCoordPointerEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_light_max_exponent
-#endif
-
-#ifdef GL_EXT_packed_pixels
-#endif
-
-#ifdef GL_EXT_paletted_texture
-    GLH_EXTERN PFNGLCOLORSUBTABLEEXTPROC GLH_EXT_NAME(glColorSubTableEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOLORTABLEEXTPROC GLH_EXT_NAME(glColorTableEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOLORTABLEEXTPROC GLH_EXT_NAME(glGetColorTableEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERFVEXTPROC GLH_EXT_NAME(glGetColorTableParameterfvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERIVEXTPROC GLH_EXT_NAME(glGetColorTableParameterivEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_point_parameters
-    GLH_EXTERN PFNGLPOINTPARAMETERFEXTPROC GLH_EXT_NAME(glPointParameterfEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPOINTPARAMETERFVEXTPROC GLH_EXT_NAME(glPointParameterfvEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_rescale_normal
-#endif
-
-#ifdef GL_EXT_secondary_color
-    GLH_EXTERN PFNGLSECONDARYCOLOR3BEXTPROC GLH_EXT_NAME(glSecondaryColor3bEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3BVEXTPROC GLH_EXT_NAME(glSecondaryColor3bvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3DEXTPROC GLH_EXT_NAME(glSecondaryColor3dEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3DVEXTPROC GLH_EXT_NAME(glSecondaryColor3dvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3FEXTPROC GLH_EXT_NAME(glSecondaryColor3fEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3FVEXTPROC GLH_EXT_NAME(glSecondaryColor3fvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3IEXTPROC GLH_EXT_NAME(glSecondaryColor3iEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3IVEXTPROC GLH_EXT_NAME(glSecondaryColor3ivEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3SEXTPROC GLH_EXT_NAME(glSecondaryColor3sEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3SVEXTPROC GLH_EXT_NAME(glSecondaryColor3svEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3UBEXTPROC GLH_EXT_NAME(glSecondaryColor3ubEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3UBVEXTPROC GLH_EXT_NAME(glSecondaryColor3ubvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3UIEXTPROC GLH_EXT_NAME(glSecondaryColor3uiEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3UIVEXTPROC GLH_EXT_NAME(glSecondaryColor3uivEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3USEXTPROC GLH_EXT_NAME(glSecondaryColor3usEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLOR3USVEXTPROC GLH_EXT_NAME(glSecondaryColor3usvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSECONDARYCOLORPOINTEREXTPROC GLH_EXT_NAME(glSecondaryColorPointerEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_separate_specular_color
-#endif
-
-#ifdef GL_EXT_shared_texture_palette
-#endif
-
-#ifdef GL_EXT_stencil_wrap
-#endif
-
-#ifdef GL_EXT_texture_compression_s3tc
-#endif
-
-#ifdef GL_EXT_texture_cube_map
-#endif
-
-#ifdef GL_EXT_texture_edge_clamp
-#endif
-
-#ifdef GL_EXT_texture_env_add
-#endif
-
-#ifdef GL_EXT_texture_env_combine
-#endif
-
-#ifdef GL_EXT_texture_filter_anisotropic
-#endif
-
-#ifdef GL_EXT_texture_lod_bias
-#endif
-
-#ifdef GL_EXT_texture_object
-    GLH_EXTERN PFNGLARETEXTURESRESIDENTEXTPROC GLH_EXT_NAME(glAreTexturesResidentEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLBINDTEXTUREEXTPROC GLH_EXT_NAME(glBindTextureEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLDELETETEXTURESEXTPROC GLH_EXT_NAME(glDeleteTexturesEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGENTEXTURESEXTPROC GLH_EXT_NAME(glGenTexturesEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLISTEXTUREEXTPROC GLH_EXT_NAME(glIsTextureEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPRIORITIZETEXTURESEXTPROC GLH_EXT_NAME(glPrioritizeTexturesEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_texture3D
-    GLH_EXTERN PFNGLTEXIMAGE3DEXTPROC GLH_EXT_NAME(glTexImage3DEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_vertex_array
-    GLH_EXTERN PFNGLARRAYELEMENTEXTPROC GLH_EXT_NAME(glArrayElementEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOLORPOINTEREXTPROC GLH_EXT_NAME(glColorPointerEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLEDGEFLAGPOINTEREXTPROC GLH_EXT_NAME(glEdgeFlagPointerEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPOINTERVEXTPROC GLH_EXT_NAME(glGetPointervEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLINDEXPOINTEREXTPROC GLH_EXT_NAME(glIndexPointerEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLNORMALPOINTEREXTPROC GLH_EXT_NAME(glNormalPointerEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLTEXCOORDPOINTEREXTPROC GLH_EXT_NAME(glTexCoordPointerEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXPOINTEREXTPROC GLH_EXT_NAME(glVertexPointerEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLDRAWARRAYSEXTPROC GLH_EXT_NAME(glDrawArraysEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_EXT_vertex_weighting
-    GLH_EXTERN PFNGLVERTEXWEIGHTFEXTPROC GLH_EXT_NAME(glVertexWeightfEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXWEIGHTFVEXTPROC GLH_EXT_NAME(glVertexWeightfvEXT) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXWEIGHTPOINTEREXTPROC GLH_EXT_NAME(glVertexWeightPointerEXT) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_NV_blend_square
-#endif
-
-#ifdef GL_NV_evaluators
-    GLH_EXTERN PFNGLMAPCONTROLPOINTSNVPROC GLH_EXT_NAME(glMapControlPointsNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMAPPARAMETERIVNVPROC GLH_EXT_NAME(glMapParameterivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLMAPPARAMETERFVNVPROC GLH_EXT_NAME(glMapParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETMAPCONTROLPOINTSNVPROC GLH_EXT_NAME(glGetMapControlPointsNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETMAPPARAMETERIVNVPROC GLH_EXT_NAME(glGetMapParameterivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETMAPPARAMETERFVNVPROC GLH_EXT_NAME(glGetMapParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETMAPATTRIBPARAMETERIVNVPROC GLH_EXT_NAME(glGetMapAttribParameterivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETMAPATTRIBPARAMETERFVNVPROC GLH_EXT_NAME(glGetMapAttribParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLEVALMAPSNVPROC GLH_EXT_NAME(glEvalMapsNV) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_NV_fence
-    GLH_EXTERN PFNGLGENFENCESNVPROC GLH_EXT_NAME(glGenFencesNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLDELETEFENCESNVPROC GLH_EXT_NAME(glDeleteFencesNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLSETFENCENVPROC GLH_EXT_NAME(glSetFenceNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLTESTFENCENVPROC GLH_EXT_NAME(glTestFenceNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLFINISHFENCENVPROC GLH_EXT_NAME(glFinishFenceNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLISFENCENVPROC GLH_EXT_NAME(glIsFenceNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETFENCEIVNVPROC GLH_EXT_NAME(glGetFenceivNV) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_NV_fog_distance
-#endif
-
-#ifdef GL_NV_packed_depth_stencil
-#endif
-
-#ifdef GL_NV_register_combiners
-    GLH_EXTERN PFNGLCOMBINERPARAMETERFVNVPROC GLH_EXT_NAME(glCombinerParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMBINERPARAMETERFNVPROC GLH_EXT_NAME(glCombinerParameterfNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMBINERPARAMETERIVNVPROC GLH_EXT_NAME(glCombinerParameterivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMBINERPARAMETERINVPROC GLH_EXT_NAME(glCombinerParameteriNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMBINERINPUTNVPROC GLH_EXT_NAME(glCombinerInputNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOMBINEROUTPUTNVPROC GLH_EXT_NAME(glCombinerOutputNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLFINALCOMBINERINPUTNVPROC GLH_EXT_NAME(glFinalCombinerInputNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC GLH_EXT_NAME(glGetCombinerInputParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC GLH_EXT_NAME(glGetCombinerInputParameterivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC GLH_EXT_NAME(glGetCombinerOutputParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC GLH_EXT_NAME(glGetCombinerOutputParameterivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC GLH_EXT_NAME(glGetFinalCombinerInputParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC GLH_EXT_NAME(glGetFinalCombinerInputParameterivNV) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_NV_register_combiners2
-    GLH_EXTERN PFNGLCOMBINERSTAGEPARAMETERFVNVPROC GLH_EXT_NAME(glCombinerStageParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC GLH_EXT_NAME(glGetCombinerStageParameterfvNV) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_NV_texgen_reflection
-#endif
-
-#ifdef GL_NV_texture_env_combine4
-#endif
-
-#ifdef GL_NV_texture_rectangle
-#endif
-
-#ifdef GL_NV_texture_shader
-#endif
-
-#ifdef GL_NV_vertex_array_range
-    GLH_EXTERN PFNGLFLUSHVERTEXARRAYRANGENVPROC GLH_EXT_NAME(glFlushVertexArrayRangeNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXARRAYRANGENVPROC GLH_EXT_NAME(glVertexArrayRangeNV) GLH_INITIALIZER;
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLALLOCATEMEMORYNVPROC GLH_EXT_NAME(wglAllocateMemoryNV) GLH_INITIALIZER;
-# endif
-# ifdef GLX_VERSION_1_3
-    GLH_EXTERN PFNGLXALLOCATEMEMORYNVPROC GLH_EXT_NAME(glXAllocateMemoryNV) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLFREEMEMORYNVPROC GLH_EXT_NAME(wglFreeMemoryNV) GLH_INITIALIZER;
-# endif
-# ifdef GLX_VERSION_1_3
-    GLH_EXTERN PFNGLXFREEMEMORYNVPROC GLH_EXT_NAME(glXFreeMemoryNV) GLH_INITIALIZER;
-# endif
-#endif
-
-#ifdef GL_NV_vertex_program
-    GLH_EXTERN PFNGLAREPROGRAMSRESIDENTNVPROC GLH_EXT_NAME(glAreProgramsResidentNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLBINDPROGRAMNVPROC GLH_EXT_NAME(glBindProgramNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLDELETEPROGRAMSNVPROC GLH_EXT_NAME(glDeleteProgramsNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLEXECUTEPROGRAMNVPROC GLH_EXT_NAME(glExecuteProgramNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGENPROGRAMSNVPROC GLH_EXT_NAME(glGenProgramsNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMPARAMETERDVNVPROC GLH_EXT_NAME(glGetProgramParameterdvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMPARAMETERFVNVPROC GLH_EXT_NAME(glGetProgramParameterfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMIVNVPROC GLH_EXT_NAME(glGetProgramivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETPROGRAMSTRINGNVPROC GLH_EXT_NAME(glGetProgramStringNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETTRACKMATRIXIVNVPROC GLH_EXT_NAME(glGetTrackMatrixivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBDVNVPROC GLH_EXT_NAME(glGetVertexAttribdvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBFVNVPROC GLH_EXT_NAME(glGetVertexAttribfvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBIVNVPROC GLH_EXT_NAME(glGetVertexAttribivNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETVERTEXATTRIBPOINTERVNVPROC GLH_EXT_NAME(glGetVertexAttribPointervNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLISPROGRAMNVPROC GLH_EXT_NAME(glIsProgramNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLLOADPROGRAMNVPROC GLH_EXT_NAME(glLoadProgramNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMPARAMETER4DNVPROC GLH_EXT_NAME(glProgramParameter4dNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMPARAMETER4DVNVPROC GLH_EXT_NAME(glProgramParameter4dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMPARAMETER4FNVPROC GLH_EXT_NAME(glProgramParameter4fNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMPARAMETER4FVNVPROC GLH_EXT_NAME(glProgramParameter4fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMPARAMETERS4DVNVPROC GLH_EXT_NAME(glProgramParameters4dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLPROGRAMPARAMETERS4FVNVPROC GLH_EXT_NAME(glProgramParameters4fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLREQUESTRESIDENTPROGRAMSNVPROC GLH_EXT_NAME(glRequestResidentProgramsNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLTRACKMATRIXNVPROC GLH_EXT_NAME(glTrackMatrixNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBPOINTERNVPROC GLH_EXT_NAME(glVertexAttribPointerNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1DNVPROC GLH_EXT_NAME(glVertexAttrib1dNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1DVNVPROC GLH_EXT_NAME(glVertexAttrib1dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1FNVPROC GLH_EXT_NAME(glVertexAttrib1fNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1FVNVPROC GLH_EXT_NAME(glVertexAttrib1fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1SNVPROC GLH_EXT_NAME(glVertexAttrib1sNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB1SVNVPROC GLH_EXT_NAME(glVertexAttrib1svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2DNVPROC GLH_EXT_NAME(glVertexAttrib2dNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2DVNVPROC GLH_EXT_NAME(glVertexAttrib2dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2FNVPROC GLH_EXT_NAME(glVertexAttrib2fNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2FVNVPROC GLH_EXT_NAME(glVertexAttrib2fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2SNVPROC GLH_EXT_NAME(glVertexAttrib2sNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB2SVNVPROC GLH_EXT_NAME(glVertexAttrib2svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3DNVPROC GLH_EXT_NAME(glVertexAttrib3dNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3DVNVPROC GLH_EXT_NAME(glVertexAttrib3dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3FNVPROC GLH_EXT_NAME(glVertexAttrib3fNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3FVNVPROC GLH_EXT_NAME(glVertexAttrib3fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3SNVPROC GLH_EXT_NAME(glVertexAttrib3sNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB3SVNVPROC GLH_EXT_NAME(glVertexAttrib3svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4DNVPROC GLH_EXT_NAME(glVertexAttrib4dNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4DVNVPROC GLH_EXT_NAME(glVertexAttrib4dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4FNVPROC GLH_EXT_NAME(glVertexAttrib4fNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4FVNVPROC GLH_EXT_NAME(glVertexAttrib4fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4SNVPROC GLH_EXT_NAME(glVertexAttrib4sNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4SVNVPROC GLH_EXT_NAME(glVertexAttrib4svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIB4UBVNVPROC GLH_EXT_NAME(glVertexAttrib4ubvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS1DVNVPROC GLH_EXT_NAME(glVertexAttribs1dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS1FVNVPROC GLH_EXT_NAME(glVertexAttribs1fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS1SVNVPROC GLH_EXT_NAME(glVertexAttribs1svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS2DVNVPROC GLH_EXT_NAME(glVertexAttribs2dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS2FVNVPROC GLH_EXT_NAME(glVertexAttribs2fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS2SVNVPROC GLH_EXT_NAME(glVertexAttribs2svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS3DVNVPROC GLH_EXT_NAME(glVertexAttribs3dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS3FVNVPROC GLH_EXT_NAME(glVertexAttribs3fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS3SVNVPROC GLH_EXT_NAME(glVertexAttribs3svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS4DVNVPROC GLH_EXT_NAME(glVertexAttribs4dvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS4FVNVPROC GLH_EXT_NAME(glVertexAttribs4fvNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS4SVNVPROC GLH_EXT_NAME(glVertexAttribs4svNV) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLVERTEXATTRIBS4UBVNVPROC GLH_EXT_NAME(glVertexAttribs4ubvNV) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_SGIS_generate_mipmap
-#endif
-
-#ifdef GL_SGIS_texture_lod
-#endif
-
-#ifdef GL_SGIX_depth_texture
-#endif
-
-#ifdef GL_SGIX_shadow
-#endif
-
-#ifdef GL_VERSION_1_2
-    /* These routines are prefixed by the preprocessor constant
-       GLH_CORE_1_2_PREFIX to avoid colliding with the OpenGL 1.2 namespace. */
-    GLH_EXTERN PFNGLBLENDCOLORPROC GLH_CORE_1_2_NAME(glBlendColor) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLBLENDEQUATIONPROC GLH_CORE_1_2_NAME(glBlendEquation) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLDRAWRANGEELEMENTSPROC GLH_CORE_1_2_NAME(glDrawRangeElements) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOLORTABLEPROC GLH_CORE_1_2_NAME(glColorTable) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOLORTABLEPARAMETERFVPROC GLH_CORE_1_2_NAME(glColorTableParameterfv) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOLORTABLEPARAMETERIVPROC GLH_CORE_1_2_NAME(glColorTableParameteriv) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOPYCOLORTABLEPROC GLH_CORE_1_2_NAME(glCopyColorTable) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOLORTABLEPROC GLH_CORE_1_2_NAME(glGetColorTable) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERFVPROC GLH_CORE_1_2_NAME(glGetColorTableParameterfv) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLGETCOLORTABLEPARAMETERIVPROC GLH_CORE_1_2_NAME(glGetColorTableParameteriv) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLTEXIMAGE3DPROC GLH_CORE_1_2_NAME(glTexImage3D) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLTEXSUBIMAGE3DPROC GLH_CORE_1_2_NAME(glTexSubImage3D) GLH_INITIALIZER;
-    GLH_EXTERN PFNGLCOPYTEXSUBIMAGE3DPROC GLH_CORE_1_2_NAME(glCopyTexSubImage3D) GLH_INITIALIZER;
-#endif
-
-#ifdef GL_WIN_swap_hint
-    GLH_EXTERN PFNGLADDSWAPHINTRECTWINPROC GLH_EXT_NAME(glAddSwapHintRectWIN) GLH_INITIALIZER;
-#endif
-
-#ifdef WGL_ARB_pbuffer
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLCREATEPBUFFERARBPROC GLH_EXT_NAME(wglCreatePbufferARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLGETPBUFFERDCARBPROC GLH_EXT_NAME(wglGetPbufferDCARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLRELEASEPBUFFERDCARBPROC GLH_EXT_NAME(wglReleasePbufferDCARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLDESTROYPBUFFERARBPROC GLH_EXT_NAME(wglDestroyPbufferARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLQUERYPBUFFERARBPROC GLH_EXT_NAME(wglQueryPbufferARB) GLH_INITIALIZER;
-# endif
-#endif
-
-#ifdef WGL_ARB_render_texture
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLBINDTEXIMAGEARBPROC GLH_EXT_NAME(wglBindTexImageARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLRELEASETEXIMAGEARBPROC GLH_EXT_NAME(wglReleaseTexImageARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLSETPBUFFERATTRIBARBPROC GLH_EXT_NAME(wglSetPbufferAttribARB) GLH_INITIALIZER;
-# endif
-#endif
-
-#ifdef WGL_ARB_pixel_format
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLGETPIXELFORMATATTRIBIVARBPROC GLH_EXT_NAME(wglGetPixelFormatAttribivARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLGETPIXELFORMATATTRIBFVARBPROC GLH_EXT_NAME(wglGetPixelFormatAttribfvARB) GLH_INITIALIZER;
-# endif
-# ifdef _WIN32
-    GLH_EXTERN PFNWGLCHOOSEPIXELFORMATARBPROC GLH_EXT_NAME(wglChoosePixelFormatARB) GLH_INITIALIZER;
-# endif
-#endif
-
-
-#ifdef GLH_EXT_SINGLE_FILE
-
-int glh_init_extension(const char* extension)
-{
-    if (NULL == extension) {
-        return FALSE;
-#ifdef GL_ARB_multitexture
-    } else if (0 == strcmp(extension, "GL_ARB_multitexture")) {
-        GLH_EXT_NAME(glMultiTexCoord1dARB) = (PFNGLMULTITEXCOORD1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1dARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1dARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord1dvARB) = (PFNGLMULTITEXCOORD1DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1dvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1dvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord1fARB) = (PFNGLMULTITEXCOORD1FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1fARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1fARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord1fvARB) = (PFNGLMULTITEXCOORD1FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1fvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1fvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord1iARB) = (PFNGLMULTITEXCOORD1IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1iARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1iARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord1ivARB) = (PFNGLMULTITEXCOORD1IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1ivARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1ivARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord1sARB) = (PFNGLMULTITEXCOORD1SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1sARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1sARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord1svARB) = (PFNGLMULTITEXCOORD1SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord1svARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord1svARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2dARB) = (PFNGLMULTITEXCOORD2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2dARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2dARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2dvARB) = (PFNGLMULTITEXCOORD2DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2dvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2dvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2fARB) = (PFNGLMULTITEXCOORD2FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2fARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2fARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2fvARB) = (PFNGLMULTITEXCOORD2FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2fvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2fvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2iARB) = (PFNGLMULTITEXCOORD2IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2iARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2iARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2ivARB) = (PFNGLMULTITEXCOORD2IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2ivARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2ivARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2sARB) = (PFNGLMULTITEXCOORD2SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2sARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2sARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord2svARB) = (PFNGLMULTITEXCOORD2SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord2svARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord2svARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3dARB) = (PFNGLMULTITEXCOORD3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3dARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3dARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3dvARB) = (PFNGLMULTITEXCOORD3DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3dvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3dvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3fARB) = (PFNGLMULTITEXCOORD3FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3fARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3fARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3fvARB) = (PFNGLMULTITEXCOORD3FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3fvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3fvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3iARB) = (PFNGLMULTITEXCOORD3IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3iARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3iARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3ivARB) = (PFNGLMULTITEXCOORD3IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3ivARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3ivARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3sARB) = (PFNGLMULTITEXCOORD3SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3sARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3sARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord3svARB) = (PFNGLMULTITEXCOORD3SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord3svARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord3svARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4dARB) = (PFNGLMULTITEXCOORD4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4dARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4dARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4dvARB) = (PFNGLMULTITEXCOORD4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4dvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4dvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4fARB) = (PFNGLMULTITEXCOORD4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4fARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4fARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4fvARB) = (PFNGLMULTITEXCOORD4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4fvARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4fvARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4iARB) = (PFNGLMULTITEXCOORD4IARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4iARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4iARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4ivARB) = (PFNGLMULTITEXCOORD4IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4ivARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4ivARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4sARB) = (PFNGLMULTITEXCOORD4SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4sARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4sARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultiTexCoord4svARB) = (PFNGLMULTITEXCOORD4SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultiTexCoord4svARB");
-        if (NULL == GLH_EXT_NAME(glMultiTexCoord4svARB))
-            return FALSE;
-        GLH_EXT_NAME(glActiveTextureARB) = (PFNGLACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glActiveTextureARB");
-        if (NULL == GLH_EXT_NAME(glActiveTextureARB))
-            return FALSE;
-        GLH_EXT_NAME(glClientActiveTextureARB) = (PFNGLCLIENTACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glClientActiveTextureARB");
-        if (NULL == GLH_EXT_NAME(glClientActiveTextureARB))
-            return FALSE;
-#endif
-
-#ifdef GL_ARB_texture_border_clamp
-    } else if (0 == strcmp(extension, "GL_ARB_texture_border_clamp")) {
-#endif
-
-#ifdef GL_ARB_texture_compression
-    } else if (0 == strcmp(extension, "GL_ARB_texture_compression")) {
-        GLH_EXT_NAME(glCompressedTexImage3DARB) = (PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexImage3DARB");
-        if (NULL == GLH_EXT_NAME(glCompressedTexImage3DARB))
-            return FALSE;
-        GLH_EXT_NAME(glCompressedTexImage2DARB) = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexImage2DARB");
-        if (NULL == GLH_EXT_NAME(glCompressedTexImage2DARB))
-            return FALSE;
-        GLH_EXT_NAME(glCompressedTexImage1DARB) = (PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexImage1DARB");
-        if (NULL == GLH_EXT_NAME(glCompressedTexImage1DARB))
-            return FALSE;
-        GLH_EXT_NAME(glCompressedTexSubImage3DARB) = (PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexSubImage3DARB");
-        if (NULL == GLH_EXT_NAME(glCompressedTexSubImage3DARB))
-            return FALSE;
-        GLH_EXT_NAME(glCompressedTexSubImage2DARB) = (PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexSubImage2DARB");
-        if (NULL == GLH_EXT_NAME(glCompressedTexSubImage2DARB))
-            return FALSE;
-        GLH_EXT_NAME(glCompressedTexSubImage1DARB) = (PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glCompressedTexSubImage1DARB");
-        if (NULL == GLH_EXT_NAME(glCompressedTexSubImage1DARB))
-            return FALSE;
-        GLH_EXT_NAME(glGetCompressedTexImageARB) = (PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCompressedTexImageARB");
-        if (NULL == GLH_EXT_NAME(glGetCompressedTexImageARB))
-            return FALSE;
-#endif
-
-#ifdef GL_ARB_texture_cube_map
-    } else if (0 == strcmp(extension, "GL_ARB_texture_cube_map")) {
-#endif
-
-#ifdef GL_ARB_transpose_matrix
-    } else if (0 == strcmp(extension, "GL_ARB_transpose_matrix")) {
-        GLH_EXT_NAME(glLoadTransposeMatrixfARB) = (PFNGLLOADTRANSPOSEMATRIXFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glLoadTransposeMatrixfARB");
-        if (NULL == GLH_EXT_NAME(glLoadTransposeMatrixfARB))
-            return FALSE;
-        GLH_EXT_NAME(glLoadTransposeMatrixdARB) = (PFNGLLOADTRANSPOSEMATRIXDARBPROC)GLH_EXT_GET_PROC_ADDRESS("glLoadTransposeMatrixdARB");
-        if (NULL == GLH_EXT_NAME(glLoadTransposeMatrixdARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultTransposeMatrixfARB) = (PFNGLMULTTRANSPOSEMATRIXFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultTransposeMatrixfARB");
-        if (NULL == GLH_EXT_NAME(glMultTransposeMatrixfARB))
-            return FALSE;
-        GLH_EXT_NAME(glMultTransposeMatrixdARB) = (PFNGLMULTTRANSPOSEMATRIXDARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMultTransposeMatrixdARB");
-        if (NULL == GLH_EXT_NAME(glMultTransposeMatrixdARB))
-            return FALSE;
-#endif
-
-#ifdef GL_ARB_vertex_program
-    } else if (0 == strcmp(extension, "GL_ARB_vertex_program")) {
-        GLH_EXT_NAME(glVertexAttrib1sARB) = (PFNGLVERTEXATTRIB1SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1sARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1sARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib1fARB) = (PFNGLVERTEXATTRIB1FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1fARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib1dARB) = (PFNGLVERTEXATTRIB1DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1dARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib2sARB) = (PFNGLVERTEXATTRIB2SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2sARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2sARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib2fARB) = (PFNGLVERTEXATTRIB2FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2fARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib2dARB) = (PFNGLVERTEXATTRIB2DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2dARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib3sARB) = (PFNGLVERTEXATTRIB3SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3sARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3sARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib3fARB) = (PFNGLVERTEXATTRIB3FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3fARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib3dARB) = (PFNGLVERTEXATTRIB3DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3dARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4sARB) = (PFNGLVERTEXATTRIB4SARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4sARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4sARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4fARB) = (PFNGLVERTEXATTRIB4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4fARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4dARB) = (PFNGLVERTEXATTRIB4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4dARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4NubARB) = (PFNGLVERTEXATTRIB4NUBARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NubARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4NubARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib1svARB) = (PFNGLVERTEXATTRIB1SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1svARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1svARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib1fvARB) = (PFNGLVERTEXATTRIB1FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1fvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib1dvARB) = (PFNGLVERTEXATTRIB1DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1dvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib2svARB) = (PFNGLVERTEXATTRIB2SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2svARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2svARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib2fvARB) = (PFNGLVERTEXATTRIB2FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2fvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib2dvARB) = (PFNGLVERTEXATTRIB2DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2dvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib3svARB) = (PFNGLVERTEXATTRIB3SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3svARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3svARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib3fvARB) = (PFNGLVERTEXATTRIB3FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3fvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib3dvARB) = (PFNGLVERTEXATTRIB3DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3dvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4bvARB) = (PFNGLVERTEXATTRIB4BVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4bvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4bvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4svARB) = (PFNGLVERTEXATTRIB4SVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4svARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4svARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4ivARB) = (PFNGLVERTEXATTRIB4IVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ivARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4ivARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4ubvARB) = (PFNGLVERTEXATTRIB4UBVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ubvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4ubvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4usvARB) = (PFNGLVERTEXATTRIB4USVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4usvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4usvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4uivARB) = (PFNGLVERTEXATTRIB4UIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4uivARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4uivARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4fvARB) = (PFNGLVERTEXATTRIB4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4fvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4dvARB) = (PFNGLVERTEXATTRIB4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4dvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4NbvARB) = (PFNGLVERTEXATTRIB4NBVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NbvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4NbvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4NsvARB) = (PFNGLVERTEXATTRIB4NSVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NsvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4NsvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4NivARB) = (PFNGLVERTEXATTRIB4NIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NivARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4NivARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4NubvARB) = (PFNGLVERTEXATTRIB4NUBVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NubvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4NubvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4NusvARB) = (PFNGLVERTEXATTRIB4NUSVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NusvARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4NusvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttrib4NuivARB) = (PFNGLVERTEXATTRIB4NUIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4NuivARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4NuivARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glVertexAttribPointerARB) = (PFNGLVERTEXATTRIBPOINTERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribPointerARB");
-        if (NULL == GLH_EXT_NAME(glVertexAttribPointerARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glEnableVertexAttribArrayARB) = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glEnableVertexAttribArrayARB");
-        if (NULL == GLH_EXT_NAME(glEnableVertexAttribArrayARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glDisableVertexAttribArrayARB) = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDisableVertexAttribArrayARB");
-        if (NULL == GLH_EXT_NAME(glDisableVertexAttribArrayARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramStringARB) = (PFNGLPROGRAMSTRINGARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramStringARB");
-        if (NULL == GLH_EXT_NAME(glProgramStringARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glBindProgramARB) = (PFNGLBINDPROGRAMARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBindProgramARB");
-        if (NULL == GLH_EXT_NAME(glBindProgramARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glDeleteProgramsARB) = (PFNGLDELETEPROGRAMSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteProgramsARB");
-        if (NULL == GLH_EXT_NAME(glDeleteProgramsARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGenProgramsARB) = (PFNGLGENPROGRAMSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenProgramsARB");
-        if (NULL == GLH_EXT_NAME(glGenProgramsARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramEnvParameter4dARB) = (PFNGLPROGRAMENVPARAMETER4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dARB");
-        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4dARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramEnvParameter4dvARB) = (PFNGLPROGRAMENVPARAMETER4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4dvARB");
-        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4dvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramEnvParameter4fARB) = (PFNGLPROGRAMENVPARAMETER4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fARB");
-        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4fARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramEnvParameter4fvARB) = (PFNGLPROGRAMENVPARAMETER4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramEnvParameter4fvARB");
-        if (NULL == GLH_EXT_NAME(glProgramEnvParameter4fvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramLocalParameter4dARB) = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dARB");
-        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4dARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramLocalParameter4dvARB) = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4dvARB");
-        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4dvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramLocalParameter4fARB) = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fARB");
-        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4fARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glProgramLocalParameter4fvARB) = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramLocalParameter4fvARB");
-        if (NULL == GLH_EXT_NAME(glProgramLocalParameter4fvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetProgramEnvParameterdvARB) = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterdvARB");
-        if (NULL == GLH_EXT_NAME(glGetProgramEnvParameterdvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetProgramEnvParameterfvARB) = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramEnvParameterfvARB");
-        if (NULL == GLH_EXT_NAME(glGetProgramEnvParameterfvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetProgramLocalParameterdvARB) = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterdvARB");
-        if (NULL == GLH_EXT_NAME(glGetProgramLocalParameterdvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetProgramLocalParameterfvARB) = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramLocalParameterfvARB");
-        if (NULL == GLH_EXT_NAME(glGetProgramLocalParameterfvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetProgramivARB) = (PFNGLGETPROGRAMIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramivARB");
-        if (NULL == GLH_EXT_NAME(glGetProgramivARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetProgramStringARB) = (PFNGLGETPROGRAMSTRINGARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramStringARB");
-        if (NULL == GLH_EXT_NAME(glGetProgramStringARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetVertexAttribdvARB) = (PFNGLGETVERTEXATTRIBDVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribdvARB");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribdvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetVertexAttribfvARB) = (PFNGLGETVERTEXATTRIBFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribfvARB");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribfvARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetVertexAttribivARB) = (PFNGLGETVERTEXATTRIBIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribivARB");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribivARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glGetVertexAttribPointervARB) = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribPointervARB");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribPointervARB))
-            return GL_FALSE;
-        GLH_EXT_NAME(glIsProgramARB) = (PFNGLISPROGRAMARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsProgramARB");
-        if (NULL == GLH_EXT_NAME(glIsProgramARB))
-            return GL_FALSE;
-#endif
-
-#ifdef GL_EXT_abgr
-    } else if (0 == strcmp(extension, "GL_EXT_abgr")) {
-#endif
-
-#ifdef GL_EXT_bgra
-    } else if (0 == strcmp(extension, "GL_EXT_bgra")) {
-#endif
-
-#ifdef GL_EXT_blend_color
-    } else if (0 == strcmp(extension, "GL_EXT_blend_color")) {
-        GLH_EXT_NAME(glBlendColorEXT) = (PFNGLBLENDCOLOREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendColorEXT");
-        if (NULL == GLH_EXT_NAME(glBlendColorEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_blend_minmax
-    } else if (0 == strcmp(extension, "GL_EXT_blend_minmax")) {
-        GLH_EXT_NAME(glBlendEquationEXT) = (PFNGLBLENDEQUATIONEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendEquationEXT");
-        if (NULL == GLH_EXT_NAME(glBlendEquationEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_blend_subtract
-    } else if (0 == strcmp(extension, "GL_EXT_blend_subtract")) {
-#endif
-
-#ifdef GL_EXT_compiled_vertex_array
-    } else if (0 == strcmp(extension, "GL_EXT_compiled_vertex_array")) {
-        GLH_EXT_NAME(glLockArraysEXT) = (PFNGLLOCKARRAYSEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glLockArraysEXT");
-        if (NULL == GLH_EXT_NAME(glLockArraysEXT))
-            return FALSE;
-        GLH_EXT_NAME(glUnlockArraysEXT) = (PFNGLUNLOCKARRAYSEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glUnlockArraysEXT");
-        if (NULL == GLH_EXT_NAME(glUnlockArraysEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_fog_coord
-    } else if (0 == strcmp(extension, "GL_EXT_fog_coord")) {
-        GLH_EXT_NAME(glFogCoorddEXT) = (PFNGLFOGCOORDDEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoorddEXT");
-        if (NULL == GLH_EXT_NAME(glFogCoorddEXT))
-            return FALSE;
-        GLH_EXT_NAME(glFogCoorddvEXT) = (PFNGLFOGCOORDDVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoorddvEXT");
-        if (NULL == GLH_EXT_NAME(glFogCoorddvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glFogCoordfEXT) = (PFNGLFOGCOORDFEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoordfEXT");
-        if (NULL == GLH_EXT_NAME(glFogCoordfEXT))
-            return FALSE;
-        GLH_EXT_NAME(glFogCoordfvEXT) = (PFNGLFOGCOORDFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoordfvEXT");
-        if (NULL == GLH_EXT_NAME(glFogCoordfvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glFogCoordPointerEXT) = (PFNGLFOGCOORDPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glFogCoordPointerEXT");
-        if (NULL == GLH_EXT_NAME(glFogCoordPointerEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_light_max_exponent
-    } else if (0 == strcmp(extension, "GL_EXT_light_max_exponent")) {
-#endif
-
-#ifdef GL_EXT_packed_pixels
-    } else if (0 == strcmp(extension, "GL_EXT_packed_pixels")) {
-#endif
-
-#ifdef GL_EXT_paletted_texture
-    } else if (0 == strcmp(extension, "GL_EXT_paletted_texture")) {
-        GLH_EXT_NAME(glColorSubTableEXT) = (PFNGLCOLORSUBTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorSubTableEXT");
-        if (NULL == GLH_EXT_NAME(glColorSubTableEXT))
-            return FALSE;
-        GLH_EXT_NAME(glColorTableEXT) = (PFNGLCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableEXT");
-        if (NULL == GLH_EXT_NAME(glColorTableEXT))
-            return FALSE;
-        GLH_EXT_NAME(glGetColorTableEXT) = (PFNGLGETCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableEXT");
-        if (NULL == GLH_EXT_NAME(glGetColorTableEXT))
-            return FALSE;
-        GLH_EXT_NAME(glGetColorTableParameterfvEXT) = (PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameterfvEXT");
-        if (NULL == GLH_EXT_NAME(glGetColorTableParameterfvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glGetColorTableParameterivEXT) = (PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameterivEXT");
-        if (NULL == GLH_EXT_NAME(glGetColorTableParameterivEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_point_parameters
-    } else if (0 == strcmp(extension, "GL_EXT_point_parameters")) {
-        GLH_EXT_NAME(glPointParameterfEXT) = (PFNGLPOINTPARAMETERFEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfEXT");
-        if (NULL == GLH_EXT_NAME(glPointParameterfEXT))
-            return FALSE;
-        GLH_EXT_NAME(glPointParameterfvEXT) = (PFNGLPOINTPARAMETERFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfvEXT");
-        if (NULL == GLH_EXT_NAME(glPointParameterfvEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_rescale_normal
-    } else if (0 == strcmp(extension, "GL_EXT_rescale_normal")) {
-#endif
-
-#ifdef GL_EXT_secondary_color
-    } else if (0 == strcmp(extension, "GL_EXT_secondary_color")) {
-        GLH_EXT_NAME(glSecondaryColor3bEXT) = (PFNGLSECONDARYCOLOR3BEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3bEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3bEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3bvEXT) = (PFNGLSECONDARYCOLOR3BVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3bvEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3bvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3dEXT) = (PFNGLSECONDARYCOLOR3DEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3dEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3dEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3dvEXT) = (PFNGLSECONDARYCOLOR3DVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3dvEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3dvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3fEXT) = (PFNGLSECONDARYCOLOR3FEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3fEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3fEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3fvEXT) = (PFNGLSECONDARYCOLOR3FVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3fvEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3fvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3iEXT) = (PFNGLSECONDARYCOLOR3IEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3iEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3iEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3ivEXT) = (PFNGLSECONDARYCOLOR3IVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3ivEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3ivEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3sEXT) = (PFNGLSECONDARYCOLOR3SEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3sEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3sEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3svEXT) = (PFNGLSECONDARYCOLOR3SVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3svEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3svEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3ubEXT) = (PFNGLSECONDARYCOLOR3UBEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3ubEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3ubEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3ubvEXT) = (PFNGLSECONDARYCOLOR3UBVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3ubvEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3ubvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3uiEXT) = (PFNGLSECONDARYCOLOR3UIEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3uiEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3uiEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3uivEXT) = (PFNGLSECONDARYCOLOR3UIVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3uivEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3uivEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3usEXT) = (PFNGLSECONDARYCOLOR3USEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3usEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3usEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColor3usvEXT) = (PFNGLSECONDARYCOLOR3USVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColor3usvEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColor3usvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glSecondaryColorPointerEXT) = (PFNGLSECONDARYCOLORPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glSecondaryColorPointerEXT");
-        if (NULL == GLH_EXT_NAME(glSecondaryColorPointerEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_separate_specular_color
-    } else if (0 == strcmp(extension, "GL_EXT_separate_specular_color")) {
-#endif
-
-#ifdef GL_EXT_shared_texture_palette
-    } else if (0 == strcmp(extension, "GL_EXT_shared_texture_palette")) {
-#endif
-
-#ifdef GL_EXT_stencil_wrap
-    } else if (0 == strcmp(extension, "GL_EXT_stencil_wrap")) {
-#endif
-
-#ifdef GL_EXT_texture_compression_s3tc
-    } else if (0 == strcmp(extension, "GL_EXT_texture_compression_s3tc")) {
-#endif
-
-#ifdef GL_EXT_texture_cube_map
-    } else if (0 == strcmp(extension, "GL_EXT_texture_cube_map")) {
-#endif
-
-#ifdef GL_EXT_texture_edge_clamp
-    } else if (0 == strcmp(extension, "GL_EXT_texture_edge_clamp")) {
-#endif
-
-#ifdef GL_EXT_texture_env_add
-    } else if (0 == strcmp(extension, "GL_EXT_texture_env_add")) {
-#endif
-
-#ifdef GL_EXT_texture_env_combine
-    } else if (0 == strcmp(extension, "GL_EXT_texture_env_combine")) {
-#endif
-
-#ifdef GL_EXT_texture_filter_anisotropic
-    } else if (0 == strcmp(extension, "GL_EXT_texture_filter_anisotropic")) {
-#endif
-
-#ifdef GL_EXT_texture_lod_bias
-    } else if (0 == strcmp(extension, "GL_EXT_texture_lod_bias")) {
-#endif
-
-#ifdef GL_EXT_texture_object
-    } else if (0 == strcmp(extension, "GL_EXT_texture_object")) {
-        GLH_EXT_NAME(glAreTexturesResidentEXT) = (PFNGLARETEXTURESRESIDENTEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glAreTexturesResidentEXT");
-        if (NULL == GLH_EXT_NAME(glAreTexturesResidentEXT))
-            return FALSE;
-        GLH_EXT_NAME(glBindTextureEXT) = (PFNGLBINDTEXTUREEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glBindTextureEXT");
-        if (NULL == GLH_EXT_NAME(glBindTextureEXT))
-            return FALSE;
-        GLH_EXT_NAME(glDeleteTexturesEXT) = (PFNGLDELETETEXTURESEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteTexturesEXT");
-        if (NULL == GLH_EXT_NAME(glDeleteTexturesEXT))
-            return FALSE;
-        GLH_EXT_NAME(glGenTexturesEXT) = (PFNGLGENTEXTURESEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGenTexturesEXT");
-        if (NULL == GLH_EXT_NAME(glGenTexturesEXT))
-            return FALSE;
-        GLH_EXT_NAME(glIsTextureEXT) = (PFNGLISTEXTUREEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glIsTextureEXT");
-        if (NULL == GLH_EXT_NAME(glIsTextureEXT))
-            return FALSE;
-        GLH_EXT_NAME(glPrioritizeTexturesEXT) = (PFNGLPRIORITIZETEXTURESEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glPrioritizeTexturesEXT");
-        if (NULL == GLH_EXT_NAME(glPrioritizeTexturesEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_texture3D
-    } else if (0 == strcmp(extension, "GL_EXT_texture3D")) {
-        GLH_EXT_NAME(glTexImage3DEXT) = (PFNGLTEXIMAGE3DEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glTexImage3DEXT");
-        if (NULL == GLH_EXT_NAME(glTexImage3DEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_vertex_array
-    } else if (0 == strcmp(extension, "GL_EXT_vertex_array")) {
-        GLH_EXT_NAME(glArrayElementEXT) = (PFNGLARRAYELEMENTEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glArrayElementEXT");
-        if (NULL == GLH_EXT_NAME(glArrayElementEXT))
-            return FALSE;
-        GLH_EXT_NAME(glColorPointerEXT) = (PFNGLCOLORPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorPointerEXT");
-        if (NULL == GLH_EXT_NAME(glColorPointerEXT))
-            return FALSE;
-        GLH_EXT_NAME(glEdgeFlagPointerEXT) = (PFNGLEDGEFLAGPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glEdgeFlagPointerEXT");
-        if (NULL == GLH_EXT_NAME(glEdgeFlagPointerEXT))
-            return FALSE;
-        GLH_EXT_NAME(glGetPointervEXT) = (PFNGLGETPOINTERVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glGetPointervEXT");
-        if (NULL == GLH_EXT_NAME(glGetPointervEXT))
-            return FALSE;
-        GLH_EXT_NAME(glIndexPointerEXT) = (PFNGLINDEXPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glIndexPointerEXT");
-        if (NULL == GLH_EXT_NAME(glIndexPointerEXT))
-            return FALSE;
-        GLH_EXT_NAME(glNormalPointerEXT) = (PFNGLNORMALPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glNormalPointerEXT");
-        if (NULL == GLH_EXT_NAME(glNormalPointerEXT))
-            return FALSE;
-        GLH_EXT_NAME(glTexCoordPointerEXT) = (PFNGLTEXCOORDPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glTexCoordPointerEXT");
-        if (NULL == GLH_EXT_NAME(glTexCoordPointerEXT))
-            return FALSE;
-        GLH_EXT_NAME(glVertexPointerEXT) = (PFNGLVERTEXPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexPointerEXT");
-        if (NULL == GLH_EXT_NAME(glVertexPointerEXT))
-            return FALSE;
-        GLH_EXT_NAME(glDrawArraysEXT) = (PFNGLDRAWARRAYSEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawArraysEXT");
-        if (NULL == GLH_EXT_NAME(glDrawArraysEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_EXT_vertex_weighting
-    } else if (0 == strcmp(extension, "GL_EXT_vertex_weighting")) {
-        GLH_EXT_NAME(glVertexWeightfEXT) = (PFNGLVERTEXWEIGHTFEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexWeightfEXT");
-        if (NULL == GLH_EXT_NAME(glVertexWeightfEXT))
-            return FALSE;
-        GLH_EXT_NAME(glVertexWeightfvEXT) = (PFNGLVERTEXWEIGHTFVEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexWeightfvEXT");
-        if (NULL == GLH_EXT_NAME(glVertexWeightfvEXT))
-            return FALSE;
-        GLH_EXT_NAME(glVertexWeightPointerEXT) = (PFNGLVERTEXWEIGHTPOINTEREXTPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexWeightPointerEXT");
-        if (NULL == GLH_EXT_NAME(glVertexWeightPointerEXT))
-            return FALSE;
-#endif
-
-#ifdef GL_NV_blend_square
-    } else if (0 == strcmp(extension, "GL_NV_blend_square")) {
-#endif
-
-#ifdef GL_NV_evaluators
-    } else if (0 == strcmp(extension, "GL_NV_evaluators")) {
-        GLH_EXT_NAME(glMapControlPointsNV) = (PFNGLMAPCONTROLPOINTSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glMapControlPointsNV");
-        if (NULL == GLH_EXT_NAME(glMapControlPointsNV))
-            return FALSE;
-        GLH_EXT_NAME(glMapParameterivNV) = (PFNGLMAPPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glMapParameterivNV");
-        if (NULL == GLH_EXT_NAME(glMapParameterivNV))
-            return FALSE;
-        GLH_EXT_NAME(glMapParameterfvNV) = (PFNGLMAPPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glMapParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glMapParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetMapControlPointsNV) = (PFNGLGETMAPCONTROLPOINTSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapControlPointsNV");
-        if (NULL == GLH_EXT_NAME(glGetMapControlPointsNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetMapParameterivNV) = (PFNGLGETMAPPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapParameterivNV");
-        if (NULL == GLH_EXT_NAME(glGetMapParameterivNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetMapParameterfvNV) = (PFNGLGETMAPPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glGetMapParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetMapAttribParameterivNV) = (PFNGLGETMAPATTRIBPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapAttribParameterivNV");
-        if (NULL == GLH_EXT_NAME(glGetMapAttribParameterivNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetMapAttribParameterfvNV) = (PFNGLGETMAPATTRIBPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetMapAttribParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glGetMapAttribParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glEvalMapsNV) = (PFNGLEVALMAPSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glEvalMapsNV");
-        if (NULL == GLH_EXT_NAME(glEvalMapsNV))
-            return FALSE;
-#endif
-
-#ifdef GL_NV_fence
-    } else if (0 == strcmp(extension, "GL_NV_fence")) {
-        GLH_EXT_NAME(glGenFencesNV) = (PFNGLGENFENCESNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGenFencesNV");
-        if (NULL == GLH_EXT_NAME(glGenFencesNV))
-            return FALSE;
-        GLH_EXT_NAME(glDeleteFencesNV) = (PFNGLDELETEFENCESNVPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteFencesNV");
-        if (NULL == GLH_EXT_NAME(glDeleteFencesNV))
-            return FALSE;
-        GLH_EXT_NAME(glSetFenceNV) = (PFNGLSETFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glSetFenceNV");
-        if (NULL == GLH_EXT_NAME(glSetFenceNV))
-            return FALSE;
-        GLH_EXT_NAME(glTestFenceNV) = (PFNGLTESTFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glTestFenceNV");
-        if (NULL == GLH_EXT_NAME(glTestFenceNV))
-            return FALSE;
-        GLH_EXT_NAME(glFinishFenceNV) = (PFNGLFINISHFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glFinishFenceNV");
-        if (NULL == GLH_EXT_NAME(glFinishFenceNV))
-            return FALSE;
-        GLH_EXT_NAME(glIsFenceNV) = (PFNGLISFENCENVPROC)GLH_EXT_GET_PROC_ADDRESS("glIsFenceNV");
-        if (NULL == GLH_EXT_NAME(glIsFenceNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetFenceivNV) = (PFNGLGETFENCEIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetFenceivNV");
-        if (NULL == GLH_EXT_NAME(glGetFenceivNV))
-            return FALSE;
-#endif
-
-#ifdef GL_NV_fog_distance
-    } else if (0 == strcmp(extension, "GL_NV_fog_distance")) {
-#endif
-
-#ifdef GL_NV_packed_depth_stencil
-    } else if (0 == strcmp(extension, "GL_NV_packed_depth_stencil")) {
-#endif
-
-#ifdef GL_NV_register_combiners
-    } else if (0 == strcmp(extension, "GL_NV_register_combiners")) {
-        GLH_EXT_NAME(glCombinerParameterfvNV) = (PFNGLCOMBINERPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glCombinerParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glCombinerParameterfNV) = (PFNGLCOMBINERPARAMETERFNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameterfNV");
-        if (NULL == GLH_EXT_NAME(glCombinerParameterfNV))
-            return FALSE;
-        GLH_EXT_NAME(glCombinerParameterivNV) = (PFNGLCOMBINERPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameterivNV");
-        if (NULL == GLH_EXT_NAME(glCombinerParameterivNV))
-            return FALSE;
-        GLH_EXT_NAME(glCombinerParameteriNV) = (PFNGLCOMBINERPARAMETERINVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerParameteriNV");
-        if (NULL == GLH_EXT_NAME(glCombinerParameteriNV))
-            return FALSE;
-        GLH_EXT_NAME(glCombinerInputNV) = (PFNGLCOMBINERINPUTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerInputNV");
-        if (NULL == GLH_EXT_NAME(glCombinerInputNV))
-            return FALSE;
-        GLH_EXT_NAME(glCombinerOutputNV) = (PFNGLCOMBINEROUTPUTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerOutputNV");
-        if (NULL == GLH_EXT_NAME(glCombinerOutputNV))
-            return FALSE;
-        GLH_EXT_NAME(glFinalCombinerInputNV) = (PFNGLFINALCOMBINERINPUTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glFinalCombinerInputNV");
-        if (NULL == GLH_EXT_NAME(glFinalCombinerInputNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetCombinerInputParameterfvNV) = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerInputParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glGetCombinerInputParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetCombinerInputParameterivNV) = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerInputParameterivNV");
-        if (NULL == GLH_EXT_NAME(glGetCombinerInputParameterivNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetCombinerOutputParameterfvNV) = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerOutputParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glGetCombinerOutputParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetCombinerOutputParameterivNV) = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerOutputParameterivNV");
-        if (NULL == GLH_EXT_NAME(glGetCombinerOutputParameterivNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetFinalCombinerInputParameterfvNV) = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetFinalCombinerInputParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glGetFinalCombinerInputParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetFinalCombinerInputParameterivNV) = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetFinalCombinerInputParameterivNV");
-        if (NULL == GLH_EXT_NAME(glGetFinalCombinerInputParameterivNV))
-            return FALSE;
-#endif
-
-#ifdef GL_NV_register_combiners2
-    } else if (0 == strcmp(extension, "GL_NV_register_combiners2")) {
-        GLH_EXT_NAME(glCombinerStageParameterfvNV) = (PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glCombinerStageParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glCombinerStageParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetCombinerStageParameterfvNV) = (PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetCombinerStageParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glGetCombinerStageParameterfvNV))
-            return FALSE;
-#endif
-
-#ifdef GL_NV_texgen_reflection
-    } else if (0 == strcmp(extension, "GL_NV_texgen_reflection")) {
-#endif
-
-#ifdef GL_NV_texture_env_combine4
-    } else if (0 == strcmp(extension, "GL_NV_texture_env_combine4")) {
-#endif
-
-#ifdef GL_NV_texture_rectangle
-    } else if (0 == strcmp(extension, "GL_NV_texture_rectangle")) {
-#endif
-
-#ifdef GL_NV_texture_shader
-    } else if (0 == strcmp(extension, "GL_NV_texture_shader")) {
-#endif
-
-#ifdef GL_NV_vertex_array_range
-    } else if (0 == strcmp(extension, "GL_NV_vertex_array_range")) {
-        GLH_EXT_NAME(glFlushVertexArrayRangeNV) = (PFNGLFLUSHVERTEXARRAYRANGENVPROC)GLH_EXT_GET_PROC_ADDRESS("glFlushVertexArrayRangeNV");
-        if (NULL == GLH_EXT_NAME(glFlushVertexArrayRangeNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexArrayRangeNV) = (PFNGLVERTEXARRAYRANGENVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexArrayRangeNV");
-        if (NULL == GLH_EXT_NAME(glVertexArrayRangeNV))
-            return FALSE;
-# ifdef _WIN32
-        GLH_EXT_NAME(wglAllocateMemoryNV) = (PFNWGLALLOCATEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("wglAllocateMemoryNV");
-        if (NULL == GLH_EXT_NAME(wglAllocateMemoryNV))
-            return FALSE;
-# endif
-# ifdef GLX_VERSION_1_3
-        GLH_EXT_NAME(glXAllocateMemoryNV) = (PFNGLXALLOCATEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("glXAllocateMemoryNV");
-        if (NULL == GLH_EXT_NAME(glXAllocateMemoryNV))
-            return FALSE;
-# endif
-# ifdef _WIN32
-        GLH_EXT_NAME(wglFreeMemoryNV) = (PFNWGLFREEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("wglFreeMemoryNV");
-        if (NULL == GLH_EXT_NAME(wglFreeMemoryNV))
-            return FALSE;
-# endif
-# ifdef GLX_VERSION_1_3
-        GLH_EXT_NAME(glXFreeMemoryNV) = (PFNGLXFREEMEMORYNVPROC)GLH_EXT_GET_PROC_ADDRESS("glXFreeMemoryNV");
-        if (NULL == GLH_EXT_NAME(glXFreeMemoryNV))
-            return FALSE;
-# endif
-#endif
-
-#ifdef GL_NV_vertex_program
-    } else if (0 == strcmp(extension, "GL_NV_vertex_program")) {
-        GLH_EXT_NAME(glAreProgramsResidentNV) = (PFNGLAREPROGRAMSRESIDENTNVPROC)GLH_EXT_GET_PROC_ADDRESS("glAreProgramsResidentNV");
-        if (NULL == GLH_EXT_NAME(glAreProgramsResidentNV))
-            return FALSE;
-        GLH_EXT_NAME(glBindProgramNV) = (PFNGLBINDPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glBindProgramNV");
-        if (NULL == GLH_EXT_NAME(glBindProgramNV))
-            return FALSE;
-        GLH_EXT_NAME(glDeleteProgramsNV) = (PFNGLDELETEPROGRAMSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteProgramsNV");
-        if (NULL == GLH_EXT_NAME(glDeleteProgramsNV))
-            return FALSE;
-        GLH_EXT_NAME(glExecuteProgramNV) = (PFNGLEXECUTEPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glExecuteProgramNV");
-        if (NULL == GLH_EXT_NAME(glExecuteProgramNV))
-            return FALSE;
-        GLH_EXT_NAME(glGenProgramsNV) = (PFNGLGENPROGRAMSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGenProgramsNV");
-        if (NULL == GLH_EXT_NAME(glGenProgramsNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetProgramParameterdvNV) = (PFNGLGETPROGRAMPARAMETERDVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramParameterdvNV");
-        if (NULL == GLH_EXT_NAME(glGetProgramParameterdvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetProgramParameterfvNV) = (PFNGLGETPROGRAMPARAMETERFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramParameterfvNV");
-        if (NULL == GLH_EXT_NAME(glGetProgramParameterfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetProgramivNV) = (PFNGLGETPROGRAMIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramivNV");
-        if (NULL == GLH_EXT_NAME(glGetProgramivNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetProgramStringNV) = (PFNGLGETPROGRAMSTRINGNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetProgramStringNV");
-        if (NULL == GLH_EXT_NAME(glGetProgramStringNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetTrackMatrixivNV) = (PFNGLGETTRACKMATRIXIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetTrackMatrixivNV");
-        if (NULL == GLH_EXT_NAME(glGetTrackMatrixivNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetVertexAttribdvNV) = (PFNGLGETVERTEXATTRIBDVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribdvNV");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribdvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetVertexAttribfvNV) = (PFNGLGETVERTEXATTRIBFVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribfvNV");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribfvNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetVertexAttribivNV) = (PFNGLGETVERTEXATTRIBIVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribivNV");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribivNV))
-            return FALSE;
-        GLH_EXT_NAME(glGetVertexAttribPointervNV) = (PFNGLGETVERTEXATTRIBPOINTERVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetVertexAttribPointervNV");
-        if (NULL == GLH_EXT_NAME(glGetVertexAttribPointervNV))
-            return FALSE;
-        GLH_EXT_NAME(glIsProgramNV) = (PFNGLISPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glIsProgramNV");
-        if (NULL == GLH_EXT_NAME(glIsProgramNV))
-            return FALSE;
-        GLH_EXT_NAME(glLoadProgramNV) = (PFNGLLOADPROGRAMNVPROC)GLH_EXT_GET_PROC_ADDRESS("glLoadProgramNV");
-        if (NULL == GLH_EXT_NAME(glLoadProgramNV))
-            return FALSE;
-        GLH_EXT_NAME(glProgramParameter4dNV) = (PFNGLPROGRAMPARAMETER4DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4dNV");
-        if (NULL == GLH_EXT_NAME(glProgramParameter4dNV))
-            return FALSE;
-        GLH_EXT_NAME(glProgramParameter4dvNV) = (PFNGLPROGRAMPARAMETER4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4dvNV");
-        if (NULL == GLH_EXT_NAME(glProgramParameter4dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glProgramParameter4fNV) = (PFNGLPROGRAMPARAMETER4FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4fNV");
-        if (NULL == GLH_EXT_NAME(glProgramParameter4fNV))
-            return FALSE;
-        GLH_EXT_NAME(glProgramParameter4fvNV) = (PFNGLPROGRAMPARAMETER4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameter4fvNV");
-        if (NULL == GLH_EXT_NAME(glProgramParameter4fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glProgramParameters4dvNV) = (PFNGLPROGRAMPARAMETERS4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameters4dvNV");
-        if (NULL == GLH_EXT_NAME(glProgramParameters4dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glProgramParameters4fvNV) = (PFNGLPROGRAMPARAMETERS4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glProgramParameters4fvNV");
-        if (NULL == GLH_EXT_NAME(glProgramParameters4fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glRequestResidentProgramsNV) = (PFNGLREQUESTRESIDENTPROGRAMSNVPROC)GLH_EXT_GET_PROC_ADDRESS("glRequestResidentProgramsNV");
-        if (NULL == GLH_EXT_NAME(glRequestResidentProgramsNV))
-            return FALSE;
-        GLH_EXT_NAME(glTrackMatrixNV) = (PFNGLTRACKMATRIXNVPROC)GLH_EXT_GET_PROC_ADDRESS("glTrackMatrixNV");
-        if (NULL == GLH_EXT_NAME(glTrackMatrixNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribPointerNV) = (PFNGLVERTEXATTRIBPOINTERNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribPointerNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribPointerNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib1dNV) = (PFNGLVERTEXATTRIB1DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1dNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib1dvNV) = (PFNGLVERTEXATTRIB1DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib1fNV) = (PFNGLVERTEXATTRIB1FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1fNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib1fvNV) = (PFNGLVERTEXATTRIB1FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib1sNV) = (PFNGLVERTEXATTRIB1SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1sNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1sNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib1svNV) = (PFNGLVERTEXATTRIB1SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib1svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib1svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib2dNV) = (PFNGLVERTEXATTRIB2DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2dNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib2dvNV) = (PFNGLVERTEXATTRIB2DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib2fNV) = (PFNGLVERTEXATTRIB2FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2fNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib2fvNV) = (PFNGLVERTEXATTRIB2FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib2sNV) = (PFNGLVERTEXATTRIB2SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2sNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2sNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib2svNV) = (PFNGLVERTEXATTRIB2SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib2svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib2svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib3dNV) = (PFNGLVERTEXATTRIB3DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3dNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib3dvNV) = (PFNGLVERTEXATTRIB3DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib3fNV) = (PFNGLVERTEXATTRIB3FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3fNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib3fvNV) = (PFNGLVERTEXATTRIB3FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib3sNV) = (PFNGLVERTEXATTRIB3SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3sNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3sNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib3svNV) = (PFNGLVERTEXATTRIB3SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib3svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib3svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib4dNV) = (PFNGLVERTEXATTRIB4DNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4dNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib4dvNV) = (PFNGLVERTEXATTRIB4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib4fNV) = (PFNGLVERTEXATTRIB4FNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4fNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib4fvNV) = (PFNGLVERTEXATTRIB4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib4sNV) = (PFNGLVERTEXATTRIB4SNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4sNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4sNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib4svNV) = (PFNGLVERTEXATTRIB4SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttrib4ubvNV) = (PFNGLVERTEXATTRIB4UBVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttrib4ubvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttrib4ubvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs1dvNV) = (PFNGLVERTEXATTRIBS1DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs1dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs1dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs1fvNV) = (PFNGLVERTEXATTRIBS1FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs1fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs1fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs1svNV) = (PFNGLVERTEXATTRIBS1SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs1svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs1svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs2dvNV) = (PFNGLVERTEXATTRIBS2DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs2dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs2dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs2fvNV) = (PFNGLVERTEXATTRIBS2FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs2fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs2fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs2svNV) = (PFNGLVERTEXATTRIBS2SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs2svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs2svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs3dvNV) = (PFNGLVERTEXATTRIBS3DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs3dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs3dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs3fvNV) = (PFNGLVERTEXATTRIBS3FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs3fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs3fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs3svNV) = (PFNGLVERTEXATTRIBS3SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs3svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs3svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs4dvNV) = (PFNGLVERTEXATTRIBS4DVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4dvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs4dvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs4fvNV) = (PFNGLVERTEXATTRIBS4FVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4fvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs4fvNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs4svNV) = (PFNGLVERTEXATTRIBS4SVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4svNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs4svNV))
-            return FALSE;
-        GLH_EXT_NAME(glVertexAttribs4ubvNV) = (PFNGLVERTEXATTRIBS4UBVNVPROC)GLH_EXT_GET_PROC_ADDRESS("glVertexAttribs4ubvNV");
-        if (NULL == GLH_EXT_NAME(glVertexAttribs4ubvNV))
-            return FALSE;
-#endif
-
-#ifdef GL_SGIS_generate_mipmap
-    } else if (0 == strcmp(extension, "GL_SGIS_generate_mipmap")) {
-#endif
-
-#ifdef GL_SGIS_texture_lod
-    } else if (0 == strcmp(extension, "GL_SGIS_texture_lod")) {
-#endif
-
-#ifdef GL_SGIX_depth_texture
-    } else if (0 == strcmp(extension, "GL_SGIX_depth_texture")) {
-#endif
-
-#ifdef GL_SGIX_shadow
-    } else if (0 == strcmp(extension, "GL_SGIX_shadow")) {
-#endif
-
-#ifdef GL_VERSION_1_2
-    } else if (0 == strcmp(extension, "GL_VERSION_1_2")) {
-        GLH_CORE_1_2_NAME(glBlendColor) = (PFNGLBLENDCOLORPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendColor");
-        if (NULL == GLH_CORE_1_2_NAME(glBlendColor))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glBlendEquation) = (PFNGLBLENDEQUATIONPROC)GLH_EXT_GET_PROC_ADDRESS("glBlendEquation");
-        if (NULL == GLH_CORE_1_2_NAME(glBlendEquation))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glDrawRangeElements) = (PFNGLDRAWRANGEELEMENTSPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawRangeElements");
-        if (NULL == GLH_CORE_1_2_NAME(glDrawRangeElements))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glColorTable) = (PFNGLCOLORTABLEPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTable");
-        if (NULL == GLH_CORE_1_2_NAME(glColorTable))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glColorTableParameterfv) = (PFNGLCOLORTABLEPARAMETERFVPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableParameterfv");
-        if (NULL == GLH_CORE_1_2_NAME(glColorTableParameterfv))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glColorTableParameteriv) = (PFNGLCOLORTABLEPARAMETERIVPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableParameteriv");
-        if (NULL == GLH_CORE_1_2_NAME(glColorTableParameteriv))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glCopyColorTable) = (PFNGLCOPYCOLORTABLEPROC)GLH_EXT_GET_PROC_ADDRESS("glCopyColorTable");
-        if (NULL == GLH_CORE_1_2_NAME(glCopyColorTable))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glGetColorTable) = (PFNGLGETCOLORTABLEPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTable");
-        if (NULL == GLH_CORE_1_2_NAME(glGetColorTable))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glGetColorTableParameterfv) = (PFNGLGETCOLORTABLEPARAMETERFVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameterfv");
-        if (NULL == GLH_CORE_1_2_NAME(glGetColorTableParameterfv))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glGetColorTableParameteriv) = (PFNGLGETCOLORTABLEPARAMETERIVPROC)GLH_EXT_GET_PROC_ADDRESS("glGetColorTableParameteriv");
-        if (NULL == GLH_CORE_1_2_NAME(glGetColorTableParameteriv))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glTexImage3D) = (PFNGLTEXIMAGE3DPROC)GLH_EXT_GET_PROC_ADDRESS("glTexImage3D");
-        if (NULL == GLH_CORE_1_2_NAME(glTexImage3D))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glTexSubImage3D) = (PFNGLTEXSUBIMAGE3DPROC)GLH_EXT_GET_PROC_ADDRESS("glTexSubImage3D");
-        if (NULL == GLH_CORE_1_2_NAME(glTexSubImage3D))
-            return FALSE;
-        GLH_CORE_1_2_NAME(glCopyTexSubImage3D) = (PFNGLCOPYTEXSUBIMAGE3DPROC)GLH_EXT_GET_PROC_ADDRESS("glCopyTexSubImage3D");
-        if (NULL == GLH_CORE_1_2_NAME(glCopyTexSubImage3D))
-            return FALSE;
-#endif
-
-#ifdef GL_WIN_swap_hint
-    } else if (0 == strcmp(extension, "GL_WIN_swap_hint")) {
-        GLH_EXT_NAME(glAddSwapHintRectWIN) = (PFNGLADDSWAPHINTRECTWINPROC)GLH_EXT_GET_PROC_ADDRESS("glAddSwapHintRectWIN");
-        if (NULL == GLH_EXT_NAME(glAddSwapHintRectWIN))
-            return FALSE;
-#endif
-
-#ifdef WGL_ARB_pbuffer
-    } else if (0 == strcmp(extension, "WGL_ARB_pbuffer")) {
-# ifdef _WIN32
-        GLH_EXT_NAME(wglCreatePbufferARB) = (PFNWGLCREATEPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglCreatePbufferARB");
-        if (NULL == GLH_EXT_NAME(wglCreatePbufferARB))
-            return FALSE;
-# endif
-# ifdef _WIN32
-        GLH_EXT_NAME(wglGetPbufferDCARB) = (PFNWGLGETPBUFFERDCARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetPbufferDCARB");
-        if (NULL == GLH_EXT_NAME(wglGetPbufferDCARB))
-            return FALSE;
-# endif
-# ifdef _WIN32
-        GLH_EXT_NAME(wglReleasePbufferDCARB) = (PFNWGLRELEASEPBUFFERDCARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglReleasePbufferDCARB");
-        if (NULL == GLH_EXT_NAME(wglReleasePbufferDCARB))
-            return FALSE;
-# endif
-# ifdef _WIN32
-        GLH_EXT_NAME(wglDestroyPbufferARB) = (PFNWGLDESTROYPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglDestroyPbufferARB");
-        if (NULL == GLH_EXT_NAME(wglDestroyPbufferARB))
-            return FALSE;
-# endif
-# ifdef _WIN32
-        GLH_EXT_NAME(wglQueryPbufferARB) = (PFNWGLQUERYPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglQueryPbufferARB");
-        if (NULL == GLH_EXT_NAME(wglQueryPbufferARB))
-            return FALSE;
-# endif
-#endif
-
-#ifdef WGL_ARB_render_texture
-# ifdef _WIN32
-		GLH_EXT_NAME(wglBindTexImageARB) = (PFNWGLBINDTEXIMAGEARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglBindTexImageARB");
-		if (NULL == GLH_EXT_NAME(wglBindTexImageARB))
-			return FALSE;
-# endif
-# ifdef _WIN32
-		GLH_EXT_NAME(wglReleaseTexImageARB) = (PFNWGLRELEASETEXIMAGEARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglReleaseTexImageARB");
-		if (NULL == GLH_EXT_NAME(wglReleaseTexImageARB))
-			return FALSE;
-# endif
-# ifdef _WIN32
-		GLH_EXT_NAME(wglSetPbufferAttribARB) = (PFNWGLSETPBUFFERATTRIBARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglSetPbufferAttribARB");
-		if (NULL == GLH_EXT_NAME(wglSetPbufferAttribARB))
-			return FALSE;
-# endif
-#endif
-
-#ifdef WGL_ARB_pixel_format
-    } else if (0 == strcmp(extension, "WGL_ARB_pixel_format")) {
-# ifdef _WIN32
-        GLH_EXT_NAME(wglGetPixelFormatAttribivARB) = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetPixelFormatAttribivARB");
-        if (NULL == GLH_EXT_NAME(wglGetPixelFormatAttribivARB))
-            return FALSE;
-# endif
-# ifdef _WIN32
-        GLH_EXT_NAME(wglGetPixelFormatAttribfvARB) = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetPixelFormatAttribfvARB");
-        if (NULL == GLH_EXT_NAME(wglGetPixelFormatAttribfvARB))
-            return FALSE;
-# endif
-# ifdef _WIN32
-        GLH_EXT_NAME(wglChoosePixelFormatARB) = (PFNWGLCHOOSEPIXELFORMATARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglChoosePixelFormatARB");
-        if (NULL == GLH_EXT_NAME(wglChoosePixelFormatARB))
-            return FALSE;
-# endif
-#endif
-
-    } else {
-        return FALSE;
-    }
-    return TRUE;
-}
-#endif
-
-#else // defined(__APPLE__)
-
-#ifdef GLH_EXT_SINGLE_FILE
-
-int glh_init_extension(const char* extension)
-{
-	// MBW -- XXX -- Should this check for extension availability?
-	return TRUE;
-}
-#endif // GLH_EXT_SINGLE_FILE
-
-#endif // defined(__APPLE__)
-
-#undef GLH_EXT_SINGLE_FILE
-
-#endif /* GLH_GENEXT_H */
diff --git a/linden/libraries/include/glh/glh_linear.h b/linden/libraries/include/glh/glh_linear.h
deleted file mode 100755
index 04ae1bd..0000000
--- a/linden/libraries/include/glh/glh_linear.h
+++ /dev/null
@@ -1,1621 +0,0 @@
-/*
-    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
-*/
-
-/*
-glh_linear.h
-*/
-
-// Author:  Cass W. Everitt
-
-#ifndef GLH_LINEAR_H
-#define GLH_LINEAR_H
-
-#include <memory.h>
-#include <math.h>
-#include <assert.h>
-
-// only supports float for now...
-#define GLH_REAL_IS_FLOAT
-
-#ifdef GLH_REAL_IS_FLOAT
-# define GLH_REAL float
-# define GLH_REAL_NAMESPACE ns_float
-#endif
-
-#define     GLH_QUATERNION_NORMALIZATION_THRESHOLD  64
-
-#define     GLH_RAD_TO_DEG      GLH_REAL(57.2957795130823208767981548141052)
-#define     GLH_DEG_TO_RAD      GLH_REAL(0.0174532925199432957692369076848861)
-#define     GLH_ZERO            GLH_REAL(0.0)
-#define     GLH_ONE             GLH_REAL(1.0)
-#define     GLH_TWO             GLH_REAL(2.0)
-#define     GLH_EPSILON         GLH_REAL(10e-6)
-#define     GLH_PI              GLH_REAL(3.1415926535897932384626433832795)    
-
-#define     equivalent(a,b)     (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
-
-namespace glh
-{
-
-	inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; }
-	inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; }
-
-	// forward declarations for friend template functions.
-	template <int N, class T> class vec;
-	
-	// forward declarations for friend template functions.
-	template <int N, class T>
-		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 );
-	
-	// forward declarations for friend template functions.
-	template <int N, class T>
-		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 );
-
-	template <int N, class T>	
-	class vec
-	{				
-    public:
-		int size() const { return N; }
-		
-		vec(const T & t = T()) 
-		{ for(int i = 0; i < N; i++) v[i] = t; }
-		vec(const T * tp)
-		{ for(int i = 0; i < N; i++) v[i] = tp[i]; }
-		
-		const T * get_value() const
-		{ return v; }
-		
-		
-		T dot( const vec<N,T> & rhs ) const
-		{ 
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*rhs.v[i];
-			return r;
-		}
-		
-		T length() const
-		{
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
-			return T(sqrt(r));
-		}	
-		
-		T square_norm() const
-		{
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
-			return r;
-		}	
-		
-		void  negate()
-		{ for(int i = 0; i < N; i++) v[i] = -v[i]; }
-		
-		
-		T normalize() 
-		{ 
-			T sum(0);
-			for(int i = 0; i < N; i++) 
-                sum += v[i]*v[i];
-			sum = T(sqrt(sum));
-            if (sum > GLH_EPSILON)
-			    for(int i = 0; i < N; i++) 
-                    v[i] /= sum;
-			return sum;
-		}
-		
-		
-		vec<N,T> & set_value( const T * rhs )
-		{ for(int i = 0; i < N; i++) v[i] = rhs[i]; return *this; }
-		
-		T & operator [] ( int i )
-		{ return v[i]; }
-		
-		const T & operator [] ( int i ) const
-		{ return v[i]; }
-
-		vec<N,T> & operator *= ( T d )
-		{ for(int i = 0; i < N; i++) v[i] *= d; return *this;}
-		
-		vec<N,T> & operator *= ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] *= u[i]; return *this;}
-		
-		vec<N,T> & operator /= ( T d )
-		{ if(d == 0) return *this; for(int i = 0; i < N; i++) v[i] /= d; return *this;}
-		
-		vec<N,T> & operator += ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] += u.v[i]; return *this;}
-		
-		vec<N,T> & operator -= ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] -= u.v[i]; return *this;}
-		
-		
-		vec<N,T> operator - () const
-		{ vec<N,T> rv = v; rv.negate(); return rv; }
-		
-		vec<N,T> operator + ( const vec<N,T> &v) const
-		{ vec<N,T> rt(*this); return rt += v; }
-		
-		vec<N,T> operator - ( const vec<N,T> &v) const
-		{ vec<N,T> rt(*this); return rt -= v; }
-		
-		vec<N,T> operator * ( T d) const
-		{ vec<N,T> rt(*this); return rt *= d; }
-		
-		friend bool operator == <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-		friend bool operator != <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-		
-		
-	//protected:
-		T v[N];
-	};
-	
-	
-	
-	// vector friend operators
-	
-	template <int N, class T> inline
-		vec<N,T> operator * ( const vec<N,T> & b, T d )
-	{
-		vec<N,T> rt(b);
-		return rt *= d;
-	}
-
-	template <int N, class T> inline
-		vec<N,T> operator * ( T d, const vec<N,T> & b )
-	{ return b*d; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator * ( const vec<N,T> & b, const vec<N,T> & d )
-	{
-		vec<N,T> rt(b);
-		return rt *= d;
-	}
-
-	template <int N, class T> inline
-		vec<N,T> operator / ( const vec<N,T> & b, T d )
-	{ vec<N,T> rt(b); return rt /= d; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator + ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ vec<N,T> rt(v1); return rt += v2; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator - ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ vec<N,T> rt(v1); return rt -= v2; }
-	
-	
-	template <int N, class T> inline
-		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{
-		for(int i = 0; i < N; i++)
-			if(v1.v[i] != v2.v[i])
-				return false;
-			return true;
-	}
-	
-	template <int N, class T> inline
-		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ return !(v1 == v2); }
-	
-
-	typedef vec<3,unsigned char> vec3ub;
-	typedef vec<4,unsigned char> vec4ub;
-
-
-
-
-
-	namespace GLH_REAL_NAMESPACE
-	{
-	typedef GLH_REAL real;
-
-	class line;
-	class plane;
-	class matrix4;
-	class quaternion;
-	typedef quaternion rotation; 
-  
-	class vec2 : public vec<2,real>
-	{
-    public:
-		vec2(const real & t = real()) : vec<2,real>(t)
-		{}
-		vec2(const vec<2,real> & t) : vec<2,real>(t)
-		{}
-		vec2(const real * tp) : vec<2,real>(tp)
-		{}
-		
-		vec2(real x, real y )
-		{ v[0] = x; v[1] = y; }
-		
-		void get_value(real & x, real & y) const
-		{ x = v[0]; y = v[1]; }
-		
-		vec2 & set_value( const real & x, const real & y)
-		{ v[0] = x; v[1] = y; return *this; }
-		
-	};
-	
-	
-	class vec3 : public vec<3,real>
-	{
-    public:
-		vec3(const real & t = real()) : vec<3,real>(t)
-		{}
-		vec3(const vec<3,real> & t) : vec<3,real>(t)
-		{}
-		vec3(const real * tp) : vec<3,real>(tp)
-		{}
-		
-		vec3(real x, real y, real z)
-		{ v[0] = x; v[1] = y; v[2] = z; }
-		
-		void get_value(real & x, real & y, real & z) const
-		{ x = v[0]; y = v[1]; z = v[2]; }
-		
-		vec3 cross( const vec3 &rhs ) const
-		{
-			vec3 rt;
-			rt.v[0] = v[1]*rhs.v[2]-v[2]*rhs.v[1];
-			rt.v[1] = v[2]*rhs.v[0]-v[0]*rhs.v[2];
-			rt.v[2] = v[0]*rhs.v[1]-v[1]*rhs.v[0];	
-			return rt;
-		}
-		
-		vec3 & set_value( const real & x, const real & y, const real & z)
-		{ v[0] = x; v[1] = y; v[2] = z; return *this; }
-		
-	};
-
-  		
-    class vec4 : public vec<4,real>
-    {
-    public:
-        vec4(const real & t = real()) : vec<4,real>(t)
-        {}
-        vec4(const vec<4,real> & t) : vec<4,real>(t)
-        {}
-
-        vec4(const vec<3,real> & t, real fourth)
-
-        { v[0] = t.v[0]; v[1] = t.v[1]; v[2] = t.v[2]; v[3] = fourth; }
-        vec4(const real * tp) : vec<4,real>(tp)
-        {}
-        vec4(real x, real y, real z, real w)
-        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; }
-
-        void get_value(real & x, real & y, real & z, real & w) const
-        { x = v[0]; y = v[1]; z = v[2]; w = v[3]; }
-  
-        vec4 & set_value( const real & x, const real & y, const real & z, const real & w)
-        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; return *this; }
-    };
-
-    inline
-    vec3 homogenize(const vec4 & v)
-    {
-      vec3 rt;
-      assert(v.v[3] != GLH_ZERO);
-      rt.v[0] = v.v[0]/v.v[3];
-      rt.v[1] = v.v[1]/v.v[3];
-      rt.v[2] = v.v[2]/v.v[3];
-      return rt;
-    }
-  
-
-
-    class line
-    {
-    public:
-  
-        line()
-        { set_value(vec3(0,0,0),vec3(0,0,1)); }
-
-        line( const vec3 & p0, const vec3 &p1)
-        { set_value(p0,p1); }
-
-        void set_value( const vec3 &p0, const vec3 &p1)
-        {
-          position = p0;
-          direction = p1-p0;
-          direction.normalize();
-        }
-  
-        bool get_closest_points(const line &line2, 
-					          vec3 &pointOnThis,
-					          vec3 &pointOnThat)
-        {
-  
-          // quick check to see if parallel -- if so, quit.
-          if(fabs(direction.dot(line2.direction)) == 1.0)
-	          return 0;
-          line l2 = line2;
-  
-          // Algorithm: Brian Jean
-          // 
-          register real u;
-          register real v;
-          vec3 Vr = direction;
-          vec3 Vs = l2.direction;
-          register real Vr_Dot_Vs = Vr.dot(Vs);
-          register real detA = real(1.0 - (Vr_Dot_Vs * Vr_Dot_Vs));
-          vec3 C = l2.position - position;
-          register real C_Dot_Vr =  C.dot(Vr);
-          register real C_Dot_Vs =  C.dot(Vs);
-  
-          u = (C_Dot_Vr - Vr_Dot_Vs * C_Dot_Vs)/detA;
-          v = (C_Dot_Vr * Vr_Dot_Vs - C_Dot_Vs)/detA;
-  
-          pointOnThis = position;
-          pointOnThis += direction * u;
-          pointOnThat = l2.position;
-          pointOnThat += l2.direction * v;
-  
-          return 1;
-        }
-  
-        vec3 get_closest_point(const vec3 &point)
-        {
-          vec3 np = point - position;
-          vec3 rp = direction*direction.dot(np)+position;
-          return rp;
-        }
-  
-        const vec3 & get_position() const {return position;}
-
-        const vec3 & get_direction() const {return direction;}
-  
-    //protected:
-        vec3 position;
-        vec3 direction;
-    };
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-  // matrix
-
-  
-  class matrix4
-  {
-    
-  public:
-        
-    matrix4() { make_identity(); }
-    
-	matrix4( real r ) 
-	{ set_value(r); }
-
-	matrix4( real * m )
-	{ set_value(m); }
-    
-    matrix4( real a00, real a01, real a02, real a03,
-	       real a10, real a11, real a12, real a13,
-		   real a20, real a21, real a22, real a23,
-		   real a30, real a31, real a32, real a33 )
-	{
-		element(0,0) = a00;
-		element(0,1) = a01;
-		element(0,2) = a02;
-		element(0,3) = a03;
-		
-		element(1,0) = a10;
-		element(1,1) = a11;
-		element(1,2) = a12;
-		element(1,3) = a13;
-		
-		element(2,0) = a20;
-		element(2,1) = a21;
-		element(2,2) = a22;
-		element(2,3) = a23;
-		
-		element(3,0) = a30;
-		element(3,1) = a31;
-		element(3,2) = a32;
-		element(3,3) = a33;
-	}
-            
-    
-    void get_value( real * mp ) const
-	{
-		int c = 0;
-		for(int j=0; j < 4; j++)
-			for(int i=0; i < 4; i++)
-				mp[c++] = element(i,j);
-	}
-    
-    
-    const real * get_value() const
-	{ return m; }
-    
-	void set_value( real * mp)
-	{
-		int c = 0;
-		for(int j=0; j < 4; j++)
-			for(int i=0; i < 4; i++)
-				element(i,j) = mp[c++];
-	}
-    
-	void set_value( real r ) 
-	{
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				element(i,j) = r;
-	}
-    
-    void make_identity()
-	{
-		element(0,0) = 1.0;
-		element(0,1) = 0.0;
-		element(0,2) = 0.0; 
-		element(0,3) = 0.0;
-		
-		element(1,0) = 0.0;
-		element(1,1) = 1.0; 
-		element(1,2) = 0.0;
-		element(1,3) = 0.0;
-		
-		element(2,0) = 0.0;
-		element(2,1) = 0.0;
-		element(2,2) = 1.0;
-		element(2,3) = 0.0;
-		
-		element(3,0) = 0.0; 
-		element(3,1) = 0.0; 
-		element(3,2) = 0.0;
-		element(3,3) = 1.0;
-	}
-	
-	
-    static matrix4 identity()
-	{
-		static matrix4 mident (
-			1.0, 0.0, 0.0, 0.0,
-			0.0, 1.0, 0.0, 0.0,
-			0.0, 0.0, 1.0, 0.0,
-			0.0, 0.0, 0.0, 1.0  );
-		return mident;
-	}
-    
-        
-    void set_scale( real s )
-	{
-		element(0,0) = s;
-		element(1,1) = s;
-		element(2,2) = s;
-	}
-    
-    void set_scale( const vec3 & s )
-	{
-		element(0,0) = s.v[0];
-		element(1,1) = s.v[1];
-		element(2,2) = s.v[2];
-	}
-    
-    
-    void set_translate( const vec3 & t )
-	{
-		element(0,3) = t.v[0];
-		element(1,3) = t.v[1];
-		element(2,3) = t.v[2];
-	}
-    
-	void set_row(int r, const vec4 & t)
-	{
-		element(r,0) = t.v[0];
-		element(r,1) = t.v[1];
-		element(r,2) = t.v[2];
-		element(r,3) = t.v[3];
-	}
-
-	void set_column(int c, const vec4 & t)
-	{
-		element(0,c) = t.v[0];
-		element(1,c) = t.v[1];
-		element(2,c) = t.v[2];
-		element(3,c) = t.v[3];
-	}
-
-    
-	void get_row(int r, vec4 & t) const
-	{
-		t.v[0] = element(r,0);
-		t.v[1] = element(r,1);
-		t.v[2] = element(r,2);
-		t.v[3] = element(r,3);
-	}
-
-	vec4 get_row(int r) const
-	{
-		vec4 v; get_row(r, v);
-		return v;
-	}
-
-	void get_column(int c, vec4 & t) const
-	{
-		t.v[0] = element(0,c);
-		t.v[1] = element(1,c);
-		t.v[2] = element(2,c);
-		t.v[3] = element(3,c);
-	}
-
-	vec4 get_column(int c) const
-	{
-		vec4 v; get_column(c, v);
-		return v;
-	}
-
-    matrix4 inverse() const
-	{
-		matrix4 minv;
-		
-		real r1[8], r2[8], r3[8], r4[8];
-		real *s[4], *tmprow;
-		
-		s[0] = &r1[0];
-		s[1] = &r2[0];
-		s[2] = &r3[0];
-		s[3] = &r4[0];
-		
-		register int i,j,p,jj;
-		for(i=0;i<4;i++)
-		{
-			for(j=0;j<4;j++)
-			{
-				s[i][j] = element(i,j);
-				if(i==j) s[i][j+4] = 1.0;
-				else     s[i][j+4] = 0.0;
-			}
-		}
-		real scp[4];
-		for(i=0;i<4;i++)
-		{
-			scp[i] = real(fabs(s[i][0]));
-			for(j=1;j<4;j++)
-				if(real(fabs(s[i][j])) > scp[i]) scp[i] = real(fabs(s[i][j]));
-				if(scp[i] == 0.0) return minv; // singular matrix!
-		}
-		
-		int pivot_to;
-		real scp_max;
-		for(i=0;i<4;i++)
-		{
-			// select pivot row
-			pivot_to = i;
-			scp_max = real(fabs(s[i][i]/scp[i]));
-			// find out which row should be on top
-			for(p=i+1;p<4;p++)
-				if(real(fabs(s[p][i]/scp[p])) > scp_max)
-				{ scp_max = real(fabs(s[p][i]/scp[p])); pivot_to = p; }
-				// Pivot if necessary
-				if(pivot_to != i)
-				{
-					tmprow = s[i];
-					s[i] = s[pivot_to];
-					s[pivot_to] = tmprow;
-					real tmpscp;
-					tmpscp = scp[i];
-					scp[i] = scp[pivot_to];
-					scp[pivot_to] = tmpscp;
-				}
-				
-				real mji;
-				// perform gaussian elimination
-				for(j=i+1;j<4;j++)
-				{
-					mji = s[j][i]/s[i][i];
-					s[j][i] = 0.0;
-					for(jj=i+1;jj<8;jj++)
-						s[j][jj] -= mji*s[i][jj];
-				}
-		}
-		if(s[3][3] == 0.0) return minv; // singular matrix!
-		
-		//
-		// Now we have an upper triangular matrix.
-		//
-		//  x x x x | y y y y
-		//  0 x x x | y y y y 
-		//  0 0 x x | y y y y
-		//  0 0 0 x | y y y y
-		//
-		//  we'll back substitute to get the inverse
-		//
-		//  1 0 0 0 | z z z z
-		//  0 1 0 0 | z z z z
-		//  0 0 1 0 | z z z z
-		//  0 0 0 1 | z z z z 
-		//
-		
-		real mij;
-		for(i=3;i>0;i--)
-		{
-			for(j=i-1;j > -1; j--)
-			{
-				mij = s[j][i]/s[i][i];
-				for(jj=j+1;jj<8;jj++)
-					s[j][jj] -= mij*s[i][jj];
-			}
-		}
-		
-		for(i=0;i<4;i++)
-			for(j=0;j<4;j++)
-				minv(i,j) = s[i][j+4] / s[i][i];
-			
-			return minv;
-	}
-    
-    
-    matrix4 transpose() const
-	{
-		matrix4 mtrans;
-		
-		for(int i=0;i<4;i++)
-			for(int j=0;j<4;j++)
-				mtrans(i,j) = element(j,i);		
-		return mtrans;
-	}
-    
-    matrix4 & mult_right( const matrix4 & b )
-	{
-		matrix4 mt(*this);
-		set_value(real(0));
-
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				for(int c=0; c < 4; c++)
-					element(i,j) += mt(i,c) * b(c,j);
-		return *this;
-	}    
-
-    matrix4 & mult_left( const matrix4 & b )
-	{
-		matrix4 mt(*this);
-		set_value(real(0));
-
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				for(int c=0; c < 4; c++)
-					element(i,j) += b(i,c) * mt(c,j);
-		return *this;
-	}
-	
-	// dst = M * src
-    void mult_matrix_vec( const vec3 &src, vec3 &dst ) const
-	{
-		real w = (
-			src.v[0] * element(3,0) +
-			src.v[1] * element(3,1) + 
-			src.v[2] * element(3,2) +
-			element(3,3)          );
-        
-        assert(w != GLH_ZERO);
-
-        dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) +
-			element(0,3)          ) / w;
-		dst.v[1]  = (
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) +
-			element(1,3)          ) / w;
-		dst.v[2]  = (
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) +
-			element(2,3)          ) / w;
-	}
-    
-	void mult_matrix_vec( vec3 & src_and_dst) const
-	{ mult_matrix_vec(vec3(src_and_dst), src_and_dst); }
-
-
-    // dst = src * M
-    void mult_vec_matrix( const vec3 &src, vec3 &dst ) const
-	{
-		real w = (
-			src.v[0] * element(0,3) +
-			src.v[1] * element(1,3) +
-			src.v[2] * element(2,3) +
-			element(3,3)          );
-        
-        assert(w != GLH_ZERO);
-
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) + 
-			src.v[2] * element(2,0) + 
-			element(3,0)          ) / w;
-		dst.v[1]  = (
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) +
-			element(3,1)          ) / w;
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) +
-			src.v[2] * element(2,2) +
-			element(3,2)          ) / w;
-	}
-        
-
-	void mult_vec_matrix( vec3 & src_and_dst) const
-	{ mult_vec_matrix(vec3(src_and_dst), src_and_dst); }
-
-	// dst = M * src
-    void mult_matrix_vec( const vec4 &src, vec4 &dst ) const
-	{
-        dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) +
-			src.v[3] * element(0,3));
-		dst.v[1]  = (
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) +
-			src.v[3] * element(1,3));
-		dst.v[2]  = (
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) +
-			src.v[3] * element(2,3));
-		dst.v[3] = (
-			src.v[0] * element(3,0) +
-			src.v[1] * element(3,1) + 
-			src.v[2] * element(3,2) +
-			src.v[3] * element(3,3));
-	}
-    
-	void mult_matrix_vec( vec4 & src_and_dst) const
-	{ mult_matrix_vec(vec4(src_and_dst), src_and_dst); }
-
-
-    // dst = src * M
-    void mult_vec_matrix( const vec4 &src, vec4 &dst ) const
-	{
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) + 
-			src.v[2] * element(2,0) + 
-			src.v[3] * element(3,0));
-		dst.v[1]  = (
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) +
-			src.v[3] * element(3,1));
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) +
-			src.v[2] * element(2,2) +
-			src.v[3] * element(3,2));
-		dst.v[3] = (
-			src.v[0] * element(0,3) +
-			src.v[1] * element(1,3) +
-			src.v[2] * element(2,3) +
-			src.v[3] * element(3,3));
-	}
-        
-
-	void mult_vec_matrix( vec4 & src_and_dst) const
-	{ mult_vec_matrix(vec4(src_and_dst), src_and_dst); }
-
-    
-    // dst = M * src
-    void mult_matrix_dir( const vec3 &src, vec3 &dst ) const
-	{
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) ) ;
-		dst.v[1]  = ( 
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) ) ;
-		dst.v[2]  = ( 
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) ) ;
-	}
-        
-
-	void mult_matrix_dir( vec3 & src_and_dst) const
-	{ mult_matrix_dir(vec3(src_and_dst), src_and_dst); }
-
-
-	// dst = src * M
-    void mult_dir_matrix( const vec3 &src, vec3 &dst ) const
-	{
-		dst.v[0]  = ( 
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) +
-			src.v[2] * element(2,0) ) ;
-		dst.v[1]  = ( 
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) ) ;
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) + 
-			src.v[2] * element(2,2) ) ;
-	}
-    
-    
-	void mult_dir_matrix( vec3 & src_and_dst) const
-	{ mult_dir_matrix(vec3(src_and_dst), src_and_dst); }
-
-
-    real & operator () (int row, int col)
-    { return element(row,col); }
-
-    const real & operator () (int row, int col) const
-    { return element(row,col); }
-
-	real & element (int row, int col)
-    { return m[row | (col<<2)]; }
-
-    const real & element (int row, int col) const
-    { return m[row | (col<<2)]; }
-
-    matrix4 & operator *= ( const matrix4 & mat )
-	{
-		mult_right( mat );
-		return *this;
-	}
-    
-    matrix4 & operator *= ( const real & r )
-	{
-		for (int i = 0; i < 4; ++i)
-        {
-            element(0,i) *= r;
-            element(1,i) *= r;
-            element(2,i) *= r;
-            element(3,i) *= r;
-        }
-		return *this;
-	}
-
-    matrix4 & operator += ( const matrix4 & mat )
-	{
-		for (int i = 0; i < 4; ++i)
-        {
-            element(0,i) += mat.element(0,i);
-            element(1,i) += mat.element(1,i);
-            element(2,i) += mat.element(2,i);
-            element(3,i) += mat.element(3,i);
-        }
-		return *this;
-	}
-
-    friend matrix4 operator * ( const matrix4 & m1,	const matrix4 & m2 );
-    friend bool operator == ( const matrix4 & m1, const matrix4 & m2 );
-    friend bool operator != ( const matrix4 & m1, const matrix4 & m2 );
-    
-  //protected:
-	  real m[16];
-  };
-  
-  inline  
-  matrix4 operator * ( const matrix4 & m1, const matrix4 & m2 )
-  {
-	  matrix4 product;
-	  
-	  product = m1;
-	  product.mult_right(m2);
-	  
-	  return product;
-  }
-  
-  inline
-  bool operator ==( const matrix4 &m1, const matrix4 &m2 )
-  {
-	  return ( 
-		  m1(0,0) == m2(0,0) &&
-		  m1(0,1) == m2(0,1) &&
-		  m1(0,2) == m2(0,2) &&
-		  m1(0,3) == m2(0,3) &&
-		  m1(1,0) == m2(1,0) &&
-		  m1(1,1) == m2(1,1) &&
-		  m1(1,2) == m2(1,2) &&
-		  m1(1,3) == m2(1,3) &&
-		  m1(2,0) == m2(2,0) &&
-		  m1(2,1) == m2(2,1) &&
-		  m1(2,2) == m2(2,2) &&
-		  m1(2,3) == m2(2,3) &&
-		  m1(3,0) == m2(3,0) &&
-		  m1(3,1) == m2(3,1) &&
-		  m1(3,2) == m2(3,2) &&
-		  m1(3,3) == m2(3,3) );
-  }
-  
-  inline
-  bool operator != ( const matrix4 & m1, const matrix4 & m2 )
-  { return !( m1 == m2 ); }  
-
-
-
-
-
-
-
-
-
-
-
-
-  
-    class quaternion
-    {
-    public:
-    
-    quaternion()
-    {
-        *this = identity();
-    }
-
-    quaternion( const real v[4] )
-    {
-        set_value( v );
-    }
-
-
-    quaternion( real q0, real q1, real q2, real q3 )
-    {
-        set_value( q0, q1, q2, q3 );
-    }
-
-
-    quaternion( const matrix4 & m )
-    {
-        set_value( m );
-    }
-
-
-    quaternion( const vec3 &axis, real radians )
-    {
-        set_value( axis, radians );
-    }
-
-
-    quaternion( const vec3 &rotateFrom, const vec3 &rotateTo )
-    {
-        set_value( rotateFrom, rotateTo );
-    }
-
-    quaternion( const vec3 & from_look, const vec3 & from_up,
-		      const vec3 & to_look, const vec3& to_up)
-    {
-	    set_value(from_look, from_up, to_look, to_up);
-    }
-
-    const real * get_value() const
-    {
-        return  &q[0];
-    }
-
-    void get_value( real &q0, real &q1, real &q2, real &q3 ) const
-    {
-        q0 = q[0];
-        q1 = q[1];
-        q2 = q[2];
-        q3 = q[3];
-    }
-
-    quaternion & set_value( real q0, real q1, real q2, real q3 )
-    {
-        q[0] = q0;
-        q[1] = q1;
-        q[2] = q2;
-        q[3] = q3;
-        counter = 0;
-        return *this;
-    }
-
-    void get_value( vec3 &axis, real &radians ) const
-    {
-        radians = real(acos( q[3] ) * GLH_TWO);
-        if ( radians == GLH_ZERO )
-            axis = vec3( 0.0, 0.0, 1.0 );
-        else
-        {
-            axis.v[0] = q[0];
-            axis.v[1] = q[1];
-            axis.v[2] = q[2];
-            axis.normalize();
-        }
-    }
-
-    void get_value( matrix4 & m ) const
-    {
-        real s, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;
-
-        real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
-
-        s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
-
-        xs = q[0] * s;
-        ys = q[1] * s;
-        zs = q[2] * s;
-
-        wx = q[3] * xs;
-        wy = q[3] * ys;
-        wz = q[3] * zs;
-
-        xx = q[0] * xs;
-        xy = q[0] * ys;
-        xz = q[0] * zs;
-
-        yy = q[1] * ys;
-        yz = q[1] * zs;
-        zz = q[2] * zs;
-
-        m(0,0) = real( GLH_ONE - ( yy + zz ));
-        m(1,0) = real ( xy + wz );
-        m(2,0) = real ( xz - wy );
-
-        m(0,1) = real ( xy - wz );
-        m(1,1) = real ( GLH_ONE - ( xx + zz ));
-        m(2,1) = real ( yz + wx );
-
-        m(0,2) = real ( xz + wy );
-        m(1,2) = real ( yz - wx );
-        m(2,2) = real ( GLH_ONE - ( xx + yy ));
-
-        m(3,0) = m(3,1) = m(3,2) = m(0,3) = m(1,3) = m(2,3) = GLH_ZERO;
-        m(3,3) = GLH_ONE;
-    }
-
-    quaternion & set_value( const real * qp )
-    {
-        memcpy(q,qp,sizeof(real) * 4);
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const matrix4 & m )
-    {
-        real tr, s;
-        int i, j, k;
-        const int nxt[3] = { 1, 2, 0 };
-
-        tr = m(0,0) + m(1,1) + m(2,2);
-
-        if ( tr > GLH_ZERO )
-        {
-            s = real(sqrt( tr + m(3,3) ));
-            q[3] = real ( s * 0.5 );
-            s = real(0.5) / s;
-
-            q[0] = real ( ( m(1,2) - m(2,1) ) * s );
-            q[1] = real ( ( m(2,0) - m(0,2) ) * s );
-            q[2] = real ( ( m(0,1) - m(1,0) ) * s );
-        }
-        else
-        {
-            i = 0;
-            if ( m(1,1) > m(0,0) )
-              i = 1;
-
-            if ( m(2,2) > m(i,i) )
-              i = 2;
-
-            j = nxt[i];
-            k = nxt[j];
-
-            s = real(sqrt( ( m(i,j) - ( m(j,j) + m(k,k) )) + GLH_ONE ));
-
-            q[i] = real ( s * 0.5 );
-            s = real(0.5 / s);
-
-            q[3] = real ( ( m(j,k) - m(k,j) ) * s );
-            q[j] = real ( ( m(i,j) + m(j,i) ) * s );
-            q[k] = real ( ( m(i,k) + m(k,i) ) * s );
-        }
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 &axis, real theta )
-    {
-        real sqnorm = axis.square_norm();
-
-        if (sqnorm <= GLH_EPSILON)
-        {
-            // axis too small.
-            x = y = z = 0.0;
-            w = 1.0;
-        } 
-        else 
-        {
-            theta *= real(0.5);
-            real sin_theta = real(sin(theta));
-
-            if (!equivalent(sqnorm,GLH_ONE)) 
-              sin_theta /= real(sqrt(sqnorm));
-            x = sin_theta * axis.v[0];
-            y = sin_theta * axis.v[1];
-            z = sin_theta * axis.v[2];
-            w = real(cos(theta));
-        }
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 & rotateFrom, const vec3 & rotateTo )
-    {
-        vec3 p1, p2;
-        real alpha;
-
-        p1 = rotateFrom; 
-        p1.normalize();
-        p2 = rotateTo;  
-        p2.normalize();
-
-        alpha = p1.dot(p2);
-
-        if(equivalent(alpha,GLH_ONE))
-        { 
-            *this = identity(); 
-            return *this; 
-        }
-
-        // ensures that the anti-parallel case leads to a positive dot
-        if(equivalent(alpha,-GLH_ONE))
-        {
-            vec3 v;
-
-            if(p1.v[0] != p1.v[1] || p1.v[0] != p1.v[2])
-    	        v = vec3(p1.v[1], p1.v[2], p1.v[0]);
-            else
-    	        v = vec3(-p1.v[0], p1.v[1], p1.v[2]);
-
-            v -= p1 * p1.dot(v);
-            v.normalize();
-
-            set_value(v, GLH_PI);
-            return *this;
-        }
-
-        p1 = p1.cross(p2);  
-        p1.normalize();
-        set_value(p1,real(acos(alpha)));
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 & from_look, const vec3 & from_up,
-		      const vec3 & to_look, const vec3 & to_up)
-    {
-	    quaternion r_look = quaternion(from_look, to_look);
-	    
-	    vec3 rotated_from_up(from_up);
-	    r_look.mult_vec(rotated_from_up);
-	    
-	    quaternion r_twist = quaternion(rotated_from_up, to_up);
-	    
-	    *this = r_twist;
-	    *this *= r_look;
-	    return *this;
-    }
-
-    quaternion & operator *= ( const quaternion & qr )
-    {
-        quaternion ql(*this);
-   
-        w = ql.w * qr.w - ql.x * qr.x - ql.y * qr.y - ql.z * qr.z;
-        x = ql.w * qr.x + ql.x * qr.w + ql.y * qr.z - ql.z * qr.y;
-        y = ql.w * qr.y + ql.y * qr.w + ql.z * qr.x - ql.x * qr.z;
-        z = ql.w * qr.z + ql.z * qr.w + ql.x * qr.y - ql.y * qr.x;
-
-        counter += qr.counter;
-        counter++;
-        counter_normalize();
-        return *this;
-    }
-
-    void normalize()
-    {
-        real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
-        if (equivalent(rnorm, GLH_ZERO))
-            return;
-        x *= rnorm;
-        y *= rnorm;
-        z *= rnorm;
-        w *= rnorm;
-        counter = 0;
-    }
-
-    friend bool operator == ( const quaternion & q1, const quaternion & q2 );      
-
-    friend bool operator != ( const quaternion & q1, const quaternion & q2 );
-
-    friend quaternion operator * ( const quaternion & q1, const quaternion & q2 );
-
-    bool equals( const quaternion & r, real tolerance ) const
-    {
-        real t;
-
-        t = (
-			(q[0]-r.q[0])*(q[0]-r.q[0]) +
-            (q[1]-r.q[1])*(q[1]-r.q[1]) +
-            (q[2]-r.q[2])*(q[2]-r.q[2]) +
-            (q[3]-r.q[3])*(q[3]-r.q[3]) );
-        if(t > GLH_EPSILON) 
-            return false;
-        return 1;
-    }
-
-    quaternion & conjugate()
-    {
-        q[0] *= -GLH_ONE;
-        q[1] *= -GLH_ONE;
-        q[2] *= -GLH_ONE;
-        return *this;
-    }
-
-    quaternion & invert()
-    {
-        return conjugate();
-    }
-
-    quaternion inverse() const
-    {
-        quaternion r = *this;
-        return r.invert();
-    }
-
-    //
-    // Quaternion multiplication with cartesian vector
-    // v' = q*v*q(star)
-    //
-    void mult_vec( const vec3 &src, vec3 &dst ) const
-    {
-        real v_coef = w * w - x * x - y * y - z * z;                     
-        real u_coef = GLH_TWO * (src.v[0] * x + src.v[1] * y + src.v[2] * z);  
-        real c_coef = GLH_TWO * w;                                       
-
-        dst.v[0] = v_coef * src.v[0] + u_coef * x + c_coef * (y * src.v[2] - z * src.v[1]);
-        dst.v[1] = v_coef * src.v[1] + u_coef * y + c_coef * (z * src.v[0] - x * src.v[2]);
-        dst.v[2] = v_coef * src.v[2] + u_coef * z + c_coef * (x * src.v[1] - y * src.v[0]);
-    }
-
-    void mult_vec( vec3 & src_and_dst) const
-    {
-        mult_vec(vec3(src_and_dst), src_and_dst);
-    }
-
-    void scale_angle( real scaleFactor )
-    {
-        vec3 axis;
-        real radians;
-
-        get_value(axis, radians);
-        radians *= scaleFactor;
-        set_value(axis, radians);
-    }
-
-    static quaternion slerp( const quaternion & p, const quaternion & q, real alpha )
-    {
-        quaternion r;
-
-        real cos_omega = p.x * q.x + p.y * q.y + p.z * q.z + p.w * q.w;
-        // if B is on opposite hemisphere from A, use -B instead
-      
-        int bflip;
-        if ( ( bflip = (cos_omega < GLH_ZERO)) )
-            cos_omega = -cos_omega;
-
-        // complementary interpolation parameter
-        real beta = GLH_ONE - alpha;     
-
-        if(cos_omega <= GLH_ONE - GLH_EPSILON)
-            return p;
-
-        real omega = real(acos(cos_omega));
-        real one_over_sin_omega = GLH_ONE / real(sin(omega));
-
-        beta    = real(sin(omega*beta)  * one_over_sin_omega);
-        alpha   = real(sin(omega*alpha) * one_over_sin_omega);
-
-        if (bflip)
-            alpha = -alpha;
-
-        r.x = beta * p.q[0]+ alpha * q.q[0];
-        r.y = beta * p.q[1]+ alpha * q.q[1];
-        r.z = beta * p.q[2]+ alpha * q.q[2];
-        r.w = beta * p.q[3]+ alpha * q.q[3];
-        return r;
-    }
-
-    static quaternion identity()
-    {
-        static quaternion ident( vec3( 0.0, 0.0, 0.0 ), GLH_ONE );
-        return ident;
-    }
-
-    real & operator []( int i )
-    {
-        assert(i < 4);
-        return q[i];
-    }
-
-    const real & operator []( int i ) const
-    {
-        assert(i < 4);
-        return q[i];
-    }
-
-    protected:
-
-        void counter_normalize()
-        {
-            if (counter > GLH_QUATERNION_NORMALIZATION_THRESHOLD)
-                normalize();
-        }
-
-        union 
-        {
-            struct 
-            {
-                real q[4];
-            };
-            struct 
-            {
-                real x;
-                real y;
-                real z;
-                real w;
-            };
-        };
-
-        // renormalization counter
-        unsigned char counter;
-    };
-
-    inline
-    bool operator == ( const quaternion & q1, const quaternion & q2 )
-    {
-        return (equivalent(q1.x, q2.x) &&
-		        equivalent(q1.y, q2.y) &&
-		        equivalent(q1.z, q2.z) &&
-		        equivalent(q1.w, q2.w) );
-    }
-
-    inline
-    bool operator != ( const quaternion & q1, const quaternion & q2 )
-    { 
-        return ! ( q1 == q2 ); 
-    }
-
-    inline
-    quaternion operator * ( const quaternion & q1, const quaternion & q2 )
-    {	
-        quaternion r(q1); 
-        r *= q2; 
-        return r; 
-    }
-  
-      
-    
-
-
-
-
-
-  
-  
-  class plane
-  {
-  public:
-	  
-	  plane()
-      {
-		  planedistance = 0.0;
-		  planenormal.set_value( 0.0, 0.0, 1.0 );
-      }
-	  
-	  
-	  plane( const vec3 &p0, const vec3 &p1, const vec3 &p2 )
-      {
-		  vec3 v0 = p1 - p0;
-		  vec3 v1 = p2 - p0;
-		  planenormal = v0.cross(v1);  
-		  planenormal.normalize();
-		  planedistance = p0.dot(planenormal);
-      }
-	  
-	  plane( const vec3 &normal, real distance )
-      {
-		  planedistance = distance;
-		  planenormal = normal;
-		  planenormal.normalize();
-      }
-	  
-	  plane( const vec3 &normal, const vec3 &point )
-      {
-		  planenormal = normal;
-		  planenormal.normalize();
-		  planedistance = point.dot(planenormal);
-      }
-	  
-	  void offset( real d )
-      {
-		  planedistance += d;
-      }
-	  
-	  bool intersect( const line &l, vec3 &intersection ) const
-      {
-		  vec3 pos, dir;
-		  vec3 pn = planenormal;
-		  real pd = planedistance;
-		  
-		  pos = l.get_position();
-		  dir = l.get_direction();
-		  
-		  if(dir.dot(pn) == 0.0) return 0;
-		  pos -= pn*pd;
-		  // now we're talking about a plane passing through the origin
-		  if(pos.dot(pn) < 0.0) pn.negate();
-		  if(dir.dot(pn) > 0.0) dir.negate();
-		  vec3 ppos = pn * pos.dot(pn);
-		  pos = (ppos.length()/dir.dot(-pn))*dir;
-		  intersection = l.get_position();
-		  intersection += pos;
-		  return 1;
-      }
-	  void transform( const matrix4 &matrix )
-      {
-		  matrix4 invtr = matrix.inverse();
-		  invtr = invtr.transpose();
-		  
-		  vec3 pntOnplane = planenormal * planedistance;
-		  vec3 newPntOnplane;
-		  vec3 newnormal;
-		  
-		  invtr.mult_dir_matrix(planenormal, newnormal);
-		  matrix.mult_vec_matrix(pntOnplane, newPntOnplane);
-		  
-		  newnormal.normalize();
-		  planenormal = newnormal;
-		  planedistance = newPntOnplane.dot(planenormal);
-      }
-	  
-	  bool is_in_half_space( const vec3 &point ) const
-      {
-		  
-		  if(( point.dot(planenormal) - planedistance) < 0.0)
-			  return 0;
-		  return 1;
-      }
-	  
-	  
-	  real distance( const vec3 & point ) const 
-      {
-		  return planenormal.dot(point - planenormal*planedistance);
-      }
-	  
-	  const vec3 &get_normal() const
-      {
-		  return planenormal;
-      }
-	  
-	  
-	  real get_distance_from_origin() const
-      {
-		  return planedistance;
-      }
-	  
-	  
-	  friend bool operator == ( const plane & p1, const plane & p2 );
-	  
-	  
-	  friend bool operator != ( const plane & p1, const plane & p2 );
-	  
-  //protected:
-	  vec3 planenormal;
-	  real planedistance;
-  };
-  
-  inline
-  bool operator == (const plane & p1, const plane & p2 )
-  {
-	  return (  p1.planedistance == p2.planedistance && p1.planenormal == p2.planenormal);
-  }
-  
-  inline
-  bool operator != ( const plane & p1, const plane & p2 )
-  { return  ! (p1 == p2); }
-  
-  
-
-  } // "ns_##GLH_REAL"
-
-  // make common typedefs...
-#ifdef GLH_REAL_IS_FLOAT
-  typedef GLH_REAL_NAMESPACE::vec2 vec2f;
-  typedef GLH_REAL_NAMESPACE::vec3 vec3f;
-  typedef GLH_REAL_NAMESPACE::vec4 vec4f;
-  typedef GLH_REAL_NAMESPACE::quaternion quaternionf;
-  typedef GLH_REAL_NAMESPACE::quaternion rotationf;
-  typedef GLH_REAL_NAMESPACE::line linef;
-  typedef GLH_REAL_NAMESPACE::plane planef;
-  typedef GLH_REAL_NAMESPACE::matrix4 matrix4f;
-#endif
-
-  
-
-
-}  // namespace glh
-
-
-
-#endif
-
diff --git a/linden/libraries/include/llmozlib2.h b/linden/libraries/include/llmozlib2.h
deleted file mode 100644
index d85caf9..0000000
--- a/linden/libraries/include/llmozlib2.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (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.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Linden Lab Inc. (http://lindenlab.com) code.
- *
- * The Initial Developer of the Original Code is:
- *   Callum Prentice (callum@ubrowser.com)
- *
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Callum Prentice (callum@ubrowser.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef LLMOZLIB_H
-#define LLMOZLIB_H
-
-#include <string>
-#include <map>
-
-class LLEmbeddedBrowser;
-class LLEmbeddedBrowserWindow;
-
-////////////////////////////////////////////////////////////////////////////////
-// data class that is passed with an event
-class LLEmbeddedBrowserWindowEvent
-{
-	public:
-		LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn ) :
-			mEventWindowId( eventWindowIdIn ),
-			mEventUri( uriIn )
-		{
-		};
-
-		// single int passed with the event - e.g. progress
-		LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn, int intValIn ) :
-			mEventWindowId( eventWindowIdIn ),
-			mEventUri( uriIn ),
-			mIntVal( intValIn )
-		{
-		};
-
-		// string passed with the event
-		LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn, std::string stringValIn ) :
-			mEventWindowId( eventWindowIdIn ),
-			mEventUri( uriIn ),
-			mStringVal( stringValIn )
-		{
-		};
-
-		// 2 strings passed with the event
-		LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn, std::string stringValIn, std::string stringVal2In ) :
-			mEventWindowId( eventWindowIdIn ),
-			mEventUri( uriIn ),
-			mStringVal( stringValIn ),
-			mStringVal2( stringVal2In )
-		{
-		};
-
-		// string and an int passed with the event
-		LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn, std::string stringValIn, int intValIn ) :
-			mEventWindowId( eventWindowIdIn ),
-			mEventUri( uriIn ),
-			mStringVal( stringValIn ),
-			mIntVal( intValIn )
-		{
-		};
-
-		// 4 ints passed (semantically as a rectangle but could be anything - didn't want to make a RECT type structure)
-		LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn, int xIn, int yIn, int widthIn, int heightIn ) :
-			mEventWindowId( eventWindowIdIn ),
-			mEventUri( uriIn ),
-			mXVal( xIn ),
-			mYVal( yIn ),
-			mWidthVal( widthIn ),
-			mHeightVal( heightIn )
-		{
-		};
-
-		virtual ~LLEmbeddedBrowserWindowEvent()
-		{
-		};
-
-		int getEventWindowId() const
-		{
-			return mEventWindowId;
-		};
-
-		std::string getEventUri() const
-		{
-			return mEventUri;
-		};
-
-		int getIntValue() const
-		{
-			return mIntVal;
-		};
-
-		std::string getStringValue() const
-		{
-			return mStringVal;
-		};
-
-		std::string getStringValue2() const
-		{
-			return mStringVal2;
-		};
-
-		void getRectValue( int& xOut, int& yOut, int& widthOut, int& heightOut ) const
-		{
-			xOut = mXVal;
-			yOut = mYVal;
-			widthOut = mWidthVal;
-			heightOut = mHeightVal;
-		};
-
-	private:
-		int mEventWindowId;
-		std::string mEventUri;
-		int mIntVal;
-		std::string mStringVal;
-		std::string mStringVal2;
-		int mXVal;
-		int mYVal;
-		int mWidthVal;
-		int mHeightVal;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// derrive from this class and override these methods to observe these events
-class LLEmbeddedBrowserWindowObserver
-{
-	public:
-		virtual ~LLEmbeddedBrowserWindowObserver() { };
-		typedef LLEmbeddedBrowserWindowEvent EventType;
-
-		virtual void onPageChanged( const EventType& eventIn ) { };
-		virtual void onNavigateBegin( const EventType& eventIn ) { };
-		virtual void onNavigateComplete( const EventType& eventIn ) { };
-		virtual void onUpdateProgress( const EventType& eventIn ) { };
-		virtual void onStatusTextChange( const EventType& eventIn ) { };
-		virtual void onLocationChange( const EventType& eventIn ) { };
-		virtual void onClickLinkHref( const EventType& eventIn ) { };
-		virtual void onClickLinkNoFollow( const EventType& eventIn ) { };
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// main library class
-class LLMozLib
-{
-	public:
-		virtual ~LLMozLib();
-
-		// singleton access
-		static LLMozLib* getInstance();
-
-		// housekeeping
-		bool init( std::string applicationDir, std::string componentDir, std::string profileDir, void* nativeWindowHandleIn );
-		bool reset();
-		bool clearCache();
-		int getLastError();
-		const std::string getVersion();
-		void setBrowserAgentId( std::string idIn );
-		bool enableProxy( bool proxyEnabledIn, std::string proxyHostNameIn, int proxyPortIn );
-		bool enableCookies( bool enabledIn );
-		bool clearAllCookies();
-		bool enablePlugins( bool enabledIn );
-
-		// browser window - creation/deletion, mutation etc.
-		int createBrowserWindow( int browserWindowWidthIn, int browserWindowHeightIn );
-		bool destroyBrowserWindow( int browserWindowIdIn );
-		bool setSize( int browserWindowIdIn, int widthIn, int heightIn );
-		bool scrollByLines( int browserWindowIdIn, int linesIn );
-		bool setBackgroundColor( int browserWindowIdIn, const int redIn, const int greenIn, const int blueIn );
-		bool setCaretColor( int browserWindowIdIn, const int redIn, const int greenIn, const int blueIn );
-		bool setEnabled( int browserWindowIdIn, bool enabledIn );
-
-		// add/remove yourself as an observer on browser events - see LLEmbeddedBrowserWindowObserver declaration
-		bool addObserver( int browserWindowIdIn, LLEmbeddedBrowserWindowObserver* subjectIn );
-		bool remObserver( int browserWindowIdIn, LLEmbeddedBrowserWindowObserver* subjectIn );
-
-		// navigation - self explanatory
-		bool navigateTo( int browserWindowIdIn, const std::string uriIn );
-		bool navigateStop( int browserWindowIdIn );
-		bool canNavigateBack( int browserWindowIdIn );
-		bool navigateBack( int browserWindowIdIn );
-		bool canNavigateForward( int browserWindowIdIn );
-		bool navigateForward( int browserWindowIdIn );
-
-		// javascript access/control
-		std::string evaluateJavascript( int browserWindowIdIn, const std::string scriptIn );
-
-		// set/clear URL to redirect to when a 404 page is reached
-		bool set404RedirectUrl( int browser_window_in, std::string redirect_url );
-		bool clr404RedirectUrl( int browser_window_in );
-
-		// access to rendered bitmap data
-		const unsigned char* grabBrowserWindow( int browserWindowIdIn );		// renders page to memory and returns pixels
-		const unsigned char* getBrowserWindowPixels( int browserWindowIdIn );	// just returns pixels - no render
-		const bool flipWindow( int browserWindowIdIn, bool flipIn );			// optionally flip window (pixels) you get back
-		const int getBrowserWidth( int browserWindowIdIn );						// current browser width (can vary slightly after page is rendered)
-		const int getBrowserHeight( int browserWindowIdIn );					// current height
-		const int getBrowserDepth( int browserWindowIdIn );						// depth in bytes
-		const int getBrowserRowSpan( int browserWindowIdIn );					// width in pixels * depth in bytes
-
-		// mouse/keyboard interaction
-		bool mouseDown( int browserWindowIdIn, int xPosIn, int yPosIn );			// send a mouse down event to a browser window at given XY in browser space
-		bool mouseUp( int browserWindowIdIn, int xPosIn, int yPosIn );				// send a mouse up event to a browser window at given XY in browser space
-		bool mouseMove( int browserWindowIdIn, int xPosIn, int yPosIn );			// send a mouse move event to a browser window at given XY in browser space
-		bool mouseLeftDoubleClick( int browserWindowIdIn, int xPosIn, int yPosIn );	// send a mouse left button double click to a browser window at given XY in browser space
-		bool keyPress( int browserWindowIdIn, int keyCodeIn );						// send a key press event to a browser window
-		bool unicodeInput ( int browserWindowIdIn, unsigned long uni_char );		// send a unicode keypress event to a browser window
-		bool focusBrowser( int browserWindowIdIn, bool focusBrowserIn );			// set/remove focus to given browser window
-
-		// accessor/mutator for scheme that browser doesn't follow - e.g. secondlife.com://
-		void setNoFollowScheme( int browserWindowIdIn, std::string schemeIn );
-		std::string getNoFollowScheme( int browserWindowIdIn );
-
-	private:
-		LLMozLib();
-		LLEmbeddedBrowserWindow* getBrowserWindowFromWindowId( int browserWindowIdIn );
-		static LLMozLib* sInstance;
-		const int mMaxBrowserWindows;
-		typedef std::map< int, LLEmbeddedBrowserWindow* > BrowserWindowMap;
-		typedef std::map< int, LLEmbeddedBrowserWindow* >::iterator BrowserWindowMapIter;
-		BrowserWindowMap mBrowserWindowMap;
-};
-
-// Mozilla virtual keycodes.
-// We don't want to suck in Mozilla headers so we copy these consts
-// from nsIDOMKeyEvent.idl.
-
-const unsigned long LL_DOM_VK_CANCEL         = 0x03;
-const unsigned long LL_DOM_VK_HELP           = 0x06;
-const unsigned long LL_DOM_VK_BACK_SPACE     = 0x08;
-const unsigned long LL_DOM_VK_TAB            = 0x09;
-const unsigned long LL_DOM_VK_CLEAR          = 0x0C;
-const unsigned long LL_DOM_VK_RETURN         = 0x0D;
-const unsigned long LL_DOM_VK_ENTER          = 0x0E;
-const unsigned long LL_DOM_VK_SHIFT          = 0x10;
-const unsigned long LL_DOM_VK_CONTROL        = 0x11;
-const unsigned long LL_DOM_VK_ALT            = 0x12;
-const unsigned long LL_DOM_VK_PAUSE          = 0x13;
-const unsigned long LL_DOM_VK_CAPS_LOCK      = 0x14;
-const unsigned long LL_DOM_VK_ESCAPE         = 0x1B;
-const unsigned long LL_DOM_VK_SPACE          = 0x20;
-const unsigned long LL_DOM_VK_PAGE_UP        = 0x21;
-const unsigned long LL_DOM_VK_PAGE_DOWN      = 0x22;
-const unsigned long LL_DOM_VK_END            = 0x23;
-const unsigned long LL_DOM_VK_HOME           = 0x24;
-const unsigned long LL_DOM_VK_LEFT           = 0x25;
-const unsigned long LL_DOM_VK_UP             = 0x26;
-const unsigned long LL_DOM_VK_RIGHT          = 0x27;
-const unsigned long LL_DOM_VK_DOWN           = 0x28;
-const unsigned long LL_DOM_VK_PRINTSCREEN    = 0x2C;
-const unsigned long LL_DOM_VK_INSERT         = 0x2D;
-const unsigned long LL_DOM_VK_DELETE         = 0x2E;
-
-// LL_DOM_VK_0 - LL_DOM_VK_9 match their ASCII values
-const unsigned long LL_DOM_VK_0              = 0x30;
-const unsigned long LL_DOM_VK_1              = 0x31;
-const unsigned long LL_DOM_VK_2              = 0x32;
-const unsigned long LL_DOM_VK_3              = 0x33;
-const unsigned long LL_DOM_VK_4              = 0x34;
-const unsigned long LL_DOM_VK_5              = 0x35;
-const unsigned long LL_DOM_VK_6              = 0x36;
-const unsigned long LL_DOM_VK_7              = 0x37;
-const unsigned long LL_DOM_VK_8              = 0x38;
-const unsigned long LL_DOM_VK_9              = 0x39;
-
-const unsigned long LL_DOM_VK_SEMICOLON      = 0x3B;
-const unsigned long LL_DOM_VK_EQUALS         = 0x3D;
-
-// LL_DOM_VK_A - LL_DOM_VK_Z match their ASCII values
-const unsigned long LL_DOM_VK_A              = 0x41;
-const unsigned long LL_DOM_VK_B              = 0x42;
-const unsigned long LL_DOM_VK_C              = 0x43;
-const unsigned long LL_DOM_VK_D              = 0x44;
-const unsigned long LL_DOM_VK_E              = 0x45;
-const unsigned long LL_DOM_VK_F              = 0x46;
-const unsigned long LL_DOM_VK_G              = 0x47;
-const unsigned long LL_DOM_VK_H              = 0x48;
-const unsigned long LL_DOM_VK_I              = 0x49;
-const unsigned long LL_DOM_VK_J              = 0x4A;
-const unsigned long LL_DOM_VK_K              = 0x4B;
-const unsigned long LL_DOM_VK_L              = 0x4C;
-const unsigned long LL_DOM_VK_M              = 0x4D;
-const unsigned long LL_DOM_VK_N              = 0x4E;
-const unsigned long LL_DOM_VK_O              = 0x4F;
-const unsigned long LL_DOM_VK_P              = 0x50;
-const unsigned long LL_DOM_VK_Q              = 0x51;
-const unsigned long LL_DOM_VK_R              = 0x52;
-const unsigned long LL_DOM_VK_S              = 0x53;
-const unsigned long LL_DOM_VK_T              = 0x54;
-const unsigned long LL_DOM_VK_U              = 0x55;
-const unsigned long LL_DOM_VK_V              = 0x56;
-const unsigned long LL_DOM_VK_W              = 0x57;
-const unsigned long LL_DOM_VK_X              = 0x58;
-const unsigned long LL_DOM_VK_Y              = 0x59;
-const unsigned long LL_DOM_VK_Z              = 0x5A;
-
-const unsigned long LL_DOM_VK_CONTEXT_MENU   = 0x5D;
-
-const unsigned long LL_DOM_VK_NUMPAD0        = 0x60;
-const unsigned long LL_DOM_VK_NUMPAD1        = 0x61;
-const unsigned long LL_DOM_VK_NUMPAD2        = 0x62;
-const unsigned long LL_DOM_VK_NUMPAD3        = 0x63;
-const unsigned long LL_DOM_VK_NUMPAD4        = 0x64;
-const unsigned long LL_DOM_VK_NUMPAD5        = 0x65;
-const unsigned long LL_DOM_VK_NUMPAD6        = 0x66;
-const unsigned long LL_DOM_VK_NUMPAD7        = 0x67;
-const unsigned long LL_DOM_VK_NUMPAD8        = 0x68;
-const unsigned long LL_DOM_VK_NUMPAD9        = 0x69;
-const unsigned long LL_DOM_VK_MULTIPLY       = 0x6A;
-const unsigned long LL_DOM_VK_ADD            = 0x6B;
-const unsigned long LL_DOM_VK_SEPARATOR      = 0x6C;
-const unsigned long LL_DOM_VK_SUBTRACT       = 0x6D;
-const unsigned long LL_DOM_VK_DECIMAL        = 0x6E;
-const unsigned long LL_DOM_VK_DIVIDE         = 0x6F;
-const unsigned long LL_DOM_VK_F1             = 0x70;
-const unsigned long LL_DOM_VK_F2             = 0x71;
-const unsigned long LL_DOM_VK_F3             = 0x72;
-const unsigned long LL_DOM_VK_F4             = 0x73;
-const unsigned long LL_DOM_VK_F5             = 0x74;
-const unsigned long LL_DOM_VK_F6             = 0x75;
-const unsigned long LL_DOM_VK_F7             = 0x76;
-const unsigned long LL_DOM_VK_F8             = 0x77;
-const unsigned long LL_DOM_VK_F9             = 0x78;
-const unsigned long LL_DOM_VK_F10            = 0x79;
-const unsigned long LL_DOM_VK_F11            = 0x7A;
-const unsigned long LL_DOM_VK_F12            = 0x7B;
-const unsigned long LL_DOM_VK_F13            = 0x7C;
-const unsigned long LL_DOM_VK_F14            = 0x7D;
-const unsigned long LL_DOM_VK_F15            = 0x7E;
-const unsigned long LL_DOM_VK_F16            = 0x7F;
-const unsigned long LL_DOM_VK_F17            = 0x80;
-const unsigned long LL_DOM_VK_F18            = 0x81;
-const unsigned long LL_DOM_VK_F19            = 0x82;
-const unsigned long LL_DOM_VK_F20            = 0x83;
-const unsigned long LL_DOM_VK_F21            = 0x84;
-const unsigned long LL_DOM_VK_F22            = 0x85;
-const unsigned long LL_DOM_VK_F23            = 0x86;
-const unsigned long LL_DOM_VK_F24            = 0x87;
-
-const unsigned long LL_DOM_VK_NUM_LOCK       = 0x90;
-const unsigned long LL_DOM_VK_SCROLL_LOCK    = 0x91;
-
-const unsigned long LL_DOM_VK_COMMA          = 0xBC;
-const unsigned long LL_DOM_VK_PERIOD         = 0xBE;
-const unsigned long LL_DOM_VK_SLASH          = 0xBF;
-const unsigned long LL_DOM_VK_BACK_QUOTE     = 0xC0;
-const unsigned long LL_DOM_VK_OPEN_BRACKET   = 0xDB;
-const unsigned long LL_DOM_VK_BACK_SLASH     = 0xDC;
-const unsigned long LL_DOM_VK_CLOSE_BRACKET  = 0xDD;
-const unsigned long LL_DOM_VK_QUOTE          = 0xDE;
-
-const unsigned long LL_DOM_VK_META           = 0xE0;
-
-#endif // LLMOZLIB_H
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
new file mode 100755
index 0000000..4bef290
--- /dev/null
+++ b/linden/scripts/build_version.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+#
+# Print the build information embedded in a header file.
+#
+# Expects to be invoked from the command line with a file name and a
+# list of directories to search.  The file name will be one of the
+# following:
+#
+#   llversionserver.h
+#   llversionviewer.h
+#
+# The directory list that follows will include indra/llcommon, where
+# these files live.
+
+import errno, os, re
+
+def get_version(filename):
+    fp = open(filename)
+    data = fp.read()
+    fp.close()
+
+    vals = {}
+    m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', data)
+    vals['major'] = m.group(1)
+    m = re.search('const S32 LL_VERSION_MINOR = (\d+);', data)
+    vals['minor'] = m.group(1)
+    m = re.search('const S32 LL_VERSION_PATCH = (\d+);', data)
+    vals['patch'] = m.group(1)
+    m = re.search('const S32 LL_VERSION_BUILD = (\d+);', data)
+    vals['build'] = m.group(1)
+
+    return "%(major)s.%(minor)s.%(patch)s.%(build)s" % vals
+
+if __name__ == '__main__':
+    import sys
+
+    try:
+        for path in sys.argv[2:]:
+            name = os.path.join(path, sys.argv[1])
+            try:
+                print get_version(name)
+                break
+            except OSError, err:
+                if err.errno != errno.ENOENT:
+                    raise
+        else:
+            print >> sys.stderr, 'File not found:', sys.argv[1]
+            sys.exit(1)
+    except AttributeError:
+        print >> sys.stderr, 'Error: malformatted file: ', name
+        sys.exit(1)
+    except IndexError:
+        print >> sys.stderr, ('Usage: %s llversion[...].h [directories]' %
+                              sys.argv[0])
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
new file mode 100755
index 0000000..0cc2fad
--- /dev/null
+++ b/linden/scripts/install.py
@@ -0,0 +1,1086 @@
+#!/usr/bin/env python
+"""\
+@file install.py
+@author Phoenix
+@date 2008-01-27
+@brief Install files into an indra checkout.
+
+Install files as specified by:
+https://wiki.lindenlab.com/wiki/User:Phoenix/Library_Installation
+
+
+$LicenseInfo:firstyear=2007&license=mit$
+
+Copyright (c) 2007-2008, Linden Research, Inc.
+
+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.
+$/LicenseInfo$
+"""
+
+import copy
+import md5
+import optparse
+import os
+import pprint
+import shutil
+import sys
+import tarfile
+import tempfile
+import urllib2
+import urlparse
+
+from sets import Set as set, ImmutableSet as frozenset
+
+# Locate -our- python library relative to our install location.
+from os.path import realpath, dirname, join
+
+# Walk back to checkout base directory
+base_dir = dirname(dirname(realpath(__file__)))
+# Walk in to libraries directory
+lib_dir = join(join(join(base_dir, 'indra'), 'lib'), 'python')
+
+if lib_dir not in sys.path:
+    sys.path.insert(0, lib_dir)
+
+from indra.base import llsd
+from indra.util import helpformatter
+
+class InstallFile(object):
+    "This is just a handy way to throw around details on a file in memory."
+    def __init__(self, pkgname, url, md5sum, cache_dir, platform_path):
+        self.pkgname = pkgname
+        self.url = url
+        self.md5sum = md5sum
+        filename = urlparse.urlparse(url)[2].split('/')[-1]
+        self.filename = os.path.join(cache_dir, filename)
+        self.platform_path = platform_path
+
+    def __str__(self):
+        return "ifile{%s:%s}" % (self.pkgname, self.url)
+
+    def _is_md5sum_match(self):
+        hasher = md5.new(file(self.filename, 'rb').read())
+        if hasher.hexdigest() == self.md5sum:
+            return  True
+        return False
+
+    def is_match(self, platform):
+        """@brief Test to see if this ifile is part of platform
+        @param platform The target platform. Eg, windows or linux/i686/gcc/3.3
+        @return Returns True if the ifile is in the platform.
+        """
+        if self.platform_path[0] == 'common':
+            return True
+        req_platform_path = platform.split('/')
+        #print "platform:",req_platform_path
+        #print "path:",self.platform_path
+        # to match, every path part much match
+        match_count = min(len(req_platform_path), len(self.platform_path))
+        for ii in range(0, match_count):
+            if req_platform_path[ii] != self.platform_path[ii]:
+                return False
+        #print "match!"
+        return True
+
+    def fetch_local(self):
+        #print "Looking for:",self.filename
+        if not os.path.exists(self.filename):
+            pass
+        elif self.md5sum and not self._is_md5sum_match():
+            print "md5 mismatch:", self.filename
+            os.remove(self.filename)
+        else:
+            print "Found matching package:", self.filename
+            return
+        print "Downloading",self.url,"to local file",self.filename
+        file(self.filename, 'wb').write(urllib2.urlopen(self.url).read())
+        if self.md5sum and not self._is_md5sum_match():
+            raise RuntimeError("Error matching md5 for %s" % self.url)
+
+class LicenseDefinition(object):
+    def __init__(self, definition):
+        #probably looks like:
+        # { text : ...,
+        #   url : ...
+        #   blessed : ...
+        # }
+        self._definition = definition
+
+
+class InstallableDefinition(object):
+    def __init__(self, definition):
+        #probably looks like:
+        # { packages : {platform...},
+        #   copyright : ...
+        #   license : ...
+        #   description: ...
+        # }
+        self._definition = definition
+
+    def _ifiles_from(self, tree, pkgname, cache_dir):
+        return self._ifiles_from_path(tree, pkgname, cache_dir, [])
+
+    def _ifiles_from_path(self, tree, pkgname, cache_dir, path):
+        ifiles = []
+        if 'url' in tree:
+            ifiles.append(InstallFile(
+                pkgname,
+                tree['url'],
+                tree.get('md5sum', None),
+                cache_dir,
+                path))
+        else:
+            for key in tree:
+                platform_path = copy.copy(path)
+                platform_path.append(key)
+                ifiles.extend(
+                    self._ifiles_from_path(
+                        tree[key],
+                        pkgname,
+                        cache_dir,
+                        platform_path))
+        return ifiles
+
+    def ifiles(self, pkgname, platform, cache_dir):
+        """@brief return a list of appropriate InstallFile instances to install
+        @param pkgname The name of the package to be installed, eg 'tut'
+        @param platform The target platform. Eg, windows or linux/i686/gcc/3.3
+        @param cache_dir The directory to cache downloads.
+        @return Returns a list of InstallFiles which are part of this install
+        """
+        if 'packages' not in self._definition:
+            return []
+        all_ifiles = self._ifiles_from(
+            self._definition['packages'],
+            pkgname,
+            cache_dir)
+        if platform == 'all':
+            return all_ifiles
+        #print "Considering", len(all_ifiles), "packages for", pkgname
+        # split into 2 lines because pychecker thinks it might return none.
+        files = [ifile for ifile in all_ifiles if ifile.is_match(platform)]
+        return files
+
+class InstalledPackage(object):
+    def __init__(self, definition):
+        # looks like:
+        # { url1 : { files: [file1,file2,...], md5sum:... },
+        #   url2 : { files: [file1,file2,...], md5sum:... },...
+        # }
+        self._installed = {}
+        for url in definition:
+            self._installed[url] = definition[url]
+
+    def urls(self):
+        return self._installed.keys()
+
+    def files_in(self, url):
+        return self._installed[url].get('files', [])
+
+    def get_md5sum(self, url):
+        return self._installed[url].get('md5sum', None)
+
+    def remove(self, url):
+        self._installed.pop(url)
+
+    def add_files(self, url, files):
+        if url not in self._installed:
+            self._installed[url] = {}
+        self._installed[url]['files'] = files
+
+    def set_md5sum(self, url, md5sum):
+        if url not in self._installed:
+            self._installed[url] = {}
+        self._installed[url]['md5sum'] = md5sum
+
+class Installer(object):
+    def __init__(self, install_filename, installed_filename, dryrun):
+        self._install_filename = install_filename
+        self._install_changed = False
+        self._installed_filename = installed_filename
+        self._installed_changed = False
+        self._dryrun = dryrun
+        self._installables = {}
+        self._licenses = {}
+        self._installed = {}
+        self.load()
+
+    def load(self):
+        if os.path.exists(self._install_filename):
+            install = llsd.parse(file(self._install_filename, 'rb').read())
+            try:
+                for name in install['installables']:
+                    self._installables[name] = InstallableDefinition(
+                        install['installables'][name])
+            except KeyError:
+                pass
+            try:
+                for name in install['licenses']:
+                    self._licenses[name] = LicenseDefinition(install['licenses'][name])
+            except KeyError:
+                pass
+        if os.path.exists(self._installed_filename):
+            installed = llsd.parse(file(self._installed_filename, 'rb').read())
+            try:
+                bins = installed['installables']
+                for name in bins:
+                    self._installed[name] = InstalledPackage(bins[name])
+            except KeyError:
+                pass
+
+    def _write(self, filename, state):
+        print "Writing state to",filename
+        if not self._dryrun:
+            file(filename, 'wb').write(llsd.format_pretty_xml(state))
+
+    def save(self):
+        if self._install_changed:
+            state = {}
+            state['licenses'] = {}
+            for name in self._licenses:
+                state['licenses'][name] = self._licenses[name]._definition
+            #print "self._installables:",self._installables
+            state['installables'] = {}
+            for name in self._installables:
+                state['installables'][name] = \
+                                        self._installables[name]._definition
+            self._write(self._install_filename, state)
+        if self._installed_changed:
+            state = {}
+            state['installables'] = {}
+            bin = state['installables']
+            for name in self._installed:
+                #print "installed:",name,self._installed[name]._installed
+                bin[name] = self._installed[name]._installed
+            self._write(self._installed_filename, state)
+
+    def is_valid_license(self, bin):
+        "@brief retrun true if we have valid license info for installable."
+        installable = self._installables[bin]._definition
+        if 'license' not in installable:
+            print >>sys.stderr, "No license info found for", bin
+            print >>sys.stderr, 'Please add the license with the',
+            print >>sys.stderr, '--add-installable option. See', \
+                                 sys.argv[0], '--help'
+            return False
+        if installable['license'] not in self._licenses:
+            lic = installable['license']
+            print >>sys.stderr, "Missing license info for '" + lic + "'.",
+            print >>sys.stderr, 'Please add the license with the',
+            print >>sys.stderr, '--add-license option. See', sys.argv[0],
+            print >>sys.stderr, '--help'
+            return False
+        return True
+
+    def list_installables(self):
+        "Return a list of all known installables."
+        return self._installables.keys()
+
+    def detail_installable(self, name):
+        "Return a installable definition detail"
+        return self._installables[name]._definition
+
+    def list_licenses(self):
+        "Return a list of all known licenses."
+        return self._licenses.keys()
+
+    def detail_license(self, name):
+        "Return a license definition detail"
+        return self._licenses[name]._definition
+
+    def list_installed(self):
+        "Return a list of installed packages."
+        return self._installed.keys()
+
+    def _update_field(self, description, field, value, multiline=False):
+        """Given a block and a field name, add or update it.
+        @param description a dict containing all the details of a description.
+        @param field the name of the field to update.
+        @param value the value of the field to update; if omitted, interview
+                     will ask for value.
+        @param multiline boolean specifying whether field is multiline or not.
+        """
+        if value:
+            description[field] = value
+        else:
+            if field in description:
+                print "Update value for '" + field + "'"
+                print "(Leave blank to keep current value)"
+                print "Current Value:  '" + description[field] + "'"
+            else:
+                print "Specify value for '" + field + "'"
+            if not multiline:
+                new_value = raw_input("Enter New Value: ")
+            else:
+                print "Please enter " + field + ". End input with EOF (^D)."
+                new_value = sys.stdin.read()
+
+            if field in description and not new_value:
+                pass
+            elif new_value:
+                description[field] = new_value
+
+        self._install_changed = True
+        return True
+
+    def _update_installable(self, name, platform, url, md5sum):
+        """Update installable entry with specific package information.
+        @param installable[in,out] a dict containing installable details. 
+        @param platform Platform info, i.e. linux/i686, windows/i686 etc.
+        @param url URL of tar file
+        @param md5sum md5sum of tar file
+        """
+        installable  = self._installables[name]._definition
+        path = platform.split('/')
+        if 'packages' not in  installable:
+            installable['packages'] = {}
+        update = installable['packages']
+        for child in path:
+            if child not in update:
+                update[child] = {}
+            parent = update
+            update = update[child]
+        parent[child]['url'] = llsd.uri(url)
+        parent[child]['md5sum'] = md5sum
+
+        self._install_changed = True
+        return True
+
+
+    def add_installable_package(self, name, **kwargs):
+        """Add an url for a platform path to the installable.
+        @param installable[in,out] a dict containing installable details.
+        """
+        platform_help_str = """\
+Please enter a new package location and url. Some examples:
+common -- specify a package for all platforms
+linux -- specify a package for all arch and compilers on linux
+darwin/universal -- specify a mac os x universal
+windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
+        if name not in self._installables:
+            print "Error: must add library with --add-installable or " \
+                  +"--add-installable-metadata before using " \
+                  +"--add-installable-package option"
+            return False
+        else:
+            print "Updating installable '" + name + "'."
+        for arg in ('platform', 'url', 'md5sum'):
+            if not kwargs[arg]:
+                if arg == 'platform': 
+                    print platform_help_str
+                kwargs[arg] = raw_input("Package "+arg+":")
+        #path = kwargs['platform'].split('/')
+
+        return self._update_installable(name, kwargs['platform'], 
+                        kwargs['url'], kwargs['md5sum'])
+
+    def add_installable_metadata(self, name, **kwargs):
+        """Interactively add (only) library metadata into install, 
+        w/o adding installable"""
+        if name not in self._installables:
+            print "Adding installable '" + name + "'."
+            self._installables[name] = InstallableDefinition({})
+        else:
+            print "Updating installable '" + name + "'."
+        installable  = self._installables[name]._definition
+        for field in ('copyright', 'license', 'description'):
+            self._update_field(installable, field, kwargs[field])
+        print "Added installable '" + name + "':"
+        pprint.pprint(self._installables[name])
+
+        return True
+
+    def add_installable(self, name, **kwargs):
+        "Interactively pull a new installable into the install"
+        ret_a = self.add_installable_metadata(name, **kwargs)
+        ret_b = self.add_installable_package(name, **kwargs)
+        return (ret_a and ret_b)
+
+    def remove_installable(self, name):
+        self._installables.pop(name)
+        self._install_changed = True
+
+    def add_license(self, name, **kwargs):
+        if name not in self._licenses:
+            print "Adding license '" + name + "'."
+            self._licenses[name] = LicenseDefinition({})
+        else:
+            print "Updating license '" + name + "'."
+        the_license  = self._licenses[name]._definition
+        for field in ('url', 'text'):
+            multiline = False
+            if field == 'text':
+                multiline = True
+            self._update_field(the_license, field, kwargs[field], multiline)
+        self._install_changed = True
+        return True
+
+    def remove_license(self, name):
+        self._licenses.pop(name)
+        self._install_changed = True
+
+    def _uninstall(self, installables):
+        """@brief Do the actual removal of files work.
+        *NOTE: This method is not transactionally safe -- ie, if it
+        raises an exception, internal state may be inconsistent. How
+        should we address this?
+        @param installables The package names to remove
+        """
+        remove_file_list = []
+        for pkgname in installables:
+            for url in self._installed[pkgname].urls():
+                remove_file_list.extend(
+                    self._installed[pkgname].files_in(url))
+                self._installed[pkgname].remove(url)
+                if not self._dryrun:
+                    self._installed_changed = True
+            if not self._dryrun:
+                self._installed.pop(pkgname)
+        remove_dir_set = set()
+        for filename in remove_file_list:
+            print "rm",filename
+            if not self._dryrun:
+                if os.path.exists(filename):
+                    remove_dir_set.add(os.path.dirname(filename))
+                    os.remove(filename)
+        for dirname in remove_dir_set:
+            try:
+                os.removedirs(dirname)
+            except OSError:
+                # This is just for cleanup, so we don't care about
+                # normal failures.
+                pass
+
+    def uninstall(self, installables, install_dir):
+        """@brief Remove the packages specified.
+        @param installables The package names to remove
+        @param install_dir The directory to work from
+        """
+        print "uninstall",installables,"from",install_dir
+        cwd = os.getcwdu()
+        os.chdir(install_dir)
+        try:
+            self._uninstall(installables)
+        finally:
+            os.chdir(cwd)
+
+    def _build_ifiles(self, platform, cache_dir):
+        """@brief determine what files to install
+        @param platform The target platform. Eg, windows or linux/i686/gcc/3.3
+        @param cache_dir The directory to cache downloads.
+        @return Returns the ifiles to install
+        """
+        ifiles = []
+        for bin in self._installables:
+            ifiles.extend(self._installables[bin].ifiles(bin, 
+                                                         platform, 
+                                                         cache_dir))
+        to_install = []
+        #print "self._installed",self._installed
+        for ifile in ifiles:
+            if ifile.pkgname not in self._installed:
+                to_install.append(ifile)
+            elif ifile.url not in self._installed[ifile.pkgname].urls():
+                to_install.append(ifile)
+            elif ifile.md5sum != \
+                 self._installed[ifile.pkgname].get_md5sum(ifile.url):
+                # *TODO: We may want to uninstall the old version too
+                # when we detect it is installed, but the md5 sum is
+                # different.
+                to_install.append(ifile)
+            else:
+                #print "Installation up to date:",
+                #        ifile.pkgname,ifile.platform_path
+                pass
+        #print "to_install",to_install
+        return to_install
+
+    def _install(self, to_install, install_dir):
+        for ifile in to_install:
+            tar = tarfile.open(ifile.filename, 'r')
+            print "Extracting",ifile.filename,"to",install_dir
+            if not self._dryrun:
+                # *NOTE: try to call extractall, which first appears
+                # in python 2.5. Phoenix 2008-01-28
+                try:
+                    tar.extractall(path=install_dir)
+                except AttributeError:
+                    _extractall(tar, path=install_dir)
+            if ifile.pkgname in self._installed:
+                self._installed[ifile.pkgname].add_files(
+                    ifile.url,
+                    tar.getnames())
+                self._installed[ifile.pkgname].set_md5sum(
+                    ifile.url,
+                    ifile.md5sum)
+            else:
+                # *HACK: this understands the installed package syntax.
+                definition = { ifile.url :
+                               {'files': tar.getnames(),
+                                'md5sum' : ifile.md5sum } }
+                self._installed[ifile.pkgname] = InstalledPackage(definition)
+            self._installed_changed = True
+
+    def install(self, installables, platform, install_dir, cache_dir):
+        """@brief Do the installation for for the platform.
+        @param installables The requested installables to install.
+        @param platform The target platform. Eg, windows or linux/i686/gcc/3.3
+        @param install_dir The root directory to install into. Created
+        if missing.
+        @param cache_dir The directory to cache downloads. Created if
+        missing.
+        """
+        # The ordering of steps in the method is to help reduce the
+        # likelihood that we break something.
+        install_dir = os.path.realpath(install_dir)
+        cache_dir = os.path.realpath(cache_dir)
+        _mkdir(install_dir)
+        _mkdir(cache_dir)
+        to_install = self._build_ifiles(platform, cache_dir)
+
+        # Filter for files which we actually requested to install.
+        to_install = [ifl for ifl in to_install if ifl.pkgname in installables]
+        for ifile in to_install:
+            ifile.fetch_local()
+        self._install(to_install, install_dir)
+
+    def do_install(self, installables, platform, install_dir, cache_dir=None, 
+                   check_license=True, scp=None):
+        """Determine what installables should be installed. If they were
+        passed in on the command line, use them, otherwise install
+        all known installables.
+        """
+        if not cache_dir: 
+            cache_dir = _default_installable_cache()
+        all_installables = self.list_installables()
+        if not len(installables):
+            install_installables = all_installables
+        else:
+            # passed in on the command line. We'll need to verify we
+            # know about them here.
+            install_installables = installables
+            for installable in install_installables:
+                if installable not in all_installables:
+                    raise RuntimeError('Unknown installable: %s' % 
+                                       (installable,))
+        if check_license:
+            # *TODO: check against a list of 'known good' licenses.
+            # *TODO: check for urls which conflict -- will lead to
+            # problems.
+            for installable in install_installables:
+                if not self.is_valid_license(installable):
+                    return 1
+    
+        # Set up the 'scp' handler
+        opener = urllib2.build_opener()
+        scp_or_http = SCPOrHTTPHandler(scp)
+        opener.add_handler(scp_or_http)
+        urllib2.install_opener(opener)
+    
+        # Do the work of installing the requested installables.
+        self.install(
+            install_installables,
+            platform,
+            install_dir,
+            cache_dir)
+        scp_or_http.cleanup()
+    
+    def do_uninstall(self, installables, install_dir):
+        # Do not bother to check license if we're uninstalling.
+        all_installed = self.list_installed()
+        if not len(installables):
+            uninstall_installables = all_installed
+        else:
+            # passed in on the command line. We'll need to verify we
+            # know about them here.
+            uninstall_installables = installables
+            for installable in uninstall_installables:
+                if installable not in all_installed:
+                    raise RuntimeError('Installable not installed: %s' % 
+                                       (installable,))
+        self.uninstall(uninstall_installables, install_dir)
+
+class SCPOrHTTPHandler(urllib2.BaseHandler):
+    """Evil hack to allow both the build system and developers consume
+    proprietary binaries.
+    To use http, export the environment variable:
+    INSTALL_USE_HTTP_FOR_SCP=true
+    """
+    def __init__(self, scp_binary):
+        self._scp = scp_binary
+        self._dir = None
+
+    def scp_open(self, request):
+        #scp:codex.lindenlab.com:/local/share/install_pkgs/package.tar.bz2
+        remote = request.get_full_url()[4:]
+        if os.getenv('INSTALL_USE_HTTP_FOR_SCP', None) == 'true':
+            return self.do_http(remote)
+        try:
+            return self.do_scp(remote)
+        except:
+            self.cleanup()
+            raise
+
+    def do_http(self, remote):
+        url = remote.split(':',1)
+        if not url[1].startswith('/'):
+            # in case it's in a homedir or something
+            url.insert(1, '/')
+        url.insert(0, "http://")
+        url = ''.join(url)
+        print "Using HTTP:",url
+        return urllib2.urlopen(url)
+
+    def do_scp(self, remote):
+        if not self._dir:
+            self._dir = tempfile.mkdtemp()
+        local = os.path.join(self._dir, remote.split('/')[-1:][0])
+        command = []
+        for part in (self._scp, remote, local):
+            if ' ' in part:
+                # I hate shell escaping.
+                part.replace('\\', '\\\\')
+                part.replace('"', '\\"')
+                command.append('"%s"' % part)
+            else:
+                command.append(part)
+        #print "forking:", command
+        rv = os.system(' '.join(command))
+        if rv != 0:
+            raise RuntimeError("Cannot fetch: %s" % remote)
+        return file(local, 'rb')
+
+    def cleanup(self):
+        if self._dir:
+            shutil.rmtree(self._dir)
+
+
+#
+# *NOTE: PULLED FROM PYTHON 2.5 tarfile.py Phoenix 2008-01-28
+#
+def _extractall(tar, path=".", members=None):
+    """Extract all members from the archive to the current working
+       directory and set owner, modification time and permissions on
+       directories afterwards. `path' specifies a different directory
+       to extract to. `members' is optional and must be a subset of the
+       list returned by getmembers().
+    """
+    directories = []
+
+    if members is None:
+        members = tar
+
+    for tarinfo in members:
+        if tarinfo.isdir():
+            # Extract directory with a safe mode, so that
+            # all files below can be extracted as well.
+            try:
+                os.makedirs(os.path.join(path, tarinfo.name), 0777)
+            except EnvironmentError:
+                pass
+            directories.append(tarinfo)
+        else:
+            tar.extract(tarinfo, path)
+
+    # Reverse sort directories.
+    directories.sort(lambda a, b: cmp(a.name, b.name))
+    directories.reverse()
+
+    # Set correct owner, mtime and filemode on directories.
+    for tarinfo in directories:
+        path = os.path.join(path, tarinfo.name)
+        try:
+            tar.chown(tarinfo, path)
+            tar.utime(tarinfo, path)
+            tar.chmod(tarinfo, path)
+        except tarfile.ExtractError, e:
+            if tar.errorlevel > 1:
+                raise
+            else:
+                tar._dbg(1, "tarfile: %s" % e)
+
+
+def _mkdir(directory):
+    "Safe, repeatable way to make a directory."
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+
+def _get_platform():
+    "Return appropriate platform packages for the environment."
+    platform_map = {
+        'darwin': 'darwin',
+        'linux2': 'linux',
+        'win32' : 'windows',
+        'cygwin' : 'windows',
+        'solaris' : 'solaris'
+        }
+    return platform_map[sys.platform]
+
+def _getuser():
+    "Get the user"
+    try:
+        # Unix-only.
+        import getpass
+        return getpass.getuser()
+    except ImportError:
+        import win32api
+        return win32api.GetUserName()
+
+def _default_installable_cache():
+    """In general, the installable files do not change much, so find a 
+    host/user specific location to cache files."""
+    user = _getuser()
+    cache_dir = "/var/tmp/%s/install.cache" % user
+    if _get_platform() == 'windows':
+        cache_dir = os.path.join(tempfile.gettempdir(), \
+                                 'install.cache.%s' % user)
+    return cache_dir
+
+def parse_args():
+    parser = optparse.OptionParser(
+        usage="usage: %prog [options] [installable1 [installable2...]]",
+        formatter = helpformatter.Formatter(),
+        description="""This script fetches and installs installable packages.
+It also handles uninstalling those packages and manages the mapping between
+packages and their license.
+
+The process is to open and read an install manifest file which specifies
+what files should be installed. For each installable to be installed.
+ * make sure it has a license
+ * check the installed version
+ ** if not installed and needs to be, download and install
+ ** if installed version differs, download & install
+
+If no installables are specified on the command line, then the defaut
+behavior is to install all known installables appropriate for the platform
+specified or uninstall all installables if --uninstall is set. You can specify
+more than one installable on the command line.
+
+When specifying a platform, you can specify 'all' to install all
+packages, or any platform of the form:
+
+OS[/arch[/compiler[/compiler_version]]]
+
+Where the supported values for each are:
+OS: darwin, linux, windows, solaris
+arch: i686, x86_64, ppc, universal
+compiler: vs, gcc
+compiler_version: 2003, 2005, 2008, 3.3, 3.4, 4.0, etc.
+
+No checks are made to ensure a valid combination of platform
+parts. Some exmples of valid platforms:
+
+windows
+windows/i686/vs/2005
+linux/x86_64/gcc/3.3
+linux/x86_64/gcc/4.0
+darwin/universal/gcc/4.0
+""")
+    parser.add_option(
+        '--dry-run', 
+        action='store_true',
+        default=False,
+        dest='dryrun',
+        help='Do not actually install files. Downloads will still happen.')
+    parser.add_option(
+        '--install-manifest', 
+        type='string',
+        default=join(base_dir, 'install.xml'),
+        dest='install_filename',
+        help='The file used to describe what should be installed.')
+    parser.add_option(
+        '--installed-manifest', 
+        type='string',
+        default=join(base_dir, 'installed.xml'),
+        dest='installed_filename',
+        help='The file used to record what is installed.')
+    parser.add_option(
+        '--export-manifest', 
+        action='store_true',
+        default=False,
+        dest='export_manifest',
+        help="Print the install manifest to stdout and exit.")
+    parser.add_option(
+        '-p', '--platform', 
+        type='string',
+        default=_get_platform(),
+        dest='platform',
+        help="""Override the automatically determined platform. \
+You can specify 'all' to do a installation of installables for all platforms.""")
+    parser.add_option(
+        '--cache-dir', 
+        type='string',
+        default=_default_installable_cache(),
+        dest='cache_dir',
+        help='Where to download files. Default: %s'% \
+             (_default_installable_cache()))
+    parser.add_option(
+        '--install-dir', 
+        type='string',
+        default=base_dir,
+        dest='install_dir',
+        help='Where to unpack the installed files.')
+    parser.add_option(
+        '--list-installed', 
+        action='store_true',
+        default=False,
+        dest='list_installed',
+        help="List the installed package names and exit.")
+    parser.add_option(
+        '--skip-license-check', 
+        action='store_false',
+        default=True,
+        dest='check_license',
+        help="Do not perform the license check.")
+    parser.add_option(
+        '--list-licenses', 
+        action='store_true',
+        default=False,
+        dest='list_licenses',
+        help="List known licenses and exit.")
+    parser.add_option(
+        '--detail-license', 
+        type='string',
+        default=None,
+        dest='detail_license',
+        help="Get detailed information on specified license and exit.")
+    parser.add_option(
+        '--add-license', 
+        type='string',
+        default=None,
+        dest='new_license',
+        help="""Add a license to the install file. Argument is the name of \
+license. Specify --license-url if the license is remote or specify \
+--license-text, otherwse the license text will be read from standard \
+input.""")
+    parser.add_option(
+        '--license-url', 
+        type='string',
+        default=None,
+        dest='license_url',
+        help="""Put the specified url into an added license. \
+Ignored if --add-license is not specified.""")
+    parser.add_option(
+        '--license-text', 
+        type='string',
+        default=None,
+        dest='license_text',
+        help="""Put the text into an added license. \
+Ignored if --add-license is not specified.""")
+    parser.add_option(
+        '--remove-license', 
+        type='string',
+        default=None,
+        dest='remove_license',
+        help="Remove a named license.")
+    parser.add_option(
+        '--remove-installable', 
+        type='string',
+        default=None,
+        dest='remove_installable',
+        help="Remove a installable from the install file.")
+    parser.add_option(
+        '--add-installable', 
+        type='string',
+        default=None,
+        dest='add_installable',
+        help="""Add a installable into the install file. Argument is \ 
+the name of the installable to add.""")
+    parser.add_option(
+        '--add-installable-metadata', 
+        type='string',
+        default=None,
+        dest='add_installable_metadata',
+        help="""Add package for library into the install file. Argument is \
+the name of the library to add.""")
+    parser.add_option(
+        '--installable-copyright', 
+        type='string',
+        default=None,
+        dest='installable_copyright',
+        help="""Copyright for specified new package. Ignored if \
+--add-installable is not specified.""")
+    parser.add_option(
+        '--installable-license', 
+        type='string',
+        default=None,
+        dest='installable_license',
+        help="""Name of license for specified new package. Ignored if \
+--add-installable is not specified.""")
+    parser.add_option(
+        '--installable-description', 
+        type='string',
+        default=None,
+        dest='installable_description',
+        help="""Description for specified new package. Ignored if \
+--add-installable is not specified.""")
+    parser.add_option(
+        '--add-installable-package', 
+        type='string',
+        default=None,
+        dest='add_installable_package',
+        help="""Add package for library into the install file. Argument is \
+the name of the library to add.""")
+    parser.add_option(
+        '--package-platform', 
+        type='string',
+        default=None,
+        dest='package_platform',
+        help="""Platform for specified new package. \
+Ignored if --add-installable or --add-installable-package is not specified.""")
+    parser.add_option(
+        '--package-url', 
+        type='string',
+        default=None,
+        dest='package_url',
+        help="""URL for specified package. \
+Ignored if --add-installable or --add-installable-package is not specified.""")
+    parser.add_option(
+        '--package-md5', 
+        type='string',
+        default=None,
+        dest='package_md5',
+        help="""md5sum for new package. \
+Ignored if --add-installable or --add-installable-package is not specified.""")
+    parser.add_option(
+        '--list', 
+        action='store_true',
+        default=False,
+        dest='list_installables',
+        help="List the installables in the install manifest and exit.")
+    parser.add_option(
+        '--detail', 
+        type='string',
+        default=None,
+        dest='detail_installable',
+        help="Get detailed information on specified installable and exit.")
+    parser.add_option(
+        '--uninstall', 
+        action='store_true',
+        default=False,
+        dest='uninstall',
+        help="""Remove the installables specified in the arguments. Just like \
+during installation, if no installables are listed then all installed \
+installables are removed.""")
+    parser.add_option(
+        '--scp', 
+        type='string',
+        default='scp',
+        dest='scp',
+        help="Specify the path to your scp program.")
+
+    return parser.parse_args()
+
+def main():
+    options, args = parse_args()
+    installer = Installer(
+        options.install_filename,
+        options.installed_filename,
+        options.dryrun)
+
+    #
+    # Handle the queries for information
+    #
+    if options.list_installed:
+        print "installed list:", installer.list_installed()
+        return 0
+    if options.list_installables:
+        print "installable list:", installer.list_installables()
+        return 0
+    if options.detail_installable:
+        try:
+            detail = installer.detail_installable(options.detail_installable)
+            print "Detail on installable",options.detail_installable+":"
+            pprint.pprint(detail)
+        except KeyError:
+            print "Installable '"+options.detail_installable+"' not found in",
+            print "install file."
+        return 0
+    if options.list_licenses:
+        print "license list:", installer.list_licenses()
+        return 0
+    if options.detail_license:
+        try:
+            detail = installer.detail_license(options.detail_license)
+            print "Detail on license",options.detail_license+":"
+            pprint.pprint(detail)
+        except KeyError:
+            print "License '"+options.detail_license+"' not defined in",
+            print "install file."
+        return 0
+    if options.export_manifest:
+        # *HACK: just re-parse the install manifest and pretty print
+        # it. easier than looking at the datastructure designed for
+        # actually determining what to install
+        install = llsd.parse(file(options.install_filename, 'rb').read())
+        pprint.pprint(install)
+        return 0
+
+    #
+    # Handle updates -- can only do one of these
+    # *TODO: should this change the command line syntax?
+    #
+    if options.new_license:
+        if not installer.add_license(
+            options.new_license,
+            text=options.license_text,
+            url=options.license_url):
+            return 1
+    elif options.remove_license:
+        installer.remove_license(options.remove_license)
+    elif options.remove_installable:
+        installer.remove_installable(options.remove_installable)
+    elif options.add_installable:
+        if not installer.add_installable(
+            options.add_installable,
+            copyright=options.installable_copyright,
+            license=options.installable_license,
+            description=options.installable_description,
+            platform=options.package_platform,
+            url=options.package_url,
+            md5sum=options.package_md5):
+            return 1
+    elif options.add_installable_metadata:
+        if not installer.add_installable_metadata(
+            options.add_installable_metadata,
+            copyright=options.installable_copyright,
+            license=options.installable_license,
+            description=options.installable_description):
+            return 1
+    elif options.add_installable_package:
+        if not installer.add_installable_package(
+            options.add_installable_package,
+            platform=options.package_platform,
+            url=options.package_url,
+            md5sum=options.package_md5):
+            return 1
+    elif options.uninstall:
+        installer.do_uninstall(args, options.install_dir)
+    else:
+        installer.do_install(args, options.platform, options.install_dir, 
+                             options.cache_dir, options.check_license, 
+                             options.scp) 
+
+    # save out any changes
+    installer.save()
+    return 0
+
+if __name__ == '__main__':
+    #print sys.argv
+    sys.exit(main())
diff --git a/linden/scripts/messages/message_template.msg b/linden/scripts/messages/message_template.msg
index abd25bf..9c92906 100644
--- a/linden/scripts/messages/message_template.msg
+++ b/linden/scripts/messages/message_template.msg
@@ -1179,7 +1179,7 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	ParcelObjectOwnersReply Low 57 Trusted Zerocoded
+	ParcelObjectOwnersReply Low 57 Trusted Zerocoded UDPDeprecated
 	{
 		Data			Variable
 		{	OwnerID			LLUUID			}
@@ -2436,6 +2436,15 @@ version 2.0
 		{	LocalID				U32  }
 		{	GrabOffset			LLVector3 }
 	}
+	{
+		SurfaceInfo     Variable
+		{   UVCoord     LLVector3 }
+		{   STCoord     LLVector3 }
+       	{   FaceIndex   S32 }
+       	{   Position    LLVector3 }
+       	{   Normal      LLVector3 }
+       	{   Binormal    LLVector3 }
+	}
 }
 
 
@@ -2457,6 +2466,16 @@ version 2.0
 		{	GrabPosition		LLVector3	}	// LLVector3, region local
 		{	TimeSinceLast		U32	}
 	}
+	{
+		SurfaceInfo     Variable
+		{   UVCoord     LLVector3 }
+		{   STCoord     LLVector3 }
+       	{   FaceIndex   S32 }
+       	{   Position    LLVector3 }
+       	{   Normal      LLVector3 }
+       	{   Binormal    LLVector3 }
+	}
+
 }
 
 
@@ -2472,6 +2491,15 @@ version 2.0
 		ObjectData			Single
 		{	LocalID				U32  }
 	}
+	{
+		SurfaceInfo     Variable
+		{   UVCoord     LLVector3 }
+		{   STCoord     LLVector3 }
+       	{   FaceIndex   S32 }
+       	{   Position    LLVector3 }
+       	{   Normal      LLVector3 }
+       	{   Binormal    LLVector3 }
+	}
 }
 
 
@@ -5307,6 +5335,7 @@ version 2.0
 		{	ObjectID		LLUUID	}
 		{	ItemID			LLUUID	}
 		{	Running			BOOL	}
+//		{	Mono			BOOL	} Added to LLSD message
 	}
 }
 
@@ -8767,7 +8796,7 @@ version 2.0
 // LandStatReply
 // Sent by the simulator in response to LandStatRequest
 {
-	LandStatReply Low 422 Trusted Unencoded
+	LandStatReply Low 422 Trusted Unencoded UDPDeprecated
 	{
 		RequestData	Single
 		{	ReportType			U32				}
@@ -8823,4 +8852,4 @@ version 2.0
 		{	ObjectLocalID	U32		}
 		{	IncludeInSearch	BOOL	}
 	}
-}
+}
\ No newline at end of file
-- 
cgit v1.1